diff --git a/go.mod b/go.mod
index 2a2177e20e..8f108d691b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,9 @@
 module google.golang.org/genproto
 
 require (
-	github.com/golang/protobuf v1.2.0
+	github.com/golang/protobuf v1.3.1
 	golang.org/x/exp v0.0.0-20190121172915-509febef88a4
 	golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961
-	golang.org/x/net v0.0.0-20190213061140-3a22650c66bd
-	golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 // indirect
 	golang.org/x/tools v0.0.0-20190226205152-f727befe758c
 	google.golang.org/grpc v1.19.0
 	honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099
diff --git a/go.sum b/go.sum
index 86243887c5..446baddaa5 100644
--- a/go.sum
+++ b/go.sum
@@ -7,6 +7,8 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -20,8 +22,6 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
diff --git a/googleapis/ads/googleads/v1/common/ad_asset.pb.go b/googleapis/ads/googleads/v1/common/ad_asset.pb.go
index 4ed5cb85f5..9386cb8f25 100644
--- a/googleapis/ads/googleads/v1/common/ad_asset.pb.go
+++ b/googleapis/ads/googleads/v1/common/ad_asset.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/ad_asset.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A text asset used inside an ad.
 type AdTextAsset struct {
@@ -39,16 +42,17 @@ func (m *AdTextAsset) Reset()         { *m = AdTextAsset{} }
 func (m *AdTextAsset) String() string { return proto.CompactTextString(m) }
 func (*AdTextAsset) ProtoMessage()    {}
 func (*AdTextAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_asset_07bce9e3ba61c559, []int{0}
+	return fileDescriptor_a1e7a8010a4d26a5, []int{0}
 }
+
 func (m *AdTextAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdTextAsset.Unmarshal(m, b)
 }
 func (m *AdTextAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdTextAsset.Marshal(b, m, deterministic)
 }
-func (dst *AdTextAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdTextAsset.Merge(dst, src)
+func (m *AdTextAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdTextAsset.Merge(m, src)
 }
 func (m *AdTextAsset) XXX_Size() int {
 	return xxx_messageInfo_AdTextAsset.Size(m)
@@ -86,16 +90,17 @@ func (m *AdImageAsset) Reset()         { *m = AdImageAsset{} }
 func (m *AdImageAsset) String() string { return proto.CompactTextString(m) }
 func (*AdImageAsset) ProtoMessage()    {}
 func (*AdImageAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_asset_07bce9e3ba61c559, []int{1}
+	return fileDescriptor_a1e7a8010a4d26a5, []int{1}
 }
+
 func (m *AdImageAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdImageAsset.Unmarshal(m, b)
 }
 func (m *AdImageAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdImageAsset.Marshal(b, m, deterministic)
 }
-func (dst *AdImageAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdImageAsset.Merge(dst, src)
+func (m *AdImageAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdImageAsset.Merge(m, src)
 }
 func (m *AdImageAsset) XXX_Size() int {
 	return xxx_messageInfo_AdImageAsset.Size(m)
@@ -126,16 +131,17 @@ func (m *AdVideoAsset) Reset()         { *m = AdVideoAsset{} }
 func (m *AdVideoAsset) String() string { return proto.CompactTextString(m) }
 func (*AdVideoAsset) ProtoMessage()    {}
 func (*AdVideoAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_asset_07bce9e3ba61c559, []int{2}
+	return fileDescriptor_a1e7a8010a4d26a5, []int{2}
 }
+
 func (m *AdVideoAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdVideoAsset.Unmarshal(m, b)
 }
 func (m *AdVideoAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdVideoAsset.Marshal(b, m, deterministic)
 }
-func (dst *AdVideoAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdVideoAsset.Merge(dst, src)
+func (m *AdVideoAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdVideoAsset.Merge(m, src)
 }
 func (m *AdVideoAsset) XXX_Size() int {
 	return xxx_messageInfo_AdVideoAsset.Size(m)
@@ -166,16 +172,17 @@ func (m *AdMediaBundleAsset) Reset()         { *m = AdMediaBundleAsset{} }
 func (m *AdMediaBundleAsset) String() string { return proto.CompactTextString(m) }
 func (*AdMediaBundleAsset) ProtoMessage()    {}
 func (*AdMediaBundleAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_asset_07bce9e3ba61c559, []int{3}
+	return fileDescriptor_a1e7a8010a4d26a5, []int{3}
 }
+
 func (m *AdMediaBundleAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdMediaBundleAsset.Unmarshal(m, b)
 }
 func (m *AdMediaBundleAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdMediaBundleAsset.Marshal(b, m, deterministic)
 }
-func (dst *AdMediaBundleAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdMediaBundleAsset.Merge(dst, src)
+func (m *AdMediaBundleAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdMediaBundleAsset.Merge(m, src)
 }
 func (m *AdMediaBundleAsset) XXX_Size() int {
 	return xxx_messageInfo_AdMediaBundleAsset.Size(m)
@@ -201,10 +208,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/ad_asset.proto", fileDescriptor_ad_asset_07bce9e3ba61c559)
+	proto.RegisterFile("google/ads/googleads/v1/common/ad_asset.proto", fileDescriptor_a1e7a8010a4d26a5)
 }
 
-var fileDescriptor_ad_asset_07bce9e3ba61c559 = []byte{
+var fileDescriptor_a1e7a8010a4d26a5 = []byte{
 	// 401 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcd, 0x6a, 0xdc, 0x30,
 	0x10, 0xc7, 0xf1, 0xf6, 0xe3, 0xa0, 0x5d, 0x7a, 0xf0, 0x29, 0x84, 0x10, 0x82, 0x4f, 0xb9, 0x54,
diff --git a/googleapis/ads/googleads/v1/common/ad_type_infos.pb.go b/googleapis/ads/googleads/v1/common/ad_type_infos.pb.go
index a11c42f734..a1889df518 100644
--- a/googleapis/ads/googleads/v1/common/ad_type_infos.pb.go
+++ b/googleapis/ads/googleads/v1/common/ad_type_infos.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/ad_type_infos.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A text ad.
 type TextAdInfo struct {
@@ -38,16 +41,17 @@ func (m *TextAdInfo) Reset()         { *m = TextAdInfo{} }
 func (m *TextAdInfo) String() string { return proto.CompactTextString(m) }
 func (*TextAdInfo) ProtoMessage()    {}
 func (*TextAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{0}
+	return fileDescriptor_2709d6977cd7f379, []int{0}
 }
+
 func (m *TextAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAdInfo.Unmarshal(m, b)
 }
 func (m *TextAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *TextAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAdInfo.Merge(dst, src)
+func (m *TextAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAdInfo.Merge(m, src)
 }
 func (m *TextAdInfo) XXX_Size() int {
 	return xxx_messageInfo_TextAdInfo.Size(m)
@@ -104,16 +108,17 @@ func (m *ExpandedTextAdInfo) Reset()         { *m = ExpandedTextAdInfo{} }
 func (m *ExpandedTextAdInfo) String() string { return proto.CompactTextString(m) }
 func (*ExpandedTextAdInfo) ProtoMessage()    {}
 func (*ExpandedTextAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{1}
+	return fileDescriptor_2709d6977cd7f379, []int{1}
 }
+
 func (m *ExpandedTextAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExpandedTextAdInfo.Unmarshal(m, b)
 }
 func (m *ExpandedTextAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExpandedTextAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ExpandedTextAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExpandedTextAdInfo.Merge(dst, src)
+func (m *ExpandedTextAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExpandedTextAdInfo.Merge(m, src)
 }
 func (m *ExpandedTextAdInfo) XXX_Size() int {
 	return xxx_messageInfo_ExpandedTextAdInfo.Size(m)
@@ -215,16 +220,17 @@ func (m *CallOnlyAdInfo) Reset()         { *m = CallOnlyAdInfo{} }
 func (m *CallOnlyAdInfo) String() string { return proto.CompactTextString(m) }
 func (*CallOnlyAdInfo) ProtoMessage()    {}
 func (*CallOnlyAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{2}
+	return fileDescriptor_2709d6977cd7f379, []int{2}
 }
+
 func (m *CallOnlyAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallOnlyAdInfo.Unmarshal(m, b)
 }
 func (m *CallOnlyAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallOnlyAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *CallOnlyAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallOnlyAdInfo.Merge(dst, src)
+func (m *CallOnlyAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallOnlyAdInfo.Merge(m, src)
 }
 func (m *CallOnlyAdInfo) XXX_Size() int {
 	return xxx_messageInfo_CallOnlyAdInfo.Size(m)
@@ -332,16 +338,17 @@ func (m *ExpandedDynamicSearchAdInfo) Reset()         { *m = ExpandedDynamicSear
 func (m *ExpandedDynamicSearchAdInfo) String() string { return proto.CompactTextString(m) }
 func (*ExpandedDynamicSearchAdInfo) ProtoMessage()    {}
 func (*ExpandedDynamicSearchAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{3}
+	return fileDescriptor_2709d6977cd7f379, []int{3}
 }
+
 func (m *ExpandedDynamicSearchAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExpandedDynamicSearchAdInfo.Unmarshal(m, b)
 }
 func (m *ExpandedDynamicSearchAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExpandedDynamicSearchAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ExpandedDynamicSearchAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExpandedDynamicSearchAdInfo.Merge(dst, src)
+func (m *ExpandedDynamicSearchAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExpandedDynamicSearchAdInfo.Merge(m, src)
 }
 func (m *ExpandedDynamicSearchAdInfo) XXX_Size() int {
 	return xxx_messageInfo_ExpandedDynamicSearchAdInfo.Size(m)
@@ -370,16 +377,17 @@ func (m *HotelAdInfo) Reset()         { *m = HotelAdInfo{} }
 func (m *HotelAdInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelAdInfo) ProtoMessage()    {}
 func (*HotelAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{4}
+	return fileDescriptor_2709d6977cd7f379, []int{4}
 }
+
 func (m *HotelAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelAdInfo.Unmarshal(m, b)
 }
 func (m *HotelAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelAdInfo.Merge(dst, src)
+func (m *HotelAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelAdInfo.Merge(m, src)
 }
 func (m *HotelAdInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelAdInfo.Size(m)
@@ -401,16 +409,17 @@ func (m *ShoppingSmartAdInfo) Reset()         { *m = ShoppingSmartAdInfo{} }
 func (m *ShoppingSmartAdInfo) String() string { return proto.CompactTextString(m) }
 func (*ShoppingSmartAdInfo) ProtoMessage()    {}
 func (*ShoppingSmartAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{5}
+	return fileDescriptor_2709d6977cd7f379, []int{5}
 }
+
 func (m *ShoppingSmartAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShoppingSmartAdInfo.Unmarshal(m, b)
 }
 func (m *ShoppingSmartAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShoppingSmartAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ShoppingSmartAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShoppingSmartAdInfo.Merge(dst, src)
+func (m *ShoppingSmartAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShoppingSmartAdInfo.Merge(m, src)
 }
 func (m *ShoppingSmartAdInfo) XXX_Size() int {
 	return xxx_messageInfo_ShoppingSmartAdInfo.Size(m)
@@ -432,16 +441,17 @@ func (m *ShoppingProductAdInfo) Reset()         { *m = ShoppingProductAdInfo{} }
 func (m *ShoppingProductAdInfo) String() string { return proto.CompactTextString(m) }
 func (*ShoppingProductAdInfo) ProtoMessage()    {}
 func (*ShoppingProductAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{6}
+	return fileDescriptor_2709d6977cd7f379, []int{6}
 }
+
 func (m *ShoppingProductAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShoppingProductAdInfo.Unmarshal(m, b)
 }
 func (m *ShoppingProductAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShoppingProductAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ShoppingProductAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShoppingProductAdInfo.Merge(dst, src)
+func (m *ShoppingProductAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShoppingProductAdInfo.Merge(m, src)
 }
 func (m *ShoppingProductAdInfo) XXX_Size() int {
 	return xxx_messageInfo_ShoppingProductAdInfo.Size(m)
@@ -485,16 +495,17 @@ func (m *GmailAdInfo) Reset()         { *m = GmailAdInfo{} }
 func (m *GmailAdInfo) String() string { return proto.CompactTextString(m) }
 func (*GmailAdInfo) ProtoMessage()    {}
 func (*GmailAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{7}
+	return fileDescriptor_2709d6977cd7f379, []int{7}
 }
+
 func (m *GmailAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GmailAdInfo.Unmarshal(m, b)
 }
 func (m *GmailAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GmailAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *GmailAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GmailAdInfo.Merge(dst, src)
+func (m *GmailAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GmailAdInfo.Merge(m, src)
 }
 func (m *GmailAdInfo) XXX_Size() int {
 	return xxx_messageInfo_GmailAdInfo.Size(m)
@@ -583,16 +594,17 @@ func (m *GmailTeaser) Reset()         { *m = GmailTeaser{} }
 func (m *GmailTeaser) String() string { return proto.CompactTextString(m) }
 func (*GmailTeaser) ProtoMessage()    {}
 func (*GmailTeaser) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{8}
+	return fileDescriptor_2709d6977cd7f379, []int{8}
 }
+
 func (m *GmailTeaser) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GmailTeaser.Unmarshal(m, b)
 }
 func (m *GmailTeaser) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GmailTeaser.Marshal(b, m, deterministic)
 }
-func (dst *GmailTeaser) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GmailTeaser.Merge(dst, src)
+func (m *GmailTeaser) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GmailTeaser.Merge(m, src)
 }
 func (m *GmailTeaser) XXX_Size() int {
 	return xxx_messageInfo_GmailTeaser.Size(m)
@@ -652,16 +664,17 @@ func (m *DisplayCallToAction) Reset()         { *m = DisplayCallToAction{} }
 func (m *DisplayCallToAction) String() string { return proto.CompactTextString(m) }
 func (*DisplayCallToAction) ProtoMessage()    {}
 func (*DisplayCallToAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{9}
+	return fileDescriptor_2709d6977cd7f379, []int{9}
 }
+
 func (m *DisplayCallToAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DisplayCallToAction.Unmarshal(m, b)
 }
 func (m *DisplayCallToAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DisplayCallToAction.Marshal(b, m, deterministic)
 }
-func (dst *DisplayCallToAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DisplayCallToAction.Merge(dst, src)
+func (m *DisplayCallToAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DisplayCallToAction.Merge(m, src)
 }
 func (m *DisplayCallToAction) XXX_Size() int {
 	return xxx_messageInfo_DisplayCallToAction.Size(m)
@@ -712,16 +725,17 @@ func (m *ProductImage) Reset()         { *m = ProductImage{} }
 func (m *ProductImage) String() string { return proto.CompactTextString(m) }
 func (*ProductImage) ProtoMessage()    {}
 func (*ProductImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{10}
+	return fileDescriptor_2709d6977cd7f379, []int{10}
 }
+
 func (m *ProductImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductImage.Unmarshal(m, b)
 }
 func (m *ProductImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductImage.Marshal(b, m, deterministic)
 }
-func (dst *ProductImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductImage.Merge(dst, src)
+func (m *ProductImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductImage.Merge(m, src)
 }
 func (m *ProductImage) XXX_Size() int {
 	return xxx_messageInfo_ProductImage.Size(m)
@@ -766,16 +780,17 @@ func (m *ProductVideo) Reset()         { *m = ProductVideo{} }
 func (m *ProductVideo) String() string { return proto.CompactTextString(m) }
 func (*ProductVideo) ProtoMessage()    {}
 func (*ProductVideo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{11}
+	return fileDescriptor_2709d6977cd7f379, []int{11}
 }
+
 func (m *ProductVideo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductVideo.Unmarshal(m, b)
 }
 func (m *ProductVideo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductVideo.Marshal(b, m, deterministic)
 }
-func (dst *ProductVideo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductVideo.Merge(dst, src)
+func (m *ProductVideo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductVideo.Merge(m, src)
 }
 func (m *ProductVideo) XXX_Size() int {
 	return xxx_messageInfo_ProductVideo.Size(m)
@@ -831,16 +846,17 @@ func (m *ImageAdInfo) Reset()         { *m = ImageAdInfo{} }
 func (m *ImageAdInfo) String() string { return proto.CompactTextString(m) }
 func (*ImageAdInfo) ProtoMessage()    {}
 func (*ImageAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{12}
+	return fileDescriptor_2709d6977cd7f379, []int{12}
 }
+
 func (m *ImageAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageAdInfo.Unmarshal(m, b)
 }
 func (m *ImageAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ImageAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageAdInfo.Merge(dst, src)
+func (m *ImageAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAdInfo.Merge(m, src)
 }
 func (m *ImageAdInfo) XXX_Size() int {
 	return xxx_messageInfo_ImageAdInfo.Size(m)
@@ -957,99 +973,15 @@ func (m *ImageAdInfo) GetAdIdToCopyImageFrom() *wrappers.Int64Value {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImageAdInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImageAdInfo_OneofMarshaler, _ImageAdInfo_OneofUnmarshaler, _ImageAdInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImageAdInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImageAdInfo_MediaFile)(nil),
 		(*ImageAdInfo_Data)(nil),
 		(*ImageAdInfo_AdIdToCopyImageFrom)(nil),
 	}
 }
 
-func _ImageAdInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImageAdInfo)
-	// image
-	switch x := m.Image.(type) {
-	case *ImageAdInfo_MediaFile:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MediaFile); err != nil {
-			return err
-		}
-	case *ImageAdInfo_Data:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Data); err != nil {
-			return err
-		}
-	case *ImageAdInfo_AdIdToCopyImageFrom:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdIdToCopyImageFrom); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ImageAdInfo.Image has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImageAdInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImageAdInfo)
-	switch tag {
-	case 1: // image.media_file
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.Image = &ImageAdInfo_MediaFile{msg}
-		return true, err
-	case 2: // image.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.BytesValue)
-		err := b.DecodeMessage(msg)
-		m.Image = &ImageAdInfo_Data{msg}
-		return true, err
-	case 3: // image.ad_id_to_copy_image_from
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.Image = &ImageAdInfo_AdIdToCopyImageFrom{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImageAdInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImageAdInfo)
-	// image
-	switch x := m.Image.(type) {
-	case *ImageAdInfo_MediaFile:
-		s := proto.Size(x.MediaFile)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ImageAdInfo_Data:
-		s := proto.Size(x.Data)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ImageAdInfo_AdIdToCopyImageFrom:
-		s := proto.Size(x.AdIdToCopyImageFrom)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Representation of video bumper in-stream ad format (very short in-stream
 // non-skippable video ad).
 type VideoBumperInStreamAdInfo struct {
@@ -1062,16 +994,17 @@ func (m *VideoBumperInStreamAdInfo) Reset()         { *m = VideoBumperInStreamAd
 func (m *VideoBumperInStreamAdInfo) String() string { return proto.CompactTextString(m) }
 func (*VideoBumperInStreamAdInfo) ProtoMessage()    {}
 func (*VideoBumperInStreamAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{13}
+	return fileDescriptor_2709d6977cd7f379, []int{13}
 }
+
 func (m *VideoBumperInStreamAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoBumperInStreamAdInfo.Unmarshal(m, b)
 }
 func (m *VideoBumperInStreamAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoBumperInStreamAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *VideoBumperInStreamAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoBumperInStreamAdInfo.Merge(dst, src)
+func (m *VideoBumperInStreamAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoBumperInStreamAdInfo.Merge(m, src)
 }
 func (m *VideoBumperInStreamAdInfo) XXX_Size() int {
 	return xxx_messageInfo_VideoBumperInStreamAdInfo.Size(m)
@@ -1094,16 +1027,17 @@ func (m *VideoNonSkippableInStreamAdInfo) Reset()         { *m = VideoNonSkippab
 func (m *VideoNonSkippableInStreamAdInfo) String() string { return proto.CompactTextString(m) }
 func (*VideoNonSkippableInStreamAdInfo) ProtoMessage()    {}
 func (*VideoNonSkippableInStreamAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{14}
+	return fileDescriptor_2709d6977cd7f379, []int{14}
 }
+
 func (m *VideoNonSkippableInStreamAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoNonSkippableInStreamAdInfo.Unmarshal(m, b)
 }
 func (m *VideoNonSkippableInStreamAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoNonSkippableInStreamAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *VideoNonSkippableInStreamAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoNonSkippableInStreamAdInfo.Merge(dst, src)
+func (m *VideoNonSkippableInStreamAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoNonSkippableInStreamAdInfo.Merge(m, src)
 }
 func (m *VideoNonSkippableInStreamAdInfo) XXX_Size() int {
 	return xxx_messageInfo_VideoNonSkippableInStreamAdInfo.Size(m)
@@ -1136,16 +1070,17 @@ func (m *VideoTrueViewInStreamAdInfo) Reset()         { *m = VideoTrueViewInStre
 func (m *VideoTrueViewInStreamAdInfo) String() string { return proto.CompactTextString(m) }
 func (*VideoTrueViewInStreamAdInfo) ProtoMessage()    {}
 func (*VideoTrueViewInStreamAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{15}
+	return fileDescriptor_2709d6977cd7f379, []int{15}
 }
+
 func (m *VideoTrueViewInStreamAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoTrueViewInStreamAdInfo.Unmarshal(m, b)
 }
 func (m *VideoTrueViewInStreamAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoTrueViewInStreamAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *VideoTrueViewInStreamAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoTrueViewInStreamAdInfo.Merge(dst, src)
+func (m *VideoTrueViewInStreamAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoTrueViewInStreamAdInfo.Merge(m, src)
 }
 func (m *VideoTrueViewInStreamAdInfo) XXX_Size() int {
 	return xxx_messageInfo_VideoTrueViewInStreamAdInfo.Size(m)
@@ -1193,16 +1128,17 @@ func (m *VideoOutstreamAdInfo) Reset()         { *m = VideoOutstreamAdInfo{} }
 func (m *VideoOutstreamAdInfo) String() string { return proto.CompactTextString(m) }
 func (*VideoOutstreamAdInfo) ProtoMessage()    {}
 func (*VideoOutstreamAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{16}
+	return fileDescriptor_2709d6977cd7f379, []int{16}
 }
+
 func (m *VideoOutstreamAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoOutstreamAdInfo.Unmarshal(m, b)
 }
 func (m *VideoOutstreamAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoOutstreamAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *VideoOutstreamAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoOutstreamAdInfo.Merge(dst, src)
+func (m *VideoOutstreamAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoOutstreamAdInfo.Merge(m, src)
 }
 func (m *VideoOutstreamAdInfo) XXX_Size() int {
 	return xxx_messageInfo_VideoOutstreamAdInfo.Size(m)
@@ -1248,16 +1184,17 @@ func (m *VideoAdInfo) Reset()         { *m = VideoAdInfo{} }
 func (m *VideoAdInfo) String() string { return proto.CompactTextString(m) }
 func (*VideoAdInfo) ProtoMessage()    {}
 func (*VideoAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{17}
+	return fileDescriptor_2709d6977cd7f379, []int{17}
 }
+
 func (m *VideoAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAdInfo.Unmarshal(m, b)
 }
 func (m *VideoAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *VideoAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAdInfo.Merge(dst, src)
+func (m *VideoAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAdInfo.Merge(m, src)
 }
 func (m *VideoAdInfo) XXX_Size() int {
 	return xxx_messageInfo_VideoAdInfo.Size(m)
@@ -1338,9 +1275,9 @@ func (m *VideoAdInfo) GetNonSkippable() *VideoNonSkippableInStreamAdInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*VideoAdInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _VideoAdInfo_OneofMarshaler, _VideoAdInfo_OneofUnmarshaler, _VideoAdInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*VideoAdInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*VideoAdInfo_InStream)(nil),
 		(*VideoAdInfo_Bumper)(nil),
 		(*VideoAdInfo_OutStream)(nil),
@@ -1348,108 +1285,6 @@ func (*VideoAdInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) e
 	}
 }
 
-func _VideoAdInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*VideoAdInfo)
-	// format
-	switch x := m.Format.(type) {
-	case *VideoAdInfo_InStream:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InStream); err != nil {
-			return err
-		}
-	case *VideoAdInfo_Bumper:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Bumper); err != nil {
-			return err
-		}
-	case *VideoAdInfo_OutStream:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OutStream); err != nil {
-			return err
-		}
-	case *VideoAdInfo_NonSkippable:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NonSkippable); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("VideoAdInfo.Format has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _VideoAdInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*VideoAdInfo)
-	switch tag {
-	case 2: // format.in_stream
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoTrueViewInStreamAdInfo)
-		err := b.DecodeMessage(msg)
-		m.Format = &VideoAdInfo_InStream{msg}
-		return true, err
-	case 3: // format.bumper
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoBumperInStreamAdInfo)
-		err := b.DecodeMessage(msg)
-		m.Format = &VideoAdInfo_Bumper{msg}
-		return true, err
-	case 4: // format.out_stream
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoOutstreamAdInfo)
-		err := b.DecodeMessage(msg)
-		m.Format = &VideoAdInfo_OutStream{msg}
-		return true, err
-	case 5: // format.non_skippable
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoNonSkippableInStreamAdInfo)
-		err := b.DecodeMessage(msg)
-		m.Format = &VideoAdInfo_NonSkippable{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _VideoAdInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*VideoAdInfo)
-	// format
-	switch x := m.Format.(type) {
-	case *VideoAdInfo_InStream:
-		s := proto.Size(x.InStream)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *VideoAdInfo_Bumper:
-		s := proto.Size(x.Bumper)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *VideoAdInfo_OutStream:
-		s := proto.Size(x.OutStream)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *VideoAdInfo_NonSkippable:
-		s := proto.Size(x.NonSkippable)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A responsive search ad.
 //
 // Responsive search ads let you create an ad that adapts to show more text, and
@@ -1482,16 +1317,17 @@ func (m *ResponsiveSearchAdInfo) Reset()         { *m = ResponsiveSearchAdInfo{}
 func (m *ResponsiveSearchAdInfo) String() string { return proto.CompactTextString(m) }
 func (*ResponsiveSearchAdInfo) ProtoMessage()    {}
 func (*ResponsiveSearchAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{18}
+	return fileDescriptor_2709d6977cd7f379, []int{18}
 }
+
 func (m *ResponsiveSearchAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResponsiveSearchAdInfo.Unmarshal(m, b)
 }
 func (m *ResponsiveSearchAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResponsiveSearchAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ResponsiveSearchAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResponsiveSearchAdInfo.Merge(dst, src)
+func (m *ResponsiveSearchAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResponsiveSearchAdInfo.Merge(m, src)
 }
 func (m *ResponsiveSearchAdInfo) XXX_Size() int {
 	return xxx_messageInfo_ResponsiveSearchAdInfo.Size(m)
@@ -1581,16 +1417,17 @@ func (m *LegacyResponsiveDisplayAdInfo) Reset()         { *m = LegacyResponsiveD
 func (m *LegacyResponsiveDisplayAdInfo) String() string { return proto.CompactTextString(m) }
 func (*LegacyResponsiveDisplayAdInfo) ProtoMessage()    {}
 func (*LegacyResponsiveDisplayAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{19}
+	return fileDescriptor_2709d6977cd7f379, []int{19}
 }
+
 func (m *LegacyResponsiveDisplayAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LegacyResponsiveDisplayAdInfo.Unmarshal(m, b)
 }
 func (m *LegacyResponsiveDisplayAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LegacyResponsiveDisplayAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *LegacyResponsiveDisplayAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LegacyResponsiveDisplayAdInfo.Merge(dst, src)
+func (m *LegacyResponsiveDisplayAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LegacyResponsiveDisplayAdInfo.Merge(m, src)
 }
 func (m *LegacyResponsiveDisplayAdInfo) XXX_Size() int {
 	return xxx_messageInfo_LegacyResponsiveDisplayAdInfo.Size(m)
@@ -1732,16 +1569,17 @@ func (m *AppAdInfo) Reset()         { *m = AppAdInfo{} }
 func (m *AppAdInfo) String() string { return proto.CompactTextString(m) }
 func (*AppAdInfo) ProtoMessage()    {}
 func (*AppAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{20}
+	return fileDescriptor_2709d6977cd7f379, []int{20}
 }
+
 func (m *AppAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppAdInfo.Unmarshal(m, b)
 }
 func (m *AppAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *AppAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppAdInfo.Merge(dst, src)
+func (m *AppAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppAdInfo.Merge(m, src)
 }
 func (m *AppAdInfo) XXX_Size() int {
 	return xxx_messageInfo_AppAdInfo.Size(m)
@@ -1818,16 +1656,17 @@ func (m *AppEngagementAdInfo) Reset()         { *m = AppEngagementAdInfo{} }
 func (m *AppEngagementAdInfo) String() string { return proto.CompactTextString(m) }
 func (*AppEngagementAdInfo) ProtoMessage()    {}
 func (*AppEngagementAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{21}
+	return fileDescriptor_2709d6977cd7f379, []int{21}
 }
+
 func (m *AppEngagementAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngagementAdInfo.Unmarshal(m, b)
 }
 func (m *AppEngagementAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngagementAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *AppEngagementAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngagementAdInfo.Merge(dst, src)
+func (m *AppEngagementAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngagementAdInfo.Merge(m, src)
 }
 func (m *AppEngagementAdInfo) XXX_Size() int {
 	return xxx_messageInfo_AppEngagementAdInfo.Size(m)
@@ -1887,16 +1726,17 @@ func (m *LegacyAppInstallAdInfo) Reset()         { *m = LegacyAppInstallAdInfo{}
 func (m *LegacyAppInstallAdInfo) String() string { return proto.CompactTextString(m) }
 func (*LegacyAppInstallAdInfo) ProtoMessage()    {}
 func (*LegacyAppInstallAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{22}
+	return fileDescriptor_2709d6977cd7f379, []int{22}
 }
+
 func (m *LegacyAppInstallAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LegacyAppInstallAdInfo.Unmarshal(m, b)
 }
 func (m *LegacyAppInstallAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LegacyAppInstallAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *LegacyAppInstallAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LegacyAppInstallAdInfo.Merge(dst, src)
+func (m *LegacyAppInstallAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LegacyAppInstallAdInfo.Merge(m, src)
 }
 func (m *LegacyAppInstallAdInfo) XXX_Size() int {
 	return xxx_messageInfo_LegacyAppInstallAdInfo.Size(m)
@@ -2006,16 +1846,17 @@ func (m *ResponsiveDisplayAdInfo) Reset()         { *m = ResponsiveDisplayAdInfo
 func (m *ResponsiveDisplayAdInfo) String() string { return proto.CompactTextString(m) }
 func (*ResponsiveDisplayAdInfo) ProtoMessage()    {}
 func (*ResponsiveDisplayAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{23}
+	return fileDescriptor_2709d6977cd7f379, []int{23}
 }
+
 func (m *ResponsiveDisplayAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResponsiveDisplayAdInfo.Unmarshal(m, b)
 }
 func (m *ResponsiveDisplayAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResponsiveDisplayAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ResponsiveDisplayAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResponsiveDisplayAdInfo.Merge(dst, src)
+func (m *ResponsiveDisplayAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResponsiveDisplayAdInfo.Merge(m, src)
 }
 func (m *ResponsiveDisplayAdInfo) XXX_Size() int {
 	return xxx_messageInfo_ResponsiveDisplayAdInfo.Size(m)
@@ -2158,16 +1999,17 @@ func (m *DisplayUploadAdInfo) Reset()         { *m = DisplayUploadAdInfo{} }
 func (m *DisplayUploadAdInfo) String() string { return proto.CompactTextString(m) }
 func (*DisplayUploadAdInfo) ProtoMessage()    {}
 func (*DisplayUploadAdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_infos_60e41938ab80fbca, []int{24}
+	return fileDescriptor_2709d6977cd7f379, []int{24}
 }
+
 func (m *DisplayUploadAdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DisplayUploadAdInfo.Unmarshal(m, b)
 }
 func (m *DisplayUploadAdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DisplayUploadAdInfo.Marshal(b, m, deterministic)
 }
-func (dst *DisplayUploadAdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DisplayUploadAdInfo.Merge(dst, src)
+func (m *DisplayUploadAdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DisplayUploadAdInfo.Merge(m, src)
 }
 func (m *DisplayUploadAdInfo) XXX_Size() int {
 	return xxx_messageInfo_DisplayUploadAdInfo.Size(m)
@@ -2209,61 +2051,13 @@ func (m *DisplayUploadAdInfo) GetMediaBundle() *AdMediaBundleAsset {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DisplayUploadAdInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DisplayUploadAdInfo_OneofMarshaler, _DisplayUploadAdInfo_OneofUnmarshaler, _DisplayUploadAdInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DisplayUploadAdInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DisplayUploadAdInfo_MediaBundle)(nil),
 	}
 }
 
-func _DisplayUploadAdInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DisplayUploadAdInfo)
-	// media_asset
-	switch x := m.MediaAsset.(type) {
-	case *DisplayUploadAdInfo_MediaBundle:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MediaBundle); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DisplayUploadAdInfo.MediaAsset has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DisplayUploadAdInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DisplayUploadAdInfo)
-	switch tag {
-	case 2: // media_asset.media_bundle
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdMediaBundleAsset)
-		err := b.DecodeMessage(msg)
-		m.MediaAsset = &DisplayUploadAdInfo_MediaBundle{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DisplayUploadAdInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DisplayUploadAdInfo)
-	// media_asset
-	switch x := m.MediaAsset.(type) {
-	case *DisplayUploadAdInfo_MediaBundle:
-		s := proto.Size(x.MediaBundle)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*TextAdInfo)(nil), "google.ads.googleads.v1.common.TextAdInfo")
 	proto.RegisterType((*ExpandedTextAdInfo)(nil), "google.ads.googleads.v1.common.ExpandedTextAdInfo")
@@ -2293,10 +2087,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/ad_type_infos.proto", fileDescriptor_ad_type_infos_60e41938ab80fbca)
+	proto.RegisterFile("google/ads/googleads/v1/common/ad_type_infos.proto", fileDescriptor_2709d6977cd7f379)
 }
 
-var fileDescriptor_ad_type_infos_60e41938ab80fbca = []byte{
+var fileDescriptor_2709d6977cd7f379 = []byte{
 	// 2358 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4b, 0x6f, 0xdb, 0xc8,
 	0x1d, 0xb7, 0x2c, 0x3f, 0xa4, 0xbf, 0x24, 0x3f, 0xe8, 0x3c, 0xb4, 0xf6, 0xee, 0x36, 0xcb, 0x43,
diff --git a/googleapis/ads/googleads/v1/common/asset_types.pb.go b/googleapis/ads/googleads/v1/common/asset_types.pb.go
index 78b7244a2a..ed91eb5e35 100644
--- a/googleapis/ads/googleads/v1/common/asset_types.pb.go
+++ b/googleapis/ads/googleads/v1/common/asset_types.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/asset_types.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A YouTube asset.
 type YoutubeVideoAsset struct {
@@ -35,16 +38,17 @@ func (m *YoutubeVideoAsset) Reset()         { *m = YoutubeVideoAsset{} }
 func (m *YoutubeVideoAsset) String() string { return proto.CompactTextString(m) }
 func (*YoutubeVideoAsset) ProtoMessage()    {}
 func (*YoutubeVideoAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_types_8b202aa014f30014, []int{0}
+	return fileDescriptor_f84b8dff1cc51362, []int{0}
 }
+
 func (m *YoutubeVideoAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_YoutubeVideoAsset.Unmarshal(m, b)
 }
 func (m *YoutubeVideoAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_YoutubeVideoAsset.Marshal(b, m, deterministic)
 }
-func (dst *YoutubeVideoAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_YoutubeVideoAsset.Merge(dst, src)
+func (m *YoutubeVideoAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YoutubeVideoAsset.Merge(m, src)
 }
 func (m *YoutubeVideoAsset) XXX_Size() int {
 	return xxx_messageInfo_YoutubeVideoAsset.Size(m)
@@ -78,16 +82,17 @@ func (m *MediaBundleAsset) Reset()         { *m = MediaBundleAsset{} }
 func (m *MediaBundleAsset) String() string { return proto.CompactTextString(m) }
 func (*MediaBundleAsset) ProtoMessage()    {}
 func (*MediaBundleAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_types_8b202aa014f30014, []int{1}
+	return fileDescriptor_f84b8dff1cc51362, []int{1}
 }
+
 func (m *MediaBundleAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaBundleAsset.Unmarshal(m, b)
 }
 func (m *MediaBundleAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaBundleAsset.Marshal(b, m, deterministic)
 }
-func (dst *MediaBundleAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaBundleAsset.Merge(dst, src)
+func (m *MediaBundleAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaBundleAsset.Merge(m, src)
 }
 func (m *MediaBundleAsset) XXX_Size() int {
 	return xxx_messageInfo_MediaBundleAsset.Size(m)
@@ -124,16 +129,17 @@ func (m *ImageAsset) Reset()         { *m = ImageAsset{} }
 func (m *ImageAsset) String() string { return proto.CompactTextString(m) }
 func (*ImageAsset) ProtoMessage()    {}
 func (*ImageAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_types_8b202aa014f30014, []int{2}
+	return fileDescriptor_f84b8dff1cc51362, []int{2}
 }
+
 func (m *ImageAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageAsset.Unmarshal(m, b)
 }
 func (m *ImageAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageAsset.Marshal(b, m, deterministic)
 }
-func (dst *ImageAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageAsset.Merge(dst, src)
+func (m *ImageAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAsset.Merge(m, src)
 }
 func (m *ImageAsset) XXX_Size() int {
 	return xxx_messageInfo_ImageAsset.Size(m)
@@ -189,16 +195,17 @@ func (m *ImageDimension) Reset()         { *m = ImageDimension{} }
 func (m *ImageDimension) String() string { return proto.CompactTextString(m) }
 func (*ImageDimension) ProtoMessage()    {}
 func (*ImageDimension) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_types_8b202aa014f30014, []int{3}
+	return fileDescriptor_f84b8dff1cc51362, []int{3}
 }
+
 func (m *ImageDimension) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageDimension.Unmarshal(m, b)
 }
 func (m *ImageDimension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageDimension.Marshal(b, m, deterministic)
 }
-func (dst *ImageDimension) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageDimension.Merge(dst, src)
+func (m *ImageDimension) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageDimension.Merge(m, src)
 }
 func (m *ImageDimension) XXX_Size() int {
 	return xxx_messageInfo_ImageDimension.Size(m)
@@ -243,16 +250,17 @@ func (m *TextAsset) Reset()         { *m = TextAsset{} }
 func (m *TextAsset) String() string { return proto.CompactTextString(m) }
 func (*TextAsset) ProtoMessage()    {}
 func (*TextAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_types_8b202aa014f30014, []int{4}
+	return fileDescriptor_f84b8dff1cc51362, []int{4}
 }
+
 func (m *TextAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAsset.Unmarshal(m, b)
 }
 func (m *TextAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAsset.Marshal(b, m, deterministic)
 }
-func (dst *TextAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAsset.Merge(dst, src)
+func (m *TextAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAsset.Merge(m, src)
 }
 func (m *TextAsset) XXX_Size() int {
 	return xxx_messageInfo_TextAsset.Size(m)
@@ -279,10 +287,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/asset_types.proto", fileDescriptor_asset_types_8b202aa014f30014)
+	proto.RegisterFile("google/ads/googleads/v1/common/asset_types.proto", fileDescriptor_f84b8dff1cc51362)
 }
 
-var fileDescriptor_asset_types_8b202aa014f30014 = []byte{
+var fileDescriptor_f84b8dff1cc51362 = []byte{
 	// 537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x41, 0x6b, 0xdb, 0x30,
 	0x14, 0xc7, 0x71, 0x12, 0x46, 0xa2, 0x76, 0x59, 0xe7, 0x53, 0xc8, 0x4a, 0x29, 0x3e, 0xf5, 0x32,
diff --git a/googleapis/ads/googleads/v1/common/bidding.pb.go b/googleapis/ads/googleads/v1/common/bidding.pb.go
index f32b832f45..b9271b1672 100644
--- a/googleapis/ads/googleads/v1/common/bidding.pb.go
+++ b/googleapis/ads/googleads/v1/common/bidding.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/bidding.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Commission is an automatic bidding strategy in which the advertiser pays a
 // certain portion of the conversion value.
@@ -38,16 +41,17 @@ func (m *Commission) Reset()         { *m = Commission{} }
 func (m *Commission) String() string { return proto.CompactTextString(m) }
 func (*Commission) ProtoMessage()    {}
 func (*Commission) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{0}
+	return fileDescriptor_b08e50fa745dd88c, []int{0}
 }
+
 func (m *Commission) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Commission.Unmarshal(m, b)
 }
 func (m *Commission) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Commission.Marshal(b, m, deterministic)
 }
-func (dst *Commission) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Commission.Merge(dst, src)
+func (m *Commission) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Commission.Merge(m, src)
 }
 func (m *Commission) XXX_Size() int {
 	return xxx_messageInfo_Commission.Size(m)
@@ -78,16 +82,17 @@ func (m *EnhancedCpc) Reset()         { *m = EnhancedCpc{} }
 func (m *EnhancedCpc) String() string { return proto.CompactTextString(m) }
 func (*EnhancedCpc) ProtoMessage()    {}
 func (*EnhancedCpc) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{1}
+	return fileDescriptor_b08e50fa745dd88c, []int{1}
 }
+
 func (m *EnhancedCpc) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnhancedCpc.Unmarshal(m, b)
 }
 func (m *EnhancedCpc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnhancedCpc.Marshal(b, m, deterministic)
 }
-func (dst *EnhancedCpc) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnhancedCpc.Merge(dst, src)
+func (m *EnhancedCpc) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnhancedCpc.Merge(m, src)
 }
 func (m *EnhancedCpc) XXX_Size() int {
 	return xxx_messageInfo_EnhancedCpc.Size(m)
@@ -111,16 +116,17 @@ func (m *ManualCpc) Reset()         { *m = ManualCpc{} }
 func (m *ManualCpc) String() string { return proto.CompactTextString(m) }
 func (*ManualCpc) ProtoMessage()    {}
 func (*ManualCpc) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{2}
+	return fileDescriptor_b08e50fa745dd88c, []int{2}
 }
+
 func (m *ManualCpc) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManualCpc.Unmarshal(m, b)
 }
 func (m *ManualCpc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManualCpc.Marshal(b, m, deterministic)
 }
-func (dst *ManualCpc) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManualCpc.Merge(dst, src)
+func (m *ManualCpc) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManualCpc.Merge(m, src)
 }
 func (m *ManualCpc) XXX_Size() int {
 	return xxx_messageInfo_ManualCpc.Size(m)
@@ -149,16 +155,17 @@ func (m *ManualCpm) Reset()         { *m = ManualCpm{} }
 func (m *ManualCpm) String() string { return proto.CompactTextString(m) }
 func (*ManualCpm) ProtoMessage()    {}
 func (*ManualCpm) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{3}
+	return fileDescriptor_b08e50fa745dd88c, []int{3}
 }
+
 func (m *ManualCpm) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManualCpm.Unmarshal(m, b)
 }
 func (m *ManualCpm) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManualCpm.Marshal(b, m, deterministic)
 }
-func (dst *ManualCpm) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManualCpm.Merge(dst, src)
+func (m *ManualCpm) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManualCpm.Merge(m, src)
 }
 func (m *ManualCpm) XXX_Size() int {
 	return xxx_messageInfo_ManualCpm.Size(m)
@@ -180,16 +187,17 @@ func (m *ManualCpv) Reset()         { *m = ManualCpv{} }
 func (m *ManualCpv) String() string { return proto.CompactTextString(m) }
 func (*ManualCpv) ProtoMessage()    {}
 func (*ManualCpv) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{4}
+	return fileDescriptor_b08e50fa745dd88c, []int{4}
 }
+
 func (m *ManualCpv) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManualCpv.Unmarshal(m, b)
 }
 func (m *ManualCpv) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManualCpv.Marshal(b, m, deterministic)
 }
-func (dst *ManualCpv) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManualCpv.Merge(dst, src)
+func (m *ManualCpv) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManualCpv.Merge(m, src)
 }
 func (m *ManualCpv) XXX_Size() int {
 	return xxx_messageInfo_ManualCpv.Size(m)
@@ -212,16 +220,17 @@ func (m *MaximizeConversions) Reset()         { *m = MaximizeConversions{} }
 func (m *MaximizeConversions) String() string { return proto.CompactTextString(m) }
 func (*MaximizeConversions) ProtoMessage()    {}
 func (*MaximizeConversions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{5}
+	return fileDescriptor_b08e50fa745dd88c, []int{5}
 }
+
 func (m *MaximizeConversions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaximizeConversions.Unmarshal(m, b)
 }
 func (m *MaximizeConversions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaximizeConversions.Marshal(b, m, deterministic)
 }
-func (dst *MaximizeConversions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaximizeConversions.Merge(dst, src)
+func (m *MaximizeConversions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaximizeConversions.Merge(m, src)
 }
 func (m *MaximizeConversions) XXX_Size() int {
 	return xxx_messageInfo_MaximizeConversions.Size(m)
@@ -250,16 +259,17 @@ func (m *MaximizeConversionValue) Reset()         { *m = MaximizeConversionValue
 func (m *MaximizeConversionValue) String() string { return proto.CompactTextString(m) }
 func (*MaximizeConversionValue) ProtoMessage()    {}
 func (*MaximizeConversionValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{6}
+	return fileDescriptor_b08e50fa745dd88c, []int{6}
 }
+
 func (m *MaximizeConversionValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaximizeConversionValue.Unmarshal(m, b)
 }
 func (m *MaximizeConversionValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaximizeConversionValue.Marshal(b, m, deterministic)
 }
-func (dst *MaximizeConversionValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaximizeConversionValue.Merge(dst, src)
+func (m *MaximizeConversionValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaximizeConversionValue.Merge(m, src)
 }
 func (m *MaximizeConversionValue) XXX_Size() int {
 	return xxx_messageInfo_MaximizeConversionValue.Size(m)
@@ -310,16 +320,17 @@ func (m *PageOnePromoted) Reset()         { *m = PageOnePromoted{} }
 func (m *PageOnePromoted) String() string { return proto.CompactTextString(m) }
 func (*PageOnePromoted) ProtoMessage()    {}
 func (*PageOnePromoted) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{7}
+	return fileDescriptor_b08e50fa745dd88c, []int{7}
 }
+
 func (m *PageOnePromoted) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PageOnePromoted.Unmarshal(m, b)
 }
 func (m *PageOnePromoted) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PageOnePromoted.Marshal(b, m, deterministic)
 }
-func (dst *PageOnePromoted) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PageOnePromoted.Merge(dst, src)
+func (m *PageOnePromoted) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PageOnePromoted.Merge(m, src)
 }
 func (m *PageOnePromoted) XXX_Size() int {
 	return xxx_messageInfo_PageOnePromoted.Size(m)
@@ -394,16 +405,17 @@ func (m *TargetCpa) Reset()         { *m = TargetCpa{} }
 func (m *TargetCpa) String() string { return proto.CompactTextString(m) }
 func (*TargetCpa) ProtoMessage()    {}
 func (*TargetCpa) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{8}
+	return fileDescriptor_b08e50fa745dd88c, []int{8}
 }
+
 func (m *TargetCpa) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetCpa.Unmarshal(m, b)
 }
 func (m *TargetCpa) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetCpa.Marshal(b, m, deterministic)
 }
-func (dst *TargetCpa) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetCpa.Merge(dst, src)
+func (m *TargetCpa) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetCpa.Merge(m, src)
 }
 func (m *TargetCpa) XXX_Size() int {
 	return xxx_messageInfo_TargetCpa.Size(m)
@@ -447,16 +459,17 @@ func (m *TargetCpm) Reset()         { *m = TargetCpm{} }
 func (m *TargetCpm) String() string { return proto.CompactTextString(m) }
 func (*TargetCpm) ProtoMessage()    {}
 func (*TargetCpm) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{9}
+	return fileDescriptor_b08e50fa745dd88c, []int{9}
 }
+
 func (m *TargetCpm) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetCpm.Unmarshal(m, b)
 }
 func (m *TargetCpm) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetCpm.Marshal(b, m, deterministic)
 }
-func (dst *TargetCpm) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetCpm.Merge(dst, src)
+func (m *TargetCpm) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetCpm.Merge(m, src)
 }
 func (m *TargetCpm) XXX_Size() int {
 	return xxx_messageInfo_TargetCpm.Size(m)
@@ -490,16 +503,17 @@ func (m *TargetImpressionShare) Reset()         { *m = TargetImpressionShare{} }
 func (m *TargetImpressionShare) String() string { return proto.CompactTextString(m) }
 func (*TargetImpressionShare) ProtoMessage()    {}
 func (*TargetImpressionShare) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{10}
+	return fileDescriptor_b08e50fa745dd88c, []int{10}
 }
+
 func (m *TargetImpressionShare) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetImpressionShare.Unmarshal(m, b)
 }
 func (m *TargetImpressionShare) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetImpressionShare.Marshal(b, m, deterministic)
 }
-func (dst *TargetImpressionShare) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetImpressionShare.Merge(dst, src)
+func (m *TargetImpressionShare) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetImpressionShare.Merge(m, src)
 }
 func (m *TargetImpressionShare) XXX_Size() int {
 	return xxx_messageInfo_TargetImpressionShare.Size(m)
@@ -564,16 +578,17 @@ func (m *TargetOutrankShare) Reset()         { *m = TargetOutrankShare{} }
 func (m *TargetOutrankShare) String() string { return proto.CompactTextString(m) }
 func (*TargetOutrankShare) ProtoMessage()    {}
 func (*TargetOutrankShare) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{11}
+	return fileDescriptor_b08e50fa745dd88c, []int{11}
 }
+
 func (m *TargetOutrankShare) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetOutrankShare.Unmarshal(m, b)
 }
 func (m *TargetOutrankShare) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetOutrankShare.Marshal(b, m, deterministic)
 }
-func (dst *TargetOutrankShare) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetOutrankShare.Merge(dst, src)
+func (m *TargetOutrankShare) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetOutrankShare.Merge(m, src)
 }
 func (m *TargetOutrankShare) XXX_Size() int {
 	return xxx_messageInfo_TargetOutrankShare.Size(m)
@@ -640,16 +655,17 @@ func (m *TargetRoas) Reset()         { *m = TargetRoas{} }
 func (m *TargetRoas) String() string { return proto.CompactTextString(m) }
 func (*TargetRoas) ProtoMessage()    {}
 func (*TargetRoas) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{12}
+	return fileDescriptor_b08e50fa745dd88c, []int{12}
 }
+
 func (m *TargetRoas) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetRoas.Unmarshal(m, b)
 }
 func (m *TargetRoas) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetRoas.Marshal(b, m, deterministic)
 }
-func (dst *TargetRoas) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetRoas.Merge(dst, src)
+func (m *TargetRoas) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetRoas.Merge(m, src)
 }
 func (m *TargetRoas) XXX_Size() int {
 	return xxx_messageInfo_TargetRoas.Size(m)
@@ -701,16 +717,17 @@ func (m *TargetSpend) Reset()         { *m = TargetSpend{} }
 func (m *TargetSpend) String() string { return proto.CompactTextString(m) }
 func (*TargetSpend) ProtoMessage()    {}
 func (*TargetSpend) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{13}
+	return fileDescriptor_b08e50fa745dd88c, []int{13}
 }
+
 func (m *TargetSpend) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetSpend.Unmarshal(m, b)
 }
 func (m *TargetSpend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetSpend.Marshal(b, m, deterministic)
 }
-func (dst *TargetSpend) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetSpend.Merge(dst, src)
+func (m *TargetSpend) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetSpend.Merge(m, src)
 }
 func (m *TargetSpend) XXX_Size() int {
 	return xxx_messageInfo_TargetSpend.Size(m)
@@ -757,16 +774,17 @@ func (m *PercentCpc) Reset()         { *m = PercentCpc{} }
 func (m *PercentCpc) String() string { return proto.CompactTextString(m) }
 func (*PercentCpc) ProtoMessage()    {}
 func (*PercentCpc) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_646e34114a6c9f78, []int{14}
+	return fileDescriptor_b08e50fa745dd88c, []int{14}
 }
+
 func (m *PercentCpc) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PercentCpc.Unmarshal(m, b)
 }
 func (m *PercentCpc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PercentCpc.Marshal(b, m, deterministic)
 }
-func (dst *PercentCpc) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PercentCpc.Merge(dst, src)
+func (m *PercentCpc) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PercentCpc.Merge(m, src)
 }
 func (m *PercentCpc) XXX_Size() int {
 	return xxx_messageInfo_PercentCpc.Size(m)
@@ -810,10 +828,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/bidding.proto", fileDescriptor_bidding_646e34114a6c9f78)
+	proto.RegisterFile("google/ads/googleads/v1/common/bidding.proto", fileDescriptor_b08e50fa745dd88c)
 }
 
-var fileDescriptor_bidding_646e34114a6c9f78 = []byte{
+var fileDescriptor_b08e50fa745dd88c = []byte{
 	// 951 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0x51, 0x6f, 0x1b, 0x45,
 	0x10, 0x80, 0x65, 0xbb, 0xad, 0xe8, 0x3a, 0xa5, 0xe4, 0x92, 0x06, 0x2b, 0xad, 0xaa, 0xea, 0x24,
diff --git a/googleapis/ads/googleads/v1/common/click_location.pb.go b/googleapis/ads/googleads/v1/common/click_location.pb.go
index 9fefc61d04..28b135782f 100644
--- a/googleapis/ads/googleads/v1/common/click_location.pb.go
+++ b/googleapis/ads/googleads/v1/common/click_location.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/click_location.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Location criteria associated with a click.
 type ClickLocation struct {
@@ -41,16 +44,17 @@ func (m *ClickLocation) Reset()         { *m = ClickLocation{} }
 func (m *ClickLocation) String() string { return proto.CompactTextString(m) }
 func (*ClickLocation) ProtoMessage()    {}
 func (*ClickLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_click_location_19655ed14d26d9e2, []int{0}
+	return fileDescriptor_68f6b7e96a137729, []int{0}
 }
+
 func (m *ClickLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClickLocation.Unmarshal(m, b)
 }
 func (m *ClickLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClickLocation.Marshal(b, m, deterministic)
 }
-func (dst *ClickLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClickLocation.Merge(dst, src)
+func (m *ClickLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClickLocation.Merge(m, src)
 }
 func (m *ClickLocation) XXX_Size() int {
 	return xxx_messageInfo_ClickLocation.Size(m)
@@ -101,10 +105,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/click_location.proto", fileDescriptor_click_location_19655ed14d26d9e2)
+	proto.RegisterFile("google/ads/googleads/v1/common/click_location.proto", fileDescriptor_68f6b7e96a137729)
 }
 
-var fileDescriptor_click_location_19655ed14d26d9e2 = []byte{
+var fileDescriptor_68f6b7e96a137729 = []byte{
 	// 354 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xbf, 0x6a, 0xeb, 0x30,
 	0x14, 0xc6, 0xb1, 0xf3, 0xe7, 0x82, 0xee, 0xcd, 0xe2, 0xc9, 0x84, 0x10, 0x2e, 0x99, 0xee, 0x24,
diff --git a/googleapis/ads/googleads/v1/common/criteria.pb.go b/googleapis/ads/googleads/v1/common/criteria.pb.go
index 1337a0720d..474f5ce0fb 100644
--- a/googleapis/ads/googleads/v1/common/criteria.pb.go
+++ b/googleapis/ads/googleads/v1/common/criteria.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/criteria.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A keyword criterion.
 type KeywordInfo struct {
@@ -36,16 +39,17 @@ func (m *KeywordInfo) Reset()         { *m = KeywordInfo{} }
 func (m *KeywordInfo) String() string { return proto.CompactTextString(m) }
 func (*KeywordInfo) ProtoMessage()    {}
 func (*KeywordInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{0}
+	return fileDescriptor_90481ed808a2095c, []int{0}
 }
+
 func (m *KeywordInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordInfo.Unmarshal(m, b)
 }
 func (m *KeywordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordInfo.Marshal(b, m, deterministic)
 }
-func (dst *KeywordInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordInfo.Merge(dst, src)
+func (m *KeywordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordInfo.Merge(m, src)
 }
 func (m *KeywordInfo) XXX_Size() int {
 	return xxx_messageInfo_KeywordInfo.Size(m)
@@ -86,16 +90,17 @@ func (m *PlacementInfo) Reset()         { *m = PlacementInfo{} }
 func (m *PlacementInfo) String() string { return proto.CompactTextString(m) }
 func (*PlacementInfo) ProtoMessage()    {}
 func (*PlacementInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{1}
+	return fileDescriptor_90481ed808a2095c, []int{1}
 }
+
 func (m *PlacementInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlacementInfo.Unmarshal(m, b)
 }
 func (m *PlacementInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlacementInfo.Marshal(b, m, deterministic)
 }
-func (dst *PlacementInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlacementInfo.Merge(dst, src)
+func (m *PlacementInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlacementInfo.Merge(m, src)
 }
 func (m *PlacementInfo) XXX_Size() int {
 	return xxx_messageInfo_PlacementInfo.Size(m)
@@ -126,16 +131,17 @@ func (m *MobileAppCategoryInfo) Reset()         { *m = MobileAppCategoryInfo{} }
 func (m *MobileAppCategoryInfo) String() string { return proto.CompactTextString(m) }
 func (*MobileAppCategoryInfo) ProtoMessage()    {}
 func (*MobileAppCategoryInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{2}
+	return fileDescriptor_90481ed808a2095c, []int{2}
 }
+
 func (m *MobileAppCategoryInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MobileAppCategoryInfo.Unmarshal(m, b)
 }
 func (m *MobileAppCategoryInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MobileAppCategoryInfo.Marshal(b, m, deterministic)
 }
-func (dst *MobileAppCategoryInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MobileAppCategoryInfo.Merge(dst, src)
+func (m *MobileAppCategoryInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MobileAppCategoryInfo.Merge(m, src)
 }
 func (m *MobileAppCategoryInfo) XXX_Size() int {
 	return xxx_messageInfo_MobileAppCategoryInfo.Size(m)
@@ -181,16 +187,17 @@ func (m *MobileApplicationInfo) Reset()         { *m = MobileApplicationInfo{} }
 func (m *MobileApplicationInfo) String() string { return proto.CompactTextString(m) }
 func (*MobileApplicationInfo) ProtoMessage()    {}
 func (*MobileApplicationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{3}
+	return fileDescriptor_90481ed808a2095c, []int{3}
 }
+
 func (m *MobileApplicationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MobileApplicationInfo.Unmarshal(m, b)
 }
 func (m *MobileApplicationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MobileApplicationInfo.Marshal(b, m, deterministic)
 }
-func (dst *MobileApplicationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MobileApplicationInfo.Merge(dst, src)
+func (m *MobileApplicationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MobileApplicationInfo.Merge(m, src)
 }
 func (m *MobileApplicationInfo) XXX_Size() int {
 	return xxx_messageInfo_MobileApplicationInfo.Size(m)
@@ -228,16 +235,17 @@ func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
 func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
 func (*LocationInfo) ProtoMessage()    {}
 func (*LocationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{4}
+	return fileDescriptor_90481ed808a2095c, []int{4}
 }
+
 func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
 }
 func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
 }
-func (dst *LocationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationInfo.Merge(dst, src)
+func (m *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(m, src)
 }
 func (m *LocationInfo) XXX_Size() int {
 	return xxx_messageInfo_LocationInfo.Size(m)
@@ -268,16 +276,17 @@ func (m *DeviceInfo) Reset()         { *m = DeviceInfo{} }
 func (m *DeviceInfo) String() string { return proto.CompactTextString(m) }
 func (*DeviceInfo) ProtoMessage()    {}
 func (*DeviceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{5}
+	return fileDescriptor_90481ed808a2095c, []int{5}
 }
+
 func (m *DeviceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceInfo.Unmarshal(m, b)
 }
 func (m *DeviceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceInfo.Marshal(b, m, deterministic)
 }
-func (dst *DeviceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceInfo.Merge(dst, src)
+func (m *DeviceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceInfo.Merge(m, src)
 }
 func (m *DeviceInfo) XXX_Size() int {
 	return xxx_messageInfo_DeviceInfo.Size(m)
@@ -308,16 +317,17 @@ func (m *PreferredContentInfo) Reset()         { *m = PreferredContentInfo{} }
 func (m *PreferredContentInfo) String() string { return proto.CompactTextString(m) }
 func (*PreferredContentInfo) ProtoMessage()    {}
 func (*PreferredContentInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{6}
+	return fileDescriptor_90481ed808a2095c, []int{6}
 }
+
 func (m *PreferredContentInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PreferredContentInfo.Unmarshal(m, b)
 }
 func (m *PreferredContentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PreferredContentInfo.Marshal(b, m, deterministic)
 }
-func (dst *PreferredContentInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PreferredContentInfo.Merge(dst, src)
+func (m *PreferredContentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PreferredContentInfo.Merge(m, src)
 }
 func (m *PreferredContentInfo) XXX_Size() int {
 	return xxx_messageInfo_PreferredContentInfo.Size(m)
@@ -354,16 +364,17 @@ func (m *ListingGroupInfo) Reset()         { *m = ListingGroupInfo{} }
 func (m *ListingGroupInfo) String() string { return proto.CompactTextString(m) }
 func (*ListingGroupInfo) ProtoMessage()    {}
 func (*ListingGroupInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{7}
+	return fileDescriptor_90481ed808a2095c, []int{7}
 }
+
 func (m *ListingGroupInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListingGroupInfo.Unmarshal(m, b)
 }
 func (m *ListingGroupInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListingGroupInfo.Marshal(b, m, deterministic)
 }
-func (dst *ListingGroupInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListingGroupInfo.Merge(dst, src)
+func (m *ListingGroupInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListingGroupInfo.Merge(m, src)
 }
 func (m *ListingGroupInfo) XXX_Size() int {
 	return xxx_messageInfo_ListingGroupInfo.Size(m)
@@ -408,16 +419,17 @@ func (m *ListingScopeInfo) Reset()         { *m = ListingScopeInfo{} }
 func (m *ListingScopeInfo) String() string { return proto.CompactTextString(m) }
 func (*ListingScopeInfo) ProtoMessage()    {}
 func (*ListingScopeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{8}
+	return fileDescriptor_90481ed808a2095c, []int{8}
 }
+
 func (m *ListingScopeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListingScopeInfo.Unmarshal(m, b)
 }
 func (m *ListingScopeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListingScopeInfo.Marshal(b, m, deterministic)
 }
-func (dst *ListingScopeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListingScopeInfo.Merge(dst, src)
+func (m *ListingScopeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListingScopeInfo.Merge(m, src)
 }
 func (m *ListingScopeInfo) XXX_Size() int {
 	return xxx_messageInfo_ListingScopeInfo.Size(m)
@@ -464,16 +476,17 @@ func (m *ListingDimensionInfo) Reset()         { *m = ListingDimensionInfo{} }
 func (m *ListingDimensionInfo) String() string { return proto.CompactTextString(m) }
 func (*ListingDimensionInfo) ProtoMessage()    {}
 func (*ListingDimensionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{9}
+	return fileDescriptor_90481ed808a2095c, []int{9}
 }
+
 func (m *ListingDimensionInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListingDimensionInfo.Unmarshal(m, b)
 }
 func (m *ListingDimensionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListingDimensionInfo.Marshal(b, m, deterministic)
 }
-func (dst *ListingDimensionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListingDimensionInfo.Merge(dst, src)
+func (m *ListingDimensionInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListingDimensionInfo.Merge(m, src)
 }
 func (m *ListingDimensionInfo) XXX_Size() int {
 	return xxx_messageInfo_ListingDimensionInfo.Size(m)
@@ -677,9 +690,9 @@ func (m *ListingDimensionInfo) GetUnknownListingDimension() *UnknownListingDimen
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListingDimensionInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListingDimensionInfo_OneofMarshaler, _ListingDimensionInfo_OneofUnmarshaler, _ListingDimensionInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListingDimensionInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListingDimensionInfo_ListingBrand)(nil),
 		(*ListingDimensionInfo_HotelId)(nil),
 		(*ListingDimensionInfo_HotelClass)(nil),
@@ -697,288 +710,6 @@ func (*ListingDimensionInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.
 	}
 }
 
-func _ListingDimensionInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListingDimensionInfo)
-	// dimension
-	switch x := m.Dimension.(type) {
-	case *ListingDimensionInfo_ListingBrand:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListingBrand); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_HotelId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelId); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_HotelClass:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelClass); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_HotelCountryRegion:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelCountryRegion); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_HotelState:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelState); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_HotelCity:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelCity); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_ListingCustomAttribute:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListingCustomAttribute); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_ProductBiddingCategory:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProductBiddingCategory); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_ProductChannel:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProductChannel); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_ProductChannelExclusivity:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProductChannelExclusivity); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_ProductCondition:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProductCondition); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_ProductItemId:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProductItemId); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_ProductType:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProductType); err != nil {
-			return err
-		}
-	case *ListingDimensionInfo_UnknownListingDimension:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UnknownListingDimension); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ListingDimensionInfo.Dimension has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListingDimensionInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListingDimensionInfo)
-	switch tag {
-	case 1: // dimension.listing_brand
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ListingBrandInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ListingBrand{msg}
-		return true, err
-	case 2: // dimension.hotel_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HotelIdInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_HotelId{msg}
-		return true, err
-	case 3: // dimension.hotel_class
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HotelClassInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_HotelClass{msg}
-		return true, err
-	case 4: // dimension.hotel_country_region
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HotelCountryRegionInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_HotelCountryRegion{msg}
-		return true, err
-	case 5: // dimension.hotel_state
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HotelStateInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_HotelState{msg}
-		return true, err
-	case 6: // dimension.hotel_city
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HotelCityInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_HotelCity{msg}
-		return true, err
-	case 7: // dimension.listing_custom_attribute
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ListingCustomAttributeInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ListingCustomAttribute{msg}
-		return true, err
-	case 13: // dimension.product_bidding_category
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProductBiddingCategoryInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ProductBiddingCategory{msg}
-		return true, err
-	case 8: // dimension.product_channel
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProductChannelInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ProductChannel{msg}
-		return true, err
-	case 9: // dimension.product_channel_exclusivity
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProductChannelExclusivityInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ProductChannelExclusivity{msg}
-		return true, err
-	case 10: // dimension.product_condition
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProductConditionInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ProductCondition{msg}
-		return true, err
-	case 11: // dimension.product_item_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProductItemIdInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ProductItemId{msg}
-		return true, err
-	case 12: // dimension.product_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProductTypeInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_ProductType{msg}
-		return true, err
-	case 14: // dimension.unknown_listing_dimension
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UnknownListingDimensionInfo)
-		err := b.DecodeMessage(msg)
-		m.Dimension = &ListingDimensionInfo_UnknownListingDimension{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListingDimensionInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListingDimensionInfo)
-	// dimension
-	switch x := m.Dimension.(type) {
-	case *ListingDimensionInfo_ListingBrand:
-		s := proto.Size(x.ListingBrand)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_HotelId:
-		s := proto.Size(x.HotelId)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_HotelClass:
-		s := proto.Size(x.HotelClass)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_HotelCountryRegion:
-		s := proto.Size(x.HotelCountryRegion)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_HotelState:
-		s := proto.Size(x.HotelState)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_HotelCity:
-		s := proto.Size(x.HotelCity)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_ListingCustomAttribute:
-		s := proto.Size(x.ListingCustomAttribute)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_ProductBiddingCategory:
-		s := proto.Size(x.ProductBiddingCategory)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_ProductChannel:
-		s := proto.Size(x.ProductChannel)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_ProductChannelExclusivity:
-		s := proto.Size(x.ProductChannelExclusivity)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_ProductCondition:
-		s := proto.Size(x.ProductCondition)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_ProductItemId:
-		s := proto.Size(x.ProductItemId)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_ProductType:
-		s := proto.Size(x.ProductType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListingDimensionInfo_UnknownListingDimension:
-		s := proto.Size(x.UnknownListingDimension)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Brand of the listing.
 type ListingBrandInfo struct {
 	// String value of the listing brand.
@@ -992,16 +723,17 @@ func (m *ListingBrandInfo) Reset()         { *m = ListingBrandInfo{} }
 func (m *ListingBrandInfo) String() string { return proto.CompactTextString(m) }
 func (*ListingBrandInfo) ProtoMessage()    {}
 func (*ListingBrandInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{10}
+	return fileDescriptor_90481ed808a2095c, []int{10}
 }
+
 func (m *ListingBrandInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListingBrandInfo.Unmarshal(m, b)
 }
 func (m *ListingBrandInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListingBrandInfo.Marshal(b, m, deterministic)
 }
-func (dst *ListingBrandInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListingBrandInfo.Merge(dst, src)
+func (m *ListingBrandInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListingBrandInfo.Merge(m, src)
 }
 func (m *ListingBrandInfo) XXX_Size() int {
 	return xxx_messageInfo_ListingBrandInfo.Size(m)
@@ -1032,16 +764,17 @@ func (m *HotelIdInfo) Reset()         { *m = HotelIdInfo{} }
 func (m *HotelIdInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelIdInfo) ProtoMessage()    {}
 func (*HotelIdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{11}
+	return fileDescriptor_90481ed808a2095c, []int{11}
 }
+
 func (m *HotelIdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelIdInfo.Unmarshal(m, b)
 }
 func (m *HotelIdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelIdInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelIdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelIdInfo.Merge(dst, src)
+func (m *HotelIdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelIdInfo.Merge(m, src)
 }
 func (m *HotelIdInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelIdInfo.Size(m)
@@ -1072,16 +805,17 @@ func (m *HotelClassInfo) Reset()         { *m = HotelClassInfo{} }
 func (m *HotelClassInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelClassInfo) ProtoMessage()    {}
 func (*HotelClassInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{12}
+	return fileDescriptor_90481ed808a2095c, []int{12}
 }
+
 func (m *HotelClassInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelClassInfo.Unmarshal(m, b)
 }
 func (m *HotelClassInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelClassInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelClassInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelClassInfo.Merge(dst, src)
+func (m *HotelClassInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelClassInfo.Merge(m, src)
 }
 func (m *HotelClassInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelClassInfo.Size(m)
@@ -1112,16 +846,17 @@ func (m *HotelCountryRegionInfo) Reset()         { *m = HotelCountryRegionInfo{}
 func (m *HotelCountryRegionInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelCountryRegionInfo) ProtoMessage()    {}
 func (*HotelCountryRegionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{13}
+	return fileDescriptor_90481ed808a2095c, []int{13}
 }
+
 func (m *HotelCountryRegionInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelCountryRegionInfo.Unmarshal(m, b)
 }
 func (m *HotelCountryRegionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelCountryRegionInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelCountryRegionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelCountryRegionInfo.Merge(dst, src)
+func (m *HotelCountryRegionInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelCountryRegionInfo.Merge(m, src)
 }
 func (m *HotelCountryRegionInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelCountryRegionInfo.Size(m)
@@ -1152,16 +887,17 @@ func (m *HotelStateInfo) Reset()         { *m = HotelStateInfo{} }
 func (m *HotelStateInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelStateInfo) ProtoMessage()    {}
 func (*HotelStateInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{14}
+	return fileDescriptor_90481ed808a2095c, []int{14}
 }
+
 func (m *HotelStateInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelStateInfo.Unmarshal(m, b)
 }
 func (m *HotelStateInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelStateInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelStateInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelStateInfo.Merge(dst, src)
+func (m *HotelStateInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelStateInfo.Merge(m, src)
 }
 func (m *HotelStateInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelStateInfo.Size(m)
@@ -1192,16 +928,17 @@ func (m *HotelCityInfo) Reset()         { *m = HotelCityInfo{} }
 func (m *HotelCityInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelCityInfo) ProtoMessage()    {}
 func (*HotelCityInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{15}
+	return fileDescriptor_90481ed808a2095c, []int{15}
 }
+
 func (m *HotelCityInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelCityInfo.Unmarshal(m, b)
 }
 func (m *HotelCityInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelCityInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelCityInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelCityInfo.Merge(dst, src)
+func (m *HotelCityInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelCityInfo.Merge(m, src)
 }
 func (m *HotelCityInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelCityInfo.Size(m)
@@ -1234,16 +971,17 @@ func (m *ListingCustomAttributeInfo) Reset()         { *m = ListingCustomAttribu
 func (m *ListingCustomAttributeInfo) String() string { return proto.CompactTextString(m) }
 func (*ListingCustomAttributeInfo) ProtoMessage()    {}
 func (*ListingCustomAttributeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{16}
+	return fileDescriptor_90481ed808a2095c, []int{16}
 }
+
 func (m *ListingCustomAttributeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListingCustomAttributeInfo.Unmarshal(m, b)
 }
 func (m *ListingCustomAttributeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListingCustomAttributeInfo.Marshal(b, m, deterministic)
 }
-func (dst *ListingCustomAttributeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListingCustomAttributeInfo.Merge(dst, src)
+func (m *ListingCustomAttributeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListingCustomAttributeInfo.Merge(m, src)
 }
 func (m *ListingCustomAttributeInfo) XXX_Size() int {
 	return xxx_messageInfo_ListingCustomAttributeInfo.Size(m)
@@ -1289,16 +1027,17 @@ func (m *ProductBiddingCategoryInfo) Reset()         { *m = ProductBiddingCatego
 func (m *ProductBiddingCategoryInfo) String() string { return proto.CompactTextString(m) }
 func (*ProductBiddingCategoryInfo) ProtoMessage()    {}
 func (*ProductBiddingCategoryInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{17}
+	return fileDescriptor_90481ed808a2095c, []int{17}
 }
+
 func (m *ProductBiddingCategoryInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductBiddingCategoryInfo.Unmarshal(m, b)
 }
 func (m *ProductBiddingCategoryInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductBiddingCategoryInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProductBiddingCategoryInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductBiddingCategoryInfo.Merge(dst, src)
+func (m *ProductBiddingCategoryInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductBiddingCategoryInfo.Merge(m, src)
 }
 func (m *ProductBiddingCategoryInfo) XXX_Size() int {
 	return xxx_messageInfo_ProductBiddingCategoryInfo.Size(m)
@@ -1343,16 +1082,17 @@ func (m *ProductChannelInfo) Reset()         { *m = ProductChannelInfo{} }
 func (m *ProductChannelInfo) String() string { return proto.CompactTextString(m) }
 func (*ProductChannelInfo) ProtoMessage()    {}
 func (*ProductChannelInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{18}
+	return fileDescriptor_90481ed808a2095c, []int{18}
 }
+
 func (m *ProductChannelInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductChannelInfo.Unmarshal(m, b)
 }
 func (m *ProductChannelInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductChannelInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProductChannelInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductChannelInfo.Merge(dst, src)
+func (m *ProductChannelInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductChannelInfo.Merge(m, src)
 }
 func (m *ProductChannelInfo) XXX_Size() int {
 	return xxx_messageInfo_ProductChannelInfo.Size(m)
@@ -1383,16 +1123,17 @@ func (m *ProductChannelExclusivityInfo) Reset()         { *m = ProductChannelExc
 func (m *ProductChannelExclusivityInfo) String() string { return proto.CompactTextString(m) }
 func (*ProductChannelExclusivityInfo) ProtoMessage()    {}
 func (*ProductChannelExclusivityInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{19}
+	return fileDescriptor_90481ed808a2095c, []int{19}
 }
+
 func (m *ProductChannelExclusivityInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductChannelExclusivityInfo.Unmarshal(m, b)
 }
 func (m *ProductChannelExclusivityInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductChannelExclusivityInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProductChannelExclusivityInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductChannelExclusivityInfo.Merge(dst, src)
+func (m *ProductChannelExclusivityInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductChannelExclusivityInfo.Merge(m, src)
 }
 func (m *ProductChannelExclusivityInfo) XXX_Size() int {
 	return xxx_messageInfo_ProductChannelExclusivityInfo.Size(m)
@@ -1423,16 +1164,17 @@ func (m *ProductConditionInfo) Reset()         { *m = ProductConditionInfo{} }
 func (m *ProductConditionInfo) String() string { return proto.CompactTextString(m) }
 func (*ProductConditionInfo) ProtoMessage()    {}
 func (*ProductConditionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{20}
+	return fileDescriptor_90481ed808a2095c, []int{20}
 }
+
 func (m *ProductConditionInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductConditionInfo.Unmarshal(m, b)
 }
 func (m *ProductConditionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductConditionInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProductConditionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductConditionInfo.Merge(dst, src)
+func (m *ProductConditionInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductConditionInfo.Merge(m, src)
 }
 func (m *ProductConditionInfo) XXX_Size() int {
 	return xxx_messageInfo_ProductConditionInfo.Size(m)
@@ -1463,16 +1205,17 @@ func (m *ProductItemIdInfo) Reset()         { *m = ProductItemIdInfo{} }
 func (m *ProductItemIdInfo) String() string { return proto.CompactTextString(m) }
 func (*ProductItemIdInfo) ProtoMessage()    {}
 func (*ProductItemIdInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{21}
+	return fileDescriptor_90481ed808a2095c, []int{21}
 }
+
 func (m *ProductItemIdInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductItemIdInfo.Unmarshal(m, b)
 }
 func (m *ProductItemIdInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductItemIdInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProductItemIdInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductItemIdInfo.Merge(dst, src)
+func (m *ProductItemIdInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductItemIdInfo.Merge(m, src)
 }
 func (m *ProductItemIdInfo) XXX_Size() int {
 	return xxx_messageInfo_ProductItemIdInfo.Size(m)
@@ -1505,16 +1248,17 @@ func (m *ProductTypeInfo) Reset()         { *m = ProductTypeInfo{} }
 func (m *ProductTypeInfo) String() string { return proto.CompactTextString(m) }
 func (*ProductTypeInfo) ProtoMessage()    {}
 func (*ProductTypeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{22}
+	return fileDescriptor_90481ed808a2095c, []int{22}
 }
+
 func (m *ProductTypeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductTypeInfo.Unmarshal(m, b)
 }
 func (m *ProductTypeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductTypeInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProductTypeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductTypeInfo.Merge(dst, src)
+func (m *ProductTypeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductTypeInfo.Merge(m, src)
 }
 func (m *ProductTypeInfo) XXX_Size() int {
 	return xxx_messageInfo_ProductTypeInfo.Size(m)
@@ -1550,16 +1294,17 @@ func (m *UnknownListingDimensionInfo) Reset()         { *m = UnknownListingDimen
 func (m *UnknownListingDimensionInfo) String() string { return proto.CompactTextString(m) }
 func (*UnknownListingDimensionInfo) ProtoMessage()    {}
 func (*UnknownListingDimensionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{23}
+	return fileDescriptor_90481ed808a2095c, []int{23}
 }
+
 func (m *UnknownListingDimensionInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnknownListingDimensionInfo.Unmarshal(m, b)
 }
 func (m *UnknownListingDimensionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UnknownListingDimensionInfo.Marshal(b, m, deterministic)
 }
-func (dst *UnknownListingDimensionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UnknownListingDimensionInfo.Merge(dst, src)
+func (m *UnknownListingDimensionInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnknownListingDimensionInfo.Merge(m, src)
 }
 func (m *UnknownListingDimensionInfo) XXX_Size() int {
 	return xxx_messageInfo_UnknownListingDimensionInfo.Size(m)
@@ -1583,16 +1328,17 @@ func (m *HotelDateSelectionTypeInfo) Reset()         { *m = HotelDateSelectionTy
 func (m *HotelDateSelectionTypeInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelDateSelectionTypeInfo) ProtoMessage()    {}
 func (*HotelDateSelectionTypeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{24}
+	return fileDescriptor_90481ed808a2095c, []int{24}
 }
+
 func (m *HotelDateSelectionTypeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelDateSelectionTypeInfo.Unmarshal(m, b)
 }
 func (m *HotelDateSelectionTypeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelDateSelectionTypeInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelDateSelectionTypeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelDateSelectionTypeInfo.Merge(dst, src)
+func (m *HotelDateSelectionTypeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelDateSelectionTypeInfo.Merge(m, src)
 }
 func (m *HotelDateSelectionTypeInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelDateSelectionTypeInfo.Size(m)
@@ -1625,16 +1371,17 @@ func (m *HotelAdvanceBookingWindowInfo) Reset()         { *m = HotelAdvanceBooki
 func (m *HotelAdvanceBookingWindowInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelAdvanceBookingWindowInfo) ProtoMessage()    {}
 func (*HotelAdvanceBookingWindowInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{25}
+	return fileDescriptor_90481ed808a2095c, []int{25}
 }
+
 func (m *HotelAdvanceBookingWindowInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelAdvanceBookingWindowInfo.Unmarshal(m, b)
 }
 func (m *HotelAdvanceBookingWindowInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelAdvanceBookingWindowInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelAdvanceBookingWindowInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelAdvanceBookingWindowInfo.Merge(dst, src)
+func (m *HotelAdvanceBookingWindowInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelAdvanceBookingWindowInfo.Merge(m, src)
 }
 func (m *HotelAdvanceBookingWindowInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelAdvanceBookingWindowInfo.Size(m)
@@ -1674,16 +1421,17 @@ func (m *HotelLengthOfStayInfo) Reset()         { *m = HotelLengthOfStayInfo{} }
 func (m *HotelLengthOfStayInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelLengthOfStayInfo) ProtoMessage()    {}
 func (*HotelLengthOfStayInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{26}
+	return fileDescriptor_90481ed808a2095c, []int{26}
 }
+
 func (m *HotelLengthOfStayInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelLengthOfStayInfo.Unmarshal(m, b)
 }
 func (m *HotelLengthOfStayInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelLengthOfStayInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelLengthOfStayInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelLengthOfStayInfo.Merge(dst, src)
+func (m *HotelLengthOfStayInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelLengthOfStayInfo.Merge(m, src)
 }
 func (m *HotelLengthOfStayInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelLengthOfStayInfo.Size(m)
@@ -1721,16 +1469,17 @@ func (m *HotelCheckInDayInfo) Reset()         { *m = HotelCheckInDayInfo{} }
 func (m *HotelCheckInDayInfo) String() string { return proto.CompactTextString(m) }
 func (*HotelCheckInDayInfo) ProtoMessage()    {}
 func (*HotelCheckInDayInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{27}
+	return fileDescriptor_90481ed808a2095c, []int{27}
 }
+
 func (m *HotelCheckInDayInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelCheckInDayInfo.Unmarshal(m, b)
 }
 func (m *HotelCheckInDayInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelCheckInDayInfo.Marshal(b, m, deterministic)
 }
-func (dst *HotelCheckInDayInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelCheckInDayInfo.Merge(dst, src)
+func (m *HotelCheckInDayInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelCheckInDayInfo.Merge(m, src)
 }
 func (m *HotelCheckInDayInfo) XXX_Size() int {
 	return xxx_messageInfo_HotelCheckInDayInfo.Size(m)
@@ -1761,16 +1510,17 @@ func (m *InteractionTypeInfo) Reset()         { *m = InteractionTypeInfo{} }
 func (m *InteractionTypeInfo) String() string { return proto.CompactTextString(m) }
 func (*InteractionTypeInfo) ProtoMessage()    {}
 func (*InteractionTypeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{28}
+	return fileDescriptor_90481ed808a2095c, []int{28}
 }
+
 func (m *InteractionTypeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InteractionTypeInfo.Unmarshal(m, b)
 }
 func (m *InteractionTypeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InteractionTypeInfo.Marshal(b, m, deterministic)
 }
-func (dst *InteractionTypeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InteractionTypeInfo.Merge(dst, src)
+func (m *InteractionTypeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InteractionTypeInfo.Merge(m, src)
 }
 func (m *InteractionTypeInfo) XXX_Size() int {
 	return xxx_messageInfo_InteractionTypeInfo.Size(m)
@@ -1832,16 +1582,17 @@ func (m *AdScheduleInfo) Reset()         { *m = AdScheduleInfo{} }
 func (m *AdScheduleInfo) String() string { return proto.CompactTextString(m) }
 func (*AdScheduleInfo) ProtoMessage()    {}
 func (*AdScheduleInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{29}
+	return fileDescriptor_90481ed808a2095c, []int{29}
 }
+
 func (m *AdScheduleInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdScheduleInfo.Unmarshal(m, b)
 }
 func (m *AdScheduleInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdScheduleInfo.Marshal(b, m, deterministic)
 }
-func (dst *AdScheduleInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdScheduleInfo.Merge(dst, src)
+func (m *AdScheduleInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdScheduleInfo.Merge(m, src)
 }
 func (m *AdScheduleInfo) XXX_Size() int {
 	return xxx_messageInfo_AdScheduleInfo.Size(m)
@@ -1900,16 +1651,17 @@ func (m *AgeRangeInfo) Reset()         { *m = AgeRangeInfo{} }
 func (m *AgeRangeInfo) String() string { return proto.CompactTextString(m) }
 func (*AgeRangeInfo) ProtoMessage()    {}
 func (*AgeRangeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{30}
+	return fileDescriptor_90481ed808a2095c, []int{30}
 }
+
 func (m *AgeRangeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AgeRangeInfo.Unmarshal(m, b)
 }
 func (m *AgeRangeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AgeRangeInfo.Marshal(b, m, deterministic)
 }
-func (dst *AgeRangeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AgeRangeInfo.Merge(dst, src)
+func (m *AgeRangeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AgeRangeInfo.Merge(m, src)
 }
 func (m *AgeRangeInfo) XXX_Size() int {
 	return xxx_messageInfo_AgeRangeInfo.Size(m)
@@ -1940,16 +1692,17 @@ func (m *GenderInfo) Reset()         { *m = GenderInfo{} }
 func (m *GenderInfo) String() string { return proto.CompactTextString(m) }
 func (*GenderInfo) ProtoMessage()    {}
 func (*GenderInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{31}
+	return fileDescriptor_90481ed808a2095c, []int{31}
 }
+
 func (m *GenderInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenderInfo.Unmarshal(m, b)
 }
 func (m *GenderInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenderInfo.Marshal(b, m, deterministic)
 }
-func (dst *GenderInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenderInfo.Merge(dst, src)
+func (m *GenderInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenderInfo.Merge(m, src)
 }
 func (m *GenderInfo) XXX_Size() int {
 	return xxx_messageInfo_GenderInfo.Size(m)
@@ -1980,16 +1733,17 @@ func (m *IncomeRangeInfo) Reset()         { *m = IncomeRangeInfo{} }
 func (m *IncomeRangeInfo) String() string { return proto.CompactTextString(m) }
 func (*IncomeRangeInfo) ProtoMessage()    {}
 func (*IncomeRangeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{32}
+	return fileDescriptor_90481ed808a2095c, []int{32}
 }
+
 func (m *IncomeRangeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IncomeRangeInfo.Unmarshal(m, b)
 }
 func (m *IncomeRangeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IncomeRangeInfo.Marshal(b, m, deterministic)
 }
-func (dst *IncomeRangeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IncomeRangeInfo.Merge(dst, src)
+func (m *IncomeRangeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IncomeRangeInfo.Merge(m, src)
 }
 func (m *IncomeRangeInfo) XXX_Size() int {
 	return xxx_messageInfo_IncomeRangeInfo.Size(m)
@@ -2020,16 +1774,17 @@ func (m *ParentalStatusInfo) Reset()         { *m = ParentalStatusInfo{} }
 func (m *ParentalStatusInfo) String() string { return proto.CompactTextString(m) }
 func (*ParentalStatusInfo) ProtoMessage()    {}
 func (*ParentalStatusInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{33}
+	return fileDescriptor_90481ed808a2095c, []int{33}
 }
+
 func (m *ParentalStatusInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParentalStatusInfo.Unmarshal(m, b)
 }
 func (m *ParentalStatusInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParentalStatusInfo.Marshal(b, m, deterministic)
 }
-func (dst *ParentalStatusInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParentalStatusInfo.Merge(dst, src)
+func (m *ParentalStatusInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParentalStatusInfo.Merge(m, src)
 }
 func (m *ParentalStatusInfo) XXX_Size() int {
 	return xxx_messageInfo_ParentalStatusInfo.Size(m)
@@ -2060,16 +1815,17 @@ func (m *YouTubeVideoInfo) Reset()         { *m = YouTubeVideoInfo{} }
 func (m *YouTubeVideoInfo) String() string { return proto.CompactTextString(m) }
 func (*YouTubeVideoInfo) ProtoMessage()    {}
 func (*YouTubeVideoInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{34}
+	return fileDescriptor_90481ed808a2095c, []int{34}
 }
+
 func (m *YouTubeVideoInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_YouTubeVideoInfo.Unmarshal(m, b)
 }
 func (m *YouTubeVideoInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_YouTubeVideoInfo.Marshal(b, m, deterministic)
 }
-func (dst *YouTubeVideoInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_YouTubeVideoInfo.Merge(dst, src)
+func (m *YouTubeVideoInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YouTubeVideoInfo.Merge(m, src)
 }
 func (m *YouTubeVideoInfo) XXX_Size() int {
 	return xxx_messageInfo_YouTubeVideoInfo.Size(m)
@@ -2100,16 +1856,17 @@ func (m *YouTubeChannelInfo) Reset()         { *m = YouTubeChannelInfo{} }
 func (m *YouTubeChannelInfo) String() string { return proto.CompactTextString(m) }
 func (*YouTubeChannelInfo) ProtoMessage()    {}
 func (*YouTubeChannelInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{35}
+	return fileDescriptor_90481ed808a2095c, []int{35}
 }
+
 func (m *YouTubeChannelInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_YouTubeChannelInfo.Unmarshal(m, b)
 }
 func (m *YouTubeChannelInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_YouTubeChannelInfo.Marshal(b, m, deterministic)
 }
-func (dst *YouTubeChannelInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_YouTubeChannelInfo.Merge(dst, src)
+func (m *YouTubeChannelInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YouTubeChannelInfo.Merge(m, src)
 }
 func (m *YouTubeChannelInfo) XXX_Size() int {
 	return xxx_messageInfo_YouTubeChannelInfo.Size(m)
@@ -2141,16 +1898,17 @@ func (m *UserListInfo) Reset()         { *m = UserListInfo{} }
 func (m *UserListInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListInfo) ProtoMessage()    {}
 func (*UserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{36}
+	return fileDescriptor_90481ed808a2095c, []int{36}
 }
+
 func (m *UserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListInfo.Unmarshal(m, b)
 }
 func (m *UserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListInfo.Merge(dst, src)
+func (m *UserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListInfo.Merge(m, src)
 }
 func (m *UserListInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListInfo.Size(m)
@@ -2194,16 +1952,17 @@ func (m *ProximityInfo) Reset()         { *m = ProximityInfo{} }
 func (m *ProximityInfo) String() string { return proto.CompactTextString(m) }
 func (*ProximityInfo) ProtoMessage()    {}
 func (*ProximityInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{37}
+	return fileDescriptor_90481ed808a2095c, []int{37}
 }
+
 func (m *ProximityInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProximityInfo.Unmarshal(m, b)
 }
 func (m *ProximityInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProximityInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProximityInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProximityInfo.Merge(dst, src)
+func (m *ProximityInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProximityInfo.Merge(m, src)
 }
 func (m *ProximityInfo) XXX_Size() int {
 	return xxx_messageInfo_ProximityInfo.Size(m)
@@ -2257,16 +2016,17 @@ func (m *GeoPointInfo) Reset()         { *m = GeoPointInfo{} }
 func (m *GeoPointInfo) String() string { return proto.CompactTextString(m) }
 func (*GeoPointInfo) ProtoMessage()    {}
 func (*GeoPointInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{38}
+	return fileDescriptor_90481ed808a2095c, []int{38}
 }
+
 func (m *GeoPointInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoPointInfo.Unmarshal(m, b)
 }
 func (m *GeoPointInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoPointInfo.Marshal(b, m, deterministic)
 }
-func (dst *GeoPointInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoPointInfo.Merge(dst, src)
+func (m *GeoPointInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoPointInfo.Merge(m, src)
 }
 func (m *GeoPointInfo) XXX_Size() int {
 	return xxx_messageInfo_GeoPointInfo.Size(m)
@@ -2318,16 +2078,17 @@ func (m *AddressInfo) Reset()         { *m = AddressInfo{} }
 func (m *AddressInfo) String() string { return proto.CompactTextString(m) }
 func (*AddressInfo) ProtoMessage()    {}
 func (*AddressInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{39}
+	return fileDescriptor_90481ed808a2095c, []int{39}
 }
+
 func (m *AddressInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddressInfo.Unmarshal(m, b)
 }
 func (m *AddressInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddressInfo.Marshal(b, m, deterministic)
 }
-func (dst *AddressInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddressInfo.Merge(dst, src)
+func (m *AddressInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddressInfo.Merge(m, src)
 }
 func (m *AddressInfo) XXX_Size() int {
 	return xxx_messageInfo_AddressInfo.Size(m)
@@ -2407,16 +2168,17 @@ func (m *TopicInfo) Reset()         { *m = TopicInfo{} }
 func (m *TopicInfo) String() string { return proto.CompactTextString(m) }
 func (*TopicInfo) ProtoMessage()    {}
 func (*TopicInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{40}
+	return fileDescriptor_90481ed808a2095c, []int{40}
 }
+
 func (m *TopicInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TopicInfo.Unmarshal(m, b)
 }
 func (m *TopicInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TopicInfo.Marshal(b, m, deterministic)
 }
-func (dst *TopicInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TopicInfo.Merge(dst, src)
+func (m *TopicInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TopicInfo.Merge(m, src)
 }
 func (m *TopicInfo) XXX_Size() int {
 	return xxx_messageInfo_TopicInfo.Size(m)
@@ -2454,16 +2216,17 @@ func (m *LanguageInfo) Reset()         { *m = LanguageInfo{} }
 func (m *LanguageInfo) String() string { return proto.CompactTextString(m) }
 func (*LanguageInfo) ProtoMessage()    {}
 func (*LanguageInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{41}
+	return fileDescriptor_90481ed808a2095c, []int{41}
 }
+
 func (m *LanguageInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LanguageInfo.Unmarshal(m, b)
 }
 func (m *LanguageInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LanguageInfo.Marshal(b, m, deterministic)
 }
-func (dst *LanguageInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LanguageInfo.Merge(dst, src)
+func (m *LanguageInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LanguageInfo.Merge(m, src)
 }
 func (m *LanguageInfo) XXX_Size() int {
 	return xxx_messageInfo_LanguageInfo.Size(m)
@@ -2498,16 +2261,17 @@ func (m *IpBlockInfo) Reset()         { *m = IpBlockInfo{} }
 func (m *IpBlockInfo) String() string { return proto.CompactTextString(m) }
 func (*IpBlockInfo) ProtoMessage()    {}
 func (*IpBlockInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{42}
+	return fileDescriptor_90481ed808a2095c, []int{42}
 }
+
 func (m *IpBlockInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IpBlockInfo.Unmarshal(m, b)
 }
 func (m *IpBlockInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IpBlockInfo.Marshal(b, m, deterministic)
 }
-func (dst *IpBlockInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IpBlockInfo.Merge(dst, src)
+func (m *IpBlockInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IpBlockInfo.Merge(m, src)
 }
 func (m *IpBlockInfo) XXX_Size() int {
 	return xxx_messageInfo_IpBlockInfo.Size(m)
@@ -2538,16 +2302,17 @@ func (m *ContentLabelInfo) Reset()         { *m = ContentLabelInfo{} }
 func (m *ContentLabelInfo) String() string { return proto.CompactTextString(m) }
 func (*ContentLabelInfo) ProtoMessage()    {}
 func (*ContentLabelInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{43}
+	return fileDescriptor_90481ed808a2095c, []int{43}
 }
+
 func (m *ContentLabelInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContentLabelInfo.Unmarshal(m, b)
 }
 func (m *ContentLabelInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContentLabelInfo.Marshal(b, m, deterministic)
 }
-func (dst *ContentLabelInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContentLabelInfo.Merge(dst, src)
+func (m *ContentLabelInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentLabelInfo.Merge(m, src)
 }
 func (m *ContentLabelInfo) XXX_Size() int {
 	return xxx_messageInfo_ContentLabelInfo.Size(m)
@@ -2578,16 +2343,17 @@ func (m *CarrierInfo) Reset()         { *m = CarrierInfo{} }
 func (m *CarrierInfo) String() string { return proto.CompactTextString(m) }
 func (*CarrierInfo) ProtoMessage()    {}
 func (*CarrierInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{44}
+	return fileDescriptor_90481ed808a2095c, []int{44}
 }
+
 func (m *CarrierInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CarrierInfo.Unmarshal(m, b)
 }
 func (m *CarrierInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CarrierInfo.Marshal(b, m, deterministic)
 }
-func (dst *CarrierInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CarrierInfo.Merge(dst, src)
+func (m *CarrierInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CarrierInfo.Merge(m, src)
 }
 func (m *CarrierInfo) XXX_Size() int {
 	return xxx_messageInfo_CarrierInfo.Size(m)
@@ -2618,16 +2384,17 @@ func (m *UserInterestInfo) Reset()         { *m = UserInterestInfo{} }
 func (m *UserInterestInfo) String() string { return proto.CompactTextString(m) }
 func (*UserInterestInfo) ProtoMessage()    {}
 func (*UserInterestInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{45}
+	return fileDescriptor_90481ed808a2095c, []int{45}
 }
+
 func (m *UserInterestInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserInterestInfo.Unmarshal(m, b)
 }
 func (m *UserInterestInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserInterestInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserInterestInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserInterestInfo.Merge(dst, src)
+func (m *UserInterestInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserInterestInfo.Merge(m, src)
 }
 func (m *UserInterestInfo) XXX_Size() int {
 	return xxx_messageInfo_UserInterestInfo.Size(m)
@@ -2670,16 +2437,17 @@ func (m *WebpageInfo) Reset()         { *m = WebpageInfo{} }
 func (m *WebpageInfo) String() string { return proto.CompactTextString(m) }
 func (*WebpageInfo) ProtoMessage()    {}
 func (*WebpageInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{46}
+	return fileDescriptor_90481ed808a2095c, []int{46}
 }
+
 func (m *WebpageInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebpageInfo.Unmarshal(m, b)
 }
 func (m *WebpageInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebpageInfo.Marshal(b, m, deterministic)
 }
-func (dst *WebpageInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebpageInfo.Merge(dst, src)
+func (m *WebpageInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebpageInfo.Merge(m, src)
 }
 func (m *WebpageInfo) XXX_Size() int {
 	return xxx_messageInfo_WebpageInfo.Size(m)
@@ -2721,16 +2489,17 @@ func (m *WebpageConditionInfo) Reset()         { *m = WebpageConditionInfo{} }
 func (m *WebpageConditionInfo) String() string { return proto.CompactTextString(m) }
 func (*WebpageConditionInfo) ProtoMessage()    {}
 func (*WebpageConditionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{47}
+	return fileDescriptor_90481ed808a2095c, []int{47}
 }
+
 func (m *WebpageConditionInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebpageConditionInfo.Unmarshal(m, b)
 }
 func (m *WebpageConditionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebpageConditionInfo.Marshal(b, m, deterministic)
 }
-func (dst *WebpageConditionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebpageConditionInfo.Merge(dst, src)
+func (m *WebpageConditionInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebpageConditionInfo.Merge(m, src)
 }
 func (m *WebpageConditionInfo) XXX_Size() int {
 	return xxx_messageInfo_WebpageConditionInfo.Size(m)
@@ -2775,16 +2544,17 @@ func (m *OperatingSystemVersionInfo) Reset()         { *m = OperatingSystemVersi
 func (m *OperatingSystemVersionInfo) String() string { return proto.CompactTextString(m) }
 func (*OperatingSystemVersionInfo) ProtoMessage()    {}
 func (*OperatingSystemVersionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{48}
+	return fileDescriptor_90481ed808a2095c, []int{48}
 }
+
 func (m *OperatingSystemVersionInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperatingSystemVersionInfo.Unmarshal(m, b)
 }
 func (m *OperatingSystemVersionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperatingSystemVersionInfo.Marshal(b, m, deterministic)
 }
-func (dst *OperatingSystemVersionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperatingSystemVersionInfo.Merge(dst, src)
+func (m *OperatingSystemVersionInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperatingSystemVersionInfo.Merge(m, src)
 }
 func (m *OperatingSystemVersionInfo) XXX_Size() int {
 	return xxx_messageInfo_OperatingSystemVersionInfo.Size(m)
@@ -2815,16 +2585,17 @@ func (m *AppPaymentModelInfo) Reset()         { *m = AppPaymentModelInfo{} }
 func (m *AppPaymentModelInfo) String() string { return proto.CompactTextString(m) }
 func (*AppPaymentModelInfo) ProtoMessage()    {}
 func (*AppPaymentModelInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{49}
+	return fileDescriptor_90481ed808a2095c, []int{49}
 }
+
 func (m *AppPaymentModelInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppPaymentModelInfo.Unmarshal(m, b)
 }
 func (m *AppPaymentModelInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppPaymentModelInfo.Marshal(b, m, deterministic)
 }
-func (dst *AppPaymentModelInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppPaymentModelInfo.Merge(dst, src)
+func (m *AppPaymentModelInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppPaymentModelInfo.Merge(m, src)
 }
 func (m *AppPaymentModelInfo) XXX_Size() int {
 	return xxx_messageInfo_AppPaymentModelInfo.Size(m)
@@ -2855,16 +2626,17 @@ func (m *MobileDeviceInfo) Reset()         { *m = MobileDeviceInfo{} }
 func (m *MobileDeviceInfo) String() string { return proto.CompactTextString(m) }
 func (*MobileDeviceInfo) ProtoMessage()    {}
 func (*MobileDeviceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{50}
+	return fileDescriptor_90481ed808a2095c, []int{50}
 }
+
 func (m *MobileDeviceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MobileDeviceInfo.Unmarshal(m, b)
 }
 func (m *MobileDeviceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MobileDeviceInfo.Marshal(b, m, deterministic)
 }
-func (dst *MobileDeviceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MobileDeviceInfo.Merge(dst, src)
+func (m *MobileDeviceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MobileDeviceInfo.Merge(m, src)
 }
 func (m *MobileDeviceInfo) XXX_Size() int {
 	return xxx_messageInfo_MobileDeviceInfo.Size(m)
@@ -2896,16 +2668,17 @@ func (m *CustomAffinityInfo) Reset()         { *m = CustomAffinityInfo{} }
 func (m *CustomAffinityInfo) String() string { return proto.CompactTextString(m) }
 func (*CustomAffinityInfo) ProtoMessage()    {}
 func (*CustomAffinityInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{51}
+	return fileDescriptor_90481ed808a2095c, []int{51}
 }
+
 func (m *CustomAffinityInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomAffinityInfo.Unmarshal(m, b)
 }
 func (m *CustomAffinityInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomAffinityInfo.Marshal(b, m, deterministic)
 }
-func (dst *CustomAffinityInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomAffinityInfo.Merge(dst, src)
+func (m *CustomAffinityInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomAffinityInfo.Merge(m, src)
 }
 func (m *CustomAffinityInfo) XXX_Size() int {
 	return xxx_messageInfo_CustomAffinityInfo.Size(m)
@@ -2937,16 +2710,17 @@ func (m *CustomIntentInfo) Reset()         { *m = CustomIntentInfo{} }
 func (m *CustomIntentInfo) String() string { return proto.CompactTextString(m) }
 func (*CustomIntentInfo) ProtoMessage()    {}
 func (*CustomIntentInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{52}
+	return fileDescriptor_90481ed808a2095c, []int{52}
 }
+
 func (m *CustomIntentInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomIntentInfo.Unmarshal(m, b)
 }
 func (m *CustomIntentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomIntentInfo.Marshal(b, m, deterministic)
 }
-func (dst *CustomIntentInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomIntentInfo.Merge(dst, src)
+func (m *CustomIntentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomIntentInfo.Merge(m, src)
 }
 func (m *CustomIntentInfo) XXX_Size() int {
 	return xxx_messageInfo_CustomIntentInfo.Size(m)
@@ -2987,16 +2761,17 @@ func (m *LocationGroupInfo) Reset()         { *m = LocationGroupInfo{} }
 func (m *LocationGroupInfo) String() string { return proto.CompactTextString(m) }
 func (*LocationGroupInfo) ProtoMessage()    {}
 func (*LocationGroupInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criteria_e78ca570234fbeae, []int{53}
+	return fileDescriptor_90481ed808a2095c, []int{53}
 }
+
 func (m *LocationGroupInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationGroupInfo.Unmarshal(m, b)
 }
 func (m *LocationGroupInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationGroupInfo.Marshal(b, m, deterministic)
 }
-func (dst *LocationGroupInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationGroupInfo.Merge(dst, src)
+func (m *LocationGroupInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationGroupInfo.Merge(m, src)
 }
 func (m *LocationGroupInfo) XXX_Size() int {
 	return xxx_messageInfo_LocationGroupInfo.Size(m)
@@ -3093,10 +2868,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/criteria.proto", fileDescriptor_criteria_e78ca570234fbeae)
+	proto.RegisterFile("google/ads/googleads/v1/common/criteria.proto", fileDescriptor_90481ed808a2095c)
 }
 
-var fileDescriptor_criteria_e78ca570234fbeae = []byte{
+var fileDescriptor_90481ed808a2095c = []byte{
 	// 2774 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x5a, 0x4f, 0x73, 0x1c, 0x47,
 	0x15, 0xcf, 0xae, 0x64, 0x4b, 0x7a, 0x2b, 0xc9, 0xf2, 0x58, 0x51, 0xd6, 0xca, 0x9f, 0x0a, 0x73,
diff --git a/googleapis/ads/googleads/v1/common/criterion_category_availability.pb.go b/googleapis/ads/googleads/v1/common/criterion_category_availability.pb.go
index 6b82dbd5f0..44c654ff4a 100644
--- a/googleapis/ads/googleads/v1/common/criterion_category_availability.pb.go
+++ b/googleapis/ads/googleads/v1/common/criterion_category_availability.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/criterion_category_availability.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Information of category availability, per advertising channel.
 type CriterionCategoryAvailability struct {
@@ -36,16 +39,17 @@ func (m *CriterionCategoryAvailability) Reset()         { *m = CriterionCategory
 func (m *CriterionCategoryAvailability) String() string { return proto.CompactTextString(m) }
 func (*CriterionCategoryAvailability) ProtoMessage()    {}
 func (*CriterionCategoryAvailability) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_category_availability_1772a6f75bfda39e, []int{0}
+	return fileDescriptor_241d9930057f9832, []int{0}
 }
+
 func (m *CriterionCategoryAvailability) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionCategoryAvailability.Unmarshal(m, b)
 }
 func (m *CriterionCategoryAvailability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionCategoryAvailability.Marshal(b, m, deterministic)
 }
-func (dst *CriterionCategoryAvailability) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionCategoryAvailability.Merge(dst, src)
+func (m *CriterionCategoryAvailability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionCategoryAvailability.Merge(m, src)
 }
 func (m *CriterionCategoryAvailability) XXX_Size() int {
 	return xxx_messageInfo_CriterionCategoryAvailability.Size(m)
@@ -98,16 +102,17 @@ func (m *CriterionCategoryChannelAvailability) Reset()         { *m = CriterionC
 func (m *CriterionCategoryChannelAvailability) String() string { return proto.CompactTextString(m) }
 func (*CriterionCategoryChannelAvailability) ProtoMessage()    {}
 func (*CriterionCategoryChannelAvailability) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_category_availability_1772a6f75bfda39e, []int{1}
+	return fileDescriptor_241d9930057f9832, []int{1}
 }
+
 func (m *CriterionCategoryChannelAvailability) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionCategoryChannelAvailability.Unmarshal(m, b)
 }
 func (m *CriterionCategoryChannelAvailability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionCategoryChannelAvailability.Marshal(b, m, deterministic)
 }
-func (dst *CriterionCategoryChannelAvailability) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionCategoryChannelAvailability.Merge(dst, src)
+func (m *CriterionCategoryChannelAvailability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionCategoryChannelAvailability.Merge(m, src)
 }
 func (m *CriterionCategoryChannelAvailability) XXX_Size() int {
 	return xxx_messageInfo_CriterionCategoryChannelAvailability.Size(m)
@@ -166,16 +171,17 @@ func (m *CriterionCategoryLocaleAvailability) Reset()         { *m = CriterionCa
 func (m *CriterionCategoryLocaleAvailability) String() string { return proto.CompactTextString(m) }
 func (*CriterionCategoryLocaleAvailability) ProtoMessage()    {}
 func (*CriterionCategoryLocaleAvailability) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_category_availability_1772a6f75bfda39e, []int{2}
+	return fileDescriptor_241d9930057f9832, []int{2}
 }
+
 func (m *CriterionCategoryLocaleAvailability) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionCategoryLocaleAvailability.Unmarshal(m, b)
 }
 func (m *CriterionCategoryLocaleAvailability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionCategoryLocaleAvailability.Marshal(b, m, deterministic)
 }
-func (dst *CriterionCategoryLocaleAvailability) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionCategoryLocaleAvailability.Merge(dst, src)
+func (m *CriterionCategoryLocaleAvailability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionCategoryLocaleAvailability.Merge(m, src)
 }
 func (m *CriterionCategoryLocaleAvailability) XXX_Size() int {
 	return xxx_messageInfo_CriterionCategoryLocaleAvailability.Size(m)
@@ -214,10 +220,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/criterion_category_availability.proto", fileDescriptor_criterion_category_availability_1772a6f75bfda39e)
+	proto.RegisterFile("google/ads/googleads/v1/common/criterion_category_availability.proto", fileDescriptor_241d9930057f9832)
 }
 
-var fileDescriptor_criterion_category_availability_1772a6f75bfda39e = []byte{
+var fileDescriptor_241d9930057f9832 = []byte{
 	// 609 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x95, 0x41, 0x8e, 0xd3, 0x30,
 	0x14, 0x86, 0x95, 0x74, 0x34, 0x48, 0xee, 0x30, 0x82, 0x2c, 0x50, 0xa9, 0xca, 0xa8, 0x0a, 0x2c,
diff --git a/googleapis/ads/googleads/v1/common/custom_parameter.pb.go b/googleapis/ads/googleads/v1/common/custom_parameter.pb.go
index 21d85b8120..abb66d01a3 100644
--- a/googleapis/ads/googleads/v1/common/custom_parameter.pb.go
+++ b/googleapis/ads/googleads/v1/common/custom_parameter.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/custom_parameter.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A mapping that can be used by custom parameter tags in a
 // `tracking_url_template`, `final_urls`, or `mobile_final_urls`.
@@ -36,16 +39,17 @@ func (m *CustomParameter) Reset()         { *m = CustomParameter{} }
 func (m *CustomParameter) String() string { return proto.CompactTextString(m) }
 func (*CustomParameter) ProtoMessage()    {}
 func (*CustomParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_parameter_e9102b323b1b6917, []int{0}
+	return fileDescriptor_6d23b9a41ba81714, []int{0}
 }
+
 func (m *CustomParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomParameter.Unmarshal(m, b)
 }
 func (m *CustomParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomParameter.Marshal(b, m, deterministic)
 }
-func (dst *CustomParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomParameter.Merge(dst, src)
+func (m *CustomParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomParameter.Merge(m, src)
 }
 func (m *CustomParameter) XXX_Size() int {
 	return xxx_messageInfo_CustomParameter.Size(m)
@@ -75,10 +79,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/custom_parameter.proto", fileDescriptor_custom_parameter_e9102b323b1b6917)
+	proto.RegisterFile("google/ads/googleads/v1/common/custom_parameter.proto", fileDescriptor_6d23b9a41ba81714)
 }
 
-var fileDescriptor_custom_parameter_e9102b323b1b6917 = []byte{
+var fileDescriptor_6d23b9a41ba81714 = []byte{
 	// 302 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xc1, 0x4a, 0xfc, 0x30,
 	0x10, 0xc6, 0x69, 0x97, 0xff, 0xff, 0x50, 0x0f, 0x42, 0xf1, 0xb0, 0x2c, 0xcb, 0x22, 0x3d, 0x79,
diff --git a/googleapis/ads/googleads/v1/common/dates.pb.go b/googleapis/ads/googleads/v1/common/dates.pb.go
index c89c43c363..5f4acfeb00 100644
--- a/googleapis/ads/googleads/v1/common/dates.pb.go
+++ b/googleapis/ads/googleads/v1/common/dates.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/dates.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A date range.
 type DateRange struct {
@@ -35,16 +38,17 @@ func (m *DateRange) Reset()         { *m = DateRange{} }
 func (m *DateRange) String() string { return proto.CompactTextString(m) }
 func (*DateRange) ProtoMessage()    {}
 func (*DateRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dates_66330ea013cf984e, []int{0}
+	return fileDescriptor_141c54e845fb6763, []int{0}
 }
+
 func (m *DateRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DateRange.Unmarshal(m, b)
 }
 func (m *DateRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DateRange.Marshal(b, m, deterministic)
 }
-func (dst *DateRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DateRange.Merge(dst, src)
+func (m *DateRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateRange.Merge(m, src)
 }
 func (m *DateRange) XXX_Size() int {
 	return xxx_messageInfo_DateRange.Size(m)
@@ -74,10 +78,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/dates.proto", fileDescriptor_dates_66330ea013cf984e)
+	proto.RegisterFile("google/ads/googleads/v1/common/dates.proto", fileDescriptor_141c54e845fb6763)
 }
 
-var fileDescriptor_dates_66330ea013cf984e = []byte{
+var fileDescriptor_141c54e845fb6763 = []byte{
 	// 302 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x41, 0x4b, 0xc3, 0x30,
 	0x14, 0xc7, 0x69, 0x05, 0x75, 0xf1, 0xd6, 0x93, 0x8c, 0x31, 0xa4, 0x27, 0xf1, 0x90, 0x50, 0x3d,
diff --git a/googleapis/ads/googleads/v1/common/explorer_auto_optimizer_setting.pb.go b/googleapis/ads/googleads/v1/common/explorer_auto_optimizer_setting.pb.go
index b8d7e29aba..9befcfe4a3 100644
--- a/googleapis/ads/googleads/v1/common/explorer_auto_optimizer_setting.pb.go
+++ b/googleapis/ads/googleads/v1/common/explorer_auto_optimizer_setting.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/explorer_auto_optimizer_setting.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Settings for the
 // <a href="https://support.google.com/google-ads/answer/190596">
@@ -35,16 +38,17 @@ func (m *ExplorerAutoOptimizerSetting) Reset()         { *m = ExplorerAutoOptimi
 func (m *ExplorerAutoOptimizerSetting) String() string { return proto.CompactTextString(m) }
 func (*ExplorerAutoOptimizerSetting) ProtoMessage()    {}
 func (*ExplorerAutoOptimizerSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_explorer_auto_optimizer_setting_f77a88f13cc516e3, []int{0}
+	return fileDescriptor_ee4d755cec81c290, []int{0}
 }
+
 func (m *ExplorerAutoOptimizerSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplorerAutoOptimizerSetting.Unmarshal(m, b)
 }
 func (m *ExplorerAutoOptimizerSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplorerAutoOptimizerSetting.Marshal(b, m, deterministic)
 }
-func (dst *ExplorerAutoOptimizerSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplorerAutoOptimizerSetting.Merge(dst, src)
+func (m *ExplorerAutoOptimizerSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplorerAutoOptimizerSetting.Merge(m, src)
 }
 func (m *ExplorerAutoOptimizerSetting) XXX_Size() int {
 	return xxx_messageInfo_ExplorerAutoOptimizerSetting.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/explorer_auto_optimizer_setting.proto", fileDescriptor_explorer_auto_optimizer_setting_f77a88f13cc516e3)
+	proto.RegisterFile("google/ads/googleads/v1/common/explorer_auto_optimizer_setting.proto", fileDescriptor_ee4d755cec81c290)
 }
 
-var fileDescriptor_explorer_auto_optimizer_setting_f77a88f13cc516e3 = []byte{
+var fileDescriptor_ee4d755cec81c290 = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
 	0x10, 0x86, 0x95, 0x22, 0x3a, 0x84, 0xad, 0x13, 0xaa, 0xaa, 0x0a, 0x3a, 0x31, 0x9d, 0x65, 0xd8,
diff --git a/googleapis/ads/googleads/v1/common/extensions.pb.go b/googleapis/ads/googleads/v1/common/extensions.pb.go
index 07ee144cb7..9b24b9c6fc 100644
--- a/googleapis/ads/googleads/v1/common/extensions.pb.go
+++ b/googleapis/ads/googleads/v1/common/extensions.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/extensions.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents an App extension.
 type AppFeedItem struct {
@@ -52,16 +55,17 @@ func (m *AppFeedItem) Reset()         { *m = AppFeedItem{} }
 func (m *AppFeedItem) String() string { return proto.CompactTextString(m) }
 func (*AppFeedItem) ProtoMessage()    {}
 func (*AppFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{0}
+	return fileDescriptor_717194951d70c62b, []int{0}
 }
+
 func (m *AppFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppFeedItem.Unmarshal(m, b)
 }
 func (m *AppFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *AppFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppFeedItem.Merge(dst, src)
+func (m *AppFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppFeedItem.Merge(m, src)
 }
 func (m *AppFeedItem) XXX_Size() int {
 	return xxx_messageInfo_AppFeedItem.Size(m)
@@ -159,16 +163,17 @@ func (m *CallFeedItem) Reset()         { *m = CallFeedItem{} }
 func (m *CallFeedItem) String() string { return proto.CompactTextString(m) }
 func (*CallFeedItem) ProtoMessage()    {}
 func (*CallFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{1}
+	return fileDescriptor_717194951d70c62b, []int{1}
 }
+
 func (m *CallFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallFeedItem.Unmarshal(m, b)
 }
 func (m *CallFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *CallFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallFeedItem.Merge(dst, src)
+func (m *CallFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallFeedItem.Merge(m, src)
 }
 func (m *CallFeedItem) XXX_Size() int {
 	return xxx_messageInfo_CallFeedItem.Size(m)
@@ -235,16 +240,17 @@ func (m *CalloutFeedItem) Reset()         { *m = CalloutFeedItem{} }
 func (m *CalloutFeedItem) String() string { return proto.CompactTextString(m) }
 func (*CalloutFeedItem) ProtoMessage()    {}
 func (*CalloutFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{2}
+	return fileDescriptor_717194951d70c62b, []int{2}
 }
+
 func (m *CalloutFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CalloutFeedItem.Unmarshal(m, b)
 }
 func (m *CalloutFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CalloutFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *CalloutFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CalloutFeedItem.Merge(dst, src)
+func (m *CalloutFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CalloutFeedItem.Merge(m, src)
 }
 func (m *CalloutFeedItem) XXX_Size() int {
 	return xxx_messageInfo_CalloutFeedItem.Size(m)
@@ -289,16 +295,17 @@ func (m *LocationFeedItem) Reset()         { *m = LocationFeedItem{} }
 func (m *LocationFeedItem) String() string { return proto.CompactTextString(m) }
 func (*LocationFeedItem) ProtoMessage()    {}
 func (*LocationFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{3}
+	return fileDescriptor_717194951d70c62b, []int{3}
 }
+
 func (m *LocationFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationFeedItem.Unmarshal(m, b)
 }
 func (m *LocationFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *LocationFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationFeedItem.Merge(dst, src)
+func (m *LocationFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationFeedItem.Merge(m, src)
 }
 func (m *LocationFeedItem) XXX_Size() int {
 	return xxx_messageInfo_LocationFeedItem.Size(m)
@@ -396,16 +403,17 @@ func (m *AffiliateLocationFeedItem) Reset()         { *m = AffiliateLocationFeed
 func (m *AffiliateLocationFeedItem) String() string { return proto.CompactTextString(m) }
 func (*AffiliateLocationFeedItem) ProtoMessage()    {}
 func (*AffiliateLocationFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{4}
+	return fileDescriptor_717194951d70c62b, []int{4}
 }
+
 func (m *AffiliateLocationFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AffiliateLocationFeedItem.Unmarshal(m, b)
 }
 func (m *AffiliateLocationFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AffiliateLocationFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *AffiliateLocationFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AffiliateLocationFeedItem.Merge(dst, src)
+func (m *AffiliateLocationFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AffiliateLocationFeedItem.Merge(m, src)
 }
 func (m *AffiliateLocationFeedItem) XXX_Size() int {
 	return xxx_messageInfo_AffiliateLocationFeedItem.Size(m)
@@ -511,16 +519,17 @@ func (m *TextMessageFeedItem) Reset()         { *m = TextMessageFeedItem{} }
 func (m *TextMessageFeedItem) String() string { return proto.CompactTextString(m) }
 func (*TextMessageFeedItem) ProtoMessage()    {}
 func (*TextMessageFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{5}
+	return fileDescriptor_717194951d70c62b, []int{5}
 }
+
 func (m *TextMessageFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextMessageFeedItem.Unmarshal(m, b)
 }
 func (m *TextMessageFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextMessageFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *TextMessageFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextMessageFeedItem.Merge(dst, src)
+func (m *TextMessageFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextMessageFeedItem.Merge(m, src)
 }
 func (m *TextMessageFeedItem) XXX_Size() int {
 	return xxx_messageInfo_TextMessageFeedItem.Size(m)
@@ -590,16 +599,17 @@ func (m *PriceFeedItem) Reset()         { *m = PriceFeedItem{} }
 func (m *PriceFeedItem) String() string { return proto.CompactTextString(m) }
 func (*PriceFeedItem) ProtoMessage()    {}
 func (*PriceFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{6}
+	return fileDescriptor_717194951d70c62b, []int{6}
 }
+
 func (m *PriceFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PriceFeedItem.Unmarshal(m, b)
 }
 func (m *PriceFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PriceFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *PriceFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PriceFeedItem.Merge(dst, src)
+func (m *PriceFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PriceFeedItem.Merge(m, src)
 }
 func (m *PriceFeedItem) XXX_Size() int {
 	return xxx_messageInfo_PriceFeedItem.Size(m)
@@ -675,16 +685,17 @@ func (m *PriceOffer) Reset()         { *m = PriceOffer{} }
 func (m *PriceOffer) String() string { return proto.CompactTextString(m) }
 func (*PriceOffer) ProtoMessage()    {}
 func (*PriceOffer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{7}
+	return fileDescriptor_717194951d70c62b, []int{7}
 }
+
 func (m *PriceOffer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PriceOffer.Unmarshal(m, b)
 }
 func (m *PriceOffer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PriceOffer.Marshal(b, m, deterministic)
 }
-func (dst *PriceOffer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PriceOffer.Merge(dst, src)
+func (m *PriceOffer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PriceOffer.Merge(m, src)
 }
 func (m *PriceOffer) XXX_Size() int {
 	return xxx_messageInfo_PriceOffer.Size(m)
@@ -790,16 +801,17 @@ func (m *PromotionFeedItem) Reset()         { *m = PromotionFeedItem{} }
 func (m *PromotionFeedItem) String() string { return proto.CompactTextString(m) }
 func (*PromotionFeedItem) ProtoMessage()    {}
 func (*PromotionFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{8}
+	return fileDescriptor_717194951d70c62b, []int{8}
 }
+
 func (m *PromotionFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PromotionFeedItem.Unmarshal(m, b)
 }
 func (m *PromotionFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PromotionFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *PromotionFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PromotionFeedItem.Merge(dst, src)
+func (m *PromotionFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PromotionFeedItem.Merge(m, src)
 }
 func (m *PromotionFeedItem) XXX_Size() int {
 	return xxx_messageInfo_PromotionFeedItem.Size(m)
@@ -961,9 +973,9 @@ func (m *PromotionFeedItem) GetOrdersOverAmount() *Money {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PromotionFeedItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PromotionFeedItem_OneofMarshaler, _PromotionFeedItem_OneofUnmarshaler, _PromotionFeedItem_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PromotionFeedItem) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PromotionFeedItem_PercentOff)(nil),
 		(*PromotionFeedItem_MoneyAmountOff)(nil),
 		(*PromotionFeedItem_PromotionCode)(nil),
@@ -971,120 +983,6 @@ func (*PromotionFeedItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _PromotionFeedItem_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PromotionFeedItem)
-	// discount_type
-	switch x := m.DiscountType.(type) {
-	case *PromotionFeedItem_PercentOff:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PercentOff); err != nil {
-			return err
-		}
-	case *PromotionFeedItem_MoneyAmountOff:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MoneyAmountOff); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PromotionFeedItem.DiscountType has unexpected type %T", x)
-	}
-	// promotion_trigger
-	switch x := m.PromotionTrigger.(type) {
-	case *PromotionFeedItem_PromotionCode:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PromotionCode); err != nil {
-			return err
-		}
-	case *PromotionFeedItem_OrdersOverAmount:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OrdersOverAmount); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PromotionFeedItem.PromotionTrigger has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PromotionFeedItem_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PromotionFeedItem)
-	switch tag {
-	case 3: // discount_type.percent_off
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.DiscountType = &PromotionFeedItem_PercentOff{msg}
-		return true, err
-	case 4: // discount_type.money_amount_off
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Money)
-		err := b.DecodeMessage(msg)
-		m.DiscountType = &PromotionFeedItem_MoneyAmountOff{msg}
-		return true, err
-	case 5: // promotion_trigger.promotion_code
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.PromotionTrigger = &PromotionFeedItem_PromotionCode{msg}
-		return true, err
-	case 6: // promotion_trigger.orders_over_amount
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Money)
-		err := b.DecodeMessage(msg)
-		m.PromotionTrigger = &PromotionFeedItem_OrdersOverAmount{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PromotionFeedItem_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PromotionFeedItem)
-	// discount_type
-	switch x := m.DiscountType.(type) {
-	case *PromotionFeedItem_PercentOff:
-		s := proto.Size(x.PercentOff)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PromotionFeedItem_MoneyAmountOff:
-		s := proto.Size(x.MoneyAmountOff)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// promotion_trigger
-	switch x := m.PromotionTrigger.(type) {
-	case *PromotionFeedItem_PromotionCode:
-		s := proto.Size(x.PromotionCode)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PromotionFeedItem_OrdersOverAmount:
-		s := proto.Size(x.OrdersOverAmount)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a structured snippet extension.
 type StructuredSnippetFeedItem struct {
 	// The header of the snippet.
@@ -1102,16 +1000,17 @@ func (m *StructuredSnippetFeedItem) Reset()         { *m = StructuredSnippetFeed
 func (m *StructuredSnippetFeedItem) String() string { return proto.CompactTextString(m) }
 func (*StructuredSnippetFeedItem) ProtoMessage()    {}
 func (*StructuredSnippetFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{9}
+	return fileDescriptor_717194951d70c62b, []int{9}
 }
+
 func (m *StructuredSnippetFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredSnippetFeedItem.Unmarshal(m, b)
 }
 func (m *StructuredSnippetFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredSnippetFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *StructuredSnippetFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredSnippetFeedItem.Merge(dst, src)
+func (m *StructuredSnippetFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredSnippetFeedItem.Merge(m, src)
 }
 func (m *StructuredSnippetFeedItem) XXX_Size() int {
 	return xxx_messageInfo_StructuredSnippetFeedItem.Size(m)
@@ -1170,16 +1069,17 @@ func (m *SitelinkFeedItem) Reset()         { *m = SitelinkFeedItem{} }
 func (m *SitelinkFeedItem) String() string { return proto.CompactTextString(m) }
 func (*SitelinkFeedItem) ProtoMessage()    {}
 func (*SitelinkFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extensions_29e88682b0f69f9b, []int{10}
+	return fileDescriptor_717194951d70c62b, []int{10}
 }
+
 func (m *SitelinkFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SitelinkFeedItem.Unmarshal(m, b)
 }
 func (m *SitelinkFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SitelinkFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *SitelinkFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SitelinkFeedItem.Merge(dst, src)
+func (m *SitelinkFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SitelinkFeedItem.Merge(m, src)
 }
 func (m *SitelinkFeedItem) XXX_Size() int {
 	return xxx_messageInfo_SitelinkFeedItem.Size(m)
@@ -1261,10 +1161,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/extensions.proto", fileDescriptor_extensions_29e88682b0f69f9b)
+	proto.RegisterFile("google/ads/googleads/v1/common/extensions.proto", fileDescriptor_717194951d70c62b)
 }
 
-var fileDescriptor_extensions_29e88682b0f69f9b = []byte{
+var fileDescriptor_717194951d70c62b = []byte{
 	// 1575 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xdf, 0x4e, 0x1b, 0xc7,
 	0x1a, 0x8f, 0xc1, 0x10, 0xf8, 0x0c, 0x06, 0x96, 0xe4, 0xc8, 0xe1, 0x44, 0x39, 0x39, 0x96, 0x8e,
diff --git a/googleapis/ads/googleads/v1/common/feed_common.pb.go b/googleapis/ads/googleads/v1/common/feed_common.pb.go
index aac75b7ce8..c3587fc3fb 100644
--- a/googleapis/ads/googleads/v1/common/feed_common.pb.go
+++ b/googleapis/ads/googleads/v1/common/feed_common.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/feed_common.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a price in a particular currency.
 type Money struct {
@@ -35,16 +38,17 @@ func (m *Money) Reset()         { *m = Money{} }
 func (m *Money) String() string { return proto.CompactTextString(m) }
 func (*Money) ProtoMessage()    {}
 func (*Money) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_common_f503f359313a2ced, []int{0}
+	return fileDescriptor_3d17791b1b55b077, []int{0}
 }
+
 func (m *Money) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Money.Unmarshal(m, b)
 }
 func (m *Money) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Money.Marshal(b, m, deterministic)
 }
-func (dst *Money) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Money.Merge(dst, src)
+func (m *Money) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Money.Merge(m, src)
 }
 func (m *Money) XXX_Size() int {
 	return xxx_messageInfo_Money.Size(m)
@@ -74,10 +78,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/feed_common.proto", fileDescriptor_feed_common_f503f359313a2ced)
+	proto.RegisterFile("google/ads/googleads/v1/common/feed_common.proto", fileDescriptor_3d17791b1b55b077)
 }
 
-var fileDescriptor_feed_common_f503f359313a2ced = []byte{
+var fileDescriptor_3d17791b1b55b077 = []byte{
 	// 328 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xf3, 0x40,
 	0x14, 0x85, 0x49, 0x7e, 0x7e, 0x17, 0xd1, 0x22, 0x74, 0x55, 0x6a, 0x29, 0xd2, 0x95, 0xab, 0x19,
diff --git a/googleapis/ads/googleads/v1/common/final_app_url.pb.go b/googleapis/ads/googleads/v1/common/final_app_url.pb.go
index a34b7eee68..fbf25b88c9 100644
--- a/googleapis/ads/googleads/v1/common/final_app_url.pb.go
+++ b/googleapis/ads/googleads/v1/common/final_app_url.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/final_app_url.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A URL for deep linking into an app for the given operating system.
 type FinalAppUrl struct {
@@ -42,16 +45,17 @@ func (m *FinalAppUrl) Reset()         { *m = FinalAppUrl{} }
 func (m *FinalAppUrl) String() string { return proto.CompactTextString(m) }
 func (*FinalAppUrl) ProtoMessage()    {}
 func (*FinalAppUrl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_final_app_url_5bb78dc5e57caeaa, []int{0}
+	return fileDescriptor_8b7b2ec96b577e51, []int{0}
 }
+
 func (m *FinalAppUrl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinalAppUrl.Unmarshal(m, b)
 }
 func (m *FinalAppUrl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinalAppUrl.Marshal(b, m, deterministic)
 }
-func (dst *FinalAppUrl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinalAppUrl.Merge(dst, src)
+func (m *FinalAppUrl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinalAppUrl.Merge(m, src)
 }
 func (m *FinalAppUrl) XXX_Size() int {
 	return xxx_messageInfo_FinalAppUrl.Size(m)
@@ -81,10 +85,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/final_app_url.proto", fileDescriptor_final_app_url_5bb78dc5e57caeaa)
+	proto.RegisterFile("google/ads/googleads/v1/common/final_app_url.proto", fileDescriptor_8b7b2ec96b577e51)
 }
 
-var fileDescriptor_final_app_url_5bb78dc5e57caeaa = []byte{
+var fileDescriptor_8b7b2ec96b577e51 = []byte{
 	// 357 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x6a, 0xf3, 0x30,
 	0x14, 0xc5, 0xb1, 0x03, 0xf9, 0xc0, 0x81, 0x8f, 0x92, 0x29, 0x84, 0x10, 0x42, 0xa6, 0x4c, 0x12,
diff --git a/googleapis/ads/googleads/v1/common/frequency_cap.pb.go b/googleapis/ads/googleads/v1/common/frequency_cap.pb.go
index 5d301ee5ab..0fecd298ae 100644
--- a/googleapis/ads/googleads/v1/common/frequency_cap.pb.go
+++ b/googleapis/ads/googleads/v1/common/frequency_cap.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/frequency_cap.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A rule specifying the maximum number of times an ad (or some set of ads) can
 // be shown to a user over a particular time period.
@@ -38,16 +41,17 @@ func (m *FrequencyCapEntry) Reset()         { *m = FrequencyCapEntry{} }
 func (m *FrequencyCapEntry) String() string { return proto.CompactTextString(m) }
 func (*FrequencyCapEntry) ProtoMessage()    {}
 func (*FrequencyCapEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_77c2844bd792a9b5, []int{0}
+	return fileDescriptor_945ed9a5640a9dfd, []int{0}
 }
+
 func (m *FrequencyCapEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FrequencyCapEntry.Unmarshal(m, b)
 }
 func (m *FrequencyCapEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FrequencyCapEntry.Marshal(b, m, deterministic)
 }
-func (dst *FrequencyCapEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FrequencyCapEntry.Merge(dst, src)
+func (m *FrequencyCapEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FrequencyCapEntry.Merge(m, src)
 }
 func (m *FrequencyCapEntry) XXX_Size() int {
 	return xxx_messageInfo_FrequencyCapEntry.Size(m)
@@ -93,16 +97,17 @@ func (m *FrequencyCapKey) Reset()         { *m = FrequencyCapKey{} }
 func (m *FrequencyCapKey) String() string { return proto.CompactTextString(m) }
 func (*FrequencyCapKey) ProtoMessage()    {}
 func (*FrequencyCapKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_77c2844bd792a9b5, []int{1}
+	return fileDescriptor_945ed9a5640a9dfd, []int{1}
 }
+
 func (m *FrequencyCapKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FrequencyCapKey.Unmarshal(m, b)
 }
 func (m *FrequencyCapKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FrequencyCapKey.Marshal(b, m, deterministic)
 }
-func (dst *FrequencyCapKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FrequencyCapKey.Merge(dst, src)
+func (m *FrequencyCapKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FrequencyCapKey.Merge(m, src)
 }
 func (m *FrequencyCapKey) XXX_Size() int {
 	return xxx_messageInfo_FrequencyCapKey.Size(m)
@@ -147,10 +152,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/frequency_cap.proto", fileDescriptor_frequency_cap_77c2844bd792a9b5)
+	proto.RegisterFile("google/ads/googleads/v1/common/frequency_cap.proto", fileDescriptor_945ed9a5640a9dfd)
 }
 
-var fileDescriptor_frequency_cap_77c2844bd792a9b5 = []byte{
+var fileDescriptor_945ed9a5640a9dfd = []byte{
 	// 466 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcf, 0x6a, 0xd4, 0x40,
 	0x18, 0x27, 0x1b, 0x15, 0x3b, 0x85, 0x8a, 0x39, 0x2d, 0x55, 0x8a, 0xec, 0xc9, 0x8b, 0x33, 0x24,
diff --git a/googleapis/ads/googleads/v1/common/keyword_plan_common.pb.go b/googleapis/ads/googleads/v1/common/keyword_plan_common.pb.go
index 05de623bbb..ba625d1993 100644
--- a/googleapis/ads/googleads/v1/common/keyword_plan_common.pb.go
+++ b/googleapis/ads/googleads/v1/common/keyword_plan_common.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/keyword_plan_common.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Historical metrics.
 type KeywordPlanHistoricalMetrics struct {
@@ -36,16 +39,17 @@ func (m *KeywordPlanHistoricalMetrics) Reset()         { *m = KeywordPlanHistori
 func (m *KeywordPlanHistoricalMetrics) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanHistoricalMetrics) ProtoMessage()    {}
 func (*KeywordPlanHistoricalMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_common_ccb20e2e02a00391, []int{0}
+	return fileDescriptor_9c4702e792c06e4e, []int{0}
 }
+
 func (m *KeywordPlanHistoricalMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanHistoricalMetrics.Unmarshal(m, b)
 }
 func (m *KeywordPlanHistoricalMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanHistoricalMetrics.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanHistoricalMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanHistoricalMetrics.Merge(dst, src)
+func (m *KeywordPlanHistoricalMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanHistoricalMetrics.Merge(m, src)
 }
 func (m *KeywordPlanHistoricalMetrics) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanHistoricalMetrics.Size(m)
@@ -75,10 +79,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/keyword_plan_common.proto", fileDescriptor_keyword_plan_common_ccb20e2e02a00391)
+	proto.RegisterFile("google/ads/googleads/v1/common/keyword_plan_common.proto", fileDescriptor_9c4702e792c06e4e)
 }
 
-var fileDescriptor_keyword_plan_common_ccb20e2e02a00391 = []byte{
+var fileDescriptor_9c4702e792c06e4e = []byte{
 	// 388 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xcf, 0x6a, 0xdb, 0x30,
 	0x18, 0xc7, 0x1e, 0xec, 0xe0, 0xc0, 0x0e, 0x66, 0x8c, 0x90, 0x85, 0x10, 0x72, 0xca, 0x49, 0xc2,
diff --git a/googleapis/ads/googleads/v1/common/matching_function.pb.go b/googleapis/ads/googleads/v1/common/matching_function.pb.go
index 9bc71f27c6..6eabab8fed 100644
--- a/googleapis/ads/googleads/v1/common/matching_function.pb.go
+++ b/googleapis/ads/googleads/v1/common/matching_function.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/matching_function.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Matching function associated with a
 // CustomerFeed, CampaignFeed, or AdGroupFeed. The matching function is used
@@ -59,16 +62,17 @@ func (m *MatchingFunction) Reset()         { *m = MatchingFunction{} }
 func (m *MatchingFunction) String() string { return proto.CompactTextString(m) }
 func (*MatchingFunction) ProtoMessage()    {}
 func (*MatchingFunction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_724626b702bec12d, []int{0}
+	return fileDescriptor_1378ef15dce1f854, []int{0}
 }
+
 func (m *MatchingFunction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MatchingFunction.Unmarshal(m, b)
 }
 func (m *MatchingFunction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MatchingFunction.Marshal(b, m, deterministic)
 }
-func (dst *MatchingFunction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MatchingFunction.Merge(dst, src)
+func (m *MatchingFunction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MatchingFunction.Merge(m, src)
 }
 func (m *MatchingFunction) XXX_Size() int {
 	return xxx_messageInfo_MatchingFunction.Size(m)
@@ -126,16 +130,17 @@ func (m *Operand) Reset()         { *m = Operand{} }
 func (m *Operand) String() string { return proto.CompactTextString(m) }
 func (*Operand) ProtoMessage()    {}
 func (*Operand) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_724626b702bec12d, []int{1}
+	return fileDescriptor_1378ef15dce1f854, []int{1}
 }
+
 func (m *Operand) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operand.Unmarshal(m, b)
 }
 func (m *Operand) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operand.Marshal(b, m, deterministic)
 }
-func (dst *Operand) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operand.Merge(dst, src)
+func (m *Operand) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operand.Merge(m, src)
 }
 func (m *Operand) XXX_Size() int {
 	return xxx_messageInfo_Operand.Size(m)
@@ -209,9 +214,9 @@ func (m *Operand) GetRequestContextOperand() *Operand_RequestContextOperand {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Operand) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Operand_OneofMarshaler, _Operand_OneofUnmarshaler, _Operand_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Operand) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Operand_ConstantOperand_)(nil),
 		(*Operand_FeedAttributeOperand_)(nil),
 		(*Operand_FunctionOperand_)(nil),
@@ -219,108 +224,6 @@ func (*Operand) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error
 	}
 }
 
-func _Operand_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Operand)
-	// function_argument_operand
-	switch x := m.FunctionArgumentOperand.(type) {
-	case *Operand_ConstantOperand_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConstantOperand); err != nil {
-			return err
-		}
-	case *Operand_FeedAttributeOperand_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedAttributeOperand); err != nil {
-			return err
-		}
-	case *Operand_FunctionOperand_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FunctionOperand); err != nil {
-			return err
-		}
-	case *Operand_RequestContextOperand_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RequestContextOperand); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Operand.FunctionArgumentOperand has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Operand_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Operand)
-	switch tag {
-	case 1: // function_argument_operand.constant_operand
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Operand_ConstantOperand)
-		err := b.DecodeMessage(msg)
-		m.FunctionArgumentOperand = &Operand_ConstantOperand_{msg}
-		return true, err
-	case 2: // function_argument_operand.feed_attribute_operand
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Operand_FeedAttributeOperand)
-		err := b.DecodeMessage(msg)
-		m.FunctionArgumentOperand = &Operand_FeedAttributeOperand_{msg}
-		return true, err
-	case 3: // function_argument_operand.function_operand
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Operand_FunctionOperand)
-		err := b.DecodeMessage(msg)
-		m.FunctionArgumentOperand = &Operand_FunctionOperand_{msg}
-		return true, err
-	case 4: // function_argument_operand.request_context_operand
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Operand_RequestContextOperand)
-		err := b.DecodeMessage(msg)
-		m.FunctionArgumentOperand = &Operand_RequestContextOperand_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Operand_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Operand)
-	// function_argument_operand
-	switch x := m.FunctionArgumentOperand.(type) {
-	case *Operand_ConstantOperand_:
-		s := proto.Size(x.ConstantOperand)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Operand_FeedAttributeOperand_:
-		s := proto.Size(x.FeedAttributeOperand)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Operand_FunctionOperand_:
-		s := proto.Size(x.FunctionOperand)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Operand_RequestContextOperand_:
-		s := proto.Size(x.RequestContextOperand)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A constant operand in a matching function.
 type Operand_ConstantOperand struct {
 	// Constant operand values. Required.
@@ -340,16 +243,17 @@ func (m *Operand_ConstantOperand) Reset()         { *m = Operand_ConstantOperand
 func (m *Operand_ConstantOperand) String() string { return proto.CompactTextString(m) }
 func (*Operand_ConstantOperand) ProtoMessage()    {}
 func (*Operand_ConstantOperand) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_724626b702bec12d, []int{1, 0}
+	return fileDescriptor_1378ef15dce1f854, []int{1, 0}
 }
+
 func (m *Operand_ConstantOperand) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operand_ConstantOperand.Unmarshal(m, b)
 }
 func (m *Operand_ConstantOperand) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operand_ConstantOperand.Marshal(b, m, deterministic)
 }
-func (dst *Operand_ConstantOperand) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operand_ConstantOperand.Merge(dst, src)
+func (m *Operand_ConstantOperand) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operand_ConstantOperand.Merge(m, src)
 }
 func (m *Operand_ConstantOperand) XXX_Size() int {
 	return xxx_messageInfo_Operand_ConstantOperand.Size(m)
@@ -423,9 +327,9 @@ func (m *Operand_ConstantOperand) GetDoubleValue() *wrappers.DoubleValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Operand_ConstantOperand) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Operand_ConstantOperand_OneofMarshaler, _Operand_ConstantOperand_OneofUnmarshaler, _Operand_ConstantOperand_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Operand_ConstantOperand) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Operand_ConstantOperand_StringValue)(nil),
 		(*Operand_ConstantOperand_LongValue)(nil),
 		(*Operand_ConstantOperand_BooleanValue)(nil),
@@ -433,108 +337,6 @@ func (*Operand_ConstantOperand) XXX_OneofFuncs() (func(msg proto.Message, b *pro
 	}
 }
 
-func _Operand_ConstantOperand_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Operand_ConstantOperand)
-	// constant_operand_value
-	switch x := m.ConstantOperandValue.(type) {
-	case *Operand_ConstantOperand_StringValue:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StringValue); err != nil {
-			return err
-		}
-	case *Operand_ConstantOperand_LongValue:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LongValue); err != nil {
-			return err
-		}
-	case *Operand_ConstantOperand_BooleanValue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BooleanValue); err != nil {
-			return err
-		}
-	case *Operand_ConstantOperand_DoubleValue:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DoubleValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Operand_ConstantOperand.ConstantOperandValue has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Operand_ConstantOperand_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Operand_ConstantOperand)
-	switch tag {
-	case 1: // constant_operand_value.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ConstantOperandValue = &Operand_ConstantOperand_StringValue{msg}
-		return true, err
-	case 2: // constant_operand_value.long_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.ConstantOperandValue = &Operand_ConstantOperand_LongValue{msg}
-		return true, err
-	case 3: // constant_operand_value.boolean_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.BoolValue)
-		err := b.DecodeMessage(msg)
-		m.ConstantOperandValue = &Operand_ConstantOperand_BooleanValue{msg}
-		return true, err
-	case 4: // constant_operand_value.double_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.DoubleValue)
-		err := b.DecodeMessage(msg)
-		m.ConstantOperandValue = &Operand_ConstantOperand_DoubleValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Operand_ConstantOperand_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Operand_ConstantOperand)
-	// constant_operand_value
-	switch x := m.ConstantOperandValue.(type) {
-	case *Operand_ConstantOperand_StringValue:
-		s := proto.Size(x.StringValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Operand_ConstantOperand_LongValue:
-		s := proto.Size(x.LongValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Operand_ConstantOperand_BooleanValue:
-		s := proto.Size(x.BooleanValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Operand_ConstantOperand_DoubleValue:
-		s := proto.Size(x.DoubleValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A feed attribute operand in a matching function.
 // Used to represent a feed attribute in feed.
 type Operand_FeedAttributeOperand struct {
@@ -551,16 +353,17 @@ func (m *Operand_FeedAttributeOperand) Reset()         { *m = Operand_FeedAttrib
 func (m *Operand_FeedAttributeOperand) String() string { return proto.CompactTextString(m) }
 func (*Operand_FeedAttributeOperand) ProtoMessage()    {}
 func (*Operand_FeedAttributeOperand) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_724626b702bec12d, []int{1, 1}
+	return fileDescriptor_1378ef15dce1f854, []int{1, 1}
 }
+
 func (m *Operand_FeedAttributeOperand) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operand_FeedAttributeOperand.Unmarshal(m, b)
 }
 func (m *Operand_FeedAttributeOperand) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operand_FeedAttributeOperand.Marshal(b, m, deterministic)
 }
-func (dst *Operand_FeedAttributeOperand) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operand_FeedAttributeOperand.Merge(dst, src)
+func (m *Operand_FeedAttributeOperand) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operand_FeedAttributeOperand.Merge(m, src)
 }
 func (m *Operand_FeedAttributeOperand) XXX_Size() int {
 	return xxx_messageInfo_Operand_FeedAttributeOperand.Size(m)
@@ -599,16 +402,17 @@ func (m *Operand_FunctionOperand) Reset()         { *m = Operand_FunctionOperand
 func (m *Operand_FunctionOperand) String() string { return proto.CompactTextString(m) }
 func (*Operand_FunctionOperand) ProtoMessage()    {}
 func (*Operand_FunctionOperand) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_724626b702bec12d, []int{1, 2}
+	return fileDescriptor_1378ef15dce1f854, []int{1, 2}
 }
+
 func (m *Operand_FunctionOperand) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operand_FunctionOperand.Unmarshal(m, b)
 }
 func (m *Operand_FunctionOperand) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operand_FunctionOperand.Marshal(b, m, deterministic)
 }
-func (dst *Operand_FunctionOperand) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operand_FunctionOperand.Merge(dst, src)
+func (m *Operand_FunctionOperand) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operand_FunctionOperand.Merge(m, src)
 }
 func (m *Operand_FunctionOperand) XXX_Size() int {
 	return xxx_messageInfo_Operand_FunctionOperand.Size(m)
@@ -639,16 +443,17 @@ func (m *Operand_RequestContextOperand) Reset()         { *m = Operand_RequestCo
 func (m *Operand_RequestContextOperand) String() string { return proto.CompactTextString(m) }
 func (*Operand_RequestContextOperand) ProtoMessage()    {}
 func (*Operand_RequestContextOperand) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_724626b702bec12d, []int{1, 3}
+	return fileDescriptor_1378ef15dce1f854, []int{1, 3}
 }
+
 func (m *Operand_RequestContextOperand) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operand_RequestContextOperand.Unmarshal(m, b)
 }
 func (m *Operand_RequestContextOperand) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operand_RequestContextOperand.Marshal(b, m, deterministic)
 }
-func (dst *Operand_RequestContextOperand) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operand_RequestContextOperand.Merge(dst, src)
+func (m *Operand_RequestContextOperand) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operand_RequestContextOperand.Merge(m, src)
 }
 func (m *Operand_RequestContextOperand) XXX_Size() int {
 	return xxx_messageInfo_Operand_RequestContextOperand.Size(m)
@@ -676,10 +481,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/matching_function.proto", fileDescriptor_matching_function_724626b702bec12d)
+	proto.RegisterFile("google/ads/googleads/v1/common/matching_function.proto", fileDescriptor_1378ef15dce1f854)
 }
 
-var fileDescriptor_matching_function_724626b702bec12d = []byte{
+var fileDescriptor_1378ef15dce1f854 = []byte{
 	// 750 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcd, 0x4e, 0xdb, 0x4a,
 	0x14, 0x26, 0x09, 0x82, 0xcb, 0x24, 0x24, 0x60, 0x01, 0x37, 0x37, 0x20, 0x84, 0xb2, 0xb9, 0xac,
diff --git a/googleapis/ads/googleads/v1/common/metrics.pb.go b/googleapis/ads/googleads/v1/common/metrics.pb.go
index b8672cc13c..6bf7631c42 100644
--- a/googleapis/ads/googleads/v1/common/metrics.pb.go
+++ b/googleapis/ads/googleads/v1/common/metrics.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/metrics.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Metrics data.
 type Metrics struct {
@@ -412,16 +415,17 @@ func (m *Metrics) Reset()         { *m = Metrics{} }
 func (m *Metrics) String() string { return proto.CompactTextString(m) }
 func (*Metrics) ProtoMessage()    {}
 func (*Metrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metrics_a6092c916b5f5d74, []int{0}
+	return fileDescriptor_1ce737312db00b98, []int{0}
 }
+
 func (m *Metrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Metrics.Unmarshal(m, b)
 }
 func (m *Metrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Metrics.Marshal(b, m, deterministic)
 }
-func (dst *Metrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Metrics.Merge(dst, src)
+func (m *Metrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metrics.Merge(m, src)
 }
 func (m *Metrics) XXX_Size() int {
 	return xxx_messageInfo_Metrics.Size(m)
@@ -1207,10 +1211,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/metrics.proto", fileDescriptor_metrics_a6092c916b5f5d74)
+	proto.RegisterFile("google/ads/googleads/v1/common/metrics.proto", fileDescriptor_1ce737312db00b98)
 }
 
-var fileDescriptor_metrics_a6092c916b5f5d74 = []byte{
+var fileDescriptor_1ce737312db00b98 = []byte{
 	// 2556 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x9a, 0xdb, 0x72, 0x14, 0xc7,
 	0x19, 0xc7, 0x6b, 0x21, 0x65, 0x27, 0x9f, 0x40, 0xc2, 0x83, 0x80, 0x96, 0x2c, 0x4b, 0x42, 0x01,
diff --git a/googleapis/ads/googleads/v1/common/policy.pb.go b/googleapis/ads/googleads/v1/common/policy.pb.go
index c2656f1ef5..d3aa304c69 100644
--- a/googleapis/ads/googleads/v1/common/policy.pb.go
+++ b/googleapis/ads/googleads/v1/common/policy.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/policy.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Key of the violation. The key is used for referring to a violation
 // when filing an exemption request.
@@ -41,16 +44,17 @@ func (m *PolicyViolationKey) Reset()         { *m = PolicyViolationKey{} }
 func (m *PolicyViolationKey) String() string { return proto.CompactTextString(m) }
 func (*PolicyViolationKey) ProtoMessage()    {}
 func (*PolicyViolationKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{0}
+	return fileDescriptor_abac22fabf79a39c, []int{0}
 }
+
 func (m *PolicyViolationKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyViolationKey.Unmarshal(m, b)
 }
 func (m *PolicyViolationKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyViolationKey.Marshal(b, m, deterministic)
 }
-func (dst *PolicyViolationKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyViolationKey.Merge(dst, src)
+func (m *PolicyViolationKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyViolationKey.Merge(m, src)
 }
 func (m *PolicyViolationKey) XXX_Size() int {
 	return xxx_messageInfo_PolicyViolationKey.Size(m)
@@ -107,16 +111,17 @@ func (m *PolicyValidationParameter) Reset()         { *m = PolicyValidationParam
 func (m *PolicyValidationParameter) String() string { return proto.CompactTextString(m) }
 func (*PolicyValidationParameter) ProtoMessage()    {}
 func (*PolicyValidationParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{1}
+	return fileDescriptor_abac22fabf79a39c, []int{1}
 }
+
 func (m *PolicyValidationParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyValidationParameter.Unmarshal(m, b)
 }
 func (m *PolicyValidationParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyValidationParameter.Marshal(b, m, deterministic)
 }
-func (dst *PolicyValidationParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyValidationParameter.Merge(dst, src)
+func (m *PolicyValidationParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyValidationParameter.Merge(m, src)
 }
 func (m *PolicyValidationParameter) XXX_Size() int {
 	return xxx_messageInfo_PolicyValidationParameter.Size(m)
@@ -172,16 +177,17 @@ func (m *PolicyTopicEntry) Reset()         { *m = PolicyTopicEntry{} }
 func (m *PolicyTopicEntry) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEntry) ProtoMessage()    {}
 func (*PolicyTopicEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{2}
+	return fileDescriptor_abac22fabf79a39c, []int{2}
 }
+
 func (m *PolicyTopicEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEntry.Unmarshal(m, b)
 }
 func (m *PolicyTopicEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEntry.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEntry.Merge(dst, src)
+func (m *PolicyTopicEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEntry.Merge(m, src)
 }
 func (m *PolicyTopicEntry) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEntry.Size(m)
@@ -242,16 +248,17 @@ func (m *PolicyTopicEvidence) Reset()         { *m = PolicyTopicEvidence{} }
 func (m *PolicyTopicEvidence) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEvidence) ProtoMessage()    {}
 func (*PolicyTopicEvidence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{3}
+	return fileDescriptor_abac22fabf79a39c, []int{3}
 }
+
 func (m *PolicyTopicEvidence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidence.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidence.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidence.Merge(dst, src)
+func (m *PolicyTopicEvidence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidence.Merge(m, src)
 }
 func (m *PolicyTopicEvidence) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidence.Size(m)
@@ -364,9 +371,9 @@ func (m *PolicyTopicEvidence) GetDestinationNotWorking() *PolicyTopicEvidence_De
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PolicyTopicEvidence) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PolicyTopicEvidence_OneofMarshaler, _PolicyTopicEvidence_OneofUnmarshaler, _PolicyTopicEvidence_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PolicyTopicEvidence) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PolicyTopicEvidence_HttpCode)(nil),
 		(*PolicyTopicEvidence_WebsiteList_)(nil),
 		(*PolicyTopicEvidence_TextList_)(nil),
@@ -377,162 +384,6 @@ func (*PolicyTopicEvidence) XXX_OneofFuncs() (func(msg proto.Message, b *proto.B
 	}
 }
 
-func _PolicyTopicEvidence_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PolicyTopicEvidence)
-	// value
-	switch x := m.Value.(type) {
-	case *PolicyTopicEvidence_HttpCode:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HttpCode); err != nil {
-			return err
-		}
-	case *PolicyTopicEvidence_WebsiteList_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.WebsiteList); err != nil {
-			return err
-		}
-	case *PolicyTopicEvidence_TextList_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextList); err != nil {
-			return err
-		}
-	case *PolicyTopicEvidence_LanguageCode:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LanguageCode); err != nil {
-			return err
-		}
-	case *PolicyTopicEvidence_DestinationTextList_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DestinationTextList); err != nil {
-			return err
-		}
-	case *PolicyTopicEvidence_DestinationMismatch_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DestinationMismatch); err != nil {
-			return err
-		}
-	case *PolicyTopicEvidence_DestinationNotWorking_:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DestinationNotWorking); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PolicyTopicEvidence.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PolicyTopicEvidence_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PolicyTopicEvidence)
-	switch tag {
-	case 2: // value.http_code
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int32Value)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicEvidence_HttpCode{msg}
-		return true, err
-	case 3: // value.website_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicEvidence_WebsiteList)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicEvidence_WebsiteList_{msg}
-		return true, err
-	case 4: // value.text_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicEvidence_TextList)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicEvidence_TextList_{msg}
-		return true, err
-	case 5: // value.language_code
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicEvidence_LanguageCode{msg}
-		return true, err
-	case 6: // value.destination_text_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicEvidence_DestinationTextList)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicEvidence_DestinationTextList_{msg}
-		return true, err
-	case 7: // value.destination_mismatch
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicEvidence_DestinationMismatch)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicEvidence_DestinationMismatch_{msg}
-		return true, err
-	case 8: // value.destination_not_working
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicEvidence_DestinationNotWorking)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicEvidence_DestinationNotWorking_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PolicyTopicEvidence_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PolicyTopicEvidence)
-	// value
-	switch x := m.Value.(type) {
-	case *PolicyTopicEvidence_HttpCode:
-		s := proto.Size(x.HttpCode)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicEvidence_WebsiteList_:
-		s := proto.Size(x.WebsiteList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicEvidence_TextList_:
-		s := proto.Size(x.TextList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicEvidence_LanguageCode:
-		s := proto.Size(x.LanguageCode)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicEvidence_DestinationTextList_:
-		s := proto.Size(x.DestinationTextList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicEvidence_DestinationMismatch_:
-		s := proto.Size(x.DestinationMismatch)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicEvidence_DestinationNotWorking_:
-		s := proto.Size(x.DestinationNotWorking)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A list of fragments of text that violated a policy.
 type PolicyTopicEvidence_TextList struct {
 	// The fragments of text from the resource that caused the policy finding.
@@ -546,16 +397,17 @@ func (m *PolicyTopicEvidence_TextList) Reset()         { *m = PolicyTopicEvidenc
 func (m *PolicyTopicEvidence_TextList) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEvidence_TextList) ProtoMessage()    {}
 func (*PolicyTopicEvidence_TextList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{3, 0}
+	return fileDescriptor_abac22fabf79a39c, []int{3, 0}
 }
+
 func (m *PolicyTopicEvidence_TextList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidence_TextList.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidence_TextList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidence_TextList.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidence_TextList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidence_TextList.Merge(dst, src)
+func (m *PolicyTopicEvidence_TextList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidence_TextList.Merge(m, src)
 }
 func (m *PolicyTopicEvidence_TextList) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidence_TextList.Size(m)
@@ -589,16 +441,17 @@ func (m *PolicyTopicEvidence_WebsiteList) Reset()         { *m = PolicyTopicEvid
 func (m *PolicyTopicEvidence_WebsiteList) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEvidence_WebsiteList) ProtoMessage()    {}
 func (*PolicyTopicEvidence_WebsiteList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{3, 1}
+	return fileDescriptor_abac22fabf79a39c, []int{3, 1}
 }
+
 func (m *PolicyTopicEvidence_WebsiteList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidence_WebsiteList.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidence_WebsiteList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidence_WebsiteList.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidence_WebsiteList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidence_WebsiteList.Merge(dst, src)
+func (m *PolicyTopicEvidence_WebsiteList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidence_WebsiteList.Merge(m, src)
 }
 func (m *PolicyTopicEvidence_WebsiteList) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidence_WebsiteList.Size(m)
@@ -632,16 +485,17 @@ func (m *PolicyTopicEvidence_DestinationTextList) Reset() {
 func (m *PolicyTopicEvidence_DestinationTextList) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEvidence_DestinationTextList) ProtoMessage()    {}
 func (*PolicyTopicEvidence_DestinationTextList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{3, 2}
+	return fileDescriptor_abac22fabf79a39c, []int{3, 2}
 }
+
 func (m *PolicyTopicEvidence_DestinationTextList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationTextList.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidence_DestinationTextList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationTextList.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidence_DestinationTextList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidence_DestinationTextList.Merge(dst, src)
+func (m *PolicyTopicEvidence_DestinationTextList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidence_DestinationTextList.Merge(m, src)
 }
 func (m *PolicyTopicEvidence_DestinationTextList) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationTextList.Size(m)
@@ -674,16 +528,17 @@ func (m *PolicyTopicEvidence_DestinationMismatch) Reset() {
 func (m *PolicyTopicEvidence_DestinationMismatch) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEvidence_DestinationMismatch) ProtoMessage()    {}
 func (*PolicyTopicEvidence_DestinationMismatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{3, 3}
+	return fileDescriptor_abac22fabf79a39c, []int{3, 3}
 }
+
 func (m *PolicyTopicEvidence_DestinationMismatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationMismatch.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidence_DestinationMismatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationMismatch.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidence_DestinationMismatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidence_DestinationMismatch.Merge(dst, src)
+func (m *PolicyTopicEvidence_DestinationMismatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidence_DestinationMismatch.Merge(m, src)
 }
 func (m *PolicyTopicEvidence_DestinationMismatch) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationMismatch.Size(m)
@@ -723,16 +578,17 @@ func (m *PolicyTopicEvidence_DestinationNotWorking) Reset() {
 func (m *PolicyTopicEvidence_DestinationNotWorking) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEvidence_DestinationNotWorking) ProtoMessage()    {}
 func (*PolicyTopicEvidence_DestinationNotWorking) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{3, 4}
+	return fileDescriptor_abac22fabf79a39c, []int{3, 4}
 }
+
 func (m *PolicyTopicEvidence_DestinationNotWorking) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationNotWorking.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidence_DestinationNotWorking) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationNotWorking.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidence_DestinationNotWorking) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidence_DestinationNotWorking.Merge(dst, src)
+func (m *PolicyTopicEvidence_DestinationNotWorking) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidence_DestinationNotWorking.Merge(m, src)
 }
 func (m *PolicyTopicEvidence_DestinationNotWorking) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidence_DestinationNotWorking.Size(m)
@@ -783,16 +639,17 @@ func (m *PolicyTopicConstraint) Reset()         { *m = PolicyTopicConstraint{} }
 func (m *PolicyTopicConstraint) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicConstraint) ProtoMessage()    {}
 func (*PolicyTopicConstraint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{4}
+	return fileDescriptor_abac22fabf79a39c, []int{4}
 }
+
 func (m *PolicyTopicConstraint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicConstraint.Unmarshal(m, b)
 }
 func (m *PolicyTopicConstraint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicConstraint.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicConstraint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicConstraint.Merge(dst, src)
+func (m *PolicyTopicConstraint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicConstraint.Merge(m, src)
 }
 func (m *PolicyTopicConstraint) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicConstraint.Size(m)
@@ -866,9 +723,9 @@ func (m *PolicyTopicConstraint) GetCertificateDomainMismatchInCountryList() *Pol
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PolicyTopicConstraint) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PolicyTopicConstraint_OneofMarshaler, _PolicyTopicConstraint_OneofUnmarshaler, _PolicyTopicConstraint_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PolicyTopicConstraint) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PolicyTopicConstraint_CountryConstraintList_)(nil),
 		(*PolicyTopicConstraint_ResellerConstraint_)(nil),
 		(*PolicyTopicConstraint_CertificateMissingInCountryList)(nil),
@@ -876,108 +733,6 @@ func (*PolicyTopicConstraint) XXX_OneofFuncs() (func(msg proto.Message, b *proto
 	}
 }
 
-func _PolicyTopicConstraint_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PolicyTopicConstraint)
-	// value
-	switch x := m.Value.(type) {
-	case *PolicyTopicConstraint_CountryConstraintList_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CountryConstraintList); err != nil {
-			return err
-		}
-	case *PolicyTopicConstraint_ResellerConstraint_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ResellerConstraint); err != nil {
-			return err
-		}
-	case *PolicyTopicConstraint_CertificateMissingInCountryList:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CertificateMissingInCountryList); err != nil {
-			return err
-		}
-	case *PolicyTopicConstraint_CertificateDomainMismatchInCountryList:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CertificateDomainMismatchInCountryList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PolicyTopicConstraint.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PolicyTopicConstraint_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PolicyTopicConstraint)
-	switch tag {
-	case 1: // value.country_constraint_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicConstraint_CountryConstraintList)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicConstraint_CountryConstraintList_{msg}
-		return true, err
-	case 2: // value.reseller_constraint
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicConstraint_ResellerConstraint)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicConstraint_ResellerConstraint_{msg}
-		return true, err
-	case 3: // value.certificate_missing_in_country_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicConstraint_CountryConstraintList)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicConstraint_CertificateMissingInCountryList{msg}
-		return true, err
-	case 4: // value.certificate_domain_mismatch_in_country_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolicyTopicConstraint_CountryConstraintList)
-		err := b.DecodeMessage(msg)
-		m.Value = &PolicyTopicConstraint_CertificateDomainMismatchInCountryList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PolicyTopicConstraint_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PolicyTopicConstraint)
-	// value
-	switch x := m.Value.(type) {
-	case *PolicyTopicConstraint_CountryConstraintList_:
-		s := proto.Size(x.CountryConstraintList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicConstraint_ResellerConstraint_:
-		s := proto.Size(x.ResellerConstraint)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicConstraint_CertificateMissingInCountryList:
-		s := proto.Size(x.CertificateMissingInCountryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PolicyTopicConstraint_CertificateDomainMismatchInCountryList:
-		s := proto.Size(x.CertificateDomainMismatchInCountryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A list of countries where a resource's serving is constrained.
 type PolicyTopicConstraint_CountryConstraintList struct {
 	// Total number of countries targeted by the resource.
@@ -997,16 +752,17 @@ func (m *PolicyTopicConstraint_CountryConstraintList) String() string {
 }
 func (*PolicyTopicConstraint_CountryConstraintList) ProtoMessage() {}
 func (*PolicyTopicConstraint_CountryConstraintList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{4, 0}
+	return fileDescriptor_abac22fabf79a39c, []int{4, 0}
 }
+
 func (m *PolicyTopicConstraint_CountryConstraintList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicConstraint_CountryConstraintList.Unmarshal(m, b)
 }
 func (m *PolicyTopicConstraint_CountryConstraintList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicConstraint_CountryConstraintList.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicConstraint_CountryConstraintList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicConstraint_CountryConstraintList.Merge(dst, src)
+func (m *PolicyTopicConstraint_CountryConstraintList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicConstraint_CountryConstraintList.Merge(m, src)
 }
 func (m *PolicyTopicConstraint_CountryConstraintList) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicConstraint_CountryConstraintList.Size(m)
@@ -1045,16 +801,17 @@ func (m *PolicyTopicConstraint_ResellerConstraint) Reset() {
 func (m *PolicyTopicConstraint_ResellerConstraint) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicConstraint_ResellerConstraint) ProtoMessage()    {}
 func (*PolicyTopicConstraint_ResellerConstraint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{4, 1}
+	return fileDescriptor_abac22fabf79a39c, []int{4, 1}
 }
+
 func (m *PolicyTopicConstraint_ResellerConstraint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicConstraint_ResellerConstraint.Unmarshal(m, b)
 }
 func (m *PolicyTopicConstraint_ResellerConstraint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicConstraint_ResellerConstraint.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicConstraint_ResellerConstraint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicConstraint_ResellerConstraint.Merge(dst, src)
+func (m *PolicyTopicConstraint_ResellerConstraint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicConstraint_ResellerConstraint.Merge(m, src)
 }
 func (m *PolicyTopicConstraint_ResellerConstraint) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicConstraint_ResellerConstraint.Size(m)
@@ -1082,16 +839,17 @@ func (m *PolicyTopicConstraint_CountryConstraint) Reset() {
 func (m *PolicyTopicConstraint_CountryConstraint) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicConstraint_CountryConstraint) ProtoMessage()    {}
 func (*PolicyTopicConstraint_CountryConstraint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_0b37253ad551feaf, []int{4, 2}
+	return fileDescriptor_abac22fabf79a39c, []int{4, 2}
 }
+
 func (m *PolicyTopicConstraint_CountryConstraint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicConstraint_CountryConstraint.Unmarshal(m, b)
 }
 func (m *PolicyTopicConstraint_CountryConstraint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicConstraint_CountryConstraint.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicConstraint_CountryConstraint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicConstraint_CountryConstraint.Merge(dst, src)
+func (m *PolicyTopicConstraint_CountryConstraint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicConstraint_CountryConstraint.Merge(m, src)
 }
 func (m *PolicyTopicConstraint_CountryConstraint) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicConstraint_CountryConstraint.Size(m)
@@ -1126,10 +884,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/policy.proto", fileDescriptor_policy_0b37253ad551feaf)
+	proto.RegisterFile("google/ads/googleads/v1/common/policy.proto", fileDescriptor_abac22fabf79a39c)
 }
 
-var fileDescriptor_policy_0b37253ad551feaf = []byte{
+var fileDescriptor_abac22fabf79a39c = []byte{
 	// 1167 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcb, 0x6e, 0x1b, 0x37,
 	0x14, 0xf5, 0xc8, 0x2f, 0x99, 0x72, 0x0c, 0x87, 0x8e, 0x62, 0x45, 0x35, 0xd2, 0x40, 0x05, 0x8a,
diff --git a/googleapis/ads/googleads/v1/common/real_time_bidding_setting.pb.go b/googleapis/ads/googleads/v1/common/real_time_bidding_setting.pb.go
index 11901c8d54..c715deaf4d 100644
--- a/googleapis/ads/googleads/v1/common/real_time_bidding_setting.pb.go
+++ b/googleapis/ads/googleads/v1/common/real_time_bidding_setting.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/real_time_bidding_setting.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Settings for Real-Time Bidding, a feature only available for campaigns
 // targeting the Ad Exchange network.
@@ -34,16 +37,17 @@ func (m *RealTimeBiddingSetting) Reset()         { *m = RealTimeBiddingSetting{}
 func (m *RealTimeBiddingSetting) String() string { return proto.CompactTextString(m) }
 func (*RealTimeBiddingSetting) ProtoMessage()    {}
 func (*RealTimeBiddingSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_real_time_bidding_setting_e97ac2ff6d978f8d, []int{0}
+	return fileDescriptor_7241f0db40dc1f31, []int{0}
 }
+
 func (m *RealTimeBiddingSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RealTimeBiddingSetting.Unmarshal(m, b)
 }
 func (m *RealTimeBiddingSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RealTimeBiddingSetting.Marshal(b, m, deterministic)
 }
-func (dst *RealTimeBiddingSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RealTimeBiddingSetting.Merge(dst, src)
+func (m *RealTimeBiddingSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RealTimeBiddingSetting.Merge(m, src)
 }
 func (m *RealTimeBiddingSetting) XXX_Size() int {
 	return xxx_messageInfo_RealTimeBiddingSetting.Size(m)
@@ -66,10 +70,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/real_time_bidding_setting.proto", fileDescriptor_real_time_bidding_setting_e97ac2ff6d978f8d)
+	proto.RegisterFile("google/ads/googleads/v1/common/real_time_bidding_setting.proto", fileDescriptor_7241f0db40dc1f31)
 }
 
-var fileDescriptor_real_time_bidding_setting_e97ac2ff6d978f8d = []byte{
+var fileDescriptor_7241f0db40dc1f31 = []byte{
 	// 303 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xec, 0x30,
 	0x14, 0x86, 0xe9, 0x5c, 0xee, 0x2c, 0xea, 0x6e, 0x16, 0x22, 0xa3, 0x0c, 0x32, 0x2b, 0x57, 0x09,
diff --git a/googleapis/ads/googleads/v1/common/segments.pb.go b/googleapis/ads/googleads/v1/common/segments.pb.go
index 6afc569f9d..119ff9dfd6 100644
--- a/googleapis/ads/googleads/v1/common/segments.pb.go
+++ b/googleapis/ads/googleads/v1/common/segments.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/segments.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Segment only fields.
 type Segments struct {
@@ -191,16 +194,17 @@ func (m *Segments) Reset()         { *m = Segments{} }
 func (m *Segments) String() string { return proto.CompactTextString(m) }
 func (*Segments) ProtoMessage()    {}
 func (*Segments) Descriptor() ([]byte, []int) {
-	return fileDescriptor_segments_284023ab6b41c387, []int{0}
+	return fileDescriptor_e9c6876208f1817a, []int{0}
 }
+
 func (m *Segments) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Segments.Unmarshal(m, b)
 }
 func (m *Segments) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Segments.Marshal(b, m, deterministic)
 }
-func (dst *Segments) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Segments.Merge(dst, src)
+func (m *Segments) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Segments.Merge(m, src)
 }
 func (m *Segments) XXX_Size() int {
 	return xxx_messageInfo_Segments.Size(m)
@@ -730,16 +734,17 @@ func (m *Keyword) Reset()         { *m = Keyword{} }
 func (m *Keyword) String() string { return proto.CompactTextString(m) }
 func (*Keyword) ProtoMessage()    {}
 func (*Keyword) Descriptor() ([]byte, []int) {
-	return fileDescriptor_segments_284023ab6b41c387, []int{1}
+	return fileDescriptor_e9c6876208f1817a, []int{1}
 }
+
 func (m *Keyword) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Keyword.Unmarshal(m, b)
 }
 func (m *Keyword) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Keyword.Marshal(b, m, deterministic)
 }
-func (dst *Keyword) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Keyword.Merge(dst, src)
+func (m *Keyword) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Keyword.Merge(m, src)
 }
 func (m *Keyword) XXX_Size() int {
 	return xxx_messageInfo_Keyword.Size(m)
@@ -770,10 +775,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/segments.proto", fileDescriptor_segments_284023ab6b41c387)
+	proto.RegisterFile("google/ads/googleads/v1/common/segments.proto", fileDescriptor_e9c6876208f1817a)
 }
 
-var fileDescriptor_segments_284023ab6b41c387 = []byte{
+var fileDescriptor_e9c6876208f1817a = []byte{
 	// 2031 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x99, 0x5d, 0x7b, 0xdb, 0xb6,
 	0x15, 0xc7, 0x1f, 0xa5, 0x6e, 0xd2, 0xc0, 0x75, 0x6c, 0xc3, 0x89, 0x8b, 0x38, 0xef, 0xee, 0xb6,
diff --git a/googleapis/ads/googleads/v1/common/simulation.pb.go b/googleapis/ads/googleads/v1/common/simulation.pb.go
index c089b8a25a..7e451a7d08 100644
--- a/googleapis/ads/googleads/v1/common/simulation.pb.go
+++ b/googleapis/ads/googleads/v1/common/simulation.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/simulation.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A container for simulation points for simulations of type BID_MODIFIER.
 type BidModifierSimulationPointList struct {
@@ -33,16 +36,17 @@ func (m *BidModifierSimulationPointList) Reset()         { *m = BidModifierSimul
 func (m *BidModifierSimulationPointList) String() string { return proto.CompactTextString(m) }
 func (*BidModifierSimulationPointList) ProtoMessage()    {}
 func (*BidModifierSimulationPointList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_236f10bcdfcd99b7, []int{0}
+	return fileDescriptor_a4802a06f80f525c, []int{0}
 }
+
 func (m *BidModifierSimulationPointList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BidModifierSimulationPointList.Unmarshal(m, b)
 }
 func (m *BidModifierSimulationPointList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BidModifierSimulationPointList.Marshal(b, m, deterministic)
 }
-func (dst *BidModifierSimulationPointList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BidModifierSimulationPointList.Merge(dst, src)
+func (m *BidModifierSimulationPointList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BidModifierSimulationPointList.Merge(m, src)
 }
 func (m *BidModifierSimulationPointList) XXX_Size() int {
 	return xxx_messageInfo_BidModifierSimulationPointList.Size(m)
@@ -73,16 +77,17 @@ func (m *CpcBidSimulationPointList) Reset()         { *m = CpcBidSimulationPoint
 func (m *CpcBidSimulationPointList) String() string { return proto.CompactTextString(m) }
 func (*CpcBidSimulationPointList) ProtoMessage()    {}
 func (*CpcBidSimulationPointList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_236f10bcdfcd99b7, []int{1}
+	return fileDescriptor_a4802a06f80f525c, []int{1}
 }
+
 func (m *CpcBidSimulationPointList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CpcBidSimulationPointList.Unmarshal(m, b)
 }
 func (m *CpcBidSimulationPointList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CpcBidSimulationPointList.Marshal(b, m, deterministic)
 }
-func (dst *CpcBidSimulationPointList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CpcBidSimulationPointList.Merge(dst, src)
+func (m *CpcBidSimulationPointList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CpcBidSimulationPointList.Merge(m, src)
 }
 func (m *CpcBidSimulationPointList) XXX_Size() int {
 	return xxx_messageInfo_CpcBidSimulationPointList.Size(m)
@@ -113,16 +118,17 @@ func (m *TargetCpaSimulationPointList) Reset()         { *m = TargetCpaSimulatio
 func (m *TargetCpaSimulationPointList) String() string { return proto.CompactTextString(m) }
 func (*TargetCpaSimulationPointList) ProtoMessage()    {}
 func (*TargetCpaSimulationPointList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_236f10bcdfcd99b7, []int{2}
+	return fileDescriptor_a4802a06f80f525c, []int{2}
 }
+
 func (m *TargetCpaSimulationPointList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetCpaSimulationPointList.Unmarshal(m, b)
 }
 func (m *TargetCpaSimulationPointList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetCpaSimulationPointList.Marshal(b, m, deterministic)
 }
-func (dst *TargetCpaSimulationPointList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetCpaSimulationPointList.Merge(dst, src)
+func (m *TargetCpaSimulationPointList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetCpaSimulationPointList.Merge(m, src)
 }
 func (m *TargetCpaSimulationPointList) XXX_Size() int {
 	return xxx_messageInfo_TargetCpaSimulationPointList.Size(m)
@@ -165,16 +171,17 @@ func (m *BidModifierSimulationPoint) Reset()         { *m = BidModifierSimulatio
 func (m *BidModifierSimulationPoint) String() string { return proto.CompactTextString(m) }
 func (*BidModifierSimulationPoint) ProtoMessage()    {}
 func (*BidModifierSimulationPoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_236f10bcdfcd99b7, []int{3}
+	return fileDescriptor_a4802a06f80f525c, []int{3}
 }
+
 func (m *BidModifierSimulationPoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BidModifierSimulationPoint.Unmarshal(m, b)
 }
 func (m *BidModifierSimulationPoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BidModifierSimulationPoint.Marshal(b, m, deterministic)
 }
-func (dst *BidModifierSimulationPoint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BidModifierSimulationPoint.Merge(dst, src)
+func (m *BidModifierSimulationPoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BidModifierSimulationPoint.Merge(m, src)
 }
 func (m *BidModifierSimulationPoint) XXX_Size() int {
 	return xxx_messageInfo_BidModifierSimulationPoint.Size(m)
@@ -260,16 +267,17 @@ func (m *CpcBidSimulationPoint) Reset()         { *m = CpcBidSimulationPoint{} }
 func (m *CpcBidSimulationPoint) String() string { return proto.CompactTextString(m) }
 func (*CpcBidSimulationPoint) ProtoMessage()    {}
 func (*CpcBidSimulationPoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_236f10bcdfcd99b7, []int{4}
+	return fileDescriptor_a4802a06f80f525c, []int{4}
 }
+
 func (m *CpcBidSimulationPoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CpcBidSimulationPoint.Unmarshal(m, b)
 }
 func (m *CpcBidSimulationPoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CpcBidSimulationPoint.Marshal(b, m, deterministic)
 }
-func (dst *CpcBidSimulationPoint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CpcBidSimulationPoint.Merge(dst, src)
+func (m *CpcBidSimulationPoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CpcBidSimulationPoint.Merge(m, src)
 }
 func (m *CpcBidSimulationPoint) XXX_Size() int {
 	return xxx_messageInfo_CpcBidSimulationPoint.Size(m)
@@ -355,16 +363,17 @@ func (m *TargetCpaSimulationPoint) Reset()         { *m = TargetCpaSimulationPoi
 func (m *TargetCpaSimulationPoint) String() string { return proto.CompactTextString(m) }
 func (*TargetCpaSimulationPoint) ProtoMessage()    {}
 func (*TargetCpaSimulationPoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_236f10bcdfcd99b7, []int{5}
+	return fileDescriptor_a4802a06f80f525c, []int{5}
 }
+
 func (m *TargetCpaSimulationPoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetCpaSimulationPoint.Unmarshal(m, b)
 }
 func (m *TargetCpaSimulationPoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetCpaSimulationPoint.Marshal(b, m, deterministic)
 }
-func (dst *TargetCpaSimulationPoint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetCpaSimulationPoint.Merge(dst, src)
+func (m *TargetCpaSimulationPoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetCpaSimulationPoint.Merge(m, src)
 }
 func (m *TargetCpaSimulationPoint) XXX_Size() int {
 	return xxx_messageInfo_TargetCpaSimulationPoint.Size(m)
@@ -434,10 +443,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/simulation.proto", fileDescriptor_simulation_236f10bcdfcd99b7)
+	proto.RegisterFile("google/ads/googleads/v1/common/simulation.proto", fileDescriptor_a4802a06f80f525c)
 }
 
-var fileDescriptor_simulation_236f10bcdfcd99b7 = []byte{
+var fileDescriptor_a4802a06f80f525c = []byte{
 	// 570 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x96, 0xdf, 0x6a, 0xdb, 0x30,
 	0x18, 0xc5, 0x71, 0x9a, 0x65, 0xa0, 0x94, 0x95, 0x69, 0x1d, 0x78, 0x59, 0x29, 0x25, 0x57, 0xbd,
diff --git a/googleapis/ads/googleads/v1/common/tag_snippet.pb.go b/googleapis/ads/googleads/v1/common/tag_snippet.pb.go
index 5cd92f8567..23770a96a3 100644
--- a/googleapis/ads/googleads/v1/common/tag_snippet.pb.go
+++ b/googleapis/ads/googleads/v1/common/tag_snippet.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/tag_snippet.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The site tag and event snippet pair for a TrackingCodeType.
 type TagSnippet struct {
@@ -43,16 +46,17 @@ func (m *TagSnippet) Reset()         { *m = TagSnippet{} }
 func (m *TagSnippet) String() string { return proto.CompactTextString(m) }
 func (*TagSnippet) ProtoMessage()    {}
 func (*TagSnippet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tag_snippet_8ac1c7c28c0f8743, []int{0}
+	return fileDescriptor_24cd5966e9dfdab2, []int{0}
 }
+
 func (m *TagSnippet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TagSnippet.Unmarshal(m, b)
 }
 func (m *TagSnippet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TagSnippet.Marshal(b, m, deterministic)
 }
-func (dst *TagSnippet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TagSnippet.Merge(dst, src)
+func (m *TagSnippet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TagSnippet.Merge(m, src)
 }
 func (m *TagSnippet) XXX_Size() int {
 	return xxx_messageInfo_TagSnippet.Size(m)
@@ -96,10 +100,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/tag_snippet.proto", fileDescriptor_tag_snippet_8ac1c7c28c0f8743)
+	proto.RegisterFile("google/ads/googleads/v1/common/tag_snippet.proto", fileDescriptor_24cd5966e9dfdab2)
 }
 
-var fileDescriptor_tag_snippet_8ac1c7c28c0f8743 = []byte{
+var fileDescriptor_24cd5966e9dfdab2 = []byte{
 	// 421 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x4f, 0x6b, 0xdb, 0x30,
 	0x14, 0xc7, 0x6e, 0xd9, 0x41, 0x5d, 0x57, 0xf0, 0x29, 0x94, 0x52, 0x4a, 0x4e, 0x3d, 0x49, 0x73,
diff --git a/googleapis/ads/googleads/v1/common/targeting_setting.pb.go b/googleapis/ads/googleads/v1/common/targeting_setting.pb.go
index 4fd2722f78..362b2bd983 100644
--- a/googleapis/ads/googleads/v1/common/targeting_setting.pb.go
+++ b/googleapis/ads/googleads/v1/common/targeting_setting.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/targeting_setting.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Settings for the
 // <a href="https://support.google.com/google-ads/answer/7365594">
@@ -37,16 +40,17 @@ func (m *TargetingSetting) Reset()         { *m = TargetingSetting{} }
 func (m *TargetingSetting) String() string { return proto.CompactTextString(m) }
 func (*TargetingSetting) ProtoMessage()    {}
 func (*TargetingSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_targeting_setting_4ec905eba5714fb0, []int{0}
+	return fileDescriptor_fd746ab34204e313, []int{0}
 }
+
 func (m *TargetingSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetingSetting.Unmarshal(m, b)
 }
 func (m *TargetingSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetingSetting.Marshal(b, m, deterministic)
 }
-func (dst *TargetingSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetingSetting.Merge(dst, src)
+func (m *TargetingSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetingSetting.Merge(m, src)
 }
 func (m *TargetingSetting) XXX_Size() int {
 	return xxx_messageInfo_TargetingSetting.Size(m)
@@ -85,16 +89,17 @@ func (m *TargetRestriction) Reset()         { *m = TargetRestriction{} }
 func (m *TargetRestriction) String() string { return proto.CompactTextString(m) }
 func (*TargetRestriction) ProtoMessage()    {}
 func (*TargetRestriction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_targeting_setting_4ec905eba5714fb0, []int{1}
+	return fileDescriptor_fd746ab34204e313, []int{1}
 }
+
 func (m *TargetRestriction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetRestriction.Unmarshal(m, b)
 }
 func (m *TargetRestriction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetRestriction.Marshal(b, m, deterministic)
 }
-func (dst *TargetRestriction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetRestriction.Merge(dst, src)
+func (m *TargetRestriction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetRestriction.Merge(m, src)
 }
 func (m *TargetRestriction) XXX_Size() int {
 	return xxx_messageInfo_TargetRestriction.Size(m)
@@ -125,10 +130,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/targeting_setting.proto", fileDescriptor_targeting_setting_4ec905eba5714fb0)
+	proto.RegisterFile("google/ads/googleads/v1/common/targeting_setting.proto", fileDescriptor_fd746ab34204e313)
 }
 
-var fileDescriptor_targeting_setting_4ec905eba5714fb0 = []byte{
+var fileDescriptor_fd746ab34204e313 = []byte{
 	// 392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x6b, 0xdb, 0x30,
 	0x18, 0xc6, 0xb1, 0x03, 0xdb, 0x70, 0x60, 0x6c, 0x1e, 0x83, 0x10, 0x46, 0x08, 0x3e, 0xe5, 0x24,
diff --git a/googleapis/ads/googleads/v1/common/text_label.pb.go b/googleapis/ads/googleads/v1/common/text_label.pb.go
index abc9857532..c1fdf75685 100644
--- a/googleapis/ads/googleads/v1/common/text_label.pb.go
+++ b/googleapis/ads/googleads/v1/common/text_label.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/text_label.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A type of label displaying text on a colored background.
 type TextLabel struct {
@@ -38,16 +41,17 @@ func (m *TextLabel) Reset()         { *m = TextLabel{} }
 func (m *TextLabel) String() string { return proto.CompactTextString(m) }
 func (*TextLabel) ProtoMessage()    {}
 func (*TextLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_label_0fdcf32aa0b0b273, []int{0}
+	return fileDescriptor_0f97c60eafd5c770, []int{0}
 }
+
 func (m *TextLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextLabel.Unmarshal(m, b)
 }
 func (m *TextLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextLabel.Marshal(b, m, deterministic)
 }
-func (dst *TextLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextLabel.Merge(dst, src)
+func (m *TextLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextLabel.Merge(m, src)
 }
 func (m *TextLabel) XXX_Size() int {
 	return xxx_messageInfo_TextLabel.Size(m)
@@ -77,10 +81,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/text_label.proto", fileDescriptor_text_label_0fdcf32aa0b0b273)
+	proto.RegisterFile("google/ads/googleads/v1/common/text_label.proto", fileDescriptor_0f97c60eafd5c770)
 }
 
-var fileDescriptor_text_label_0fdcf32aa0b0b273 = []byte{
+var fileDescriptor_0f97c60eafd5c770 = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xc1, 0x4a, 0xfb, 0x30,
 	0x1c, 0xc7, 0x69, 0xff, 0xf0, 0x07, 0x3b, 0x50, 0xd9, 0x69, 0x8c, 0x31, 0x64, 0x27, 0x4f, 0x09,
diff --git a/googleapis/ads/googleads/v1/common/url_collection.pb.go b/googleapis/ads/googleads/v1/common/url_collection.pb.go
index 76bd7fe087..aef3daf70e 100644
--- a/googleapis/ads/googleads/v1/common/url_collection.pb.go
+++ b/googleapis/ads/googleads/v1/common/url_collection.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/url_collection.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Collection of urls that is tagged with a unique identifier.
 type UrlCollection struct {
@@ -39,16 +42,17 @@ func (m *UrlCollection) Reset()         { *m = UrlCollection{} }
 func (m *UrlCollection) String() string { return proto.CompactTextString(m) }
 func (*UrlCollection) ProtoMessage()    {}
 func (*UrlCollection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_url_collection_4410b50aa3630e5e, []int{0}
+	return fileDescriptor_82f492aa5cd99b44, []int{0}
 }
+
 func (m *UrlCollection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UrlCollection.Unmarshal(m, b)
 }
 func (m *UrlCollection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UrlCollection.Marshal(b, m, deterministic)
 }
-func (dst *UrlCollection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UrlCollection.Merge(dst, src)
+func (m *UrlCollection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UrlCollection.Merge(m, src)
 }
 func (m *UrlCollection) XXX_Size() int {
 	return xxx_messageInfo_UrlCollection.Size(m)
@@ -92,10 +96,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/url_collection.proto", fileDescriptor_url_collection_4410b50aa3630e5e)
+	proto.RegisterFile("google/ads/googleads/v1/common/url_collection.proto", fileDescriptor_82f492aa5cd99b44)
 }
 
-var fileDescriptor_url_collection_4410b50aa3630e5e = []byte{
+var fileDescriptor_82f492aa5cd99b44 = []byte{
 	// 371 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x6a, 0xeb, 0x30,
 	0x14, 0x86, 0xb1, 0x73, 0xb9, 0x70, 0x7d, 0xb9, 0x84, 0xeb, 0x52, 0x08, 0x21, 0x84, 0x90, 0xa9,
diff --git a/googleapis/ads/googleads/v1/common/user_lists.pb.go b/googleapis/ads/googleads/v1/common/user_lists.pb.go
index 342cdfb0d3..fb11b7082b 100644
--- a/googleapis/ads/googleads/v1/common/user_lists.pb.go
+++ b/googleapis/ads/googleads/v1/common/user_lists.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/user_lists.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // SimilarUserList is a list of users which are similar to users from another
 // UserList. These lists are read-only and automatically created by Google.
@@ -35,16 +38,17 @@ func (m *SimilarUserListInfo) Reset()         { *m = SimilarUserListInfo{} }
 func (m *SimilarUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*SimilarUserListInfo) ProtoMessage()    {}
 func (*SimilarUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{0}
+	return fileDescriptor_09d2cd2397775a05, []int{0}
 }
+
 func (m *SimilarUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SimilarUserListInfo.Unmarshal(m, b)
 }
 func (m *SimilarUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SimilarUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *SimilarUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SimilarUserListInfo.Merge(dst, src)
+func (m *SimilarUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimilarUserListInfo.Merge(m, src)
 }
 func (m *SimilarUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_SimilarUserListInfo.Size(m)
@@ -91,16 +95,17 @@ func (m *CrmBasedUserListInfo) Reset()         { *m = CrmBasedUserListInfo{} }
 func (m *CrmBasedUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*CrmBasedUserListInfo) ProtoMessage()    {}
 func (*CrmBasedUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{1}
+	return fileDescriptor_09d2cd2397775a05, []int{1}
 }
+
 func (m *CrmBasedUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CrmBasedUserListInfo.Unmarshal(m, b)
 }
 func (m *CrmBasedUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CrmBasedUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *CrmBasedUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CrmBasedUserListInfo.Merge(dst, src)
+func (m *CrmBasedUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CrmBasedUserListInfo.Merge(m, src)
 }
 func (m *CrmBasedUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_CrmBasedUserListInfo.Size(m)
@@ -156,16 +161,17 @@ func (m *UserListRuleInfo) Reset()         { *m = UserListRuleInfo{} }
 func (m *UserListRuleInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListRuleInfo) ProtoMessage()    {}
 func (*UserListRuleInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{2}
+	return fileDescriptor_09d2cd2397775a05, []int{2}
 }
+
 func (m *UserListRuleInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListRuleInfo.Unmarshal(m, b)
 }
 func (m *UserListRuleInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListRuleInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListRuleInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListRuleInfo.Merge(dst, src)
+func (m *UserListRuleInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListRuleInfo.Merge(m, src)
 }
 func (m *UserListRuleInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListRuleInfo.Size(m)
@@ -203,16 +209,17 @@ func (m *UserListRuleItemGroupInfo) Reset()         { *m = UserListRuleItemGroup
 func (m *UserListRuleItemGroupInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListRuleItemGroupInfo) ProtoMessage()    {}
 func (*UserListRuleItemGroupInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{3}
+	return fileDescriptor_09d2cd2397775a05, []int{3}
 }
+
 func (m *UserListRuleItemGroupInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListRuleItemGroupInfo.Unmarshal(m, b)
 }
 func (m *UserListRuleItemGroupInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListRuleItemGroupInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListRuleItemGroupInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListRuleItemGroupInfo.Merge(dst, src)
+func (m *UserListRuleItemGroupInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListRuleItemGroupInfo.Merge(m, src)
 }
 func (m *UserListRuleItemGroupInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListRuleItemGroupInfo.Size(m)
@@ -257,16 +264,17 @@ func (m *UserListRuleItemInfo) Reset()         { *m = UserListRuleItemInfo{} }
 func (m *UserListRuleItemInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListRuleItemInfo) ProtoMessage()    {}
 func (*UserListRuleItemInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{4}
+	return fileDescriptor_09d2cd2397775a05, []int{4}
 }
+
 func (m *UserListRuleItemInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListRuleItemInfo.Unmarshal(m, b)
 }
 func (m *UserListRuleItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListRuleItemInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListRuleItemInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListRuleItemInfo.Merge(dst, src)
+func (m *UserListRuleItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListRuleItemInfo.Merge(m, src)
 }
 func (m *UserListRuleItemInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListRuleItemInfo.Size(m)
@@ -334,99 +342,15 @@ func (m *UserListRuleItemInfo) GetDateRuleItem() *UserListDateRuleItemInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*UserListRuleItemInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _UserListRuleItemInfo_OneofMarshaler, _UserListRuleItemInfo_OneofUnmarshaler, _UserListRuleItemInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*UserListRuleItemInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*UserListRuleItemInfo_NumberRuleItem)(nil),
 		(*UserListRuleItemInfo_StringRuleItem)(nil),
 		(*UserListRuleItemInfo_DateRuleItem)(nil),
 	}
 }
 
-func _UserListRuleItemInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*UserListRuleItemInfo)
-	// rule_item
-	switch x := m.RuleItem.(type) {
-	case *UserListRuleItemInfo_NumberRuleItem:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NumberRuleItem); err != nil {
-			return err
-		}
-	case *UserListRuleItemInfo_StringRuleItem:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StringRuleItem); err != nil {
-			return err
-		}
-	case *UserListRuleItemInfo_DateRuleItem:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateRuleItem); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("UserListRuleItemInfo.RuleItem has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _UserListRuleItemInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*UserListRuleItemInfo)
-	switch tag {
-	case 2: // rule_item.number_rule_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UserListNumberRuleItemInfo)
-		err := b.DecodeMessage(msg)
-		m.RuleItem = &UserListRuleItemInfo_NumberRuleItem{msg}
-		return true, err
-	case 3: // rule_item.string_rule_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UserListStringRuleItemInfo)
-		err := b.DecodeMessage(msg)
-		m.RuleItem = &UserListRuleItemInfo_StringRuleItem{msg}
-		return true, err
-	case 4: // rule_item.date_rule_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UserListDateRuleItemInfo)
-		err := b.DecodeMessage(msg)
-		m.RuleItem = &UserListRuleItemInfo_DateRuleItem{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _UserListRuleItemInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*UserListRuleItemInfo)
-	// rule_item
-	switch x := m.RuleItem.(type) {
-	case *UserListRuleItemInfo_NumberRuleItem:
-		s := proto.Size(x.NumberRuleItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserListRuleItemInfo_StringRuleItem:
-		s := proto.Size(x.StringRuleItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserListRuleItemInfo_DateRuleItem:
-		s := proto.Size(x.DateRuleItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A rule item composed of date operation.
 type UserListDateRuleItemInfo struct {
 	// Date comparison operator.
@@ -450,16 +374,17 @@ func (m *UserListDateRuleItemInfo) Reset()         { *m = UserListDateRuleItemIn
 func (m *UserListDateRuleItemInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListDateRuleItemInfo) ProtoMessage()    {}
 func (*UserListDateRuleItemInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{5}
+	return fileDescriptor_09d2cd2397775a05, []int{5}
 }
+
 func (m *UserListDateRuleItemInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListDateRuleItemInfo.Unmarshal(m, b)
 }
 func (m *UserListDateRuleItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListDateRuleItemInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListDateRuleItemInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListDateRuleItemInfo.Merge(dst, src)
+func (m *UserListDateRuleItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListDateRuleItemInfo.Merge(m, src)
 }
 func (m *UserListDateRuleItemInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListDateRuleItemInfo.Size(m)
@@ -510,16 +435,17 @@ func (m *UserListNumberRuleItemInfo) Reset()         { *m = UserListNumberRuleIt
 func (m *UserListNumberRuleItemInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListNumberRuleItemInfo) ProtoMessage()    {}
 func (*UserListNumberRuleItemInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{6}
+	return fileDescriptor_09d2cd2397775a05, []int{6}
 }
+
 func (m *UserListNumberRuleItemInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListNumberRuleItemInfo.Unmarshal(m, b)
 }
 func (m *UserListNumberRuleItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListNumberRuleItemInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListNumberRuleItemInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListNumberRuleItemInfo.Merge(dst, src)
+func (m *UserListNumberRuleItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListNumberRuleItemInfo.Merge(m, src)
 }
 func (m *UserListNumberRuleItemInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListNumberRuleItemInfo.Size(m)
@@ -564,16 +490,17 @@ func (m *UserListStringRuleItemInfo) Reset()         { *m = UserListStringRuleIt
 func (m *UserListStringRuleItemInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListStringRuleItemInfo) ProtoMessage()    {}
 func (*UserListStringRuleItemInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{7}
+	return fileDescriptor_09d2cd2397775a05, []int{7}
 }
+
 func (m *UserListStringRuleItemInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListStringRuleItemInfo.Unmarshal(m, b)
 }
 func (m *UserListStringRuleItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListStringRuleItemInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListStringRuleItemInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListStringRuleItemInfo.Merge(dst, src)
+func (m *UserListStringRuleItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListStringRuleItemInfo.Merge(m, src)
 }
 func (m *UserListStringRuleItemInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListStringRuleItemInfo.Size(m)
@@ -623,16 +550,17 @@ func (m *CombinedRuleUserListInfo) Reset()         { *m = CombinedRuleUserListIn
 func (m *CombinedRuleUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*CombinedRuleUserListInfo) ProtoMessage()    {}
 func (*CombinedRuleUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{8}
+	return fileDescriptor_09d2cd2397775a05, []int{8}
 }
+
 func (m *CombinedRuleUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CombinedRuleUserListInfo.Unmarshal(m, b)
 }
 func (m *CombinedRuleUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CombinedRuleUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *CombinedRuleUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CombinedRuleUserListInfo.Merge(dst, src)
+func (m *CombinedRuleUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CombinedRuleUserListInfo.Merge(m, src)
 }
 func (m *CombinedRuleUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_CombinedRuleUserListInfo.Size(m)
@@ -689,16 +617,17 @@ func (m *DateSpecificRuleUserListInfo) Reset()         { *m = DateSpecificRuleUs
 func (m *DateSpecificRuleUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*DateSpecificRuleUserListInfo) ProtoMessage()    {}
 func (*DateSpecificRuleUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{9}
+	return fileDescriptor_09d2cd2397775a05, []int{9}
 }
+
 func (m *DateSpecificRuleUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DateSpecificRuleUserListInfo.Unmarshal(m, b)
 }
 func (m *DateSpecificRuleUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DateSpecificRuleUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *DateSpecificRuleUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DateSpecificRuleUserListInfo.Merge(dst, src)
+func (m *DateSpecificRuleUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateSpecificRuleUserListInfo.Merge(m, src)
 }
 func (m *DateSpecificRuleUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_DateSpecificRuleUserListInfo.Size(m)
@@ -748,16 +677,17 @@ func (m *ExpressionRuleUserListInfo) Reset()         { *m = ExpressionRuleUserLi
 func (m *ExpressionRuleUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*ExpressionRuleUserListInfo) ProtoMessage()    {}
 func (*ExpressionRuleUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{10}
+	return fileDescriptor_09d2cd2397775a05, []int{10}
 }
+
 func (m *ExpressionRuleUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExpressionRuleUserListInfo.Unmarshal(m, b)
 }
 func (m *ExpressionRuleUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExpressionRuleUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *ExpressionRuleUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExpressionRuleUserListInfo.Merge(dst, src)
+func (m *ExpressionRuleUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExpressionRuleUserListInfo.Merge(m, src)
 }
 func (m *ExpressionRuleUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_ExpressionRuleUserListInfo.Size(m)
@@ -802,16 +732,17 @@ func (m *RuleBasedUserListInfo) Reset()         { *m = RuleBasedUserListInfo{} }
 func (m *RuleBasedUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*RuleBasedUserListInfo) ProtoMessage()    {}
 func (*RuleBasedUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{11}
+	return fileDescriptor_09d2cd2397775a05, []int{11}
 }
+
 func (m *RuleBasedUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RuleBasedUserListInfo.Unmarshal(m, b)
 }
 func (m *RuleBasedUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RuleBasedUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *RuleBasedUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RuleBasedUserListInfo.Merge(dst, src)
+func (m *RuleBasedUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RuleBasedUserListInfo.Merge(m, src)
 }
 func (m *RuleBasedUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_RuleBasedUserListInfo.Size(m)
@@ -879,99 +810,15 @@ func (m *RuleBasedUserListInfo) GetExpressionRuleUserList() *ExpressionRuleUserL
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RuleBasedUserListInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RuleBasedUserListInfo_OneofMarshaler, _RuleBasedUserListInfo_OneofUnmarshaler, _RuleBasedUserListInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RuleBasedUserListInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RuleBasedUserListInfo_CombinedRuleUserList)(nil),
 		(*RuleBasedUserListInfo_DateSpecificRuleUserList)(nil),
 		(*RuleBasedUserListInfo_ExpressionRuleUserList)(nil),
 	}
 }
 
-func _RuleBasedUserListInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RuleBasedUserListInfo)
-	// rule_based_user_list
-	switch x := m.RuleBasedUserList.(type) {
-	case *RuleBasedUserListInfo_CombinedRuleUserList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CombinedRuleUserList); err != nil {
-			return err
-		}
-	case *RuleBasedUserListInfo_DateSpecificRuleUserList:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateSpecificRuleUserList); err != nil {
-			return err
-		}
-	case *RuleBasedUserListInfo_ExpressionRuleUserList:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExpressionRuleUserList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RuleBasedUserListInfo.RuleBasedUserList has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RuleBasedUserListInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RuleBasedUserListInfo)
-	switch tag {
-	case 2: // rule_based_user_list.combined_rule_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CombinedRuleUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.RuleBasedUserList = &RuleBasedUserListInfo_CombinedRuleUserList{msg}
-		return true, err
-	case 3: // rule_based_user_list.date_specific_rule_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DateSpecificRuleUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.RuleBasedUserList = &RuleBasedUserListInfo_DateSpecificRuleUserList{msg}
-		return true, err
-	case 4: // rule_based_user_list.expression_rule_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExpressionRuleUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.RuleBasedUserList = &RuleBasedUserListInfo_ExpressionRuleUserList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RuleBasedUserListInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RuleBasedUserListInfo)
-	// rule_based_user_list
-	switch x := m.RuleBasedUserList.(type) {
-	case *RuleBasedUserListInfo_CombinedRuleUserList:
-		s := proto.Size(x.CombinedRuleUserList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RuleBasedUserListInfo_DateSpecificRuleUserList:
-		s := proto.Size(x.DateSpecificRuleUserList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RuleBasedUserListInfo_ExpressionRuleUserList:
-		s := proto.Size(x.ExpressionRuleUserList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a user list that is a custom combination of user lists.
 type LogicalUserListInfo struct {
 	// Logical list rules that define this user list. The rules are defined as a
@@ -989,16 +836,17 @@ func (m *LogicalUserListInfo) Reset()         { *m = LogicalUserListInfo{} }
 func (m *LogicalUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*LogicalUserListInfo) ProtoMessage()    {}
 func (*LogicalUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{12}
+	return fileDescriptor_09d2cd2397775a05, []int{12}
 }
+
 func (m *LogicalUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogicalUserListInfo.Unmarshal(m, b)
 }
 func (m *LogicalUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogicalUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *LogicalUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogicalUserListInfo.Merge(dst, src)
+func (m *LogicalUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogicalUserListInfo.Merge(m, src)
 }
 func (m *LogicalUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_LogicalUserListInfo.Size(m)
@@ -1032,16 +880,17 @@ func (m *UserListLogicalRuleInfo) Reset()         { *m = UserListLogicalRuleInfo
 func (m *UserListLogicalRuleInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListLogicalRuleInfo) ProtoMessage()    {}
 func (*UserListLogicalRuleInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{13}
+	return fileDescriptor_09d2cd2397775a05, []int{13}
 }
+
 func (m *UserListLogicalRuleInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListLogicalRuleInfo.Unmarshal(m, b)
 }
 func (m *UserListLogicalRuleInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListLogicalRuleInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListLogicalRuleInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListLogicalRuleInfo.Merge(dst, src)
+func (m *UserListLogicalRuleInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListLogicalRuleInfo.Merge(m, src)
 }
 func (m *UserListLogicalRuleInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListLogicalRuleInfo.Size(m)
@@ -1079,16 +928,17 @@ func (m *LogicalUserListOperandInfo) Reset()         { *m = LogicalUserListOpera
 func (m *LogicalUserListOperandInfo) String() string { return proto.CompactTextString(m) }
 func (*LogicalUserListOperandInfo) ProtoMessage()    {}
 func (*LogicalUserListOperandInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{14}
+	return fileDescriptor_09d2cd2397775a05, []int{14}
 }
+
 func (m *LogicalUserListOperandInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogicalUserListOperandInfo.Unmarshal(m, b)
 }
 func (m *LogicalUserListOperandInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogicalUserListOperandInfo.Marshal(b, m, deterministic)
 }
-func (dst *LogicalUserListOperandInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogicalUserListOperandInfo.Merge(dst, src)
+func (m *LogicalUserListOperandInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogicalUserListOperandInfo.Merge(m, src)
 }
 func (m *LogicalUserListOperandInfo) XXX_Size() int {
 	return xxx_messageInfo_LogicalUserListOperandInfo.Size(m)
@@ -1119,16 +969,17 @@ func (m *BasicUserListInfo) Reset()         { *m = BasicUserListInfo{} }
 func (m *BasicUserListInfo) String() string { return proto.CompactTextString(m) }
 func (*BasicUserListInfo) ProtoMessage()    {}
 func (*BasicUserListInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{15}
+	return fileDescriptor_09d2cd2397775a05, []int{15}
 }
+
 func (m *BasicUserListInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BasicUserListInfo.Unmarshal(m, b)
 }
 func (m *BasicUserListInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BasicUserListInfo.Marshal(b, m, deterministic)
 }
-func (dst *BasicUserListInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BasicUserListInfo.Merge(dst, src)
+func (m *BasicUserListInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BasicUserListInfo.Merge(m, src)
 }
 func (m *BasicUserListInfo) XXX_Size() int {
 	return xxx_messageInfo_BasicUserListInfo.Size(m)
@@ -1163,16 +1014,17 @@ func (m *UserListActionInfo) Reset()         { *m = UserListActionInfo{} }
 func (m *UserListActionInfo) String() string { return proto.CompactTextString(m) }
 func (*UserListActionInfo) ProtoMessage()    {}
 func (*UserListActionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_lists_e2e607ee8d2b2ff7, []int{16}
+	return fileDescriptor_09d2cd2397775a05, []int{16}
 }
+
 func (m *UserListActionInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListActionInfo.Unmarshal(m, b)
 }
 func (m *UserListActionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListActionInfo.Marshal(b, m, deterministic)
 }
-func (dst *UserListActionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListActionInfo.Merge(dst, src)
+func (m *UserListActionInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListActionInfo.Merge(m, src)
 }
 func (m *UserListActionInfo) XXX_Size() int {
 	return xxx_messageInfo_UserListActionInfo.Size(m)
@@ -1220,80 +1072,14 @@ func (m *UserListActionInfo) GetRemarketingAction() *wrappers.StringValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*UserListActionInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _UserListActionInfo_OneofMarshaler, _UserListActionInfo_OneofUnmarshaler, _UserListActionInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*UserListActionInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*UserListActionInfo_ConversionAction)(nil),
 		(*UserListActionInfo_RemarketingAction)(nil),
 	}
 }
 
-func _UserListActionInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*UserListActionInfo)
-	// user_list_action
-	switch x := m.UserListAction.(type) {
-	case *UserListActionInfo_ConversionAction:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConversionAction); err != nil {
-			return err
-		}
-	case *UserListActionInfo_RemarketingAction:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RemarketingAction); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("UserListActionInfo.UserListAction has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _UserListActionInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*UserListActionInfo)
-	switch tag {
-	case 1: // user_list_action.conversion_action
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.UserListAction = &UserListActionInfo_ConversionAction{msg}
-		return true, err
-	case 2: // user_list_action.remarketing_action
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.UserListAction = &UserListActionInfo_RemarketingAction{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _UserListActionInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*UserListActionInfo)
-	// user_list_action
-	switch x := m.UserListAction.(type) {
-	case *UserListActionInfo_ConversionAction:
-		s := proto.Size(x.ConversionAction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserListActionInfo_RemarketingAction:
-		s := proto.Size(x.RemarketingAction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*SimilarUserListInfo)(nil), "google.ads.googleads.v1.common.SimilarUserListInfo")
 	proto.RegisterType((*CrmBasedUserListInfo)(nil), "google.ads.googleads.v1.common.CrmBasedUserListInfo")
@@ -1315,10 +1101,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/user_lists.proto", fileDescriptor_user_lists_e2e607ee8d2b2ff7)
+	proto.RegisterFile("google/ads/googleads/v1/common/user_lists.proto", fileDescriptor_09d2cd2397775a05)
 }
 
-var fileDescriptor_user_lists_e2e607ee8d2b2ff7 = []byte{
+var fileDescriptor_09d2cd2397775a05 = []byte{
 	// 1306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x41, 0x6f, 0xdb, 0xb6,
 	0x17, 0x8f, 0x9c, 0xb4, 0x4d, 0x98, 0xd4, 0xff, 0x94, 0xcd, 0xbf, 0x75, 0xbd, 0xa0, 0x28, 0x74,
diff --git a/googleapis/ads/googleads/v1/common/value.pb.go b/googleapis/ads/googleads/v1/common/value.pb.go
index 906e3c5227..9bff0de554 100644
--- a/googleapis/ads/googleads/v1/common/value.pb.go
+++ b/googleapis/ads/googleads/v1/common/value.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/common/value.proto
 
-package common // import "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A generic data container.
 type Value struct {
@@ -39,16 +42,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_b597d7af186472f5, []int{0}
+	return fileDescriptor_f72ac823a63d9c0f, []int{0}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -135,9 +139,9 @@ func (m *Value) GetStringValue() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_BooleanValue)(nil),
 		(*Value_Int64Value)(nil),
 		(*Value_FloatValue)(nil),
@@ -146,115 +150,15 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// value
-	switch x := m.Value.(type) {
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_Int64Value:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Value))
-	case *Value_FloatValue:
-		b.EncodeVarint(3<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.FloatValue)))
-	case *Value_DoubleValue:
-		b.EncodeVarint(4<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Value_StringValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case nil:
-	default:
-		return fmt.Errorf("Value.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 1: // value.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &Value_BooleanValue{x != 0}
-		return true, err
-	case 2: // value.int64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &Value_Int64Value{int64(x)}
-		return true, err
-	case 3: // value.float_value
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Value = &Value_FloatValue{math.Float32frombits(uint32(x))}
-		return true, err
-	case 4: // value.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Value = &Value_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 5: // value.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Value = &Value_StringValue{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// value
-	switch x := m.Value.(type) {
-	case *Value_BooleanValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_Int64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Value))
-	case *Value_FloatValue:
-		n += 1 // tag and wire
-		n += 4
-	case *Value_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*Value)(nil), "google.ads.googleads.v1.common.Value")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/common/value.proto", fileDescriptor_value_b597d7af186472f5)
+	proto.RegisterFile("google/ads/googleads/v1/common/value.proto", fileDescriptor_f72ac823a63d9c0f)
 }
 
-var fileDescriptor_value_b597d7af186472f5 = []byte{
+var fileDescriptor_f72ac823a63d9c0f = []byte{
 	// 329 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xd1, 0x41, 0x4b, 0xf3, 0x30,
 	0x18, 0x07, 0xf0, 0xa5, 0x7b, 0xf7, 0xaa, 0xd9, 0xbc, 0xec, 0x24, 0x22, 0xa3, 0x4e, 0x84, 0xe2,
diff --git a/googleapis/ads/googleads/v1/enums/access_reason.pb.go b/googleapis/ads/googleads/v1/enums/access_reason.pb.go
index f8ee3ed622..bd4fb95858 100644
--- a/googleapis/ads/googleads/v1/enums/access_reason.pb.go
+++ b/googleapis/ads/googleads/v1/enums/access_reason.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/access_reason.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible access reasons.
 type AccessReasonEnum_AccessReason int32
@@ -48,6 +51,7 @@ var AccessReasonEnum_AccessReason_name = map[int32]string{
 	5: "SUBSCRIBED",
 	6: "AFFILIATED",
 }
+
 var AccessReasonEnum_AccessReason_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -61,8 +65,9 @@ var AccessReasonEnum_AccessReason_value = map[string]int32{
 func (x AccessReasonEnum_AccessReason) String() string {
 	return proto.EnumName(AccessReasonEnum_AccessReason_name, int32(x))
 }
+
 func (AccessReasonEnum_AccessReason) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_access_reason_f540ca2e6dd316e1, []int{0, 0}
+	return fileDescriptor_e5eeb8bdb1b58fce, []int{0, 0}
 }
 
 // Indicates the way the resource such as user list is related to a user.
@@ -76,16 +81,17 @@ func (m *AccessReasonEnum) Reset()         { *m = AccessReasonEnum{} }
 func (m *AccessReasonEnum) String() string { return proto.CompactTextString(m) }
 func (*AccessReasonEnum) ProtoMessage()    {}
 func (*AccessReasonEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_access_reason_f540ca2e6dd316e1, []int{0}
+	return fileDescriptor_e5eeb8bdb1b58fce, []int{0}
 }
+
 func (m *AccessReasonEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccessReasonEnum.Unmarshal(m, b)
 }
 func (m *AccessReasonEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccessReasonEnum.Marshal(b, m, deterministic)
 }
-func (dst *AccessReasonEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccessReasonEnum.Merge(dst, src)
+func (m *AccessReasonEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccessReasonEnum.Merge(m, src)
 }
 func (m *AccessReasonEnum) XXX_Size() int {
 	return xxx_messageInfo_AccessReasonEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *AccessReasonEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AccessReasonEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AccessReasonEnum)(nil), "google.ads.googleads.v1.enums.AccessReasonEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AccessReasonEnum_AccessReason", AccessReasonEnum_AccessReason_name, AccessReasonEnum_AccessReason_value)
+	proto.RegisterType((*AccessReasonEnum)(nil), "google.ads.googleads.v1.enums.AccessReasonEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/access_reason.proto", fileDescriptor_access_reason_f540ca2e6dd316e1)
+	proto.RegisterFile("google/ads/googleads/v1/enums/access_reason.proto", fileDescriptor_e5eeb8bdb1b58fce)
 }
 
-var fileDescriptor_access_reason_f540ca2e6dd316e1 = []byte{
+var fileDescriptor_e5eeb8bdb1b58fce = []byte{
 	// 336 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4e, 0xf2, 0x30,
 	0x18, 0xfd, 0x37, 0x7e, 0x50, 0x0b, 0xd1, 0xda, 0x4b, 0x23, 0x17, 0xf0, 0x00, 0x5d, 0x16, 0xef,
diff --git a/googleapis/ads/googleads/v1/enums/account_budget_proposal_status.pb.go b/googleapis/ads/googleads/v1/enums/account_budget_proposal_status.pb.go
index 65f0e7b19f..3cdebfb995 100644
--- a/googleapis/ads/googleads/v1/enums/account_budget_proposal_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/account_budget_proposal_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/account_budget_proposal_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of an AccountBudgetProposal.
 type AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus int32
@@ -52,6 +55,7 @@ var AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus_name = map[int32
 	5: "CANCELLED",
 	6: "REJECTED",
 }
+
 var AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -65,8 +69,9 @@ var AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus_value = map[stri
 func (x AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus) String() string {
 	return proto.EnumName(AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus_name, int32(x))
 }
+
 func (AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_status_26386523d21926fe, []int{0, 0}
+	return fileDescriptor_cb22da81b8cf02e5, []int{0, 0}
 }
 
 // Message describing AccountBudgetProposal statuses.
@@ -80,16 +85,17 @@ func (m *AccountBudgetProposalStatusEnum) Reset()         { *m = AccountBudgetPr
 func (m *AccountBudgetProposalStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*AccountBudgetProposalStatusEnum) ProtoMessage()    {}
 func (*AccountBudgetProposalStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_status_26386523d21926fe, []int{0}
+	return fileDescriptor_cb22da81b8cf02e5, []int{0}
 }
+
 func (m *AccountBudgetProposalStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudgetProposalStatusEnum.Unmarshal(m, b)
 }
 func (m *AccountBudgetProposalStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudgetProposalStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudgetProposalStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudgetProposalStatusEnum.Merge(dst, src)
+func (m *AccountBudgetProposalStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudgetProposalStatusEnum.Merge(m, src)
 }
 func (m *AccountBudgetProposalStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_AccountBudgetProposalStatusEnum.Size(m)
@@ -101,15 +107,15 @@ func (m *AccountBudgetProposalStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AccountBudgetProposalStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AccountBudgetProposalStatusEnum)(nil), "google.ads.googleads.v1.enums.AccountBudgetProposalStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus", AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus_name, AccountBudgetProposalStatusEnum_AccountBudgetProposalStatus_value)
+	proto.RegisterType((*AccountBudgetProposalStatusEnum)(nil), "google.ads.googleads.v1.enums.AccountBudgetProposalStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/account_budget_proposal_status.proto", fileDescriptor_account_budget_proposal_status_26386523d21926fe)
+	proto.RegisterFile("google/ads/googleads/v1/enums/account_budget_proposal_status.proto", fileDescriptor_cb22da81b8cf02e5)
 }
 
-var fileDescriptor_account_budget_proposal_status_26386523d21926fe = []byte{
+var fileDescriptor_cb22da81b8cf02e5 = []byte{
 	// 354 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0x4e, 0xc2, 0x40,
 	0x10, 0xb5, 0x45, 0x51, 0x17, 0x89, 0xb5, 0x47, 0x95, 0x28, 0x7c, 0xc0, 0x36, 0x8d, 0xb7, 0xf5,
diff --git a/googleapis/ads/googleads/v1/enums/account_budget_proposal_type.pb.go b/googleapis/ads/googleads/v1/enums/account_budget_proposal_type.pb.go
index d9aac2c465..05ea36cd21 100644
--- a/googleapis/ads/googleads/v1/enums/account_budget_proposal_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/account_budget_proposal_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/account_budget_proposal_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible types of an AccountBudgetProposal.
 type AccountBudgetProposalTypeEnum_AccountBudgetProposalType int32
@@ -45,6 +48,7 @@ var AccountBudgetProposalTypeEnum_AccountBudgetProposalType_name = map[int32]str
 	4: "END",
 	5: "REMOVE",
 }
+
 var AccountBudgetProposalTypeEnum_AccountBudgetProposalType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -57,8 +61,9 @@ var AccountBudgetProposalTypeEnum_AccountBudgetProposalType_value = map[string]i
 func (x AccountBudgetProposalTypeEnum_AccountBudgetProposalType) String() string {
 	return proto.EnumName(AccountBudgetProposalTypeEnum_AccountBudgetProposalType_name, int32(x))
 }
+
 func (AccountBudgetProposalTypeEnum_AccountBudgetProposalType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_type_a2ce3cf7765c59ed, []int{0, 0}
+	return fileDescriptor_69356f21c7854669, []int{0, 0}
 }
 
 // Message describing AccountBudgetProposal types.
@@ -72,16 +77,17 @@ func (m *AccountBudgetProposalTypeEnum) Reset()         { *m = AccountBudgetProp
 func (m *AccountBudgetProposalTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AccountBudgetProposalTypeEnum) ProtoMessage()    {}
 func (*AccountBudgetProposalTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_type_a2ce3cf7765c59ed, []int{0}
+	return fileDescriptor_69356f21c7854669, []int{0}
 }
+
 func (m *AccountBudgetProposalTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudgetProposalTypeEnum.Unmarshal(m, b)
 }
 func (m *AccountBudgetProposalTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudgetProposalTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudgetProposalTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudgetProposalTypeEnum.Merge(dst, src)
+func (m *AccountBudgetProposalTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudgetProposalTypeEnum.Merge(m, src)
 }
 func (m *AccountBudgetProposalTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AccountBudgetProposalTypeEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *AccountBudgetProposalTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AccountBudgetProposalTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AccountBudgetProposalTypeEnum)(nil), "google.ads.googleads.v1.enums.AccountBudgetProposalTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AccountBudgetProposalTypeEnum_AccountBudgetProposalType", AccountBudgetProposalTypeEnum_AccountBudgetProposalType_name, AccountBudgetProposalTypeEnum_AccountBudgetProposalType_value)
+	proto.RegisterType((*AccountBudgetProposalTypeEnum)(nil), "google.ads.googleads.v1.enums.AccountBudgetProposalTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/account_budget_proposal_type.proto", fileDescriptor_account_budget_proposal_type_a2ce3cf7765c59ed)
+	proto.RegisterFile("google/ads/googleads/v1/enums/account_budget_proposal_type.proto", fileDescriptor_69356f21c7854669)
 }
 
-var fileDescriptor_account_budget_proposal_type_a2ce3cf7765c59ed = []byte{
+var fileDescriptor_69356f21c7854669 = []byte{
 	// 333 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x6a, 0xc2, 0x30,
 	0x14, 0x86, 0xd7, 0xba, 0x29, 0xc4, 0x8b, 0x95, 0xde, 0x6d, 0xcc, 0x81, 0x3e, 0x40, 0x4a, 0xd9,
diff --git a/googleapis/ads/googleads/v1/enums/account_budget_status.pb.go b/googleapis/ads/googleads/v1/enums/account_budget_status.pb.go
index fdcbd3a907..3d01877269 100644
--- a/googleapis/ads/googleads/v1/enums/account_budget_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/account_budget_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/account_budget_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of an AccountBudget.
 type AccountBudgetStatusEnum_AccountBudgetStatus int32
@@ -42,6 +45,7 @@ var AccountBudgetStatusEnum_AccountBudgetStatus_name = map[int32]string{
 	3: "APPROVED",
 	4: "CANCELLED",
 }
+
 var AccountBudgetStatusEnum_AccountBudgetStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var AccountBudgetStatusEnum_AccountBudgetStatus_value = map[string]int32{
 func (x AccountBudgetStatusEnum_AccountBudgetStatus) String() string {
 	return proto.EnumName(AccountBudgetStatusEnum_AccountBudgetStatus_name, int32(x))
 }
+
 func (AccountBudgetStatusEnum_AccountBudgetStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_status_1e96112e98d86ccd, []int{0, 0}
+	return fileDescriptor_9e61cea849ce46b5, []int{0, 0}
 }
 
 // Message describing AccountBudget statuses.
@@ -68,16 +73,17 @@ func (m *AccountBudgetStatusEnum) Reset()         { *m = AccountBudgetStatusEnum
 func (m *AccountBudgetStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*AccountBudgetStatusEnum) ProtoMessage()    {}
 func (*AccountBudgetStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_status_1e96112e98d86ccd, []int{0}
+	return fileDescriptor_9e61cea849ce46b5, []int{0}
 }
+
 func (m *AccountBudgetStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudgetStatusEnum.Unmarshal(m, b)
 }
 func (m *AccountBudgetStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudgetStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudgetStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudgetStatusEnum.Merge(dst, src)
+func (m *AccountBudgetStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudgetStatusEnum.Merge(m, src)
 }
 func (m *AccountBudgetStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_AccountBudgetStatusEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *AccountBudgetStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AccountBudgetStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AccountBudgetStatusEnum)(nil), "google.ads.googleads.v1.enums.AccountBudgetStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AccountBudgetStatusEnum_AccountBudgetStatus", AccountBudgetStatusEnum_AccountBudgetStatus_name, AccountBudgetStatusEnum_AccountBudgetStatus_value)
+	proto.RegisterType((*AccountBudgetStatusEnum)(nil), "google.ads.googleads.v1.enums.AccountBudgetStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/account_budget_status.proto", fileDescriptor_account_budget_status_1e96112e98d86ccd)
+	proto.RegisterFile("google/ads/googleads/v1/enums/account_budget_status.proto", fileDescriptor_9e61cea849ce46b5)
 }
 
-var fileDescriptor_account_budget_status_1e96112e98d86ccd = []byte{
+var fileDescriptor_9e61cea849ce46b5 = []byte{
 	// 319 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcd, 0x4a, 0xc3, 0x30,
 	0x00, 0x76, 0x9d, 0xf8, 0x93, 0x29, 0x96, 0x7a, 0x50, 0xc4, 0x1d, 0xb6, 0x07, 0x48, 0x29, 0x9e,
diff --git a/googleapis/ads/googleads/v1/enums/ad_customizer_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/ad_customizer_placeholder_field.pb.go
index 9404ae9b06..1a641849f3 100644
--- a/googleapis/ads/googleads/v1/enums/ad_customizer_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_customizer_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_customizer_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Ad Customizers placeholder fields.
 type AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField int32
@@ -45,6 +48,7 @@ var AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField_name = map[int
 	4: "DATE",
 	5: "STRING",
 }
+
 var AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -57,8 +61,9 @@ var AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField_value = map[st
 func (x AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField) String() string {
 	return proto.EnumName(AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField_name, int32(x))
 }
+
 func (AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_customizer_placeholder_field_1a21cd682c8e0db6, []int{0, 0}
+	return fileDescriptor_8c47ebea978e70d9, []int{0, 0}
 }
 
 // Values for Ad Customizer placeholder fields.
@@ -72,16 +77,17 @@ func (m *AdCustomizerPlaceholderFieldEnum) Reset()         { *m = AdCustomizerPl
 func (m *AdCustomizerPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*AdCustomizerPlaceholderFieldEnum) ProtoMessage()    {}
 func (*AdCustomizerPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_customizer_placeholder_field_1a21cd682c8e0db6, []int{0}
+	return fileDescriptor_8c47ebea978e70d9, []int{0}
 }
+
 func (m *AdCustomizerPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdCustomizerPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *AdCustomizerPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdCustomizerPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdCustomizerPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdCustomizerPlaceholderFieldEnum.Merge(dst, src)
+func (m *AdCustomizerPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdCustomizerPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *AdCustomizerPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_AdCustomizerPlaceholderFieldEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *AdCustomizerPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdCustomizerPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdCustomizerPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.AdCustomizerPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField", AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField_name, AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField_value)
+	proto.RegisterType((*AdCustomizerPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.AdCustomizerPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_customizer_placeholder_field.proto", fileDescriptor_ad_customizer_placeholder_field_1a21cd682c8e0db6)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_customizer_placeholder_field.proto", fileDescriptor_8c47ebea978e70d9)
 }
 
-var fileDescriptor_ad_customizer_placeholder_field_1a21cd682c8e0db6 = []byte{
+var fileDescriptor_8c47ebea978e70d9 = []byte{
 	// 337 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x4e, 0x83, 0x40,
 	0x18, 0x15, 0xfa, 0xa3, 0x4e, 0x17, 0x12, 0x96, 0xa6, 0x4d, 0x6c, 0x0f, 0x30, 0x84, 0xb8, 0x1b,
diff --git a/googleapis/ads/googleads/v1/enums/ad_group_ad_rotation_mode.pb.go b/googleapis/ads/googleads/v1/enums/ad_group_ad_rotation_mode.pb.go
index f4d9df7377..5a42cf51dd 100644
--- a/googleapis/ads/googleads/v1/enums/ad_group_ad_rotation_mode.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_group_ad_rotation_mode.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_group_ad_rotation_mode.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible ad rotation modes of an ad group.
 type AdGroupAdRotationModeEnum_AdGroupAdRotationMode int32
@@ -41,6 +44,7 @@ var AdGroupAdRotationModeEnum_AdGroupAdRotationMode_name = map[int32]string{
 	2: "OPTIMIZE",
 	3: "ROTATE_FOREVER",
 }
+
 var AdGroupAdRotationModeEnum_AdGroupAdRotationMode_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -51,8 +55,9 @@ var AdGroupAdRotationModeEnum_AdGroupAdRotationMode_value = map[string]int32{
 func (x AdGroupAdRotationModeEnum_AdGroupAdRotationMode) String() string {
 	return proto.EnumName(AdGroupAdRotationModeEnum_AdGroupAdRotationMode_name, int32(x))
 }
+
 func (AdGroupAdRotationModeEnum_AdGroupAdRotationMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_rotation_mode_1bfda688bd69645c, []int{0, 0}
+	return fileDescriptor_01a65cb679b1721f, []int{0, 0}
 }
 
 // Container for enum describing possible ad rotation modes of ads within an
@@ -67,16 +72,17 @@ func (m *AdGroupAdRotationModeEnum) Reset()         { *m = AdGroupAdRotationMode
 func (m *AdGroupAdRotationModeEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAdRotationModeEnum) ProtoMessage()    {}
 func (*AdGroupAdRotationModeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_rotation_mode_1bfda688bd69645c, []int{0}
+	return fileDescriptor_01a65cb679b1721f, []int{0}
 }
+
 func (m *AdGroupAdRotationModeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAdRotationModeEnum.Unmarshal(m, b)
 }
 func (m *AdGroupAdRotationModeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAdRotationModeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAdRotationModeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAdRotationModeEnum.Merge(dst, src)
+func (m *AdGroupAdRotationModeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAdRotationModeEnum.Merge(m, src)
 }
 func (m *AdGroupAdRotationModeEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAdRotationModeEnum.Size(m)
@@ -88,15 +94,15 @@ func (m *AdGroupAdRotationModeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupAdRotationModeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupAdRotationModeEnum)(nil), "google.ads.googleads.v1.enums.AdGroupAdRotationModeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdGroupAdRotationModeEnum_AdGroupAdRotationMode", AdGroupAdRotationModeEnum_AdGroupAdRotationMode_name, AdGroupAdRotationModeEnum_AdGroupAdRotationMode_value)
+	proto.RegisterType((*AdGroupAdRotationModeEnum)(nil), "google.ads.googleads.v1.enums.AdGroupAdRotationModeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_ad_rotation_mode.proto", fileDescriptor_ad_group_ad_rotation_mode_1bfda688bd69645c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_ad_rotation_mode.proto", fileDescriptor_01a65cb679b1721f)
 }
 
-var fileDescriptor_ad_group_ad_rotation_mode_1bfda688bd69645c = []byte{
+var fileDescriptor_01a65cb679b1721f = []byte{
 	// 321 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xfb, 0x30,
 	0x18, 0xc5, 0xff, 0xeb, 0xe0, 0xaf, 0x64, 0xa2, 0xa5, 0xe0, 0x85, 0xc3, 0x5d, 0x6c, 0x0f, 0x90,
diff --git a/googleapis/ads/googleads/v1/enums/ad_group_ad_status.pb.go b/googleapis/ads/googleads/v1/enums/ad_group_ad_status.pb.go
index 1b067dca4b..4cfb5fc141 100644
--- a/googleapis/ads/googleads/v1/enums/ad_group_ad_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_group_ad_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_group_ad_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of an AdGroupAd.
 type AdGroupAdStatusEnum_AdGroupAdStatus int32
@@ -44,6 +47,7 @@ var AdGroupAdStatusEnum_AdGroupAdStatus_name = map[int32]string{
 	3: "PAUSED",
 	4: "REMOVED",
 }
+
 var AdGroupAdStatusEnum_AdGroupAdStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -55,8 +59,9 @@ var AdGroupAdStatusEnum_AdGroupAdStatus_value = map[string]int32{
 func (x AdGroupAdStatusEnum_AdGroupAdStatus) String() string {
 	return proto.EnumName(AdGroupAdStatusEnum_AdGroupAdStatus_name, int32(x))
 }
+
 func (AdGroupAdStatusEnum_AdGroupAdStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_status_b660490e35bdde48, []int{0, 0}
+	return fileDescriptor_714c565600c46e91, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of an AdGroupAd.
@@ -70,16 +75,17 @@ func (m *AdGroupAdStatusEnum) Reset()         { *m = AdGroupAdStatusEnum{} }
 func (m *AdGroupAdStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAdStatusEnum) ProtoMessage()    {}
 func (*AdGroupAdStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_status_b660490e35bdde48, []int{0}
+	return fileDescriptor_714c565600c46e91, []int{0}
 }
+
 func (m *AdGroupAdStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAdStatusEnum.Unmarshal(m, b)
 }
 func (m *AdGroupAdStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAdStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAdStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAdStatusEnum.Merge(dst, src)
+func (m *AdGroupAdStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAdStatusEnum.Merge(m, src)
 }
 func (m *AdGroupAdStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAdStatusEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *AdGroupAdStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupAdStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupAdStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupAdStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdGroupAdStatusEnum_AdGroupAdStatus", AdGroupAdStatusEnum_AdGroupAdStatus_name, AdGroupAdStatusEnum_AdGroupAdStatus_value)
+	proto.RegisterType((*AdGroupAdStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupAdStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_ad_status.proto", fileDescriptor_ad_group_ad_status_b660490e35bdde48)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_ad_status.proto", fileDescriptor_714c565600c46e91)
 }
 
-var fileDescriptor_ad_group_ad_status_b660490e35bdde48 = []byte{
+var fileDescriptor_714c565600c46e91 = []byte{
 	// 311 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x9d, 0x4c, 0xc8, 0x0e, 0x2b, 0xd5, 0x93, 0xb8, 0xc3, 0xf6, 0x00, 0x09, 0x45, 0xf0,
diff --git a/googleapis/ads/googleads/v1/enums/ad_group_criterion_approval_status.pb.go b/googleapis/ads/googleads/v1/enums/ad_group_criterion_approval_status.pb.go
index ac7edae6cc..62187b10ca 100644
--- a/googleapis/ads/googleads/v1/enums/ad_group_criterion_approval_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_group_criterion_approval_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_group_criterion_approval_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates AdGroupCriterion approval statuses.
 type AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus int32
@@ -45,6 +48,7 @@ var AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus_name = map
 	4: "PENDING_REVIEW",
 	5: "UNDER_REVIEW",
 }
+
 var AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -57,8 +61,9 @@ var AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus_value = ma
 func (x AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus) String() string {
 	return proto.EnumName(AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus_name, int32(x))
 }
+
 func (AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_approval_status_57d27da9f8e80211, []int{0, 0}
+	return fileDescriptor_55ae34b77e6d6b63, []int{0, 0}
 }
 
 // Container for enum describing possible AdGroupCriterion approval statuses.
@@ -72,16 +77,17 @@ func (m *AdGroupCriterionApprovalStatusEnum) Reset()         { *m = AdGroupCrite
 func (m *AdGroupCriterionApprovalStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterionApprovalStatusEnum) ProtoMessage()    {}
 func (*AdGroupCriterionApprovalStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_approval_status_57d27da9f8e80211, []int{0}
+	return fileDescriptor_55ae34b77e6d6b63, []int{0}
 }
+
 func (m *AdGroupCriterionApprovalStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterionApprovalStatusEnum.Unmarshal(m, b)
 }
 func (m *AdGroupCriterionApprovalStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterionApprovalStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterionApprovalStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterionApprovalStatusEnum.Merge(dst, src)
+func (m *AdGroupCriterionApprovalStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterionApprovalStatusEnum.Merge(m, src)
 }
 func (m *AdGroupCriterionApprovalStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterionApprovalStatusEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *AdGroupCriterionApprovalStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupCriterionApprovalStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupCriterionApprovalStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupCriterionApprovalStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus", AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus_name, AdGroupCriterionApprovalStatusEnum_AdGroupCriterionApprovalStatus_value)
+	proto.RegisterType((*AdGroupCriterionApprovalStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupCriterionApprovalStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_criterion_approval_status.proto", fileDescriptor_ad_group_criterion_approval_status_57d27da9f8e80211)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_criterion_approval_status.proto", fileDescriptor_55ae34b77e6d6b63)
 }
 
-var fileDescriptor_ad_group_criterion_approval_status_57d27da9f8e80211 = []byte{
+var fileDescriptor_55ae34b77e6d6b63 = []byte{
 	// 349 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xcd, 0x6a, 0xab, 0x40,
 	0x18, 0xbd, 0x9a, 0x7b, 0x6f, 0xcb, 0x24, 0xb4, 0xe2, 0xb2, 0x34, 0x85, 0xa4, 0xfb, 0x11, 0xe9,
diff --git a/googleapis/ads/googleads/v1/enums/ad_group_criterion_status.pb.go b/googleapis/ads/googleads/v1/enums/ad_group_criterion_status.pb.go
index 8cb3155cca..dea6ced240 100644
--- a/googleapis/ads/googleads/v1/enums/ad_group_criterion_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_group_criterion_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_group_criterion_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of an AdGroupCriterion.
 type AdGroupCriterionStatusEnum_AdGroupCriterionStatus int32
@@ -44,6 +47,7 @@ var AdGroupCriterionStatusEnum_AdGroupCriterionStatus_name = map[int32]string{
 	3: "PAUSED",
 	4: "REMOVED",
 }
+
 var AdGroupCriterionStatusEnum_AdGroupCriterionStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -55,8 +59,9 @@ var AdGroupCriterionStatusEnum_AdGroupCriterionStatus_value = map[string]int32{
 func (x AdGroupCriterionStatusEnum_AdGroupCriterionStatus) String() string {
 	return proto.EnumName(AdGroupCriterionStatusEnum_AdGroupCriterionStatus_name, int32(x))
 }
+
 func (AdGroupCriterionStatusEnum_AdGroupCriterionStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_status_38c725642d0e60d1, []int{0, 0}
+	return fileDescriptor_53e0a4674d62bdc5, []int{0, 0}
 }
 
 // Message describing AdGroupCriterion statuses.
@@ -70,16 +75,17 @@ func (m *AdGroupCriterionStatusEnum) Reset()         { *m = AdGroupCriterionStat
 func (m *AdGroupCriterionStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterionStatusEnum) ProtoMessage()    {}
 func (*AdGroupCriterionStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_status_38c725642d0e60d1, []int{0}
+	return fileDescriptor_53e0a4674d62bdc5, []int{0}
 }
+
 func (m *AdGroupCriterionStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterionStatusEnum.Unmarshal(m, b)
 }
 func (m *AdGroupCriterionStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterionStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterionStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterionStatusEnum.Merge(dst, src)
+func (m *AdGroupCriterionStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterionStatusEnum.Merge(m, src)
 }
 func (m *AdGroupCriterionStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterionStatusEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *AdGroupCriterionStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupCriterionStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupCriterionStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupCriterionStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdGroupCriterionStatusEnum_AdGroupCriterionStatus", AdGroupCriterionStatusEnum_AdGroupCriterionStatus_name, AdGroupCriterionStatusEnum_AdGroupCriterionStatus_value)
+	proto.RegisterType((*AdGroupCriterionStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupCriterionStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_criterion_status.proto", fileDescriptor_ad_group_criterion_status_38c725642d0e60d1)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_criterion_status.proto", fileDescriptor_53e0a4674d62bdc5)
 }
 
-var fileDescriptor_ad_group_criterion_status_38c725642d0e60d1 = []byte{
+var fileDescriptor_53e0a4674d62bdc5 = []byte{
 	// 322 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4b, 0xf3, 0x30,
 	0x1c, 0xc6, 0xdf, 0x75, 0x2f, 0x13, 0xb2, 0x83, 0xa5, 0x07, 0x0f, 0xd3, 0x1d, 0xb6, 0x0f, 0x90,
diff --git a/googleapis/ads/googleads/v1/enums/ad_group_status.pb.go b/googleapis/ads/googleads/v1/enums/ad_group_status.pb.go
index 6d668ab081..4a9e8fd496 100644
--- a/googleapis/ads/googleads/v1/enums/ad_group_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_group_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_group_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of an ad group.
 type AdGroupStatusEnum_AdGroupStatus int32
@@ -44,6 +47,7 @@ var AdGroupStatusEnum_AdGroupStatus_name = map[int32]string{
 	3: "PAUSED",
 	4: "REMOVED",
 }
+
 var AdGroupStatusEnum_AdGroupStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -55,8 +59,9 @@ var AdGroupStatusEnum_AdGroupStatus_value = map[string]int32{
 func (x AdGroupStatusEnum_AdGroupStatus) String() string {
 	return proto.EnumName(AdGroupStatusEnum_AdGroupStatus_name, int32(x))
 }
+
 func (AdGroupStatusEnum_AdGroupStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_status_de784cd4ed39993a, []int{0, 0}
+	return fileDescriptor_e0cba17e383d2fca, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of an ad group.
@@ -70,16 +75,17 @@ func (m *AdGroupStatusEnum) Reset()         { *m = AdGroupStatusEnum{} }
 func (m *AdGroupStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupStatusEnum) ProtoMessage()    {}
 func (*AdGroupStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_status_de784cd4ed39993a, []int{0}
+	return fileDescriptor_e0cba17e383d2fca, []int{0}
 }
+
 func (m *AdGroupStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupStatusEnum.Unmarshal(m, b)
 }
 func (m *AdGroupStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupStatusEnum.Merge(dst, src)
+func (m *AdGroupStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupStatusEnum.Merge(m, src)
 }
 func (m *AdGroupStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupStatusEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *AdGroupStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdGroupStatusEnum_AdGroupStatus", AdGroupStatusEnum_AdGroupStatus_name, AdGroupStatusEnum_AdGroupStatus_value)
+	proto.RegisterType((*AdGroupStatusEnum)(nil), "google.ads.googleads.v1.enums.AdGroupStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_status.proto", fileDescriptor_ad_group_status_de784cd4ed39993a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_status.proto", fileDescriptor_e0cba17e383d2fca)
 }
 
-var fileDescriptor_ad_group_status_de784cd4ed39993a = []byte{
+var fileDescriptor_e0cba17e383d2fca = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x9d, 0x4c, 0xc8, 0x10, 0x6b, 0x8f, 0xe2, 0x0e, 0xdb, 0x03, 0x24, 0x94, 0xdd, 0xe2,
diff --git a/googleapis/ads/googleads/v1/enums/ad_group_type.pb.go b/googleapis/ads/googleads/v1/enums/ad_group_type.pb.go
index d974e72efa..40c8c0861e 100644
--- a/googleapis/ads/googleads/v1/enums/ad_group_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_group_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_group_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the possible types of an ad group.
 type AdGroupTypeEnum_AdGroupType int32
@@ -68,6 +71,7 @@ var AdGroupTypeEnum_AdGroupType_name = map[int32]string{
 	12: "VIDEO_OUTSTREAM",
 	13: "SEARCH_DYNAMIC_ADS",
 }
+
 var AdGroupTypeEnum_AdGroupType_value = map[string]int32{
 	"UNSPECIFIED":                   0,
 	"UNKNOWN":                       1,
@@ -87,8 +91,9 @@ var AdGroupTypeEnum_AdGroupType_value = map[string]int32{
 func (x AdGroupTypeEnum_AdGroupType) String() string {
 	return proto.EnumName(AdGroupTypeEnum_AdGroupType_name, int32(x))
 }
+
 func (AdGroupTypeEnum_AdGroupType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_type_8038a67ed0ccfa9a, []int{0, 0}
+	return fileDescriptor_07bc19b8ed4d56ed, []int{0, 0}
 }
 
 // Defines types of an ad group, specific to a particular campaign channel
@@ -104,16 +109,17 @@ func (m *AdGroupTypeEnum) Reset()         { *m = AdGroupTypeEnum{} }
 func (m *AdGroupTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupTypeEnum) ProtoMessage()    {}
 func (*AdGroupTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_type_8038a67ed0ccfa9a, []int{0}
+	return fileDescriptor_07bc19b8ed4d56ed, []int{0}
 }
+
 func (m *AdGroupTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupTypeEnum.Unmarshal(m, b)
 }
 func (m *AdGroupTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupTypeEnum.Merge(dst, src)
+func (m *AdGroupTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupTypeEnum.Merge(m, src)
 }
 func (m *AdGroupTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupTypeEnum.Size(m)
@@ -125,15 +131,15 @@ func (m *AdGroupTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupTypeEnum)(nil), "google.ads.googleads.v1.enums.AdGroupTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdGroupTypeEnum_AdGroupType", AdGroupTypeEnum_AdGroupType_name, AdGroupTypeEnum_AdGroupType_value)
+	proto.RegisterType((*AdGroupTypeEnum)(nil), "google.ads.googleads.v1.enums.AdGroupTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_type.proto", fileDescriptor_ad_group_type_8038a67ed0ccfa9a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_group_type.proto", fileDescriptor_07bc19b8ed4d56ed)
 }
 
-var fileDescriptor_ad_group_type_8038a67ed0ccfa9a = []byte{
+var fileDescriptor_07bc19b8ed4d56ed = []byte{
 	// 448 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xd1, 0x6a, 0xdb, 0x3c,
 	0x18, 0xfd, 0xe3, 0xfe, 0xb4, 0xab, 0xd2, 0x12, 0xa1, 0x95, 0xb1, 0x95, 0x65, 0x90, 0x3e, 0x80,
diff --git a/googleapis/ads/googleads/v1/enums/ad_network_type.pb.go b/googleapis/ads/googleads/v1/enums/ad_network_type.pb.go
index f1432baecb..131ffbbe41 100644
--- a/googleapis/ads/googleads/v1/enums/ad_network_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_network_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_network_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates Google Ads network types.
 type AdNetworkTypeEnum_AdNetworkType int32
@@ -51,6 +54,7 @@ var AdNetworkTypeEnum_AdNetworkType_name = map[int32]string{
 	6: "YOUTUBE_WATCH",
 	7: "MIXED",
 }
+
 var AdNetworkTypeEnum_AdNetworkType_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -65,8 +69,9 @@ var AdNetworkTypeEnum_AdNetworkType_value = map[string]int32{
 func (x AdNetworkTypeEnum_AdNetworkType) String() string {
 	return proto.EnumName(AdNetworkTypeEnum_AdNetworkType_name, int32(x))
 }
+
 func (AdNetworkTypeEnum_AdNetworkType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_network_type_1a1e7d9b181d8408, []int{0, 0}
+	return fileDescriptor_2816d596704f6b7a, []int{0, 0}
 }
 
 // Container for enumeration of Google Ads network types.
@@ -80,16 +85,17 @@ func (m *AdNetworkTypeEnum) Reset()         { *m = AdNetworkTypeEnum{} }
 func (m *AdNetworkTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AdNetworkTypeEnum) ProtoMessage()    {}
 func (*AdNetworkTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_network_type_1a1e7d9b181d8408, []int{0}
+	return fileDescriptor_2816d596704f6b7a, []int{0}
 }
+
 func (m *AdNetworkTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdNetworkTypeEnum.Unmarshal(m, b)
 }
 func (m *AdNetworkTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdNetworkTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdNetworkTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdNetworkTypeEnum.Merge(dst, src)
+func (m *AdNetworkTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdNetworkTypeEnum.Merge(m, src)
 }
 func (m *AdNetworkTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AdNetworkTypeEnum.Size(m)
@@ -101,15 +107,15 @@ func (m *AdNetworkTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdNetworkTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdNetworkTypeEnum)(nil), "google.ads.googleads.v1.enums.AdNetworkTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdNetworkTypeEnum_AdNetworkType", AdNetworkTypeEnum_AdNetworkType_name, AdNetworkTypeEnum_AdNetworkType_value)
+	proto.RegisterType((*AdNetworkTypeEnum)(nil), "google.ads.googleads.v1.enums.AdNetworkTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_network_type.proto", fileDescriptor_ad_network_type_1a1e7d9b181d8408)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_network_type.proto", fileDescriptor_2816d596704f6b7a)
 }
 
-var fileDescriptor_ad_network_type_1a1e7d9b181d8408 = []byte{
+var fileDescriptor_2816d596704f6b7a = []byte{
 	// 356 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x6a, 0xe2, 0x40,
 	0x1c, 0xde, 0xc4, 0x55, 0xd9, 0x11, 0xd7, 0x38, 0x7b, 0x5b, 0xd6, 0x83, 0x3e, 0xc0, 0x84, 0xe0,
diff --git a/googleapis/ads/googleads/v1/enums/ad_serving_optimization_status.pb.go b/googleapis/ads/googleads/v1/enums/ad_serving_optimization_status.pb.go
index e6ee70c2f5..faa877e9bd 100644
--- a/googleapis/ads/googleads/v1/enums/ad_serving_optimization_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_serving_optimization_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_serving_optimization_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible serving statuses.
 type AdServingOptimizationStatusEnum_AdServingOptimizationStatus int32
@@ -53,6 +56,7 @@ var AdServingOptimizationStatusEnum_AdServingOptimizationStatus_name = map[int32
 	5: "ROTATE_INDEFINITELY",
 	6: "UNAVAILABLE",
 }
+
 var AdServingOptimizationStatusEnum_AdServingOptimizationStatus_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -66,8 +70,9 @@ var AdServingOptimizationStatusEnum_AdServingOptimizationStatus_value = map[stri
 func (x AdServingOptimizationStatusEnum_AdServingOptimizationStatus) String() string {
 	return proto.EnumName(AdServingOptimizationStatusEnum_AdServingOptimizationStatus_name, int32(x))
 }
+
 func (AdServingOptimizationStatusEnum_AdServingOptimizationStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_serving_optimization_status_41633d967f063778, []int{0, 0}
+	return fileDescriptor_6d03632b095a3049, []int{0, 0}
 }
 
 // Possible ad serving statuses of a campaign.
@@ -81,16 +86,17 @@ func (m *AdServingOptimizationStatusEnum) Reset()         { *m = AdServingOptimi
 func (m *AdServingOptimizationStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*AdServingOptimizationStatusEnum) ProtoMessage()    {}
 func (*AdServingOptimizationStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_serving_optimization_status_41633d967f063778, []int{0}
+	return fileDescriptor_6d03632b095a3049, []int{0}
 }
+
 func (m *AdServingOptimizationStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdServingOptimizationStatusEnum.Unmarshal(m, b)
 }
 func (m *AdServingOptimizationStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdServingOptimizationStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdServingOptimizationStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdServingOptimizationStatusEnum.Merge(dst, src)
+func (m *AdServingOptimizationStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdServingOptimizationStatusEnum.Merge(m, src)
 }
 func (m *AdServingOptimizationStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_AdServingOptimizationStatusEnum.Size(m)
@@ -102,15 +108,15 @@ func (m *AdServingOptimizationStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdServingOptimizationStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdServingOptimizationStatusEnum)(nil), "google.ads.googleads.v1.enums.AdServingOptimizationStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdServingOptimizationStatusEnum_AdServingOptimizationStatus", AdServingOptimizationStatusEnum_AdServingOptimizationStatus_name, AdServingOptimizationStatusEnum_AdServingOptimizationStatus_value)
+	proto.RegisterType((*AdServingOptimizationStatusEnum)(nil), "google.ads.googleads.v1.enums.AdServingOptimizationStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_serving_optimization_status.proto", fileDescriptor_ad_serving_optimization_status_41633d967f063778)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_serving_optimization_status.proto", fileDescriptor_6d03632b095a3049)
 }
 
-var fileDescriptor_ad_serving_optimization_status_41633d967f063778 = []byte{
+var fileDescriptor_6d03632b095a3049 = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0x8a, 0xdb, 0x30,
 	0x14, 0xac, 0x9d, 0x36, 0x2d, 0x4a, 0xa1, 0xc6, 0x3d, 0x14, 0xda, 0x86, 0x36, 0xf9, 0x00, 0x19,
diff --git a/googleapis/ads/googleads/v1/enums/ad_strength.pb.go b/googleapis/ads/googleads/v1/enums/ad_strength.pb.go
index 9813475c4d..f439f6667a 100644
--- a/googleapis/ads/googleads/v1/enums/ad_strength.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_strength.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_strength.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the possible ad strengths.
 type AdStrengthEnum_AdStrength int32
@@ -51,6 +54,7 @@ var AdStrengthEnum_AdStrength_name = map[int32]string{
 	6: "GOOD",
 	7: "EXCELLENT",
 }
+
 var AdStrengthEnum_AdStrength_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -65,8 +69,9 @@ var AdStrengthEnum_AdStrength_value = map[string]int32{
 func (x AdStrengthEnum_AdStrength) String() string {
 	return proto.EnumName(AdStrengthEnum_AdStrength_name, int32(x))
 }
+
 func (AdStrengthEnum_AdStrength) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_strength_5cb008be111e595d, []int{0, 0}
+	return fileDescriptor_f6be2a2119b3f8e8, []int{0, 0}
 }
 
 // Container for enum describing possible ad strengths.
@@ -80,16 +85,17 @@ func (m *AdStrengthEnum) Reset()         { *m = AdStrengthEnum{} }
 func (m *AdStrengthEnum) String() string { return proto.CompactTextString(m) }
 func (*AdStrengthEnum) ProtoMessage()    {}
 func (*AdStrengthEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_strength_5cb008be111e595d, []int{0}
+	return fileDescriptor_f6be2a2119b3f8e8, []int{0}
 }
+
 func (m *AdStrengthEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdStrengthEnum.Unmarshal(m, b)
 }
 func (m *AdStrengthEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdStrengthEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdStrengthEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdStrengthEnum.Merge(dst, src)
+func (m *AdStrengthEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdStrengthEnum.Merge(m, src)
 }
 func (m *AdStrengthEnum) XXX_Size() int {
 	return xxx_messageInfo_AdStrengthEnum.Size(m)
@@ -101,15 +107,15 @@ func (m *AdStrengthEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdStrengthEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdStrengthEnum)(nil), "google.ads.googleads.v1.enums.AdStrengthEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdStrengthEnum_AdStrength", AdStrengthEnum_AdStrength_name, AdStrengthEnum_AdStrength_value)
+	proto.RegisterType((*AdStrengthEnum)(nil), "google.ads.googleads.v1.enums.AdStrengthEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_strength.proto", fileDescriptor_ad_strength_5cb008be111e595d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_strength.proto", fileDescriptor_f6be2a2119b3f8e8)
 }
 
-var fileDescriptor_ad_strength_5cb008be111e595d = []byte{
+var fileDescriptor_f6be2a2119b3f8e8 = []byte{
 	// 331 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4e, 0xc2, 0x30,
 	0x18, 0x75, 0x03, 0x41, 0x4b, 0x94, 0x66, 0x97, 0x46, 0x2e, 0xe0, 0x01, 0xba, 0x2c, 0xde, 0xd5,
diff --git a/googleapis/ads/googleads/v1/enums/ad_type.pb.go b/googleapis/ads/googleads/v1/enums/ad_type.pb.go
index c55cd83d0c..fc33f0e81b 100644
--- a/googleapis/ads/googleads/v1/enums/ad_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/ad_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/ad_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible types of an ad.
 type AdTypeEnum_AdType int32
@@ -90,6 +93,7 @@ var AdTypeEnum_AdType_name = map[int32]string{
 	22: "DYNAMIC_HTML5_AD",
 	23: "APP_ENGAGEMENT_AD",
 }
+
 var AdTypeEnum_AdType_value = map[string]int32{
 	"UNSPECIFIED":                  0,
 	"UNKNOWN":                      1,
@@ -116,8 +120,9 @@ var AdTypeEnum_AdType_value = map[string]int32{
 func (x AdTypeEnum_AdType) String() string {
 	return proto.EnumName(AdTypeEnum_AdType_name, int32(x))
 }
+
 func (AdTypeEnum_AdType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_8da0c2fb74489b69, []int{0, 0}
+	return fileDescriptor_c765db6f43f63180, []int{0, 0}
 }
 
 // Container for enum describing possible types of an ad.
@@ -131,16 +136,17 @@ func (m *AdTypeEnum) Reset()         { *m = AdTypeEnum{} }
 func (m *AdTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AdTypeEnum) ProtoMessage()    {}
 func (*AdTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_type_8da0c2fb74489b69, []int{0}
+	return fileDescriptor_c765db6f43f63180, []int{0}
 }
+
 func (m *AdTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdTypeEnum.Unmarshal(m, b)
 }
 func (m *AdTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdTypeEnum.Merge(dst, src)
+func (m *AdTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdTypeEnum.Merge(m, src)
 }
 func (m *AdTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AdTypeEnum.Size(m)
@@ -152,15 +158,15 @@ func (m *AdTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdTypeEnum)(nil), "google.ads.googleads.v1.enums.AdTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdTypeEnum_AdType", AdTypeEnum_AdType_name, AdTypeEnum_AdType_value)
+	proto.RegisterType((*AdTypeEnum)(nil), "google.ads.googleads.v1.enums.AdTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/ad_type.proto", fileDescriptor_ad_type_8da0c2fb74489b69)
+	proto.RegisterFile("google/ads/googleads/v1/enums/ad_type.proto", fileDescriptor_c765db6f43f63180)
 }
 
-var fileDescriptor_ad_type_8da0c2fb74489b69 = []byte{
+var fileDescriptor_c765db6f43f63180 = []byte{
 	// 495 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0xa6, 0x89, 0x94, 0x96, 0x49, 0x20, 0xee, 0xa6, 0xa1, 0x50, 0xb5, 0x88, 0xf6, 0x8a, 0x64,
diff --git a/googleapis/ads/googleads/v1/enums/advertising_channel_sub_type.pb.go b/googleapis/ads/googleads/v1/enums/advertising_channel_sub_type.pb.go
index 88ae3e6384..fe295c5b5c 100644
--- a/googleapis/ads/googleads/v1/enums/advertising_channel_sub_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/advertising_channel_sub_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/advertising_channel_sub_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the different channel subtypes.
 type AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType int32
@@ -73,6 +76,7 @@ var AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType_name = map[int32]str
 	12: "APP_CAMPAIGN",
 	13: "APP_CAMPAIGN_FOR_ENGAGEMENT",
 }
+
 var AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -93,8 +97,9 @@ var AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType_value = map[string]i
 func (x AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType) String() string {
 	return proto.EnumName(AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType_name, int32(x))
 }
+
 func (AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_advertising_channel_sub_type_85066977ea55d72d, []int{0, 0}
+	return fileDescriptor_4530783206e05cfb, []int{0, 0}
 }
 
 // An immutable specialization of an Advertising Channel.
@@ -108,16 +113,17 @@ func (m *AdvertisingChannelSubTypeEnum) Reset()         { *m = AdvertisingChanne
 func (m *AdvertisingChannelSubTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AdvertisingChannelSubTypeEnum) ProtoMessage()    {}
 func (*AdvertisingChannelSubTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_advertising_channel_sub_type_85066977ea55d72d, []int{0}
+	return fileDescriptor_4530783206e05cfb, []int{0}
 }
+
 func (m *AdvertisingChannelSubTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdvertisingChannelSubTypeEnum.Unmarshal(m, b)
 }
 func (m *AdvertisingChannelSubTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdvertisingChannelSubTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdvertisingChannelSubTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdvertisingChannelSubTypeEnum.Merge(dst, src)
+func (m *AdvertisingChannelSubTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdvertisingChannelSubTypeEnum.Merge(m, src)
 }
 func (m *AdvertisingChannelSubTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AdvertisingChannelSubTypeEnum.Size(m)
@@ -129,15 +135,15 @@ func (m *AdvertisingChannelSubTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdvertisingChannelSubTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdvertisingChannelSubTypeEnum)(nil), "google.ads.googleads.v1.enums.AdvertisingChannelSubTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType", AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType_name, AdvertisingChannelSubTypeEnum_AdvertisingChannelSubType_value)
+	proto.RegisterType((*AdvertisingChannelSubTypeEnum)(nil), "google.ads.googleads.v1.enums.AdvertisingChannelSubTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/advertising_channel_sub_type.proto", fileDescriptor_advertising_channel_sub_type_85066977ea55d72d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/advertising_channel_sub_type.proto", fileDescriptor_4530783206e05cfb)
 }
 
-var fileDescriptor_advertising_channel_sub_type_85066977ea55d72d = []byte{
+var fileDescriptor_4530783206e05cfb = []byte{
 	// 476 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x6e, 0xd3, 0x4c,
 	0x14, 0xc5, 0xbf, 0xb8, 0x1f, 0x2d, 0x4c, 0x0a, 0x1d, 0xa6, 0x50, 0x44, 0x21, 0xa0, 0xf6, 0x01,
diff --git a/googleapis/ads/googleads/v1/enums/advertising_channel_type.pb.go b/googleapis/ads/googleads/v1/enums/advertising_channel_type.pb.go
index 5ab30b19a3..de035f1f98 100644
--- a/googleapis/ads/googleads/v1/enums/advertising_channel_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/advertising_channel_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/advertising_channel_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the various advertising channel types.
 type AdvertisingChannelTypeEnum_AdvertisingChannelType int32
@@ -53,6 +56,7 @@ var AdvertisingChannelTypeEnum_AdvertisingChannelType_name = map[int32]string{
 	6: "VIDEO",
 	7: "MULTI_CHANNEL",
 }
+
 var AdvertisingChannelTypeEnum_AdvertisingChannelType_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -67,8 +71,9 @@ var AdvertisingChannelTypeEnum_AdvertisingChannelType_value = map[string]int32{
 func (x AdvertisingChannelTypeEnum_AdvertisingChannelType) String() string {
 	return proto.EnumName(AdvertisingChannelTypeEnum_AdvertisingChannelType_name, int32(x))
 }
+
 func (AdvertisingChannelTypeEnum_AdvertisingChannelType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_advertising_channel_type_fa6d1db862c02c2d, []int{0, 0}
+	return fileDescriptor_d496394fd88a2a26, []int{0, 0}
 }
 
 // The channel type a campaign may target to serve on.
@@ -82,16 +87,17 @@ func (m *AdvertisingChannelTypeEnum) Reset()         { *m = AdvertisingChannelTy
 func (m *AdvertisingChannelTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AdvertisingChannelTypeEnum) ProtoMessage()    {}
 func (*AdvertisingChannelTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_advertising_channel_type_fa6d1db862c02c2d, []int{0}
+	return fileDescriptor_d496394fd88a2a26, []int{0}
 }
+
 func (m *AdvertisingChannelTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdvertisingChannelTypeEnum.Unmarshal(m, b)
 }
 func (m *AdvertisingChannelTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdvertisingChannelTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdvertisingChannelTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdvertisingChannelTypeEnum.Merge(dst, src)
+func (m *AdvertisingChannelTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdvertisingChannelTypeEnum.Merge(m, src)
 }
 func (m *AdvertisingChannelTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AdvertisingChannelTypeEnum.Size(m)
@@ -103,15 +109,15 @@ func (m *AdvertisingChannelTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdvertisingChannelTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdvertisingChannelTypeEnum)(nil), "google.ads.googleads.v1.enums.AdvertisingChannelTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AdvertisingChannelTypeEnum_AdvertisingChannelType", AdvertisingChannelTypeEnum_AdvertisingChannelType_name, AdvertisingChannelTypeEnum_AdvertisingChannelType_value)
+	proto.RegisterType((*AdvertisingChannelTypeEnum)(nil), "google.ads.googleads.v1.enums.AdvertisingChannelTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/advertising_channel_type.proto", fileDescriptor_advertising_channel_type_fa6d1db862c02c2d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/advertising_channel_type.proto", fileDescriptor_d496394fd88a2a26)
 }
 
-var fileDescriptor_advertising_channel_type_fa6d1db862c02c2d = []byte{
+var fileDescriptor_d496394fd88a2a26 = []byte{
 	// 364 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4e, 0xbb, 0x40,
 	0x18, 0xc5, 0xff, 0xd0, 0x7f, 0x5b, 0x9d, 0x6a, 0x1c, 0x59, 0xb8, 0xa8, 0x76, 0xd1, 0x1e, 0x60,
diff --git a/googleapis/ads/googleads/v1/enums/affiliate_location_feed_relationship_type.pb.go b/googleapis/ads/googleads/v1/enums/affiliate_location_feed_relationship_type.pb.go
index 8fff72df19..d151832e68 100644
--- a/googleapis/ads/googleads/v1/enums/affiliate_location_feed_relationship_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/affiliate_location_feed_relationship_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/affiliate_location_feed_relationship_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for a relationship type for an affiliate location feed.
 type AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType int32
@@ -36,6 +39,7 @@ var AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipT
 	1: "UNKNOWN",
 	2: "GENERAL_RETAILER",
 }
+
 var AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType_value = map[string]int32{
 	"UNSPECIFIED":      0,
 	"UNKNOWN":          1,
@@ -45,8 +49,9 @@ var AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipT
 func (x AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType) String() string {
 	return proto.EnumName(AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType_name, int32(x))
 }
+
 func (AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_affiliate_location_feed_relationship_type_3af3bb377476510a, []int{0, 0}
+	return fileDescriptor_7f857a321b243c6c, []int{0, 0}
 }
 
 // Container for enum describing possible values for a relationship type for
@@ -63,16 +68,17 @@ func (m *AffiliateLocationFeedRelationshipTypeEnum) Reset() {
 func (m *AffiliateLocationFeedRelationshipTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AffiliateLocationFeedRelationshipTypeEnum) ProtoMessage()    {}
 func (*AffiliateLocationFeedRelationshipTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_affiliate_location_feed_relationship_type_3af3bb377476510a, []int{0}
+	return fileDescriptor_7f857a321b243c6c, []int{0}
 }
+
 func (m *AffiliateLocationFeedRelationshipTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AffiliateLocationFeedRelationshipTypeEnum.Unmarshal(m, b)
 }
 func (m *AffiliateLocationFeedRelationshipTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AffiliateLocationFeedRelationshipTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AffiliateLocationFeedRelationshipTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AffiliateLocationFeedRelationshipTypeEnum.Merge(dst, src)
+func (m *AffiliateLocationFeedRelationshipTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AffiliateLocationFeedRelationshipTypeEnum.Merge(m, src)
 }
 func (m *AffiliateLocationFeedRelationshipTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AffiliateLocationFeedRelationshipTypeEnum.Size(m)
@@ -84,15 +90,15 @@ func (m *AffiliateLocationFeedRelationshipTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AffiliateLocationFeedRelationshipTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AffiliateLocationFeedRelationshipTypeEnum)(nil), "google.ads.googleads.v1.enums.AffiliateLocationFeedRelationshipTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType", AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType_name, AffiliateLocationFeedRelationshipTypeEnum_AffiliateLocationFeedRelationshipType_value)
+	proto.RegisterType((*AffiliateLocationFeedRelationshipTypeEnum)(nil), "google.ads.googleads.v1.enums.AffiliateLocationFeedRelationshipTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/affiliate_location_feed_relationship_type.proto", fileDescriptor_affiliate_location_feed_relationship_type_3af3bb377476510a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/affiliate_location_feed_relationship_type.proto", fileDescriptor_7f857a321b243c6c)
 }
 
-var fileDescriptor_affiliate_location_feed_relationship_type_3af3bb377476510a = []byte{
+var fileDescriptor_7f857a321b243c6c = []byte{
 	// 332 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4a, 0xc3, 0x30,
 	0x18, 0xc7, 0x6d, 0x05, 0x85, 0xec, 0x60, 0x29, 0x9e, 0xc4, 0x1d, 0x36, 0xf0, 0xa0, 0x87, 0x94,
diff --git a/googleapis/ads/googleads/v1/enums/affiliate_location_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/affiliate_location_placeholder_field.pb.go
index 9ab7c1ba84..de5643d0ae 100644
--- a/googleapis/ads/googleads/v1/enums/affiliate_location_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/affiliate_location_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/affiliate_location_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Affiliate Location placeholder fields.
 type AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField int32
@@ -66,6 +69,7 @@ var AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField_name
 	11: "CHAIN_ID",
 	12: "CHAIN_NAME",
 }
+
 var AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -85,8 +89,9 @@ var AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField_valu
 func (x AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField) String() string {
 	return proto.EnumName(AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField_name, int32(x))
 }
+
 func (AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_affiliate_location_placeholder_field_9a684762b064fbe0, []int{0, 0}
+	return fileDescriptor_00ea8dfbc7e37169, []int{0, 0}
 }
 
 // Values for Affiliate Location placeholder fields.
@@ -100,16 +105,17 @@ func (m *AffiliateLocationPlaceholderFieldEnum) Reset()         { *m = Affiliate
 func (m *AffiliateLocationPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*AffiliateLocationPlaceholderFieldEnum) ProtoMessage()    {}
 func (*AffiliateLocationPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_affiliate_location_placeholder_field_9a684762b064fbe0, []int{0}
+	return fileDescriptor_00ea8dfbc7e37169, []int{0}
 }
+
 func (m *AffiliateLocationPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AffiliateLocationPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *AffiliateLocationPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AffiliateLocationPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *AffiliateLocationPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AffiliateLocationPlaceholderFieldEnum.Merge(dst, src)
+func (m *AffiliateLocationPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AffiliateLocationPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *AffiliateLocationPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_AffiliateLocationPlaceholderFieldEnum.Size(m)
@@ -121,15 +127,15 @@ func (m *AffiliateLocationPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AffiliateLocationPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AffiliateLocationPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.AffiliateLocationPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField", AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField_name, AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField_value)
+	proto.RegisterType((*AffiliateLocationPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.AffiliateLocationPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/affiliate_location_placeholder_field.proto", fileDescriptor_affiliate_location_placeholder_field_9a684762b064fbe0)
+	proto.RegisterFile("google/ads/googleads/v1/enums/affiliate_location_placeholder_field.proto", fileDescriptor_00ea8dfbc7e37169)
 }
 
-var fileDescriptor_affiliate_location_placeholder_field_9a684762b064fbe0 = []byte{
+var fileDescriptor_00ea8dfbc7e37169 = []byte{
 	// 431 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xc1, 0x8e, 0xd3, 0x30,
 	0x10, 0xa5, 0xd9, 0x65, 0xb7, 0xb8, 0x65, 0x31, 0x3e, 0x22, 0xf6, 0xd0, 0x95, 0xe0, 0xe8, 0x28,
diff --git a/googleapis/ads/googleads/v1/enums/age_range_type.pb.go b/googleapis/ads/googleads/v1/enums/age_range_type.pb.go
index 7ef3e94fbe..18c7bdbec3 100644
--- a/googleapis/ads/googleads/v1/enums/age_range_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/age_range_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/age_range_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of demographic age ranges (e.g. between 18 and 24 years old).
 type AgeRangeTypeEnum_AgeRangeType int32
@@ -54,6 +57,7 @@ var AgeRangeTypeEnum_AgeRangeType_name = map[int32]string{
 	503006: "AGE_RANGE_65_UP",
 	503999: "AGE_RANGE_UNDETERMINED",
 }
+
 var AgeRangeTypeEnum_AgeRangeType_value = map[string]int32{
 	"UNSPECIFIED":            0,
 	"UNKNOWN":                1,
@@ -69,8 +73,9 @@ var AgeRangeTypeEnum_AgeRangeType_value = map[string]int32{
 func (x AgeRangeTypeEnum_AgeRangeType) String() string {
 	return proto.EnumName(AgeRangeTypeEnum_AgeRangeType_name, int32(x))
 }
+
 func (AgeRangeTypeEnum_AgeRangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_age_range_type_6aa2521db2f95ab5, []int{0, 0}
+	return fileDescriptor_063260bf4028a422, []int{0, 0}
 }
 
 // Container for enum describing the type of demographic age ranges.
@@ -84,16 +89,17 @@ func (m *AgeRangeTypeEnum) Reset()         { *m = AgeRangeTypeEnum{} }
 func (m *AgeRangeTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AgeRangeTypeEnum) ProtoMessage()    {}
 func (*AgeRangeTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_age_range_type_6aa2521db2f95ab5, []int{0}
+	return fileDescriptor_063260bf4028a422, []int{0}
 }
+
 func (m *AgeRangeTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AgeRangeTypeEnum.Unmarshal(m, b)
 }
 func (m *AgeRangeTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AgeRangeTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AgeRangeTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AgeRangeTypeEnum.Merge(dst, src)
+func (m *AgeRangeTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AgeRangeTypeEnum.Merge(m, src)
 }
 func (m *AgeRangeTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AgeRangeTypeEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *AgeRangeTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AgeRangeTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AgeRangeTypeEnum)(nil), "google.ads.googleads.v1.enums.AgeRangeTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AgeRangeTypeEnum_AgeRangeType", AgeRangeTypeEnum_AgeRangeType_name, AgeRangeTypeEnum_AgeRangeType_value)
+	proto.RegisterType((*AgeRangeTypeEnum)(nil), "google.ads.googleads.v1.enums.AgeRangeTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/age_range_type.proto", fileDescriptor_age_range_type_6aa2521db2f95ab5)
+	proto.RegisterFile("google/ads/googleads/v1/enums/age_range_type.proto", fileDescriptor_063260bf4028a422)
 }
 
-var fileDescriptor_age_range_type_6aa2521db2f95ab5 = []byte{
+var fileDescriptor_063260bf4028a422 = []byte{
 	// 378 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xd4, 0xbc,
diff --git a/googleapis/ads/googleads/v1/enums/app_campaign_app_store.pb.go b/googleapis/ads/googleads/v1/enums/app_campaign_app_store.pb.go
index 67b750bb33..64ad15fde9 100644
--- a/googleapis/ads/googleads/v1/enums/app_campaign_app_store.pb.go
+++ b/googleapis/ads/googleads/v1/enums/app_campaign_app_store.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/app_campaign_app_store.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing app campaign app store.
 type AppCampaignAppStoreEnum_AppCampaignAppStore int32
@@ -39,6 +42,7 @@ var AppCampaignAppStoreEnum_AppCampaignAppStore_name = map[int32]string{
 	2: "APPLE_APP_STORE",
 	3: "GOOGLE_APP_STORE",
 }
+
 var AppCampaignAppStoreEnum_AppCampaignAppStore_value = map[string]int32{
 	"UNSPECIFIED":      0,
 	"UNKNOWN":          1,
@@ -49,8 +53,9 @@ var AppCampaignAppStoreEnum_AppCampaignAppStore_value = map[string]int32{
 func (x AppCampaignAppStoreEnum_AppCampaignAppStore) String() string {
 	return proto.EnumName(AppCampaignAppStoreEnum_AppCampaignAppStore_name, int32(x))
 }
+
 func (AppCampaignAppStoreEnum_AppCampaignAppStore) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_campaign_app_store_a6bc8941816fd21e, []int{0, 0}
+	return fileDescriptor_7e6ebba29b36d5af, []int{0, 0}
 }
 
 // The application store that distributes mobile applications.
@@ -64,16 +69,17 @@ func (m *AppCampaignAppStoreEnum) Reset()         { *m = AppCampaignAppStoreEnum
 func (m *AppCampaignAppStoreEnum) String() string { return proto.CompactTextString(m) }
 func (*AppCampaignAppStoreEnum) ProtoMessage()    {}
 func (*AppCampaignAppStoreEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_campaign_app_store_a6bc8941816fd21e, []int{0}
+	return fileDescriptor_7e6ebba29b36d5af, []int{0}
 }
+
 func (m *AppCampaignAppStoreEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppCampaignAppStoreEnum.Unmarshal(m, b)
 }
 func (m *AppCampaignAppStoreEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppCampaignAppStoreEnum.Marshal(b, m, deterministic)
 }
-func (dst *AppCampaignAppStoreEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppCampaignAppStoreEnum.Merge(dst, src)
+func (m *AppCampaignAppStoreEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppCampaignAppStoreEnum.Merge(m, src)
 }
 func (m *AppCampaignAppStoreEnum) XXX_Size() int {
 	return xxx_messageInfo_AppCampaignAppStoreEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *AppCampaignAppStoreEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AppCampaignAppStoreEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AppCampaignAppStoreEnum)(nil), "google.ads.googleads.v1.enums.AppCampaignAppStoreEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AppCampaignAppStoreEnum_AppCampaignAppStore", AppCampaignAppStoreEnum_AppCampaignAppStore_name, AppCampaignAppStoreEnum_AppCampaignAppStore_value)
+	proto.RegisterType((*AppCampaignAppStoreEnum)(nil), "google.ads.googleads.v1.enums.AppCampaignAppStoreEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/app_campaign_app_store.proto", fileDescriptor_app_campaign_app_store_a6bc8941816fd21e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/app_campaign_app_store.proto", fileDescriptor_7e6ebba29b36d5af)
 }
 
-var fileDescriptor_app_campaign_app_store_a6bc8941816fd21e = []byte{
+var fileDescriptor_7e6ebba29b36d5af = []byte{
 	// 315 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4a, 0xc3, 0x30,
 	0x14, 0x75, 0x1d, 0x28, 0x64, 0x0f, 0x2b, 0x9d, 0xa0, 0x88, 0x7b, 0xd8, 0x3e, 0x20, 0xa1, 0xf8,
diff --git a/googleapis/ads/googleads/v1/enums/app_campaign_bidding_strategy_goal_type.pb.go b/googleapis/ads/googleads/v1/enums/app_campaign_bidding_strategy_goal_type.pb.go
index 2b4f9fbba8..dfb7e4c1b0 100644
--- a/googleapis/ads/googleads/v1/enums/app_campaign_bidding_strategy_goal_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/app_campaign_bidding_strategy_goal_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/app_campaign_bidding_strategy_goal_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Goal type of App campaign BiddingStrategy.
 type AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType int32
@@ -52,6 +55,7 @@ var AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType_na
 	4: "OPTIMIZE_IN_APP_CONVERSIONS_TARGET_CONVERSION_COST",
 	5: "OPTIMIZE_RETURN_ON_ADVERTISING_SPEND",
 }
+
 var AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType_value = map[string]int32{
 	"UNSPECIFIED":                           0,
 	"UNKNOWN":                               1,
@@ -64,8 +68,9 @@ var AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType_va
 func (x AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType) String() string {
 	return proto.EnumName(AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType_name, int32(x))
 }
+
 func (AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_campaign_bidding_strategy_goal_type_f6a7d1f1531eb5da, []int{0, 0}
+	return fileDescriptor_421bbef09a409bde, []int{0, 0}
 }
 
 // Container for enum describing goal towards which the bidding strategy of an
@@ -82,16 +87,17 @@ func (m *AppCampaignBiddingStrategyGoalTypeEnum) Reset() {
 func (m *AppCampaignBiddingStrategyGoalTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AppCampaignBiddingStrategyGoalTypeEnum) ProtoMessage()    {}
 func (*AppCampaignBiddingStrategyGoalTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_campaign_bidding_strategy_goal_type_f6a7d1f1531eb5da, []int{0}
+	return fileDescriptor_421bbef09a409bde, []int{0}
 }
+
 func (m *AppCampaignBiddingStrategyGoalTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppCampaignBiddingStrategyGoalTypeEnum.Unmarshal(m, b)
 }
 func (m *AppCampaignBiddingStrategyGoalTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppCampaignBiddingStrategyGoalTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AppCampaignBiddingStrategyGoalTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppCampaignBiddingStrategyGoalTypeEnum.Merge(dst, src)
+func (m *AppCampaignBiddingStrategyGoalTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppCampaignBiddingStrategyGoalTypeEnum.Merge(m, src)
 }
 func (m *AppCampaignBiddingStrategyGoalTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AppCampaignBiddingStrategyGoalTypeEnum.Size(m)
@@ -103,15 +109,15 @@ func (m *AppCampaignBiddingStrategyGoalTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AppCampaignBiddingStrategyGoalTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AppCampaignBiddingStrategyGoalTypeEnum)(nil), "google.ads.googleads.v1.enums.AppCampaignBiddingStrategyGoalTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType", AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType_name, AppCampaignBiddingStrategyGoalTypeEnum_AppCampaignBiddingStrategyGoalType_value)
+	proto.RegisterType((*AppCampaignBiddingStrategyGoalTypeEnum)(nil), "google.ads.googleads.v1.enums.AppCampaignBiddingStrategyGoalTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/app_campaign_bidding_strategy_goal_type.proto", fileDescriptor_app_campaign_bidding_strategy_goal_type_f6a7d1f1531eb5da)
+	proto.RegisterFile("google/ads/googleads/v1/enums/app_campaign_bidding_strategy_goal_type.proto", fileDescriptor_421bbef09a409bde)
 }
 
-var fileDescriptor_app_campaign_bidding_strategy_goal_type_f6a7d1f1531eb5da = []byte{
+var fileDescriptor_421bbef09a409bde = []byte{
 	// 413 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x8a, 0xdb, 0x30,
 	0x10, 0x6e, 0xbc, 0xfd, 0x01, 0xed, 0xa1, 0xc1, 0xc7, 0xd2, 0x3d, 0x6c, 0xe8, 0xef, 0x45, 0xc6,
diff --git a/googleapis/ads/googleads/v1/enums/app_payment_model_type.pb.go b/googleapis/ads/googleads/v1/enums/app_payment_model_type.pb.go
index f2264e1a72..eca621f7ea 100644
--- a/googleapis/ads/googleads/v1/enums/app_payment_model_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/app_payment_model_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/app_payment_model_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible app payment models.
 type AppPaymentModelTypeEnum_AppPaymentModelType int32
@@ -36,6 +39,7 @@ var AppPaymentModelTypeEnum_AppPaymentModelType_name = map[int32]string{
 	1:  "UNKNOWN",
 	30: "PAID",
 }
+
 var AppPaymentModelTypeEnum_AppPaymentModelType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var AppPaymentModelTypeEnum_AppPaymentModelType_value = map[string]int32{
 func (x AppPaymentModelTypeEnum_AppPaymentModelType) String() string {
 	return proto.EnumName(AppPaymentModelTypeEnum_AppPaymentModelType_name, int32(x))
 }
+
 func (AppPaymentModelTypeEnum_AppPaymentModelType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_payment_model_type_2d44013d63f90d11, []int{0, 0}
+	return fileDescriptor_963a2c4d6c17beff, []int{0, 0}
 }
 
 // Represents a criterion for targeting paid apps.
@@ -60,16 +65,17 @@ func (m *AppPaymentModelTypeEnum) Reset()         { *m = AppPaymentModelTypeEnum
 func (m *AppPaymentModelTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AppPaymentModelTypeEnum) ProtoMessage()    {}
 func (*AppPaymentModelTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_payment_model_type_2d44013d63f90d11, []int{0}
+	return fileDescriptor_963a2c4d6c17beff, []int{0}
 }
+
 func (m *AppPaymentModelTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppPaymentModelTypeEnum.Unmarshal(m, b)
 }
 func (m *AppPaymentModelTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppPaymentModelTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AppPaymentModelTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppPaymentModelTypeEnum.Merge(dst, src)
+func (m *AppPaymentModelTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppPaymentModelTypeEnum.Merge(m, src)
 }
 func (m *AppPaymentModelTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AppPaymentModelTypeEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *AppPaymentModelTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AppPaymentModelTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AppPaymentModelTypeEnum)(nil), "google.ads.googleads.v1.enums.AppPaymentModelTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AppPaymentModelTypeEnum_AppPaymentModelType", AppPaymentModelTypeEnum_AppPaymentModelType_name, AppPaymentModelTypeEnum_AppPaymentModelType_value)
+	proto.RegisterType((*AppPaymentModelTypeEnum)(nil), "google.ads.googleads.v1.enums.AppPaymentModelTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/app_payment_model_type.proto", fileDescriptor_app_payment_model_type_2d44013d63f90d11)
+	proto.RegisterFile("google/ads/googleads/v1/enums/app_payment_model_type.proto", fileDescriptor_963a2c4d6c17beff)
 }
 
-var fileDescriptor_app_payment_model_type_2d44013d63f90d11 = []byte{
+var fileDescriptor_963a2c4d6c17beff = []byte{
 	// 302 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xf3, 0x30,
 	0x1c, 0xc5, 0xbf, 0xed, 0x13, 0x95, 0xec, 0xc2, 0x51, 0x2f, 0x14, 0x71, 0xc2, 0xf6, 0x00, 0x09,
diff --git a/googleapis/ads/googleads/v1/enums/app_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/app_placeholder_field.pb.go
index 5221f6a444..32878e3923 100644
--- a/googleapis/ads/googleads/v1/enums/app_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/app_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/app_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for App placeholder fields.
 type AppPlaceholderFieldEnum_AppPlaceholderField int32
@@ -64,6 +67,7 @@ var AppPlaceholderFieldEnum_AppPlaceholderField_name = map[int32]string{
 	8: "TRACKING_URL",
 	9: "FINAL_URL_SUFFIX",
 }
+
 var AppPlaceholderFieldEnum_AppPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":       0,
 	"UNKNOWN":           1,
@@ -80,8 +84,9 @@ var AppPlaceholderFieldEnum_AppPlaceholderField_value = map[string]int32{
 func (x AppPlaceholderFieldEnum_AppPlaceholderField) String() string {
 	return proto.EnumName(AppPlaceholderFieldEnum_AppPlaceholderField_name, int32(x))
 }
+
 func (AppPlaceholderFieldEnum_AppPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_placeholder_field_18f7848a1cee338f, []int{0, 0}
+	return fileDescriptor_f69ee9c0d399b0c8, []int{0, 0}
 }
 
 // Values for App placeholder fields.
@@ -95,16 +100,17 @@ func (m *AppPlaceholderFieldEnum) Reset()         { *m = AppPlaceholderFieldEnum
 func (m *AppPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*AppPlaceholderFieldEnum) ProtoMessage()    {}
 func (*AppPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_placeholder_field_18f7848a1cee338f, []int{0}
+	return fileDescriptor_f69ee9c0d399b0c8, []int{0}
 }
+
 func (m *AppPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *AppPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *AppPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppPlaceholderFieldEnum.Merge(dst, src)
+func (m *AppPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *AppPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_AppPlaceholderFieldEnum.Size(m)
@@ -116,15 +122,15 @@ func (m *AppPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AppPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AppPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.AppPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AppPlaceholderFieldEnum_AppPlaceholderField", AppPlaceholderFieldEnum_AppPlaceholderField_name, AppPlaceholderFieldEnum_AppPlaceholderField_value)
+	proto.RegisterType((*AppPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.AppPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/app_placeholder_field.proto", fileDescriptor_app_placeholder_field_18f7848a1cee338f)
+	proto.RegisterFile("google/ads/googleads/v1/enums/app_placeholder_field.proto", fileDescriptor_f69ee9c0d399b0c8)
 }
 
-var fileDescriptor_app_placeholder_field_18f7848a1cee338f = []byte{
+var fileDescriptor_f69ee9c0d399b0c8 = []byte{
 	// 382 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xdd, 0xce, 0x93, 0x30,
 	0x18, 0x16, 0xe6, 0xb7, 0xb9, 0x7e, 0xfe, 0xd4, 0xaa, 0xd1, 0x18, 0x77, 0xb0, 0x5d, 0x40, 0x09,
diff --git a/googleapis/ads/googleads/v1/enums/app_store.pb.go b/googleapis/ads/googleads/v1/enums/app_store.pb.go
index f86baf72d9..53d6d8abae 100644
--- a/googleapis/ads/googleads/v1/enums/app_store.pb.go
+++ b/googleapis/ads/googleads/v1/enums/app_store.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/app_store.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // App store type in an app extension.
 type AppStoreEnum_AppStore int32
@@ -39,6 +42,7 @@ var AppStoreEnum_AppStore_name = map[int32]string{
 	2: "APPLE_ITUNES",
 	3: "GOOGLE_PLAY",
 }
+
 var AppStoreEnum_AppStore_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -49,8 +53,9 @@ var AppStoreEnum_AppStore_value = map[string]int32{
 func (x AppStoreEnum_AppStore) String() string {
 	return proto.EnumName(AppStoreEnum_AppStore_name, int32(x))
 }
+
 func (AppStoreEnum_AppStore) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_store_e122b0acc6870c18, []int{0, 0}
+	return fileDescriptor_6f2edfdc6e3ce9d3, []int{0, 0}
 }
 
 // Container for enum describing app store type in an app extension.
@@ -64,16 +69,17 @@ func (m *AppStoreEnum) Reset()         { *m = AppStoreEnum{} }
 func (m *AppStoreEnum) String() string { return proto.CompactTextString(m) }
 func (*AppStoreEnum) ProtoMessage()    {}
 func (*AppStoreEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_store_e122b0acc6870c18, []int{0}
+	return fileDescriptor_6f2edfdc6e3ce9d3, []int{0}
 }
+
 func (m *AppStoreEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppStoreEnum.Unmarshal(m, b)
 }
 func (m *AppStoreEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppStoreEnum.Marshal(b, m, deterministic)
 }
-func (dst *AppStoreEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppStoreEnum.Merge(dst, src)
+func (m *AppStoreEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppStoreEnum.Merge(m, src)
 }
 func (m *AppStoreEnum) XXX_Size() int {
 	return xxx_messageInfo_AppStoreEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *AppStoreEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AppStoreEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AppStoreEnum)(nil), "google.ads.googleads.v1.enums.AppStoreEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AppStoreEnum_AppStore", AppStoreEnum_AppStore_name, AppStoreEnum_AppStore_value)
+	proto.RegisterType((*AppStoreEnum)(nil), "google.ads.googleads.v1.enums.AppStoreEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/app_store.proto", fileDescriptor_app_store_e122b0acc6870c18)
+	proto.RegisterFile("google/ads/googleads/v1/enums/app_store.proto", fileDescriptor_6f2edfdc6e3ce9d3)
 }
 
-var fileDescriptor_app_store_e122b0acc6870c18 = []byte{
+var fileDescriptor_6f2edfdc6e3ce9d3 = []byte{
 	// 299 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x5d, 0x07, 0x2a, 0xd9, 0xc4, 0xd2, 0xa3, 0xb8, 0xc3, 0x76, 0x37, 0xa1, 0x78, 0x8b,
diff --git a/googleapis/ads/googleads/v1/enums/app_url_operating_system_type.pb.go b/googleapis/ads/googleads/v1/enums/app_url_operating_system_type.pb.go
index 7000ec3233..96a68c09e1 100644
--- a/googleapis/ads/googleads/v1/enums/app_url_operating_system_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/app_url_operating_system_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/app_url_operating_system_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Operating System
 type AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType int32
@@ -39,6 +42,7 @@ var AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType_name = map[int32]str
 	2: "IOS",
 	3: "ANDROID",
 }
+
 var AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType_value = map[string]i
 func (x AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType) String() string {
 	return proto.EnumName(AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType_name, int32(x))
 }
+
 func (AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_url_operating_system_type_383fa34862fb8242, []int{0, 0}
+	return fileDescriptor_9be88570ce0e911d, []int{0, 0}
 }
 
 // The possible OS types for a deeplink AppUrl.
@@ -64,16 +69,17 @@ func (m *AppUrlOperatingSystemTypeEnum) Reset()         { *m = AppUrlOperatingSy
 func (m *AppUrlOperatingSystemTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AppUrlOperatingSystemTypeEnum) ProtoMessage()    {}
 func (*AppUrlOperatingSystemTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_url_operating_system_type_383fa34862fb8242, []int{0}
+	return fileDescriptor_9be88570ce0e911d, []int{0}
 }
+
 func (m *AppUrlOperatingSystemTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppUrlOperatingSystemTypeEnum.Unmarshal(m, b)
 }
 func (m *AppUrlOperatingSystemTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppUrlOperatingSystemTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AppUrlOperatingSystemTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppUrlOperatingSystemTypeEnum.Merge(dst, src)
+func (m *AppUrlOperatingSystemTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppUrlOperatingSystemTypeEnum.Merge(m, src)
 }
 func (m *AppUrlOperatingSystemTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AppUrlOperatingSystemTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *AppUrlOperatingSystemTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AppUrlOperatingSystemTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AppUrlOperatingSystemTypeEnum)(nil), "google.ads.googleads.v1.enums.AppUrlOperatingSystemTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType", AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType_name, AppUrlOperatingSystemTypeEnum_AppUrlOperatingSystemType_value)
+	proto.RegisterType((*AppUrlOperatingSystemTypeEnum)(nil), "google.ads.googleads.v1.enums.AppUrlOperatingSystemTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/app_url_operating_system_type.proto", fileDescriptor_app_url_operating_system_type_383fa34862fb8242)
+	proto.RegisterFile("google/ads/googleads/v1/enums/app_url_operating_system_type.proto", fileDescriptor_9be88570ce0e911d)
 }
 
-var fileDescriptor_app_url_operating_system_type_383fa34862fb8242 = []byte{
+var fileDescriptor_9be88570ce0e911d = []byte{
 	// 314 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x4b, 0xc3, 0x30,
 	0x18, 0x75, 0x1d, 0x38, 0xc8, 0x0e, 0x96, 0xde, 0x14, 0x27, 0x6c, 0x3f, 0x20, 0xa1, 0x78, 0x8b,
diff --git a/googleapis/ads/googleads/v1/enums/asset_type.pb.go b/googleapis/ads/googleads/v1/enums/asset_type.pb.go
index a200004928..d47c738603 100644
--- a/googleapis/ads/googleads/v1/enums/asset_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/asset_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/asset_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible types of asset.
 type AssetTypeEnum_AssetType int32
@@ -45,6 +48,7 @@ var AssetTypeEnum_AssetType_name = map[int32]string{
 	4: "IMAGE",
 	5: "TEXT",
 }
+
 var AssetTypeEnum_AssetType_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -57,8 +61,9 @@ var AssetTypeEnum_AssetType_value = map[string]int32{
 func (x AssetTypeEnum_AssetType) String() string {
 	return proto.EnumName(AssetTypeEnum_AssetType_name, int32(x))
 }
+
 func (AssetTypeEnum_AssetType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_asset_type_6ee0f36116fdf786, []int{0, 0}
+	return fileDescriptor_491e1f3963d1cbfd, []int{0, 0}
 }
 
 // Container for enum describing the types of asset.
@@ -72,16 +77,17 @@ func (m *AssetTypeEnum) Reset()         { *m = AssetTypeEnum{} }
 func (m *AssetTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*AssetTypeEnum) ProtoMessage()    {}
 func (*AssetTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_type_6ee0f36116fdf786, []int{0}
+	return fileDescriptor_491e1f3963d1cbfd, []int{0}
 }
+
 func (m *AssetTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AssetTypeEnum.Unmarshal(m, b)
 }
 func (m *AssetTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AssetTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *AssetTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AssetTypeEnum.Merge(dst, src)
+func (m *AssetTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssetTypeEnum.Merge(m, src)
 }
 func (m *AssetTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_AssetTypeEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *AssetTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AssetTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AssetTypeEnum)(nil), "google.ads.googleads.v1.enums.AssetTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AssetTypeEnum_AssetType", AssetTypeEnum_AssetType_name, AssetTypeEnum_AssetType_value)
+	proto.RegisterType((*AssetTypeEnum)(nil), "google.ads.googleads.v1.enums.AssetTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/asset_type.proto", fileDescriptor_asset_type_6ee0f36116fdf786)
+	proto.RegisterFile("google/ads/googleads/v1/enums/asset_type.proto", fileDescriptor_491e1f3963d1cbfd)
 }
 
-var fileDescriptor_asset_type_6ee0f36116fdf786 = []byte{
+var fileDescriptor_491e1f3963d1cbfd = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4e, 0xf3, 0x30,
 	0x14, 0xc4, 0xbf, 0xa6, 0xed, 0x07, 0x75, 0x29, 0x18, 0x2f, 0x11, 0x5d, 0xb4, 0x07, 0x70, 0x14,
diff --git a/googleapis/ads/googleads/v1/enums/attribution_model.pb.go b/googleapis/ads/googleads/v1/enums/attribution_model.pb.go
index a3fca632da..252180b96f 100644
--- a/googleapis/ads/googleads/v1/enums/attribution_model.pb.go
+++ b/googleapis/ads/googleads/v1/enums/attribution_model.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/attribution_model.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The attribution model that describes how to distribute credit for a
 // particular conversion across potentially many prior interactions.
@@ -61,6 +64,7 @@ var AttributionModelEnum_AttributionModel_name = map[int32]string{
 	105: "GOOGLE_SEARCH_ATTRIBUTION_POSITION_BASED",
 	106: "GOOGLE_SEARCH_ATTRIBUTION_DATA_DRIVEN",
 }
+
 var AttributionModelEnum_AttributionModel_value = map[string]int32{
 	"UNSPECIFIED":                              0,
 	"UNKNOWN":                                  1,
@@ -76,8 +80,9 @@ var AttributionModelEnum_AttributionModel_value = map[string]int32{
 func (x AttributionModelEnum_AttributionModel) String() string {
 	return proto.EnumName(AttributionModelEnum_AttributionModel_name, int32(x))
 }
+
 func (AttributionModelEnum_AttributionModel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_attribution_model_6e5f9ecff5a128d2, []int{0, 0}
+	return fileDescriptor_544444d91d4f05f0, []int{0, 0}
 }
 
 // Container for enum representing the attribution model that describes how to
@@ -93,16 +98,17 @@ func (m *AttributionModelEnum) Reset()         { *m = AttributionModelEnum{} }
 func (m *AttributionModelEnum) String() string { return proto.CompactTextString(m) }
 func (*AttributionModelEnum) ProtoMessage()    {}
 func (*AttributionModelEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_attribution_model_6e5f9ecff5a128d2, []int{0}
+	return fileDescriptor_544444d91d4f05f0, []int{0}
 }
+
 func (m *AttributionModelEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttributionModelEnum.Unmarshal(m, b)
 }
 func (m *AttributionModelEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttributionModelEnum.Marshal(b, m, deterministic)
 }
-func (dst *AttributionModelEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttributionModelEnum.Merge(dst, src)
+func (m *AttributionModelEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttributionModelEnum.Merge(m, src)
 }
 func (m *AttributionModelEnum) XXX_Size() int {
 	return xxx_messageInfo_AttributionModelEnum.Size(m)
@@ -114,15 +120,15 @@ func (m *AttributionModelEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AttributionModelEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AttributionModelEnum)(nil), "google.ads.googleads.v1.enums.AttributionModelEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.AttributionModelEnum_AttributionModel", AttributionModelEnum_AttributionModel_name, AttributionModelEnum_AttributionModel_value)
+	proto.RegisterType((*AttributionModelEnum)(nil), "google.ads.googleads.v1.enums.AttributionModelEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/attribution_model.proto", fileDescriptor_attribution_model_6e5f9ecff5a128d2)
+	proto.RegisterFile("google/ads/googleads/v1/enums/attribution_model.proto", fileDescriptor_544444d91d4f05f0)
 }
 
-var fileDescriptor_attribution_model_6e5f9ecff5a128d2 = []byte{
+var fileDescriptor_544444d91d4f05f0 = []byte{
 	// 407 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xdd, 0x6a, 0xd4, 0x40,
 	0x1c, 0xc5, 0xdd, 0x08, 0x2a, 0x53, 0xc1, 0x61, 0xb0, 0x17, 0x8a, 0x05, 0x5b, 0x2a, 0x54, 0x90,
diff --git a/googleapis/ads/googleads/v1/enums/bid_modifier_source.pb.go b/googleapis/ads/googleads/v1/enums/bid_modifier_source.pb.go
index 9450a37afb..e7019f4598 100644
--- a/googleapis/ads/googleads/v1/enums/bid_modifier_source.pb.go
+++ b/googleapis/ads/googleads/v1/enums/bid_modifier_source.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/bid_modifier_source.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible bid modifier sources.
 type BidModifierSourceEnum_BidModifierSource int32
@@ -40,6 +43,7 @@ var BidModifierSourceEnum_BidModifierSource_name = map[int32]string{
 	2: "CAMPAIGN",
 	3: "AD_GROUP",
 }
+
 var BidModifierSourceEnum_BidModifierSource_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -50,8 +54,9 @@ var BidModifierSourceEnum_BidModifierSource_value = map[string]int32{
 func (x BidModifierSourceEnum_BidModifierSource) String() string {
 	return proto.EnumName(BidModifierSourceEnum_BidModifierSource_name, int32(x))
 }
+
 func (BidModifierSourceEnum_BidModifierSource) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bid_modifier_source_e3eae9c0e23dc5d0, []int{0, 0}
+	return fileDescriptor_7d26e3acf5e20574, []int{0, 0}
 }
 
 // Container for enum describing possible bid modifier sources.
@@ -65,16 +70,17 @@ func (m *BidModifierSourceEnum) Reset()         { *m = BidModifierSourceEnum{} }
 func (m *BidModifierSourceEnum) String() string { return proto.CompactTextString(m) }
 func (*BidModifierSourceEnum) ProtoMessage()    {}
 func (*BidModifierSourceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bid_modifier_source_e3eae9c0e23dc5d0, []int{0}
+	return fileDescriptor_7d26e3acf5e20574, []int{0}
 }
+
 func (m *BidModifierSourceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BidModifierSourceEnum.Unmarshal(m, b)
 }
 func (m *BidModifierSourceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BidModifierSourceEnum.Marshal(b, m, deterministic)
 }
-func (dst *BidModifierSourceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BidModifierSourceEnum.Merge(dst, src)
+func (m *BidModifierSourceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BidModifierSourceEnum.Merge(m, src)
 }
 func (m *BidModifierSourceEnum) XXX_Size() int {
 	return xxx_messageInfo_BidModifierSourceEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *BidModifierSourceEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BidModifierSourceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BidModifierSourceEnum)(nil), "google.ads.googleads.v1.enums.BidModifierSourceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BidModifierSourceEnum_BidModifierSource", BidModifierSourceEnum_BidModifierSource_name, BidModifierSourceEnum_BidModifierSource_value)
+	proto.RegisterType((*BidModifierSourceEnum)(nil), "google.ads.googleads.v1.enums.BidModifierSourceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/bid_modifier_source.proto", fileDescriptor_bid_modifier_source_e3eae9c0e23dc5d0)
+	proto.RegisterFile("google/ads/googleads/v1/enums/bid_modifier_source.proto", fileDescriptor_7d26e3acf5e20574)
 }
 
-var fileDescriptor_bid_modifier_source_e3eae9c0e23dc5d0 = []byte{
+var fileDescriptor_7d26e3acf5e20574 = []byte{
 	// 309 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xf3, 0x30,
 	0x1c, 0xfd, 0xd6, 0xc1, 0xa7, 0x64, 0x82, 0xb5, 0xa0, 0x17, 0xe2, 0x2e, 0xb6, 0x07, 0x48, 0x28,
diff --git a/googleapis/ads/googleads/v1/enums/bidding_source.pb.go b/googleapis/ads/googleads/v1/enums/bidding_source.pb.go
index 53816c9fb6..86ff4092c9 100644
--- a/googleapis/ads/googleads/v1/enums/bidding_source.pb.go
+++ b/googleapis/ads/googleads/v1/enums/bidding_source.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/bidding_source.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates where a bid or target is defined. For example, an ad group
 // criterion may define a cpc bid directly, or it can inherit its cpc bid from
@@ -44,6 +47,7 @@ var BiddingSourceEnum_BiddingSource_name = map[int32]string{
 	6: "AD_GROUP",
 	7: "AD_GROUP_CRITERION",
 }
+
 var BiddingSourceEnum_BiddingSource_value = map[string]int32{
 	"UNSPECIFIED":               0,
 	"UNKNOWN":                   1,
@@ -55,8 +59,9 @@ var BiddingSourceEnum_BiddingSource_value = map[string]int32{
 func (x BiddingSourceEnum_BiddingSource) String() string {
 	return proto.EnumName(BiddingSourceEnum_BiddingSource_name, int32(x))
 }
+
 func (BiddingSourceEnum_BiddingSource) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_source_c61d46f2f54ad011, []int{0, 0}
+	return fileDescriptor_50941e96e9ec31bb, []int{0, 0}
 }
 
 // Container for enum describing possible bidding sources.
@@ -70,16 +75,17 @@ func (m *BiddingSourceEnum) Reset()         { *m = BiddingSourceEnum{} }
 func (m *BiddingSourceEnum) String() string { return proto.CompactTextString(m) }
 func (*BiddingSourceEnum) ProtoMessage()    {}
 func (*BiddingSourceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_source_c61d46f2f54ad011, []int{0}
+	return fileDescriptor_50941e96e9ec31bb, []int{0}
 }
+
 func (m *BiddingSourceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BiddingSourceEnum.Unmarshal(m, b)
 }
 func (m *BiddingSourceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BiddingSourceEnum.Marshal(b, m, deterministic)
 }
-func (dst *BiddingSourceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BiddingSourceEnum.Merge(dst, src)
+func (m *BiddingSourceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BiddingSourceEnum.Merge(m, src)
 }
 func (m *BiddingSourceEnum) XXX_Size() int {
 	return xxx_messageInfo_BiddingSourceEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *BiddingSourceEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BiddingSourceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BiddingSourceEnum)(nil), "google.ads.googleads.v1.enums.BiddingSourceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BiddingSourceEnum_BiddingSource", BiddingSourceEnum_BiddingSource_name, BiddingSourceEnum_BiddingSource_value)
+	proto.RegisterType((*BiddingSourceEnum)(nil), "google.ads.googleads.v1.enums.BiddingSourceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/bidding_source.proto", fileDescriptor_bidding_source_c61d46f2f54ad011)
+	proto.RegisterFile("google/ads/googleads/v1/enums/bidding_source.proto", fileDescriptor_50941e96e9ec31bb)
 }
 
-var fileDescriptor_bidding_source_c61d46f2f54ad011 = []byte{
+var fileDescriptor_50941e96e9ec31bb = []byte{
 	// 336 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x18, 0xfd, 0x75, 0x3f, 0xdc, 0x24, 0x53, 0xac, 0xb9, 0x10, 0x14, 0x77, 0xb1, 0x3d, 0x40, 0x4a,
diff --git a/googleapis/ads/googleads/v1/enums/bidding_strategy_status.pb.go b/googleapis/ads/googleads/v1/enums/bidding_strategy_status.pb.go
index b7ef66292c..3149b601ca 100644
--- a/googleapis/ads/googleads/v1/enums/bidding_strategy_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/bidding_strategy_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/bidding_strategy_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of a BiddingStrategy.
 type BiddingStrategyStatusEnum_BiddingStrategyStatus int32
@@ -41,6 +44,7 @@ var BiddingStrategyStatusEnum_BiddingStrategyStatus_name = map[int32]string{
 	2: "ENABLED",
 	4: "REMOVED",
 }
+
 var BiddingStrategyStatusEnum_BiddingStrategyStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -51,8 +55,9 @@ var BiddingStrategyStatusEnum_BiddingStrategyStatus_value = map[string]int32{
 func (x BiddingStrategyStatusEnum_BiddingStrategyStatus) String() string {
 	return proto.EnumName(BiddingStrategyStatusEnum_BiddingStrategyStatus_name, int32(x))
 }
+
 func (BiddingStrategyStatusEnum_BiddingStrategyStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_status_47be9e1502989548, []int{0, 0}
+	return fileDescriptor_1e6f31065c294d03, []int{0, 0}
 }
 
 // Message describing BiddingStrategy statuses.
@@ -66,16 +71,17 @@ func (m *BiddingStrategyStatusEnum) Reset()         { *m = BiddingStrategyStatus
 func (m *BiddingStrategyStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*BiddingStrategyStatusEnum) ProtoMessage()    {}
 func (*BiddingStrategyStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_status_47be9e1502989548, []int{0}
+	return fileDescriptor_1e6f31065c294d03, []int{0}
 }
+
 func (m *BiddingStrategyStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BiddingStrategyStatusEnum.Unmarshal(m, b)
 }
 func (m *BiddingStrategyStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BiddingStrategyStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *BiddingStrategyStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BiddingStrategyStatusEnum.Merge(dst, src)
+func (m *BiddingStrategyStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BiddingStrategyStatusEnum.Merge(m, src)
 }
 func (m *BiddingStrategyStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_BiddingStrategyStatusEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *BiddingStrategyStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BiddingStrategyStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BiddingStrategyStatusEnum)(nil), "google.ads.googleads.v1.enums.BiddingStrategyStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BiddingStrategyStatusEnum_BiddingStrategyStatus", BiddingStrategyStatusEnum_BiddingStrategyStatus_name, BiddingStrategyStatusEnum_BiddingStrategyStatus_value)
+	proto.RegisterType((*BiddingStrategyStatusEnum)(nil), "google.ads.googleads.v1.enums.BiddingStrategyStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/bidding_strategy_status.proto", fileDescriptor_bidding_strategy_status_47be9e1502989548)
+	proto.RegisterFile("google/ads/googleads/v1/enums/bidding_strategy_status.proto", fileDescriptor_1e6f31065c294d03)
 }
 
-var fileDescriptor_bidding_strategy_status_47be9e1502989548 = []byte{
+var fileDescriptor_1e6f31065c294d03 = []byte{
 	// 307 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4a, 0xc3, 0x30,
 	0x14, 0x75, 0x55, 0x14, 0xb2, 0x07, 0xcb, 0xc0, 0x07, 0x87, 0x7b, 0xd8, 0x3e, 0x20, 0xa1, 0xf8,
diff --git a/googleapis/ads/googleads/v1/enums/bidding_strategy_type.pb.go b/googleapis/ads/googleads/v1/enums/bidding_strategy_type.pb.go
index 95fa2ed9af..91d871d552 100644
--- a/googleapis/ads/googleads/v1/enums/bidding_strategy_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/bidding_strategy_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/bidding_strategy_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible bidding strategy types.
 type BiddingStrategyTypeEnum_BiddingStrategyType int32
@@ -93,6 +96,7 @@ var BiddingStrategyTypeEnum_BiddingStrategyType_name = map[int32]string{
 	8:  "TARGET_ROAS",
 	9:  "TARGET_SPEND",
 }
+
 var BiddingStrategyTypeEnum_BiddingStrategyType_value = map[string]int32{
 	"UNSPECIFIED":               0,
 	"UNKNOWN":                   1,
@@ -115,8 +119,9 @@ var BiddingStrategyTypeEnum_BiddingStrategyType_value = map[string]int32{
 func (x BiddingStrategyTypeEnum_BiddingStrategyType) String() string {
 	return proto.EnumName(BiddingStrategyTypeEnum_BiddingStrategyType_name, int32(x))
 }
+
 func (BiddingStrategyTypeEnum_BiddingStrategyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_type_5a1ecac8ab3d1803, []int{0, 0}
+	return fileDescriptor_f0033534dbb333f5, []int{0, 0}
 }
 
 // Container for enum describing possible bidding strategy types.
@@ -130,16 +135,17 @@ func (m *BiddingStrategyTypeEnum) Reset()         { *m = BiddingStrategyTypeEnum
 func (m *BiddingStrategyTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*BiddingStrategyTypeEnum) ProtoMessage()    {}
 func (*BiddingStrategyTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_type_5a1ecac8ab3d1803, []int{0}
+	return fileDescriptor_f0033534dbb333f5, []int{0}
 }
+
 func (m *BiddingStrategyTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BiddingStrategyTypeEnum.Unmarshal(m, b)
 }
 func (m *BiddingStrategyTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BiddingStrategyTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *BiddingStrategyTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BiddingStrategyTypeEnum.Merge(dst, src)
+func (m *BiddingStrategyTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BiddingStrategyTypeEnum.Merge(m, src)
 }
 func (m *BiddingStrategyTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_BiddingStrategyTypeEnum.Size(m)
@@ -151,15 +157,15 @@ func (m *BiddingStrategyTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BiddingStrategyTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BiddingStrategyTypeEnum)(nil), "google.ads.googleads.v1.enums.BiddingStrategyTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BiddingStrategyTypeEnum_BiddingStrategyType", BiddingStrategyTypeEnum_BiddingStrategyType_name, BiddingStrategyTypeEnum_BiddingStrategyType_value)
+	proto.RegisterType((*BiddingStrategyTypeEnum)(nil), "google.ads.googleads.v1.enums.BiddingStrategyTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/bidding_strategy_type.proto", fileDescriptor_bidding_strategy_type_5a1ecac8ab3d1803)
+	proto.RegisterFile("google/ads/googleads/v1/enums/bidding_strategy_type.proto", fileDescriptor_f0033534dbb333f5)
 }
 
-var fileDescriptor_bidding_strategy_type_5a1ecac8ab3d1803 = []byte{
+var fileDescriptor_f0033534dbb333f5 = []byte{
 	// 455 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xdb, 0x6e, 0xd3, 0x30,
 	0x18, 0xc7, 0x69, 0x06, 0x1b, 0xb8, 0x63, 0x33, 0x06, 0xb4, 0x71, 0xe8, 0xc5, 0xf6, 0x00, 0x8e,
diff --git a/googleapis/ads/googleads/v1/enums/billing_setup_status.pb.go b/googleapis/ads/googleads/v1/enums/billing_setup_status.pb.go
index c696748fe5..7fef9ce2a0 100644
--- a/googleapis/ads/googleads/v1/enums/billing_setup_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/billing_setup_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/billing_setup_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of a BillingSetup.
 type BillingSetupStatusEnum_BillingSetupStatus int32
@@ -47,6 +50,7 @@ var BillingSetupStatusEnum_BillingSetupStatus_name = map[int32]string{
 	4: "APPROVED",
 	5: "CANCELLED",
 }
+
 var BillingSetupStatusEnum_BillingSetupStatus_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -59,8 +63,9 @@ var BillingSetupStatusEnum_BillingSetupStatus_value = map[string]int32{
 func (x BillingSetupStatusEnum_BillingSetupStatus) String() string {
 	return proto.EnumName(BillingSetupStatusEnum_BillingSetupStatus_name, int32(x))
 }
+
 func (BillingSetupStatusEnum_BillingSetupStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_status_98112529998e699e, []int{0, 0}
+	return fileDescriptor_1a153c8a5f7bc531, []int{0, 0}
 }
 
 // Message describing BillingSetup statuses.
@@ -74,16 +79,17 @@ func (m *BillingSetupStatusEnum) Reset()         { *m = BillingSetupStatusEnum{}
 func (m *BillingSetupStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*BillingSetupStatusEnum) ProtoMessage()    {}
 func (*BillingSetupStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_status_98112529998e699e, []int{0}
+	return fileDescriptor_1a153c8a5f7bc531, []int{0}
 }
+
 func (m *BillingSetupStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BillingSetupStatusEnum.Unmarshal(m, b)
 }
 func (m *BillingSetupStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BillingSetupStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *BillingSetupStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BillingSetupStatusEnum.Merge(dst, src)
+func (m *BillingSetupStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BillingSetupStatusEnum.Merge(m, src)
 }
 func (m *BillingSetupStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_BillingSetupStatusEnum.Size(m)
@@ -95,15 +101,15 @@ func (m *BillingSetupStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BillingSetupStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BillingSetupStatusEnum)(nil), "google.ads.googleads.v1.enums.BillingSetupStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BillingSetupStatusEnum_BillingSetupStatus", BillingSetupStatusEnum_BillingSetupStatus_name, BillingSetupStatusEnum_BillingSetupStatus_value)
+	proto.RegisterType((*BillingSetupStatusEnum)(nil), "google.ads.googleads.v1.enums.BillingSetupStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/billing_setup_status.proto", fileDescriptor_billing_setup_status_98112529998e699e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/billing_setup_status.proto", fileDescriptor_1a153c8a5f7bc531)
 }
 
-var fileDescriptor_billing_setup_status_98112529998e699e = []byte{
+var fileDescriptor_1a153c8a5f7bc531 = []byte{
 	// 335 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x18, 0xfd, 0xb5, 0xfb, 0xf9, 0x2f, 0x73, 0x58, 0x73, 0xa1, 0x20, 0xee, 0x62, 0x7b, 0x80, 0x94,
diff --git a/googleapis/ads/googleads/v1/enums/brand_safety_suitability.pb.go b/googleapis/ads/googleads/v1/enums/brand_safety_suitability.pb.go
index 0197fb2fd8..e227799421 100644
--- a/googleapis/ads/googleads/v1/enums/brand_safety_suitability.pb.go
+++ b/googleapis/ads/googleads/v1/enums/brand_safety_suitability.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/brand_safety_suitability.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // 3-Tier brand safety suitability control.
 type BrandSafetySuitabilityEnum_BrandSafetySuitability int32
@@ -62,6 +65,7 @@ var BrandSafetySuitabilityEnum_BrandSafetySuitability_name = map[int32]string{
 	3: "STANDARD_INVENTORY",
 	4: "LIMITED_INVENTORY",
 }
+
 var BrandSafetySuitabilityEnum_BrandSafetySuitability_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"UNKNOWN":            1,
@@ -73,8 +77,9 @@ var BrandSafetySuitabilityEnum_BrandSafetySuitability_value = map[string]int32{
 func (x BrandSafetySuitabilityEnum_BrandSafetySuitability) String() string {
 	return proto.EnumName(BrandSafetySuitabilityEnum_BrandSafetySuitability_name, int32(x))
 }
+
 func (BrandSafetySuitabilityEnum_BrandSafetySuitability) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_brand_safety_suitability_8b6fc888662e6ffb, []int{0, 0}
+	return fileDescriptor_924c6c9918cc5552, []int{0, 0}
 }
 
 // Container for enum with 3-Tier brand safety suitability control.
@@ -88,16 +93,17 @@ func (m *BrandSafetySuitabilityEnum) Reset()         { *m = BrandSafetySuitabili
 func (m *BrandSafetySuitabilityEnum) String() string { return proto.CompactTextString(m) }
 func (*BrandSafetySuitabilityEnum) ProtoMessage()    {}
 func (*BrandSafetySuitabilityEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_brand_safety_suitability_8b6fc888662e6ffb, []int{0}
+	return fileDescriptor_924c6c9918cc5552, []int{0}
 }
+
 func (m *BrandSafetySuitabilityEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BrandSafetySuitabilityEnum.Unmarshal(m, b)
 }
 func (m *BrandSafetySuitabilityEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BrandSafetySuitabilityEnum.Marshal(b, m, deterministic)
 }
-func (dst *BrandSafetySuitabilityEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BrandSafetySuitabilityEnum.Merge(dst, src)
+func (m *BrandSafetySuitabilityEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BrandSafetySuitabilityEnum.Merge(m, src)
 }
 func (m *BrandSafetySuitabilityEnum) XXX_Size() int {
 	return xxx_messageInfo_BrandSafetySuitabilityEnum.Size(m)
@@ -109,15 +115,15 @@ func (m *BrandSafetySuitabilityEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BrandSafetySuitabilityEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BrandSafetySuitabilityEnum)(nil), "google.ads.googleads.v1.enums.BrandSafetySuitabilityEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BrandSafetySuitabilityEnum_BrandSafetySuitability", BrandSafetySuitabilityEnum_BrandSafetySuitability_name, BrandSafetySuitabilityEnum_BrandSafetySuitability_value)
+	proto.RegisterType((*BrandSafetySuitabilityEnum)(nil), "google.ads.googleads.v1.enums.BrandSafetySuitabilityEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/brand_safety_suitability.proto", fileDescriptor_brand_safety_suitability_8b6fc888662e6ffb)
+	proto.RegisterFile("google/ads/googleads/v1/enums/brand_safety_suitability.proto", fileDescriptor_924c6c9918cc5552)
 }
 
-var fileDescriptor_brand_safety_suitability_8b6fc888662e6ffb = []byte{
+var fileDescriptor_924c6c9918cc5552 = []byte{
 	// 339 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x4b, 0xfb, 0x30,
 	0x1c, 0xfe, 0xb7, 0xfb, 0xa3, 0x90, 0x1d, 0x9c, 0x05, 0x77, 0x98, 0xee, 0xb0, 0x7d, 0x80, 0x94,
diff --git a/googleapis/ads/googleads/v1/enums/budget_delivery_method.pb.go b/googleapis/ads/googleads/v1/enums/budget_delivery_method.pb.go
index 9e708b1c3e..fdff902c98 100644
--- a/googleapis/ads/googleads/v1/enums/budget_delivery_method.pb.go
+++ b/googleapis/ads/googleads/v1/enums/budget_delivery_method.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/budget_delivery_method.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible delivery methods of a Budget.
 type BudgetDeliveryMethodEnum_BudgetDeliveryMethod int32
@@ -41,6 +44,7 @@ var BudgetDeliveryMethodEnum_BudgetDeliveryMethod_name = map[int32]string{
 	2: "STANDARD",
 	3: "ACCELERATED",
 }
+
 var BudgetDeliveryMethodEnum_BudgetDeliveryMethod_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -51,8 +55,9 @@ var BudgetDeliveryMethodEnum_BudgetDeliveryMethod_value = map[string]int32{
 func (x BudgetDeliveryMethodEnum_BudgetDeliveryMethod) String() string {
 	return proto.EnumName(BudgetDeliveryMethodEnum_BudgetDeliveryMethod_name, int32(x))
 }
+
 func (BudgetDeliveryMethodEnum_BudgetDeliveryMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_budget_delivery_method_f2a3e0bbe704f256, []int{0, 0}
+	return fileDescriptor_ab3c3b6a21a82551, []int{0, 0}
 }
 
 // Message describing Budget delivery methods. A delivery method determines the
@@ -67,16 +72,17 @@ func (m *BudgetDeliveryMethodEnum) Reset()         { *m = BudgetDeliveryMethodEn
 func (m *BudgetDeliveryMethodEnum) String() string { return proto.CompactTextString(m) }
 func (*BudgetDeliveryMethodEnum) ProtoMessage()    {}
 func (*BudgetDeliveryMethodEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_budget_delivery_method_f2a3e0bbe704f256, []int{0}
+	return fileDescriptor_ab3c3b6a21a82551, []int{0}
 }
+
 func (m *BudgetDeliveryMethodEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BudgetDeliveryMethodEnum.Unmarshal(m, b)
 }
 func (m *BudgetDeliveryMethodEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BudgetDeliveryMethodEnum.Marshal(b, m, deterministic)
 }
-func (dst *BudgetDeliveryMethodEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BudgetDeliveryMethodEnum.Merge(dst, src)
+func (m *BudgetDeliveryMethodEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BudgetDeliveryMethodEnum.Merge(m, src)
 }
 func (m *BudgetDeliveryMethodEnum) XXX_Size() int {
 	return xxx_messageInfo_BudgetDeliveryMethodEnum.Size(m)
@@ -88,15 +94,15 @@ func (m *BudgetDeliveryMethodEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BudgetDeliveryMethodEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BudgetDeliveryMethodEnum)(nil), "google.ads.googleads.v1.enums.BudgetDeliveryMethodEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BudgetDeliveryMethodEnum_BudgetDeliveryMethod", BudgetDeliveryMethodEnum_BudgetDeliveryMethod_name, BudgetDeliveryMethodEnum_BudgetDeliveryMethod_value)
+	proto.RegisterType((*BudgetDeliveryMethodEnum)(nil), "google.ads.googleads.v1.enums.BudgetDeliveryMethodEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/budget_delivery_method.proto", fileDescriptor_budget_delivery_method_f2a3e0bbe704f256)
+	proto.RegisterFile("google/ads/googleads/v1/enums/budget_delivery_method.proto", fileDescriptor_ab3c3b6a21a82551)
 }
 
-var fileDescriptor_budget_delivery_method_f2a3e0bbe704f256 = []byte{
+var fileDescriptor_ab3c3b6a21a82551 = []byte{
 	// 313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xfb, 0x30,
 	0x00, 0xfe, 0xad, 0x83, 0x9f, 0x92, 0x09, 0x96, 0xe2, 0x41, 0xc5, 0x1d, 0xb6, 0x07, 0x48, 0x28,
diff --git a/googleapis/ads/googleads/v1/enums/budget_period.pb.go b/googleapis/ads/googleads/v1/enums/budget_period.pb.go
index e403c48e67..afa116dae7 100644
--- a/googleapis/ads/googleads/v1/enums/budget_period.pb.go
+++ b/googleapis/ads/googleads/v1/enums/budget_period.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/budget_period.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible period of a Budget.
 type BudgetPeriodEnum_BudgetPeriod int32
@@ -42,6 +45,7 @@ var BudgetPeriodEnum_BudgetPeriod_name = map[int32]string{
 	3: "CUSTOM",
 	4: "FIXED_DAILY",
 }
+
 var BudgetPeriodEnum_BudgetPeriod_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var BudgetPeriodEnum_BudgetPeriod_value = map[string]int32{
 func (x BudgetPeriodEnum_BudgetPeriod) String() string {
 	return proto.EnumName(BudgetPeriodEnum_BudgetPeriod_name, int32(x))
 }
+
 func (BudgetPeriodEnum_BudgetPeriod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_budget_period_32db56380851a2e1, []int{0, 0}
+	return fileDescriptor_e71481160c596bdb, []int{0, 0}
 }
 
 // Message describing Budget period.
@@ -68,16 +73,17 @@ func (m *BudgetPeriodEnum) Reset()         { *m = BudgetPeriodEnum{} }
 func (m *BudgetPeriodEnum) String() string { return proto.CompactTextString(m) }
 func (*BudgetPeriodEnum) ProtoMessage()    {}
 func (*BudgetPeriodEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_budget_period_32db56380851a2e1, []int{0}
+	return fileDescriptor_e71481160c596bdb, []int{0}
 }
+
 func (m *BudgetPeriodEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BudgetPeriodEnum.Unmarshal(m, b)
 }
 func (m *BudgetPeriodEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BudgetPeriodEnum.Marshal(b, m, deterministic)
 }
-func (dst *BudgetPeriodEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BudgetPeriodEnum.Merge(dst, src)
+func (m *BudgetPeriodEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BudgetPeriodEnum.Merge(m, src)
 }
 func (m *BudgetPeriodEnum) XXX_Size() int {
 	return xxx_messageInfo_BudgetPeriodEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *BudgetPeriodEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BudgetPeriodEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BudgetPeriodEnum)(nil), "google.ads.googleads.v1.enums.BudgetPeriodEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BudgetPeriodEnum_BudgetPeriod", BudgetPeriodEnum_BudgetPeriod_name, BudgetPeriodEnum_BudgetPeriod_value)
+	proto.RegisterType((*BudgetPeriodEnum)(nil), "google.ads.googleads.v1.enums.BudgetPeriodEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/budget_period.proto", fileDescriptor_budget_period_32db56380851a2e1)
+	proto.RegisterFile("google/ads/googleads/v1/enums/budget_period.proto", fileDescriptor_e71481160c596bdb)
 }
 
-var fileDescriptor_budget_period_32db56380851a2e1 = []byte{
+var fileDescriptor_e71481160c596bdb = []byte{
 	// 307 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x4b, 0xc3, 0x30,
 	0x18, 0x76, 0x9d, 0x4e, 0xcc, 0x04, 0x6b, 0x8f, 0xe2, 0x0e, 0xdb, 0x0f, 0x48, 0x08, 0xde, 0xe2,
diff --git a/googleapis/ads/googleads/v1/enums/budget_status.pb.go b/googleapis/ads/googleads/v1/enums/budget_status.pb.go
index 86214c8237..0c86f6337f 100644
--- a/googleapis/ads/googleads/v1/enums/budget_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/budget_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/budget_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a Budget.
 type BudgetStatusEnum_BudgetStatus int32
@@ -39,6 +42,7 @@ var BudgetStatusEnum_BudgetStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var BudgetStatusEnum_BudgetStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var BudgetStatusEnum_BudgetStatus_value = map[string]int32{
 func (x BudgetStatusEnum_BudgetStatus) String() string {
 	return proto.EnumName(BudgetStatusEnum_BudgetStatus_name, int32(x))
 }
+
 func (BudgetStatusEnum_BudgetStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_budget_status_c0cacb75be9fe794, []int{0, 0}
+	return fileDescriptor_236574c4e98b0294, []int{0, 0}
 }
 
 // Message describing a Budget status
@@ -64,16 +69,17 @@ func (m *BudgetStatusEnum) Reset()         { *m = BudgetStatusEnum{} }
 func (m *BudgetStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*BudgetStatusEnum) ProtoMessage()    {}
 func (*BudgetStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_budget_status_c0cacb75be9fe794, []int{0}
+	return fileDescriptor_236574c4e98b0294, []int{0}
 }
+
 func (m *BudgetStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BudgetStatusEnum.Unmarshal(m, b)
 }
 func (m *BudgetStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BudgetStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *BudgetStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BudgetStatusEnum.Merge(dst, src)
+func (m *BudgetStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BudgetStatusEnum.Merge(m, src)
 }
 func (m *BudgetStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_BudgetStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *BudgetStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BudgetStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BudgetStatusEnum)(nil), "google.ads.googleads.v1.enums.BudgetStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BudgetStatusEnum_BudgetStatus", BudgetStatusEnum_BudgetStatus_name, BudgetStatusEnum_BudgetStatus_value)
+	proto.RegisterType((*BudgetStatusEnum)(nil), "google.ads.googleads.v1.enums.BudgetStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/budget_status.proto", fileDescriptor_budget_status_c0cacb75be9fe794)
+	proto.RegisterFile("google/ads/googleads/v1/enums/budget_status.proto", fileDescriptor_236574c4e98b0294)
 }
 
-var fileDescriptor_budget_status_c0cacb75be9fe794 = []byte{
+var fileDescriptor_236574c4e98b0294 = []byte{
 	// 294 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x1d, 0x28, 0x64, 0x82, 0x75, 0x47, 0x71, 0x87, 0xed, 0x01, 0x12, 0x82, 0xb7, 0x78,
diff --git a/googleapis/ads/googleads/v1/enums/budget_type.pb.go b/googleapis/ads/googleads/v1/enums/budget_type.pb.go
index c003898aac..73c62477d3 100644
--- a/googleapis/ads/googleads/v1/enums/budget_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/budget_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/budget_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible Budget types.
 type BudgetTypeEnum_BudgetType int32
@@ -55,6 +58,7 @@ var BudgetTypeEnum_BudgetType_name = map[int32]string{
 	3: "HOTEL_ADS_COMMISSION",
 	4: "FIXED_CPA",
 }
+
 var BudgetTypeEnum_BudgetType_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -66,8 +70,9 @@ var BudgetTypeEnum_BudgetType_value = map[string]int32{
 func (x BudgetTypeEnum_BudgetType) String() string {
 	return proto.EnumName(BudgetTypeEnum_BudgetType_name, int32(x))
 }
+
 func (BudgetTypeEnum_BudgetType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_budget_type_ef871b5d9330c0c2, []int{0, 0}
+	return fileDescriptor_064eaff51e649410, []int{0, 0}
 }
 
 // Describes Budget types.
@@ -81,16 +86,17 @@ func (m *BudgetTypeEnum) Reset()         { *m = BudgetTypeEnum{} }
 func (m *BudgetTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*BudgetTypeEnum) ProtoMessage()    {}
 func (*BudgetTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_budget_type_ef871b5d9330c0c2, []int{0}
+	return fileDescriptor_064eaff51e649410, []int{0}
 }
+
 func (m *BudgetTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BudgetTypeEnum.Unmarshal(m, b)
 }
 func (m *BudgetTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BudgetTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *BudgetTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BudgetTypeEnum.Merge(dst, src)
+func (m *BudgetTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BudgetTypeEnum.Merge(m, src)
 }
 func (m *BudgetTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_BudgetTypeEnum.Size(m)
@@ -102,15 +108,15 @@ func (m *BudgetTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BudgetTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BudgetTypeEnum)(nil), "google.ads.googleads.v1.enums.BudgetTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.BudgetTypeEnum_BudgetType", BudgetTypeEnum_BudgetType_name, BudgetTypeEnum_BudgetType_value)
+	proto.RegisterType((*BudgetTypeEnum)(nil), "google.ads.googleads.v1.enums.BudgetTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/budget_type.proto", fileDescriptor_budget_type_ef871b5d9330c0c2)
+	proto.RegisterFile("google/ads/googleads/v1/enums/budget_type.proto", fileDescriptor_064eaff51e649410)
 }
 
-var fileDescriptor_budget_type_ef871b5d9330c0c2 = []byte{
+var fileDescriptor_064eaff51e649410 = []byte{
 	// 325 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4e, 0xfa, 0x30,
 	0x1c, 0xfd, 0x33, 0xfe, 0xf1, 0xa3, 0xa8, 0x2c, 0x8b, 0x17, 0xc6, 0xc8, 0x05, 0x3c, 0x40, 0x97,
diff --git a/googleapis/ads/googleads/v1/enums/call_conversion_reporting_state.pb.go b/googleapis/ads/googleads/v1/enums/call_conversion_reporting_state.pb.go
index 53934db0a0..495f540519 100644
--- a/googleapis/ads/googleads/v1/enums/call_conversion_reporting_state.pb.go
+++ b/googleapis/ads/googleads/v1/enums/call_conversion_reporting_state.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/call_conversion_reporting_state.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible data types for a call conversion action state.
 type CallConversionReportingStateEnum_CallConversionReportingState int32
@@ -44,6 +47,7 @@ var CallConversionReportingStateEnum_CallConversionReportingState_name = map[int
 	3: "USE_ACCOUNT_LEVEL_CALL_CONVERSION_ACTION",
 	4: "USE_RESOURCE_LEVEL_CALL_CONVERSION_ACTION",
 }
+
 var CallConversionReportingStateEnum_CallConversionReportingState_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -55,8 +59,9 @@ var CallConversionReportingStateEnum_CallConversionReportingState_value = map[st
 func (x CallConversionReportingStateEnum_CallConversionReportingState) String() string {
 	return proto.EnumName(CallConversionReportingStateEnum_CallConversionReportingState_name, int32(x))
 }
+
 func (CallConversionReportingStateEnum_CallConversionReportingState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_call_conversion_reporting_state_c7c215557a8b7336, []int{0, 0}
+	return fileDescriptor_c5ae3172f92a0785, []int{0, 0}
 }
 
 // Container for enum describing possible data types for call conversion
@@ -71,16 +76,17 @@ func (m *CallConversionReportingStateEnum) Reset()         { *m = CallConversion
 func (m *CallConversionReportingStateEnum) String() string { return proto.CompactTextString(m) }
 func (*CallConversionReportingStateEnum) ProtoMessage()    {}
 func (*CallConversionReportingStateEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_call_conversion_reporting_state_c7c215557a8b7336, []int{0}
+	return fileDescriptor_c5ae3172f92a0785, []int{0}
 }
+
 func (m *CallConversionReportingStateEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallConversionReportingStateEnum.Unmarshal(m, b)
 }
 func (m *CallConversionReportingStateEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallConversionReportingStateEnum.Marshal(b, m, deterministic)
 }
-func (dst *CallConversionReportingStateEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallConversionReportingStateEnum.Merge(dst, src)
+func (m *CallConversionReportingStateEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallConversionReportingStateEnum.Merge(m, src)
 }
 func (m *CallConversionReportingStateEnum) XXX_Size() int {
 	return xxx_messageInfo_CallConversionReportingStateEnum.Size(m)
@@ -92,15 +98,15 @@ func (m *CallConversionReportingStateEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CallConversionReportingStateEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CallConversionReportingStateEnum)(nil), "google.ads.googleads.v1.enums.CallConversionReportingStateEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CallConversionReportingStateEnum_CallConversionReportingState", CallConversionReportingStateEnum_CallConversionReportingState_name, CallConversionReportingStateEnum_CallConversionReportingState_value)
+	proto.RegisterType((*CallConversionReportingStateEnum)(nil), "google.ads.googleads.v1.enums.CallConversionReportingStateEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/call_conversion_reporting_state.proto", fileDescriptor_call_conversion_reporting_state_c7c215557a8b7336)
+	proto.RegisterFile("google/ads/googleads/v1/enums/call_conversion_reporting_state.proto", fileDescriptor_c5ae3172f92a0785)
 }
 
-var fileDescriptor_call_conversion_reporting_state_c7c215557a8b7336 = []byte{
+var fileDescriptor_c5ae3172f92a0785 = []byte{
 	// 365 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x41, 0xeb, 0x9b, 0x30,
 	0x1c, 0x9d, 0x76, 0x6c, 0x23, 0x1d, 0x4c, 0x3c, 0x8e, 0x16, 0xd6, 0x9e, 0x36, 0xd8, 0x22, 0xb2,
diff --git a/googleapis/ads/googleads/v1/enums/call_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/call_placeholder_field.pb.go
index 059d736333..c5e7198197 100644
--- a/googleapis/ads/googleads/v1/enums/call_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/call_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/call_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Call placeholder fields.
 type CallPlaceholderFieldEnum_CallPlaceholderField int32
@@ -55,6 +58,7 @@ var CallPlaceholderFieldEnum_CallPlaceholderField_name = map[int32]string{
 	5: "CONVERSION_TYPE_ID",
 	6: "CONVERSION_REPORTING_STATE",
 }
+
 var CallPlaceholderFieldEnum_CallPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -68,8 +72,9 @@ var CallPlaceholderFieldEnum_CallPlaceholderField_value = map[string]int32{
 func (x CallPlaceholderFieldEnum_CallPlaceholderField) String() string {
 	return proto.EnumName(CallPlaceholderFieldEnum_CallPlaceholderField_name, int32(x))
 }
+
 func (CallPlaceholderFieldEnum_CallPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_call_placeholder_field_406dc30ab4e5d7bc, []int{0, 0}
+	return fileDescriptor_08ddc446f9f82f36, []int{0, 0}
 }
 
 // Values for Call placeholder fields.
@@ -83,16 +88,17 @@ func (m *CallPlaceholderFieldEnum) Reset()         { *m = CallPlaceholderFieldEn
 func (m *CallPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*CallPlaceholderFieldEnum) ProtoMessage()    {}
 func (*CallPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_call_placeholder_field_406dc30ab4e5d7bc, []int{0}
+	return fileDescriptor_08ddc446f9f82f36, []int{0}
 }
+
 func (m *CallPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *CallPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *CallPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallPlaceholderFieldEnum.Merge(dst, src)
+func (m *CallPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *CallPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_CallPlaceholderFieldEnum.Size(m)
@@ -104,15 +110,15 @@ func (m *CallPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CallPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CallPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.CallPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CallPlaceholderFieldEnum_CallPlaceholderField", CallPlaceholderFieldEnum_CallPlaceholderField_name, CallPlaceholderFieldEnum_CallPlaceholderField_value)
+	proto.RegisterType((*CallPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.CallPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/call_placeholder_field.proto", fileDescriptor_call_placeholder_field_406dc30ab4e5d7bc)
+	proto.RegisterFile("google/ads/googleads/v1/enums/call_placeholder_field.proto", fileDescriptor_08ddc446f9f82f36)
 }
 
-var fileDescriptor_call_placeholder_field_406dc30ab4e5d7bc = []byte{
+var fileDescriptor_08ddc446f9f82f36 = []byte{
 	// 377 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x6a, 0xdb, 0x40,
 	0x14, 0xc6, 0x2b, 0xb9, 0x75, 0x61, 0x5c, 0xe8, 0x20, 0x4a, 0x69, 0x4d, 0x5d, 0xb0, 0x0f, 0x30,
diff --git a/googleapis/ads/googleads/v1/enums/callout_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/callout_placeholder_field.pb.go
index dda3bd9f64..bf1f07b62f 100644
--- a/googleapis/ads/googleads/v1/enums/callout_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/callout_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/callout_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Callout placeholder fields.
 type CalloutPlaceholderFieldEnum_CalloutPlaceholderField int32
@@ -36,6 +39,7 @@ var CalloutPlaceholderFieldEnum_CalloutPlaceholderField_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "CALLOUT_TEXT",
 }
+
 var CalloutPlaceholderFieldEnum_CalloutPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -45,8 +49,9 @@ var CalloutPlaceholderFieldEnum_CalloutPlaceholderField_value = map[string]int32
 func (x CalloutPlaceholderFieldEnum_CalloutPlaceholderField) String() string {
 	return proto.EnumName(CalloutPlaceholderFieldEnum_CalloutPlaceholderField_name, int32(x))
 }
+
 func (CalloutPlaceholderFieldEnum_CalloutPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_callout_placeholder_field_16aa589fff00a281, []int{0, 0}
+	return fileDescriptor_fdaaaac7f43f43a2, []int{0, 0}
 }
 
 // Values for Callout placeholder fields.
@@ -60,16 +65,17 @@ func (m *CalloutPlaceholderFieldEnum) Reset()         { *m = CalloutPlaceholderF
 func (m *CalloutPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*CalloutPlaceholderFieldEnum) ProtoMessage()    {}
 func (*CalloutPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_callout_placeholder_field_16aa589fff00a281, []int{0}
+	return fileDescriptor_fdaaaac7f43f43a2, []int{0}
 }
+
 func (m *CalloutPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CalloutPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *CalloutPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CalloutPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *CalloutPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CalloutPlaceholderFieldEnum.Merge(dst, src)
+func (m *CalloutPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CalloutPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *CalloutPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_CalloutPlaceholderFieldEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *CalloutPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CalloutPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CalloutPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.CalloutPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CalloutPlaceholderFieldEnum_CalloutPlaceholderField", CalloutPlaceholderFieldEnum_CalloutPlaceholderField_name, CalloutPlaceholderFieldEnum_CalloutPlaceholderField_value)
+	proto.RegisterType((*CalloutPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.CalloutPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/callout_placeholder_field.proto", fileDescriptor_callout_placeholder_field_16aa589fff00a281)
+	proto.RegisterFile("google/ads/googleads/v1/enums/callout_placeholder_field.proto", fileDescriptor_fdaaaac7f43f43a2)
 }
 
-var fileDescriptor_callout_placeholder_field_16aa589fff00a281 = []byte{
+var fileDescriptor_fdaaaac7f43f43a2 = []byte{
 	// 310 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xfb, 0x30,
 	0x18, 0xc5, 0xff, 0xeb, 0x1f, 0x14, 0x32, 0xc1, 0xd2, 0x1b, 0x41, 0xb7, 0x8b, 0xed, 0x01, 0x12,
diff --git a/googleapis/ads/googleads/v1/enums/campaign_experiment_type.pb.go b/googleapis/ads/googleads/v1/enums/campaign_experiment_type.pb.go
index 2bf98e9143..4af199c1c4 100644
--- a/googleapis/ads/googleads/v1/enums/campaign_experiment_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/campaign_experiment_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/campaign_experiment_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates if this campaign is a normal campaign,
 // a draft campaign, or an experiment campaign.
@@ -48,6 +51,7 @@ var CampaignExperimentTypeEnum_CampaignExperimentType_name = map[int32]string{
 	3: "DRAFT",
 	4: "EXPERIMENT",
 }
+
 var CampaignExperimentTypeEnum_CampaignExperimentType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -59,8 +63,9 @@ var CampaignExperimentTypeEnum_CampaignExperimentType_value = map[string]int32{
 func (x CampaignExperimentTypeEnum_CampaignExperimentType) String() string {
 	return proto.EnumName(CampaignExperimentTypeEnum_CampaignExperimentType_name, int32(x))
 }
+
 func (CampaignExperimentTypeEnum_CampaignExperimentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_experiment_type_1f7d6a53994657ce, []int{0, 0}
+	return fileDescriptor_c588ebee0a4cfc6c, []int{0, 0}
 }
 
 // Container for enum describing campaign experiment type.
@@ -74,16 +79,17 @@ func (m *CampaignExperimentTypeEnum) Reset()         { *m = CampaignExperimentTy
 func (m *CampaignExperimentTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignExperimentTypeEnum) ProtoMessage()    {}
 func (*CampaignExperimentTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_experiment_type_1f7d6a53994657ce, []int{0}
+	return fileDescriptor_c588ebee0a4cfc6c, []int{0}
 }
+
 func (m *CampaignExperimentTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignExperimentTypeEnum.Unmarshal(m, b)
 }
 func (m *CampaignExperimentTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignExperimentTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignExperimentTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignExperimentTypeEnum.Merge(dst, src)
+func (m *CampaignExperimentTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignExperimentTypeEnum.Merge(m, src)
 }
 func (m *CampaignExperimentTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignExperimentTypeEnum.Size(m)
@@ -95,15 +101,15 @@ func (m *CampaignExperimentTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignExperimentTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignExperimentTypeEnum)(nil), "google.ads.googleads.v1.enums.CampaignExperimentTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CampaignExperimentTypeEnum_CampaignExperimentType", CampaignExperimentTypeEnum_CampaignExperimentType_name, CampaignExperimentTypeEnum_CampaignExperimentType_value)
+	proto.RegisterType((*CampaignExperimentTypeEnum)(nil), "google.ads.googleads.v1.enums.CampaignExperimentTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_experiment_type.proto", fileDescriptor_campaign_experiment_type_1f7d6a53994657ce)
+	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_experiment_type.proto", fileDescriptor_c588ebee0a4cfc6c)
 }
 
-var fileDescriptor_campaign_experiment_type_1f7d6a53994657ce = []byte{
+var fileDescriptor_c588ebee0a4cfc6c = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x4b, 0x4e, 0xf3, 0x30,
 	0x1c, 0xc4, 0xbf, 0xa6, 0xfd, 0x78, 0xb8, 0x12, 0x44, 0x59, 0xb0, 0x28, 0x74, 0xd1, 0x1e, 0xc0,
diff --git a/googleapis/ads/googleads/v1/enums/campaign_serving_status.pb.go b/googleapis/ads/googleads/v1/enums/campaign_serving_status.pb.go
index 64e8c95edd..55e89c13d9 100644
--- a/googleapis/ads/googleads/v1/enums/campaign_serving_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/campaign_serving_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/campaign_serving_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible serving statuses of a campaign.
 type CampaignServingStatusEnum_CampaignServingStatus int32
@@ -50,6 +53,7 @@ var CampaignServingStatusEnum_CampaignServingStatus_name = map[int32]string{
 	5: "PENDING",
 	6: "SUSPENDED",
 }
+
 var CampaignServingStatusEnum_CampaignServingStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -63,8 +67,9 @@ var CampaignServingStatusEnum_CampaignServingStatus_value = map[string]int32{
 func (x CampaignServingStatusEnum_CampaignServingStatus) String() string {
 	return proto.EnumName(CampaignServingStatusEnum_CampaignServingStatus_name, int32(x))
 }
+
 func (CampaignServingStatusEnum_CampaignServingStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_serving_status_afe2dc785917db06, []int{0, 0}
+	return fileDescriptor_40e65b6fe8387390, []int{0, 0}
 }
 
 // Message describing Campaign serving statuses.
@@ -78,16 +83,17 @@ func (m *CampaignServingStatusEnum) Reset()         { *m = CampaignServingStatus
 func (m *CampaignServingStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignServingStatusEnum) ProtoMessage()    {}
 func (*CampaignServingStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_serving_status_afe2dc785917db06, []int{0}
+	return fileDescriptor_40e65b6fe8387390, []int{0}
 }
+
 func (m *CampaignServingStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignServingStatusEnum.Unmarshal(m, b)
 }
 func (m *CampaignServingStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignServingStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignServingStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignServingStatusEnum.Merge(dst, src)
+func (m *CampaignServingStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignServingStatusEnum.Merge(m, src)
 }
 func (m *CampaignServingStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignServingStatusEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *CampaignServingStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignServingStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignServingStatusEnum)(nil), "google.ads.googleads.v1.enums.CampaignServingStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CampaignServingStatusEnum_CampaignServingStatus", CampaignServingStatusEnum_CampaignServingStatus_name, CampaignServingStatusEnum_CampaignServingStatus_value)
+	proto.RegisterType((*CampaignServingStatusEnum)(nil), "google.ads.googleads.v1.enums.CampaignServingStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_serving_status.proto", fileDescriptor_campaign_serving_status_afe2dc785917db06)
+	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_serving_status.proto", fileDescriptor_40e65b6fe8387390)
 }
 
-var fileDescriptor_campaign_serving_status_afe2dc785917db06 = []byte{
+var fileDescriptor_40e65b6fe8387390 = []byte{
 	// 332 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x1c, 0xb6, 0xdd, 0x1f, 0x5d, 0x86, 0x58, 0x0a, 0x1e, 0x1c, 0xee, 0xb0, 0x3d, 0x40, 0x4a, 0xf1,
diff --git a/googleapis/ads/googleads/v1/enums/campaign_shared_set_status.pb.go b/googleapis/ads/googleads/v1/enums/campaign_shared_set_status.pb.go
index 7fea40083e..a6aed255ed 100644
--- a/googleapis/ads/googleads/v1/enums/campaign_shared_set_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/campaign_shared_set_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/campaign_shared_set_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the possible campaign shared set statuses.
 type CampaignSharedSetStatusEnum_CampaignSharedSetStatus int32
@@ -39,6 +42,7 @@ var CampaignSharedSetStatusEnum_CampaignSharedSetStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var CampaignSharedSetStatusEnum_CampaignSharedSetStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var CampaignSharedSetStatusEnum_CampaignSharedSetStatus_value = map[string]int32
 func (x CampaignSharedSetStatusEnum_CampaignSharedSetStatus) String() string {
 	return proto.EnumName(CampaignSharedSetStatusEnum_CampaignSharedSetStatus_name, int32(x))
 }
+
 func (CampaignSharedSetStatusEnum_CampaignSharedSetStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_status_88d95ddd26d28aba, []int{0, 0}
+	return fileDescriptor_c9faa9312450fcc9, []int{0, 0}
 }
 
 // Container for enum describing types of campaign shared set statuses.
@@ -64,16 +69,17 @@ func (m *CampaignSharedSetStatusEnum) Reset()         { *m = CampaignSharedSetSt
 func (m *CampaignSharedSetStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignSharedSetStatusEnum) ProtoMessage()    {}
 func (*CampaignSharedSetStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_status_88d95ddd26d28aba, []int{0}
+	return fileDescriptor_c9faa9312450fcc9, []int{0}
 }
+
 func (m *CampaignSharedSetStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignSharedSetStatusEnum.Unmarshal(m, b)
 }
 func (m *CampaignSharedSetStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignSharedSetStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignSharedSetStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignSharedSetStatusEnum.Merge(dst, src)
+func (m *CampaignSharedSetStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignSharedSetStatusEnum.Merge(m, src)
 }
 func (m *CampaignSharedSetStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignSharedSetStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *CampaignSharedSetStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignSharedSetStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignSharedSetStatusEnum)(nil), "google.ads.googleads.v1.enums.CampaignSharedSetStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CampaignSharedSetStatusEnum_CampaignSharedSetStatus", CampaignSharedSetStatusEnum_CampaignSharedSetStatus_name, CampaignSharedSetStatusEnum_CampaignSharedSetStatus_value)
+	proto.RegisterType((*CampaignSharedSetStatusEnum)(nil), "google.ads.googleads.v1.enums.CampaignSharedSetStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_shared_set_status.proto", fileDescriptor_campaign_shared_set_status_88d95ddd26d28aba)
+	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_shared_set_status.proto", fileDescriptor_c9faa9312450fcc9)
 }
 
-var fileDescriptor_campaign_shared_set_status_88d95ddd26d28aba = []byte{
+var fileDescriptor_c9faa9312450fcc9 = []byte{
 	// 313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4a, 0xf3, 0x30,
 	0x18, 0xfd, 0xd7, 0xc1, 0x2f, 0x74, 0x17, 0x96, 0xdd, 0x08, 0xba, 0x5d, 0x6c, 0x0f, 0x90, 0x50,
diff --git a/googleapis/ads/googleads/v1/enums/campaign_status.pb.go b/googleapis/ads/googleads/v1/enums/campaign_status.pb.go
index 816da9e5fb..5da37fc527 100644
--- a/googleapis/ads/googleads/v1/enums/campaign_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/campaign_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/campaign_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a campaign.
 type CampaignStatusEnum_CampaignStatus int32
@@ -42,6 +45,7 @@ var CampaignStatusEnum_CampaignStatus_name = map[int32]string{
 	3: "PAUSED",
 	4: "REMOVED",
 }
+
 var CampaignStatusEnum_CampaignStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var CampaignStatusEnum_CampaignStatus_value = map[string]int32{
 func (x CampaignStatusEnum_CampaignStatus) String() string {
 	return proto.EnumName(CampaignStatusEnum_CampaignStatus_name, int32(x))
 }
+
 func (CampaignStatusEnum_CampaignStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_status_fffe5ae9c510246e, []int{0, 0}
+	return fileDescriptor_6d9d0ca16fb2fd74, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of a campaign.
@@ -68,16 +73,17 @@ func (m *CampaignStatusEnum) Reset()         { *m = CampaignStatusEnum{} }
 func (m *CampaignStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignStatusEnum) ProtoMessage()    {}
 func (*CampaignStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_status_fffe5ae9c510246e, []int{0}
+	return fileDescriptor_6d9d0ca16fb2fd74, []int{0}
 }
+
 func (m *CampaignStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignStatusEnum.Unmarshal(m, b)
 }
 func (m *CampaignStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignStatusEnum.Merge(dst, src)
+func (m *CampaignStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignStatusEnum.Merge(m, src)
 }
 func (m *CampaignStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignStatusEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *CampaignStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignStatusEnum)(nil), "google.ads.googleads.v1.enums.CampaignStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CampaignStatusEnum_CampaignStatus", CampaignStatusEnum_CampaignStatus_name, CampaignStatusEnum_CampaignStatus_value)
+	proto.RegisterType((*CampaignStatusEnum)(nil), "google.ads.googleads.v1.enums.CampaignStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_status.proto", fileDescriptor_campaign_status_fffe5ae9c510246e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/campaign_status.proto", fileDescriptor_6d9d0ca16fb2fd74)
 }
 
-var fileDescriptor_campaign_status_fffe5ae9c510246e = []byte{
+var fileDescriptor_6d9d0ca16fb2fd74 = []byte{
 	// 305 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4a, 0xc3, 0x30,
 	0x14, 0x76, 0x9d, 0x4c, 0xc8, 0x40, 0x4b, 0xbd, 0x13, 0x77, 0xb1, 0x3d, 0x40, 0x42, 0xd9, 0x5d,
diff --git a/googleapis/ads/googleads/v1/enums/change_status_operation.pb.go b/googleapis/ads/googleads/v1/enums/change_status_operation.pb.go
index b54fcc3acf..9879982ddf 100644
--- a/googleapis/ads/googleads/v1/enums/change_status_operation.pb.go
+++ b/googleapis/ads/googleads/v1/enums/change_status_operation.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/change_status_operation.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Status of the changed resource
 type ChangeStatusOperationEnum_ChangeStatusOperation int32
@@ -43,6 +46,7 @@ var ChangeStatusOperationEnum_ChangeStatusOperation_name = map[int32]string{
 	3: "CHANGED",
 	4: "REMOVED",
 }
+
 var ChangeStatusOperationEnum_ChangeStatusOperation_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -54,8 +58,9 @@ var ChangeStatusOperationEnum_ChangeStatusOperation_value = map[string]int32{
 func (x ChangeStatusOperationEnum_ChangeStatusOperation) String() string {
 	return proto.EnumName(ChangeStatusOperationEnum_ChangeStatusOperation_name, int32(x))
 }
+
 func (ChangeStatusOperationEnum_ChangeStatusOperation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_operation_4fcc3a6e9d69541d, []int{0, 0}
+	return fileDescriptor_0de4a81b3f7260b4, []int{0, 0}
 }
 
 // Container for enum describing operations for the ChangeStatus resource.
@@ -69,16 +74,17 @@ func (m *ChangeStatusOperationEnum) Reset()         { *m = ChangeStatusOperation
 func (m *ChangeStatusOperationEnum) String() string { return proto.CompactTextString(m) }
 func (*ChangeStatusOperationEnum) ProtoMessage()    {}
 func (*ChangeStatusOperationEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_operation_4fcc3a6e9d69541d, []int{0}
+	return fileDescriptor_0de4a81b3f7260b4, []int{0}
 }
+
 func (m *ChangeStatusOperationEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChangeStatusOperationEnum.Unmarshal(m, b)
 }
 func (m *ChangeStatusOperationEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChangeStatusOperationEnum.Marshal(b, m, deterministic)
 }
-func (dst *ChangeStatusOperationEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChangeStatusOperationEnum.Merge(dst, src)
+func (m *ChangeStatusOperationEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeStatusOperationEnum.Merge(m, src)
 }
 func (m *ChangeStatusOperationEnum) XXX_Size() int {
 	return xxx_messageInfo_ChangeStatusOperationEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *ChangeStatusOperationEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ChangeStatusOperationEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ChangeStatusOperationEnum)(nil), "google.ads.googleads.v1.enums.ChangeStatusOperationEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ChangeStatusOperationEnum_ChangeStatusOperation", ChangeStatusOperationEnum_ChangeStatusOperation_name, ChangeStatusOperationEnum_ChangeStatusOperation_value)
+	proto.RegisterType((*ChangeStatusOperationEnum)(nil), "google.ads.googleads.v1.enums.ChangeStatusOperationEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/change_status_operation.proto", fileDescriptor_change_status_operation_4fcc3a6e9d69541d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/change_status_operation.proto", fileDescriptor_0de4a81b3f7260b4)
 }
 
-var fileDescriptor_change_status_operation_4fcc3a6e9d69541d = []byte{
+var fileDescriptor_0de4a81b3f7260b4 = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4f, 0xfa, 0x30,
 	0x18, 0xc6, 0xff, 0x8c, 0xbf, 0x1a, 0xcb, 0xc1, 0x65, 0x89, 0x07, 0x89, 0x1c, 0xe0, 0x03, 0xb4,
diff --git a/googleapis/ads/googleads/v1/enums/change_status_resource_type.pb.go b/googleapis/ads/googleads/v1/enums/change_status_resource_type.pb.go
index 77a84f97dc..77372533e8 100644
--- a/googleapis/ads/googleads/v1/enums/change_status_resource_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/change_status_resource_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/change_status_resource_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the resource types support by the ChangeStatus resource.
 type ChangeStatusResourceTypeEnum_ChangeStatusResourceType int32
@@ -64,6 +67,7 @@ var ChangeStatusResourceTypeEnum_ChangeStatusResourceType_name = map[int32]strin
 	12: "CAMPAIGN_FEED",
 	13: "AD_GROUP_BID_MODIFIER",
 }
+
 var ChangeStatusResourceTypeEnum_ChangeStatusResourceType_value = map[string]int32{
 	"UNSPECIFIED":           0,
 	"UNKNOWN":               1,
@@ -82,8 +86,9 @@ var ChangeStatusResourceTypeEnum_ChangeStatusResourceType_value = map[string]int
 func (x ChangeStatusResourceTypeEnum_ChangeStatusResourceType) String() string {
 	return proto.EnumName(ChangeStatusResourceTypeEnum_ChangeStatusResourceType_name, int32(x))
 }
+
 func (ChangeStatusResourceTypeEnum_ChangeStatusResourceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_resource_type_6cf9a467f229f19c, []int{0, 0}
+	return fileDescriptor_62c3997623423e9b, []int{0, 0}
 }
 
 // Container for enum describing supported resource types for the ChangeStatus
@@ -98,16 +103,17 @@ func (m *ChangeStatusResourceTypeEnum) Reset()         { *m = ChangeStatusResour
 func (m *ChangeStatusResourceTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ChangeStatusResourceTypeEnum) ProtoMessage()    {}
 func (*ChangeStatusResourceTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_resource_type_6cf9a467f229f19c, []int{0}
+	return fileDescriptor_62c3997623423e9b, []int{0}
 }
+
 func (m *ChangeStatusResourceTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChangeStatusResourceTypeEnum.Unmarshal(m, b)
 }
 func (m *ChangeStatusResourceTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChangeStatusResourceTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ChangeStatusResourceTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChangeStatusResourceTypeEnum.Merge(dst, src)
+func (m *ChangeStatusResourceTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeStatusResourceTypeEnum.Merge(m, src)
 }
 func (m *ChangeStatusResourceTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ChangeStatusResourceTypeEnum.Size(m)
@@ -119,15 +125,15 @@ func (m *ChangeStatusResourceTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ChangeStatusResourceTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ChangeStatusResourceTypeEnum)(nil), "google.ads.googleads.v1.enums.ChangeStatusResourceTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ChangeStatusResourceTypeEnum_ChangeStatusResourceType", ChangeStatusResourceTypeEnum_ChangeStatusResourceType_name, ChangeStatusResourceTypeEnum_ChangeStatusResourceType_value)
+	proto.RegisterType((*ChangeStatusResourceTypeEnum)(nil), "google.ads.googleads.v1.enums.ChangeStatusResourceTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/change_status_resource_type.proto", fileDescriptor_change_status_resource_type_6cf9a467f229f19c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/change_status_resource_type.proto", fileDescriptor_62c3997623423e9b)
 }
 
-var fileDescriptor_change_status_resource_type_6cf9a467f229f19c = []byte{
+var fileDescriptor_62c3997623423e9b = []byte{
 	// 407 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcd, 0x8a, 0xdb, 0x30,
 	0x10, 0xc7, 0x6b, 0xef, 0x76, 0x3f, 0x94, 0x0d, 0x55, 0x05, 0x2d, 0x6d, 0xd9, 0x1c, 0x76, 0x1f,
diff --git a/googleapis/ads/googleads/v1/enums/click_type.pb.go b/googleapis/ads/googleads/v1/enums/click_type.pb.go
index 22b444a949..c1022d4671 100644
--- a/googleapis/ads/googleads/v1/enums/click_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/click_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/click_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates Google Ads click types.
 type ClickTypeEnum_ClickType int32
@@ -189,6 +192,7 @@ var ClickTypeEnum_ClickType_name = map[int32]string{
 	54: "PRICE_EXTENSION",
 	55: "HOTEL_BOOK_ON_GOOGLE_ROOM_SELECTION",
 }
+
 var ClickTypeEnum_ClickType_value = map[string]int32{
 	"UNSPECIFIED":                            0,
 	"UNKNOWN":                                1,
@@ -249,8 +253,9 @@ var ClickTypeEnum_ClickType_value = map[string]int32{
 func (x ClickTypeEnum_ClickType) String() string {
 	return proto.EnumName(ClickTypeEnum_ClickType_name, int32(x))
 }
+
 func (ClickTypeEnum_ClickType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_click_type_094021787dbc0905, []int{0, 0}
+	return fileDescriptor_e96f35ef78cd8577, []int{0, 0}
 }
 
 // Container for enumeration of Google Ads click types.
@@ -264,16 +269,17 @@ func (m *ClickTypeEnum) Reset()         { *m = ClickTypeEnum{} }
 func (m *ClickTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ClickTypeEnum) ProtoMessage()    {}
 func (*ClickTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_click_type_094021787dbc0905, []int{0}
+	return fileDescriptor_e96f35ef78cd8577, []int{0}
 }
+
 func (m *ClickTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClickTypeEnum.Unmarshal(m, b)
 }
 func (m *ClickTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClickTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ClickTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClickTypeEnum.Merge(dst, src)
+func (m *ClickTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClickTypeEnum.Merge(m, src)
 }
 func (m *ClickTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ClickTypeEnum.Size(m)
@@ -285,15 +291,15 @@ func (m *ClickTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ClickTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ClickTypeEnum)(nil), "google.ads.googleads.v1.enums.ClickTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ClickTypeEnum_ClickType", ClickTypeEnum_ClickType_name, ClickTypeEnum_ClickType_value)
+	proto.RegisterType((*ClickTypeEnum)(nil), "google.ads.googleads.v1.enums.ClickTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/click_type.proto", fileDescriptor_click_type_094021787dbc0905)
+	proto.RegisterFile("google/ads/googleads/v1/enums/click_type.proto", fileDescriptor_e96f35ef78cd8577)
 }
 
-var fileDescriptor_click_type_094021787dbc0905 = []byte{
+var fileDescriptor_e96f35ef78cd8577 = []byte{
 	// 930 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xdb, 0x6e, 0xdb, 0x36,
 	0x18, 0xc7, 0xd7, 0x74, 0x6d, 0x17, 0xe6, 0xc4, 0x32, 0x69, 0xd2, 0x1c, 0x9c, 0xd4, 0xce, 0x92,
diff --git a/googleapis/ads/googleads/v1/enums/content_label_type.pb.go b/googleapis/ads/googleads/v1/enums/content_label_type.pb.go
index 7d6c2c2535..fe697db3b9 100644
--- a/googleapis/ads/googleads/v1/enums/content_label_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/content_label_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/content_label_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the content label types supported by ContentLabel criterion.
 type ContentLabelTypeEnum_ContentLabelType int32
@@ -78,6 +81,7 @@ var ContentLabelTypeEnum_ContentLabelType_name = map[int32]string{
 	15: "EMBEDDED_VIDEO",
 	16: "LIVE_STREAMING_VIDEO",
 }
+
 var ContentLabelTypeEnum_ContentLabelType_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -101,8 +105,9 @@ var ContentLabelTypeEnum_ContentLabelType_value = map[string]int32{
 func (x ContentLabelTypeEnum_ContentLabelType) String() string {
 	return proto.EnumName(ContentLabelTypeEnum_ContentLabelType_name, int32(x))
 }
+
 func (ContentLabelTypeEnum_ContentLabelType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_content_label_type_fbdc3184d1a69374, []int{0, 0}
+	return fileDescriptor_bcaccae1ff7e8076, []int{0, 0}
 }
 
 // Container for enum describing content label types in ContentLabel.
@@ -116,16 +121,17 @@ func (m *ContentLabelTypeEnum) Reset()         { *m = ContentLabelTypeEnum{} }
 func (m *ContentLabelTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ContentLabelTypeEnum) ProtoMessage()    {}
 func (*ContentLabelTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_content_label_type_fbdc3184d1a69374, []int{0}
+	return fileDescriptor_bcaccae1ff7e8076, []int{0}
 }
+
 func (m *ContentLabelTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContentLabelTypeEnum.Unmarshal(m, b)
 }
 func (m *ContentLabelTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContentLabelTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ContentLabelTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContentLabelTypeEnum.Merge(dst, src)
+func (m *ContentLabelTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentLabelTypeEnum.Merge(m, src)
 }
 func (m *ContentLabelTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ContentLabelTypeEnum.Size(m)
@@ -137,15 +143,15 @@ func (m *ContentLabelTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ContentLabelTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ContentLabelTypeEnum)(nil), "google.ads.googleads.v1.enums.ContentLabelTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ContentLabelTypeEnum_ContentLabelType", ContentLabelTypeEnum_ContentLabelType_name, ContentLabelTypeEnum_ContentLabelType_value)
+	proto.RegisterType((*ContentLabelTypeEnum)(nil), "google.ads.googleads.v1.enums.ContentLabelTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/content_label_type.proto", fileDescriptor_content_label_type_fbdc3184d1a69374)
+	proto.RegisterFile("google/ads/googleads/v1/enums/content_label_type.proto", fileDescriptor_bcaccae1ff7e8076)
 }
 
-var fileDescriptor_content_label_type_fbdc3184d1a69374 = []byte{
+var fileDescriptor_bcaccae1ff7e8076 = []byte{
 	// 475 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x6e, 0x9b, 0x3c,
 	0x18, 0xfe, 0x42, 0xff, 0x12, 0xa7, 0x69, 0x5d, 0x7f, 0xed, 0x36, 0x4d, 0xeb, 0x41, 0x7b, 0x01,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_action_category.pb.go b/googleapis/ads/googleads/v1/enums/conversion_action_category.pb.go
index f7ccf0b614..e96519a6f6 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_action_category.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_action_category.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_action_category.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The category of conversions that are associated with a ConversionAction.
 type ConversionActionCategoryEnum_ConversionActionCategory int32
@@ -51,6 +54,7 @@ var ConversionActionCategoryEnum_ConversionActionCategory_name = map[int32]strin
 	6: "LEAD",
 	7: "DOWNLOAD",
 }
+
 var ConversionActionCategoryEnum_ConversionActionCategory_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -65,8 +69,9 @@ var ConversionActionCategoryEnum_ConversionActionCategory_value = map[string]int
 func (x ConversionActionCategoryEnum_ConversionActionCategory) String() string {
 	return proto.EnumName(ConversionActionCategoryEnum_ConversionActionCategory_name, int32(x))
 }
+
 func (ConversionActionCategoryEnum_ConversionActionCategory) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_category_025dfe4d5b0cb5da, []int{0, 0}
+	return fileDescriptor_23ef90dd965d8778, []int{0, 0}
 }
 
 // Container for enum describing the category of conversions that are associated
@@ -81,16 +86,17 @@ func (m *ConversionActionCategoryEnum) Reset()         { *m = ConversionActionCa
 func (m *ConversionActionCategoryEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionActionCategoryEnum) ProtoMessage()    {}
 func (*ConversionActionCategoryEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_category_025dfe4d5b0cb5da, []int{0}
+	return fileDescriptor_23ef90dd965d8778, []int{0}
 }
+
 func (m *ConversionActionCategoryEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionActionCategoryEnum.Unmarshal(m, b)
 }
 func (m *ConversionActionCategoryEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionActionCategoryEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionActionCategoryEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionActionCategoryEnum.Merge(dst, src)
+func (m *ConversionActionCategoryEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionActionCategoryEnum.Merge(m, src)
 }
 func (m *ConversionActionCategoryEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionActionCategoryEnum.Size(m)
@@ -102,15 +108,15 @@ func (m *ConversionActionCategoryEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionActionCategoryEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionActionCategoryEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionCategoryEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionActionCategoryEnum_ConversionActionCategory", ConversionActionCategoryEnum_ConversionActionCategory_name, ConversionActionCategoryEnum_ConversionActionCategory_value)
+	proto.RegisterType((*ConversionActionCategoryEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionCategoryEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_category.proto", fileDescriptor_conversion_action_category_025dfe4d5b0cb5da)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_category.proto", fileDescriptor_23ef90dd965d8778)
 }
 
-var fileDescriptor_conversion_action_category_025dfe4d5b0cb5da = []byte{
+var fileDescriptor_23ef90dd965d8778 = []byte{
 	// 360 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0x6a, 0xea, 0x40,
 	0x14, 0x7d, 0x89, 0x3e, 0xf5, 0x8d, 0xef, 0xf1, 0x86, 0xac, 0x4a, 0xd1, 0x85, 0x7e, 0xc0, 0x84,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_action_counting_type.pb.go b/googleapis/ads/googleads/v1/enums/conversion_action_counting_type.pb.go
index 5304a47202..bdbb3d1fae 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_action_counting_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_action_counting_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_action_counting_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates how conversions for this action will be counted. For more
 // information, see https://support.google.com/google-ads/answer/3438531.
@@ -40,6 +43,7 @@ var ConversionActionCountingTypeEnum_ConversionActionCountingType_name = map[int
 	2: "ONE_PER_CLICK",
 	3: "MANY_PER_CLICK",
 }
+
 var ConversionActionCountingTypeEnum_ConversionActionCountingType_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -50,8 +54,9 @@ var ConversionActionCountingTypeEnum_ConversionActionCountingType_value = map[st
 func (x ConversionActionCountingTypeEnum_ConversionActionCountingType) String() string {
 	return proto.EnumName(ConversionActionCountingTypeEnum_ConversionActionCountingType_name, int32(x))
 }
+
 func (ConversionActionCountingTypeEnum_ConversionActionCountingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_counting_type_8318613c00d341f1, []int{0, 0}
+	return fileDescriptor_550c507bc08e87d7, []int{0, 0}
 }
 
 // Container for enum describing the conversion deduplication mode for
@@ -66,16 +71,17 @@ func (m *ConversionActionCountingTypeEnum) Reset()         { *m = ConversionActi
 func (m *ConversionActionCountingTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionActionCountingTypeEnum) ProtoMessage()    {}
 func (*ConversionActionCountingTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_counting_type_8318613c00d341f1, []int{0}
+	return fileDescriptor_550c507bc08e87d7, []int{0}
 }
+
 func (m *ConversionActionCountingTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionActionCountingTypeEnum.Unmarshal(m, b)
 }
 func (m *ConversionActionCountingTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionActionCountingTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionActionCountingTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionActionCountingTypeEnum.Merge(dst, src)
+func (m *ConversionActionCountingTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionActionCountingTypeEnum.Merge(m, src)
 }
 func (m *ConversionActionCountingTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionActionCountingTypeEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *ConversionActionCountingTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionActionCountingTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionActionCountingTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionCountingTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionActionCountingTypeEnum_ConversionActionCountingType", ConversionActionCountingTypeEnum_ConversionActionCountingType_name, ConversionActionCountingTypeEnum_ConversionActionCountingType_value)
+	proto.RegisterType((*ConversionActionCountingTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionCountingTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_counting_type.proto", fileDescriptor_conversion_action_counting_type_8318613c00d341f1)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_counting_type.proto", fileDescriptor_550c507bc08e87d7)
 }
 
-var fileDescriptor_conversion_action_counting_type_8318613c00d341f1 = []byte{
+var fileDescriptor_550c507bc08e87d7 = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xf3, 0x30,
 	0x1c, 0xfd, 0xda, 0xc1, 0x27, 0x64, 0xa8, 0xb3, 0x97, 0xb2, 0x81, 0xdb, 0x03, 0xa4, 0x14, 0xef,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_action_status.pb.go b/googleapis/ads/googleads/v1/enums/conversion_action_status.pb.go
index 7872440edd..af0098eeab 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_action_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_action_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_action_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a conversion action.
 type ConversionActionStatusEnum_ConversionActionStatus int32
@@ -43,6 +46,7 @@ var ConversionActionStatusEnum_ConversionActionStatus_name = map[int32]string{
 	3: "REMOVED",
 	4: "HIDDEN",
 }
+
 var ConversionActionStatusEnum_ConversionActionStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -54,8 +58,9 @@ var ConversionActionStatusEnum_ConversionActionStatus_value = map[string]int32{
 func (x ConversionActionStatusEnum_ConversionActionStatus) String() string {
 	return proto.EnumName(ConversionActionStatusEnum_ConversionActionStatus_name, int32(x))
 }
+
 func (ConversionActionStatusEnum_ConversionActionStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_status_9c04a392c42bd2a7, []int{0, 0}
+	return fileDescriptor_5e3dce9bda957bc7, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of a conversion action.
@@ -69,16 +74,17 @@ func (m *ConversionActionStatusEnum) Reset()         { *m = ConversionActionStat
 func (m *ConversionActionStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionActionStatusEnum) ProtoMessage()    {}
 func (*ConversionActionStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_status_9c04a392c42bd2a7, []int{0}
+	return fileDescriptor_5e3dce9bda957bc7, []int{0}
 }
+
 func (m *ConversionActionStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionActionStatusEnum.Unmarshal(m, b)
 }
 func (m *ConversionActionStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionActionStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionActionStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionActionStatusEnum.Merge(dst, src)
+func (m *ConversionActionStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionActionStatusEnum.Merge(m, src)
 }
 func (m *ConversionActionStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionActionStatusEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *ConversionActionStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionActionStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionActionStatusEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionActionStatusEnum_ConversionActionStatus", ConversionActionStatusEnum_ConversionActionStatus_name, ConversionActionStatusEnum_ConversionActionStatus_value)
+	proto.RegisterType((*ConversionActionStatusEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_status.proto", fileDescriptor_conversion_action_status_9c04a392c42bd2a7)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_status.proto", fileDescriptor_5e3dce9bda957bc7)
 }
 
-var fileDescriptor_conversion_action_status_9c04a392c42bd2a7 = []byte{
+var fileDescriptor_5e3dce9bda957bc7 = []byte{
 	// 316 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xb1, 0x4e, 0xf3, 0x30,
 	0x18, 0xfc, 0x9b, 0xfe, 0x2a, 0x92, 0x3b, 0x10, 0x65, 0x60, 0x28, 0x74, 0x68, 0x1f, 0xc0, 0x56,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_action_type.pb.go b/googleapis/ads/googleads/v1/enums/conversion_action_type.pb.go
index 2af8b5ac31..8b7559de4f 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_action_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_action_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_action_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible types of a conversion action.
 type ConversionActionTypeEnum_ConversionActionType int32
@@ -62,6 +65,7 @@ var ConversionActionTypeEnum_ConversionActionType_name = map[int32]string{
 	8: "WEBPAGE",
 	9: "WEBSITE_CALL",
 }
+
 var ConversionActionTypeEnum_ConversionActionType_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -78,8 +82,9 @@ var ConversionActionTypeEnum_ConversionActionType_value = map[string]int32{
 func (x ConversionActionTypeEnum_ConversionActionType) String() string {
 	return proto.EnumName(ConversionActionTypeEnum_ConversionActionType_name, int32(x))
 }
+
 func (ConversionActionTypeEnum_ConversionActionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_type_ef6e965e011b0243, []int{0, 0}
+	return fileDescriptor_bfa8e6b62b604bcb, []int{0, 0}
 }
 
 // Container for enum describing possible types of a conversion action.
@@ -93,16 +98,17 @@ func (m *ConversionActionTypeEnum) Reset()         { *m = ConversionActionTypeEn
 func (m *ConversionActionTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionActionTypeEnum) ProtoMessage()    {}
 func (*ConversionActionTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_type_ef6e965e011b0243, []int{0}
+	return fileDescriptor_bfa8e6b62b604bcb, []int{0}
 }
+
 func (m *ConversionActionTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionActionTypeEnum.Unmarshal(m, b)
 }
 func (m *ConversionActionTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionActionTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionActionTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionActionTypeEnum.Merge(dst, src)
+func (m *ConversionActionTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionActionTypeEnum.Merge(m, src)
 }
 func (m *ConversionActionTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionActionTypeEnum.Size(m)
@@ -114,15 +120,15 @@ func (m *ConversionActionTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionActionTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionActionTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionActionTypeEnum_ConversionActionType", ConversionActionTypeEnum_ConversionActionType_name, ConversionActionTypeEnum_ConversionActionType_value)
+	proto.RegisterType((*ConversionActionTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionActionTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_type.proto", fileDescriptor_conversion_action_type_ef6e965e011b0243)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_action_type.proto", fileDescriptor_bfa8e6b62b604bcb)
 }
 
-var fileDescriptor_conversion_action_type_ef6e965e011b0243 = []byte{
+var fileDescriptor_bfa8e6b62b604bcb = []byte{
 	// 398 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xdf, 0x8e, 0x94, 0x30,
 	0x14, 0xc6, 0x85, 0xd5, 0x5d, 0xed, 0x6a, 0xac, 0x64, 0x2f, 0xd6, 0x3f, 0x1b, 0xb3, 0xfb, 0x00,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_adjustment_type.pb.go b/googleapis/ads/googleads/v1/enums/conversion_adjustment_type.pb.go
index 9ed635909c..ad55a1a8df 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_adjustment_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_adjustment_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_adjustment_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The different actions advertisers can take to adjust the conversions that
 // they already reported. Retractions negate a conversion. Restatements change
@@ -41,6 +44,7 @@ var ConversionAdjustmentTypeEnum_ConversionAdjustmentType_name = map[int32]strin
 	2: "RETRACTION",
 	3: "RESTATEMENT",
 }
+
 var ConversionAdjustmentTypeEnum_ConversionAdjustmentType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -51,8 +55,9 @@ var ConversionAdjustmentTypeEnum_ConversionAdjustmentType_value = map[string]int
 func (x ConversionAdjustmentTypeEnum_ConversionAdjustmentType) String() string {
 	return proto.EnumName(ConversionAdjustmentTypeEnum_ConversionAdjustmentType_name, int32(x))
 }
+
 func (ConversionAdjustmentTypeEnum_ConversionAdjustmentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_type_aa7254239d7954f6, []int{0, 0}
+	return fileDescriptor_407eae25c297e5ef, []int{0, 0}
 }
 
 // Container for enum describing conversion adjustment types.
@@ -66,16 +71,17 @@ func (m *ConversionAdjustmentTypeEnum) Reset()         { *m = ConversionAdjustme
 func (m *ConversionAdjustmentTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionAdjustmentTypeEnum) ProtoMessage()    {}
 func (*ConversionAdjustmentTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_type_aa7254239d7954f6, []int{0}
+	return fileDescriptor_407eae25c297e5ef, []int{0}
 }
+
 func (m *ConversionAdjustmentTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAdjustmentTypeEnum.Unmarshal(m, b)
 }
 func (m *ConversionAdjustmentTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAdjustmentTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAdjustmentTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAdjustmentTypeEnum.Merge(dst, src)
+func (m *ConversionAdjustmentTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAdjustmentTypeEnum.Merge(m, src)
 }
 func (m *ConversionAdjustmentTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionAdjustmentTypeEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *ConversionAdjustmentTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionAdjustmentTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionAdjustmentTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionAdjustmentTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionAdjustmentTypeEnum_ConversionAdjustmentType", ConversionAdjustmentTypeEnum_ConversionAdjustmentType_name, ConversionAdjustmentTypeEnum_ConversionAdjustmentType_value)
+	proto.RegisterType((*ConversionAdjustmentTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionAdjustmentTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_adjustment_type.proto", fileDescriptor_conversion_adjustment_type_aa7254239d7954f6)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_adjustment_type.proto", fileDescriptor_407eae25c297e5ef)
 }
 
-var fileDescriptor_conversion_adjustment_type_aa7254239d7954f6 = []byte{
+var fileDescriptor_407eae25c297e5ef = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xf3, 0x30,
 	0x1c, 0xfd, 0xd6, 0xc1, 0x27, 0x64, 0xa0, 0xa5, 0x57, 0x22, 0xdb, 0xc5, 0xf6, 0x00, 0x29, 0xc5,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_attribution_event_type.pb.go b/googleapis/ads/googleads/v1/enums/conversion_attribution_event_type.pb.go
index 239f6a3e44..8c6fc56eed 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_attribution_event_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_attribution_event_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_attribution_event_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The event type of conversions that are attributed to.
 type ConversionAttributionEventTypeEnum_ConversionAttributionEventType int32
@@ -39,6 +42,7 @@ var ConversionAttributionEventTypeEnum_ConversionAttributionEventType_name = map
 	2: "IMPRESSION",
 	3: "INTERACTION",
 }
+
 var ConversionAttributionEventTypeEnum_ConversionAttributionEventType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var ConversionAttributionEventTypeEnum_ConversionAttributionEventType_value = ma
 func (x ConversionAttributionEventTypeEnum_ConversionAttributionEventType) String() string {
 	return proto.EnumName(ConversionAttributionEventTypeEnum_ConversionAttributionEventType_name, int32(x))
 }
+
 func (ConversionAttributionEventTypeEnum_ConversionAttributionEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_attribution_event_type_7490467adc98b209, []int{0, 0}
+	return fileDescriptor_3829bdfc2590c063, []int{0, 0}
 }
 
 // Container for enum indicating the event type the conversion is attributed to.
@@ -64,16 +69,17 @@ func (m *ConversionAttributionEventTypeEnum) Reset()         { *m = ConversionAt
 func (m *ConversionAttributionEventTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionAttributionEventTypeEnum) ProtoMessage()    {}
 func (*ConversionAttributionEventTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_attribution_event_type_7490467adc98b209, []int{0}
+	return fileDescriptor_3829bdfc2590c063, []int{0}
 }
+
 func (m *ConversionAttributionEventTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAttributionEventTypeEnum.Unmarshal(m, b)
 }
 func (m *ConversionAttributionEventTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAttributionEventTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAttributionEventTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAttributionEventTypeEnum.Merge(dst, src)
+func (m *ConversionAttributionEventTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAttributionEventTypeEnum.Merge(m, src)
 }
 func (m *ConversionAttributionEventTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionAttributionEventTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *ConversionAttributionEventTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionAttributionEventTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionAttributionEventTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionAttributionEventTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionAttributionEventTypeEnum_ConversionAttributionEventType", ConversionAttributionEventTypeEnum_ConversionAttributionEventType_name, ConversionAttributionEventTypeEnum_ConversionAttributionEventType_value)
+	proto.RegisterType((*ConversionAttributionEventTypeEnum)(nil), "google.ads.googleads.v1.enums.ConversionAttributionEventTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_attribution_event_type.proto", fileDescriptor_conversion_attribution_event_type_7490467adc98b209)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_attribution_event_type.proto", fileDescriptor_3829bdfc2590c063)
 }
 
-var fileDescriptor_conversion_attribution_event_type_7490467adc98b209 = []byte{
+var fileDescriptor_3829bdfc2590c063 = []byte{
 	// 325 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x18, 0xfd, 0xb5, 0x83, 0x9f, 0x90, 0x81, 0x8e, 0x5e, 0x8a, 0x13, 0x36, 0xef, 0x53, 0x8a, 0x77,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_lag_bucket.pb.go b/googleapis/ads/googleads/v1/enums/conversion_lag_bucket.pb.go
index 6a05d542f2..ffb65946fd 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_lag_bucket.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_lag_bucket.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_lag_bucket.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum representing the number of days between impression and conversion.
 type ConversionLagBucketEnum_ConversionLagBucket int32
@@ -107,6 +110,7 @@ var ConversionLagBucketEnum_ConversionLagBucket_name = map[int32]string{
 	19: "FORTY_FIVE_TO_SIXTY_DAYS",
 	20: "SIXTY_TO_NINETY_DAYS",
 }
+
 var ConversionLagBucketEnum_ConversionLagBucket_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -134,8 +138,9 @@ var ConversionLagBucketEnum_ConversionLagBucket_value = map[string]int32{
 func (x ConversionLagBucketEnum_ConversionLagBucket) String() string {
 	return proto.EnumName(ConversionLagBucketEnum_ConversionLagBucket_name, int32(x))
 }
+
 func (ConversionLagBucketEnum_ConversionLagBucket) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_lag_bucket_f7860160ba5d8d24, []int{0, 0}
+	return fileDescriptor_68e3b61d9708a0b6, []int{0, 0}
 }
 
 // Container for enum representing the number of days between impression and
@@ -150,16 +155,17 @@ func (m *ConversionLagBucketEnum) Reset()         { *m = ConversionLagBucketEnum
 func (m *ConversionLagBucketEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionLagBucketEnum) ProtoMessage()    {}
 func (*ConversionLagBucketEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_lag_bucket_f7860160ba5d8d24, []int{0}
+	return fileDescriptor_68e3b61d9708a0b6, []int{0}
 }
+
 func (m *ConversionLagBucketEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionLagBucketEnum.Unmarshal(m, b)
 }
 func (m *ConversionLagBucketEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionLagBucketEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionLagBucketEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionLagBucketEnum.Merge(dst, src)
+func (m *ConversionLagBucketEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionLagBucketEnum.Merge(m, src)
 }
 func (m *ConversionLagBucketEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionLagBucketEnum.Size(m)
@@ -171,15 +177,15 @@ func (m *ConversionLagBucketEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionLagBucketEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionLagBucketEnum)(nil), "google.ads.googleads.v1.enums.ConversionLagBucketEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionLagBucketEnum_ConversionLagBucket", ConversionLagBucketEnum_ConversionLagBucket_name, ConversionLagBucketEnum_ConversionLagBucket_value)
+	proto.RegisterType((*ConversionLagBucketEnum)(nil), "google.ads.googleads.v1.enums.ConversionLagBucketEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_lag_bucket.proto", fileDescriptor_conversion_lag_bucket_f7860160ba5d8d24)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_lag_bucket.proto", fileDescriptor_68e3b61d9708a0b6)
 }
 
-var fileDescriptor_conversion_lag_bucket_f7860160ba5d8d24 = []byte{
+var fileDescriptor_68e3b61d9708a0b6 = []byte{
 	// 512 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xd1, 0x6e, 0xda, 0x30,
 	0x14, 0x86, 0x07, 0x65, 0xed, 0x66, 0xb6, 0x91, 0x1a, 0x3a, 0xe8, 0x5a, 0x34, 0xb5, 0x0f, 0x90,
diff --git a/googleapis/ads/googleads/v1/enums/conversion_or_adjustment_lag_bucket.pb.go b/googleapis/ads/googleads/v1/enums/conversion_or_adjustment_lag_bucket.pb.go
index ac89e6e6ba..c36427f897 100644
--- a/googleapis/ads/googleads/v1/enums/conversion_or_adjustment_lag_bucket.pb.go
+++ b/googleapis/ads/googleads/v1/enums/conversion_or_adjustment_lag_bucket.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/conversion_or_adjustment_lag_bucket.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum representing the number of days between the impression and the
 // conversion or between the impression and adjustments to the conversion.
@@ -196,6 +199,7 @@ var ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket_name = m
 	41: "CONVERSION_UNKNOWN",
 	42: "ADJUSTMENT_UNKNOWN",
 }
+
 var ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket_value = map[string]int32{
 	"UNSPECIFIED":                                          0,
 	"UNKNOWN":                                              1,
@@ -245,8 +249,9 @@ var ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket_value =
 func (x ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket) String() string {
 	return proto.EnumName(ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket_name, int32(x))
 }
+
 func (ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_or_adjustment_lag_bucket_ea9c79e631bbd90c, []int{0, 0}
+	return fileDescriptor_a73fee0cbd0d3fff, []int{0, 0}
 }
 
 // Container for enum representing the number of days between the impression and
@@ -261,16 +266,17 @@ func (m *ConversionOrAdjustmentLagBucketEnum) Reset()         { *m = ConversionO
 func (m *ConversionOrAdjustmentLagBucketEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionOrAdjustmentLagBucketEnum) ProtoMessage()    {}
 func (*ConversionOrAdjustmentLagBucketEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_or_adjustment_lag_bucket_ea9c79e631bbd90c, []int{0}
+	return fileDescriptor_a73fee0cbd0d3fff, []int{0}
 }
+
 func (m *ConversionOrAdjustmentLagBucketEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionOrAdjustmentLagBucketEnum.Unmarshal(m, b)
 }
 func (m *ConversionOrAdjustmentLagBucketEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionOrAdjustmentLagBucketEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionOrAdjustmentLagBucketEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionOrAdjustmentLagBucketEnum.Merge(dst, src)
+func (m *ConversionOrAdjustmentLagBucketEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionOrAdjustmentLagBucketEnum.Merge(m, src)
 }
 func (m *ConversionOrAdjustmentLagBucketEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionOrAdjustmentLagBucketEnum.Size(m)
@@ -282,15 +288,15 @@ func (m *ConversionOrAdjustmentLagBucketEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionOrAdjustmentLagBucketEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionOrAdjustmentLagBucketEnum)(nil), "google.ads.googleads.v1.enums.ConversionOrAdjustmentLagBucketEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket", ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket_name, ConversionOrAdjustmentLagBucketEnum_ConversionOrAdjustmentLagBucket_value)
+	proto.RegisterType((*ConversionOrAdjustmentLagBucketEnum)(nil), "google.ads.googleads.v1.enums.ConversionOrAdjustmentLagBucketEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_or_adjustment_lag_bucket.proto", fileDescriptor_conversion_or_adjustment_lag_bucket_ea9c79e631bbd90c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/conversion_or_adjustment_lag_bucket.proto", fileDescriptor_a73fee0cbd0d3fff)
 }
 
-var fileDescriptor_conversion_or_adjustment_lag_bucket_ea9c79e631bbd90c = []byte{
+var fileDescriptor_a73fee0cbd0d3fff = []byte{
 	// 741 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x95, 0xdf, 0x72, 0xd2, 0x40,
 	0x14, 0xc6, 0x2d, 0xd5, 0x56, 0xb7, 0xd5, 0xe2, 0xaa, 0x55, 0xdb, 0x52, 0xca, 0x1f, 0xdb, 0xda,
diff --git a/googleapis/ads/googleads/v1/enums/criterion_category_channel_availability_mode.pb.go b/googleapis/ads/googleads/v1/enums/criterion_category_channel_availability_mode.pb.go
index fefbee93bc..66bb3a5998 100644
--- a/googleapis/ads/googleads/v1/enums/criterion_category_channel_availability_mode.pb.go
+++ b/googleapis/ads/googleads/v1/enums/criterion_category_channel_availability_mode.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/criterion_category_channel_availability_mode.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing the possible CriterionCategoryChannelAvailabilityMode.
 type CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode int32
@@ -44,6 +47,7 @@ var CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailab
 	3: "CHANNEL_TYPE_AND_ALL_SUBTYPES",
 	4: "CHANNEL_TYPE_AND_SUBSET_SUBTYPES",
 }
+
 var CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode_value = map[string]int32{
 	"UNSPECIFIED":                      0,
 	"UNKNOWN":                          1,
@@ -55,8 +59,9 @@ var CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailab
 func (x CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode) String() string {
 	return proto.EnumName(CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode_name, int32(x))
 }
+
 func (CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_category_channel_availability_mode_54bffde09aaf912b, []int{0, 0}
+	return fileDescriptor_193a0f2dff78de0b, []int{0, 0}
 }
 
 // Describes channel availability mode for a criterion availability - whether
@@ -77,16 +82,17 @@ func (m *CriterionCategoryChannelAvailabilityModeEnum) String() string {
 }
 func (*CriterionCategoryChannelAvailabilityModeEnum) ProtoMessage() {}
 func (*CriterionCategoryChannelAvailabilityModeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_category_channel_availability_mode_54bffde09aaf912b, []int{0}
+	return fileDescriptor_193a0f2dff78de0b, []int{0}
 }
+
 func (m *CriterionCategoryChannelAvailabilityModeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionCategoryChannelAvailabilityModeEnum.Unmarshal(m, b)
 }
 func (m *CriterionCategoryChannelAvailabilityModeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionCategoryChannelAvailabilityModeEnum.Marshal(b, m, deterministic)
 }
-func (dst *CriterionCategoryChannelAvailabilityModeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionCategoryChannelAvailabilityModeEnum.Merge(dst, src)
+func (m *CriterionCategoryChannelAvailabilityModeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionCategoryChannelAvailabilityModeEnum.Merge(m, src)
 }
 func (m *CriterionCategoryChannelAvailabilityModeEnum) XXX_Size() int {
 	return xxx_messageInfo_CriterionCategoryChannelAvailabilityModeEnum.Size(m)
@@ -98,15 +104,15 @@ func (m *CriterionCategoryChannelAvailabilityModeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CriterionCategoryChannelAvailabilityModeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CriterionCategoryChannelAvailabilityModeEnum)(nil), "google.ads.googleads.v1.enums.CriterionCategoryChannelAvailabilityModeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode", CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode_name, CriterionCategoryChannelAvailabilityModeEnum_CriterionCategoryChannelAvailabilityMode_value)
+	proto.RegisterType((*CriterionCategoryChannelAvailabilityModeEnum)(nil), "google.ads.googleads.v1.enums.CriterionCategoryChannelAvailabilityModeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_category_channel_availability_mode.proto", fileDescriptor_criterion_category_channel_availability_mode_54bffde09aaf912b)
+	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_category_channel_availability_mode.proto", fileDescriptor_193a0f2dff78de0b)
 }
 
-var fileDescriptor_criterion_category_channel_availability_mode_54bffde09aaf912b = []byte{
+var fileDescriptor_193a0f2dff78de0b = []byte{
 	// 374 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0x41, 0x6b, 0xdb, 0x30,
 	0x18, 0x9d, 0x9d, 0xb1, 0x81, 0x32, 0x98, 0xf1, 0x71, 0x2c, 0xb0, 0x84, 0x1d, 0x76, 0xd8, 0x64,
diff --git a/googleapis/ads/googleads/v1/enums/criterion_category_locale_availability_mode.pb.go b/googleapis/ads/googleads/v1/enums/criterion_category_locale_availability_mode.pb.go
index b513569759..b2ff337873 100644
--- a/googleapis/ads/googleads/v1/enums/criterion_category_locale_availability_mode.pb.go
+++ b/googleapis/ads/googleads/v1/enums/criterion_category_locale_availability_mode.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/criterion_category_locale_availability_mode.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing the possible CriterionCategoryLocaleAvailabilityMode.
 type CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode int32
@@ -48,6 +51,7 @@ var CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabil
 	4: "LANGUAGE_AND_ALL_COUNTRIES",
 	5: "COUNTRY_AND_LANGUAGE",
 }
+
 var CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -60,8 +64,9 @@ var CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabil
 func (x CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode) String() string {
 	return proto.EnumName(CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode_name, int32(x))
 }
+
 func (CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_category_locale_availability_mode_3573c0447f09f6e1, []int{0, 0}
+	return fileDescriptor_cab68ed8e76c6679, []int{0, 0}
 }
 
 // Describes locale availabilty mode for a criterion availability - whether
@@ -81,16 +86,17 @@ func (m *CriterionCategoryLocaleAvailabilityModeEnum) String() string {
 }
 func (*CriterionCategoryLocaleAvailabilityModeEnum) ProtoMessage() {}
 func (*CriterionCategoryLocaleAvailabilityModeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_category_locale_availability_mode_3573c0447f09f6e1, []int{0}
+	return fileDescriptor_cab68ed8e76c6679, []int{0}
 }
+
 func (m *CriterionCategoryLocaleAvailabilityModeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionCategoryLocaleAvailabilityModeEnum.Unmarshal(m, b)
 }
 func (m *CriterionCategoryLocaleAvailabilityModeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionCategoryLocaleAvailabilityModeEnum.Marshal(b, m, deterministic)
 }
-func (dst *CriterionCategoryLocaleAvailabilityModeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionCategoryLocaleAvailabilityModeEnum.Merge(dst, src)
+func (m *CriterionCategoryLocaleAvailabilityModeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionCategoryLocaleAvailabilityModeEnum.Merge(m, src)
 }
 func (m *CriterionCategoryLocaleAvailabilityModeEnum) XXX_Size() int {
 	return xxx_messageInfo_CriterionCategoryLocaleAvailabilityModeEnum.Size(m)
@@ -102,15 +108,15 @@ func (m *CriterionCategoryLocaleAvailabilityModeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CriterionCategoryLocaleAvailabilityModeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CriterionCategoryLocaleAvailabilityModeEnum)(nil), "google.ads.googleads.v1.enums.CriterionCategoryLocaleAvailabilityModeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode", CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode_name, CriterionCategoryLocaleAvailabilityModeEnum_CriterionCategoryLocaleAvailabilityMode_value)
+	proto.RegisterType((*CriterionCategoryLocaleAvailabilityModeEnum)(nil), "google.ads.googleads.v1.enums.CriterionCategoryLocaleAvailabilityModeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_category_locale_availability_mode.proto", fileDescriptor_criterion_category_locale_availability_mode_3573c0447f09f6e1)
+	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_category_locale_availability_mode.proto", fileDescriptor_cab68ed8e76c6679)
 }
 
-var fileDescriptor_criterion_category_locale_availability_mode_3573c0447f09f6e1 = []byte{
+var fileDescriptor_cab68ed8e76c6679 = []byte{
 	// 381 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0x4f, 0x8b, 0x9b, 0x40,
 	0x1c, 0xad, 0xa6, 0x7f, 0x60, 0x72, 0xa8, 0x48, 0x0f, 0x6d, 0x68, 0x0a, 0xc9, 0xa5, 0x87, 0x96,
diff --git a/googleapis/ads/googleads/v1/enums/criterion_system_serving_status.pb.go b/googleapis/ads/googleads/v1/enums/criterion_system_serving_status.pb.go
index 0d3724ed96..13f5c7245c 100644
--- a/googleapis/ads/googleads/v1/enums/criterion_system_serving_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/criterion_system_serving_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/criterion_system_serving_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates criterion system serving statuses.
 type CriterionSystemServingStatusEnum_CriterionSystemServingStatus int32
@@ -39,6 +42,7 @@ var CriterionSystemServingStatusEnum_CriterionSystemServingStatus_name = map[int
 	2: "ELIGIBLE",
 	3: "RARELY_SERVED",
 }
+
 var CriterionSystemServingStatusEnum_CriterionSystemServingStatus_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -49,8 +53,9 @@ var CriterionSystemServingStatusEnum_CriterionSystemServingStatus_value = map[st
 func (x CriterionSystemServingStatusEnum_CriterionSystemServingStatus) String() string {
 	return proto.EnumName(CriterionSystemServingStatusEnum_CriterionSystemServingStatus_name, int32(x))
 }
+
 func (CriterionSystemServingStatusEnum_CriterionSystemServingStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_system_serving_status_8ef5a705312ec933, []int{0, 0}
+	return fileDescriptor_b78d45305d2292b6, []int{0, 0}
 }
 
 // Container for enum describing possible criterion system serving statuses.
@@ -64,16 +69,17 @@ func (m *CriterionSystemServingStatusEnum) Reset()         { *m = CriterionSyste
 func (m *CriterionSystemServingStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*CriterionSystemServingStatusEnum) ProtoMessage()    {}
 func (*CriterionSystemServingStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_system_serving_status_8ef5a705312ec933, []int{0}
+	return fileDescriptor_b78d45305d2292b6, []int{0}
 }
+
 func (m *CriterionSystemServingStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionSystemServingStatusEnum.Unmarshal(m, b)
 }
 func (m *CriterionSystemServingStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionSystemServingStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *CriterionSystemServingStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionSystemServingStatusEnum.Merge(dst, src)
+func (m *CriterionSystemServingStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionSystemServingStatusEnum.Merge(m, src)
 }
 func (m *CriterionSystemServingStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_CriterionSystemServingStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *CriterionSystemServingStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CriterionSystemServingStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CriterionSystemServingStatusEnum)(nil), "google.ads.googleads.v1.enums.CriterionSystemServingStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CriterionSystemServingStatusEnum_CriterionSystemServingStatus", CriterionSystemServingStatusEnum_CriterionSystemServingStatus_name, CriterionSystemServingStatusEnum_CriterionSystemServingStatus_value)
+	proto.RegisterType((*CriterionSystemServingStatusEnum)(nil), "google.ads.googleads.v1.enums.CriterionSystemServingStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_system_serving_status.proto", fileDescriptor_criterion_system_serving_status_8ef5a705312ec933)
+	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_system_serving_status.proto", fileDescriptor_b78d45305d2292b6)
 }
 
-var fileDescriptor_criterion_system_serving_status_8ef5a705312ec933 = []byte{
+var fileDescriptor_b78d45305d2292b6 = []byte{
 	// 328 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xc1, 0x4a, 0xf3, 0x40,
 	0x18, 0xfc, 0x93, 0xc2, 0xaf, 0x6c, 0x15, 0x63, 0x8e, 0xd2, 0x82, 0xed, 0x03, 0x6c, 0x08, 0xde,
diff --git a/googleapis/ads/googleads/v1/enums/criterion_type.pb.go b/googleapis/ads/googleads/v1/enums/criterion_type.pb.go
index b8b317a080..0c7917d32a 100644
--- a/googleapis/ads/googleads/v1/enums/criterion_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/criterion_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/criterion_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible criterion types.
 type CriterionTypeEnum_CriterionType int32
@@ -123,6 +126,7 @@ var CriterionTypeEnum_CriterionType_name = map[int32]string{
 	30: "CUSTOM_INTENT",
 	31: "LOCATION_GROUP",
 }
+
 var CriterionTypeEnum_CriterionType_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -161,8 +165,9 @@ var CriterionTypeEnum_CriterionType_value = map[string]int32{
 func (x CriterionTypeEnum_CriterionType) String() string {
 	return proto.EnumName(CriterionTypeEnum_CriterionType_name, int32(x))
 }
+
 func (CriterionTypeEnum_CriterionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_type_6c3b4f09ae204a99, []int{0, 0}
+	return fileDescriptor_152391fcc2ce1fa1, []int{0, 0}
 }
 
 // The possible types of a criterion.
@@ -176,16 +181,17 @@ func (m *CriterionTypeEnum) Reset()         { *m = CriterionTypeEnum{} }
 func (m *CriterionTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*CriterionTypeEnum) ProtoMessage()    {}
 func (*CriterionTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_type_6c3b4f09ae204a99, []int{0}
+	return fileDescriptor_152391fcc2ce1fa1, []int{0}
 }
+
 func (m *CriterionTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionTypeEnum.Unmarshal(m, b)
 }
 func (m *CriterionTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *CriterionTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionTypeEnum.Merge(dst, src)
+func (m *CriterionTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionTypeEnum.Merge(m, src)
 }
 func (m *CriterionTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_CriterionTypeEnum.Size(m)
@@ -197,15 +203,15 @@ func (m *CriterionTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CriterionTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CriterionTypeEnum)(nil), "google.ads.googleads.v1.enums.CriterionTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CriterionTypeEnum_CriterionType", CriterionTypeEnum_CriterionType_name, CriterionTypeEnum_CriterionType_value)
+	proto.RegisterType((*CriterionTypeEnum)(nil), "google.ads.googleads.v1.enums.CriterionTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_type.proto", fileDescriptor_criterion_type_6c3b4f09ae204a99)
+	proto.RegisterFile("google/ads/googleads/v1/enums/criterion_type.proto", fileDescriptor_152391fcc2ce1fa1)
 }
 
-var fileDescriptor_criterion_type_6c3b4f09ae204a99 = []byte{
+var fileDescriptor_152391fcc2ce1fa1 = []byte{
 	// 621 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x4e, 0xdb, 0x30,
 	0x14, 0x1e, 0xe5, 0xdf, 0x50, 0x70, 0xcd, 0xf8, 0x19, 0x83, 0x4d, 0xf0, 0x00, 0xa9, 0xba, 0xdd,
diff --git a/googleapis/ads/googleads/v1/enums/custom_interest_member_type.pb.go b/googleapis/ads/googleads/v1/enums/custom_interest_member_type.pb.go
index 957633e99d..abd801725d 100644
--- a/googleapis/ads/googleads/v1/enums/custom_interest_member_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/custom_interest_member_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/custom_interest_member_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing possible custom interest member types.
 type CustomInterestMemberTypeEnum_CustomInterestMemberType int32
@@ -39,6 +42,7 @@ var CustomInterestMemberTypeEnum_CustomInterestMemberType_name = map[int32]strin
 	2: "KEYWORD",
 	3: "URL",
 }
+
 var CustomInterestMemberTypeEnum_CustomInterestMemberType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var CustomInterestMemberTypeEnum_CustomInterestMemberType_value = map[string]int
 func (x CustomInterestMemberTypeEnum_CustomInterestMemberType) String() string {
 	return proto.EnumName(CustomInterestMemberTypeEnum_CustomInterestMemberType_name, int32(x))
 }
+
 func (CustomInterestMemberTypeEnum_CustomInterestMemberType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_member_type_320b7c5ee93d2530, []int{0, 0}
+	return fileDescriptor_55e3da660044a7a0, []int{0, 0}
 }
 
 // The types of custom interest member, either KEYWORD or URL.
@@ -64,16 +69,17 @@ func (m *CustomInterestMemberTypeEnum) Reset()         { *m = CustomInterestMemb
 func (m *CustomInterestMemberTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomInterestMemberTypeEnum) ProtoMessage()    {}
 func (*CustomInterestMemberTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_member_type_320b7c5ee93d2530, []int{0}
+	return fileDescriptor_55e3da660044a7a0, []int{0}
 }
+
 func (m *CustomInterestMemberTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInterestMemberTypeEnum.Unmarshal(m, b)
 }
 func (m *CustomInterestMemberTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInterestMemberTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomInterestMemberTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInterestMemberTypeEnum.Merge(dst, src)
+func (m *CustomInterestMemberTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInterestMemberTypeEnum.Merge(m, src)
 }
 func (m *CustomInterestMemberTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomInterestMemberTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *CustomInterestMemberTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomInterestMemberTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomInterestMemberTypeEnum)(nil), "google.ads.googleads.v1.enums.CustomInterestMemberTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CustomInterestMemberTypeEnum_CustomInterestMemberType", CustomInterestMemberTypeEnum_CustomInterestMemberType_name, CustomInterestMemberTypeEnum_CustomInterestMemberType_value)
+	proto.RegisterType((*CustomInterestMemberTypeEnum)(nil), "google.ads.googleads.v1.enums.CustomInterestMemberTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/custom_interest_member_type.proto", fileDescriptor_custom_interest_member_type_320b7c5ee93d2530)
+	proto.RegisterFile("google/ads/googleads/v1/enums/custom_interest_member_type.proto", fileDescriptor_55e3da660044a7a0)
 }
 
-var fileDescriptor_custom_interest_member_type_320b7c5ee93d2530 = []byte{
+var fileDescriptor_55e3da660044a7a0 = []byte{
 	// 313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x6a, 0xc2, 0x30,
 	0x18, 0x9f, 0x15, 0x26, 0xc4, 0xc3, 0x4a, 0x4f, 0x63, 0xe8, 0x41, 0x1f, 0x20, 0xa1, 0xec, 0x96,
diff --git a/googleapis/ads/googleads/v1/enums/custom_interest_status.pb.go b/googleapis/ads/googleads/v1/enums/custom_interest_status.pb.go
index d248bb0ea9..834fa70be2 100644
--- a/googleapis/ads/googleads/v1/enums/custom_interest_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/custom_interest_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/custom_interest_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing possible custom interest types.
 type CustomInterestStatusEnum_CustomInterestStatus int32
@@ -40,6 +43,7 @@ var CustomInterestStatusEnum_CustomInterestStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var CustomInterestStatusEnum_CustomInterestStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -50,8 +54,9 @@ var CustomInterestStatusEnum_CustomInterestStatus_value = map[string]int32{
 func (x CustomInterestStatusEnum_CustomInterestStatus) String() string {
 	return proto.EnumName(CustomInterestStatusEnum_CustomInterestStatus_name, int32(x))
 }
+
 func (CustomInterestStatusEnum_CustomInterestStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_status_4f118426068e3218, []int{0, 0}
+	return fileDescriptor_d9ed969238f1f29e, []int{0, 0}
 }
 
 // The status of custom interest.
@@ -65,16 +70,17 @@ func (m *CustomInterestStatusEnum) Reset()         { *m = CustomInterestStatusEn
 func (m *CustomInterestStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomInterestStatusEnum) ProtoMessage()    {}
 func (*CustomInterestStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_status_4f118426068e3218, []int{0}
+	return fileDescriptor_d9ed969238f1f29e, []int{0}
 }
+
 func (m *CustomInterestStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInterestStatusEnum.Unmarshal(m, b)
 }
 func (m *CustomInterestStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInterestStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomInterestStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInterestStatusEnum.Merge(dst, src)
+func (m *CustomInterestStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInterestStatusEnum.Merge(m, src)
 }
 func (m *CustomInterestStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomInterestStatusEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *CustomInterestStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomInterestStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomInterestStatusEnum)(nil), "google.ads.googleads.v1.enums.CustomInterestStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CustomInterestStatusEnum_CustomInterestStatus", CustomInterestStatusEnum_CustomInterestStatus_name, CustomInterestStatusEnum_CustomInterestStatus_value)
+	proto.RegisterType((*CustomInterestStatusEnum)(nil), "google.ads.googleads.v1.enums.CustomInterestStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/custom_interest_status.proto", fileDescriptor_custom_interest_status_4f118426068e3218)
+	proto.RegisterFile("google/ads/googleads/v1/enums/custom_interest_status.proto", fileDescriptor_d9ed969238f1f29e)
 }
 
-var fileDescriptor_custom_interest_status_4f118426068e3218 = []byte{
+var fileDescriptor_d9ed969238f1f29e = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xc1, 0x4a, 0x03, 0x31,
 	0x10, 0xb5, 0x5b, 0x50, 0x48, 0x0f, 0x2e, 0xc5, 0x83, 0x8a, 0x3d, 0xb4, 0x1f, 0x90, 0xb0, 0x78,
diff --git a/googleapis/ads/googleads/v1/enums/custom_interest_type.pb.go b/googleapis/ads/googleads/v1/enums/custom_interest_type.pb.go
index 13f762a5fc..a779424e34 100644
--- a/googleapis/ads/googleads/v1/enums/custom_interest_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/custom_interest_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/custom_interest_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing possible custom interest types.
 type CustomInterestTypeEnum_CustomInterestType int32
@@ -39,6 +42,7 @@ var CustomInterestTypeEnum_CustomInterestType_name = map[int32]string{
 	2: "CUSTOM_AFFINITY",
 	3: "CUSTOM_INTENT",
 }
+
 var CustomInterestTypeEnum_CustomInterestType_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -49,8 +53,9 @@ var CustomInterestTypeEnum_CustomInterestType_value = map[string]int32{
 func (x CustomInterestTypeEnum_CustomInterestType) String() string {
 	return proto.EnumName(CustomInterestTypeEnum_CustomInterestType_name, int32(x))
 }
+
 func (CustomInterestTypeEnum_CustomInterestType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_type_50baa3a4060ff668, []int{0, 0}
+	return fileDescriptor_e8450f6e08433cd0, []int{0, 0}
 }
 
 // The types of custom interest.
@@ -64,16 +69,17 @@ func (m *CustomInterestTypeEnum) Reset()         { *m = CustomInterestTypeEnum{}
 func (m *CustomInterestTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomInterestTypeEnum) ProtoMessage()    {}
 func (*CustomInterestTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_type_50baa3a4060ff668, []int{0}
+	return fileDescriptor_e8450f6e08433cd0, []int{0}
 }
+
 func (m *CustomInterestTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInterestTypeEnum.Unmarshal(m, b)
 }
 func (m *CustomInterestTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInterestTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomInterestTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInterestTypeEnum.Merge(dst, src)
+func (m *CustomInterestTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInterestTypeEnum.Merge(m, src)
 }
 func (m *CustomInterestTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomInterestTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *CustomInterestTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomInterestTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomInterestTypeEnum)(nil), "google.ads.googleads.v1.enums.CustomInterestTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CustomInterestTypeEnum_CustomInterestType", CustomInterestTypeEnum_CustomInterestType_name, CustomInterestTypeEnum_CustomInterestType_value)
+	proto.RegisterType((*CustomInterestTypeEnum)(nil), "google.ads.googleads.v1.enums.CustomInterestTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/custom_interest_type.proto", fileDescriptor_custom_interest_type_50baa3a4060ff668)
+	proto.RegisterFile("google/ads/googleads/v1/enums/custom_interest_type.proto", fileDescriptor_e8450f6e08433cd0)
 }
 
-var fileDescriptor_custom_interest_type_50baa3a4060ff668 = []byte{
+var fileDescriptor_e8450f6e08433cd0 = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x6a, 0xf2, 0x30,
 	0x1c, 0xfd, 0xac, 0xf0, 0x0d, 0x22, 0xc3, 0xae, 0x83, 0x0d, 0xc6, 0xbc, 0xd0, 0x07, 0x48, 0x28,
diff --git a/googleapis/ads/googleads/v1/enums/custom_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/custom_placeholder_field.pb.go
index 62bd823ee4..97d65db141 100644
--- a/googleapis/ads/googleads/v1/enums/custom_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/custom_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/custom_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Custom placeholder fields.
 type CustomPlaceholderFieldEnum_CustomPlaceholderField int32
@@ -116,6 +119,7 @@ var CustomPlaceholderFieldEnum_CustomPlaceholderField_name = map[int32]string{
 	20: "IOS_APP_LINK",
 	21: "IOS_APP_STORE_ID",
 }
+
 var CustomPlaceholderFieldEnum_CustomPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -144,8 +148,9 @@ var CustomPlaceholderFieldEnum_CustomPlaceholderField_value = map[string]int32{
 func (x CustomPlaceholderFieldEnum_CustomPlaceholderField) String() string {
 	return proto.EnumName(CustomPlaceholderFieldEnum_CustomPlaceholderField_name, int32(x))
 }
+
 func (CustomPlaceholderFieldEnum_CustomPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_custom_placeholder_field_60b4307cd1510ec1, []int{0, 0}
+	return fileDescriptor_03e8133214061585, []int{0, 0}
 }
 
 // Values for Custom placeholder fields.
@@ -161,16 +166,17 @@ func (m *CustomPlaceholderFieldEnum) Reset()         { *m = CustomPlaceholderFie
 func (m *CustomPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomPlaceholderFieldEnum) ProtoMessage()    {}
 func (*CustomPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_placeholder_field_60b4307cd1510ec1, []int{0}
+	return fileDescriptor_03e8133214061585, []int{0}
 }
+
 func (m *CustomPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *CustomPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomPlaceholderFieldEnum.Merge(dst, src)
+func (m *CustomPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *CustomPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomPlaceholderFieldEnum.Size(m)
@@ -182,15 +188,15 @@ func (m *CustomPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.CustomPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CustomPlaceholderFieldEnum_CustomPlaceholderField", CustomPlaceholderFieldEnum_CustomPlaceholderField_name, CustomPlaceholderFieldEnum_CustomPlaceholderField_value)
+	proto.RegisterType((*CustomPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.CustomPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/custom_placeholder_field.proto", fileDescriptor_custom_placeholder_field_60b4307cd1510ec1)
+	proto.RegisterFile("google/ads/googleads/v1/enums/custom_placeholder_field.proto", fileDescriptor_03e8133214061585)
 }
 
-var fileDescriptor_custom_placeholder_field_60b4307cd1510ec1 = []byte{
+var fileDescriptor_03e8133214061585 = []byte{
 	// 524 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x8e, 0xd2, 0x40,
 	0x18, 0x15, 0x70, 0x41, 0x86, 0x65, 0x19, 0x06, 0x56, 0xcd, 0xea, 0x5e, 0xec, 0x3e, 0x40, 0x1b,
diff --git a/googleapis/ads/googleads/v1/enums/customer_match_upload_key_type.pb.go b/googleapis/ads/googleads/v1/enums/customer_match_upload_key_type.pb.go
index 4af3e297d1..9bb137e80e 100644
--- a/googleapis/ads/googleads/v1/enums/customer_match_upload_key_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/customer_match_upload_key_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/customer_match_upload_key_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible customer match upload key types.
 type CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType int32
@@ -44,6 +47,7 @@ var CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType_name = map[int32]s
 	3: "CRM_ID",
 	4: "MOBILE_ADVERTISING_ID",
 }
+
 var CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType_value = map[string]int32{
 	"UNSPECIFIED":           0,
 	"UNKNOWN":               1,
@@ -55,8 +59,9 @@ var CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType_value = map[string
 func (x CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType) String() string {
 	return proto.EnumName(CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType_name, int32(x))
 }
+
 func (CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_customer_match_upload_key_type_baf8b72a7a5cd145, []int{0, 0}
+	return fileDescriptor_3c71b2f6f6b0492d, []int{0, 0}
 }
 
 // Indicates what type of data are the user list's members matched from.
@@ -70,16 +75,17 @@ func (m *CustomerMatchUploadKeyTypeEnum) Reset()         { *m = CustomerMatchUpl
 func (m *CustomerMatchUploadKeyTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomerMatchUploadKeyTypeEnum) ProtoMessage()    {}
 func (*CustomerMatchUploadKeyTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_match_upload_key_type_baf8b72a7a5cd145, []int{0}
+	return fileDescriptor_3c71b2f6f6b0492d, []int{0}
 }
+
 func (m *CustomerMatchUploadKeyTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerMatchUploadKeyTypeEnum.Unmarshal(m, b)
 }
 func (m *CustomerMatchUploadKeyTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerMatchUploadKeyTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomerMatchUploadKeyTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerMatchUploadKeyTypeEnum.Merge(dst, src)
+func (m *CustomerMatchUploadKeyTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerMatchUploadKeyTypeEnum.Merge(m, src)
 }
 func (m *CustomerMatchUploadKeyTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomerMatchUploadKeyTypeEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *CustomerMatchUploadKeyTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomerMatchUploadKeyTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomerMatchUploadKeyTypeEnum)(nil), "google.ads.googleads.v1.enums.CustomerMatchUploadKeyTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType", CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType_name, CustomerMatchUploadKeyTypeEnum_CustomerMatchUploadKeyType_value)
+	proto.RegisterType((*CustomerMatchUploadKeyTypeEnum)(nil), "google.ads.googleads.v1.enums.CustomerMatchUploadKeyTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/customer_match_upload_key_type.proto", fileDescriptor_customer_match_upload_key_type_baf8b72a7a5cd145)
+	proto.RegisterFile("google/ads/googleads/v1/enums/customer_match_upload_key_type.proto", fileDescriptor_3c71b2f6f6b0492d)
 }
 
-var fileDescriptor_customer_match_upload_key_type_baf8b72a7a5cd145 = []byte{
+var fileDescriptor_3c71b2f6f6b0492d = []byte{
 	// 352 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x41, 0x6a, 0x83, 0x40,
 	0x14, 0xad, 0xa6, 0xa4, 0x30, 0x29, 0x54, 0x84, 0x2e, 0x1a, 0x9a, 0x96, 0xe4, 0x00, 0x23, 0xd2,
diff --git a/googleapis/ads/googleads/v1/enums/customer_pay_per_conversion_eligibility_failure_reason.pb.go b/googleapis/ads/googleads/v1/enums/customer_pay_per_conversion_eligibility_failure_reason.pb.go
index f394fd143c..3f45b72efd 100644
--- a/googleapis/ads/googleads/v1/enums/customer_pay_per_conversion_eligibility_failure_reason.pb.go
+++ b/googleapis/ads/googleads/v1/enums/customer_pay_per_conversion_eligibility_failure_reason.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/customer_pay_per_conversion_eligibility_failure_reason.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible reasons a customer is not eligible to use
 // PaymentMode.CONVERSIONS.
@@ -56,6 +59,7 @@ var CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversio
 	7: "ANALYSIS_NOT_COMPLETE",
 	8: "OTHER",
 }
+
 var CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversionEligibilityFailureReason_value = map[string]int32{
 	"UNSPECIFIED":                     0,
 	"UNKNOWN":                         1,
@@ -71,8 +75,9 @@ var CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversio
 func (x CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversionEligibilityFailureReason) String() string {
 	return proto.EnumName(CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversionEligibilityFailureReason_name, int32(x))
 }
+
 func (CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversionEligibilityFailureReason) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_customer_pay_per_conversion_eligibility_failure_reason_fe69e3f1bce20ba1, []int{0, 0}
+	return fileDescriptor_5cef7e661f31b2d1, []int{0, 0}
 }
 
 // Container for enum describing reasons why a customer is not eligible to use
@@ -91,16 +96,17 @@ func (m *CustomerPayPerConversionEligibilityFailureReasonEnum) String() string {
 }
 func (*CustomerPayPerConversionEligibilityFailureReasonEnum) ProtoMessage() {}
 func (*CustomerPayPerConversionEligibilityFailureReasonEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_pay_per_conversion_eligibility_failure_reason_fe69e3f1bce20ba1, []int{0}
+	return fileDescriptor_5cef7e661f31b2d1, []int{0}
 }
+
 func (m *CustomerPayPerConversionEligibilityFailureReasonEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerPayPerConversionEligibilityFailureReasonEnum.Unmarshal(m, b)
 }
 func (m *CustomerPayPerConversionEligibilityFailureReasonEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerPayPerConversionEligibilityFailureReasonEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomerPayPerConversionEligibilityFailureReasonEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerPayPerConversionEligibilityFailureReasonEnum.Merge(dst, src)
+func (m *CustomerPayPerConversionEligibilityFailureReasonEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerPayPerConversionEligibilityFailureReasonEnum.Merge(m, src)
 }
 func (m *CustomerPayPerConversionEligibilityFailureReasonEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomerPayPerConversionEligibilityFailureReasonEnum.Size(m)
@@ -112,15 +118,15 @@ func (m *CustomerPayPerConversionEligibilityFailureReasonEnum) XXX_DiscardUnknow
 var xxx_messageInfo_CustomerPayPerConversionEligibilityFailureReasonEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomerPayPerConversionEligibilityFailureReasonEnum)(nil), "google.ads.googleads.v1.enums.CustomerPayPerConversionEligibilityFailureReasonEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversionEligibilityFailureReason", CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversionEligibilityFailureReason_name, CustomerPayPerConversionEligibilityFailureReasonEnum_CustomerPayPerConversionEligibilityFailureReason_value)
+	proto.RegisterType((*CustomerPayPerConversionEligibilityFailureReasonEnum)(nil), "google.ads.googleads.v1.enums.CustomerPayPerConversionEligibilityFailureReasonEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/customer_pay_per_conversion_eligibility_failure_reason.proto", fileDescriptor_customer_pay_per_conversion_eligibility_failure_reason_fe69e3f1bce20ba1)
+	proto.RegisterFile("google/ads/googleads/v1/enums/customer_pay_per_conversion_eligibility_failure_reason.proto", fileDescriptor_5cef7e661f31b2d1)
 }
 
-var fileDescriptor_customer_pay_per_conversion_eligibility_failure_reason_fe69e3f1bce20ba1 = []byte{
+var fileDescriptor_5cef7e661f31b2d1 = []byte{
 	// 476 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x6f, 0x94, 0x40,
 	0x18, 0xc6, 0x2d, 0xb5, 0xad, 0x4e, 0x0f, 0x12, 0x12, 0x35, 0xd6, 0x36, 0xda, 0x7a, 0x07, 0x89,
diff --git a/googleapis/ads/googleads/v1/enums/data_driven_model_status.pb.go b/googleapis/ads/googleads/v1/enums/data_driven_model_status.pb.go
index 6b5fc8b58d..8661f66117 100644
--- a/googleapis/ads/googleads/v1/enums/data_driven_model_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/data_driven_model_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/data_driven_model_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates data driven model statuses.
 type DataDrivenModelStatusEnum_DataDrivenModelStatus int32
@@ -51,6 +54,7 @@ var DataDrivenModelStatusEnum_DataDrivenModelStatus_name = map[int32]string{
 	4: "EXPIRED",
 	5: "NEVER_GENERATED",
 }
+
 var DataDrivenModelStatusEnum_DataDrivenModelStatus_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -63,8 +67,9 @@ var DataDrivenModelStatusEnum_DataDrivenModelStatus_value = map[string]int32{
 func (x DataDrivenModelStatusEnum_DataDrivenModelStatus) String() string {
 	return proto.EnumName(DataDrivenModelStatusEnum_DataDrivenModelStatus_name, int32(x))
 }
+
 func (DataDrivenModelStatusEnum_DataDrivenModelStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_driven_model_status_cb3109dff421a3f4, []int{0, 0}
+	return fileDescriptor_448d803015c82ee7, []int{0, 0}
 }
 
 // Container for enum indicating data driven model status.
@@ -78,16 +83,17 @@ func (m *DataDrivenModelStatusEnum) Reset()         { *m = DataDrivenModelStatus
 func (m *DataDrivenModelStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*DataDrivenModelStatusEnum) ProtoMessage()    {}
 func (*DataDrivenModelStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_driven_model_status_cb3109dff421a3f4, []int{0}
+	return fileDescriptor_448d803015c82ee7, []int{0}
 }
+
 func (m *DataDrivenModelStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataDrivenModelStatusEnum.Unmarshal(m, b)
 }
 func (m *DataDrivenModelStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DataDrivenModelStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *DataDrivenModelStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DataDrivenModelStatusEnum.Merge(dst, src)
+func (m *DataDrivenModelStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataDrivenModelStatusEnum.Merge(m, src)
 }
 func (m *DataDrivenModelStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_DataDrivenModelStatusEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *DataDrivenModelStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DataDrivenModelStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DataDrivenModelStatusEnum)(nil), "google.ads.googleads.v1.enums.DataDrivenModelStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.DataDrivenModelStatusEnum_DataDrivenModelStatus", DataDrivenModelStatusEnum_DataDrivenModelStatus_name, DataDrivenModelStatusEnum_DataDrivenModelStatus_value)
+	proto.RegisterType((*DataDrivenModelStatusEnum)(nil), "google.ads.googleads.v1.enums.DataDrivenModelStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/data_driven_model_status.proto", fileDescriptor_data_driven_model_status_cb3109dff421a3f4)
+	proto.RegisterFile("google/ads/googleads/v1/enums/data_driven_model_status.proto", fileDescriptor_448d803015c82ee7)
 }
 
-var fileDescriptor_data_driven_model_status_cb3109dff421a3f4 = []byte{
+var fileDescriptor_448d803015c82ee7 = []byte{
 	// 341 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x1c, 0xb6, 0x9d, 0x53, 0x96, 0x21, 0x2b, 0x15, 0x0f, 0x0e, 0x77, 0xd8, 0x1e, 0x20, 0xa5, 0x78,
diff --git a/googleapis/ads/googleads/v1/enums/day_of_week.pb.go b/googleapis/ads/googleads/v1/enums/day_of_week.pb.go
index 1f42506213..271a198dfd 100644
--- a/googleapis/ads/googleads/v1/enums/day_of_week.pb.go
+++ b/googleapis/ads/googleads/v1/enums/day_of_week.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/day_of_week.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates days of the week, e.g., "Monday".
 type DayOfWeekEnum_DayOfWeek int32
@@ -54,6 +57,7 @@ var DayOfWeekEnum_DayOfWeek_name = map[int32]string{
 	7: "SATURDAY",
 	8: "SUNDAY",
 }
+
 var DayOfWeekEnum_DayOfWeek_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -69,8 +73,9 @@ var DayOfWeekEnum_DayOfWeek_value = map[string]int32{
 func (x DayOfWeekEnum_DayOfWeek) String() string {
 	return proto.EnumName(DayOfWeekEnum_DayOfWeek_name, int32(x))
 }
+
 func (DayOfWeekEnum_DayOfWeek) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_day_of_week_f77dfafb40312473, []int{0, 0}
+	return fileDescriptor_eba362041c9d1ea5, []int{0, 0}
 }
 
 // Container for enumeration of days of the week, e.g., "Monday".
@@ -84,16 +89,17 @@ func (m *DayOfWeekEnum) Reset()         { *m = DayOfWeekEnum{} }
 func (m *DayOfWeekEnum) String() string { return proto.CompactTextString(m) }
 func (*DayOfWeekEnum) ProtoMessage()    {}
 func (*DayOfWeekEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_day_of_week_f77dfafb40312473, []int{0}
+	return fileDescriptor_eba362041c9d1ea5, []int{0}
 }
+
 func (m *DayOfWeekEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DayOfWeekEnum.Unmarshal(m, b)
 }
 func (m *DayOfWeekEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DayOfWeekEnum.Marshal(b, m, deterministic)
 }
-func (dst *DayOfWeekEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DayOfWeekEnum.Merge(dst, src)
+func (m *DayOfWeekEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DayOfWeekEnum.Merge(m, src)
 }
 func (m *DayOfWeekEnum) XXX_Size() int {
 	return xxx_messageInfo_DayOfWeekEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *DayOfWeekEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DayOfWeekEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DayOfWeekEnum)(nil), "google.ads.googleads.v1.enums.DayOfWeekEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.DayOfWeekEnum_DayOfWeek", DayOfWeekEnum_DayOfWeek_name, DayOfWeekEnum_DayOfWeek_value)
+	proto.RegisterType((*DayOfWeekEnum)(nil), "google.ads.googleads.v1.enums.DayOfWeekEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/day_of_week.proto", fileDescriptor_day_of_week_f77dfafb40312473)
+	proto.RegisterFile("google/ads/googleads/v1/enums/day_of_week.proto", fileDescriptor_eba362041c9d1ea5)
 }
 
-var fileDescriptor_day_of_week_f77dfafb40312473 = []byte{
+var fileDescriptor_eba362041c9d1ea5 = []byte{
 	// 343 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4e, 0x32, 0x31,
 	0x14, 0xc5, 0xbf, 0x19, 0x3e, 0xf9, 0x53, 0x44, 0xc9, 0x2c, 0x8d, 0x2c, 0xe0, 0x01, 0x3a, 0x99,
diff --git a/googleapis/ads/googleads/v1/enums/device.pb.go b/googleapis/ads/googleads/v1/enums/device.pb.go
index b49d9bb1b9..fcaedf70c1 100644
--- a/googleapis/ads/googleads/v1/enums/device.pb.go
+++ b/googleapis/ads/googleads/v1/enums/device.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/device.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates Google Ads devices available for targeting.
 type DeviceEnum_Device int32
@@ -45,6 +48,7 @@ var DeviceEnum_Device_name = map[int32]string{
 	4: "DESKTOP",
 	5: "OTHER",
 }
+
 var DeviceEnum_Device_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -57,8 +61,9 @@ var DeviceEnum_Device_value = map[string]int32{
 func (x DeviceEnum_Device) String() string {
 	return proto.EnumName(DeviceEnum_Device_name, int32(x))
 }
+
 func (DeviceEnum_Device) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_device_af26abde288b5cfb, []int{0, 0}
+	return fileDescriptor_2f3653a34a029c3f, []int{0, 0}
 }
 
 // Container for enumeration of Google Ads devices available for targeting.
@@ -72,16 +77,17 @@ func (m *DeviceEnum) Reset()         { *m = DeviceEnum{} }
 func (m *DeviceEnum) String() string { return proto.CompactTextString(m) }
 func (*DeviceEnum) ProtoMessage()    {}
 func (*DeviceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_af26abde288b5cfb, []int{0}
+	return fileDescriptor_2f3653a34a029c3f, []int{0}
 }
+
 func (m *DeviceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceEnum.Unmarshal(m, b)
 }
 func (m *DeviceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceEnum.Marshal(b, m, deterministic)
 }
-func (dst *DeviceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceEnum.Merge(dst, src)
+func (m *DeviceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceEnum.Merge(m, src)
 }
 func (m *DeviceEnum) XXX_Size() int {
 	return xxx_messageInfo_DeviceEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *DeviceEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DeviceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DeviceEnum)(nil), "google.ads.googleads.v1.enums.DeviceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.DeviceEnum_Device", DeviceEnum_Device_name, DeviceEnum_Device_value)
+	proto.RegisterType((*DeviceEnum)(nil), "google.ads.googleads.v1.enums.DeviceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/device.proto", fileDescriptor_device_af26abde288b5cfb)
+	proto.RegisterFile("google/ads/googleads/v1/enums/device.proto", fileDescriptor_2f3653a34a029c3f)
 }
 
-var fileDescriptor_device_af26abde288b5cfb = []byte{
+var fileDescriptor_2f3653a34a029c3f = []byte{
 	// 305 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4e, 0xf3, 0x30,
 	0x1c, 0xc5, 0xbf, 0xa6, 0x5f, 0x8b, 0x70, 0x07, 0xac, 0x8c, 0x88, 0x0e, 0xed, 0xc8, 0x60, 0x2b,
diff --git a/googleapis/ads/googleads/v1/enums/display_ad_format_setting.pb.go b/googleapis/ads/googleads/v1/enums/display_ad_format_setting.pb.go
index b91edb8d0c..327433df42 100644
--- a/googleapis/ads/googleads/v1/enums/display_ad_format_setting.pb.go
+++ b/googleapis/ads/googleads/v1/enums/display_ad_format_setting.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/display_ad_format_setting.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates display ad format settings.
 type DisplayAdFormatSettingEnum_DisplayAdFormatSetting int32
@@ -43,6 +46,7 @@ var DisplayAdFormatSettingEnum_DisplayAdFormatSetting_name = map[int32]string{
 	3: "NON_NATIVE",
 	4: "NATIVE",
 }
+
 var DisplayAdFormatSettingEnum_DisplayAdFormatSetting_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -54,8 +58,9 @@ var DisplayAdFormatSettingEnum_DisplayAdFormatSetting_value = map[string]int32{
 func (x DisplayAdFormatSettingEnum_DisplayAdFormatSetting) String() string {
 	return proto.EnumName(DisplayAdFormatSettingEnum_DisplayAdFormatSetting_name, int32(x))
 }
+
 func (DisplayAdFormatSettingEnum_DisplayAdFormatSetting) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_display_ad_format_setting_4bd791b4be3a0ccc, []int{0, 0}
+	return fileDescriptor_c4acbddf81279131, []int{0, 0}
 }
 
 // Container for display ad format settings.
@@ -69,16 +74,17 @@ func (m *DisplayAdFormatSettingEnum) Reset()         { *m = DisplayAdFormatSetti
 func (m *DisplayAdFormatSettingEnum) String() string { return proto.CompactTextString(m) }
 func (*DisplayAdFormatSettingEnum) ProtoMessage()    {}
 func (*DisplayAdFormatSettingEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_display_ad_format_setting_4bd791b4be3a0ccc, []int{0}
+	return fileDescriptor_c4acbddf81279131, []int{0}
 }
+
 func (m *DisplayAdFormatSettingEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DisplayAdFormatSettingEnum.Unmarshal(m, b)
 }
 func (m *DisplayAdFormatSettingEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DisplayAdFormatSettingEnum.Marshal(b, m, deterministic)
 }
-func (dst *DisplayAdFormatSettingEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DisplayAdFormatSettingEnum.Merge(dst, src)
+func (m *DisplayAdFormatSettingEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DisplayAdFormatSettingEnum.Merge(m, src)
 }
 func (m *DisplayAdFormatSettingEnum) XXX_Size() int {
 	return xxx_messageInfo_DisplayAdFormatSettingEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *DisplayAdFormatSettingEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DisplayAdFormatSettingEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DisplayAdFormatSettingEnum)(nil), "google.ads.googleads.v1.enums.DisplayAdFormatSettingEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.DisplayAdFormatSettingEnum_DisplayAdFormatSetting", DisplayAdFormatSettingEnum_DisplayAdFormatSetting_name, DisplayAdFormatSettingEnum_DisplayAdFormatSetting_value)
+	proto.RegisterType((*DisplayAdFormatSettingEnum)(nil), "google.ads.googleads.v1.enums.DisplayAdFormatSettingEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/display_ad_format_setting.proto", fileDescriptor_display_ad_format_setting_4bd791b4be3a0ccc)
+	proto.RegisterFile("google/ads/googleads/v1/enums/display_ad_format_setting.proto", fileDescriptor_c4acbddf81279131)
 }
 
-var fileDescriptor_display_ad_format_setting_4bd791b4be3a0ccc = []byte{
+var fileDescriptor_c4acbddf81279131 = []byte{
 	// 329 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x4b, 0xfb, 0x30,
 	0x1c, 0xfd, 0xb7, 0xfb, 0x33, 0x21, 0x03, 0x2d, 0x3d, 0x78, 0x98, 0xee, 0xb0, 0x7d, 0x80, 0x94,
diff --git a/googleapis/ads/googleads/v1/enums/display_upload_product_type.pb.go b/googleapis/ads/googleads/v1/enums/display_upload_product_type.pb.go
index 582aef3c75..4e5d2aa096 100644
--- a/googleapis/ads/googleads/v1/enums/display_upload_product_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/display_upload_product_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/display_upload_product_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates display upload product types.
 type DisplayUploadProductTypeEnum_DisplayUploadProductType int32
@@ -82,6 +85,7 @@ var DisplayUploadProductTypeEnum_DisplayUploadProductType_name = map[int32]strin
 	10: "DYNAMIC_HTML5_TRAVEL_AD",
 	11: "DYNAMIC_HTML5_HOTEL_AD",
 }
+
 var DisplayUploadProductTypeEnum_DisplayUploadProductType_value = map[string]int32{
 	"UNSPECIFIED":                   0,
 	"UNKNOWN":                       1,
@@ -100,8 +104,9 @@ var DisplayUploadProductTypeEnum_DisplayUploadProductType_value = map[string]int
 func (x DisplayUploadProductTypeEnum_DisplayUploadProductType) String() string {
 	return proto.EnumName(DisplayUploadProductTypeEnum_DisplayUploadProductType_name, int32(x))
 }
+
 func (DisplayUploadProductTypeEnum_DisplayUploadProductType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_display_upload_product_type_d7c5a6f338709612, []int{0, 0}
+	return fileDescriptor_5c241c09621b180c, []int{0, 0}
 }
 
 // Container for display upload product types. Product types that have the word
@@ -119,16 +124,17 @@ func (m *DisplayUploadProductTypeEnum) Reset()         { *m = DisplayUploadProdu
 func (m *DisplayUploadProductTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*DisplayUploadProductTypeEnum) ProtoMessage()    {}
 func (*DisplayUploadProductTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_display_upload_product_type_d7c5a6f338709612, []int{0}
+	return fileDescriptor_5c241c09621b180c, []int{0}
 }
+
 func (m *DisplayUploadProductTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DisplayUploadProductTypeEnum.Unmarshal(m, b)
 }
 func (m *DisplayUploadProductTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DisplayUploadProductTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *DisplayUploadProductTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DisplayUploadProductTypeEnum.Merge(dst, src)
+func (m *DisplayUploadProductTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DisplayUploadProductTypeEnum.Merge(m, src)
 }
 func (m *DisplayUploadProductTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_DisplayUploadProductTypeEnum.Size(m)
@@ -140,15 +146,15 @@ func (m *DisplayUploadProductTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DisplayUploadProductTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DisplayUploadProductTypeEnum)(nil), "google.ads.googleads.v1.enums.DisplayUploadProductTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.DisplayUploadProductTypeEnum_DisplayUploadProductType", DisplayUploadProductTypeEnum_DisplayUploadProductType_name, DisplayUploadProductTypeEnum_DisplayUploadProductType_value)
+	proto.RegisterType((*DisplayUploadProductTypeEnum)(nil), "google.ads.googleads.v1.enums.DisplayUploadProductTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/display_upload_product_type.proto", fileDescriptor_display_upload_product_type_d7c5a6f338709612)
+	proto.RegisterFile("google/ads/googleads/v1/enums/display_upload_product_type.proto", fileDescriptor_5c241c09621b180c)
 }
 
-var fileDescriptor_display_upload_product_type_d7c5a6f338709612 = []byte{
+var fileDescriptor_5c241c09621b180c = []byte{
 	// 441 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0xaa, 0xd3, 0x40,
 	0x14, 0x86, 0x6d, 0xae, 0xde, 0xab, 0xd3, 0xc5, 0x2d, 0xa3, 0xe8, 0xa5, 0xb6, 0x62, 0xef, 0x03,
diff --git a/googleapis/ads/googleads/v1/enums/dsa_page_feed_criterion_field.pb.go b/googleapis/ads/googleads/v1/enums/dsa_page_feed_criterion_field.pb.go
index 93e5026639..045501ded5 100644
--- a/googleapis/ads/googleads/v1/enums/dsa_page_feed_criterion_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/dsa_page_feed_criterion_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/dsa_page_feed_criterion_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Dynamic Search Ad Page Feed criterion fields.
 type DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField int32
@@ -40,6 +43,7 @@ var DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField_name = map[int32]str
 	2: "PAGE_URL",
 	3: "LABEL",
 }
+
 var DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -50,8 +54,9 @@ var DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField_value = map[string]i
 func (x DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField) String() string {
 	return proto.EnumName(DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField_name, int32(x))
 }
+
 func (DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dsa_page_feed_criterion_field_5246b93b382746b3, []int{0, 0}
+	return fileDescriptor_7742773da57a2f85, []int{0, 0}
 }
 
 // Values for Dynamic Search Ad Page Feed criterion fields.
@@ -65,16 +70,17 @@ func (m *DsaPageFeedCriterionFieldEnum) Reset()         { *m = DsaPageFeedCriter
 func (m *DsaPageFeedCriterionFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*DsaPageFeedCriterionFieldEnum) ProtoMessage()    {}
 func (*DsaPageFeedCriterionFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dsa_page_feed_criterion_field_5246b93b382746b3, []int{0}
+	return fileDescriptor_7742773da57a2f85, []int{0}
 }
+
 func (m *DsaPageFeedCriterionFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DsaPageFeedCriterionFieldEnum.Unmarshal(m, b)
 }
 func (m *DsaPageFeedCriterionFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DsaPageFeedCriterionFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *DsaPageFeedCriterionFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DsaPageFeedCriterionFieldEnum.Merge(dst, src)
+func (m *DsaPageFeedCriterionFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DsaPageFeedCriterionFieldEnum.Merge(m, src)
 }
 func (m *DsaPageFeedCriterionFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_DsaPageFeedCriterionFieldEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *DsaPageFeedCriterionFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DsaPageFeedCriterionFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DsaPageFeedCriterionFieldEnum)(nil), "google.ads.googleads.v1.enums.DsaPageFeedCriterionFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField", DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField_name, DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField_value)
+	proto.RegisterType((*DsaPageFeedCriterionFieldEnum)(nil), "google.ads.googleads.v1.enums.DsaPageFeedCriterionFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/dsa_page_feed_criterion_field.proto", fileDescriptor_dsa_page_feed_criterion_field_5246b93b382746b3)
+	proto.RegisterFile("google/ads/googleads/v1/enums/dsa_page_feed_criterion_field.proto", fileDescriptor_7742773da57a2f85)
 }
 
-var fileDescriptor_dsa_page_feed_criterion_field_5246b93b382746b3 = []byte{
+var fileDescriptor_7742773da57a2f85 = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcd, 0x4a, 0xc3, 0x40,
 	0x18, 0xb4, 0x29, 0xfe, 0x6d, 0x05, 0x43, 0x6e, 0x8a, 0x15, 0xda, 0x07, 0xd8, 0x10, 0xbc, 0xad,
diff --git a/googleapis/ads/googleads/v1/enums/education_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/education_placeholder_field.pb.go
index ca4f2d4ec6..baa029ce58 100644
--- a/googleapis/ads/googleads/v1/enums/education_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/education_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/education_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Education placeholder fields.
 type EducationPlaceholderFieldEnum_EducationPlaceholderField int32
@@ -98,6 +101,7 @@ var EducationPlaceholderFieldEnum_EducationPlaceholderField_name = map[int32]str
 	17: "IOS_APP_LINK",
 	18: "IOS_APP_STORE_ID",
 }
+
 var EducationPlaceholderFieldEnum_EducationPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":                     0,
 	"UNKNOWN":                         1,
@@ -123,8 +127,9 @@ var EducationPlaceholderFieldEnum_EducationPlaceholderField_value = map[string]i
 func (x EducationPlaceholderFieldEnum_EducationPlaceholderField) String() string {
 	return proto.EnumName(EducationPlaceholderFieldEnum_EducationPlaceholderField_name, int32(x))
 }
+
 func (EducationPlaceholderFieldEnum_EducationPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_education_placeholder_field_7f235e522c33dfac, []int{0, 0}
+	return fileDescriptor_8fd4c47241194ad2, []int{0, 0}
 }
 
 // Values for Education placeholder fields.
@@ -140,16 +145,17 @@ func (m *EducationPlaceholderFieldEnum) Reset()         { *m = EducationPlacehol
 func (m *EducationPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*EducationPlaceholderFieldEnum) ProtoMessage()    {}
 func (*EducationPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_education_placeholder_field_7f235e522c33dfac, []int{0}
+	return fileDescriptor_8fd4c47241194ad2, []int{0}
 }
+
 func (m *EducationPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EducationPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *EducationPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EducationPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *EducationPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EducationPlaceholderFieldEnum.Merge(dst, src)
+func (m *EducationPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EducationPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *EducationPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_EducationPlaceholderFieldEnum.Size(m)
@@ -161,15 +167,15 @@ func (m *EducationPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_EducationPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*EducationPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.EducationPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.EducationPlaceholderFieldEnum_EducationPlaceholderField", EducationPlaceholderFieldEnum_EducationPlaceholderField_name, EducationPlaceholderFieldEnum_EducationPlaceholderField_value)
+	proto.RegisterType((*EducationPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.EducationPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/education_placeholder_field.proto", fileDescriptor_education_placeholder_field_7f235e522c33dfac)
+	proto.RegisterFile("google/ads/googleads/v1/enums/education_placeholder_field.proto", fileDescriptor_8fd4c47241194ad2)
 }
 
-var fileDescriptor_education_placeholder_field_7f235e522c33dfac = []byte{
+var fileDescriptor_8fd4c47241194ad2 = []byte{
 	// 514 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x8e, 0xd3, 0x30,
 	0x10, 0xc6, 0xd9, 0x16, 0x76, 0xc1, 0xdd, 0x3f, 0x6e, 0x00, 0x21, 0x10, 0x05, 0xed, 0x72, 0x4f,
diff --git a/googleapis/ads/googleads/v1/enums/extension_setting_device.pb.go b/googleapis/ads/googleads/v1/enums/extension_setting_device.pb.go
index 112475c652..92ab0de2aa 100644
--- a/googleapis/ads/googleads/v1/enums/extension_setting_device.pb.go
+++ b/googleapis/ads/googleads/v1/enums/extension_setting_device.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/extension_setting_device.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possbile device types for an extension setting.
 type ExtensionSettingDeviceEnum_ExtensionSettingDevice int32
@@ -41,6 +44,7 @@ var ExtensionSettingDeviceEnum_ExtensionSettingDevice_name = map[int32]string{
 	2: "MOBILE",
 	3: "DESKTOP",
 }
+
 var ExtensionSettingDeviceEnum_ExtensionSettingDevice_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -51,8 +55,9 @@ var ExtensionSettingDeviceEnum_ExtensionSettingDevice_value = map[string]int32{
 func (x ExtensionSettingDeviceEnum_ExtensionSettingDevice) String() string {
 	return proto.EnumName(ExtensionSettingDeviceEnum_ExtensionSettingDevice_name, int32(x))
 }
+
 func (ExtensionSettingDeviceEnum_ExtensionSettingDevice) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_extension_setting_device_c8f5db7acb01d08d, []int{0, 0}
+	return fileDescriptor_ae3aed08ebb9f2aa, []int{0, 0}
 }
 
 // Container for enum describing extension setting device types.
@@ -66,16 +71,17 @@ func (m *ExtensionSettingDeviceEnum) Reset()         { *m = ExtensionSettingDevi
 func (m *ExtensionSettingDeviceEnum) String() string { return proto.CompactTextString(m) }
 func (*ExtensionSettingDeviceEnum) ProtoMessage()    {}
 func (*ExtensionSettingDeviceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_setting_device_c8f5db7acb01d08d, []int{0}
+	return fileDescriptor_ae3aed08ebb9f2aa, []int{0}
 }
+
 func (m *ExtensionSettingDeviceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtensionSettingDeviceEnum.Unmarshal(m, b)
 }
 func (m *ExtensionSettingDeviceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExtensionSettingDeviceEnum.Marshal(b, m, deterministic)
 }
-func (dst *ExtensionSettingDeviceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtensionSettingDeviceEnum.Merge(dst, src)
+func (m *ExtensionSettingDeviceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionSettingDeviceEnum.Merge(m, src)
 }
 func (m *ExtensionSettingDeviceEnum) XXX_Size() int {
 	return xxx_messageInfo_ExtensionSettingDeviceEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *ExtensionSettingDeviceEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ExtensionSettingDeviceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ExtensionSettingDeviceEnum)(nil), "google.ads.googleads.v1.enums.ExtensionSettingDeviceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ExtensionSettingDeviceEnum_ExtensionSettingDevice", ExtensionSettingDeviceEnum_ExtensionSettingDevice_name, ExtensionSettingDeviceEnum_ExtensionSettingDevice_value)
+	proto.RegisterType((*ExtensionSettingDeviceEnum)(nil), "google.ads.googleads.v1.enums.ExtensionSettingDeviceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/extension_setting_device.proto", fileDescriptor_extension_setting_device_c8f5db7acb01d08d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/extension_setting_device.proto", fileDescriptor_ae3aed08ebb9f2aa)
 }
 
-var fileDescriptor_extension_setting_device_c8f5db7acb01d08d = []byte{
+var fileDescriptor_ae3aed08ebb9f2aa = []byte{
 	// 311 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4b, 0xfb, 0x30,
 	0x18, 0xc6, 0xff, 0xeb, 0x60, 0x7f, 0xc8, 0x0e, 0x96, 0x1e, 0x3c, 0x4c, 0x77, 0xd8, 0x3e, 0x40,
diff --git a/googleapis/ads/googleads/v1/enums/extension_type.pb.go b/googleapis/ads/googleads/v1/enums/extension_type.pb.go
index 57cd2f0d9c..6052062ad5 100644
--- a/googleapis/ads/googleads/v1/enums/extension_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/extension_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/extension_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible data types for an extension in an extension setting.
 type ExtensionTypeEnum_ExtensionType int32
@@ -69,6 +72,7 @@ var ExtensionTypeEnum_ExtensionType_name = map[int32]string{
 	12: "LOCATION",
 	13: "AFFILIATE_LOCATION",
 }
+
 var ExtensionTypeEnum_ExtensionType_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"UNKNOWN":            1,
@@ -89,8 +93,9 @@ var ExtensionTypeEnum_ExtensionType_value = map[string]int32{
 func (x ExtensionTypeEnum_ExtensionType) String() string {
 	return proto.EnumName(ExtensionTypeEnum_ExtensionType_name, int32(x))
 }
+
 func (ExtensionTypeEnum_ExtensionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_extension_type_daed22fceb6f35da, []int{0, 0}
+	return fileDescriptor_637b9107265116c7, []int{0, 0}
 }
 
 // Container for enum describing possible data types for an extension in an
@@ -105,16 +110,17 @@ func (m *ExtensionTypeEnum) Reset()         { *m = ExtensionTypeEnum{} }
 func (m *ExtensionTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ExtensionTypeEnum) ProtoMessage()    {}
 func (*ExtensionTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_type_daed22fceb6f35da, []int{0}
+	return fileDescriptor_637b9107265116c7, []int{0}
 }
+
 func (m *ExtensionTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtensionTypeEnum.Unmarshal(m, b)
 }
 func (m *ExtensionTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExtensionTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ExtensionTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtensionTypeEnum.Merge(dst, src)
+func (m *ExtensionTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionTypeEnum.Merge(m, src)
 }
 func (m *ExtensionTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ExtensionTypeEnum.Size(m)
@@ -126,15 +132,15 @@ func (m *ExtensionTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ExtensionTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ExtensionTypeEnum)(nil), "google.ads.googleads.v1.enums.ExtensionTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ExtensionTypeEnum_ExtensionType", ExtensionTypeEnum_ExtensionType_name, ExtensionTypeEnum_ExtensionType_value)
+	proto.RegisterType((*ExtensionTypeEnum)(nil), "google.ads.googleads.v1.enums.ExtensionTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/extension_type.proto", fileDescriptor_extension_type_daed22fceb6f35da)
+	proto.RegisterFile("google/ads/googleads/v1/enums/extension_type.proto", fileDescriptor_637b9107265116c7)
 }
 
-var fileDescriptor_extension_type_daed22fceb6f35da = []byte{
+var fileDescriptor_637b9107265116c7 = []byte{
 	// 407 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x4d, 0x6a, 0xdc, 0x30,
 	0x18, 0xad, 0x67, 0x92, 0xf9, 0xd1, 0x64, 0xa8, 0xaa, 0x45, 0x17, 0xa5, 0x59, 0x24, 0x07, 0x90,
diff --git a/googleapis/ads/googleads/v1/enums/external_conversion_source.pb.go b/googleapis/ads/googleads/v1/enums/external_conversion_source.pb.go
index e60db53d8d..f42ddc92d1 100644
--- a/googleapis/ads/googleads/v1/enums/external_conversion_source.pb.go
+++ b/googleapis/ads/googleads/v1/enums/external_conversion_source.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/external_conversion_source.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The external conversion source that is associated with a ConversionAction.
 type ExternalConversionSourceEnum_ExternalConversionSource int32
@@ -120,6 +123,7 @@ var ExternalConversionSourceEnum_ExternalConversionSource_name = map[int32]strin
 	21: "GOOGLE_ATTRIBUTION",
 	22: "STORE_SALES_DIRECT",
 }
+
 var ExternalConversionSourceEnum_ExternalConversionSource_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -149,8 +153,9 @@ var ExternalConversionSourceEnum_ExternalConversionSource_value = map[string]int
 func (x ExternalConversionSourceEnum_ExternalConversionSource) String() string {
 	return proto.EnumName(ExternalConversionSourceEnum_ExternalConversionSource_name, int32(x))
 }
+
 func (ExternalConversionSourceEnum_ExternalConversionSource) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_external_conversion_source_4493126392cc16df, []int{0, 0}
+	return fileDescriptor_edda814909168641, []int{0, 0}
 }
 
 // Container for enum describing the external conversion source that is
@@ -165,16 +170,17 @@ func (m *ExternalConversionSourceEnum) Reset()         { *m = ExternalConversion
 func (m *ExternalConversionSourceEnum) String() string { return proto.CompactTextString(m) }
 func (*ExternalConversionSourceEnum) ProtoMessage()    {}
 func (*ExternalConversionSourceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_external_conversion_source_4493126392cc16df, []int{0}
+	return fileDescriptor_edda814909168641, []int{0}
 }
+
 func (m *ExternalConversionSourceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExternalConversionSourceEnum.Unmarshal(m, b)
 }
 func (m *ExternalConversionSourceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExternalConversionSourceEnum.Marshal(b, m, deterministic)
 }
-func (dst *ExternalConversionSourceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExternalConversionSourceEnum.Merge(dst, src)
+func (m *ExternalConversionSourceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExternalConversionSourceEnum.Merge(m, src)
 }
 func (m *ExternalConversionSourceEnum) XXX_Size() int {
 	return xxx_messageInfo_ExternalConversionSourceEnum.Size(m)
@@ -186,15 +192,15 @@ func (m *ExternalConversionSourceEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ExternalConversionSourceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ExternalConversionSourceEnum)(nil), "google.ads.googleads.v1.enums.ExternalConversionSourceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ExternalConversionSourceEnum_ExternalConversionSource", ExternalConversionSourceEnum_ExternalConversionSource_name, ExternalConversionSourceEnum_ExternalConversionSource_value)
+	proto.RegisterType((*ExternalConversionSourceEnum)(nil), "google.ads.googleads.v1.enums.ExternalConversionSourceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/external_conversion_source.proto", fileDescriptor_external_conversion_source_4493126392cc16df)
+	proto.RegisterFile("google/ads/googleads/v1/enums/external_conversion_source.proto", fileDescriptor_edda814909168641)
 }
 
-var fileDescriptor_external_conversion_source_4493126392cc16df = []byte{
+var fileDescriptor_edda814909168641 = []byte{
 	// 553 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x6e, 0xda, 0x3c,
 	0x18, 0xfe, 0x4a, 0xfb, 0xf5, 0xc7, 0xfd, 0x73, 0xdd, 0xae, 0xea, 0xb6, 0xa2, 0xa9, 0xbd, 0x80,
diff --git a/googleapis/ads/googleads/v1/enums/feed_attribute_type.pb.go b/googleapis/ads/googleads/v1/enums/feed_attribute_type.pb.go
index a4a41c178c..553a647ba8 100644
--- a/googleapis/ads/googleads/v1/enums/feed_attribute_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_attribute_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_attribute_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible data types for a feed attribute.
 type FeedAttributeTypeEnum_FeedAttributeType int32
@@ -72,6 +75,7 @@ var FeedAttributeTypeEnum_FeedAttributeType_name = map[int32]string{
 	13: "DATE_TIME_LIST",
 	14: "PRICE",
 }
+
 var FeedAttributeTypeEnum_FeedAttributeType_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -93,8 +97,9 @@ var FeedAttributeTypeEnum_FeedAttributeType_value = map[string]int32{
 func (x FeedAttributeTypeEnum_FeedAttributeType) String() string {
 	return proto.EnumName(FeedAttributeTypeEnum_FeedAttributeType_name, int32(x))
 }
+
 func (FeedAttributeTypeEnum_FeedAttributeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_attribute_type_282150463692a3a8, []int{0, 0}
+	return fileDescriptor_75b6a07c0f255725, []int{0, 0}
 }
 
 // Container for enum describing possible data types for a feed attribute.
@@ -108,16 +113,17 @@ func (m *FeedAttributeTypeEnum) Reset()         { *m = FeedAttributeTypeEnum{} }
 func (m *FeedAttributeTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedAttributeTypeEnum) ProtoMessage()    {}
 func (*FeedAttributeTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_attribute_type_282150463692a3a8, []int{0}
+	return fileDescriptor_75b6a07c0f255725, []int{0}
 }
+
 func (m *FeedAttributeTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedAttributeTypeEnum.Unmarshal(m, b)
 }
 func (m *FeedAttributeTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedAttributeTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedAttributeTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedAttributeTypeEnum.Merge(dst, src)
+func (m *FeedAttributeTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedAttributeTypeEnum.Merge(m, src)
 }
 func (m *FeedAttributeTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedAttributeTypeEnum.Size(m)
@@ -129,15 +135,15 @@ func (m *FeedAttributeTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedAttributeTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedAttributeTypeEnum)(nil), "google.ads.googleads.v1.enums.FeedAttributeTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedAttributeTypeEnum_FeedAttributeType", FeedAttributeTypeEnum_FeedAttributeType_name, FeedAttributeTypeEnum_FeedAttributeType_value)
+	proto.RegisterType((*FeedAttributeTypeEnum)(nil), "google.ads.googleads.v1.enums.FeedAttributeTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_attribute_type.proto", fileDescriptor_feed_attribute_type_282150463692a3a8)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_attribute_type.proto", fileDescriptor_75b6a07c0f255725)
 }
 
-var fileDescriptor_feed_attribute_type_282150463692a3a8 = []byte{
+var fileDescriptor_75b6a07c0f255725 = []byte{
 	// 407 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0x6a, 0xdb, 0x40,
 	0x14, 0xac, 0xe5, 0xc6, 0x8e, 0x9f, 0x1d, 0x77, 0xbb, 0xd0, 0x1e, 0x4a, 0x73, 0x48, 0x3e, 0x60,
diff --git a/googleapis/ads/googleads/v1/enums/feed_item_quality_approval_status.pb.go b/googleapis/ads/googleads/v1/enums/feed_item_quality_approval_status.pb.go
index dbb04c5dca..3474aaf8af 100644
--- a/googleapis/ads/googleads/v1/enums/feed_item_quality_approval_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_item_quality_approval_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_item_quality_approval_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible quality evaluation approval statuses of a feed item.
 type FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus int32
@@ -40,6 +43,7 @@ var FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus_name = map[i
 	2: "APPROVED",
 	3: "DISAPPROVED",
 }
+
 var FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -50,8 +54,9 @@ var FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus_value = map[
 func (x FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus) String() string {
 	return proto.EnumName(FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus_name, int32(x))
 }
+
 func (FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_quality_approval_status_6b620c95a3e51336, []int{0, 0}
+	return fileDescriptor_204092c81427d94e, []int{0, 0}
 }
 
 // Container for enum describing possible quality evaluation approval statuses
@@ -66,16 +71,17 @@ func (m *FeedItemQualityApprovalStatusEnum) Reset()         { *m = FeedItemQuali
 func (m *FeedItemQualityApprovalStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemQualityApprovalStatusEnum) ProtoMessage()    {}
 func (*FeedItemQualityApprovalStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_quality_approval_status_6b620c95a3e51336, []int{0}
+	return fileDescriptor_204092c81427d94e, []int{0}
 }
+
 func (m *FeedItemQualityApprovalStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemQualityApprovalStatusEnum.Unmarshal(m, b)
 }
 func (m *FeedItemQualityApprovalStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemQualityApprovalStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemQualityApprovalStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemQualityApprovalStatusEnum.Merge(dst, src)
+func (m *FeedItemQualityApprovalStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemQualityApprovalStatusEnum.Merge(m, src)
 }
 func (m *FeedItemQualityApprovalStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemQualityApprovalStatusEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *FeedItemQualityApprovalStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemQualityApprovalStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemQualityApprovalStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedItemQualityApprovalStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus", FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus_name, FeedItemQualityApprovalStatusEnum_FeedItemQualityApprovalStatus_value)
+	proto.RegisterType((*FeedItemQualityApprovalStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedItemQualityApprovalStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_quality_approval_status.proto", fileDescriptor_feed_item_quality_approval_status_6b620c95a3e51336)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_quality_approval_status.proto", fileDescriptor_204092c81427d94e)
 }
 
-var fileDescriptor_feed_item_quality_approval_status_6b620c95a3e51336 = []byte{
+var fileDescriptor_204092c81427d94e = []byte{
 	// 324 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4a, 0xf3, 0x30,
 	0x18, 0xfd, 0xdb, 0xc1, 0xaf, 0x64, 0x82, 0xa3, 0x97, 0xe2, 0x2e, 0xb6, 0x07, 0x48, 0x28, 0xde,
diff --git a/googleapis/ads/googleads/v1/enums/feed_item_quality_disapproval_reason.pb.go b/googleapis/ads/googleads/v1/enums/feed_item_quality_disapproval_reason.pb.go
index 95ae2645de..e1b0c405c5 100644
--- a/googleapis/ads/googleads/v1/enums/feed_item_quality_disapproval_reason.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_item_quality_disapproval_reason.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_item_quality_disapproval_reason.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible quality evaluation disapproval reasons of a feed item.
 type FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason int32
@@ -87,6 +90,7 @@ var FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason_name =
 	18: "STRUCTURED_SNIPPETS_EDITORIAL_GUIDELINES",
 	19: "STRUCTURED_SNIPPETS_HAS_PROMOTIONAL_TEXT",
 }
+
 var FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason_value = map[string]int32{
 	"UNSPECIFIED":                                      0,
 	"UNKNOWN":                                          1,
@@ -113,8 +117,9 @@ var FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason_value
 func (x FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason) String() string {
 	return proto.EnumName(FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason_name, int32(x))
 }
+
 func (FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_quality_disapproval_reason_592822322f4816f9, []int{0, 0}
+	return fileDescriptor_f17372a6460ec60d, []int{0, 0}
 }
 
 // Container for enum describing possible quality evaluation disapproval reasons
@@ -129,16 +134,17 @@ func (m *FeedItemQualityDisapprovalReasonEnum) Reset()         { *m = FeedItemQu
 func (m *FeedItemQualityDisapprovalReasonEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemQualityDisapprovalReasonEnum) ProtoMessage()    {}
 func (*FeedItemQualityDisapprovalReasonEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_quality_disapproval_reason_592822322f4816f9, []int{0}
+	return fileDescriptor_f17372a6460ec60d, []int{0}
 }
+
 func (m *FeedItemQualityDisapprovalReasonEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemQualityDisapprovalReasonEnum.Unmarshal(m, b)
 }
 func (m *FeedItemQualityDisapprovalReasonEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemQualityDisapprovalReasonEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemQualityDisapprovalReasonEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemQualityDisapprovalReasonEnum.Merge(dst, src)
+func (m *FeedItemQualityDisapprovalReasonEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemQualityDisapprovalReasonEnum.Merge(m, src)
 }
 func (m *FeedItemQualityDisapprovalReasonEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemQualityDisapprovalReasonEnum.Size(m)
@@ -150,15 +156,15 @@ func (m *FeedItemQualityDisapprovalReasonEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemQualityDisapprovalReasonEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemQualityDisapprovalReasonEnum)(nil), "google.ads.googleads.v1.enums.FeedItemQualityDisapprovalReasonEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason", FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason_name, FeedItemQualityDisapprovalReasonEnum_FeedItemQualityDisapprovalReason_value)
+	proto.RegisterType((*FeedItemQualityDisapprovalReasonEnum)(nil), "google.ads.googleads.v1.enums.FeedItemQualityDisapprovalReasonEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_quality_disapproval_reason.proto", fileDescriptor_feed_item_quality_disapproval_reason_592822322f4816f9)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_quality_disapproval_reason.proto", fileDescriptor_f17372a6460ec60d)
 }
 
-var fileDescriptor_feed_item_quality_disapproval_reason_592822322f4816f9 = []byte{
+var fileDescriptor_f17372a6460ec60d = []byte{
 	// 631 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcd, 0x72, 0xd3, 0x30,
 	0x10, 0xc7, 0x69, 0x0a, 0x29, 0xa8, 0x40, 0x85, 0xb8, 0x15, 0x5a, 0x68, 0xa0, 0x05, 0x0a, 0xd8,
diff --git a/googleapis/ads/googleads/v1/enums/feed_item_status.pb.go b/googleapis/ads/googleads/v1/enums/feed_item_status.pb.go
index 34c9486a34..0f8e6bbf9b 100644
--- a/googleapis/ads/googleads/v1/enums/feed_item_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_item_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_item_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a feed item.
 type FeedItemStatusEnum_FeedItemStatus int32
@@ -39,6 +42,7 @@ var FeedItemStatusEnum_FeedItemStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var FeedItemStatusEnum_FeedItemStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var FeedItemStatusEnum_FeedItemStatus_value = map[string]int32{
 func (x FeedItemStatusEnum_FeedItemStatus) String() string {
 	return proto.EnumName(FeedItemStatusEnum_FeedItemStatus_name, int32(x))
 }
+
 func (FeedItemStatusEnum_FeedItemStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_status_38675fbdac6e61e9, []int{0, 0}
+	return fileDescriptor_46fdc388d24984f9, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of a feed item.
@@ -64,16 +69,17 @@ func (m *FeedItemStatusEnum) Reset()         { *m = FeedItemStatusEnum{} }
 func (m *FeedItemStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemStatusEnum) ProtoMessage()    {}
 func (*FeedItemStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_status_38675fbdac6e61e9, []int{0}
+	return fileDescriptor_46fdc388d24984f9, []int{0}
 }
+
 func (m *FeedItemStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemStatusEnum.Unmarshal(m, b)
 }
 func (m *FeedItemStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemStatusEnum.Merge(dst, src)
+func (m *FeedItemStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemStatusEnum.Merge(m, src)
 }
 func (m *FeedItemStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *FeedItemStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedItemStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedItemStatusEnum_FeedItemStatus", FeedItemStatusEnum_FeedItemStatus_name, FeedItemStatusEnum_FeedItemStatus_value)
+	proto.RegisterType((*FeedItemStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedItemStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_status.proto", fileDescriptor_feed_item_status_38675fbdac6e61e9)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_status.proto", fileDescriptor_46fdc388d24984f9)
 }
 
-var fileDescriptor_feed_item_status_38675fbdac6e61e9 = []byte{
+var fileDescriptor_46fdc388d24984f9 = []byte{
 	// 302 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x14, 0xfe, 0xad, 0x83, 0x9f, 0x90, 0x81, 0x96, 0x7a, 0x27, 0xee, 0x62, 0x7b, 0x80, 0x84, 0xa2,
diff --git a/googleapis/ads/googleads/v1/enums/feed_item_target_device.pb.go b/googleapis/ads/googleads/v1/enums/feed_item_target_device.pb.go
index 5b6e15f363..1136c5f796 100644
--- a/googleapis/ads/googleads/v1/enums/feed_item_target_device.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_item_target_device.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_item_target_device.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible data types for a feed item target device.
 type FeedItemTargetDeviceEnum_FeedItemTargetDevice int32
@@ -36,6 +39,7 @@ var FeedItemTargetDeviceEnum_FeedItemTargetDevice_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "MOBILE",
 }
+
 var FeedItemTargetDeviceEnum_FeedItemTargetDevice_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var FeedItemTargetDeviceEnum_FeedItemTargetDevice_value = map[string]int32{
 func (x FeedItemTargetDeviceEnum_FeedItemTargetDevice) String() string {
 	return proto.EnumName(FeedItemTargetDeviceEnum_FeedItemTargetDevice_name, int32(x))
 }
+
 func (FeedItemTargetDeviceEnum_FeedItemTargetDevice) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_device_343b6c944046560e, []int{0, 0}
+	return fileDescriptor_7bbd78c5de847bc3, []int{0, 0}
 }
 
 // Container for enum describing possible data types for a feed item target
@@ -61,16 +66,17 @@ func (m *FeedItemTargetDeviceEnum) Reset()         { *m = FeedItemTargetDeviceEn
 func (m *FeedItemTargetDeviceEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemTargetDeviceEnum) ProtoMessage()    {}
 func (*FeedItemTargetDeviceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_device_343b6c944046560e, []int{0}
+	return fileDescriptor_7bbd78c5de847bc3, []int{0}
 }
+
 func (m *FeedItemTargetDeviceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemTargetDeviceEnum.Unmarshal(m, b)
 }
 func (m *FeedItemTargetDeviceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemTargetDeviceEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemTargetDeviceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemTargetDeviceEnum.Merge(dst, src)
+func (m *FeedItemTargetDeviceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemTargetDeviceEnum.Merge(m, src)
 }
 func (m *FeedItemTargetDeviceEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemTargetDeviceEnum.Size(m)
@@ -82,15 +88,15 @@ func (m *FeedItemTargetDeviceEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemTargetDeviceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemTargetDeviceEnum)(nil), "google.ads.googleads.v1.enums.FeedItemTargetDeviceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedItemTargetDeviceEnum_FeedItemTargetDevice", FeedItemTargetDeviceEnum_FeedItemTargetDevice_name, FeedItemTargetDeviceEnum_FeedItemTargetDevice_value)
+	proto.RegisterType((*FeedItemTargetDeviceEnum)(nil), "google.ads.googleads.v1.enums.FeedItemTargetDeviceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_target_device.proto", fileDescriptor_feed_item_target_device_343b6c944046560e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_target_device.proto", fileDescriptor_7bbd78c5de847bc3)
 }
 
-var fileDescriptor_feed_item_target_device_343b6c944046560e = []byte{
+var fileDescriptor_7bbd78c5de847bc3 = []byte{
 	// 303 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x5d, 0x85, 0x09, 0xd9, 0xc1, 0x51, 0x3c, 0xa8, 0xb8, 0xc3, 0xf6, 0x00, 0x09, 0xc5,
diff --git a/googleapis/ads/googleads/v1/enums/feed_item_target_type.pb.go b/googleapis/ads/googleads/v1/enums/feed_item_target_type.pb.go
index 200f012826..c4930c1894 100644
--- a/googleapis/ads/googleads/v1/enums/feed_item_target_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_item_target_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_item_target_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible type of a feed item target.
 type FeedItemTargetTypeEnum_FeedItemTargetType int32
@@ -42,6 +45,7 @@ var FeedItemTargetTypeEnum_FeedItemTargetType_name = map[int32]string{
 	3: "AD_GROUP",
 	4: "CRITERION",
 }
+
 var FeedItemTargetTypeEnum_FeedItemTargetType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var FeedItemTargetTypeEnum_FeedItemTargetType_value = map[string]int32{
 func (x FeedItemTargetTypeEnum_FeedItemTargetType) String() string {
 	return proto.EnumName(FeedItemTargetTypeEnum_FeedItemTargetType_name, int32(x))
 }
+
 func (FeedItemTargetTypeEnum_FeedItemTargetType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_type_a71e42a041a59521, []int{0, 0}
+	return fileDescriptor_ffc7958087281c9e, []int{0, 0}
 }
 
 // Container for enum describing possible types of a feed item target.
@@ -68,16 +73,17 @@ func (m *FeedItemTargetTypeEnum) Reset()         { *m = FeedItemTargetTypeEnum{}
 func (m *FeedItemTargetTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemTargetTypeEnum) ProtoMessage()    {}
 func (*FeedItemTargetTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_type_a71e42a041a59521, []int{0}
+	return fileDescriptor_ffc7958087281c9e, []int{0}
 }
+
 func (m *FeedItemTargetTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemTargetTypeEnum.Unmarshal(m, b)
 }
 func (m *FeedItemTargetTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemTargetTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemTargetTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemTargetTypeEnum.Merge(dst, src)
+func (m *FeedItemTargetTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemTargetTypeEnum.Merge(m, src)
 }
 func (m *FeedItemTargetTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemTargetTypeEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *FeedItemTargetTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemTargetTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemTargetTypeEnum)(nil), "google.ads.googleads.v1.enums.FeedItemTargetTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedItemTargetTypeEnum_FeedItemTargetType", FeedItemTargetTypeEnum_FeedItemTargetType_name, FeedItemTargetTypeEnum_FeedItemTargetType_value)
+	proto.RegisterType((*FeedItemTargetTypeEnum)(nil), "google.ads.googleads.v1.enums.FeedItemTargetTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_target_type.proto", fileDescriptor_feed_item_target_type_a71e42a041a59521)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_target_type.proto", fileDescriptor_ffc7958087281c9e)
 }
 
-var fileDescriptor_feed_item_target_type_a71e42a041a59521 = []byte{
+var fileDescriptor_ffc7958087281c9e = []byte{
 	// 328 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4a, 0xfb, 0x30,
 	0x1c, 0xfd, 0xaf, 0xfb, 0xe3, 0x47, 0xa6, 0x58, 0x7a, 0xa1, 0x20, 0xee, 0x62, 0x7b, 0x80, 0x94,
diff --git a/googleapis/ads/googleads/v1/enums/feed_item_validation_status.pb.go b/googleapis/ads/googleads/v1/enums/feed_item_validation_status.pb.go
index 0e35562460..db1c5aae24 100644
--- a/googleapis/ads/googleads/v1/enums/feed_item_validation_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_item_validation_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_item_validation_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible validation statuses of a feed item.
 type FeedItemValidationStatusEnum_FeedItemValidationStatus int32
@@ -42,6 +45,7 @@ var FeedItemValidationStatusEnum_FeedItemValidationStatus_name = map[int32]strin
 	3: "INVALID",
 	4: "VALID",
 }
+
 var FeedItemValidationStatusEnum_FeedItemValidationStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var FeedItemValidationStatusEnum_FeedItemValidationStatus_value = map[string]int
 func (x FeedItemValidationStatusEnum_FeedItemValidationStatus) String() string {
 	return proto.EnumName(FeedItemValidationStatusEnum_FeedItemValidationStatus_name, int32(x))
 }
+
 func (FeedItemValidationStatusEnum_FeedItemValidationStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_validation_status_2b319562ff85f2e3, []int{0, 0}
+	return fileDescriptor_e3f43edd0f85e01a, []int{0, 0}
 }
 
 // Container for enum describing possible validation statuses of a feed item.
@@ -68,16 +73,17 @@ func (m *FeedItemValidationStatusEnum) Reset()         { *m = FeedItemValidation
 func (m *FeedItemValidationStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemValidationStatusEnum) ProtoMessage()    {}
 func (*FeedItemValidationStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_validation_status_2b319562ff85f2e3, []int{0}
+	return fileDescriptor_e3f43edd0f85e01a, []int{0}
 }
+
 func (m *FeedItemValidationStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemValidationStatusEnum.Unmarshal(m, b)
 }
 func (m *FeedItemValidationStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemValidationStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemValidationStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemValidationStatusEnum.Merge(dst, src)
+func (m *FeedItemValidationStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemValidationStatusEnum.Merge(m, src)
 }
 func (m *FeedItemValidationStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemValidationStatusEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *FeedItemValidationStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemValidationStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemValidationStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedItemValidationStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedItemValidationStatusEnum_FeedItemValidationStatus", FeedItemValidationStatusEnum_FeedItemValidationStatus_name, FeedItemValidationStatusEnum_FeedItemValidationStatus_value)
+	proto.RegisterType((*FeedItemValidationStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedItemValidationStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_validation_status.proto", fileDescriptor_feed_item_validation_status_2b319562ff85f2e3)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_item_validation_status.proto", fileDescriptor_e3f43edd0f85e01a)
 }
 
-var fileDescriptor_feed_item_validation_status_2b319562ff85f2e3 = []byte{
+var fileDescriptor_e3f43edd0f85e01a = []byte{
 	// 319 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4a, 0x03, 0x31,
 	0x14, 0xc6, 0xed, 0xd4, 0x3f, 0x98, 0x2e, 0x1c, 0x66, 0x25, 0xd2, 0x2e, 0xda, 0x03, 0x64, 0x18,
diff --git a/googleapis/ads/googleads/v1/enums/feed_link_status.pb.go b/googleapis/ads/googleads/v1/enums/feed_link_status.pb.go
index 458093db15..d83cdfdafe 100644
--- a/googleapis/ads/googleads/v1/enums/feed_link_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_link_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_link_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a feed link.
 type FeedLinkStatusEnum_FeedLinkStatus int32
@@ -39,6 +42,7 @@ var FeedLinkStatusEnum_FeedLinkStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var FeedLinkStatusEnum_FeedLinkStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var FeedLinkStatusEnum_FeedLinkStatus_value = map[string]int32{
 func (x FeedLinkStatusEnum_FeedLinkStatus) String() string {
 	return proto.EnumName(FeedLinkStatusEnum_FeedLinkStatus_name, int32(x))
 }
+
 func (FeedLinkStatusEnum_FeedLinkStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_link_status_8ca9533e883427cd, []int{0, 0}
+	return fileDescriptor_23c30109a5e5efe9, []int{0, 0}
 }
 
 // Container for an enum describing possible statuses of a feed link.
@@ -64,16 +69,17 @@ func (m *FeedLinkStatusEnum) Reset()         { *m = FeedLinkStatusEnum{} }
 func (m *FeedLinkStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedLinkStatusEnum) ProtoMessage()    {}
 func (*FeedLinkStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_link_status_8ca9533e883427cd, []int{0}
+	return fileDescriptor_23c30109a5e5efe9, []int{0}
 }
+
 func (m *FeedLinkStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedLinkStatusEnum.Unmarshal(m, b)
 }
 func (m *FeedLinkStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedLinkStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedLinkStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedLinkStatusEnum.Merge(dst, src)
+func (m *FeedLinkStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedLinkStatusEnum.Merge(m, src)
 }
 func (m *FeedLinkStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedLinkStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *FeedLinkStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedLinkStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedLinkStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedLinkStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedLinkStatusEnum_FeedLinkStatus", FeedLinkStatusEnum_FeedLinkStatus_name, FeedLinkStatusEnum_FeedLinkStatus_value)
+	proto.RegisterType((*FeedLinkStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedLinkStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_link_status.proto", fileDescriptor_feed_link_status_8ca9533e883427cd)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_link_status.proto", fileDescriptor_23c30109a5e5efe9)
 }
 
-var fileDescriptor_feed_link_status_8ca9533e883427cd = []byte{
+var fileDescriptor_23c30109a5e5efe9 = []byte{
 	// 302 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x1d, 0x28, 0x64, 0xa0, 0xa5, 0xde, 0xc4, 0x1d, 0xb6, 0x07, 0x48, 0x28, 0x7a, 0x8a,
diff --git a/googleapis/ads/googleads/v1/enums/feed_mapping_criterion_type.pb.go b/googleapis/ads/googleads/v1/enums/feed_mapping_criterion_type.pb.go
index 1c28616b83..bcd74fac3f 100644
--- a/googleapis/ads/googleads/v1/enums/feed_mapping_criterion_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_mapping_criterion_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_mapping_criterion_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible placeholder types for a feed mapping.
 type FeedMappingCriterionTypeEnum_FeedMappingCriterionType int32
@@ -39,6 +42,7 @@ var FeedMappingCriterionTypeEnum_FeedMappingCriterionType_name = map[int32]strin
 	4: "LOCATION_EXTENSION_TARGETING",
 	3: "DSA_PAGE_FEED",
 }
+
 var FeedMappingCriterionTypeEnum_FeedMappingCriterionType_value = map[string]int32{
 	"UNSPECIFIED":                  0,
 	"UNKNOWN":                      1,
@@ -49,8 +53,9 @@ var FeedMappingCriterionTypeEnum_FeedMappingCriterionType_value = map[string]int
 func (x FeedMappingCriterionTypeEnum_FeedMappingCriterionType) String() string {
 	return proto.EnumName(FeedMappingCriterionTypeEnum_FeedMappingCriterionType_name, int32(x))
 }
+
 func (FeedMappingCriterionTypeEnum_FeedMappingCriterionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_criterion_type_6f259ec09688fc9e, []int{0, 0}
+	return fileDescriptor_61e694bc2e8bdf50, []int{0, 0}
 }
 
 // Container for enum describing possible criterion types for a feed mapping.
@@ -64,16 +69,17 @@ func (m *FeedMappingCriterionTypeEnum) Reset()         { *m = FeedMappingCriteri
 func (m *FeedMappingCriterionTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedMappingCriterionTypeEnum) ProtoMessage()    {}
 func (*FeedMappingCriterionTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_criterion_type_6f259ec09688fc9e, []int{0}
+	return fileDescriptor_61e694bc2e8bdf50, []int{0}
 }
+
 func (m *FeedMappingCriterionTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedMappingCriterionTypeEnum.Unmarshal(m, b)
 }
 func (m *FeedMappingCriterionTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedMappingCriterionTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedMappingCriterionTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedMappingCriterionTypeEnum.Merge(dst, src)
+func (m *FeedMappingCriterionTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedMappingCriterionTypeEnum.Merge(m, src)
 }
 func (m *FeedMappingCriterionTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedMappingCriterionTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *FeedMappingCriterionTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedMappingCriterionTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedMappingCriterionTypeEnum)(nil), "google.ads.googleads.v1.enums.FeedMappingCriterionTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedMappingCriterionTypeEnum_FeedMappingCriterionType", FeedMappingCriterionTypeEnum_FeedMappingCriterionType_name, FeedMappingCriterionTypeEnum_FeedMappingCriterionType_value)
+	proto.RegisterType((*FeedMappingCriterionTypeEnum)(nil), "google.ads.googleads.v1.enums.FeedMappingCriterionTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_mapping_criterion_type.proto", fileDescriptor_feed_mapping_criterion_type_6f259ec09688fc9e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_mapping_criterion_type.proto", fileDescriptor_61e694bc2e8bdf50)
 }
 
-var fileDescriptor_feed_mapping_criterion_type_6f259ec09688fc9e = []byte{
+var fileDescriptor_61e694bc2e8bdf50 = []byte{
 	// 344 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x6a, 0xe3, 0x30,
 	0x14, 0x1d, 0x27, 0xc3, 0x0c, 0x28, 0x0c, 0xe3, 0x7a, 0x55, 0x4a, 0x02, 0x4d, 0x0e, 0x20, 0x63,
diff --git a/googleapis/ads/googleads/v1/enums/feed_mapping_status.pb.go b/googleapis/ads/googleads/v1/enums/feed_mapping_status.pb.go
index f37bc393ef..b31713f287 100644
--- a/googleapis/ads/googleads/v1/enums/feed_mapping_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_mapping_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_mapping_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a feed mapping.
 type FeedMappingStatusEnum_FeedMappingStatus int32
@@ -39,6 +42,7 @@ var FeedMappingStatusEnum_FeedMappingStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var FeedMappingStatusEnum_FeedMappingStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var FeedMappingStatusEnum_FeedMappingStatus_value = map[string]int32{
 func (x FeedMappingStatusEnum_FeedMappingStatus) String() string {
 	return proto.EnumName(FeedMappingStatusEnum_FeedMappingStatus_name, int32(x))
 }
+
 func (FeedMappingStatusEnum_FeedMappingStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_status_4cbd153096d872ad, []int{0, 0}
+	return fileDescriptor_c09baf66b1b8fdef, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of a feed mapping.
@@ -64,16 +69,17 @@ func (m *FeedMappingStatusEnum) Reset()         { *m = FeedMappingStatusEnum{} }
 func (m *FeedMappingStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedMappingStatusEnum) ProtoMessage()    {}
 func (*FeedMappingStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_status_4cbd153096d872ad, []int{0}
+	return fileDescriptor_c09baf66b1b8fdef, []int{0}
 }
+
 func (m *FeedMappingStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedMappingStatusEnum.Unmarshal(m, b)
 }
 func (m *FeedMappingStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedMappingStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedMappingStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedMappingStatusEnum.Merge(dst, src)
+func (m *FeedMappingStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedMappingStatusEnum.Merge(m, src)
 }
 func (m *FeedMappingStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedMappingStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *FeedMappingStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedMappingStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedMappingStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedMappingStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedMappingStatusEnum_FeedMappingStatus", FeedMappingStatusEnum_FeedMappingStatus_name, FeedMappingStatusEnum_FeedMappingStatus_value)
+	proto.RegisterType((*FeedMappingStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedMappingStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_mapping_status.proto", fileDescriptor_feed_mapping_status_4cbd153096d872ad)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_mapping_status.proto", fileDescriptor_c09baf66b1b8fdef)
 }
 
-var fileDescriptor_feed_mapping_status_4cbd153096d872ad = []byte{
+var fileDescriptor_c09baf66b1b8fdef = []byte{
 	// 303 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x1d, 0x28, 0x64, 0x07, 0xeb, 0x40, 0x0f, 0xe2, 0x0e, 0xdb, 0x03, 0x24, 0x14, 0x0f,
diff --git a/googleapis/ads/googleads/v1/enums/feed_origin.pb.go b/googleapis/ads/googleads/v1/enums/feed_origin.pb.go
index 1ee52987d1..74436b09e3 100644
--- a/googleapis/ads/googleads/v1/enums/feed_origin.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_origin.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_origin.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for a feed origin.
 type FeedOriginEnum_FeedOrigin int32
@@ -42,6 +45,7 @@ var FeedOriginEnum_FeedOrigin_name = map[int32]string{
 	2: "USER",
 	3: "GOOGLE",
 }
+
 var FeedOriginEnum_FeedOrigin_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -52,8 +56,9 @@ var FeedOriginEnum_FeedOrigin_value = map[string]int32{
 func (x FeedOriginEnum_FeedOrigin) String() string {
 	return proto.EnumName(FeedOriginEnum_FeedOrigin_name, int32(x))
 }
+
 func (FeedOriginEnum_FeedOrigin) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_origin_e721bc225ad36d8a, []int{0, 0}
+	return fileDescriptor_a0e878bed3b5bcf6, []int{0, 0}
 }
 
 // Container for enum describing possible values for a feed origin.
@@ -67,16 +72,17 @@ func (m *FeedOriginEnum) Reset()         { *m = FeedOriginEnum{} }
 func (m *FeedOriginEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedOriginEnum) ProtoMessage()    {}
 func (*FeedOriginEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_origin_e721bc225ad36d8a, []int{0}
+	return fileDescriptor_a0e878bed3b5bcf6, []int{0}
 }
+
 func (m *FeedOriginEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedOriginEnum.Unmarshal(m, b)
 }
 func (m *FeedOriginEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedOriginEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedOriginEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedOriginEnum.Merge(dst, src)
+func (m *FeedOriginEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedOriginEnum.Merge(m, src)
 }
 func (m *FeedOriginEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedOriginEnum.Size(m)
@@ -88,15 +94,15 @@ func (m *FeedOriginEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedOriginEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedOriginEnum)(nil), "google.ads.googleads.v1.enums.FeedOriginEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedOriginEnum_FeedOrigin", FeedOriginEnum_FeedOrigin_name, FeedOriginEnum_FeedOrigin_value)
+	proto.RegisterType((*FeedOriginEnum)(nil), "google.ads.googleads.v1.enums.FeedOriginEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_origin.proto", fileDescriptor_feed_origin_e721bc225ad36d8a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_origin.proto", fileDescriptor_a0e878bed3b5bcf6)
 }
 
-var fileDescriptor_feed_origin_e721bc225ad36d8a = []byte{
+var fileDescriptor_a0e878bed3b5bcf6 = []byte{
 	// 293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x4a, 0xc3, 0x40,
 	0x14, 0x36, 0xa9, 0x54, 0x99, 0x82, 0x0d, 0x59, 0x8a, 0x5d, 0xb4, 0x07, 0x98, 0x21, 0xb8, 0x1b,
diff --git a/googleapis/ads/googleads/v1/enums/feed_status.pb.go b/googleapis/ads/googleads/v1/enums/feed_status.pb.go
index 55b31ab013..fe3b10bfac 100644
--- a/googleapis/ads/googleads/v1/enums/feed_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/feed_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/feed_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a feed.
 type FeedStatusEnum_FeedStatus int32
@@ -39,6 +42,7 @@ var FeedStatusEnum_FeedStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var FeedStatusEnum_FeedStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var FeedStatusEnum_FeedStatus_value = map[string]int32{
 func (x FeedStatusEnum_FeedStatus) String() string {
 	return proto.EnumName(FeedStatusEnum_FeedStatus_name, int32(x))
 }
+
 func (FeedStatusEnum_FeedStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_status_bcef086af951c148, []int{0, 0}
+	return fileDescriptor_0c1344062e272969, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of a feed.
@@ -64,16 +69,17 @@ func (m *FeedStatusEnum) Reset()         { *m = FeedStatusEnum{} }
 func (m *FeedStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedStatusEnum) ProtoMessage()    {}
 func (*FeedStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_status_bcef086af951c148, []int{0}
+	return fileDescriptor_0c1344062e272969, []int{0}
 }
+
 func (m *FeedStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedStatusEnum.Unmarshal(m, b)
 }
 func (m *FeedStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedStatusEnum.Merge(dst, src)
+func (m *FeedStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedStatusEnum.Merge(m, src)
 }
 func (m *FeedStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *FeedStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FeedStatusEnum_FeedStatus", FeedStatusEnum_FeedStatus_name, FeedStatusEnum_FeedStatus_value)
+	proto.RegisterType((*FeedStatusEnum)(nil), "google.ads.googleads.v1.enums.FeedStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/feed_status.proto", fileDescriptor_feed_status_bcef086af951c148)
+	proto.RegisterFile("google/ads/googleads/v1/enums/feed_status.proto", fileDescriptor_0c1344062e272969)
 }
 
-var fileDescriptor_feed_status_bcef086af951c148 = []byte{
+var fileDescriptor_0c1344062e272969 = []byte{
 	// 293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4a, 0xf3, 0x30,
 	0x18, 0xfe, 0xd6, 0xc1, 0x27, 0x64, 0xe0, 0x4a, 0x0f, 0xc5, 0x1d, 0x6c, 0x17, 0x90, 0x50, 0x3c,
diff --git a/googleapis/ads/googleads/v1/enums/flight_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/flight_placeholder_field.pb.go
index 31ddb41b61..d03d0be4c4 100644
--- a/googleapis/ads/googleads/v1/enums/flight_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/flight_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/flight_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Flight placeholder fields.
 type FlightPlaceholderFieldEnum_FlightPlaceholderField int32
@@ -105,6 +108,7 @@ var FlightPlaceholderFieldEnum_FlightPlaceholderField_name = map[int32]string{
 	17: "IOS_APP_LINK",
 	18: "IOS_APP_STORE_ID",
 }
+
 var FlightPlaceholderFieldEnum_FlightPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":             0,
 	"UNKNOWN":                 1,
@@ -130,8 +134,9 @@ var FlightPlaceholderFieldEnum_FlightPlaceholderField_value = map[string]int32{
 func (x FlightPlaceholderFieldEnum_FlightPlaceholderField) String() string {
 	return proto.EnumName(FlightPlaceholderFieldEnum_FlightPlaceholderField_name, int32(x))
 }
+
 func (FlightPlaceholderFieldEnum_FlightPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_flight_placeholder_field_aa0dc850b5bf1d4d, []int{0, 0}
+	return fileDescriptor_f6e95d0d95acaedd, []int{0, 0}
 }
 
 // Values for Flight placeholder fields.
@@ -147,16 +152,17 @@ func (m *FlightPlaceholderFieldEnum) Reset()         { *m = FlightPlaceholderFie
 func (m *FlightPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*FlightPlaceholderFieldEnum) ProtoMessage()    {}
 func (*FlightPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_flight_placeholder_field_aa0dc850b5bf1d4d, []int{0}
+	return fileDescriptor_f6e95d0d95acaedd, []int{0}
 }
+
 func (m *FlightPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FlightPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *FlightPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FlightPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *FlightPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FlightPlaceholderFieldEnum.Merge(dst, src)
+func (m *FlightPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FlightPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *FlightPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_FlightPlaceholderFieldEnum.Size(m)
@@ -168,15 +174,15 @@ func (m *FlightPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FlightPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FlightPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.FlightPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FlightPlaceholderFieldEnum_FlightPlaceholderField", FlightPlaceholderFieldEnum_FlightPlaceholderField_name, FlightPlaceholderFieldEnum_FlightPlaceholderField_value)
+	proto.RegisterType((*FlightPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.FlightPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/flight_placeholder_field.proto", fileDescriptor_flight_placeholder_field_aa0dc850b5bf1d4d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/flight_placeholder_field.proto", fileDescriptor_f6e95d0d95acaedd)
 }
 
-var fileDescriptor_flight_placeholder_field_aa0dc850b5bf1d4d = []byte{
+var fileDescriptor_f6e95d0d95acaedd = []byte{
 	// 497 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xcf, 0x6e, 0xd3, 0x30,
 	0x18, 0xa7, 0x2d, 0x6c, 0xcc, 0xdd, 0x5a, 0xcf, 0x8c, 0x81, 0xc6, 0x76, 0xd8, 0x1e, 0x20, 0x51,
diff --git a/googleapis/ads/googleads/v1/enums/frequency_cap_event_type.pb.go b/googleapis/ads/googleads/v1/enums/frequency_cap_event_type.pb.go
index cc8b86291d..f307c259e1 100644
--- a/googleapis/ads/googleads/v1/enums/frequency_cap_event_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/frequency_cap_event_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/frequency_cap_event_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of event that the cap applies to (e.g. impression).
 type FrequencyCapEventTypeEnum_FrequencyCapEventType int32
@@ -39,6 +42,7 @@ var FrequencyCapEventTypeEnum_FrequencyCapEventType_name = map[int32]string{
 	2: "IMPRESSION",
 	3: "VIDEO_VIEW",
 }
+
 var FrequencyCapEventTypeEnum_FrequencyCapEventType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var FrequencyCapEventTypeEnum_FrequencyCapEventType_value = map[string]int32{
 func (x FrequencyCapEventTypeEnum_FrequencyCapEventType) String() string {
 	return proto.EnumName(FrequencyCapEventTypeEnum_FrequencyCapEventType_name, int32(x))
 }
+
 func (FrequencyCapEventTypeEnum_FrequencyCapEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_event_type_0dbeda690db4d8fa, []int{0, 0}
+	return fileDescriptor_8554d288e454025e, []int{0, 0}
 }
 
 // Container for enum describing the type of event that the cap applies to.
@@ -64,16 +69,17 @@ func (m *FrequencyCapEventTypeEnum) Reset()         { *m = FrequencyCapEventType
 func (m *FrequencyCapEventTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*FrequencyCapEventTypeEnum) ProtoMessage()    {}
 func (*FrequencyCapEventTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_event_type_0dbeda690db4d8fa, []int{0}
+	return fileDescriptor_8554d288e454025e, []int{0}
 }
+
 func (m *FrequencyCapEventTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FrequencyCapEventTypeEnum.Unmarshal(m, b)
 }
 func (m *FrequencyCapEventTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FrequencyCapEventTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *FrequencyCapEventTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FrequencyCapEventTypeEnum.Merge(dst, src)
+func (m *FrequencyCapEventTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FrequencyCapEventTypeEnum.Merge(m, src)
 }
 func (m *FrequencyCapEventTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_FrequencyCapEventTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *FrequencyCapEventTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FrequencyCapEventTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FrequencyCapEventTypeEnum)(nil), "google.ads.googleads.v1.enums.FrequencyCapEventTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FrequencyCapEventTypeEnum_FrequencyCapEventType", FrequencyCapEventTypeEnum_FrequencyCapEventType_name, FrequencyCapEventTypeEnum_FrequencyCapEventType_value)
+	proto.RegisterType((*FrequencyCapEventTypeEnum)(nil), "google.ads.googleads.v1.enums.FrequencyCapEventTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/frequency_cap_event_type.proto", fileDescriptor_frequency_cap_event_type_0dbeda690db4d8fa)
+	proto.RegisterFile("google/ads/googleads/v1/enums/frequency_cap_event_type.proto", fileDescriptor_8554d288e454025e)
 }
 
-var fileDescriptor_frequency_cap_event_type_0dbeda690db4d8fa = []byte{
+var fileDescriptor_8554d288e454025e = []byte{
 	// 320 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x4b, 0xc3, 0x30,
 	0x18, 0x75, 0x1d, 0x28, 0x64, 0xa0, 0xa5, 0xe0, 0xc1, 0xe1, 0x0e, 0xdb, 0x0f, 0x48, 0x29, 0xde,
diff --git a/googleapis/ads/googleads/v1/enums/frequency_cap_level.pb.go b/googleapis/ads/googleads/v1/enums/frequency_cap_level.pb.go
index 58549bf326..1b3d32c537 100644
--- a/googleapis/ads/googleads/v1/enums/frequency_cap_level.pb.go
+++ b/googleapis/ads/googleads/v1/enums/frequency_cap_level.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/frequency_cap_level.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The level on which the cap is to be applied (e.g ad group ad, ad group).
 // Cap is applied to all the resources of this level.
@@ -43,6 +46,7 @@ var FrequencyCapLevelEnum_FrequencyCapLevel_name = map[int32]string{
 	3: "AD_GROUP",
 	4: "CAMPAIGN",
 }
+
 var FrequencyCapLevelEnum_FrequencyCapLevel_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -54,8 +58,9 @@ var FrequencyCapLevelEnum_FrequencyCapLevel_value = map[string]int32{
 func (x FrequencyCapLevelEnum_FrequencyCapLevel) String() string {
 	return proto.EnumName(FrequencyCapLevelEnum_FrequencyCapLevel_name, int32(x))
 }
+
 func (FrequencyCapLevelEnum_FrequencyCapLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_level_44ed939bc5ce921b, []int{0, 0}
+	return fileDescriptor_f3b8ac2167d6463c, []int{0, 0}
 }
 
 // Container for enum describing the level on which the cap is to be applied.
@@ -69,16 +74,17 @@ func (m *FrequencyCapLevelEnum) Reset()         { *m = FrequencyCapLevelEnum{} }
 func (m *FrequencyCapLevelEnum) String() string { return proto.CompactTextString(m) }
 func (*FrequencyCapLevelEnum) ProtoMessage()    {}
 func (*FrequencyCapLevelEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_level_44ed939bc5ce921b, []int{0}
+	return fileDescriptor_f3b8ac2167d6463c, []int{0}
 }
+
 func (m *FrequencyCapLevelEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FrequencyCapLevelEnum.Unmarshal(m, b)
 }
 func (m *FrequencyCapLevelEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FrequencyCapLevelEnum.Marshal(b, m, deterministic)
 }
-func (dst *FrequencyCapLevelEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FrequencyCapLevelEnum.Merge(dst, src)
+func (m *FrequencyCapLevelEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FrequencyCapLevelEnum.Merge(m, src)
 }
 func (m *FrequencyCapLevelEnum) XXX_Size() int {
 	return xxx_messageInfo_FrequencyCapLevelEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *FrequencyCapLevelEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FrequencyCapLevelEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FrequencyCapLevelEnum)(nil), "google.ads.googleads.v1.enums.FrequencyCapLevelEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FrequencyCapLevelEnum_FrequencyCapLevel", FrequencyCapLevelEnum_FrequencyCapLevel_name, FrequencyCapLevelEnum_FrequencyCapLevel_value)
+	proto.RegisterType((*FrequencyCapLevelEnum)(nil), "google.ads.googleads.v1.enums.FrequencyCapLevelEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/frequency_cap_level.proto", fileDescriptor_frequency_cap_level_44ed939bc5ce921b)
+	proto.RegisterFile("google/ads/googleads/v1/enums/frequency_cap_level.proto", fileDescriptor_f3b8ac2167d6463c)
 }
 
-var fileDescriptor_frequency_cap_level_44ed939bc5ce921b = []byte{
+var fileDescriptor_f3b8ac2167d6463c = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4a, 0xfb, 0x30,
 	0x1c, 0xfd, 0xaf, 0xfb, 0xa3, 0x92, 0x09, 0xd6, 0x82, 0x5e, 0x88, 0xbb, 0xd8, 0x1e, 0x20, 0xa1,
diff --git a/googleapis/ads/googleads/v1/enums/frequency_cap_time_unit.pb.go b/googleapis/ads/googleads/v1/enums/frequency_cap_time_unit.pb.go
index ae603cd68b..fe771624fd 100644
--- a/googleapis/ads/googleads/v1/enums/frequency_cap_time_unit.pb.go
+++ b/googleapis/ads/googleads/v1/enums/frequency_cap_time_unit.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/frequency_cap_time_unit.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Unit of time the cap is defined at (e.g. day, week).
 type FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit int32
@@ -42,6 +45,7 @@ var FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit_name = map[int32]string{
 	3: "WEEK",
 	4: "MONTH",
 }
+
 var FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit_value = map[string]int32{
 func (x FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit) String() string {
 	return proto.EnumName(FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit_name, int32(x))
 }
+
 func (FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_time_unit_8ca53ecbfb0650e3, []int{0, 0}
+	return fileDescriptor_73a84d0af80e92fc, []int{0, 0}
 }
 
 // Container for enum describing the unit of time the cap is defined at.
@@ -68,16 +73,17 @@ func (m *FrequencyCapTimeUnitEnum) Reset()         { *m = FrequencyCapTimeUnitEn
 func (m *FrequencyCapTimeUnitEnum) String() string { return proto.CompactTextString(m) }
 func (*FrequencyCapTimeUnitEnum) ProtoMessage()    {}
 func (*FrequencyCapTimeUnitEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_frequency_cap_time_unit_8ca53ecbfb0650e3, []int{0}
+	return fileDescriptor_73a84d0af80e92fc, []int{0}
 }
+
 func (m *FrequencyCapTimeUnitEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FrequencyCapTimeUnitEnum.Unmarshal(m, b)
 }
 func (m *FrequencyCapTimeUnitEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FrequencyCapTimeUnitEnum.Marshal(b, m, deterministic)
 }
-func (dst *FrequencyCapTimeUnitEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FrequencyCapTimeUnitEnum.Merge(dst, src)
+func (m *FrequencyCapTimeUnitEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FrequencyCapTimeUnitEnum.Merge(m, src)
 }
 func (m *FrequencyCapTimeUnitEnum) XXX_Size() int {
 	return xxx_messageInfo_FrequencyCapTimeUnitEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *FrequencyCapTimeUnitEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FrequencyCapTimeUnitEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FrequencyCapTimeUnitEnum)(nil), "google.ads.googleads.v1.enums.FrequencyCapTimeUnitEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit", FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit_name, FrequencyCapTimeUnitEnum_FrequencyCapTimeUnit_value)
+	proto.RegisterType((*FrequencyCapTimeUnitEnum)(nil), "google.ads.googleads.v1.enums.FrequencyCapTimeUnitEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/frequency_cap_time_unit.proto", fileDescriptor_frequency_cap_time_unit_8ca53ecbfb0650e3)
+	proto.RegisterFile("google/ads/googleads/v1/enums/frequency_cap_time_unit.proto", fileDescriptor_73a84d0af80e92fc)
 }
 
-var fileDescriptor_frequency_cap_time_unit_8ca53ecbfb0650e3 = []byte{
+var fileDescriptor_73a84d0af80e92fc = []byte{
 	// 324 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4e, 0xf2, 0x40,
 	0x14, 0xc5, 0x3f, 0x0a, 0x9f, 0xe8, 0xb0, 0xb0, 0x69, 0x5c, 0xa8, 0x91, 0x05, 0x3c, 0xc0, 0x34,
diff --git a/googleapis/ads/googleads/v1/enums/gender_type.pb.go b/googleapis/ads/googleads/v1/enums/gender_type.pb.go
index fe3a3bc725..f452d6e553 100644
--- a/googleapis/ads/googleads/v1/enums/gender_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/gender_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/gender_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of demographic genders (e.g. female).
 type GenderTypeEnum_GenderType int32
@@ -42,6 +45,7 @@ var GenderTypeEnum_GenderType_name = map[int32]string{
 	11: "FEMALE",
 	20: "UNDETERMINED",
 }
+
 var GenderTypeEnum_GenderType_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -53,8 +57,9 @@ var GenderTypeEnum_GenderType_value = map[string]int32{
 func (x GenderTypeEnum_GenderType) String() string {
 	return proto.EnumName(GenderTypeEnum_GenderType_name, int32(x))
 }
+
 func (GenderTypeEnum_GenderType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_gender_type_4c2fe868c930bc6b, []int{0, 0}
+	return fileDescriptor_206c2dcb587dc8cf, []int{0, 0}
 }
 
 // Container for enum describing the type of demographic genders.
@@ -68,16 +73,17 @@ func (m *GenderTypeEnum) Reset()         { *m = GenderTypeEnum{} }
 func (m *GenderTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*GenderTypeEnum) ProtoMessage()    {}
 func (*GenderTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_gender_type_4c2fe868c930bc6b, []int{0}
+	return fileDescriptor_206c2dcb587dc8cf, []int{0}
 }
+
 func (m *GenderTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenderTypeEnum.Unmarshal(m, b)
 }
 func (m *GenderTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenderTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *GenderTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenderTypeEnum.Merge(dst, src)
+func (m *GenderTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenderTypeEnum.Merge(m, src)
 }
 func (m *GenderTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_GenderTypeEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *GenderTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_GenderTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*GenderTypeEnum)(nil), "google.ads.googleads.v1.enums.GenderTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.GenderTypeEnum_GenderType", GenderTypeEnum_GenderType_name, GenderTypeEnum_GenderType_value)
+	proto.RegisterType((*GenderTypeEnum)(nil), "google.ads.googleads.v1.enums.GenderTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/gender_type.proto", fileDescriptor_gender_type_4c2fe868c930bc6b)
+	proto.RegisterFile("google/ads/googleads/v1/enums/gender_type.proto", fileDescriptor_206c2dcb587dc8cf)
 }
 
-var fileDescriptor_gender_type_4c2fe868c930bc6b = []byte{
+var fileDescriptor_206c2dcb587dc8cf = []byte{
 	// 305 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x1c, 0x76, 0x53, 0xa6, 0xfc, 0x26, 0xae, 0x04, 0x4f, 0xe2, 0x0e, 0xdb, 0x03, 0xa4, 0x14, 0x6f,
diff --git a/googleapis/ads/googleads/v1/enums/geo_target_constant_status.pb.go b/googleapis/ads/googleads/v1/enums/geo_target_constant_status.pb.go
index f338b9a2ef..717b06a032 100644
--- a/googleapis/ads/googleads/v1/enums/geo_target_constant_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/geo_target_constant_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/geo_target_constant_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible statuses of a geo target constant.
 type GeoTargetConstantStatusEnum_GeoTargetConstantStatus int32
@@ -41,6 +44,7 @@ var GeoTargetConstantStatusEnum_GeoTargetConstantStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVAL_PLANNED",
 }
+
 var GeoTargetConstantStatusEnum_GeoTargetConstantStatus_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -51,8 +55,9 @@ var GeoTargetConstantStatusEnum_GeoTargetConstantStatus_value = map[string]int32
 func (x GeoTargetConstantStatusEnum_GeoTargetConstantStatus) String() string {
 	return proto.EnumName(GeoTargetConstantStatusEnum_GeoTargetConstantStatus_name, int32(x))
 }
+
 func (GeoTargetConstantStatusEnum_GeoTargetConstantStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_status_d39400cdaf0b42fd, []int{0, 0}
+	return fileDescriptor_67dba27e8548264d, []int{0, 0}
 }
 
 // Container for describing the status of a geo target constant.
@@ -66,16 +71,17 @@ func (m *GeoTargetConstantStatusEnum) Reset()         { *m = GeoTargetConstantSt
 func (m *GeoTargetConstantStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*GeoTargetConstantStatusEnum) ProtoMessage()    {}
 func (*GeoTargetConstantStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_status_d39400cdaf0b42fd, []int{0}
+	return fileDescriptor_67dba27e8548264d, []int{0}
 }
+
 func (m *GeoTargetConstantStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoTargetConstantStatusEnum.Unmarshal(m, b)
 }
 func (m *GeoTargetConstantStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoTargetConstantStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *GeoTargetConstantStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoTargetConstantStatusEnum.Merge(dst, src)
+func (m *GeoTargetConstantStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoTargetConstantStatusEnum.Merge(m, src)
 }
 func (m *GeoTargetConstantStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_GeoTargetConstantStatusEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *GeoTargetConstantStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_GeoTargetConstantStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*GeoTargetConstantStatusEnum)(nil), "google.ads.googleads.v1.enums.GeoTargetConstantStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.GeoTargetConstantStatusEnum_GeoTargetConstantStatus", GeoTargetConstantStatusEnum_GeoTargetConstantStatus_name, GeoTargetConstantStatusEnum_GeoTargetConstantStatus_value)
+	proto.RegisterType((*GeoTargetConstantStatusEnum)(nil), "google.ads.googleads.v1.enums.GeoTargetConstantStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/geo_target_constant_status.proto", fileDescriptor_geo_target_constant_status_d39400cdaf0b42fd)
+	proto.RegisterFile("google/ads/googleads/v1/enums/geo_target_constant_status.proto", fileDescriptor_67dba27e8548264d)
 }
 
-var fileDescriptor_geo_target_constant_status_d39400cdaf0b42fd = []byte{
+var fileDescriptor_67dba27e8548264d = []byte{
 	// 321 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x6a, 0xf2, 0x30,
 	0x18, 0xfd, 0xad, 0xf0, 0x0f, 0xe2, 0x85, 0xa5, 0xbb, 0x18, 0x6c, 0x7a, 0xa1, 0x0f, 0x90, 0x52,
diff --git a/googleapis/ads/googleads/v1/enums/geo_targeting_restriction.pb.go b/googleapis/ads/googleads/v1/enums/geo_targeting_restriction.pb.go
index 9106e9bf13..0aa645b88a 100644
--- a/googleapis/ads/googleads/v1/enums/geo_targeting_restriction.pb.go
+++ b/googleapis/ads/googleads/v1/enums/geo_targeting_restriction.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/geo_targeting_restriction.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A restriction used to determine if the request context's
 // geo should be matched.
@@ -38,6 +41,7 @@ var GeoTargetingRestrictionEnum_GeoTargetingRestriction_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "LOCATION_OF_PRESENCE",
 }
+
 var GeoTargetingRestrictionEnum_GeoTargetingRestriction_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -47,8 +51,9 @@ var GeoTargetingRestrictionEnum_GeoTargetingRestriction_value = map[string]int32
 func (x GeoTargetingRestrictionEnum_GeoTargetingRestriction) String() string {
 	return proto.EnumName(GeoTargetingRestrictionEnum_GeoTargetingRestriction_name, int32(x))
 }
+
 func (GeoTargetingRestrictionEnum_GeoTargetingRestriction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_geo_targeting_restriction_40a83d06ddfa34b9, []int{0, 0}
+	return fileDescriptor_bda5cebc24d80c9b, []int{0, 0}
 }
 
 // Message describing feed item geo targeting restriction.
@@ -62,16 +67,17 @@ func (m *GeoTargetingRestrictionEnum) Reset()         { *m = GeoTargetingRestric
 func (m *GeoTargetingRestrictionEnum) String() string { return proto.CompactTextString(m) }
 func (*GeoTargetingRestrictionEnum) ProtoMessage()    {}
 func (*GeoTargetingRestrictionEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_targeting_restriction_40a83d06ddfa34b9, []int{0}
+	return fileDescriptor_bda5cebc24d80c9b, []int{0}
 }
+
 func (m *GeoTargetingRestrictionEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoTargetingRestrictionEnum.Unmarshal(m, b)
 }
 func (m *GeoTargetingRestrictionEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoTargetingRestrictionEnum.Marshal(b, m, deterministic)
 }
-func (dst *GeoTargetingRestrictionEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoTargetingRestrictionEnum.Merge(dst, src)
+func (m *GeoTargetingRestrictionEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoTargetingRestrictionEnum.Merge(m, src)
 }
 func (m *GeoTargetingRestrictionEnum) XXX_Size() int {
 	return xxx_messageInfo_GeoTargetingRestrictionEnum.Size(m)
@@ -83,15 +89,15 @@ func (m *GeoTargetingRestrictionEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_GeoTargetingRestrictionEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*GeoTargetingRestrictionEnum)(nil), "google.ads.googleads.v1.enums.GeoTargetingRestrictionEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.GeoTargetingRestrictionEnum_GeoTargetingRestriction", GeoTargetingRestrictionEnum_GeoTargetingRestriction_name, GeoTargetingRestrictionEnum_GeoTargetingRestriction_value)
+	proto.RegisterType((*GeoTargetingRestrictionEnum)(nil), "google.ads.googleads.v1.enums.GeoTargetingRestrictionEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/geo_targeting_restriction.proto", fileDescriptor_geo_targeting_restriction_40a83d06ddfa34b9)
+	proto.RegisterFile("google/ads/googleads/v1/enums/geo_targeting_restriction.proto", fileDescriptor_bda5cebc24d80c9b)
 }
 
-var fileDescriptor_geo_targeting_restriction_40a83d06ddfa34b9 = []byte{
+var fileDescriptor_bda5cebc24d80c9b = []byte{
 	// 313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4a, 0x2b, 0x31,
 	0x18, 0xc5, 0x6f, 0xe7, 0x82, 0x42, 0xba, 0xb0, 0x0c, 0x82, 0xa2, 0xed, 0xa2, 0x7d, 0x80, 0x84,
diff --git a/googleapis/ads/googleads/v1/enums/geo_targeting_type.pb.go b/googleapis/ads/googleads/v1/enums/geo_targeting_type.pb.go
index 7f9f9027be..caa75a8365 100644
--- a/googleapis/ads/googleads/v1/enums/geo_targeting_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/geo_targeting_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/geo_targeting_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible geo targeting types.
 type GeoTargetingTypeEnum_GeoTargetingType int32
@@ -39,6 +42,7 @@ var GeoTargetingTypeEnum_GeoTargetingType_name = map[int32]string{
 	2: "AREA_OF_INTEREST",
 	3: "LOCATION_OF_PRESENCE",
 }
+
 var GeoTargetingTypeEnum_GeoTargetingType_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -49,8 +53,9 @@ var GeoTargetingTypeEnum_GeoTargetingType_value = map[string]int32{
 func (x GeoTargetingTypeEnum_GeoTargetingType) String() string {
 	return proto.EnumName(GeoTargetingTypeEnum_GeoTargetingType_name, int32(x))
 }
+
 func (GeoTargetingTypeEnum_GeoTargetingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_geo_targeting_type_16c0620d49cd437f, []int{0, 0}
+	return fileDescriptor_9acbd086c416c55e, []int{0, 0}
 }
 
 // Container for enum describing possible geo targeting types.
@@ -64,16 +69,17 @@ func (m *GeoTargetingTypeEnum) Reset()         { *m = GeoTargetingTypeEnum{} }
 func (m *GeoTargetingTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*GeoTargetingTypeEnum) ProtoMessage()    {}
 func (*GeoTargetingTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_targeting_type_16c0620d49cd437f, []int{0}
+	return fileDescriptor_9acbd086c416c55e, []int{0}
 }
+
 func (m *GeoTargetingTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoTargetingTypeEnum.Unmarshal(m, b)
 }
 func (m *GeoTargetingTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoTargetingTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *GeoTargetingTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoTargetingTypeEnum.Merge(dst, src)
+func (m *GeoTargetingTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoTargetingTypeEnum.Merge(m, src)
 }
 func (m *GeoTargetingTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_GeoTargetingTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *GeoTargetingTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_GeoTargetingTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*GeoTargetingTypeEnum)(nil), "google.ads.googleads.v1.enums.GeoTargetingTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.GeoTargetingTypeEnum_GeoTargetingType", GeoTargetingTypeEnum_GeoTargetingType_name, GeoTargetingTypeEnum_GeoTargetingType_value)
+	proto.RegisterType((*GeoTargetingTypeEnum)(nil), "google.ads.googleads.v1.enums.GeoTargetingTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/geo_targeting_type.proto", fileDescriptor_geo_targeting_type_16c0620d49cd437f)
+	proto.RegisterFile("google/ads/googleads/v1/enums/geo_targeting_type.proto", fileDescriptor_9acbd086c416c55e)
 }
 
-var fileDescriptor_geo_targeting_type_16c0620d49cd437f = []byte{
+var fileDescriptor_9acbd086c416c55e = []byte{
 	// 323 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xf3, 0x30,
 	0x1c, 0xfd, 0xd6, 0xc1, 0x27, 0x64, 0x17, 0x96, 0x32, 0x41, 0xc4, 0x5d, 0x6c, 0x0f, 0x90, 0x52,
diff --git a/googleapis/ads/googleads/v1/enums/google_ads_field_category.pb.go b/googleapis/ads/googleads/v1/enums/google_ads_field_category.pb.go
index d6557fa914..dde021677e 100644
--- a/googleapis/ads/googleads/v1/enums/google_ads_field_category.pb.go
+++ b/googleapis/ads/googleads/v1/enums/google_ads_field_category.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/google_ads_field_category.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The category of the artifact.
 type GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory int32
@@ -49,6 +52,7 @@ var GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory_name = map[int32]string{
 	5: "SEGMENT",
 	6: "METRIC",
 }
+
 var GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -61,8 +65,9 @@ var GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory_value = map[string]int32{
 func (x GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory) String() string {
 	return proto.EnumName(GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory_name, int32(x))
 }
+
 func (GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_category_e668ad533e427a2f, []int{0, 0}
+	return fileDescriptor_c71ec81f0f9a2c8e, []int{0, 0}
 }
 
 // Container for enum that determines if the described artifact is a resource
@@ -77,16 +82,17 @@ func (m *GoogleAdsFieldCategoryEnum) Reset()         { *m = GoogleAdsFieldCatego
 func (m *GoogleAdsFieldCategoryEnum) String() string { return proto.CompactTextString(m) }
 func (*GoogleAdsFieldCategoryEnum) ProtoMessage()    {}
 func (*GoogleAdsFieldCategoryEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_category_e668ad533e427a2f, []int{0}
+	return fileDescriptor_c71ec81f0f9a2c8e, []int{0}
 }
+
 func (m *GoogleAdsFieldCategoryEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoogleAdsFieldCategoryEnum.Unmarshal(m, b)
 }
 func (m *GoogleAdsFieldCategoryEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoogleAdsFieldCategoryEnum.Marshal(b, m, deterministic)
 }
-func (dst *GoogleAdsFieldCategoryEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoogleAdsFieldCategoryEnum.Merge(dst, src)
+func (m *GoogleAdsFieldCategoryEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleAdsFieldCategoryEnum.Merge(m, src)
 }
 func (m *GoogleAdsFieldCategoryEnum) XXX_Size() int {
 	return xxx_messageInfo_GoogleAdsFieldCategoryEnum.Size(m)
@@ -98,15 +104,15 @@ func (m *GoogleAdsFieldCategoryEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_GoogleAdsFieldCategoryEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*GoogleAdsFieldCategoryEnum)(nil), "google.ads.googleads.v1.enums.GoogleAdsFieldCategoryEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory", GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory_name, GoogleAdsFieldCategoryEnum_GoogleAdsFieldCategory_value)
+	proto.RegisterType((*GoogleAdsFieldCategoryEnum)(nil), "google.ads.googleads.v1.enums.GoogleAdsFieldCategoryEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/google_ads_field_category.proto", fileDescriptor_google_ads_field_category_e668ad533e427a2f)
+	proto.RegisterFile("google/ads/googleads/v1/enums/google_ads_field_category.proto", fileDescriptor_c71ec81f0f9a2c8e)
 }
 
-var fileDescriptor_google_ads_field_category_e668ad533e427a2f = []byte{
+var fileDescriptor_c71ec81f0f9a2c8e = []byte{
 	// 336 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0xb7, 0x1d, 0x4e, 0xcd, 0x14, 0x4b, 0x0f, 0x1e, 0xa6, 0x3b, 0x6c, 0x0f, 0x90, 0x52, 0xbc,
diff --git a/googleapis/ads/googleads/v1/enums/google_ads_field_data_type.pb.go b/googleapis/ads/googleads/v1/enums/google_ads_field_data_type.pb.go
index db4acc259b..e40810476c 100644
--- a/googleapis/ads/googleads/v1/enums/google_ads_field_data_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/google_ads_field_data_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/google_ads_field_data_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // These are the various types a GoogleAdsService artifact may take on.
 type GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType int32
@@ -86,6 +89,7 @@ var GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType_name = map[int32]string{
 	10: "RESOURCE_NAME",
 	11: "STRING",
 }
+
 var GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -104,8 +108,9 @@ var GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType_value = map[string]int32{
 func (x GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType) String() string {
 	return proto.EnumName(GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType_name, int32(x))
 }
+
 func (GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_data_type_3292bb2809ac3276, []int{0, 0}
+	return fileDescriptor_d86b5d9b002287f6, []int{0, 0}
 }
 
 // Container holding the various data types.
@@ -119,16 +124,17 @@ func (m *GoogleAdsFieldDataTypeEnum) Reset()         { *m = GoogleAdsFieldDataTy
 func (m *GoogleAdsFieldDataTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*GoogleAdsFieldDataTypeEnum) ProtoMessage()    {}
 func (*GoogleAdsFieldDataTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_data_type_3292bb2809ac3276, []int{0}
+	return fileDescriptor_d86b5d9b002287f6, []int{0}
 }
+
 func (m *GoogleAdsFieldDataTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoogleAdsFieldDataTypeEnum.Unmarshal(m, b)
 }
 func (m *GoogleAdsFieldDataTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoogleAdsFieldDataTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *GoogleAdsFieldDataTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoogleAdsFieldDataTypeEnum.Merge(dst, src)
+func (m *GoogleAdsFieldDataTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleAdsFieldDataTypeEnum.Merge(m, src)
 }
 func (m *GoogleAdsFieldDataTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_GoogleAdsFieldDataTypeEnum.Size(m)
@@ -140,15 +146,15 @@ func (m *GoogleAdsFieldDataTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_GoogleAdsFieldDataTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*GoogleAdsFieldDataTypeEnum)(nil), "google.ads.googleads.v1.enums.GoogleAdsFieldDataTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType", GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType_name, GoogleAdsFieldDataTypeEnum_GoogleAdsFieldDataType_value)
+	proto.RegisterType((*GoogleAdsFieldDataTypeEnum)(nil), "google.ads.googleads.v1.enums.GoogleAdsFieldDataTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/google_ads_field_data_type.proto", fileDescriptor_google_ads_field_data_type_3292bb2809ac3276)
+	proto.RegisterFile("google/ads/googleads/v1/enums/google_ads_field_data_type.proto", fileDescriptor_d86b5d9b002287f6)
 }
 
-var fileDescriptor_google_ads_field_data_type_3292bb2809ac3276 = []byte{
+var fileDescriptor_d86b5d9b002287f6 = []byte{
 	// 392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xcf, 0x8e, 0x93, 0x40,
 	0x18, 0x17, 0x76, 0xb7, 0xbb, 0x3b, 0x8d, 0x71, 0xe4, 0xe0, 0x61, 0x75, 0x0f, 0xbb, 0x0f, 0x30,
diff --git a/googleapis/ads/googleads/v1/enums/hotel_date_selection_type.pb.go b/googleapis/ads/googleads/v1/enums/hotel_date_selection_type.pb.go
index 08ad04cd5e..b87dbc451e 100644
--- a/googleapis/ads/googleads/v1/enums/hotel_date_selection_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/hotel_date_selection_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/hotel_date_selection_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible hotel date selection types.
 type HotelDateSelectionTypeEnum_HotelDateSelectionType int32
@@ -39,6 +42,7 @@ var HotelDateSelectionTypeEnum_HotelDateSelectionType_name = map[int32]string{
 	50: "DEFAULT_SELECTION",
 	51: "USER_SELECTED",
 }
+
 var HotelDateSelectionTypeEnum_HotelDateSelectionType_value = map[string]int32{
 	"UNSPECIFIED":       0,
 	"UNKNOWN":           1,
@@ -49,8 +53,9 @@ var HotelDateSelectionTypeEnum_HotelDateSelectionType_value = map[string]int32{
 func (x HotelDateSelectionTypeEnum_HotelDateSelectionType) String() string {
 	return proto.EnumName(HotelDateSelectionTypeEnum_HotelDateSelectionType_name, int32(x))
 }
+
 func (HotelDateSelectionTypeEnum_HotelDateSelectionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_date_selection_type_19278eff2b88f900, []int{0, 0}
+	return fileDescriptor_df390d4eb95bf882, []int{0, 0}
 }
 
 // Container for enum describing possible hotel date selection types
@@ -64,16 +69,17 @@ func (m *HotelDateSelectionTypeEnum) Reset()         { *m = HotelDateSelectionTy
 func (m *HotelDateSelectionTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*HotelDateSelectionTypeEnum) ProtoMessage()    {}
 func (*HotelDateSelectionTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_date_selection_type_19278eff2b88f900, []int{0}
+	return fileDescriptor_df390d4eb95bf882, []int{0}
 }
+
 func (m *HotelDateSelectionTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelDateSelectionTypeEnum.Unmarshal(m, b)
 }
 func (m *HotelDateSelectionTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelDateSelectionTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *HotelDateSelectionTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelDateSelectionTypeEnum.Merge(dst, src)
+func (m *HotelDateSelectionTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelDateSelectionTypeEnum.Merge(m, src)
 }
 func (m *HotelDateSelectionTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_HotelDateSelectionTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *HotelDateSelectionTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_HotelDateSelectionTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*HotelDateSelectionTypeEnum)(nil), "google.ads.googleads.v1.enums.HotelDateSelectionTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.HotelDateSelectionTypeEnum_HotelDateSelectionType", HotelDateSelectionTypeEnum_HotelDateSelectionType_name, HotelDateSelectionTypeEnum_HotelDateSelectionType_value)
+	proto.RegisterType((*HotelDateSelectionTypeEnum)(nil), "google.ads.googleads.v1.enums.HotelDateSelectionTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/hotel_date_selection_type.proto", fileDescriptor_hotel_date_selection_type_19278eff2b88f900)
+	proto.RegisterFile("google/ads/googleads/v1/enums/hotel_date_selection_type.proto", fileDescriptor_df390d4eb95bf882)
 }
 
-var fileDescriptor_hotel_date_selection_type_19278eff2b88f900 = []byte{
+var fileDescriptor_df390d4eb95bf882 = []byte{
 	// 329 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xc1, 0x4e, 0xc2, 0x40,
 	0x14, 0x14, 0x4c, 0x34, 0x59, 0x62, 0x2c, 0x4d, 0xf4, 0x80, 0x72, 0x80, 0x0f, 0xd8, 0xa6, 0x72,
diff --git a/googleapis/ads/googleads/v1/enums/hotel_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/hotel_placeholder_field.pb.go
index b43af9b48e..424b83793e 100644
--- a/googleapis/ads/googleads/v1/enums/hotel_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/hotel_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/hotel_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Hotel placeholder fields.
 type HotelPlaceholderFieldEnum_HotelPlaceholderField int32
@@ -111,6 +114,7 @@ var HotelPlaceholderFieldEnum_HotelPlaceholderField_name = map[int32]string{
 	20: "IOS_APP_LINK",
 	21: "IOS_APP_STORE_ID",
 }
+
 var HotelPlaceholderFieldEnum_HotelPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -139,8 +143,9 @@ var HotelPlaceholderFieldEnum_HotelPlaceholderField_value = map[string]int32{
 func (x HotelPlaceholderFieldEnum_HotelPlaceholderField) String() string {
 	return proto.EnumName(HotelPlaceholderFieldEnum_HotelPlaceholderField_name, int32(x))
 }
+
 func (HotelPlaceholderFieldEnum_HotelPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_placeholder_field_f3cb215d888e27b9, []int{0, 0}
+	return fileDescriptor_eb9adf95cad007a6, []int{0, 0}
 }
 
 // Values for Hotel placeholder fields.
@@ -156,16 +161,17 @@ func (m *HotelPlaceholderFieldEnum) Reset()         { *m = HotelPlaceholderField
 func (m *HotelPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*HotelPlaceholderFieldEnum) ProtoMessage()    {}
 func (*HotelPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_placeholder_field_f3cb215d888e27b9, []int{0}
+	return fileDescriptor_eb9adf95cad007a6, []int{0}
 }
+
 func (m *HotelPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *HotelPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *HotelPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelPlaceholderFieldEnum.Merge(dst, src)
+func (m *HotelPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *HotelPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_HotelPlaceholderFieldEnum.Size(m)
@@ -177,15 +183,15 @@ func (m *HotelPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_HotelPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*HotelPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.HotelPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.HotelPlaceholderFieldEnum_HotelPlaceholderField", HotelPlaceholderFieldEnum_HotelPlaceholderField_name, HotelPlaceholderFieldEnum_HotelPlaceholderField_value)
+	proto.RegisterType((*HotelPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.HotelPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/hotel_placeholder_field.proto", fileDescriptor_hotel_placeholder_field_f3cb215d888e27b9)
+	proto.RegisterFile("google/ads/googleads/v1/enums/hotel_placeholder_field.proto", fileDescriptor_eb9adf95cad007a6)
 }
 
-var fileDescriptor_hotel_placeholder_field_f3cb215d888e27b9 = []byte{
+var fileDescriptor_eb9adf95cad007a6 = []byte{
 	// 531 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x6e, 0xda, 0x30,
 	0x18, 0x5d, 0x61, 0xfd, 0x73, 0xa1, 0x18, 0x03, 0xda, 0x6f, 0x2f, 0xda, 0x07, 0x48, 0x84, 0x76,
diff --git a/googleapis/ads/googleads/v1/enums/income_range_type.pb.go b/googleapis/ads/googleads/v1/enums/income_range_type.pb.go
index f0c7b627ec..22db92d4ec 100644
--- a/googleapis/ads/googleads/v1/enums/income_range_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/income_range_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/income_range_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of demographic income ranges (e.g. between 0% to 50%).
 type IncomeRangeTypeEnum_IncomeRangeType int32
@@ -54,6 +57,7 @@ var IncomeRangeTypeEnum_IncomeRangeType_name = map[int32]string{
 	510006: "INCOME_RANGE_90_UP",
 	510000: "INCOME_RANGE_UNDETERMINED",
 }
+
 var IncomeRangeTypeEnum_IncomeRangeType_value = map[string]int32{
 	"UNSPECIFIED":               0,
 	"UNKNOWN":                   1,
@@ -69,8 +73,9 @@ var IncomeRangeTypeEnum_IncomeRangeType_value = map[string]int32{
 func (x IncomeRangeTypeEnum_IncomeRangeType) String() string {
 	return proto.EnumName(IncomeRangeTypeEnum_IncomeRangeType_name, int32(x))
 }
+
 func (IncomeRangeTypeEnum_IncomeRangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_income_range_type_739e42fc80e579be, []int{0, 0}
+	return fileDescriptor_30cf189a92b3abfe, []int{0, 0}
 }
 
 // Container for enum describing the type of demographic income ranges.
@@ -84,16 +89,17 @@ func (m *IncomeRangeTypeEnum) Reset()         { *m = IncomeRangeTypeEnum{} }
 func (m *IncomeRangeTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*IncomeRangeTypeEnum) ProtoMessage()    {}
 func (*IncomeRangeTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_income_range_type_739e42fc80e579be, []int{0}
+	return fileDescriptor_30cf189a92b3abfe, []int{0}
 }
+
 func (m *IncomeRangeTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IncomeRangeTypeEnum.Unmarshal(m, b)
 }
 func (m *IncomeRangeTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IncomeRangeTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *IncomeRangeTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IncomeRangeTypeEnum.Merge(dst, src)
+func (m *IncomeRangeTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IncomeRangeTypeEnum.Merge(m, src)
 }
 func (m *IncomeRangeTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_IncomeRangeTypeEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *IncomeRangeTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_IncomeRangeTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*IncomeRangeTypeEnum)(nil), "google.ads.googleads.v1.enums.IncomeRangeTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.IncomeRangeTypeEnum_IncomeRangeType", IncomeRangeTypeEnum_IncomeRangeType_name, IncomeRangeTypeEnum_IncomeRangeType_value)
+	proto.RegisterType((*IncomeRangeTypeEnum)(nil), "google.ads.googleads.v1.enums.IncomeRangeTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/income_range_type.proto", fileDescriptor_income_range_type_739e42fc80e579be)
+	proto.RegisterFile("google/ads/googleads/v1/enums/income_range_type.proto", fileDescriptor_30cf189a92b3abfe)
 }
 
-var fileDescriptor_income_range_type_739e42fc80e579be = []byte{
+var fileDescriptor_30cf189a92b3abfe = []byte{
 	// 385 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x5d, 0xca, 0xd3, 0x40,
 	0x18, 0x85, 0x4d, 0x04, 0x85, 0xf9, 0x2e, 0xbe, 0x31, 0x0a, 0xfe, 0xe0, 0x47, 0x68, 0x17, 0x30,
diff --git a/googleapis/ads/googleads/v1/enums/interaction_event_type.pb.go b/googleapis/ads/googleads/v1/enums/interaction_event_type.pb.go
index 6f8b1b5bc4..e85f8558c2 100644
--- a/googleapis/ads/googleads/v1/enums/interaction_event_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/interaction_event_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/interaction_event_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible types of payable and free interactions.
 type InteractionEventTypeEnum_InteractionEventType int32
@@ -51,6 +54,7 @@ var InteractionEventTypeEnum_InteractionEventType_name = map[int32]string{
 	4: "VIDEO_VIEW",
 	5: "NONE",
 }
+
 var InteractionEventTypeEnum_InteractionEventType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -63,8 +67,9 @@ var InteractionEventTypeEnum_InteractionEventType_value = map[string]int32{
 func (x InteractionEventTypeEnum_InteractionEventType) String() string {
 	return proto.EnumName(InteractionEventTypeEnum_InteractionEventType_name, int32(x))
 }
+
 func (InteractionEventTypeEnum_InteractionEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_interaction_event_type_18ad80b1ed99b3b2, []int{0, 0}
+	return fileDescriptor_e68f43996bbfc12e, []int{0, 0}
 }
 
 // Container for enum describing types of payable and free interactions.
@@ -78,16 +83,17 @@ func (m *InteractionEventTypeEnum) Reset()         { *m = InteractionEventTypeEn
 func (m *InteractionEventTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*InteractionEventTypeEnum) ProtoMessage()    {}
 func (*InteractionEventTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_interaction_event_type_18ad80b1ed99b3b2, []int{0}
+	return fileDescriptor_e68f43996bbfc12e, []int{0}
 }
+
 func (m *InteractionEventTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InteractionEventTypeEnum.Unmarshal(m, b)
 }
 func (m *InteractionEventTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InteractionEventTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *InteractionEventTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InteractionEventTypeEnum.Merge(dst, src)
+func (m *InteractionEventTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InteractionEventTypeEnum.Merge(m, src)
 }
 func (m *InteractionEventTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_InteractionEventTypeEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *InteractionEventTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_InteractionEventTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*InteractionEventTypeEnum)(nil), "google.ads.googleads.v1.enums.InteractionEventTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.InteractionEventTypeEnum_InteractionEventType", InteractionEventTypeEnum_InteractionEventType_name, InteractionEventTypeEnum_InteractionEventType_value)
+	proto.RegisterType((*InteractionEventTypeEnum)(nil), "google.ads.googleads.v1.enums.InteractionEventTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/interaction_event_type.proto", fileDescriptor_interaction_event_type_18ad80b1ed99b3b2)
+	proto.RegisterFile("google/ads/googleads/v1/enums/interaction_event_type.proto", fileDescriptor_e68f43996bbfc12e)
 }
 
-var fileDescriptor_interaction_event_type_18ad80b1ed99b3b2 = []byte{
+var fileDescriptor_e68f43996bbfc12e = []byte{
 	// 335 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4e, 0xf2, 0x30,
 	0x18, 0xfd, 0x37, 0xe0, 0x57, 0x4b, 0xa2, 0xcb, 0xe2, 0x85, 0x1a, 0xb9, 0x80, 0x07, 0xe8, 0xb2,
diff --git a/googleapis/ads/googleads/v1/enums/interaction_type.pb.go b/googleapis/ads/googleads/v1/enums/interaction_type.pb.go
index 5ebe57479a..fa8139c073 100644
--- a/googleapis/ads/googleads/v1/enums/interaction_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/interaction_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/interaction_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible interaction types.
 type InteractionTypeEnum_InteractionType int32
@@ -36,6 +39,7 @@ var InteractionTypeEnum_InteractionType_name = map[int32]string{
 	1:    "UNKNOWN",
 	8000: "CALLS",
 }
+
 var InteractionTypeEnum_InteractionType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var InteractionTypeEnum_InteractionType_value = map[string]int32{
 func (x InteractionTypeEnum_InteractionType) String() string {
 	return proto.EnumName(InteractionTypeEnum_InteractionType_name, int32(x))
 }
+
 func (InteractionTypeEnum_InteractionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_interaction_type_253dbad63b95615d, []int{0, 0}
+	return fileDescriptor_e7b42fdf3afc37c3, []int{0, 0}
 }
 
 // Container for enum describing possible interaction types.
@@ -60,16 +65,17 @@ func (m *InteractionTypeEnum) Reset()         { *m = InteractionTypeEnum{} }
 func (m *InteractionTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*InteractionTypeEnum) ProtoMessage()    {}
 func (*InteractionTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_interaction_type_253dbad63b95615d, []int{0}
+	return fileDescriptor_e7b42fdf3afc37c3, []int{0}
 }
+
 func (m *InteractionTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InteractionTypeEnum.Unmarshal(m, b)
 }
 func (m *InteractionTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InteractionTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *InteractionTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InteractionTypeEnum.Merge(dst, src)
+func (m *InteractionTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InteractionTypeEnum.Merge(m, src)
 }
 func (m *InteractionTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_InteractionTypeEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *InteractionTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_InteractionTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*InteractionTypeEnum)(nil), "google.ads.googleads.v1.enums.InteractionTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.InteractionTypeEnum_InteractionType", InteractionTypeEnum_InteractionType_name, InteractionTypeEnum_InteractionType_value)
+	proto.RegisterType((*InteractionTypeEnum)(nil), "google.ads.googleads.v1.enums.InteractionTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/interaction_type.proto", fileDescriptor_interaction_type_253dbad63b95615d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/interaction_type.proto", fileDescriptor_e7b42fdf3afc37c3)
 }
 
-var fileDescriptor_interaction_type_253dbad63b95615d = []byte{
+var fileDescriptor_e7b42fdf3afc37c3 = []byte{
 	// 291 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xd4, 0xbc,
diff --git a/googleapis/ads/googleads/v1/enums/job_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/job_placeholder_field.pb.go
index 11289818af..735854da90 100644
--- a/googleapis/ads/googleads/v1/enums/job_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/job_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/job_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Job placeholder fields.
 type JobPlaceholderFieldEnum_JobPlaceholderField int32
@@ -102,6 +105,7 @@ var JobPlaceholderFieldEnum_JobPlaceholderField_name = map[int32]string{
 	18: "IOS_APP_LINK",
 	19: "IOS_APP_STORE_ID",
 }
+
 var JobPlaceholderFieldEnum_JobPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -127,8 +131,9 @@ var JobPlaceholderFieldEnum_JobPlaceholderField_value = map[string]int32{
 func (x JobPlaceholderFieldEnum_JobPlaceholderField) String() string {
 	return proto.EnumName(JobPlaceholderFieldEnum_JobPlaceholderField_name, int32(x))
 }
+
 func (JobPlaceholderFieldEnum_JobPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_placeholder_field_cf233a1bf95849ac, []int{0, 0}
+	return fileDescriptor_e9572662ca9c52ed, []int{0, 0}
 }
 
 // Values for Job placeholder fields.
@@ -144,16 +149,17 @@ func (m *JobPlaceholderFieldEnum) Reset()         { *m = JobPlaceholderFieldEnum
 func (m *JobPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*JobPlaceholderFieldEnum) ProtoMessage()    {}
 func (*JobPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_placeholder_field_cf233a1bf95849ac, []int{0}
+	return fileDescriptor_e9572662ca9c52ed, []int{0}
 }
+
 func (m *JobPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *JobPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *JobPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobPlaceholderFieldEnum.Merge(dst, src)
+func (m *JobPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *JobPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_JobPlaceholderFieldEnum.Size(m)
@@ -165,15 +171,15 @@ func (m *JobPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_JobPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*JobPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.JobPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.JobPlaceholderFieldEnum_JobPlaceholderField", JobPlaceholderFieldEnum_JobPlaceholderField_name, JobPlaceholderFieldEnum_JobPlaceholderField_value)
+	proto.RegisterType((*JobPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.JobPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/job_placeholder_field.proto", fileDescriptor_job_placeholder_field_cf233a1bf95849ac)
+	proto.RegisterFile("google/ads/googleads/v1/enums/job_placeholder_field.proto", fileDescriptor_e9572662ca9c52ed)
 }
 
-var fileDescriptor_job_placeholder_field_cf233a1bf95849ac = []byte{
+var fileDescriptor_e9572662ca9c52ed = []byte{
 	// 494 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6e, 0xd3, 0x30,
 	0x14, 0x86, 0x69, 0xc6, 0xba, 0xd5, 0x2d, 0xab, 0xe7, 0x82, 0x26, 0x10, 0xbb, 0xd8, 0x1e, 0x20,
diff --git a/googleapis/ads/googleads/v1/enums/keyword_match_type.pb.go b/googleapis/ads/googleads/v1/enums/keyword_match_type.pb.go
index 578939756e..35a6d69971 100644
--- a/googleapis/ads/googleads/v1/enums/keyword_match_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/keyword_match_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/keyword_match_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible Keyword match types.
 type KeywordMatchTypeEnum_KeywordMatchType int32
@@ -42,6 +45,7 @@ var KeywordMatchTypeEnum_KeywordMatchType_name = map[int32]string{
 	3: "PHRASE",
 	4: "BROAD",
 }
+
 var KeywordMatchTypeEnum_KeywordMatchType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var KeywordMatchTypeEnum_KeywordMatchType_value = map[string]int32{
 func (x KeywordMatchTypeEnum_KeywordMatchType) String() string {
 	return proto.EnumName(KeywordMatchTypeEnum_KeywordMatchType_name, int32(x))
 }
+
 func (KeywordMatchTypeEnum_KeywordMatchType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_match_type_61366195944217b7, []int{0, 0}
+	return fileDescriptor_bb7e96826193c362, []int{0, 0}
 }
 
 // Message describing Keyword match types.
@@ -68,16 +73,17 @@ func (m *KeywordMatchTypeEnum) Reset()         { *m = KeywordMatchTypeEnum{} }
 func (m *KeywordMatchTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordMatchTypeEnum) ProtoMessage()    {}
 func (*KeywordMatchTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_match_type_61366195944217b7, []int{0}
+	return fileDescriptor_bb7e96826193c362, []int{0}
 }
+
 func (m *KeywordMatchTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordMatchTypeEnum.Unmarshal(m, b)
 }
 func (m *KeywordMatchTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordMatchTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordMatchTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordMatchTypeEnum.Merge(dst, src)
+func (m *KeywordMatchTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordMatchTypeEnum.Merge(m, src)
 }
 func (m *KeywordMatchTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordMatchTypeEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *KeywordMatchTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordMatchTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordMatchTypeEnum)(nil), "google.ads.googleads.v1.enums.KeywordMatchTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.KeywordMatchTypeEnum_KeywordMatchType", KeywordMatchTypeEnum_KeywordMatchType_name, KeywordMatchTypeEnum_KeywordMatchType_value)
+	proto.RegisterType((*KeywordMatchTypeEnum)(nil), "google.ads.googleads.v1.enums.KeywordMatchTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_match_type.proto", fileDescriptor_keyword_match_type_61366195944217b7)
+	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_match_type.proto", fileDescriptor_bb7e96826193c362)
 }
 
-var fileDescriptor_keyword_match_type_61366195944217b7 = []byte{
+var fileDescriptor_bb7e96826193c362 = []byte{
 	// 317 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4e, 0xf2, 0x30,
 	0x18, 0xfe, 0x18, 0x9f, 0x18, 0xcb, 0x81, 0xcb, 0xa2, 0x27, 0x46, 0x0e, 0xe0, 0x02, 0xba, 0x2c,
diff --git a/googleapis/ads/googleads/v1/enums/keyword_plan_competition_level.pb.go b/googleapis/ads/googleads/v1/enums/keyword_plan_competition_level.pb.go
index e93741bf42..b0d54d6208 100644
--- a/googleapis/ads/googleads/v1/enums/keyword_plan_competition_level.pb.go
+++ b/googleapis/ads/googleads/v1/enums/keyword_plan_competition_level.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/keyword_plan_competition_level.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Competition level of a keyword.
 type KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel int32
@@ -42,6 +45,7 @@ var KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel_name = map[int32
 	3: "MEDIUM",
 	4: "HIGH",
 }
+
 var KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel_value = map[stri
 func (x KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel) String() string {
 	return proto.EnumName(KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel_name, int32(x))
 }
+
 func (KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_competition_level_be32af162d2cdabf, []int{0, 0}
+	return fileDescriptor_c20ed2e277b87d6e, []int{0, 0}
 }
 
 // Container for enumeration of keyword competition levels. The competition
@@ -72,16 +77,17 @@ func (m *KeywordPlanCompetitionLevelEnum) Reset()         { *m = KeywordPlanComp
 func (m *KeywordPlanCompetitionLevelEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanCompetitionLevelEnum) ProtoMessage()    {}
 func (*KeywordPlanCompetitionLevelEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_competition_level_be32af162d2cdabf, []int{0}
+	return fileDescriptor_c20ed2e277b87d6e, []int{0}
 }
+
 func (m *KeywordPlanCompetitionLevelEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanCompetitionLevelEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanCompetitionLevelEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanCompetitionLevelEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanCompetitionLevelEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanCompetitionLevelEnum.Merge(dst, src)
+func (m *KeywordPlanCompetitionLevelEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanCompetitionLevelEnum.Merge(m, src)
 }
 func (m *KeywordPlanCompetitionLevelEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanCompetitionLevelEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *KeywordPlanCompetitionLevelEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanCompetitionLevelEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanCompetitionLevelEnum)(nil), "google.ads.googleads.v1.enums.KeywordPlanCompetitionLevelEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel", KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel_name, KeywordPlanCompetitionLevelEnum_KeywordPlanCompetitionLevel_value)
+	proto.RegisterType((*KeywordPlanCompetitionLevelEnum)(nil), "google.ads.googleads.v1.enums.KeywordPlanCompetitionLevelEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_plan_competition_level.proto", fileDescriptor_keyword_plan_competition_level_be32af162d2cdabf)
+	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_plan_competition_level.proto", fileDescriptor_c20ed2e277b87d6e)
 }
 
-var fileDescriptor_keyword_plan_competition_level_be32af162d2cdabf = []byte{
+var fileDescriptor_c20ed2e277b87d6e = []byte{
 	// 325 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x4f, 0xc2, 0x30,
 	0x18, 0x95, 0x41, 0xc0, 0x94, 0x83, 0xcb, 0x8e, 0x2a, 0x51, 0xf8, 0x01, 0x5d, 0x16, 0x6f, 0xf5,
diff --git a/googleapis/ads/googleads/v1/enums/keyword_plan_forecast_interval.pb.go b/googleapis/ads/googleads/v1/enums/keyword_plan_forecast_interval.pb.go
index 13b018dc33..7dab12589e 100644
--- a/googleapis/ads/googleads/v1/enums/keyword_plan_forecast_interval.pb.go
+++ b/googleapis/ads/googleads/v1/enums/keyword_plan_forecast_interval.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/keyword_plan_forecast_interval.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Forecast intervals.
 type KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval int32
@@ -45,6 +48,7 @@ var KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval_name = map[int32
 	4: "NEXT_MONTH",
 	5: "NEXT_QUARTER",
 }
+
 var KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -56,8 +60,9 @@ var KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval_value = map[stri
 func (x KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval) String() string {
 	return proto.EnumName(KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval_name, int32(x))
 }
+
 func (KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_forecast_interval_81df08cdb2ab986b, []int{0, 0}
+	return fileDescriptor_3fb66cd8111603d1, []int{0, 0}
 }
 
 // Container for enumeration of forecast intervals.
@@ -71,16 +76,17 @@ func (m *KeywordPlanForecastIntervalEnum) Reset()         { *m = KeywordPlanFore
 func (m *KeywordPlanForecastIntervalEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanForecastIntervalEnum) ProtoMessage()    {}
 func (*KeywordPlanForecastIntervalEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_forecast_interval_81df08cdb2ab986b, []int{0}
+	return fileDescriptor_3fb66cd8111603d1, []int{0}
 }
+
 func (m *KeywordPlanForecastIntervalEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanForecastIntervalEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanForecastIntervalEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanForecastIntervalEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanForecastIntervalEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanForecastIntervalEnum.Merge(dst, src)
+func (m *KeywordPlanForecastIntervalEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanForecastIntervalEnum.Merge(m, src)
 }
 func (m *KeywordPlanForecastIntervalEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanForecastIntervalEnum.Size(m)
@@ -92,15 +98,15 @@ func (m *KeywordPlanForecastIntervalEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanForecastIntervalEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanForecastIntervalEnum)(nil), "google.ads.googleads.v1.enums.KeywordPlanForecastIntervalEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval", KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval_name, KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval_value)
+	proto.RegisterType((*KeywordPlanForecastIntervalEnum)(nil), "google.ads.googleads.v1.enums.KeywordPlanForecastIntervalEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_plan_forecast_interval.proto", fileDescriptor_keyword_plan_forecast_interval_81df08cdb2ab986b)
+	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_plan_forecast_interval.proto", fileDescriptor_3fb66cd8111603d1)
 }
 
-var fileDescriptor_keyword_plan_forecast_interval_81df08cdb2ab986b = []byte{
+var fileDescriptor_3fb66cd8111603d1 = []byte{
 	// 339 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4b, 0x4e, 0xc3, 0x30,
 	0x10, 0x25, 0x2d, 0x1f, 0xe1, 0xf2, 0x89, 0xb2, 0x04, 0x2a, 0x68, 0x0f, 0xe0, 0x28, 0x62, 0x67,
diff --git a/googleapis/ads/googleads/v1/enums/keyword_plan_network.pb.go b/googleapis/ads/googleads/v1/enums/keyword_plan_network.pb.go
index 31f39ab3ca..6c9f66cf00 100644
--- a/googleapis/ads/googleads/v1/enums/keyword_plan_network.pb.go
+++ b/googleapis/ads/googleads/v1/enums/keyword_plan_network.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/keyword_plan_network.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates keyword plan forecastable network types.
 type KeywordPlanNetworkEnum_KeywordPlanNetwork int32
@@ -39,6 +42,7 @@ var KeywordPlanNetworkEnum_KeywordPlanNetwork_name = map[int32]string{
 	2: "GOOGLE_SEARCH",
 	3: "GOOGLE_SEARCH_AND_PARTNERS",
 }
+
 var KeywordPlanNetworkEnum_KeywordPlanNetwork_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -49,8 +53,9 @@ var KeywordPlanNetworkEnum_KeywordPlanNetwork_value = map[string]int32{
 func (x KeywordPlanNetworkEnum_KeywordPlanNetwork) String() string {
 	return proto.EnumName(KeywordPlanNetworkEnum_KeywordPlanNetwork_name, int32(x))
 }
+
 func (KeywordPlanNetworkEnum_KeywordPlanNetwork) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_network_dbfff2566f4fba42, []int{0, 0}
+	return fileDescriptor_5811477df0314af6, []int{0, 0}
 }
 
 // Container for enumeration of keyword plan forecastable network types.
@@ -64,16 +69,17 @@ func (m *KeywordPlanNetworkEnum) Reset()         { *m = KeywordPlanNetworkEnum{}
 func (m *KeywordPlanNetworkEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanNetworkEnum) ProtoMessage()    {}
 func (*KeywordPlanNetworkEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_network_dbfff2566f4fba42, []int{0}
+	return fileDescriptor_5811477df0314af6, []int{0}
 }
+
 func (m *KeywordPlanNetworkEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanNetworkEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanNetworkEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanNetworkEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanNetworkEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanNetworkEnum.Merge(dst, src)
+func (m *KeywordPlanNetworkEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanNetworkEnum.Merge(m, src)
 }
 func (m *KeywordPlanNetworkEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanNetworkEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *KeywordPlanNetworkEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanNetworkEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanNetworkEnum)(nil), "google.ads.googleads.v1.enums.KeywordPlanNetworkEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.KeywordPlanNetworkEnum_KeywordPlanNetwork", KeywordPlanNetworkEnum_KeywordPlanNetwork_name, KeywordPlanNetworkEnum_KeywordPlanNetwork_value)
+	proto.RegisterType((*KeywordPlanNetworkEnum)(nil), "google.ads.googleads.v1.enums.KeywordPlanNetworkEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_plan_network.proto", fileDescriptor_keyword_plan_network_dbfff2566f4fba42)
+	proto.RegisterFile("google/ads/googleads/v1/enums/keyword_plan_network.proto", fileDescriptor_5811477df0314af6)
 }
 
-var fileDescriptor_keyword_plan_network_dbfff2566f4fba42 = []byte{
+var fileDescriptor_5811477df0314af6 = []byte{
 	// 324 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xf3, 0x30,
 	0x1c, 0xfd, 0xd6, 0xc1, 0x27, 0x64, 0x88, 0xb5, 0x17, 0x0a, 0xc3, 0x09, 0xdb, 0x03, 0xa4, 0x14,
diff --git a/googleapis/ads/googleads/v1/enums/label_status.pb.go b/googleapis/ads/googleads/v1/enums/label_status.pb.go
index 25d3c9ae19..98995d3687 100644
--- a/googleapis/ads/googleads/v1/enums/label_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/label_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/label_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a label.
 type LabelStatusEnum_LabelStatus int32
@@ -39,6 +42,7 @@ var LabelStatusEnum_LabelStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var LabelStatusEnum_LabelStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var LabelStatusEnum_LabelStatus_value = map[string]int32{
 func (x LabelStatusEnum_LabelStatus) String() string {
 	return proto.EnumName(LabelStatusEnum_LabelStatus_name, int32(x))
 }
+
 func (LabelStatusEnum_LabelStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_label_status_8f8aec166f117b1a, []int{0, 0}
+	return fileDescriptor_903d42273602099e, []int{0, 0}
 }
 
 // Container for enum describing possible status of a label.
@@ -64,16 +69,17 @@ func (m *LabelStatusEnum) Reset()         { *m = LabelStatusEnum{} }
 func (m *LabelStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*LabelStatusEnum) ProtoMessage()    {}
 func (*LabelStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_status_8f8aec166f117b1a, []int{0}
+	return fileDescriptor_903d42273602099e, []int{0}
 }
+
 func (m *LabelStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelStatusEnum.Unmarshal(m, b)
 }
 func (m *LabelStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *LabelStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelStatusEnum.Merge(dst, src)
+func (m *LabelStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelStatusEnum.Merge(m, src)
 }
 func (m *LabelStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_LabelStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *LabelStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LabelStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LabelStatusEnum)(nil), "google.ads.googleads.v1.enums.LabelStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.LabelStatusEnum_LabelStatus", LabelStatusEnum_LabelStatus_name, LabelStatusEnum_LabelStatus_value)
+	proto.RegisterType((*LabelStatusEnum)(nil), "google.ads.googleads.v1.enums.LabelStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/label_status.proto", fileDescriptor_label_status_8f8aec166f117b1a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/label_status.proto", fileDescriptor_903d42273602099e)
 }
 
-var fileDescriptor_label_status_8f8aec166f117b1a = []byte{
+var fileDescriptor_903d42273602099e = []byte{
 	// 293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x1d, 0x28, 0xa4, 0x87, 0x95, 0x1e, 0xc5, 0x1d, 0xb6, 0x07, 0x48, 0x2c, 0xde, 0xe2,
diff --git a/googleapis/ads/googleads/v1/enums/legacy_app_install_ad_app_store.pb.go b/googleapis/ads/googleads/v1/enums/legacy_app_install_ad_app_store.pb.go
index b2519af368..c919f5c23b 100644
--- a/googleapis/ads/googleads/v1/enums/legacy_app_install_ad_app_store.pb.go
+++ b/googleapis/ads/googleads/v1/enums/legacy_app_install_ad_app_store.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/legacy_app_install_ad_app_store.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // App store type in a legacy app install ad.
 type LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore int32
@@ -48,6 +51,7 @@ var LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore_name = map[int32]s
 	5: "WINDOWS_PHONE_STORE",
 	6: "CN_APP_STORE",
 }
+
 var LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -61,8 +65,9 @@ var LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore_value = map[string
 func (x LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore) String() string {
 	return proto.EnumName(LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore_name, int32(x))
 }
+
 func (LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_legacy_app_install_ad_app_store_985540f294b6708f, []int{0, 0}
+	return fileDescriptor_676a144a27afa9f6, []int{0, 0}
 }
 
 // Container for enum describing app store type in a legacy app install ad.
@@ -76,16 +81,17 @@ func (m *LegacyAppInstallAdAppStoreEnum) Reset()         { *m = LegacyAppInstall
 func (m *LegacyAppInstallAdAppStoreEnum) String() string { return proto.CompactTextString(m) }
 func (*LegacyAppInstallAdAppStoreEnum) ProtoMessage()    {}
 func (*LegacyAppInstallAdAppStoreEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_legacy_app_install_ad_app_store_985540f294b6708f, []int{0}
+	return fileDescriptor_676a144a27afa9f6, []int{0}
 }
+
 func (m *LegacyAppInstallAdAppStoreEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LegacyAppInstallAdAppStoreEnum.Unmarshal(m, b)
 }
 func (m *LegacyAppInstallAdAppStoreEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LegacyAppInstallAdAppStoreEnum.Marshal(b, m, deterministic)
 }
-func (dst *LegacyAppInstallAdAppStoreEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LegacyAppInstallAdAppStoreEnum.Merge(dst, src)
+func (m *LegacyAppInstallAdAppStoreEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LegacyAppInstallAdAppStoreEnum.Merge(m, src)
 }
 func (m *LegacyAppInstallAdAppStoreEnum) XXX_Size() int {
 	return xxx_messageInfo_LegacyAppInstallAdAppStoreEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *LegacyAppInstallAdAppStoreEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LegacyAppInstallAdAppStoreEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LegacyAppInstallAdAppStoreEnum)(nil), "google.ads.googleads.v1.enums.LegacyAppInstallAdAppStoreEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore", LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore_name, LegacyAppInstallAdAppStoreEnum_LegacyAppInstallAdAppStore_value)
+	proto.RegisterType((*LegacyAppInstallAdAppStoreEnum)(nil), "google.ads.googleads.v1.enums.LegacyAppInstallAdAppStoreEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/legacy_app_install_ad_app_store.proto", fileDescriptor_legacy_app_install_ad_app_store_985540f294b6708f)
+	proto.RegisterFile("google/ads/googleads/v1/enums/legacy_app_install_ad_app_store.proto", fileDescriptor_676a144a27afa9f6)
 }
 
-var fileDescriptor_legacy_app_install_ad_app_store_985540f294b6708f = []byte{
+var fileDescriptor_676a144a27afa9f6 = []byte{
 	// 371 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x41, 0x6b, 0xa3, 0x40,
 	0x18, 0x5d, 0xcd, 0x6e, 0x16, 0x26, 0xbb, 0xc4, 0x35, 0x87, 0x85, 0xb0, 0xd9, 0x25, 0xf9, 0x01,
diff --git a/googleapis/ads/googleads/v1/enums/listing_custom_attribute_index.pb.go b/googleapis/ads/googleads/v1/enums/listing_custom_attribute_index.pb.go
index 15690b5dfb..7a03503ba5 100644
--- a/googleapis/ads/googleads/v1/enums/listing_custom_attribute_index.pb.go
+++ b/googleapis/ads/googleads/v1/enums/listing_custom_attribute_index.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/listing_custom_attribute_index.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The index of the listing custom attribute.
 type ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex int32
@@ -48,6 +51,7 @@ var ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex_name = map[int32
 	10: "INDEX3",
 	11: "INDEX4",
 }
+
 var ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -61,8 +65,9 @@ var ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex_value = map[stri
 func (x ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex) String() string {
 	return proto.EnumName(ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex_name, int32(x))
 }
+
 func (ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_listing_custom_attribute_index_306d4bdbda07a18e, []int{0, 0}
+	return fileDescriptor_410e7e01334fc3fb, []int{0, 0}
 }
 
 // Container for enum describing the index of the listing custom attribute.
@@ -76,16 +81,17 @@ func (m *ListingCustomAttributeIndexEnum) Reset()         { *m = ListingCustomAt
 func (m *ListingCustomAttributeIndexEnum) String() string { return proto.CompactTextString(m) }
 func (*ListingCustomAttributeIndexEnum) ProtoMessage()    {}
 func (*ListingCustomAttributeIndexEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_listing_custom_attribute_index_306d4bdbda07a18e, []int{0}
+	return fileDescriptor_410e7e01334fc3fb, []int{0}
 }
+
 func (m *ListingCustomAttributeIndexEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListingCustomAttributeIndexEnum.Unmarshal(m, b)
 }
 func (m *ListingCustomAttributeIndexEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListingCustomAttributeIndexEnum.Marshal(b, m, deterministic)
 }
-func (dst *ListingCustomAttributeIndexEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListingCustomAttributeIndexEnum.Merge(dst, src)
+func (m *ListingCustomAttributeIndexEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListingCustomAttributeIndexEnum.Merge(m, src)
 }
 func (m *ListingCustomAttributeIndexEnum) XXX_Size() int {
 	return xxx_messageInfo_ListingCustomAttributeIndexEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *ListingCustomAttributeIndexEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ListingCustomAttributeIndexEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ListingCustomAttributeIndexEnum)(nil), "google.ads.googleads.v1.enums.ListingCustomAttributeIndexEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex", ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex_name, ListingCustomAttributeIndexEnum_ListingCustomAttributeIndex_value)
+	proto.RegisterType((*ListingCustomAttributeIndexEnum)(nil), "google.ads.googleads.v1.enums.ListingCustomAttributeIndexEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/listing_custom_attribute_index.proto", fileDescriptor_listing_custom_attribute_index_306d4bdbda07a18e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/listing_custom_attribute_index.proto", fileDescriptor_410e7e01334fc3fb)
 }
 
-var fileDescriptor_listing_custom_attribute_index_306d4bdbda07a18e = []byte{
+var fileDescriptor_410e7e01334fc3fb = []byte{
 	// 328 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x4e, 0xf3, 0x30,
 	0x14, 0x85, 0xff, 0xf4, 0x97, 0x5a, 0x70, 0x07, 0xac, 0x8c, 0x40, 0x05, 0xed, 0x03, 0x38, 0x84,
diff --git a/googleapis/ads/googleads/v1/enums/listing_group_type.pb.go b/googleapis/ads/googleads/v1/enums/listing_group_type.pb.go
index fb5d7c94e8..7af9da1541 100644
--- a/googleapis/ads/googleads/v1/enums/listing_group_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/listing_group_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/listing_group_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of the listing group.
 type ListingGroupTypeEnum_ListingGroupType int32
@@ -41,6 +44,7 @@ var ListingGroupTypeEnum_ListingGroupType_name = map[int32]string{
 	2: "SUBDIVISION",
 	3: "UNIT",
 }
+
 var ListingGroupTypeEnum_ListingGroupType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -51,8 +55,9 @@ var ListingGroupTypeEnum_ListingGroupType_value = map[string]int32{
 func (x ListingGroupTypeEnum_ListingGroupType) String() string {
 	return proto.EnumName(ListingGroupTypeEnum_ListingGroupType_name, int32(x))
 }
+
 func (ListingGroupTypeEnum_ListingGroupType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_listing_group_type_702778b765e2222d, []int{0, 0}
+	return fileDescriptor_fbd98b8004bba2ed, []int{0, 0}
 }
 
 // Container for enum describing the type of the listing group.
@@ -66,16 +71,17 @@ func (m *ListingGroupTypeEnum) Reset()         { *m = ListingGroupTypeEnum{} }
 func (m *ListingGroupTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ListingGroupTypeEnum) ProtoMessage()    {}
 func (*ListingGroupTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_listing_group_type_702778b765e2222d, []int{0}
+	return fileDescriptor_fbd98b8004bba2ed, []int{0}
 }
+
 func (m *ListingGroupTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListingGroupTypeEnum.Unmarshal(m, b)
 }
 func (m *ListingGroupTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListingGroupTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ListingGroupTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListingGroupTypeEnum.Merge(dst, src)
+func (m *ListingGroupTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListingGroupTypeEnum.Merge(m, src)
 }
 func (m *ListingGroupTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ListingGroupTypeEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *ListingGroupTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ListingGroupTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ListingGroupTypeEnum)(nil), "google.ads.googleads.v1.enums.ListingGroupTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ListingGroupTypeEnum_ListingGroupType", ListingGroupTypeEnum_ListingGroupType_name, ListingGroupTypeEnum_ListingGroupType_value)
+	proto.RegisterType((*ListingGroupTypeEnum)(nil), "google.ads.googleads.v1.enums.ListingGroupTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/listing_group_type.proto", fileDescriptor_listing_group_type_702778b765e2222d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/listing_group_type.proto", fileDescriptor_fbd98b8004bba2ed)
 }
 
-var fileDescriptor_listing_group_type_702778b765e2222d = []byte{
+var fileDescriptor_fbd98b8004bba2ed = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x9d, 0xa8, 0x64, 0x07, 0x4b, 0xd1, 0x8b, 0xb8, 0xc3, 0xf6, 0x00, 0x09, 0x45, 0xf0,
diff --git a/googleapis/ads/googleads/v1/enums/local_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/local_placeholder_field.pb.go
index 4001018cde..93b345a282 100644
--- a/googleapis/ads/googleads/v1/enums/local_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/local_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/local_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Local placeholder fields.
 type LocalPlaceholderFieldEnum_LocalPlaceholderField int32
@@ -106,6 +109,7 @@ var LocalPlaceholderFieldEnum_LocalPlaceholderField_name = map[int32]string{
 	19: "IOS_APP_LINK",
 	20: "IOS_APP_STORE_ID",
 }
+
 var LocalPlaceholderFieldEnum_LocalPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -133,8 +137,9 @@ var LocalPlaceholderFieldEnum_LocalPlaceholderField_value = map[string]int32{
 func (x LocalPlaceholderFieldEnum_LocalPlaceholderField) String() string {
 	return proto.EnumName(LocalPlaceholderFieldEnum_LocalPlaceholderField_name, int32(x))
 }
+
 func (LocalPlaceholderFieldEnum_LocalPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_local_placeholder_field_ded9d998e2bec814, []int{0, 0}
+	return fileDescriptor_0dcff458a17bffef, []int{0, 0}
 }
 
 // Values for Local placeholder fields.
@@ -150,16 +155,17 @@ func (m *LocalPlaceholderFieldEnum) Reset()         { *m = LocalPlaceholderField
 func (m *LocalPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*LocalPlaceholderFieldEnum) ProtoMessage()    {}
 func (*LocalPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_local_placeholder_field_ded9d998e2bec814, []int{0}
+	return fileDescriptor_0dcff458a17bffef, []int{0}
 }
+
 func (m *LocalPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocalPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *LocalPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocalPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *LocalPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocalPlaceholderFieldEnum.Merge(dst, src)
+func (m *LocalPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *LocalPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_LocalPlaceholderFieldEnum.Size(m)
@@ -171,15 +177,15 @@ func (m *LocalPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LocalPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LocalPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.LocalPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.LocalPlaceholderFieldEnum_LocalPlaceholderField", LocalPlaceholderFieldEnum_LocalPlaceholderField_name, LocalPlaceholderFieldEnum_LocalPlaceholderField_value)
+	proto.RegisterType((*LocalPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.LocalPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/local_placeholder_field.proto", fileDescriptor_local_placeholder_field_ded9d998e2bec814)
+	proto.RegisterFile("google/ads/googleads/v1/enums/local_placeholder_field.proto", fileDescriptor_0dcff458a17bffef)
 }
 
-var fileDescriptor_local_placeholder_field_ded9d998e2bec814 = []byte{
+var fileDescriptor_0dcff458a17bffef = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x6e, 0xda, 0x30,
 	0x14, 0x1e, 0xb0, 0xfe, 0x60, 0x68, 0x71, 0x0d, 0xd5, 0xb6, 0x6a, 0xbd, 0x68, 0x1f, 0x20, 0x11,
diff --git a/googleapis/ads/googleads/v1/enums/location_extension_targeting_criterion_field.pb.go b/googleapis/ads/googleads/v1/enums/location_extension_targeting_criterion_field.pb.go
index 4ea0c059ba..58bbfe9c32 100644
--- a/googleapis/ads/googleads/v1/enums/location_extension_targeting_criterion_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/location_extension_targeting_criterion_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/location_extension_targeting_criterion_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Location Extension Targeting criterion fields.
 type LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField int32
@@ -51,6 +54,7 @@ var LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCrite
 	6: "POSTAL_CODE",
 	7: "COUNTRY_CODE",
 }
+
 var LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -65,8 +69,9 @@ var LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCrite
 func (x LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField) String() string {
 	return proto.EnumName(LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField_name, int32(x))
 }
+
 func (LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_location_extension_targeting_criterion_field_ae2bb4571840bb1c, []int{0, 0}
+	return fileDescriptor_5b18aad743d9f814, []int{0, 0}
 }
 
 // Values for Location Extension Targeting criterion fields.
@@ -84,16 +89,17 @@ func (m *LocationExtensionTargetingCriterionFieldEnum) String() string {
 }
 func (*LocationExtensionTargetingCriterionFieldEnum) ProtoMessage() {}
 func (*LocationExtensionTargetingCriterionFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_extension_targeting_criterion_field_ae2bb4571840bb1c, []int{0}
+	return fileDescriptor_5b18aad743d9f814, []int{0}
 }
+
 func (m *LocationExtensionTargetingCriterionFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationExtensionTargetingCriterionFieldEnum.Unmarshal(m, b)
 }
 func (m *LocationExtensionTargetingCriterionFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationExtensionTargetingCriterionFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *LocationExtensionTargetingCriterionFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationExtensionTargetingCriterionFieldEnum.Merge(dst, src)
+func (m *LocationExtensionTargetingCriterionFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationExtensionTargetingCriterionFieldEnum.Merge(m, src)
 }
 func (m *LocationExtensionTargetingCriterionFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_LocationExtensionTargetingCriterionFieldEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *LocationExtensionTargetingCriterionFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LocationExtensionTargetingCriterionFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LocationExtensionTargetingCriterionFieldEnum)(nil), "google.ads.googleads.v1.enums.LocationExtensionTargetingCriterionFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField", LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField_name, LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField_value)
+	proto.RegisterType((*LocationExtensionTargetingCriterionFieldEnum)(nil), "google.ads.googleads.v1.enums.LocationExtensionTargetingCriterionFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/location_extension_targeting_criterion_field.proto", fileDescriptor_location_extension_targeting_criterion_field_ae2bb4571840bb1c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/location_extension_targeting_criterion_field.proto", fileDescriptor_5b18aad743d9f814)
 }
 
-var fileDescriptor_location_extension_targeting_criterion_field_ae2bb4571840bb1c = []byte{
+var fileDescriptor_5b18aad743d9f814 = []byte{
 	// 383 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0xae, 0x93, 0x40,
 	0x18, 0x85, 0x85, 0x7b, 0xbd, 0xf7, 0x66, 0xda, 0xe8, 0x64, 0x96, 0xc6, 0x2e, 0xda, 0x95, 0x0b,
diff --git a/googleapis/ads/googleads/v1/enums/location_group_radius_units.pb.go b/googleapis/ads/googleads/v1/enums/location_group_radius_units.pb.go
index f27938ef4f..2db05c55d1 100644
--- a/googleapis/ads/googleads/v1/enums/location_group_radius_units.pb.go
+++ b/googleapis/ads/googleads/v1/enums/location_group_radius_units.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/location_group_radius_units.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The unit of radius distance in location group (e.g. MILES)
 type LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits int32
@@ -39,6 +42,7 @@ var LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits_name = map[int32]strin
 	2: "METERS",
 	3: "MILES",
 }
+
 var LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits_value = map[string]int
 func (x LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits) String() string {
 	return proto.EnumName(LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits_name, int32(x))
 }
+
 func (LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_location_group_radius_units_431f4b934ef27033, []int{0, 0}
+	return fileDescriptor_4d3468bd973fd435, []int{0, 0}
 }
 
 // Container for enum describing unit of radius in location group.
@@ -64,16 +69,17 @@ func (m *LocationGroupRadiusUnitsEnum) Reset()         { *m = LocationGroupRadiu
 func (m *LocationGroupRadiusUnitsEnum) String() string { return proto.CompactTextString(m) }
 func (*LocationGroupRadiusUnitsEnum) ProtoMessage()    {}
 func (*LocationGroupRadiusUnitsEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_group_radius_units_431f4b934ef27033, []int{0}
+	return fileDescriptor_4d3468bd973fd435, []int{0}
 }
+
 func (m *LocationGroupRadiusUnitsEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationGroupRadiusUnitsEnum.Unmarshal(m, b)
 }
 func (m *LocationGroupRadiusUnitsEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationGroupRadiusUnitsEnum.Marshal(b, m, deterministic)
 }
-func (dst *LocationGroupRadiusUnitsEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationGroupRadiusUnitsEnum.Merge(dst, src)
+func (m *LocationGroupRadiusUnitsEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationGroupRadiusUnitsEnum.Merge(m, src)
 }
 func (m *LocationGroupRadiusUnitsEnum) XXX_Size() int {
 	return xxx_messageInfo_LocationGroupRadiusUnitsEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *LocationGroupRadiusUnitsEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LocationGroupRadiusUnitsEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LocationGroupRadiusUnitsEnum)(nil), "google.ads.googleads.v1.enums.LocationGroupRadiusUnitsEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits", LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits_name, LocationGroupRadiusUnitsEnum_LocationGroupRadiusUnits_value)
+	proto.RegisterType((*LocationGroupRadiusUnitsEnum)(nil), "google.ads.googleads.v1.enums.LocationGroupRadiusUnitsEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/location_group_radius_units.proto", fileDescriptor_location_group_radius_units_431f4b934ef27033)
+	proto.RegisterFile("google/ads/googleads/v1/enums/location_group_radius_units.proto", fileDescriptor_4d3468bd973fd435)
 }
 
-var fileDescriptor_location_group_radius_units_431f4b934ef27033 = []byte{
+var fileDescriptor_4d3468bd973fd435 = []byte{
 	// 314 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x6a, 0xf2, 0x40,
 	0x14, 0xc5, 0x3f, 0x23, 0x9f, 0xa5, 0xe3, 0xa2, 0x21, 0xab, 0x52, 0x74, 0xa1, 0x0f, 0x30, 0x43,
diff --git a/googleapis/ads/googleads/v1/enums/location_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/location_placeholder_field.pb.go
index bef7188837..9e7e0e8905 100644
--- a/googleapis/ads/googleads/v1/enums/location_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/location_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/location_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Location placeholder fields.
 type LocationPlaceholderFieldEnum_LocationPlaceholderField int32
@@ -57,6 +60,7 @@ var LocationPlaceholderFieldEnum_LocationPlaceholderField_name = map[int32]strin
 	8: "COUNTRY_CODE",
 	9: "PHONE_NUMBER",
 }
+
 var LocationPlaceholderFieldEnum_LocationPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -73,8 +77,9 @@ var LocationPlaceholderFieldEnum_LocationPlaceholderField_value = map[string]int
 func (x LocationPlaceholderFieldEnum_LocationPlaceholderField) String() string {
 	return proto.EnumName(LocationPlaceholderFieldEnum_LocationPlaceholderField_name, int32(x))
 }
+
 func (LocationPlaceholderFieldEnum_LocationPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_location_placeholder_field_c804fc5510f17f55, []int{0, 0}
+	return fileDescriptor_a7365260cf440eb7, []int{0, 0}
 }
 
 // Values for Location placeholder fields.
@@ -88,16 +93,17 @@ func (m *LocationPlaceholderFieldEnum) Reset()         { *m = LocationPlaceholde
 func (m *LocationPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*LocationPlaceholderFieldEnum) ProtoMessage()    {}
 func (*LocationPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_placeholder_field_c804fc5510f17f55, []int{0}
+	return fileDescriptor_a7365260cf440eb7, []int{0}
 }
+
 func (m *LocationPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *LocationPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *LocationPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationPlaceholderFieldEnum.Merge(dst, src)
+func (m *LocationPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *LocationPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_LocationPlaceholderFieldEnum.Size(m)
@@ -109,15 +115,15 @@ func (m *LocationPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LocationPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LocationPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.LocationPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.LocationPlaceholderFieldEnum_LocationPlaceholderField", LocationPlaceholderFieldEnum_LocationPlaceholderField_name, LocationPlaceholderFieldEnum_LocationPlaceholderField_value)
+	proto.RegisterType((*LocationPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.LocationPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/location_placeholder_field.proto", fileDescriptor_location_placeholder_field_c804fc5510f17f55)
+	proto.RegisterFile("google/ads/googleads/v1/enums/location_placeholder_field.proto", fileDescriptor_a7365260cf440eb7)
 }
 
-var fileDescriptor_location_placeholder_field_c804fc5510f17f55 = []byte{
+var fileDescriptor_a7365260cf440eb7 = []byte{
 	// 392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0xae, 0x93, 0x40,
 	0x14, 0x15, 0xde, 0xf3, 0xbd, 0x3a, 0xef, 0xa9, 0xe3, 0xac, 0x8c, 0x69, 0x17, 0xed, 0x07, 0x0c,
diff --git a/googleapis/ads/googleads/v1/enums/manager_link_status.pb.go b/googleapis/ads/googleads/v1/enums/manager_link_status.pb.go
index 3a5dde9622..be4a2dec12 100644
--- a/googleapis/ads/googleads/v1/enums/manager_link_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/manager_link_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/manager_link_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible statuses of a link.
 type ManagerLinkStatusEnum_ManagerLinkStatus int32
@@ -50,6 +53,7 @@ var ManagerLinkStatusEnum_ManagerLinkStatus_name = map[int32]string{
 	5: "REFUSED",
 	6: "CANCELED",
 }
+
 var ManagerLinkStatusEnum_ManagerLinkStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -63,8 +67,9 @@ var ManagerLinkStatusEnum_ManagerLinkStatus_value = map[string]int32{
 func (x ManagerLinkStatusEnum_ManagerLinkStatus) String() string {
 	return proto.EnumName(ManagerLinkStatusEnum_ManagerLinkStatus_name, int32(x))
 }
+
 func (ManagerLinkStatusEnum_ManagerLinkStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_manager_link_status_93d56526ebe80286, []int{0, 0}
+	return fileDescriptor_e8f80561365406c5, []int{0, 0}
 }
 
 // Container for enum describing possible status of a manager and client link.
@@ -78,16 +83,17 @@ func (m *ManagerLinkStatusEnum) Reset()         { *m = ManagerLinkStatusEnum{} }
 func (m *ManagerLinkStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*ManagerLinkStatusEnum) ProtoMessage()    {}
 func (*ManagerLinkStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_manager_link_status_93d56526ebe80286, []int{0}
+	return fileDescriptor_e8f80561365406c5, []int{0}
 }
+
 func (m *ManagerLinkStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManagerLinkStatusEnum.Unmarshal(m, b)
 }
 func (m *ManagerLinkStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManagerLinkStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *ManagerLinkStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManagerLinkStatusEnum.Merge(dst, src)
+func (m *ManagerLinkStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagerLinkStatusEnum.Merge(m, src)
 }
 func (m *ManagerLinkStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_ManagerLinkStatusEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *ManagerLinkStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ManagerLinkStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ManagerLinkStatusEnum)(nil), "google.ads.googleads.v1.enums.ManagerLinkStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ManagerLinkStatusEnum_ManagerLinkStatus", ManagerLinkStatusEnum_ManagerLinkStatus_name, ManagerLinkStatusEnum_ManagerLinkStatus_value)
+	proto.RegisterType((*ManagerLinkStatusEnum)(nil), "google.ads.googleads.v1.enums.ManagerLinkStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/manager_link_status.proto", fileDescriptor_manager_link_status_93d56526ebe80286)
+	proto.RegisterFile("google/ads/googleads/v1/enums/manager_link_status.proto", fileDescriptor_e8f80561365406c5)
 }
 
-var fileDescriptor_manager_link_status_93d56526ebe80286 = []byte{
+var fileDescriptor_e8f80561365406c5 = []byte{
 	// 335 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x14, 0xfe, 0xb5, 0xfb, 0x39, 0x25, 0x13, 0xac, 0x05, 0xbd, 0x10, 0x77, 0xb1, 0x3d, 0x40, 0x4a,
diff --git a/googleapis/ads/googleads/v1/enums/matching_function_context_type.pb.go b/googleapis/ads/googleads/v1/enums/matching_function_context_type.pb.go
index 614fe67c7f..18a8c7d88d 100644
--- a/googleapis/ads/googleads/v1/enums/matching_function_context_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/matching_function_context_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/matching_function_context_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible context types for an operand in a matching function.
 type MatchingFunctionContextTypeEnum_MatchingFunctionContextType int32
@@ -39,6 +42,7 @@ var MatchingFunctionContextTypeEnum_MatchingFunctionContextType_name = map[int32
 	2: "FEED_ITEM_ID",
 	3: "DEVICE_NAME",
 }
+
 var MatchingFunctionContextTypeEnum_MatchingFunctionContextType_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -49,8 +53,9 @@ var MatchingFunctionContextTypeEnum_MatchingFunctionContextType_value = map[stri
 func (x MatchingFunctionContextTypeEnum_MatchingFunctionContextType) String() string {
 	return proto.EnumName(MatchingFunctionContextTypeEnum_MatchingFunctionContextType_name, int32(x))
 }
+
 func (MatchingFunctionContextTypeEnum_MatchingFunctionContextType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_context_type_1f6d87ceb71b483c, []int{0, 0}
+	return fileDescriptor_937b7f083ab86e9c, []int{0, 0}
 }
 
 // Container for context types for an operand in a matching function.
@@ -64,16 +69,17 @@ func (m *MatchingFunctionContextTypeEnum) Reset()         { *m = MatchingFunctio
 func (m *MatchingFunctionContextTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*MatchingFunctionContextTypeEnum) ProtoMessage()    {}
 func (*MatchingFunctionContextTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_context_type_1f6d87ceb71b483c, []int{0}
+	return fileDescriptor_937b7f083ab86e9c, []int{0}
 }
+
 func (m *MatchingFunctionContextTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MatchingFunctionContextTypeEnum.Unmarshal(m, b)
 }
 func (m *MatchingFunctionContextTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MatchingFunctionContextTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *MatchingFunctionContextTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MatchingFunctionContextTypeEnum.Merge(dst, src)
+func (m *MatchingFunctionContextTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MatchingFunctionContextTypeEnum.Merge(m, src)
 }
 func (m *MatchingFunctionContextTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_MatchingFunctionContextTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *MatchingFunctionContextTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MatchingFunctionContextTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MatchingFunctionContextTypeEnum)(nil), "google.ads.googleads.v1.enums.MatchingFunctionContextTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MatchingFunctionContextTypeEnum_MatchingFunctionContextType", MatchingFunctionContextTypeEnum_MatchingFunctionContextType_name, MatchingFunctionContextTypeEnum_MatchingFunctionContextType_value)
+	proto.RegisterType((*MatchingFunctionContextTypeEnum)(nil), "google.ads.googleads.v1.enums.MatchingFunctionContextTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/matching_function_context_type.proto", fileDescriptor_matching_function_context_type_1f6d87ceb71b483c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/matching_function_context_type.proto", fileDescriptor_937b7f083ab86e9c)
 }
 
-var fileDescriptor_matching_function_context_type_1f6d87ceb71b483c = []byte{
+var fileDescriptor_937b7f083ab86e9c = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x4b, 0xc3, 0x30,
 	0x18, 0xb5, 0x1d, 0x28, 0x64, 0x82, 0xa5, 0x47, 0x75, 0xe8, 0xf6, 0x03, 0x52, 0x8a, 0xb7, 0x78,
diff --git a/googleapis/ads/googleads/v1/enums/matching_function_operator.pb.go b/googleapis/ads/googleads/v1/enums/matching_function_operator.pb.go
index 76fd8f1537..1db6da60af 100644
--- a/googleapis/ads/googleads/v1/enums/matching_function_operator.pb.go
+++ b/googleapis/ads/googleads/v1/enums/matching_function_operator.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/matching_function_operator.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible operators in a matching function.
 type MatchingFunctionOperatorEnum_MatchingFunctionOperator int32
@@ -54,6 +57,7 @@ var MatchingFunctionOperatorEnum_MatchingFunctionOperator_name = map[int32]strin
 	5: "AND",
 	6: "CONTAINS_ANY",
 }
+
 var MatchingFunctionOperatorEnum_MatchingFunctionOperator_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -67,8 +71,9 @@ var MatchingFunctionOperatorEnum_MatchingFunctionOperator_value = map[string]int
 func (x MatchingFunctionOperatorEnum_MatchingFunctionOperator) String() string {
 	return proto.EnumName(MatchingFunctionOperatorEnum_MatchingFunctionOperator_name, int32(x))
 }
+
 func (MatchingFunctionOperatorEnum_MatchingFunctionOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_operator_2b1a251212d826f2, []int{0, 0}
+	return fileDescriptor_783bfd6aa74ae209, []int{0, 0}
 }
 
 // Container for enum describing matching function operator.
@@ -82,16 +87,17 @@ func (m *MatchingFunctionOperatorEnum) Reset()         { *m = MatchingFunctionOp
 func (m *MatchingFunctionOperatorEnum) String() string { return proto.CompactTextString(m) }
 func (*MatchingFunctionOperatorEnum) ProtoMessage()    {}
 func (*MatchingFunctionOperatorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_matching_function_operator_2b1a251212d826f2, []int{0}
+	return fileDescriptor_783bfd6aa74ae209, []int{0}
 }
+
 func (m *MatchingFunctionOperatorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MatchingFunctionOperatorEnum.Unmarshal(m, b)
 }
 func (m *MatchingFunctionOperatorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MatchingFunctionOperatorEnum.Marshal(b, m, deterministic)
 }
-func (dst *MatchingFunctionOperatorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MatchingFunctionOperatorEnum.Merge(dst, src)
+func (m *MatchingFunctionOperatorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MatchingFunctionOperatorEnum.Merge(m, src)
 }
 func (m *MatchingFunctionOperatorEnum) XXX_Size() int {
 	return xxx_messageInfo_MatchingFunctionOperatorEnum.Size(m)
@@ -103,15 +109,15 @@ func (m *MatchingFunctionOperatorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MatchingFunctionOperatorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MatchingFunctionOperatorEnum)(nil), "google.ads.googleads.v1.enums.MatchingFunctionOperatorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MatchingFunctionOperatorEnum_MatchingFunctionOperator", MatchingFunctionOperatorEnum_MatchingFunctionOperator_name, MatchingFunctionOperatorEnum_MatchingFunctionOperator_value)
+	proto.RegisterType((*MatchingFunctionOperatorEnum)(nil), "google.ads.googleads.v1.enums.MatchingFunctionOperatorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/matching_function_operator.proto", fileDescriptor_matching_function_operator_2b1a251212d826f2)
+	proto.RegisterFile("google/ads/googleads/v1/enums/matching_function_operator.proto", fileDescriptor_783bfd6aa74ae209)
 }
 
-var fileDescriptor_matching_function_operator_2b1a251212d826f2 = []byte{
+var fileDescriptor_783bfd6aa74ae209 = []byte{
 	// 345 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x6a, 0xf3, 0x30,
 	0x14, 0xfc, 0xec, 0x7c, 0x75, 0x8a, 0x12, 0xa8, 0xd0, 0xaa, 0x94, 0x64, 0x91, 0x1c, 0x40, 0xc6,
diff --git a/googleapis/ads/googleads/v1/enums/media_type.pb.go b/googleapis/ads/googleads/v1/enums/media_type.pb.go
index bab003317f..c334f22c34 100644
--- a/googleapis/ads/googleads/v1/enums/media_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/media_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/media_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of media.
 type MediaTypeEnum_MediaType int32
@@ -53,6 +56,7 @@ var MediaTypeEnum_MediaType_name = map[int32]string{
 	6: "VIDEO",
 	7: "DYNAMIC_IMAGE",
 }
+
 var MediaTypeEnum_MediaType_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -67,8 +71,9 @@ var MediaTypeEnum_MediaType_value = map[string]int32{
 func (x MediaTypeEnum_MediaType) String() string {
 	return proto.EnumName(MediaTypeEnum_MediaType_name, int32(x))
 }
+
 func (MediaTypeEnum_MediaType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_media_type_6fdd7d6f52c48143, []int{0, 0}
+	return fileDescriptor_6855a55699a4ce91, []int{0, 0}
 }
 
 // Container for enum describing the types of media.
@@ -82,16 +87,17 @@ func (m *MediaTypeEnum) Reset()         { *m = MediaTypeEnum{} }
 func (m *MediaTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*MediaTypeEnum) ProtoMessage()    {}
 func (*MediaTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_type_6fdd7d6f52c48143, []int{0}
+	return fileDescriptor_6855a55699a4ce91, []int{0}
 }
+
 func (m *MediaTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaTypeEnum.Unmarshal(m, b)
 }
 func (m *MediaTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *MediaTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaTypeEnum.Merge(dst, src)
+func (m *MediaTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaTypeEnum.Merge(m, src)
 }
 func (m *MediaTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_MediaTypeEnum.Size(m)
@@ -103,15 +109,15 @@ func (m *MediaTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MediaTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MediaTypeEnum)(nil), "google.ads.googleads.v1.enums.MediaTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MediaTypeEnum_MediaType", MediaTypeEnum_MediaType_name, MediaTypeEnum_MediaType_value)
+	proto.RegisterType((*MediaTypeEnum)(nil), "google.ads.googleads.v1.enums.MediaTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/media_type.proto", fileDescriptor_media_type_6fdd7d6f52c48143)
+	proto.RegisterFile("google/ads/googleads/v1/enums/media_type.proto", fileDescriptor_6855a55699a4ce91)
 }
 
-var fileDescriptor_media_type_6fdd7d6f52c48143 = []byte{
+var fileDescriptor_6855a55699a4ce91 = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4e, 0x83, 0x40,
 	0x18, 0xc5, 0x85, 0xfe, 0xb3, 0x53, 0xab, 0x23, 0x4b, 0x63, 0x17, 0xed, 0x01, 0x86, 0x10, 0x77,
diff --git a/googleapis/ads/googleads/v1/enums/merchant_center_link_status.pb.go b/googleapis/ads/googleads/v1/enums/merchant_center_link_status.pb.go
index 73fb4fc0a9..2a62ee4684 100644
--- a/googleapis/ads/googleads/v1/enums/merchant_center_link_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/merchant_center_link_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/merchant_center_link_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes the possible statuses for a link between a Google Ads customer
 // and a Google Merchant Center account.
@@ -41,6 +44,7 @@ var MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus_name = map[int32]strin
 	2: "ENABLED",
 	3: "PENDING",
 }
+
 var MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -51,8 +55,9 @@ var MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus_value = map[string]int
 func (x MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus) String() string {
 	return proto.EnumName(MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus_name, int32(x))
 }
+
 func (MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_status_ed4bf61ab73ed71c, []int{0, 0}
+	return fileDescriptor_3ca4362a21bcb5aa, []int{0, 0}
 }
 
 // Container for enum describing possible statuses of a Google Merchant Center
@@ -67,16 +72,17 @@ func (m *MerchantCenterLinkStatusEnum) Reset()         { *m = MerchantCenterLink
 func (m *MerchantCenterLinkStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*MerchantCenterLinkStatusEnum) ProtoMessage()    {}
 func (*MerchantCenterLinkStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_status_ed4bf61ab73ed71c, []int{0}
+	return fileDescriptor_3ca4362a21bcb5aa, []int{0}
 }
+
 func (m *MerchantCenterLinkStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MerchantCenterLinkStatusEnum.Unmarshal(m, b)
 }
 func (m *MerchantCenterLinkStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MerchantCenterLinkStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *MerchantCenterLinkStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MerchantCenterLinkStatusEnum.Merge(dst, src)
+func (m *MerchantCenterLinkStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MerchantCenterLinkStatusEnum.Merge(m, src)
 }
 func (m *MerchantCenterLinkStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_MerchantCenterLinkStatusEnum.Size(m)
@@ -88,15 +94,15 @@ func (m *MerchantCenterLinkStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MerchantCenterLinkStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MerchantCenterLinkStatusEnum)(nil), "google.ads.googleads.v1.enums.MerchantCenterLinkStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus", MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus_name, MerchantCenterLinkStatusEnum_MerchantCenterLinkStatus_value)
+	proto.RegisterType((*MerchantCenterLinkStatusEnum)(nil), "google.ads.googleads.v1.enums.MerchantCenterLinkStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/merchant_center_link_status.proto", fileDescriptor_merchant_center_link_status_ed4bf61ab73ed71c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/merchant_center_link_status.proto", fileDescriptor_3ca4362a21bcb5aa)
 }
 
-var fileDescriptor_merchant_center_link_status_ed4bf61ab73ed71c = []byte{
+var fileDescriptor_3ca4362a21bcb5aa = []byte{
 	// 315 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x6a, 0xeb, 0x30,
 	0x14, 0xfc, 0x71, 0xe0, 0x17, 0x94, 0x45, 0x4d, 0x56, 0xa5, 0x24, 0x8b, 0xe4, 0x00, 0x12, 0xa6,
diff --git a/googleapis/ads/googleads/v1/enums/message_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/message_placeholder_field.pb.go
index 6d79c81ee8..7bfdb2ae27 100644
--- a/googleapis/ads/googleads/v1/enums/message_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/message_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/message_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Message placeholder fields.
 type MessagePlaceholderFieldEnum_MessagePlaceholderField int32
@@ -50,6 +53,7 @@ var MessagePlaceholderFieldEnum_MessagePlaceholderField_name = map[int32]string{
 	5: "MESSAGE_EXTENSION_TEXT",
 	6: "MESSAGE_TEXT",
 }
+
 var MessagePlaceholderFieldEnum_MessagePlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":            0,
 	"UNKNOWN":                1,
@@ -63,8 +67,9 @@ var MessagePlaceholderFieldEnum_MessagePlaceholderField_value = map[string]int32
 func (x MessagePlaceholderFieldEnum_MessagePlaceholderField) String() string {
 	return proto.EnumName(MessagePlaceholderFieldEnum_MessagePlaceholderField_name, int32(x))
 }
+
 func (MessagePlaceholderFieldEnum_MessagePlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_message_placeholder_field_4faf76ed816f88ca, []int{0, 0}
+	return fileDescriptor_854ce0923e797876, []int{0, 0}
 }
 
 // Values for Message placeholder fields.
@@ -78,16 +83,17 @@ func (m *MessagePlaceholderFieldEnum) Reset()         { *m = MessagePlaceholderF
 func (m *MessagePlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*MessagePlaceholderFieldEnum) ProtoMessage()    {}
 func (*MessagePlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_message_placeholder_field_4faf76ed816f88ca, []int{0}
+	return fileDescriptor_854ce0923e797876, []int{0}
 }
+
 func (m *MessagePlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessagePlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *MessagePlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessagePlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *MessagePlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessagePlaceholderFieldEnum.Merge(dst, src)
+func (m *MessagePlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessagePlaceholderFieldEnum.Merge(m, src)
 }
 func (m *MessagePlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_MessagePlaceholderFieldEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *MessagePlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MessagePlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MessagePlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.MessagePlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MessagePlaceholderFieldEnum_MessagePlaceholderField", MessagePlaceholderFieldEnum_MessagePlaceholderField_name, MessagePlaceholderFieldEnum_MessagePlaceholderField_value)
+	proto.RegisterType((*MessagePlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.MessagePlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/message_placeholder_field.proto", fileDescriptor_message_placeholder_field_4faf76ed816f88ca)
+	proto.RegisterFile("google/ads/googleads/v1/enums/message_placeholder_field.proto", fileDescriptor_854ce0923e797876)
 }
 
-var fileDescriptor_message_placeholder_field_4faf76ed816f88ca = []byte{
+var fileDescriptor_854ce0923e797876 = []byte{
 	// 370 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x4f, 0x4e, 0xb3, 0x40,
 	0x1c, 0xfd, 0xa0, 0x9f, 0x35, 0x99, 0x6a, 0x44, 0x16, 0x9a, 0xd4, 0x76, 0xd1, 0x1e, 0x60, 0x08,
diff --git a/googleapis/ads/googleads/v1/enums/mime_type.pb.go b/googleapis/ads/googleads/v1/enums/mime_type.pb.go
index 4b3b0cd6cb..4e18a1dd2f 100644
--- a/googleapis/ads/googleads/v1/enums/mime_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/mime_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/mime_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The mime type
 type MimeTypeEnum_MimeType int32
@@ -71,6 +74,7 @@ var MimeTypeEnum_MimeType_name = map[int32]string{
 	12: "AUDIO_MP3",
 	13: "HTML5_AD_ZIP",
 }
+
 var MimeTypeEnum_MimeType_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -91,8 +95,9 @@ var MimeTypeEnum_MimeType_value = map[string]int32{
 func (x MimeTypeEnum_MimeType) String() string {
 	return proto.EnumName(MimeTypeEnum_MimeType_name, int32(x))
 }
+
 func (MimeTypeEnum_MimeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_mime_type_e0cd9d9a97a10483, []int{0, 0}
+	return fileDescriptor_247053ac99562566, []int{0, 0}
 }
 
 // Container for enum describing the mime types.
@@ -106,16 +111,17 @@ func (m *MimeTypeEnum) Reset()         { *m = MimeTypeEnum{} }
 func (m *MimeTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*MimeTypeEnum) ProtoMessage()    {}
 func (*MimeTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mime_type_e0cd9d9a97a10483, []int{0}
+	return fileDescriptor_247053ac99562566, []int{0}
 }
+
 func (m *MimeTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MimeTypeEnum.Unmarshal(m, b)
 }
 func (m *MimeTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MimeTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *MimeTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MimeTypeEnum.Merge(dst, src)
+func (m *MimeTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MimeTypeEnum.Merge(m, src)
 }
 func (m *MimeTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_MimeTypeEnum.Size(m)
@@ -127,15 +133,15 @@ func (m *MimeTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MimeTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MimeTypeEnum)(nil), "google.ads.googleads.v1.enums.MimeTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MimeTypeEnum_MimeType", MimeTypeEnum_MimeType_name, MimeTypeEnum_MimeType_value)
+	proto.RegisterType((*MimeTypeEnum)(nil), "google.ads.googleads.v1.enums.MimeTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/mime_type.proto", fileDescriptor_mime_type_e0cd9d9a97a10483)
+	proto.RegisterFile("google/ads/googleads/v1/enums/mime_type.proto", fileDescriptor_247053ac99562566)
 }
 
-var fileDescriptor_mime_type_e0cd9d9a97a10483 = []byte{
+var fileDescriptor_247053ac99562566 = []byte{
 	// 396 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x6e, 0x9b, 0x40,
 	0x10, 0x86, 0x0b, 0x6e, 0xec, 0x78, 0x6d, 0xb7, 0xab, 0x3d, 0x56, 0xcd, 0x21, 0xb9, 0x77, 0x11,
diff --git a/googleapis/ads/googleads/v1/enums/minute_of_hour.pb.go b/googleapis/ads/googleads/v1/enums/minute_of_hour.pb.go
index f0b54128a8..6c184c564a 100644
--- a/googleapis/ads/googleads/v1/enums/minute_of_hour.pb.go
+++ b/googleapis/ads/googleads/v1/enums/minute_of_hour.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/minute_of_hour.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates of quarter-hours. E.g. "FIFTEEN"
 type MinuteOfHourEnum_MinuteOfHour int32
@@ -45,6 +48,7 @@ var MinuteOfHourEnum_MinuteOfHour_name = map[int32]string{
 	4: "THIRTY",
 	5: "FORTY_FIVE",
 }
+
 var MinuteOfHourEnum_MinuteOfHour_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -57,8 +61,9 @@ var MinuteOfHourEnum_MinuteOfHour_value = map[string]int32{
 func (x MinuteOfHourEnum_MinuteOfHour) String() string {
 	return proto.EnumName(MinuteOfHourEnum_MinuteOfHour_name, int32(x))
 }
+
 func (MinuteOfHourEnum_MinuteOfHour) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_minute_of_hour_4dcf36a7c1549c65, []int{0, 0}
+	return fileDescriptor_8fd8f371ee9dca04, []int{0, 0}
 }
 
 // Container for enumeration of quarter-hours.
@@ -72,16 +77,17 @@ func (m *MinuteOfHourEnum) Reset()         { *m = MinuteOfHourEnum{} }
 func (m *MinuteOfHourEnum) String() string { return proto.CompactTextString(m) }
 func (*MinuteOfHourEnum) ProtoMessage()    {}
 func (*MinuteOfHourEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_minute_of_hour_4dcf36a7c1549c65, []int{0}
+	return fileDescriptor_8fd8f371ee9dca04, []int{0}
 }
+
 func (m *MinuteOfHourEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MinuteOfHourEnum.Unmarshal(m, b)
 }
 func (m *MinuteOfHourEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MinuteOfHourEnum.Marshal(b, m, deterministic)
 }
-func (dst *MinuteOfHourEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MinuteOfHourEnum.Merge(dst, src)
+func (m *MinuteOfHourEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MinuteOfHourEnum.Merge(m, src)
 }
 func (m *MinuteOfHourEnum) XXX_Size() int {
 	return xxx_messageInfo_MinuteOfHourEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *MinuteOfHourEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MinuteOfHourEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MinuteOfHourEnum)(nil), "google.ads.googleads.v1.enums.MinuteOfHourEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MinuteOfHourEnum_MinuteOfHour", MinuteOfHourEnum_MinuteOfHour_name, MinuteOfHourEnum_MinuteOfHour_value)
+	proto.RegisterType((*MinuteOfHourEnum)(nil), "google.ads.googleads.v1.enums.MinuteOfHourEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/minute_of_hour.proto", fileDescriptor_minute_of_hour_4dcf36a7c1549c65)
+	proto.RegisterFile("google/ads/googleads/v1/enums/minute_of_hour.proto", fileDescriptor_8fd8f371ee9dca04)
 }
 
-var fileDescriptor_minute_of_hour_4dcf36a7c1549c65 = []byte{
+var fileDescriptor_8fd8f371ee9dca04 = []byte{
 	// 323 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4f, 0x4e, 0xf2, 0x40,
 	0x1c, 0xfd, 0x28, 0x7c, 0x68, 0x06, 0xa3, 0x63, 0x97, 0x46, 0x16, 0x70, 0x80, 0x69, 0xaa, 0xbb,
diff --git a/googleapis/ads/googleads/v1/enums/mobile_device_type.pb.go b/googleapis/ads/googleads/v1/enums/mobile_device_type.pb.go
index 5d10cd8171..06115dbf6a 100644
--- a/googleapis/ads/googleads/v1/enums/mobile_device_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/mobile_device_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/mobile_device_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of mobile device.
 type MobileDeviceTypeEnum_MobileDeviceType int32
@@ -39,6 +42,7 @@ var MobileDeviceTypeEnum_MobileDeviceType_name = map[int32]string{
 	2: "MOBILE",
 	3: "TABLET",
 }
+
 var MobileDeviceTypeEnum_MobileDeviceType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var MobileDeviceTypeEnum_MobileDeviceType_value = map[string]int32{
 func (x MobileDeviceTypeEnum_MobileDeviceType) String() string {
 	return proto.EnumName(MobileDeviceTypeEnum_MobileDeviceType_name, int32(x))
 }
+
 func (MobileDeviceTypeEnum_MobileDeviceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_mobile_device_type_36c69dbb38a4b590, []int{0, 0}
+	return fileDescriptor_fa061ddb5d52e233, []int{0, 0}
 }
 
 // Container for enum describing the types of mobile device.
@@ -64,16 +69,17 @@ func (m *MobileDeviceTypeEnum) Reset()         { *m = MobileDeviceTypeEnum{} }
 func (m *MobileDeviceTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*MobileDeviceTypeEnum) ProtoMessage()    {}
 func (*MobileDeviceTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mobile_device_type_36c69dbb38a4b590, []int{0}
+	return fileDescriptor_fa061ddb5d52e233, []int{0}
 }
+
 func (m *MobileDeviceTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MobileDeviceTypeEnum.Unmarshal(m, b)
 }
 func (m *MobileDeviceTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MobileDeviceTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *MobileDeviceTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MobileDeviceTypeEnum.Merge(dst, src)
+func (m *MobileDeviceTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MobileDeviceTypeEnum.Merge(m, src)
 }
 func (m *MobileDeviceTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_MobileDeviceTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *MobileDeviceTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MobileDeviceTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MobileDeviceTypeEnum)(nil), "google.ads.googleads.v1.enums.MobileDeviceTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MobileDeviceTypeEnum_MobileDeviceType", MobileDeviceTypeEnum_MobileDeviceType_name, MobileDeviceTypeEnum_MobileDeviceType_value)
+	proto.RegisterType((*MobileDeviceTypeEnum)(nil), "google.ads.googleads.v1.enums.MobileDeviceTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/mobile_device_type.proto", fileDescriptor_mobile_device_type_36c69dbb38a4b590)
+	proto.RegisterFile("google/ads/googleads/v1/enums/mobile_device_type.proto", fileDescriptor_fa061ddb5d52e233)
 }
 
-var fileDescriptor_mobile_device_type_36c69dbb38a4b590 = []byte{
+var fileDescriptor_fa061ddb5d52e233 = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4f, 0x4b, 0xfb, 0x30,
 	0x18, 0xfe, 0xad, 0x83, 0xfd, 0x20, 0x3b, 0x58, 0x8a, 0x5e, 0xc4, 0x1d, 0xb6, 0x0f, 0x90, 0x50,
diff --git a/googleapis/ads/googleads/v1/enums/month_of_year.pb.go b/googleapis/ads/googleads/v1/enums/month_of_year.pb.go
index 34fdc0b3cc..1ce13b65c9 100644
--- a/googleapis/ads/googleads/v1/enums/month_of_year.pb.go
+++ b/googleapis/ads/googleads/v1/enums/month_of_year.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/month_of_year.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates months of the year, e.g., "January".
 type MonthOfYearEnum_MonthOfYear int32
@@ -69,6 +72,7 @@ var MonthOfYearEnum_MonthOfYear_name = map[int32]string{
 	12: "NOVEMBER",
 	13: "DECEMBER",
 }
+
 var MonthOfYearEnum_MonthOfYear_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -89,8 +93,9 @@ var MonthOfYearEnum_MonthOfYear_value = map[string]int32{
 func (x MonthOfYearEnum_MonthOfYear) String() string {
 	return proto.EnumName(MonthOfYearEnum_MonthOfYear_name, int32(x))
 }
+
 func (MonthOfYearEnum_MonthOfYear) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_month_of_year_833b1270d63ddf92, []int{0, 0}
+	return fileDescriptor_5a6459dd75e57391, []int{0, 0}
 }
 
 // Container for enumeration of months of the year, e.g., "January".
@@ -104,16 +109,17 @@ func (m *MonthOfYearEnum) Reset()         { *m = MonthOfYearEnum{} }
 func (m *MonthOfYearEnum) String() string { return proto.CompactTextString(m) }
 func (*MonthOfYearEnum) ProtoMessage()    {}
 func (*MonthOfYearEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_month_of_year_833b1270d63ddf92, []int{0}
+	return fileDescriptor_5a6459dd75e57391, []int{0}
 }
+
 func (m *MonthOfYearEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MonthOfYearEnum.Unmarshal(m, b)
 }
 func (m *MonthOfYearEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MonthOfYearEnum.Marshal(b, m, deterministic)
 }
-func (dst *MonthOfYearEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MonthOfYearEnum.Merge(dst, src)
+func (m *MonthOfYearEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MonthOfYearEnum.Merge(m, src)
 }
 func (m *MonthOfYearEnum) XXX_Size() int {
 	return xxx_messageInfo_MonthOfYearEnum.Size(m)
@@ -125,15 +131,15 @@ func (m *MonthOfYearEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MonthOfYearEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MonthOfYearEnum)(nil), "google.ads.googleads.v1.enums.MonthOfYearEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MonthOfYearEnum_MonthOfYear", MonthOfYearEnum_MonthOfYear_name, MonthOfYearEnum_MonthOfYear_value)
+	proto.RegisterType((*MonthOfYearEnum)(nil), "google.ads.googleads.v1.enums.MonthOfYearEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/month_of_year.proto", fileDescriptor_month_of_year_833b1270d63ddf92)
+	proto.RegisterFile("google/ads/googleads/v1/enums/month_of_year.proto", fileDescriptor_5a6459dd75e57391)
 }
 
-var fileDescriptor_month_of_year_833b1270d63ddf92 = []byte{
+var fileDescriptor_5a6459dd75e57391 = []byte{
 	// 389 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xcb, 0x8e, 0xd3, 0x30,
 	0x14, 0x25, 0xe9, 0x4c, 0x1f, 0xce, 0x8c, 0xc6, 0xf2, 0x12, 0x31, 0x8b, 0x99, 0x0f, 0x70, 0x14,
diff --git a/googleapis/ads/googleads/v1/enums/mutate_job_status.pb.go b/googleapis/ads/googleads/v1/enums/mutate_job_status.pb.go
index 7349e83705..4ed4958b7a 100644
--- a/googleapis/ads/googleads/v1/enums/mutate_job_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/mutate_job_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/mutate_job_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The mutate job statuses.
 type MutateJobStatusEnum_MutateJobStatus int32
@@ -42,6 +45,7 @@ var MutateJobStatusEnum_MutateJobStatus_name = map[int32]string{
 	3: "RUNNING",
 	4: "DONE",
 }
+
 var MutateJobStatusEnum_MutateJobStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var MutateJobStatusEnum_MutateJobStatus_value = map[string]int32{
 func (x MutateJobStatusEnum_MutateJobStatus) String() string {
 	return proto.EnumName(MutateJobStatusEnum_MutateJobStatus_name, int32(x))
 }
+
 func (MutateJobStatusEnum_MutateJobStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_status_c1054ab47bf7cadd, []int{0, 0}
+	return fileDescriptor_48c0d38bc796ede0, []int{0, 0}
 }
 
 // Container for enum describing possible mutate job statuses.
@@ -68,16 +73,17 @@ func (m *MutateJobStatusEnum) Reset()         { *m = MutateJobStatusEnum{} }
 func (m *MutateJobStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*MutateJobStatusEnum) ProtoMessage()    {}
 func (*MutateJobStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_status_c1054ab47bf7cadd, []int{0}
+	return fileDescriptor_48c0d38bc796ede0, []int{0}
 }
+
 func (m *MutateJobStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateJobStatusEnum.Unmarshal(m, b)
 }
 func (m *MutateJobStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateJobStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *MutateJobStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateJobStatusEnum.Merge(dst, src)
+func (m *MutateJobStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateJobStatusEnum.Merge(m, src)
 }
 func (m *MutateJobStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_MutateJobStatusEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *MutateJobStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MutateJobStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MutateJobStatusEnum)(nil), "google.ads.googleads.v1.enums.MutateJobStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.MutateJobStatusEnum_MutateJobStatus", MutateJobStatusEnum_MutateJobStatus_name, MutateJobStatusEnum_MutateJobStatus_value)
+	proto.RegisterType((*MutateJobStatusEnum)(nil), "google.ads.googleads.v1.enums.MutateJobStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/mutate_job_status.proto", fileDescriptor_mutate_job_status_c1054ab47bf7cadd)
+	proto.RegisterFile("google/ads/googleads/v1/enums/mutate_job_status.proto", fileDescriptor_48c0d38bc796ede0)
 }
 
-var fileDescriptor_mutate_job_status_c1054ab47bf7cadd = []byte{
+var fileDescriptor_48c0d38bc796ede0 = []byte{
 	// 309 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4a, 0xc3, 0x30,
 	0x14, 0x75, 0xdd, 0x50, 0xc9, 0x1e, 0x56, 0xaa, 0x4f, 0xe2, 0x1e, 0xb6, 0x0f, 0x48, 0x28, 0xe2,
diff --git a/googleapis/ads/googleads/v1/enums/negative_geo_target_type.pb.go b/googleapis/ads/googleads/v1/enums/negative_geo_target_type.pb.go
index 7e096f2aaa..7a8c4e3cf3 100644
--- a/googleapis/ads/googleads/v1/enums/negative_geo_target_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/negative_geo_target_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/negative_geo_target_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible negative geo target types.
 type NegativeGeoTargetTypeEnum_NegativeGeoTargetType int32
@@ -41,6 +44,7 @@ var NegativeGeoTargetTypeEnum_NegativeGeoTargetType_name = map[int32]string{
 	2: "DONT_CARE",
 	3: "LOCATION_OF_PRESENCE",
 }
+
 var NegativeGeoTargetTypeEnum_NegativeGeoTargetType_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -51,8 +55,9 @@ var NegativeGeoTargetTypeEnum_NegativeGeoTargetType_value = map[string]int32{
 func (x NegativeGeoTargetTypeEnum_NegativeGeoTargetType) String() string {
 	return proto.EnumName(NegativeGeoTargetTypeEnum_NegativeGeoTargetType_name, int32(x))
 }
+
 func (NegativeGeoTargetTypeEnum_NegativeGeoTargetType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_negative_geo_target_type_835f17c79fca4c8e, []int{0, 0}
+	return fileDescriptor_66c4692eef99de00, []int{0, 0}
 }
 
 // Container for enum describing possible negative geo target types.
@@ -66,16 +71,17 @@ func (m *NegativeGeoTargetTypeEnum) Reset()         { *m = NegativeGeoTargetType
 func (m *NegativeGeoTargetTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*NegativeGeoTargetTypeEnum) ProtoMessage()    {}
 func (*NegativeGeoTargetTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_negative_geo_target_type_835f17c79fca4c8e, []int{0}
+	return fileDescriptor_66c4692eef99de00, []int{0}
 }
+
 func (m *NegativeGeoTargetTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NegativeGeoTargetTypeEnum.Unmarshal(m, b)
 }
 func (m *NegativeGeoTargetTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NegativeGeoTargetTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *NegativeGeoTargetTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NegativeGeoTargetTypeEnum.Merge(dst, src)
+func (m *NegativeGeoTargetTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NegativeGeoTargetTypeEnum.Merge(m, src)
 }
 func (m *NegativeGeoTargetTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_NegativeGeoTargetTypeEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *NegativeGeoTargetTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_NegativeGeoTargetTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*NegativeGeoTargetTypeEnum)(nil), "google.ads.googleads.v1.enums.NegativeGeoTargetTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.NegativeGeoTargetTypeEnum_NegativeGeoTargetType", NegativeGeoTargetTypeEnum_NegativeGeoTargetType_name, NegativeGeoTargetTypeEnum_NegativeGeoTargetType_value)
+	proto.RegisterType((*NegativeGeoTargetTypeEnum)(nil), "google.ads.googleads.v1.enums.NegativeGeoTargetTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/negative_geo_target_type.proto", fileDescriptor_negative_geo_target_type_835f17c79fca4c8e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/negative_geo_target_type.proto", fileDescriptor_66c4692eef99de00)
 }
 
-var fileDescriptor_negative_geo_target_type_835f17c79fca4c8e = []byte{
+var fileDescriptor_66c4692eef99de00 = []byte{
 	// 332 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xeb, 0x30,
 	0x1c, 0xc6, 0xcf, 0x3a, 0x38, 0x87, 0x93, 0x21, 0x96, 0xa2, 0xa0, 0xc3, 0x5d, 0x6c, 0x0f, 0x90,
diff --git a/googleapis/ads/googleads/v1/enums/operating_system_version_operator_type.pb.go b/googleapis/ads/googleads/v1/enums/operating_system_version_operator_type.pb.go
index 8eb10aaee6..78bf1b3283 100644
--- a/googleapis/ads/googleads/v1/enums/operating_system_version_operator_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/operating_system_version_operator_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/operating_system_version_operator_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of operating system version.
 type OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType int32
@@ -39,6 +42,7 @@ var OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType_na
 	2: "EQUALS_TO",
 	4: "GREATER_THAN_EQUALS_TO",
 }
+
 var OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType_value = map[string]int32{
 	"UNSPECIFIED":            0,
 	"UNKNOWN":                1,
@@ -49,8 +53,9 @@ var OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType_va
 func (x OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType) String() string {
 	return proto.EnumName(OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType_name, int32(x))
 }
+
 func (OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operating_system_version_operator_type_03c667b04f322a09, []int{0, 0}
+	return fileDescriptor_87a572f6e7ce491f, []int{0, 0}
 }
 
 // Container for enum describing the type of OS operators.
@@ -66,16 +71,17 @@ func (m *OperatingSystemVersionOperatorTypeEnum) Reset() {
 func (m *OperatingSystemVersionOperatorTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*OperatingSystemVersionOperatorTypeEnum) ProtoMessage()    {}
 func (*OperatingSystemVersionOperatorTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operating_system_version_operator_type_03c667b04f322a09, []int{0}
+	return fileDescriptor_87a572f6e7ce491f, []int{0}
 }
+
 func (m *OperatingSystemVersionOperatorTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperatingSystemVersionOperatorTypeEnum.Unmarshal(m, b)
 }
 func (m *OperatingSystemVersionOperatorTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperatingSystemVersionOperatorTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *OperatingSystemVersionOperatorTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperatingSystemVersionOperatorTypeEnum.Merge(dst, src)
+func (m *OperatingSystemVersionOperatorTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperatingSystemVersionOperatorTypeEnum.Merge(m, src)
 }
 func (m *OperatingSystemVersionOperatorTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_OperatingSystemVersionOperatorTypeEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *OperatingSystemVersionOperatorTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_OperatingSystemVersionOperatorTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*OperatingSystemVersionOperatorTypeEnum)(nil), "google.ads.googleads.v1.enums.OperatingSystemVersionOperatorTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType", OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType_name, OperatingSystemVersionOperatorTypeEnum_OperatingSystemVersionOperatorType_value)
+	proto.RegisterType((*OperatingSystemVersionOperatorTypeEnum)(nil), "google.ads.googleads.v1.enums.OperatingSystemVersionOperatorTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/operating_system_version_operator_type.proto", fileDescriptor_operating_system_version_operator_type_03c667b04f322a09)
+	proto.RegisterFile("google/ads/googleads/v1/enums/operating_system_version_operator_type.proto", fileDescriptor_87a572f6e7ce491f)
 }
 
-var fileDescriptor_operating_system_version_operator_type_03c667b04f322a09 = []byte{
+var fileDescriptor_87a572f6e7ce491f = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x51, 0x4f, 0x4b, 0xc3, 0x30,
 	0x1c, 0xb5, 0x55, 0x14, 0x33, 0xc4, 0xd1, 0x83, 0x87, 0xe1, 0x0e, 0xdb, 0x41, 0x6f, 0x29, 0xc5,
diff --git a/googleapis/ads/googleads/v1/enums/page_one_promoted_strategy_goal.pb.go b/googleapis/ads/googleads/v1/enums/page_one_promoted_strategy_goal.pb.go
index dd031df646..6761e8b9c2 100644
--- a/googleapis/ads/googleads/v1/enums/page_one_promoted_strategy_goal.pb.go
+++ b/googleapis/ads/googleads/v1/enums/page_one_promoted_strategy_goal.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/page_one_promoted_strategy_goal.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible strategy goals.
 type PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal int32
@@ -39,6 +42,7 @@ var PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal_name = map[int32
 	2: "FIRST_PAGE",
 	3: "FIRST_PAGE_PROMOTED",
 }
+
 var PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -49,8 +53,9 @@ var PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal_value = map[stri
 func (x PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal) String() string {
 	return proto.EnumName(PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal_name, int32(x))
 }
+
 func (PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_page_one_promoted_strategy_goal_af27d4f7a36bbf23, []int{0, 0}
+	return fileDescriptor_a14ec166d42f2f9d, []int{0, 0}
 }
 
 // Container for enum describing possible strategy goals: where impressions are
@@ -65,16 +70,17 @@ func (m *PageOnePromotedStrategyGoalEnum) Reset()         { *m = PageOnePromoted
 func (m *PageOnePromotedStrategyGoalEnum) String() string { return proto.CompactTextString(m) }
 func (*PageOnePromotedStrategyGoalEnum) ProtoMessage()    {}
 func (*PageOnePromotedStrategyGoalEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_page_one_promoted_strategy_goal_af27d4f7a36bbf23, []int{0}
+	return fileDescriptor_a14ec166d42f2f9d, []int{0}
 }
+
 func (m *PageOnePromotedStrategyGoalEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PageOnePromotedStrategyGoalEnum.Unmarshal(m, b)
 }
 func (m *PageOnePromotedStrategyGoalEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PageOnePromotedStrategyGoalEnum.Marshal(b, m, deterministic)
 }
-func (dst *PageOnePromotedStrategyGoalEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PageOnePromotedStrategyGoalEnum.Merge(dst, src)
+func (m *PageOnePromotedStrategyGoalEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PageOnePromotedStrategyGoalEnum.Merge(m, src)
 }
 func (m *PageOnePromotedStrategyGoalEnum) XXX_Size() int {
 	return xxx_messageInfo_PageOnePromotedStrategyGoalEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *PageOnePromotedStrategyGoalEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PageOnePromotedStrategyGoalEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PageOnePromotedStrategyGoalEnum)(nil), "google.ads.googleads.v1.enums.PageOnePromotedStrategyGoalEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal", PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal_name, PageOnePromotedStrategyGoalEnum_PageOnePromotedStrategyGoal_value)
+	proto.RegisterType((*PageOnePromotedStrategyGoalEnum)(nil), "google.ads.googleads.v1.enums.PageOnePromotedStrategyGoalEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/page_one_promoted_strategy_goal.proto", fileDescriptor_page_one_promoted_strategy_goal_af27d4f7a36bbf23)
+	proto.RegisterFile("google/ads/googleads/v1/enums/page_one_promoted_strategy_goal.proto", fileDescriptor_a14ec166d42f2f9d)
 }
 
-var fileDescriptor_page_one_promoted_strategy_goal_af27d4f7a36bbf23 = []byte{
+var fileDescriptor_a14ec166d42f2f9d = []byte{
 	// 331 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcd, 0x4a, 0xc3, 0x40,
 	0x18, 0x34, 0x29, 0x28, 0x6c, 0x41, 0x43, 0x3c, 0x08, 0x6a, 0xd1, 0xf6, 0x01, 0x36, 0x04, 0x6f,
diff --git a/googleapis/ads/googleads/v1/enums/parental_status_type.pb.go b/googleapis/ads/googleads/v1/enums/parental_status_type.pb.go
index 24c91389ff..d1c5c183f8 100644
--- a/googleapis/ads/googleads/v1/enums/parental_status_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/parental_status_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/parental_status_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of parental statuses (e.g. not a parent).
 type ParentalStatusTypeEnum_ParentalStatusType int32
@@ -42,6 +45,7 @@ var ParentalStatusTypeEnum_ParentalStatusType_name = map[int32]string{
 	301: "NOT_A_PARENT",
 	302: "UNDETERMINED",
 }
+
 var ParentalStatusTypeEnum_ParentalStatusType_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -53,8 +57,9 @@ var ParentalStatusTypeEnum_ParentalStatusType_value = map[string]int32{
 func (x ParentalStatusTypeEnum_ParentalStatusType) String() string {
 	return proto.EnumName(ParentalStatusTypeEnum_ParentalStatusType_name, int32(x))
 }
+
 func (ParentalStatusTypeEnum_ParentalStatusType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_parental_status_type_7dc2fa597ff4162a, []int{0, 0}
+	return fileDescriptor_9954dc976e658902, []int{0, 0}
 }
 
 // Container for enum describing the type of demographic parental statuses.
@@ -68,16 +73,17 @@ func (m *ParentalStatusTypeEnum) Reset()         { *m = ParentalStatusTypeEnum{}
 func (m *ParentalStatusTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ParentalStatusTypeEnum) ProtoMessage()    {}
 func (*ParentalStatusTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_parental_status_type_7dc2fa597ff4162a, []int{0}
+	return fileDescriptor_9954dc976e658902, []int{0}
 }
+
 func (m *ParentalStatusTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParentalStatusTypeEnum.Unmarshal(m, b)
 }
 func (m *ParentalStatusTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParentalStatusTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ParentalStatusTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParentalStatusTypeEnum.Merge(dst, src)
+func (m *ParentalStatusTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParentalStatusTypeEnum.Merge(m, src)
 }
 func (m *ParentalStatusTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ParentalStatusTypeEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *ParentalStatusTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ParentalStatusTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ParentalStatusTypeEnum)(nil), "google.ads.googleads.v1.enums.ParentalStatusTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ParentalStatusTypeEnum_ParentalStatusType", ParentalStatusTypeEnum_ParentalStatusType_name, ParentalStatusTypeEnum_ParentalStatusType_value)
+	proto.RegisterType((*ParentalStatusTypeEnum)(nil), "google.ads.googleads.v1.enums.ParentalStatusTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/parental_status_type.proto", fileDescriptor_parental_status_type_7dc2fa597ff4162a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/parental_status_type.proto", fileDescriptor_9954dc976e658902)
 }
 
-var fileDescriptor_parental_status_type_7dc2fa597ff4162a = []byte{
+var fileDescriptor_9954dc976e658902 = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4f, 0x4a, 0x33, 0x31,
 	0x1c, 0xfd, 0x3a, 0x1f, 0x54, 0x48, 0x05, 0xc7, 0x59, 0x28, 0x88, 0x5d, 0xb4, 0x07, 0xc8, 0x30,
diff --git a/googleapis/ads/googleads/v1/enums/payment_mode.pb.go b/googleapis/ads/googleads/v1/enums/payment_mode.pb.go
index 82c4c542ff..c324b97f03 100644
--- a/googleapis/ads/googleads/v1/enums/payment_mode.pb.go
+++ b/googleapis/ads/googleads/v1/enums/payment_mode.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/payment_mode.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible payment modes.
 type PaymentModeEnum_PaymentMode int32
@@ -48,6 +51,7 @@ var PaymentModeEnum_PaymentMode_name = map[int32]string{
 	5: "CONVERSION_VALUE",
 	6: "CONVERSIONS",
 }
+
 var PaymentModeEnum_PaymentMode_value = map[string]int32{
 	"UNSPECIFIED":      0,
 	"UNKNOWN":          1,
@@ -59,8 +63,9 @@ var PaymentModeEnum_PaymentMode_value = map[string]int32{
 func (x PaymentModeEnum_PaymentMode) String() string {
 	return proto.EnumName(PaymentModeEnum_PaymentMode_name, int32(x))
 }
+
 func (PaymentModeEnum_PaymentMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_payment_mode_1e9387136819e800, []int{0, 0}
+	return fileDescriptor_b7c5af4378e229c7, []int{0, 0}
 }
 
 // Container for enum describing possible payment modes.
@@ -74,16 +79,17 @@ func (m *PaymentModeEnum) Reset()         { *m = PaymentModeEnum{} }
 func (m *PaymentModeEnum) String() string { return proto.CompactTextString(m) }
 func (*PaymentModeEnum) ProtoMessage()    {}
 func (*PaymentModeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_payment_mode_1e9387136819e800, []int{0}
+	return fileDescriptor_b7c5af4378e229c7, []int{0}
 }
+
 func (m *PaymentModeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PaymentModeEnum.Unmarshal(m, b)
 }
 func (m *PaymentModeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PaymentModeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PaymentModeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PaymentModeEnum.Merge(dst, src)
+func (m *PaymentModeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PaymentModeEnum.Merge(m, src)
 }
 func (m *PaymentModeEnum) XXX_Size() int {
 	return xxx_messageInfo_PaymentModeEnum.Size(m)
@@ -95,15 +101,15 @@ func (m *PaymentModeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PaymentModeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PaymentModeEnum)(nil), "google.ads.googleads.v1.enums.PaymentModeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PaymentModeEnum_PaymentMode", PaymentModeEnum_PaymentMode_name, PaymentModeEnum_PaymentMode_value)
+	proto.RegisterType((*PaymentModeEnum)(nil), "google.ads.googleads.v1.enums.PaymentModeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/payment_mode.proto", fileDescriptor_payment_mode_1e9387136819e800)
+	proto.RegisterFile("google/ads/googleads/v1/enums/payment_mode.proto", fileDescriptor_b7c5af4378e229c7)
 }
 
-var fileDescriptor_payment_mode_1e9387136819e800 = []byte{
+var fileDescriptor_b7c5af4378e229c7 = []byte{
 	// 312 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x1c, 0x76, 0x53, 0x27, 0x64, 0x87, 0x85, 0xe2, 0x49, 0xdc, 0x61, 0x7b, 0x80, 0xd4, 0xe2, 0x2d,
diff --git a/googleapis/ads/googleads/v1/enums/placeholder_type.pb.go b/googleapis/ads/googleads/v1/enums/placeholder_type.pb.go
index 8f8ecb5af7..4ab42eef41 100644
--- a/googleapis/ads/googleads/v1/enums/placeholder_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/placeholder_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/placeholder_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible placeholder types for a feed mapping.
 type PlaceholderTypeEnum_PlaceholderType int32
@@ -110,6 +113,7 @@ var PlaceholderTypeEnum_PlaceholderType_name = map[int32]string{
 	19: "DYNAMIC_LOCAL",
 	20: "DYNAMIC_JOB",
 }
+
 var PlaceholderTypeEnum_PlaceholderType_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -137,8 +141,9 @@ var PlaceholderTypeEnum_PlaceholderType_value = map[string]int32{
 func (x PlaceholderTypeEnum_PlaceholderType) String() string {
 	return proto.EnumName(PlaceholderTypeEnum_PlaceholderType_name, int32(x))
 }
+
 func (PlaceholderTypeEnum_PlaceholderType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_placeholder_type_3e5fe1fcc2d8440e, []int{0, 0}
+	return fileDescriptor_4007a2ae92623c7b, []int{0, 0}
 }
 
 // Container for enum describing possible placeholder types for a feed mapping.
@@ -152,16 +157,17 @@ func (m *PlaceholderTypeEnum) Reset()         { *m = PlaceholderTypeEnum{} }
 func (m *PlaceholderTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*PlaceholderTypeEnum) ProtoMessage()    {}
 func (*PlaceholderTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_placeholder_type_3e5fe1fcc2d8440e, []int{0}
+	return fileDescriptor_4007a2ae92623c7b, []int{0}
 }
+
 func (m *PlaceholderTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlaceholderTypeEnum.Unmarshal(m, b)
 }
 func (m *PlaceholderTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlaceholderTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PlaceholderTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlaceholderTypeEnum.Merge(dst, src)
+func (m *PlaceholderTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlaceholderTypeEnum.Merge(m, src)
 }
 func (m *PlaceholderTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_PlaceholderTypeEnum.Size(m)
@@ -173,15 +179,15 @@ func (m *PlaceholderTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PlaceholderTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PlaceholderTypeEnum)(nil), "google.ads.googleads.v1.enums.PlaceholderTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PlaceholderTypeEnum_PlaceholderType", PlaceholderTypeEnum_PlaceholderType_name, PlaceholderTypeEnum_PlaceholderType_value)
+	proto.RegisterType((*PlaceholderTypeEnum)(nil), "google.ads.googleads.v1.enums.PlaceholderTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/placeholder_type.proto", fileDescriptor_placeholder_type_3e5fe1fcc2d8440e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/placeholder_type.proto", fileDescriptor_4007a2ae92623c7b)
 }
 
-var fileDescriptor_placeholder_type_3e5fe1fcc2d8440e = []byte{
+var fileDescriptor_4007a2ae92623c7b = []byte{
 	// 492 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6e, 0x9b, 0x3e,
 	0x14, 0xc6, 0xff, 0x21, 0x6d, 0x93, 0x38, 0x4d, 0xe3, 0x38, 0xfd, 0x6f, 0xd2, 0xb4, 0x5e, 0xb4,
diff --git a/googleapis/ads/googleads/v1/enums/placement_type.pb.go b/googleapis/ads/googleads/v1/enums/placement_type.pb.go
index a7f08e3a0a..ac3a5cad14 100644
--- a/googleapis/ads/googleads/v1/enums/placement_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/placement_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/placement_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible placement types for a feed mapping.
 type PlacementTypeEnum_PlacementType int32
@@ -48,6 +51,7 @@ var PlacementTypeEnum_PlacementType_name = map[int32]string{
 	5: "YOUTUBE_VIDEO",
 	6: "YOUTUBE_CHANNEL",
 }
+
 var PlacementTypeEnum_PlacementType_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -61,8 +65,9 @@ var PlacementTypeEnum_PlacementType_value = map[string]int32{
 func (x PlacementTypeEnum_PlacementType) String() string {
 	return proto.EnumName(PlacementTypeEnum_PlacementType_name, int32(x))
 }
+
 func (PlacementTypeEnum_PlacementType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_placement_type_dc725b3e437565ca, []int{0, 0}
+	return fileDescriptor_b1a4b1f4d95c82a7, []int{0, 0}
 }
 
 // Container for enum describing possible placement types.
@@ -76,16 +81,17 @@ func (m *PlacementTypeEnum) Reset()         { *m = PlacementTypeEnum{} }
 func (m *PlacementTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*PlacementTypeEnum) ProtoMessage()    {}
 func (*PlacementTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_placement_type_dc725b3e437565ca, []int{0}
+	return fileDescriptor_b1a4b1f4d95c82a7, []int{0}
 }
+
 func (m *PlacementTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlacementTypeEnum.Unmarshal(m, b)
 }
 func (m *PlacementTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlacementTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PlacementTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlacementTypeEnum.Merge(dst, src)
+func (m *PlacementTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlacementTypeEnum.Merge(m, src)
 }
 func (m *PlacementTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_PlacementTypeEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *PlacementTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PlacementTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PlacementTypeEnum)(nil), "google.ads.googleads.v1.enums.PlacementTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PlacementTypeEnum_PlacementType", PlacementTypeEnum_PlacementType_name, PlacementTypeEnum_PlacementType_value)
+	proto.RegisterType((*PlacementTypeEnum)(nil), "google.ads.googleads.v1.enums.PlacementTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/placement_type.proto", fileDescriptor_placement_type_dc725b3e437565ca)
+	proto.RegisterFile("google/ads/googleads/v1/enums/placement_type.proto", fileDescriptor_b1a4b1f4d95c82a7)
 }
 
-var fileDescriptor_placement_type_dc725b3e437565ca = []byte{
+var fileDescriptor_b1a4b1f4d95c82a7 = []byte{
 	// 360 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x6a, 0xa3, 0x40,
 	0x14, 0x5e, 0xcd, 0x6e, 0x16, 0x26, 0x84, 0x98, 0x09, 0xec, 0xc2, 0xb2, 0xb9, 0x48, 0x1e, 0x60,
diff --git a/googleapis/ads/googleads/v1/enums/policy_approval_status.pb.go b/googleapis/ads/googleads/v1/enums/policy_approval_status.pb.go
index 5e530704ad..5d45be03ee 100644
--- a/googleapis/ads/googleads/v1/enums/policy_approval_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/policy_approval_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/policy_approval_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible policy approval statuses. When there are several approval
 // statuses available the most severe one will be used. The order of severity
@@ -50,6 +53,7 @@ var PolicyApprovalStatusEnum_PolicyApprovalStatus_name = map[int32]string{
 	4: "APPROVED",
 	5: "AREA_OF_INTEREST_ONLY",
 }
+
 var PolicyApprovalStatusEnum_PolicyApprovalStatus_value = map[string]int32{
 	"UNSPECIFIED":           0,
 	"UNKNOWN":               1,
@@ -62,8 +66,9 @@ var PolicyApprovalStatusEnum_PolicyApprovalStatus_value = map[string]int32{
 func (x PolicyApprovalStatusEnum_PolicyApprovalStatus) String() string {
 	return proto.EnumName(PolicyApprovalStatusEnum_PolicyApprovalStatus_name, int32(x))
 }
+
 func (PolicyApprovalStatusEnum_PolicyApprovalStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_approval_status_de38eaf2e45ee77d, []int{0, 0}
+	return fileDescriptor_44c273ba52c3688f, []int{0, 0}
 }
 
 // Container for enum describing possible policy approval statuses.
@@ -77,16 +82,17 @@ func (m *PolicyApprovalStatusEnum) Reset()         { *m = PolicyApprovalStatusEn
 func (m *PolicyApprovalStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*PolicyApprovalStatusEnum) ProtoMessage()    {}
 func (*PolicyApprovalStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_approval_status_de38eaf2e45ee77d, []int{0}
+	return fileDescriptor_44c273ba52c3688f, []int{0}
 }
+
 func (m *PolicyApprovalStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyApprovalStatusEnum.Unmarshal(m, b)
 }
 func (m *PolicyApprovalStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyApprovalStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyApprovalStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyApprovalStatusEnum.Merge(dst, src)
+func (m *PolicyApprovalStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyApprovalStatusEnum.Merge(m, src)
 }
 func (m *PolicyApprovalStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyApprovalStatusEnum.Size(m)
@@ -98,15 +104,15 @@ func (m *PolicyApprovalStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PolicyApprovalStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyApprovalStatusEnum)(nil), "google.ads.googleads.v1.enums.PolicyApprovalStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PolicyApprovalStatusEnum_PolicyApprovalStatus", PolicyApprovalStatusEnum_PolicyApprovalStatus_name, PolicyApprovalStatusEnum_PolicyApprovalStatus_value)
+	proto.RegisterType((*PolicyApprovalStatusEnum)(nil), "google.ads.googleads.v1.enums.PolicyApprovalStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/policy_approval_status.proto", fileDescriptor_policy_approval_status_de38eaf2e45ee77d)
+	proto.RegisterFile("google/ads/googleads/v1/enums/policy_approval_status.proto", fileDescriptor_44c273ba52c3688f)
 }
 
-var fileDescriptor_policy_approval_status_de38eaf2e45ee77d = []byte{
+var fileDescriptor_44c273ba52c3688f = []byte{
 	// 346 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x4a, 0xc3, 0x40,
 	0x14, 0x36, 0xa9, 0x7f, 0x4c, 0x05, 0x43, 0xa8, 0x60, 0xc5, 0x2e, 0xda, 0x03, 0x4c, 0x08, 0xee,
diff --git a/googleapis/ads/googleads/v1/enums/policy_review_status.pb.go b/googleapis/ads/googleads/v1/enums/policy_review_status.pb.go
index ca521031ed..9029dd6849 100644
--- a/googleapis/ads/googleads/v1/enums/policy_review_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/policy_review_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/policy_review_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible policy review statuses.
 type PolicyReviewStatusEnum_PolicyReviewStatus int32
@@ -45,6 +48,7 @@ var PolicyReviewStatusEnum_PolicyReviewStatus_name = map[int32]string{
 	3: "REVIEWED",
 	4: "UNDER_APPEAL",
 }
+
 var PolicyReviewStatusEnum_PolicyReviewStatus_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"UNKNOWN":            1,
@@ -56,8 +60,9 @@ var PolicyReviewStatusEnum_PolicyReviewStatus_value = map[string]int32{
 func (x PolicyReviewStatusEnum_PolicyReviewStatus) String() string {
 	return proto.EnumName(PolicyReviewStatusEnum_PolicyReviewStatus_name, int32(x))
 }
+
 func (PolicyReviewStatusEnum_PolicyReviewStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_review_status_8e59777bd577c932, []int{0, 0}
+	return fileDescriptor_07bf305fecc00f04, []int{0, 0}
 }
 
 // Container for enum describing possible policy review statuses.
@@ -71,16 +76,17 @@ func (m *PolicyReviewStatusEnum) Reset()         { *m = PolicyReviewStatusEnum{}
 func (m *PolicyReviewStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*PolicyReviewStatusEnum) ProtoMessage()    {}
 func (*PolicyReviewStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_review_status_8e59777bd577c932, []int{0}
+	return fileDescriptor_07bf305fecc00f04, []int{0}
 }
+
 func (m *PolicyReviewStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyReviewStatusEnum.Unmarshal(m, b)
 }
 func (m *PolicyReviewStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyReviewStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyReviewStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyReviewStatusEnum.Merge(dst, src)
+func (m *PolicyReviewStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyReviewStatusEnum.Merge(m, src)
 }
 func (m *PolicyReviewStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyReviewStatusEnum.Size(m)
@@ -92,15 +98,15 @@ func (m *PolicyReviewStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PolicyReviewStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyReviewStatusEnum)(nil), "google.ads.googleads.v1.enums.PolicyReviewStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PolicyReviewStatusEnum_PolicyReviewStatus", PolicyReviewStatusEnum_PolicyReviewStatus_name, PolicyReviewStatusEnum_PolicyReviewStatus_value)
+	proto.RegisterType((*PolicyReviewStatusEnum)(nil), "google.ads.googleads.v1.enums.PolicyReviewStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/policy_review_status.proto", fileDescriptor_policy_review_status_8e59777bd577c932)
+	proto.RegisterFile("google/ads/googleads/v1/enums/policy_review_status.proto", fileDescriptor_07bf305fecc00f04)
 }
 
-var fileDescriptor_policy_review_status_8e59777bd577c932 = []byte{
+var fileDescriptor_07bf305fecc00f04 = []byte{
 	// 330 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x1c, 0xb6, 0x9d, 0xa8, 0x64, 0x03, 0x4b, 0x0e, 0x13, 0xc4, 0x1d, 0xb6, 0x07, 0x48, 0x29, 0x5e,
diff --git a/googleapis/ads/googleads/v1/enums/policy_topic_entry_type.pb.go b/googleapis/ads/googleads/v1/enums/policy_topic_entry_type.pb.go
index 65e31dd61d..540000d9b0 100644
--- a/googleapis/ads/googleads/v1/enums/policy_topic_entry_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/policy_topic_entry_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/policy_topic_entry_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible policy topic entry types.
 type PolicyTopicEntryTypeEnum_PolicyTopicEntryType int32
@@ -55,6 +58,7 @@ var PolicyTopicEntryTypeEnum_PolicyTopicEntryType_name = map[int32]string{
 	6: "BROADENING",
 	7: "AREA_OF_INTEREST_ONLY",
 }
+
 var PolicyTopicEntryTypeEnum_PolicyTopicEntryType_value = map[string]int32{
 	"UNSPECIFIED":           0,
 	"UNKNOWN":               1,
@@ -69,8 +73,9 @@ var PolicyTopicEntryTypeEnum_PolicyTopicEntryType_value = map[string]int32{
 func (x PolicyTopicEntryTypeEnum_PolicyTopicEntryType) String() string {
 	return proto.EnumName(PolicyTopicEntryTypeEnum_PolicyTopicEntryType_name, int32(x))
 }
+
 func (PolicyTopicEntryTypeEnum_PolicyTopicEntryType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_topic_entry_type_2d86a58e897e12eb, []int{0, 0}
+	return fileDescriptor_80af3c322661380a, []int{0, 0}
 }
 
 // Container for enum describing possible policy topic entry types.
@@ -84,16 +89,17 @@ func (m *PolicyTopicEntryTypeEnum) Reset()         { *m = PolicyTopicEntryTypeEn
 func (m *PolicyTopicEntryTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*PolicyTopicEntryTypeEnum) ProtoMessage()    {}
 func (*PolicyTopicEntryTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_topic_entry_type_2d86a58e897e12eb, []int{0}
+	return fileDescriptor_80af3c322661380a, []int{0}
 }
+
 func (m *PolicyTopicEntryTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEntryTypeEnum.Unmarshal(m, b)
 }
 func (m *PolicyTopicEntryTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEntryTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEntryTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEntryTypeEnum.Merge(dst, src)
+func (m *PolicyTopicEntryTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEntryTypeEnum.Merge(m, src)
 }
 func (m *PolicyTopicEntryTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEntryTypeEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *PolicyTopicEntryTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PolicyTopicEntryTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyTopicEntryTypeEnum)(nil), "google.ads.googleads.v1.enums.PolicyTopicEntryTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PolicyTopicEntryTypeEnum_PolicyTopicEntryType", PolicyTopicEntryTypeEnum_PolicyTopicEntryType_name, PolicyTopicEntryTypeEnum_PolicyTopicEntryType_value)
+	proto.RegisterType((*PolicyTopicEntryTypeEnum)(nil), "google.ads.googleads.v1.enums.PolicyTopicEntryTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/policy_topic_entry_type.proto", fileDescriptor_policy_topic_entry_type_2d86a58e897e12eb)
+	proto.RegisterFile("google/ads/googleads/v1/enums/policy_topic_entry_type.proto", fileDescriptor_80af3c322661380a)
 }
 
-var fileDescriptor_policy_topic_entry_type_2d86a58e897e12eb = []byte{
+var fileDescriptor_80af3c322661380a = []byte{
 	// 379 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0xae, 0x93, 0x40,
 	0x18, 0x85, 0x05, 0xf5, 0x5e, 0x33, 0x37, 0x2a, 0x12, 0x4d, 0xbc, 0xc6, 0x2e, 0xda, 0x07, 0x18,
diff --git a/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_mismatch_url_type.pb.go b/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_mismatch_url_type.pb.go
index 851fea79c1..a0aab5c7a0 100644
--- a/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_mismatch_url_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_mismatch_url_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/policy_topic_evidence_destination_mismatch_url_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible policy topic evidence destination mismatch url types.
 type PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType int32
@@ -50,6 +53,7 @@ var PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestina
 	5: "TRACKING_URL",
 	6: "MOBILE_TRACKING_URL",
 }
+
 var PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -63,8 +67,9 @@ var PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestina
 func (x PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType) String() string {
 	return proto.EnumName(PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType_name, int32(x))
 }
+
 func (PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_topic_evidence_destination_mismatch_url_type_7351fdf0972bcdb9, []int{0, 0}
+	return fileDescriptor_9a328b758980e7be, []int{0, 0}
 }
 
 // Container for enum describing possible policy topic evidence destination
@@ -83,16 +88,17 @@ func (m *PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) String() string {
 }
 func (*PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) ProtoMessage() {}
 func (*PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_topic_evidence_destination_mismatch_url_type_7351fdf0972bcdb9, []int{0}
+	return fileDescriptor_9a328b758980e7be, []int{0}
 }
+
 func (m *PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidenceDestinationMismatchUrlTypeEnum.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidenceDestinationMismatchUrlTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidenceDestinationMismatchUrlTypeEnum.Merge(dst, src)
+func (m *PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidenceDestinationMismatchUrlTypeEnum.Merge(m, src)
 }
 func (m *PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidenceDestinationMismatchUrlTypeEnum.Size(m)
@@ -104,15 +110,15 @@ func (m *PolicyTopicEvidenceDestinationMismatchUrlTypeEnum) XXX_DiscardUnknown()
 var xxx_messageInfo_PolicyTopicEvidenceDestinationMismatchUrlTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyTopicEvidenceDestinationMismatchUrlTypeEnum)(nil), "google.ads.googleads.v1.enums.PolicyTopicEvidenceDestinationMismatchUrlTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType", PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType_name, PolicyTopicEvidenceDestinationMismatchUrlTypeEnum_PolicyTopicEvidenceDestinationMismatchUrlType_value)
+	proto.RegisterType((*PolicyTopicEvidenceDestinationMismatchUrlTypeEnum)(nil), "google.ads.googleads.v1.enums.PolicyTopicEvidenceDestinationMismatchUrlTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/policy_topic_evidence_destination_mismatch_url_type.proto", fileDescriptor_policy_topic_evidence_destination_mismatch_url_type_7351fdf0972bcdb9)
+	proto.RegisterFile("google/ads/googleads/v1/enums/policy_topic_evidence_destination_mismatch_url_type.proto", fileDescriptor_9a328b758980e7be)
 }
 
-var fileDescriptor_policy_topic_evidence_destination_mismatch_url_type_7351fdf0972bcdb9 = []byte{
+var fileDescriptor_9a328b758980e7be = []byte{
 	// 390 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x51, 0xc1, 0xaa, 0x9b, 0x40,
 	0x14, 0xad, 0xa6, 0x4d, 0xe9, 0xa4, 0xa5, 0x62, 0x0b, 0x85, 0xd2, 0x2c, 0x92, 0x7d, 0x47, 0x6c,
diff --git a/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_not_working_device.pb.go b/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_not_working_device.pb.go
index a9504cf294..98e7e40698 100644
--- a/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_not_working_device.pb.go
+++ b/googleapis/ads/googleads/v1/enums/policy_topic_evidence_destination_not_working_device.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/policy_topic_evidence_destination_not_working_device.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible policy topic evidence destination not working devices.
 type PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice int32
@@ -44,6 +47,7 @@ var PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestin
 	3: "ANDROID",
 	4: "IOS",
 }
+
 var PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -55,8 +59,9 @@ var PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestin
 func (x PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice) String() string {
 	return proto.EnumName(PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice_name, int32(x))
 }
+
 func (PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_topic_evidence_destination_not_working_device_c2cbfcd4d0456964, []int{0, 0}
+	return fileDescriptor_b10d0781dd50ac63, []int{0, 0}
 }
 
 // Container for enum describing possible policy topic evidence destination not
@@ -75,16 +80,17 @@ func (m *PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) String() string {
 }
 func (*PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) ProtoMessage() {}
 func (*PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_topic_evidence_destination_not_working_device_c2cbfcd4d0456964, []int{0}
+	return fileDescriptor_b10d0781dd50ac63, []int{0}
 }
+
 func (m *PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyTopicEvidenceDestinationNotWorkingDeviceEnum.Unmarshal(m, b)
 }
 func (m *PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyTopicEvidenceDestinationNotWorkingDeviceEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyTopicEvidenceDestinationNotWorkingDeviceEnum.Merge(dst, src)
+func (m *PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyTopicEvidenceDestinationNotWorkingDeviceEnum.Merge(m, src)
 }
 func (m *PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyTopicEvidenceDestinationNotWorkingDeviceEnum.Size(m)
@@ -96,15 +102,15 @@ func (m *PolicyTopicEvidenceDestinationNotWorkingDeviceEnum) XXX_DiscardUnknown(
 var xxx_messageInfo_PolicyTopicEvidenceDestinationNotWorkingDeviceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyTopicEvidenceDestinationNotWorkingDeviceEnum)(nil), "google.ads.googleads.v1.enums.PolicyTopicEvidenceDestinationNotWorkingDeviceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice", PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice_name, PolicyTopicEvidenceDestinationNotWorkingDeviceEnum_PolicyTopicEvidenceDestinationNotWorkingDevice_value)
+	proto.RegisterType((*PolicyTopicEvidenceDestinationNotWorkingDeviceEnum)(nil), "google.ads.googleads.v1.enums.PolicyTopicEvidenceDestinationNotWorkingDeviceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/policy_topic_evidence_destination_not_working_device.proto", fileDescriptor_policy_topic_evidence_destination_not_working_device_c2cbfcd4d0456964)
+	proto.RegisterFile("google/ads/googleads/v1/enums/policy_topic_evidence_destination_not_working_device.proto", fileDescriptor_b10d0781dd50ac63)
 }
 
-var fileDescriptor_policy_topic_evidence_destination_not_working_device_c2cbfcd4d0456964 = []byte{
+var fileDescriptor_b10d0781dd50ac63 = []byte{
 	// 350 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xcf, 0x4a, 0xc3, 0x40,
 	0x10, 0xc6, 0x6d, 0x2a, 0x16, 0xd2, 0x83, 0x21, 0x47, 0xb1, 0x87, 0xf6, 0x01, 0x36, 0xc4, 0xde,
diff --git a/googleapis/ads/googleads/v1/enums/positive_geo_target_type.pb.go b/googleapis/ads/googleads/v1/enums/positive_geo_target_type.pb.go
index d2547ad6cd..157b740186 100644
--- a/googleapis/ads/googleads/v1/enums/positive_geo_target_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/positive_geo_target_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/positive_geo_target_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible positive geo target types.
 type PositiveGeoTargetTypeEnum_PositiveGeoTargetType int32
@@ -45,6 +48,7 @@ var PositiveGeoTargetTypeEnum_PositiveGeoTargetType_name = map[int32]string{
 	3: "AREA_OF_INTEREST",
 	4: "LOCATION_OF_PRESENCE",
 }
+
 var PositiveGeoTargetTypeEnum_PositiveGeoTargetType_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -56,8 +60,9 @@ var PositiveGeoTargetTypeEnum_PositiveGeoTargetType_value = map[string]int32{
 func (x PositiveGeoTargetTypeEnum_PositiveGeoTargetType) String() string {
 	return proto.EnumName(PositiveGeoTargetTypeEnum_PositiveGeoTargetType_name, int32(x))
 }
+
 func (PositiveGeoTargetTypeEnum_PositiveGeoTargetType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_positive_geo_target_type_8a4eb110d34593ec, []int{0, 0}
+	return fileDescriptor_f2a88de5e0172b64, []int{0, 0}
 }
 
 // Container for enum describing possible positive geo target types.
@@ -71,16 +76,17 @@ func (m *PositiveGeoTargetTypeEnum) Reset()         { *m = PositiveGeoTargetType
 func (m *PositiveGeoTargetTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*PositiveGeoTargetTypeEnum) ProtoMessage()    {}
 func (*PositiveGeoTargetTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_positive_geo_target_type_8a4eb110d34593ec, []int{0}
+	return fileDescriptor_f2a88de5e0172b64, []int{0}
 }
+
 func (m *PositiveGeoTargetTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PositiveGeoTargetTypeEnum.Unmarshal(m, b)
 }
 func (m *PositiveGeoTargetTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PositiveGeoTargetTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PositiveGeoTargetTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PositiveGeoTargetTypeEnum.Merge(dst, src)
+func (m *PositiveGeoTargetTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PositiveGeoTargetTypeEnum.Merge(m, src)
 }
 func (m *PositiveGeoTargetTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_PositiveGeoTargetTypeEnum.Size(m)
@@ -92,15 +98,15 @@ func (m *PositiveGeoTargetTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PositiveGeoTargetTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PositiveGeoTargetTypeEnum)(nil), "google.ads.googleads.v1.enums.PositiveGeoTargetTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PositiveGeoTargetTypeEnum_PositiveGeoTargetType", PositiveGeoTargetTypeEnum_PositiveGeoTargetType_name, PositiveGeoTargetTypeEnum_PositiveGeoTargetType_value)
+	proto.RegisterType((*PositiveGeoTargetTypeEnum)(nil), "google.ads.googleads.v1.enums.PositiveGeoTargetTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/positive_geo_target_type.proto", fileDescriptor_positive_geo_target_type_8a4eb110d34593ec)
+	proto.RegisterFile("google/ads/googleads/v1/enums/positive_geo_target_type.proto", fileDescriptor_f2a88de5e0172b64)
 }
 
-var fileDescriptor_positive_geo_target_type_8a4eb110d34593ec = []byte{
+var fileDescriptor_f2a88de5e0172b64 = []byte{
 	// 348 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xfb, 0x30,
 	0x18, 0xc5, 0xff, 0xed, 0xfe, 0x28, 0x66, 0x88, 0xa5, 0x4c, 0xd0, 0xe1, 0x2e, 0xb6, 0x07, 0x48,
diff --git a/googleapis/ads/googleads/v1/enums/preferred_content_type.pb.go b/googleapis/ads/googleads/v1/enums/preferred_content_type.pb.go
index a7596fc99a..8ba75a8b95 100644
--- a/googleapis/ads/googleads/v1/enums/preferred_content_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/preferred_content_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/preferred_content_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates preferred content criterion type.
 type PreferredContentTypeEnum_PreferredContentType int32
@@ -36,6 +39,7 @@ var PreferredContentTypeEnum_PreferredContentType_name = map[int32]string{
 	1:   "UNKNOWN",
 	400: "YOUTUBE_TOP_CONTENT",
 }
+
 var PreferredContentTypeEnum_PreferredContentType_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -45,8 +49,9 @@ var PreferredContentTypeEnum_PreferredContentType_value = map[string]int32{
 func (x PreferredContentTypeEnum_PreferredContentType) String() string {
 	return proto.EnumName(PreferredContentTypeEnum_PreferredContentType_name, int32(x))
 }
+
 func (PreferredContentTypeEnum_PreferredContentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_preferred_content_type_89f4aa51b16a342c, []int{0, 0}
+	return fileDescriptor_67bec211f0f151aa, []int{0, 0}
 }
 
 // Container for enumeration of preferred content criterion type.
@@ -60,16 +65,17 @@ func (m *PreferredContentTypeEnum) Reset()         { *m = PreferredContentTypeEn
 func (m *PreferredContentTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*PreferredContentTypeEnum) ProtoMessage()    {}
 func (*PreferredContentTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_preferred_content_type_89f4aa51b16a342c, []int{0}
+	return fileDescriptor_67bec211f0f151aa, []int{0}
 }
+
 func (m *PreferredContentTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PreferredContentTypeEnum.Unmarshal(m, b)
 }
 func (m *PreferredContentTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PreferredContentTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PreferredContentTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PreferredContentTypeEnum.Merge(dst, src)
+func (m *PreferredContentTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PreferredContentTypeEnum.Merge(m, src)
 }
 func (m *PreferredContentTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_PreferredContentTypeEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *PreferredContentTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PreferredContentTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PreferredContentTypeEnum)(nil), "google.ads.googleads.v1.enums.PreferredContentTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PreferredContentTypeEnum_PreferredContentType", PreferredContentTypeEnum_PreferredContentType_name, PreferredContentTypeEnum_PreferredContentType_value)
+	proto.RegisterType((*PreferredContentTypeEnum)(nil), "google.ads.googleads.v1.enums.PreferredContentTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/preferred_content_type.proto", fileDescriptor_preferred_content_type_89f4aa51b16a342c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/preferred_content_type.proto", fileDescriptor_67bec211f0f151aa)
 }
 
-var fileDescriptor_preferred_content_type_89f4aa51b16a342c = []byte{
+var fileDescriptor_67bec211f0f151aa = []byte{
 	// 316 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xfb, 0x30,
 	0x18, 0xc5, 0xff, 0xdb, 0xe0, 0x2f, 0x64, 0x17, 0x8e, 0xea, 0xc5, 0x14, 0x77, 0xb1, 0x3d, 0x40,
diff --git a/googleapis/ads/googleads/v1/enums/price_extension_price_qualifier.pb.go b/googleapis/ads/googleads/v1/enums/price_extension_price_qualifier.pb.go
index 0eb4d28f76..0146420a2c 100644
--- a/googleapis/ads/googleads/v1/enums/price_extension_price_qualifier.pb.go
+++ b/googleapis/ads/googleads/v1/enums/price_extension_price_qualifier.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/price_extension_price_qualifier.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enums of price extension price qualifier.
 type PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier int32
@@ -42,6 +45,7 @@ var PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier_name = map[int
 	3: "UP_TO",
 	4: "AVERAGE",
 }
+
 var PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier_value = map[st
 func (x PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier) String() string {
 	return proto.EnumName(PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier_name, int32(x))
 }
+
 func (PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_price_extension_price_qualifier_960fd1cf90164248, []int{0, 0}
+	return fileDescriptor_5385b5b37d759744, []int{0, 0}
 }
 
 // Container for enum describing a price extension price qualifier.
@@ -68,16 +73,17 @@ func (m *PriceExtensionPriceQualifierEnum) Reset()         { *m = PriceExtension
 func (m *PriceExtensionPriceQualifierEnum) String() string { return proto.CompactTextString(m) }
 func (*PriceExtensionPriceQualifierEnum) ProtoMessage()    {}
 func (*PriceExtensionPriceQualifierEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_price_extension_price_qualifier_960fd1cf90164248, []int{0}
+	return fileDescriptor_5385b5b37d759744, []int{0}
 }
+
 func (m *PriceExtensionPriceQualifierEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PriceExtensionPriceQualifierEnum.Unmarshal(m, b)
 }
 func (m *PriceExtensionPriceQualifierEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PriceExtensionPriceQualifierEnum.Marshal(b, m, deterministic)
 }
-func (dst *PriceExtensionPriceQualifierEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PriceExtensionPriceQualifierEnum.Merge(dst, src)
+func (m *PriceExtensionPriceQualifierEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PriceExtensionPriceQualifierEnum.Merge(m, src)
 }
 func (m *PriceExtensionPriceQualifierEnum) XXX_Size() int {
 	return xxx_messageInfo_PriceExtensionPriceQualifierEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *PriceExtensionPriceQualifierEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PriceExtensionPriceQualifierEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PriceExtensionPriceQualifierEnum)(nil), "google.ads.googleads.v1.enums.PriceExtensionPriceQualifierEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier", PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier_name, PriceExtensionPriceQualifierEnum_PriceExtensionPriceQualifier_value)
+	proto.RegisterType((*PriceExtensionPriceQualifierEnum)(nil), "google.ads.googleads.v1.enums.PriceExtensionPriceQualifierEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/price_extension_price_qualifier.proto", fileDescriptor_price_extension_price_qualifier_960fd1cf90164248)
+	proto.RegisterFile("google/ads/googleads/v1/enums/price_extension_price_qualifier.proto", fileDescriptor_5385b5b37d759744)
 }
 
-var fileDescriptor_price_extension_price_qualifier_960fd1cf90164248 = []byte{
+var fileDescriptor_5385b5b37d759744 = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x4e, 0xf3, 0x30,
 	0x10, 0xfd, 0x92, 0xf6, 0xe3, 0xc7, 0x5d, 0x10, 0x65, 0x89, 0x5a, 0x89, 0xf6, 0x00, 0x8e, 0x22,
diff --git a/googleapis/ads/googleads/v1/enums/price_extension_price_unit.pb.go b/googleapis/ads/googleads/v1/enums/price_extension_price_unit.pb.go
index ce259dbe64..30c2943c36 100644
--- a/googleapis/ads/googleads/v1/enums/price_extension_price_unit.pb.go
+++ b/googleapis/ads/googleads/v1/enums/price_extension_price_unit.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/price_extension_price_unit.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Price extension price unit.
 type PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit int32
@@ -51,6 +54,7 @@ var PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit_name = map[int32]string{
 	6: "PER_YEAR",
 	7: "PER_NIGHT",
 }
+
 var PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -65,8 +69,9 @@ var PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit_value = map[string]int32
 func (x PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit) String() string {
 	return proto.EnumName(PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit_name, int32(x))
 }
+
 func (PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_price_extension_price_unit_b2bf1d2dd17ee2c0, []int{0, 0}
+	return fileDescriptor_1ba476426d1d0390, []int{0, 0}
 }
 
 // Container for enum describing price extension price unit.
@@ -80,16 +85,17 @@ func (m *PriceExtensionPriceUnitEnum) Reset()         { *m = PriceExtensionPrice
 func (m *PriceExtensionPriceUnitEnum) String() string { return proto.CompactTextString(m) }
 func (*PriceExtensionPriceUnitEnum) ProtoMessage()    {}
 func (*PriceExtensionPriceUnitEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_price_extension_price_unit_b2bf1d2dd17ee2c0, []int{0}
+	return fileDescriptor_1ba476426d1d0390, []int{0}
 }
+
 func (m *PriceExtensionPriceUnitEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PriceExtensionPriceUnitEnum.Unmarshal(m, b)
 }
 func (m *PriceExtensionPriceUnitEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PriceExtensionPriceUnitEnum.Marshal(b, m, deterministic)
 }
-func (dst *PriceExtensionPriceUnitEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PriceExtensionPriceUnitEnum.Merge(dst, src)
+func (m *PriceExtensionPriceUnitEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PriceExtensionPriceUnitEnum.Merge(m, src)
 }
 func (m *PriceExtensionPriceUnitEnum) XXX_Size() int {
 	return xxx_messageInfo_PriceExtensionPriceUnitEnum.Size(m)
@@ -101,15 +107,15 @@ func (m *PriceExtensionPriceUnitEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PriceExtensionPriceUnitEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PriceExtensionPriceUnitEnum)(nil), "google.ads.googleads.v1.enums.PriceExtensionPriceUnitEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit", PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit_name, PriceExtensionPriceUnitEnum_PriceExtensionPriceUnit_value)
+	proto.RegisterType((*PriceExtensionPriceUnitEnum)(nil), "google.ads.googleads.v1.enums.PriceExtensionPriceUnitEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/price_extension_price_unit.proto", fileDescriptor_price_extension_price_unit_b2bf1d2dd17ee2c0)
+	proto.RegisterFile("google/ads/googleads/v1/enums/price_extension_price_unit.proto", fileDescriptor_1ba476426d1d0390)
 }
 
-var fileDescriptor_price_extension_price_unit_b2bf1d2dd17ee2c0 = []byte{
+var fileDescriptor_1ba476426d1d0390 = []byte{
 	// 350 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xd1, 0x4e, 0xfa, 0x30,
 	0x14, 0xc6, 0xff, 0x1b, 0x7f, 0x41, 0x8b, 0xc6, 0x66, 0x37, 0x26, 0x0a, 0x17, 0xf0, 0x00, 0x5d,
diff --git a/googleapis/ads/googleads/v1/enums/price_extension_type.pb.go b/googleapis/ads/googleads/v1/enums/price_extension_type.pb.go
index 374416d5f1..02daa8fbb6 100644
--- a/googleapis/ads/googleads/v1/enums/price_extension_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/price_extension_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/price_extension_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Price extension type.
 type PriceExtensionTypeEnum_PriceExtensionType int32
@@ -60,6 +63,7 @@ var PriceExtensionTypeEnum_PriceExtensionType_name = map[int32]string{
 	9:  "SERVICE_CATEGORIES",
 	10: "SERVICE_TIERS",
 }
+
 var PriceExtensionTypeEnum_PriceExtensionType_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"UNKNOWN":            1,
@@ -77,8 +81,9 @@ var PriceExtensionTypeEnum_PriceExtensionType_value = map[string]int32{
 func (x PriceExtensionTypeEnum_PriceExtensionType) String() string {
 	return proto.EnumName(PriceExtensionTypeEnum_PriceExtensionType_name, int32(x))
 }
+
 func (PriceExtensionTypeEnum_PriceExtensionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_price_extension_type_b4046f5b4d5b8020, []int{0, 0}
+	return fileDescriptor_68854bbfc816b83c, []int{0, 0}
 }
 
 // Container for enum describing types for a price extension.
@@ -92,16 +97,17 @@ func (m *PriceExtensionTypeEnum) Reset()         { *m = PriceExtensionTypeEnum{}
 func (m *PriceExtensionTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*PriceExtensionTypeEnum) ProtoMessage()    {}
 func (*PriceExtensionTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_price_extension_type_b4046f5b4d5b8020, []int{0}
+	return fileDescriptor_68854bbfc816b83c, []int{0}
 }
+
 func (m *PriceExtensionTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PriceExtensionTypeEnum.Unmarshal(m, b)
 }
 func (m *PriceExtensionTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PriceExtensionTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *PriceExtensionTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PriceExtensionTypeEnum.Merge(dst, src)
+func (m *PriceExtensionTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PriceExtensionTypeEnum.Merge(m, src)
 }
 func (m *PriceExtensionTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_PriceExtensionTypeEnum.Size(m)
@@ -113,15 +119,15 @@ func (m *PriceExtensionTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PriceExtensionTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PriceExtensionTypeEnum)(nil), "google.ads.googleads.v1.enums.PriceExtensionTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PriceExtensionTypeEnum_PriceExtensionType", PriceExtensionTypeEnum_PriceExtensionType_name, PriceExtensionTypeEnum_PriceExtensionType_value)
+	proto.RegisterType((*PriceExtensionTypeEnum)(nil), "google.ads.googleads.v1.enums.PriceExtensionTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/price_extension_type.proto", fileDescriptor_price_extension_type_b4046f5b4d5b8020)
+	proto.RegisterFile("google/ads/googleads/v1/enums/price_extension_type.proto", fileDescriptor_68854bbfc816b83c)
 }
 
-var fileDescriptor_price_extension_type_b4046f5b4d5b8020 = []byte{
+var fileDescriptor_68854bbfc816b83c = []byte{
 	// 394 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xd1, 0x6a, 0xd4, 0x40,
 	0x18, 0x85, 0xcd, 0x56, 0xb7, 0xed, 0xd4, 0xe2, 0x38, 0x17, 0x15, 0xc4, 0x5e, 0xb4, 0x0f, 0x30,
diff --git a/googleapis/ads/googleads/v1/enums/price_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/price_placeholder_field.pb.go
index 0d948d93b8..a8be021e8e 100644
--- a/googleapis/ads/googleads/v1/enums/price_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/price_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/price_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Price placeholder fields.
 type PricePlaceholderFieldEnum_PricePlaceholderField int32
@@ -229,6 +232,7 @@ var PricePlaceholderFieldEnum_PricePlaceholderField_name = map[int32]string{
 	804: "ITEM_8_FINAL_URLS",
 	805: "ITEM_8_FINAL_MOBILE_URLS",
 }
+
 var PricePlaceholderFieldEnum_PricePlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -290,8 +294,9 @@ var PricePlaceholderFieldEnum_PricePlaceholderField_value = map[string]int32{
 func (x PricePlaceholderFieldEnum_PricePlaceholderField) String() string {
 	return proto.EnumName(PricePlaceholderFieldEnum_PricePlaceholderField_name, int32(x))
 }
+
 func (PricePlaceholderFieldEnum_PricePlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_price_placeholder_field_70027d62066d5e9c, []int{0, 0}
+	return fileDescriptor_3d990bd7464db1dd, []int{0, 0}
 }
 
 // Values for Price placeholder fields.
@@ -305,16 +310,17 @@ func (m *PricePlaceholderFieldEnum) Reset()         { *m = PricePlaceholderField
 func (m *PricePlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*PricePlaceholderFieldEnum) ProtoMessage()    {}
 func (*PricePlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_price_placeholder_field_70027d62066d5e9c, []int{0}
+	return fileDescriptor_3d990bd7464db1dd, []int{0}
 }
+
 func (m *PricePlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PricePlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *PricePlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PricePlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *PricePlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PricePlaceholderFieldEnum.Merge(dst, src)
+func (m *PricePlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PricePlaceholderFieldEnum.Merge(m, src)
 }
 func (m *PricePlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_PricePlaceholderFieldEnum.Size(m)
@@ -326,15 +332,15 @@ func (m *PricePlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PricePlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PricePlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.PricePlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PricePlaceholderFieldEnum_PricePlaceholderField", PricePlaceholderFieldEnum_PricePlaceholderField_name, PricePlaceholderFieldEnum_PricePlaceholderField_value)
+	proto.RegisterType((*PricePlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.PricePlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/price_placeholder_field.proto", fileDescriptor_price_placeholder_field_70027d62066d5e9c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/price_placeholder_field.proto", fileDescriptor_3d990bd7464db1dd)
 }
 
-var fileDescriptor_price_placeholder_field_70027d62066d5e9c = []byte{
+var fileDescriptor_3d990bd7464db1dd = []byte{
 	// 731 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xd4, 0x49, 0x4f, 0xdb, 0x5a,
 	0x14, 0x07, 0xf0, 0xe7, 0x21, 0x7e, 0x70, 0xe1, 0x89, 0xcb, 0x7d, 0x0f, 0x5e, 0x8b, 0x60, 0x01,
diff --git a/googleapis/ads/googleads/v1/enums/product_bidding_category_level.pb.go b/googleapis/ads/googleads/v1/enums/product_bidding_category_level.pb.go
index 386bf8e85a..3ba6adfd5a 100644
--- a/googleapis/ads/googleads/v1/enums/product_bidding_category_level.pb.go
+++ b/googleapis/ads/googleads/v1/enums/product_bidding_category_level.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/product_bidding_category_level.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the level of the product bidding category.
 type ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel int32
@@ -48,6 +51,7 @@ var ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel_name = map[int32
 	5: "LEVEL4",
 	6: "LEVEL5",
 }
+
 var ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -61,8 +65,9 @@ var ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel_value = map[stri
 func (x ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel) String() string {
 	return proto.EnumName(ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel_name, int32(x))
 }
+
 func (ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_bidding_category_level_26189038419dce97, []int{0, 0}
+	return fileDescriptor_8fbaaa9fae45372c, []int{0, 0}
 }
 
 // Level of a product bidding category.
@@ -76,16 +81,17 @@ func (m *ProductBiddingCategoryLevelEnum) Reset()         { *m = ProductBiddingC
 func (m *ProductBiddingCategoryLevelEnum) String() string { return proto.CompactTextString(m) }
 func (*ProductBiddingCategoryLevelEnum) ProtoMessage()    {}
 func (*ProductBiddingCategoryLevelEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_bidding_category_level_26189038419dce97, []int{0}
+	return fileDescriptor_8fbaaa9fae45372c, []int{0}
 }
+
 func (m *ProductBiddingCategoryLevelEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductBiddingCategoryLevelEnum.Unmarshal(m, b)
 }
 func (m *ProductBiddingCategoryLevelEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductBiddingCategoryLevelEnum.Marshal(b, m, deterministic)
 }
-func (dst *ProductBiddingCategoryLevelEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductBiddingCategoryLevelEnum.Merge(dst, src)
+func (m *ProductBiddingCategoryLevelEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductBiddingCategoryLevelEnum.Merge(m, src)
 }
 func (m *ProductBiddingCategoryLevelEnum) XXX_Size() int {
 	return xxx_messageInfo_ProductBiddingCategoryLevelEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *ProductBiddingCategoryLevelEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ProductBiddingCategoryLevelEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ProductBiddingCategoryLevelEnum)(nil), "google.ads.googleads.v1.enums.ProductBiddingCategoryLevelEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel", ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel_name, ProductBiddingCategoryLevelEnum_ProductBiddingCategoryLevel_value)
+	proto.RegisterType((*ProductBiddingCategoryLevelEnum)(nil), "google.ads.googleads.v1.enums.ProductBiddingCategoryLevelEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/product_bidding_category_level.proto", fileDescriptor_product_bidding_category_level_26189038419dce97)
+	proto.RegisterFile("google/ads/googleads/v1/enums/product_bidding_category_level.proto", fileDescriptor_8fbaaa9fae45372c)
 }
 
-var fileDescriptor_product_bidding_category_level_26189038419dce97 = []byte{
+var fileDescriptor_8fbaaa9fae45372c = []byte{
 	// 329 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4b, 0xfb, 0x30,
 	0x18, 0xc6, 0xff, 0xed, 0xfe, 0x4e, 0xc8, 0x0e, 0x86, 0x1e, 0xd5, 0xa1, 0xdb, 0x07, 0x48, 0xa9,
diff --git a/googleapis/ads/googleads/v1/enums/product_bidding_category_status.pb.go b/googleapis/ads/googleads/v1/enums/product_bidding_category_status.pb.go
index db1fe77b24..119e2d477a 100644
--- a/googleapis/ads/googleads/v1/enums/product_bidding_category_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/product_bidding_category_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/product_bidding_category_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the status of the product bidding category.
 type ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus int32
@@ -39,6 +42,7 @@ var ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus_name = map[int
 	2: "ACTIVE",
 	3: "OBSOLETE",
 }
+
 var ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus_value = map[st
 func (x ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus) String() string {
 	return proto.EnumName(ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus_name, int32(x))
 }
+
 func (ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_bidding_category_status_e3bdc1049d216265, []int{0, 0}
+	return fileDescriptor_d3fc354717fb5b27, []int{0, 0}
 }
 
 // Status of the product bidding category.
@@ -64,16 +69,17 @@ func (m *ProductBiddingCategoryStatusEnum) Reset()         { *m = ProductBidding
 func (m *ProductBiddingCategoryStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*ProductBiddingCategoryStatusEnum) ProtoMessage()    {}
 func (*ProductBiddingCategoryStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_bidding_category_status_e3bdc1049d216265, []int{0}
+	return fileDescriptor_d3fc354717fb5b27, []int{0}
 }
+
 func (m *ProductBiddingCategoryStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductBiddingCategoryStatusEnum.Unmarshal(m, b)
 }
 func (m *ProductBiddingCategoryStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductBiddingCategoryStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *ProductBiddingCategoryStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductBiddingCategoryStatusEnum.Merge(dst, src)
+func (m *ProductBiddingCategoryStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductBiddingCategoryStatusEnum.Merge(m, src)
 }
 func (m *ProductBiddingCategoryStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_ProductBiddingCategoryStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *ProductBiddingCategoryStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ProductBiddingCategoryStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ProductBiddingCategoryStatusEnum)(nil), "google.ads.googleads.v1.enums.ProductBiddingCategoryStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus", ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus_name, ProductBiddingCategoryStatusEnum_ProductBiddingCategoryStatus_value)
+	proto.RegisterType((*ProductBiddingCategoryStatusEnum)(nil), "google.ads.googleads.v1.enums.ProductBiddingCategoryStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/product_bidding_category_status.proto", fileDescriptor_product_bidding_category_status_e3bdc1049d216265)
+	proto.RegisterFile("google/ads/googleads/v1/enums/product_bidding_category_status.proto", fileDescriptor_d3fc354717fb5b27)
 }
 
-var fileDescriptor_product_bidding_category_status_e3bdc1049d216265 = []byte{
+var fileDescriptor_d3fc354717fb5b27 = []byte{
 	// 319 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xc3, 0x30,
 	0x14, 0x86, 0x5d, 0x07, 0x53, 0x32, 0xc1, 0xd2, 0x4b, 0xd9, 0xc0, 0xed, 0x01, 0x12, 0x8a, 0x77,
diff --git a/googleapis/ads/googleads/v1/enums/product_channel.pb.go b/googleapis/ads/googleads/v1/enums/product_channel.pb.go
index 3d5cfccfa4..f8f8c2a4c2 100644
--- a/googleapis/ads/googleads/v1/enums/product_channel.pb.go
+++ b/googleapis/ads/googleads/v1/enums/product_channel.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/product_channel.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the locality of a product offer.
 type ProductChannelEnum_ProductChannel int32
@@ -39,6 +42,7 @@ var ProductChannelEnum_ProductChannel_name = map[int32]string{
 	2: "ONLINE",
 	3: "LOCAL",
 }
+
 var ProductChannelEnum_ProductChannel_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var ProductChannelEnum_ProductChannel_value = map[string]int32{
 func (x ProductChannelEnum_ProductChannel) String() string {
 	return proto.EnumName(ProductChannelEnum_ProductChannel_name, int32(x))
 }
+
 func (ProductChannelEnum_ProductChannel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_channel_ab1de09ee91c448a, []int{0, 0}
+	return fileDescriptor_1a8696547f984201, []int{0, 0}
 }
 
 // Locality of a product offer.
@@ -64,16 +69,17 @@ func (m *ProductChannelEnum) Reset()         { *m = ProductChannelEnum{} }
 func (m *ProductChannelEnum) String() string { return proto.CompactTextString(m) }
 func (*ProductChannelEnum) ProtoMessage()    {}
 func (*ProductChannelEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_channel_ab1de09ee91c448a, []int{0}
+	return fileDescriptor_1a8696547f984201, []int{0}
 }
+
 func (m *ProductChannelEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductChannelEnum.Unmarshal(m, b)
 }
 func (m *ProductChannelEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductChannelEnum.Marshal(b, m, deterministic)
 }
-func (dst *ProductChannelEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductChannelEnum.Merge(dst, src)
+func (m *ProductChannelEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductChannelEnum.Merge(m, src)
 }
 func (m *ProductChannelEnum) XXX_Size() int {
 	return xxx_messageInfo_ProductChannelEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *ProductChannelEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ProductChannelEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ProductChannelEnum)(nil), "google.ads.googleads.v1.enums.ProductChannelEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ProductChannelEnum_ProductChannel", ProductChannelEnum_ProductChannel_name, ProductChannelEnum_ProductChannel_value)
+	proto.RegisterType((*ProductChannelEnum)(nil), "google.ads.googleads.v1.enums.ProductChannelEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/product_channel.proto", fileDescriptor_product_channel_ab1de09ee91c448a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/product_channel.proto", fileDescriptor_1a8696547f984201)
 }
 
-var fileDescriptor_product_channel_ab1de09ee91c448a = []byte{
+var fileDescriptor_1a8696547f984201 = []byte{
 	// 299 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x14, 0xfe, 0xad, 0xe3, 0x37, 0x31, 0x03, 0x2d, 0xf1, 0x4e, 0xdc, 0xc5, 0xf6, 0x00, 0x09, 0x65,
diff --git a/googleapis/ads/googleads/v1/enums/product_channel_exclusivity.pb.go b/googleapis/ads/googleads/v1/enums/product_channel_exclusivity.pb.go
index a7817ddcba..2367d75edf 100644
--- a/googleapis/ads/googleads/v1/enums/product_channel_exclusivity.pb.go
+++ b/googleapis/ads/googleads/v1/enums/product_channel_exclusivity.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/product_channel_exclusivity.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the availability of a product offer.
 type ProductChannelExclusivityEnum_ProductChannelExclusivity int32
@@ -41,6 +44,7 @@ var ProductChannelExclusivityEnum_ProductChannelExclusivity_name = map[int32]str
 	2: "SINGLE_CHANNEL",
 	3: "MULTI_CHANNEL",
 }
+
 var ProductChannelExclusivityEnum_ProductChannelExclusivity_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -51,8 +55,9 @@ var ProductChannelExclusivityEnum_ProductChannelExclusivity_value = map[string]i
 func (x ProductChannelExclusivityEnum_ProductChannelExclusivity) String() string {
 	return proto.EnumName(ProductChannelExclusivityEnum_ProductChannelExclusivity_name, int32(x))
 }
+
 func (ProductChannelExclusivityEnum_ProductChannelExclusivity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_channel_exclusivity_e83d82105cf52bc2, []int{0, 0}
+	return fileDescriptor_4f957309edf66181, []int{0, 0}
 }
 
 // Availability of a product offer.
@@ -66,16 +71,17 @@ func (m *ProductChannelExclusivityEnum) Reset()         { *m = ProductChannelExc
 func (m *ProductChannelExclusivityEnum) String() string { return proto.CompactTextString(m) }
 func (*ProductChannelExclusivityEnum) ProtoMessage()    {}
 func (*ProductChannelExclusivityEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_channel_exclusivity_e83d82105cf52bc2, []int{0}
+	return fileDescriptor_4f957309edf66181, []int{0}
 }
+
 func (m *ProductChannelExclusivityEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductChannelExclusivityEnum.Unmarshal(m, b)
 }
 func (m *ProductChannelExclusivityEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductChannelExclusivityEnum.Marshal(b, m, deterministic)
 }
-func (dst *ProductChannelExclusivityEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductChannelExclusivityEnum.Merge(dst, src)
+func (m *ProductChannelExclusivityEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductChannelExclusivityEnum.Merge(m, src)
 }
 func (m *ProductChannelExclusivityEnum) XXX_Size() int {
 	return xxx_messageInfo_ProductChannelExclusivityEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *ProductChannelExclusivityEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ProductChannelExclusivityEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ProductChannelExclusivityEnum)(nil), "google.ads.googleads.v1.enums.ProductChannelExclusivityEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ProductChannelExclusivityEnum_ProductChannelExclusivity", ProductChannelExclusivityEnum_ProductChannelExclusivity_name, ProductChannelExclusivityEnum_ProductChannelExclusivity_value)
+	proto.RegisterType((*ProductChannelExclusivityEnum)(nil), "google.ads.googleads.v1.enums.ProductChannelExclusivityEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/product_channel_exclusivity.proto", fileDescriptor_product_channel_exclusivity_e83d82105cf52bc2)
+	proto.RegisterFile("google/ads/googleads/v1/enums/product_channel_exclusivity.proto", fileDescriptor_4f957309edf66181)
 }
 
-var fileDescriptor_product_channel_exclusivity_e83d82105cf52bc2 = []byte{
+var fileDescriptor_4f957309edf66181 = []byte{
 	// 324 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x4b, 0xc3, 0x30,
 	0x18, 0xb5, 0x1d, 0x28, 0x64, 0xa8, 0xb3, 0x37, 0xc5, 0x09, 0xdb, 0x0f, 0x48, 0x29, 0xde, 0xe2,
diff --git a/googleapis/ads/googleads/v1/enums/product_condition.pb.go b/googleapis/ads/googleads/v1/enums/product_condition.pb.go
index f8a7f8abd6..acc61b1c8f 100644
--- a/googleapis/ads/googleads/v1/enums/product_condition.pb.go
+++ b/googleapis/ads/googleads/v1/enums/product_condition.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/product_condition.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the condition of a product offer.
 type ProductConditionEnum_ProductCondition int32
@@ -42,6 +45,7 @@ var ProductConditionEnum_ProductCondition_name = map[int32]string{
 	4: "REFURBISHED",
 	5: "USED",
 }
+
 var ProductConditionEnum_ProductCondition_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var ProductConditionEnum_ProductCondition_value = map[string]int32{
 func (x ProductConditionEnum_ProductCondition) String() string {
 	return proto.EnumName(ProductConditionEnum_ProductCondition_name, int32(x))
 }
+
 func (ProductConditionEnum_ProductCondition) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_condition_fad86b4083272fb9, []int{0, 0}
+	return fileDescriptor_07be2a30f4f7cc08, []int{0, 0}
 }
 
 // Condition of a product offer.
@@ -68,16 +73,17 @@ func (m *ProductConditionEnum) Reset()         { *m = ProductConditionEnum{} }
 func (m *ProductConditionEnum) String() string { return proto.CompactTextString(m) }
 func (*ProductConditionEnum) ProtoMessage()    {}
 func (*ProductConditionEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_condition_fad86b4083272fb9, []int{0}
+	return fileDescriptor_07be2a30f4f7cc08, []int{0}
 }
+
 func (m *ProductConditionEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductConditionEnum.Unmarshal(m, b)
 }
 func (m *ProductConditionEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductConditionEnum.Marshal(b, m, deterministic)
 }
-func (dst *ProductConditionEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductConditionEnum.Merge(dst, src)
+func (m *ProductConditionEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductConditionEnum.Merge(m, src)
 }
 func (m *ProductConditionEnum) XXX_Size() int {
 	return xxx_messageInfo_ProductConditionEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *ProductConditionEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ProductConditionEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ProductConditionEnum)(nil), "google.ads.googleads.v1.enums.ProductConditionEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ProductConditionEnum_ProductCondition", ProductConditionEnum_ProductCondition_name, ProductConditionEnum_ProductCondition_value)
+	proto.RegisterType((*ProductConditionEnum)(nil), "google.ads.googleads.v1.enums.ProductConditionEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/product_condition.proto", fileDescriptor_product_condition_fad86b4083272fb9)
+	proto.RegisterFile("google/ads/googleads/v1/enums/product_condition.proto", fileDescriptor_07be2a30f4f7cc08)
 }
 
-var fileDescriptor_product_condition_fad86b4083272fb9 = []byte{
+var fileDescriptor_07be2a30f4f7cc08 = []byte{
 	// 308 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x7f, 0x74, 0x92, 0x1d, 0x0c, 0x45, 0x2f, 0xe2, 0x0e, 0xdb, 0x03, 0x24, 0x14, 0xf1,
diff --git a/googleapis/ads/googleads/v1/enums/product_type_level.pb.go b/googleapis/ads/googleads/v1/enums/product_type_level.pb.go
index cf4d490d6e..c562d63d35 100644
--- a/googleapis/ads/googleads/v1/enums/product_type_level.pb.go
+++ b/googleapis/ads/googleads/v1/enums/product_type_level.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/product_type_level.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the level of the type of a product offer.
 type ProductTypeLevelEnum_ProductTypeLevel int32
@@ -48,6 +51,7 @@ var ProductTypeLevelEnum_ProductTypeLevel_name = map[int32]string{
 	10: "LEVEL4",
 	11: "LEVEL5",
 }
+
 var ProductTypeLevelEnum_ProductTypeLevel_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -61,8 +65,9 @@ var ProductTypeLevelEnum_ProductTypeLevel_value = map[string]int32{
 func (x ProductTypeLevelEnum_ProductTypeLevel) String() string {
 	return proto.EnumName(ProductTypeLevelEnum_ProductTypeLevel_name, int32(x))
 }
+
 func (ProductTypeLevelEnum_ProductTypeLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_type_level_f0ec3feab93e994a, []int{0, 0}
+	return fileDescriptor_946c08b9a6423f6e, []int{0, 0}
 }
 
 // Level of the type of a product offer.
@@ -76,16 +81,17 @@ func (m *ProductTypeLevelEnum) Reset()         { *m = ProductTypeLevelEnum{} }
 func (m *ProductTypeLevelEnum) String() string { return proto.CompactTextString(m) }
 func (*ProductTypeLevelEnum) ProtoMessage()    {}
 func (*ProductTypeLevelEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_type_level_f0ec3feab93e994a, []int{0}
+	return fileDescriptor_946c08b9a6423f6e, []int{0}
 }
+
 func (m *ProductTypeLevelEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductTypeLevelEnum.Unmarshal(m, b)
 }
 func (m *ProductTypeLevelEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductTypeLevelEnum.Marshal(b, m, deterministic)
 }
-func (dst *ProductTypeLevelEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductTypeLevelEnum.Merge(dst, src)
+func (m *ProductTypeLevelEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductTypeLevelEnum.Merge(m, src)
 }
 func (m *ProductTypeLevelEnum) XXX_Size() int {
 	return xxx_messageInfo_ProductTypeLevelEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *ProductTypeLevelEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ProductTypeLevelEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ProductTypeLevelEnum)(nil), "google.ads.googleads.v1.enums.ProductTypeLevelEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ProductTypeLevelEnum_ProductTypeLevel", ProductTypeLevelEnum_ProductTypeLevel_name, ProductTypeLevelEnum_ProductTypeLevel_value)
+	proto.RegisterType((*ProductTypeLevelEnum)(nil), "google.ads.googleads.v1.enums.ProductTypeLevelEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/product_type_level.proto", fileDescriptor_product_type_level_f0ec3feab93e994a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/product_type_level.proto", fileDescriptor_946c08b9a6423f6e)
 }
 
-var fileDescriptor_product_type_level_f0ec3feab93e994a = []byte{
+var fileDescriptor_946c08b9a6423f6e = []byte{
 	// 315 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4a, 0x03, 0x31,
 	0x18, 0x85, 0x9d, 0x0a, 0xad, 0xa6, 0x0b, 0xc3, 0xa0, 0x1b, 0xb1, 0x8b, 0xf6, 0x00, 0x09, 0xb1,
diff --git a/googleapis/ads/googleads/v1/enums/promotion_extension_discount_modifier.pb.go b/googleapis/ads/googleads/v1/enums/promotion_extension_discount_modifier.pb.go
index c658f256f7..3b16004d91 100644
--- a/googleapis/ads/googleads/v1/enums/promotion_extension_discount_modifier.pb.go
+++ b/googleapis/ads/googleads/v1/enums/promotion_extension_discount_modifier.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/promotion_extension_discount_modifier.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A promotion extension discount modifier.
 type PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier int32
@@ -36,6 +39,7 @@ var PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier_na
 	1: "UNKNOWN",
 	2: "UP_TO",
 }
+
 var PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier_va
 func (x PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier) String() string {
 	return proto.EnumName(PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier_name, int32(x))
 }
+
 func (PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_promotion_extension_discount_modifier_13658de280b60b6c, []int{0, 0}
+	return fileDescriptor_dc325cf0cb5c4ed3, []int{0, 0}
 }
 
 // Container for enum describing possible a promotion extension
@@ -63,16 +68,17 @@ func (m *PromotionExtensionDiscountModifierEnum) Reset() {
 func (m *PromotionExtensionDiscountModifierEnum) String() string { return proto.CompactTextString(m) }
 func (*PromotionExtensionDiscountModifierEnum) ProtoMessage()    {}
 func (*PromotionExtensionDiscountModifierEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_promotion_extension_discount_modifier_13658de280b60b6c, []int{0}
+	return fileDescriptor_dc325cf0cb5c4ed3, []int{0}
 }
+
 func (m *PromotionExtensionDiscountModifierEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PromotionExtensionDiscountModifierEnum.Unmarshal(m, b)
 }
 func (m *PromotionExtensionDiscountModifierEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PromotionExtensionDiscountModifierEnum.Marshal(b, m, deterministic)
 }
-func (dst *PromotionExtensionDiscountModifierEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PromotionExtensionDiscountModifierEnum.Merge(dst, src)
+func (m *PromotionExtensionDiscountModifierEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PromotionExtensionDiscountModifierEnum.Merge(m, src)
 }
 func (m *PromotionExtensionDiscountModifierEnum) XXX_Size() int {
 	return xxx_messageInfo_PromotionExtensionDiscountModifierEnum.Size(m)
@@ -84,15 +90,15 @@ func (m *PromotionExtensionDiscountModifierEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PromotionExtensionDiscountModifierEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PromotionExtensionDiscountModifierEnum)(nil), "google.ads.googleads.v1.enums.PromotionExtensionDiscountModifierEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier", PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier_name, PromotionExtensionDiscountModifierEnum_PromotionExtensionDiscountModifier_value)
+	proto.RegisterType((*PromotionExtensionDiscountModifierEnum)(nil), "google.ads.googleads.v1.enums.PromotionExtensionDiscountModifierEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/promotion_extension_discount_modifier.proto", fileDescriptor_promotion_extension_discount_modifier_13658de280b60b6c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/promotion_extension_discount_modifier.proto", fileDescriptor_dc325cf0cb5c4ed3)
 }
 
-var fileDescriptor_promotion_extension_discount_modifier_13658de280b60b6c = []byte{
+var fileDescriptor_dc325cf0cb5c4ed3 = []byte{
 	// 311 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
 	0x10, 0x86, 0x69, 0x10, 0x20, 0xdc, 0x81, 0x2a, 0x23, 0xa2, 0x43, 0x3b, 0xc0, 0x66, 0x2b, 0x62,
diff --git a/googleapis/ads/googleads/v1/enums/promotion_extension_occasion.pb.go b/googleapis/ads/googleads/v1/enums/promotion_extension_occasion.pb.go
index f88b41b91d..e7bc83679a 100644
--- a/googleapis/ads/googleads/v1/enums/promotion_extension_occasion.pb.go
+++ b/googleapis/ads/googleads/v1/enums/promotion_extension_occasion.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/promotion_extension_occasion.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A promotion extension occasion.
 type PromotionExtensionOccasionEnum_PromotionExtensionOccasion int32
@@ -144,6 +147,7 @@ var PromotionExtensionOccasionEnum_PromotionExtensionOccasion_name = map[int32]s
 	37: "SONGKRAN",
 	38: "YEAR_END_GIFT",
 }
+
 var PromotionExtensionOccasionEnum_PromotionExtensionOccasion_value = map[string]int32{
 	"UNSPECIFIED":      0,
 	"UNKNOWN":          1,
@@ -189,8 +193,9 @@ var PromotionExtensionOccasionEnum_PromotionExtensionOccasion_value = map[string
 func (x PromotionExtensionOccasionEnum_PromotionExtensionOccasion) String() string {
 	return proto.EnumName(PromotionExtensionOccasionEnum_PromotionExtensionOccasion_name, int32(x))
 }
+
 func (PromotionExtensionOccasionEnum_PromotionExtensionOccasion) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_promotion_extension_occasion_e0195af12e829776, []int{0, 0}
+	return fileDescriptor_92f10499601d751d, []int{0, 0}
 }
 
 // Container for enum describing a promotion extension occasion.
@@ -206,16 +211,17 @@ func (m *PromotionExtensionOccasionEnum) Reset()         { *m = PromotionExtensi
 func (m *PromotionExtensionOccasionEnum) String() string { return proto.CompactTextString(m) }
 func (*PromotionExtensionOccasionEnum) ProtoMessage()    {}
 func (*PromotionExtensionOccasionEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_promotion_extension_occasion_e0195af12e829776, []int{0}
+	return fileDescriptor_92f10499601d751d, []int{0}
 }
+
 func (m *PromotionExtensionOccasionEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PromotionExtensionOccasionEnum.Unmarshal(m, b)
 }
 func (m *PromotionExtensionOccasionEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PromotionExtensionOccasionEnum.Marshal(b, m, deterministic)
 }
-func (dst *PromotionExtensionOccasionEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PromotionExtensionOccasionEnum.Merge(dst, src)
+func (m *PromotionExtensionOccasionEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PromotionExtensionOccasionEnum.Merge(m, src)
 }
 func (m *PromotionExtensionOccasionEnum) XXX_Size() int {
 	return xxx_messageInfo_PromotionExtensionOccasionEnum.Size(m)
@@ -227,15 +233,15 @@ func (m *PromotionExtensionOccasionEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PromotionExtensionOccasionEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PromotionExtensionOccasionEnum)(nil), "google.ads.googleads.v1.enums.PromotionExtensionOccasionEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PromotionExtensionOccasionEnum_PromotionExtensionOccasion", PromotionExtensionOccasionEnum_PromotionExtensionOccasion_name, PromotionExtensionOccasionEnum_PromotionExtensionOccasion_value)
+	proto.RegisterType((*PromotionExtensionOccasionEnum)(nil), "google.ads.googleads.v1.enums.PromotionExtensionOccasionEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/promotion_extension_occasion.proto", fileDescriptor_promotion_extension_occasion_e0195af12e829776)
+	proto.RegisterFile("google/ads/googleads/v1/enums/promotion_extension_occasion.proto", fileDescriptor_92f10499601d751d)
 }
 
-var fileDescriptor_promotion_extension_occasion_e0195af12e829776 = []byte{
+var fileDescriptor_92f10499601d751d = []byte{
 	// 669 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xcb, 0x6e, 0xdb, 0x3a,
 	0x10, 0xbd, 0x71, 0xde, 0xcc, 0x8b, 0x51, 0x72, 0x5f, 0xb9, 0x79, 0xdc, 0xe4, 0x3e, 0x96, 0x32,
diff --git a/googleapis/ads/googleads/v1/enums/promotion_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/promotion_placeholder_field.pb.go
index c2041a848b..a2c6364e31 100644
--- a/googleapis/ads/googleads/v1/enums/promotion_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/promotion_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/promotion_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Promotion placeholder fields.
 type PromotionPlaceholderFieldEnum_PromotionPlaceholderField int32
@@ -84,6 +87,7 @@ var PromotionPlaceholderFieldEnum_PromotionPlaceholderField_name = map[int32]str
 	14: "LANGUAGE",
 	15: "FINAL_URL_SUFFIX",
 }
+
 var PromotionPlaceholderFieldEnum_PromotionPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"UNKNOWN":            1,
@@ -106,8 +110,9 @@ var PromotionPlaceholderFieldEnum_PromotionPlaceholderField_value = map[string]i
 func (x PromotionPlaceholderFieldEnum_PromotionPlaceholderField) String() string {
 	return proto.EnumName(PromotionPlaceholderFieldEnum_PromotionPlaceholderField_name, int32(x))
 }
+
 func (PromotionPlaceholderFieldEnum_PromotionPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_promotion_placeholder_field_494db46851f5ebaa, []int{0, 0}
+	return fileDescriptor_82cfe61f98d75179, []int{0, 0}
 }
 
 // Values for Promotion placeholder fields.
@@ -121,16 +126,17 @@ func (m *PromotionPlaceholderFieldEnum) Reset()         { *m = PromotionPlacehol
 func (m *PromotionPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*PromotionPlaceholderFieldEnum) ProtoMessage()    {}
 func (*PromotionPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_promotion_placeholder_field_494db46851f5ebaa, []int{0}
+	return fileDescriptor_82cfe61f98d75179, []int{0}
 }
+
 func (m *PromotionPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PromotionPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *PromotionPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PromotionPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *PromotionPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PromotionPlaceholderFieldEnum.Merge(dst, src)
+func (m *PromotionPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PromotionPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *PromotionPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_PromotionPlaceholderFieldEnum.Size(m)
@@ -142,15 +148,15 @@ func (m *PromotionPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PromotionPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PromotionPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.PromotionPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.PromotionPlaceholderFieldEnum_PromotionPlaceholderField", PromotionPlaceholderFieldEnum_PromotionPlaceholderField_name, PromotionPlaceholderFieldEnum_PromotionPlaceholderField_value)
+	proto.RegisterType((*PromotionPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.PromotionPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/promotion_placeholder_field.proto", fileDescriptor_promotion_placeholder_field_494db46851f5ebaa)
+	proto.RegisterFile("google/ads/googleads/v1/enums/promotion_placeholder_field.proto", fileDescriptor_82cfe61f98d75179)
 }
 
-var fileDescriptor_promotion_placeholder_field_494db46851f5ebaa = []byte{
+var fileDescriptor_82cfe61f98d75179 = []byte{
 	// 476 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x6e, 0x9b, 0x4e,
 	0x10, 0xc7, 0x7f, 0x26, 0xbf, 0x26, 0xe9, 0xda, 0xb1, 0x37, 0xdb, 0x3f, 0x52, 0xab, 0xba, 0x52,
diff --git a/googleapis/ads/googleads/v1/enums/proximity_radius_units.pb.go b/googleapis/ads/googleads/v1/enums/proximity_radius_units.pb.go
index 6ceac99db8..1b0a32c100 100644
--- a/googleapis/ads/googleads/v1/enums/proximity_radius_units.pb.go
+++ b/googleapis/ads/googleads/v1/enums/proximity_radius_units.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/proximity_radius_units.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The unit of radius distance in proximity (e.g. MILES)
 type ProximityRadiusUnitsEnum_ProximityRadiusUnits int32
@@ -39,6 +42,7 @@ var ProximityRadiusUnitsEnum_ProximityRadiusUnits_name = map[int32]string{
 	2: "MILES",
 	3: "KILOMETERS",
 }
+
 var ProximityRadiusUnitsEnum_ProximityRadiusUnits_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var ProximityRadiusUnitsEnum_ProximityRadiusUnits_value = map[string]int32{
 func (x ProximityRadiusUnitsEnum_ProximityRadiusUnits) String() string {
 	return proto.EnumName(ProximityRadiusUnitsEnum_ProximityRadiusUnits_name, int32(x))
 }
+
 func (ProximityRadiusUnitsEnum_ProximityRadiusUnits) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_proximity_radius_units_b6e6c9fc53d5bd7b, []int{0, 0}
+	return fileDescriptor_deffb3e711c9fade, []int{0, 0}
 }
 
 // Container for enum describing unit of radius in proximity.
@@ -64,16 +69,17 @@ func (m *ProximityRadiusUnitsEnum) Reset()         { *m = ProximityRadiusUnitsEn
 func (m *ProximityRadiusUnitsEnum) String() string { return proto.CompactTextString(m) }
 func (*ProximityRadiusUnitsEnum) ProtoMessage()    {}
 func (*ProximityRadiusUnitsEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_proximity_radius_units_b6e6c9fc53d5bd7b, []int{0}
+	return fileDescriptor_deffb3e711c9fade, []int{0}
 }
+
 func (m *ProximityRadiusUnitsEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProximityRadiusUnitsEnum.Unmarshal(m, b)
 }
 func (m *ProximityRadiusUnitsEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProximityRadiusUnitsEnum.Marshal(b, m, deterministic)
 }
-func (dst *ProximityRadiusUnitsEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProximityRadiusUnitsEnum.Merge(dst, src)
+func (m *ProximityRadiusUnitsEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProximityRadiusUnitsEnum.Merge(m, src)
 }
 func (m *ProximityRadiusUnitsEnum) XXX_Size() int {
 	return xxx_messageInfo_ProximityRadiusUnitsEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *ProximityRadiusUnitsEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ProximityRadiusUnitsEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ProximityRadiusUnitsEnum)(nil), "google.ads.googleads.v1.enums.ProximityRadiusUnitsEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ProximityRadiusUnitsEnum_ProximityRadiusUnits", ProximityRadiusUnitsEnum_ProximityRadiusUnits_name, ProximityRadiusUnitsEnum_ProximityRadiusUnits_value)
+	proto.RegisterType((*ProximityRadiusUnitsEnum)(nil), "google.ads.googleads.v1.enums.ProximityRadiusUnitsEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/proximity_radius_units.proto", fileDescriptor_proximity_radius_units_b6e6c9fc53d5bd7b)
+	proto.RegisterFile("google/ads/googleads/v1/enums/proximity_radius_units.proto", fileDescriptor_deffb3e711c9fade)
 }
 
-var fileDescriptor_proximity_radius_units_b6e6c9fc53d5bd7b = []byte{
+var fileDescriptor_deffb3e711c9fade = []byte{
 	// 315 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xfb, 0x30,
 	0x18, 0xc5, 0xff, 0xeb, 0xf8, 0x2b, 0x66, 0xa0, 0xa5, 0x78, 0xa1, 0xe2, 0x2e, 0xb6, 0x07, 0x48,
diff --git a/googleapis/ads/googleads/v1/enums/quality_score_bucket.pb.go b/googleapis/ads/googleads/v1/enums/quality_score_bucket.pb.go
index 4df3f3df4d..918aac77d1 100644
--- a/googleapis/ads/googleads/v1/enums/quality_score_bucket.pb.go
+++ b/googleapis/ads/googleads/v1/enums/quality_score_bucket.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/quality_score_bucket.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the possible quality score buckets.
 type QualityScoreBucketEnum_QualityScoreBucket int32
@@ -42,6 +45,7 @@ var QualityScoreBucketEnum_QualityScoreBucket_name = map[int32]string{
 	3: "AVERAGE",
 	4: "ABOVE_AVERAGE",
 }
+
 var QualityScoreBucketEnum_QualityScoreBucket_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -53,8 +57,9 @@ var QualityScoreBucketEnum_QualityScoreBucket_value = map[string]int32{
 func (x QualityScoreBucketEnum_QualityScoreBucket) String() string {
 	return proto.EnumName(QualityScoreBucketEnum_QualityScoreBucket_name, int32(x))
 }
+
 func (QualityScoreBucketEnum_QualityScoreBucket) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_quality_score_bucket_d1c2022083792bdb, []int{0, 0}
+	return fileDescriptor_6bb90b551a0fc47a, []int{0, 0}
 }
 
 // The relative performance compared to other advertisers.
@@ -68,16 +73,17 @@ func (m *QualityScoreBucketEnum) Reset()         { *m = QualityScoreBucketEnum{}
 func (m *QualityScoreBucketEnum) String() string { return proto.CompactTextString(m) }
 func (*QualityScoreBucketEnum) ProtoMessage()    {}
 func (*QualityScoreBucketEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quality_score_bucket_d1c2022083792bdb, []int{0}
+	return fileDescriptor_6bb90b551a0fc47a, []int{0}
 }
+
 func (m *QualityScoreBucketEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QualityScoreBucketEnum.Unmarshal(m, b)
 }
 func (m *QualityScoreBucketEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QualityScoreBucketEnum.Marshal(b, m, deterministic)
 }
-func (dst *QualityScoreBucketEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QualityScoreBucketEnum.Merge(dst, src)
+func (m *QualityScoreBucketEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QualityScoreBucketEnum.Merge(m, src)
 }
 func (m *QualityScoreBucketEnum) XXX_Size() int {
 	return xxx_messageInfo_QualityScoreBucketEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *QualityScoreBucketEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_QualityScoreBucketEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*QualityScoreBucketEnum)(nil), "google.ads.googleads.v1.enums.QualityScoreBucketEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.QualityScoreBucketEnum_QualityScoreBucket", QualityScoreBucketEnum_QualityScoreBucket_name, QualityScoreBucketEnum_QualityScoreBucket_value)
+	proto.RegisterType((*QualityScoreBucketEnum)(nil), "google.ads.googleads.v1.enums.QualityScoreBucketEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/quality_score_bucket.proto", fileDescriptor_quality_score_bucket_d1c2022083792bdb)
+	proto.RegisterFile("google/ads/googleads/v1/enums/quality_score_bucket.proto", fileDescriptor_6bb90b551a0fc47a)
 }
 
-var fileDescriptor_quality_score_bucket_d1c2022083792bdb = []byte{
+var fileDescriptor_6bb90b551a0fc47a = []byte{
 	// 320 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xfb, 0x30,
 	0x18, 0xc5, 0xff, 0xeb, 0xfe, 0x28, 0x64, 0x88, 0xb3, 0x17, 0x0a, 0xe2, 0x2e, 0xb6, 0x07, 0x48,
diff --git a/googleapis/ads/googleads/v1/enums/real_estate_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/real_estate_placeholder_field.pb.go
index a9e5a51e51..a36b610766 100644
--- a/googleapis/ads/googleads/v1/enums/real_estate_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/real_estate_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/real_estate_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Real Estate placeholder fields.
 type RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField int32
@@ -102,6 +105,7 @@ var RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField_name = map[int32]s
 	18: "IOS_APP_LINK",
 	19: "IOS_APP_STORE_ID",
 }
+
 var RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -128,8 +132,9 @@ var RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField_value = map[string
 func (x RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField) String() string {
 	return proto.EnumName(RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField_name, int32(x))
 }
+
 func (RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_real_estate_placeholder_field_0cf045b5aa386b01, []int{0, 0}
+	return fileDescriptor_55a569651ed4e6a3, []int{0, 0}
 }
 
 // Values for Real Estate placeholder fields.
@@ -145,16 +150,17 @@ func (m *RealEstatePlaceholderFieldEnum) Reset()         { *m = RealEstatePlaceh
 func (m *RealEstatePlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*RealEstatePlaceholderFieldEnum) ProtoMessage()    {}
 func (*RealEstatePlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_real_estate_placeholder_field_0cf045b5aa386b01, []int{0}
+	return fileDescriptor_55a569651ed4e6a3, []int{0}
 }
+
 func (m *RealEstatePlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RealEstatePlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *RealEstatePlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RealEstatePlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *RealEstatePlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RealEstatePlaceholderFieldEnum.Merge(dst, src)
+func (m *RealEstatePlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RealEstatePlaceholderFieldEnum.Merge(m, src)
 }
 func (m *RealEstatePlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_RealEstatePlaceholderFieldEnum.Size(m)
@@ -166,15 +172,15 @@ func (m *RealEstatePlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_RealEstatePlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*RealEstatePlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.RealEstatePlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField", RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField_name, RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField_value)
+	proto.RegisterType((*RealEstatePlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.RealEstatePlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/real_estate_placeholder_field.proto", fileDescriptor_real_estate_placeholder_field_0cf045b5aa386b01)
+	proto.RegisterFile("google/ads/googleads/v1/enums/real_estate_placeholder_field.proto", fileDescriptor_55a569651ed4e6a3)
 }
 
-var fileDescriptor_real_estate_placeholder_field_0cf045b5aa386b01 = []byte{
+var fileDescriptor_55a569651ed4e6a3 = []byte{
 	// 513 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6e, 0xda, 0x3c,
 	0x14, 0xc7, 0x3f, 0xe0, 0x6b, 0x3b, 0x4c, 0x29, 0xc6, 0x6c, 0x9a, 0x54, 0xad, 0x9b, 0xda, 0x07,
diff --git a/googleapis/ads/googleads/v1/enums/recommendation_type.pb.go b/googleapis/ads/googleads/v1/enums/recommendation_type.pb.go
index d61f8237cb..e1e116cb61 100644
--- a/googleapis/ads/googleads/v1/enums/recommendation_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/recommendation_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/recommendation_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Types of recommendations.
 type RecommendationTypeEnum_RecommendationType int32
@@ -81,6 +84,7 @@ var RecommendationTypeEnum_RecommendationType_name = map[int32]string{
 	14: "KEYWORD_MATCH_TYPE",
 	15: "MOVE_UNUSED_BUDGET",
 }
+
 var RecommendationTypeEnum_RecommendationType_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -103,8 +107,9 @@ var RecommendationTypeEnum_RecommendationType_value = map[string]int32{
 func (x RecommendationTypeEnum_RecommendationType) String() string {
 	return proto.EnumName(RecommendationTypeEnum_RecommendationType_name, int32(x))
 }
+
 func (RecommendationTypeEnum_RecommendationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_type_5880b2dc3b350db2, []int{0, 0}
+	return fileDescriptor_8dbf696d9c23fcc1, []int{0, 0}
 }
 
 // Container for enum describing types of recommendations.
@@ -118,16 +123,17 @@ func (m *RecommendationTypeEnum) Reset()         { *m = RecommendationTypeEnum{}
 func (m *RecommendationTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*RecommendationTypeEnum) ProtoMessage()    {}
 func (*RecommendationTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_type_5880b2dc3b350db2, []int{0}
+	return fileDescriptor_8dbf696d9c23fcc1, []int{0}
 }
+
 func (m *RecommendationTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecommendationTypeEnum.Unmarshal(m, b)
 }
 func (m *RecommendationTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecommendationTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *RecommendationTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecommendationTypeEnum.Merge(dst, src)
+func (m *RecommendationTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecommendationTypeEnum.Merge(m, src)
 }
 func (m *RecommendationTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_RecommendationTypeEnum.Size(m)
@@ -139,15 +145,15 @@ func (m *RecommendationTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_RecommendationTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*RecommendationTypeEnum)(nil), "google.ads.googleads.v1.enums.RecommendationTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.RecommendationTypeEnum_RecommendationType", RecommendationTypeEnum_RecommendationType_name, RecommendationTypeEnum_RecommendationType_value)
+	proto.RegisterType((*RecommendationTypeEnum)(nil), "google.ads.googleads.v1.enums.RecommendationTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/recommendation_type.proto", fileDescriptor_recommendation_type_5880b2dc3b350db2)
+	proto.RegisterFile("google/ads/googleads/v1/enums/recommendation_type.proto", fileDescriptor_8dbf696d9c23fcc1)
 }
 
-var fileDescriptor_recommendation_type_5880b2dc3b350db2 = []byte{
+var fileDescriptor_8dbf696d9c23fcc1 = []byte{
 	// 493 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6e, 0xd3, 0x30,
 	0x14, 0x86, 0x69, 0x0b, 0x1b, 0xb8, 0xb0, 0x06, 0x0f, 0x3a, 0x34, 0x98, 0xd0, 0xf6, 0x00, 0x89,
diff --git a/googleapis/ads/googleads/v1/enums/search_engine_results_page_type.pb.go b/googleapis/ads/googleads/v1/enums/search_engine_results_page_type.pb.go
index 4fbe55344c..549b9610ce 100644
--- a/googleapis/ads/googleads/v1/enums/search_engine_results_page_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/search_engine_results_page_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/search_engine_results_page_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of the search engine results page.
 type SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType int32
@@ -43,6 +46,7 @@ var SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType_name = map[int32
 	3: "ORGANIC_ONLY",
 	4: "ADS_AND_ORGANIC",
 }
+
 var SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -54,8 +58,9 @@ var SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType_value = map[stri
 func (x SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType) String() string {
 	return proto.EnumName(SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType_name, int32(x))
 }
+
 func (SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_search_engine_results_page_type_8eeb6594cd669db9, []int{0, 0}
+	return fileDescriptor_db318dd200586d33, []int{0, 0}
 }
 
 // The type of the search engine results page.
@@ -69,16 +74,17 @@ func (m *SearchEngineResultsPageTypeEnum) Reset()         { *m = SearchEngineRes
 func (m *SearchEngineResultsPageTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*SearchEngineResultsPageTypeEnum) ProtoMessage()    {}
 func (*SearchEngineResultsPageTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_search_engine_results_page_type_8eeb6594cd669db9, []int{0}
+	return fileDescriptor_db318dd200586d33, []int{0}
 }
+
 func (m *SearchEngineResultsPageTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchEngineResultsPageTypeEnum.Unmarshal(m, b)
 }
 func (m *SearchEngineResultsPageTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchEngineResultsPageTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *SearchEngineResultsPageTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchEngineResultsPageTypeEnum.Merge(dst, src)
+func (m *SearchEngineResultsPageTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchEngineResultsPageTypeEnum.Merge(m, src)
 }
 func (m *SearchEngineResultsPageTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_SearchEngineResultsPageTypeEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *SearchEngineResultsPageTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SearchEngineResultsPageTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SearchEngineResultsPageTypeEnum)(nil), "google.ads.googleads.v1.enums.SearchEngineResultsPageTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType", SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType_name, SearchEngineResultsPageTypeEnum_SearchEngineResultsPageType_value)
+	proto.RegisterType((*SearchEngineResultsPageTypeEnum)(nil), "google.ads.googleads.v1.enums.SearchEngineResultsPageTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/search_engine_results_page_type.proto", fileDescriptor_search_engine_results_page_type_8eeb6594cd669db9)
+	proto.RegisterFile("google/ads/googleads/v1/enums/search_engine_results_page_type.proto", fileDescriptor_db318dd200586d33)
 }
 
-var fileDescriptor_search_engine_results_page_type_8eeb6594cd669db9 = []byte{
+var fileDescriptor_db318dd200586d33 = []byte{
 	// 339 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xd1, 0x4e, 0xc2, 0x30,
 	0x14, 0x75, 0xc3, 0xa8, 0x29, 0x24, 0x2c, 0xf3, 0x4d, 0x25, 0x0a, 0x1f, 0xd0, 0x65, 0xf1, 0xad,
diff --git a/googleapis/ads/googleads/v1/enums/search_term_match_type.pb.go b/googleapis/ads/googleads/v1/enums/search_term_match_type.pb.go
index a054ffd6e6..d3acda934c 100644
--- a/googleapis/ads/googleads/v1/enums/search_term_match_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/search_term_match_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/search_term_match_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible match types for a keyword triggering an ad, including variants.
 type SearchTermMatchTypeEnum_SearchTermMatchType int32
@@ -48,6 +51,7 @@ var SearchTermMatchTypeEnum_SearchTermMatchType_name = map[int32]string{
 	5: "NEAR_EXACT",
 	6: "NEAR_PHRASE",
 }
+
 var SearchTermMatchTypeEnum_SearchTermMatchType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -61,8 +65,9 @@ var SearchTermMatchTypeEnum_SearchTermMatchType_value = map[string]int32{
 func (x SearchTermMatchTypeEnum_SearchTermMatchType) String() string {
 	return proto.EnumName(SearchTermMatchTypeEnum_SearchTermMatchType_name, int32(x))
 }
+
 func (SearchTermMatchTypeEnum_SearchTermMatchType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_search_term_match_type_20ffb145f6a71e1b, []int{0, 0}
+	return fileDescriptor_505ba0d0a9da1b88, []int{0, 0}
 }
 
 // Container for enum describing match types for a keyword triggering an ad.
@@ -76,16 +81,17 @@ func (m *SearchTermMatchTypeEnum) Reset()         { *m = SearchTermMatchTypeEnum
 func (m *SearchTermMatchTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*SearchTermMatchTypeEnum) ProtoMessage()    {}
 func (*SearchTermMatchTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_search_term_match_type_20ffb145f6a71e1b, []int{0}
+	return fileDescriptor_505ba0d0a9da1b88, []int{0}
 }
+
 func (m *SearchTermMatchTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchTermMatchTypeEnum.Unmarshal(m, b)
 }
 func (m *SearchTermMatchTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchTermMatchTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *SearchTermMatchTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchTermMatchTypeEnum.Merge(dst, src)
+func (m *SearchTermMatchTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchTermMatchTypeEnum.Merge(m, src)
 }
 func (m *SearchTermMatchTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_SearchTermMatchTypeEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *SearchTermMatchTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SearchTermMatchTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SearchTermMatchTypeEnum)(nil), "google.ads.googleads.v1.enums.SearchTermMatchTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SearchTermMatchTypeEnum_SearchTermMatchType", SearchTermMatchTypeEnum_SearchTermMatchType_name, SearchTermMatchTypeEnum_SearchTermMatchType_value)
+	proto.RegisterType((*SearchTermMatchTypeEnum)(nil), "google.ads.googleads.v1.enums.SearchTermMatchTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/search_term_match_type.proto", fileDescriptor_search_term_match_type_20ffb145f6a71e1b)
+	proto.RegisterFile("google/ads/googleads/v1/enums/search_term_match_type.proto", fileDescriptor_505ba0d0a9da1b88)
 }
 
-var fileDescriptor_search_term_match_type_20ffb145f6a71e1b = []byte{
+var fileDescriptor_505ba0d0a9da1b88 = []byte{
 	// 339 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xdf, 0x4a, 0xf3, 0x30,
 	0x18, 0xc6, 0xbf, 0x76, 0xdf, 0x26, 0x66, 0xa0, 0xa5, 0x1e, 0x28, 0xe2, 0x0e, 0xb6, 0x0b, 0x48,
diff --git a/googleapis/ads/googleads/v1/enums/search_term_targeting_status.pb.go b/googleapis/ads/googleads/v1/enums/search_term_targeting_status.pb.go
index 397b8471c7..515fd6ee43 100644
--- a/googleapis/ads/googleads/v1/enums/search_term_targeting_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/search_term_targeting_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/search_term_targeting_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates whether the search term is one of your targeted or excluded
 // keywords.
@@ -46,6 +49,7 @@ var SearchTermTargetingStatusEnum_SearchTermTargetingStatus_name = map[int32]str
 	4: "ADDED_EXCLUDED",
 	5: "NONE",
 }
+
 var SearchTermTargetingStatusEnum_SearchTermTargetingStatus_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -58,8 +62,9 @@ var SearchTermTargetingStatusEnum_SearchTermTargetingStatus_value = map[string]i
 func (x SearchTermTargetingStatusEnum_SearchTermTargetingStatus) String() string {
 	return proto.EnumName(SearchTermTargetingStatusEnum_SearchTermTargetingStatus_name, int32(x))
 }
+
 func (SearchTermTargetingStatusEnum_SearchTermTargetingStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_search_term_targeting_status_521500b33031bfcc, []int{0, 0}
+	return fileDescriptor_e85ee4a345f96b8f, []int{0, 0}
 }
 
 // Container for enum indicating whether a search term is one of your targeted
@@ -74,16 +79,17 @@ func (m *SearchTermTargetingStatusEnum) Reset()         { *m = SearchTermTargeti
 func (m *SearchTermTargetingStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*SearchTermTargetingStatusEnum) ProtoMessage()    {}
 func (*SearchTermTargetingStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_search_term_targeting_status_521500b33031bfcc, []int{0}
+	return fileDescriptor_e85ee4a345f96b8f, []int{0}
 }
+
 func (m *SearchTermTargetingStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchTermTargetingStatusEnum.Unmarshal(m, b)
 }
 func (m *SearchTermTargetingStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchTermTargetingStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *SearchTermTargetingStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchTermTargetingStatusEnum.Merge(dst, src)
+func (m *SearchTermTargetingStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchTermTargetingStatusEnum.Merge(m, src)
 }
 func (m *SearchTermTargetingStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_SearchTermTargetingStatusEnum.Size(m)
@@ -95,15 +101,15 @@ func (m *SearchTermTargetingStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SearchTermTargetingStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SearchTermTargetingStatusEnum)(nil), "google.ads.googleads.v1.enums.SearchTermTargetingStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SearchTermTargetingStatusEnum_SearchTermTargetingStatus", SearchTermTargetingStatusEnum_SearchTermTargetingStatus_name, SearchTermTargetingStatusEnum_SearchTermTargetingStatus_value)
+	proto.RegisterType((*SearchTermTargetingStatusEnum)(nil), "google.ads.googleads.v1.enums.SearchTermTargetingStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/search_term_targeting_status.proto", fileDescriptor_search_term_targeting_status_521500b33031bfcc)
+	proto.RegisterFile("google/ads/googleads/v1/enums/search_term_targeting_status.proto", fileDescriptor_e85ee4a345f96b8f)
 }
 
-var fileDescriptor_search_term_targeting_status_521500b33031bfcc = []byte{
+var fileDescriptor_e85ee4a345f96b8f = []byte{
 	// 335 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4b, 0x4e, 0xc3, 0x30,
 	0x10, 0x25, 0x69, 0x0b, 0xc5, 0x45, 0x10, 0x79, 0x07, 0xa2, 0x48, 0xed, 0x01, 0x1c, 0x45, 0xec,
diff --git a/googleapis/ads/googleads/v1/enums/served_asset_field_type.pb.go b/googleapis/ads/googleads/v1/enums/served_asset_field_type.pb.go
index d0af91d33d..476b8f9b9e 100644
--- a/googleapis/ads/googleads/v1/enums/served_asset_field_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/served_asset_field_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/served_asset_field_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible asset field types.
 type ServedAssetFieldTypeEnum_ServedAssetFieldType int32
@@ -50,6 +53,7 @@ var ServedAssetFieldTypeEnum_ServedAssetFieldType_name = map[int32]string{
 	5: "DESCRIPTION_1",
 	6: "DESCRIPTION_2",
 }
+
 var ServedAssetFieldTypeEnum_ServedAssetFieldType_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -63,8 +67,9 @@ var ServedAssetFieldTypeEnum_ServedAssetFieldType_value = map[string]int32{
 func (x ServedAssetFieldTypeEnum_ServedAssetFieldType) String() string {
 	return proto.EnumName(ServedAssetFieldTypeEnum_ServedAssetFieldType_name, int32(x))
 }
+
 func (ServedAssetFieldTypeEnum_ServedAssetFieldType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_served_asset_field_type_a333abd6d211e399, []int{0, 0}
+	return fileDescriptor_bbc3a0c17156a84d, []int{0, 0}
 }
 
 // Container for enum describing possible asset field types.
@@ -78,16 +83,17 @@ func (m *ServedAssetFieldTypeEnum) Reset()         { *m = ServedAssetFieldTypeEn
 func (m *ServedAssetFieldTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*ServedAssetFieldTypeEnum) ProtoMessage()    {}
 func (*ServedAssetFieldTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_served_asset_field_type_a333abd6d211e399, []int{0}
+	return fileDescriptor_bbc3a0c17156a84d, []int{0}
 }
+
 func (m *ServedAssetFieldTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServedAssetFieldTypeEnum.Unmarshal(m, b)
 }
 func (m *ServedAssetFieldTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServedAssetFieldTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *ServedAssetFieldTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServedAssetFieldTypeEnum.Merge(dst, src)
+func (m *ServedAssetFieldTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServedAssetFieldTypeEnum.Merge(m, src)
 }
 func (m *ServedAssetFieldTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_ServedAssetFieldTypeEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *ServedAssetFieldTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ServedAssetFieldTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ServedAssetFieldTypeEnum)(nil), "google.ads.googleads.v1.enums.ServedAssetFieldTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.ServedAssetFieldTypeEnum_ServedAssetFieldType", ServedAssetFieldTypeEnum_ServedAssetFieldType_name, ServedAssetFieldTypeEnum_ServedAssetFieldType_value)
+	proto.RegisterType((*ServedAssetFieldTypeEnum)(nil), "google.ads.googleads.v1.enums.ServedAssetFieldTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/served_asset_field_type.proto", fileDescriptor_served_asset_field_type_a333abd6d211e399)
+	proto.RegisterFile("google/ads/googleads/v1/enums/served_asset_field_type.proto", fileDescriptor_bbc3a0c17156a84d)
 }
 
-var fileDescriptor_served_asset_field_type_a333abd6d211e399 = []byte{
+var fileDescriptor_bbc3a0c17156a84d = []byte{
 	// 344 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xdd, 0x4a, 0xc3, 0x30,
 	0x14, 0xb6, 0x9d, 0x4e, 0xc8, 0x50, 0x63, 0xf1, 0x42, 0xc5, 0x5d, 0x6c, 0x0f, 0x90, 0x92, 0xed,
diff --git a/googleapis/ads/googleads/v1/enums/shared_set_status.pb.go b/googleapis/ads/googleads/v1/enums/shared_set_status.pb.go
index d29fc65f08..9b1fe8c4b6 100644
--- a/googleapis/ads/googleads/v1/enums/shared_set_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/shared_set_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/shared_set_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the possible shared set statuses.
 type SharedSetStatusEnum_SharedSetStatus int32
@@ -39,6 +42,7 @@ var SharedSetStatusEnum_SharedSetStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "REMOVED",
 }
+
 var SharedSetStatusEnum_SharedSetStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var SharedSetStatusEnum_SharedSetStatus_value = map[string]int32{
 func (x SharedSetStatusEnum_SharedSetStatus) String() string {
 	return proto.EnumName(SharedSetStatusEnum_SharedSetStatus_name, int32(x))
 }
+
 func (SharedSetStatusEnum_SharedSetStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_status_513c75a1a01c6520, []int{0, 0}
+	return fileDescriptor_c47bfb5c4eb612f2, []int{0, 0}
 }
 
 // Container for enum describing types of shared set statuses.
@@ -64,16 +69,17 @@ func (m *SharedSetStatusEnum) Reset()         { *m = SharedSetStatusEnum{} }
 func (m *SharedSetStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*SharedSetStatusEnum) ProtoMessage()    {}
 func (*SharedSetStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_status_513c75a1a01c6520, []int{0}
+	return fileDescriptor_c47bfb5c4eb612f2, []int{0}
 }
+
 func (m *SharedSetStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedSetStatusEnum.Unmarshal(m, b)
 }
 func (m *SharedSetStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedSetStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *SharedSetStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedSetStatusEnum.Merge(dst, src)
+func (m *SharedSetStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedSetStatusEnum.Merge(m, src)
 }
 func (m *SharedSetStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_SharedSetStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *SharedSetStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SharedSetStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SharedSetStatusEnum)(nil), "google.ads.googleads.v1.enums.SharedSetStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SharedSetStatusEnum_SharedSetStatus", SharedSetStatusEnum_SharedSetStatus_name, SharedSetStatusEnum_SharedSetStatus_value)
+	proto.RegisterType((*SharedSetStatusEnum)(nil), "google.ads.googleads.v1.enums.SharedSetStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/shared_set_status.proto", fileDescriptor_shared_set_status_513c75a1a01c6520)
+	proto.RegisterFile("google/ads/googleads/v1/enums/shared_set_status.proto", fileDescriptor_c47bfb5c4eb612f2)
 }
 
-var fileDescriptor_shared_set_status_513c75a1a01c6520 = []byte{
+var fileDescriptor_c47bfb5c4eb612f2 = []byte{
 	// 301 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x4d, 0x4a, 0x03, 0x31,
 	0x14, 0xb6, 0x53, 0x50, 0x48, 0x17, 0x1d, 0xaa, 0x2b, 0xb1, 0x8b, 0xf6, 0x00, 0x09, 0x83, 0xb8,
diff --git a/googleapis/ads/googleads/v1/enums/shared_set_type.pb.go b/googleapis/ads/googleads/v1/enums/shared_set_type.pb.go
index 151b2e64be..deb4af0847 100644
--- a/googleapis/ads/googleads/v1/enums/shared_set_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/shared_set_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/shared_set_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the possible shared set types.
 type SharedSetTypeEnum_SharedSetType int32
@@ -39,6 +42,7 @@ var SharedSetTypeEnum_SharedSetType_name = map[int32]string{
 	2: "NEGATIVE_KEYWORDS",
 	3: "NEGATIVE_PLACEMENTS",
 }
+
 var SharedSetTypeEnum_SharedSetType_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -49,8 +53,9 @@ var SharedSetTypeEnum_SharedSetType_value = map[string]int32{
 func (x SharedSetTypeEnum_SharedSetType) String() string {
 	return proto.EnumName(SharedSetTypeEnum_SharedSetType_name, int32(x))
 }
+
 func (SharedSetTypeEnum_SharedSetType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_type_6a9f5b8cceba110f, []int{0, 0}
+	return fileDescriptor_f0b5a2733cf6883c, []int{0, 0}
 }
 
 // Container for enum describing types of shared sets.
@@ -64,16 +69,17 @@ func (m *SharedSetTypeEnum) Reset()         { *m = SharedSetTypeEnum{} }
 func (m *SharedSetTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*SharedSetTypeEnum) ProtoMessage()    {}
 func (*SharedSetTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_type_6a9f5b8cceba110f, []int{0}
+	return fileDescriptor_f0b5a2733cf6883c, []int{0}
 }
+
 func (m *SharedSetTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedSetTypeEnum.Unmarshal(m, b)
 }
 func (m *SharedSetTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedSetTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *SharedSetTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedSetTypeEnum.Merge(dst, src)
+func (m *SharedSetTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedSetTypeEnum.Merge(m, src)
 }
 func (m *SharedSetTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_SharedSetTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *SharedSetTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SharedSetTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SharedSetTypeEnum)(nil), "google.ads.googleads.v1.enums.SharedSetTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SharedSetTypeEnum_SharedSetType", SharedSetTypeEnum_SharedSetType_name, SharedSetTypeEnum_SharedSetType_value)
+	proto.RegisterType((*SharedSetTypeEnum)(nil), "google.ads.googleads.v1.enums.SharedSetTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/shared_set_type.proto", fileDescriptor_shared_set_type_6a9f5b8cceba110f)
+	proto.RegisterFile("google/ads/googleads/v1/enums/shared_set_type.proto", fileDescriptor_f0b5a2733cf6883c)
 }
 
-var fileDescriptor_shared_set_type_6a9f5b8cceba110f = []byte{
+var fileDescriptor_f0b5a2733cf6883c = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x1c, 0x76, 0x1d, 0x28, 0x64, 0x88, 0x5d, 0x45, 0x04, 0x71, 0x87, 0xed, 0x01, 0x52, 0xca, 0x6e,
diff --git a/googleapis/ads/googleads/v1/enums/simulation_modification_method.pb.go b/googleapis/ads/googleads/v1/enums/simulation_modification_method.pb.go
index 134c0ddfaa..fadae132d2 100644
--- a/googleapis/ads/googleads/v1/enums/simulation_modification_method.pb.go
+++ b/googleapis/ads/googleads/v1/enums/simulation_modification_method.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/simulation_modification_method.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the method by which a simulation modifies a field.
 type SimulationModificationMethodEnum_SimulationModificationMethod int32
@@ -42,6 +45,7 @@ var SimulationModificationMethodEnum_SimulationModificationMethod_name = map[int
 	2: "UNIFORM",
 	3: "DEFAULT",
 }
+
 var SimulationModificationMethodEnum_SimulationModificationMethod_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -52,8 +56,9 @@ var SimulationModificationMethodEnum_SimulationModificationMethod_value = map[st
 func (x SimulationModificationMethodEnum_SimulationModificationMethod) String() string {
 	return proto.EnumName(SimulationModificationMethodEnum_SimulationModificationMethod_name, int32(x))
 }
+
 func (SimulationModificationMethodEnum_SimulationModificationMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_modification_method_76c10895becc3924, []int{0, 0}
+	return fileDescriptor_ecdf62786c8f64e4, []int{0, 0}
 }
 
 // Container for enum describing the method by which a simulation modifies
@@ -68,16 +73,17 @@ func (m *SimulationModificationMethodEnum) Reset()         { *m = SimulationModi
 func (m *SimulationModificationMethodEnum) String() string { return proto.CompactTextString(m) }
 func (*SimulationModificationMethodEnum) ProtoMessage()    {}
 func (*SimulationModificationMethodEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_modification_method_76c10895becc3924, []int{0}
+	return fileDescriptor_ecdf62786c8f64e4, []int{0}
 }
+
 func (m *SimulationModificationMethodEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SimulationModificationMethodEnum.Unmarshal(m, b)
 }
 func (m *SimulationModificationMethodEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SimulationModificationMethodEnum.Marshal(b, m, deterministic)
 }
-func (dst *SimulationModificationMethodEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SimulationModificationMethodEnum.Merge(dst, src)
+func (m *SimulationModificationMethodEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimulationModificationMethodEnum.Merge(m, src)
 }
 func (m *SimulationModificationMethodEnum) XXX_Size() int {
 	return xxx_messageInfo_SimulationModificationMethodEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *SimulationModificationMethodEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SimulationModificationMethodEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SimulationModificationMethodEnum)(nil), "google.ads.googleads.v1.enums.SimulationModificationMethodEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SimulationModificationMethodEnum_SimulationModificationMethod", SimulationModificationMethodEnum_SimulationModificationMethod_name, SimulationModificationMethodEnum_SimulationModificationMethod_value)
+	proto.RegisterType((*SimulationModificationMethodEnum)(nil), "google.ads.googleads.v1.enums.SimulationModificationMethodEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/simulation_modification_method.proto", fileDescriptor_simulation_modification_method_76c10895becc3924)
+	proto.RegisterFile("google/ads/googleads/v1/enums/simulation_modification_method.proto", fileDescriptor_ecdf62786c8f64e4)
 }
 
-var fileDescriptor_simulation_modification_method_76c10895becc3924 = []byte{
+var fileDescriptor_ecdf62786c8f64e4 = []byte{
 	// 308 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4a, 0xc3, 0x30,
 	0x14, 0x75, 0x1d, 0x28, 0x64, 0x0f, 0x96, 0x3d, 0xca, 0x06, 0x6e, 0x1f, 0x90, 0x50, 0x7c, 0x8b,
diff --git a/googleapis/ads/googleads/v1/enums/simulation_type.pb.go b/googleapis/ads/googleads/v1/enums/simulation_type.pb.go
index 8c6812c955..0eb16e36ff 100644
--- a/googleapis/ads/googleads/v1/enums/simulation_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/simulation_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/simulation_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing the field a simulation modifies.
 type SimulationTypeEnum_SimulationType int32
@@ -45,6 +48,7 @@ var SimulationTypeEnum_SimulationType_name = map[int32]string{
 	4: "TARGET_CPA",
 	5: "BID_MODIFIER",
 }
+
 var SimulationTypeEnum_SimulationType_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -57,8 +61,9 @@ var SimulationTypeEnum_SimulationType_value = map[string]int32{
 func (x SimulationTypeEnum_SimulationType) String() string {
 	return proto.EnumName(SimulationTypeEnum_SimulationType_name, int32(x))
 }
+
 func (SimulationTypeEnum_SimulationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_type_c2cbede8840bdffd, []int{0, 0}
+	return fileDescriptor_bfbb0271e7521728, []int{0, 0}
 }
 
 // Container for enum describing the field a simulation modifies.
@@ -72,16 +77,17 @@ func (m *SimulationTypeEnum) Reset()         { *m = SimulationTypeEnum{} }
 func (m *SimulationTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*SimulationTypeEnum) ProtoMessage()    {}
 func (*SimulationTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_simulation_type_c2cbede8840bdffd, []int{0}
+	return fileDescriptor_bfbb0271e7521728, []int{0}
 }
+
 func (m *SimulationTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SimulationTypeEnum.Unmarshal(m, b)
 }
 func (m *SimulationTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SimulationTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *SimulationTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SimulationTypeEnum.Merge(dst, src)
+func (m *SimulationTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimulationTypeEnum.Merge(m, src)
 }
 func (m *SimulationTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_SimulationTypeEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *SimulationTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SimulationTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SimulationTypeEnum)(nil), "google.ads.googleads.v1.enums.SimulationTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SimulationTypeEnum_SimulationType", SimulationTypeEnum_SimulationType_name, SimulationTypeEnum_SimulationType_value)
+	proto.RegisterType((*SimulationTypeEnum)(nil), "google.ads.googleads.v1.enums.SimulationTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/simulation_type.proto", fileDescriptor_simulation_type_c2cbede8840bdffd)
+	proto.RegisterFile("google/ads/googleads/v1/enums/simulation_type.proto", fileDescriptor_bfbb0271e7521728)
 }
 
-var fileDescriptor_simulation_type_c2cbede8840bdffd = []byte{
+var fileDescriptor_bfbb0271e7521728 = []byte{
 	// 324 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcd, 0x4a, 0xf3, 0x40,
 	0x14, 0xfd, 0x92, 0x7e, 0x2a, 0x4c, 0xa5, 0x86, 0xb8, 0x13, 0xbb, 0x68, 0x1f, 0x60, 0x86, 0xd0,
diff --git a/googleapis/ads/googleads/v1/enums/sitelink_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/sitelink_placeholder_field.pb.go
index ee53fd6678..282b31fb65 100644
--- a/googleapis/ads/googleads/v1/enums/sitelink_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/sitelink_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/sitelink_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Sitelink placeholder fields.
 type SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField int32
@@ -58,6 +61,7 @@ var SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField_name = map[int32]strin
 	7: "TRACKING_URL",
 	8: "FINAL_URL_SUFFIX",
 }
+
 var SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":       0,
 	"UNKNOWN":           1,
@@ -73,8 +77,9 @@ var SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField_value = map[string]int
 func (x SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField) String() string {
 	return proto.EnumName(SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField_name, int32(x))
 }
+
 func (SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_sitelink_placeholder_field_4eeb2517ba6aee0a, []int{0, 0}
+	return fileDescriptor_35cfd519d4af849b, []int{0, 0}
 }
 
 // Values for Sitelink placeholder fields.
@@ -88,16 +93,17 @@ func (m *SitelinkPlaceholderFieldEnum) Reset()         { *m = SitelinkPlaceholde
 func (m *SitelinkPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*SitelinkPlaceholderFieldEnum) ProtoMessage()    {}
 func (*SitelinkPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sitelink_placeholder_field_4eeb2517ba6aee0a, []int{0}
+	return fileDescriptor_35cfd519d4af849b, []int{0}
 }
+
 func (m *SitelinkPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SitelinkPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *SitelinkPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SitelinkPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *SitelinkPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SitelinkPlaceholderFieldEnum.Merge(dst, src)
+func (m *SitelinkPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SitelinkPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *SitelinkPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_SitelinkPlaceholderFieldEnum.Size(m)
@@ -109,15 +115,15 @@ func (m *SitelinkPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SitelinkPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SitelinkPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.SitelinkPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField", SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField_name, SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField_value)
+	proto.RegisterType((*SitelinkPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.SitelinkPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/sitelink_placeholder_field.proto", fileDescriptor_sitelink_placeholder_field_4eeb2517ba6aee0a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/sitelink_placeholder_field.proto", fileDescriptor_35cfd519d4af849b)
 }
 
-var fileDescriptor_sitelink_placeholder_field_4eeb2517ba6aee0a = []byte{
+var fileDescriptor_35cfd519d4af849b = []byte{
 	// 377 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xd1, 0x8e, 0x9a, 0x40,
 	0x14, 0x86, 0x0b, 0x5a, 0x35, 0x63, 0xd3, 0x4e, 0x27, 0x6d, 0xd2, 0x34, 0x7a, 0xa1, 0x0f, 0x30,
diff --git a/googleapis/ads/googleads/v1/enums/slot.pb.go b/googleapis/ads/googleads/v1/enums/slot.pb.go
index 5e99381673..6249ec2c53 100644
--- a/googleapis/ads/googleads/v1/enums/slot.pb.go
+++ b/googleapis/ads/googleads/v1/enums/slot.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/slot.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates possible positions of the Ad.
 type SlotEnum_Slot int32
@@ -54,6 +57,7 @@ var SlotEnum_Slot_name = map[int32]string{
 	7: "SEARCH_PARTNER_OTHER",
 	8: "MIXED",
 }
+
 var SlotEnum_Slot_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -69,8 +73,9 @@ var SlotEnum_Slot_value = map[string]int32{
 func (x SlotEnum_Slot) String() string {
 	return proto.EnumName(SlotEnum_Slot_name, int32(x))
 }
+
 func (SlotEnum_Slot) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_slot_050e1c028a893c5a, []int{0, 0}
+	return fileDescriptor_19070d4b6c614f61, []int{0, 0}
 }
 
 // Container for enumeration of possible positions of the Ad.
@@ -84,16 +89,17 @@ func (m *SlotEnum) Reset()         { *m = SlotEnum{} }
 func (m *SlotEnum) String() string { return proto.CompactTextString(m) }
 func (*SlotEnum) ProtoMessage()    {}
 func (*SlotEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_slot_050e1c028a893c5a, []int{0}
+	return fileDescriptor_19070d4b6c614f61, []int{0}
 }
+
 func (m *SlotEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SlotEnum.Unmarshal(m, b)
 }
 func (m *SlotEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SlotEnum.Marshal(b, m, deterministic)
 }
-func (dst *SlotEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SlotEnum.Merge(dst, src)
+func (m *SlotEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SlotEnum.Merge(m, src)
 }
 func (m *SlotEnum) XXX_Size() int {
 	return xxx_messageInfo_SlotEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *SlotEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SlotEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SlotEnum)(nil), "google.ads.googleads.v1.enums.SlotEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SlotEnum_Slot", SlotEnum_Slot_name, SlotEnum_Slot_value)
+	proto.RegisterType((*SlotEnum)(nil), "google.ads.googleads.v1.enums.SlotEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/slot.proto", fileDescriptor_slot_050e1c028a893c5a)
+	proto.RegisterFile("google/ads/googleads/v1/enums/slot.proto", fileDescriptor_19070d4b6c614f61)
 }
 
-var fileDescriptor_slot_050e1c028a893c5a = []byte{
+var fileDescriptor_19070d4b6c614f61 = []byte{
 	// 347 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcd, 0x4a, 0xeb, 0x40,
 	0x18, 0xbd, 0x49, 0xff, 0xa7, 0x97, 0x7b, 0x87, 0x41, 0x44, 0xc4, 0x2e, 0xda, 0x95, 0xab, 0x09,
diff --git a/googleapis/ads/googleads/v1/enums/spending_limit_type.pb.go b/googleapis/ads/googleads/v1/enums/spending_limit_type.pb.go
index 793531b6d0..69aa497f48 100644
--- a/googleapis/ads/googleads/v1/enums/spending_limit_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/spending_limit_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/spending_limit_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible spending limit types used by certain resources as an
 // alternative to absolute money values in micros.
@@ -37,6 +40,7 @@ var SpendingLimitTypeEnum_SpendingLimitType_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "INFINITE",
 }
+
 var SpendingLimitTypeEnum_SpendingLimitType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -46,8 +50,9 @@ var SpendingLimitTypeEnum_SpendingLimitType_value = map[string]int32{
 func (x SpendingLimitTypeEnum_SpendingLimitType) String() string {
 	return proto.EnumName(SpendingLimitTypeEnum_SpendingLimitType_name, int32(x))
 }
+
 func (SpendingLimitTypeEnum_SpendingLimitType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_spending_limit_type_709c8d5d89f1cb00, []int{0, 0}
+	return fileDescriptor_7f77550b87b707e4, []int{0, 0}
 }
 
 // Message describing spending limit types.
@@ -61,16 +66,17 @@ func (m *SpendingLimitTypeEnum) Reset()         { *m = SpendingLimitTypeEnum{} }
 func (m *SpendingLimitTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*SpendingLimitTypeEnum) ProtoMessage()    {}
 func (*SpendingLimitTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spending_limit_type_709c8d5d89f1cb00, []int{0}
+	return fileDescriptor_7f77550b87b707e4, []int{0}
 }
+
 func (m *SpendingLimitTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpendingLimitTypeEnum.Unmarshal(m, b)
 }
 func (m *SpendingLimitTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpendingLimitTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *SpendingLimitTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpendingLimitTypeEnum.Merge(dst, src)
+func (m *SpendingLimitTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpendingLimitTypeEnum.Merge(m, src)
 }
 func (m *SpendingLimitTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_SpendingLimitTypeEnum.Size(m)
@@ -82,15 +88,15 @@ func (m *SpendingLimitTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SpendingLimitTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SpendingLimitTypeEnum)(nil), "google.ads.googleads.v1.enums.SpendingLimitTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SpendingLimitTypeEnum_SpendingLimitType", SpendingLimitTypeEnum_SpendingLimitType_name, SpendingLimitTypeEnum_SpendingLimitType_value)
+	proto.RegisterType((*SpendingLimitTypeEnum)(nil), "google.ads.googleads.v1.enums.SpendingLimitTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/spending_limit_type.proto", fileDescriptor_spending_limit_type_709c8d5d89f1cb00)
+	proto.RegisterFile("google/ads/googleads/v1/enums/spending_limit_type.proto", fileDescriptor_7f77550b87b707e4)
 }
 
-var fileDescriptor_spending_limit_type_709c8d5d89f1cb00 = []byte{
+var fileDescriptor_7f77550b87b707e4 = []byte{
 	// 298 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcd, 0x4a, 0xc3, 0x30,
 	0x00, 0x76, 0x15, 0x54, 0x32, 0xc1, 0x59, 0xd0, 0x83, 0xb8, 0xc3, 0xf6, 0x00, 0x09, 0xc5, 0x83,
diff --git a/googleapis/ads/googleads/v1/enums/structured_snippet_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/structured_snippet_placeholder_field.pb.go
index a48212f636..5a2a7df307 100644
--- a/googleapis/ads/googleads/v1/enums/structured_snippet_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/structured_snippet_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/structured_snippet_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Structured Snippet placeholder fields.
 type StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField int32
@@ -45,6 +48,7 @@ var StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField_name
 	2: "HEADER",
 	3: "SNIPPETS",
 }
+
 var StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -55,8 +59,9 @@ var StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField_valu
 func (x StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField) String() string {
 	return proto.EnumName(StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField_name, int32(x))
 }
+
 func (StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_structured_snippet_placeholder_field_77587c1495c9f888, []int{0, 0}
+	return fileDescriptor_b931266ec688ae7c, []int{0, 0}
 }
 
 // Values for Structured Snippet placeholder fields.
@@ -70,16 +75,17 @@ func (m *StructuredSnippetPlaceholderFieldEnum) Reset()         { *m = Structure
 func (m *StructuredSnippetPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*StructuredSnippetPlaceholderFieldEnum) ProtoMessage()    {}
 func (*StructuredSnippetPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_structured_snippet_placeholder_field_77587c1495c9f888, []int{0}
+	return fileDescriptor_b931266ec688ae7c, []int{0}
 }
+
 func (m *StructuredSnippetPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredSnippetPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *StructuredSnippetPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredSnippetPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *StructuredSnippetPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredSnippetPlaceholderFieldEnum.Merge(dst, src)
+func (m *StructuredSnippetPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredSnippetPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *StructuredSnippetPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_StructuredSnippetPlaceholderFieldEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *StructuredSnippetPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_StructuredSnippetPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*StructuredSnippetPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.StructuredSnippetPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField", StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField_name, StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField_value)
+	proto.RegisterType((*StructuredSnippetPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.StructuredSnippetPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/structured_snippet_placeholder_field.proto", fileDescriptor_structured_snippet_placeholder_field_77587c1495c9f888)
+	proto.RegisterFile("google/ads/googleads/v1/enums/structured_snippet_placeholder_field.proto", fileDescriptor_b931266ec688ae7c)
 }
 
-var fileDescriptor_structured_snippet_placeholder_field_77587c1495c9f888 = []byte{
+var fileDescriptor_b931266ec688ae7c = []byte{
 	// 329 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x18, 0xfd, 0xb5, 0x83, 0xfd, 0x24, 0x13, 0x2c, 0xbd, 0x14, 0x77, 0xb1, 0x81, 0x5e, 0xa6, 0x14,
diff --git a/googleapis/ads/googleads/v1/enums/system_managed_entity_source.pb.go b/googleapis/ads/googleads/v1/enums/system_managed_entity_source.pb.go
index 761ec05011..8b7a9da4b0 100644
--- a/googleapis/ads/googleads/v1/enums/system_managed_entity_source.pb.go
+++ b/googleapis/ads/googleads/v1/enums/system_managed_entity_source.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/system_managed_entity_source.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum listing the possible system managed entity sources.
 type SystemManagedResourceSourceEnum_SystemManagedResourceSource int32
@@ -36,6 +39,7 @@ var SystemManagedResourceSourceEnum_SystemManagedResourceSource_name = map[int32
 	1: "UNKNOWN",
 	2: "AD_VARIATIONS",
 }
+
 var SystemManagedResourceSourceEnum_SystemManagedResourceSource_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"UNKNOWN":       1,
@@ -45,8 +49,9 @@ var SystemManagedResourceSourceEnum_SystemManagedResourceSource_value = map[stri
 func (x SystemManagedResourceSourceEnum_SystemManagedResourceSource) String() string {
 	return proto.EnumName(SystemManagedResourceSourceEnum_SystemManagedResourceSource_name, int32(x))
 }
+
 func (SystemManagedResourceSourceEnum_SystemManagedResourceSource) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_system_managed_entity_source_2cb6e967d17e4e0c, []int{0, 0}
+	return fileDescriptor_6714aea019e15287, []int{0, 0}
 }
 
 // Container for enum describing possible system managed entity sources.
@@ -60,16 +65,17 @@ func (m *SystemManagedResourceSourceEnum) Reset()         { *m = SystemManagedRe
 func (m *SystemManagedResourceSourceEnum) String() string { return proto.CompactTextString(m) }
 func (*SystemManagedResourceSourceEnum) ProtoMessage()    {}
 func (*SystemManagedResourceSourceEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_system_managed_entity_source_2cb6e967d17e4e0c, []int{0}
+	return fileDescriptor_6714aea019e15287, []int{0}
 }
+
 func (m *SystemManagedResourceSourceEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SystemManagedResourceSourceEnum.Unmarshal(m, b)
 }
 func (m *SystemManagedResourceSourceEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SystemManagedResourceSourceEnum.Marshal(b, m, deterministic)
 }
-func (dst *SystemManagedResourceSourceEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SystemManagedResourceSourceEnum.Merge(dst, src)
+func (m *SystemManagedResourceSourceEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemManagedResourceSourceEnum.Merge(m, src)
 }
 func (m *SystemManagedResourceSourceEnum) XXX_Size() int {
 	return xxx_messageInfo_SystemManagedResourceSourceEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *SystemManagedResourceSourceEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SystemManagedResourceSourceEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SystemManagedResourceSourceEnum)(nil), "google.ads.googleads.v1.enums.SystemManagedResourceSourceEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.SystemManagedResourceSourceEnum_SystemManagedResourceSource", SystemManagedResourceSourceEnum_SystemManagedResourceSource_name, SystemManagedResourceSourceEnum_SystemManagedResourceSource_value)
+	proto.RegisterType((*SystemManagedResourceSourceEnum)(nil), "google.ads.googleads.v1.enums.SystemManagedResourceSourceEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/system_managed_entity_source.proto", fileDescriptor_system_managed_entity_source_2cb6e967d17e4e0c)
+	proto.RegisterFile("google/ads/googleads/v1/enums/system_managed_entity_source.proto", fileDescriptor_6714aea019e15287)
 }
 
-var fileDescriptor_system_managed_entity_source_2cb6e967d17e4e0c = []byte{
+var fileDescriptor_6714aea019e15287 = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x4a, 0xf3, 0x30,
 	0x18, 0xfd, 0xd7, 0x1f, 0x14, 0x32, 0xc4, 0xd9, 0x4b, 0x75, 0xca, 0xf6, 0x00, 0x29, 0xc5, 0xbb,
diff --git a/googleapis/ads/googleads/v1/enums/target_cpa_opt_in_recommendation_goal.pb.go b/googleapis/ads/googleads/v1/enums/target_cpa_opt_in_recommendation_goal.pb.go
index a73a676d4e..7857f7fe0f 100644
--- a/googleapis/ads/googleads/v1/enums/target_cpa_opt_in_recommendation_goal.pb.go
+++ b/googleapis/ads/googleads/v1/enums/target_cpa_opt_in_recommendation_goal.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/target_cpa_opt_in_recommendation_goal.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Goal of TargetCpaOptIn recommendation.
 type TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal int32
@@ -46,6 +49,7 @@ var TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal_name =
 	4: "SAME_CPA",
 	5: "CLOSEST_CPA",
 }
+
 var TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal_value = map[string]int32{
 	"UNSPECIFIED":      0,
 	"UNKNOWN":          1,
@@ -58,8 +62,9 @@ var TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal_value
 func (x TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal) String() string {
 	return proto.EnumName(TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal_name, int32(x))
 }
+
 func (TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_cpa_opt_in_recommendation_goal_a5829dcc7eee49d4, []int{0, 0}
+	return fileDescriptor_0f2228689a4a5189, []int{0, 0}
 }
 
 // Container for enum describing goals for TargetCpaOptIn recommendation.
@@ -73,16 +78,17 @@ func (m *TargetCpaOptInRecommendationGoalEnum) Reset()         { *m = TargetCpaO
 func (m *TargetCpaOptInRecommendationGoalEnum) String() string { return proto.CompactTextString(m) }
 func (*TargetCpaOptInRecommendationGoalEnum) ProtoMessage()    {}
 func (*TargetCpaOptInRecommendationGoalEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_cpa_opt_in_recommendation_goal_a5829dcc7eee49d4, []int{0}
+	return fileDescriptor_0f2228689a4a5189, []int{0}
 }
+
 func (m *TargetCpaOptInRecommendationGoalEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetCpaOptInRecommendationGoalEnum.Unmarshal(m, b)
 }
 func (m *TargetCpaOptInRecommendationGoalEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetCpaOptInRecommendationGoalEnum.Marshal(b, m, deterministic)
 }
-func (dst *TargetCpaOptInRecommendationGoalEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetCpaOptInRecommendationGoalEnum.Merge(dst, src)
+func (m *TargetCpaOptInRecommendationGoalEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetCpaOptInRecommendationGoalEnum.Merge(m, src)
 }
 func (m *TargetCpaOptInRecommendationGoalEnum) XXX_Size() int {
 	return xxx_messageInfo_TargetCpaOptInRecommendationGoalEnum.Size(m)
@@ -94,15 +100,15 @@ func (m *TargetCpaOptInRecommendationGoalEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_TargetCpaOptInRecommendationGoalEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*TargetCpaOptInRecommendationGoalEnum)(nil), "google.ads.googleads.v1.enums.TargetCpaOptInRecommendationGoalEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal", TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal_name, TargetCpaOptInRecommendationGoalEnum_TargetCpaOptInRecommendationGoal_value)
+	proto.RegisterType((*TargetCpaOptInRecommendationGoalEnum)(nil), "google.ads.googleads.v1.enums.TargetCpaOptInRecommendationGoalEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/target_cpa_opt_in_recommendation_goal.proto", fileDescriptor_target_cpa_opt_in_recommendation_goal_a5829dcc7eee49d4)
+	proto.RegisterFile("google/ads/googleads/v1/enums/target_cpa_opt_in_recommendation_goal.proto", fileDescriptor_0f2228689a4a5189)
 }
 
-var fileDescriptor_target_cpa_opt_in_recommendation_goal_a5829dcc7eee49d4 = []byte{
+var fileDescriptor_0f2228689a4a5189 = []byte{
 	// 357 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xdd, 0x4a, 0xf3, 0x30,
 	0x18, 0xc7, 0xdf, 0x76, 0xef, 0x97, 0x99, 0x62, 0x29, 0x1e, 0x89, 0x03, 0x37, 0xf4, 0x34, 0xa5,
diff --git a/googleapis/ads/googleads/v1/enums/target_impression_share_location.pb.go b/googleapis/ads/googleads/v1/enums/target_impression_share_location.pb.go
index ee3abb5996..c0c6c2a17c 100644
--- a/googleapis/ads/googleads/v1/enums/target_impression_share_location.pb.go
+++ b/googleapis/ads/googleads/v1/enums/target_impression_share_location.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/target_impression_share_location.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible goals.
 type TargetImpressionShareLocationEnum_TargetImpressionShareLocation int32
@@ -42,6 +45,7 @@ var TargetImpressionShareLocationEnum_TargetImpressionShareLocation_name = map[i
 	3: "TOP_OF_PAGE",
 	4: "ABSOLUTE_TOP_OF_PAGE",
 }
+
 var TargetImpressionShareLocationEnum_TargetImpressionShareLocation_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -53,8 +57,9 @@ var TargetImpressionShareLocationEnum_TargetImpressionShareLocation_value = map[
 func (x TargetImpressionShareLocationEnum_TargetImpressionShareLocation) String() string {
 	return proto.EnumName(TargetImpressionShareLocationEnum_TargetImpressionShareLocation_name, int32(x))
 }
+
 func (TargetImpressionShareLocationEnum_TargetImpressionShareLocation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_impression_share_location_ed72bb7348c0a7f5, []int{0, 0}
+	return fileDescriptor_6c99805b4d0c8200, []int{0, 0}
 }
 
 // Container for enum describing where on the first search results page the
@@ -70,16 +75,17 @@ func (m *TargetImpressionShareLocationEnum) Reset()         { *m = TargetImpress
 func (m *TargetImpressionShareLocationEnum) String() string { return proto.CompactTextString(m) }
 func (*TargetImpressionShareLocationEnum) ProtoMessage()    {}
 func (*TargetImpressionShareLocationEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_impression_share_location_ed72bb7348c0a7f5, []int{0}
+	return fileDescriptor_6c99805b4d0c8200, []int{0}
 }
+
 func (m *TargetImpressionShareLocationEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetImpressionShareLocationEnum.Unmarshal(m, b)
 }
 func (m *TargetImpressionShareLocationEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetImpressionShareLocationEnum.Marshal(b, m, deterministic)
 }
-func (dst *TargetImpressionShareLocationEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetImpressionShareLocationEnum.Merge(dst, src)
+func (m *TargetImpressionShareLocationEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetImpressionShareLocationEnum.Merge(m, src)
 }
 func (m *TargetImpressionShareLocationEnum) XXX_Size() int {
 	return xxx_messageInfo_TargetImpressionShareLocationEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *TargetImpressionShareLocationEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_TargetImpressionShareLocationEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*TargetImpressionShareLocationEnum)(nil), "google.ads.googleads.v1.enums.TargetImpressionShareLocationEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.TargetImpressionShareLocationEnum_TargetImpressionShareLocation", TargetImpressionShareLocationEnum_TargetImpressionShareLocation_name, TargetImpressionShareLocationEnum_TargetImpressionShareLocation_value)
+	proto.RegisterType((*TargetImpressionShareLocationEnum)(nil), "google.ads.googleads.v1.enums.TargetImpressionShareLocationEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/target_impression_share_location.proto", fileDescriptor_target_impression_share_location_ed72bb7348c0a7f5)
+	proto.RegisterFile("google/ads/googleads/v1/enums/target_impression_share_location.proto", fileDescriptor_6c99805b4d0c8200)
 }
 
-var fileDescriptor_target_impression_share_location_ed72bb7348c0a7f5 = []byte{
+var fileDescriptor_6c99805b4d0c8200 = []byte{
 	// 343 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xbd, 0x6a, 0xeb, 0x30,
 	0x18, 0xbd, 0x76, 0x2e, 0xf7, 0x82, 0x32, 0xd4, 0x98, 0x0c, 0xa5, 0x34, 0x43, 0xf2, 0x00, 0x32,
diff --git a/googleapis/ads/googleads/v1/enums/targeting_dimension.pb.go b/googleapis/ads/googleads/v1/enums/targeting_dimension.pb.go
index 389862c8fd..3eb81f9988 100644
--- a/googleapis/ads/googleads/v1/enums/targeting_dimension.pb.go
+++ b/googleapis/ads/googleads/v1/enums/targeting_dimension.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/targeting_dimension.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible targeting dimensions.
 type TargetingDimensionEnum_TargetingDimension int32
@@ -63,6 +66,7 @@ var TargetingDimensionEnum_TargetingDimension_name = map[int32]string{
 	8: "PARENTAL_STATUS",
 	9: "INCOME_RANGE",
 }
+
 var TargetingDimensionEnum_TargetingDimension_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -79,8 +83,9 @@ var TargetingDimensionEnum_TargetingDimension_value = map[string]int32{
 func (x TargetingDimensionEnum_TargetingDimension) String() string {
 	return proto.EnumName(TargetingDimensionEnum_TargetingDimension_name, int32(x))
 }
+
 func (TargetingDimensionEnum_TargetingDimension) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_targeting_dimension_0a228f606eaa5934, []int{0, 0}
+	return fileDescriptor_7532960c6a9b7e8f, []int{0, 0}
 }
 
 // The dimensions that can be targeted.
@@ -94,16 +99,17 @@ func (m *TargetingDimensionEnum) Reset()         { *m = TargetingDimensionEnum{}
 func (m *TargetingDimensionEnum) String() string { return proto.CompactTextString(m) }
 func (*TargetingDimensionEnum) ProtoMessage()    {}
 func (*TargetingDimensionEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_targeting_dimension_0a228f606eaa5934, []int{0}
+	return fileDescriptor_7532960c6a9b7e8f, []int{0}
 }
+
 func (m *TargetingDimensionEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetingDimensionEnum.Unmarshal(m, b)
 }
 func (m *TargetingDimensionEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetingDimensionEnum.Marshal(b, m, deterministic)
 }
-func (dst *TargetingDimensionEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetingDimensionEnum.Merge(dst, src)
+func (m *TargetingDimensionEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetingDimensionEnum.Merge(m, src)
 }
 func (m *TargetingDimensionEnum) XXX_Size() int {
 	return xxx_messageInfo_TargetingDimensionEnum.Size(m)
@@ -115,15 +121,15 @@ func (m *TargetingDimensionEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_TargetingDimensionEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*TargetingDimensionEnum)(nil), "google.ads.googleads.v1.enums.TargetingDimensionEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.TargetingDimensionEnum_TargetingDimension", TargetingDimensionEnum_TargetingDimension_name, TargetingDimensionEnum_TargetingDimension_value)
+	proto.RegisterType((*TargetingDimensionEnum)(nil), "google.ads.googleads.v1.enums.TargetingDimensionEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/targeting_dimension.proto", fileDescriptor_targeting_dimension_0a228f606eaa5934)
+	proto.RegisterFile("google/ads/googleads/v1/enums/targeting_dimension.proto", fileDescriptor_7532960c6a9b7e8f)
 }
 
-var fileDescriptor_targeting_dimension_0a228f606eaa5934 = []byte{
+var fileDescriptor_7532960c6a9b7e8f = []byte{
 	// 378 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xdf, 0xaa, 0xd3, 0x30,
 	0x1c, 0xb6, 0x3d, 0x9e, 0x9d, 0xb3, 0x6c, 0xb2, 0x10, 0x41, 0x41, 0xdc, 0xc5, 0xf6, 0x00, 0x29,
diff --git a/googleapis/ads/googleads/v1/enums/time_type.pb.go b/googleapis/ads/googleads/v1/enums/time_type.pb.go
index 66adaabbec..601451da61 100644
--- a/googleapis/ads/googleads/v1/enums/time_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/time_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/time_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible time types used by certain resources as an alternative to
 // absolute timestamps.
@@ -40,6 +43,7 @@ var TimeTypeEnum_TimeType_name = map[int32]string{
 	2: "NOW",
 	3: "FOREVER",
 }
+
 var TimeTypeEnum_TimeType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -50,8 +54,9 @@ var TimeTypeEnum_TimeType_value = map[string]int32{
 func (x TimeTypeEnum_TimeType) String() string {
 	return proto.EnumName(TimeTypeEnum_TimeType_name, int32(x))
 }
+
 func (TimeTypeEnum_TimeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_time_type_cab7bcba6ce59172, []int{0, 0}
+	return fileDescriptor_60b4ddac3c85d154, []int{0, 0}
 }
 
 // Message describing time types.
@@ -65,16 +70,17 @@ func (m *TimeTypeEnum) Reset()         { *m = TimeTypeEnum{} }
 func (m *TimeTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*TimeTypeEnum) ProtoMessage()    {}
 func (*TimeTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_time_type_cab7bcba6ce59172, []int{0}
+	return fileDescriptor_60b4ddac3c85d154, []int{0}
 }
+
 func (m *TimeTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeTypeEnum.Unmarshal(m, b)
 }
 func (m *TimeTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *TimeTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeTypeEnum.Merge(dst, src)
+func (m *TimeTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeTypeEnum.Merge(m, src)
 }
 func (m *TimeTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_TimeTypeEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *TimeTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_TimeTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*TimeTypeEnum)(nil), "google.ads.googleads.v1.enums.TimeTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.TimeTypeEnum_TimeType", TimeTypeEnum_TimeType_name, TimeTypeEnum_TimeType_value)
+	proto.RegisterType((*TimeTypeEnum)(nil), "google.ads.googleads.v1.enums.TimeTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/time_type.proto", fileDescriptor_time_type_cab7bcba6ce59172)
+	proto.RegisterFile("google/ads/googleads/v1/enums/time_type.proto", fileDescriptor_60b4ddac3c85d154)
 }
 
-var fileDescriptor_time_type_cab7bcba6ce59172 = []byte{
+var fileDescriptor_60b4ddac3c85d154 = []byte{
 	// 294 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x18, 0xc7, 0x6d, 0x0b, 0x4e, 0x32, 0xc5, 0xd2, 0xa3, 0xb8, 0xc3, 0x76, 0x37, 0xa1, 0x78, 0x8b,
diff --git a/googleapis/ads/googleads/v1/enums/tracking_code_page_format.pb.go b/googleapis/ads/googleads/v1/enums/tracking_code_page_format.pb.go
index 06c7a5ddf8..42c5bc2ebb 100644
--- a/googleapis/ads/googleads/v1/enums/tracking_code_page_format.pb.go
+++ b/googleapis/ads/googleads/v1/enums/tracking_code_page_format.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/tracking_code_page_format.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The format of the web page where the tracking tag and snippet will be
 // installed.
@@ -40,6 +43,7 @@ var TrackingCodePageFormatEnum_TrackingCodePageFormat_name = map[int32]string{
 	2: "HTML",
 	3: "AMP",
 }
+
 var TrackingCodePageFormatEnum_TrackingCodePageFormat_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -50,8 +54,9 @@ var TrackingCodePageFormatEnum_TrackingCodePageFormat_value = map[string]int32{
 func (x TrackingCodePageFormatEnum_TrackingCodePageFormat) String() string {
 	return proto.EnumName(TrackingCodePageFormatEnum_TrackingCodePageFormat_name, int32(x))
 }
+
 func (TrackingCodePageFormatEnum_TrackingCodePageFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_tracking_code_page_format_109230f9eb069caa, []int{0, 0}
+	return fileDescriptor_bb83a2db93e5f178, []int{0, 0}
 }
 
 // Container for enum describing the format of the web page where the tracking
@@ -66,16 +71,17 @@ func (m *TrackingCodePageFormatEnum) Reset()         { *m = TrackingCodePageForm
 func (m *TrackingCodePageFormatEnum) String() string { return proto.CompactTextString(m) }
 func (*TrackingCodePageFormatEnum) ProtoMessage()    {}
 func (*TrackingCodePageFormatEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tracking_code_page_format_109230f9eb069caa, []int{0}
+	return fileDescriptor_bb83a2db93e5f178, []int{0}
 }
+
 func (m *TrackingCodePageFormatEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrackingCodePageFormatEnum.Unmarshal(m, b)
 }
 func (m *TrackingCodePageFormatEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrackingCodePageFormatEnum.Marshal(b, m, deterministic)
 }
-func (dst *TrackingCodePageFormatEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrackingCodePageFormatEnum.Merge(dst, src)
+func (m *TrackingCodePageFormatEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrackingCodePageFormatEnum.Merge(m, src)
 }
 func (m *TrackingCodePageFormatEnum) XXX_Size() int {
 	return xxx_messageInfo_TrackingCodePageFormatEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *TrackingCodePageFormatEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_TrackingCodePageFormatEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*TrackingCodePageFormatEnum)(nil), "google.ads.googleads.v1.enums.TrackingCodePageFormatEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.TrackingCodePageFormatEnum_TrackingCodePageFormat", TrackingCodePageFormatEnum_TrackingCodePageFormat_name, TrackingCodePageFormatEnum_TrackingCodePageFormat_value)
+	proto.RegisterType((*TrackingCodePageFormatEnum)(nil), "google.ads.googleads.v1.enums.TrackingCodePageFormatEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/tracking_code_page_format.proto", fileDescriptor_tracking_code_page_format_109230f9eb069caa)
+	proto.RegisterFile("google/ads/googleads/v1/enums/tracking_code_page_format.proto", fileDescriptor_bb83a2db93e5f178)
 }
 
-var fileDescriptor_tracking_code_page_format_109230f9eb069caa = []byte{
+var fileDescriptor_bb83a2db93e5f178 = []byte{
 	// 312 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4e, 0xc2, 0x30,
 	0x18, 0xc7, 0x65, 0x18, 0x31, 0xe5, 0xe0, 0xb2, 0x83, 0x07, 0x94, 0x03, 0x3c, 0x40, 0x9b, 0xc5,
diff --git a/googleapis/ads/googleads/v1/enums/tracking_code_type.pb.go b/googleapis/ads/googleads/v1/enums/tracking_code_type.pb.go
index bb24dd0c27..63a0df6480 100644
--- a/googleapis/ads/googleads/v1/enums/tracking_code_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/tracking_code_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/tracking_code_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of the generated tag snippets for tracking conversions.
 type TrackingCodeTypeEnum_TrackingCodeType int32
@@ -45,6 +48,7 @@ var TrackingCodeTypeEnum_TrackingCodeType_name = map[int32]string{
 	3: "WEBPAGE_ONCLICK",
 	4: "CLICK_TO_CALL",
 }
+
 var TrackingCodeTypeEnum_TrackingCodeType_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -56,8 +60,9 @@ var TrackingCodeTypeEnum_TrackingCodeType_value = map[string]int32{
 func (x TrackingCodeTypeEnum_TrackingCodeType) String() string {
 	return proto.EnumName(TrackingCodeTypeEnum_TrackingCodeType_name, int32(x))
 }
+
 func (TrackingCodeTypeEnum_TrackingCodeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_tracking_code_type_1a45135fd39e29d4, []int{0, 0}
+	return fileDescriptor_3fe4bb6a9d0a0750, []int{0, 0}
 }
 
 // Container for enum describing the type of the generated tag snippets for
@@ -72,16 +77,17 @@ func (m *TrackingCodeTypeEnum) Reset()         { *m = TrackingCodeTypeEnum{} }
 func (m *TrackingCodeTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*TrackingCodeTypeEnum) ProtoMessage()    {}
 func (*TrackingCodeTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tracking_code_type_1a45135fd39e29d4, []int{0}
+	return fileDescriptor_3fe4bb6a9d0a0750, []int{0}
 }
+
 func (m *TrackingCodeTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrackingCodeTypeEnum.Unmarshal(m, b)
 }
 func (m *TrackingCodeTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrackingCodeTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *TrackingCodeTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrackingCodeTypeEnum.Merge(dst, src)
+func (m *TrackingCodeTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrackingCodeTypeEnum.Merge(m, src)
 }
 func (m *TrackingCodeTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_TrackingCodeTypeEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *TrackingCodeTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_TrackingCodeTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*TrackingCodeTypeEnum)(nil), "google.ads.googleads.v1.enums.TrackingCodeTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.TrackingCodeTypeEnum_TrackingCodeType", TrackingCodeTypeEnum_TrackingCodeType_name, TrackingCodeTypeEnum_TrackingCodeType_value)
+	proto.RegisterType((*TrackingCodeTypeEnum)(nil), "google.ads.googleads.v1.enums.TrackingCodeTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/tracking_code_type.proto", fileDescriptor_tracking_code_type_1a45135fd39e29d4)
+	proto.RegisterFile("google/ads/googleads/v1/enums/tracking_code_type.proto", fileDescriptor_3fe4bb6a9d0a0750)
 }
 
-var fileDescriptor_tracking_code_type_1a45135fd39e29d4 = []byte{
+var fileDescriptor_3fe4bb6a9d0a0750 = []byte{
 	// 327 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdf, 0x4a, 0xfb, 0x30,
 	0x18, 0xfd, 0xad, 0xfb, 0xa1, 0x90, 0x21, 0xab, 0x55, 0x6f, 0xc4, 0x5d, 0x6c, 0x0f, 0x90, 0x50,
diff --git a/googleapis/ads/googleads/v1/enums/travel_placeholder_field.pb.go b/googleapis/ads/googleads/v1/enums/travel_placeholder_field.pb.go
index 7a587fb726..68e0c1f3ee 100644
--- a/googleapis/ads/googleads/v1/enums/travel_placeholder_field.pb.go
+++ b/googleapis/ads/googleads/v1/enums/travel_placeholder_field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/travel_placeholder_field.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Travel placeholder fields.
 type TravelPlaceholderFieldEnum_TravelPlaceholderField int32
@@ -115,6 +118,7 @@ var TravelPlaceholderFieldEnum_TravelPlaceholderField_name = map[int32]string{
 	20: "IOS_APP_LINK",
 	21: "IOS_APP_STORE_ID",
 }
+
 var TravelPlaceholderFieldEnum_TravelPlaceholderField_value = map[string]int32{
 	"UNSPECIFIED":             0,
 	"UNKNOWN":                 1,
@@ -143,8 +147,9 @@ var TravelPlaceholderFieldEnum_TravelPlaceholderField_value = map[string]int32{
 func (x TravelPlaceholderFieldEnum_TravelPlaceholderField) String() string {
 	return proto.EnumName(TravelPlaceholderFieldEnum_TravelPlaceholderField_name, int32(x))
 }
+
 func (TravelPlaceholderFieldEnum_TravelPlaceholderField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_travel_placeholder_field_c5fb0d1e99f0b387, []int{0, 0}
+	return fileDescriptor_ca7a3e1388fd357c, []int{0, 0}
 }
 
 // Values for Travel placeholder fields.
@@ -160,16 +165,17 @@ func (m *TravelPlaceholderFieldEnum) Reset()         { *m = TravelPlaceholderFie
 func (m *TravelPlaceholderFieldEnum) String() string { return proto.CompactTextString(m) }
 func (*TravelPlaceholderFieldEnum) ProtoMessage()    {}
 func (*TravelPlaceholderFieldEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_travel_placeholder_field_c5fb0d1e99f0b387, []int{0}
+	return fileDescriptor_ca7a3e1388fd357c, []int{0}
 }
+
 func (m *TravelPlaceholderFieldEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TravelPlaceholderFieldEnum.Unmarshal(m, b)
 }
 func (m *TravelPlaceholderFieldEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TravelPlaceholderFieldEnum.Marshal(b, m, deterministic)
 }
-func (dst *TravelPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TravelPlaceholderFieldEnum.Merge(dst, src)
+func (m *TravelPlaceholderFieldEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TravelPlaceholderFieldEnum.Merge(m, src)
 }
 func (m *TravelPlaceholderFieldEnum) XXX_Size() int {
 	return xxx_messageInfo_TravelPlaceholderFieldEnum.Size(m)
@@ -181,15 +187,15 @@ func (m *TravelPlaceholderFieldEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_TravelPlaceholderFieldEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*TravelPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.TravelPlaceholderFieldEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.TravelPlaceholderFieldEnum_TravelPlaceholderField", TravelPlaceholderFieldEnum_TravelPlaceholderField_name, TravelPlaceholderFieldEnum_TravelPlaceholderField_value)
+	proto.RegisterType((*TravelPlaceholderFieldEnum)(nil), "google.ads.googleads.v1.enums.TravelPlaceholderFieldEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/travel_placeholder_field.proto", fileDescriptor_travel_placeholder_field_c5fb0d1e99f0b387)
+	proto.RegisterFile("google/ads/googleads/v1/enums/travel_placeholder_field.proto", fileDescriptor_ca7a3e1388fd357c)
 }
 
-var fileDescriptor_travel_placeholder_field_c5fb0d1e99f0b387 = []byte{
+var fileDescriptor_ca7a3e1388fd357c = []byte{
 	// 524 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0x66, 0x2d, 0xfb, 0x73, 0xbb, 0xd6, 0x73, 0x3b, 0x86, 0x36, 0x76, 0xb1, 0x3d, 0x40, 0xa2,
diff --git a/googleapis/ads/googleads/v1/enums/user_interest_taxonomy_type.pb.go b/googleapis/ads/googleads/v1/enums/user_interest_taxonomy_type.pb.go
index a1dc7f03d2..741f37a9e9 100644
--- a/googleapis/ads/googleads/v1/enums/user_interest_taxonomy_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_interest_taxonomy_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_interest_taxonomy_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing the possible UserInterestTaxonomyTypes.
 type UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType int32
@@ -48,6 +51,7 @@ var UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType_name = map[int32]strin
 	5: "VERTICAL_GEO",
 	6: "NEW_SMART_PHONE_USER",
 }
+
 var UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType_value = map[string]int32{
 	"UNSPECIFIED":             0,
 	"UNKNOWN":                 1,
@@ -61,8 +65,9 @@ var UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType_value = map[string]int
 func (x UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType) String() string {
 	return proto.EnumName(UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType_name, int32(x))
 }
+
 func (UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_interest_taxonomy_type_2ebc60b51ce4cdbd, []int{0, 0}
+	return fileDescriptor_bb8bc4f7b2be793c, []int{0, 0}
 }
 
 // Message describing a UserInterestTaxonomyType.
@@ -76,16 +81,17 @@ func (m *UserInterestTaxonomyTypeEnum) Reset()         { *m = UserInterestTaxono
 func (m *UserInterestTaxonomyTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*UserInterestTaxonomyTypeEnum) ProtoMessage()    {}
 func (*UserInterestTaxonomyTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_interest_taxonomy_type_2ebc60b51ce4cdbd, []int{0}
+	return fileDescriptor_bb8bc4f7b2be793c, []int{0}
 }
+
 func (m *UserInterestTaxonomyTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserInterestTaxonomyTypeEnum.Unmarshal(m, b)
 }
 func (m *UserInterestTaxonomyTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserInterestTaxonomyTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserInterestTaxonomyTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserInterestTaxonomyTypeEnum.Merge(dst, src)
+func (m *UserInterestTaxonomyTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserInterestTaxonomyTypeEnum.Merge(m, src)
 }
 func (m *UserInterestTaxonomyTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_UserInterestTaxonomyTypeEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *UserInterestTaxonomyTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserInterestTaxonomyTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserInterestTaxonomyTypeEnum)(nil), "google.ads.googleads.v1.enums.UserInterestTaxonomyTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType", UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType_name, UserInterestTaxonomyTypeEnum_UserInterestTaxonomyType_value)
+	proto.RegisterType((*UserInterestTaxonomyTypeEnum)(nil), "google.ads.googleads.v1.enums.UserInterestTaxonomyTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_interest_taxonomy_type.proto", fileDescriptor_user_interest_taxonomy_type_2ebc60b51ce4cdbd)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_interest_taxonomy_type.proto", fileDescriptor_bb8bc4f7b2be793c)
 }
 
-var fileDescriptor_user_interest_taxonomy_type_2ebc60b51ce4cdbd = []byte{
+var fileDescriptor_bb8bc4f7b2be793c = []byte{
 	// 387 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xcf, 0x8a, 0xd4, 0x30,
 	0x1c, 0xb6, 0xb3, 0xba, 0x6a, 0x76, 0xc5, 0x12, 0x04, 0x17, 0xdd, 0x39, 0xec, 0x3e, 0x40, 0x4a,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_access_status.pb.go b/googleapis/ads/googleads/v1/enums/user_list_access_status.pb.go
index ac9054a4a2..e0633c5c10 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_access_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_access_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_access_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing possible user list access statuses.
 type UserListAccessStatusEnum_UserListAccessStatus int32
@@ -39,6 +42,7 @@ var UserListAccessStatusEnum_UserListAccessStatus_name = map[int32]string{
 	2: "ENABLED",
 	3: "DISABLED",
 }
+
 var UserListAccessStatusEnum_UserListAccessStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var UserListAccessStatusEnum_UserListAccessStatus_value = map[string]int32{
 func (x UserListAccessStatusEnum_UserListAccessStatus) String() string {
 	return proto.EnumName(UserListAccessStatusEnum_UserListAccessStatus_name, int32(x))
 }
+
 func (UserListAccessStatusEnum_UserListAccessStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_access_status_351bc453276f30da, []int{0, 0}
+	return fileDescriptor_4bc74499510e4946, []int{0, 0}
 }
 
 // Indicates if this client still has access to the list.
@@ -64,16 +69,17 @@ func (m *UserListAccessStatusEnum) Reset()         { *m = UserListAccessStatusEn
 func (m *UserListAccessStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListAccessStatusEnum) ProtoMessage()    {}
 func (*UserListAccessStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_access_status_351bc453276f30da, []int{0}
+	return fileDescriptor_4bc74499510e4946, []int{0}
 }
+
 func (m *UserListAccessStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListAccessStatusEnum.Unmarshal(m, b)
 }
 func (m *UserListAccessStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListAccessStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListAccessStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListAccessStatusEnum.Merge(dst, src)
+func (m *UserListAccessStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListAccessStatusEnum.Merge(m, src)
 }
 func (m *UserListAccessStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListAccessStatusEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *UserListAccessStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListAccessStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListAccessStatusEnum)(nil), "google.ads.googleads.v1.enums.UserListAccessStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListAccessStatusEnum_UserListAccessStatus", UserListAccessStatusEnum_UserListAccessStatus_name, UserListAccessStatusEnum_UserListAccessStatus_value)
+	proto.RegisterType((*UserListAccessStatusEnum)(nil), "google.ads.googleads.v1.enums.UserListAccessStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_access_status.proto", fileDescriptor_user_list_access_status_351bc453276f30da)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_access_status.proto", fileDescriptor_4bc74499510e4946)
 }
 
-var fileDescriptor_user_list_access_status_351bc453276f30da = []byte{
+var fileDescriptor_4bc74499510e4946 = []byte{
 	// 311 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x6a, 0xeb, 0x30,
 	0x10, 0xfd, 0x71, 0xe0, 0xb7, 0x28, 0x85, 0x06, 0xd3, 0x45, 0x5b, 0x9a, 0x45, 0x72, 0x00, 0x09,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_closing_reason.pb.go b/googleapis/ads/googleads/v1/enums/user_list_closing_reason.pb.go
index f6d7afd951..dfc82b4ec2 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_closing_reason.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_closing_reason.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_closing_reason.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list closing reasons.
 type UserListClosingReasonEnum_UserListClosingReason int32
@@ -36,6 +39,7 @@ var UserListClosingReasonEnum_UserListClosingReason_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "UNUSED",
 }
+
 var UserListClosingReasonEnum_UserListClosingReason_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var UserListClosingReasonEnum_UserListClosingReason_value = map[string]int32{
 func (x UserListClosingReasonEnum_UserListClosingReason) String() string {
 	return proto.EnumName(UserListClosingReasonEnum_UserListClosingReason_name, int32(x))
 }
+
 func (UserListClosingReasonEnum_UserListClosingReason) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_closing_reason_b58c1e2643567ca7, []int{0, 0}
+	return fileDescriptor_9586aee4ba6d2ca2, []int{0, 0}
 }
 
 // Indicates the reason why the userlist was closed.
@@ -61,16 +66,17 @@ func (m *UserListClosingReasonEnum) Reset()         { *m = UserListClosingReason
 func (m *UserListClosingReasonEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListClosingReasonEnum) ProtoMessage()    {}
 func (*UserListClosingReasonEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_closing_reason_b58c1e2643567ca7, []int{0}
+	return fileDescriptor_9586aee4ba6d2ca2, []int{0}
 }
+
 func (m *UserListClosingReasonEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListClosingReasonEnum.Unmarshal(m, b)
 }
 func (m *UserListClosingReasonEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListClosingReasonEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListClosingReasonEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListClosingReasonEnum.Merge(dst, src)
+func (m *UserListClosingReasonEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListClosingReasonEnum.Merge(m, src)
 }
 func (m *UserListClosingReasonEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListClosingReasonEnum.Size(m)
@@ -82,15 +88,15 @@ func (m *UserListClosingReasonEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListClosingReasonEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListClosingReasonEnum)(nil), "google.ads.googleads.v1.enums.UserListClosingReasonEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListClosingReasonEnum_UserListClosingReason", UserListClosingReasonEnum_UserListClosingReason_name, UserListClosingReasonEnum_UserListClosingReason_value)
+	proto.RegisterType((*UserListClosingReasonEnum)(nil), "google.ads.googleads.v1.enums.UserListClosingReasonEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_closing_reason.proto", fileDescriptor_user_list_closing_reason_b58c1e2643567ca7)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_closing_reason.proto", fileDescriptor_9586aee4ba6d2ca2)
 }
 
-var fileDescriptor_user_list_closing_reason_b58c1e2643567ca7 = []byte{
+var fileDescriptor_9586aee4ba6d2ca2 = []byte{
 	// 302 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x5d, 0x85, 0x09, 0xd9, 0xc1, 0x51, 0xf0, 0xe0, 0x70, 0x87, 0xed, 0x01, 0x12, 0x8a,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_combined_rule_operator.pb.go b/googleapis/ads/googleads/v1/enums/user_list_combined_rule_operator.pb.go
index c0821c8f65..ed51b4850a 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_combined_rule_operator.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_combined_rule_operator.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_combined_rule_operator.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list combined rule operators.
 type UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator int32
@@ -39,6 +42,7 @@ var UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator_name = map[int
 	2: "AND",
 	3: "AND_NOT",
 }
+
 var UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator_value = map[st
 func (x UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator) String() string {
 	return proto.EnumName(UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator_name, int32(x))
 }
+
 func (UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_combined_rule_operator_4ebfc904d7db5e97, []int{0, 0}
+	return fileDescriptor_c43031e2c954a0ca, []int{0, 0}
 }
 
 // Logical operator connecting two rules.
@@ -64,16 +69,17 @@ func (m *UserListCombinedRuleOperatorEnum) Reset()         { *m = UserListCombin
 func (m *UserListCombinedRuleOperatorEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListCombinedRuleOperatorEnum) ProtoMessage()    {}
 func (*UserListCombinedRuleOperatorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_combined_rule_operator_4ebfc904d7db5e97, []int{0}
+	return fileDescriptor_c43031e2c954a0ca, []int{0}
 }
+
 func (m *UserListCombinedRuleOperatorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListCombinedRuleOperatorEnum.Unmarshal(m, b)
 }
 func (m *UserListCombinedRuleOperatorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListCombinedRuleOperatorEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListCombinedRuleOperatorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListCombinedRuleOperatorEnum.Merge(dst, src)
+func (m *UserListCombinedRuleOperatorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListCombinedRuleOperatorEnum.Merge(m, src)
 }
 func (m *UserListCombinedRuleOperatorEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListCombinedRuleOperatorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *UserListCombinedRuleOperatorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListCombinedRuleOperatorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListCombinedRuleOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListCombinedRuleOperatorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator", UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator_name, UserListCombinedRuleOperatorEnum_UserListCombinedRuleOperator_value)
+	proto.RegisterType((*UserListCombinedRuleOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListCombinedRuleOperatorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_combined_rule_operator.proto", fileDescriptor_user_list_combined_rule_operator_4ebfc904d7db5e97)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_combined_rule_operator.proto", fileDescriptor_c43031e2c954a0ca)
 }
 
-var fileDescriptor_user_list_combined_rule_operator_4ebfc904d7db5e97 = []byte{
+var fileDescriptor_c43031e2c954a0ca = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xc1, 0x6a, 0xea, 0x40,
 	0x14, 0x7d, 0x46, 0x78, 0xc2, 0xb8, 0x68, 0xc8, 0xb2, 0x28, 0x54, 0x3f, 0x60, 0x42, 0xe8, 0x6e,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_crm_data_source_type.pb.go b/googleapis/ads/googleads/v1/enums/user_list_crm_data_source_type.pb.go
index 440818090a..915de2746f 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_crm_data_source_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_crm_data_source_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_crm_data_source_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list crm data source type.
 type UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType int32
@@ -42,6 +45,7 @@ var UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType_name = map[int32]str
 	3: "THIRD_PARTY_CREDIT_BUREAU",
 	4: "THIRD_PARTY_VOTER_FILE",
 }
+
 var UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType_value = map[string]int32{
 	"UNSPECIFIED":               0,
 	"UNKNOWN":                   1,
@@ -53,8 +57,9 @@ var UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType_value = map[string]i
 func (x UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType) String() string {
 	return proto.EnumName(UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType_name, int32(x))
 }
+
 func (UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_crm_data_source_type_b5173b7d81e81cef, []int{0, 0}
+	return fileDescriptor_1035a1797a7c624d, []int{0, 0}
 }
 
 // Indicates source of Crm upload data.
@@ -68,16 +73,17 @@ func (m *UserListCrmDataSourceTypeEnum) Reset()         { *m = UserListCrmDataSo
 func (m *UserListCrmDataSourceTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListCrmDataSourceTypeEnum) ProtoMessage()    {}
 func (*UserListCrmDataSourceTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_crm_data_source_type_b5173b7d81e81cef, []int{0}
+	return fileDescriptor_1035a1797a7c624d, []int{0}
 }
+
 func (m *UserListCrmDataSourceTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListCrmDataSourceTypeEnum.Unmarshal(m, b)
 }
 func (m *UserListCrmDataSourceTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListCrmDataSourceTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListCrmDataSourceTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListCrmDataSourceTypeEnum.Merge(dst, src)
+func (m *UserListCrmDataSourceTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListCrmDataSourceTypeEnum.Merge(m, src)
 }
 func (m *UserListCrmDataSourceTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListCrmDataSourceTypeEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *UserListCrmDataSourceTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListCrmDataSourceTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListCrmDataSourceTypeEnum)(nil), "google.ads.googleads.v1.enums.UserListCrmDataSourceTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType", UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType_name, UserListCrmDataSourceTypeEnum_UserListCrmDataSourceType_value)
+	proto.RegisterType((*UserListCrmDataSourceTypeEnum)(nil), "google.ads.googleads.v1.enums.UserListCrmDataSourceTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_crm_data_source_type.proto", fileDescriptor_user_list_crm_data_source_type_b5173b7d81e81cef)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_crm_data_source_type.proto", fileDescriptor_1035a1797a7c624d)
 }
 
-var fileDescriptor_user_list_crm_data_source_type_b5173b7d81e81cef = []byte{
+var fileDescriptor_1035a1797a7c624d = []byte{
 	// 362 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0x6a, 0xab, 0x40,
 	0x14, 0x7d, 0x9a, 0x47, 0x0b, 0x93, 0x45, 0xc5, 0x45, 0x21, 0xa1, 0x16, 0x92, 0x0f, 0x18, 0x91,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_date_rule_item_operator.pb.go b/googleapis/ads/googleads/v1/enums/user_list_date_rule_item_operator.pb.go
index 8e36b2bbaa..575e72088b 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_date_rule_item_operator.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_date_rule_item_operator.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_date_rule_item_operator.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list date rule item operators.
 type UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator int32
@@ -45,6 +48,7 @@ var UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator_name = map[int
 	4: "BEFORE",
 	5: "AFTER",
 }
+
 var UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -57,8 +61,9 @@ var UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator_value = map[st
 func (x UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator) String() string {
 	return proto.EnumName(UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator_name, int32(x))
 }
+
 func (UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_date_rule_item_operator_c55e0b52762bba4b, []int{0, 0}
+	return fileDescriptor_03e6c9c04adcfde7, []int{0, 0}
 }
 
 // Supported rule operator for date type.
@@ -72,16 +77,17 @@ func (m *UserListDateRuleItemOperatorEnum) Reset()         { *m = UserListDateRu
 func (m *UserListDateRuleItemOperatorEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListDateRuleItemOperatorEnum) ProtoMessage()    {}
 func (*UserListDateRuleItemOperatorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_date_rule_item_operator_c55e0b52762bba4b, []int{0}
+	return fileDescriptor_03e6c9c04adcfde7, []int{0}
 }
+
 func (m *UserListDateRuleItemOperatorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListDateRuleItemOperatorEnum.Unmarshal(m, b)
 }
 func (m *UserListDateRuleItemOperatorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListDateRuleItemOperatorEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListDateRuleItemOperatorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListDateRuleItemOperatorEnum.Merge(dst, src)
+func (m *UserListDateRuleItemOperatorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListDateRuleItemOperatorEnum.Merge(m, src)
 }
 func (m *UserListDateRuleItemOperatorEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListDateRuleItemOperatorEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *UserListDateRuleItemOperatorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListDateRuleItemOperatorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListDateRuleItemOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListDateRuleItemOperatorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator", UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator_name, UserListDateRuleItemOperatorEnum_UserListDateRuleItemOperator_value)
+	proto.RegisterType((*UserListDateRuleItemOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListDateRuleItemOperatorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_date_rule_item_operator.proto", fileDescriptor_user_list_date_rule_item_operator_c55e0b52762bba4b)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_date_rule_item_operator.proto", fileDescriptor_03e6c9c04adcfde7)
 }
 
-var fileDescriptor_user_list_date_rule_item_operator_c55e0b52762bba4b = []byte{
+var fileDescriptor_03e6c9c04adcfde7 = []byte{
 	// 346 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x41, 0x6a, 0xeb, 0x30,
 	0x14, 0xfc, 0x76, 0x7e, 0x52, 0xaa, 0x40, 0x6b, 0xbc, 0x2c, 0x09, 0x34, 0x39, 0x80, 0x8c, 0xe9,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_logical_rule_operator.pb.go b/googleapis/ads/googleads/v1/enums/user_list_logical_rule_operator.pb.go
index 5e91c3d58f..01c7d52627 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_logical_rule_operator.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_logical_rule_operator.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_logical_rule_operator.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list logical rule operators.
 type UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator int32
@@ -42,6 +45,7 @@ var UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator_name = map[int32
 	3: "ANY",
 	4: "NONE",
 }
+
 var UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator_value = map[stri
 func (x UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator) String() string {
 	return proto.EnumName(UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator_name, int32(x))
 }
+
 func (UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_logical_rule_operator_70bc084eae3dce54, []int{0, 0}
+	return fileDescriptor_995f7daf8451585d, []int{0, 0}
 }
 
 // The logical operator of the rule.
@@ -68,16 +73,17 @@ func (m *UserListLogicalRuleOperatorEnum) Reset()         { *m = UserListLogical
 func (m *UserListLogicalRuleOperatorEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListLogicalRuleOperatorEnum) ProtoMessage()    {}
 func (*UserListLogicalRuleOperatorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_logical_rule_operator_70bc084eae3dce54, []int{0}
+	return fileDescriptor_995f7daf8451585d, []int{0}
 }
+
 func (m *UserListLogicalRuleOperatorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListLogicalRuleOperatorEnum.Unmarshal(m, b)
 }
 func (m *UserListLogicalRuleOperatorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListLogicalRuleOperatorEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListLogicalRuleOperatorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListLogicalRuleOperatorEnum.Merge(dst, src)
+func (m *UserListLogicalRuleOperatorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListLogicalRuleOperatorEnum.Merge(m, src)
 }
 func (m *UserListLogicalRuleOperatorEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListLogicalRuleOperatorEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *UserListLogicalRuleOperatorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListLogicalRuleOperatorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListLogicalRuleOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListLogicalRuleOperatorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator", UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator_name, UserListLogicalRuleOperatorEnum_UserListLogicalRuleOperator_value)
+	proto.RegisterType((*UserListLogicalRuleOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListLogicalRuleOperatorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_logical_rule_operator.proto", fileDescriptor_user_list_logical_rule_operator_70bc084eae3dce54)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_logical_rule_operator.proto", fileDescriptor_995f7daf8451585d)
 }
 
-var fileDescriptor_user_list_logical_rule_operator_70bc084eae3dce54 = []byte{
+var fileDescriptor_995f7daf8451585d = []byte{
 	// 324 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xc1, 0x6e, 0xe2, 0x30,
 	0x14, 0x5c, 0x02, 0x5a, 0x56, 0xe6, 0xb0, 0x51, 0x8e, 0xbb, 0x45, 0x2d, 0x7c, 0x80, 0xa3, 0xa8,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_membership_status.pb.go b/googleapis/ads/googleads/v1/enums/user_list_membership_status.pb.go
index 8d1e45948c..432a631f70 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_membership_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_membership_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_membership_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing possible user list membership statuses.
 type UserListMembershipStatusEnum_UserListMembershipStatus int32
@@ -39,6 +42,7 @@ var UserListMembershipStatusEnum_UserListMembershipStatus_name = map[int32]strin
 	2: "OPEN",
 	3: "CLOSED",
 }
+
 var UserListMembershipStatusEnum_UserListMembershipStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var UserListMembershipStatusEnum_UserListMembershipStatus_value = map[string]int
 func (x UserListMembershipStatusEnum_UserListMembershipStatus) String() string {
 	return proto.EnumName(UserListMembershipStatusEnum_UserListMembershipStatus_name, int32(x))
 }
+
 func (UserListMembershipStatusEnum_UserListMembershipStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_membership_status_353af4c79a9ed804, []int{0, 0}
+	return fileDescriptor_f6aee6609cb435f7, []int{0, 0}
 }
 
 // Membership status of this user list. Indicates whether a user list is open
@@ -66,16 +71,17 @@ func (m *UserListMembershipStatusEnum) Reset()         { *m = UserListMembership
 func (m *UserListMembershipStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListMembershipStatusEnum) ProtoMessage()    {}
 func (*UserListMembershipStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_membership_status_353af4c79a9ed804, []int{0}
+	return fileDescriptor_f6aee6609cb435f7, []int{0}
 }
+
 func (m *UserListMembershipStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListMembershipStatusEnum.Unmarshal(m, b)
 }
 func (m *UserListMembershipStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListMembershipStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListMembershipStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListMembershipStatusEnum.Merge(dst, src)
+func (m *UserListMembershipStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListMembershipStatusEnum.Merge(m, src)
 }
 func (m *UserListMembershipStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListMembershipStatusEnum.Size(m)
@@ -87,15 +93,15 @@ func (m *UserListMembershipStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListMembershipStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListMembershipStatusEnum)(nil), "google.ads.googleads.v1.enums.UserListMembershipStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListMembershipStatusEnum_UserListMembershipStatus", UserListMembershipStatusEnum_UserListMembershipStatus_name, UserListMembershipStatusEnum_UserListMembershipStatus_value)
+	proto.RegisterType((*UserListMembershipStatusEnum)(nil), "google.ads.googleads.v1.enums.UserListMembershipStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_membership_status.proto", fileDescriptor_user_list_membership_status_353af4c79a9ed804)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_membership_status.proto", fileDescriptor_f6aee6609cb435f7)
 }
 
-var fileDescriptor_user_list_membership_status_353af4c79a9ed804 = []byte{
+var fileDescriptor_f6aee6609cb435f7 = []byte{
 	// 314 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4a, 0xc3, 0x40,
 	0x14, 0x86, 0x6d, 0x2a, 0x55, 0xa6, 0x0b, 0x43, 0x56, 0x22, 0xed, 0xa2, 0x3d, 0xc0, 0x84, 0xe0,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_number_rule_item_operator.pb.go b/googleapis/ads/googleads/v1/enums/user_list_number_rule_item_operator.pb.go
index ce3146de67..e78e371fcd 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_number_rule_item_operator.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_number_rule_item_operator.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_number_rule_item_operator.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list number rule item operators.
 type UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator int32
@@ -51,6 +54,7 @@ var UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator_name = map
 	6: "LESS_THAN",
 	7: "LESS_THAN_OR_EQUAL",
 }
+
 var UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator_value = map[string]int32{
 	"UNSPECIFIED":           0,
 	"UNKNOWN":               1,
@@ -65,8 +69,9 @@ var UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator_value = ma
 func (x UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator) String() string {
 	return proto.EnumName(UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator_name, int32(x))
 }
+
 func (UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_number_rule_item_operator_a792052f11149239, []int{0, 0}
+	return fileDescriptor_33b46e553d0fd0da, []int{0, 0}
 }
 
 // Supported rule operator for number type.
@@ -80,16 +85,17 @@ func (m *UserListNumberRuleItemOperatorEnum) Reset()         { *m = UserListNumb
 func (m *UserListNumberRuleItemOperatorEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListNumberRuleItemOperatorEnum) ProtoMessage()    {}
 func (*UserListNumberRuleItemOperatorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_number_rule_item_operator_a792052f11149239, []int{0}
+	return fileDescriptor_33b46e553d0fd0da, []int{0}
 }
+
 func (m *UserListNumberRuleItemOperatorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListNumberRuleItemOperatorEnum.Unmarshal(m, b)
 }
 func (m *UserListNumberRuleItemOperatorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListNumberRuleItemOperatorEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListNumberRuleItemOperatorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListNumberRuleItemOperatorEnum.Merge(dst, src)
+func (m *UserListNumberRuleItemOperatorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListNumberRuleItemOperatorEnum.Merge(m, src)
 }
 func (m *UserListNumberRuleItemOperatorEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListNumberRuleItemOperatorEnum.Size(m)
@@ -101,15 +107,15 @@ func (m *UserListNumberRuleItemOperatorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListNumberRuleItemOperatorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListNumberRuleItemOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListNumberRuleItemOperatorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator", UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator_name, UserListNumberRuleItemOperatorEnum_UserListNumberRuleItemOperator_value)
+	proto.RegisterType((*UserListNumberRuleItemOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListNumberRuleItemOperatorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_number_rule_item_operator.proto", fileDescriptor_user_list_number_rule_item_operator_a792052f11149239)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_number_rule_item_operator.proto", fileDescriptor_33b46e553d0fd0da)
 }
 
-var fileDescriptor_user_list_number_rule_item_operator_a792052f11149239 = []byte{
+var fileDescriptor_33b46e553d0fd0da = []byte{
 	// 379 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcd, 0xae, 0x93, 0x40,
 	0x14, 0xc7, 0x85, 0x6a, 0x1b, 0xa7, 0x7e, 0x90, 0x49, 0x34, 0xd1, 0x58, 0x93, 0xd6, 0xfd, 0x10,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_prepopulation_status.pb.go b/googleapis/ads/googleads/v1/enums/user_list_prepopulation_status.pb.go
index 6adb8eee82..6c1a81ef46 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_prepopulation_status.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_prepopulation_status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_prepopulation_status.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list prepopulation status.
 type UserListPrepopulationStatusEnum_UserListPrepopulationStatus int32
@@ -42,6 +45,7 @@ var UserListPrepopulationStatusEnum_UserListPrepopulationStatus_name = map[int32
 	3: "FINISHED",
 	4: "FAILED",
 }
+
 var UserListPrepopulationStatusEnum_UserListPrepopulationStatus_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -53,8 +57,9 @@ var UserListPrepopulationStatusEnum_UserListPrepopulationStatus_value = map[stri
 func (x UserListPrepopulationStatusEnum_UserListPrepopulationStatus) String() string {
 	return proto.EnumName(UserListPrepopulationStatusEnum_UserListPrepopulationStatus_name, int32(x))
 }
+
 func (UserListPrepopulationStatusEnum_UserListPrepopulationStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_prepopulation_status_8930b9ea3020757e, []int{0, 0}
+	return fileDescriptor_8f4f54f43cc394fe, []int{0, 0}
 }
 
 // Indicates status of prepopulation based on the rule.
@@ -68,16 +73,17 @@ func (m *UserListPrepopulationStatusEnum) Reset()         { *m = UserListPrepopu
 func (m *UserListPrepopulationStatusEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListPrepopulationStatusEnum) ProtoMessage()    {}
 func (*UserListPrepopulationStatusEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_prepopulation_status_8930b9ea3020757e, []int{0}
+	return fileDescriptor_8f4f54f43cc394fe, []int{0}
 }
+
 func (m *UserListPrepopulationStatusEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListPrepopulationStatusEnum.Unmarshal(m, b)
 }
 func (m *UserListPrepopulationStatusEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListPrepopulationStatusEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListPrepopulationStatusEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListPrepopulationStatusEnum.Merge(dst, src)
+func (m *UserListPrepopulationStatusEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListPrepopulationStatusEnum.Merge(m, src)
 }
 func (m *UserListPrepopulationStatusEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListPrepopulationStatusEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *UserListPrepopulationStatusEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListPrepopulationStatusEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListPrepopulationStatusEnum)(nil), "google.ads.googleads.v1.enums.UserListPrepopulationStatusEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListPrepopulationStatusEnum_UserListPrepopulationStatus", UserListPrepopulationStatusEnum_UserListPrepopulationStatus_name, UserListPrepopulationStatusEnum_UserListPrepopulationStatus_value)
+	proto.RegisterType((*UserListPrepopulationStatusEnum)(nil), "google.ads.googleads.v1.enums.UserListPrepopulationStatusEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_prepopulation_status.proto", fileDescriptor_user_list_prepopulation_status_8930b9ea3020757e)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_prepopulation_status.proto", fileDescriptor_8f4f54f43cc394fe)
 }
 
-var fileDescriptor_user_list_prepopulation_status_8930b9ea3020757e = []byte{
+var fileDescriptor_8f4f54f43cc394fe = []byte{
 	// 333 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xc1, 0x4e, 0xb3, 0x40,
 	0x18, 0xfc, 0xa1, 0x7f, 0xaa, 0x6e, 0x35, 0x12, 0x8e, 0x6a, 0xa3, 0xed, 0x03, 0x2c, 0x21, 0xde,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_rule_type.pb.go b/googleapis/ads/googleads/v1/enums/user_list_rule_type.pb.go
index 2025e580fc..f4368ecb65 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_rule_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_rule_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_rule_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list rule types.
 type UserListRuleTypeEnum_UserListRuleType int32
@@ -39,6 +42,7 @@ var UserListRuleTypeEnum_UserListRuleType_name = map[int32]string{
 	2: "AND_OF_ORS",
 	3: "OR_OF_ANDS",
 }
+
 var UserListRuleTypeEnum_UserListRuleType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var UserListRuleTypeEnum_UserListRuleType_value = map[string]int32{
 func (x UserListRuleTypeEnum_UserListRuleType) String() string {
 	return proto.EnumName(UserListRuleTypeEnum_UserListRuleType_name, int32(x))
 }
+
 func (UserListRuleTypeEnum_UserListRuleType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_rule_type_6ff13bf7262f7b61, []int{0, 0}
+	return fileDescriptor_7f852bff5087c9c7, []int{0, 0}
 }
 
 // Rule based user list rule type.
@@ -64,16 +69,17 @@ func (m *UserListRuleTypeEnum) Reset()         { *m = UserListRuleTypeEnum{} }
 func (m *UserListRuleTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListRuleTypeEnum) ProtoMessage()    {}
 func (*UserListRuleTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_rule_type_6ff13bf7262f7b61, []int{0}
+	return fileDescriptor_7f852bff5087c9c7, []int{0}
 }
+
 func (m *UserListRuleTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListRuleTypeEnum.Unmarshal(m, b)
 }
 func (m *UserListRuleTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListRuleTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListRuleTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListRuleTypeEnum.Merge(dst, src)
+func (m *UserListRuleTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListRuleTypeEnum.Merge(m, src)
 }
 func (m *UserListRuleTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListRuleTypeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *UserListRuleTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListRuleTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListRuleTypeEnum)(nil), "google.ads.googleads.v1.enums.UserListRuleTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListRuleTypeEnum_UserListRuleType", UserListRuleTypeEnum_UserListRuleType_name, UserListRuleTypeEnum_UserListRuleType_value)
+	proto.RegisterType((*UserListRuleTypeEnum)(nil), "google.ads.googleads.v1.enums.UserListRuleTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_rule_type.proto", fileDescriptor_user_list_rule_type_6ff13bf7262f7b61)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_rule_type.proto", fileDescriptor_7f852bff5087c9c7)
 }
 
-var fileDescriptor_user_list_rule_type_6ff13bf7262f7b61 = []byte{
+var fileDescriptor_7f852bff5087c9c7 = []byte{
 	// 315 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xdd, 0x4a, 0xc3, 0x30,
 	0x14, 0x76, 0x1d, 0x28, 0x64, 0xa0, 0xa5, 0xe8, 0x8d, 0xb8, 0x8b, 0xed, 0x01, 0x52, 0x8a, 0x17,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_size_range.pb.go b/googleapis/ads/googleads/v1/enums/user_list_size_range.pb.go
index 16add8833c..9aee71efc2 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_size_range.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_size_range.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_size_range.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing possible user list size ranges.
 type UserListSizeRangeEnum_UserListSizeRange int32
@@ -81,6 +84,7 @@ var UserListSizeRangeEnum_UserListSizeRange_name = map[int32]string{
 	16: "THIRTY_MILLION_TO_FIFTY_MILLION",
 	17: "OVER_FIFTY_MILLION",
 }
+
 var UserListSizeRangeEnum_UserListSizeRange_value = map[string]int32{
 	"UNSPECIFIED":                                     0,
 	"UNKNOWN":                                         1,
@@ -105,8 +109,9 @@ var UserListSizeRangeEnum_UserListSizeRange_value = map[string]int32{
 func (x UserListSizeRangeEnum_UserListSizeRange) String() string {
 	return proto.EnumName(UserListSizeRangeEnum_UserListSizeRange_name, int32(x))
 }
+
 func (UserListSizeRangeEnum_UserListSizeRange) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_size_range_4744de7763dbe702, []int{0, 0}
+	return fileDescriptor_08c233c74e444694, []int{0, 0}
 }
 
 // Size range in terms of number of users of a UserList.
@@ -120,16 +125,17 @@ func (m *UserListSizeRangeEnum) Reset()         { *m = UserListSizeRangeEnum{} }
 func (m *UserListSizeRangeEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListSizeRangeEnum) ProtoMessage()    {}
 func (*UserListSizeRangeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_size_range_4744de7763dbe702, []int{0}
+	return fileDescriptor_08c233c74e444694, []int{0}
 }
+
 func (m *UserListSizeRangeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListSizeRangeEnum.Unmarshal(m, b)
 }
 func (m *UserListSizeRangeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListSizeRangeEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListSizeRangeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListSizeRangeEnum.Merge(dst, src)
+func (m *UserListSizeRangeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListSizeRangeEnum.Merge(m, src)
 }
 func (m *UserListSizeRangeEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListSizeRangeEnum.Size(m)
@@ -141,15 +147,15 @@ func (m *UserListSizeRangeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListSizeRangeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListSizeRangeEnum)(nil), "google.ads.googleads.v1.enums.UserListSizeRangeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListSizeRangeEnum_UserListSizeRange", UserListSizeRangeEnum_UserListSizeRange_name, UserListSizeRangeEnum_UserListSizeRange_value)
+	proto.RegisterType((*UserListSizeRangeEnum)(nil), "google.ads.googleads.v1.enums.UserListSizeRangeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_size_range.proto", fileDescriptor_user_list_size_range_4744de7763dbe702)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_size_range.proto", fileDescriptor_08c233c74e444694)
 }
 
-var fileDescriptor_user_list_size_range_4744de7763dbe702 = []byte{
+var fileDescriptor_08c233c74e444694 = []byte{
 	// 505 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xcb, 0x6e, 0xd3, 0x40,
 	0x14, 0x86, 0x49, 0x7a, 0x83, 0x13, 0xa0, 0xee, 0x48, 0x64, 0x11, 0x9a, 0xb6, 0x09, 0x15, 0x42,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_string_rule_item_operator.pb.go b/googleapis/ads/googleads/v1/enums/user_list_string_rule_item_operator.pb.go
index b195a46dc3..bb028327ce 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_string_rule_item_operator.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_string_rule_item_operator.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_string_rule_item_operator.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list string rule item operators.
 type UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator int32
@@ -57,6 +60,7 @@ var UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator_name = map
 	8: "NOT_STARTS_WITH",
 	9: "NOT_ENDS_WITH",
 }
+
 var UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -73,8 +77,9 @@ var UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator_value = ma
 func (x UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator) String() string {
 	return proto.EnumName(UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator_name, int32(x))
 }
+
 func (UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_string_rule_item_operator_932eec4397d453ac, []int{0, 0}
+	return fileDescriptor_71706bdcf45a4e95, []int{0, 0}
 }
 
 // Supported rule operator for string type.
@@ -88,16 +93,17 @@ func (m *UserListStringRuleItemOperatorEnum) Reset()         { *m = UserListStri
 func (m *UserListStringRuleItemOperatorEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListStringRuleItemOperatorEnum) ProtoMessage()    {}
 func (*UserListStringRuleItemOperatorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_string_rule_item_operator_932eec4397d453ac, []int{0}
+	return fileDescriptor_71706bdcf45a4e95, []int{0}
 }
+
 func (m *UserListStringRuleItemOperatorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListStringRuleItemOperatorEnum.Unmarshal(m, b)
 }
 func (m *UserListStringRuleItemOperatorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListStringRuleItemOperatorEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListStringRuleItemOperatorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListStringRuleItemOperatorEnum.Merge(dst, src)
+func (m *UserListStringRuleItemOperatorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListStringRuleItemOperatorEnum.Merge(m, src)
 }
 func (m *UserListStringRuleItemOperatorEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListStringRuleItemOperatorEnum.Size(m)
@@ -109,15 +115,15 @@ func (m *UserListStringRuleItemOperatorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListStringRuleItemOperatorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListStringRuleItemOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListStringRuleItemOperatorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator", UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator_name, UserListStringRuleItemOperatorEnum_UserListStringRuleItemOperator_value)
+	proto.RegisterType((*UserListStringRuleItemOperatorEnum)(nil), "google.ads.googleads.v1.enums.UserListStringRuleItemOperatorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_string_rule_item_operator.proto", fileDescriptor_user_list_string_rule_item_operator_932eec4397d453ac)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_string_rule_item_operator.proto", fileDescriptor_71706bdcf45a4e95)
 }
 
-var fileDescriptor_user_list_string_rule_item_operator_932eec4397d453ac = []byte{
+var fileDescriptor_71706bdcf45a4e95 = []byte{
 	// 391 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x41, 0x8f, 0x94, 0x30,
 	0x14, 0x16, 0x56, 0x67, 0x77, 0xbb, 0xbb, 0x2e, 0xd6, 0x9b, 0x71, 0x4d, 0x76, 0xbc, 0x97, 0x10,
diff --git a/googleapis/ads/googleads/v1/enums/user_list_type.pb.go b/googleapis/ads/googleads/v1/enums/user_list_type.pb.go
index 71b0e49ec3..447ef1e469 100644
--- a/googleapis/ads/googleads/v1/enums/user_list_type.pb.go
+++ b/googleapis/ads/googleads/v1/enums/user_list_type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/user_list_type.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum containing possible user list types.
 type UserListTypeEnum_UserListType int32
@@ -52,6 +55,7 @@ var UserListTypeEnum_UserListType_name = map[int32]string{
 	6: "SIMILAR",
 	7: "CRM_BASED",
 }
+
 var UserListTypeEnum_UserListType_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -66,8 +70,9 @@ var UserListTypeEnum_UserListType_value = map[string]int32{
 func (x UserListTypeEnum_UserListType) String() string {
 	return proto.EnumName(UserListTypeEnum_UserListType_name, int32(x))
 }
+
 func (UserListTypeEnum_UserListType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_type_a2df5dfff3017dbe, []int{0, 0}
+	return fileDescriptor_79b9149f39c9027c, []int{0, 0}
 }
 
 // The user list types.
@@ -81,16 +86,17 @@ func (m *UserListTypeEnum) Reset()         { *m = UserListTypeEnum{} }
 func (m *UserListTypeEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListTypeEnum) ProtoMessage()    {}
 func (*UserListTypeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_type_a2df5dfff3017dbe, []int{0}
+	return fileDescriptor_79b9149f39c9027c, []int{0}
 }
+
 func (m *UserListTypeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListTypeEnum.Unmarshal(m, b)
 }
 func (m *UserListTypeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListTypeEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListTypeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListTypeEnum.Merge(dst, src)
+func (m *UserListTypeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListTypeEnum.Merge(m, src)
 }
 func (m *UserListTypeEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListTypeEnum.Size(m)
@@ -102,15 +108,15 @@ func (m *UserListTypeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListTypeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListTypeEnum)(nil), "google.ads.googleads.v1.enums.UserListTypeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.UserListTypeEnum_UserListType", UserListTypeEnum_UserListType_name, UserListTypeEnum_UserListType_value)
+	proto.RegisterType((*UserListTypeEnum)(nil), "google.ads.googleads.v1.enums.UserListTypeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_type.proto", fileDescriptor_user_list_type_a2df5dfff3017dbe)
+	proto.RegisterFile("google/ads/googleads/v1/enums/user_list_type.proto", fileDescriptor_79b9149f39c9027c)
 }
 
-var fileDescriptor_user_list_type_a2df5dfff3017dbe = []byte{
+var fileDescriptor_79b9149f39c9027c = []byte{
 	// 360 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4a, 0xeb, 0x40,
 	0x18, 0xc5, 0x6f, 0xd2, 0x7b, 0x5b, 0xee, 0xd4, 0x3f, 0x31, 0xb8, 0x10, 0xb1, 0x8b, 0xf6, 0x01,
diff --git a/googleapis/ads/googleads/v1/enums/vanity_pharma_display_url_mode.pb.go b/googleapis/ads/googleads/v1/enums/vanity_pharma_display_url_mode.pb.go
index c60cdaa1a7..6e2cdceb8c 100644
--- a/googleapis/ads/googleads/v1/enums/vanity_pharma_display_url_mode.pb.go
+++ b/googleapis/ads/googleads/v1/enums/vanity_pharma_display_url_mode.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/vanity_pharma_display_url_mode.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible display modes for vanity pharma URLs.
 type VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode int32
@@ -39,6 +42,7 @@ var VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode_name = map[int32]s
 	2: "MANUFACTURER_WEBSITE_URL",
 	3: "WEBSITE_DESCRIPTION",
 }
+
 var VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -49,8 +53,9 @@ var VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode_value = map[string
 func (x VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode) String() string {
 	return proto.EnumName(VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode_name, int32(x))
 }
+
 func (VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vanity_pharma_display_url_mode_4cfd7515397e8a48, []int{0, 0}
+	return fileDescriptor_7fd43ea3416edbfd, []int{0, 0}
 }
 
 // The display mode for vanity pharma URLs.
@@ -64,16 +69,17 @@ func (m *VanityPharmaDisplayUrlModeEnum) Reset()         { *m = VanityPharmaDisp
 func (m *VanityPharmaDisplayUrlModeEnum) String() string { return proto.CompactTextString(m) }
 func (*VanityPharmaDisplayUrlModeEnum) ProtoMessage()    {}
 func (*VanityPharmaDisplayUrlModeEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vanity_pharma_display_url_mode_4cfd7515397e8a48, []int{0}
+	return fileDescriptor_7fd43ea3416edbfd, []int{0}
 }
+
 func (m *VanityPharmaDisplayUrlModeEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VanityPharmaDisplayUrlModeEnum.Unmarshal(m, b)
 }
 func (m *VanityPharmaDisplayUrlModeEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VanityPharmaDisplayUrlModeEnum.Marshal(b, m, deterministic)
 }
-func (dst *VanityPharmaDisplayUrlModeEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VanityPharmaDisplayUrlModeEnum.Merge(dst, src)
+func (m *VanityPharmaDisplayUrlModeEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VanityPharmaDisplayUrlModeEnum.Merge(m, src)
 }
 func (m *VanityPharmaDisplayUrlModeEnum) XXX_Size() int {
 	return xxx_messageInfo_VanityPharmaDisplayUrlModeEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *VanityPharmaDisplayUrlModeEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_VanityPharmaDisplayUrlModeEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*VanityPharmaDisplayUrlModeEnum)(nil), "google.ads.googleads.v1.enums.VanityPharmaDisplayUrlModeEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode", VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode_name, VanityPharmaDisplayUrlModeEnum_VanityPharmaDisplayUrlMode_value)
+	proto.RegisterType((*VanityPharmaDisplayUrlModeEnum)(nil), "google.ads.googleads.v1.enums.VanityPharmaDisplayUrlModeEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/vanity_pharma_display_url_mode.proto", fileDescriptor_vanity_pharma_display_url_mode_4cfd7515397e8a48)
+	proto.RegisterFile("google/ads/googleads/v1/enums/vanity_pharma_display_url_mode.proto", fileDescriptor_7fd43ea3416edbfd)
 }
 
-var fileDescriptor_vanity_pharma_display_url_mode_4cfd7515397e8a48 = []byte{
+var fileDescriptor_7fd43ea3416edbfd = []byte{
 	// 347 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0x41, 0x6a, 0xb3, 0x40,
 	0x18, 0xfd, 0x35, 0xf0, 0x17, 0x26, 0x8b, 0x8a, 0x5d, 0xb4, 0x84, 0xa4, 0x25, 0x39, 0xc0, 0x88,
diff --git a/googleapis/ads/googleads/v1/enums/vanity_pharma_text.pb.go b/googleapis/ads/googleads/v1/enums/vanity_pharma_text.pb.go
index a294164cd5..a05f325fd0 100644
--- a/googleapis/ads/googleads/v1/enums/vanity_pharma_text.pb.go
+++ b/googleapis/ads/googleads/v1/enums/vanity_pharma_text.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/vanity_pharma_text.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible text.
 type VanityPharmaTextEnum_VanityPharmaText int32
@@ -75,6 +78,7 @@ var VanityPharmaTextEnum_VanityPharmaText_name = map[int32]string{
 	12: "PRESCRIPTION_VACCINE_WEBSITE_EN",
 	13: "PRESCRIPTION_VACCINE_WEBSITE_ES",
 }
+
 var VanityPharmaTextEnum_VanityPharmaText_value = map[string]int32{
 	"UNSPECIFIED":                           0,
 	"UNKNOWN":                               1,
@@ -95,8 +99,9 @@ var VanityPharmaTextEnum_VanityPharmaText_value = map[string]int32{
 func (x VanityPharmaTextEnum_VanityPharmaText) String() string {
 	return proto.EnumName(VanityPharmaTextEnum_VanityPharmaText_name, int32(x))
 }
+
 func (VanityPharmaTextEnum_VanityPharmaText) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vanity_pharma_text_61cebb42c8c693a8, []int{0, 0}
+	return fileDescriptor_1ee2c0c6d237b5f6, []int{0, 0}
 }
 
 // The text that will be displayed in display URL of the text ad when website
@@ -111,16 +116,17 @@ func (m *VanityPharmaTextEnum) Reset()         { *m = VanityPharmaTextEnum{} }
 func (m *VanityPharmaTextEnum) String() string { return proto.CompactTextString(m) }
 func (*VanityPharmaTextEnum) ProtoMessage()    {}
 func (*VanityPharmaTextEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vanity_pharma_text_61cebb42c8c693a8, []int{0}
+	return fileDescriptor_1ee2c0c6d237b5f6, []int{0}
 }
+
 func (m *VanityPharmaTextEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VanityPharmaTextEnum.Unmarshal(m, b)
 }
 func (m *VanityPharmaTextEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VanityPharmaTextEnum.Marshal(b, m, deterministic)
 }
-func (dst *VanityPharmaTextEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VanityPharmaTextEnum.Merge(dst, src)
+func (m *VanityPharmaTextEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VanityPharmaTextEnum.Merge(m, src)
 }
 func (m *VanityPharmaTextEnum) XXX_Size() int {
 	return xxx_messageInfo_VanityPharmaTextEnum.Size(m)
@@ -132,15 +138,15 @@ func (m *VanityPharmaTextEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_VanityPharmaTextEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*VanityPharmaTextEnum)(nil), "google.ads.googleads.v1.enums.VanityPharmaTextEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.VanityPharmaTextEnum_VanityPharmaText", VanityPharmaTextEnum_VanityPharmaText_name, VanityPharmaTextEnum_VanityPharmaText_value)
+	proto.RegisterType((*VanityPharmaTextEnum)(nil), "google.ads.googleads.v1.enums.VanityPharmaTextEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/vanity_pharma_text.proto", fileDescriptor_vanity_pharma_text_61cebb42c8c693a8)
+	proto.RegisterFile("google/ads/googleads/v1/enums/vanity_pharma_text.proto", fileDescriptor_1ee2c0c6d237b5f6)
 }
 
-var fileDescriptor_vanity_pharma_text_61cebb42c8c693a8 = []byte{
+var fileDescriptor_1ee2c0c6d237b5f6 = []byte{
 	// 429 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x8a, 0x13, 0x31,
 	0x1c, 0xc6, 0x6d, 0xbb, 0xee, 0x6a, 0xaa, 0x18, 0x06, 0x3d, 0x28, 0x56, 0x69, 0x65, 0x0f, 0x5e,
diff --git a/googleapis/ads/googleads/v1/enums/webpage_condition_operand.pb.go b/googleapis/ads/googleads/v1/enums/webpage_condition_operand.pb.go
index 5783d56b7b..1972fa0904 100644
--- a/googleapis/ads/googleads/v1/enums/webpage_condition_operand.pb.go
+++ b/googleapis/ads/googleads/v1/enums/webpage_condition_operand.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/webpage_condition_operand.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The webpage condition operand in webpage criterion.
 type WebpageConditionOperandEnum_WebpageConditionOperand int32
@@ -48,6 +51,7 @@ var WebpageConditionOperandEnum_WebpageConditionOperand_name = map[int32]string{
 	5: "PAGE_CONTENT",
 	6: "CUSTOM_LABEL",
 }
+
 var WebpageConditionOperandEnum_WebpageConditionOperand_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -61,8 +65,9 @@ var WebpageConditionOperandEnum_WebpageConditionOperand_value = map[string]int32
 func (x WebpageConditionOperandEnum_WebpageConditionOperand) String() string {
 	return proto.EnumName(WebpageConditionOperandEnum_WebpageConditionOperand_name, int32(x))
 }
+
 func (WebpageConditionOperandEnum_WebpageConditionOperand) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_webpage_condition_operand_ce1dd41c06601f19, []int{0, 0}
+	return fileDescriptor_cc0697625fa842a9, []int{0, 0}
 }
 
 // Container for enum describing webpage condition operand in webpage criterion.
@@ -76,16 +81,17 @@ func (m *WebpageConditionOperandEnum) Reset()         { *m = WebpageConditionOpe
 func (m *WebpageConditionOperandEnum) String() string { return proto.CompactTextString(m) }
 func (*WebpageConditionOperandEnum) ProtoMessage()    {}
 func (*WebpageConditionOperandEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webpage_condition_operand_ce1dd41c06601f19, []int{0}
+	return fileDescriptor_cc0697625fa842a9, []int{0}
 }
+
 func (m *WebpageConditionOperandEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebpageConditionOperandEnum.Unmarshal(m, b)
 }
 func (m *WebpageConditionOperandEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebpageConditionOperandEnum.Marshal(b, m, deterministic)
 }
-func (dst *WebpageConditionOperandEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebpageConditionOperandEnum.Merge(dst, src)
+func (m *WebpageConditionOperandEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebpageConditionOperandEnum.Merge(m, src)
 }
 func (m *WebpageConditionOperandEnum) XXX_Size() int {
 	return xxx_messageInfo_WebpageConditionOperandEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *WebpageConditionOperandEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_WebpageConditionOperandEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*WebpageConditionOperandEnum)(nil), "google.ads.googleads.v1.enums.WebpageConditionOperandEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.WebpageConditionOperandEnum_WebpageConditionOperand", WebpageConditionOperandEnum_WebpageConditionOperand_name, WebpageConditionOperandEnum_WebpageConditionOperand_value)
+	proto.RegisterType((*WebpageConditionOperandEnum)(nil), "google.ads.googleads.v1.enums.WebpageConditionOperandEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/webpage_condition_operand.proto", fileDescriptor_webpage_condition_operand_ce1dd41c06601f19)
+	proto.RegisterFile("google/ads/googleads/v1/enums/webpage_condition_operand.proto", fileDescriptor_cc0697625fa842a9)
 }
 
-var fileDescriptor_webpage_condition_operand_ce1dd41c06601f19 = []byte{
+var fileDescriptor_cc0697625fa842a9 = []byte{
 	// 354 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0x4e, 0xea, 0x40,
 	0x14, 0x7d, 0x2d, 0x4f, 0x30, 0x03, 0xd1, 0x49, 0x37, 0x26, 0x0a, 0x0b, 0xf8, 0x80, 0x69, 0x1a,
diff --git a/googleapis/ads/googleads/v1/enums/webpage_condition_operator.pb.go b/googleapis/ads/googleads/v1/enums/webpage_condition_operator.pb.go
index 59a77feb03..d1b0e17b9d 100644
--- a/googleapis/ads/googleads/v1/enums/webpage_condition_operator.pb.go
+++ b/googleapis/ads/googleads/v1/enums/webpage_condition_operator.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/enums/webpage_condition_operator.proto
 
-package enums // import "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+package enums
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The webpage condition operator in webpage criterion.
 type WebpageConditionOperatorEnum_WebpageConditionOperator int32
@@ -39,6 +42,7 @@ var WebpageConditionOperatorEnum_WebpageConditionOperator_name = map[int32]strin
 	2: "EQUALS",
 	3: "CONTAINS",
 }
+
 var WebpageConditionOperatorEnum_WebpageConditionOperator_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var WebpageConditionOperatorEnum_WebpageConditionOperator_value = map[string]int
 func (x WebpageConditionOperatorEnum_WebpageConditionOperator) String() string {
 	return proto.EnumName(WebpageConditionOperatorEnum_WebpageConditionOperator_name, int32(x))
 }
+
 func (WebpageConditionOperatorEnum_WebpageConditionOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_webpage_condition_operator_d37a704d21612ea5, []int{0, 0}
+	return fileDescriptor_e856da14d9f47c05, []int{0, 0}
 }
 
 // Container for enum describing webpage condition operator in webpage
@@ -65,16 +70,17 @@ func (m *WebpageConditionOperatorEnum) Reset()         { *m = WebpageConditionOp
 func (m *WebpageConditionOperatorEnum) String() string { return proto.CompactTextString(m) }
 func (*WebpageConditionOperatorEnum) ProtoMessage()    {}
 func (*WebpageConditionOperatorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webpage_condition_operator_d37a704d21612ea5, []int{0}
+	return fileDescriptor_e856da14d9f47c05, []int{0}
 }
+
 func (m *WebpageConditionOperatorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebpageConditionOperatorEnum.Unmarshal(m, b)
 }
 func (m *WebpageConditionOperatorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebpageConditionOperatorEnum.Marshal(b, m, deterministic)
 }
-func (dst *WebpageConditionOperatorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebpageConditionOperatorEnum.Merge(dst, src)
+func (m *WebpageConditionOperatorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebpageConditionOperatorEnum.Merge(m, src)
 }
 func (m *WebpageConditionOperatorEnum) XXX_Size() int {
 	return xxx_messageInfo_WebpageConditionOperatorEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *WebpageConditionOperatorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_WebpageConditionOperatorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*WebpageConditionOperatorEnum)(nil), "google.ads.googleads.v1.enums.WebpageConditionOperatorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.enums.WebpageConditionOperatorEnum_WebpageConditionOperator", WebpageConditionOperatorEnum_WebpageConditionOperator_name, WebpageConditionOperatorEnum_WebpageConditionOperator_value)
+	proto.RegisterType((*WebpageConditionOperatorEnum)(nil), "google.ads.googleads.v1.enums.WebpageConditionOperatorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/enums/webpage_condition_operator.proto", fileDescriptor_webpage_condition_operator_d37a704d21612ea5)
+	proto.RegisterFile("google/ads/googleads/v1/enums/webpage_condition_operator.proto", fileDescriptor_e856da14d9f47c05)
 }
 
-var fileDescriptor_webpage_condition_operator_d37a704d21612ea5 = []byte{
+var fileDescriptor_e856da14d9f47c05 = []byte{
 	// 312 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xd1, 0x6a, 0xc2, 0x30,
 	0x14, 0x9d, 0x15, 0xdc, 0x88, 0x83, 0x95, 0x3e, 0x8d, 0xa1, 0x0f, 0xfa, 0x01, 0x29, 0x65, 0x6f,
diff --git a/googleapis/ads/googleads/v1/errors/account_budget_proposal_error.pb.go b/googleapis/ads/googleads/v1/errors/account_budget_proposal_error.pb.go
index a2c0b36f22..e90afe1982 100644
--- a/googleapis/ads/googleads/v1/errors/account_budget_proposal_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/account_budget_proposal_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/account_budget_proposal_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible account budget proposal errors.
 type AccountBudgetProposalErrorEnum_AccountBudgetProposalError int32
@@ -103,6 +106,7 @@ var AccountBudgetProposalErrorEnum_AccountBudgetProposalError_name = map[int32]s
 	22: "NOT_AUTHORIZED",
 	23: "INVALID_BILLING_SETUP",
 }
+
 var AccountBudgetProposalErrorEnum_AccountBudgetProposalError_value = map[string]int32{
 	"UNSPECIFIED":                     0,
 	"UNKNOWN":                         1,
@@ -133,8 +137,9 @@ var AccountBudgetProposalErrorEnum_AccountBudgetProposalError_value = map[string
 func (x AccountBudgetProposalErrorEnum_AccountBudgetProposalError) String() string {
 	return proto.EnumName(AccountBudgetProposalErrorEnum_AccountBudgetProposalError_name, int32(x))
 }
+
 func (AccountBudgetProposalErrorEnum_AccountBudgetProposalError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_error_6eb4a0167888d036, []int{0, 0}
+	return fileDescriptor_b846ff75902c2ac4, []int{0, 0}
 }
 
 // Container for enum describing possible account budget proposal errors.
@@ -148,16 +153,17 @@ func (m *AccountBudgetProposalErrorEnum) Reset()         { *m = AccountBudgetPro
 func (m *AccountBudgetProposalErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AccountBudgetProposalErrorEnum) ProtoMessage()    {}
 func (*AccountBudgetProposalErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_error_6eb4a0167888d036, []int{0}
+	return fileDescriptor_b846ff75902c2ac4, []int{0}
 }
+
 func (m *AccountBudgetProposalErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudgetProposalErrorEnum.Unmarshal(m, b)
 }
 func (m *AccountBudgetProposalErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudgetProposalErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudgetProposalErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudgetProposalErrorEnum.Merge(dst, src)
+func (m *AccountBudgetProposalErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudgetProposalErrorEnum.Merge(m, src)
 }
 func (m *AccountBudgetProposalErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AccountBudgetProposalErrorEnum.Size(m)
@@ -169,15 +175,15 @@ func (m *AccountBudgetProposalErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AccountBudgetProposalErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AccountBudgetProposalErrorEnum)(nil), "google.ads.googleads.v1.errors.AccountBudgetProposalErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AccountBudgetProposalErrorEnum_AccountBudgetProposalError", AccountBudgetProposalErrorEnum_AccountBudgetProposalError_name, AccountBudgetProposalErrorEnum_AccountBudgetProposalError_value)
+	proto.RegisterType((*AccountBudgetProposalErrorEnum)(nil), "google.ads.googleads.v1.errors.AccountBudgetProposalErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/account_budget_proposal_error.proto", fileDescriptor_account_budget_proposal_error_6eb4a0167888d036)
+	proto.RegisterFile("google/ads/googleads/v1/errors/account_budget_proposal_error.proto", fileDescriptor_b846ff75902c2ac4)
 }
 
-var fileDescriptor_account_budget_proposal_error_6eb4a0167888d036 = []byte{
+var fileDescriptor_b846ff75902c2ac4 = []byte{
 	// 686 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xcb, 0x6e, 0x13, 0x3d,
 	0x14, 0xfe, 0x9b, 0xfe, 0xa4, 0xe0, 0x42, 0x6b, 0xdc, 0x0b, 0x25, 0xaa, 0x52, 0x14, 0x96, 0x48,
diff --git a/googleapis/ads/googleads/v1/errors/ad_customizer_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_customizer_error.pb.go
index edfb4c22f8..daaff56e6d 100644
--- a/googleapis/ads/googleads/v1/errors/ad_customizer_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_customizer_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_customizer_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad customizer errors.
 type AdCustomizerErrorEnum_AdCustomizerError int32
@@ -48,6 +51,7 @@ var AdCustomizerErrorEnum_AdCustomizerError_name = map[int32]string{
 	5: "COUNTDOWN_INVALID_START_DAYS_BEFORE",
 	6: "UNKNOWN_USER_LIST",
 }
+
 var AdCustomizerErrorEnum_AdCustomizerError_value = map[string]int32{
 	"UNSPECIFIED":                         0,
 	"UNKNOWN":                             1,
@@ -61,8 +65,9 @@ var AdCustomizerErrorEnum_AdCustomizerError_value = map[string]int32{
 func (x AdCustomizerErrorEnum_AdCustomizerError) String() string {
 	return proto.EnumName(AdCustomizerErrorEnum_AdCustomizerError_name, int32(x))
 }
+
 func (AdCustomizerErrorEnum_AdCustomizerError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_customizer_error_7520f04803e89b43, []int{0, 0}
+	return fileDescriptor_ad09816fa1689384, []int{0, 0}
 }
 
 // Container for enum describing possible ad customizer errors.
@@ -76,16 +81,17 @@ func (m *AdCustomizerErrorEnum) Reset()         { *m = AdCustomizerErrorEnum{} }
 func (m *AdCustomizerErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdCustomizerErrorEnum) ProtoMessage()    {}
 func (*AdCustomizerErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_customizer_error_7520f04803e89b43, []int{0}
+	return fileDescriptor_ad09816fa1689384, []int{0}
 }
+
 func (m *AdCustomizerErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdCustomizerErrorEnum.Unmarshal(m, b)
 }
 func (m *AdCustomizerErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdCustomizerErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdCustomizerErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdCustomizerErrorEnum.Merge(dst, src)
+func (m *AdCustomizerErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdCustomizerErrorEnum.Merge(m, src)
 }
 func (m *AdCustomizerErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdCustomizerErrorEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *AdCustomizerErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdCustomizerErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdCustomizerErrorEnum)(nil), "google.ads.googleads.v1.errors.AdCustomizerErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdCustomizerErrorEnum_AdCustomizerError", AdCustomizerErrorEnum_AdCustomizerError_name, AdCustomizerErrorEnum_AdCustomizerError_value)
+	proto.RegisterType((*AdCustomizerErrorEnum)(nil), "google.ads.googleads.v1.errors.AdCustomizerErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_customizer_error.proto", fileDescriptor_ad_customizer_error_7520f04803e89b43)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_customizer_error.proto", fileDescriptor_ad09816fa1689384)
 }
 
-var fileDescriptor_ad_customizer_error_7520f04803e89b43 = []byte{
+var fileDescriptor_ad09816fa1689384 = []byte{
 	// 386 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcf, 0x8a, 0xd4, 0x40,
 	0x10, 0xc6, 0x4d, 0x56, 0x57, 0xe8, 0x3d, 0x98, 0x6d, 0xd8, 0x45, 0x96, 0x75, 0xc1, 0x78, 0xf0,
diff --git a/googleapis/ads/googleads/v1/errors/ad_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_error.pb.go
index 10b84f1d19..77d0dd22bd 100644
--- a/googleapis/ads/googleads/v1/errors/ad_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad errors.
 type AdErrorEnum_AdError int32
@@ -443,6 +446,7 @@ var AdErrorEnum_AdError_name = map[int32]string{
 	132: "MISSING_IMAGE_OR_MEDIA_BUNDLE",
 	133: "PRODUCT_TYPE_NOT_SUPPORTED_IN_THIS_CAMPAIGN",
 }
+
 var AdErrorEnum_AdError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -580,8 +584,9 @@ var AdErrorEnum_AdError_value = map[string]int32{
 func (x AdErrorEnum_AdError) String() string {
 	return proto.EnumName(AdErrorEnum_AdError_name, int32(x))
 }
+
 func (AdErrorEnum_AdError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_error_e9bb2204ffbdff9f, []int{0, 0}
+	return fileDescriptor_69091a5966fb9a14, []int{0, 0}
 }
 
 // Container for enum describing possible ad errors.
@@ -595,16 +600,17 @@ func (m *AdErrorEnum) Reset()         { *m = AdErrorEnum{} }
 func (m *AdErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdErrorEnum) ProtoMessage()    {}
 func (*AdErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_error_e9bb2204ffbdff9f, []int{0}
+	return fileDescriptor_69091a5966fb9a14, []int{0}
 }
+
 func (m *AdErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdErrorEnum.Unmarshal(m, b)
 }
 func (m *AdErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdErrorEnum.Merge(dst, src)
+func (m *AdErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdErrorEnum.Merge(m, src)
 }
 func (m *AdErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdErrorEnum.Size(m)
@@ -616,15 +622,15 @@ func (m *AdErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdErrorEnum)(nil), "google.ads.googleads.v1.errors.AdErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdErrorEnum_AdError", AdErrorEnum_AdError_name, AdErrorEnum_AdError_value)
+	proto.RegisterType((*AdErrorEnum)(nil), "google.ads.googleads.v1.errors.AdErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_error.proto", fileDescriptor_ad_error_e9bb2204ffbdff9f)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_error.proto", fileDescriptor_69091a5966fb9a14)
 }
 
-var fileDescriptor_ad_error_e9bb2204ffbdff9f = []byte{
+var fileDescriptor_69091a5966fb9a14 = []byte{
 	// 2059 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x58, 0x6b, 0x7b, 0x1c, 0x37,
 	0x15, 0xc6, 0x29, 0x34, 0xad, 0x92, 0x34, 0x8a, 0x72, 0xbf, 0x39, 0xa9, 0x93, 0xe6, 0x9e, 0x75,
diff --git a/googleapis/ads/googleads/v1/errors/ad_group_ad_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_group_ad_error.pb.go
index 04248a7ab4..7e70649006 100644
--- a/googleapis/ads/googleads/v1/errors/ad_group_ad_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_group_ad_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_group_ad_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad group ad errors.
 type AdGroupAdErrorEnum_AdGroupAdError int32
@@ -59,6 +62,7 @@ var AdGroupAdErrorEnum_AdGroupAdError_name = map[int32]string{
 	8: "EMPTY_FIELD",
 	9: "RESOURCE_REFERENCED_IN_MULTIPLE_OPS",
 }
+
 var AdGroupAdErrorEnum_AdGroupAdError_value = map[string]int32{
 	"UNSPECIFIED":                         0,
 	"UNKNOWN":                             1,
@@ -75,8 +79,9 @@ var AdGroupAdErrorEnum_AdGroupAdError_value = map[string]int32{
 func (x AdGroupAdErrorEnum_AdGroupAdError) String() string {
 	return proto.EnumName(AdGroupAdErrorEnum_AdGroupAdError_name, int32(x))
 }
+
 func (AdGroupAdErrorEnum_AdGroupAdError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_error_bb843f1771a94842, []int{0, 0}
+	return fileDescriptor_0a1e540bf367b66f, []int{0, 0}
 }
 
 // Container for enum describing possible ad group ad errors.
@@ -90,16 +95,17 @@ func (m *AdGroupAdErrorEnum) Reset()         { *m = AdGroupAdErrorEnum{} }
 func (m *AdGroupAdErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAdErrorEnum) ProtoMessage()    {}
 func (*AdGroupAdErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_error_bb843f1771a94842, []int{0}
+	return fileDescriptor_0a1e540bf367b66f, []int{0}
 }
+
 func (m *AdGroupAdErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAdErrorEnum.Unmarshal(m, b)
 }
 func (m *AdGroupAdErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAdErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAdErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAdErrorEnum.Merge(dst, src)
+func (m *AdGroupAdErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAdErrorEnum.Merge(m, src)
 }
 func (m *AdGroupAdErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAdErrorEnum.Size(m)
@@ -111,15 +117,15 @@ func (m *AdGroupAdErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupAdErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupAdErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupAdErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdGroupAdErrorEnum_AdGroupAdError", AdGroupAdErrorEnum_AdGroupAdError_name, AdGroupAdErrorEnum_AdGroupAdError_value)
+	proto.RegisterType((*AdGroupAdErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupAdErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_ad_error.proto", fileDescriptor_ad_group_ad_error_bb843f1771a94842)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_ad_error.proto", fileDescriptor_0a1e540bf367b66f)
 }
 
-var fileDescriptor_ad_group_ad_error_bb843f1771a94842 = []byte{
+var fileDescriptor_0a1e540bf367b66f = []byte{
 	// 448 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x51, 0x6b, 0xd4, 0x40,
 	0x10, 0xc7, 0xbd, 0x54, 0x5b, 0xdd, 0x82, 0x86, 0x28, 0x22, 0xa5, 0x94, 0x72, 0x0a, 0xbe, 0x25,
diff --git a/googleapis/ads/googleads/v1/errors/ad_group_bid_modifier_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_group_bid_modifier_error.pb.go
index e9f1ad9e6f..6e1fca3378 100644
--- a/googleapis/ads/googleads/v1/errors/ad_group_bid_modifier_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_group_bid_modifier_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_group_bid_modifier_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad group bid modifier errors.
 type AdGroupBidModifierErrorEnum_AdGroupBidModifierError int32
@@ -40,6 +43,7 @@ var AdGroupBidModifierErrorEnum_AdGroupBidModifierError_name = map[int32]string{
 	2: "CRITERION_ID_NOT_SUPPORTED",
 	3: "CANNOT_OVERRIDE_OPTED_OUT_CAMPAIGN_CRITERION_BID_MODIFIER",
 }
+
 var AdGroupBidModifierErrorEnum_AdGroupBidModifierError_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -50,8 +54,9 @@ var AdGroupBidModifierErrorEnum_AdGroupBidModifierError_value = map[string]int32
 func (x AdGroupBidModifierErrorEnum_AdGroupBidModifierError) String() string {
 	return proto.EnumName(AdGroupBidModifierErrorEnum_AdGroupBidModifierError_name, int32(x))
 }
+
 func (AdGroupBidModifierErrorEnum_AdGroupBidModifierError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_error_b3d4b89f8531df2e, []int{0, 0}
+	return fileDescriptor_488f71f8a13452db, []int{0, 0}
 }
 
 // Container for enum describing possible ad group bid modifier errors.
@@ -65,16 +70,17 @@ func (m *AdGroupBidModifierErrorEnum) Reset()         { *m = AdGroupBidModifierE
 func (m *AdGroupBidModifierErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupBidModifierErrorEnum) ProtoMessage()    {}
 func (*AdGroupBidModifierErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_error_b3d4b89f8531df2e, []int{0}
+	return fileDescriptor_488f71f8a13452db, []int{0}
 }
+
 func (m *AdGroupBidModifierErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupBidModifierErrorEnum.Unmarshal(m, b)
 }
 func (m *AdGroupBidModifierErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupBidModifierErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupBidModifierErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupBidModifierErrorEnum.Merge(dst, src)
+func (m *AdGroupBidModifierErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupBidModifierErrorEnum.Merge(m, src)
 }
 func (m *AdGroupBidModifierErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupBidModifierErrorEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *AdGroupBidModifierErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupBidModifierErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupBidModifierErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupBidModifierErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdGroupBidModifierErrorEnum_AdGroupBidModifierError", AdGroupBidModifierErrorEnum_AdGroupBidModifierError_name, AdGroupBidModifierErrorEnum_AdGroupBidModifierError_value)
+	proto.RegisterType((*AdGroupBidModifierErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupBidModifierErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_bid_modifier_error.proto", fileDescriptor_ad_group_bid_modifier_error_b3d4b89f8531df2e)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_bid_modifier_error.proto", fileDescriptor_488f71f8a13452db)
 }
 
-var fileDescriptor_ad_group_bid_modifier_error_b3d4b89f8531df2e = []byte{
+var fileDescriptor_488f71f8a13452db = []byte{
 	// 368 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xcd, 0xaa, 0xd4, 0x30,
 	0x14, 0xb6, 0xbd, 0xa0, 0x90, 0xbb, 0xb0, 0x74, 0x23, 0x5c, 0x2f, 0xb3, 0xe8, 0x03, 0xa4, 0x14,
diff --git a/googleapis/ads/googleads/v1/errors/ad_group_criterion_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_group_criterion_error.pb.go
index 62dacb2e79..c587ff1d20 100644
--- a/googleapis/ads/googleads/v1/errors/ad_group_criterion_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_group_criterion_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_group_criterion_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad group criterion errors.
 type AdGroupCriterionErrorEnum_AdGroupCriterionError int32
@@ -154,6 +157,7 @@ var AdGroupCriterionErrorEnum_AdGroupCriterionError_name = map[int32]string{
 	46: "INVALID_LISTING_GROUP_TYPE",
 	47: "LISTING_GROUP_ADD_MAY_ONLY_USE_TEMP_ID",
 }
+
 var AdGroupCriterionErrorEnum_AdGroupCriterionError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -199,8 +203,9 @@ var AdGroupCriterionErrorEnum_AdGroupCriterionError_value = map[string]int32{
 func (x AdGroupCriterionErrorEnum_AdGroupCriterionError) String() string {
 	return proto.EnumName(AdGroupCriterionErrorEnum_AdGroupCriterionError_name, int32(x))
 }
+
 func (AdGroupCriterionErrorEnum_AdGroupCriterionError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_error_22d32d77f0f0a104, []int{0, 0}
+	return fileDescriptor_6d0afb787727cc9c, []int{0, 0}
 }
 
 // Container for enum describing possible ad group criterion errors.
@@ -214,16 +219,17 @@ func (m *AdGroupCriterionErrorEnum) Reset()         { *m = AdGroupCriterionError
 func (m *AdGroupCriterionErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterionErrorEnum) ProtoMessage()    {}
 func (*AdGroupCriterionErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_error_22d32d77f0f0a104, []int{0}
+	return fileDescriptor_6d0afb787727cc9c, []int{0}
 }
+
 func (m *AdGroupCriterionErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterionErrorEnum.Unmarshal(m, b)
 }
 func (m *AdGroupCriterionErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterionErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterionErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterionErrorEnum.Merge(dst, src)
+func (m *AdGroupCriterionErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterionErrorEnum.Merge(m, src)
 }
 func (m *AdGroupCriterionErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterionErrorEnum.Size(m)
@@ -235,15 +241,15 @@ func (m *AdGroupCriterionErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupCriterionErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupCriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupCriterionErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdGroupCriterionErrorEnum_AdGroupCriterionError", AdGroupCriterionErrorEnum_AdGroupCriterionError_name, AdGroupCriterionErrorEnum_AdGroupCriterionError_value)
+	proto.RegisterType((*AdGroupCriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupCriterionErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_criterion_error.proto", fileDescriptor_ad_group_criterion_error_22d32d77f0f0a104)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_criterion_error.proto", fileDescriptor_6d0afb787727cc9c)
 }
 
-var fileDescriptor_ad_group_criterion_error_22d32d77f0f0a104 = []byte{
+var fileDescriptor_6d0afb787727cc9c = []byte{
 	// 976 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x72, 0x1b, 0x35,
 	0x14, 0xa6, 0x29, 0xb4, 0xa0, 0x06, 0x2a, 0xc4, 0x4f, 0xdb, 0xfc, 0xb6, 0x29, 0xb4, 0xb4, 0x21,
diff --git a/googleapis/ads/googleads/v1/errors/ad_group_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_group_error.pb.go
index b9e2ce24f0..9901d6824a 100644
--- a/googleapis/ads/googleads/v1/errors/ad_group_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_group_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_group_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad group errors.
 type AdGroupErrorEnum_AdGroupError int32
@@ -72,6 +75,7 @@ var AdGroupErrorEnum_AdGroupError_name = map[int32]string{
 	13: "ADGROUP_TYPE_NOT_SUPPORTED_FOR_CAMPAIGN_SALES_COUNTRY",
 	14: "CANNOT_ADD_ADGROUP_OF_TYPE_DSA_TO_CAMPAIGN_WITHOUT_DSA_SETTING",
 }
+
 var AdGroupErrorEnum_AdGroupError_value = map[string]int32{
 	"UNSPECIFIED":                                                    0,
 	"UNKNOWN":                                                        1,
@@ -92,8 +96,9 @@ var AdGroupErrorEnum_AdGroupError_value = map[string]int32{
 func (x AdGroupErrorEnum_AdGroupError) String() string {
 	return proto.EnumName(AdGroupErrorEnum_AdGroupError_name, int32(x))
 }
+
 func (AdGroupErrorEnum_AdGroupError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_error_de21abf890f19b77, []int{0, 0}
+	return fileDescriptor_8e0068e691513cbe, []int{0, 0}
 }
 
 // Container for enum describing possible ad group errors.
@@ -107,16 +112,17 @@ func (m *AdGroupErrorEnum) Reset()         { *m = AdGroupErrorEnum{} }
 func (m *AdGroupErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupErrorEnum) ProtoMessage()    {}
 func (*AdGroupErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_error_de21abf890f19b77, []int{0}
+	return fileDescriptor_8e0068e691513cbe, []int{0}
 }
+
 func (m *AdGroupErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupErrorEnum.Unmarshal(m, b)
 }
 func (m *AdGroupErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupErrorEnum.Merge(dst, src)
+func (m *AdGroupErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupErrorEnum.Merge(m, src)
 }
 func (m *AdGroupErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupErrorEnum.Size(m)
@@ -128,15 +134,15 @@ func (m *AdGroupErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdGroupErrorEnum_AdGroupError", AdGroupErrorEnum_AdGroupError_name, AdGroupErrorEnum_AdGroupError_value)
+	proto.RegisterType((*AdGroupErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_error.proto", fileDescriptor_ad_group_error_de21abf890f19b77)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_error.proto", fileDescriptor_8e0068e691513cbe)
 }
 
-var fileDescriptor_ad_group_error_de21abf890f19b77 = []byte{
+var fileDescriptor_8e0068e691513cbe = []byte{
 	// 554 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xe1, 0x6a, 0xd4, 0x40,
 	0x14, 0x85, 0xed, 0xb6, 0xb6, 0x3a, 0xad, 0x3a, 0x0e, 0x22, 0x52, 0x4a, 0xd1, 0x05, 0x45, 0x44,
diff --git a/googleapis/ads/googleads/v1/errors/ad_group_feed_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_group_feed_error.pb.go
index 35bc5c0786..e6ff5a5d1f 100644
--- a/googleapis/ads/googleads/v1/errors/ad_group_feed_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_group_feed_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_group_feed_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad group feed errors.
 type AdGroupFeedErrorEnum_AdGroupFeedError int32
@@ -56,6 +59,7 @@ var AdGroupFeedErrorEnum_AdGroupFeedError_name = map[int32]string{
 	7: "MISSING_FEEDMAPPING_FOR_PLACEHOLDER_TYPE",
 	8: "NO_EXISTING_LOCATION_CUSTOMER_FEED",
 }
+
 var AdGroupFeedErrorEnum_AdGroupFeedError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -71,8 +75,9 @@ var AdGroupFeedErrorEnum_AdGroupFeedError_value = map[string]int32{
 func (x AdGroupFeedErrorEnum_AdGroupFeedError) String() string {
 	return proto.EnumName(AdGroupFeedErrorEnum_AdGroupFeedError_name, int32(x))
 }
+
 func (AdGroupFeedErrorEnum_AdGroupFeedError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_error_cfd5a46a58afca74, []int{0, 0}
+	return fileDescriptor_cd287da9ca2936b6, []int{0, 0}
 }
 
 // Container for enum describing possible ad group feed errors.
@@ -86,16 +91,17 @@ func (m *AdGroupFeedErrorEnum) Reset()         { *m = AdGroupFeedErrorEnum{} }
 func (m *AdGroupFeedErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdGroupFeedErrorEnum) ProtoMessage()    {}
 func (*AdGroupFeedErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_error_cfd5a46a58afca74, []int{0}
+	return fileDescriptor_cd287da9ca2936b6, []int{0}
 }
+
 func (m *AdGroupFeedErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupFeedErrorEnum.Unmarshal(m, b)
 }
 func (m *AdGroupFeedErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupFeedErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupFeedErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupFeedErrorEnum.Merge(dst, src)
+func (m *AdGroupFeedErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupFeedErrorEnum.Merge(m, src)
 }
 func (m *AdGroupFeedErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdGroupFeedErrorEnum.Size(m)
@@ -107,15 +113,15 @@ func (m *AdGroupFeedErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdGroupFeedErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdGroupFeedErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupFeedErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdGroupFeedErrorEnum_AdGroupFeedError", AdGroupFeedErrorEnum_AdGroupFeedError_name, AdGroupFeedErrorEnum_AdGroupFeedError_value)
+	proto.RegisterType((*AdGroupFeedErrorEnum)(nil), "google.ads.googleads.v1.errors.AdGroupFeedErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_feed_error.proto", fileDescriptor_ad_group_feed_error_cfd5a46a58afca74)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_group_feed_error.proto", fileDescriptor_cd287da9ca2936b6)
 }
 
-var fileDescriptor_ad_group_feed_error_cfd5a46a58afca74 = []byte{
+var fileDescriptor_cd287da9ca2936b6 = []byte{
 	// 445 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x6a, 0xd4, 0x40,
 	0x1c, 0xc6, 0xdd, 0x54, 0x5b, 0x99, 0x1e, 0x0c, 0x41, 0x41, 0xb4, 0xac, 0x90, 0x43, 0x11, 0x91,
diff --git a/googleapis/ads/googleads/v1/errors/ad_parameter_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_parameter_error.pb.go
index 7e1e8de069..b426759d75 100644
--- a/googleapis/ads/googleads/v1/errors/ad_parameter_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_parameter_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_parameter_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad parameter errors.
 type AdParameterErrorEnum_AdParameterError int32
@@ -39,6 +42,7 @@ var AdParameterErrorEnum_AdParameterError_name = map[int32]string{
 	2: "AD_GROUP_CRITERION_MUST_BE_KEYWORD",
 	3: "INVALID_INSERTION_TEXT_FORMAT",
 }
+
 var AdParameterErrorEnum_AdParameterError_value = map[string]int32{
 	"UNSPECIFIED":                        0,
 	"UNKNOWN":                            1,
@@ -49,8 +53,9 @@ var AdParameterErrorEnum_AdParameterError_value = map[string]int32{
 func (x AdParameterErrorEnum_AdParameterError) String() string {
 	return proto.EnumName(AdParameterErrorEnum_AdParameterError_name, int32(x))
 }
+
 func (AdParameterErrorEnum_AdParameterError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_error_4740fd19374c0b5b, []int{0, 0}
+	return fileDescriptor_9daf43f3c5a5dc12, []int{0, 0}
 }
 
 // Container for enum describing possible ad parameter errors.
@@ -64,16 +69,17 @@ func (m *AdParameterErrorEnum) Reset()         { *m = AdParameterErrorEnum{} }
 func (m *AdParameterErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdParameterErrorEnum) ProtoMessage()    {}
 func (*AdParameterErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_error_4740fd19374c0b5b, []int{0}
+	return fileDescriptor_9daf43f3c5a5dc12, []int{0}
 }
+
 func (m *AdParameterErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdParameterErrorEnum.Unmarshal(m, b)
 }
 func (m *AdParameterErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdParameterErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdParameterErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdParameterErrorEnum.Merge(dst, src)
+func (m *AdParameterErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdParameterErrorEnum.Merge(m, src)
 }
 func (m *AdParameterErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdParameterErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *AdParameterErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdParameterErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdParameterErrorEnum)(nil), "google.ads.googleads.v1.errors.AdParameterErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdParameterErrorEnum_AdParameterError", AdParameterErrorEnum_AdParameterError_name, AdParameterErrorEnum_AdParameterError_value)
+	proto.RegisterType((*AdParameterErrorEnum)(nil), "google.ads.googleads.v1.errors.AdParameterErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_parameter_error.proto", fileDescriptor_ad_parameter_error_4740fd19374c0b5b)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_parameter_error.proto", fileDescriptor_9daf43f3c5a5dc12)
 }
 
-var fileDescriptor_ad_parameter_error_4740fd19374c0b5b = []byte{
+var fileDescriptor_9daf43f3c5a5dc12 = []byte{
 	// 349 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xeb, 0x40,
 	0x18, 0x85, 0x6f, 0x52, 0xb8, 0x17, 0xa6, 0x8b, 0x1b, 0x82, 0x6e, 0x44, 0x0b, 0x66, 0xe1, 0x72,
diff --git a/googleapis/ads/googleads/v1/errors/ad_sharing_error.pb.go b/googleapis/ads/googleads/v1/errors/ad_sharing_error.pb.go
index 90576b7518..e902c87221 100644
--- a/googleapis/ads/googleads/v1/errors/ad_sharing_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/ad_sharing_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/ad_sharing_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible ad sharing errors.
 type AdSharingErrorEnum_AdSharingError int32
@@ -43,6 +46,7 @@ var AdSharingErrorEnum_AdSharingError_name = map[int32]string{
 	3: "INCOMPATIBLE_AD_UNDER_AD_GROUP",
 	4: "CANNOT_SHARE_INACTIVE_AD",
 }
+
 var AdSharingErrorEnum_AdSharingError_value = map[string]int32{
 	"UNSPECIFIED":                    0,
 	"UNKNOWN":                        1,
@@ -54,8 +58,9 @@ var AdSharingErrorEnum_AdSharingError_value = map[string]int32{
 func (x AdSharingErrorEnum_AdSharingError) String() string {
 	return proto.EnumName(AdSharingErrorEnum_AdSharingError_name, int32(x))
 }
+
 func (AdSharingErrorEnum_AdSharingError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ad_sharing_error_ecb9463c83b86137, []int{0, 0}
+	return fileDescriptor_3ce66a02f96ddc3c, []int{0, 0}
 }
 
 // Container for enum describing possible ad sharing errors.
@@ -69,16 +74,17 @@ func (m *AdSharingErrorEnum) Reset()         { *m = AdSharingErrorEnum{} }
 func (m *AdSharingErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdSharingErrorEnum) ProtoMessage()    {}
 func (*AdSharingErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_sharing_error_ecb9463c83b86137, []int{0}
+	return fileDescriptor_3ce66a02f96ddc3c, []int{0}
 }
+
 func (m *AdSharingErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdSharingErrorEnum.Unmarshal(m, b)
 }
 func (m *AdSharingErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdSharingErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdSharingErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdSharingErrorEnum.Merge(dst, src)
+func (m *AdSharingErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdSharingErrorEnum.Merge(m, src)
 }
 func (m *AdSharingErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdSharingErrorEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *AdSharingErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdSharingErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdSharingErrorEnum)(nil), "google.ads.googleads.v1.errors.AdSharingErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdSharingErrorEnum_AdSharingError", AdSharingErrorEnum_AdSharingError_name, AdSharingErrorEnum_AdSharingError_value)
+	proto.RegisterType((*AdSharingErrorEnum)(nil), "google.ads.googleads.v1.errors.AdSharingErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/ad_sharing_error.proto", fileDescriptor_ad_sharing_error_ecb9463c83b86137)
+	proto.RegisterFile("google/ads/googleads/v1/errors/ad_sharing_error.proto", fileDescriptor_3ce66a02f96ddc3c)
 }
 
-var fileDescriptor_ad_sharing_error_ecb9463c83b86137 = []byte{
+var fileDescriptor_3ce66a02f96ddc3c = []byte{
 	// 360 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xdf, 0x4a, 0xe3, 0x40,
 	0x14, 0x87, 0x37, 0xe9, 0xb2, 0x0b, 0x53, 0xd8, 0x0d, 0xd9, 0x9b, 0x65, 0x29, 0x65, 0xc9, 0x03,
diff --git a/googleapis/ads/googleads/v1/errors/adx_error.pb.go b/googleapis/ads/googleads/v1/errors/adx_error.pb.go
index 82dc870865..a35ce4b764 100644
--- a/googleapis/ads/googleads/v1/errors/adx_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/adx_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/adx_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible adx errors.
 type AdxErrorEnum_AdxError int32
@@ -36,6 +39,7 @@ var AdxErrorEnum_AdxError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "UNSUPPORTED_FEATURE",
 }
+
 var AdxErrorEnum_AdxError_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -45,8 +49,9 @@ var AdxErrorEnum_AdxError_value = map[string]int32{
 func (x AdxErrorEnum_AdxError) String() string {
 	return proto.EnumName(AdxErrorEnum_AdxError_name, int32(x))
 }
+
 func (AdxErrorEnum_AdxError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_adx_error_3c0c7a571d9648a3, []int{0, 0}
+	return fileDescriptor_c9f794da03667699, []int{0, 0}
 }
 
 // Container for enum describing possible adx errors.
@@ -60,16 +65,17 @@ func (m *AdxErrorEnum) Reset()         { *m = AdxErrorEnum{} }
 func (m *AdxErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AdxErrorEnum) ProtoMessage()    {}
 func (*AdxErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_adx_error_3c0c7a571d9648a3, []int{0}
+	return fileDescriptor_c9f794da03667699, []int{0}
 }
+
 func (m *AdxErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdxErrorEnum.Unmarshal(m, b)
 }
 func (m *AdxErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdxErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AdxErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdxErrorEnum.Merge(dst, src)
+func (m *AdxErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdxErrorEnum.Merge(m, src)
 }
 func (m *AdxErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AdxErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *AdxErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AdxErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AdxErrorEnum)(nil), "google.ads.googleads.v1.errors.AdxErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AdxErrorEnum_AdxError", AdxErrorEnum_AdxError_name, AdxErrorEnum_AdxError_value)
+	proto.RegisterType((*AdxErrorEnum)(nil), "google.ads.googleads.v1.errors.AdxErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/adx_error.proto", fileDescriptor_adx_error_3c0c7a571d9648a3)
+	proto.RegisterFile("google/ads/googleads/v1/errors/adx_error.proto", fileDescriptor_c9f794da03667699)
 }
 
-var fileDescriptor_adx_error_3c0c7a571d9648a3 = []byte{
+var fileDescriptor_c9f794da03667699 = []byte{
 	// 293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xf3, 0x30,
 	0x14, 0xc7, 0xbf, 0xf6, 0x03, 0x95, 0x4c, 0xb1, 0xd4, 0x0b, 0x41, 0x64, 0x17, 0x7d, 0x80, 0x84,
diff --git a/googleapis/ads/googleads/v1/errors/asset_error.pb.go b/googleapis/ads/googleads/v1/errors/asset_error.pb.go
index 075c440ea8..c1f08b44f7 100644
--- a/googleapis/ads/googleads/v1/errors/asset_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/asset_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/asset_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible asset errors.
 type AssetErrorEnum_AssetError int32
@@ -50,6 +53,7 @@ var AssetErrorEnum_AssetError_name = map[int32]string{
 	5: "ASSET_DATA_IS_MISSING",
 	6: "CANNOT_MODIFY_ASSET_NAME",
 }
+
 var AssetErrorEnum_AssetError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -63,8 +67,9 @@ var AssetErrorEnum_AssetError_value = map[string]int32{
 func (x AssetErrorEnum_AssetError) String() string {
 	return proto.EnumName(AssetErrorEnum_AssetError_name, int32(x))
 }
+
 func (AssetErrorEnum_AssetError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_asset_error_d59e2d33636ee424, []int{0, 0}
+	return fileDescriptor_d1e46d0937f553c0, []int{0, 0}
 }
 
 // Container for enum describing possible asset errors.
@@ -78,16 +83,17 @@ func (m *AssetErrorEnum) Reset()         { *m = AssetErrorEnum{} }
 func (m *AssetErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AssetErrorEnum) ProtoMessage()    {}
 func (*AssetErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_error_d59e2d33636ee424, []int{0}
+	return fileDescriptor_d1e46d0937f553c0, []int{0}
 }
+
 func (m *AssetErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AssetErrorEnum.Unmarshal(m, b)
 }
 func (m *AssetErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AssetErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AssetErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AssetErrorEnum.Merge(dst, src)
+func (m *AssetErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssetErrorEnum.Merge(m, src)
 }
 func (m *AssetErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AssetErrorEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *AssetErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AssetErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AssetErrorEnum)(nil), "google.ads.googleads.v1.errors.AssetErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AssetErrorEnum_AssetError", AssetErrorEnum_AssetError_name, AssetErrorEnum_AssetError_value)
+	proto.RegisterType((*AssetErrorEnum)(nil), "google.ads.googleads.v1.errors.AssetErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/asset_error.proto", fileDescriptor_asset_error_d59e2d33636ee424)
+	proto.RegisterFile("google/ads/googleads/v1/errors/asset_error.proto", fileDescriptor_d1e46d0937f553c0)
 }
 
-var fileDescriptor_asset_error_d59e2d33636ee424 = []byte{
+var fileDescriptor_d1e46d0937f553c0 = []byte{
 	// 380 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x8e, 0xd3, 0x30,
 	0x10, 0x86, 0x49, 0x16, 0x16, 0xc9, 0x2b, 0xd1, 0xc8, 0x80, 0xb4, 0xa0, 0xd5, 0x1e, 0x72, 0xe1,
diff --git a/googleapis/ads/googleads/v1/errors/authentication_error.pb.go b/googleapis/ads/googleads/v1/errors/authentication_error.pb.go
index 69269247c9..d028a87464 100644
--- a/googleapis/ads/googleads/v1/errors/authentication_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/authentication_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/authentication_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible authentication errors.
 type AuthenticationErrorEnum_AuthenticationError int32
@@ -92,6 +95,7 @@ var AuthenticationErrorEnum_AuthenticationError_name = map[int32]string{
 	23: "TWO_STEP_VERIFICATION_NOT_ENROLLED",
 	24: "ADVANCED_PROTECTION_NOT_ENROLLED",
 }
+
 var AuthenticationErrorEnum_AuthenticationError_value = map[string]int32{
 	"UNSPECIFIED":                               0,
 	"UNKNOWN":                                   1,
@@ -118,8 +122,9 @@ var AuthenticationErrorEnum_AuthenticationError_value = map[string]int32{
 func (x AuthenticationErrorEnum_AuthenticationError) String() string {
 	return proto.EnumName(AuthenticationErrorEnum_AuthenticationError_name, int32(x))
 }
+
 func (AuthenticationErrorEnum_AuthenticationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_authentication_error_2d6a04c4485c2fa4, []int{0, 0}
+	return fileDescriptor_22e1e89d89e15d35, []int{0, 0}
 }
 
 // Container for enum describing possible authentication errors.
@@ -133,16 +138,17 @@ func (m *AuthenticationErrorEnum) Reset()         { *m = AuthenticationErrorEnum
 func (m *AuthenticationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AuthenticationErrorEnum) ProtoMessage()    {}
 func (*AuthenticationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_authentication_error_2d6a04c4485c2fa4, []int{0}
+	return fileDescriptor_22e1e89d89e15d35, []int{0}
 }
+
 func (m *AuthenticationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthenticationErrorEnum.Unmarshal(m, b)
 }
 func (m *AuthenticationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthenticationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AuthenticationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthenticationErrorEnum.Merge(dst, src)
+func (m *AuthenticationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthenticationErrorEnum.Merge(m, src)
 }
 func (m *AuthenticationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AuthenticationErrorEnum.Size(m)
@@ -154,15 +160,15 @@ func (m *AuthenticationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AuthenticationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AuthenticationErrorEnum)(nil), "google.ads.googleads.v1.errors.AuthenticationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AuthenticationErrorEnum_AuthenticationError", AuthenticationErrorEnum_AuthenticationError_name, AuthenticationErrorEnum_AuthenticationError_value)
+	proto.RegisterType((*AuthenticationErrorEnum)(nil), "google.ads.googleads.v1.errors.AuthenticationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/authentication_error.proto", fileDescriptor_authentication_error_2d6a04c4485c2fa4)
+	proto.RegisterFile("google/ads/googleads/v1/errors/authentication_error.proto", fileDescriptor_22e1e89d89e15d35)
 }
 
-var fileDescriptor_authentication_error_2d6a04c4485c2fa4 = []byte{
+var fileDescriptor_22e1e89d89e15d35 = []byte{
 	// 558 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0x66, 0x65, 0xfc, 0x79, 0x83, 0x19, 0x77, 0xec, 0x4f, 0x30, 0x41, 0x35, 0x21, 0xb8, 0x20,
diff --git a/googleapis/ads/googleads/v1/errors/authorization_error.pb.go b/googleapis/ads/googleads/v1/errors/authorization_error.pb.go
index 71ed08157f..260a272b4b 100644
--- a/googleapis/ads/googleads/v1/errors/authorization_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/authorization_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/authorization_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible authorization errors.
 type AuthorizationErrorEnum_AuthorizationError int32
@@ -71,6 +74,7 @@ var AuthorizationErrorEnum_AuthorizationError_name = map[int32]string{
 	9:  "MISSING_TOS",
 	10: "DEVELOPER_TOKEN_NOT_APPROVED",
 }
+
 var AuthorizationErrorEnum_AuthorizationError_value = map[string]int32{
 	"UNSPECIFIED":                     0,
 	"UNKNOWN":                         1,
@@ -89,8 +93,9 @@ var AuthorizationErrorEnum_AuthorizationError_value = map[string]int32{
 func (x AuthorizationErrorEnum_AuthorizationError) String() string {
 	return proto.EnumName(AuthorizationErrorEnum_AuthorizationError_name, int32(x))
 }
+
 func (AuthorizationErrorEnum_AuthorizationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_authorization_error_456d20243b5f6327, []int{0, 0}
+	return fileDescriptor_a8139e3547d5c236, []int{0, 0}
 }
 
 // Container for enum describing possible authorization errors.
@@ -104,16 +109,17 @@ func (m *AuthorizationErrorEnum) Reset()         { *m = AuthorizationErrorEnum{}
 func (m *AuthorizationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*AuthorizationErrorEnum) ProtoMessage()    {}
 func (*AuthorizationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_authorization_error_456d20243b5f6327, []int{0}
+	return fileDescriptor_a8139e3547d5c236, []int{0}
 }
+
 func (m *AuthorizationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthorizationErrorEnum.Unmarshal(m, b)
 }
 func (m *AuthorizationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthorizationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *AuthorizationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthorizationErrorEnum.Merge(dst, src)
+func (m *AuthorizationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthorizationErrorEnum.Merge(m, src)
 }
 func (m *AuthorizationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_AuthorizationErrorEnum.Size(m)
@@ -125,15 +131,15 @@ func (m *AuthorizationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_AuthorizationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*AuthorizationErrorEnum)(nil), "google.ads.googleads.v1.errors.AuthorizationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.AuthorizationErrorEnum_AuthorizationError", AuthorizationErrorEnum_AuthorizationError_name, AuthorizationErrorEnum_AuthorizationError_value)
+	proto.RegisterType((*AuthorizationErrorEnum)(nil), "google.ads.googleads.v1.errors.AuthorizationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/authorization_error.proto", fileDescriptor_authorization_error_456d20243b5f6327)
+	proto.RegisterFile("google/ads/googleads/v1/errors/authorization_error.proto", fileDescriptor_a8139e3547d5c236)
 }
 
-var fileDescriptor_authorization_error_456d20243b5f6327 = []byte{
+var fileDescriptor_a8139e3547d5c236 = []byte{
 	// 462 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x6e, 0xd3, 0x30,
 	0x18, 0xc7, 0x69, 0x06, 0x1b, 0x78, 0x07, 0x82, 0x19, 0xdb, 0x54, 0x4d, 0x05, 0x95, 0x7b, 0xa2,
diff --git a/googleapis/ads/googleads/v1/errors/bidding_error.pb.go b/googleapis/ads/googleads/v1/errors/bidding_error.pb.go
index 947053da8e..53a4147a46 100644
--- a/googleapis/ads/googleads/v1/errors/bidding_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/bidding_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/bidding_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible bidding errors.
 type BiddingErrorEnum_BiddingError int32
@@ -104,6 +107,7 @@ var BiddingErrorEnum_BiddingError_name = map[int32]string{
 	34: "NOT_COMPATIBLE_WITH_PAYMENT_MODE",
 	35: "NOT_COMPATIBLE_WITH_BUDGET_TYPE",
 }
+
 var BiddingErrorEnum_BiddingError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -134,8 +138,9 @@ var BiddingErrorEnum_BiddingError_value = map[string]int32{
 func (x BiddingErrorEnum_BiddingError) String() string {
 	return proto.EnumName(BiddingErrorEnum_BiddingError_name, int32(x))
 }
+
 func (BiddingErrorEnum_BiddingError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_error_0777b280f66560dd, []int{0, 0}
+	return fileDescriptor_a54920be9d4893fa, []int{0, 0}
 }
 
 // Container for enum describing possible bidding errors.
@@ -149,16 +154,17 @@ func (m *BiddingErrorEnum) Reset()         { *m = BiddingErrorEnum{} }
 func (m *BiddingErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*BiddingErrorEnum) ProtoMessage()    {}
 func (*BiddingErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_error_0777b280f66560dd, []int{0}
+	return fileDescriptor_a54920be9d4893fa, []int{0}
 }
+
 func (m *BiddingErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BiddingErrorEnum.Unmarshal(m, b)
 }
 func (m *BiddingErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BiddingErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *BiddingErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BiddingErrorEnum.Merge(dst, src)
+func (m *BiddingErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BiddingErrorEnum.Merge(m, src)
 }
 func (m *BiddingErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_BiddingErrorEnum.Size(m)
@@ -170,15 +176,15 @@ func (m *BiddingErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BiddingErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BiddingErrorEnum)(nil), "google.ads.googleads.v1.errors.BiddingErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.BiddingErrorEnum_BiddingError", BiddingErrorEnum_BiddingError_name, BiddingErrorEnum_BiddingError_value)
+	proto.RegisterType((*BiddingErrorEnum)(nil), "google.ads.googleads.v1.errors.BiddingErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/bidding_error.proto", fileDescriptor_bidding_error_0777b280f66560dd)
+	proto.RegisterFile("google/ads/googleads/v1/errors/bidding_error.proto", fileDescriptor_a54920be9d4893fa)
 }
 
-var fileDescriptor_bidding_error_0777b280f66560dd = []byte{
+var fileDescriptor_a54920be9d4893fa = []byte{
 	// 729 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xed, 0x8e, 0xe3, 0x34,
 	0x14, 0x65, 0x8a, 0xc4, 0x20, 0x2f, 0x1f, 0x1e, 0x2f, 0xb0, 0x30, 0xec, 0x76, 0x77, 0xbb, 0x48,
diff --git a/googleapis/ads/googleads/v1/errors/bidding_strategy_error.pb.go b/googleapis/ads/googleads/v1/errors/bidding_strategy_error.pb.go
index 69cc1296c2..e9816b84dc 100644
--- a/googleapis/ads/googleads/v1/errors/bidding_strategy_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/bidding_strategy_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/bidding_strategy_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible bidding strategy errors.
 type BiddingStrategyErrorEnum_BiddingStrategyError int32
@@ -50,6 +53,7 @@ var BiddingStrategyErrorEnum_BiddingStrategyError_name = map[int32]string{
 	5: "BIDDING_STRATEGY_NOT_SUPPORTED",
 	6: "INCOMPATIBLE_BIDDING_STRATEGY_AND_BIDDING_STRATEGY_GOAL_TYPE",
 }
+
 var BiddingStrategyErrorEnum_BiddingStrategyError_value = map[string]int32{
 	"UNSPECIFIED":                         0,
 	"UNKNOWN":                             1,
@@ -63,8 +67,9 @@ var BiddingStrategyErrorEnum_BiddingStrategyError_value = map[string]int32{
 func (x BiddingStrategyErrorEnum_BiddingStrategyError) String() string {
 	return proto.EnumName(BiddingStrategyErrorEnum_BiddingStrategyError_name, int32(x))
 }
+
 func (BiddingStrategyErrorEnum_BiddingStrategyError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_error_3abccb3fafd9c38d, []int{0, 0}
+	return fileDescriptor_4903c61cc975ddf7, []int{0, 0}
 }
 
 // Container for enum describing possible bidding strategy errors.
@@ -78,16 +83,17 @@ func (m *BiddingStrategyErrorEnum) Reset()         { *m = BiddingStrategyErrorEn
 func (m *BiddingStrategyErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*BiddingStrategyErrorEnum) ProtoMessage()    {}
 func (*BiddingStrategyErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_error_3abccb3fafd9c38d, []int{0}
+	return fileDescriptor_4903c61cc975ddf7, []int{0}
 }
+
 func (m *BiddingStrategyErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BiddingStrategyErrorEnum.Unmarshal(m, b)
 }
 func (m *BiddingStrategyErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BiddingStrategyErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *BiddingStrategyErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BiddingStrategyErrorEnum.Merge(dst, src)
+func (m *BiddingStrategyErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BiddingStrategyErrorEnum.Merge(m, src)
 }
 func (m *BiddingStrategyErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_BiddingStrategyErrorEnum.Size(m)
@@ -99,15 +105,15 @@ func (m *BiddingStrategyErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BiddingStrategyErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BiddingStrategyErrorEnum)(nil), "google.ads.googleads.v1.errors.BiddingStrategyErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.BiddingStrategyErrorEnum_BiddingStrategyError", BiddingStrategyErrorEnum_BiddingStrategyError_name, BiddingStrategyErrorEnum_BiddingStrategyError_value)
+	proto.RegisterType((*BiddingStrategyErrorEnum)(nil), "google.ads.googleads.v1.errors.BiddingStrategyErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/bidding_strategy_error.proto", fileDescriptor_bidding_strategy_error_3abccb3fafd9c38d)
+	proto.RegisterFile("google/ads/googleads/v1/errors/bidding_strategy_error.proto", fileDescriptor_4903c61cc975ddf7)
 }
 
-var fileDescriptor_bidding_strategy_error_3abccb3fafd9c38d = []byte{
+var fileDescriptor_4903c61cc975ddf7 = []byte{
 	// 408 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x8b, 0xd4, 0x30,
 	0x1c, 0xc5, 0x9d, 0xae, 0xae, 0x90, 0x05, 0x2d, 0xc1, 0x83, 0x8a, 0x0c, 0x58, 0x11, 0x6f, 0x29,
diff --git a/googleapis/ads/googleads/v1/errors/billing_setup_error.pb.go b/googleapis/ads/googleads/v1/errors/billing_setup_error.pb.go
index 4b3eb50f84..e4636b08f6 100644
--- a/googleapis/ads/googleads/v1/errors/billing_setup_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/billing_setup_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/billing_setup_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible billing setup errors.
 type BillingSetupErrorEnum_BillingSetupError int32
@@ -90,6 +93,7 @@ var BillingSetupErrorEnum_BillingSetupError_name = map[int32]string{
 	15: "PAYMENTS_PROFILE_INELIGIBLE",
 	16: "PAYMENTS_ACCOUNT_INELIGIBLE",
 }
+
 var BillingSetupErrorEnum_BillingSetupError_value = map[string]int32{
 	"UNSPECIFIED":                                       0,
 	"UNKNOWN":                                           1,
@@ -113,8 +117,9 @@ var BillingSetupErrorEnum_BillingSetupError_value = map[string]int32{
 func (x BillingSetupErrorEnum_BillingSetupError) String() string {
 	return proto.EnumName(BillingSetupErrorEnum_BillingSetupError_name, int32(x))
 }
+
 func (BillingSetupErrorEnum_BillingSetupError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_error_67fc3dcc859d5bc8, []int{0, 0}
+	return fileDescriptor_be69d6086d69218d, []int{0, 0}
 }
 
 // Container for enum describing possible billing setup errors.
@@ -128,16 +133,17 @@ func (m *BillingSetupErrorEnum) Reset()         { *m = BillingSetupErrorEnum{} }
 func (m *BillingSetupErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*BillingSetupErrorEnum) ProtoMessage()    {}
 func (*BillingSetupErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_error_67fc3dcc859d5bc8, []int{0}
+	return fileDescriptor_be69d6086d69218d, []int{0}
 }
+
 func (m *BillingSetupErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BillingSetupErrorEnum.Unmarshal(m, b)
 }
 func (m *BillingSetupErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BillingSetupErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *BillingSetupErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BillingSetupErrorEnum.Merge(dst, src)
+func (m *BillingSetupErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BillingSetupErrorEnum.Merge(m, src)
 }
 func (m *BillingSetupErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_BillingSetupErrorEnum.Size(m)
@@ -149,15 +155,15 @@ func (m *BillingSetupErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_BillingSetupErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*BillingSetupErrorEnum)(nil), "google.ads.googleads.v1.errors.BillingSetupErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.BillingSetupErrorEnum_BillingSetupError", BillingSetupErrorEnum_BillingSetupError_name, BillingSetupErrorEnum_BillingSetupError_value)
+	proto.RegisterType((*BillingSetupErrorEnum)(nil), "google.ads.googleads.v1.errors.BillingSetupErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/billing_setup_error.proto", fileDescriptor_billing_setup_error_67fc3dcc859d5bc8)
+	proto.RegisterFile("google/ads/googleads/v1/errors/billing_setup_error.proto", fileDescriptor_be69d6086d69218d)
 }
 
-var fileDescriptor_billing_setup_error_67fc3dcc859d5bc8 = []byte{
+var fileDescriptor_be69d6086d69218d = []byte{
 	// 568 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0x59, 0x37, 0x36, 0xf0, 0x80, 0x19, 0x8b, 0x1f, 0x63, 0x3f, 0x45, 0x77, 0xe0, 0x96,
diff --git a/googleapis/ads/googleads/v1/errors/campaign_budget_error.pb.go b/googleapis/ads/googleads/v1/errors/campaign_budget_error.pb.go
index b07b2bf93c..633873ef3a 100644
--- a/googleapis/ads/googleads/v1/errors/campaign_budget_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/campaign_budget_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/campaign_budget_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible campaign budget errors.
 type CampaignBudgetErrorEnum_CampaignBudgetError int32
@@ -83,6 +86,7 @@ var CampaignBudgetErrorEnum_CampaignBudgetError_name = map[int32]string{
 	15: "NEGATIVE_MONEY_AMOUNT",
 	16: "NON_MULTIPLE_OF_MINIMUM_CURRENCY_UNIT",
 }
+
 var CampaignBudgetErrorEnum_CampaignBudgetError_value = map[string]int32{
 	"UNSPECIFIED":                          0,
 	"UNKNOWN":                              1,
@@ -106,8 +110,9 @@ var CampaignBudgetErrorEnum_CampaignBudgetError_value = map[string]int32{
 func (x CampaignBudgetErrorEnum_CampaignBudgetError) String() string {
 	return proto.EnumName(CampaignBudgetErrorEnum_CampaignBudgetError_name, int32(x))
 }
+
 func (CampaignBudgetErrorEnum_CampaignBudgetError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_error_18e5e7124b214724, []int{0, 0}
+	return fileDescriptor_c441af0a1cb3d01f, []int{0, 0}
 }
 
 // Container for enum describing possible campaign budget errors.
@@ -121,16 +126,17 @@ func (m *CampaignBudgetErrorEnum) Reset()         { *m = CampaignBudgetErrorEnum
 func (m *CampaignBudgetErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignBudgetErrorEnum) ProtoMessage()    {}
 func (*CampaignBudgetErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_error_18e5e7124b214724, []int{0}
+	return fileDescriptor_c441af0a1cb3d01f, []int{0}
 }
+
 func (m *CampaignBudgetErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignBudgetErrorEnum.Unmarshal(m, b)
 }
 func (m *CampaignBudgetErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignBudgetErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignBudgetErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignBudgetErrorEnum.Merge(dst, src)
+func (m *CampaignBudgetErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignBudgetErrorEnum.Merge(m, src)
 }
 func (m *CampaignBudgetErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignBudgetErrorEnum.Size(m)
@@ -142,15 +148,15 @@ func (m *CampaignBudgetErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignBudgetErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignBudgetErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignBudgetErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CampaignBudgetErrorEnum_CampaignBudgetError", CampaignBudgetErrorEnum_CampaignBudgetError_name, CampaignBudgetErrorEnum_CampaignBudgetError_value)
+	proto.RegisterType((*CampaignBudgetErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignBudgetErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_budget_error.proto", fileDescriptor_campaign_budget_error_18e5e7124b214724)
+	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_budget_error.proto", fileDescriptor_c441af0a1cb3d01f)
 }
 
-var fileDescriptor_campaign_budget_error_18e5e7124b214724 = []byte{
+var fileDescriptor_c441af0a1cb3d01f = []byte{
 	// 582 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6a, 0xd4, 0x4c,
 	0x18, 0xc6, 0xbf, 0x6e, 0xbf, 0xb6, 0x3a, 0xd5, 0x76, 0x1c, 0xd1, 0x6a, 0x95, 0x22, 0x4b, 0x05,
diff --git a/googleapis/ads/googleads/v1/errors/campaign_criterion_error.pb.go b/googleapis/ads/googleads/v1/errors/campaign_criterion_error.pb.go
index f9cca639f1..2b42114d61 100644
--- a/googleapis/ads/googleads/v1/errors/campaign_criterion_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/campaign_criterion_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/campaign_criterion_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible campaign criterion errors.
 type CampaignCriterionErrorEnum_CampaignCriterionError int32
@@ -70,6 +73,7 @@ var CampaignCriterionErrorEnum_CampaignCriterionError_name = map[int32]string{
 	11: "CANNOT_ADD_EXISTING_FIELD",
 	12: "CANNOT_UPDATE_NEGATIVE_CRITERION",
 }
+
 var CampaignCriterionErrorEnum_CampaignCriterionError_value = map[string]int32{
 	"UNSPECIFIED":                               0,
 	"UNKNOWN":                                   1,
@@ -89,8 +93,9 @@ var CampaignCriterionErrorEnum_CampaignCriterionError_value = map[string]int32{
 func (x CampaignCriterionErrorEnum_CampaignCriterionError) String() string {
 	return proto.EnumName(CampaignCriterionErrorEnum_CampaignCriterionError_name, int32(x))
 }
+
 func (CampaignCriterionErrorEnum_CampaignCriterionError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_error_d8b84e8d646e37a2, []int{0, 0}
+	return fileDescriptor_3abd0050e308ff58, []int{0, 0}
 }
 
 // Container for enum describing possible campaign criterion errors.
@@ -104,16 +109,17 @@ func (m *CampaignCriterionErrorEnum) Reset()         { *m = CampaignCriterionErr
 func (m *CampaignCriterionErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignCriterionErrorEnum) ProtoMessage()    {}
 func (*CampaignCriterionErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_error_d8b84e8d646e37a2, []int{0}
+	return fileDescriptor_3abd0050e308ff58, []int{0}
 }
+
 func (m *CampaignCriterionErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignCriterionErrorEnum.Unmarshal(m, b)
 }
 func (m *CampaignCriterionErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignCriterionErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignCriterionErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignCriterionErrorEnum.Merge(dst, src)
+func (m *CampaignCriterionErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignCriterionErrorEnum.Merge(m, src)
 }
 func (m *CampaignCriterionErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignCriterionErrorEnum.Size(m)
@@ -125,15 +131,15 @@ func (m *CampaignCriterionErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignCriterionErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignCriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignCriterionErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CampaignCriterionErrorEnum_CampaignCriterionError", CampaignCriterionErrorEnum_CampaignCriterionError_name, CampaignCriterionErrorEnum_CampaignCriterionError_value)
+	proto.RegisterType((*CampaignCriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignCriterionErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_criterion_error.proto", fileDescriptor_campaign_criterion_error_d8b84e8d646e37a2)
+	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_criterion_error.proto", fileDescriptor_3abd0050e308ff58)
 }
 
-var fileDescriptor_campaign_criterion_error_d8b84e8d646e37a2 = []byte{
+var fileDescriptor_3abd0050e308ff58 = []byte{
 	// 526 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6a, 0xd4, 0x40,
 	0x14, 0x86, 0xed, 0xae, 0xb6, 0x3a, 0x15, 0x0c, 0x23, 0x56, 0x5a, 0x6b, 0x29, 0xab, 0x50, 0x44,
diff --git a/googleapis/ads/googleads/v1/errors/campaign_error.pb.go b/googleapis/ads/googleads/v1/errors/campaign_error.pb.go
index 074179ffe9..ee50509849 100644
--- a/googleapis/ads/googleads/v1/errors/campaign_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/campaign_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/campaign_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible campaign errors.
 type CampaignErrorEnum_CampaignError int32
@@ -156,6 +159,7 @@ var CampaignErrorEnum_CampaignError_name = map[int32]string{
 	40: "CANNOT_USE_SHARED_CAMPAIGN_BUDGET_WHILE_PART_OF_CAMPAIGN_GROUP",
 	41: "APP_NOT_FOUND",
 }
+
 var CampaignErrorEnum_CampaignError_value = map[string]int32{
 	"UNSPECIFIED":                   0,
 	"UNKNOWN":                       1,
@@ -201,8 +205,9 @@ var CampaignErrorEnum_CampaignError_value = map[string]int32{
 func (x CampaignErrorEnum_CampaignError) String() string {
 	return proto.EnumName(CampaignErrorEnum_CampaignError_name, int32(x))
 }
+
 func (CampaignErrorEnum_CampaignError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_error_1caad62f8629dd50, []int{0, 0}
+	return fileDescriptor_7f177f8ec60df265, []int{0, 0}
 }
 
 // Container for enum describing possible campaign errors.
@@ -216,16 +221,17 @@ func (m *CampaignErrorEnum) Reset()         { *m = CampaignErrorEnum{} }
 func (m *CampaignErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignErrorEnum) ProtoMessage()    {}
 func (*CampaignErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_error_1caad62f8629dd50, []int{0}
+	return fileDescriptor_7f177f8ec60df265, []int{0}
 }
+
 func (m *CampaignErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignErrorEnum.Unmarshal(m, b)
 }
 func (m *CampaignErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignErrorEnum.Merge(dst, src)
+func (m *CampaignErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignErrorEnum.Merge(m, src)
 }
 func (m *CampaignErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignErrorEnum.Size(m)
@@ -237,15 +243,15 @@ func (m *CampaignErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CampaignErrorEnum_CampaignError", CampaignErrorEnum_CampaignError_name, CampaignErrorEnum_CampaignError_value)
+	proto.RegisterType((*CampaignErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_error.proto", fileDescriptor_campaign_error_1caad62f8629dd50)
+	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_error.proto", fileDescriptor_7f177f8ec60df265)
 }
 
-var fileDescriptor_campaign_error_1caad62f8629dd50 = []byte{
+var fileDescriptor_7f177f8ec60df265 = []byte{
 	// 990 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0xff, 0x6e, 0x1b, 0x45,
 	0x10, 0x26, 0x29, 0xb4, 0xb0, 0x49, 0xe8, 0x66, 0x69, 0x69, 0xda, 0x84, 0x34, 0x31, 0x69, 0x49,
diff --git a/googleapis/ads/googleads/v1/errors/campaign_feed_error.pb.go b/googleapis/ads/googleads/v1/errors/campaign_feed_error.pb.go
index 75cf34e8fe..d4201a2497 100644
--- a/googleapis/ads/googleads/v1/errors/campaign_feed_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/campaign_feed_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/campaign_feed_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible campaign feed errors.
 type CampaignFeedErrorEnum_CampaignFeedError int32
@@ -52,6 +55,7 @@ var CampaignFeedErrorEnum_CampaignFeedError_name = map[int32]string{
 	7: "INVALID_PLACEHOLDER_TYPE",
 	8: "MISSING_FEEDMAPPING_FOR_PLACEHOLDER_TYPE",
 }
+
 var CampaignFeedErrorEnum_CampaignFeedError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -66,8 +70,9 @@ var CampaignFeedErrorEnum_CampaignFeedError_value = map[string]int32{
 func (x CampaignFeedErrorEnum_CampaignFeedError) String() string {
 	return proto.EnumName(CampaignFeedErrorEnum_CampaignFeedError_name, int32(x))
 }
+
 func (CampaignFeedErrorEnum_CampaignFeedError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_error_0aa2b696cc3972eb, []int{0, 0}
+	return fileDescriptor_75d91332b6012d3f, []int{0, 0}
 }
 
 // Container for enum describing possible campaign feed errors.
@@ -81,16 +86,17 @@ func (m *CampaignFeedErrorEnum) Reset()         { *m = CampaignFeedErrorEnum{} }
 func (m *CampaignFeedErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignFeedErrorEnum) ProtoMessage()    {}
 func (*CampaignFeedErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_error_0aa2b696cc3972eb, []int{0}
+	return fileDescriptor_75d91332b6012d3f, []int{0}
 }
+
 func (m *CampaignFeedErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignFeedErrorEnum.Unmarshal(m, b)
 }
 func (m *CampaignFeedErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignFeedErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignFeedErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignFeedErrorEnum.Merge(dst, src)
+func (m *CampaignFeedErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignFeedErrorEnum.Merge(m, src)
 }
 func (m *CampaignFeedErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignFeedErrorEnum.Size(m)
@@ -102,15 +108,15 @@ func (m *CampaignFeedErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignFeedErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignFeedErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignFeedErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CampaignFeedErrorEnum_CampaignFeedError", CampaignFeedErrorEnum_CampaignFeedError_name, CampaignFeedErrorEnum_CampaignFeedError_value)
+	proto.RegisterType((*CampaignFeedErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignFeedErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_feed_error.proto", fileDescriptor_campaign_feed_error_0aa2b696cc3972eb)
+	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_feed_error.proto", fileDescriptor_75d91332b6012d3f)
 }
 
-var fileDescriptor_campaign_feed_error_0aa2b696cc3972eb = []byte{
+var fileDescriptor_75d91332b6012d3f = []byte{
 	// 423 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x8e, 0xd3, 0x30,
 	0x14, 0x86, 0x69, 0x80, 0x19, 0xe4, 0x59, 0x50, 0x2c, 0x81, 0x10, 0x1a, 0x75, 0x11, 0x16, 0xb0,
diff --git a/googleapis/ads/googleads/v1/errors/campaign_shared_set_error.pb.go b/googleapis/ads/googleads/v1/errors/campaign_shared_set_error.pb.go
index 4cb3f7b34d..f4f5a318fb 100644
--- a/googleapis/ads/googleads/v1/errors/campaign_shared_set_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/campaign_shared_set_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/campaign_shared_set_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible campaign shared set errors.
 type CampaignSharedSetErrorEnum_CampaignSharedSetError int32
@@ -36,6 +39,7 @@ var CampaignSharedSetErrorEnum_CampaignSharedSetError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "SHARED_SET_ACCESS_DENIED",
 }
+
 var CampaignSharedSetErrorEnum_CampaignSharedSetError_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -45,8 +49,9 @@ var CampaignSharedSetErrorEnum_CampaignSharedSetError_value = map[string]int32{
 func (x CampaignSharedSetErrorEnum_CampaignSharedSetError) String() string {
 	return proto.EnumName(CampaignSharedSetErrorEnum_CampaignSharedSetError_name, int32(x))
 }
+
 func (CampaignSharedSetErrorEnum_CampaignSharedSetError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_error_cec87191eef93255, []int{0, 0}
+	return fileDescriptor_1900787c3ad45cb6, []int{0, 0}
 }
 
 // Container for enum describing possible campaign shared set errors.
@@ -60,16 +65,17 @@ func (m *CampaignSharedSetErrorEnum) Reset()         { *m = CampaignSharedSetErr
 func (m *CampaignSharedSetErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CampaignSharedSetErrorEnum) ProtoMessage()    {}
 func (*CampaignSharedSetErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_error_cec87191eef93255, []int{0}
+	return fileDescriptor_1900787c3ad45cb6, []int{0}
 }
+
 func (m *CampaignSharedSetErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignSharedSetErrorEnum.Unmarshal(m, b)
 }
 func (m *CampaignSharedSetErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignSharedSetErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CampaignSharedSetErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignSharedSetErrorEnum.Merge(dst, src)
+func (m *CampaignSharedSetErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignSharedSetErrorEnum.Merge(m, src)
 }
 func (m *CampaignSharedSetErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CampaignSharedSetErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *CampaignSharedSetErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CampaignSharedSetErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CampaignSharedSetErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignSharedSetErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CampaignSharedSetErrorEnum_CampaignSharedSetError", CampaignSharedSetErrorEnum_CampaignSharedSetError_name, CampaignSharedSetErrorEnum_CampaignSharedSetError_value)
+	proto.RegisterType((*CampaignSharedSetErrorEnum)(nil), "google.ads.googleads.v1.errors.CampaignSharedSetErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_shared_set_error.proto", fileDescriptor_campaign_shared_set_error_cec87191eef93255)
+	proto.RegisterFile("google/ads/googleads/v1/errors/campaign_shared_set_error.proto", fileDescriptor_1900787c3ad45cb6)
 }
 
-var fileDescriptor_campaign_shared_set_error_cec87191eef93255 = []byte{
+var fileDescriptor_1900787c3ad45cb6 = []byte{
 	// 315 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xf3, 0x30,
 	0x14, 0xc7, 0xbf, 0xf5, 0x03, 0x85, 0xec, 0xc2, 0xd1, 0x0b, 0x91, 0x39, 0x76, 0xd1, 0x07, 0x48,
diff --git a/googleapis/ads/googleads/v1/errors/change_status_error.pb.go b/googleapis/ads/googleads/v1/errors/change_status_error.pb.go
index e2b1b0a8ea..53dd6755ca 100644
--- a/googleapis/ads/googleads/v1/errors/change_status_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/change_status_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/change_status_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible change status errors.
 type ChangeStatusErrorEnum_ChangeStatusError int32
@@ -36,6 +39,7 @@ var ChangeStatusErrorEnum_ChangeStatusError_name = map[int32]string{
 	1: "UNKNOWN",
 	3: "START_DATE_TOO_OLD",
 }
+
 var ChangeStatusErrorEnum_ChangeStatusError_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"UNKNOWN":            1,
@@ -45,8 +49,9 @@ var ChangeStatusErrorEnum_ChangeStatusError_value = map[string]int32{
 func (x ChangeStatusErrorEnum_ChangeStatusError) String() string {
 	return proto.EnumName(ChangeStatusErrorEnum_ChangeStatusError_name, int32(x))
 }
+
 func (ChangeStatusErrorEnum_ChangeStatusError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_error_dcadad2fbec236b5, []int{0, 0}
+	return fileDescriptor_a7c28c4196dfc2bd, []int{0, 0}
 }
 
 // Container for enum describing possible change status errors.
@@ -60,16 +65,17 @@ func (m *ChangeStatusErrorEnum) Reset()         { *m = ChangeStatusErrorEnum{} }
 func (m *ChangeStatusErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ChangeStatusErrorEnum) ProtoMessage()    {}
 func (*ChangeStatusErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_error_dcadad2fbec236b5, []int{0}
+	return fileDescriptor_a7c28c4196dfc2bd, []int{0}
 }
+
 func (m *ChangeStatusErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChangeStatusErrorEnum.Unmarshal(m, b)
 }
 func (m *ChangeStatusErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChangeStatusErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ChangeStatusErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChangeStatusErrorEnum.Merge(dst, src)
+func (m *ChangeStatusErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeStatusErrorEnum.Merge(m, src)
 }
 func (m *ChangeStatusErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ChangeStatusErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *ChangeStatusErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ChangeStatusErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ChangeStatusErrorEnum)(nil), "google.ads.googleads.v1.errors.ChangeStatusErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ChangeStatusErrorEnum_ChangeStatusError", ChangeStatusErrorEnum_ChangeStatusError_name, ChangeStatusErrorEnum_ChangeStatusError_value)
+	proto.RegisterType((*ChangeStatusErrorEnum)(nil), "google.ads.googleads.v1.errors.ChangeStatusErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/change_status_error.proto", fileDescriptor_change_status_error_dcadad2fbec236b5)
+	proto.RegisterFile("google/ads/googleads/v1/errors/change_status_error.proto", fileDescriptor_a7c28c4196dfc2bd)
 }
 
-var fileDescriptor_change_status_error_dcadad2fbec236b5 = []byte{
+var fileDescriptor_a7c28c4196dfc2bd = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x6a, 0xb3, 0x40,
 	0x14, 0x85, 0x7f, 0x0d, 0xfc, 0x85, 0xc9, 0xa2, 0x56, 0x68, 0x16, 0xa5, 0x64, 0xe1, 0x03, 0xcc,
diff --git a/googleapis/ads/googleads/v1/errors/collection_size_error.pb.go b/googleapis/ads/googleads/v1/errors/collection_size_error.pb.go
index 87529b14e4..79f4787ddf 100644
--- a/googleapis/ads/googleads/v1/errors/collection_size_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/collection_size_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/collection_size_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible collection size errors.
 type CollectionSizeErrorEnum_CollectionSizeError int32
@@ -39,6 +42,7 @@ var CollectionSizeErrorEnum_CollectionSizeError_name = map[int32]string{
 	2: "TOO_FEW",
 	3: "TOO_MANY",
 }
+
 var CollectionSizeErrorEnum_CollectionSizeError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var CollectionSizeErrorEnum_CollectionSizeError_value = map[string]int32{
 func (x CollectionSizeErrorEnum_CollectionSizeError) String() string {
 	return proto.EnumName(CollectionSizeErrorEnum_CollectionSizeError_name, int32(x))
 }
+
 func (CollectionSizeErrorEnum_CollectionSizeError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_collection_size_error_e5383bdfcaf040c2, []int{0, 0}
+	return fileDescriptor_a923d8c0ba17afcb, []int{0, 0}
 }
 
 // Container for enum describing possible collection size errors.
@@ -64,16 +69,17 @@ func (m *CollectionSizeErrorEnum) Reset()         { *m = CollectionSizeErrorEnum
 func (m *CollectionSizeErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CollectionSizeErrorEnum) ProtoMessage()    {}
 func (*CollectionSizeErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_collection_size_error_e5383bdfcaf040c2, []int{0}
+	return fileDescriptor_a923d8c0ba17afcb, []int{0}
 }
+
 func (m *CollectionSizeErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollectionSizeErrorEnum.Unmarshal(m, b)
 }
 func (m *CollectionSizeErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollectionSizeErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CollectionSizeErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollectionSizeErrorEnum.Merge(dst, src)
+func (m *CollectionSizeErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollectionSizeErrorEnum.Merge(m, src)
 }
 func (m *CollectionSizeErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CollectionSizeErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *CollectionSizeErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CollectionSizeErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CollectionSizeErrorEnum)(nil), "google.ads.googleads.v1.errors.CollectionSizeErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CollectionSizeErrorEnum_CollectionSizeError", CollectionSizeErrorEnum_CollectionSizeError_name, CollectionSizeErrorEnum_CollectionSizeError_value)
+	proto.RegisterType((*CollectionSizeErrorEnum)(nil), "google.ads.googleads.v1.errors.CollectionSizeErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/collection_size_error.proto", fileDescriptor_collection_size_error_e5383bdfcaf040c2)
+	proto.RegisterFile("google/ads/googleads/v1/errors/collection_size_error.proto", fileDescriptor_a923d8c0ba17afcb)
 }
 
-var fileDescriptor_collection_size_error_e5383bdfcaf040c2 = []byte{
+var fileDescriptor_a923d8c0ba17afcb = []byte{
 	// 308 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xd4, 0xa2,
diff --git a/googleapis/ads/googleads/v1/errors/context_error.pb.go b/googleapis/ads/googleads/v1/errors/context_error.pb.go
index caabf2db1b..5ef04b016e 100644
--- a/googleapis/ads/googleads/v1/errors/context_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/context_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/context_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible context errors.
 type ContextErrorEnum_ContextError int32
@@ -39,6 +42,7 @@ var ContextErrorEnum_ContextError_name = map[int32]string{
 	2: "OPERATION_NOT_PERMITTED_FOR_CONTEXT",
 	3: "OPERATION_NOT_PERMITTED_FOR_REMOVED_RESOURCE",
 }
+
 var ContextErrorEnum_ContextError_value = map[string]int32{
 	"UNSPECIFIED":                         0,
 	"UNKNOWN":                             1,
@@ -49,8 +53,9 @@ var ContextErrorEnum_ContextError_value = map[string]int32{
 func (x ContextErrorEnum_ContextError) String() string {
 	return proto.EnumName(ContextErrorEnum_ContextError_name, int32(x))
 }
+
 func (ContextErrorEnum_ContextError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_context_error_889c9ab3b358b3b5, []int{0, 0}
+	return fileDescriptor_b5179db1d8bb3be8, []int{0, 0}
 }
 
 // Container for enum describing possible context errors.
@@ -64,16 +69,17 @@ func (m *ContextErrorEnum) Reset()         { *m = ContextErrorEnum{} }
 func (m *ContextErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ContextErrorEnum) ProtoMessage()    {}
 func (*ContextErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_error_889c9ab3b358b3b5, []int{0}
+	return fileDescriptor_b5179db1d8bb3be8, []int{0}
 }
+
 func (m *ContextErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContextErrorEnum.Unmarshal(m, b)
 }
 func (m *ContextErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContextErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ContextErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContextErrorEnum.Merge(dst, src)
+func (m *ContextErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContextErrorEnum.Merge(m, src)
 }
 func (m *ContextErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ContextErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *ContextErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ContextErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ContextErrorEnum)(nil), "google.ads.googleads.v1.errors.ContextErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ContextErrorEnum_ContextError", ContextErrorEnum_ContextError_name, ContextErrorEnum_ContextError_value)
+	proto.RegisterType((*ContextErrorEnum)(nil), "google.ads.googleads.v1.errors.ContextErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/context_error.proto", fileDescriptor_context_error_889c9ab3b358b3b5)
+	proto.RegisterFile("google/ads/googleads/v1/errors/context_error.proto", fileDescriptor_b5179db1d8bb3be8)
 }
 
-var fileDescriptor_context_error_889c9ab3b358b3b5 = []byte{
+var fileDescriptor_b5179db1d8bb3be8 = []byte{
 	// 335 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4a, 0xc3, 0x40,
 	0x18, 0x85, 0x4d, 0x0a, 0x0a, 0x53, 0xc1, 0x98, 0xa5, 0x48, 0x17, 0x71, 0xe1, 0x46, 0x26, 0x46,
diff --git a/googleapis/ads/googleads/v1/errors/conversion_action_error.pb.go b/googleapis/ads/googleads/v1/errors/conversion_action_error.pb.go
index d35a7fc584..b6f90dd285 100644
--- a/googleapis/ads/googleads/v1/errors/conversion_action_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/conversion_action_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/conversion_action_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible conversion action errors.
 type ConversionActionErrorEnum_ConversionActionError int32
@@ -64,6 +67,7 @@ var ConversionActionErrorEnum_ConversionActionError_name = map[int32]string{
 	8: "DATA_DRIVEN_MODEL_STALE",
 	9: "DATA_DRIVEN_MODEL_UNKNOWN",
 }
+
 var ConversionActionErrorEnum_ConversionActionError_value = map[string]int32{
 	"UNSPECIFIED":      0,
 	"UNKNOWN":          1,
@@ -80,8 +84,9 @@ var ConversionActionErrorEnum_ConversionActionError_value = map[string]int32{
 func (x ConversionActionErrorEnum_ConversionActionError) String() string {
 	return proto.EnumName(ConversionActionErrorEnum_ConversionActionError_name, int32(x))
 }
+
 func (ConversionActionErrorEnum_ConversionActionError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_error_ba5f46d45d84a23e, []int{0, 0}
+	return fileDescriptor_6c8902b8343b0907, []int{0, 0}
 }
 
 // Container for enum describing possible conversion action errors.
@@ -95,16 +100,17 @@ func (m *ConversionActionErrorEnum) Reset()         { *m = ConversionActionError
 func (m *ConversionActionErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionActionErrorEnum) ProtoMessage()    {}
 func (*ConversionActionErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_error_ba5f46d45d84a23e, []int{0}
+	return fileDescriptor_6c8902b8343b0907, []int{0}
 }
+
 func (m *ConversionActionErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionActionErrorEnum.Unmarshal(m, b)
 }
 func (m *ConversionActionErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionActionErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionActionErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionActionErrorEnum.Merge(dst, src)
+func (m *ConversionActionErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionActionErrorEnum.Merge(m, src)
 }
 func (m *ConversionActionErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionActionErrorEnum.Size(m)
@@ -116,15 +122,15 @@ func (m *ConversionActionErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionActionErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionActionErrorEnum)(nil), "google.ads.googleads.v1.errors.ConversionActionErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ConversionActionErrorEnum_ConversionActionError", ConversionActionErrorEnum_ConversionActionError_name, ConversionActionErrorEnum_ConversionActionError_value)
+	proto.RegisterType((*ConversionActionErrorEnum)(nil), "google.ads.googleads.v1.errors.ConversionActionErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/conversion_action_error.proto", fileDescriptor_conversion_action_error_ba5f46d45d84a23e)
+	proto.RegisterFile("google/ads/googleads/v1/errors/conversion_action_error.proto", fileDescriptor_6c8902b8343b0907)
 }
 
-var fileDescriptor_conversion_action_error_ba5f46d45d84a23e = []byte{
+var fileDescriptor_6c8902b8343b0907 = []byte{
 	// 443 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x8b, 0xd3, 0x40,
 	0x14, 0xc7, 0x6d, 0x56, 0x77, 0x75, 0x16, 0x74, 0x18, 0x14, 0xd9, 0x55, 0xf7, 0x50, 0xf0, 0xe0,
diff --git a/googleapis/ads/googleads/v1/errors/conversion_adjustment_upload_error.pb.go b/googleapis/ads/googleads/v1/errors/conversion_adjustment_upload_error.pb.go
index c6375076fd..db8575282c 100644
--- a/googleapis/ads/googleads/v1/errors/conversion_adjustment_upload_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/conversion_adjustment_upload_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/conversion_adjustment_upload_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible conversion adjustment upload errors.
 type ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError int32
@@ -68,6 +71,7 @@ var ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError_name = m
 	9:  "TOO_RECENT_CONVERSION",
 	10: "CANNOT_RESTATE_CONVERSION_ACTION_THAT_ALWAYS_USES_DEFAULT_CONVERSION_VALUE",
 }
+
 var ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError_value = map[string]int32{
 	"UNSPECIFIED":                    0,
 	"UNKNOWN":                        1,
@@ -85,8 +89,9 @@ var ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError_value =
 func (x ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError) String() string {
 	return proto.EnumName(ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError_name, int32(x))
 }
+
 func (ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_error_27a6081dae4d6cab, []int{0, 0}
+	return fileDescriptor_c800024a3df9b728, []int{0, 0}
 }
 
 // Container for enum describing possible conversion adjustment upload errors.
@@ -100,16 +105,17 @@ func (m *ConversionAdjustmentUploadErrorEnum) Reset()         { *m = ConversionA
 func (m *ConversionAdjustmentUploadErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionAdjustmentUploadErrorEnum) ProtoMessage()    {}
 func (*ConversionAdjustmentUploadErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_error_27a6081dae4d6cab, []int{0}
+	return fileDescriptor_c800024a3df9b728, []int{0}
 }
+
 func (m *ConversionAdjustmentUploadErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAdjustmentUploadErrorEnum.Unmarshal(m, b)
 }
 func (m *ConversionAdjustmentUploadErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAdjustmentUploadErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAdjustmentUploadErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAdjustmentUploadErrorEnum.Merge(dst, src)
+func (m *ConversionAdjustmentUploadErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAdjustmentUploadErrorEnum.Merge(m, src)
 }
 func (m *ConversionAdjustmentUploadErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionAdjustmentUploadErrorEnum.Size(m)
@@ -121,15 +127,15 @@ func (m *ConversionAdjustmentUploadErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionAdjustmentUploadErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionAdjustmentUploadErrorEnum)(nil), "google.ads.googleads.v1.errors.ConversionAdjustmentUploadErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError", ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError_name, ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError_value)
+	proto.RegisterType((*ConversionAdjustmentUploadErrorEnum)(nil), "google.ads.googleads.v1.errors.ConversionAdjustmentUploadErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/conversion_adjustment_upload_error.proto", fileDescriptor_conversion_adjustment_upload_error_27a6081dae4d6cab)
+	proto.RegisterFile("google/ads/googleads/v1/errors/conversion_adjustment_upload_error.proto", fileDescriptor_c800024a3df9b728)
 }
 
-var fileDescriptor_conversion_adjustment_upload_error_27a6081dae4d6cab = []byte{
+var fileDescriptor_c800024a3df9b728 = []byte{
 	// 478 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xd1, 0x6e, 0xd3, 0x30,
 	0x14, 0x86, 0x59, 0x0b, 0x1b, 0x78, 0x17, 0x44, 0x16, 0x20, 0x86, 0xb6, 0x02, 0x85, 0xeb, 0x44,
diff --git a/googleapis/ads/googleads/v1/errors/conversion_upload_error.pb.go b/googleapis/ads/googleads/v1/errors/conversion_upload_error.pb.go
index c695a627f8..3fe876e58c 100644
--- a/googleapis/ads/googleads/v1/errors/conversion_upload_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/conversion_upload_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/conversion_upload_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible conversion upload errors.
 type ConversionUploadErrorEnum_ConversionUploadError int32
@@ -119,6 +122,7 @@ var ConversionUploadErrorEnum_ConversionUploadError_name = map[int32]string{
 	21: "CONVERSION_TRACKING_NOT_ENABLED_AT_CALL_TIME",
 	22: "UNPARSEABLE_CALLERS_PHONE_NUMBER",
 }
+
 var ConversionUploadErrorEnum_ConversionUploadError_value = map[string]int32{
 	"UNSPECIFIED":                     0,
 	"UNKNOWN":                         1,
@@ -148,8 +152,9 @@ var ConversionUploadErrorEnum_ConversionUploadError_value = map[string]int32{
 func (x ConversionUploadErrorEnum_ConversionUploadError) String() string {
 	return proto.EnumName(ConversionUploadErrorEnum_ConversionUploadError_name, int32(x))
 }
+
 func (ConversionUploadErrorEnum_ConversionUploadError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_error_c36471db71103be7, []int{0, 0}
+	return fileDescriptor_ba5bceb565e055e5, []int{0, 0}
 }
 
 // Container for enum describing possible conversion upload errors.
@@ -163,16 +168,17 @@ func (m *ConversionUploadErrorEnum) Reset()         { *m = ConversionUploadError
 func (m *ConversionUploadErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ConversionUploadErrorEnum) ProtoMessage()    {}
 func (*ConversionUploadErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_error_c36471db71103be7, []int{0}
+	return fileDescriptor_ba5bceb565e055e5, []int{0}
 }
+
 func (m *ConversionUploadErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionUploadErrorEnum.Unmarshal(m, b)
 }
 func (m *ConversionUploadErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionUploadErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ConversionUploadErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionUploadErrorEnum.Merge(dst, src)
+func (m *ConversionUploadErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionUploadErrorEnum.Merge(m, src)
 }
 func (m *ConversionUploadErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ConversionUploadErrorEnum.Size(m)
@@ -184,15 +190,15 @@ func (m *ConversionUploadErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ConversionUploadErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ConversionUploadErrorEnum)(nil), "google.ads.googleads.v1.errors.ConversionUploadErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ConversionUploadErrorEnum_ConversionUploadError", ConversionUploadErrorEnum_ConversionUploadError_name, ConversionUploadErrorEnum_ConversionUploadError_value)
+	proto.RegisterType((*ConversionUploadErrorEnum)(nil), "google.ads.googleads.v1.errors.ConversionUploadErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/conversion_upload_error.proto", fileDescriptor_conversion_upload_error_c36471db71103be7)
+	proto.RegisterFile("google/ads/googleads/v1/errors/conversion_upload_error.proto", fileDescriptor_ba5bceb565e055e5)
 }
 
-var fileDescriptor_conversion_upload_error_c36471db71103be7 = []byte{
+var fileDescriptor_ba5bceb565e055e5 = []byte{
 	// 638 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x4e,
 	0x10, 0xff, 0x37, 0xfd, 0x93, 0xc2, 0xf6, 0x6b, 0xbb, 0x6d, 0x0a, 0x2d, 0xa5, 0x54, 0x81, 0x23,
diff --git a/googleapis/ads/googleads/v1/errors/country_code_error.pb.go b/googleapis/ads/googleads/v1/errors/country_code_error.pb.go
index 8132c86dcd..317de35e1f 100644
--- a/googleapis/ads/googleads/v1/errors/country_code_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/country_code_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/country_code_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing country code errors.
 type CountryCodeErrorEnum_CountryCodeError int32
@@ -36,6 +39,7 @@ var CountryCodeErrorEnum_CountryCodeError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "INVALID_COUNTRY_CODE",
 }
+
 var CountryCodeErrorEnum_CountryCodeError_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -45,8 +49,9 @@ var CountryCodeErrorEnum_CountryCodeError_value = map[string]int32{
 func (x CountryCodeErrorEnum_CountryCodeError) String() string {
 	return proto.EnumName(CountryCodeErrorEnum_CountryCodeError_name, int32(x))
 }
+
 func (CountryCodeErrorEnum_CountryCodeError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_country_code_error_f5f418d6eb875d13, []int{0, 0}
+	return fileDescriptor_69b104cf7bd804d2, []int{0, 0}
 }
 
 // Container for enum describing country code errors.
@@ -60,16 +65,17 @@ func (m *CountryCodeErrorEnum) Reset()         { *m = CountryCodeErrorEnum{} }
 func (m *CountryCodeErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CountryCodeErrorEnum) ProtoMessage()    {}
 func (*CountryCodeErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_country_code_error_f5f418d6eb875d13, []int{0}
+	return fileDescriptor_69b104cf7bd804d2, []int{0}
 }
+
 func (m *CountryCodeErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CountryCodeErrorEnum.Unmarshal(m, b)
 }
 func (m *CountryCodeErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CountryCodeErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CountryCodeErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CountryCodeErrorEnum.Merge(dst, src)
+func (m *CountryCodeErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CountryCodeErrorEnum.Merge(m, src)
 }
 func (m *CountryCodeErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CountryCodeErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *CountryCodeErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CountryCodeErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CountryCodeErrorEnum)(nil), "google.ads.googleads.v1.errors.CountryCodeErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CountryCodeErrorEnum_CountryCodeError", CountryCodeErrorEnum_CountryCodeError_name, CountryCodeErrorEnum_CountryCodeError_value)
+	proto.RegisterType((*CountryCodeErrorEnum)(nil), "google.ads.googleads.v1.errors.CountryCodeErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/country_code_error.proto", fileDescriptor_country_code_error_f5f418d6eb875d13)
+	proto.RegisterFile("google/ads/googleads/v1/errors/country_code_error.proto", fileDescriptor_69b104cf7bd804d2)
 }
 
-var fileDescriptor_country_code_error_f5f418d6eb875d13 = []byte{
+var fileDescriptor_69b104cf7bd804d2 = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x5d, 0x05, 0x85, 0xec, 0x60, 0x29, 0x13, 0x44, 0x64, 0x87, 0x3e, 0x40, 0x42, 0xf1,
diff --git a/googleapis/ads/googleads/v1/errors/criterion_error.pb.go b/googleapis/ads/googleads/v1/errors/criterion_error.pb.go
index c4ab94be57..c523f167a8 100644
--- a/googleapis/ads/googleads/v1/errors/criterion_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/criterion_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/criterion_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible criterion errors.
 type CriterionErrorEnum_CriterionError int32
@@ -358,6 +361,7 @@ var CriterionErrorEnum_CriterionError_name = map[int32]string{
 	94: "WEBPAGE_CRITERION_URL_EQUALS_CAN_HAVE_ONLY_ONE_CONDITION",
 	95: "WEBPAGE_CRITERION_NOT_SUPPORTED_ON_NON_DSA_AD_GROUP",
 }
+
 var CriterionErrorEnum_CriterionError_value = map[string]int32{
 	"UNSPECIFIED":                                                       0,
 	"UNKNOWN":                                                           1,
@@ -463,8 +467,9 @@ var CriterionErrorEnum_CriterionError_value = map[string]int32{
 func (x CriterionErrorEnum_CriterionError) String() string {
 	return proto.EnumName(CriterionErrorEnum_CriterionError_name, int32(x))
 }
+
 func (CriterionErrorEnum_CriterionError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_error_640614236324c79e, []int{0, 0}
+	return fileDescriptor_cbdffbe05cefe9a1, []int{0, 0}
 }
 
 // Container for enum describing possible criterion errors.
@@ -478,16 +483,17 @@ func (m *CriterionErrorEnum) Reset()         { *m = CriterionErrorEnum{} }
 func (m *CriterionErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CriterionErrorEnum) ProtoMessage()    {}
 func (*CriterionErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_criterion_error_640614236324c79e, []int{0}
+	return fileDescriptor_cbdffbe05cefe9a1, []int{0}
 }
+
 func (m *CriterionErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CriterionErrorEnum.Unmarshal(m, b)
 }
 func (m *CriterionErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CriterionErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CriterionErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CriterionErrorEnum.Merge(dst, src)
+func (m *CriterionErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CriterionErrorEnum.Merge(m, src)
 }
 func (m *CriterionErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CriterionErrorEnum.Size(m)
@@ -499,15 +505,15 @@ func (m *CriterionErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CriterionErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.CriterionErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CriterionErrorEnum_CriterionError", CriterionErrorEnum_CriterionError_name, CriterionErrorEnum_CriterionError_value)
+	proto.RegisterType((*CriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.CriterionErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/criterion_error.proto", fileDescriptor_criterion_error_640614236324c79e)
+	proto.RegisterFile("google/ads/googleads/v1/errors/criterion_error.proto", fileDescriptor_cbdffbe05cefe9a1)
 }
 
-var fileDescriptor_criterion_error_640614236324c79e = []byte{
+var fileDescriptor_cbdffbe05cefe9a1 = []byte{
 	// 1695 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xef, 0x72, 0x1b, 0xb7,
 	0x11, 0xaf, 0x9d, 0x36, 0x69, 0xe1, 0x36, 0x41, 0xe0, 0xff, 0xff, 0x14, 0x5b, 0xb1, 0x1d, 0xc7,
diff --git a/googleapis/ads/googleads/v1/errors/custom_interest_error.pb.go b/googleapis/ads/googleads/v1/errors/custom_interest_error.pb.go
index 8fb30849c4..525c54af2b 100644
--- a/googleapis/ads/googleads/v1/errors/custom_interest_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/custom_interest_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/custom_interest_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible custom interest errors.
 type CustomInterestErrorEnum_CustomInterestError int32
@@ -55,6 +58,7 @@ var CustomInterestErrorEnum_CustomInterestError_name = map[int32]string{
 	7: "CANNOT_REMOVE_WHILE_IN_USE",
 	8: "CANNOT_CHANGE_TYPE",
 }
+
 var CustomInterestErrorEnum_CustomInterestError_value = map[string]int32{
 	"UNSPECIFIED":       0,
 	"UNKNOWN":           1,
@@ -70,8 +74,9 @@ var CustomInterestErrorEnum_CustomInterestError_value = map[string]int32{
 func (x CustomInterestErrorEnum_CustomInterestError) String() string {
 	return proto.EnumName(CustomInterestErrorEnum_CustomInterestError_name, int32(x))
 }
+
 func (CustomInterestErrorEnum_CustomInterestError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_error_c7ecd8e8f5b7a014, []int{0, 0}
+	return fileDescriptor_bace08c6ed3f21e7, []int{0, 0}
 }
 
 // Container for enum describing possible custom interest errors.
@@ -85,16 +90,17 @@ func (m *CustomInterestErrorEnum) Reset()         { *m = CustomInterestErrorEnum
 func (m *CustomInterestErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomInterestErrorEnum) ProtoMessage()    {}
 func (*CustomInterestErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_error_c7ecd8e8f5b7a014, []int{0}
+	return fileDescriptor_bace08c6ed3f21e7, []int{0}
 }
+
 func (m *CustomInterestErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInterestErrorEnum.Unmarshal(m, b)
 }
 func (m *CustomInterestErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInterestErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomInterestErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInterestErrorEnum.Merge(dst, src)
+func (m *CustomInterestErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInterestErrorEnum.Merge(m, src)
 }
 func (m *CustomInterestErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomInterestErrorEnum.Size(m)
@@ -106,15 +112,15 @@ func (m *CustomInterestErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomInterestErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomInterestErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomInterestErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CustomInterestErrorEnum_CustomInterestError", CustomInterestErrorEnum_CustomInterestError_name, CustomInterestErrorEnum_CustomInterestError_value)
+	proto.RegisterType((*CustomInterestErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomInterestErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/custom_interest_error.proto", fileDescriptor_custom_interest_error_c7ecd8e8f5b7a014)
+	proto.RegisterFile("google/ads/googleads/v1/errors/custom_interest_error.proto", fileDescriptor_bace08c6ed3f21e7)
 }
 
-var fileDescriptor_custom_interest_error_c7ecd8e8f5b7a014 = []byte{
+var fileDescriptor_bace08c6ed3f21e7 = []byte{
 	// 448 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xdf, 0x6a, 0xdb, 0x30,
 	0x18, 0xc5, 0x17, 0x77, 0x6b, 0x87, 0x7a, 0x31, 0x4f, 0x63, 0x7f, 0x28, 0x25, 0x8c, 0x0c, 0xb6,
diff --git a/googleapis/ads/googleads/v1/errors/customer_client_link_error.pb.go b/googleapis/ads/googleads/v1/errors/customer_client_link_error.pb.go
index c83428a808..3ea129c752 100644
--- a/googleapis/ads/googleads/v1/errors/customer_client_link_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/customer_client_link_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/customer_client_link_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible CustomerClientLink errors.
 type CustomerClientLinkErrorEnum_CustomerClientLinkError int32
@@ -54,6 +57,7 @@ var CustomerClientLinkErrorEnum_CustomerClientLinkError_name = map[int32]string{
 	7: "CANNOT_HIDE_OR_UNHIDE_MANAGER_ACCOUNTS",
 	8: "CUSTOMER_HAS_TOO_MANY_ACCOUNTS_AT_MANAGER",
 }
+
 var CustomerClientLinkErrorEnum_CustomerClientLinkError_value = map[string]int32{
 	"UNSPECIFIED":                               0,
 	"UNKNOWN":                                   1,
@@ -69,8 +73,9 @@ var CustomerClientLinkErrorEnum_CustomerClientLinkError_value = map[string]int32
 func (x CustomerClientLinkErrorEnum_CustomerClientLinkError) String() string {
 	return proto.EnumName(CustomerClientLinkErrorEnum_CustomerClientLinkError_name, int32(x))
 }
+
 func (CustomerClientLinkErrorEnum_CustomerClientLinkError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_error_c03bfa9f5c874866, []int{0, 0}
+	return fileDescriptor_05999249da6418bd, []int{0, 0}
 }
 
 // Container for enum describing possible CustomeClientLink errors.
@@ -84,16 +89,17 @@ func (m *CustomerClientLinkErrorEnum) Reset()         { *m = CustomerClientLinkE
 func (m *CustomerClientLinkErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomerClientLinkErrorEnum) ProtoMessage()    {}
 func (*CustomerClientLinkErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_error_c03bfa9f5c874866, []int{0}
+	return fileDescriptor_05999249da6418bd, []int{0}
 }
+
 func (m *CustomerClientLinkErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerClientLinkErrorEnum.Unmarshal(m, b)
 }
 func (m *CustomerClientLinkErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerClientLinkErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomerClientLinkErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerClientLinkErrorEnum.Merge(dst, src)
+func (m *CustomerClientLinkErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerClientLinkErrorEnum.Merge(m, src)
 }
 func (m *CustomerClientLinkErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomerClientLinkErrorEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *CustomerClientLinkErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomerClientLinkErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomerClientLinkErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerClientLinkErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CustomerClientLinkErrorEnum_CustomerClientLinkError", CustomerClientLinkErrorEnum_CustomerClientLinkError_name, CustomerClientLinkErrorEnum_CustomerClientLinkError_value)
+	proto.RegisterType((*CustomerClientLinkErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerClientLinkErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/customer_client_link_error.proto", fileDescriptor_customer_client_link_error_c03bfa9f5c874866)
+	proto.RegisterFile("google/ads/googleads/v1/errors/customer_client_link_error.proto", fileDescriptor_05999249da6418bd)
 }
 
-var fileDescriptor_customer_client_link_error_c03bfa9f5c874866 = []byte{
+var fileDescriptor_05999249da6418bd = []byte{
 	// 453 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x4f, 0x6b, 0xd4, 0x40,
 	0x14, 0x77, 0x53, 0x6d, 0x65, 0x7a, 0x30, 0xe4, 0x52, 0xb0, 0x65, 0x85, 0x14, 0x14, 0x05, 0x13,
diff --git a/googleapis/ads/googleads/v1/errors/customer_error.pb.go b/googleapis/ads/googleads/v1/errors/customer_error.pb.go
index 23693cf2f8..d9aca04fb3 100644
--- a/googleapis/ads/googleads/v1/errors/customer_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/customer_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/customer_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Set of errors that are related to requests dealing with Customer.
 // Next id: 26
@@ -42,6 +45,7 @@ var CustomerErrorEnum_CustomerError_name = map[int32]string{
 	2: "STATUS_CHANGE_DISALLOWED",
 	3: "ACCOUNT_NOT_SET_UP",
 }
+
 var CustomerErrorEnum_CustomerError_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -52,8 +56,9 @@ var CustomerErrorEnum_CustomerError_value = map[string]int32{
 func (x CustomerErrorEnum_CustomerError) String() string {
 	return proto.EnumName(CustomerErrorEnum_CustomerError_name, int32(x))
 }
+
 func (CustomerErrorEnum_CustomerError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_customer_error_6cd97071f19e5e21, []int{0, 0}
+	return fileDescriptor_307d1dd8bdad6a5d, []int{0, 0}
 }
 
 // Container for enum describing possible customer errors.
@@ -67,16 +72,17 @@ func (m *CustomerErrorEnum) Reset()         { *m = CustomerErrorEnum{} }
 func (m *CustomerErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomerErrorEnum) ProtoMessage()    {}
 func (*CustomerErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_error_6cd97071f19e5e21, []int{0}
+	return fileDescriptor_307d1dd8bdad6a5d, []int{0}
 }
+
 func (m *CustomerErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerErrorEnum.Unmarshal(m, b)
 }
 func (m *CustomerErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomerErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerErrorEnum.Merge(dst, src)
+func (m *CustomerErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerErrorEnum.Merge(m, src)
 }
 func (m *CustomerErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomerErrorEnum.Size(m)
@@ -88,15 +94,15 @@ func (m *CustomerErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomerErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomerErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CustomerErrorEnum_CustomerError", CustomerErrorEnum_CustomerError_name, CustomerErrorEnum_CustomerError_value)
+	proto.RegisterType((*CustomerErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/customer_error.proto", fileDescriptor_customer_error_6cd97071f19e5e21)
+	proto.RegisterFile("google/ads/googleads/v1/errors/customer_error.proto", fileDescriptor_307d1dd8bdad6a5d)
 }
 
-var fileDescriptor_customer_error_6cd97071f19e5e21 = []byte{
+var fileDescriptor_307d1dd8bdad6a5d = []byte{
 	// 321 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x5d, 0x07, 0x0a, 0x19, 0x62, 0xcd, 0x41, 0x44, 0xc6, 0x0e, 0x7d, 0x80, 0x94, 0xb2,
diff --git a/googleapis/ads/googleads/v1/errors/customer_feed_error.pb.go b/googleapis/ads/googleads/v1/errors/customer_feed_error.pb.go
index 34cdef12d0..35e6113db1 100644
--- a/googleapis/ads/googleads/v1/errors/customer_feed_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/customer_feed_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/customer_feed_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible customer feed errors.
 type CustomerFeedErrorEnum_CustomerFeedError int32
@@ -55,6 +58,7 @@ var CustomerFeedErrorEnum_CustomerFeedError_name = map[int32]string{
 	7: "MISSING_FEEDMAPPING_FOR_PLACEHOLDER_TYPE",
 	8: "PLACEHOLDER_TYPE_NOT_ALLOWED_ON_CUSTOMER_FEED",
 }
+
 var CustomerFeedErrorEnum_CustomerFeedError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -70,8 +74,9 @@ var CustomerFeedErrorEnum_CustomerFeedError_value = map[string]int32{
 func (x CustomerFeedErrorEnum_CustomerFeedError) String() string {
 	return proto.EnumName(CustomerFeedErrorEnum_CustomerFeedError_name, int32(x))
 }
+
 func (CustomerFeedErrorEnum_CustomerFeedError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_error_b47213809494701d, []int{0, 0}
+	return fileDescriptor_7a622cddfd1be36c, []int{0, 0}
 }
 
 // Container for enum describing possible customer feed errors.
@@ -85,16 +90,17 @@ func (m *CustomerFeedErrorEnum) Reset()         { *m = CustomerFeedErrorEnum{} }
 func (m *CustomerFeedErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomerFeedErrorEnum) ProtoMessage()    {}
 func (*CustomerFeedErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_error_b47213809494701d, []int{0}
+	return fileDescriptor_7a622cddfd1be36c, []int{0}
 }
+
 func (m *CustomerFeedErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerFeedErrorEnum.Unmarshal(m, b)
 }
 func (m *CustomerFeedErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerFeedErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomerFeedErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerFeedErrorEnum.Merge(dst, src)
+func (m *CustomerFeedErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerFeedErrorEnum.Merge(m, src)
 }
 func (m *CustomerFeedErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomerFeedErrorEnum.Size(m)
@@ -106,15 +112,15 @@ func (m *CustomerFeedErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomerFeedErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomerFeedErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerFeedErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CustomerFeedErrorEnum_CustomerFeedError", CustomerFeedErrorEnum_CustomerFeedError_name, CustomerFeedErrorEnum_CustomerFeedError_value)
+	proto.RegisterType((*CustomerFeedErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerFeedErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/customer_feed_error.proto", fileDescriptor_customer_feed_error_b47213809494701d)
+	proto.RegisterFile("google/ads/googleads/v1/errors/customer_feed_error.proto", fileDescriptor_7a622cddfd1be36c)
 }
 
-var fileDescriptor_customer_feed_error_b47213809494701d = []byte{
+var fileDescriptor_7a622cddfd1be36c = []byte{
 	// 443 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0x69, 0x06, 0x1b, 0xf2, 0x0e, 0x14, 0x4b, 0x20, 0x84, 0xa6, 0x1e, 0xc2, 0x01, 0x0e,
diff --git a/googleapis/ads/googleads/v1/errors/customer_manager_link_error.pb.go b/googleapis/ads/googleads/v1/errors/customer_manager_link_error.pb.go
index de46978b5e..653eaad3dd 100644
--- a/googleapis/ads/googleads/v1/errors/customer_manager_link_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/customer_manager_link_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/customer_manager_link_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible CustomerManagerLink errors.
 type CustomerManagerLinkErrorEnum_CustomerManagerLinkError int32
@@ -60,6 +63,7 @@ var CustomerManagerLinkErrorEnum_CustomerManagerLinkError_name = map[int32]strin
 	8: "CANNOT_CHANGE_ROLE_FOR_NON_ACTIVE_LINK_ACCOUNT",
 	9: "DUPLICATE_CHILD_FOUND",
 }
+
 var CustomerManagerLinkErrorEnum_CustomerManagerLinkError_value = map[string]int32{
 	"UNSPECIFIED":                         0,
 	"UNKNOWN":                             1,
@@ -76,8 +80,9 @@ var CustomerManagerLinkErrorEnum_CustomerManagerLinkError_value = map[string]int
 func (x CustomerManagerLinkErrorEnum_CustomerManagerLinkError) String() string {
 	return proto.EnumName(CustomerManagerLinkErrorEnum_CustomerManagerLinkError_name, int32(x))
 }
+
 func (CustomerManagerLinkErrorEnum_CustomerManagerLinkError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_error_154e0a6b1d419238, []int{0, 0}
+	return fileDescriptor_bb13b694be60d601, []int{0, 0}
 }
 
 // Container for enum describing possible CustomerManagerLink errors.
@@ -91,16 +96,17 @@ func (m *CustomerManagerLinkErrorEnum) Reset()         { *m = CustomerManagerLin
 func (m *CustomerManagerLinkErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*CustomerManagerLinkErrorEnum) ProtoMessage()    {}
 func (*CustomerManagerLinkErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_error_154e0a6b1d419238, []int{0}
+	return fileDescriptor_bb13b694be60d601, []int{0}
 }
+
 func (m *CustomerManagerLinkErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerManagerLinkErrorEnum.Unmarshal(m, b)
 }
 func (m *CustomerManagerLinkErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerManagerLinkErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *CustomerManagerLinkErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerManagerLinkErrorEnum.Merge(dst, src)
+func (m *CustomerManagerLinkErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerManagerLinkErrorEnum.Merge(m, src)
 }
 func (m *CustomerManagerLinkErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_CustomerManagerLinkErrorEnum.Size(m)
@@ -112,15 +118,15 @@ func (m *CustomerManagerLinkErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_CustomerManagerLinkErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*CustomerManagerLinkErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerManagerLinkErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.CustomerManagerLinkErrorEnum_CustomerManagerLinkError", CustomerManagerLinkErrorEnum_CustomerManagerLinkError_name, CustomerManagerLinkErrorEnum_CustomerManagerLinkError_value)
+	proto.RegisterType((*CustomerManagerLinkErrorEnum)(nil), "google.ads.googleads.v1.errors.CustomerManagerLinkErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/customer_manager_link_error.proto", fileDescriptor_customer_manager_link_error_154e0a6b1d419238)
+	proto.RegisterFile("google/ads/googleads/v1/errors/customer_manager_link_error.proto", fileDescriptor_bb13b694be60d601)
 }
 
-var fileDescriptor_customer_manager_link_error_154e0a6b1d419238 = []byte{
+var fileDescriptor_bb13b694be60d601 = []byte{
 	// 496 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x6e, 0xd3, 0x40,
 	0x10, 0xc6, 0x69, 0x0a, 0x2d, 0x6c, 0x0f, 0x18, 0x4b, 0x95, 0x00, 0x95, 0x1e, 0xc2, 0xa1, 0x42,
diff --git a/googleapis/ads/googleads/v1/errors/database_error.pb.go b/googleapis/ads/googleads/v1/errors/database_error.pb.go
index db62aa9e70..8f95552200 100644
--- a/googleapis/ads/googleads/v1/errors/database_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/database_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/database_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible database errors.
 type DatabaseErrorEnum_DatabaseError int32
@@ -37,6 +40,7 @@ var DatabaseErrorEnum_DatabaseError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "CONCURRENT_MODIFICATION",
 }
+
 var DatabaseErrorEnum_DatabaseError_value = map[string]int32{
 	"UNSPECIFIED":             0,
 	"UNKNOWN":                 1,
@@ -46,8 +50,9 @@ var DatabaseErrorEnum_DatabaseError_value = map[string]int32{
 func (x DatabaseErrorEnum_DatabaseError) String() string {
 	return proto.EnumName(DatabaseErrorEnum_DatabaseError_name, int32(x))
 }
+
 func (DatabaseErrorEnum_DatabaseError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_database_error_4830c69527554d32, []int{0, 0}
+	return fileDescriptor_a3df06e3d3683363, []int{0, 0}
 }
 
 // Container for enum describing possible database errors.
@@ -61,16 +66,17 @@ func (m *DatabaseErrorEnum) Reset()         { *m = DatabaseErrorEnum{} }
 func (m *DatabaseErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*DatabaseErrorEnum) ProtoMessage()    {}
 func (*DatabaseErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_database_error_4830c69527554d32, []int{0}
+	return fileDescriptor_a3df06e3d3683363, []int{0}
 }
+
 func (m *DatabaseErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatabaseErrorEnum.Unmarshal(m, b)
 }
 func (m *DatabaseErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatabaseErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *DatabaseErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatabaseErrorEnum.Merge(dst, src)
+func (m *DatabaseErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatabaseErrorEnum.Merge(m, src)
 }
 func (m *DatabaseErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_DatabaseErrorEnum.Size(m)
@@ -82,15 +88,15 @@ func (m *DatabaseErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DatabaseErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DatabaseErrorEnum)(nil), "google.ads.googleads.v1.errors.DatabaseErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.DatabaseErrorEnum_DatabaseError", DatabaseErrorEnum_DatabaseError_name, DatabaseErrorEnum_DatabaseError_value)
+	proto.RegisterType((*DatabaseErrorEnum)(nil), "google.ads.googleads.v1.errors.DatabaseErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/database_error.proto", fileDescriptor_database_error_4830c69527554d32)
+	proto.RegisterFile("google/ads/googleads/v1/errors/database_error.proto", fileDescriptor_a3df06e3d3683363)
 }
 
-var fileDescriptor_database_error_4830c69527554d32 = []byte{
+var fileDescriptor_a3df06e3d3683363 = []byte{
 	// 300 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xc3, 0x30,
 	0x18, 0x85, 0x5d, 0x05, 0x85, 0x0c, 0x71, 0xf6, 0x46, 0x50, 0xd9, 0x45, 0x1f, 0x20, 0xa1, 0xec,
diff --git a/googleapis/ads/googleads/v1/errors/date_error.pb.go b/googleapis/ads/googleads/v1/errors/date_error.pb.go
index 6d1095a2b2..c0760e6e18 100644
--- a/googleapis/ads/googleads/v1/errors/date_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/date_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/date_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible date errors.
 type DateErrorEnum_DateError int32
@@ -63,6 +66,7 @@ var DateErrorEnum_DateError_name = map[int32]string{
 	9:  "DATE_RANGE_MINIMUM_DATE_LATER_THAN_MAXIMUM_DATE",
 	10: "DATE_RANGE_MINIMUM_AND_MAXIMUM_DATES_BOTH_NULL",
 }
+
 var DateErrorEnum_DateError_value = map[string]int32{
 	"UNSPECIFIED":                                     0,
 	"UNKNOWN":                                         1,
@@ -81,8 +85,9 @@ var DateErrorEnum_DateError_value = map[string]int32{
 func (x DateErrorEnum_DateError) String() string {
 	return proto.EnumName(DateErrorEnum_DateError_name, int32(x))
 }
+
 func (DateErrorEnum_DateError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_date_error_46c20899519a126a, []int{0, 0}
+	return fileDescriptor_df8c01899fe51563, []int{0, 0}
 }
 
 // Container for enum describing possible date errors.
@@ -96,16 +101,17 @@ func (m *DateErrorEnum) Reset()         { *m = DateErrorEnum{} }
 func (m *DateErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*DateErrorEnum) ProtoMessage()    {}
 func (*DateErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_date_error_46c20899519a126a, []int{0}
+	return fileDescriptor_df8c01899fe51563, []int{0}
 }
+
 func (m *DateErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DateErrorEnum.Unmarshal(m, b)
 }
 func (m *DateErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DateErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *DateErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DateErrorEnum.Merge(dst, src)
+func (m *DateErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateErrorEnum.Merge(m, src)
 }
 func (m *DateErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_DateErrorEnum.Size(m)
@@ -117,15 +123,15 @@ func (m *DateErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DateErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DateErrorEnum)(nil), "google.ads.googleads.v1.errors.DateErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.DateErrorEnum_DateError", DateErrorEnum_DateError_name, DateErrorEnum_DateError_value)
+	proto.RegisterType((*DateErrorEnum)(nil), "google.ads.googleads.v1.errors.DateErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/date_error.proto", fileDescriptor_date_error_46c20899519a126a)
+	proto.RegisterFile("google/ads/googleads/v1/errors/date_error.proto", fileDescriptor_df8c01899fe51563)
 }
 
-var fileDescriptor_date_error_46c20899519a126a = []byte{
+var fileDescriptor_df8c01899fe51563 = []byte{
 	// 446 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xdd, 0x6e, 0xd3, 0x30,
 	0x18, 0x86, 0x69, 0x8b, 0x36, 0xf6, 0x95, 0x9f, 0xc8, 0x1c, 0x4c, 0xc0, 0x18, 0xa3, 0xc0, 0x19,
diff --git a/googleapis/ads/googleads/v1/errors/date_range_error.pb.go b/googleapis/ads/googleads/v1/errors/date_range_error.pb.go
index c7d0f9ab7b..b94a37f780 100644
--- a/googleapis/ads/googleads/v1/errors/date_range_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/date_range_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/date_range_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible date range errors.
 type DateRangeErrorEnum_DateRangeError int32
@@ -48,6 +51,7 @@ var DateRangeErrorEnum_DateRangeError_name = map[int32]string{
 	5: "AFTER_MAXIMUM_ALLOWABLE_DATE",
 	6: "CANNOT_MODIFY_START_DATE_IF_ALREADY_STARTED",
 }
+
 var DateRangeErrorEnum_DateRangeError_value = map[string]int32{
 	"UNSPECIFIED":                  0,
 	"UNKNOWN":                      1,
@@ -61,8 +65,9 @@ var DateRangeErrorEnum_DateRangeError_value = map[string]int32{
 func (x DateRangeErrorEnum_DateRangeError) String() string {
 	return proto.EnumName(DateRangeErrorEnum_DateRangeError_name, int32(x))
 }
+
 func (DateRangeErrorEnum_DateRangeError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_date_range_error_4de96ce6b4f7f7c6, []int{0, 0}
+	return fileDescriptor_3c2f66935ae77907, []int{0, 0}
 }
 
 // Container for enum describing possible date range errors.
@@ -76,16 +81,17 @@ func (m *DateRangeErrorEnum) Reset()         { *m = DateRangeErrorEnum{} }
 func (m *DateRangeErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*DateRangeErrorEnum) ProtoMessage()    {}
 func (*DateRangeErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_date_range_error_4de96ce6b4f7f7c6, []int{0}
+	return fileDescriptor_3c2f66935ae77907, []int{0}
 }
+
 func (m *DateRangeErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DateRangeErrorEnum.Unmarshal(m, b)
 }
 func (m *DateRangeErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DateRangeErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *DateRangeErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DateRangeErrorEnum.Merge(dst, src)
+func (m *DateRangeErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateRangeErrorEnum.Merge(m, src)
 }
 func (m *DateRangeErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_DateRangeErrorEnum.Size(m)
@@ -97,15 +103,15 @@ func (m *DateRangeErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DateRangeErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DateRangeErrorEnum)(nil), "google.ads.googleads.v1.errors.DateRangeErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.DateRangeErrorEnum_DateRangeError", DateRangeErrorEnum_DateRangeError_name, DateRangeErrorEnum_DateRangeError_value)
+	proto.RegisterType((*DateRangeErrorEnum)(nil), "google.ads.googleads.v1.errors.DateRangeErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/date_range_error.proto", fileDescriptor_date_range_error_4de96ce6b4f7f7c6)
+	proto.RegisterFile("google/ads/googleads/v1/errors/date_range_error.proto", fileDescriptor_3c2f66935ae77907)
 }
 
-var fileDescriptor_date_range_error_4de96ce6b4f7f7c6 = []byte{
+var fileDescriptor_3c2f66935ae77907 = []byte{
 	// 391 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x8e, 0x95, 0x30,
 	0x14, 0x86, 0xe5, 0x8e, 0x8e, 0x49, 0xc7, 0x28, 0xa9, 0x0b, 0xa3, 0x8e, 0x13, 0xc3, 0xd6, 0xa4,
diff --git a/googleapis/ads/googleads/v1/errors/distinct_error.pb.go b/googleapis/ads/googleads/v1/errors/distinct_error.pb.go
index 627a8b0a61..93b990f02d 100644
--- a/googleapis/ads/googleads/v1/errors/distinct_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/distinct_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/distinct_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible distinct errors.
 type DistinctErrorEnum_DistinctError int32
@@ -39,6 +42,7 @@ var DistinctErrorEnum_DistinctError_name = map[int32]string{
 	2: "DUPLICATE_ELEMENT",
 	3: "DUPLICATE_TYPE",
 }
+
 var DistinctErrorEnum_DistinctError_value = map[string]int32{
 	"UNSPECIFIED":       0,
 	"UNKNOWN":           1,
@@ -49,8 +53,9 @@ var DistinctErrorEnum_DistinctError_value = map[string]int32{
 func (x DistinctErrorEnum_DistinctError) String() string {
 	return proto.EnumName(DistinctErrorEnum_DistinctError_name, int32(x))
 }
+
 func (DistinctErrorEnum_DistinctError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_distinct_error_e8a8de7568fed594, []int{0, 0}
+	return fileDescriptor_5c34c4db4ba30dcf, []int{0, 0}
 }
 
 // Container for enum describing possible distinct errors.
@@ -64,16 +69,17 @@ func (m *DistinctErrorEnum) Reset()         { *m = DistinctErrorEnum{} }
 func (m *DistinctErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*DistinctErrorEnum) ProtoMessage()    {}
 func (*DistinctErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distinct_error_e8a8de7568fed594, []int{0}
+	return fileDescriptor_5c34c4db4ba30dcf, []int{0}
 }
+
 func (m *DistinctErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DistinctErrorEnum.Unmarshal(m, b)
 }
 func (m *DistinctErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DistinctErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *DistinctErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DistinctErrorEnum.Merge(dst, src)
+func (m *DistinctErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DistinctErrorEnum.Merge(m, src)
 }
 func (m *DistinctErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_DistinctErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *DistinctErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_DistinctErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*DistinctErrorEnum)(nil), "google.ads.googleads.v1.errors.DistinctErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.DistinctErrorEnum_DistinctError", DistinctErrorEnum_DistinctError_name, DistinctErrorEnum_DistinctError_value)
+	proto.RegisterType((*DistinctErrorEnum)(nil), "google.ads.googleads.v1.errors.DistinctErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/distinct_error.proto", fileDescriptor_distinct_error_e8a8de7568fed594)
+	proto.RegisterFile("google/ads/googleads/v1/errors/distinct_error.proto", fileDescriptor_5c34c4db4ba30dcf)
 }
 
-var fileDescriptor_distinct_error_e8a8de7568fed594 = []byte{
+var fileDescriptor_5c34c4db4ba30dcf = []byte{
 	// 307 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xdf, 0x4a, 0xc3, 0x30,
 	0x18, 0xc5, 0x5d, 0x07, 0x0a, 0x19, 0x6a, 0x17, 0xf0, 0x46, 0x64, 0x17, 0x7d, 0x80, 0x84, 0xb2,
diff --git a/googleapis/ads/googleads/v1/errors/enum_error.pb.go b/googleapis/ads/googleads/v1/errors/enum_error.pb.go
index 05ce677716..226eafd3b5 100644
--- a/googleapis/ads/googleads/v1/errors/enum_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/enum_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/enum_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible enum errors.
 type EnumErrorEnum_EnumError int32
@@ -36,6 +39,7 @@ var EnumErrorEnum_EnumError_name = map[int32]string{
 	1: "UNKNOWN",
 	3: "ENUM_VALUE_NOT_PERMITTED",
 }
+
 var EnumErrorEnum_EnumError_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -45,8 +49,9 @@ var EnumErrorEnum_EnumError_value = map[string]int32{
 func (x EnumErrorEnum_EnumError) String() string {
 	return proto.EnumName(EnumErrorEnum_EnumError_name, int32(x))
 }
+
 func (EnumErrorEnum_EnumError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_enum_error_9874f7159f8ae424, []int{0, 0}
+	return fileDescriptor_14e62fef9dcb7b60, []int{0, 0}
 }
 
 // Container for enum describing possible enum errors.
@@ -60,16 +65,17 @@ func (m *EnumErrorEnum) Reset()         { *m = EnumErrorEnum{} }
 func (m *EnumErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*EnumErrorEnum) ProtoMessage()    {}
 func (*EnumErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_enum_error_9874f7159f8ae424, []int{0}
+	return fileDescriptor_14e62fef9dcb7b60, []int{0}
 }
+
 func (m *EnumErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnumErrorEnum.Unmarshal(m, b)
 }
 func (m *EnumErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnumErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *EnumErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnumErrorEnum.Merge(dst, src)
+func (m *EnumErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumErrorEnum.Merge(m, src)
 }
 func (m *EnumErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_EnumErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *EnumErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_EnumErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*EnumErrorEnum)(nil), "google.ads.googleads.v1.errors.EnumErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.EnumErrorEnum_EnumError", EnumErrorEnum_EnumError_name, EnumErrorEnum_EnumError_value)
+	proto.RegisterType((*EnumErrorEnum)(nil), "google.ads.googleads.v1.errors.EnumErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/enum_error.proto", fileDescriptor_enum_error_9874f7159f8ae424)
+	proto.RegisterFile("google/ads/googleads/v1/errors/enum_error.proto", fileDescriptor_14e62fef9dcb7b60)
 }
 
-var fileDescriptor_enum_error_9874f7159f8ae424 = []byte{
+var fileDescriptor_14e62fef9dcb7b60 = []byte{
 	// 293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0x84, 0x40,
 	0x18, 0xc7, 0xd3, 0x85, 0xa2, 0x59, 0x2a, 0xf1, 0x14, 0xb1, 0xec, 0xc1, 0x07, 0x98, 0x41, 0xba,
diff --git a/googleapis/ads/googleads/v1/errors/errors.pb.go b/googleapis/ads/googleads/v1/errors/errors.pb.go
index 17187976c0..5ea3a920bf 100644
--- a/googleapis/ads/googleads/v1/errors/errors.pb.go
+++ b/googleapis/ads/googleads/v1/errors/errors.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/errors.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes how a GoogleAds API call failed. It's returned inside
 // google.rpc.Status.details when a call fails.
@@ -35,16 +38,17 @@ func (m *GoogleAdsFailure) Reset()         { *m = GoogleAdsFailure{} }
 func (m *GoogleAdsFailure) String() string { return proto.CompactTextString(m) }
 func (*GoogleAdsFailure) ProtoMessage()    {}
 func (*GoogleAdsFailure) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{0}
+	return fileDescriptor_857fbb2e615b330c, []int{0}
 }
+
 func (m *GoogleAdsFailure) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoogleAdsFailure.Unmarshal(m, b)
 }
 func (m *GoogleAdsFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoogleAdsFailure.Marshal(b, m, deterministic)
 }
-func (dst *GoogleAdsFailure) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoogleAdsFailure.Merge(dst, src)
+func (m *GoogleAdsFailure) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleAdsFailure.Merge(m, src)
 }
 func (m *GoogleAdsFailure) XXX_Size() int {
 	return xxx_messageInfo_GoogleAdsFailure.Size(m)
@@ -84,16 +88,17 @@ func (m *GoogleAdsError) Reset()         { *m = GoogleAdsError{} }
 func (m *GoogleAdsError) String() string { return proto.CompactTextString(m) }
 func (*GoogleAdsError) ProtoMessage()    {}
 func (*GoogleAdsError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{1}
+	return fileDescriptor_857fbb2e615b330c, []int{1}
 }
+
 func (m *GoogleAdsError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoogleAdsError.Unmarshal(m, b)
 }
 func (m *GoogleAdsError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoogleAdsError.Marshal(b, m, deterministic)
 }
-func (dst *GoogleAdsError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoogleAdsError.Merge(dst, src)
+func (m *GoogleAdsError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleAdsError.Merge(m, src)
 }
 func (m *GoogleAdsError) XXX_Size() int {
 	return xxx_messageInfo_GoogleAdsError.Size(m)
@@ -252,16 +257,17 @@ func (m *ErrorCode) Reset()         { *m = ErrorCode{} }
 func (m *ErrorCode) String() string { return proto.CompactTextString(m) }
 func (*ErrorCode) ProtoMessage()    {}
 func (*ErrorCode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{2}
+	return fileDescriptor_857fbb2e615b330c, []int{2}
 }
+
 func (m *ErrorCode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorCode.Unmarshal(m, b)
 }
 func (m *ErrorCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorCode.Marshal(b, m, deterministic)
 }
-func (dst *ErrorCode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorCode.Merge(dst, src)
+func (m *ErrorCode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorCode.Merge(m, src)
 }
 func (m *ErrorCode) XXX_Size() int {
 	return xxx_messageInfo_ErrorCode.Size(m)
@@ -1557,9 +1563,9 @@ func (m *ErrorCode) GetSizeLimitError() SizeLimitErrorEnum_SizeLimitError {
 	return SizeLimitErrorEnum_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ErrorCode) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ErrorCode_OneofMarshaler, _ErrorCode_OneofUnmarshaler, _ErrorCode_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ErrorCode) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ErrorCode_RequestError)(nil),
 		(*ErrorCode_BiddingStrategyError)(nil),
 		(*ErrorCode_UrlFieldError)(nil),
@@ -1661,1310 +1667,6 @@ func (*ErrorCode) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) err
 	}
 }
 
-func _ErrorCode_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ErrorCode)
-	// error_code
-	switch x := m.ErrorCode.(type) {
-	case *ErrorCode_RequestError:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RequestError))
-	case *ErrorCode_BiddingStrategyError:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.BiddingStrategyError))
-	case *ErrorCode_UrlFieldError:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.UrlFieldError))
-	case *ErrorCode_ListOperationError:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ListOperationError))
-	case *ErrorCode_QueryError:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.QueryError))
-	case *ErrorCode_MutateError:
-		b.EncodeVarint(7<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MutateError))
-	case *ErrorCode_FieldMaskError:
-		b.EncodeVarint(8<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FieldMaskError))
-	case *ErrorCode_AuthorizationError:
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AuthorizationError))
-	case *ErrorCode_InternalError:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.InternalError))
-	case *ErrorCode_QuotaError:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.QuotaError))
-	case *ErrorCode_AdError:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdError))
-	case *ErrorCode_AdGroupError:
-		b.EncodeVarint(13<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdGroupError))
-	case *ErrorCode_CampaignBudgetError:
-		b.EncodeVarint(14<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CampaignBudgetError))
-	case *ErrorCode_CampaignError:
-		b.EncodeVarint(15<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CampaignError))
-	case *ErrorCode_AuthenticationError:
-		b.EncodeVarint(17<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AuthenticationError))
-	case *ErrorCode_AdGroupCriterionError:
-		b.EncodeVarint(18<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdGroupCriterionError))
-	case *ErrorCode_AdCustomizerError:
-		b.EncodeVarint(19<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdCustomizerError))
-	case *ErrorCode_AdGroupAdError:
-		b.EncodeVarint(21<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdGroupAdError))
-	case *ErrorCode_AdSharingError:
-		b.EncodeVarint(24<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdSharingError))
-	case *ErrorCode_AdxError:
-		b.EncodeVarint(25<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdxError))
-	case *ErrorCode_AssetError:
-		b.EncodeVarint(107<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AssetError))
-	case *ErrorCode_BiddingError:
-		b.EncodeVarint(26<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.BiddingError))
-	case *ErrorCode_CampaignCriterionError:
-		b.EncodeVarint(29<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CampaignCriterionError))
-	case *ErrorCode_CollectionSizeError:
-		b.EncodeVarint(31<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CollectionSizeError))
-	case *ErrorCode_CountryCodeError:
-		b.EncodeVarint(109<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CountryCodeError))
-	case *ErrorCode_CriterionError:
-		b.EncodeVarint(32<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CriterionError))
-	case *ErrorCode_CustomerError:
-		b.EncodeVarint(90<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CustomerError))
-	case *ErrorCode_DateError:
-		b.EncodeVarint(33<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.DateError))
-	case *ErrorCode_DateRangeError:
-		b.EncodeVarint(34<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.DateRangeError))
-	case *ErrorCode_DistinctError:
-		b.EncodeVarint(35<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.DistinctError))
-	case *ErrorCode_FeedAttributeReferenceError:
-		b.EncodeVarint(36<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FeedAttributeReferenceError))
-	case *ErrorCode_FunctionError:
-		b.EncodeVarint(37<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FunctionError))
-	case *ErrorCode_FunctionParsingError:
-		b.EncodeVarint(38<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FunctionParsingError))
-	case *ErrorCode_IdError:
-		b.EncodeVarint(39<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IdError))
-	case *ErrorCode_ImageError:
-		b.EncodeVarint(40<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ImageError))
-	case *ErrorCode_LanguageCodeError:
-		b.EncodeVarint(110<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.LanguageCodeError))
-	case *ErrorCode_MediaBundleError:
-		b.EncodeVarint(42<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MediaBundleError))
-	case *ErrorCode_MediaUploadError:
-		b.EncodeVarint(116<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MediaUploadError))
-	case *ErrorCode_MediaFileError:
-		b.EncodeVarint(86<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MediaFileError))
-	case *ErrorCode_MultiplierError:
-		b.EncodeVarint(44<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MultiplierError))
-	case *ErrorCode_NewResourceCreationError:
-		b.EncodeVarint(45<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NewResourceCreationError))
-	case *ErrorCode_NotEmptyError:
-		b.EncodeVarint(46<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NotEmptyError))
-	case *ErrorCode_NullError:
-		b.EncodeVarint(47<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullError))
-	case *ErrorCode_OperatorError:
-		b.EncodeVarint(48<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OperatorError))
-	case *ErrorCode_RangeError:
-		b.EncodeVarint(49<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RangeError))
-	case *ErrorCode_RecommendationError:
-		b.EncodeVarint(58<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RecommendationError))
-	case *ErrorCode_RegionCodeError:
-		b.EncodeVarint(51<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RegionCodeError))
-	case *ErrorCode_SettingError:
-		b.EncodeVarint(52<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SettingError))
-	case *ErrorCode_StringFormatError:
-		b.EncodeVarint(53<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.StringFormatError))
-	case *ErrorCode_StringLengthError:
-		b.EncodeVarint(54<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.StringLengthError))
-	case *ErrorCode_OperationAccessDeniedError:
-		b.EncodeVarint(55<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OperationAccessDeniedError))
-	case *ErrorCode_ResourceAccessDeniedError:
-		b.EncodeVarint(56<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ResourceAccessDeniedError))
-	case *ErrorCode_ResourceCountLimitExceededError:
-		b.EncodeVarint(57<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ResourceCountLimitExceededError))
-	case *ErrorCode_YoutubeVideoRegistrationError:
-		b.EncodeVarint(117<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.YoutubeVideoRegistrationError))
-	case *ErrorCode_AdGroupBidModifierError:
-		b.EncodeVarint(59<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdGroupBidModifierError))
-	case *ErrorCode_ContextError:
-		b.EncodeVarint(60<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ContextError))
-	case *ErrorCode_FieldError:
-		b.EncodeVarint(61<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FieldError))
-	case *ErrorCode_SharedSetError:
-		b.EncodeVarint(62<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SharedSetError))
-	case *ErrorCode_SharedCriterionError:
-		b.EncodeVarint(63<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SharedCriterionError))
-	case *ErrorCode_CampaignSharedSetError:
-		b.EncodeVarint(64<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CampaignSharedSetError))
-	case *ErrorCode_ConversionActionError:
-		b.EncodeVarint(65<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ConversionActionError))
-	case *ErrorCode_ConversionAdjustmentUploadError:
-		b.EncodeVarint(115<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ConversionAdjustmentUploadError))
-	case *ErrorCode_ConversionUploadError:
-		b.EncodeVarint(111<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ConversionUploadError))
-	case *ErrorCode_HeaderError:
-		b.EncodeVarint(66<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.HeaderError))
-	case *ErrorCode_DatabaseError:
-		b.EncodeVarint(67<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.DatabaseError))
-	case *ErrorCode_PolicyFindingError:
-		b.EncodeVarint(68<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.PolicyFindingError))
-	case *ErrorCode_EnumError:
-		b.EncodeVarint(70<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.EnumError))
-	case *ErrorCode_KeywordPlanError:
-		b.EncodeVarint(71<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.KeywordPlanError))
-	case *ErrorCode_KeywordPlanCampaignError:
-		b.EncodeVarint(72<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.KeywordPlanCampaignError))
-	case *ErrorCode_KeywordPlanNegativeKeywordError:
-		b.EncodeVarint(73<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.KeywordPlanNegativeKeywordError))
-	case *ErrorCode_KeywordPlanAdGroupError:
-		b.EncodeVarint(74<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.KeywordPlanAdGroupError))
-	case *ErrorCode_KeywordPlanKeywordError:
-		b.EncodeVarint(75<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.KeywordPlanKeywordError))
-	case *ErrorCode_KeywordPlanIdeaError:
-		b.EncodeVarint(76<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.KeywordPlanIdeaError))
-	case *ErrorCode_AccountBudgetProposalError:
-		b.EncodeVarint(77<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AccountBudgetProposalError))
-	case *ErrorCode_UserListError:
-		b.EncodeVarint(78<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.UserListError))
-	case *ErrorCode_ChangeStatusError:
-		b.EncodeVarint(79<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ChangeStatusError))
-	case *ErrorCode_FeedError:
-		b.EncodeVarint(80<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FeedError))
-	case *ErrorCode_GeoTargetConstantSuggestionError:
-		b.EncodeVarint(81<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.GeoTargetConstantSuggestionError))
-	case *ErrorCode_FeedItemError:
-		b.EncodeVarint(83<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FeedItemError))
-	case *ErrorCode_LabelError:
-		b.EncodeVarint(84<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.LabelError))
-	case *ErrorCode_BillingSetupError:
-		b.EncodeVarint(87<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.BillingSetupError))
-	case *ErrorCode_CustomerClientLinkError:
-		b.EncodeVarint(88<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CustomerClientLinkError))
-	case *ErrorCode_CustomerManagerLinkError:
-		b.EncodeVarint(91<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CustomerManagerLinkError))
-	case *ErrorCode_FeedMappingError:
-		b.EncodeVarint(92<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FeedMappingError))
-	case *ErrorCode_CustomerFeedError:
-		b.EncodeVarint(93<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CustomerFeedError))
-	case *ErrorCode_AdGroupFeedError:
-		b.EncodeVarint(94<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdGroupFeedError))
-	case *ErrorCode_CampaignFeedError:
-		b.EncodeVarint(96<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CampaignFeedError))
-	case *ErrorCode_CustomInterestError:
-		b.EncodeVarint(97<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CustomInterestError))
-	case *ErrorCode_ExtensionFeedItemError:
-		b.EncodeVarint(100<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ExtensionFeedItemError))
-	case *ErrorCode_AdParameterError:
-		b.EncodeVarint(101<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdParameterError))
-	case *ErrorCode_FeedItemValidationError:
-		b.EncodeVarint(102<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FeedItemValidationError))
-	case *ErrorCode_ExtensionSettingError:
-		b.EncodeVarint(103<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ExtensionSettingError))
-	case *ErrorCode_FeedItemTargetError:
-		b.EncodeVarint(104<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FeedItemTargetError))
-	case *ErrorCode_PolicyViolationError:
-		b.EncodeVarint(105<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.PolicyViolationError))
-	case *ErrorCode_MutateJobError:
-		b.EncodeVarint(108<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MutateJobError))
-	case *ErrorCode_PartialFailureError:
-		b.EncodeVarint(112<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.PartialFailureError))
-	case *ErrorCode_PolicyValidationParameterError:
-		b.EncodeVarint(114<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.PolicyValidationParameterError))
-	case *ErrorCode_SizeLimitError:
-		b.EncodeVarint(118<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SizeLimitError))
-	case nil:
-	default:
-		return fmt.Errorf("ErrorCode.ErrorCode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ErrorCode_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ErrorCode)
-	switch tag {
-	case 1: // error_code.request_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_RequestError{RequestErrorEnum_RequestError(x)}
-		return true, err
-	case 2: // error_code.bidding_strategy_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_BiddingStrategyError{BiddingStrategyErrorEnum_BiddingStrategyError(x)}
-		return true, err
-	case 3: // error_code.url_field_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_UrlFieldError{UrlFieldErrorEnum_UrlFieldError(x)}
-		return true, err
-	case 4: // error_code.list_operation_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ListOperationError{ListOperationErrorEnum_ListOperationError(x)}
-		return true, err
-	case 5: // error_code.query_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_QueryError{QueryErrorEnum_QueryError(x)}
-		return true, err
-	case 7: // error_code.mutate_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_MutateError{MutateErrorEnum_MutateError(x)}
-		return true, err
-	case 8: // error_code.field_mask_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FieldMaskError{FieldMaskErrorEnum_FieldMaskError(x)}
-		return true, err
-	case 9: // error_code.authorization_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AuthorizationError{AuthorizationErrorEnum_AuthorizationError(x)}
-		return true, err
-	case 10: // error_code.internal_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_InternalError{InternalErrorEnum_InternalError(x)}
-		return true, err
-	case 11: // error_code.quota_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_QuotaError{QuotaErrorEnum_QuotaError(x)}
-		return true, err
-	case 12: // error_code.ad_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdError{AdErrorEnum_AdError(x)}
-		return true, err
-	case 13: // error_code.ad_group_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdGroupError{AdGroupErrorEnum_AdGroupError(x)}
-		return true, err
-	case 14: // error_code.campaign_budget_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CampaignBudgetError{CampaignBudgetErrorEnum_CampaignBudgetError(x)}
-		return true, err
-	case 15: // error_code.campaign_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CampaignError{CampaignErrorEnum_CampaignError(x)}
-		return true, err
-	case 17: // error_code.authentication_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AuthenticationError{AuthenticationErrorEnum_AuthenticationError(x)}
-		return true, err
-	case 18: // error_code.ad_group_criterion_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdGroupCriterionError{AdGroupCriterionErrorEnum_AdGroupCriterionError(x)}
-		return true, err
-	case 19: // error_code.ad_customizer_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdCustomizerError{AdCustomizerErrorEnum_AdCustomizerError(x)}
-		return true, err
-	case 21: // error_code.ad_group_ad_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdGroupAdError{AdGroupAdErrorEnum_AdGroupAdError(x)}
-		return true, err
-	case 24: // error_code.ad_sharing_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdSharingError{AdSharingErrorEnum_AdSharingError(x)}
-		return true, err
-	case 25: // error_code.adx_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdxError{AdxErrorEnum_AdxError(x)}
-		return true, err
-	case 107: // error_code.asset_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AssetError{AssetErrorEnum_AssetError(x)}
-		return true, err
-	case 26: // error_code.bidding_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_BiddingError{BiddingErrorEnum_BiddingError(x)}
-		return true, err
-	case 29: // error_code.campaign_criterion_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CampaignCriterionError{CampaignCriterionErrorEnum_CampaignCriterionError(x)}
-		return true, err
-	case 31: // error_code.collection_size_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CollectionSizeError{CollectionSizeErrorEnum_CollectionSizeError(x)}
-		return true, err
-	case 109: // error_code.country_code_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CountryCodeError{CountryCodeErrorEnum_CountryCodeError(x)}
-		return true, err
-	case 32: // error_code.criterion_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CriterionError{CriterionErrorEnum_CriterionError(x)}
-		return true, err
-	case 90: // error_code.customer_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CustomerError{CustomerErrorEnum_CustomerError(x)}
-		return true, err
-	case 33: // error_code.date_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_DateError{DateErrorEnum_DateError(x)}
-		return true, err
-	case 34: // error_code.date_range_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_DateRangeError{DateRangeErrorEnum_DateRangeError(x)}
-		return true, err
-	case 35: // error_code.distinct_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_DistinctError{DistinctErrorEnum_DistinctError(x)}
-		return true, err
-	case 36: // error_code.feed_attribute_reference_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FeedAttributeReferenceError{FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError(x)}
-		return true, err
-	case 37: // error_code.function_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FunctionError{FunctionErrorEnum_FunctionError(x)}
-		return true, err
-	case 38: // error_code.function_parsing_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FunctionParsingError{FunctionParsingErrorEnum_FunctionParsingError(x)}
-		return true, err
-	case 39: // error_code.id_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_IdError{IdErrorEnum_IdError(x)}
-		return true, err
-	case 40: // error_code.image_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ImageError{ImageErrorEnum_ImageError(x)}
-		return true, err
-	case 110: // error_code.language_code_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_LanguageCodeError{LanguageCodeErrorEnum_LanguageCodeError(x)}
-		return true, err
-	case 42: // error_code.media_bundle_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_MediaBundleError{MediaBundleErrorEnum_MediaBundleError(x)}
-		return true, err
-	case 116: // error_code.media_upload_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_MediaUploadError{MediaUploadErrorEnum_MediaUploadError(x)}
-		return true, err
-	case 86: // error_code.media_file_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_MediaFileError{MediaFileErrorEnum_MediaFileError(x)}
-		return true, err
-	case 44: // error_code.multiplier_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_MultiplierError{MultiplierErrorEnum_MultiplierError(x)}
-		return true, err
-	case 45: // error_code.new_resource_creation_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_NewResourceCreationError{NewResourceCreationErrorEnum_NewResourceCreationError(x)}
-		return true, err
-	case 46: // error_code.not_empty_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_NotEmptyError{NotEmptyErrorEnum_NotEmptyError(x)}
-		return true, err
-	case 47: // error_code.null_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_NullError{NullErrorEnum_NullError(x)}
-		return true, err
-	case 48: // error_code.operator_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_OperatorError{OperatorErrorEnum_OperatorError(x)}
-		return true, err
-	case 49: // error_code.range_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_RangeError{RangeErrorEnum_RangeError(x)}
-		return true, err
-	case 58: // error_code.recommendation_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_RecommendationError{RecommendationErrorEnum_RecommendationError(x)}
-		return true, err
-	case 51: // error_code.region_code_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_RegionCodeError{RegionCodeErrorEnum_RegionCodeError(x)}
-		return true, err
-	case 52: // error_code.setting_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_SettingError{SettingErrorEnum_SettingError(x)}
-		return true, err
-	case 53: // error_code.string_format_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_StringFormatError{StringFormatErrorEnum_StringFormatError(x)}
-		return true, err
-	case 54: // error_code.string_length_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_StringLengthError{StringLengthErrorEnum_StringLengthError(x)}
-		return true, err
-	case 55: // error_code.operation_access_denied_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_OperationAccessDeniedError{OperationAccessDeniedErrorEnum_OperationAccessDeniedError(x)}
-		return true, err
-	case 56: // error_code.resource_access_denied_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ResourceAccessDeniedError{ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError(x)}
-		return true, err
-	case 57: // error_code.resource_count_limit_exceeded_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ResourceCountLimitExceededError{ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError(x)}
-		return true, err
-	case 117: // error_code.youtube_video_registration_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_YoutubeVideoRegistrationError{YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError(x)}
-		return true, err
-	case 59: // error_code.ad_group_bid_modifier_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdGroupBidModifierError{AdGroupBidModifierErrorEnum_AdGroupBidModifierError(x)}
-		return true, err
-	case 60: // error_code.context_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ContextError{ContextErrorEnum_ContextError(x)}
-		return true, err
-	case 61: // error_code.field_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FieldError{FieldErrorEnum_FieldError(x)}
-		return true, err
-	case 62: // error_code.shared_set_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_SharedSetError{SharedSetErrorEnum_SharedSetError(x)}
-		return true, err
-	case 63: // error_code.shared_criterion_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_SharedCriterionError{SharedCriterionErrorEnum_SharedCriterionError(x)}
-		return true, err
-	case 64: // error_code.campaign_shared_set_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CampaignSharedSetError{CampaignSharedSetErrorEnum_CampaignSharedSetError(x)}
-		return true, err
-	case 65: // error_code.conversion_action_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ConversionActionError{ConversionActionErrorEnum_ConversionActionError(x)}
-		return true, err
-	case 115: // error_code.conversion_adjustment_upload_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ConversionAdjustmentUploadError{ConversionAdjustmentUploadErrorEnum_ConversionAdjustmentUploadError(x)}
-		return true, err
-	case 111: // error_code.conversion_upload_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ConversionUploadError{ConversionUploadErrorEnum_ConversionUploadError(x)}
-		return true, err
-	case 66: // error_code.header_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_HeaderError{HeaderErrorEnum_HeaderError(x)}
-		return true, err
-	case 67: // error_code.database_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_DatabaseError{DatabaseErrorEnum_DatabaseError(x)}
-		return true, err
-	case 68: // error_code.policy_finding_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_PolicyFindingError{PolicyFindingErrorEnum_PolicyFindingError(x)}
-		return true, err
-	case 70: // error_code.enum_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_EnumError{EnumErrorEnum_EnumError(x)}
-		return true, err
-	case 71: // error_code.keyword_plan_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_KeywordPlanError{KeywordPlanErrorEnum_KeywordPlanError(x)}
-		return true, err
-	case 72: // error_code.keyword_plan_campaign_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_KeywordPlanCampaignError{KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError(x)}
-		return true, err
-	case 73: // error_code.keyword_plan_negative_keyword_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_KeywordPlanNegativeKeywordError{KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError(x)}
-		return true, err
-	case 74: // error_code.keyword_plan_ad_group_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_KeywordPlanAdGroupError{KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError(x)}
-		return true, err
-	case 75: // error_code.keyword_plan_keyword_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_KeywordPlanKeywordError{KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError(x)}
-		return true, err
-	case 76: // error_code.keyword_plan_idea_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_KeywordPlanIdeaError{KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError(x)}
-		return true, err
-	case 77: // error_code.account_budget_proposal_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AccountBudgetProposalError{AccountBudgetProposalErrorEnum_AccountBudgetProposalError(x)}
-		return true, err
-	case 78: // error_code.user_list_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_UserListError{UserListErrorEnum_UserListError(x)}
-		return true, err
-	case 79: // error_code.change_status_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ChangeStatusError{ChangeStatusErrorEnum_ChangeStatusError(x)}
-		return true, err
-	case 80: // error_code.feed_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FeedError{FeedErrorEnum_FeedError(x)}
-		return true, err
-	case 81: // error_code.geo_target_constant_suggestion_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_GeoTargetConstantSuggestionError{GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError(x)}
-		return true, err
-	case 83: // error_code.feed_item_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FeedItemError{FeedItemErrorEnum_FeedItemError(x)}
-		return true, err
-	case 84: // error_code.label_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_LabelError{LabelErrorEnum_LabelError(x)}
-		return true, err
-	case 87: // error_code.billing_setup_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_BillingSetupError{BillingSetupErrorEnum_BillingSetupError(x)}
-		return true, err
-	case 88: // error_code.customer_client_link_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CustomerClientLinkError{CustomerClientLinkErrorEnum_CustomerClientLinkError(x)}
-		return true, err
-	case 91: // error_code.customer_manager_link_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CustomerManagerLinkError{CustomerManagerLinkErrorEnum_CustomerManagerLinkError(x)}
-		return true, err
-	case 92: // error_code.feed_mapping_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FeedMappingError{FeedMappingErrorEnum_FeedMappingError(x)}
-		return true, err
-	case 93: // error_code.customer_feed_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CustomerFeedError{CustomerFeedErrorEnum_CustomerFeedError(x)}
-		return true, err
-	case 94: // error_code.ad_group_feed_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdGroupFeedError{AdGroupFeedErrorEnum_AdGroupFeedError(x)}
-		return true, err
-	case 96: // error_code.campaign_feed_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CampaignFeedError{CampaignFeedErrorEnum_CampaignFeedError(x)}
-		return true, err
-	case 97: // error_code.custom_interest_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_CustomInterestError{CustomInterestErrorEnum_CustomInterestError(x)}
-		return true, err
-	case 100: // error_code.extension_feed_item_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ExtensionFeedItemError{ExtensionFeedItemErrorEnum_ExtensionFeedItemError(x)}
-		return true, err
-	case 101: // error_code.ad_parameter_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_AdParameterError{AdParameterErrorEnum_AdParameterError(x)}
-		return true, err
-	case 102: // error_code.feed_item_validation_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FeedItemValidationError{FeedItemValidationErrorEnum_FeedItemValidationError(x)}
-		return true, err
-	case 103: // error_code.extension_setting_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_ExtensionSettingError{ExtensionSettingErrorEnum_ExtensionSettingError(x)}
-		return true, err
-	case 104: // error_code.feed_item_target_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_FeedItemTargetError{FeedItemTargetErrorEnum_FeedItemTargetError(x)}
-		return true, err
-	case 105: // error_code.policy_violation_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_PolicyViolationError{PolicyViolationErrorEnum_PolicyViolationError(x)}
-		return true, err
-	case 108: // error_code.mutate_job_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_MutateJobError{MutateJobErrorEnum_MutateJobError(x)}
-		return true, err
-	case 112: // error_code.partial_failure_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_PartialFailureError{PartialFailureErrorEnum_PartialFailureError(x)}
-		return true, err
-	case 114: // error_code.policy_validation_parameter_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_PolicyValidationParameterError{PolicyValidationParameterErrorEnum_PolicyValidationParameterError(x)}
-		return true, err
-	case 118: // error_code.size_limit_error
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ErrorCode = &ErrorCode_SizeLimitError{SizeLimitErrorEnum_SizeLimitError(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ErrorCode_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ErrorCode)
-	// error_code
-	switch x := m.ErrorCode.(type) {
-	case *ErrorCode_RequestError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.RequestError))
-	case *ErrorCode_BiddingStrategyError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.BiddingStrategyError))
-	case *ErrorCode_UrlFieldError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.UrlFieldError))
-	case *ErrorCode_ListOperationError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ListOperationError))
-	case *ErrorCode_QueryError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.QueryError))
-	case *ErrorCode_MutateError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.MutateError))
-	case *ErrorCode_FieldMaskError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.FieldMaskError))
-	case *ErrorCode_AuthorizationError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.AuthorizationError))
-	case *ErrorCode_InternalError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.InternalError))
-	case *ErrorCode_QuotaError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.QuotaError))
-	case *ErrorCode_AdError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdError))
-	case *ErrorCode_AdGroupError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdGroupError))
-	case *ErrorCode_CampaignBudgetError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CampaignBudgetError))
-	case *ErrorCode_CampaignError:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CampaignError))
-	case *ErrorCode_AuthenticationError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AuthenticationError))
-	case *ErrorCode_AdGroupCriterionError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdGroupCriterionError))
-	case *ErrorCode_AdCustomizerError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdCustomizerError))
-	case *ErrorCode_AdGroupAdError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdGroupAdError))
-	case *ErrorCode_AdSharingError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdSharingError))
-	case *ErrorCode_AdxError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdxError))
-	case *ErrorCode_AssetError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AssetError))
-	case *ErrorCode_BiddingError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.BiddingError))
-	case *ErrorCode_CampaignCriterionError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CampaignCriterionError))
-	case *ErrorCode_CollectionSizeError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CollectionSizeError))
-	case *ErrorCode_CountryCodeError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CountryCodeError))
-	case *ErrorCode_CriterionError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CriterionError))
-	case *ErrorCode_CustomerError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CustomerError))
-	case *ErrorCode_DateError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.DateError))
-	case *ErrorCode_DateRangeError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.DateRangeError))
-	case *ErrorCode_DistinctError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.DistinctError))
-	case *ErrorCode_FeedAttributeReferenceError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FeedAttributeReferenceError))
-	case *ErrorCode_FunctionError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FunctionError))
-	case *ErrorCode_FunctionParsingError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FunctionParsingError))
-	case *ErrorCode_IdError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.IdError))
-	case *ErrorCode_ImageError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ImageError))
-	case *ErrorCode_LanguageCodeError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.LanguageCodeError))
-	case *ErrorCode_MediaBundleError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.MediaBundleError))
-	case *ErrorCode_MediaUploadError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.MediaUploadError))
-	case *ErrorCode_MediaFileError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.MediaFileError))
-	case *ErrorCode_MultiplierError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.MultiplierError))
-	case *ErrorCode_NewResourceCreationError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.NewResourceCreationError))
-	case *ErrorCode_NotEmptyError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.NotEmptyError))
-	case *ErrorCode_NullError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullError))
-	case *ErrorCode_OperatorError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OperatorError))
-	case *ErrorCode_RangeError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.RangeError))
-	case *ErrorCode_RecommendationError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.RecommendationError))
-	case *ErrorCode_RegionCodeError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.RegionCodeError))
-	case *ErrorCode_SettingError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.SettingError))
-	case *ErrorCode_StringFormatError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.StringFormatError))
-	case *ErrorCode_StringLengthError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.StringLengthError))
-	case *ErrorCode_OperationAccessDeniedError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OperationAccessDeniedError))
-	case *ErrorCode_ResourceAccessDeniedError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ResourceAccessDeniedError))
-	case *ErrorCode_ResourceCountLimitExceededError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ResourceCountLimitExceededError))
-	case *ErrorCode_YoutubeVideoRegistrationError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.YoutubeVideoRegistrationError))
-	case *ErrorCode_AdGroupBidModifierError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdGroupBidModifierError))
-	case *ErrorCode_ContextError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ContextError))
-	case *ErrorCode_FieldError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FieldError))
-	case *ErrorCode_SharedSetError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.SharedSetError))
-	case *ErrorCode_SharedCriterionError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.SharedCriterionError))
-	case *ErrorCode_CampaignSharedSetError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CampaignSharedSetError))
-	case *ErrorCode_ConversionActionError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ConversionActionError))
-	case *ErrorCode_ConversionAdjustmentUploadError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ConversionAdjustmentUploadError))
-	case *ErrorCode_ConversionUploadError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ConversionUploadError))
-	case *ErrorCode_HeaderError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.HeaderError))
-	case *ErrorCode_DatabaseError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.DatabaseError))
-	case *ErrorCode_PolicyFindingError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.PolicyFindingError))
-	case *ErrorCode_EnumError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.EnumError))
-	case *ErrorCode_KeywordPlanError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.KeywordPlanError))
-	case *ErrorCode_KeywordPlanCampaignError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.KeywordPlanCampaignError))
-	case *ErrorCode_KeywordPlanNegativeKeywordError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.KeywordPlanNegativeKeywordError))
-	case *ErrorCode_KeywordPlanAdGroupError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.KeywordPlanAdGroupError))
-	case *ErrorCode_KeywordPlanKeywordError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.KeywordPlanKeywordError))
-	case *ErrorCode_KeywordPlanIdeaError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.KeywordPlanIdeaError))
-	case *ErrorCode_AccountBudgetProposalError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AccountBudgetProposalError))
-	case *ErrorCode_UserListError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.UserListError))
-	case *ErrorCode_ChangeStatusError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ChangeStatusError))
-	case *ErrorCode_FeedError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FeedError))
-	case *ErrorCode_GeoTargetConstantSuggestionError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.GeoTargetConstantSuggestionError))
-	case *ErrorCode_FeedItemError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FeedItemError))
-	case *ErrorCode_LabelError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.LabelError))
-	case *ErrorCode_BillingSetupError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.BillingSetupError))
-	case *ErrorCode_CustomerClientLinkError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CustomerClientLinkError))
-	case *ErrorCode_CustomerManagerLinkError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CustomerManagerLinkError))
-	case *ErrorCode_FeedMappingError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FeedMappingError))
-	case *ErrorCode_CustomerFeedError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CustomerFeedError))
-	case *ErrorCode_AdGroupFeedError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdGroupFeedError))
-	case *ErrorCode_CampaignFeedError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CampaignFeedError))
-	case *ErrorCode_CustomInterestError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CustomInterestError))
-	case *ErrorCode_ExtensionFeedItemError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ExtensionFeedItemError))
-	case *ErrorCode_AdParameterError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdParameterError))
-	case *ErrorCode_FeedItemValidationError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FeedItemValidationError))
-	case *ErrorCode_ExtensionSettingError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ExtensionSettingError))
-	case *ErrorCode_FeedItemTargetError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FeedItemTargetError))
-	case *ErrorCode_PolicyViolationError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.PolicyViolationError))
-	case *ErrorCode_MutateJobError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.MutateJobError))
-	case *ErrorCode_PartialFailureError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.PartialFailureError))
-	case *ErrorCode_PolicyValidationParameterError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.PolicyValidationParameterError))
-	case *ErrorCode_SizeLimitError:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.SizeLimitError))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Describes the part of the request proto that caused the error.
 type ErrorLocation struct {
 	// A field path that indicates which field was invalid in the request.
@@ -2978,16 +1680,17 @@ func (m *ErrorLocation) Reset()         { *m = ErrorLocation{} }
 func (m *ErrorLocation) String() string { return proto.CompactTextString(m) }
 func (*ErrorLocation) ProtoMessage()    {}
 func (*ErrorLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{3}
+	return fileDescriptor_857fbb2e615b330c, []int{3}
 }
+
 func (m *ErrorLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorLocation.Unmarshal(m, b)
 }
 func (m *ErrorLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorLocation.Marshal(b, m, deterministic)
 }
-func (dst *ErrorLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorLocation.Merge(dst, src)
+func (m *ErrorLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorLocation.Merge(m, src)
 }
 func (m *ErrorLocation) XXX_Size() int {
 	return xxx_messageInfo_ErrorLocation.Size(m)
@@ -3020,16 +1723,17 @@ func (m *ErrorLocation_FieldPathElement) Reset()         { *m = ErrorLocation_Fi
 func (m *ErrorLocation_FieldPathElement) String() string { return proto.CompactTextString(m) }
 func (*ErrorLocation_FieldPathElement) ProtoMessage()    {}
 func (*ErrorLocation_FieldPathElement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{3, 0}
+	return fileDescriptor_857fbb2e615b330c, []int{3, 0}
 }
+
 func (m *ErrorLocation_FieldPathElement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorLocation_FieldPathElement.Unmarshal(m, b)
 }
 func (m *ErrorLocation_FieldPathElement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorLocation_FieldPathElement.Marshal(b, m, deterministic)
 }
-func (dst *ErrorLocation_FieldPathElement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorLocation_FieldPathElement.Merge(dst, src)
+func (m *ErrorLocation_FieldPathElement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorLocation_FieldPathElement.Merge(m, src)
 }
 func (m *ErrorLocation_FieldPathElement) XXX_Size() int {
 	return xxx_messageInfo_ErrorLocation_FieldPathElement.Size(m)
@@ -3072,16 +1776,17 @@ func (m *ErrorDetails) Reset()         { *m = ErrorDetails{} }
 func (m *ErrorDetails) String() string { return proto.CompactTextString(m) }
 func (*ErrorDetails) ProtoMessage()    {}
 func (*ErrorDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{4}
+	return fileDescriptor_857fbb2e615b330c, []int{4}
 }
+
 func (m *ErrorDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorDetails.Unmarshal(m, b)
 }
 func (m *ErrorDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorDetails.Marshal(b, m, deterministic)
 }
-func (dst *ErrorDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorDetails.Merge(dst, src)
+func (m *ErrorDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorDetails.Merge(m, src)
 }
 func (m *ErrorDetails) XXX_Size() int {
 	return xxx_messageInfo_ErrorDetails.Size(m)
@@ -3135,16 +1840,17 @@ func (m *PolicyViolationDetails) Reset()         { *m = PolicyViolationDetails{}
 func (m *PolicyViolationDetails) String() string { return proto.CompactTextString(m) }
 func (*PolicyViolationDetails) ProtoMessage()    {}
 func (*PolicyViolationDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{5}
+	return fileDescriptor_857fbb2e615b330c, []int{5}
 }
+
 func (m *PolicyViolationDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyViolationDetails.Unmarshal(m, b)
 }
 func (m *PolicyViolationDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyViolationDetails.Marshal(b, m, deterministic)
 }
-func (dst *PolicyViolationDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyViolationDetails.Merge(dst, src)
+func (m *PolicyViolationDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyViolationDetails.Merge(m, src)
 }
 func (m *PolicyViolationDetails) XXX_Size() int {
 	return xxx_messageInfo_PolicyViolationDetails.Size(m)
@@ -3200,16 +1906,17 @@ func (m *PolicyFindingDetails) Reset()         { *m = PolicyFindingDetails{} }
 func (m *PolicyFindingDetails) String() string { return proto.CompactTextString(m) }
 func (*PolicyFindingDetails) ProtoMessage()    {}
 func (*PolicyFindingDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_errors_70395b57fa918bda, []int{6}
+	return fileDescriptor_857fbb2e615b330c, []int{6}
 }
+
 func (m *PolicyFindingDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyFindingDetails.Unmarshal(m, b)
 }
 func (m *PolicyFindingDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyFindingDetails.Marshal(b, m, deterministic)
 }
-func (dst *PolicyFindingDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyFindingDetails.Merge(dst, src)
+func (m *PolicyFindingDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyFindingDetails.Merge(m, src)
 }
 func (m *PolicyFindingDetails) XXX_Size() int {
 	return xxx_messageInfo_PolicyFindingDetails.Size(m)
@@ -3239,10 +1946,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/errors.proto", fileDescriptor_errors_70395b57fa918bda)
+	proto.RegisterFile("google/ads/googleads/v1/errors/errors.proto", fileDescriptor_857fbb2e615b330c)
 }
 
-var fileDescriptor_errors_70395b57fa918bda = []byte{
+var fileDescriptor_857fbb2e615b330c = []byte{
 	// 3983 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x5c, 0xcd, 0x73, 0x1c, 0xb9,
 	0x75, 0x9f, 0xd1, 0x66, 0x57, 0x22, 0x28, 0x51, 0x52, 0x8b, 0xab, 0x85, 0x24, 0x4b, 0x96, 0xb9,
diff --git a/googleapis/ads/googleads/v1/errors/extension_feed_item_error.pb.go b/googleapis/ads/googleads/v1/errors/extension_feed_item_error.pb.go
index f1cb8e7a30..f717cf754e 100644
--- a/googleapis/ads/googleads/v1/errors/extension_feed_item_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/extension_feed_item_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/extension_feed_item_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible extension feed item errors.
 type ExtensionFeedItemErrorEnum_ExtensionFeedItemError int32
@@ -177,6 +180,7 @@ var ExtensionFeedItemErrorEnum_ExtensionFeedItemError_name = map[int32]string{
 	43: "PROMOTION_INVALID_TIME",
 	44: "TOO_MANY_DECIMAL_PLACES_SPECIFIED",
 }
+
 var ExtensionFeedItemErrorEnum_ExtensionFeedItemError_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"UNKNOWN":            1,
@@ -228,8 +232,9 @@ var ExtensionFeedItemErrorEnum_ExtensionFeedItemError_value = map[string]int32{
 func (x ExtensionFeedItemErrorEnum_ExtensionFeedItemError) String() string {
 	return proto.EnumName(ExtensionFeedItemErrorEnum_ExtensionFeedItemError_name, int32(x))
 }
+
 func (ExtensionFeedItemErrorEnum_ExtensionFeedItemError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_error_4484ec81d93b3330, []int{0, 0}
+	return fileDescriptor_5c3cc3411bdbe205, []int{0, 0}
 }
 
 // Container for enum describing possible extension feed item error.
@@ -243,16 +248,17 @@ func (m *ExtensionFeedItemErrorEnum) Reset()         { *m = ExtensionFeedItemErr
 func (m *ExtensionFeedItemErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ExtensionFeedItemErrorEnum) ProtoMessage()    {}
 func (*ExtensionFeedItemErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_error_4484ec81d93b3330, []int{0}
+	return fileDescriptor_5c3cc3411bdbe205, []int{0}
 }
+
 func (m *ExtensionFeedItemErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtensionFeedItemErrorEnum.Unmarshal(m, b)
 }
 func (m *ExtensionFeedItemErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExtensionFeedItemErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ExtensionFeedItemErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtensionFeedItemErrorEnum.Merge(dst, src)
+func (m *ExtensionFeedItemErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionFeedItemErrorEnum.Merge(m, src)
 }
 func (m *ExtensionFeedItemErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ExtensionFeedItemErrorEnum.Size(m)
@@ -264,15 +270,15 @@ func (m *ExtensionFeedItemErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ExtensionFeedItemErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ExtensionFeedItemErrorEnum)(nil), "google.ads.googleads.v1.errors.ExtensionFeedItemErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ExtensionFeedItemErrorEnum_ExtensionFeedItemError", ExtensionFeedItemErrorEnum_ExtensionFeedItemError_name, ExtensionFeedItemErrorEnum_ExtensionFeedItemError_value)
+	proto.RegisterType((*ExtensionFeedItemErrorEnum)(nil), "google.ads.googleads.v1.errors.ExtensionFeedItemErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/extension_feed_item_error.proto", fileDescriptor_extension_feed_item_error_4484ec81d93b3330)
+	proto.RegisterFile("google/ads/googleads/v1/errors/extension_feed_item_error.proto", fileDescriptor_5c3cc3411bdbe205)
 }
 
-var fileDescriptor_extension_feed_item_error_4484ec81d93b3330 = []byte{
+var fileDescriptor_5c3cc3411bdbe205 = []byte{
 	// 1056 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0xdd, 0x8e, 0x53, 0x37,
 	0x10, 0x2e, 0x4b, 0x0b, 0xad, 0x29, 0x60, 0x5c, 0x58, 0x60, 0x17, 0x96, 0x12, 0xfe, 0x29, 0x24,
diff --git a/googleapis/ads/googleads/v1/errors/extension_setting_error.pb.go b/googleapis/ads/googleads/v1/errors/extension_setting_error.pb.go
index b197725495..f507b64a24 100644
--- a/googleapis/ads/googleads/v1/errors/extension_setting_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/extension_setting_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/extension_setting_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible extension setting errors.
 type ExtensionSettingErrorEnum_ExtensionSettingError int32
@@ -246,6 +249,7 @@ var ExtensionSettingErrorEnum_ExtensionSettingError_name = map[int32]string{
 	66: "CUSTOMER_CONSENT_FOR_CALL_RECORDING_REQUIRED",
 	67: "EXTENSION_SETTING_UPDATE_IS_A_NOOP",
 }
+
 var ExtensionSettingErrorEnum_ExtensionSettingError_value = map[string]int32{
 	"UNSPECIFIED":                       0,
 	"UNKNOWN":                           1,
@@ -318,8 +322,9 @@ var ExtensionSettingErrorEnum_ExtensionSettingError_value = map[string]int32{
 func (x ExtensionSettingErrorEnum_ExtensionSettingError) String() string {
 	return proto.EnumName(ExtensionSettingErrorEnum_ExtensionSettingError_name, int32(x))
 }
+
 func (ExtensionSettingErrorEnum_ExtensionSettingError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_extension_setting_error_36d74918ab80bb6d, []int{0, 0}
+	return fileDescriptor_3dd51a7138a9d084, []int{0, 0}
 }
 
 // Container for enum describing validation errors of extension settings.
@@ -333,16 +338,17 @@ func (m *ExtensionSettingErrorEnum) Reset()         { *m = ExtensionSettingError
 func (m *ExtensionSettingErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ExtensionSettingErrorEnum) ProtoMessage()    {}
 func (*ExtensionSettingErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_setting_error_36d74918ab80bb6d, []int{0}
+	return fileDescriptor_3dd51a7138a9d084, []int{0}
 }
+
 func (m *ExtensionSettingErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtensionSettingErrorEnum.Unmarshal(m, b)
 }
 func (m *ExtensionSettingErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExtensionSettingErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ExtensionSettingErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtensionSettingErrorEnum.Merge(dst, src)
+func (m *ExtensionSettingErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionSettingErrorEnum.Merge(m, src)
 }
 func (m *ExtensionSettingErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ExtensionSettingErrorEnum.Size(m)
@@ -354,15 +360,15 @@ func (m *ExtensionSettingErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ExtensionSettingErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ExtensionSettingErrorEnum)(nil), "google.ads.googleads.v1.errors.ExtensionSettingErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ExtensionSettingErrorEnum_ExtensionSettingError", ExtensionSettingErrorEnum_ExtensionSettingError_name, ExtensionSettingErrorEnum_ExtensionSettingError_value)
+	proto.RegisterType((*ExtensionSettingErrorEnum)(nil), "google.ads.googleads.v1.errors.ExtensionSettingErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/extension_setting_error.proto", fileDescriptor_extension_setting_error_36d74918ab80bb6d)
+	proto.RegisterFile("google/ads/googleads/v1/errors/extension_setting_error.proto", fileDescriptor_3dd51a7138a9d084)
 }
 
-var fileDescriptor_extension_setting_error_36d74918ab80bb6d = []byte{
+var fileDescriptor_3dd51a7138a9d084 = []byte{
 	// 1313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x5d, 0x73, 0x53, 0xb7,
 	0x16, 0xbd, 0x84, 0x7b, 0xe1, 0x5e, 0x71, 0x01, 0x21, 0x08, 0x90, 0x00, 0x01, 0xc2, 0x37, 0x2d,
diff --git a/googleapis/ads/googleads/v1/errors/feed_attribute_reference_error.pb.go b/googleapis/ads/googleads/v1/errors/feed_attribute_reference_error.pb.go
index c23e3aa488..a8e05915c5 100644
--- a/googleapis/ads/googleads/v1/errors/feed_attribute_reference_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/feed_attribute_reference_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/feed_attribute_reference_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible feed attribute reference errors.
 type FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError int32
@@ -42,6 +45,7 @@ var FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError_name = map[int32
 	3: "INVALID_FEED_NAME",
 	4: "INVALID_FEED_ATTRIBUTE_NAME",
 }
+
 var FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError_value = map[string]int32{
 	"UNSPECIFIED":                   0,
 	"UNKNOWN":                       1,
@@ -53,8 +57,9 @@ var FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError_value = map[stri
 func (x FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError) String() string {
 	return proto.EnumName(FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError_name, int32(x))
 }
+
 func (FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_attribute_reference_error_dc3a3bf8c254dc8e, []int{0, 0}
+	return fileDescriptor_1513e40adc63f345, []int{0, 0}
 }
 
 // Container for enum describing possible feed attribute reference errors.
@@ -68,16 +73,17 @@ func (m *FeedAttributeReferenceErrorEnum) Reset()         { *m = FeedAttributeRe
 func (m *FeedAttributeReferenceErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedAttributeReferenceErrorEnum) ProtoMessage()    {}
 func (*FeedAttributeReferenceErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_attribute_reference_error_dc3a3bf8c254dc8e, []int{0}
+	return fileDescriptor_1513e40adc63f345, []int{0}
 }
+
 func (m *FeedAttributeReferenceErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedAttributeReferenceErrorEnum.Unmarshal(m, b)
 }
 func (m *FeedAttributeReferenceErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedAttributeReferenceErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedAttributeReferenceErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedAttributeReferenceErrorEnum.Merge(dst, src)
+func (m *FeedAttributeReferenceErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedAttributeReferenceErrorEnum.Merge(m, src)
 }
 func (m *FeedAttributeReferenceErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedAttributeReferenceErrorEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *FeedAttributeReferenceErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedAttributeReferenceErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedAttributeReferenceErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedAttributeReferenceErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError", FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError_name, FeedAttributeReferenceErrorEnum_FeedAttributeReferenceError_value)
+	proto.RegisterType((*FeedAttributeReferenceErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedAttributeReferenceErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/feed_attribute_reference_error.proto", fileDescriptor_feed_attribute_reference_error_dc3a3bf8c254dc8e)
+	proto.RegisterFile("google/ads/googleads/v1/errors/feed_attribute_reference_error.proto", fileDescriptor_1513e40adc63f345)
 }
 
-var fileDescriptor_feed_attribute_reference_error_dc3a3bf8c254dc8e = []byte{
+var fileDescriptor_1513e40adc63f345 = []byte{
 	// 364 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x6e, 0xa3, 0x30,
 	0x14, 0x86, 0x07, 0x32, 0x9a, 0x91, 0x9c, 0xc5, 0x30, 0x48, 0xb3, 0x99, 0xb4, 0x49, 0xcb, 0x01,
diff --git a/googleapis/ads/googleads/v1/errors/feed_error.pb.go b/googleapis/ads/googleads/v1/errors/feed_error.pb.go
index 3d5bfa05e2..21684d10cb 100644
--- a/googleapis/ads/googleads/v1/errors/feed_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/feed_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/feed_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible feed errors.
 type FeedErrorEnum_FeedError int32
@@ -91,6 +94,7 @@ var FeedErrorEnum_FeedError_name = map[int32]string{
 	19: "BUSINESS_ACCOUNT_CANNOT_ACCESS_LOCATION_ACCOUNT",
 	20: "INVALID_AFFILIATE_CHAIN_ID",
 }
+
 var FeedErrorEnum_FeedError_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -118,8 +122,9 @@ var FeedErrorEnum_FeedError_value = map[string]int32{
 func (x FeedErrorEnum_FeedError) String() string {
 	return proto.EnumName(FeedErrorEnum_FeedError_name, int32(x))
 }
+
 func (FeedErrorEnum_FeedError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_error_55545305caaf267c, []int{0, 0}
+	return fileDescriptor_f6fe8d83f04b74b3, []int{0, 0}
 }
 
 // Container for enum describing possible feed errors.
@@ -133,16 +138,17 @@ func (m *FeedErrorEnum) Reset()         { *m = FeedErrorEnum{} }
 func (m *FeedErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedErrorEnum) ProtoMessage()    {}
 func (*FeedErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_error_55545305caaf267c, []int{0}
+	return fileDescriptor_f6fe8d83f04b74b3, []int{0}
 }
+
 func (m *FeedErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedErrorEnum.Unmarshal(m, b)
 }
 func (m *FeedErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedErrorEnum.Merge(dst, src)
+func (m *FeedErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedErrorEnum.Merge(m, src)
 }
 func (m *FeedErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedErrorEnum.Size(m)
@@ -154,15 +160,15 @@ func (m *FeedErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FeedErrorEnum_FeedError", FeedErrorEnum_FeedError_name, FeedErrorEnum_FeedError_value)
+	proto.RegisterType((*FeedErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/feed_error.proto", fileDescriptor_feed_error_55545305caaf267c)
+	proto.RegisterFile("google/ads/googleads/v1/errors/feed_error.proto", fileDescriptor_f6fe8d83f04b74b3)
 }
 
-var fileDescriptor_feed_error_55545305caaf267c = []byte{
+var fileDescriptor_f6fe8d83f04b74b3 = []byte{
 	// 611 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xdf, 0x6e, 0xd3, 0x3e,
 	0x14, 0xc7, 0x7f, 0xeb, 0x7e, 0xdb, 0x98, 0xf7, 0xcf, 0xf3, 0x06, 0x9b, 0xc6, 0x34, 0xa1, 0x5e,
diff --git a/googleapis/ads/googleads/v1/errors/feed_item_error.pb.go b/googleapis/ads/googleads/v1/errors/feed_item_error.pb.go
index 2fe978b221..6504066f2a 100644
--- a/googleapis/ads/googleads/v1/errors/feed_item_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/feed_item_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/feed_item_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible feed item errors.
 type FeedItemErrorEnum_FeedItemError int32
@@ -60,6 +63,7 @@ var FeedItemErrorEnum_FeedItemError_name = map[int32]string{
 	9:  "CANNOT_MODIFY_KEY_ATTRIBUTE_VALUE",
 	10: "SIZE_TOO_LARGE_FOR_MULTI_VALUE_ATTRIBUTE",
 }
+
 var FeedItemErrorEnum_FeedItemError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -77,8 +81,9 @@ var FeedItemErrorEnum_FeedItemError_value = map[string]int32{
 func (x FeedItemErrorEnum_FeedItemError) String() string {
 	return proto.EnumName(FeedItemErrorEnum_FeedItemError_name, int32(x))
 }
+
 func (FeedItemErrorEnum_FeedItemError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_error_be75ed22e97f1137, []int{0, 0}
+	return fileDescriptor_1ad663dccdbbe49f, []int{0, 0}
 }
 
 // Container for enum describing possible feed item errors.
@@ -92,16 +97,17 @@ func (m *FeedItemErrorEnum) Reset()         { *m = FeedItemErrorEnum{} }
 func (m *FeedItemErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemErrorEnum) ProtoMessage()    {}
 func (*FeedItemErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_error_be75ed22e97f1137, []int{0}
+	return fileDescriptor_1ad663dccdbbe49f, []int{0}
 }
+
 func (m *FeedItemErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemErrorEnum.Unmarshal(m, b)
 }
 func (m *FeedItemErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemErrorEnum.Merge(dst, src)
+func (m *FeedItemErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemErrorEnum.Merge(m, src)
 }
 func (m *FeedItemErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemErrorEnum.Size(m)
@@ -113,15 +119,15 @@ func (m *FeedItemErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedItemErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FeedItemErrorEnum_FeedItemError", FeedItemErrorEnum_FeedItemError_name, FeedItemErrorEnum_FeedItemError_value)
+	proto.RegisterType((*FeedItemErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedItemErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/feed_item_error.proto", fileDescriptor_feed_item_error_be75ed22e97f1137)
+	proto.RegisterFile("google/ads/googleads/v1/errors/feed_item_error.proto", fileDescriptor_1ad663dccdbbe49f)
 }
 
-var fileDescriptor_feed_item_error_be75ed22e97f1137 = []byte{
+var fileDescriptor_1ad663dccdbbe49f = []byte{
 	// 485 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x8a, 0xd3, 0x40,
 	0x18, 0x75, 0x5b, 0xdd, 0xd5, 0x59, 0xc4, 0x71, 0x2e, 0x44, 0x97, 0x75, 0xc1, 0x8a, 0x3f, 0x2c,
diff --git a/googleapis/ads/googleads/v1/errors/feed_item_target_error.pb.go b/googleapis/ads/googleads/v1/errors/feed_item_target_error.pb.go
index 3e2e3e908a..c013301864 100644
--- a/googleapis/ads/googleads/v1/errors/feed_item_target_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/feed_item_target_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/feed_item_target_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible feed item target errors.
 type FeedItemTargetErrorEnum_FeedItemTargetError int32
@@ -53,6 +56,7 @@ var FeedItemTargetErrorEnum_FeedItemTargetError_name = map[int32]string{
 	6: "TOO_MANY_SCHEDULES_PER_DAY",
 	7: "CANNOT_HAVE_ENABLED_CAMPAIGN_AND_ENABLED_AD_GROUP_TARGETS",
 }
+
 var FeedItemTargetErrorEnum_FeedItemTargetError_value = map[string]int32{
 	"UNSPECIFIED":                                               0,
 	"UNKNOWN":                                                   1,
@@ -67,8 +71,9 @@ var FeedItemTargetErrorEnum_FeedItemTargetError_value = map[string]int32{
 func (x FeedItemTargetErrorEnum_FeedItemTargetError) String() string {
 	return proto.EnumName(FeedItemTargetErrorEnum_FeedItemTargetError_name, int32(x))
 }
+
 func (FeedItemTargetErrorEnum_FeedItemTargetError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_error_c657952a4e3022c2, []int{0, 0}
+	return fileDescriptor_e158dc4de886fe3b, []int{0, 0}
 }
 
 // Container for enum describing possible feed item target errors.
@@ -82,16 +87,17 @@ func (m *FeedItemTargetErrorEnum) Reset()         { *m = FeedItemTargetErrorEnum
 func (m *FeedItemTargetErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemTargetErrorEnum) ProtoMessage()    {}
 func (*FeedItemTargetErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_error_c657952a4e3022c2, []int{0}
+	return fileDescriptor_e158dc4de886fe3b, []int{0}
 }
+
 func (m *FeedItemTargetErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemTargetErrorEnum.Unmarshal(m, b)
 }
 func (m *FeedItemTargetErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemTargetErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemTargetErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemTargetErrorEnum.Merge(dst, src)
+func (m *FeedItemTargetErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemTargetErrorEnum.Merge(m, src)
 }
 func (m *FeedItemTargetErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemTargetErrorEnum.Size(m)
@@ -103,15 +109,15 @@ func (m *FeedItemTargetErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemTargetErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemTargetErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedItemTargetErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FeedItemTargetErrorEnum_FeedItemTargetError", FeedItemTargetErrorEnum_FeedItemTargetError_name, FeedItemTargetErrorEnum_FeedItemTargetError_value)
+	proto.RegisterType((*FeedItemTargetErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedItemTargetErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/feed_item_target_error.proto", fileDescriptor_feed_item_target_error_c657952a4e3022c2)
+	proto.RegisterFile("google/ads/googleads/v1/errors/feed_item_target_error.proto", fileDescriptor_e158dc4de886fe3b)
 }
 
-var fileDescriptor_feed_item_target_error_c657952a4e3022c2 = []byte{
+var fileDescriptor_e158dc4de886fe3b = []byte{
 	// 462 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x8e, 0xd3, 0x3e,
 	0x10, 0xc6, 0xff, 0xcd, 0xfe, 0xd9, 0x95, 0xbc, 0x07, 0xa2, 0x70, 0x00, 0xad, 0x50, 0x91, 0x0a,
diff --git a/googleapis/ads/googleads/v1/errors/feed_item_validation_error.pb.go b/googleapis/ads/googleads/v1/errors/feed_item_validation_error.pb.go
index e4f39bd7e5..e23bfae492 100644
--- a/googleapis/ads/googleads/v1/errors/feed_item_validation_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/feed_item_validation_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/feed_item_validation_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The possible validation errors of a feed item.
 type FeedItemValidationErrorEnum_FeedItemValidationError int32
@@ -336,6 +339,7 @@ var FeedItemValidationErrorEnum_FeedItemValidationError_name = map[int32]string{
 	95: "MISSING_LATITUDE_VALUE",
 	96: "MISSING_LONGITUDE_VALUE",
 }
+
 var FeedItemValidationErrorEnum_FeedItemValidationError_value = map[string]int32{
 	"UNSPECIFIED":                                                0,
 	"UNKNOWN":                                                    1,
@@ -439,8 +443,9 @@ var FeedItemValidationErrorEnum_FeedItemValidationError_value = map[string]int32
 func (x FeedItemValidationErrorEnum_FeedItemValidationError) String() string {
 	return proto.EnumName(FeedItemValidationErrorEnum_FeedItemValidationError_name, int32(x))
 }
+
 func (FeedItemValidationErrorEnum_FeedItemValidationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_validation_error_1e58e32e34431998, []int{0, 0}
+	return fileDescriptor_bd98196a189f1138, []int{0, 0}
 }
 
 // Container for enum describing possible validation errors of a feed item.
@@ -454,16 +459,17 @@ func (m *FeedItemValidationErrorEnum) Reset()         { *m = FeedItemValidationE
 func (m *FeedItemValidationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedItemValidationErrorEnum) ProtoMessage()    {}
 func (*FeedItemValidationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_validation_error_1e58e32e34431998, []int{0}
+	return fileDescriptor_bd98196a189f1138, []int{0}
 }
+
 func (m *FeedItemValidationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemValidationErrorEnum.Unmarshal(m, b)
 }
 func (m *FeedItemValidationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemValidationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemValidationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemValidationErrorEnum.Merge(dst, src)
+func (m *FeedItemValidationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemValidationErrorEnum.Merge(m, src)
 }
 func (m *FeedItemValidationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedItemValidationErrorEnum.Size(m)
@@ -475,15 +481,15 @@ func (m *FeedItemValidationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedItemValidationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedItemValidationErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedItemValidationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FeedItemValidationErrorEnum_FeedItemValidationError", FeedItemValidationErrorEnum_FeedItemValidationError_name, FeedItemValidationErrorEnum_FeedItemValidationError_value)
+	proto.RegisterType((*FeedItemValidationErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedItemValidationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/feed_item_validation_error.proto", fileDescriptor_feed_item_validation_error_1e58e32e34431998)
+	proto.RegisterFile("google/ads/googleads/v1/errors/feed_item_validation_error.proto", fileDescriptor_bd98196a189f1138)
 }
 
-var fileDescriptor_feed_item_validation_error_1e58e32e34431998 = []byte{
+var fileDescriptor_bd98196a189f1138 = []byte{
 	// 1643 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xdd, 0x76, 0x1b, 0xb7,
 	0x11, 0xae, 0x9d, 0x36, 0x69, 0xe1, 0x26, 0x86, 0xe1, 0x5f, 0xd9, 0xb2, 0x6c, 0xcb, 0x8e, 0xed,
diff --git a/googleapis/ads/googleads/v1/errors/feed_mapping_error.pb.go b/googleapis/ads/googleads/v1/errors/feed_mapping_error.pb.go
index 18c7bf0720..012841d600 100644
--- a/googleapis/ads/googleads/v1/errors/feed_mapping_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/feed_mapping_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/feed_mapping_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible feed item errors.
 type FeedMappingErrorEnum_FeedMappingError int32
@@ -86,6 +89,7 @@ var FeedMappingErrorEnum_FeedMappingError_name = map[int32]string{
 	17: "INVALID_PLACEHOLDER_TYPE_FOR_NON_SYSTEM_GENERATED_FEED",
 	18: "INVALID_PLACEHOLDER_TYPE_FOR_SYSTEM_GENERATED_FEED_TYPE",
 }
+
 var FeedMappingErrorEnum_FeedMappingError_value = map[string]int32{
 	"UNSPECIFIED":                  0,
 	"UNKNOWN":                      1,
@@ -110,8 +114,9 @@ var FeedMappingErrorEnum_FeedMappingError_value = map[string]int32{
 func (x FeedMappingErrorEnum_FeedMappingError) String() string {
 	return proto.EnumName(FeedMappingErrorEnum_FeedMappingError_name, int32(x))
 }
+
 func (FeedMappingErrorEnum_FeedMappingError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_error_abb8d6f5674d8589, []int{0, 0}
+	return fileDescriptor_8d89e199689d3695, []int{0, 0}
 }
 
 // Container for enum describing possible feed item errors.
@@ -125,16 +130,17 @@ func (m *FeedMappingErrorEnum) Reset()         { *m = FeedMappingErrorEnum{} }
 func (m *FeedMappingErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FeedMappingErrorEnum) ProtoMessage()    {}
 func (*FeedMappingErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_error_abb8d6f5674d8589, []int{0}
+	return fileDescriptor_8d89e199689d3695, []int{0}
 }
+
 func (m *FeedMappingErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedMappingErrorEnum.Unmarshal(m, b)
 }
 func (m *FeedMappingErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedMappingErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FeedMappingErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedMappingErrorEnum.Merge(dst, src)
+func (m *FeedMappingErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedMappingErrorEnum.Merge(m, src)
 }
 func (m *FeedMappingErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FeedMappingErrorEnum.Size(m)
@@ -146,15 +152,15 @@ func (m *FeedMappingErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeedMappingErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FeedMappingErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedMappingErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FeedMappingErrorEnum_FeedMappingError", FeedMappingErrorEnum_FeedMappingError_name, FeedMappingErrorEnum_FeedMappingError_value)
+	proto.RegisterType((*FeedMappingErrorEnum)(nil), "google.ads.googleads.v1.errors.FeedMappingErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/feed_mapping_error.proto", fileDescriptor_feed_mapping_error_abb8d6f5674d8589)
+	proto.RegisterFile("google/ads/googleads/v1/errors/feed_mapping_error.proto", fileDescriptor_8d89e199689d3695)
 }
 
-var fileDescriptor_feed_mapping_error_abb8d6f5674d8589 = []byte{
+var fileDescriptor_8d89e199689d3695 = []byte{
 	// 556 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xdf, 0x6e, 0xd3, 0x30,
 	0x14, 0xc6, 0x69, 0x47, 0x19, 0xb8, 0xc0, 0x82, 0xc5, 0xdf, 0xad, 0x0c, 0x54, 0xfe, 0x0c, 0x86,
diff --git a/googleapis/ads/googleads/v1/errors/field_error.pb.go b/googleapis/ads/googleads/v1/errors/field_error.pb.go
index 452087767a..0f866a5f25 100644
--- a/googleapis/ads/googleads/v1/errors/field_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/field_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/field_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible field errors.
 type FieldErrorEnum_FieldError int32
@@ -54,6 +57,7 @@ var FieldErrorEnum_FieldError_name = map[int32]string{
 	7: "FIELD_CANNOT_BE_CLEARED",
 	8: "BLACKLISTED_VALUE",
 }
+
 var FieldErrorEnum_FieldError_value = map[string]int32{
 	"UNSPECIFIED":             0,
 	"UNKNOWN":                 1,
@@ -69,8 +73,9 @@ var FieldErrorEnum_FieldError_value = map[string]int32{
 func (x FieldErrorEnum_FieldError) String() string {
 	return proto.EnumName(FieldErrorEnum_FieldError_name, int32(x))
 }
+
 func (FieldErrorEnum_FieldError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_field_error_63b25d27a87432fe, []int{0, 0}
+	return fileDescriptor_1e5beaff382bf75e, []int{0, 0}
 }
 
 // Container for enum describing possible field errors.
@@ -84,16 +89,17 @@ func (m *FieldErrorEnum) Reset()         { *m = FieldErrorEnum{} }
 func (m *FieldErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FieldErrorEnum) ProtoMessage()    {}
 func (*FieldErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_field_error_63b25d27a87432fe, []int{0}
+	return fileDescriptor_1e5beaff382bf75e, []int{0}
 }
+
 func (m *FieldErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldErrorEnum.Unmarshal(m, b)
 }
 func (m *FieldErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FieldErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldErrorEnum.Merge(dst, src)
+func (m *FieldErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldErrorEnum.Merge(m, src)
 }
 func (m *FieldErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FieldErrorEnum.Size(m)
@@ -105,15 +111,15 @@ func (m *FieldErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FieldErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FieldErrorEnum)(nil), "google.ads.googleads.v1.errors.FieldErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FieldErrorEnum_FieldError", FieldErrorEnum_FieldError_name, FieldErrorEnum_FieldError_value)
+	proto.RegisterType((*FieldErrorEnum)(nil), "google.ads.googleads.v1.errors.FieldErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/field_error.proto", fileDescriptor_field_error_63b25d27a87432fe)
+	proto.RegisterFile("google/ads/googleads/v1/errors/field_error.proto", fileDescriptor_1e5beaff382bf75e)
 }
 
-var fileDescriptor_field_error_63b25d27a87432fe = []byte{
+var fileDescriptor_1e5beaff382bf75e = []byte{
 	// 392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x8e, 0xd3, 0x30,
 	0x14, 0xc6, 0x49, 0x06, 0x66, 0x46, 0x1e, 0xa0, 0x19, 0x8f, 0x60, 0xa4, 0x01, 0xcd, 0x22, 0x07,
diff --git a/googleapis/ads/googleads/v1/errors/field_mask_error.pb.go b/googleapis/ads/googleads/v1/errors/field_mask_error.pb.go
index bf93842726..58d6108998 100644
--- a/googleapis/ads/googleads/v1/errors/field_mask_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/field_mask_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/field_mask_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible field mask errors.
 type FieldMaskErrorEnum_FieldMaskError int32
@@ -47,6 +50,7 @@ var FieldMaskErrorEnum_FieldMaskError_name = map[int32]string{
 	2: "FIELD_NOT_FOUND",
 	3: "FIELD_HAS_SUBFIELDS",
 }
+
 var FieldMaskErrorEnum_FieldMaskError_value = map[string]int32{
 	"UNSPECIFIED":            0,
 	"UNKNOWN":                1,
@@ -59,8 +63,9 @@ var FieldMaskErrorEnum_FieldMaskError_value = map[string]int32{
 func (x FieldMaskErrorEnum_FieldMaskError) String() string {
 	return proto.EnumName(FieldMaskErrorEnum_FieldMaskError_name, int32(x))
 }
+
 func (FieldMaskErrorEnum_FieldMaskError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_field_mask_error_ed6cfea039bdd6d3, []int{0, 0}
+	return fileDescriptor_bb7b8d8152b776ca, []int{0, 0}
 }
 
 // Container for enum describing possible field mask errors.
@@ -74,16 +79,17 @@ func (m *FieldMaskErrorEnum) Reset()         { *m = FieldMaskErrorEnum{} }
 func (m *FieldMaskErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FieldMaskErrorEnum) ProtoMessage()    {}
 func (*FieldMaskErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_field_mask_error_ed6cfea039bdd6d3, []int{0}
+	return fileDescriptor_bb7b8d8152b776ca, []int{0}
 }
+
 func (m *FieldMaskErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldMaskErrorEnum.Unmarshal(m, b)
 }
 func (m *FieldMaskErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldMaskErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FieldMaskErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldMaskErrorEnum.Merge(dst, src)
+func (m *FieldMaskErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldMaskErrorEnum.Merge(m, src)
 }
 func (m *FieldMaskErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FieldMaskErrorEnum.Size(m)
@@ -95,15 +101,15 @@ func (m *FieldMaskErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FieldMaskErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FieldMaskErrorEnum)(nil), "google.ads.googleads.v1.errors.FieldMaskErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FieldMaskErrorEnum_FieldMaskError", FieldMaskErrorEnum_FieldMaskError_name, FieldMaskErrorEnum_FieldMaskError_value)
+	proto.RegisterType((*FieldMaskErrorEnum)(nil), "google.ads.googleads.v1.errors.FieldMaskErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/field_mask_error.proto", fileDescriptor_field_mask_error_ed6cfea039bdd6d3)
+	proto.RegisterFile("google/ads/googleads/v1/errors/field_mask_error.proto", fileDescriptor_bb7b8d8152b776ca)
 }
 
-var fileDescriptor_field_mask_error_ed6cfea039bdd6d3 = []byte{
+var fileDescriptor_bb7b8d8152b776ca = []byte{
 	// 353 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xfb, 0x30,
 	0x14, 0xc6, 0xff, 0xed, 0xfe, 0x2a, 0x64, 0xe0, 0x4a, 0x06, 0x13, 0x86, 0xec, 0xa2, 0x0f, 0x90,
diff --git a/googleapis/ads/googleads/v1/errors/function_error.pb.go b/googleapis/ads/googleads/v1/errors/function_error.pb.go
index ee612c1014..8ec4de2077 100644
--- a/googleapis/ads/googleads/v1/errors/function_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/function_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/function_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible function errors.
 type FunctionErrorEnum_FunctionError int32
@@ -82,6 +85,7 @@ var FunctionErrorEnum_FunctionError_name = map[int32]string{
 	16: "INVALID_FUNCTION_FOR_FEED_WITH_FIXED_SCHEMA",
 	17: "INVALID_ATTRIBUTE_NAME",
 }
+
 var FunctionErrorEnum_FunctionError_value = map[string]int32{
 	"UNSPECIFIED":                                 0,
 	"UNKNOWN":                                     1,
@@ -106,8 +110,9 @@ var FunctionErrorEnum_FunctionError_value = map[string]int32{
 func (x FunctionErrorEnum_FunctionError) String() string {
 	return proto.EnumName(FunctionErrorEnum_FunctionError_name, int32(x))
 }
+
 func (FunctionErrorEnum_FunctionError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_function_error_646271f62f11fab0, []int{0, 0}
+	return fileDescriptor_26e86f97fb83f8f1, []int{0, 0}
 }
 
 // Container for enum describing possible function errors.
@@ -121,16 +126,17 @@ func (m *FunctionErrorEnum) Reset()         { *m = FunctionErrorEnum{} }
 func (m *FunctionErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FunctionErrorEnum) ProtoMessage()    {}
 func (*FunctionErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_function_error_646271f62f11fab0, []int{0}
+	return fileDescriptor_26e86f97fb83f8f1, []int{0}
 }
+
 func (m *FunctionErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionErrorEnum.Unmarshal(m, b)
 }
 func (m *FunctionErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FunctionErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionErrorEnum.Merge(dst, src)
+func (m *FunctionErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionErrorEnum.Merge(m, src)
 }
 func (m *FunctionErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FunctionErrorEnum.Size(m)
@@ -142,15 +148,15 @@ func (m *FunctionErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FunctionErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FunctionErrorEnum)(nil), "google.ads.googleads.v1.errors.FunctionErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FunctionErrorEnum_FunctionError", FunctionErrorEnum_FunctionError_name, FunctionErrorEnum_FunctionError_value)
+	proto.RegisterType((*FunctionErrorEnum)(nil), "google.ads.googleads.v1.errors.FunctionErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/function_error.proto", fileDescriptor_function_error_646271f62f11fab0)
+	proto.RegisterFile("google/ads/googleads/v1/errors/function_error.proto", fileDescriptor_26e86f97fb83f8f1)
 }
 
-var fileDescriptor_function_error_646271f62f11fab0 = []byte{
+var fileDescriptor_26e86f97fb83f8f1 = []byte{
 	// 541 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x51, 0x6f, 0xd3, 0x30,
 	0x10, 0xc7, 0x59, 0x37, 0x36, 0xf0, 0x18, 0xf5, 0xcc, 0x34, 0x50, 0x99, 0xca, 0x54, 0xe0, 0x01,
diff --git a/googleapis/ads/googleads/v1/errors/function_parsing_error.pb.go b/googleapis/ads/googleads/v1/errors/function_parsing_error.pb.go
index 2f1c6b3b18..92618f36eb 100644
--- a/googleapis/ads/googleads/v1/errors/function_parsing_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/function_parsing_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/function_parsing_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible function parsing errors.
 type FunctionParsingErrorEnum_FunctionParsingError int32
@@ -66,6 +69,7 @@ var FunctionParsingErrorEnum_FunctionParsingError_name = map[int32]string{
 	11: "NO_OPERANDS",
 	12: "TOO_MANY_OPERANDS",
 }
+
 var FunctionParsingErrorEnum_FunctionParsingError_value = map[string]int32{
 	"UNSPECIFIED":                                 0,
 	"UNKNOWN":                                     1,
@@ -85,8 +89,9 @@ var FunctionParsingErrorEnum_FunctionParsingError_value = map[string]int32{
 func (x FunctionParsingErrorEnum_FunctionParsingError) String() string {
 	return proto.EnumName(FunctionParsingErrorEnum_FunctionParsingError_name, int32(x))
 }
+
 func (FunctionParsingErrorEnum_FunctionParsingError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_function_parsing_error_0b827c0c284191cb, []int{0, 0}
+	return fileDescriptor_452dbf0b9f7b0cf9, []int{0, 0}
 }
 
 // Container for enum describing possible function parsing errors.
@@ -100,16 +105,17 @@ func (m *FunctionParsingErrorEnum) Reset()         { *m = FunctionParsingErrorEn
 func (m *FunctionParsingErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*FunctionParsingErrorEnum) ProtoMessage()    {}
 func (*FunctionParsingErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_function_parsing_error_0b827c0c284191cb, []int{0}
+	return fileDescriptor_452dbf0b9f7b0cf9, []int{0}
 }
+
 func (m *FunctionParsingErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionParsingErrorEnum.Unmarshal(m, b)
 }
 func (m *FunctionParsingErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionParsingErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *FunctionParsingErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionParsingErrorEnum.Merge(dst, src)
+func (m *FunctionParsingErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionParsingErrorEnum.Merge(m, src)
 }
 func (m *FunctionParsingErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_FunctionParsingErrorEnum.Size(m)
@@ -121,15 +127,15 @@ func (m *FunctionParsingErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_FunctionParsingErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*FunctionParsingErrorEnum)(nil), "google.ads.googleads.v1.errors.FunctionParsingErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.FunctionParsingErrorEnum_FunctionParsingError", FunctionParsingErrorEnum_FunctionParsingError_name, FunctionParsingErrorEnum_FunctionParsingError_value)
+	proto.RegisterType((*FunctionParsingErrorEnum)(nil), "google.ads.googleads.v1.errors.FunctionParsingErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/function_parsing_error.proto", fileDescriptor_function_parsing_error_0b827c0c284191cb)
+	proto.RegisterFile("google/ads/googleads/v1/errors/function_parsing_error.proto", fileDescriptor_452dbf0b9f7b0cf9)
 }
 
-var fileDescriptor_function_parsing_error_0b827c0c284191cb = []byte{
+var fileDescriptor_452dbf0b9f7b0cf9 = []byte{
 	// 488 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcd, 0x6e, 0xd3, 0x40,
 	0x14, 0x85, 0x49, 0x02, 0x2d, 0x4c, 0x40, 0xb8, 0xa3, 0xb6, 0x34, 0x01, 0xb2, 0xc8, 0x16, 0xc9,
diff --git a/googleapis/ads/googleads/v1/errors/geo_target_constant_suggestion_error.pb.go b/googleapis/ads/googleads/v1/errors/geo_target_constant_suggestion_error.pb.go
index 62f55dc194..8f062d5421 100644
--- a/googleapis/ads/googleads/v1/errors/geo_target_constant_suggestion_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/geo_target_constant_suggestion_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/geo_target_constant_suggestion_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible geo target constant suggestion errors.
 type GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError int32
@@ -47,6 +50,7 @@ var GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError_name =
 	4: "INVALID_COUNTRY_CODE",
 	5: "REQUEST_PARAMETERS_UNSET",
 }
+
 var GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -59,8 +63,9 @@ var GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError_value
 func (x GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError) String() string {
 	return proto.EnumName(GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError_name, int32(x))
 }
+
 func (GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_suggestion_error_30f41090bf4a4fdb, []int{0, 0}
+	return fileDescriptor_ef7e3347ae4bfc6d, []int{0, 0}
 }
 
 // Container for enum describing possible geo target constant suggestion errors.
@@ -74,16 +79,17 @@ func (m *GeoTargetConstantSuggestionErrorEnum) Reset()         { *m = GeoTargetC
 func (m *GeoTargetConstantSuggestionErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*GeoTargetConstantSuggestionErrorEnum) ProtoMessage()    {}
 func (*GeoTargetConstantSuggestionErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_suggestion_error_30f41090bf4a4fdb, []int{0}
+	return fileDescriptor_ef7e3347ae4bfc6d, []int{0}
 }
+
 func (m *GeoTargetConstantSuggestionErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoTargetConstantSuggestionErrorEnum.Unmarshal(m, b)
 }
 func (m *GeoTargetConstantSuggestionErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoTargetConstantSuggestionErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *GeoTargetConstantSuggestionErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoTargetConstantSuggestionErrorEnum.Merge(dst, src)
+func (m *GeoTargetConstantSuggestionErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoTargetConstantSuggestionErrorEnum.Merge(m, src)
 }
 func (m *GeoTargetConstantSuggestionErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_GeoTargetConstantSuggestionErrorEnum.Size(m)
@@ -95,15 +101,15 @@ func (m *GeoTargetConstantSuggestionErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_GeoTargetConstantSuggestionErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*GeoTargetConstantSuggestionErrorEnum)(nil), "google.ads.googleads.v1.errors.GeoTargetConstantSuggestionErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError", GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError_name, GeoTargetConstantSuggestionErrorEnum_GeoTargetConstantSuggestionError_value)
+	proto.RegisterType((*GeoTargetConstantSuggestionErrorEnum)(nil), "google.ads.googleads.v1.errors.GeoTargetConstantSuggestionErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/geo_target_constant_suggestion_error.proto", fileDescriptor_geo_target_constant_suggestion_error_30f41090bf4a4fdb)
+	proto.RegisterFile("google/ads/googleads/v1/errors/geo_target_constant_suggestion_error.proto", fileDescriptor_ef7e3347ae4bfc6d)
 }
 
-var fileDescriptor_geo_target_constant_suggestion_error_30f41090bf4a4fdb = []byte{
+var fileDescriptor_ef7e3347ae4bfc6d = []byte{
 	// 386 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcf, 0xaa, 0xd4, 0x30,
 	0x14, 0xc6, 0x6d, 0xaf, 0x7f, 0x20, 0x77, 0x61, 0xa9, 0x82, 0x17, 0xb9, 0x0c, 0x52, 0x74, 0x9b,
diff --git a/googleapis/ads/googleads/v1/errors/header_error.pb.go b/googleapis/ads/googleads/v1/errors/header_error.pb.go
index 301bf289ff..35381c5b4d 100644
--- a/googleapis/ads/googleads/v1/errors/header_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/header_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/header_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible header errors.
 type HeaderErrorEnum_HeaderError int32
@@ -36,6 +39,7 @@ var HeaderErrorEnum_HeaderError_name = map[int32]string{
 	1: "UNKNOWN",
 	3: "INVALID_LOGIN_CUSTOMER_ID",
 }
+
 var HeaderErrorEnum_HeaderError_value = map[string]int32{
 	"UNSPECIFIED":               0,
 	"UNKNOWN":                   1,
@@ -45,8 +49,9 @@ var HeaderErrorEnum_HeaderError_value = map[string]int32{
 func (x HeaderErrorEnum_HeaderError) String() string {
 	return proto.EnumName(HeaderErrorEnum_HeaderError_name, int32(x))
 }
+
 func (HeaderErrorEnum_HeaderError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_header_error_12c8e9116eb505a1, []int{0, 0}
+	return fileDescriptor_17dbd7ec3240a65f, []int{0, 0}
 }
 
 // Container for enum describing possible header errors.
@@ -60,16 +65,17 @@ func (m *HeaderErrorEnum) Reset()         { *m = HeaderErrorEnum{} }
 func (m *HeaderErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*HeaderErrorEnum) ProtoMessage()    {}
 func (*HeaderErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_header_error_12c8e9116eb505a1, []int{0}
+	return fileDescriptor_17dbd7ec3240a65f, []int{0}
 }
+
 func (m *HeaderErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HeaderErrorEnum.Unmarshal(m, b)
 }
 func (m *HeaderErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HeaderErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *HeaderErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HeaderErrorEnum.Merge(dst, src)
+func (m *HeaderErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HeaderErrorEnum.Merge(m, src)
 }
 func (m *HeaderErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_HeaderErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *HeaderErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_HeaderErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*HeaderErrorEnum)(nil), "google.ads.googleads.v1.errors.HeaderErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.HeaderErrorEnum_HeaderError", HeaderErrorEnum_HeaderError_name, HeaderErrorEnum_HeaderError_value)
+	proto.RegisterType((*HeaderErrorEnum)(nil), "google.ads.googleads.v1.errors.HeaderErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/header_error.proto", fileDescriptor_header_error_12c8e9116eb505a1)
+	proto.RegisterFile("google/ads/googleads/v1/errors/header_error.proto", fileDescriptor_17dbd7ec3240a65f)
 }
 
-var fileDescriptor_header_error_12c8e9116eb505a1 = []byte{
+var fileDescriptor_17dbd7ec3240a65f = []byte{
 	// 300 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0xdd, 0x06, 0x0a, 0xd9, 0x61, 0xa5, 0x37, 0x45, 0x77, 0xe8, 0x03, 0x24, 0x04, 0x6f,
diff --git a/googleapis/ads/googleads/v1/errors/id_error.pb.go b/googleapis/ads/googleads/v1/errors/id_error.pb.go
index 5dc2c2677f..a5cfc52a1e 100644
--- a/googleapis/ads/googleads/v1/errors/id_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/id_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/id_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible id errors.
 type IdErrorEnum_IdError int32
@@ -36,6 +39,7 @@ var IdErrorEnum_IdError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "NOT_FOUND",
 }
+
 var IdErrorEnum_IdError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var IdErrorEnum_IdError_value = map[string]int32{
 func (x IdErrorEnum_IdError) String() string {
 	return proto.EnumName(IdErrorEnum_IdError_name, int32(x))
 }
+
 func (IdErrorEnum_IdError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_id_error_7d0b19ff3e859e44, []int{0, 0}
+	return fileDescriptor_ef5c320c9c725015, []int{0, 0}
 }
 
 // Container for enum describing possible id errors.
@@ -60,16 +65,17 @@ func (m *IdErrorEnum) Reset()         { *m = IdErrorEnum{} }
 func (m *IdErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*IdErrorEnum) ProtoMessage()    {}
 func (*IdErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_id_error_7d0b19ff3e859e44, []int{0}
+	return fileDescriptor_ef5c320c9c725015, []int{0}
 }
+
 func (m *IdErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IdErrorEnum.Unmarshal(m, b)
 }
 func (m *IdErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IdErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *IdErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IdErrorEnum.Merge(dst, src)
+func (m *IdErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IdErrorEnum.Merge(m, src)
 }
 func (m *IdErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_IdErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *IdErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_IdErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*IdErrorEnum)(nil), "google.ads.googleads.v1.errors.IdErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.IdErrorEnum_IdError", IdErrorEnum_IdError_name, IdErrorEnum_IdError_value)
+	proto.RegisterType((*IdErrorEnum)(nil), "google.ads.googleads.v1.errors.IdErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/id_error.proto", fileDescriptor_id_error_7d0b19ff3e859e44)
+	proto.RegisterFile("google/ads/googleads/v1/errors/id_error.proto", fileDescriptor_ef5c320c9c725015)
 }
 
-var fileDescriptor_id_error_7d0b19ff3e859e44 = []byte{
+var fileDescriptor_ef5c320c9c725015 = []byte{
 	// 279 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4a, 0xc4, 0x30,
 	0x14, 0x86, 0x6d, 0x05, 0x07, 0x53, 0xc5, 0xd2, 0xa5, 0xc8, 0x2c, 0xba, 0x37, 0xa1, 0x08, 0x2e,
diff --git a/googleapis/ads/googleads/v1/errors/image_error.pb.go b/googleapis/ads/googleads/v1/errors/image_error.pb.go
index 6ec62e0899..9298e0bd76 100644
--- a/googleapis/ads/googleads/v1/errors/image_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/image_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/image_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible image errors.
 type ImageErrorEnum_ImageError int32
@@ -145,6 +148,7 @@ var ImageErrorEnum_ImageError_name = map[int32]string{
 	37: "INVALID_INPUT",
 	38: "PROBLEM_READING_FILE",
 }
+
 var ImageErrorEnum_ImageError_value = map[string]int32{
 	"UNSPECIFIED":                        0,
 	"UNKNOWN":                            1,
@@ -190,8 +194,9 @@ var ImageErrorEnum_ImageError_value = map[string]int32{
 func (x ImageErrorEnum_ImageError) String() string {
 	return proto.EnumName(ImageErrorEnum_ImageError_name, int32(x))
 }
+
 func (ImageErrorEnum_ImageError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_error_f8e718005d4b0553, []int{0, 0}
+	return fileDescriptor_9dd554b8a72a1295, []int{0, 0}
 }
 
 // Container for enum describing possible image errors.
@@ -205,16 +210,17 @@ func (m *ImageErrorEnum) Reset()         { *m = ImageErrorEnum{} }
 func (m *ImageErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ImageErrorEnum) ProtoMessage()    {}
 func (*ImageErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_error_f8e718005d4b0553, []int{0}
+	return fileDescriptor_9dd554b8a72a1295, []int{0}
 }
+
 func (m *ImageErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageErrorEnum.Unmarshal(m, b)
 }
 func (m *ImageErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ImageErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageErrorEnum.Merge(dst, src)
+func (m *ImageErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageErrorEnum.Merge(m, src)
 }
 func (m *ImageErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ImageErrorEnum.Size(m)
@@ -226,15 +232,15 @@ func (m *ImageErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ImageErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ImageErrorEnum)(nil), "google.ads.googleads.v1.errors.ImageErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ImageErrorEnum_ImageError", ImageErrorEnum_ImageError_name, ImageErrorEnum_ImageError_value)
+	proto.RegisterType((*ImageErrorEnum)(nil), "google.ads.googleads.v1.errors.ImageErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/image_error.proto", fileDescriptor_image_error_f8e718005d4b0553)
+	proto.RegisterFile("google/ads/googleads/v1/errors/image_error.proto", fileDescriptor_9dd554b8a72a1295)
 }
 
-var fileDescriptor_image_error_f8e718005d4b0553 = []byte{
+var fileDescriptor_9dd554b8a72a1295 = []byte{
 	// 786 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xcd, 0x72, 0xdb, 0x36,
 	0x10, 0xae, 0x9d, 0x36, 0x4e, 0xe1, 0xc4, 0x86, 0xe1, 0xf8, 0xdf, 0x71, 0x52, 0x35, 0xcd, 0x51,
diff --git a/googleapis/ads/googleads/v1/errors/internal_error.pb.go b/googleapis/ads/googleads/v1/errors/internal_error.pb.go
index cea6942012..4f58e15838 100644
--- a/googleapis/ads/googleads/v1/errors/internal_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/internal_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/internal_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible internal errors.
 type InternalErrorEnum_InternalError int32
@@ -44,6 +47,7 @@ var InternalErrorEnum_InternalError_name = map[int32]string{
 	3: "ERROR_CODE_NOT_PUBLISHED",
 	4: "TRANSIENT_ERROR",
 }
+
 var InternalErrorEnum_InternalError_value = map[string]int32{
 	"UNSPECIFIED":              0,
 	"UNKNOWN":                  1,
@@ -55,8 +59,9 @@ var InternalErrorEnum_InternalError_value = map[string]int32{
 func (x InternalErrorEnum_InternalError) String() string {
 	return proto.EnumName(InternalErrorEnum_InternalError_name, int32(x))
 }
+
 func (InternalErrorEnum_InternalError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_internal_error_61af587325ee8155, []int{0, 0}
+	return fileDescriptor_9b8dc486f08daaa1, []int{0, 0}
 }
 
 // Container for enum describing possible internal errors.
@@ -70,16 +75,17 @@ func (m *InternalErrorEnum) Reset()         { *m = InternalErrorEnum{} }
 func (m *InternalErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*InternalErrorEnum) ProtoMessage()    {}
 func (*InternalErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_internal_error_61af587325ee8155, []int{0}
+	return fileDescriptor_9b8dc486f08daaa1, []int{0}
 }
+
 func (m *InternalErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InternalErrorEnum.Unmarshal(m, b)
 }
 func (m *InternalErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InternalErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *InternalErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InternalErrorEnum.Merge(dst, src)
+func (m *InternalErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InternalErrorEnum.Merge(m, src)
 }
 func (m *InternalErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_InternalErrorEnum.Size(m)
@@ -91,15 +97,15 @@ func (m *InternalErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_InternalErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*InternalErrorEnum)(nil), "google.ads.googleads.v1.errors.InternalErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.InternalErrorEnum_InternalError", InternalErrorEnum_InternalError_name, InternalErrorEnum_InternalError_value)
+	proto.RegisterType((*InternalErrorEnum)(nil), "google.ads.googleads.v1.errors.InternalErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/internal_error.proto", fileDescriptor_internal_error_61af587325ee8155)
+	proto.RegisterFile("google/ads/googleads/v1/errors/internal_error.proto", fileDescriptor_9b8dc486f08daaa1)
 }
 
-var fileDescriptor_internal_error_61af587325ee8155 = []byte{
+var fileDescriptor_9b8dc486f08daaa1 = []byte{
 	// 331 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xc3, 0x30,
 	0x14, 0x86, 0x6d, 0x27, 0x0a, 0x19, 0xba, 0x1a, 0x6f, 0x44, 0xc6, 0x2e, 0xfa, 0x00, 0x29, 0x65,
diff --git a/googleapis/ads/googleads/v1/errors/keyword_plan_ad_group_error.pb.go b/googleapis/ads/googleads/v1/errors/keyword_plan_ad_group_error.pb.go
index a05fe7c32a..d0cc8c8019 100644
--- a/googleapis/ads/googleads/v1/errors/keyword_plan_ad_group_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/keyword_plan_ad_group_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/keyword_plan_ad_group_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible errors from applying a keyword plan ad group.
 type KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError int32
@@ -41,6 +44,7 @@ var KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError_name = map[int32]string{
 	2: "INVALID_NAME",
 	3: "DUPLICATE_NAME",
 }
+
 var KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -51,8 +55,9 @@ var KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError_value = map[string]int32
 func (x KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError) String() string {
 	return proto.EnumName(KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError_name, int32(x))
 }
+
 func (KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_error_e4bac52c78eeee86, []int{0, 0}
+	return fileDescriptor_ae3a7647d43607f0, []int{0, 0}
 }
 
 // Container for enum describing possible errors from applying a keyword plan
@@ -67,16 +72,17 @@ func (m *KeywordPlanAdGroupErrorEnum) Reset()         { *m = KeywordPlanAdGroupE
 func (m *KeywordPlanAdGroupErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanAdGroupErrorEnum) ProtoMessage()    {}
 func (*KeywordPlanAdGroupErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_error_e4bac52c78eeee86, []int{0}
+	return fileDescriptor_ae3a7647d43607f0, []int{0}
 }
+
 func (m *KeywordPlanAdGroupErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanAdGroupErrorEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanAdGroupErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanAdGroupErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanAdGroupErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanAdGroupErrorEnum.Merge(dst, src)
+func (m *KeywordPlanAdGroupErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanAdGroupErrorEnum.Merge(m, src)
 }
 func (m *KeywordPlanAdGroupErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanAdGroupErrorEnum.Size(m)
@@ -88,15 +94,15 @@ func (m *KeywordPlanAdGroupErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanAdGroupErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanAdGroupErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanAdGroupErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError", KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError_name, KeywordPlanAdGroupErrorEnum_KeywordPlanAdGroupError_value)
+	proto.RegisterType((*KeywordPlanAdGroupErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanAdGroupErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_ad_group_error.proto", fileDescriptor_keyword_plan_ad_group_error_e4bac52c78eeee86)
+	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_ad_group_error.proto", fileDescriptor_ae3a7647d43607f0)
 }
 
-var fileDescriptor_keyword_plan_ad_group_error_e4bac52c78eeee86 = []byte{
+var fileDescriptor_ae3a7647d43607f0 = []byte{
 	// 323 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x50, 0xcf, 0x4a, 0xc3, 0x30,
 	0x18, 0x77, 0x1d, 0x28, 0x64, 0xa2, 0xa5, 0x17, 0x41, 0xc7, 0x0e, 0x7d, 0x80, 0x94, 0xe2, 0x2d,
diff --git a/googleapis/ads/googleads/v1/errors/keyword_plan_campaign_error.pb.go b/googleapis/ads/googleads/v1/errors/keyword_plan_campaign_error.pb.go
index ef35665eae..fc5363090c 100644
--- a/googleapis/ads/googleads/v1/errors/keyword_plan_campaign_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/keyword_plan_campaign_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/keyword_plan_campaign_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible errors from applying a keyword plan campaign.
 type KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError int32
@@ -50,6 +53,7 @@ var KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError_name = map[int32]strin
 	5: "DUPLICATE_NAME",
 	6: "MAX_GEOS_EXCEEDED",
 }
+
 var KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError_value = map[string]int32{
 	"UNSPECIFIED":       0,
 	"UNKNOWN":           1,
@@ -63,8 +67,9 @@ var KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError_value = map[string]int
 func (x KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError) String() string {
 	return proto.EnumName(KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError_name, int32(x))
 }
+
 func (KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_error_409b324e7f5751b8, []int{0, 0}
+	return fileDescriptor_7bc9bb1d32a81c9e, []int{0, 0}
 }
 
 // Container for enum describing possible errors from applying a keyword plan
@@ -79,16 +84,17 @@ func (m *KeywordPlanCampaignErrorEnum) Reset()         { *m = KeywordPlanCampaig
 func (m *KeywordPlanCampaignErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanCampaignErrorEnum) ProtoMessage()    {}
 func (*KeywordPlanCampaignErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_error_409b324e7f5751b8, []int{0}
+	return fileDescriptor_7bc9bb1d32a81c9e, []int{0}
 }
+
 func (m *KeywordPlanCampaignErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanCampaignErrorEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanCampaignErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanCampaignErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanCampaignErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanCampaignErrorEnum.Merge(dst, src)
+func (m *KeywordPlanCampaignErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanCampaignErrorEnum.Merge(m, src)
 }
 func (m *KeywordPlanCampaignErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanCampaignErrorEnum.Size(m)
@@ -100,15 +106,15 @@ func (m *KeywordPlanCampaignErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanCampaignErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanCampaignErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanCampaignErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError", KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError_name, KeywordPlanCampaignErrorEnum_KeywordPlanCampaignError_value)
+	proto.RegisterType((*KeywordPlanCampaignErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanCampaignErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_campaign_error.proto", fileDescriptor_keyword_plan_campaign_error_409b324e7f5751b8)
+	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_campaign_error.proto", fileDescriptor_7bc9bb1d32a81c9e)
 }
 
-var fileDescriptor_keyword_plan_campaign_error_409b324e7f5751b8 = []byte{
+var fileDescriptor_7bc9bb1d32a81c9e = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x6a, 0xa3, 0x40,
 	0x1c, 0xc6, 0x57, 0xb3, 0x9b, 0x85, 0xc9, 0xb2, 0xeb, 0x0a, 0x85, 0x52, 0xd2, 0x1c, 0x7c, 0x80,
diff --git a/googleapis/ads/googleads/v1/errors/keyword_plan_error.pb.go b/googleapis/ads/googleads/v1/errors/keyword_plan_error.pb.go
index c54a1e53ee..a9df9114d4 100644
--- a/googleapis/ads/googleads/v1/errors/keyword_plan_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/keyword_plan_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/keyword_plan_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible errors from applying a keyword plan.
 type KeywordPlanErrorEnum_KeywordPlanError int32
@@ -76,6 +79,7 @@ var KeywordPlanErrorEnum_KeywordPlanError_name = map[int32]string{
 	15: "INVALID_FORECAST_DATE_RANGE",
 	16: "INVALID_NAME",
 }
+
 var KeywordPlanErrorEnum_KeywordPlanError_value = map[string]int32{
 	"UNSPECIFIED":                             0,
 	"UNKNOWN":                                 1,
@@ -98,8 +102,9 @@ var KeywordPlanErrorEnum_KeywordPlanError_value = map[string]int32{
 func (x KeywordPlanErrorEnum_KeywordPlanError) String() string {
 	return proto.EnumName(KeywordPlanErrorEnum_KeywordPlanError_name, int32(x))
 }
+
 func (KeywordPlanErrorEnum_KeywordPlanError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_error_76c865a67b9ab15d, []int{0, 0}
+	return fileDescriptor_c1ce5991f7c4173e, []int{0, 0}
 }
 
 // Container for enum describing possible errors from applying a keyword plan
@@ -115,16 +120,17 @@ func (m *KeywordPlanErrorEnum) Reset()         { *m = KeywordPlanErrorEnum{} }
 func (m *KeywordPlanErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanErrorEnum) ProtoMessage()    {}
 func (*KeywordPlanErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_error_76c865a67b9ab15d, []int{0}
+	return fileDescriptor_c1ce5991f7c4173e, []int{0}
 }
+
 func (m *KeywordPlanErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanErrorEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanErrorEnum.Merge(dst, src)
+func (m *KeywordPlanErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanErrorEnum.Merge(m, src)
 }
 func (m *KeywordPlanErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanErrorEnum.Size(m)
@@ -136,15 +142,15 @@ func (m *KeywordPlanErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.KeywordPlanErrorEnum_KeywordPlanError", KeywordPlanErrorEnum_KeywordPlanError_name, KeywordPlanErrorEnum_KeywordPlanError_value)
+	proto.RegisterType((*KeywordPlanErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_error.proto", fileDescriptor_keyword_plan_error_76c865a67b9ab15d)
+	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_error.proto", fileDescriptor_c1ce5991f7c4173e)
 }
 
-var fileDescriptor_keyword_plan_error_76c865a67b9ab15d = []byte{
+var fileDescriptor_c1ce5991f7c4173e = []byte{
 	// 508 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x4f, 0x8b, 0xd3, 0x4e,
 	0x1c, 0xc6, 0x7f, 0x6d, 0x7f, 0xee, 0xea, 0xd4, 0x75, 0xc7, 0x61, 0xd5, 0x65, 0xb7, 0x54, 0xe9,
diff --git a/googleapis/ads/googleads/v1/errors/keyword_plan_idea_error.pb.go b/googleapis/ads/googleads/v1/errors/keyword_plan_idea_error.pb.go
index 1f57b4725d..fb340f884f 100644
--- a/googleapis/ads/googleads/v1/errors/keyword_plan_idea_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/keyword_plan_idea_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/keyword_plan_idea_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible errors from KeywordPlanIdeaService.
 type KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError int32
@@ -39,6 +42,7 @@ var KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError_name = map[int32]string{
 	2: "URL_CRAWL_ERROR",
 	3: "INVALID_VALUE",
 }
+
 var KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError_value = map[string]int32{
 	"UNSPECIFIED":     0,
 	"UNKNOWN":         1,
@@ -49,8 +53,9 @@ var KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError_value = map[string]int32{
 func (x KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError) String() string {
 	return proto.EnumName(KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError_name, int32(x))
 }
+
 func (KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_error_cd9f9ae2fcdd2e05, []int{0, 0}
+	return fileDescriptor_89101d9415c04e8d, []int{0, 0}
 }
 
 // Container for enum describing possible errors from KeywordPlanIdeaService.
@@ -64,16 +69,17 @@ func (m *KeywordPlanIdeaErrorEnum) Reset()         { *m = KeywordPlanIdeaErrorEn
 func (m *KeywordPlanIdeaErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanIdeaErrorEnum) ProtoMessage()    {}
 func (*KeywordPlanIdeaErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_error_cd9f9ae2fcdd2e05, []int{0}
+	return fileDescriptor_89101d9415c04e8d, []int{0}
 }
+
 func (m *KeywordPlanIdeaErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanIdeaErrorEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanIdeaErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanIdeaErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanIdeaErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanIdeaErrorEnum.Merge(dst, src)
+func (m *KeywordPlanIdeaErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanIdeaErrorEnum.Merge(m, src)
 }
 func (m *KeywordPlanIdeaErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanIdeaErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *KeywordPlanIdeaErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanIdeaErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanIdeaErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanIdeaErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError", KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError_name, KeywordPlanIdeaErrorEnum_KeywordPlanIdeaError_value)
+	proto.RegisterType((*KeywordPlanIdeaErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanIdeaErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_idea_error.proto", fileDescriptor_keyword_plan_idea_error_cd9f9ae2fcdd2e05)
+	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_idea_error.proto", fileDescriptor_89101d9415c04e8d)
 }
 
-var fileDescriptor_keyword_plan_idea_error_cd9f9ae2fcdd2e05 = []byte{
+var fileDescriptor_89101d9415c04e8d = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xf3, 0x30,
 	0x1c, 0xc5, 0xbf, 0x75, 0xf0, 0x09, 0x19, 0xb2, 0x5a, 0xbd, 0x50, 0x91, 0x5d, 0xf4, 0x01, 0x52,
diff --git a/googleapis/ads/googleads/v1/errors/keyword_plan_keyword_error.pb.go b/googleapis/ads/googleads/v1/errors/keyword_plan_keyword_error.pb.go
index a92aa3e803..281d4164bd 100644
--- a/googleapis/ads/googleads/v1/errors/keyword_plan_keyword_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/keyword_plan_keyword_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/keyword_plan_keyword_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible errors from applying a keyword plan keyword.
 type KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError int32
@@ -52,6 +55,7 @@ var KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError_name = map[int32]string{
 	6: "KEYWORD_HAS_TOO_MANY_WORDS",
 	7: "INVALID_KEYWORD_TEXT",
 }
+
 var KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -66,8 +70,9 @@ var KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError_value = map[string]int32
 func (x KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError) String() string {
 	return proto.EnumName(KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError_name, int32(x))
 }
+
 func (KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_error_dbf4ef80d98a243c, []int{0, 0}
+	return fileDescriptor_0c5378240c3c1be8, []int{0, 0}
 }
 
 // Container for enum describing possible errors from applying a keyword or a
@@ -82,16 +87,17 @@ func (m *KeywordPlanKeywordErrorEnum) Reset()         { *m = KeywordPlanKeywordE
 func (m *KeywordPlanKeywordErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanKeywordErrorEnum) ProtoMessage()    {}
 func (*KeywordPlanKeywordErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_error_dbf4ef80d98a243c, []int{0}
+	return fileDescriptor_0c5378240c3c1be8, []int{0}
 }
+
 func (m *KeywordPlanKeywordErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanKeywordErrorEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanKeywordErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanKeywordErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanKeywordErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanKeywordErrorEnum.Merge(dst, src)
+func (m *KeywordPlanKeywordErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanKeywordErrorEnum.Merge(m, src)
 }
 func (m *KeywordPlanKeywordErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanKeywordErrorEnum.Size(m)
@@ -103,15 +109,15 @@ func (m *KeywordPlanKeywordErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanKeywordErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanKeywordErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanKeywordErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError", KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError_name, KeywordPlanKeywordErrorEnum_KeywordPlanKeywordError_value)
+	proto.RegisterType((*KeywordPlanKeywordErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanKeywordErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_keyword_error.proto", fileDescriptor_keyword_plan_keyword_error_dbf4ef80d98a243c)
+	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_keyword_error.proto", fileDescriptor_0c5378240c3c1be8)
 }
 
-var fileDescriptor_keyword_plan_keyword_error_dbf4ef80d98a243c = []byte{
+var fileDescriptor_0c5378240c3c1be8 = []byte{
 	// 395 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xcd, 0x6e, 0xd3, 0x30,
 	0x00, 0xa6, 0x19, 0x6c, 0x92, 0x77, 0xc0, 0x58, 0x4c, 0xb0, 0x31, 0x7a, 0xc8, 0x03, 0x38, 0x8a,
diff --git a/googleapis/ads/googleads/v1/errors/keyword_plan_negative_keyword_error.pb.go b/googleapis/ads/googleads/v1/errors/keyword_plan_negative_keyword_error.pb.go
index fc2dc9b1bc..140f4c48b2 100644
--- a/googleapis/ads/googleads/v1/errors/keyword_plan_negative_keyword_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/keyword_plan_negative_keyword_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/keyword_plan_negative_keyword_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible errors from applying a keyword plan negative
 // keyword.
@@ -34,6 +37,7 @@ var KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError_name = m
 	0: "UNSPECIFIED",
 	1: "UNKNOWN",
 }
+
 var KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -42,8 +46,9 @@ var KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError_value =
 func (x KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError) String() string {
 	return proto.EnumName(KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError_name, int32(x))
 }
+
 func (KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_error_64e283750637729c, []int{0, 0}
+	return fileDescriptor_f3a04f2b3400ffb6, []int{0, 0}
 }
 
 // Container for enum describing possible errors from applying a keyword plan
@@ -58,16 +63,17 @@ func (m *KeywordPlanNegativeKeywordErrorEnum) Reset()         { *m = KeywordPlan
 func (m *KeywordPlanNegativeKeywordErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanNegativeKeywordErrorEnum) ProtoMessage()    {}
 func (*KeywordPlanNegativeKeywordErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_error_64e283750637729c, []int{0}
+	return fileDescriptor_f3a04f2b3400ffb6, []int{0}
 }
+
 func (m *KeywordPlanNegativeKeywordErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanNegativeKeywordErrorEnum.Unmarshal(m, b)
 }
 func (m *KeywordPlanNegativeKeywordErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanNegativeKeywordErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanNegativeKeywordErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanNegativeKeywordErrorEnum.Merge(dst, src)
+func (m *KeywordPlanNegativeKeywordErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanNegativeKeywordErrorEnum.Merge(m, src)
 }
 func (m *KeywordPlanNegativeKeywordErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanNegativeKeywordErrorEnum.Size(m)
@@ -79,15 +85,15 @@ func (m *KeywordPlanNegativeKeywordErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_KeywordPlanNegativeKeywordErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*KeywordPlanNegativeKeywordErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanNegativeKeywordErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError", KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError_name, KeywordPlanNegativeKeywordErrorEnum_KeywordPlanNegativeKeywordError_value)
+	proto.RegisterType((*KeywordPlanNegativeKeywordErrorEnum)(nil), "google.ads.googleads.v1.errors.KeywordPlanNegativeKeywordErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_negative_keyword_error.proto", fileDescriptor_keyword_plan_negative_keyword_error_64e283750637729c)
+	proto.RegisterFile("google/ads/googleads/v1/errors/keyword_plan_negative_keyword_error.proto", fileDescriptor_f3a04f2b3400ffb6)
 }
 
-var fileDescriptor_keyword_plan_negative_keyword_error_64e283750637729c = []byte{
+var fileDescriptor_f3a04f2b3400ffb6 = []byte{
 	// 297 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4a, 0xf4, 0x30,
 	0x14, 0x85, 0xff, 0xf6, 0x07, 0x85, 0xcc, 0xc2, 0xa1, 0x4b, 0x91, 0x11, 0xaa, 0xeb, 0x84, 0xe2,
diff --git a/googleapis/ads/googleads/v1/errors/label_error.pb.go b/googleapis/ads/googleads/v1/errors/label_error.pb.go
index bbbc2314c0..51b3d31cb6 100644
--- a/googleapis/ads/googleads/v1/errors/label_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/label_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/label_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible label errors.
 type LabelErrorEnum_LabelError int32
@@ -62,6 +65,7 @@ var LabelErrorEnum_LabelError_name = map[int32]string{
 	9:  "CANNOT_ATTACH_LABEL_TO_DRAFT",
 	10: "CANNOT_ATTACH_NON_MANAGER_LABEL_TO_CUSTOMER",
 }
+
 var LabelErrorEnum_LabelError_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -79,8 +83,9 @@ var LabelErrorEnum_LabelError_value = map[string]int32{
 func (x LabelErrorEnum_LabelError) String() string {
 	return proto.EnumName(LabelErrorEnum_LabelError_name, int32(x))
 }
+
 func (LabelErrorEnum_LabelError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_label_error_9335abe2f6e3dde0, []int{0, 0}
+	return fileDescriptor_b728e98c4ada0c8f, []int{0, 0}
 }
 
 // Container for enum describing possible label errors.
@@ -94,16 +99,17 @@ func (m *LabelErrorEnum) Reset()         { *m = LabelErrorEnum{} }
 func (m *LabelErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*LabelErrorEnum) ProtoMessage()    {}
 func (*LabelErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_error_9335abe2f6e3dde0, []int{0}
+	return fileDescriptor_b728e98c4ada0c8f, []int{0}
 }
+
 func (m *LabelErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelErrorEnum.Unmarshal(m, b)
 }
 func (m *LabelErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *LabelErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelErrorEnum.Merge(dst, src)
+func (m *LabelErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelErrorEnum.Merge(m, src)
 }
 func (m *LabelErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_LabelErrorEnum.Size(m)
@@ -115,15 +121,15 @@ func (m *LabelErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LabelErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LabelErrorEnum)(nil), "google.ads.googleads.v1.errors.LabelErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.LabelErrorEnum_LabelError", LabelErrorEnum_LabelError_name, LabelErrorEnum_LabelError_value)
+	proto.RegisterType((*LabelErrorEnum)(nil), "google.ads.googleads.v1.errors.LabelErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/label_error.proto", fileDescriptor_label_error_9335abe2f6e3dde0)
+	proto.RegisterFile("google/ads/googleads/v1/errors/label_error.proto", fileDescriptor_b728e98c4ada0c8f)
 }
 
-var fileDescriptor_label_error_9335abe2f6e3dde0 = []byte{
+var fileDescriptor_b728e98c4ada0c8f = []byte{
 	// 465 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x6e, 0xd3, 0x40,
 	0x10, 0x40, 0x69, 0x02, 0x2d, 0x6c, 0xa5, 0xd6, 0xda, 0x03, 0x07, 0x28, 0x05, 0x72, 0xe0, 0x82,
diff --git a/googleapis/ads/googleads/v1/errors/language_code_error.pb.go b/googleapis/ads/googleads/v1/errors/language_code_error.pb.go
index 53df0413f3..818686b2f3 100644
--- a/googleapis/ads/googleads/v1/errors/language_code_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/language_code_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/language_code_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing language code errors.
 type LanguageCodeErrorEnum_LanguageCodeError int32
@@ -39,6 +42,7 @@ var LanguageCodeErrorEnum_LanguageCodeError_name = map[int32]string{
 	2: "LANGUAGE_CODE_NOT_FOUND",
 	3: "INVALID_LANGUAGE_CODE",
 }
+
 var LanguageCodeErrorEnum_LanguageCodeError_value = map[string]int32{
 	"UNSPECIFIED":             0,
 	"UNKNOWN":                 1,
@@ -49,8 +53,9 @@ var LanguageCodeErrorEnum_LanguageCodeError_value = map[string]int32{
 func (x LanguageCodeErrorEnum_LanguageCodeError) String() string {
 	return proto.EnumName(LanguageCodeErrorEnum_LanguageCodeError_name, int32(x))
 }
+
 func (LanguageCodeErrorEnum_LanguageCodeError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_code_error_66c9745952dd8d08, []int{0, 0}
+	return fileDescriptor_8c79937672aea8be, []int{0, 0}
 }
 
 // Container for enum describing language code errors.
@@ -64,16 +69,17 @@ func (m *LanguageCodeErrorEnum) Reset()         { *m = LanguageCodeErrorEnum{} }
 func (m *LanguageCodeErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*LanguageCodeErrorEnum) ProtoMessage()    {}
 func (*LanguageCodeErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_code_error_66c9745952dd8d08, []int{0}
+	return fileDescriptor_8c79937672aea8be, []int{0}
 }
+
 func (m *LanguageCodeErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LanguageCodeErrorEnum.Unmarshal(m, b)
 }
 func (m *LanguageCodeErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LanguageCodeErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *LanguageCodeErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LanguageCodeErrorEnum.Merge(dst, src)
+func (m *LanguageCodeErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LanguageCodeErrorEnum.Merge(m, src)
 }
 func (m *LanguageCodeErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_LanguageCodeErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *LanguageCodeErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_LanguageCodeErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*LanguageCodeErrorEnum)(nil), "google.ads.googleads.v1.errors.LanguageCodeErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.LanguageCodeErrorEnum_LanguageCodeError", LanguageCodeErrorEnum_LanguageCodeError_name, LanguageCodeErrorEnum_LanguageCodeError_value)
+	proto.RegisterType((*LanguageCodeErrorEnum)(nil), "google.ads.googleads.v1.errors.LanguageCodeErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/language_code_error.proto", fileDescriptor_language_code_error_66c9745952dd8d08)
+	proto.RegisterFile("google/ads/googleads/v1/errors/language_code_error.proto", fileDescriptor_8c79937672aea8be)
 }
 
-var fileDescriptor_language_code_error_66c9745952dd8d08 = []byte{
+var fileDescriptor_8c79937672aea8be = []byte{
 	// 325 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4a, 0xc3, 0x40,
 	0x14, 0xc6, 0x4d, 0x0a, 0x0a, 0xd3, 0x85, 0x31, 0x50, 0xc5, 0x3f, 0x74, 0x91, 0x03, 0x4c, 0x08,
diff --git a/googleapis/ads/googleads/v1/errors/list_operation_error.pb.go b/googleapis/ads/googleads/v1/errors/list_operation_error.pb.go
index 97bcf4983d..fb477e4f0e 100644
--- a/googleapis/ads/googleads/v1/errors/list_operation_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/list_operation_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/list_operation_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible list operation errors.
 type ListOperationErrorEnum_ListOperationError int32
@@ -39,6 +42,7 @@ var ListOperationErrorEnum_ListOperationError_name = map[int32]string{
 	7: "REQUIRED_FIELD_MISSING",
 	8: "DUPLICATE_VALUES",
 }
+
 var ListOperationErrorEnum_ListOperationError_value = map[string]int32{
 	"UNSPECIFIED":            0,
 	"UNKNOWN":                1,
@@ -49,8 +53,9 @@ var ListOperationErrorEnum_ListOperationError_value = map[string]int32{
 func (x ListOperationErrorEnum_ListOperationError) String() string {
 	return proto.EnumName(ListOperationErrorEnum_ListOperationError_name, int32(x))
 }
+
 func (ListOperationErrorEnum_ListOperationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_list_operation_error_945cc7d5592a6156, []int{0, 0}
+	return fileDescriptor_93fc0a461682f081, []int{0, 0}
 }
 
 // Container for enum describing possible list operation errors.
@@ -64,16 +69,17 @@ func (m *ListOperationErrorEnum) Reset()         { *m = ListOperationErrorEnum{}
 func (m *ListOperationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ListOperationErrorEnum) ProtoMessage()    {}
 func (*ListOperationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_list_operation_error_945cc7d5592a6156, []int{0}
+	return fileDescriptor_93fc0a461682f081, []int{0}
 }
+
 func (m *ListOperationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationErrorEnum.Unmarshal(m, b)
 }
 func (m *ListOperationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationErrorEnum.Merge(dst, src)
+func (m *ListOperationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationErrorEnum.Merge(m, src)
 }
 func (m *ListOperationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ListOperationErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *ListOperationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ListOperationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ListOperationErrorEnum)(nil), "google.ads.googleads.v1.errors.ListOperationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ListOperationErrorEnum_ListOperationError", ListOperationErrorEnum_ListOperationError_name, ListOperationErrorEnum_ListOperationError_value)
+	proto.RegisterType((*ListOperationErrorEnum)(nil), "google.ads.googleads.v1.errors.ListOperationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/list_operation_error.proto", fileDescriptor_list_operation_error_945cc7d5592a6156)
+	proto.RegisterFile("google/ads/googleads/v1/errors/list_operation_error.proto", fileDescriptor_93fc0a461682f081)
 }
 
-var fileDescriptor_list_operation_error_945cc7d5592a6156 = []byte{
+var fileDescriptor_93fc0a461682f081 = []byte{
 	// 326 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0xdd, 0x04, 0x27, 0xd9, 0xc1, 0x52, 0x64, 0xc2, 0x90, 0x1d, 0xfa, 0x00, 0x29, 0xc5,
diff --git a/googleapis/ads/googleads/v1/errors/media_bundle_error.pb.go b/googleapis/ads/googleads/v1/errors/media_bundle_error.pb.go
index 79f0d0c8c7..1b8b5b05ac 100644
--- a/googleapis/ads/googleads/v1/errors/media_bundle_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/media_bundle_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/media_bundle_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible media bundle errors.
 type MediaBundleErrorEnum_MediaBundleError int32
@@ -99,6 +102,7 @@ var MediaBundleErrorEnum_MediaBundleError_name = map[int32]string{
 	23: "URL_IN_MEDIA_BUNDLE_NOT_SSL_COMPLIANT",
 	24: "CUSTOM_EXIT_NOT_ALLOWED",
 }
+
 var MediaBundleErrorEnum_MediaBundleError_value = map[string]int32{
 	"UNSPECIFIED":                    0,
 	"UNKNOWN":                        1,
@@ -129,8 +133,9 @@ var MediaBundleErrorEnum_MediaBundleError_value = map[string]int32{
 func (x MediaBundleErrorEnum_MediaBundleError) String() string {
 	return proto.EnumName(MediaBundleErrorEnum_MediaBundleError_name, int32(x))
 }
+
 func (MediaBundleErrorEnum_MediaBundleError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_media_bundle_error_4672b1a9825524e9, []int{0, 0}
+	return fileDescriptor_532a64b4156dabfe, []int{0, 0}
 }
 
 // Container for enum describing possible media bundle errors.
@@ -144,16 +149,17 @@ func (m *MediaBundleErrorEnum) Reset()         { *m = MediaBundleErrorEnum{} }
 func (m *MediaBundleErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*MediaBundleErrorEnum) ProtoMessage()    {}
 func (*MediaBundleErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_bundle_error_4672b1a9825524e9, []int{0}
+	return fileDescriptor_532a64b4156dabfe, []int{0}
 }
+
 func (m *MediaBundleErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaBundleErrorEnum.Unmarshal(m, b)
 }
 func (m *MediaBundleErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaBundleErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *MediaBundleErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaBundleErrorEnum.Merge(dst, src)
+func (m *MediaBundleErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaBundleErrorEnum.Merge(m, src)
 }
 func (m *MediaBundleErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_MediaBundleErrorEnum.Size(m)
@@ -165,15 +171,15 @@ func (m *MediaBundleErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MediaBundleErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MediaBundleErrorEnum)(nil), "google.ads.googleads.v1.errors.MediaBundleErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.MediaBundleErrorEnum_MediaBundleError", MediaBundleErrorEnum_MediaBundleError_name, MediaBundleErrorEnum_MediaBundleError_value)
+	proto.RegisterType((*MediaBundleErrorEnum)(nil), "google.ads.googleads.v1.errors.MediaBundleErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/media_bundle_error.proto", fileDescriptor_media_bundle_error_4672b1a9825524e9)
+	proto.RegisterFile("google/ads/googleads/v1/errors/media_bundle_error.proto", fileDescriptor_532a64b4156dabfe)
 }
 
-var fileDescriptor_media_bundle_error_4672b1a9825524e9 = []byte{
+var fileDescriptor_532a64b4156dabfe = []byte{
 	// 641 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x6a, 0x13, 0x41,
 	0x14, 0xb6, 0xad, 0x6d, 0x75, 0xfa, 0x37, 0x9d, 0x36, 0xf6, 0xc7, 0x9a, 0x8b, 0x80, 0x82, 0x0a,
diff --git a/googleapis/ads/googleads/v1/errors/media_file_error.pb.go b/googleapis/ads/googleads/v1/errors/media_file_error.pb.go
index e73cf9b6a3..704e04b9ee 100644
--- a/googleapis/ads/googleads/v1/errors/media_file_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/media_file_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/media_file_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible media file errors.
 type MediaFileErrorEnum_MediaFileError int32
@@ -102,6 +105,7 @@ var MediaFileErrorEnum_MediaFileError_name = map[int32]string{
 	23: "YOU_TUBE_VIDEO_HAS_NON_POSITIVE_DURATION",
 	24: "YOU_TUBE_VIDEO_NOT_FOUND",
 }
+
 var MediaFileErrorEnum_MediaFileError_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -133,8 +137,9 @@ var MediaFileErrorEnum_MediaFileError_value = map[string]int32{
 func (x MediaFileErrorEnum_MediaFileError) String() string {
 	return proto.EnumName(MediaFileErrorEnum_MediaFileError_name, int32(x))
 }
+
 func (MediaFileErrorEnum_MediaFileError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_error_bd80bc9494b4cc45, []int{0, 0}
+	return fileDescriptor_8beb6ca4c6065079, []int{0, 0}
 }
 
 // Container for enum describing possible media file errors.
@@ -148,16 +153,17 @@ func (m *MediaFileErrorEnum) Reset()         { *m = MediaFileErrorEnum{} }
 func (m *MediaFileErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*MediaFileErrorEnum) ProtoMessage()    {}
 func (*MediaFileErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_error_bd80bc9494b4cc45, []int{0}
+	return fileDescriptor_8beb6ca4c6065079, []int{0}
 }
+
 func (m *MediaFileErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaFileErrorEnum.Unmarshal(m, b)
 }
 func (m *MediaFileErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaFileErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *MediaFileErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaFileErrorEnum.Merge(dst, src)
+func (m *MediaFileErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaFileErrorEnum.Merge(m, src)
 }
 func (m *MediaFileErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_MediaFileErrorEnum.Size(m)
@@ -169,15 +175,15 @@ func (m *MediaFileErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MediaFileErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MediaFileErrorEnum)(nil), "google.ads.googleads.v1.errors.MediaFileErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.MediaFileErrorEnum_MediaFileError", MediaFileErrorEnum_MediaFileError_name, MediaFileErrorEnum_MediaFileError_value)
+	proto.RegisterType((*MediaFileErrorEnum)(nil), "google.ads.googleads.v1.errors.MediaFileErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/media_file_error.proto", fileDescriptor_media_file_error_bd80bc9494b4cc45)
+	proto.RegisterFile("google/ads/googleads/v1/errors/media_file_error.proto", fileDescriptor_8beb6ca4c6065079)
 }
 
-var fileDescriptor_media_file_error_bd80bc9494b4cc45 = []byte{
+var fileDescriptor_8beb6ca4c6065079 = []byte{
 	// 674 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
 	0x14, 0xfd, 0x9a, 0x7e, 0xa4, 0x65, 0x5a, 0xda, 0xe9, 0xa4, 0x7f, 0xb4, 0xa5, 0x40, 0x10, 0x3f,
diff --git a/googleapis/ads/googleads/v1/errors/media_upload_error.pb.go b/googleapis/ads/googleads/v1/errors/media_upload_error.pb.go
index ebc3b92672..560a3f3f7b 100644
--- a/googleapis/ads/googleads/v1/errors/media_upload_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/media_upload_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/media_upload_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible media uploading errors.
 type MediaUploadErrorEnum_MediaUploadError int32
@@ -45,6 +48,7 @@ var MediaUploadErrorEnum_MediaUploadError_name = map[int32]string{
 	4: "ANIMATED_IMAGE_NOT_ALLOWED",
 	5: "FORMAT_NOT_ALLOWED",
 }
+
 var MediaUploadErrorEnum_MediaUploadError_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -57,8 +61,9 @@ var MediaUploadErrorEnum_MediaUploadError_value = map[string]int32{
 func (x MediaUploadErrorEnum_MediaUploadError) String() string {
 	return proto.EnumName(MediaUploadErrorEnum_MediaUploadError_name, int32(x))
 }
+
 func (MediaUploadErrorEnum_MediaUploadError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_media_upload_error_1210dc4a8093b4d0, []int{0, 0}
+	return fileDescriptor_b8a75598d47dda1f, []int{0, 0}
 }
 
 // Container for enum describing possible media uploading errors.
@@ -72,16 +77,17 @@ func (m *MediaUploadErrorEnum) Reset()         { *m = MediaUploadErrorEnum{} }
 func (m *MediaUploadErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*MediaUploadErrorEnum) ProtoMessage()    {}
 func (*MediaUploadErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_upload_error_1210dc4a8093b4d0, []int{0}
+	return fileDescriptor_b8a75598d47dda1f, []int{0}
 }
+
 func (m *MediaUploadErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaUploadErrorEnum.Unmarshal(m, b)
 }
 func (m *MediaUploadErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaUploadErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *MediaUploadErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaUploadErrorEnum.Merge(dst, src)
+func (m *MediaUploadErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaUploadErrorEnum.Merge(m, src)
 }
 func (m *MediaUploadErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_MediaUploadErrorEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *MediaUploadErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MediaUploadErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MediaUploadErrorEnum)(nil), "google.ads.googleads.v1.errors.MediaUploadErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.MediaUploadErrorEnum_MediaUploadError", MediaUploadErrorEnum_MediaUploadError_name, MediaUploadErrorEnum_MediaUploadError_value)
+	proto.RegisterType((*MediaUploadErrorEnum)(nil), "google.ads.googleads.v1.errors.MediaUploadErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/media_upload_error.proto", fileDescriptor_media_upload_error_1210dc4a8093b4d0)
+	proto.RegisterFile("google/ads/googleads/v1/errors/media_upload_error.proto", fileDescriptor_b8a75598d47dda1f)
 }
 
-var fileDescriptor_media_upload_error_1210dc4a8093b4d0 = []byte{
+var fileDescriptor_b8a75598d47dda1f = []byte{
 	// 357 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcf, 0x6a, 0xab, 0x40,
 	0x18, 0xc5, 0xaf, 0xe6, 0xfe, 0x81, 0xc9, 0x85, 0xda, 0xa1, 0xe9, 0x22, 0x94, 0x2c, 0x7c, 0x80,
diff --git a/googleapis/ads/googleads/v1/errors/multiplier_error.pb.go b/googleapis/ads/googleads/v1/errors/multiplier_error.pb.go
index 9921b6a110..2688f2c567 100644
--- a/googleapis/ads/googleads/v1/errors/multiplier_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/multiplier_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/multiplier_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible multiplier errors.
 type MultiplierErrorEnum_MultiplierError int32
@@ -70,6 +73,7 @@ var MultiplierErrorEnum_MultiplierError_name = map[int32]string{
 	12: "BID_LESS_THAN_MIN_ALLOWED_BID_WITH_MULTIPLIER",
 	13: "MULTIPLIER_AND_BIDDING_STRATEGY_TYPE_MISMATCH",
 }
+
 var MultiplierErrorEnum_MultiplierError_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"UNKNOWN":                    1,
@@ -90,8 +94,9 @@ var MultiplierErrorEnum_MultiplierError_value = map[string]int32{
 func (x MultiplierErrorEnum_MultiplierError) String() string {
 	return proto.EnumName(MultiplierErrorEnum_MultiplierError_name, int32(x))
 }
+
 func (MultiplierErrorEnum_MultiplierError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_multiplier_error_e904d1bae997600a, []int{0, 0}
+	return fileDescriptor_b59c1387d137e1f4, []int{0, 0}
 }
 
 // Container for enum describing possible multiplier errors.
@@ -105,16 +110,17 @@ func (m *MultiplierErrorEnum) Reset()         { *m = MultiplierErrorEnum{} }
 func (m *MultiplierErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*MultiplierErrorEnum) ProtoMessage()    {}
 func (*MultiplierErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_multiplier_error_e904d1bae997600a, []int{0}
+	return fileDescriptor_b59c1387d137e1f4, []int{0}
 }
+
 func (m *MultiplierErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MultiplierErrorEnum.Unmarshal(m, b)
 }
 func (m *MultiplierErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MultiplierErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *MultiplierErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MultiplierErrorEnum.Merge(dst, src)
+func (m *MultiplierErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MultiplierErrorEnum.Merge(m, src)
 }
 func (m *MultiplierErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_MultiplierErrorEnum.Size(m)
@@ -126,15 +132,15 @@ func (m *MultiplierErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MultiplierErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MultiplierErrorEnum)(nil), "google.ads.googleads.v1.errors.MultiplierErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.MultiplierErrorEnum_MultiplierError", MultiplierErrorEnum_MultiplierError_name, MultiplierErrorEnum_MultiplierError_value)
+	proto.RegisterType((*MultiplierErrorEnum)(nil), "google.ads.googleads.v1.errors.MultiplierErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/multiplier_error.proto", fileDescriptor_multiplier_error_e904d1bae997600a)
+	proto.RegisterFile("google/ads/googleads/v1/errors/multiplier_error.proto", fileDescriptor_b59c1387d137e1f4)
 }
 
-var fileDescriptor_multiplier_error_e904d1bae997600a = []byte{
+var fileDescriptor_b59c1387d137e1f4 = []byte{
 	// 523 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xd1, 0x6e, 0xd3, 0x3c,
 	0x14, 0xc7, 0xbf, 0x76, 0xfd, 0x36, 0x70, 0x41, 0xb3, 0x3c, 0xc4, 0xa4, 0x81, 0x7a, 0xd1, 0x5b,
diff --git a/googleapis/ads/googleads/v1/errors/mutate_error.pb.go b/googleapis/ads/googleads/v1/errors/mutate_error.pb.go
index 2189ee17bd..42ac04e6dc 100644
--- a/googleapis/ads/googleads/v1/errors/mutate_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/mutate_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/mutate_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible mutate errors.
 type MutateErrorEnum_MutateError int32
@@ -52,6 +55,7 @@ var MutateErrorEnum_MutateError_name = map[int32]string{
 	10: "RESOURCE_NOT_IN_GOOGLE_ADS",
 	11: "RESOURCE_ALREADY_EXISTS",
 }
+
 var MutateErrorEnum_MutateError_value = map[string]int32{
 	"UNSPECIFIED":                   0,
 	"UNKNOWN":                       1,
@@ -66,8 +70,9 @@ var MutateErrorEnum_MutateError_value = map[string]int32{
 func (x MutateErrorEnum_MutateError) String() string {
 	return proto.EnumName(MutateErrorEnum_MutateError_name, int32(x))
 }
+
 func (MutateErrorEnum_MutateError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_error_703af8e0974ec265, []int{0, 0}
+	return fileDescriptor_69e9950c75c98711, []int{0, 0}
 }
 
 // Container for enum describing possible mutate errors.
@@ -81,16 +86,17 @@ func (m *MutateErrorEnum) Reset()         { *m = MutateErrorEnum{} }
 func (m *MutateErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*MutateErrorEnum) ProtoMessage()    {}
 func (*MutateErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_error_703af8e0974ec265, []int{0}
+	return fileDescriptor_69e9950c75c98711, []int{0}
 }
+
 func (m *MutateErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateErrorEnum.Unmarshal(m, b)
 }
 func (m *MutateErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *MutateErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateErrorEnum.Merge(dst, src)
+func (m *MutateErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateErrorEnum.Merge(m, src)
 }
 func (m *MutateErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_MutateErrorEnum.Size(m)
@@ -102,15 +108,15 @@ func (m *MutateErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MutateErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MutateErrorEnum)(nil), "google.ads.googleads.v1.errors.MutateErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.MutateErrorEnum_MutateError", MutateErrorEnum_MutateError_name, MutateErrorEnum_MutateError_value)
+	proto.RegisterType((*MutateErrorEnum)(nil), "google.ads.googleads.v1.errors.MutateErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/mutate_error.proto", fileDescriptor_mutate_error_703af8e0974ec265)
+	proto.RegisterFile("google/ads/googleads/v1/errors/mutate_error.proto", fileDescriptor_69e9950c75c98711)
 }
 
-var fileDescriptor_mutate_error_703af8e0974ec265 = []byte{
+var fileDescriptor_69e9950c75c98711 = []byte{
 	// 399 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x8e, 0xd3, 0x30,
 	0x18, 0x85, 0x49, 0x47, 0x62, 0xc0, 0x5d, 0x8c, 0xe5, 0x05, 0x88, 0x81, 0xa9, 0x44, 0x0f, 0xe0,
diff --git a/googleapis/ads/googleads/v1/errors/mutate_job_error.pb.go b/googleapis/ads/googleads/v1/errors/mutate_job_error.pb.go
index d0828c548d..dfb4953dbd 100644
--- a/googleapis/ads/googleads/v1/errors/mutate_job_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/mutate_job_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/mutate_job_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible request errors.
 type MutateJobErrorEnum_MutateJobError int32
@@ -49,6 +52,7 @@ var MutateJobErrorEnum_MutateJobError_name = map[int32]string{
 	5: "RESULTS_NOT_READY",
 	6: "INVALID_PAGE_SIZE",
 }
+
 var MutateJobErrorEnum_MutateJobError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -62,8 +66,9 @@ var MutateJobErrorEnum_MutateJobError_value = map[string]int32{
 func (x MutateJobErrorEnum_MutateJobError) String() string {
 	return proto.EnumName(MutateJobErrorEnum_MutateJobError_name, int32(x))
 }
+
 func (MutateJobErrorEnum_MutateJobError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_error_15eaa13915eb323a, []int{0, 0}
+	return fileDescriptor_8e4c017f15cf8aca, []int{0, 0}
 }
 
 // Container for enum describing possible mutate job errors.
@@ -77,16 +82,17 @@ func (m *MutateJobErrorEnum) Reset()         { *m = MutateJobErrorEnum{} }
 func (m *MutateJobErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*MutateJobErrorEnum) ProtoMessage()    {}
 func (*MutateJobErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_error_15eaa13915eb323a, []int{0}
+	return fileDescriptor_8e4c017f15cf8aca, []int{0}
 }
+
 func (m *MutateJobErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateJobErrorEnum.Unmarshal(m, b)
 }
 func (m *MutateJobErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateJobErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *MutateJobErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateJobErrorEnum.Merge(dst, src)
+func (m *MutateJobErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateJobErrorEnum.Merge(m, src)
 }
 func (m *MutateJobErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_MutateJobErrorEnum.Size(m)
@@ -98,15 +104,15 @@ func (m *MutateJobErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_MutateJobErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MutateJobErrorEnum)(nil), "google.ads.googleads.v1.errors.MutateJobErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.MutateJobErrorEnum_MutateJobError", MutateJobErrorEnum_MutateJobError_name, MutateJobErrorEnum_MutateJobError_value)
+	proto.RegisterType((*MutateJobErrorEnum)(nil), "google.ads.googleads.v1.errors.MutateJobErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/mutate_job_error.proto", fileDescriptor_mutate_job_error_15eaa13915eb323a)
+	proto.RegisterFile("google/ads/googleads/v1/errors/mutate_job_error.proto", fileDescriptor_8e4c017f15cf8aca)
 }
 
-var fileDescriptor_mutate_job_error_15eaa13915eb323a = []byte{
+var fileDescriptor_8e4c017f15cf8aca = []byte{
 	// 399 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x8e, 0xd3, 0x30,
 	0x18, 0xc5, 0x49, 0x07, 0x06, 0xc9, 0x23, 0x81, 0x31, 0x7f, 0x16, 0x23, 0x34, 0x8b, 0x2e, 0x59,
diff --git a/googleapis/ads/googleads/v1/errors/new_resource_creation_error.pb.go b/googleapis/ads/googleads/v1/errors/new_resource_creation_error.pb.go
index 73b9e89513..3593389f1d 100644
--- a/googleapis/ads/googleads/v1/errors/new_resource_creation_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/new_resource_creation_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/new_resource_creation_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible new resource creation errors.
 type NewResourceCreationErrorEnum_NewResourceCreationError int32
@@ -43,6 +46,7 @@ var NewResourceCreationErrorEnum_NewResourceCreationError_name = map[int32]strin
 	3: "DUPLICATE_TEMP_IDS",
 	4: "TEMP_ID_RESOURCE_HAD_ERRORS",
 }
+
 var NewResourceCreationErrorEnum_NewResourceCreationError_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -54,8 +58,9 @@ var NewResourceCreationErrorEnum_NewResourceCreationError_value = map[string]int
 func (x NewResourceCreationErrorEnum_NewResourceCreationError) String() string {
 	return proto.EnumName(NewResourceCreationErrorEnum_NewResourceCreationError_name, int32(x))
 }
+
 func (NewResourceCreationErrorEnum_NewResourceCreationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_new_resource_creation_error_2cd7e98c3abb8598, []int{0, 0}
+	return fileDescriptor_d40957e6c0c933f5, []int{0, 0}
 }
 
 // Container for enum describing possible new resource creation errors.
@@ -69,16 +74,17 @@ func (m *NewResourceCreationErrorEnum) Reset()         { *m = NewResourceCreatio
 func (m *NewResourceCreationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*NewResourceCreationErrorEnum) ProtoMessage()    {}
 func (*NewResourceCreationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_new_resource_creation_error_2cd7e98c3abb8598, []int{0}
+	return fileDescriptor_d40957e6c0c933f5, []int{0}
 }
+
 func (m *NewResourceCreationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NewResourceCreationErrorEnum.Unmarshal(m, b)
 }
 func (m *NewResourceCreationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NewResourceCreationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *NewResourceCreationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NewResourceCreationErrorEnum.Merge(dst, src)
+func (m *NewResourceCreationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NewResourceCreationErrorEnum.Merge(m, src)
 }
 func (m *NewResourceCreationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_NewResourceCreationErrorEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *NewResourceCreationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_NewResourceCreationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*NewResourceCreationErrorEnum)(nil), "google.ads.googleads.v1.errors.NewResourceCreationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.NewResourceCreationErrorEnum_NewResourceCreationError", NewResourceCreationErrorEnum_NewResourceCreationError_name, NewResourceCreationErrorEnum_NewResourceCreationError_value)
+	proto.RegisterType((*NewResourceCreationErrorEnum)(nil), "google.ads.googleads.v1.errors.NewResourceCreationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/new_resource_creation_error.proto", fileDescriptor_new_resource_creation_error_2cd7e98c3abb8598)
+	proto.RegisterFile("google/ads/googleads/v1/errors/new_resource_creation_error.proto", fileDescriptor_d40957e6c0c933f5)
 }
 
-var fileDescriptor_new_resource_creation_error_2cd7e98c3abb8598 = []byte{
+var fileDescriptor_d40957e6c0c933f5 = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x6e, 0xa3, 0x30,
 	0x14, 0xc6, 0x07, 0x32, 0x9a, 0x91, 0x9c, 0xc5, 0x20, 0x16, 0xa3, 0x68, 0x26, 0x93, 0x91, 0x38,
diff --git a/googleapis/ads/googleads/v1/errors/not_empty_error.pb.go b/googleapis/ads/googleads/v1/errors/not_empty_error.pb.go
index 9e0f548caa..c32ad2249b 100644
--- a/googleapis/ads/googleads/v1/errors/not_empty_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/not_empty_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/not_empty_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible not empty errors.
 type NotEmptyErrorEnum_NotEmptyError int32
@@ -36,6 +39,7 @@ var NotEmptyErrorEnum_NotEmptyError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "EMPTY_LIST",
 }
+
 var NotEmptyErrorEnum_NotEmptyError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var NotEmptyErrorEnum_NotEmptyError_value = map[string]int32{
 func (x NotEmptyErrorEnum_NotEmptyError) String() string {
 	return proto.EnumName(NotEmptyErrorEnum_NotEmptyError_name, int32(x))
 }
+
 func (NotEmptyErrorEnum_NotEmptyError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_not_empty_error_60da7a8d2d549cbf, []int{0, 0}
+	return fileDescriptor_59d94572b89cc406, []int{0, 0}
 }
 
 // Container for enum describing possible not empty errors.
@@ -60,16 +65,17 @@ func (m *NotEmptyErrorEnum) Reset()         { *m = NotEmptyErrorEnum{} }
 func (m *NotEmptyErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*NotEmptyErrorEnum) ProtoMessage()    {}
 func (*NotEmptyErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_not_empty_error_60da7a8d2d549cbf, []int{0}
+	return fileDescriptor_59d94572b89cc406, []int{0}
 }
+
 func (m *NotEmptyErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NotEmptyErrorEnum.Unmarshal(m, b)
 }
 func (m *NotEmptyErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NotEmptyErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *NotEmptyErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NotEmptyErrorEnum.Merge(dst, src)
+func (m *NotEmptyErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NotEmptyErrorEnum.Merge(m, src)
 }
 func (m *NotEmptyErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_NotEmptyErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *NotEmptyErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_NotEmptyErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*NotEmptyErrorEnum)(nil), "google.ads.googleads.v1.errors.NotEmptyErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.NotEmptyErrorEnum_NotEmptyError", NotEmptyErrorEnum_NotEmptyError_name, NotEmptyErrorEnum_NotEmptyError_value)
+	proto.RegisterType((*NotEmptyErrorEnum)(nil), "google.ads.googleads.v1.errors.NotEmptyErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/not_empty_error.proto", fileDescriptor_not_empty_error_60da7a8d2d549cbf)
+	proto.RegisterFile("google/ads/googleads/v1/errors/not_empty_error.proto", fileDescriptor_59d94572b89cc406)
 }
 
-var fileDescriptor_not_empty_error_60da7a8d2d549cbf = []byte{
+var fileDescriptor_59d94572b89cc406 = []byte{
 	// 293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xc3, 0x30,
 	0x18, 0x85, 0x6d, 0x05, 0x85, 0x0c, 0xb5, 0xf6, 0x52, 0x64, 0x17, 0x7d, 0x80, 0x84, 0xa2, 0x57,
diff --git a/googleapis/ads/googleads/v1/errors/null_error.pb.go b/googleapis/ads/googleads/v1/errors/null_error.pb.go
index 17bf68c327..d0f7a018dc 100644
--- a/googleapis/ads/googleads/v1/errors/null_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/null_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/null_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible null errors.
 type NullErrorEnum_NullError int32
@@ -36,6 +39,7 @@ var NullErrorEnum_NullError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "NULL_CONTENT",
 }
+
 var NullErrorEnum_NullError_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -45,8 +49,9 @@ var NullErrorEnum_NullError_value = map[string]int32{
 func (x NullErrorEnum_NullError) String() string {
 	return proto.EnumName(NullErrorEnum_NullError_name, int32(x))
 }
+
 func (NullErrorEnum_NullError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_null_error_8cdf831fc777f390, []int{0, 0}
+	return fileDescriptor_1aea2f2f74eaad78, []int{0, 0}
 }
 
 // Container for enum describing possible null errors.
@@ -60,16 +65,17 @@ func (m *NullErrorEnum) Reset()         { *m = NullErrorEnum{} }
 func (m *NullErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*NullErrorEnum) ProtoMessage()    {}
 func (*NullErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_null_error_8cdf831fc777f390, []int{0}
+	return fileDescriptor_1aea2f2f74eaad78, []int{0}
 }
+
 func (m *NullErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NullErrorEnum.Unmarshal(m, b)
 }
 func (m *NullErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NullErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *NullErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NullErrorEnum.Merge(dst, src)
+func (m *NullErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NullErrorEnum.Merge(m, src)
 }
 func (m *NullErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_NullErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *NullErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_NullErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*NullErrorEnum)(nil), "google.ads.googleads.v1.errors.NullErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.NullErrorEnum_NullError", NullErrorEnum_NullError_name, NullErrorEnum_NullError_value)
+	proto.RegisterType((*NullErrorEnum)(nil), "google.ads.googleads.v1.errors.NullErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/null_error.proto", fileDescriptor_null_error_8cdf831fc777f390)
+	proto.RegisterFile("google/ads/googleads/v1/errors/null_error.proto", fileDescriptor_1aea2f2f74eaad78)
 }
 
-var fileDescriptor_null_error_8cdf831fc777f390 = []byte{
+var fileDescriptor_1aea2f2f74eaad78 = []byte{
 	// 285 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xdf, 0x6a, 0x83, 0x30,
 	0x14, 0xc6, 0xa7, 0x83, 0x8d, 0xa5, 0xfb, 0x23, 0x5e, 0x8e, 0xd1, 0x0b, 0x1f, 0x20, 0x41, 0x76,
diff --git a/googleapis/ads/googleads/v1/errors/operation_access_denied_error.pb.go b/googleapis/ads/googleads/v1/errors/operation_access_denied_error.pb.go
index 8b4e87a4d0..735468f1de 100644
--- a/googleapis/ads/googleads/v1/errors/operation_access_denied_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/operation_access_denied_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/operation_access_denied_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible operation access denied errors.
 type OperationAccessDeniedErrorEnum_OperationAccessDeniedError int32
@@ -63,6 +66,7 @@ var OperationAccessDeniedErrorEnum_OperationAccessDeniedError_name = map[int32]s
 	10: "OPERATION_NOT_PERMITTED_FOR_AD_GROUP_TYPE",
 	11: "MUTATE_NOT_PERMITTED_FOR_CUSTOMER",
 }
+
 var OperationAccessDeniedErrorEnum_OperationAccessDeniedError_value = map[string]int32{
 	"UNSPECIFIED":                                  0,
 	"UNKNOWN":                                      1,
@@ -81,8 +85,9 @@ var OperationAccessDeniedErrorEnum_OperationAccessDeniedError_value = map[string
 func (x OperationAccessDeniedErrorEnum_OperationAccessDeniedError) String() string {
 	return proto.EnumName(OperationAccessDeniedErrorEnum_OperationAccessDeniedError_name, int32(x))
 }
+
 func (OperationAccessDeniedErrorEnum_OperationAccessDeniedError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operation_access_denied_error_c1c948edc110cca8, []int{0, 0}
+	return fileDescriptor_f047890255dc139d, []int{0, 0}
 }
 
 // Container for enum describing possible operation access denied errors.
@@ -96,16 +101,17 @@ func (m *OperationAccessDeniedErrorEnum) Reset()         { *m = OperationAccessD
 func (m *OperationAccessDeniedErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*OperationAccessDeniedErrorEnum) ProtoMessage()    {}
 func (*OperationAccessDeniedErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_access_denied_error_c1c948edc110cca8, []int{0}
+	return fileDescriptor_f047890255dc139d, []int{0}
 }
+
 func (m *OperationAccessDeniedErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationAccessDeniedErrorEnum.Unmarshal(m, b)
 }
 func (m *OperationAccessDeniedErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationAccessDeniedErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *OperationAccessDeniedErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationAccessDeniedErrorEnum.Merge(dst, src)
+func (m *OperationAccessDeniedErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationAccessDeniedErrorEnum.Merge(m, src)
 }
 func (m *OperationAccessDeniedErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_OperationAccessDeniedErrorEnum.Size(m)
@@ -117,15 +123,15 @@ func (m *OperationAccessDeniedErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_OperationAccessDeniedErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*OperationAccessDeniedErrorEnum)(nil), "google.ads.googleads.v1.errors.OperationAccessDeniedErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.OperationAccessDeniedErrorEnum_OperationAccessDeniedError", OperationAccessDeniedErrorEnum_OperationAccessDeniedError_name, OperationAccessDeniedErrorEnum_OperationAccessDeniedError_value)
+	proto.RegisterType((*OperationAccessDeniedErrorEnum)(nil), "google.ads.googleads.v1.errors.OperationAccessDeniedErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/operation_access_denied_error.proto", fileDescriptor_operation_access_denied_error_c1c948edc110cca8)
+	proto.RegisterFile("google/ads/googleads/v1/errors/operation_access_denied_error.proto", fileDescriptor_f047890255dc139d)
 }
 
-var fileDescriptor_operation_access_denied_error_c1c948edc110cca8 = []byte{
+var fileDescriptor_f047890255dc139d = []byte{
 	// 448 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x8a, 0xd3, 0x40,
 	0x1c, 0xc6, 0x6d, 0xab, 0xbb, 0x3a, 0x3d, 0x18, 0x06, 0x0f, 0xb2, 0x48, 0x17, 0x23, 0x0a, 0x8a,
diff --git a/googleapis/ads/googleads/v1/errors/operator_error.pb.go b/googleapis/ads/googleads/v1/errors/operator_error.pb.go
index 72827150ad..44e06c78ca 100644
--- a/googleapis/ads/googleads/v1/errors/operator_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/operator_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/operator_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible operator errors.
 type OperatorErrorEnum_OperatorError int32
@@ -36,6 +39,7 @@ var OperatorErrorEnum_OperatorError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "OPERATOR_NOT_SUPPORTED",
 }
+
 var OperatorErrorEnum_OperatorError_value = map[string]int32{
 	"UNSPECIFIED":            0,
 	"UNKNOWN":                1,
@@ -45,8 +49,9 @@ var OperatorErrorEnum_OperatorError_value = map[string]int32{
 func (x OperatorErrorEnum_OperatorError) String() string {
 	return proto.EnumName(OperatorErrorEnum_OperatorError_name, int32(x))
 }
+
 func (OperatorErrorEnum_OperatorError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operator_error_28a8d2f041e454d4, []int{0, 0}
+	return fileDescriptor_7e5ebe422ee766bc, []int{0, 0}
 }
 
 // Container for enum describing possible operator errors.
@@ -60,16 +65,17 @@ func (m *OperatorErrorEnum) Reset()         { *m = OperatorErrorEnum{} }
 func (m *OperatorErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*OperatorErrorEnum) ProtoMessage()    {}
 func (*OperatorErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operator_error_28a8d2f041e454d4, []int{0}
+	return fileDescriptor_7e5ebe422ee766bc, []int{0}
 }
+
 func (m *OperatorErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperatorErrorEnum.Unmarshal(m, b)
 }
 func (m *OperatorErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperatorErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *OperatorErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperatorErrorEnum.Merge(dst, src)
+func (m *OperatorErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperatorErrorEnum.Merge(m, src)
 }
 func (m *OperatorErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_OperatorErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *OperatorErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_OperatorErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*OperatorErrorEnum)(nil), "google.ads.googleads.v1.errors.OperatorErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.OperatorErrorEnum_OperatorError", OperatorErrorEnum_OperatorError_name, OperatorErrorEnum_OperatorError_value)
+	proto.RegisterType((*OperatorErrorEnum)(nil), "google.ads.googleads.v1.errors.OperatorErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/operator_error.proto", fileDescriptor_operator_error_28a8d2f041e454d4)
+	proto.RegisterFile("google/ads/googleads/v1/errors/operator_error.proto", fileDescriptor_7e5ebe422ee766bc)
 }
 
-var fileDescriptor_operator_error_28a8d2f041e454d4 = []byte{
+var fileDescriptor_7e5ebe422ee766bc = []byte{
 	// 301 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4a, 0x33, 0x31,
 	0x14, 0xc5, 0xbf, 0xce, 0x07, 0x0a, 0x29, 0x62, 0x9d, 0x85, 0x8b, 0x22, 0x5d, 0xcc, 0x03, 0x24,
diff --git a/googleapis/ads/googleads/v1/errors/partial_failure_error.pb.go b/googleapis/ads/googleads/v1/errors/partial_failure_error.pb.go
index 48d6e6e119..3bc5a74a88 100644
--- a/googleapis/ads/googleads/v1/errors/partial_failure_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/partial_failure_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/partial_failure_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible partial failure errors.
 type PartialFailureErrorEnum_PartialFailureError int32
@@ -37,6 +40,7 @@ var PartialFailureErrorEnum_PartialFailureError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "PARTIAL_FAILURE_MODE_REQUIRED",
 }
+
 var PartialFailureErrorEnum_PartialFailureError_value = map[string]int32{
 	"UNSPECIFIED":                   0,
 	"UNKNOWN":                       1,
@@ -46,8 +50,9 @@ var PartialFailureErrorEnum_PartialFailureError_value = map[string]int32{
 func (x PartialFailureErrorEnum_PartialFailureError) String() string {
 	return proto.EnumName(PartialFailureErrorEnum_PartialFailureError_name, int32(x))
 }
+
 func (PartialFailureErrorEnum_PartialFailureError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_partial_failure_error_0a8571a1c815d149, []int{0, 0}
+	return fileDescriptor_32e9e87d16651f2f, []int{0, 0}
 }
 
 // Container for enum describing possible partial failure errors.
@@ -61,16 +66,17 @@ func (m *PartialFailureErrorEnum) Reset()         { *m = PartialFailureErrorEnum
 func (m *PartialFailureErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*PartialFailureErrorEnum) ProtoMessage()    {}
 func (*PartialFailureErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_partial_failure_error_0a8571a1c815d149, []int{0}
+	return fileDescriptor_32e9e87d16651f2f, []int{0}
 }
+
 func (m *PartialFailureErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartialFailureErrorEnum.Unmarshal(m, b)
 }
 func (m *PartialFailureErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartialFailureErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *PartialFailureErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartialFailureErrorEnum.Merge(dst, src)
+func (m *PartialFailureErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartialFailureErrorEnum.Merge(m, src)
 }
 func (m *PartialFailureErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_PartialFailureErrorEnum.Size(m)
@@ -82,15 +88,15 @@ func (m *PartialFailureErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PartialFailureErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PartialFailureErrorEnum)(nil), "google.ads.googleads.v1.errors.PartialFailureErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.PartialFailureErrorEnum_PartialFailureError", PartialFailureErrorEnum_PartialFailureError_name, PartialFailureErrorEnum_PartialFailureError_value)
+	proto.RegisterType((*PartialFailureErrorEnum)(nil), "google.ads.googleads.v1.errors.PartialFailureErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/partial_failure_error.proto", fileDescriptor_partial_failure_error_0a8571a1c815d149)
+	proto.RegisterFile("google/ads/googleads/v1/errors/partial_failure_error.proto", fileDescriptor_32e9e87d16651f2f)
 }
 
-var fileDescriptor_partial_failure_error_0a8571a1c815d149 = []byte{
+var fileDescriptor_32e9e87d16651f2f = []byte{
 	// 316 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4e, 0xb3, 0x40,
 	0x14, 0x85, 0xff, 0xf2, 0x27, 0x9a, 0x4c, 0x17, 0x36, 0xb8, 0xd0, 0x18, 0x6d, 0x22, 0x0f, 0x30,
diff --git a/googleapis/ads/googleads/v1/errors/policy_finding_error.pb.go b/googleapis/ads/googleads/v1/errors/policy_finding_error.pb.go
index b53fc00ad7..5493e00660 100644
--- a/googleapis/ads/googleads/v1/errors/policy_finding_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/policy_finding_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/policy_finding_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible policy finding errors.
 type PolicyFindingErrorEnum_PolicyFindingError int32
@@ -40,6 +43,7 @@ var PolicyFindingErrorEnum_PolicyFindingError_name = map[int32]string{
 	2: "POLICY_FINDING",
 	3: "POLICY_TOPIC_NOT_FOUND",
 }
+
 var PolicyFindingErrorEnum_PolicyFindingError_value = map[string]int32{
 	"UNSPECIFIED":            0,
 	"UNKNOWN":                1,
@@ -50,8 +54,9 @@ var PolicyFindingErrorEnum_PolicyFindingError_value = map[string]int32{
 func (x PolicyFindingErrorEnum_PolicyFindingError) String() string {
 	return proto.EnumName(PolicyFindingErrorEnum_PolicyFindingError_name, int32(x))
 }
+
 func (PolicyFindingErrorEnum_PolicyFindingError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_finding_error_488cb98685ad631d, []int{0, 0}
+	return fileDescriptor_61987e2d3d600b4b, []int{0, 0}
 }
 
 // Container for enum describing possible policy finding errors.
@@ -65,16 +70,17 @@ func (m *PolicyFindingErrorEnum) Reset()         { *m = PolicyFindingErrorEnum{}
 func (m *PolicyFindingErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*PolicyFindingErrorEnum) ProtoMessage()    {}
 func (*PolicyFindingErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_finding_error_488cb98685ad631d, []int{0}
+	return fileDescriptor_61987e2d3d600b4b, []int{0}
 }
+
 func (m *PolicyFindingErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyFindingErrorEnum.Unmarshal(m, b)
 }
 func (m *PolicyFindingErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyFindingErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyFindingErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyFindingErrorEnum.Merge(dst, src)
+func (m *PolicyFindingErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyFindingErrorEnum.Merge(m, src)
 }
 func (m *PolicyFindingErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyFindingErrorEnum.Size(m)
@@ -86,15 +92,15 @@ func (m *PolicyFindingErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PolicyFindingErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyFindingErrorEnum)(nil), "google.ads.googleads.v1.errors.PolicyFindingErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.PolicyFindingErrorEnum_PolicyFindingError", PolicyFindingErrorEnum_PolicyFindingError_name, PolicyFindingErrorEnum_PolicyFindingError_value)
+	proto.RegisterType((*PolicyFindingErrorEnum)(nil), "google.ads.googleads.v1.errors.PolicyFindingErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/policy_finding_error.proto", fileDescriptor_policy_finding_error_488cb98685ad631d)
+	proto.RegisterFile("google/ads/googleads/v1/errors/policy_finding_error.proto", fileDescriptor_61987e2d3d600b4b)
 }
 
-var fileDescriptor_policy_finding_error_488cb98685ad631d = []byte{
+var fileDescriptor_61987e2d3d600b4b = []byte{
 	// 323 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x5d, 0x07, 0x0a, 0x19, 0x68, 0xc9, 0x61, 0xc2, 0x90, 0x1d, 0xfa, 0x00, 0x29, 0xc5,
diff --git a/googleapis/ads/googleads/v1/errors/policy_validation_parameter_error.pb.go b/googleapis/ads/googleads/v1/errors/policy_validation_parameter_error.pb.go
index 80ced02ffc..b447eb0847 100644
--- a/googleapis/ads/googleads/v1/errors/policy_validation_parameter_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/policy_validation_parameter_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/policy_validation_parameter_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible policy validation parameter errors.
 type PolicyValidationParameterErrorEnum_PolicyValidationParameterError int32
@@ -43,6 +46,7 @@ var PolicyValidationParameterErrorEnum_PolicyValidationParameterError_name = map
 	3: "UNSUPPORTED_AD_TYPE_FOR_EXEMPT_POLICY_VIOLATION_KEYS",
 	4: "CANNOT_SET_BOTH_IGNORABLE_POLICY_TOPICS_AND_EXEMPT_POLICY_VIOLATION_KEYS",
 }
+
 var PolicyValidationParameterErrorEnum_PolicyValidationParameterError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -54,8 +58,9 @@ var PolicyValidationParameterErrorEnum_PolicyValidationParameterError_value = ma
 func (x PolicyValidationParameterErrorEnum_PolicyValidationParameterError) String() string {
 	return proto.EnumName(PolicyValidationParameterErrorEnum_PolicyValidationParameterError_name, int32(x))
 }
+
 func (PolicyValidationParameterErrorEnum_PolicyValidationParameterError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_validation_parameter_error_30d40d9e925110fb, []int{0, 0}
+	return fileDescriptor_b4c304776e3c07c9, []int{0, 0}
 }
 
 // Container for enum describing possible policy validation parameter errors.
@@ -69,16 +74,17 @@ func (m *PolicyValidationParameterErrorEnum) Reset()         { *m = PolicyValida
 func (m *PolicyValidationParameterErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*PolicyValidationParameterErrorEnum) ProtoMessage()    {}
 func (*PolicyValidationParameterErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_validation_parameter_error_30d40d9e925110fb, []int{0}
+	return fileDescriptor_b4c304776e3c07c9, []int{0}
 }
+
 func (m *PolicyValidationParameterErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyValidationParameterErrorEnum.Unmarshal(m, b)
 }
 func (m *PolicyValidationParameterErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyValidationParameterErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyValidationParameterErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyValidationParameterErrorEnum.Merge(dst, src)
+func (m *PolicyValidationParameterErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyValidationParameterErrorEnum.Merge(m, src)
 }
 func (m *PolicyValidationParameterErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyValidationParameterErrorEnum.Size(m)
@@ -90,15 +96,15 @@ func (m *PolicyValidationParameterErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PolicyValidationParameterErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyValidationParameterErrorEnum)(nil), "google.ads.googleads.v1.errors.PolicyValidationParameterErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.PolicyValidationParameterErrorEnum_PolicyValidationParameterError", PolicyValidationParameterErrorEnum_PolicyValidationParameterError_name, PolicyValidationParameterErrorEnum_PolicyValidationParameterError_value)
+	proto.RegisterType((*PolicyValidationParameterErrorEnum)(nil), "google.ads.googleads.v1.errors.PolicyValidationParameterErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/policy_validation_parameter_error.proto", fileDescriptor_policy_validation_parameter_error_30d40d9e925110fb)
+	proto.RegisterFile("google/ads/googleads/v1/errors/policy_validation_parameter_error.proto", fileDescriptor_b4c304776e3c07c9)
 }
 
-var fileDescriptor_policy_validation_parameter_error_30d40d9e925110fb = []byte{
+var fileDescriptor_b4c304776e3c07c9 = []byte{
 	// 391 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x8a, 0xdb, 0x30,
 	0x18, 0x85, 0x1b, 0x4f, 0x69, 0x41, 0xb3, 0x68, 0xf0, 0xb2, 0x94, 0x2c, 0xdc, 0xbd, 0x8c, 0x99,
diff --git a/googleapis/ads/googleads/v1/errors/policy_violation_error.pb.go b/googleapis/ads/googleads/v1/errors/policy_violation_error.pb.go
index fc8d5b4733..90308ef02c 100644
--- a/googleapis/ads/googleads/v1/errors/policy_violation_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/policy_violation_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/policy_violation_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible policy violation errors.
 type PolicyViolationErrorEnum_PolicyViolationError int32
@@ -36,6 +39,7 @@ var PolicyViolationErrorEnum_PolicyViolationError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "POLICY_ERROR",
 }
+
 var PolicyViolationErrorEnum_PolicyViolationError_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNKNOWN":      1,
@@ -45,8 +49,9 @@ var PolicyViolationErrorEnum_PolicyViolationError_value = map[string]int32{
 func (x PolicyViolationErrorEnum_PolicyViolationError) String() string {
 	return proto.EnumName(PolicyViolationErrorEnum_PolicyViolationError_name, int32(x))
 }
+
 func (PolicyViolationErrorEnum_PolicyViolationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_violation_error_6fb18553f085b239, []int{0, 0}
+	return fileDescriptor_82022b324da9a65a, []int{0, 0}
 }
 
 // Container for enum describing possible policy violation errors.
@@ -60,16 +65,17 @@ func (m *PolicyViolationErrorEnum) Reset()         { *m = PolicyViolationErrorEn
 func (m *PolicyViolationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*PolicyViolationErrorEnum) ProtoMessage()    {}
 func (*PolicyViolationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_violation_error_6fb18553f085b239, []int{0}
+	return fileDescriptor_82022b324da9a65a, []int{0}
 }
+
 func (m *PolicyViolationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyViolationErrorEnum.Unmarshal(m, b)
 }
 func (m *PolicyViolationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyViolationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *PolicyViolationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyViolationErrorEnum.Merge(dst, src)
+func (m *PolicyViolationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyViolationErrorEnum.Merge(m, src)
 }
 func (m *PolicyViolationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_PolicyViolationErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *PolicyViolationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_PolicyViolationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PolicyViolationErrorEnum)(nil), "google.ads.googleads.v1.errors.PolicyViolationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.PolicyViolationErrorEnum_PolicyViolationError", PolicyViolationErrorEnum_PolicyViolationError_name, PolicyViolationErrorEnum_PolicyViolationError_value)
+	proto.RegisterType((*PolicyViolationErrorEnum)(nil), "google.ads.googleads.v1.errors.PolicyViolationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/policy_violation_error.proto", fileDescriptor_policy_violation_error_6fb18553f085b239)
+	proto.RegisterFile("google/ads/googleads/v1/errors/policy_violation_error.proto", fileDescriptor_82022b324da9a65a)
 }
 
-var fileDescriptor_policy_violation_error_6fb18553f085b239 = []byte{
+var fileDescriptor_82022b324da9a65a = []byte{
 	// 301 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0x84, 0x40,
 	0x14, 0x86, 0xd3, 0xa0, 0x60, 0x36, 0x48, 0xa4, 0x8b, 0x8a, 0xd8, 0x0b, 0x1f, 0x60, 0x06, 0xe9,
diff --git a/googleapis/ads/googleads/v1/errors/query_error.pb.go b/googleapis/ads/googleads/v1/errors/query_error.pb.go
index 4110a0d1df..38409907d6 100644
--- a/googleapis/ads/googleads/v1/errors/query_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/query_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/query_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible query errors.
 type QueryErrorEnum_QueryError int32
@@ -203,6 +206,7 @@ var QueryErrorEnum_QueryError_name = map[int32]string{
 	11: "UNEXPECTED_INPUT",
 	59: "REQUESTED_METRICS_FOR_MANAGER",
 }
+
 var QueryErrorEnum_QueryError_value = map[string]int32{
 	"UNSPECIFIED":                      0,
 	"UNKNOWN":                          1,
@@ -263,8 +267,9 @@ var QueryErrorEnum_QueryError_value = map[string]int32{
 func (x QueryErrorEnum_QueryError) String() string {
 	return proto.EnumName(QueryErrorEnum_QueryError_name, int32(x))
 }
+
 func (QueryErrorEnum_QueryError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_error_6b95ddf2843c3ef1, []int{0, 0}
+	return fileDescriptor_199f4004bfaeb2f2, []int{0, 0}
 }
 
 // Container for enum describing possible query errors.
@@ -278,16 +283,17 @@ func (m *QueryErrorEnum) Reset()         { *m = QueryErrorEnum{} }
 func (m *QueryErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*QueryErrorEnum) ProtoMessage()    {}
 func (*QueryErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_error_6b95ddf2843c3ef1, []int{0}
+	return fileDescriptor_199f4004bfaeb2f2, []int{0}
 }
+
 func (m *QueryErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryErrorEnum.Unmarshal(m, b)
 }
 func (m *QueryErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *QueryErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryErrorEnum.Merge(dst, src)
+func (m *QueryErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryErrorEnum.Merge(m, src)
 }
 func (m *QueryErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_QueryErrorEnum.Size(m)
@@ -299,15 +305,15 @@ func (m *QueryErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_QueryErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*QueryErrorEnum)(nil), "google.ads.googleads.v1.errors.QueryErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.QueryErrorEnum_QueryError", QueryErrorEnum_QueryError_name, QueryErrorEnum_QueryError_value)
+	proto.RegisterType((*QueryErrorEnum)(nil), "google.ads.googleads.v1.errors.QueryErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/query_error.proto", fileDescriptor_query_error_6b95ddf2843c3ef1)
+	proto.RegisterFile("google/ads/googleads/v1/errors/query_error.proto", fileDescriptor_199f4004bfaeb2f2)
 }
 
-var fileDescriptor_query_error_6b95ddf2843c3ef1 = []byte{
+var fileDescriptor_199f4004bfaeb2f2 = []byte{
 	// 970 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0xff, 0x6e, 0x13, 0x47,
 	0x10, 0x6e, 0x42, 0x0b, 0x65, 0x42, 0x92, 0x65, 0x21, 0x3f, 0x48, 0x43, 0x1a, 0x4c, 0x80, 0x40,
diff --git a/googleapis/ads/googleads/v1/errors/quota_error.pb.go b/googleapis/ads/googleads/v1/errors/quota_error.pb.go
index 07b26a1a1b..c517c2c0ca 100644
--- a/googleapis/ads/googleads/v1/errors/quota_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/quota_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/quota_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible quota errors.
 type QuotaErrorEnum_QuotaError int32
@@ -42,6 +45,7 @@ var QuotaErrorEnum_QuotaError_name = map[int32]string{
 	3: "ACCESS_PROHIBITED",
 	4: "RESOURCE_TEMPORARILY_EXHAUSTED",
 }
+
 var QuotaErrorEnum_QuotaError_value = map[string]int32{
 	"UNSPECIFIED":                    0,
 	"UNKNOWN":                        1,
@@ -53,8 +57,9 @@ var QuotaErrorEnum_QuotaError_value = map[string]int32{
 func (x QuotaErrorEnum_QuotaError) String() string {
 	return proto.EnumName(QuotaErrorEnum_QuotaError_name, int32(x))
 }
+
 func (QuotaErrorEnum_QuotaError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_quota_error_731d878185294ca1, []int{0, 0}
+	return fileDescriptor_6cd7591584b55844, []int{0, 0}
 }
 
 // Container for enum describing possible quota errors.
@@ -68,16 +73,17 @@ func (m *QuotaErrorEnum) Reset()         { *m = QuotaErrorEnum{} }
 func (m *QuotaErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*QuotaErrorEnum) ProtoMessage()    {}
 func (*QuotaErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_error_731d878185294ca1, []int{0}
+	return fileDescriptor_6cd7591584b55844, []int{0}
 }
+
 func (m *QuotaErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuotaErrorEnum.Unmarshal(m, b)
 }
 func (m *QuotaErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuotaErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *QuotaErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuotaErrorEnum.Merge(dst, src)
+func (m *QuotaErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaErrorEnum.Merge(m, src)
 }
 func (m *QuotaErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_QuotaErrorEnum.Size(m)
@@ -89,15 +95,15 @@ func (m *QuotaErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_QuotaErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*QuotaErrorEnum)(nil), "google.ads.googleads.v1.errors.QuotaErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.QuotaErrorEnum_QuotaError", QuotaErrorEnum_QuotaError_name, QuotaErrorEnum_QuotaError_value)
+	proto.RegisterType((*QuotaErrorEnum)(nil), "google.ads.googleads.v1.errors.QuotaErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/quota_error.proto", fileDescriptor_quota_error_731d878185294ca1)
+	proto.RegisterFile("google/ads/googleads/v1/errors/quota_error.proto", fileDescriptor_6cd7591584b55844)
 }
 
-var fileDescriptor_quota_error_731d878185294ca1 = []byte{
+var fileDescriptor_6cd7591584b55844 = []byte{
 	// 335 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4e, 0xb3, 0x40,
 	0x14, 0xc5, 0x3f, 0xe8, 0x17, 0x4d, 0xa6, 0x89, 0xad, 0x93, 0xe8, 0xc2, 0x98, 0x2e, 0x78, 0x80,
diff --git a/googleapis/ads/googleads/v1/errors/range_error.pb.go b/googleapis/ads/googleads/v1/errors/range_error.pb.go
index 6322ff8336..b256c93ee6 100644
--- a/googleapis/ads/googleads/v1/errors/range_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/range_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/range_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible range errors.
 type RangeErrorEnum_RangeError int32
@@ -39,6 +42,7 @@ var RangeErrorEnum_RangeError_name = map[int32]string{
 	2: "TOO_LOW",
 	3: "TOO_HIGH",
 }
+
 var RangeErrorEnum_RangeError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var RangeErrorEnum_RangeError_value = map[string]int32{
 func (x RangeErrorEnum_RangeError) String() string {
 	return proto.EnumName(RangeErrorEnum_RangeError_name, int32(x))
 }
+
 func (RangeErrorEnum_RangeError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_range_error_706dbda1b4701d63, []int{0, 0}
+	return fileDescriptor_c6a9036257ea7c61, []int{0, 0}
 }
 
 // Container for enum describing possible range errors.
@@ -64,16 +69,17 @@ func (m *RangeErrorEnum) Reset()         { *m = RangeErrorEnum{} }
 func (m *RangeErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*RangeErrorEnum) ProtoMessage()    {}
 func (*RangeErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_range_error_706dbda1b4701d63, []int{0}
+	return fileDescriptor_c6a9036257ea7c61, []int{0}
 }
+
 func (m *RangeErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RangeErrorEnum.Unmarshal(m, b)
 }
 func (m *RangeErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RangeErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *RangeErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RangeErrorEnum.Merge(dst, src)
+func (m *RangeErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RangeErrorEnum.Merge(m, src)
 }
 func (m *RangeErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_RangeErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *RangeErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_RangeErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*RangeErrorEnum)(nil), "google.ads.googleads.v1.errors.RangeErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.RangeErrorEnum_RangeError", RangeErrorEnum_RangeError_name, RangeErrorEnum_RangeError_value)
+	proto.RegisterType((*RangeErrorEnum)(nil), "google.ads.googleads.v1.errors.RangeErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/range_error.proto", fileDescriptor_range_error_706dbda1b4701d63)
+	proto.RegisterFile("google/ads/googleads/v1/errors/range_error.proto", fileDescriptor_c6a9036257ea7c61)
 }
 
-var fileDescriptor_range_error_706dbda1b4701d63 = []byte{
+var fileDescriptor_c6a9036257ea7c61 = []byte{
 	// 292 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xf3, 0x40,
 	0x14, 0x85, 0xff, 0xa4, 0xf0, 0x2b, 0x53, 0xb1, 0x21, 0x4b, 0x91, 0x2e, 0xf2, 0x00, 0x33, 0x06,
diff --git a/googleapis/ads/googleads/v1/errors/recommendation_error.pb.go b/googleapis/ads/googleads/v1/errors/recommendation_error.pb.go
index b815b498d9..2facb39ee6 100644
--- a/googleapis/ads/googleads/v1/errors/recommendation_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/recommendation_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/recommendation_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible errors from applying a recommendation.
 type RecommendationErrorEnum_RecommendationError int32
@@ -79,6 +82,7 @@ var RecommendationErrorEnum_RecommendationError_name = map[int32]string{
 	14: "RECOMMENDATION_ALREADY_DISMISSED",
 	15: "INVALID_APPLY_REQUEST",
 }
+
 var RecommendationErrorEnum_RecommendationError_value = map[string]int32{
 	"UNSPECIFIED":                      0,
 	"UNKNOWN":                          1,
@@ -101,8 +105,9 @@ var RecommendationErrorEnum_RecommendationError_value = map[string]int32{
 func (x RecommendationErrorEnum_RecommendationError) String() string {
 	return proto.EnumName(RecommendationErrorEnum_RecommendationError_name, int32(x))
 }
+
 func (RecommendationErrorEnum_RecommendationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_error_7a76f155b17969f8, []int{0, 0}
+	return fileDescriptor_81944be64bae24a3, []int{0, 0}
 }
 
 // Container for enum describing possible errors from applying a recommendation.
@@ -116,16 +121,17 @@ func (m *RecommendationErrorEnum) Reset()         { *m = RecommendationErrorEnum
 func (m *RecommendationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*RecommendationErrorEnum) ProtoMessage()    {}
 func (*RecommendationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_error_7a76f155b17969f8, []int{0}
+	return fileDescriptor_81944be64bae24a3, []int{0}
 }
+
 func (m *RecommendationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecommendationErrorEnum.Unmarshal(m, b)
 }
 func (m *RecommendationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecommendationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *RecommendationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecommendationErrorEnum.Merge(dst, src)
+func (m *RecommendationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecommendationErrorEnum.Merge(m, src)
 }
 func (m *RecommendationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_RecommendationErrorEnum.Size(m)
@@ -137,15 +143,15 @@ func (m *RecommendationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_RecommendationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*RecommendationErrorEnum)(nil), "google.ads.googleads.v1.errors.RecommendationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.RecommendationErrorEnum_RecommendationError", RecommendationErrorEnum_RecommendationError_name, RecommendationErrorEnum_RecommendationError_value)
+	proto.RegisterType((*RecommendationErrorEnum)(nil), "google.ads.googleads.v1.errors.RecommendationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/recommendation_error.proto", fileDescriptor_recommendation_error_7a76f155b17969f8)
+	proto.RegisterFile("google/ads/googleads/v1/errors/recommendation_error.proto", fileDescriptor_81944be64bae24a3)
 }
 
-var fileDescriptor_recommendation_error_7a76f155b17969f8 = []byte{
+var fileDescriptor_81944be64bae24a3 = []byte{
 	// 515 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6e, 0xd3, 0x30,
 	0x14, 0x86, 0x59, 0x0b, 0x1b, 0x78, 0x1b, 0x33, 0x9e, 0x60, 0x30, 0xa0, 0x82, 0x8a, 0xeb, 0x44,
diff --git a/googleapis/ads/googleads/v1/errors/region_code_error.pb.go b/googleapis/ads/googleads/v1/errors/region_code_error.pb.go
index 8934d2499a..8b6cd9e52b 100644
--- a/googleapis/ads/googleads/v1/errors/region_code_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/region_code_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/region_code_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible region code errors.
 type RegionCodeErrorEnum_RegionCodeError int32
@@ -36,6 +39,7 @@ var RegionCodeErrorEnum_RegionCodeError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "INVALID_REGION_CODE",
 }
+
 var RegionCodeErrorEnum_RegionCodeError_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -45,8 +49,9 @@ var RegionCodeErrorEnum_RegionCodeError_value = map[string]int32{
 func (x RegionCodeErrorEnum_RegionCodeError) String() string {
 	return proto.EnumName(RegionCodeErrorEnum_RegionCodeError_name, int32(x))
 }
+
 func (RegionCodeErrorEnum_RegionCodeError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_region_code_error_3ef96732f9283c65, []int{0, 0}
+	return fileDescriptor_f7a91ec3042795c0, []int{0, 0}
 }
 
 // Container for enum describing possible region code errors.
@@ -60,16 +65,17 @@ func (m *RegionCodeErrorEnum) Reset()         { *m = RegionCodeErrorEnum{} }
 func (m *RegionCodeErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*RegionCodeErrorEnum) ProtoMessage()    {}
 func (*RegionCodeErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_region_code_error_3ef96732f9283c65, []int{0}
+	return fileDescriptor_f7a91ec3042795c0, []int{0}
 }
+
 func (m *RegionCodeErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegionCodeErrorEnum.Unmarshal(m, b)
 }
 func (m *RegionCodeErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RegionCodeErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *RegionCodeErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RegionCodeErrorEnum.Merge(dst, src)
+func (m *RegionCodeErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegionCodeErrorEnum.Merge(m, src)
 }
 func (m *RegionCodeErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_RegionCodeErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *RegionCodeErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_RegionCodeErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*RegionCodeErrorEnum)(nil), "google.ads.googleads.v1.errors.RegionCodeErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.RegionCodeErrorEnum_RegionCodeError", RegionCodeErrorEnum_RegionCodeError_name, RegionCodeErrorEnum_RegionCodeError_value)
+	proto.RegisterType((*RegionCodeErrorEnum)(nil), "google.ads.googleads.v1.errors.RegionCodeErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/region_code_error.proto", fileDescriptor_region_code_error_3ef96732f9283c65)
+	proto.RegisterFile("google/ads/googleads/v1/errors/region_code_error.proto", fileDescriptor_f7a91ec3042795c0)
 }
 
-var fileDescriptor_region_code_error_3ef96732f9283c65 = []byte{
+var fileDescriptor_f7a91ec3042795c0 = []byte{
 	// 304 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xd1, 0x4a, 0xf3, 0x30,
 	0x1c, 0xc5, 0xbf, 0xf5, 0x03, 0x85, 0xec, 0x62, 0xa3, 0x13, 0x04, 0x91, 0x5d, 0xf4, 0x01, 0x12,
diff --git a/googleapis/ads/googleads/v1/errors/request_error.pb.go b/googleapis/ads/googleads/v1/errors/request_error.pb.go
index c94ecd8091..2676f814d4 100644
--- a/googleapis/ads/googleads/v1/errors/request_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/request_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/request_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible request errors.
 type RequestErrorEnum_RequestError int32
@@ -90,6 +93,7 @@ var RequestErrorEnum_RequestError_name = map[int32]string{
 	20: "LOGIN_CUSTOMER_ID_PARAMETER_MISSING",
 	21: "VALIDATE_ONLY_REQUEST_HAS_PAGE_TOKEN",
 }
+
 var RequestErrorEnum_RequestError_value = map[string]int32{
 	"UNSPECIFIED":                           0,
 	"UNKNOWN":                               1,
@@ -116,8 +120,9 @@ var RequestErrorEnum_RequestError_value = map[string]int32{
 func (x RequestErrorEnum_RequestError) String() string {
 	return proto.EnumName(RequestErrorEnum_RequestError_name, int32(x))
 }
+
 func (RequestErrorEnum_RequestError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_request_error_898c7e116ba56a69, []int{0, 0}
+	return fileDescriptor_fef0616bab723331, []int{0, 0}
 }
 
 // Container for enum describing possible request errors.
@@ -131,16 +136,17 @@ func (m *RequestErrorEnum) Reset()         { *m = RequestErrorEnum{} }
 func (m *RequestErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*RequestErrorEnum) ProtoMessage()    {}
 func (*RequestErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_request_error_898c7e116ba56a69, []int{0}
+	return fileDescriptor_fef0616bab723331, []int{0}
 }
+
 func (m *RequestErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestErrorEnum.Unmarshal(m, b)
 }
 func (m *RequestErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *RequestErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestErrorEnum.Merge(dst, src)
+func (m *RequestErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestErrorEnum.Merge(m, src)
 }
 func (m *RequestErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_RequestErrorEnum.Size(m)
@@ -152,15 +158,15 @@ func (m *RequestErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_RequestErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*RequestErrorEnum)(nil), "google.ads.googleads.v1.errors.RequestErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.RequestErrorEnum_RequestError", RequestErrorEnum_RequestError_name, RequestErrorEnum_RequestError_value)
+	proto.RegisterType((*RequestErrorEnum)(nil), "google.ads.googleads.v1.errors.RequestErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/request_error.proto", fileDescriptor_request_error_898c7e116ba56a69)
+	proto.RegisterFile("google/ads/googleads/v1/errors/request_error.proto", fileDescriptor_fef0616bab723331)
 }
 
-var fileDescriptor_request_error_898c7e116ba56a69 = []byte{
+var fileDescriptor_fef0616bab723331 = []byte{
 	// 573 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0x66, 0x3f, 0x6c, 0xe0, 0x01, 0xf3, 0x3c, 0xb6, 0x89, 0x0d, 0x0d, 0x51, 0x98, 0x80, 0x9b,
diff --git a/googleapis/ads/googleads/v1/errors/resource_access_denied_error.pb.go b/googleapis/ads/googleads/v1/errors/resource_access_denied_error.pb.go
index 492e3efcd3..dc5b971bfd 100644
--- a/googleapis/ads/googleads/v1/errors/resource_access_denied_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/resource_access_denied_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/resource_access_denied_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible resource access denied errors.
 type ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError int32
@@ -36,6 +39,7 @@ var ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError_name = map[int32]str
 	1: "UNKNOWN",
 	3: "WRITE_ACCESS_DENIED",
 }
+
 var ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError_value = map[string]int32{
 	"UNSPECIFIED":         0,
 	"UNKNOWN":             1,
@@ -45,8 +49,9 @@ var ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError_value = map[string]i
 func (x ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError) String() string {
 	return proto.EnumName(ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError_name, int32(x))
 }
+
 func (ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resource_access_denied_error_f45d8d71096e1d66, []int{0, 0}
+	return fileDescriptor_ebcb9332861fe0ce, []int{0, 0}
 }
 
 // Container for enum describing possible resource access denied errors.
@@ -60,16 +65,17 @@ func (m *ResourceAccessDeniedErrorEnum) Reset()         { *m = ResourceAccessDen
 func (m *ResourceAccessDeniedErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ResourceAccessDeniedErrorEnum) ProtoMessage()    {}
 func (*ResourceAccessDeniedErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resource_access_denied_error_f45d8d71096e1d66, []int{0}
+	return fileDescriptor_ebcb9332861fe0ce, []int{0}
 }
+
 func (m *ResourceAccessDeniedErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceAccessDeniedErrorEnum.Unmarshal(m, b)
 }
 func (m *ResourceAccessDeniedErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceAccessDeniedErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ResourceAccessDeniedErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceAccessDeniedErrorEnum.Merge(dst, src)
+func (m *ResourceAccessDeniedErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceAccessDeniedErrorEnum.Merge(m, src)
 }
 func (m *ResourceAccessDeniedErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ResourceAccessDeniedErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *ResourceAccessDeniedErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ResourceAccessDeniedErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ResourceAccessDeniedErrorEnum)(nil), "google.ads.googleads.v1.errors.ResourceAccessDeniedErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError", ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError_name, ResourceAccessDeniedErrorEnum_ResourceAccessDeniedError_value)
+	proto.RegisterType((*ResourceAccessDeniedErrorEnum)(nil), "google.ads.googleads.v1.errors.ResourceAccessDeniedErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/resource_access_denied_error.proto", fileDescriptor_resource_access_denied_error_f45d8d71096e1d66)
+	proto.RegisterFile("google/ads/googleads/v1/errors/resource_access_denied_error.proto", fileDescriptor_ebcb9332861fe0ce)
 }
 
-var fileDescriptor_resource_access_denied_error_f45d8d71096e1d66 = []byte{
+var fileDescriptor_ebcb9332861fe0ce = []byte{
 	// 312 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x6a, 0x32, 0x31,
 	0x14, 0x85, 0x7f, 0x15, 0xfe, 0x42, 0x5c, 0x54, 0xa6, 0x8b, 0xd2, 0xd2, 0xba, 0x98, 0x07, 0x48,
diff --git a/googleapis/ads/googleads/v1/errors/resource_count_limit_exceeded_error.pb.go b/googleapis/ads/googleads/v1/errors/resource_count_limit_exceeded_error.pb.go
index 252b84c208..ea00f219fd 100644
--- a/googleapis/ads/googleads/v1/errors/resource_count_limit_exceeded_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/resource_count_limit_exceeded_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/resource_count_limit_exceeded_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible resource count limit exceeded errors.
 type ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError int32
@@ -77,6 +80,7 @@ var ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError_name = m
 	8: "MATCHING_FUNCTION_LIMIT",
 	9: "RESPONSE_ROW_LIMIT_EXCEEDED",
 }
+
 var ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError_value = map[string]int32{
 	"UNSPECIFIED":                 0,
 	"UNKNOWN":                     1,
@@ -93,8 +97,9 @@ var ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError_value =
 func (x ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError) String() string {
 	return proto.EnumName(ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError_name, int32(x))
 }
+
 func (ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resource_count_limit_exceeded_error_4e9c7c26ba2a3e8f, []int{0, 0}
+	return fileDescriptor_baf533b61e178968, []int{0, 0}
 }
 
 // Container for enum describing possible resource count limit exceeded errors.
@@ -108,16 +113,17 @@ func (m *ResourceCountLimitExceededErrorEnum) Reset()         { *m = ResourceCou
 func (m *ResourceCountLimitExceededErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*ResourceCountLimitExceededErrorEnum) ProtoMessage()    {}
 func (*ResourceCountLimitExceededErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resource_count_limit_exceeded_error_4e9c7c26ba2a3e8f, []int{0}
+	return fileDescriptor_baf533b61e178968, []int{0}
 }
+
 func (m *ResourceCountLimitExceededErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceCountLimitExceededErrorEnum.Unmarshal(m, b)
 }
 func (m *ResourceCountLimitExceededErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceCountLimitExceededErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *ResourceCountLimitExceededErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceCountLimitExceededErrorEnum.Merge(dst, src)
+func (m *ResourceCountLimitExceededErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceCountLimitExceededErrorEnum.Merge(m, src)
 }
 func (m *ResourceCountLimitExceededErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_ResourceCountLimitExceededErrorEnum.Size(m)
@@ -129,15 +135,15 @@ func (m *ResourceCountLimitExceededErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_ResourceCountLimitExceededErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ResourceCountLimitExceededErrorEnum)(nil), "google.ads.googleads.v1.errors.ResourceCountLimitExceededErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError", ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError_name, ResourceCountLimitExceededErrorEnum_ResourceCountLimitExceededError_value)
+	proto.RegisterType((*ResourceCountLimitExceededErrorEnum)(nil), "google.ads.googleads.v1.errors.ResourceCountLimitExceededErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/resource_count_limit_exceeded_error.proto", fileDescriptor_resource_count_limit_exceeded_error_4e9c7c26ba2a3e8f)
+	proto.RegisterFile("google/ads/googleads/v1/errors/resource_count_limit_exceeded_error.proto", fileDescriptor_baf533b61e178968)
 }
 
-var fileDescriptor_resource_count_limit_exceeded_error_4e9c7c26ba2a3e8f = []byte{
+var fileDescriptor_baf533b61e178968 = []byte{
 	// 428 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xdf, 0x6a, 0xd4, 0x40,
 	0x18, 0xc5, 0xdd, 0x54, 0x5b, 0x9d, 0xa2, 0xa6, 0x83, 0xa2, 0xd8, 0xd2, 0xc2, 0xea, 0xf5, 0x84,
diff --git a/googleapis/ads/googleads/v1/errors/setting_error.pb.go b/googleapis/ads/googleads/v1/errors/setting_error.pb.go
index 1e0f62a58a..4c8a5b00fe 100644
--- a/googleapis/ads/googleads/v1/errors/setting_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/setting_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/setting_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible setting errors.
 type SettingErrorEnum_SettingError int32
@@ -94,6 +97,7 @@ var SettingErrorEnum_SettingError_name = map[int32]string{
 	18: "MEDIA_INCOMPATIBLE_FOR_UNIVERSAL_APP_CAMPAIGN",
 	19: "TOO_MANY_EXCLAMATION_MARKS",
 }
+
 var SettingErrorEnum_SettingError_value = map[string]int32{
 	"UNSPECIFIED":                   0,
 	"UNKNOWN":                       1,
@@ -119,8 +123,9 @@ var SettingErrorEnum_SettingError_value = map[string]int32{
 func (x SettingErrorEnum_SettingError) String() string {
 	return proto.EnumName(SettingErrorEnum_SettingError_name, int32(x))
 }
+
 func (SettingErrorEnum_SettingError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_setting_error_c07b21986f03a4ed, []int{0, 0}
+	return fileDescriptor_752343a1d62a5cad, []int{0, 0}
 }
 
 // Container for enum describing possible setting errors.
@@ -134,16 +139,17 @@ func (m *SettingErrorEnum) Reset()         { *m = SettingErrorEnum{} }
 func (m *SettingErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*SettingErrorEnum) ProtoMessage()    {}
 func (*SettingErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_setting_error_c07b21986f03a4ed, []int{0}
+	return fileDescriptor_752343a1d62a5cad, []int{0}
 }
+
 func (m *SettingErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SettingErrorEnum.Unmarshal(m, b)
 }
 func (m *SettingErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SettingErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *SettingErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SettingErrorEnum.Merge(dst, src)
+func (m *SettingErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SettingErrorEnum.Merge(m, src)
 }
 func (m *SettingErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_SettingErrorEnum.Size(m)
@@ -155,15 +161,15 @@ func (m *SettingErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SettingErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SettingErrorEnum)(nil), "google.ads.googleads.v1.errors.SettingErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.SettingErrorEnum_SettingError", SettingErrorEnum_SettingError_name, SettingErrorEnum_SettingError_value)
+	proto.RegisterType((*SettingErrorEnum)(nil), "google.ads.googleads.v1.errors.SettingErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/setting_error.proto", fileDescriptor_setting_error_c07b21986f03a4ed)
+	proto.RegisterFile("google/ads/googleads/v1/errors/setting_error.proto", fileDescriptor_752343a1d62a5cad)
 }
 
-var fileDescriptor_setting_error_c07b21986f03a4ed = []byte{
+var fileDescriptor_752343a1d62a5cad = []byte{
 	// 696 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xd1, 0x8e, 0xdb, 0x44,
 	0x14, 0x86, 0xd9, 0x2d, 0xb4, 0xcb, 0x6c, 0xa1, 0xd3, 0xe1, 0xae, 0x82, 0x95, 0xd8, 0x6b, 0x70,
diff --git a/googleapis/ads/googleads/v1/errors/shared_criterion_error.pb.go b/googleapis/ads/googleads/v1/errors/shared_criterion_error.pb.go
index fc71882f76..85a37a487f 100644
--- a/googleapis/ads/googleads/v1/errors/shared_criterion_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/shared_criterion_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/shared_criterion_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible shared criterion errors.
 type SharedCriterionErrorEnum_SharedCriterionError int32
@@ -36,6 +39,7 @@ var SharedCriterionErrorEnum_SharedCriterionError_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "CRITERION_TYPE_NOT_ALLOWED_FOR_SHARED_SET_TYPE",
 }
+
 var SharedCriterionErrorEnum_SharedCriterionError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -45,8 +49,9 @@ var SharedCriterionErrorEnum_SharedCriterionError_value = map[string]int32{
 func (x SharedCriterionErrorEnum_SharedCriterionError) String() string {
 	return proto.EnumName(SharedCriterionErrorEnum_SharedCriterionError_name, int32(x))
 }
+
 func (SharedCriterionErrorEnum_SharedCriterionError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_error_40c1d60c7ede7d32, []int{0, 0}
+	return fileDescriptor_63aacfbca4cfc124, []int{0, 0}
 }
 
 // Container for enum describing possible shared criterion errors.
@@ -60,16 +65,17 @@ func (m *SharedCriterionErrorEnum) Reset()         { *m = SharedCriterionErrorEn
 func (m *SharedCriterionErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*SharedCriterionErrorEnum) ProtoMessage()    {}
 func (*SharedCriterionErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_error_40c1d60c7ede7d32, []int{0}
+	return fileDescriptor_63aacfbca4cfc124, []int{0}
 }
+
 func (m *SharedCriterionErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedCriterionErrorEnum.Unmarshal(m, b)
 }
 func (m *SharedCriterionErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedCriterionErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *SharedCriterionErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedCriterionErrorEnum.Merge(dst, src)
+func (m *SharedCriterionErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedCriterionErrorEnum.Merge(m, src)
 }
 func (m *SharedCriterionErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_SharedCriterionErrorEnum.Size(m)
@@ -81,15 +87,15 @@ func (m *SharedCriterionErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SharedCriterionErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SharedCriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.SharedCriterionErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.SharedCriterionErrorEnum_SharedCriterionError", SharedCriterionErrorEnum_SharedCriterionError_name, SharedCriterionErrorEnum_SharedCriterionError_value)
+	proto.RegisterType((*SharedCriterionErrorEnum)(nil), "google.ads.googleads.v1.errors.SharedCriterionErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/shared_criterion_error.proto", fileDescriptor_shared_criterion_error_40c1d60c7ede7d32)
+	proto.RegisterFile("google/ads/googleads/v1/errors/shared_criterion_error.proto", fileDescriptor_63aacfbca4cfc124)
 }
 
-var fileDescriptor_shared_criterion_error_40c1d60c7ede7d32 = []byte{
+var fileDescriptor_63aacfbca4cfc124 = []byte{
 	// 330 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4e, 0x83, 0x40,
 	0x14, 0x86, 0x05, 0x13, 0x4d, 0xa6, 0x0b, 0x1b, 0xe2, 0x42, 0x8d, 0xe9, 0x82, 0x03, 0x0c, 0x41,
diff --git a/googleapis/ads/googleads/v1/errors/shared_set_error.pb.go b/googleapis/ads/googleads/v1/errors/shared_set_error.pb.go
index 89b24799b1..793cb89b7f 100644
--- a/googleapis/ads/googleads/v1/errors/shared_set_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/shared_set_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/shared_set_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible shared set errors.
 type SharedSetErrorEnum_SharedSetError int32
@@ -45,6 +48,7 @@ var SharedSetErrorEnum_SharedSetError_name = map[int32]string{
 	4: "SHARED_SET_REMOVED",
 	5: "SHARED_SET_IN_USE",
 }
+
 var SharedSetErrorEnum_SharedSetError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -57,8 +61,9 @@ var SharedSetErrorEnum_SharedSetError_value = map[string]int32{
 func (x SharedSetErrorEnum_SharedSetError) String() string {
 	return proto.EnumName(SharedSetErrorEnum_SharedSetError_name, int32(x))
 }
+
 func (SharedSetErrorEnum_SharedSetError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_error_3a2a77f77d946ee5, []int{0, 0}
+	return fileDescriptor_f7557a309b795fce, []int{0, 0}
 }
 
 // Container for enum describing possible shared set errors.
@@ -72,16 +77,17 @@ func (m *SharedSetErrorEnum) Reset()         { *m = SharedSetErrorEnum{} }
 func (m *SharedSetErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*SharedSetErrorEnum) ProtoMessage()    {}
 func (*SharedSetErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_error_3a2a77f77d946ee5, []int{0}
+	return fileDescriptor_f7557a309b795fce, []int{0}
 }
+
 func (m *SharedSetErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedSetErrorEnum.Unmarshal(m, b)
 }
 func (m *SharedSetErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedSetErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *SharedSetErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedSetErrorEnum.Merge(dst, src)
+func (m *SharedSetErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedSetErrorEnum.Merge(m, src)
 }
 func (m *SharedSetErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_SharedSetErrorEnum.Size(m)
@@ -93,15 +99,15 @@ func (m *SharedSetErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SharedSetErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SharedSetErrorEnum)(nil), "google.ads.googleads.v1.errors.SharedSetErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.SharedSetErrorEnum_SharedSetError", SharedSetErrorEnum_SharedSetError_name, SharedSetErrorEnum_SharedSetError_value)
+	proto.RegisterType((*SharedSetErrorEnum)(nil), "google.ads.googleads.v1.errors.SharedSetErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/shared_set_error.proto", fileDescriptor_shared_set_error_3a2a77f77d946ee5)
+	proto.RegisterFile("google/ads/googleads/v1/errors/shared_set_error.proto", fileDescriptor_f7557a309b795fce)
 }
 
-var fileDescriptor_shared_set_error_3a2a77f77d946ee5 = []byte{
+var fileDescriptor_f7557a309b795fce = []byte{
 	// 372 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x8e, 0x9b, 0x30,
 	0x18, 0xc5, 0x0b, 0xe9, 0x1f, 0xc9, 0x91, 0x52, 0xea, 0xaa, 0x5d, 0x54, 0x55, 0x16, 0x1c, 0xc0,
diff --git a/googleapis/ads/googleads/v1/errors/size_limit_error.pb.go b/googleapis/ads/googleads/v1/errors/size_limit_error.pb.go
index f216fe56d8..100f6c4e89 100644
--- a/googleapis/ads/googleads/v1/errors/size_limit_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/size_limit_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/size_limit_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible size limit errors.
 type SizeLimitErrorEnum_SizeLimitError int32
@@ -39,6 +42,7 @@ var SizeLimitErrorEnum_SizeLimitError_name = map[int32]string{
 	2: "REQUEST_SIZE_LIMIT_EXCEEDED",
 	3: "RESPONSE_SIZE_LIMIT_EXCEEDED",
 }
+
 var SizeLimitErrorEnum_SizeLimitError_value = map[string]int32{
 	"UNSPECIFIED":                  0,
 	"UNKNOWN":                      1,
@@ -49,8 +53,9 @@ var SizeLimitErrorEnum_SizeLimitError_value = map[string]int32{
 func (x SizeLimitErrorEnum_SizeLimitError) String() string {
 	return proto.EnumName(SizeLimitErrorEnum_SizeLimitError_name, int32(x))
 }
+
 func (SizeLimitErrorEnum_SizeLimitError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_size_limit_error_92d39604b305e0fb, []int{0, 0}
+	return fileDescriptor_bcc468de64921988, []int{0, 0}
 }
 
 // Container for enum describing possible size limit errors.
@@ -64,16 +69,17 @@ func (m *SizeLimitErrorEnum) Reset()         { *m = SizeLimitErrorEnum{} }
 func (m *SizeLimitErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*SizeLimitErrorEnum) ProtoMessage()    {}
 func (*SizeLimitErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_size_limit_error_92d39604b305e0fb, []int{0}
+	return fileDescriptor_bcc468de64921988, []int{0}
 }
+
 func (m *SizeLimitErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SizeLimitErrorEnum.Unmarshal(m, b)
 }
 func (m *SizeLimitErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SizeLimitErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *SizeLimitErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SizeLimitErrorEnum.Merge(dst, src)
+func (m *SizeLimitErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SizeLimitErrorEnum.Merge(m, src)
 }
 func (m *SizeLimitErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_SizeLimitErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *SizeLimitErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_SizeLimitErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*SizeLimitErrorEnum)(nil), "google.ads.googleads.v1.errors.SizeLimitErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.SizeLimitErrorEnum_SizeLimitError", SizeLimitErrorEnum_SizeLimitError_name, SizeLimitErrorEnum_SizeLimitError_value)
+	proto.RegisterType((*SizeLimitErrorEnum)(nil), "google.ads.googleads.v1.errors.SizeLimitErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/size_limit_error.proto", fileDescriptor_size_limit_error_92d39604b305e0fb)
+	proto.RegisterFile("google/ads/googleads/v1/errors/size_limit_error.proto", fileDescriptor_bcc468de64921988)
 }
 
-var fileDescriptor_size_limit_error_92d39604b305e0fb = []byte{
+var fileDescriptor_bcc468de64921988 = []byte{
 	// 327 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4a, 0xc3, 0x40,
 	0x14, 0x86, 0x4d, 0x0a, 0x0a, 0x53, 0xd0, 0x12, 0x77, 0x5a, 0xaa, 0xe4, 0x00, 0x13, 0x82, 0xb8,
diff --git a/googleapis/ads/googleads/v1/errors/string_format_error.pb.go b/googleapis/ads/googleads/v1/errors/string_format_error.pb.go
index 279c72e11d..53c73223a2 100644
--- a/googleapis/ads/googleads/v1/errors/string_format_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/string_format_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/string_format_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible string format errors.
 type StringFormatErrorEnum_StringFormatError int32
@@ -39,6 +42,7 @@ var StringFormatErrorEnum_StringFormatError_name = map[int32]string{
 	2: "ILLEGAL_CHARS",
 	3: "INVALID_FORMAT",
 }
+
 var StringFormatErrorEnum_StringFormatError_value = map[string]int32{
 	"UNSPECIFIED":    0,
 	"UNKNOWN":        1,
@@ -49,8 +53,9 @@ var StringFormatErrorEnum_StringFormatError_value = map[string]int32{
 func (x StringFormatErrorEnum_StringFormatError) String() string {
 	return proto.EnumName(StringFormatErrorEnum_StringFormatError_name, int32(x))
 }
+
 func (StringFormatErrorEnum_StringFormatError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_string_format_error_f7006cd68d0ebbf8, []int{0, 0}
+	return fileDescriptor_8ce65d4b86eec262, []int{0, 0}
 }
 
 // Container for enum describing possible string format errors.
@@ -64,16 +69,17 @@ func (m *StringFormatErrorEnum) Reset()         { *m = StringFormatErrorEnum{} }
 func (m *StringFormatErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*StringFormatErrorEnum) ProtoMessage()    {}
 func (*StringFormatErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_string_format_error_f7006cd68d0ebbf8, []int{0}
+	return fileDescriptor_8ce65d4b86eec262, []int{0}
 }
+
 func (m *StringFormatErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StringFormatErrorEnum.Unmarshal(m, b)
 }
 func (m *StringFormatErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StringFormatErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *StringFormatErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StringFormatErrorEnum.Merge(dst, src)
+func (m *StringFormatErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StringFormatErrorEnum.Merge(m, src)
 }
 func (m *StringFormatErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_StringFormatErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *StringFormatErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_StringFormatErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*StringFormatErrorEnum)(nil), "google.ads.googleads.v1.errors.StringFormatErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.StringFormatErrorEnum_StringFormatError", StringFormatErrorEnum_StringFormatError_name, StringFormatErrorEnum_StringFormatError_value)
+	proto.RegisterType((*StringFormatErrorEnum)(nil), "google.ads.googleads.v1.errors.StringFormatErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/string_format_error.proto", fileDescriptor_string_format_error_f7006cd68d0ebbf8)
+	proto.RegisterFile("google/ads/googleads/v1/errors/string_format_error.proto", fileDescriptor_8ce65d4b86eec262)
 }
 
-var fileDescriptor_string_format_error_f7006cd68d0ebbf8 = []byte{
+var fileDescriptor_8ce65d4b86eec262 = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x5d, 0x07, 0x0a, 0x19, 0x6a, 0x17, 0xd0, 0x83, 0xc8, 0x0e, 0x7d, 0x80, 0x84, 0xe2,
diff --git a/googleapis/ads/googleads/v1/errors/string_length_error.pb.go b/googleapis/ads/googleads/v1/errors/string_length_error.pb.go
index b54d63dd92..ce3d440e80 100644
--- a/googleapis/ads/googleads/v1/errors/string_length_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/string_length_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/string_length_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible string length errors.
 type StringLengthErrorEnum_StringLengthError int32
@@ -39,6 +42,7 @@ var StringLengthErrorEnum_StringLengthError_name = map[int32]string{
 	2: "TOO_SHORT",
 	3: "TOO_LONG",
 }
+
 var StringLengthErrorEnum_StringLengthError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -49,8 +53,9 @@ var StringLengthErrorEnum_StringLengthError_value = map[string]int32{
 func (x StringLengthErrorEnum_StringLengthError) String() string {
 	return proto.EnumName(StringLengthErrorEnum_StringLengthError_name, int32(x))
 }
+
 func (StringLengthErrorEnum_StringLengthError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_string_length_error_fcfdf078aefc1641, []int{0, 0}
+	return fileDescriptor_cc7d1cf13cf6443b, []int{0, 0}
 }
 
 // Container for enum describing possible string length errors.
@@ -64,16 +69,17 @@ func (m *StringLengthErrorEnum) Reset()         { *m = StringLengthErrorEnum{} }
 func (m *StringLengthErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*StringLengthErrorEnum) ProtoMessage()    {}
 func (*StringLengthErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_string_length_error_fcfdf078aefc1641, []int{0}
+	return fileDescriptor_cc7d1cf13cf6443b, []int{0}
 }
+
 func (m *StringLengthErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StringLengthErrorEnum.Unmarshal(m, b)
 }
 func (m *StringLengthErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StringLengthErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *StringLengthErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StringLengthErrorEnum.Merge(dst, src)
+func (m *StringLengthErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StringLengthErrorEnum.Merge(m, src)
 }
 func (m *StringLengthErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_StringLengthErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *StringLengthErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_StringLengthErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*StringLengthErrorEnum)(nil), "google.ads.googleads.v1.errors.StringLengthErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.StringLengthErrorEnum_StringLengthError", StringLengthErrorEnum_StringLengthError_name, StringLengthErrorEnum_StringLengthError_value)
+	proto.RegisterType((*StringLengthErrorEnum)(nil), "google.ads.googleads.v1.errors.StringLengthErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/string_length_error.proto", fileDescriptor_string_length_error_fcfdf078aefc1641)
+	proto.RegisterFile("google/ads/googleads/v1/errors/string_length_error.proto", fileDescriptor_cc7d1cf13cf6443b)
 }
 
-var fileDescriptor_string_length_error_fcfdf078aefc1641 = []byte{
+var fileDescriptor_cc7d1cf13cf6443b = []byte{
 	// 309 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4e, 0x84, 0x30,
 	0x14, 0xc6, 0x85, 0x49, 0xfc, 0xd3, 0xd1, 0x88, 0x24, 0xba, 0x30, 0x66, 0x16, 0x1c, 0xa0, 0x0d,
diff --git a/googleapis/ads/googleads/v1/errors/url_field_error.pb.go b/googleapis/ads/googleads/v1/errors/url_field_error.pb.go
index 18b9ca879a..250d890631 100644
--- a/googleapis/ads/googleads/v1/errors/url_field_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/url_field_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/url_field_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible url field errors.
 type UrlFieldErrorEnum_UrlFieldError int32
@@ -201,6 +204,7 @@ var UrlFieldErrorEnum_UrlFieldError_name = map[int32]string{
 	55: "MALFORMED_URL",
 	56: "MISSING_HOST",
 }
+
 var UrlFieldErrorEnum_UrlFieldError_value = map[string]int32{
 	"UNSPECIFIED":                                      0,
 	"UNKNOWN":                                          1,
@@ -260,8 +264,9 @@ var UrlFieldErrorEnum_UrlFieldError_value = map[string]int32{
 func (x UrlFieldErrorEnum_UrlFieldError) String() string {
 	return proto.EnumName(UrlFieldErrorEnum_UrlFieldError_name, int32(x))
 }
+
 func (UrlFieldErrorEnum_UrlFieldError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_url_field_error_eb3fbd09420326b6, []int{0, 0}
+	return fileDescriptor_a37685699293a2e8, []int{0, 0}
 }
 
 // Container for enum describing possible url field errors.
@@ -275,16 +280,17 @@ func (m *UrlFieldErrorEnum) Reset()         { *m = UrlFieldErrorEnum{} }
 func (m *UrlFieldErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*UrlFieldErrorEnum) ProtoMessage()    {}
 func (*UrlFieldErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_url_field_error_eb3fbd09420326b6, []int{0}
+	return fileDescriptor_a37685699293a2e8, []int{0}
 }
+
 func (m *UrlFieldErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UrlFieldErrorEnum.Unmarshal(m, b)
 }
 func (m *UrlFieldErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UrlFieldErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *UrlFieldErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UrlFieldErrorEnum.Merge(dst, src)
+func (m *UrlFieldErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UrlFieldErrorEnum.Merge(m, src)
 }
 func (m *UrlFieldErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_UrlFieldErrorEnum.Size(m)
@@ -296,15 +302,15 @@ func (m *UrlFieldErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UrlFieldErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UrlFieldErrorEnum)(nil), "google.ads.googleads.v1.errors.UrlFieldErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.UrlFieldErrorEnum_UrlFieldError", UrlFieldErrorEnum_UrlFieldError_name, UrlFieldErrorEnum_UrlFieldError_value)
+	proto.RegisterType((*UrlFieldErrorEnum)(nil), "google.ads.googleads.v1.errors.UrlFieldErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/url_field_error.proto", fileDescriptor_url_field_error_eb3fbd09420326b6)
+	proto.RegisterFile("google/ads/googleads/v1/errors/url_field_error.proto", fileDescriptor_a37685699293a2e8)
 }
 
-var fileDescriptor_url_field_error_eb3fbd09420326b6 = []byte{
+var fileDescriptor_a37685699293a2e8 = []byte{
 	// 854 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x95, 0xeb, 0x6e, 0xdc, 0x44,
 	0x14, 0xc7, 0x49, 0x0a, 0x2d, 0x9c, 0x34, 0xc9, 0xe4, 0xa4, 0x69, 0x9b, 0x90, 0x6c, 0x93, 0xa5,
diff --git a/googleapis/ads/googleads/v1/errors/user_list_error.pb.go b/googleapis/ads/googleads/v1/errors/user_list_error.pb.go
index d23fcfadef..3881f7c478 100644
--- a/googleapis/ads/googleads/v1/errors/user_list_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/user_list_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/user_list_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing possible user list errors.
 type UserListErrorEnum_UserListError int32
@@ -118,6 +121,7 @@ var UserListErrorEnum_UserListError_name = map[int32]string{
 	35: "CAN_NOT_ADD_A_SIMILAR_USERLIST_AS_LOGICAL_LIST_OPERAND",
 	36: "CAN_NOT_MIX_CRM_BASED_IN_LOGICAL_LIST_WITH_OTHER_LISTS",
 }
+
 var UserListErrorEnum_UserListError_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -152,8 +156,9 @@ var UserListErrorEnum_UserListError_value = map[string]int32{
 func (x UserListErrorEnum_UserListError) String() string {
 	return proto.EnumName(UserListErrorEnum_UserListError_name, int32(x))
 }
+
 func (UserListErrorEnum_UserListError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_error_de5f1fdf418dc5db, []int{0, 0}
+	return fileDescriptor_037f4a77ec34ed51, []int{0, 0}
 }
 
 // Container for enum describing possible user list errors.
@@ -167,16 +172,17 @@ func (m *UserListErrorEnum) Reset()         { *m = UserListErrorEnum{} }
 func (m *UserListErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*UserListErrorEnum) ProtoMessage()    {}
 func (*UserListErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_error_de5f1fdf418dc5db, []int{0}
+	return fileDescriptor_037f4a77ec34ed51, []int{0}
 }
+
 func (m *UserListErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListErrorEnum.Unmarshal(m, b)
 }
 func (m *UserListErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *UserListErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListErrorEnum.Merge(dst, src)
+func (m *UserListErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListErrorEnum.Merge(m, src)
 }
 func (m *UserListErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_UserListErrorEnum.Size(m)
@@ -188,15 +194,15 @@ func (m *UserListErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*UserListErrorEnum)(nil), "google.ads.googleads.v1.errors.UserListErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.UserListErrorEnum_UserListError", UserListErrorEnum_UserListError_name, UserListErrorEnum_UserListError_value)
+	proto.RegisterType((*UserListErrorEnum)(nil), "google.ads.googleads.v1.errors.UserListErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/user_list_error.proto", fileDescriptor_user_list_error_de5f1fdf418dc5db)
+	proto.RegisterFile("google/ads/googleads/v1/errors/user_list_error.proto", fileDescriptor_037f4a77ec34ed51)
 }
 
-var fileDescriptor_user_list_error_de5f1fdf418dc5db = []byte{
+var fileDescriptor_037f4a77ec34ed51 = []byte{
 	// 742 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xed, 0x6e, 0x23, 0x35,
 	0x14, 0xa5, 0x59, 0xd8, 0x80, 0xbb, 0x1f, 0xae, 0x11, 0xbb, 0x52, 0xbb, 0x64, 0xd9, 0x2c, 0x1f,
diff --git a/googleapis/ads/googleads/v1/errors/youtube_video_registration_error.pb.go b/googleapis/ads/googleads/v1/errors/youtube_video_registration_error.pb.go
index f3c515035a..496cf4ba3b 100644
--- a/googleapis/ads/googleads/v1/errors/youtube_video_registration_error.pb.go
+++ b/googleapis/ads/googleads/v1/errors/youtube_video_registration_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/errors/youtube_video_registration_error.proto
 
-package errors // import "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+package errors
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum describing YouTube video registration errors.
 type YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError int32
@@ -39,6 +42,7 @@ var YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError_name = map[i
 	2: "VIDEO_NOT_FOUND",
 	3: "VIDEO_NOT_ACCESSIBLE",
 }
+
 var YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError_value = map[string]int32{
 	"UNSPECIFIED":          0,
 	"UNKNOWN":              1,
@@ -49,8 +53,9 @@ var YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError_value = map[
 func (x YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError) String() string {
 	return proto.EnumName(YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError_name, int32(x))
 }
+
 func (YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_youtube_video_registration_error_b51a63b007d526e2, []int{0, 0}
+	return fileDescriptor_cb3f6566d387d326, []int{0, 0}
 }
 
 // Container for enum describing YouTube video registration errors.
@@ -64,16 +69,17 @@ func (m *YoutubeVideoRegistrationErrorEnum) Reset()         { *m = YoutubeVideoR
 func (m *YoutubeVideoRegistrationErrorEnum) String() string { return proto.CompactTextString(m) }
 func (*YoutubeVideoRegistrationErrorEnum) ProtoMessage()    {}
 func (*YoutubeVideoRegistrationErrorEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_youtube_video_registration_error_b51a63b007d526e2, []int{0}
+	return fileDescriptor_cb3f6566d387d326, []int{0}
 }
+
 func (m *YoutubeVideoRegistrationErrorEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_YoutubeVideoRegistrationErrorEnum.Unmarshal(m, b)
 }
 func (m *YoutubeVideoRegistrationErrorEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_YoutubeVideoRegistrationErrorEnum.Marshal(b, m, deterministic)
 }
-func (dst *YoutubeVideoRegistrationErrorEnum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_YoutubeVideoRegistrationErrorEnum.Merge(dst, src)
+func (m *YoutubeVideoRegistrationErrorEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YoutubeVideoRegistrationErrorEnum.Merge(m, src)
 }
 func (m *YoutubeVideoRegistrationErrorEnum) XXX_Size() int {
 	return xxx_messageInfo_YoutubeVideoRegistrationErrorEnum.Size(m)
@@ -85,15 +91,15 @@ func (m *YoutubeVideoRegistrationErrorEnum) XXX_DiscardUnknown() {
 var xxx_messageInfo_YoutubeVideoRegistrationErrorEnum proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*YoutubeVideoRegistrationErrorEnum)(nil), "google.ads.googleads.v1.errors.YoutubeVideoRegistrationErrorEnum")
 	proto.RegisterEnum("google.ads.googleads.v1.errors.YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError", YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError_name, YoutubeVideoRegistrationErrorEnum_YoutubeVideoRegistrationError_value)
+	proto.RegisterType((*YoutubeVideoRegistrationErrorEnum)(nil), "google.ads.googleads.v1.errors.YoutubeVideoRegistrationErrorEnum")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/errors/youtube_video_registration_error.proto", fileDescriptor_youtube_video_registration_error_b51a63b007d526e2)
+	proto.RegisterFile("google/ads/googleads/v1/errors/youtube_video_registration_error.proto", fileDescriptor_cb3f6566d387d326)
 }
 
-var fileDescriptor_youtube_video_registration_error_b51a63b007d526e2 = []byte{
+var fileDescriptor_cb3f6566d387d326 = []byte{
 	// 332 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4a, 0xc3, 0x40,
 	0x14, 0x86, 0x4d, 0x0a, 0x0a, 0xd3, 0x45, 0x43, 0x74, 0x21, 0xa2, 0x05, 0x73, 0x80, 0x09, 0xc1,
diff --git a/googleapis/ads/googleads/v1/resources/account_budget.pb.go b/googleapis/ads/googleads/v1/resources/account_budget.pb.go
index f214a5c3ca..a2b2884972 100644
--- a/googleapis/ads/googleads/v1/resources/account_budget.pb.go
+++ b/googleapis/ads/googleads/v1/resources/account_budget.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/account_budget.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An account-level budget. It contains information about the budget itself,
 // as well as the most recently approved changes to the budget and proposed
@@ -129,16 +132,17 @@ func (m *AccountBudget) Reset()         { *m = AccountBudget{} }
 func (m *AccountBudget) String() string { return proto.CompactTextString(m) }
 func (*AccountBudget) ProtoMessage()    {}
 func (*AccountBudget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_80044f3210f6054b, []int{0}
+	return fileDescriptor_4320b2be24569afc, []int{0}
 }
+
 func (m *AccountBudget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudget.Unmarshal(m, b)
 }
 func (m *AccountBudget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudget.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudget.Merge(dst, src)
+func (m *AccountBudget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudget.Merge(m, src)
 }
 func (m *AccountBudget) XXX_Size() int {
 	return xxx_messageInfo_AccountBudget.Size(m)
@@ -418,9 +422,9 @@ func (m *AccountBudget) GetAdjustedSpendingLimitType() enums.SpendingLimitTypeEn
 	return enums.SpendingLimitTypeEnum_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AccountBudget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AccountBudget_OneofMarshaler, _AccountBudget_OneofUnmarshaler, _AccountBudget_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AccountBudget) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AccountBudget_ProposedEndDateTime)(nil),
 		(*AccountBudget_ProposedEndTimeType)(nil),
 		(*AccountBudget_ApprovedEndDateTime)(nil),
@@ -434,239 +438,6 @@ func (*AccountBudget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 	}
 }
 
-func _AccountBudget_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AccountBudget)
-	// proposed_end_time
-	switch x := m.ProposedEndTime.(type) {
-	case *AccountBudget_ProposedEndDateTime:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProposedEndDateTime); err != nil {
-			return err
-		}
-	case *AccountBudget_ProposedEndTimeType:
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ProposedEndTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudget.ProposedEndTime has unexpected type %T", x)
-	}
-	// approved_end_time
-	switch x := m.ApprovedEndTime.(type) {
-	case *AccountBudget_ApprovedEndDateTime:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ApprovedEndDateTime); err != nil {
-			return err
-		}
-	case *AccountBudget_ApprovedEndTimeType:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ApprovedEndTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudget.ApprovedEndTime has unexpected type %T", x)
-	}
-	// proposed_spending_limit
-	switch x := m.ProposedSpendingLimit.(type) {
-	case *AccountBudget_ProposedSpendingLimitMicros:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProposedSpendingLimitMicros); err != nil {
-			return err
-		}
-	case *AccountBudget_ProposedSpendingLimitType:
-		b.EncodeVarint(13<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ProposedSpendingLimitType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudget.ProposedSpendingLimit has unexpected type %T", x)
-	}
-	// approved_spending_limit
-	switch x := m.ApprovedSpendingLimit.(type) {
-	case *AccountBudget_ApprovedSpendingLimitMicros:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ApprovedSpendingLimitMicros); err != nil {
-			return err
-		}
-	case *AccountBudget_ApprovedSpendingLimitType:
-		b.EncodeVarint(15<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ApprovedSpendingLimitType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudget.ApprovedSpendingLimit has unexpected type %T", x)
-	}
-	// adjusted_spending_limit
-	switch x := m.AdjustedSpendingLimit.(type) {
-	case *AccountBudget_AdjustedSpendingLimitMicros:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdjustedSpendingLimitMicros); err != nil {
-			return err
-		}
-	case *AccountBudget_AdjustedSpendingLimitType:
-		b.EncodeVarint(17<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdjustedSpendingLimitType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudget.AdjustedSpendingLimit has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AccountBudget_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AccountBudget)
-	switch tag {
-	case 8: // proposed_end_time.proposed_end_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ProposedEndTime = &AccountBudget_ProposedEndDateTime{msg}
-		return true, err
-	case 9: // proposed_end_time.proposed_end_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ProposedEndTime = &AccountBudget_ProposedEndTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	case 10: // approved_end_time.approved_end_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ApprovedEndTime = &AccountBudget_ApprovedEndDateTime{msg}
-		return true, err
-	case 11: // approved_end_time.approved_end_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ApprovedEndTime = &AccountBudget_ApprovedEndTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	case 12: // proposed_spending_limit.proposed_spending_limit_micros
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.ProposedSpendingLimit = &AccountBudget_ProposedSpendingLimitMicros{msg}
-		return true, err
-	case 13: // proposed_spending_limit.proposed_spending_limit_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ProposedSpendingLimit = &AccountBudget_ProposedSpendingLimitType{enums.SpendingLimitTypeEnum_SpendingLimitType(x)}
-		return true, err
-	case 14: // approved_spending_limit.approved_spending_limit_micros
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.ApprovedSpendingLimit = &AccountBudget_ApprovedSpendingLimitMicros{msg}
-		return true, err
-	case 15: // approved_spending_limit.approved_spending_limit_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ApprovedSpendingLimit = &AccountBudget_ApprovedSpendingLimitType{enums.SpendingLimitTypeEnum_SpendingLimitType(x)}
-		return true, err
-	case 16: // adjusted_spending_limit.adjusted_spending_limit_micros
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.AdjustedSpendingLimit = &AccountBudget_AdjustedSpendingLimitMicros{msg}
-		return true, err
-	case 17: // adjusted_spending_limit.adjusted_spending_limit_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.AdjustedSpendingLimit = &AccountBudget_AdjustedSpendingLimitType{enums.SpendingLimitTypeEnum_SpendingLimitType(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AccountBudget_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AccountBudget)
-	// proposed_end_time
-	switch x := m.ProposedEndTime.(type) {
-	case *AccountBudget_ProposedEndDateTime:
-		s := proto.Size(x.ProposedEndDateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudget_ProposedEndTimeType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ProposedEndTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// approved_end_time
-	switch x := m.ApprovedEndTime.(type) {
-	case *AccountBudget_ApprovedEndDateTime:
-		s := proto.Size(x.ApprovedEndDateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudget_ApprovedEndTimeType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ApprovedEndTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// proposed_spending_limit
-	switch x := m.ProposedSpendingLimit.(type) {
-	case *AccountBudget_ProposedSpendingLimitMicros:
-		s := proto.Size(x.ProposedSpendingLimitMicros)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudget_ProposedSpendingLimitType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ProposedSpendingLimitType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// approved_spending_limit
-	switch x := m.ApprovedSpendingLimit.(type) {
-	case *AccountBudget_ApprovedSpendingLimitMicros:
-		s := proto.Size(x.ApprovedSpendingLimitMicros)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudget_ApprovedSpendingLimitType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ApprovedSpendingLimitType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// adjusted_spending_limit
-	switch x := m.AdjustedSpendingLimit.(type) {
-	case *AccountBudget_AdjustedSpendingLimitMicros:
-		s := proto.Size(x.AdjustedSpendingLimitMicros)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudget_AdjustedSpendingLimitType:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdjustedSpendingLimitType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A pending proposal associated with the enclosing account-level budget,
 // if applicable.
 type AccountBudget_PendingAccountBudgetProposal struct {
@@ -716,16 +487,17 @@ func (m *AccountBudget_PendingAccountBudgetProposal) String() string {
 }
 func (*AccountBudget_PendingAccountBudgetProposal) ProtoMessage() {}
 func (*AccountBudget_PendingAccountBudgetProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_80044f3210f6054b, []int{0, 0}
+	return fileDescriptor_4320b2be24569afc, []int{0, 0}
 }
+
 func (m *AccountBudget_PendingAccountBudgetProposal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudget_PendingAccountBudgetProposal.Unmarshal(m, b)
 }
 func (m *AccountBudget_PendingAccountBudgetProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudget_PendingAccountBudgetProposal.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudget_PendingAccountBudgetProposal) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudget_PendingAccountBudgetProposal.Merge(dst, src)
+func (m *AccountBudget_PendingAccountBudgetProposal) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudget_PendingAccountBudgetProposal.Merge(m, src)
 }
 func (m *AccountBudget_PendingAccountBudgetProposal) XXX_Size() int {
 	return xxx_messageInfo_AccountBudget_PendingAccountBudgetProposal.Size(m)
@@ -863,9 +635,9 @@ func (m *AccountBudget_PendingAccountBudgetProposal) GetSpendingLimitType() enum
 	return enums.SpendingLimitTypeEnum_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AccountBudget_PendingAccountBudgetProposal) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AccountBudget_PendingAccountBudgetProposal_OneofMarshaler, _AccountBudget_PendingAccountBudgetProposal_OneofUnmarshaler, _AccountBudget_PendingAccountBudgetProposal_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AccountBudget_PendingAccountBudgetProposal) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AccountBudget_PendingAccountBudgetProposal_EndDateTime)(nil),
 		(*AccountBudget_PendingAccountBudgetProposal_EndTimeType)(nil),
 		(*AccountBudget_PendingAccountBudgetProposal_SpendingLimitMicros)(nil),
@@ -873,120 +645,16 @@ func (*AccountBudget_PendingAccountBudgetProposal) XXX_OneofFuncs() (func(msg pr
 	}
 }
 
-func _AccountBudget_PendingAccountBudgetProposal_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AccountBudget_PendingAccountBudgetProposal)
-	// end_time
-	switch x := m.EndTime.(type) {
-	case *AccountBudget_PendingAccountBudgetProposal_EndDateTime:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EndDateTime); err != nil {
-			return err
-		}
-	case *AccountBudget_PendingAccountBudgetProposal_EndTimeType:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.EndTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudget_PendingAccountBudgetProposal.EndTime has unexpected type %T", x)
-	}
-	// spending_limit
-	switch x := m.SpendingLimit.(type) {
-	case *AccountBudget_PendingAccountBudgetProposal_SpendingLimitMicros:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SpendingLimitMicros); err != nil {
-			return err
-		}
-	case *AccountBudget_PendingAccountBudgetProposal_SpendingLimitType:
-		b.EncodeVarint(8<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SpendingLimitType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudget_PendingAccountBudgetProposal.SpendingLimit has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AccountBudget_PendingAccountBudgetProposal_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AccountBudget_PendingAccountBudgetProposal)
-	switch tag {
-	case 5: // end_time.end_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.EndTime = &AccountBudget_PendingAccountBudgetProposal_EndDateTime{msg}
-		return true, err
-	case 6: // end_time.end_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.EndTime = &AccountBudget_PendingAccountBudgetProposal_EndTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	case 7: // spending_limit.spending_limit_micros
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.SpendingLimit = &AccountBudget_PendingAccountBudgetProposal_SpendingLimitMicros{msg}
-		return true, err
-	case 8: // spending_limit.spending_limit_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.SpendingLimit = &AccountBudget_PendingAccountBudgetProposal_SpendingLimitType{enums.SpendingLimitTypeEnum_SpendingLimitType(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AccountBudget_PendingAccountBudgetProposal_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AccountBudget_PendingAccountBudgetProposal)
-	// end_time
-	switch x := m.EndTime.(type) {
-	case *AccountBudget_PendingAccountBudgetProposal_EndDateTime:
-		s := proto.Size(x.EndDateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudget_PendingAccountBudgetProposal_EndTimeType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.EndTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// spending_limit
-	switch x := m.SpendingLimit.(type) {
-	case *AccountBudget_PendingAccountBudgetProposal_SpendingLimitMicros:
-		s := proto.Size(x.SpendingLimitMicros)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudget_PendingAccountBudgetProposal_SpendingLimitType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.SpendingLimitType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*AccountBudget)(nil), "google.ads.googleads.v1.resources.AccountBudget")
 	proto.RegisterType((*AccountBudget_PendingAccountBudgetProposal)(nil), "google.ads.googleads.v1.resources.AccountBudget.PendingAccountBudgetProposal")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/account_budget.proto", fileDescriptor_account_budget_80044f3210f6054b)
+	proto.RegisterFile("google/ads/googleads/v1/resources/account_budget.proto", fileDescriptor_4320b2be24569afc)
 }
 
-var fileDescriptor_account_budget_80044f3210f6054b = []byte{
+var fileDescriptor_4320b2be24569afc = []byte{
 	// 1010 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0xdb, 0x36,
 	0x14, 0x9e, 0x6c, 0xe7, 0x8f, 0x89, 0xf3, 0x23, 0x37, 0xa9, 0xf2, 0x83, 0x22, 0xdd, 0x50, 0x20,
diff --git a/googleapis/ads/googleads/v1/resources/account_budget_proposal.pb.go b/googleapis/ads/googleads/v1/resources/account_budget_proposal.pb.go
index e6e33baaf7..321530e751 100644
--- a/googleapis/ads/googleads/v1/resources/account_budget_proposal.pb.go
+++ b/googleapis/ads/googleads/v1/resources/account_budget_proposal.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/account_budget_proposal.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An account-level budget proposal.
 //
@@ -105,16 +108,17 @@ func (m *AccountBudgetProposal) Reset()         { *m = AccountBudgetProposal{} }
 func (m *AccountBudgetProposal) String() string { return proto.CompactTextString(m) }
 func (*AccountBudgetProposal) ProtoMessage()    {}
 func (*AccountBudgetProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_bb72fd32acc2bc82, []int{0}
+	return fileDescriptor_17c851e3a0204a0a, []int{0}
 }
+
 func (m *AccountBudgetProposal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudgetProposal.Unmarshal(m, b)
 }
 func (m *AccountBudgetProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudgetProposal.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudgetProposal) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudgetProposal.Merge(dst, src)
+func (m *AccountBudgetProposal) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudgetProposal.Merge(m, src)
 }
 func (m *AccountBudgetProposal) XXX_Size() int {
 	return xxx_messageInfo_AccountBudgetProposal.Size(m)
@@ -398,9 +402,9 @@ func (m *AccountBudgetProposal) GetApprovedSpendingLimitType() enums.SpendingLim
 	return enums.SpendingLimitTypeEnum_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AccountBudgetProposal) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AccountBudgetProposal_OneofMarshaler, _AccountBudgetProposal_OneofUnmarshaler, _AccountBudgetProposal_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AccountBudgetProposal) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AccountBudgetProposal_ProposedStartDateTime)(nil),
 		(*AccountBudgetProposal_ProposedStartTimeType)(nil),
 		(*AccountBudgetProposal_ProposedEndDateTime)(nil),
@@ -414,248 +418,15 @@ func (*AccountBudgetProposal) XXX_OneofFuncs() (func(msg proto.Message, b *proto
 	}
 }
 
-func _AccountBudgetProposal_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AccountBudgetProposal)
-	// proposed_start_time
-	switch x := m.ProposedStartTime.(type) {
-	case *AccountBudgetProposal_ProposedStartDateTime:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProposedStartDateTime); err != nil {
-			return err
-		}
-	case *AccountBudgetProposal_ProposedStartTimeType:
-		b.EncodeVarint(7<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ProposedStartTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudgetProposal.ProposedStartTime has unexpected type %T", x)
-	}
-	// proposed_end_time
-	switch x := m.ProposedEndTime.(type) {
-	case *AccountBudgetProposal_ProposedEndDateTime:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProposedEndDateTime); err != nil {
-			return err
-		}
-	case *AccountBudgetProposal_ProposedEndTimeType:
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ProposedEndTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudgetProposal.ProposedEndTime has unexpected type %T", x)
-	}
-	// approved_end_time
-	switch x := m.ApprovedEndTime.(type) {
-	case *AccountBudgetProposal_ApprovedEndDateTime:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ApprovedEndDateTime); err != nil {
-			return err
-		}
-	case *AccountBudgetProposal_ApprovedEndTimeType:
-		b.EncodeVarint(22<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ApprovedEndTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudgetProposal.ApprovedEndTime has unexpected type %T", x)
-	}
-	// proposed_spending_limit
-	switch x := m.ProposedSpendingLimit.(type) {
-	case *AccountBudgetProposal_ProposedSpendingLimitMicros:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProposedSpendingLimitMicros); err != nil {
-			return err
-		}
-	case *AccountBudgetProposal_ProposedSpendingLimitType:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ProposedSpendingLimitType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudgetProposal.ProposedSpendingLimit has unexpected type %T", x)
-	}
-	// approved_spending_limit
-	switch x := m.ApprovedSpendingLimit.(type) {
-	case *AccountBudgetProposal_ApprovedSpendingLimitMicros:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ApprovedSpendingLimitMicros); err != nil {
-			return err
-		}
-	case *AccountBudgetProposal_ApprovedSpendingLimitType:
-		b.EncodeVarint(24<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ApprovedSpendingLimitType))
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudgetProposal.ApprovedSpendingLimit has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AccountBudgetProposal_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AccountBudgetProposal)
-	switch tag {
-	case 18: // proposed_start_time.proposed_start_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ProposedStartTime = &AccountBudgetProposal_ProposedStartDateTime{msg}
-		return true, err
-	case 7: // proposed_start_time.proposed_start_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ProposedStartTime = &AccountBudgetProposal_ProposedStartTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	case 19: // proposed_end_time.proposed_end_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ProposedEndTime = &AccountBudgetProposal_ProposedEndDateTime{msg}
-		return true, err
-	case 9: // proposed_end_time.proposed_end_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ProposedEndTime = &AccountBudgetProposal_ProposedEndTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	case 21: // approved_end_time.approved_end_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ApprovedEndTime = &AccountBudgetProposal_ApprovedEndDateTime{msg}
-		return true, err
-	case 22: // approved_end_time.approved_end_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ApprovedEndTime = &AccountBudgetProposal_ApprovedEndTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	case 10: // proposed_spending_limit.proposed_spending_limit_micros
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.ProposedSpendingLimit = &AccountBudgetProposal_ProposedSpendingLimitMicros{msg}
-		return true, err
-	case 11: // proposed_spending_limit.proposed_spending_limit_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ProposedSpendingLimit = &AccountBudgetProposal_ProposedSpendingLimitType{enums.SpendingLimitTypeEnum_SpendingLimitType(x)}
-		return true, err
-	case 23: // approved_spending_limit.approved_spending_limit_micros
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.Int64Value)
-		err := b.DecodeMessage(msg)
-		m.ApprovedSpendingLimit = &AccountBudgetProposal_ApprovedSpendingLimitMicros{msg}
-		return true, err
-	case 24: // approved_spending_limit.approved_spending_limit_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ApprovedSpendingLimit = &AccountBudgetProposal_ApprovedSpendingLimitType{enums.SpendingLimitTypeEnum_SpendingLimitType(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AccountBudgetProposal_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AccountBudgetProposal)
-	// proposed_start_time
-	switch x := m.ProposedStartTime.(type) {
-	case *AccountBudgetProposal_ProposedStartDateTime:
-		s := proto.Size(x.ProposedStartDateTime)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudgetProposal_ProposedStartTimeType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ProposedStartTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// proposed_end_time
-	switch x := m.ProposedEndTime.(type) {
-	case *AccountBudgetProposal_ProposedEndDateTime:
-		s := proto.Size(x.ProposedEndDateTime)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudgetProposal_ProposedEndTimeType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ProposedEndTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// approved_end_time
-	switch x := m.ApprovedEndTime.(type) {
-	case *AccountBudgetProposal_ApprovedEndDateTime:
-		s := proto.Size(x.ApprovedEndDateTime)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudgetProposal_ApprovedEndTimeType:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ApprovedEndTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// proposed_spending_limit
-	switch x := m.ProposedSpendingLimit.(type) {
-	case *AccountBudgetProposal_ProposedSpendingLimitMicros:
-		s := proto.Size(x.ProposedSpendingLimitMicros)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudgetProposal_ProposedSpendingLimitType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ProposedSpendingLimitType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// approved_spending_limit
-	switch x := m.ApprovedSpendingLimit.(type) {
-	case *AccountBudgetProposal_ApprovedSpendingLimitMicros:
-		s := proto.Size(x.ApprovedSpendingLimitMicros)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudgetProposal_ApprovedSpendingLimitType:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.ApprovedSpendingLimitType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*AccountBudgetProposal)(nil), "google.ads.googleads.v1.resources.AccountBudgetProposal")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/account_budget_proposal.proto", fileDescriptor_account_budget_proposal_bb72fd32acc2bc82)
+	proto.RegisterFile("google/ads/googleads/v1/resources/account_budget_proposal.proto", fileDescriptor_17c851e3a0204a0a)
 }
 
-var fileDescriptor_account_budget_proposal_bb72fd32acc2bc82 = []byte{
+var fileDescriptor_17c851e3a0204a0a = []byte{
 	// 840 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xef, 0x6e, 0xeb, 0x34,
 	0x18, 0xc6, 0x69, 0x3a, 0x0e, 0x3a, 0x3e, 0xed, 0xd8, 0x49, 0xe9, 0x39, 0xd9, 0x1f, 0x1d, 0x6d,
diff --git a/googleapis/ads/googleads/v1/resources/ad.pb.go b/googleapis/ads/googleads/v1/resources/ad.pb.go
index a7121d391a..a65cc06020 100644
--- a/googleapis/ads/googleads/v1/resources/ad.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad.
 type Ad struct {
@@ -95,16 +98,17 @@ func (m *Ad) Reset()         { *m = Ad{} }
 func (m *Ad) String() string { return proto.CompactTextString(m) }
 func (*Ad) ProtoMessage()    {}
 func (*Ad) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_55cd72465d865885, []int{0}
+	return fileDescriptor_2cfecfd7772c305a, []int{0}
 }
+
 func (m *Ad) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Ad.Unmarshal(m, b)
 }
 func (m *Ad) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Ad.Marshal(b, m, deterministic)
 }
-func (dst *Ad) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Ad.Merge(dst, src)
+func (m *Ad) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Ad.Merge(m, src)
 }
 func (m *Ad) XXX_Size() int {
 	return xxx_messageInfo_Ad.Size(m)
@@ -438,9 +442,9 @@ func (m *Ad) GetAppEngagementAd() *common.AppEngagementAdInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Ad) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Ad_OneofMarshaler, _Ad_OneofUnmarshaler, _Ad_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Ad) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Ad_TextAd)(nil),
 		(*Ad_ExpandedTextAd)(nil),
 		(*Ad_CallOnlyAd)(nil),
@@ -461,351 +465,15 @@ func (*Ad) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, fun
 	}
 }
 
-func _Ad_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Ad)
-	// ad_data
-	switch x := m.AdData.(type) {
-	case *Ad_TextAd:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextAd); err != nil {
-			return err
-		}
-	case *Ad_ExpandedTextAd:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExpandedTextAd); err != nil {
-			return err
-		}
-	case *Ad_CallOnlyAd:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CallOnlyAd); err != nil {
-			return err
-		}
-	case *Ad_ExpandedDynamicSearchAd:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExpandedDynamicSearchAd); err != nil {
-			return err
-		}
-	case *Ad_HotelAd:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelAd); err != nil {
-			return err
-		}
-	case *Ad_ShoppingSmartAd:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ShoppingSmartAd); err != nil {
-			return err
-		}
-	case *Ad_ShoppingProductAd:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ShoppingProductAd); err != nil {
-			return err
-		}
-	case *Ad_GmailAd:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GmailAd); err != nil {
-			return err
-		}
-	case *Ad_ImageAd:
-		b.EncodeVarint(22<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageAd); err != nil {
-			return err
-		}
-	case *Ad_VideoAd:
-		b.EncodeVarint(24<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoAd); err != nil {
-			return err
-		}
-	case *Ad_ResponsiveSearchAd:
-		b.EncodeVarint(25<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ResponsiveSearchAd); err != nil {
-			return err
-		}
-	case *Ad_LegacyResponsiveDisplayAd:
-		b.EncodeVarint(28<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LegacyResponsiveDisplayAd); err != nil {
-			return err
-		}
-	case *Ad_AppAd:
-		b.EncodeVarint(29<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppAd); err != nil {
-			return err
-		}
-	case *Ad_LegacyAppInstallAd:
-		b.EncodeVarint(30<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LegacyAppInstallAd); err != nil {
-			return err
-		}
-	case *Ad_ResponsiveDisplayAd:
-		b.EncodeVarint(31<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ResponsiveDisplayAd); err != nil {
-			return err
-		}
-	case *Ad_DisplayUploadAd:
-		b.EncodeVarint(33<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DisplayUploadAd); err != nil {
-			return err
-		}
-	case *Ad_AppEngagementAd:
-		b.EncodeVarint(34<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngagementAd); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Ad.AdData has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Ad_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Ad)
-	switch tag {
-	case 6: // ad_data.text_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TextAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_TextAd{msg}
-		return true, err
-	case 7: // ad_data.expanded_text_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ExpandedTextAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_ExpandedTextAd{msg}
-		return true, err
-	case 13: // ad_data.call_only_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CallOnlyAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_CallOnlyAd{msg}
-		return true, err
-	case 14: // ad_data.expanded_dynamic_search_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ExpandedDynamicSearchAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_ExpandedDynamicSearchAd{msg}
-		return true, err
-	case 15: // ad_data.hotel_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.HotelAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_HotelAd{msg}
-		return true, err
-	case 17: // ad_data.shopping_smart_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ShoppingSmartAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_ShoppingSmartAd{msg}
-		return true, err
-	case 18: // ad_data.shopping_product_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ShoppingProductAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_ShoppingProductAd{msg}
-		return true, err
-	case 21: // ad_data.gmail_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.GmailAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_GmailAd{msg}
-		return true, err
-	case 22: // ad_data.image_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ImageAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_ImageAd{msg}
-		return true, err
-	case 24: // ad_data.video_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.VideoAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_VideoAd{msg}
-		return true, err
-	case 25: // ad_data.responsive_search_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ResponsiveSearchAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_ResponsiveSearchAd{msg}
-		return true, err
-	case 28: // ad_data.legacy_responsive_display_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.LegacyResponsiveDisplayAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_LegacyResponsiveDisplayAd{msg}
-		return true, err
-	case 29: // ad_data.app_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AppAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_AppAd{msg}
-		return true, err
-	case 30: // ad_data.legacy_app_install_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.LegacyAppInstallAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_LegacyAppInstallAd{msg}
-		return true, err
-	case 31: // ad_data.responsive_display_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ResponsiveDisplayAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_ResponsiveDisplayAd{msg}
-		return true, err
-	case 33: // ad_data.display_upload_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.DisplayUploadAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_DisplayUploadAd{msg}
-		return true, err
-	case 34: // ad_data.app_engagement_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AppEngagementAdInfo)
-		err := b.DecodeMessage(msg)
-		m.AdData = &Ad_AppEngagementAd{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Ad_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Ad)
-	// ad_data
-	switch x := m.AdData.(type) {
-	case *Ad_TextAd:
-		s := proto.Size(x.TextAd)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_ExpandedTextAd:
-		s := proto.Size(x.ExpandedTextAd)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_CallOnlyAd:
-		s := proto.Size(x.CallOnlyAd)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_ExpandedDynamicSearchAd:
-		s := proto.Size(x.ExpandedDynamicSearchAd)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_HotelAd:
-		s := proto.Size(x.HotelAd)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_ShoppingSmartAd:
-		s := proto.Size(x.ShoppingSmartAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_ShoppingProductAd:
-		s := proto.Size(x.ShoppingProductAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_GmailAd:
-		s := proto.Size(x.GmailAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_ImageAd:
-		s := proto.Size(x.ImageAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_VideoAd:
-		s := proto.Size(x.VideoAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_ResponsiveSearchAd:
-		s := proto.Size(x.ResponsiveSearchAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_LegacyResponsiveDisplayAd:
-		s := proto.Size(x.LegacyResponsiveDisplayAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_AppAd:
-		s := proto.Size(x.AppAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_LegacyAppInstallAd:
-		s := proto.Size(x.LegacyAppInstallAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_ResponsiveDisplayAd:
-		s := proto.Size(x.ResponsiveDisplayAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_DisplayUploadAd:
-		s := proto.Size(x.DisplayUploadAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Ad_AppEngagementAd:
-		s := proto.Size(x.AppEngagementAd)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*Ad)(nil), "google.ads.googleads.v1.resources.Ad")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad.proto", fileDescriptor_ad_55cd72465d865885)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad.proto", fileDescriptor_2cfecfd7772c305a)
 }
 
-var fileDescriptor_ad_55cd72465d865885 = []byte{
+var fileDescriptor_2cfecfd7772c305a = []byte{
 	// 1176 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x97, 0xdf, 0x6e, 0xdb, 0x36,
 	0x1b, 0xc6, 0x3f, 0xbb, 0x6d, 0xf2, 0x95, 0xed, 0xf2, 0x87, 0x6e, 0x56, 0x35, 0xcd, 0xba, 0xb6,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group.pb.go b/googleapis/ads/googleads/v1/resources/ad_group.pb.go
index 1702283d23..e27b6b341e 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group.
 type AdGroup struct {
@@ -105,16 +108,17 @@ func (m *AdGroup) Reset()         { *m = AdGroup{} }
 func (m *AdGroup) String() string { return proto.CompactTextString(m) }
 func (*AdGroup) ProtoMessage()    {}
 func (*AdGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_4e6d485528e2fbcb, []int{0}
+	return fileDescriptor_57dce8114718594f, []int{0}
 }
+
 func (m *AdGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroup.Unmarshal(m, b)
 }
 func (m *AdGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroup.Marshal(b, m, deterministic)
 }
-func (dst *AdGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroup.Merge(dst, src)
+func (m *AdGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroup.Merge(m, src)
 }
 func (m *AdGroup) XXX_Size() int {
 	return xxx_messageInfo_AdGroup.Size(m)
@@ -298,10 +302,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group.proto", fileDescriptor_ad_group_4e6d485528e2fbcb)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group.proto", fileDescriptor_57dce8114718594f)
 }
 
-var fileDescriptor_ad_group_4e6d485528e2fbcb = []byte{
+var fileDescriptor_57dce8114718594f = []byte{
 	// 952 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x6f, 0x23, 0x35,
 	0x14, 0xc7, 0x95, 0xb4, 0x14, 0x70, 0xbb, 0x69, 0x77, 0x4a, 0x97, 0x69, 0x1b, 0x76, 0xb3, 0xa0,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_ad.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_ad.pb.go
index 2f4d741cb3..03665d0df9 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_ad.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_ad.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_ad.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group ad.
 type AdGroupAd struct {
@@ -48,16 +51,17 @@ func (m *AdGroupAd) Reset()         { *m = AdGroupAd{} }
 func (m *AdGroupAd) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAd) ProtoMessage()    {}
 func (*AdGroupAd) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_ea5fcfcc30667776, []int{0}
+	return fileDescriptor_f498dcb629eaef64, []int{0}
 }
+
 func (m *AdGroupAd) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAd.Unmarshal(m, b)
 }
 func (m *AdGroupAd) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAd.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAd) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAd.Merge(dst, src)
+func (m *AdGroupAd) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAd.Merge(m, src)
 }
 func (m *AdGroupAd) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAd.Size(m)
@@ -128,16 +132,17 @@ func (m *AdGroupAdPolicySummary) Reset()         { *m = AdGroupAdPolicySummary{}
 func (m *AdGroupAdPolicySummary) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAdPolicySummary) ProtoMessage()    {}
 func (*AdGroupAdPolicySummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_ea5fcfcc30667776, []int{1}
+	return fileDescriptor_f498dcb629eaef64, []int{1}
 }
+
 func (m *AdGroupAdPolicySummary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAdPolicySummary.Unmarshal(m, b)
 }
 func (m *AdGroupAdPolicySummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAdPolicySummary.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAdPolicySummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAdPolicySummary.Merge(dst, src)
+func (m *AdGroupAdPolicySummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAdPolicySummary.Merge(m, src)
 }
 func (m *AdGroupAdPolicySummary) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAdPolicySummary.Size(m)
@@ -175,10 +180,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_ad.proto", fileDescriptor_ad_group_ad_ea5fcfcc30667776)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_ad.proto", fileDescriptor_f498dcb629eaef64)
 }
 
-var fileDescriptor_ad_group_ad_ea5fcfcc30667776 = []byte{
+var fileDescriptor_f498dcb629eaef64 = []byte{
 	// 592 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xdf, 0x6a, 0xdb, 0x3e,
 	0x18, 0xc5, 0xce, 0xef, 0x97, 0xae, 0xca, 0x9a, 0x81, 0x19, 0xc3, 0x94, 0x32, 0xd2, 0x8e, 0x40,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_ad_label.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_ad_label.pb.go
index af9b9345fe..a0784f548b 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_ad_label.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_ad_label.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_ad_label.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A relationship between an ad group ad and a label.
 type AdGroupAdLabel struct {
@@ -39,16 +42,17 @@ func (m *AdGroupAdLabel) Reset()         { *m = AdGroupAdLabel{} }
 func (m *AdGroupAdLabel) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAdLabel) ProtoMessage()    {}
 func (*AdGroupAdLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_label_6145341efa86b0bb, []int{0}
+	return fileDescriptor_2df918faaa4182f5, []int{0}
 }
+
 func (m *AdGroupAdLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAdLabel.Unmarshal(m, b)
 }
 func (m *AdGroupAdLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAdLabel.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAdLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAdLabel.Merge(dst, src)
+func (m *AdGroupAdLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAdLabel.Merge(m, src)
 }
 func (m *AdGroupAdLabel) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAdLabel.Size(m)
@@ -85,10 +89,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_ad_label.proto", fileDescriptor_ad_group_ad_label_6145341efa86b0bb)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_ad_label.proto", fileDescriptor_2df918faaa4182f5)
 }
 
-var fileDescriptor_ad_group_ad_label_6145341efa86b0bb = []byte{
+var fileDescriptor_2df918faaa4182f5 = []byte{
 	// 331 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4a, 0xc3, 0x30,
 	0x00, 0xc6, 0x69, 0x87, 0xc2, 0x3a, 0xf5, 0x50, 0x2f, 0x63, 0x0c, 0xd9, 0x94, 0xc1, 0x4e, 0x09,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_audience_view.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_audience_view.pb.go
index 526808c612..93f849b0c0 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_audience_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_audience_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_audience_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group audience view.
 // Includes performance data from interests and remarketing lists for Display
@@ -38,16 +41,17 @@ func (m *AdGroupAudienceView) Reset()         { *m = AdGroupAudienceView{} }
 func (m *AdGroupAudienceView) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAudienceView) ProtoMessage()    {}
 func (*AdGroupAudienceView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_audience_view_52e87a3873ae29dc, []int{0}
+	return fileDescriptor_bc8817e198a682ff, []int{0}
 }
+
 func (m *AdGroupAudienceView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAudienceView.Unmarshal(m, b)
 }
 func (m *AdGroupAudienceView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAudienceView.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAudienceView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAudienceView.Merge(dst, src)
+func (m *AdGroupAudienceView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAudienceView.Merge(m, src)
 }
 func (m *AdGroupAudienceView) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAudienceView.Size(m)
@@ -70,10 +74,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_audience_view.proto", fileDescriptor_ad_group_audience_view_52e87a3873ae29dc)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_audience_view.proto", fileDescriptor_bc8817e198a682ff)
 }
 
-var fileDescriptor_ad_group_audience_view_52e87a3873ae29dc = []byte{
+var fileDescriptor_bc8817e198a682ff = []byte{
 	// 276 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x4a, 0xc4, 0x30,
 	0x14, 0xc6, 0x99, 0x0a, 0x82, 0x45, 0x37, 0xe3, 0x66, 0x10, 0x17, 0x8e, 0x32, 0xe0, 0x2a, 0x21,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_bid_modifier.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_bid_modifier.pb.go
index ea56ceabca..a17680efe3 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_bid_modifier.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_bid_modifier.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_bid_modifier.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents an ad group bid modifier.
 type AdGroupBidModifier struct {
@@ -66,16 +69,17 @@ func (m *AdGroupBidModifier) Reset()         { *m = AdGroupBidModifier{} }
 func (m *AdGroupBidModifier) String() string { return proto.CompactTextString(m) }
 func (*AdGroupBidModifier) ProtoMessage()    {}
 func (*AdGroupBidModifier) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_c58bd31b1ada3574, []int{0}
+	return fileDescriptor_14c1022b135ec410, []int{0}
 }
+
 func (m *AdGroupBidModifier) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupBidModifier.Unmarshal(m, b)
 }
 func (m *AdGroupBidModifier) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupBidModifier.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupBidModifier) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupBidModifier.Merge(dst, src)
+func (m *AdGroupBidModifier) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupBidModifier.Merge(m, src)
 }
 func (m *AdGroupBidModifier) XXX_Size() int {
 	return xxx_messageInfo_AdGroupBidModifier.Size(m)
@@ -217,9 +221,9 @@ func (m *AdGroupBidModifier) GetPreferredContent() *common.PreferredContentInfo
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupBidModifier) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupBidModifier_OneofMarshaler, _AdGroupBidModifier_OneofUnmarshaler, _AdGroupBidModifier_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupBidModifier) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupBidModifier_HotelDateSelectionType)(nil),
 		(*AdGroupBidModifier_HotelAdvanceBookingWindow)(nil),
 		(*AdGroupBidModifier_HotelLengthOfStay)(nil),
@@ -229,153 +233,15 @@ func (*AdGroupBidModifier) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Bu
 	}
 }
 
-func _AdGroupBidModifier_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupBidModifier)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *AdGroupBidModifier_HotelDateSelectionType:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelDateSelectionType); err != nil {
-			return err
-		}
-	case *AdGroupBidModifier_HotelAdvanceBookingWindow:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelAdvanceBookingWindow); err != nil {
-			return err
-		}
-	case *AdGroupBidModifier_HotelLengthOfStay:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelLengthOfStay); err != nil {
-			return err
-		}
-	case *AdGroupBidModifier_HotelCheckInDay:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotelCheckInDay); err != nil {
-			return err
-		}
-	case *AdGroupBidModifier_Device:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Device); err != nil {
-			return err
-		}
-	case *AdGroupBidModifier_PreferredContent:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PreferredContent); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupBidModifier.Criterion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupBidModifier_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupBidModifier)
-	switch tag {
-	case 5: // criterion.hotel_date_selection_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.HotelDateSelectionTypeInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupBidModifier_HotelDateSelectionType{msg}
-		return true, err
-	case 6: // criterion.hotel_advance_booking_window
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.HotelAdvanceBookingWindowInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupBidModifier_HotelAdvanceBookingWindow{msg}
-		return true, err
-	case 7: // criterion.hotel_length_of_stay
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.HotelLengthOfStayInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupBidModifier_HotelLengthOfStay{msg}
-		return true, err
-	case 8: // criterion.hotel_check_in_day
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.HotelCheckInDayInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupBidModifier_HotelCheckInDay{msg}
-		return true, err
-	case 11: // criterion.device
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.DeviceInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupBidModifier_Device{msg}
-		return true, err
-	case 12: // criterion.preferred_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PreferredContentInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupBidModifier_PreferredContent{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupBidModifier_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupBidModifier)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *AdGroupBidModifier_HotelDateSelectionType:
-		s := proto.Size(x.HotelDateSelectionType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupBidModifier_HotelAdvanceBookingWindow:
-		s := proto.Size(x.HotelAdvanceBookingWindow)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupBidModifier_HotelLengthOfStay:
-		s := proto.Size(x.HotelLengthOfStay)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupBidModifier_HotelCheckInDay:
-		s := proto.Size(x.HotelCheckInDay)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupBidModifier_Device:
-		s := proto.Size(x.Device)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupBidModifier_PreferredContent:
-		s := proto.Size(x.PreferredContent)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*AdGroupBidModifier)(nil), "google.ads.googleads.v1.resources.AdGroupBidModifier")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_bid_modifier.proto", fileDescriptor_ad_group_bid_modifier_c58bd31b1ada3574)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_bid_modifier.proto", fileDescriptor_14c1022b135ec410)
 }
 
-var fileDescriptor_ad_group_bid_modifier_c58bd31b1ada3574 = []byte{
+var fileDescriptor_14c1022b135ec410 = []byte{
 	// 694 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x48,
 	0x14, 0xde, 0xa4, 0xbb, 0xfd, 0x99, 0xa4, 0xbb, 0x5b, 0xef, 0x6a, 0xd7, 0x94, 0x0a, 0xb5, 0xa0,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_criterion.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_criterion.pb.go
index 2dd9861071..817c4d1e4d 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_criterion.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_criterion.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_criterion.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group criterion.
 type AdGroupCriterion struct {
@@ -126,16 +129,17 @@ func (m *AdGroupCriterion) Reset()         { *m = AdGroupCriterion{} }
 func (m *AdGroupCriterion) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterion) ProtoMessage()    {}
 func (*AdGroupCriterion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_18b9ede2c7927371, []int{0}
+	return fileDescriptor_762d1b0ee6b4b0d4, []int{0}
 }
+
 func (m *AdGroupCriterion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterion.Unmarshal(m, b)
 }
 func (m *AdGroupCriterion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterion.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterion.Merge(dst, src)
+func (m *AdGroupCriterion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterion.Merge(m, src)
 }
 func (m *AdGroupCriterion) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterion.Size(m)
@@ -587,9 +591,9 @@ func (m *AdGroupCriterion) GetCustomIntent() *common.CustomIntentInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupCriterion_OneofMarshaler, _AdGroupCriterion_OneofUnmarshaler, _AdGroupCriterion_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupCriterion) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupCriterion_Keyword)(nil),
 		(*AdGroupCriterion_Placement)(nil),
 		(*AdGroupCriterion_MobileAppCategory)(nil),
@@ -611,360 +615,6 @@ func (*AdGroupCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buff
 	}
 }
 
-func _AdGroupCriterion_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *AdGroupCriterion_Keyword:
-		b.EncodeVarint(27<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Keyword); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_Placement:
-		b.EncodeVarint(28<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Placement); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_MobileAppCategory:
-		b.EncodeVarint(29<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileAppCategory); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_MobileApplication:
-		b.EncodeVarint(30<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileApplication); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_ListingGroup:
-		b.EncodeVarint(32<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListingGroup); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_AgeRange:
-		b.EncodeVarint(36<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AgeRange); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_Gender:
-		b.EncodeVarint(37<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Gender); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_IncomeRange:
-		b.EncodeVarint(38<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.IncomeRange); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_ParentalStatus:
-		b.EncodeVarint(39<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ParentalStatus); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_UserList:
-		b.EncodeVarint(42<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UserList); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_YoutubeVideo:
-		b.EncodeVarint(40<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeVideo); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_YoutubeChannel:
-		b.EncodeVarint(41<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeChannel); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_Topic:
-		b.EncodeVarint(43<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Topic); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_UserInterest:
-		b.EncodeVarint(45<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UserInterest); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_Webpage:
-		b.EncodeVarint(46<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Webpage); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_AppPaymentModel:
-		b.EncodeVarint(47<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppPaymentModel); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_CustomAffinity:
-		b.EncodeVarint(48<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomAffinity); err != nil {
-			return err
-		}
-	case *AdGroupCriterion_CustomIntent:
-		b.EncodeVarint(49<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomIntent); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupCriterion.Criterion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupCriterion_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupCriterion)
-	switch tag {
-	case 27: // criterion.keyword
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.KeywordInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_Keyword{msg}
-		return true, err
-	case 28: // criterion.placement
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PlacementInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_Placement{msg}
-		return true, err
-	case 29: // criterion.mobile_app_category
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileAppCategoryInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_MobileAppCategory{msg}
-		return true, err
-	case 30: // criterion.mobile_application
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileApplicationInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_MobileApplication{msg}
-		return true, err
-	case 32: // criterion.listing_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ListingGroupInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_ListingGroup{msg}
-		return true, err
-	case 36: // criterion.age_range
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AgeRangeInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_AgeRange{msg}
-		return true, err
-	case 37: // criterion.gender
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.GenderInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_Gender{msg}
-		return true, err
-	case 38: // criterion.income_range
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.IncomeRangeInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_IncomeRange{msg}
-		return true, err
-	case 39: // criterion.parental_status
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ParentalStatusInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_ParentalStatus{msg}
-		return true, err
-	case 42: // criterion.user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.UserListInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_UserList{msg}
-		return true, err
-	case 40: // criterion.youtube_video
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeVideoInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_YoutubeVideo{msg}
-		return true, err
-	case 41: // criterion.youtube_channel
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeChannelInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_YoutubeChannel{msg}
-		return true, err
-	case 43: // criterion.topic
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TopicInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_Topic{msg}
-		return true, err
-	case 45: // criterion.user_interest
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.UserInterestInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_UserInterest{msg}
-		return true, err
-	case 46: // criterion.webpage
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.WebpageInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_Webpage{msg}
-		return true, err
-	case 47: // criterion.app_payment_model
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AppPaymentModelInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_AppPaymentModel{msg}
-		return true, err
-	case 48: // criterion.custom_affinity
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CustomAffinityInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_CustomAffinity{msg}
-		return true, err
-	case 49: // criterion.custom_intent
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CustomIntentInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &AdGroupCriterion_CustomIntent{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupCriterion_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *AdGroupCriterion_Keyword:
-		s := proto.Size(x.Keyword)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_Placement:
-		s := proto.Size(x.Placement)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_MobileAppCategory:
-		s := proto.Size(x.MobileAppCategory)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_MobileApplication:
-		s := proto.Size(x.MobileApplication)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_ListingGroup:
-		s := proto.Size(x.ListingGroup)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_AgeRange:
-		s := proto.Size(x.AgeRange)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_Gender:
-		s := proto.Size(x.Gender)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_IncomeRange:
-		s := proto.Size(x.IncomeRange)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_ParentalStatus:
-		s := proto.Size(x.ParentalStatus)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_UserList:
-		s := proto.Size(x.UserList)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_YoutubeVideo:
-		s := proto.Size(x.YoutubeVideo)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_YoutubeChannel:
-		s := proto.Size(x.YoutubeChannel)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_Topic:
-		s := proto.Size(x.Topic)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_UserInterest:
-		s := proto.Size(x.UserInterest)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_Webpage:
-		s := proto.Size(x.Webpage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_AppPaymentModel:
-		s := proto.Size(x.AppPaymentModel)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_CustomAffinity:
-		s := proto.Size(x.CustomAffinity)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterion_CustomIntent:
-		s := proto.Size(x.CustomIntent)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A container for ad group criterion quality information.
 type AdGroupCriterion_QualityInfo struct {
 	// The quality score.
@@ -987,16 +637,17 @@ func (m *AdGroupCriterion_QualityInfo) Reset()         { *m = AdGroupCriterion_Q
 func (m *AdGroupCriterion_QualityInfo) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterion_QualityInfo) ProtoMessage()    {}
 func (*AdGroupCriterion_QualityInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_18b9ede2c7927371, []int{0, 0}
+	return fileDescriptor_762d1b0ee6b4b0d4, []int{0, 0}
 }
+
 func (m *AdGroupCriterion_QualityInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterion_QualityInfo.Unmarshal(m, b)
 }
 func (m *AdGroupCriterion_QualityInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterion_QualityInfo.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterion_QualityInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterion_QualityInfo.Merge(dst, src)
+func (m *AdGroupCriterion_QualityInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterion_QualityInfo.Merge(m, src)
 }
 func (m *AdGroupCriterion_QualityInfo) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterion_QualityInfo.Size(m)
@@ -1061,16 +712,17 @@ func (m *AdGroupCriterion_PositionEstimates) Reset()         { *m = AdGroupCrite
 func (m *AdGroupCriterion_PositionEstimates) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterion_PositionEstimates) ProtoMessage()    {}
 func (*AdGroupCriterion_PositionEstimates) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_18b9ede2c7927371, []int{0, 1}
+	return fileDescriptor_762d1b0ee6b4b0d4, []int{0, 1}
 }
+
 func (m *AdGroupCriterion_PositionEstimates) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterion_PositionEstimates.Unmarshal(m, b)
 }
 func (m *AdGroupCriterion_PositionEstimates) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterion_PositionEstimates.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterion_PositionEstimates) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterion_PositionEstimates.Merge(dst, src)
+func (m *AdGroupCriterion_PositionEstimates) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterion_PositionEstimates.Merge(m, src)
 }
 func (m *AdGroupCriterion_PositionEstimates) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterion_PositionEstimates.Size(m)
@@ -1123,10 +775,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_criterion.proto", fileDescriptor_ad_group_criterion_18b9ede2c7927371)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_criterion.proto", fileDescriptor_762d1b0ee6b4b0d4)
 }
 
-var fileDescriptor_ad_group_criterion_18b9ede2c7927371 = []byte{
+var fileDescriptor_762d1b0ee6b4b0d4 = []byte{
 	// 1706 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x98, 0xdd, 0x72, 0x1b, 0xb7,
 	0x15, 0xc7, 0x4b, 0x29, 0x76, 0x2c, 0x48, 0x96, 0x2d, 0xc8, 0x52, 0x11, 0xc5, 0x4d, 0x65, 0x27,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_criterion_label.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_criterion_label.pb.go
index ac9f69aba6..a0154bec93 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_criterion_label.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_criterion_label.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_criterion_label.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A relationship between an ad group criterion and a label.
 type AdGroupCriterionLabel struct {
@@ -40,16 +43,17 @@ func (m *AdGroupCriterionLabel) Reset()         { *m = AdGroupCriterionLabel{} }
 func (m *AdGroupCriterionLabel) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterionLabel) ProtoMessage()    {}
 func (*AdGroupCriterionLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_label_889d4a773b2ff94f, []int{0}
+	return fileDescriptor_2165ddac79b87814, []int{0}
 }
+
 func (m *AdGroupCriterionLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterionLabel.Unmarshal(m, b)
 }
 func (m *AdGroupCriterionLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterionLabel.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterionLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterionLabel.Merge(dst, src)
+func (m *AdGroupCriterionLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterionLabel.Merge(m, src)
 }
 func (m *AdGroupCriterionLabel) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterionLabel.Size(m)
@@ -86,10 +90,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_criterion_label.proto", fileDescriptor_ad_group_criterion_label_889d4a773b2ff94f)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_criterion_label.proto", fileDescriptor_2165ddac79b87814)
 }
 
-var fileDescriptor_ad_group_criterion_label_889d4a773b2ff94f = []byte{
+var fileDescriptor_2165ddac79b87814 = []byte{
 	// 343 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc6, 0x69, 0x87, 0x82, 0x55, 0x41, 0x0a, 0xc2, 0x18, 0x43, 0x36, 0x65, 0xb0, 0x53, 0x42,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_criterion_simulation.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_criterion_simulation.pb.go
index fcb0615157..e24de461a8 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_criterion_simulation.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_criterion_simulation.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_criterion_simulation.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group criterion simulation. Supported combinations of advertising
 // channel type, criterion types, simulation type, and simulation modification
@@ -60,16 +63,17 @@ func (m *AdGroupCriterionSimulation) Reset()         { *m = AdGroupCriterionSimu
 func (m *AdGroupCriterionSimulation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterionSimulation) ProtoMessage()    {}
 func (*AdGroupCriterionSimulation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_simulation_a6c4c667ef018570, []int{0}
+	return fileDescriptor_f859d33f99a752e1, []int{0}
 }
+
 func (m *AdGroupCriterionSimulation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterionSimulation.Unmarshal(m, b)
 }
 func (m *AdGroupCriterionSimulation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterionSimulation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterionSimulation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterionSimulation.Merge(dst, src)
+func (m *AdGroupCriterionSimulation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterionSimulation.Merge(m, src)
 }
 func (m *AdGroupCriterionSimulation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterionSimulation.Size(m)
@@ -153,70 +157,22 @@ func (m *AdGroupCriterionSimulation) GetCpcBidPointList() *common.CpcBidSimulati
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupCriterionSimulation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupCriterionSimulation_OneofMarshaler, _AdGroupCriterionSimulation_OneofUnmarshaler, _AdGroupCriterionSimulation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupCriterionSimulation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupCriterionSimulation_CpcBidPointList)(nil),
 	}
 }
 
-func _AdGroupCriterionSimulation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupCriterionSimulation)
-	// point_list
-	switch x := m.PointList.(type) {
-	case *AdGroupCriterionSimulation_CpcBidPointList:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CpcBidPointList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupCriterionSimulation.PointList has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupCriterionSimulation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupCriterionSimulation)
-	switch tag {
-	case 8: // point_list.cpc_bid_point_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CpcBidSimulationPointList)
-		err := b.DecodeMessage(msg)
-		m.PointList = &AdGroupCriterionSimulation_CpcBidPointList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupCriterionSimulation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupCriterionSimulation)
-	// point_list
-	switch x := m.PointList.(type) {
-	case *AdGroupCriterionSimulation_CpcBidPointList:
-		s := proto.Size(x.CpcBidPointList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*AdGroupCriterionSimulation)(nil), "google.ads.googleads.v1.resources.AdGroupCriterionSimulation")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_criterion_simulation.proto", fileDescriptor_ad_group_criterion_simulation_a6c4c667ef018570)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_criterion_simulation.proto", fileDescriptor_f859d33f99a752e1)
 }
 
-var fileDescriptor_ad_group_criterion_simulation_a6c4c667ef018570 = []byte{
+var fileDescriptor_f859d33f99a752e1 = []byte{
 	// 557 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x3e,
 	0x14, 0xff, 0xa7, 0xfb, 0xf6, 0xfa, 0x07, 0x29, 0xdc, 0x44, 0x65, 0x82, 0x0e, 0x34, 0xa9, 0x57,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_extension_setting.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_extension_setting.pb.go
index cb414bae85..a6a6a0df00 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_extension_setting.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_extension_setting.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_extension_setting.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group extension setting.
 type AdGroupExtensionSetting struct {
@@ -53,16 +56,17 @@ func (m *AdGroupExtensionSetting) Reset()         { *m = AdGroupExtensionSetting
 func (m *AdGroupExtensionSetting) String() string { return proto.CompactTextString(m) }
 func (*AdGroupExtensionSetting) ProtoMessage()    {}
 func (*AdGroupExtensionSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_extension_setting_7412d90d5487962e, []int{0}
+	return fileDescriptor_48cf797d6357afb2, []int{0}
 }
+
 func (m *AdGroupExtensionSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupExtensionSetting.Unmarshal(m, b)
 }
 func (m *AdGroupExtensionSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupExtensionSetting.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupExtensionSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupExtensionSetting.Merge(dst, src)
+func (m *AdGroupExtensionSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupExtensionSetting.Merge(m, src)
 }
 func (m *AdGroupExtensionSetting) XXX_Size() int {
 	return xxx_messageInfo_AdGroupExtensionSetting.Size(m)
@@ -113,10 +117,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_extension_setting.proto", fileDescriptor_ad_group_extension_setting_7412d90d5487962e)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_extension_setting.proto", fileDescriptor_48cf797d6357afb2)
 }
 
-var fileDescriptor_ad_group_extension_setting_7412d90d5487962e = []byte{
+var fileDescriptor_48cf797d6357afb2 = []byte{
 	// 449 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xd1, 0x8a, 0xd4, 0x30,
 	0x14, 0xa5, 0x1d, 0x5d, 0xb5, 0xba, 0xfb, 0x50, 0x04, 0xcb, 0x32, 0xc8, 0xac, 0xb2, 0x30, 0x4f,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_feed.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_feed.pb.go
index 96e0820ebc..70b3f29a17 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_feed.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_feed.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_feed.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group feed.
 type AdGroupFeed struct {
@@ -52,16 +55,17 @@ func (m *AdGroupFeed) Reset()         { *m = AdGroupFeed{} }
 func (m *AdGroupFeed) String() string { return proto.CompactTextString(m) }
 func (*AdGroupFeed) ProtoMessage()    {}
 func (*AdGroupFeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_182dd6d2597b72d9, []int{0}
+	return fileDescriptor_d91c15fcb3b678ff, []int{0}
 }
+
 func (m *AdGroupFeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupFeed.Unmarshal(m, b)
 }
 func (m *AdGroupFeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupFeed.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupFeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupFeed.Merge(dst, src)
+func (m *AdGroupFeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupFeed.Merge(m, src)
 }
 func (m *AdGroupFeed) XXX_Size() int {
 	return xxx_messageInfo_AdGroupFeed.Size(m)
@@ -119,10 +123,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_feed.proto", fileDescriptor_ad_group_feed_182dd6d2597b72d9)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_feed.proto", fileDescriptor_d91c15fcb3b678ff)
 }
 
-var fileDescriptor_ad_group_feed_182dd6d2597b72d9 = []byte{
+var fileDescriptor_d91c15fcb3b678ff = []byte{
 	// 489 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdd, 0x6a, 0xd4, 0x40,
 	0x14, 0xc7, 0xc9, 0x6e, 0x5d, 0x75, 0xaa, 0x65, 0x9b, 0xab, 0x50, 0x8a, 0x6c, 0x95, 0xc2, 0x5e,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_label.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_label.pb.go
index af68ab53b7..52acf655ad 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_label.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_label.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_label.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A relationship between an ad group and a label.
 type AdGroupLabel struct {
@@ -39,16 +42,17 @@ func (m *AdGroupLabel) Reset()         { *m = AdGroupLabel{} }
 func (m *AdGroupLabel) String() string { return proto.CompactTextString(m) }
 func (*AdGroupLabel) ProtoMessage()    {}
 func (*AdGroupLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_label_0fa746bd05e2b50f, []int{0}
+	return fileDescriptor_90328d22925d96e4, []int{0}
 }
+
 func (m *AdGroupLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupLabel.Unmarshal(m, b)
 }
 func (m *AdGroupLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupLabel.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupLabel.Merge(dst, src)
+func (m *AdGroupLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupLabel.Merge(m, src)
 }
 func (m *AdGroupLabel) XXX_Size() int {
 	return xxx_messageInfo_AdGroupLabel.Size(m)
@@ -85,10 +89,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_label.proto", fileDescriptor_ad_group_label_0fa746bd05e2b50f)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_label.proto", fileDescriptor_90328d22925d96e4)
 }
 
-var fileDescriptor_ad_group_label_0fa746bd05e2b50f = []byte{
+var fileDescriptor_90328d22925d96e4 = []byte{
 	// 328 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x4f, 0x4b, 0xf3, 0x30,
 	0x1c, 0xc7, 0x69, 0xc7, 0xf3, 0xa8, 0x75, 0x1e, 0xec, 0x69, 0x8c, 0x21, 0x9b, 0x32, 0xd8, 0x29,
diff --git a/googleapis/ads/googleads/v1/resources/ad_group_simulation.pb.go b/googleapis/ads/googleads/v1/resources/ad_group_simulation.pb.go
index d806d58ea4..3e29408357 100644
--- a/googleapis/ads/googleads/v1/resources/ad_group_simulation.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_group_simulation.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_group_simulation.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad group simulation. Supported combinations of advertising
 // channel type, simulation type and simulation modification method is
@@ -64,16 +67,17 @@ func (m *AdGroupSimulation) Reset()         { *m = AdGroupSimulation{} }
 func (m *AdGroupSimulation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupSimulation) ProtoMessage()    {}
 func (*AdGroupSimulation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_simulation_a578bba85f881904, []int{0}
+	return fileDescriptor_8c8573d5f5d3a023, []int{0}
 }
+
 func (m *AdGroupSimulation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupSimulation.Unmarshal(m, b)
 }
 func (m *AdGroupSimulation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupSimulation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupSimulation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupSimulation.Merge(dst, src)
+func (m *AdGroupSimulation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupSimulation.Merge(m, src)
 }
 func (m *AdGroupSimulation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupSimulation.Size(m)
@@ -163,89 +167,23 @@ func (m *AdGroupSimulation) GetTargetCpaPointList() *common.TargetCpaSimulationP
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupSimulation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupSimulation_OneofMarshaler, _AdGroupSimulation_OneofUnmarshaler, _AdGroupSimulation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupSimulation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupSimulation_CpcBidPointList)(nil),
 		(*AdGroupSimulation_TargetCpaPointList)(nil),
 	}
 }
 
-func _AdGroupSimulation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupSimulation)
-	// point_list
-	switch x := m.PointList.(type) {
-	case *AdGroupSimulation_CpcBidPointList:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CpcBidPointList); err != nil {
-			return err
-		}
-	case *AdGroupSimulation_TargetCpaPointList:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetCpaPointList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupSimulation.PointList has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupSimulation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupSimulation)
-	switch tag {
-	case 8: // point_list.cpc_bid_point_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CpcBidSimulationPointList)
-		err := b.DecodeMessage(msg)
-		m.PointList = &AdGroupSimulation_CpcBidPointList{msg}
-		return true, err
-	case 9: // point_list.target_cpa_point_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetCpaSimulationPointList)
-		err := b.DecodeMessage(msg)
-		m.PointList = &AdGroupSimulation_TargetCpaPointList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupSimulation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupSimulation)
-	// point_list
-	switch x := m.PointList.(type) {
-	case *AdGroupSimulation_CpcBidPointList:
-		s := proto.Size(x.CpcBidPointList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupSimulation_TargetCpaPointList:
-		s := proto.Size(x.TargetCpaPointList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*AdGroupSimulation)(nil), "google.ads.googleads.v1.resources.AdGroupSimulation")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_simulation.proto", fileDescriptor_ad_group_simulation_a578bba85f881904)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_group_simulation.proto", fileDescriptor_8c8573d5f5d3a023)
 }
 
-var fileDescriptor_ad_group_simulation_a578bba85f881904 = []byte{
+var fileDescriptor_8c8573d5f5d3a023 = []byte{
 	// 563 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x3c,
 	0x18, 0xfe, 0xd2, 0xfd, 0x7c, 0x9b, 0x37, 0x40, 0x18, 0x81, 0xa2, 0x31, 0xa1, 0x0e, 0x34, 0xa9,
diff --git a/googleapis/ads/googleads/v1/resources/ad_parameter.pb.go b/googleapis/ads/googleads/v1/resources/ad_parameter.pb.go
index 3703a7ce15..89d8e12a54 100644
--- a/googleapis/ads/googleads/v1/resources/ad_parameter.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_parameter.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_parameter.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad parameter that is used to update numeric values (such as prices or
 // inventory levels) in any text line of an ad (including URLs). There can
@@ -60,16 +63,17 @@ func (m *AdParameter) Reset()         { *m = AdParameter{} }
 func (m *AdParameter) String() string { return proto.CompactTextString(m) }
 func (*AdParameter) ProtoMessage()    {}
 func (*AdParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_c2ef224ce905eb1b, []int{0}
+	return fileDescriptor_80d3f7afedc49596, []int{0}
 }
+
 func (m *AdParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdParameter.Unmarshal(m, b)
 }
 func (m *AdParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdParameter.Marshal(b, m, deterministic)
 }
-func (dst *AdParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdParameter.Merge(dst, src)
+func (m *AdParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdParameter.Merge(m, src)
 }
 func (m *AdParameter) XXX_Size() int {
 	return xxx_messageInfo_AdParameter.Size(m)
@@ -113,10 +117,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_parameter.proto", fileDescriptor_ad_parameter_c2ef224ce905eb1b)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_parameter.proto", fileDescriptor_80d3f7afedc49596)
 }
 
-var fileDescriptor_ad_parameter_c2ef224ce905eb1b = []byte{
+var fileDescriptor_80d3f7afedc49596 = []byte{
 	// 385 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xdf, 0x6a, 0xdb, 0x30,
 	0x18, 0xc5, 0xb1, 0x33, 0x06, 0x73, 0x96, 0x2c, 0xf8, 0xca, 0x64, 0x61, 0x24, 0x1b, 0x81, 0x5c,
diff --git a/googleapis/ads/googleads/v1/resources/ad_schedule_view.pb.go b/googleapis/ads/googleads/v1/resources/ad_schedule_view.pb.go
index 56f4e35298..3a2c624319 100644
--- a/googleapis/ads/googleads/v1/resources/ad_schedule_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/ad_schedule_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/ad_schedule_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An ad schedule view summarizes the performance of campaigns by
 // AdSchedule criteria.
@@ -36,16 +39,17 @@ func (m *AdScheduleView) Reset()         { *m = AdScheduleView{} }
 func (m *AdScheduleView) String() string { return proto.CompactTextString(m) }
 func (*AdScheduleView) ProtoMessage()    {}
 func (*AdScheduleView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_schedule_view_4019259953664afe, []int{0}
+	return fileDescriptor_88641aea73ff6f50, []int{0}
 }
+
 func (m *AdScheduleView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdScheduleView.Unmarshal(m, b)
 }
 func (m *AdScheduleView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdScheduleView.Marshal(b, m, deterministic)
 }
-func (dst *AdScheduleView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdScheduleView.Merge(dst, src)
+func (m *AdScheduleView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdScheduleView.Merge(m, src)
 }
 func (m *AdScheduleView) XXX_Size() int {
 	return xxx_messageInfo_AdScheduleView.Size(m)
@@ -68,10 +72,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/ad_schedule_view.proto", fileDescriptor_ad_schedule_view_4019259953664afe)
+	proto.RegisterFile("google/ads/googleads/v1/resources/ad_schedule_view.proto", fileDescriptor_88641aea73ff6f50)
 }
 
-var fileDescriptor_ad_schedule_view_4019259953664afe = []byte{
+var fileDescriptor_88641aea73ff6f50 = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4a, 0xc4, 0x30,
 	0x10, 0x86, 0x69, 0x05, 0xc1, 0xa2, 0x1e, 0xd6, 0x8b, 0x88, 0x07, 0x57, 0x59, 0xf0, 0x94, 0x50,
diff --git a/googleapis/ads/googleads/v1/resources/age_range_view.pb.go b/googleapis/ads/googleads/v1/resources/age_range_view.pb.go
index 6da32f959f..f8019a6e29 100644
--- a/googleapis/ads/googleads/v1/resources/age_range_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/age_range_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/age_range_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An age range view.
 type AgeRangeView struct {
@@ -35,16 +38,17 @@ func (m *AgeRangeView) Reset()         { *m = AgeRangeView{} }
 func (m *AgeRangeView) String() string { return proto.CompactTextString(m) }
 func (*AgeRangeView) ProtoMessage()    {}
 func (*AgeRangeView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_age_range_view_32980c6c992c3551, []int{0}
+	return fileDescriptor_730b8809402823e5, []int{0}
 }
+
 func (m *AgeRangeView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AgeRangeView.Unmarshal(m, b)
 }
 func (m *AgeRangeView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AgeRangeView.Marshal(b, m, deterministic)
 }
-func (dst *AgeRangeView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AgeRangeView.Merge(dst, src)
+func (m *AgeRangeView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AgeRangeView.Merge(m, src)
 }
 func (m *AgeRangeView) XXX_Size() int {
 	return xxx_messageInfo_AgeRangeView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/age_range_view.proto", fileDescriptor_age_range_view_32980c6c992c3551)
+	proto.RegisterFile("google/ads/googleads/v1/resources/age_range_view.proto", fileDescriptor_730b8809402823e5)
 }
 
-var fileDescriptor_age_range_view_32980c6c992c3551 = []byte{
+var fileDescriptor_730b8809402823e5 = []byte{
 	// 267 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xb1, 0x4a, 0xc4, 0x30,
 	0x18, 0xc7, 0x69, 0x05, 0xc1, 0x72, 0x0e, 0xde, 0x24, 0xe2, 0xe0, 0x29, 0x07, 0x4e, 0x09, 0xe1,
diff --git a/googleapis/ads/googleads/v1/resources/asset.pb.go b/googleapis/ads/googleads/v1/resources/asset.pb.go
index 45216e12ef..ffe7c28496 100644
--- a/googleapis/ads/googleads/v1/resources/asset.pb.go
+++ b/googleapis/ads/googleads/v1/resources/asset.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/asset.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Asset is a part of an ad which can be shared across multiple ads.
 // It can be an image (ImageAsset), a video (YoutubeVideoAsset), etc.
@@ -53,16 +56,17 @@ func (m *Asset) Reset()         { *m = Asset{} }
 func (m *Asset) String() string { return proto.CompactTextString(m) }
 func (*Asset) ProtoMessage()    {}
 func (*Asset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_06e147e85df80ec5, []int{0}
+	return fileDescriptor_6b8d91af9b64a99d, []int{0}
 }
+
 func (m *Asset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset.Unmarshal(m, b)
 }
 func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset.Marshal(b, m, deterministic)
 }
-func (dst *Asset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset.Merge(dst, src)
+func (m *Asset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset.Merge(m, src)
 }
 func (m *Asset) XXX_Size() int {
 	return xxx_messageInfo_Asset.Size(m)
@@ -164,9 +168,9 @@ func (m *Asset) GetTextAsset() *common.TextAsset {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Asset) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Asset_OneofMarshaler, _Asset_OneofUnmarshaler, _Asset_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Asset) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Asset_YoutubeVideoAsset)(nil),
 		(*Asset_MediaBundleAsset)(nil),
 		(*Asset_ImageAsset)(nil),
@@ -174,117 +178,15 @@ func (*Asset) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Asset_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Asset)
-	// asset_data
-	switch x := m.AssetData.(type) {
-	case *Asset_YoutubeVideoAsset:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeVideoAsset); err != nil {
-			return err
-		}
-	case *Asset_MediaBundleAsset:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MediaBundleAsset); err != nil {
-			return err
-		}
-	case *Asset_ImageAsset:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageAsset); err != nil {
-			return err
-		}
-	case *Asset_TextAsset:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextAsset); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Asset.AssetData has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Asset_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Asset)
-	switch tag {
-	case 5: // asset_data.youtube_video_asset
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YoutubeVideoAsset)
-		err := b.DecodeMessage(msg)
-		m.AssetData = &Asset_YoutubeVideoAsset{msg}
-		return true, err
-	case 6: // asset_data.media_bundle_asset
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MediaBundleAsset)
-		err := b.DecodeMessage(msg)
-		m.AssetData = &Asset_MediaBundleAsset{msg}
-		return true, err
-	case 7: // asset_data.image_asset
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ImageAsset)
-		err := b.DecodeMessage(msg)
-		m.AssetData = &Asset_ImageAsset{msg}
-		return true, err
-	case 8: // asset_data.text_asset
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TextAsset)
-		err := b.DecodeMessage(msg)
-		m.AssetData = &Asset_TextAsset{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Asset_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Asset)
-	// asset_data
-	switch x := m.AssetData.(type) {
-	case *Asset_YoutubeVideoAsset:
-		s := proto.Size(x.YoutubeVideoAsset)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Asset_MediaBundleAsset:
-		s := proto.Size(x.MediaBundleAsset)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Asset_ImageAsset:
-		s := proto.Size(x.ImageAsset)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Asset_TextAsset:
-		s := proto.Size(x.TextAsset)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*Asset)(nil), "google.ads.googleads.v1.resources.Asset")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/asset.proto", fileDescriptor_asset_06e147e85df80ec5)
+	proto.RegisterFile("google/ads/googleads/v1/resources/asset.proto", fileDescriptor_6b8d91af9b64a99d)
 }
 
-var fileDescriptor_asset_06e147e85df80ec5 = []byte{
+var fileDescriptor_6b8d91af9b64a99d = []byte{
 	// 508 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xc1, 0x6e, 0xd3, 0x30,
 	0x18, 0xc7, 0x49, 0xd6, 0x0d, 0xe6, 0x0d, 0x04, 0xe6, 0x52, 0x8d, 0x09, 0x75, 0xa0, 0x49, 0x05,
diff --git a/googleapis/ads/googleads/v1/resources/bidding_strategy.pb.go b/googleapis/ads/googleads/v1/resources/bidding_strategy.pb.go
index 3b70fa9cfb..0de974eff9 100644
--- a/googleapis/ads/googleads/v1/resources/bidding_strategy.pb.go
+++ b/googleapis/ads/googleads/v1/resources/bidding_strategy.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/bidding_strategy.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A bidding strategy.
 type BiddingStrategy struct {
@@ -76,16 +79,17 @@ func (m *BiddingStrategy) Reset()         { *m = BiddingStrategy{} }
 func (m *BiddingStrategy) String() string { return proto.CompactTextString(m) }
 func (*BiddingStrategy) ProtoMessage()    {}
 func (*BiddingStrategy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_c7e03cac8ed0390b, []int{0}
+	return fileDescriptor_45db3d8386a3943d, []int{0}
 }
+
 func (m *BiddingStrategy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BiddingStrategy.Unmarshal(m, b)
 }
 func (m *BiddingStrategy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BiddingStrategy.Marshal(b, m, deterministic)
 }
-func (dst *BiddingStrategy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BiddingStrategy.Merge(dst, src)
+func (m *BiddingStrategy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BiddingStrategy.Merge(m, src)
 }
 func (m *BiddingStrategy) XXX_Size() int {
 	return xxx_messageInfo_BiddingStrategy.Size(m)
@@ -247,9 +251,9 @@ func (m *BiddingStrategy) GetTargetSpend() *common.TargetSpend {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BiddingStrategy) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BiddingStrategy_OneofMarshaler, _BiddingStrategy_OneofUnmarshaler, _BiddingStrategy_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BiddingStrategy) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BiddingStrategy_EnhancedCpc)(nil),
 		(*BiddingStrategy_PageOnePromoted)(nil),
 		(*BiddingStrategy_TargetCpa)(nil),
@@ -260,171 +264,15 @@ func (*BiddingStrategy) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffe
 	}
 }
 
-func _BiddingStrategy_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BiddingStrategy)
-	// scheme
-	switch x := m.Scheme.(type) {
-	case *BiddingStrategy_EnhancedCpc:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EnhancedCpc); err != nil {
-			return err
-		}
-	case *BiddingStrategy_PageOnePromoted:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PageOnePromoted); err != nil {
-			return err
-		}
-	case *BiddingStrategy_TargetCpa:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetCpa); err != nil {
-			return err
-		}
-	case *BiddingStrategy_TargetImpressionShare:
-		b.EncodeVarint(48<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetImpressionShare); err != nil {
-			return err
-		}
-	case *BiddingStrategy_TargetOutrankShare:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetOutrankShare); err != nil {
-			return err
-		}
-	case *BiddingStrategy_TargetRoas:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetRoas); err != nil {
-			return err
-		}
-	case *BiddingStrategy_TargetSpend:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetSpend); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BiddingStrategy.Scheme has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BiddingStrategy_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BiddingStrategy)
-	switch tag {
-	case 7: // scheme.enhanced_cpc
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.EnhancedCpc)
-		err := b.DecodeMessage(msg)
-		m.Scheme = &BiddingStrategy_EnhancedCpc{msg}
-		return true, err
-	case 8: // scheme.page_one_promoted
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PageOnePromoted)
-		err := b.DecodeMessage(msg)
-		m.Scheme = &BiddingStrategy_PageOnePromoted{msg}
-		return true, err
-	case 9: // scheme.target_cpa
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetCpa)
-		err := b.DecodeMessage(msg)
-		m.Scheme = &BiddingStrategy_TargetCpa{msg}
-		return true, err
-	case 48: // scheme.target_impression_share
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetImpressionShare)
-		err := b.DecodeMessage(msg)
-		m.Scheme = &BiddingStrategy_TargetImpressionShare{msg}
-		return true, err
-	case 10: // scheme.target_outrank_share
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetOutrankShare)
-		err := b.DecodeMessage(msg)
-		m.Scheme = &BiddingStrategy_TargetOutrankShare{msg}
-		return true, err
-	case 11: // scheme.target_roas
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetRoas)
-		err := b.DecodeMessage(msg)
-		m.Scheme = &BiddingStrategy_TargetRoas{msg}
-		return true, err
-	case 12: // scheme.target_spend
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetSpend)
-		err := b.DecodeMessage(msg)
-		m.Scheme = &BiddingStrategy_TargetSpend{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BiddingStrategy_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BiddingStrategy)
-	// scheme
-	switch x := m.Scheme.(type) {
-	case *BiddingStrategy_EnhancedCpc:
-		s := proto.Size(x.EnhancedCpc)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategy_PageOnePromoted:
-		s := proto.Size(x.PageOnePromoted)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategy_TargetCpa:
-		s := proto.Size(x.TargetCpa)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategy_TargetImpressionShare:
-		s := proto.Size(x.TargetImpressionShare)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategy_TargetOutrankShare:
-		s := proto.Size(x.TargetOutrankShare)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategy_TargetRoas:
-		s := proto.Size(x.TargetRoas)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategy_TargetSpend:
-		s := proto.Size(x.TargetSpend)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*BiddingStrategy)(nil), "google.ads.googleads.v1.resources.BiddingStrategy")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/bidding_strategy.proto", fileDescriptor_bidding_strategy_c7e03cac8ed0390b)
+	proto.RegisterFile("google/ads/googleads/v1/resources/bidding_strategy.proto", fileDescriptor_45db3d8386a3943d)
 }
 
-var fileDescriptor_bidding_strategy_c7e03cac8ed0390b = []byte{
+var fileDescriptor_45db3d8386a3943d = []byte{
 	// 693 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x95, 0xdd, 0x4e, 0xdb, 0x30,
 	0x14, 0xc7, 0xdb, 0xc2, 0x18, 0xb8, 0x7c, 0x68, 0x11, 0x13, 0x11, 0x43, 0x13, 0x6c, 0x42, 0x62,
diff --git a/googleapis/ads/googleads/v1/resources/billing_setup.pb.go b/googleapis/ads/googleads/v1/resources/billing_setup.pb.go
index f241e55fc5..7fd00cc371 100644
--- a/googleapis/ads/googleads/v1/resources/billing_setup.pb.go
+++ b/googleapis/ads/googleads/v1/resources/billing_setup.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/billing_setup.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A billing setup across Ads and Payments systems; an association between a
 // Payments account and an advertiser. A billing setup is specific to one
@@ -77,16 +80,17 @@ func (m *BillingSetup) Reset()         { *m = BillingSetup{} }
 func (m *BillingSetup) String() string { return proto.CompactTextString(m) }
 func (*BillingSetup) ProtoMessage()    {}
 func (*BillingSetup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_1af7eb39eb240777, []int{0}
+	return fileDescriptor_4372b9605c7b101a, []int{0}
 }
+
 func (m *BillingSetup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BillingSetup.Unmarshal(m, b)
 }
 func (m *BillingSetup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BillingSetup.Marshal(b, m, deterministic)
 }
-func (dst *BillingSetup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BillingSetup.Merge(dst, src)
+func (m *BillingSetup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BillingSetup.Merge(m, src)
 }
 func (m *BillingSetup) XXX_Size() int {
 	return xxx_messageInfo_BillingSetup.Size(m)
@@ -206,9 +210,9 @@ func (m *BillingSetup) GetEndTimeType() enums.TimeTypeEnum_TimeType {
 	return enums.TimeTypeEnum_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BillingSetup) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BillingSetup_OneofMarshaler, _BillingSetup_OneofUnmarshaler, _BillingSetup_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BillingSetup) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BillingSetup_StartDateTime)(nil),
 		(*BillingSetup_StartTimeType)(nil),
 		(*BillingSetup_EndDateTime)(nil),
@@ -216,110 +220,6 @@ func (*BillingSetup) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 	}
 }
 
-func _BillingSetup_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BillingSetup)
-	// start_time
-	switch x := m.StartTime.(type) {
-	case *BillingSetup_StartDateTime:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StartDateTime); err != nil {
-			return err
-		}
-	case *BillingSetup_StartTimeType:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.StartTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("BillingSetup.StartTime has unexpected type %T", x)
-	}
-	// end_time
-	switch x := m.EndTime.(type) {
-	case *BillingSetup_EndDateTime:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EndDateTime); err != nil {
-			return err
-		}
-	case *BillingSetup_EndTimeType:
-		b.EncodeVarint(14<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.EndTimeType))
-	case nil:
-	default:
-		return fmt.Errorf("BillingSetup.EndTime has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BillingSetup_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BillingSetup)
-	switch tag {
-	case 9: // start_time.start_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.StartTime = &BillingSetup_StartDateTime{msg}
-		return true, err
-	case 10: // start_time.start_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.StartTime = &BillingSetup_StartTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	case 13: // end_time.end_date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.EndTime = &BillingSetup_EndDateTime{msg}
-		return true, err
-	case 14: // end_time.end_time_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.EndTime = &BillingSetup_EndTimeType{enums.TimeTypeEnum_TimeType(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BillingSetup_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BillingSetup)
-	// start_time
-	switch x := m.StartTime.(type) {
-	case *BillingSetup_StartDateTime:
-		s := proto.Size(x.StartDateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BillingSetup_StartTimeType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.StartTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// end_time
-	switch x := m.EndTime.(type) {
-	case *BillingSetup_EndDateTime:
-		s := proto.Size(x.EndDateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BillingSetup_EndTimeType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.EndTimeType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Container of Payments account information for this billing.
 type BillingSetup_PaymentsAccountInfo struct {
 	// A 16 digit id used to identify the Payments account associated with the
@@ -353,16 +253,17 @@ func (m *BillingSetup_PaymentsAccountInfo) Reset()         { *m = BillingSetup_P
 func (m *BillingSetup_PaymentsAccountInfo) String() string { return proto.CompactTextString(m) }
 func (*BillingSetup_PaymentsAccountInfo) ProtoMessage()    {}
 func (*BillingSetup_PaymentsAccountInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_1af7eb39eb240777, []int{0, 0}
+	return fileDescriptor_4372b9605c7b101a, []int{0, 0}
 }
+
 func (m *BillingSetup_PaymentsAccountInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BillingSetup_PaymentsAccountInfo.Unmarshal(m, b)
 }
 func (m *BillingSetup_PaymentsAccountInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BillingSetup_PaymentsAccountInfo.Marshal(b, m, deterministic)
 }
-func (dst *BillingSetup_PaymentsAccountInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BillingSetup_PaymentsAccountInfo.Merge(dst, src)
+func (m *BillingSetup_PaymentsAccountInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BillingSetup_PaymentsAccountInfo.Merge(m, src)
 }
 func (m *BillingSetup_PaymentsAccountInfo) XXX_Size() int {
 	return xxx_messageInfo_BillingSetup_PaymentsAccountInfo.Size(m)
@@ -414,10 +315,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/billing_setup.proto", fileDescriptor_billing_setup_1af7eb39eb240777)
+	proto.RegisterFile("google/ads/googleads/v1/resources/billing_setup.proto", fileDescriptor_4372b9605c7b101a)
 }
 
-var fileDescriptor_billing_setup_1af7eb39eb240777 = []byte{
+var fileDescriptor_4372b9605c7b101a = []byte{
 	// 631 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0x80, 0x49, 0x0a, 0x13, 0xf3, 0xda, 0x8d, 0x65, 0x42, 0x8a, 0xca, 0x40, 0x1b, 0x68, 0xd2,
diff --git a/googleapis/ads/googleads/v1/resources/campaign.pb.go b/googleapis/ads/googleads/v1/resources/campaign.pb.go
index a8c5691149..5ac7f98ca9 100644
--- a/googleapis/ads/googleads/v1/resources/campaign.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A campaign.
 type Campaign struct {
@@ -154,16 +157,17 @@ func (m *Campaign) Reset()         { *m = Campaign{} }
 func (m *Campaign) String() string { return proto.CompactTextString(m) }
 func (*Campaign) ProtoMessage()    {}
 func (*Campaign) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0}
+	return fileDescriptor_27611d02f7286242, []int{0}
 }
+
 func (m *Campaign) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign.Unmarshal(m, b)
 }
 func (m *Campaign) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign.Marshal(b, m, deterministic)
 }
-func (dst *Campaign) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign.Merge(dst, src)
+func (m *Campaign) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign.Merge(m, src)
 }
 func (m *Campaign) XXX_Size() int {
 	return xxx_messageInfo_Campaign.Size(m)
@@ -571,9 +575,9 @@ func (m *Campaign) GetTargetCpm() *common.TargetCpm {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Campaign) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Campaign_OneofMarshaler, _Campaign_OneofUnmarshaler, _Campaign_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Campaign) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Campaign_BiddingStrategy)(nil),
 		(*Campaign_Commission)(nil),
 		(*Campaign_ManualCpc)(nil),
@@ -590,270 +594,6 @@ func (*Campaign) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _Campaign_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Campaign)
-	// campaign_bidding_strategy
-	switch x := m.CampaignBiddingStrategy.(type) {
-	case *Campaign_BiddingStrategy:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BiddingStrategy); err != nil {
-			return err
-		}
-	case *Campaign_Commission:
-		b.EncodeVarint(49<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Commission); err != nil {
-			return err
-		}
-	case *Campaign_ManualCpc:
-		b.EncodeVarint(24<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ManualCpc); err != nil {
-			return err
-		}
-	case *Campaign_ManualCpm:
-		b.EncodeVarint(25<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ManualCpm); err != nil {
-			return err
-		}
-	case *Campaign_ManualCpv:
-		b.EncodeVarint(37<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ManualCpv); err != nil {
-			return err
-		}
-	case *Campaign_MaximizeConversions:
-		b.EncodeVarint(30<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MaximizeConversions); err != nil {
-			return err
-		}
-	case *Campaign_MaximizeConversionValue:
-		b.EncodeVarint(31<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MaximizeConversionValue); err != nil {
-			return err
-		}
-	case *Campaign_TargetCpa:
-		b.EncodeVarint(26<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetCpa); err != nil {
-			return err
-		}
-	case *Campaign_TargetImpressionShare:
-		b.EncodeVarint(48<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetImpressionShare); err != nil {
-			return err
-		}
-	case *Campaign_TargetRoas:
-		b.EncodeVarint(29<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetRoas); err != nil {
-			return err
-		}
-	case *Campaign_TargetSpend:
-		b.EncodeVarint(27<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetSpend); err != nil {
-			return err
-		}
-	case *Campaign_PercentCpc:
-		b.EncodeVarint(34<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PercentCpc); err != nil {
-			return err
-		}
-	case *Campaign_TargetCpm:
-		b.EncodeVarint(41<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetCpm); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Campaign.CampaignBiddingStrategy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Campaign_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Campaign)
-	switch tag {
-	case 23: // campaign_bidding_strategy.bidding_strategy
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_BiddingStrategy{msg}
-		return true, err
-	case 49: // campaign_bidding_strategy.commission
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.Commission)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_Commission{msg}
-		return true, err
-	case 24: // campaign_bidding_strategy.manual_cpc
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ManualCpc)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_ManualCpc{msg}
-		return true, err
-	case 25: // campaign_bidding_strategy.manual_cpm
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ManualCpm)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_ManualCpm{msg}
-		return true, err
-	case 37: // campaign_bidding_strategy.manual_cpv
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ManualCpv)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_ManualCpv{msg}
-		return true, err
-	case 30: // campaign_bidding_strategy.maximize_conversions
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MaximizeConversions)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_MaximizeConversions{msg}
-		return true, err
-	case 31: // campaign_bidding_strategy.maximize_conversion_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MaximizeConversionValue)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_MaximizeConversionValue{msg}
-		return true, err
-	case 26: // campaign_bidding_strategy.target_cpa
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetCpa)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_TargetCpa{msg}
-		return true, err
-	case 48: // campaign_bidding_strategy.target_impression_share
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetImpressionShare)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_TargetImpressionShare{msg}
-		return true, err
-	case 29: // campaign_bidding_strategy.target_roas
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetRoas)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_TargetRoas{msg}
-		return true, err
-	case 27: // campaign_bidding_strategy.target_spend
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetSpend)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_TargetSpend{msg}
-		return true, err
-	case 34: // campaign_bidding_strategy.percent_cpc
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PercentCpc)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_PercentCpc{msg}
-		return true, err
-	case 41: // campaign_bidding_strategy.target_cpm
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TargetCpm)
-		err := b.DecodeMessage(msg)
-		m.CampaignBiddingStrategy = &Campaign_TargetCpm{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Campaign_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Campaign)
-	// campaign_bidding_strategy
-	switch x := m.CampaignBiddingStrategy.(type) {
-	case *Campaign_BiddingStrategy:
-		s := proto.Size(x.BiddingStrategy)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_Commission:
-		s := proto.Size(x.Commission)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_ManualCpc:
-		s := proto.Size(x.ManualCpc)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_ManualCpm:
-		s := proto.Size(x.ManualCpm)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_ManualCpv:
-		s := proto.Size(x.ManualCpv)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_MaximizeConversions:
-		s := proto.Size(x.MaximizeConversions)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_MaximizeConversionValue:
-		s := proto.Size(x.MaximizeConversionValue)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_TargetCpa:
-		s := proto.Size(x.TargetCpa)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_TargetImpressionShare:
-		s := proto.Size(x.TargetImpressionShare)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_TargetRoas:
-		s := proto.Size(x.TargetRoas)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_TargetSpend:
-		s := proto.Size(x.TargetSpend)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_PercentCpc:
-		s := proto.Size(x.PercentCpc)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Campaign_TargetCpm:
-		s := proto.Size(x.TargetCpm)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The network settings for the campaign.
 type Campaign_NetworkSettings struct {
 	// Whether ads will be served with google.com search results.
@@ -876,16 +616,17 @@ func (m *Campaign_NetworkSettings) Reset()         { *m = Campaign_NetworkSettin
 func (m *Campaign_NetworkSettings) String() string { return proto.CompactTextString(m) }
 func (*Campaign_NetworkSettings) ProtoMessage()    {}
 func (*Campaign_NetworkSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 0}
+	return fileDescriptor_27611d02f7286242, []int{0, 0}
 }
+
 func (m *Campaign_NetworkSettings) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_NetworkSettings.Unmarshal(m, b)
 }
 func (m *Campaign_NetworkSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_NetworkSettings.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_NetworkSettings) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_NetworkSettings.Merge(dst, src)
+func (m *Campaign_NetworkSettings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_NetworkSettings.Merge(m, src)
 }
 func (m *Campaign_NetworkSettings) XXX_Size() int {
 	return xxx_messageInfo_Campaign_NetworkSettings.Size(m)
@@ -937,16 +678,17 @@ func (m *Campaign_HotelSettingInfo) Reset()         { *m = Campaign_HotelSetting
 func (m *Campaign_HotelSettingInfo) String() string { return proto.CompactTextString(m) }
 func (*Campaign_HotelSettingInfo) ProtoMessage()    {}
 func (*Campaign_HotelSettingInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 1}
+	return fileDescriptor_27611d02f7286242, []int{0, 1}
 }
+
 func (m *Campaign_HotelSettingInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_HotelSettingInfo.Unmarshal(m, b)
 }
 func (m *Campaign_HotelSettingInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_HotelSettingInfo.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_HotelSettingInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_HotelSettingInfo.Merge(dst, src)
+func (m *Campaign_HotelSettingInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_HotelSettingInfo.Merge(m, src)
 }
 func (m *Campaign_HotelSettingInfo) XXX_Size() int {
 	return xxx_messageInfo_Campaign_HotelSettingInfo.Size(m)
@@ -984,16 +726,17 @@ func (m *Campaign_DynamicSearchAdsSetting) Reset()         { *m = Campaign_Dynam
 func (m *Campaign_DynamicSearchAdsSetting) String() string { return proto.CompactTextString(m) }
 func (*Campaign_DynamicSearchAdsSetting) ProtoMessage()    {}
 func (*Campaign_DynamicSearchAdsSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 2}
+	return fileDescriptor_27611d02f7286242, []int{0, 2}
 }
+
 func (m *Campaign_DynamicSearchAdsSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_DynamicSearchAdsSetting.Unmarshal(m, b)
 }
 func (m *Campaign_DynamicSearchAdsSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_DynamicSearchAdsSetting.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_DynamicSearchAdsSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_DynamicSearchAdsSetting.Merge(dst, src)
+func (m *Campaign_DynamicSearchAdsSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_DynamicSearchAdsSetting.Merge(m, src)
 }
 func (m *Campaign_DynamicSearchAdsSetting) XXX_Size() int {
 	return xxx_messageInfo_Campaign_DynamicSearchAdsSetting.Size(m)
@@ -1045,16 +788,17 @@ func (m *Campaign_TrackingSetting) Reset()         { *m = Campaign_TrackingSetti
 func (m *Campaign_TrackingSetting) String() string { return proto.CompactTextString(m) }
 func (*Campaign_TrackingSetting) ProtoMessage()    {}
 func (*Campaign_TrackingSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 3}
+	return fileDescriptor_27611d02f7286242, []int{0, 3}
 }
+
 func (m *Campaign_TrackingSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_TrackingSetting.Unmarshal(m, b)
 }
 func (m *Campaign_TrackingSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_TrackingSetting.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_TrackingSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_TrackingSetting.Merge(dst, src)
+func (m *Campaign_TrackingSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_TrackingSetting.Merge(m, src)
 }
 func (m *Campaign_TrackingSetting) XXX_Size() int {
 	return xxx_messageInfo_Campaign_TrackingSetting.Size(m)
@@ -1087,16 +831,17 @@ func (m *Campaign_GeoTargetTypeSetting) Reset()         { *m = Campaign_GeoTarge
 func (m *Campaign_GeoTargetTypeSetting) String() string { return proto.CompactTextString(m) }
 func (*Campaign_GeoTargetTypeSetting) ProtoMessage()    {}
 func (*Campaign_GeoTargetTypeSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 4}
+	return fileDescriptor_27611d02f7286242, []int{0, 4}
 }
+
 func (m *Campaign_GeoTargetTypeSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_GeoTargetTypeSetting.Unmarshal(m, b)
 }
 func (m *Campaign_GeoTargetTypeSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_GeoTargetTypeSetting.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_GeoTargetTypeSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_GeoTargetTypeSetting.Merge(dst, src)
+func (m *Campaign_GeoTargetTypeSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_GeoTargetTypeSetting.Merge(m, src)
 }
 func (m *Campaign_GeoTargetTypeSetting) XXX_Size() int {
 	return xxx_messageInfo_Campaign_GeoTargetTypeSetting.Size(m)
@@ -1135,16 +880,17 @@ func (m *Campaign_SelectiveOptimization) Reset()         { *m = Campaign_Selecti
 func (m *Campaign_SelectiveOptimization) String() string { return proto.CompactTextString(m) }
 func (*Campaign_SelectiveOptimization) ProtoMessage()    {}
 func (*Campaign_SelectiveOptimization) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 5}
+	return fileDescriptor_27611d02f7286242, []int{0, 5}
 }
+
 func (m *Campaign_SelectiveOptimization) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_SelectiveOptimization.Unmarshal(m, b)
 }
 func (m *Campaign_SelectiveOptimization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_SelectiveOptimization.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_SelectiveOptimization) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_SelectiveOptimization.Merge(dst, src)
+func (m *Campaign_SelectiveOptimization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_SelectiveOptimization.Merge(m, src)
 }
 func (m *Campaign_SelectiveOptimization) XXX_Size() int {
 	return xxx_messageInfo_Campaign_SelectiveOptimization.Size(m)
@@ -1193,16 +939,17 @@ func (m *Campaign_ShoppingSetting) Reset()         { *m = Campaign_ShoppingSetti
 func (m *Campaign_ShoppingSetting) String() string { return proto.CompactTextString(m) }
 func (*Campaign_ShoppingSetting) ProtoMessage()    {}
 func (*Campaign_ShoppingSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 6}
+	return fileDescriptor_27611d02f7286242, []int{0, 6}
 }
+
 func (m *Campaign_ShoppingSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_ShoppingSetting.Unmarshal(m, b)
 }
 func (m *Campaign_ShoppingSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_ShoppingSetting.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_ShoppingSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_ShoppingSetting.Merge(dst, src)
+func (m *Campaign_ShoppingSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_ShoppingSetting.Merge(m, src)
 }
 func (m *Campaign_ShoppingSetting) XXX_Size() int {
 	return xxx_messageInfo_Campaign_ShoppingSetting.Size(m)
@@ -1259,16 +1006,17 @@ func (m *Campaign_AppCampaignSetting) Reset()         { *m = Campaign_AppCampaig
 func (m *Campaign_AppCampaignSetting) String() string { return proto.CompactTextString(m) }
 func (*Campaign_AppCampaignSetting) ProtoMessage()    {}
 func (*Campaign_AppCampaignSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 7}
+	return fileDescriptor_27611d02f7286242, []int{0, 7}
 }
+
 func (m *Campaign_AppCampaignSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_AppCampaignSetting.Unmarshal(m, b)
 }
 func (m *Campaign_AppCampaignSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_AppCampaignSetting.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_AppCampaignSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_AppCampaignSetting.Merge(dst, src)
+func (m *Campaign_AppCampaignSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_AppCampaignSetting.Merge(m, src)
 }
 func (m *Campaign_AppCampaignSetting) XXX_Size() int {
 	return xxx_messageInfo_Campaign_AppCampaignSetting.Size(m)
@@ -1316,16 +1064,17 @@ func (m *Campaign_VanityPharma) Reset()         { *m = Campaign_VanityPharma{} }
 func (m *Campaign_VanityPharma) String() string { return proto.CompactTextString(m) }
 func (*Campaign_VanityPharma) ProtoMessage()    {}
 func (*Campaign_VanityPharma) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_159b92ef9ae7a828, []int{0, 8}
+	return fileDescriptor_27611d02f7286242, []int{0, 8}
 }
+
 func (m *Campaign_VanityPharma) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Campaign_VanityPharma.Unmarshal(m, b)
 }
 func (m *Campaign_VanityPharma) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Campaign_VanityPharma.Marshal(b, m, deterministic)
 }
-func (dst *Campaign_VanityPharma) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Campaign_VanityPharma.Merge(dst, src)
+func (m *Campaign_VanityPharma) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Campaign_VanityPharma.Merge(m, src)
 }
 func (m *Campaign_VanityPharma) XXX_Size() int {
 	return xxx_messageInfo_Campaign_VanityPharma.Size(m)
@@ -1364,10 +1113,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign.proto", fileDescriptor_campaign_159b92ef9ae7a828)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign.proto", fileDescriptor_27611d02f7286242)
 }
 
-var fileDescriptor_campaign_159b92ef9ae7a828 = []byte{
+var fileDescriptor_27611d02f7286242 = []byte{
 	// 2205 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x59, 0x5b, 0x93, 0xdb, 0xb6,
 	0x15, 0x5e, 0xc9, 0x97, 0xda, 0xd8, 0xab, 0xb1, 0x37, 0x5a, 0x76, 0x5c, 0x3b, 0xad, 0x5b, 0x27,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_audience_view.pb.go b/googleapis/ads/googleads/v1/resources/campaign_audience_view.pb.go
index a47c6bb8c6..44af10b44b 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_audience_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_audience_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_audience_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A campaign audience view.
 // Includes performance data from interests and remarketing lists for Display
@@ -40,16 +43,17 @@ func (m *CampaignAudienceView) Reset()         { *m = CampaignAudienceView{} }
 func (m *CampaignAudienceView) String() string { return proto.CompactTextString(m) }
 func (*CampaignAudienceView) ProtoMessage()    {}
 func (*CampaignAudienceView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_audience_view_0a728cd592b53255, []int{0}
+	return fileDescriptor_466ee4be4842c8d4, []int{0}
 }
+
 func (m *CampaignAudienceView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignAudienceView.Unmarshal(m, b)
 }
 func (m *CampaignAudienceView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignAudienceView.Marshal(b, m, deterministic)
 }
-func (dst *CampaignAudienceView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignAudienceView.Merge(dst, src)
+func (m *CampaignAudienceView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignAudienceView.Merge(m, src)
 }
 func (m *CampaignAudienceView) XXX_Size() int {
 	return xxx_messageInfo_CampaignAudienceView.Size(m)
@@ -72,10 +76,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_audience_view.proto", fileDescriptor_campaign_audience_view_0a728cd592b53255)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_audience_view.proto", fileDescriptor_466ee4be4842c8d4)
 }
 
-var fileDescriptor_campaign_audience_view_0a728cd592b53255 = []byte{
+var fileDescriptor_466ee4be4842c8d4 = []byte{
 	// 276 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x4a, 0xc4, 0x30,
 	0x14, 0xc6, 0x99, 0x0a, 0x82, 0x45, 0x37, 0x83, 0x0b, 0x15, 0x17, 0x8e, 0x32, 0xe0, 0x2a, 0xa1,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_bid_modifier.pb.go b/googleapis/ads/googleads/v1/resources/campaign_bid_modifier.pb.go
index 4a8beed805..b2bb1cafb2 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_bid_modifier.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_bid_modifier.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_bid_modifier.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a bid-modifiable only criterion at the campaign level.
 type CampaignBidModifier struct {
@@ -50,16 +53,17 @@ func (m *CampaignBidModifier) Reset()         { *m = CampaignBidModifier{} }
 func (m *CampaignBidModifier) String() string { return proto.CompactTextString(m) }
 func (*CampaignBidModifier) ProtoMessage()    {}
 func (*CampaignBidModifier) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_bid_modifier_22909370b669e990, []int{0}
+	return fileDescriptor_c88d20810b244847, []int{0}
 }
+
 func (m *CampaignBidModifier) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignBidModifier.Unmarshal(m, b)
 }
 func (m *CampaignBidModifier) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignBidModifier.Marshal(b, m, deterministic)
 }
-func (dst *CampaignBidModifier) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignBidModifier.Merge(dst, src)
+func (m *CampaignBidModifier) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignBidModifier.Merge(m, src)
 }
 func (m *CampaignBidModifier) XXX_Size() int {
 	return xxx_messageInfo_CampaignBidModifier.Size(m)
@@ -122,70 +126,22 @@ func (m *CampaignBidModifier) GetInteractionType() *common.InteractionTypeInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignBidModifier) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignBidModifier_OneofMarshaler, _CampaignBidModifier_OneofUnmarshaler, _CampaignBidModifier_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignBidModifier) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignBidModifier_InteractionType)(nil),
 	}
 }
 
-func _CampaignBidModifier_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignBidModifier)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *CampaignBidModifier_InteractionType:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InteractionType); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CampaignBidModifier.Criterion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignBidModifier_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignBidModifier)
-	switch tag {
-	case 5: // criterion.interaction_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.InteractionTypeInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignBidModifier_InteractionType{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignBidModifier_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignBidModifier)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *CampaignBidModifier_InteractionType:
-		s := proto.Size(x.InteractionType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*CampaignBidModifier)(nil), "google.ads.googleads.v1.resources.CampaignBidModifier")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_bid_modifier.proto", fileDescriptor_campaign_bid_modifier_22909370b669e990)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_bid_modifier.proto", fileDescriptor_c88d20810b244847)
 }
 
-var fileDescriptor_campaign_bid_modifier_22909370b669e990 = []byte{
+var fileDescriptor_c88d20810b244847 = []byte{
 	// 440 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xdd, 0x8a, 0xd4, 0x30,
 	0x14, 0x76, 0xba, 0x2a, 0x6e, 0x66, 0x44, 0xa9, 0x37, 0x65, 0x5d, 0x64, 0x57, 0x59, 0xd8, 0x1b,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_budget.pb.go b/googleapis/ads/googleads/v1/resources/campaign_budget.pb.go
index 32894c24b5..85ce7051b3 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_budget.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_budget.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_budget.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A campaign budget.
 type CampaignBudget struct {
@@ -122,16 +125,17 @@ func (m *CampaignBudget) Reset()         { *m = CampaignBudget{} }
 func (m *CampaignBudget) String() string { return proto.CompactTextString(m) }
 func (*CampaignBudget) ProtoMessage()    {}
 func (*CampaignBudget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_b018f8e27e2503ef, []int{0}
+	return fileDescriptor_ed30a48e8c388be6, []int{0}
 }
+
 func (m *CampaignBudget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignBudget.Unmarshal(m, b)
 }
 func (m *CampaignBudget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignBudget.Marshal(b, m, deterministic)
 }
-func (dst *CampaignBudget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignBudget.Merge(dst, src)
+func (m *CampaignBudget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignBudget.Merge(m, src)
 }
 func (m *CampaignBudget) XXX_Size() int {
 	return xxx_messageInfo_CampaignBudget.Size(m)
@@ -266,10 +270,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_budget.proto", fileDescriptor_campaign_budget_b018f8e27e2503ef)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_budget.proto", fileDescriptor_ed30a48e8c388be6)
 }
 
-var fileDescriptor_campaign_budget_b018f8e27e2503ef = []byte{
+var fileDescriptor_ed30a48e8c388be6 = []byte{
 	// 752 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x95, 0x5d, 0x6b, 0x2b, 0x45,
 	0x18, 0xc7, 0xd9, 0x9c, 0x5a, 0x3d, 0x73, 0xd2, 0xf4, 0x74, 0x8f, 0xc8, 0x52, 0x8f, 0x92, 0x2a,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_criterion.pb.go b/googleapis/ads/googleads/v1/resources/campaign_criterion.pb.go
index 4d7bac2e4a..42f3121ee8 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_criterion.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_criterion.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_criterion.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A campaign criterion.
 type CampaignCriterion struct {
@@ -84,16 +87,17 @@ func (m *CampaignCriterion) Reset()         { *m = CampaignCriterion{} }
 func (m *CampaignCriterion) String() string { return proto.CompactTextString(m) }
 func (*CampaignCriterion) ProtoMessage()    {}
 func (*CampaignCriterion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_f1511be1f9991413, []int{0}
+	return fileDescriptor_66974bcead75dadf, []int{0}
 }
+
 func (m *CampaignCriterion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignCriterion.Unmarshal(m, b)
 }
 func (m *CampaignCriterion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignCriterion.Marshal(b, m, deterministic)
 }
-func (dst *CampaignCriterion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignCriterion.Merge(dst, src)
+func (m *CampaignCriterion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignCriterion.Merge(m, src)
 }
 func (m *CampaignCriterion) XXX_Size() int {
 	return xxx_messageInfo_CampaignCriterion.Size(m)
@@ -495,9 +499,9 @@ func (m *CampaignCriterion) GetLocationGroup() *common.LocationGroupInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignCriterion_OneofMarshaler, _CampaignCriterion_OneofUnmarshaler, _CampaignCriterion_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignCriterion) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignCriterion_Keyword)(nil),
 		(*CampaignCriterion_Placement)(nil),
 		(*CampaignCriterion_MobileAppCategory)(nil),
@@ -527,513 +531,15 @@ func (*CampaignCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _CampaignCriterion_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *CampaignCriterion_Keyword:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Keyword); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Placement:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Placement); err != nil {
-			return err
-		}
-	case *CampaignCriterion_MobileAppCategory:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileAppCategory); err != nil {
-			return err
-		}
-	case *CampaignCriterion_MobileApplication:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileApplication); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Location:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Location); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Device:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Device); err != nil {
-			return err
-		}
-	case *CampaignCriterion_AdSchedule:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdSchedule); err != nil {
-			return err
-		}
-	case *CampaignCriterion_AgeRange:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AgeRange); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Gender:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Gender); err != nil {
-			return err
-		}
-	case *CampaignCriterion_IncomeRange:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.IncomeRange); err != nil {
-			return err
-		}
-	case *CampaignCriterion_ParentalStatus:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ParentalStatus); err != nil {
-			return err
-		}
-	case *CampaignCriterion_UserList:
-		b.EncodeVarint(22<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UserList); err != nil {
-			return err
-		}
-	case *CampaignCriterion_YoutubeVideo:
-		b.EncodeVarint(20<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeVideo); err != nil {
-			return err
-		}
-	case *CampaignCriterion_YoutubeChannel:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeChannel); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Proximity:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Proximity); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Topic:
-		b.EncodeVarint(24<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Topic); err != nil {
-			return err
-		}
-	case *CampaignCriterion_ListingScope:
-		b.EncodeVarint(25<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListingScope); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Language:
-		b.EncodeVarint(26<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Language); err != nil {
-			return err
-		}
-	case *CampaignCriterion_IpBlock:
-		b.EncodeVarint(27<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.IpBlock); err != nil {
-			return err
-		}
-	case *CampaignCriterion_ContentLabel:
-		b.EncodeVarint(28<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ContentLabel); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Carrier:
-		b.EncodeVarint(29<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Carrier); err != nil {
-			return err
-		}
-	case *CampaignCriterion_UserInterest:
-		b.EncodeVarint(30<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UserInterest); err != nil {
-			return err
-		}
-	case *CampaignCriterion_Webpage:
-		b.EncodeVarint(31<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Webpage); err != nil {
-			return err
-		}
-	case *CampaignCriterion_OperatingSystemVersion:
-		b.EncodeVarint(32<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OperatingSystemVersion); err != nil {
-			return err
-		}
-	case *CampaignCriterion_MobileDevice:
-		b.EncodeVarint(33<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileDevice); err != nil {
-			return err
-		}
-	case *CampaignCriterion_LocationGroup:
-		b.EncodeVarint(34<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LocationGroup); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CampaignCriterion.Criterion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignCriterion_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignCriterion)
-	switch tag {
-	case 8: // criterion.keyword
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.KeywordInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Keyword{msg}
-		return true, err
-	case 9: // criterion.placement
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PlacementInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Placement{msg}
-		return true, err
-	case 10: // criterion.mobile_app_category
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileAppCategoryInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_MobileAppCategory{msg}
-		return true, err
-	case 11: // criterion.mobile_application
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileApplicationInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_MobileApplication{msg}
-		return true, err
-	case 12: // criterion.location
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.LocationInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Location{msg}
-		return true, err
-	case 13: // criterion.device
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.DeviceInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Device{msg}
-		return true, err
-	case 15: // criterion.ad_schedule
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AdScheduleInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_AdSchedule{msg}
-		return true, err
-	case 16: // criterion.age_range
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AgeRangeInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_AgeRange{msg}
-		return true, err
-	case 17: // criterion.gender
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.GenderInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Gender{msg}
-		return true, err
-	case 18: // criterion.income_range
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.IncomeRangeInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_IncomeRange{msg}
-		return true, err
-	case 19: // criterion.parental_status
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ParentalStatusInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_ParentalStatus{msg}
-		return true, err
-	case 22: // criterion.user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.UserListInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_UserList{msg}
-		return true, err
-	case 20: // criterion.youtube_video
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeVideoInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_YoutubeVideo{msg}
-		return true, err
-	case 21: // criterion.youtube_channel
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeChannelInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_YoutubeChannel{msg}
-		return true, err
-	case 23: // criterion.proximity
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ProximityInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Proximity{msg}
-		return true, err
-	case 24: // criterion.topic
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TopicInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Topic{msg}
-		return true, err
-	case 25: // criterion.listing_scope
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ListingScopeInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_ListingScope{msg}
-		return true, err
-	case 26: // criterion.language
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.LanguageInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Language{msg}
-		return true, err
-	case 27: // criterion.ip_block
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.IpBlockInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_IpBlock{msg}
-		return true, err
-	case 28: // criterion.content_label
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ContentLabelInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_ContentLabel{msg}
-		return true, err
-	case 29: // criterion.carrier
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CarrierInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Carrier{msg}
-		return true, err
-	case 30: // criterion.user_interest
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.UserInterestInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_UserInterest{msg}
-		return true, err
-	case 31: // criterion.webpage
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.WebpageInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_Webpage{msg}
-		return true, err
-	case 32: // criterion.operating_system_version
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.OperatingSystemVersionInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_OperatingSystemVersion{msg}
-		return true, err
-	case 33: // criterion.mobile_device
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileDeviceInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_MobileDevice{msg}
-		return true, err
-	case 34: // criterion.location_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.LocationGroupInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CampaignCriterion_LocationGroup{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignCriterion_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *CampaignCriterion_Keyword:
-		s := proto.Size(x.Keyword)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Placement:
-		s := proto.Size(x.Placement)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_MobileAppCategory:
-		s := proto.Size(x.MobileAppCategory)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_MobileApplication:
-		s := proto.Size(x.MobileApplication)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Location:
-		s := proto.Size(x.Location)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Device:
-		s := proto.Size(x.Device)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_AdSchedule:
-		s := proto.Size(x.AdSchedule)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_AgeRange:
-		s := proto.Size(x.AgeRange)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Gender:
-		s := proto.Size(x.Gender)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_IncomeRange:
-		s := proto.Size(x.IncomeRange)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_ParentalStatus:
-		s := proto.Size(x.ParentalStatus)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_UserList:
-		s := proto.Size(x.UserList)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_YoutubeVideo:
-		s := proto.Size(x.YoutubeVideo)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_YoutubeChannel:
-		s := proto.Size(x.YoutubeChannel)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Proximity:
-		s := proto.Size(x.Proximity)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Topic:
-		s := proto.Size(x.Topic)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_ListingScope:
-		s := proto.Size(x.ListingScope)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Language:
-		s := proto.Size(x.Language)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_IpBlock:
-		s := proto.Size(x.IpBlock)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_ContentLabel:
-		s := proto.Size(x.ContentLabel)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Carrier:
-		s := proto.Size(x.Carrier)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_UserInterest:
-		s := proto.Size(x.UserInterest)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_Webpage:
-		s := proto.Size(x.Webpage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_OperatingSystemVersion:
-		s := proto.Size(x.OperatingSystemVersion)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_MobileDevice:
-		s := proto.Size(x.MobileDevice)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterion_LocationGroup:
-		s := proto.Size(x.LocationGroup)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*CampaignCriterion)(nil), "google.ads.googleads.v1.resources.CampaignCriterion")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_criterion.proto", fileDescriptor_campaign_criterion_f1511be1f9991413)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_criterion.proto", fileDescriptor_66974bcead75dadf)
 }
 
-var fileDescriptor_campaign_criterion_f1511be1f9991413 = []byte{
+var fileDescriptor_66974bcead75dadf = []byte{
 	// 1084 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x96, 0xdf, 0x72, 0xdc, 0x34,
 	0x17, 0xc0, 0xbf, 0xe4, 0x6b, 0xd3, 0x8d, 0x76, 0x93, 0x12, 0xb5, 0x04, 0x91, 0x86, 0x92, 0x94,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_criterion_simulation.pb.go b/googleapis/ads/googleads/v1/resources/campaign_criterion_simulation.pb.go
index af9a41e542..447fc8402d 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_criterion_simulation.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_criterion_simulation.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_criterion_simulation.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A campaign criterion simulation. Supported combinations of advertising
 // channel type, criterion ids, simulation type and simulation modification
@@ -61,16 +64,17 @@ func (m *CampaignCriterionSimulation) Reset()         { *m = CampaignCriterionSi
 func (m *CampaignCriterionSimulation) String() string { return proto.CompactTextString(m) }
 func (*CampaignCriterionSimulation) ProtoMessage()    {}
 func (*CampaignCriterionSimulation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_simulation_7330cdca86aa0af3, []int{0}
+	return fileDescriptor_4eae0e5c50ed969c, []int{0}
 }
+
 func (m *CampaignCriterionSimulation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignCriterionSimulation.Unmarshal(m, b)
 }
 func (m *CampaignCriterionSimulation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignCriterionSimulation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignCriterionSimulation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignCriterionSimulation.Merge(dst, src)
+func (m *CampaignCriterionSimulation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignCriterionSimulation.Merge(m, src)
 }
 func (m *CampaignCriterionSimulation) XXX_Size() int {
 	return xxx_messageInfo_CampaignCriterionSimulation.Size(m)
@@ -154,70 +158,22 @@ func (m *CampaignCriterionSimulation) GetBidModifierPointList() *common.BidModif
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignCriterionSimulation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignCriterionSimulation_OneofMarshaler, _CampaignCriterionSimulation_OneofUnmarshaler, _CampaignCriterionSimulation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignCriterionSimulation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignCriterionSimulation_BidModifierPointList)(nil),
 	}
 }
 
-func _CampaignCriterionSimulation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignCriterionSimulation)
-	// point_list
-	switch x := m.PointList.(type) {
-	case *CampaignCriterionSimulation_BidModifierPointList:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BidModifierPointList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CampaignCriterionSimulation.PointList has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignCriterionSimulation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignCriterionSimulation)
-	switch tag {
-	case 8: // point_list.bid_modifier_point_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.BidModifierSimulationPointList)
-		err := b.DecodeMessage(msg)
-		m.PointList = &CampaignCriterionSimulation_BidModifierPointList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignCriterionSimulation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignCriterionSimulation)
-	// point_list
-	switch x := m.PointList.(type) {
-	case *CampaignCriterionSimulation_BidModifierPointList:
-		s := proto.Size(x.BidModifierPointList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*CampaignCriterionSimulation)(nil), "google.ads.googleads.v1.resources.CampaignCriterionSimulation")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_criterion_simulation.proto", fileDescriptor_campaign_criterion_simulation_7330cdca86aa0af3)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_criterion_simulation.proto", fileDescriptor_4eae0e5c50ed969c)
 }
 
-var fileDescriptor_campaign_criterion_simulation_7330cdca86aa0af3 = []byte{
+var fileDescriptor_4eae0e5c50ed969c = []byte{
 	// 556 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdf, 0x6a, 0xdb, 0x30,
 	0x14, 0xc6, 0xe7, 0xf4, 0xbf, 0x9a, 0xed, 0xc2, 0x1b, 0xcc, 0xb4, 0x65, 0xa4, 0x1b, 0x85, 0x5c,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_extension_setting.pb.go b/googleapis/ads/googleads/v1/resources/campaign_extension_setting.pb.go
index efe8e4884e..8280b73bd4 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_extension_setting.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_extension_setting.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_extension_setting.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A campaign extension setting.
 type CampaignExtensionSetting struct {
@@ -53,16 +56,17 @@ func (m *CampaignExtensionSetting) Reset()         { *m = CampaignExtensionSetti
 func (m *CampaignExtensionSetting) String() string { return proto.CompactTextString(m) }
 func (*CampaignExtensionSetting) ProtoMessage()    {}
 func (*CampaignExtensionSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_extension_setting_b38dd0ac0ea02cbd, []int{0}
+	return fileDescriptor_be2f6987185b7cdc, []int{0}
 }
+
 func (m *CampaignExtensionSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignExtensionSetting.Unmarshal(m, b)
 }
 func (m *CampaignExtensionSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignExtensionSetting.Marshal(b, m, deterministic)
 }
-func (dst *CampaignExtensionSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignExtensionSetting.Merge(dst, src)
+func (m *CampaignExtensionSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignExtensionSetting.Merge(m, src)
 }
 func (m *CampaignExtensionSetting) XXX_Size() int {
 	return xxx_messageInfo_CampaignExtensionSetting.Size(m)
@@ -113,10 +117,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_extension_setting.proto", fileDescriptor_campaign_extension_setting_b38dd0ac0ea02cbd)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_extension_setting.proto", fileDescriptor_be2f6987185b7cdc)
 }
 
-var fileDescriptor_campaign_extension_setting_b38dd0ac0ea02cbd = []byte{
+var fileDescriptor_be2f6987185b7cdc = []byte{
 	// 445 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xd1, 0x6e, 0xd3, 0x30,
 	0x14, 0x55, 0x52, 0x98, 0x20, 0xb0, 0x3d, 0x44, 0x3c, 0x44, 0xd3, 0x40, 0x1d, 0x68, 0x52, 0x9f,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_feed.pb.go b/googleapis/ads/googleads/v1/resources/campaign_feed.pb.go
index 1767f5869c..cae971c4c8 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_feed.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_feed.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_feed.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A campaign feed.
 type CampaignFeed struct {
@@ -52,16 +55,17 @@ func (m *CampaignFeed) Reset()         { *m = CampaignFeed{} }
 func (m *CampaignFeed) String() string { return proto.CompactTextString(m) }
 func (*CampaignFeed) ProtoMessage()    {}
 func (*CampaignFeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_3a6668ca9a325d53, []int{0}
+	return fileDescriptor_10f784f3692d2150, []int{0}
 }
+
 func (m *CampaignFeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignFeed.Unmarshal(m, b)
 }
 func (m *CampaignFeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignFeed.Marshal(b, m, deterministic)
 }
-func (dst *CampaignFeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignFeed.Merge(dst, src)
+func (m *CampaignFeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignFeed.Merge(m, src)
 }
 func (m *CampaignFeed) XXX_Size() int {
 	return xxx_messageInfo_CampaignFeed.Size(m)
@@ -119,10 +123,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_feed.proto", fileDescriptor_campaign_feed_3a6668ca9a325d53)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_feed.proto", fileDescriptor_10f784f3692d2150)
 }
 
-var fileDescriptor_campaign_feed_3a6668ca9a325d53 = []byte{
+var fileDescriptor_10f784f3692d2150 = []byte{
 	// 485 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdd, 0x6a, 0xd4, 0x40,
 	0x14, 0xc7, 0xc9, 0x6e, 0x5d, 0x74, 0xac, 0xa5, 0x9b, 0xab, 0x50, 0x8a, 0x6c, 0x95, 0xc2, 0x5e,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_label.pb.go b/googleapis/ads/googleads/v1/resources/campaign_label.pb.go
index 5600ba0af5..8ed10475bf 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_label.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_label.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_label.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a relationship between a campaign and a label.
 type CampaignLabel struct {
@@ -39,16 +42,17 @@ func (m *CampaignLabel) Reset()         { *m = CampaignLabel{} }
 func (m *CampaignLabel) String() string { return proto.CompactTextString(m) }
 func (*CampaignLabel) ProtoMessage()    {}
 func (*CampaignLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_label_866cb6c3a9d00bde, []int{0}
+	return fileDescriptor_a1b047812890bf04, []int{0}
 }
+
 func (m *CampaignLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignLabel.Unmarshal(m, b)
 }
 func (m *CampaignLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignLabel.Marshal(b, m, deterministic)
 }
-func (dst *CampaignLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignLabel.Merge(dst, src)
+func (m *CampaignLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignLabel.Merge(m, src)
 }
 func (m *CampaignLabel) XXX_Size() int {
 	return xxx_messageInfo_CampaignLabel.Size(m)
@@ -85,10 +89,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_label.proto", fileDescriptor_campaign_label_866cb6c3a9d00bde)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_label.proto", fileDescriptor_a1b047812890bf04)
 }
 
-var fileDescriptor_campaign_label_866cb6c3a9d00bde = []byte{
+var fileDescriptor_a1b047812890bf04 = []byte{
 	// 323 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4a, 0xc3, 0x30,
 	0x1c, 0xc7, 0x69, 0x87, 0xa2, 0xd5, 0x5d, 0x7a, 0x1a, 0x63, 0xc8, 0xa6, 0x0c, 0x76, 0x4a, 0xe8,
diff --git a/googleapis/ads/googleads/v1/resources/campaign_shared_set.pb.go b/googleapis/ads/googleads/v1/resources/campaign_shared_set.pb.go
index 3421a44167..96c01ca805 100644
--- a/googleapis/ads/googleads/v1/resources/campaign_shared_set.pb.go
+++ b/googleapis/ads/googleads/v1/resources/campaign_shared_set.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/campaign_shared_set.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // CampaignSharedSets are used for managing the shared sets associated with a
 // campaign.
@@ -49,16 +52,17 @@ func (m *CampaignSharedSet) Reset()         { *m = CampaignSharedSet{} }
 func (m *CampaignSharedSet) String() string { return proto.CompactTextString(m) }
 func (*CampaignSharedSet) ProtoMessage()    {}
 func (*CampaignSharedSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_f9acec9356ea71cc, []int{0}
+	return fileDescriptor_5c77b63cdc30c4b2, []int{0}
 }
+
 func (m *CampaignSharedSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignSharedSet.Unmarshal(m, b)
 }
 func (m *CampaignSharedSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignSharedSet.Marshal(b, m, deterministic)
 }
-func (dst *CampaignSharedSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignSharedSet.Merge(dst, src)
+func (m *CampaignSharedSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignSharedSet.Merge(m, src)
 }
 func (m *CampaignSharedSet) XXX_Size() int {
 	return xxx_messageInfo_CampaignSharedSet.Size(m)
@@ -102,10 +106,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_shared_set.proto", fileDescriptor_campaign_shared_set_f9acec9356ea71cc)
+	proto.RegisterFile("google/ads/googleads/v1/resources/campaign_shared_set.proto", fileDescriptor_5c77b63cdc30c4b2)
 }
 
-var fileDescriptor_campaign_shared_set_f9acec9356ea71cc = []byte{
+var fileDescriptor_5c77b63cdc30c4b2 = []byte{
 	// 386 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x6a, 0xe3, 0x30,
 	0x18, 0xc4, 0xce, 0x12, 0x36, 0xda, 0x1f, 0x58, 0x1f, 0x16, 0x13, 0xc2, 0x92, 0x6c, 0x09, 0xe4,
diff --git a/googleapis/ads/googleads/v1/resources/carrier_constant.pb.go b/googleapis/ads/googleads/v1/resources/carrier_constant.pb.go
index f812048d01..bac6810d0d 100644
--- a/googleapis/ads/googleads/v1/resources/carrier_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/carrier_constant.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/carrier_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A carrier criterion that can be used in campaign targeting.
 type CarrierConstant struct {
@@ -43,16 +46,17 @@ func (m *CarrierConstant) Reset()         { *m = CarrierConstant{} }
 func (m *CarrierConstant) String() string { return proto.CompactTextString(m) }
 func (*CarrierConstant) ProtoMessage()    {}
 func (*CarrierConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_carrier_constant_55ed5152c85d3e1c, []int{0}
+	return fileDescriptor_6b8b1da6512447a4, []int{0}
 }
+
 func (m *CarrierConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CarrierConstant.Unmarshal(m, b)
 }
 func (m *CarrierConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CarrierConstant.Marshal(b, m, deterministic)
 }
-func (dst *CarrierConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CarrierConstant.Merge(dst, src)
+func (m *CarrierConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CarrierConstant.Merge(m, src)
 }
 func (m *CarrierConstant) XXX_Size() int {
 	return xxx_messageInfo_CarrierConstant.Size(m)
@@ -96,10 +100,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/carrier_constant.proto", fileDescriptor_carrier_constant_55ed5152c85d3e1c)
+	proto.RegisterFile("google/ads/googleads/v1/resources/carrier_constant.proto", fileDescriptor_6b8b1da6512447a4)
 }
 
-var fileDescriptor_carrier_constant_55ed5152c85d3e1c = []byte{
+var fileDescriptor_6b8b1da6512447a4 = []byte{
 	// 363 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4a, 0xeb, 0x40,
 	0x14, 0x86, 0x49, 0x5a, 0x2e, 0xdc, 0xb4, 0x97, 0x0b, 0xc1, 0x45, 0xa9, 0x45, 0x5a, 0xa5, 0x50,
diff --git a/googleapis/ads/googleads/v1/resources/change_status.pb.go b/googleapis/ads/googleads/v1/resources/change_status.pb.go
index 33f5fd83cb..c2a386d369 100644
--- a/googleapis/ads/googleads/v1/resources/change_status.pb.go
+++ b/googleapis/ads/googleads/v1/resources/change_status.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/change_status.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes the status of returned resource.
 type ChangeStatus struct {
@@ -65,16 +68,17 @@ func (m *ChangeStatus) Reset()         { *m = ChangeStatus{} }
 func (m *ChangeStatus) String() string { return proto.CompactTextString(m) }
 func (*ChangeStatus) ProtoMessage()    {}
 func (*ChangeStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_3c3999904ed1b9b4, []int{0}
+	return fileDescriptor_9a34c24bda75f035, []int{0}
 }
+
 func (m *ChangeStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChangeStatus.Unmarshal(m, b)
 }
 func (m *ChangeStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChangeStatus.Marshal(b, m, deterministic)
 }
-func (dst *ChangeStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChangeStatus.Merge(dst, src)
+func (m *ChangeStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeStatus.Merge(m, src)
 }
 func (m *ChangeStatus) XXX_Size() int {
 	return xxx_messageInfo_ChangeStatus.Size(m)
@@ -188,10 +192,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/change_status.proto", fileDescriptor_change_status_3c3999904ed1b9b4)
+	proto.RegisterFile("google/ads/googleads/v1/resources/change_status.proto", fileDescriptor_9a34c24bda75f035)
 }
 
-var fileDescriptor_change_status_3c3999904ed1b9b4 = []byte{
+var fileDescriptor_9a34c24bda75f035 = []byte{
 	// 603 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdd, 0x6a, 0xdb, 0x3e,
 	0x14, 0xc7, 0x6d, 0xff, 0xfd, 0x27, 0x4a, 0xd2, 0x0f, 0x41, 0xc1, 0x94, 0x32, 0xda, 0x8d, 0x42,
diff --git a/googleapis/ads/googleads/v1/resources/click_view.pb.go b/googleapis/ads/googleads/v1/resources/click_view.pb.go
index 3860715cb8..fc95c9b0b5 100644
--- a/googleapis/ads/googleads/v1/resources/click_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/click_view.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/click_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A click view with metrics aggregated at each click level, including both
 // valid and invalid clicks. For non-Search campaigns, metrics.clicks
@@ -49,16 +52,17 @@ func (m *ClickView) Reset()         { *m = ClickView{} }
 func (m *ClickView) String() string { return proto.CompactTextString(m) }
 func (*ClickView) ProtoMessage()    {}
 func (*ClickView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_click_view_e4e236f4d52695b3, []int{0}
+	return fileDescriptor_c61fa672950e615e, []int{0}
 }
+
 func (m *ClickView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClickView.Unmarshal(m, b)
 }
 func (m *ClickView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClickView.Marshal(b, m, deterministic)
 }
-func (dst *ClickView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClickView.Merge(dst, src)
+func (m *ClickView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClickView.Merge(m, src)
 }
 func (m *ClickView) XXX_Size() int {
 	return xxx_messageInfo_ClickView.Size(m)
@@ -109,10 +113,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/click_view.proto", fileDescriptor_click_view_e4e236f4d52695b3)
+	proto.RegisterFile("google/ads/googleads/v1/resources/click_view.proto", fileDescriptor_c61fa672950e615e)
 }
 
-var fileDescriptor_click_view_e4e236f4d52695b3 = []byte{
+var fileDescriptor_c61fa672950e615e = []byte{
 	// 429 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xdf, 0x6a, 0xd4, 0x40,
 	0x14, 0x87, 0x49, 0x6a, 0x85, 0x4e, 0xb5, 0x48, 0xf0, 0x22, 0xd4, 0x22, 0xad, 0x52, 0xe8, 0x8d,
diff --git a/googleapis/ads/googleads/v1/resources/conversion_action.pb.go b/googleapis/ads/googleads/v1/resources/conversion_action.pb.go
index 469bd7884b..b48e67bf7a 100644
--- a/googleapis/ads/googleads/v1/resources/conversion_action.pb.go
+++ b/googleapis/ads/googleads/v1/resources/conversion_action.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/conversion_action.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A conversion action.
 type ConversionAction struct {
@@ -79,16 +82,17 @@ func (m *ConversionAction) Reset()         { *m = ConversionAction{} }
 func (m *ConversionAction) String() string { return proto.CompactTextString(m) }
 func (*ConversionAction) ProtoMessage()    {}
 func (*ConversionAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_c6dc8f0fecb5b482, []int{0}
+	return fileDescriptor_c3f71f6866f7bfaf, []int{0}
 }
+
 func (m *ConversionAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAction.Unmarshal(m, b)
 }
 func (m *ConversionAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAction.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAction.Merge(dst, src)
+func (m *ConversionAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAction.Merge(m, src)
 }
 func (m *ConversionAction) XXX_Size() int {
 	return xxx_messageInfo_ConversionAction.Size(m)
@@ -229,16 +233,17 @@ func (m *ConversionAction_AttributionModelSettings) Reset() {
 func (m *ConversionAction_AttributionModelSettings) String() string { return proto.CompactTextString(m) }
 func (*ConversionAction_AttributionModelSettings) ProtoMessage()    {}
 func (*ConversionAction_AttributionModelSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_c6dc8f0fecb5b482, []int{0, 0}
+	return fileDescriptor_c3f71f6866f7bfaf, []int{0, 0}
 }
+
 func (m *ConversionAction_AttributionModelSettings) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAction_AttributionModelSettings.Unmarshal(m, b)
 }
 func (m *ConversionAction_AttributionModelSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAction_AttributionModelSettings.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAction_AttributionModelSettings) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAction_AttributionModelSettings.Merge(dst, src)
+func (m *ConversionAction_AttributionModelSettings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAction_AttributionModelSettings.Merge(m, src)
 }
 func (m *ConversionAction_AttributionModelSettings) XXX_Size() int {
 	return xxx_messageInfo_ConversionAction_AttributionModelSettings.Size(m)
@@ -287,16 +292,17 @@ func (m *ConversionAction_ValueSettings) Reset()         { *m = ConversionAction
 func (m *ConversionAction_ValueSettings) String() string { return proto.CompactTextString(m) }
 func (*ConversionAction_ValueSettings) ProtoMessage()    {}
 func (*ConversionAction_ValueSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_c6dc8f0fecb5b482, []int{0, 1}
+	return fileDescriptor_c3f71f6866f7bfaf, []int{0, 1}
 }
+
 func (m *ConversionAction_ValueSettings) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAction_ValueSettings.Unmarshal(m, b)
 }
 func (m *ConversionAction_ValueSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAction_ValueSettings.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAction_ValueSettings) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAction_ValueSettings.Merge(dst, src)
+func (m *ConversionAction_ValueSettings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAction_ValueSettings.Merge(m, src)
 }
 func (m *ConversionAction_ValueSettings) XXX_Size() int {
 	return xxx_messageInfo_ConversionAction_ValueSettings.Size(m)
@@ -335,10 +341,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/conversion_action.proto", fileDescriptor_conversion_action_c6dc8f0fecb5b482)
+	proto.RegisterFile("google/ads/googleads/v1/resources/conversion_action.proto", fileDescriptor_c3f71f6866f7bfaf)
 }
 
-var fileDescriptor_conversion_action_c6dc8f0fecb5b482 = []byte{
+var fileDescriptor_c3f71f6866f7bfaf = []byte{
 	// 971 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0x56, 0xd2, 0x6e, 0xd9, 0x9d, 0x26, 0xd9, 0x32, 0xa8, 0x92, 0x95, 0xfd, 0x51, 0xbb, 0x68,
diff --git a/googleapis/ads/googleads/v1/resources/custom_interest.pb.go b/googleapis/ads/googleads/v1/resources/custom_interest.pb.go
index 05abc7d41e..2ca344a040 100644
--- a/googleapis/ads/googleads/v1/resources/custom_interest.pb.go
+++ b/googleapis/ads/googleads/v1/resources/custom_interest.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/custom_interest.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A custom interest. This is a list of users by interest.
 type CustomInterest struct {
@@ -55,16 +58,17 @@ func (m *CustomInterest) Reset()         { *m = CustomInterest{} }
 func (m *CustomInterest) String() string { return proto.CompactTextString(m) }
 func (*CustomInterest) ProtoMessage()    {}
 func (*CustomInterest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_3c6adccc8a716e4f, []int{0}
+	return fileDescriptor_a831eeefd2f4541b, []int{0}
 }
+
 func (m *CustomInterest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInterest.Unmarshal(m, b)
 }
 func (m *CustomInterest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInterest.Marshal(b, m, deterministic)
 }
-func (dst *CustomInterest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInterest.Merge(dst, src)
+func (m *CustomInterest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInterest.Merge(m, src)
 }
 func (m *CustomInterest) XXX_Size() int {
 	return xxx_messageInfo_CustomInterest.Size(m)
@@ -141,16 +145,17 @@ func (m *CustomInterestMember) Reset()         { *m = CustomInterestMember{} }
 func (m *CustomInterestMember) String() string { return proto.CompactTextString(m) }
 func (*CustomInterestMember) ProtoMessage()    {}
 func (*CustomInterestMember) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_3c6adccc8a716e4f, []int{1}
+	return fileDescriptor_a831eeefd2f4541b, []int{1}
 }
+
 func (m *CustomInterestMember) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInterestMember.Unmarshal(m, b)
 }
 func (m *CustomInterestMember) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInterestMember.Marshal(b, m, deterministic)
 }
-func (dst *CustomInterestMember) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInterestMember.Merge(dst, src)
+func (m *CustomInterestMember) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInterestMember.Merge(m, src)
 }
 func (m *CustomInterestMember) XXX_Size() int {
 	return xxx_messageInfo_CustomInterestMember.Size(m)
@@ -181,10 +186,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/custom_interest.proto", fileDescriptor_custom_interest_3c6adccc8a716e4f)
+	proto.RegisterFile("google/ads/googleads/v1/resources/custom_interest.proto", fileDescriptor_a831eeefd2f4541b)
 }
 
-var fileDescriptor_custom_interest_3c6adccc8a716e4f = []byte{
+var fileDescriptor_a831eeefd2f4541b = []byte{
 	// 520 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xd1, 0x6e, 0xd3, 0x30,
 	0x14, 0x55, 0xd2, 0xd2, 0x69, 0x2e, 0xf4, 0xc1, 0xf0, 0x10, 0x8d, 0x09, 0x75, 0x43, 0x93, 0x2a,
diff --git a/googleapis/ads/googleads/v1/resources/customer.pb.go b/googleapis/ads/googleads/v1/resources/customer.pb.go
index f01a92bd3e..3e1d871767 100644
--- a/googleapis/ads/googleads/v1/resources/customer.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A customer.
 type Customer struct {
@@ -70,16 +73,17 @@ func (m *Customer) Reset()         { *m = Customer{} }
 func (m *Customer) String() string { return proto.CompactTextString(m) }
 func (*Customer) ProtoMessage()    {}
 func (*Customer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_df9b425a0de8248d, []int{0}
+	return fileDescriptor_3f95889c65daf179, []int{0}
 }
+
 func (m *Customer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Customer.Unmarshal(m, b)
 }
 func (m *Customer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Customer.Marshal(b, m, deterministic)
 }
-func (dst *Customer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Customer.Merge(dst, src)
+func (m *Customer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Customer.Merge(m, src)
 }
 func (m *Customer) XXX_Size() int {
 	return xxx_messageInfo_Customer.Size(m)
@@ -215,16 +219,17 @@ func (m *CallReportingSetting) Reset()         { *m = CallReportingSetting{} }
 func (m *CallReportingSetting) String() string { return proto.CompactTextString(m) }
 func (*CallReportingSetting) ProtoMessage()    {}
 func (*CallReportingSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_df9b425a0de8248d, []int{1}
+	return fileDescriptor_3f95889c65daf179, []int{1}
 }
+
 func (m *CallReportingSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallReportingSetting.Unmarshal(m, b)
 }
 func (m *CallReportingSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallReportingSetting.Marshal(b, m, deterministic)
 }
-func (dst *CallReportingSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallReportingSetting.Merge(dst, src)
+func (m *CallReportingSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallReportingSetting.Merge(m, src)
 }
 func (m *CallReportingSetting) XXX_Size() int {
 	return xxx_messageInfo_CallReportingSetting.Size(m)
@@ -277,16 +282,17 @@ func (m *ConversionTrackingSetting) Reset()         { *m = ConversionTrackingSet
 func (m *ConversionTrackingSetting) String() string { return proto.CompactTextString(m) }
 func (*ConversionTrackingSetting) ProtoMessage()    {}
 func (*ConversionTrackingSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_df9b425a0de8248d, []int{2}
+	return fileDescriptor_3f95889c65daf179, []int{2}
 }
+
 func (m *ConversionTrackingSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionTrackingSetting.Unmarshal(m, b)
 }
 func (m *ConversionTrackingSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionTrackingSetting.Marshal(b, m, deterministic)
 }
-func (dst *ConversionTrackingSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionTrackingSetting.Merge(dst, src)
+func (m *ConversionTrackingSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionTrackingSetting.Merge(m, src)
 }
 func (m *ConversionTrackingSetting) XXX_Size() int {
 	return xxx_messageInfo_ConversionTrackingSetting.Size(m)
@@ -324,16 +330,17 @@ func (m *RemarketingSetting) Reset()         { *m = RemarketingSetting{} }
 func (m *RemarketingSetting) String() string { return proto.CompactTextString(m) }
 func (*RemarketingSetting) ProtoMessage()    {}
 func (*RemarketingSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_df9b425a0de8248d, []int{3}
+	return fileDescriptor_3f95889c65daf179, []int{3}
 }
+
 func (m *RemarketingSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemarketingSetting.Unmarshal(m, b)
 }
 func (m *RemarketingSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemarketingSetting.Marshal(b, m, deterministic)
 }
-func (dst *RemarketingSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemarketingSetting.Merge(dst, src)
+func (m *RemarketingSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemarketingSetting.Merge(m, src)
 }
 func (m *RemarketingSetting) XXX_Size() int {
 	return xxx_messageInfo_RemarketingSetting.Size(m)
@@ -359,10 +366,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer.proto", fileDescriptor_customer_df9b425a0de8248d)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer.proto", fileDescriptor_3f95889c65daf179)
 }
 
-var fileDescriptor_customer_df9b425a0de8248d = []byte{
+var fileDescriptor_3f95889c65daf179 = []byte{
 	// 879 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x96, 0xdf, 0x6e, 0xe4, 0x34,
 	0x14, 0xc6, 0x95, 0x29, 0xec, 0xb6, 0xee, 0x9f, 0xad, 0xbc, 0xc3, 0x2a, 0xdb, 0x5d, 0xad, 0xda,
diff --git a/googleapis/ads/googleads/v1/resources/customer_client.pb.go b/googleapis/ads/googleads/v1/resources/customer_client.pb.go
index f6a2d6e116..ec9c03e44c 100644
--- a/googleapis/ads/googleads/v1/resources/customer_client.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer_client.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer_client.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A link between the given customer and a client customer. CustomerClients only
 // exist for manager customers. All direct and indirect client customers are
@@ -48,16 +51,17 @@ func (m *CustomerClient) Reset()         { *m = CustomerClient{} }
 func (m *CustomerClient) String() string { return proto.CompactTextString(m) }
 func (*CustomerClient) ProtoMessage()    {}
 func (*CustomerClient) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_509fb76a6f1ab219, []int{0}
+	return fileDescriptor_a1fcc371bcda99b7, []int{0}
 }
+
 func (m *CustomerClient) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerClient.Unmarshal(m, b)
 }
 func (m *CustomerClient) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerClient.Marshal(b, m, deterministic)
 }
-func (dst *CustomerClient) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerClient.Merge(dst, src)
+func (m *CustomerClient) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerClient.Merge(m, src)
 }
 func (m *CustomerClient) XXX_Size() int {
 	return xxx_messageInfo_CustomerClient.Size(m)
@@ -101,10 +105,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer_client.proto", fileDescriptor_customer_client_509fb76a6f1ab219)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer_client.proto", fileDescriptor_a1fcc371bcda99b7)
 }
 
-var fileDescriptor_customer_client_509fb76a6f1ab219 = []byte{
+var fileDescriptor_a1fcc371bcda99b7 = []byte{
 	// 364 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x41, 0x4b, 0xfb, 0x30,
 	0x00, 0xc5, 0x69, 0xf7, 0xdf, 0xe0, 0x5f, 0x75, 0x42, 0xbd, 0x94, 0x39, 0x64, 0x53, 0x06, 0x3b,
diff --git a/googleapis/ads/googleads/v1/resources/customer_client_link.pb.go b/googleapis/ads/googleads/v1/resources/customer_client_link.pb.go
index 46e9119b7a..a898e19c1e 100644
--- a/googleapis/ads/googleads/v1/resources/customer_client_link.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer_client_link.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer_client_link.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents customer client link relationship.
 type CustomerClientLink struct {
@@ -47,16 +50,17 @@ func (m *CustomerClientLink) Reset()         { *m = CustomerClientLink{} }
 func (m *CustomerClientLink) String() string { return proto.CompactTextString(m) }
 func (*CustomerClientLink) ProtoMessage()    {}
 func (*CustomerClientLink) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_282011011b313e4f, []int{0}
+	return fileDescriptor_1dba9317d3293f16, []int{0}
 }
+
 func (m *CustomerClientLink) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerClientLink.Unmarshal(m, b)
 }
 func (m *CustomerClientLink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerClientLink.Marshal(b, m, deterministic)
 }
-func (dst *CustomerClientLink) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerClientLink.Merge(dst, src)
+func (m *CustomerClientLink) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerClientLink.Merge(m, src)
 }
 func (m *CustomerClientLink) XXX_Size() int {
 	return xxx_messageInfo_CustomerClientLink.Size(m)
@@ -107,10 +111,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer_client_link.proto", fileDescriptor_customer_client_link_282011011b313e4f)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer_client_link.proto", fileDescriptor_1dba9317d3293f16)
 }
 
-var fileDescriptor_customer_client_link_282011011b313e4f = []byte{
+var fileDescriptor_1dba9317d3293f16 = []byte{
 	// 436 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xdd, 0x6a, 0x14, 0x31,
 	0x18, 0x65, 0xa6, 0xba, 0x60, 0xb4, 0x2d, 0xcc, 0x8d, 0xc3, 0x5a, 0x64, 0xab, 0x14, 0xf6, 0x2a,
diff --git a/googleapis/ads/googleads/v1/resources/customer_extension_setting.pb.go b/googleapis/ads/googleads/v1/resources/customer_extension_setting.pb.go
index 16a643c0a6..0ad9c8505e 100644
--- a/googleapis/ads/googleads/v1/resources/customer_extension_setting.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer_extension_setting.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer_extension_setting.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A customer extension setting.
 type CustomerExtensionSetting struct {
@@ -46,16 +49,17 @@ func (m *CustomerExtensionSetting) Reset()         { *m = CustomerExtensionSetti
 func (m *CustomerExtensionSetting) String() string { return proto.CompactTextString(m) }
 func (*CustomerExtensionSetting) ProtoMessage()    {}
 func (*CustomerExtensionSetting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_extension_setting_36805005c826cc7e, []int{0}
+	return fileDescriptor_125a90dbdb0cdd71, []int{0}
 }
+
 func (m *CustomerExtensionSetting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerExtensionSetting.Unmarshal(m, b)
 }
 func (m *CustomerExtensionSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerExtensionSetting.Marshal(b, m, deterministic)
 }
-func (dst *CustomerExtensionSetting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerExtensionSetting.Merge(dst, src)
+func (m *CustomerExtensionSetting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerExtensionSetting.Merge(m, src)
 }
 func (m *CustomerExtensionSetting) XXX_Size() int {
 	return xxx_messageInfo_CustomerExtensionSetting.Size(m)
@@ -99,10 +103,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer_extension_setting.proto", fileDescriptor_customer_extension_setting_36805005c826cc7e)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer_extension_setting.proto", fileDescriptor_125a90dbdb0cdd71)
 }
 
-var fileDescriptor_customer_extension_setting_36805005c826cc7e = []byte{
+var fileDescriptor_125a90dbdb0cdd71 = []byte{
 	// 431 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x6e, 0xd4, 0x30,
 	0x10, 0xd5, 0x66, 0x51, 0x25, 0x02, 0xed, 0x21, 0xe2, 0x10, 0x55, 0x05, 0x6d, 0x41, 0x95, 0xf6,
diff --git a/googleapis/ads/googleads/v1/resources/customer_feed.pb.go b/googleapis/ads/googleads/v1/resources/customer_feed.pb.go
index 9d7b2e7543..78f55d3ac6 100644
--- a/googleapis/ads/googleads/v1/resources/customer_feed.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer_feed.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer_feed.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A customer feed.
 type CustomerFeed struct {
@@ -50,16 +53,17 @@ func (m *CustomerFeed) Reset()         { *m = CustomerFeed{} }
 func (m *CustomerFeed) String() string { return proto.CompactTextString(m) }
 func (*CustomerFeed) ProtoMessage()    {}
 func (*CustomerFeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_eb3e39480bda33e3, []int{0}
+	return fileDescriptor_51bd0ae9893f1b0c, []int{0}
 }
+
 func (m *CustomerFeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerFeed.Unmarshal(m, b)
 }
 func (m *CustomerFeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerFeed.Marshal(b, m, deterministic)
 }
-func (dst *CustomerFeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerFeed.Merge(dst, src)
+func (m *CustomerFeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerFeed.Merge(m, src)
 }
 func (m *CustomerFeed) XXX_Size() int {
 	return xxx_messageInfo_CustomerFeed.Size(m)
@@ -110,10 +114,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer_feed.proto", fileDescriptor_customer_feed_eb3e39480bda33e3)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer_feed.proto", fileDescriptor_51bd0ae9893f1b0c)
 }
 
-var fileDescriptor_customer_feed_eb3e39480bda33e3 = []byte{
+var fileDescriptor_51bd0ae9893f1b0c = []byte{
 	// 473 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xdd, 0x6a, 0xd4, 0x40,
 	0x14, 0x26, 0xbb, 0xb5, 0x60, 0xac, 0xa5, 0x9b, 0xab, 0x50, 0x8a, 0x6c, 0x95, 0xc2, 0x5e, 0xcd,
diff --git a/googleapis/ads/googleads/v1/resources/customer_label.pb.go b/googleapis/ads/googleads/v1/resources/customer_label.pb.go
index 08c1b0931e..aea4b165d9 100644
--- a/googleapis/ads/googleads/v1/resources/customer_label.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer_label.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer_label.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a relationship between a customer and a label. This customer may
 // not have access to all the labels attached to it. Additional CustomerLabels
@@ -45,16 +48,17 @@ func (m *CustomerLabel) Reset()         { *m = CustomerLabel{} }
 func (m *CustomerLabel) String() string { return proto.CompactTextString(m) }
 func (*CustomerLabel) ProtoMessage()    {}
 func (*CustomerLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_label_992888de78627c4d, []int{0}
+	return fileDescriptor_85c963ece951af59, []int{0}
 }
+
 func (m *CustomerLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerLabel.Unmarshal(m, b)
 }
 func (m *CustomerLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerLabel.Marshal(b, m, deterministic)
 }
-func (dst *CustomerLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerLabel.Merge(dst, src)
+func (m *CustomerLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerLabel.Merge(m, src)
 }
 func (m *CustomerLabel) XXX_Size() int {
 	return xxx_messageInfo_CustomerLabel.Size(m)
@@ -91,10 +95,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer_label.proto", fileDescriptor_customer_label_992888de78627c4d)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer_label.proto", fileDescriptor_85c963ece951af59)
 }
 
-var fileDescriptor_customer_label_992888de78627c4d = []byte{
+var fileDescriptor_85c963ece951af59 = []byte{
 	// 322 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4a, 0xc3, 0x30,
 	0x00, 0xc6, 0x49, 0x87, 0xa2, 0xd1, 0x5d, 0x7a, 0x1a, 0x63, 0xc8, 0xa6, 0x0c, 0x76, 0x4a, 0xe8,
diff --git a/googleapis/ads/googleads/v1/resources/customer_manager_link.pb.go b/googleapis/ads/googleads/v1/resources/customer_manager_link.pb.go
index 0788734b02..7c874ef076 100644
--- a/googleapis/ads/googleads/v1/resources/customer_manager_link.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer_manager_link.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer_manager_link.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents customer-manager link relationship.
 type CustomerManagerLink struct {
@@ -43,16 +46,17 @@ func (m *CustomerManagerLink) Reset()         { *m = CustomerManagerLink{} }
 func (m *CustomerManagerLink) String() string { return proto.CompactTextString(m) }
 func (*CustomerManagerLink) ProtoMessage()    {}
 func (*CustomerManagerLink) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_ea27bde8cdb5c4ca, []int{0}
+	return fileDescriptor_7e3318e064b05720, []int{0}
 }
+
 func (m *CustomerManagerLink) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerManagerLink.Unmarshal(m, b)
 }
 func (m *CustomerManagerLink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerManagerLink.Marshal(b, m, deterministic)
 }
-func (dst *CustomerManagerLink) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerManagerLink.Merge(dst, src)
+func (m *CustomerManagerLink) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerManagerLink.Merge(m, src)
 }
 func (m *CustomerManagerLink) XXX_Size() int {
 	return xxx_messageInfo_CustomerManagerLink.Size(m)
@@ -96,10 +100,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer_manager_link.proto", fileDescriptor_customer_manager_link_ea27bde8cdb5c4ca)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer_manager_link.proto", fileDescriptor_7e3318e064b05720)
 }
 
-var fileDescriptor_customer_manager_link_ea27bde8cdb5c4ca = []byte{
+var fileDescriptor_7e3318e064b05720 = []byte{
 	// 408 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xd1, 0xca, 0xd3, 0x30,
 	0x18, 0xa5, 0xfd, 0xf5, 0x07, 0xab, 0x73, 0x52, 0x6f, 0xca, 0x1c, 0xb2, 0x29, 0x83, 0x5d, 0x25,
diff --git a/googleapis/ads/googleads/v1/resources/customer_negative_criterion.pb.go b/googleapis/ads/googleads/v1/resources/customer_negative_criterion.pb.go
index 0e65ac5f55..b260ab1314 100644
--- a/googleapis/ads/googleads/v1/resources/customer_negative_criterion.pb.go
+++ b/googleapis/ads/googleads/v1/resources/customer_negative_criterion.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/customer_negative_criterion.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A negative criterion for exclusions at the customer level.
 type CustomerNegativeCriterion struct {
@@ -54,16 +57,17 @@ func (m *CustomerNegativeCriterion) Reset()         { *m = CustomerNegativeCrite
 func (m *CustomerNegativeCriterion) String() string { return proto.CompactTextString(m) }
 func (*CustomerNegativeCriterion) ProtoMessage()    {}
 func (*CustomerNegativeCriterion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_negative_criterion_44d1ead2708d58a3, []int{0}
+	return fileDescriptor_761ad3c7a7659e34, []int{0}
 }
+
 func (m *CustomerNegativeCriterion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerNegativeCriterion.Unmarshal(m, b)
 }
 func (m *CustomerNegativeCriterion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerNegativeCriterion.Marshal(b, m, deterministic)
 }
-func (dst *CustomerNegativeCriterion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerNegativeCriterion.Merge(dst, src)
+func (m *CustomerNegativeCriterion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerNegativeCriterion.Merge(m, src)
 }
 func (m *CustomerNegativeCriterion) XXX_Size() int {
 	return xxx_messageInfo_CustomerNegativeCriterion.Size(m)
@@ -184,9 +188,9 @@ func (m *CustomerNegativeCriterion) GetYoutubeChannel() *common.YouTubeChannelIn
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomerNegativeCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomerNegativeCriterion_OneofMarshaler, _CustomerNegativeCriterion_OneofUnmarshaler, _CustomerNegativeCriterion_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomerNegativeCriterion) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomerNegativeCriterion_ContentLabel)(nil),
 		(*CustomerNegativeCriterion_MobileApplication)(nil),
 		(*CustomerNegativeCriterion_MobileAppCategory)(nil),
@@ -196,153 +200,15 @@ func (*CustomerNegativeCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *p
 	}
 }
 
-func _CustomerNegativeCriterion_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomerNegativeCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *CustomerNegativeCriterion_ContentLabel:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ContentLabel); err != nil {
-			return err
-		}
-	case *CustomerNegativeCriterion_MobileApplication:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileApplication); err != nil {
-			return err
-		}
-	case *CustomerNegativeCriterion_MobileAppCategory:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileAppCategory); err != nil {
-			return err
-		}
-	case *CustomerNegativeCriterion_Placement:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Placement); err != nil {
-			return err
-		}
-	case *CustomerNegativeCriterion_YoutubeVideo:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeVideo); err != nil {
-			return err
-		}
-	case *CustomerNegativeCriterion_YoutubeChannel:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeChannel); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomerNegativeCriterion.Criterion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomerNegativeCriterion_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomerNegativeCriterion)
-	switch tag {
-	case 4: // criterion.content_label
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.ContentLabelInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CustomerNegativeCriterion_ContentLabel{msg}
-		return true, err
-	case 5: // criterion.mobile_application
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileApplicationInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CustomerNegativeCriterion_MobileApplication{msg}
-		return true, err
-	case 6: // criterion.mobile_app_category
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileAppCategoryInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CustomerNegativeCriterion_MobileAppCategory{msg}
-		return true, err
-	case 7: // criterion.placement
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PlacementInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CustomerNegativeCriterion_Placement{msg}
-		return true, err
-	case 8: // criterion.youtube_video
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeVideoInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CustomerNegativeCriterion_YoutubeVideo{msg}
-		return true, err
-	case 9: // criterion.youtube_channel
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeChannelInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &CustomerNegativeCriterion_YoutubeChannel{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomerNegativeCriterion_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomerNegativeCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *CustomerNegativeCriterion_ContentLabel:
-		s := proto.Size(x.ContentLabel)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerNegativeCriterion_MobileApplication:
-		s := proto.Size(x.MobileApplication)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerNegativeCriterion_MobileAppCategory:
-		s := proto.Size(x.MobileAppCategory)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerNegativeCriterion_Placement:
-		s := proto.Size(x.Placement)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerNegativeCriterion_YoutubeVideo:
-		s := proto.Size(x.YoutubeVideo)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerNegativeCriterion_YoutubeChannel:
-		s := proto.Size(x.YoutubeChannel)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*CustomerNegativeCriterion)(nil), "google.ads.googleads.v1.resources.CustomerNegativeCriterion")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/customer_negative_criterion.proto", fileDescriptor_customer_negative_criterion_44d1ead2708d58a3)
+	proto.RegisterFile("google/ads/googleads/v1/resources/customer_negative_criterion.proto", fileDescriptor_761ad3c7a7659e34)
 }
 
-var fileDescriptor_customer_negative_criterion_44d1ead2708d58a3 = []byte{
+var fileDescriptor_761ad3c7a7659e34 = []byte{
 	// 575 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdd, 0x8a, 0xd3, 0x40,
 	0x14, 0xc7, 0x6d, 0xf6, 0x43, 0x3b, 0xfb, 0x21, 0xc6, 0x9b, 0xb8, 0xca, 0xd2, 0x55, 0x16, 0x0a,
diff --git a/googleapis/ads/googleads/v1/resources/detail_placement_view.pb.go b/googleapis/ads/googleads/v1/resources/detail_placement_view.pb.go
index 449c971ed3..2bded1d7c2 100644
--- a/googleapis/ads/googleads/v1/resources/detail_placement_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/detail_placement_view.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/detail_placement_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A view with metrics aggregated by ad group and URL or YouTube video.
 type DetailPlacementView struct {
@@ -52,16 +55,17 @@ func (m *DetailPlacementView) Reset()         { *m = DetailPlacementView{} }
 func (m *DetailPlacementView) String() string { return proto.CompactTextString(m) }
 func (*DetailPlacementView) ProtoMessage()    {}
 func (*DetailPlacementView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_detail_placement_view_204339af36109cb0, []int{0}
+	return fileDescriptor_9703f91bccf33f03, []int{0}
 }
+
 func (m *DetailPlacementView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetailPlacementView.Unmarshal(m, b)
 }
 func (m *DetailPlacementView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetailPlacementView.Marshal(b, m, deterministic)
 }
-func (dst *DetailPlacementView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetailPlacementView.Merge(dst, src)
+func (m *DetailPlacementView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetailPlacementView.Merge(m, src)
 }
 func (m *DetailPlacementView) XXX_Size() int {
 	return xxx_messageInfo_DetailPlacementView.Size(m)
@@ -119,10 +123,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/detail_placement_view.proto", fileDescriptor_detail_placement_view_204339af36109cb0)
+	proto.RegisterFile("google/ads/googleads/v1/resources/detail_placement_view.proto", fileDescriptor_9703f91bccf33f03)
 }
 
-var fileDescriptor_detail_placement_view_204339af36109cb0 = []byte{
+var fileDescriptor_9703f91bccf33f03 = []byte{
 	// 439 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x8a, 0x13, 0x31,
 	0x14, 0x66, 0xa6, 0xba, 0xb0, 0xd9, 0x9f, 0x8b, 0xf1, 0xc2, 0xa1, 0x2c, 0xd2, 0x55, 0x16, 0x7a,
diff --git a/googleapis/ads/googleads/v1/resources/display_keyword_view.pb.go b/googleapis/ads/googleads/v1/resources/display_keyword_view.pb.go
index b4b30c23e1..ab970b7e69 100644
--- a/googleapis/ads/googleads/v1/resources/display_keyword_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/display_keyword_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/display_keyword_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A display keyword view.
 type DisplayKeywordView struct {
@@ -35,16 +38,17 @@ func (m *DisplayKeywordView) Reset()         { *m = DisplayKeywordView{} }
 func (m *DisplayKeywordView) String() string { return proto.CompactTextString(m) }
 func (*DisplayKeywordView) ProtoMessage()    {}
 func (*DisplayKeywordView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_display_keyword_view_a1af203287ac2439, []int{0}
+	return fileDescriptor_2279af1d97ad83df, []int{0}
 }
+
 func (m *DisplayKeywordView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DisplayKeywordView.Unmarshal(m, b)
 }
 func (m *DisplayKeywordView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DisplayKeywordView.Marshal(b, m, deterministic)
 }
-func (dst *DisplayKeywordView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DisplayKeywordView.Merge(dst, src)
+func (m *DisplayKeywordView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DisplayKeywordView.Merge(m, src)
 }
 func (m *DisplayKeywordView) XXX_Size() int {
 	return xxx_messageInfo_DisplayKeywordView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/display_keyword_view.proto", fileDescriptor_display_keyword_view_a1af203287ac2439)
+	proto.RegisterFile("google/ads/googleads/v1/resources/display_keyword_view.proto", fileDescriptor_2279af1d97ad83df)
 }
 
-var fileDescriptor_display_keyword_view_a1af203287ac2439 = []byte{
+var fileDescriptor_2279af1d97ad83df = []byte{
 	// 276 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xcf, 0x4a, 0xec, 0x30,
 	0x14, 0xc6, 0x69, 0x2f, 0x5c, 0xb0, 0xe8, 0xa6, 0x1b, 0x45, 0x5c, 0x38, 0xca, 0x80, 0xab, 0x84,
diff --git a/googleapis/ads/googleads/v1/resources/domain_category.pb.go b/googleapis/ads/googleads/v1/resources/domain_category.pb.go
index 2e67571467..cdc14c5fb6 100644
--- a/googleapis/ads/googleads/v1/resources/domain_category.pb.go
+++ b/googleapis/ads/googleads/v1/resources/domain_category.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/domain_category.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A category generated automatically by crawling a domain. If a campaign uses
 // the DynamicSearchAdsSetting, then domain categories will be generated for
@@ -63,16 +66,17 @@ func (m *DomainCategory) Reset()         { *m = DomainCategory{} }
 func (m *DomainCategory) String() string { return proto.CompactTextString(m) }
 func (*DomainCategory) ProtoMessage()    {}
 func (*DomainCategory) Descriptor() ([]byte, []int) {
-	return fileDescriptor_domain_category_4860955cf62b00ac, []int{0}
+	return fileDescriptor_c2d1ae0f79ccb888, []int{0}
 }
+
 func (m *DomainCategory) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DomainCategory.Unmarshal(m, b)
 }
 func (m *DomainCategory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DomainCategory.Marshal(b, m, deterministic)
 }
-func (dst *DomainCategory) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DomainCategory.Merge(dst, src)
+func (m *DomainCategory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DomainCategory.Merge(m, src)
 }
 func (m *DomainCategory) XXX_Size() int {
 	return xxx_messageInfo_DomainCategory.Size(m)
@@ -151,10 +155,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/domain_category.proto", fileDescriptor_domain_category_4860955cf62b00ac)
+	proto.RegisterFile("google/ads/googleads/v1/resources/domain_category.proto", fileDescriptor_c2d1ae0f79ccb888)
 }
 
-var fileDescriptor_domain_category_4860955cf62b00ac = []byte{
+var fileDescriptor_c2d1ae0f79ccb888 = []byte{
 	// 493 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xd1, 0x6a, 0x14, 0x3d,
 	0x1c, 0xc5, 0xd9, 0x6d, 0xbf, 0xfd, 0xda, 0x74, 0x57, 0x74, 0xbc, 0x70, 0x58, 0x8b, 0xb4, 0x4a,
diff --git a/googleapis/ads/googleads/v1/resources/dynamic_search_ads_search_term_view.pb.go b/googleapis/ads/googleads/v1/resources/dynamic_search_ads_search_term_view.pb.go
index d04cb4ba82..03088ac5d3 100644
--- a/googleapis/ads/googleads/v1/resources/dynamic_search_ads_search_term_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/dynamic_search_ads_search_term_view.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/dynamic_search_ads_search_term_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A dynamic search ads search term view.
 type DynamicSearchAdsSearchTermView struct {
@@ -53,16 +56,17 @@ func (m *DynamicSearchAdsSearchTermView) Reset()         { *m = DynamicSearchAds
 func (m *DynamicSearchAdsSearchTermView) String() string { return proto.CompactTextString(m) }
 func (*DynamicSearchAdsSearchTermView) ProtoMessage()    {}
 func (*DynamicSearchAdsSearchTermView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dynamic_search_ads_search_term_view_4a7297abf6b93574, []int{0}
+	return fileDescriptor_9ffd212889021798, []int{0}
 }
+
 func (m *DynamicSearchAdsSearchTermView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DynamicSearchAdsSearchTermView.Unmarshal(m, b)
 }
 func (m *DynamicSearchAdsSearchTermView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DynamicSearchAdsSearchTermView.Marshal(b, m, deterministic)
 }
-func (dst *DynamicSearchAdsSearchTermView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DynamicSearchAdsSearchTermView.Merge(dst, src)
+func (m *DynamicSearchAdsSearchTermView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DynamicSearchAdsSearchTermView.Merge(m, src)
 }
 func (m *DynamicSearchAdsSearchTermView) XXX_Size() int {
 	return xxx_messageInfo_DynamicSearchAdsSearchTermView.Size(m)
@@ -113,10 +117,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/dynamic_search_ads_search_term_view.proto", fileDescriptor_dynamic_search_ads_search_term_view_4a7297abf6b93574)
+	proto.RegisterFile("google/ads/googleads/v1/resources/dynamic_search_ads_search_term_view.proto", fileDescriptor_9ffd212889021798)
 }
 
-var fileDescriptor_dynamic_search_ads_search_term_view_4a7297abf6b93574 = []byte{
+var fileDescriptor_9ffd212889021798 = []byte{
 	// 399 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x6a, 0xd4, 0x40,
 	0x1c, 0xc7, 0xd9, 0xd4, 0x3f, 0x75, 0xb6, 0x5e, 0x72, 0x0a, 0xa5, 0x94, 0xd6, 0x52, 0xe8, 0x69,
diff --git a/googleapis/ads/googleads/v1/resources/expanded_landing_page_view.pb.go b/googleapis/ads/googleads/v1/resources/expanded_landing_page_view.pb.go
index d89eb1714f..ea6ba6bcd8 100644
--- a/googleapis/ads/googleads/v1/resources/expanded_landing_page_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/expanded_landing_page_view.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/expanded_landing_page_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A landing page view with metrics aggregated at the expanded final URL
 // level.
@@ -40,16 +43,17 @@ func (m *ExpandedLandingPageView) Reset()         { *m = ExpandedLandingPageView
 func (m *ExpandedLandingPageView) String() string { return proto.CompactTextString(m) }
 func (*ExpandedLandingPageView) ProtoMessage()    {}
 func (*ExpandedLandingPageView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expanded_landing_page_view_c5c0b44fb5c32bb4, []int{0}
+	return fileDescriptor_b526ad7687a265f6, []int{0}
 }
+
 func (m *ExpandedLandingPageView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExpandedLandingPageView.Unmarshal(m, b)
 }
 func (m *ExpandedLandingPageView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExpandedLandingPageView.Marshal(b, m, deterministic)
 }
-func (dst *ExpandedLandingPageView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExpandedLandingPageView.Merge(dst, src)
+func (m *ExpandedLandingPageView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExpandedLandingPageView.Merge(m, src)
 }
 func (m *ExpandedLandingPageView) XXX_Size() int {
 	return xxx_messageInfo_ExpandedLandingPageView.Size(m)
@@ -79,10 +83,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/expanded_landing_page_view.proto", fileDescriptor_expanded_landing_page_view_c5c0b44fb5c32bb4)
+	proto.RegisterFile("google/ads/googleads/v1/resources/expanded_landing_page_view.proto", fileDescriptor_b526ad7687a265f6)
 }
 
-var fileDescriptor_expanded_landing_page_view_c5c0b44fb5c32bb4 = []byte{
+var fileDescriptor_b526ad7687a265f6 = []byte{
 	// 343 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xc1, 0x4a, 0xeb, 0x40,
 	0x14, 0x86, 0x49, 0x2e, 0x5c, 0xb8, 0xb9, 0x0a, 0x92, 0x8d, 0xa5, 0x14, 0x69, 0x95, 0x42, 0x57,
diff --git a/googleapis/ads/googleads/v1/resources/extension_feed_item.pb.go b/googleapis/ads/googleads/v1/resources/extension_feed_item.pb.go
index fc7a76932a..91d46bfea7 100644
--- a/googleapis/ads/googleads/v1/resources/extension_feed_item.pb.go
+++ b/googleapis/ads/googleads/v1/resources/extension_feed_item.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/extension_feed_item.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An extension feed item.
 type ExtensionFeedItem struct {
@@ -73,16 +76,17 @@ func (m *ExtensionFeedItem) Reset()         { *m = ExtensionFeedItem{} }
 func (m *ExtensionFeedItem) String() string { return proto.CompactTextString(m) }
 func (*ExtensionFeedItem) ProtoMessage()    {}
 func (*ExtensionFeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_3b0d7704bf91f757, []int{0}
+	return fileDescriptor_800f8a839b1b4536, []int{0}
 }
+
 func (m *ExtensionFeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtensionFeedItem.Unmarshal(m, b)
 }
 func (m *ExtensionFeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExtensionFeedItem.Marshal(b, m, deterministic)
 }
-func (dst *ExtensionFeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtensionFeedItem.Merge(dst, src)
+func (m *ExtensionFeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionFeedItem.Merge(m, src)
 }
 func (m *ExtensionFeedItem) XXX_Size() int {
 	return xxx_messageInfo_ExtensionFeedItem.Size(m)
@@ -283,9 +287,9 @@ func (m *ExtensionFeedItem) GetAffiliateLocationFeedItem() *common.AffiliateLoca
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExtensionFeedItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExtensionFeedItem_OneofMarshaler, _ExtensionFeedItem_OneofUnmarshaler, _ExtensionFeedItem_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExtensionFeedItem) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExtensionFeedItem_SitelinkFeedItem)(nil),
 		(*ExtensionFeedItem_StructuredSnippetFeedItem)(nil),
 		(*ExtensionFeedItem_AppFeedItem)(nil),
@@ -299,225 +303,15 @@ func (*ExtensionFeedItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _ExtensionFeedItem_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExtensionFeedItem)
-	// extension
-	switch x := m.Extension.(type) {
-	case *ExtensionFeedItem_SitelinkFeedItem:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SitelinkFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_StructuredSnippetFeedItem:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredSnippetFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_AppFeedItem:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_CallFeedItem:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CallFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_CalloutFeedItem:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CalloutFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_TextMessageFeedItem:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextMessageFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_PriceFeedItem:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PriceFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_PromotionFeedItem:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PromotionFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_LocationFeedItem:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LocationFeedItem); err != nil {
-			return err
-		}
-	case *ExtensionFeedItem_AffiliateLocationFeedItem:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AffiliateLocationFeedItem); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ExtensionFeedItem.Extension has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExtensionFeedItem_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExtensionFeedItem)
-	switch tag {
-	case 2: // extension.sitelink_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.SitelinkFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_SitelinkFeedItem{msg}
-		return true, err
-	case 3: // extension.structured_snippet_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.StructuredSnippetFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_StructuredSnippetFeedItem{msg}
-		return true, err
-	case 7: // extension.app_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AppFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_AppFeedItem{msg}
-		return true, err
-	case 8: // extension.call_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CallFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_CallFeedItem{msg}
-		return true, err
-	case 9: // extension.callout_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CalloutFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_CalloutFeedItem{msg}
-		return true, err
-	case 10: // extension.text_message_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.TextMessageFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_TextMessageFeedItem{msg}
-		return true, err
-	case 11: // extension.price_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PriceFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_PriceFeedItem{msg}
-		return true, err
-	case 12: // extension.promotion_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PromotionFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_PromotionFeedItem{msg}
-		return true, err
-	case 14: // extension.location_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.LocationFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_LocationFeedItem{msg}
-		return true, err
-	case 15: // extension.affiliate_location_feed_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AffiliateLocationFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Extension = &ExtensionFeedItem_AffiliateLocationFeedItem{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExtensionFeedItem_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExtensionFeedItem)
-	// extension
-	switch x := m.Extension.(type) {
-	case *ExtensionFeedItem_SitelinkFeedItem:
-		s := proto.Size(x.SitelinkFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_StructuredSnippetFeedItem:
-		s := proto.Size(x.StructuredSnippetFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_AppFeedItem:
-		s := proto.Size(x.AppFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_CallFeedItem:
-		s := proto.Size(x.CallFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_CalloutFeedItem:
-		s := proto.Size(x.CalloutFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_TextMessageFeedItem:
-		s := proto.Size(x.TextMessageFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_PriceFeedItem:
-		s := proto.Size(x.PriceFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_PromotionFeedItem:
-		s := proto.Size(x.PromotionFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_LocationFeedItem:
-		s := proto.Size(x.LocationFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItem_AffiliateLocationFeedItem:
-		s := proto.Size(x.AffiliateLocationFeedItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*ExtensionFeedItem)(nil), "google.ads.googleads.v1.resources.ExtensionFeedItem")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/extension_feed_item.proto", fileDescriptor_extension_feed_item_3b0d7704bf91f757)
+	proto.RegisterFile("google/ads/googleads/v1/resources/extension_feed_item.proto", fileDescriptor_800f8a839b1b4536)
 }
 
-var fileDescriptor_extension_feed_item_3b0d7704bf91f757 = []byte{
+var fileDescriptor_800f8a839b1b4536 = []byte{
 	// 805 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x96, 0xdd, 0x8e, 0xdb, 0x44,
 	0x14, 0xc7, 0x49, 0x16, 0x16, 0x76, 0x92, 0xec, 0x76, 0xa7, 0x52, 0xe5, 0x56, 0x2b, 0x94, 0x82,
diff --git a/googleapis/ads/googleads/v1/resources/feed.pb.go b/googleapis/ads/googleads/v1/resources/feed.pb.go
index 64420f845a..59b4bcdc66 100644
--- a/googleapis/ads/googleads/v1/resources/feed.pb.go
+++ b/googleapis/ads/googleads/v1/resources/feed.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/feed.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The operator.
 type FeedAttributeOperation_Operator int32
@@ -38,6 +41,7 @@ var FeedAttributeOperation_Operator_name = map[int32]string{
 	1: "UNKNOWN",
 	2: "ADD",
 }
+
 var FeedAttributeOperation_Operator_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"UNKNOWN":     1,
@@ -47,8 +51,9 @@ var FeedAttributeOperation_Operator_value = map[string]int32{
 func (x FeedAttributeOperation_Operator) String() string {
 	return proto.EnumName(FeedAttributeOperation_Operator_name, int32(x))
 }
+
 func (FeedAttributeOperation_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_feed_0878dc93c3f7dc5a, []int{2, 0}
+	return fileDescriptor_90b38030e9747922, []int{2, 0}
 }
 
 // A feed.
@@ -90,16 +95,17 @@ func (m *Feed) Reset()         { *m = Feed{} }
 func (m *Feed) String() string { return proto.CompactTextString(m) }
 func (*Feed) ProtoMessage()    {}
 func (*Feed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_0878dc93c3f7dc5a, []int{0}
+	return fileDescriptor_90b38030e9747922, []int{0}
 }
+
 func (m *Feed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feed.Unmarshal(m, b)
 }
 func (m *Feed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feed.Marshal(b, m, deterministic)
 }
-func (dst *Feed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feed.Merge(dst, src)
+func (m *Feed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feed.Merge(m, src)
 }
 func (m *Feed) XXX_Size() int {
 	return xxx_messageInfo_Feed.Size(m)
@@ -196,80 +202,14 @@ func (m *Feed) GetAffiliateLocationFeedData() *Feed_AffiliateLocationFeedData {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Feed) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Feed_OneofMarshaler, _Feed_OneofUnmarshaler, _Feed_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Feed) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Feed_PlacesLocationFeedData_)(nil),
 		(*Feed_AffiliateLocationFeedData_)(nil),
 	}
 }
 
-func _Feed_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Feed)
-	// system_feed_generation_data
-	switch x := m.SystemFeedGenerationData.(type) {
-	case *Feed_PlacesLocationFeedData_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PlacesLocationFeedData); err != nil {
-			return err
-		}
-	case *Feed_AffiliateLocationFeedData_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AffiliateLocationFeedData); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Feed.SystemFeedGenerationData has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Feed_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Feed)
-	switch tag {
-	case 6: // system_feed_generation_data.places_location_feed_data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Feed_PlacesLocationFeedData)
-		err := b.DecodeMessage(msg)
-		m.SystemFeedGenerationData = &Feed_PlacesLocationFeedData_{msg}
-		return true, err
-	case 7: // system_feed_generation_data.affiliate_location_feed_data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Feed_AffiliateLocationFeedData)
-		err := b.DecodeMessage(msg)
-		m.SystemFeedGenerationData = &Feed_AffiliateLocationFeedData_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Feed_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Feed)
-	// system_feed_generation_data
-	switch x := m.SystemFeedGenerationData.(type) {
-	case *Feed_PlacesLocationFeedData_:
-		s := proto.Size(x.PlacesLocationFeedData)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Feed_AffiliateLocationFeedData_:
-		s := proto.Size(x.AffiliateLocationFeedData)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Data used to configure a location feed populated from Google My Business
 // Locations.
 type Feed_PlacesLocationFeedData struct {
@@ -308,16 +248,17 @@ func (m *Feed_PlacesLocationFeedData) Reset()         { *m = Feed_PlacesLocation
 func (m *Feed_PlacesLocationFeedData) String() string { return proto.CompactTextString(m) }
 func (*Feed_PlacesLocationFeedData) ProtoMessage()    {}
 func (*Feed_PlacesLocationFeedData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_0878dc93c3f7dc5a, []int{0, 0}
+	return fileDescriptor_90b38030e9747922, []int{0, 0}
 }
+
 func (m *Feed_PlacesLocationFeedData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feed_PlacesLocationFeedData.Unmarshal(m, b)
 }
 func (m *Feed_PlacesLocationFeedData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feed_PlacesLocationFeedData.Marshal(b, m, deterministic)
 }
-func (dst *Feed_PlacesLocationFeedData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feed_PlacesLocationFeedData.Merge(dst, src)
+func (m *Feed_PlacesLocationFeedData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feed_PlacesLocationFeedData.Merge(m, src)
 }
 func (m *Feed_PlacesLocationFeedData) XXX_Size() int {
 	return xxx_messageInfo_Feed_PlacesLocationFeedData.Size(m)
@@ -387,16 +328,17 @@ func (m *Feed_PlacesLocationFeedData_OAuthInfo) Reset()         { *m = Feed_Plac
 func (m *Feed_PlacesLocationFeedData_OAuthInfo) String() string { return proto.CompactTextString(m) }
 func (*Feed_PlacesLocationFeedData_OAuthInfo) ProtoMessage()    {}
 func (*Feed_PlacesLocationFeedData_OAuthInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_0878dc93c3f7dc5a, []int{0, 0, 0}
+	return fileDescriptor_90b38030e9747922, []int{0, 0, 0}
 }
+
 func (m *Feed_PlacesLocationFeedData_OAuthInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feed_PlacesLocationFeedData_OAuthInfo.Unmarshal(m, b)
 }
 func (m *Feed_PlacesLocationFeedData_OAuthInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feed_PlacesLocationFeedData_OAuthInfo.Marshal(b, m, deterministic)
 }
-func (dst *Feed_PlacesLocationFeedData_OAuthInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feed_PlacesLocationFeedData_OAuthInfo.Merge(dst, src)
+func (m *Feed_PlacesLocationFeedData_OAuthInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feed_PlacesLocationFeedData_OAuthInfo.Merge(m, src)
 }
 func (m *Feed_PlacesLocationFeedData_OAuthInfo) XXX_Size() int {
 	return xxx_messageInfo_Feed_PlacesLocationFeedData_OAuthInfo.Size(m)
@@ -445,16 +387,17 @@ func (m *Feed_AffiliateLocationFeedData) Reset()         { *m = Feed_AffiliateLo
 func (m *Feed_AffiliateLocationFeedData) String() string { return proto.CompactTextString(m) }
 func (*Feed_AffiliateLocationFeedData) ProtoMessage()    {}
 func (*Feed_AffiliateLocationFeedData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_0878dc93c3f7dc5a, []int{0, 1}
+	return fileDescriptor_90b38030e9747922, []int{0, 1}
 }
+
 func (m *Feed_AffiliateLocationFeedData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feed_AffiliateLocationFeedData.Unmarshal(m, b)
 }
 func (m *Feed_AffiliateLocationFeedData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feed_AffiliateLocationFeedData.Marshal(b, m, deterministic)
 }
-func (dst *Feed_AffiliateLocationFeedData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feed_AffiliateLocationFeedData.Merge(dst, src)
+func (m *Feed_AffiliateLocationFeedData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feed_AffiliateLocationFeedData.Merge(m, src)
 }
 func (m *Feed_AffiliateLocationFeedData) XXX_Size() int {
 	return xxx_messageInfo_Feed_AffiliateLocationFeedData.Size(m)
@@ -504,16 +447,17 @@ func (m *FeedAttribute) Reset()         { *m = FeedAttribute{} }
 func (m *FeedAttribute) String() string { return proto.CompactTextString(m) }
 func (*FeedAttribute) ProtoMessage()    {}
 func (*FeedAttribute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_0878dc93c3f7dc5a, []int{1}
+	return fileDescriptor_90b38030e9747922, []int{1}
 }
+
 func (m *FeedAttribute) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedAttribute.Unmarshal(m, b)
 }
 func (m *FeedAttribute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedAttribute.Marshal(b, m, deterministic)
 }
-func (dst *FeedAttribute) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedAttribute.Merge(dst, src)
+func (m *FeedAttribute) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedAttribute.Merge(m, src)
 }
 func (m *FeedAttribute) XXX_Size() int {
 	return xxx_messageInfo_FeedAttribute.Size(m)
@@ -567,16 +511,17 @@ func (m *FeedAttributeOperation) Reset()         { *m = FeedAttributeOperation{}
 func (m *FeedAttributeOperation) String() string { return proto.CompactTextString(m) }
 func (*FeedAttributeOperation) ProtoMessage()    {}
 func (*FeedAttributeOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_0878dc93c3f7dc5a, []int{2}
+	return fileDescriptor_90b38030e9747922, []int{2}
 }
+
 func (m *FeedAttributeOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedAttributeOperation.Unmarshal(m, b)
 }
 func (m *FeedAttributeOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedAttributeOperation.Marshal(b, m, deterministic)
 }
-func (dst *FeedAttributeOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedAttributeOperation.Merge(dst, src)
+func (m *FeedAttributeOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedAttributeOperation.Merge(m, src)
 }
 func (m *FeedAttributeOperation) XXX_Size() int {
 	return xxx_messageInfo_FeedAttributeOperation.Size(m)
@@ -602,20 +547,20 @@ func (m *FeedAttributeOperation) GetValue() *FeedAttribute {
 }
 
 func init() {
+	proto.RegisterEnum("google.ads.googleads.v1.resources.FeedAttributeOperation_Operator", FeedAttributeOperation_Operator_name, FeedAttributeOperation_Operator_value)
 	proto.RegisterType((*Feed)(nil), "google.ads.googleads.v1.resources.Feed")
 	proto.RegisterType((*Feed_PlacesLocationFeedData)(nil), "google.ads.googleads.v1.resources.Feed.PlacesLocationFeedData")
 	proto.RegisterType((*Feed_PlacesLocationFeedData_OAuthInfo)(nil), "google.ads.googleads.v1.resources.Feed.PlacesLocationFeedData.OAuthInfo")
 	proto.RegisterType((*Feed_AffiliateLocationFeedData)(nil), "google.ads.googleads.v1.resources.Feed.AffiliateLocationFeedData")
 	proto.RegisterType((*FeedAttribute)(nil), "google.ads.googleads.v1.resources.FeedAttribute")
 	proto.RegisterType((*FeedAttributeOperation)(nil), "google.ads.googleads.v1.resources.FeedAttributeOperation")
-	proto.RegisterEnum("google.ads.googleads.v1.resources.FeedAttributeOperation_Operator", FeedAttributeOperation_Operator_name, FeedAttributeOperation_Operator_value)
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/feed.proto", fileDescriptor_feed_0878dc93c3f7dc5a)
+	proto.RegisterFile("google/ads/googleads/v1/resources/feed.proto", fileDescriptor_90b38030e9747922)
 }
 
-var fileDescriptor_feed_0878dc93c3f7dc5a = []byte{
+var fileDescriptor_90b38030e9747922 = []byte{
 	// 1031 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0xcf, 0x6f, 0xe3, 0x44,
 	0x14, 0xc7, 0xd7, 0x49, 0xfa, 0x23, 0x93, 0x36, 0x9b, 0x9d, 0x5d, 0x15, 0x37, 0x5b, 0x50, 0xb7,
diff --git a/googleapis/ads/googleads/v1/resources/feed_item.pb.go b/googleapis/ads/googleads/v1/resources/feed_item.pb.go
index bbf945b1f2..7967afec23 100644
--- a/googleapis/ads/googleads/v1/resources/feed_item.pb.go
+++ b/googleapis/ads/googleads/v1/resources/feed_item.pb.go
@@ -1,16 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/feed_item.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import errors "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	errors "google.golang.org/genproto/googleapis/ads/googleads/v1/errors"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -21,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A feed item.
 type FeedItem struct {
@@ -70,16 +73,17 @@ func (m *FeedItem) Reset()         { *m = FeedItem{} }
 func (m *FeedItem) String() string { return proto.CompactTextString(m) }
 func (*FeedItem) ProtoMessage()    {}
 func (*FeedItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_210b5164f935f220, []int{0}
+	return fileDescriptor_7db33c9c712020a5, []int{0}
 }
+
 func (m *FeedItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItem.Unmarshal(m, b)
 }
 func (m *FeedItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItem.Marshal(b, m, deterministic)
 }
-func (dst *FeedItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItem.Merge(dst, src)
+func (m *FeedItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItem.Merge(m, src)
 }
 func (m *FeedItem) XXX_Size() int {
 	return xxx_messageInfo_FeedItem.Size(m)
@@ -210,16 +214,17 @@ func (m *FeedItemAttributeValue) Reset()         { *m = FeedItemAttributeValue{}
 func (m *FeedItemAttributeValue) String() string { return proto.CompactTextString(m) }
 func (*FeedItemAttributeValue) ProtoMessage()    {}
 func (*FeedItemAttributeValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_210b5164f935f220, []int{1}
+	return fileDescriptor_7db33c9c712020a5, []int{1}
 }
+
 func (m *FeedItemAttributeValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemAttributeValue.Unmarshal(m, b)
 }
 func (m *FeedItemAttributeValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemAttributeValue.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemAttributeValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemAttributeValue.Merge(dst, src)
+func (m *FeedItemAttributeValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemAttributeValue.Merge(m, src)
 }
 func (m *FeedItemAttributeValue) XXX_Size() int {
 	return xxx_messageInfo_FeedItemAttributeValue.Size(m)
@@ -331,16 +336,17 @@ func (m *FeedItemPlaceholderPolicyInfo) Reset()         { *m = FeedItemPlacehold
 func (m *FeedItemPlaceholderPolicyInfo) String() string { return proto.CompactTextString(m) }
 func (*FeedItemPlaceholderPolicyInfo) ProtoMessage()    {}
 func (*FeedItemPlaceholderPolicyInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_210b5164f935f220, []int{2}
+	return fileDescriptor_7db33c9c712020a5, []int{2}
 }
+
 func (m *FeedItemPlaceholderPolicyInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemPlaceholderPolicyInfo.Unmarshal(m, b)
 }
 func (m *FeedItemPlaceholderPolicyInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemPlaceholderPolicyInfo.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemPlaceholderPolicyInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemPlaceholderPolicyInfo.Merge(dst, src)
+func (m *FeedItemPlaceholderPolicyInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemPlaceholderPolicyInfo.Merge(m, src)
 }
 func (m *FeedItemPlaceholderPolicyInfo) XXX_Size() int {
 	return xxx_messageInfo_FeedItemPlaceholderPolicyInfo.Size(m)
@@ -439,16 +445,17 @@ func (m *FeedItemValidationError) Reset()         { *m = FeedItemValidationError
 func (m *FeedItemValidationError) String() string { return proto.CompactTextString(m) }
 func (*FeedItemValidationError) ProtoMessage()    {}
 func (*FeedItemValidationError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_210b5164f935f220, []int{3}
+	return fileDescriptor_7db33c9c712020a5, []int{3}
 }
+
 func (m *FeedItemValidationError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemValidationError.Unmarshal(m, b)
 }
 func (m *FeedItemValidationError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemValidationError.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemValidationError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemValidationError.Merge(dst, src)
+func (m *FeedItemValidationError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemValidationError.Merge(m, src)
 }
 func (m *FeedItemValidationError) XXX_Size() int {
 	return xxx_messageInfo_FeedItemValidationError.Size(m)
@@ -495,10 +502,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/feed_item.proto", fileDescriptor_feed_item_210b5164f935f220)
+	proto.RegisterFile("google/ads/googleads/v1/resources/feed_item.proto", fileDescriptor_7db33c9c712020a5)
 }
 
-var fileDescriptor_feed_item_210b5164f935f220 = []byte{
+var fileDescriptor_7db33c9c712020a5 = []byte{
 	// 1213 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xdb, 0x6e, 0xdc, 0x44,
 	0x18, 0xd6, 0x6e, 0xda, 0x34, 0x99, 0x3d, 0x24, 0x1d, 0x28, 0x71, 0xd3, 0x82, 0xd2, 0xa0, 0x48,
diff --git a/googleapis/ads/googleads/v1/resources/feed_item_target.pb.go b/googleapis/ads/googleads/v1/resources/feed_item_target.pb.go
index 517a056f28..836603d18a 100644
--- a/googleapis/ads/googleads/v1/resources/feed_item_target.pb.go
+++ b/googleapis/ads/googleads/v1/resources/feed_item_target.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/feed_item_target.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A feed item target.
 type FeedItemTarget struct {
@@ -54,16 +57,17 @@ func (m *FeedItemTarget) Reset()         { *m = FeedItemTarget{} }
 func (m *FeedItemTarget) String() string { return proto.CompactTextString(m) }
 func (*FeedItemTarget) ProtoMessage()    {}
 func (*FeedItemTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_9b79f0bfee17a3b5, []int{0}
+	return fileDescriptor_82fa673cb0c842f7, []int{0}
 }
+
 func (m *FeedItemTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemTarget.Unmarshal(m, b)
 }
 func (m *FeedItemTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemTarget.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemTarget.Merge(dst, src)
+func (m *FeedItemTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemTarget.Merge(m, src)
 }
 func (m *FeedItemTarget) XXX_Size() int {
 	return xxx_messageInfo_FeedItemTarget.Size(m)
@@ -191,9 +195,9 @@ func (m *FeedItemTarget) GetAdSchedule() *common.AdScheduleInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FeedItemTarget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FeedItemTarget_OneofMarshaler, _FeedItemTarget_OneofUnmarshaler, _FeedItemTarget_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*FeedItemTarget) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*FeedItemTarget_Campaign)(nil),
 		(*FeedItemTarget_AdGroup)(nil),
 		(*FeedItemTarget_Keyword)(nil),
@@ -203,148 +207,15 @@ func (*FeedItemTarget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _FeedItemTarget_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FeedItemTarget)
-	// target
-	switch x := m.Target.(type) {
-	case *FeedItemTarget_Campaign:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Campaign); err != nil {
-			return err
-		}
-	case *FeedItemTarget_AdGroup:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroup); err != nil {
-			return err
-		}
-	case *FeedItemTarget_Keyword:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Keyword); err != nil {
-			return err
-		}
-	case *FeedItemTarget_GeoTargetConstant:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GeoTargetConstant); err != nil {
-			return err
-		}
-	case *FeedItemTarget_Device:
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Device))
-	case *FeedItemTarget_AdSchedule:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdSchedule); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("FeedItemTarget.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FeedItemTarget_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FeedItemTarget)
-	switch tag {
-	case 4: // target.campaign
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.Target = &FeedItemTarget_Campaign{msg}
-		return true, err
-	case 5: // target.ad_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.Target = &FeedItemTarget_AdGroup{msg}
-		return true, err
-	case 7: // target.keyword
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.KeywordInfo)
-		err := b.DecodeMessage(msg)
-		m.Target = &FeedItemTarget_Keyword{msg}
-		return true, err
-	case 8: // target.geo_target_constant
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.Target = &FeedItemTarget_GeoTargetConstant{msg}
-		return true, err
-	case 9: // target.device
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &FeedItemTarget_Device{enums.FeedItemTargetDeviceEnum_FeedItemTargetDevice(x)}
-		return true, err
-	case 10: // target.ad_schedule
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.AdScheduleInfo)
-		err := b.DecodeMessage(msg)
-		m.Target = &FeedItemTarget_AdSchedule{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FeedItemTarget_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FeedItemTarget)
-	// target
-	switch x := m.Target.(type) {
-	case *FeedItemTarget_Campaign:
-		s := proto.Size(x.Campaign)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedItemTarget_AdGroup:
-		s := proto.Size(x.AdGroup)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedItemTarget_Keyword:
-		s := proto.Size(x.Keyword)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedItemTarget_GeoTargetConstant:
-		s := proto.Size(x.GeoTargetConstant)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedItemTarget_Device:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Device))
-	case *FeedItemTarget_AdSchedule:
-		s := proto.Size(x.AdSchedule)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*FeedItemTarget)(nil), "google.ads.googleads.v1.resources.FeedItemTarget")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/feed_item_target.proto", fileDescriptor_feed_item_target_9b79f0bfee17a3b5)
+	proto.RegisterFile("google/ads/googleads/v1/resources/feed_item_target.proto", fileDescriptor_82fa673cb0c842f7)
 }
 
-var fileDescriptor_feed_item_target_9b79f0bfee17a3b5 = []byte{
+var fileDescriptor_82fa673cb0c842f7 = []byte{
 	// 581 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdd, 0x6a, 0x13, 0x41,
 	0x14, 0x6e, 0x52, 0x4d, 0xd3, 0xa9, 0x16, 0x9d, 0x22, 0x2c, 0xb5, 0x48, 0xab, 0x14, 0x0a, 0xe2,
diff --git a/googleapis/ads/googleads/v1/resources/feed_mapping.pb.go b/googleapis/ads/googleads/v1/resources/feed_mapping.pb.go
index 33c0694c4b..5956617f9f 100644
--- a/googleapis/ads/googleads/v1/resources/feed_mapping.pb.go
+++ b/googleapis/ads/googleads/v1/resources/feed_mapping.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/feed_mapping.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A feed mapping.
 type FeedMapping struct {
@@ -55,16 +58,17 @@ func (m *FeedMapping) Reset()         { *m = FeedMapping{} }
 func (m *FeedMapping) String() string { return proto.CompactTextString(m) }
 func (*FeedMapping) ProtoMessage()    {}
 func (*FeedMapping) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_c1c27da2bf9a0d52, []int{0}
+	return fileDescriptor_664f64bb6423b1b2, []int{0}
 }
+
 func (m *FeedMapping) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedMapping.Unmarshal(m, b)
 }
 func (m *FeedMapping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedMapping.Marshal(b, m, deterministic)
 }
-func (dst *FeedMapping) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedMapping.Merge(dst, src)
+func (m *FeedMapping) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedMapping.Merge(m, src)
 }
 func (m *FeedMapping) XXX_Size() int {
 	return xxx_messageInfo_FeedMapping.Size(m)
@@ -140,70 +144,14 @@ func (m *FeedMapping) GetCriterionType() enums.FeedMappingCriterionTypeEnum_Feed
 	return enums.FeedMappingCriterionTypeEnum_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FeedMapping) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FeedMapping_OneofMarshaler, _FeedMapping_OneofUnmarshaler, _FeedMapping_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*FeedMapping) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*FeedMapping_PlaceholderType)(nil),
 		(*FeedMapping_CriterionType)(nil),
 	}
 }
 
-func _FeedMapping_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FeedMapping)
-	// target
-	switch x := m.Target.(type) {
-	case *FeedMapping_PlaceholderType:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.PlaceholderType))
-	case *FeedMapping_CriterionType:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CriterionType))
-	case nil:
-	default:
-		return fmt.Errorf("FeedMapping.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FeedMapping_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FeedMapping)
-	switch tag {
-	case 3: // target.placeholder_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &FeedMapping_PlaceholderType{enums.PlaceholderTypeEnum_PlaceholderType(x)}
-		return true, err
-	case 4: // target.criterion_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &FeedMapping_CriterionType{enums.FeedMappingCriterionTypeEnum_FeedMappingCriterionType(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FeedMapping_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FeedMapping)
-	// target
-	switch x := m.Target.(type) {
-	case *FeedMapping_PlaceholderType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.PlaceholderType))
-	case *FeedMapping_CriterionType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CriterionType))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Maps from feed attribute id to a placeholder or criterion field id.
 type AttributeFieldMapping struct {
 	// Feed attribute from which to map.
@@ -248,16 +196,17 @@ func (m *AttributeFieldMapping) Reset()         { *m = AttributeFieldMapping{} }
 func (m *AttributeFieldMapping) String() string { return proto.CompactTextString(m) }
 func (*AttributeFieldMapping) ProtoMessage()    {}
 func (*AttributeFieldMapping) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_c1c27da2bf9a0d52, []int{1}
+	return fileDescriptor_664f64bb6423b1b2, []int{1}
 }
+
 func (m *AttributeFieldMapping) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttributeFieldMapping.Unmarshal(m, b)
 }
 func (m *AttributeFieldMapping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttributeFieldMapping.Marshal(b, m, deterministic)
 }
-func (dst *AttributeFieldMapping) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttributeFieldMapping.Merge(dst, src)
+func (m *AttributeFieldMapping) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttributeFieldMapping.Merge(m, src)
 }
 func (m *AttributeFieldMapping) XXX_Size() int {
 	return xxx_messageInfo_AttributeFieldMapping.Size(m)
@@ -566,9 +515,9 @@ func (m *AttributeFieldMapping) GetJobField() enums.JobPlaceholderFieldEnum_JobP
 	return enums.JobPlaceholderFieldEnum_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AttributeFieldMapping) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AttributeFieldMapping_OneofMarshaler, _AttributeFieldMapping_OneofUnmarshaler, _AttributeFieldMapping_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AttributeFieldMapping) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AttributeFieldMapping_SitelinkField)(nil),
 		(*AttributeFieldMapping_CallField)(nil),
 		(*AttributeFieldMapping_AppField)(nil),
@@ -593,319 +542,16 @@ func (*AttributeFieldMapping) XXX_OneofFuncs() (func(msg proto.Message, b *proto
 	}
 }
 
-func _AttributeFieldMapping_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AttributeFieldMapping)
-	// field
-	switch x := m.Field.(type) {
-	case *AttributeFieldMapping_SitelinkField:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SitelinkField))
-	case *AttributeFieldMapping_CallField:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CallField))
-	case *AttributeFieldMapping_AppField:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AppField))
-	case *AttributeFieldMapping_LocationField:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.LocationField))
-	case *AttributeFieldMapping_AffiliateLocationField:
-		b.EncodeVarint(7<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AffiliateLocationField))
-	case *AttributeFieldMapping_CalloutField:
-		b.EncodeVarint(8<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CalloutField))
-	case *AttributeFieldMapping_StructuredSnippetField:
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.StructuredSnippetField))
-	case *AttributeFieldMapping_MessageField:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MessageField))
-	case *AttributeFieldMapping_PriceField:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.PriceField))
-	case *AttributeFieldMapping_PromotionField:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.PromotionField))
-	case *AttributeFieldMapping_AdCustomizerField:
-		b.EncodeVarint(13<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.AdCustomizerField))
-	case *AttributeFieldMapping_DsaPageFeedField:
-		b.EncodeVarint(14<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.DsaPageFeedField))
-	case *AttributeFieldMapping_LocationExtensionTargetingField:
-		b.EncodeVarint(15<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.LocationExtensionTargetingField))
-	case *AttributeFieldMapping_EducationField:
-		b.EncodeVarint(16<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.EducationField))
-	case *AttributeFieldMapping_FlightField:
-		b.EncodeVarint(17<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FlightField))
-	case *AttributeFieldMapping_CustomField:
-		b.EncodeVarint(18<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CustomField))
-	case *AttributeFieldMapping_HotelField:
-		b.EncodeVarint(19<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.HotelField))
-	case *AttributeFieldMapping_RealEstateField:
-		b.EncodeVarint(20<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RealEstateField))
-	case *AttributeFieldMapping_TravelField:
-		b.EncodeVarint(21<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.TravelField))
-	case *AttributeFieldMapping_LocalField:
-		b.EncodeVarint(22<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.LocalField))
-	case *AttributeFieldMapping_JobField:
-		b.EncodeVarint(23<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.JobField))
-	case nil:
-	default:
-		return fmt.Errorf("AttributeFieldMapping.Field has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AttributeFieldMapping_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AttributeFieldMapping)
-	switch tag {
-	case 3: // field.sitelink_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_SitelinkField{enums.SitelinkPlaceholderFieldEnum_SitelinkPlaceholderField(x)}
-		return true, err
-	case 4: // field.call_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_CallField{enums.CallPlaceholderFieldEnum_CallPlaceholderField(x)}
-		return true, err
-	case 5: // field.app_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_AppField{enums.AppPlaceholderFieldEnum_AppPlaceholderField(x)}
-		return true, err
-	case 6: // field.location_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_LocationField{enums.LocationPlaceholderFieldEnum_LocationPlaceholderField(x)}
-		return true, err
-	case 7: // field.affiliate_location_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_AffiliateLocationField{enums.AffiliateLocationPlaceholderFieldEnum_AffiliateLocationPlaceholderField(x)}
-		return true, err
-	case 8: // field.callout_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_CalloutField{enums.CalloutPlaceholderFieldEnum_CalloutPlaceholderField(x)}
-		return true, err
-	case 9: // field.structured_snippet_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_StructuredSnippetField{enums.StructuredSnippetPlaceholderFieldEnum_StructuredSnippetPlaceholderField(x)}
-		return true, err
-	case 10: // field.message_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_MessageField{enums.MessagePlaceholderFieldEnum_MessagePlaceholderField(x)}
-		return true, err
-	case 11: // field.price_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_PriceField{enums.PricePlaceholderFieldEnum_PricePlaceholderField(x)}
-		return true, err
-	case 12: // field.promotion_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_PromotionField{enums.PromotionPlaceholderFieldEnum_PromotionPlaceholderField(x)}
-		return true, err
-	case 13: // field.ad_customizer_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_AdCustomizerField{enums.AdCustomizerPlaceholderFieldEnum_AdCustomizerPlaceholderField(x)}
-		return true, err
-	case 14: // field.dsa_page_feed_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_DsaPageFeedField{enums.DsaPageFeedCriterionFieldEnum_DsaPageFeedCriterionField(x)}
-		return true, err
-	case 15: // field.location_extension_targeting_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_LocationExtensionTargetingField{enums.LocationExtensionTargetingCriterionFieldEnum_LocationExtensionTargetingCriterionField(x)}
-		return true, err
-	case 16: // field.education_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_EducationField{enums.EducationPlaceholderFieldEnum_EducationPlaceholderField(x)}
-		return true, err
-	case 17: // field.flight_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_FlightField{enums.FlightPlaceholderFieldEnum_FlightPlaceholderField(x)}
-		return true, err
-	case 18: // field.custom_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_CustomField{enums.CustomPlaceholderFieldEnum_CustomPlaceholderField(x)}
-		return true, err
-	case 19: // field.hotel_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_HotelField{enums.HotelPlaceholderFieldEnum_HotelPlaceholderField(x)}
-		return true, err
-	case 20: // field.real_estate_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_RealEstateField{enums.RealEstatePlaceholderFieldEnum_RealEstatePlaceholderField(x)}
-		return true, err
-	case 21: // field.travel_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_TravelField{enums.TravelPlaceholderFieldEnum_TravelPlaceholderField(x)}
-		return true, err
-	case 22: // field.local_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_LocalField{enums.LocalPlaceholderFieldEnum_LocalPlaceholderField(x)}
-		return true, err
-	case 23: // field.job_field
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Field = &AttributeFieldMapping_JobField{enums.JobPlaceholderFieldEnum_JobPlaceholderField(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AttributeFieldMapping_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AttributeFieldMapping)
-	// field
-	switch x := m.Field.(type) {
-	case *AttributeFieldMapping_SitelinkField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.SitelinkField))
-	case *AttributeFieldMapping_CallField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CallField))
-	case *AttributeFieldMapping_AppField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.AppField))
-	case *AttributeFieldMapping_LocationField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.LocationField))
-	case *AttributeFieldMapping_AffiliateLocationField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.AffiliateLocationField))
-	case *AttributeFieldMapping_CalloutField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CalloutField))
-	case *AttributeFieldMapping_StructuredSnippetField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.StructuredSnippetField))
-	case *AttributeFieldMapping_MessageField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.MessageField))
-	case *AttributeFieldMapping_PriceField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.PriceField))
-	case *AttributeFieldMapping_PromotionField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.PromotionField))
-	case *AttributeFieldMapping_AdCustomizerField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.AdCustomizerField))
-	case *AttributeFieldMapping_DsaPageFeedField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.DsaPageFeedField))
-	case *AttributeFieldMapping_LocationExtensionTargetingField:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.LocationExtensionTargetingField))
-	case *AttributeFieldMapping_EducationField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.EducationField))
-	case *AttributeFieldMapping_FlightField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.FlightField))
-	case *AttributeFieldMapping_CustomField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.CustomField))
-	case *AttributeFieldMapping_HotelField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.HotelField))
-	case *AttributeFieldMapping_RealEstateField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.RealEstateField))
-	case *AttributeFieldMapping_TravelField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.TravelField))
-	case *AttributeFieldMapping_LocalField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.LocalField))
-	case *AttributeFieldMapping_JobField:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.JobField))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*FeedMapping)(nil), "google.ads.googleads.v1.resources.FeedMapping")
 	proto.RegisterType((*AttributeFieldMapping)(nil), "google.ads.googleads.v1.resources.AttributeFieldMapping")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/feed_mapping.proto", fileDescriptor_feed_mapping_c1c27da2bf9a0d52)
+	proto.RegisterFile("google/ads/googleads/v1/resources/feed_mapping.proto", fileDescriptor_664f64bb6423b1b2)
 }
 
-var fileDescriptor_feed_mapping_c1c27da2bf9a0d52 = []byte{
+var fileDescriptor_664f64bb6423b1b2 = []byte{
 	// 1316 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x4d, 0x6f, 0xe4, 0x44,
 	0x13, 0xc7, 0xed, 0x6c, 0x5e, 0x7b, 0xf2, 0x3a, 0x79, 0x36, 0xcf, 0x68, 0x59, 0x41, 0x36, 0x68,
diff --git a/googleapis/ads/googleads/v1/resources/feed_placeholder_view.pb.go b/googleapis/ads/googleads/v1/resources/feed_placeholder_view.pb.go
index 2f015c4af3..a11c99a0d5 100644
--- a/googleapis/ads/googleads/v1/resources/feed_placeholder_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/feed_placeholder_view.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/feed_placeholder_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A feed placeholder view.
 type FeedPlaceholderView struct {
@@ -38,16 +41,17 @@ func (m *FeedPlaceholderView) Reset()         { *m = FeedPlaceholderView{} }
 func (m *FeedPlaceholderView) String() string { return proto.CompactTextString(m) }
 func (*FeedPlaceholderView) ProtoMessage()    {}
 func (*FeedPlaceholderView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_placeholder_view_1c94e4ff449c09ba, []int{0}
+	return fileDescriptor_84882bb262f263ab, []int{0}
 }
+
 func (m *FeedPlaceholderView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedPlaceholderView.Unmarshal(m, b)
 }
 func (m *FeedPlaceholderView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedPlaceholderView.Marshal(b, m, deterministic)
 }
-func (dst *FeedPlaceholderView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedPlaceholderView.Merge(dst, src)
+func (m *FeedPlaceholderView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedPlaceholderView.Merge(m, src)
 }
 func (m *FeedPlaceholderView) XXX_Size() int {
 	return xxx_messageInfo_FeedPlaceholderView.Size(m)
@@ -77,10 +81,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/feed_placeholder_view.proto", fileDescriptor_feed_placeholder_view_1c94e4ff449c09ba)
+	proto.RegisterFile("google/ads/googleads/v1/resources/feed_placeholder_view.proto", fileDescriptor_84882bb262f263ab)
 }
 
-var fileDescriptor_feed_placeholder_view_1c94e4ff449c09ba = []byte{
+var fileDescriptor_84882bb262f263ab = []byte{
 	// 333 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcd, 0x4a, 0x3b, 0x31,
 	0x14, 0xc5, 0x99, 0xf9, 0xc3, 0x1f, 0x1c, 0xfc, 0xa2, 0x6e, 0x4a, 0x71, 0xd1, 0x2a, 0x85, 0xae,
diff --git a/googleapis/ads/googleads/v1/resources/gender_view.pb.go b/googleapis/ads/googleads/v1/resources/gender_view.pb.go
index 6a01e7816a..773058bfe7 100644
--- a/googleapis/ads/googleads/v1/resources/gender_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/gender_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/gender_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A gender view.
 type GenderView struct {
@@ -35,16 +38,17 @@ func (m *GenderView) Reset()         { *m = GenderView{} }
 func (m *GenderView) String() string { return proto.CompactTextString(m) }
 func (*GenderView) ProtoMessage()    {}
 func (*GenderView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_gender_view_a5fa3e0190fff0f4, []int{0}
+	return fileDescriptor_1caf9d1d919debe3, []int{0}
 }
+
 func (m *GenderView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenderView.Unmarshal(m, b)
 }
 func (m *GenderView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenderView.Marshal(b, m, deterministic)
 }
-func (dst *GenderView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenderView.Merge(dst, src)
+func (m *GenderView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenderView.Merge(m, src)
 }
 func (m *GenderView) XXX_Size() int {
 	return xxx_messageInfo_GenderView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/gender_view.proto", fileDescriptor_gender_view_a5fa3e0190fff0f4)
+	proto.RegisterFile("google/ads/googleads/v1/resources/gender_view.proto", fileDescriptor_1caf9d1d919debe3)
 }
 
-var fileDescriptor_gender_view_a5fa3e0190fff0f4 = []byte{
+var fileDescriptor_1caf9d1d919debe3 = []byte{
 	// 262 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x31, 0x4b, 0xc4, 0x30,
 	0x14, 0xc7, 0x69, 0x05, 0xc1, 0xa0, 0x08, 0x37, 0x89, 0x38, 0x78, 0xca, 0x81, 0x53, 0x42, 0xb8,
diff --git a/googleapis/ads/googleads/v1/resources/geo_target_constant.pb.go b/googleapis/ads/googleads/v1/resources/geo_target_constant.pb.go
index 64d5cafeed..420854a2ae 100644
--- a/googleapis/ads/googleads/v1/resources/geo_target_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/geo_target_constant.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/geo_target_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A geo target constant.
 type GeoTargetConstant struct {
@@ -50,16 +53,17 @@ func (m *GeoTargetConstant) Reset()         { *m = GeoTargetConstant{} }
 func (m *GeoTargetConstant) String() string { return proto.CompactTextString(m) }
 func (*GeoTargetConstant) ProtoMessage()    {}
 func (*GeoTargetConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_45d3d633f73a7113, []int{0}
+	return fileDescriptor_e598a341d42b96a1, []int{0}
 }
+
 func (m *GeoTargetConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoTargetConstant.Unmarshal(m, b)
 }
 func (m *GeoTargetConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoTargetConstant.Marshal(b, m, deterministic)
 }
-func (dst *GeoTargetConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoTargetConstant.Merge(dst, src)
+func (m *GeoTargetConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoTargetConstant.Merge(m, src)
 }
 func (m *GeoTargetConstant) XXX_Size() int {
 	return xxx_messageInfo_GeoTargetConstant.Size(m)
@@ -124,10 +128,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/geo_target_constant.proto", fileDescriptor_geo_target_constant_45d3d633f73a7113)
+	proto.RegisterFile("google/ads/googleads/v1/resources/geo_target_constant.proto", fileDescriptor_e598a341d42b96a1)
 }
 
-var fileDescriptor_geo_target_constant_45d3d633f73a7113 = []byte{
+var fileDescriptor_e598a341d42b96a1 = []byte{
 	// 456 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6b, 0xd4, 0x40,
 	0x14, 0xc7, 0x49, 0xb6, 0xae, 0x3a, 0xdb, 0x16, 0xcc, 0x41, 0x42, 0x2d, 0xb2, 0x55, 0x0a, 0x0b,
diff --git a/googleapis/ads/googleads/v1/resources/geographic_view.pb.go b/googleapis/ads/googleads/v1/resources/geographic_view.pb.go
index f450a2b812..8baa0cdf20 100644
--- a/googleapis/ads/googleads/v1/resources/geographic_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/geographic_view.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/geographic_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A geographic view.
 //
@@ -47,16 +50,17 @@ func (m *GeographicView) Reset()         { *m = GeographicView{} }
 func (m *GeographicView) String() string { return proto.CompactTextString(m) }
 func (*GeographicView) ProtoMessage()    {}
 func (*GeographicView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geographic_view_6565bde3f2de1438, []int{0}
+	return fileDescriptor_45a03e49a5e672c5, []int{0}
 }
+
 func (m *GeographicView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeographicView.Unmarshal(m, b)
 }
 func (m *GeographicView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeographicView.Marshal(b, m, deterministic)
 }
-func (dst *GeographicView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeographicView.Merge(dst, src)
+func (m *GeographicView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeographicView.Merge(m, src)
 }
 func (m *GeographicView) XXX_Size() int {
 	return xxx_messageInfo_GeographicView.Size(m)
@@ -93,10 +97,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/geographic_view.proto", fileDescriptor_geographic_view_6565bde3f2de1438)
+	proto.RegisterFile("google/ads/googleads/v1/resources/geographic_view.proto", fileDescriptor_45a03e49a5e672c5)
 }
 
-var fileDescriptor_geographic_view_6565bde3f2de1438 = []byte{
+var fileDescriptor_45a03e49a5e672c5 = []byte{
 	// 402 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x41, 0x8b, 0xd4, 0x30,
 	0x18, 0xa5, 0x5d, 0x10, 0xac, 0xbb, 0x7b, 0xa8, 0x97, 0xb2, 0x2e, 0x32, 0xab, 0x2c, 0xcc, 0x29,
diff --git a/googleapis/ads/googleads/v1/resources/google_ads_field.pb.go b/googleapis/ads/googleads/v1/resources/google_ads_field.pb.go
index 69e1904caf..1ebc0eaf75 100644
--- a/googleapis/ads/googleads/v1/resources/google_ads_field.pb.go
+++ b/googleapis/ads/googleads/v1/resources/google_ads_field.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/google_ads_field.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A field or resource (artifact) used by GoogleAdsService.
 type GoogleAdsField struct {
@@ -88,16 +91,17 @@ func (m *GoogleAdsField) Reset()         { *m = GoogleAdsField{} }
 func (m *GoogleAdsField) String() string { return proto.CompactTextString(m) }
 func (*GoogleAdsField) ProtoMessage()    {}
 func (*GoogleAdsField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_cf081ba62a41af56, []int{0}
+	return fileDescriptor_0c6569d4aa3b558c, []int{0}
 }
+
 func (m *GoogleAdsField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoogleAdsField.Unmarshal(m, b)
 }
 func (m *GoogleAdsField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoogleAdsField.Marshal(b, m, deterministic)
 }
-func (dst *GoogleAdsField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoogleAdsField.Merge(dst, src)
+func (m *GoogleAdsField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleAdsField.Merge(m, src)
 }
 func (m *GoogleAdsField) XXX_Size() int {
 	return xxx_messageInfo_GoogleAdsField.Size(m)
@@ -211,10 +215,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/google_ads_field.proto", fileDescriptor_google_ads_field_cf081ba62a41af56)
+	proto.RegisterFile("google/ads/googleads/v1/resources/google_ads_field.proto", fileDescriptor_0c6569d4aa3b558c)
 }
 
-var fileDescriptor_google_ads_field_cf081ba62a41af56 = []byte{
+var fileDescriptor_0c6569d4aa3b558c = []byte{
 	// 581 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xdd, 0x6a, 0x13, 0x41,
 	0x14, 0xc7, 0x49, 0x52, 0x9b, 0xcd, 0xa4, 0x8d, 0x30, 0xbd, 0x59, 0x42, 0x91, 0x54, 0x29, 0xe4,
diff --git a/googleapis/ads/googleads/v1/resources/group_placement_view.pb.go b/googleapis/ads/googleads/v1/resources/group_placement_view.pb.go
index 7836f265ca..24ba5247ac 100644
--- a/googleapis/ads/googleads/v1/resources/group_placement_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/group_placement_view.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/group_placement_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A group placement view.
 type GroupPlacementView struct {
@@ -48,16 +51,17 @@ func (m *GroupPlacementView) Reset()         { *m = GroupPlacementView{} }
 func (m *GroupPlacementView) String() string { return proto.CompactTextString(m) }
 func (*GroupPlacementView) ProtoMessage()    {}
 func (*GroupPlacementView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_placement_view_0b45087a197a7439, []int{0}
+	return fileDescriptor_40a38bfc66391954, []int{0}
 }
+
 func (m *GroupPlacementView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupPlacementView.Unmarshal(m, b)
 }
 func (m *GroupPlacementView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupPlacementView.Marshal(b, m, deterministic)
 }
-func (dst *GroupPlacementView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupPlacementView.Merge(dst, src)
+func (m *GroupPlacementView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupPlacementView.Merge(m, src)
 }
 func (m *GroupPlacementView) XXX_Size() int {
 	return xxx_messageInfo_GroupPlacementView.Size(m)
@@ -108,10 +112,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/group_placement_view.proto", fileDescriptor_group_placement_view_0b45087a197a7439)
+	proto.RegisterFile("google/ads/googleads/v1/resources/group_placement_view.proto", fileDescriptor_40a38bfc66391954)
 }
 
-var fileDescriptor_group_placement_view_0b45087a197a7439 = []byte{
+var fileDescriptor_40a38bfc66391954 = []byte{
 	// 415 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x8a, 0xd4, 0x30,
 	0x14, 0xa6, 0x5d, 0x15, 0x36, 0xfb, 0x73, 0xd1, 0x1b, 0x87, 0x65, 0x91, 0x59, 0x65, 0x61, 0xae,
diff --git a/googleapis/ads/googleads/v1/resources/hotel_group_view.pb.go b/googleapis/ads/googleads/v1/resources/hotel_group_view.pb.go
index 413293305b..434e013313 100644
--- a/googleapis/ads/googleads/v1/resources/hotel_group_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/hotel_group_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/hotel_group_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A hotel group view.
 type HotelGroupView struct {
@@ -35,16 +38,17 @@ func (m *HotelGroupView) Reset()         { *m = HotelGroupView{} }
 func (m *HotelGroupView) String() string { return proto.CompactTextString(m) }
 func (*HotelGroupView) ProtoMessage()    {}
 func (*HotelGroupView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_group_view_1f6cdac5d30c3d49, []int{0}
+	return fileDescriptor_fa913b710ae8e895, []int{0}
 }
+
 func (m *HotelGroupView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelGroupView.Unmarshal(m, b)
 }
 func (m *HotelGroupView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelGroupView.Marshal(b, m, deterministic)
 }
-func (dst *HotelGroupView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelGroupView.Merge(dst, src)
+func (m *HotelGroupView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelGroupView.Merge(m, src)
 }
 func (m *HotelGroupView) XXX_Size() int {
 	return xxx_messageInfo_HotelGroupView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/hotel_group_view.proto", fileDescriptor_hotel_group_view_1f6cdac5d30c3d49)
+	proto.RegisterFile("google/ads/googleads/v1/resources/hotel_group_view.proto", fileDescriptor_fa913b710ae8e895)
 }
 
-var fileDescriptor_hotel_group_view_1f6cdac5d30c3d49 = []byte{
+var fileDescriptor_fa913b710ae8e895 = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xb1, 0x4a, 0xc4, 0x30,
 	0x18, 0xc7, 0x69, 0x05, 0xc1, 0xa2, 0x0e, 0xe7, 0x22, 0xe2, 0xe0, 0x29, 0x07, 0x4e, 0x09, 0x41,
diff --git a/googleapis/ads/googleads/v1/resources/hotel_performance_view.pb.go b/googleapis/ads/googleads/v1/resources/hotel_performance_view.pb.go
index 62c22aaa3a..ee0b515fbc 100644
--- a/googleapis/ads/googleads/v1/resources/hotel_performance_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/hotel_performance_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/hotel_performance_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A hotel performance view.
 type HotelPerformanceView struct {
@@ -35,16 +38,17 @@ func (m *HotelPerformanceView) Reset()         { *m = HotelPerformanceView{} }
 func (m *HotelPerformanceView) String() string { return proto.CompactTextString(m) }
 func (*HotelPerformanceView) ProtoMessage()    {}
 func (*HotelPerformanceView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_performance_view_82509a48fa090f7b, []int{0}
+	return fileDescriptor_fae7911ba81f9657, []int{0}
 }
+
 func (m *HotelPerformanceView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HotelPerformanceView.Unmarshal(m, b)
 }
 func (m *HotelPerformanceView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HotelPerformanceView.Marshal(b, m, deterministic)
 }
-func (dst *HotelPerformanceView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HotelPerformanceView.Merge(dst, src)
+func (m *HotelPerformanceView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HotelPerformanceView.Merge(m, src)
 }
 func (m *HotelPerformanceView) XXX_Size() int {
 	return xxx_messageInfo_HotelPerformanceView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/hotel_performance_view.proto", fileDescriptor_hotel_performance_view_82509a48fa090f7b)
+	proto.RegisterFile("google/ads/googleads/v1/resources/hotel_performance_view.proto", fileDescriptor_fae7911ba81f9657)
 }
 
-var fileDescriptor_hotel_performance_view_82509a48fa090f7b = []byte{
+var fileDescriptor_fae7911ba81f9657 = []byte{
 	// 278 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x4a, 0xf4, 0x30,
 	0x18, 0xc6, 0x69, 0x3f, 0xf8, 0xc0, 0xa2, 0x9b, 0xc1, 0x85, 0x8a, 0x0b, 0x47, 0x19, 0x70, 0x95,
diff --git a/googleapis/ads/googleads/v1/resources/keyword_plan.pb.go b/googleapis/ads/googleads/v1/resources/keyword_plan.pb.go
index 424e53605b..47d2e9ca40 100644
--- a/googleapis/ads/googleads/v1/resources/keyword_plan.pb.go
+++ b/googleapis/ads/googleads/v1/resources/keyword_plan.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/keyword_plan.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Keyword Planner plan.
 // Max number of saved keyword plans: 10000.
@@ -49,16 +52,17 @@ func (m *KeywordPlan) Reset()         { *m = KeywordPlan{} }
 func (m *KeywordPlan) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlan) ProtoMessage()    {}
 func (*KeywordPlan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_683d8e3ecae641c5, []int{0}
+	return fileDescriptor_b229f482c8618309, []int{0}
 }
+
 func (m *KeywordPlan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlan.Unmarshal(m, b)
 }
 func (m *KeywordPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlan.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlan.Merge(dst, src)
+func (m *KeywordPlan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlan.Merge(m, src)
 }
 func (m *KeywordPlan) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlan.Size(m)
@@ -114,16 +118,17 @@ func (m *KeywordPlanForecastPeriod) Reset()         { *m = KeywordPlanForecastPe
 func (m *KeywordPlanForecastPeriod) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanForecastPeriod) ProtoMessage()    {}
 func (*KeywordPlanForecastPeriod) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_683d8e3ecae641c5, []int{1}
+	return fileDescriptor_b229f482c8618309, []int{1}
 }
+
 func (m *KeywordPlanForecastPeriod) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanForecastPeriod.Unmarshal(m, b)
 }
 func (m *KeywordPlanForecastPeriod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanForecastPeriod.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanForecastPeriod) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanForecastPeriod.Merge(dst, src)
+func (m *KeywordPlanForecastPeriod) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanForecastPeriod.Merge(m, src)
 }
 func (m *KeywordPlanForecastPeriod) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanForecastPeriod.Size(m)
@@ -171,85 +176,24 @@ func (m *KeywordPlanForecastPeriod) GetDateRange() *common.DateRange {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*KeywordPlanForecastPeriod) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _KeywordPlanForecastPeriod_OneofMarshaler, _KeywordPlanForecastPeriod_OneofUnmarshaler, _KeywordPlanForecastPeriod_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*KeywordPlanForecastPeriod) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*KeywordPlanForecastPeriod_DateInterval)(nil),
 		(*KeywordPlanForecastPeriod_DateRange)(nil),
 	}
 }
 
-func _KeywordPlanForecastPeriod_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*KeywordPlanForecastPeriod)
-	// interval
-	switch x := m.Interval.(type) {
-	case *KeywordPlanForecastPeriod_DateInterval:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.DateInterval))
-	case *KeywordPlanForecastPeriod_DateRange:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateRange); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("KeywordPlanForecastPeriod.Interval has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _KeywordPlanForecastPeriod_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*KeywordPlanForecastPeriod)
-	switch tag {
-	case 1: // interval.date_interval
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Interval = &KeywordPlanForecastPeriod_DateInterval{enums.KeywordPlanForecastIntervalEnum_KeywordPlanForecastInterval(x)}
-		return true, err
-	case 2: // interval.date_range
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.DateRange)
-		err := b.DecodeMessage(msg)
-		m.Interval = &KeywordPlanForecastPeriod_DateRange{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _KeywordPlanForecastPeriod_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*KeywordPlanForecastPeriod)
-	// interval
-	switch x := m.Interval.(type) {
-	case *KeywordPlanForecastPeriod_DateInterval:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.DateInterval))
-	case *KeywordPlanForecastPeriod_DateRange:
-		s := proto.Size(x.DateRange)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*KeywordPlan)(nil), "google.ads.googleads.v1.resources.KeywordPlan")
 	proto.RegisterType((*KeywordPlanForecastPeriod)(nil), "google.ads.googleads.v1.resources.KeywordPlanForecastPeriod")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan.proto", fileDescriptor_keyword_plan_683d8e3ecae641c5)
+	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan.proto", fileDescriptor_b229f482c8618309)
 }
 
-var fileDescriptor_keyword_plan_683d8e3ecae641c5 = []byte{
+var fileDescriptor_b229f482c8618309 = []byte{
 	// 486 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xdd, 0x6a, 0xd4, 0x40,
 	0x14, 0xc7, 0x9b, 0xb4, 0x88, 0x9d, 0x7e, 0x28, 0xb9, 0x5a, 0x6b, 0x91, 0xb6, 0x52, 0xa8, 0x0a,
diff --git a/googleapis/ads/googleads/v1/resources/keyword_plan_ad_group.pb.go b/googleapis/ads/googleads/v1/resources/keyword_plan_ad_group.pb.go
index f3ec16d439..b9d8e15533 100644
--- a/googleapis/ads/googleads/v1/resources/keyword_plan_ad_group.pb.go
+++ b/googleapis/ads/googleads/v1/resources/keyword_plan_ad_group.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/keyword_plan_ad_group.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Keyword Planner ad group.
 // Max number of keyword plan ad groups per plan: 200.
@@ -50,16 +53,17 @@ func (m *KeywordPlanAdGroup) Reset()         { *m = KeywordPlanAdGroup{} }
 func (m *KeywordPlanAdGroup) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanAdGroup) ProtoMessage()    {}
 func (*KeywordPlanAdGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_57f0587f66d3b006, []int{0}
+	return fileDescriptor_b67654cd741a0162, []int{0}
 }
+
 func (m *KeywordPlanAdGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanAdGroup.Unmarshal(m, b)
 }
 func (m *KeywordPlanAdGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanAdGroup.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanAdGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanAdGroup.Merge(dst, src)
+func (m *KeywordPlanAdGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanAdGroup.Merge(m, src)
 }
 func (m *KeywordPlanAdGroup) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanAdGroup.Size(m)
@@ -110,10 +114,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_ad_group.proto", fileDescriptor_keyword_plan_ad_group_57f0587f66d3b006)
+	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_ad_group.proto", fileDescriptor_b67654cd741a0162)
 }
 
-var fileDescriptor_keyword_plan_ad_group_57f0587f66d3b006 = []byte{
+var fileDescriptor_b67654cd741a0162 = []byte{
 	// 398 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0xaa, 0xd4, 0x30,
 	0x18, 0x85, 0x69, 0xee, 0x55, 0x30, 0x5e, 0x5d, 0x54, 0xc4, 0x72, 0xbd, 0xc8, 0x8c, 0x32, 0x30,
diff --git a/googleapis/ads/googleads/v1/resources/keyword_plan_campaign.pb.go b/googleapis/ads/googleads/v1/resources/keyword_plan_campaign.pb.go
index 7df20f0653..46e8ac813c 100644
--- a/googleapis/ads/googleads/v1/resources/keyword_plan_campaign.pb.go
+++ b/googleapis/ads/googleads/v1/resources/keyword_plan_campaign.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/keyword_plan_campaign.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Keyword Plan campaign.
 // Max number of keyword plan campaigns per plan allowed: 1.
@@ -64,16 +67,17 @@ func (m *KeywordPlanCampaign) Reset()         { *m = KeywordPlanCampaign{} }
 func (m *KeywordPlanCampaign) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanCampaign) ProtoMessage()    {}
 func (*KeywordPlanCampaign) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_f00db65e7bd65657, []int{0}
+	return fileDescriptor_1f4e57860a6ad48d, []int{0}
 }
+
 func (m *KeywordPlanCampaign) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanCampaign.Unmarshal(m, b)
 }
 func (m *KeywordPlanCampaign) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanCampaign.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanCampaign) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanCampaign.Merge(dst, src)
+func (m *KeywordPlanCampaign) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanCampaign.Merge(m, src)
 }
 func (m *KeywordPlanCampaign) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanCampaign.Size(m)
@@ -154,16 +158,17 @@ func (m *KeywordPlanGeoTarget) Reset()         { *m = KeywordPlanGeoTarget{} }
 func (m *KeywordPlanGeoTarget) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanGeoTarget) ProtoMessage()    {}
 func (*KeywordPlanGeoTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_f00db65e7bd65657, []int{1}
+	return fileDescriptor_1f4e57860a6ad48d, []int{1}
 }
+
 func (m *KeywordPlanGeoTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanGeoTarget.Unmarshal(m, b)
 }
 func (m *KeywordPlanGeoTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanGeoTarget.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanGeoTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanGeoTarget.Merge(dst, src)
+func (m *KeywordPlanGeoTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanGeoTarget.Merge(m, src)
 }
 func (m *KeywordPlanGeoTarget) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanGeoTarget.Size(m)
@@ -187,10 +192,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_campaign.proto", fileDescriptor_keyword_plan_campaign_f00db65e7bd65657)
+	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_campaign.proto", fileDescriptor_1f4e57860a6ad48d)
 }
 
-var fileDescriptor_keyword_plan_campaign_f00db65e7bd65657 = []byte{
+var fileDescriptor_1f4e57860a6ad48d = []byte{
 	// 523 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xd1, 0x8a, 0x13, 0x31,
 	0x14, 0x86, 0xe9, 0xb4, 0xae, 0x9a, 0xd6, 0x05, 0xb3, 0x7b, 0x31, 0xac, 0x8b, 0x74, 0x57, 0x16,
diff --git a/googleapis/ads/googleads/v1/resources/keyword_plan_keyword.pb.go b/googleapis/ads/googleads/v1/resources/keyword_plan_keyword.pb.go
index bf388e816d..b1ddf55ce2 100644
--- a/googleapis/ads/googleads/v1/resources/keyword_plan_keyword.pb.go
+++ b/googleapis/ads/googleads/v1/resources/keyword_plan_keyword.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/keyword_plan_keyword.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Keyword Plan ad group keyword.
 // Max number of keyword plan keywords per plan: 2500.
@@ -49,16 +52,17 @@ func (m *KeywordPlanKeyword) Reset()         { *m = KeywordPlanKeyword{} }
 func (m *KeywordPlanKeyword) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanKeyword) ProtoMessage()    {}
 func (*KeywordPlanKeyword) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_93af4dbc1a58d5ba, []int{0}
+	return fileDescriptor_50ba98432990bcb2, []int{0}
 }
+
 func (m *KeywordPlanKeyword) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanKeyword.Unmarshal(m, b)
 }
 func (m *KeywordPlanKeyword) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanKeyword.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanKeyword) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanKeyword.Merge(dst, src)
+func (m *KeywordPlanKeyword) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanKeyword.Merge(m, src)
 }
 func (m *KeywordPlanKeyword) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanKeyword.Size(m)
@@ -116,10 +120,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_keyword.proto", fileDescriptor_keyword_plan_keyword_93af4dbc1a58d5ba)
+	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_keyword.proto", fileDescriptor_50ba98432990bcb2)
 }
 
-var fileDescriptor_keyword_plan_keyword_93af4dbc1a58d5ba = []byte{
+var fileDescriptor_50ba98432990bcb2 = []byte{
 	// 453 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6a, 0x14, 0x31,
 	0x18, 0xc7, 0x99, 0xd9, 0x5a, 0x68, 0xac, 0x3d, 0x04, 0xc4, 0xa1, 0x16, 0xd9, 0x2a, 0x85, 0x05,
diff --git a/googleapis/ads/googleads/v1/resources/keyword_plan_negative_keyword.pb.go b/googleapis/ads/googleads/v1/resources/keyword_plan_negative_keyword.pb.go
index e3ddf6b861..bc1b6aa237 100644
--- a/googleapis/ads/googleads/v1/resources/keyword_plan_negative_keyword.pb.go
+++ b/googleapis/ads/googleads/v1/resources/keyword_plan_negative_keyword.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/keyword_plan_negative_keyword.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Keyword Plan negative keyword.
 // Max number of keyword plan negative keywords per plan: 1000.
@@ -47,16 +50,17 @@ func (m *KeywordPlanNegativeKeyword) Reset()         { *m = KeywordPlanNegativeK
 func (m *KeywordPlanNegativeKeyword) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanNegativeKeyword) ProtoMessage()    {}
 func (*KeywordPlanNegativeKeyword) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_5104ab403d28b07d, []int{0}
+	return fileDescriptor_bc44a5c087ed7942, []int{0}
 }
+
 func (m *KeywordPlanNegativeKeyword) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanNegativeKeyword.Unmarshal(m, b)
 }
 func (m *KeywordPlanNegativeKeyword) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanNegativeKeyword.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanNegativeKeyword) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanNegativeKeyword.Merge(dst, src)
+func (m *KeywordPlanNegativeKeyword) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanNegativeKeyword.Merge(m, src)
 }
 func (m *KeywordPlanNegativeKeyword) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanNegativeKeyword.Size(m)
@@ -107,10 +111,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_negative_keyword.proto", fileDescriptor_keyword_plan_negative_keyword_5104ab403d28b07d)
+	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_plan_negative_keyword.proto", fileDescriptor_bc44a5c087ed7942)
 }
 
-var fileDescriptor_keyword_plan_negative_keyword_5104ab403d28b07d = []byte{
+var fileDescriptor_bc44a5c087ed7942 = []byte{
 	// 436 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x6a, 0x14, 0x31,
 	0x18, 0x65, 0xa6, 0x55, 0x68, 0xfc, 0xb9, 0x18, 0x11, 0x86, 0xb5, 0xe8, 0x56, 0x29, 0x2c, 0x08,
diff --git a/googleapis/ads/googleads/v1/resources/keyword_view.pb.go b/googleapis/ads/googleads/v1/resources/keyword_view.pb.go
index 3ba40a646d..d0e0a54846 100644
--- a/googleapis/ads/googleads/v1/resources/keyword_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/keyword_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/keyword_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A keyword view.
 type KeywordView struct {
@@ -35,16 +38,17 @@ func (m *KeywordView) Reset()         { *m = KeywordView{} }
 func (m *KeywordView) String() string { return proto.CompactTextString(m) }
 func (*KeywordView) ProtoMessage()    {}
 func (*KeywordView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_view_80d6b289c44fb170, []int{0}
+	return fileDescriptor_4c4b375a791b3e16, []int{0}
 }
+
 func (m *KeywordView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordView.Unmarshal(m, b)
 }
 func (m *KeywordView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordView.Marshal(b, m, deterministic)
 }
-func (dst *KeywordView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordView.Merge(dst, src)
+func (m *KeywordView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordView.Merge(m, src)
 }
 func (m *KeywordView) XXX_Size() int {
 	return xxx_messageInfo_KeywordView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_view.proto", fileDescriptor_keyword_view_80d6b289c44fb170)
+	proto.RegisterFile("google/ads/googleads/v1/resources/keyword_view.proto", fileDescriptor_4c4b375a791b3e16)
 }
 
-var fileDescriptor_keyword_view_80d6b289c44fb170 = []byte{
+var fileDescriptor_4c4b375a791b3e16 = []byte{
 	// 266 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x41, 0x4a, 0xc4, 0x30,
 	0x14, 0x86, 0x69, 0x05, 0xc1, 0xaa, 0x20, 0xb3, 0x12, 0x71, 0xe1, 0x28, 0x03, 0xae, 0x12, 0xa2,
diff --git a/googleapis/ads/googleads/v1/resources/label.pb.go b/googleapis/ads/googleads/v1/resources/label.pb.go
index dc260dbf38..4f94fb7139 100644
--- a/googleapis/ads/googleads/v1/resources/label.pb.go
+++ b/googleapis/ads/googleads/v1/resources/label.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/label.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A label.
 type Label struct {
@@ -49,16 +52,17 @@ func (m *Label) Reset()         { *m = Label{} }
 func (m *Label) String() string { return proto.CompactTextString(m) }
 func (*Label) ProtoMessage()    {}
 func (*Label) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_8e99450ed5488248, []int{0}
+	return fileDescriptor_b4f50cd20a4c405a, []int{0}
 }
+
 func (m *Label) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Label.Unmarshal(m, b)
 }
 func (m *Label) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Label.Marshal(b, m, deterministic)
 }
-func (dst *Label) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Label.Merge(dst, src)
+func (m *Label) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Label.Merge(m, src)
 }
 func (m *Label) XXX_Size() int {
 	return xxx_messageInfo_Label.Size(m)
@@ -109,10 +113,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/label.proto", fileDescriptor_label_8e99450ed5488248)
+	proto.RegisterFile("google/ads/googleads/v1/resources/label.proto", fileDescriptor_b4f50cd20a4c405a)
 }
 
-var fileDescriptor_label_8e99450ed5488248 = []byte{
+var fileDescriptor_b4f50cd20a4c405a = []byte{
 	// 411 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcb, 0x8a, 0xdb, 0x30,
 	0x18, 0x85, 0xb1, 0x73, 0x81, 0xa8, 0x97, 0x85, 0x57, 0x26, 0x0d, 0x25, 0x69, 0x09, 0xa4, 0x94,
diff --git a/googleapis/ads/googleads/v1/resources/landing_page_view.pb.go b/googleapis/ads/googleads/v1/resources/landing_page_view.pb.go
index 09bfdbdc0e..d354fed000 100644
--- a/googleapis/ads/googleads/v1/resources/landing_page_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/landing_page_view.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/landing_page_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A landing page view with metrics aggregated at the unexpanded final URL
 // level.
@@ -40,16 +43,17 @@ func (m *LandingPageView) Reset()         { *m = LandingPageView{} }
 func (m *LandingPageView) String() string { return proto.CompactTextString(m) }
 func (*LandingPageView) ProtoMessage()    {}
 func (*LandingPageView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_landing_page_view_64530fca7fef0d58, []int{0}
+	return fileDescriptor_0dcfa31285588a3a, []int{0}
 }
+
 func (m *LandingPageView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LandingPageView.Unmarshal(m, b)
 }
 func (m *LandingPageView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LandingPageView.Marshal(b, m, deterministic)
 }
-func (dst *LandingPageView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LandingPageView.Merge(dst, src)
+func (m *LandingPageView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LandingPageView.Merge(m, src)
 }
 func (m *LandingPageView) XXX_Size() int {
 	return xxx_messageInfo_LandingPageView.Size(m)
@@ -79,10 +83,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/landing_page_view.proto", fileDescriptor_landing_page_view_64530fca7fef0d58)
+	proto.RegisterFile("google/ads/googleads/v1/resources/landing_page_view.proto", fileDescriptor_0dcfa31285588a3a)
 }
 
-var fileDescriptor_landing_page_view_64530fca7fef0d58 = []byte{
+var fileDescriptor_0dcfa31285588a3a = []byte{
 	// 340 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x41, 0x4b, 0xc3, 0x30,
 	0x18, 0x86, 0x69, 0x05, 0xc1, 0xaa, 0x08, 0x65, 0x87, 0x31, 0x86, 0x6c, 0xca, 0x60, 0xa7, 0x94,
diff --git a/googleapis/ads/googleads/v1/resources/language_constant.pb.go b/googleapis/ads/googleads/v1/resources/language_constant.pb.go
index 17079b49d5..4baf154ecd 100644
--- a/googleapis/ads/googleads/v1/resources/language_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/language_constant.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/language_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A language.
 type LanguageConstant struct {
@@ -45,16 +48,17 @@ func (m *LanguageConstant) Reset()         { *m = LanguageConstant{} }
 func (m *LanguageConstant) String() string { return proto.CompactTextString(m) }
 func (*LanguageConstant) ProtoMessage()    {}
 func (*LanguageConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_constant_7d2a7078a26d5ec1, []int{0}
+	return fileDescriptor_74e5fb6fb55865cb, []int{0}
 }
+
 func (m *LanguageConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LanguageConstant.Unmarshal(m, b)
 }
 func (m *LanguageConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LanguageConstant.Marshal(b, m, deterministic)
 }
-func (dst *LanguageConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LanguageConstant.Merge(dst, src)
+func (m *LanguageConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LanguageConstant.Merge(m, src)
 }
 func (m *LanguageConstant) XXX_Size() int {
 	return xxx_messageInfo_LanguageConstant.Size(m)
@@ -105,10 +109,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/language_constant.proto", fileDescriptor_language_constant_7d2a7078a26d5ec1)
+	proto.RegisterFile("google/ads/googleads/v1/resources/language_constant.proto", fileDescriptor_74e5fb6fb55865cb)
 }
 
-var fileDescriptor_language_constant_7d2a7078a26d5ec1 = []byte{
+var fileDescriptor_74e5fb6fb55865cb = []byte{
 	// 371 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xd1, 0x4a, 0xeb, 0x30,
 	0x18, 0xc7, 0x69, 0xb6, 0x73, 0xe0, 0xe4, 0x9c, 0x03, 0x52, 0x10, 0xca, 0x1c, 0xb2, 0x29, 0x83,
diff --git a/googleapis/ads/googleads/v1/resources/location_view.pb.go b/googleapis/ads/googleads/v1/resources/location_view.pb.go
index 5f477b1579..86a3666990 100644
--- a/googleapis/ads/googleads/v1/resources/location_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/location_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/location_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A location view summarizes the performance of campaigns by
 // Location criteria.
@@ -36,16 +39,17 @@ func (m *LocationView) Reset()         { *m = LocationView{} }
 func (m *LocationView) String() string { return proto.CompactTextString(m) }
 func (*LocationView) ProtoMessage()    {}
 func (*LocationView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_view_b17bd9cfa89e2be7, []int{0}
+	return fileDescriptor_3aa3d275dc2bd5c6, []int{0}
 }
+
 func (m *LocationView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationView.Unmarshal(m, b)
 }
 func (m *LocationView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationView.Marshal(b, m, deterministic)
 }
-func (dst *LocationView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationView.Merge(dst, src)
+func (m *LocationView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationView.Merge(m, src)
 }
 func (m *LocationView) XXX_Size() int {
 	return xxx_messageInfo_LocationView.Size(m)
@@ -68,10 +72,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/location_view.proto", fileDescriptor_location_view_b17bd9cfa89e2be7)
+	proto.RegisterFile("google/ads/googleads/v1/resources/location_view.proto", fileDescriptor_3aa3d275dc2bd5c6)
 }
 
-var fileDescriptor_location_view_b17bd9cfa89e2be7 = []byte{
+var fileDescriptor_3aa3d275dc2bd5c6 = []byte{
 	// 264 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4d, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xa2, 0xd4,
diff --git a/googleapis/ads/googleads/v1/resources/managed_placement_view.pb.go b/googleapis/ads/googleads/v1/resources/managed_placement_view.pb.go
index b4436cac8d..b5d29e4021 100644
--- a/googleapis/ads/googleads/v1/resources/managed_placement_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/managed_placement_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/managed_placement_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A managed placement view.
 type ManagedPlacementView struct {
@@ -36,16 +39,17 @@ func (m *ManagedPlacementView) Reset()         { *m = ManagedPlacementView{} }
 func (m *ManagedPlacementView) String() string { return proto.CompactTextString(m) }
 func (*ManagedPlacementView) ProtoMessage()    {}
 func (*ManagedPlacementView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_managed_placement_view_ec6979a30e876ecb, []int{0}
+	return fileDescriptor_6953f60267bddfaf, []int{0}
 }
+
 func (m *ManagedPlacementView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManagedPlacementView.Unmarshal(m, b)
 }
 func (m *ManagedPlacementView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManagedPlacementView.Marshal(b, m, deterministic)
 }
-func (dst *ManagedPlacementView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManagedPlacementView.Merge(dst, src)
+func (m *ManagedPlacementView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedPlacementView.Merge(m, src)
 }
 func (m *ManagedPlacementView) XXX_Size() int {
 	return xxx_messageInfo_ManagedPlacementView.Size(m)
@@ -68,10 +72,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/managed_placement_view.proto", fileDescriptor_managed_placement_view_ec6979a30e876ecb)
+	proto.RegisterFile("google/ads/googleads/v1/resources/managed_placement_view.proto", fileDescriptor_6953f60267bddfaf)
 }
 
-var fileDescriptor_managed_placement_view_ec6979a30e876ecb = []byte{
+var fileDescriptor_6953f60267bddfaf = []byte{
 	// 275 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x4a, 0xc4, 0x30,
 	0x14, 0xc6, 0x99, 0x0a, 0x82, 0x45, 0x37, 0x83, 0x0b, 0x15, 0x17, 0x8e, 0x32, 0xe0, 0x2a, 0xa1,
diff --git a/googleapis/ads/googleads/v1/resources/media_file.pb.go b/googleapis/ads/googleads/v1/resources/media_file.pb.go
index e4defc6479..d639b7f9e2 100644
--- a/googleapis/ads/googleads/v1/resources/media_file.pb.go
+++ b/googleapis/ads/googleads/v1/resources/media_file.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/media_file.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A media file.
 type MediaFile struct {
@@ -59,16 +62,17 @@ func (m *MediaFile) Reset()         { *m = MediaFile{} }
 func (m *MediaFile) String() string { return proto.CompactTextString(m) }
 func (*MediaFile) ProtoMessage()    {}
 func (*MediaFile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_4cd852e94bdefecd, []int{0}
+	return fileDescriptor_7ffee613242502eb, []int{0}
 }
+
 func (m *MediaFile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaFile.Unmarshal(m, b)
 }
 func (m *MediaFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaFile.Marshal(b, m, deterministic)
 }
-func (dst *MediaFile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaFile.Merge(dst, src)
+func (m *MediaFile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaFile.Merge(m, src)
 }
 func (m *MediaFile) XXX_Size() int {
 	return xxx_messageInfo_MediaFile.Size(m)
@@ -191,9 +195,9 @@ func (m *MediaFile) GetVideo() *MediaVideo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MediaFile) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MediaFile_OneofMarshaler, _MediaFile_OneofUnmarshaler, _MediaFile_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MediaFile) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MediaFile_Image)(nil),
 		(*MediaFile_MediaBundle)(nil),
 		(*MediaFile_Audio)(nil),
@@ -201,108 +205,6 @@ func (*MediaFile) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) err
 	}
 }
 
-func _MediaFile_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MediaFile)
-	// mediatype
-	switch x := m.Mediatype.(type) {
-	case *MediaFile_Image:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Image); err != nil {
-			return err
-		}
-	case *MediaFile_MediaBundle:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MediaBundle); err != nil {
-			return err
-		}
-	case *MediaFile_Audio:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Audio); err != nil {
-			return err
-		}
-	case *MediaFile_Video:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Video); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MediaFile.Mediatype has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MediaFile_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MediaFile)
-	switch tag {
-	case 3: // mediatype.image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MediaImage)
-		err := b.DecodeMessage(msg)
-		m.Mediatype = &MediaFile_Image{msg}
-		return true, err
-	case 4: // mediatype.media_bundle
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MediaBundle)
-		err := b.DecodeMessage(msg)
-		m.Mediatype = &MediaFile_MediaBundle{msg}
-		return true, err
-	case 10: // mediatype.audio
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MediaAudio)
-		err := b.DecodeMessage(msg)
-		m.Mediatype = &MediaFile_Audio{msg}
-		return true, err
-	case 11: // mediatype.video
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MediaVideo)
-		err := b.DecodeMessage(msg)
-		m.Mediatype = &MediaFile_Video{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MediaFile_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MediaFile)
-	// mediatype
-	switch x := m.Mediatype.(type) {
-	case *MediaFile_Image:
-		s := proto.Size(x.Image)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MediaFile_MediaBundle:
-		s := proto.Size(x.MediaBundle)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MediaFile_Audio:
-		s := proto.Size(x.Audio)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MediaFile_Video:
-		s := proto.Size(x.Video)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Encapsulates an Image.
 type MediaImage struct {
 	// Raw image data.
@@ -316,16 +218,17 @@ func (m *MediaImage) Reset()         { *m = MediaImage{} }
 func (m *MediaImage) String() string { return proto.CompactTextString(m) }
 func (*MediaImage) ProtoMessage()    {}
 func (*MediaImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_4cd852e94bdefecd, []int{1}
+	return fileDescriptor_7ffee613242502eb, []int{1}
 }
+
 func (m *MediaImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaImage.Unmarshal(m, b)
 }
 func (m *MediaImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaImage.Marshal(b, m, deterministic)
 }
-func (dst *MediaImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaImage.Merge(dst, src)
+func (m *MediaImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaImage.Merge(m, src)
 }
 func (m *MediaImage) XXX_Size() int {
 	return xxx_messageInfo_MediaImage.Size(m)
@@ -356,16 +259,17 @@ func (m *MediaBundle) Reset()         { *m = MediaBundle{} }
 func (m *MediaBundle) String() string { return proto.CompactTextString(m) }
 func (*MediaBundle) ProtoMessage()    {}
 func (*MediaBundle) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_4cd852e94bdefecd, []int{2}
+	return fileDescriptor_7ffee613242502eb, []int{2}
 }
+
 func (m *MediaBundle) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaBundle.Unmarshal(m, b)
 }
 func (m *MediaBundle) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaBundle.Marshal(b, m, deterministic)
 }
-func (dst *MediaBundle) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaBundle.Merge(dst, src)
+func (m *MediaBundle) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaBundle.Merge(m, src)
 }
 func (m *MediaBundle) XXX_Size() int {
 	return xxx_messageInfo_MediaBundle.Size(m)
@@ -396,16 +300,17 @@ func (m *MediaAudio) Reset()         { *m = MediaAudio{} }
 func (m *MediaAudio) String() string { return proto.CompactTextString(m) }
 func (*MediaAudio) ProtoMessage()    {}
 func (*MediaAudio) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_4cd852e94bdefecd, []int{3}
+	return fileDescriptor_7ffee613242502eb, []int{3}
 }
+
 func (m *MediaAudio) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaAudio.Unmarshal(m, b)
 }
 func (m *MediaAudio) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaAudio.Marshal(b, m, deterministic)
 }
-func (dst *MediaAudio) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaAudio.Merge(dst, src)
+func (m *MediaAudio) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaAudio.Merge(m, src)
 }
 func (m *MediaAudio) XXX_Size() int {
 	return xxx_messageInfo_MediaAudio.Size(m)
@@ -445,16 +350,17 @@ func (m *MediaVideo) Reset()         { *m = MediaVideo{} }
 func (m *MediaVideo) String() string { return proto.CompactTextString(m) }
 func (*MediaVideo) ProtoMessage()    {}
 func (*MediaVideo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_4cd852e94bdefecd, []int{4}
+	return fileDescriptor_7ffee613242502eb, []int{4}
 }
+
 func (m *MediaVideo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaVideo.Unmarshal(m, b)
 }
 func (m *MediaVideo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaVideo.Marshal(b, m, deterministic)
 }
-func (dst *MediaVideo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaVideo.Merge(dst, src)
+func (m *MediaVideo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaVideo.Merge(m, src)
 }
 func (m *MediaVideo) XXX_Size() int {
 	return xxx_messageInfo_MediaVideo.Size(m)
@@ -502,10 +408,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/media_file.proto", fileDescriptor_media_file_4cd852e94bdefecd)
+	proto.RegisterFile("google/ads/googleads/v1/resources/media_file.proto", fileDescriptor_7ffee613242502eb)
 }
 
-var fileDescriptor_media_file_4cd852e94bdefecd = []byte{
+var fileDescriptor_7ffee613242502eb = []byte{
 	// 683 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xdf, 0x6a, 0xd4, 0x4c,
 	0x18, 0xc6, 0xbb, 0xe9, 0xb6, 0xdf, 0x66, 0xb6, 0x5f, 0xa9, 0xe3, 0x49, 0xa8, 0x45, 0xda, 0x95,
diff --git a/googleapis/ads/googleads/v1/resources/merchant_center_link.pb.go b/googleapis/ads/googleads/v1/resources/merchant_center_link.pb.go
index f77986b79a..7a45fe474e 100644
--- a/googleapis/ads/googleads/v1/resources/merchant_center_link.pb.go
+++ b/googleapis/ads/googleads/v1/resources/merchant_center_link.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/merchant_center_link.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A data sharing connection, proposed or in use,
 // between a Google Ads Customer and a Merchant Center account.
@@ -46,16 +49,17 @@ func (m *MerchantCenterLink) Reset()         { *m = MerchantCenterLink{} }
 func (m *MerchantCenterLink) String() string { return proto.CompactTextString(m) }
 func (*MerchantCenterLink) ProtoMessage()    {}
 func (*MerchantCenterLink) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_a6c67adc47332ce3, []int{0}
+	return fileDescriptor_068c27e743addf15, []int{0}
 }
+
 func (m *MerchantCenterLink) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MerchantCenterLink.Unmarshal(m, b)
 }
 func (m *MerchantCenterLink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MerchantCenterLink.Marshal(b, m, deterministic)
 }
-func (dst *MerchantCenterLink) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MerchantCenterLink.Merge(dst, src)
+func (m *MerchantCenterLink) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MerchantCenterLink.Merge(m, src)
 }
 func (m *MerchantCenterLink) XXX_Size() int {
 	return xxx_messageInfo_MerchantCenterLink.Size(m)
@@ -99,10 +103,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/merchant_center_link.proto", fileDescriptor_merchant_center_link_a6c67adc47332ce3)
+	proto.RegisterFile("google/ads/googleads/v1/resources/merchant_center_link.proto", fileDescriptor_068c27e743addf15)
 }
 
-var fileDescriptor_merchant_center_link_a6c67adc47332ce3 = []byte{
+var fileDescriptor_068c27e743addf15 = []byte{
 	// 410 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x6a, 0xdb, 0x30,
 	0x18, 0xc7, 0xce, 0x16, 0x98, 0xf7, 0xe7, 0xe0, 0xcb, 0xb2, 0x2c, 0x8c, 0x64, 0x23, 0x10, 0x18,
diff --git a/googleapis/ads/googleads/v1/resources/mobile_app_category_constant.pb.go b/googleapis/ads/googleads/v1/resources/mobile_app_category_constant.pb.go
index 40ea5efd31..c397202acf 100644
--- a/googleapis/ads/googleads/v1/resources/mobile_app_category_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/mobile_app_category_constant.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/mobile_app_category_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A mobile application category constant.
 type MobileAppCategoryConstant struct {
@@ -40,16 +43,17 @@ func (m *MobileAppCategoryConstant) Reset()         { *m = MobileAppCategoryCons
 func (m *MobileAppCategoryConstant) String() string { return proto.CompactTextString(m) }
 func (*MobileAppCategoryConstant) ProtoMessage()    {}
 func (*MobileAppCategoryConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mobile_app_category_constant_45ea856e6f2b6600, []int{0}
+	return fileDescriptor_1d66e9d0b240fe19, []int{0}
 }
+
 func (m *MobileAppCategoryConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MobileAppCategoryConstant.Unmarshal(m, b)
 }
 func (m *MobileAppCategoryConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MobileAppCategoryConstant.Marshal(b, m, deterministic)
 }
-func (dst *MobileAppCategoryConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MobileAppCategoryConstant.Merge(dst, src)
+func (m *MobileAppCategoryConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MobileAppCategoryConstant.Merge(m, src)
 }
 func (m *MobileAppCategoryConstant) XXX_Size() int {
 	return xxx_messageInfo_MobileAppCategoryConstant.Size(m)
@@ -86,10 +90,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/mobile_app_category_constant.proto", fileDescriptor_mobile_app_category_constant_45ea856e6f2b6600)
+	proto.RegisterFile("google/ads/googleads/v1/resources/mobile_app_category_constant.proto", fileDescriptor_1d66e9d0b240fe19)
 }
 
-var fileDescriptor_mobile_app_category_constant_45ea856e6f2b6600 = []byte{
+var fileDescriptor_1d66e9d0b240fe19 = []byte{
 	// 352 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xd1, 0x4a, 0xeb, 0x30,
 	0x18, 0xc7, 0x69, 0x77, 0x38, 0x70, 0x7a, 0xf4, 0xa6, 0x57, 0x73, 0x8e, 0xb1, 0x29, 0x83, 0x81,
diff --git a/googleapis/ads/googleads/v1/resources/mobile_device_constant.pb.go b/googleapis/ads/googleads/v1/resources/mobile_device_constant.pb.go
index 629eb53498..4c9736d147 100644
--- a/googleapis/ads/googleads/v1/resources/mobile_device_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/mobile_device_constant.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/mobile_device_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A mobile device constant.
 type MobileDeviceConstant struct {
@@ -47,16 +50,17 @@ func (m *MobileDeviceConstant) Reset()         { *m = MobileDeviceConstant{} }
 func (m *MobileDeviceConstant) String() string { return proto.CompactTextString(m) }
 func (*MobileDeviceConstant) ProtoMessage()    {}
 func (*MobileDeviceConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mobile_device_constant_6b896300aee21e10, []int{0}
+	return fileDescriptor_5f49c94eff431093, []int{0}
 }
+
 func (m *MobileDeviceConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MobileDeviceConstant.Unmarshal(m, b)
 }
 func (m *MobileDeviceConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MobileDeviceConstant.Marshal(b, m, deterministic)
 }
-func (dst *MobileDeviceConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MobileDeviceConstant.Merge(dst, src)
+func (m *MobileDeviceConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MobileDeviceConstant.Merge(m, src)
 }
 func (m *MobileDeviceConstant) XXX_Size() int {
 	return xxx_messageInfo_MobileDeviceConstant.Size(m)
@@ -114,10 +118,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/mobile_device_constant.proto", fileDescriptor_mobile_device_constant_6b896300aee21e10)
+	proto.RegisterFile("google/ads/googleads/v1/resources/mobile_device_constant.proto", fileDescriptor_5f49c94eff431093)
 }
 
-var fileDescriptor_mobile_device_constant_6b896300aee21e10 = []byte{
+var fileDescriptor_5f49c94eff431093 = []byte{
 	// 448 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xdf, 0x6a, 0x13, 0x41,
 	0x14, 0xc6, 0xd9, 0x4d, 0x2c, 0x38, 0xfe, 0x41, 0x57, 0x85, 0x58, 0x8b, 0xa4, 0x4a, 0x21, 0x20,
diff --git a/googleapis/ads/googleads/v1/resources/mutate_job.pb.go b/googleapis/ads/googleads/v1/resources/mutate_job.pb.go
index 2eff05fca6..798c0648db 100644
--- a/googleapis/ads/googleads/v1/resources/mutate_job.pb.go
+++ b/googleapis/ads/googleads/v1/resources/mutate_job.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/mutate_job.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A list of mutates being processed asynchronously. The mutates are uploaded
 // by the user. The mutates themselves aren’t readable and the results of the
@@ -51,16 +54,17 @@ func (m *MutateJob) Reset()         { *m = MutateJob{} }
 func (m *MutateJob) String() string { return proto.CompactTextString(m) }
 func (*MutateJob) ProtoMessage()    {}
 func (*MutateJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_3bb9abe6bc3ebff0, []int{0}
+	return fileDescriptor_a5e8cce5a5c605aa, []int{0}
 }
+
 func (m *MutateJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateJob.Unmarshal(m, b)
 }
 func (m *MutateJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateJob.Marshal(b, m, deterministic)
 }
-func (dst *MutateJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateJob.Merge(dst, src)
+func (m *MutateJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateJob.Merge(m, src)
 }
 func (m *MutateJob) XXX_Size() int {
 	return xxx_messageInfo_MutateJob.Size(m)
@@ -139,16 +143,17 @@ func (m *MutateJob_MutateJobMetadata) Reset()         { *m = MutateJob_MutateJob
 func (m *MutateJob_MutateJobMetadata) String() string { return proto.CompactTextString(m) }
 func (*MutateJob_MutateJobMetadata) ProtoMessage()    {}
 func (*MutateJob_MutateJobMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_3bb9abe6bc3ebff0, []int{0, 0}
+	return fileDescriptor_a5e8cce5a5c605aa, []int{0, 0}
 }
+
 func (m *MutateJob_MutateJobMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateJob_MutateJobMetadata.Unmarshal(m, b)
 }
 func (m *MutateJob_MutateJobMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateJob_MutateJobMetadata.Marshal(b, m, deterministic)
 }
-func (dst *MutateJob_MutateJobMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateJob_MutateJobMetadata.Merge(dst, src)
+func (m *MutateJob_MutateJobMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateJob_MutateJobMetadata.Merge(m, src)
 }
 func (m *MutateJob_MutateJobMetadata) XXX_Size() int {
 	return xxx_messageInfo_MutateJob_MutateJobMetadata.Size(m)
@@ -200,10 +205,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/mutate_job.proto", fileDescriptor_mutate_job_3bb9abe6bc3ebff0)
+	proto.RegisterFile("google/ads/googleads/v1/resources/mutate_job.proto", fileDescriptor_a5e8cce5a5c605aa)
 }
 
-var fileDescriptor_mutate_job_3bb9abe6bc3ebff0 = []byte{
+var fileDescriptor_a5e8cce5a5c605aa = []byte{
 	// 581 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdd, 0x6a, 0xd4, 0x4c,
 	0x18, 0xc7, 0x49, 0xfa, 0x76, 0x79, 0x3b, 0x6a, 0xd5, 0xa1, 0xd4, 0xb0, 0x16, 0x69, 0x95, 0x42,
diff --git a/googleapis/ads/googleads/v1/resources/operating_system_version_constant.pb.go b/googleapis/ads/googleads/v1/resources/operating_system_version_constant.pb.go
index 187a659484..56e886b0b3 100644
--- a/googleapis/ads/googleads/v1/resources/operating_system_version_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/operating_system_version_constant.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/operating_system_version_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A mobile operating system version or a range of versions, depending on
 // 'operator_type'. The complete list of available mobile platforms is available
@@ -53,16 +56,17 @@ func (m *OperatingSystemVersionConstant) Reset()         { *m = OperatingSystemV
 func (m *OperatingSystemVersionConstant) String() string { return proto.CompactTextString(m) }
 func (*OperatingSystemVersionConstant) ProtoMessage()    {}
 func (*OperatingSystemVersionConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operating_system_version_constant_d132cf92a34d1924, []int{0}
+	return fileDescriptor_255222b6c86bb69b, []int{0}
 }
+
 func (m *OperatingSystemVersionConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperatingSystemVersionConstant.Unmarshal(m, b)
 }
 func (m *OperatingSystemVersionConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperatingSystemVersionConstant.Marshal(b, m, deterministic)
 }
-func (dst *OperatingSystemVersionConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperatingSystemVersionConstant.Merge(dst, src)
+func (m *OperatingSystemVersionConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperatingSystemVersionConstant.Merge(m, src)
 }
 func (m *OperatingSystemVersionConstant) XXX_Size() int {
 	return xxx_messageInfo_OperatingSystemVersionConstant.Size(m)
@@ -120,10 +124,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/operating_system_version_constant.proto", fileDescriptor_operating_system_version_constant_d132cf92a34d1924)
+	proto.RegisterFile("google/ads/googleads/v1/resources/operating_system_version_constant.proto", fileDescriptor_255222b6c86bb69b)
 }
 
-var fileDescriptor_operating_system_version_constant_d132cf92a34d1924 = []byte{
+var fileDescriptor_255222b6c86bb69b = []byte{
 	// 459 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6a, 0xd4, 0x40,
 	0x14, 0xc6, 0x49, 0xb6, 0x16, 0x8c, 0x6d, 0x91, 0x5c, 0x2d, 0xb5, 0x94, 0xad, 0xa5, 0xb0, 0x20,
diff --git a/googleapis/ads/googleads/v1/resources/paid_organic_search_term_view.pb.go b/googleapis/ads/googleads/v1/resources/paid_organic_search_term_view.pb.go
index 70567a030c..8283249139 100644
--- a/googleapis/ads/googleads/v1/resources/paid_organic_search_term_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/paid_organic_search_term_view.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/paid_organic_search_term_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A paid organic search term view providing a view of search stats across
 // ads and organic listings aggregated by search term at the ad group level.
@@ -40,16 +43,17 @@ func (m *PaidOrganicSearchTermView) Reset()         { *m = PaidOrganicSearchTerm
 func (m *PaidOrganicSearchTermView) String() string { return proto.CompactTextString(m) }
 func (*PaidOrganicSearchTermView) ProtoMessage()    {}
 func (*PaidOrganicSearchTermView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_paid_organic_search_term_view_f9e1b4e70097c79d, []int{0}
+	return fileDescriptor_8e209ceb6c96a605, []int{0}
 }
+
 func (m *PaidOrganicSearchTermView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PaidOrganicSearchTermView.Unmarshal(m, b)
 }
 func (m *PaidOrganicSearchTermView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PaidOrganicSearchTermView.Marshal(b, m, deterministic)
 }
-func (dst *PaidOrganicSearchTermView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PaidOrganicSearchTermView.Merge(dst, src)
+func (m *PaidOrganicSearchTermView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PaidOrganicSearchTermView.Merge(m, src)
 }
 func (m *PaidOrganicSearchTermView) XXX_Size() int {
 	return xxx_messageInfo_PaidOrganicSearchTermView.Size(m)
@@ -79,10 +83,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/paid_organic_search_term_view.proto", fileDescriptor_paid_organic_search_term_view_f9e1b4e70097c79d)
+	proto.RegisterFile("google/ads/googleads/v1/resources/paid_organic_search_term_view.proto", fileDescriptor_8e209ceb6c96a605)
 }
 
-var fileDescriptor_paid_organic_search_term_view_f9e1b4e70097c79d = []byte{
+var fileDescriptor_8e209ceb6c96a605 = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xc1, 0x4a, 0x33, 0x31,
 	0x14, 0x85, 0x99, 0xf9, 0xe1, 0x07, 0xa7, 0xba, 0xe9, 0xaa, 0x96, 0x52, 0x5a, 0xa5, 0xd0, 0x55,
diff --git a/googleapis/ads/googleads/v1/resources/parental_status_view.pb.go b/googleapis/ads/googleads/v1/resources/parental_status_view.pb.go
index 54bfa0b4d5..d2bd16bfba 100644
--- a/googleapis/ads/googleads/v1/resources/parental_status_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/parental_status_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/parental_status_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A parental status view.
 type ParentalStatusView struct {
@@ -35,16 +38,17 @@ func (m *ParentalStatusView) Reset()         { *m = ParentalStatusView{} }
 func (m *ParentalStatusView) String() string { return proto.CompactTextString(m) }
 func (*ParentalStatusView) ProtoMessage()    {}
 func (*ParentalStatusView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_parental_status_view_8da4e3d8777c69cb, []int{0}
+	return fileDescriptor_701a359e48c28a79, []int{0}
 }
+
 func (m *ParentalStatusView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParentalStatusView.Unmarshal(m, b)
 }
 func (m *ParentalStatusView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParentalStatusView.Marshal(b, m, deterministic)
 }
-func (dst *ParentalStatusView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParentalStatusView.Merge(dst, src)
+func (m *ParentalStatusView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParentalStatusView.Merge(m, src)
 }
 func (m *ParentalStatusView) XXX_Size() int {
 	return xxx_messageInfo_ParentalStatusView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/parental_status_view.proto", fileDescriptor_parental_status_view_8da4e3d8777c69cb)
+	proto.RegisterFile("google/ads/googleads/v1/resources/parental_status_view.proto", fileDescriptor_701a359e48c28a79)
 }
 
-var fileDescriptor_parental_status_view_8da4e3d8777c69cb = []byte{
+var fileDescriptor_701a359e48c28a79 = []byte{
 	// 275 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xcf, 0x4a, 0xec, 0x30,
 	0x14, 0xc6, 0x69, 0x2f, 0x5c, 0xb0, 0xe8, 0xa6, 0x1b, 0x45, 0x5c, 0x38, 0xca, 0x80, 0xab, 0x84,
diff --git a/googleapis/ads/googleads/v1/resources/payments_account.pb.go b/googleapis/ads/googleads/v1/resources/payments_account.pb.go
index cf1c3b17aa..58c00a9d6f 100644
--- a/googleapis/ads/googleads/v1/resources/payments_account.pb.go
+++ b/googleapis/ads/googleads/v1/resources/payments_account.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/payments_account.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Payments account, which can be used to set up billing for an Ads customer.
 type PaymentsAccount struct {
@@ -50,16 +53,17 @@ func (m *PaymentsAccount) Reset()         { *m = PaymentsAccount{} }
 func (m *PaymentsAccount) String() string { return proto.CompactTextString(m) }
 func (*PaymentsAccount) ProtoMessage()    {}
 func (*PaymentsAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_payments_account_f36f45999373b500, []int{0}
+	return fileDescriptor_154b57c389e0899a, []int{0}
 }
+
 func (m *PaymentsAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PaymentsAccount.Unmarshal(m, b)
 }
 func (m *PaymentsAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PaymentsAccount.Marshal(b, m, deterministic)
 }
-func (dst *PaymentsAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PaymentsAccount.Merge(dst, src)
+func (m *PaymentsAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PaymentsAccount.Merge(m, src)
 }
 func (m *PaymentsAccount) XXX_Size() int {
 	return xxx_messageInfo_PaymentsAccount.Size(m)
@@ -117,10 +121,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/payments_account.proto", fileDescriptor_payments_account_f36f45999373b500)
+	proto.RegisterFile("google/ads/googleads/v1/resources/payments_account.proto", fileDescriptor_154b57c389e0899a)
 }
 
-var fileDescriptor_payments_account_f36f45999373b500 = []byte{
+var fileDescriptor_154b57c389e0899a = []byte{
 	// 397 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x4f, 0xcb, 0xd3, 0x30,
 	0x18, 0xa7, 0xdd, 0xeb, 0x0b, 0xc6, 0x77, 0x88, 0xd5, 0xc3, 0x18, 0x53, 0x36, 0x65, 0xb0, 0x53,
diff --git a/googleapis/ads/googleads/v1/resources/product_bidding_category_constant.pb.go b/googleapis/ads/googleads/v1/resources/product_bidding_category_constant.pb.go
index 8c56da29d2..bd788f0559 100644
--- a/googleapis/ads/googleads/v1/resources/product_bidding_category_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/product_bidding_category_constant.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/product_bidding_category_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Product Bidding Category.
 type ProductBiddingCategoryConstant struct {
@@ -55,16 +58,17 @@ func (m *ProductBiddingCategoryConstant) Reset()         { *m = ProductBiddingCa
 func (m *ProductBiddingCategoryConstant) String() string { return proto.CompactTextString(m) }
 func (*ProductBiddingCategoryConstant) ProtoMessage()    {}
 func (*ProductBiddingCategoryConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_bidding_category_constant_3b65021211328885, []int{0}
+	return fileDescriptor_108bf531d72dd437, []int{0}
 }
+
 func (m *ProductBiddingCategoryConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductBiddingCategoryConstant.Unmarshal(m, b)
 }
 func (m *ProductBiddingCategoryConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductBiddingCategoryConstant.Marshal(b, m, deterministic)
 }
-func (dst *ProductBiddingCategoryConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductBiddingCategoryConstant.Merge(dst, src)
+func (m *ProductBiddingCategoryConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductBiddingCategoryConstant.Merge(m, src)
 }
 func (m *ProductBiddingCategoryConstant) XXX_Size() int {
 	return xxx_messageInfo_ProductBiddingCategoryConstant.Size(m)
@@ -136,10 +140,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/product_bidding_category_constant.proto", fileDescriptor_product_bidding_category_constant_3b65021211328885)
+	proto.RegisterFile("google/ads/googleads/v1/resources/product_bidding_category_constant.proto", fileDescriptor_108bf531d72dd437)
 }
 
-var fileDescriptor_product_bidding_category_constant_3b65021211328885 = []byte{
+var fileDescriptor_108bf531d72dd437 = []byte{
 	// 510 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x41, 0x6b, 0xdb, 0x30,
 	0x14, 0xc7, 0xb1, 0xbb, 0x64, 0x9b, 0x9a, 0xf4, 0xe0, 0x93, 0xe9, 0x4a, 0x49, 0xd7, 0x15, 0x02,
diff --git a/googleapis/ads/googleads/v1/resources/product_group_view.pb.go b/googleapis/ads/googleads/v1/resources/product_group_view.pb.go
index f1ed8c89fc..a5928e0d31 100644
--- a/googleapis/ads/googleads/v1/resources/product_group_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/product_group_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/product_group_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A product group view.
 type ProductGroupView struct {
@@ -35,16 +38,17 @@ func (m *ProductGroupView) Reset()         { *m = ProductGroupView{} }
 func (m *ProductGroupView) String() string { return proto.CompactTextString(m) }
 func (*ProductGroupView) ProtoMessage()    {}
 func (*ProductGroupView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_group_view_5f62641bcd2a0adf, []int{0}
+	return fileDescriptor_e3a6978f2d357ed9, []int{0}
 }
+
 func (m *ProductGroupView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductGroupView.Unmarshal(m, b)
 }
 func (m *ProductGroupView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductGroupView.Marshal(b, m, deterministic)
 }
-func (dst *ProductGroupView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductGroupView.Merge(dst, src)
+func (m *ProductGroupView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductGroupView.Merge(m, src)
 }
 func (m *ProductGroupView) XXX_Size() int {
 	return xxx_messageInfo_ProductGroupView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/product_group_view.proto", fileDescriptor_product_group_view_5f62641bcd2a0adf)
+	proto.RegisterFile("google/ads/googleads/v1/resources/product_group_view.proto", fileDescriptor_e3a6978f2d357ed9)
 }
 
-var fileDescriptor_product_group_view_5f62641bcd2a0adf = []byte{
+var fileDescriptor_e3a6978f2d357ed9 = []byte{
 	// 272 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xb1, 0x4a, 0xc4, 0x30,
 	0x18, 0xc7, 0x69, 0x05, 0xc1, 0xa2, 0x20, 0x07, 0x82, 0x88, 0x83, 0xa7, 0x1c, 0x38, 0x25, 0x04,
diff --git a/googleapis/ads/googleads/v1/resources/recommendation.pb.go b/googleapis/ads/googleads/v1/resources/recommendation.pb.go
index eef58bc9f2..90ea335669 100644
--- a/googleapis/ads/googleads/v1/resources/recommendation.pb.go
+++ b/googleapis/ads/googleads/v1/resources/recommendation.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/recommendation.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A recommendation.
 type Recommendation struct {
@@ -82,16 +85,17 @@ func (m *Recommendation) Reset()         { *m = Recommendation{} }
 func (m *Recommendation) String() string { return proto.CompactTextString(m) }
 func (*Recommendation) ProtoMessage()    {}
 func (*Recommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0}
+	return fileDescriptor_241badd72f000da2, []int{0}
 }
+
 func (m *Recommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation.Unmarshal(m, b)
 }
 func (m *Recommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation.Merge(dst, src)
+func (m *Recommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation.Merge(m, src)
 }
 func (m *Recommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation.Size(m)
@@ -344,9 +348,9 @@ func (m *Recommendation) GetMoveUnusedBudgetRecommendation() *Recommendation_Mov
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Recommendation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Recommendation_OneofMarshaler, _Recommendation_OneofUnmarshaler, _Recommendation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Recommendation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Recommendation_CampaignBudgetRecommendation_)(nil),
 		(*Recommendation_KeywordRecommendation_)(nil),
 		(*Recommendation_TextAdRecommendation_)(nil),
@@ -364,288 +368,6 @@ func (*Recommendation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _Recommendation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Recommendation)
-	// recommendation
-	switch x := m.Recommendation.(type) {
-	case *Recommendation_CampaignBudgetRecommendation_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignBudgetRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_KeywordRecommendation_:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KeywordRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_TextAdRecommendation_:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextAdRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_TargetCpaOptInRecommendation_:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetCpaOptInRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_MaximizeConversionsOptInRecommendation_:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MaximizeConversionsOptInRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_EnhancedCpcOptInRecommendation_:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EnhancedCpcOptInRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_SearchPartnersOptInRecommendation_:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SearchPartnersOptInRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_MaximizeClicksOptInRecommendation_:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MaximizeClicksOptInRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_OptimizeAdRotationRecommendation_:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OptimizeAdRotationRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_CalloutExtensionRecommendation_:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CalloutExtensionRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_SitelinkExtensionRecommendation_:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SitelinkExtensionRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_CallExtensionRecommendation_:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CallExtensionRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_KeywordMatchTypeRecommendation_:
-		b.EncodeVarint(20<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KeywordMatchTypeRecommendation); err != nil {
-			return err
-		}
-	case *Recommendation_MoveUnusedBudgetRecommendation_:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MoveUnusedBudgetRecommendation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Recommendation.Recommendation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Recommendation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Recommendation)
-	switch tag {
-	case 4: // recommendation.campaign_budget_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_CampaignBudgetRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_CampaignBudgetRecommendation_{msg}
-		return true, err
-	case 8: // recommendation.keyword_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_KeywordRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_KeywordRecommendation_{msg}
-		return true, err
-	case 9: // recommendation.text_ad_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_TextAdRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_TextAdRecommendation_{msg}
-		return true, err
-	case 10: // recommendation.target_cpa_opt_in_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_TargetCpaOptInRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_TargetCpaOptInRecommendation_{msg}
-		return true, err
-	case 11: // recommendation.maximize_conversions_opt_in_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_MaximizeConversionsOptInRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_MaximizeConversionsOptInRecommendation_{msg}
-		return true, err
-	case 12: // recommendation.enhanced_cpc_opt_in_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_EnhancedCpcOptInRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_EnhancedCpcOptInRecommendation_{msg}
-		return true, err
-	case 14: // recommendation.search_partners_opt_in_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_SearchPartnersOptInRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_SearchPartnersOptInRecommendation_{msg}
-		return true, err
-	case 15: // recommendation.maximize_clicks_opt_in_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_MaximizeClicksOptInRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_MaximizeClicksOptInRecommendation_{msg}
-		return true, err
-	case 16: // recommendation.optimize_ad_rotation_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_OptimizeAdRotationRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_OptimizeAdRotationRecommendation_{msg}
-		return true, err
-	case 17: // recommendation.callout_extension_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_CalloutExtensionRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_CalloutExtensionRecommendation_{msg}
-		return true, err
-	case 18: // recommendation.sitelink_extension_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_SitelinkExtensionRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_SitelinkExtensionRecommendation_{msg}
-		return true, err
-	case 19: // recommendation.call_extension_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_CallExtensionRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_CallExtensionRecommendation_{msg}
-		return true, err
-	case 20: // recommendation.keyword_match_type_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_KeywordMatchTypeRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_KeywordMatchTypeRecommendation_{msg}
-		return true, err
-	case 21: // recommendation.move_unused_budget_recommendation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Recommendation_MoveUnusedBudgetRecommendation)
-		err := b.DecodeMessage(msg)
-		m.Recommendation = &Recommendation_MoveUnusedBudgetRecommendation_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Recommendation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Recommendation)
-	// recommendation
-	switch x := m.Recommendation.(type) {
-	case *Recommendation_CampaignBudgetRecommendation_:
-		s := proto.Size(x.CampaignBudgetRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_KeywordRecommendation_:
-		s := proto.Size(x.KeywordRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_TextAdRecommendation_:
-		s := proto.Size(x.TextAdRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_TargetCpaOptInRecommendation_:
-		s := proto.Size(x.TargetCpaOptInRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_MaximizeConversionsOptInRecommendation_:
-		s := proto.Size(x.MaximizeConversionsOptInRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_EnhancedCpcOptInRecommendation_:
-		s := proto.Size(x.EnhancedCpcOptInRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_SearchPartnersOptInRecommendation_:
-		s := proto.Size(x.SearchPartnersOptInRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_MaximizeClicksOptInRecommendation_:
-		s := proto.Size(x.MaximizeClicksOptInRecommendation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_OptimizeAdRotationRecommendation_:
-		s := proto.Size(x.OptimizeAdRotationRecommendation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_CalloutExtensionRecommendation_:
-		s := proto.Size(x.CalloutExtensionRecommendation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_SitelinkExtensionRecommendation_:
-		s := proto.Size(x.SitelinkExtensionRecommendation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_CallExtensionRecommendation_:
-		s := proto.Size(x.CallExtensionRecommendation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_KeywordMatchTypeRecommendation_:
-		s := proto.Size(x.KeywordMatchTypeRecommendation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Recommendation_MoveUnusedBudgetRecommendation_:
-		s := proto.Size(x.MoveUnusedBudgetRecommendation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The impact of making the change as described in the recommendation.
 // Some types of recommendations may not have impact information.
 type Recommendation_RecommendationImpact struct {
@@ -662,16 +384,17 @@ func (m *Recommendation_RecommendationImpact) Reset()         { *m = Recommendat
 func (m *Recommendation_RecommendationImpact) String() string { return proto.CompactTextString(m) }
 func (*Recommendation_RecommendationImpact) ProtoMessage()    {}
 func (*Recommendation_RecommendationImpact) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 0}
+	return fileDescriptor_241badd72f000da2, []int{0, 0}
 }
+
 func (m *Recommendation_RecommendationImpact) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_RecommendationImpact.Unmarshal(m, b)
 }
 func (m *Recommendation_RecommendationImpact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_RecommendationImpact.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_RecommendationImpact) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_RecommendationImpact.Merge(dst, src)
+func (m *Recommendation_RecommendationImpact) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_RecommendationImpact.Merge(m, src)
 }
 func (m *Recommendation_RecommendationImpact) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_RecommendationImpact.Size(m)
@@ -718,16 +441,17 @@ func (m *Recommendation_RecommendationMetrics) Reset()         { *m = Recommenda
 func (m *Recommendation_RecommendationMetrics) String() string { return proto.CompactTextString(m) }
 func (*Recommendation_RecommendationMetrics) ProtoMessage()    {}
 func (*Recommendation_RecommendationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 1}
+	return fileDescriptor_241badd72f000da2, []int{0, 1}
 }
+
 func (m *Recommendation_RecommendationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_RecommendationMetrics.Unmarshal(m, b)
 }
 func (m *Recommendation_RecommendationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_RecommendationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_RecommendationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_RecommendationMetrics.Merge(dst, src)
+func (m *Recommendation_RecommendationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_RecommendationMetrics.Merge(m, src)
 }
 func (m *Recommendation_RecommendationMetrics) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_RecommendationMetrics.Size(m)
@@ -795,16 +519,17 @@ func (m *Recommendation_CampaignBudgetRecommendation) String() string {
 }
 func (*Recommendation_CampaignBudgetRecommendation) ProtoMessage() {}
 func (*Recommendation_CampaignBudgetRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 2}
+	return fileDescriptor_241badd72f000da2, []int{0, 2}
 }
+
 func (m *Recommendation_CampaignBudgetRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_CampaignBudgetRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_CampaignBudgetRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_CampaignBudgetRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_CampaignBudgetRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_CampaignBudgetRecommendation.Merge(dst, src)
+func (m *Recommendation_CampaignBudgetRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_CampaignBudgetRecommendation.Merge(m, src)
 }
 func (m *Recommendation_CampaignBudgetRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_CampaignBudgetRecommendation.Size(m)
@@ -857,16 +582,17 @@ func (m *Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendatio
 func (*Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption) ProtoMessage() {
 }
 func (*Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 2, 0}
+	return fileDescriptor_241badd72f000da2, []int{0, 2, 0}
 }
+
 func (m *Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption.Unmarshal(m, b)
 }
 func (m *Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption.Merge(dst, src)
+func (m *Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption.Merge(m, src)
 }
 func (m *Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_CampaignBudgetRecommendation_CampaignBudgetRecommendationOption.Size(m)
@@ -906,16 +632,17 @@ func (m *Recommendation_KeywordRecommendation) Reset()         { *m = Recommenda
 func (m *Recommendation_KeywordRecommendation) String() string { return proto.CompactTextString(m) }
 func (*Recommendation_KeywordRecommendation) ProtoMessage()    {}
 func (*Recommendation_KeywordRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 3}
+	return fileDescriptor_241badd72f000da2, []int{0, 3}
 }
+
 func (m *Recommendation_KeywordRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_KeywordRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_KeywordRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_KeywordRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_KeywordRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_KeywordRecommendation.Merge(dst, src)
+func (m *Recommendation_KeywordRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_KeywordRecommendation.Merge(m, src)
 }
 func (m *Recommendation_KeywordRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_KeywordRecommendation.Size(m)
@@ -960,16 +687,17 @@ func (m *Recommendation_TextAdRecommendation) Reset()         { *m = Recommendat
 func (m *Recommendation_TextAdRecommendation) String() string { return proto.CompactTextString(m) }
 func (*Recommendation_TextAdRecommendation) ProtoMessage()    {}
 func (*Recommendation_TextAdRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 4}
+	return fileDescriptor_241badd72f000da2, []int{0, 4}
 }
+
 func (m *Recommendation_TextAdRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_TextAdRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_TextAdRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_TextAdRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_TextAdRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_TextAdRecommendation.Merge(dst, src)
+func (m *Recommendation_TextAdRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_TextAdRecommendation.Merge(m, src)
 }
 func (m *Recommendation_TextAdRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_TextAdRecommendation.Size(m)
@@ -1021,16 +749,17 @@ func (m *Recommendation_TargetCpaOptInRecommendation) String() string {
 }
 func (*Recommendation_TargetCpaOptInRecommendation) ProtoMessage() {}
 func (*Recommendation_TargetCpaOptInRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 5}
+	return fileDescriptor_241badd72f000da2, []int{0, 5}
 }
+
 func (m *Recommendation_TargetCpaOptInRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_TargetCpaOptInRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_TargetCpaOptInRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation.Merge(dst, src)
+func (m *Recommendation_TargetCpaOptInRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation.Merge(m, src)
 }
 func (m *Recommendation_TargetCpaOptInRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation.Size(m)
@@ -1082,16 +811,17 @@ func (m *Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendatio
 func (*Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption) ProtoMessage() {
 }
 func (*Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 5, 0}
+	return fileDescriptor_241badd72f000da2, []int{0, 5, 0}
 }
+
 func (m *Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption.Unmarshal(m, b)
 }
 func (m *Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption.Merge(dst, src)
+func (m *Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption.Merge(m, src)
 }
 func (m *Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_TargetCpaOptInRecommendation_TargetCpaOptInRecommendationOption.Size(m)
@@ -1149,16 +879,17 @@ func (m *Recommendation_KeywordMatchTypeRecommendation) String() string {
 }
 func (*Recommendation_KeywordMatchTypeRecommendation) ProtoMessage() {}
 func (*Recommendation_KeywordMatchTypeRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 6}
+	return fileDescriptor_241badd72f000da2, []int{0, 6}
 }
+
 func (m *Recommendation_KeywordMatchTypeRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_KeywordMatchTypeRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_KeywordMatchTypeRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_KeywordMatchTypeRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_KeywordMatchTypeRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_KeywordMatchTypeRecommendation.Merge(dst, src)
+func (m *Recommendation_KeywordMatchTypeRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_KeywordMatchTypeRecommendation.Merge(m, src)
 }
 func (m *Recommendation_KeywordMatchTypeRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_KeywordMatchTypeRecommendation.Size(m)
@@ -1200,16 +931,17 @@ func (m *Recommendation_MaximizeConversionsOptInRecommendation) String() string
 }
 func (*Recommendation_MaximizeConversionsOptInRecommendation) ProtoMessage() {}
 func (*Recommendation_MaximizeConversionsOptInRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 7}
+	return fileDescriptor_241badd72f000da2, []int{0, 7}
 }
+
 func (m *Recommendation_MaximizeConversionsOptInRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_MaximizeConversionsOptInRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_MaximizeConversionsOptInRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_MaximizeConversionsOptInRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_MaximizeConversionsOptInRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_MaximizeConversionsOptInRecommendation.Merge(dst, src)
+func (m *Recommendation_MaximizeConversionsOptInRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_MaximizeConversionsOptInRecommendation.Merge(m, src)
 }
 func (m *Recommendation_MaximizeConversionsOptInRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_MaximizeConversionsOptInRecommendation.Size(m)
@@ -1242,16 +974,17 @@ func (m *Recommendation_EnhancedCpcOptInRecommendation) String() string {
 }
 func (*Recommendation_EnhancedCpcOptInRecommendation) ProtoMessage() {}
 func (*Recommendation_EnhancedCpcOptInRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 8}
+	return fileDescriptor_241badd72f000da2, []int{0, 8}
 }
+
 func (m *Recommendation_EnhancedCpcOptInRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_EnhancedCpcOptInRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_EnhancedCpcOptInRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_EnhancedCpcOptInRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_EnhancedCpcOptInRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_EnhancedCpcOptInRecommendation.Merge(dst, src)
+func (m *Recommendation_EnhancedCpcOptInRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_EnhancedCpcOptInRecommendation.Merge(m, src)
 }
 func (m *Recommendation_EnhancedCpcOptInRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_EnhancedCpcOptInRecommendation.Size(m)
@@ -1279,16 +1012,17 @@ func (m *Recommendation_CallExtensionRecommendation) String() string {
 }
 func (*Recommendation_CallExtensionRecommendation) ProtoMessage() {}
 func (*Recommendation_CallExtensionRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 9}
+	return fileDescriptor_241badd72f000da2, []int{0, 9}
 }
+
 func (m *Recommendation_CallExtensionRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_CallExtensionRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_CallExtensionRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_CallExtensionRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_CallExtensionRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_CallExtensionRecommendation.Merge(dst, src)
+func (m *Recommendation_CallExtensionRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_CallExtensionRecommendation.Merge(m, src)
 }
 func (m *Recommendation_CallExtensionRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_CallExtensionRecommendation.Size(m)
@@ -1321,16 +1055,17 @@ func (m *Recommendation_SearchPartnersOptInRecommendation) String() string {
 }
 func (*Recommendation_SearchPartnersOptInRecommendation) ProtoMessage() {}
 func (*Recommendation_SearchPartnersOptInRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 10}
+	return fileDescriptor_241badd72f000da2, []int{0, 10}
 }
+
 func (m *Recommendation_SearchPartnersOptInRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_SearchPartnersOptInRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_SearchPartnersOptInRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_SearchPartnersOptInRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_SearchPartnersOptInRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_SearchPartnersOptInRecommendation.Merge(dst, src)
+func (m *Recommendation_SearchPartnersOptInRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_SearchPartnersOptInRecommendation.Merge(m, src)
 }
 func (m *Recommendation_SearchPartnersOptInRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_SearchPartnersOptInRecommendation.Size(m)
@@ -1359,16 +1094,17 @@ func (m *Recommendation_MaximizeClicksOptInRecommendation) String() string {
 }
 func (*Recommendation_MaximizeClicksOptInRecommendation) ProtoMessage() {}
 func (*Recommendation_MaximizeClicksOptInRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 11}
+	return fileDescriptor_241badd72f000da2, []int{0, 11}
 }
+
 func (m *Recommendation_MaximizeClicksOptInRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_MaximizeClicksOptInRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_MaximizeClicksOptInRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_MaximizeClicksOptInRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_MaximizeClicksOptInRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_MaximizeClicksOptInRecommendation.Merge(dst, src)
+func (m *Recommendation_MaximizeClicksOptInRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_MaximizeClicksOptInRecommendation.Merge(m, src)
 }
 func (m *Recommendation_MaximizeClicksOptInRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_MaximizeClicksOptInRecommendation.Size(m)
@@ -1401,16 +1137,17 @@ func (m *Recommendation_OptimizeAdRotationRecommendation) String() string {
 }
 func (*Recommendation_OptimizeAdRotationRecommendation) ProtoMessage() {}
 func (*Recommendation_OptimizeAdRotationRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 12}
+	return fileDescriptor_241badd72f000da2, []int{0, 12}
 }
+
 func (m *Recommendation_OptimizeAdRotationRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_OptimizeAdRotationRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_OptimizeAdRotationRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_OptimizeAdRotationRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_OptimizeAdRotationRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_OptimizeAdRotationRecommendation.Merge(dst, src)
+func (m *Recommendation_OptimizeAdRotationRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_OptimizeAdRotationRecommendation.Merge(m, src)
 }
 func (m *Recommendation_OptimizeAdRotationRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_OptimizeAdRotationRecommendation.Size(m)
@@ -1440,16 +1177,17 @@ func (m *Recommendation_MoveUnusedBudgetRecommendation) String() string {
 }
 func (*Recommendation_MoveUnusedBudgetRecommendation) ProtoMessage() {}
 func (*Recommendation_MoveUnusedBudgetRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 13}
+	return fileDescriptor_241badd72f000da2, []int{0, 13}
 }
+
 func (m *Recommendation_MoveUnusedBudgetRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_MoveUnusedBudgetRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_MoveUnusedBudgetRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_MoveUnusedBudgetRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_MoveUnusedBudgetRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_MoveUnusedBudgetRecommendation.Merge(dst, src)
+func (m *Recommendation_MoveUnusedBudgetRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_MoveUnusedBudgetRecommendation.Merge(m, src)
 }
 func (m *Recommendation_MoveUnusedBudgetRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_MoveUnusedBudgetRecommendation.Size(m)
@@ -1491,16 +1229,17 @@ func (m *Recommendation_CalloutExtensionRecommendation) String() string {
 }
 func (*Recommendation_CalloutExtensionRecommendation) ProtoMessage() {}
 func (*Recommendation_CalloutExtensionRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 14}
+	return fileDescriptor_241badd72f000da2, []int{0, 14}
 }
+
 func (m *Recommendation_CalloutExtensionRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_CalloutExtensionRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_CalloutExtensionRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_CalloutExtensionRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_CalloutExtensionRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_CalloutExtensionRecommendation.Merge(dst, src)
+func (m *Recommendation_CalloutExtensionRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_CalloutExtensionRecommendation.Merge(m, src)
 }
 func (m *Recommendation_CalloutExtensionRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_CalloutExtensionRecommendation.Size(m)
@@ -1535,16 +1274,17 @@ func (m *Recommendation_SitelinkExtensionRecommendation) String() string {
 }
 func (*Recommendation_SitelinkExtensionRecommendation) ProtoMessage() {}
 func (*Recommendation_SitelinkExtensionRecommendation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_f16744120f29f1ae, []int{0, 15}
+	return fileDescriptor_241badd72f000da2, []int{0, 15}
 }
+
 func (m *Recommendation_SitelinkExtensionRecommendation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recommendation_SitelinkExtensionRecommendation.Unmarshal(m, b)
 }
 func (m *Recommendation_SitelinkExtensionRecommendation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Recommendation_SitelinkExtensionRecommendation.Marshal(b, m, deterministic)
 }
-func (dst *Recommendation_SitelinkExtensionRecommendation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Recommendation_SitelinkExtensionRecommendation.Merge(dst, src)
+func (m *Recommendation_SitelinkExtensionRecommendation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Recommendation_SitelinkExtensionRecommendation.Merge(m, src)
 }
 func (m *Recommendation_SitelinkExtensionRecommendation) XXX_Size() int {
 	return xxx_messageInfo_Recommendation_SitelinkExtensionRecommendation.Size(m)
@@ -1585,10 +1325,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/recommendation.proto", fileDescriptor_recommendation_f16744120f29f1ae)
+	proto.RegisterFile("google/ads/googleads/v1/resources/recommendation.proto", fileDescriptor_241badd72f000da2)
 }
 
-var fileDescriptor_recommendation_f16744120f29f1ae = []byte{
+var fileDescriptor_241badd72f000da2 = []byte{
 	// 1671 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4b, 0x6f, 0xdc, 0x46,
 	0x12, 0xde, 0x1e, 0xc9, 0x92, 0x5d, 0x7a, 0xd9, 0x6d, 0x49, 0x3b, 0x4b, 0xcb, 0xe3, 0x91, 0x0c,
diff --git a/googleapis/ads/googleads/v1/resources/remarketing_action.pb.go b/googleapis/ads/googleads/v1/resources/remarketing_action.pb.go
index 9bae822b31..0f3ab9546b 100644
--- a/googleapis/ads/googleads/v1/resources/remarketing_action.pb.go
+++ b/googleapis/ads/googleads/v1/resources/remarketing_action.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/remarketing_action.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A remarketing action. A snippet of JavaScript code that will collect the
 // product id and the type of page people visited (product page, shopping cart
@@ -48,16 +51,17 @@ func (m *RemarketingAction) Reset()         { *m = RemarketingAction{} }
 func (m *RemarketingAction) String() string { return proto.CompactTextString(m) }
 func (*RemarketingAction) ProtoMessage()    {}
 func (*RemarketingAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remarketing_action_803307fcc656e819, []int{0}
+	return fileDescriptor_62ce490472884744, []int{0}
 }
+
 func (m *RemarketingAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemarketingAction.Unmarshal(m, b)
 }
 func (m *RemarketingAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemarketingAction.Marshal(b, m, deterministic)
 }
-func (dst *RemarketingAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemarketingAction.Merge(dst, src)
+func (m *RemarketingAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemarketingAction.Merge(m, src)
 }
 func (m *RemarketingAction) XXX_Size() int {
 	return xxx_messageInfo_RemarketingAction.Size(m)
@@ -101,10 +105,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/remarketing_action.proto", fileDescriptor_remarketing_action_803307fcc656e819)
+	proto.RegisterFile("google/ads/googleads/v1/resources/remarketing_action.proto", fileDescriptor_62ce490472884744)
 }
 
-var fileDescriptor_remarketing_action_803307fcc656e819 = []byte{
+var fileDescriptor_62ce490472884744 = []byte{
 	// 390 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6a, 0xdb, 0x30,
 	0x1c, 0xc6, 0xb1, 0x13, 0x06, 0x73, 0xb2, 0xc3, 0x7c, 0x18, 0x21, 0x0b, 0x23, 0xd9, 0x08, 0x84,
diff --git a/googleapis/ads/googleads/v1/resources/search_term_view.pb.go b/googleapis/ads/googleads/v1/resources/search_term_view.pb.go
index 0b642d2f59..606abddcb0 100644
--- a/googleapis/ads/googleads/v1/resources/search_term_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/search_term_view.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/search_term_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A search term view with metrics aggregated by search term at the ad group
 // level.
@@ -46,16 +49,17 @@ func (m *SearchTermView) Reset()         { *m = SearchTermView{} }
 func (m *SearchTermView) String() string { return proto.CompactTextString(m) }
 func (*SearchTermView) ProtoMessage()    {}
 func (*SearchTermView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_search_term_view_6b40967744a091b0, []int{0}
+	return fileDescriptor_13d7523262f43a04, []int{0}
 }
+
 func (m *SearchTermView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchTermView.Unmarshal(m, b)
 }
 func (m *SearchTermView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchTermView.Marshal(b, m, deterministic)
 }
-func (dst *SearchTermView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchTermView.Merge(dst, src)
+func (m *SearchTermView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchTermView.Merge(m, src)
 }
 func (m *SearchTermView) XXX_Size() int {
 	return xxx_messageInfo_SearchTermView.Size(m)
@@ -99,10 +103,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/search_term_view.proto", fileDescriptor_search_term_view_6b40967744a091b0)
+	proto.RegisterFile("google/ads/googleads/v1/resources/search_term_view.proto", fileDescriptor_13d7523262f43a04)
 }
 
-var fileDescriptor_search_term_view_6b40967744a091b0 = []byte{
+var fileDescriptor_13d7523262f43a04 = []byte{
 	// 404 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0x6b, 0xdb, 0x40,
 	0x10, 0x45, 0x72, 0x71, 0xdb, 0x75, 0xeb, 0x83, 0x7a, 0x11, 0xc6, 0x14, 0xbb, 0xc5, 0xe0, 0xd3,
diff --git a/googleapis/ads/googleads/v1/resources/shared_criterion.pb.go b/googleapis/ads/googleads/v1/resources/shared_criterion.pb.go
index c983f4f440..50ef7c5855 100644
--- a/googleapis/ads/googleads/v1/resources/shared_criterion.pb.go
+++ b/googleapis/ads/googleads/v1/resources/shared_criterion.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/shared_criterion.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A criterion belonging to a shared set.
 type SharedCriterion struct {
@@ -58,16 +61,17 @@ func (m *SharedCriterion) Reset()         { *m = SharedCriterion{} }
 func (m *SharedCriterion) String() string { return proto.CompactTextString(m) }
 func (*SharedCriterion) ProtoMessage()    {}
 func (*SharedCriterion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_f01ea99d54c9b1f1, []int{0}
+	return fileDescriptor_c8be09b18890bd33, []int{0}
 }
+
 func (m *SharedCriterion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedCriterion.Unmarshal(m, b)
 }
 func (m *SharedCriterion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedCriterion.Marshal(b, m, deterministic)
 }
-func (dst *SharedCriterion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedCriterion.Merge(dst, src)
+func (m *SharedCriterion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedCriterion.Merge(m, src)
 }
 func (m *SharedCriterion) XXX_Size() int {
 	return xxx_messageInfo_SharedCriterion.Size(m)
@@ -195,9 +199,9 @@ func (m *SharedCriterion) GetMobileApplication() *common.MobileApplicationInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SharedCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SharedCriterion_OneofMarshaler, _SharedCriterion_OneofUnmarshaler, _SharedCriterion_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SharedCriterion) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SharedCriterion_Keyword)(nil),
 		(*SharedCriterion_YoutubeVideo)(nil),
 		(*SharedCriterion_YoutubeChannel)(nil),
@@ -207,153 +211,15 @@ func (*SharedCriterion) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffe
 	}
 }
 
-func _SharedCriterion_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SharedCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *SharedCriterion_Keyword:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Keyword); err != nil {
-			return err
-		}
-	case *SharedCriterion_YoutubeVideo:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeVideo); err != nil {
-			return err
-		}
-	case *SharedCriterion_YoutubeChannel:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.YoutubeChannel); err != nil {
-			return err
-		}
-	case *SharedCriterion_Placement:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Placement); err != nil {
-			return err
-		}
-	case *SharedCriterion_MobileAppCategory:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileAppCategory); err != nil {
-			return err
-		}
-	case *SharedCriterion_MobileApplication:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MobileApplication); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SharedCriterion.Criterion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SharedCriterion_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SharedCriterion)
-	switch tag {
-	case 3: // criterion.keyword
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.KeywordInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &SharedCriterion_Keyword{msg}
-		return true, err
-	case 5: // criterion.youtube_video
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeVideoInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &SharedCriterion_YoutubeVideo{msg}
-		return true, err
-	case 6: // criterion.youtube_channel
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.YouTubeChannelInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &SharedCriterion_YoutubeChannel{msg}
-		return true, err
-	case 7: // criterion.placement
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.PlacementInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &SharedCriterion_Placement{msg}
-		return true, err
-	case 8: // criterion.mobile_app_category
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileAppCategoryInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &SharedCriterion_MobileAppCategory{msg}
-		return true, err
-	case 9: // criterion.mobile_application
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.MobileApplicationInfo)
-		err := b.DecodeMessage(msg)
-		m.Criterion = &SharedCriterion_MobileApplication{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SharedCriterion_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SharedCriterion)
-	// criterion
-	switch x := m.Criterion.(type) {
-	case *SharedCriterion_Keyword:
-		s := proto.Size(x.Keyword)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedCriterion_YoutubeVideo:
-		s := proto.Size(x.YoutubeVideo)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedCriterion_YoutubeChannel:
-		s := proto.Size(x.YoutubeChannel)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedCriterion_Placement:
-		s := proto.Size(x.Placement)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedCriterion_MobileAppCategory:
-		s := proto.Size(x.MobileAppCategory)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedCriterion_MobileApplication:
-		s := proto.Size(x.MobileApplication)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*SharedCriterion)(nil), "google.ads.googleads.v1.resources.SharedCriterion")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/shared_criterion.proto", fileDescriptor_shared_criterion_f01ea99d54c9b1f1)
+	proto.RegisterFile("google/ads/googleads/v1/resources/shared_criterion.proto", fileDescriptor_c8be09b18890bd33)
 }
 
-var fileDescriptor_shared_criterion_f01ea99d54c9b1f1 = []byte{
+var fileDescriptor_c8be09b18890bd33 = []byte{
 	// 592 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdb, 0x6a, 0xd4, 0x40,
 	0x18, 0xc7, 0xdd, 0x6d, 0x6d, 0xdd, 0xe9, 0x09, 0x47, 0x2f, 0x42, 0x2d, 0xd2, 0x2a, 0x85, 0x82,
diff --git a/googleapis/ads/googleads/v1/resources/shared_set.pb.go b/googleapis/ads/googleads/v1/resources/shared_set.pb.go
index 00c211bed9..4ee2e17a29 100644
--- a/googleapis/ads/googleads/v1/resources/shared_set.pb.go
+++ b/googleapis/ads/googleads/v1/resources/shared_set.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/shared_set.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // SharedSets are used for sharing criterion exclusions across multiple
 // campaigns.
@@ -55,16 +58,17 @@ func (m *SharedSet) Reset()         { *m = SharedSet{} }
 func (m *SharedSet) String() string { return proto.CompactTextString(m) }
 func (*SharedSet) ProtoMessage()    {}
 func (*SharedSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_f5088d1f05eebba7, []int{0}
+	return fileDescriptor_3a1581938e7cc60d, []int{0}
 }
+
 func (m *SharedSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedSet.Unmarshal(m, b)
 }
 func (m *SharedSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedSet.Marshal(b, m, deterministic)
 }
-func (dst *SharedSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedSet.Merge(dst, src)
+func (m *SharedSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedSet.Merge(m, src)
 }
 func (m *SharedSet) XXX_Size() int {
 	return xxx_messageInfo_SharedSet.Size(m)
@@ -129,10 +133,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/shared_set.proto", fileDescriptor_shared_set_f5088d1f05eebba7)
+	proto.RegisterFile("google/ads/googleads/v1/resources/shared_set.proto", fileDescriptor_3a1581938e7cc60d)
 }
 
-var fileDescriptor_shared_set_f5088d1f05eebba7 = []byte{
+var fileDescriptor_3a1581938e7cc60d = []byte{
 	// 457 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6b, 0xdb, 0x30,
 	0x14, 0xc7, 0xb1, 0x93, 0x65, 0x54, 0xed, 0x32, 0xf0, 0xc9, 0x74, 0x65, 0xa4, 0x1b, 0x85, 0xc0,
diff --git a/googleapis/ads/googleads/v1/resources/shopping_performance_view.pb.go b/googleapis/ads/googleads/v1/resources/shopping_performance_view.pb.go
index 8298c937b5..dda195a346 100644
--- a/googleapis/ads/googleads/v1/resources/shopping_performance_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/shopping_performance_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/shopping_performance_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Shopping performance view.
 // Provides Shopping campaign statistics aggregated at several product dimension
@@ -39,16 +42,17 @@ func (m *ShoppingPerformanceView) Reset()         { *m = ShoppingPerformanceView
 func (m *ShoppingPerformanceView) String() string { return proto.CompactTextString(m) }
 func (*ShoppingPerformanceView) ProtoMessage()    {}
 func (*ShoppingPerformanceView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shopping_performance_view_dba5c71589d7b79b, []int{0}
+	return fileDescriptor_37285869b217afa9, []int{0}
 }
+
 func (m *ShoppingPerformanceView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShoppingPerformanceView.Unmarshal(m, b)
 }
 func (m *ShoppingPerformanceView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShoppingPerformanceView.Marshal(b, m, deterministic)
 }
-func (dst *ShoppingPerformanceView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShoppingPerformanceView.Merge(dst, src)
+func (m *ShoppingPerformanceView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShoppingPerformanceView.Merge(m, src)
 }
 func (m *ShoppingPerformanceView) XXX_Size() int {
 	return xxx_messageInfo_ShoppingPerformanceView.Size(m)
@@ -71,10 +75,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/shopping_performance_view.proto", fileDescriptor_shopping_performance_view_dba5c71589d7b79b)
+	proto.RegisterFile("google/ads/googleads/v1/resources/shopping_performance_view.proto", fileDescriptor_37285869b217afa9)
 }
 
-var fileDescriptor_shopping_performance_view_dba5c71589d7b79b = []byte{
+var fileDescriptor_37285869b217afa9 = []byte{
 	// 278 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x41, 0x4a, 0xc4, 0x30,
 	0x14, 0x86, 0x69, 0x05, 0xc1, 0xa2, 0x9b, 0xd9, 0x28, 0x32, 0x0b, 0x47, 0x19, 0x70, 0x95, 0x50,
diff --git a/googleapis/ads/googleads/v1/resources/topic_constant.pb.go b/googleapis/ads/googleads/v1/resources/topic_constant.pb.go
index 9de12e2f79..4286a4e031 100644
--- a/googleapis/ads/googleads/v1/resources/topic_constant.pb.go
+++ b/googleapis/ads/googleads/v1/resources/topic_constant.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/topic_constant.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Use topics to target or exclude placements in the Google Display Network
 // based on the category into which the placement falls (for example,
@@ -51,16 +54,17 @@ func (m *TopicConstant) Reset()         { *m = TopicConstant{} }
 func (m *TopicConstant) String() string { return proto.CompactTextString(m) }
 func (*TopicConstant) ProtoMessage()    {}
 func (*TopicConstant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topic_constant_ae3a2d9dbb1054e6, []int{0}
+	return fileDescriptor_7e0961a18b03751e, []int{0}
 }
+
 func (m *TopicConstant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TopicConstant.Unmarshal(m, b)
 }
 func (m *TopicConstant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TopicConstant.Marshal(b, m, deterministic)
 }
-func (dst *TopicConstant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TopicConstant.Merge(dst, src)
+func (m *TopicConstant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TopicConstant.Merge(m, src)
 }
 func (m *TopicConstant) XXX_Size() int {
 	return xxx_messageInfo_TopicConstant.Size(m)
@@ -104,10 +108,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/topic_constant.proto", fileDescriptor_topic_constant_ae3a2d9dbb1054e6)
+	proto.RegisterFile("google/ads/googleads/v1/resources/topic_constant.proto", fileDescriptor_7e0961a18b03751e)
 }
 
-var fileDescriptor_topic_constant_ae3a2d9dbb1054e6 = []byte{
+var fileDescriptor_7e0961a18b03751e = []byte{
 	// 360 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x4f, 0x4b, 0xf3, 0x30,
 	0x00, 0xc6, 0x69, 0x37, 0x5e, 0x78, 0xfb, 0xbe, 0xbb, 0x54, 0x84, 0x32, 0x87, 0x6c, 0xca, 0x60,
diff --git a/googleapis/ads/googleads/v1/resources/topic_view.pb.go b/googleapis/ads/googleads/v1/resources/topic_view.pb.go
index cc7922e1da..b21b0a234c 100644
--- a/googleapis/ads/googleads/v1/resources/topic_view.pb.go
+++ b/googleapis/ads/googleads/v1/resources/topic_view.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/topic_view.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A topic view.
 type TopicView struct {
@@ -35,16 +38,17 @@ func (m *TopicView) Reset()         { *m = TopicView{} }
 func (m *TopicView) String() string { return proto.CompactTextString(m) }
 func (*TopicView) ProtoMessage()    {}
 func (*TopicView) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topic_view_3f7e8b858c6defb8, []int{0}
+	return fileDescriptor_a0d62eef5707a97d, []int{0}
 }
+
 func (m *TopicView) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TopicView.Unmarshal(m, b)
 }
 func (m *TopicView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TopicView.Marshal(b, m, deterministic)
 }
-func (dst *TopicView) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TopicView.Merge(dst, src)
+func (m *TopicView) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TopicView.Merge(m, src)
 }
 func (m *TopicView) XXX_Size() int {
 	return xxx_messageInfo_TopicView.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/topic_view.proto", fileDescriptor_topic_view_3f7e8b858c6defb8)
+	proto.RegisterFile("google/ads/googleads/v1/resources/topic_view.proto", fileDescriptor_a0d62eef5707a97d)
 }
 
-var fileDescriptor_topic_view_3f7e8b858c6defb8 = []byte{
+var fileDescriptor_a0d62eef5707a97d = []byte{
 	// 263 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x31, 0x4b, 0x03, 0x31,
 	0x14, 0xc7, 0xb9, 0x13, 0x84, 0x1e, 0xea, 0xd0, 0x49, 0xc4, 0xc1, 0x2a, 0x05, 0xa7, 0x17, 0xa3,
diff --git a/googleapis/ads/googleads/v1/resources/user_interest.pb.go b/googleapis/ads/googleads/v1/resources/user_interest.pb.go
index 3252aca60e..9960dd2073 100644
--- a/googleapis/ads/googleads/v1/resources/user_interest.pb.go
+++ b/googleapis/ads/googleads/v1/resources/user_interest.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/user_interest.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A user interest: a particular interest-based vertical to be targeted.
 type UserInterest struct {
@@ -50,16 +53,17 @@ func (m *UserInterest) Reset()         { *m = UserInterest{} }
 func (m *UserInterest) String() string { return proto.CompactTextString(m) }
 func (*UserInterest) ProtoMessage()    {}
 func (*UserInterest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_interest_36047fb460ea0a9e, []int{0}
+	return fileDescriptor_01746905ff80465b, []int{0}
 }
+
 func (m *UserInterest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserInterest.Unmarshal(m, b)
 }
 func (m *UserInterest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserInterest.Marshal(b, m, deterministic)
 }
-func (dst *UserInterest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserInterest.Merge(dst, src)
+func (m *UserInterest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserInterest.Merge(m, src)
 }
 func (m *UserInterest) XXX_Size() int {
 	return xxx_messageInfo_UserInterest.Size(m)
@@ -124,10 +128,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/user_interest.proto", fileDescriptor_user_interest_36047fb460ea0a9e)
+	proto.RegisterFile("google/ads/googleads/v1/resources/user_interest.proto", fileDescriptor_01746905ff80465b)
 }
 
-var fileDescriptor_user_interest_36047fb460ea0a9e = []byte{
+var fileDescriptor_01746905ff80465b = []byte{
 	// 519 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xdd, 0x8a, 0xd3, 0x40,
 	0x14, 0x26, 0x6d, 0x5d, 0x31, 0xdb, 0x56, 0x0d, 0x5e, 0x84, 0xba, 0x48, 0x57, 0x59, 0xe8, 0xd5,
diff --git a/googleapis/ads/googleads/v1/resources/user_list.pb.go b/googleapis/ads/googleads/v1/resources/user_list.pb.go
index ea992bcc7c..b740a57c6c 100644
--- a/googleapis/ads/googleads/v1/resources/user_list.pb.go
+++ b/googleapis/ads/googleads/v1/resources/user_list.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/user_list.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A user list. This is a list of users a customer may target.
 type UserList struct {
@@ -120,16 +123,17 @@ func (m *UserList) Reset()         { *m = UserList{} }
 func (m *UserList) String() string { return proto.CompactTextString(m) }
 func (*UserList) ProtoMessage()    {}
 func (*UserList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_263e88425715e3b0, []int{0}
+	return fileDescriptor_fcfde90717249098, []int{0}
 }
+
 func (m *UserList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserList.Unmarshal(m, b)
 }
 func (m *UserList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserList.Marshal(b, m, deterministic)
 }
-func (dst *UserList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserList.Merge(dst, src)
+func (m *UserList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserList.Merge(m, src)
 }
 func (m *UserList) XXX_Size() int {
 	return xxx_messageInfo_UserList.Size(m)
@@ -342,9 +346,9 @@ func (m *UserList) GetBasicUserList() *common.BasicUserListInfo {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*UserList) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _UserList_OneofMarshaler, _UserList_OneofUnmarshaler, _UserList_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*UserList) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*UserList_CrmBasedUserList)(nil),
 		(*UserList_SimilarUserList)(nil),
 		(*UserList_RuleBasedUserList)(nil),
@@ -353,135 +357,15 @@ func (*UserList) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _UserList_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*UserList)
-	// user_list
-	switch x := m.UserList.(type) {
-	case *UserList_CrmBasedUserList:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CrmBasedUserList); err != nil {
-			return err
-		}
-	case *UserList_SimilarUserList:
-		b.EncodeVarint(20<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SimilarUserList); err != nil {
-			return err
-		}
-	case *UserList_RuleBasedUserList:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RuleBasedUserList); err != nil {
-			return err
-		}
-	case *UserList_LogicalUserList:
-		b.EncodeVarint(22<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LogicalUserList); err != nil {
-			return err
-		}
-	case *UserList_BasicUserList:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BasicUserList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("UserList.UserList has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _UserList_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*UserList)
-	switch tag {
-	case 19: // user_list.crm_based_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.CrmBasedUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.UserList = &UserList_CrmBasedUserList{msg}
-		return true, err
-	case 20: // user_list.similar_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.SimilarUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.UserList = &UserList_SimilarUserList{msg}
-		return true, err
-	case 21: // user_list.rule_based_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.RuleBasedUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.UserList = &UserList_RuleBasedUserList{msg}
-		return true, err
-	case 22: // user_list.logical_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.LogicalUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.UserList = &UserList_LogicalUserList{msg}
-		return true, err
-	case 23: // user_list.basic_user_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(common.BasicUserListInfo)
-		err := b.DecodeMessage(msg)
-		m.UserList = &UserList_BasicUserList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _UserList_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*UserList)
-	// user_list
-	switch x := m.UserList.(type) {
-	case *UserList_CrmBasedUserList:
-		s := proto.Size(x.CrmBasedUserList)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserList_SimilarUserList:
-		s := proto.Size(x.SimilarUserList)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserList_RuleBasedUserList:
-		s := proto.Size(x.RuleBasedUserList)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserList_LogicalUserList:
-		s := proto.Size(x.LogicalUserList)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserList_BasicUserList:
-		s := proto.Size(x.BasicUserList)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*UserList)(nil), "google.ads.googleads.v1.resources.UserList")
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/user_list.proto", fileDescriptor_user_list_263e88425715e3b0)
+	proto.RegisterFile("google/ads/googleads/v1/resources/user_list.proto", fileDescriptor_fcfde90717249098)
 }
 
-var fileDescriptor_user_list_263e88425715e3b0 = []byte{
+var fileDescriptor_fcfde90717249098 = []byte{
 	// 927 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4d, 0x6f, 0xdb, 0x36,
 	0x1c, 0xc6, 0x67, 0x37, 0xeb, 0x12, 0x26, 0x8e, 0x6d, 0x26, 0xe9, 0x84, 0xac, 0x18, 0xd2, 0x0d,
diff --git a/googleapis/ads/googleads/v1/resources/video.pb.go b/googleapis/ads/googleads/v1/resources/video.pb.go
index 55061f6ba3..39a9618108 100644
--- a/googleapis/ads/googleads/v1/resources/video.pb.go
+++ b/googleapis/ads/googleads/v1/resources/video.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/resources/video.proto
 
-package resources // import "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+package resources
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A video.
 type Video struct {
@@ -44,16 +47,17 @@ func (m *Video) Reset()         { *m = Video{} }
 func (m *Video) String() string { return proto.CompactTextString(m) }
 func (*Video) ProtoMessage()    {}
 func (*Video) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_71e1c02985f5b3f4, []int{0}
+	return fileDescriptor_a029458d5852873f, []int{0}
 }
+
 func (m *Video) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Video.Unmarshal(m, b)
 }
 func (m *Video) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Video.Marshal(b, m, deterministic)
 }
-func (dst *Video) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Video.Merge(dst, src)
+func (m *Video) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Video.Merge(m, src)
 }
 func (m *Video) XXX_Size() int {
 	return xxx_messageInfo_Video.Size(m)
@@ -104,10 +108,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/resources/video.proto", fileDescriptor_video_71e1c02985f5b3f4)
+	proto.RegisterFile("google/ads/googleads/v1/resources/video.proto", fileDescriptor_a029458d5852873f)
 }
 
-var fileDescriptor_video_71e1c02985f5b3f4 = []byte{
+var fileDescriptor_a029458d5852873f = []byte{
 	// 370 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4a, 0xf3, 0x40,
 	0x14, 0xc5, 0x49, 0xfa, 0xf5, 0x83, 0x8e, 0xff, 0x20, 0xab, 0x50, 0x8b, 0xb4, 0x4a, 0xa1, 0x0b,
diff --git a/googleapis/ads/googleads/v1/services/account_budget_proposal_service.pb.go b/googleapis/ads/googleads/v1/services/account_budget_proposal_service.pb.go
index dc788277ce..8f14b153d2 100644
--- a/googleapis/ads/googleads/v1/services/account_budget_proposal_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/account_budget_proposal_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/account_budget_proposal_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [AccountBudgetProposalService.GetAccountBudgetProposal][google.ads.googleads.v1.services.AccountBudgetProposalService.GetAccountBudgetProposal].
@@ -40,16 +40,17 @@ func (m *GetAccountBudgetProposalRequest) Reset()         { *m = GetAccountBudge
 func (m *GetAccountBudgetProposalRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAccountBudgetProposalRequest) ProtoMessage()    {}
 func (*GetAccountBudgetProposalRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_service_19af3128d079e096, []int{0}
+	return fileDescriptor_2316c2664e0be7e3, []int{0}
 }
+
 func (m *GetAccountBudgetProposalRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAccountBudgetProposalRequest.Unmarshal(m, b)
 }
 func (m *GetAccountBudgetProposalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAccountBudgetProposalRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAccountBudgetProposalRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAccountBudgetProposalRequest.Merge(dst, src)
+func (m *GetAccountBudgetProposalRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAccountBudgetProposalRequest.Merge(m, src)
 }
 func (m *GetAccountBudgetProposalRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAccountBudgetProposalRequest.Size(m)
@@ -86,16 +87,17 @@ func (m *MutateAccountBudgetProposalRequest) Reset()         { *m = MutateAccoun
 func (m *MutateAccountBudgetProposalRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAccountBudgetProposalRequest) ProtoMessage()    {}
 func (*MutateAccountBudgetProposalRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_service_19af3128d079e096, []int{1}
+	return fileDescriptor_2316c2664e0be7e3, []int{1}
 }
+
 func (m *MutateAccountBudgetProposalRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAccountBudgetProposalRequest.Unmarshal(m, b)
 }
 func (m *MutateAccountBudgetProposalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAccountBudgetProposalRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAccountBudgetProposalRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAccountBudgetProposalRequest.Merge(dst, src)
+func (m *MutateAccountBudgetProposalRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAccountBudgetProposalRequest.Merge(m, src)
 }
 func (m *MutateAccountBudgetProposalRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAccountBudgetProposalRequest.Size(m)
@@ -152,16 +154,17 @@ func (m *AccountBudgetProposalOperation) Reset()         { *m = AccountBudgetPro
 func (m *AccountBudgetProposalOperation) String() string { return proto.CompactTextString(m) }
 func (*AccountBudgetProposalOperation) ProtoMessage()    {}
 func (*AccountBudgetProposalOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_service_19af3128d079e096, []int{2}
+	return fileDescriptor_2316c2664e0be7e3, []int{2}
 }
+
 func (m *AccountBudgetProposalOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountBudgetProposalOperation.Unmarshal(m, b)
 }
 func (m *AccountBudgetProposalOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountBudgetProposalOperation.Marshal(b, m, deterministic)
 }
-func (dst *AccountBudgetProposalOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountBudgetProposalOperation.Merge(dst, src)
+func (m *AccountBudgetProposalOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountBudgetProposalOperation.Merge(m, src)
 }
 func (m *AccountBudgetProposalOperation) XXX_Size() int {
 	return xxx_messageInfo_AccountBudgetProposalOperation.Size(m)
@@ -216,76 +219,14 @@ func (m *AccountBudgetProposalOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AccountBudgetProposalOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AccountBudgetProposalOperation_OneofMarshaler, _AccountBudgetProposalOperation_OneofUnmarshaler, _AccountBudgetProposalOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AccountBudgetProposalOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AccountBudgetProposalOperation_Create)(nil),
 		(*AccountBudgetProposalOperation_Remove)(nil),
 	}
 }
 
-func _AccountBudgetProposalOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AccountBudgetProposalOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AccountBudgetProposalOperation_Create:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AccountBudgetProposalOperation_Remove:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AccountBudgetProposalOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AccountBudgetProposalOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AccountBudgetProposalOperation)
-	switch tag {
-	case 2: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AccountBudgetProposal)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AccountBudgetProposalOperation_Create{msg}
-		return true, err
-	case 1: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AccountBudgetProposalOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AccountBudgetProposalOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AccountBudgetProposalOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AccountBudgetProposalOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountBudgetProposalOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for account-level budget mutate operations.
 type MutateAccountBudgetProposalResponse struct {
 	// The result of the mutate.
@@ -299,16 +240,17 @@ func (m *MutateAccountBudgetProposalResponse) Reset()         { *m = MutateAccou
 func (m *MutateAccountBudgetProposalResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAccountBudgetProposalResponse) ProtoMessage()    {}
 func (*MutateAccountBudgetProposalResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_service_19af3128d079e096, []int{3}
+	return fileDescriptor_2316c2664e0be7e3, []int{3}
 }
+
 func (m *MutateAccountBudgetProposalResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAccountBudgetProposalResponse.Unmarshal(m, b)
 }
 func (m *MutateAccountBudgetProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAccountBudgetProposalResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAccountBudgetProposalResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAccountBudgetProposalResponse.Merge(dst, src)
+func (m *MutateAccountBudgetProposalResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAccountBudgetProposalResponse.Merge(m, src)
 }
 func (m *MutateAccountBudgetProposalResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAccountBudgetProposalResponse.Size(m)
@@ -339,16 +281,17 @@ func (m *MutateAccountBudgetProposalResult) Reset()         { *m = MutateAccount
 func (m *MutateAccountBudgetProposalResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAccountBudgetProposalResult) ProtoMessage()    {}
 func (*MutateAccountBudgetProposalResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_proposal_service_19af3128d079e096, []int{4}
+	return fileDescriptor_2316c2664e0be7e3, []int{4}
 }
+
 func (m *MutateAccountBudgetProposalResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAccountBudgetProposalResult.Unmarshal(m, b)
 }
 func (m *MutateAccountBudgetProposalResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAccountBudgetProposalResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAccountBudgetProposalResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAccountBudgetProposalResult.Merge(dst, src)
+func (m *MutateAccountBudgetProposalResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAccountBudgetProposalResult.Merge(m, src)
 }
 func (m *MutateAccountBudgetProposalResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAccountBudgetProposalResult.Size(m)
@@ -374,6 +317,54 @@ func init() {
 	proto.RegisterType((*MutateAccountBudgetProposalResult)(nil), "google.ads.googleads.v1.services.MutateAccountBudgetProposalResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/account_budget_proposal_service.proto", fileDescriptor_2316c2664e0be7e3)
+}
+
+var fileDescriptor_2316c2664e0be7e3 = []byte{
+	// 629 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x3f, 0x6f, 0xd3, 0x4e,
+	0x18, 0xfe, 0xd9, 0x95, 0xa2, 0x5f, 0x2f, 0x65, 0xb9, 0x29, 0x0a, 0x15, 0x4d, 0xdd, 0x0e, 0x51,
+	0x06, 0x5b, 0x09, 0x4b, 0xe5, 0xa8, 0x22, 0x0e, 0x90, 0x84, 0xa1, 0x34, 0x32, 0x52, 0x06, 0x88,
+	0xb0, 0x2e, 0xf6, 0xd5, 0xb2, 0x6a, 0xfb, 0x8c, 0xef, 0x1c, 0xa9, 0xaa, 0xba, 0x74, 0x62, 0xe7,
+	0x1b, 0x30, 0xf2, 0x51, 0xba, 0xb2, 0xc0, 0xce, 0xc4, 0x82, 0xc4, 0x27, 0x40, 0xf6, 0xdd, 0xa5,
+	0xad, 0x94, 0xd8, 0x88, 0x6e, 0xaf, 0xcf, 0x8f, 0x9f, 0xe7, 0x7d, 0xde, 0x3f, 0x67, 0x30, 0xf2,
+	0x09, 0xf1, 0x43, 0x6c, 0x20, 0x8f, 0x1a, 0x3c, 0xcc, 0xa3, 0x65, 0xd7, 0xa0, 0x38, 0x5d, 0x06,
+	0x2e, 0xa6, 0x06, 0x72, 0x5d, 0x92, 0xc5, 0xcc, 0x59, 0x64, 0x9e, 0x8f, 0x99, 0x93, 0xa4, 0x24,
+	0x21, 0x14, 0x85, 0x8e, 0x00, 0xe8, 0x49, 0x4a, 0x18, 0x81, 0x2d, 0xfe, 0xb1, 0x8e, 0x3c, 0xaa,
+	0xaf, 0x78, 0xf4, 0x65, 0x57, 0x97, 0x3c, 0xcd, 0x67, 0x9b, 0x94, 0x52, 0x4c, 0x49, 0x96, 0x96,
+	0x48, 0x71, 0x89, 0xe6, 0xae, 0x24, 0x48, 0x02, 0x03, 0xc5, 0x31, 0x61, 0x88, 0x05, 0x24, 0xa6,
+	0xe2, 0xad, 0x48, 0xc0, 0x28, 0x9e, 0x16, 0xd9, 0x99, 0x71, 0x16, 0xe0, 0xd0, 0x73, 0x22, 0x44,
+	0xcf, 0x39, 0x42, 0x1b, 0x81, 0xbd, 0x31, 0x66, 0x16, 0xd7, 0x18, 0x16, 0x12, 0x53, 0xa1, 0x60,
+	0xe3, 0x0f, 0x19, 0xa6, 0x0c, 0x1e, 0x80, 0x47, 0x32, 0x1b, 0x27, 0x46, 0x11, 0x6e, 0x28, 0x2d,
+	0xa5, 0xbd, 0x6d, 0xef, 0xc8, 0xc3, 0xd7, 0x28, 0xc2, 0xda, 0x8d, 0x02, 0xb4, 0x93, 0x8c, 0x21,
+	0x86, 0x4b, 0xb9, 0xf6, 0x40, 0xdd, 0xcd, 0x28, 0x23, 0x11, 0x4e, 0x9d, 0xc0, 0x13, 0x4c, 0x40,
+	0x1e, 0xbd, 0xf2, 0xe0, 0x7b, 0xb0, 0x4d, 0x12, 0x9c, 0x16, 0x2e, 0x1a, 0x6a, 0x4b, 0x69, 0xd7,
+	0x7b, 0x03, 0xbd, 0xaa, 0x8c, 0xfa, 0x5a, 0xcd, 0x53, 0xc9, 0x63, 0xdf, 0x52, 0xe6, 0x66, 0x96,
+	0x28, 0x0c, 0x3c, 0xc4, 0xb0, 0x43, 0xe2, 0xf0, 0xa2, 0xb1, 0xd5, 0x52, 0xda, 0xff, 0xdb, 0x3b,
+	0xf2, 0xf0, 0x34, 0x0e, 0x2f, 0xb4, 0x6f, 0x0a, 0x78, 0x52, 0x4e, 0x09, 0xfb, 0xa0, 0x9e, 0x25,
+	0x05, 0x4b, 0x5e, 0xcc, 0x82, 0xa5, 0xde, 0x6b, 0xca, 0x4c, 0x65, 0xbd, 0xf5, 0x51, 0x5e, 0xef,
+	0x13, 0x44, 0xcf, 0x6d, 0xc0, 0xe1, 0x79, 0x0c, 0x6d, 0x50, 0x73, 0x53, 0x8c, 0x18, 0x16, 0x0e,
+	0x8f, 0x36, 0x3a, 0x5c, 0x8d, 0xc1, 0x7a, 0x8b, 0x93, 0xff, 0x6c, 0xc1, 0x04, 0x1b, 0xa0, 0x96,
+	0xe2, 0x88, 0x2c, 0x45, 0x7b, 0xf2, 0x37, 0xfc, 0x79, 0x58, 0xbf, 0x53, 0x52, 0xed, 0x5a, 0x01,
+	0x07, 0xa5, 0x7d, 0xa2, 0x09, 0x89, 0x29, 0x86, 0xef, 0x72, 0x3a, 0x9a, 0x85, 0x4c, 0xa4, 0xf8,
+	0xbc, 0xba, 0x09, 0xe5, 0xb4, 0x59, 0xc8, 0x6c, 0x41, 0xa9, 0x4d, 0xc0, 0x7e, 0x25, 0xf8, 0xaf,
+	0xc6, 0xae, 0xf7, 0x6b, 0x0b, 0xec, 0xae, 0x25, 0x79, 0xc3, 0xb3, 0x82, 0xdf, 0x15, 0xd0, 0xd8,
+	0x34, 0xe0, 0xd0, 0xaa, 0x36, 0x55, 0xb1, 0x1c, 0xcd, 0x7f, 0x6e, 0x9d, 0x36, 0xb8, 0xfe, 0xfa,
+	0xe3, 0x93, 0x6a, 0xc2, 0xa3, 0x7c, 0xdd, 0x2f, 0xef, 0x59, 0x3d, 0x96, 0x0b, 0x41, 0x8d, 0x8e,
+	0xdc, 0xff, 0xfb, 0x5f, 0x53, 0xa3, 0x73, 0x05, 0x7f, 0x2b, 0xe0, 0x71, 0x49, 0x1d, 0xe1, 0x8b,
+	0x07, 0xf6, 0x8c, 0x3b, 0x7c, 0xf9, 0xd0, 0xce, 0x17, 0x03, 0xa5, 0x8d, 0x0a, 0xbb, 0x03, 0xad,
+	0x9f, 0xdb, 0xbd, 0xf5, 0x77, 0x79, 0xe7, 0x3a, 0x38, 0xee, 0x5c, 0x6d, 0x70, 0x6b, 0x46, 0x85,
+	0x82, 0xa9, 0x74, 0x86, 0x1f, 0x55, 0x70, 0xe8, 0x92, 0xa8, 0x32, 0xa9, 0xe1, 0x7e, 0xd9, 0x5c,
+	0x4c, 0xf3, 0x05, 0x9d, 0x2a, 0x6f, 0x27, 0x82, 0xc6, 0x27, 0x21, 0x8a, 0x7d, 0x9d, 0xa4, 0xbe,
+	0xe1, 0xe3, 0xb8, 0x58, 0x5f, 0x79, 0x1f, 0x27, 0x01, 0xdd, 0xfc, 0x23, 0xe8, 0xcb, 0xe0, 0xb3,
+	0xba, 0x35, 0xb6, 0xac, 0x2f, 0x6a, 0x6b, 0xcc, 0x09, 0x2d, 0x8f, 0xea, 0x3c, 0xcc, 0xa3, 0x59,
+	0x57, 0x17, 0xc2, 0xf4, 0x46, 0x42, 0xe6, 0x96, 0x47, 0xe7, 0x2b, 0xc8, 0x7c, 0xd6, 0x9d, 0x4b,
+	0xc8, 0x4f, 0xf5, 0x90, 0x9f, 0x9b, 0xa6, 0xe5, 0x51, 0xd3, 0x5c, 0x81, 0x4c, 0x73, 0xd6, 0x35,
+	0x4d, 0x09, 0x5b, 0xd4, 0x8a, 0x3c, 0x9f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x83, 0x78, 0xdf,
+	0x87, 0xaf, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -484,51 +475,3 @@ var _AccountBudgetProposalService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/account_budget_proposal_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/account_budget_proposal_service.proto", fileDescriptor_account_budget_proposal_service_19af3128d079e096)
-}
-
-var fileDescriptor_account_budget_proposal_service_19af3128d079e096 = []byte{
-	// 629 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x3f, 0x6f, 0xd3, 0x4e,
-	0x18, 0xfe, 0xd9, 0x95, 0xa2, 0x5f, 0x2f, 0x65, 0xb9, 0x29, 0x0a, 0x15, 0x4d, 0xdd, 0x0e, 0x51,
-	0x06, 0x5b, 0x09, 0x4b, 0xe5, 0xa8, 0x22, 0x0e, 0x90, 0x84, 0xa1, 0x34, 0x32, 0x52, 0x06, 0x88,
-	0xb0, 0x2e, 0xf6, 0xd5, 0xb2, 0x6a, 0xfb, 0x8c, 0xef, 0x1c, 0xa9, 0xaa, 0xba, 0x74, 0x62, 0xe7,
-	0x1b, 0x30, 0xf2, 0x51, 0xba, 0xb2, 0xc0, 0xce, 0xc4, 0x82, 0xc4, 0x27, 0x40, 0xf6, 0xdd, 0xa5,
-	0xad, 0x94, 0xd8, 0x88, 0x6e, 0xaf, 0xcf, 0x8f, 0x9f, 0xe7, 0x7d, 0xde, 0x3f, 0x67, 0x30, 0xf2,
-	0x09, 0xf1, 0x43, 0x6c, 0x20, 0x8f, 0x1a, 0x3c, 0xcc, 0xa3, 0x65, 0xd7, 0xa0, 0x38, 0x5d, 0x06,
-	0x2e, 0xa6, 0x06, 0x72, 0x5d, 0x92, 0xc5, 0xcc, 0x59, 0x64, 0x9e, 0x8f, 0x99, 0x93, 0xa4, 0x24,
-	0x21, 0x14, 0x85, 0x8e, 0x00, 0xe8, 0x49, 0x4a, 0x18, 0x81, 0x2d, 0xfe, 0xb1, 0x8e, 0x3c, 0xaa,
-	0xaf, 0x78, 0xf4, 0x65, 0x57, 0x97, 0x3c, 0xcd, 0x67, 0x9b, 0x94, 0x52, 0x4c, 0x49, 0x96, 0x96,
-	0x48, 0x71, 0x89, 0xe6, 0xae, 0x24, 0x48, 0x02, 0x03, 0xc5, 0x31, 0x61, 0x88, 0x05, 0x24, 0xa6,
-	0xe2, 0xad, 0x48, 0xc0, 0x28, 0x9e, 0x16, 0xd9, 0x99, 0x71, 0x16, 0xe0, 0xd0, 0x73, 0x22, 0x44,
-	0xcf, 0x39, 0x42, 0x1b, 0x81, 0xbd, 0x31, 0x66, 0x16, 0xd7, 0x18, 0x16, 0x12, 0x53, 0xa1, 0x60,
-	0xe3, 0x0f, 0x19, 0xa6, 0x0c, 0x1e, 0x80, 0x47, 0x32, 0x1b, 0x27, 0x46, 0x11, 0x6e, 0x28, 0x2d,
-	0xa5, 0xbd, 0x6d, 0xef, 0xc8, 0xc3, 0xd7, 0x28, 0xc2, 0xda, 0x8d, 0x02, 0xb4, 0x93, 0x8c, 0x21,
-	0x86, 0x4b, 0xb9, 0xf6, 0x40, 0xdd, 0xcd, 0x28, 0x23, 0x11, 0x4e, 0x9d, 0xc0, 0x13, 0x4c, 0x40,
-	0x1e, 0xbd, 0xf2, 0xe0, 0x7b, 0xb0, 0x4d, 0x12, 0x9c, 0x16, 0x2e, 0x1a, 0x6a, 0x4b, 0x69, 0xd7,
-	0x7b, 0x03, 0xbd, 0xaa, 0x8c, 0xfa, 0x5a, 0xcd, 0x53, 0xc9, 0x63, 0xdf, 0x52, 0xe6, 0x66, 0x96,
-	0x28, 0x0c, 0x3c, 0xc4, 0xb0, 0x43, 0xe2, 0xf0, 0xa2, 0xb1, 0xd5, 0x52, 0xda, 0xff, 0xdb, 0x3b,
-	0xf2, 0xf0, 0x34, 0x0e, 0x2f, 0xb4, 0x6f, 0x0a, 0x78, 0x52, 0x4e, 0x09, 0xfb, 0xa0, 0x9e, 0x25,
-	0x05, 0x4b, 0x5e, 0xcc, 0x82, 0xa5, 0xde, 0x6b, 0xca, 0x4c, 0x65, 0xbd, 0xf5, 0x51, 0x5e, 0xef,
-	0x13, 0x44, 0xcf, 0x6d, 0xc0, 0xe1, 0x79, 0x0c, 0x6d, 0x50, 0x73, 0x53, 0x8c, 0x18, 0x16, 0x0e,
-	0x8f, 0x36, 0x3a, 0x5c, 0x8d, 0xc1, 0x7a, 0x8b, 0x93, 0xff, 0x6c, 0xc1, 0x04, 0x1b, 0xa0, 0x96,
-	0xe2, 0x88, 0x2c, 0x45, 0x7b, 0xf2, 0x37, 0xfc, 0x79, 0x58, 0xbf, 0x53, 0x52, 0xed, 0x5a, 0x01,
-	0x07, 0xa5, 0x7d, 0xa2, 0x09, 0x89, 0x29, 0x86, 0xef, 0x72, 0x3a, 0x9a, 0x85, 0x4c, 0xa4, 0xf8,
-	0xbc, 0xba, 0x09, 0xe5, 0xb4, 0x59, 0xc8, 0x6c, 0x41, 0xa9, 0x4d, 0xc0, 0x7e, 0x25, 0xf8, 0xaf,
-	0xc6, 0xae, 0xf7, 0x6b, 0x0b, 0xec, 0xae, 0x25, 0x79, 0xc3, 0xb3, 0x82, 0xdf, 0x15, 0xd0, 0xd8,
-	0x34, 0xe0, 0xd0, 0xaa, 0x36, 0x55, 0xb1, 0x1c, 0xcd, 0x7f, 0x6e, 0x9d, 0x36, 0xb8, 0xfe, 0xfa,
-	0xe3, 0x93, 0x6a, 0xc2, 0xa3, 0x7c, 0xdd, 0x2f, 0xef, 0x59, 0x3d, 0x96, 0x0b, 0x41, 0x8d, 0x8e,
-	0xdc, 0xff, 0xfb, 0x5f, 0x53, 0xa3, 0x73, 0x05, 0x7f, 0x2b, 0xe0, 0x71, 0x49, 0x1d, 0xe1, 0x8b,
-	0x07, 0xf6, 0x8c, 0x3b, 0x7c, 0xf9, 0xd0, 0xce, 0x17, 0x03, 0xa5, 0x8d, 0x0a, 0xbb, 0x03, 0xad,
-	0x9f, 0xdb, 0xbd, 0xf5, 0x77, 0x79, 0xe7, 0x3a, 0x38, 0xee, 0x5c, 0x6d, 0x70, 0x6b, 0x46, 0x85,
-	0x82, 0xa9, 0x74, 0x86, 0x1f, 0x55, 0x70, 0xe8, 0x92, 0xa8, 0x32, 0xa9, 0xe1, 0x7e, 0xd9, 0x5c,
-	0x4c, 0xf3, 0x05, 0x9d, 0x2a, 0x6f, 0x27, 0x82, 0xc6, 0x27, 0x21, 0x8a, 0x7d, 0x9d, 0xa4, 0xbe,
-	0xe1, 0xe3, 0xb8, 0x58, 0x5f, 0x79, 0x1f, 0x27, 0x01, 0xdd, 0xfc, 0x23, 0xe8, 0xcb, 0xe0, 0xb3,
-	0xba, 0x35, 0xb6, 0xac, 0x2f, 0x6a, 0x6b, 0xcc, 0x09, 0x2d, 0x8f, 0xea, 0x3c, 0xcc, 0xa3, 0x59,
-	0x57, 0x17, 0xc2, 0xf4, 0x46, 0x42, 0xe6, 0x96, 0x47, 0xe7, 0x2b, 0xc8, 0x7c, 0xd6, 0x9d, 0x4b,
-	0xc8, 0x4f, 0xf5, 0x90, 0x9f, 0x9b, 0xa6, 0xe5, 0x51, 0xd3, 0x5c, 0x81, 0x4c, 0x73, 0xd6, 0x35,
-	0x4d, 0x09, 0x5b, 0xd4, 0x8a, 0x3c, 0x9f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x83, 0x78, 0xdf,
-	0x87, 0xaf, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/account_budget_service.pb.go b/googleapis/ads/googleads/v1/services/account_budget_service.pb.go
index 60bbe624ab..b85fb24224 100644
--- a/googleapis/ads/googleads/v1/services/account_budget_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/account_budget_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/account_budget_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [AccountBudgetService.GetAccountBudget][google.ads.googleads.v1.services.AccountBudgetService.GetAccountBudget].
@@ -39,16 +39,17 @@ func (m *GetAccountBudgetRequest) Reset()         { *m = GetAccountBudgetRequest
 func (m *GetAccountBudgetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAccountBudgetRequest) ProtoMessage()    {}
 func (*GetAccountBudgetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_account_budget_service_f5da40cfa7b98b21, []int{0}
+	return fileDescriptor_4dc4724169a75353, []int{0}
 }
+
 func (m *GetAccountBudgetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAccountBudgetRequest.Unmarshal(m, b)
 }
 func (m *GetAccountBudgetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAccountBudgetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAccountBudgetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAccountBudgetRequest.Merge(dst, src)
+func (m *GetAccountBudgetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAccountBudgetRequest.Merge(m, src)
 }
 func (m *GetAccountBudgetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAccountBudgetRequest.Size(m)
@@ -70,6 +71,37 @@ func init() {
 	proto.RegisterType((*GetAccountBudgetRequest)(nil), "google.ads.googleads.v1.services.GetAccountBudgetRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/account_budget_service.proto", fileDescriptor_4dc4724169a75353)
+}
+
+var fileDescriptor_4dc4724169a75353 = []byte{
+	// 364 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x4a, 0xf3, 0x40,
+	0x18, 0xc6, 0x49, 0x3e, 0xf8, 0xc0, 0xa0, 0x20, 0x41, 0x50, 0x8b, 0x8b, 0x52, 0xbb, 0x90, 0x2e,
+	0x66, 0x9a, 0x0a, 0xa2, 0x23, 0x15, 0xd2, 0x4d, 0x5d, 0x49, 0xa9, 0xd0, 0x85, 0x04, 0xca, 0x34,
+	0x19, 0x86, 0x40, 0x33, 0x53, 0xe7, 0x9d, 0x74, 0x23, 0x82, 0x78, 0x05, 0x6f, 0xe0, 0xd2, 0x1b,
+	0x78, 0x05, 0x97, 0x7a, 0x05, 0x57, 0x9e, 0x42, 0xd2, 0xe9, 0x04, 0xaa, 0x86, 0xee, 0x1e, 0xde,
+	0x3c, 0xbf, 0xf7, 0xcf, 0x93, 0xf1, 0xba, 0x5c, 0x4a, 0x3e, 0x65, 0x98, 0x26, 0x80, 0x8d, 0x2c,
+	0xd4, 0x3c, 0xc0, 0xc0, 0xd4, 0x3c, 0x8d, 0x19, 0x60, 0x1a, 0xc7, 0x32, 0x17, 0x7a, 0x3c, 0xc9,
+	0x13, 0xce, 0xf4, 0x78, 0x59, 0x47, 0x33, 0x25, 0xb5, 0xf4, 0xeb, 0x86, 0x41, 0x34, 0x01, 0x54,
+	0xe2, 0x68, 0x1e, 0x20, 0x8b, 0xd7, 0x4e, 0xaa, 0x06, 0x28, 0x06, 0x32, 0x57, 0xbf, 0x27, 0x98,
+	0xce, 0xb5, 0x03, 0xcb, 0xcd, 0x52, 0x4c, 0x85, 0x90, 0x9a, 0xea, 0x54, 0x0a, 0x30, 0x5f, 0x1b,
+	0x17, 0xde, 0x6e, 0x9f, 0xe9, 0xd0, 0x80, 0xbd, 0x05, 0x37, 0x64, 0xb7, 0x39, 0x03, 0xed, 0x1f,
+	0x7a, 0x5b, 0xb6, 0xf5, 0x58, 0xd0, 0x8c, 0xed, 0x39, 0x75, 0xe7, 0x68, 0x63, 0xb8, 0x69, 0x8b,
+	0x57, 0x34, 0x63, 0x9d, 0x77, 0xc7, 0xdb, 0x59, 0xa1, 0xaf, 0xcd, 0xbe, 0xfe, 0xab, 0xe3, 0x6d,
+	0xff, 0xec, 0xec, 0x9f, 0xa1, 0x75, 0x67, 0xa2, 0x8a, 0x6d, 0x6a, 0xed, 0x4a, 0xb4, 0xbc, 0x1f,
+	0xad, 0x80, 0x8d, 0xd3, 0xc7, 0x8f, 0xcf, 0x27, 0xb7, 0xe3, 0xb7, 0x8b, 0x90, 0xee, 0x56, 0x4e,
+	0xe9, 0xc6, 0x39, 0x68, 0x99, 0x31, 0x05, 0xb8, 0x65, 0x53, 0x33, 0x14, 0xe0, 0xd6, 0x7d, 0xef,
+	0xc1, 0xf5, 0x9a, 0xb1, 0xcc, 0xd6, 0x2e, 0xdb, 0xdb, 0xff, 0xeb, 0xf4, 0x41, 0x11, 0xec, 0xc0,
+	0xb9, 0xb9, 0x5c, 0xe2, 0x5c, 0x4e, 0xa9, 0xe0, 0x48, 0x2a, 0x8e, 0x39, 0x13, 0x8b, 0xd8, 0xed,
+	0x0f, 0x9c, 0xa5, 0x50, 0xfd, 0x60, 0xce, 0xad, 0x78, 0x76, 0xff, 0xf5, 0xc3, 0xf0, 0xc5, 0xad,
+	0xf7, 0x4d, 0xc3, 0x30, 0x01, 0x64, 0x64, 0xa1, 0x46, 0x01, 0x5a, 0x0e, 0x86, 0x37, 0x6b, 0x89,
+	0xc2, 0x04, 0xa2, 0xd2, 0x12, 0x8d, 0x82, 0xc8, 0x5a, 0xbe, 0xdc, 0xa6, 0xa9, 0x13, 0x12, 0x26,
+	0x40, 0x48, 0x69, 0x22, 0x64, 0x14, 0x10, 0x62, 0x6d, 0x93, 0xff, 0x8b, 0x3d, 0x8f, 0xbf, 0x03,
+	0x00, 0x00, 0xff, 0xff, 0x29, 0x16, 0xed, 0x5b, 0xd7, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,34 +175,3 @@ var _AccountBudgetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/account_budget_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/account_budget_service.proto", fileDescriptor_account_budget_service_f5da40cfa7b98b21)
-}
-
-var fileDescriptor_account_budget_service_f5da40cfa7b98b21 = []byte{
-	// 364 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x4a, 0xf3, 0x40,
-	0x18, 0xc6, 0x49, 0x3e, 0xf8, 0xc0, 0xa0, 0x20, 0x41, 0x50, 0x8b, 0x8b, 0x52, 0xbb, 0x90, 0x2e,
-	0x66, 0x9a, 0x0a, 0xa2, 0x23, 0x15, 0xd2, 0x4d, 0x5d, 0x49, 0xa9, 0xd0, 0x85, 0x04, 0xca, 0x34,
-	0x19, 0x86, 0x40, 0x33, 0x53, 0xe7, 0x9d, 0x74, 0x23, 0x82, 0x78, 0x05, 0x6f, 0xe0, 0xd2, 0x1b,
-	0x78, 0x05, 0x97, 0x7a, 0x05, 0x57, 0x9e, 0x42, 0xd2, 0xe9, 0x04, 0xaa, 0x86, 0xee, 0x1e, 0xde,
-	0x3c, 0xbf, 0xf7, 0xcf, 0x93, 0xf1, 0xba, 0x5c, 0x4a, 0x3e, 0x65, 0x98, 0x26, 0x80, 0x8d, 0x2c,
-	0xd4, 0x3c, 0xc0, 0xc0, 0xd4, 0x3c, 0x8d, 0x19, 0x60, 0x1a, 0xc7, 0x32, 0x17, 0x7a, 0x3c, 0xc9,
-	0x13, 0xce, 0xf4, 0x78, 0x59, 0x47, 0x33, 0x25, 0xb5, 0xf4, 0xeb, 0x86, 0x41, 0x34, 0x01, 0x54,
-	0xe2, 0x68, 0x1e, 0x20, 0x8b, 0xd7, 0x4e, 0xaa, 0x06, 0x28, 0x06, 0x32, 0x57, 0xbf, 0x27, 0x98,
-	0xce, 0xb5, 0x03, 0xcb, 0xcd, 0x52, 0x4c, 0x85, 0x90, 0x9a, 0xea, 0x54, 0x0a, 0x30, 0x5f, 0x1b,
-	0x17, 0xde, 0x6e, 0x9f, 0xe9, 0xd0, 0x80, 0xbd, 0x05, 0x37, 0x64, 0xb7, 0x39, 0x03, 0xed, 0x1f,
-	0x7a, 0x5b, 0xb6, 0xf5, 0x58, 0xd0, 0x8c, 0xed, 0x39, 0x75, 0xe7, 0x68, 0x63, 0xb8, 0x69, 0x8b,
-	0x57, 0x34, 0x63, 0x9d, 0x77, 0xc7, 0xdb, 0x59, 0xa1, 0xaf, 0xcd, 0xbe, 0xfe, 0xab, 0xe3, 0x6d,
-	0xff, 0xec, 0xec, 0x9f, 0xa1, 0x75, 0x67, 0xa2, 0x8a, 0x6d, 0x6a, 0xed, 0x4a, 0xb4, 0xbc, 0x1f,
-	0xad, 0x80, 0x8d, 0xd3, 0xc7, 0x8f, 0xcf, 0x27, 0xb7, 0xe3, 0xb7, 0x8b, 0x90, 0xee, 0x56, 0x4e,
-	0xe9, 0xc6, 0x39, 0x68, 0x99, 0x31, 0x05, 0xb8, 0x65, 0x53, 0x33, 0x14, 0xe0, 0xd6, 0x7d, 0xef,
-	0xc1, 0xf5, 0x9a, 0xb1, 0xcc, 0xd6, 0x2e, 0xdb, 0xdb, 0xff, 0xeb, 0xf4, 0x41, 0x11, 0xec, 0xc0,
-	0xb9, 0xb9, 0x5c, 0xe2, 0x5c, 0x4e, 0xa9, 0xe0, 0x48, 0x2a, 0x8e, 0x39, 0x13, 0x8b, 0xd8, 0xed,
-	0x0f, 0x9c, 0xa5, 0x50, 0xfd, 0x60, 0xce, 0xad, 0x78, 0x76, 0xff, 0xf5, 0xc3, 0xf0, 0xc5, 0xad,
-	0xf7, 0x4d, 0xc3, 0x30, 0x01, 0x64, 0x64, 0xa1, 0x46, 0x01, 0x5a, 0x0e, 0x86, 0x37, 0x6b, 0x89,
-	0xc2, 0x04, 0xa2, 0xd2, 0x12, 0x8d, 0x82, 0xc8, 0x5a, 0xbe, 0xdc, 0xa6, 0xa9, 0x13, 0x12, 0x26,
-	0x40, 0x48, 0x69, 0x22, 0x64, 0x14, 0x10, 0x62, 0x6d, 0x93, 0xff, 0x8b, 0x3d, 0x8f, 0xbf, 0x03,
-	0x00, 0x00, 0xff, 0xff, 0x29, 0x16, 0xed, 0x5b, 0xd7, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_ad_label_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_ad_label_service.pb.go
index 0179260327..5aea067b52 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_ad_label_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_ad_label_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_ad_label_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupAdLabelService.GetAdGroupAdLabel][google.ads.googleads.v1.services.AdGroupAdLabelService.GetAdGroupAdLabel].
 type GetAdGroupAdLabelRequest struct {
@@ -40,16 +40,17 @@ func (m *GetAdGroupAdLabelRequest) Reset()         { *m = GetAdGroupAdLabelReque
 func (m *GetAdGroupAdLabelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupAdLabelRequest) ProtoMessage()    {}
 func (*GetAdGroupAdLabelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_label_service_55352a1446b4673b, []int{0}
+	return fileDescriptor_54f0c11a748eada4, []int{0}
 }
+
 func (m *GetAdGroupAdLabelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupAdLabelRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupAdLabelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupAdLabelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupAdLabelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupAdLabelRequest.Merge(dst, src)
+func (m *GetAdGroupAdLabelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupAdLabelRequest.Merge(m, src)
 }
 func (m *GetAdGroupAdLabelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupAdLabelRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateAdGroupAdLabelsRequest) Reset()         { *m = MutateAdGroupAdLab
 func (m *MutateAdGroupAdLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupAdLabelsRequest) ProtoMessage()    {}
 func (*MutateAdGroupAdLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_label_service_55352a1446b4673b, []int{1}
+	return fileDescriptor_54f0c11a748eada4, []int{1}
 }
+
 func (m *MutateAdGroupAdLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupAdLabelsRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupAdLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupAdLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupAdLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupAdLabelsRequest.Merge(dst, src)
+func (m *MutateAdGroupAdLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupAdLabelsRequest.Merge(m, src)
 }
 func (m *MutateAdGroupAdLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupAdLabelsRequest.Size(m)
@@ -155,16 +157,17 @@ func (m *AdGroupAdLabelOperation) Reset()         { *m = AdGroupAdLabelOperation
 func (m *AdGroupAdLabelOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAdLabelOperation) ProtoMessage()    {}
 func (*AdGroupAdLabelOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_label_service_55352a1446b4673b, []int{2}
+	return fileDescriptor_54f0c11a748eada4, []int{2}
 }
+
 func (m *AdGroupAdLabelOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAdLabelOperation.Unmarshal(m, b)
 }
 func (m *AdGroupAdLabelOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAdLabelOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAdLabelOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAdLabelOperation.Merge(dst, src)
+func (m *AdGroupAdLabelOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAdLabelOperation.Merge(m, src)
 }
 func (m *AdGroupAdLabelOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAdLabelOperation.Size(m)
@@ -212,76 +215,14 @@ func (m *AdGroupAdLabelOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupAdLabelOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupAdLabelOperation_OneofMarshaler, _AdGroupAdLabelOperation_OneofUnmarshaler, _AdGroupAdLabelOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupAdLabelOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupAdLabelOperation_Create)(nil),
 		(*AdGroupAdLabelOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupAdLabelOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupAdLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupAdLabelOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupAdLabelOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupAdLabelOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupAdLabelOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupAdLabelOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupAdLabel)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupAdLabelOperation_Create{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupAdLabelOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupAdLabelOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupAdLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupAdLabelOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupAdLabelOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group ad labels mutate.
 type MutateAdGroupAdLabelsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -300,16 +241,17 @@ func (m *MutateAdGroupAdLabelsResponse) Reset()         { *m = MutateAdGroupAdLa
 func (m *MutateAdGroupAdLabelsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupAdLabelsResponse) ProtoMessage()    {}
 func (*MutateAdGroupAdLabelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_label_service_55352a1446b4673b, []int{3}
+	return fileDescriptor_54f0c11a748eada4, []int{3}
 }
+
 func (m *MutateAdGroupAdLabelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupAdLabelsResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupAdLabelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupAdLabelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupAdLabelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupAdLabelsResponse.Merge(dst, src)
+func (m *MutateAdGroupAdLabelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupAdLabelsResponse.Merge(m, src)
 }
 func (m *MutateAdGroupAdLabelsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupAdLabelsResponse.Size(m)
@@ -347,16 +289,17 @@ func (m *MutateAdGroupAdLabelResult) Reset()         { *m = MutateAdGroupAdLabel
 func (m *MutateAdGroupAdLabelResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupAdLabelResult) ProtoMessage()    {}
 func (*MutateAdGroupAdLabelResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_label_service_55352a1446b4673b, []int{4}
+	return fileDescriptor_54f0c11a748eada4, []int{4}
 }
+
 func (m *MutateAdGroupAdLabelResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupAdLabelResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupAdLabelResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupAdLabelResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupAdLabelResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupAdLabelResult.Merge(dst, src)
+func (m *MutateAdGroupAdLabelResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupAdLabelResult.Merge(m, src)
 }
 func (m *MutateAdGroupAdLabelResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupAdLabelResult.Size(m)
@@ -382,6 +325,56 @@ func init() {
 	proto.RegisterType((*MutateAdGroupAdLabelResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupAdLabelResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_ad_label_service.proto", fileDescriptor_54f0c11a748eada4)
+}
+
+var fileDescriptor_54f0c11a748eada4 = []byte{
+	// 669 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6f, 0xd3, 0x4c,
+	0x10, 0x7e, 0xed, 0xbc, 0x2a, 0x74, 0x53, 0x40, 0x2c, 0xaa, 0x6a, 0x45, 0x05, 0x22, 0x53, 0x89,
+	0x2a, 0x07, 0x5b, 0x4e, 0xb9, 0xc4, 0x50, 0x8a, 0x2b, 0xd1, 0x14, 0xf1, 0xd1, 0xca, 0x95, 0x22,
+	0x81, 0x22, 0x59, 0xdb, 0xec, 0xd6, 0xb2, 0xe4, 0x78, 0xcd, 0xee, 0x3a, 0xa8, 0xaa, 0x7a, 0x80,
+	0x3b, 0x27, 0xfe, 0x01, 0x47, 0xae, 0x9c, 0x11, 0x77, 0xae, 0x9c, 0xb8, 0x73, 0x40, 0xfc, 0x0a,
+	0x64, 0xaf, 0x37, 0x34, 0x21, 0x56, 0xa0, 0xb7, 0xd9, 0xf9, 0x78, 0x66, 0x9e, 0x99, 0x9d, 0x01,
+	0x0f, 0x42, 0x4a, 0xc3, 0x98, 0xd8, 0x08, 0x73, 0x5b, 0x8a, 0xb9, 0x34, 0x72, 0x6c, 0x4e, 0xd8,
+	0x28, 0x1a, 0x10, 0x6e, 0x23, 0x1c, 0x84, 0x8c, 0x66, 0x69, 0x80, 0x70, 0x10, 0xa3, 0x43, 0x12,
+	0x07, 0xa5, 0xc9, 0x4a, 0x19, 0x15, 0x14, 0x36, 0x65, 0x98, 0x85, 0x30, 0xb7, 0xc6, 0x08, 0xd6,
+	0xc8, 0xb1, 0x14, 0x42, 0xa3, 0x53, 0x95, 0x83, 0x11, 0x4e, 0x33, 0x36, 0x33, 0x89, 0x04, 0x6f,
+	0xac, 0xaa, 0xd0, 0x34, 0xb2, 0x51, 0x92, 0x50, 0x81, 0x44, 0x44, 0x13, 0x5e, 0x5a, 0x6f, 0x94,
+	0xd6, 0xe2, 0x75, 0x98, 0x1d, 0xd9, 0xaf, 0x18, 0x4a, 0x53, 0xc2, 0x94, 0x7d, 0xa5, 0xb4, 0xb3,
+	0x74, 0x60, 0x73, 0x81, 0x44, 0x56, 0x1a, 0xcc, 0x2d, 0x60, 0x74, 0x89, 0xf0, 0x70, 0x37, 0xcf,
+	0xe9, 0xe1, 0x27, 0x79, 0x46, 0x9f, 0xbc, 0xcc, 0x08, 0x17, 0xf0, 0x16, 0xb8, 0xa4, 0xea, 0x0a,
+	0x12, 0x34, 0x24, 0x86, 0xd6, 0xd4, 0xd6, 0x17, 0xfd, 0x25, 0xa5, 0x7c, 0x86, 0x86, 0xc4, 0xfc,
+	0xa1, 0x81, 0xd5, 0xa7, 0x99, 0x40, 0x82, 0x4c, 0x82, 0x70, 0x85, 0x72, 0x13, 0xd4, 0x07, 0x19,
+	0x17, 0x74, 0x48, 0x58, 0x10, 0xe1, 0x12, 0x03, 0x28, 0xd5, 0x23, 0x0c, 0x9f, 0x03, 0x40, 0x53,
+	0xc2, 0x24, 0x1f, 0x43, 0x6f, 0xd6, 0xd6, 0xeb, 0xed, 0x8e, 0x35, 0xaf, 0x97, 0xd6, 0x64, 0xba,
+	0x3d, 0x85, 0xe0, 0x9f, 0x01, 0x83, 0xb7, 0xc1, 0x95, 0x14, 0x31, 0x11, 0xa1, 0x38, 0x38, 0x42,
+	0x51, 0x9c, 0x31, 0x62, 0xd4, 0x9a, 0xda, 0xfa, 0x45, 0xff, 0x72, 0xa9, 0xde, 0x91, 0xda, 0x9c,
+	0xea, 0x08, 0xc5, 0x11, 0x46, 0x82, 0x04, 0x34, 0x89, 0x8f, 0x8d, 0xff, 0x0b, 0xb7, 0x25, 0xa5,
+	0xdc, 0x4b, 0xe2, 0x63, 0xf3, 0xad, 0x06, 0x56, 0x2a, 0xb2, 0xc2, 0xc7, 0x60, 0x61, 0xc0, 0x08,
+	0x12, 0xb2, 0x49, 0xf5, 0xb6, 0x53, 0x49, 0x60, 0x3c, 0xea, 0x29, 0x06, 0xbb, 0xff, 0xf9, 0x25,
+	0x04, 0x34, 0xc0, 0x02, 0x23, 0x43, 0x3a, 0x22, 0x86, 0x9e, 0x77, 0x2b, 0xb7, 0xc8, 0xf7, 0x76,
+	0x1d, 0x2c, 0x8e, 0xe9, 0x99, 0x9f, 0x35, 0x70, 0xbd, 0xa2, 0xf5, 0x3c, 0xa5, 0x09, 0x27, 0x70,
+	0x07, 0x2c, 0x4f, 0xf1, 0x0f, 0x08, 0x63, 0x94, 0x15, 0x5d, 0xa8, 0xb7, 0xa1, 0x2a, 0x92, 0xa5,
+	0x03, 0xeb, 0xa0, 0xf8, 0x16, 0xfe, 0xb5, 0xc9, 0xce, 0x3c, 0xcc, 0xdd, 0x61, 0x0f, 0x5c, 0x60,
+	0x84, 0x67, 0xb1, 0x50, 0xf3, 0xb9, 0x37, 0x7f, 0x3e, 0xb3, 0x2a, 0xf3, 0x0b, 0x10, 0x5f, 0x81,
+	0x99, 0x1e, 0x68, 0x54, 0xbb, 0xfd, 0xd5, 0xff, 0x6b, 0x7f, 0xac, 0x81, 0xe5, 0xc9, 0xe8, 0x03,
+	0x59, 0x01, 0xfc, 0xa4, 0x81, 0xab, 0x7f, 0xfc, 0x6d, 0xe8, 0xce, 0xaf, 0xbc, 0x6a, 0x21, 0x1a,
+	0xff, 0x3e, 0x54, 0xb3, 0xf3, 0xe6, 0xeb, 0xf7, 0x77, 0xfa, 0x06, 0x74, 0xf2, 0x2d, 0x3f, 0x99,
+	0xa0, 0xb3, 0xa9, 0x76, 0x80, 0xdb, 0x2d, 0x1b, 0x4d, 0x4e, 0xd0, 0x6e, 0x9d, 0xc2, 0x6f, 0x1a,
+	0x58, 0x9e, 0x39, 0x5e, 0x78, 0xff, 0x7c, 0xdd, 0x57, 0x2b, 0xd9, 0xd8, 0x3a, 0x77, 0xbc, 0xfc,
+	0x57, 0xe6, 0x56, 0xc1, 0xaa, 0x63, 0xde, 0xc9, 0x59, 0xfd, 0xa6, 0x71, 0x72, 0x66, 0xd1, 0x37,
+	0x5b, 0xa7, 0xd3, 0xa4, 0xdc, 0x61, 0x01, 0xea, 0x6a, 0xad, 0xed, 0xd7, 0x3a, 0x58, 0x1b, 0xd0,
+	0xe1, 0xdc, 0x3a, 0xb6, 0x1b, 0x33, 0x67, 0xbb, 0x9f, 0xdf, 0xae, 0x7d, 0xed, 0xc5, 0x6e, 0x19,
+	0x1f, 0xd2, 0x18, 0x25, 0xa1, 0x45, 0x59, 0x68, 0x87, 0x24, 0x29, 0x2e, 0x9b, 0xba, 0xaf, 0x69,
+	0xc4, 0xab, 0x4f, 0xfa, 0x5d, 0x25, 0xbc, 0xd7, 0x6b, 0x5d, 0xcf, 0xfb, 0xa0, 0x37, 0xbb, 0x12,
+	0xd0, 0xc3, 0xdc, 0x92, 0x62, 0x2e, 0xf5, 0x1c, 0xab, 0x4c, 0xcc, 0xbf, 0x28, 0x97, 0xbe, 0x87,
+	0x79, 0x7f, 0xec, 0xd2, 0xef, 0x39, 0x7d, 0xe5, 0xf2, 0x53, 0x5f, 0x93, 0x7a, 0xd7, 0xf5, 0x30,
+	0x77, 0xdd, 0xb1, 0x93, 0xeb, 0xf6, 0x1c, 0xd7, 0x55, 0x6e, 0x87, 0x0b, 0x45, 0x9d, 0x1b, 0xbf,
+	0x02, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xd7, 0x62, 0x6d, 0x79, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -492,53 +485,3 @@ var _AdGroupAdLabelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_ad_label_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_ad_label_service.proto", fileDescriptor_ad_group_ad_label_service_55352a1446b4673b)
-}
-
-var fileDescriptor_ad_group_ad_label_service_55352a1446b4673b = []byte{
-	// 669 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6f, 0xd3, 0x4c,
-	0x10, 0x7e, 0xed, 0xbc, 0x2a, 0x74, 0x53, 0x40, 0x2c, 0xaa, 0x6a, 0x45, 0x05, 0x22, 0x53, 0x89,
-	0x2a, 0x07, 0x5b, 0x4e, 0xb9, 0xc4, 0x50, 0x8a, 0x2b, 0xd1, 0x14, 0xf1, 0xd1, 0xca, 0x95, 0x22,
-	0x81, 0x22, 0x59, 0xdb, 0xec, 0xd6, 0xb2, 0xe4, 0x78, 0xcd, 0xee, 0x3a, 0xa8, 0xaa, 0x7a, 0x80,
-	0x3b, 0x27, 0xfe, 0x01, 0x47, 0xae, 0x9c, 0x11, 0x77, 0xae, 0x9c, 0xb8, 0x73, 0x40, 0xfc, 0x0a,
-	0x64, 0xaf, 0x37, 0x34, 0x21, 0x56, 0xa0, 0xb7, 0xd9, 0xf9, 0x78, 0x66, 0x9e, 0x99, 0x9d, 0x01,
-	0x0f, 0x42, 0x4a, 0xc3, 0x98, 0xd8, 0x08, 0x73, 0x5b, 0x8a, 0xb9, 0x34, 0x72, 0x6c, 0x4e, 0xd8,
-	0x28, 0x1a, 0x10, 0x6e, 0x23, 0x1c, 0x84, 0x8c, 0x66, 0x69, 0x80, 0x70, 0x10, 0xa3, 0x43, 0x12,
-	0x07, 0xa5, 0xc9, 0x4a, 0x19, 0x15, 0x14, 0x36, 0x65, 0x98, 0x85, 0x30, 0xb7, 0xc6, 0x08, 0xd6,
-	0xc8, 0xb1, 0x14, 0x42, 0xa3, 0x53, 0x95, 0x83, 0x11, 0x4e, 0x33, 0x36, 0x33, 0x89, 0x04, 0x6f,
-	0xac, 0xaa, 0xd0, 0x34, 0xb2, 0x51, 0x92, 0x50, 0x81, 0x44, 0x44, 0x13, 0x5e, 0x5a, 0x6f, 0x94,
-	0xd6, 0xe2, 0x75, 0x98, 0x1d, 0xd9, 0xaf, 0x18, 0x4a, 0x53, 0xc2, 0x94, 0x7d, 0xa5, 0xb4, 0xb3,
-	0x74, 0x60, 0x73, 0x81, 0x44, 0x56, 0x1a, 0xcc, 0x2d, 0x60, 0x74, 0x89, 0xf0, 0x70, 0x37, 0xcf,
-	0xe9, 0xe1, 0x27, 0x79, 0x46, 0x9f, 0xbc, 0xcc, 0x08, 0x17, 0xf0, 0x16, 0xb8, 0xa4, 0xea, 0x0a,
-	0x12, 0x34, 0x24, 0x86, 0xd6, 0xd4, 0xd6, 0x17, 0xfd, 0x25, 0xa5, 0x7c, 0x86, 0x86, 0xc4, 0xfc,
-	0xa1, 0x81, 0xd5, 0xa7, 0x99, 0x40, 0x82, 0x4c, 0x82, 0x70, 0x85, 0x72, 0x13, 0xd4, 0x07, 0x19,
-	0x17, 0x74, 0x48, 0x58, 0x10, 0xe1, 0x12, 0x03, 0x28, 0xd5, 0x23, 0x0c, 0x9f, 0x03, 0x40, 0x53,
-	0xc2, 0x24, 0x1f, 0x43, 0x6f, 0xd6, 0xd6, 0xeb, 0xed, 0x8e, 0x35, 0xaf, 0x97, 0xd6, 0x64, 0xba,
-	0x3d, 0x85, 0xe0, 0x9f, 0x01, 0x83, 0xb7, 0xc1, 0x95, 0x14, 0x31, 0x11, 0xa1, 0x38, 0x38, 0x42,
-	0x51, 0x9c, 0x31, 0x62, 0xd4, 0x9a, 0xda, 0xfa, 0x45, 0xff, 0x72, 0xa9, 0xde, 0x91, 0xda, 0x9c,
-	0xea, 0x08, 0xc5, 0x11, 0x46, 0x82, 0x04, 0x34, 0x89, 0x8f, 0x8d, 0xff, 0x0b, 0xb7, 0x25, 0xa5,
-	0xdc, 0x4b, 0xe2, 0x63, 0xf3, 0xad, 0x06, 0x56, 0x2a, 0xb2, 0xc2, 0xc7, 0x60, 0x61, 0xc0, 0x08,
-	0x12, 0xb2, 0x49, 0xf5, 0xb6, 0x53, 0x49, 0x60, 0x3c, 0xea, 0x29, 0x06, 0xbb, 0xff, 0xf9, 0x25,
-	0x04, 0x34, 0xc0, 0x02, 0x23, 0x43, 0x3a, 0x22, 0x86, 0x9e, 0x77, 0x2b, 0xb7, 0xc8, 0xf7, 0x76,
-	0x1d, 0x2c, 0x8e, 0xe9, 0x99, 0x9f, 0x35, 0x70, 0xbd, 0xa2, 0xf5, 0x3c, 0xa5, 0x09, 0x27, 0x70,
-	0x07, 0x2c, 0x4f, 0xf1, 0x0f, 0x08, 0x63, 0x94, 0x15, 0x5d, 0xa8, 0xb7, 0xa1, 0x2a, 0x92, 0xa5,
-	0x03, 0xeb, 0xa0, 0xf8, 0x16, 0xfe, 0xb5, 0xc9, 0xce, 0x3c, 0xcc, 0xdd, 0x61, 0x0f, 0x5c, 0x60,
-	0x84, 0x67, 0xb1, 0x50, 0xf3, 0xb9, 0x37, 0x7f, 0x3e, 0xb3, 0x2a, 0xf3, 0x0b, 0x10, 0x5f, 0x81,
-	0x99, 0x1e, 0x68, 0x54, 0xbb, 0xfd, 0xd5, 0xff, 0x6b, 0x7f, 0xac, 0x81, 0xe5, 0xc9, 0xe8, 0x03,
-	0x59, 0x01, 0xfc, 0xa4, 0x81, 0xab, 0x7f, 0xfc, 0x6d, 0xe8, 0xce, 0xaf, 0xbc, 0x6a, 0x21, 0x1a,
-	0xff, 0x3e, 0x54, 0xb3, 0xf3, 0xe6, 0xeb, 0xf7, 0x77, 0xfa, 0x06, 0x74, 0xf2, 0x2d, 0x3f, 0x99,
-	0xa0, 0xb3, 0xa9, 0x76, 0x80, 0xdb, 0x2d, 0x1b, 0x4d, 0x4e, 0xd0, 0x6e, 0x9d, 0xc2, 0x6f, 0x1a,
-	0x58, 0x9e, 0x39, 0x5e, 0x78, 0xff, 0x7c, 0xdd, 0x57, 0x2b, 0xd9, 0xd8, 0x3a, 0x77, 0xbc, 0xfc,
-	0x57, 0xe6, 0x56, 0xc1, 0xaa, 0x63, 0xde, 0xc9, 0x59, 0xfd, 0xa6, 0x71, 0x72, 0x66, 0xd1, 0x37,
-	0x5b, 0xa7, 0xd3, 0xa4, 0xdc, 0x61, 0x01, 0xea, 0x6a, 0xad, 0xed, 0xd7, 0x3a, 0x58, 0x1b, 0xd0,
-	0xe1, 0xdc, 0x3a, 0xb6, 0x1b, 0x33, 0x67, 0xbb, 0x9f, 0xdf, 0xae, 0x7d, 0xed, 0xc5, 0x6e, 0x19,
-	0x1f, 0xd2, 0x18, 0x25, 0xa1, 0x45, 0x59, 0x68, 0x87, 0x24, 0x29, 0x2e, 0x9b, 0xba, 0xaf, 0x69,
-	0xc4, 0xab, 0x4f, 0xfa, 0x5d, 0x25, 0xbc, 0xd7, 0x6b, 0x5d, 0xcf, 0xfb, 0xa0, 0x37, 0xbb, 0x12,
-	0xd0, 0xc3, 0xdc, 0x92, 0x62, 0x2e, 0xf5, 0x1c, 0xab, 0x4c, 0xcc, 0xbf, 0x28, 0x97, 0xbe, 0x87,
-	0x79, 0x7f, 0xec, 0xd2, 0xef, 0x39, 0x7d, 0xe5, 0xf2, 0x53, 0x5f, 0x93, 0x7a, 0xd7, 0xf5, 0x30,
-	0x77, 0xdd, 0xb1, 0x93, 0xeb, 0xf6, 0x1c, 0xd7, 0x55, 0x6e, 0x87, 0x0b, 0x45, 0x9d, 0x1b, 0xbf,
-	0x02, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xd7, 0x62, 0x6d, 0x79, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_ad_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_ad_service.pb.go
index 79e2197958..87bbc4d464 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_ad_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_ad_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_ad_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupAdService.GetAdGroupAd][google.ads.googleads.v1.services.AdGroupAdService.GetAdGroupAd].
 type GetAdGroupAdRequest struct {
@@ -42,16 +42,17 @@ func (m *GetAdGroupAdRequest) Reset()         { *m = GetAdGroupAdRequest{} }
 func (m *GetAdGroupAdRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupAdRequest) ProtoMessage()    {}
 func (*GetAdGroupAdRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_service_2ab9daac9d4494fb, []int{0}
+	return fileDescriptor_3faf2e58edc49841, []int{0}
 }
+
 func (m *GetAdGroupAdRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupAdRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupAdRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupAdRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupAdRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupAdRequest.Merge(dst, src)
+func (m *GetAdGroupAdRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupAdRequest.Merge(m, src)
 }
 func (m *GetAdGroupAdRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupAdRequest.Size(m)
@@ -92,16 +93,17 @@ func (m *MutateAdGroupAdsRequest) Reset()         { *m = MutateAdGroupAdsRequest
 func (m *MutateAdGroupAdsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupAdsRequest) ProtoMessage()    {}
 func (*MutateAdGroupAdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_service_2ab9daac9d4494fb, []int{1}
+	return fileDescriptor_3faf2e58edc49841, []int{1}
 }
+
 func (m *MutateAdGroupAdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupAdsRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupAdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupAdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupAdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupAdsRequest.Merge(dst, src)
+func (m *MutateAdGroupAdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupAdsRequest.Merge(m, src)
 }
 func (m *MutateAdGroupAdsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupAdsRequest.Size(m)
@@ -162,16 +164,17 @@ func (m *AdGroupAdOperation) Reset()         { *m = AdGroupAdOperation{} }
 func (m *AdGroupAdOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupAdOperation) ProtoMessage()    {}
 func (*AdGroupAdOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_service_2ab9daac9d4494fb, []int{2}
+	return fileDescriptor_3faf2e58edc49841, []int{2}
 }
+
 func (m *AdGroupAdOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupAdOperation.Unmarshal(m, b)
 }
 func (m *AdGroupAdOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupAdOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupAdOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupAdOperation.Merge(dst, src)
+func (m *AdGroupAdOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupAdOperation.Merge(m, src)
 }
 func (m *AdGroupAdOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupAdOperation.Size(m)
@@ -246,95 +249,15 @@ func (m *AdGroupAdOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupAdOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupAdOperation_OneofMarshaler, _AdGroupAdOperation_OneofUnmarshaler, _AdGroupAdOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupAdOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupAdOperation_Create)(nil),
 		(*AdGroupAdOperation_Update)(nil),
 		(*AdGroupAdOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupAdOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupAdOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupAdOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupAdOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *AdGroupAdOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupAdOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupAdOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupAdOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupAd)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupAdOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupAd)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupAdOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupAdOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupAdOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupAdOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupAdOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupAdOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupAdOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group ad mutate.
 type MutateAdGroupAdsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -353,16 +276,17 @@ func (m *MutateAdGroupAdsResponse) Reset()         { *m = MutateAdGroupAdsRespon
 func (m *MutateAdGroupAdsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupAdsResponse) ProtoMessage()    {}
 func (*MutateAdGroupAdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_service_2ab9daac9d4494fb, []int{3}
+	return fileDescriptor_3faf2e58edc49841, []int{3}
 }
+
 func (m *MutateAdGroupAdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupAdsResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupAdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupAdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupAdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupAdsResponse.Merge(dst, src)
+func (m *MutateAdGroupAdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupAdsResponse.Merge(m, src)
 }
 func (m *MutateAdGroupAdsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupAdsResponse.Size(m)
@@ -400,16 +324,17 @@ func (m *MutateAdGroupAdResult) Reset()         { *m = MutateAdGroupAdResult{} }
 func (m *MutateAdGroupAdResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupAdResult) ProtoMessage()    {}
 func (*MutateAdGroupAdResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_ad_service_2ab9daac9d4494fb, []int{4}
+	return fileDescriptor_3faf2e58edc49841, []int{4}
 }
+
 func (m *MutateAdGroupAdResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupAdResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupAdResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupAdResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupAdResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupAdResult.Merge(dst, src)
+func (m *MutateAdGroupAdResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupAdResult.Merge(m, src)
 }
 func (m *MutateAdGroupAdResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupAdResult.Size(m)
@@ -435,6 +360,62 @@ func init() {
 	proto.RegisterType((*MutateAdGroupAdResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupAdResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_ad_service.proto", fileDescriptor_3faf2e58edc49841)
+}
+
+var fileDescriptor_3faf2e58edc49841 = []byte{
+	// 766 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xc1, 0x6e, 0xd3, 0x4a,
+	0x14, 0x7d, 0x4e, 0xde, 0xeb, 0x7b, 0x9d, 0xf4, 0x41, 0x35, 0x55, 0x55, 0x13, 0x10, 0x44, 0xa6,
+	0x12, 0x55, 0xa8, 0x6c, 0x25, 0x2d, 0x42, 0x75, 0xe9, 0x22, 0x95, 0x68, 0xca, 0xa2, 0x34, 0xb8,
+	0x28, 0x0b, 0x14, 0xc9, 0x9a, 0xda, 0xd3, 0xc8, 0xaa, 0xed, 0x19, 0x66, 0xc6, 0x41, 0x51, 0xd5,
+	0x0d, 0x48, 0xfc, 0x00, 0x7f, 0xc0, 0x0e, 0xf6, 0x7c, 0x02, 0x1b, 0xb6, 0xec, 0x59, 0xb1, 0xe2,
+	0x1b, 0x58, 0x20, 0x7b, 0x3c, 0x26, 0x4d, 0x1b, 0x85, 0x76, 0x37, 0xbe, 0x73, 0xcf, 0xb9, 0x67,
+	0xe6, 0xdc, 0xb9, 0x06, 0x76, 0x9f, 0x90, 0x7e, 0x88, 0x2d, 0xe4, 0x73, 0x4b, 0x2e, 0xd3, 0xd5,
+	0xa0, 0x61, 0x71, 0xcc, 0x06, 0x81, 0x87, 0xb9, 0x85, 0x7c, 0xb7, 0xcf, 0x48, 0x42, 0x5d, 0xe4,
+	0xbb, 0x79, 0xd0, 0xa4, 0x8c, 0x08, 0x02, 0x6b, 0x12, 0x60, 0x22, 0x9f, 0x9b, 0x05, 0xd6, 0x1c,
+	0x34, 0x4c, 0x85, 0xad, 0xde, 0x9f, 0xc4, 0xee, 0x91, 0x28, 0x22, 0xb1, 0x45, 0x49, 0x18, 0x78,
+	0x43, 0x49, 0x57, 0x5d, 0x9b, 0x94, 0xcc, 0x30, 0x27, 0x09, 0x1b, 0xd3, 0x92, 0x83, 0x6e, 0x29,
+	0x10, 0x0d, 0x2c, 0x14, 0xc7, 0x44, 0x20, 0x11, 0x90, 0x98, 0xe7, 0xbb, 0xb9, 0x42, 0x2b, 0xfb,
+	0x3a, 0x4c, 0x8e, 0xac, 0xa3, 0x00, 0x87, 0xbe, 0x1b, 0x21, 0x7e, 0x9c, 0x67, 0xdc, 0x1e, 0xcf,
+	0x78, 0xc5, 0x10, 0xa5, 0x98, 0x29, 0x86, 0xa5, 0x7c, 0x9f, 0x51, 0xcf, 0xe2, 0x02, 0x89, 0x24,
+	0xdf, 0x30, 0x6c, 0xb0, 0xd0, 0xc6, 0xa2, 0xe5, 0xb7, 0x53, 0x3d, 0x2d, 0xdf, 0xc1, 0x2f, 0x13,
+	0xcc, 0x05, 0xbc, 0x0b, 0xfe, 0x57, 0x72, 0xdd, 0x18, 0x45, 0x58, 0xd7, 0x6a, 0xda, 0xca, 0xac,
+	0x33, 0xa7, 0x82, 0x4f, 0x51, 0x84, 0x8d, 0x6f, 0x1a, 0x58, 0xda, 0x4b, 0x04, 0x12, 0xb8, 0xc0,
+	0x73, 0x45, 0x70, 0x07, 0x54, 0xbc, 0x84, 0x0b, 0x12, 0x61, 0xe6, 0x06, 0x7e, 0x0e, 0x07, 0x2a,
+	0xf4, 0xc4, 0x87, 0xcf, 0x01, 0x20, 0x14, 0x33, 0x79, 0x4e, 0xbd, 0x54, 0x2b, 0xaf, 0x54, 0x9a,
+	0xeb, 0xe6, 0x34, 0x2b, 0xcc, 0xa2, 0xd2, 0xbe, 0x02, 0x3b, 0x23, 0x3c, 0xf0, 0x1e, 0xb8, 0x4e,
+	0x11, 0x13, 0x01, 0x0a, 0xdd, 0x23, 0x14, 0x84, 0x09, 0xc3, 0x7a, 0xb9, 0xa6, 0xad, 0xfc, 0xe7,
+	0x5c, 0xcb, 0xc3, 0x3b, 0x32, 0x9a, 0x1e, 0x70, 0x80, 0xc2, 0xc0, 0x47, 0x02, 0xbb, 0x24, 0x0e,
+	0x87, 0xfa, 0xdf, 0x59, 0xda, 0x9c, 0x0a, 0xee, 0xc7, 0xe1, 0xd0, 0x78, 0x53, 0x06, 0xf0, 0x7c,
+	0x41, 0xb8, 0x09, 0x2a, 0x09, 0xcd, 0x90, 0xa9, 0x03, 0x19, 0xb2, 0xd2, 0xac, 0x2a, 0xed, 0xca,
+	0x02, 0x73, 0x27, 0x35, 0x69, 0x0f, 0xf1, 0x63, 0x07, 0xc8, 0xf4, 0x74, 0x0d, 0x87, 0xe0, 0xa6,
+	0x6c, 0x17, 0x37, 0x2f, 0x15, 0x90, 0xd8, 0xa5, 0x88, 0xa1, 0x08, 0x0b, 0xcc, 0xf4, 0x7f, 0x32,
+	0xb2, 0x8d, 0x89, 0x17, 0x21, 0x3b, 0xce, 0xec, 0x64, 0x14, 0xdd, 0x82, 0xa1, 0xa3, 0x08, 0x9c,
+	0x1b, 0x74, 0xd2, 0x16, 0xdc, 0x01, 0x33, 0x1e, 0xc3, 0x48, 0x48, 0x37, 0x2b, 0xcd, 0xd5, 0x89,
+	0x55, 0x8a, 0x56, 0xfd, 0x7d, 0xdf, 0xbb, 0x7f, 0x39, 0x39, 0x3a, 0xe5, 0x91, 0x07, 0xd2, 0x4b,
+	0x57, 0xe3, 0x91, 0x68, 0xa8, 0x83, 0x19, 0x86, 0x23, 0x32, 0x90, 0x1e, 0xcd, 0xa6, 0x3b, 0xf2,
+	0x7b, 0xbb, 0x02, 0x66, 0x0b, 0x53, 0x8d, 0x4f, 0x1a, 0xd0, 0xcf, 0xb7, 0x19, 0xa7, 0x24, 0xe6,
+	0xa9, 0x96, 0xc5, 0x31, 0xc3, 0x5d, 0xcc, 0x18, 0x61, 0x19, 0x65, 0xa5, 0x09, 0x95, 0x34, 0x46,
+	0x3d, 0xf3, 0x20, 0x6b, 0x7c, 0x67, 0xe1, 0x6c, 0x2b, 0x3c, 0x4e, 0xd3, 0xe1, 0x33, 0xf0, 0x2f,
+	0xc3, 0x3c, 0x09, 0x85, 0xea, 0xc5, 0x87, 0xd3, 0x7b, 0x71, 0x4c, 0x94, 0x93, 0xe1, 0x1d, 0xc5,
+	0x63, 0x3c, 0x02, 0x8b, 0x17, 0x66, 0xfc, 0xd1, 0xe3, 0x6a, 0xbe, 0x2d, 0x83, 0xf9, 0x02, 0x78,
+	0x20, 0x4b, 0xc2, 0x0f, 0x1a, 0x98, 0x1b, 0x7d, 0xae, 0xf0, 0xc1, 0x74, 0x95, 0x17, 0x3c, 0xef,
+	0xea, 0xa5, 0x1c, 0x33, 0xd6, 0x5f, 0x7f, 0xfd, 0xfe, 0xae, 0x64, 0xc2, 0xd5, 0x74, 0x8a, 0x9d,
+	0x9c, 0x91, 0xbe, 0xa5, 0x5e, 0x34, 0xb7, 0xea, 0x16, 0x2a, 0xec, 0xb1, 0xea, 0xa7, 0xf0, 0xb3,
+	0x06, 0xe6, 0xc7, 0x6d, 0x83, 0x1b, 0x97, 0xbe, 0x55, 0x35, 0x51, 0xaa, 0xf6, 0x55, 0xa0, 0xb2,
+	0x4b, 0x0c, 0x3b, 0x3b, 0xc1, 0xba, 0x61, 0x65, 0x43, 0xbb, 0x90, 0x7c, 0x32, 0x32, 0xa2, 0xb6,
+	0xea, 0xa7, 0x23, 0x07, 0xb0, 0xa3, 0x8c, 0xca, 0xd6, 0xea, 0xdb, 0x3f, 0x35, 0xb0, 0xec, 0x91,
+	0x68, 0x6a, 0xf5, 0xed, 0xc5, 0x71, 0xbb, 0x3a, 0xe9, 0x24, 0xe8, 0x68, 0x2f, 0x76, 0x73, 0x68,
+	0x9f, 0x84, 0x28, 0xee, 0x9b, 0x84, 0xf5, 0xad, 0x3e, 0x8e, 0xb3, 0x39, 0xa1, 0xfe, 0x10, 0x34,
+	0xe0, 0x93, 0xff, 0x5d, 0x9b, 0x6a, 0xf1, 0xbe, 0x54, 0x6e, 0xb7, 0x5a, 0x1f, 0x4b, 0xb5, 0xb6,
+	0x24, 0x6c, 0xf9, 0xdc, 0x94, 0xcb, 0x74, 0xd5, 0x6d, 0x98, 0x79, 0x61, 0xfe, 0x45, 0xa5, 0xf4,
+	0x5a, 0x3e, 0xef, 0x15, 0x29, 0xbd, 0x6e, 0xa3, 0xa7, 0x52, 0x7e, 0x94, 0x96, 0x65, 0xdc, 0xb6,
+	0xd3, 0xf3, 0xda, 0x45, 0x92, 0x6d, 0x77, 0x1b, 0xb6, 0xad, 0xd2, 0x0e, 0x67, 0x32, 0x9d, 0x6b,
+	0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x46, 0x3a, 0xc6, 0x70, 0x62, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -543,59 +524,3 @@ var _AdGroupAdService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_ad_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_ad_service.proto", fileDescriptor_ad_group_ad_service_2ab9daac9d4494fb)
-}
-
-var fileDescriptor_ad_group_ad_service_2ab9daac9d4494fb = []byte{
-	// 766 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xc1, 0x6e, 0xd3, 0x4a,
-	0x14, 0x7d, 0x4e, 0xde, 0xeb, 0x7b, 0x9d, 0xf4, 0x41, 0x35, 0x55, 0x55, 0x13, 0x10, 0x44, 0xa6,
-	0x12, 0x55, 0xa8, 0x6c, 0x25, 0x2d, 0x42, 0x75, 0xe9, 0x22, 0x95, 0x68, 0xca, 0xa2, 0x34, 0xb8,
-	0x28, 0x0b, 0x14, 0xc9, 0x9a, 0xda, 0xd3, 0xc8, 0xaa, 0xed, 0x19, 0x66, 0xc6, 0x41, 0x51, 0xd5,
-	0x0d, 0x48, 0xfc, 0x00, 0x7f, 0xc0, 0x0e, 0xf6, 0x7c, 0x02, 0x1b, 0xb6, 0xec, 0x59, 0xb1, 0xe2,
-	0x1b, 0x58, 0x20, 0x7b, 0x3c, 0x26, 0x4d, 0x1b, 0x85, 0x76, 0x37, 0xbe, 0x73, 0xcf, 0xb9, 0x67,
-	0xe6, 0xdc, 0xb9, 0x06, 0x76, 0x9f, 0x90, 0x7e, 0x88, 0x2d, 0xe4, 0x73, 0x4b, 0x2e, 0xd3, 0xd5,
-	0xa0, 0x61, 0x71, 0xcc, 0x06, 0x81, 0x87, 0xb9, 0x85, 0x7c, 0xb7, 0xcf, 0x48, 0x42, 0x5d, 0xe4,
-	0xbb, 0x79, 0xd0, 0xa4, 0x8c, 0x08, 0x02, 0x6b, 0x12, 0x60, 0x22, 0x9f, 0x9b, 0x05, 0xd6, 0x1c,
-	0x34, 0x4c, 0x85, 0xad, 0xde, 0x9f, 0xc4, 0xee, 0x91, 0x28, 0x22, 0xb1, 0x45, 0x49, 0x18, 0x78,
-	0x43, 0x49, 0x57, 0x5d, 0x9b, 0x94, 0xcc, 0x30, 0x27, 0x09, 0x1b, 0xd3, 0x92, 0x83, 0x6e, 0x29,
-	0x10, 0x0d, 0x2c, 0x14, 0xc7, 0x44, 0x20, 0x11, 0x90, 0x98, 0xe7, 0xbb, 0xb9, 0x42, 0x2b, 0xfb,
-	0x3a, 0x4c, 0x8e, 0xac, 0xa3, 0x00, 0x87, 0xbe, 0x1b, 0x21, 0x7e, 0x9c, 0x67, 0xdc, 0x1e, 0xcf,
-	0x78, 0xc5, 0x10, 0xa5, 0x98, 0x29, 0x86, 0xa5, 0x7c, 0x9f, 0x51, 0xcf, 0xe2, 0x02, 0x89, 0x24,
-	0xdf, 0x30, 0x6c, 0xb0, 0xd0, 0xc6, 0xa2, 0xe5, 0xb7, 0x53, 0x3d, 0x2d, 0xdf, 0xc1, 0x2f, 0x13,
-	0xcc, 0x05, 0xbc, 0x0b, 0xfe, 0x57, 0x72, 0xdd, 0x18, 0x45, 0x58, 0xd7, 0x6a, 0xda, 0xca, 0xac,
-	0x33, 0xa7, 0x82, 0x4f, 0x51, 0x84, 0x8d, 0x6f, 0x1a, 0x58, 0xda, 0x4b, 0x04, 0x12, 0xb8, 0xc0,
-	0x73, 0x45, 0x70, 0x07, 0x54, 0xbc, 0x84, 0x0b, 0x12, 0x61, 0xe6, 0x06, 0x7e, 0x0e, 0x07, 0x2a,
-	0xf4, 0xc4, 0x87, 0xcf, 0x01, 0x20, 0x14, 0x33, 0x79, 0x4e, 0xbd, 0x54, 0x2b, 0xaf, 0x54, 0x9a,
-	0xeb, 0xe6, 0x34, 0x2b, 0xcc, 0xa2, 0xd2, 0xbe, 0x02, 0x3b, 0x23, 0x3c, 0xf0, 0x1e, 0xb8, 0x4e,
-	0x11, 0x13, 0x01, 0x0a, 0xdd, 0x23, 0x14, 0x84, 0x09, 0xc3, 0x7a, 0xb9, 0xa6, 0xad, 0xfc, 0xe7,
-	0x5c, 0xcb, 0xc3, 0x3b, 0x32, 0x9a, 0x1e, 0x70, 0x80, 0xc2, 0xc0, 0x47, 0x02, 0xbb, 0x24, 0x0e,
-	0x87, 0xfa, 0xdf, 0x59, 0xda, 0x9c, 0x0a, 0xee, 0xc7, 0xe1, 0xd0, 0x78, 0x53, 0x06, 0xf0, 0x7c,
-	0x41, 0xb8, 0x09, 0x2a, 0x09, 0xcd, 0x90, 0xa9, 0x03, 0x19, 0xb2, 0xd2, 0xac, 0x2a, 0xed, 0xca,
-	0x02, 0x73, 0x27, 0x35, 0x69, 0x0f, 0xf1, 0x63, 0x07, 0xc8, 0xf4, 0x74, 0x0d, 0x87, 0xe0, 0xa6,
-	0x6c, 0x17, 0x37, 0x2f, 0x15, 0x90, 0xd8, 0xa5, 0x88, 0xa1, 0x08, 0x0b, 0xcc, 0xf4, 0x7f, 0x32,
-	0xb2, 0x8d, 0x89, 0x17, 0x21, 0x3b, 0xce, 0xec, 0x64, 0x14, 0xdd, 0x82, 0xa1, 0xa3, 0x08, 0x9c,
-	0x1b, 0x74, 0xd2, 0x16, 0xdc, 0x01, 0x33, 0x1e, 0xc3, 0x48, 0x48, 0x37, 0x2b, 0xcd, 0xd5, 0x89,
-	0x55, 0x8a, 0x56, 0xfd, 0x7d, 0xdf, 0xbb, 0x7f, 0x39, 0x39, 0x3a, 0xe5, 0x91, 0x07, 0xd2, 0x4b,
-	0x57, 0xe3, 0x91, 0x68, 0xa8, 0x83, 0x19, 0x86, 0x23, 0x32, 0x90, 0x1e, 0xcd, 0xa6, 0x3b, 0xf2,
-	0x7b, 0xbb, 0x02, 0x66, 0x0b, 0x53, 0x8d, 0x4f, 0x1a, 0xd0, 0xcf, 0xb7, 0x19, 0xa7, 0x24, 0xe6,
-	0xa9, 0x96, 0xc5, 0x31, 0xc3, 0x5d, 0xcc, 0x18, 0x61, 0x19, 0x65, 0xa5, 0x09, 0x95, 0x34, 0x46,
-	0x3d, 0xf3, 0x20, 0x6b, 0x7c, 0x67, 0xe1, 0x6c, 0x2b, 0x3c, 0x4e, 0xd3, 0xe1, 0x33, 0xf0, 0x2f,
-	0xc3, 0x3c, 0x09, 0x85, 0xea, 0xc5, 0x87, 0xd3, 0x7b, 0x71, 0x4c, 0x94, 0x93, 0xe1, 0x1d, 0xc5,
-	0x63, 0x3c, 0x02, 0x8b, 0x17, 0x66, 0xfc, 0xd1, 0xe3, 0x6a, 0xbe, 0x2d, 0x83, 0xf9, 0x02, 0x78,
-	0x20, 0x4b, 0xc2, 0x0f, 0x1a, 0x98, 0x1b, 0x7d, 0xae, 0xf0, 0xc1, 0x74, 0x95, 0x17, 0x3c, 0xef,
-	0xea, 0xa5, 0x1c, 0x33, 0xd6, 0x5f, 0x7f, 0xfd, 0xfe, 0xae, 0x64, 0xc2, 0xd5, 0x74, 0x8a, 0x9d,
-	0x9c, 0x91, 0xbe, 0xa5, 0x5e, 0x34, 0xb7, 0xea, 0x16, 0x2a, 0xec, 0xb1, 0xea, 0xa7, 0xf0, 0xb3,
-	0x06, 0xe6, 0xc7, 0x6d, 0x83, 0x1b, 0x97, 0xbe, 0x55, 0x35, 0x51, 0xaa, 0xf6, 0x55, 0xa0, 0xb2,
-	0x4b, 0x0c, 0x3b, 0x3b, 0xc1, 0xba, 0x61, 0x65, 0x43, 0xbb, 0x90, 0x7c, 0x32, 0x32, 0xa2, 0xb6,
-	0xea, 0xa7, 0x23, 0x07, 0xb0, 0xa3, 0x8c, 0xca, 0xd6, 0xea, 0xdb, 0x3f, 0x35, 0xb0, 0xec, 0x91,
-	0x68, 0x6a, 0xf5, 0xed, 0xc5, 0x71, 0xbb, 0x3a, 0xe9, 0x24, 0xe8, 0x68, 0x2f, 0x76, 0x73, 0x68,
-	0x9f, 0x84, 0x28, 0xee, 0x9b, 0x84, 0xf5, 0xad, 0x3e, 0x8e, 0xb3, 0x39, 0xa1, 0xfe, 0x10, 0x34,
-	0xe0, 0x93, 0xff, 0x5d, 0x9b, 0x6a, 0xf1, 0xbe, 0x54, 0x6e, 0xb7, 0x5a, 0x1f, 0x4b, 0xb5, 0xb6,
-	0x24, 0x6c, 0xf9, 0xdc, 0x94, 0xcb, 0x74, 0xd5, 0x6d, 0x98, 0x79, 0x61, 0xfe, 0x45, 0xa5, 0xf4,
-	0x5a, 0x3e, 0xef, 0x15, 0x29, 0xbd, 0x6e, 0xa3, 0xa7, 0x52, 0x7e, 0x94, 0x96, 0x65, 0xdc, 0xb6,
-	0xd3, 0xf3, 0xda, 0x45, 0x92, 0x6d, 0x77, 0x1b, 0xb6, 0xad, 0xd2, 0x0e, 0x67, 0x32, 0x9d, 0x6b,
-	0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x46, 0x3a, 0xc6, 0x70, 0x62, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_audience_view_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_audience_view_service.pb.go
index 0938431358..e74195dcf5 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_audience_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_audience_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_audience_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupAudienceViewService.GetAdGoupAudienceView][].
 type GetAdGroupAudienceViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetAdGroupAudienceViewRequest) Reset()         { *m = GetAdGroupAudienc
 func (m *GetAdGroupAudienceViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupAudienceViewRequest) ProtoMessage()    {}
 func (*GetAdGroupAudienceViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_audience_view_service_d1fd343d6456c81d, []int{0}
+	return fileDescriptor_3d5066b0a4b723bc, []int{0}
 }
+
 func (m *GetAdGroupAudienceViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupAudienceViewRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupAudienceViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupAudienceViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupAudienceViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupAudienceViewRequest.Merge(dst, src)
+func (m *GetAdGroupAudienceViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupAudienceViewRequest.Merge(m, src)
 }
 func (m *GetAdGroupAudienceViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupAudienceViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetAdGroupAudienceViewRequest)(nil), "google.ads.googleads.v1.services.GetAdGroupAudienceViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_audience_view_service.proto", fileDescriptor_3d5066b0a4b723bc)
+}
+
+var fileDescriptor_3d5066b0a4b723bc = []byte{
+	// 377 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbd, 0x4a, 0xec, 0x40,
+	0x14, 0x26, 0xb9, 0x70, 0xe1, 0x86, 0x7b, 0x9b, 0x14, 0x17, 0x09, 0x8a, 0xcb, 0xba, 0x85, 0x6c,
+	0x31, 0x43, 0x14, 0x16, 0x19, 0x71, 0x25, 0x8b, 0x12, 0x2b, 0x59, 0x56, 0x48, 0x21, 0x81, 0x30,
+	0x66, 0x86, 0x10, 0xd8, 0x64, 0x62, 0x4e, 0x92, 0x2d, 0xc4, 0xc6, 0xc2, 0x17, 0xf0, 0x0d, 0x2c,
+	0x7d, 0x14, 0x3b, 0xf1, 0x15, 0xac, 0xac, 0x7c, 0x04, 0xc9, 0x4e, 0x26, 0x20, 0x6e, 0xdc, 0xee,
+	0x63, 0xe6, 0xfb, 0x39, 0xf3, 0x9d, 0x31, 0x4e, 0x23, 0x21, 0xa2, 0x39, 0xc7, 0x94, 0x01, 0x96,
+	0xb0, 0x46, 0x95, 0x8d, 0x81, 0xe7, 0x55, 0x1c, 0x72, 0xc0, 0x94, 0x05, 0x51, 0x2e, 0xca, 0x2c,
+	0xa0, 0x25, 0x8b, 0x79, 0x1a, 0xf2, 0xa0, 0x8a, 0xf9, 0x22, 0x68, 0xee, 0x51, 0x96, 0x8b, 0x42,
+	0x98, 0x3d, 0xa9, 0x45, 0x94, 0x01, 0x6a, 0x6d, 0x50, 0x65, 0x23, 0x65, 0x63, 0x8d, 0xbb, 0x82,
+	0x72, 0x0e, 0xa2, 0xcc, 0xbb, 0x93, 0x64, 0x82, 0xb5, 0xa9, 0xf4, 0x59, 0x8c, 0x69, 0x9a, 0x8a,
+	0x82, 0x16, 0xb1, 0x48, 0x41, 0xde, 0xf6, 0x4f, 0x8c, 0x2d, 0x97, 0x17, 0x0e, 0x73, 0x6b, 0xbd,
+	0xd3, 0xc8, 0xbd, 0x98, 0x2f, 0x66, 0xfc, 0xba, 0xe4, 0x50, 0x98, 0x3b, 0xc6, 0x3f, 0x15, 0x14,
+	0xa4, 0x34, 0xe1, 0x1b, 0x5a, 0x4f, 0xdb, 0xfd, 0x33, 0xfb, 0xab, 0x0e, 0xcf, 0x69, 0xc2, 0xf7,
+	0x3e, 0x34, 0xc3, 0x5a, 0xe1, 0x71, 0x21, 0xdf, 0x60, 0xbe, 0x68, 0xc6, 0xff, 0xd5, 0x29, 0xe6,
+	0x31, 0x5a, 0x57, 0x00, 0xfa, 0x71, 0x3e, 0x6b, 0xd4, 0x69, 0xd0, 0xf6, 0x83, 0x56, 0xc8, 0xfb,
+	0xe3, 0xbb, 0xd7, 0xb7, 0x07, 0xfd, 0xc0, 0x1c, 0xd5, 0x55, 0xde, 0x7c, 0x79, 0xe2, 0x51, 0x58,
+	0x42, 0x21, 0x12, 0x9e, 0x03, 0x1e, 0x62, 0xfa, 0x5d, 0x0b, 0x78, 0x78, 0x3b, 0xb9, 0xd7, 0x8d,
+	0x41, 0x28, 0x92, 0xb5, 0xe3, 0x4f, 0xb6, 0xbb, 0x8b, 0x99, 0xd6, 0x2b, 0x98, 0x6a, 0x97, 0x67,
+	0x8d, 0x49, 0x24, 0xe6, 0x34, 0x8d, 0x90, 0xc8, 0x23, 0x1c, 0xf1, 0x74, 0xb9, 0x20, 0xb5, 0xf2,
+	0x2c, 0x86, 0xee, 0xaf, 0x76, 0xa8, 0xc0, 0xa3, 0xfe, 0xcb, 0x75, 0x9c, 0x27, 0xbd, 0xe7, 0x4a,
+	0x43, 0x87, 0x01, 0x92, 0xb0, 0x46, 0x9e, 0x8d, 0x9a, 0x60, 0x78, 0x56, 0x14, 0xdf, 0x61, 0xe0,
+	0xb7, 0x14, 0xdf, 0xb3, 0x7d, 0x45, 0x79, 0xd7, 0x07, 0xf2, 0x9c, 0x10, 0x87, 0x01, 0x21, 0x2d,
+	0x89, 0x10, 0xcf, 0x26, 0x44, 0xd1, 0xae, 0x7e, 0x2f, 0xe7, 0xdc, 0xff, 0x0c, 0x00, 0x00, 0xff,
+	0xff, 0x44, 0x48, 0x54, 0x5f, 0x11, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _AdGroupAudienceViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_audience_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_audience_view_service.proto", fileDescriptor_ad_group_audience_view_service_d1fd343d6456c81d)
-}
-
-var fileDescriptor_ad_group_audience_view_service_d1fd343d6456c81d = []byte{
-	// 377 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbd, 0x4a, 0xec, 0x40,
-	0x14, 0x26, 0xb9, 0x70, 0xe1, 0x86, 0x7b, 0x9b, 0x14, 0x17, 0x09, 0x8a, 0xcb, 0xba, 0x85, 0x6c,
-	0x31, 0x43, 0x14, 0x16, 0x19, 0x71, 0x25, 0x8b, 0x12, 0x2b, 0x59, 0x56, 0x48, 0x21, 0x81, 0x30,
-	0x66, 0x86, 0x10, 0xd8, 0x64, 0x62, 0x4e, 0x92, 0x2d, 0xc4, 0xc6, 0xc2, 0x17, 0xf0, 0x0d, 0x2c,
-	0x7d, 0x14, 0x3b, 0xf1, 0x15, 0xac, 0xac, 0x7c, 0x04, 0xc9, 0x4e, 0x26, 0x20, 0x6e, 0xdc, 0xee,
-	0x63, 0xe6, 0xfb, 0x39, 0xf3, 0x9d, 0x31, 0x4e, 0x23, 0x21, 0xa2, 0x39, 0xc7, 0x94, 0x01, 0x96,
-	0xb0, 0x46, 0x95, 0x8d, 0x81, 0xe7, 0x55, 0x1c, 0x72, 0xc0, 0x94, 0x05, 0x51, 0x2e, 0xca, 0x2c,
-	0xa0, 0x25, 0x8b, 0x79, 0x1a, 0xf2, 0xa0, 0x8a, 0xf9, 0x22, 0x68, 0xee, 0x51, 0x96, 0x8b, 0x42,
-	0x98, 0x3d, 0xa9, 0x45, 0x94, 0x01, 0x6a, 0x6d, 0x50, 0x65, 0x23, 0x65, 0x63, 0x8d, 0xbb, 0x82,
-	0x72, 0x0e, 0xa2, 0xcc, 0xbb, 0x93, 0x64, 0x82, 0xb5, 0xa9, 0xf4, 0x59, 0x8c, 0x69, 0x9a, 0x8a,
-	0x82, 0x16, 0xb1, 0x48, 0x41, 0xde, 0xf6, 0x4f, 0x8c, 0x2d, 0x97, 0x17, 0x0e, 0x73, 0x6b, 0xbd,
-	0xd3, 0xc8, 0xbd, 0x98, 0x2f, 0x66, 0xfc, 0xba, 0xe4, 0x50, 0x98, 0x3b, 0xc6, 0x3f, 0x15, 0x14,
-	0xa4, 0x34, 0xe1, 0x1b, 0x5a, 0x4f, 0xdb, 0xfd, 0x33, 0xfb, 0xab, 0x0e, 0xcf, 0x69, 0xc2, 0xf7,
-	0x3e, 0x34, 0xc3, 0x5a, 0xe1, 0x71, 0x21, 0xdf, 0x60, 0xbe, 0x68, 0xc6, 0xff, 0xd5, 0x29, 0xe6,
-	0x31, 0x5a, 0x57, 0x00, 0xfa, 0x71, 0x3e, 0x6b, 0xd4, 0x69, 0xd0, 0xf6, 0x83, 0x56, 0xc8, 0xfb,
-	0xe3, 0xbb, 0xd7, 0xb7, 0x07, 0xfd, 0xc0, 0x1c, 0xd5, 0x55, 0xde, 0x7c, 0x79, 0xe2, 0x51, 0x58,
-	0x42, 0x21, 0x12, 0x9e, 0x03, 0x1e, 0x62, 0xfa, 0x5d, 0x0b, 0x78, 0x78, 0x3b, 0xb9, 0xd7, 0x8d,
-	0x41, 0x28, 0x92, 0xb5, 0xe3, 0x4f, 0xb6, 0xbb, 0x8b, 0x99, 0xd6, 0x2b, 0x98, 0x6a, 0x97, 0x67,
-	0x8d, 0x49, 0x24, 0xe6, 0x34, 0x8d, 0x90, 0xc8, 0x23, 0x1c, 0xf1, 0x74, 0xb9, 0x20, 0xb5, 0xf2,
-	0x2c, 0x86, 0xee, 0xaf, 0x76, 0xa8, 0xc0, 0xa3, 0xfe, 0xcb, 0x75, 0x9c, 0x27, 0xbd, 0xe7, 0x4a,
-	0x43, 0x87, 0x01, 0x92, 0xb0, 0x46, 0x9e, 0x8d, 0x9a, 0x60, 0x78, 0x56, 0x14, 0xdf, 0x61, 0xe0,
-	0xb7, 0x14, 0xdf, 0xb3, 0x7d, 0x45, 0x79, 0xd7, 0x07, 0xf2, 0x9c, 0x10, 0x87, 0x01, 0x21, 0x2d,
-	0x89, 0x10, 0xcf, 0x26, 0x44, 0xd1, 0xae, 0x7e, 0x2f, 0xe7, 0xdc, 0xff, 0x0c, 0x00, 0x00, 0xff,
-	0xff, 0x44, 0x48, 0x54, 0x5f, 0x11, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_bid_modifier_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_bid_modifier_service.pb.go
index 5032636237..2d14eaf9c3 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_bid_modifier_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_bid_modifier_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_bid_modifier_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupBidModifierService.GetAdGroupBidModifier][google.ads.googleads.v1.services.AdGroupBidModifierService.GetAdGroupBidModifier].
 type GetAdGroupBidModifierRequest struct {
@@ -41,16 +41,17 @@ func (m *GetAdGroupBidModifierRequest) Reset()         { *m = GetAdGroupBidModif
 func (m *GetAdGroupBidModifierRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupBidModifierRequest) ProtoMessage()    {}
 func (*GetAdGroupBidModifierRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_service_3a4e96624f81a14a, []int{0}
+	return fileDescriptor_66526f749bb8a530, []int{0}
 }
+
 func (m *GetAdGroupBidModifierRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupBidModifierRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupBidModifierRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupBidModifierRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupBidModifierRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupBidModifierRequest.Merge(dst, src)
+func (m *GetAdGroupBidModifierRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupBidModifierRequest.Merge(m, src)
 }
 func (m *GetAdGroupBidModifierRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupBidModifierRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateAdGroupBidModifiersRequest) Reset()         { *m = MutateAdGroupB
 func (m *MutateAdGroupBidModifiersRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupBidModifiersRequest) ProtoMessage()    {}
 func (*MutateAdGroupBidModifiersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_service_3a4e96624f81a14a, []int{1}
+	return fileDescriptor_66526f749bb8a530, []int{1}
 }
+
 func (m *MutateAdGroupBidModifiersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupBidModifiersRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupBidModifiersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupBidModifiersRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupBidModifiersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupBidModifiersRequest.Merge(dst, src)
+func (m *MutateAdGroupBidModifiersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupBidModifiersRequest.Merge(m, src)
 }
 func (m *MutateAdGroupBidModifiersRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupBidModifiersRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *AdGroupBidModifierOperation) Reset()         { *m = AdGroupBidModifierO
 func (m *AdGroupBidModifierOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupBidModifierOperation) ProtoMessage()    {}
 func (*AdGroupBidModifierOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_service_3a4e96624f81a14a, []int{2}
+	return fileDescriptor_66526f749bb8a530, []int{2}
 }
+
 func (m *AdGroupBidModifierOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupBidModifierOperation.Unmarshal(m, b)
 }
 func (m *AdGroupBidModifierOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupBidModifierOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupBidModifierOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupBidModifierOperation.Merge(dst, src)
+func (m *AdGroupBidModifierOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupBidModifierOperation.Merge(m, src)
 }
 func (m *AdGroupBidModifierOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupBidModifierOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *AdGroupBidModifierOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupBidModifierOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupBidModifierOperation_OneofMarshaler, _AdGroupBidModifierOperation_OneofUnmarshaler, _AdGroupBidModifierOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupBidModifierOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupBidModifierOperation_Create)(nil),
 		(*AdGroupBidModifierOperation_Update)(nil),
 		(*AdGroupBidModifierOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupBidModifierOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupBidModifierOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupBidModifierOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupBidModifierOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *AdGroupBidModifierOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupBidModifierOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupBidModifierOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupBidModifierOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupBidModifier)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupBidModifierOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupBidModifier)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupBidModifierOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupBidModifierOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupBidModifierOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupBidModifierOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupBidModifierOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupBidModifierOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupBidModifierOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for ad group bid modifiers mutate.
 type MutateAdGroupBidModifiersResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateAdGroupBidModifiersResponse) Reset()         { *m = MutateAdGroup
 func (m *MutateAdGroupBidModifiersResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupBidModifiersResponse) ProtoMessage()    {}
 func (*MutateAdGroupBidModifiersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_service_3a4e96624f81a14a, []int{3}
+	return fileDescriptor_66526f749bb8a530, []int{3}
 }
+
 func (m *MutateAdGroupBidModifiersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupBidModifiersResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupBidModifiersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupBidModifiersResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupBidModifiersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupBidModifiersResponse.Merge(dst, src)
+func (m *MutateAdGroupBidModifiersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupBidModifiersResponse.Merge(m, src)
 }
 func (m *MutateAdGroupBidModifiersResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupBidModifiersResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateAdGroupBidModifierResult) Reset()         { *m = MutateAdGroupBid
 func (m *MutateAdGroupBidModifierResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupBidModifierResult) ProtoMessage()    {}
 func (*MutateAdGroupBidModifierResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_bid_modifier_service_3a4e96624f81a14a, []int{4}
+	return fileDescriptor_66526f749bb8a530, []int{4}
 }
+
 func (m *MutateAdGroupBidModifierResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupBidModifierResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupBidModifierResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupBidModifierResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupBidModifierResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupBidModifierResult.Merge(dst, src)
+func (m *MutateAdGroupBidModifierResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupBidModifierResult.Merge(m, src)
 }
 func (m *MutateAdGroupBidModifierResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupBidModifierResult.Size(m)
@@ -425,6 +350,60 @@ func init() {
 	proto.RegisterType((*MutateAdGroupBidModifierResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupBidModifierResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_bid_modifier_service.proto", fileDescriptor_66526f749bb8a530)
+}
+
+var fileDescriptor_66526f749bb8a530 = []byte{
+	// 730 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcd, 0x6e, 0xd3, 0x4a,
+	0x14, 0xc7, 0xaf, 0x9d, 0xab, 0xde, 0xdb, 0x49, 0xef, 0x45, 0x1a, 0x54, 0x91, 0x86, 0xaa, 0x04,
+	0x53, 0x89, 0x2a, 0x0b, 0x5b, 0x09, 0xaa, 0x40, 0xae, 0x82, 0x48, 0x4a, 0x9b, 0xb2, 0x28, 0xad,
+	0x5c, 0xa9, 0x8b, 0x2a, 0xc8, 0x9a, 0x66, 0x26, 0x96, 0x55, 0xdb, 0x63, 0x66, 0xc6, 0x41, 0x55,
+	0xd5, 0x0d, 0x12, 0x4f, 0xc0, 0x1b, 0xc0, 0x8e, 0x17, 0x41, 0x42, 0x62, 0xc5, 0x82, 0x17, 0x60,
+	0x03, 0x2b, 0x1e, 0x01, 0xd9, 0xe3, 0x09, 0x6d, 0x53, 0x27, 0xa8, 0xdd, 0x9d, 0x9c, 0xf9, 0xe7,
+	0x77, 0x3e, 0x67, 0x0c, 0x9e, 0x7a, 0x94, 0x7a, 0x01, 0xb1, 0x10, 0xe6, 0x96, 0x34, 0x53, 0x6b,
+	0xd8, 0xb0, 0x38, 0x61, 0x43, 0xbf, 0x4f, 0xb8, 0x85, 0xb0, 0xeb, 0x31, 0x9a, 0xc4, 0xee, 0xa1,
+	0x8f, 0xdd, 0x90, 0x62, 0x7f, 0xe0, 0x13, 0xe6, 0xe6, 0xc7, 0x66, 0xcc, 0xa8, 0xa0, 0xb0, 0x26,
+	0xff, 0x6a, 0x22, 0xcc, 0xcd, 0x11, 0xc5, 0x1c, 0x36, 0x4c, 0x45, 0xa9, 0xb6, 0x8a, 0xe2, 0x30,
+	0xc2, 0x69, 0xc2, 0x0a, 0x03, 0xc9, 0x00, 0xd5, 0x45, 0xf5, 0xf7, 0xd8, 0xb7, 0x50, 0x14, 0x51,
+	0x81, 0x84, 0x4f, 0x23, 0x9e, 0x9f, 0xe6, 0xe1, 0xad, 0xec, 0xd7, 0x61, 0x32, 0xb0, 0x06, 0x3e,
+	0x09, 0xb0, 0x1b, 0x22, 0x7e, 0x94, 0x2b, 0x96, 0x2e, 0x2a, 0x5e, 0x31, 0x14, 0xc7, 0x84, 0x29,
+	0xc2, 0xad, 0xfc, 0x9c, 0xc5, 0x7d, 0x8b, 0x0b, 0x24, 0x92, 0xfc, 0xc0, 0x58, 0x07, 0x8b, 0x5d,
+	0x22, 0xda, 0xb8, 0x9b, 0x66, 0xd6, 0xf1, 0xf1, 0x76, 0x9e, 0x97, 0x43, 0x5e, 0x26, 0x84, 0x0b,
+	0x78, 0x0f, 0xfc, 0xa7, 0x2a, 0x70, 0x23, 0x14, 0x92, 0x8a, 0x56, 0xd3, 0x56, 0x66, 0x9d, 0x39,
+	0xe5, 0x7c, 0x8e, 0x42, 0x62, 0xfc, 0xd4, 0x40, 0x6d, 0x3b, 0x11, 0x48, 0x90, 0x71, 0x10, 0x57,
+	0xa4, 0x3b, 0xa0, 0xdc, 0x4f, 0xb8, 0xa0, 0x21, 0x61, 0xae, 0x8f, 0x73, 0x0e, 0x50, 0xae, 0x67,
+	0x18, 0xbe, 0x00, 0x80, 0xc6, 0x84, 0xc9, 0xca, 0x2b, 0x7a, 0xad, 0xb4, 0x52, 0x6e, 0xb6, 0xcc,
+	0x69, 0x9d, 0x37, 0xc7, 0x43, 0xee, 0x28, 0x8a, 0x73, 0x06, 0x08, 0xef, 0x83, 0x1b, 0x31, 0x62,
+	0xc2, 0x47, 0x81, 0x3b, 0x40, 0x7e, 0x90, 0x30, 0x52, 0x29, 0xd5, 0xb4, 0x95, 0x7f, 0x9d, 0xff,
+	0x73, 0xf7, 0xa6, 0xf4, 0xa6, 0x25, 0x0f, 0x51, 0xe0, 0x63, 0x24, 0x88, 0x4b, 0xa3, 0xe0, 0xb8,
+	0xf2, 0x77, 0x26, 0x9b, 0x53, 0xce, 0x9d, 0x28, 0x38, 0x36, 0xde, 0xeb, 0xe0, 0xf6, 0x84, 0xc8,
+	0x70, 0x0d, 0x94, 0x93, 0x38, 0x43, 0xa4, 0x53, 0xca, 0x10, 0xe5, 0x66, 0x55, 0x55, 0xa3, 0xc6,
+	0x64, 0x6e, 0xa6, 0x83, 0xdc, 0x46, 0xfc, 0xc8, 0x01, 0x52, 0x9e, 0xda, 0x70, 0x07, 0xcc, 0xf4,
+	0x19, 0x41, 0x42, 0x76, 0xbb, 0xdc, 0x5c, 0x2d, 0xec, 0xc2, 0x68, 0xbb, 0x2e, 0x69, 0xc3, 0xd6,
+	0x5f, 0x4e, 0x8e, 0x49, 0x81, 0x12, 0x5f, 0xd1, 0xaf, 0x09, 0x94, 0x18, 0x58, 0x01, 0x33, 0x8c,
+	0x84, 0x74, 0x28, 0x7b, 0x38, 0x9b, 0x9e, 0xc8, 0xdf, 0x9d, 0x32, 0x98, 0x1d, 0x35, 0xdd, 0xf8,
+	0xa8, 0x81, 0xbb, 0x13, 0x16, 0x83, 0xc7, 0x34, 0xe2, 0x04, 0x6e, 0x82, 0xf9, 0x0b, 0x93, 0x71,
+	0x09, 0x63, 0x94, 0x65, 0xec, 0x72, 0x13, 0xaa, 0x64, 0x59, 0xdc, 0x37, 0xf7, 0xb2, 0xe5, 0x75,
+	0x6e, 0x9e, 0x9f, 0xd9, 0x46, 0x2a, 0x87, 0x07, 0xe0, 0x1f, 0x46, 0x78, 0x12, 0x08, 0xb5, 0x3d,
+	0x4f, 0xa6, 0x6f, 0x4f, 0x51, 0x76, 0x4e, 0x06, 0x72, 0x14, 0xd0, 0xd8, 0x00, 0x4b, 0x93, 0xa5,
+	0x7f, 0x74, 0x53, 0x9a, 0x5f, 0x4b, 0x60, 0x61, 0x9c, 0xb0, 0x27, 0xb3, 0x81, 0x9f, 0x35, 0x30,
+	0x7f, 0xe9, 0x6d, 0x84, 0x8f, 0xa7, 0x57, 0x32, 0xe9, 0x1a, 0x57, 0xaf, 0x36, 0x70, 0xa3, 0xf5,
+	0xfa, 0xcb, 0xb7, 0xb7, 0xfa, 0x43, 0xb8, 0x9a, 0xbe, 0x64, 0x27, 0xe7, 0xca, 0x6b, 0xa9, 0x9b,
+	0xcb, 0xad, 0xba, 0x85, 0xc6, 0xa7, 0x6b, 0xd5, 0x4f, 0xe1, 0x77, 0x0d, 0x2c, 0x14, 0x8e, 0x1f,
+	0x76, 0xae, 0x3e, 0x1d, 0xf5, 0xa8, 0x54, 0xd7, 0xaf, 0xc5, 0x90, 0xfb, 0x67, 0xac, 0x67, 0x55,
+	0xb6, 0x8c, 0x47, 0x69, 0x95, 0xbf, 0xcb, 0x3a, 0x39, 0xf3, 0x5c, 0xb5, 0xea, 0xa7, 0x97, 0x15,
+	0x69, 0x87, 0x19, 0xdc, 0xd6, 0xea, 0x9d, 0x37, 0x3a, 0x58, 0xee, 0xd3, 0x70, 0x6a, 0x3e, 0x9d,
+	0xa5, 0xc2, 0xf9, 0xef, 0xa6, 0xaf, 0xc2, 0xae, 0x76, 0xb0, 0x95, 0x33, 0x3c, 0x1a, 0xa0, 0xc8,
+	0x33, 0x29, 0xf3, 0x2c, 0x8f, 0x44, 0xd9, 0x9b, 0xa1, 0xbe, 0x2d, 0xb1, 0xcf, 0x8b, 0x3f, 0x69,
+	0x6b, 0xca, 0x78, 0xa7, 0x97, 0xba, 0xed, 0xf6, 0x07, 0xbd, 0xd6, 0x95, 0xc0, 0x36, 0xe6, 0xa6,
+	0x34, 0x53, 0x6b, 0xbf, 0x61, 0xe6, 0x81, 0xf9, 0x27, 0x25, 0xe9, 0xb5, 0x31, 0xef, 0x8d, 0x24,
+	0xbd, 0xfd, 0x46, 0x4f, 0x49, 0x7e, 0xe8, 0xcb, 0xd2, 0x6f, 0xdb, 0x6d, 0xcc, 0x6d, 0x7b, 0x24,
+	0xb2, 0xed, 0xfd, 0x86, 0x6d, 0x2b, 0xd9, 0xe1, 0x4c, 0x96, 0xe7, 0x83, 0x5f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x79, 0xcc, 0x98, 0xaf, 0x79, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,57 +514,3 @@ var _AdGroupBidModifierService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_bid_modifier_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_bid_modifier_service.proto", fileDescriptor_ad_group_bid_modifier_service_3a4e96624f81a14a)
-}
-
-var fileDescriptor_ad_group_bid_modifier_service_3a4e96624f81a14a = []byte{
-	// 730 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcd, 0x6e, 0xd3, 0x4a,
-	0x14, 0xc7, 0xaf, 0x9d, 0xab, 0xde, 0xdb, 0x49, 0xef, 0x45, 0x1a, 0x54, 0x91, 0x86, 0xaa, 0x04,
-	0x53, 0x89, 0x2a, 0x0b, 0x5b, 0x09, 0xaa, 0x40, 0xae, 0x82, 0x48, 0x4a, 0x9b, 0xb2, 0x28, 0xad,
-	0x5c, 0xa9, 0x8b, 0x2a, 0xc8, 0x9a, 0x66, 0x26, 0x96, 0x55, 0xdb, 0x63, 0x66, 0xc6, 0x41, 0x55,
-	0xd5, 0x0d, 0x12, 0x4f, 0xc0, 0x1b, 0xc0, 0x8e, 0x17, 0x41, 0x42, 0x62, 0xc5, 0x82, 0x17, 0x60,
-	0x03, 0x2b, 0x1e, 0x01, 0xd9, 0xe3, 0x09, 0x6d, 0x53, 0x27, 0xa8, 0xdd, 0x9d, 0x9c, 0xf9, 0xe7,
-	0x77, 0x3e, 0x67, 0x0c, 0x9e, 0x7a, 0x94, 0x7a, 0x01, 0xb1, 0x10, 0xe6, 0x96, 0x34, 0x53, 0x6b,
-	0xd8, 0xb0, 0x38, 0x61, 0x43, 0xbf, 0x4f, 0xb8, 0x85, 0xb0, 0xeb, 0x31, 0x9a, 0xc4, 0xee, 0xa1,
-	0x8f, 0xdd, 0x90, 0x62, 0x7f, 0xe0, 0x13, 0xe6, 0xe6, 0xc7, 0x66, 0xcc, 0xa8, 0xa0, 0xb0, 0x26,
-	0xff, 0x6a, 0x22, 0xcc, 0xcd, 0x11, 0xc5, 0x1c, 0x36, 0x4c, 0x45, 0xa9, 0xb6, 0x8a, 0xe2, 0x30,
-	0xc2, 0x69, 0xc2, 0x0a, 0x03, 0xc9, 0x00, 0xd5, 0x45, 0xf5, 0xf7, 0xd8, 0xb7, 0x50, 0x14, 0x51,
-	0x81, 0x84, 0x4f, 0x23, 0x9e, 0x9f, 0xe6, 0xe1, 0xad, 0xec, 0xd7, 0x61, 0x32, 0xb0, 0x06, 0x3e,
-	0x09, 0xb0, 0x1b, 0x22, 0x7e, 0x94, 0x2b, 0x96, 0x2e, 0x2a, 0x5e, 0x31, 0x14, 0xc7, 0x84, 0x29,
-	0xc2, 0xad, 0xfc, 0x9c, 0xc5, 0x7d, 0x8b, 0x0b, 0x24, 0x92, 0xfc, 0xc0, 0x58, 0x07, 0x8b, 0x5d,
-	0x22, 0xda, 0xb8, 0x9b, 0x66, 0xd6, 0xf1, 0xf1, 0x76, 0x9e, 0x97, 0x43, 0x5e, 0x26, 0x84, 0x0b,
-	0x78, 0x0f, 0xfc, 0xa7, 0x2a, 0x70, 0x23, 0x14, 0x92, 0x8a, 0x56, 0xd3, 0x56, 0x66, 0x9d, 0x39,
-	0xe5, 0x7c, 0x8e, 0x42, 0x62, 0xfc, 0xd4, 0x40, 0x6d, 0x3b, 0x11, 0x48, 0x90, 0x71, 0x10, 0x57,
-	0xa4, 0x3b, 0xa0, 0xdc, 0x4f, 0xb8, 0xa0, 0x21, 0x61, 0xae, 0x8f, 0x73, 0x0e, 0x50, 0xae, 0x67,
-	0x18, 0xbe, 0x00, 0x80, 0xc6, 0x84, 0xc9, 0xca, 0x2b, 0x7a, 0xad, 0xb4, 0x52, 0x6e, 0xb6, 0xcc,
-	0x69, 0x9d, 0x37, 0xc7, 0x43, 0xee, 0x28, 0x8a, 0x73, 0x06, 0x08, 0xef, 0x83, 0x1b, 0x31, 0x62,
-	0xc2, 0x47, 0x81, 0x3b, 0x40, 0x7e, 0x90, 0x30, 0x52, 0x29, 0xd5, 0xb4, 0x95, 0x7f, 0x9d, 0xff,
-	0x73, 0xf7, 0xa6, 0xf4, 0xa6, 0x25, 0x0f, 0x51, 0xe0, 0x63, 0x24, 0x88, 0x4b, 0xa3, 0xe0, 0xb8,
-	0xf2, 0x77, 0x26, 0x9b, 0x53, 0xce, 0x9d, 0x28, 0x38, 0x36, 0xde, 0xeb, 0xe0, 0xf6, 0x84, 0xc8,
-	0x70, 0x0d, 0x94, 0x93, 0x38, 0x43, 0xa4, 0x53, 0xca, 0x10, 0xe5, 0x66, 0x55, 0x55, 0xa3, 0xc6,
-	0x64, 0x6e, 0xa6, 0x83, 0xdc, 0x46, 0xfc, 0xc8, 0x01, 0x52, 0x9e, 0xda, 0x70, 0x07, 0xcc, 0xf4,
-	0x19, 0x41, 0x42, 0x76, 0xbb, 0xdc, 0x5c, 0x2d, 0xec, 0xc2, 0x68, 0xbb, 0x2e, 0x69, 0xc3, 0xd6,
-	0x5f, 0x4e, 0x8e, 0x49, 0x81, 0x12, 0x5f, 0xd1, 0xaf, 0x09, 0x94, 0x18, 0x58, 0x01, 0x33, 0x8c,
-	0x84, 0x74, 0x28, 0x7b, 0x38, 0x9b, 0x9e, 0xc8, 0xdf, 0x9d, 0x32, 0x98, 0x1d, 0x35, 0xdd, 0xf8,
-	0xa8, 0x81, 0xbb, 0x13, 0x16, 0x83, 0xc7, 0x34, 0xe2, 0x04, 0x6e, 0x82, 0xf9, 0x0b, 0x93, 0x71,
-	0x09, 0x63, 0x94, 0x65, 0xec, 0x72, 0x13, 0xaa, 0x64, 0x59, 0xdc, 0x37, 0xf7, 0xb2, 0xe5, 0x75,
-	0x6e, 0x9e, 0x9f, 0xd9, 0x46, 0x2a, 0x87, 0x07, 0xe0, 0x1f, 0x46, 0x78, 0x12, 0x08, 0xb5, 0x3d,
-	0x4f, 0xa6, 0x6f, 0x4f, 0x51, 0x76, 0x4e, 0x06, 0x72, 0x14, 0xd0, 0xd8, 0x00, 0x4b, 0x93, 0xa5,
-	0x7f, 0x74, 0x53, 0x9a, 0x5f, 0x4b, 0x60, 0x61, 0x9c, 0xb0, 0x27, 0xb3, 0x81, 0x9f, 0x35, 0x30,
-	0x7f, 0xe9, 0x6d, 0x84, 0x8f, 0xa7, 0x57, 0x32, 0xe9, 0x1a, 0x57, 0xaf, 0x36, 0x70, 0xa3, 0xf5,
-	0xfa, 0xcb, 0xb7, 0xb7, 0xfa, 0x43, 0xb8, 0x9a, 0xbe, 0x64, 0x27, 0xe7, 0xca, 0x6b, 0xa9, 0x9b,
-	0xcb, 0xad, 0xba, 0x85, 0xc6, 0xa7, 0x6b, 0xd5, 0x4f, 0xe1, 0x77, 0x0d, 0x2c, 0x14, 0x8e, 0x1f,
-	0x76, 0xae, 0x3e, 0x1d, 0xf5, 0xa8, 0x54, 0xd7, 0xaf, 0xc5, 0x90, 0xfb, 0x67, 0xac, 0x67, 0x55,
-	0xb6, 0x8c, 0x47, 0x69, 0x95, 0xbf, 0xcb, 0x3a, 0x39, 0xf3, 0x5c, 0xb5, 0xea, 0xa7, 0x97, 0x15,
-	0x69, 0x87, 0x19, 0xdc, 0xd6, 0xea, 0x9d, 0x37, 0x3a, 0x58, 0xee, 0xd3, 0x70, 0x6a, 0x3e, 0x9d,
-	0xa5, 0xc2, 0xf9, 0xef, 0xa6, 0xaf, 0xc2, 0xae, 0x76, 0xb0, 0x95, 0x33, 0x3c, 0x1a, 0xa0, 0xc8,
-	0x33, 0x29, 0xf3, 0x2c, 0x8f, 0x44, 0xd9, 0x9b, 0xa1, 0xbe, 0x2d, 0xb1, 0xcf, 0x8b, 0x3f, 0x69,
-	0x6b, 0xca, 0x78, 0xa7, 0x97, 0xba, 0xed, 0xf6, 0x07, 0xbd, 0xd6, 0x95, 0xc0, 0x36, 0xe6, 0xa6,
-	0x34, 0x53, 0x6b, 0xbf, 0x61, 0xe6, 0x81, 0xf9, 0x27, 0x25, 0xe9, 0xb5, 0x31, 0xef, 0x8d, 0x24,
-	0xbd, 0xfd, 0x46, 0x4f, 0x49, 0x7e, 0xe8, 0xcb, 0xd2, 0x6f, 0xdb, 0x6d, 0xcc, 0x6d, 0x7b, 0x24,
-	0xb2, 0xed, 0xfd, 0x86, 0x6d, 0x2b, 0xd9, 0xe1, 0x4c, 0x96, 0xe7, 0x83, 0x5f, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x79, 0xcc, 0x98, 0xaf, 0x79, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_criterion_label_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_criterion_label_service.pb.go
index 2edbd0a646..fb4dc3fd07 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_criterion_label_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_criterion_label_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_criterion_label_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [AdGroupCriterionLabelService.GetAdGroupCriterionLabel][google.ads.googleads.v1.services.AdGroupCriterionLabelService.GetAdGroupCriterionLabel].
@@ -41,16 +41,17 @@ func (m *GetAdGroupCriterionLabelRequest) Reset()         { *m = GetAdGroupCrite
 func (m *GetAdGroupCriterionLabelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupCriterionLabelRequest) ProtoMessage()    {}
 func (*GetAdGroupCriterionLabelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_label_service_7d87b5a83f995ffa, []int{0}
+	return fileDescriptor_812d424f598fe7ab, []int{0}
 }
+
 func (m *GetAdGroupCriterionLabelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupCriterionLabelRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupCriterionLabelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupCriterionLabelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupCriterionLabelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupCriterionLabelRequest.Merge(dst, src)
+func (m *GetAdGroupCriterionLabelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupCriterionLabelRequest.Merge(m, src)
 }
 func (m *GetAdGroupCriterionLabelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupCriterionLabelRequest.Size(m)
@@ -92,16 +93,17 @@ func (m *MutateAdGroupCriterionLabelsRequest) Reset()         { *m = MutateAdGro
 func (m *MutateAdGroupCriterionLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupCriterionLabelsRequest) ProtoMessage()    {}
 func (*MutateAdGroupCriterionLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_label_service_7d87b5a83f995ffa, []int{1}
+	return fileDescriptor_812d424f598fe7ab, []int{1}
 }
+
 func (m *MutateAdGroupCriterionLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelsRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupCriterionLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupCriterionLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupCriterionLabelsRequest.Merge(dst, src)
+func (m *MutateAdGroupCriterionLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupCriterionLabelsRequest.Merge(m, src)
 }
 func (m *MutateAdGroupCriterionLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelsRequest.Size(m)
@@ -157,16 +159,17 @@ func (m *AdGroupCriterionLabelOperation) Reset()         { *m = AdGroupCriterion
 func (m *AdGroupCriterionLabelOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterionLabelOperation) ProtoMessage()    {}
 func (*AdGroupCriterionLabelOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_label_service_7d87b5a83f995ffa, []int{2}
+	return fileDescriptor_812d424f598fe7ab, []int{2}
 }
+
 func (m *AdGroupCriterionLabelOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterionLabelOperation.Unmarshal(m, b)
 }
 func (m *AdGroupCriterionLabelOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterionLabelOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterionLabelOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterionLabelOperation.Merge(dst, src)
+func (m *AdGroupCriterionLabelOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterionLabelOperation.Merge(m, src)
 }
 func (m *AdGroupCriterionLabelOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterionLabelOperation.Size(m)
@@ -214,76 +217,14 @@ func (m *AdGroupCriterionLabelOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupCriterionLabelOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupCriterionLabelOperation_OneofMarshaler, _AdGroupCriterionLabelOperation_OneofUnmarshaler, _AdGroupCriterionLabelOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupCriterionLabelOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupCriterionLabelOperation_Create)(nil),
 		(*AdGroupCriterionLabelOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupCriterionLabelOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupCriterionLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupCriterionLabelOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupCriterionLabelOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupCriterionLabelOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupCriterionLabelOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupCriterionLabelOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupCriterionLabel)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupCriterionLabelOperation_Create{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupCriterionLabelOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupCriterionLabelOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupCriterionLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupCriterionLabelOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterionLabelOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group criterion labels mutate.
 type MutateAdGroupCriterionLabelsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -302,16 +243,17 @@ func (m *MutateAdGroupCriterionLabelsResponse) Reset()         { *m = MutateAdGr
 func (m *MutateAdGroupCriterionLabelsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupCriterionLabelsResponse) ProtoMessage()    {}
 func (*MutateAdGroupCriterionLabelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_label_service_7d87b5a83f995ffa, []int{3}
+	return fileDescriptor_812d424f598fe7ab, []int{3}
 }
+
 func (m *MutateAdGroupCriterionLabelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelsResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupCriterionLabelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupCriterionLabelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupCriterionLabelsResponse.Merge(dst, src)
+func (m *MutateAdGroupCriterionLabelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupCriterionLabelsResponse.Merge(m, src)
 }
 func (m *MutateAdGroupCriterionLabelsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelsResponse.Size(m)
@@ -349,16 +291,17 @@ func (m *MutateAdGroupCriterionLabelResult) Reset()         { *m = MutateAdGroup
 func (m *MutateAdGroupCriterionLabelResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupCriterionLabelResult) ProtoMessage()    {}
 func (*MutateAdGroupCriterionLabelResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_label_service_7d87b5a83f995ffa, []int{4}
+	return fileDescriptor_812d424f598fe7ab, []int{4}
 }
+
 func (m *MutateAdGroupCriterionLabelResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupCriterionLabelResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupCriterionLabelResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupCriterionLabelResult.Merge(dst, src)
+func (m *MutateAdGroupCriterionLabelResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupCriterionLabelResult.Merge(m, src)
 }
 func (m *MutateAdGroupCriterionLabelResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupCriterionLabelResult.Size(m)
@@ -384,6 +327,57 @@ func init() {
 	proto.RegisterType((*MutateAdGroupCriterionLabelResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupCriterionLabelResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_criterion_label_service.proto", fileDescriptor_812d424f598fe7ab)
+}
+
+var fileDescriptor_812d424f598fe7ab = []byte{
+	// 677 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6b, 0xd4, 0x5e,
+	0x10, 0xff, 0x26, 0xfb, 0xa5, 0xda, 0xb7, 0x55, 0xe1, 0x89, 0x18, 0x96, 0xd2, 0x6e, 0xd3, 0x82,
+	0x65, 0x0f, 0x09, 0xbb, 0x5e, 0x4a, 0x4a, 0x61, 0xd3, 0xd2, 0xdd, 0x0a, 0x6a, 0x4b, 0x0a, 0x3d,
+	0xc8, 0x4a, 0x7c, 0x9b, 0x4c, 0x43, 0x20, 0x9b, 0x17, 0xdf, 0x7b, 0x59, 0x29, 0xa5, 0x17, 0x4f,
+	0xde, 0x3d, 0x7a, 0xf3, 0xe8, 0x9f, 0x22, 0x78, 0xf2, 0xe4, 0xdd, 0x93, 0x47, 0x41, 0xcf, 0x92,
+	0x1f, 0x6f, 0x6d, 0x65, 0x77, 0x23, 0xf6, 0x36, 0x99, 0x99, 0xfd, 0x7c, 0xe6, 0x33, 0x33, 0x6f,
+	0x16, 0xf5, 0x03, 0x4a, 0x83, 0x08, 0x4c, 0xe2, 0x73, 0xb3, 0x30, 0x33, 0x6b, 0xdc, 0x36, 0x39,
+	0xb0, 0x71, 0xe8, 0x01, 0x37, 0x89, 0xef, 0x06, 0x8c, 0xa6, 0x89, 0xeb, 0xb1, 0x50, 0x00, 0x0b,
+	0x69, 0xec, 0x46, 0x64, 0x08, 0x91, 0x5b, 0x66, 0x18, 0x09, 0xa3, 0x82, 0xe2, 0x66, 0xf1, 0x6b,
+	0x83, 0xf8, 0xdc, 0x98, 0x00, 0x19, 0xe3, 0xb6, 0x21, 0x81, 0x1a, 0xdd, 0x59, 0x54, 0x0c, 0x38,
+	0x4d, 0xd9, 0x3c, 0xae, 0x82, 0xa3, 0xb1, 0x2c, 0x11, 0x92, 0xd0, 0x24, 0x71, 0x4c, 0x05, 0x11,
+	0x21, 0x8d, 0x79, 0x19, 0x5d, 0x29, 0xa3, 0xf9, 0xd7, 0x30, 0x3d, 0x35, 0x5f, 0x31, 0x92, 0x24,
+	0xc0, 0x64, 0xfc, 0x7e, 0x19, 0x67, 0x89, 0x67, 0x72, 0x41, 0x44, 0x5a, 0x06, 0xf4, 0x1e, 0x5a,
+	0xed, 0x83, 0xb0, 0xfd, 0x7e, 0x46, 0xbd, 0x27, 0x99, 0x1f, 0x67, 0xc4, 0x0e, 0xbc, 0x4c, 0x81,
+	0x0b, 0xbc, 0x8e, 0x6e, 0xc9, 0x2a, 0xdd, 0x98, 0x8c, 0x40, 0x53, 0x9a, 0xca, 0xe6, 0xa2, 0xb3,
+	0x24, 0x9d, 0x4f, 0xc9, 0x08, 0xf4, 0x9f, 0x0a, 0x5a, 0x7f, 0x92, 0x0a, 0x22, 0x60, 0x2a, 0x16,
+	0x97, 0x60, 0xab, 0xa8, 0xee, 0xa5, 0x5c, 0xd0, 0x11, 0x30, 0x37, 0xf4, 0x4b, 0x28, 0x24, 0x5d,
+	0x8f, 0x7c, 0xfc, 0x02, 0x21, 0x9a, 0x00, 0x2b, 0xd4, 0x69, 0x6a, 0xb3, 0xb6, 0x59, 0xef, 0x74,
+	0x8d, 0xaa, 0x06, 0x1b, 0x53, 0x59, 0x0f, 0x25, 0x90, 0x73, 0x09, 0x13, 0x3f, 0x40, 0x77, 0x12,
+	0xc2, 0x44, 0x48, 0x22, 0xf7, 0x94, 0x84, 0x51, 0xca, 0x40, 0xab, 0x35, 0x95, 0xcd, 0x9b, 0xce,
+	0xed, 0xd2, 0xdd, 0x2b, 0xbc, 0x99, 0xf0, 0x31, 0x89, 0x42, 0x9f, 0x08, 0x70, 0x69, 0x1c, 0x9d,
+	0x69, 0xff, 0xe7, 0x69, 0x4b, 0xd2, 0x79, 0x18, 0x47, 0x67, 0xfa, 0x3b, 0x05, 0xad, 0xcc, 0x27,
+	0xc7, 0x0e, 0x5a, 0xf0, 0x18, 0x10, 0x51, 0x74, 0xae, 0xde, 0xd9, 0x9a, 0x29, 0x67, 0xb2, 0x0d,
+	0xd3, 0xf5, 0x1c, 0xfc, 0xe7, 0x94, 0x48, 0x58, 0x43, 0x0b, 0x0c, 0x46, 0x74, 0x0c, 0x9a, 0x9a,
+	0xb5, 0x30, 0x8b, 0x14, 0xdf, 0xbb, 0x75, 0xb4, 0x38, 0x11, 0xab, 0x7f, 0x52, 0xd0, 0xc6, 0xfc,
+	0xb1, 0xf0, 0x84, 0xc6, 0x1c, 0x70, 0x0f, 0xdd, 0xfb, 0xa3, 0x29, 0x2e, 0x30, 0x46, 0x59, 0xde,
+	0x9a, 0x7a, 0x07, 0xcb, 0x92, 0x59, 0xe2, 0x19, 0xc7, 0xf9, 0x02, 0x39, 0x77, 0xaf, 0xb6, 0x6b,
+	0x3f, 0x4b, 0xc7, 0xcf, 0xd1, 0x0d, 0x06, 0x3c, 0x8d, 0x84, 0x9c, 0xdd, 0x5e, 0xf5, 0xec, 0xe6,
+	0x14, 0xe8, 0xe4, 0x58, 0x8e, 0xc4, 0xd4, 0x0f, 0xd0, 0x5a, 0x65, 0xf6, 0x5f, 0x2d, 0x6c, 0xe7,
+	0x7b, 0x0d, 0x2d, 0x4f, 0x05, 0x39, 0x2e, 0xca, 0xc2, 0x5f, 0x14, 0xa4, 0xcd, 0x7a, 0x1a, 0xd8,
+	0xae, 0x56, 0x55, 0xf1, 0xac, 0x1a, 0xff, 0xbc, 0x05, 0x7a, 0xf7, 0xf5, 0xe7, 0xaf, 0x6f, 0x55,
+	0x0b, 0x6f, 0x65, 0x07, 0xe4, 0xfc, 0x8a, 0xd4, 0x1d, 0xf9, 0x92, 0xb8, 0xd9, 0x32, 0xc9, 0xd4,
+	0x91, 0x9b, 0xad, 0x0b, 0xfc, 0x43, 0x41, 0xcb, 0xf3, 0xd6, 0x02, 0xef, 0x5f, 0x6b, 0x6a, 0xf2,
+	0xb5, 0x37, 0x7a, 0xd7, 0x85, 0x29, 0xb6, 0x53, 0xef, 0xe5, 0x8a, 0xbb, 0xfa, 0x76, 0xa6, 0xf8,
+	0xb7, 0xc4, 0xf3, 0x4b, 0xa7, 0x64, 0xa7, 0x75, 0x31, 0x43, 0xb0, 0x35, 0xca, 0x29, 0x2c, 0xa5,
+	0xb5, 0xfb, 0x46, 0x45, 0x1b, 0x1e, 0x1d, 0x55, 0x56, 0xb5, 0xbb, 0x36, 0x6f, 0x35, 0x8e, 0xb2,
+	0xcb, 0x79, 0xa4, 0x3c, 0x3b, 0x28, 0x61, 0x02, 0x1a, 0x91, 0x38, 0x30, 0x28, 0x0b, 0xcc, 0x00,
+	0xe2, 0xfc, 0xae, 0xca, 0x23, 0x9f, 0x84, 0x7c, 0xf6, 0xdf, 0xcb, 0xb6, 0x34, 0xde, 0xab, 0xb5,
+	0xbe, 0x6d, 0x7f, 0x50, 0x9b, 0xfd, 0x02, 0xd0, 0xf6, 0xb9, 0x51, 0x98, 0x99, 0x75, 0xd2, 0x36,
+	0x4a, 0x62, 0xfe, 0x51, 0xa6, 0x0c, 0x6c, 0x9f, 0x0f, 0x26, 0x29, 0x83, 0x93, 0xf6, 0x40, 0xa6,
+	0x7c, 0x53, 0x37, 0x0a, 0xbf, 0x65, 0xd9, 0x3e, 0xb7, 0xac, 0x49, 0x92, 0x65, 0x9d, 0xb4, 0x2d,
+	0x4b, 0xa6, 0x0d, 0x17, 0xf2, 0x3a, 0x1f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x21, 0x33,
+	0x9c, 0x05, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -494,54 +488,3 @@ var _AdGroupCriterionLabelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_criterion_label_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_criterion_label_service.proto", fileDescriptor_ad_group_criterion_label_service_7d87b5a83f995ffa)
-}
-
-var fileDescriptor_ad_group_criterion_label_service_7d87b5a83f995ffa = []byte{
-	// 677 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6b, 0xd4, 0x5e,
-	0x10, 0xff, 0x26, 0xfb, 0xa5, 0xda, 0xb7, 0x55, 0xe1, 0x89, 0x18, 0x96, 0xd2, 0x6e, 0xd3, 0x82,
-	0x65, 0x0f, 0x09, 0xbb, 0x5e, 0x4a, 0x4a, 0x61, 0xd3, 0xd2, 0xdd, 0x0a, 0x6a, 0x4b, 0x0a, 0x3d,
-	0xc8, 0x4a, 0x7c, 0x9b, 0x4c, 0x43, 0x20, 0x9b, 0x17, 0xdf, 0x7b, 0x59, 0x29, 0xa5, 0x17, 0x4f,
-	0xde, 0x3d, 0x7a, 0xf3, 0xe8, 0x9f, 0x22, 0x78, 0xf2, 0xe4, 0xdd, 0x93, 0x47, 0x41, 0xcf, 0x92,
-	0x1f, 0x6f, 0x6d, 0x65, 0x77, 0x23, 0xf6, 0x36, 0x99, 0x99, 0xfd, 0x7c, 0xe6, 0x33, 0x33, 0x6f,
-	0x16, 0xf5, 0x03, 0x4a, 0x83, 0x08, 0x4c, 0xe2, 0x73, 0xb3, 0x30, 0x33, 0x6b, 0xdc, 0x36, 0x39,
-	0xb0, 0x71, 0xe8, 0x01, 0x37, 0x89, 0xef, 0x06, 0x8c, 0xa6, 0x89, 0xeb, 0xb1, 0x50, 0x00, 0x0b,
-	0x69, 0xec, 0x46, 0x64, 0x08, 0x91, 0x5b, 0x66, 0x18, 0x09, 0xa3, 0x82, 0xe2, 0x66, 0xf1, 0x6b,
-	0x83, 0xf8, 0xdc, 0x98, 0x00, 0x19, 0xe3, 0xb6, 0x21, 0x81, 0x1a, 0xdd, 0x59, 0x54, 0x0c, 0x38,
-	0x4d, 0xd9, 0x3c, 0xae, 0x82, 0xa3, 0xb1, 0x2c, 0x11, 0x92, 0xd0, 0x24, 0x71, 0x4c, 0x05, 0x11,
-	0x21, 0x8d, 0x79, 0x19, 0x5d, 0x29, 0xa3, 0xf9, 0xd7, 0x30, 0x3d, 0x35, 0x5f, 0x31, 0x92, 0x24,
-	0xc0, 0x64, 0xfc, 0x7e, 0x19, 0x67, 0x89, 0x67, 0x72, 0x41, 0x44, 0x5a, 0x06, 0xf4, 0x1e, 0x5a,
-	0xed, 0x83, 0xb0, 0xfd, 0x7e, 0x46, 0xbd, 0x27, 0x99, 0x1f, 0x67, 0xc4, 0x0e, 0xbc, 0x4c, 0x81,
-	0x0b, 0xbc, 0x8e, 0x6e, 0xc9, 0x2a, 0xdd, 0x98, 0x8c, 0x40, 0x53, 0x9a, 0xca, 0xe6, 0xa2, 0xb3,
-	0x24, 0x9d, 0x4f, 0xc9, 0x08, 0xf4, 0x9f, 0x0a, 0x5a, 0x7f, 0x92, 0x0a, 0x22, 0x60, 0x2a, 0x16,
-	0x97, 0x60, 0xab, 0xa8, 0xee, 0xa5, 0x5c, 0xd0, 0x11, 0x30, 0x37, 0xf4, 0x4b, 0x28, 0x24, 0x5d,
-	0x8f, 0x7c, 0xfc, 0x02, 0x21, 0x9a, 0x00, 0x2b, 0xd4, 0x69, 0x6a, 0xb3, 0xb6, 0x59, 0xef, 0x74,
-	0x8d, 0xaa, 0x06, 0x1b, 0x53, 0x59, 0x0f, 0x25, 0x90, 0x73, 0x09, 0x13, 0x3f, 0x40, 0x77, 0x12,
-	0xc2, 0x44, 0x48, 0x22, 0xf7, 0x94, 0x84, 0x51, 0xca, 0x40, 0xab, 0x35, 0x95, 0xcd, 0x9b, 0xce,
-	0xed, 0xd2, 0xdd, 0x2b, 0xbc, 0x99, 0xf0, 0x31, 0x89, 0x42, 0x9f, 0x08, 0x70, 0x69, 0x1c, 0x9d,
-	0x69, 0xff, 0xe7, 0x69, 0x4b, 0xd2, 0x79, 0x18, 0x47, 0x67, 0xfa, 0x3b, 0x05, 0xad, 0xcc, 0x27,
-	0xc7, 0x0e, 0x5a, 0xf0, 0x18, 0x10, 0x51, 0x74, 0xae, 0xde, 0xd9, 0x9a, 0x29, 0x67, 0xb2, 0x0d,
-	0xd3, 0xf5, 0x1c, 0xfc, 0xe7, 0x94, 0x48, 0x58, 0x43, 0x0b, 0x0c, 0x46, 0x74, 0x0c, 0x9a, 0x9a,
-	0xb5, 0x30, 0x8b, 0x14, 0xdf, 0xbb, 0x75, 0xb4, 0x38, 0x11, 0xab, 0x7f, 0x52, 0xd0, 0xc6, 0xfc,
-	0xb1, 0xf0, 0x84, 0xc6, 0x1c, 0x70, 0x0f, 0xdd, 0xfb, 0xa3, 0x29, 0x2e, 0x30, 0x46, 0x59, 0xde,
-	0x9a, 0x7a, 0x07, 0xcb, 0x92, 0x59, 0xe2, 0x19, 0xc7, 0xf9, 0x02, 0x39, 0x77, 0xaf, 0xb6, 0x6b,
-	0x3f, 0x4b, 0xc7, 0xcf, 0xd1, 0x0d, 0x06, 0x3c, 0x8d, 0x84, 0x9c, 0xdd, 0x5e, 0xf5, 0xec, 0xe6,
-	0x14, 0xe8, 0xe4, 0x58, 0x8e, 0xc4, 0xd4, 0x0f, 0xd0, 0x5a, 0x65, 0xf6, 0x5f, 0x2d, 0x6c, 0xe7,
-	0x7b, 0x0d, 0x2d, 0x4f, 0x05, 0x39, 0x2e, 0xca, 0xc2, 0x5f, 0x14, 0xa4, 0xcd, 0x7a, 0x1a, 0xd8,
-	0xae, 0x56, 0x55, 0xf1, 0xac, 0x1a, 0xff, 0xbc, 0x05, 0x7a, 0xf7, 0xf5, 0xe7, 0xaf, 0x6f, 0x55,
-	0x0b, 0x6f, 0x65, 0x07, 0xe4, 0xfc, 0x8a, 0xd4, 0x1d, 0xf9, 0x92, 0xb8, 0xd9, 0x32, 0xc9, 0xd4,
-	0x91, 0x9b, 0xad, 0x0b, 0xfc, 0x43, 0x41, 0xcb, 0xf3, 0xd6, 0x02, 0xef, 0x5f, 0x6b, 0x6a, 0xf2,
-	0xb5, 0x37, 0x7a, 0xd7, 0x85, 0x29, 0xb6, 0x53, 0xef, 0xe5, 0x8a, 0xbb, 0xfa, 0x76, 0xa6, 0xf8,
-	0xb7, 0xc4, 0xf3, 0x4b, 0xa7, 0x64, 0xa7, 0x75, 0x31, 0x43, 0xb0, 0x35, 0xca, 0x29, 0x2c, 0xa5,
-	0xb5, 0xfb, 0x46, 0x45, 0x1b, 0x1e, 0x1d, 0x55, 0x56, 0xb5, 0xbb, 0x36, 0x6f, 0x35, 0x8e, 0xb2,
-	0xcb, 0x79, 0xa4, 0x3c, 0x3b, 0x28, 0x61, 0x02, 0x1a, 0x91, 0x38, 0x30, 0x28, 0x0b, 0xcc, 0x00,
-	0xe2, 0xfc, 0xae, 0xca, 0x23, 0x9f, 0x84, 0x7c, 0xf6, 0xdf, 0xcb, 0xb6, 0x34, 0xde, 0xab, 0xb5,
-	0xbe, 0x6d, 0x7f, 0x50, 0x9b, 0xfd, 0x02, 0xd0, 0xf6, 0xb9, 0x51, 0x98, 0x99, 0x75, 0xd2, 0x36,
-	0x4a, 0x62, 0xfe, 0x51, 0xa6, 0x0c, 0x6c, 0x9f, 0x0f, 0x26, 0x29, 0x83, 0x93, 0xf6, 0x40, 0xa6,
-	0x7c, 0x53, 0x37, 0x0a, 0xbf, 0x65, 0xd9, 0x3e, 0xb7, 0xac, 0x49, 0x92, 0x65, 0x9d, 0xb4, 0x2d,
-	0x4b, 0xa6, 0x0d, 0x17, 0xf2, 0x3a, 0x1f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x21, 0x33,
-	0x9c, 0x05, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_criterion_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_criterion_service.pb.go
index 8426e6c487..a243e2bbeb 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_criterion_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_criterion_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_criterion_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupCriterionService.GetAdGroupCriterion][google.ads.googleads.v1.services.AdGroupCriterionService.GetAdGroupCriterion].
 type GetAdGroupCriterionRequest struct {
@@ -42,16 +42,17 @@ func (m *GetAdGroupCriterionRequest) Reset()         { *m = GetAdGroupCriterionR
 func (m *GetAdGroupCriterionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupCriterionRequest) ProtoMessage()    {}
 func (*GetAdGroupCriterionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_service_c15c43b9a0ae56f4, []int{0}
+	return fileDescriptor_214fd2be829a47dc, []int{0}
 }
+
 func (m *GetAdGroupCriterionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupCriterionRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupCriterionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupCriterionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupCriterionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupCriterionRequest.Merge(dst, src)
+func (m *GetAdGroupCriterionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupCriterionRequest.Merge(m, src)
 }
 func (m *GetAdGroupCriterionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupCriterionRequest.Size(m)
@@ -92,16 +93,17 @@ func (m *MutateAdGroupCriteriaRequest) Reset()         { *m = MutateAdGroupCrite
 func (m *MutateAdGroupCriteriaRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupCriteriaRequest) ProtoMessage()    {}
 func (*MutateAdGroupCriteriaRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_service_c15c43b9a0ae56f4, []int{1}
+	return fileDescriptor_214fd2be829a47dc, []int{1}
 }
+
 func (m *MutateAdGroupCriteriaRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupCriteriaRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupCriteriaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupCriteriaRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupCriteriaRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupCriteriaRequest.Merge(dst, src)
+func (m *MutateAdGroupCriteriaRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupCriteriaRequest.Merge(m, src)
 }
 func (m *MutateAdGroupCriteriaRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupCriteriaRequest.Size(m)
@@ -170,16 +172,17 @@ func (m *AdGroupCriterionOperation) Reset()         { *m = AdGroupCriterionOpera
 func (m *AdGroupCriterionOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupCriterionOperation) ProtoMessage()    {}
 func (*AdGroupCriterionOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_service_c15c43b9a0ae56f4, []int{2}
+	return fileDescriptor_214fd2be829a47dc, []int{2}
 }
+
 func (m *AdGroupCriterionOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupCriterionOperation.Unmarshal(m, b)
 }
 func (m *AdGroupCriterionOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupCriterionOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupCriterionOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupCriterionOperation.Merge(dst, src)
+func (m *AdGroupCriterionOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupCriterionOperation.Merge(m, src)
 }
 func (m *AdGroupCriterionOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupCriterionOperation.Size(m)
@@ -254,95 +257,15 @@ func (m *AdGroupCriterionOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupCriterionOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupCriterionOperation_OneofMarshaler, _AdGroupCriterionOperation_OneofUnmarshaler, _AdGroupCriterionOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupCriterionOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupCriterionOperation_Create)(nil),
 		(*AdGroupCriterionOperation_Update)(nil),
 		(*AdGroupCriterionOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupCriterionOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupCriterionOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupCriterionOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *AdGroupCriterionOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupCriterionOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupCriterionOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupCriterionOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupCriterion)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupCriterionOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupCriterion)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupCriterionOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupCriterionOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupCriterionOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupCriterionOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterionOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupCriterionOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group criterion mutate.
 type MutateAdGroupCriteriaResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -361,16 +284,17 @@ func (m *MutateAdGroupCriteriaResponse) Reset()         { *m = MutateAdGroupCrit
 func (m *MutateAdGroupCriteriaResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupCriteriaResponse) ProtoMessage()    {}
 func (*MutateAdGroupCriteriaResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_service_c15c43b9a0ae56f4, []int{3}
+	return fileDescriptor_214fd2be829a47dc, []int{3}
 }
+
 func (m *MutateAdGroupCriteriaResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupCriteriaResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupCriteriaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupCriteriaResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupCriteriaResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupCriteriaResponse.Merge(dst, src)
+func (m *MutateAdGroupCriteriaResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupCriteriaResponse.Merge(m, src)
 }
 func (m *MutateAdGroupCriteriaResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupCriteriaResponse.Size(m)
@@ -408,16 +332,17 @@ func (m *MutateAdGroupCriterionResult) Reset()         { *m = MutateAdGroupCrite
 func (m *MutateAdGroupCriterionResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupCriterionResult) ProtoMessage()    {}
 func (*MutateAdGroupCriterionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_service_c15c43b9a0ae56f4, []int{4}
+	return fileDescriptor_214fd2be829a47dc, []int{4}
 }
+
 func (m *MutateAdGroupCriterionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupCriterionResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupCriterionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupCriterionResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupCriterionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupCriterionResult.Merge(dst, src)
+func (m *MutateAdGroupCriterionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupCriterionResult.Merge(m, src)
 }
 func (m *MutateAdGroupCriterionResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupCriterionResult.Size(m)
@@ -443,6 +368,63 @@ func init() {
 	proto.RegisterType((*MutateAdGroupCriterionResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupCriterionResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_criterion_service.proto", fileDescriptor_214fd2be829a47dc)
+}
+
+var fileDescriptor_214fd2be829a47dc = []byte{
+	// 782 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x41, 0x6f, 0xd3, 0x3c,
+	0x18, 0xc7, 0xdf, 0xb4, 0x2f, 0x83, 0xb9, 0x03, 0x24, 0x4f, 0xd3, 0xba, 0xaa, 0x40, 0x15, 0x26,
+	0x31, 0x15, 0x29, 0x51, 0x3b, 0x2e, 0xcb, 0x18, 0x53, 0x36, 0xb1, 0x0e, 0xa1, 0xb1, 0x29, 0x93,
+	0x2a, 0x04, 0x95, 0x22, 0x2f, 0xf1, 0xa2, 0x68, 0x49, 0x1c, 0x6c, 0xa7, 0x50, 0x4d, 0xbb, 0xc0,
+	0x37, 0x80, 0x6f, 0xc0, 0x91, 0xaf, 0xc0, 0x09, 0x71, 0xe3, 0xca, 0x89, 0x3b, 0xa7, 0x7d, 0x0a,
+	0x94, 0x38, 0xae, 0xd6, 0xae, 0x51, 0xd1, 0xb8, 0x39, 0xf6, 0xff, 0xf9, 0xe5, 0x79, 0xf2, 0x7f,
+	0xfc, 0x04, 0x98, 0x1e, 0x21, 0x5e, 0x80, 0x75, 0xe4, 0x32, 0x5d, 0x2c, 0xd3, 0x55, 0xbf, 0xa5,
+	0x33, 0x4c, 0xfb, 0xbe, 0x83, 0x99, 0x8e, 0x5c, 0xdb, 0xa3, 0x24, 0x89, 0x6d, 0x87, 0xfa, 0x1c,
+	0x53, 0x9f, 0x44, 0x76, 0x7e, 0xa6, 0xc5, 0x94, 0x70, 0x02, 0x1b, 0x22, 0x4e, 0x43, 0x2e, 0xd3,
+	0x86, 0x08, 0xad, 0xdf, 0xd2, 0x24, 0xa2, 0xf6, 0xb0, 0xe8, 0x25, 0x0e, 0x09, 0x43, 0x12, 0xe9,
+	0x31, 0x09, 0x7c, 0x67, 0x20, 0x70, 0x35, 0xa3, 0x48, 0x4c, 0x31, 0x23, 0x09, 0x9d, 0x9c, 0x52,
+	0x1e, 0x5b, 0x97, 0xb1, 0xb1, 0xaf, 0xa3, 0x28, 0x22, 0x1c, 0x71, 0x9f, 0x44, 0x2c, 0x3f, 0xcd,
+	0x13, 0xd5, 0xb3, 0xa7, 0xa3, 0xe4, 0x58, 0x3f, 0xf6, 0x71, 0xe0, 0xda, 0x21, 0x62, 0x27, 0xb9,
+	0xe2, 0xee, 0xb8, 0xe2, 0x2d, 0x45, 0x71, 0x8c, 0xa9, 0x24, 0x2c, 0xe6, 0xe7, 0x34, 0x76, 0x74,
+	0xc6, 0x11, 0x4f, 0xf2, 0x03, 0xd5, 0x04, 0xb5, 0x0e, 0xe6, 0xa6, 0xdb, 0x49, 0xd3, 0xda, 0x96,
+	0x59, 0x59, 0xf8, 0x4d, 0x82, 0x19, 0x87, 0xf7, 0xc1, 0x4d, 0x99, 0xbc, 0x1d, 0xa1, 0x10, 0x57,
+	0x95, 0x86, 0xb2, 0x32, 0x6b, 0xcd, 0xc9, 0xcd, 0x17, 0x28, 0xc4, 0xea, 0xb9, 0x02, 0xea, 0x7b,
+	0x09, 0x47, 0x1c, 0x8f, 0x62, 0x90, 0xa4, 0xdc, 0x03, 0x15, 0x27, 0x61, 0x9c, 0x84, 0x98, 0xda,
+	0xbe, 0x9b, 0x33, 0x80, 0xdc, 0x7a, 0xe6, 0xc2, 0xd7, 0x00, 0x90, 0x18, 0x53, 0x51, 0x73, 0xb5,
+	0xd4, 0x28, 0xaf, 0x54, 0xda, 0xeb, 0xda, 0x34, 0x77, 0xb4, 0xf1, 0xac, 0xf7, 0x25, 0xc3, 0xba,
+	0x80, 0x83, 0x0f, 0xc0, 0xed, 0x18, 0x51, 0xee, 0xa3, 0xc0, 0x3e, 0x46, 0x7e, 0x90, 0x50, 0x5c,
+	0x2d, 0x37, 0x94, 0x95, 0x1b, 0xd6, 0xad, 0x7c, 0x7b, 0x47, 0xec, 0xa6, 0xc5, 0xf6, 0x51, 0xe0,
+	0xbb, 0x88, 0x63, 0x9b, 0x44, 0xc1, 0xa0, 0xfa, 0x7f, 0x26, 0x9b, 0x93, 0x9b, 0xfb, 0x51, 0x30,
+	0x50, 0x3f, 0x96, 0xc1, 0x52, 0xe1, 0x7b, 0xe1, 0x3a, 0xa8, 0x24, 0x71, 0x06, 0x48, 0xbd, 0xc9,
+	0x00, 0x95, 0x76, 0x4d, 0x56, 0x22, 0xcd, 0xd1, 0x76, 0x52, 0xfb, 0xf6, 0x10, 0x3b, 0xb1, 0x80,
+	0x90, 0xa7, 0x6b, 0xc8, 0x40, 0x1d, 0xbf, 0xc3, 0x61, 0xcc, 0x6d, 0xd1, 0x56, 0x76, 0xdf, 0x27,
+	0x41, 0xc6, 0xb5, 0x4f, 0xf0, 0x80, 0x55, 0xaf, 0x65, 0xdf, 0xa5, 0x5d, 0xf8, 0x5d, 0x44, 0x4f,
+	0x6a, 0x07, 0x59, 0x70, 0x57, 0xc6, 0x3e, 0xc7, 0x03, 0x6b, 0x49, 0x70, 0x2f, 0x9f, 0x30, 0xb8,
+	0x07, 0x66, 0x1c, 0x8a, 0x11, 0x17, 0xd6, 0x56, 0xda, 0xab, 0x85, 0xf8, 0x61, 0x17, 0x5f, 0xfa,
+	0xee, 0xbb, 0xff, 0x59, 0x39, 0x24, 0xc5, 0x89, 0x8a, 0xaa, 0xa5, 0x7f, 0xc2, 0x09, 0x08, 0xac,
+	0x82, 0x19, 0x8a, 0x43, 0xd2, 0x17, 0x96, 0xcd, 0xa6, 0x27, 0xe2, 0x79, 0xab, 0x02, 0x66, 0x87,
+	0x1e, 0xab, 0xdf, 0x14, 0x70, 0xa7, 0xa0, 0x03, 0x59, 0x4c, 0x22, 0x86, 0xe1, 0x0e, 0x58, 0x18,
+	0x6b, 0x02, 0x1b, 0x53, 0x4a, 0x68, 0xc6, 0xad, 0xb4, 0xa1, 0x4c, 0x93, 0xc6, 0x8e, 0x76, 0x98,
+	0xdd, 0x0f, 0x6b, 0x7e, 0xb4, 0x3d, 0x9e, 0xa6, 0x72, 0xf8, 0x12, 0x5c, 0xa7, 0x98, 0x25, 0x01,
+	0x97, 0x6d, 0xfa, 0x64, 0x7a, 0x9b, 0x4e, 0xca, 0x2c, 0xbd, 0x62, 0x29, 0xc6, 0x92, 0x38, 0x75,
+	0x7b, 0xf2, 0x25, 0x92, 0xc2, 0xbf, 0xba, 0x8a, 0xed, 0xaf, 0x65, 0xb0, 0x38, 0x1e, 0x7f, 0x28,
+	0xf2, 0x80, 0xdf, 0x15, 0x30, 0x3f, 0xe1, 0xaa, 0xc3, 0xc7, 0xd3, 0x2b, 0x28, 0x9e, 0x10, 0xb5,
+	0xab, 0x18, 0xac, 0xae, 0xbd, 0xff, 0xf9, 0xfb, 0x53, 0x69, 0x15, 0xb6, 0xd2, 0xe9, 0x78, 0x3a,
+	0x52, 0xd6, 0x86, 0x1c, 0x0b, 0x4c, 0x6f, 0xea, 0x68, 0xd4, 0x4d, 0xbd, 0x79, 0x06, 0x7f, 0x29,
+	0x60, 0x61, 0xa2, 0xd5, 0xf0, 0x8a, 0x4e, 0xc8, 0x29, 0x55, 0xdb, 0xbc, 0x72, 0xbc, 0xe8, 0x31,
+	0x75, 0x33, 0xab, 0x6a, 0x4d, 0x7d, 0x94, 0xfd, 0x20, 0x86, 0x65, 0x9c, 0x5e, 0x98, 0x7d, 0x1b,
+	0xcd, 0xb3, 0xf1, 0xa2, 0x8c, 0x30, 0x83, 0x1a, 0x4a, 0x73, 0xeb, 0x43, 0x09, 0x2c, 0x3b, 0x24,
+	0x9c, 0x9a, 0xc7, 0x56, 0xbd, 0xc0, 0xe3, 0x83, 0x74, 0xc0, 0x1c, 0x28, 0xaf, 0x76, 0x73, 0x82,
+	0x47, 0x02, 0x14, 0x79, 0x1a, 0xa1, 0x9e, 0xee, 0xe1, 0x28, 0x1b, 0x3f, 0xf2, 0xcf, 0x14, 0xfb,
+	0xac, 0xf8, 0xd7, 0xb9, 0x2e, 0x17, 0x9f, 0x4b, 0xe5, 0x8e, 0x69, 0x7e, 0x29, 0x35, 0x3a, 0x02,
+	0x68, 0xba, 0x4c, 0x13, 0xcb, 0x74, 0xd5, 0x6d, 0x69, 0xf9, 0x8b, 0xd9, 0x0f, 0x29, 0xe9, 0x99,
+	0x2e, 0xeb, 0x0d, 0x25, 0xbd, 0x6e, 0xab, 0x27, 0x25, 0xe7, 0xa5, 0x65, 0xb1, 0x6f, 0x18, 0xa6,
+	0xcb, 0x0c, 0x63, 0x28, 0x32, 0x8c, 0x6e, 0xcb, 0x30, 0xa4, 0xec, 0x68, 0x26, 0xcb, 0x73, 0xf5,
+	0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb3, 0xfb, 0x3f, 0xae, 0xe1, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -551,60 +533,3 @@ var _AdGroupCriterionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_criterion_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_criterion_service.proto", fileDescriptor_ad_group_criterion_service_c15c43b9a0ae56f4)
-}
-
-var fileDescriptor_ad_group_criterion_service_c15c43b9a0ae56f4 = []byte{
-	// 782 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x41, 0x6f, 0xd3, 0x3c,
-	0x18, 0xc7, 0xdf, 0xb4, 0x2f, 0x83, 0xb9, 0x03, 0x24, 0x4f, 0xd3, 0xba, 0xaa, 0x40, 0x15, 0x26,
-	0x31, 0x15, 0x29, 0x51, 0x3b, 0x2e, 0xcb, 0x18, 0x53, 0x36, 0xb1, 0x0e, 0xa1, 0xb1, 0x29, 0x93,
-	0x2a, 0x04, 0x95, 0x22, 0x2f, 0xf1, 0xa2, 0x68, 0x49, 0x1c, 0x6c, 0xa7, 0x50, 0x4d, 0xbb, 0xc0,
-	0x37, 0x80, 0x6f, 0xc0, 0x91, 0xaf, 0xc0, 0x09, 0x71, 0xe3, 0xca, 0x89, 0x3b, 0xa7, 0x7d, 0x0a,
-	0x94, 0x38, 0xae, 0xd6, 0xae, 0x51, 0xd1, 0xb8, 0x39, 0xf6, 0xff, 0xf9, 0xe5, 0x79, 0xf2, 0x7f,
-	0xfc, 0x04, 0x98, 0x1e, 0x21, 0x5e, 0x80, 0x75, 0xe4, 0x32, 0x5d, 0x2c, 0xd3, 0x55, 0xbf, 0xa5,
-	0x33, 0x4c, 0xfb, 0xbe, 0x83, 0x99, 0x8e, 0x5c, 0xdb, 0xa3, 0x24, 0x89, 0x6d, 0x87, 0xfa, 0x1c,
-	0x53, 0x9f, 0x44, 0x76, 0x7e, 0xa6, 0xc5, 0x94, 0x70, 0x02, 0x1b, 0x22, 0x4e, 0x43, 0x2e, 0xd3,
-	0x86, 0x08, 0xad, 0xdf, 0xd2, 0x24, 0xa2, 0xf6, 0xb0, 0xe8, 0x25, 0x0e, 0x09, 0x43, 0x12, 0xe9,
-	0x31, 0x09, 0x7c, 0x67, 0x20, 0x70, 0x35, 0xa3, 0x48, 0x4c, 0x31, 0x23, 0x09, 0x9d, 0x9c, 0x52,
-	0x1e, 0x5b, 0x97, 0xb1, 0xb1, 0xaf, 0xa3, 0x28, 0x22, 0x1c, 0x71, 0x9f, 0x44, 0x2c, 0x3f, 0xcd,
-	0x13, 0xd5, 0xb3, 0xa7, 0xa3, 0xe4, 0x58, 0x3f, 0xf6, 0x71, 0xe0, 0xda, 0x21, 0x62, 0x27, 0xb9,
-	0xe2, 0xee, 0xb8, 0xe2, 0x2d, 0x45, 0x71, 0x8c, 0xa9, 0x24, 0x2c, 0xe6, 0xe7, 0x34, 0x76, 0x74,
-	0xc6, 0x11, 0x4f, 0xf2, 0x03, 0xd5, 0x04, 0xb5, 0x0e, 0xe6, 0xa6, 0xdb, 0x49, 0xd3, 0xda, 0x96,
-	0x59, 0x59, 0xf8, 0x4d, 0x82, 0x19, 0x87, 0xf7, 0xc1, 0x4d, 0x99, 0xbc, 0x1d, 0xa1, 0x10, 0x57,
-	0x95, 0x86, 0xb2, 0x32, 0x6b, 0xcd, 0xc9, 0xcd, 0x17, 0x28, 0xc4, 0xea, 0xb9, 0x02, 0xea, 0x7b,
-	0x09, 0x47, 0x1c, 0x8f, 0x62, 0x90, 0xa4, 0xdc, 0x03, 0x15, 0x27, 0x61, 0x9c, 0x84, 0x98, 0xda,
-	0xbe, 0x9b, 0x33, 0x80, 0xdc, 0x7a, 0xe6, 0xc2, 0xd7, 0x00, 0x90, 0x18, 0x53, 0x51, 0x73, 0xb5,
-	0xd4, 0x28, 0xaf, 0x54, 0xda, 0xeb, 0xda, 0x34, 0x77, 0xb4, 0xf1, 0xac, 0xf7, 0x25, 0xc3, 0xba,
-	0x80, 0x83, 0x0f, 0xc0, 0xed, 0x18, 0x51, 0xee, 0xa3, 0xc0, 0x3e, 0x46, 0x7e, 0x90, 0x50, 0x5c,
-	0x2d, 0x37, 0x94, 0x95, 0x1b, 0xd6, 0xad, 0x7c, 0x7b, 0x47, 0xec, 0xa6, 0xc5, 0xf6, 0x51, 0xe0,
-	0xbb, 0x88, 0x63, 0x9b, 0x44, 0xc1, 0xa0, 0xfa, 0x7f, 0x26, 0x9b, 0x93, 0x9b, 0xfb, 0x51, 0x30,
-	0x50, 0x3f, 0x96, 0xc1, 0x52, 0xe1, 0x7b, 0xe1, 0x3a, 0xa8, 0x24, 0x71, 0x06, 0x48, 0xbd, 0xc9,
-	0x00, 0x95, 0x76, 0x4d, 0x56, 0x22, 0xcd, 0xd1, 0x76, 0x52, 0xfb, 0xf6, 0x10, 0x3b, 0xb1, 0x80,
-	0x90, 0xa7, 0x6b, 0xc8, 0x40, 0x1d, 0xbf, 0xc3, 0x61, 0xcc, 0x6d, 0xd1, 0x56, 0x76, 0xdf, 0x27,
-	0x41, 0xc6, 0xb5, 0x4f, 0xf0, 0x80, 0x55, 0xaf, 0x65, 0xdf, 0xa5, 0x5d, 0xf8, 0x5d, 0x44, 0x4f,
-	0x6a, 0x07, 0x59, 0x70, 0x57, 0xc6, 0x3e, 0xc7, 0x03, 0x6b, 0x49, 0x70, 0x2f, 0x9f, 0x30, 0xb8,
-	0x07, 0x66, 0x1c, 0x8a, 0x11, 0x17, 0xd6, 0x56, 0xda, 0xab, 0x85, 0xf8, 0x61, 0x17, 0x5f, 0xfa,
-	0xee, 0xbb, 0xff, 0x59, 0x39, 0x24, 0xc5, 0x89, 0x8a, 0xaa, 0xa5, 0x7f, 0xc2, 0x09, 0x08, 0xac,
-	0x82, 0x19, 0x8a, 0x43, 0xd2, 0x17, 0x96, 0xcd, 0xa6, 0x27, 0xe2, 0x79, 0xab, 0x02, 0x66, 0x87,
-	0x1e, 0xab, 0xdf, 0x14, 0x70, 0xa7, 0xa0, 0x03, 0x59, 0x4c, 0x22, 0x86, 0xe1, 0x0e, 0x58, 0x18,
-	0x6b, 0x02, 0x1b, 0x53, 0x4a, 0x68, 0xc6, 0xad, 0xb4, 0xa1, 0x4c, 0x93, 0xc6, 0x8e, 0x76, 0x98,
-	0xdd, 0x0f, 0x6b, 0x7e, 0xb4, 0x3d, 0x9e, 0xa6, 0x72, 0xf8, 0x12, 0x5c, 0xa7, 0x98, 0x25, 0x01,
-	0x97, 0x6d, 0xfa, 0x64, 0x7a, 0x9b, 0x4e, 0xca, 0x2c, 0xbd, 0x62, 0x29, 0xc6, 0x92, 0x38, 0x75,
-	0x7b, 0xf2, 0x25, 0x92, 0xc2, 0xbf, 0xba, 0x8a, 0xed, 0xaf, 0x65, 0xb0, 0x38, 0x1e, 0x7f, 0x28,
-	0xf2, 0x80, 0xdf, 0x15, 0x30, 0x3f, 0xe1, 0xaa, 0xc3, 0xc7, 0xd3, 0x2b, 0x28, 0x9e, 0x10, 0xb5,
-	0xab, 0x18, 0xac, 0xae, 0xbd, 0xff, 0xf9, 0xfb, 0x53, 0x69, 0x15, 0xb6, 0xd2, 0xe9, 0x78, 0x3a,
-	0x52, 0xd6, 0x86, 0x1c, 0x0b, 0x4c, 0x6f, 0xea, 0x68, 0xd4, 0x4d, 0xbd, 0x79, 0x06, 0x7f, 0x29,
-	0x60, 0x61, 0xa2, 0xd5, 0xf0, 0x8a, 0x4e, 0xc8, 0x29, 0x55, 0xdb, 0xbc, 0x72, 0xbc, 0xe8, 0x31,
-	0x75, 0x33, 0xab, 0x6a, 0x4d, 0x7d, 0x94, 0xfd, 0x20, 0x86, 0x65, 0x9c, 0x5e, 0x98, 0x7d, 0x1b,
-	0xcd, 0xb3, 0xf1, 0xa2, 0x8c, 0x30, 0x83, 0x1a, 0x4a, 0x73, 0xeb, 0x43, 0x09, 0x2c, 0x3b, 0x24,
-	0x9c, 0x9a, 0xc7, 0x56, 0xbd, 0xc0, 0xe3, 0x83, 0x74, 0xc0, 0x1c, 0x28, 0xaf, 0x76, 0x73, 0x82,
-	0x47, 0x02, 0x14, 0x79, 0x1a, 0xa1, 0x9e, 0xee, 0xe1, 0x28, 0x1b, 0x3f, 0xf2, 0xcf, 0x14, 0xfb,
-	0xac, 0xf8, 0xd7, 0xb9, 0x2e, 0x17, 0x9f, 0x4b, 0xe5, 0x8e, 0x69, 0x7e, 0x29, 0x35, 0x3a, 0x02,
-	0x68, 0xba, 0x4c, 0x13, 0xcb, 0x74, 0xd5, 0x6d, 0x69, 0xf9, 0x8b, 0xd9, 0x0f, 0x29, 0xe9, 0x99,
-	0x2e, 0xeb, 0x0d, 0x25, 0xbd, 0x6e, 0xab, 0x27, 0x25, 0xe7, 0xa5, 0x65, 0xb1, 0x6f, 0x18, 0xa6,
-	0xcb, 0x0c, 0x63, 0x28, 0x32, 0x8c, 0x6e, 0xcb, 0x30, 0xa4, 0xec, 0x68, 0x26, 0xcb, 0x73, 0xf5,
-	0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb3, 0xfb, 0x3f, 0xae, 0xe1, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_criterion_simulation_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_criterion_simulation_service.pb.go
index 42a1aaaff4..136acb1f97 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_criterion_simulation_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_criterion_simulation_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_criterion_simulation_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [AdGroupCriterionSimulationService.GetAdGroupCriterionSimulation][google.ads.googleads.v1.services.AdGroupCriterionSimulationService.GetAdGroupCriterionSimulation].
@@ -39,16 +39,17 @@ func (m *GetAdGroupCriterionSimulationRequest) Reset()         { *m = GetAdGroup
 func (m *GetAdGroupCriterionSimulationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupCriterionSimulationRequest) ProtoMessage()    {}
 func (*GetAdGroupCriterionSimulationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_criterion_simulation_service_1f923f60c32b966e, []int{0}
+	return fileDescriptor_1f03d9711149e38c, []int{0}
 }
+
 func (m *GetAdGroupCriterionSimulationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupCriterionSimulationRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupCriterionSimulationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupCriterionSimulationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupCriterionSimulationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupCriterionSimulationRequest.Merge(dst, src)
+func (m *GetAdGroupCriterionSimulationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupCriterionSimulationRequest.Merge(m, src)
 }
 func (m *GetAdGroupCriterionSimulationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupCriterionSimulationRequest.Size(m)
@@ -70,6 +71,38 @@ func init() {
 	proto.RegisterType((*GetAdGroupCriterionSimulationRequest)(nil), "google.ads.googleads.v1.services.GetAdGroupCriterionSimulationRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_criterion_simulation_service.proto", fileDescriptor_1f03d9711149e38c)
+}
+
+var fileDescriptor_1f03d9711149e38c = []byte{
+	// 373 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x4a, 0xc3, 0x40,
+	0x1c, 0xc6, 0x49, 0x04, 0xc1, 0xa0, 0x4b, 0x26, 0x29, 0x0a, 0xb5, 0x16, 0x91, 0x0e, 0x77, 0x44,
+	0xb7, 0x93, 0x22, 0xa9, 0xd4, 0x08, 0x8a, 0x94, 0x16, 0x3a, 0x48, 0x20, 0x9c, 0xc9, 0x11, 0x02,
+	0x4d, 0x2e, 0xde, 0xff, 0xd2, 0x45, 0x5c, 0xdc, 0x9d, 0xfa, 0x06, 0x8e, 0x3e, 0x8a, 0xab, 0xaf,
+	0xe0, 0x24, 0xf8, 0x0e, 0x92, 0x5c, 0x2f, 0xe0, 0x10, 0xe3, 0xf6, 0x71, 0xf7, 0xf1, 0xfb, 0xee,
+	0xff, 0xdd, 0xdf, 0xba, 0x89, 0x39, 0x8f, 0x17, 0x0c, 0xd3, 0x08, 0xb0, 0x92, 0xa5, 0x5a, 0x3a,
+	0x18, 0x98, 0x58, 0x26, 0x21, 0x03, 0x4c, 0xa3, 0x20, 0x16, 0xbc, 0xc8, 0x83, 0x50, 0x24, 0x92,
+	0x89, 0x84, 0x67, 0x01, 0x24, 0x69, 0xb1, 0xa0, 0xb2, 0x92, 0xca, 0x86, 0x72, 0xc1, 0x25, 0xb7,
+	0xbb, 0x0a, 0x81, 0x68, 0x04, 0xa8, 0xa6, 0xa1, 0xa5, 0x83, 0x34, 0xad, 0x33, 0x6e, 0xca, 0x13,
+	0x0c, 0x78, 0x21, 0x5a, 0x03, 0x55, 0x50, 0x67, 0x4f, 0x63, 0xf2, 0x04, 0xd3, 0x2c, 0xe3, 0xb2,
+	0xba, 0x04, 0x75, 0xdb, 0xbb, 0xb6, 0xfa, 0x1e, 0x93, 0x6e, 0xe4, 0x95, 0x98, 0x0b, 0x4d, 0x99,
+	0xd5, 0x90, 0x29, 0x7b, 0x28, 0x18, 0x48, 0xfb, 0xd0, 0xda, 0xd1, 0xb1, 0x41, 0x46, 0x53, 0xb6,
+	0x6b, 0x74, 0x8d, 0xe3, 0xad, 0xe9, 0xb6, 0x3e, 0xbc, 0xa5, 0x29, 0x3b, 0x59, 0x99, 0xd6, 0x41,
+	0x33, 0x6a, 0xa6, 0x06, 0xb3, 0xbf, 0x0d, 0x6b, 0xff, 0xcf, 0x4c, 0xfb, 0x12, 0xb5, 0x95, 0x83,
+	0xfe, 0xf3, 0xe8, 0xce, 0xb0, 0x91, 0x53, 0x57, 0x88, 0x9a, 0x29, 0xbd, 0xf1, 0xf3, 0xc7, 0xe7,
+	0xca, 0x3c, 0xb7, 0x87, 0x65, 0xe9, 0x8f, 0xbf, 0xc6, 0x1f, 0x86, 0x05, 0x48, 0x9e, 0x32, 0x01,
+	0x78, 0x80, 0x69, 0x23, 0x02, 0xf0, 0xe0, 0x69, 0xf4, 0x62, 0x5a, 0xfd, 0x90, 0xa7, 0xad, 0x33,
+	0x8d, 0x8e, 0x5a, 0xbb, 0x9b, 0x94, 0x7f, 0x36, 0x31, 0xee, 0xae, 0xd6, 0xac, 0x98, 0x2f, 0x68,
+	0x16, 0x23, 0x2e, 0x62, 0x1c, 0xb3, 0xac, 0xfa, 0x51, 0xbd, 0x2a, 0x79, 0x02, 0xcd, 0x9b, 0x7a,
+	0xa6, 0xc5, 0xab, 0xb9, 0xe1, 0xb9, 0xee, 0x9b, 0xd9, 0xf5, 0x14, 0xd0, 0x8d, 0x00, 0x29, 0x59,
+	0xaa, 0xb9, 0x83, 0xd6, 0xc1, 0xf0, 0xae, 0x2d, 0xbe, 0x1b, 0x81, 0x5f, 0x5b, 0xfc, 0xb9, 0xe3,
+	0x6b, 0xcb, 0x97, 0xd9, 0x57, 0xe7, 0x84, 0xb8, 0x11, 0x10, 0x52, 0x9b, 0x08, 0x99, 0x3b, 0x84,
+	0x68, 0xdb, 0xfd, 0x66, 0xf5, 0xce, 0xd3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x43, 0x68,
+	0x5b, 0x50, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,35 +176,3 @@ var _AdGroupCriterionSimulationService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_criterion_simulation_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_criterion_simulation_service.proto", fileDescriptor_ad_group_criterion_simulation_service_1f923f60c32b966e)
-}
-
-var fileDescriptor_ad_group_criterion_simulation_service_1f923f60c32b966e = []byte{
-	// 373 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x4a, 0xc3, 0x40,
-	0x1c, 0xc6, 0x49, 0x04, 0xc1, 0xa0, 0x4b, 0x26, 0x29, 0x0a, 0xb5, 0x16, 0x91, 0x0e, 0x77, 0x44,
-	0xb7, 0x93, 0x22, 0xa9, 0xd4, 0x08, 0x8a, 0x94, 0x16, 0x3a, 0x48, 0x20, 0x9c, 0xc9, 0x11, 0x02,
-	0x4d, 0x2e, 0xde, 0xff, 0xd2, 0x45, 0x5c, 0xdc, 0x9d, 0xfa, 0x06, 0x8e, 0x3e, 0x8a, 0xab, 0xaf,
-	0xe0, 0x24, 0xf8, 0x0e, 0x92, 0x5c, 0x2f, 0xe0, 0x10, 0xe3, 0xf6, 0x71, 0xf7, 0xf1, 0xfb, 0xee,
-	0xff, 0xdd, 0xdf, 0xba, 0x89, 0x39, 0x8f, 0x17, 0x0c, 0xd3, 0x08, 0xb0, 0x92, 0xa5, 0x5a, 0x3a,
-	0x18, 0x98, 0x58, 0x26, 0x21, 0x03, 0x4c, 0xa3, 0x20, 0x16, 0xbc, 0xc8, 0x83, 0x50, 0x24, 0x92,
-	0x89, 0x84, 0x67, 0x01, 0x24, 0x69, 0xb1, 0xa0, 0xb2, 0x92, 0xca, 0x86, 0x72, 0xc1, 0x25, 0xb7,
-	0xbb, 0x0a, 0x81, 0x68, 0x04, 0xa8, 0xa6, 0xa1, 0xa5, 0x83, 0x34, 0xad, 0x33, 0x6e, 0xca, 0x13,
-	0x0c, 0x78, 0x21, 0x5a, 0x03, 0x55, 0x50, 0x67, 0x4f, 0x63, 0xf2, 0x04, 0xd3, 0x2c, 0xe3, 0xb2,
-	0xba, 0x04, 0x75, 0xdb, 0xbb, 0xb6, 0xfa, 0x1e, 0x93, 0x6e, 0xe4, 0x95, 0x98, 0x0b, 0x4d, 0x99,
-	0xd5, 0x90, 0x29, 0x7b, 0x28, 0x18, 0x48, 0xfb, 0xd0, 0xda, 0xd1, 0xb1, 0x41, 0x46, 0x53, 0xb6,
-	0x6b, 0x74, 0x8d, 0xe3, 0xad, 0xe9, 0xb6, 0x3e, 0xbc, 0xa5, 0x29, 0x3b, 0x59, 0x99, 0xd6, 0x41,
-	0x33, 0x6a, 0xa6, 0x06, 0xb3, 0xbf, 0x0d, 0x6b, 0xff, 0xcf, 0x4c, 0xfb, 0x12, 0xb5, 0x95, 0x83,
-	0xfe, 0xf3, 0xe8, 0xce, 0xb0, 0x91, 0x53, 0x57, 0x88, 0x9a, 0x29, 0xbd, 0xf1, 0xf3, 0xc7, 0xe7,
-	0xca, 0x3c, 0xb7, 0x87, 0x65, 0xe9, 0x8f, 0xbf, 0xc6, 0x1f, 0x86, 0x05, 0x48, 0x9e, 0x32, 0x01,
-	0x78, 0x80, 0x69, 0x23, 0x02, 0xf0, 0xe0, 0x69, 0xf4, 0x62, 0x5a, 0xfd, 0x90, 0xa7, 0xad, 0x33,
-	0x8d, 0x8e, 0x5a, 0xbb, 0x9b, 0x94, 0x7f, 0x36, 0x31, 0xee, 0xae, 0xd6, 0xac, 0x98, 0x2f, 0x68,
-	0x16, 0x23, 0x2e, 0x62, 0x1c, 0xb3, 0xac, 0xfa, 0x51, 0xbd, 0x2a, 0x79, 0x02, 0xcd, 0x9b, 0x7a,
-	0xa6, 0xc5, 0xab, 0xb9, 0xe1, 0xb9, 0xee, 0x9b, 0xd9, 0xf5, 0x14, 0xd0, 0x8d, 0x00, 0x29, 0x59,
-	0xaa, 0xb9, 0x83, 0xd6, 0xc1, 0xf0, 0xae, 0x2d, 0xbe, 0x1b, 0x81, 0x5f, 0x5b, 0xfc, 0xb9, 0xe3,
-	0x6b, 0xcb, 0x97, 0xd9, 0x57, 0xe7, 0x84, 0xb8, 0x11, 0x10, 0x52, 0x9b, 0x08, 0x99, 0x3b, 0x84,
-	0x68, 0xdb, 0xfd, 0x66, 0xf5, 0xce, 0xd3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x43, 0x68,
-	0x5b, 0x50, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_extension_setting_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_extension_setting_service.pb.go
index 6892705d17..c18e75fb18 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_extension_setting_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_extension_setting_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_extension_setting_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [AdGroupExtensionSettingService.GetAdGroupExtensionSetting][google.ads.googleads.v1.services.AdGroupExtensionSettingService.GetAdGroupExtensionSetting].
@@ -42,16 +42,17 @@ func (m *GetAdGroupExtensionSettingRequest) Reset()         { *m = GetAdGroupExt
 func (m *GetAdGroupExtensionSettingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupExtensionSettingRequest) ProtoMessage()    {}
 func (*GetAdGroupExtensionSettingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_extension_setting_service_fd5e4f4a8f156262, []int{0}
+	return fileDescriptor_054674c18d01b7a6, []int{0}
 }
+
 func (m *GetAdGroupExtensionSettingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupExtensionSettingRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupExtensionSettingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupExtensionSettingRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupExtensionSettingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupExtensionSettingRequest.Merge(dst, src)
+func (m *GetAdGroupExtensionSettingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupExtensionSettingRequest.Merge(m, src)
 }
 func (m *GetAdGroupExtensionSettingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupExtensionSettingRequest.Size(m)
@@ -95,16 +96,17 @@ func (m *MutateAdGroupExtensionSettingsRequest) Reset()         { *m = MutateAdG
 func (m *MutateAdGroupExtensionSettingsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupExtensionSettingsRequest) ProtoMessage()    {}
 func (*MutateAdGroupExtensionSettingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_extension_setting_service_fd5e4f4a8f156262, []int{1}
+	return fileDescriptor_054674c18d01b7a6, []int{1}
 }
+
 func (m *MutateAdGroupExtensionSettingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingsRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupExtensionSettingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupExtensionSettingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupExtensionSettingsRequest.Merge(dst, src)
+func (m *MutateAdGroupExtensionSettingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupExtensionSettingsRequest.Merge(m, src)
 }
 func (m *MutateAdGroupExtensionSettingsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingsRequest.Size(m)
@@ -163,16 +165,17 @@ func (m *AdGroupExtensionSettingOperation) Reset()         { *m = AdGroupExtensi
 func (m *AdGroupExtensionSettingOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupExtensionSettingOperation) ProtoMessage()    {}
 func (*AdGroupExtensionSettingOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_extension_setting_service_fd5e4f4a8f156262, []int{2}
+	return fileDescriptor_054674c18d01b7a6, []int{2}
 }
+
 func (m *AdGroupExtensionSettingOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupExtensionSettingOperation.Unmarshal(m, b)
 }
 func (m *AdGroupExtensionSettingOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupExtensionSettingOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupExtensionSettingOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupExtensionSettingOperation.Merge(dst, src)
+func (m *AdGroupExtensionSettingOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupExtensionSettingOperation.Merge(m, src)
 }
 func (m *AdGroupExtensionSettingOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupExtensionSettingOperation.Size(m)
@@ -240,95 +243,15 @@ func (m *AdGroupExtensionSettingOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupExtensionSettingOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupExtensionSettingOperation_OneofMarshaler, _AdGroupExtensionSettingOperation_OneofUnmarshaler, _AdGroupExtensionSettingOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupExtensionSettingOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupExtensionSettingOperation_Create)(nil),
 		(*AdGroupExtensionSettingOperation_Update)(nil),
 		(*AdGroupExtensionSettingOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupExtensionSettingOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupExtensionSettingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupExtensionSettingOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupExtensionSettingOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *AdGroupExtensionSettingOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupExtensionSettingOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupExtensionSettingOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupExtensionSettingOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupExtensionSetting)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupExtensionSettingOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupExtensionSetting)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupExtensionSettingOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupExtensionSettingOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupExtensionSettingOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupExtensionSettingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupExtensionSettingOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupExtensionSettingOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupExtensionSettingOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group extension setting mutate.
 type MutateAdGroupExtensionSettingsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -349,16 +272,17 @@ func (m *MutateAdGroupExtensionSettingsResponse) Reset() {
 func (m *MutateAdGroupExtensionSettingsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupExtensionSettingsResponse) ProtoMessage()    {}
 func (*MutateAdGroupExtensionSettingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_extension_setting_service_fd5e4f4a8f156262, []int{3}
+	return fileDescriptor_054674c18d01b7a6, []int{3}
 }
+
 func (m *MutateAdGroupExtensionSettingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingsResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupExtensionSettingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupExtensionSettingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupExtensionSettingsResponse.Merge(dst, src)
+func (m *MutateAdGroupExtensionSettingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupExtensionSettingsResponse.Merge(m, src)
 }
 func (m *MutateAdGroupExtensionSettingsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingsResponse.Size(m)
@@ -396,16 +320,17 @@ func (m *MutateAdGroupExtensionSettingResult) Reset()         { *m = MutateAdGro
 func (m *MutateAdGroupExtensionSettingResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupExtensionSettingResult) ProtoMessage()    {}
 func (*MutateAdGroupExtensionSettingResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_extension_setting_service_fd5e4f4a8f156262, []int{4}
+	return fileDescriptor_054674c18d01b7a6, []int{4}
 }
+
 func (m *MutateAdGroupExtensionSettingResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupExtensionSettingResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupExtensionSettingResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupExtensionSettingResult.Merge(dst, src)
+func (m *MutateAdGroupExtensionSettingResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupExtensionSettingResult.Merge(m, src)
 }
 func (m *MutateAdGroupExtensionSettingResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupExtensionSettingResult.Size(m)
@@ -431,6 +356,60 @@ func init() {
 	proto.RegisterType((*MutateAdGroupExtensionSettingResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupExtensionSettingResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_extension_setting_service.proto", fileDescriptor_054674c18d01b7a6)
+}
+
+var fileDescriptor_054674c18d01b7a6 = []byte{
+	// 729 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xc1, 0x6b, 0xd4, 0x4e,
+	0x14, 0xc7, 0x7f, 0x49, 0x4b, 0x7f, 0x76, 0x52, 0x15, 0x46, 0xc4, 0x65, 0x91, 0xba, 0xa6, 0x55,
+	0xcb, 0x1e, 0x12, 0x76, 0xbd, 0xa5, 0xf6, 0xb0, 0x91, 0x76, 0xb7, 0x42, 0x6d, 0x49, 0xa5, 0x07,
+	0x59, 0x08, 0xd3, 0xcd, 0x34, 0x84, 0x26, 0x99, 0x38, 0x33, 0x59, 0x2d, 0xa5, 0x17, 0xf1, 0xe4,
+	0xd5, 0xff, 0xc0, 0xa3, 0x47, 0xff, 0x0c, 0x6f, 0xe2, 0x5f, 0x20, 0x78, 0xf2, 0x4f, 0x10, 0x04,
+	0x99, 0x4c, 0x66, 0x6d, 0x0b, 0xd9, 0x14, 0xd6, 0xdb, 0xdb, 0x37, 0xdf, 0xfd, 0xbc, 0xf7, 0xe6,
+	0xbd, 0x79, 0x01, 0xdb, 0x21, 0x21, 0x61, 0x8c, 0x6d, 0x14, 0x30, 0x5b, 0x9a, 0xc2, 0x1a, 0x77,
+	0x6c, 0x86, 0xe9, 0x38, 0x1a, 0x61, 0x66, 0xa3, 0xc0, 0x0f, 0x29, 0xc9, 0x33, 0x1f, 0xbf, 0xe1,
+	0x38, 0x65, 0x11, 0x49, 0x7d, 0x86, 0x39, 0x8f, 0xd2, 0xd0, 0x2f, 0x35, 0x56, 0x46, 0x09, 0x27,
+	0xb0, 0x25, 0xff, 0x6f, 0xa1, 0x80, 0x59, 0x13, 0x94, 0x35, 0xee, 0x58, 0x0a, 0xd5, 0x74, 0xab,
+	0x82, 0x51, 0xcc, 0x48, 0x4e, 0xa7, 0x47, 0x93, 0x51, 0x9a, 0x77, 0x15, 0x23, 0x8b, 0x6c, 0x94,
+	0xa6, 0x84, 0x23, 0x1e, 0x91, 0x94, 0x95, 0xa7, 0x65, 0x0e, 0x76, 0xf1, 0xeb, 0x30, 0x3f, 0xb2,
+	0x8f, 0x22, 0x1c, 0x07, 0x7e, 0x82, 0xd8, 0x71, 0xa9, 0x58, 0xbe, 0xac, 0x78, 0x4d, 0x51, 0x96,
+	0x61, 0xaa, 0x08, 0x77, 0xca, 0x73, 0x9a, 0x8d, 0x6c, 0xc6, 0x11, 0xcf, 0xcb, 0x03, 0x73, 0x00,
+	0xee, 0xf7, 0x31, 0xef, 0x05, 0x7d, 0x91, 0xde, 0xa6, 0xca, 0x6e, 0x5f, 0x26, 0xe7, 0xe1, 0x57,
+	0x39, 0x66, 0x1c, 0xae, 0x80, 0xeb, 0xaa, 0x16, 0x3f, 0x45, 0x09, 0x6e, 0x68, 0x2d, 0x6d, 0x6d,
+	0xd1, 0x5b, 0x52, 0xce, 0xe7, 0x28, 0xc1, 0xe6, 0x2f, 0x0d, 0x3c, 0xd8, 0xc9, 0x39, 0xe2, 0xb8,
+	0x82, 0xc6, 0x14, 0xee, 0x1e, 0x30, 0x46, 0x39, 0xe3, 0x24, 0xc1, 0xd4, 0x8f, 0x82, 0x12, 0x06,
+	0x94, 0x6b, 0x3b, 0x80, 0x87, 0x00, 0x90, 0x0c, 0x53, 0x79, 0x07, 0x0d, 0xbd, 0x35, 0xb7, 0x66,
+	0x74, 0x5d, 0xab, 0xae, 0x11, 0x56, 0x45, 0xdc, 0x5d, 0x85, 0xf2, 0xce, 0x51, 0xe1, 0x23, 0x70,
+	0x33, 0x43, 0x94, 0x47, 0x28, 0xf6, 0x8f, 0x50, 0x14, 0xe7, 0x14, 0x37, 0xe6, 0x5a, 0xda, 0xda,
+	0x35, 0xef, 0x46, 0xe9, 0xde, 0x92, 0x5e, 0x51, 0xfc, 0x18, 0xc5, 0x51, 0x80, 0x38, 0xf6, 0x49,
+	0x1a, 0x9f, 0x34, 0xe6, 0x0b, 0xd9, 0x92, 0x72, 0xee, 0xa6, 0xf1, 0x89, 0xf9, 0x59, 0x07, 0xad,
+	0xba, 0xf0, 0x70, 0x1d, 0x18, 0x79, 0x56, 0x70, 0x44, 0xe7, 0x0a, 0x8e, 0xd1, 0x6d, 0xaa, 0xba,
+	0x54, 0xeb, 0xac, 0x2d, 0xd1, 0xdc, 0x1d, 0xc4, 0x8e, 0x3d, 0x20, 0xe5, 0xc2, 0x86, 0x2f, 0xc0,
+	0xc2, 0x88, 0x62, 0xc4, 0xe5, 0xe5, 0x1b, 0x5d, 0xa7, 0xf2, 0x3e, 0x26, 0x63, 0x57, 0x75, 0x21,
+	0x83, 0xff, 0xbc, 0x92, 0x25, 0xa8, 0x32, 0x46, 0x43, 0xff, 0x17, 0x54, 0xc9, 0x82, 0x0d, 0xb0,
+	0x40, 0x71, 0x42, 0xc6, 0xf2, 0x4a, 0x17, 0xc5, 0x89, 0xfc, 0xed, 0x1a, 0x60, 0x71, 0xd2, 0x03,
+	0xf3, 0xab, 0x06, 0x1e, 0xd6, 0x4d, 0x0c, 0xcb, 0x48, 0xca, 0x30, 0xdc, 0x02, 0xb7, 0x2f, 0x75,
+	0xcb, 0xc7, 0x94, 0x12, 0x5a, 0x04, 0x30, 0xba, 0x50, 0xa5, 0x4d, 0xb3, 0x91, 0xb5, 0x5f, 0xcc,
+	0xb7, 0x77, 0xeb, 0x62, 0x1f, 0x37, 0x85, 0x1c, 0xfa, 0xe0, 0x7f, 0x8a, 0x59, 0x1e, 0x73, 0x35,
+	0x56, 0x9b, 0xf5, 0x63, 0x35, 0x35, 0x45, 0xaf, 0xa0, 0x79, 0x8a, 0x6a, 0x3e, 0x03, 0x2b, 0x57,
+	0xd0, 0x5f, 0xe9, 0x45, 0x75, 0xdf, 0xcd, 0x83, 0xe5, 0x0a, 0xcc, 0xbe, 0x4c, 0x0e, 0x7e, 0xd7,
+	0x40, 0xb3, 0xfa, 0xfd, 0xc2, 0xa7, 0xf5, 0xd5, 0xd5, 0xbe, 0xfe, 0xe6, 0x0c, 0x33, 0x61, 0xba,
+	0x6f, 0xbf, 0xfd, 0xf8, 0xa0, 0x3f, 0x81, 0x8e, 0xd8, 0x87, 0xa7, 0x17, 0x4a, 0xde, 0x50, 0x0f,
+	0x9e, 0xd9, 0x6d, 0x1b, 0x55, 0x0c, 0x80, 0xdd, 0x3e, 0x83, 0xbf, 0x35, 0xb0, 0x3c, 0x7d, 0x4c,
+	0x60, 0x7f, 0xc6, 0x2e, 0xaa, 0xd5, 0xd4, 0x1c, 0xcc, 0x0e, 0x92, 0x13, 0x6b, 0x0e, 0x8a, 0xca,
+	0x5d, 0x73, 0x43, 0x54, 0xfe, 0xb7, 0xd4, 0xd3, 0x73, 0x9b, 0x6f, 0xa3, 0x7d, 0x56, 0x59, 0xb8,
+	0x93, 0x14, 0x61, 0x1c, 0xad, 0xed, 0xbe, 0xd7, 0xc1, 0xea, 0x88, 0x24, 0xb5, 0x99, 0xb9, 0x2b,
+	0xd3, 0x87, 0x65, 0x4f, 0x2c, 0x98, 0x3d, 0xed, 0xe5, 0xa0, 0x04, 0x85, 0x24, 0x46, 0x69, 0x68,
+	0x11, 0x1a, 0xda, 0x21, 0x4e, 0x8b, 0xf5, 0xa3, 0xbe, 0x5f, 0x59, 0xc4, 0xaa, 0xbf, 0x9d, 0xeb,
+	0xca, 0xf8, 0xa8, 0xcf, 0xf5, 0x7b, 0xbd, 0x4f, 0x7a, 0xab, 0x2f, 0x81, 0xbd, 0x80, 0x59, 0xd2,
+	0x14, 0xd6, 0x41, 0xc7, 0x2a, 0x03, 0xb3, 0x2f, 0x4a, 0x32, 0xec, 0x05, 0x6c, 0x38, 0x91, 0x0c,
+	0x0f, 0x3a, 0x43, 0x25, 0xf9, 0xa9, 0xaf, 0x4a, 0xbf, 0xe3, 0xf4, 0x02, 0xe6, 0x38, 0x13, 0x91,
+	0xe3, 0x1c, 0x74, 0x1c, 0x47, 0xc9, 0x0e, 0x17, 0x8a, 0x3c, 0x1f, 0xff, 0x09, 0x00, 0x00, 0xff,
+	0xff, 0xbb, 0x5c, 0x83, 0x6c, 0xe2, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -541,57 +520,3 @@ var _AdGroupExtensionSettingService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_extension_setting_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_extension_setting_service.proto", fileDescriptor_ad_group_extension_setting_service_fd5e4f4a8f156262)
-}
-
-var fileDescriptor_ad_group_extension_setting_service_fd5e4f4a8f156262 = []byte{
-	// 729 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xc1, 0x6b, 0xd4, 0x4e,
-	0x14, 0xc7, 0x7f, 0x49, 0x4b, 0x7f, 0x76, 0x52, 0x15, 0x46, 0xc4, 0x65, 0x91, 0xba, 0xa6, 0x55,
-	0xcb, 0x1e, 0x12, 0x76, 0xbd, 0xa5, 0xf6, 0xb0, 0x91, 0x76, 0xb7, 0x42, 0x6d, 0x49, 0xa5, 0x07,
-	0x59, 0x08, 0xd3, 0xcd, 0x34, 0x84, 0x26, 0x99, 0x38, 0x33, 0x59, 0x2d, 0xa5, 0x17, 0xf1, 0xe4,
-	0xd5, 0xff, 0xc0, 0xa3, 0x47, 0xff, 0x0c, 0x6f, 0xe2, 0x5f, 0x20, 0x78, 0xf2, 0x4f, 0x10, 0x04,
-	0x99, 0x4c, 0x66, 0x6d, 0x0b, 0xd9, 0x14, 0xd6, 0xdb, 0xdb, 0x37, 0xdf, 0xfd, 0xbc, 0xf7, 0xe6,
-	0xbd, 0x79, 0x01, 0xdb, 0x21, 0x21, 0x61, 0x8c, 0x6d, 0x14, 0x30, 0x5b, 0x9a, 0xc2, 0x1a, 0x77,
-	0x6c, 0x86, 0xe9, 0x38, 0x1a, 0x61, 0x66, 0xa3, 0xc0, 0x0f, 0x29, 0xc9, 0x33, 0x1f, 0xbf, 0xe1,
-	0x38, 0x65, 0x11, 0x49, 0x7d, 0x86, 0x39, 0x8f, 0xd2, 0xd0, 0x2f, 0x35, 0x56, 0x46, 0x09, 0x27,
-	0xb0, 0x25, 0xff, 0x6f, 0xa1, 0x80, 0x59, 0x13, 0x94, 0x35, 0xee, 0x58, 0x0a, 0xd5, 0x74, 0xab,
-	0x82, 0x51, 0xcc, 0x48, 0x4e, 0xa7, 0x47, 0x93, 0x51, 0x9a, 0x77, 0x15, 0x23, 0x8b, 0x6c, 0x94,
-	0xa6, 0x84, 0x23, 0x1e, 0x91, 0x94, 0x95, 0xa7, 0x65, 0x0e, 0x76, 0xf1, 0xeb, 0x30, 0x3f, 0xb2,
-	0x8f, 0x22, 0x1c, 0x07, 0x7e, 0x82, 0xd8, 0x71, 0xa9, 0x58, 0xbe, 0xac, 0x78, 0x4d, 0x51, 0x96,
-	0x61, 0xaa, 0x08, 0x77, 0xca, 0x73, 0x9a, 0x8d, 0x6c, 0xc6, 0x11, 0xcf, 0xcb, 0x03, 0x73, 0x00,
-	0xee, 0xf7, 0x31, 0xef, 0x05, 0x7d, 0x91, 0xde, 0xa6, 0xca, 0x6e, 0x5f, 0x26, 0xe7, 0xe1, 0x57,
-	0x39, 0x66, 0x1c, 0xae, 0x80, 0xeb, 0xaa, 0x16, 0x3f, 0x45, 0x09, 0x6e, 0x68, 0x2d, 0x6d, 0x6d,
-	0xd1, 0x5b, 0x52, 0xce, 0xe7, 0x28, 0xc1, 0xe6, 0x2f, 0x0d, 0x3c, 0xd8, 0xc9, 0x39, 0xe2, 0xb8,
-	0x82, 0xc6, 0x14, 0xee, 0x1e, 0x30, 0x46, 0x39, 0xe3, 0x24, 0xc1, 0xd4, 0x8f, 0x82, 0x12, 0x06,
-	0x94, 0x6b, 0x3b, 0x80, 0x87, 0x00, 0x90, 0x0c, 0x53, 0x79, 0x07, 0x0d, 0xbd, 0x35, 0xb7, 0x66,
-	0x74, 0x5d, 0xab, 0xae, 0x11, 0x56, 0x45, 0xdc, 0x5d, 0x85, 0xf2, 0xce, 0x51, 0xe1, 0x23, 0x70,
-	0x33, 0x43, 0x94, 0x47, 0x28, 0xf6, 0x8f, 0x50, 0x14, 0xe7, 0x14, 0x37, 0xe6, 0x5a, 0xda, 0xda,
-	0x35, 0xef, 0x46, 0xe9, 0xde, 0x92, 0x5e, 0x51, 0xfc, 0x18, 0xc5, 0x51, 0x80, 0x38, 0xf6, 0x49,
-	0x1a, 0x9f, 0x34, 0xe6, 0x0b, 0xd9, 0x92, 0x72, 0xee, 0xa6, 0xf1, 0x89, 0xf9, 0x59, 0x07, 0xad,
-	0xba, 0xf0, 0x70, 0x1d, 0x18, 0x79, 0x56, 0x70, 0x44, 0xe7, 0x0a, 0x8e, 0xd1, 0x6d, 0xaa, 0xba,
-	0x54, 0xeb, 0xac, 0x2d, 0xd1, 0xdc, 0x1d, 0xc4, 0x8e, 0x3d, 0x20, 0xe5, 0xc2, 0x86, 0x2f, 0xc0,
-	0xc2, 0x88, 0x62, 0xc4, 0xe5, 0xe5, 0x1b, 0x5d, 0xa7, 0xf2, 0x3e, 0x26, 0x63, 0x57, 0x75, 0x21,
-	0x83, 0xff, 0xbc, 0x92, 0x25, 0xa8, 0x32, 0x46, 0x43, 0xff, 0x17, 0x54, 0xc9, 0x82, 0x0d, 0xb0,
-	0x40, 0x71, 0x42, 0xc6, 0xf2, 0x4a, 0x17, 0xc5, 0x89, 0xfc, 0xed, 0x1a, 0x60, 0x71, 0xd2, 0x03,
-	0xf3, 0xab, 0x06, 0x1e, 0xd6, 0x4d, 0x0c, 0xcb, 0x48, 0xca, 0x30, 0xdc, 0x02, 0xb7, 0x2f, 0x75,
-	0xcb, 0xc7, 0x94, 0x12, 0x5a, 0x04, 0x30, 0xba, 0x50, 0xa5, 0x4d, 0xb3, 0x91, 0xb5, 0x5f, 0xcc,
-	0xb7, 0x77, 0xeb, 0x62, 0x1f, 0x37, 0x85, 0x1c, 0xfa, 0xe0, 0x7f, 0x8a, 0x59, 0x1e, 0x73, 0x35,
-	0x56, 0x9b, 0xf5, 0x63, 0x35, 0x35, 0x45, 0xaf, 0xa0, 0x79, 0x8a, 0x6a, 0x3e, 0x03, 0x2b, 0x57,
-	0xd0, 0x5f, 0xe9, 0x45, 0x75, 0xdf, 0xcd, 0x83, 0xe5, 0x0a, 0xcc, 0xbe, 0x4c, 0x0e, 0x7e, 0xd7,
-	0x40, 0xb3, 0xfa, 0xfd, 0xc2, 0xa7, 0xf5, 0xd5, 0xd5, 0xbe, 0xfe, 0xe6, 0x0c, 0x33, 0x61, 0xba,
-	0x6f, 0xbf, 0xfd, 0xf8, 0xa0, 0x3f, 0x81, 0x8e, 0xd8, 0x87, 0xa7, 0x17, 0x4a, 0xde, 0x50, 0x0f,
-	0x9e, 0xd9, 0x6d, 0x1b, 0x55, 0x0c, 0x80, 0xdd, 0x3e, 0x83, 0xbf, 0x35, 0xb0, 0x3c, 0x7d, 0x4c,
-	0x60, 0x7f, 0xc6, 0x2e, 0xaa, 0xd5, 0xd4, 0x1c, 0xcc, 0x0e, 0x92, 0x13, 0x6b, 0x0e, 0x8a, 0xca,
-	0x5d, 0x73, 0x43, 0x54, 0xfe, 0xb7, 0xd4, 0xd3, 0x73, 0x9b, 0x6f, 0xa3, 0x7d, 0x56, 0x59, 0xb8,
-	0x93, 0x14, 0x61, 0x1c, 0xad, 0xed, 0xbe, 0xd7, 0xc1, 0xea, 0x88, 0x24, 0xb5, 0x99, 0xb9, 0x2b,
-	0xd3, 0x87, 0x65, 0x4f, 0x2c, 0x98, 0x3d, 0xed, 0xe5, 0xa0, 0x04, 0x85, 0x24, 0x46, 0x69, 0x68,
-	0x11, 0x1a, 0xda, 0x21, 0x4e, 0x8b, 0xf5, 0xa3, 0xbe, 0x5f, 0x59, 0xc4, 0xaa, 0xbf, 0x9d, 0xeb,
-	0xca, 0xf8, 0xa8, 0xcf, 0xf5, 0x7b, 0xbd, 0x4f, 0x7a, 0xab, 0x2f, 0x81, 0xbd, 0x80, 0x59, 0xd2,
-	0x14, 0xd6, 0x41, 0xc7, 0x2a, 0x03, 0xb3, 0x2f, 0x4a, 0x32, 0xec, 0x05, 0x6c, 0x38, 0x91, 0x0c,
-	0x0f, 0x3a, 0x43, 0x25, 0xf9, 0xa9, 0xaf, 0x4a, 0xbf, 0xe3, 0xf4, 0x02, 0xe6, 0x38, 0x13, 0x91,
-	0xe3, 0x1c, 0x74, 0x1c, 0x47, 0xc9, 0x0e, 0x17, 0x8a, 0x3c, 0x1f, 0xff, 0x09, 0x00, 0x00, 0xff,
-	0xff, 0xbb, 0x5c, 0x83, 0x6c, 0xe2, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_feed_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_feed_service.pb.go
index 9f9895708b..42bc523517 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_feed_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_feed_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_feed_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupFeedService.GetAdGroupFeed][google.ads.googleads.v1.services.AdGroupFeedService.GetAdGroupFeed].
 type GetAdGroupFeedRequest struct {
@@ -41,16 +41,17 @@ func (m *GetAdGroupFeedRequest) Reset()         { *m = GetAdGroupFeedRequest{} }
 func (m *GetAdGroupFeedRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupFeedRequest) ProtoMessage()    {}
 func (*GetAdGroupFeedRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_service_c2934f1f20022fd1, []int{0}
+	return fileDescriptor_83f37f6e6fd89895, []int{0}
 }
+
 func (m *GetAdGroupFeedRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupFeedRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupFeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupFeedRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupFeedRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupFeedRequest.Merge(dst, src)
+func (m *GetAdGroupFeedRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupFeedRequest.Merge(m, src)
 }
 func (m *GetAdGroupFeedRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupFeedRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateAdGroupFeedsRequest) Reset()         { *m = MutateAdGroupFeedsReq
 func (m *MutateAdGroupFeedsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupFeedsRequest) ProtoMessage()    {}
 func (*MutateAdGroupFeedsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_service_c2934f1f20022fd1, []int{1}
+	return fileDescriptor_83f37f6e6fd89895, []int{1}
 }
+
 func (m *MutateAdGroupFeedsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupFeedsRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupFeedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupFeedsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupFeedsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupFeedsRequest.Merge(dst, src)
+func (m *MutateAdGroupFeedsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupFeedsRequest.Merge(m, src)
 }
 func (m *MutateAdGroupFeedsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupFeedsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *AdGroupFeedOperation) Reset()         { *m = AdGroupFeedOperation{} }
 func (m *AdGroupFeedOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupFeedOperation) ProtoMessage()    {}
 func (*AdGroupFeedOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_service_c2934f1f20022fd1, []int{2}
+	return fileDescriptor_83f37f6e6fd89895, []int{2}
 }
+
 func (m *AdGroupFeedOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupFeedOperation.Unmarshal(m, b)
 }
 func (m *AdGroupFeedOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupFeedOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupFeedOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupFeedOperation.Merge(dst, src)
+func (m *AdGroupFeedOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupFeedOperation.Merge(m, src)
 }
 func (m *AdGroupFeedOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupFeedOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *AdGroupFeedOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupFeedOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupFeedOperation_OneofMarshaler, _AdGroupFeedOperation_OneofUnmarshaler, _AdGroupFeedOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupFeedOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupFeedOperation_Create)(nil),
 		(*AdGroupFeedOperation_Update)(nil),
 		(*AdGroupFeedOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupFeedOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupFeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupFeedOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupFeedOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *AdGroupFeedOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupFeedOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupFeedOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupFeedOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupFeed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupFeedOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupFeed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupFeedOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupFeedOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupFeedOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupFeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupFeedOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupFeedOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupFeedOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group feed mutate.
 type MutateAdGroupFeedsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateAdGroupFeedsResponse) Reset()         { *m = MutateAdGroupFeedsRe
 func (m *MutateAdGroupFeedsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupFeedsResponse) ProtoMessage()    {}
 func (*MutateAdGroupFeedsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_service_c2934f1f20022fd1, []int{3}
+	return fileDescriptor_83f37f6e6fd89895, []int{3}
 }
+
 func (m *MutateAdGroupFeedsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupFeedsResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupFeedsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupFeedsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupFeedsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupFeedsResponse.Merge(dst, src)
+func (m *MutateAdGroupFeedsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupFeedsResponse.Merge(m, src)
 }
 func (m *MutateAdGroupFeedsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupFeedsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateAdGroupFeedResult) Reset()         { *m = MutateAdGroupFeedResult
 func (m *MutateAdGroupFeedResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupFeedResult) ProtoMessage()    {}
 func (*MutateAdGroupFeedResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_feed_service_c2934f1f20022fd1, []int{4}
+	return fileDescriptor_83f37f6e6fd89895, []int{4}
 }
+
 func (m *MutateAdGroupFeedResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupFeedResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupFeedResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupFeedResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupFeedResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupFeedResult.Merge(dst, src)
+func (m *MutateAdGroupFeedResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupFeedResult.Merge(m, src)
 }
 func (m *MutateAdGroupFeedResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupFeedResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateAdGroupFeedResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupFeedResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_feed_service.proto", fileDescriptor_83f37f6e6fd89895)
+}
+
+var fileDescriptor_83f37f6e6fd89895 = []byte{
+	// 715 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x6e, 0xd3, 0x4a,
+	0x14, 0xbe, 0x76, 0xae, 0x7a, 0x6f, 0xc7, 0xbd, 0xbd, 0xd2, 0x40, 0xd5, 0x10, 0x21, 0x88, 0x4c,
+	0x25, 0xaa, 0x2c, 0xc6, 0x24, 0x88, 0x22, 0xdc, 0x14, 0x29, 0x95, 0x48, 0xca, 0xa2, 0xb4, 0x72,
+	0xa5, 0x2c, 0x50, 0x24, 0x6b, 0x1a, 0x4f, 0x2c, 0xab, 0xb6, 0xc7, 0xcc, 0x8c, 0x83, 0xaa, 0xaa,
+	0x1b, 0x1e, 0x80, 0x0d, 0x1b, 0xd6, 0x2c, 0xd9, 0xb1, 0xe4, 0x15, 0x90, 0x58, 0xf1, 0x06, 0x88,
+	0x15, 0x0f, 0x81, 0x90, 0x3d, 0x9e, 0xe0, 0x34, 0x8d, 0x02, 0xdd, 0x9d, 0x9c, 0xf9, 0xbe, 0xef,
+	0xfc, 0x3b, 0xa0, 0xed, 0x53, 0xea, 0x87, 0xc4, 0xc2, 0x1e, 0xb7, 0xa4, 0x99, 0x59, 0xe3, 0xa6,
+	0xc5, 0x09, 0x1b, 0x07, 0x43, 0xc2, 0x2d, 0xec, 0xb9, 0x3e, 0xa3, 0x69, 0xe2, 0x8e, 0x08, 0xf1,
+	0xdc, 0xc2, 0x8d, 0x12, 0x46, 0x05, 0x85, 0x75, 0x49, 0x41, 0xd8, 0xe3, 0x68, 0xc2, 0x46, 0xe3,
+	0x26, 0x52, 0xec, 0xda, 0x83, 0x79, 0xfa, 0x8c, 0x70, 0x9a, 0xb2, 0x99, 0x00, 0x52, 0xb8, 0x76,
+	0x53, 0xd1, 0x92, 0xc0, 0xc2, 0x71, 0x4c, 0x05, 0x16, 0x01, 0x8d, 0x79, 0xf1, 0x5a, 0x84, 0xb5,
+	0xf2, 0x5f, 0xc7, 0xe9, 0xc8, 0x1a, 0x05, 0x24, 0xf4, 0xdc, 0x08, 0xf3, 0x93, 0x02, 0x71, 0xeb,
+	0x22, 0xe2, 0x25, 0xc3, 0x49, 0x42, 0x98, 0x52, 0x58, 0x2f, 0xde, 0x59, 0x32, 0xb4, 0xb8, 0xc0,
+	0x22, 0x2d, 0x1e, 0xcc, 0x36, 0x58, 0xeb, 0x11, 0xd1, 0xf1, 0x7a, 0x59, 0x46, 0x5d, 0x42, 0x3c,
+	0x87, 0xbc, 0x48, 0x09, 0x17, 0xf0, 0x0e, 0xf8, 0x4f, 0xa5, 0xec, 0xc6, 0x38, 0x22, 0x55, 0xad,
+	0xae, 0x6d, 0x2e, 0x3b, 0x2b, 0xca, 0xf9, 0x0c, 0x47, 0xc4, 0xfc, 0xaa, 0x81, 0x1b, 0xfb, 0xa9,
+	0xc0, 0x82, 0x94, 0x14, 0xb8, 0x92, 0xb8, 0x0d, 0x8c, 0x61, 0xca, 0x05, 0x8d, 0x08, 0x73, 0x03,
+	0xaf, 0x10, 0x00, 0xca, 0xf5, 0xd4, 0x83, 0x7d, 0x00, 0x68, 0x42, 0x98, 0xac, 0xb5, 0xaa, 0xd7,
+	0x2b, 0x9b, 0x46, 0x6b, 0x0b, 0x2d, 0xea, 0x31, 0x2a, 0xc5, 0x3a, 0x50, 0x74, 0xa7, 0xa4, 0x04,
+	0xef, 0x82, 0xff, 0x13, 0xcc, 0x44, 0x80, 0x43, 0x77, 0x84, 0x83, 0x30, 0x65, 0xa4, 0x5a, 0xa9,
+	0x6b, 0x9b, 0xff, 0x3a, 0xab, 0x85, 0xbb, 0x2b, 0xbd, 0x59, 0x91, 0x63, 0x1c, 0x06, 0x1e, 0x16,
+	0xc4, 0xa5, 0x71, 0x78, 0x5a, 0xfd, 0x3b, 0x87, 0xad, 0x28, 0xe7, 0x41, 0x1c, 0x9e, 0x9a, 0xaf,
+	0x75, 0x70, 0xfd, 0xb2, 0x90, 0x70, 0x1b, 0x18, 0x69, 0x92, 0x73, 0xb3, 0x49, 0xe4, 0x5c, 0xa3,
+	0x55, 0x53, 0xf9, 0xab, 0x51, 0xa0, 0x6e, 0x36, 0xac, 0x7d, 0xcc, 0x4f, 0x1c, 0x20, 0xe1, 0x99,
+	0x0d, 0xf7, 0xc0, 0xd2, 0x90, 0x11, 0x2c, 0x64, 0x63, 0x8d, 0x16, 0x9a, 0x5b, 0xf7, 0x64, 0x73,
+	0xca, 0x85, 0xef, 0xfd, 0xe5, 0x14, 0xfc, 0x4c, 0x49, 0xea, 0x56, 0xf5, 0xab, 0x2a, 0x49, 0x3e,
+	0xac, 0x82, 0x25, 0x46, 0x22, 0x3a, 0x96, 0xed, 0x5a, 0xce, 0x5e, 0xe4, 0xef, 0x5d, 0x03, 0x2c,
+	0x4f, 0xfa, 0x6b, 0x7e, 0xd4, 0x40, 0xed, 0xb2, 0xa9, 0xf3, 0x84, 0xc6, 0x9c, 0xc0, 0x2e, 0x58,
+	0xbb, 0xd0, 0x7d, 0x97, 0x30, 0x46, 0x59, 0x2e, 0x6a, 0xb4, 0xa0, 0x4a, 0x8f, 0x25, 0x43, 0x74,
+	0x94, 0xef, 0xa2, 0x73, 0x6d, 0x7a, 0x2e, 0x4f, 0x32, 0x38, 0x3c, 0x02, 0xff, 0x30, 0xc2, 0xd3,
+	0x50, 0xa8, 0xd5, 0x78, 0xb4, 0x78, 0x35, 0x66, 0xd2, 0x72, 0x72, 0x05, 0x47, 0x29, 0x99, 0x8f,
+	0xc1, 0xfa, 0x1c, 0xcc, 0x6f, 0x6d, 0x7c, 0xeb, 0x6d, 0x05, 0xc0, 0x12, 0xf5, 0x48, 0x06, 0x86,
+	0x1f, 0x34, 0xb0, 0x3a, 0x7d, 0x47, 0xf0, 0xe1, 0xe2, 0x6c, 0x2f, 0xbd, 0xbc, 0xda, 0x1f, 0xce,
+	0xcf, 0xdc, 0x7a, 0xf5, 0xe5, 0xdb, 0x1b, 0xfd, 0x1e, 0x44, 0xd9, 0x67, 0xe6, 0x6c, 0xaa, 0x84,
+	0x1d, 0x75, 0x6c, 0xdc, 0x6a, 0x58, 0xb8, 0x34, 0x2c, 0xab, 0x71, 0x0e, 0x3f, 0x6b, 0x00, 0xce,
+	0x8e, 0x11, 0x6e, 0x5f, 0xa1, 0xcb, 0xea, 0xe4, 0x6b, 0xed, 0xab, 0x91, 0xe5, 0xe6, 0x98, 0xed,
+	0xbc, 0x92, 0x2d, 0xb3, 0x99, 0x55, 0xf2, 0x2b, 0xf5, 0xb3, 0xd2, 0x57, 0x64, 0xa7, 0x71, 0x3e,
+	0x55, 0x88, 0x1d, 0xe5, 0x72, 0xb6, 0xd6, 0xd8, 0xfd, 0xa1, 0x81, 0x8d, 0x21, 0x8d, 0x16, 0x66,
+	0xb0, 0xbb, 0x3e, 0x3b, 0xc0, 0xc3, 0xec, 0x58, 0x0f, 0xb5, 0xe7, 0x7b, 0x05, 0xd9, 0xa7, 0x21,
+	0x8e, 0x7d, 0x44, 0x99, 0x6f, 0xf9, 0x24, 0xce, 0x4f, 0x59, 0x7d, 0xce, 0x93, 0x80, 0xcf, 0xff,
+	0xf7, 0xd8, 0x56, 0xc6, 0x3b, 0xbd, 0xd2, 0xeb, 0x74, 0xde, 0xeb, 0xf5, 0x9e, 0x14, 0xec, 0x78,
+	0x1c, 0x49, 0x33, 0xb3, 0xfa, 0x4d, 0x54, 0x04, 0xe6, 0x9f, 0x14, 0x64, 0xd0, 0xf1, 0xf8, 0x60,
+	0x02, 0x19, 0xf4, 0x9b, 0x03, 0x05, 0xf9, 0xae, 0x6f, 0x48, 0xbf, 0x6d, 0x77, 0x3c, 0x6e, 0xdb,
+	0x13, 0x90, 0x6d, 0xf7, 0x9b, 0xb6, 0xad, 0x60, 0xc7, 0x4b, 0x79, 0x9e, 0xf7, 0x7f, 0x06, 0x00,
+	0x00, 0xff, 0xff, 0x0c, 0x80, 0x01, 0xb4, 0xe4, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,56 +513,3 @@ var _AdGroupFeedService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_feed_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_feed_service.proto", fileDescriptor_ad_group_feed_service_c2934f1f20022fd1)
-}
-
-var fileDescriptor_ad_group_feed_service_c2934f1f20022fd1 = []byte{
-	// 715 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x6e, 0xd3, 0x4a,
-	0x14, 0xbe, 0x76, 0xae, 0x7a, 0x6f, 0xc7, 0xbd, 0xbd, 0xd2, 0x40, 0xd5, 0x10, 0x21, 0x88, 0x4c,
-	0x25, 0xaa, 0x2c, 0xc6, 0x24, 0x88, 0x22, 0xdc, 0x14, 0x29, 0x95, 0x48, 0xca, 0xa2, 0xb4, 0x72,
-	0xa5, 0x2c, 0x50, 0x24, 0x6b, 0x1a, 0x4f, 0x2c, 0xab, 0xb6, 0xc7, 0xcc, 0x8c, 0x83, 0xaa, 0xaa,
-	0x1b, 0x1e, 0x80, 0x0d, 0x1b, 0xd6, 0x2c, 0xd9, 0xb1, 0xe4, 0x15, 0x90, 0x58, 0xf1, 0x06, 0x88,
-	0x15, 0x0f, 0x81, 0x90, 0x3d, 0x9e, 0xe0, 0x34, 0x8d, 0x02, 0xdd, 0x9d, 0x9c, 0xf9, 0xbe, 0xef,
-	0xfc, 0x3b, 0xa0, 0xed, 0x53, 0xea, 0x87, 0xc4, 0xc2, 0x1e, 0xb7, 0xa4, 0x99, 0x59, 0xe3, 0xa6,
-	0xc5, 0x09, 0x1b, 0x07, 0x43, 0xc2, 0x2d, 0xec, 0xb9, 0x3e, 0xa3, 0x69, 0xe2, 0x8e, 0x08, 0xf1,
-	0xdc, 0xc2, 0x8d, 0x12, 0x46, 0x05, 0x85, 0x75, 0x49, 0x41, 0xd8, 0xe3, 0x68, 0xc2, 0x46, 0xe3,
-	0x26, 0x52, 0xec, 0xda, 0x83, 0x79, 0xfa, 0x8c, 0x70, 0x9a, 0xb2, 0x99, 0x00, 0x52, 0xb8, 0x76,
-	0x53, 0xd1, 0x92, 0xc0, 0xc2, 0x71, 0x4c, 0x05, 0x16, 0x01, 0x8d, 0x79, 0xf1, 0x5a, 0x84, 0xb5,
-	0xf2, 0x5f, 0xc7, 0xe9, 0xc8, 0x1a, 0x05, 0x24, 0xf4, 0xdc, 0x08, 0xf3, 0x93, 0x02, 0x71, 0xeb,
-	0x22, 0xe2, 0x25, 0xc3, 0x49, 0x42, 0x98, 0x52, 0x58, 0x2f, 0xde, 0x59, 0x32, 0xb4, 0xb8, 0xc0,
-	0x22, 0x2d, 0x1e, 0xcc, 0x36, 0x58, 0xeb, 0x11, 0xd1, 0xf1, 0x7a, 0x59, 0x46, 0x5d, 0x42, 0x3c,
-	0x87, 0xbc, 0x48, 0x09, 0x17, 0xf0, 0x0e, 0xf8, 0x4f, 0xa5, 0xec, 0xc6, 0x38, 0x22, 0x55, 0xad,
-	0xae, 0x6d, 0x2e, 0x3b, 0x2b, 0xca, 0xf9, 0x0c, 0x47, 0xc4, 0xfc, 0xaa, 0x81, 0x1b, 0xfb, 0xa9,
-	0xc0, 0x82, 0x94, 0x14, 0xb8, 0x92, 0xb8, 0x0d, 0x8c, 0x61, 0xca, 0x05, 0x8d, 0x08, 0x73, 0x03,
-	0xaf, 0x10, 0x00, 0xca, 0xf5, 0xd4, 0x83, 0x7d, 0x00, 0x68, 0x42, 0x98, 0xac, 0xb5, 0xaa, 0xd7,
-	0x2b, 0x9b, 0x46, 0x6b, 0x0b, 0x2d, 0xea, 0x31, 0x2a, 0xc5, 0x3a, 0x50, 0x74, 0xa7, 0xa4, 0x04,
-	0xef, 0x82, 0xff, 0x13, 0xcc, 0x44, 0x80, 0x43, 0x77, 0x84, 0x83, 0x30, 0x65, 0xa4, 0x5a, 0xa9,
-	0x6b, 0x9b, 0xff, 0x3a, 0xab, 0x85, 0xbb, 0x2b, 0xbd, 0x59, 0x91, 0x63, 0x1c, 0x06, 0x1e, 0x16,
-	0xc4, 0xa5, 0x71, 0x78, 0x5a, 0xfd, 0x3b, 0x87, 0xad, 0x28, 0xe7, 0x41, 0x1c, 0x9e, 0x9a, 0xaf,
-	0x75, 0x70, 0xfd, 0xb2, 0x90, 0x70, 0x1b, 0x18, 0x69, 0x92, 0x73, 0xb3, 0x49, 0xe4, 0x5c, 0xa3,
-	0x55, 0x53, 0xf9, 0xab, 0x51, 0xa0, 0x6e, 0x36, 0xac, 0x7d, 0xcc, 0x4f, 0x1c, 0x20, 0xe1, 0x99,
-	0x0d, 0xf7, 0xc0, 0xd2, 0x90, 0x11, 0x2c, 0x64, 0x63, 0x8d, 0x16, 0x9a, 0x5b, 0xf7, 0x64, 0x73,
-	0xca, 0x85, 0xef, 0xfd, 0xe5, 0x14, 0xfc, 0x4c, 0x49, 0xea, 0x56, 0xf5, 0xab, 0x2a, 0x49, 0x3e,
-	0xac, 0x82, 0x25, 0x46, 0x22, 0x3a, 0x96, 0xed, 0x5a, 0xce, 0x5e, 0xe4, 0xef, 0x5d, 0x03, 0x2c,
-	0x4f, 0xfa, 0x6b, 0x7e, 0xd4, 0x40, 0xed, 0xb2, 0xa9, 0xf3, 0x84, 0xc6, 0x9c, 0xc0, 0x2e, 0x58,
-	0xbb, 0xd0, 0x7d, 0x97, 0x30, 0x46, 0x59, 0x2e, 0x6a, 0xb4, 0xa0, 0x4a, 0x8f, 0x25, 0x43, 0x74,
-	0x94, 0xef, 0xa2, 0x73, 0x6d, 0x7a, 0x2e, 0x4f, 0x32, 0x38, 0x3c, 0x02, 0xff, 0x30, 0xc2, 0xd3,
-	0x50, 0xa8, 0xd5, 0x78, 0xb4, 0x78, 0x35, 0x66, 0xd2, 0x72, 0x72, 0x05, 0x47, 0x29, 0x99, 0x8f,
-	0xc1, 0xfa, 0x1c, 0xcc, 0x6f, 0x6d, 0x7c, 0xeb, 0x6d, 0x05, 0xc0, 0x12, 0xf5, 0x48, 0x06, 0x86,
-	0x1f, 0x34, 0xb0, 0x3a, 0x7d, 0x47, 0xf0, 0xe1, 0xe2, 0x6c, 0x2f, 0xbd, 0xbc, 0xda, 0x1f, 0xce,
-	0xcf, 0xdc, 0x7a, 0xf5, 0xe5, 0xdb, 0x1b, 0xfd, 0x1e, 0x44, 0xd9, 0x67, 0xe6, 0x6c, 0xaa, 0x84,
-	0x1d, 0x75, 0x6c, 0xdc, 0x6a, 0x58, 0xb8, 0x34, 0x2c, 0xab, 0x71, 0x0e, 0x3f, 0x6b, 0x00, 0xce,
-	0x8e, 0x11, 0x6e, 0x5f, 0xa1, 0xcb, 0xea, 0xe4, 0x6b, 0xed, 0xab, 0x91, 0xe5, 0xe6, 0x98, 0xed,
-	0xbc, 0x92, 0x2d, 0xb3, 0x99, 0x55, 0xf2, 0x2b, 0xf5, 0xb3, 0xd2, 0x57, 0x64, 0xa7, 0x71, 0x3e,
-	0x55, 0x88, 0x1d, 0xe5, 0x72, 0xb6, 0xd6, 0xd8, 0xfd, 0xa1, 0x81, 0x8d, 0x21, 0x8d, 0x16, 0x66,
-	0xb0, 0xbb, 0x3e, 0x3b, 0xc0, 0xc3, 0xec, 0x58, 0x0f, 0xb5, 0xe7, 0x7b, 0x05, 0xd9, 0xa7, 0x21,
-	0x8e, 0x7d, 0x44, 0x99, 0x6f, 0xf9, 0x24, 0xce, 0x4f, 0x59, 0x7d, 0xce, 0x93, 0x80, 0xcf, 0xff,
-	0xf7, 0xd8, 0x56, 0xc6, 0x3b, 0xbd, 0xd2, 0xeb, 0x74, 0xde, 0xeb, 0xf5, 0x9e, 0x14, 0xec, 0x78,
-	0x1c, 0x49, 0x33, 0xb3, 0xfa, 0x4d, 0x54, 0x04, 0xe6, 0x9f, 0x14, 0x64, 0xd0, 0xf1, 0xf8, 0x60,
-	0x02, 0x19, 0xf4, 0x9b, 0x03, 0x05, 0xf9, 0xae, 0x6f, 0x48, 0xbf, 0x6d, 0x77, 0x3c, 0x6e, 0xdb,
-	0x13, 0x90, 0x6d, 0xf7, 0x9b, 0xb6, 0xad, 0x60, 0xc7, 0x4b, 0x79, 0x9e, 0xf7, 0x7f, 0x06, 0x00,
-	0x00, 0xff, 0xff, 0x0c, 0x80, 0x01, 0xb4, 0xe4, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_label_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_label_service.pb.go
index aa579a97b6..ea36d81e6d 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_label_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_label_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_label_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupLabelService.GetAdGroupLabel][google.ads.googleads.v1.services.AdGroupLabelService.GetAdGroupLabel].
 type GetAdGroupLabelRequest struct {
@@ -40,16 +40,17 @@ func (m *GetAdGroupLabelRequest) Reset()         { *m = GetAdGroupLabelRequest{}
 func (m *GetAdGroupLabelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupLabelRequest) ProtoMessage()    {}
 func (*GetAdGroupLabelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_label_service_5fd3c10fbb229e04, []int{0}
+	return fileDescriptor_1659eac28b95f6f8, []int{0}
 }
+
 func (m *GetAdGroupLabelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupLabelRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupLabelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupLabelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupLabelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupLabelRequest.Merge(dst, src)
+func (m *GetAdGroupLabelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupLabelRequest.Merge(m, src)
 }
 func (m *GetAdGroupLabelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupLabelRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateAdGroupLabelsRequest) Reset()         { *m = MutateAdGroupLabelsR
 func (m *MutateAdGroupLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupLabelsRequest) ProtoMessage()    {}
 func (*MutateAdGroupLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_label_service_5fd3c10fbb229e04, []int{1}
+	return fileDescriptor_1659eac28b95f6f8, []int{1}
 }
+
 func (m *MutateAdGroupLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupLabelsRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupLabelsRequest.Merge(dst, src)
+func (m *MutateAdGroupLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupLabelsRequest.Merge(m, src)
 }
 func (m *MutateAdGroupLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupLabelsRequest.Size(m)
@@ -155,16 +157,17 @@ func (m *AdGroupLabelOperation) Reset()         { *m = AdGroupLabelOperation{} }
 func (m *AdGroupLabelOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupLabelOperation) ProtoMessage()    {}
 func (*AdGroupLabelOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_label_service_5fd3c10fbb229e04, []int{2}
+	return fileDescriptor_1659eac28b95f6f8, []int{2}
 }
+
 func (m *AdGroupLabelOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupLabelOperation.Unmarshal(m, b)
 }
 func (m *AdGroupLabelOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupLabelOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupLabelOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupLabelOperation.Merge(dst, src)
+func (m *AdGroupLabelOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupLabelOperation.Merge(m, src)
 }
 func (m *AdGroupLabelOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupLabelOperation.Size(m)
@@ -212,76 +215,14 @@ func (m *AdGroupLabelOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupLabelOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupLabelOperation_OneofMarshaler, _AdGroupLabelOperation_OneofUnmarshaler, _AdGroupLabelOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupLabelOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupLabelOperation_Create)(nil),
 		(*AdGroupLabelOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupLabelOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupLabelOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupLabelOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupLabelOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupLabelOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupLabelOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroupLabel)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupLabelOperation_Create{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupLabelOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupLabelOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupLabelOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupLabelOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group labels mutate.
 type MutateAdGroupLabelsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -300,16 +241,17 @@ func (m *MutateAdGroupLabelsResponse) Reset()         { *m = MutateAdGroupLabels
 func (m *MutateAdGroupLabelsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupLabelsResponse) ProtoMessage()    {}
 func (*MutateAdGroupLabelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_label_service_5fd3c10fbb229e04, []int{3}
+	return fileDescriptor_1659eac28b95f6f8, []int{3}
 }
+
 func (m *MutateAdGroupLabelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupLabelsResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupLabelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupLabelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupLabelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupLabelsResponse.Merge(dst, src)
+func (m *MutateAdGroupLabelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupLabelsResponse.Merge(m, src)
 }
 func (m *MutateAdGroupLabelsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupLabelsResponse.Size(m)
@@ -347,16 +289,17 @@ func (m *MutateAdGroupLabelResult) Reset()         { *m = MutateAdGroupLabelResu
 func (m *MutateAdGroupLabelResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupLabelResult) ProtoMessage()    {}
 func (*MutateAdGroupLabelResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_label_service_5fd3c10fbb229e04, []int{4}
+	return fileDescriptor_1659eac28b95f6f8, []int{4}
 }
+
 func (m *MutateAdGroupLabelResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupLabelResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupLabelResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupLabelResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupLabelResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupLabelResult.Merge(dst, src)
+func (m *MutateAdGroupLabelResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupLabelResult.Merge(m, src)
 }
 func (m *MutateAdGroupLabelResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupLabelResult.Size(m)
@@ -382,6 +325,56 @@ func init() {
 	proto.RegisterType((*MutateAdGroupLabelResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupLabelResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_label_service.proto", fileDescriptor_1659eac28b95f6f8)
+}
+
+var fileDescriptor_1659eac28b95f6f8 = []byte{
+	// 663 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0xd4, 0x40,
+	0x14, 0x37, 0xbb, 0x52, 0xed, 0x6c, 0xb5, 0x30, 0xa5, 0x1a, 0x56, 0xd1, 0x25, 0x16, 0x2c, 0x7b,
+	0xc8, 0xb0, 0x2b, 0x58, 0x89, 0x2e, 0x92, 0x82, 0xdd, 0x16, 0xd4, 0x96, 0x54, 0x2a, 0xc8, 0x42,
+	0x98, 0x4d, 0xa6, 0x21, 0x90, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0xbc, 0x79, 0xf6, 0x13,
+	0xe8, 0xd1, 0xbb, 0x27, 0xbf, 0x81, 0x37, 0xf1, 0x2b, 0xf4, 0xe4, 0x97, 0x50, 0x92, 0xc9, 0xac,
+	0xd9, 0x76, 0x97, 0xd5, 0xde, 0x5e, 0xde, 0x9f, 0xdf, 0xfb, 0xfd, 0xde, 0x7b, 0x19, 0xd0, 0x0b,
+	0x28, 0x0d, 0x22, 0x82, 0xb0, 0xcf, 0x91, 0x34, 0x73, 0x6b, 0xd4, 0x41, 0x9c, 0xb0, 0x51, 0xe8,
+	0x11, 0x8e, 0xb0, 0xef, 0x06, 0x8c, 0x66, 0xa9, 0x1b, 0xe1, 0x21, 0x89, 0xdc, 0xd2, 0x6f, 0xa6,
+	0x8c, 0x0a, 0x0a, 0x5b, 0xb2, 0xc6, 0xc4, 0x3e, 0x37, 0xc7, 0xe5, 0xe6, 0xa8, 0x63, 0xaa, 0xf2,
+	0xe6, 0xc3, 0x59, 0x0d, 0x18, 0xe1, 0x34, 0x63, 0xe7, 0x3b, 0x48, 0xe4, 0xe6, 0x6d, 0x55, 0x97,
+	0x86, 0x08, 0x27, 0x09, 0x15, 0x58, 0x84, 0x34, 0xe1, 0x65, 0xf4, 0x4e, 0x19, 0x2d, 0xbe, 0x86,
+	0xd9, 0x21, 0x7a, 0xc7, 0x70, 0x9a, 0x12, 0xa6, 0xe2, 0x37, 0xcb, 0x38, 0x4b, 0x3d, 0xc4, 0x05,
+	0x16, 0x59, 0x19, 0x30, 0x7a, 0xe0, 0x46, 0x9f, 0x08, 0xdb, 0xef, 0xe7, 0x0d, 0x9f, 0xe7, 0xfd,
+	0x1c, 0xf2, 0x36, 0x23, 0x5c, 0xc0, 0x7b, 0xe0, 0x9a, 0xa2, 0xe4, 0x26, 0x38, 0x26, 0xba, 0xd6,
+	0xd2, 0xd6, 0x17, 0x9d, 0x25, 0xe5, 0x7c, 0x89, 0x63, 0x62, 0x9c, 0x6a, 0xa0, 0xf9, 0x22, 0x13,
+	0x58, 0x90, 0x2a, 0x04, 0x57, 0x18, 0x77, 0x41, 0xc3, 0xcb, 0xb8, 0xa0, 0x31, 0x61, 0x6e, 0xe8,
+	0x97, 0x08, 0x40, 0xb9, 0x76, 0x7c, 0xf8, 0x1a, 0x00, 0x9a, 0x12, 0x26, 0xb5, 0xe8, 0xb5, 0x56,
+	0x7d, 0xbd, 0xd1, 0xdd, 0x30, 0xe7, 0x0d, 0xd1, 0xac, 0x36, 0xdb, 0x55, 0xf5, 0x4e, 0x05, 0x0a,
+	0xde, 0x07, 0xcb, 0x29, 0x66, 0x22, 0xc4, 0x91, 0x7b, 0x88, 0xc3, 0x28, 0x63, 0x44, 0xaf, 0xb7,
+	0xb4, 0xf5, 0xab, 0xce, 0xf5, 0xd2, 0xbd, 0x25, 0xbd, 0xb9, 0xcc, 0x11, 0x8e, 0x42, 0x1f, 0x0b,
+	0xe2, 0xd2, 0x24, 0x3a, 0xd2, 0x2f, 0x17, 0x69, 0x4b, 0xca, 0xb9, 0x9b, 0x44, 0x47, 0xc6, 0x07,
+	0x0d, 0xac, 0x4e, 0xed, 0x09, 0x77, 0xc0, 0x82, 0xc7, 0x08, 0x16, 0x72, 0x3c, 0x8d, 0x2e, 0x9a,
+	0x49, 0x7e, 0xbc, 0xdf, 0x09, 0xf6, 0xdb, 0x97, 0x9c, 0x12, 0x00, 0xea, 0x60, 0x81, 0x91, 0x98,
+	0x8e, 0x88, 0x5e, 0xcb, 0xe7, 0x94, 0x47, 0xe4, 0xf7, 0x66, 0x03, 0x2c, 0x8e, 0xa5, 0x19, 0xdf,
+	0x34, 0x70, 0x6b, 0xea, 0xc8, 0x79, 0x4a, 0x13, 0x4e, 0xe0, 0x16, 0x58, 0x3d, 0xa3, 0xdc, 0x25,
+	0x8c, 0x51, 0x56, 0xe8, 0x6f, 0x74, 0xa1, 0x22, 0xc8, 0x52, 0xcf, 0xdc, 0x2f, 0x4e, 0xc1, 0x59,
+	0x99, 0x9c, 0xc9, 0xb3, 0x3c, 0x1d, 0xbe, 0x02, 0x57, 0x18, 0xe1, 0x59, 0x24, 0xd4, 0x5e, 0xac,
+	0xf9, 0x7b, 0x39, 0xcf, 0xcb, 0x29, 0x20, 0x1c, 0x05, 0x65, 0x3c, 0x05, 0xfa, 0xac, 0xa4, 0x7f,
+	0xba, 0xb8, 0xee, 0xa7, 0x3a, 0x58, 0xa9, 0xd6, 0xee, 0xcb, 0xde, 0xf0, 0xab, 0x06, 0x96, 0xcf,
+	0x5c, 0x32, 0x7c, 0x34, 0x9f, 0xf1, 0xf4, 0xe3, 0x6f, 0xfe, 0xef, 0x1a, 0x8d, 0x8d, 0xf7, 0x3f,
+	0x4f, 0x3f, 0xd6, 0x3a, 0x10, 0xe5, 0xbf, 0xf2, 0xf1, 0x84, 0x8c, 0x9e, 0xba, 0x77, 0x8e, 0xda,
+	0x08, 0x57, 0x77, 0x86, 0xda, 0x27, 0xf0, 0x87, 0x06, 0x56, 0xa6, 0xac, 0x13, 0x3e, 0xb9, 0xc8,
+	0xb4, 0xd5, 0x8f, 0xd7, 0xec, 0x5d, 0xb0, 0x5a, 0xde, 0x90, 0xd1, 0x2b, 0xd4, 0x6c, 0x18, 0xdd,
+	0x5c, 0xcd, 0x5f, 0xfa, 0xc7, 0x95, 0x9f, 0xb9, 0xd7, 0x3e, 0x99, 0x14, 0x63, 0xc5, 0x05, 0xa0,
+	0xa5, 0xb5, 0x37, 0x7f, 0x6b, 0x60, 0xcd, 0xa3, 0xf1, 0x5c, 0x0e, 0x9b, 0xfa, 0x94, 0x4d, 0xee,
+	0xe5, 0xef, 0xd2, 0x9e, 0xf6, 0x66, 0xbb, 0xac, 0x0e, 0x68, 0x84, 0x93, 0xc0, 0xa4, 0x2c, 0x40,
+	0x01, 0x49, 0x8a, 0x57, 0x4b, 0x3d, 0x9c, 0x69, 0xc8, 0x67, 0x3f, 0xd4, 0x8f, 0x95, 0xf1, 0xb9,
+	0x56, 0xef, 0xdb, 0xf6, 0x97, 0x5a, 0xab, 0x2f, 0x01, 0x6d, 0x9f, 0x9b, 0xd2, 0xcc, 0xad, 0x83,
+	0x8e, 0x59, 0x36, 0xe6, 0xdf, 0x55, 0xca, 0xc0, 0xf6, 0xf9, 0x60, 0x9c, 0x32, 0x38, 0xe8, 0x0c,
+	0x54, 0xca, 0xaf, 0xda, 0x9a, 0xf4, 0x5b, 0x96, 0xed, 0x73, 0xcb, 0x1a, 0x27, 0x59, 0xd6, 0x41,
+	0xc7, 0xb2, 0x54, 0xda, 0x70, 0xa1, 0xe0, 0xf9, 0xe0, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb9,
+	0x7c, 0x1a, 0xba, 0x4f, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -492,53 +485,3 @@ var _AdGroupLabelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_label_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_label_service.proto", fileDescriptor_ad_group_label_service_5fd3c10fbb229e04)
-}
-
-var fileDescriptor_ad_group_label_service_5fd3c10fbb229e04 = []byte{
-	// 663 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0xd4, 0x40,
-	0x14, 0x37, 0xbb, 0x52, 0xed, 0x6c, 0xb5, 0x30, 0xa5, 0x1a, 0x56, 0xd1, 0x25, 0x16, 0x2c, 0x7b,
-	0xc8, 0xb0, 0x2b, 0x58, 0x89, 0x2e, 0x92, 0x82, 0xdd, 0x16, 0xd4, 0x96, 0x54, 0x2a, 0xc8, 0x42,
-	0x98, 0x4d, 0xa6, 0x21, 0x90, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0xbc, 0x79, 0xf6, 0x13,
-	0xe8, 0xd1, 0xbb, 0x27, 0xbf, 0x81, 0x37, 0xf1, 0x2b, 0xf4, 0xe4, 0x97, 0x50, 0x92, 0xc9, 0xac,
-	0xd9, 0x76, 0x97, 0xd5, 0xde, 0x5e, 0xde, 0x9f, 0xdf, 0xfb, 0xfd, 0xde, 0x7b, 0x19, 0xd0, 0x0b,
-	0x28, 0x0d, 0x22, 0x82, 0xb0, 0xcf, 0x91, 0x34, 0x73, 0x6b, 0xd4, 0x41, 0x9c, 0xb0, 0x51, 0xe8,
-	0x11, 0x8e, 0xb0, 0xef, 0x06, 0x8c, 0x66, 0xa9, 0x1b, 0xe1, 0x21, 0x89, 0xdc, 0xd2, 0x6f, 0xa6,
-	0x8c, 0x0a, 0x0a, 0x5b, 0xb2, 0xc6, 0xc4, 0x3e, 0x37, 0xc7, 0xe5, 0xe6, 0xa8, 0x63, 0xaa, 0xf2,
-	0xe6, 0xc3, 0x59, 0x0d, 0x18, 0xe1, 0x34, 0x63, 0xe7, 0x3b, 0x48, 0xe4, 0xe6, 0x6d, 0x55, 0x97,
-	0x86, 0x08, 0x27, 0x09, 0x15, 0x58, 0x84, 0x34, 0xe1, 0x65, 0xf4, 0x4e, 0x19, 0x2d, 0xbe, 0x86,
-	0xd9, 0x21, 0x7a, 0xc7, 0x70, 0x9a, 0x12, 0xa6, 0xe2, 0x37, 0xcb, 0x38, 0x4b, 0x3d, 0xc4, 0x05,
-	0x16, 0x59, 0x19, 0x30, 0x7a, 0xe0, 0x46, 0x9f, 0x08, 0xdb, 0xef, 0xe7, 0x0d, 0x9f, 0xe7, 0xfd,
-	0x1c, 0xf2, 0x36, 0x23, 0x5c, 0xc0, 0x7b, 0xe0, 0x9a, 0xa2, 0xe4, 0x26, 0x38, 0x26, 0xba, 0xd6,
-	0xd2, 0xd6, 0x17, 0x9d, 0x25, 0xe5, 0x7c, 0x89, 0x63, 0x62, 0x9c, 0x6a, 0xa0, 0xf9, 0x22, 0x13,
-	0x58, 0x90, 0x2a, 0x04, 0x57, 0x18, 0x77, 0x41, 0xc3, 0xcb, 0xb8, 0xa0, 0x31, 0x61, 0x6e, 0xe8,
-	0x97, 0x08, 0x40, 0xb9, 0x76, 0x7c, 0xf8, 0x1a, 0x00, 0x9a, 0x12, 0x26, 0xb5, 0xe8, 0xb5, 0x56,
-	0x7d, 0xbd, 0xd1, 0xdd, 0x30, 0xe7, 0x0d, 0xd1, 0xac, 0x36, 0xdb, 0x55, 0xf5, 0x4e, 0x05, 0x0a,
-	0xde, 0x07, 0xcb, 0x29, 0x66, 0x22, 0xc4, 0x91, 0x7b, 0x88, 0xc3, 0x28, 0x63, 0x44, 0xaf, 0xb7,
-	0xb4, 0xf5, 0xab, 0xce, 0xf5, 0xd2, 0xbd, 0x25, 0xbd, 0xb9, 0xcc, 0x11, 0x8e, 0x42, 0x1f, 0x0b,
-	0xe2, 0xd2, 0x24, 0x3a, 0xd2, 0x2f, 0x17, 0x69, 0x4b, 0xca, 0xb9, 0x9b, 0x44, 0x47, 0xc6, 0x07,
-	0x0d, 0xac, 0x4e, 0xed, 0x09, 0x77, 0xc0, 0x82, 0xc7, 0x08, 0x16, 0x72, 0x3c, 0x8d, 0x2e, 0x9a,
-	0x49, 0x7e, 0xbc, 0xdf, 0x09, 0xf6, 0xdb, 0x97, 0x9c, 0x12, 0x00, 0xea, 0x60, 0x81, 0x91, 0x98,
-	0x8e, 0x88, 0x5e, 0xcb, 0xe7, 0x94, 0x47, 0xe4, 0xf7, 0x66, 0x03, 0x2c, 0x8e, 0xa5, 0x19, 0xdf,
-	0x34, 0x70, 0x6b, 0xea, 0xc8, 0x79, 0x4a, 0x13, 0x4e, 0xe0, 0x16, 0x58, 0x3d, 0xa3, 0xdc, 0x25,
-	0x8c, 0x51, 0x56, 0xe8, 0x6f, 0x74, 0xa1, 0x22, 0xc8, 0x52, 0xcf, 0xdc, 0x2f, 0x4e, 0xc1, 0x59,
-	0x99, 0x9c, 0xc9, 0xb3, 0x3c, 0x1d, 0xbe, 0x02, 0x57, 0x18, 0xe1, 0x59, 0x24, 0xd4, 0x5e, 0xac,
-	0xf9, 0x7b, 0x39, 0xcf, 0xcb, 0x29, 0x20, 0x1c, 0x05, 0x65, 0x3c, 0x05, 0xfa, 0xac, 0xa4, 0x7f,
-	0xba, 0xb8, 0xee, 0xa7, 0x3a, 0x58, 0xa9, 0xd6, 0xee, 0xcb, 0xde, 0xf0, 0xab, 0x06, 0x96, 0xcf,
-	0x5c, 0x32, 0x7c, 0x34, 0x9f, 0xf1, 0xf4, 0xe3, 0x6f, 0xfe, 0xef, 0x1a, 0x8d, 0x8d, 0xf7, 0x3f,
-	0x4f, 0x3f, 0xd6, 0x3a, 0x10, 0xe5, 0xbf, 0xf2, 0xf1, 0x84, 0x8c, 0x9e, 0xba, 0x77, 0x8e, 0xda,
-	0x08, 0x57, 0x77, 0x86, 0xda, 0x27, 0xf0, 0x87, 0x06, 0x56, 0xa6, 0xac, 0x13, 0x3e, 0xb9, 0xc8,
-	0xb4, 0xd5, 0x8f, 0xd7, 0xec, 0x5d, 0xb0, 0x5a, 0xde, 0x90, 0xd1, 0x2b, 0xd4, 0x6c, 0x18, 0xdd,
-	0x5c, 0xcd, 0x5f, 0xfa, 0xc7, 0x95, 0x9f, 0xb9, 0xd7, 0x3e, 0x99, 0x14, 0x63, 0xc5, 0x05, 0xa0,
-	0xa5, 0xb5, 0x37, 0x7f, 0x6b, 0x60, 0xcd, 0xa3, 0xf1, 0x5c, 0x0e, 0x9b, 0xfa, 0x94, 0x4d, 0xee,
-	0xe5, 0xef, 0xd2, 0x9e, 0xf6, 0x66, 0xbb, 0xac, 0x0e, 0x68, 0x84, 0x93, 0xc0, 0xa4, 0x2c, 0x40,
-	0x01, 0x49, 0x8a, 0x57, 0x4b, 0x3d, 0x9c, 0x69, 0xc8, 0x67, 0x3f, 0xd4, 0x8f, 0x95, 0xf1, 0xb9,
-	0x56, 0xef, 0xdb, 0xf6, 0x97, 0x5a, 0xab, 0x2f, 0x01, 0x6d, 0x9f, 0x9b, 0xd2, 0xcc, 0xad, 0x83,
-	0x8e, 0x59, 0x36, 0xe6, 0xdf, 0x55, 0xca, 0xc0, 0xf6, 0xf9, 0x60, 0x9c, 0x32, 0x38, 0xe8, 0x0c,
-	0x54, 0xca, 0xaf, 0xda, 0x9a, 0xf4, 0x5b, 0x96, 0xed, 0x73, 0xcb, 0x1a, 0x27, 0x59, 0xd6, 0x41,
-	0xc7, 0xb2, 0x54, 0xda, 0x70, 0xa1, 0xe0, 0xf9, 0xe0, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb9,
-	0x7c, 0x1a, 0xba, 0x4f, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_service.pb.go
index db946e81f8..38fea3fe6c 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupService.GetAdGroup][google.ads.googleads.v1.services.AdGroupService.GetAdGroup].
 type GetAdGroupRequest struct {
@@ -41,16 +41,17 @@ func (m *GetAdGroupRequest) Reset()         { *m = GetAdGroupRequest{} }
 func (m *GetAdGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupRequest) ProtoMessage()    {}
 func (*GetAdGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_service_b66f8854dd286f7c, []int{0}
+	return fileDescriptor_3386b0d8974a2f1b, []int{0}
 }
+
 func (m *GetAdGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupRequest.Merge(dst, src)
+func (m *GetAdGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupRequest.Merge(m, src)
 }
 func (m *GetAdGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateAdGroupsRequest) Reset()         { *m = MutateAdGroupsRequest{} }
 func (m *MutateAdGroupsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupsRequest) ProtoMessage()    {}
 func (*MutateAdGroupsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_service_b66f8854dd286f7c, []int{1}
+	return fileDescriptor_3386b0d8974a2f1b, []int{1}
 }
+
 func (m *MutateAdGroupsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupsRequest.Unmarshal(m, b)
 }
 func (m *MutateAdGroupsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupsRequest.Merge(dst, src)
+func (m *MutateAdGroupsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupsRequest.Merge(m, src)
 }
 func (m *MutateAdGroupsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *AdGroupOperation) Reset()         { *m = AdGroupOperation{} }
 func (m *AdGroupOperation) String() string { return proto.CompactTextString(m) }
 func (*AdGroupOperation) ProtoMessage()    {}
 func (*AdGroupOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_service_b66f8854dd286f7c, []int{2}
+	return fileDescriptor_3386b0d8974a2f1b, []int{2}
 }
+
 func (m *AdGroupOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdGroupOperation.Unmarshal(m, b)
 }
 func (m *AdGroupOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdGroupOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdGroupOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdGroupOperation.Merge(dst, src)
+func (m *AdGroupOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdGroupOperation.Merge(m, src)
 }
 func (m *AdGroupOperation) XXX_Size() int {
 	return xxx_messageInfo_AdGroupOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *AdGroupOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdGroupOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdGroupOperation_OneofMarshaler, _AdGroupOperation_OneofUnmarshaler, _AdGroupOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdGroupOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdGroupOperation_Create)(nil),
 		(*AdGroupOperation_Update)(nil),
 		(*AdGroupOperation_Remove)(nil),
 	}
 }
 
-func _AdGroupOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdGroupOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdGroupOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *AdGroupOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdGroupOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdGroupOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdGroupOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroup)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdGroup)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdGroupOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdGroupOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdGroupOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdGroupOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdGroupOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdGroupOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad group mutate.
 type MutateAdGroupsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateAdGroupsResponse) Reset()         { *m = MutateAdGroupsResponse{}
 func (m *MutateAdGroupsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupsResponse) ProtoMessage()    {}
 func (*MutateAdGroupsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_service_b66f8854dd286f7c, []int{3}
+	return fileDescriptor_3386b0d8974a2f1b, []int{3}
 }
+
 func (m *MutateAdGroupsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupsResponse.Unmarshal(m, b)
 }
 func (m *MutateAdGroupsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupsResponse.Merge(dst, src)
+func (m *MutateAdGroupsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupsResponse.Merge(m, src)
 }
 func (m *MutateAdGroupsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateAdGroupResult) Reset()         { *m = MutateAdGroupResult{} }
 func (m *MutateAdGroupResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdGroupResult) ProtoMessage()    {}
 func (*MutateAdGroupResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_service_b66f8854dd286f7c, []int{4}
+	return fileDescriptor_3386b0d8974a2f1b, []int{4}
 }
+
 func (m *MutateAdGroupResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdGroupResult.Unmarshal(m, b)
 }
 func (m *MutateAdGroupResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdGroupResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdGroupResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdGroupResult.Merge(dst, src)
+func (m *MutateAdGroupResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdGroupResult.Merge(m, src)
 }
 func (m *MutateAdGroupResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdGroupResult.Size(m)
@@ -425,6 +350,58 @@ func init() {
 	proto.RegisterType((*MutateAdGroupResult)(nil), "google.ads.googleads.v1.services.MutateAdGroupResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_service.proto", fileDescriptor_3386b0d8974a2f1b)
+}
+
+var fileDescriptor_3386b0d8974a2f1b = []byte{
+	// 702 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x4f, 0xd4, 0x40,
+	0x14, 0xb7, 0xc5, 0xa0, 0x4c, 0x11, 0x75, 0x08, 0xba, 0xd9, 0x18, 0xdd, 0x54, 0x12, 0xc9, 0x46,
+	0x5b, 0xb7, 0xc4, 0x40, 0x4a, 0x38, 0x2c, 0x51, 0x16, 0x0f, 0x08, 0x29, 0x09, 0x07, 0xb3, 0x49,
+	0x33, 0x6c, 0x87, 0xa6, 0xa1, 0xed, 0xd4, 0x99, 0xe9, 0x1a, 0x42, 0xb8, 0xf0, 0x15, 0xfc, 0x04,
+	0x7a, 0xf4, 0xe6, 0x07, 0xf0, 0x0b, 0x78, 0xf5, 0xe6, 0xd9, 0x93, 0x67, 0x4f, 0x9e, 0xcc, 0x74,
+	0x66, 0x16, 0x76, 0x95, 0xac, 0xeb, 0xed, 0xcd, 0x9b, 0xf7, 0xfb, 0xbd, 0xdf, 0xbc, 0x3f, 0x03,
+	0x56, 0x62, 0x42, 0xe2, 0x14, 0xbb, 0x28, 0x62, 0xae, 0x34, 0x85, 0xd5, 0x6f, 0xb9, 0x0c, 0xd3,
+	0x7e, 0xd2, 0xc3, 0xcc, 0x45, 0x51, 0x18, 0x53, 0x52, 0x16, 0xa1, 0xf2, 0x38, 0x05, 0x25, 0x9c,
+	0xc0, 0x86, 0x8c, 0x76, 0x50, 0xc4, 0x9c, 0x01, 0xd0, 0xe9, 0xb7, 0x1c, 0x0d, 0xac, 0x3f, 0xbd,
+	0x8c, 0x9a, 0x62, 0x46, 0x4a, 0x7a, 0x91, 0x5b, 0x72, 0xd6, 0xef, 0x69, 0x44, 0x91, 0xb8, 0x28,
+	0xcf, 0x09, 0x47, 0x3c, 0x21, 0x39, 0x53, 0xb7, 0x2a, 0xa3, 0x5b, 0x9d, 0x0e, 0xca, 0x43, 0xf7,
+	0x30, 0xc1, 0x69, 0x14, 0x66, 0x88, 0x1d, 0xa9, 0x88, 0xfb, 0xa3, 0x11, 0x6f, 0x29, 0x2a, 0x0a,
+	0x4c, 0x35, 0xc3, 0x5d, 0x75, 0x4f, 0x8b, 0x9e, 0xcb, 0x38, 0xe2, 0xa5, 0xba, 0xb0, 0x57, 0xc1,
+	0xed, 0x0e, 0xe6, 0xed, 0xa8, 0x23, 0xc4, 0x04, 0xf8, 0x4d, 0x89, 0x19, 0x87, 0x0f, 0xc1, 0x0d,
+	0xad, 0x34, 0xcc, 0x51, 0x86, 0x6b, 0x46, 0xc3, 0x58, 0x9a, 0x09, 0x66, 0xb5, 0xf3, 0x15, 0xca,
+	0xb0, 0xfd, 0xcd, 0x00, 0x0b, 0xdb, 0x25, 0x47, 0x1c, 0x2b, 0x34, 0xd3, 0xf0, 0x07, 0xc0, 0xea,
+	0x95, 0x8c, 0x93, 0x0c, 0xd3, 0x30, 0x89, 0x14, 0x18, 0x68, 0xd7, 0xcb, 0x08, 0x06, 0x00, 0x90,
+	0x02, 0x53, 0xf9, 0xc6, 0x9a, 0xd9, 0x98, 0x5a, 0xb2, 0x3c, 0xcf, 0x19, 0x57, 0x56, 0x47, 0xe5,
+	0xd9, 0xd1, 0xd0, 0xe0, 0x02, 0x0b, 0x7c, 0x04, 0x6e, 0x16, 0x88, 0xf2, 0x04, 0xa5, 0xe1, 0x21,
+	0x4a, 0xd2, 0x92, 0xe2, 0xda, 0x54, 0xc3, 0x58, 0xba, 0x1e, 0xcc, 0x29, 0xf7, 0xa6, 0xf4, 0x8a,
+	0xc7, 0xf5, 0x51, 0x9a, 0x44, 0x88, 0xe3, 0x90, 0xe4, 0xe9, 0x71, 0xed, 0x6a, 0x15, 0x36, 0xab,
+	0x9d, 0x3b, 0x79, 0x7a, 0x6c, 0x9f, 0x99, 0xe0, 0xd6, 0x68, 0x3a, 0xb8, 0x06, 0xac, 0xb2, 0xa8,
+	0x70, 0xa2, 0xf2, 0x15, 0xce, 0xf2, 0xea, 0x5a, 0xb7, 0x2e, 0xbd, 0xb3, 0x29, 0x9a, 0xb3, 0x8d,
+	0xd8, 0x51, 0x00, 0x64, 0xb8, 0xb0, 0xe1, 0x73, 0x30, 0xdd, 0xa3, 0x18, 0x71, 0x59, 0x4c, 0xcb,
+	0x6b, 0x5e, 0xfa, 0xde, 0xc1, 0x90, 0xe8, 0x07, 0x6f, 0x5d, 0x09, 0x14, 0x56, 0xb0, 0x48, 0xce,
+	0x9a, 0xf9, 0x3f, 0x2c, 0x12, 0x0b, 0x6b, 0x60, 0x9a, 0xe2, 0x8c, 0xf4, 0x65, 0x89, 0x66, 0xc4,
+	0x8d, 0x3c, 0x6f, 0x58, 0x60, 0x66, 0x50, 0x53, 0xfb, 0x93, 0x01, 0xee, 0x8c, 0x76, 0x98, 0x15,
+	0x24, 0x67, 0x18, 0x6e, 0x82, 0x85, 0x91, 0x6a, 0x87, 0x98, 0x52, 0x42, 0x2b, 0x42, 0xcb, 0x83,
+	0x5a, 0x16, 0x2d, 0x7a, 0xce, 0x5e, 0x35, 0x6f, 0xc1, 0xfc, 0x70, 0x1f, 0x5e, 0x88, 0x70, 0xb8,
+	0x03, 0xae, 0x51, 0xcc, 0xca, 0x94, 0xeb, 0x31, 0x78, 0x36, 0x7e, 0x0c, 0x86, 0x24, 0x05, 0x15,
+	0x3a, 0xd0, 0x2c, 0xb6, 0x0f, 0xe6, 0xff, 0x72, 0xff, 0x4f, 0x13, 0xed, 0xfd, 0x34, 0xc1, 0x9c,
+	0x82, 0xed, 0xc9, 0x64, 0xf0, 0xbd, 0x01, 0xc0, 0xf9, 0x7e, 0xc0, 0xe5, 0xf1, 0xea, 0xfe, 0xd8,
+	0xa6, 0xfa, 0x04, 0x3d, 0xb2, 0xbd, 0xb3, 0xaf, 0xdf, 0xdf, 0x99, 0x8f, 0x61, 0x53, 0xfc, 0x16,
+	0x27, 0x43, 0x92, 0xd7, 0xf5, 0x02, 0x31, 0xb7, 0xe9, 0x22, 0xd5, 0x10, 0xb7, 0x79, 0x0a, 0x3f,
+	0x1b, 0x60, 0x6e, 0xb8, 0x4d, 0x70, 0x65, 0xc2, 0x2a, 0xea, 0xd5, 0xad, 0xaf, 0x4e, 0x0e, 0x94,
+	0x13, 0x61, 0xaf, 0x56, 0xca, 0x3d, 0xfb, 0x89, 0x50, 0x7e, 0x2e, 0xf5, 0xe4, 0xc2, 0x4f, 0xb0,
+	0xde, 0x3c, 0x1d, 0x08, 0xf7, 0xb3, 0x8a, 0xc6, 0x37, 0x9a, 0x1b, 0xbf, 0x0c, 0xb0, 0xd8, 0x23,
+	0xd9, 0xd8, 0xcc, 0x1b, 0xf3, 0xc3, 0xcd, 0xd9, 0x15, 0x0b, 0xb7, 0x6b, 0xbc, 0xde, 0x52, 0xc0,
+	0x98, 0xa4, 0x28, 0x8f, 0x1d, 0x42, 0x63, 0x37, 0xc6, 0x79, 0xb5, 0x8e, 0xfa, 0xf7, 0x2d, 0x12,
+	0x76, 0xf9, 0x3f, 0xbf, 0xa6, 0x8d, 0x0f, 0xe6, 0x54, 0xa7, 0xdd, 0xfe, 0x68, 0x36, 0x3a, 0x92,
+	0xb0, 0x1d, 0x31, 0x47, 0x9a, 0xc2, 0xda, 0x6f, 0x39, 0x2a, 0x31, 0xfb, 0xa2, 0x43, 0xba, 0xed,
+	0x88, 0x75, 0x07, 0x21, 0xdd, 0xfd, 0x56, 0x57, 0x87, 0xfc, 0x30, 0x17, 0xa5, 0xdf, 0xf7, 0xdb,
+	0x11, 0xf3, 0xfd, 0x41, 0x90, 0xef, 0xef, 0xb7, 0x7c, 0x5f, 0x87, 0x1d, 0x4c, 0x57, 0x3a, 0x97,
+	0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x5f, 0x6a, 0x64, 0x8e, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -533,55 +510,3 @@ var _AdGroupService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_service.proto", fileDescriptor_ad_group_service_b66f8854dd286f7c)
-}
-
-var fileDescriptor_ad_group_service_b66f8854dd286f7c = []byte{
-	// 702 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x4f, 0xd4, 0x40,
-	0x14, 0xb7, 0xc5, 0xa0, 0x4c, 0x11, 0x75, 0x08, 0xba, 0xd9, 0x18, 0xdd, 0x54, 0x12, 0xc9, 0x46,
-	0x5b, 0xb7, 0xc4, 0x40, 0x4a, 0x38, 0x2c, 0x51, 0x16, 0x0f, 0x08, 0x29, 0x09, 0x07, 0xb3, 0x49,
-	0x33, 0x6c, 0x87, 0xa6, 0xa1, 0xed, 0xd4, 0x99, 0xe9, 0x1a, 0x42, 0xb8, 0xf0, 0x15, 0xfc, 0x04,
-	0x7a, 0xf4, 0xe6, 0x07, 0xf0, 0x0b, 0x78, 0xf5, 0xe6, 0xd9, 0x93, 0x67, 0x4f, 0x9e, 0xcc, 0x74,
-	0x66, 0x16, 0x76, 0x95, 0xac, 0xeb, 0xed, 0xcd, 0x9b, 0xf7, 0xfb, 0xbd, 0xdf, 0xbc, 0x3f, 0x03,
-	0x56, 0x62, 0x42, 0xe2, 0x14, 0xbb, 0x28, 0x62, 0xae, 0x34, 0x85, 0xd5, 0x6f, 0xb9, 0x0c, 0xd3,
-	0x7e, 0xd2, 0xc3, 0xcc, 0x45, 0x51, 0x18, 0x53, 0x52, 0x16, 0xa1, 0xf2, 0x38, 0x05, 0x25, 0x9c,
-	0xc0, 0x86, 0x8c, 0x76, 0x50, 0xc4, 0x9c, 0x01, 0xd0, 0xe9, 0xb7, 0x1c, 0x0d, 0xac, 0x3f, 0xbd,
-	0x8c, 0x9a, 0x62, 0x46, 0x4a, 0x7a, 0x91, 0x5b, 0x72, 0xd6, 0xef, 0x69, 0x44, 0x91, 0xb8, 0x28,
-	0xcf, 0x09, 0x47, 0x3c, 0x21, 0x39, 0x53, 0xb7, 0x2a, 0xa3, 0x5b, 0x9d, 0x0e, 0xca, 0x43, 0xf7,
-	0x30, 0xc1, 0x69, 0x14, 0x66, 0x88, 0x1d, 0xa9, 0x88, 0xfb, 0xa3, 0x11, 0x6f, 0x29, 0x2a, 0x0a,
-	0x4c, 0x35, 0xc3, 0x5d, 0x75, 0x4f, 0x8b, 0x9e, 0xcb, 0x38, 0xe2, 0xa5, 0xba, 0xb0, 0x57, 0xc1,
-	0xed, 0x0e, 0xe6, 0xed, 0xa8, 0x23, 0xc4, 0x04, 0xf8, 0x4d, 0x89, 0x19, 0x87, 0x0f, 0xc1, 0x0d,
-	0xad, 0x34, 0xcc, 0x51, 0x86, 0x6b, 0x46, 0xc3, 0x58, 0x9a, 0x09, 0x66, 0xb5, 0xf3, 0x15, 0xca,
-	0xb0, 0xfd, 0xcd, 0x00, 0x0b, 0xdb, 0x25, 0x47, 0x1c, 0x2b, 0x34, 0xd3, 0xf0, 0x07, 0xc0, 0xea,
-	0x95, 0x8c, 0x93, 0x0c, 0xd3, 0x30, 0x89, 0x14, 0x18, 0x68, 0xd7, 0xcb, 0x08, 0x06, 0x00, 0x90,
-	0x02, 0x53, 0xf9, 0xc6, 0x9a, 0xd9, 0x98, 0x5a, 0xb2, 0x3c, 0xcf, 0x19, 0x57, 0x56, 0x47, 0xe5,
-	0xd9, 0xd1, 0xd0, 0xe0, 0x02, 0x0b, 0x7c, 0x04, 0x6e, 0x16, 0x88, 0xf2, 0x04, 0xa5, 0xe1, 0x21,
-	0x4a, 0xd2, 0x92, 0xe2, 0xda, 0x54, 0xc3, 0x58, 0xba, 0x1e, 0xcc, 0x29, 0xf7, 0xa6, 0xf4, 0x8a,
-	0xc7, 0xf5, 0x51, 0x9a, 0x44, 0x88, 0xe3, 0x90, 0xe4, 0xe9, 0x71, 0xed, 0x6a, 0x15, 0x36, 0xab,
-	0x9d, 0x3b, 0x79, 0x7a, 0x6c, 0x9f, 0x99, 0xe0, 0xd6, 0x68, 0x3a, 0xb8, 0x06, 0xac, 0xb2, 0xa8,
-	0x70, 0xa2, 0xf2, 0x15, 0xce, 0xf2, 0xea, 0x5a, 0xb7, 0x2e, 0xbd, 0xb3, 0x29, 0x9a, 0xb3, 0x8d,
-	0xd8, 0x51, 0x00, 0x64, 0xb8, 0xb0, 0xe1, 0x73, 0x30, 0xdd, 0xa3, 0x18, 0x71, 0x59, 0x4c, 0xcb,
-	0x6b, 0x5e, 0xfa, 0xde, 0xc1, 0x90, 0xe8, 0x07, 0x6f, 0x5d, 0x09, 0x14, 0x56, 0xb0, 0x48, 0xce,
-	0x9a, 0xf9, 0x3f, 0x2c, 0x12, 0x0b, 0x6b, 0x60, 0x9a, 0xe2, 0x8c, 0xf4, 0x65, 0x89, 0x66, 0xc4,
-	0x8d, 0x3c, 0x6f, 0x58, 0x60, 0x66, 0x50, 0x53, 0xfb, 0x93, 0x01, 0xee, 0x8c, 0x76, 0x98, 0x15,
-	0x24, 0x67, 0x18, 0x6e, 0x82, 0x85, 0x91, 0x6a, 0x87, 0x98, 0x52, 0x42, 0x2b, 0x42, 0xcb, 0x83,
-	0x5a, 0x16, 0x2d, 0x7a, 0xce, 0x5e, 0x35, 0x6f, 0xc1, 0xfc, 0x70, 0x1f, 0x5e, 0x88, 0x70, 0xb8,
-	0x03, 0xae, 0x51, 0xcc, 0xca, 0x94, 0xeb, 0x31, 0x78, 0x36, 0x7e, 0x0c, 0x86, 0x24, 0x05, 0x15,
-	0x3a, 0xd0, 0x2c, 0xb6, 0x0f, 0xe6, 0xff, 0x72, 0xff, 0x4f, 0x13, 0xed, 0xfd, 0x34, 0xc1, 0x9c,
-	0x82, 0xed, 0xc9, 0x64, 0xf0, 0xbd, 0x01, 0xc0, 0xf9, 0x7e, 0xc0, 0xe5, 0xf1, 0xea, 0xfe, 0xd8,
-	0xa6, 0xfa, 0x04, 0x3d, 0xb2, 0xbd, 0xb3, 0xaf, 0xdf, 0xdf, 0x99, 0x8f, 0x61, 0x53, 0xfc, 0x16,
-	0x27, 0x43, 0x92, 0xd7, 0xf5, 0x02, 0x31, 0xb7, 0xe9, 0x22, 0xd5, 0x10, 0xb7, 0x79, 0x0a, 0x3f,
-	0x1b, 0x60, 0x6e, 0xb8, 0x4d, 0x70, 0x65, 0xc2, 0x2a, 0xea, 0xd5, 0xad, 0xaf, 0x4e, 0x0e, 0x94,
-	0x13, 0x61, 0xaf, 0x56, 0xca, 0x3d, 0xfb, 0x89, 0x50, 0x7e, 0x2e, 0xf5, 0xe4, 0xc2, 0x4f, 0xb0,
-	0xde, 0x3c, 0x1d, 0x08, 0xf7, 0xb3, 0x8a, 0xc6, 0x37, 0x9a, 0x1b, 0xbf, 0x0c, 0xb0, 0xd8, 0x23,
-	0xd9, 0xd8, 0xcc, 0x1b, 0xf3, 0xc3, 0xcd, 0xd9, 0x15, 0x0b, 0xb7, 0x6b, 0xbc, 0xde, 0x52, 0xc0,
-	0x98, 0xa4, 0x28, 0x8f, 0x1d, 0x42, 0x63, 0x37, 0xc6, 0x79, 0xb5, 0x8e, 0xfa, 0xf7, 0x2d, 0x12,
-	0x76, 0xf9, 0x3f, 0xbf, 0xa6, 0x8d, 0x0f, 0xe6, 0x54, 0xa7, 0xdd, 0xfe, 0x68, 0x36, 0x3a, 0x92,
-	0xb0, 0x1d, 0x31, 0x47, 0x9a, 0xc2, 0xda, 0x6f, 0x39, 0x2a, 0x31, 0xfb, 0xa2, 0x43, 0xba, 0xed,
-	0x88, 0x75, 0x07, 0x21, 0xdd, 0xfd, 0x56, 0x57, 0x87, 0xfc, 0x30, 0x17, 0xa5, 0xdf, 0xf7, 0xdb,
-	0x11, 0xf3, 0xfd, 0x41, 0x90, 0xef, 0xef, 0xb7, 0x7c, 0x5f, 0x87, 0x1d, 0x4c, 0x57, 0x3a, 0x97,
-	0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x5f, 0x6a, 0x64, 0x8e, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_group_simulation_service.pb.go b/googleapis/ads/googleads/v1/services/ad_group_simulation_service.pb.go
index c672fe7a77..08438bb3a7 100644
--- a/googleapis/ads/googleads/v1/services/ad_group_simulation_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_group_simulation_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_group_simulation_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdGroupSimulationService.GetAdGroupSimulation][google.ads.googleads.v1.services.AdGroupSimulationService.GetAdGroupSimulation].
 type GetAdGroupSimulationRequest struct {
@@ -38,16 +38,17 @@ func (m *GetAdGroupSimulationRequest) Reset()         { *m = GetAdGroupSimulatio
 func (m *GetAdGroupSimulationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdGroupSimulationRequest) ProtoMessage()    {}
 func (*GetAdGroupSimulationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_group_simulation_service_6eeb2b02d2d7da9e, []int{0}
+	return fileDescriptor_100c20f45a4ce1f1, []int{0}
 }
+
 func (m *GetAdGroupSimulationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdGroupSimulationRequest.Unmarshal(m, b)
 }
 func (m *GetAdGroupSimulationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdGroupSimulationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdGroupSimulationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdGroupSimulationRequest.Merge(dst, src)
+func (m *GetAdGroupSimulationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdGroupSimulationRequest.Merge(m, src)
 }
 func (m *GetAdGroupSimulationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdGroupSimulationRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetAdGroupSimulationRequest)(nil), "google.ads.googleads.v1.services.GetAdGroupSimulationRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_simulation_service.proto", fileDescriptor_100c20f45a4ce1f1)
+}
+
+var fileDescriptor_100c20f45a4ce1f1 = []byte{
+	// 367 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcd, 0x4a, 0xeb, 0x40,
+	0x14, 0x26, 0xb9, 0x70, 0xe1, 0x86, 0xeb, 0x26, 0xb8, 0x28, 0x55, 0xa1, 0xd4, 0x2e, 0xa4, 0x8b,
+	0x19, 0xa2, 0xc5, 0xc5, 0xd4, 0x2e, 0x92, 0x4d, 0x5c, 0x49, 0x69, 0xa1, 0x0b, 0x09, 0x84, 0xb1,
+	0x33, 0x0c, 0x81, 0x26, 0x13, 0xe7, 0x24, 0xdd, 0x88, 0x1b, 0xf1, 0x0d, 0x7c, 0x03, 0x97, 0xbe,
+	0x89, 0x6e, 0x7d, 0x05, 0x71, 0xe1, 0x53, 0x48, 0x3a, 0x9d, 0x80, 0xd6, 0xd8, 0xdd, 0xc7, 0x9c,
+	0xef, 0xe7, 0xcc, 0x37, 0xe3, 0x04, 0x42, 0x4a, 0xb1, 0xe0, 0x98, 0x32, 0xc0, 0x1a, 0x56, 0x68,
+	0xe9, 0x61, 0xe0, 0x6a, 0x99, 0xcc, 0x39, 0x60, 0xca, 0x62, 0xa1, 0x64, 0x99, 0xc7, 0x90, 0xa4,
+	0xe5, 0x82, 0x16, 0x89, 0xcc, 0xe2, 0xf5, 0x10, 0xe5, 0x4a, 0x16, 0xd2, 0xed, 0x68, 0x21, 0xa2,
+	0x0c, 0x50, 0xed, 0x81, 0x96, 0x1e, 0x32, 0x1e, 0xed, 0x61, 0x53, 0x8a, 0xe2, 0x20, 0x4b, 0xd5,
+	0x10, 0xa3, 0xed, 0xdb, 0xfb, 0x46, 0x9c, 0x27, 0x98, 0x66, 0x99, 0x2c, 0x56, 0x43, 0xd0, 0xd3,
+	0x6e, 0xe0, 0xec, 0x85, 0xbc, 0xf0, 0x59, 0x58, 0x89, 0xa7, 0xb5, 0x76, 0xc2, 0xaf, 0x4b, 0x0e,
+	0x85, 0x7b, 0xe8, 0xec, 0x98, 0x8c, 0x38, 0xa3, 0x29, 0x6f, 0x59, 0x1d, 0xeb, 0xe8, 0xdf, 0xe4,
+	0xbf, 0x39, 0xbc, 0xa0, 0x29, 0x3f, 0x7e, 0xb7, 0x9c, 0xd6, 0x86, 0xc3, 0x54, 0x2f, 0xef, 0x3e,
+	0x5b, 0xce, 0xee, 0x4f, 0x09, 0xee, 0x08, 0x6d, 0xbb, 0x37, 0xfa, 0x65, 0xb3, 0xf6, 0xa0, 0x51,
+	0x5e, 0x97, 0x82, 0x36, 0xc4, 0xdd, 0xb3, 0xbb, 0xd7, 0xb7, 0x07, 0xfb, 0xd4, 0x1d, 0x54, 0xed,
+	0xdd, 0x7c, 0xb9, 0xda, 0x68, 0x5e, 0x42, 0x21, 0x53, 0xae, 0x00, 0xf7, 0x31, 0xfd, 0xae, 0x04,
+	0xdc, 0xbf, 0x0d, 0xee, 0x6d, 0xa7, 0x37, 0x97, 0xe9, 0xd6, 0xc5, 0x83, 0x83, 0xa6, 0x3a, 0xc6,
+	0x55, 0xe9, 0x63, 0xeb, 0xf2, 0x7c, 0x6d, 0x21, 0xe4, 0x82, 0x66, 0x02, 0x49, 0x25, 0xb0, 0xe0,
+	0xd9, 0xea, 0x49, 0xcc, 0x0b, 0xe7, 0x09, 0x34, 0x7f, 0xab, 0xa1, 0x01, 0x8f, 0xf6, 0x9f, 0xd0,
+	0xf7, 0x9f, 0xec, 0x4e, 0xa8, 0x0d, 0x7d, 0x06, 0x48, 0xc3, 0x0a, 0xcd, 0x3c, 0xb4, 0x0e, 0x86,
+	0x17, 0x43, 0x89, 0x7c, 0x06, 0x51, 0x4d, 0x89, 0x66, 0x5e, 0x64, 0x28, 0x1f, 0x76, 0x4f, 0x9f,
+	0x13, 0xe2, 0x33, 0x20, 0xa4, 0x26, 0x11, 0x32, 0xf3, 0x08, 0x31, 0xb4, 0xab, 0xbf, 0xab, 0x3d,
+	0x4f, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0xae, 0xdf, 0xb6, 0xd4, 0xfd, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _AdGroupSimulationService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_group_simulation_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_group_simulation_service.proto", fileDescriptor_ad_group_simulation_service_6eeb2b02d2d7da9e)
-}
-
-var fileDescriptor_ad_group_simulation_service_6eeb2b02d2d7da9e = []byte{
-	// 367 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcd, 0x4a, 0xeb, 0x40,
-	0x14, 0x26, 0xb9, 0x70, 0xe1, 0x86, 0xeb, 0x26, 0xb8, 0x28, 0x55, 0xa1, 0xd4, 0x2e, 0xa4, 0x8b,
-	0x19, 0xa2, 0xc5, 0xc5, 0xd4, 0x2e, 0x92, 0x4d, 0x5c, 0x49, 0x69, 0xa1, 0x0b, 0x09, 0x84, 0xb1,
-	0x33, 0x0c, 0x81, 0x26, 0x13, 0xe7, 0x24, 0xdd, 0x88, 0x1b, 0xf1, 0x0d, 0x7c, 0x03, 0x97, 0xbe,
-	0x89, 0x6e, 0x7d, 0x05, 0x71, 0xe1, 0x53, 0x48, 0x3a, 0x9d, 0x80, 0xd6, 0xd8, 0xdd, 0xc7, 0x9c,
-	0xef, 0xe7, 0xcc, 0x37, 0xe3, 0x04, 0x42, 0x4a, 0xb1, 0xe0, 0x98, 0x32, 0xc0, 0x1a, 0x56, 0x68,
-	0xe9, 0x61, 0xe0, 0x6a, 0x99, 0xcc, 0x39, 0x60, 0xca, 0x62, 0xa1, 0x64, 0x99, 0xc7, 0x90, 0xa4,
-	0xe5, 0x82, 0x16, 0x89, 0xcc, 0xe2, 0xf5, 0x10, 0xe5, 0x4a, 0x16, 0xd2, 0xed, 0x68, 0x21, 0xa2,
-	0x0c, 0x50, 0xed, 0x81, 0x96, 0x1e, 0x32, 0x1e, 0xed, 0x61, 0x53, 0x8a, 0xe2, 0x20, 0x4b, 0xd5,
-	0x10, 0xa3, 0xed, 0xdb, 0xfb, 0x46, 0x9c, 0x27, 0x98, 0x66, 0x99, 0x2c, 0x56, 0x43, 0xd0, 0xd3,
-	0x6e, 0xe0, 0xec, 0x85, 0xbc, 0xf0, 0x59, 0x58, 0x89, 0xa7, 0xb5, 0x76, 0xc2, 0xaf, 0x4b, 0x0e,
-	0x85, 0x7b, 0xe8, 0xec, 0x98, 0x8c, 0x38, 0xa3, 0x29, 0x6f, 0x59, 0x1d, 0xeb, 0xe8, 0xdf, 0xe4,
-	0xbf, 0x39, 0xbc, 0xa0, 0x29, 0x3f, 0x7e, 0xb7, 0x9c, 0xd6, 0x86, 0xc3, 0x54, 0x2f, 0xef, 0x3e,
-	0x5b, 0xce, 0xee, 0x4f, 0x09, 0xee, 0x08, 0x6d, 0xbb, 0x37, 0xfa, 0x65, 0xb3, 0xf6, 0xa0, 0x51,
-	0x5e, 0x97, 0x82, 0x36, 0xc4, 0xdd, 0xb3, 0xbb, 0xd7, 0xb7, 0x07, 0xfb, 0xd4, 0x1d, 0x54, 0xed,
-	0xdd, 0x7c, 0xb9, 0xda, 0x68, 0x5e, 0x42, 0x21, 0x53, 0xae, 0x00, 0xf7, 0x31, 0xfd, 0xae, 0x04,
-	0xdc, 0xbf, 0x0d, 0xee, 0x6d, 0xa7, 0x37, 0x97, 0xe9, 0xd6, 0xc5, 0x83, 0x83, 0xa6, 0x3a, 0xc6,
-	0x55, 0xe9, 0x63, 0xeb, 0xf2, 0x7c, 0x6d, 0x21, 0xe4, 0x82, 0x66, 0x02, 0x49, 0x25, 0xb0, 0xe0,
-	0xd9, 0xea, 0x49, 0xcc, 0x0b, 0xe7, 0x09, 0x34, 0x7f, 0xab, 0xa1, 0x01, 0x8f, 0xf6, 0x9f, 0xd0,
-	0xf7, 0x9f, 0xec, 0x4e, 0xa8, 0x0d, 0x7d, 0x06, 0x48, 0xc3, 0x0a, 0xcd, 0x3c, 0xb4, 0x0e, 0x86,
-	0x17, 0x43, 0x89, 0x7c, 0x06, 0x51, 0x4d, 0x89, 0x66, 0x5e, 0x64, 0x28, 0x1f, 0x76, 0x4f, 0x9f,
-	0x13, 0xe2, 0x33, 0x20, 0xa4, 0x26, 0x11, 0x32, 0xf3, 0x08, 0x31, 0xb4, 0xab, 0xbf, 0xab, 0x3d,
-	0x4f, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0xae, 0xdf, 0xb6, 0xd4, 0xfd, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_parameter_service.pb.go b/googleapis/ads/googleads/v1/services/ad_parameter_service.pb.go
index 0330a4dc92..57c42c8d33 100644
--- a/googleapis/ads/googleads/v1/services/ad_parameter_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_parameter_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_parameter_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdParameterService.GetAdParameter][google.ads.googleads.v1.services.AdParameterService.GetAdParameter]
 type GetAdParameterRequest struct {
@@ -41,16 +41,17 @@ func (m *GetAdParameterRequest) Reset()         { *m = GetAdParameterRequest{} }
 func (m *GetAdParameterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdParameterRequest) ProtoMessage()    {}
 func (*GetAdParameterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_service_06b4e4938dc4aa57, []int{0}
+	return fileDescriptor_c000ad2760c78756, []int{0}
 }
+
 func (m *GetAdParameterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdParameterRequest.Unmarshal(m, b)
 }
 func (m *GetAdParameterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdParameterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdParameterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdParameterRequest.Merge(dst, src)
+func (m *GetAdParameterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdParameterRequest.Merge(m, src)
 }
 func (m *GetAdParameterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdParameterRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateAdParametersRequest) Reset()         { *m = MutateAdParametersReq
 func (m *MutateAdParametersRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAdParametersRequest) ProtoMessage()    {}
 func (*MutateAdParametersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_service_06b4e4938dc4aa57, []int{1}
+	return fileDescriptor_c000ad2760c78756, []int{1}
 }
+
 func (m *MutateAdParametersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdParametersRequest.Unmarshal(m, b)
 }
 func (m *MutateAdParametersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdParametersRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdParametersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdParametersRequest.Merge(dst, src)
+func (m *MutateAdParametersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdParametersRequest.Merge(m, src)
 }
 func (m *MutateAdParametersRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAdParametersRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *AdParameterOperation) Reset()         { *m = AdParameterOperation{} }
 func (m *AdParameterOperation) String() string { return proto.CompactTextString(m) }
 func (*AdParameterOperation) ProtoMessage()    {}
 func (*AdParameterOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_service_06b4e4938dc4aa57, []int{2}
+	return fileDescriptor_c000ad2760c78756, []int{2}
 }
+
 func (m *AdParameterOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdParameterOperation.Unmarshal(m, b)
 }
 func (m *AdParameterOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdParameterOperation.Marshal(b, m, deterministic)
 }
-func (dst *AdParameterOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdParameterOperation.Merge(dst, src)
+func (m *AdParameterOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdParameterOperation.Merge(m, src)
 }
 func (m *AdParameterOperation) XXX_Size() int {
 	return xxx_messageInfo_AdParameterOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *AdParameterOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AdParameterOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AdParameterOperation_OneofMarshaler, _AdParameterOperation_OneofUnmarshaler, _AdParameterOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AdParameterOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AdParameterOperation_Create)(nil),
 		(*AdParameterOperation_Update)(nil),
 		(*AdParameterOperation_Remove)(nil),
 	}
 }
 
-func _AdParameterOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AdParameterOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdParameterOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *AdParameterOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *AdParameterOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("AdParameterOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AdParameterOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AdParameterOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdParameter)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdParameterOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.AdParameter)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AdParameterOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &AdParameterOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AdParameterOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AdParameterOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AdParameterOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdParameterOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AdParameterOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an ad parameter mutate.
 type MutateAdParametersResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateAdParametersResponse) Reset()         { *m = MutateAdParametersRe
 func (m *MutateAdParametersResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAdParametersResponse) ProtoMessage()    {}
 func (*MutateAdParametersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_service_06b4e4938dc4aa57, []int{3}
+	return fileDescriptor_c000ad2760c78756, []int{3}
 }
+
 func (m *MutateAdParametersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdParametersResponse.Unmarshal(m, b)
 }
 func (m *MutateAdParametersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdParametersResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdParametersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdParametersResponse.Merge(dst, src)
+func (m *MutateAdParametersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdParametersResponse.Merge(m, src)
 }
 func (m *MutateAdParametersResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAdParametersResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateAdParameterResult) Reset()         { *m = MutateAdParameterResult
 func (m *MutateAdParameterResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAdParameterResult) ProtoMessage()    {}
 func (*MutateAdParameterResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_parameter_service_06b4e4938dc4aa57, []int{4}
+	return fileDescriptor_c000ad2760c78756, []int{4}
 }
+
 func (m *MutateAdParameterResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAdParameterResult.Unmarshal(m, b)
 }
 func (m *MutateAdParameterResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAdParameterResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAdParameterResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAdParameterResult.Merge(dst, src)
+func (m *MutateAdParameterResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAdParameterResult.Merge(m, src)
 }
 func (m *MutateAdParameterResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAdParameterResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateAdParameterResult)(nil), "google.ads.googleads.v1.services.MutateAdParameterResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_parameter_service.proto", fileDescriptor_c000ad2760c78756)
+}
+
+var fileDescriptor_c000ad2760c78756 = []byte{
+	// 710 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x6b, 0xd4, 0x4e,
+	0x18, 0xfe, 0x25, 0xfb, 0xa3, 0xda, 0x49, 0xad, 0x30, 0x5a, 0xba, 0x2e, 0xa2, 0x4b, 0x2c, 0x58,
+	0xf6, 0x30, 0x71, 0x57, 0xa9, 0x98, 0x6d, 0x85, 0x2d, 0xd8, 0xd6, 0x43, 0x6d, 0x49, 0x61, 0x0f,
+	0xb2, 0x10, 0xa6, 0x9b, 0xe9, 0x12, 0x9a, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0xfc, 0x00,
+	0x5e, 0xbc, 0x78, 0xf6, 0xe8, 0xcd, 0xa3, 0x5f, 0x41, 0xf0, 0xe4, 0x37, 0x10, 0x4f, 0x7e, 0x08,
+	0x91, 0xc9, 0x64, 0xd6, 0x6c, 0xdb, 0x65, 0x75, 0x6f, 0x6f, 0xde, 0x79, 0x9e, 0x67, 0xde, 0xbf,
+	0x13, 0xd0, 0x1e, 0x50, 0x3a, 0x88, 0x88, 0x83, 0x03, 0xee, 0x28, 0x53, 0x5a, 0xc3, 0xa6, 0xc3,
+	0x09, 0x1b, 0x86, 0x7d, 0xc2, 0x1d, 0x1c, 0xf8, 0x29, 0x66, 0x38, 0x26, 0x82, 0x30, 0xbf, 0xf0,
+	0xa2, 0x94, 0x51, 0x41, 0x61, 0x5d, 0x31, 0x10, 0x0e, 0x38, 0x1a, 0x91, 0xd1, 0xb0, 0x89, 0x34,
+	0xb9, 0xf6, 0x68, 0x92, 0x3c, 0x23, 0x9c, 0x66, 0xec, 0xbc, 0xbe, 0xd2, 0xad, 0xdd, 0xd6, 0xac,
+	0x34, 0x74, 0x70, 0x92, 0x50, 0x81, 0x45, 0x48, 0x13, 0x5e, 0x9c, 0x16, 0xb7, 0x3a, 0xf9, 0xd7,
+	0x61, 0x76, 0xe4, 0x1c, 0x85, 0x24, 0x0a, 0xfc, 0x18, 0xf3, 0xe3, 0x02, 0x71, 0xe7, 0x3c, 0xe2,
+	0x35, 0xc3, 0x69, 0x4a, 0x98, 0x56, 0x58, 0x2e, 0xce, 0x59, 0xda, 0x77, 0xb8, 0xc0, 0x22, 0x2b,
+	0x0e, 0xec, 0x75, 0xb0, 0xb4, 0x4d, 0x44, 0x27, 0xd8, 0xd7, 0x01, 0x79, 0xe4, 0x55, 0x46, 0xb8,
+	0x80, 0xf7, 0xc0, 0x35, 0x1d, 0xb1, 0x9f, 0xe0, 0x98, 0x54, 0x8d, 0xba, 0xb1, 0x3a, 0xef, 0x2d,
+	0x68, 0xe7, 0x0b, 0x1c, 0x13, 0xfb, 0xbb, 0x01, 0x6e, 0xed, 0x66, 0x02, 0x0b, 0x52, 0x52, 0xe0,
+	0x5a, 0xe2, 0x2e, 0xb0, 0xfa, 0x19, 0x17, 0x34, 0x26, 0xcc, 0x0f, 0x83, 0x42, 0x00, 0x68, 0xd7,
+	0xf3, 0x00, 0x76, 0x01, 0xa0, 0x29, 0x61, 0x2a, 0xd7, 0xaa, 0x59, 0xaf, 0xac, 0x5a, 0xad, 0x35,
+	0x34, 0xad, 0xc4, 0xa8, 0x74, 0xd7, 0x9e, 0xa6, 0x7b, 0x25, 0x25, 0x78, 0x1f, 0x5c, 0x4f, 0x31,
+	0x13, 0x21, 0x8e, 0xfc, 0x23, 0x1c, 0x46, 0x19, 0x23, 0xd5, 0x4a, 0xdd, 0x58, 0xbd, 0xea, 0x2d,
+	0x16, 0xee, 0x2d, 0xe5, 0x95, 0x49, 0x0e, 0x71, 0x14, 0x06, 0x58, 0x10, 0x9f, 0x26, 0xd1, 0x49,
+	0xf5, 0xff, 0x1c, 0xb6, 0xa0, 0x9d, 0x7b, 0x49, 0x74, 0x62, 0xbf, 0x35, 0xc1, 0xcd, 0xcb, 0xae,
+	0x84, 0x6d, 0x60, 0x65, 0x69, 0xce, 0x95, 0x9d, 0xc8, 0xb9, 0x56, 0xab, 0xa6, 0xe3, 0xd7, 0xad,
+	0x40, 0x5b, 0xb2, 0x59, 0xbb, 0x98, 0x1f, 0x7b, 0x40, 0xc1, 0xa5, 0x0d, 0x77, 0xc0, 0x5c, 0x9f,
+	0x11, 0x2c, 0x54, 0x61, 0xad, 0x16, 0x9a, 0x98, 0xf7, 0x68, 0x70, 0xca, 0x89, 0xef, 0xfc, 0xe7,
+	0x15, 0x7c, 0xa9, 0xa4, 0x74, 0xab, 0xe6, 0xac, 0x4a, 0x8a, 0x0f, 0xab, 0x60, 0x8e, 0x91, 0x98,
+	0x0e, 0x55, 0xb9, 0xe6, 0xe5, 0x89, 0xfa, 0xde, 0xb4, 0xc0, 0xfc, 0xa8, 0xbe, 0xf6, 0x67, 0x03,
+	0xd4, 0x2e, 0xeb, 0x3a, 0x4f, 0x69, 0xc2, 0x09, 0xdc, 0x02, 0x4b, 0xe7, 0xaa, 0xef, 0x13, 0xc6,
+	0x28, 0xcb, 0x45, 0xad, 0x16, 0xd4, 0xe1, 0xb1, 0xb4, 0x8f, 0x0e, 0xf2, 0x59, 0xf4, 0x6e, 0x8c,
+	0xf7, 0xe5, 0x99, 0x84, 0xc3, 0x03, 0x70, 0x85, 0x11, 0x9e, 0x45, 0x42, 0x8f, 0xc6, 0x93, 0xe9,
+	0xa3, 0x71, 0x21, 0x2c, 0x2f, 0x57, 0xf0, 0xb4, 0x92, 0xfd, 0x14, 0x2c, 0x4f, 0xc0, 0xfc, 0xd5,
+	0xc4, 0xb7, 0xde, 0x57, 0x00, 0x2c, 0x51, 0x0f, 0xd4, 0xc5, 0xf0, 0x93, 0x01, 0x16, 0xc7, 0xf7,
+	0x08, 0x3e, 0x9e, 0x1e, 0xed, 0xa5, 0x9b, 0x57, 0xfb, 0xc7, 0xfe, 0xd9, 0x6b, 0x6f, 0xbe, 0xfd,
+	0x78, 0x67, 0x3e, 0x80, 0x48, 0xbe, 0x32, 0xa7, 0x63, 0x29, 0x6c, 0xe8, 0x65, 0xe3, 0x4e, 0xc3,
+	0xc1, 0xa5, 0x66, 0x39, 0x8d, 0x33, 0xf8, 0xd5, 0x00, 0xf0, 0x62, 0x1b, 0x61, 0x7b, 0x86, 0x2a,
+	0xeb, 0x95, 0xaf, 0xad, 0xcf, 0x46, 0x56, 0x93, 0x63, 0xaf, 0xe7, 0x99, 0xac, 0xd9, 0x4d, 0x99,
+	0xc9, 0x9f, 0xd0, 0x4f, 0x4b, 0xaf, 0xc8, 0x46, 0xe3, 0x6c, 0x2c, 0x11, 0x37, 0xce, 0xe5, 0x5c,
+	0xa3, 0xb1, 0xf9, 0xcb, 0x00, 0x2b, 0x7d, 0x1a, 0x4f, 0x8d, 0x60, 0x73, 0xf9, 0x62, 0x03, 0xf7,
+	0xe5, 0xb2, 0xee, 0x1b, 0x2f, 0x77, 0x0a, 0xf2, 0x80, 0x46, 0x38, 0x19, 0x20, 0xca, 0x06, 0xce,
+	0x80, 0x24, 0xf9, 0x2a, 0xeb, 0xd7, 0x3c, 0x0d, 0xf9, 0xe4, 0x7f, 0x47, 0x5b, 0x1b, 0x1f, 0xcc,
+	0xca, 0x76, 0xa7, 0xf3, 0xd1, 0xac, 0x6f, 0x2b, 0xc1, 0x4e, 0xc0, 0x91, 0x32, 0xa5, 0xd5, 0x6d,
+	0xa2, 0xe2, 0x62, 0xfe, 0x45, 0x43, 0x7a, 0x9d, 0x80, 0xf7, 0x46, 0x90, 0x5e, 0xb7, 0xd9, 0xd3,
+	0x90, 0x9f, 0xe6, 0x8a, 0xf2, 0xbb, 0x6e, 0x27, 0xe0, 0xae, 0x3b, 0x02, 0xb9, 0x6e, 0xb7, 0xe9,
+	0xba, 0x1a, 0x76, 0x38, 0x97, 0xc7, 0xf9, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x33, 0xf9,
+	0x55, 0x2d, 0xe2, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,56 +513,3 @@ var _AdParameterService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_parameter_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_parameter_service.proto", fileDescriptor_ad_parameter_service_06b4e4938dc4aa57)
-}
-
-var fileDescriptor_ad_parameter_service_06b4e4938dc4aa57 = []byte{
-	// 710 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x6b, 0xd4, 0x4e,
-	0x18, 0xfe, 0x25, 0xfb, 0xa3, 0xda, 0x49, 0xad, 0x30, 0x5a, 0xba, 0x2e, 0xa2, 0x4b, 0x2c, 0x58,
-	0xf6, 0x30, 0x71, 0x57, 0xa9, 0x98, 0x6d, 0x85, 0x2d, 0xd8, 0xd6, 0x43, 0x6d, 0x49, 0x61, 0x0f,
-	0xb2, 0x10, 0xa6, 0x9b, 0xe9, 0x12, 0x9a, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0xfc, 0x00,
-	0x5e, 0xbc, 0x78, 0xf6, 0xe8, 0xcd, 0xa3, 0x5f, 0x41, 0xf0, 0xe4, 0x37, 0x10, 0x4f, 0x7e, 0x08,
-	0x91, 0xc9, 0x64, 0xd6, 0x6c, 0xdb, 0x65, 0x75, 0x6f, 0x6f, 0xde, 0x79, 0x9e, 0x67, 0xde, 0xbf,
-	0x13, 0xd0, 0x1e, 0x50, 0x3a, 0x88, 0x88, 0x83, 0x03, 0xee, 0x28, 0x53, 0x5a, 0xc3, 0xa6, 0xc3,
-	0x09, 0x1b, 0x86, 0x7d, 0xc2, 0x1d, 0x1c, 0xf8, 0x29, 0x66, 0x38, 0x26, 0x82, 0x30, 0xbf, 0xf0,
-	0xa2, 0x94, 0x51, 0x41, 0x61, 0x5d, 0x31, 0x10, 0x0e, 0x38, 0x1a, 0x91, 0xd1, 0xb0, 0x89, 0x34,
-	0xb9, 0xf6, 0x68, 0x92, 0x3c, 0x23, 0x9c, 0x66, 0xec, 0xbc, 0xbe, 0xd2, 0xad, 0xdd, 0xd6, 0xac,
-	0x34, 0x74, 0x70, 0x92, 0x50, 0x81, 0x45, 0x48, 0x13, 0x5e, 0x9c, 0x16, 0xb7, 0x3a, 0xf9, 0xd7,
-	0x61, 0x76, 0xe4, 0x1c, 0x85, 0x24, 0x0a, 0xfc, 0x18, 0xf3, 0xe3, 0x02, 0x71, 0xe7, 0x3c, 0xe2,
-	0x35, 0xc3, 0x69, 0x4a, 0x98, 0x56, 0x58, 0x2e, 0xce, 0x59, 0xda, 0x77, 0xb8, 0xc0, 0x22, 0x2b,
-	0x0e, 0xec, 0x75, 0xb0, 0xb4, 0x4d, 0x44, 0x27, 0xd8, 0xd7, 0x01, 0x79, 0xe4, 0x55, 0x46, 0xb8,
-	0x80, 0xf7, 0xc0, 0x35, 0x1d, 0xb1, 0x9f, 0xe0, 0x98, 0x54, 0x8d, 0xba, 0xb1, 0x3a, 0xef, 0x2d,
-	0x68, 0xe7, 0x0b, 0x1c, 0x13, 0xfb, 0xbb, 0x01, 0x6e, 0xed, 0x66, 0x02, 0x0b, 0x52, 0x52, 0xe0,
-	0x5a, 0xe2, 0x2e, 0xb0, 0xfa, 0x19, 0x17, 0x34, 0x26, 0xcc, 0x0f, 0x83, 0x42, 0x00, 0x68, 0xd7,
-	0xf3, 0x00, 0x76, 0x01, 0xa0, 0x29, 0x61, 0x2a, 0xd7, 0xaa, 0x59, 0xaf, 0xac, 0x5a, 0xad, 0x35,
-	0x34, 0xad, 0xc4, 0xa8, 0x74, 0xd7, 0x9e, 0xa6, 0x7b, 0x25, 0x25, 0x78, 0x1f, 0x5c, 0x4f, 0x31,
-	0x13, 0x21, 0x8e, 0xfc, 0x23, 0x1c, 0x46, 0x19, 0x23, 0xd5, 0x4a, 0xdd, 0x58, 0xbd, 0xea, 0x2d,
-	0x16, 0xee, 0x2d, 0xe5, 0x95, 0x49, 0x0e, 0x71, 0x14, 0x06, 0x58, 0x10, 0x9f, 0x26, 0xd1, 0x49,
-	0xf5, 0xff, 0x1c, 0xb6, 0xa0, 0x9d, 0x7b, 0x49, 0x74, 0x62, 0xbf, 0x35, 0xc1, 0xcd, 0xcb, 0xae,
-	0x84, 0x6d, 0x60, 0x65, 0x69, 0xce, 0x95, 0x9d, 0xc8, 0xb9, 0x56, 0xab, 0xa6, 0xe3, 0xd7, 0xad,
-	0x40, 0x5b, 0xb2, 0x59, 0xbb, 0x98, 0x1f, 0x7b, 0x40, 0xc1, 0xa5, 0x0d, 0x77, 0xc0, 0x5c, 0x9f,
-	0x11, 0x2c, 0x54, 0x61, 0xad, 0x16, 0x9a, 0x98, 0xf7, 0x68, 0x70, 0xca, 0x89, 0xef, 0xfc, 0xe7,
-	0x15, 0x7c, 0xa9, 0xa4, 0x74, 0xab, 0xe6, 0xac, 0x4a, 0x8a, 0x0f, 0xab, 0x60, 0x8e, 0x91, 0x98,
-	0x0e, 0x55, 0xb9, 0xe6, 0xe5, 0x89, 0xfa, 0xde, 0xb4, 0xc0, 0xfc, 0xa8, 0xbe, 0xf6, 0x67, 0x03,
-	0xd4, 0x2e, 0xeb, 0x3a, 0x4f, 0x69, 0xc2, 0x09, 0xdc, 0x02, 0x4b, 0xe7, 0xaa, 0xef, 0x13, 0xc6,
-	0x28, 0xcb, 0x45, 0xad, 0x16, 0xd4, 0xe1, 0xb1, 0xb4, 0x8f, 0x0e, 0xf2, 0x59, 0xf4, 0x6e, 0x8c,
-	0xf7, 0xe5, 0x99, 0x84, 0xc3, 0x03, 0x70, 0x85, 0x11, 0x9e, 0x45, 0x42, 0x8f, 0xc6, 0x93, 0xe9,
-	0xa3, 0x71, 0x21, 0x2c, 0x2f, 0x57, 0xf0, 0xb4, 0x92, 0xfd, 0x14, 0x2c, 0x4f, 0xc0, 0xfc, 0xd5,
-	0xc4, 0xb7, 0xde, 0x57, 0x00, 0x2c, 0x51, 0x0f, 0xd4, 0xc5, 0xf0, 0x93, 0x01, 0x16, 0xc7, 0xf7,
-	0x08, 0x3e, 0x9e, 0x1e, 0xed, 0xa5, 0x9b, 0x57, 0xfb, 0xc7, 0xfe, 0xd9, 0x6b, 0x6f, 0xbe, 0xfd,
-	0x78, 0x67, 0x3e, 0x80, 0x48, 0xbe, 0x32, 0xa7, 0x63, 0x29, 0x6c, 0xe8, 0x65, 0xe3, 0x4e, 0xc3,
-	0xc1, 0xa5, 0x66, 0x39, 0x8d, 0x33, 0xf8, 0xd5, 0x00, 0xf0, 0x62, 0x1b, 0x61, 0x7b, 0x86, 0x2a,
-	0xeb, 0x95, 0xaf, 0xad, 0xcf, 0x46, 0x56, 0x93, 0x63, 0xaf, 0xe7, 0x99, 0xac, 0xd9, 0x4d, 0x99,
-	0xc9, 0x9f, 0xd0, 0x4f, 0x4b, 0xaf, 0xc8, 0x46, 0xe3, 0x6c, 0x2c, 0x11, 0x37, 0xce, 0xe5, 0x5c,
-	0xa3, 0xb1, 0xf9, 0xcb, 0x00, 0x2b, 0x7d, 0x1a, 0x4f, 0x8d, 0x60, 0x73, 0xf9, 0x62, 0x03, 0xf7,
-	0xe5, 0xb2, 0xee, 0x1b, 0x2f, 0x77, 0x0a, 0xf2, 0x80, 0x46, 0x38, 0x19, 0x20, 0xca, 0x06, 0xce,
-	0x80, 0x24, 0xf9, 0x2a, 0xeb, 0xd7, 0x3c, 0x0d, 0xf9, 0xe4, 0x7f, 0x47, 0x5b, 0x1b, 0x1f, 0xcc,
-	0xca, 0x76, 0xa7, 0xf3, 0xd1, 0xac, 0x6f, 0x2b, 0xc1, 0x4e, 0xc0, 0x91, 0x32, 0xa5, 0xd5, 0x6d,
-	0xa2, 0xe2, 0x62, 0xfe, 0x45, 0x43, 0x7a, 0x9d, 0x80, 0xf7, 0x46, 0x90, 0x5e, 0xb7, 0xd9, 0xd3,
-	0x90, 0x9f, 0xe6, 0x8a, 0xf2, 0xbb, 0x6e, 0x27, 0xe0, 0xae, 0x3b, 0x02, 0xb9, 0x6e, 0xb7, 0xe9,
-	0xba, 0x1a, 0x76, 0x38, 0x97, 0xc7, 0xf9, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x33, 0xf9,
-	0x55, 0x2d, 0xe2, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/ad_schedule_view_service.pb.go b/googleapis/ads/googleads/v1/services/ad_schedule_view_service.pb.go
index a84bbc40b1..51c1123b93 100644
--- a/googleapis/ads/googleads/v1/services/ad_schedule_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/ad_schedule_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/ad_schedule_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AdScheduleViewService.GetAdScheduleView][google.ads.googleads.v1.services.AdScheduleViewService.GetAdScheduleView].
 type GetAdScheduleViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetAdScheduleViewRequest) Reset()         { *m = GetAdScheduleViewReque
 func (m *GetAdScheduleViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAdScheduleViewRequest) ProtoMessage()    {}
 func (*GetAdScheduleViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad_schedule_view_service_e3a15fb179c0103d, []int{0}
+	return fileDescriptor_b6e0ec29d39ff4cc, []int{0}
 }
+
 func (m *GetAdScheduleViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAdScheduleViewRequest.Unmarshal(m, b)
 }
 func (m *GetAdScheduleViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAdScheduleViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAdScheduleViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAdScheduleViewRequest.Merge(dst, src)
+func (m *GetAdScheduleViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAdScheduleViewRequest.Merge(m, src)
 }
 func (m *GetAdScheduleViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAdScheduleViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetAdScheduleViewRequest)(nil), "google.ads.googleads.v1.services.GetAdScheduleViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/ad_schedule_view_service.proto", fileDescriptor_b6e0ec29d39ff4cc)
+}
+
+var fileDescriptor_b6e0ec29d39ff4cc = []byte{
+	// 366 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4a, 0xc3, 0x40,
+	0x1c, 0xc7, 0x49, 0x04, 0xc1, 0xa0, 0x83, 0x01, 0xa1, 0x04, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
+	0x62, 0x17, 0x3d, 0x91, 0x92, 0x2e, 0x75, 0x92, 0xd2, 0x42, 0x06, 0x09, 0x84, 0x33, 0x77, 0xc4,
+	0x40, 0x93, 0xab, 0xf9, 0x25, 0xe9, 0x20, 0x0e, 0xfa, 0x0a, 0xbe, 0x81, 0xa3, 0xef, 0xe0, 0x0b,
+	0xb8, 0x3a, 0xf8, 0x02, 0x4e, 0x3e, 0x85, 0xa4, 0x97, 0x0b, 0x04, 0x1b, 0xba, 0x7d, 0xb9, 0xdf,
+	0xf7, 0xf3, 0xfd, 0xfd, 0x49, 0x8c, 0x51, 0x28, 0x44, 0xb8, 0xe0, 0x98, 0x32, 0xc0, 0x52, 0x96,
+	0xaa, 0xb0, 0x31, 0xf0, 0xb4, 0x88, 0x02, 0x0e, 0x98, 0x32, 0x1f, 0x82, 0x7b, 0xce, 0xf2, 0x05,
+	0xf7, 0x8b, 0x88, 0xaf, 0xfc, 0xaa, 0x82, 0x96, 0xa9, 0xc8, 0x84, 0xd9, 0x95, 0x14, 0xa2, 0x0c,
+	0x50, 0x1d, 0x80, 0x0a, 0x1b, 0xa9, 0x00, 0xeb, 0xbc, 0xad, 0x45, 0xca, 0x41, 0xe4, 0xe9, 0xa6,
+	0x1e, 0x32, 0xdb, 0x3a, 0x56, 0xe4, 0x32, 0xc2, 0x34, 0x49, 0x44, 0x46, 0xb3, 0x48, 0x24, 0x20,
+	0xab, 0xbd, 0x91, 0xd1, 0x99, 0xf0, 0xcc, 0x61, 0xf3, 0x8a, 0x74, 0x23, 0xbe, 0x9a, 0xf1, 0x87,
+	0x9c, 0x43, 0x66, 0x9e, 0x18, 0x07, 0x2a, 0xdd, 0x4f, 0x68, 0xcc, 0x3b, 0x5a, 0x57, 0x3b, 0xdd,
+	0x9b, 0xed, 0xab, 0xc7, 0x1b, 0x1a, 0xf3, 0xb3, 0x6f, 0xcd, 0x38, 0x6a, 0xe2, 0x73, 0x39, 0xb3,
+	0xf9, 0xa1, 0x19, 0x87, 0xff, 0xb2, 0x4d, 0x82, 0xb6, 0xed, 0x8a, 0xda, 0x06, 0xb2, 0xec, 0x56,
+	0xb6, 0xbe, 0x02, 0x6a, 0x92, 0xbd, 0x8b, 0x97, 0xaf, 0x9f, 0x57, 0x7d, 0x68, 0xda, 0xe5, 0xad,
+	0x1e, 0x1b, 0xeb, 0x5c, 0x05, 0x39, 0x64, 0x22, 0xe6, 0x29, 0xe0, 0x01, 0xa6, 0x0d, 0x0c, 0xf0,
+	0xe0, 0x69, 0xfc, 0xac, 0x1b, 0xfd, 0x40, 0xc4, 0x5b, 0xe7, 0x1d, 0x5b, 0x1b, 0xf7, 0x9f, 0x96,
+	0xf7, 0x9d, 0x6a, 0xb7, 0xd7, 0x15, 0x1f, 0x8a, 0x05, 0x4d, 0x42, 0x24, 0xd2, 0x10, 0x87, 0x3c,
+	0x59, 0x5f, 0x5f, 0x7d, 0xc9, 0x65, 0x04, 0xed, 0xff, 0xce, 0xa5, 0x12, 0x6f, 0xfa, 0xce, 0xc4,
+	0x71, 0xde, 0xf5, 0xee, 0x44, 0x06, 0x3a, 0x0c, 0x90, 0x94, 0xa5, 0x72, 0x6d, 0x54, 0x35, 0x86,
+	0x4f, 0x65, 0xf1, 0x1c, 0x06, 0x5e, 0x6d, 0xf1, 0x5c, 0xdb, 0x53, 0x96, 0x5f, 0xbd, 0x2f, 0xdf,
+	0x09, 0x71, 0x18, 0x10, 0x52, 0x9b, 0x08, 0x71, 0x6d, 0x42, 0x94, 0xed, 0x6e, 0x77, 0x3d, 0xe7,
+	0xf0, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x00, 0x12, 0xd8, 0xe2, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _AdScheduleViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/ad_schedule_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/ad_schedule_view_service.proto", fileDescriptor_ad_schedule_view_service_e3a15fb179c0103d)
-}
-
-var fileDescriptor_ad_schedule_view_service_e3a15fb179c0103d = []byte{
-	// 366 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4a, 0xc3, 0x40,
-	0x1c, 0xc7, 0x49, 0x04, 0xc1, 0xa0, 0x83, 0x01, 0xa1, 0x04, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
-	0x62, 0x17, 0x3d, 0x91, 0x92, 0x2e, 0x75, 0x92, 0xd2, 0x42, 0x06, 0x09, 0x84, 0x33, 0x77, 0xc4,
-	0x40, 0x93, 0xab, 0xf9, 0x25, 0xe9, 0x20, 0x0e, 0xfa, 0x0a, 0xbe, 0x81, 0xa3, 0xef, 0xe0, 0x0b,
-	0xb8, 0x3a, 0xf8, 0x02, 0x4e, 0x3e, 0x85, 0xa4, 0x97, 0x0b, 0x04, 0x1b, 0xba, 0x7d, 0xb9, 0xdf,
-	0xf7, 0xf3, 0xfd, 0xfd, 0x49, 0x8c, 0x51, 0x28, 0x44, 0xb8, 0xe0, 0x98, 0x32, 0xc0, 0x52, 0x96,
-	0xaa, 0xb0, 0x31, 0xf0, 0xb4, 0x88, 0x02, 0x0e, 0x98, 0x32, 0x1f, 0x82, 0x7b, 0xce, 0xf2, 0x05,
-	0xf7, 0x8b, 0x88, 0xaf, 0xfc, 0xaa, 0x82, 0x96, 0xa9, 0xc8, 0x84, 0xd9, 0x95, 0x14, 0xa2, 0x0c,
-	0x50, 0x1d, 0x80, 0x0a, 0x1b, 0xa9, 0x00, 0xeb, 0xbc, 0xad, 0x45, 0xca, 0x41, 0xe4, 0xe9, 0xa6,
-	0x1e, 0x32, 0xdb, 0x3a, 0x56, 0xe4, 0x32, 0xc2, 0x34, 0x49, 0x44, 0x46, 0xb3, 0x48, 0x24, 0x20,
-	0xab, 0xbd, 0x91, 0xd1, 0x99, 0xf0, 0xcc, 0x61, 0xf3, 0x8a, 0x74, 0x23, 0xbe, 0x9a, 0xf1, 0x87,
-	0x9c, 0x43, 0x66, 0x9e, 0x18, 0x07, 0x2a, 0xdd, 0x4f, 0x68, 0xcc, 0x3b, 0x5a, 0x57, 0x3b, 0xdd,
-	0x9b, 0xed, 0xab, 0xc7, 0x1b, 0x1a, 0xf3, 0xb3, 0x6f, 0xcd, 0x38, 0x6a, 0xe2, 0x73, 0x39, 0xb3,
-	0xf9, 0xa1, 0x19, 0x87, 0xff, 0xb2, 0x4d, 0x82, 0xb6, 0xed, 0x8a, 0xda, 0x06, 0xb2, 0xec, 0x56,
-	0xb6, 0xbe, 0x02, 0x6a, 0x92, 0xbd, 0x8b, 0x97, 0xaf, 0x9f, 0x57, 0x7d, 0x68, 0xda, 0xe5, 0xad,
-	0x1e, 0x1b, 0xeb, 0x5c, 0x05, 0x39, 0x64, 0x22, 0xe6, 0x29, 0xe0, 0x01, 0xa6, 0x0d, 0x0c, 0xf0,
-	0xe0, 0x69, 0xfc, 0xac, 0x1b, 0xfd, 0x40, 0xc4, 0x5b, 0xe7, 0x1d, 0x5b, 0x1b, 0xf7, 0x9f, 0x96,
-	0xf7, 0x9d, 0x6a, 0xb7, 0xd7, 0x15, 0x1f, 0x8a, 0x05, 0x4d, 0x42, 0x24, 0xd2, 0x10, 0x87, 0x3c,
-	0x59, 0x5f, 0x5f, 0x7d, 0xc9, 0x65, 0x04, 0xed, 0xff, 0xce, 0xa5, 0x12, 0x6f, 0xfa, 0xce, 0xc4,
-	0x71, 0xde, 0xf5, 0xee, 0x44, 0x06, 0x3a, 0x0c, 0x90, 0x94, 0xa5, 0x72, 0x6d, 0x54, 0x35, 0x86,
-	0x4f, 0x65, 0xf1, 0x1c, 0x06, 0x5e, 0x6d, 0xf1, 0x5c, 0xdb, 0x53, 0x96, 0x5f, 0xbd, 0x2f, 0xdf,
-	0x09, 0x71, 0x18, 0x10, 0x52, 0x9b, 0x08, 0x71, 0x6d, 0x42, 0x94, 0xed, 0x6e, 0x77, 0x3d, 0xe7,
-	0xf0, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x00, 0x12, 0xd8, 0xe2, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/age_range_view_service.pb.go b/googleapis/ads/googleads/v1/services/age_range_view_service.pb.go
index 4014263c2f..94eb619f86 100644
--- a/googleapis/ads/googleads/v1/services/age_range_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/age_range_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/age_range_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AgeRangeViewService.GetAgeRangeView][google.ads.googleads.v1.services.AgeRangeViewService.GetAgeRangeView].
 type GetAgeRangeViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetAgeRangeViewRequest) Reset()         { *m = GetAgeRangeViewRequest{}
 func (m *GetAgeRangeViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAgeRangeViewRequest) ProtoMessage()    {}
 func (*GetAgeRangeViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_age_range_view_service_77fc07ff34ca1f9c, []int{0}
+	return fileDescriptor_ec3750cf7941374c, []int{0}
 }
+
 func (m *GetAgeRangeViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAgeRangeViewRequest.Unmarshal(m, b)
 }
 func (m *GetAgeRangeViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAgeRangeViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAgeRangeViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAgeRangeViewRequest.Merge(dst, src)
+func (m *GetAgeRangeViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAgeRangeViewRequest.Merge(m, src)
 }
 func (m *GetAgeRangeViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAgeRangeViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetAgeRangeViewRequest)(nil), "google.ads.googleads.v1.services.GetAgeRangeViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/age_range_view_service.proto", fileDescriptor_ec3750cf7941374c)
+}
+
+var fileDescriptor_ec3750cf7941374c = []byte{
+	// 364 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3f, 0x4b, 0xc3, 0x40,
+	0x18, 0xc6, 0x49, 0x04, 0xc1, 0xa0, 0x08, 0x11, 0xa4, 0x14, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
+	0xa2, 0xa0, 0x72, 0xd2, 0x21, 0x5d, 0xea, 0x24, 0xa5, 0x42, 0x06, 0x09, 0x84, 0xb3, 0x79, 0x39,
+	0x02, 0x4d, 0xae, 0xde, 0x9b, 0xa6, 0x83, 0xb8, 0xf8, 0x15, 0xfc, 0x06, 0x8e, 0xee, 0x7e, 0x09,
+	0xc1, 0xc9, 0xaf, 0xe0, 0xe4, 0x97, 0x50, 0xd2, 0xeb, 0x85, 0xaa, 0x2d, 0xdd, 0x1e, 0xde, 0x3c,
+	0xbf, 0xf7, 0xcf, 0x93, 0x73, 0x3a, 0x42, 0x4a, 0x31, 0x02, 0xca, 0x63, 0xa4, 0x5a, 0x96, 0xaa,
+	0xf0, 0x28, 0x82, 0x2a, 0x92, 0x21, 0x20, 0xe5, 0x02, 0x22, 0xc5, 0x33, 0x01, 0x51, 0x91, 0xc0,
+	0x34, 0x9a, 0xd7, 0xc9, 0x58, 0xc9, 0x5c, 0xba, 0x0d, 0xcd, 0x10, 0x1e, 0x23, 0xa9, 0x70, 0x52,
+	0x78, 0xc4, 0xe0, 0xf5, 0xd3, 0x55, 0x03, 0x14, 0xa0, 0x9c, 0xa8, 0xff, 0x13, 0x74, 0xe7, 0xfa,
+	0x81, 0xe1, 0xc6, 0x09, 0xe5, 0x59, 0x26, 0x73, 0x9e, 0x27, 0x32, 0x43, 0xfd, 0xb5, 0xd9, 0x71,
+	0xf6, 0x7b, 0x90, 0xfb, 0x02, 0x06, 0x25, 0x17, 0x24, 0x30, 0x1d, 0xc0, 0xdd, 0x04, 0x30, 0x77,
+	0x0f, 0x9d, 0x1d, 0xd3, 0x39, 0xca, 0x78, 0x0a, 0x35, 0xab, 0x61, 0x1d, 0x6d, 0x0d, 0xb6, 0x4d,
+	0xf1, 0x8a, 0xa7, 0x70, 0xfc, 0x6e, 0x39, 0x7b, 0x8b, 0xf0, 0xb5, 0xde, 0xd6, 0x7d, 0xb5, 0x9c,
+	0xdd, 0x3f, 0x7d, 0xdd, 0x73, 0xb2, 0xee, 0x46, 0xb2, 0x7c, 0x95, 0x3a, 0x5d, 0x49, 0x56, 0xb7,
+	0x93, 0x45, 0xae, 0x79, 0xf6, 0xf8, 0xf1, 0xf9, 0x64, 0x7b, 0x2e, 0x2d, 0xf3, 0xb9, 0xff, 0x75,
+	0x46, 0x67, 0x38, 0xc1, 0x5c, 0xa6, 0xa0, 0x90, 0xb6, 0xcb, 0xc0, 0x2a, 0x08, 0x69, 0xfb, 0xa1,
+	0xfb, 0x6d, 0x39, 0xad, 0xa1, 0x4c, 0xd7, 0x6e, 0xda, 0xad, 0x2d, 0xb9, 0xba, 0x5f, 0x26, 0xda,
+	0xb7, 0x6e, 0x2e, 0xe7, 0xb4, 0x90, 0x23, 0x9e, 0x09, 0x22, 0x95, 0xa0, 0x02, 0xb2, 0x59, 0xde,
+	0xe6, 0xcf, 0x8d, 0x13, 0x5c, 0xfd, 0x52, 0x2e, 0x8c, 0x78, 0xb6, 0x37, 0x7a, 0xbe, 0xff, 0x62,
+	0x37, 0x7a, 0xba, 0xa1, 0x1f, 0x23, 0xd1, 0xb2, 0x54, 0x81, 0x47, 0xe6, 0x83, 0xf1, 0xcd, 0x58,
+	0x42, 0x3f, 0xc6, 0xb0, 0xb2, 0x84, 0x81, 0x17, 0x1a, 0xcb, 0x97, 0xdd, 0xd2, 0x75, 0xc6, 0xfc,
+	0x18, 0x19, 0xab, 0x4c, 0x8c, 0x05, 0x1e, 0x63, 0xc6, 0x76, 0xbb, 0x39, 0xdb, 0xf3, 0xe4, 0x27,
+	0x00, 0x00, 0xff, 0xff, 0x02, 0x12, 0xf3, 0x69, 0xd0, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _AgeRangeViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/age_range_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/age_range_view_service.proto", fileDescriptor_age_range_view_service_77fc07ff34ca1f9c)
-}
-
-var fileDescriptor_age_range_view_service_77fc07ff34ca1f9c = []byte{
-	// 364 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3f, 0x4b, 0xc3, 0x40,
-	0x18, 0xc6, 0x49, 0x04, 0xc1, 0xa0, 0x08, 0x11, 0xa4, 0x14, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
-	0xa2, 0xa0, 0x72, 0xd2, 0x21, 0x5d, 0xea, 0x24, 0xa5, 0x42, 0x06, 0x09, 0x84, 0xb3, 0x79, 0x39,
-	0x02, 0x4d, 0xae, 0xde, 0x9b, 0xa6, 0x83, 0xb8, 0xf8, 0x15, 0xfc, 0x06, 0x8e, 0xee, 0x7e, 0x09,
-	0xc1, 0xc9, 0xaf, 0xe0, 0xe4, 0x97, 0x50, 0xd2, 0xeb, 0x85, 0xaa, 0x2d, 0xdd, 0x1e, 0xde, 0x3c,
-	0xbf, 0xf7, 0xcf, 0x93, 0x73, 0x3a, 0x42, 0x4a, 0x31, 0x02, 0xca, 0x63, 0xa4, 0x5a, 0x96, 0xaa,
-	0xf0, 0x28, 0x82, 0x2a, 0x92, 0x21, 0x20, 0xe5, 0x02, 0x22, 0xc5, 0x33, 0x01, 0x51, 0x91, 0xc0,
-	0x34, 0x9a, 0xd7, 0xc9, 0x58, 0xc9, 0x5c, 0xba, 0x0d, 0xcd, 0x10, 0x1e, 0x23, 0xa9, 0x70, 0x52,
-	0x78, 0xc4, 0xe0, 0xf5, 0xd3, 0x55, 0x03, 0x14, 0xa0, 0x9c, 0xa8, 0xff, 0x13, 0x74, 0xe7, 0xfa,
-	0x81, 0xe1, 0xc6, 0x09, 0xe5, 0x59, 0x26, 0x73, 0x9e, 0x27, 0x32, 0x43, 0xfd, 0xb5, 0xd9, 0x71,
-	0xf6, 0x7b, 0x90, 0xfb, 0x02, 0x06, 0x25, 0x17, 0x24, 0x30, 0x1d, 0xc0, 0xdd, 0x04, 0x30, 0x77,
-	0x0f, 0x9d, 0x1d, 0xd3, 0x39, 0xca, 0x78, 0x0a, 0x35, 0xab, 0x61, 0x1d, 0x6d, 0x0d, 0xb6, 0x4d,
-	0xf1, 0x8a, 0xa7, 0x70, 0xfc, 0x6e, 0x39, 0x7b, 0x8b, 0xf0, 0xb5, 0xde, 0xd6, 0x7d, 0xb5, 0x9c,
-	0xdd, 0x3f, 0x7d, 0xdd, 0x73, 0xb2, 0xee, 0x46, 0xb2, 0x7c, 0x95, 0x3a, 0x5d, 0x49, 0x56, 0xb7,
-	0x93, 0x45, 0xae, 0x79, 0xf6, 0xf8, 0xf1, 0xf9, 0x64, 0x7b, 0x2e, 0x2d, 0xf3, 0xb9, 0xff, 0x75,
-	0x46, 0x67, 0x38, 0xc1, 0x5c, 0xa6, 0xa0, 0x90, 0xb6, 0xcb, 0xc0, 0x2a, 0x08, 0x69, 0xfb, 0xa1,
-	0xfb, 0x6d, 0x39, 0xad, 0xa1, 0x4c, 0xd7, 0x6e, 0xda, 0xad, 0x2d, 0xb9, 0xba, 0x5f, 0x26, 0xda,
-	0xb7, 0x6e, 0x2e, 0xe7, 0xb4, 0x90, 0x23, 0x9e, 0x09, 0x22, 0x95, 0xa0, 0x02, 0xb2, 0x59, 0xde,
-	0xe6, 0xcf, 0x8d, 0x13, 0x5c, 0xfd, 0x52, 0x2e, 0x8c, 0x78, 0xb6, 0x37, 0x7a, 0xbe, 0xff, 0x62,
-	0x37, 0x7a, 0xba, 0xa1, 0x1f, 0x23, 0xd1, 0xb2, 0x54, 0x81, 0x47, 0xe6, 0x83, 0xf1, 0xcd, 0x58,
-	0x42, 0x3f, 0xc6, 0xb0, 0xb2, 0x84, 0x81, 0x17, 0x1a, 0xcb, 0x97, 0xdd, 0xd2, 0x75, 0xc6, 0xfc,
-	0x18, 0x19, 0xab, 0x4c, 0x8c, 0x05, 0x1e, 0x63, 0xc6, 0x76, 0xbb, 0x39, 0xdb, 0xf3, 0xe4, 0x27,
-	0x00, 0x00, 0xff, 0xff, 0x02, 0x12, 0xf3, 0x69, 0xd0, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/asset_service.pb.go b/googleapis/ads/googleads/v1/services/asset_service.pb.go
index 51aaf4f59b..90e857dda4 100644
--- a/googleapis/ads/googleads/v1/services/asset_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/asset_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/asset_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AssetService.GetAsset][google.ads.googleads.v1.services.AssetService.GetAsset]
 type GetAssetRequest struct {
@@ -38,16 +38,17 @@ func (m *GetAssetRequest) Reset()         { *m = GetAssetRequest{} }
 func (m *GetAssetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAssetRequest) ProtoMessage()    {}
 func (*GetAssetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_f6d94be756c262a6, []int{0}
+	return fileDescriptor_4a6e6d3ab580fb9b, []int{0}
 }
+
 func (m *GetAssetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAssetRequest.Unmarshal(m, b)
 }
 func (m *GetAssetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAssetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAssetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAssetRequest.Merge(dst, src)
+func (m *GetAssetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAssetRequest.Merge(m, src)
 }
 func (m *GetAssetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAssetRequest.Size(m)
@@ -80,16 +81,17 @@ func (m *MutateAssetsRequest) Reset()         { *m = MutateAssetsRequest{} }
 func (m *MutateAssetsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateAssetsRequest) ProtoMessage()    {}
 func (*MutateAssetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_f6d94be756c262a6, []int{1}
+	return fileDescriptor_4a6e6d3ab580fb9b, []int{1}
 }
+
 func (m *MutateAssetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAssetsRequest.Unmarshal(m, b)
 }
 func (m *MutateAssetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAssetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateAssetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAssetsRequest.Merge(dst, src)
+func (m *MutateAssetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAssetsRequest.Merge(m, src)
 }
 func (m *MutateAssetsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateAssetsRequest.Size(m)
@@ -130,16 +132,17 @@ func (m *AssetOperation) Reset()         { *m = AssetOperation{} }
 func (m *AssetOperation) String() string { return proto.CompactTextString(m) }
 func (*AssetOperation) ProtoMessage()    {}
 func (*AssetOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_f6d94be756c262a6, []int{2}
+	return fileDescriptor_4a6e6d3ab580fb9b, []int{2}
 }
+
 func (m *AssetOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AssetOperation.Unmarshal(m, b)
 }
 func (m *AssetOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AssetOperation.Marshal(b, m, deterministic)
 }
-func (dst *AssetOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AssetOperation.Merge(dst, src)
+func (m *AssetOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssetOperation.Merge(m, src)
 }
 func (m *AssetOperation) XXX_Size() int {
 	return xxx_messageInfo_AssetOperation.Size(m)
@@ -174,61 +177,13 @@ func (m *AssetOperation) GetCreate() *resources.Asset {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AssetOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AssetOperation_OneofMarshaler, _AssetOperation_OneofUnmarshaler, _AssetOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AssetOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AssetOperation_Create)(nil),
 	}
 }
 
-func _AssetOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AssetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AssetOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AssetOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AssetOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AssetOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.Asset)
-		err := b.DecodeMessage(msg)
-		m.Operation = &AssetOperation_Create{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AssetOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AssetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *AssetOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an asset mutate.
 type MutateAssetsResponse struct {
 	// All results for the mutate.
@@ -242,16 +197,17 @@ func (m *MutateAssetsResponse) Reset()         { *m = MutateAssetsResponse{} }
 func (m *MutateAssetsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateAssetsResponse) ProtoMessage()    {}
 func (*MutateAssetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_f6d94be756c262a6, []int{3}
+	return fileDescriptor_4a6e6d3ab580fb9b, []int{3}
 }
+
 func (m *MutateAssetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAssetsResponse.Unmarshal(m, b)
 }
 func (m *MutateAssetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAssetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateAssetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAssetsResponse.Merge(dst, src)
+func (m *MutateAssetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAssetsResponse.Merge(m, src)
 }
 func (m *MutateAssetsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateAssetsResponse.Size(m)
@@ -282,16 +238,17 @@ func (m *MutateAssetResult) Reset()         { *m = MutateAssetResult{} }
 func (m *MutateAssetResult) String() string { return proto.CompactTextString(m) }
 func (*MutateAssetResult) ProtoMessage()    {}
 func (*MutateAssetResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_f6d94be756c262a6, []int{4}
+	return fileDescriptor_4a6e6d3ab580fb9b, []int{4}
 }
+
 func (m *MutateAssetResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateAssetResult.Unmarshal(m, b)
 }
 func (m *MutateAssetResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateAssetResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateAssetResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateAssetResult.Merge(dst, src)
+func (m *MutateAssetResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateAssetResult.Merge(m, src)
 }
 func (m *MutateAssetResult) XXX_Size() int {
 	return xxx_messageInfo_MutateAssetResult.Size(m)
@@ -317,6 +274,47 @@ func init() {
 	proto.RegisterType((*MutateAssetResult)(nil), "google.ads.googleads.v1.services.MutateAssetResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/asset_service.proto", fileDescriptor_4a6e6d3ab580fb9b)
+}
+
+var fileDescriptor_4a6e6d3ab580fb9b = []byte{
+	// 520 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xbf, 0x6f, 0xd3, 0x40,
+	0x14, 0xc6, 0xae, 0x54, 0xe8, 0x25, 0x80, 0x7a, 0x30, 0x54, 0x11, 0x12, 0x91, 0xe9, 0x10, 0x19,
+	0x71, 0x8e, 0x53, 0x88, 0xd0, 0xa1, 0x0e, 0xce, 0x92, 0x32, 0x14, 0x22, 0x23, 0x65, 0x40, 0x91,
+	0xa2, 0x23, 0x3e, 0x59, 0x96, 0x62, 0x9f, 0xf1, 0x3b, 0x67, 0xa9, 0xba, 0x30, 0xb1, 0x33, 0xb1,
+	0x32, 0xb2, 0xf3, 0x4f, 0xb0, 0xf2, 0x1f, 0x20, 0x26, 0xfe, 0x02, 0x46, 0x64, 0x9f, 0xcf, 0x38,
+	0x54, 0x51, 0x9a, 0xed, 0xf9, 0xee, 0xfb, 0xbe, 0xf7, 0xbd, 0x1f, 0x67, 0xf4, 0x34, 0x14, 0x22,
+	0x5c, 0x72, 0x87, 0x05, 0xe0, 0xa8, 0xb0, 0x88, 0x56, 0xae, 0x03, 0x3c, 0x5b, 0x45, 0x0b, 0x0e,
+	0x0e, 0x03, 0xe0, 0x72, 0x5e, 0x7d, 0x92, 0x34, 0x13, 0x52, 0xe0, 0xae, 0x82, 0x12, 0x16, 0x00,
+	0xa9, 0x59, 0x64, 0xe5, 0x12, 0xcd, 0xea, 0x3c, 0xd9, 0xa4, 0x9b, 0x71, 0x10, 0x79, 0x56, 0x0b,
+	0x2b, 0xc1, 0xce, 0x03, 0x0d, 0x4f, 0x23, 0x87, 0x25, 0x89, 0x90, 0x4c, 0x46, 0x22, 0x01, 0x75,
+	0x6b, 0x0d, 0xd1, 0xdd, 0x31, 0x97, 0x5e, 0x81, 0xf7, 0xf9, 0xfb, 0x9c, 0x83, 0xc4, 0x8f, 0xd0,
+	0x6d, 0xad, 0x34, 0x4f, 0x58, 0xcc, 0x8f, 0x8c, 0xae, 0xd1, 0x3b, 0xf0, 0xdb, 0xfa, 0xf0, 0x15,
+	0x8b, 0xb9, 0xf5, 0xd1, 0x40, 0xf7, 0xce, 0x73, 0xc9, 0x24, 0x2f, 0xb9, 0xa0, 0xc9, 0x0f, 0x51,
+	0x6b, 0x91, 0x83, 0x14, 0x31, 0xcf, 0xe6, 0x51, 0x50, 0x51, 0x91, 0x3e, 0x7a, 0x19, 0xe0, 0x09,
+	0x42, 0x22, 0xe5, 0x99, 0x32, 0x71, 0x64, 0x76, 0xf7, 0x7a, 0xad, 0x41, 0x9f, 0x6c, 0x2b, 0x9a,
+	0x94, 0x59, 0x5e, 0x6b, 0xa2, 0xdf, 0xd0, 0xb0, 0x18, 0xba, 0xb3, 0x7e, 0x8b, 0x47, 0x68, 0x7f,
+	0x91, 0x71, 0x26, 0x95, 0xf5, 0xd6, 0xa0, 0xb7, 0x51, 0xbf, 0x6e, 0x99, 0x4a, 0x70, 0x76, 0xc3,
+	0xaf, 0x98, 0xa3, 0x16, 0x3a, 0xa8, 0x73, 0x58, 0x1c, 0xdd, 0x5f, 0x2f, 0x16, 0x52, 0x91, 0x00,
+	0xc7, 0xe7, 0xe8, 0x66, 0xc6, 0x21, 0x5f, 0x4a, 0x5d, 0xc9, 0xc9, 0xf6, 0x4a, 0x1a, 0x42, 0x7e,
+	0xc9, 0xf5, 0xb5, 0x86, 0xf5, 0x1c, 0x1d, 0x5e, 0xb9, 0xbd, 0xd6, 0x38, 0x06, 0x3f, 0x4d, 0xd4,
+	0x2e, 0x49, 0x6f, 0x54, 0x1a, 0xfc, 0xd9, 0x40, 0xb7, 0xf4, 0x60, 0xb1, 0xbb, 0xdd, 0xd5, 0x7f,
+	0x4b, 0xd0, 0xb9, 0x76, 0xcb, 0xac, 0xfe, 0x87, 0x1f, 0xbf, 0x3e, 0x99, 0x36, 0xee, 0x15, 0x2b,
+	0x78, 0xb1, 0x66, 0xf5, 0x54, 0xcf, 0x1d, 0x1c, 0x5b, 0xed, 0x24, 0x38, 0xf6, 0x25, 0xfe, 0x66,
+	0xa0, 0x76, 0xb3, 0x9d, 0xf8, 0xd9, 0x4e, 0x5d, 0xd3, 0xbb, 0xd6, 0x19, 0xee, 0x4a, 0x53, 0x53,
+	0xb3, 0x86, 0xa5, 0xe3, 0xbe, 0xf5, 0xb8, 0x70, 0xfc, 0xcf, 0xe2, 0x45, 0x63, 0x71, 0x4f, 0xed,
+	0xcb, 0xca, 0x30, 0x8d, 0x4b, 0x09, 0x6a, 0xd8, 0xa3, 0x3f, 0x06, 0x3a, 0x5e, 0x88, 0x78, 0x6b,
+	0xd6, 0xd1, 0x61, 0x73, 0x14, 0x93, 0xe2, 0x9d, 0x4d, 0x8c, 0xb7, 0x67, 0x15, 0x2d, 0x14, 0x4b,
+	0x96, 0x84, 0x44, 0x64, 0xa1, 0x13, 0xf2, 0xa4, 0x7c, 0x85, 0xfa, 0x19, 0xa7, 0x11, 0x6c, 0xfe,
+	0x5b, 0xbc, 0xd0, 0xc1, 0x17, 0x73, 0x6f, 0xec, 0x79, 0x5f, 0xcd, 0xee, 0x58, 0x09, 0x7a, 0x01,
+	0x10, 0x15, 0x16, 0xd1, 0xd4, 0x25, 0x55, 0x62, 0xf8, 0xae, 0x21, 0x33, 0x2f, 0x80, 0x59, 0x0d,
+	0x99, 0x4d, 0xdd, 0x99, 0x86, 0xfc, 0x36, 0x8f, 0xd5, 0x39, 0xa5, 0x5e, 0x00, 0x94, 0xd6, 0x20,
+	0x4a, 0xa7, 0x2e, 0xa5, 0x1a, 0xf6, 0x6e, 0xbf, 0xf4, 0x79, 0xf2, 0x37, 0x00, 0x00, 0xff, 0xff,
+	0xc0, 0xa5, 0x7e, 0xbf, 0xd4, 0x04, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -425,44 +423,3 @@ var _AssetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/asset_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/asset_service.proto", fileDescriptor_asset_service_f6d94be756c262a6)
-}
-
-var fileDescriptor_asset_service_f6d94be756c262a6 = []byte{
-	// 520 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xbf, 0x6f, 0xd3, 0x40,
-	0x14, 0xc6, 0xae, 0x54, 0xe8, 0x25, 0x80, 0x7a, 0x30, 0x54, 0x11, 0x12, 0x91, 0xe9, 0x10, 0x19,
-	0x71, 0x8e, 0x53, 0x88, 0xd0, 0xa1, 0x0e, 0xce, 0x92, 0x32, 0x14, 0x22, 0x23, 0x65, 0x40, 0x91,
-	0xa2, 0x23, 0x3e, 0x59, 0x96, 0x62, 0x9f, 0xf1, 0x3b, 0x67, 0xa9, 0xba, 0x30, 0xb1, 0x33, 0xb1,
-	0x32, 0xb2, 0xf3, 0x4f, 0xb0, 0xf2, 0x1f, 0x20, 0x26, 0xfe, 0x02, 0x46, 0x64, 0x9f, 0xcf, 0x38,
-	0x54, 0x51, 0x9a, 0xed, 0xf9, 0xee, 0xfb, 0xbe, 0xf7, 0xbd, 0x1f, 0x67, 0xf4, 0x34, 0x14, 0x22,
-	0x5c, 0x72, 0x87, 0x05, 0xe0, 0xa8, 0xb0, 0x88, 0x56, 0xae, 0x03, 0x3c, 0x5b, 0x45, 0x0b, 0x0e,
-	0x0e, 0x03, 0xe0, 0x72, 0x5e, 0x7d, 0x92, 0x34, 0x13, 0x52, 0xe0, 0xae, 0x82, 0x12, 0x16, 0x00,
-	0xa9, 0x59, 0x64, 0xe5, 0x12, 0xcd, 0xea, 0x3c, 0xd9, 0xa4, 0x9b, 0x71, 0x10, 0x79, 0x56, 0x0b,
-	0x2b, 0xc1, 0xce, 0x03, 0x0d, 0x4f, 0x23, 0x87, 0x25, 0x89, 0x90, 0x4c, 0x46, 0x22, 0x01, 0x75,
-	0x6b, 0x0d, 0xd1, 0xdd, 0x31, 0x97, 0x5e, 0x81, 0xf7, 0xf9, 0xfb, 0x9c, 0x83, 0xc4, 0x8f, 0xd0,
-	0x6d, 0xad, 0x34, 0x4f, 0x58, 0xcc, 0x8f, 0x8c, 0xae, 0xd1, 0x3b, 0xf0, 0xdb, 0xfa, 0xf0, 0x15,
-	0x8b, 0xb9, 0xf5, 0xd1, 0x40, 0xf7, 0xce, 0x73, 0xc9, 0x24, 0x2f, 0xb9, 0xa0, 0xc9, 0x0f, 0x51,
-	0x6b, 0x91, 0x83, 0x14, 0x31, 0xcf, 0xe6, 0x51, 0x50, 0x51, 0x91, 0x3e, 0x7a, 0x19, 0xe0, 0x09,
-	0x42, 0x22, 0xe5, 0x99, 0x32, 0x71, 0x64, 0x76, 0xf7, 0x7a, 0xad, 0x41, 0x9f, 0x6c, 0x2b, 0x9a,
-	0x94, 0x59, 0x5e, 0x6b, 0xa2, 0xdf, 0xd0, 0xb0, 0x18, 0xba, 0xb3, 0x7e, 0x8b, 0x47, 0x68, 0x7f,
-	0x91, 0x71, 0x26, 0x95, 0xf5, 0xd6, 0xa0, 0xb7, 0x51, 0xbf, 0x6e, 0x99, 0x4a, 0x70, 0x76, 0xc3,
-	0xaf, 0x98, 0xa3, 0x16, 0x3a, 0xa8, 0x73, 0x58, 0x1c, 0xdd, 0x5f, 0x2f, 0x16, 0x52, 0x91, 0x00,
-	0xc7, 0xe7, 0xe8, 0x66, 0xc6, 0x21, 0x5f, 0x4a, 0x5d, 0xc9, 0xc9, 0xf6, 0x4a, 0x1a, 0x42, 0x7e,
-	0xc9, 0xf5, 0xb5, 0x86, 0xf5, 0x1c, 0x1d, 0x5e, 0xb9, 0xbd, 0xd6, 0x38, 0x06, 0x3f, 0x4d, 0xd4,
-	0x2e, 0x49, 0x6f, 0x54, 0x1a, 0xfc, 0xd9, 0x40, 0xb7, 0xf4, 0x60, 0xb1, 0xbb, 0xdd, 0xd5, 0x7f,
-	0x4b, 0xd0, 0xb9, 0x76, 0xcb, 0xac, 0xfe, 0x87, 0x1f, 0xbf, 0x3e, 0x99, 0x36, 0xee, 0x15, 0x2b,
-	0x78, 0xb1, 0x66, 0xf5, 0x54, 0xcf, 0x1d, 0x1c, 0x5b, 0xed, 0x24, 0x38, 0xf6, 0x25, 0xfe, 0x66,
-	0xa0, 0x76, 0xb3, 0x9d, 0xf8, 0xd9, 0x4e, 0x5d, 0xd3, 0xbb, 0xd6, 0x19, 0xee, 0x4a, 0x53, 0x53,
-	0xb3, 0x86, 0xa5, 0xe3, 0xbe, 0xf5, 0xb8, 0x70, 0xfc, 0xcf, 0xe2, 0x45, 0x63, 0x71, 0x4f, 0xed,
-	0xcb, 0xca, 0x30, 0x8d, 0x4b, 0x09, 0x6a, 0xd8, 0xa3, 0x3f, 0x06, 0x3a, 0x5e, 0x88, 0x78, 0x6b,
-	0xd6, 0xd1, 0x61, 0x73, 0x14, 0x93, 0xe2, 0x9d, 0x4d, 0x8c, 0xb7, 0x67, 0x15, 0x2d, 0x14, 0x4b,
-	0x96, 0x84, 0x44, 0x64, 0xa1, 0x13, 0xf2, 0xa4, 0x7c, 0x85, 0xfa, 0x19, 0xa7, 0x11, 0x6c, 0xfe,
-	0x5b, 0xbc, 0xd0, 0xc1, 0x17, 0x73, 0x6f, 0xec, 0x79, 0x5f, 0xcd, 0xee, 0x58, 0x09, 0x7a, 0x01,
-	0x10, 0x15, 0x16, 0xd1, 0xd4, 0x25, 0x55, 0x62, 0xf8, 0xae, 0x21, 0x33, 0x2f, 0x80, 0x59, 0x0d,
-	0x99, 0x4d, 0xdd, 0x99, 0x86, 0xfc, 0x36, 0x8f, 0xd5, 0x39, 0xa5, 0x5e, 0x00, 0x94, 0xd6, 0x20,
-	0x4a, 0xa7, 0x2e, 0xa5, 0x1a, 0xf6, 0x6e, 0xbf, 0xf4, 0x79, 0xf2, 0x37, 0x00, 0x00, 0xff, 0xff,
-	0xc0, 0xa5, 0x7e, 0xbf, 0xd4, 0x04, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/bidding_strategy_service.pb.go b/googleapis/ads/googleads/v1/services/bidding_strategy_service.pb.go
index 800d21f981..06da3256b0 100644
--- a/googleapis/ads/googleads/v1/services/bidding_strategy_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/bidding_strategy_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/bidding_strategy_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [BiddingStrategyService.GetBiddingStrategy][google.ads.googleads.v1.services.BiddingStrategyService.GetBiddingStrategy].
 type GetBiddingStrategyRequest struct {
@@ -41,16 +41,17 @@ func (m *GetBiddingStrategyRequest) Reset()         { *m = GetBiddingStrategyReq
 func (m *GetBiddingStrategyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBiddingStrategyRequest) ProtoMessage()    {}
 func (*GetBiddingStrategyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_service_98c343afe8e94e27, []int{0}
+	return fileDescriptor_57d6d2619481cd67, []int{0}
 }
+
 func (m *GetBiddingStrategyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBiddingStrategyRequest.Unmarshal(m, b)
 }
 func (m *GetBiddingStrategyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBiddingStrategyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetBiddingStrategyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBiddingStrategyRequest.Merge(dst, src)
+func (m *GetBiddingStrategyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBiddingStrategyRequest.Merge(m, src)
 }
 func (m *GetBiddingStrategyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBiddingStrategyRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateBiddingStrategiesRequest) Reset()         { *m = MutateBiddingStr
 func (m *MutateBiddingStrategiesRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateBiddingStrategiesRequest) ProtoMessage()    {}
 func (*MutateBiddingStrategiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_service_98c343afe8e94e27, []int{1}
+	return fileDescriptor_57d6d2619481cd67, []int{1}
 }
+
 func (m *MutateBiddingStrategiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateBiddingStrategiesRequest.Unmarshal(m, b)
 }
 func (m *MutateBiddingStrategiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateBiddingStrategiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateBiddingStrategiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateBiddingStrategiesRequest.Merge(dst, src)
+func (m *MutateBiddingStrategiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateBiddingStrategiesRequest.Merge(m, src)
 }
 func (m *MutateBiddingStrategiesRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateBiddingStrategiesRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *BiddingStrategyOperation) Reset()         { *m = BiddingStrategyOperati
 func (m *BiddingStrategyOperation) String() string { return proto.CompactTextString(m) }
 func (*BiddingStrategyOperation) ProtoMessage()    {}
 func (*BiddingStrategyOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_service_98c343afe8e94e27, []int{2}
+	return fileDescriptor_57d6d2619481cd67, []int{2}
 }
+
 func (m *BiddingStrategyOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BiddingStrategyOperation.Unmarshal(m, b)
 }
 func (m *BiddingStrategyOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BiddingStrategyOperation.Marshal(b, m, deterministic)
 }
-func (dst *BiddingStrategyOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BiddingStrategyOperation.Merge(dst, src)
+func (m *BiddingStrategyOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BiddingStrategyOperation.Merge(m, src)
 }
 func (m *BiddingStrategyOperation) XXX_Size() int {
 	return xxx_messageInfo_BiddingStrategyOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *BiddingStrategyOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BiddingStrategyOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BiddingStrategyOperation_OneofMarshaler, _BiddingStrategyOperation_OneofUnmarshaler, _BiddingStrategyOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BiddingStrategyOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BiddingStrategyOperation_Create)(nil),
 		(*BiddingStrategyOperation_Update)(nil),
 		(*BiddingStrategyOperation_Remove)(nil),
 	}
 }
 
-func _BiddingStrategyOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BiddingStrategyOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *BiddingStrategyOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *BiddingStrategyOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *BiddingStrategyOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("BiddingStrategyOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BiddingStrategyOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BiddingStrategyOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.BiddingStrategy)
-		err := b.DecodeMessage(msg)
-		m.Operation = &BiddingStrategyOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.BiddingStrategy)
-		err := b.DecodeMessage(msg)
-		m.Operation = &BiddingStrategyOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &BiddingStrategyOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BiddingStrategyOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BiddingStrategyOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *BiddingStrategyOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategyOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BiddingStrategyOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for bidding strategy mutate.
 type MutateBiddingStrategiesResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateBiddingStrategiesResponse) Reset()         { *m = MutateBiddingSt
 func (m *MutateBiddingStrategiesResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateBiddingStrategiesResponse) ProtoMessage()    {}
 func (*MutateBiddingStrategiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_service_98c343afe8e94e27, []int{3}
+	return fileDescriptor_57d6d2619481cd67, []int{3}
 }
+
 func (m *MutateBiddingStrategiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateBiddingStrategiesResponse.Unmarshal(m, b)
 }
 func (m *MutateBiddingStrategiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateBiddingStrategiesResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateBiddingStrategiesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateBiddingStrategiesResponse.Merge(dst, src)
+func (m *MutateBiddingStrategiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateBiddingStrategiesResponse.Merge(m, src)
 }
 func (m *MutateBiddingStrategiesResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateBiddingStrategiesResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateBiddingStrategyResult) Reset()         { *m = MutateBiddingStrate
 func (m *MutateBiddingStrategyResult) String() string { return proto.CompactTextString(m) }
 func (*MutateBiddingStrategyResult) ProtoMessage()    {}
 func (*MutateBiddingStrategyResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bidding_strategy_service_98c343afe8e94e27, []int{4}
+	return fileDescriptor_57d6d2619481cd67, []int{4}
 }
+
 func (m *MutateBiddingStrategyResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateBiddingStrategyResult.Unmarshal(m, b)
 }
 func (m *MutateBiddingStrategyResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateBiddingStrategyResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateBiddingStrategyResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateBiddingStrategyResult.Merge(dst, src)
+func (m *MutateBiddingStrategyResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateBiddingStrategyResult.Merge(m, src)
 }
 func (m *MutateBiddingStrategyResult) XXX_Size() int {
 	return xxx_messageInfo_MutateBiddingStrategyResult.Size(m)
@@ -425,6 +350,60 @@ func init() {
 	proto.RegisterType((*MutateBiddingStrategyResult)(nil), "google.ads.googleads.v1.services.MutateBiddingStrategyResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/bidding_strategy_service.proto", fileDescriptor_57d6d2619481cd67)
+}
+
+var fileDescriptor_57d6d2619481cd67 = []byte{
+	// 721 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xd1, 0x6a, 0xd4, 0x4c,
+	0x14, 0xc7, 0xbf, 0x64, 0x3f, 0xaa, 0x9d, 0x54, 0x85, 0x11, 0x6d, 0xdc, 0x4a, 0xbb, 0xc4, 0x82,
+	0x65, 0x2f, 0x12, 0x76, 0x8b, 0x22, 0x59, 0x8a, 0xcd, 0x82, 0x6d, 0x05, 0x6b, 0x4b, 0x0a, 0x15,
+	0xca, 0x42, 0x98, 0x6e, 0xa6, 0x21, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0xca, 0x52, 0x7a, 0xd3, 0x57,
+	0xf0, 0xce, 0x4b, 0x2f, 0x7d, 0x0b, 0x7b, 0xe9, 0xad, 0x4f, 0x20, 0x78, 0xa5, 0x2f, 0x21, 0xc9,
+	0x64, 0xb6, 0xed, 0xb6, 0x71, 0xa5, 0xbd, 0x3b, 0x39, 0xf3, 0x9f, 0xdf, 0x9c, 0x33, 0xe7, 0xcc,
+	0x09, 0x78, 0x19, 0x10, 0x12, 0x44, 0xd8, 0x42, 0x3e, 0xb3, 0x84, 0x99, 0x5b, 0x83, 0x96, 0xc5,
+	0x30, 0x1d, 0x84, 0x7d, 0xcc, 0xac, 0xfd, 0xd0, 0xf7, 0xc3, 0x24, 0xf0, 0x18, 0xa7, 0x88, 0xe3,
+	0x60, 0xe8, 0x95, 0x2b, 0x66, 0x4a, 0x09, 0x27, 0xb0, 0x21, 0x76, 0x99, 0xc8, 0x67, 0xe6, 0x08,
+	0x60, 0x0e, 0x5a, 0xa6, 0x04, 0xd4, 0x5f, 0x54, 0x1d, 0x41, 0x31, 0x23, 0x19, 0xbd, 0xea, 0x0c,
+	0xc1, 0xae, 0x3f, 0x96, 0x3b, 0xd3, 0xd0, 0x42, 0x49, 0x42, 0x38, 0xe2, 0x21, 0x49, 0x58, 0xb9,
+	0x5a, 0x9e, 0x6c, 0x15, 0x5f, 0xfb, 0xd9, 0x81, 0x75, 0x10, 0xe2, 0xc8, 0xf7, 0x62, 0xc4, 0x0e,
+	0x4b, 0xc5, 0xfc, 0xb8, 0xe2, 0x03, 0x45, 0x69, 0x8a, 0xa9, 0x24, 0xcc, 0x96, 0xeb, 0x34, 0xed,
+	0x5b, 0x8c, 0x23, 0x9e, 0x95, 0x0b, 0xc6, 0x2a, 0x78, 0xb4, 0x8e, 0x79, 0x57, 0x44, 0xb5, 0x53,
+	0x06, 0xe5, 0xe2, 0xf7, 0x19, 0x66, 0x1c, 0x3e, 0x01, 0x77, 0x64, 0xe4, 0x5e, 0x82, 0x62, 0xac,
+	0x2b, 0x0d, 0x65, 0x69, 0xda, 0x9d, 0x91, 0xce, 0xb7, 0x28, 0xc6, 0xc6, 0x6f, 0x05, 0xcc, 0x6f,
+	0x66, 0x1c, 0x71, 0x7c, 0x91, 0x12, 0x62, 0x26, 0x39, 0x0b, 0x40, 0xeb, 0x67, 0x8c, 0x93, 0x18,
+	0x53, 0x2f, 0xf4, 0x4b, 0x0a, 0x90, 0xae, 0xd7, 0x3e, 0xdc, 0x03, 0x80, 0xa4, 0x98, 0x8a, 0xa4,
+	0x75, 0xb5, 0x51, 0x5b, 0xd2, 0xda, 0xb6, 0x39, 0xe9, 0xbe, 0xcd, 0xb1, 0xb0, 0xb7, 0x24, 0xc2,
+	0x3d, 0x47, 0x83, 0x4f, 0xc1, 0xbd, 0x14, 0x51, 0x1e, 0xa2, 0xc8, 0x3b, 0x40, 0x61, 0x94, 0x51,
+	0xac, 0xd7, 0x1a, 0xca, 0xd2, 0x6d, 0xf7, 0x6e, 0xe9, 0x5e, 0x13, 0xde, 0x3c, 0xdb, 0x01, 0x8a,
+	0x42, 0x1f, 0x71, 0xec, 0x91, 0x24, 0x1a, 0xea, 0xff, 0x17, 0xb2, 0x19, 0xe9, 0xdc, 0x4a, 0xa2,
+	0xa1, 0xf1, 0x49, 0x05, 0x7a, 0xd5, 0xb1, 0xb0, 0x03, 0xb4, 0x2c, 0x2d, 0xf6, 0xe7, 0xa5, 0x29,
+	0xf6, 0x6b, 0xed, 0xba, 0xcc, 0x43, 0xd6, 0xc6, 0x5c, 0xcb, 0xab, 0xb7, 0x89, 0xd8, 0xa1, 0x0b,
+	0x84, 0x3c, 0xb7, 0xe1, 0x1b, 0x30, 0xd5, 0xa7, 0x18, 0x71, 0x71, 0xcb, 0x5a, 0xbb, 0x5d, 0x99,
+	0xff, 0xa8, 0x9b, 0xc6, 0x2f, 0x60, 0xe3, 0x3f, 0xb7, 0x64, 0xe4, 0x34, 0xc1, 0xd6, 0xd5, 0x9b,
+	0xd0, 0x04, 0x03, 0xea, 0x60, 0x8a, 0xe2, 0x98, 0x0c, 0xc4, 0xd5, 0x4d, 0xe7, 0x2b, 0xe2, 0xbb,
+	0xab, 0x81, 0xe9, 0xd1, 0x5d, 0x1b, 0xa7, 0x0a, 0x58, 0xa8, 0x6c, 0x05, 0x96, 0x92, 0x84, 0x61,
+	0xb8, 0x06, 0x1e, 0x8c, 0x95, 0xc3, 0xc3, 0x94, 0x12, 0x5a, 0x90, 0xb5, 0x36, 0x94, 0x71, 0xd2,
+	0xb4, 0x6f, 0xee, 0x14, 0x9d, 0xea, 0xde, 0xbf, 0x58, 0xa8, 0x57, 0xb9, 0x1c, 0xbe, 0x03, 0xb7,
+	0x28, 0x66, 0x59, 0xc4, 0x65, 0xbf, 0xac, 0x4c, 0xee, 0x97, 0xab, 0x62, 0x1b, 0xba, 0x05, 0xc5,
+	0x95, 0x34, 0xa3, 0x0b, 0xe6, 0xfe, 0xa2, 0xfb, 0xa7, 0x37, 0xd1, 0xfe, 0x5a, 0x03, 0x0f, 0xc7,
+	0xb6, 0xef, 0x88, 0x20, 0xe0, 0xa9, 0x02, 0xe0, 0xe5, 0x17, 0x07, 0x3b, 0x93, 0xa3, 0xaf, 0x7c,
+	0xa7, 0xf5, 0x6b, 0x14, 0xd7, 0xe8, 0x9c, 0x7c, 0xff, 0xf9, 0x51, 0x7d, 0x06, 0x97, 0xf3, 0xf9,
+	0x74, 0x74, 0x21, 0xa5, 0x15, 0xf9, 0x32, 0x99, 0xd5, 0x94, 0x03, 0xeb, 0xac, 0x92, 0x56, 0xf3,
+	0x18, 0xfe, 0x50, 0xc0, 0x6c, 0x45, 0xa1, 0xe1, 0xea, 0xf5, 0xea, 0x70, 0x36, 0x2e, 0xea, 0xce,
+	0x0d, 0x08, 0xa2, 0xcb, 0x0c, 0xa7, 0xc8, 0xae, 0x63, 0x3c, 0xcf, 0xb3, 0x3b, 0x4b, 0xe7, 0xe8,
+	0xdc, 0x18, 0x5a, 0x69, 0x1e, 0x5f, 0x4e, 0xce, 0x8e, 0x0b, 0xb0, 0xad, 0x34, 0xbb, 0x27, 0x2a,
+	0x58, 0xec, 0x93, 0x78, 0x62, 0x2c, 0xdd, 0xb9, 0xab, 0x2b, 0xbd, 0x9d, 0x3f, 0xf7, 0x6d, 0x65,
+	0x6f, 0xa3, 0x04, 0x04, 0x24, 0x42, 0x49, 0x60, 0x12, 0x1a, 0x58, 0x01, 0x4e, 0x8a, 0x61, 0x20,
+	0x7f, 0x12, 0x69, 0xc8, 0xaa, 0x7f, 0x4b, 0x1d, 0x69, 0x7c, 0x56, 0x6b, 0xeb, 0x8e, 0xf3, 0x45,
+	0x6d, 0xac, 0x0b, 0xa0, 0xe3, 0x33, 0x53, 0x98, 0xb9, 0xb5, 0xdb, 0x32, 0xcb, 0x83, 0xd9, 0x37,
+	0x29, 0xe9, 0x39, 0x3e, 0xeb, 0x8d, 0x24, 0xbd, 0xdd, 0x56, 0x4f, 0x4a, 0x7e, 0xa9, 0x8b, 0xc2,
+	0x6f, 0xdb, 0x8e, 0xcf, 0x6c, 0x7b, 0x24, 0xb2, 0xed, 0xdd, 0x96, 0x6d, 0x4b, 0xd9, 0xfe, 0x54,
+	0x11, 0xe7, 0xf2, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x66, 0xd6, 0xf6, 0x59, 0x3d, 0x07, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,57 +514,3 @@ var _BiddingStrategyService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/bidding_strategy_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/bidding_strategy_service.proto", fileDescriptor_bidding_strategy_service_98c343afe8e94e27)
-}
-
-var fileDescriptor_bidding_strategy_service_98c343afe8e94e27 = []byte{
-	// 721 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xd1, 0x6a, 0xd4, 0x4c,
-	0x14, 0xc7, 0xbf, 0x64, 0x3f, 0xaa, 0x9d, 0x54, 0x85, 0x11, 0x6d, 0xdc, 0x4a, 0xbb, 0xc4, 0x82,
-	0x65, 0x2f, 0x12, 0x76, 0x8b, 0x22, 0x59, 0x8a, 0xcd, 0x82, 0x6d, 0x05, 0x6b, 0x4b, 0x0a, 0x15,
-	0xca, 0x42, 0x98, 0x6e, 0xa6, 0x21, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0xca, 0x52, 0x7a, 0xd3, 0x57,
-	0xf0, 0xce, 0x4b, 0x2f, 0x7d, 0x0b, 0x7b, 0xe9, 0xad, 0x4f, 0x20, 0x78, 0xa5, 0x2f, 0x21, 0xc9,
-	0x64, 0xb6, 0xed, 0xb6, 0x71, 0xa5, 0xbd, 0x3b, 0x39, 0xf3, 0x9f, 0xdf, 0x9c, 0x33, 0xe7, 0xcc,
-	0x09, 0x78, 0x19, 0x10, 0x12, 0x44, 0xd8, 0x42, 0x3e, 0xb3, 0x84, 0x99, 0x5b, 0x83, 0x96, 0xc5,
-	0x30, 0x1d, 0x84, 0x7d, 0xcc, 0xac, 0xfd, 0xd0, 0xf7, 0xc3, 0x24, 0xf0, 0x18, 0xa7, 0x88, 0xe3,
-	0x60, 0xe8, 0x95, 0x2b, 0x66, 0x4a, 0x09, 0x27, 0xb0, 0x21, 0x76, 0x99, 0xc8, 0x67, 0xe6, 0x08,
-	0x60, 0x0e, 0x5a, 0xa6, 0x04, 0xd4, 0x5f, 0x54, 0x1d, 0x41, 0x31, 0x23, 0x19, 0xbd, 0xea, 0x0c,
-	0xc1, 0xae, 0x3f, 0x96, 0x3b, 0xd3, 0xd0, 0x42, 0x49, 0x42, 0x38, 0xe2, 0x21, 0x49, 0x58, 0xb9,
-	0x5a, 0x9e, 0x6c, 0x15, 0x5f, 0xfb, 0xd9, 0x81, 0x75, 0x10, 0xe2, 0xc8, 0xf7, 0x62, 0xc4, 0x0e,
-	0x4b, 0xc5, 0xfc, 0xb8, 0xe2, 0x03, 0x45, 0x69, 0x8a, 0xa9, 0x24, 0xcc, 0x96, 0xeb, 0x34, 0xed,
-	0x5b, 0x8c, 0x23, 0x9e, 0x95, 0x0b, 0xc6, 0x2a, 0x78, 0xb4, 0x8e, 0x79, 0x57, 0x44, 0xb5, 0x53,
-	0x06, 0xe5, 0xe2, 0xf7, 0x19, 0x66, 0x1c, 0x3e, 0x01, 0x77, 0x64, 0xe4, 0x5e, 0x82, 0x62, 0xac,
-	0x2b, 0x0d, 0x65, 0x69, 0xda, 0x9d, 0x91, 0xce, 0xb7, 0x28, 0xc6, 0xc6, 0x6f, 0x05, 0xcc, 0x6f,
-	0x66, 0x1c, 0x71, 0x7c, 0x91, 0x12, 0x62, 0x26, 0x39, 0x0b, 0x40, 0xeb, 0x67, 0x8c, 0x93, 0x18,
-	0x53, 0x2f, 0xf4, 0x4b, 0x0a, 0x90, 0xae, 0xd7, 0x3e, 0xdc, 0x03, 0x80, 0xa4, 0x98, 0x8a, 0xa4,
-	0x75, 0xb5, 0x51, 0x5b, 0xd2, 0xda, 0xb6, 0x39, 0xe9, 0xbe, 0xcd, 0xb1, 0xb0, 0xb7, 0x24, 0xc2,
-	0x3d, 0x47, 0x83, 0x4f, 0xc1, 0xbd, 0x14, 0x51, 0x1e, 0xa2, 0xc8, 0x3b, 0x40, 0x61, 0x94, 0x51,
-	0xac, 0xd7, 0x1a, 0xca, 0xd2, 0x6d, 0xf7, 0x6e, 0xe9, 0x5e, 0x13, 0xde, 0x3c, 0xdb, 0x01, 0x8a,
-	0x42, 0x1f, 0x71, 0xec, 0x91, 0x24, 0x1a, 0xea, 0xff, 0x17, 0xb2, 0x19, 0xe9, 0xdc, 0x4a, 0xa2,
-	0xa1, 0xf1, 0x49, 0x05, 0x7a, 0xd5, 0xb1, 0xb0, 0x03, 0xb4, 0x2c, 0x2d, 0xf6, 0xe7, 0xa5, 0x29,
-	0xf6, 0x6b, 0xed, 0xba, 0xcc, 0x43, 0xd6, 0xc6, 0x5c, 0xcb, 0xab, 0xb7, 0x89, 0xd8, 0xa1, 0x0b,
-	0x84, 0x3c, 0xb7, 0xe1, 0x1b, 0x30, 0xd5, 0xa7, 0x18, 0x71, 0x71, 0xcb, 0x5a, 0xbb, 0x5d, 0x99,
-	0xff, 0xa8, 0x9b, 0xc6, 0x2f, 0x60, 0xe3, 0x3f, 0xb7, 0x64, 0xe4, 0x34, 0xc1, 0xd6, 0xd5, 0x9b,
-	0xd0, 0x04, 0x03, 0xea, 0x60, 0x8a, 0xe2, 0x98, 0x0c, 0xc4, 0xd5, 0x4d, 0xe7, 0x2b, 0xe2, 0xbb,
-	0xab, 0x81, 0xe9, 0xd1, 0x5d, 0x1b, 0xa7, 0x0a, 0x58, 0xa8, 0x6c, 0x05, 0x96, 0x92, 0x84, 0x61,
-	0xb8, 0x06, 0x1e, 0x8c, 0x95, 0xc3, 0xc3, 0x94, 0x12, 0x5a, 0x90, 0xb5, 0x36, 0x94, 0x71, 0xd2,
-	0xb4, 0x6f, 0xee, 0x14, 0x9d, 0xea, 0xde, 0xbf, 0x58, 0xa8, 0x57, 0xb9, 0x1c, 0xbe, 0x03, 0xb7,
-	0x28, 0x66, 0x59, 0xc4, 0x65, 0xbf, 0xac, 0x4c, 0xee, 0x97, 0xab, 0x62, 0x1b, 0xba, 0x05, 0xc5,
-	0x95, 0x34, 0xa3, 0x0b, 0xe6, 0xfe, 0xa2, 0xfb, 0xa7, 0x37, 0xd1, 0xfe, 0x5a, 0x03, 0x0f, 0xc7,
-	0xb6, 0xef, 0x88, 0x20, 0xe0, 0xa9, 0x02, 0xe0, 0xe5, 0x17, 0x07, 0x3b, 0x93, 0xa3, 0xaf, 0x7c,
-	0xa7, 0xf5, 0x6b, 0x14, 0xd7, 0xe8, 0x9c, 0x7c, 0xff, 0xf9, 0x51, 0x7d, 0x06, 0x97, 0xf3, 0xf9,
-	0x74, 0x74, 0x21, 0xa5, 0x15, 0xf9, 0x32, 0x99, 0xd5, 0x94, 0x03, 0xeb, 0xac, 0x92, 0x56, 0xf3,
-	0x18, 0xfe, 0x50, 0xc0, 0x6c, 0x45, 0xa1, 0xe1, 0xea, 0xf5, 0xea, 0x70, 0x36, 0x2e, 0xea, 0xce,
-	0x0d, 0x08, 0xa2, 0xcb, 0x0c, 0xa7, 0xc8, 0xae, 0x63, 0x3c, 0xcf, 0xb3, 0x3b, 0x4b, 0xe7, 0xe8,
-	0xdc, 0x18, 0x5a, 0x69, 0x1e, 0x5f, 0x4e, 0xce, 0x8e, 0x0b, 0xb0, 0xad, 0x34, 0xbb, 0x27, 0x2a,
-	0x58, 0xec, 0x93, 0x78, 0x62, 0x2c, 0xdd, 0xb9, 0xab, 0x2b, 0xbd, 0x9d, 0x3f, 0xf7, 0x6d, 0x65,
-	0x6f, 0xa3, 0x04, 0x04, 0x24, 0x42, 0x49, 0x60, 0x12, 0x1a, 0x58, 0x01, 0x4e, 0x8a, 0x61, 0x20,
-	0x7f, 0x12, 0x69, 0xc8, 0xaa, 0x7f, 0x4b, 0x1d, 0x69, 0x7c, 0x56, 0x6b, 0xeb, 0x8e, 0xf3, 0x45,
-	0x6d, 0xac, 0x0b, 0xa0, 0xe3, 0x33, 0x53, 0x98, 0xb9, 0xb5, 0xdb, 0x32, 0xcb, 0x83, 0xd9, 0x37,
-	0x29, 0xe9, 0x39, 0x3e, 0xeb, 0x8d, 0x24, 0xbd, 0xdd, 0x56, 0x4f, 0x4a, 0x7e, 0xa9, 0x8b, 0xc2,
-	0x6f, 0xdb, 0x8e, 0xcf, 0x6c, 0x7b, 0x24, 0xb2, 0xed, 0xdd, 0x96, 0x6d, 0x4b, 0xd9, 0xfe, 0x54,
-	0x11, 0xe7, 0xf2, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x66, 0xd6, 0xf6, 0x59, 0x3d, 0x07, 0x00,
-	0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/billing_setup_service.pb.go b/googleapis/ads/googleads/v1/services/billing_setup_service.pb.go
index 81d874d155..904416ad72 100644
--- a/googleapis/ads/googleads/v1/services/billing_setup_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/billing_setup_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/billing_setup_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [BillingSetupService.GetBillingSetup][google.ads.googleads.v1.services.BillingSetupService.GetBillingSetup].
@@ -39,16 +39,17 @@ func (m *GetBillingSetupRequest) Reset()         { *m = GetBillingSetupRequest{}
 func (m *GetBillingSetupRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBillingSetupRequest) ProtoMessage()    {}
 func (*GetBillingSetupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_service_6bff980c1ed14b83, []int{0}
+	return fileDescriptor_0a012b9d34a4d410, []int{0}
 }
+
 func (m *GetBillingSetupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBillingSetupRequest.Unmarshal(m, b)
 }
 func (m *GetBillingSetupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBillingSetupRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetBillingSetupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBillingSetupRequest.Merge(dst, src)
+func (m *GetBillingSetupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBillingSetupRequest.Merge(m, src)
 }
 func (m *GetBillingSetupRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBillingSetupRequest.Size(m)
@@ -81,16 +82,17 @@ func (m *MutateBillingSetupRequest) Reset()         { *m = MutateBillingSetupReq
 func (m *MutateBillingSetupRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateBillingSetupRequest) ProtoMessage()    {}
 func (*MutateBillingSetupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_service_6bff980c1ed14b83, []int{1}
+	return fileDescriptor_0a012b9d34a4d410, []int{1}
 }
+
 func (m *MutateBillingSetupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateBillingSetupRequest.Unmarshal(m, b)
 }
 func (m *MutateBillingSetupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateBillingSetupRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateBillingSetupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateBillingSetupRequest.Merge(dst, src)
+func (m *MutateBillingSetupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateBillingSetupRequest.Merge(m, src)
 }
 func (m *MutateBillingSetupRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateBillingSetupRequest.Size(m)
@@ -134,16 +136,17 @@ func (m *BillingSetupOperation) Reset()         { *m = BillingSetupOperation{} }
 func (m *BillingSetupOperation) String() string { return proto.CompactTextString(m) }
 func (*BillingSetupOperation) ProtoMessage()    {}
 func (*BillingSetupOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_service_6bff980c1ed14b83, []int{2}
+	return fileDescriptor_0a012b9d34a4d410, []int{2}
 }
+
 func (m *BillingSetupOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BillingSetupOperation.Unmarshal(m, b)
 }
 func (m *BillingSetupOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BillingSetupOperation.Marshal(b, m, deterministic)
 }
-func (dst *BillingSetupOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BillingSetupOperation.Merge(dst, src)
+func (m *BillingSetupOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BillingSetupOperation.Merge(m, src)
 }
 func (m *BillingSetupOperation) XXX_Size() int {
 	return xxx_messageInfo_BillingSetupOperation.Size(m)
@@ -191,76 +194,14 @@ func (m *BillingSetupOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BillingSetupOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BillingSetupOperation_OneofMarshaler, _BillingSetupOperation_OneofUnmarshaler, _BillingSetupOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BillingSetupOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BillingSetupOperation_Create)(nil),
 		(*BillingSetupOperation_Remove)(nil),
 	}
 }
 
-func _BillingSetupOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BillingSetupOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *BillingSetupOperation_Create:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *BillingSetupOperation_Remove:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("BillingSetupOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BillingSetupOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BillingSetupOperation)
-	switch tag {
-	case 2: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.BillingSetup)
-		err := b.DecodeMessage(msg)
-		m.Operation = &BillingSetupOperation_Create{msg}
-		return true, err
-	case 1: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &BillingSetupOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BillingSetupOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BillingSetupOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *BillingSetupOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BillingSetupOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a billing setup operation.
 type MutateBillingSetupResponse struct {
 	// A result that identifies the resource affected by the mutate request.
@@ -274,16 +215,17 @@ func (m *MutateBillingSetupResponse) Reset()         { *m = MutateBillingSetupRe
 func (m *MutateBillingSetupResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateBillingSetupResponse) ProtoMessage()    {}
 func (*MutateBillingSetupResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_service_6bff980c1ed14b83, []int{3}
+	return fileDescriptor_0a012b9d34a4d410, []int{3}
 }
+
 func (m *MutateBillingSetupResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateBillingSetupResponse.Unmarshal(m, b)
 }
 func (m *MutateBillingSetupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateBillingSetupResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateBillingSetupResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateBillingSetupResponse.Merge(dst, src)
+func (m *MutateBillingSetupResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateBillingSetupResponse.Merge(m, src)
 }
 func (m *MutateBillingSetupResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateBillingSetupResponse.Size(m)
@@ -314,16 +256,17 @@ func (m *MutateBillingSetupResult) Reset()         { *m = MutateBillingSetupResu
 func (m *MutateBillingSetupResult) String() string { return proto.CompactTextString(m) }
 func (*MutateBillingSetupResult) ProtoMessage()    {}
 func (*MutateBillingSetupResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_setup_service_6bff980c1ed14b83, []int{4}
+	return fileDescriptor_0a012b9d34a4d410, []int{4}
 }
+
 func (m *MutateBillingSetupResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateBillingSetupResult.Unmarshal(m, b)
 }
 func (m *MutateBillingSetupResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateBillingSetupResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateBillingSetupResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateBillingSetupResult.Merge(dst, src)
+func (m *MutateBillingSetupResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateBillingSetupResult.Merge(m, src)
 }
 func (m *MutateBillingSetupResult) XXX_Size() int {
 	return xxx_messageInfo_MutateBillingSetupResult.Size(m)
@@ -349,6 +292,49 @@ func init() {
 	proto.RegisterType((*MutateBillingSetupResult)(nil), "google.ads.googleads.v1.services.MutateBillingSetupResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/billing_setup_service.proto", fileDescriptor_0a012b9d34a4d410)
+}
+
+var fileDescriptor_0a012b9d34a4d410 = []byte{
+	// 545 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x31, 0x6f, 0xd3, 0x40,
+	0x14, 0xe6, 0x52, 0x29, 0x52, 0x2f, 0x20, 0xa4, 0x43, 0xa0, 0x10, 0x21, 0x11, 0x99, 0x0e, 0x55,
+	0x86, 0x3b, 0x39, 0x08, 0x05, 0x5d, 0x1b, 0x21, 0x67, 0x49, 0x3b, 0x00, 0x95, 0x2b, 0x32, 0xa0,
+	0x48, 0x91, 0x1b, 0x9f, 0x2c, 0x4b, 0xb6, 0xcf, 0xf8, 0x9d, 0xb3, 0x54, 0x5d, 0xd8, 0x98, 0xbb,
+	0x33, 0x30, 0xb2, 0xf3, 0x27, 0x18, 0x58, 0xf8, 0x0b, 0x4c, 0xfc, 0x09, 0x90, 0x7d, 0xbe, 0x34,
+	0xa1, 0x8e, 0x42, 0xbb, 0x3d, 0x9f, 0xdf, 0xf7, 0x7d, 0xef, 0x7d, 0xef, 0xdd, 0xe1, 0xc3, 0x40,
+	0xca, 0x20, 0x12, 0xcc, 0xf3, 0x81, 0xe9, 0xb0, 0x88, 0x16, 0x36, 0x03, 0x91, 0x2d, 0xc2, 0xb9,
+	0x00, 0x76, 0x16, 0x46, 0x51, 0x98, 0x04, 0x33, 0x10, 0x2a, 0x4f, 0x67, 0xd5, 0x31, 0x4d, 0x33,
+	0xa9, 0x24, 0xe9, 0x6a, 0x08, 0xf5, 0x7c, 0xa0, 0x4b, 0x34, 0x5d, 0xd8, 0xd4, 0xa0, 0x3b, 0x2f,
+	0x36, 0xf1, 0x67, 0x02, 0x64, 0x9e, 0x5d, 0x13, 0xd0, 0xc4, 0x9d, 0x27, 0x06, 0x96, 0x86, 0xcc,
+	0x4b, 0x12, 0xa9, 0x3c, 0x15, 0xca, 0x04, 0xf4, 0x5f, 0x6b, 0x88, 0x1f, 0x8d, 0x85, 0x1a, 0x69,
+	0xdc, 0x69, 0x01, 0x73, 0xc5, 0x87, 0x5c, 0x80, 0x22, 0xcf, 0xf0, 0x3d, 0x43, 0x3c, 0x4b, 0xbc,
+	0x58, 0xb4, 0x51, 0x17, 0xed, 0xef, 0xba, 0x77, 0xcd, 0xe1, 0x1b, 0x2f, 0x16, 0xd6, 0x25, 0xc2,
+	0x8f, 0x5f, 0xe7, 0xca, 0x53, 0xa2, 0x8e, 0xe2, 0x29, 0x6e, 0xcd, 0x73, 0x50, 0x32, 0x16, 0xd9,
+	0x2c, 0xf4, 0x2b, 0x02, 0x6c, 0x8e, 0x8e, 0x7d, 0xf2, 0x0e, 0xef, 0xca, 0x54, 0x64, 0x65, 0x45,
+	0xed, 0x46, 0x17, 0xed, 0xb7, 0xfa, 0x03, 0xba, 0xcd, 0x08, 0xba, 0x2a, 0xf5, 0xd6, 0xc0, 0xdd,
+	0x2b, 0x26, 0xeb, 0x13, 0xc2, 0x0f, 0x6b, 0x93, 0xc8, 0x31, 0x6e, 0xce, 0x33, 0xe1, 0x29, 0x51,
+	0xa9, 0xb1, 0x8d, 0x6a, 0x4b, 0x53, 0xd7, 0xe4, 0x8e, 0xee, 0xb8, 0x15, 0x01, 0x69, 0xe3, 0x66,
+	0x26, 0x62, 0xb9, 0xa8, 0x8c, 0x29, 0xfe, 0xe8, 0xef, 0x51, 0x6b, 0xa5, 0x2b, 0x2b, 0xc5, 0x9d,
+	0x3a, 0x83, 0x20, 0x95, 0x09, 0x08, 0xe2, 0x16, 0x24, 0x90, 0x47, 0xaa, 0x24, 0x69, 0xf5, 0xf9,
+	0xf6, 0xee, 0x6b, 0xd9, 0xf2, 0x48, 0xb9, 0x15, 0x93, 0xf5, 0x0a, 0xb7, 0x37, 0xe5, 0xfc, 0xd7,
+	0x50, 0xfb, 0x9f, 0x77, 0xf0, 0x83, 0x55, 0xec, 0xa9, 0x96, 0x26, 0xdf, 0x10, 0xbe, 0xff, 0xcf,
+	0xb2, 0x90, 0x97, 0xdb, 0x0b, 0xae, 0xdf, 0xaf, 0xce, 0x4d, 0xad, 0xb7, 0x06, 0x1f, 0x7f, 0xfe,
+	0xba, 0x6c, 0xd8, 0x84, 0x15, 0x3b, 0x7f, 0xbe, 0xd6, 0xc6, 0xd0, 0xec, 0x14, 0xb0, 0x9e, 0xb9,
+	0x04, 0x25, 0x08, 0x58, 0xef, 0x82, 0xfc, 0x40, 0x98, 0x5c, 0x77, 0x84, 0x1c, 0xdc, 0xce, 0x6b,
+	0x5d, 0xfd, 0xe1, 0x2d, 0x07, 0x55, 0x8e, 0xdd, 0x1a, 0x96, 0xad, 0x0c, 0xac, 0x7e, 0xd1, 0xca,
+	0x55, 0xed, 0xe7, 0x2b, 0xb7, 0x65, 0xd8, 0xbb, 0x58, 0xef, 0x84, 0xc7, 0x25, 0x1f, 0x47, 0xbd,
+	0xd1, 0x1f, 0x84, 0xf7, 0xe6, 0x32, 0xde, 0x5a, 0xc2, 0xa8, 0x5d, 0x33, 0xc6, 0x93, 0xe2, 0xde,
+	0x9f, 0xa0, 0xf7, 0x47, 0x15, 0x3a, 0x90, 0x91, 0x97, 0x04, 0x54, 0x66, 0x01, 0x0b, 0x44, 0x52,
+	0xbe, 0x0a, 0xe6, 0x79, 0x49, 0x43, 0xd8, 0xfc, 0x9a, 0x1d, 0x98, 0xe0, 0x4b, 0x63, 0x67, 0xec,
+	0x38, 0x5f, 0x1b, 0xdd, 0xb1, 0x26, 0x74, 0x7c, 0xa0, 0x3a, 0x2c, 0xa2, 0x89, 0x4d, 0x2b, 0x61,
+	0xf8, 0x6e, 0x52, 0xa6, 0x8e, 0x0f, 0xd3, 0x65, 0xca, 0x74, 0x62, 0x4f, 0x4d, 0xca, 0xef, 0xc6,
+	0x9e, 0x3e, 0xe7, 0xdc, 0xf1, 0x81, 0xf3, 0x65, 0x12, 0xe7, 0x13, 0x9b, 0x73, 0x93, 0x76, 0xd6,
+	0x2c, 0xeb, 0x7c, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x00, 0x54, 0x93, 0x74, 0x05, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -457,46 +443,3 @@ var _BillingSetupService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/billing_setup_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/billing_setup_service.proto", fileDescriptor_billing_setup_service_6bff980c1ed14b83)
-}
-
-var fileDescriptor_billing_setup_service_6bff980c1ed14b83 = []byte{
-	// 545 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x31, 0x6f, 0xd3, 0x40,
-	0x14, 0xe6, 0x52, 0x29, 0x52, 0x2f, 0x20, 0xa4, 0x43, 0xa0, 0x10, 0x21, 0x11, 0x99, 0x0e, 0x55,
-	0x86, 0x3b, 0x39, 0x08, 0x05, 0x5d, 0x1b, 0x21, 0x67, 0x49, 0x3b, 0x00, 0x95, 0x2b, 0x32, 0xa0,
-	0x48, 0x91, 0x1b, 0x9f, 0x2c, 0x4b, 0xb6, 0xcf, 0xf8, 0x9d, 0xb3, 0x54, 0x5d, 0xd8, 0x98, 0xbb,
-	0x33, 0x30, 0xb2, 0xf3, 0x27, 0x18, 0x58, 0xf8, 0x0b, 0x4c, 0xfc, 0x09, 0x90, 0x7d, 0xbe, 0x34,
-	0xa1, 0x8e, 0x42, 0xbb, 0x3d, 0x9f, 0xdf, 0xf7, 0x7d, 0xef, 0x7d, 0xef, 0xdd, 0xe1, 0xc3, 0x40,
-	0xca, 0x20, 0x12, 0xcc, 0xf3, 0x81, 0xe9, 0xb0, 0x88, 0x16, 0x36, 0x03, 0x91, 0x2d, 0xc2, 0xb9,
-	0x00, 0x76, 0x16, 0x46, 0x51, 0x98, 0x04, 0x33, 0x10, 0x2a, 0x4f, 0x67, 0xd5, 0x31, 0x4d, 0x33,
-	0xa9, 0x24, 0xe9, 0x6a, 0x08, 0xf5, 0x7c, 0xa0, 0x4b, 0x34, 0x5d, 0xd8, 0xd4, 0xa0, 0x3b, 0x2f,
-	0x36, 0xf1, 0x67, 0x02, 0x64, 0x9e, 0x5d, 0x13, 0xd0, 0xc4, 0x9d, 0x27, 0x06, 0x96, 0x86, 0xcc,
-	0x4b, 0x12, 0xa9, 0x3c, 0x15, 0xca, 0x04, 0xf4, 0x5f, 0x6b, 0x88, 0x1f, 0x8d, 0x85, 0x1a, 0x69,
-	0xdc, 0x69, 0x01, 0x73, 0xc5, 0x87, 0x5c, 0x80, 0x22, 0xcf, 0xf0, 0x3d, 0x43, 0x3c, 0x4b, 0xbc,
-	0x58, 0xb4, 0x51, 0x17, 0xed, 0xef, 0xba, 0x77, 0xcd, 0xe1, 0x1b, 0x2f, 0x16, 0xd6, 0x25, 0xc2,
-	0x8f, 0x5f, 0xe7, 0xca, 0x53, 0xa2, 0x8e, 0xe2, 0x29, 0x6e, 0xcd, 0x73, 0x50, 0x32, 0x16, 0xd9,
-	0x2c, 0xf4, 0x2b, 0x02, 0x6c, 0x8e, 0x8e, 0x7d, 0xf2, 0x0e, 0xef, 0xca, 0x54, 0x64, 0x65, 0x45,
-	0xed, 0x46, 0x17, 0xed, 0xb7, 0xfa, 0x03, 0xba, 0xcd, 0x08, 0xba, 0x2a, 0xf5, 0xd6, 0xc0, 0xdd,
-	0x2b, 0x26, 0xeb, 0x13, 0xc2, 0x0f, 0x6b, 0x93, 0xc8, 0x31, 0x6e, 0xce, 0x33, 0xe1, 0x29, 0x51,
-	0xa9, 0xb1, 0x8d, 0x6a, 0x4b, 0x53, 0xd7, 0xe4, 0x8e, 0xee, 0xb8, 0x15, 0x01, 0x69, 0xe3, 0x66,
-	0x26, 0x62, 0xb9, 0xa8, 0x8c, 0x29, 0xfe, 0xe8, 0xef, 0x51, 0x6b, 0xa5, 0x2b, 0x2b, 0xc5, 0x9d,
-	0x3a, 0x83, 0x20, 0x95, 0x09, 0x08, 0xe2, 0x16, 0x24, 0x90, 0x47, 0xaa, 0x24, 0x69, 0xf5, 0xf9,
-	0xf6, 0xee, 0x6b, 0xd9, 0xf2, 0x48, 0xb9, 0x15, 0x93, 0xf5, 0x0a, 0xb7, 0x37, 0xe5, 0xfc, 0xd7,
-	0x50, 0xfb, 0x9f, 0x77, 0xf0, 0x83, 0x55, 0xec, 0xa9, 0x96, 0x26, 0xdf, 0x10, 0xbe, 0xff, 0xcf,
-	0xb2, 0x90, 0x97, 0xdb, 0x0b, 0xae, 0xdf, 0xaf, 0xce, 0x4d, 0xad, 0xb7, 0x06, 0x1f, 0x7f, 0xfe,
-	0xba, 0x6c, 0xd8, 0x84, 0x15, 0x3b, 0x7f, 0xbe, 0xd6, 0xc6, 0xd0, 0xec, 0x14, 0xb0, 0x9e, 0xb9,
-	0x04, 0x25, 0x08, 0x58, 0xef, 0x82, 0xfc, 0x40, 0x98, 0x5c, 0x77, 0x84, 0x1c, 0xdc, 0xce, 0x6b,
-	0x5d, 0xfd, 0xe1, 0x2d, 0x07, 0x55, 0x8e, 0xdd, 0x1a, 0x96, 0xad, 0x0c, 0xac, 0x7e, 0xd1, 0xca,
-	0x55, 0xed, 0xe7, 0x2b, 0xb7, 0x65, 0xd8, 0xbb, 0x58, 0xef, 0x84, 0xc7, 0x25, 0x1f, 0x47, 0xbd,
-	0xd1, 0x1f, 0x84, 0xf7, 0xe6, 0x32, 0xde, 0x5a, 0xc2, 0xa8, 0x5d, 0x33, 0xc6, 0x93, 0xe2, 0xde,
-	0x9f, 0xa0, 0xf7, 0x47, 0x15, 0x3a, 0x90, 0x91, 0x97, 0x04, 0x54, 0x66, 0x01, 0x0b, 0x44, 0x52,
-	0xbe, 0x0a, 0xe6, 0x79, 0x49, 0x43, 0xd8, 0xfc, 0x9a, 0x1d, 0x98, 0xe0, 0x4b, 0x63, 0x67, 0xec,
-	0x38, 0x5f, 0x1b, 0xdd, 0xb1, 0x26, 0x74, 0x7c, 0xa0, 0x3a, 0x2c, 0xa2, 0x89, 0x4d, 0x2b, 0x61,
-	0xf8, 0x6e, 0x52, 0xa6, 0x8e, 0x0f, 0xd3, 0x65, 0xca, 0x74, 0x62, 0x4f, 0x4d, 0xca, 0xef, 0xc6,
-	0x9e, 0x3e, 0xe7, 0xdc, 0xf1, 0x81, 0xf3, 0x65, 0x12, 0xe7, 0x13, 0x9b, 0x73, 0x93, 0x76, 0xd6,
-	0x2c, 0xeb, 0x7c, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x00, 0x54, 0x93, 0x74, 0x05, 0x00,
-	0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_audience_view_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_audience_view_service.pb.go
index b9b32bd170..6e81f74fb5 100644
--- a/googleapis/ads/googleads/v1/services/campaign_audience_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_audience_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_audience_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignAudienceViewService.GetCampaignAudienceView][google.ads.googleads.v1.services.CampaignAudienceViewService.GetCampaignAudienceView].
 type GetCampaignAudienceViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetCampaignAudienceViewRequest) Reset()         { *m = GetCampaignAudie
 func (m *GetCampaignAudienceViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignAudienceViewRequest) ProtoMessage()    {}
 func (*GetCampaignAudienceViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_audience_view_service_4246c126b41f8f58, []int{0}
+	return fileDescriptor_ae1606ecaa0347f1, []int{0}
 }
+
 func (m *GetCampaignAudienceViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignAudienceViewRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignAudienceViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignAudienceViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignAudienceViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignAudienceViewRequest.Merge(dst, src)
+func (m *GetCampaignAudienceViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignAudienceViewRequest.Merge(m, src)
 }
 func (m *GetCampaignAudienceViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignAudienceViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetCampaignAudienceViewRequest)(nil), "google.ads.googleads.v1.services.GetCampaignAudienceViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_audience_view_service.proto", fileDescriptor_ae1606ecaa0347f1)
+}
+
+var fileDescriptor_ae1606ecaa0347f1 = []byte{
+	// 378 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x3d, 0x6b, 0xdb, 0x40,
+	0x18, 0x46, 0x2a, 0x14, 0x2a, 0xda, 0x45, 0x4b, 0x8b, 0x5b, 0x8a, 0x70, 0x3d, 0x14, 0x0f, 0x77,
+	0xa8, 0x1d, 0x4c, 0x2e, 0xe4, 0x43, 0x0e, 0xc6, 0x99, 0x82, 0x71, 0x40, 0x43, 0x10, 0x88, 0x8b,
+	0x74, 0x88, 0x03, 0xeb, 0x4e, 0xd1, 0x2b, 0xc9, 0x43, 0xc8, 0x92, 0x25, 0x3f, 0x20, 0xff, 0x20,
+	0x63, 0x7e, 0x4a, 0xd6, 0x90, 0x7f, 0x90, 0x29, 0x7b, 0xf6, 0x20, 0x9f, 0x4e, 0x24, 0x60, 0xd9,
+	0xdb, 0xc3, 0xdd, 0xf3, 0x71, 0xef, 0xf3, 0x9e, 0x35, 0x49, 0xa4, 0x4c, 0x16, 0x0c, 0xd3, 0x18,
+	0xb0, 0x82, 0x35, 0xaa, 0x5c, 0x0c, 0x2c, 0xaf, 0x78, 0xc4, 0x00, 0x47, 0x34, 0xcd, 0x28, 0x4f,
+	0x44, 0x48, 0xcb, 0x98, 0x33, 0x11, 0xb1, 0xb0, 0xe2, 0x6c, 0x19, 0x36, 0xf7, 0x28, 0xcb, 0x65,
+	0x21, 0x6d, 0x47, 0x69, 0x11, 0x8d, 0x01, 0xb5, 0x36, 0xa8, 0x72, 0x91, 0xb6, 0xe9, 0xed, 0x77,
+	0x05, 0xe5, 0x0c, 0x64, 0x99, 0x77, 0x27, 0xa9, 0x84, 0xde, 0x2f, 0xad, 0xcf, 0x38, 0xa6, 0x42,
+	0xc8, 0x82, 0x16, 0x5c, 0x0a, 0x50, 0xb7, 0xfd, 0x89, 0xf5, 0x7b, 0xca, 0x8a, 0xa3, 0xc6, 0xc0,
+	0x6b, 0xf4, 0x3e, 0x67, 0xcb, 0x39, 0xbb, 0x28, 0x19, 0x14, 0xf6, 0x1f, 0xeb, 0x9b, 0x4e, 0x0a,
+	0x05, 0x4d, 0xd9, 0x0f, 0xc3, 0x31, 0xfe, 0x7e, 0x99, 0x7f, 0xd5, 0x87, 0x27, 0x34, 0x65, 0xff,
+	0x5e, 0x0d, 0xeb, 0xe7, 0x3a, 0x93, 0x53, 0x35, 0x85, 0xfd, 0x64, 0x58, 0xdf, 0x3b, 0x72, 0xec,
+	0x43, 0xb4, 0xad, 0x03, 0xb4, 0xf9, 0x89, 0xbd, 0x51, 0xa7, 0x43, 0xdb, 0x11, 0x5a, 0xa7, 0xef,
+	0x1f, 0x5c, 0x3f, 0x3e, 0xdf, 0x9a, 0x3b, 0xf6, 0xa8, 0xee, 0xf3, 0xf2, 0xc3, 0x98, 0x7b, 0x51,
+	0x09, 0x85, 0x4c, 0x59, 0x0e, 0x78, 0xd8, 0x16, 0xfc, 0x5e, 0x0c, 0x78, 0x78, 0x35, 0xbe, 0x31,
+	0xad, 0x41, 0x24, 0xd3, 0xad, 0x13, 0x8c, 0x9d, 0x0d, 0xed, 0xcc, 0xea, 0x4d, 0xcc, 0x8c, 0xb3,
+	0xe3, 0xc6, 0x25, 0x91, 0x0b, 0x2a, 0x12, 0x24, 0xf3, 0x04, 0x27, 0x4c, 0xac, 0xf6, 0xa4, 0x37,
+	0x9f, 0x71, 0xe8, 0xfe, 0x71, 0xbb, 0x1a, 0xdc, 0x99, 0x9f, 0xa6, 0x9e, 0x77, 0x6f, 0x3a, 0x53,
+	0x65, 0xe8, 0xc5, 0x80, 0x14, 0xac, 0x91, 0xef, 0xa2, 0x26, 0x18, 0x1e, 0x34, 0x25, 0xf0, 0x62,
+	0x08, 0x5a, 0x4a, 0xe0, 0xbb, 0x81, 0xa6, 0xbc, 0x98, 0x03, 0x75, 0x4e, 0x88, 0x17, 0x03, 0x21,
+	0x2d, 0x89, 0x10, 0xdf, 0x25, 0x44, 0xd3, 0xce, 0x3f, 0xaf, 0xde, 0xf9, 0xff, 0x2d, 0x00, 0x00,
+	0xff, 0xff, 0x7f, 0x73, 0xad, 0x2f, 0x18, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _CampaignAudienceViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_audience_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_audience_view_service.proto", fileDescriptor_campaign_audience_view_service_4246c126b41f8f58)
-}
-
-var fileDescriptor_campaign_audience_view_service_4246c126b41f8f58 = []byte{
-	// 378 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x3d, 0x6b, 0xdb, 0x40,
-	0x18, 0x46, 0x2a, 0x14, 0x2a, 0xda, 0x45, 0x4b, 0x8b, 0x5b, 0x8a, 0x70, 0x3d, 0x14, 0x0f, 0x77,
-	0xa8, 0x1d, 0x4c, 0x2e, 0xe4, 0x43, 0x0e, 0xc6, 0x99, 0x82, 0x71, 0x40, 0x43, 0x10, 0x88, 0x8b,
-	0x74, 0x88, 0x03, 0xeb, 0x4e, 0xd1, 0x2b, 0xc9, 0x43, 0xc8, 0x92, 0x25, 0x3f, 0x20, 0xff, 0x20,
-	0x63, 0x7e, 0x4a, 0xd6, 0x90, 0x7f, 0x90, 0x29, 0x7b, 0xf6, 0x20, 0x9f, 0x4e, 0x24, 0x60, 0xd9,
-	0xdb, 0xc3, 0xdd, 0xf3, 0x71, 0xef, 0xf3, 0x9e, 0x35, 0x49, 0xa4, 0x4c, 0x16, 0x0c, 0xd3, 0x18,
-	0xb0, 0x82, 0x35, 0xaa, 0x5c, 0x0c, 0x2c, 0xaf, 0x78, 0xc4, 0x00, 0x47, 0x34, 0xcd, 0x28, 0x4f,
-	0x44, 0x48, 0xcb, 0x98, 0x33, 0x11, 0xb1, 0xb0, 0xe2, 0x6c, 0x19, 0x36, 0xf7, 0x28, 0xcb, 0x65,
-	0x21, 0x6d, 0x47, 0x69, 0x11, 0x8d, 0x01, 0xb5, 0x36, 0xa8, 0x72, 0x91, 0xb6, 0xe9, 0xed, 0x77,
-	0x05, 0xe5, 0x0c, 0x64, 0x99, 0x77, 0x27, 0xa9, 0x84, 0xde, 0x2f, 0xad, 0xcf, 0x38, 0xa6, 0x42,
-	0xc8, 0x82, 0x16, 0x5c, 0x0a, 0x50, 0xb7, 0xfd, 0x89, 0xf5, 0x7b, 0xca, 0x8a, 0xa3, 0xc6, 0xc0,
-	0x6b, 0xf4, 0x3e, 0x67, 0xcb, 0x39, 0xbb, 0x28, 0x19, 0x14, 0xf6, 0x1f, 0xeb, 0x9b, 0x4e, 0x0a,
-	0x05, 0x4d, 0xd9, 0x0f, 0xc3, 0x31, 0xfe, 0x7e, 0x99, 0x7f, 0xd5, 0x87, 0x27, 0x34, 0x65, 0xff,
-	0x5e, 0x0d, 0xeb, 0xe7, 0x3a, 0x93, 0x53, 0x35, 0x85, 0xfd, 0x64, 0x58, 0xdf, 0x3b, 0x72, 0xec,
-	0x43, 0xb4, 0xad, 0x03, 0xb4, 0xf9, 0x89, 0xbd, 0x51, 0xa7, 0x43, 0xdb, 0x11, 0x5a, 0xa7, 0xef,
-	0x1f, 0x5c, 0x3f, 0x3e, 0xdf, 0x9a, 0x3b, 0xf6, 0xa8, 0xee, 0xf3, 0xf2, 0xc3, 0x98, 0x7b, 0x51,
-	0x09, 0x85, 0x4c, 0x59, 0x0e, 0x78, 0xd8, 0x16, 0xfc, 0x5e, 0x0c, 0x78, 0x78, 0x35, 0xbe, 0x31,
-	0xad, 0x41, 0x24, 0xd3, 0xad, 0x13, 0x8c, 0x9d, 0x0d, 0xed, 0xcc, 0xea, 0x4d, 0xcc, 0x8c, 0xb3,
-	0xe3, 0xc6, 0x25, 0x91, 0x0b, 0x2a, 0x12, 0x24, 0xf3, 0x04, 0x27, 0x4c, 0xac, 0xf6, 0xa4, 0x37,
-	0x9f, 0x71, 0xe8, 0xfe, 0x71, 0xbb, 0x1a, 0xdc, 0x99, 0x9f, 0xa6, 0x9e, 0x77, 0x6f, 0x3a, 0x53,
-	0x65, 0xe8, 0xc5, 0x80, 0x14, 0xac, 0x91, 0xef, 0xa2, 0x26, 0x18, 0x1e, 0x34, 0x25, 0xf0, 0x62,
-	0x08, 0x5a, 0x4a, 0xe0, 0xbb, 0x81, 0xa6, 0xbc, 0x98, 0x03, 0x75, 0x4e, 0x88, 0x17, 0x03, 0x21,
-	0x2d, 0x89, 0x10, 0xdf, 0x25, 0x44, 0xd3, 0xce, 0x3f, 0xaf, 0xde, 0xf9, 0xff, 0x2d, 0x00, 0x00,
-	0xff, 0xff, 0x7f, 0x73, 0xad, 0x2f, 0x18, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_bid_modifier_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_bid_modifier_service.pb.go
index f66efa31ac..c91e0c5f72 100644
--- a/googleapis/ads/googleads/v1/services/campaign_bid_modifier_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_bid_modifier_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_bid_modifier_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignBidModifierService.GetCampaignBidModifier][google.ads.googleads.v1.services.CampaignBidModifierService.GetCampaignBidModifier].
 type GetCampaignBidModifierRequest struct {
@@ -41,16 +41,17 @@ func (m *GetCampaignBidModifierRequest) Reset()         { *m = GetCampaignBidMod
 func (m *GetCampaignBidModifierRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignBidModifierRequest) ProtoMessage()    {}
 func (*GetCampaignBidModifierRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_bid_modifier_service_eb7befde0ae1b2cc, []int{0}
+	return fileDescriptor_27d42c41001293b8, []int{0}
 }
+
 func (m *GetCampaignBidModifierRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignBidModifierRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignBidModifierRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignBidModifierRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignBidModifierRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignBidModifierRequest.Merge(dst, src)
+func (m *GetCampaignBidModifierRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignBidModifierRequest.Merge(m, src)
 }
 func (m *GetCampaignBidModifierRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignBidModifierRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateCampaignBidModifiersRequest) Reset()         { *m = MutateCampaig
 func (m *MutateCampaignBidModifiersRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignBidModifiersRequest) ProtoMessage()    {}
 func (*MutateCampaignBidModifiersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_bid_modifier_service_eb7befde0ae1b2cc, []int{1}
+	return fileDescriptor_27d42c41001293b8, []int{1}
 }
+
 func (m *MutateCampaignBidModifiersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignBidModifiersRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignBidModifiersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignBidModifiersRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignBidModifiersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignBidModifiersRequest.Merge(dst, src)
+func (m *MutateCampaignBidModifiersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignBidModifiersRequest.Merge(m, src)
 }
 func (m *MutateCampaignBidModifiersRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignBidModifiersRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *CampaignBidModifierOperation) Reset()         { *m = CampaignBidModifie
 func (m *CampaignBidModifierOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignBidModifierOperation) ProtoMessage()    {}
 func (*CampaignBidModifierOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_bid_modifier_service_eb7befde0ae1b2cc, []int{2}
+	return fileDescriptor_27d42c41001293b8, []int{2}
 }
+
 func (m *CampaignBidModifierOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignBidModifierOperation.Unmarshal(m, b)
 }
 func (m *CampaignBidModifierOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignBidModifierOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignBidModifierOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignBidModifierOperation.Merge(dst, src)
+func (m *CampaignBidModifierOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignBidModifierOperation.Merge(m, src)
 }
 func (m *CampaignBidModifierOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignBidModifierOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *CampaignBidModifierOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignBidModifierOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignBidModifierOperation_OneofMarshaler, _CampaignBidModifierOperation_OneofUnmarshaler, _CampaignBidModifierOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignBidModifierOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignBidModifierOperation_Create)(nil),
 		(*CampaignBidModifierOperation_Update)(nil),
 		(*CampaignBidModifierOperation_Remove)(nil),
 	}
 }
 
-func _CampaignBidModifierOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignBidModifierOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignBidModifierOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignBidModifierOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CampaignBidModifierOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignBidModifierOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignBidModifierOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignBidModifierOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignBidModifier)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignBidModifierOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignBidModifier)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignBidModifierOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignBidModifierOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignBidModifierOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignBidModifierOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignBidModifierOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignBidModifierOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignBidModifierOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for campaign bid modifiers mutate.
 type MutateCampaignBidModifiersResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateCampaignBidModifiersResponse) Reset()         { *m = MutateCampai
 func (m *MutateCampaignBidModifiersResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignBidModifiersResponse) ProtoMessage()    {}
 func (*MutateCampaignBidModifiersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_bid_modifier_service_eb7befde0ae1b2cc, []int{3}
+	return fileDescriptor_27d42c41001293b8, []int{3}
 }
+
 func (m *MutateCampaignBidModifiersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignBidModifiersResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignBidModifiersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignBidModifiersResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignBidModifiersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignBidModifiersResponse.Merge(dst, src)
+func (m *MutateCampaignBidModifiersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignBidModifiersResponse.Merge(m, src)
 }
 func (m *MutateCampaignBidModifiersResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignBidModifiersResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateCampaignBidModifierResult) Reset()         { *m = MutateCampaignB
 func (m *MutateCampaignBidModifierResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignBidModifierResult) ProtoMessage()    {}
 func (*MutateCampaignBidModifierResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_bid_modifier_service_eb7befde0ae1b2cc, []int{4}
+	return fileDescriptor_27d42c41001293b8, []int{4}
 }
+
 func (m *MutateCampaignBidModifierResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignBidModifierResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignBidModifierResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignBidModifierResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignBidModifierResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignBidModifierResult.Merge(dst, src)
+func (m *MutateCampaignBidModifierResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignBidModifierResult.Merge(m, src)
 }
 func (m *MutateCampaignBidModifierResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignBidModifierResult.Size(m)
@@ -425,6 +350,60 @@ func init() {
 	proto.RegisterType((*MutateCampaignBidModifierResult)(nil), "google.ads.googleads.v1.services.MutateCampaignBidModifierResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_bid_modifier_service.proto", fileDescriptor_27d42c41001293b8)
+}
+
+var fileDescriptor_27d42c41001293b8 = []byte{
+	// 728 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6e, 0xd3, 0x4c,
+	0x14, 0xc0, 0x3f, 0x3b, 0x9f, 0x0a, 0x9d, 0x14, 0x90, 0x06, 0x01, 0x51, 0x54, 0x68, 0x30, 0x95,
+	0xa8, 0xb2, 0xb0, 0x95, 0x20, 0x55, 0xe0, 0xaa, 0x45, 0x49, 0x43, 0x5a, 0x16, 0xa5, 0x95, 0x2b,
+	0x75, 0x01, 0x11, 0xd6, 0xd4, 0x9e, 0x58, 0xa3, 0xda, 0x1e, 0x33, 0x33, 0x0e, 0xaa, 0xaa, 0x6e,
+	0x58, 0x70, 0x01, 0x6e, 0xc0, 0x82, 0x05, 0x37, 0x81, 0x1d, 0xe2, 0x02, 0x2c, 0x58, 0x21, 0xb1,
+	0xe1, 0x04, 0xc8, 0x1e, 0x4f, 0x68, 0xab, 0xb8, 0x41, 0x74, 0xf7, 0xfc, 0xe6, 0xf9, 0xf7, 0xfe,
+	0xce, 0x1b, 0xd0, 0x0b, 0x28, 0x0d, 0x42, 0x6c, 0x21, 0x9f, 0x5b, 0x52, 0xcc, 0xa4, 0x51, 0xcb,
+	0xe2, 0x98, 0x8d, 0x88, 0x87, 0xb9, 0xe5, 0xa1, 0x28, 0x41, 0x24, 0x88, 0xdd, 0x7d, 0xe2, 0xbb,
+	0x11, 0xf5, 0xc9, 0x90, 0x60, 0xe6, 0x16, 0xc7, 0x66, 0xc2, 0xa8, 0xa0, 0xb0, 0x21, 0x7f, 0x35,
+	0x91, 0xcf, 0xcd, 0x31, 0xc5, 0x1c, 0xb5, 0x4c, 0x45, 0xa9, 0xaf, 0x96, 0xf9, 0x61, 0x98, 0xd3,
+	0x94, 0x95, 0x3a, 0x92, 0x0e, 0xea, 0xf3, 0xea, 0xf7, 0x84, 0x58, 0x28, 0x8e, 0xa9, 0x40, 0x82,
+	0xd0, 0x98, 0x17, 0xa7, 0x85, 0x7b, 0x2b, 0xff, 0xda, 0x4f, 0x87, 0xd6, 0x90, 0xe0, 0xd0, 0x77,
+	0x23, 0xc4, 0x0f, 0x0a, 0x8b, 0x3b, 0x67, 0x2d, 0x5e, 0x33, 0x94, 0x24, 0x98, 0x29, 0xc2, 0xad,
+	0xe2, 0x9c, 0x25, 0x9e, 0xc5, 0x05, 0x12, 0x69, 0x71, 0x60, 0xf4, 0xc0, 0xed, 0x0d, 0x2c, 0xd6,
+	0x8b, 0xd0, 0xba, 0xc4, 0xdf, 0x2a, 0x02, 0x73, 0xf0, 0xab, 0x14, 0x73, 0x01, 0xef, 0x81, 0x2b,
+	0x2a, 0x05, 0x37, 0x46, 0x11, 0xae, 0x69, 0x0d, 0x6d, 0x69, 0xd6, 0x99, 0x53, 0xca, 0x67, 0x28,
+	0xc2, 0xc6, 0x2f, 0x0d, 0xdc, 0xdd, 0x4a, 0x05, 0x12, 0x78, 0x02, 0x89, 0x2b, 0xd4, 0x02, 0xa8,
+	0x7a, 0x29, 0x17, 0x34, 0xc2, 0xcc, 0x25, 0x7e, 0x01, 0x02, 0x4a, 0xf5, 0xd4, 0x87, 0x2f, 0x01,
+	0xa0, 0x09, 0x66, 0x32, 0xf7, 0x9a, 0xde, 0xa8, 0x2c, 0x55, 0xdb, 0x6b, 0xe6, 0xb4, 0xda, 0x9b,
+	0x13, 0x7c, 0x6e, 0x2b, 0x8c, 0x73, 0x82, 0x08, 0xef, 0x83, 0x6b, 0x09, 0x62, 0x82, 0xa0, 0xd0,
+	0x1d, 0x22, 0x12, 0xa6, 0x0c, 0xd7, 0x2a, 0x0d, 0x6d, 0xe9, 0xb2, 0x73, 0xb5, 0x50, 0xf7, 0xa5,
+	0x36, 0x4b, 0x7a, 0x84, 0x42, 0xe2, 0x23, 0x81, 0x5d, 0x1a, 0x87, 0x87, 0xb5, 0xff, 0x73, 0xb3,
+	0x39, 0xa5, 0xdc, 0x8e, 0xc3, 0x43, 0xe3, 0x83, 0x0e, 0xe6, 0xcf, 0x73, 0x0d, 0x57, 0x40, 0x35,
+	0x4d, 0x72, 0x46, 0xd6, 0xa9, 0x9c, 0x51, 0x6d, 0xd7, 0x55, 0x3e, 0xaa, 0x55, 0x66, 0x3f, 0x6b,
+	0xe6, 0x16, 0xe2, 0x07, 0x0e, 0x90, 0xe6, 0x99, 0x0c, 0x77, 0xc0, 0x8c, 0xc7, 0x30, 0x12, 0xb2,
+	0xe0, 0xd5, 0xf6, 0x72, 0x69, 0x1d, 0xc6, 0x13, 0x36, 0xa9, 0x10, 0x9b, 0xff, 0x39, 0x05, 0x27,
+	0x23, 0x4a, 0x7e, 0x4d, 0xbf, 0x28, 0x51, 0x72, 0x60, 0x0d, 0xcc, 0x30, 0x1c, 0xd1, 0x91, 0x2c,
+	0xe3, 0x6c, 0x76, 0x22, 0xbf, 0xbb, 0x55, 0x30, 0x3b, 0xae, 0xbb, 0xf1, 0x49, 0x03, 0xc6, 0x79,
+	0xd3, 0xc1, 0x13, 0x1a, 0x73, 0x0c, 0xfb, 0xe0, 0xc6, 0x99, 0xee, 0xb8, 0x98, 0x31, 0xca, 0x72,
+	0x78, 0xb5, 0x0d, 0x55, 0xb8, 0x2c, 0xf1, 0xcc, 0xdd, 0x7c, 0x86, 0x9d, 0xeb, 0xa7, 0xfb, 0xf6,
+	0x24, 0x33, 0x87, 0x2f, 0xc0, 0x25, 0x86, 0x79, 0x1a, 0x0a, 0x35, 0x42, 0x9d, 0xe9, 0x23, 0x54,
+	0x1a, 0x9e, 0x93, 0x93, 0x1c, 0x45, 0x34, 0xfa, 0x60, 0x61, 0x8a, 0xed, 0x5f, 0xdd, 0x98, 0xf6,
+	0xb7, 0x0a, 0xa8, 0x4f, 0x40, 0xec, 0xca, 0x80, 0xe0, 0x17, 0x0d, 0xdc, 0x9c, 0x7c, 0x2f, 0xe1,
+	0xe3, 0xe9, 0xd9, 0x9c, 0x7b, 0xa3, 0xeb, 0xff, 0xd8, 0x77, 0x63, 0xed, 0xcd, 0xd7, 0xef, 0xef,
+	0xf4, 0x87, 0x70, 0x39, 0x5b, 0x6b, 0x47, 0xa7, 0x52, 0x5c, 0x55, 0x97, 0x98, 0x5b, 0xcd, 0xf1,
+	0x9e, 0x3b, 0xd9, 0x64, 0xab, 0x79, 0x0c, 0x7f, 0x6a, 0xa0, 0x5e, 0x3e, 0x06, 0x70, 0xfd, 0x02,
+	0x5d, 0x52, 0x2b, 0xa6, 0xde, 0xbb, 0x18, 0x44, 0x4e, 0xa2, 0xd1, 0xcb, 0x33, 0x5d, 0x33, 0x1e,
+	0x65, 0x99, 0xfe, 0x49, 0xed, 0xe8, 0xc4, 0xf6, 0x5a, 0x6d, 0x1e, 0x4f, 0x4c, 0xd4, 0x8e, 0x72,
+	0xbc, 0xad, 0x35, 0xbb, 0x6f, 0x75, 0xb0, 0xe8, 0xd1, 0x68, 0x6a, 0x44, 0xdd, 0x85, 0xf2, 0x41,
+	0xd8, 0xc9, 0x96, 0xc4, 0x8e, 0xf6, 0x7c, 0xb3, 0x80, 0x04, 0x34, 0x44, 0x71, 0x60, 0x52, 0x16,
+	0x58, 0x01, 0x8e, 0xf3, 0x15, 0xa2, 0x9e, 0x9b, 0x84, 0xf0, 0xf2, 0x57, 0x6e, 0x45, 0x09, 0xef,
+	0xf5, 0xca, 0x46, 0xa7, 0xf3, 0x51, 0x6f, 0x6c, 0x48, 0x60, 0xc7, 0xe7, 0xa6, 0x14, 0x33, 0x69,
+	0xaf, 0x65, 0x16, 0x8e, 0xf9, 0x67, 0x65, 0x32, 0xe8, 0xf8, 0x7c, 0x30, 0x36, 0x19, 0xec, 0xb5,
+	0x06, 0xca, 0xe4, 0x87, 0xbe, 0x28, 0xf5, 0xb6, 0xdd, 0xf1, 0xb9, 0x6d, 0x8f, 0x8d, 0x6c, 0x7b,
+	0xaf, 0x65, 0xdb, 0xca, 0x6c, 0x7f, 0x26, 0x8f, 0xf3, 0xc1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x6b, 0x80, 0xdc, 0x8d, 0x8c, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,57 +514,3 @@ var _CampaignBidModifierService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_bid_modifier_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_bid_modifier_service.proto", fileDescriptor_campaign_bid_modifier_service_eb7befde0ae1b2cc)
-}
-
-var fileDescriptor_campaign_bid_modifier_service_eb7befde0ae1b2cc = []byte{
-	// 728 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6e, 0xd3, 0x4c,
-	0x14, 0xc0, 0x3f, 0x3b, 0x9f, 0x0a, 0x9d, 0x14, 0x90, 0x06, 0x01, 0x51, 0x54, 0x68, 0x30, 0x95,
-	0xa8, 0xb2, 0xb0, 0x95, 0x20, 0x55, 0xe0, 0xaa, 0x45, 0x49, 0x43, 0x5a, 0x16, 0xa5, 0x95, 0x2b,
-	0x75, 0x01, 0x11, 0xd6, 0xd4, 0x9e, 0x58, 0xa3, 0xda, 0x1e, 0x33, 0x33, 0x0e, 0xaa, 0xaa, 0x6e,
-	0x58, 0x70, 0x01, 0x6e, 0xc0, 0x82, 0x05, 0x37, 0x81, 0x1d, 0xe2, 0x02, 0x2c, 0x58, 0x21, 0xb1,
-	0xe1, 0x04, 0xc8, 0x1e, 0x4f, 0x68, 0xab, 0xb8, 0x41, 0x74, 0xf7, 0xfc, 0xe6, 0xf9, 0xf7, 0xfe,
-	0xce, 0x1b, 0xd0, 0x0b, 0x28, 0x0d, 0x42, 0x6c, 0x21, 0x9f, 0x5b, 0x52, 0xcc, 0xa4, 0x51, 0xcb,
-	0xe2, 0x98, 0x8d, 0x88, 0x87, 0xb9, 0xe5, 0xa1, 0x28, 0x41, 0x24, 0x88, 0xdd, 0x7d, 0xe2, 0xbb,
-	0x11, 0xf5, 0xc9, 0x90, 0x60, 0xe6, 0x16, 0xc7, 0x66, 0xc2, 0xa8, 0xa0, 0xb0, 0x21, 0x7f, 0x35,
-	0x91, 0xcf, 0xcd, 0x31, 0xc5, 0x1c, 0xb5, 0x4c, 0x45, 0xa9, 0xaf, 0x96, 0xf9, 0x61, 0x98, 0xd3,
-	0x94, 0x95, 0x3a, 0x92, 0x0e, 0xea, 0xf3, 0xea, 0xf7, 0x84, 0x58, 0x28, 0x8e, 0xa9, 0x40, 0x82,
-	0xd0, 0x98, 0x17, 0xa7, 0x85, 0x7b, 0x2b, 0xff, 0xda, 0x4f, 0x87, 0xd6, 0x90, 0xe0, 0xd0, 0x77,
-	0x23, 0xc4, 0x0f, 0x0a, 0x8b, 0x3b, 0x67, 0x2d, 0x5e, 0x33, 0x94, 0x24, 0x98, 0x29, 0xc2, 0xad,
-	0xe2, 0x9c, 0x25, 0x9e, 0xc5, 0x05, 0x12, 0x69, 0x71, 0x60, 0xf4, 0xc0, 0xed, 0x0d, 0x2c, 0xd6,
-	0x8b, 0xd0, 0xba, 0xc4, 0xdf, 0x2a, 0x02, 0x73, 0xf0, 0xab, 0x14, 0x73, 0x01, 0xef, 0x81, 0x2b,
-	0x2a, 0x05, 0x37, 0x46, 0x11, 0xae, 0x69, 0x0d, 0x6d, 0x69, 0xd6, 0x99, 0x53, 0xca, 0x67, 0x28,
-	0xc2, 0xc6, 0x2f, 0x0d, 0xdc, 0xdd, 0x4a, 0x05, 0x12, 0x78, 0x02, 0x89, 0x2b, 0xd4, 0x02, 0xa8,
-	0x7a, 0x29, 0x17, 0x34, 0xc2, 0xcc, 0x25, 0x7e, 0x01, 0x02, 0x4a, 0xf5, 0xd4, 0x87, 0x2f, 0x01,
-	0xa0, 0x09, 0x66, 0x32, 0xf7, 0x9a, 0xde, 0xa8, 0x2c, 0x55, 0xdb, 0x6b, 0xe6, 0xb4, 0xda, 0x9b,
-	0x13, 0x7c, 0x6e, 0x2b, 0x8c, 0x73, 0x82, 0x08, 0xef, 0x83, 0x6b, 0x09, 0x62, 0x82, 0xa0, 0xd0,
-	0x1d, 0x22, 0x12, 0xa6, 0x0c, 0xd7, 0x2a, 0x0d, 0x6d, 0xe9, 0xb2, 0x73, 0xb5, 0x50, 0xf7, 0xa5,
-	0x36, 0x4b, 0x7a, 0x84, 0x42, 0xe2, 0x23, 0x81, 0x5d, 0x1a, 0x87, 0x87, 0xb5, 0xff, 0x73, 0xb3,
-	0x39, 0xa5, 0xdc, 0x8e, 0xc3, 0x43, 0xe3, 0x83, 0x0e, 0xe6, 0xcf, 0x73, 0x0d, 0x57, 0x40, 0x35,
-	0x4d, 0x72, 0x46, 0xd6, 0xa9, 0x9c, 0x51, 0x6d, 0xd7, 0x55, 0x3e, 0xaa, 0x55, 0x66, 0x3f, 0x6b,
-	0xe6, 0x16, 0xe2, 0x07, 0x0e, 0x90, 0xe6, 0x99, 0x0c, 0x77, 0xc0, 0x8c, 0xc7, 0x30, 0x12, 0xb2,
-	0xe0, 0xd5, 0xf6, 0x72, 0x69, 0x1d, 0xc6, 0x13, 0x36, 0xa9, 0x10, 0x9b, 0xff, 0x39, 0x05, 0x27,
-	0x23, 0x4a, 0x7e, 0x4d, 0xbf, 0x28, 0x51, 0x72, 0x60, 0x0d, 0xcc, 0x30, 0x1c, 0xd1, 0x91, 0x2c,
-	0xe3, 0x6c, 0x76, 0x22, 0xbf, 0xbb, 0x55, 0x30, 0x3b, 0xae, 0xbb, 0xf1, 0x49, 0x03, 0xc6, 0x79,
-	0xd3, 0xc1, 0x13, 0x1a, 0x73, 0x0c, 0xfb, 0xe0, 0xc6, 0x99, 0xee, 0xb8, 0x98, 0x31, 0xca, 0x72,
-	0x78, 0xb5, 0x0d, 0x55, 0xb8, 0x2c, 0xf1, 0xcc, 0xdd, 0x7c, 0x86, 0x9d, 0xeb, 0xa7, 0xfb, 0xf6,
-	0x24, 0x33, 0x87, 0x2f, 0xc0, 0x25, 0x86, 0x79, 0x1a, 0x0a, 0x35, 0x42, 0x9d, 0xe9, 0x23, 0x54,
-	0x1a, 0x9e, 0x93, 0x93, 0x1c, 0x45, 0x34, 0xfa, 0x60, 0x61, 0x8a, 0xed, 0x5f, 0xdd, 0x98, 0xf6,
-	0xb7, 0x0a, 0xa8, 0x4f, 0x40, 0xec, 0xca, 0x80, 0xe0, 0x17, 0x0d, 0xdc, 0x9c, 0x7c, 0x2f, 0xe1,
-	0xe3, 0xe9, 0xd9, 0x9c, 0x7b, 0xa3, 0xeb, 0xff, 0xd8, 0x77, 0x63, 0xed, 0xcd, 0xd7, 0xef, 0xef,
-	0xf4, 0x87, 0x70, 0x39, 0x5b, 0x6b, 0x47, 0xa7, 0x52, 0x5c, 0x55, 0x97, 0x98, 0x5b, 0xcd, 0xf1,
-	0x9e, 0x3b, 0xd9, 0x64, 0xab, 0x79, 0x0c, 0x7f, 0x6a, 0xa0, 0x5e, 0x3e, 0x06, 0x70, 0xfd, 0x02,
-	0x5d, 0x52, 0x2b, 0xa6, 0xde, 0xbb, 0x18, 0x44, 0x4e, 0xa2, 0xd1, 0xcb, 0x33, 0x5d, 0x33, 0x1e,
-	0x65, 0x99, 0xfe, 0x49, 0xed, 0xe8, 0xc4, 0xf6, 0x5a, 0x6d, 0x1e, 0x4f, 0x4c, 0xd4, 0x8e, 0x72,
-	0xbc, 0xad, 0x35, 0xbb, 0x6f, 0x75, 0xb0, 0xe8, 0xd1, 0x68, 0x6a, 0x44, 0xdd, 0x85, 0xf2, 0x41,
-	0xd8, 0xc9, 0x96, 0xc4, 0x8e, 0xf6, 0x7c, 0xb3, 0x80, 0x04, 0x34, 0x44, 0x71, 0x60, 0x52, 0x16,
-	0x58, 0x01, 0x8e, 0xf3, 0x15, 0xa2, 0x9e, 0x9b, 0x84, 0xf0, 0xf2, 0x57, 0x6e, 0x45, 0x09, 0xef,
-	0xf5, 0xca, 0x46, 0xa7, 0xf3, 0x51, 0x6f, 0x6c, 0x48, 0x60, 0xc7, 0xe7, 0xa6, 0x14, 0x33, 0x69,
-	0xaf, 0x65, 0x16, 0x8e, 0xf9, 0x67, 0x65, 0x32, 0xe8, 0xf8, 0x7c, 0x30, 0x36, 0x19, 0xec, 0xb5,
-	0x06, 0xca, 0xe4, 0x87, 0xbe, 0x28, 0xf5, 0xb6, 0xdd, 0xf1, 0xb9, 0x6d, 0x8f, 0x8d, 0x6c, 0x7b,
-	0xaf, 0x65, 0xdb, 0xca, 0x6c, 0x7f, 0x26, 0x8f, 0xf3, 0xc1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x6b, 0x80, 0xdc, 0x8d, 0x8c, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_budget_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_budget_service.pb.go
index 559d8478db..404bf3d6d4 100644
--- a/googleapis/ads/googleads/v1/services/campaign_budget_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_budget_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_budget_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignBudgetService.GetCampaignBudget][google.ads.googleads.v1.services.CampaignBudgetService.GetCampaignBudget].
 type GetCampaignBudgetRequest struct {
@@ -41,16 +41,17 @@ func (m *GetCampaignBudgetRequest) Reset()         { *m = GetCampaignBudgetReque
 func (m *GetCampaignBudgetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignBudgetRequest) ProtoMessage()    {}
 func (*GetCampaignBudgetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_service_7c839c9c61357c69, []int{0}
+	return fileDescriptor_58d7b628a151e6ac, []int{0}
 }
+
 func (m *GetCampaignBudgetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignBudgetRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignBudgetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignBudgetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignBudgetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignBudgetRequest.Merge(dst, src)
+func (m *GetCampaignBudgetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignBudgetRequest.Merge(m, src)
 }
 func (m *GetCampaignBudgetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignBudgetRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateCampaignBudgetsRequest) Reset()         { *m = MutateCampaignBudg
 func (m *MutateCampaignBudgetsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignBudgetsRequest) ProtoMessage()    {}
 func (*MutateCampaignBudgetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_service_7c839c9c61357c69, []int{1}
+	return fileDescriptor_58d7b628a151e6ac, []int{1}
 }
+
 func (m *MutateCampaignBudgetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignBudgetsRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignBudgetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignBudgetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignBudgetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignBudgetsRequest.Merge(dst, src)
+func (m *MutateCampaignBudgetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignBudgetsRequest.Merge(m, src)
 }
 func (m *MutateCampaignBudgetsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignBudgetsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *CampaignBudgetOperation) Reset()         { *m = CampaignBudgetOperation
 func (m *CampaignBudgetOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignBudgetOperation) ProtoMessage()    {}
 func (*CampaignBudgetOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_service_7c839c9c61357c69, []int{2}
+	return fileDescriptor_58d7b628a151e6ac, []int{2}
 }
+
 func (m *CampaignBudgetOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignBudgetOperation.Unmarshal(m, b)
 }
 func (m *CampaignBudgetOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignBudgetOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignBudgetOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignBudgetOperation.Merge(dst, src)
+func (m *CampaignBudgetOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignBudgetOperation.Merge(m, src)
 }
 func (m *CampaignBudgetOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignBudgetOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *CampaignBudgetOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignBudgetOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignBudgetOperation_OneofMarshaler, _CampaignBudgetOperation_OneofUnmarshaler, _CampaignBudgetOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignBudgetOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignBudgetOperation_Create)(nil),
 		(*CampaignBudgetOperation_Update)(nil),
 		(*CampaignBudgetOperation_Remove)(nil),
 	}
 }
 
-func _CampaignBudgetOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignBudgetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignBudgetOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignBudgetOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CampaignBudgetOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignBudgetOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignBudgetOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignBudgetOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignBudget)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignBudgetOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignBudget)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignBudgetOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignBudgetOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignBudgetOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignBudgetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignBudgetOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignBudgetOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignBudgetOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for campaign budget mutate.
 type MutateCampaignBudgetsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateCampaignBudgetsResponse) Reset()         { *m = MutateCampaignBud
 func (m *MutateCampaignBudgetsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignBudgetsResponse) ProtoMessage()    {}
 func (*MutateCampaignBudgetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_service_7c839c9c61357c69, []int{3}
+	return fileDescriptor_58d7b628a151e6ac, []int{3}
 }
+
 func (m *MutateCampaignBudgetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignBudgetsResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignBudgetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignBudgetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignBudgetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignBudgetsResponse.Merge(dst, src)
+func (m *MutateCampaignBudgetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignBudgetsResponse.Merge(m, src)
 }
 func (m *MutateCampaignBudgetsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignBudgetsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateCampaignBudgetResult) Reset()         { *m = MutateCampaignBudget
 func (m *MutateCampaignBudgetResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignBudgetResult) ProtoMessage()    {}
 func (*MutateCampaignBudgetResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_budget_service_7c839c9c61357c69, []int{4}
+	return fileDescriptor_58d7b628a151e6ac, []int{4}
 }
+
 func (m *MutateCampaignBudgetResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignBudgetResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignBudgetResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignBudgetResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignBudgetResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignBudgetResult.Merge(dst, src)
+func (m *MutateCampaignBudgetResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignBudgetResult.Merge(m, src)
 }
 func (m *MutateCampaignBudgetResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignBudgetResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateCampaignBudgetResult)(nil), "google.ads.googleads.v1.services.MutateCampaignBudgetResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_budget_service.proto", fileDescriptor_58d7b628a151e6ac)
+}
+
+var fileDescriptor_58d7b628a151e6ac = []byte{
+	// 717 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x6b, 0xd4, 0x4e,
+	0x14, 0xfe, 0x25, 0xfb, 0xa3, 0xda, 0xd9, 0xaa, 0x38, 0x52, 0xba, 0x84, 0xaa, 0x4b, 0x2c, 0x58,
+	0xf6, 0x90, 0x90, 0xad, 0x20, 0x4d, 0x6d, 0xcb, 0xae, 0xd8, 0x56, 0xa4, 0xb6, 0xa4, 0xb0, 0xa0,
+	0x2c, 0x84, 0x69, 0x32, 0x0d, 0xa1, 0x49, 0x26, 0xce, 0x4c, 0x56, 0x4a, 0xe9, 0x41, 0xff, 0x05,
+	0x0f, 0xde, 0x3d, 0x7a, 0xf5, 0x2c, 0xde, 0xbd, 0x7a, 0xf2, 0xee, 0x41, 0xfc, 0x2b, 0x24, 0x99,
+	0xcc, 0xda, 0x5d, 0x37, 0xac, 0xd6, 0xdb, 0xcb, 0x9b, 0xef, 0x7d, 0xef, 0x7d, 0xf3, 0xde, 0x9b,
+	0x80, 0x8d, 0x80, 0x90, 0x20, 0xc2, 0x26, 0xf2, 0x99, 0x29, 0xcc, 0xdc, 0x1a, 0x58, 0x26, 0xc3,
+	0x74, 0x10, 0x7a, 0x98, 0x99, 0x1e, 0x8a, 0x53, 0x14, 0x06, 0x89, 0x7b, 0x98, 0xf9, 0x01, 0xe6,
+	0x6e, 0x79, 0x60, 0xa4, 0x94, 0x70, 0x02, 0x9b, 0x22, 0xc8, 0x40, 0x3e, 0x33, 0x86, 0xf1, 0xc6,
+	0xc0, 0x32, 0x64, 0xbc, 0x76, 0xbf, 0x2a, 0x03, 0xc5, 0x8c, 0x64, 0x74, 0x42, 0x0a, 0x41, 0xad,
+	0x2d, 0xca, 0xc0, 0x34, 0x34, 0x51, 0x92, 0x10, 0x8e, 0x78, 0x48, 0x12, 0x56, 0x9e, 0x96, 0x89,
+	0xcd, 0xe2, 0xeb, 0x30, 0x3b, 0x32, 0x8f, 0x42, 0x1c, 0xf9, 0x6e, 0x8c, 0xd8, 0x71, 0x89, 0xb8,
+	0x35, 0x8e, 0x78, 0x49, 0x51, 0x9a, 0x62, 0x2a, 0x19, 0x16, 0xca, 0x73, 0x9a, 0x7a, 0x26, 0xe3,
+	0x88, 0x67, 0xe5, 0x81, 0xbe, 0x09, 0x1a, 0xdb, 0x98, 0x3f, 0x2c, 0x8b, 0xea, 0x16, 0x35, 0x39,
+	0xf8, 0x45, 0x86, 0x19, 0x87, 0x77, 0xc0, 0x15, 0x59, 0xb7, 0x9b, 0xa0, 0x18, 0x37, 0x94, 0xa6,
+	0xb2, 0x3c, 0xeb, 0xcc, 0x49, 0xe7, 0x53, 0x14, 0x63, 0xfd, 0xbb, 0x02, 0x16, 0x77, 0x33, 0x8e,
+	0x38, 0x1e, 0x25, 0x61, 0x92, 0xe5, 0x36, 0xa8, 0x7b, 0x19, 0xe3, 0x24, 0xc6, 0xd4, 0x0d, 0xfd,
+	0x92, 0x03, 0x48, 0xd7, 0x63, 0x1f, 0x3e, 0x03, 0x80, 0xa4, 0x98, 0x0a, 0xc5, 0x0d, 0xb5, 0x59,
+	0x5b, 0xae, 0xb7, 0x57, 0x8d, 0x69, 0x77, 0x6d, 0x8c, 0xa6, 0xdb, 0x93, 0x0c, 0xce, 0x39, 0x32,
+	0x78, 0x17, 0x5c, 0x4b, 0x11, 0xe5, 0x21, 0x8a, 0xdc, 0x23, 0x14, 0x46, 0x19, 0xc5, 0x8d, 0x5a,
+	0x53, 0x59, 0xbe, 0xec, 0x5c, 0x2d, 0xdd, 0x5b, 0xc2, 0x9b, 0x4b, 0x1d, 0xa0, 0x28, 0xf4, 0x11,
+	0xc7, 0x2e, 0x49, 0xa2, 0x93, 0xc6, 0xff, 0x05, 0x6c, 0x4e, 0x3a, 0xf7, 0x92, 0xe8, 0x44, 0x7f,
+	0xab, 0x82, 0x85, 0x8a, 0xac, 0x70, 0x0d, 0xd4, 0xb3, 0xb4, 0x08, 0xcf, 0xbb, 0x52, 0x84, 0xd7,
+	0xdb, 0x9a, 0x54, 0x21, 0xdb, 0x62, 0x6c, 0xe5, 0x8d, 0xdb, 0x45, 0xec, 0xd8, 0x01, 0x02, 0x9e,
+	0xdb, 0xf0, 0x09, 0x98, 0xf1, 0x28, 0x46, 0x5c, 0xdc, 0x70, 0xbd, 0x6d, 0x55, 0xaa, 0x1f, 0xce,
+	0xd1, 0x98, 0xfc, 0x9d, 0xff, 0x9c, 0x92, 0x22, 0x27, 0x13, 0xd4, 0x0d, 0xf5, 0x1f, 0xc8, 0x04,
+	0x05, 0x6c, 0x80, 0x19, 0x8a, 0x63, 0x32, 0x10, 0xf7, 0x36, 0x9b, 0x9f, 0x88, 0xef, 0x6e, 0x1d,
+	0xcc, 0x0e, 0x2f, 0x5a, 0xff, 0xa4, 0x80, 0x9b, 0x15, 0x43, 0xc0, 0x52, 0x92, 0x30, 0x0c, 0xb7,
+	0xc0, 0xfc, 0x58, 0x27, 0x5c, 0x4c, 0x29, 0xa1, 0x05, 0x6f, 0xbd, 0x0d, 0x65, 0x91, 0x34, 0xf5,
+	0x8c, 0x83, 0x62, 0x40, 0x9d, 0x1b, 0xa3, 0x3d, 0x7a, 0x94, 0xc3, 0x61, 0x0f, 0x5c, 0xa2, 0x98,
+	0x65, 0x11, 0x97, 0x93, 0xf2, 0x60, 0xfa, 0xa4, 0x4c, 0xaa, 0xcc, 0x29, 0x48, 0x1c, 0x49, 0xa6,
+	0x77, 0x80, 0x56, 0x0d, 0xfb, 0xa3, 0x4d, 0x68, 0x7f, 0xa8, 0x81, 0xf9, 0xd1, 0xe8, 0x03, 0x51,
+	0x01, 0xfc, 0xa8, 0x80, 0xeb, 0xbf, 0x6d, 0x19, 0xb4, 0xa7, 0x57, 0x5e, 0xb5, 0x9a, 0xda, 0xdf,
+	0x37, 0x55, 0x5f, 0x7d, 0xfd, 0xe5, 0xdb, 0x1b, 0x75, 0x05, 0x5a, 0xf9, 0x7b, 0x74, 0x3a, 0x22,
+	0x67, 0x5d, 0x6e, 0x23, 0x33, 0x5b, 0xc3, 0x07, 0xaa, 0xec, 0xa0, 0xd9, 0x3a, 0x83, 0x5f, 0x15,
+	0x30, 0x3f, 0xb1, 0xbd, 0x70, 0xe3, 0x62, 0xb7, 0x2f, 0x1f, 0x07, 0x6d, 0xf3, 0xc2, 0xf1, 0x62,
+	0xae, 0xf4, 0xcd, 0x42, 0xd5, 0xaa, 0x7e, 0x2f, 0x57, 0xf5, 0x4b, 0xc6, 0xe9, 0xb9, 0x27, 0x67,
+	0xbd, 0x75, 0x36, 0x2e, 0xca, 0x8e, 0x0b, 0x52, 0x5b, 0x69, 0x75, 0x5f, 0xa9, 0x60, 0xc9, 0x23,
+	0xf1, 0xd4, 0x3a, 0xba, 0xda, 0xc4, 0xde, 0xee, 0xe7, 0x9b, 0xbd, 0xaf, 0x3c, 0xdf, 0x29, 0xe3,
+	0x03, 0x12, 0xa1, 0x24, 0x30, 0x08, 0x0d, 0xcc, 0x00, 0x27, 0xc5, 0xde, 0xcb, 0x3f, 0x41, 0x1a,
+	0xb2, 0xea, 0x5f, 0xcf, 0x9a, 0x34, 0xde, 0xa9, 0xb5, 0xed, 0x4e, 0xe7, 0xbd, 0xda, 0xdc, 0x16,
+	0x84, 0x1d, 0x9f, 0x19, 0xc2, 0xcc, 0xad, 0x9e, 0x65, 0x94, 0x89, 0xd9, 0x67, 0x09, 0xe9, 0x77,
+	0x7c, 0xd6, 0x1f, 0x42, 0xfa, 0x3d, 0xab, 0x2f, 0x21, 0x3f, 0xd4, 0x25, 0xe1, 0xb7, 0xed, 0x8e,
+	0xcf, 0x6c, 0x7b, 0x08, 0xb2, 0xed, 0x9e, 0x65, 0xdb, 0x12, 0x76, 0x38, 0x53, 0xd4, 0xb9, 0xf2,
+	0x33, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x22, 0xee, 0x20, 0x21, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,56 +513,3 @@ var _CampaignBudgetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_budget_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_budget_service.proto", fileDescriptor_campaign_budget_service_7c839c9c61357c69)
-}
-
-var fileDescriptor_campaign_budget_service_7c839c9c61357c69 = []byte{
-	// 717 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x6b, 0xd4, 0x4e,
-	0x14, 0xfe, 0x25, 0xfb, 0xa3, 0xda, 0xd9, 0xaa, 0x38, 0x52, 0xba, 0x84, 0xaa, 0x4b, 0x2c, 0x58,
-	0xf6, 0x90, 0x90, 0xad, 0x20, 0x4d, 0x6d, 0xcb, 0xae, 0xd8, 0x56, 0xa4, 0xb6, 0xa4, 0xb0, 0xa0,
-	0x2c, 0x84, 0x69, 0x32, 0x0d, 0xa1, 0x49, 0x26, 0xce, 0x4c, 0x56, 0x4a, 0xe9, 0x41, 0xff, 0x05,
-	0x0f, 0xde, 0x3d, 0x7a, 0xf5, 0x2c, 0xde, 0xbd, 0x7a, 0xf2, 0xee, 0x41, 0xfc, 0x2b, 0x24, 0x99,
-	0xcc, 0xda, 0x5d, 0x37, 0xac, 0xd6, 0xdb, 0xcb, 0x9b, 0xef, 0x7d, 0xef, 0x7d, 0xf3, 0xde, 0x9b,
-	0x80, 0x8d, 0x80, 0x90, 0x20, 0xc2, 0x26, 0xf2, 0x99, 0x29, 0xcc, 0xdc, 0x1a, 0x58, 0x26, 0xc3,
-	0x74, 0x10, 0x7a, 0x98, 0x99, 0x1e, 0x8a, 0x53, 0x14, 0x06, 0x89, 0x7b, 0x98, 0xf9, 0x01, 0xe6,
-	0x6e, 0x79, 0x60, 0xa4, 0x94, 0x70, 0x02, 0x9b, 0x22, 0xc8, 0x40, 0x3e, 0x33, 0x86, 0xf1, 0xc6,
-	0xc0, 0x32, 0x64, 0xbc, 0x76, 0xbf, 0x2a, 0x03, 0xc5, 0x8c, 0x64, 0x74, 0x42, 0x0a, 0x41, 0xad,
-	0x2d, 0xca, 0xc0, 0x34, 0x34, 0x51, 0x92, 0x10, 0x8e, 0x78, 0x48, 0x12, 0x56, 0x9e, 0x96, 0x89,
-	0xcd, 0xe2, 0xeb, 0x30, 0x3b, 0x32, 0x8f, 0x42, 0x1c, 0xf9, 0x6e, 0x8c, 0xd8, 0x71, 0x89, 0xb8,
-	0x35, 0x8e, 0x78, 0x49, 0x51, 0x9a, 0x62, 0x2a, 0x19, 0x16, 0xca, 0x73, 0x9a, 0x7a, 0x26, 0xe3,
-	0x88, 0x67, 0xe5, 0x81, 0xbe, 0x09, 0x1a, 0xdb, 0x98, 0x3f, 0x2c, 0x8b, 0xea, 0x16, 0x35, 0x39,
-	0xf8, 0x45, 0x86, 0x19, 0x87, 0x77, 0xc0, 0x15, 0x59, 0xb7, 0x9b, 0xa0, 0x18, 0x37, 0x94, 0xa6,
-	0xb2, 0x3c, 0xeb, 0xcc, 0x49, 0xe7, 0x53, 0x14, 0x63, 0xfd, 0xbb, 0x02, 0x16, 0x77, 0x33, 0x8e,
-	0x38, 0x1e, 0x25, 0x61, 0x92, 0xe5, 0x36, 0xa8, 0x7b, 0x19, 0xe3, 0x24, 0xc6, 0xd4, 0x0d, 0xfd,
-	0x92, 0x03, 0x48, 0xd7, 0x63, 0x1f, 0x3e, 0x03, 0x80, 0xa4, 0x98, 0x0a, 0xc5, 0x0d, 0xb5, 0x59,
-	0x5b, 0xae, 0xb7, 0x57, 0x8d, 0x69, 0x77, 0x6d, 0x8c, 0xa6, 0xdb, 0x93, 0x0c, 0xce, 0x39, 0x32,
-	0x78, 0x17, 0x5c, 0x4b, 0x11, 0xe5, 0x21, 0x8a, 0xdc, 0x23, 0x14, 0x46, 0x19, 0xc5, 0x8d, 0x5a,
-	0x53, 0x59, 0xbe, 0xec, 0x5c, 0x2d, 0xdd, 0x5b, 0xc2, 0x9b, 0x4b, 0x1d, 0xa0, 0x28, 0xf4, 0x11,
-	0xc7, 0x2e, 0x49, 0xa2, 0x93, 0xc6, 0xff, 0x05, 0x6c, 0x4e, 0x3a, 0xf7, 0x92, 0xe8, 0x44, 0x7f,
-	0xab, 0x82, 0x85, 0x8a, 0xac, 0x70, 0x0d, 0xd4, 0xb3, 0xb4, 0x08, 0xcf, 0xbb, 0x52, 0x84, 0xd7,
-	0xdb, 0x9a, 0x54, 0x21, 0xdb, 0x62, 0x6c, 0xe5, 0x8d, 0xdb, 0x45, 0xec, 0xd8, 0x01, 0x02, 0x9e,
-	0xdb, 0xf0, 0x09, 0x98, 0xf1, 0x28, 0x46, 0x5c, 0xdc, 0x70, 0xbd, 0x6d, 0x55, 0xaa, 0x1f, 0xce,
-	0xd1, 0x98, 0xfc, 0x9d, 0xff, 0x9c, 0x92, 0x22, 0x27, 0x13, 0xd4, 0x0d, 0xf5, 0x1f, 0xc8, 0x04,
-	0x05, 0x6c, 0x80, 0x19, 0x8a, 0x63, 0x32, 0x10, 0xf7, 0x36, 0x9b, 0x9f, 0x88, 0xef, 0x6e, 0x1d,
-	0xcc, 0x0e, 0x2f, 0x5a, 0xff, 0xa4, 0x80, 0x9b, 0x15, 0x43, 0xc0, 0x52, 0x92, 0x30, 0x0c, 0xb7,
-	0xc0, 0xfc, 0x58, 0x27, 0x5c, 0x4c, 0x29, 0xa1, 0x05, 0x6f, 0xbd, 0x0d, 0x65, 0x91, 0x34, 0xf5,
-	0x8c, 0x83, 0x62, 0x40, 0x9d, 0x1b, 0xa3, 0x3d, 0x7a, 0x94, 0xc3, 0x61, 0x0f, 0x5c, 0xa2, 0x98,
-	0x65, 0x11, 0x97, 0x93, 0xf2, 0x60, 0xfa, 0xa4, 0x4c, 0xaa, 0xcc, 0x29, 0x48, 0x1c, 0x49, 0xa6,
-	0x77, 0x80, 0x56, 0x0d, 0xfb, 0xa3, 0x4d, 0x68, 0x7f, 0xa8, 0x81, 0xf9, 0xd1, 0xe8, 0x03, 0x51,
-	0x01, 0xfc, 0xa8, 0x80, 0xeb, 0xbf, 0x6d, 0x19, 0xb4, 0xa7, 0x57, 0x5e, 0xb5, 0x9a, 0xda, 0xdf,
-	0x37, 0x55, 0x5f, 0x7d, 0xfd, 0xe5, 0xdb, 0x1b, 0x75, 0x05, 0x5a, 0xf9, 0x7b, 0x74, 0x3a, 0x22,
-	0x67, 0x5d, 0x6e, 0x23, 0x33, 0x5b, 0xc3, 0x07, 0xaa, 0xec, 0xa0, 0xd9, 0x3a, 0x83, 0x5f, 0x15,
-	0x30, 0x3f, 0xb1, 0xbd, 0x70, 0xe3, 0x62, 0xb7, 0x2f, 0x1f, 0x07, 0x6d, 0xf3, 0xc2, 0xf1, 0x62,
-	0xae, 0xf4, 0xcd, 0x42, 0xd5, 0xaa, 0x7e, 0x2f, 0x57, 0xf5, 0x4b, 0xc6, 0xe9, 0xb9, 0x27, 0x67,
-	0xbd, 0x75, 0x36, 0x2e, 0xca, 0x8e, 0x0b, 0x52, 0x5b, 0x69, 0x75, 0x5f, 0xa9, 0x60, 0xc9, 0x23,
-	0xf1, 0xd4, 0x3a, 0xba, 0xda, 0xc4, 0xde, 0xee, 0xe7, 0x9b, 0xbd, 0xaf, 0x3c, 0xdf, 0x29, 0xe3,
-	0x03, 0x12, 0xa1, 0x24, 0x30, 0x08, 0x0d, 0xcc, 0x00, 0x27, 0xc5, 0xde, 0xcb, 0x3f, 0x41, 0x1a,
-	0xb2, 0xea, 0x5f, 0xcf, 0x9a, 0x34, 0xde, 0xa9, 0xb5, 0xed, 0x4e, 0xe7, 0xbd, 0xda, 0xdc, 0x16,
-	0x84, 0x1d, 0x9f, 0x19, 0xc2, 0xcc, 0xad, 0x9e, 0x65, 0x94, 0x89, 0xd9, 0x67, 0x09, 0xe9, 0x77,
-	0x7c, 0xd6, 0x1f, 0x42, 0xfa, 0x3d, 0xab, 0x2f, 0x21, 0x3f, 0xd4, 0x25, 0xe1, 0xb7, 0xed, 0x8e,
-	0xcf, 0x6c, 0x7b, 0x08, 0xb2, 0xed, 0x9e, 0x65, 0xdb, 0x12, 0x76, 0x38, 0x53, 0xd4, 0xb9, 0xf2,
-	0x33, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x22, 0xee, 0x20, 0x21, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_criterion_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_criterion_service.pb.go
index 2b47f77458..fa3651ea07 100644
--- a/googleapis/ads/googleads/v1/services/campaign_criterion_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_criterion_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_criterion_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignCriterionService.GetCampaignCriterion][google.ads.googleads.v1.services.CampaignCriterionService.GetCampaignCriterion].
 type GetCampaignCriterionRequest struct {
@@ -41,16 +41,17 @@ func (m *GetCampaignCriterionRequest) Reset()         { *m = GetCampaignCriterio
 func (m *GetCampaignCriterionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignCriterionRequest) ProtoMessage()    {}
 func (*GetCampaignCriterionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_service_6844638016c8baf0, []int{0}
+	return fileDescriptor_3a3c2b9bfd5dd6f9, []int{0}
 }
+
 func (m *GetCampaignCriterionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignCriterionRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignCriterionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignCriterionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignCriterionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignCriterionRequest.Merge(dst, src)
+func (m *GetCampaignCriterionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignCriterionRequest.Merge(m, src)
 }
 func (m *GetCampaignCriterionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignCriterionRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateCampaignCriteriaRequest) Reset()         { *m = MutateCampaignCri
 func (m *MutateCampaignCriteriaRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignCriteriaRequest) ProtoMessage()    {}
 func (*MutateCampaignCriteriaRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_service_6844638016c8baf0, []int{1}
+	return fileDescriptor_3a3c2b9bfd5dd6f9, []int{1}
 }
+
 func (m *MutateCampaignCriteriaRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignCriteriaRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignCriteriaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignCriteriaRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignCriteriaRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignCriteriaRequest.Merge(dst, src)
+func (m *MutateCampaignCriteriaRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignCriteriaRequest.Merge(m, src)
 }
 func (m *MutateCampaignCriteriaRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignCriteriaRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *CampaignCriterionOperation) Reset()         { *m = CampaignCriterionOpe
 func (m *CampaignCriterionOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignCriterionOperation) ProtoMessage()    {}
 func (*CampaignCriterionOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_service_6844638016c8baf0, []int{2}
+	return fileDescriptor_3a3c2b9bfd5dd6f9, []int{2}
 }
+
 func (m *CampaignCriterionOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignCriterionOperation.Unmarshal(m, b)
 }
 func (m *CampaignCriterionOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignCriterionOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignCriterionOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignCriterionOperation.Merge(dst, src)
+func (m *CampaignCriterionOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignCriterionOperation.Merge(m, src)
 }
 func (m *CampaignCriterionOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignCriterionOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *CampaignCriterionOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignCriterionOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignCriterionOperation_OneofMarshaler, _CampaignCriterionOperation_OneofUnmarshaler, _CampaignCriterionOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignCriterionOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignCriterionOperation_Create)(nil),
 		(*CampaignCriterionOperation_Update)(nil),
 		(*CampaignCriterionOperation_Remove)(nil),
 	}
 }
 
-func _CampaignCriterionOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignCriterionOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignCriterionOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CampaignCriterionOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignCriterionOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignCriterionOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignCriterionOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignCriterion)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignCriterionOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignCriterion)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignCriterionOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignCriterionOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignCriterionOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignCriterionOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterionOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignCriterionOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for campaign criterion mutate.
 type MutateCampaignCriteriaResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateCampaignCriteriaResponse) Reset()         { *m = MutateCampaignCr
 func (m *MutateCampaignCriteriaResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignCriteriaResponse) ProtoMessage()    {}
 func (*MutateCampaignCriteriaResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_service_6844638016c8baf0, []int{3}
+	return fileDescriptor_3a3c2b9bfd5dd6f9, []int{3}
 }
+
 func (m *MutateCampaignCriteriaResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignCriteriaResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignCriteriaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignCriteriaResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignCriteriaResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignCriteriaResponse.Merge(dst, src)
+func (m *MutateCampaignCriteriaResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignCriteriaResponse.Merge(m, src)
 }
 func (m *MutateCampaignCriteriaResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignCriteriaResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateCampaignCriterionResult) Reset()         { *m = MutateCampaignCri
 func (m *MutateCampaignCriterionResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignCriterionResult) ProtoMessage()    {}
 func (*MutateCampaignCriterionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_service_6844638016c8baf0, []int{4}
+	return fileDescriptor_3a3c2b9bfd5dd6f9, []int{4}
 }
+
 func (m *MutateCampaignCriterionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignCriterionResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignCriterionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignCriterionResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignCriterionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignCriterionResult.Merge(dst, src)
+func (m *MutateCampaignCriterionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignCriterionResult.Merge(m, src)
 }
 func (m *MutateCampaignCriterionResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignCriterionResult.Size(m)
@@ -425,6 +350,60 @@ func init() {
 	proto.RegisterType((*MutateCampaignCriterionResult)(nil), "google.ads.googleads.v1.services.MutateCampaignCriterionResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_criterion_service.proto", fileDescriptor_3a3c2b9bfd5dd6f9)
+}
+
+var fileDescriptor_3a3c2b9bfd5dd6f9 = []byte{
+	// 721 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6b, 0xd4, 0x4c,
+	0x1c, 0xc7, 0x9f, 0x64, 0x1f, 0xfa, 0x3c, 0x9d, 0xad, 0x0a, 0xe3, 0xbf, 0xb0, 0xda, 0xba, 0xc4,
+	0x82, 0x65, 0x0f, 0x09, 0xbb, 0xd6, 0x4b, 0x6a, 0xb1, 0xbb, 0xd5, 0xb6, 0x1e, 0xfa, 0x87, 0x14,
+	0x0a, 0xca, 0x42, 0x98, 0x26, 0xd3, 0x10, 0x9a, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0xc4,
+	0x77, 0xe0, 0x1b, 0x10, 0x8f, 0xbe, 0x0d, 0x05, 0xc1, 0xab, 0x67, 0x6f, 0x9e, 0xc4, 0x17, 0x21,
+	0x93, 0xc9, 0xac, 0x6d, 0x77, 0xe3, 0x4a, 0xbd, 0xfd, 0xf2, 0x9b, 0x6f, 0x3e, 0xf3, 0xfb, 0x37,
+	0x33, 0xa0, 0x1b, 0x12, 0x12, 0xc6, 0xd8, 0x46, 0x01, 0xb3, 0xa5, 0x29, 0xac, 0x41, 0xdb, 0x66,
+	0x98, 0x0e, 0x22, 0x1f, 0x33, 0xdb, 0x47, 0x49, 0x86, 0xa2, 0x30, 0xf5, 0x7c, 0x1a, 0x71, 0x4c,
+	0x23, 0x92, 0x7a, 0xe5, 0x9a, 0x95, 0x51, 0xc2, 0x09, 0x6c, 0xca, 0xff, 0x2c, 0x14, 0x30, 0x6b,
+	0x88, 0xb0, 0x06, 0x6d, 0x4b, 0x21, 0x1a, 0x4e, 0xd5, 0x26, 0x14, 0x33, 0x92, 0xd3, 0xf1, 0xbb,
+	0x48, 0x7a, 0xe3, 0xb6, 0xfa, 0x37, 0x8b, 0x6c, 0x94, 0xa6, 0x84, 0x23, 0x1e, 0x91, 0x94, 0x95,
+	0xab, 0xe5, 0xde, 0x76, 0xf1, 0xb5, 0x9f, 0x1f, 0xd8, 0x07, 0x11, 0x8e, 0x03, 0x2f, 0x41, 0xec,
+	0xb0, 0x54, 0xcc, 0x9d, 0x57, 0xbc, 0xa4, 0x28, 0xcb, 0x30, 0x55, 0x84, 0x9b, 0xe5, 0x3a, 0xcd,
+	0x7c, 0x9b, 0x71, 0xc4, 0xf3, 0x72, 0xc1, 0xec, 0x81, 0x5b, 0xeb, 0x98, 0xaf, 0x96, 0x71, 0xad,
+	0xaa, 0xb0, 0x5c, 0xfc, 0x22, 0xc7, 0x8c, 0xc3, 0xbb, 0xe0, 0x92, 0x8a, 0xde, 0x4b, 0x51, 0x82,
+	0x0d, 0xad, 0xa9, 0x2d, 0x4c, 0xbb, 0x33, 0xca, 0xb9, 0x85, 0x12, 0x6c, 0xfe, 0xd0, 0xc0, 0xec,
+	0x66, 0xce, 0x11, 0xc7, 0xe7, 0x38, 0x48, 0x61, 0xee, 0x80, 0xba, 0x9f, 0x33, 0x4e, 0x12, 0x4c,
+	0xbd, 0x28, 0x28, 0x21, 0x40, 0xb9, 0x9e, 0x06, 0xb0, 0x0f, 0x00, 0xc9, 0x30, 0x95, 0x59, 0x1b,
+	0x7a, 0xb3, 0xb6, 0x50, 0xef, 0x3c, 0xb4, 0x26, 0x95, 0xdc, 0x1a, 0x89, 0x7b, 0x5b, 0x41, 0xdc,
+	0x53, 0x3c, 0x78, 0x0f, 0x5c, 0xc9, 0x10, 0xe5, 0x11, 0x8a, 0xbd, 0x03, 0x14, 0xc5, 0x39, 0xc5,
+	0x46, 0xad, 0xa9, 0x2d, 0xfc, 0xef, 0x5e, 0x2e, 0xdd, 0x6b, 0xd2, 0x2b, 0xd2, 0x1d, 0xa0, 0x38,
+	0x0a, 0x10, 0xc7, 0x1e, 0x49, 0xe3, 0x23, 0xe3, 0xdf, 0x42, 0x36, 0xa3, 0x9c, 0xdb, 0x69, 0x7c,
+	0x64, 0xbe, 0xd5, 0x41, 0xa3, 0x7a, 0x63, 0xb8, 0x04, 0xea, 0x79, 0x56, 0x10, 0x44, 0x7f, 0x0a,
+	0x42, 0xbd, 0xd3, 0x50, 0xb9, 0xa8, 0x06, 0x59, 0x6b, 0xa2, 0x85, 0x9b, 0x88, 0x1d, 0xba, 0x40,
+	0xca, 0x85, 0x0d, 0xb7, 0xc0, 0x94, 0x4f, 0x31, 0xe2, 0xb2, 0xd0, 0xf5, 0xce, 0x62, 0x65, 0x0d,
+	0x86, 0x43, 0x35, 0x5a, 0x84, 0x8d, 0x7f, 0xdc, 0x92, 0x22, 0x78, 0x92, 0x6e, 0xe8, 0x7f, 0xc7,
+	0x93, 0x14, 0x68, 0x80, 0x29, 0x8a, 0x13, 0x32, 0x90, 0x05, 0x9c, 0x16, 0x2b, 0xf2, 0xbb, 0x57,
+	0x07, 0xd3, 0xc3, 0x8a, 0x9b, 0x1f, 0x34, 0x30, 0x57, 0x35, 0x11, 0x2c, 0x23, 0x29, 0xc3, 0x70,
+	0x0d, 0x5c, 0x3f, 0xd7, 0x13, 0x0f, 0x53, 0x4a, 0x68, 0x01, 0xae, 0x77, 0xa0, 0x0a, 0x94, 0x66,
+	0xbe, 0xb5, 0x5b, 0x4c, 0xac, 0x7b, 0xf5, 0x6c, 0xb7, 0x9e, 0x08, 0x39, 0x7c, 0x06, 0xfe, 0xa3,
+	0x98, 0xe5, 0x31, 0x57, 0x63, 0xf3, 0x68, 0xf2, 0xd8, 0x8c, 0x0d, 0x4d, 0x0c, 0xbd, 0xe0, 0xb8,
+	0x8a, 0x67, 0x3e, 0xae, 0x18, 0x6b, 0xa5, 0xfc, 0xa3, 0xd3, 0xd1, 0xf9, 0x58, 0x03, 0xc6, 0x08,
+	0x60, 0x57, 0x86, 0x02, 0x3f, 0x69, 0xe0, 0xda, 0xb8, 0xf3, 0x07, 0x97, 0x27, 0x67, 0xf1, 0x9b,
+	0x73, 0xdb, 0xb8, 0x50, 0x9f, 0x4d, 0xe7, 0xd5, 0x97, 0x6f, 0x6f, 0xf4, 0x45, 0xd8, 0x11, 0xb7,
+	0xd6, 0xf1, 0x99, 0xd4, 0x96, 0xd5, 0x61, 0x65, 0x76, 0x6b, 0x78, 0x8d, 0xa9, 0xa6, 0xda, 0xad,
+	0x13, 0xf8, 0x55, 0x03, 0x37, 0xc6, 0xb7, 0x1c, 0x5e, 0xb4, 0x23, 0xea, 0xfa, 0x68, 0xac, 0x5c,
+	0x1c, 0x20, 0xa7, 0xcd, 0x5c, 0x29, 0x32, 0x73, 0xcc, 0x07, 0x22, 0xb3, 0x5f, 0xa9, 0x1c, 0x9f,
+	0xba, 0x95, 0x96, 0x5b, 0x27, 0x23, 0x89, 0x39, 0x49, 0x81, 0x75, 0xb4, 0x56, 0xef, 0xb5, 0x0e,
+	0xe6, 0x7d, 0x92, 0x4c, 0x8c, 0xa4, 0x37, 0x5b, 0xd5, 0xec, 0x1d, 0x71, 0xf4, 0x77, 0xb4, 0xe7,
+	0x1b, 0x25, 0x22, 0x24, 0x31, 0x4a, 0x43, 0x8b, 0xd0, 0xd0, 0x0e, 0x71, 0x5a, 0x5c, 0x0c, 0xea,
+	0xdd, 0xc8, 0x22, 0x56, 0xfd, 0x56, 0x2d, 0x29, 0xe3, 0x9d, 0x5e, 0x5b, 0xef, 0x76, 0xdf, 0xeb,
+	0xcd, 0x75, 0x09, 0xec, 0x06, 0xcc, 0x92, 0xa6, 0xb0, 0xf6, 0xda, 0x56, 0xb9, 0x31, 0xfb, 0xac,
+	0x24, 0xfd, 0x6e, 0xc0, 0xfa, 0x43, 0x49, 0x7f, 0xaf, 0xdd, 0x57, 0x92, 0xef, 0xfa, 0xbc, 0xf4,
+	0x3b, 0x4e, 0x37, 0x60, 0x8e, 0x33, 0x14, 0x39, 0xce, 0x5e, 0xdb, 0x71, 0x94, 0x6c, 0x7f, 0xaa,
+	0x88, 0xf3, 0xfe, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x85, 0x31, 0xc3, 0xac, 0x52, 0x07, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -533,57 +512,3 @@ var _CampaignCriterionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_criterion_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_criterion_service.proto", fileDescriptor_campaign_criterion_service_6844638016c8baf0)
-}
-
-var fileDescriptor_campaign_criterion_service_6844638016c8baf0 = []byte{
-	// 721 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6b, 0xd4, 0x4c,
-	0x1c, 0xc7, 0x9f, 0x64, 0x1f, 0xfa, 0x3c, 0x9d, 0xad, 0x0a, 0xe3, 0xbf, 0xb0, 0xda, 0xba, 0xc4,
-	0x82, 0x65, 0x0f, 0x09, 0xbb, 0xd6, 0x4b, 0x6a, 0xb1, 0xbb, 0xd5, 0xb6, 0x1e, 0xfa, 0x87, 0x14,
-	0x0a, 0xca, 0x42, 0x98, 0x26, 0xd3, 0x10, 0x9a, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0xc4,
-	0x77, 0xe0, 0x1b, 0x10, 0x8f, 0xbe, 0x0d, 0x05, 0xc1, 0xab, 0x67, 0x6f, 0x9e, 0xc4, 0x17, 0x21,
-	0x93, 0xc9, 0xac, 0x6d, 0x77, 0xe3, 0x4a, 0xbd, 0xfd, 0xf2, 0x9b, 0x6f, 0x3e, 0xf3, 0xfb, 0x37,
-	0x33, 0xa0, 0x1b, 0x12, 0x12, 0xc6, 0xd8, 0x46, 0x01, 0xb3, 0xa5, 0x29, 0xac, 0x41, 0xdb, 0x66,
-	0x98, 0x0e, 0x22, 0x1f, 0x33, 0xdb, 0x47, 0x49, 0x86, 0xa2, 0x30, 0xf5, 0x7c, 0x1a, 0x71, 0x4c,
-	0x23, 0x92, 0x7a, 0xe5, 0x9a, 0x95, 0x51, 0xc2, 0x09, 0x6c, 0xca, 0xff, 0x2c, 0x14, 0x30, 0x6b,
-	0x88, 0xb0, 0x06, 0x6d, 0x4b, 0x21, 0x1a, 0x4e, 0xd5, 0x26, 0x14, 0x33, 0x92, 0xd3, 0xf1, 0xbb,
-	0x48, 0x7a, 0xe3, 0xb6, 0xfa, 0x37, 0x8b, 0x6c, 0x94, 0xa6, 0x84, 0x23, 0x1e, 0x91, 0x94, 0x95,
-	0xab, 0xe5, 0xde, 0x76, 0xf1, 0xb5, 0x9f, 0x1f, 0xd8, 0x07, 0x11, 0x8e, 0x03, 0x2f, 0x41, 0xec,
-	0xb0, 0x54, 0xcc, 0x9d, 0x57, 0xbc, 0xa4, 0x28, 0xcb, 0x30, 0x55, 0x84, 0x9b, 0xe5, 0x3a, 0xcd,
-	0x7c, 0x9b, 0x71, 0xc4, 0xf3, 0x72, 0xc1, 0xec, 0x81, 0x5b, 0xeb, 0x98, 0xaf, 0x96, 0x71, 0xad,
-	0xaa, 0xb0, 0x5c, 0xfc, 0x22, 0xc7, 0x8c, 0xc3, 0xbb, 0xe0, 0x92, 0x8a, 0xde, 0x4b, 0x51, 0x82,
-	0x0d, 0xad, 0xa9, 0x2d, 0x4c, 0xbb, 0x33, 0xca, 0xb9, 0x85, 0x12, 0x6c, 0xfe, 0xd0, 0xc0, 0xec,
-	0x66, 0xce, 0x11, 0xc7, 0xe7, 0x38, 0x48, 0x61, 0xee, 0x80, 0xba, 0x9f, 0x33, 0x4e, 0x12, 0x4c,
-	0xbd, 0x28, 0x28, 0x21, 0x40, 0xb9, 0x9e, 0x06, 0xb0, 0x0f, 0x00, 0xc9, 0x30, 0x95, 0x59, 0x1b,
-	0x7a, 0xb3, 0xb6, 0x50, 0xef, 0x3c, 0xb4, 0x26, 0x95, 0xdc, 0x1a, 0x89, 0x7b, 0x5b, 0x41, 0xdc,
-	0x53, 0x3c, 0x78, 0x0f, 0x5c, 0xc9, 0x10, 0xe5, 0x11, 0x8a, 0xbd, 0x03, 0x14, 0xc5, 0x39, 0xc5,
-	0x46, 0xad, 0xa9, 0x2d, 0xfc, 0xef, 0x5e, 0x2e, 0xdd, 0x6b, 0xd2, 0x2b, 0xd2, 0x1d, 0xa0, 0x38,
-	0x0a, 0x10, 0xc7, 0x1e, 0x49, 0xe3, 0x23, 0xe3, 0xdf, 0x42, 0x36, 0xa3, 0x9c, 0xdb, 0x69, 0x7c,
-	0x64, 0xbe, 0xd5, 0x41, 0xa3, 0x7a, 0x63, 0xb8, 0x04, 0xea, 0x79, 0x56, 0x10, 0x44, 0x7f, 0x0a,
-	0x42, 0xbd, 0xd3, 0x50, 0xb9, 0xa8, 0x06, 0x59, 0x6b, 0xa2, 0x85, 0x9b, 0x88, 0x1d, 0xba, 0x40,
-	0xca, 0x85, 0x0d, 0xb7, 0xc0, 0x94, 0x4f, 0x31, 0xe2, 0xb2, 0xd0, 0xf5, 0xce, 0x62, 0x65, 0x0d,
-	0x86, 0x43, 0x35, 0x5a, 0x84, 0x8d, 0x7f, 0xdc, 0x92, 0x22, 0x78, 0x92, 0x6e, 0xe8, 0x7f, 0xc7,
-	0x93, 0x14, 0x68, 0x80, 0x29, 0x8a, 0x13, 0x32, 0x90, 0x05, 0x9c, 0x16, 0x2b, 0xf2, 0xbb, 0x57,
-	0x07, 0xd3, 0xc3, 0x8a, 0x9b, 0x1f, 0x34, 0x30, 0x57, 0x35, 0x11, 0x2c, 0x23, 0x29, 0xc3, 0x70,
-	0x0d, 0x5c, 0x3f, 0xd7, 0x13, 0x0f, 0x53, 0x4a, 0x68, 0x01, 0xae, 0x77, 0xa0, 0x0a, 0x94, 0x66,
-	0xbe, 0xb5, 0x5b, 0x4c, 0xac, 0x7b, 0xf5, 0x6c, 0xb7, 0x9e, 0x08, 0x39, 0x7c, 0x06, 0xfe, 0xa3,
-	0x98, 0xe5, 0x31, 0x57, 0x63, 0xf3, 0x68, 0xf2, 0xd8, 0x8c, 0x0d, 0x4d, 0x0c, 0xbd, 0xe0, 0xb8,
-	0x8a, 0x67, 0x3e, 0xae, 0x18, 0x6b, 0xa5, 0xfc, 0xa3, 0xd3, 0xd1, 0xf9, 0x58, 0x03, 0xc6, 0x08,
-	0x60, 0x57, 0x86, 0x02, 0x3f, 0x69, 0xe0, 0xda, 0xb8, 0xf3, 0x07, 0x97, 0x27, 0x67, 0xf1, 0x9b,
-	0x73, 0xdb, 0xb8, 0x50, 0x9f, 0x4d, 0xe7, 0xd5, 0x97, 0x6f, 0x6f, 0xf4, 0x45, 0xd8, 0x11, 0xb7,
-	0xd6, 0xf1, 0x99, 0xd4, 0x96, 0xd5, 0x61, 0x65, 0x76, 0x6b, 0x78, 0x8d, 0xa9, 0xa6, 0xda, 0xad,
-	0x13, 0xf8, 0x55, 0x03, 0x37, 0xc6, 0xb7, 0x1c, 0x5e, 0xb4, 0x23, 0xea, 0xfa, 0x68, 0xac, 0x5c,
-	0x1c, 0x20, 0xa7, 0xcd, 0x5c, 0x29, 0x32, 0x73, 0xcc, 0x07, 0x22, 0xb3, 0x5f, 0xa9, 0x1c, 0x9f,
-	0xba, 0x95, 0x96, 0x5b, 0x27, 0x23, 0x89, 0x39, 0x49, 0x81, 0x75, 0xb4, 0x56, 0xef, 0xb5, 0x0e,
-	0xe6, 0x7d, 0x92, 0x4c, 0x8c, 0xa4, 0x37, 0x5b, 0xd5, 0xec, 0x1d, 0x71, 0xf4, 0x77, 0xb4, 0xe7,
-	0x1b, 0x25, 0x22, 0x24, 0x31, 0x4a, 0x43, 0x8b, 0xd0, 0xd0, 0x0e, 0x71, 0x5a, 0x5c, 0x0c, 0xea,
-	0xdd, 0xc8, 0x22, 0x56, 0xfd, 0x56, 0x2d, 0x29, 0xe3, 0x9d, 0x5e, 0x5b, 0xef, 0x76, 0xdf, 0xeb,
-	0xcd, 0x75, 0x09, 0xec, 0x06, 0xcc, 0x92, 0xa6, 0xb0, 0xf6, 0xda, 0x56, 0xb9, 0x31, 0xfb, 0xac,
-	0x24, 0xfd, 0x6e, 0xc0, 0xfa, 0x43, 0x49, 0x7f, 0xaf, 0xdd, 0x57, 0x92, 0xef, 0xfa, 0xbc, 0xf4,
-	0x3b, 0x4e, 0x37, 0x60, 0x8e, 0x33, 0x14, 0x39, 0xce, 0x5e, 0xdb, 0x71, 0x94, 0x6c, 0x7f, 0xaa,
-	0x88, 0xf3, 0xfe, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x85, 0x31, 0xc3, 0xac, 0x52, 0x07, 0x00,
-	0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_criterion_simulation_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_criterion_simulation_service.pb.go
index 71038dea8a..f57ecfc997 100644
--- a/googleapis/ads/googleads/v1/services/campaign_criterion_simulation_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_criterion_simulation_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_criterion_simulation_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [CampaignCriterionSimulationService.GetCampaignCriterionSimulation][google.ads.googleads.v1.services.CampaignCriterionSimulationService.GetCampaignCriterionSimulation].
@@ -39,16 +39,17 @@ func (m *GetCampaignCriterionSimulationRequest) Reset()         { *m = GetCampai
 func (m *GetCampaignCriterionSimulationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignCriterionSimulationRequest) ProtoMessage()    {}
 func (*GetCampaignCriterionSimulationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_criterion_simulation_service_b00eeea876e3218c, []int{0}
+	return fileDescriptor_892d70bcad64eee6, []int{0}
 }
+
 func (m *GetCampaignCriterionSimulationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignCriterionSimulationRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignCriterionSimulationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignCriterionSimulationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignCriterionSimulationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignCriterionSimulationRequest.Merge(dst, src)
+func (m *GetCampaignCriterionSimulationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignCriterionSimulationRequest.Merge(m, src)
 }
 func (m *GetCampaignCriterionSimulationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignCriterionSimulationRequest.Size(m)
@@ -70,6 +71,38 @@ func init() {
 	proto.RegisterType((*GetCampaignCriterionSimulationRequest)(nil), "google.ads.googleads.v1.services.GetCampaignCriterionSimulationRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_criterion_simulation_service.proto", fileDescriptor_892d70bcad64eee6)
+}
+
+var fileDescriptor_892d70bcad64eee6 = []byte{
+	// 378 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x4a, 0xeb, 0x40,
+	0x18, 0x85, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0xde, 0x4d, 0x56, 0x97, 0x22, 0x52, 0x6a, 0x45, 0xe9,
+	0x62, 0x86, 0xe8, 0x6e, 0xc4, 0x62, 0x5a, 0x34, 0x2e, 0x8a, 0x94, 0x16, 0xba, 0x90, 0x40, 0x19,
+	0x93, 0x21, 0x04, 0x9a, 0x99, 0x38, 0xff, 0xa4, 0x1b, 0x71, 0xe3, 0x03, 0xb8, 0x71, 0xe3, 0xda,
+	0xa5, 0x8f, 0xe2, 0xd6, 0x57, 0x70, 0xe5, 0xce, 0x37, 0x90, 0x64, 0x3a, 0x01, 0xc1, 0x36, 0xee,
+	0x0e, 0x33, 0x87, 0xef, 0xcc, 0x9c, 0xff, 0x77, 0x46, 0x89, 0x10, 0xc9, 0x82, 0x61, 0x1a, 0x03,
+	0xd6, 0xb2, 0x54, 0x4b, 0x0f, 0x03, 0x93, 0xcb, 0x34, 0x62, 0x80, 0x23, 0x9a, 0xe5, 0x34, 0x4d,
+	0xf8, 0x3c, 0x92, 0xa9, 0x62, 0x32, 0x15, 0x7c, 0x0e, 0x69, 0x56, 0x2c, 0xa8, 0xaa, 0xa4, 0xb6,
+	0xa1, 0x5c, 0x0a, 0x25, 0xdc, 0xb6, 0x46, 0x20, 0x1a, 0x03, 0xaa, 0x69, 0x68, 0xe9, 0x21, 0x43,
+	0x6b, 0x9d, 0xae, 0xcb, 0x93, 0x0c, 0x44, 0x21, 0x1b, 0x03, 0x75, 0x50, 0x6b, 0xcb, 0x60, 0xf2,
+	0x14, 0x53, 0xce, 0x85, 0xaa, 0x2e, 0x41, 0xdf, 0x76, 0x46, 0xce, 0x6e, 0xc0, 0xd4, 0x70, 0xc5,
+	0x19, 0x1a, 0xcc, 0xb4, 0xa6, 0x4c, 0xd8, 0x75, 0xc1, 0x40, 0xb9, 0x3b, 0xce, 0x3f, 0x93, 0x3b,
+	0xe7, 0x34, 0x63, 0xff, 0xad, 0xb6, 0xb5, 0xff, 0x67, 0xf2, 0xd7, 0x1c, 0x5e, 0xd0, 0x8c, 0x1d,
+	0x3c, 0xda, 0x4e, 0x67, 0x03, 0x6b, 0xaa, 0xbf, 0xe6, 0x7e, 0x58, 0xce, 0xf6, 0xe6, 0x54, 0x37,
+	0x40, 0x4d, 0xfd, 0xa0, 0x1f, 0xbd, 0xbb, 0xd5, 0x5f, 0x0b, 0xaa, 0x6b, 0x44, 0x1b, 0x30, 0x9d,
+	0xb3, 0xbb, 0xd7, 0xb7, 0x07, 0xfb, 0xc4, 0xed, 0x97, 0xcd, 0xdf, 0x7c, 0xa9, 0xe0, 0x38, 0x2a,
+	0x40, 0x89, 0x8c, 0x49, 0xc0, 0xbd, 0x7a, 0x14, 0xdf, 0x30, 0x00, 0xf7, 0x6e, 0x07, 0xf7, 0xb6,
+	0xd3, 0x8d, 0x44, 0xd6, 0xf8, 0xad, 0xc1, 0x5e, 0x73, 0x81, 0xe3, 0x72, 0x74, 0x63, 0xeb, 0xf2,
+	0x7c, 0x05, 0x4b, 0xc4, 0x82, 0xf2, 0x04, 0x09, 0x99, 0xe0, 0x84, 0xf1, 0x6a, 0xb0, 0x66, 0x63,
+	0xf2, 0x14, 0xd6, 0x2f, 0xec, 0x91, 0x11, 0x4f, 0xf6, 0xaf, 0xc0, 0xf7, 0x9f, 0xed, 0x76, 0xa0,
+	0x81, 0x7e, 0x0c, 0x48, 0xcb, 0x52, 0xcd, 0x3c, 0xb4, 0x0a, 0x86, 0x17, 0x63, 0x09, 0xfd, 0x18,
+	0xc2, 0xda, 0x12, 0xce, 0xbc, 0xd0, 0x58, 0xde, 0xed, 0xae, 0x3e, 0x27, 0xc4, 0x8f, 0x81, 0x90,
+	0xda, 0x44, 0xc8, 0xcc, 0x23, 0xc4, 0xd8, 0xae, 0x7e, 0x57, 0xef, 0x3c, 0xfc, 0x0c, 0x00, 0x00,
+	0xff, 0xff, 0x21, 0x54, 0x12, 0xce, 0x57, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,35 +176,3 @@ var _CampaignCriterionSimulationService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_criterion_simulation_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_criterion_simulation_service.proto", fileDescriptor_campaign_criterion_simulation_service_b00eeea876e3218c)
-}
-
-var fileDescriptor_campaign_criterion_simulation_service_b00eeea876e3218c = []byte{
-	// 378 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x4a, 0xeb, 0x40,
-	0x18, 0x85, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0xde, 0x4d, 0x56, 0x97, 0x22, 0x52, 0x6a, 0x45, 0xe9,
-	0x62, 0x86, 0xe8, 0x6e, 0xc4, 0x62, 0x5a, 0x34, 0x2e, 0x8a, 0x94, 0x16, 0xba, 0x90, 0x40, 0x19,
-	0x93, 0x21, 0x04, 0x9a, 0x99, 0x38, 0xff, 0xa4, 0x1b, 0x71, 0xe3, 0x03, 0xb8, 0x71, 0xe3, 0xda,
-	0xa5, 0x8f, 0xe2, 0xd6, 0x57, 0x70, 0xe5, 0xce, 0x37, 0x90, 0x64, 0x3a, 0x01, 0xc1, 0x36, 0xee,
-	0x0e, 0x33, 0x87, 0xef, 0xcc, 0x9c, 0xff, 0x77, 0x46, 0x89, 0x10, 0xc9, 0x82, 0x61, 0x1a, 0x03,
-	0xd6, 0xb2, 0x54, 0x4b, 0x0f, 0x03, 0x93, 0xcb, 0x34, 0x62, 0x80, 0x23, 0x9a, 0xe5, 0x34, 0x4d,
-	0xf8, 0x3c, 0x92, 0xa9, 0x62, 0x32, 0x15, 0x7c, 0x0e, 0x69, 0x56, 0x2c, 0xa8, 0xaa, 0xa4, 0xb6,
-	0xa1, 0x5c, 0x0a, 0x25, 0xdc, 0xb6, 0x46, 0x20, 0x1a, 0x03, 0xaa, 0x69, 0x68, 0xe9, 0x21, 0x43,
-	0x6b, 0x9d, 0xae, 0xcb, 0x93, 0x0c, 0x44, 0x21, 0x1b, 0x03, 0x75, 0x50, 0x6b, 0xcb, 0x60, 0xf2,
-	0x14, 0x53, 0xce, 0x85, 0xaa, 0x2e, 0x41, 0xdf, 0x76, 0x46, 0xce, 0x6e, 0xc0, 0xd4, 0x70, 0xc5,
-	0x19, 0x1a, 0xcc, 0xb4, 0xa6, 0x4c, 0xd8, 0x75, 0xc1, 0x40, 0xb9, 0x3b, 0xce, 0x3f, 0x93, 0x3b,
-	0xe7, 0x34, 0x63, 0xff, 0xad, 0xb6, 0xb5, 0xff, 0x67, 0xf2, 0xd7, 0x1c, 0x5e, 0xd0, 0x8c, 0x1d,
-	0x3c, 0xda, 0x4e, 0x67, 0x03, 0x6b, 0xaa, 0xbf, 0xe6, 0x7e, 0x58, 0xce, 0xf6, 0xe6, 0x54, 0x37,
-	0x40, 0x4d, 0xfd, 0xa0, 0x1f, 0xbd, 0xbb, 0xd5, 0x5f, 0x0b, 0xaa, 0x6b, 0x44, 0x1b, 0x30, 0x9d,
-	0xb3, 0xbb, 0xd7, 0xb7, 0x07, 0xfb, 0xc4, 0xed, 0x97, 0xcd, 0xdf, 0x7c, 0xa9, 0xe0, 0x38, 0x2a,
-	0x40, 0x89, 0x8c, 0x49, 0xc0, 0xbd, 0x7a, 0x14, 0xdf, 0x30, 0x00, 0xf7, 0x6e, 0x07, 0xf7, 0xb6,
-	0xd3, 0x8d, 0x44, 0xd6, 0xf8, 0xad, 0xc1, 0x5e, 0x73, 0x81, 0xe3, 0x72, 0x74, 0x63, 0xeb, 0xf2,
-	0x7c, 0x05, 0x4b, 0xc4, 0x82, 0xf2, 0x04, 0x09, 0x99, 0xe0, 0x84, 0xf1, 0x6a, 0xb0, 0x66, 0x63,
-	0xf2, 0x14, 0xd6, 0x2f, 0xec, 0x91, 0x11, 0x4f, 0xf6, 0xaf, 0xc0, 0xf7, 0x9f, 0xed, 0x76, 0xa0,
-	0x81, 0x7e, 0x0c, 0x48, 0xcb, 0x52, 0xcd, 0x3c, 0xb4, 0x0a, 0x86, 0x17, 0x63, 0x09, 0xfd, 0x18,
-	0xc2, 0xda, 0x12, 0xce, 0xbc, 0xd0, 0x58, 0xde, 0xed, 0xae, 0x3e, 0x27, 0xc4, 0x8f, 0x81, 0x90,
-	0xda, 0x44, 0xc8, 0xcc, 0x23, 0xc4, 0xd8, 0xae, 0x7e, 0x57, 0xef, 0x3c, 0xfc, 0x0c, 0x00, 0x00,
-	0xff, 0xff, 0x21, 0x54, 0x12, 0xce, 0x57, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_extension_setting_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_extension_setting_service.pb.go
index 0ed9327b30..659232885a 100644
--- a/googleapis/ads/googleads/v1/services/campaign_extension_setting_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_extension_setting_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_extension_setting_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [CampaignExtensionSettingService.GetCampaignExtensionSetting][google.ads.googleads.v1.services.CampaignExtensionSettingService.GetCampaignExtensionSetting].
@@ -42,16 +42,17 @@ func (m *GetCampaignExtensionSettingRequest) Reset()         { *m = GetCampaignE
 func (m *GetCampaignExtensionSettingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignExtensionSettingRequest) ProtoMessage()    {}
 func (*GetCampaignExtensionSettingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_extension_setting_service_79af28ecb9bc5deb, []int{0}
+	return fileDescriptor_eefc8bddcb5de716, []int{0}
 }
+
 func (m *GetCampaignExtensionSettingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignExtensionSettingRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignExtensionSettingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignExtensionSettingRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignExtensionSettingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignExtensionSettingRequest.Merge(dst, src)
+func (m *GetCampaignExtensionSettingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignExtensionSettingRequest.Merge(m, src)
 }
 func (m *GetCampaignExtensionSettingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignExtensionSettingRequest.Size(m)
@@ -97,16 +98,17 @@ func (m *MutateCampaignExtensionSettingsRequest) Reset() {
 func (m *MutateCampaignExtensionSettingsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignExtensionSettingsRequest) ProtoMessage()    {}
 func (*MutateCampaignExtensionSettingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_extension_setting_service_79af28ecb9bc5deb, []int{1}
+	return fileDescriptor_eefc8bddcb5de716, []int{1}
 }
+
 func (m *MutateCampaignExtensionSettingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignExtensionSettingsRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignExtensionSettingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignExtensionSettingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignExtensionSettingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignExtensionSettingsRequest.Merge(dst, src)
+func (m *MutateCampaignExtensionSettingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignExtensionSettingsRequest.Merge(m, src)
 }
 func (m *MutateCampaignExtensionSettingsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignExtensionSettingsRequest.Size(m)
@@ -165,16 +167,17 @@ func (m *CampaignExtensionSettingOperation) Reset()         { *m = CampaignExten
 func (m *CampaignExtensionSettingOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignExtensionSettingOperation) ProtoMessage()    {}
 func (*CampaignExtensionSettingOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_extension_setting_service_79af28ecb9bc5deb, []int{2}
+	return fileDescriptor_eefc8bddcb5de716, []int{2}
 }
+
 func (m *CampaignExtensionSettingOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignExtensionSettingOperation.Unmarshal(m, b)
 }
 func (m *CampaignExtensionSettingOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignExtensionSettingOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignExtensionSettingOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignExtensionSettingOperation.Merge(dst, src)
+func (m *CampaignExtensionSettingOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignExtensionSettingOperation.Merge(m, src)
 }
 func (m *CampaignExtensionSettingOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignExtensionSettingOperation.Size(m)
@@ -242,95 +245,15 @@ func (m *CampaignExtensionSettingOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignExtensionSettingOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignExtensionSettingOperation_OneofMarshaler, _CampaignExtensionSettingOperation_OneofUnmarshaler, _CampaignExtensionSettingOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignExtensionSettingOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignExtensionSettingOperation_Create)(nil),
 		(*CampaignExtensionSettingOperation_Update)(nil),
 		(*CampaignExtensionSettingOperation_Remove)(nil),
 	}
 }
 
-func _CampaignExtensionSettingOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignExtensionSettingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignExtensionSettingOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignExtensionSettingOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CampaignExtensionSettingOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignExtensionSettingOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignExtensionSettingOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignExtensionSettingOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignExtensionSetting)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignExtensionSettingOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignExtensionSetting)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignExtensionSettingOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignExtensionSettingOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignExtensionSettingOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignExtensionSettingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignExtensionSettingOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignExtensionSettingOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignExtensionSettingOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a campaign extension setting mutate.
 type MutateCampaignExtensionSettingsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -351,16 +274,17 @@ func (m *MutateCampaignExtensionSettingsResponse) Reset() {
 func (m *MutateCampaignExtensionSettingsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignExtensionSettingsResponse) ProtoMessage()    {}
 func (*MutateCampaignExtensionSettingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_extension_setting_service_79af28ecb9bc5deb, []int{3}
+	return fileDescriptor_eefc8bddcb5de716, []int{3}
 }
+
 func (m *MutateCampaignExtensionSettingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignExtensionSettingsResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignExtensionSettingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignExtensionSettingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignExtensionSettingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignExtensionSettingsResponse.Merge(dst, src)
+func (m *MutateCampaignExtensionSettingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignExtensionSettingsResponse.Merge(m, src)
 }
 func (m *MutateCampaignExtensionSettingsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignExtensionSettingsResponse.Size(m)
@@ -398,16 +322,17 @@ func (m *MutateCampaignExtensionSettingResult) Reset()         { *m = MutateCamp
 func (m *MutateCampaignExtensionSettingResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignExtensionSettingResult) ProtoMessage()    {}
 func (*MutateCampaignExtensionSettingResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_extension_setting_service_79af28ecb9bc5deb, []int{4}
+	return fileDescriptor_eefc8bddcb5de716, []int{4}
 }
+
 func (m *MutateCampaignExtensionSettingResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignExtensionSettingResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignExtensionSettingResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignExtensionSettingResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignExtensionSettingResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignExtensionSettingResult.Merge(dst, src)
+func (m *MutateCampaignExtensionSettingResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignExtensionSettingResult.Merge(m, src)
 }
 func (m *MutateCampaignExtensionSettingResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignExtensionSettingResult.Size(m)
@@ -433,6 +358,60 @@ func init() {
 	proto.RegisterType((*MutateCampaignExtensionSettingResult)(nil), "google.ads.googleads.v1.services.MutateCampaignExtensionSettingResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_extension_setting_service.proto", fileDescriptor_eefc8bddcb5de716)
+}
+
+var fileDescriptor_eefc8bddcb5de716 = []byte{
+	// 728 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x41, 0x4f, 0xd4, 0x40,
+	0x14, 0xc7, 0x6d, 0x21, 0x28, 0x53, 0xd4, 0x64, 0x8c, 0x71, 0xb3, 0x1a, 0x59, 0xeb, 0x46, 0xc8,
+	0x1e, 0xda, 0xec, 0x7a, 0xeb, 0x06, 0x93, 0xdd, 0x95, 0x85, 0x8d, 0x41, 0x48, 0x89, 0x1c, 0xcc,
+	0x26, 0x75, 0x68, 0x87, 0xa6, 0xa1, 0xed, 0xd4, 0x99, 0xe9, 0x2a, 0x21, 0x1c, 0xf4, 0x6a, 0x3c,
+	0xf9, 0x0d, 0x3c, 0x7a, 0xf7, 0x4b, 0x78, 0xe5, 0x2b, 0xe8, 0xc5, 0xcf, 0xe0, 0xc1, 0xb4, 0xd3,
+	0x59, 0x01, 0x53, 0x4a, 0x02, 0xb7, 0xd7, 0x37, 0xff, 0xfe, 0xde, 0x7b, 0xf3, 0x5e, 0x5f, 0xc1,
+	0xc8, 0x27, 0xc4, 0x0f, 0xb1, 0x89, 0x3c, 0x66, 0x0a, 0x33, 0xb3, 0x26, 0x6d, 0x93, 0x61, 0x3a,
+	0x09, 0x5c, 0xcc, 0x4c, 0x17, 0x45, 0x09, 0x0a, 0xfc, 0xd8, 0xc1, 0xef, 0x39, 0x8e, 0x59, 0x40,
+	0x62, 0x87, 0x61, 0xce, 0x83, 0xd8, 0x77, 0x0a, 0x8d, 0x91, 0x50, 0xc2, 0x09, 0x6c, 0x88, 0xf7,
+	0x0d, 0xe4, 0x31, 0x63, 0x8a, 0x32, 0x26, 0x6d, 0x43, 0xa2, 0xea, 0xfd, 0xb2, 0x60, 0x14, 0x33,
+	0x92, 0xd2, 0xf3, 0xa3, 0x89, 0x28, 0xf5, 0x07, 0x92, 0x91, 0x04, 0x26, 0x8a, 0x63, 0xc2, 0x11,
+	0x0f, 0x48, 0xcc, 0x8a, 0xd3, 0x22, 0x07, 0x33, 0x7f, 0xda, 0x4d, 0xf7, 0xcc, 0xbd, 0x00, 0x87,
+	0x9e, 0x13, 0x21, 0xb6, 0x5f, 0x28, 0x1e, 0x9e, 0x55, 0xbc, 0xa3, 0x28, 0x49, 0x30, 0x95, 0x84,
+	0x7b, 0xc5, 0x39, 0x4d, 0x5c, 0x93, 0x71, 0xc4, 0xd3, 0xe2, 0x40, 0x1f, 0x01, 0x7d, 0x0d, 0xf3,
+	0x41, 0x91, 0xdf, 0xaa, 0x4c, 0x6f, 0x5b, 0x64, 0x67, 0xe3, 0xb7, 0x29, 0x66, 0x1c, 0x3e, 0x06,
+	0x37, 0x65, 0x31, 0x4e, 0x8c, 0x22, 0x5c, 0x53, 0x1a, 0xca, 0xf2, 0xbc, 0xbd, 0x20, 0x9d, 0x2f,
+	0x51, 0x84, 0xf5, 0x3f, 0x0a, 0x78, 0xb2, 0x91, 0x72, 0xc4, 0x71, 0x19, 0x8e, 0x49, 0xde, 0x22,
+	0xd0, 0xdc, 0x94, 0x71, 0x12, 0x61, 0xea, 0x04, 0x5e, 0x41, 0x03, 0xd2, 0x35, 0xf2, 0xa0, 0x0b,
+	0x00, 0x49, 0x30, 0x15, 0xb7, 0x50, 0x53, 0x1b, 0x33, 0xcb, 0x5a, 0x67, 0x60, 0x54, 0xb5, 0xc2,
+	0x28, 0x0b, 0xbc, 0x29, 0x59, 0xf6, 0x09, 0x2c, 0x5c, 0x02, 0xb7, 0x13, 0x44, 0x79, 0x80, 0x42,
+	0x67, 0x0f, 0x05, 0x61, 0x4a, 0x71, 0x6d, 0xa6, 0xa1, 0x2c, 0xdf, 0xb0, 0x6f, 0x15, 0xee, 0xa1,
+	0xf0, 0x66, 0xe5, 0x4f, 0x50, 0x18, 0x78, 0x88, 0x63, 0x87, 0xc4, 0xe1, 0x41, 0x6d, 0x36, 0x97,
+	0x2d, 0x48, 0xe7, 0x66, 0x1c, 0x1e, 0xe8, 0xdf, 0x55, 0xf0, 0xa8, 0x32, 0x3e, 0xec, 0x02, 0x2d,
+	0x4d, 0x72, 0x50, 0xd6, 0xbd, 0x1c, 0xa4, 0x75, 0xea, 0xb2, 0x32, 0xd9, 0x3e, 0x63, 0x98, 0x35,
+	0x78, 0x03, 0xb1, 0x7d, 0x1b, 0x08, 0x79, 0x66, 0xc3, 0x57, 0x60, 0xce, 0xa5, 0x18, 0x71, 0x71,
+	0xff, 0x5a, 0xa7, 0x5b, 0x7a, 0x23, 0xd3, 0xd1, 0x2b, 0xbd, 0x92, 0xf5, 0x6b, 0x76, 0x01, 0xcb,
+	0xb0, 0x22, 0x48, 0x4d, 0xbd, 0x12, 0xac, 0x80, 0xc1, 0x1a, 0x98, 0xa3, 0x38, 0x22, 0x13, 0x71,
+	0xab, 0xf3, 0xd9, 0x89, 0x78, 0xee, 0x6b, 0x60, 0x7e, 0xda, 0x06, 0xfd, 0x58, 0x01, 0x4b, 0x95,
+	0x63, 0xc3, 0x12, 0x12, 0x33, 0x0c, 0x87, 0xe0, 0xee, 0x99, 0x8e, 0x39, 0x98, 0x52, 0x42, 0xf3,
+	0x08, 0x5a, 0x07, 0xca, 0xc4, 0x69, 0xe2, 0x1a, 0xdb, 0xf9, 0x98, 0xdb, 0x77, 0x4e, 0xf7, 0x72,
+	0x35, 0x93, 0xc3, 0x37, 0xe0, 0x3a, 0xc5, 0x2c, 0x0d, 0xb9, 0x9c, 0xad, 0x61, 0xf5, 0x6c, 0x9d,
+	0x9f, 0xa3, 0x9d, 0xe3, 0x6c, 0x89, 0xd5, 0x5f, 0x80, 0xe6, 0x45, 0x5e, 0xb8, 0xd0, 0x97, 0xd5,
+	0xf9, 0x3c, 0x0b, 0x16, 0xcb, 0x38, 0xdb, 0x22, 0x3f, 0xf8, 0x4b, 0x01, 0xf7, 0xcf, 0xf9, 0x92,
+	0xe1, 0xf3, 0xea, 0x0a, 0xab, 0x17, 0x41, 0xfd, 0x32, 0xa3, 0xa1, 0x0f, 0x3e, 0x1e, 0xff, 0xfc,
+	0xa2, 0xae, 0xc0, 0x6e, 0xb6, 0x1c, 0x0f, 0x4f, 0x95, 0xbd, 0x22, 0xbf, 0x7d, 0x66, 0xb6, 0xa6,
+	0xdb, 0xf2, 0xbf, 0x39, 0x30, 0x5b, 0x47, 0xf0, 0x83, 0x0a, 0x16, 0x2b, 0xc6, 0x05, 0xae, 0x5f,
+	0xb6, 0x9b, 0x72, 0x51, 0xd5, 0x47, 0x57, 0x40, 0x12, 0xb3, 0xab, 0x8f, 0xf2, 0xea, 0x07, 0xfa,
+	0xb3, 0xac, 0xfa, 0x7f, 0xe5, 0x1e, 0x9e, 0x58, 0x84, 0x2b, 0xad, 0xa3, 0xf2, 0xe2, 0xad, 0x28,
+	0x0f, 0x64, 0x29, 0xad, 0xfe, 0x27, 0x15, 0x34, 0x5d, 0x12, 0x55, 0xe6, 0xd6, 0x6f, 0x56, 0x4c,
+	0xcd, 0x56, 0xb6, 0x6f, 0xb6, 0x94, 0xd7, 0xeb, 0x05, 0xc9, 0x27, 0x21, 0x8a, 0x7d, 0x83, 0x50,
+	0xdf, 0xf4, 0x71, 0x9c, 0x6f, 0x23, 0xf9, 0x4b, 0x4b, 0x02, 0x56, 0xfe, 0x3b, 0xed, 0x4a, 0xe3,
+	0xab, 0x3a, 0xb3, 0xd6, 0xeb, 0x7d, 0x53, 0x1b, 0x6b, 0x02, 0xd8, 0xf3, 0x98, 0x21, 0xcc, 0xcc,
+	0xda, 0x69, 0x1b, 0x45, 0x60, 0xf6, 0x43, 0x4a, 0xc6, 0x3d, 0x8f, 0x8d, 0xa7, 0x92, 0xf1, 0x4e,
+	0x7b, 0x2c, 0x25, 0xbf, 0xd5, 0xa6, 0xf0, 0x5b, 0x56, 0xcf, 0x63, 0x96, 0x35, 0x15, 0x59, 0xd6,
+	0x4e, 0xdb, 0xb2, 0xa4, 0x6c, 0x77, 0x2e, 0xcf, 0xf3, 0xe9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x75, 0x32, 0x38, 0x15, 0xf5, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -543,57 +522,3 @@ var _CampaignExtensionSettingService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_extension_setting_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_extension_setting_service.proto", fileDescriptor_campaign_extension_setting_service_79af28ecb9bc5deb)
-}
-
-var fileDescriptor_campaign_extension_setting_service_79af28ecb9bc5deb = []byte{
-	// 728 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x41, 0x4f, 0xd4, 0x40,
-	0x14, 0xc7, 0x6d, 0x21, 0x28, 0x53, 0xd4, 0x64, 0x8c, 0x71, 0xb3, 0x1a, 0x59, 0xeb, 0x46, 0xc8,
-	0x1e, 0xda, 0xec, 0x7a, 0xeb, 0x06, 0x93, 0xdd, 0x95, 0x85, 0x8d, 0x41, 0x48, 0x89, 0x1c, 0xcc,
-	0x26, 0x75, 0x68, 0x87, 0xa6, 0xa1, 0xed, 0xd4, 0x99, 0xe9, 0x2a, 0x21, 0x1c, 0xf4, 0x6a, 0x3c,
-	0xf9, 0x0d, 0x3c, 0x7a, 0xf7, 0x4b, 0x78, 0xe5, 0x2b, 0xe8, 0xc5, 0xcf, 0xe0, 0xc1, 0xb4, 0xd3,
-	0x59, 0x01, 0x53, 0x4a, 0x02, 0xb7, 0xd7, 0x37, 0xff, 0xfe, 0xde, 0x7b, 0xf3, 0x5e, 0x5f, 0xc1,
-	0xc8, 0x27, 0xc4, 0x0f, 0xb1, 0x89, 0x3c, 0x66, 0x0a, 0x33, 0xb3, 0x26, 0x6d, 0x93, 0x61, 0x3a,
-	0x09, 0x5c, 0xcc, 0x4c, 0x17, 0x45, 0x09, 0x0a, 0xfc, 0xd8, 0xc1, 0xef, 0x39, 0x8e, 0x59, 0x40,
-	0x62, 0x87, 0x61, 0xce, 0x83, 0xd8, 0x77, 0x0a, 0x8d, 0x91, 0x50, 0xc2, 0x09, 0x6c, 0x88, 0xf7,
-	0x0d, 0xe4, 0x31, 0x63, 0x8a, 0x32, 0x26, 0x6d, 0x43, 0xa2, 0xea, 0xfd, 0xb2, 0x60, 0x14, 0x33,
-	0x92, 0xd2, 0xf3, 0xa3, 0x89, 0x28, 0xf5, 0x07, 0x92, 0x91, 0x04, 0x26, 0x8a, 0x63, 0xc2, 0x11,
-	0x0f, 0x48, 0xcc, 0x8a, 0xd3, 0x22, 0x07, 0x33, 0x7f, 0xda, 0x4d, 0xf7, 0xcc, 0xbd, 0x00, 0x87,
-	0x9e, 0x13, 0x21, 0xb6, 0x5f, 0x28, 0x1e, 0x9e, 0x55, 0xbc, 0xa3, 0x28, 0x49, 0x30, 0x95, 0x84,
-	0x7b, 0xc5, 0x39, 0x4d, 0x5c, 0x93, 0x71, 0xc4, 0xd3, 0xe2, 0x40, 0x1f, 0x01, 0x7d, 0x0d, 0xf3,
-	0x41, 0x91, 0xdf, 0xaa, 0x4c, 0x6f, 0x5b, 0x64, 0x67, 0xe3, 0xb7, 0x29, 0x66, 0x1c, 0x3e, 0x06,
-	0x37, 0x65, 0x31, 0x4e, 0x8c, 0x22, 0x5c, 0x53, 0x1a, 0xca, 0xf2, 0xbc, 0xbd, 0x20, 0x9d, 0x2f,
-	0x51, 0x84, 0xf5, 0x3f, 0x0a, 0x78, 0xb2, 0x91, 0x72, 0xc4, 0x71, 0x19, 0x8e, 0x49, 0xde, 0x22,
-	0xd0, 0xdc, 0x94, 0x71, 0x12, 0x61, 0xea, 0x04, 0x5e, 0x41, 0x03, 0xd2, 0x35, 0xf2, 0xa0, 0x0b,
-	0x00, 0x49, 0x30, 0x15, 0xb7, 0x50, 0x53, 0x1b, 0x33, 0xcb, 0x5a, 0x67, 0x60, 0x54, 0xb5, 0xc2,
-	0x28, 0x0b, 0xbc, 0x29, 0x59, 0xf6, 0x09, 0x2c, 0x5c, 0x02, 0xb7, 0x13, 0x44, 0x79, 0x80, 0x42,
-	0x67, 0x0f, 0x05, 0x61, 0x4a, 0x71, 0x6d, 0xa6, 0xa1, 0x2c, 0xdf, 0xb0, 0x6f, 0x15, 0xee, 0xa1,
-	0xf0, 0x66, 0xe5, 0x4f, 0x50, 0x18, 0x78, 0x88, 0x63, 0x87, 0xc4, 0xe1, 0x41, 0x6d, 0x36, 0x97,
-	0x2d, 0x48, 0xe7, 0x66, 0x1c, 0x1e, 0xe8, 0xdf, 0x55, 0xf0, 0xa8, 0x32, 0x3e, 0xec, 0x02, 0x2d,
-	0x4d, 0x72, 0x50, 0xd6, 0xbd, 0x1c, 0xa4, 0x75, 0xea, 0xb2, 0x32, 0xd9, 0x3e, 0x63, 0x98, 0x35,
-	0x78, 0x03, 0xb1, 0x7d, 0x1b, 0x08, 0x79, 0x66, 0xc3, 0x57, 0x60, 0xce, 0xa5, 0x18, 0x71, 0x71,
-	0xff, 0x5a, 0xa7, 0x5b, 0x7a, 0x23, 0xd3, 0xd1, 0x2b, 0xbd, 0x92, 0xf5, 0x6b, 0x76, 0x01, 0xcb,
-	0xb0, 0x22, 0x48, 0x4d, 0xbd, 0x12, 0xac, 0x80, 0xc1, 0x1a, 0x98, 0xa3, 0x38, 0x22, 0x13, 0x71,
-	0xab, 0xf3, 0xd9, 0x89, 0x78, 0xee, 0x6b, 0x60, 0x7e, 0xda, 0x06, 0xfd, 0x58, 0x01, 0x4b, 0x95,
-	0x63, 0xc3, 0x12, 0x12, 0x33, 0x0c, 0x87, 0xe0, 0xee, 0x99, 0x8e, 0x39, 0x98, 0x52, 0x42, 0xf3,
-	0x08, 0x5a, 0x07, 0xca, 0xc4, 0x69, 0xe2, 0x1a, 0xdb, 0xf9, 0x98, 0xdb, 0x77, 0x4e, 0xf7, 0x72,
-	0x35, 0x93, 0xc3, 0x37, 0xe0, 0x3a, 0xc5, 0x2c, 0x0d, 0xb9, 0x9c, 0xad, 0x61, 0xf5, 0x6c, 0x9d,
-	0x9f, 0xa3, 0x9d, 0xe3, 0x6c, 0x89, 0xd5, 0x5f, 0x80, 0xe6, 0x45, 0x5e, 0xb8, 0xd0, 0x97, 0xd5,
-	0xf9, 0x3c, 0x0b, 0x16, 0xcb, 0x38, 0xdb, 0x22, 0x3f, 0xf8, 0x4b, 0x01, 0xf7, 0xcf, 0xf9, 0x92,
-	0xe1, 0xf3, 0xea, 0x0a, 0xab, 0x17, 0x41, 0xfd, 0x32, 0xa3, 0xa1, 0x0f, 0x3e, 0x1e, 0xff, 0xfc,
-	0xa2, 0xae, 0xc0, 0x6e, 0xb6, 0x1c, 0x0f, 0x4f, 0x95, 0xbd, 0x22, 0xbf, 0x7d, 0x66, 0xb6, 0xa6,
-	0xdb, 0xf2, 0xbf, 0x39, 0x30, 0x5b, 0x47, 0xf0, 0x83, 0x0a, 0x16, 0x2b, 0xc6, 0x05, 0xae, 0x5f,
-	0xb6, 0x9b, 0x72, 0x51, 0xd5, 0x47, 0x57, 0x40, 0x12, 0xb3, 0xab, 0x8f, 0xf2, 0xea, 0x07, 0xfa,
-	0xb3, 0xac, 0xfa, 0x7f, 0xe5, 0x1e, 0x9e, 0x58, 0x84, 0x2b, 0xad, 0xa3, 0xf2, 0xe2, 0xad, 0x28,
-	0x0f, 0x64, 0x29, 0xad, 0xfe, 0x27, 0x15, 0x34, 0x5d, 0x12, 0x55, 0xe6, 0xd6, 0x6f, 0x56, 0x4c,
-	0xcd, 0x56, 0xb6, 0x6f, 0xb6, 0x94, 0xd7, 0xeb, 0x05, 0xc9, 0x27, 0x21, 0x8a, 0x7d, 0x83, 0x50,
-	0xdf, 0xf4, 0x71, 0x9c, 0x6f, 0x23, 0xf9, 0x4b, 0x4b, 0x02, 0x56, 0xfe, 0x3b, 0xed, 0x4a, 0xe3,
-	0xab, 0x3a, 0xb3, 0xd6, 0xeb, 0x7d, 0x53, 0x1b, 0x6b, 0x02, 0xd8, 0xf3, 0x98, 0x21, 0xcc, 0xcc,
-	0xda, 0x69, 0x1b, 0x45, 0x60, 0xf6, 0x43, 0x4a, 0xc6, 0x3d, 0x8f, 0x8d, 0xa7, 0x92, 0xf1, 0x4e,
-	0x7b, 0x2c, 0x25, 0xbf, 0xd5, 0xa6, 0xf0, 0x5b, 0x56, 0xcf, 0x63, 0x96, 0x35, 0x15, 0x59, 0xd6,
-	0x4e, 0xdb, 0xb2, 0xa4, 0x6c, 0x77, 0x2e, 0xcf, 0xf3, 0xe9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x75, 0x32, 0x38, 0x15, 0xf5, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_feed_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_feed_service.pb.go
index 424b21afec..3caa0efc96 100644
--- a/googleapis/ads/googleads/v1/services/campaign_feed_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_feed_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_feed_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignFeedService.GetCampaignFeed][google.ads.googleads.v1.services.CampaignFeedService.GetCampaignFeed].
 type GetCampaignFeedRequest struct {
@@ -41,16 +41,17 @@ func (m *GetCampaignFeedRequest) Reset()         { *m = GetCampaignFeedRequest{}
 func (m *GetCampaignFeedRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignFeedRequest) ProtoMessage()    {}
 func (*GetCampaignFeedRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_service_8c918da333fda613, []int{0}
+	return fileDescriptor_e0bfa8f03a924d02, []int{0}
 }
+
 func (m *GetCampaignFeedRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignFeedRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignFeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignFeedRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignFeedRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignFeedRequest.Merge(dst, src)
+func (m *GetCampaignFeedRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignFeedRequest.Merge(m, src)
 }
 func (m *GetCampaignFeedRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignFeedRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateCampaignFeedsRequest) Reset()         { *m = MutateCampaignFeedsR
 func (m *MutateCampaignFeedsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignFeedsRequest) ProtoMessage()    {}
 func (*MutateCampaignFeedsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_service_8c918da333fda613, []int{1}
+	return fileDescriptor_e0bfa8f03a924d02, []int{1}
 }
+
 func (m *MutateCampaignFeedsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignFeedsRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignFeedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignFeedsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignFeedsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignFeedsRequest.Merge(dst, src)
+func (m *MutateCampaignFeedsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignFeedsRequest.Merge(m, src)
 }
 func (m *MutateCampaignFeedsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignFeedsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *CampaignFeedOperation) Reset()         { *m = CampaignFeedOperation{} }
 func (m *CampaignFeedOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignFeedOperation) ProtoMessage()    {}
 func (*CampaignFeedOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_service_8c918da333fda613, []int{2}
+	return fileDescriptor_e0bfa8f03a924d02, []int{2}
 }
+
 func (m *CampaignFeedOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignFeedOperation.Unmarshal(m, b)
 }
 func (m *CampaignFeedOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignFeedOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignFeedOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignFeedOperation.Merge(dst, src)
+func (m *CampaignFeedOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignFeedOperation.Merge(m, src)
 }
 func (m *CampaignFeedOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignFeedOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *CampaignFeedOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignFeedOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignFeedOperation_OneofMarshaler, _CampaignFeedOperation_OneofUnmarshaler, _CampaignFeedOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignFeedOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignFeedOperation_Create)(nil),
 		(*CampaignFeedOperation_Update)(nil),
 		(*CampaignFeedOperation_Remove)(nil),
 	}
 }
 
-func _CampaignFeedOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignFeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignFeedOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignFeedOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CampaignFeedOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignFeedOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignFeedOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignFeedOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignFeed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignFeedOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignFeed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignFeedOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignFeedOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignFeedOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignFeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignFeedOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignFeedOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignFeedOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a campaign feed mutate.
 type MutateCampaignFeedsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateCampaignFeedsResponse) Reset()         { *m = MutateCampaignFeeds
 func (m *MutateCampaignFeedsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignFeedsResponse) ProtoMessage()    {}
 func (*MutateCampaignFeedsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_service_8c918da333fda613, []int{3}
+	return fileDescriptor_e0bfa8f03a924d02, []int{3}
 }
+
 func (m *MutateCampaignFeedsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignFeedsResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignFeedsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignFeedsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignFeedsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignFeedsResponse.Merge(dst, src)
+func (m *MutateCampaignFeedsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignFeedsResponse.Merge(m, src)
 }
 func (m *MutateCampaignFeedsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignFeedsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateCampaignFeedResult) Reset()         { *m = MutateCampaignFeedResu
 func (m *MutateCampaignFeedResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignFeedResult) ProtoMessage()    {}
 func (*MutateCampaignFeedResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_feed_service_8c918da333fda613, []int{4}
+	return fileDescriptor_e0bfa8f03a924d02, []int{4}
 }
+
 func (m *MutateCampaignFeedResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignFeedResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignFeedResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignFeedResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignFeedResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignFeedResult.Merge(dst, src)
+func (m *MutateCampaignFeedResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignFeedResult.Merge(m, src)
 }
 func (m *MutateCampaignFeedResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignFeedResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateCampaignFeedResult)(nil), "google.ads.googleads.v1.services.MutateCampaignFeedResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_feed_service.proto", fileDescriptor_e0bfa8f03a924d02)
+}
+
+var fileDescriptor_e0bfa8f03a924d02 = []byte{
+	// 714 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xc1, 0x6e, 0xd3, 0x4c,
+	0x10, 0xfe, 0x9d, 0xfc, 0x2a, 0x74, 0x5d, 0xa8, 0xb4, 0x55, 0xc1, 0x0a, 0x08, 0x22, 0x53, 0x89,
+	0x2a, 0x07, 0xaf, 0x12, 0x84, 0x8a, 0xdc, 0x46, 0x28, 0x45, 0xa4, 0xed, 0xa1, 0xb4, 0x72, 0x51,
+	0x91, 0x50, 0x24, 0x6b, 0x6b, 0x6f, 0x2c, 0xab, 0xb6, 0xd7, 0xec, 0xae, 0x83, 0xaa, 0xaa, 0x17,
+	0xde, 0x00, 0xf1, 0x04, 0x70, 0xe4, 0xce, 0x89, 0x37, 0xe0, 0x86, 0x78, 0x85, 0x9e, 0x78, 0x09,
+	0x90, 0xbd, 0xde, 0x90, 0xb4, 0x89, 0x02, 0xbd, 0x8d, 0x67, 0xbf, 0xf9, 0x66, 0x66, 0xbf, 0xd9,
+	0x31, 0xd8, 0x08, 0x28, 0x0d, 0x22, 0x82, 0xb0, 0xcf, 0x91, 0x34, 0x73, 0x6b, 0xd0, 0x44, 0x9c,
+	0xb0, 0x41, 0xe8, 0x11, 0x8e, 0x3c, 0x1c, 0xa7, 0x38, 0x0c, 0x12, 0xb7, 0x4f, 0x88, 0xef, 0x96,
+	0x6e, 0x2b, 0x65, 0x54, 0x50, 0x58, 0x97, 0x21, 0x16, 0xf6, 0xb9, 0x35, 0x8c, 0xb6, 0x06, 0x4d,
+	0x4b, 0x45, 0xd7, 0x1e, 0x4f, 0xe3, 0x67, 0x84, 0xd3, 0x8c, 0x5d, 0x4a, 0x20, 0x89, 0x6b, 0x77,
+	0x55, 0x58, 0x1a, 0x22, 0x9c, 0x24, 0x54, 0x60, 0x11, 0xd2, 0x84, 0x97, 0xa7, 0x65, 0x5a, 0x54,
+	0x7c, 0x1d, 0x65, 0x7d, 0xd4, 0x0f, 0x49, 0xe4, 0xbb, 0x31, 0xe6, 0xc7, 0x25, 0xe2, 0xde, 0x45,
+	0xc4, 0x5b, 0x86, 0xd3, 0x94, 0x30, 0xc5, 0x70, 0xbb, 0x3c, 0x67, 0xa9, 0x87, 0xb8, 0xc0, 0x22,
+	0x2b, 0x0f, 0xcc, 0x36, 0xb8, 0xb5, 0x45, 0xc4, 0xb3, 0xb2, 0xa4, 0x2e, 0x21, 0xbe, 0x43, 0xde,
+	0x64, 0x84, 0x0b, 0xf8, 0x00, 0xdc, 0x50, 0x35, 0xbb, 0x09, 0x8e, 0x89, 0xa1, 0xd5, 0xb5, 0xd5,
+	0x79, 0x67, 0x41, 0x39, 0x5f, 0xe0, 0x98, 0x98, 0xe7, 0x1a, 0xa8, 0xed, 0x66, 0x02, 0x0b, 0x32,
+	0x4a, 0xc1, 0x15, 0xc7, 0x7d, 0xa0, 0x7b, 0x19, 0x17, 0x34, 0x26, 0xcc, 0x0d, 0xfd, 0x92, 0x01,
+	0x28, 0xd7, 0x8e, 0x0f, 0x5f, 0x01, 0x40, 0x53, 0xc2, 0x64, 0xb7, 0x46, 0xa5, 0x5e, 0x5d, 0xd5,
+	0x5b, 0x6b, 0xd6, 0xac, 0x5b, 0xb6, 0x46, 0x93, 0xed, 0xa9, 0x78, 0x67, 0x84, 0x0a, 0x3e, 0x04,
+	0x8b, 0x29, 0x66, 0x22, 0xc4, 0x91, 0xdb, 0xc7, 0x61, 0x94, 0x31, 0x62, 0x54, 0xeb, 0xda, 0xea,
+	0x75, 0xe7, 0x66, 0xe9, 0xee, 0x4a, 0x6f, 0xde, 0xe6, 0x00, 0x47, 0xa1, 0x8f, 0x05, 0x71, 0x69,
+	0x12, 0x9d, 0x18, 0xff, 0x17, 0xb0, 0x05, 0xe5, 0xdc, 0x4b, 0xa2, 0x13, 0xf3, 0x7d, 0x05, 0x2c,
+	0x4f, 0xcc, 0x09, 0xd7, 0x81, 0x9e, 0xa5, 0x45, 0x70, 0xae, 0x46, 0x11, 0xac, 0xb7, 0x6a, 0xaa,
+	0x03, 0x25, 0x87, 0xd5, 0xcd, 0x05, 0xdb, 0xc5, 0xfc, 0xd8, 0x01, 0x12, 0x9e, 0xdb, 0x70, 0x07,
+	0xcc, 0x79, 0x8c, 0x60, 0x21, 0xef, 0x56, 0x6f, 0xa1, 0xa9, 0x9d, 0x0f, 0xa7, 0x67, 0xac, 0xf5,
+	0xed, 0xff, 0x9c, 0x92, 0x20, 0xa7, 0x92, 0xc4, 0x46, 0xe5, 0xca, 0x54, 0x92, 0x00, 0x1a, 0x60,
+	0x8e, 0x91, 0x98, 0x0e, 0xe4, 0x8d, 0xcd, 0xe7, 0x27, 0xf2, 0x7b, 0x53, 0x07, 0xf3, 0xc3, 0x2b,
+	0x36, 0xbf, 0x6a, 0xe0, 0xce, 0x44, 0xe9, 0x79, 0x4a, 0x13, 0x4e, 0x60, 0x17, 0x2c, 0x5f, 0x50,
+	0xc0, 0x25, 0x8c, 0x51, 0x56, 0xb0, 0xea, 0x2d, 0xa8, 0x0a, 0x64, 0xa9, 0x67, 0x1d, 0x14, 0x23,
+	0xe9, 0x2c, 0x8d, 0x6b, 0xf3, 0x3c, 0x87, 0xc3, 0x97, 0xe0, 0x1a, 0x23, 0x3c, 0x8b, 0x84, 0x9a,
+	0x0f, 0x7b, 0xf6, 0x7c, 0x5c, 0xae, 0xcb, 0x29, 0x28, 0x1c, 0x45, 0x65, 0x3e, 0x05, 0xc6, 0x34,
+	0xd0, 0x5f, 0x4d, 0x7e, 0xeb, 0x63, 0x15, 0x2c, 0x8d, 0xc6, 0x1e, 0xc8, 0xdc, 0xf0, 0x8b, 0x06,
+	0x16, 0x2f, 0xbc, 0x28, 0xf8, 0x64, 0x76, 0xc5, 0x93, 0x1f, 0x61, 0xed, 0x5f, 0x65, 0x34, 0xd7,
+	0xde, 0xfd, 0x38, 0xff, 0x50, 0x69, 0x42, 0x94, 0xef, 0x9c, 0xd3, 0xb1, 0x36, 0xda, 0xea, 0xdd,
+	0x71, 0xd4, 0x18, 0x2e, 0xa1, 0x42, 0x33, 0xd4, 0x38, 0x83, 0xdf, 0x35, 0xb0, 0x34, 0x41, 0x4e,
+	0xb8, 0x71, 0x95, 0xdb, 0x56, 0x0b, 0xa0, 0xd6, 0xbe, 0x62, 0xb4, 0x9c, 0x21, 0xb3, 0x5d, 0x74,
+	0xb3, 0x66, 0xb6, 0xf2, 0x6e, 0xfe, 0x94, 0x7f, 0x3a, 0xb2, 0x54, 0xda, 0x8d, 0xb3, 0xf1, 0x66,
+	0xec, 0xb8, 0x20, 0xb4, 0xb5, 0xc6, 0xe6, 0x2f, 0x0d, 0xac, 0x78, 0x34, 0x9e, 0x59, 0xc3, 0xa6,
+	0x31, 0x41, 0xc9, 0xfd, 0xfc, 0xed, 0xee, 0x6b, 0xaf, 0xb7, 0xcb, 0xe8, 0x80, 0x46, 0x38, 0x09,
+	0x2c, 0xca, 0x02, 0x14, 0x90, 0xa4, 0x78, 0xd9, 0x6a, 0xc3, 0xa7, 0x21, 0x9f, 0xfe, 0x43, 0x59,
+	0x57, 0xc6, 0xa7, 0x4a, 0x75, 0xab, 0xd3, 0xf9, 0x5c, 0xa9, 0x6f, 0x49, 0xc2, 0x8e, 0xcf, 0x2d,
+	0x69, 0xe6, 0xd6, 0x61, 0xd3, 0x2a, 0x13, 0xf3, 0x6f, 0x0a, 0xd2, 0xeb, 0xf8, 0xbc, 0x37, 0x84,
+	0xf4, 0x0e, 0x9b, 0x3d, 0x05, 0xf9, 0x59, 0x59, 0x91, 0x7e, 0xdb, 0xee, 0xf8, 0xdc, 0xb6, 0x87,
+	0x20, 0xdb, 0x3e, 0x6c, 0xda, 0xb6, 0x82, 0x1d, 0xcd, 0x15, 0x75, 0x3e, 0xfa, 0x1d, 0x00, 0x00,
+	0xff, 0xff, 0x1c, 0x27, 0x98, 0x94, 0xf7, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,56 +513,3 @@ var _CampaignFeedService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_feed_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_feed_service.proto", fileDescriptor_campaign_feed_service_8c918da333fda613)
-}
-
-var fileDescriptor_campaign_feed_service_8c918da333fda613 = []byte{
-	// 714 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0xfe, 0x9d, 0xfc, 0x2a, 0x74, 0x5d, 0xa8, 0xb4, 0x55, 0xc1, 0x0a, 0x08, 0x22, 0x53, 0x89,
-	0x2a, 0x07, 0xaf, 0x12, 0x84, 0x8a, 0xdc, 0x46, 0x28, 0x45, 0xa4, 0xed, 0xa1, 0xb4, 0x72, 0x51,
-	0x91, 0x50, 0x24, 0x6b, 0x6b, 0x6f, 0x2c, 0xab, 0xb6, 0xd7, 0xec, 0xae, 0x83, 0xaa, 0xaa, 0x17,
-	0xde, 0x00, 0xf1, 0x04, 0x70, 0xe4, 0xce, 0x89, 0x37, 0xe0, 0x86, 0x78, 0x85, 0x9e, 0x78, 0x09,
-	0x90, 0xbd, 0xde, 0x90, 0xb4, 0x89, 0x02, 0xbd, 0x8d, 0x67, 0xbf, 0xf9, 0x66, 0x66, 0xbf, 0xd9,
-	0x31, 0xd8, 0x08, 0x28, 0x0d, 0x22, 0x82, 0xb0, 0xcf, 0x91, 0x34, 0x73, 0x6b, 0xd0, 0x44, 0x9c,
-	0xb0, 0x41, 0xe8, 0x11, 0x8e, 0x3c, 0x1c, 0xa7, 0x38, 0x0c, 0x12, 0xb7, 0x4f, 0x88, 0xef, 0x96,
-	0x6e, 0x2b, 0x65, 0x54, 0x50, 0x58, 0x97, 0x21, 0x16, 0xf6, 0xb9, 0x35, 0x8c, 0xb6, 0x06, 0x4d,
-	0x4b, 0x45, 0xd7, 0x1e, 0x4f, 0xe3, 0x67, 0x84, 0xd3, 0x8c, 0x5d, 0x4a, 0x20, 0x89, 0x6b, 0x77,
-	0x55, 0x58, 0x1a, 0x22, 0x9c, 0x24, 0x54, 0x60, 0x11, 0xd2, 0x84, 0x97, 0xa7, 0x65, 0x5a, 0x54,
-	0x7c, 0x1d, 0x65, 0x7d, 0xd4, 0x0f, 0x49, 0xe4, 0xbb, 0x31, 0xe6, 0xc7, 0x25, 0xe2, 0xde, 0x45,
-	0xc4, 0x5b, 0x86, 0xd3, 0x94, 0x30, 0xc5, 0x70, 0xbb, 0x3c, 0x67, 0xa9, 0x87, 0xb8, 0xc0, 0x22,
-	0x2b, 0x0f, 0xcc, 0x36, 0xb8, 0xb5, 0x45, 0xc4, 0xb3, 0xb2, 0xa4, 0x2e, 0x21, 0xbe, 0x43, 0xde,
-	0x64, 0x84, 0x0b, 0xf8, 0x00, 0xdc, 0x50, 0x35, 0xbb, 0x09, 0x8e, 0x89, 0xa1, 0xd5, 0xb5, 0xd5,
-	0x79, 0x67, 0x41, 0x39, 0x5f, 0xe0, 0x98, 0x98, 0xe7, 0x1a, 0xa8, 0xed, 0x66, 0x02, 0x0b, 0x32,
-	0x4a, 0xc1, 0x15, 0xc7, 0x7d, 0xa0, 0x7b, 0x19, 0x17, 0x34, 0x26, 0xcc, 0x0d, 0xfd, 0x92, 0x01,
-	0x28, 0xd7, 0x8e, 0x0f, 0x5f, 0x01, 0x40, 0x53, 0xc2, 0x64, 0xb7, 0x46, 0xa5, 0x5e, 0x5d, 0xd5,
-	0x5b, 0x6b, 0xd6, 0xac, 0x5b, 0xb6, 0x46, 0x93, 0xed, 0xa9, 0x78, 0x67, 0x84, 0x0a, 0x3e, 0x04,
-	0x8b, 0x29, 0x66, 0x22, 0xc4, 0x91, 0xdb, 0xc7, 0x61, 0x94, 0x31, 0x62, 0x54, 0xeb, 0xda, 0xea,
-	0x75, 0xe7, 0x66, 0xe9, 0xee, 0x4a, 0x6f, 0xde, 0xe6, 0x00, 0x47, 0xa1, 0x8f, 0x05, 0x71, 0x69,
-	0x12, 0x9d, 0x18, 0xff, 0x17, 0xb0, 0x05, 0xe5, 0xdc, 0x4b, 0xa2, 0x13, 0xf3, 0x7d, 0x05, 0x2c,
-	0x4f, 0xcc, 0x09, 0xd7, 0x81, 0x9e, 0xa5, 0x45, 0x70, 0xae, 0x46, 0x11, 0xac, 0xb7, 0x6a, 0xaa,
-	0x03, 0x25, 0x87, 0xd5, 0xcd, 0x05, 0xdb, 0xc5, 0xfc, 0xd8, 0x01, 0x12, 0x9e, 0xdb, 0x70, 0x07,
-	0xcc, 0x79, 0x8c, 0x60, 0x21, 0xef, 0x56, 0x6f, 0xa1, 0xa9, 0x9d, 0x0f, 0xa7, 0x67, 0xac, 0xf5,
-	0xed, 0xff, 0x9c, 0x92, 0x20, 0xa7, 0x92, 0xc4, 0x46, 0xe5, 0xca, 0x54, 0x92, 0x00, 0x1a, 0x60,
-	0x8e, 0x91, 0x98, 0x0e, 0xe4, 0x8d, 0xcd, 0xe7, 0x27, 0xf2, 0x7b, 0x53, 0x07, 0xf3, 0xc3, 0x2b,
-	0x36, 0xbf, 0x6a, 0xe0, 0xce, 0x44, 0xe9, 0x79, 0x4a, 0x13, 0x4e, 0x60, 0x17, 0x2c, 0x5f, 0x50,
-	0xc0, 0x25, 0x8c, 0x51, 0x56, 0xb0, 0xea, 0x2d, 0xa8, 0x0a, 0x64, 0xa9, 0x67, 0x1d, 0x14, 0x23,
-	0xe9, 0x2c, 0x8d, 0x6b, 0xf3, 0x3c, 0x87, 0xc3, 0x97, 0xe0, 0x1a, 0x23, 0x3c, 0x8b, 0x84, 0x9a,
-	0x0f, 0x7b, 0xf6, 0x7c, 0x5c, 0xae, 0xcb, 0x29, 0x28, 0x1c, 0x45, 0x65, 0x3e, 0x05, 0xc6, 0x34,
-	0xd0, 0x5f, 0x4d, 0x7e, 0xeb, 0x63, 0x15, 0x2c, 0x8d, 0xc6, 0x1e, 0xc8, 0xdc, 0xf0, 0x8b, 0x06,
-	0x16, 0x2f, 0xbc, 0x28, 0xf8, 0x64, 0x76, 0xc5, 0x93, 0x1f, 0x61, 0xed, 0x5f, 0x65, 0x34, 0xd7,
-	0xde, 0xfd, 0x38, 0xff, 0x50, 0x69, 0x42, 0x94, 0xef, 0x9c, 0xd3, 0xb1, 0x36, 0xda, 0xea, 0xdd,
-	0x71, 0xd4, 0x18, 0x2e, 0xa1, 0x42, 0x33, 0xd4, 0x38, 0x83, 0xdf, 0x35, 0xb0, 0x34, 0x41, 0x4e,
-	0xb8, 0x71, 0x95, 0xdb, 0x56, 0x0b, 0xa0, 0xd6, 0xbe, 0x62, 0xb4, 0x9c, 0x21, 0xb3, 0x5d, 0x74,
-	0xb3, 0x66, 0xb6, 0xf2, 0x6e, 0xfe, 0x94, 0x7f, 0x3a, 0xb2, 0x54, 0xda, 0x8d, 0xb3, 0xf1, 0x66,
-	0xec, 0xb8, 0x20, 0xb4, 0xb5, 0xc6, 0xe6, 0x2f, 0x0d, 0xac, 0x78, 0x34, 0x9e, 0x59, 0xc3, 0xa6,
-	0x31, 0x41, 0xc9, 0xfd, 0xfc, 0xed, 0xee, 0x6b, 0xaf, 0xb7, 0xcb, 0xe8, 0x80, 0x46, 0x38, 0x09,
-	0x2c, 0xca, 0x02, 0x14, 0x90, 0xa4, 0x78, 0xd9, 0x6a, 0xc3, 0xa7, 0x21, 0x9f, 0xfe, 0x43, 0x59,
-	0x57, 0xc6, 0xa7, 0x4a, 0x75, 0xab, 0xd3, 0xf9, 0x5c, 0xa9, 0x6f, 0x49, 0xc2, 0x8e, 0xcf, 0x2d,
-	0x69, 0xe6, 0xd6, 0x61, 0xd3, 0x2a, 0x13, 0xf3, 0x6f, 0x0a, 0xd2, 0xeb, 0xf8, 0xbc, 0x37, 0x84,
-	0xf4, 0x0e, 0x9b, 0x3d, 0x05, 0xf9, 0x59, 0x59, 0x91, 0x7e, 0xdb, 0xee, 0xf8, 0xdc, 0xb6, 0x87,
-	0x20, 0xdb, 0x3e, 0x6c, 0xda, 0xb6, 0x82, 0x1d, 0xcd, 0x15, 0x75, 0x3e, 0xfa, 0x1d, 0x00, 0x00,
-	0xff, 0xff, 0x1c, 0x27, 0x98, 0x94, 0xf7, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_label_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_label_service.pb.go
index cf316c265a..c896c03dc7 100644
--- a/googleapis/ads/googleads/v1/services/campaign_label_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_label_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_label_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignLabelService.GetCampaignLabel][google.ads.googleads.v1.services.CampaignLabelService.GetCampaignLabel].
 type GetCampaignLabelRequest struct {
@@ -40,16 +40,17 @@ func (m *GetCampaignLabelRequest) Reset()         { *m = GetCampaignLabelRequest
 func (m *GetCampaignLabelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignLabelRequest) ProtoMessage()    {}
 func (*GetCampaignLabelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_label_service_a33f567caeaa39d2, []int{0}
+	return fileDescriptor_27173f6ba18f2b11, []int{0}
 }
+
 func (m *GetCampaignLabelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignLabelRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignLabelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignLabelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignLabelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignLabelRequest.Merge(dst, src)
+func (m *GetCampaignLabelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignLabelRequest.Merge(m, src)
 }
 func (m *GetCampaignLabelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignLabelRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateCampaignLabelsRequest) Reset()         { *m = MutateCampaignLabel
 func (m *MutateCampaignLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignLabelsRequest) ProtoMessage()    {}
 func (*MutateCampaignLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_label_service_a33f567caeaa39d2, []int{1}
+	return fileDescriptor_27173f6ba18f2b11, []int{1}
 }
+
 func (m *MutateCampaignLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignLabelsRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignLabelsRequest.Merge(dst, src)
+func (m *MutateCampaignLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignLabelsRequest.Merge(m, src)
 }
 func (m *MutateCampaignLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignLabelsRequest.Size(m)
@@ -155,16 +157,17 @@ func (m *CampaignLabelOperation) Reset()         { *m = CampaignLabelOperation{}
 func (m *CampaignLabelOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignLabelOperation) ProtoMessage()    {}
 func (*CampaignLabelOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_label_service_a33f567caeaa39d2, []int{2}
+	return fileDescriptor_27173f6ba18f2b11, []int{2}
 }
+
 func (m *CampaignLabelOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignLabelOperation.Unmarshal(m, b)
 }
 func (m *CampaignLabelOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignLabelOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignLabelOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignLabelOperation.Merge(dst, src)
+func (m *CampaignLabelOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignLabelOperation.Merge(m, src)
 }
 func (m *CampaignLabelOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignLabelOperation.Size(m)
@@ -212,76 +215,14 @@ func (m *CampaignLabelOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignLabelOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignLabelOperation_OneofMarshaler, _CampaignLabelOperation_OneofUnmarshaler, _CampaignLabelOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignLabelOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignLabelOperation_Create)(nil),
 		(*CampaignLabelOperation_Remove)(nil),
 	}
 }
 
-func _CampaignLabelOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignLabelOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignLabelOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignLabelOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignLabelOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignLabelOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignLabel)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignLabelOperation_Create{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignLabelOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignLabelOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignLabelOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignLabelOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a campaign labels mutate.
 type MutateCampaignLabelsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -300,16 +241,17 @@ func (m *MutateCampaignLabelsResponse) Reset()         { *m = MutateCampaignLabe
 func (m *MutateCampaignLabelsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignLabelsResponse) ProtoMessage()    {}
 func (*MutateCampaignLabelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_label_service_a33f567caeaa39d2, []int{3}
+	return fileDescriptor_27173f6ba18f2b11, []int{3}
 }
+
 func (m *MutateCampaignLabelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignLabelsResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignLabelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignLabelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignLabelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignLabelsResponse.Merge(dst, src)
+func (m *MutateCampaignLabelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignLabelsResponse.Merge(m, src)
 }
 func (m *MutateCampaignLabelsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignLabelsResponse.Size(m)
@@ -347,16 +289,17 @@ func (m *MutateCampaignLabelResult) Reset()         { *m = MutateCampaignLabelRe
 func (m *MutateCampaignLabelResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignLabelResult) ProtoMessage()    {}
 func (*MutateCampaignLabelResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_label_service_a33f567caeaa39d2, []int{4}
+	return fileDescriptor_27173f6ba18f2b11, []int{4}
 }
+
 func (m *MutateCampaignLabelResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignLabelResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignLabelResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignLabelResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignLabelResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignLabelResult.Merge(dst, src)
+func (m *MutateCampaignLabelResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignLabelResult.Merge(m, src)
 }
 func (m *MutateCampaignLabelResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignLabelResult.Size(m)
@@ -382,6 +325,56 @@ func init() {
 	proto.RegisterType((*MutateCampaignLabelResult)(nil), "google.ads.googleads.v1.services.MutateCampaignLabelResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_label_service.proto", fileDescriptor_27173f6ba18f2b11)
+}
+
+var fileDescriptor_27173f6ba18f2b11 = []byte{
+	// 668 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6a, 0xd4, 0x4e,
+	0x14, 0xff, 0x27, 0xfb, 0xa7, 0xda, 0xd9, 0xfa, 0xc1, 0x58, 0x6d, 0xba, 0x16, 0x5d, 0x62, 0xc1,
+	0xb2, 0x17, 0x49, 0x77, 0x0b, 0x52, 0x53, 0xb6, 0xb8, 0x15, 0xdb, 0x2a, 0x6a, 0x4b, 0x8a, 0x45,
+	0x64, 0x21, 0x4c, 0x93, 0x69, 0x08, 0x24, 0x99, 0x38, 0x33, 0x59, 0x29, 0xa5, 0x20, 0xde, 0x7a,
+	0xe9, 0x1b, 0x78, 0xd9, 0x37, 0xf0, 0xc2, 0x17, 0xf0, 0x56, 0x7c, 0x03, 0xf1, 0xc2, 0xa7, 0x90,
+	0x64, 0x32, 0xb1, 0x59, 0x77, 0x59, 0xed, 0xdd, 0x99, 0xf3, 0xf1, 0x3b, 0xe7, 0x77, 0x3e, 0x06,
+	0x74, 0x7d, 0x42, 0xfc, 0x10, 0x9b, 0xc8, 0x63, 0xa6, 0x10, 0x33, 0x69, 0xd0, 0x36, 0x19, 0xa6,
+	0x83, 0xc0, 0xc5, 0xcc, 0x74, 0x51, 0x94, 0xa0, 0xc0, 0x8f, 0x9d, 0x10, 0x1d, 0xe0, 0xd0, 0x29,
+	0xf4, 0x46, 0x42, 0x09, 0x27, 0xb0, 0x29, 0x62, 0x0c, 0xe4, 0x31, 0xa3, 0x0c, 0x37, 0x06, 0x6d,
+	0x43, 0x86, 0x37, 0xee, 0x8d, 0x4b, 0x40, 0x31, 0x23, 0x29, 0xfd, 0x33, 0x83, 0x40, 0x6e, 0x2c,
+	0xc8, 0xb8, 0x24, 0x30, 0x51, 0x1c, 0x13, 0x8e, 0x78, 0x40, 0x62, 0x56, 0x58, 0x6f, 0x15, 0xd6,
+	0xfc, 0x75, 0x90, 0x1e, 0x9a, 0x6f, 0x28, 0x4a, 0x12, 0x4c, 0xa5, 0x7d, 0xae, 0xb0, 0xd3, 0xc4,
+	0x35, 0x19, 0x47, 0x3c, 0x2d, 0x0c, 0xfa, 0x3a, 0x98, 0xdb, 0xc2, 0xfc, 0x61, 0x91, 0xf1, 0x69,
+	0x96, 0xd0, 0xc6, 0xaf, 0x53, 0xcc, 0x38, 0xbc, 0x03, 0x2e, 0xc9, 0x9a, 0x9c, 0x18, 0x45, 0x58,
+	0x53, 0x9a, 0xca, 0xd2, 0xb4, 0x3d, 0x23, 0x95, 0xcf, 0x51, 0x84, 0xf5, 0x1f, 0x0a, 0xb8, 0xf9,
+	0x2c, 0xe5, 0x88, 0xe3, 0x0a, 0x06, 0x93, 0x20, 0xb7, 0x41, 0xdd, 0x4d, 0x19, 0x27, 0x11, 0xa6,
+	0x4e, 0xe0, 0x15, 0x10, 0x40, 0xaa, 0x1e, 0x7b, 0xf0, 0x25, 0x00, 0x24, 0xc1, 0x54, 0xb0, 0xd1,
+	0xd4, 0x66, 0x6d, 0xa9, 0xde, 0x59, 0x35, 0x26, 0xb5, 0xd1, 0xa8, 0x64, 0xdb, 0x91, 0x00, 0xf6,
+	0x19, 0x2c, 0x78, 0x17, 0x5c, 0x49, 0x10, 0xe5, 0x01, 0x0a, 0x9d, 0x43, 0x14, 0x84, 0x29, 0xc5,
+	0x5a, 0xad, 0xa9, 0x2c, 0x5d, 0xb4, 0x2f, 0x17, 0xea, 0x4d, 0xa1, 0xcd, 0x88, 0x0e, 0x50, 0x18,
+	0x78, 0x88, 0x63, 0x87, 0xc4, 0xe1, 0x91, 0xf6, 0x7f, 0xee, 0x36, 0x23, 0x95, 0x3b, 0x71, 0x78,
+	0xa4, 0xbf, 0x57, 0xc0, 0x8d, 0xd1, 0x49, 0xe1, 0x13, 0x30, 0xe5, 0x52, 0x8c, 0xb8, 0xe8, 0x50,
+	0xbd, 0xb3, 0x3c, 0xb6, 0xfc, 0x72, 0xc6, 0xd5, 0xfa, 0xb7, 0xff, 0xb3, 0x0b, 0x04, 0xa8, 0x81,
+	0x29, 0x8a, 0x23, 0x32, 0xc0, 0x9a, 0x9a, 0xb5, 0x2a, 0xb3, 0x88, 0xf7, 0x46, 0x1d, 0x4c, 0x97,
+	0xe4, 0xf4, 0xcf, 0x0a, 0x58, 0x18, 0xdd, 0x76, 0x96, 0x90, 0x98, 0x61, 0xb8, 0x09, 0xae, 0x0f,
+	0x91, 0x77, 0x30, 0xa5, 0x84, 0xe6, 0x2d, 0xa8, 0x77, 0xa0, 0x2c, 0x91, 0x26, 0xae, 0xb1, 0x97,
+	0x2f, 0x84, 0x7d, 0xad, 0xda, 0x96, 0x47, 0x99, 0x3b, 0x7c, 0x01, 0x2e, 0x50, 0xcc, 0xd2, 0x90,
+	0xcb, 0xd9, 0xac, 0x4d, 0x9e, 0xcd, 0x88, 0xc2, 0xec, 0x1c, 0xc3, 0x96, 0x58, 0xfa, 0x03, 0x30,
+	0x3f, 0xd6, 0xeb, 0xaf, 0x16, 0xaf, 0x73, 0x5a, 0x03, 0xb3, 0x95, 0xe0, 0x3d, 0x91, 0x1e, 0x7e,
+	0x52, 0xc0, 0xd5, 0xe1, 0x95, 0x86, 0xf7, 0x27, 0x57, 0x3d, 0xe6, 0x0c, 0x1a, 0xff, 0x3c, 0x4d,
+	0x7d, 0xf5, 0xdd, 0xd7, 0xef, 0x1f, 0xd4, 0x0e, 0x5c, 0xce, 0xce, 0xfa, 0xb8, 0x42, 0xa5, 0x2b,
+	0x37, 0x9f, 0x99, 0xad, 0xf2, 0xce, 0xc5, 0xe8, 0xcc, 0xd6, 0x09, 0xfc, 0xa6, 0x80, 0xd9, 0x51,
+	0x63, 0x85, 0xdd, 0x73, 0x75, 0x5d, 0x5e, 0x61, 0x63, 0xfd, 0xbc, 0xe1, 0x62, 0x9b, 0xf4, 0xf5,
+	0x9c, 0xd1, 0xaa, 0xbe, 0x92, 0x31, 0xfa, 0x4d, 0xe1, 0xf8, 0xcc, 0x69, 0x77, 0x5b, 0x27, 0x43,
+	0x84, 0xac, 0x28, 0x87, 0xb4, 0x94, 0xd6, 0xc6, 0x5b, 0x15, 0x2c, 0xba, 0x24, 0x9a, 0x58, 0xc5,
+	0xc6, 0xfc, 0xa8, 0x91, 0xee, 0x66, 0x3f, 0xd5, 0xae, 0xf2, 0x6a, 0xbb, 0x08, 0xf7, 0x49, 0x88,
+	0x62, 0xdf, 0x20, 0xd4, 0x37, 0x7d, 0x1c, 0xe7, 0xff, 0x98, 0xfc, 0x4a, 0x93, 0x80, 0x8d, 0xff,
+	0xba, 0xd7, 0xa4, 0xf0, 0x51, 0xad, 0x6d, 0xf5, 0x7a, 0xa7, 0x6a, 0x73, 0x4b, 0x00, 0xf6, 0x3c,
+	0x66, 0x08, 0x31, 0x93, 0xf6, 0xdb, 0x46, 0x91, 0x98, 0x7d, 0x91, 0x2e, 0xfd, 0x9e, 0xc7, 0xfa,
+	0xa5, 0x4b, 0x7f, 0xbf, 0xdd, 0x97, 0x2e, 0x3f, 0xd5, 0x45, 0xa1, 0xb7, 0xac, 0x9e, 0xc7, 0x2c,
+	0xab, 0x74, 0xb2, 0xac, 0xfd, 0xb6, 0x65, 0x49, 0xb7, 0x83, 0xa9, 0xbc, 0xce, 0x95, 0x5f, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0x6a, 0xf6, 0xcc, 0x51, 0x61, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -492,53 +485,3 @@ var _CampaignLabelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_label_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_label_service.proto", fileDescriptor_campaign_label_service_a33f567caeaa39d2)
-}
-
-var fileDescriptor_campaign_label_service_a33f567caeaa39d2 = []byte{
-	// 668 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6a, 0xd4, 0x4e,
-	0x14, 0xff, 0x27, 0xfb, 0xa7, 0xda, 0xd9, 0xfa, 0xc1, 0x58, 0x6d, 0xba, 0x16, 0x5d, 0x62, 0xc1,
-	0xb2, 0x17, 0x49, 0x77, 0x0b, 0x52, 0x53, 0xb6, 0xb8, 0x15, 0xdb, 0x2a, 0x6a, 0x4b, 0x8a, 0x45,
-	0x64, 0x21, 0x4c, 0x93, 0x69, 0x08, 0x24, 0x99, 0x38, 0x33, 0x59, 0x29, 0xa5, 0x20, 0xde, 0x7a,
-	0xe9, 0x1b, 0x78, 0xd9, 0x37, 0xf0, 0xc2, 0x17, 0xf0, 0x56, 0x7c, 0x03, 0xf1, 0xc2, 0xa7, 0x90,
-	0x64, 0x32, 0xb1, 0x59, 0x77, 0x59, 0xed, 0xdd, 0x99, 0xf3, 0xf1, 0x3b, 0xe7, 0x77, 0x3e, 0x06,
-	0x74, 0x7d, 0x42, 0xfc, 0x10, 0x9b, 0xc8, 0x63, 0xa6, 0x10, 0x33, 0x69, 0xd0, 0x36, 0x19, 0xa6,
-	0x83, 0xc0, 0xc5, 0xcc, 0x74, 0x51, 0x94, 0xa0, 0xc0, 0x8f, 0x9d, 0x10, 0x1d, 0xe0, 0xd0, 0x29,
-	0xf4, 0x46, 0x42, 0x09, 0x27, 0xb0, 0x29, 0x62, 0x0c, 0xe4, 0x31, 0xa3, 0x0c, 0x37, 0x06, 0x6d,
-	0x43, 0x86, 0x37, 0xee, 0x8d, 0x4b, 0x40, 0x31, 0x23, 0x29, 0xfd, 0x33, 0x83, 0x40, 0x6e, 0x2c,
-	0xc8, 0xb8, 0x24, 0x30, 0x51, 0x1c, 0x13, 0x8e, 0x78, 0x40, 0x62, 0x56, 0x58, 0x6f, 0x15, 0xd6,
-	0xfc, 0x75, 0x90, 0x1e, 0x9a, 0x6f, 0x28, 0x4a, 0x12, 0x4c, 0xa5, 0x7d, 0xae, 0xb0, 0xd3, 0xc4,
-	0x35, 0x19, 0x47, 0x3c, 0x2d, 0x0c, 0xfa, 0x3a, 0x98, 0xdb, 0xc2, 0xfc, 0x61, 0x91, 0xf1, 0x69,
-	0x96, 0xd0, 0xc6, 0xaf, 0x53, 0xcc, 0x38, 0xbc, 0x03, 0x2e, 0xc9, 0x9a, 0x9c, 0x18, 0x45, 0x58,
-	0x53, 0x9a, 0xca, 0xd2, 0xb4, 0x3d, 0x23, 0x95, 0xcf, 0x51, 0x84, 0xf5, 0x1f, 0x0a, 0xb8, 0xf9,
-	0x2c, 0xe5, 0x88, 0xe3, 0x0a, 0x06, 0x93, 0x20, 0xb7, 0x41, 0xdd, 0x4d, 0x19, 0x27, 0x11, 0xa6,
-	0x4e, 0xe0, 0x15, 0x10, 0x40, 0xaa, 0x1e, 0x7b, 0xf0, 0x25, 0x00, 0x24, 0xc1, 0x54, 0xb0, 0xd1,
-	0xd4, 0x66, 0x6d, 0xa9, 0xde, 0x59, 0x35, 0x26, 0xb5, 0xd1, 0xa8, 0x64, 0xdb, 0x91, 0x00, 0xf6,
-	0x19, 0x2c, 0x78, 0x17, 0x5c, 0x49, 0x10, 0xe5, 0x01, 0x0a, 0x9d, 0x43, 0x14, 0x84, 0x29, 0xc5,
-	0x5a, 0xad, 0xa9, 0x2c, 0x5d, 0xb4, 0x2f, 0x17, 0xea, 0x4d, 0xa1, 0xcd, 0x88, 0x0e, 0x50, 0x18,
-	0x78, 0x88, 0x63, 0x87, 0xc4, 0xe1, 0x91, 0xf6, 0x7f, 0xee, 0x36, 0x23, 0x95, 0x3b, 0x71, 0x78,
-	0xa4, 0xbf, 0x57, 0xc0, 0x8d, 0xd1, 0x49, 0xe1, 0x13, 0x30, 0xe5, 0x52, 0x8c, 0xb8, 0xe8, 0x50,
-	0xbd, 0xb3, 0x3c, 0xb6, 0xfc, 0x72, 0xc6, 0xd5, 0xfa, 0xb7, 0xff, 0xb3, 0x0b, 0x04, 0xa8, 0x81,
-	0x29, 0x8a, 0x23, 0x32, 0xc0, 0x9a, 0x9a, 0xb5, 0x2a, 0xb3, 0x88, 0xf7, 0x46, 0x1d, 0x4c, 0x97,
-	0xe4, 0xf4, 0xcf, 0x0a, 0x58, 0x18, 0xdd, 0x76, 0x96, 0x90, 0x98, 0x61, 0xb8, 0x09, 0xae, 0x0f,
-	0x91, 0x77, 0x30, 0xa5, 0x84, 0xe6, 0x2d, 0xa8, 0x77, 0xa0, 0x2c, 0x91, 0x26, 0xae, 0xb1, 0x97,
-	0x2f, 0x84, 0x7d, 0xad, 0xda, 0x96, 0x47, 0x99, 0x3b, 0x7c, 0x01, 0x2e, 0x50, 0xcc, 0xd2, 0x90,
-	0xcb, 0xd9, 0xac, 0x4d, 0x9e, 0xcd, 0x88, 0xc2, 0xec, 0x1c, 0xc3, 0x96, 0x58, 0xfa, 0x03, 0x30,
-	0x3f, 0xd6, 0xeb, 0xaf, 0x16, 0xaf, 0x73, 0x5a, 0x03, 0xb3, 0x95, 0xe0, 0x3d, 0x91, 0x1e, 0x7e,
-	0x52, 0xc0, 0xd5, 0xe1, 0x95, 0x86, 0xf7, 0x27, 0x57, 0x3d, 0xe6, 0x0c, 0x1a, 0xff, 0x3c, 0x4d,
-	0x7d, 0xf5, 0xdd, 0xd7, 0xef, 0x1f, 0xd4, 0x0e, 0x5c, 0xce, 0xce, 0xfa, 0xb8, 0x42, 0xa5, 0x2b,
-	0x37, 0x9f, 0x99, 0xad, 0xf2, 0xce, 0xc5, 0xe8, 0xcc, 0xd6, 0x09, 0xfc, 0xa6, 0x80, 0xd9, 0x51,
-	0x63, 0x85, 0xdd, 0x73, 0x75, 0x5d, 0x5e, 0x61, 0x63, 0xfd, 0xbc, 0xe1, 0x62, 0x9b, 0xf4, 0xf5,
-	0x9c, 0xd1, 0xaa, 0xbe, 0x92, 0x31, 0xfa, 0x4d, 0xe1, 0xf8, 0xcc, 0x69, 0x77, 0x5b, 0x27, 0x43,
-	0x84, 0xac, 0x28, 0x87, 0xb4, 0x94, 0xd6, 0xc6, 0x5b, 0x15, 0x2c, 0xba, 0x24, 0x9a, 0x58, 0xc5,
-	0xc6, 0xfc, 0xa8, 0x91, 0xee, 0x66, 0x3f, 0xd5, 0xae, 0xf2, 0x6a, 0xbb, 0x08, 0xf7, 0x49, 0x88,
-	0x62, 0xdf, 0x20, 0xd4, 0x37, 0x7d, 0x1c, 0xe7, 0xff, 0x98, 0xfc, 0x4a, 0x93, 0x80, 0x8d, 0xff,
-	0xba, 0xd7, 0xa4, 0xf0, 0x51, 0xad, 0x6d, 0xf5, 0x7a, 0xa7, 0x6a, 0x73, 0x4b, 0x00, 0xf6, 0x3c,
-	0x66, 0x08, 0x31, 0x93, 0xf6, 0xdb, 0x46, 0x91, 0x98, 0x7d, 0x91, 0x2e, 0xfd, 0x9e, 0xc7, 0xfa,
-	0xa5, 0x4b, 0x7f, 0xbf, 0xdd, 0x97, 0x2e, 0x3f, 0xd5, 0x45, 0xa1, 0xb7, 0xac, 0x9e, 0xc7, 0x2c,
-	0xab, 0x74, 0xb2, 0xac, 0xfd, 0xb6, 0x65, 0x49, 0xb7, 0x83, 0xa9, 0xbc, 0xce, 0x95, 0x5f, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x6a, 0xf6, 0xcc, 0x51, 0x61, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_service.pb.go
index a4c4ffdbe7..1c6780df6e 100644
--- a/googleapis/ads/googleads/v1/services/campaign_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignService.GetCampaign][google.ads.googleads.v1.services.CampaignService.GetCampaign].
 type GetCampaignRequest struct {
@@ -41,16 +41,17 @@ func (m *GetCampaignRequest) Reset()         { *m = GetCampaignRequest{} }
 func (m *GetCampaignRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignRequest) ProtoMessage()    {}
 func (*GetCampaignRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_service_1e7ae00c38b671a3, []int{0}
+	return fileDescriptor_57837f1a83a55878, []int{0}
 }
+
 func (m *GetCampaignRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignRequest.Merge(dst, src)
+func (m *GetCampaignRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignRequest.Merge(m, src)
 }
 func (m *GetCampaignRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateCampaignsRequest) Reset()         { *m = MutateCampaignsRequest{}
 func (m *MutateCampaignsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignsRequest) ProtoMessage()    {}
 func (*MutateCampaignsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_service_1e7ae00c38b671a3, []int{1}
+	return fileDescriptor_57837f1a83a55878, []int{1}
 }
+
 func (m *MutateCampaignsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignsRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignsRequest.Merge(dst, src)
+func (m *MutateCampaignsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignsRequest.Merge(m, src)
 }
 func (m *MutateCampaignsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *CampaignOperation) Reset()         { *m = CampaignOperation{} }
 func (m *CampaignOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignOperation) ProtoMessage()    {}
 func (*CampaignOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_service_1e7ae00c38b671a3, []int{2}
+	return fileDescriptor_57837f1a83a55878, []int{2}
 }
+
 func (m *CampaignOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignOperation.Unmarshal(m, b)
 }
 func (m *CampaignOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignOperation.Merge(dst, src)
+func (m *CampaignOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignOperation.Merge(m, src)
 }
 func (m *CampaignOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *CampaignOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignOperation_OneofMarshaler, _CampaignOperation_OneofUnmarshaler, _CampaignOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignOperation_Create)(nil),
 		(*CampaignOperation_Update)(nil),
 		(*CampaignOperation_Remove)(nil),
 	}
 }
 
-func _CampaignOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CampaignOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.Campaign)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.Campaign)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for campaign mutate.
 type MutateCampaignsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateCampaignsResponse) Reset()         { *m = MutateCampaignsResponse
 func (m *MutateCampaignsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignsResponse) ProtoMessage()    {}
 func (*MutateCampaignsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_service_1e7ae00c38b671a3, []int{3}
+	return fileDescriptor_57837f1a83a55878, []int{3}
 }
+
 func (m *MutateCampaignsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignsResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignsResponse.Merge(dst, src)
+func (m *MutateCampaignsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignsResponse.Merge(m, src)
 }
 func (m *MutateCampaignsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateCampaignResult) Reset()         { *m = MutateCampaignResult{} }
 func (m *MutateCampaignResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignResult) ProtoMessage()    {}
 func (*MutateCampaignResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_service_1e7ae00c38b671a3, []int{4}
+	return fileDescriptor_57837f1a83a55878, []int{4}
 }
+
 func (m *MutateCampaignResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignResult.Merge(dst, src)
+func (m *MutateCampaignResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignResult.Merge(m, src)
 }
 func (m *MutateCampaignResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignResult.Size(m)
@@ -425,6 +350,58 @@ func init() {
 	proto.RegisterType((*MutateCampaignResult)(nil), "google.ads.googleads.v1.services.MutateCampaignResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_service.proto", fileDescriptor_57837f1a83a55878)
+}
+
+var fileDescriptor_57837f1a83a55878 = []byte{
+	// 704 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0xd4, 0x4e,
+	0x18, 0xfe, 0x25, 0xfd, 0x51, 0xed, 0xa4, 0x5a, 0x1c, 0xab, 0x5d, 0x16, 0xd1, 0x25, 0x16, 0x2c,
+	0x5b, 0x9c, 0xb8, 0xbb, 0xa2, 0x36, 0xa5, 0x87, 0xad, 0xf4, 0x8f, 0x87, 0xda, 0x92, 0x42, 0x0f,
+	0xb2, 0x10, 0xa6, 0xc9, 0x34, 0x84, 0x26, 0x99, 0x38, 0x33, 0x59, 0x29, 0xa5, 0x17, 0xc1, 0x4f,
+	0xe0, 0x37, 0x10, 0xbc, 0x78, 0xf5, 0x13, 0x78, 0xf5, 0xea, 0xd5, 0xa3, 0x27, 0xbf, 0x82, 0x08,
+	0x92, 0x4c, 0x26, 0xdd, 0x6e, 0x5d, 0xd6, 0xf6, 0x36, 0x79, 0xf3, 0x3c, 0xcf, 0xfb, 0xcc, 0xfb,
+	0x67, 0xc0, 0xd3, 0x80, 0xd2, 0x20, 0x22, 0x16, 0xf6, 0xb9, 0x25, 0x8f, 0xf9, 0xa9, 0xdf, 0xb2,
+	0x38, 0x61, 0xfd, 0xd0, 0x23, 0xdc, 0xf2, 0x70, 0x9c, 0xe2, 0x30, 0x48, 0xdc, 0x32, 0x82, 0x52,
+	0x46, 0x05, 0x85, 0x0d, 0x89, 0x46, 0xd8, 0xe7, 0xa8, 0x22, 0xa2, 0x7e, 0x0b, 0x29, 0x62, 0xfd,
+	0xd1, 0x28, 0x69, 0x46, 0x38, 0xcd, 0xd8, 0xa0, 0xb6, 0xd4, 0xac, 0xdf, 0x51, 0x8c, 0x34, 0xb4,
+	0x70, 0x92, 0x50, 0x81, 0x45, 0x48, 0x13, 0x5e, 0xfe, 0x2d, 0x33, 0x5a, 0xc5, 0xd7, 0x7e, 0x76,
+	0x60, 0x1d, 0x84, 0x24, 0xf2, 0xdd, 0x18, 0xf3, 0xc3, 0x12, 0x71, 0x77, 0x18, 0xf1, 0x86, 0xe1,
+	0x34, 0x25, 0x4c, 0x29, 0xcc, 0x95, 0xff, 0x59, 0xea, 0x59, 0x5c, 0x60, 0x91, 0x95, 0x3f, 0xcc,
+	0x25, 0x00, 0x37, 0x88, 0x78, 0x5e, 0xba, 0x71, 0xc8, 0xeb, 0x8c, 0x70, 0x01, 0xef, 0x83, 0x6b,
+	0xca, 0xaa, 0x9b, 0xe0, 0x98, 0xd4, 0xb4, 0x86, 0xb6, 0x30, 0xe5, 0x4c, 0xab, 0xe0, 0x4b, 0x1c,
+	0x13, 0xf3, 0xbb, 0x06, 0x6e, 0x6f, 0x65, 0x02, 0x0b, 0xa2, 0xe8, 0x5c, 0xf1, 0xef, 0x01, 0xc3,
+	0xcb, 0xb8, 0xa0, 0x31, 0x61, 0x6e, 0xe8, 0x97, 0x6c, 0xa0, 0x42, 0x2f, 0x7c, 0xb8, 0x0b, 0x00,
+	0x4d, 0x09, 0x93, 0xb7, 0xac, 0xe9, 0x8d, 0x89, 0x05, 0xa3, 0xdd, 0x41, 0xe3, 0x0a, 0x8b, 0x54,
+	0xa2, 0x6d, 0xc5, 0x75, 0x06, 0x64, 0xe0, 0x03, 0x30, 0x93, 0x62, 0x26, 0x42, 0x1c, 0xb9, 0x07,
+	0x38, 0x8c, 0x32, 0x46, 0x6a, 0x13, 0x0d, 0x6d, 0xe1, 0xaa, 0x73, 0xbd, 0x0c, 0xaf, 0xcb, 0x68,
+	0x7e, 0xbd, 0x3e, 0x8e, 0x42, 0x1f, 0x0b, 0xe2, 0xd2, 0x24, 0x3a, 0xaa, 0xfd, 0x5f, 0xc0, 0xa6,
+	0x55, 0x70, 0x3b, 0x89, 0x8e, 0xcc, 0x77, 0x3a, 0xb8, 0x71, 0x2e, 0x1f, 0x5c, 0x06, 0x46, 0x96,
+	0x16, 0xc4, 0xbc, 0xfa, 0x05, 0xd1, 0x68, 0xd7, 0x95, 0x73, 0x55, 0x7e, 0xb4, 0x9e, 0x37, 0x68,
+	0x0b, 0xf3, 0x43, 0x07, 0x48, 0x78, 0x7e, 0x86, 0x6b, 0x60, 0xd2, 0x63, 0x04, 0x0b, 0x59, 0x4f,
+	0xa3, 0xbd, 0x38, 0xf2, 0xc6, 0xd5, 0xa0, 0x54, 0x57, 0xde, 0xfc, 0xcf, 0x29, 0xc9, 0xb9, 0x8c,
+	0x14, 0xad, 0xe9, 0x97, 0x92, 0x91, 0x64, 0x58, 0x03, 0x93, 0x8c, 0xc4, 0xb4, 0x2f, 0xab, 0x34,
+	0x95, 0xff, 0x91, 0xdf, 0xab, 0x06, 0x98, 0xaa, 0xca, 0x6a, 0x7e, 0xd6, 0xc0, 0xdc, 0xb9, 0x36,
+	0xf3, 0x94, 0x26, 0x9c, 0xc0, 0x75, 0x70, 0x6b, 0xa8, 0xe2, 0x2e, 0x61, 0x8c, 0xb2, 0x42, 0xd1,
+	0x68, 0x43, 0x65, 0x8c, 0xa5, 0x1e, 0xda, 0x2d, 0xc6, 0xce, 0xb9, 0x79, 0xb6, 0x17, 0x6b, 0x39,
+	0x1c, 0xee, 0x80, 0x2b, 0x8c, 0xf0, 0x2c, 0x12, 0x6a, 0x16, 0x9e, 0x8c, 0x9f, 0x85, 0xb3, 0x9e,
+	0x9c, 0x82, 0xee, 0x28, 0x19, 0x73, 0x19, 0xcc, 0xfe, 0x0d, 0xf0, 0x4f, 0x93, 0xdd, 0xfe, 0xad,
+	0x83, 0x19, 0xc5, 0xdb, 0x95, 0xf9, 0xe0, 0x47, 0x0d, 0x18, 0x03, 0x9b, 0x02, 0x1f, 0x8f, 0x77,
+	0x78, 0x7e, 0xb1, 0xea, 0x17, 0x69, 0x95, 0xd9, 0x79, 0xfb, 0xed, 0xc7, 0x7b, 0xfd, 0x21, 0x5c,
+	0xcc, 0x9f, 0x8e, 0xe3, 0x33, 0xb6, 0x57, 0xd4, 0x2e, 0x71, 0xab, 0x59, 0xbd, 0x25, 0xdc, 0x6a,
+	0x9e, 0xc0, 0x2f, 0x1a, 0x98, 0x19, 0x6a, 0x17, 0x7c, 0x76, 0xd1, 0x6a, 0xaa, 0x45, 0xae, 0x2f,
+	0x5d, 0x82, 0x29, 0x67, 0xc3, 0x5c, 0x2a, 0xdc, 0x77, 0x4c, 0x94, 0xbb, 0x3f, 0xb5, 0x7b, 0x3c,
+	0xf0, 0x30, 0xac, 0x34, 0x4f, 0x4e, 0xcd, 0xdb, 0x71, 0x21, 0x64, 0x6b, 0xcd, 0xd5, 0x5f, 0x1a,
+	0x98, 0xf7, 0x68, 0x3c, 0x36, 0xf7, 0xea, 0xec, 0x50, 0x97, 0x76, 0xf2, 0xfd, 0xdb, 0xd1, 0x5e,
+	0x6d, 0x96, 0xcc, 0x80, 0x46, 0x38, 0x09, 0x10, 0x65, 0x81, 0x15, 0x90, 0xa4, 0xd8, 0x4e, 0xf5,
+	0x20, 0xa7, 0x21, 0x1f, 0xfd, 0xf4, 0x2f, 0xab, 0xc3, 0x07, 0x7d, 0x62, 0xa3, 0xdb, 0xfd, 0xa4,
+	0x37, 0x36, 0xa4, 0x60, 0xd7, 0xe7, 0x48, 0x1e, 0xf3, 0xd3, 0x5e, 0x0b, 0x95, 0x89, 0xf9, 0x57,
+	0x05, 0xe9, 0x75, 0x7d, 0xde, 0xab, 0x20, 0xbd, 0xbd, 0x56, 0x4f, 0x41, 0x7e, 0xea, 0xf3, 0x32,
+	0x6e, 0xdb, 0x5d, 0x9f, 0xdb, 0x76, 0x05, 0xb2, 0xed, 0xbd, 0x96, 0x6d, 0x2b, 0xd8, 0xfe, 0x64,
+	0xe1, 0xb3, 0xf3, 0x27, 0x00, 0x00, 0xff, 0xff, 0x56, 0xbf, 0x71, 0xcc, 0xa1, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -533,55 +510,3 @@ var _CampaignService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_service.proto", fileDescriptor_campaign_service_1e7ae00c38b671a3)
-}
-
-var fileDescriptor_campaign_service_1e7ae00c38b671a3 = []byte{
-	// 704 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0xd4, 0x4e,
-	0x18, 0xfe, 0x25, 0xfd, 0x51, 0xed, 0xa4, 0x5a, 0x1c, 0xab, 0x5d, 0x16, 0xd1, 0x25, 0x16, 0x2c,
-	0x5b, 0x9c, 0xb8, 0xbb, 0xa2, 0x36, 0xa5, 0x87, 0xad, 0xf4, 0x8f, 0x87, 0xda, 0x92, 0x42, 0x0f,
-	0xb2, 0x10, 0xa6, 0xc9, 0x34, 0x84, 0x26, 0x99, 0x38, 0x33, 0x59, 0x29, 0xa5, 0x17, 0xc1, 0x4f,
-	0xe0, 0x37, 0x10, 0xbc, 0x78, 0xf5, 0x13, 0x78, 0xf5, 0xea, 0xd5, 0xa3, 0x27, 0xbf, 0x82, 0x08,
-	0x92, 0x4c, 0x26, 0xdd, 0x6e, 0x5d, 0xd6, 0xf6, 0x36, 0x79, 0xf3, 0x3c, 0xcf, 0xfb, 0xcc, 0xfb,
-	0x67, 0xc0, 0xd3, 0x80, 0xd2, 0x20, 0x22, 0x16, 0xf6, 0xb9, 0x25, 0x8f, 0xf9, 0xa9, 0xdf, 0xb2,
-	0x38, 0x61, 0xfd, 0xd0, 0x23, 0xdc, 0xf2, 0x70, 0x9c, 0xe2, 0x30, 0x48, 0xdc, 0x32, 0x82, 0x52,
-	0x46, 0x05, 0x85, 0x0d, 0x89, 0x46, 0xd8, 0xe7, 0xa8, 0x22, 0xa2, 0x7e, 0x0b, 0x29, 0x62, 0xfd,
-	0xd1, 0x28, 0x69, 0x46, 0x38, 0xcd, 0xd8, 0xa0, 0xb6, 0xd4, 0xac, 0xdf, 0x51, 0x8c, 0x34, 0xb4,
-	0x70, 0x92, 0x50, 0x81, 0x45, 0x48, 0x13, 0x5e, 0xfe, 0x2d, 0x33, 0x5a, 0xc5, 0xd7, 0x7e, 0x76,
-	0x60, 0x1d, 0x84, 0x24, 0xf2, 0xdd, 0x18, 0xf3, 0xc3, 0x12, 0x71, 0x77, 0x18, 0xf1, 0x86, 0xe1,
-	0x34, 0x25, 0x4c, 0x29, 0xcc, 0x95, 0xff, 0x59, 0xea, 0x59, 0x5c, 0x60, 0x91, 0x95, 0x3f, 0xcc,
-	0x25, 0x00, 0x37, 0x88, 0x78, 0x5e, 0xba, 0x71, 0xc8, 0xeb, 0x8c, 0x70, 0x01, 0xef, 0x83, 0x6b,
-	0xca, 0xaa, 0x9b, 0xe0, 0x98, 0xd4, 0xb4, 0x86, 0xb6, 0x30, 0xe5, 0x4c, 0xab, 0xe0, 0x4b, 0x1c,
-	0x13, 0xf3, 0xbb, 0x06, 0x6e, 0x6f, 0x65, 0x02, 0x0b, 0xa2, 0xe8, 0x5c, 0xf1, 0xef, 0x01, 0xc3,
-	0xcb, 0xb8, 0xa0, 0x31, 0x61, 0x6e, 0xe8, 0x97, 0x6c, 0xa0, 0x42, 0x2f, 0x7c, 0xb8, 0x0b, 0x00,
-	0x4d, 0x09, 0x93, 0xb7, 0xac, 0xe9, 0x8d, 0x89, 0x05, 0xa3, 0xdd, 0x41, 0xe3, 0x0a, 0x8b, 0x54,
-	0xa2, 0x6d, 0xc5, 0x75, 0x06, 0x64, 0xe0, 0x03, 0x30, 0x93, 0x62, 0x26, 0x42, 0x1c, 0xb9, 0x07,
-	0x38, 0x8c, 0x32, 0x46, 0x6a, 0x13, 0x0d, 0x6d, 0xe1, 0xaa, 0x73, 0xbd, 0x0c, 0xaf, 0xcb, 0x68,
-	0x7e, 0xbd, 0x3e, 0x8e, 0x42, 0x1f, 0x0b, 0xe2, 0xd2, 0x24, 0x3a, 0xaa, 0xfd, 0x5f, 0xc0, 0xa6,
-	0x55, 0x70, 0x3b, 0x89, 0x8e, 0xcc, 0x77, 0x3a, 0xb8, 0x71, 0x2e, 0x1f, 0x5c, 0x06, 0x46, 0x96,
-	0x16, 0xc4, 0xbc, 0xfa, 0x05, 0xd1, 0x68, 0xd7, 0x95, 0x73, 0x55, 0x7e, 0xb4, 0x9e, 0x37, 0x68,
-	0x0b, 0xf3, 0x43, 0x07, 0x48, 0x78, 0x7e, 0x86, 0x6b, 0x60, 0xd2, 0x63, 0x04, 0x0b, 0x59, 0x4f,
-	0xa3, 0xbd, 0x38, 0xf2, 0xc6, 0xd5, 0xa0, 0x54, 0x57, 0xde, 0xfc, 0xcf, 0x29, 0xc9, 0xb9, 0x8c,
-	0x14, 0xad, 0xe9, 0x97, 0x92, 0x91, 0x64, 0x58, 0x03, 0x93, 0x8c, 0xc4, 0xb4, 0x2f, 0xab, 0x34,
-	0x95, 0xff, 0x91, 0xdf, 0xab, 0x06, 0x98, 0xaa, 0xca, 0x6a, 0x7e, 0xd6, 0xc0, 0xdc, 0xb9, 0x36,
-	0xf3, 0x94, 0x26, 0x9c, 0xc0, 0x75, 0x70, 0x6b, 0xa8, 0xe2, 0x2e, 0x61, 0x8c, 0xb2, 0x42, 0xd1,
-	0x68, 0x43, 0x65, 0x8c, 0xa5, 0x1e, 0xda, 0x2d, 0xc6, 0xce, 0xb9, 0x79, 0xb6, 0x17, 0x6b, 0x39,
-	0x1c, 0xee, 0x80, 0x2b, 0x8c, 0xf0, 0x2c, 0x12, 0x6a, 0x16, 0x9e, 0x8c, 0x9f, 0x85, 0xb3, 0x9e,
-	0x9c, 0x82, 0xee, 0x28, 0x19, 0x73, 0x19, 0xcc, 0xfe, 0x0d, 0xf0, 0x4f, 0x93, 0xdd, 0xfe, 0xad,
-	0x83, 0x19, 0xc5, 0xdb, 0x95, 0xf9, 0xe0, 0x47, 0x0d, 0x18, 0x03, 0x9b, 0x02, 0x1f, 0x8f, 0x77,
-	0x78, 0x7e, 0xb1, 0xea, 0x17, 0x69, 0x95, 0xd9, 0x79, 0xfb, 0xed, 0xc7, 0x7b, 0xfd, 0x21, 0x5c,
-	0xcc, 0x9f, 0x8e, 0xe3, 0x33, 0xb6, 0x57, 0xd4, 0x2e, 0x71, 0xab, 0x59, 0xbd, 0x25, 0xdc, 0x6a,
-	0x9e, 0xc0, 0x2f, 0x1a, 0x98, 0x19, 0x6a, 0x17, 0x7c, 0x76, 0xd1, 0x6a, 0xaa, 0x45, 0xae, 0x2f,
-	0x5d, 0x82, 0x29, 0x67, 0xc3, 0x5c, 0x2a, 0xdc, 0x77, 0x4c, 0x94, 0xbb, 0x3f, 0xb5, 0x7b, 0x3c,
-	0xf0, 0x30, 0xac, 0x34, 0x4f, 0x4e, 0xcd, 0xdb, 0x71, 0x21, 0x64, 0x6b, 0xcd, 0xd5, 0x5f, 0x1a,
-	0x98, 0xf7, 0x68, 0x3c, 0x36, 0xf7, 0xea, 0xec, 0x50, 0x97, 0x76, 0xf2, 0xfd, 0xdb, 0xd1, 0x5e,
-	0x6d, 0x96, 0xcc, 0x80, 0x46, 0x38, 0x09, 0x10, 0x65, 0x81, 0x15, 0x90, 0xa4, 0xd8, 0x4e, 0xf5,
-	0x20, 0xa7, 0x21, 0x1f, 0xfd, 0xf4, 0x2f, 0xab, 0xc3, 0x07, 0x7d, 0x62, 0xa3, 0xdb, 0xfd, 0xa4,
-	0x37, 0x36, 0xa4, 0x60, 0xd7, 0xe7, 0x48, 0x1e, 0xf3, 0xd3, 0x5e, 0x0b, 0x95, 0x89, 0xf9, 0x57,
-	0x05, 0xe9, 0x75, 0x7d, 0xde, 0xab, 0x20, 0xbd, 0xbd, 0x56, 0x4f, 0x41, 0x7e, 0xea, 0xf3, 0x32,
-	0x6e, 0xdb, 0x5d, 0x9f, 0xdb, 0x76, 0x05, 0xb2, 0xed, 0xbd, 0x96, 0x6d, 0x2b, 0xd8, 0xfe, 0x64,
-	0xe1, 0xb3, 0xf3, 0x27, 0x00, 0x00, 0xff, 0xff, 0x56, 0xbf, 0x71, 0xcc, 0xa1, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/campaign_shared_set_service.pb.go b/googleapis/ads/googleads/v1/services/campaign_shared_set_service.pb.go
index 2f334887ad..f2f6e59e1e 100644
--- a/googleapis/ads/googleads/v1/services/campaign_shared_set_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/campaign_shared_set_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/campaign_shared_set_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CampaignSharedSetService.GetCampaignSharedSet][google.ads.googleads.v1.services.CampaignSharedSetService.GetCampaignSharedSet].
 type GetCampaignSharedSetRequest struct {
@@ -40,16 +40,17 @@ func (m *GetCampaignSharedSetRequest) Reset()         { *m = GetCampaignSharedSe
 func (m *GetCampaignSharedSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCampaignSharedSetRequest) ProtoMessage()    {}
 func (*GetCampaignSharedSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_service_3cd8ec5aeb965a55, []int{0}
+	return fileDescriptor_4eb5d89b68dc46d0, []int{0}
 }
+
 func (m *GetCampaignSharedSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCampaignSharedSetRequest.Unmarshal(m, b)
 }
 func (m *GetCampaignSharedSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCampaignSharedSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCampaignSharedSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCampaignSharedSetRequest.Merge(dst, src)
+func (m *GetCampaignSharedSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCampaignSharedSetRequest.Merge(m, src)
 }
 func (m *GetCampaignSharedSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCampaignSharedSetRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateCampaignSharedSetsRequest) Reset()         { *m = MutateCampaignS
 func (m *MutateCampaignSharedSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignSharedSetsRequest) ProtoMessage()    {}
 func (*MutateCampaignSharedSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_service_3cd8ec5aeb965a55, []int{1}
+	return fileDescriptor_4eb5d89b68dc46d0, []int{1}
 }
+
 func (m *MutateCampaignSharedSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignSharedSetsRequest.Unmarshal(m, b)
 }
 func (m *MutateCampaignSharedSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignSharedSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignSharedSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignSharedSetsRequest.Merge(dst, src)
+func (m *MutateCampaignSharedSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignSharedSetsRequest.Merge(m, src)
 }
 func (m *MutateCampaignSharedSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignSharedSetsRequest.Size(m)
@@ -155,16 +157,17 @@ func (m *CampaignSharedSetOperation) Reset()         { *m = CampaignSharedSetOpe
 func (m *CampaignSharedSetOperation) String() string { return proto.CompactTextString(m) }
 func (*CampaignSharedSetOperation) ProtoMessage()    {}
 func (*CampaignSharedSetOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_service_3cd8ec5aeb965a55, []int{2}
+	return fileDescriptor_4eb5d89b68dc46d0, []int{2}
 }
+
 func (m *CampaignSharedSetOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CampaignSharedSetOperation.Unmarshal(m, b)
 }
 func (m *CampaignSharedSetOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CampaignSharedSetOperation.Marshal(b, m, deterministic)
 }
-func (dst *CampaignSharedSetOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CampaignSharedSetOperation.Merge(dst, src)
+func (m *CampaignSharedSetOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CampaignSharedSetOperation.Merge(m, src)
 }
 func (m *CampaignSharedSetOperation) XXX_Size() int {
 	return xxx_messageInfo_CampaignSharedSetOperation.Size(m)
@@ -212,76 +215,14 @@ func (m *CampaignSharedSetOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CampaignSharedSetOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CampaignSharedSetOperation_OneofMarshaler, _CampaignSharedSetOperation_OneofUnmarshaler, _CampaignSharedSetOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CampaignSharedSetOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CampaignSharedSetOperation_Create)(nil),
 		(*CampaignSharedSetOperation_Remove)(nil),
 	}
 }
 
-func _CampaignSharedSetOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CampaignSharedSetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignSharedSetOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CampaignSharedSetOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CampaignSharedSetOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CampaignSharedSetOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CampaignSharedSetOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CampaignSharedSet)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CampaignSharedSetOperation_Create{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CampaignSharedSetOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CampaignSharedSetOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CampaignSharedSetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CampaignSharedSetOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CampaignSharedSetOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a campaign shared set mutate.
 type MutateCampaignSharedSetsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -300,16 +241,17 @@ func (m *MutateCampaignSharedSetsResponse) Reset()         { *m = MutateCampaign
 func (m *MutateCampaignSharedSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignSharedSetsResponse) ProtoMessage()    {}
 func (*MutateCampaignSharedSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_service_3cd8ec5aeb965a55, []int{3}
+	return fileDescriptor_4eb5d89b68dc46d0, []int{3}
 }
+
 func (m *MutateCampaignSharedSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignSharedSetsResponse.Unmarshal(m, b)
 }
 func (m *MutateCampaignSharedSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignSharedSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignSharedSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignSharedSetsResponse.Merge(dst, src)
+func (m *MutateCampaignSharedSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignSharedSetsResponse.Merge(m, src)
 }
 func (m *MutateCampaignSharedSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignSharedSetsResponse.Size(m)
@@ -347,16 +289,17 @@ func (m *MutateCampaignSharedSetResult) Reset()         { *m = MutateCampaignSha
 func (m *MutateCampaignSharedSetResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCampaignSharedSetResult) ProtoMessage()    {}
 func (*MutateCampaignSharedSetResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_campaign_shared_set_service_3cd8ec5aeb965a55, []int{4}
+	return fileDescriptor_4eb5d89b68dc46d0, []int{4}
 }
+
 func (m *MutateCampaignSharedSetResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCampaignSharedSetResult.Unmarshal(m, b)
 }
 func (m *MutateCampaignSharedSetResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCampaignSharedSetResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCampaignSharedSetResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCampaignSharedSetResult.Merge(dst, src)
+func (m *MutateCampaignSharedSetResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCampaignSharedSetResult.Merge(m, src)
 }
 func (m *MutateCampaignSharedSetResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCampaignSharedSetResult.Size(m)
@@ -382,6 +325,56 @@ func init() {
 	proto.RegisterType((*MutateCampaignSharedSetResult)(nil), "google.ads.googleads.v1.services.MutateCampaignSharedSetResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/campaign_shared_set_service.proto", fileDescriptor_4eb5d89b68dc46d0)
+}
+
+var fileDescriptor_4eb5d89b68dc46d0 = []byte{
+	// 671 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x41, 0x6b, 0xd4, 0x4e,
+	0x14, 0xff, 0x67, 0xf7, 0x4f, 0xb5, 0xb3, 0x55, 0x61, 0x54, 0x0c, 0xab, 0xb5, 0x4b, 0x2c, 0x58,
+	0xf6, 0x90, 0xb0, 0x6b, 0x51, 0x48, 0x5b, 0x24, 0x51, 0xdb, 0x7a, 0xb0, 0x2d, 0x59, 0x58, 0x50,
+	0x16, 0xc2, 0x34, 0x99, 0xc6, 0x40, 0x92, 0x89, 0x33, 0x93, 0x95, 0x52, 0x7a, 0x11, 0xbf, 0x41,
+	0xbf, 0x81, 0x47, 0xbf, 0x87, 0x07, 0x3d, 0x78, 0xf1, 0x2b, 0xe8, 0xc5, 0x83, 0x9f, 0x41, 0x92,
+	0xc9, 0xa4, 0xad, 0xdb, 0x74, 0xa5, 0xde, 0x5e, 0xde, 0x7b, 0xf3, 0x7b, 0xef, 0x37, 0xbf, 0x37,
+	0x2f, 0xc0, 0x0e, 0x08, 0x09, 0x22, 0x6c, 0x20, 0x9f, 0x19, 0xc2, 0xcc, 0xad, 0x71, 0xcf, 0x60,
+	0x98, 0x8e, 0x43, 0x0f, 0x33, 0xc3, 0x43, 0x71, 0x8a, 0xc2, 0x20, 0x71, 0xd9, 0x6b, 0x44, 0xb1,
+	0xef, 0x32, 0xcc, 0xdd, 0x32, 0xa8, 0xa7, 0x94, 0x70, 0x02, 0x3b, 0xe2, 0xa0, 0x8e, 0x7c, 0xa6,
+	0x57, 0x18, 0xfa, 0xb8, 0xa7, 0x4b, 0x8c, 0xf6, 0x4a, 0x5d, 0x15, 0x8a, 0x19, 0xc9, 0x68, 0x4d,
+	0x19, 0x01, 0xdf, 0xbe, 0x23, 0x0f, 0xa7, 0xa1, 0x81, 0x92, 0x84, 0x70, 0xc4, 0x43, 0x92, 0xb0,
+	0x32, 0x7a, 0xb7, 0x8c, 0x16, 0x5f, 0xbb, 0xd9, 0x9e, 0xf1, 0x96, 0xa2, 0x34, 0xc5, 0x54, 0xc6,
+	0x6f, 0x95, 0x71, 0x9a, 0x7a, 0x06, 0xe3, 0x88, 0x67, 0x65, 0x40, 0xb3, 0xc1, 0xed, 0x0d, 0xcc,
+	0x9f, 0x94, 0x65, 0x07, 0x45, 0xd5, 0x01, 0xe6, 0x0e, 0x7e, 0x93, 0x61, 0xc6, 0xe1, 0x3d, 0x70,
+	0x45, 0x36, 0xe7, 0x26, 0x28, 0xc6, 0xaa, 0xd2, 0x51, 0x96, 0x66, 0x9d, 0x39, 0xe9, 0xdc, 0x42,
+	0x31, 0xd6, 0x7e, 0x29, 0x60, 0xe1, 0x45, 0xc6, 0x11, 0xc7, 0x13, 0x38, 0x4c, 0x02, 0x2d, 0x80,
+	0x96, 0x97, 0x31, 0x4e, 0x62, 0x4c, 0xdd, 0xd0, 0x2f, 0x61, 0x80, 0x74, 0x3d, 0xf7, 0xe1, 0x08,
+	0x00, 0x92, 0x62, 0x2a, 0x58, 0xa9, 0x8d, 0x4e, 0x73, 0xa9, 0xd5, 0x5f, 0xd5, 0xa7, 0xdd, 0xa9,
+	0x3e, 0x51, 0x71, 0x5b, 0x82, 0x38, 0x27, 0xf0, 0xe0, 0x7d, 0x70, 0x2d, 0x45, 0x94, 0x87, 0x28,
+	0x72, 0xf7, 0x50, 0x18, 0x65, 0x14, 0xab, 0xcd, 0x8e, 0xb2, 0x74, 0xd9, 0xb9, 0x5a, 0xba, 0xd7,
+	0x85, 0x37, 0x27, 0x3c, 0x46, 0x51, 0xe8, 0x23, 0x8e, 0x5d, 0x92, 0x44, 0xfb, 0xea, 0xff, 0x45,
+	0xda, 0x9c, 0x74, 0x6e, 0x27, 0xd1, 0xbe, 0x76, 0xa4, 0x80, 0x76, 0x7d, 0x61, 0xb8, 0x05, 0x66,
+	0x3c, 0x8a, 0x11, 0x17, 0xb7, 0xd5, 0xea, 0x2f, 0xd7, 0xd2, 0xa8, 0x84, 0x9f, 0xe4, 0xb1, 0xf9,
+	0x9f, 0x53, 0xa2, 0x40, 0x15, 0xcc, 0x50, 0x1c, 0x93, 0xb1, 0xe8, 0x79, 0x36, 0x8f, 0x88, 0x6f,
+	0xbb, 0x05, 0x66, 0x2b, 0x92, 0xda, 0x27, 0x05, 0x74, 0xea, 0x65, 0x60, 0x29, 0x49, 0x18, 0x86,
+	0xeb, 0xe0, 0xe6, 0x1f, 0x17, 0xe1, 0x62, 0x4a, 0x09, 0x2d, 0xa0, 0x5b, 0x7d, 0x28, 0x5b, 0xa5,
+	0xa9, 0xa7, 0x0f, 0x8a, 0x41, 0x71, 0xae, 0x9f, 0xbe, 0xa2, 0x67, 0x79, 0x3a, 0x7c, 0x09, 0x2e,
+	0x51, 0xcc, 0xb2, 0x88, 0x4b, 0xad, 0x1e, 0x4f, 0xd7, 0xaa, 0xa6, 0x39, 0xa7, 0xc0, 0x71, 0x24,
+	0x9e, 0xf6, 0x14, 0xcc, 0x9f, 0x9b, 0xf9, 0x57, 0x43, 0xd9, 0xff, 0xda, 0x04, 0xea, 0x04, 0xc0,
+	0x40, 0xb4, 0x02, 0x3f, 0x2b, 0xe0, 0xc6, 0x59, 0x63, 0x0f, 0xd7, 0xa6, 0xb3, 0x38, 0xe7, 0xb9,
+	0xb4, 0x2f, 0xa4, 0xb4, 0xb6, 0xfa, 0xee, 0xdb, 0xf7, 0xa3, 0xc6, 0x43, 0xb8, 0x9c, 0xef, 0x82,
+	0x83, 0x53, 0xd4, 0xd6, 0xe4, 0x0b, 0x61, 0x46, 0xb7, 0x5a, 0x0e, 0xc7, 0xb2, 0x1a, 0xdd, 0x43,
+	0xf8, 0x43, 0x01, 0x6a, 0x9d, 0xec, 0xd0, 0xba, 0xb0, 0x2a, 0xf2, 0xe5, 0xb6, 0xed, 0x7f, 0x81,
+	0x10, 0x53, 0xa7, 0xd9, 0x05, 0xc3, 0x55, 0xed, 0x51, 0xce, 0xf0, 0x98, 0xd2, 0xc1, 0x89, 0x95,
+	0xb0, 0xd6, 0x3d, 0x3c, 0x83, 0xa0, 0x19, 0x17, 0xd0, 0xa6, 0xd2, 0xb5, 0xdf, 0x37, 0xc0, 0xa2,
+	0x47, 0xe2, 0xa9, 0xdd, 0xd8, 0xf3, 0x75, 0xb2, 0xef, 0xe4, 0x1b, 0x6f, 0x47, 0x79, 0xb5, 0x59,
+	0x42, 0x04, 0x24, 0x42, 0x49, 0xa0, 0x13, 0x1a, 0x18, 0x01, 0x4e, 0x8a, 0x7d, 0x28, 0xf7, 0x72,
+	0x1a, 0xb2, 0xfa, 0x9f, 0xc1, 0x8a, 0x34, 0x3e, 0x34, 0x9a, 0x1b, 0x96, 0xf5, 0xb1, 0xd1, 0xd9,
+	0x10, 0x80, 0x96, 0xcf, 0x74, 0x61, 0xe6, 0xd6, 0xb0, 0xa7, 0x97, 0x85, 0xd9, 0x17, 0x99, 0x32,
+	0xb2, 0x7c, 0x36, 0xaa, 0x52, 0x46, 0xc3, 0xde, 0x48, 0xa6, 0xfc, 0x6c, 0x2c, 0x0a, 0xbf, 0x69,
+	0x5a, 0x3e, 0x33, 0xcd, 0x2a, 0xc9, 0x34, 0x87, 0x3d, 0xd3, 0x94, 0x69, 0xbb, 0x33, 0x45, 0x9f,
+	0x0f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x69, 0x26, 0xa6, 0xb3, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -490,53 +483,3 @@ var _CampaignSharedSetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/campaign_shared_set_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/campaign_shared_set_service.proto", fileDescriptor_campaign_shared_set_service_3cd8ec5aeb965a55)
-}
-
-var fileDescriptor_campaign_shared_set_service_3cd8ec5aeb965a55 = []byte{
-	// 671 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x41, 0x6b, 0xd4, 0x4e,
-	0x14, 0xff, 0x67, 0xf7, 0x4f, 0xb5, 0xb3, 0x55, 0x61, 0x54, 0x0c, 0xab, 0xb5, 0x4b, 0x2c, 0x58,
-	0xf6, 0x90, 0xb0, 0x6b, 0x51, 0x48, 0x5b, 0x24, 0x51, 0xdb, 0x7a, 0xb0, 0x2d, 0x59, 0x58, 0x50,
-	0x16, 0xc2, 0x34, 0x99, 0xc6, 0x40, 0x92, 0x89, 0x33, 0x93, 0x95, 0x52, 0x7a, 0x11, 0xbf, 0x41,
-	0xbf, 0x81, 0x47, 0xbf, 0x87, 0x07, 0x3d, 0x78, 0xf1, 0x2b, 0xe8, 0xc5, 0x83, 0x9f, 0x41, 0x92,
-	0xc9, 0xa4, 0xad, 0xdb, 0x74, 0xa5, 0xde, 0x5e, 0xde, 0x7b, 0xf3, 0x7b, 0xef, 0x37, 0xbf, 0x37,
-	0x2f, 0xc0, 0x0e, 0x08, 0x09, 0x22, 0x6c, 0x20, 0x9f, 0x19, 0xc2, 0xcc, 0xad, 0x71, 0xcf, 0x60,
-	0x98, 0x8e, 0x43, 0x0f, 0x33, 0xc3, 0x43, 0x71, 0x8a, 0xc2, 0x20, 0x71, 0xd9, 0x6b, 0x44, 0xb1,
-	0xef, 0x32, 0xcc, 0xdd, 0x32, 0xa8, 0xa7, 0x94, 0x70, 0x02, 0x3b, 0xe2, 0xa0, 0x8e, 0x7c, 0xa6,
-	0x57, 0x18, 0xfa, 0xb8, 0xa7, 0x4b, 0x8c, 0xf6, 0x4a, 0x5d, 0x15, 0x8a, 0x19, 0xc9, 0x68, 0x4d,
-	0x19, 0x01, 0xdf, 0xbe, 0x23, 0x0f, 0xa7, 0xa1, 0x81, 0x92, 0x84, 0x70, 0xc4, 0x43, 0x92, 0xb0,
-	0x32, 0x7a, 0xb7, 0x8c, 0x16, 0x5f, 0xbb, 0xd9, 0x9e, 0xf1, 0x96, 0xa2, 0x34, 0xc5, 0x54, 0xc6,
-	0x6f, 0x95, 0x71, 0x9a, 0x7a, 0x06, 0xe3, 0x88, 0x67, 0x65, 0x40, 0xb3, 0xc1, 0xed, 0x0d, 0xcc,
-	0x9f, 0x94, 0x65, 0x07, 0x45, 0xd5, 0x01, 0xe6, 0x0e, 0x7e, 0x93, 0x61, 0xc6, 0xe1, 0x3d, 0x70,
-	0x45, 0x36, 0xe7, 0x26, 0x28, 0xc6, 0xaa, 0xd2, 0x51, 0x96, 0x66, 0x9d, 0x39, 0xe9, 0xdc, 0x42,
-	0x31, 0xd6, 0x7e, 0x29, 0x60, 0xe1, 0x45, 0xc6, 0x11, 0xc7, 0x13, 0x38, 0x4c, 0x02, 0x2d, 0x80,
-	0x96, 0x97, 0x31, 0x4e, 0x62, 0x4c, 0xdd, 0xd0, 0x2f, 0x61, 0x80, 0x74, 0x3d, 0xf7, 0xe1, 0x08,
-	0x00, 0x92, 0x62, 0x2a, 0x58, 0xa9, 0x8d, 0x4e, 0x73, 0xa9, 0xd5, 0x5f, 0xd5, 0xa7, 0xdd, 0xa9,
-	0x3e, 0x51, 0x71, 0x5b, 0x82, 0x38, 0x27, 0xf0, 0xe0, 0x7d, 0x70, 0x2d, 0x45, 0x94, 0x87, 0x28,
-	0x72, 0xf7, 0x50, 0x18, 0x65, 0x14, 0xab, 0xcd, 0x8e, 0xb2, 0x74, 0xd9, 0xb9, 0x5a, 0xba, 0xd7,
-	0x85, 0x37, 0x27, 0x3c, 0x46, 0x51, 0xe8, 0x23, 0x8e, 0x5d, 0x92, 0x44, 0xfb, 0xea, 0xff, 0x45,
-	0xda, 0x9c, 0x74, 0x6e, 0x27, 0xd1, 0xbe, 0x76, 0xa4, 0x80, 0x76, 0x7d, 0x61, 0xb8, 0x05, 0x66,
-	0x3c, 0x8a, 0x11, 0x17, 0xb7, 0xd5, 0xea, 0x2f, 0xd7, 0xd2, 0xa8, 0x84, 0x9f, 0xe4, 0xb1, 0xf9,
-	0x9f, 0x53, 0xa2, 0x40, 0x15, 0xcc, 0x50, 0x1c, 0x93, 0xb1, 0xe8, 0x79, 0x36, 0x8f, 0x88, 0x6f,
-	0xbb, 0x05, 0x66, 0x2b, 0x92, 0xda, 0x27, 0x05, 0x74, 0xea, 0x65, 0x60, 0x29, 0x49, 0x18, 0x86,
-	0xeb, 0xe0, 0xe6, 0x1f, 0x17, 0xe1, 0x62, 0x4a, 0x09, 0x2d, 0xa0, 0x5b, 0x7d, 0x28, 0x5b, 0xa5,
-	0xa9, 0xa7, 0x0f, 0x8a, 0x41, 0x71, 0xae, 0x9f, 0xbe, 0xa2, 0x67, 0x79, 0x3a, 0x7c, 0x09, 0x2e,
-	0x51, 0xcc, 0xb2, 0x88, 0x4b, 0xad, 0x1e, 0x4f, 0xd7, 0xaa, 0xa6, 0x39, 0xa7, 0xc0, 0x71, 0x24,
-	0x9e, 0xf6, 0x14, 0xcc, 0x9f, 0x9b, 0xf9, 0x57, 0x43, 0xd9, 0xff, 0xda, 0x04, 0xea, 0x04, 0xc0,
-	0x40, 0xb4, 0x02, 0x3f, 0x2b, 0xe0, 0xc6, 0x59, 0x63, 0x0f, 0xd7, 0xa6, 0xb3, 0x38, 0xe7, 0xb9,
-	0xb4, 0x2f, 0xa4, 0xb4, 0xb6, 0xfa, 0xee, 0xdb, 0xf7, 0xa3, 0xc6, 0x43, 0xb8, 0x9c, 0xef, 0x82,
-	0x83, 0x53, 0xd4, 0xd6, 0xe4, 0x0b, 0x61, 0x46, 0xb7, 0x5a, 0x0e, 0xc7, 0xb2, 0x1a, 0xdd, 0x43,
-	0xf8, 0x43, 0x01, 0x6a, 0x9d, 0xec, 0xd0, 0xba, 0xb0, 0x2a, 0xf2, 0xe5, 0xb6, 0xed, 0x7f, 0x81,
-	0x10, 0x53, 0xa7, 0xd9, 0x05, 0xc3, 0x55, 0xed, 0x51, 0xce, 0xf0, 0x98, 0xd2, 0xc1, 0x89, 0x95,
-	0xb0, 0xd6, 0x3d, 0x3c, 0x83, 0xa0, 0x19, 0x17, 0xd0, 0xa6, 0xd2, 0xb5, 0xdf, 0x37, 0xc0, 0xa2,
-	0x47, 0xe2, 0xa9, 0xdd, 0xd8, 0xf3, 0x75, 0xb2, 0xef, 0xe4, 0x1b, 0x6f, 0x47, 0x79, 0xb5, 0x59,
-	0x42, 0x04, 0x24, 0x42, 0x49, 0xa0, 0x13, 0x1a, 0x18, 0x01, 0x4e, 0x8a, 0x7d, 0x28, 0xf7, 0x72,
-	0x1a, 0xb2, 0xfa, 0x9f, 0xc1, 0x8a, 0x34, 0x3e, 0x34, 0x9a, 0x1b, 0x96, 0xf5, 0xb1, 0xd1, 0xd9,
-	0x10, 0x80, 0x96, 0xcf, 0x74, 0x61, 0xe6, 0xd6, 0xb0, 0xa7, 0x97, 0x85, 0xd9, 0x17, 0x99, 0x32,
-	0xb2, 0x7c, 0x36, 0xaa, 0x52, 0x46, 0xc3, 0xde, 0x48, 0xa6, 0xfc, 0x6c, 0x2c, 0x0a, 0xbf, 0x69,
-	0x5a, 0x3e, 0x33, 0xcd, 0x2a, 0xc9, 0x34, 0x87, 0x3d, 0xd3, 0x94, 0x69, 0xbb, 0x33, 0x45, 0x9f,
-	0x0f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x69, 0x26, 0xa6, 0xb3, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/carrier_constant_service.pb.go b/googleapis/ads/googleads/v1/services/carrier_constant_service.pb.go
index 56d2b5aafd..9669646d04 100644
--- a/googleapis/ads/googleads/v1/services/carrier_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/carrier_constant_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/carrier_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CarrierConstantService.GetCarrierConstant][google.ads.googleads.v1.services.CarrierConstantService.GetCarrierConstant].
 type GetCarrierConstantRequest struct {
@@ -38,16 +38,17 @@ func (m *GetCarrierConstantRequest) Reset()         { *m = GetCarrierConstantReq
 func (m *GetCarrierConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCarrierConstantRequest) ProtoMessage()    {}
 func (*GetCarrierConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_carrier_constant_service_1becf49bbaa2ca47, []int{0}
+	return fileDescriptor_ad8e2a96eee0407f, []int{0}
 }
+
 func (m *GetCarrierConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCarrierConstantRequest.Unmarshal(m, b)
 }
 func (m *GetCarrierConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCarrierConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCarrierConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCarrierConstantRequest.Merge(dst, src)
+func (m *GetCarrierConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCarrierConstantRequest.Merge(m, src)
 }
 func (m *GetCarrierConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCarrierConstantRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetCarrierConstantRequest)(nil), "google.ads.googleads.v1.services.GetCarrierConstantRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/carrier_constant_service.proto", fileDescriptor_ad8e2a96eee0407f)
+}
+
+var fileDescriptor_ad8e2a96eee0407f = []byte{
+	// 356 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xc1, 0x4a, 0xf3, 0x40,
+	0x18, 0x24, 0xf9, 0xe1, 0x07, 0x83, 0x5e, 0x72, 0x10, 0xad, 0x1e, 0x4a, 0x2d, 0x52, 0x3c, 0xec,
+	0x92, 0x7a, 0x91, 0x2d, 0xa2, 0x69, 0x0f, 0xf5, 0x24, 0xa5, 0x42, 0x0f, 0x12, 0x28, 0x6b, 0xb2,
+	0x2c, 0x81, 0x76, 0xb7, 0xee, 0xb7, 0xcd, 0x45, 0xbc, 0xf4, 0x15, 0x7c, 0x03, 0x8f, 0xde, 0x7d,
+	0x09, 0x4f, 0x82, 0xaf, 0xe0, 0xc9, 0xa7, 0x90, 0x74, 0xb3, 0x81, 0xd6, 0x86, 0xde, 0x86, 0xfd,
+	0x66, 0xe6, 0x9b, 0x6f, 0x12, 0xef, 0x8a, 0x4b, 0xc9, 0x27, 0x0c, 0xd3, 0x04, 0xb0, 0x81, 0x39,
+	0xca, 0x02, 0x0c, 0x4c, 0x65, 0x69, 0xcc, 0x00, 0xc7, 0x54, 0xa9, 0x94, 0xa9, 0x71, 0x2c, 0x05,
+	0x68, 0x2a, 0xf4, 0xb8, 0x98, 0xa0, 0x99, 0x92, 0x5a, 0xfa, 0x75, 0xa3, 0x42, 0x34, 0x01, 0x54,
+	0x1a, 0xa0, 0x2c, 0x40, 0xd6, 0xa0, 0x76, 0x51, 0xb5, 0x42, 0x31, 0x90, 0x73, 0xb5, 0x69, 0x87,
+	0xf1, 0xae, 0x1d, 0x5b, 0xe5, 0x2c, 0xc5, 0x54, 0x08, 0xa9, 0xa9, 0x4e, 0xa5, 0x00, 0x33, 0x6d,
+	0x5c, 0x7b, 0x87, 0x7d, 0xa6, 0x7b, 0x46, 0xda, 0x2b, 0x94, 0x43, 0xf6, 0x38, 0x67, 0xa0, 0xfd,
+	0x13, 0x6f, 0xcf, 0xda, 0x8f, 0x05, 0x9d, 0xb2, 0x03, 0xa7, 0xee, 0xb4, 0x76, 0x86, 0xbb, 0xf6,
+	0xf1, 0x96, 0x4e, 0x59, 0xfb, 0xd3, 0xf1, 0xf6, 0xd7, 0xf4, 0x77, 0x26, 0xb5, 0xff, 0xee, 0x78,
+	0xfe, 0x5f, 0x77, 0xbf, 0x83, 0xb6, 0x9d, 0x8b, 0x2a, 0x33, 0xd5, 0xda, 0x95, 0xe2, 0xb2, 0x09,
+	0xb4, 0x26, 0x6d, 0xa0, 0xc5, 0xd7, 0xf7, 0x8b, 0xdb, 0xf2, 0x4f, 0xf3, 0xc2, 0x9e, 0x56, 0x4e,
+	0xba, 0x8c, 0x57, 0xb9, 0x80, 0xcf, 0x9e, 0xbb, 0x0b, 0xd7, 0x6b, 0xc6, 0x72, 0xba, 0x35, 0x66,
+	0xf7, 0x68, 0xf3, 0xe1, 0x83, 0xbc, 0xda, 0x81, 0x73, 0x7f, 0x53, 0x18, 0x70, 0x39, 0xa1, 0x82,
+	0x23, 0xa9, 0x38, 0xe6, 0x4c, 0x2c, 0x8b, 0xb7, 0x1f, 0x71, 0x96, 0x42, 0xf5, 0x6f, 0xd3, 0xb1,
+	0xe0, 0xd5, 0xfd, 0xd7, 0x0f, 0xc3, 0x37, 0xb7, 0xde, 0x37, 0x86, 0x61, 0x02, 0xc8, 0xc0, 0x1c,
+	0x8d, 0x02, 0x54, 0x2c, 0x86, 0x0f, 0x4b, 0x89, 0xc2, 0x04, 0xa2, 0x92, 0x12, 0x8d, 0x82, 0xc8,
+	0x52, 0x7e, 0xdc, 0xa6, 0x79, 0x27, 0x24, 0x4c, 0x80, 0x90, 0x92, 0x44, 0xc8, 0x28, 0x20, 0xc4,
+	0xd2, 0x1e, 0xfe, 0x2f, 0x73, 0x9e, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xf6, 0x00, 0xfb,
+	0xdd, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _CarrierConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/carrier_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/carrier_constant_service.proto", fileDescriptor_carrier_constant_service_1becf49bbaa2ca47)
-}
-
-var fileDescriptor_carrier_constant_service_1becf49bbaa2ca47 = []byte{
-	// 356 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xc1, 0x4a, 0xf3, 0x40,
-	0x18, 0x24, 0xf9, 0xe1, 0x07, 0x83, 0x5e, 0x72, 0x10, 0xad, 0x1e, 0x4a, 0x2d, 0x52, 0x3c, 0xec,
-	0x92, 0x7a, 0x91, 0x2d, 0xa2, 0x69, 0x0f, 0xf5, 0x24, 0xa5, 0x42, 0x0f, 0x12, 0x28, 0x6b, 0xb2,
-	0x2c, 0x81, 0x76, 0xb7, 0xee, 0xb7, 0xcd, 0x45, 0xbc, 0xf4, 0x15, 0x7c, 0x03, 0x8f, 0xde, 0x7d,
-	0x09, 0x4f, 0x82, 0xaf, 0xe0, 0xc9, 0xa7, 0x90, 0x74, 0xb3, 0x81, 0xd6, 0x86, 0xde, 0x86, 0xfd,
-	0x66, 0xe6, 0x9b, 0x6f, 0x12, 0xef, 0x8a, 0x4b, 0xc9, 0x27, 0x0c, 0xd3, 0x04, 0xb0, 0x81, 0x39,
-	0xca, 0x02, 0x0c, 0x4c, 0x65, 0x69, 0xcc, 0x00, 0xc7, 0x54, 0xa9, 0x94, 0xa9, 0x71, 0x2c, 0x05,
-	0x68, 0x2a, 0xf4, 0xb8, 0x98, 0xa0, 0x99, 0x92, 0x5a, 0xfa, 0x75, 0xa3, 0x42, 0x34, 0x01, 0x54,
-	0x1a, 0xa0, 0x2c, 0x40, 0xd6, 0xa0, 0x76, 0x51, 0xb5, 0x42, 0x31, 0x90, 0x73, 0xb5, 0x69, 0x87,
-	0xf1, 0xae, 0x1d, 0x5b, 0xe5, 0x2c, 0xc5, 0x54, 0x08, 0xa9, 0xa9, 0x4e, 0xa5, 0x00, 0x33, 0x6d,
-	0x5c, 0x7b, 0x87, 0x7d, 0xa6, 0x7b, 0x46, 0xda, 0x2b, 0x94, 0x43, 0xf6, 0x38, 0x67, 0xa0, 0xfd,
-	0x13, 0x6f, 0xcf, 0xda, 0x8f, 0x05, 0x9d, 0xb2, 0x03, 0xa7, 0xee, 0xb4, 0x76, 0x86, 0xbb, 0xf6,
-	0xf1, 0x96, 0x4e, 0x59, 0xfb, 0xd3, 0xf1, 0xf6, 0xd7, 0xf4, 0x77, 0x26, 0xb5, 0xff, 0xee, 0x78,
-	0xfe, 0x5f, 0x77, 0xbf, 0x83, 0xb6, 0x9d, 0x8b, 0x2a, 0x33, 0xd5, 0xda, 0x95, 0xe2, 0xb2, 0x09,
-	0xb4, 0x26, 0x6d, 0xa0, 0xc5, 0xd7, 0xf7, 0x8b, 0xdb, 0xf2, 0x4f, 0xf3, 0xc2, 0x9e, 0x56, 0x4e,
-	0xba, 0x8c, 0x57, 0xb9, 0x80, 0xcf, 0x9e, 0xbb, 0x0b, 0xd7, 0x6b, 0xc6, 0x72, 0xba, 0x35, 0x66,
-	0xf7, 0x68, 0xf3, 0xe1, 0x83, 0xbc, 0xda, 0x81, 0x73, 0x7f, 0x53, 0x18, 0x70, 0x39, 0xa1, 0x82,
-	0x23, 0xa9, 0x38, 0xe6, 0x4c, 0x2c, 0x8b, 0xb7, 0x1f, 0x71, 0x96, 0x42, 0xf5, 0x6f, 0xd3, 0xb1,
-	0xe0, 0xd5, 0xfd, 0xd7, 0x0f, 0xc3, 0x37, 0xb7, 0xde, 0x37, 0x86, 0x61, 0x02, 0xc8, 0xc0, 0x1c,
-	0x8d, 0x02, 0x54, 0x2c, 0x86, 0x0f, 0x4b, 0x89, 0xc2, 0x04, 0xa2, 0x92, 0x12, 0x8d, 0x82, 0xc8,
-	0x52, 0x7e, 0xdc, 0xa6, 0x79, 0x27, 0x24, 0x4c, 0x80, 0x90, 0x92, 0x44, 0xc8, 0x28, 0x20, 0xc4,
-	0xd2, 0x1e, 0xfe, 0x2f, 0x73, 0x9e, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xf6, 0x00, 0xfb,
-	0xdd, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/change_status_service.pb.go b/googleapis/ads/googleads/v1/services/change_status_service.pb.go
index cf9539302a..775e02337c 100644
--- a/googleapis/ads/googleads/v1/services/change_status_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/change_status_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/change_status_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for '[ChangeStatusService.GetChangeStatus][google.ads.googleads.v1.services.ChangeStatusService.GetChangeStatus]'.
 type GetChangeStatusRequest struct {
@@ -38,16 +38,17 @@ func (m *GetChangeStatusRequest) Reset()         { *m = GetChangeStatusRequest{}
 func (m *GetChangeStatusRequest) String() string { return proto.CompactTextString(m) }
 func (*GetChangeStatusRequest) ProtoMessage()    {}
 func (*GetChangeStatusRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_change_status_service_7363c6ead5b74186, []int{0}
+	return fileDescriptor_6c59aa7321bb8d53, []int{0}
 }
+
 func (m *GetChangeStatusRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetChangeStatusRequest.Unmarshal(m, b)
 }
 func (m *GetChangeStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetChangeStatusRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetChangeStatusRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetChangeStatusRequest.Merge(dst, src)
+func (m *GetChangeStatusRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetChangeStatusRequest.Merge(m, src)
 }
 func (m *GetChangeStatusRequest) XXX_Size() int {
 	return xxx_messageInfo_GetChangeStatusRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetChangeStatusRequest)(nil), "google.ads.googleads.v1.services.GetChangeStatusRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/change_status_service.proto", fileDescriptor_6c59aa7321bb8d53)
+}
+
+var fileDescriptor_6c59aa7321bb8d53 = []byte{
+	// 362 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4a, 0xf3, 0x40,
+	0x14, 0xc5, 0x49, 0x3e, 0xf8, 0xc0, 0xa0, 0x08, 0x11, 0xa4, 0x14, 0x17, 0xa5, 0x76, 0x21, 0x5d,
+	0xcc, 0x18, 0x45, 0x91, 0xd1, 0x2e, 0x52, 0x17, 0x75, 0x25, 0xa5, 0x85, 0x2e, 0x24, 0x50, 0xc6,
+	0x64, 0x18, 0x03, 0xcd, 0x4c, 0xcd, 0x9d, 0x74, 0x23, 0x6e, 0x7c, 0x05, 0xdf, 0xc0, 0xa5, 0x6b,
+	0x9f, 0x42, 0xdc, 0xf9, 0x0a, 0xae, 0x7c, 0x09, 0x25, 0x99, 0x4c, 0xa8, 0xda, 0xd2, 0xdd, 0xe1,
+	0xe6, 0xfc, 0xce, 0xfd, 0x93, 0x71, 0xce, 0xb8, 0x94, 0x7c, 0xc2, 0x30, 0x8d, 0x00, 0x6b, 0x99,
+	0xab, 0x99, 0x87, 0x81, 0xa5, 0xb3, 0x38, 0x64, 0x80, 0xc3, 0x1b, 0x2a, 0x38, 0x1b, 0x83, 0xa2,
+	0x2a, 0x83, 0x71, 0x59, 0x46, 0xd3, 0x54, 0x2a, 0xe9, 0x36, 0x34, 0x82, 0x68, 0x04, 0xa8, 0xa2,
+	0xd1, 0xcc, 0x43, 0x86, 0xae, 0x1f, 0x2d, 0xcb, 0x4f, 0x19, 0xc8, 0x2c, 0xfd, 0xd3, 0x40, 0x07,
+	0xd7, 0x77, 0x0c, 0x36, 0x8d, 0x31, 0x15, 0x42, 0x2a, 0xaa, 0x62, 0x29, 0xca, 0xaf, 0xcd, 0x8e,
+	0xb3, 0xdd, 0x63, 0xea, 0xbc, 0xe0, 0x86, 0x05, 0x36, 0x60, 0xb7, 0x19, 0x03, 0xe5, 0xee, 0x3a,
+	0x1b, 0x26, 0x78, 0x2c, 0x68, 0xc2, 0x6a, 0x56, 0xc3, 0xda, 0x5b, 0x1b, 0xac, 0x9b, 0xe2, 0x25,
+	0x4d, 0xd8, 0xc1, 0x9b, 0xe5, 0x6c, 0xcd, 0xc3, 0x43, 0x3d, 0xac, 0xfb, 0x62, 0x39, 0x9b, 0xbf,
+	0x72, 0xdd, 0x13, 0xb4, 0x6a, 0x45, 0xb4, 0x78, 0x94, 0x3a, 0x5e, 0x4a, 0x56, 0xab, 0xa3, 0x79,
+	0xae, 0x79, 0xfc, 0xf0, 0xfe, 0xf1, 0x68, 0xef, 0xbb, 0x28, 0x3f, 0xcf, 0xdd, 0x8f, 0x35, 0x3a,
+	0x61, 0x06, 0x4a, 0x26, 0x2c, 0x05, 0xdc, 0x2e, 0xef, 0xa5, 0x21, 0xdc, 0xbe, 0xef, 0x7e, 0x59,
+	0x4e, 0x2b, 0x94, 0xc9, 0xca, 0x41, 0xbb, 0xb5, 0x05, 0x4b, 0xf7, 0xf3, 0x83, 0xf6, 0xad, 0xab,
+	0x8b, 0x92, 0xe6, 0x72, 0x42, 0x05, 0x47, 0x32, 0xe5, 0x98, 0x33, 0x51, 0x9c, 0xdb, 0xfc, 0xb7,
+	0x69, 0x0c, 0xcb, 0x9f, 0xc9, 0xa9, 0x11, 0x4f, 0xf6, 0xbf, 0x9e, 0xef, 0x3f, 0xdb, 0x8d, 0x9e,
+	0x0e, 0xf4, 0x23, 0x40, 0x5a, 0xe6, 0x6a, 0xe4, 0xa1, 0xb2, 0x31, 0xbc, 0x1a, 0x4b, 0xe0, 0x47,
+	0x10, 0x54, 0x96, 0x60, 0xe4, 0x05, 0xc6, 0xf2, 0x69, 0xb7, 0x74, 0x9d, 0x10, 0x3f, 0x02, 0x42,
+	0x2a, 0x13, 0x21, 0x23, 0x8f, 0x10, 0x63, 0xbb, 0xfe, 0x5f, 0xcc, 0x79, 0xf8, 0x1d, 0x00, 0x00,
+	0xff, 0xff, 0xa5, 0x0c, 0x9d, 0x37, 0xcd, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _ChangeStatusService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/change_status_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/change_status_service.proto", fileDescriptor_change_status_service_7363c6ead5b74186)
-}
-
-var fileDescriptor_change_status_service_7363c6ead5b74186 = []byte{
-	// 362 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4a, 0xf3, 0x40,
-	0x14, 0xc5, 0x49, 0x3e, 0xf8, 0xc0, 0xa0, 0x08, 0x11, 0xa4, 0x14, 0x17, 0xa5, 0x76, 0x21, 0x5d,
-	0xcc, 0x18, 0x45, 0x91, 0xd1, 0x2e, 0x52, 0x17, 0x75, 0x25, 0xa5, 0x85, 0x2e, 0x24, 0x50, 0xc6,
-	0x64, 0x18, 0x03, 0xcd, 0x4c, 0xcd, 0x9d, 0x74, 0x23, 0x6e, 0x7c, 0x05, 0xdf, 0xc0, 0xa5, 0x6b,
-	0x9f, 0x42, 0xdc, 0xf9, 0x0a, 0xae, 0x7c, 0x09, 0x25, 0x99, 0x4c, 0xa8, 0xda, 0xd2, 0xdd, 0xe1,
-	0xe6, 0xfc, 0xce, 0xfd, 0x93, 0x71, 0xce, 0xb8, 0x94, 0x7c, 0xc2, 0x30, 0x8d, 0x00, 0x6b, 0x99,
-	0xab, 0x99, 0x87, 0x81, 0xa5, 0xb3, 0x38, 0x64, 0x80, 0xc3, 0x1b, 0x2a, 0x38, 0x1b, 0x83, 0xa2,
-	0x2a, 0x83, 0x71, 0x59, 0x46, 0xd3, 0x54, 0x2a, 0xe9, 0x36, 0x34, 0x82, 0x68, 0x04, 0xa8, 0xa2,
-	0xd1, 0xcc, 0x43, 0x86, 0xae, 0x1f, 0x2d, 0xcb, 0x4f, 0x19, 0xc8, 0x2c, 0xfd, 0xd3, 0x40, 0x07,
-	0xd7, 0x77, 0x0c, 0x36, 0x8d, 0x31, 0x15, 0x42, 0x2a, 0xaa, 0x62, 0x29, 0xca, 0xaf, 0xcd, 0x8e,
-	0xb3, 0xdd, 0x63, 0xea, 0xbc, 0xe0, 0x86, 0x05, 0x36, 0x60, 0xb7, 0x19, 0x03, 0xe5, 0xee, 0x3a,
-	0x1b, 0x26, 0x78, 0x2c, 0x68, 0xc2, 0x6a, 0x56, 0xc3, 0xda, 0x5b, 0x1b, 0xac, 0x9b, 0xe2, 0x25,
-	0x4d, 0xd8, 0xc1, 0x9b, 0xe5, 0x6c, 0xcd, 0xc3, 0x43, 0x3d, 0xac, 0xfb, 0x62, 0x39, 0x9b, 0xbf,
-	0x72, 0xdd, 0x13, 0xb4, 0x6a, 0x45, 0xb4, 0x78, 0x94, 0x3a, 0x5e, 0x4a, 0x56, 0xab, 0xa3, 0x79,
-	0xae, 0x79, 0xfc, 0xf0, 0xfe, 0xf1, 0x68, 0xef, 0xbb, 0x28, 0x3f, 0xcf, 0xdd, 0x8f, 0x35, 0x3a,
-	0x61, 0x06, 0x4a, 0x26, 0x2c, 0x05, 0xdc, 0x2e, 0xef, 0xa5, 0x21, 0xdc, 0xbe, 0xef, 0x7e, 0x59,
-	0x4e, 0x2b, 0x94, 0xc9, 0xca, 0x41, 0xbb, 0xb5, 0x05, 0x4b, 0xf7, 0xf3, 0x83, 0xf6, 0xad, 0xab,
-	0x8b, 0x92, 0xe6, 0x72, 0x42, 0x05, 0x47, 0x32, 0xe5, 0x98, 0x33, 0x51, 0x9c, 0xdb, 0xfc, 0xb7,
-	0x69, 0x0c, 0xcb, 0x9f, 0xc9, 0xa9, 0x11, 0x4f, 0xf6, 0xbf, 0x9e, 0xef, 0x3f, 0xdb, 0x8d, 0x9e,
-	0x0e, 0xf4, 0x23, 0x40, 0x5a, 0xe6, 0x6a, 0xe4, 0xa1, 0xb2, 0x31, 0xbc, 0x1a, 0x4b, 0xe0, 0x47,
-	0x10, 0x54, 0x96, 0x60, 0xe4, 0x05, 0xc6, 0xf2, 0x69, 0xb7, 0x74, 0x9d, 0x10, 0x3f, 0x02, 0x42,
-	0x2a, 0x13, 0x21, 0x23, 0x8f, 0x10, 0x63, 0xbb, 0xfe, 0x5f, 0xcc, 0x79, 0xf8, 0x1d, 0x00, 0x00,
-	0xff, 0xff, 0xa5, 0x0c, 0x9d, 0x37, 0xcd, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/click_view_service.pb.go b/googleapis/ads/googleads/v1/services/click_view_service.pb.go
index 81591daf45..6713b7d1b9 100644
--- a/googleapis/ads/googleads/v1/services/click_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/click_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/click_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ClickViewService.GetClickView][google.ads.googleads.v1.services.ClickViewService.GetClickView].
 type GetClickViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetClickViewRequest) Reset()         { *m = GetClickViewRequest{} }
 func (m *GetClickViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClickViewRequest) ProtoMessage()    {}
 func (*GetClickViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_click_view_service_27445b6aae79d7f5, []int{0}
+	return fileDescriptor_a3c35caeb519e64a, []int{0}
 }
+
 func (m *GetClickViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClickViewRequest.Unmarshal(m, b)
 }
 func (m *GetClickViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClickViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClickViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClickViewRequest.Merge(dst, src)
+func (m *GetClickViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClickViewRequest.Merge(m, src)
 }
 func (m *GetClickViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClickViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetClickViewRequest)(nil), "google.ads.googleads.v1.services.GetClickViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/click_view_service.proto", fileDescriptor_a3c35caeb519e64a)
+}
+
+var fileDescriptor_a3c35caeb519e64a = []byte{
+	// 362 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4a, 0xc3, 0x50,
+	0x14, 0x86, 0x49, 0x04, 0xc1, 0x50, 0x41, 0x22, 0x82, 0x14, 0x87, 0x52, 0x3b, 0x48, 0x29, 0xf7,
+	0x92, 0xaa, 0x83, 0x57, 0x1c, 0x52, 0x87, 0x3a, 0x49, 0xa9, 0x90, 0x41, 0x02, 0xe5, 0x9a, 0x1c,
+	0xc2, 0xc5, 0x26, 0xb7, 0xe6, 0xa4, 0xe9, 0x20, 0x2e, 0xbe, 0x82, 0x6f, 0xe0, 0xa6, 0x0f, 0xe1,
+	0x03, 0xb8, 0xfa, 0x0a, 0x4e, 0x3e, 0x83, 0x83, 0xa4, 0xb7, 0x37, 0x58, 0x31, 0x74, 0xfb, 0x39,
+	0xf9, 0xbf, 0x3f, 0xff, 0x39, 0x89, 0x75, 0x12, 0x49, 0x19, 0x8d, 0x81, 0xf2, 0x10, 0xa9, 0x92,
+	0x85, 0xca, 0x1d, 0x8a, 0x90, 0xe6, 0x22, 0x00, 0xa4, 0xc1, 0x58, 0x04, 0xb7, 0xa3, 0x5c, 0xc0,
+	0x6c, 0xb4, 0x98, 0x91, 0x49, 0x2a, 0x33, 0x69, 0x37, 0x94, 0x9f, 0xf0, 0x10, 0x49, 0x89, 0x92,
+	0xdc, 0x21, 0x1a, 0xad, 0x77, 0xab, 0xc2, 0x53, 0x40, 0x39, 0x4d, 0x97, 0xd3, 0x55, 0x6a, 0x7d,
+	0x4f, 0x33, 0x13, 0x41, 0x79, 0x92, 0xc8, 0x8c, 0x67, 0x42, 0x26, 0xa8, 0x9e, 0x36, 0x99, 0xb5,
+	0xdd, 0x87, 0xec, 0xbc, 0x80, 0x3c, 0x01, 0xb3, 0x21, 0xdc, 0x4d, 0x01, 0x33, 0x7b, 0xdf, 0xda,
+	0xd4, 0x91, 0xa3, 0x84, 0xc7, 0xb0, 0x6b, 0x34, 0x8c, 0x83, 0x8d, 0x61, 0x4d, 0x0f, 0x2f, 0x79,
+	0x0c, 0xdd, 0x37, 0xc3, 0xda, 0x2a, 0xc9, 0x2b, 0xd5, 0xd1, 0x7e, 0x31, 0xac, 0xda, 0xef, 0x44,
+	0xfb, 0x98, 0xac, 0x5a, 0x8b, 0xfc, 0xd3, 0xa0, 0xde, 0xa9, 0xc4, 0xca, 0x5d, 0x49, 0x09, 0x35,
+	0x8f, 0x1e, 0x3f, 0x3e, 0x9f, 0x4c, 0x62, 0x77, 0x8a, 0x63, 0xdc, 0x2f, 0x55, 0x3f, 0x0b, 0xa6,
+	0x98, 0xc9, 0x18, 0x52, 0xa4, 0x6d, 0x75, 0x9d, 0x82, 0x40, 0xda, 0x7e, 0xe8, 0x7d, 0x1b, 0x56,
+	0x2b, 0x90, 0xf1, 0xca, 0x82, 0xbd, 0x9d, 0xbf, 0x6b, 0x0e, 0x8a, 0xe3, 0x0d, 0x8c, 0xeb, 0x8b,
+	0x05, 0x1a, 0xc9, 0x31, 0x4f, 0x22, 0x22, 0xd3, 0x88, 0x46, 0x90, 0xcc, 0x4f, 0xab, 0x3f, 0xd0,
+	0x44, 0x60, 0xf5, 0xcf, 0x70, 0xaa, 0xc5, 0xb3, 0xb9, 0xd6, 0x77, 0xdd, 0x57, 0xb3, 0xd1, 0x57,
+	0x81, 0x6e, 0x88, 0x44, 0xc9, 0x42, 0x79, 0x0e, 0x59, 0xbc, 0x18, 0xdf, 0xb5, 0xc5, 0x77, 0x43,
+	0xf4, 0x4b, 0x8b, 0xef, 0x39, 0xbe, 0xb6, 0x7c, 0x99, 0x2d, 0x35, 0x67, 0xcc, 0x0d, 0x91, 0xb1,
+	0xd2, 0xc4, 0x98, 0xe7, 0x30, 0xa6, 0x6d, 0x37, 0xeb, 0xf3, 0x9e, 0x87, 0x3f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0xe1, 0xc6, 0x06, 0x3b, 0xb3, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _ClickViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/click_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/click_view_service.proto", fileDescriptor_click_view_service_27445b6aae79d7f5)
-}
-
-var fileDescriptor_click_view_service_27445b6aae79d7f5 = []byte{
-	// 362 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4a, 0xc3, 0x50,
-	0x14, 0x86, 0x49, 0x04, 0xc1, 0x50, 0x41, 0x22, 0x82, 0x14, 0x87, 0x52, 0x3b, 0x48, 0x29, 0xf7,
-	0x92, 0xaa, 0x83, 0x57, 0x1c, 0x52, 0x87, 0x3a, 0x49, 0xa9, 0x90, 0x41, 0x02, 0xe5, 0x9a, 0x1c,
-	0xc2, 0xc5, 0x26, 0xb7, 0xe6, 0xa4, 0xe9, 0x20, 0x2e, 0xbe, 0x82, 0x6f, 0xe0, 0xa6, 0x0f, 0xe1,
-	0x03, 0xb8, 0xfa, 0x0a, 0x4e, 0x3e, 0x83, 0x83, 0xa4, 0xb7, 0x37, 0x58, 0x31, 0x74, 0xfb, 0x39,
-	0xf9, 0xbf, 0x3f, 0xff, 0x39, 0x89, 0x75, 0x12, 0x49, 0x19, 0x8d, 0x81, 0xf2, 0x10, 0xa9, 0x92,
-	0x85, 0xca, 0x1d, 0x8a, 0x90, 0xe6, 0x22, 0x00, 0xa4, 0xc1, 0x58, 0x04, 0xb7, 0xa3, 0x5c, 0xc0,
-	0x6c, 0xb4, 0x98, 0x91, 0x49, 0x2a, 0x33, 0x69, 0x37, 0x94, 0x9f, 0xf0, 0x10, 0x49, 0x89, 0x92,
-	0xdc, 0x21, 0x1a, 0xad, 0x77, 0xab, 0xc2, 0x53, 0x40, 0x39, 0x4d, 0x97, 0xd3, 0x55, 0x6a, 0x7d,
-	0x4f, 0x33, 0x13, 0x41, 0x79, 0x92, 0xc8, 0x8c, 0x67, 0x42, 0x26, 0xa8, 0x9e, 0x36, 0x99, 0xb5,
-	0xdd, 0x87, 0xec, 0xbc, 0x80, 0x3c, 0x01, 0xb3, 0x21, 0xdc, 0x4d, 0x01, 0x33, 0x7b, 0xdf, 0xda,
-	0xd4, 0x91, 0xa3, 0x84, 0xc7, 0xb0, 0x6b, 0x34, 0x8c, 0x83, 0x8d, 0x61, 0x4d, 0x0f, 0x2f, 0x79,
-	0x0c, 0xdd, 0x37, 0xc3, 0xda, 0x2a, 0xc9, 0x2b, 0xd5, 0xd1, 0x7e, 0x31, 0xac, 0xda, 0xef, 0x44,
-	0xfb, 0x98, 0xac, 0x5a, 0x8b, 0xfc, 0xd3, 0xa0, 0xde, 0xa9, 0xc4, 0xca, 0x5d, 0x49, 0x09, 0x35,
-	0x8f, 0x1e, 0x3f, 0x3e, 0x9f, 0x4c, 0x62, 0x77, 0x8a, 0x63, 0xdc, 0x2f, 0x55, 0x3f, 0x0b, 0xa6,
-	0x98, 0xc9, 0x18, 0x52, 0xa4, 0x6d, 0x75, 0x9d, 0x82, 0x40, 0xda, 0x7e, 0xe8, 0x7d, 0x1b, 0x56,
-	0x2b, 0x90, 0xf1, 0xca, 0x82, 0xbd, 0x9d, 0xbf, 0x6b, 0x0e, 0x8a, 0xe3, 0x0d, 0x8c, 0xeb, 0x8b,
-	0x05, 0x1a, 0xc9, 0x31, 0x4f, 0x22, 0x22, 0xd3, 0x88, 0x46, 0x90, 0xcc, 0x4f, 0xab, 0x3f, 0xd0,
-	0x44, 0x60, 0xf5, 0xcf, 0x70, 0xaa, 0xc5, 0xb3, 0xb9, 0xd6, 0x77, 0xdd, 0x57, 0xb3, 0xd1, 0x57,
-	0x81, 0x6e, 0x88, 0x44, 0xc9, 0x42, 0x79, 0x0e, 0x59, 0xbc, 0x18, 0xdf, 0xb5, 0xc5, 0x77, 0x43,
-	0xf4, 0x4b, 0x8b, 0xef, 0x39, 0xbe, 0xb6, 0x7c, 0x99, 0x2d, 0x35, 0x67, 0xcc, 0x0d, 0x91, 0xb1,
-	0xd2, 0xc4, 0x98, 0xe7, 0x30, 0xa6, 0x6d, 0x37, 0xeb, 0xf3, 0x9e, 0x87, 0x3f, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0xe1, 0xc6, 0x06, 0x3b, 0xb3, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/conversion_action_service.pb.go b/googleapis/ads/googleads/v1/services/conversion_action_service.pb.go
index e25d256f73..318b2bdfa5 100644
--- a/googleapis/ads/googleads/v1/services/conversion_action_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/conversion_action_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/conversion_action_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ConversionActionService.GetConversionAction][google.ads.googleads.v1.services.ConversionActionService.GetConversionAction].
 type GetConversionActionRequest struct {
@@ -41,16 +41,17 @@ func (m *GetConversionActionRequest) Reset()         { *m = GetConversionActionR
 func (m *GetConversionActionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetConversionActionRequest) ProtoMessage()    {}
 func (*GetConversionActionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_service_185b1d4d9f9a10fa, []int{0}
+	return fileDescriptor_7c1381831f293da1, []int{0}
 }
+
 func (m *GetConversionActionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversionActionRequest.Unmarshal(m, b)
 }
 func (m *GetConversionActionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetConversionActionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetConversionActionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetConversionActionRequest.Merge(dst, src)
+func (m *GetConversionActionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConversionActionRequest.Merge(m, src)
 }
 func (m *GetConversionActionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetConversionActionRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateConversionActionsRequest) Reset()         { *m = MutateConversion
 func (m *MutateConversionActionsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateConversionActionsRequest) ProtoMessage()    {}
 func (*MutateConversionActionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_service_185b1d4d9f9a10fa, []int{1}
+	return fileDescriptor_7c1381831f293da1, []int{1}
 }
+
 func (m *MutateConversionActionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateConversionActionsRequest.Unmarshal(m, b)
 }
 func (m *MutateConversionActionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateConversionActionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateConversionActionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateConversionActionsRequest.Merge(dst, src)
+func (m *MutateConversionActionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateConversionActionsRequest.Merge(m, src)
 }
 func (m *MutateConversionActionsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateConversionActionsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *ConversionActionOperation) Reset()         { *m = ConversionActionOpera
 func (m *ConversionActionOperation) String() string { return proto.CompactTextString(m) }
 func (*ConversionActionOperation) ProtoMessage()    {}
 func (*ConversionActionOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_service_185b1d4d9f9a10fa, []int{2}
+	return fileDescriptor_7c1381831f293da1, []int{2}
 }
+
 func (m *ConversionActionOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionActionOperation.Unmarshal(m, b)
 }
 func (m *ConversionActionOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionActionOperation.Marshal(b, m, deterministic)
 }
-func (dst *ConversionActionOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionActionOperation.Merge(dst, src)
+func (m *ConversionActionOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionActionOperation.Merge(m, src)
 }
 func (m *ConversionActionOperation) XXX_Size() int {
 	return xxx_messageInfo_ConversionActionOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *ConversionActionOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ConversionActionOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ConversionActionOperation_OneofMarshaler, _ConversionActionOperation_OneofUnmarshaler, _ConversionActionOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ConversionActionOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ConversionActionOperation_Create)(nil),
 		(*ConversionActionOperation_Update)(nil),
 		(*ConversionActionOperation_Remove)(nil),
 	}
 }
 
-func _ConversionActionOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ConversionActionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *ConversionActionOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *ConversionActionOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *ConversionActionOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("ConversionActionOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ConversionActionOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ConversionActionOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.ConversionAction)
-		err := b.DecodeMessage(msg)
-		m.Operation = &ConversionActionOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.ConversionAction)
-		err := b.DecodeMessage(msg)
-		m.Operation = &ConversionActionOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &ConversionActionOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ConversionActionOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ConversionActionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *ConversionActionOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ConversionActionOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ConversionActionOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for [ConversionActionService.MutateConversionActions][google.ads.googleads.v1.services.ConversionActionService.MutateConversionActions].
 type MutateConversionActionsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateConversionActionsResponse) Reset()         { *m = MutateConversio
 func (m *MutateConversionActionsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateConversionActionsResponse) ProtoMessage()    {}
 func (*MutateConversionActionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_service_185b1d4d9f9a10fa, []int{3}
+	return fileDescriptor_7c1381831f293da1, []int{3}
 }
+
 func (m *MutateConversionActionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateConversionActionsResponse.Unmarshal(m, b)
 }
 func (m *MutateConversionActionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateConversionActionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateConversionActionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateConversionActionsResponse.Merge(dst, src)
+func (m *MutateConversionActionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateConversionActionsResponse.Merge(m, src)
 }
 func (m *MutateConversionActionsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateConversionActionsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateConversionActionResult) Reset()         { *m = MutateConversionAc
 func (m *MutateConversionActionResult) String() string { return proto.CompactTextString(m) }
 func (*MutateConversionActionResult) ProtoMessage()    {}
 func (*MutateConversionActionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_action_service_185b1d4d9f9a10fa, []int{4}
+	return fileDescriptor_7c1381831f293da1, []int{4}
 }
+
 func (m *MutateConversionActionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateConversionActionResult.Unmarshal(m, b)
 }
 func (m *MutateConversionActionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateConversionActionResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateConversionActionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateConversionActionResult.Merge(dst, src)
+func (m *MutateConversionActionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateConversionActionResult.Merge(m, src)
 }
 func (m *MutateConversionActionResult) XXX_Size() int {
 	return xxx_messageInfo_MutateConversionActionResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateConversionActionResult)(nil), "google.ads.googleads.v1.services.MutateConversionActionResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/conversion_action_service.proto", fileDescriptor_7c1381831f293da1)
+}
+
+var fileDescriptor_7c1381831f293da1 = []byte{
+	// 716 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x4f, 0xd4, 0x4c,
+	0x18, 0xc0, 0xdf, 0x76, 0xdf, 0xa0, 0x4c, 0x51, 0x93, 0x21, 0x86, 0x75, 0x43, 0x60, 0x53, 0x49,
+	0x24, 0x7b, 0x68, 0xb3, 0x4b, 0x34, 0xb1, 0x2b, 0x86, 0x42, 0x04, 0x3c, 0x20, 0xa4, 0x24, 0xc4,
+	0xe8, 0x26, 0xcd, 0xd0, 0x0e, 0x9b, 0x86, 0xb6, 0x53, 0x67, 0xa6, 0x6b, 0x08, 0xe1, 0xa2, 0x1f,
+	0xc1, 0xb3, 0x17, 0x8f, 0x7e, 0x0d, 0xc3, 0xc5, 0xab, 0x9f, 0xc0, 0xc4, 0x93, 0xf1, 0x43, 0x98,
+	0xe9, 0x74, 0x56, 0x58, 0xa8, 0x6b, 0xe0, 0xb4, 0xcf, 0x3e, 0xcf, 0x33, 0xbf, 0xe7, 0xef, 0x4c,
+	0xc1, 0x4a, 0x9f, 0x90, 0x7e, 0x8c, 0x6d, 0x14, 0x32, 0x5b, 0x8a, 0x42, 0x1a, 0xb4, 0x6d, 0x86,
+	0xe9, 0x20, 0x0a, 0x30, 0xb3, 0x03, 0x92, 0x0e, 0x30, 0x65, 0x11, 0x49, 0x7d, 0x14, 0x70, 0xf1,
+	0x53, 0x9a, 0xac, 0x8c, 0x12, 0x4e, 0x60, 0x53, 0x1e, 0xb3, 0x50, 0xc8, 0xac, 0x21, 0xc1, 0x1a,
+	0xb4, 0x2d, 0x45, 0x68, 0x3c, 0xae, 0x8a, 0x41, 0x31, 0x23, 0x39, 0xbd, 0x34, 0x88, 0x84, 0x37,
+	0x66, 0xd5, 0xd1, 0x2c, 0xb2, 0x51, 0x9a, 0x12, 0x8e, 0x84, 0x91, 0x95, 0xd6, 0x32, 0xb4, 0x5d,
+	0xfc, 0xdb, 0xcf, 0x0f, 0xec, 0x83, 0x08, 0xc7, 0xa1, 0x9f, 0x20, 0x76, 0x58, 0x7a, 0xcc, 0x8d,
+	0x7a, 0xbc, 0xa5, 0x28, 0xcb, 0x30, 0x55, 0x84, 0x99, 0xd2, 0x4e, 0xb3, 0xc0, 0x66, 0x1c, 0xf1,
+	0xbc, 0x34, 0x98, 0x2e, 0x68, 0x6c, 0x60, 0xbe, 0x36, 0x4c, 0xcb, 0x2d, 0xb2, 0xf2, 0xf0, 0x9b,
+	0x1c, 0x33, 0x0e, 0xef, 0x83, 0x5b, 0x2a, 0x77, 0x3f, 0x45, 0x09, 0xae, 0x6b, 0x4d, 0x6d, 0x71,
+	0xd2, 0x9b, 0x52, 0xca, 0x17, 0x28, 0xc1, 0xe6, 0x2f, 0x0d, 0xcc, 0x6d, 0xe5, 0x1c, 0x71, 0x3c,
+	0x8a, 0x61, 0x8a, 0x33, 0x0f, 0x8c, 0x20, 0x67, 0x9c, 0x24, 0x98, 0xfa, 0x51, 0x58, 0x52, 0x80,
+	0x52, 0x3d, 0x0f, 0xe1, 0x6b, 0x00, 0x48, 0x86, 0xa9, 0xac, 0xba, 0xae, 0x37, 0x6b, 0x8b, 0x46,
+	0xa7, 0x6b, 0x8d, 0xeb, 0xb8, 0x35, 0x1a, 0x70, 0x5b, 0x31, 0xbc, 0x33, 0x38, 0xf8, 0x00, 0xdc,
+	0xc9, 0x10, 0xe5, 0x11, 0x8a, 0xfd, 0x03, 0x14, 0xc5, 0x39, 0xc5, 0xf5, 0x5a, 0x53, 0x5b, 0xbc,
+	0xe9, 0xdd, 0x2e, 0xd5, 0xeb, 0x52, 0x2b, 0xca, 0x1d, 0xa0, 0x38, 0x0a, 0x11, 0xc7, 0x3e, 0x49,
+	0xe3, 0xa3, 0xfa, 0xff, 0x85, 0xdb, 0x94, 0x52, 0x6e, 0xa7, 0xf1, 0x91, 0xf9, 0x51, 0x07, 0xf7,
+	0x2a, 0xe3, 0xc2, 0x2e, 0x30, 0xf2, 0xac, 0x00, 0x88, 0xe9, 0x14, 0x00, 0xa3, 0xd3, 0x50, 0x95,
+	0xa8, 0xf1, 0x58, 0xeb, 0x62, 0x80, 0x5b, 0x88, 0x1d, 0x7a, 0x40, 0xba, 0x0b, 0x19, 0x6e, 0x81,
+	0x89, 0x80, 0x62, 0xc4, 0x65, 0x9f, 0x8d, 0xce, 0x52, 0x65, 0x07, 0x86, 0x1b, 0x75, 0xa1, 0x05,
+	0x9b, 0xff, 0x79, 0x25, 0x44, 0xe0, 0x24, 0xbc, 0xae, 0x5f, 0x0b, 0x27, 0x21, 0xb0, 0x0e, 0x26,
+	0x28, 0x4e, 0xc8, 0x40, 0x76, 0x6f, 0x52, 0x58, 0xe4, 0xff, 0x55, 0x03, 0x4c, 0x0e, 0xdb, 0x6d,
+	0x7e, 0xd1, 0xc0, 0x7c, 0xe5, 0x3a, 0xb0, 0x8c, 0xa4, 0x0c, 0xc3, 0x75, 0x70, 0x77, 0x64, 0x22,
+	0x3e, 0xa6, 0x94, 0xd0, 0x82, 0x6c, 0x74, 0xa0, 0x4a, 0x94, 0x66, 0x81, 0xb5, 0x5b, 0xac, 0xab,
+	0x37, 0x7d, 0x7e, 0x56, 0xcf, 0x84, 0x3b, 0x7c, 0x09, 0x6e, 0x50, 0xcc, 0xf2, 0x98, 0xab, 0x9d,
+	0x79, 0x3a, 0x7e, 0x67, 0x2e, 0xcf, 0xcd, 0x2b, 0x30, 0x9e, 0xc2, 0x99, 0x6b, 0x60, 0xf6, 0x6f,
+	0x8e, 0xff, 0x74, 0x33, 0x3a, 0xa7, 0x35, 0x30, 0x33, 0x7a, 0x7e, 0x57, 0xe6, 0x01, 0x4f, 0x35,
+	0x30, 0x7d, 0xc9, 0xcd, 0x83, 0x4f, 0xc6, 0x57, 0x50, 0x7d, 0x61, 0x1b, 0x57, 0x19, 0xb1, 0xd9,
+	0x7d, 0xf7, 0xed, 0xc7, 0x07, 0xfd, 0x21, 0x5c, 0x12, 0x6f, 0xd5, 0xf1, 0xb9, 0xb2, 0x96, 0xd5,
+	0x1d, 0x65, 0x76, 0xeb, 0xcc, 0xe3, 0x55, 0xce, 0xd3, 0x6e, 0x9d, 0xc0, 0xef, 0x1a, 0x98, 0xa9,
+	0x18, 0x37, 0x5c, 0xb9, 0xea, 0x34, 0xd4, 0xc3, 0xd1, 0x70, 0xaf, 0x41, 0x90, 0xbb, 0x66, 0xba,
+	0x45, 0x75, 0x5d, 0xf3, 0x91, 0xa8, 0xee, 0x4f, 0x39, 0xc7, 0x67, 0x1e, 0xa4, 0xe5, 0xd6, 0xc9,
+	0xc5, 0xe2, 0x9c, 0xa4, 0x00, 0x3b, 0x5a, 0x6b, 0xf5, 0xbd, 0x0e, 0x16, 0x02, 0x92, 0x8c, 0xcd,
+	0x65, 0x75, 0xb6, 0x62, 0xda, 0x3b, 0xe2, 0xde, 0xef, 0x68, 0xaf, 0x36, 0x4b, 0x42, 0x9f, 0xc4,
+	0x28, 0xed, 0x5b, 0x84, 0xf6, 0xed, 0x3e, 0x4e, 0x8b, 0x57, 0x41, 0x7d, 0x31, 0xb2, 0x88, 0x55,
+	0x7f, 0xa4, 0xba, 0x4a, 0xf8, 0xa4, 0xd7, 0x36, 0x5c, 0xf7, 0xb3, 0xde, 0xdc, 0x90, 0x40, 0x37,
+	0x64, 0x96, 0x14, 0x85, 0xb4, 0xd7, 0xb6, 0xca, 0xc0, 0xec, 0xab, 0x72, 0xe9, 0xb9, 0x21, 0xeb,
+	0x0d, 0x5d, 0x7a, 0x7b, 0xed, 0x9e, 0x72, 0xf9, 0xa9, 0x2f, 0x48, 0xbd, 0xe3, 0xb8, 0x21, 0x73,
+	0x9c, 0xa1, 0x93, 0xe3, 0xec, 0xb5, 0x1d, 0x47, 0xb9, 0xed, 0x4f, 0x14, 0x79, 0x2e, 0xfd, 0x0e,
+	0x00, 0x00, 0xff, 0xff, 0xdd, 0x78, 0x76, 0x77, 0x4b, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,56 +513,3 @@ var _ConversionActionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/conversion_action_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/conversion_action_service.proto", fileDescriptor_conversion_action_service_185b1d4d9f9a10fa)
-}
-
-var fileDescriptor_conversion_action_service_185b1d4d9f9a10fa = []byte{
-	// 716 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x4f, 0xd4, 0x4c,
-	0x18, 0xc0, 0xdf, 0x76, 0xdf, 0xa0, 0x4c, 0x51, 0x93, 0x21, 0x86, 0x75, 0x43, 0x60, 0x53, 0x49,
-	0x24, 0x7b, 0x68, 0xb3, 0x4b, 0x34, 0xb1, 0x2b, 0x86, 0x42, 0x04, 0x3c, 0x20, 0xa4, 0x24, 0xc4,
-	0xe8, 0x26, 0xcd, 0xd0, 0x0e, 0x9b, 0x86, 0xb6, 0x53, 0x67, 0xa6, 0x6b, 0x08, 0xe1, 0xa2, 0x1f,
-	0xc1, 0xb3, 0x17, 0x8f, 0x7e, 0x0d, 0xc3, 0xc5, 0xab, 0x9f, 0xc0, 0xc4, 0x93, 0xf1, 0x43, 0x98,
-	0xe9, 0x74, 0x56, 0x58, 0xa8, 0x6b, 0xe0, 0xb4, 0xcf, 0x3e, 0xcf, 0x33, 0xbf, 0xe7, 0xef, 0x4c,
-	0xc1, 0x4a, 0x9f, 0x90, 0x7e, 0x8c, 0x6d, 0x14, 0x32, 0x5b, 0x8a, 0x42, 0x1a, 0xb4, 0x6d, 0x86,
-	0xe9, 0x20, 0x0a, 0x30, 0xb3, 0x03, 0x92, 0x0e, 0x30, 0x65, 0x11, 0x49, 0x7d, 0x14, 0x70, 0xf1,
-	0x53, 0x9a, 0xac, 0x8c, 0x12, 0x4e, 0x60, 0x53, 0x1e, 0xb3, 0x50, 0xc8, 0xac, 0x21, 0xc1, 0x1a,
-	0xb4, 0x2d, 0x45, 0x68, 0x3c, 0xae, 0x8a, 0x41, 0x31, 0x23, 0x39, 0xbd, 0x34, 0x88, 0x84, 0x37,
-	0x66, 0xd5, 0xd1, 0x2c, 0xb2, 0x51, 0x9a, 0x12, 0x8e, 0x84, 0x91, 0x95, 0xd6, 0x32, 0xb4, 0x5d,
-	0xfc, 0xdb, 0xcf, 0x0f, 0xec, 0x83, 0x08, 0xc7, 0xa1, 0x9f, 0x20, 0x76, 0x58, 0x7a, 0xcc, 0x8d,
-	0x7a, 0xbc, 0xa5, 0x28, 0xcb, 0x30, 0x55, 0x84, 0x99, 0xd2, 0x4e, 0xb3, 0xc0, 0x66, 0x1c, 0xf1,
-	0xbc, 0x34, 0x98, 0x2e, 0x68, 0x6c, 0x60, 0xbe, 0x36, 0x4c, 0xcb, 0x2d, 0xb2, 0xf2, 0xf0, 0x9b,
-	0x1c, 0x33, 0x0e, 0xef, 0x83, 0x5b, 0x2a, 0x77, 0x3f, 0x45, 0x09, 0xae, 0x6b, 0x4d, 0x6d, 0x71,
-	0xd2, 0x9b, 0x52, 0xca, 0x17, 0x28, 0xc1, 0xe6, 0x2f, 0x0d, 0xcc, 0x6d, 0xe5, 0x1c, 0x71, 0x3c,
-	0x8a, 0x61, 0x8a, 0x33, 0x0f, 0x8c, 0x20, 0x67, 0x9c, 0x24, 0x98, 0xfa, 0x51, 0x58, 0x52, 0x80,
-	0x52, 0x3d, 0x0f, 0xe1, 0x6b, 0x00, 0x48, 0x86, 0xa9, 0xac, 0xba, 0xae, 0x37, 0x6b, 0x8b, 0x46,
-	0xa7, 0x6b, 0x8d, 0xeb, 0xb8, 0x35, 0x1a, 0x70, 0x5b, 0x31, 0xbc, 0x33, 0x38, 0xf8, 0x00, 0xdc,
-	0xc9, 0x10, 0xe5, 0x11, 0x8a, 0xfd, 0x03, 0x14, 0xc5, 0x39, 0xc5, 0xf5, 0x5a, 0x53, 0x5b, 0xbc,
-	0xe9, 0xdd, 0x2e, 0xd5, 0xeb, 0x52, 0x2b, 0xca, 0x1d, 0xa0, 0x38, 0x0a, 0x11, 0xc7, 0x3e, 0x49,
-	0xe3, 0xa3, 0xfa, 0xff, 0x85, 0xdb, 0x94, 0x52, 0x6e, 0xa7, 0xf1, 0x91, 0xf9, 0x51, 0x07, 0xf7,
-	0x2a, 0xe3, 0xc2, 0x2e, 0x30, 0xf2, 0xac, 0x00, 0x88, 0xe9, 0x14, 0x00, 0xa3, 0xd3, 0x50, 0x95,
-	0xa8, 0xf1, 0x58, 0xeb, 0x62, 0x80, 0x5b, 0x88, 0x1d, 0x7a, 0x40, 0xba, 0x0b, 0x19, 0x6e, 0x81,
-	0x89, 0x80, 0x62, 0xc4, 0x65, 0x9f, 0x8d, 0xce, 0x52, 0x65, 0x07, 0x86, 0x1b, 0x75, 0xa1, 0x05,
-	0x9b, 0xff, 0x79, 0x25, 0x44, 0xe0, 0x24, 0xbc, 0xae, 0x5f, 0x0b, 0x27, 0x21, 0xb0, 0x0e, 0x26,
-	0x28, 0x4e, 0xc8, 0x40, 0x76, 0x6f, 0x52, 0x58, 0xe4, 0xff, 0x55, 0x03, 0x4c, 0x0e, 0xdb, 0x6d,
-	0x7e, 0xd1, 0xc0, 0x7c, 0xe5, 0x3a, 0xb0, 0x8c, 0xa4, 0x0c, 0xc3, 0x75, 0x70, 0x77, 0x64, 0x22,
-	0x3e, 0xa6, 0x94, 0xd0, 0x82, 0x6c, 0x74, 0xa0, 0x4a, 0x94, 0x66, 0x81, 0xb5, 0x5b, 0xac, 0xab,
-	0x37, 0x7d, 0x7e, 0x56, 0xcf, 0x84, 0x3b, 0x7c, 0x09, 0x6e, 0x50, 0xcc, 0xf2, 0x98, 0xab, 0x9d,
-	0x79, 0x3a, 0x7e, 0x67, 0x2e, 0xcf, 0xcd, 0x2b, 0x30, 0x9e, 0xc2, 0x99, 0x6b, 0x60, 0xf6, 0x6f,
-	0x8e, 0xff, 0x74, 0x33, 0x3a, 0xa7, 0x35, 0x30, 0x33, 0x7a, 0x7e, 0x57, 0xe6, 0x01, 0x4f, 0x35,
-	0x30, 0x7d, 0xc9, 0xcd, 0x83, 0x4f, 0xc6, 0x57, 0x50, 0x7d, 0x61, 0x1b, 0x57, 0x19, 0xb1, 0xd9,
-	0x7d, 0xf7, 0xed, 0xc7, 0x07, 0xfd, 0x21, 0x5c, 0x12, 0x6f, 0xd5, 0xf1, 0xb9, 0xb2, 0x96, 0xd5,
-	0x1d, 0x65, 0x76, 0xeb, 0xcc, 0xe3, 0x55, 0xce, 0xd3, 0x6e, 0x9d, 0xc0, 0xef, 0x1a, 0x98, 0xa9,
-	0x18, 0x37, 0x5c, 0xb9, 0xea, 0x34, 0xd4, 0xc3, 0xd1, 0x70, 0xaf, 0x41, 0x90, 0xbb, 0x66, 0xba,
-	0x45, 0x75, 0x5d, 0xf3, 0x91, 0xa8, 0xee, 0x4f, 0x39, 0xc7, 0x67, 0x1e, 0xa4, 0xe5, 0xd6, 0xc9,
-	0xc5, 0xe2, 0x9c, 0xa4, 0x00, 0x3b, 0x5a, 0x6b, 0xf5, 0xbd, 0x0e, 0x16, 0x02, 0x92, 0x8c, 0xcd,
-	0x65, 0x75, 0xb6, 0x62, 0xda, 0x3b, 0xe2, 0xde, 0xef, 0x68, 0xaf, 0x36, 0x4b, 0x42, 0x9f, 0xc4,
-	0x28, 0xed, 0x5b, 0x84, 0xf6, 0xed, 0x3e, 0x4e, 0x8b, 0x57, 0x41, 0x7d, 0x31, 0xb2, 0x88, 0x55,
-	0x7f, 0xa4, 0xba, 0x4a, 0xf8, 0xa4, 0xd7, 0x36, 0x5c, 0xf7, 0xb3, 0xde, 0xdc, 0x90, 0x40, 0x37,
-	0x64, 0x96, 0x14, 0x85, 0xb4, 0xd7, 0xb6, 0xca, 0xc0, 0xec, 0xab, 0x72, 0xe9, 0xb9, 0x21, 0xeb,
-	0x0d, 0x5d, 0x7a, 0x7b, 0xed, 0x9e, 0x72, 0xf9, 0xa9, 0x2f, 0x48, 0xbd, 0xe3, 0xb8, 0x21, 0x73,
-	0x9c, 0xa1, 0x93, 0xe3, 0xec, 0xb5, 0x1d, 0x47, 0xb9, 0xed, 0x4f, 0x14, 0x79, 0x2e, 0xfd, 0x0e,
-	0x00, 0x00, 0xff, 0xff, 0xdd, 0x78, 0x76, 0x77, 0x4b, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/conversion_adjustment_upload_service.pb.go b/googleapis/ads/googleads/v1/services/conversion_adjustment_upload_service.pb.go
index 109376ef85..273832a519 100644
--- a/googleapis/ads/googleads/v1/services/conversion_adjustment_upload_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/conversion_adjustment_upload_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/conversion_adjustment_upload_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [ConversionAdjustmentUploadService.UploadConversionAdjustments][google.ads.googleads.v1.services.ConversionAdjustmentUploadService.UploadConversionAdjustments].
@@ -48,16 +48,17 @@ func (m *UploadConversionAdjustmentsRequest) Reset()         { *m = UploadConver
 func (m *UploadConversionAdjustmentsRequest) String() string { return proto.CompactTextString(m) }
 func (*UploadConversionAdjustmentsRequest) ProtoMessage()    {}
 func (*UploadConversionAdjustmentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531, []int{0}
+	return fileDescriptor_418d7f048cc75833, []int{0}
 }
+
 func (m *UploadConversionAdjustmentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadConversionAdjustmentsRequest.Unmarshal(m, b)
 }
 func (m *UploadConversionAdjustmentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadConversionAdjustmentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *UploadConversionAdjustmentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadConversionAdjustmentsRequest.Merge(dst, src)
+func (m *UploadConversionAdjustmentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadConversionAdjustmentsRequest.Merge(m, src)
 }
 func (m *UploadConversionAdjustmentsRequest) XXX_Size() int {
 	return xxx_messageInfo_UploadConversionAdjustmentsRequest.Size(m)
@@ -110,16 +111,17 @@ func (m *UploadConversionAdjustmentsResponse) Reset()         { *m = UploadConve
 func (m *UploadConversionAdjustmentsResponse) String() string { return proto.CompactTextString(m) }
 func (*UploadConversionAdjustmentsResponse) ProtoMessage()    {}
 func (*UploadConversionAdjustmentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531, []int{1}
+	return fileDescriptor_418d7f048cc75833, []int{1}
 }
+
 func (m *UploadConversionAdjustmentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadConversionAdjustmentsResponse.Unmarshal(m, b)
 }
 func (m *UploadConversionAdjustmentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadConversionAdjustmentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *UploadConversionAdjustmentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadConversionAdjustmentsResponse.Merge(dst, src)
+func (m *UploadConversionAdjustmentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadConversionAdjustmentsResponse.Merge(m, src)
 }
 func (m *UploadConversionAdjustmentsResponse) XXX_Size() int {
 	return xxx_messageInfo_UploadConversionAdjustmentsResponse.Size(m)
@@ -176,16 +178,17 @@ func (m *ConversionAdjustment) Reset()         { *m = ConversionAdjustment{} }
 func (m *ConversionAdjustment) String() string { return proto.CompactTextString(m) }
 func (*ConversionAdjustment) ProtoMessage()    {}
 func (*ConversionAdjustment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531, []int{2}
+	return fileDescriptor_418d7f048cc75833, []int{2}
 }
+
 func (m *ConversionAdjustment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAdjustment.Unmarshal(m, b)
 }
 func (m *ConversionAdjustment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAdjustment.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAdjustment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAdjustment.Merge(dst, src)
+func (m *ConversionAdjustment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAdjustment.Merge(m, src)
 }
 func (m *ConversionAdjustment) XXX_Size() int {
 	return xxx_messageInfo_ConversionAdjustment.Size(m)
@@ -261,80 +264,14 @@ func (m *ConversionAdjustment) GetOrderId() *wrappers.StringValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ConversionAdjustment) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ConversionAdjustment_OneofMarshaler, _ConversionAdjustment_OneofUnmarshaler, _ConversionAdjustment_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ConversionAdjustment) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ConversionAdjustment_GclidDateTimePair)(nil),
 		(*ConversionAdjustment_OrderId)(nil),
 	}
 }
 
-func _ConversionAdjustment_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ConversionAdjustment)
-	// conversion_identifier
-	switch x := m.ConversionIdentifier.(type) {
-	case *ConversionAdjustment_GclidDateTimePair:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GclidDateTimePair); err != nil {
-			return err
-		}
-	case *ConversionAdjustment_OrderId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OrderId); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ConversionAdjustment.ConversionIdentifier has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ConversionAdjustment_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ConversionAdjustment)
-	switch tag {
-	case 1: // conversion_identifier.gclid_date_time_pair
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GclidDateTimePair)
-		err := b.DecodeMessage(msg)
-		m.ConversionIdentifier = &ConversionAdjustment_GclidDateTimePair{msg}
-		return true, err
-	case 2: // conversion_identifier.order_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ConversionIdentifier = &ConversionAdjustment_OrderId{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ConversionAdjustment_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ConversionAdjustment)
-	// conversion_identifier
-	switch x := m.ConversionIdentifier.(type) {
-	case *ConversionAdjustment_GclidDateTimePair:
-		s := proto.Size(x.GclidDateTimePair)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ConversionAdjustment_OrderId:
-		s := proto.Size(x.OrderId)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Contains information needed to restate a conversion's value.
 type RestatementValue struct {
 	// The restated conversion value. This is the value of the conversion after
@@ -355,16 +292,17 @@ func (m *RestatementValue) Reset()         { *m = RestatementValue{} }
 func (m *RestatementValue) String() string { return proto.CompactTextString(m) }
 func (*RestatementValue) ProtoMessage()    {}
 func (*RestatementValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531, []int{3}
+	return fileDescriptor_418d7f048cc75833, []int{3}
 }
+
 func (m *RestatementValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RestatementValue.Unmarshal(m, b)
 }
 func (m *RestatementValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RestatementValue.Marshal(b, m, deterministic)
 }
-func (dst *RestatementValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RestatementValue.Merge(dst, src)
+func (m *RestatementValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestatementValue.Merge(m, src)
 }
 func (m *RestatementValue) XXX_Size() int {
 	return xxx_messageInfo_RestatementValue.Size(m)
@@ -408,16 +346,17 @@ func (m *GclidDateTimePair) Reset()         { *m = GclidDateTimePair{} }
 func (m *GclidDateTimePair) String() string { return proto.CompactTextString(m) }
 func (*GclidDateTimePair) ProtoMessage()    {}
 func (*GclidDateTimePair) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531, []int{4}
+	return fileDescriptor_418d7f048cc75833, []int{4}
 }
+
 func (m *GclidDateTimePair) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GclidDateTimePair.Unmarshal(m, b)
 }
 func (m *GclidDateTimePair) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GclidDateTimePair.Marshal(b, m, deterministic)
 }
-func (dst *GclidDateTimePair) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GclidDateTimePair.Merge(dst, src)
+func (m *GclidDateTimePair) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GclidDateTimePair.Merge(m, src)
 }
 func (m *GclidDateTimePair) XXX_Size() int {
 	return xxx_messageInfo_GclidDateTimePair.Size(m)
@@ -467,16 +406,17 @@ func (m *ConversionAdjustmentResult) Reset()         { *m = ConversionAdjustment
 func (m *ConversionAdjustmentResult) String() string { return proto.CompactTextString(m) }
 func (*ConversionAdjustmentResult) ProtoMessage()    {}
 func (*ConversionAdjustmentResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531, []int{5}
+	return fileDescriptor_418d7f048cc75833, []int{5}
 }
+
 func (m *ConversionAdjustmentResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversionAdjustmentResult.Unmarshal(m, b)
 }
 func (m *ConversionAdjustmentResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConversionAdjustmentResult.Marshal(b, m, deterministic)
 }
-func (dst *ConversionAdjustmentResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConversionAdjustmentResult.Merge(dst, src)
+func (m *ConversionAdjustmentResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConversionAdjustmentResult.Merge(m, src)
 }
 func (m *ConversionAdjustmentResult) XXX_Size() int {
 	return xxx_messageInfo_ConversionAdjustmentResult.Size(m)
@@ -546,80 +486,14 @@ func (m *ConversionAdjustmentResult) GetOrderId() *wrappers.StringValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ConversionAdjustmentResult) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ConversionAdjustmentResult_OneofMarshaler, _ConversionAdjustmentResult_OneofUnmarshaler, _ConversionAdjustmentResult_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ConversionAdjustmentResult) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ConversionAdjustmentResult_GclidDateTimePair)(nil),
 		(*ConversionAdjustmentResult_OrderId)(nil),
 	}
 }
 
-func _ConversionAdjustmentResult_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ConversionAdjustmentResult)
-	// conversion_identifier
-	switch x := m.ConversionIdentifier.(type) {
-	case *ConversionAdjustmentResult_GclidDateTimePair:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GclidDateTimePair); err != nil {
-			return err
-		}
-	case *ConversionAdjustmentResult_OrderId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OrderId); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ConversionAdjustmentResult.ConversionIdentifier has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ConversionAdjustmentResult_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ConversionAdjustmentResult)
-	switch tag {
-	case 1: // conversion_identifier.gclid_date_time_pair
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GclidDateTimePair)
-		err := b.DecodeMessage(msg)
-		m.ConversionIdentifier = &ConversionAdjustmentResult_GclidDateTimePair{msg}
-		return true, err
-	case 2: // conversion_identifier.order_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(wrappers.StringValue)
-		err := b.DecodeMessage(msg)
-		m.ConversionIdentifier = &ConversionAdjustmentResult_OrderId{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ConversionAdjustmentResult_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ConversionAdjustmentResult)
-	// conversion_identifier
-	switch x := m.ConversionIdentifier.(type) {
-	case *ConversionAdjustmentResult_GclidDateTimePair:
-		s := proto.Size(x.GclidDateTimePair)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ConversionAdjustmentResult_OrderId:
-		s := proto.Size(x.OrderId)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*UploadConversionAdjustmentsRequest)(nil), "google.ads.googleads.v1.services.UploadConversionAdjustmentsRequest")
 	proto.RegisterType((*UploadConversionAdjustmentsResponse)(nil), "google.ads.googleads.v1.services.UploadConversionAdjustmentsResponse")
@@ -629,6 +503,66 @@ func init() {
 	proto.RegisterType((*ConversionAdjustmentResult)(nil), "google.ads.googleads.v1.services.ConversionAdjustmentResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/conversion_adjustment_upload_service.proto", fileDescriptor_418d7f048cc75833)
+}
+
+var fileDescriptor_418d7f048cc75833 = []byte{
+	// 821 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcb, 0x6f, 0xfb, 0x44,
+	0x10, 0xfe, 0xd9, 0xf9, 0x3d, 0xca, 0x86, 0x3e, 0xb2, 0xb4, 0x34, 0x0a, 0x15, 0x04, 0x53, 0x41,
+	0xd4, 0x83, 0xad, 0xa4, 0x12, 0x52, 0x0d, 0x54, 0x4a, 0x9b, 0xbe, 0x84, 0x84, 0x2a, 0xb7, 0xe4,
+	0x80, 0x22, 0x59, 0x5b, 0xef, 0xc6, 0x5a, 0x64, 0x7b, 0xcd, 0xee, 0x3a, 0xa8, 0x42, 0xbd, 0x70,
+	0xe7, 0x84, 0x04, 0x12, 0x47, 0x8e, 0xfc, 0x1f, 0x5c, 0x90, 0x38, 0x71, 0xe6, 0xc6, 0x89, 0x13,
+	0xe2, 0x2f, 0x40, 0x7e, 0x6c, 0x92, 0x86, 0xb8, 0xae, 0xe0, 0x84, 0xc4, 0x6d, 0xbd, 0x33, 0xf3,
+	0xcd, 0x37, 0xdf, 0xce, 0x68, 0x0c, 0x3e, 0xf4, 0x19, 0xf3, 0x03, 0x62, 0x21, 0x2c, 0xac, 0xfc,
+	0x98, 0x9e, 0x26, 0x5d, 0x4b, 0x10, 0x3e, 0xa1, 0x1e, 0x11, 0x96, 0xc7, 0xa2, 0x09, 0xe1, 0x82,
+	0xb2, 0xc8, 0x45, 0xf8, 0xd3, 0x44, 0xc8, 0x90, 0x44, 0xd2, 0x4d, 0xe2, 0x80, 0x21, 0xec, 0x16,
+	0x5e, 0x66, 0xcc, 0x99, 0x64, 0xb0, 0x9d, 0x23, 0x98, 0x08, 0x0b, 0x73, 0x0a, 0x66, 0x4e, 0xba,
+	0xa6, 0x02, 0x6b, 0x1d, 0x96, 0xa5, 0x23, 0x51, 0x12, 0x96, 0xe5, 0x92, 0xb7, 0x71, 0x91, 0xa1,
+	0xb5, 0xa3, 0xe2, 0x63, 0x6a, 0xa1, 0x28, 0x62, 0x12, 0x49, 0xca, 0x22, 0x51, 0x58, 0x5f, 0x2f,
+	0xac, 0xd9, 0xd7, 0x4d, 0x32, 0xb6, 0x3e, 0xe7, 0x28, 0x8e, 0x09, 0x57, 0xf6, 0xed, 0xc2, 0xce,
+	0x63, 0xcf, 0x12, 0x12, 0xc9, 0xa4, 0x30, 0x18, 0xbf, 0x6a, 0xc0, 0xf8, 0x38, 0xab, 0xe8, 0x78,
+	0xca, 0xa0, 0x3f, 0x25, 0x20, 0x1c, 0xf2, 0x59, 0x42, 0x84, 0x84, 0x6f, 0x80, 0xba, 0x97, 0x08,
+	0xc9, 0x42, 0xc2, 0x5d, 0x8a, 0x9b, 0x5a, 0x5b, 0xeb, 0xbc, 0xe4, 0x00, 0x75, 0x75, 0x81, 0x61,
+	0x08, 0x5e, 0x5d, 0x5a, 0x82, 0x68, 0xea, 0xed, 0x5a, 0xa7, 0xde, 0x7b, 0xd7, 0xac, 0x52, 0xc8,
+	0x5c, 0x46, 0xc0, 0xd9, 0xf2, 0x96, 0xd1, 0x82, 0xef, 0x80, 0xf5, 0x18, 0x71, 0x49, 0x51, 0xe0,
+	0x8e, 0x11, 0x0d, 0x12, 0x4e, 0x9a, 0xb5, 0xb6, 0xd6, 0x59, 0x71, 0xd6, 0x8a, 0xeb, 0xd3, 0xfc,
+	0xd6, 0xf8, 0x51, 0x03, 0x6f, 0x3d, 0x58, 0x9f, 0x88, 0x59, 0x24, 0x08, 0x3c, 0x05, 0x5b, 0x0b,
+	0x80, 0x2e, 0xe1, 0x9c, 0xf1, 0xac, 0xd4, 0x7a, 0x0f, 0x2a, 0xfa, 0x3c, 0xf6, 0xcc, 0xab, 0x4c,
+	0x40, 0xe7, 0x95, 0xfb, 0xa9, 0x4e, 0x52, 0x77, 0x38, 0x04, 0x2f, 0x38, 0x11, 0x49, 0x30, 0x2d,
+	0xfc, 0xfd, 0x7f, 0x58, 0x78, 0x06, 0xe2, 0x28, 0x30, 0xe3, 0xe7, 0xa7, 0x60, 0x73, 0x99, 0x1f,
+	0xbc, 0x00, 0x8d, 0x79, 0xe1, 0xbd, 0xb4, 0x2b, 0x32, 0x2d, 0xea, 0xbd, 0x1d, 0x95, 0x5a, 0x75,
+	0x85, 0x79, 0x25, 0x39, 0x8d, 0xfc, 0x21, 0x0a, 0x12, 0xe2, 0x6c, 0xcc, 0x29, 0x9b, 0x45, 0xc1,
+	0x8f, 0xc0, 0xe6, 0x5c, 0xef, 0x61, 0x24, 0x89, 0x2b, 0x69, 0x48, 0x9a, 0x4f, 0x1f, 0x81, 0x06,
+	0x67, 0x91, 0x03, 0x24, 0xc9, 0x35, 0x0d, 0x09, 0xbc, 0x03, 0xeb, 0x0b, 0xbd, 0xdc, 0x7c, 0xd6,
+	0xd6, 0x3a, 0x6b, 0xbd, 0xeb, 0x52, 0x4d, 0xb2, 0x61, 0x58, 0x2a, 0xc8, 0xf5, 0x6d, 0x4c, 0x4e,
+	0xa2, 0x24, 0x2c, 0x35, 0x3a, 0x6b, 0xe8, 0xde, 0x37, 0x74, 0x41, 0x83, 0x93, 0xb4, 0xd9, 0x49,
+	0x96, 0x7f, 0x92, 0xf2, 0x6c, 0x3e, 0xcf, 0x6a, 0xe9, 0x55, 0x3f, 0x8a, 0x33, 0x0b, 0x2d, 0xf4,
+	0xe2, 0x0b, 0x37, 0x70, 0x0c, 0x36, 0x7d, 0x2f, 0xa0, 0x78, 0x26, 0x95, 0x1b, 0x23, 0xaa, 0x5a,
+	0x66, 0xbf, 0x3a, 0xc7, 0x59, 0x1a, 0xad, 0xe4, 0xba, 0x44, 0x94, 0x9f, 0x3f, 0x71, 0x1a, 0xfe,
+	0xe2, 0x25, 0x3c, 0x00, 0x2b, 0x8c, 0xe3, 0x7c, 0xf2, 0xf4, 0xea, 0xb7, 0x38, 0x7f, 0xe2, 0xbc,
+	0xc8, 0xfc, 0x2f, 0xf0, 0xd1, 0x36, 0x98, 0x1b, 0x20, 0x97, 0x62, 0x12, 0x49, 0x3a, 0xa6, 0x84,
+	0x1b, 0xdf, 0x69, 0x60, 0x63, 0xb1, 0x44, 0x78, 0x0c, 0x0a, 0x0d, 0x09, 0x2e, 0xe4, 0xd2, 0x4a,
+	0xd2, 0x0d, 0x58, 0x72, 0x13, 0x90, 0x5c, 0x98, 0x55, 0x15, 0x93, 0x83, 0xf4, 0xc1, 0xaa, 0x97,
+	0x70, 0x4e, 0x22, 0xef, 0xd6, 0xf5, 0x18, 0x26, 0x8f, 0xa1, 0xec, 0xbc, 0xac, 0x42, 0x8e, 0x19,
+	0x26, 0xc6, 0xb7, 0x1a, 0x68, 0xfc, 0x4d, 0x1b, 0xd8, 0x03, 0xcf, 0x32, 0x6d, 0x4a, 0x49, 0xcd,
+	0x03, 0xe6, 0xae, 0x69, 0x4b, 0xcf, 0xd5, 0x3f, 0x6b, 0xe9, 0xc7, 0x70, 0x82, 0xb3, 0x48, 0xc5,
+	0xc3, 0xf8, 0xb3, 0x06, 0x5a, 0xe5, 0xe3, 0xfa, 0xff, 0x30, 0x96, 0x0e, 0xe3, 0x7f, 0x78, 0x56,
+	0x7a, 0xdf, 0xe8, 0xe0, 0xcd, 0x65, 0x85, 0xe6, 0x7b, 0xe5, 0x2a, 0x67, 0x08, 0xff, 0xd0, 0xc0,
+	0x6b, 0x0f, 0x6c, 0x1a, 0x38, 0xa8, 0xae, 0xb1, 0x7a, 0x11, 0xb7, 0x4e, 0xfe, 0x25, 0x4a, 0xbe,
+	0xee, 0x8c, 0xc1, 0x97, 0xbf, 0xfc, 0xf6, 0xb5, 0x7e, 0x68, 0x1c, 0xa4, 0x7f, 0x20, 0x6a, 0x8d,
+	0x0b, 0xeb, 0x8b, 0xb9, 0x25, 0xff, 0xc1, 0xde, 0x9d, 0x9d, 0x94, 0x43, 0xd9, 0xda, 0xde, 0xd1,
+	0x57, 0x3a, 0xd8, 0xf5, 0x58, 0x58, 0x49, 0xe9, 0xe8, 0xed, 0x4a, 0xf9, 0x2e, 0xd3, 0xc7, 0xb9,
+	0xd4, 0x3e, 0x39, 0x2f, 0xb0, 0x7c, 0x16, 0xa0, 0xc8, 0x37, 0x19, 0xf7, 0x2d, 0x9f, 0x44, 0xd9,
+	0xd3, 0xa9, 0xdf, 0xa6, 0x98, 0x8a, 0xf2, 0x9f, 0xb6, 0xf7, 0xd4, 0xe1, 0x7b, 0xbd, 0x76, 0xd6,
+	0xef, 0xff, 0xa0, 0xb7, 0xcf, 0x72, 0xc0, 0x3e, 0x16, 0x66, 0x7e, 0x4c, 0x4f, 0xc3, 0xae, 0x59,
+	0x24, 0x16, 0x3f, 0x29, 0x97, 0x51, 0x1f, 0x8b, 0xd1, 0xd4, 0x65, 0x34, 0xec, 0x8e, 0x94, 0xcb,
+	0xef, 0xfa, 0x6e, 0x7e, 0x6f, 0xdb, 0x7d, 0x2c, 0x6c, 0x7b, 0xea, 0x64, 0xdb, 0xc3, 0xae, 0x6d,
+	0x2b, 0xb7, 0x9b, 0xe7, 0x19, 0xcf, 0xfd, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, 0x44, 0x47,
+	0x09, 0x5b, 0x0a, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -702,63 +636,3 @@ var _ConversionAdjustmentUploadService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/conversion_adjustment_upload_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/conversion_adjustment_upload_service.proto", fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531)
-}
-
-var fileDescriptor_conversion_adjustment_upload_service_f73ceda272931531 = []byte{
-	// 821 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcb, 0x6f, 0xfb, 0x44,
-	0x10, 0xfe, 0xd9, 0xf9, 0x3d, 0xca, 0x86, 0x3e, 0xb2, 0xb4, 0x34, 0x0a, 0x15, 0x04, 0x53, 0x41,
-	0xd4, 0x83, 0xad, 0xa4, 0x12, 0x52, 0x0d, 0x54, 0x4a, 0x9b, 0xbe, 0x84, 0x84, 0x2a, 0xb7, 0xe4,
-	0x80, 0x22, 0x59, 0x5b, 0xef, 0xc6, 0x5a, 0x64, 0x7b, 0xcd, 0xee, 0x3a, 0xa8, 0x42, 0xbd, 0x70,
-	0xe7, 0x84, 0x04, 0x12, 0x47, 0x8e, 0xfc, 0x1f, 0x5c, 0x90, 0x38, 0x71, 0xe6, 0xc6, 0x89, 0x13,
-	0xe2, 0x2f, 0x40, 0x7e, 0x6c, 0x92, 0x86, 0xb8, 0xae, 0xe0, 0x84, 0xc4, 0x6d, 0xbd, 0x33, 0xf3,
-	0xcd, 0x37, 0xdf, 0xce, 0x68, 0x0c, 0x3e, 0xf4, 0x19, 0xf3, 0x03, 0x62, 0x21, 0x2c, 0xac, 0xfc,
-	0x98, 0x9e, 0x26, 0x5d, 0x4b, 0x10, 0x3e, 0xa1, 0x1e, 0x11, 0x96, 0xc7, 0xa2, 0x09, 0xe1, 0x82,
-	0xb2, 0xc8, 0x45, 0xf8, 0xd3, 0x44, 0xc8, 0x90, 0x44, 0xd2, 0x4d, 0xe2, 0x80, 0x21, 0xec, 0x16,
-	0x5e, 0x66, 0xcc, 0x99, 0x64, 0xb0, 0x9d, 0x23, 0x98, 0x08, 0x0b, 0x73, 0x0a, 0x66, 0x4e, 0xba,
-	0xa6, 0x02, 0x6b, 0x1d, 0x96, 0xa5, 0x23, 0x51, 0x12, 0x96, 0xe5, 0x92, 0xb7, 0x71, 0x91, 0xa1,
-	0xb5, 0xa3, 0xe2, 0x63, 0x6a, 0xa1, 0x28, 0x62, 0x12, 0x49, 0xca, 0x22, 0x51, 0x58, 0x5f, 0x2f,
-	0xac, 0xd9, 0xd7, 0x4d, 0x32, 0xb6, 0x3e, 0xe7, 0x28, 0x8e, 0x09, 0x57, 0xf6, 0xed, 0xc2, 0xce,
-	0x63, 0xcf, 0x12, 0x12, 0xc9, 0xa4, 0x30, 0x18, 0xbf, 0x6a, 0xc0, 0xf8, 0x38, 0xab, 0xe8, 0x78,
-	0xca, 0xa0, 0x3f, 0x25, 0x20, 0x1c, 0xf2, 0x59, 0x42, 0x84, 0x84, 0x6f, 0x80, 0xba, 0x97, 0x08,
-	0xc9, 0x42, 0xc2, 0x5d, 0x8a, 0x9b, 0x5a, 0x5b, 0xeb, 0xbc, 0xe4, 0x00, 0x75, 0x75, 0x81, 0x61,
-	0x08, 0x5e, 0x5d, 0x5a, 0x82, 0x68, 0xea, 0xed, 0x5a, 0xa7, 0xde, 0x7b, 0xd7, 0xac, 0x52, 0xc8,
-	0x5c, 0x46, 0xc0, 0xd9, 0xf2, 0x96, 0xd1, 0x82, 0xef, 0x80, 0xf5, 0x18, 0x71, 0x49, 0x51, 0xe0,
-	0x8e, 0x11, 0x0d, 0x12, 0x4e, 0x9a, 0xb5, 0xb6, 0xd6, 0x59, 0x71, 0xd6, 0x8a, 0xeb, 0xd3, 0xfc,
-	0xd6, 0xf8, 0x51, 0x03, 0x6f, 0x3d, 0x58, 0x9f, 0x88, 0x59, 0x24, 0x08, 0x3c, 0x05, 0x5b, 0x0b,
-	0x80, 0x2e, 0xe1, 0x9c, 0xf1, 0xac, 0xd4, 0x7a, 0x0f, 0x2a, 0xfa, 0x3c, 0xf6, 0xcc, 0xab, 0x4c,
-	0x40, 0xe7, 0x95, 0xfb, 0xa9, 0x4e, 0x52, 0x77, 0x38, 0x04, 0x2f, 0x38, 0x11, 0x49, 0x30, 0x2d,
-	0xfc, 0xfd, 0x7f, 0x58, 0x78, 0x06, 0xe2, 0x28, 0x30, 0xe3, 0xe7, 0xa7, 0x60, 0x73, 0x99, 0x1f,
-	0xbc, 0x00, 0x8d, 0x79, 0xe1, 0xbd, 0xb4, 0x2b, 0x32, 0x2d, 0xea, 0xbd, 0x1d, 0x95, 0x5a, 0x75,
-	0x85, 0x79, 0x25, 0x39, 0x8d, 0xfc, 0x21, 0x0a, 0x12, 0xe2, 0x6c, 0xcc, 0x29, 0x9b, 0x45, 0xc1,
-	0x8f, 0xc0, 0xe6, 0x5c, 0xef, 0x61, 0x24, 0x89, 0x2b, 0x69, 0x48, 0x9a, 0x4f, 0x1f, 0x81, 0x06,
-	0x67, 0x91, 0x03, 0x24, 0xc9, 0x35, 0x0d, 0x09, 0xbc, 0x03, 0xeb, 0x0b, 0xbd, 0xdc, 0x7c, 0xd6,
-	0xd6, 0x3a, 0x6b, 0xbd, 0xeb, 0x52, 0x4d, 0xb2, 0x61, 0x58, 0x2a, 0xc8, 0xf5, 0x6d, 0x4c, 0x4e,
-	0xa2, 0x24, 0x2c, 0x35, 0x3a, 0x6b, 0xe8, 0xde, 0x37, 0x74, 0x41, 0x83, 0x93, 0xb4, 0xd9, 0x49,
-	0x96, 0x7f, 0x92, 0xf2, 0x6c, 0x3e, 0xcf, 0x6a, 0xe9, 0x55, 0x3f, 0x8a, 0x33, 0x0b, 0x2d, 0xf4,
-	0xe2, 0x0b, 0x37, 0x70, 0x0c, 0x36, 0x7d, 0x2f, 0xa0, 0x78, 0x26, 0x95, 0x1b, 0x23, 0xaa, 0x5a,
-	0x66, 0xbf, 0x3a, 0xc7, 0x59, 0x1a, 0xad, 0xe4, 0xba, 0x44, 0x94, 0x9f, 0x3f, 0x71, 0x1a, 0xfe,
-	0xe2, 0x25, 0x3c, 0x00, 0x2b, 0x8c, 0xe3, 0x7c, 0xf2, 0xf4, 0xea, 0xb7, 0x38, 0x7f, 0xe2, 0xbc,
-	0xc8, 0xfc, 0x2f, 0xf0, 0xd1, 0x36, 0x98, 0x1b, 0x20, 0x97, 0x62, 0x12, 0x49, 0x3a, 0xa6, 0x84,
-	0x1b, 0xdf, 0x69, 0x60, 0x63, 0xb1, 0x44, 0x78, 0x0c, 0x0a, 0x0d, 0x09, 0x2e, 0xe4, 0xd2, 0x4a,
-	0xd2, 0x0d, 0x58, 0x72, 0x13, 0x90, 0x5c, 0x98, 0x55, 0x15, 0x93, 0x83, 0xf4, 0xc1, 0xaa, 0x97,
-	0x70, 0x4e, 0x22, 0xef, 0xd6, 0xf5, 0x18, 0x26, 0x8f, 0xa1, 0xec, 0xbc, 0xac, 0x42, 0x8e, 0x19,
-	0x26, 0xc6, 0xb7, 0x1a, 0x68, 0xfc, 0x4d, 0x1b, 0xd8, 0x03, 0xcf, 0x32, 0x6d, 0x4a, 0x49, 0xcd,
-	0x03, 0xe6, 0xae, 0x69, 0x4b, 0xcf, 0xd5, 0x3f, 0x6b, 0xe9, 0xc7, 0x70, 0x82, 0xb3, 0x48, 0xc5,
-	0xc3, 0xf8, 0xb3, 0x06, 0x5a, 0xe5, 0xe3, 0xfa, 0xff, 0x30, 0x96, 0x0e, 0xe3, 0x7f, 0x78, 0x56,
-	0x7a, 0xdf, 0xe8, 0xe0, 0xcd, 0x65, 0x85, 0xe6, 0x7b, 0xe5, 0x2a, 0x67, 0x08, 0xff, 0xd0, 0xc0,
-	0x6b, 0x0f, 0x6c, 0x1a, 0x38, 0xa8, 0xae, 0xb1, 0x7a, 0x11, 0xb7, 0x4e, 0xfe, 0x25, 0x4a, 0xbe,
-	0xee, 0x8c, 0xc1, 0x97, 0xbf, 0xfc, 0xf6, 0xb5, 0x7e, 0x68, 0x1c, 0xa4, 0x7f, 0x20, 0x6a, 0x8d,
-	0x0b, 0xeb, 0x8b, 0xb9, 0x25, 0xff, 0xc1, 0xde, 0x9d, 0x9d, 0x94, 0x43, 0xd9, 0xda, 0xde, 0xd1,
-	0x57, 0x3a, 0xd8, 0xf5, 0x58, 0x58, 0x49, 0xe9, 0xe8, 0xed, 0x4a, 0xf9, 0x2e, 0xd3, 0xc7, 0xb9,
-	0xd4, 0x3e, 0x39, 0x2f, 0xb0, 0x7c, 0x16, 0xa0, 0xc8, 0x37, 0x19, 0xf7, 0x2d, 0x9f, 0x44, 0xd9,
-	0xd3, 0xa9, 0xdf, 0xa6, 0x98, 0x8a, 0xf2, 0x9f, 0xb6, 0xf7, 0xd4, 0xe1, 0x7b, 0xbd, 0x76, 0xd6,
-	0xef, 0xff, 0xa0, 0xb7, 0xcf, 0x72, 0xc0, 0x3e, 0x16, 0x66, 0x7e, 0x4c, 0x4f, 0xc3, 0xae, 0x59,
-	0x24, 0x16, 0x3f, 0x29, 0x97, 0x51, 0x1f, 0x8b, 0xd1, 0xd4, 0x65, 0x34, 0xec, 0x8e, 0x94, 0xcb,
-	0xef, 0xfa, 0x6e, 0x7e, 0x6f, 0xdb, 0x7d, 0x2c, 0x6c, 0x7b, 0xea, 0x64, 0xdb, 0xc3, 0xae, 0x6d,
-	0x2b, 0xb7, 0x9b, 0xe7, 0x19, 0xcf, 0xfd, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, 0x44, 0x47,
-	0x09, 0x5b, 0x0a, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/conversion_upload_service.pb.go b/googleapis/ads/googleads/v1/services/conversion_upload_service.pb.go
index 729c2a95cc..05f1e326b5 100644
--- a/googleapis/ads/googleads/v1/services/conversion_upload_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/conversion_upload_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/conversion_upload_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ConversionUploadService.UploadClickConversions][google.ads.googleads.v1.services.ConversionUploadService.UploadClickConversions].
 type UploadClickConversionsRequest struct {
@@ -46,16 +46,17 @@ func (m *UploadClickConversionsRequest) Reset()         { *m = UploadClickConver
 func (m *UploadClickConversionsRequest) String() string { return proto.CompactTextString(m) }
 func (*UploadClickConversionsRequest) ProtoMessage()    {}
 func (*UploadClickConversionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{0}
+	return fileDescriptor_0e4ce88023381c6a, []int{0}
 }
+
 func (m *UploadClickConversionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadClickConversionsRequest.Unmarshal(m, b)
 }
 func (m *UploadClickConversionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadClickConversionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *UploadClickConversionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadClickConversionsRequest.Merge(dst, src)
+func (m *UploadClickConversionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadClickConversionsRequest.Merge(m, src)
 }
 func (m *UploadClickConversionsRequest) XXX_Size() int {
 	return xxx_messageInfo_UploadClickConversionsRequest.Size(m)
@@ -106,16 +107,17 @@ func (m *UploadClickConversionsResponse) Reset()         { *m = UploadClickConve
 func (m *UploadClickConversionsResponse) String() string { return proto.CompactTextString(m) }
 func (*UploadClickConversionsResponse) ProtoMessage()    {}
 func (*UploadClickConversionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{1}
+	return fileDescriptor_0e4ce88023381c6a, []int{1}
 }
+
 func (m *UploadClickConversionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadClickConversionsResponse.Unmarshal(m, b)
 }
 func (m *UploadClickConversionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadClickConversionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *UploadClickConversionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadClickConversionsResponse.Merge(dst, src)
+func (m *UploadClickConversionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadClickConversionsResponse.Merge(m, src)
 }
 func (m *UploadClickConversionsResponse) XXX_Size() int {
 	return xxx_messageInfo_UploadClickConversionsResponse.Size(m)
@@ -160,16 +162,17 @@ func (m *UploadCallConversionsRequest) Reset()         { *m = UploadCallConversi
 func (m *UploadCallConversionsRequest) String() string { return proto.CompactTextString(m) }
 func (*UploadCallConversionsRequest) ProtoMessage()    {}
 func (*UploadCallConversionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{2}
+	return fileDescriptor_0e4ce88023381c6a, []int{2}
 }
+
 func (m *UploadCallConversionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadCallConversionsRequest.Unmarshal(m, b)
 }
 func (m *UploadCallConversionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadCallConversionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *UploadCallConversionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadCallConversionsRequest.Merge(dst, src)
+func (m *UploadCallConversionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadCallConversionsRequest.Merge(m, src)
 }
 func (m *UploadCallConversionsRequest) XXX_Size() int {
 	return xxx_messageInfo_UploadCallConversionsRequest.Size(m)
@@ -220,16 +223,17 @@ func (m *UploadCallConversionsResponse) Reset()         { *m = UploadCallConvers
 func (m *UploadCallConversionsResponse) String() string { return proto.CompactTextString(m) }
 func (*UploadCallConversionsResponse) ProtoMessage()    {}
 func (*UploadCallConversionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{3}
+	return fileDescriptor_0e4ce88023381c6a, []int{3}
 }
+
 func (m *UploadCallConversionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadCallConversionsResponse.Unmarshal(m, b)
 }
 func (m *UploadCallConversionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadCallConversionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *UploadCallConversionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadCallConversionsResponse.Merge(dst, src)
+func (m *UploadCallConversionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadCallConversionsResponse.Merge(m, src)
 }
 func (m *UploadCallConversionsResponse) XXX_Size() int {
 	return xxx_messageInfo_UploadCallConversionsResponse.Size(m)
@@ -288,16 +292,17 @@ func (m *ClickConversion) Reset()         { *m = ClickConversion{} }
 func (m *ClickConversion) String() string { return proto.CompactTextString(m) }
 func (*ClickConversion) ProtoMessage()    {}
 func (*ClickConversion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{4}
+	return fileDescriptor_0e4ce88023381c6a, []int{4}
 }
+
 func (m *ClickConversion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClickConversion.Unmarshal(m, b)
 }
 func (m *ClickConversion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClickConversion.Marshal(b, m, deterministic)
 }
-func (dst *ClickConversion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClickConversion.Merge(dst, src)
+func (m *ClickConversion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClickConversion.Merge(m, src)
 }
 func (m *ClickConversion) XXX_Size() int {
 	return xxx_messageInfo_ClickConversion.Size(m)
@@ -389,16 +394,17 @@ func (m *CallConversion) Reset()         { *m = CallConversion{} }
 func (m *CallConversion) String() string { return proto.CompactTextString(m) }
 func (*CallConversion) ProtoMessage()    {}
 func (*CallConversion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{5}
+	return fileDescriptor_0e4ce88023381c6a, []int{5}
 }
+
 func (m *CallConversion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallConversion.Unmarshal(m, b)
 }
 func (m *CallConversion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallConversion.Marshal(b, m, deterministic)
 }
-func (dst *CallConversion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallConversion.Merge(dst, src)
+func (m *CallConversion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallConversion.Merge(m, src)
 }
 func (m *CallConversion) XXX_Size() int {
 	return xxx_messageInfo_CallConversion.Size(m)
@@ -467,16 +473,17 @@ func (m *ExternalAttributionData) Reset()         { *m = ExternalAttributionData
 func (m *ExternalAttributionData) String() string { return proto.CompactTextString(m) }
 func (*ExternalAttributionData) ProtoMessage()    {}
 func (*ExternalAttributionData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{6}
+	return fileDescriptor_0e4ce88023381c6a, []int{6}
 }
+
 func (m *ExternalAttributionData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExternalAttributionData.Unmarshal(m, b)
 }
 func (m *ExternalAttributionData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExternalAttributionData.Marshal(b, m, deterministic)
 }
-func (dst *ExternalAttributionData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExternalAttributionData.Merge(dst, src)
+func (m *ExternalAttributionData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExternalAttributionData.Merge(m, src)
 }
 func (m *ExternalAttributionData) XXX_Size() int {
 	return xxx_messageInfo_ExternalAttributionData.Size(m)
@@ -519,16 +526,17 @@ func (m *ClickConversionResult) Reset()         { *m = ClickConversionResult{} }
 func (m *ClickConversionResult) String() string { return proto.CompactTextString(m) }
 func (*ClickConversionResult) ProtoMessage()    {}
 func (*ClickConversionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{7}
+	return fileDescriptor_0e4ce88023381c6a, []int{7}
 }
+
 func (m *ClickConversionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClickConversionResult.Unmarshal(m, b)
 }
 func (m *ClickConversionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClickConversionResult.Marshal(b, m, deterministic)
 }
-func (dst *ClickConversionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClickConversionResult.Merge(dst, src)
+func (m *ClickConversionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClickConversionResult.Merge(m, src)
 }
 func (m *ClickConversionResult) XXX_Size() int {
 	return xxx_messageInfo_ClickConversionResult.Size(m)
@@ -582,16 +590,17 @@ func (m *CallConversionResult) Reset()         { *m = CallConversionResult{} }
 func (m *CallConversionResult) String() string { return proto.CompactTextString(m) }
 func (*CallConversionResult) ProtoMessage()    {}
 func (*CallConversionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversion_upload_service_97d02deb0eb593c3, []int{8}
+	return fileDescriptor_0e4ce88023381c6a, []int{8}
 }
+
 func (m *CallConversionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallConversionResult.Unmarshal(m, b)
 }
 func (m *CallConversionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallConversionResult.Marshal(b, m, deterministic)
 }
-func (dst *CallConversionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallConversionResult.Merge(dst, src)
+func (m *CallConversionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallConversionResult.Merge(m, src)
 }
 func (m *CallConversionResult) XXX_Size() int {
 	return xxx_messageInfo_CallConversionResult.Size(m)
@@ -642,6 +651,71 @@ func init() {
 	proto.RegisterType((*CallConversionResult)(nil), "google.ads.googleads.v1.services.CallConversionResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/conversion_upload_service.proto", fileDescriptor_0e4ce88023381c6a)
+}
+
+var fileDescriptor_0e4ce88023381c6a = []byte{
+	// 900 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x4d, 0x6f, 0xe3, 0x44,
+	0x18, 0x96, 0x93, 0x7e, 0xed, 0x04, 0xb6, 0xec, 0xd0, 0x52, 0x6f, 0x28, 0x4b, 0x64, 0xad, 0x44,
+	0xd5, 0x83, 0x4d, 0xb2, 0x88, 0xa5, 0x46, 0x6c, 0xd7, 0xdb, 0xee, 0x96, 0x1e, 0x16, 0x15, 0x07,
+	0x7a, 0x58, 0x45, 0xb2, 0xa6, 0x9e, 0x59, 0xcb, 0x62, 0xe2, 0x31, 0x33, 0xe3, 0x00, 0x42, 0x5c,
+	0xe0, 0x27, 0x70, 0xe5, 0xc4, 0x91, 0x7f, 0x80, 0x8a, 0x90, 0xb8, 0x72, 0xed, 0x85, 0x03, 0x47,
+	0xc4, 0x81, 0x5f, 0x81, 0xfc, 0x31, 0x71, 0x1a, 0x39, 0xc4, 0xad, 0x72, 0x42, 0x7b, 0x9b, 0xcc,
+	0xbc, 0xcf, 0xf3, 0x7e, 0x3d, 0x33, 0x79, 0x0d, 0x1e, 0x06, 0x8c, 0x05, 0x94, 0x58, 0x08, 0x0b,
+	0x2b, 0x5f, 0xa6, 0xab, 0x51, 0xd7, 0x12, 0x84, 0x8f, 0x42, 0x9f, 0x08, 0xcb, 0x67, 0xd1, 0x88,
+	0x70, 0x11, 0xb2, 0xc8, 0x4b, 0x62, 0xca, 0x10, 0xf6, 0x8a, 0x23, 0x33, 0xe6, 0x4c, 0x32, 0xd8,
+	0xc9, 0x61, 0x26, 0xc2, 0xc2, 0x1c, 0x33, 0x98, 0xa3, 0xae, 0xa9, 0x18, 0xda, 0xdb, 0xca, 0x47,
+	0x1c, 0x5a, 0x28, 0x8a, 0x98, 0x44, 0x32, 0x64, 0x91, 0xc8, 0xf1, 0xed, 0x3b, 0xc5, 0x69, 0xf6,
+	0xeb, 0x2c, 0x79, 0x6e, 0x7d, 0xc1, 0x51, 0x1c, 0x13, 0xae, 0xce, 0xb7, 0x8a, 0x73, 0x1e, 0xfb,
+	0x96, 0x90, 0x48, 0x26, 0xc5, 0x81, 0xf1, 0xab, 0x06, 0xde, 0xf8, 0x34, 0x8b, 0xe8, 0x80, 0x86,
+	0xfe, 0x67, 0x07, 0xe3, 0x38, 0x85, 0x4b, 0x3e, 0x4f, 0x88, 0x90, 0xf0, 0x4d, 0xd0, 0xf2, 0x13,
+	0x21, 0xd9, 0x90, 0x70, 0x2f, 0xc4, 0xba, 0xd6, 0xd1, 0x76, 0x6e, 0xb8, 0x40, 0x6d, 0x1d, 0x63,
+	0xd8, 0x07, 0xad, 0x32, 0x3d, 0xa1, 0x37, 0x3a, 0xcd, 0x9d, 0x56, 0xaf, 0x6b, 0xce, 0xcb, 0xc8,
+	0x9c, 0x72, 0xe8, 0x4e, 0xb2, 0xc0, 0xb7, 0xc0, 0x7a, 0x8c, 0xb8, 0x0c, 0x11, 0xf5, 0x9e, 0xa3,
+	0x90, 0x26, 0x9c, 0xe8, 0xcd, 0x8e, 0xb6, 0xb3, 0xe6, 0xde, 0x2c, 0xb6, 0x9f, 0xe4, 0xbb, 0xc6,
+	0xb9, 0x06, 0xee, 0xcc, 0x4a, 0x40, 0xc4, 0x2c, 0x12, 0x04, 0x3e, 0x01, 0x9b, 0x53, 0x5c, 0x1e,
+	0xe1, 0x9c, 0xf1, 0x2c, 0x97, 0x56, 0x0f, 0xaa, 0x50, 0x79, 0xec, 0x9b, 0xfd, 0xac, 0x38, 0xee,
+	0xab, 0x97, 0xbd, 0x3c, 0x4e, 0xcd, 0xe1, 0xc7, 0x60, 0x95, 0x13, 0x91, 0x50, 0xa9, 0x92, 0xbc,
+	0x7f, 0xf5, 0x24, 0x33, 0xbc, 0xab, 0x78, 0x8c, 0x5f, 0x34, 0xb0, 0x5d, 0x44, 0x8f, 0x28, 0xbd,
+	0x4e, 0xf5, 0xdd, 0xaa, 0xea, 0xbf, 0x5d, 0x23, 0xb0, 0x4b, 0xfe, 0xae, 0x59, 0xfc, 0x9f, 0x4b,
+	0xf5, 0x4c, 0x87, 0xbf, 0xe0, 0xda, 0x9f, 0x4c, 0xd7, 0xfe, 0xdd, 0x2b, 0xa7, 0x38, 0x55, 0xfa,
+	0x1f, 0x96, 0xc0, 0xfa, 0x54, 0x77, 0x60, 0x0f, 0x2c, 0x07, 0x3e, 0x2d, 0xea, 0xdc, 0xea, 0x6d,
+	0x2b, 0x1f, 0xea, 0x5a, 0x99, 0x7d, 0xc9, 0xc3, 0x28, 0x38, 0x45, 0x34, 0x21, 0x6e, 0x6e, 0x0a,
+	0x8f, 0xc1, 0xad, 0x89, 0xdb, 0x8d, 0xfc, 0xf4, 0x5a, 0xea, 0x8d, 0x1a, 0xf8, 0x57, 0x4a, 0x98,
+	0x93, 0xa1, 0xe0, 0x47, 0x60, 0x63, 0x82, 0x0a, 0x23, 0x49, 0x3c, 0x19, 0x0e, 0xf3, 0xe2, 0xcf,
+	0x63, 0x83, 0x25, 0xf2, 0x10, 0x49, 0xf2, 0x49, 0x38, 0x24, 0xf0, 0x08, 0x4c, 0xf8, 0xf0, 0x46,
+	0xa9, 0x9d, 0xbe, 0x34, 0x83, 0xeb, 0x90, 0x25, 0x67, 0x94, 0xe4, 0x5c, 0xeb, 0x25, 0x2a, 0xdb,
+	0x80, 0x0e, 0x78, 0xd9, 0x4f, 0x38, 0x27, 0x91, 0xff, 0x95, 0xe7, 0x33, 0x4c, 0xf4, 0xe5, 0x1a,
+	0x11, 0xbd, 0xa4, 0x20, 0x07, 0x0c, 0x13, 0x78, 0x1f, 0xac, 0x31, 0x8e, 0x73, 0x15, 0xaf, 0xd4,
+	0x40, 0xaf, 0x66, 0xd6, 0xc7, 0x18, 0x26, 0xe0, 0x36, 0xf9, 0x52, 0x12, 0x1e, 0x21, 0xea, 0x21,
+	0x29, 0x79, 0x78, 0x96, 0xc8, 0xa2, 0x3c, 0x48, 0x5f, 0xcd, 0x98, 0xf6, 0xe6, 0x6b, 0xe1, 0x71,
+	0x41, 0xe1, 0x94, 0x0c, 0x87, 0x48, 0x22, 0x77, 0x8b, 0x54, 0x1f, 0x18, 0xbf, 0x35, 0xc1, 0xcd,
+	0xcb, 0x02, 0x82, 0x7b, 0xe0, 0x86, 0x8f, 0x28, 0x2d, 0x6f, 0xe2, 0xbc, 0x1c, 0xd6, 0x72, 0xf3,
+	0x63, 0x0c, 0x9f, 0x82, 0x8d, 0x74, 0xed, 0x09, 0x89, 0xb8, 0x9c, 0xe8, 0x6c, 0x1d, 0x9d, 0xdc,
+	0x4a, 0x91, 0xfd, 0x14, 0x38, 0x6e, 0x6c, 0xa5, 0xe6, 0x9a, 0x0b, 0xd5, 0xdc, 0xd2, 0x02, 0x35,
+	0xb7, 0xbc, 0x10, 0xcd, 0xad, 0x5c, 0x55, 0x73, 0xc6, 0x85, 0x06, 0xb6, 0x66, 0x34, 0x1e, 0x0e,
+	0xc0, 0xeb, 0x95, 0xb2, 0xf2, 0x39, 0xc1, 0xa1, 0x9c, 0xd9, 0xde, 0xc9, 0x90, 0x6f, 0x57, 0x68,
+	0xe7, 0x20, 0x83, 0xc3, 0x67, 0xa0, 0x5d, 0xc9, 0x3e, 0x64, 0x98, 0xd0, 0x5a, 0x5d, 0xd7, 0x2b,
+	0xc8, 0x9f, 0xa6, 0x68, 0xe3, 0x6f, 0x0d, 0x6c, 0x56, 0xfe, 0xad, 0xfc, 0xcf, 0x9e, 0x2f, 0xe3,
+	0xbc, 0x01, 0x36, 0xaa, 0xde, 0xf0, 0x17, 0x17, 0xb1, 0x46, 0xf5, 0x7a, 0x17, 0x4d, 0xb0, 0x55,
+	0x56, 0x2e, 0xff, 0x97, 0xee, 0xe7, 0xcf, 0x21, 0xfc, 0x53, 0x03, 0xaf, 0x55, 0x0f, 0x4d, 0x70,
+	0x7f, 0xfe, 0x5b, 0xfa, 0x9f, 0xf3, 0x62, 0xfb, 0xe1, 0xf5, 0x09, 0xf2, 0x99, 0xc1, 0xd8, 0xff,
+	0xf6, 0xe2, 0xaf, 0xef, 0x1b, 0x7b, 0xc6, 0x3b, 0xe9, 0x08, 0xad, 0x46, 0x1d, 0x61, 0x7d, 0x3d,
+	0x31, 0x08, 0x7d, 0xb0, 0xfb, 0x8d, 0x9d, 0x54, 0xb2, 0xd8, 0xda, 0x2e, 0xfc, 0x43, 0x03, 0x9b,
+	0x95, 0x63, 0x09, 0x7c, 0x50, 0x3b, 0xb8, 0xca, 0x71, 0xac, 0xbd, 0x7f, 0x6d, 0x7c, 0x91, 0xdb,
+	0x83, 0x2c, 0xb7, 0xf7, 0x8c, 0x7b, 0xb5, 0x72, 0xbb, 0x4c, 0x62, 0x6b, 0xbb, 0x8f, 0xbe, 0x6b,
+	0x80, 0xbb, 0x3e, 0x1b, 0xce, 0x0d, 0xe3, 0xd1, 0xf6, 0x8c, 0xde, 0x9f, 0xa4, 0xfa, 0x39, 0xd1,
+	0x9e, 0x7d, 0x58, 0x30, 0x04, 0x8c, 0xa2, 0x28, 0x30, 0x19, 0x0f, 0xac, 0x80, 0x44, 0x99, 0xba,
+	0xd4, 0x37, 0x4c, 0x1c, 0x8a, 0xd9, 0x9f, 0x34, 0xef, 0xab, 0xc5, 0x8f, 0x8d, 0xe6, 0x91, 0xe3,
+	0xfc, 0xd4, 0xe8, 0x1c, 0xe5, 0x84, 0x0e, 0x16, 0x66, 0xbe, 0x4c, 0x57, 0xa7, 0x5d, 0xb3, 0x70,
+	0x2c, 0x7e, 0x57, 0x26, 0x03, 0x07, 0x8b, 0xc1, 0xd8, 0x64, 0x70, 0xda, 0x1d, 0x28, 0x93, 0x7f,
+	0x1a, 0x77, 0xf3, 0x7d, 0xdb, 0x76, 0xb0, 0xb0, 0xed, 0xb1, 0x91, 0x6d, 0x9f, 0x76, 0x6d, 0x5b,
+	0x99, 0x9d, 0xad, 0x64, 0x71, 0xde, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc0, 0xa3, 0xe2, 0x9c,
+	0x79, 0x0d, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -750,68 +824,3 @@ var _ConversionUploadService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/conversion_upload_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/conversion_upload_service.proto", fileDescriptor_conversion_upload_service_97d02deb0eb593c3)
-}
-
-var fileDescriptor_conversion_upload_service_97d02deb0eb593c3 = []byte{
-	// 900 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x4d, 0x6f, 0xe3, 0x44,
-	0x18, 0x96, 0x93, 0x7e, 0xed, 0x04, 0xb6, 0xec, 0xd0, 0x52, 0x6f, 0x28, 0x4b, 0x64, 0xad, 0x44,
-	0xd5, 0x83, 0x4d, 0xb2, 0x88, 0xa5, 0x46, 0x6c, 0xd7, 0xdb, 0xee, 0x96, 0x1e, 0x16, 0x15, 0x07,
-	0x7a, 0x58, 0x45, 0xb2, 0xa6, 0x9e, 0x59, 0xcb, 0x62, 0xe2, 0x31, 0x33, 0xe3, 0x00, 0x42, 0x5c,
-	0xe0, 0x27, 0x70, 0xe5, 0xc4, 0x91, 0x7f, 0x80, 0x8a, 0x90, 0xb8, 0x72, 0xed, 0x85, 0x03, 0x47,
-	0xc4, 0x81, 0x5f, 0x81, 0xfc, 0x31, 0x71, 0x1a, 0x39, 0xc4, 0xad, 0x72, 0x42, 0x7b, 0x9b, 0xcc,
-	0xbc, 0xcf, 0xf3, 0x7e, 0x3d, 0x33, 0x79, 0x0d, 0x1e, 0x06, 0x8c, 0x05, 0x94, 0x58, 0x08, 0x0b,
-	0x2b, 0x5f, 0xa6, 0xab, 0x51, 0xd7, 0x12, 0x84, 0x8f, 0x42, 0x9f, 0x08, 0xcb, 0x67, 0xd1, 0x88,
-	0x70, 0x11, 0xb2, 0xc8, 0x4b, 0x62, 0xca, 0x10, 0xf6, 0x8a, 0x23, 0x33, 0xe6, 0x4c, 0x32, 0xd8,
-	0xc9, 0x61, 0x26, 0xc2, 0xc2, 0x1c, 0x33, 0x98, 0xa3, 0xae, 0xa9, 0x18, 0xda, 0xdb, 0xca, 0x47,
-	0x1c, 0x5a, 0x28, 0x8a, 0x98, 0x44, 0x32, 0x64, 0x91, 0xc8, 0xf1, 0xed, 0x3b, 0xc5, 0x69, 0xf6,
-	0xeb, 0x2c, 0x79, 0x6e, 0x7d, 0xc1, 0x51, 0x1c, 0x13, 0xae, 0xce, 0xb7, 0x8a, 0x73, 0x1e, 0xfb,
-	0x96, 0x90, 0x48, 0x26, 0xc5, 0x81, 0xf1, 0xab, 0x06, 0xde, 0xf8, 0x34, 0x8b, 0xe8, 0x80, 0x86,
-	0xfe, 0x67, 0x07, 0xe3, 0x38, 0x85, 0x4b, 0x3e, 0x4f, 0x88, 0x90, 0xf0, 0x4d, 0xd0, 0xf2, 0x13,
-	0x21, 0xd9, 0x90, 0x70, 0x2f, 0xc4, 0xba, 0xd6, 0xd1, 0x76, 0x6e, 0xb8, 0x40, 0x6d, 0x1d, 0x63,
-	0xd8, 0x07, 0xad, 0x32, 0x3d, 0xa1, 0x37, 0x3a, 0xcd, 0x9d, 0x56, 0xaf, 0x6b, 0xce, 0xcb, 0xc8,
-	0x9c, 0x72, 0xe8, 0x4e, 0xb2, 0xc0, 0xb7, 0xc0, 0x7a, 0x8c, 0xb8, 0x0c, 0x11, 0xf5, 0x9e, 0xa3,
-	0x90, 0x26, 0x9c, 0xe8, 0xcd, 0x8e, 0xb6, 0xb3, 0xe6, 0xde, 0x2c, 0xb6, 0x9f, 0xe4, 0xbb, 0xc6,
-	0xb9, 0x06, 0xee, 0xcc, 0x4a, 0x40, 0xc4, 0x2c, 0x12, 0x04, 0x3e, 0x01, 0x9b, 0x53, 0x5c, 0x1e,
-	0xe1, 0x9c, 0xf1, 0x2c, 0x97, 0x56, 0x0f, 0xaa, 0x50, 0x79, 0xec, 0x9b, 0xfd, 0xac, 0x38, 0xee,
-	0xab, 0x97, 0xbd, 0x3c, 0x4e, 0xcd, 0xe1, 0xc7, 0x60, 0x95, 0x13, 0x91, 0x50, 0xa9, 0x92, 0xbc,
-	0x7f, 0xf5, 0x24, 0x33, 0xbc, 0xab, 0x78, 0x8c, 0x5f, 0x34, 0xb0, 0x5d, 0x44, 0x8f, 0x28, 0xbd,
-	0x4e, 0xf5, 0xdd, 0xaa, 0xea, 0xbf, 0x5d, 0x23, 0xb0, 0x4b, 0xfe, 0xae, 0x59, 0xfc, 0x9f, 0x4b,
-	0xf5, 0x4c, 0x87, 0xbf, 0xe0, 0xda, 0x9f, 0x4c, 0xd7, 0xfe, 0xdd, 0x2b, 0xa7, 0x38, 0x55, 0xfa,
-	0x1f, 0x96, 0xc0, 0xfa, 0x54, 0x77, 0x60, 0x0f, 0x2c, 0x07, 0x3e, 0x2d, 0xea, 0xdc, 0xea, 0x6d,
-	0x2b, 0x1f, 0xea, 0x5a, 0x99, 0x7d, 0xc9, 0xc3, 0x28, 0x38, 0x45, 0x34, 0x21, 0x6e, 0x6e, 0x0a,
-	0x8f, 0xc1, 0xad, 0x89, 0xdb, 0x8d, 0xfc, 0xf4, 0x5a, 0xea, 0x8d, 0x1a, 0xf8, 0x57, 0x4a, 0x98,
-	0x93, 0xa1, 0xe0, 0x47, 0x60, 0x63, 0x82, 0x0a, 0x23, 0x49, 0x3c, 0x19, 0x0e, 0xf3, 0xe2, 0xcf,
-	0x63, 0x83, 0x25, 0xf2, 0x10, 0x49, 0xf2, 0x49, 0x38, 0x24, 0xf0, 0x08, 0x4c, 0xf8, 0xf0, 0x46,
-	0xa9, 0x9d, 0xbe, 0x34, 0x83, 0xeb, 0x90, 0x25, 0x67, 0x94, 0xe4, 0x5c, 0xeb, 0x25, 0x2a, 0xdb,
-	0x80, 0x0e, 0x78, 0xd9, 0x4f, 0x38, 0x27, 0x91, 0xff, 0x95, 0xe7, 0x33, 0x4c, 0xf4, 0xe5, 0x1a,
-	0x11, 0xbd, 0xa4, 0x20, 0x07, 0x0c, 0x13, 0x78, 0x1f, 0xac, 0x31, 0x8e, 0x73, 0x15, 0xaf, 0xd4,
-	0x40, 0xaf, 0x66, 0xd6, 0xc7, 0x18, 0x26, 0xe0, 0x36, 0xf9, 0x52, 0x12, 0x1e, 0x21, 0xea, 0x21,
-	0x29, 0x79, 0x78, 0x96, 0xc8, 0xa2, 0x3c, 0x48, 0x5f, 0xcd, 0x98, 0xf6, 0xe6, 0x6b, 0xe1, 0x71,
-	0x41, 0xe1, 0x94, 0x0c, 0x87, 0x48, 0x22, 0x77, 0x8b, 0x54, 0x1f, 0x18, 0xbf, 0x35, 0xc1, 0xcd,
-	0xcb, 0x02, 0x82, 0x7b, 0xe0, 0x86, 0x8f, 0x28, 0x2d, 0x6f, 0xe2, 0xbc, 0x1c, 0xd6, 0x72, 0xf3,
-	0x63, 0x0c, 0x9f, 0x82, 0x8d, 0x74, 0xed, 0x09, 0x89, 0xb8, 0x9c, 0xe8, 0x6c, 0x1d, 0x9d, 0xdc,
-	0x4a, 0x91, 0xfd, 0x14, 0x38, 0x6e, 0x6c, 0xa5, 0xe6, 0x9a, 0x0b, 0xd5, 0xdc, 0xd2, 0x02, 0x35,
-	0xb7, 0xbc, 0x10, 0xcd, 0xad, 0x5c, 0x55, 0x73, 0xc6, 0x85, 0x06, 0xb6, 0x66, 0x34, 0x1e, 0x0e,
-	0xc0, 0xeb, 0x95, 0xb2, 0xf2, 0x39, 0xc1, 0xa1, 0x9c, 0xd9, 0xde, 0xc9, 0x90, 0x6f, 0x57, 0x68,
-	0xe7, 0x20, 0x83, 0xc3, 0x67, 0xa0, 0x5d, 0xc9, 0x3e, 0x64, 0x98, 0xd0, 0x5a, 0x5d, 0xd7, 0x2b,
-	0xc8, 0x9f, 0xa6, 0x68, 0xe3, 0x6f, 0x0d, 0x6c, 0x56, 0xfe, 0xad, 0xfc, 0xcf, 0x9e, 0x2f, 0xe3,
-	0xbc, 0x01, 0x36, 0xaa, 0xde, 0xf0, 0x17, 0x17, 0xb1, 0x46, 0xf5, 0x7a, 0x17, 0x4d, 0xb0, 0x55,
-	0x56, 0x2e, 0xff, 0x97, 0xee, 0xe7, 0xcf, 0x21, 0xfc, 0x53, 0x03, 0xaf, 0x55, 0x0f, 0x4d, 0x70,
-	0x7f, 0xfe, 0x5b, 0xfa, 0x9f, 0xf3, 0x62, 0xfb, 0xe1, 0xf5, 0x09, 0xf2, 0x99, 0xc1, 0xd8, 0xff,
-	0xf6, 0xe2, 0xaf, 0xef, 0x1b, 0x7b, 0xc6, 0x3b, 0xe9, 0x08, 0xad, 0x46, 0x1d, 0x61, 0x7d, 0x3d,
-	0x31, 0x08, 0x7d, 0xb0, 0xfb, 0x8d, 0x9d, 0x54, 0xb2, 0xd8, 0xda, 0x2e, 0xfc, 0x43, 0x03, 0x9b,
-	0x95, 0x63, 0x09, 0x7c, 0x50, 0x3b, 0xb8, 0xca, 0x71, 0xac, 0xbd, 0x7f, 0x6d, 0x7c, 0x91, 0xdb,
-	0x83, 0x2c, 0xb7, 0xf7, 0x8c, 0x7b, 0xb5, 0x72, 0xbb, 0x4c, 0x62, 0x6b, 0xbb, 0x8f, 0xbe, 0x6b,
-	0x80, 0xbb, 0x3e, 0x1b, 0xce, 0x0d, 0xe3, 0xd1, 0xf6, 0x8c, 0xde, 0x9f, 0xa4, 0xfa, 0x39, 0xd1,
-	0x9e, 0x7d, 0x58, 0x30, 0x04, 0x8c, 0xa2, 0x28, 0x30, 0x19, 0x0f, 0xac, 0x80, 0x44, 0x99, 0xba,
-	0xd4, 0x37, 0x4c, 0x1c, 0x8a, 0xd9, 0x9f, 0x34, 0xef, 0xab, 0xc5, 0x8f, 0x8d, 0xe6, 0x91, 0xe3,
-	0xfc, 0xd4, 0xe8, 0x1c, 0xe5, 0x84, 0x0e, 0x16, 0x66, 0xbe, 0x4c, 0x57, 0xa7, 0x5d, 0xb3, 0x70,
-	0x2c, 0x7e, 0x57, 0x26, 0x03, 0x07, 0x8b, 0xc1, 0xd8, 0x64, 0x70, 0xda, 0x1d, 0x28, 0x93, 0x7f,
-	0x1a, 0x77, 0xf3, 0x7d, 0xdb, 0x76, 0xb0, 0xb0, 0xed, 0xb1, 0x91, 0x6d, 0x9f, 0x76, 0x6d, 0x5b,
-	0x99, 0x9d, 0xad, 0x64, 0x71, 0xde, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc0, 0xa3, 0xe2, 0x9c,
-	0x79, 0x0d, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/custom_interest_service.pb.go b/googleapis/ads/googleads/v1/services/custom_interest_service.pb.go
index 0d9edc1ddf..d52094f509 100644
--- a/googleapis/ads/googleads/v1/services/custom_interest_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/custom_interest_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/custom_interest_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CustomInterestService.GetCustomInterest][google.ads.googleads.v1.services.CustomInterestService.GetCustomInterest].
 type GetCustomInterestRequest struct {
@@ -40,16 +40,17 @@ func (m *GetCustomInterestRequest) Reset()         { *m = GetCustomInterestReque
 func (m *GetCustomInterestRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomInterestRequest) ProtoMessage()    {}
 func (*GetCustomInterestRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_service_85b11e27e8f607fc, []int{0}
+	return fileDescriptor_ddfad66fd19c3e99, []int{0}
 }
+
 func (m *GetCustomInterestRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomInterestRequest.Unmarshal(m, b)
 }
 func (m *GetCustomInterestRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomInterestRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomInterestRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomInterestRequest.Merge(dst, src)
+func (m *GetCustomInterestRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomInterestRequest.Merge(m, src)
 }
 func (m *GetCustomInterestRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomInterestRequest.Size(m)
@@ -85,16 +86,17 @@ func (m *MutateCustomInterestsRequest) Reset()         { *m = MutateCustomIntere
 func (m *MutateCustomInterestsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomInterestsRequest) ProtoMessage()    {}
 func (*MutateCustomInterestsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_service_85b11e27e8f607fc, []int{1}
+	return fileDescriptor_ddfad66fd19c3e99, []int{1}
 }
+
 func (m *MutateCustomInterestsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomInterestsRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomInterestsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomInterestsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomInterestsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomInterestsRequest.Merge(dst, src)
+func (m *MutateCustomInterestsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomInterestsRequest.Merge(m, src)
 }
 func (m *MutateCustomInterestsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomInterestsRequest.Size(m)
@@ -145,16 +147,17 @@ func (m *CustomInterestOperation) Reset()         { *m = CustomInterestOperation
 func (m *CustomInterestOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomInterestOperation) ProtoMessage()    {}
 func (*CustomInterestOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_service_85b11e27e8f607fc, []int{2}
+	return fileDescriptor_ddfad66fd19c3e99, []int{2}
 }
+
 func (m *CustomInterestOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInterestOperation.Unmarshal(m, b)
 }
 func (m *CustomInterestOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInterestOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomInterestOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInterestOperation.Merge(dst, src)
+func (m *CustomInterestOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInterestOperation.Merge(m, src)
 }
 func (m *CustomInterestOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomInterestOperation.Size(m)
@@ -209,80 +212,14 @@ func (m *CustomInterestOperation) GetUpdate() *resources.CustomInterest {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInterestOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInterestOperation_OneofMarshaler, _CustomInterestOperation_OneofUnmarshaler, _CustomInterestOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomInterestOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomInterestOperation_Create)(nil),
 		(*CustomInterestOperation_Update)(nil),
 	}
 }
 
-func _CustomInterestOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInterestOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomInterestOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CustomInterestOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInterestOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInterestOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInterestOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomInterest)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomInterestOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomInterest)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomInterestOperation_Update{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInterestOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInterestOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomInterestOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomInterestOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for custom interest mutate.
 type MutateCustomInterestsResponse struct {
 	// All results for the mutate.
@@ -296,16 +233,17 @@ func (m *MutateCustomInterestsResponse) Reset()         { *m = MutateCustomInter
 func (m *MutateCustomInterestsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomInterestsResponse) ProtoMessage()    {}
 func (*MutateCustomInterestsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_service_85b11e27e8f607fc, []int{3}
+	return fileDescriptor_ddfad66fd19c3e99, []int{3}
 }
+
 func (m *MutateCustomInterestsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomInterestsResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomInterestsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomInterestsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomInterestsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomInterestsResponse.Merge(dst, src)
+func (m *MutateCustomInterestsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomInterestsResponse.Merge(m, src)
 }
 func (m *MutateCustomInterestsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomInterestsResponse.Size(m)
@@ -336,16 +274,17 @@ func (m *MutateCustomInterestResult) Reset()         { *m = MutateCustomInterest
 func (m *MutateCustomInterestResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomInterestResult) ProtoMessage()    {}
 func (*MutateCustomInterestResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_custom_interest_service_85b11e27e8f607fc, []int{4}
+	return fileDescriptor_ddfad66fd19c3e99, []int{4}
 }
+
 func (m *MutateCustomInterestResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomInterestResult.Unmarshal(m, b)
 }
 func (m *MutateCustomInterestResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomInterestResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomInterestResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomInterestResult.Merge(dst, src)
+func (m *MutateCustomInterestResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomInterestResult.Merge(m, src)
 }
 func (m *MutateCustomInterestResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomInterestResult.Size(m)
@@ -371,6 +310,54 @@ func init() {
 	proto.RegisterType((*MutateCustomInterestResult)(nil), "google.ads.googleads.v1.services.MutateCustomInterestResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/custom_interest_service.proto", fileDescriptor_ddfad66fd19c3e99)
+}
+
+var fileDescriptor_ddfad66fd19c3e99 = []byte{
+	// 633 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x6b, 0xd4, 0x40,
+	0x14, 0xc7, 0x4d, 0x2a, 0xd5, 0x4e, 0xea, 0xc1, 0x40, 0x71, 0x09, 0x55, 0x97, 0xd8, 0xc3, 0xb2,
+	0x87, 0x84, 0x6c, 0x05, 0xd9, 0xd4, 0x76, 0xc9, 0x0a, 0x6e, 0x8b, 0xd4, 0x96, 0x08, 0x0b, 0xca,
+	0x42, 0x98, 0x6e, 0xa6, 0x21, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0x96, 0x52, 0x7a, 0xd0, 0xaf, 0xe0,
+	0x37, 0xf0, 0xe8, 0xd5, 0xb3, 0x78, 0xf7, 0xea, 0xc9, 0xbb, 0x27, 0xbf, 0x83, 0x20, 0xc9, 0x64,
+	0x62, 0x77, 0xdd, 0xb0, 0x5a, 0x6f, 0x2f, 0x93, 0xf7, 0x7e, 0xef, 0xfd, 0xdf, 0x9b, 0x37, 0x60,
+	0x27, 0xc0, 0x38, 0x88, 0x90, 0x09, 0x7d, 0x6a, 0x72, 0x33, 0xb7, 0x26, 0x96, 0x49, 0x11, 0x99,
+	0x84, 0x63, 0x44, 0xcd, 0x71, 0x46, 0x19, 0x8e, 0xbd, 0x30, 0x61, 0x88, 0x20, 0xca, 0xbc, 0xf2,
+	0x87, 0x91, 0x12, 0xcc, 0xb0, 0xda, 0xe4, 0x41, 0x06, 0xf4, 0xa9, 0x51, 0xc5, 0x1b, 0x13, 0xcb,
+	0x10, 0xf1, 0xda, 0xa3, 0xba, 0x0c, 0x04, 0x51, 0x9c, 0x91, 0x39, 0x29, 0x38, 0x5a, 0x5b, 0x17,
+	0x81, 0x69, 0x68, 0xc2, 0x24, 0xc1, 0x0c, 0xb2, 0x10, 0x27, 0xb4, 0xfc, 0x5b, 0x26, 0x36, 0x8b,
+	0xaf, 0xa3, 0xec, 0xd8, 0x3c, 0x0e, 0x51, 0xe4, 0x7b, 0x31, 0xa4, 0x27, 0xa5, 0xc7, 0xbd, 0x59,
+	0x8f, 0x53, 0x02, 0xd3, 0x14, 0x91, 0x92, 0xa0, 0xf7, 0x40, 0x63, 0x80, 0xd8, 0x93, 0x22, 0xf7,
+	0x5e, 0x99, 0xda, 0x45, 0xaf, 0x33, 0x44, 0x99, 0xfa, 0x00, 0xdc, 0x12, 0xe5, 0x79, 0x09, 0x8c,
+	0x51, 0x43, 0x6a, 0x4a, 0xad, 0x15, 0x77, 0x55, 0x1c, 0x3e, 0x87, 0x31, 0xd2, 0x3f, 0x4b, 0x60,
+	0x7d, 0x3f, 0x63, 0x90, 0xa1, 0x69, 0x08, 0x15, 0x94, 0xfb, 0x40, 0xe1, 0xd2, 0x10, 0xf1, 0x42,
+	0xbf, 0x64, 0x00, 0x71, 0xb4, 0xe7, 0xab, 0x2f, 0x01, 0xc0, 0x29, 0x22, 0x5c, 0x58, 0x43, 0x6e,
+	0x2e, 0xb5, 0x94, 0x4e, 0xd7, 0x58, 0xd4, 0x52, 0x63, 0x3a, 0xdd, 0x81, 0x20, 0xb8, 0x97, 0x60,
+	0xb9, 0x82, 0x09, 0x8c, 0x42, 0x1f, 0x32, 0xe4, 0xe1, 0x24, 0x3a, 0x6b, 0x5c, 0x6f, 0x4a, 0xad,
+	0x9b, 0xee, 0xaa, 0x38, 0x3c, 0x48, 0xa2, 0x33, 0xfd, 0xa7, 0x04, 0xee, 0xd4, 0xc0, 0xd4, 0x2d,
+	0xa0, 0x64, 0x69, 0x11, 0x9e, 0xf7, 0xb4, 0x08, 0x57, 0x3a, 0x9a, 0x28, 0x4e, 0x34, 0xd5, 0x78,
+	0x9a, 0xb7, 0x7d, 0x1f, 0xd2, 0x13, 0x17, 0x70, 0xf7, 0xdc, 0x56, 0x9f, 0x81, 0xe5, 0x31, 0x41,
+	0x90, 0xf1, 0xc6, 0x29, 0x1d, 0xab, 0x56, 0x54, 0x75, 0x0b, 0x66, 0x54, 0xed, 0x5e, 0x73, 0x4b,
+	0x44, 0x0e, 0xe3, 0xe8, 0x86, 0xfc, 0x1f, 0x30, 0x8e, 0xe8, 0x2b, 0x60, 0xa5, 0xea, 0x92, 0x7e,
+	0x0a, 0xee, 0xd6, 0x0c, 0x90, 0xa6, 0x38, 0xa1, 0x48, 0x1d, 0x82, 0x1b, 0x04, 0xd1, 0x2c, 0x62,
+	0x62, 0x3a, 0x8f, 0x17, 0x4f, 0x67, 0x1e, 0xd1, 0x2d, 0x20, 0xae, 0x80, 0xe9, 0x0e, 0xd0, 0xea,
+	0xdd, 0xfe, 0xea, 0xf6, 0x75, 0x3e, 0x2e, 0x81, 0xb5, 0xe9, 0xe8, 0x17, 0xbc, 0x02, 0xf5, 0x93,
+	0x04, 0x6e, 0xff, 0x71, 0xb3, 0x55, 0x7b, 0x71, 0xe5, 0x75, 0xeb, 0xa0, 0xfd, 0x7b, 0xc7, 0xf5,
+	0xee, 0xdb, 0xaf, 0xdf, 0xdf, 0xc9, 0x9b, 0xaa, 0x95, 0xaf, 0xfa, 0xf9, 0x94, 0x9c, 0x6d, 0xb1,
+	0x01, 0xd4, 0x6c, 0x97, 0xbb, 0x5f, 0x75, 0xde, 0x6c, 0x5f, 0xa8, 0xdf, 0x24, 0xb0, 0x36, 0x77,
+	0x2c, 0xea, 0xce, 0xd5, 0xba, 0x2f, 0x16, 0x52, 0xeb, 0x5d, 0x39, 0x9e, 0xdf, 0x07, 0xbd, 0x57,
+	0xa8, 0xea, 0xea, 0x0f, 0x73, 0x55, 0xbf, 0x65, 0x9c, 0x5f, 0x5a, 0xf3, 0xed, 0xf6, 0xc5, 0xac,
+	0x28, 0x3b, 0x2e, 0xa0, 0xb6, 0xd4, 0xee, 0xbf, 0x91, 0xc1, 0xc6, 0x18, 0xc7, 0x0b, 0xeb, 0xe8,
+	0x6b, 0x73, 0x67, 0x7b, 0x98, 0xaf, 0xdd, 0xa1, 0xf4, 0x6a, 0xb7, 0x8c, 0x0f, 0x70, 0x04, 0x93,
+	0xc0, 0xc0, 0x24, 0x30, 0x03, 0x94, 0x14, 0x4b, 0x29, 0x1e, 0xd9, 0x34, 0xa4, 0xf5, 0xaf, 0xfa,
+	0x96, 0x30, 0xde, 0xcb, 0x4b, 0x03, 0xc7, 0xf9, 0x20, 0x37, 0x07, 0x1c, 0xe8, 0xf8, 0xd4, 0xe0,
+	0x66, 0x6e, 0x0d, 0x2d, 0xa3, 0x4c, 0x4c, 0xbf, 0x08, 0x97, 0x91, 0xe3, 0xd3, 0x51, 0xe5, 0x32,
+	0x1a, 0x5a, 0x23, 0xe1, 0xf2, 0x43, 0xde, 0xe0, 0xe7, 0xb6, 0xed, 0xf8, 0xd4, 0xb6, 0x2b, 0x27,
+	0xdb, 0x1e, 0x5a, 0xb6, 0x2d, 0xdc, 0x8e, 0x96, 0x8b, 0x3a, 0x37, 0x7f, 0x05, 0x00, 0x00, 0xff,
+	0xff, 0x62, 0xea, 0xe7, 0xce, 0x7c, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -479,51 +466,3 @@ var _CustomInterestService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/custom_interest_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/custom_interest_service.proto", fileDescriptor_custom_interest_service_85b11e27e8f607fc)
-}
-
-var fileDescriptor_custom_interest_service_85b11e27e8f607fc = []byte{
-	// 633 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x6b, 0xd4, 0x40,
-	0x14, 0xc7, 0x4d, 0x2a, 0xd5, 0x4e, 0xea, 0xc1, 0x40, 0x71, 0x09, 0x55, 0x97, 0xd8, 0xc3, 0xb2,
-	0x87, 0x84, 0x6c, 0x05, 0xd9, 0xd4, 0x76, 0xc9, 0x0a, 0x6e, 0x8b, 0xd4, 0x96, 0x08, 0x0b, 0xca,
-	0x42, 0x98, 0x6e, 0xa6, 0x21, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0x96, 0x52, 0x7a, 0xd0, 0xaf, 0xe0,
-	0x37, 0xf0, 0xe8, 0xd5, 0xb3, 0x78, 0xf7, 0xea, 0xc9, 0xbb, 0x27, 0xbf, 0x83, 0x20, 0xc9, 0x64,
-	0x62, 0x77, 0xdd, 0xb0, 0x5a, 0x6f, 0x2f, 0x93, 0xf7, 0x7e, 0xef, 0xfd, 0xdf, 0x9b, 0x37, 0x60,
-	0x27, 0xc0, 0x38, 0x88, 0x90, 0x09, 0x7d, 0x6a, 0x72, 0x33, 0xb7, 0x26, 0x96, 0x49, 0x11, 0x99,
-	0x84, 0x63, 0x44, 0xcd, 0x71, 0x46, 0x19, 0x8e, 0xbd, 0x30, 0x61, 0x88, 0x20, 0xca, 0xbc, 0xf2,
-	0x87, 0x91, 0x12, 0xcc, 0xb0, 0xda, 0xe4, 0x41, 0x06, 0xf4, 0xa9, 0x51, 0xc5, 0x1b, 0x13, 0xcb,
-	0x10, 0xf1, 0xda, 0xa3, 0xba, 0x0c, 0x04, 0x51, 0x9c, 0x91, 0x39, 0x29, 0x38, 0x5a, 0x5b, 0x17,
-	0x81, 0x69, 0x68, 0xc2, 0x24, 0xc1, 0x0c, 0xb2, 0x10, 0x27, 0xb4, 0xfc, 0x5b, 0x26, 0x36, 0x8b,
-	0xaf, 0xa3, 0xec, 0xd8, 0x3c, 0x0e, 0x51, 0xe4, 0x7b, 0x31, 0xa4, 0x27, 0xa5, 0xc7, 0xbd, 0x59,
-	0x8f, 0x53, 0x02, 0xd3, 0x14, 0x91, 0x92, 0xa0, 0xf7, 0x40, 0x63, 0x80, 0xd8, 0x93, 0x22, 0xf7,
-	0x5e, 0x99, 0xda, 0x45, 0xaf, 0x33, 0x44, 0x99, 0xfa, 0x00, 0xdc, 0x12, 0xe5, 0x79, 0x09, 0x8c,
-	0x51, 0x43, 0x6a, 0x4a, 0xad, 0x15, 0x77, 0x55, 0x1c, 0x3e, 0x87, 0x31, 0xd2, 0x3f, 0x4b, 0x60,
-	0x7d, 0x3f, 0x63, 0x90, 0xa1, 0x69, 0x08, 0x15, 0x94, 0xfb, 0x40, 0xe1, 0xd2, 0x10, 0xf1, 0x42,
-	0xbf, 0x64, 0x00, 0x71, 0xb4, 0xe7, 0xab, 0x2f, 0x01, 0xc0, 0x29, 0x22, 0x5c, 0x58, 0x43, 0x6e,
-	0x2e, 0xb5, 0x94, 0x4e, 0xd7, 0x58, 0xd4, 0x52, 0x63, 0x3a, 0xdd, 0x81, 0x20, 0xb8, 0x97, 0x60,
-	0xb9, 0x82, 0x09, 0x8c, 0x42, 0x1f, 0x32, 0xe4, 0xe1, 0x24, 0x3a, 0x6b, 0x5c, 0x6f, 0x4a, 0xad,
-	0x9b, 0xee, 0xaa, 0x38, 0x3c, 0x48, 0xa2, 0x33, 0xfd, 0xa7, 0x04, 0xee, 0xd4, 0xc0, 0xd4, 0x2d,
-	0xa0, 0x64, 0x69, 0x11, 0x9e, 0xf7, 0xb4, 0x08, 0x57, 0x3a, 0x9a, 0x28, 0x4e, 0x34, 0xd5, 0x78,
-	0x9a, 0xb7, 0x7d, 0x1f, 0xd2, 0x13, 0x17, 0x70, 0xf7, 0xdc, 0x56, 0x9f, 0x81, 0xe5, 0x31, 0x41,
-	0x90, 0xf1, 0xc6, 0x29, 0x1d, 0xab, 0x56, 0x54, 0x75, 0x0b, 0x66, 0x54, 0xed, 0x5e, 0x73, 0x4b,
-	0x44, 0x0e, 0xe3, 0xe8, 0x86, 0xfc, 0x1f, 0x30, 0x8e, 0xe8, 0x2b, 0x60, 0xa5, 0xea, 0x92, 0x7e,
-	0x0a, 0xee, 0xd6, 0x0c, 0x90, 0xa6, 0x38, 0xa1, 0x48, 0x1d, 0x82, 0x1b, 0x04, 0xd1, 0x2c, 0x62,
-	0x62, 0x3a, 0x8f, 0x17, 0x4f, 0x67, 0x1e, 0xd1, 0x2d, 0x20, 0xae, 0x80, 0xe9, 0x0e, 0xd0, 0xea,
-	0xdd, 0xfe, 0xea, 0xf6, 0x75, 0x3e, 0x2e, 0x81, 0xb5, 0xe9, 0xe8, 0x17, 0xbc, 0x02, 0xf5, 0x93,
-	0x04, 0x6e, 0xff, 0x71, 0xb3, 0x55, 0x7b, 0x71, 0xe5, 0x75, 0xeb, 0xa0, 0xfd, 0x7b, 0xc7, 0xf5,
-	0xee, 0xdb, 0xaf, 0xdf, 0xdf, 0xc9, 0x9b, 0xaa, 0x95, 0xaf, 0xfa, 0xf9, 0x94, 0x9c, 0x6d, 0xb1,
-	0x01, 0xd4, 0x6c, 0x97, 0xbb, 0x5f, 0x75, 0xde, 0x6c, 0x5f, 0xa8, 0xdf, 0x24, 0xb0, 0x36, 0x77,
-	0x2c, 0xea, 0xce, 0xd5, 0xba, 0x2f, 0x16, 0x52, 0xeb, 0x5d, 0x39, 0x9e, 0xdf, 0x07, 0xbd, 0x57,
-	0xa8, 0xea, 0xea, 0x0f, 0x73, 0x55, 0xbf, 0x65, 0x9c, 0x5f, 0x5a, 0xf3, 0xed, 0xf6, 0xc5, 0xac,
-	0x28, 0x3b, 0x2e, 0xa0, 0xb6, 0xd4, 0xee, 0xbf, 0x91, 0xc1, 0xc6, 0x18, 0xc7, 0x0b, 0xeb, 0xe8,
-	0x6b, 0x73, 0x67, 0x7b, 0x98, 0xaf, 0xdd, 0xa1, 0xf4, 0x6a, 0xb7, 0x8c, 0x0f, 0x70, 0x04, 0x93,
-	0xc0, 0xc0, 0x24, 0x30, 0x03, 0x94, 0x14, 0x4b, 0x29, 0x1e, 0xd9, 0x34, 0xa4, 0xf5, 0xaf, 0xfa,
-	0x96, 0x30, 0xde, 0xcb, 0x4b, 0x03, 0xc7, 0xf9, 0x20, 0x37, 0x07, 0x1c, 0xe8, 0xf8, 0xd4, 0xe0,
-	0x66, 0x6e, 0x0d, 0x2d, 0xa3, 0x4c, 0x4c, 0xbf, 0x08, 0x97, 0x91, 0xe3, 0xd3, 0x51, 0xe5, 0x32,
-	0x1a, 0x5a, 0x23, 0xe1, 0xf2, 0x43, 0xde, 0xe0, 0xe7, 0xb6, 0xed, 0xf8, 0xd4, 0xb6, 0x2b, 0x27,
-	0xdb, 0x1e, 0x5a, 0xb6, 0x2d, 0xdc, 0x8e, 0x96, 0x8b, 0x3a, 0x37, 0x7f, 0x05, 0x00, 0x00, 0xff,
-	0xff, 0x62, 0xea, 0xe7, 0xce, 0x7c, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_client_link_service.pb.go b/googleapis/ads/googleads/v1/services/customer_client_link_service.pb.go
index 0787a47c24..9ab3c4e662 100644
--- a/googleapis/ads/googleads/v1/services/customer_client_link_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_client_link_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_client_link_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CustomerClientLinkService.GetCustomerClientLink][google.ads.googleads.v1.services.CustomerClientLinkService.GetCustomerClientLink].
 type GetCustomerClientLinkRequest struct {
@@ -40,16 +40,17 @@ func (m *GetCustomerClientLinkRequest) Reset()         { *m = GetCustomerClientL
 func (m *GetCustomerClientLinkRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerClientLinkRequest) ProtoMessage()    {}
 func (*GetCustomerClientLinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_service_ec1d3dfd8da034fb, []int{0}
+	return fileDescriptor_e1d0479edf27af92, []int{0}
 }
+
 func (m *GetCustomerClientLinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerClientLinkRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerClientLinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerClientLinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerClientLinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerClientLinkRequest.Merge(dst, src)
+func (m *GetCustomerClientLinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerClientLinkRequest.Merge(m, src)
 }
 func (m *GetCustomerClientLinkRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerClientLinkRequest.Size(m)
@@ -82,16 +83,17 @@ func (m *MutateCustomerClientLinkRequest) Reset()         { *m = MutateCustomerC
 func (m *MutateCustomerClientLinkRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerClientLinkRequest) ProtoMessage()    {}
 func (*MutateCustomerClientLinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_service_ec1d3dfd8da034fb, []int{1}
+	return fileDescriptor_e1d0479edf27af92, []int{1}
 }
+
 func (m *MutateCustomerClientLinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerClientLinkRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomerClientLinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerClientLinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerClientLinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerClientLinkRequest.Merge(dst, src)
+func (m *MutateCustomerClientLinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerClientLinkRequest.Merge(m, src)
 }
 func (m *MutateCustomerClientLinkRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerClientLinkRequest.Size(m)
@@ -135,16 +137,17 @@ func (m *CustomerClientLinkOperation) Reset()         { *m = CustomerClientLinkO
 func (m *CustomerClientLinkOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomerClientLinkOperation) ProtoMessage()    {}
 func (*CustomerClientLinkOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_service_ec1d3dfd8da034fb, []int{2}
+	return fileDescriptor_e1d0479edf27af92, []int{2}
 }
+
 func (m *CustomerClientLinkOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerClientLinkOperation.Unmarshal(m, b)
 }
 func (m *CustomerClientLinkOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerClientLinkOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomerClientLinkOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerClientLinkOperation.Merge(dst, src)
+func (m *CustomerClientLinkOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerClientLinkOperation.Merge(m, src)
 }
 func (m *CustomerClientLinkOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomerClientLinkOperation.Size(m)
@@ -199,80 +202,14 @@ func (m *CustomerClientLinkOperation) GetUpdate() *resources.CustomerClientLink
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomerClientLinkOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomerClientLinkOperation_OneofMarshaler, _CustomerClientLinkOperation_OneofUnmarshaler, _CustomerClientLinkOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomerClientLinkOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomerClientLinkOperation_Create)(nil),
 		(*CustomerClientLinkOperation_Update)(nil),
 	}
 }
 
-func _CustomerClientLinkOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomerClientLinkOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerClientLinkOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CustomerClientLinkOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomerClientLinkOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomerClientLinkOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomerClientLinkOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerClientLink)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerClientLinkOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerClientLink)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerClientLinkOperation_Update{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomerClientLinkOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomerClientLinkOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerClientLinkOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerClientLinkOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a CustomerClientLink mutate.
 type MutateCustomerClientLinkResponse struct {
 	// A result that identifies the resource affected by the mutate request.
@@ -286,16 +223,17 @@ func (m *MutateCustomerClientLinkResponse) Reset()         { *m = MutateCustomer
 func (m *MutateCustomerClientLinkResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerClientLinkResponse) ProtoMessage()    {}
 func (*MutateCustomerClientLinkResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_service_ec1d3dfd8da034fb, []int{3}
+	return fileDescriptor_e1d0479edf27af92, []int{3}
 }
+
 func (m *MutateCustomerClientLinkResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerClientLinkResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomerClientLinkResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerClientLinkResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerClientLinkResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerClientLinkResponse.Merge(dst, src)
+func (m *MutateCustomerClientLinkResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerClientLinkResponse.Merge(m, src)
 }
 func (m *MutateCustomerClientLinkResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerClientLinkResponse.Size(m)
@@ -326,16 +264,17 @@ func (m *MutateCustomerClientLinkResult) Reset()         { *m = MutateCustomerCl
 func (m *MutateCustomerClientLinkResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerClientLinkResult) ProtoMessage()    {}
 func (*MutateCustomerClientLinkResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_link_service_ec1d3dfd8da034fb, []int{4}
+	return fileDescriptor_e1d0479edf27af92, []int{4}
 }
+
 func (m *MutateCustomerClientLinkResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerClientLinkResult.Unmarshal(m, b)
 }
 func (m *MutateCustomerClientLinkResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerClientLinkResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerClientLinkResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerClientLinkResult.Merge(dst, src)
+func (m *MutateCustomerClientLinkResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerClientLinkResult.Merge(m, src)
 }
 func (m *MutateCustomerClientLinkResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerClientLinkResult.Size(m)
@@ -361,6 +300,53 @@ func init() {
 	proto.RegisterType((*MutateCustomerClientLinkResult)(nil), "google.ads.googleads.v1.services.MutateCustomerClientLinkResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_client_link_service.proto", fileDescriptor_e1d0479edf27af92)
+}
+
+var fileDescriptor_e1d0479edf27af92 = []byte{
+	// 612 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x8b, 0xd3, 0x40,
+	0x14, 0xc7, 0x4d, 0x56, 0x0a, 0x3b, 0xd5, 0x4b, 0x40, 0xa8, 0x75, 0xe9, 0x96, 0xb8, 0x87, 0xa5,
+	0x87, 0x09, 0xad, 0x2c, 0x4a, 0xd6, 0x8a, 0x69, 0xd1, 0xae, 0xe0, 0xba, 0x4b, 0x84, 0x22, 0x5a,
+	0x28, 0xb3, 0xcd, 0x6c, 0x08, 0x4d, 0x32, 0x71, 0x66, 0x52, 0x0f, 0xeb, 0x5e, 0x04, 0x0f, 0x9e,
+	0xfd, 0x00, 0x82, 0x47, 0x3f, 0x8a, 0xe0, 0x49, 0x3f, 0x82, 0x78, 0xf0, 0x53, 0x48, 0x32, 0x33,
+	0xe9, 0xea, 0x36, 0xad, 0xec, 0xde, 0x5e, 0x26, 0xef, 0xfd, 0xde, 0xfb, 0xbf, 0x37, 0x6f, 0x40,
+	0xdf, 0x27, 0xc4, 0x0f, 0xb1, 0x85, 0x3c, 0x66, 0x09, 0x33, 0xb3, 0x66, 0x6d, 0x8b, 0x61, 0x3a,
+	0x0b, 0x26, 0x98, 0x59, 0x93, 0x94, 0x71, 0x12, 0x61, 0x3a, 0x9e, 0x84, 0x01, 0x8e, 0xf9, 0x38,
+	0x0c, 0xe2, 0xe9, 0x58, 0xfe, 0x85, 0x09, 0x25, 0x9c, 0x18, 0x4d, 0x11, 0x09, 0x91, 0xc7, 0x60,
+	0x01, 0x81, 0xb3, 0x36, 0x54, 0x90, 0xfa, 0xfd, 0xb2, 0x34, 0x14, 0x33, 0x92, 0xd2, 0xb2, 0x3c,
+	0x82, 0x5f, 0xdf, 0x50, 0xd1, 0x49, 0x60, 0xa1, 0x38, 0x26, 0x1c, 0xf1, 0x80, 0xc4, 0x4c, 0xfe,
+	0x95, 0xd9, 0xad, 0xfc, 0xeb, 0x28, 0x3d, 0xb6, 0x8e, 0x03, 0x1c, 0x7a, 0xe3, 0x08, 0x31, 0x15,
+	0xdf, 0xf8, 0xd7, 0xe3, 0x0d, 0x45, 0x49, 0x82, 0xa9, 0x24, 0x98, 0x7d, 0xb0, 0x31, 0xc0, 0xbc,
+	0x2f, 0x0b, 0xe8, 0xe7, 0xf9, 0x9f, 0x06, 0xf1, 0xd4, 0xc5, 0xaf, 0x53, 0xcc, 0xb8, 0x71, 0x1b,
+	0x5c, 0x57, 0x75, 0x8e, 0x63, 0x14, 0xe1, 0x9a, 0xd6, 0xd4, 0xb6, 0xd7, 0xdd, 0x6b, 0xea, 0xf0,
+	0x19, 0x8a, 0xb0, 0xf9, 0x49, 0x03, 0x9b, 0xfb, 0x29, 0x47, 0x1c, 0x97, 0x83, 0x36, 0x41, 0xb5,
+	0x90, 0x19, 0x78, 0x12, 0x03, 0xd4, 0xd1, 0x13, 0xcf, 0x78, 0x05, 0xd6, 0x49, 0x82, 0x69, 0xae,
+	0xaf, 0xa6, 0x37, 0xb5, 0xed, 0x6a, 0xa7, 0x0b, 0x57, 0x75, 0x17, 0x9e, 0x4f, 0x78, 0xa0, 0x20,
+	0xee, 0x9c, 0x67, 0x7e, 0xd0, 0xc1, 0xad, 0x25, 0xae, 0xc6, 0x2e, 0xa8, 0xa6, 0x89, 0x87, 0x38,
+	0xce, 0x7b, 0x57, 0xbb, 0x9a, 0xa7, 0xaf, 0xab, 0xf4, 0xaa, 0x79, 0xf0, 0x71, 0xd6, 0xde, 0x7d,
+	0xc4, 0xa6, 0x2e, 0x10, 0xee, 0x99, 0x6d, 0x1c, 0x80, 0xca, 0x84, 0x62, 0xc4, 0x45, 0x73, 0xaa,
+	0x9d, 0x9d, 0xd2, 0xb2, 0x8b, 0x91, 0x2f, 0xa8, 0x7b, 0xef, 0x8a, 0x2b, 0x31, 0x19, 0x50, 0xe0,
+	0x65, 0x1f, 0x2e, 0x0e, 0x14, 0x98, 0x5e, 0xf5, 0x4c, 0x6f, 0xcd, 0xb7, 0xa0, 0x59, 0x3e, 0x2c,
+	0x96, 0x90, 0x98, 0x61, 0xe3, 0x05, 0xa8, 0x50, 0xcc, 0xd2, 0x90, 0x4b, 0x49, 0x0f, 0x57, 0x4f,
+	0x62, 0x09, 0x33, 0x0d, 0xb9, 0x2b, 0x79, 0xe6, 0x23, 0xd0, 0x58, 0xee, 0xf9, 0x5f, 0x57, 0xae,
+	0xf3, 0x63, 0x0d, 0xdc, 0x3c, 0x4f, 0x78, 0x2e, 0x8a, 0x31, 0xbe, 0x69, 0xe0, 0xc6, 0xc2, 0x6b,
+	0x6d, 0x3c, 0x58, 0x2d, 0x64, 0xd9, 0x3e, 0xd4, 0x2f, 0x36, 0x0a, 0xb3, 0xfb, 0xee, 0xfb, 0xcf,
+	0x8f, 0xfa, 0x5d, 0x63, 0x27, 0x5b, 0xfc, 0x93, 0xbf, 0xe4, 0x75, 0xd5, 0x0e, 0x30, 0xab, 0x55,
+	0xbc, 0x04, 0xf3, 0x50, 0x66, 0xb5, 0x4e, 0x8d, 0x5f, 0x1a, 0xa8, 0x95, 0x75, 0xcd, 0x70, 0x2e,
+	0x33, 0x1b, 0xa1, 0xaa, 0x77, 0xa9, 0xf1, 0xe6, 0x57, 0xc6, 0xec, 0xe7, 0x12, 0xbb, 0xe6, 0xbd,
+	0x4c, 0xe2, 0x5c, 0xd3, 0xc9, 0x99, 0xad, 0xef, 0xb6, 0x4e, 0x17, 0x29, 0xb4, 0xa3, 0x9c, 0x6d,
+	0x6b, 0xad, 0xde, 0x7b, 0x1d, 0x6c, 0x4d, 0x48, 0xb4, 0xb2, 0x9c, 0x5e, 0xa3, 0x74, 0xf8, 0x87,
+	0xd9, 0xb2, 0x1e, 0x6a, 0x2f, 0xf7, 0x24, 0xc3, 0x27, 0x21, 0x8a, 0x7d, 0x48, 0xa8, 0x6f, 0xf9,
+	0x38, 0xce, 0x57, 0x59, 0xbd, 0xc3, 0x49, 0xc0, 0xca, 0x5f, 0xff, 0x5d, 0x65, 0x7c, 0xd6, 0xd7,
+	0x06, 0x8e, 0xf3, 0x45, 0x6f, 0x0e, 0x04, 0xd0, 0xf1, 0x18, 0x14, 0x66, 0x66, 0x0d, 0xdb, 0x50,
+	0x26, 0x66, 0x5f, 0x95, 0xcb, 0xc8, 0xf1, 0xd8, 0xa8, 0x70, 0x19, 0x0d, 0xdb, 0x23, 0xe5, 0xf2,
+	0x5b, 0xdf, 0x12, 0xe7, 0xb6, 0xed, 0x78, 0xcc, 0xb6, 0x0b, 0x27, 0xdb, 0x1e, 0xb6, 0x6d, 0x5b,
+	0xb9, 0x1d, 0x55, 0xf2, 0x3a, 0xef, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xea, 0x97, 0x0d, 0xdb,
+	0xa4, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -469,50 +455,3 @@ var _CustomerClientLinkService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_client_link_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_client_link_service.proto", fileDescriptor_customer_client_link_service_ec1d3dfd8da034fb)
-}
-
-var fileDescriptor_customer_client_link_service_ec1d3dfd8da034fb = []byte{
-	// 612 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x4d, 0x56, 0x0a, 0x3b, 0xd5, 0x4b, 0x40, 0xa8, 0x75, 0xe9, 0x96, 0xb8, 0x87, 0xa5,
-	0x87, 0x09, 0xad, 0x2c, 0x4a, 0xd6, 0x8a, 0x69, 0xd1, 0xae, 0xe0, 0xba, 0x4b, 0x84, 0x22, 0x5a,
-	0x28, 0xb3, 0xcd, 0x6c, 0x08, 0x4d, 0x32, 0x71, 0x66, 0x52, 0x0f, 0xeb, 0x5e, 0x04, 0x0f, 0x9e,
-	0xfd, 0x00, 0x82, 0x47, 0x3f, 0x8a, 0xe0, 0x49, 0x3f, 0x82, 0x78, 0xf0, 0x53, 0x48, 0x32, 0x33,
-	0xe9, 0xea, 0x36, 0xad, 0xec, 0xde, 0x5e, 0x26, 0xef, 0xfd, 0xde, 0xfb, 0xbf, 0x37, 0x6f, 0x40,
-	0xdf, 0x27, 0xc4, 0x0f, 0xb1, 0x85, 0x3c, 0x66, 0x09, 0x33, 0xb3, 0x66, 0x6d, 0x8b, 0x61, 0x3a,
-	0x0b, 0x26, 0x98, 0x59, 0x93, 0x94, 0x71, 0x12, 0x61, 0x3a, 0x9e, 0x84, 0x01, 0x8e, 0xf9, 0x38,
-	0x0c, 0xe2, 0xe9, 0x58, 0xfe, 0x85, 0x09, 0x25, 0x9c, 0x18, 0x4d, 0x11, 0x09, 0x91, 0xc7, 0x60,
-	0x01, 0x81, 0xb3, 0x36, 0x54, 0x90, 0xfa, 0xfd, 0xb2, 0x34, 0x14, 0x33, 0x92, 0xd2, 0xb2, 0x3c,
-	0x82, 0x5f, 0xdf, 0x50, 0xd1, 0x49, 0x60, 0xa1, 0x38, 0x26, 0x1c, 0xf1, 0x80, 0xc4, 0x4c, 0xfe,
-	0x95, 0xd9, 0xad, 0xfc, 0xeb, 0x28, 0x3d, 0xb6, 0x8e, 0x03, 0x1c, 0x7a, 0xe3, 0x08, 0x31, 0x15,
-	0xdf, 0xf8, 0xd7, 0xe3, 0x0d, 0x45, 0x49, 0x82, 0xa9, 0x24, 0x98, 0x7d, 0xb0, 0x31, 0xc0, 0xbc,
-	0x2f, 0x0b, 0xe8, 0xe7, 0xf9, 0x9f, 0x06, 0xf1, 0xd4, 0xc5, 0xaf, 0x53, 0xcc, 0xb8, 0x71, 0x1b,
-	0x5c, 0x57, 0x75, 0x8e, 0x63, 0x14, 0xe1, 0x9a, 0xd6, 0xd4, 0xb6, 0xd7, 0xdd, 0x6b, 0xea, 0xf0,
-	0x19, 0x8a, 0xb0, 0xf9, 0x49, 0x03, 0x9b, 0xfb, 0x29, 0x47, 0x1c, 0x97, 0x83, 0x36, 0x41, 0xb5,
-	0x90, 0x19, 0x78, 0x12, 0x03, 0xd4, 0xd1, 0x13, 0xcf, 0x78, 0x05, 0xd6, 0x49, 0x82, 0x69, 0xae,
-	0xaf, 0xa6, 0x37, 0xb5, 0xed, 0x6a, 0xa7, 0x0b, 0x57, 0x75, 0x17, 0x9e, 0x4f, 0x78, 0xa0, 0x20,
-	0xee, 0x9c, 0x67, 0x7e, 0xd0, 0xc1, 0xad, 0x25, 0xae, 0xc6, 0x2e, 0xa8, 0xa6, 0x89, 0x87, 0x38,
-	0xce, 0x7b, 0x57, 0xbb, 0x9a, 0xa7, 0xaf, 0xab, 0xf4, 0xaa, 0x79, 0xf0, 0x71, 0xd6, 0xde, 0x7d,
-	0xc4, 0xa6, 0x2e, 0x10, 0xee, 0x99, 0x6d, 0x1c, 0x80, 0xca, 0x84, 0x62, 0xc4, 0x45, 0x73, 0xaa,
-	0x9d, 0x9d, 0xd2, 0xb2, 0x8b, 0x91, 0x2f, 0xa8, 0x7b, 0xef, 0x8a, 0x2b, 0x31, 0x19, 0x50, 0xe0,
-	0x65, 0x1f, 0x2e, 0x0e, 0x14, 0x98, 0x5e, 0xf5, 0x4c, 0x6f, 0xcd, 0xb7, 0xa0, 0x59, 0x3e, 0x2c,
-	0x96, 0x90, 0x98, 0x61, 0xe3, 0x05, 0xa8, 0x50, 0xcc, 0xd2, 0x90, 0x4b, 0x49, 0x0f, 0x57, 0x4f,
-	0x62, 0x09, 0x33, 0x0d, 0xb9, 0x2b, 0x79, 0xe6, 0x23, 0xd0, 0x58, 0xee, 0xf9, 0x5f, 0x57, 0xae,
-	0xf3, 0x63, 0x0d, 0xdc, 0x3c, 0x4f, 0x78, 0x2e, 0x8a, 0x31, 0xbe, 0x69, 0xe0, 0xc6, 0xc2, 0x6b,
-	0x6d, 0x3c, 0x58, 0x2d, 0x64, 0xd9, 0x3e, 0xd4, 0x2f, 0x36, 0x0a, 0xb3, 0xfb, 0xee, 0xfb, 0xcf,
-	0x8f, 0xfa, 0x5d, 0x63, 0x27, 0x5b, 0xfc, 0x93, 0xbf, 0xe4, 0x75, 0xd5, 0x0e, 0x30, 0xab, 0x55,
-	0xbc, 0x04, 0xf3, 0x50, 0x66, 0xb5, 0x4e, 0x8d, 0x5f, 0x1a, 0xa8, 0x95, 0x75, 0xcd, 0x70, 0x2e,
-	0x33, 0x1b, 0xa1, 0xaa, 0x77, 0xa9, 0xf1, 0xe6, 0x57, 0xc6, 0xec, 0xe7, 0x12, 0xbb, 0xe6, 0xbd,
-	0x4c, 0xe2, 0x5c, 0xd3, 0xc9, 0x99, 0xad, 0xef, 0xb6, 0x4e, 0x17, 0x29, 0xb4, 0xa3, 0x9c, 0x6d,
-	0x6b, 0xad, 0xde, 0x7b, 0x1d, 0x6c, 0x4d, 0x48, 0xb4, 0xb2, 0x9c, 0x5e, 0xa3, 0x74, 0xf8, 0x87,
-	0xd9, 0xb2, 0x1e, 0x6a, 0x2f, 0xf7, 0x24, 0xc3, 0x27, 0x21, 0x8a, 0x7d, 0x48, 0xa8, 0x6f, 0xf9,
-	0x38, 0xce, 0x57, 0x59, 0xbd, 0xc3, 0x49, 0xc0, 0xca, 0x5f, 0xff, 0x5d, 0x65, 0x7c, 0xd6, 0xd7,
-	0x06, 0x8e, 0xf3, 0x45, 0x6f, 0x0e, 0x04, 0xd0, 0xf1, 0x18, 0x14, 0x66, 0x66, 0x0d, 0xdb, 0x50,
-	0x26, 0x66, 0x5f, 0x95, 0xcb, 0xc8, 0xf1, 0xd8, 0xa8, 0x70, 0x19, 0x0d, 0xdb, 0x23, 0xe5, 0xf2,
-	0x5b, 0xdf, 0x12, 0xe7, 0xb6, 0xed, 0x78, 0xcc, 0xb6, 0x0b, 0x27, 0xdb, 0x1e, 0xb6, 0x6d, 0x5b,
-	0xb9, 0x1d, 0x55, 0xf2, 0x3a, 0xef, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xea, 0x97, 0x0d, 0xdb,
-	0xa4, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_client_service.pb.go b/googleapis/ads/googleads/v1/services/customer_client_service.pb.go
index 4f17ded368..c1dfef90c0 100644
--- a/googleapis/ads/googleads/v1/services/customer_client_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_client_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_client_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CustomerClientService.GetCustomerClient][google.ads.googleads.v1.services.CustomerClientService.GetCustomerClient].
 type GetCustomerClientRequest struct {
@@ -38,16 +38,17 @@ func (m *GetCustomerClientRequest) Reset()         { *m = GetCustomerClientReque
 func (m *GetCustomerClientRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerClientRequest) ProtoMessage()    {}
 func (*GetCustomerClientRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_client_service_bf7d81d922f0354a, []int{0}
+	return fileDescriptor_cb7c23abb2a23d64, []int{0}
 }
+
 func (m *GetCustomerClientRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerClientRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerClientRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerClientRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerClientRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerClientRequest.Merge(dst, src)
+func (m *GetCustomerClientRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerClientRequest.Merge(m, src)
 }
 func (m *GetCustomerClientRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerClientRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetCustomerClientRequest)(nil), "google.ads.googleads.v1.services.GetCustomerClientRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_client_service.proto", fileDescriptor_cb7c23abb2a23d64)
+}
+
+var fileDescriptor_cb7c23abb2a23d64 = []byte{
+	// 360 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4a, 0xc3, 0x40,
+	0x1c, 0xc7, 0x49, 0x04, 0xc1, 0xa0, 0x83, 0x01, 0xa1, 0x04, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
+	0xce, 0x0e, 0xe2, 0x89, 0x4a, 0xda, 0xa1, 0x4e, 0x52, 0x2a, 0x74, 0x90, 0x40, 0x39, 0x93, 0x23,
+	0x04, 0x9a, 0xbb, 0x7a, 0xbf, 0x6b, 0x17, 0x71, 0xd0, 0x57, 0xf0, 0x0d, 0x1c, 0x7d, 0x07, 0x5f,
+	0xc0, 0xd5, 0xc1, 0x17, 0x70, 0xf2, 0x29, 0x24, 0xbd, 0x5c, 0xa0, 0xd8, 0xd0, 0xed, 0xcb, 0xfd,
+	0xbe, 0x9f, 0xdf, 0x9f, 0x6f, 0xe2, 0x5d, 0xa6, 0x52, 0xa6, 0x53, 0x8e, 0x59, 0x02, 0xd8, 0xc8,
+	0x42, 0x2d, 0x08, 0x06, 0xae, 0x16, 0x59, 0xcc, 0x01, 0xc7, 0x73, 0xd0, 0x32, 0xe7, 0x6a, 0x12,
+	0x4f, 0x33, 0x2e, 0xf4, 0xa4, 0x2c, 0xa0, 0x99, 0x92, 0x5a, 0xfa, 0x4d, 0x03, 0x21, 0x96, 0x00,
+	0xaa, 0x78, 0xb4, 0x20, 0xc8, 0xf2, 0xc1, 0x69, 0xdd, 0x04, 0xc5, 0x41, 0xce, 0xd5, 0x9a, 0x11,
+	0xa6, 0x75, 0x70, 0x68, 0xc1, 0x59, 0x86, 0x99, 0x10, 0x52, 0x33, 0x9d, 0x49, 0x01, 0xa6, 0xda,
+	0xba, 0xf2, 0x1a, 0x03, 0xae, 0xfb, 0x25, 0xd9, 0x5f, 0x82, 0x23, 0xfe, 0x30, 0xe7, 0xa0, 0xfd,
+	0x23, 0x6f, 0xcf, 0x36, 0x9f, 0x08, 0x96, 0xf3, 0x86, 0xd3, 0x74, 0x8e, 0x77, 0x46, 0xbb, 0xf6,
+	0xf1, 0x86, 0xe5, 0xfc, 0xe4, 0xdb, 0xf1, 0x0e, 0x56, 0xf1, 0x5b, 0xb3, 0xb2, 0xff, 0xe1, 0x78,
+	0xfb, 0xff, 0x7a, 0xfb, 0x14, 0x6d, 0x3a, 0x15, 0xd5, 0x2d, 0x14, 0x90, 0x5a, 0xb6, 0x0a, 0x01,
+	0xad, 0x92, 0xad, 0xb3, 0x97, 0xaf, 0x9f, 0x57, 0xb7, 0xeb, 0x93, 0x22, 0xaa, 0xc7, 0x95, 0x73,
+	0x2e, 0x6c, 0x5e, 0x80, 0x3b, 0x55, 0x76, 0x06, 0x03, 0xdc, 0x79, 0xea, 0x3d, 0xbb, 0x5e, 0x3b,
+	0x96, 0xf9, 0xc6, 0x7d, 0x7b, 0xc1, 0xda, 0xfb, 0x87, 0x45, 0xbe, 0x43, 0xe7, 0xee, 0xba, 0xe4,
+	0x53, 0x39, 0x65, 0x22, 0x45, 0x52, 0xa5, 0x38, 0xe5, 0x62, 0x99, 0xbe, 0xfd, 0x90, 0xb3, 0x0c,
+	0xea, 0xff, 0x9c, 0x73, 0x2b, 0xde, 0xdc, 0xad, 0x41, 0x18, 0xbe, 0xbb, 0xcd, 0x81, 0x69, 0x18,
+	0x26, 0x80, 0x8c, 0x2c, 0xd4, 0x98, 0xa0, 0x72, 0x30, 0x7c, 0x5a, 0x4b, 0x14, 0x26, 0x10, 0x55,
+	0x96, 0x68, 0x4c, 0x22, 0x6b, 0xf9, 0x75, 0xdb, 0xe6, 0x9d, 0xd2, 0x30, 0x01, 0x4a, 0x2b, 0x13,
+	0xa5, 0x63, 0x42, 0xa9, 0xb5, 0xdd, 0x6f, 0x2f, 0xf7, 0xec, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff,
+	0x14, 0x0f, 0x26, 0x19, 0xe0, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _CustomerClientService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_client_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_client_service.proto", fileDescriptor_customer_client_service_bf7d81d922f0354a)
-}
-
-var fileDescriptor_customer_client_service_bf7d81d922f0354a = []byte{
-	// 360 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4a, 0xc3, 0x40,
-	0x1c, 0xc7, 0x49, 0x04, 0xc1, 0xa0, 0x83, 0x01, 0xa1, 0x04, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
-	0xce, 0x0e, 0xe2, 0x89, 0x4a, 0xda, 0xa1, 0x4e, 0x52, 0x2a, 0x74, 0x90, 0x40, 0x39, 0x93, 0x23,
-	0x04, 0x9a, 0xbb, 0x7a, 0xbf, 0x6b, 0x17, 0x71, 0xd0, 0x57, 0xf0, 0x0d, 0x1c, 0x7d, 0x07, 0x5f,
-	0xc0, 0xd5, 0xc1, 0x17, 0x70, 0xf2, 0x29, 0x24, 0xbd, 0x5c, 0xa0, 0xd8, 0xd0, 0xed, 0xcb, 0xfd,
-	0xbe, 0x9f, 0xdf, 0x9f, 0x6f, 0xe2, 0x5d, 0xa6, 0x52, 0xa6, 0x53, 0x8e, 0x59, 0x02, 0xd8, 0xc8,
-	0x42, 0x2d, 0x08, 0x06, 0xae, 0x16, 0x59, 0xcc, 0x01, 0xc7, 0x73, 0xd0, 0x32, 0xe7, 0x6a, 0x12,
-	0x4f, 0x33, 0x2e, 0xf4, 0xa4, 0x2c, 0xa0, 0x99, 0x92, 0x5a, 0xfa, 0x4d, 0x03, 0x21, 0x96, 0x00,
-	0xaa, 0x78, 0xb4, 0x20, 0xc8, 0xf2, 0xc1, 0x69, 0xdd, 0x04, 0xc5, 0x41, 0xce, 0xd5, 0x9a, 0x11,
-	0xa6, 0x75, 0x70, 0x68, 0xc1, 0x59, 0x86, 0x99, 0x10, 0x52, 0x33, 0x9d, 0x49, 0x01, 0xa6, 0xda,
-	0xba, 0xf2, 0x1a, 0x03, 0xae, 0xfb, 0x25, 0xd9, 0x5f, 0x82, 0x23, 0xfe, 0x30, 0xe7, 0xa0, 0xfd,
-	0x23, 0x6f, 0xcf, 0x36, 0x9f, 0x08, 0x96, 0xf3, 0x86, 0xd3, 0x74, 0x8e, 0x77, 0x46, 0xbb, 0xf6,
-	0xf1, 0x86, 0xe5, 0xfc, 0xe4, 0xdb, 0xf1, 0x0e, 0x56, 0xf1, 0x5b, 0xb3, 0xb2, 0xff, 0xe1, 0x78,
-	0xfb, 0xff, 0x7a, 0xfb, 0x14, 0x6d, 0x3a, 0x15, 0xd5, 0x2d, 0x14, 0x90, 0x5a, 0xb6, 0x0a, 0x01,
-	0xad, 0x92, 0xad, 0xb3, 0x97, 0xaf, 0x9f, 0x57, 0xb7, 0xeb, 0x93, 0x22, 0xaa, 0xc7, 0x95, 0x73,
-	0x2e, 0x6c, 0x5e, 0x80, 0x3b, 0x55, 0x76, 0x06, 0x03, 0xdc, 0x79, 0xea, 0x3d, 0xbb, 0x5e, 0x3b,
-	0x96, 0xf9, 0xc6, 0x7d, 0x7b, 0xc1, 0xda, 0xfb, 0x87, 0x45, 0xbe, 0x43, 0xe7, 0xee, 0xba, 0xe4,
-	0x53, 0x39, 0x65, 0x22, 0x45, 0x52, 0xa5, 0x38, 0xe5, 0x62, 0x99, 0xbe, 0xfd, 0x90, 0xb3, 0x0c,
-	0xea, 0xff, 0x9c, 0x73, 0x2b, 0xde, 0xdc, 0xad, 0x41, 0x18, 0xbe, 0xbb, 0xcd, 0x81, 0x69, 0x18,
-	0x26, 0x80, 0x8c, 0x2c, 0xd4, 0x98, 0xa0, 0x72, 0x30, 0x7c, 0x5a, 0x4b, 0x14, 0x26, 0x10, 0x55,
-	0x96, 0x68, 0x4c, 0x22, 0x6b, 0xf9, 0x75, 0xdb, 0xe6, 0x9d, 0xd2, 0x30, 0x01, 0x4a, 0x2b, 0x13,
-	0xa5, 0x63, 0x42, 0xa9, 0xb5, 0xdd, 0x6f, 0x2f, 0xf7, 0xec, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff,
-	0x14, 0x0f, 0x26, 0x19, 0xe0, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_extension_setting_service.pb.go b/googleapis/ads/googleads/v1/services/customer_extension_setting_service.pb.go
index 9d0df43f9f..d8524614af 100644
--- a/googleapis/ads/googleads/v1/services/customer_extension_setting_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_extension_setting_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_extension_setting_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [CustomerExtensionSettingService.GetCustomerExtensionSetting][google.ads.googleads.v1.services.CustomerExtensionSettingService.GetCustomerExtensionSetting].
@@ -42,16 +42,17 @@ func (m *GetCustomerExtensionSettingRequest) Reset()         { *m = GetCustomerE
 func (m *GetCustomerExtensionSettingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerExtensionSettingRequest) ProtoMessage()    {}
 func (*GetCustomerExtensionSettingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_extension_setting_service_7aa4f56bacfec343, []int{0}
+	return fileDescriptor_f039497e3ad343eb, []int{0}
 }
+
 func (m *GetCustomerExtensionSettingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerExtensionSettingRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerExtensionSettingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerExtensionSettingRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerExtensionSettingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerExtensionSettingRequest.Merge(dst, src)
+func (m *GetCustomerExtensionSettingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerExtensionSettingRequest.Merge(m, src)
 }
 func (m *GetCustomerExtensionSettingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerExtensionSettingRequest.Size(m)
@@ -97,16 +98,17 @@ func (m *MutateCustomerExtensionSettingsRequest) Reset() {
 func (m *MutateCustomerExtensionSettingsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerExtensionSettingsRequest) ProtoMessage()    {}
 func (*MutateCustomerExtensionSettingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_extension_setting_service_7aa4f56bacfec343, []int{1}
+	return fileDescriptor_f039497e3ad343eb, []int{1}
 }
+
 func (m *MutateCustomerExtensionSettingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerExtensionSettingsRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomerExtensionSettingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerExtensionSettingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerExtensionSettingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerExtensionSettingsRequest.Merge(dst, src)
+func (m *MutateCustomerExtensionSettingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerExtensionSettingsRequest.Merge(m, src)
 }
 func (m *MutateCustomerExtensionSettingsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerExtensionSettingsRequest.Size(m)
@@ -165,16 +167,17 @@ func (m *CustomerExtensionSettingOperation) Reset()         { *m = CustomerExten
 func (m *CustomerExtensionSettingOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomerExtensionSettingOperation) ProtoMessage()    {}
 func (*CustomerExtensionSettingOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_extension_setting_service_7aa4f56bacfec343, []int{2}
+	return fileDescriptor_f039497e3ad343eb, []int{2}
 }
+
 func (m *CustomerExtensionSettingOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerExtensionSettingOperation.Unmarshal(m, b)
 }
 func (m *CustomerExtensionSettingOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerExtensionSettingOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomerExtensionSettingOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerExtensionSettingOperation.Merge(dst, src)
+func (m *CustomerExtensionSettingOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerExtensionSettingOperation.Merge(m, src)
 }
 func (m *CustomerExtensionSettingOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomerExtensionSettingOperation.Size(m)
@@ -242,95 +245,15 @@ func (m *CustomerExtensionSettingOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomerExtensionSettingOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomerExtensionSettingOperation_OneofMarshaler, _CustomerExtensionSettingOperation_OneofUnmarshaler, _CustomerExtensionSettingOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomerExtensionSettingOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomerExtensionSettingOperation_Create)(nil),
 		(*CustomerExtensionSettingOperation_Update)(nil),
 		(*CustomerExtensionSettingOperation_Remove)(nil),
 	}
 }
 
-func _CustomerExtensionSettingOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomerExtensionSettingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerExtensionSettingOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CustomerExtensionSettingOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CustomerExtensionSettingOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CustomerExtensionSettingOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomerExtensionSettingOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomerExtensionSettingOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerExtensionSetting)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerExtensionSettingOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerExtensionSetting)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerExtensionSettingOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CustomerExtensionSettingOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomerExtensionSettingOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomerExtensionSettingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerExtensionSettingOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerExtensionSettingOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerExtensionSettingOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a customer extension setting mutate.
 type MutateCustomerExtensionSettingsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -351,16 +274,17 @@ func (m *MutateCustomerExtensionSettingsResponse) Reset() {
 func (m *MutateCustomerExtensionSettingsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerExtensionSettingsResponse) ProtoMessage()    {}
 func (*MutateCustomerExtensionSettingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_extension_setting_service_7aa4f56bacfec343, []int{3}
+	return fileDescriptor_f039497e3ad343eb, []int{3}
 }
+
 func (m *MutateCustomerExtensionSettingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerExtensionSettingsResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomerExtensionSettingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerExtensionSettingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerExtensionSettingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerExtensionSettingsResponse.Merge(dst, src)
+func (m *MutateCustomerExtensionSettingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerExtensionSettingsResponse.Merge(m, src)
 }
 func (m *MutateCustomerExtensionSettingsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerExtensionSettingsResponse.Size(m)
@@ -398,16 +322,17 @@ func (m *MutateCustomerExtensionSettingResult) Reset()         { *m = MutateCust
 func (m *MutateCustomerExtensionSettingResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerExtensionSettingResult) ProtoMessage()    {}
 func (*MutateCustomerExtensionSettingResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_extension_setting_service_7aa4f56bacfec343, []int{4}
+	return fileDescriptor_f039497e3ad343eb, []int{4}
 }
+
 func (m *MutateCustomerExtensionSettingResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerExtensionSettingResult.Unmarshal(m, b)
 }
 func (m *MutateCustomerExtensionSettingResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerExtensionSettingResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerExtensionSettingResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerExtensionSettingResult.Merge(dst, src)
+func (m *MutateCustomerExtensionSettingResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerExtensionSettingResult.Merge(m, src)
 }
 func (m *MutateCustomerExtensionSettingResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerExtensionSettingResult.Size(m)
@@ -433,6 +358,60 @@ func init() {
 	proto.RegisterType((*MutateCustomerExtensionSettingResult)(nil), "google.ads.googleads.v1.services.MutateCustomerExtensionSettingResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_extension_setting_service.proto", fileDescriptor_f039497e3ad343eb)
+}
+
+var fileDescriptor_f039497e3ad343eb = []byte{
+	// 722 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcf, 0x4e, 0xd4, 0x40,
+	0x1c, 0xc7, 0x6d, 0x21, 0x28, 0xb3, 0xa8, 0xc9, 0x18, 0xe3, 0x66, 0x35, 0xb2, 0xd6, 0x8d, 0x90,
+	0x3d, 0xb4, 0xd9, 0xf5, 0xd6, 0x0d, 0x26, 0xbb, 0x2b, 0x0b, 0x1b, 0x83, 0x90, 0x12, 0x39, 0x98,
+	0x4d, 0xea, 0xd0, 0x0e, 0x4d, 0x43, 0xdb, 0xa9, 0x33, 0xd3, 0x55, 0x42, 0x38, 0xe8, 0xd5, 0x78,
+	0xf2, 0x0d, 0x3c, 0x7a, 0xf7, 0x25, 0xbc, 0xf2, 0x0a, 0x7a, 0xf1, 0x19, 0x3c, 0x98, 0x76, 0x3a,
+	0x15, 0x30, 0xa5, 0x24, 0x70, 0x9b, 0xfe, 0xe6, 0xdb, 0xcf, 0xef, 0x6f, 0x7f, 0x05, 0x63, 0x8f,
+	0x10, 0x2f, 0xc0, 0x06, 0x72, 0x99, 0x21, 0x8e, 0xe9, 0x69, 0xda, 0x31, 0x18, 0xa6, 0x53, 0xdf,
+	0xc1, 0xcc, 0x70, 0x12, 0xc6, 0x49, 0x88, 0xa9, 0x8d, 0xdf, 0x73, 0x1c, 0x31, 0x9f, 0x44, 0x36,
+	0xc3, 0x9c, 0xfb, 0x91, 0x67, 0xe7, 0x1a, 0x3d, 0xa6, 0x84, 0x13, 0xd8, 0x14, 0xef, 0xeb, 0xc8,
+	0x65, 0x7a, 0x81, 0xd2, 0xa7, 0x1d, 0x5d, 0xa2, 0x1a, 0x83, 0x32, 0x67, 0x14, 0x33, 0x92, 0xd0,
+	0xf3, 0xbd, 0x09, 0x2f, 0x8d, 0x07, 0x92, 0x11, 0xfb, 0x06, 0x8a, 0x22, 0xc2, 0x11, 0xf7, 0x49,
+	0xc4, 0xf2, 0xdb, 0x3c, 0x06, 0x23, 0x7b, 0xda, 0x4d, 0xf6, 0x8c, 0x3d, 0x1f, 0x07, 0xae, 0x1d,
+	0x22, 0xb6, 0x9f, 0x2b, 0x1e, 0x9e, 0x55, 0xbc, 0xa3, 0x28, 0x8e, 0x31, 0x95, 0x84, 0x7b, 0xf9,
+	0x3d, 0x8d, 0x1d, 0x83, 0x71, 0xc4, 0x93, 0xfc, 0x42, 0x1b, 0x03, 0x6d, 0x0d, 0xf3, 0x61, 0x1e,
+	0xdf, 0xaa, 0x0c, 0x6f, 0x5b, 0x44, 0x67, 0xe1, 0xb7, 0x09, 0x66, 0x1c, 0x3e, 0x06, 0x37, 0x65,
+	0x32, 0x76, 0x84, 0x42, 0x5c, 0x57, 0x9a, 0xca, 0xf2, 0xbc, 0xb5, 0x20, 0x8d, 0x2f, 0x51, 0x88,
+	0xb5, 0x3f, 0x0a, 0x78, 0xb2, 0x91, 0x70, 0xc4, 0x71, 0x19, 0x8e, 0x49, 0xde, 0x22, 0xa8, 0x15,
+	0x25, 0xf1, 0xdd, 0x9c, 0x06, 0xa4, 0x69, 0xec, 0x42, 0x07, 0x00, 0x12, 0x63, 0x2a, 0xaa, 0x50,
+	0x57, 0x9b, 0x33, 0xcb, 0xb5, 0xee, 0x50, 0xaf, 0x6a, 0x85, 0x5e, 0xe6, 0x78, 0x53, 0xb2, 0xac,
+	0x13, 0x58, 0xb8, 0x04, 0x6e, 0xc7, 0x88, 0x72, 0x1f, 0x05, 0xf6, 0x1e, 0xf2, 0x83, 0x84, 0xe2,
+	0xfa, 0x4c, 0x53, 0x59, 0xbe, 0x61, 0xdd, 0xca, 0xcd, 0x23, 0x61, 0x4d, 0xd3, 0x9f, 0xa2, 0xc0,
+	0x77, 0x11, 0xc7, 0x36, 0x89, 0x82, 0x83, 0xfa, 0x6c, 0x26, 0x5b, 0x90, 0xc6, 0xcd, 0x28, 0x38,
+	0xd0, 0xbe, 0xab, 0xe0, 0x51, 0xa5, 0x7f, 0xd8, 0x03, 0xb5, 0x24, 0xce, 0x40, 0x69, 0xf7, 0x32,
+	0x50, 0xad, 0xdb, 0x90, 0x99, 0xc9, 0xf6, 0xe9, 0xa3, 0xb4, 0xc1, 0x1b, 0x88, 0xed, 0x5b, 0x40,
+	0xc8, 0xd3, 0x33, 0x7c, 0x05, 0xe6, 0x1c, 0x8a, 0x11, 0x17, 0xf5, 0xaf, 0x75, 0x7b, 0xa5, 0x15,
+	0x29, 0x46, 0xaf, 0xb4, 0x24, 0xeb, 0xd7, 0xac, 0x1c, 0x96, 0x62, 0x85, 0x93, 0xba, 0x7a, 0x25,
+	0x58, 0x01, 0x83, 0x75, 0x30, 0x47, 0x71, 0x48, 0xa6, 0xa2, 0xaa, 0xf3, 0xe9, 0x8d, 0x78, 0x1e,
+	0xd4, 0xc0, 0x7c, 0xd1, 0x06, 0xed, 0x58, 0x01, 0x4b, 0x95, 0x63, 0xc3, 0x62, 0x12, 0x31, 0x0c,
+	0x47, 0xe0, 0xee, 0x99, 0x8e, 0xd9, 0x98, 0x52, 0x42, 0x33, 0x0f, 0xb5, 0x2e, 0x94, 0x81, 0xd3,
+	0xd8, 0xd1, 0xb7, 0xb3, 0x31, 0xb7, 0xee, 0x9c, 0xee, 0xe5, 0x6a, 0x2a, 0x87, 0x6f, 0xc0, 0x75,
+	0x8a, 0x59, 0x12, 0x70, 0x39, 0x5b, 0xa3, 0xea, 0xd9, 0x3a, 0x3f, 0x46, 0x2b, 0xc3, 0x59, 0x12,
+	0xab, 0xbd, 0x00, 0xad, 0x8b, 0xbc, 0x70, 0xa1, 0x2f, 0xab, 0xfb, 0x79, 0x16, 0x2c, 0x96, 0x71,
+	0xb6, 0x45, 0x7c, 0xf0, 0x97, 0x02, 0xee, 0x9f, 0xf3, 0x25, 0xc3, 0xe7, 0xd5, 0x19, 0x56, 0x2f,
+	0x82, 0xc6, 0x65, 0x46, 0x43, 0x1b, 0x7e, 0x3c, 0xfe, 0xf9, 0x45, 0x5d, 0x81, 0xbd, 0x74, 0x39,
+	0x1e, 0x9e, 0x4a, 0x7b, 0x45, 0x7e, 0xfb, 0xcc, 0x68, 0x17, 0xdb, 0xf2, 0xbf, 0x39, 0x30, 0xda,
+	0x47, 0xf0, 0x83, 0x0a, 0x16, 0x2b, 0xc6, 0x05, 0xae, 0x5f, 0xb6, 0x9b, 0x72, 0x51, 0x35, 0xc6,
+	0x57, 0x40, 0x12, 0xb3, 0xab, 0x8d, 0xb3, 0xec, 0x87, 0xda, 0xb3, 0x34, 0xfb, 0x7f, 0xe9, 0x1e,
+	0x9e, 0x58, 0x84, 0x2b, 0xed, 0xa3, 0xf2, 0xe4, 0xcd, 0x30, 0x73, 0x64, 0x2a, 0xed, 0xc1, 0x27,
+	0x15, 0xb4, 0x1c, 0x12, 0x56, 0xc6, 0x36, 0x68, 0x55, 0x4c, 0xcd, 0x56, 0xba, 0x6f, 0xb6, 0x94,
+	0xd7, 0xeb, 0x39, 0xc9, 0x23, 0x01, 0x8a, 0x3c, 0x9d, 0x50, 0xcf, 0xf0, 0x70, 0x94, 0x6d, 0x23,
+	0xf9, 0x4b, 0x8b, 0x7d, 0x56, 0xfe, 0x3b, 0xed, 0xc9, 0xc3, 0x57, 0x75, 0x66, 0xad, 0xdf, 0xff,
+	0xa6, 0x36, 0xd7, 0x04, 0xb0, 0xef, 0x32, 0x5d, 0x1c, 0xd3, 0xd3, 0x4e, 0x47, 0xcf, 0x1d, 0xb3,
+	0x1f, 0x52, 0x32, 0xe9, 0xbb, 0x6c, 0x52, 0x48, 0x26, 0x3b, 0x9d, 0x89, 0x94, 0xfc, 0x56, 0x5b,
+	0xc2, 0x6e, 0x9a, 0x7d, 0x97, 0x99, 0x66, 0x21, 0x32, 0xcd, 0x9d, 0x8e, 0x69, 0x4a, 0xd9, 0xee,
+	0x5c, 0x16, 0xe7, 0xd3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xac, 0xac, 0x54, 0xea, 0xf5, 0x07,
+	0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -543,57 +522,3 @@ var _CustomerExtensionSettingService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_extension_setting_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_extension_setting_service.proto", fileDescriptor_customer_extension_setting_service_7aa4f56bacfec343)
-}
-
-var fileDescriptor_customer_extension_setting_service_7aa4f56bacfec343 = []byte{
-	// 722 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcf, 0x4e, 0xd4, 0x40,
-	0x1c, 0xc7, 0x6d, 0x21, 0x28, 0xb3, 0xa8, 0xc9, 0x18, 0xe3, 0x66, 0x35, 0xb2, 0xd6, 0x8d, 0x90,
-	0x3d, 0xb4, 0xd9, 0xf5, 0xd6, 0x0d, 0x26, 0xbb, 0x2b, 0x0b, 0x1b, 0x83, 0x90, 0x12, 0x39, 0x98,
-	0x4d, 0xea, 0xd0, 0x0e, 0x4d, 0x43, 0xdb, 0xa9, 0x33, 0xd3, 0x55, 0x42, 0x38, 0xe8, 0xd5, 0x78,
-	0xf2, 0x0d, 0x3c, 0x7a, 0xf7, 0x25, 0xbc, 0xf2, 0x0a, 0x7a, 0xf1, 0x19, 0x3c, 0x98, 0x76, 0x3a,
-	0x15, 0x30, 0xa5, 0x24, 0x70, 0x9b, 0xfe, 0xe6, 0xdb, 0xcf, 0xef, 0x6f, 0x7f, 0x05, 0x63, 0x8f,
-	0x10, 0x2f, 0xc0, 0x06, 0x72, 0x99, 0x21, 0x8e, 0xe9, 0x69, 0xda, 0x31, 0x18, 0xa6, 0x53, 0xdf,
-	0xc1, 0xcc, 0x70, 0x12, 0xc6, 0x49, 0x88, 0xa9, 0x8d, 0xdf, 0x73, 0x1c, 0x31, 0x9f, 0x44, 0x36,
-	0xc3, 0x9c, 0xfb, 0x91, 0x67, 0xe7, 0x1a, 0x3d, 0xa6, 0x84, 0x13, 0xd8, 0x14, 0xef, 0xeb, 0xc8,
-	0x65, 0x7a, 0x81, 0xd2, 0xa7, 0x1d, 0x5d, 0xa2, 0x1a, 0x83, 0x32, 0x67, 0x14, 0x33, 0x92, 0xd0,
-	0xf3, 0xbd, 0x09, 0x2f, 0x8d, 0x07, 0x92, 0x11, 0xfb, 0x06, 0x8a, 0x22, 0xc2, 0x11, 0xf7, 0x49,
-	0xc4, 0xf2, 0xdb, 0x3c, 0x06, 0x23, 0x7b, 0xda, 0x4d, 0xf6, 0x8c, 0x3d, 0x1f, 0x07, 0xae, 0x1d,
-	0x22, 0xb6, 0x9f, 0x2b, 0x1e, 0x9e, 0x55, 0xbc, 0xa3, 0x28, 0x8e, 0x31, 0x95, 0x84, 0x7b, 0xf9,
-	0x3d, 0x8d, 0x1d, 0x83, 0x71, 0xc4, 0x93, 0xfc, 0x42, 0x1b, 0x03, 0x6d, 0x0d, 0xf3, 0x61, 0x1e,
-	0xdf, 0xaa, 0x0c, 0x6f, 0x5b, 0x44, 0x67, 0xe1, 0xb7, 0x09, 0x66, 0x1c, 0x3e, 0x06, 0x37, 0x65,
-	0x32, 0x76, 0x84, 0x42, 0x5c, 0x57, 0x9a, 0xca, 0xf2, 0xbc, 0xb5, 0x20, 0x8d, 0x2f, 0x51, 0x88,
-	0xb5, 0x3f, 0x0a, 0x78, 0xb2, 0x91, 0x70, 0xc4, 0x71, 0x19, 0x8e, 0x49, 0xde, 0x22, 0xa8, 0x15,
-	0x25, 0xf1, 0xdd, 0x9c, 0x06, 0xa4, 0x69, 0xec, 0x42, 0x07, 0x00, 0x12, 0x63, 0x2a, 0xaa, 0x50,
-	0x57, 0x9b, 0x33, 0xcb, 0xb5, 0xee, 0x50, 0xaf, 0x6a, 0x85, 0x5e, 0xe6, 0x78, 0x53, 0xb2, 0xac,
-	0x13, 0x58, 0xb8, 0x04, 0x6e, 0xc7, 0x88, 0x72, 0x1f, 0x05, 0xf6, 0x1e, 0xf2, 0x83, 0x84, 0xe2,
-	0xfa, 0x4c, 0x53, 0x59, 0xbe, 0x61, 0xdd, 0xca, 0xcd, 0x23, 0x61, 0x4d, 0xd3, 0x9f, 0xa2, 0xc0,
-	0x77, 0x11, 0xc7, 0x36, 0x89, 0x82, 0x83, 0xfa, 0x6c, 0x26, 0x5b, 0x90, 0xc6, 0xcd, 0x28, 0x38,
-	0xd0, 0xbe, 0xab, 0xe0, 0x51, 0xa5, 0x7f, 0xd8, 0x03, 0xb5, 0x24, 0xce, 0x40, 0x69, 0xf7, 0x32,
-	0x50, 0xad, 0xdb, 0x90, 0x99, 0xc9, 0xf6, 0xe9, 0xa3, 0xb4, 0xc1, 0x1b, 0x88, 0xed, 0x5b, 0x40,
-	0xc8, 0xd3, 0x33, 0x7c, 0x05, 0xe6, 0x1c, 0x8a, 0x11, 0x17, 0xf5, 0xaf, 0x75, 0x7b, 0xa5, 0x15,
-	0x29, 0x46, 0xaf, 0xb4, 0x24, 0xeb, 0xd7, 0xac, 0x1c, 0x96, 0x62, 0x85, 0x93, 0xba, 0x7a, 0x25,
-	0x58, 0x01, 0x83, 0x75, 0x30, 0x47, 0x71, 0x48, 0xa6, 0xa2, 0xaa, 0xf3, 0xe9, 0x8d, 0x78, 0x1e,
-	0xd4, 0xc0, 0x7c, 0xd1, 0x06, 0xed, 0x58, 0x01, 0x4b, 0x95, 0x63, 0xc3, 0x62, 0x12, 0x31, 0x0c,
-	0x47, 0xe0, 0xee, 0x99, 0x8e, 0xd9, 0x98, 0x52, 0x42, 0x33, 0x0f, 0xb5, 0x2e, 0x94, 0x81, 0xd3,
-	0xd8, 0xd1, 0xb7, 0xb3, 0x31, 0xb7, 0xee, 0x9c, 0xee, 0xe5, 0x6a, 0x2a, 0x87, 0x6f, 0xc0, 0x75,
-	0x8a, 0x59, 0x12, 0x70, 0x39, 0x5b, 0xa3, 0xea, 0xd9, 0x3a, 0x3f, 0x46, 0x2b, 0xc3, 0x59, 0x12,
-	0xab, 0xbd, 0x00, 0xad, 0x8b, 0xbc, 0x70, 0xa1, 0x2f, 0xab, 0xfb, 0x79, 0x16, 0x2c, 0x96, 0x71,
-	0xb6, 0x45, 0x7c, 0xf0, 0x97, 0x02, 0xee, 0x9f, 0xf3, 0x25, 0xc3, 0xe7, 0xd5, 0x19, 0x56, 0x2f,
-	0x82, 0xc6, 0x65, 0x46, 0x43, 0x1b, 0x7e, 0x3c, 0xfe, 0xf9, 0x45, 0x5d, 0x81, 0xbd, 0x74, 0x39,
-	0x1e, 0x9e, 0x4a, 0x7b, 0x45, 0x7e, 0xfb, 0xcc, 0x68, 0x17, 0xdb, 0xf2, 0xbf, 0x39, 0x30, 0xda,
-	0x47, 0xf0, 0x83, 0x0a, 0x16, 0x2b, 0xc6, 0x05, 0xae, 0x5f, 0xb6, 0x9b, 0x72, 0x51, 0x35, 0xc6,
-	0x57, 0x40, 0x12, 0xb3, 0xab, 0x8d, 0xb3, 0xec, 0x87, 0xda, 0xb3, 0x34, 0xfb, 0x7f, 0xe9, 0x1e,
-	0x9e, 0x58, 0x84, 0x2b, 0xed, 0xa3, 0xf2, 0xe4, 0xcd, 0x30, 0x73, 0x64, 0x2a, 0xed, 0xc1, 0x27,
-	0x15, 0xb4, 0x1c, 0x12, 0x56, 0xc6, 0x36, 0x68, 0x55, 0x4c, 0xcd, 0x56, 0xba, 0x6f, 0xb6, 0x94,
-	0xd7, 0xeb, 0x39, 0xc9, 0x23, 0x01, 0x8a, 0x3c, 0x9d, 0x50, 0xcf, 0xf0, 0x70, 0x94, 0x6d, 0x23,
-	0xf9, 0x4b, 0x8b, 0x7d, 0x56, 0xfe, 0x3b, 0xed, 0xc9, 0xc3, 0x57, 0x75, 0x66, 0xad, 0xdf, 0xff,
-	0xa6, 0x36, 0xd7, 0x04, 0xb0, 0xef, 0x32, 0x5d, 0x1c, 0xd3, 0xd3, 0x4e, 0x47, 0xcf, 0x1d, 0xb3,
-	0x1f, 0x52, 0x32, 0xe9, 0xbb, 0x6c, 0x52, 0x48, 0x26, 0x3b, 0x9d, 0x89, 0x94, 0xfc, 0x56, 0x5b,
-	0xc2, 0x6e, 0x9a, 0x7d, 0x97, 0x99, 0x66, 0x21, 0x32, 0xcd, 0x9d, 0x8e, 0x69, 0x4a, 0xd9, 0xee,
-	0x5c, 0x16, 0xe7, 0xd3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xac, 0xac, 0x54, 0xea, 0xf5, 0x07,
-	0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_feed_service.pb.go b/googleapis/ads/googleads/v1/services/customer_feed_service.pb.go
index efa0cd15d7..781d00005a 100644
--- a/googleapis/ads/googleads/v1/services/customer_feed_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_feed_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_feed_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CustomerFeedService.GetCustomerFeed][google.ads.googleads.v1.services.CustomerFeedService.GetCustomerFeed].
 type GetCustomerFeedRequest struct {
@@ -41,16 +41,17 @@ func (m *GetCustomerFeedRequest) Reset()         { *m = GetCustomerFeedRequest{}
 func (m *GetCustomerFeedRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerFeedRequest) ProtoMessage()    {}
 func (*GetCustomerFeedRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_service_643a1eae045d32fc, []int{0}
+	return fileDescriptor_b5e6824139175c36, []int{0}
 }
+
 func (m *GetCustomerFeedRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerFeedRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerFeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerFeedRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerFeedRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerFeedRequest.Merge(dst, src)
+func (m *GetCustomerFeedRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerFeedRequest.Merge(m, src)
 }
 func (m *GetCustomerFeedRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerFeedRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateCustomerFeedsRequest) Reset()         { *m = MutateCustomerFeedsR
 func (m *MutateCustomerFeedsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerFeedsRequest) ProtoMessage()    {}
 func (*MutateCustomerFeedsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_service_643a1eae045d32fc, []int{1}
+	return fileDescriptor_b5e6824139175c36, []int{1}
 }
+
 func (m *MutateCustomerFeedsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerFeedsRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomerFeedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerFeedsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerFeedsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerFeedsRequest.Merge(dst, src)
+func (m *MutateCustomerFeedsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerFeedsRequest.Merge(m, src)
 }
 func (m *MutateCustomerFeedsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerFeedsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *CustomerFeedOperation) Reset()         { *m = CustomerFeedOperation{} }
 func (m *CustomerFeedOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomerFeedOperation) ProtoMessage()    {}
 func (*CustomerFeedOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_service_643a1eae045d32fc, []int{2}
+	return fileDescriptor_b5e6824139175c36, []int{2}
 }
+
 func (m *CustomerFeedOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerFeedOperation.Unmarshal(m, b)
 }
 func (m *CustomerFeedOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerFeedOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomerFeedOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerFeedOperation.Merge(dst, src)
+func (m *CustomerFeedOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerFeedOperation.Merge(m, src)
 }
 func (m *CustomerFeedOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomerFeedOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *CustomerFeedOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomerFeedOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomerFeedOperation_OneofMarshaler, _CustomerFeedOperation_OneofUnmarshaler, _CustomerFeedOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomerFeedOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomerFeedOperation_Create)(nil),
 		(*CustomerFeedOperation_Update)(nil),
 		(*CustomerFeedOperation_Remove)(nil),
 	}
 }
 
-func _CustomerFeedOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomerFeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerFeedOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CustomerFeedOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *CustomerFeedOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CustomerFeedOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomerFeedOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomerFeedOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerFeed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerFeedOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerFeed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerFeedOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CustomerFeedOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomerFeedOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomerFeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerFeedOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerFeedOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerFeedOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a customer feed mutate.
 type MutateCustomerFeedsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateCustomerFeedsResponse) Reset()         { *m = MutateCustomerFeeds
 func (m *MutateCustomerFeedsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerFeedsResponse) ProtoMessage()    {}
 func (*MutateCustomerFeedsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_service_643a1eae045d32fc, []int{3}
+	return fileDescriptor_b5e6824139175c36, []int{3}
 }
+
 func (m *MutateCustomerFeedsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerFeedsResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomerFeedsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerFeedsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerFeedsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerFeedsResponse.Merge(dst, src)
+func (m *MutateCustomerFeedsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerFeedsResponse.Merge(m, src)
 }
 func (m *MutateCustomerFeedsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerFeedsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateCustomerFeedResult) Reset()         { *m = MutateCustomerFeedResu
 func (m *MutateCustomerFeedResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerFeedResult) ProtoMessage()    {}
 func (*MutateCustomerFeedResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_feed_service_643a1eae045d32fc, []int{4}
+	return fileDescriptor_b5e6824139175c36, []int{4}
 }
+
 func (m *MutateCustomerFeedResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerFeedResult.Unmarshal(m, b)
 }
 func (m *MutateCustomerFeedResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerFeedResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerFeedResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerFeedResult.Merge(dst, src)
+func (m *MutateCustomerFeedResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerFeedResult.Merge(m, src)
 }
 func (m *MutateCustomerFeedResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerFeedResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateCustomerFeedResult)(nil), "google.ads.googleads.v1.services.MutateCustomerFeedResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_feed_service.proto", fileDescriptor_b5e6824139175c36)
+}
+
+var fileDescriptor_b5e6824139175c36 = []byte{
+	// 710 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xc1, 0x6e, 0xd3, 0x4c,
+	0x10, 0xfe, 0xed, 0xfc, 0x2a, 0x74, 0x5d, 0xa8, 0xb4, 0x55, 0xc1, 0x0a, 0x08, 0x22, 0x53, 0x89,
+	0x2a, 0x07, 0xaf, 0x12, 0x84, 0x8a, 0xdc, 0x46, 0x28, 0x45, 0xa4, 0xed, 0xa1, 0xb4, 0x72, 0x51,
+	0x91, 0x50, 0x24, 0x6b, 0x1b, 0x6f, 0x22, 0xab, 0xb6, 0xd7, 0xec, 0xae, 0x83, 0xaa, 0xaa, 0x17,
+	0xde, 0x00, 0xf1, 0x04, 0x70, 0xe4, 0xce, 0x89, 0x37, 0xe0, 0x86, 0x78, 0x85, 0x9e, 0x78, 0x09,
+	0x90, 0xbd, 0x5e, 0x93, 0xb4, 0x89, 0x02, 0xbd, 0x8d, 0x67, 0xbf, 0xf9, 0x66, 0x66, 0xbf, 0xd9,
+	0x31, 0xd8, 0x18, 0x50, 0x3a, 0x08, 0x09, 0xc2, 0x3e, 0x47, 0xd2, 0xcc, 0xac, 0x61, 0x03, 0x71,
+	0xc2, 0x86, 0x41, 0x8f, 0x70, 0xd4, 0x4b, 0xb9, 0xa0, 0x11, 0x61, 0x5e, 0x9f, 0x10, 0xdf, 0x2b,
+	0xdc, 0x76, 0xc2, 0xa8, 0xa0, 0xb0, 0x26, 0x43, 0x6c, 0xec, 0x73, 0xbb, 0x8c, 0xb6, 0x87, 0x0d,
+	0x5b, 0x45, 0x57, 0x1f, 0x4f, 0xe3, 0x67, 0x84, 0xd3, 0x94, 0x5d, 0x4a, 0x20, 0x89, 0xab, 0x77,
+	0x55, 0x58, 0x12, 0x20, 0x1c, 0xc7, 0x54, 0x60, 0x11, 0xd0, 0x98, 0x17, 0xa7, 0x45, 0x5a, 0x94,
+	0x7f, 0x1d, 0xa5, 0x7d, 0xd4, 0x0f, 0x48, 0xe8, 0x7b, 0x11, 0xe6, 0xc7, 0x05, 0xe2, 0xde, 0x45,
+	0xc4, 0x5b, 0x86, 0x93, 0x84, 0x30, 0xc5, 0x70, 0xbb, 0x38, 0x67, 0x49, 0x0f, 0x71, 0x81, 0x45,
+	0x5a, 0x1c, 0x58, 0x2d, 0x70, 0x6b, 0x8b, 0x88, 0x67, 0x45, 0x49, 0x1d, 0x42, 0x7c, 0x97, 0xbc,
+	0x49, 0x09, 0x17, 0xf0, 0x01, 0xb8, 0xa1, 0x6a, 0xf6, 0x62, 0x1c, 0x11, 0x53, 0xab, 0x69, 0xab,
+	0xf3, 0xee, 0x82, 0x72, 0xbe, 0xc0, 0x11, 0xb1, 0xce, 0x35, 0x50, 0xdd, 0x4d, 0x05, 0x16, 0x64,
+	0x94, 0x82, 0x2b, 0x8e, 0xfb, 0xc0, 0x28, 0xbb, 0x0d, 0xfc, 0x82, 0x01, 0x28, 0xd7, 0x8e, 0x0f,
+	0x5f, 0x01, 0x40, 0x13, 0xc2, 0x64, 0xb7, 0xa6, 0x5e, 0xab, 0xac, 0x1a, 0xcd, 0x35, 0x7b, 0xd6,
+	0x2d, 0xdb, 0xa3, 0xc9, 0xf6, 0x54, 0xbc, 0x3b, 0x42, 0x05, 0x1f, 0x82, 0xc5, 0x04, 0x33, 0x11,
+	0xe0, 0xd0, 0xeb, 0xe3, 0x20, 0x4c, 0x19, 0x31, 0x2b, 0x35, 0x6d, 0xf5, 0xba, 0x7b, 0xb3, 0x70,
+	0x77, 0xa4, 0x37, 0x6b, 0x73, 0x88, 0xc3, 0xc0, 0xc7, 0x82, 0x78, 0x34, 0x0e, 0x4f, 0xcc, 0xff,
+	0x73, 0xd8, 0x82, 0x72, 0xee, 0xc5, 0xe1, 0x89, 0xf5, 0x5e, 0x07, 0xcb, 0x13, 0x73, 0xc2, 0x75,
+	0x60, 0xa4, 0x49, 0x1e, 0x9c, 0xa9, 0x91, 0x07, 0x1b, 0xcd, 0xaa, 0xea, 0x40, 0xc9, 0x61, 0x77,
+	0x32, 0xc1, 0x76, 0x31, 0x3f, 0x76, 0x81, 0x84, 0x67, 0x36, 0xdc, 0x01, 0x73, 0x3d, 0x46, 0xb0,
+	0x90, 0x77, 0x6b, 0x34, 0xd1, 0xd4, 0xce, 0xcb, 0xe9, 0x19, 0x6b, 0x7d, 0xfb, 0x3f, 0xb7, 0x20,
+	0xc8, 0xa8, 0x24, 0xb1, 0xa9, 0x5f, 0x99, 0x4a, 0x12, 0x40, 0x13, 0xcc, 0x31, 0x12, 0xd1, 0xa1,
+	0xbc, 0xb1, 0xf9, 0xec, 0x44, 0x7e, 0x6f, 0x1a, 0x60, 0xbe, 0xbc, 0x62, 0xeb, 0xab, 0x06, 0xee,
+	0x4c, 0x94, 0x9e, 0x27, 0x34, 0xe6, 0x04, 0x76, 0xc0, 0xf2, 0x05, 0x05, 0x3c, 0xc2, 0x18, 0x65,
+	0x39, 0xab, 0xd1, 0x84, 0xaa, 0x40, 0x96, 0xf4, 0xec, 0x83, 0x7c, 0x24, 0xdd, 0xa5, 0x71, 0x6d,
+	0x9e, 0x67, 0x70, 0xf8, 0x12, 0x5c, 0x63, 0x84, 0xa7, 0xa1, 0x50, 0xf3, 0xe1, 0xcc, 0x9e, 0x8f,
+	0xcb, 0x75, 0xb9, 0x39, 0x85, 0xab, 0xa8, 0xac, 0xa7, 0xc0, 0x9c, 0x06, 0xfa, 0xab, 0xc9, 0x6f,
+	0x7e, 0xac, 0x80, 0xa5, 0xd1, 0xd8, 0x03, 0x99, 0x1b, 0x7e, 0xd1, 0xc0, 0xe2, 0x85, 0x17, 0x05,
+	0x9f, 0xcc, 0xae, 0x78, 0xf2, 0x23, 0xac, 0xfe, 0xab, 0x8c, 0xd6, 0xda, 0xbb, 0x1f, 0xe7, 0x1f,
+	0xf4, 0x06, 0x44, 0xd9, 0xce, 0x39, 0x1d, 0x6b, 0xa3, 0xa5, 0xde, 0x1d, 0x47, 0xf5, 0x72, 0x09,
+	0xe5, 0x9a, 0xa1, 0xfa, 0x19, 0xfc, 0xae, 0x81, 0xa5, 0x09, 0x72, 0xc2, 0x8d, 0xab, 0xdc, 0xb6,
+	0x5a, 0x00, 0xd5, 0xd6, 0x15, 0xa3, 0xe5, 0x0c, 0x59, 0xad, 0xbc, 0x9b, 0x35, 0xab, 0x99, 0x75,
+	0xf3, 0xa7, 0xfc, 0xd3, 0x91, 0xa5, 0xd2, 0xaa, 0x9f, 0x8d, 0x37, 0xe3, 0x44, 0x39, 0xa1, 0xa3,
+	0xd5, 0x37, 0x7f, 0x69, 0x60, 0xa5, 0x47, 0xa3, 0x99, 0x35, 0x6c, 0x9a, 0x13, 0x94, 0xdc, 0xcf,
+	0xde, 0xee, 0xbe, 0xf6, 0x7a, 0xbb, 0x88, 0x1e, 0xd0, 0x10, 0xc7, 0x03, 0x9b, 0xb2, 0x01, 0x1a,
+	0x90, 0x38, 0x7f, 0xd9, 0x6a, 0xc3, 0x27, 0x01, 0x9f, 0xfe, 0x43, 0x59, 0x57, 0xc6, 0x27, 0xbd,
+	0xb2, 0xd5, 0x6e, 0x7f, 0xd6, 0x6b, 0x5b, 0x92, 0xb0, 0xed, 0x73, 0x5b, 0x9a, 0x99, 0x75, 0xd8,
+	0xb0, 0x8b, 0xc4, 0xfc, 0x9b, 0x82, 0x74, 0xdb, 0x3e, 0xef, 0x96, 0x90, 0xee, 0x61, 0xa3, 0xab,
+	0x20, 0x3f, 0xf5, 0x15, 0xe9, 0x77, 0x9c, 0xb6, 0xcf, 0x1d, 0xa7, 0x04, 0x39, 0xce, 0x61, 0xc3,
+	0x71, 0x14, 0xec, 0x68, 0x2e, 0xaf, 0xf3, 0xd1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x70,
+	0x21, 0x28, 0xf7, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,56 +513,3 @@ var _CustomerFeedService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_feed_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_feed_service.proto", fileDescriptor_customer_feed_service_643a1eae045d32fc)
-}
-
-var fileDescriptor_customer_feed_service_643a1eae045d32fc = []byte{
-	// 710 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0xfe, 0xed, 0xfc, 0x2a, 0x74, 0x5d, 0xa8, 0xb4, 0x55, 0xc1, 0x0a, 0x08, 0x22, 0x53, 0x89,
-	0x2a, 0x07, 0xaf, 0x12, 0x84, 0x8a, 0xdc, 0x46, 0x28, 0x45, 0xa4, 0xed, 0xa1, 0xb4, 0x72, 0x51,
-	0x91, 0x50, 0x24, 0x6b, 0x1b, 0x6f, 0x22, 0xab, 0xb6, 0xd7, 0xec, 0xae, 0x83, 0xaa, 0xaa, 0x17,
-	0xde, 0x00, 0xf1, 0x04, 0x70, 0xe4, 0xce, 0x89, 0x37, 0xe0, 0x86, 0x78, 0x85, 0x9e, 0x78, 0x09,
-	0x90, 0xbd, 0x5e, 0x93, 0xb4, 0x89, 0x02, 0xbd, 0x8d, 0x67, 0xbf, 0xf9, 0x66, 0x66, 0xbf, 0xd9,
-	0x31, 0xd8, 0x18, 0x50, 0x3a, 0x08, 0x09, 0xc2, 0x3e, 0x47, 0xd2, 0xcc, 0xac, 0x61, 0x03, 0x71,
-	0xc2, 0x86, 0x41, 0x8f, 0x70, 0xd4, 0x4b, 0xb9, 0xa0, 0x11, 0x61, 0x5e, 0x9f, 0x10, 0xdf, 0x2b,
-	0xdc, 0x76, 0xc2, 0xa8, 0xa0, 0xb0, 0x26, 0x43, 0x6c, 0xec, 0x73, 0xbb, 0x8c, 0xb6, 0x87, 0x0d,
-	0x5b, 0x45, 0x57, 0x1f, 0x4f, 0xe3, 0x67, 0x84, 0xd3, 0x94, 0x5d, 0x4a, 0x20, 0x89, 0xab, 0x77,
-	0x55, 0x58, 0x12, 0x20, 0x1c, 0xc7, 0x54, 0x60, 0x11, 0xd0, 0x98, 0x17, 0xa7, 0x45, 0x5a, 0x94,
-	0x7f, 0x1d, 0xa5, 0x7d, 0xd4, 0x0f, 0x48, 0xe8, 0x7b, 0x11, 0xe6, 0xc7, 0x05, 0xe2, 0xde, 0x45,
-	0xc4, 0x5b, 0x86, 0x93, 0x84, 0x30, 0xc5, 0x70, 0xbb, 0x38, 0x67, 0x49, 0x0f, 0x71, 0x81, 0x45,
-	0x5a, 0x1c, 0x58, 0x2d, 0x70, 0x6b, 0x8b, 0x88, 0x67, 0x45, 0x49, 0x1d, 0x42, 0x7c, 0x97, 0xbc,
-	0x49, 0x09, 0x17, 0xf0, 0x01, 0xb8, 0xa1, 0x6a, 0xf6, 0x62, 0x1c, 0x11, 0x53, 0xab, 0x69, 0xab,
-	0xf3, 0xee, 0x82, 0x72, 0xbe, 0xc0, 0x11, 0xb1, 0xce, 0x35, 0x50, 0xdd, 0x4d, 0x05, 0x16, 0x64,
-	0x94, 0x82, 0x2b, 0x8e, 0xfb, 0xc0, 0x28, 0xbb, 0x0d, 0xfc, 0x82, 0x01, 0x28, 0xd7, 0x8e, 0x0f,
-	0x5f, 0x01, 0x40, 0x13, 0xc2, 0x64, 0xb7, 0xa6, 0x5e, 0xab, 0xac, 0x1a, 0xcd, 0x35, 0x7b, 0xd6,
-	0x2d, 0xdb, 0xa3, 0xc9, 0xf6, 0x54, 0xbc, 0x3b, 0x42, 0x05, 0x1f, 0x82, 0xc5, 0x04, 0x33, 0x11,
-	0xe0, 0xd0, 0xeb, 0xe3, 0x20, 0x4c, 0x19, 0x31, 0x2b, 0x35, 0x6d, 0xf5, 0xba, 0x7b, 0xb3, 0x70,
-	0x77, 0xa4, 0x37, 0x6b, 0x73, 0x88, 0xc3, 0xc0, 0xc7, 0x82, 0x78, 0x34, 0x0e, 0x4f, 0xcc, 0xff,
-	0x73, 0xd8, 0x82, 0x72, 0xee, 0xc5, 0xe1, 0x89, 0xf5, 0x5e, 0x07, 0xcb, 0x13, 0x73, 0xc2, 0x75,
-	0x60, 0xa4, 0x49, 0x1e, 0x9c, 0xa9, 0x91, 0x07, 0x1b, 0xcd, 0xaa, 0xea, 0x40, 0xc9, 0x61, 0x77,
-	0x32, 0xc1, 0x76, 0x31, 0x3f, 0x76, 0x81, 0x84, 0x67, 0x36, 0xdc, 0x01, 0x73, 0x3d, 0x46, 0xb0,
-	0x90, 0x77, 0x6b, 0x34, 0xd1, 0xd4, 0xce, 0xcb, 0xe9, 0x19, 0x6b, 0x7d, 0xfb, 0x3f, 0xb7, 0x20,
-	0xc8, 0xa8, 0x24, 0xb1, 0xa9, 0x5f, 0x99, 0x4a, 0x12, 0x40, 0x13, 0xcc, 0x31, 0x12, 0xd1, 0xa1,
-	0xbc, 0xb1, 0xf9, 0xec, 0x44, 0x7e, 0x6f, 0x1a, 0x60, 0xbe, 0xbc, 0x62, 0xeb, 0xab, 0x06, 0xee,
-	0x4c, 0x94, 0x9e, 0x27, 0x34, 0xe6, 0x04, 0x76, 0xc0, 0xf2, 0x05, 0x05, 0x3c, 0xc2, 0x18, 0x65,
-	0x39, 0xab, 0xd1, 0x84, 0xaa, 0x40, 0x96, 0xf4, 0xec, 0x83, 0x7c, 0x24, 0xdd, 0xa5, 0x71, 0x6d,
-	0x9e, 0x67, 0x70, 0xf8, 0x12, 0x5c, 0x63, 0x84, 0xa7, 0xa1, 0x50, 0xf3, 0xe1, 0xcc, 0x9e, 0x8f,
-	0xcb, 0x75, 0xb9, 0x39, 0x85, 0xab, 0xa8, 0xac, 0xa7, 0xc0, 0x9c, 0x06, 0xfa, 0xab, 0xc9, 0x6f,
-	0x7e, 0xac, 0x80, 0xa5, 0xd1, 0xd8, 0x03, 0x99, 0x1b, 0x7e, 0xd1, 0xc0, 0xe2, 0x85, 0x17, 0x05,
-	0x9f, 0xcc, 0xae, 0x78, 0xf2, 0x23, 0xac, 0xfe, 0xab, 0x8c, 0xd6, 0xda, 0xbb, 0x1f, 0xe7, 0x1f,
-	0xf4, 0x06, 0x44, 0xd9, 0xce, 0x39, 0x1d, 0x6b, 0xa3, 0xa5, 0xde, 0x1d, 0x47, 0xf5, 0x72, 0x09,
-	0xe5, 0x9a, 0xa1, 0xfa, 0x19, 0xfc, 0xae, 0x81, 0xa5, 0x09, 0x72, 0xc2, 0x8d, 0xab, 0xdc, 0xb6,
-	0x5a, 0x00, 0xd5, 0xd6, 0x15, 0xa3, 0xe5, 0x0c, 0x59, 0xad, 0xbc, 0x9b, 0x35, 0xab, 0x99, 0x75,
-	0xf3, 0xa7, 0xfc, 0xd3, 0x91, 0xa5, 0xd2, 0xaa, 0x9f, 0x8d, 0x37, 0xe3, 0x44, 0x39, 0xa1, 0xa3,
-	0xd5, 0x37, 0x7f, 0x69, 0x60, 0xa5, 0x47, 0xa3, 0x99, 0x35, 0x6c, 0x9a, 0x13, 0x94, 0xdc, 0xcf,
-	0xde, 0xee, 0xbe, 0xf6, 0x7a, 0xbb, 0x88, 0x1e, 0xd0, 0x10, 0xc7, 0x03, 0x9b, 0xb2, 0x01, 0x1a,
-	0x90, 0x38, 0x7f, 0xd9, 0x6a, 0xc3, 0x27, 0x01, 0x9f, 0xfe, 0x43, 0x59, 0x57, 0xc6, 0x27, 0xbd,
-	0xb2, 0xd5, 0x6e, 0x7f, 0xd6, 0x6b, 0x5b, 0x92, 0xb0, 0xed, 0x73, 0x5b, 0x9a, 0x99, 0x75, 0xd8,
-	0xb0, 0x8b, 0xc4, 0xfc, 0x9b, 0x82, 0x74, 0xdb, 0x3e, 0xef, 0x96, 0x90, 0xee, 0x61, 0xa3, 0xab,
-	0x20, 0x3f, 0xf5, 0x15, 0xe9, 0x77, 0x9c, 0xb6, 0xcf, 0x1d, 0xa7, 0x04, 0x39, 0xce, 0x61, 0xc3,
-	0x71, 0x14, 0xec, 0x68, 0x2e, 0xaf, 0xf3, 0xd1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x70,
-	0x21, 0x28, 0xf7, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_label_service.pb.go b/googleapis/ads/googleads/v1/services/customer_label_service.pb.go
index c5166a7aeb..82dc04264d 100644
--- a/googleapis/ads/googleads/v1/services/customer_label_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_label_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_label_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CustomerLabelService.GetCustomerLabel][google.ads.googleads.v1.services.CustomerLabelService.GetCustomerLabel].
 type GetCustomerLabelRequest struct {
@@ -40,16 +40,17 @@ func (m *GetCustomerLabelRequest) Reset()         { *m = GetCustomerLabelRequest
 func (m *GetCustomerLabelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerLabelRequest) ProtoMessage()    {}
 func (*GetCustomerLabelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_label_service_af6ae2408ce6ca33, []int{0}
+	return fileDescriptor_7a3857ac18d66f22, []int{0}
 }
+
 func (m *GetCustomerLabelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerLabelRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerLabelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerLabelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerLabelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerLabelRequest.Merge(dst, src)
+func (m *GetCustomerLabelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerLabelRequest.Merge(m, src)
 }
 func (m *GetCustomerLabelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerLabelRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateCustomerLabelsRequest) Reset()         { *m = MutateCustomerLabel
 func (m *MutateCustomerLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerLabelsRequest) ProtoMessage()    {}
 func (*MutateCustomerLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_label_service_af6ae2408ce6ca33, []int{1}
+	return fileDescriptor_7a3857ac18d66f22, []int{1}
 }
+
 func (m *MutateCustomerLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerLabelsRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomerLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerLabelsRequest.Merge(dst, src)
+func (m *MutateCustomerLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerLabelsRequest.Merge(m, src)
 }
 func (m *MutateCustomerLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerLabelsRequest.Size(m)
@@ -155,16 +157,17 @@ func (m *CustomerLabelOperation) Reset()         { *m = CustomerLabelOperation{}
 func (m *CustomerLabelOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomerLabelOperation) ProtoMessage()    {}
 func (*CustomerLabelOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_label_service_af6ae2408ce6ca33, []int{2}
+	return fileDescriptor_7a3857ac18d66f22, []int{2}
 }
+
 func (m *CustomerLabelOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerLabelOperation.Unmarshal(m, b)
 }
 func (m *CustomerLabelOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerLabelOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomerLabelOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerLabelOperation.Merge(dst, src)
+func (m *CustomerLabelOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerLabelOperation.Merge(m, src)
 }
 func (m *CustomerLabelOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomerLabelOperation.Size(m)
@@ -212,76 +215,14 @@ func (m *CustomerLabelOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomerLabelOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomerLabelOperation_OneofMarshaler, _CustomerLabelOperation_OneofUnmarshaler, _CustomerLabelOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomerLabelOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomerLabelOperation_Create)(nil),
 		(*CustomerLabelOperation_Remove)(nil),
 	}
 }
 
-func _CustomerLabelOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomerLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerLabelOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CustomerLabelOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CustomerLabelOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomerLabelOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomerLabelOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerLabel)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerLabelOperation_Create{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CustomerLabelOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomerLabelOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomerLabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerLabelOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerLabelOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a customer labels mutate.
 type MutateCustomerLabelsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -300,16 +241,17 @@ func (m *MutateCustomerLabelsResponse) Reset()         { *m = MutateCustomerLabe
 func (m *MutateCustomerLabelsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerLabelsResponse) ProtoMessage()    {}
 func (*MutateCustomerLabelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_label_service_af6ae2408ce6ca33, []int{3}
+	return fileDescriptor_7a3857ac18d66f22, []int{3}
 }
+
 func (m *MutateCustomerLabelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerLabelsResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomerLabelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerLabelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerLabelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerLabelsResponse.Merge(dst, src)
+func (m *MutateCustomerLabelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerLabelsResponse.Merge(m, src)
 }
 func (m *MutateCustomerLabelsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerLabelsResponse.Size(m)
@@ -347,16 +289,17 @@ func (m *MutateCustomerLabelResult) Reset()         { *m = MutateCustomerLabelRe
 func (m *MutateCustomerLabelResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerLabelResult) ProtoMessage()    {}
 func (*MutateCustomerLabelResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_label_service_af6ae2408ce6ca33, []int{4}
+	return fileDescriptor_7a3857ac18d66f22, []int{4}
 }
+
 func (m *MutateCustomerLabelResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerLabelResult.Unmarshal(m, b)
 }
 func (m *MutateCustomerLabelResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerLabelResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerLabelResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerLabelResult.Merge(dst, src)
+func (m *MutateCustomerLabelResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerLabelResult.Merge(m, src)
 }
 func (m *MutateCustomerLabelResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerLabelResult.Size(m)
@@ -382,6 +325,56 @@ func init() {
 	proto.RegisterType((*MutateCustomerLabelResult)(nil), "google.ads.googleads.v1.services.MutateCustomerLabelResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_label_service.proto", fileDescriptor_7a3857ac18d66f22)
+}
+
+var fileDescriptor_7a3857ac18d66f22 = []byte{
+	// 663 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6a, 0xd4, 0x4e,
+	0x14, 0xff, 0x27, 0xfb, 0xa7, 0xda, 0xd9, 0xfa, 0xc1, 0x58, 0x6d, 0xba, 0x16, 0x5d, 0x62, 0xc1,
+	0xb2, 0x17, 0x49, 0x77, 0x0b, 0x52, 0x53, 0xb6, 0xb8, 0x15, 0xdb, 0x2a, 0x6a, 0x4b, 0x8a, 0x45,
+	0x64, 0x21, 0x4c, 0x93, 0x69, 0x08, 0x24, 0x99, 0x38, 0x33, 0x59, 0x29, 0xa5, 0x20, 0xde, 0x7a,
+	0xe9, 0x1b, 0x78, 0xd9, 0x37, 0xf0, 0xc2, 0x17, 0xf0, 0x56, 0x7c, 0x03, 0xf1, 0xc2, 0xa7, 0x90,
+	0x64, 0x32, 0xb1, 0x59, 0x77, 0x59, 0xed, 0xdd, 0x99, 0xf3, 0xf1, 0x3b, 0xe7, 0x77, 0x3e, 0x06,
+	0x74, 0x7d, 0x42, 0xfc, 0x10, 0x9b, 0xc8, 0x63, 0xa6, 0x10, 0x33, 0x69, 0xd0, 0x36, 0x19, 0xa6,
+	0x83, 0xc0, 0xc5, 0xcc, 0x74, 0x53, 0xc6, 0x49, 0x84, 0xa9, 0x13, 0xa2, 0x03, 0x1c, 0x3a, 0x85,
+	0xde, 0x48, 0x28, 0xe1, 0x04, 0x36, 0x45, 0x8c, 0x81, 0x3c, 0x66, 0x94, 0xe1, 0xc6, 0xa0, 0x6d,
+	0xc8, 0xf0, 0xc6, 0xbd, 0x71, 0x09, 0x28, 0x66, 0x24, 0xa5, 0x7f, 0x66, 0x10, 0xc8, 0x8d, 0x05,
+	0x19, 0x97, 0x04, 0x26, 0x8a, 0x63, 0xc2, 0x11, 0x0f, 0x48, 0xcc, 0x0a, 0xeb, 0xad, 0xc2, 0x9a,
+	0xbf, 0x0e, 0xd2, 0x43, 0xf3, 0x0d, 0x45, 0x49, 0x82, 0xa9, 0xb4, 0xcf, 0x15, 0x76, 0x9a, 0xb8,
+	0x26, 0xe3, 0x88, 0xa7, 0x85, 0x41, 0x5f, 0x07, 0x73, 0x5b, 0x98, 0x3f, 0x2c, 0x32, 0x3e, 0xcd,
+	0x12, 0xda, 0xf8, 0x75, 0x8a, 0x19, 0x87, 0x77, 0xc0, 0x25, 0x59, 0x93, 0x13, 0xa3, 0x08, 0x6b,
+	0x4a, 0x53, 0x59, 0x9a, 0xb6, 0x67, 0xa4, 0xf2, 0x39, 0x8a, 0xb0, 0xfe, 0x43, 0x01, 0x37, 0x9f,
+	0xa5, 0x1c, 0x71, 0x5c, 0xc1, 0x60, 0x12, 0xe4, 0x36, 0xa8, 0x97, 0x74, 0x02, 0xaf, 0x80, 0x00,
+	0x52, 0xf5, 0xd8, 0x83, 0x2f, 0x01, 0x20, 0x09, 0xa6, 0x82, 0x8d, 0xa6, 0x36, 0x6b, 0x4b, 0xf5,
+	0xce, 0xaa, 0x31, 0xa9, 0x8d, 0x46, 0x25, 0xdb, 0x8e, 0x04, 0xb0, 0xcf, 0x60, 0xc1, 0xbb, 0xe0,
+	0x4a, 0x82, 0x28, 0x0f, 0x50, 0xe8, 0x1c, 0xa2, 0x20, 0x4c, 0x29, 0xd6, 0x6a, 0x4d, 0x65, 0xe9,
+	0xa2, 0x7d, 0xb9, 0x50, 0x6f, 0x0a, 0x6d, 0x46, 0x74, 0x80, 0xc2, 0xc0, 0x43, 0x1c, 0x3b, 0x24,
+	0x0e, 0x8f, 0xb4, 0xff, 0x73, 0xb7, 0x19, 0xa9, 0xdc, 0x89, 0xc3, 0x23, 0xfd, 0xbd, 0x02, 0x6e,
+	0x8c, 0x4e, 0x0a, 0x9f, 0x80, 0x29, 0x97, 0x62, 0xc4, 0x45, 0x87, 0xea, 0x9d, 0xe5, 0xb1, 0xe5,
+	0x97, 0x33, 0xae, 0xd6, 0xbf, 0xfd, 0x9f, 0x5d, 0x20, 0x40, 0x0d, 0x4c, 0x51, 0x1c, 0x91, 0x01,
+	0xd6, 0xd4, 0xac, 0x55, 0x99, 0x45, 0xbc, 0x37, 0xea, 0x60, 0xba, 0x24, 0xa7, 0x7f, 0x56, 0xc0,
+	0xc2, 0xe8, 0xb6, 0xb3, 0x84, 0xc4, 0x0c, 0xc3, 0x4d, 0x70, 0x7d, 0x88, 0xbc, 0x83, 0x29, 0x25,
+	0x34, 0x6f, 0x41, 0xbd, 0x03, 0x65, 0x89, 0x34, 0x71, 0x8d, 0xbd, 0x7c, 0x21, 0xec, 0x6b, 0xd5,
+	0xb6, 0x3c, 0xca, 0xdc, 0xe1, 0x0b, 0x70, 0x81, 0x62, 0x96, 0x86, 0x5c, 0xce, 0x66, 0x6d, 0xf2,
+	0x6c, 0x46, 0x14, 0x66, 0xe7, 0x18, 0xb6, 0xc4, 0xd2, 0x1f, 0x80, 0xf9, 0xb1, 0x5e, 0x7f, 0xb5,
+	0x78, 0x9d, 0xd3, 0x1a, 0x98, 0xad, 0x04, 0xef, 0x89, 0xf4, 0xf0, 0x93, 0x02, 0xae, 0x0e, 0xaf,
+	0x34, 0xbc, 0x3f, 0xb9, 0xea, 0x31, 0x67, 0xd0, 0xf8, 0xe7, 0x69, 0xea, 0xab, 0xef, 0xbe, 0x7e,
+	0xff, 0xa0, 0x76, 0xe0, 0x72, 0x76, 0xd6, 0xc7, 0x15, 0x2a, 0x5d, 0xb9, 0xf9, 0xcc, 0x6c, 0x95,
+	0x77, 0x2e, 0x46, 0x67, 0xb6, 0x4e, 0xe0, 0x37, 0x05, 0xcc, 0x8e, 0x1a, 0x2b, 0xec, 0x9e, 0xab,
+	0xeb, 0xf2, 0x0a, 0x1b, 0xeb, 0xe7, 0x0d, 0x17, 0xdb, 0xa4, 0xaf, 0xe7, 0x8c, 0x56, 0xf5, 0x95,
+	0x8c, 0xd1, 0x6f, 0x0a, 0xc7, 0x67, 0x4e, 0xbb, 0xdb, 0x3a, 0x19, 0x22, 0x64, 0x45, 0x39, 0xa4,
+	0xa5, 0xb4, 0x36, 0xde, 0xaa, 0x60, 0xd1, 0x25, 0xd1, 0xc4, 0x2a, 0x36, 0xe6, 0x47, 0x8d, 0x74,
+	0x37, 0xfb, 0xa9, 0x76, 0x95, 0x57, 0xdb, 0x45, 0xb8, 0x4f, 0x42, 0x14, 0xfb, 0x06, 0xa1, 0xbe,
+	0xe9, 0xe3, 0x38, 0xff, 0xc7, 0xe4, 0x57, 0x9a, 0x04, 0x6c, 0xfc, 0xd7, 0xbd, 0x26, 0x85, 0x8f,
+	0x6a, 0x6d, 0xab, 0xd7, 0x3b, 0x55, 0x9b, 0x5b, 0x02, 0xb0, 0xe7, 0x31, 0x43, 0x88, 0x99, 0xb4,
+	0xdf, 0x36, 0x8a, 0xc4, 0xec, 0x8b, 0x74, 0xe9, 0xf7, 0x3c, 0xd6, 0x2f, 0x5d, 0xfa, 0xfb, 0xed,
+	0xbe, 0x74, 0xf9, 0xa9, 0x2e, 0x0a, 0xbd, 0x65, 0xf5, 0x3c, 0x66, 0x59, 0xa5, 0x93, 0x65, 0xed,
+	0xb7, 0x2d, 0x4b, 0xba, 0x1d, 0x4c, 0xe5, 0x75, 0xae, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xdd,
+	0xb3, 0x0e, 0x47, 0x61, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -492,53 +485,3 @@ var _CustomerLabelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_label_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_label_service.proto", fileDescriptor_customer_label_service_af6ae2408ce6ca33)
-}
-
-var fileDescriptor_customer_label_service_af6ae2408ce6ca33 = []byte{
-	// 663 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6a, 0xd4, 0x4e,
-	0x14, 0xff, 0x27, 0xfb, 0xa7, 0xda, 0xd9, 0xfa, 0xc1, 0x58, 0x6d, 0xba, 0x16, 0x5d, 0x62, 0xc1,
-	0xb2, 0x17, 0x49, 0x77, 0x0b, 0x52, 0x53, 0xb6, 0xb8, 0x15, 0xdb, 0x2a, 0x6a, 0x4b, 0x8a, 0x45,
-	0x64, 0x21, 0x4c, 0x93, 0x69, 0x08, 0x24, 0x99, 0x38, 0x33, 0x59, 0x29, 0xa5, 0x20, 0xde, 0x7a,
-	0xe9, 0x1b, 0x78, 0xd9, 0x37, 0xf0, 0xc2, 0x17, 0xf0, 0x56, 0x7c, 0x03, 0xf1, 0xc2, 0xa7, 0x90,
-	0x64, 0x32, 0xb1, 0x59, 0x77, 0x59, 0xed, 0xdd, 0x99, 0xf3, 0xf1, 0x3b, 0xe7, 0x77, 0x3e, 0x06,
-	0x74, 0x7d, 0x42, 0xfc, 0x10, 0x9b, 0xc8, 0x63, 0xa6, 0x10, 0x33, 0x69, 0xd0, 0x36, 0x19, 0xa6,
-	0x83, 0xc0, 0xc5, 0xcc, 0x74, 0x53, 0xc6, 0x49, 0x84, 0xa9, 0x13, 0xa2, 0x03, 0x1c, 0x3a, 0x85,
-	0xde, 0x48, 0x28, 0xe1, 0x04, 0x36, 0x45, 0x8c, 0x81, 0x3c, 0x66, 0x94, 0xe1, 0xc6, 0xa0, 0x6d,
-	0xc8, 0xf0, 0xc6, 0xbd, 0x71, 0x09, 0x28, 0x66, 0x24, 0xa5, 0x7f, 0x66, 0x10, 0xc8, 0x8d, 0x05,
-	0x19, 0x97, 0x04, 0x26, 0x8a, 0x63, 0xc2, 0x11, 0x0f, 0x48, 0xcc, 0x0a, 0xeb, 0xad, 0xc2, 0x9a,
-	0xbf, 0x0e, 0xd2, 0x43, 0xf3, 0x0d, 0x45, 0x49, 0x82, 0xa9, 0xb4, 0xcf, 0x15, 0x76, 0x9a, 0xb8,
-	0x26, 0xe3, 0x88, 0xa7, 0x85, 0x41, 0x5f, 0x07, 0x73, 0x5b, 0x98, 0x3f, 0x2c, 0x32, 0x3e, 0xcd,
-	0x12, 0xda, 0xf8, 0x75, 0x8a, 0x19, 0x87, 0x77, 0xc0, 0x25, 0x59, 0x93, 0x13, 0xa3, 0x08, 0x6b,
-	0x4a, 0x53, 0x59, 0x9a, 0xb6, 0x67, 0xa4, 0xf2, 0x39, 0x8a, 0xb0, 0xfe, 0x43, 0x01, 0x37, 0x9f,
-	0xa5, 0x1c, 0x71, 0x5c, 0xc1, 0x60, 0x12, 0xe4, 0x36, 0xa8, 0x97, 0x74, 0x02, 0xaf, 0x80, 0x00,
-	0x52, 0xf5, 0xd8, 0x83, 0x2f, 0x01, 0x20, 0x09, 0xa6, 0x82, 0x8d, 0xa6, 0x36, 0x6b, 0x4b, 0xf5,
-	0xce, 0xaa, 0x31, 0xa9, 0x8d, 0x46, 0x25, 0xdb, 0x8e, 0x04, 0xb0, 0xcf, 0x60, 0xc1, 0xbb, 0xe0,
-	0x4a, 0x82, 0x28, 0x0f, 0x50, 0xe8, 0x1c, 0xa2, 0x20, 0x4c, 0x29, 0xd6, 0x6a, 0x4d, 0x65, 0xe9,
-	0xa2, 0x7d, 0xb9, 0x50, 0x6f, 0x0a, 0x6d, 0x46, 0x74, 0x80, 0xc2, 0xc0, 0x43, 0x1c, 0x3b, 0x24,
-	0x0e, 0x8f, 0xb4, 0xff, 0x73, 0xb7, 0x19, 0xa9, 0xdc, 0x89, 0xc3, 0x23, 0xfd, 0xbd, 0x02, 0x6e,
-	0x8c, 0x4e, 0x0a, 0x9f, 0x80, 0x29, 0x97, 0x62, 0xc4, 0x45, 0x87, 0xea, 0x9d, 0xe5, 0xb1, 0xe5,
-	0x97, 0x33, 0xae, 0xd6, 0xbf, 0xfd, 0x9f, 0x5d, 0x20, 0x40, 0x0d, 0x4c, 0x51, 0x1c, 0x91, 0x01,
-	0xd6, 0xd4, 0xac, 0x55, 0x99, 0x45, 0xbc, 0x37, 0xea, 0x60, 0xba, 0x24, 0xa7, 0x7f, 0x56, 0xc0,
-	0xc2, 0xe8, 0xb6, 0xb3, 0x84, 0xc4, 0x0c, 0xc3, 0x4d, 0x70, 0x7d, 0x88, 0xbc, 0x83, 0x29, 0x25,
-	0x34, 0x6f, 0x41, 0xbd, 0x03, 0x65, 0x89, 0x34, 0x71, 0x8d, 0xbd, 0x7c, 0x21, 0xec, 0x6b, 0xd5,
-	0xb6, 0x3c, 0xca, 0xdc, 0xe1, 0x0b, 0x70, 0x81, 0x62, 0x96, 0x86, 0x5c, 0xce, 0x66, 0x6d, 0xf2,
-	0x6c, 0x46, 0x14, 0x66, 0xe7, 0x18, 0xb6, 0xc4, 0xd2, 0x1f, 0x80, 0xf9, 0xb1, 0x5e, 0x7f, 0xb5,
-	0x78, 0x9d, 0xd3, 0x1a, 0x98, 0xad, 0x04, 0xef, 0x89, 0xf4, 0xf0, 0x93, 0x02, 0xae, 0x0e, 0xaf,
-	0x34, 0xbc, 0x3f, 0xb9, 0xea, 0x31, 0x67, 0xd0, 0xf8, 0xe7, 0x69, 0xea, 0xab, 0xef, 0xbe, 0x7e,
-	0xff, 0xa0, 0x76, 0xe0, 0x72, 0x76, 0xd6, 0xc7, 0x15, 0x2a, 0x5d, 0xb9, 0xf9, 0xcc, 0x6c, 0x95,
-	0x77, 0x2e, 0x46, 0x67, 0xb6, 0x4e, 0xe0, 0x37, 0x05, 0xcc, 0x8e, 0x1a, 0x2b, 0xec, 0x9e, 0xab,
-	0xeb, 0xf2, 0x0a, 0x1b, 0xeb, 0xe7, 0x0d, 0x17, 0xdb, 0xa4, 0xaf, 0xe7, 0x8c, 0x56, 0xf5, 0x95,
-	0x8c, 0xd1, 0x6f, 0x0a, 0xc7, 0x67, 0x4e, 0xbb, 0xdb, 0x3a, 0x19, 0x22, 0x64, 0x45, 0x39, 0xa4,
-	0xa5, 0xb4, 0x36, 0xde, 0xaa, 0x60, 0xd1, 0x25, 0xd1, 0xc4, 0x2a, 0x36, 0xe6, 0x47, 0x8d, 0x74,
-	0x37, 0xfb, 0xa9, 0x76, 0x95, 0x57, 0xdb, 0x45, 0xb8, 0x4f, 0x42, 0x14, 0xfb, 0x06, 0xa1, 0xbe,
-	0xe9, 0xe3, 0x38, 0xff, 0xc7, 0xe4, 0x57, 0x9a, 0x04, 0x6c, 0xfc, 0xd7, 0xbd, 0x26, 0x85, 0x8f,
-	0x6a, 0x6d, 0xab, 0xd7, 0x3b, 0x55, 0x9b, 0x5b, 0x02, 0xb0, 0xe7, 0x31, 0x43, 0x88, 0x99, 0xb4,
-	0xdf, 0x36, 0x8a, 0xc4, 0xec, 0x8b, 0x74, 0xe9, 0xf7, 0x3c, 0xd6, 0x2f, 0x5d, 0xfa, 0xfb, 0xed,
-	0xbe, 0x74, 0xf9, 0xa9, 0x2e, 0x0a, 0xbd, 0x65, 0xf5, 0x3c, 0x66, 0x59, 0xa5, 0x93, 0x65, 0xed,
-	0xb7, 0x2d, 0x4b, 0xba, 0x1d, 0x4c, 0xe5, 0x75, 0xae, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xdd,
-	0xb3, 0x0e, 0x47, 0x61, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_manager_link_service.pb.go b/googleapis/ads/googleads/v1/services/customer_manager_link_service.pb.go
index c7763dcdcd..4e1678eac3 100644
--- a/googleapis/ads/googleads/v1/services/customer_manager_link_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_manager_link_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_manager_link_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CustomerManagerLinkService.GetCustomerManagerLink][google.ads.googleads.v1.services.CustomerManagerLinkService.GetCustomerManagerLink].
 type GetCustomerManagerLinkRequest struct {
@@ -39,16 +39,17 @@ func (m *GetCustomerManagerLinkRequest) Reset()         { *m = GetCustomerManage
 func (m *GetCustomerManagerLinkRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerManagerLinkRequest) ProtoMessage()    {}
 func (*GetCustomerManagerLinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_service_89a13cddd5698861, []int{0}
+	return fileDescriptor_aaa2b7db8eabbebe, []int{0}
 }
+
 func (m *GetCustomerManagerLinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerManagerLinkRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerManagerLinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerManagerLinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerManagerLinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerManagerLinkRequest.Merge(dst, src)
+func (m *GetCustomerManagerLinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerManagerLinkRequest.Merge(m, src)
 }
 func (m *GetCustomerManagerLinkRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerManagerLinkRequest.Size(m)
@@ -81,16 +82,17 @@ func (m *MutateCustomerManagerLinkRequest) Reset()         { *m = MutateCustomer
 func (m *MutateCustomerManagerLinkRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerManagerLinkRequest) ProtoMessage()    {}
 func (*MutateCustomerManagerLinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_service_89a13cddd5698861, []int{1}
+	return fileDescriptor_aaa2b7db8eabbebe, []int{1}
 }
+
 func (m *MutateCustomerManagerLinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerManagerLinkRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomerManagerLinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerManagerLinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerManagerLinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerManagerLinkRequest.Merge(dst, src)
+func (m *MutateCustomerManagerLinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerManagerLinkRequest.Merge(m, src)
 }
 func (m *MutateCustomerManagerLinkRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerManagerLinkRequest.Size(m)
@@ -137,16 +139,17 @@ func (m *CustomerManagerLinkOperation) Reset()         { *m = CustomerManagerLin
 func (m *CustomerManagerLinkOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomerManagerLinkOperation) ProtoMessage()    {}
 func (*CustomerManagerLinkOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_service_89a13cddd5698861, []int{2}
+	return fileDescriptor_aaa2b7db8eabbebe, []int{2}
 }
+
 func (m *CustomerManagerLinkOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerManagerLinkOperation.Unmarshal(m, b)
 }
 func (m *CustomerManagerLinkOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerManagerLinkOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomerManagerLinkOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerManagerLinkOperation.Merge(dst, src)
+func (m *CustomerManagerLinkOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerManagerLinkOperation.Merge(m, src)
 }
 func (m *CustomerManagerLinkOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomerManagerLinkOperation.Size(m)
@@ -188,61 +191,13 @@ func (m *CustomerManagerLinkOperation) GetUpdate() *resources.CustomerManagerLin
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomerManagerLinkOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomerManagerLinkOperation_OneofMarshaler, _CustomerManagerLinkOperation_OneofUnmarshaler, _CustomerManagerLinkOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomerManagerLinkOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomerManagerLinkOperation_Update)(nil),
 	}
 }
 
-func _CustomerManagerLinkOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomerManagerLinkOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerManagerLinkOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomerManagerLinkOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomerManagerLinkOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomerManagerLinkOperation)
-	switch tag {
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerManagerLink)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerManagerLinkOperation_Update{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomerManagerLinkOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomerManagerLinkOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerManagerLinkOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a CustomerManagerLink mutate.
 type MutateCustomerManagerLinkResponse struct {
 	// A result that identifies the resource affected by the mutate request.
@@ -256,16 +211,17 @@ func (m *MutateCustomerManagerLinkResponse) Reset()         { *m = MutateCustome
 func (m *MutateCustomerManagerLinkResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerManagerLinkResponse) ProtoMessage()    {}
 func (*MutateCustomerManagerLinkResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_service_89a13cddd5698861, []int{3}
+	return fileDescriptor_aaa2b7db8eabbebe, []int{3}
 }
+
 func (m *MutateCustomerManagerLinkResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerManagerLinkResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomerManagerLinkResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerManagerLinkResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerManagerLinkResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerManagerLinkResponse.Merge(dst, src)
+func (m *MutateCustomerManagerLinkResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerManagerLinkResponse.Merge(m, src)
 }
 func (m *MutateCustomerManagerLinkResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerManagerLinkResponse.Size(m)
@@ -296,16 +252,17 @@ func (m *MutateCustomerManagerLinkResult) Reset()         { *m = MutateCustomerM
 func (m *MutateCustomerManagerLinkResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerManagerLinkResult) ProtoMessage()    {}
 func (*MutateCustomerManagerLinkResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_manager_link_service_89a13cddd5698861, []int{4}
+	return fileDescriptor_aaa2b7db8eabbebe, []int{4}
 }
+
 func (m *MutateCustomerManagerLinkResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerManagerLinkResult.Unmarshal(m, b)
 }
 func (m *MutateCustomerManagerLinkResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerManagerLinkResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerManagerLinkResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerManagerLinkResult.Merge(dst, src)
+func (m *MutateCustomerManagerLinkResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerManagerLinkResult.Merge(m, src)
 }
 func (m *MutateCustomerManagerLinkResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerManagerLinkResult.Size(m)
@@ -331,6 +288,52 @@ func init() {
 	proto.RegisterType((*MutateCustomerManagerLinkResult)(nil), "google.ads.googleads.v1.services.MutateCustomerManagerLinkResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_manager_link_service.proto", fileDescriptor_aaa2b7db8eabbebe)
+}
+
+var fileDescriptor_aaa2b7db8eabbebe = []byte{
+	// 597 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x8b, 0xd3, 0x40,
+	0x14, 0x36, 0xa9, 0xac, 0xec, 0x54, 0x2f, 0x73, 0x90, 0x5a, 0x56, 0x1a, 0xe3, 0x1e, 0x4a, 0x0f,
+	0x13, 0x5a, 0x61, 0xd1, 0x2c, 0xad, 0xa4, 0x5b, 0xb6, 0x2b, 0x58, 0x2d, 0x11, 0x7a, 0xd0, 0x62,
+	0x99, 0x6d, 0x66, 0x43, 0x68, 0x92, 0x89, 0x99, 0x49, 0x2f, 0xcb, 0x82, 0x78, 0xf0, 0x0f, 0xf8,
+	0x0f, 0xf4, 0xe6, 0x4f, 0xf0, 0x27, 0x78, 0x13, 0xcf, 0xde, 0x3c, 0xed, 0xaf, 0x90, 0x64, 0x32,
+	0xb1, 0x42, 0xd3, 0xca, 0xee, 0xed, 0x65, 0xf2, 0xde, 0xf7, 0xbe, 0xef, 0x9b, 0xf7, 0x06, 0x0c,
+	0x5c, 0x4a, 0x5d, 0x9f, 0x18, 0xd8, 0x61, 0x86, 0x08, 0xd3, 0x68, 0xd9, 0x36, 0x18, 0x89, 0x97,
+	0xde, 0x9c, 0x30, 0x63, 0x9e, 0x30, 0x4e, 0x03, 0x12, 0xcf, 0x02, 0x1c, 0x62, 0x97, 0xc4, 0x33,
+	0xdf, 0x0b, 0x17, 0xb3, 0xfc, 0x37, 0x8a, 0x62, 0xca, 0x29, 0xd4, 0x44, 0x29, 0xc2, 0x0e, 0x43,
+	0x05, 0x0a, 0x5a, 0xb6, 0x91, 0x44, 0xa9, 0x77, 0xcb, 0xfa, 0xc4, 0x84, 0xd1, 0x24, 0x2e, 0x6d,
+	0x24, 0x1a, 0xd4, 0xf7, 0x64, 0x79, 0xe4, 0x19, 0x38, 0x0c, 0x29, 0xc7, 0xdc, 0xa3, 0x21, 0xcb,
+	0xff, 0xe6, 0xed, 0x8d, 0xec, 0xeb, 0x34, 0x39, 0x33, 0xce, 0x3c, 0xe2, 0x3b, 0xb3, 0x00, 0xb3,
+	0xbc, 0x5e, 0x1f, 0x80, 0xfb, 0x43, 0xc2, 0x8f, 0xf2, 0x0e, 0x23, 0xd1, 0xe0, 0xb9, 0x17, 0x2e,
+	0x6c, 0xf2, 0x2e, 0x21, 0x8c, 0xc3, 0x87, 0xe0, 0x8e, 0x64, 0x32, 0x0b, 0x71, 0x40, 0x6a, 0x8a,
+	0xa6, 0x34, 0x77, 0xed, 0xdb, 0xf2, 0xf0, 0x05, 0x0e, 0x88, 0xfe, 0x45, 0x01, 0xda, 0x28, 0xe1,
+	0x98, 0x93, 0x0d, 0x48, 0x0d, 0x50, 0x2d, 0x94, 0x78, 0x4e, 0x8e, 0x03, 0xe4, 0xd1, 0x33, 0x07,
+	0xbe, 0x05, 0x80, 0x46, 0x24, 0x16, 0x0a, 0x6a, 0xaa, 0x56, 0x69, 0x56, 0x3b, 0x3d, 0xb4, 0xcd,
+	0x41, 0xb4, 0xa6, 0xe5, 0x4b, 0x09, 0x63, 0xaf, 0x20, 0xea, 0xdf, 0x14, 0xb0, 0xb7, 0x29, 0x19,
+	0x1e, 0x82, 0x6a, 0x12, 0x39, 0x98, 0x93, 0xcc, 0xa1, 0xda, 0x4d, 0x4d, 0x69, 0x56, 0x3b, 0x75,
+	0xc9, 0x40, 0x9a, 0x88, 0x8e, 0x53, 0x13, 0x47, 0x98, 0x2d, 0x6c, 0x20, 0xd2, 0xd3, 0x18, 0x8e,
+	0xc1, 0x8e, 0xf8, 0xaa, 0xa9, 0x59, 0xdd, 0x41, 0x29, 0xf3, 0xe2, 0x66, 0xd7, 0x51, 0x3f, 0xb9,
+	0x61, 0xe7, 0x38, 0xfd, 0x2a, 0xd8, 0x2d, 0xd8, 0xeb, 0xef, 0x15, 0xf0, 0x60, 0x83, 0xc5, 0x2c,
+	0xa2, 0x21, 0x23, 0xf0, 0x0d, 0xb8, 0x15, 0x13, 0x96, 0xf8, 0x9c, 0xd5, 0x94, 0xcc, 0x3f, 0x6b,
+	0xbb, 0x7f, 0x9b, 0x50, 0x13, 0x9f, 0xdb, 0x12, 0x51, 0x3f, 0x06, 0x8d, 0x2d, 0xb9, 0xff, 0x35,
+	0x2d, 0x9d, 0x5f, 0x15, 0x50, 0x5f, 0x03, 0xf1, 0x4a, 0x10, 0x82, 0x3f, 0x14, 0x70, 0x77, 0xfd,
+	0x4c, 0xc2, 0xa7, 0xdb, 0xd5, 0x6c, 0x9c, 0xe6, 0xfa, 0x15, 0x2f, 0x45, 0xef, 0x7d, 0xf8, 0xf9,
+	0xfb, 0x93, 0xfa, 0x18, 0x1e, 0xa4, 0x9b, 0x79, 0xfe, 0x8f, 0xc4, 0xae, 0x9c, 0x60, 0x66, 0xb4,
+	0x8a, 0x55, 0x5d, 0xa9, 0x65, 0x46, 0xeb, 0x02, 0x5e, 0x2a, 0xe0, 0x5e, 0xa9, 0x77, 0xb0, 0x7f,
+	0xad, 0x4b, 0x12, 0xca, 0x8e, 0xae, 0x77, 0xd1, 0xd9, 0xf8, 0xe8, 0x83, 0x4c, 0x66, 0x4f, 0x7f,
+	0x92, 0xca, 0xfc, 0xab, 0xeb, 0x7c, 0x65, 0x6f, 0xbb, 0xad, 0x8b, 0xb5, 0x2a, 0xcd, 0x20, 0x43,
+	0x37, 0x95, 0x56, 0xff, 0xa3, 0x0a, 0xf6, 0xe7, 0x34, 0xd8, 0x4a, 0xa8, 0xdf, 0x28, 0x9f, 0x82,
+	0x71, 0xba, 0x6c, 0x63, 0xe5, 0xf5, 0x49, 0x0e, 0xe2, 0x52, 0x1f, 0x87, 0x2e, 0xa2, 0xb1, 0x6b,
+	0xb8, 0x24, 0xcc, 0x56, 0x51, 0x3e, 0x97, 0x91, 0xc7, 0xca, 0x5f, 0xe9, 0x43, 0x19, 0x7c, 0x56,
+	0x2b, 0x43, 0xcb, 0xfa, 0xaa, 0x6a, 0x43, 0x01, 0x68, 0x39, 0x0c, 0x89, 0x30, 0x8d, 0x26, 0x6d,
+	0x94, 0x37, 0x66, 0xdf, 0x65, 0xca, 0xd4, 0x72, 0xd8, 0xb4, 0x48, 0x99, 0x4e, 0xda, 0x53, 0x99,
+	0x72, 0xa9, 0xee, 0x8b, 0x73, 0xd3, 0xb4, 0x1c, 0x66, 0x9a, 0x45, 0x92, 0x69, 0x4e, 0xda, 0xa6,
+	0x29, 0xd3, 0x4e, 0x77, 0x32, 0x9e, 0x8f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xb5, 0x81,
+	0xa2, 0x4c, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -439,49 +442,3 @@ var _CustomerManagerLinkService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_manager_link_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_manager_link_service.proto", fileDescriptor_customer_manager_link_service_89a13cddd5698861)
-}
-
-var fileDescriptor_customer_manager_link_service_89a13cddd5698861 = []byte{
-	// 597 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0x36, 0xa9, 0xac, 0xec, 0x54, 0x2f, 0x73, 0x90, 0x5a, 0x56, 0x1a, 0xe3, 0x1e, 0x4a, 0x0f,
-	0x13, 0x5a, 0x61, 0xd1, 0x2c, 0xad, 0xa4, 0x5b, 0xb6, 0x2b, 0x58, 0x2d, 0x11, 0x7a, 0xd0, 0x62,
-	0x99, 0x6d, 0x66, 0x43, 0x68, 0x92, 0x89, 0x99, 0x49, 0x2f, 0xcb, 0x82, 0x78, 0xf0, 0x0f, 0xf8,
-	0x0f, 0xf4, 0xe6, 0x4f, 0xf0, 0x27, 0x78, 0x13, 0xcf, 0xde, 0x3c, 0xed, 0xaf, 0x90, 0x64, 0x32,
-	0xb1, 0x42, 0xd3, 0xca, 0xee, 0xed, 0x65, 0xf2, 0xde, 0xf7, 0xbe, 0xef, 0x9b, 0xf7, 0x06, 0x0c,
-	0x5c, 0x4a, 0x5d, 0x9f, 0x18, 0xd8, 0x61, 0x86, 0x08, 0xd3, 0x68, 0xd9, 0x36, 0x18, 0x89, 0x97,
-	0xde, 0x9c, 0x30, 0x63, 0x9e, 0x30, 0x4e, 0x03, 0x12, 0xcf, 0x02, 0x1c, 0x62, 0x97, 0xc4, 0x33,
-	0xdf, 0x0b, 0x17, 0xb3, 0xfc, 0x37, 0x8a, 0x62, 0xca, 0x29, 0xd4, 0x44, 0x29, 0xc2, 0x0e, 0x43,
-	0x05, 0x0a, 0x5a, 0xb6, 0x91, 0x44, 0xa9, 0x77, 0xcb, 0xfa, 0xc4, 0x84, 0xd1, 0x24, 0x2e, 0x6d,
-	0x24, 0x1a, 0xd4, 0xf7, 0x64, 0x79, 0xe4, 0x19, 0x38, 0x0c, 0x29, 0xc7, 0xdc, 0xa3, 0x21, 0xcb,
-	0xff, 0xe6, 0xed, 0x8d, 0xec, 0xeb, 0x34, 0x39, 0x33, 0xce, 0x3c, 0xe2, 0x3b, 0xb3, 0x00, 0xb3,
-	0xbc, 0x5e, 0x1f, 0x80, 0xfb, 0x43, 0xc2, 0x8f, 0xf2, 0x0e, 0x23, 0xd1, 0xe0, 0xb9, 0x17, 0x2e,
-	0x6c, 0xf2, 0x2e, 0x21, 0x8c, 0xc3, 0x87, 0xe0, 0x8e, 0x64, 0x32, 0x0b, 0x71, 0x40, 0x6a, 0x8a,
-	0xa6, 0x34, 0x77, 0xed, 0xdb, 0xf2, 0xf0, 0x05, 0x0e, 0x88, 0xfe, 0x45, 0x01, 0xda, 0x28, 0xe1,
-	0x98, 0x93, 0x0d, 0x48, 0x0d, 0x50, 0x2d, 0x94, 0x78, 0x4e, 0x8e, 0x03, 0xe4, 0xd1, 0x33, 0x07,
-	0xbe, 0x05, 0x80, 0x46, 0x24, 0x16, 0x0a, 0x6a, 0xaa, 0x56, 0x69, 0x56, 0x3b, 0x3d, 0xb4, 0xcd,
-	0x41, 0xb4, 0xa6, 0xe5, 0x4b, 0x09, 0x63, 0xaf, 0x20, 0xea, 0xdf, 0x14, 0xb0, 0xb7, 0x29, 0x19,
-	0x1e, 0x82, 0x6a, 0x12, 0x39, 0x98, 0x93, 0xcc, 0xa1, 0xda, 0x4d, 0x4d, 0x69, 0x56, 0x3b, 0x75,
-	0xc9, 0x40, 0x9a, 0x88, 0x8e, 0x53, 0x13, 0x47, 0x98, 0x2d, 0x6c, 0x20, 0xd2, 0xd3, 0x18, 0x8e,
-	0xc1, 0x8e, 0xf8, 0xaa, 0xa9, 0x59, 0xdd, 0x41, 0x29, 0xf3, 0xe2, 0x66, 0xd7, 0x51, 0x3f, 0xb9,
-	0x61, 0xe7, 0x38, 0xfd, 0x2a, 0xd8, 0x2d, 0xd8, 0xeb, 0xef, 0x15, 0xf0, 0x60, 0x83, 0xc5, 0x2c,
-	0xa2, 0x21, 0x23, 0xf0, 0x0d, 0xb8, 0x15, 0x13, 0x96, 0xf8, 0x9c, 0xd5, 0x94, 0xcc, 0x3f, 0x6b,
-	0xbb, 0x7f, 0x9b, 0x50, 0x13, 0x9f, 0xdb, 0x12, 0x51, 0x3f, 0x06, 0x8d, 0x2d, 0xb9, 0xff, 0x35,
-	0x2d, 0x9d, 0x5f, 0x15, 0x50, 0x5f, 0x03, 0xf1, 0x4a, 0x10, 0x82, 0x3f, 0x14, 0x70, 0x77, 0xfd,
-	0x4c, 0xc2, 0xa7, 0xdb, 0xd5, 0x6c, 0x9c, 0xe6, 0xfa, 0x15, 0x2f, 0x45, 0xef, 0x7d, 0xf8, 0xf9,
-	0xfb, 0x93, 0xfa, 0x18, 0x1e, 0xa4, 0x9b, 0x79, 0xfe, 0x8f, 0xc4, 0xae, 0x9c, 0x60, 0x66, 0xb4,
-	0x8a, 0x55, 0x5d, 0xa9, 0x65, 0x46, 0xeb, 0x02, 0x5e, 0x2a, 0xe0, 0x5e, 0xa9, 0x77, 0xb0, 0x7f,
-	0xad, 0x4b, 0x12, 0xca, 0x8e, 0xae, 0x77, 0xd1, 0xd9, 0xf8, 0xe8, 0x83, 0x4c, 0x66, 0x4f, 0x7f,
-	0x92, 0xca, 0xfc, 0xab, 0xeb, 0x7c, 0x65, 0x6f, 0xbb, 0xad, 0x8b, 0xb5, 0x2a, 0xcd, 0x20, 0x43,
-	0x37, 0x95, 0x56, 0xff, 0xa3, 0x0a, 0xf6, 0xe7, 0x34, 0xd8, 0x4a, 0xa8, 0xdf, 0x28, 0x9f, 0x82,
-	0x71, 0xba, 0x6c, 0x63, 0xe5, 0xf5, 0x49, 0x0e, 0xe2, 0x52, 0x1f, 0x87, 0x2e, 0xa2, 0xb1, 0x6b,
-	0xb8, 0x24, 0xcc, 0x56, 0x51, 0x3e, 0x97, 0x91, 0xc7, 0xca, 0x5f, 0xe9, 0x43, 0x19, 0x7c, 0x56,
-	0x2b, 0x43, 0xcb, 0xfa, 0xaa, 0x6a, 0x43, 0x01, 0x68, 0x39, 0x0c, 0x89, 0x30, 0x8d, 0x26, 0x6d,
-	0x94, 0x37, 0x66, 0xdf, 0x65, 0xca, 0xd4, 0x72, 0xd8, 0xb4, 0x48, 0x99, 0x4e, 0xda, 0x53, 0x99,
-	0x72, 0xa9, 0xee, 0x8b, 0x73, 0xd3, 0xb4, 0x1c, 0x66, 0x9a, 0x45, 0x92, 0x69, 0x4e, 0xda, 0xa6,
-	0x29, 0xd3, 0x4e, 0x77, 0x32, 0x9e, 0x8f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xb5, 0x81,
-	0xa2, 0x4c, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_negative_criterion_service.pb.go b/googleapis/ads/googleads/v1/services/customer_negative_criterion_service.pb.go
index 13e3e27d81..7fc65b2eff 100644
--- a/googleapis/ads/googleads/v1/services/customer_negative_criterion_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_negative_criterion_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_negative_criterion_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [CustomerNegativeCriterionService.GetCustomerNegativeCriterion][google.ads.googleads.v1.services.CustomerNegativeCriterionService.GetCustomerNegativeCriterion].
@@ -41,16 +41,17 @@ func (m *GetCustomerNegativeCriterionRequest) Reset()         { *m = GetCustomer
 func (m *GetCustomerNegativeCriterionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerNegativeCriterionRequest) ProtoMessage()    {}
 func (*GetCustomerNegativeCriterionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_negative_criterion_service_bef57624ec14ad68, []int{0}
+	return fileDescriptor_d21e22dd7a1998fe, []int{0}
 }
+
 func (m *GetCustomerNegativeCriterionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerNegativeCriterionRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerNegativeCriterionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerNegativeCriterionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerNegativeCriterionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerNegativeCriterionRequest.Merge(dst, src)
+func (m *GetCustomerNegativeCriterionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerNegativeCriterionRequest.Merge(m, src)
 }
 func (m *GetCustomerNegativeCriterionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerNegativeCriterionRequest.Size(m)
@@ -92,16 +93,17 @@ func (m *MutateCustomerNegativeCriteriaRequest) Reset()         { *m = MutateCus
 func (m *MutateCustomerNegativeCriteriaRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerNegativeCriteriaRequest) ProtoMessage()    {}
 func (*MutateCustomerNegativeCriteriaRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_negative_criterion_service_bef57624ec14ad68, []int{1}
+	return fileDescriptor_d21e22dd7a1998fe, []int{1}
 }
+
 func (m *MutateCustomerNegativeCriteriaRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomerNegativeCriteriaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerNegativeCriteriaRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerNegativeCriteriaRequest.Merge(dst, src)
+func (m *MutateCustomerNegativeCriteriaRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerNegativeCriteriaRequest.Merge(m, src)
 }
 func (m *MutateCustomerNegativeCriteriaRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaRequest.Size(m)
@@ -157,16 +159,17 @@ func (m *CustomerNegativeCriterionOperation) Reset()         { *m = CustomerNega
 func (m *CustomerNegativeCriterionOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomerNegativeCriterionOperation) ProtoMessage()    {}
 func (*CustomerNegativeCriterionOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_negative_criterion_service_bef57624ec14ad68, []int{2}
+	return fileDescriptor_d21e22dd7a1998fe, []int{2}
 }
+
 func (m *CustomerNegativeCriterionOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerNegativeCriterionOperation.Unmarshal(m, b)
 }
 func (m *CustomerNegativeCriterionOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerNegativeCriterionOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomerNegativeCriterionOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerNegativeCriterionOperation.Merge(dst, src)
+func (m *CustomerNegativeCriterionOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerNegativeCriterionOperation.Merge(m, src)
 }
 func (m *CustomerNegativeCriterionOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomerNegativeCriterionOperation.Size(m)
@@ -214,76 +217,14 @@ func (m *CustomerNegativeCriterionOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomerNegativeCriterionOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomerNegativeCriterionOperation_OneofMarshaler, _CustomerNegativeCriterionOperation_OneofUnmarshaler, _CustomerNegativeCriterionOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomerNegativeCriterionOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomerNegativeCriterionOperation_Create)(nil),
 		(*CustomerNegativeCriterionOperation_Remove)(nil),
 	}
 }
 
-func _CustomerNegativeCriterionOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomerNegativeCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerNegativeCriterionOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *CustomerNegativeCriterionOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("CustomerNegativeCriterionOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomerNegativeCriterionOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomerNegativeCriterionOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.CustomerNegativeCriterion)
-		err := b.DecodeMessage(msg)
-		m.Operation = &CustomerNegativeCriterionOperation_Create{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &CustomerNegativeCriterionOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomerNegativeCriterionOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomerNegativeCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *CustomerNegativeCriterionOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomerNegativeCriterionOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for customer negative criterion mutate.
 type MutateCustomerNegativeCriteriaResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -304,16 +245,17 @@ func (m *MutateCustomerNegativeCriteriaResponse) Reset() {
 func (m *MutateCustomerNegativeCriteriaResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerNegativeCriteriaResponse) ProtoMessage()    {}
 func (*MutateCustomerNegativeCriteriaResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_negative_criterion_service_bef57624ec14ad68, []int{3}
+	return fileDescriptor_d21e22dd7a1998fe, []int{3}
 }
+
 func (m *MutateCustomerNegativeCriteriaResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomerNegativeCriteriaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerNegativeCriteriaResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerNegativeCriteriaResponse.Merge(dst, src)
+func (m *MutateCustomerNegativeCriteriaResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerNegativeCriteriaResponse.Merge(m, src)
 }
 func (m *MutateCustomerNegativeCriteriaResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaResponse.Size(m)
@@ -351,16 +293,17 @@ func (m *MutateCustomerNegativeCriteriaResult) Reset()         { *m = MutateCust
 func (m *MutateCustomerNegativeCriteriaResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerNegativeCriteriaResult) ProtoMessage()    {}
 func (*MutateCustomerNegativeCriteriaResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_negative_criterion_service_bef57624ec14ad68, []int{4}
+	return fileDescriptor_d21e22dd7a1998fe, []int{4}
 }
+
 func (m *MutateCustomerNegativeCriteriaResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaResult.Unmarshal(m, b)
 }
 func (m *MutateCustomerNegativeCriteriaResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerNegativeCriteriaResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerNegativeCriteriaResult.Merge(dst, src)
+func (m *MutateCustomerNegativeCriteriaResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerNegativeCriteriaResult.Merge(m, src)
 }
 func (m *MutateCustomerNegativeCriteriaResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerNegativeCriteriaResult.Size(m)
@@ -386,6 +329,56 @@ func init() {
 	proto.RegisterType((*MutateCustomerNegativeCriteriaResult)(nil), "google.ads.googleads.v1.services.MutateCustomerNegativeCriteriaResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_negative_criterion_service.proto", fileDescriptor_d21e22dd7a1998fe)
+}
+
+var fileDescriptor_d21e22dd7a1998fe = []byte{
+	// 670 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6b, 0xd4, 0x40,
+	0x14, 0x37, 0x69, 0xa9, 0x76, 0xb6, 0x2a, 0x8c, 0x88, 0x4b, 0x29, 0x75, 0x49, 0x5b, 0x2d, 0x7b,
+	0x48, 0xd8, 0xf5, 0x16, 0xdb, 0xc3, 0x6e, 0x6d, 0x77, 0xad, 0xd8, 0x96, 0x14, 0xf6, 0x20, 0x0b,
+	0x71, 0x9a, 0xbc, 0x86, 0x40, 0x36, 0x13, 0x67, 0x26, 0x91, 0x52, 0x7a, 0xf1, 0xdc, 0x9b, 0xdf,
+	0x40, 0x6f, 0x7e, 0x14, 0x8f, 0xfa, 0x15, 0x04, 0xc1, 0xcf, 0xa0, 0x20, 0xf9, 0x33, 0xb1, 0x2d,
+	0xa4, 0x59, 0xa8, 0xb7, 0x97, 0xf7, 0x5e, 0x7e, 0xef, 0xfd, 0x7e, 0xf3, 0xe6, 0x0d, 0xda, 0xf5,
+	0x28, 0xf5, 0x02, 0x30, 0x88, 0xcb, 0x8d, 0xdc, 0x4c, 0xad, 0xa4, 0x63, 0x70, 0x60, 0x89, 0xef,
+	0x00, 0x37, 0x9c, 0x98, 0x0b, 0x3a, 0x01, 0x66, 0x87, 0xe0, 0x11, 0xe1, 0x27, 0x60, 0x3b, 0xcc,
+	0x17, 0xc0, 0x7c, 0x1a, 0xda, 0x45, 0x92, 0x1e, 0x31, 0x2a, 0x28, 0x6e, 0xe5, 0x00, 0x3a, 0x71,
+	0xb9, 0x5e, 0x62, 0xe9, 0x49, 0x47, 0x97, 0x58, 0x8b, 0x5b, 0x55, 0xd5, 0x18, 0x70, 0x1a, 0xb3,
+	0x9a, 0x72, 0x79, 0x99, 0xc5, 0x25, 0x09, 0x12, 0xf9, 0x06, 0x09, 0x43, 0x2a, 0x88, 0xf0, 0x69,
+	0xc8, 0x8b, 0xe8, 0x72, 0x11, 0xcd, 0xbe, 0x8e, 0xe2, 0x63, 0xe3, 0x3d, 0x23, 0x51, 0x04, 0x4c,
+	0xc6, 0x1f, 0x15, 0x71, 0x16, 0x39, 0x06, 0x17, 0x44, 0xc4, 0x45, 0x40, 0xdb, 0x45, 0x2b, 0x03,
+	0x10, 0x5b, 0x45, 0xf9, 0xbd, 0xa2, 0xfa, 0x96, 0x2c, 0x6e, 0xc1, 0xbb, 0x18, 0xb8, 0xc0, 0x2b,
+	0xe8, 0xae, 0x6c, 0xd6, 0x0e, 0xc9, 0x04, 0x9a, 0x4a, 0x4b, 0x59, 0x9f, 0xb7, 0x16, 0xa4, 0x73,
+	0x8f, 0x4c, 0x40, 0xfb, 0xad, 0xa0, 0xb5, 0xd7, 0xb1, 0x20, 0x02, 0x2a, 0xf0, 0x88, 0x84, 0x7b,
+	0x8c, 0x1a, 0x25, 0x63, 0xdf, 0x2d, 0xc0, 0x90, 0x74, 0xbd, 0x74, 0xb1, 0x8b, 0x10, 0x8d, 0x80,
+	0xe5, 0x1c, 0x9b, 0x6a, 0x6b, 0x66, 0xbd, 0xd1, 0x7d, 0xa1, 0xd7, 0x29, 0xad, 0x57, 0xf2, 0xd8,
+	0x97, 0x60, 0xd6, 0x05, 0x5c, 0xfc, 0x14, 0xdd, 0x8f, 0x08, 0x13, 0x3e, 0x09, 0xec, 0x63, 0xe2,
+	0x07, 0x31, 0x83, 0xe6, 0x4c, 0x4b, 0x59, 0xbf, 0x63, 0xdd, 0x2b, 0xdc, 0x3b, 0xb9, 0x37, 0xa5,
+	0x9f, 0x90, 0xc0, 0x77, 0x89, 0x00, 0x9b, 0x86, 0xc1, 0x49, 0x73, 0x36, 0x4b, 0x5b, 0x90, 0xce,
+	0xfd, 0x30, 0x38, 0xd1, 0x3e, 0x2b, 0x48, 0xab, 0x6f, 0x00, 0x8f, 0xd0, 0x9c, 0xc3, 0x80, 0x88,
+	0x5c, 0xc3, 0x46, 0x77, 0xa3, 0x92, 0x56, 0x39, 0x1e, 0xd5, 0xbc, 0x86, 0xb7, 0xac, 0x02, 0x0d,
+	0x37, 0xd1, 0x1c, 0x83, 0x09, 0x4d, 0xa0, 0xa9, 0xa6, 0x72, 0xa6, 0x91, 0xfc, 0xbb, 0xdf, 0x40,
+	0xf3, 0x25, 0x69, 0xed, 0x9b, 0x82, 0x9e, 0xd4, 0x1d, 0x12, 0x8f, 0x68, 0xc8, 0x01, 0xef, 0xa0,
+	0x87, 0x57, 0xe4, 0xb1, 0x81, 0x31, 0xca, 0x32, 0x91, 0x1a, 0x5d, 0x2c, 0x1b, 0x67, 0x91, 0xa3,
+	0x1f, 0x66, 0x43, 0x65, 0x3d, 0xb8, 0x2c, 0xdc, 0x76, 0x9a, 0x8e, 0xdf, 0xa2, 0xdb, 0x0c, 0x78,
+	0x1c, 0x08, 0x79, 0x92, 0x3b, 0xf5, 0x27, 0x59, 0xdb, 0x62, 0x1c, 0x08, 0x4b, 0xc2, 0x6a, 0xaf,
+	0xd0, 0xea, 0x34, 0x3f, 0x4c, 0x35, 0xc6, 0xdd, 0xf3, 0x59, 0xd4, 0xaa, 0x14, 0xfc, 0x30, 0x6f,
+	0x10, 0xff, 0x54, 0xd0, 0xd2, 0x75, 0x17, 0x07, 0x6f, 0xd7, 0x73, 0x9c, 0xe2, 0xe2, 0x2d, 0xde,
+	0x68, 0x3a, 0xb4, 0xfe, 0x87, 0xef, 0x3f, 0x3e, 0xaa, 0x1b, 0xd8, 0x4c, 0xb7, 0xcd, 0xe9, 0x25,
+	0xea, 0x9b, 0xf2, 0xb6, 0x71, 0xa3, 0x5d, 0xae, 0x9f, 0xab, 0xb2, 0x19, 0xed, 0x33, 0xfc, 0x47,
+	0x41, 0xcb, 0xd7, 0x8b, 0x8b, 0x07, 0x37, 0x3f, 0xcf, 0x9c, 0xed, 0xf0, 0x3f, 0x0c, 0x46, 0x36,
+	0xbb, 0xda, 0x30, 0x63, 0xde, 0xd7, 0x36, 0x53, 0xe6, 0xff, 0xa8, 0x9e, 0x5e, 0x58, 0x3b, 0x9b,
+	0xed, 0xb3, 0x4a, 0xe2, 0xe6, 0x24, 0x2b, 0x63, 0x2a, 0xed, 0xfe, 0xb9, 0x8a, 0x56, 0x1d, 0x3a,
+	0xa9, 0xed, 0xac, 0xbf, 0x56, 0x37, 0x34, 0x07, 0xe9, 0xc6, 0x3d, 0x50, 0xde, 0x0c, 0x0b, 0x28,
+	0x8f, 0x06, 0x24, 0xf4, 0x74, 0xca, 0x3c, 0xc3, 0x83, 0x30, 0xdb, 0xc7, 0xf2, 0x7d, 0x88, 0x7c,
+	0x5e, 0xfd, 0x38, 0x3d, 0x97, 0xc6, 0x27, 0x75, 0x66, 0xd0, 0xeb, 0x7d, 0x51, 0x5b, 0x83, 0x1c,
+	0xb0, 0xe7, 0x72, 0x3d, 0x37, 0x53, 0x6b, 0xd4, 0xd1, 0x8b, 0xc2, 0xfc, 0xab, 0x4c, 0x19, 0xf7,
+	0x5c, 0x3e, 0x2e, 0x53, 0xc6, 0xa3, 0xce, 0x58, 0xa6, 0xfc, 0x52, 0x57, 0x73, 0xbf, 0x69, 0xf6,
+	0x5c, 0x6e, 0x9a, 0x65, 0x92, 0x69, 0x8e, 0x3a, 0xa6, 0x29, 0xd3, 0x8e, 0xe6, 0xb2, 0x3e, 0x9f,
+	0xfd, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x87, 0xdb, 0xa3, 0xde, 0x43, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -494,53 +487,3 @@ var _CustomerNegativeCriterionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_negative_criterion_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_negative_criterion_service.proto", fileDescriptor_customer_negative_criterion_service_bef57624ec14ad68)
-}
-
-var fileDescriptor_customer_negative_criterion_service_bef57624ec14ad68 = []byte{
-	// 670 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6b, 0xd4, 0x40,
-	0x14, 0x37, 0x69, 0xa9, 0x76, 0xb6, 0x2a, 0x8c, 0x88, 0x4b, 0x29, 0x75, 0x49, 0x5b, 0x2d, 0x7b,
-	0x48, 0xd8, 0xf5, 0x16, 0xdb, 0xc3, 0x6e, 0x6d, 0x77, 0xad, 0xd8, 0x96, 0x14, 0xf6, 0x20, 0x0b,
-	0x71, 0x9a, 0xbc, 0x86, 0x40, 0x36, 0x13, 0x67, 0x26, 0x91, 0x52, 0x7a, 0xf1, 0xdc, 0x9b, 0xdf,
-	0x40, 0x6f, 0x7e, 0x14, 0x8f, 0xfa, 0x15, 0x04, 0xc1, 0xcf, 0xa0, 0x20, 0xf9, 0x33, 0xb1, 0x2d,
-	0xa4, 0x59, 0xa8, 0xb7, 0x97, 0xf7, 0x5e, 0x7e, 0xef, 0xfd, 0x7e, 0xf3, 0xe6, 0x0d, 0xda, 0xf5,
-	0x28, 0xf5, 0x02, 0x30, 0x88, 0xcb, 0x8d, 0xdc, 0x4c, 0xad, 0xa4, 0x63, 0x70, 0x60, 0x89, 0xef,
-	0x00, 0x37, 0x9c, 0x98, 0x0b, 0x3a, 0x01, 0x66, 0x87, 0xe0, 0x11, 0xe1, 0x27, 0x60, 0x3b, 0xcc,
-	0x17, 0xc0, 0x7c, 0x1a, 0xda, 0x45, 0x92, 0x1e, 0x31, 0x2a, 0x28, 0x6e, 0xe5, 0x00, 0x3a, 0x71,
-	0xb9, 0x5e, 0x62, 0xe9, 0x49, 0x47, 0x97, 0x58, 0x8b, 0x5b, 0x55, 0xd5, 0x18, 0x70, 0x1a, 0xb3,
-	0x9a, 0x72, 0x79, 0x99, 0xc5, 0x25, 0x09, 0x12, 0xf9, 0x06, 0x09, 0x43, 0x2a, 0x88, 0xf0, 0x69,
-	0xc8, 0x8b, 0xe8, 0x72, 0x11, 0xcd, 0xbe, 0x8e, 0xe2, 0x63, 0xe3, 0x3d, 0x23, 0x51, 0x04, 0x4c,
-	0xc6, 0x1f, 0x15, 0x71, 0x16, 0x39, 0x06, 0x17, 0x44, 0xc4, 0x45, 0x40, 0xdb, 0x45, 0x2b, 0x03,
-	0x10, 0x5b, 0x45, 0xf9, 0xbd, 0xa2, 0xfa, 0x96, 0x2c, 0x6e, 0xc1, 0xbb, 0x18, 0xb8, 0xc0, 0x2b,
-	0xe8, 0xae, 0x6c, 0xd6, 0x0e, 0xc9, 0x04, 0x9a, 0x4a, 0x4b, 0x59, 0x9f, 0xb7, 0x16, 0xa4, 0x73,
-	0x8f, 0x4c, 0x40, 0xfb, 0xad, 0xa0, 0xb5, 0xd7, 0xb1, 0x20, 0x02, 0x2a, 0xf0, 0x88, 0x84, 0x7b,
-	0x8c, 0x1a, 0x25, 0x63, 0xdf, 0x2d, 0xc0, 0x90, 0x74, 0xbd, 0x74, 0xb1, 0x8b, 0x10, 0x8d, 0x80,
-	0xe5, 0x1c, 0x9b, 0x6a, 0x6b, 0x66, 0xbd, 0xd1, 0x7d, 0xa1, 0xd7, 0x29, 0xad, 0x57, 0xf2, 0xd8,
-	0x97, 0x60, 0xd6, 0x05, 0x5c, 0xfc, 0x14, 0xdd, 0x8f, 0x08, 0x13, 0x3e, 0x09, 0xec, 0x63, 0xe2,
-	0x07, 0x31, 0x83, 0xe6, 0x4c, 0x4b, 0x59, 0xbf, 0x63, 0xdd, 0x2b, 0xdc, 0x3b, 0xb9, 0x37, 0xa5,
-	0x9f, 0x90, 0xc0, 0x77, 0x89, 0x00, 0x9b, 0x86, 0xc1, 0x49, 0x73, 0x36, 0x4b, 0x5b, 0x90, 0xce,
-	0xfd, 0x30, 0x38, 0xd1, 0x3e, 0x2b, 0x48, 0xab, 0x6f, 0x00, 0x8f, 0xd0, 0x9c, 0xc3, 0x80, 0x88,
-	0x5c, 0xc3, 0x46, 0x77, 0xa3, 0x92, 0x56, 0x39, 0x1e, 0xd5, 0xbc, 0x86, 0xb7, 0xac, 0x02, 0x0d,
-	0x37, 0xd1, 0x1c, 0x83, 0x09, 0x4d, 0xa0, 0xa9, 0xa6, 0x72, 0xa6, 0x91, 0xfc, 0xbb, 0xdf, 0x40,
-	0xf3, 0x25, 0x69, 0xed, 0x9b, 0x82, 0x9e, 0xd4, 0x1d, 0x12, 0x8f, 0x68, 0xc8, 0x01, 0xef, 0xa0,
-	0x87, 0x57, 0xe4, 0xb1, 0x81, 0x31, 0xca, 0x32, 0x91, 0x1a, 0x5d, 0x2c, 0x1b, 0x67, 0x91, 0xa3,
-	0x1f, 0x66, 0x43, 0x65, 0x3d, 0xb8, 0x2c, 0xdc, 0x76, 0x9a, 0x8e, 0xdf, 0xa2, 0xdb, 0x0c, 0x78,
-	0x1c, 0x08, 0x79, 0x92, 0x3b, 0xf5, 0x27, 0x59, 0xdb, 0x62, 0x1c, 0x08, 0x4b, 0xc2, 0x6a, 0xaf,
-	0xd0, 0xea, 0x34, 0x3f, 0x4c, 0x35, 0xc6, 0xdd, 0xf3, 0x59, 0xd4, 0xaa, 0x14, 0xfc, 0x30, 0x6f,
-	0x10, 0xff, 0x54, 0xd0, 0xd2, 0x75, 0x17, 0x07, 0x6f, 0xd7, 0x73, 0x9c, 0xe2, 0xe2, 0x2d, 0xde,
-	0x68, 0x3a, 0xb4, 0xfe, 0x87, 0xef, 0x3f, 0x3e, 0xaa, 0x1b, 0xd8, 0x4c, 0xb7, 0xcd, 0xe9, 0x25,
-	0xea, 0x9b, 0xf2, 0xb6, 0x71, 0xa3, 0x5d, 0xae, 0x9f, 0xab, 0xb2, 0x19, 0xed, 0x33, 0xfc, 0x47,
-	0x41, 0xcb, 0xd7, 0x8b, 0x8b, 0x07, 0x37, 0x3f, 0xcf, 0x9c, 0xed, 0xf0, 0x3f, 0x0c, 0x46, 0x36,
-	0xbb, 0xda, 0x30, 0x63, 0xde, 0xd7, 0x36, 0x53, 0xe6, 0xff, 0xa8, 0x9e, 0x5e, 0x58, 0x3b, 0x9b,
-	0xed, 0xb3, 0x4a, 0xe2, 0xe6, 0x24, 0x2b, 0x63, 0x2a, 0xed, 0xfe, 0xb9, 0x8a, 0x56, 0x1d, 0x3a,
-	0xa9, 0xed, 0xac, 0xbf, 0x56, 0x37, 0x34, 0x07, 0xe9, 0xc6, 0x3d, 0x50, 0xde, 0x0c, 0x0b, 0x28,
-	0x8f, 0x06, 0x24, 0xf4, 0x74, 0xca, 0x3c, 0xc3, 0x83, 0x30, 0xdb, 0xc7, 0xf2, 0x7d, 0x88, 0x7c,
-	0x5e, 0xfd, 0x38, 0x3d, 0x97, 0xc6, 0x27, 0x75, 0x66, 0xd0, 0xeb, 0x7d, 0x51, 0x5b, 0x83, 0x1c,
-	0xb0, 0xe7, 0x72, 0x3d, 0x37, 0x53, 0x6b, 0xd4, 0xd1, 0x8b, 0xc2, 0xfc, 0xab, 0x4c, 0x19, 0xf7,
-	0x5c, 0x3e, 0x2e, 0x53, 0xc6, 0xa3, 0xce, 0x58, 0xa6, 0xfc, 0x52, 0x57, 0x73, 0xbf, 0x69, 0xf6,
-	0x5c, 0x6e, 0x9a, 0x65, 0x92, 0x69, 0x8e, 0x3a, 0xa6, 0x29, 0xd3, 0x8e, 0xe6, 0xb2, 0x3e, 0x9f,
-	0xfd, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x87, 0xdb, 0xa3, 0xde, 0x43, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/customer_service.pb.go b/googleapis/ads/googleads/v1/services/customer_service.pb.go
index dfec96c3dc..677e35af14 100644
--- a/googleapis/ads/googleads/v1/services/customer_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/customer_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/customer_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [CustomerService.GetCustomer][google.ads.googleads.v1.services.CustomerService.GetCustomer].
 type GetCustomerRequest struct {
@@ -40,16 +40,17 @@ func (m *GetCustomerRequest) Reset()         { *m = GetCustomerRequest{} }
 func (m *GetCustomerRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCustomerRequest) ProtoMessage()    {}
 func (*GetCustomerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{0}
+	return fileDescriptor_35dc615eb25453ea, []int{0}
 }
+
 func (m *GetCustomerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCustomerRequest.Unmarshal(m, b)
 }
 func (m *GetCustomerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCustomerRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCustomerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCustomerRequest.Merge(dst, src)
+func (m *GetCustomerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCustomerRequest.Merge(m, src)
 }
 func (m *GetCustomerRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCustomerRequest.Size(m)
@@ -85,16 +86,17 @@ func (m *MutateCustomerRequest) Reset()         { *m = MutateCustomerRequest{} }
 func (m *MutateCustomerRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerRequest) ProtoMessage()    {}
 func (*MutateCustomerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{1}
+	return fileDescriptor_35dc615eb25453ea, []int{1}
 }
+
 func (m *MutateCustomerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerRequest.Unmarshal(m, b)
 }
 func (m *MutateCustomerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerRequest.Merge(dst, src)
+func (m *MutateCustomerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerRequest.Merge(m, src)
 }
 func (m *MutateCustomerRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerRequest.Size(m)
@@ -142,16 +144,17 @@ func (m *CreateCustomerClientRequest) Reset()         { *m = CreateCustomerClien
 func (m *CreateCustomerClientRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateCustomerClientRequest) ProtoMessage()    {}
 func (*CreateCustomerClientRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{2}
+	return fileDescriptor_35dc615eb25453ea, []int{2}
 }
+
 func (m *CreateCustomerClientRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCustomerClientRequest.Unmarshal(m, b)
 }
 func (m *CreateCustomerClientRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCustomerClientRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateCustomerClientRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCustomerClientRequest.Merge(dst, src)
+func (m *CreateCustomerClientRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCustomerClientRequest.Merge(m, src)
 }
 func (m *CreateCustomerClientRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateCustomerClientRequest.Size(m)
@@ -191,16 +194,17 @@ func (m *CustomerOperation) Reset()         { *m = CustomerOperation{} }
 func (m *CustomerOperation) String() string { return proto.CompactTextString(m) }
 func (*CustomerOperation) ProtoMessage()    {}
 func (*CustomerOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{3}
+	return fileDescriptor_35dc615eb25453ea, []int{3}
 }
+
 func (m *CustomerOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerOperation.Unmarshal(m, b)
 }
 func (m *CustomerOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerOperation.Marshal(b, m, deterministic)
 }
-func (dst *CustomerOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerOperation.Merge(dst, src)
+func (m *CustomerOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerOperation.Merge(m, src)
 }
 func (m *CustomerOperation) XXX_Size() int {
 	return xxx_messageInfo_CustomerOperation.Size(m)
@@ -238,16 +242,17 @@ func (m *CreateCustomerClientResponse) Reset()         { *m = CreateCustomerClie
 func (m *CreateCustomerClientResponse) String() string { return proto.CompactTextString(m) }
 func (*CreateCustomerClientResponse) ProtoMessage()    {}
 func (*CreateCustomerClientResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{4}
+	return fileDescriptor_35dc615eb25453ea, []int{4}
 }
+
 func (m *CreateCustomerClientResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCustomerClientResponse.Unmarshal(m, b)
 }
 func (m *CreateCustomerClientResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCustomerClientResponse.Marshal(b, m, deterministic)
 }
-func (dst *CreateCustomerClientResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCustomerClientResponse.Merge(dst, src)
+func (m *CreateCustomerClientResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCustomerClientResponse.Merge(m, src)
 }
 func (m *CreateCustomerClientResponse) XXX_Size() int {
 	return xxx_messageInfo_CreateCustomerClientResponse.Size(m)
@@ -278,16 +283,17 @@ func (m *MutateCustomerResponse) Reset()         { *m = MutateCustomerResponse{}
 func (m *MutateCustomerResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerResponse) ProtoMessage()    {}
 func (*MutateCustomerResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{5}
+	return fileDescriptor_35dc615eb25453ea, []int{5}
 }
+
 func (m *MutateCustomerResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerResponse.Unmarshal(m, b)
 }
 func (m *MutateCustomerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerResponse.Merge(dst, src)
+func (m *MutateCustomerResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerResponse.Merge(m, src)
 }
 func (m *MutateCustomerResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerResponse.Size(m)
@@ -318,16 +324,17 @@ func (m *MutateCustomerResult) Reset()         { *m = MutateCustomerResult{} }
 func (m *MutateCustomerResult) String() string { return proto.CompactTextString(m) }
 func (*MutateCustomerResult) ProtoMessage()    {}
 func (*MutateCustomerResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{6}
+	return fileDescriptor_35dc615eb25453ea, []int{6}
 }
+
 func (m *MutateCustomerResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateCustomerResult.Unmarshal(m, b)
 }
 func (m *MutateCustomerResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateCustomerResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateCustomerResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateCustomerResult.Merge(dst, src)
+func (m *MutateCustomerResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateCustomerResult.Merge(m, src)
 }
 func (m *MutateCustomerResult) XXX_Size() int {
 	return xxx_messageInfo_MutateCustomerResult.Size(m)
@@ -356,16 +363,17 @@ func (m *ListAccessibleCustomersRequest) Reset()         { *m = ListAccessibleCu
 func (m *ListAccessibleCustomersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAccessibleCustomersRequest) ProtoMessage()    {}
 func (*ListAccessibleCustomersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{7}
+	return fileDescriptor_35dc615eb25453ea, []int{7}
 }
+
 func (m *ListAccessibleCustomersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAccessibleCustomersRequest.Unmarshal(m, b)
 }
 func (m *ListAccessibleCustomersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAccessibleCustomersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAccessibleCustomersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAccessibleCustomersRequest.Merge(dst, src)
+func (m *ListAccessibleCustomersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAccessibleCustomersRequest.Merge(m, src)
 }
 func (m *ListAccessibleCustomersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAccessibleCustomersRequest.Size(m)
@@ -390,16 +398,17 @@ func (m *ListAccessibleCustomersResponse) Reset()         { *m = ListAccessibleC
 func (m *ListAccessibleCustomersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAccessibleCustomersResponse) ProtoMessage()    {}
 func (*ListAccessibleCustomersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_customer_service_2bf00998210897da, []int{8}
+	return fileDescriptor_35dc615eb25453ea, []int{8}
 }
+
 func (m *ListAccessibleCustomersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAccessibleCustomersResponse.Unmarshal(m, b)
 }
 func (m *ListAccessibleCustomersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAccessibleCustomersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAccessibleCustomersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAccessibleCustomersResponse.Merge(dst, src)
+func (m *ListAccessibleCustomersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAccessibleCustomersResponse.Merge(m, src)
 }
 func (m *ListAccessibleCustomersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAccessibleCustomersResponse.Size(m)
@@ -429,6 +438,61 @@ func init() {
 	proto.RegisterType((*ListAccessibleCustomersResponse)(nil), "google.ads.googleads.v1.services.ListAccessibleCustomersResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/customer_service.proto", fileDescriptor_35dc615eb25453ea)
+}
+
+var fileDescriptor_35dc615eb25453ea = []byte{
+	// 746 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xd5, 0xa4, 0xdf, 0x17, 0xd1, 0x49, 0x7f, 0xc4, 0xa8, 0x40, 0x14, 0xaa, 0x36, 0x98, 0x56,
+	0x0d, 0x41, 0xd8, 0xa4, 0x45, 0x14, 0x5c, 0x05, 0xe1, 0x46, 0xa2, 0x45, 0xa2, 0x3f, 0x18, 0xd4,
+	0x05, 0x8a, 0x14, 0xb9, 0xf6, 0x34, 0x58, 0x75, 0x3c, 0xc6, 0x63, 0x07, 0x55, 0x55, 0x37, 0x6c,
+	0x59, 0x02, 0x0b, 0xb6, 0x2c, 0x59, 0xb1, 0xe0, 0x29, 0x90, 0x58, 0xc1, 0x23, 0xb0, 0xe2, 0x15,
+	0xd8, 0x20, 0x8f, 0x67, 0xdc, 0xfc, 0xb9, 0x69, 0xcb, 0xee, 0x66, 0x72, 0xcf, 0xb9, 0xe7, 0xde,
+	0x39, 0x73, 0x0d, 0x97, 0x9b, 0x84, 0x34, 0x1d, 0xac, 0x18, 0x16, 0x55, 0xe2, 0x30, 0x8a, 0xda,
+	0x15, 0x85, 0x62, 0xbf, 0x6d, 0x9b, 0x98, 0x2a, 0x66, 0x48, 0x03, 0xd2, 0xc2, 0x7e, 0x83, 0x9f,
+	0xc8, 0x9e, 0x4f, 0x02, 0x82, 0x8a, 0x71, 0xb6, 0x6c, 0x58, 0x54, 0x4e, 0x80, 0x72, 0xbb, 0x22,
+	0x0b, 0x60, 0xe1, 0x76, 0x1a, 0xb5, 0x8f, 0x29, 0x09, 0xfd, 0x4e, 0xee, 0x98, 0xb3, 0x30, 0x2d,
+	0x10, 0x9e, 0xad, 0x18, 0xae, 0x4b, 0x02, 0x23, 0xb0, 0x89, 0x4b, 0xf9, 0xbf, 0xbc, 0xa2, 0xc2,
+	0x7e, 0xed, 0x86, 0x7b, 0xca, 0x9e, 0x8d, 0x1d, 0xab, 0xd1, 0x32, 0xe8, 0x3e, 0xcf, 0x98, 0xe9,
+	0xcd, 0x78, 0xed, 0x1b, 0x9e, 0x87, 0x7d, 0xce, 0x20, 0xdd, 0x87, 0x68, 0x0d, 0x07, 0x35, 0x5e,
+	0x54, 0xc7, 0xaf, 0x42, 0x4c, 0x03, 0x74, 0x1d, 0x8e, 0x0b, 0x45, 0x0d, 0xd7, 0x68, 0xe1, 0x3c,
+	0x28, 0x82, 0xd2, 0xa8, 0x3e, 0x26, 0x0e, 0x37, 0x8d, 0x16, 0x96, 0xbe, 0x00, 0x78, 0x69, 0x23,
+	0x0c, 0x8c, 0x00, 0xf7, 0xc2, 0x67, 0x61, 0x2e, 0x19, 0x91, 0x6d, 0x71, 0x30, 0x14, 0x47, 0x8f,
+	0x2d, 0xf4, 0x14, 0x8e, 0x12, 0x0f, 0xfb, 0xac, 0x97, 0xfc, 0x7f, 0x45, 0x50, 0xca, 0x2d, 0x2e,
+	0xc9, 0xc3, 0xa6, 0x27, 0x8b, 0x32, 0x5b, 0x02, 0xaa, 0x1f, 0xb3, 0x44, 0x92, 0xdb, 0x86, 0x63,
+	0x5b, 0x46, 0x80, 0x1b, 0xc4, 0x75, 0x0e, 0xf2, 0xff, 0x17, 0x41, 0xe9, 0x82, 0x3e, 0x26, 0x0e,
+	0xb7, 0x5c, 0xe7, 0x40, 0x7a, 0x0f, 0xe0, 0xd5, 0x9a, 0x8f, 0x3b, 0x24, 0xd7, 0x1c, 0x1b, 0xbb,
+	0xc1, 0xa9, 0x85, 0x3f, 0x87, 0x93, 0x49, 0x82, 0xc9, 0xa0, 0xf9, 0x0c, 0x93, 0x7f, 0x33, 0x55,
+	0x7e, 0x72, 0xb5, 0x89, 0x7e, 0x7d, 0xc2, 0xec, 0xaa, 0x2e, 0x7d, 0x00, 0xf0, 0x62, 0x5f, 0x73,
+	0xa8, 0x06, 0xb3, 0xa1, 0x17, 0x49, 0x67, 0x3a, 0xce, 0x58, 0x82, 0x43, 0xd1, 0x0a, 0xcc, 0xc5,
+	0x11, 0x33, 0x05, 0x17, 0x5b, 0x10, 0x4c, 0xc2, 0x15, 0xf2, 0xa3, 0xc8, 0x37, 0x1b, 0x06, 0xdd,
+	0xd7, 0x61, 0x9c, 0x1e, 0xc5, 0x52, 0x0d, 0x4e, 0x0f, 0x9e, 0x16, 0xf5, 0x88, 0x4b, 0x71, 0xbf,
+	0x4d, 0x32, 0x03, 0x6c, 0xf2, 0x12, 0x5e, 0xee, 0x75, 0x09, 0x87, 0x6f, 0xc2, 0xac, 0x8f, 0x69,
+	0xe8, 0x88, 0x19, 0xde, 0x1d, 0x6e, 0x81, 0x3e, 0xa6, 0xd0, 0x09, 0x74, 0xce, 0x22, 0xad, 0xc0,
+	0xa9, 0x41, 0xff, 0x9f, 0xce, 0xcd, 0x45, 0x38, 0xf3, 0xc4, 0xa6, 0x81, 0x66, 0x9a, 0x98, 0x52,
+	0x7b, 0xd7, 0x49, 0x48, 0x28, 0x37, 0x87, 0xb4, 0x0e, 0x67, 0x53, 0x33, 0x78, 0x47, 0xf3, 0x70,
+	0xa2, 0xab, 0x12, 0xcd, 0x83, 0xe2, 0x48, 0x69, 0x54, 0x1f, 0xef, 0x2c, 0x45, 0x17, 0xdf, 0x66,
+	0xe1, 0xa4, 0x00, 0x3f, 0x8b, 0x5b, 0x43, 0x1f, 0x01, 0xcc, 0x75, 0xbc, 0x44, 0x74, 0x67, 0xf8,
+	0x30, 0xfa, 0x1f, 0x6e, 0xe1, 0x2c, 0x1e, 0x91, 0x16, 0xde, 0xfc, 0xf8, 0xf5, 0x2e, 0x73, 0x0d,
+	0xcd, 0x46, 0x1b, 0xe8, 0xb0, 0x4b, 0x78, 0x55, 0x38, 0x94, 0x2a, 0xe5, 0x23, 0xf4, 0x15, 0xc0,
+	0x89, 0xee, 0xc9, 0xa2, 0xe5, 0xb3, 0xdf, 0x55, 0xac, 0xf0, 0xde, 0x39, 0x2e, 0x99, 0x0d, 0x57,
+	0x52, 0x98, 0xdc, 0x1b, 0xd2, 0x5c, 0x24, 0xf7, 0x58, 0xdf, 0x61, 0xc7, 0x8b, 0xad, 0x96, 0x8f,
+	0xd4, 0x16, 0x43, 0xab, 0xa0, 0x8c, 0xbe, 0x03, 0x78, 0x25, 0xe5, 0xc6, 0xd0, 0xc3, 0xe1, 0x32,
+	0x4e, 0xb6, 0x43, 0x41, 0xfb, 0x07, 0x06, 0xde, 0xd1, 0x2d, 0xd6, 0xd1, 0x02, 0x9a, 0xef, 0xea,
+	0x48, 0x75, 0x52, 0x34, 0xff, 0x04, 0x70, 0x6a, 0xd0, 0x7b, 0x44, 0xd5, 0x53, 0xec, 0xce, 0xf4,
+	0xad, 0x57, 0x78, 0x70, 0x5e, 0x38, 0x6f, 0xa3, 0xca, 0xda, 0x58, 0x96, 0x16, 0x4f, 0xbe, 0x18,
+	0x73, 0x00, 0x87, 0x0a, 0xca, 0xab, 0x7f, 0x00, 0x9c, 0x33, 0x49, 0x6b, 0xa8, 0x88, 0xd5, 0xa9,
+	0x9e, 0x37, 0xb3, 0x1d, 0x6d, 0xaf, 0x6d, 0xf0, 0x62, 0x9d, 0x23, 0x9b, 0xc4, 0x31, 0xdc, 0xa6,
+	0x4c, 0xfc, 0xa6, 0xd2, 0xc4, 0x2e, 0xdb, 0x6d, 0xe2, 0x2b, 0xeb, 0xd9, 0x34, 0xfd, 0x7b, 0xbe,
+	0x22, 0x82, 0x4f, 0x99, 0x91, 0x35, 0x4d, 0xfb, 0x9c, 0x29, 0xae, 0xc5, 0x84, 0x9a, 0x45, 0xe5,
+	0x38, 0x8c, 0xa2, 0x9d, 0x8a, 0xcc, 0x0b, 0xd3, 0x6f, 0x22, 0xa5, 0xae, 0x59, 0xb4, 0x9e, 0xa4,
+	0xd4, 0x77, 0x2a, 0x75, 0x91, 0xf2, 0x3b, 0x33, 0x17, 0x9f, 0xab, 0xaa, 0x66, 0x51, 0x55, 0x4d,
+	0x92, 0x54, 0x75, 0xa7, 0xa2, 0xaa, 0x22, 0x6d, 0x37, 0xcb, 0x74, 0x2e, 0xfd, 0x0d, 0x00, 0x00,
+	0xff, 0xff, 0x3c, 0x0a, 0xed, 0x23, 0x76, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -609,58 +673,3 @@ var _CustomerService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/customer_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/customer_service.proto", fileDescriptor_customer_service_2bf00998210897da)
-}
-
-var fileDescriptor_customer_service_2bf00998210897da = []byte{
-	// 746 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0xd5, 0xa4, 0xdf, 0x17, 0xd1, 0x49, 0x7f, 0xc4, 0xa8, 0x40, 0x14, 0xaa, 0x36, 0x98, 0x56,
-	0x0d, 0x41, 0xd8, 0xa4, 0x45, 0x14, 0x5c, 0x05, 0xe1, 0x46, 0xa2, 0x45, 0xa2, 0x3f, 0x18, 0xd4,
-	0x05, 0x8a, 0x14, 0xb9, 0xf6, 0x34, 0x58, 0x75, 0x3c, 0xc6, 0x63, 0x07, 0x55, 0x55, 0x37, 0x6c,
-	0x59, 0x02, 0x0b, 0xb6, 0x2c, 0x59, 0xb1, 0xe0, 0x29, 0x90, 0x58, 0xc1, 0x23, 0xb0, 0xe2, 0x15,
-	0xd8, 0x20, 0x8f, 0x67, 0xdc, 0xfc, 0xb9, 0x69, 0xcb, 0xee, 0x66, 0x72, 0xcf, 0xb9, 0xe7, 0xde,
-	0x39, 0x73, 0x0d, 0x97, 0x9b, 0x84, 0x34, 0x1d, 0xac, 0x18, 0x16, 0x55, 0xe2, 0x30, 0x8a, 0xda,
-	0x15, 0x85, 0x62, 0xbf, 0x6d, 0x9b, 0x98, 0x2a, 0x66, 0x48, 0x03, 0xd2, 0xc2, 0x7e, 0x83, 0x9f,
-	0xc8, 0x9e, 0x4f, 0x02, 0x82, 0x8a, 0x71, 0xb6, 0x6c, 0x58, 0x54, 0x4e, 0x80, 0x72, 0xbb, 0x22,
-	0x0b, 0x60, 0xe1, 0x76, 0x1a, 0xb5, 0x8f, 0x29, 0x09, 0xfd, 0x4e, 0xee, 0x98, 0xb3, 0x30, 0x2d,
-	0x10, 0x9e, 0xad, 0x18, 0xae, 0x4b, 0x02, 0x23, 0xb0, 0x89, 0x4b, 0xf9, 0xbf, 0xbc, 0xa2, 0xc2,
-	0x7e, 0xed, 0x86, 0x7b, 0xca, 0x9e, 0x8d, 0x1d, 0xab, 0xd1, 0x32, 0xe8, 0x3e, 0xcf, 0x98, 0xe9,
-	0xcd, 0x78, 0xed, 0x1b, 0x9e, 0x87, 0x7d, 0xce, 0x20, 0xdd, 0x87, 0x68, 0x0d, 0x07, 0x35, 0x5e,
-	0x54, 0xc7, 0xaf, 0x42, 0x4c, 0x03, 0x74, 0x1d, 0x8e, 0x0b, 0x45, 0x0d, 0xd7, 0x68, 0xe1, 0x3c,
-	0x28, 0x82, 0xd2, 0xa8, 0x3e, 0x26, 0x0e, 0x37, 0x8d, 0x16, 0x96, 0xbe, 0x00, 0x78, 0x69, 0x23,
-	0x0c, 0x8c, 0x00, 0xf7, 0xc2, 0x67, 0x61, 0x2e, 0x19, 0x91, 0x6d, 0x71, 0x30, 0x14, 0x47, 0x8f,
-	0x2d, 0xf4, 0x14, 0x8e, 0x12, 0x0f, 0xfb, 0xac, 0x97, 0xfc, 0x7f, 0x45, 0x50, 0xca, 0x2d, 0x2e,
-	0xc9, 0xc3, 0xa6, 0x27, 0x8b, 0x32, 0x5b, 0x02, 0xaa, 0x1f, 0xb3, 0x44, 0x92, 0xdb, 0x86, 0x63,
-	0x5b, 0x46, 0x80, 0x1b, 0xc4, 0x75, 0x0e, 0xf2, 0xff, 0x17, 0x41, 0xe9, 0x82, 0x3e, 0x26, 0x0e,
-	0xb7, 0x5c, 0xe7, 0x40, 0x7a, 0x0f, 0xe0, 0xd5, 0x9a, 0x8f, 0x3b, 0x24, 0xd7, 0x1c, 0x1b, 0xbb,
-	0xc1, 0xa9, 0x85, 0x3f, 0x87, 0x93, 0x49, 0x82, 0xc9, 0xa0, 0xf9, 0x0c, 0x93, 0x7f, 0x33, 0x55,
-	0x7e, 0x72, 0xb5, 0x89, 0x7e, 0x7d, 0xc2, 0xec, 0xaa, 0x2e, 0x7d, 0x00, 0xf0, 0x62, 0x5f, 0x73,
-	0xa8, 0x06, 0xb3, 0xa1, 0x17, 0x49, 0x67, 0x3a, 0xce, 0x58, 0x82, 0x43, 0xd1, 0x0a, 0xcc, 0xc5,
-	0x11, 0x33, 0x05, 0x17, 0x5b, 0x10, 0x4c, 0xc2, 0x15, 0xf2, 0xa3, 0xc8, 0x37, 0x1b, 0x06, 0xdd,
-	0xd7, 0x61, 0x9c, 0x1e, 0xc5, 0x52, 0x0d, 0x4e, 0x0f, 0x9e, 0x16, 0xf5, 0x88, 0x4b, 0x71, 0xbf,
-	0x4d, 0x32, 0x03, 0x6c, 0xf2, 0x12, 0x5e, 0xee, 0x75, 0x09, 0x87, 0x6f, 0xc2, 0xac, 0x8f, 0x69,
-	0xe8, 0x88, 0x19, 0xde, 0x1d, 0x6e, 0x81, 0x3e, 0xa6, 0xd0, 0x09, 0x74, 0xce, 0x22, 0xad, 0xc0,
-	0xa9, 0x41, 0xff, 0x9f, 0xce, 0xcd, 0x45, 0x38, 0xf3, 0xc4, 0xa6, 0x81, 0x66, 0x9a, 0x98, 0x52,
-	0x7b, 0xd7, 0x49, 0x48, 0x28, 0x37, 0x87, 0xb4, 0x0e, 0x67, 0x53, 0x33, 0x78, 0x47, 0xf3, 0x70,
-	0xa2, 0xab, 0x12, 0xcd, 0x83, 0xe2, 0x48, 0x69, 0x54, 0x1f, 0xef, 0x2c, 0x45, 0x17, 0xdf, 0x66,
-	0xe1, 0xa4, 0x00, 0x3f, 0x8b, 0x5b, 0x43, 0x1f, 0x01, 0xcc, 0x75, 0xbc, 0x44, 0x74, 0x67, 0xf8,
-	0x30, 0xfa, 0x1f, 0x6e, 0xe1, 0x2c, 0x1e, 0x91, 0x16, 0xde, 0xfc, 0xf8, 0xf5, 0x2e, 0x73, 0x0d,
-	0xcd, 0x46, 0x1b, 0xe8, 0xb0, 0x4b, 0x78, 0x55, 0x38, 0x94, 0x2a, 0xe5, 0x23, 0xf4, 0x15, 0xc0,
-	0x89, 0xee, 0xc9, 0xa2, 0xe5, 0xb3, 0xdf, 0x55, 0xac, 0xf0, 0xde, 0x39, 0x2e, 0x99, 0x0d, 0x57,
-	0x52, 0x98, 0xdc, 0x1b, 0xd2, 0x5c, 0x24, 0xf7, 0x58, 0xdf, 0x61, 0xc7, 0x8b, 0xad, 0x96, 0x8f,
-	0xd4, 0x16, 0x43, 0xab, 0xa0, 0x8c, 0xbe, 0x03, 0x78, 0x25, 0xe5, 0xc6, 0xd0, 0xc3, 0xe1, 0x32,
-	0x4e, 0xb6, 0x43, 0x41, 0xfb, 0x07, 0x06, 0xde, 0xd1, 0x2d, 0xd6, 0xd1, 0x02, 0x9a, 0xef, 0xea,
-	0x48, 0x75, 0x52, 0x34, 0xff, 0x04, 0x70, 0x6a, 0xd0, 0x7b, 0x44, 0xd5, 0x53, 0xec, 0xce, 0xf4,
-	0xad, 0x57, 0x78, 0x70, 0x5e, 0x38, 0x6f, 0xa3, 0xca, 0xda, 0x58, 0x96, 0x16, 0x4f, 0xbe, 0x18,
-	0x73, 0x00, 0x87, 0x0a, 0xca, 0xab, 0x7f, 0x00, 0x9c, 0x33, 0x49, 0x6b, 0xa8, 0x88, 0xd5, 0xa9,
-	0x9e, 0x37, 0xb3, 0x1d, 0x6d, 0xaf, 0x6d, 0xf0, 0x62, 0x9d, 0x23, 0x9b, 0xc4, 0x31, 0xdc, 0xa6,
-	0x4c, 0xfc, 0xa6, 0xd2, 0xc4, 0x2e, 0xdb, 0x6d, 0xe2, 0x2b, 0xeb, 0xd9, 0x34, 0xfd, 0x7b, 0xbe,
-	0x22, 0x82, 0x4f, 0x99, 0x91, 0x35, 0x4d, 0xfb, 0x9c, 0x29, 0xae, 0xc5, 0x84, 0x9a, 0x45, 0xe5,
-	0x38, 0x8c, 0xa2, 0x9d, 0x8a, 0xcc, 0x0b, 0xd3, 0x6f, 0x22, 0xa5, 0xae, 0x59, 0xb4, 0x9e, 0xa4,
-	0xd4, 0x77, 0x2a, 0x75, 0x91, 0xf2, 0x3b, 0x33, 0x17, 0x9f, 0xab, 0xaa, 0x66, 0x51, 0x55, 0x4d,
-	0x92, 0x54, 0x75, 0xa7, 0xa2, 0xaa, 0x22, 0x6d, 0x37, 0xcb, 0x74, 0x2e, 0xfd, 0x0d, 0x00, 0x00,
-	0xff, 0xff, 0x3c, 0x0a, 0xed, 0x23, 0x76, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/detail_placement_view_service.pb.go b/googleapis/ads/googleads/v1/services/detail_placement_view_service.pb.go
index 55fce0b823..9612117c81 100644
--- a/googleapis/ads/googleads/v1/services/detail_placement_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/detail_placement_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/detail_placement_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [DetailPlacementViewService.GetDetailPlacementView][google.ads.googleads.v1.services.DetailPlacementViewService.GetDetailPlacementView].
 type GetDetailPlacementViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetDetailPlacementViewRequest) Reset()         { *m = GetDetailPlacemen
 func (m *GetDetailPlacementViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDetailPlacementViewRequest) ProtoMessage()    {}
 func (*GetDetailPlacementViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_detail_placement_view_service_70dfd9a0f630143c, []int{0}
+	return fileDescriptor_9f5548d46c4dece9, []int{0}
 }
+
 func (m *GetDetailPlacementViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDetailPlacementViewRequest.Unmarshal(m, b)
 }
 func (m *GetDetailPlacementViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDetailPlacementViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDetailPlacementViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDetailPlacementViewRequest.Merge(dst, src)
+func (m *GetDetailPlacementViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDetailPlacementViewRequest.Merge(m, src)
 }
 func (m *GetDetailPlacementViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDetailPlacementViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetDetailPlacementViewRequest)(nil), "google.ads.googleads.v1.services.GetDetailPlacementViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/detail_placement_view_service.proto", fileDescriptor_9f5548d46c4dece9)
+}
+
+var fileDescriptor_9f5548d46c4dece9 = []byte{
+	// 373 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbf, 0x4a, 0xfb, 0x40,
+	0x1c, 0x27, 0xf9, 0xc1, 0x0f, 0x0c, 0xba, 0x64, 0x10, 0x09, 0x8a, 0xa5, 0x76, 0x90, 0x0e, 0x77,
+	0x44, 0xa1, 0xc8, 0x49, 0x95, 0x94, 0x42, 0x9d, 0xa4, 0x54, 0xc8, 0x20, 0x81, 0x70, 0x26, 0x5f,
+	0x42, 0x20, 0xc9, 0xc5, 0xdc, 0x35, 0x1d, 0xc4, 0xc5, 0xc1, 0x17, 0xf0, 0x0d, 0x1c, 0x7d, 0x14,
+	0x37, 0xf1, 0x15, 0x9c, 0x9c, 0x7c, 0x04, 0x49, 0x2f, 0x17, 0x28, 0x34, 0x76, 0xfb, 0x70, 0xdf,
+	0xcf, 0x9f, 0xef, 0x9f, 0x33, 0xc6, 0x11, 0x63, 0x51, 0x02, 0x98, 0x86, 0x1c, 0x4b, 0x58, 0xa1,
+	0xd2, 0xc6, 0x1c, 0x8a, 0x32, 0x0e, 0x80, 0xe3, 0x10, 0x04, 0x8d, 0x13, 0x3f, 0x4f, 0x68, 0x00,
+	0x29, 0x64, 0xc2, 0x2f, 0x63, 0x58, 0xf8, 0x75, 0x19, 0xe5, 0x05, 0x13, 0xcc, 0xec, 0x48, 0x29,
+	0xa2, 0x21, 0x47, 0x8d, 0x0b, 0x2a, 0x6d, 0xa4, 0x5c, 0xac, 0x61, 0x5b, 0x4e, 0x01, 0x9c, 0xcd,
+	0x8b, 0xd6, 0x20, 0x19, 0x60, 0xed, 0x2b, 0x79, 0x1e, 0x63, 0x9a, 0x65, 0x4c, 0x50, 0x11, 0xb3,
+	0x8c, 0xcb, 0x6a, 0x77, 0x6c, 0x1c, 0x4c, 0x40, 0x8c, 0x97, 0xfa, 0xa9, 0x92, 0xbb, 0x31, 0x2c,
+	0x66, 0x70, 0x3f, 0x07, 0x2e, 0xcc, 0x23, 0x63, 0x47, 0xe5, 0xf8, 0x19, 0x4d, 0x61, 0x4f, 0xeb,
+	0x68, 0xc7, 0x5b, 0xb3, 0x6d, 0xf5, 0x78, 0x4d, 0x53, 0x38, 0xf9, 0xd1, 0x0c, 0x6b, 0x8d, 0xc7,
+	0x8d, 0x1c, 0xc1, 0xfc, 0xd0, 0x8c, 0xdd, 0xf5, 0x29, 0xe6, 0x25, 0xda, 0x34, 0x3f, 0xfa, 0xb3,
+	0x3f, 0x6b, 0xd0, 0x6a, 0xd0, 0xac, 0x07, 0xad, 0x91, 0x77, 0x2f, 0x9e, 0x3e, 0xbf, 0x5e, 0xf4,
+	0x33, 0x73, 0x50, 0x6d, 0xf2, 0x61, 0x65, 0xc4, 0x61, 0x30, 0xe7, 0x82, 0xa5, 0x50, 0x70, 0xdc,
+	0xaf, 0x57, 0xbb, 0xa2, 0xe5, 0xb8, 0xff, 0x38, 0x7a, 0xd6, 0x8d, 0x5e, 0xc0, 0xd2, 0x8d, 0xed,
+	0x8f, 0x0e, 0xdb, 0x17, 0x33, 0xad, 0x4e, 0x30, 0xd5, 0x6e, 0xaf, 0x6a, 0x93, 0x88, 0x25, 0x34,
+	0x8b, 0x10, 0x2b, 0x22, 0x1c, 0x41, 0xb6, 0x3c, 0x90, 0xba, 0x78, 0x1e, 0xf3, 0xf6, 0x8f, 0x76,
+	0xae, 0xc0, 0xab, 0xfe, 0x6f, 0xe2, 0x38, 0x6f, 0x7a, 0x67, 0x22, 0x0d, 0x9d, 0x90, 0x23, 0x09,
+	0x2b, 0xe4, 0xda, 0xa8, 0x0e, 0xe6, 0xef, 0x8a, 0xe2, 0x39, 0x21, 0xf7, 0x1a, 0x8a, 0xe7, 0xda,
+	0x9e, 0xa2, 0x7c, 0xeb, 0x3d, 0xf9, 0x4e, 0x88, 0x13, 0x72, 0x42, 0x1a, 0x12, 0x21, 0xae, 0x4d,
+	0x88, 0xa2, 0xdd, 0xfd, 0x5f, 0xf6, 0x79, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x02, 0x09,
+	0x37, 0x0f, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _DetailPlacementViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/detail_placement_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/detail_placement_view_service.proto", fileDescriptor_detail_placement_view_service_70dfd9a0f630143c)
-}
-
-var fileDescriptor_detail_placement_view_service_70dfd9a0f630143c = []byte{
-	// 373 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbf, 0x4a, 0xfb, 0x40,
-	0x1c, 0x27, 0xf9, 0xc1, 0x0f, 0x0c, 0xba, 0x64, 0x10, 0x09, 0x8a, 0xa5, 0x76, 0x90, 0x0e, 0x77,
-	0x44, 0xa1, 0xc8, 0x49, 0x95, 0x94, 0x42, 0x9d, 0xa4, 0x54, 0xc8, 0x20, 0x81, 0x70, 0x26, 0x5f,
-	0x42, 0x20, 0xc9, 0xc5, 0xdc, 0x35, 0x1d, 0xc4, 0xc5, 0xc1, 0x17, 0xf0, 0x0d, 0x1c, 0x7d, 0x14,
-	0x37, 0xf1, 0x15, 0x9c, 0x9c, 0x7c, 0x04, 0x49, 0x2f, 0x17, 0x28, 0x34, 0x76, 0xfb, 0x70, 0xdf,
-	0xcf, 0x9f, 0xef, 0x9f, 0x33, 0xc6, 0x11, 0x63, 0x51, 0x02, 0x98, 0x86, 0x1c, 0x4b, 0x58, 0xa1,
-	0xd2, 0xc6, 0x1c, 0x8a, 0x32, 0x0e, 0x80, 0xe3, 0x10, 0x04, 0x8d, 0x13, 0x3f, 0x4f, 0x68, 0x00,
-	0x29, 0x64, 0xc2, 0x2f, 0x63, 0x58, 0xf8, 0x75, 0x19, 0xe5, 0x05, 0x13, 0xcc, 0xec, 0x48, 0x29,
-	0xa2, 0x21, 0x47, 0x8d, 0x0b, 0x2a, 0x6d, 0xa4, 0x5c, 0xac, 0x61, 0x5b, 0x4e, 0x01, 0x9c, 0xcd,
-	0x8b, 0xd6, 0x20, 0x19, 0x60, 0xed, 0x2b, 0x79, 0x1e, 0x63, 0x9a, 0x65, 0x4c, 0x50, 0x11, 0xb3,
-	0x8c, 0xcb, 0x6a, 0x77, 0x6c, 0x1c, 0x4c, 0x40, 0x8c, 0x97, 0xfa, 0xa9, 0x92, 0xbb, 0x31, 0x2c,
-	0x66, 0x70, 0x3f, 0x07, 0x2e, 0xcc, 0x23, 0x63, 0x47, 0xe5, 0xf8, 0x19, 0x4d, 0x61, 0x4f, 0xeb,
-	0x68, 0xc7, 0x5b, 0xb3, 0x6d, 0xf5, 0x78, 0x4d, 0x53, 0x38, 0xf9, 0xd1, 0x0c, 0x6b, 0x8d, 0xc7,
-	0x8d, 0x1c, 0xc1, 0xfc, 0xd0, 0x8c, 0xdd, 0xf5, 0x29, 0xe6, 0x25, 0xda, 0x34, 0x3f, 0xfa, 0xb3,
-	0x3f, 0x6b, 0xd0, 0x6a, 0xd0, 0xac, 0x07, 0xad, 0x91, 0x77, 0x2f, 0x9e, 0x3e, 0xbf, 0x5e, 0xf4,
-	0x33, 0x73, 0x50, 0x6d, 0xf2, 0x61, 0x65, 0xc4, 0x61, 0x30, 0xe7, 0x82, 0xa5, 0x50, 0x70, 0xdc,
-	0xaf, 0x57, 0xbb, 0xa2, 0xe5, 0xb8, 0xff, 0x38, 0x7a, 0xd6, 0x8d, 0x5e, 0xc0, 0xd2, 0x8d, 0xed,
-	0x8f, 0x0e, 0xdb, 0x17, 0x33, 0xad, 0x4e, 0x30, 0xd5, 0x6e, 0xaf, 0x6a, 0x93, 0x88, 0x25, 0x34,
-	0x8b, 0x10, 0x2b, 0x22, 0x1c, 0x41, 0xb6, 0x3c, 0x90, 0xba, 0x78, 0x1e, 0xf3, 0xf6, 0x8f, 0x76,
-	0xae, 0xc0, 0xab, 0xfe, 0x6f, 0xe2, 0x38, 0x6f, 0x7a, 0x67, 0x22, 0x0d, 0x9d, 0x90, 0x23, 0x09,
-	0x2b, 0xe4, 0xda, 0xa8, 0x0e, 0xe6, 0xef, 0x8a, 0xe2, 0x39, 0x21, 0xf7, 0x1a, 0x8a, 0xe7, 0xda,
-	0x9e, 0xa2, 0x7c, 0xeb, 0x3d, 0xf9, 0x4e, 0x88, 0x13, 0x72, 0x42, 0x1a, 0x12, 0x21, 0xae, 0x4d,
-	0x88, 0xa2, 0xdd, 0xfd, 0x5f, 0xf6, 0x79, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x02, 0x09,
-	0x37, 0x0f, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/display_keyword_view_service.pb.go b/googleapis/ads/googleads/v1/services/display_keyword_view_service.pb.go
index 098dad2e18..b611013887 100644
--- a/googleapis/ads/googleads/v1/services/display_keyword_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/display_keyword_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/display_keyword_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [DisplayKeywordViewService.GetDisplayKeywordView][google.ads.googleads.v1.services.DisplayKeywordViewService.GetDisplayKeywordView].
 type GetDisplayKeywordViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetDisplayKeywordViewRequest) Reset()         { *m = GetDisplayKeywordV
 func (m *GetDisplayKeywordViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDisplayKeywordViewRequest) ProtoMessage()    {}
 func (*GetDisplayKeywordViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_display_keyword_view_service_277caaf988ad7c73, []int{0}
+	return fileDescriptor_5b29fb51aa49493b, []int{0}
 }
+
 func (m *GetDisplayKeywordViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDisplayKeywordViewRequest.Unmarshal(m, b)
 }
 func (m *GetDisplayKeywordViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDisplayKeywordViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDisplayKeywordViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDisplayKeywordViewRequest.Merge(dst, src)
+func (m *GetDisplayKeywordViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDisplayKeywordViewRequest.Merge(m, src)
 }
 func (m *GetDisplayKeywordViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDisplayKeywordViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetDisplayKeywordViewRequest)(nil), "google.ads.googleads.v1.services.GetDisplayKeywordViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/display_keyword_view_service.proto", fileDescriptor_5b29fb51aa49493b)
+}
+
+var fileDescriptor_5b29fb51aa49493b = []byte{
+	// 373 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x4a, 0xc3, 0x30,
+	0x18, 0xa7, 0x15, 0x04, 0x8b, 0x5e, 0x0a, 0x82, 0x8e, 0x21, 0x63, 0xee, 0x20, 0x3b, 0x24, 0x54,
+	0x19, 0x42, 0x74, 0x42, 0x37, 0x61, 0x82, 0x20, 0x63, 0x42, 0x0f, 0x52, 0x28, 0x71, 0x0d, 0xa5,
+	0xb8, 0x36, 0x35, 0x5f, 0xd7, 0x31, 0xc4, 0x8b, 0xe0, 0x13, 0xf8, 0x06, 0x1e, 0x7d, 0x14, 0xc1,
+	0x93, 0xaf, 0xe0, 0x49, 0x5f, 0x42, 0xba, 0x2c, 0x45, 0x99, 0x75, 0xb7, 0x1f, 0xc9, 0xef, 0xcf,
+	0x97, 0xdf, 0x17, 0xa3, 0x1b, 0x70, 0x1e, 0x8c, 0x18, 0xa6, 0x3e, 0x60, 0x09, 0x73, 0x94, 0x59,
+	0x18, 0x98, 0xc8, 0xc2, 0x21, 0x03, 0xec, 0x87, 0x90, 0x8c, 0xe8, 0xd4, 0xbb, 0x61, 0xd3, 0x09,
+	0x17, 0xbe, 0x97, 0x85, 0x6c, 0xe2, 0xcd, 0x6f, 0x51, 0x22, 0x78, 0xca, 0xcd, 0x9a, 0x54, 0x22,
+	0xea, 0x03, 0x2a, 0x4c, 0x50, 0x66, 0x21, 0x65, 0x52, 0x39, 0x2e, 0x8b, 0x11, 0x0c, 0xf8, 0x58,
+	0x94, 0xe5, 0x48, 0xff, 0x4a, 0x55, 0xa9, 0x93, 0x10, 0xd3, 0x38, 0xe6, 0x29, 0x4d, 0x43, 0x1e,
+	0x83, 0xbc, 0xad, 0x77, 0x8d, 0x6a, 0x8f, 0xa5, 0xa7, 0x52, 0x7e, 0x2e, 0xd5, 0x4e, 0xc8, 0x26,
+	0x03, 0x76, 0x3b, 0x66, 0x90, 0x9a, 0xbb, 0xc6, 0x86, 0x4a, 0xf1, 0x62, 0x1a, 0xb1, 0x2d, 0xad,
+	0xa6, 0xed, 0xad, 0x0d, 0xd6, 0xd5, 0xe1, 0x05, 0x8d, 0xd8, 0xfe, 0x97, 0x66, 0x6c, 0x2f, 0x5a,
+	0x5c, 0xca, 0xf9, 0xcd, 0x37, 0xcd, 0xd8, 0xfc, 0x33, 0xc3, 0x3c, 0x41, 0xcb, 0xde, 0x8e, 0xfe,
+	0x1b, 0xae, 0xd2, 0x2a, 0xd5, 0x17, 0xcd, 0xa0, 0x45, 0x75, 0xbd, 0xfd, 0xf0, 0xfe, 0xf1, 0xa4,
+	0x1f, 0x9a, 0xad, 0xbc, 0xc3, 0xbb, 0x5f, 0xcf, 0x6b, 0x0f, 0xc7, 0x90, 0xf2, 0x88, 0x09, 0xc0,
+	0x4d, 0x55, 0xea, 0x0f, 0x29, 0xe0, 0xe6, 0x7d, 0xe7, 0x51, 0x37, 0x1a, 0x43, 0x1e, 0x2d, 0x9d,
+	0xbd, 0xb3, 0x53, 0xda, 0x49, 0x3f, 0xef, 0xbe, 0xaf, 0x5d, 0x9d, 0xcd, 0x3d, 0x02, 0x3e, 0xa2,
+	0x71, 0x80, 0xb8, 0x08, 0x70, 0xc0, 0xe2, 0xd9, 0x66, 0xd4, 0xa6, 0x93, 0x10, 0xca, 0xff, 0xd7,
+	0x91, 0x02, 0xcf, 0xfa, 0x4a, 0xcf, 0xb6, 0x5f, 0xf4, 0x5a, 0x4f, 0x1a, 0xda, 0x3e, 0x20, 0x09,
+	0x73, 0xe4, 0x58, 0x68, 0x1e, 0x0c, 0xaf, 0x8a, 0xe2, 0xda, 0x3e, 0xb8, 0x05, 0xc5, 0x75, 0x2c,
+	0x57, 0x51, 0x3e, 0xf5, 0x86, 0x3c, 0x27, 0xc4, 0xf6, 0x81, 0x90, 0x82, 0x44, 0x88, 0x63, 0x11,
+	0xa2, 0x68, 0xd7, 0xab, 0xb3, 0x39, 0x0f, 0xbe, 0x03, 0x00, 0x00, 0xff, 0xff, 0x56, 0xf2, 0xb0,
+	0x91, 0x06, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _DisplayKeywordViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/display_keyword_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/display_keyword_view_service.proto", fileDescriptor_display_keyword_view_service_277caaf988ad7c73)
-}
-
-var fileDescriptor_display_keyword_view_service_277caaf988ad7c73 = []byte{
-	// 373 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x4a, 0xc3, 0x30,
-	0x18, 0xa7, 0x15, 0x04, 0x8b, 0x5e, 0x0a, 0x82, 0x8e, 0x21, 0x63, 0xee, 0x20, 0x3b, 0x24, 0x54,
-	0x19, 0x42, 0x74, 0x42, 0x37, 0x61, 0x82, 0x20, 0x63, 0x42, 0x0f, 0x52, 0x28, 0x71, 0x0d, 0xa5,
-	0xb8, 0x36, 0x35, 0x5f, 0xd7, 0x31, 0xc4, 0x8b, 0xe0, 0x13, 0xf8, 0x06, 0x1e, 0x7d, 0x14, 0xc1,
-	0x93, 0xaf, 0xe0, 0x49, 0x5f, 0x42, 0xba, 0x2c, 0x45, 0x99, 0x75, 0xb7, 0x1f, 0xc9, 0xef, 0xcf,
-	0x97, 0xdf, 0x17, 0xa3, 0x1b, 0x70, 0x1e, 0x8c, 0x18, 0xa6, 0x3e, 0x60, 0x09, 0x73, 0x94, 0x59,
-	0x18, 0x98, 0xc8, 0xc2, 0x21, 0x03, 0xec, 0x87, 0x90, 0x8c, 0xe8, 0xd4, 0xbb, 0x61, 0xd3, 0x09,
-	0x17, 0xbe, 0x97, 0x85, 0x6c, 0xe2, 0xcd, 0x6f, 0x51, 0x22, 0x78, 0xca, 0xcd, 0x9a, 0x54, 0x22,
-	0xea, 0x03, 0x2a, 0x4c, 0x50, 0x66, 0x21, 0x65, 0x52, 0x39, 0x2e, 0x8b, 0x11, 0x0c, 0xf8, 0x58,
-	0x94, 0xe5, 0x48, 0xff, 0x4a, 0x55, 0xa9, 0x93, 0x10, 0xd3, 0x38, 0xe6, 0x29, 0x4d, 0x43, 0x1e,
-	0x83, 0xbc, 0xad, 0x77, 0x8d, 0x6a, 0x8f, 0xa5, 0xa7, 0x52, 0x7e, 0x2e, 0xd5, 0x4e, 0xc8, 0x26,
-	0x03, 0x76, 0x3b, 0x66, 0x90, 0x9a, 0xbb, 0xc6, 0x86, 0x4a, 0xf1, 0x62, 0x1a, 0xb1, 0x2d, 0xad,
-	0xa6, 0xed, 0xad, 0x0d, 0xd6, 0xd5, 0xe1, 0x05, 0x8d, 0xd8, 0xfe, 0x97, 0x66, 0x6c, 0x2f, 0x5a,
-	0x5c, 0xca, 0xf9, 0xcd, 0x37, 0xcd, 0xd8, 0xfc, 0x33, 0xc3, 0x3c, 0x41, 0xcb, 0xde, 0x8e, 0xfe,
-	0x1b, 0xae, 0xd2, 0x2a, 0xd5, 0x17, 0xcd, 0xa0, 0x45, 0x75, 0xbd, 0xfd, 0xf0, 0xfe, 0xf1, 0xa4,
-	0x1f, 0x9a, 0xad, 0xbc, 0xc3, 0xbb, 0x5f, 0xcf, 0x6b, 0x0f, 0xc7, 0x90, 0xf2, 0x88, 0x09, 0xc0,
-	0x4d, 0x55, 0xea, 0x0f, 0x29, 0xe0, 0xe6, 0x7d, 0xe7, 0x51, 0x37, 0x1a, 0x43, 0x1e, 0x2d, 0x9d,
-	0xbd, 0xb3, 0x53, 0xda, 0x49, 0x3f, 0xef, 0xbe, 0xaf, 0x5d, 0x9d, 0xcd, 0x3d, 0x02, 0x3e, 0xa2,
-	0x71, 0x80, 0xb8, 0x08, 0x70, 0xc0, 0xe2, 0xd9, 0x66, 0xd4, 0xa6, 0x93, 0x10, 0xca, 0xff, 0xd7,
-	0x91, 0x02, 0xcf, 0xfa, 0x4a, 0xcf, 0xb6, 0x5f, 0xf4, 0x5a, 0x4f, 0x1a, 0xda, 0x3e, 0x20, 0x09,
-	0x73, 0xe4, 0x58, 0x68, 0x1e, 0x0c, 0xaf, 0x8a, 0xe2, 0xda, 0x3e, 0xb8, 0x05, 0xc5, 0x75, 0x2c,
-	0x57, 0x51, 0x3e, 0xf5, 0x86, 0x3c, 0x27, 0xc4, 0xf6, 0x81, 0x90, 0x82, 0x44, 0x88, 0x63, 0x11,
-	0xa2, 0x68, 0xd7, 0xab, 0xb3, 0x39, 0x0f, 0xbe, 0x03, 0x00, 0x00, 0xff, 0xff, 0x56, 0xf2, 0xb0,
-	0x91, 0x06, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/domain_category_service.pb.go b/googleapis/ads/googleads/v1/services/domain_category_service.pb.go
index a1dd9e94ee..ee0c142d63 100644
--- a/googleapis/ads/googleads/v1/services/domain_category_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/domain_category_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/domain_category_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [DomainCategoryService.GetDomainCategory][google.ads.googleads.v1.services.DomainCategoryService.GetDomainCategory].
@@ -39,16 +39,17 @@ func (m *GetDomainCategoryRequest) Reset()         { *m = GetDomainCategoryReque
 func (m *GetDomainCategoryRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDomainCategoryRequest) ProtoMessage()    {}
 func (*GetDomainCategoryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_domain_category_service_e150c47857abcd62, []int{0}
+	return fileDescriptor_15e4bcffa65a4ff8, []int{0}
 }
+
 func (m *GetDomainCategoryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDomainCategoryRequest.Unmarshal(m, b)
 }
 func (m *GetDomainCategoryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDomainCategoryRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDomainCategoryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDomainCategoryRequest.Merge(dst, src)
+func (m *GetDomainCategoryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDomainCategoryRequest.Merge(m, src)
 }
 func (m *GetDomainCategoryRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDomainCategoryRequest.Size(m)
@@ -70,6 +71,37 @@ func init() {
 	proto.RegisterType((*GetDomainCategoryRequest)(nil), "google.ads.googleads.v1.services.GetDomainCategoryRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/domain_category_service.proto", fileDescriptor_15e4bcffa65a4ff8)
+}
+
+var fileDescriptor_15e4bcffa65a4ff8 = []byte{
+	// 367 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x4a, 0xfb, 0x40,
+	0x18, 0xc5, 0x49, 0xfe, 0xf0, 0x07, 0x83, 0x2e, 0x0c, 0x08, 0x25, 0xb8, 0x28, 0xb5, 0x0b, 0xe9,
+	0x62, 0x86, 0x54, 0x41, 0x18, 0x51, 0x49, 0x15, 0xea, 0x4a, 0x4a, 0x85, 0x2e, 0x24, 0x50, 0xc6,
+	0x64, 0x18, 0x02, 0xcd, 0x4c, 0x9d, 0x6f, 0x5a, 0x10, 0x71, 0xa1, 0x57, 0xf0, 0x06, 0x2e, 0x3d,
+	0x84, 0x07, 0x70, 0xeb, 0xc6, 0x03, 0xb8, 0xf2, 0x14, 0x92, 0x4e, 0x26, 0x50, 0x6c, 0xe8, 0xee,
+	0x31, 0xf3, 0x7e, 0xdf, 0xf7, 0xe6, 0x25, 0xde, 0x29, 0x97, 0x92, 0x4f, 0x18, 0xa6, 0x29, 0x60,
+	0x23, 0x0b, 0x35, 0x0f, 0x31, 0x30, 0x35, 0xcf, 0x12, 0x06, 0x38, 0x95, 0x39, 0xcd, 0xc4, 0x38,
+	0xa1, 0x9a, 0x71, 0xa9, 0xee, 0xc7, 0xe5, 0x05, 0x9a, 0x2a, 0xa9, 0xa5, 0xdf, 0x34, 0x10, 0xa2,
+	0x29, 0xa0, 0x8a, 0x47, 0xf3, 0x10, 0x59, 0x3e, 0x38, 0xaa, 0xdb, 0xa0, 0x18, 0xc8, 0x99, 0x5a,
+	0xb1, 0xc2, 0x8c, 0x0e, 0x76, 0x2d, 0x38, 0xcd, 0x30, 0x15, 0x42, 0x6a, 0xaa, 0x33, 0x29, 0xc0,
+	0xdc, 0xb6, 0xce, 0xbc, 0x46, 0x9f, 0xe9, 0x8b, 0x05, 0x79, 0x5e, 0x82, 0x43, 0x76, 0x37, 0x63,
+	0xa0, 0xfd, 0x3d, 0x6f, 0xcb, 0x0e, 0x1f, 0x0b, 0x9a, 0xb3, 0x86, 0xd3, 0x74, 0xf6, 0x37, 0x86,
+	0x9b, 0xf6, 0xf0, 0x8a, 0xe6, 0xac, 0xfb, 0xe5, 0x78, 0x3b, 0xcb, 0xf8, 0xb5, 0x89, 0xec, 0xbf,
+	0x3b, 0xde, 0xf6, 0x9f, 0xd9, 0x3e, 0x41, 0xeb, 0x9e, 0x8a, 0xea, 0x02, 0x05, 0x61, 0x2d, 0x5b,
+	0x95, 0x80, 0x96, 0xc9, 0x16, 0x79, 0xfe, 0xfc, 0x7e, 0x71, 0x0f, 0xfd, 0x6e, 0x51, 0xd5, 0xc3,
+	0xd2, 0x73, 0x4e, 0x92, 0x19, 0x68, 0x99, 0x33, 0x05, 0xb8, 0x53, 0x76, 0x57, 0x62, 0x19, 0x03,
+	0xdc, 0x79, 0xec, 0x3d, 0xb9, 0x5e, 0x3b, 0x91, 0xf9, 0xda, 0xc0, 0xbd, 0x60, 0x65, 0x01, 0x83,
+	0xa2, 0xe0, 0x81, 0x73, 0x73, 0x59, 0xf2, 0x5c, 0x4e, 0xa8, 0xe0, 0x48, 0x2a, 0x8e, 0x39, 0x13,
+	0x8b, 0xfa, 0xed, 0x97, 0x9c, 0x66, 0x50, 0xff, 0xeb, 0x1c, 0x5b, 0xf1, 0xea, 0xfe, 0xeb, 0x47,
+	0xd1, 0x9b, 0xdb, 0xec, 0x9b, 0x81, 0x51, 0x0a, 0xc8, 0xc8, 0x42, 0x8d, 0x42, 0x54, 0x2e, 0x86,
+	0x0f, 0x6b, 0x89, 0xa3, 0x14, 0xe2, 0xca, 0x12, 0x8f, 0xc2, 0xd8, 0x5a, 0x7e, 0xdc, 0xb6, 0x39,
+	0x27, 0x24, 0x4a, 0x81, 0x90, 0xca, 0x44, 0xc8, 0x28, 0x24, 0xc4, 0xda, 0x6e, 0xff, 0x2f, 0x72,
+	0x1e, 0xfc, 0x06, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xaa, 0x05, 0x1b, 0xe1, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,34 +175,3 @@ var _DomainCategoryService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/domain_category_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/domain_category_service.proto", fileDescriptor_domain_category_service_e150c47857abcd62)
-}
-
-var fileDescriptor_domain_category_service_e150c47857abcd62 = []byte{
-	// 367 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x4a, 0xfb, 0x40,
-	0x18, 0xc5, 0x49, 0xfe, 0xf0, 0x07, 0x83, 0x2e, 0x0c, 0x08, 0x25, 0xb8, 0x28, 0xb5, 0x0b, 0xe9,
-	0x62, 0x86, 0x54, 0x41, 0x18, 0x51, 0x49, 0x15, 0xea, 0x4a, 0x4a, 0x85, 0x2e, 0x24, 0x50, 0xc6,
-	0x64, 0x18, 0x02, 0xcd, 0x4c, 0x9d, 0x6f, 0x5a, 0x10, 0x71, 0xa1, 0x57, 0xf0, 0x06, 0x2e, 0x3d,
-	0x84, 0x07, 0x70, 0xeb, 0xc6, 0x03, 0xb8, 0xf2, 0x14, 0x92, 0x4e, 0x26, 0x50, 0x6c, 0xe8, 0xee,
-	0x31, 0xf3, 0x7e, 0xdf, 0xf7, 0xe6, 0x25, 0xde, 0x29, 0x97, 0x92, 0x4f, 0x18, 0xa6, 0x29, 0x60,
-	0x23, 0x0b, 0x35, 0x0f, 0x31, 0x30, 0x35, 0xcf, 0x12, 0x06, 0x38, 0x95, 0x39, 0xcd, 0xc4, 0x38,
-	0xa1, 0x9a, 0x71, 0xa9, 0xee, 0xc7, 0xe5, 0x05, 0x9a, 0x2a, 0xa9, 0xa5, 0xdf, 0x34, 0x10, 0xa2,
-	0x29, 0xa0, 0x8a, 0x47, 0xf3, 0x10, 0x59, 0x3e, 0x38, 0xaa, 0xdb, 0xa0, 0x18, 0xc8, 0x99, 0x5a,
-	0xb1, 0xc2, 0x8c, 0x0e, 0x76, 0x2d, 0x38, 0xcd, 0x30, 0x15, 0x42, 0x6a, 0xaa, 0x33, 0x29, 0xc0,
-	0xdc, 0xb6, 0xce, 0xbc, 0x46, 0x9f, 0xe9, 0x8b, 0x05, 0x79, 0x5e, 0x82, 0x43, 0x76, 0x37, 0x63,
-	0xa0, 0xfd, 0x3d, 0x6f, 0xcb, 0x0e, 0x1f, 0x0b, 0x9a, 0xb3, 0x86, 0xd3, 0x74, 0xf6, 0x37, 0x86,
-	0x9b, 0xf6, 0xf0, 0x8a, 0xe6, 0xac, 0xfb, 0xe5, 0x78, 0x3b, 0xcb, 0xf8, 0xb5, 0x89, 0xec, 0xbf,
-	0x3b, 0xde, 0xf6, 0x9f, 0xd9, 0x3e, 0x41, 0xeb, 0x9e, 0x8a, 0xea, 0x02, 0x05, 0x61, 0x2d, 0x5b,
-	0x95, 0x80, 0x96, 0xc9, 0x16, 0x79, 0xfe, 0xfc, 0x7e, 0x71, 0x0f, 0xfd, 0x6e, 0x51, 0xd5, 0xc3,
-	0xd2, 0x73, 0x4e, 0x92, 0x19, 0x68, 0x99, 0x33, 0x05, 0xb8, 0x53, 0x76, 0x57, 0x62, 0x19, 0x03,
-	0xdc, 0x79, 0xec, 0x3d, 0xb9, 0x5e, 0x3b, 0x91, 0xf9, 0xda, 0xc0, 0xbd, 0x60, 0x65, 0x01, 0x83,
-	0xa2, 0xe0, 0x81, 0x73, 0x73, 0x59, 0xf2, 0x5c, 0x4e, 0xa8, 0xe0, 0x48, 0x2a, 0x8e, 0x39, 0x13,
-	0x8b, 0xfa, 0xed, 0x97, 0x9c, 0x66, 0x50, 0xff, 0xeb, 0x1c, 0x5b, 0xf1, 0xea, 0xfe, 0xeb, 0x47,
-	0xd1, 0x9b, 0xdb, 0xec, 0x9b, 0x81, 0x51, 0x0a, 0xc8, 0xc8, 0x42, 0x8d, 0x42, 0x54, 0x2e, 0x86,
-	0x0f, 0x6b, 0x89, 0xa3, 0x14, 0xe2, 0xca, 0x12, 0x8f, 0xc2, 0xd8, 0x5a, 0x7e, 0xdc, 0xb6, 0x39,
-	0x27, 0x24, 0x4a, 0x81, 0x90, 0xca, 0x44, 0xc8, 0x28, 0x24, 0xc4, 0xda, 0x6e, 0xff, 0x2f, 0x72,
-	0x1e, 0xfc, 0x06, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xaa, 0x05, 0x1b, 0xe1, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.pb.go b/googleapis/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.pb.go
index 3a1277e444..80e7be0455 100644
--- a/googleapis/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [DynamicSearchAdsSearchTermViewService.GetDynamicSearchAdsSearchTermView][google.ads.googleads.v1.services.DynamicSearchAdsSearchTermViewService.GetDynamicSearchAdsSearchTermView].
@@ -41,16 +41,17 @@ func (m *GetDynamicSearchAdsSearchTermViewRequest) Reset() {
 func (m *GetDynamicSearchAdsSearchTermViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDynamicSearchAdsSearchTermViewRequest) ProtoMessage()    {}
 func (*GetDynamicSearchAdsSearchTermViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dynamic_search_ads_search_term_view_service_fdd5eab22ce903b6, []int{0}
+	return fileDescriptor_b4acc14a32136684, []int{0}
 }
+
 func (m *GetDynamicSearchAdsSearchTermViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDynamicSearchAdsSearchTermViewRequest.Unmarshal(m, b)
 }
 func (m *GetDynamicSearchAdsSearchTermViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDynamicSearchAdsSearchTermViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDynamicSearchAdsSearchTermViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDynamicSearchAdsSearchTermViewRequest.Merge(dst, src)
+func (m *GetDynamicSearchAdsSearchTermViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDynamicSearchAdsSearchTermViewRequest.Merge(m, src)
 }
 func (m *GetDynamicSearchAdsSearchTermViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDynamicSearchAdsSearchTermViewRequest.Size(m)
@@ -72,6 +73,39 @@ func init() {
 	proto.RegisterType((*GetDynamicSearchAdsSearchTermViewRequest)(nil), "google.ads.googleads.v1.services.GetDynamicSearchAdsSearchTermViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.proto", fileDescriptor_b4acc14a32136684)
+}
+
+var fileDescriptor_b4acc14a32136684 = []byte{
+	// 391 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x6a, 0xdb, 0x40,
+	0x14, 0x85, 0x91, 0x0a, 0x85, 0x8a, 0x76, 0xa3, 0x55, 0x31, 0x5d, 0xb8, 0xae, 0x0b, 0xc6, 0x8b,
+	0x19, 0xd4, 0xee, 0xa6, 0x74, 0x31, 0x6e, 0xc1, 0xfd, 0x81, 0xd6, 0xd8, 0x41, 0x8b, 0x20, 0x10,
+	0x13, 0xcd, 0x45, 0x11, 0x58, 0x1a, 0x67, 0xae, 0x2c, 0x13, 0x42, 0x36, 0x79, 0x83, 0x90, 0x37,
+	0xc8, 0x26, 0x90, 0x47, 0xc9, 0x36, 0xaf, 0x90, 0x55, 0xde, 0x21, 0x10, 0xe4, 0xf1, 0x08, 0xb2,
+	0x90, 0xed, 0xdd, 0x61, 0xe6, 0xf0, 0x9d, 0xb9, 0xf7, 0x8c, 0x37, 0x4d, 0x95, 0x4a, 0xe7, 0x40,
+	0x85, 0x44, 0x6a, 0x64, 0xad, 0xaa, 0x80, 0x22, 0xe8, 0x2a, 0x4b, 0x00, 0xa9, 0x3c, 0x2d, 0x44,
+	0x9e, 0x25, 0x31, 0x82, 0xd0, 0xc9, 0x71, 0x2c, 0x24, 0x5a, 0x59, 0x82, 0xce, 0xe3, 0x2a, 0x83,
+	0x55, 0xbc, 0x31, 0x93, 0x85, 0x56, 0xa5, 0xf2, 0xbb, 0x06, 0x44, 0x84, 0x44, 0xd2, 0x30, 0x49,
+	0x15, 0x10, 0xcb, 0xec, 0xfc, 0x6d, 0x4b, 0xd5, 0x80, 0x6a, 0xa9, 0xf7, 0x8c, 0x35, 0x71, 0x9d,
+	0x0f, 0x16, 0xb6, 0xc8, 0xa8, 0x28, 0x0a, 0x55, 0x8a, 0x32, 0x53, 0x05, 0x9a, 0xdb, 0xde, 0x7f,
+	0x6f, 0x30, 0x86, 0xf2, 0xa7, 0xa1, 0xcd, 0xd6, 0x04, 0x2e, 0xd1, 0x88, 0x03, 0xd0, 0x79, 0x98,
+	0xc1, 0x6a, 0x0a, 0x27, 0x4b, 0xc0, 0xd2, 0xff, 0xe4, 0xbd, 0xb3, 0x0f, 0x88, 0x0b, 0x91, 0xc3,
+	0x7b, 0xa7, 0xeb, 0x0c, 0xde, 0x4c, 0xdf, 0xda, 0xc3, 0x7f, 0x22, 0x87, 0x2f, 0x37, 0xae, 0xf7,
+	0x79, 0x3b, 0x6e, 0x66, 0xc6, 0xf4, 0x9f, 0x1c, 0xef, 0xe3, 0xce, 0x6c, 0xff, 0x0f, 0xd9, 0xb5,
+	0x2e, 0xb2, 0xef, 0x00, 0x1d, 0xde, 0xca, 0x6a, 0x16, 0x4b, 0xb6, 0x93, 0x7a, 0xbf, 0x2f, 0xee,
+	0x1f, 0xae, 0xdc, 0x1f, 0x3e, 0xaf, 0xeb, 0x38, 0x7b, 0xb1, 0x8e, 0xef, 0xc9, 0x12, 0x4b, 0x95,
+	0x83, 0x46, 0x3a, 0xb4, 0xfd, 0xb4, 0x60, 0x90, 0x0e, 0xcf, 0x47, 0x97, 0xae, 0xd7, 0x4f, 0x54,
+	0xbe, 0x73, 0xbe, 0xd1, 0x70, 0xaf, 0x7d, 0x4e, 0xea, 0x3e, 0x27, 0xce, 0xe1, 0xaf, 0x0d, 0x2f,
+	0x55, 0x73, 0x51, 0xa4, 0x44, 0xe9, 0x94, 0xa6, 0x50, 0xac, 0xdb, 0xb6, 0x9f, 0x69, 0x91, 0x61,
+	0xfb, 0x8f, 0xfe, 0x66, 0xc5, 0xb5, 0xfb, 0x6a, 0xcc, 0xf9, 0xad, 0xdb, 0x1d, 0x1b, 0x20, 0x97,
+	0x48, 0x8c, 0xac, 0x55, 0x18, 0x90, 0x4d, 0x30, 0xde, 0x59, 0x4b, 0xc4, 0x25, 0x46, 0x8d, 0x25,
+	0x0a, 0x83, 0xc8, 0x5a, 0x1e, 0xdd, 0xbe, 0x39, 0x67, 0x8c, 0x4b, 0x64, 0xac, 0x31, 0x31, 0x16,
+	0x06, 0x8c, 0x59, 0xdb, 0xd1, 0xeb, 0xf5, 0x3b, 0xbf, 0x3e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x0e,
+	0x7a, 0x64, 0x1d, 0x78, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -145,36 +179,3 @@ var _DynamicSearchAdsSearchTermViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/dynamic_search_ads_search_term_view_service.proto", fileDescriptor_dynamic_search_ads_search_term_view_service_fdd5eab22ce903b6)
-}
-
-var fileDescriptor_dynamic_search_ads_search_term_view_service_fdd5eab22ce903b6 = []byte{
-	// 391 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x6a, 0xdb, 0x40,
-	0x14, 0x85, 0x91, 0x0a, 0x85, 0x8a, 0x76, 0xa3, 0x55, 0x31, 0x5d, 0xb8, 0xae, 0x0b, 0xc6, 0x8b,
-	0x19, 0xd4, 0xee, 0xa6, 0x74, 0x31, 0x6e, 0xc1, 0xfd, 0x81, 0xd6, 0xd8, 0x41, 0x8b, 0x20, 0x10,
-	0x13, 0xcd, 0x45, 0x11, 0x58, 0x1a, 0x67, 0xae, 0x2c, 0x13, 0x42, 0x36, 0x79, 0x83, 0x90, 0x37,
-	0xc8, 0x26, 0x90, 0x47, 0xc9, 0x36, 0xaf, 0x90, 0x55, 0xde, 0x21, 0x10, 0xe4, 0xf1, 0x08, 0xb2,
-	0x90, 0xed, 0xdd, 0x61, 0xe6, 0xf0, 0x9d, 0xb9, 0xf7, 0x8c, 0x37, 0x4d, 0x95, 0x4a, 0xe7, 0x40,
-	0x85, 0x44, 0x6a, 0x64, 0xad, 0xaa, 0x80, 0x22, 0xe8, 0x2a, 0x4b, 0x00, 0xa9, 0x3c, 0x2d, 0x44,
-	0x9e, 0x25, 0x31, 0x82, 0xd0, 0xc9, 0x71, 0x2c, 0x24, 0x5a, 0x59, 0x82, 0xce, 0xe3, 0x2a, 0x83,
-	0x55, 0xbc, 0x31, 0x93, 0x85, 0x56, 0xa5, 0xf2, 0xbb, 0x06, 0x44, 0x84, 0x44, 0xd2, 0x30, 0x49,
-	0x15, 0x10, 0xcb, 0xec, 0xfc, 0x6d, 0x4b, 0xd5, 0x80, 0x6a, 0xa9, 0xf7, 0x8c, 0x35, 0x71, 0x9d,
-	0x0f, 0x16, 0xb6, 0xc8, 0xa8, 0x28, 0x0a, 0x55, 0x8a, 0x32, 0x53, 0x05, 0x9a, 0xdb, 0xde, 0x7f,
-	0x6f, 0x30, 0x86, 0xf2, 0xa7, 0xa1, 0xcd, 0xd6, 0x04, 0x2e, 0xd1, 0x88, 0x03, 0xd0, 0x79, 0x98,
-	0xc1, 0x6a, 0x0a, 0x27, 0x4b, 0xc0, 0xd2, 0xff, 0xe4, 0xbd, 0xb3, 0x0f, 0x88, 0x0b, 0x91, 0xc3,
-	0x7b, 0xa7, 0xeb, 0x0c, 0xde, 0x4c, 0xdf, 0xda, 0xc3, 0x7f, 0x22, 0x87, 0x2f, 0x37, 0xae, 0xf7,
-	0x79, 0x3b, 0x6e, 0x66, 0xc6, 0xf4, 0x9f, 0x1c, 0xef, 0xe3, 0xce, 0x6c, 0xff, 0x0f, 0xd9, 0xb5,
-	0x2e, 0xb2, 0xef, 0x00, 0x1d, 0xde, 0xca, 0x6a, 0x16, 0x4b, 0xb6, 0x93, 0x7a, 0xbf, 0x2f, 0xee,
-	0x1f, 0xae, 0xdc, 0x1f, 0x3e, 0xaf, 0xeb, 0x38, 0x7b, 0xb1, 0x8e, 0xef, 0xc9, 0x12, 0x4b, 0x95,
-	0x83, 0x46, 0x3a, 0xb4, 0xfd, 0xb4, 0x60, 0x90, 0x0e, 0xcf, 0x47, 0x97, 0xae, 0xd7, 0x4f, 0x54,
-	0xbe, 0x73, 0xbe, 0xd1, 0x70, 0xaf, 0x7d, 0x4e, 0xea, 0x3e, 0x27, 0xce, 0xe1, 0xaf, 0x0d, 0x2f,
-	0x55, 0x73, 0x51, 0xa4, 0x44, 0xe9, 0x94, 0xa6, 0x50, 0xac, 0xdb, 0xb6, 0x9f, 0x69, 0x91, 0x61,
-	0xfb, 0x8f, 0xfe, 0x66, 0xc5, 0xb5, 0xfb, 0x6a, 0xcc, 0xf9, 0xad, 0xdb, 0x1d, 0x1b, 0x20, 0x97,
-	0x48, 0x8c, 0xac, 0x55, 0x18, 0x90, 0x4d, 0x30, 0xde, 0x59, 0x4b, 0xc4, 0x25, 0x46, 0x8d, 0x25,
-	0x0a, 0x83, 0xc8, 0x5a, 0x1e, 0xdd, 0xbe, 0x39, 0x67, 0x8c, 0x4b, 0x64, 0xac, 0x31, 0x31, 0x16,
-	0x06, 0x8c, 0x59, 0xdb, 0xd1, 0xeb, 0xf5, 0x3b, 0xbf, 0x3e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x0e,
-	0x7a, 0x64, 0x1d, 0x78, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/expanded_landing_page_view_service.pb.go b/googleapis/ads/googleads/v1/services/expanded_landing_page_view_service.pb.go
index 37a0344f7c..6f7e05a49d 100644
--- a/googleapis/ads/googleads/v1/services/expanded_landing_page_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/expanded_landing_page_view_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/expanded_landing_page_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [ExpandedLandingPageViewService.GetExpandedLandingPageView][google.ads.googleads.v1.services.ExpandedLandingPageViewService.GetExpandedLandingPageView].
@@ -40,16 +40,17 @@ func (m *GetExpandedLandingPageViewRequest) Reset()         { *m = GetExpandedLa
 func (m *GetExpandedLandingPageViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetExpandedLandingPageViewRequest) ProtoMessage()    {}
 func (*GetExpandedLandingPageViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expanded_landing_page_view_service_f73ccb2dea9fee66, []int{0}
+	return fileDescriptor_d9246f2676cd9670, []int{0}
 }
+
 func (m *GetExpandedLandingPageViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetExpandedLandingPageViewRequest.Unmarshal(m, b)
 }
 func (m *GetExpandedLandingPageViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetExpandedLandingPageViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetExpandedLandingPageViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetExpandedLandingPageViewRequest.Merge(dst, src)
+func (m *GetExpandedLandingPageViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetExpandedLandingPageViewRequest.Merge(m, src)
 }
 func (m *GetExpandedLandingPageViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetExpandedLandingPageViewRequest.Size(m)
@@ -71,6 +72,39 @@ func init() {
 	proto.RegisterType((*GetExpandedLandingPageViewRequest)(nil), "google.ads.googleads.v1.services.GetExpandedLandingPageViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/expanded_landing_page_view_service.proto", fileDescriptor_d9246f2676cd9670)
+}
+
+var fileDescriptor_d9246f2676cd9670 = []byte{
+	// 398 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x8b, 0xdb, 0x30,
+	0x14, 0xc6, 0x2e, 0x14, 0x6a, 0xda, 0xc5, 0x53, 0x31, 0x25, 0xa4, 0x49, 0x86, 0x92, 0x41, 0xc2,
+	0xed, 0xa6, 0xb6, 0x83, 0x5d, 0x4a, 0x52, 0x28, 0x25, 0xa4, 0xe0, 0xa1, 0x18, 0x8c, 0x12, 0xbd,
+	0x0a, 0x43, 0x2c, 0xb9, 0x92, 0xed, 0x14, 0x4a, 0x97, 0xd2, 0xe9, 0xd6, 0xfb, 0x07, 0x37, 0xde,
+	0x4f, 0xb9, 0xf5, 0x7e, 0xc1, 0xc1, 0x4d, 0xf7, 0x2b, 0x0e, 0x47, 0x96, 0xe1, 0x0e, 0x9c, 0x6c,
+	0x9f, 0xf4, 0x3e, 0x7d, 0xdf, 0x7b, 0xef, 0x93, 0xf7, 0x85, 0x4b, 0xc9, 0x77, 0x80, 0x29, 0xd3,
+	0xd8, 0xc0, 0x16, 0x35, 0x21, 0xd6, 0xa0, 0x9a, 0x7c, 0x0b, 0x1a, 0xc3, 0xef, 0x92, 0x0a, 0x06,
+	0x2c, 0xdb, 0x51, 0xc1, 0x72, 0xc1, 0xb3, 0x92, 0x72, 0xc8, 0x9a, 0x1c, 0xf6, 0x59, 0xc7, 0x41,
+	0xa5, 0x92, 0x95, 0xf4, 0xc7, 0xe6, 0x3d, 0xa2, 0x4c, 0xa3, 0x5e, 0x0a, 0x35, 0x21, 0xb2, 0x52,
+	0x41, 0x3c, 0x64, 0xa6, 0x40, 0xcb, 0x5a, 0x1d, 0x77, 0x33, 0x2e, 0xc1, 0x2b, 0xab, 0x51, 0xe6,
+	0x98, 0x0a, 0x21, 0x2b, 0x5a, 0xe5, 0x52, 0xe8, 0xae, 0x3a, 0xea, 0xaa, 0x87, 0xd3, 0xa6, 0xfe,
+	0x89, 0xf7, 0x8a, 0x96, 0x25, 0xa8, 0xae, 0x3e, 0x59, 0x7a, 0xaf, 0x17, 0x50, 0x7d, 0xee, 0x4c,
+	0xbe, 0x1a, 0x8f, 0x15, 0xe5, 0x90, 0xe4, 0xb0, 0x5f, 0xc3, 0xaf, 0x1a, 0x74, 0xe5, 0x4f, 0xbd,
+	0x17, 0xb6, 0xa1, 0x4c, 0xd0, 0x02, 0x5e, 0x3a, 0x63, 0xe7, 0xcd, 0xb3, 0xf5, 0x73, 0x7b, 0xf9,
+	0x8d, 0x16, 0xf0, 0xf6, 0xbf, 0xeb, 0x8d, 0x06, 0x74, 0xbe, 0x9b, 0x79, 0xfd, 0x1b, 0xc7, 0x0b,
+	0x86, 0xdd, 0xfc, 0x4f, 0xe8, 0xd4, 0xc2, 0xd0, 0xc9, 0x5e, 0x03, 0x32, 0x28, 0xd2, 0xef, 0x14,
+	0x0d, 0x48, 0x4c, 0xe2, 0x7f, 0xd7, 0xb7, 0xe7, 0xee, 0x07, 0x9f, 0xb4, 0x11, 0xfc, 0x79, 0x30,
+	0xf2, 0xc7, 0x6d, 0xad, 0x2b, 0x59, 0x80, 0xd2, 0x78, 0xde, 0x67, 0xf2, 0xe8, 0xbd, 0xc6, 0xf3,
+	0xbf, 0xf1, 0x99, 0xeb, 0xcd, 0xb6, 0xb2, 0x38, 0x39, 0x4a, 0x3c, 0x3d, 0xbe, 0xac, 0x55, 0x1b,
+	0xcf, 0xca, 0xf9, 0xb1, 0xec, 0x84, 0xb8, 0xdc, 0x51, 0xc1, 0x91, 0x54, 0x1c, 0x73, 0x10, 0x87,
+	0xf0, 0xec, 0x97, 0x29, 0x73, 0x3d, 0xfc, 0x5d, 0xdf, 0x5b, 0x70, 0xe1, 0x3e, 0x59, 0x44, 0xd1,
+	0xa5, 0x3b, 0x5e, 0x18, 0xc1, 0x88, 0x69, 0x64, 0x60, 0x8b, 0x92, 0x10, 0x75, 0xc6, 0xfa, 0xca,
+	0x52, 0xd2, 0x88, 0xe9, 0xb4, 0xa7, 0xa4, 0x49, 0x98, 0x5a, 0xca, 0x9d, 0x3b, 0x33, 0xf7, 0x84,
+	0x44, 0x4c, 0x13, 0xd2, 0x93, 0x08, 0x49, 0x42, 0x42, 0x2c, 0x6d, 0xf3, 0xf4, 0xd0, 0xe7, 0xbb,
+	0xfb, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xc2, 0x24, 0x75, 0x55, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -144,36 +178,3 @@ var _ExpandedLandingPageViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/expanded_landing_page_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/expanded_landing_page_view_service.proto", fileDescriptor_expanded_landing_page_view_service_f73ccb2dea9fee66)
-}
-
-var fileDescriptor_expanded_landing_page_view_service_f73ccb2dea9fee66 = []byte{
-	// 398 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x8b, 0xdb, 0x30,
-	0x14, 0xc6, 0x2e, 0x14, 0x6a, 0xda, 0xc5, 0x53, 0x31, 0x25, 0xa4, 0x49, 0x86, 0x92, 0x41, 0xc2,
-	0xed, 0xa6, 0xb6, 0x83, 0x5d, 0x4a, 0x52, 0x28, 0x25, 0xa4, 0xe0, 0xa1, 0x18, 0x8c, 0x12, 0xbd,
-	0x0a, 0x43, 0x2c, 0xb9, 0x92, 0xed, 0x14, 0x4a, 0x97, 0xd2, 0xe9, 0xd6, 0xfb, 0x07, 0x37, 0xde,
-	0x4f, 0xb9, 0xf5, 0x7e, 0xc1, 0xc1, 0x4d, 0xf7, 0x2b, 0x0e, 0x47, 0x96, 0xe1, 0x0e, 0x9c, 0x6c,
-	0x9f, 0xf4, 0x3e, 0x7d, 0xdf, 0x7b, 0xef, 0x93, 0xf7, 0x85, 0x4b, 0xc9, 0x77, 0x80, 0x29, 0xd3,
-	0xd8, 0xc0, 0x16, 0x35, 0x21, 0xd6, 0xa0, 0x9a, 0x7c, 0x0b, 0x1a, 0xc3, 0xef, 0x92, 0x0a, 0x06,
-	0x2c, 0xdb, 0x51, 0xc1, 0x72, 0xc1, 0xb3, 0x92, 0x72, 0xc8, 0x9a, 0x1c, 0xf6, 0x59, 0xc7, 0x41,
-	0xa5, 0x92, 0x95, 0xf4, 0xc7, 0xe6, 0x3d, 0xa2, 0x4c, 0xa3, 0x5e, 0x0a, 0x35, 0x21, 0xb2, 0x52,
-	0x41, 0x3c, 0x64, 0xa6, 0x40, 0xcb, 0x5a, 0x1d, 0x77, 0x33, 0x2e, 0xc1, 0x2b, 0xab, 0x51, 0xe6,
-	0x98, 0x0a, 0x21, 0x2b, 0x5a, 0xe5, 0x52, 0xe8, 0xae, 0x3a, 0xea, 0xaa, 0x87, 0xd3, 0xa6, 0xfe,
-	0x89, 0xf7, 0x8a, 0x96, 0x25, 0xa8, 0xae, 0x3e, 0x59, 0x7a, 0xaf, 0x17, 0x50, 0x7d, 0xee, 0x4c,
-	0xbe, 0x1a, 0x8f, 0x15, 0xe5, 0x90, 0xe4, 0xb0, 0x5f, 0xc3, 0xaf, 0x1a, 0x74, 0xe5, 0x4f, 0xbd,
-	0x17, 0xb6, 0xa1, 0x4c, 0xd0, 0x02, 0x5e, 0x3a, 0x63, 0xe7, 0xcd, 0xb3, 0xf5, 0x73, 0x7b, 0xf9,
-	0x8d, 0x16, 0xf0, 0xf6, 0xbf, 0xeb, 0x8d, 0x06, 0x74, 0xbe, 0x9b, 0x79, 0xfd, 0x1b, 0xc7, 0x0b,
-	0x86, 0xdd, 0xfc, 0x4f, 0xe8, 0xd4, 0xc2, 0xd0, 0xc9, 0x5e, 0x03, 0x32, 0x28, 0xd2, 0xef, 0x14,
-	0x0d, 0x48, 0x4c, 0xe2, 0x7f, 0xd7, 0xb7, 0xe7, 0xee, 0x07, 0x9f, 0xb4, 0x11, 0xfc, 0x79, 0x30,
-	0xf2, 0xc7, 0x6d, 0xad, 0x2b, 0x59, 0x80, 0xd2, 0x78, 0xde, 0x67, 0xf2, 0xe8, 0xbd, 0xc6, 0xf3,
-	0xbf, 0xf1, 0x99, 0xeb, 0xcd, 0xb6, 0xb2, 0x38, 0x39, 0x4a, 0x3c, 0x3d, 0xbe, 0xac, 0x55, 0x1b,
-	0xcf, 0xca, 0xf9, 0xb1, 0xec, 0x84, 0xb8, 0xdc, 0x51, 0xc1, 0x91, 0x54, 0x1c, 0x73, 0x10, 0x87,
-	0xf0, 0xec, 0x97, 0x29, 0x73, 0x3d, 0xfc, 0x5d, 0xdf, 0x5b, 0x70, 0xe1, 0x3e, 0x59, 0x44, 0xd1,
-	0xa5, 0x3b, 0x5e, 0x18, 0xc1, 0x88, 0x69, 0x64, 0x60, 0x8b, 0x92, 0x10, 0x75, 0xc6, 0xfa, 0xca,
-	0x52, 0xd2, 0x88, 0xe9, 0xb4, 0xa7, 0xa4, 0x49, 0x98, 0x5a, 0xca, 0x9d, 0x3b, 0x33, 0xf7, 0x84,
-	0x44, 0x4c, 0x13, 0xd2, 0x93, 0x08, 0x49, 0x42, 0x42, 0x2c, 0x6d, 0xf3, 0xf4, 0xd0, 0xe7, 0xbb,
-	0xfb, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xc2, 0x24, 0x75, 0x55, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/extension_feed_item_service.pb.go b/googleapis/ads/googleads/v1/services/extension_feed_item_service.pb.go
index 132127f7c2..f421b45f9c 100644
--- a/googleapis/ads/googleads/v1/services/extension_feed_item_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/extension_feed_item_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/extension_feed_item_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ExtensionFeedItemService.GetExtensionFeedItem][google.ads.googleads.v1.services.ExtensionFeedItemService.GetExtensionFeedItem].
 type GetExtensionFeedItemRequest struct {
@@ -40,16 +40,17 @@ func (m *GetExtensionFeedItemRequest) Reset()         { *m = GetExtensionFeedIte
 func (m *GetExtensionFeedItemRequest) String() string { return proto.CompactTextString(m) }
 func (*GetExtensionFeedItemRequest) ProtoMessage()    {}
 func (*GetExtensionFeedItemRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_service_7f4cbaf9bfb19d81, []int{0}
+	return fileDescriptor_e6e6bc4adf2cef65, []int{0}
 }
+
 func (m *GetExtensionFeedItemRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetExtensionFeedItemRequest.Unmarshal(m, b)
 }
 func (m *GetExtensionFeedItemRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetExtensionFeedItemRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetExtensionFeedItemRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetExtensionFeedItemRequest.Merge(dst, src)
+func (m *GetExtensionFeedItemRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetExtensionFeedItemRequest.Merge(m, src)
 }
 func (m *GetExtensionFeedItemRequest) XXX_Size() int {
 	return xxx_messageInfo_GetExtensionFeedItemRequest.Size(m)
@@ -86,16 +87,17 @@ func (m *MutateExtensionFeedItemsRequest) Reset()         { *m = MutateExtension
 func (m *MutateExtensionFeedItemsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateExtensionFeedItemsRequest) ProtoMessage()    {}
 func (*MutateExtensionFeedItemsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_service_7f4cbaf9bfb19d81, []int{1}
+	return fileDescriptor_e6e6bc4adf2cef65, []int{1}
 }
+
 func (m *MutateExtensionFeedItemsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateExtensionFeedItemsRequest.Unmarshal(m, b)
 }
 func (m *MutateExtensionFeedItemsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateExtensionFeedItemsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateExtensionFeedItemsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateExtensionFeedItemsRequest.Merge(dst, src)
+func (m *MutateExtensionFeedItemsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateExtensionFeedItemsRequest.Merge(m, src)
 }
 func (m *MutateExtensionFeedItemsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateExtensionFeedItemsRequest.Size(m)
@@ -147,16 +149,17 @@ func (m *ExtensionFeedItemOperation) Reset()         { *m = ExtensionFeedItemOpe
 func (m *ExtensionFeedItemOperation) String() string { return proto.CompactTextString(m) }
 func (*ExtensionFeedItemOperation) ProtoMessage()    {}
 func (*ExtensionFeedItemOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_service_7f4cbaf9bfb19d81, []int{2}
+	return fileDescriptor_e6e6bc4adf2cef65, []int{2}
 }
+
 func (m *ExtensionFeedItemOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtensionFeedItemOperation.Unmarshal(m, b)
 }
 func (m *ExtensionFeedItemOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExtensionFeedItemOperation.Marshal(b, m, deterministic)
 }
-func (dst *ExtensionFeedItemOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtensionFeedItemOperation.Merge(dst, src)
+func (m *ExtensionFeedItemOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionFeedItemOperation.Merge(m, src)
 }
 func (m *ExtensionFeedItemOperation) XXX_Size() int {
 	return xxx_messageInfo_ExtensionFeedItemOperation.Size(m)
@@ -224,95 +227,15 @@ func (m *ExtensionFeedItemOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExtensionFeedItemOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExtensionFeedItemOperation_OneofMarshaler, _ExtensionFeedItemOperation_OneofUnmarshaler, _ExtensionFeedItemOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExtensionFeedItemOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExtensionFeedItemOperation_Create)(nil),
 		(*ExtensionFeedItemOperation_Update)(nil),
 		(*ExtensionFeedItemOperation_Remove)(nil),
 	}
 }
 
-func _ExtensionFeedItemOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExtensionFeedItemOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *ExtensionFeedItemOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *ExtensionFeedItemOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *ExtensionFeedItemOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("ExtensionFeedItemOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExtensionFeedItemOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExtensionFeedItemOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.ExtensionFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Operation = &ExtensionFeedItemOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.ExtensionFeedItem)
-		err := b.DecodeMessage(msg)
-		m.Operation = &ExtensionFeedItemOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &ExtensionFeedItemOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExtensionFeedItemOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExtensionFeedItemOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *ExtensionFeedItemOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItemOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExtensionFeedItemOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an extension feed item mutate.
 type MutateExtensionFeedItemsResponse struct {
 	// All results for the mutate.
@@ -326,16 +249,17 @@ func (m *MutateExtensionFeedItemsResponse) Reset()         { *m = MutateExtensio
 func (m *MutateExtensionFeedItemsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateExtensionFeedItemsResponse) ProtoMessage()    {}
 func (*MutateExtensionFeedItemsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_service_7f4cbaf9bfb19d81, []int{3}
+	return fileDescriptor_e6e6bc4adf2cef65, []int{3}
 }
+
 func (m *MutateExtensionFeedItemsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateExtensionFeedItemsResponse.Unmarshal(m, b)
 }
 func (m *MutateExtensionFeedItemsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateExtensionFeedItemsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateExtensionFeedItemsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateExtensionFeedItemsResponse.Merge(dst, src)
+func (m *MutateExtensionFeedItemsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateExtensionFeedItemsResponse.Merge(m, src)
 }
 func (m *MutateExtensionFeedItemsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateExtensionFeedItemsResponse.Size(m)
@@ -366,16 +290,17 @@ func (m *MutateExtensionFeedItemResult) Reset()         { *m = MutateExtensionFe
 func (m *MutateExtensionFeedItemResult) String() string { return proto.CompactTextString(m) }
 func (*MutateExtensionFeedItemResult) ProtoMessage()    {}
 func (*MutateExtensionFeedItemResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extension_feed_item_service_7f4cbaf9bfb19d81, []int{4}
+	return fileDescriptor_e6e6bc4adf2cef65, []int{4}
 }
+
 func (m *MutateExtensionFeedItemResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateExtensionFeedItemResult.Unmarshal(m, b)
 }
 func (m *MutateExtensionFeedItemResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateExtensionFeedItemResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateExtensionFeedItemResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateExtensionFeedItemResult.Merge(dst, src)
+func (m *MutateExtensionFeedItemResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateExtensionFeedItemResult.Merge(m, src)
 }
 func (m *MutateExtensionFeedItemResult) XXX_Size() int {
 	return xxx_messageInfo_MutateExtensionFeedItemResult.Size(m)
@@ -401,6 +326,55 @@ func init() {
 	proto.RegisterType((*MutateExtensionFeedItemResult)(nil), "google.ads.googleads.v1.services.MutateExtensionFeedItemResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/extension_feed_item_service.proto", fileDescriptor_e6e6bc4adf2cef65)
+}
+
+var fileDescriptor_e6e6bc4adf2cef65 = []byte{
+	// 656 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xc7, 0xb1, 0x83, 0x0a, 0xdd, 0x94, 0x8b, 0xc5, 0xc1, 0x0a, 0x94, 0x46, 0xa6, 0x87, 0x2a,
+	0x07, 0x5b, 0x09, 0x15, 0x48, 0x6e, 0x2b, 0x14, 0x0b, 0xfa, 0x71, 0xe8, 0x87, 0x8c, 0x54, 0x09,
+	0x14, 0xc9, 0xda, 0xc6, 0xd3, 0xc8, 0xaa, 0xed, 0x35, 0xbb, 0xeb, 0x40, 0x55, 0xf5, 0x82, 0x78,
+	0x03, 0x5e, 0x00, 0x71, 0xe4, 0x3d, 0x38, 0xc0, 0x81, 0x0b, 0xaf, 0x00, 0x17, 0x9e, 0x02, 0xad,
+	0xd7, 0xeb, 0x16, 0x52, 0x37, 0xa8, 0xbd, 0x4d, 0x76, 0xc7, 0xbf, 0xd9, 0xff, 0xfc, 0x77, 0x36,
+	0xc8, 0x1b, 0x11, 0x32, 0x8a, 0xc1, 0xc1, 0x21, 0x73, 0x64, 0x28, 0xa2, 0x71, 0xd7, 0x61, 0x40,
+	0xc7, 0xd1, 0x10, 0x98, 0x03, 0x6f, 0x39, 0xa4, 0x2c, 0x22, 0x69, 0x70, 0x08, 0x10, 0x06, 0x11,
+	0x87, 0x24, 0x28, 0x37, 0xed, 0x8c, 0x12, 0x4e, 0x8c, 0xb6, 0xfc, 0xd0, 0xc6, 0x21, 0xb3, 0x2b,
+	0x86, 0x3d, 0xee, 0xda, 0x8a, 0xd1, 0x5a, 0xa9, 0xab, 0x42, 0x81, 0x91, 0x9c, 0xd6, 0x94, 0x91,
+	0xf8, 0xd6, 0x7d, 0xf5, 0x71, 0x16, 0x39, 0x38, 0x4d, 0x09, 0xc7, 0x3c, 0x22, 0x29, 0x2b, 0x77,
+	0xcb, 0xe2, 0x4e, 0xf1, 0xeb, 0x20, 0x3f, 0x74, 0x0e, 0x23, 0x88, 0xc3, 0x20, 0xc1, 0xec, 0xa8,
+	0xcc, 0x78, 0xf0, 0x6f, 0xc6, 0x1b, 0x8a, 0xb3, 0x0c, 0x68, 0x49, 0xb0, 0x3c, 0x74, 0x6f, 0x03,
+	0xf8, 0x73, 0x55, 0x7f, 0x1d, 0x20, 0xdc, 0xe2, 0x90, 0xf8, 0xf0, 0x3a, 0x07, 0xc6, 0x8d, 0x87,
+	0xe8, 0x8e, 0x3a, 0x65, 0x90, 0xe2, 0x04, 0x4c, 0xad, 0xad, 0x2d, 0xcd, 0xfa, 0x73, 0x6a, 0x71,
+	0x07, 0x27, 0x60, 0x7d, 0xd1, 0xd0, 0xc2, 0x76, 0xce, 0x31, 0x87, 0x09, 0x0e, 0x53, 0xa0, 0x05,
+	0xd4, 0x1c, 0xe6, 0x8c, 0x93, 0x04, 0x68, 0x10, 0x85, 0x25, 0x06, 0xa9, 0xa5, 0xad, 0xd0, 0x18,
+	0x20, 0x44, 0x32, 0xa0, 0x52, 0x9e, 0xa9, 0xb7, 0x1b, 0x4b, 0xcd, 0xde, 0xaa, 0x3d, 0xad, 0xb9,
+	0xf6, 0x44, 0xc5, 0x5d, 0x05, 0xf1, 0xcf, 0xf1, 0x84, 0x8e, 0x31, 0x8e, 0xa3, 0x10, 0x73, 0x08,
+	0x48, 0x1a, 0x1f, 0x9b, 0x37, 0xdb, 0xda, 0xd2, 0x6d, 0x7f, 0x4e, 0x2d, 0xee, 0xa6, 0xf1, 0xb1,
+	0xf5, 0x51, 0x47, 0xad, 0x7a, 0x9e, 0xb1, 0x82, 0x9a, 0x79, 0x56, 0x10, 0x44, 0x7f, 0x0b, 0x42,
+	0xb3, 0xd7, 0x52, 0x47, 0x54, 0x0d, 0xb6, 0xd7, 0x85, 0x05, 0xdb, 0x98, 0x1d, 0xf9, 0x48, 0xa6,
+	0x8b, 0xd8, 0xd8, 0x41, 0x33, 0x43, 0x0a, 0x98, 0xcb, 0x0e, 0x36, 0x7b, 0xcb, 0xb5, 0xd2, 0xaa,
+	0x5b, 0x31, 0xa9, 0x6d, 0xf3, 0x86, 0x5f, 0x52, 0x04, 0x4f, 0xd2, 0x4d, 0xfd, 0x7a, 0x3c, 0x49,
+	0x31, 0x4c, 0x34, 0x43, 0x21, 0x21, 0x63, 0x30, 0x1b, 0xc2, 0x1a, 0xb1, 0x23, 0x7f, 0x7b, 0x4d,
+	0x34, 0x5b, 0x35, 0xd2, 0x3a, 0x45, 0xed, 0x7a, 0xa7, 0x59, 0x46, 0x52, 0x06, 0xc6, 0x4b, 0x74,
+	0x8b, 0x02, 0xcb, 0x63, 0xae, 0x6c, 0x7c, 0x3a, 0xdd, 0xc6, 0x1a, 0xa8, 0x5f, 0x70, 0x7c, 0xc5,
+	0xb3, 0x9e, 0xa1, 0xf9, 0x4b, 0x33, 0xff, 0xeb, 0xbe, 0xf6, 0xbe, 0x37, 0x90, 0x39, 0x01, 0x78,
+	0x21, 0x8f, 0x62, 0x7c, 0xd5, 0xd0, 0xdd, 0x8b, 0x26, 0xc2, 0x58, 0x9b, 0xae, 0xe2, 0x92, 0x49,
+	0x6a, 0x5d, 0xc9, 0x20, 0x6b, 0xf5, 0xdd, 0x8f, 0x9f, 0x1f, 0xf4, 0xc7, 0xc6, 0xb2, 0x78, 0x2f,
+	0x4e, 0xfe, 0x92, 0xb6, 0xa6, 0x86, 0x87, 0x39, 0x9d, 0xb3, 0x07, 0xa4, 0xb2, 0xc3, 0xe9, 0x9c,
+	0x1a, 0xbf, 0x34, 0x64, 0xd6, 0xd9, 0x65, 0xf4, 0xaf, 0xec, 0x8a, 0x1a, 0xea, 0x96, 0x77, 0x1d,
+	0x84, 0xbc, 0x2d, 0x96, 0x57, 0x28, 0x5c, 0xb5, 0x9e, 0x08, 0x85, 0x67, 0x92, 0x4e, 0xce, 0xbd,
+	0x16, 0x6b, 0x9d, 0xd3, 0x0b, 0x04, 0xba, 0x49, 0x81, 0x76, 0xb5, 0x8e, 0xf7, 0x5e, 0x47, 0x8b,
+	0x43, 0x92, 0x4c, 0x3d, 0x8d, 0x37, 0x5f, 0x67, 0xfb, 0x9e, 0x98, 0xde, 0x3d, 0xed, 0xd5, 0x66,
+	0x89, 0x18, 0x91, 0x18, 0xa7, 0x23, 0x9b, 0xd0, 0x91, 0x33, 0x82, 0xb4, 0x98, 0x6d, 0xf5, 0x76,
+	0x67, 0x11, 0xab, 0xff, 0xc3, 0x58, 0x51, 0xc1, 0x27, 0xbd, 0xb1, 0xd1, 0xef, 0x7f, 0xd6, 0xdb,
+	0x1b, 0x12, 0xd8, 0x0f, 0x99, 0x2d, 0x43, 0x11, 0xed, 0x77, 0xed, 0xb2, 0x30, 0xfb, 0xa6, 0x52,
+	0x06, 0xfd, 0x90, 0x0d, 0xaa, 0x94, 0xc1, 0x7e, 0x77, 0xa0, 0x52, 0x7e, 0xeb, 0x8b, 0x72, 0xdd,
+	0x75, 0xfb, 0x21, 0x73, 0xdd, 0x2a, 0xc9, 0x75, 0xf7, 0xbb, 0xae, 0xab, 0xd2, 0x0e, 0x66, 0x8a,
+	0x73, 0x3e, 0xfa, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x46, 0x4e, 0x27, 0xd7, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -511,52 +485,3 @@ var _ExtensionFeedItemService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/extension_feed_item_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/extension_feed_item_service.proto", fileDescriptor_extension_feed_item_service_7f4cbaf9bfb19d81)
-}
-
-var fileDescriptor_extension_feed_item_service_7f4cbaf9bfb19d81 = []byte{
-	// 656 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xc7, 0xb1, 0x83, 0x0a, 0xdd, 0x94, 0x8b, 0xc5, 0xc1, 0x0a, 0x94, 0x46, 0xa6, 0x87, 0x2a,
-	0x07, 0x5b, 0x09, 0x15, 0x48, 0x6e, 0x2b, 0x14, 0x0b, 0xfa, 0x71, 0xe8, 0x87, 0x8c, 0x54, 0x09,
-	0x14, 0xc9, 0xda, 0xc6, 0xd3, 0xc8, 0xaa, 0xed, 0x35, 0xbb, 0xeb, 0x40, 0x55, 0xf5, 0x82, 0x78,
-	0x03, 0x5e, 0x00, 0x71, 0xe4, 0x3d, 0x38, 0xc0, 0x81, 0x0b, 0xaf, 0x00, 0x17, 0x9e, 0x02, 0xad,
-	0xd7, 0xeb, 0x16, 0x52, 0x37, 0xa8, 0xbd, 0x4d, 0x76, 0xc7, 0xbf, 0xd9, 0xff, 0xfc, 0x77, 0x36,
-	0xc8, 0x1b, 0x11, 0x32, 0x8a, 0xc1, 0xc1, 0x21, 0x73, 0x64, 0x28, 0xa2, 0x71, 0xd7, 0x61, 0x40,
-	0xc7, 0xd1, 0x10, 0x98, 0x03, 0x6f, 0x39, 0xa4, 0x2c, 0x22, 0x69, 0x70, 0x08, 0x10, 0x06, 0x11,
-	0x87, 0x24, 0x28, 0x37, 0xed, 0x8c, 0x12, 0x4e, 0x8c, 0xb6, 0xfc, 0xd0, 0xc6, 0x21, 0xb3, 0x2b,
-	0x86, 0x3d, 0xee, 0xda, 0x8a, 0xd1, 0x5a, 0xa9, 0xab, 0x42, 0x81, 0x91, 0x9c, 0xd6, 0x94, 0x91,
-	0xf8, 0xd6, 0x7d, 0xf5, 0x71, 0x16, 0x39, 0x38, 0x4d, 0x09, 0xc7, 0x3c, 0x22, 0x29, 0x2b, 0x77,
-	0xcb, 0xe2, 0x4e, 0xf1, 0xeb, 0x20, 0x3f, 0x74, 0x0e, 0x23, 0x88, 0xc3, 0x20, 0xc1, 0xec, 0xa8,
-	0xcc, 0x78, 0xf0, 0x6f, 0xc6, 0x1b, 0x8a, 0xb3, 0x0c, 0x68, 0x49, 0xb0, 0x3c, 0x74, 0x6f, 0x03,
-	0xf8, 0x73, 0x55, 0x7f, 0x1d, 0x20, 0xdc, 0xe2, 0x90, 0xf8, 0xf0, 0x3a, 0x07, 0xc6, 0x8d, 0x87,
-	0xe8, 0x8e, 0x3a, 0x65, 0x90, 0xe2, 0x04, 0x4c, 0xad, 0xad, 0x2d, 0xcd, 0xfa, 0x73, 0x6a, 0x71,
-	0x07, 0x27, 0x60, 0x7d, 0xd1, 0xd0, 0xc2, 0x76, 0xce, 0x31, 0x87, 0x09, 0x0e, 0x53, 0xa0, 0x05,
-	0xd4, 0x1c, 0xe6, 0x8c, 0x93, 0x04, 0x68, 0x10, 0x85, 0x25, 0x06, 0xa9, 0xa5, 0xad, 0xd0, 0x18,
-	0x20, 0x44, 0x32, 0xa0, 0x52, 0x9e, 0xa9, 0xb7, 0x1b, 0x4b, 0xcd, 0xde, 0xaa, 0x3d, 0xad, 0xb9,
-	0xf6, 0x44, 0xc5, 0x5d, 0x05, 0xf1, 0xcf, 0xf1, 0x84, 0x8e, 0x31, 0x8e, 0xa3, 0x10, 0x73, 0x08,
-	0x48, 0x1a, 0x1f, 0x9b, 0x37, 0xdb, 0xda, 0xd2, 0x6d, 0x7f, 0x4e, 0x2d, 0xee, 0xa6, 0xf1, 0xb1,
-	0xf5, 0x51, 0x47, 0xad, 0x7a, 0x9e, 0xb1, 0x82, 0x9a, 0x79, 0x56, 0x10, 0x44, 0x7f, 0x0b, 0x42,
-	0xb3, 0xd7, 0x52, 0x47, 0x54, 0x0d, 0xb6, 0xd7, 0x85, 0x05, 0xdb, 0x98, 0x1d, 0xf9, 0x48, 0xa6,
-	0x8b, 0xd8, 0xd8, 0x41, 0x33, 0x43, 0x0a, 0x98, 0xcb, 0x0e, 0x36, 0x7b, 0xcb, 0xb5, 0xd2, 0xaa,
-	0x5b, 0x31, 0xa9, 0x6d, 0xf3, 0x86, 0x5f, 0x52, 0x04, 0x4f, 0xd2, 0x4d, 0xfd, 0x7a, 0x3c, 0x49,
-	0x31, 0x4c, 0x34, 0x43, 0x21, 0x21, 0x63, 0x30, 0x1b, 0xc2, 0x1a, 0xb1, 0x23, 0x7f, 0x7b, 0x4d,
-	0x34, 0x5b, 0x35, 0xd2, 0x3a, 0x45, 0xed, 0x7a, 0xa7, 0x59, 0x46, 0x52, 0x06, 0xc6, 0x4b, 0x74,
-	0x8b, 0x02, 0xcb, 0x63, 0xae, 0x6c, 0x7c, 0x3a, 0xdd, 0xc6, 0x1a, 0xa8, 0x5f, 0x70, 0x7c, 0xc5,
-	0xb3, 0x9e, 0xa1, 0xf9, 0x4b, 0x33, 0xff, 0xeb, 0xbe, 0xf6, 0xbe, 0x37, 0x90, 0x39, 0x01, 0x78,
-	0x21, 0x8f, 0x62, 0x7c, 0xd5, 0xd0, 0xdd, 0x8b, 0x26, 0xc2, 0x58, 0x9b, 0xae, 0xe2, 0x92, 0x49,
-	0x6a, 0x5d, 0xc9, 0x20, 0x6b, 0xf5, 0xdd, 0x8f, 0x9f, 0x1f, 0xf4, 0xc7, 0xc6, 0xb2, 0x78, 0x2f,
-	0x4e, 0xfe, 0x92, 0xb6, 0xa6, 0x86, 0x87, 0x39, 0x9d, 0xb3, 0x07, 0xa4, 0xb2, 0xc3, 0xe9, 0x9c,
-	0x1a, 0xbf, 0x34, 0x64, 0xd6, 0xd9, 0x65, 0xf4, 0xaf, 0xec, 0x8a, 0x1a, 0xea, 0x96, 0x77, 0x1d,
-	0x84, 0xbc, 0x2d, 0x96, 0x57, 0x28, 0x5c, 0xb5, 0x9e, 0x08, 0x85, 0x67, 0x92, 0x4e, 0xce, 0xbd,
-	0x16, 0x6b, 0x9d, 0xd3, 0x0b, 0x04, 0xba, 0x49, 0x81, 0x76, 0xb5, 0x8e, 0xf7, 0x5e, 0x47, 0x8b,
-	0x43, 0x92, 0x4c, 0x3d, 0x8d, 0x37, 0x5f, 0x67, 0xfb, 0x9e, 0x98, 0xde, 0x3d, 0xed, 0xd5, 0x66,
-	0x89, 0x18, 0x91, 0x18, 0xa7, 0x23, 0x9b, 0xd0, 0x91, 0x33, 0x82, 0xb4, 0x98, 0x6d, 0xf5, 0x76,
-	0x67, 0x11, 0xab, 0xff, 0xc3, 0x58, 0x51, 0xc1, 0x27, 0xbd, 0xb1, 0xd1, 0xef, 0x7f, 0xd6, 0xdb,
-	0x1b, 0x12, 0xd8, 0x0f, 0x99, 0x2d, 0x43, 0x11, 0xed, 0x77, 0xed, 0xb2, 0x30, 0xfb, 0xa6, 0x52,
-	0x06, 0xfd, 0x90, 0x0d, 0xaa, 0x94, 0xc1, 0x7e, 0x77, 0xa0, 0x52, 0x7e, 0xeb, 0x8b, 0x72, 0xdd,
-	0x75, 0xfb, 0x21, 0x73, 0xdd, 0x2a, 0xc9, 0x75, 0xf7, 0xbb, 0xae, 0xab, 0xd2, 0x0e, 0x66, 0x8a,
-	0x73, 0x3e, 0xfa, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x46, 0x4e, 0x27, 0xd7, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/feed_item_service.pb.go b/googleapis/ads/googleads/v1/services/feed_item_service.pb.go
index b07af9f072..5bd2dd9c33 100644
--- a/googleapis/ads/googleads/v1/services/feed_item_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/feed_item_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/feed_item_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [FeedItemService.GetFeedItem][google.ads.googleads.v1.services.FeedItemService.GetFeedItem].
 type GetFeedItemRequest struct {
@@ -41,16 +41,17 @@ func (m *GetFeedItemRequest) Reset()         { *m = GetFeedItemRequest{} }
 func (m *GetFeedItemRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFeedItemRequest) ProtoMessage()    {}
 func (*GetFeedItemRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_service_07bfb4ad3b8f0fac, []int{0}
+	return fileDescriptor_7e460b42cd95bced, []int{0}
 }
+
 func (m *GetFeedItemRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFeedItemRequest.Unmarshal(m, b)
 }
 func (m *GetFeedItemRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFeedItemRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFeedItemRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFeedItemRequest.Merge(dst, src)
+func (m *GetFeedItemRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFeedItemRequest.Merge(m, src)
 }
 func (m *GetFeedItemRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFeedItemRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateFeedItemsRequest) Reset()         { *m = MutateFeedItemsRequest{}
 func (m *MutateFeedItemsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedItemsRequest) ProtoMessage()    {}
 func (*MutateFeedItemsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_service_07bfb4ad3b8f0fac, []int{1}
+	return fileDescriptor_7e460b42cd95bced, []int{1}
 }
+
 func (m *MutateFeedItemsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedItemsRequest.Unmarshal(m, b)
 }
 func (m *MutateFeedItemsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedItemsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedItemsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedItemsRequest.Merge(dst, src)
+func (m *MutateFeedItemsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedItemsRequest.Merge(m, src)
 }
 func (m *MutateFeedItemsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedItemsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *FeedItemOperation) Reset()         { *m = FeedItemOperation{} }
 func (m *FeedItemOperation) String() string { return proto.CompactTextString(m) }
 func (*FeedItemOperation) ProtoMessage()    {}
 func (*FeedItemOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_service_07bfb4ad3b8f0fac, []int{2}
+	return fileDescriptor_7e460b42cd95bced, []int{2}
 }
+
 func (m *FeedItemOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemOperation.Unmarshal(m, b)
 }
 func (m *FeedItemOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemOperation.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemOperation.Merge(dst, src)
+func (m *FeedItemOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemOperation.Merge(m, src)
 }
 func (m *FeedItemOperation) XXX_Size() int {
 	return xxx_messageInfo_FeedItemOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *FeedItemOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FeedItemOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FeedItemOperation_OneofMarshaler, _FeedItemOperation_OneofUnmarshaler, _FeedItemOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*FeedItemOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*FeedItemOperation_Create)(nil),
 		(*FeedItemOperation_Update)(nil),
 		(*FeedItemOperation_Remove)(nil),
 	}
 }
 
-func _FeedItemOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FeedItemOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedItemOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *FeedItemOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *FeedItemOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("FeedItemOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FeedItemOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FeedItemOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.FeedItem)
-		err := b.DecodeMessage(msg)
-		m.Operation = &FeedItemOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.FeedItem)
-		err := b.DecodeMessage(msg)
-		m.Operation = &FeedItemOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &FeedItemOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FeedItemOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FeedItemOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedItemOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedItemOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedItemOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an feed item mutate.
 type MutateFeedItemsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateFeedItemsResponse) Reset()         { *m = MutateFeedItemsResponse
 func (m *MutateFeedItemsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedItemsResponse) ProtoMessage()    {}
 func (*MutateFeedItemsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_service_07bfb4ad3b8f0fac, []int{3}
+	return fileDescriptor_7e460b42cd95bced, []int{3}
 }
+
 func (m *MutateFeedItemsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedItemsResponse.Unmarshal(m, b)
 }
 func (m *MutateFeedItemsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedItemsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedItemsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedItemsResponse.Merge(dst, src)
+func (m *MutateFeedItemsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedItemsResponse.Merge(m, src)
 }
 func (m *MutateFeedItemsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedItemsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateFeedItemResult) Reset()         { *m = MutateFeedItemResult{} }
 func (m *MutateFeedItemResult) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedItemResult) ProtoMessage()    {}
 func (*MutateFeedItemResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_service_07bfb4ad3b8f0fac, []int{4}
+	return fileDescriptor_7e460b42cd95bced, []int{4}
 }
+
 func (m *MutateFeedItemResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedItemResult.Unmarshal(m, b)
 }
 func (m *MutateFeedItemResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedItemResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedItemResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedItemResult.Merge(dst, src)
+func (m *MutateFeedItemResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedItemResult.Merge(m, src)
 }
 func (m *MutateFeedItemResult) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedItemResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateFeedItemResult)(nil), "google.ads.googleads.v1.services.MutateFeedItemResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/feed_item_service.proto", fileDescriptor_7e460b42cd95bced)
+}
+
+var fileDescriptor_7e460b42cd95bced = []byte{
+	// 708 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0x13, 0x41,
+	0x14, 0x77, 0xb7, 0x52, 0xed, 0x6c, 0xb5, 0x38, 0x56, 0x1b, 0x82, 0x68, 0x58, 0x0b, 0x96, 0x14,
+	0x77, 0x49, 0x22, 0xd2, 0x6e, 0xe9, 0x21, 0x85, 0xa6, 0xed, 0xa1, 0xb6, 0x6c, 0xa1, 0x07, 0x09,
+	0x2c, 0xd3, 0xec, 0x4b, 0x58, 0xba, 0xbb, 0xb3, 0xce, 0xcc, 0x46, 0x4a, 0xe9, 0x45, 0xf0, 0x13,
+	0xf8, 0x0d, 0x04, 0x2f, 0x5e, 0xfd, 0x04, 0x5e, 0xbd, 0x7a, 0xf5, 0xe8, 0xc9, 0xaf, 0x20, 0x82,
+	0xec, 0xce, 0x4e, 0xda, 0xa4, 0x86, 0xd8, 0xde, 0xde, 0xbc, 0xf9, 0xfd, 0x7e, 0xef, 0xcd, 0xfb,
+	0x33, 0x68, 0xa5, 0x47, 0x69, 0x2f, 0x04, 0x9b, 0xf8, 0xdc, 0x96, 0x66, 0x66, 0xf5, 0x6b, 0x36,
+	0x07, 0xd6, 0x0f, 0x3a, 0xc0, 0xed, 0x2e, 0x80, 0xef, 0x05, 0x02, 0x22, 0xaf, 0x70, 0x59, 0x09,
+	0xa3, 0x82, 0xe2, 0x8a, 0x84, 0x5b, 0xc4, 0xe7, 0xd6, 0x80, 0x69, 0xf5, 0x6b, 0x96, 0x62, 0x96,
+	0x6b, 0xe3, 0xb4, 0x19, 0x70, 0x9a, 0xb2, 0x21, 0x71, 0x29, 0x5a, 0x7e, 0xa4, 0x28, 0x49, 0x60,
+	0x93, 0x38, 0xa6, 0x82, 0x88, 0x80, 0xc6, 0xbc, 0xb8, 0x2d, 0x42, 0xda, 0xf9, 0xe9, 0x28, 0xed,
+	0xda, 0xdd, 0x00, 0x42, 0xdf, 0x8b, 0x08, 0x3f, 0x2e, 0x10, 0x8f, 0x47, 0x11, 0x6f, 0x19, 0x49,
+	0x12, 0x60, 0x4a, 0x61, 0xa1, 0xb8, 0x67, 0x49, 0xc7, 0xe6, 0x82, 0x88, 0xb4, 0xb8, 0x30, 0x57,
+	0x11, 0xde, 0x02, 0xd1, 0x02, 0xf0, 0x77, 0x04, 0x44, 0x2e, 0xbc, 0x49, 0x81, 0x0b, 0xfc, 0x14,
+	0xdd, 0x51, 0xb9, 0x7a, 0x31, 0x89, 0xa0, 0xa4, 0x55, 0xb4, 0xa5, 0x19, 0x77, 0x56, 0x39, 0x5f,
+	0x91, 0x08, 0xcc, 0x1f, 0x1a, 0x7a, 0xb8, 0x9b, 0x0a, 0x22, 0x40, 0xd1, 0xb9, 0xe2, 0x3f, 0x41,
+	0x46, 0x27, 0xe5, 0x82, 0x46, 0xc0, 0xbc, 0xc0, 0x2f, 0xd8, 0x48, 0xb9, 0x76, 0x7c, 0x7c, 0x80,
+	0x10, 0x4d, 0x80, 0xc9, 0x57, 0x96, 0xf4, 0xca, 0xd4, 0x92, 0x51, 0x6f, 0x58, 0x93, 0x2a, 0x6b,
+	0xa9, 0x40, 0x7b, 0x8a, 0xeb, 0x5e, 0x90, 0xc1, 0xcf, 0xd0, 0x5c, 0x42, 0x98, 0x08, 0x48, 0xe8,
+	0x75, 0x49, 0x10, 0xa6, 0x0c, 0x4a, 0x53, 0x15, 0x6d, 0xe9, 0xb6, 0x7b, 0xb7, 0x70, 0xb7, 0xa4,
+	0x37, 0x7b, 0x5e, 0x9f, 0x84, 0x81, 0x4f, 0x04, 0x78, 0x34, 0x0e, 0x4f, 0x4a, 0x37, 0x73, 0xd8,
+	0xac, 0x72, 0xee, 0xc5, 0xe1, 0x89, 0xf9, 0x5e, 0x47, 0xf7, 0x2e, 0xc5, 0xc3, 0x6b, 0xc8, 0x48,
+	0x93, 0x9c, 0x98, 0x55, 0x3f, 0x27, 0x1a, 0xf5, 0xb2, 0xca, 0x5c, 0x95, 0xdf, 0x6a, 0x65, 0x0d,
+	0xda, 0x25, 0xfc, 0xd8, 0x45, 0x12, 0x9e, 0xd9, 0x78, 0x13, 0x4d, 0x77, 0x18, 0x10, 0x21, 0xeb,
+	0x69, 0xd4, 0x97, 0xc7, 0xbe, 0x78, 0x30, 0x29, 0x83, 0x27, 0x6f, 0xdf, 0x70, 0x0b, 0x72, 0x26,
+	0x23, 0x45, 0x4b, 0xfa, 0xb5, 0x64, 0x24, 0x19, 0x97, 0xd0, 0x34, 0x83, 0x88, 0xf6, 0x65, 0x95,
+	0x66, 0xb2, 0x1b, 0x79, 0xde, 0x30, 0xd0, 0xcc, 0xa0, 0xac, 0xe6, 0x17, 0x0d, 0x2d, 0x5c, 0x6a,
+	0x33, 0x4f, 0x68, 0xcc, 0x01, 0xb7, 0xd0, 0x83, 0x91, 0x8a, 0x7b, 0xc0, 0x18, 0x65, 0xb9, 0xa2,
+	0x51, 0xc7, 0x2a, 0x31, 0x96, 0x74, 0xac, 0x83, 0x7c, 0xec, 0xdc, 0xfb, 0xc3, 0xbd, 0xd8, 0xcc,
+	0xe0, 0x78, 0x1f, 0xdd, 0x62, 0xc0, 0xd3, 0x50, 0xa8, 0x59, 0x78, 0x39, 0x79, 0x16, 0x86, 0x73,
+	0x72, 0x73, 0xba, 0xab, 0x64, 0xcc, 0x35, 0x34, 0xff, 0x2f, 0xc0, 0x7f, 0x4d, 0x76, 0xfd, 0x8f,
+	0x8e, 0xe6, 0x14, 0xef, 0x40, 0xc6, 0xc3, 0x9f, 0x34, 0x64, 0x5c, 0xd8, 0x14, 0xfc, 0x62, 0x72,
+	0x86, 0x97, 0x17, 0xab, 0x7c, 0x95, 0x56, 0x99, 0x8d, 0x77, 0xdf, 0x7f, 0x7e, 0xd0, 0x9f, 0xe3,
+	0xe5, 0xec, 0xef, 0x38, 0x1d, 0x4a, 0x7b, 0x5d, 0xed, 0x12, 0xb7, 0xab, 0xf9, 0x67, 0x92, 0xf7,
+	0xc5, 0xae, 0x9e, 0xe1, 0xaf, 0x1a, 0x9a, 0x1b, 0x69, 0x17, 0x5e, 0xb9, 0x6a, 0x35, 0xd5, 0x22,
+	0x97, 0x57, 0xaf, 0xc1, 0x94, 0xb3, 0x61, 0xae, 0xe6, 0xd9, 0x37, 0x4c, 0x2b, 0xcb, 0xfe, 0x3c,
+	0xdd, 0xd3, 0x0b, 0x1f, 0xc3, 0x7a, 0xf5, 0xec, 0x3c, 0x79, 0x27, 0xca, 0x85, 0x1c, 0xad, 0xba,
+	0xf1, 0x5b, 0x43, 0x8b, 0x1d, 0x1a, 0x4d, 0x8c, 0xbd, 0x31, 0x3f, 0xd2, 0xa5, 0xfd, 0x6c, 0xff,
+	0xf6, 0xb5, 0xd7, 0xdb, 0x05, 0xb3, 0x47, 0x43, 0x12, 0xf7, 0x2c, 0xca, 0x7a, 0x76, 0x0f, 0xe2,
+	0x7c, 0x3b, 0xd5, 0x8f, 0x9c, 0x04, 0x7c, 0xfc, 0xe7, 0xbf, 0xa6, 0x8c, 0x8f, 0xfa, 0xd4, 0x56,
+	0xb3, 0xf9, 0x59, 0xaf, 0x6c, 0x49, 0xc1, 0xa6, 0xcf, 0x2d, 0x69, 0x66, 0xd6, 0x61, 0xcd, 0x2a,
+	0x02, 0xf3, 0x6f, 0x0a, 0xd2, 0x6e, 0xfa, 0xbc, 0x3d, 0x80, 0xb4, 0x0f, 0x6b, 0x6d, 0x05, 0xf9,
+	0xa5, 0x2f, 0x4a, 0xbf, 0xe3, 0x34, 0x7d, 0xee, 0x38, 0x03, 0x90, 0xe3, 0x1c, 0xd6, 0x1c, 0x47,
+	0xc1, 0x8e, 0xa6, 0xf3, 0x3c, 0x1b, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x02, 0x4f, 0xc6, 0x7f,
+	0xa3, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,56 +513,3 @@ var _FeedItemService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/feed_item_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/feed_item_service.proto", fileDescriptor_feed_item_service_07bfb4ad3b8f0fac)
-}
-
-var fileDescriptor_feed_item_service_07bfb4ad3b8f0fac = []byte{
-	// 708 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0x13, 0x41,
-	0x14, 0x77, 0xb7, 0x52, 0xed, 0x6c, 0xb5, 0x38, 0x56, 0x1b, 0x82, 0x68, 0x58, 0x0b, 0x96, 0x14,
-	0x77, 0x49, 0x22, 0xd2, 0x6e, 0xe9, 0x21, 0x85, 0xa6, 0xed, 0xa1, 0xb6, 0x6c, 0xa1, 0x07, 0x09,
-	0x2c, 0xd3, 0xec, 0x4b, 0x58, 0xba, 0xbb, 0xb3, 0xce, 0xcc, 0x46, 0x4a, 0xe9, 0x45, 0xf0, 0x13,
-	0xf8, 0x0d, 0x04, 0x2f, 0x5e, 0xfd, 0x04, 0x5e, 0xbd, 0x7a, 0xf5, 0xe8, 0xc9, 0xaf, 0x20, 0x82,
-	0xec, 0xce, 0x4e, 0xda, 0xa4, 0x86, 0xd8, 0xde, 0xde, 0xbc, 0xf9, 0xfd, 0x7e, 0xef, 0xcd, 0xfb,
-	0x33, 0x68, 0xa5, 0x47, 0x69, 0x2f, 0x04, 0x9b, 0xf8, 0xdc, 0x96, 0x66, 0x66, 0xf5, 0x6b, 0x36,
-	0x07, 0xd6, 0x0f, 0x3a, 0xc0, 0xed, 0x2e, 0x80, 0xef, 0x05, 0x02, 0x22, 0xaf, 0x70, 0x59, 0x09,
-	0xa3, 0x82, 0xe2, 0x8a, 0x84, 0x5b, 0xc4, 0xe7, 0xd6, 0x80, 0x69, 0xf5, 0x6b, 0x96, 0x62, 0x96,
-	0x6b, 0xe3, 0xb4, 0x19, 0x70, 0x9a, 0xb2, 0x21, 0x71, 0x29, 0x5a, 0x7e, 0xa4, 0x28, 0x49, 0x60,
-	0x93, 0x38, 0xa6, 0x82, 0x88, 0x80, 0xc6, 0xbc, 0xb8, 0x2d, 0x42, 0xda, 0xf9, 0xe9, 0x28, 0xed,
-	0xda, 0xdd, 0x00, 0x42, 0xdf, 0x8b, 0x08, 0x3f, 0x2e, 0x10, 0x8f, 0x47, 0x11, 0x6f, 0x19, 0x49,
-	0x12, 0x60, 0x4a, 0x61, 0xa1, 0xb8, 0x67, 0x49, 0xc7, 0xe6, 0x82, 0x88, 0xb4, 0xb8, 0x30, 0x57,
-	0x11, 0xde, 0x02, 0xd1, 0x02, 0xf0, 0x77, 0x04, 0x44, 0x2e, 0xbc, 0x49, 0x81, 0x0b, 0xfc, 0x14,
-	0xdd, 0x51, 0xb9, 0x7a, 0x31, 0x89, 0xa0, 0xa4, 0x55, 0xb4, 0xa5, 0x19, 0x77, 0x56, 0x39, 0x5f,
-	0x91, 0x08, 0xcc, 0x1f, 0x1a, 0x7a, 0xb8, 0x9b, 0x0a, 0x22, 0x40, 0xd1, 0xb9, 0xe2, 0x3f, 0x41,
-	0x46, 0x27, 0xe5, 0x82, 0x46, 0xc0, 0xbc, 0xc0, 0x2f, 0xd8, 0x48, 0xb9, 0x76, 0x7c, 0x7c, 0x80,
-	0x10, 0x4d, 0x80, 0xc9, 0x57, 0x96, 0xf4, 0xca, 0xd4, 0x92, 0x51, 0x6f, 0x58, 0x93, 0x2a, 0x6b,
-	0xa9, 0x40, 0x7b, 0x8a, 0xeb, 0x5e, 0x90, 0xc1, 0xcf, 0xd0, 0x5c, 0x42, 0x98, 0x08, 0x48, 0xe8,
-	0x75, 0x49, 0x10, 0xa6, 0x0c, 0x4a, 0x53, 0x15, 0x6d, 0xe9, 0xb6, 0x7b, 0xb7, 0x70, 0xb7, 0xa4,
-	0x37, 0x7b, 0x5e, 0x9f, 0x84, 0x81, 0x4f, 0x04, 0x78, 0x34, 0x0e, 0x4f, 0x4a, 0x37, 0x73, 0xd8,
-	0xac, 0x72, 0xee, 0xc5, 0xe1, 0x89, 0xf9, 0x5e, 0x47, 0xf7, 0x2e, 0xc5, 0xc3, 0x6b, 0xc8, 0x48,
-	0x93, 0x9c, 0x98, 0x55, 0x3f, 0x27, 0x1a, 0xf5, 0xb2, 0xca, 0x5c, 0x95, 0xdf, 0x6a, 0x65, 0x0d,
-	0xda, 0x25, 0xfc, 0xd8, 0x45, 0x12, 0x9e, 0xd9, 0x78, 0x13, 0x4d, 0x77, 0x18, 0x10, 0x21, 0xeb,
-	0x69, 0xd4, 0x97, 0xc7, 0xbe, 0x78, 0x30, 0x29, 0x83, 0x27, 0x6f, 0xdf, 0x70, 0x0b, 0x72, 0x26,
-	0x23, 0x45, 0x4b, 0xfa, 0xb5, 0x64, 0x24, 0x19, 0x97, 0xd0, 0x34, 0x83, 0x88, 0xf6, 0x65, 0x95,
-	0x66, 0xb2, 0x1b, 0x79, 0xde, 0x30, 0xd0, 0xcc, 0xa0, 0xac, 0xe6, 0x17, 0x0d, 0x2d, 0x5c, 0x6a,
-	0x33, 0x4f, 0x68, 0xcc, 0x01, 0xb7, 0xd0, 0x83, 0x91, 0x8a, 0x7b, 0xc0, 0x18, 0x65, 0xb9, 0xa2,
-	0x51, 0xc7, 0x2a, 0x31, 0x96, 0x74, 0xac, 0x83, 0x7c, 0xec, 0xdc, 0xfb, 0xc3, 0xbd, 0xd8, 0xcc,
-	0xe0, 0x78, 0x1f, 0xdd, 0x62, 0xc0, 0xd3, 0x50, 0xa8, 0x59, 0x78, 0x39, 0x79, 0x16, 0x86, 0x73,
-	0x72, 0x73, 0xba, 0xab, 0x64, 0xcc, 0x35, 0x34, 0xff, 0x2f, 0xc0, 0x7f, 0x4d, 0x76, 0xfd, 0x8f,
-	0x8e, 0xe6, 0x14, 0xef, 0x40, 0xc6, 0xc3, 0x9f, 0x34, 0x64, 0x5c, 0xd8, 0x14, 0xfc, 0x62, 0x72,
-	0x86, 0x97, 0x17, 0xab, 0x7c, 0x95, 0x56, 0x99, 0x8d, 0x77, 0xdf, 0x7f, 0x7e, 0xd0, 0x9f, 0xe3,
-	0xe5, 0xec, 0xef, 0x38, 0x1d, 0x4a, 0x7b, 0x5d, 0xed, 0x12, 0xb7, 0xab, 0xf9, 0x67, 0x92, 0xf7,
-	0xc5, 0xae, 0x9e, 0xe1, 0xaf, 0x1a, 0x9a, 0x1b, 0x69, 0x17, 0x5e, 0xb9, 0x6a, 0x35, 0xd5, 0x22,
-	0x97, 0x57, 0xaf, 0xc1, 0x94, 0xb3, 0x61, 0xae, 0xe6, 0xd9, 0x37, 0x4c, 0x2b, 0xcb, 0xfe, 0x3c,
-	0xdd, 0xd3, 0x0b, 0x1f, 0xc3, 0x7a, 0xf5, 0xec, 0x3c, 0x79, 0x27, 0xca, 0x85, 0x1c, 0xad, 0xba,
-	0xf1, 0x5b, 0x43, 0x8b, 0x1d, 0x1a, 0x4d, 0x8c, 0xbd, 0x31, 0x3f, 0xd2, 0xa5, 0xfd, 0x6c, 0xff,
-	0xf6, 0xb5, 0xd7, 0xdb, 0x05, 0xb3, 0x47, 0x43, 0x12, 0xf7, 0x2c, 0xca, 0x7a, 0x76, 0x0f, 0xe2,
-	0x7c, 0x3b, 0xd5, 0x8f, 0x9c, 0x04, 0x7c, 0xfc, 0xe7, 0xbf, 0xa6, 0x8c, 0x8f, 0xfa, 0xd4, 0x56,
-	0xb3, 0xf9, 0x59, 0xaf, 0x6c, 0x49, 0xc1, 0xa6, 0xcf, 0x2d, 0x69, 0x66, 0xd6, 0x61, 0xcd, 0x2a,
-	0x02, 0xf3, 0x6f, 0x0a, 0xd2, 0x6e, 0xfa, 0xbc, 0x3d, 0x80, 0xb4, 0x0f, 0x6b, 0x6d, 0x05, 0xf9,
-	0xa5, 0x2f, 0x4a, 0xbf, 0xe3, 0x34, 0x7d, 0xee, 0x38, 0x03, 0x90, 0xe3, 0x1c, 0xd6, 0x1c, 0x47,
-	0xc1, 0x8e, 0xa6, 0xf3, 0x3c, 0x1b, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x02, 0x4f, 0xc6, 0x7f,
-	0xa3, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/feed_item_target_service.pb.go b/googleapis/ads/googleads/v1/services/feed_item_target_service.pb.go
index bb54fefff2..2fc2ead9e6 100644
--- a/googleapis/ads/googleads/v1/services/feed_item_target_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/feed_item_target_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/feed_item_target_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [FeedItemTargetService.GetFeedItemTarget][google.ads.googleads.v1.services.FeedItemTargetService.GetFeedItemTarget].
 type GetFeedItemTargetRequest struct {
@@ -38,16 +38,17 @@ func (m *GetFeedItemTargetRequest) Reset()         { *m = GetFeedItemTargetReque
 func (m *GetFeedItemTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFeedItemTargetRequest) ProtoMessage()    {}
 func (*GetFeedItemTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_service_7676c6ec99ca33e2, []int{0}
+	return fileDescriptor_6354928c0acab6b3, []int{0}
 }
+
 func (m *GetFeedItemTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFeedItemTargetRequest.Unmarshal(m, b)
 }
 func (m *GetFeedItemTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFeedItemTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFeedItemTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFeedItemTargetRequest.Merge(dst, src)
+func (m *GetFeedItemTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFeedItemTargetRequest.Merge(m, src)
 }
 func (m *GetFeedItemTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFeedItemTargetRequest.Size(m)
@@ -80,16 +81,17 @@ func (m *MutateFeedItemTargetsRequest) Reset()         { *m = MutateFeedItemTarg
 func (m *MutateFeedItemTargetsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedItemTargetsRequest) ProtoMessage()    {}
 func (*MutateFeedItemTargetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_service_7676c6ec99ca33e2, []int{1}
+	return fileDescriptor_6354928c0acab6b3, []int{1}
 }
+
 func (m *MutateFeedItemTargetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedItemTargetsRequest.Unmarshal(m, b)
 }
 func (m *MutateFeedItemTargetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedItemTargetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedItemTargetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedItemTargetsRequest.Merge(dst, src)
+func (m *MutateFeedItemTargetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedItemTargetsRequest.Merge(m, src)
 }
 func (m *MutateFeedItemTargetsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedItemTargetsRequest.Size(m)
@@ -131,16 +133,17 @@ func (m *FeedItemTargetOperation) Reset()         { *m = FeedItemTargetOperation
 func (m *FeedItemTargetOperation) String() string { return proto.CompactTextString(m) }
 func (*FeedItemTargetOperation) ProtoMessage()    {}
 func (*FeedItemTargetOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_service_7676c6ec99ca33e2, []int{2}
+	return fileDescriptor_6354928c0acab6b3, []int{2}
 }
+
 func (m *FeedItemTargetOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedItemTargetOperation.Unmarshal(m, b)
 }
 func (m *FeedItemTargetOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedItemTargetOperation.Marshal(b, m, deterministic)
 }
-func (dst *FeedItemTargetOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedItemTargetOperation.Merge(dst, src)
+func (m *FeedItemTargetOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedItemTargetOperation.Merge(m, src)
 }
 func (m *FeedItemTargetOperation) XXX_Size() int {
 	return xxx_messageInfo_FeedItemTargetOperation.Size(m)
@@ -188,76 +191,14 @@ func (m *FeedItemTargetOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FeedItemTargetOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FeedItemTargetOperation_OneofMarshaler, _FeedItemTargetOperation_OneofUnmarshaler, _FeedItemTargetOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*FeedItemTargetOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*FeedItemTargetOperation_Create)(nil),
 		(*FeedItemTargetOperation_Remove)(nil),
 	}
 }
 
-func _FeedItemTargetOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FeedItemTargetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedItemTargetOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *FeedItemTargetOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("FeedItemTargetOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FeedItemTargetOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FeedItemTargetOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.FeedItemTarget)
-		err := b.DecodeMessage(msg)
-		m.Operation = &FeedItemTargetOperation_Create{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &FeedItemTargetOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FeedItemTargetOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FeedItemTargetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedItemTargetOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedItemTargetOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an feed item target mutate.
 type MutateFeedItemTargetsResponse struct {
 	// All results for the mutate.
@@ -271,16 +212,17 @@ func (m *MutateFeedItemTargetsResponse) Reset()         { *m = MutateFeedItemTar
 func (m *MutateFeedItemTargetsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedItemTargetsResponse) ProtoMessage()    {}
 func (*MutateFeedItemTargetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_service_7676c6ec99ca33e2, []int{3}
+	return fileDescriptor_6354928c0acab6b3, []int{3}
 }
+
 func (m *MutateFeedItemTargetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedItemTargetsResponse.Unmarshal(m, b)
 }
 func (m *MutateFeedItemTargetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedItemTargetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedItemTargetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedItemTargetsResponse.Merge(dst, src)
+func (m *MutateFeedItemTargetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedItemTargetsResponse.Merge(m, src)
 }
 func (m *MutateFeedItemTargetsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedItemTargetsResponse.Size(m)
@@ -311,16 +253,17 @@ func (m *MutateFeedItemTargetResult) Reset()         { *m = MutateFeedItemTarget
 func (m *MutateFeedItemTargetResult) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedItemTargetResult) ProtoMessage()    {}
 func (*MutateFeedItemTargetResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_item_target_service_7676c6ec99ca33e2, []int{4}
+	return fileDescriptor_6354928c0acab6b3, []int{4}
 }
+
 func (m *MutateFeedItemTargetResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedItemTargetResult.Unmarshal(m, b)
 }
 func (m *MutateFeedItemTargetResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedItemTargetResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedItemTargetResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedItemTargetResult.Merge(dst, src)
+func (m *MutateFeedItemTargetResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedItemTargetResult.Merge(m, src)
 }
 func (m *MutateFeedItemTargetResult) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedItemTargetResult.Size(m)
@@ -346,6 +289,49 @@ func init() {
 	proto.RegisterType((*MutateFeedItemTargetResult)(nil), "google.ads.googleads.v1.services.MutateFeedItemTargetResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/feed_item_target_service.proto", fileDescriptor_6354928c0acab6b3)
+}
+
+var fileDescriptor_6354928c0acab6b3 = []byte{
+	// 559 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x3f, 0x6f, 0xd3, 0x40,
+	0x14, 0xc0, 0xb1, 0x2b, 0x05, 0xf5, 0x02, 0x03, 0x27, 0x55, 0x44, 0x56, 0x11, 0x91, 0xe9, 0x50,
+	0x65, 0x38, 0xcb, 0x29, 0x03, 0x39, 0x28, 0x91, 0x33, 0x90, 0x56, 0x08, 0xa8, 0x0c, 0x8a, 0x04,
+	0x8a, 0x14, 0x1d, 0xf1, 0xc3, 0xb2, 0x14, 0xfb, 0xc2, 0xdd, 0x25, 0x0c, 0x55, 0x07, 0xd8, 0x99,
+	0xd8, 0x18, 0x19, 0x59, 0x99, 0xf9, 0x02, 0xac, 0x4c, 0xec, 0x4c, 0x7c, 0x0a, 0x64, 0x5f, 0xce,
+	0x24, 0x25, 0x56, 0xa0, 0xdb, 0xbb, 0xbb, 0xf7, 0x7e, 0xef, 0xef, 0x3d, 0xd4, 0x8d, 0x39, 0x8f,
+	0x27, 0xe0, 0xb1, 0x48, 0x7a, 0x5a, 0xcc, 0xa5, 0xb9, 0xef, 0x49, 0x10, 0xf3, 0x64, 0x0c, 0xd2,
+	0x7b, 0x05, 0x10, 0x8d, 0x12, 0x05, 0xe9, 0x48, 0x31, 0x11, 0x83, 0x1a, 0x2d, 0x5e, 0xc8, 0x54,
+	0x70, 0xc5, 0x71, 0x53, 0x5b, 0x11, 0x16, 0x49, 0x52, 0x02, 0xc8, 0xdc, 0x27, 0x06, 0xe0, 0xdc,
+	0xa9, 0x72, 0x21, 0x40, 0xf2, 0x99, 0x58, 0xe7, 0x43, 0xb3, 0x9d, 0x5d, 0x63, 0x39, 0x4d, 0x3c,
+	0x96, 0x65, 0x5c, 0x31, 0x95, 0xf0, 0x4c, 0xea, 0x57, 0xb7, 0x8b, 0x1a, 0x7d, 0x50, 0x0f, 0x00,
+	0xa2, 0x63, 0x05, 0xe9, 0xb3, 0xc2, 0x30, 0x84, 0xd7, 0x33, 0x90, 0x0a, 0xdf, 0x42, 0x57, 0x0d,
+	0x7d, 0x94, 0xb1, 0x14, 0x1a, 0x56, 0xd3, 0xda, 0xdf, 0x0e, 0xaf, 0x98, 0xcb, 0xc7, 0x2c, 0x05,
+	0xf7, 0xa3, 0x85, 0x76, 0x1f, 0xcd, 0x14, 0x53, 0xb0, 0x0a, 0x91, 0x86, 0x72, 0x13, 0xd5, 0xc7,
+	0x33, 0xa9, 0x78, 0x0a, 0x62, 0x94, 0x44, 0x0b, 0x06, 0x32, 0x57, 0xc7, 0x11, 0x7e, 0x8e, 0x10,
+	0x9f, 0x82, 0xd0, 0x61, 0x35, 0xec, 0xe6, 0xd6, 0x7e, 0xbd, 0xdd, 0x21, 0x9b, 0x2a, 0x42, 0x56,
+	0xdd, 0x3d, 0x31, 0x84, 0x70, 0x09, 0xe6, 0xbe, 0xb7, 0xd0, 0xf5, 0x0a, 0x3d, 0xfc, 0x10, 0xd5,
+	0xc6, 0x02, 0x98, 0xd2, 0x69, 0xd5, 0xdb, 0x7e, 0xa5, 0xcb, 0xb2, 0xc4, 0xe7, 0x7c, 0x1e, 0x5d,
+	0x0a, 0x17, 0x08, 0xdc, 0x40, 0x35, 0x01, 0x29, 0x9f, 0x43, 0xc3, 0xce, 0xf3, 0xcb, 0x5f, 0xf4,
+	0xb9, 0x57, 0x47, 0xdb, 0x65, 0x40, 0xee, 0x1b, 0x74, 0xa3, 0xa2, 0x56, 0x72, 0xca, 0x33, 0x09,
+	0x78, 0x80, 0x2e, 0x0b, 0x90, 0xb3, 0x89, 0x32, 0x85, 0xb8, 0xb7, 0xb9, 0x10, 0xeb, 0x88, 0x61,
+	0x01, 0x09, 0x0d, 0xcc, 0x0d, 0x90, 0x53, 0xad, 0xf6, 0x4f, 0x8d, 0x6e, 0x7f, 0xd9, 0x42, 0x3b,
+	0xab, 0xd6, 0x4f, 0x75, 0x04, 0xf8, 0xab, 0x85, 0xae, 0xfd, 0x35, 0x44, 0x98, 0x6e, 0x8e, 0xbc,
+	0x6a, 0xf2, 0x9c, 0xff, 0xef, 0x85, 0xdb, 0x79, 0xf7, 0xfd, 0xe7, 0x07, 0xfb, 0x00, 0xfb, 0xf9,
+	0xa7, 0x38, 0x5d, 0x49, 0xe7, 0xd0, 0x0c, 0x9b, 0xf4, 0x5a, 0xc5, 0x2f, 0x59, 0xaa, 0xbc, 0xd7,
+	0x3a, 0xc3, 0x3f, 0x2c, 0xb4, 0xb3, 0xb6, 0x2d, 0xf8, 0xfe, 0xc5, 0xaa, 0x6f, 0x66, 0xdf, 0xe9,
+	0x5e, 0xd8, 0x5e, 0xcf, 0x83, 0xdb, 0x2d, 0xb2, 0xea, 0xb8, 0xb7, 0xf3, 0xac, 0xfe, 0xa4, 0x71,
+	0xba, 0xf4, 0xa3, 0x0e, 0x5b, 0x67, 0xe7, 0x93, 0xa2, 0x69, 0x01, 0xa5, 0x56, 0xab, 0xf7, 0xd6,
+	0x46, 0x7b, 0x63, 0x9e, 0x6e, 0x8c, 0xa3, 0xe7, 0xac, 0xed, 0xed, 0x49, 0xbe, 0x24, 0x4e, 0xac,
+	0x17, 0x47, 0x0b, 0xfb, 0x98, 0x4f, 0x58, 0x16, 0x13, 0x2e, 0x62, 0x2f, 0x86, 0xac, 0x58, 0x21,
+	0x66, 0x1d, 0x4d, 0x13, 0x59, 0xbd, 0x00, 0xef, 0x1a, 0xe1, 0x93, 0xbd, 0xd5, 0x0f, 0x82, 0xcf,
+	0x76, 0xb3, 0xaf, 0x81, 0x41, 0x24, 0x89, 0x16, 0x73, 0x69, 0xe0, 0x93, 0x85, 0x63, 0xf9, 0xcd,
+	0xa8, 0x0c, 0x83, 0x48, 0x0e, 0x4b, 0x95, 0xe1, 0xc0, 0x1f, 0x1a, 0x95, 0x5f, 0xf6, 0x9e, 0xbe,
+	0xa7, 0x34, 0x88, 0x24, 0xa5, 0xa5, 0x12, 0xa5, 0x03, 0x9f, 0x52, 0xa3, 0xf6, 0xb2, 0x56, 0xc4,
+	0x79, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xd9, 0xad, 0xe7, 0xfc, 0xa7, 0x05, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -454,46 +440,3 @@ var _FeedItemTargetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/feed_item_target_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/feed_item_target_service.proto", fileDescriptor_feed_item_target_service_7676c6ec99ca33e2)
-}
-
-var fileDescriptor_feed_item_target_service_7676c6ec99ca33e2 = []byte{
-	// 559 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x3f, 0x6f, 0xd3, 0x40,
-	0x14, 0xc0, 0xb1, 0x2b, 0x05, 0xf5, 0x02, 0x03, 0x27, 0x55, 0x44, 0x56, 0x11, 0x91, 0xe9, 0x50,
-	0x65, 0x38, 0xcb, 0x29, 0x03, 0x39, 0x28, 0x91, 0x33, 0x90, 0x56, 0x08, 0xa8, 0x0c, 0x8a, 0x04,
-	0x8a, 0x14, 0x1d, 0xf1, 0xc3, 0xb2, 0x14, 0xfb, 0xc2, 0xdd, 0x25, 0x0c, 0x55, 0x07, 0xd8, 0x99,
-	0xd8, 0x18, 0x19, 0x59, 0x99, 0xf9, 0x02, 0xac, 0x4c, 0xec, 0x4c, 0x7c, 0x0a, 0x64, 0x5f, 0xce,
-	0x24, 0x25, 0x56, 0xa0, 0xdb, 0xbb, 0xbb, 0xf7, 0x7e, 0xef, 0xef, 0x3d, 0xd4, 0x8d, 0x39, 0x8f,
-	0x27, 0xe0, 0xb1, 0x48, 0x7a, 0x5a, 0xcc, 0xa5, 0xb9, 0xef, 0x49, 0x10, 0xf3, 0x64, 0x0c, 0xd2,
-	0x7b, 0x05, 0x10, 0x8d, 0x12, 0x05, 0xe9, 0x48, 0x31, 0x11, 0x83, 0x1a, 0x2d, 0x5e, 0xc8, 0x54,
-	0x70, 0xc5, 0x71, 0x53, 0x5b, 0x11, 0x16, 0x49, 0x52, 0x02, 0xc8, 0xdc, 0x27, 0x06, 0xe0, 0xdc,
-	0xa9, 0x72, 0x21, 0x40, 0xf2, 0x99, 0x58, 0xe7, 0x43, 0xb3, 0x9d, 0x5d, 0x63, 0x39, 0x4d, 0x3c,
-	0x96, 0x65, 0x5c, 0x31, 0x95, 0xf0, 0x4c, 0xea, 0x57, 0xb7, 0x8b, 0x1a, 0x7d, 0x50, 0x0f, 0x00,
-	0xa2, 0x63, 0x05, 0xe9, 0xb3, 0xc2, 0x30, 0x84, 0xd7, 0x33, 0x90, 0x0a, 0xdf, 0x42, 0x57, 0x0d,
-	0x7d, 0x94, 0xb1, 0x14, 0x1a, 0x56, 0xd3, 0xda, 0xdf, 0x0e, 0xaf, 0x98, 0xcb, 0xc7, 0x2c, 0x05,
-	0xf7, 0xa3, 0x85, 0x76, 0x1f, 0xcd, 0x14, 0x53, 0xb0, 0x0a, 0x91, 0x86, 0x72, 0x13, 0xd5, 0xc7,
-	0x33, 0xa9, 0x78, 0x0a, 0x62, 0x94, 0x44, 0x0b, 0x06, 0x32, 0x57, 0xc7, 0x11, 0x7e, 0x8e, 0x10,
-	0x9f, 0x82, 0xd0, 0x61, 0x35, 0xec, 0xe6, 0xd6, 0x7e, 0xbd, 0xdd, 0x21, 0x9b, 0x2a, 0x42, 0x56,
-	0xdd, 0x3d, 0x31, 0x84, 0x70, 0x09, 0xe6, 0xbe, 0xb7, 0xd0, 0xf5, 0x0a, 0x3d, 0xfc, 0x10, 0xd5,
-	0xc6, 0x02, 0x98, 0xd2, 0x69, 0xd5, 0xdb, 0x7e, 0xa5, 0xcb, 0xb2, 0xc4, 0xe7, 0x7c, 0x1e, 0x5d,
-	0x0a, 0x17, 0x08, 0xdc, 0x40, 0x35, 0x01, 0x29, 0x9f, 0x43, 0xc3, 0xce, 0xf3, 0xcb, 0x5f, 0xf4,
-	0xb9, 0x57, 0x47, 0xdb, 0x65, 0x40, 0xee, 0x1b, 0x74, 0xa3, 0xa2, 0x56, 0x72, 0xca, 0x33, 0x09,
-	0x78, 0x80, 0x2e, 0x0b, 0x90, 0xb3, 0x89, 0x32, 0x85, 0xb8, 0xb7, 0xb9, 0x10, 0xeb, 0x88, 0x61,
-	0x01, 0x09, 0x0d, 0xcc, 0x0d, 0x90, 0x53, 0xad, 0xf6, 0x4f, 0x8d, 0x6e, 0x7f, 0xd9, 0x42, 0x3b,
-	0xab, 0xd6, 0x4f, 0x75, 0x04, 0xf8, 0xab, 0x85, 0xae, 0xfd, 0x35, 0x44, 0x98, 0x6e, 0x8e, 0xbc,
-	0x6a, 0xf2, 0x9c, 0xff, 0xef, 0x85, 0xdb, 0x79, 0xf7, 0xfd, 0xe7, 0x07, 0xfb, 0x00, 0xfb, 0xf9,
-	0xa7, 0x38, 0x5d, 0x49, 0xe7, 0xd0, 0x0c, 0x9b, 0xf4, 0x5a, 0xc5, 0x2f, 0x59, 0xaa, 0xbc, 0xd7,
-	0x3a, 0xc3, 0x3f, 0x2c, 0xb4, 0xb3, 0xb6, 0x2d, 0xf8, 0xfe, 0xc5, 0xaa, 0x6f, 0x66, 0xdf, 0xe9,
-	0x5e, 0xd8, 0x5e, 0xcf, 0x83, 0xdb, 0x2d, 0xb2, 0xea, 0xb8, 0xb7, 0xf3, 0xac, 0xfe, 0xa4, 0x71,
-	0xba, 0xf4, 0xa3, 0x0e, 0x5b, 0x67, 0xe7, 0x93, 0xa2, 0x69, 0x01, 0xa5, 0x56, 0xab, 0xf7, 0xd6,
-	0x46, 0x7b, 0x63, 0x9e, 0x6e, 0x8c, 0xa3, 0xe7, 0xac, 0xed, 0xed, 0x49, 0xbe, 0x24, 0x4e, 0xac,
-	0x17, 0x47, 0x0b, 0xfb, 0x98, 0x4f, 0x58, 0x16, 0x13, 0x2e, 0x62, 0x2f, 0x86, 0xac, 0x58, 0x21,
-	0x66, 0x1d, 0x4d, 0x13, 0x59, 0xbd, 0x00, 0xef, 0x1a, 0xe1, 0x93, 0xbd, 0xd5, 0x0f, 0x82, 0xcf,
-	0x76, 0xb3, 0xaf, 0x81, 0x41, 0x24, 0x89, 0x16, 0x73, 0x69, 0xe0, 0x93, 0x85, 0x63, 0xf9, 0xcd,
-	0xa8, 0x0c, 0x83, 0x48, 0x0e, 0x4b, 0x95, 0xe1, 0xc0, 0x1f, 0x1a, 0x95, 0x5f, 0xf6, 0x9e, 0xbe,
-	0xa7, 0x34, 0x88, 0x24, 0xa5, 0xa5, 0x12, 0xa5, 0x03, 0x9f, 0x52, 0xa3, 0xf6, 0xb2, 0x56, 0xc4,
-	0x79, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xd9, 0xad, 0xe7, 0xfc, 0xa7, 0x05, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/feed_mapping_service.pb.go b/googleapis/ads/googleads/v1/services/feed_mapping_service.pb.go
index 657899d22e..28e8a4240b 100644
--- a/googleapis/ads/googleads/v1/services/feed_mapping_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/feed_mapping_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/feed_mapping_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [FeedMappingService.GetFeedMapping][google.ads.googleads.v1.services.FeedMappingService.GetFeedMapping].
 type GetFeedMappingRequest struct {
@@ -40,16 +40,17 @@ func (m *GetFeedMappingRequest) Reset()         { *m = GetFeedMappingRequest{} }
 func (m *GetFeedMappingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFeedMappingRequest) ProtoMessage()    {}
 func (*GetFeedMappingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_service_f33bc33a71e46f7d, []int{0}
+	return fileDescriptor_0c4574cb8d3703b3, []int{0}
 }
+
 func (m *GetFeedMappingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFeedMappingRequest.Unmarshal(m, b)
 }
 func (m *GetFeedMappingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFeedMappingRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFeedMappingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFeedMappingRequest.Merge(dst, src)
+func (m *GetFeedMappingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFeedMappingRequest.Merge(m, src)
 }
 func (m *GetFeedMappingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFeedMappingRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateFeedMappingsRequest) Reset()         { *m = MutateFeedMappingsReq
 func (m *MutateFeedMappingsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedMappingsRequest) ProtoMessage()    {}
 func (*MutateFeedMappingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_service_f33bc33a71e46f7d, []int{1}
+	return fileDescriptor_0c4574cb8d3703b3, []int{1}
 }
+
 func (m *MutateFeedMappingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedMappingsRequest.Unmarshal(m, b)
 }
 func (m *MutateFeedMappingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedMappingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedMappingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedMappingsRequest.Merge(dst, src)
+func (m *MutateFeedMappingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedMappingsRequest.Merge(m, src)
 }
 func (m *MutateFeedMappingsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedMappingsRequest.Size(m)
@@ -155,16 +157,17 @@ func (m *FeedMappingOperation) Reset()         { *m = FeedMappingOperation{} }
 func (m *FeedMappingOperation) String() string { return proto.CompactTextString(m) }
 func (*FeedMappingOperation) ProtoMessage()    {}
 func (*FeedMappingOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_service_f33bc33a71e46f7d, []int{2}
+	return fileDescriptor_0c4574cb8d3703b3, []int{2}
 }
+
 func (m *FeedMappingOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedMappingOperation.Unmarshal(m, b)
 }
 func (m *FeedMappingOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedMappingOperation.Marshal(b, m, deterministic)
 }
-func (dst *FeedMappingOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedMappingOperation.Merge(dst, src)
+func (m *FeedMappingOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedMappingOperation.Merge(m, src)
 }
 func (m *FeedMappingOperation) XXX_Size() int {
 	return xxx_messageInfo_FeedMappingOperation.Size(m)
@@ -212,76 +215,14 @@ func (m *FeedMappingOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FeedMappingOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FeedMappingOperation_OneofMarshaler, _FeedMappingOperation_OneofUnmarshaler, _FeedMappingOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*FeedMappingOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*FeedMappingOperation_Create)(nil),
 		(*FeedMappingOperation_Remove)(nil),
 	}
 }
 
-func _FeedMappingOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FeedMappingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedMappingOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *FeedMappingOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("FeedMappingOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FeedMappingOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FeedMappingOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.FeedMapping)
-		err := b.DecodeMessage(msg)
-		m.Operation = &FeedMappingOperation_Create{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &FeedMappingOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FeedMappingOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FeedMappingOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedMappingOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedMappingOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a feed mapping mutate.
 type MutateFeedMappingsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -300,16 +241,17 @@ func (m *MutateFeedMappingsResponse) Reset()         { *m = MutateFeedMappingsRe
 func (m *MutateFeedMappingsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedMappingsResponse) ProtoMessage()    {}
 func (*MutateFeedMappingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_service_f33bc33a71e46f7d, []int{3}
+	return fileDescriptor_0c4574cb8d3703b3, []int{3}
 }
+
 func (m *MutateFeedMappingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedMappingsResponse.Unmarshal(m, b)
 }
 func (m *MutateFeedMappingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedMappingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedMappingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedMappingsResponse.Merge(dst, src)
+func (m *MutateFeedMappingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedMappingsResponse.Merge(m, src)
 }
 func (m *MutateFeedMappingsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedMappingsResponse.Size(m)
@@ -347,16 +289,17 @@ func (m *MutateFeedMappingResult) Reset()         { *m = MutateFeedMappingResult
 func (m *MutateFeedMappingResult) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedMappingResult) ProtoMessage()    {}
 func (*MutateFeedMappingResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_mapping_service_f33bc33a71e46f7d, []int{4}
+	return fileDescriptor_0c4574cb8d3703b3, []int{4}
 }
+
 func (m *MutateFeedMappingResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedMappingResult.Unmarshal(m, b)
 }
 func (m *MutateFeedMappingResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedMappingResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedMappingResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedMappingResult.Merge(dst, src)
+func (m *MutateFeedMappingResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedMappingResult.Merge(m, src)
 }
 func (m *MutateFeedMappingResult) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedMappingResult.Size(m)
@@ -382,6 +325,56 @@ func init() {
 	proto.RegisterType((*MutateFeedMappingResult)(nil), "google.ads.googleads.v1.services.MutateFeedMappingResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/feed_mapping_service.proto", fileDescriptor_0c4574cb8d3703b3)
+}
+
+var fileDescriptor_0c4574cb8d3703b3 = []byte{
+	// 663 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0x13, 0x4f,
+	0x18, 0xfe, 0x6d, 0xf2, 0xa3, 0xda, 0x49, 0xad, 0x30, 0x5a, 0x1a, 0x83, 0x68, 0x58, 0x0b, 0x96,
+	0x1c, 0x66, 0x4d, 0x94, 0x8a, 0xdb, 0x56, 0x48, 0xc1, 0xb6, 0x1e, 0x6a, 0xcb, 0x16, 0x72, 0x90,
+	0xc0, 0x32, 0xcd, 0xbe, 0x5d, 0x16, 0x76, 0x77, 0xd6, 0x99, 0xd9, 0x48, 0x29, 0xbd, 0x78, 0xf1,
+	0x03, 0x78, 0xf1, 0xec, 0xd1, 0x9b, 0x47, 0xbf, 0x82, 0xe0, 0xc9, 0x6f, 0x20, 0x9e, 0xfc, 0x10,
+	0x22, 0xbb, 0xb3, 0x13, 0x37, 0x6d, 0x42, 0xb4, 0xb7, 0x99, 0xf7, 0x7d, 0x9f, 0xe7, 0x7d, 0xde,
+	0x3f, 0x33, 0x68, 0xdd, 0x67, 0xcc, 0x0f, 0xc1, 0xa2, 0x9e, 0xb0, 0xd4, 0x31, 0x3b, 0x0d, 0xdb,
+	0x96, 0x00, 0x3e, 0x0c, 0x06, 0x20, 0xac, 0x63, 0x00, 0xcf, 0x8d, 0x68, 0x92, 0x04, 0xb1, 0xef,
+	0x16, 0x56, 0x92, 0x70, 0x26, 0x19, 0x6e, 0x2a, 0x04, 0xa1, 0x9e, 0x20, 0x23, 0x30, 0x19, 0xb6,
+	0x89, 0x06, 0x37, 0x1e, 0x4d, 0xa3, 0xe7, 0x20, 0x58, 0xca, 0xcf, 0xf3, 0x2b, 0xde, 0xc6, 0x6d,
+	0x8d, 0x4a, 0x02, 0x8b, 0xc6, 0x31, 0x93, 0x54, 0x06, 0x2c, 0x16, 0x85, 0xf7, 0x4e, 0xe1, 0xcd,
+	0x6f, 0x47, 0xe9, 0xb1, 0xf5, 0x9a, 0xd3, 0x24, 0x01, 0xae, 0xfd, 0xcb, 0x85, 0x9f, 0x27, 0x03,
+	0x4b, 0x48, 0x2a, 0xd3, 0xc2, 0x61, 0x6e, 0xa0, 0xa5, 0x1d, 0x90, 0xdb, 0x00, 0xde, 0x9e, 0x4a,
+	0xe7, 0xc0, 0xab, 0x14, 0x84, 0xc4, 0xf7, 0xd0, 0x35, 0xad, 0xc7, 0x8d, 0x69, 0x04, 0x75, 0xa3,
+	0x69, 0xac, 0xce, 0x3b, 0x0b, 0xda, 0xf8, 0x82, 0x46, 0x60, 0x7e, 0x37, 0xd0, 0xad, 0xbd, 0x54,
+	0x52, 0x09, 0x25, 0x06, 0xa1, 0x29, 0xee, 0xa2, 0xda, 0x20, 0x15, 0x92, 0x45, 0xc0, 0xdd, 0xc0,
+	0x2b, 0x08, 0x90, 0x36, 0x3d, 0xf7, 0x70, 0x0f, 0x21, 0x96, 0x00, 0x57, 0x95, 0xd4, 0x2b, 0xcd,
+	0xea, 0x6a, 0xad, 0xb3, 0x46, 0x66, 0x35, 0x90, 0x94, 0x72, 0xed, 0x6b, 0xb8, 0x53, 0x62, 0xc2,
+	0xf7, 0xd1, 0xf5, 0x84, 0x72, 0x19, 0xd0, 0xd0, 0x3d, 0xa6, 0x41, 0x98, 0x72, 0xa8, 0x57, 0x9b,
+	0xc6, 0xea, 0x55, 0x67, 0xb1, 0x30, 0x6f, 0x2b, 0x6b, 0x56, 0xe4, 0x90, 0x86, 0x81, 0x47, 0x25,
+	0xb8, 0x2c, 0x0e, 0x4f, 0xea, 0xff, 0xe7, 0x61, 0x0b, 0xda, 0xb8, 0x1f, 0x87, 0x27, 0xe6, 0x5b,
+	0x03, 0xdd, 0x9c, 0x94, 0x12, 0xef, 0xa2, 0xb9, 0x01, 0x07, 0x2a, 0x55, 0x6f, 0x6a, 0x1d, 0x32,
+	0x55, 0xfa, 0x68, 0xb2, 0x65, 0xed, 0xbb, 0xff, 0x39, 0x05, 0x1e, 0xd7, 0xd1, 0x1c, 0x87, 0x88,
+	0x0d, 0x95, 0xce, 0xf9, 0xcc, 0xa3, 0xee, 0x5b, 0x35, 0x34, 0x3f, 0x2a, 0xcc, 0xfc, 0x6c, 0xa0,
+	0xc6, 0xa4, 0x76, 0x8b, 0x84, 0xc5, 0x02, 0xf0, 0x36, 0x5a, 0x3a, 0x57, 0xb6, 0x0b, 0x9c, 0x33,
+	0x9e, 0x93, 0xd6, 0x3a, 0x58, 0xcb, 0xe3, 0xc9, 0x80, 0x1c, 0xe6, 0x4b, 0xe0, 0xdc, 0x18, 0x6f,
+	0xc8, 0xb3, 0x2c, 0x1c, 0x1f, 0xa2, 0x2b, 0x1c, 0x44, 0x1a, 0x4a, 0x3d, 0x93, 0x27, 0xb3, 0x67,
+	0x72, 0x41, 0x96, 0x93, 0x33, 0x38, 0x9a, 0xc9, 0x7c, 0x8a, 0x96, 0xa7, 0xc4, 0xfc, 0xd5, 0xaa,
+	0x75, 0xde, 0x57, 0x11, 0x2e, 0x41, 0x0f, 0x55, 0x62, 0xfc, 0xc9, 0x40, 0x8b, 0xe3, 0x0b, 0x8c,
+	0x1f, 0xcf, 0x56, 0x3b, 0x71, 0xe5, 0x1b, 0xff, 0x38, 0x3f, 0x73, 0xed, 0xcd, 0xb7, 0x1f, 0xef,
+	0x2a, 0x0f, 0x30, 0xc9, 0x1e, 0xef, 0xe9, 0x58, 0x09, 0x9b, 0x7a, 0xcb, 0x85, 0xd5, 0xca, 0x5f,
+	0xb3, 0x1e, 0x96, 0xd5, 0x3a, 0xc3, 0x5f, 0x0d, 0x84, 0x2f, 0x8e, 0x11, 0xaf, 0x5f, 0xa2, 0xcb,
+	0xfa, 0xad, 0x35, 0x36, 0x2e, 0x07, 0x56, 0x9b, 0x63, 0x6e, 0xe4, 0x95, 0xac, 0x99, 0xed, 0xac,
+	0x92, 0x3f, 0xd2, 0x4f, 0x4b, 0xcf, 0x77, 0xb3, 0x75, 0x36, 0x56, 0x88, 0x1d, 0xe5, 0x74, 0xb6,
+	0xd1, 0xda, 0xfa, 0x65, 0xa0, 0x95, 0x01, 0x8b, 0x66, 0x2a, 0xd8, 0x5a, 0xbe, 0x38, 0xc0, 0x83,
+	0xec, 0x17, 0x3a, 0x30, 0x5e, 0xee, 0x16, 0x60, 0x9f, 0x85, 0x34, 0xf6, 0x09, 0xe3, 0xbe, 0xe5,
+	0x43, 0x9c, 0xff, 0x51, 0xfa, 0x93, 0x4c, 0x02, 0x31, 0xfd, 0x4b, 0x5e, 0xd7, 0x87, 0x0f, 0x95,
+	0xea, 0x4e, 0xb7, 0xfb, 0xb1, 0xd2, 0xdc, 0x51, 0x84, 0x5d, 0x4f, 0x10, 0x75, 0xcc, 0x4e, 0xbd,
+	0x36, 0x29, 0x12, 0x8b, 0x2f, 0x3a, 0xa4, 0xdf, 0xf5, 0x44, 0x7f, 0x14, 0xd2, 0xef, 0xb5, 0xfb,
+	0x3a, 0xe4, 0x67, 0x65, 0x45, 0xd9, 0x6d, 0xbb, 0xeb, 0x09, 0xdb, 0x1e, 0x05, 0xd9, 0x76, 0xaf,
+	0x6d, 0xdb, 0x3a, 0xec, 0x68, 0x2e, 0xd7, 0xf9, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1,
+	0x89, 0x6c, 0x2f, 0x39, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -492,53 +485,3 @@ var _FeedMappingService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/feed_mapping_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/feed_mapping_service.proto", fileDescriptor_feed_mapping_service_f33bc33a71e46f7d)
-}
-
-var fileDescriptor_feed_mapping_service_f33bc33a71e46f7d = []byte{
-	// 663 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0x13, 0x4f,
-	0x18, 0xfe, 0x6d, 0xf2, 0xa3, 0xda, 0x49, 0xad, 0x30, 0x5a, 0x1a, 0x83, 0x68, 0x58, 0x0b, 0x96,
-	0x1c, 0x66, 0x4d, 0x94, 0x8a, 0xdb, 0x56, 0x48, 0xc1, 0xb6, 0x1e, 0x6a, 0xcb, 0x16, 0x72, 0x90,
-	0xc0, 0x32, 0xcd, 0xbe, 0x5d, 0x16, 0x76, 0x77, 0xd6, 0x99, 0xd9, 0x48, 0x29, 0xbd, 0x78, 0xf1,
-	0x03, 0x78, 0xf1, 0xec, 0xd1, 0x9b, 0x47, 0xbf, 0x82, 0xe0, 0xc9, 0x6f, 0x20, 0x9e, 0xfc, 0x10,
-	0x22, 0xbb, 0xb3, 0x13, 0x37, 0x6d, 0x42, 0xb4, 0xb7, 0x99, 0xf7, 0x7d, 0x9f, 0xe7, 0x7d, 0xde,
-	0x3f, 0x33, 0x68, 0xdd, 0x67, 0xcc, 0x0f, 0xc1, 0xa2, 0x9e, 0xb0, 0xd4, 0x31, 0x3b, 0x0d, 0xdb,
-	0x96, 0x00, 0x3e, 0x0c, 0x06, 0x20, 0xac, 0x63, 0x00, 0xcf, 0x8d, 0x68, 0x92, 0x04, 0xb1, 0xef,
-	0x16, 0x56, 0x92, 0x70, 0x26, 0x19, 0x6e, 0x2a, 0x04, 0xa1, 0x9e, 0x20, 0x23, 0x30, 0x19, 0xb6,
-	0x89, 0x06, 0x37, 0x1e, 0x4d, 0xa3, 0xe7, 0x20, 0x58, 0xca, 0xcf, 0xf3, 0x2b, 0xde, 0xc6, 0x6d,
-	0x8d, 0x4a, 0x02, 0x8b, 0xc6, 0x31, 0x93, 0x54, 0x06, 0x2c, 0x16, 0x85, 0xf7, 0x4e, 0xe1, 0xcd,
-	0x6f, 0x47, 0xe9, 0xb1, 0xf5, 0x9a, 0xd3, 0x24, 0x01, 0xae, 0xfd, 0xcb, 0x85, 0x9f, 0x27, 0x03,
-	0x4b, 0x48, 0x2a, 0xd3, 0xc2, 0x61, 0x6e, 0xa0, 0xa5, 0x1d, 0x90, 0xdb, 0x00, 0xde, 0x9e, 0x4a,
-	0xe7, 0xc0, 0xab, 0x14, 0x84, 0xc4, 0xf7, 0xd0, 0x35, 0xad, 0xc7, 0x8d, 0x69, 0x04, 0x75, 0xa3,
-	0x69, 0xac, 0xce, 0x3b, 0x0b, 0xda, 0xf8, 0x82, 0x46, 0x60, 0x7e, 0x37, 0xd0, 0xad, 0xbd, 0x54,
-	0x52, 0x09, 0x25, 0x06, 0xa1, 0x29, 0xee, 0xa2, 0xda, 0x20, 0x15, 0x92, 0x45, 0xc0, 0xdd, 0xc0,
-	0x2b, 0x08, 0x90, 0x36, 0x3d, 0xf7, 0x70, 0x0f, 0x21, 0x96, 0x00, 0x57, 0x95, 0xd4, 0x2b, 0xcd,
-	0xea, 0x6a, 0xad, 0xb3, 0x46, 0x66, 0x35, 0x90, 0x94, 0x72, 0xed, 0x6b, 0xb8, 0x53, 0x62, 0xc2,
-	0xf7, 0xd1, 0xf5, 0x84, 0x72, 0x19, 0xd0, 0xd0, 0x3d, 0xa6, 0x41, 0x98, 0x72, 0xa8, 0x57, 0x9b,
-	0xc6, 0xea, 0x55, 0x67, 0xb1, 0x30, 0x6f, 0x2b, 0x6b, 0x56, 0xe4, 0x90, 0x86, 0x81, 0x47, 0x25,
-	0xb8, 0x2c, 0x0e, 0x4f, 0xea, 0xff, 0xe7, 0x61, 0x0b, 0xda, 0xb8, 0x1f, 0x87, 0x27, 0xe6, 0x5b,
-	0x03, 0xdd, 0x9c, 0x94, 0x12, 0xef, 0xa2, 0xb9, 0x01, 0x07, 0x2a, 0x55, 0x6f, 0x6a, 0x1d, 0x32,
-	0x55, 0xfa, 0x68, 0xb2, 0x65, 0xed, 0xbb, 0xff, 0x39, 0x05, 0x1e, 0xd7, 0xd1, 0x1c, 0x87, 0x88,
-	0x0d, 0x95, 0xce, 0xf9, 0xcc, 0xa3, 0xee, 0x5b, 0x35, 0x34, 0x3f, 0x2a, 0xcc, 0xfc, 0x6c, 0xa0,
-	0xc6, 0xa4, 0x76, 0x8b, 0x84, 0xc5, 0x02, 0xf0, 0x36, 0x5a, 0x3a, 0x57, 0xb6, 0x0b, 0x9c, 0x33,
-	0x9e, 0x93, 0xd6, 0x3a, 0x58, 0xcb, 0xe3, 0xc9, 0x80, 0x1c, 0xe6, 0x4b, 0xe0, 0xdc, 0x18, 0x6f,
-	0xc8, 0xb3, 0x2c, 0x1c, 0x1f, 0xa2, 0x2b, 0x1c, 0x44, 0x1a, 0x4a, 0x3d, 0x93, 0x27, 0xb3, 0x67,
-	0x72, 0x41, 0x96, 0x93, 0x33, 0x38, 0x9a, 0xc9, 0x7c, 0x8a, 0x96, 0xa7, 0xc4, 0xfc, 0xd5, 0xaa,
-	0x75, 0xde, 0x57, 0x11, 0x2e, 0x41, 0x0f, 0x55, 0x62, 0xfc, 0xc9, 0x40, 0x8b, 0xe3, 0x0b, 0x8c,
-	0x1f, 0xcf, 0x56, 0x3b, 0x71, 0xe5, 0x1b, 0xff, 0x38, 0x3f, 0x73, 0xed, 0xcd, 0xb7, 0x1f, 0xef,
-	0x2a, 0x0f, 0x30, 0xc9, 0x1e, 0xef, 0xe9, 0x58, 0x09, 0x9b, 0x7a, 0xcb, 0x85, 0xd5, 0xca, 0x5f,
-	0xb3, 0x1e, 0x96, 0xd5, 0x3a, 0xc3, 0x5f, 0x0d, 0x84, 0x2f, 0x8e, 0x11, 0xaf, 0x5f, 0xa2, 0xcb,
-	0xfa, 0xad, 0x35, 0x36, 0x2e, 0x07, 0x56, 0x9b, 0x63, 0x6e, 0xe4, 0x95, 0xac, 0x99, 0xed, 0xac,
-	0x92, 0x3f, 0xd2, 0x4f, 0x4b, 0xcf, 0x77, 0xb3, 0x75, 0x36, 0x56, 0x88, 0x1d, 0xe5, 0x74, 0xb6,
-	0xd1, 0xda, 0xfa, 0x65, 0xa0, 0x95, 0x01, 0x8b, 0x66, 0x2a, 0xd8, 0x5a, 0xbe, 0x38, 0xc0, 0x83,
-	0xec, 0x17, 0x3a, 0x30, 0x5e, 0xee, 0x16, 0x60, 0x9f, 0x85, 0x34, 0xf6, 0x09, 0xe3, 0xbe, 0xe5,
-	0x43, 0x9c, 0xff, 0x51, 0xfa, 0x93, 0x4c, 0x02, 0x31, 0xfd, 0x4b, 0x5e, 0xd7, 0x87, 0x0f, 0x95,
-	0xea, 0x4e, 0xb7, 0xfb, 0xb1, 0xd2, 0xdc, 0x51, 0x84, 0x5d, 0x4f, 0x10, 0x75, 0xcc, 0x4e, 0xbd,
-	0x36, 0x29, 0x12, 0x8b, 0x2f, 0x3a, 0xa4, 0xdf, 0xf5, 0x44, 0x7f, 0x14, 0xd2, 0xef, 0xb5, 0xfb,
-	0x3a, 0xe4, 0x67, 0x65, 0x45, 0xd9, 0x6d, 0xbb, 0xeb, 0x09, 0xdb, 0x1e, 0x05, 0xd9, 0x76, 0xaf,
-	0x6d, 0xdb, 0x3a, 0xec, 0x68, 0x2e, 0xd7, 0xf9, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1,
-	0x89, 0x6c, 0x2f, 0x39, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/feed_placeholder_view_service.pb.go b/googleapis/ads/googleads/v1/services/feed_placeholder_view_service.pb.go
index e75e4d0ac4..45b5e57495 100644
--- a/googleapis/ads/googleads/v1/services/feed_placeholder_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/feed_placeholder_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/feed_placeholder_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [FeedPlaceholderViewService.GetFeedPlaceholderView][google.ads.googleads.v1.services.FeedPlaceholderViewService.GetFeedPlaceholderView].
 type GetFeedPlaceholderViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetFeedPlaceholderViewRequest) Reset()         { *m = GetFeedPlaceholde
 func (m *GetFeedPlaceholderViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFeedPlaceholderViewRequest) ProtoMessage()    {}
 func (*GetFeedPlaceholderViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_placeholder_view_service_20149c4acfccfc2b, []int{0}
+	return fileDescriptor_8c806439cff2804f, []int{0}
 }
+
 func (m *GetFeedPlaceholderViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFeedPlaceholderViewRequest.Unmarshal(m, b)
 }
 func (m *GetFeedPlaceholderViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFeedPlaceholderViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFeedPlaceholderViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFeedPlaceholderViewRequest.Merge(dst, src)
+func (m *GetFeedPlaceholderViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFeedPlaceholderViewRequest.Merge(m, src)
 }
 func (m *GetFeedPlaceholderViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFeedPlaceholderViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetFeedPlaceholderViewRequest)(nil), "google.ads.googleads.v1.services.GetFeedPlaceholderViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/feed_placeholder_view_service.proto", fileDescriptor_8c806439cff2804f)
+}
+
+var fileDescriptor_8c806439cff2804f = []byte{
+	// 377 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcd, 0x4a, 0xeb, 0x40,
+	0x14, 0x26, 0xb9, 0x70, 0xe1, 0x86, 0x7b, 0x37, 0x59, 0x5c, 0x24, 0x28, 0x96, 0xda, 0x85, 0x74,
+	0x31, 0x43, 0x14, 0x8a, 0x8c, 0x54, 0x49, 0x29, 0xd6, 0x95, 0x94, 0x0a, 0x59, 0x48, 0x20, 0x8c,
+	0x99, 0x63, 0x0c, 0x24, 0x99, 0x98, 0x49, 0xd3, 0x85, 0xb8, 0x71, 0xe1, 0x0b, 0xf8, 0x06, 0x2e,
+	0x7d, 0x14, 0x77, 0xe2, 0x2b, 0xb8, 0x72, 0xe5, 0x23, 0x48, 0x3a, 0x9d, 0x88, 0xd2, 0xd8, 0xdd,
+	0xc7, 0x9c, 0xef, 0xe7, 0xfc, 0x8c, 0x31, 0x0c, 0x39, 0x0f, 0x63, 0xc0, 0x94, 0x09, 0x2c, 0x61,
+	0x85, 0x4a, 0x1b, 0x0b, 0xc8, 0xcb, 0x28, 0x00, 0x81, 0x2f, 0x00, 0x98, 0x9f, 0xc5, 0x34, 0x80,
+	0x4b, 0x1e, 0x33, 0xc8, 0xfd, 0x32, 0x82, 0x99, 0xbf, 0x28, 0xa3, 0x2c, 0xe7, 0x05, 0x37, 0x5b,
+	0x52, 0x8a, 0x28, 0x13, 0xa8, 0x76, 0x41, 0xa5, 0x8d, 0x94, 0x8b, 0xd5, 0x6f, 0xca, 0xc9, 0x41,
+	0xf0, 0x69, 0xde, 0x18, 0x24, 0x03, 0xac, 0x75, 0x25, 0xcf, 0x22, 0x4c, 0xd3, 0x94, 0x17, 0xb4,
+	0x88, 0x78, 0x2a, 0x64, 0xb5, 0x3d, 0x34, 0x36, 0x46, 0x50, 0x1c, 0x01, 0xb0, 0xf1, 0xa7, 0xdc,
+	0x8d, 0x60, 0x36, 0x81, 0xab, 0x29, 0x88, 0xc2, 0xdc, 0x32, 0xfe, 0xa9, 0x1c, 0x3f, 0xa5, 0x09,
+	0xac, 0x69, 0x2d, 0x6d, 0xfb, 0xcf, 0xe4, 0xaf, 0x7a, 0x3c, 0xa1, 0x09, 0xec, 0xbc, 0x6b, 0x86,
+	0xb5, 0xc4, 0xe3, 0x54, 0x8e, 0x60, 0x3e, 0x6b, 0xc6, 0xff, 0xe5, 0x29, 0xe6, 0x21, 0x5a, 0x35,
+	0x3f, 0xfa, 0xb1, 0x3f, 0xab, 0xd7, 0x68, 0x50, 0xaf, 0x07, 0x2d, 0x91, 0xb7, 0x0f, 0x6e, 0x5f,
+	0x5e, 0xef, 0xf5, 0x3d, 0xb3, 0x57, 0x6d, 0xf2, 0xfa, 0xcb, 0x88, 0xfd, 0x60, 0x2a, 0x0a, 0x9e,
+	0x40, 0x2e, 0x70, 0x77, 0xbe, 0xda, 0x6f, 0x5a, 0x81, 0xbb, 0x37, 0x83, 0x3b, 0xdd, 0xe8, 0x04,
+	0x3c, 0x59, 0xd9, 0xfe, 0x60, 0xb3, 0x79, 0x31, 0xe3, 0xea, 0x04, 0x63, 0xed, 0xec, 0x78, 0x61,
+	0x12, 0xf2, 0x98, 0xa6, 0x21, 0xe2, 0x79, 0x88, 0x43, 0x48, 0xe7, 0x07, 0x52, 0x17, 0xcf, 0x22,
+	0xd1, 0xfc, 0xd1, 0xf6, 0x15, 0x78, 0xd0, 0x7f, 0x8d, 0x1c, 0xe7, 0x51, 0x6f, 0x8d, 0xa4, 0xa1,
+	0xc3, 0x04, 0x92, 0xb0, 0x42, 0xae, 0x8d, 0x16, 0xc1, 0xe2, 0x49, 0x51, 0x3c, 0x87, 0x09, 0xaf,
+	0xa6, 0x78, 0xae, 0xed, 0x29, 0xca, 0x9b, 0xde, 0x91, 0xef, 0x84, 0x38, 0x4c, 0x10, 0x52, 0x93,
+	0x08, 0x71, 0x6d, 0x42, 0x14, 0xed, 0xfc, 0xf7, 0xbc, 0xcf, 0xdd, 0x8f, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xee, 0xb8, 0x0d, 0xf6, 0x0f, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _FeedPlaceholderViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/feed_placeholder_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/feed_placeholder_view_service.proto", fileDescriptor_feed_placeholder_view_service_20149c4acfccfc2b)
-}
-
-var fileDescriptor_feed_placeholder_view_service_20149c4acfccfc2b = []byte{
-	// 377 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcd, 0x4a, 0xeb, 0x40,
-	0x14, 0x26, 0xb9, 0x70, 0xe1, 0x86, 0x7b, 0x37, 0x59, 0x5c, 0x24, 0x28, 0x96, 0xda, 0x85, 0x74,
-	0x31, 0x43, 0x14, 0x8a, 0x8c, 0x54, 0x49, 0x29, 0xd6, 0x95, 0x94, 0x0a, 0x59, 0x48, 0x20, 0x8c,
-	0x99, 0x63, 0x0c, 0x24, 0x99, 0x98, 0x49, 0xd3, 0x85, 0xb8, 0x71, 0xe1, 0x0b, 0xf8, 0x06, 0x2e,
-	0x7d, 0x14, 0x77, 0xe2, 0x2b, 0xb8, 0x72, 0xe5, 0x23, 0x48, 0x3a, 0x9d, 0x88, 0xd2, 0xd8, 0xdd,
-	0xc7, 0x9c, 0xef, 0xe7, 0xfc, 0x8c, 0x31, 0x0c, 0x39, 0x0f, 0x63, 0xc0, 0x94, 0x09, 0x2c, 0x61,
-	0x85, 0x4a, 0x1b, 0x0b, 0xc8, 0xcb, 0x28, 0x00, 0x81, 0x2f, 0x00, 0x98, 0x9f, 0xc5, 0x34, 0x80,
-	0x4b, 0x1e, 0x33, 0xc8, 0xfd, 0x32, 0x82, 0x99, 0xbf, 0x28, 0xa3, 0x2c, 0xe7, 0x05, 0x37, 0x5b,
-	0x52, 0x8a, 0x28, 0x13, 0xa8, 0x76, 0x41, 0xa5, 0x8d, 0x94, 0x8b, 0xd5, 0x6f, 0xca, 0xc9, 0x41,
-	0xf0, 0x69, 0xde, 0x18, 0x24, 0x03, 0xac, 0x75, 0x25, 0xcf, 0x22, 0x4c, 0xd3, 0x94, 0x17, 0xb4,
-	0x88, 0x78, 0x2a, 0x64, 0xb5, 0x3d, 0x34, 0x36, 0x46, 0x50, 0x1c, 0x01, 0xb0, 0xf1, 0xa7, 0xdc,
-	0x8d, 0x60, 0x36, 0x81, 0xab, 0x29, 0x88, 0xc2, 0xdc, 0x32, 0xfe, 0xa9, 0x1c, 0x3f, 0xa5, 0x09,
-	0xac, 0x69, 0x2d, 0x6d, 0xfb, 0xcf, 0xe4, 0xaf, 0x7a, 0x3c, 0xa1, 0x09, 0xec, 0xbc, 0x6b, 0x86,
-	0xb5, 0xc4, 0xe3, 0x54, 0x8e, 0x60, 0x3e, 0x6b, 0xc6, 0xff, 0xe5, 0x29, 0xe6, 0x21, 0x5a, 0x35,
-	0x3f, 0xfa, 0xb1, 0x3f, 0xab, 0xd7, 0x68, 0x50, 0xaf, 0x07, 0x2d, 0x91, 0xb7, 0x0f, 0x6e, 0x5f,
-	0x5e, 0xef, 0xf5, 0x3d, 0xb3, 0x57, 0x6d, 0xf2, 0xfa, 0xcb, 0x88, 0xfd, 0x60, 0x2a, 0x0a, 0x9e,
-	0x40, 0x2e, 0x70, 0x77, 0xbe, 0xda, 0x6f, 0x5a, 0x81, 0xbb, 0x37, 0x83, 0x3b, 0xdd, 0xe8, 0x04,
-	0x3c, 0x59, 0xd9, 0xfe, 0x60, 0xb3, 0x79, 0x31, 0xe3, 0xea, 0x04, 0x63, 0xed, 0xec, 0x78, 0x61,
-	0x12, 0xf2, 0x98, 0xa6, 0x21, 0xe2, 0x79, 0x88, 0x43, 0x48, 0xe7, 0x07, 0x52, 0x17, 0xcf, 0x22,
-	0xd1, 0xfc, 0xd1, 0xf6, 0x15, 0x78, 0xd0, 0x7f, 0x8d, 0x1c, 0xe7, 0x51, 0x6f, 0x8d, 0xa4, 0xa1,
-	0xc3, 0x04, 0x92, 0xb0, 0x42, 0xae, 0x8d, 0x16, 0xc1, 0xe2, 0x49, 0x51, 0x3c, 0x87, 0x09, 0xaf,
-	0xa6, 0x78, 0xae, 0xed, 0x29, 0xca, 0x9b, 0xde, 0x91, 0xef, 0x84, 0x38, 0x4c, 0x10, 0x52, 0x93,
-	0x08, 0x71, 0x6d, 0x42, 0x14, 0xed, 0xfc, 0xf7, 0xbc, 0xcf, 0xdd, 0x8f, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xee, 0xb8, 0x0d, 0xf6, 0x0f, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/feed_service.pb.go b/googleapis/ads/googleads/v1/services/feed_service.pb.go
index 845ca8ec95..ecfc22dc34 100644
--- a/googleapis/ads/googleads/v1/services/feed_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/feed_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/feed_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [FeedService.GetFeed][google.ads.googleads.v1.services.FeedService.GetFeed].
 type GetFeedRequest struct {
@@ -41,16 +41,17 @@ func (m *GetFeedRequest) Reset()         { *m = GetFeedRequest{} }
 func (m *GetFeedRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFeedRequest) ProtoMessage()    {}
 func (*GetFeedRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_service_ed598965e23a13be, []int{0}
+	return fileDescriptor_3b158f21a9b50a59, []int{0}
 }
+
 func (m *GetFeedRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFeedRequest.Unmarshal(m, b)
 }
 func (m *GetFeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFeedRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFeedRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFeedRequest.Merge(dst, src)
+func (m *GetFeedRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFeedRequest.Merge(m, src)
 }
 func (m *GetFeedRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFeedRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateFeedsRequest) Reset()         { *m = MutateFeedsRequest{} }
 func (m *MutateFeedsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedsRequest) ProtoMessage()    {}
 func (*MutateFeedsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_service_ed598965e23a13be, []int{1}
+	return fileDescriptor_3b158f21a9b50a59, []int{1}
 }
+
 func (m *MutateFeedsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedsRequest.Unmarshal(m, b)
 }
 func (m *MutateFeedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedsRequest.Merge(dst, src)
+func (m *MutateFeedsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedsRequest.Merge(m, src)
 }
 func (m *MutateFeedsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *FeedOperation) Reset()         { *m = FeedOperation{} }
 func (m *FeedOperation) String() string { return proto.CompactTextString(m) }
 func (*FeedOperation) ProtoMessage()    {}
 func (*FeedOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_service_ed598965e23a13be, []int{2}
+	return fileDescriptor_3b158f21a9b50a59, []int{2}
 }
+
 func (m *FeedOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeedOperation.Unmarshal(m, b)
 }
 func (m *FeedOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FeedOperation.Marshal(b, m, deterministic)
 }
-func (dst *FeedOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FeedOperation.Merge(dst, src)
+func (m *FeedOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FeedOperation.Merge(m, src)
 }
 func (m *FeedOperation) XXX_Size() int {
 	return xxx_messageInfo_FeedOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *FeedOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FeedOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FeedOperation_OneofMarshaler, _FeedOperation_OneofUnmarshaler, _FeedOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*FeedOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*FeedOperation_Create)(nil),
 		(*FeedOperation_Update)(nil),
 		(*FeedOperation_Remove)(nil),
 	}
 }
 
-func _FeedOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *FeedOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *FeedOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("FeedOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FeedOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FeedOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.Feed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &FeedOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.Feed)
-		err := b.DecodeMessage(msg)
-		m.Operation = &FeedOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &FeedOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FeedOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FeedOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *FeedOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FeedOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for an feed mutate.
 type MutateFeedsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateFeedsResponse) Reset()         { *m = MutateFeedsResponse{} }
 func (m *MutateFeedsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedsResponse) ProtoMessage()    {}
 func (*MutateFeedsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_service_ed598965e23a13be, []int{3}
+	return fileDescriptor_3b158f21a9b50a59, []int{3}
 }
+
 func (m *MutateFeedsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedsResponse.Unmarshal(m, b)
 }
 func (m *MutateFeedsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedsResponse.Merge(dst, src)
+func (m *MutateFeedsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedsResponse.Merge(m, src)
 }
 func (m *MutateFeedsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateFeedResult) Reset()         { *m = MutateFeedResult{} }
 func (m *MutateFeedResult) String() string { return proto.CompactTextString(m) }
 func (*MutateFeedResult) ProtoMessage()    {}
 func (*MutateFeedResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_feed_service_ed598965e23a13be, []int{4}
+	return fileDescriptor_3b158f21a9b50a59, []int{4}
 }
+
 func (m *MutateFeedResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateFeedResult.Unmarshal(m, b)
 }
 func (m *MutateFeedResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateFeedResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateFeedResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateFeedResult.Merge(dst, src)
+func (m *MutateFeedResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateFeedResult.Merge(m, src)
 }
 func (m *MutateFeedResult) XXX_Size() int {
 	return xxx_messageInfo_MutateFeedResult.Size(m)
@@ -425,6 +350,58 @@ func init() {
 	proto.RegisterType((*MutateFeedResult)(nil), "google.ads.googleads.v1.services.MutateFeedResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/feed_service.proto", fileDescriptor_3b158f21a9b50a59)
+}
+
+var fileDescriptor_3b158f21a9b50a59 = []byte{
+	// 694 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6b, 0x13, 0x41,
+	0x14, 0x76, 0xb7, 0xd2, 0xda, 0xd9, 0xb6, 0x96, 0x29, 0x62, 0x08, 0xa2, 0x61, 0x2d, 0xb4, 0x06,
+	0xd9, 0x31, 0xa9, 0x45, 0xd8, 0xd2, 0x43, 0x0a, 0xa6, 0x15, 0xac, 0x2d, 0x5b, 0xe8, 0x41, 0x02,
+	0xcb, 0x34, 0x3b, 0x09, 0x4b, 0x77, 0x77, 0xd6, 0x99, 0xd9, 0x48, 0x29, 0xbd, 0xf8, 0x17, 0xc4,
+	0x3f, 0xe0, 0x51, 0x4f, 0xfe, 0x0d, 0xaf, 0x7a, 0xf1, 0xee, 0xc9, 0x3f, 0x20, 0xde, 0x64, 0x66,
+	0x76, 0xd2, 0xa4, 0x50, 0xd2, 0xdc, 0xde, 0xbe, 0xf9, 0xbe, 0xef, 0x7d, 0xf3, 0xde, 0xbe, 0x01,
+	0x1b, 0x7d, 0x4a, 0xfb, 0x09, 0x41, 0x38, 0xe2, 0x48, 0x87, 0x32, 0x1a, 0x34, 0x10, 0x27, 0x6c,
+	0x10, 0x77, 0x09, 0x47, 0x3d, 0x42, 0xa2, 0xb0, 0xfc, 0xf2, 0x72, 0x46, 0x05, 0x85, 0x35, 0x8d,
+	0xf4, 0x70, 0xc4, 0xbd, 0x21, 0xc9, 0x1b, 0x34, 0x3c, 0x43, 0xaa, 0x3e, 0xbd, 0x4e, 0x96, 0x11,
+	0x4e, 0x0b, 0x66, 0x74, 0xb5, 0x5e, 0xf5, 0x81, 0x41, 0xe7, 0x31, 0xc2, 0x59, 0x46, 0x05, 0x16,
+	0x31, 0xcd, 0x78, 0x79, 0x5a, 0x56, 0x43, 0xea, 0xeb, 0xa4, 0xe8, 0xa1, 0x5e, 0x4c, 0x92, 0x28,
+	0x4c, 0x31, 0x3f, 0x2d, 0x11, 0x0f, 0xaf, 0x22, 0xde, 0x33, 0x9c, 0xe7, 0x84, 0x19, 0x85, 0xfb,
+	0xe5, 0x39, 0xcb, 0xbb, 0x88, 0x0b, 0x2c, 0x8a, 0xf2, 0xc0, 0xdd, 0x04, 0x4b, 0xbb, 0x44, 0xb4,
+	0x09, 0x89, 0x02, 0xf2, 0xae, 0x20, 0x5c, 0xc0, 0xc7, 0x60, 0xd1, 0x58, 0x0c, 0x33, 0x9c, 0x92,
+	0x8a, 0x55, 0xb3, 0xd6, 0xe7, 0x83, 0x05, 0x93, 0x7c, 0x83, 0x53, 0xe2, 0xfe, 0xb4, 0x00, 0xdc,
+	0x2f, 0x04, 0x16, 0x44, 0x52, 0xb9, 0xe1, 0x3e, 0x02, 0x4e, 0xb7, 0xe0, 0x82, 0xa6, 0x84, 0x85,
+	0x71, 0x54, 0x32, 0x81, 0x49, 0xbd, 0x8a, 0xe0, 0x01, 0x00, 0x34, 0x27, 0x4c, 0xdf, 0xae, 0x62,
+	0xd7, 0x66, 0xd6, 0x9d, 0x26, 0xf2, 0x26, 0x35, 0xd3, 0x93, 0x45, 0x0e, 0x0c, 0x2f, 0x18, 0x91,
+	0x80, 0x6b, 0xe0, 0x6e, 0x8e, 0x99, 0x88, 0x71, 0x12, 0xf6, 0x70, 0x9c, 0x14, 0x8c, 0x54, 0x66,
+	0x6a, 0xd6, 0xfa, 0x9d, 0x60, 0xa9, 0x4c, 0xb7, 0x75, 0x56, 0x5e, 0x6b, 0x80, 0x93, 0x38, 0xc2,
+	0x82, 0x84, 0x34, 0x4b, 0xce, 0x2a, 0xb7, 0x15, 0x6c, 0xc1, 0x24, 0x0f, 0xb2, 0xe4, 0xcc, 0xfd,
+	0x67, 0x81, 0xc5, 0xb1, 0x5a, 0x70, 0x0b, 0x38, 0x45, 0xae, 0x48, 0xb2, 0xdb, 0x8a, 0xe4, 0x34,
+	0xab, 0xc6, 0xb1, 0x69, 0xb7, 0xd7, 0x96, 0x03, 0xd9, 0xc7, 0xfc, 0x34, 0x00, 0x1a, 0x2e, 0x63,
+	0xd8, 0x02, 0xb3, 0x5d, 0x46, 0xb0, 0xd0, 0x3d, 0x74, 0x9a, 0x6b, 0xd7, 0xde, 0x74, 0xf8, 0x53,
+	0xa8, 0xab, 0xee, 0xdd, 0x0a, 0x4a, 0xa2, 0x94, 0xd0, 0x82, 0x15, 0x7b, 0x6a, 0x09, 0x4d, 0x84,
+	0x15, 0x30, 0xcb, 0x48, 0x4a, 0x07, 0xba, 0x33, 0xf3, 0xf2, 0x44, 0x7f, 0xef, 0x38, 0x60, 0x7e,
+	0xd8, 0x4a, 0xf7, 0xab, 0x05, 0x56, 0xc6, 0x46, 0xca, 0x73, 0x9a, 0x71, 0x02, 0xdb, 0xe0, 0xde,
+	0x95, 0x0e, 0x87, 0x84, 0x31, 0xca, 0x94, 0x9a, 0xd3, 0x84, 0xc6, 0x10, 0xcb, 0xbb, 0xde, 0x91,
+	0xfa, 0xb5, 0x82, 0x95, 0xf1, 0xde, 0xbf, 0x94, 0x70, 0xf8, 0x1a, 0xcc, 0x31, 0xc2, 0x8b, 0x44,
+	0x98, 0xb9, 0x37, 0x27, 0xcf, 0xfd, 0xd2, 0x4f, 0xa0, 0xa8, 0x81, 0x91, 0x70, 0x5f, 0x80, 0xe5,
+	0xab, 0x87, 0x37, 0xfa, 0x73, 0x9b, 0xbf, 0x6c, 0xe0, 0x48, 0xce, 0x91, 0xae, 0x01, 0x3f, 0x59,
+	0x60, 0xae, 0xdc, 0x00, 0xf8, 0x6c, 0xb2, 0xa3, 0xf1, 0x65, 0xa9, 0xde, 0x74, 0x1c, 0x2e, 0xfa,
+	0xf0, 0xe3, 0xf7, 0x47, 0xfb, 0x09, 0x5c, 0x93, 0x4f, 0xc0, 0xf9, 0x98, 0xcd, 0x6d, 0xb3, 0x1f,
+	0x1c, 0xd5, 0xd5, 0x9b, 0xc0, 0x51, 0xfd, 0x02, 0x7e, 0xb3, 0x80, 0x33, 0x32, 0x0e, 0xf8, 0x7c,
+	0x9a, 0x6e, 0x99, 0x85, 0xac, 0x6e, 0x4e, 0xc9, 0xd2, 0x33, 0x77, 0x37, 0x95, 0x5b, 0xe4, 0xd6,
+	0xa5, 0xdb, 0x4b, 0x7b, 0xe7, 0x23, 0xcb, 0xbd, 0x5d, 0xbf, 0xd0, 0x66, 0xfd, 0x54, 0x09, 0xf8,
+	0x56, 0x7d, 0xe7, 0xaf, 0x05, 0x56, 0xbb, 0x34, 0x9d, 0x58, 0x73, 0x67, 0x79, 0x64, 0x02, 0x87,
+	0x72, 0x87, 0x0e, 0xad, 0xb7, 0x7b, 0x25, 0xab, 0x4f, 0x13, 0x9c, 0xf5, 0x3d, 0xca, 0xfa, 0xa8,
+	0x4f, 0x32, 0xb5, 0x61, 0xe6, 0x01, 0xcd, 0x63, 0x7e, 0xfd, 0x33, 0xbd, 0x65, 0x82, 0xcf, 0xf6,
+	0xcc, 0x6e, 0xab, 0xf5, 0xc5, 0xae, 0xed, 0x6a, 0xc1, 0x56, 0xc4, 0x3d, 0x1d, 0xca, 0xe8, 0xb8,
+	0xe1, 0x95, 0x85, 0xf9, 0x77, 0x03, 0xe9, 0xb4, 0x22, 0xde, 0x19, 0x42, 0x3a, 0xc7, 0x8d, 0x8e,
+	0x81, 0xfc, 0xb1, 0x57, 0x75, 0xde, 0xf7, 0x5b, 0x11, 0xf7, 0xfd, 0x21, 0xc8, 0xf7, 0x8f, 0x1b,
+	0xbe, 0x6f, 0x60, 0x27, 0xb3, 0xca, 0xe7, 0xc6, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x05,
+	0x04, 0x92, 0x4d, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -535,55 +512,3 @@ var _FeedService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/feed_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/feed_service.proto", fileDescriptor_feed_service_ed598965e23a13be)
-}
-
-var fileDescriptor_feed_service_ed598965e23a13be = []byte{
-	// 694 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6b, 0x13, 0x41,
-	0x14, 0x76, 0xb7, 0xd2, 0xda, 0xd9, 0xb6, 0x96, 0x29, 0x62, 0x08, 0xa2, 0x61, 0x2d, 0xb4, 0x06,
-	0xd9, 0x31, 0xa9, 0x45, 0xd8, 0xd2, 0x43, 0x0a, 0xa6, 0x15, 0xac, 0x2d, 0x5b, 0xe8, 0x41, 0x02,
-	0xcb, 0x34, 0x3b, 0x09, 0x4b, 0x77, 0x77, 0xd6, 0x99, 0xd9, 0x48, 0x29, 0xbd, 0xf8, 0x17, 0xc4,
-	0x3f, 0xe0, 0x51, 0x4f, 0xfe, 0x0d, 0xaf, 0x7a, 0xf1, 0xee, 0xc9, 0x3f, 0x20, 0xde, 0x64, 0x66,
-	0x76, 0xd2, 0xa4, 0x50, 0xd2, 0xdc, 0xde, 0xbe, 0xf9, 0xbe, 0xef, 0x7d, 0xf3, 0xde, 0xbe, 0x01,
-	0x1b, 0x7d, 0x4a, 0xfb, 0x09, 0x41, 0x38, 0xe2, 0x48, 0x87, 0x32, 0x1a, 0x34, 0x10, 0x27, 0x6c,
-	0x10, 0x77, 0x09, 0x47, 0x3d, 0x42, 0xa2, 0xb0, 0xfc, 0xf2, 0x72, 0x46, 0x05, 0x85, 0x35, 0x8d,
-	0xf4, 0x70, 0xc4, 0xbd, 0x21, 0xc9, 0x1b, 0x34, 0x3c, 0x43, 0xaa, 0x3e, 0xbd, 0x4e, 0x96, 0x11,
-	0x4e, 0x0b, 0x66, 0x74, 0xb5, 0x5e, 0xf5, 0x81, 0x41, 0xe7, 0x31, 0xc2, 0x59, 0x46, 0x05, 0x16,
-	0x31, 0xcd, 0x78, 0x79, 0x5a, 0x56, 0x43, 0xea, 0xeb, 0xa4, 0xe8, 0xa1, 0x5e, 0x4c, 0x92, 0x28,
-	0x4c, 0x31, 0x3f, 0x2d, 0x11, 0x0f, 0xaf, 0x22, 0xde, 0x33, 0x9c, 0xe7, 0x84, 0x19, 0x85, 0xfb,
-	0xe5, 0x39, 0xcb, 0xbb, 0x88, 0x0b, 0x2c, 0x8a, 0xf2, 0xc0, 0xdd, 0x04, 0x4b, 0xbb, 0x44, 0xb4,
-	0x09, 0x89, 0x02, 0xf2, 0xae, 0x20, 0x5c, 0xc0, 0xc7, 0x60, 0xd1, 0x58, 0x0c, 0x33, 0x9c, 0x92,
-	0x8a, 0x55, 0xb3, 0xd6, 0xe7, 0x83, 0x05, 0x93, 0x7c, 0x83, 0x53, 0xe2, 0xfe, 0xb4, 0x00, 0xdc,
-	0x2f, 0x04, 0x16, 0x44, 0x52, 0xb9, 0xe1, 0x3e, 0x02, 0x4e, 0xb7, 0xe0, 0x82, 0xa6, 0x84, 0x85,
-	0x71, 0x54, 0x32, 0x81, 0x49, 0xbd, 0x8a, 0xe0, 0x01, 0x00, 0x34, 0x27, 0x4c, 0xdf, 0xae, 0x62,
-	0xd7, 0x66, 0xd6, 0x9d, 0x26, 0xf2, 0x26, 0x35, 0xd3, 0x93, 0x45, 0x0e, 0x0c, 0x2f, 0x18, 0x91,
-	0x80, 0x6b, 0xe0, 0x6e, 0x8e, 0x99, 0x88, 0x71, 0x12, 0xf6, 0x70, 0x9c, 0x14, 0x8c, 0x54, 0x66,
-	0x6a, 0xd6, 0xfa, 0x9d, 0x60, 0xa9, 0x4c, 0xb7, 0x75, 0x56, 0x5e, 0x6b, 0x80, 0x93, 0x38, 0xc2,
-	0x82, 0x84, 0x34, 0x4b, 0xce, 0x2a, 0xb7, 0x15, 0x6c, 0xc1, 0x24, 0x0f, 0xb2, 0xe4, 0xcc, 0xfd,
-	0x67, 0x81, 0xc5, 0xb1, 0x5a, 0x70, 0x0b, 0x38, 0x45, 0xae, 0x48, 0xb2, 0xdb, 0x8a, 0xe4, 0x34,
-	0xab, 0xc6, 0xb1, 0x69, 0xb7, 0xd7, 0x96, 0x03, 0xd9, 0xc7, 0xfc, 0x34, 0x00, 0x1a, 0x2e, 0x63,
-	0xd8, 0x02, 0xb3, 0x5d, 0x46, 0xb0, 0xd0, 0x3d, 0x74, 0x9a, 0x6b, 0xd7, 0xde, 0x74, 0xf8, 0x53,
-	0xa8, 0xab, 0xee, 0xdd, 0x0a, 0x4a, 0xa2, 0x94, 0xd0, 0x82, 0x15, 0x7b, 0x6a, 0x09, 0x4d, 0x84,
-	0x15, 0x30, 0xcb, 0x48, 0x4a, 0x07, 0xba, 0x33, 0xf3, 0xf2, 0x44, 0x7f, 0xef, 0x38, 0x60, 0x7e,
-	0xd8, 0x4a, 0xf7, 0xab, 0x05, 0x56, 0xc6, 0x46, 0xca, 0x73, 0x9a, 0x71, 0x02, 0xdb, 0xe0, 0xde,
-	0x95, 0x0e, 0x87, 0x84, 0x31, 0xca, 0x94, 0x9a, 0xd3, 0x84, 0xc6, 0x10, 0xcb, 0xbb, 0xde, 0x91,
-	0xfa, 0xb5, 0x82, 0x95, 0xf1, 0xde, 0xbf, 0x94, 0x70, 0xf8, 0x1a, 0xcc, 0x31, 0xc2, 0x8b, 0x44,
-	0x98, 0xb9, 0x37, 0x27, 0xcf, 0xfd, 0xd2, 0x4f, 0xa0, 0xa8, 0x81, 0x91, 0x70, 0x5f, 0x80, 0xe5,
-	0xab, 0x87, 0x37, 0xfa, 0x73, 0x9b, 0xbf, 0x6c, 0xe0, 0x48, 0xce, 0x91, 0xae, 0x01, 0x3f, 0x59,
-	0x60, 0xae, 0xdc, 0x00, 0xf8, 0x6c, 0xb2, 0xa3, 0xf1, 0x65, 0xa9, 0xde, 0x74, 0x1c, 0x2e, 0xfa,
-	0xf0, 0xe3, 0xf7, 0x47, 0xfb, 0x09, 0x5c, 0x93, 0x4f, 0xc0, 0xf9, 0x98, 0xcd, 0x6d, 0xb3, 0x1f,
-	0x1c, 0xd5, 0xd5, 0x9b, 0xc0, 0x51, 0xfd, 0x02, 0x7e, 0xb3, 0x80, 0x33, 0x32, 0x0e, 0xf8, 0x7c,
-	0x9a, 0x6e, 0x99, 0x85, 0xac, 0x6e, 0x4e, 0xc9, 0xd2, 0x33, 0x77, 0x37, 0x95, 0x5b, 0xe4, 0xd6,
-	0xa5, 0xdb, 0x4b, 0x7b, 0xe7, 0x23, 0xcb, 0xbd, 0x5d, 0xbf, 0xd0, 0x66, 0xfd, 0x54, 0x09, 0xf8,
-	0x56, 0x7d, 0xe7, 0xaf, 0x05, 0x56, 0xbb, 0x34, 0x9d, 0x58, 0x73, 0x67, 0x79, 0x64, 0x02, 0x87,
-	0x72, 0x87, 0x0e, 0xad, 0xb7, 0x7b, 0x25, 0xab, 0x4f, 0x13, 0x9c, 0xf5, 0x3d, 0xca, 0xfa, 0xa8,
-	0x4f, 0x32, 0xb5, 0x61, 0xe6, 0x01, 0xcd, 0x63, 0x7e, 0xfd, 0x33, 0xbd, 0x65, 0x82, 0xcf, 0xf6,
-	0xcc, 0x6e, 0xab, 0xf5, 0xc5, 0xae, 0xed, 0x6a, 0xc1, 0x56, 0xc4, 0x3d, 0x1d, 0xca, 0xe8, 0xb8,
-	0xe1, 0x95, 0x85, 0xf9, 0x77, 0x03, 0xe9, 0xb4, 0x22, 0xde, 0x19, 0x42, 0x3a, 0xc7, 0x8d, 0x8e,
-	0x81, 0xfc, 0xb1, 0x57, 0x75, 0xde, 0xf7, 0x5b, 0x11, 0xf7, 0xfd, 0x21, 0xc8, 0xf7, 0x8f, 0x1b,
-	0xbe, 0x6f, 0x60, 0x27, 0xb3, 0xca, 0xe7, 0xc6, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x05,
-	0x04, 0x92, 0x4d, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/gender_view_service.pb.go b/googleapis/ads/googleads/v1/services/gender_view_service.pb.go
index a016402150..a4b7467f92 100644
--- a/googleapis/ads/googleads/v1/services/gender_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/gender_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/gender_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [GenderViewService.GetGenderView][google.ads.googleads.v1.services.GenderViewService.GetGenderView].
 type GetGenderViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetGenderViewRequest) Reset()         { *m = GetGenderViewRequest{} }
 func (m *GetGenderViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGenderViewRequest) ProtoMessage()    {}
 func (*GetGenderViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_gender_view_service_cdbdad6124719293, []int{0}
+	return fileDescriptor_30a3d0b836382d3b, []int{0}
 }
+
 func (m *GetGenderViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGenderViewRequest.Unmarshal(m, b)
 }
 func (m *GetGenderViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGenderViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGenderViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGenderViewRequest.Merge(dst, src)
+func (m *GetGenderViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGenderViewRequest.Merge(m, src)
 }
 func (m *GetGenderViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGenderViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetGenderViewRequest)(nil), "google.ads.googleads.v1.services.GetGenderViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/gender_view_service.proto", fileDescriptor_30a3d0b836382d3b)
+}
+
+var fileDescriptor_30a3d0b836382d3b = []byte{
+	// 361 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4a, 0xc3, 0x50,
+	0x14, 0x86, 0x49, 0x04, 0xc1, 0x60, 0x07, 0x83, 0x88, 0x14, 0x87, 0x52, 0x3b, 0x48, 0xa1, 0xf7,
+	0x12, 0x8b, 0x0e, 0xb7, 0x38, 0xa4, 0x4b, 0x9c, 0xa4, 0x54, 0xc8, 0x20, 0x81, 0x72, 0x6d, 0x0e,
+	0x21, 0xd0, 0xe4, 0xd6, 0x7b, 0xd2, 0x74, 0x10, 0x17, 0x5f, 0xc1, 0x37, 0x70, 0x14, 0x7c, 0x0a,
+	0x37, 0x57, 0x5f, 0xc1, 0xc9, 0x77, 0x10, 0x24, 0xbd, 0xb9, 0x29, 0x55, 0x4b, 0xb7, 0x9f, 0xd3,
+	0xff, 0xfb, 0xef, 0x7f, 0x4e, 0x63, 0xb1, 0x48, 0x88, 0x68, 0x02, 0x94, 0x87, 0x48, 0x95, 0x2c,
+	0x54, 0xee, 0x50, 0x04, 0x99, 0xc7, 0x63, 0x40, 0x1a, 0x41, 0x1a, 0x82, 0x1c, 0xe5, 0x31, 0xcc,
+	0x47, 0xe5, 0x90, 0x4c, 0xa5, 0xc8, 0x84, 0xdd, 0x50, 0x00, 0xe1, 0x21, 0x92, 0x8a, 0x25, 0xb9,
+	0x43, 0x34, 0x5b, 0xef, 0xae, 0x4b, 0x97, 0x80, 0x62, 0x26, 0x7f, 0xc5, 0xab, 0xd8, 0xfa, 0x91,
+	0x86, 0xa6, 0x31, 0xe5, 0x69, 0x2a, 0x32, 0x9e, 0xc5, 0x22, 0x45, 0xf5, 0x6b, 0xb3, 0x67, 0xed,
+	0x7b, 0x90, 0x79, 0x0b, 0xca, 0x8f, 0x61, 0x3e, 0x84, 0xbb, 0x19, 0x60, 0x66, 0x1f, 0x5b, 0x35,
+	0x1d, 0x3a, 0x4a, 0x79, 0x02, 0x87, 0x46, 0xc3, 0x38, 0xd9, 0x19, 0xee, 0xea, 0xe1, 0x15, 0x4f,
+	0xe0, 0xf4, 0xcd, 0xb0, 0xf6, 0x96, 0xe8, 0xb5, 0xaa, 0x69, 0xbf, 0x1a, 0x56, 0x6d, 0x25, 0xd3,
+	0x3e, 0x27, 0x9b, 0x56, 0x23, 0xff, 0x95, 0xa8, 0x77, 0xd6, 0x72, 0xd5, 0xc2, 0x64, 0x49, 0x35,
+	0xcf, 0x1e, 0x3f, 0x3e, 0x9f, 0x4c, 0x6a, 0x77, 0x8a, 0x93, 0xdc, 0xaf, 0xd4, 0xbf, 0x18, 0xcf,
+	0x30, 0x13, 0x09, 0x48, 0xa4, 0xed, 0xf2, 0x46, 0x05, 0x82, 0xb4, 0xfd, 0xd0, 0xff, 0x36, 0xac,
+	0xd6, 0x58, 0x24, 0x1b, 0x3b, 0xf6, 0x0f, 0xfe, 0xec, 0x3a, 0x28, 0x6e, 0x38, 0x30, 0x6e, 0x2e,
+	0x4b, 0x36, 0x12, 0x13, 0x9e, 0x46, 0x44, 0xc8, 0xa8, 0x78, 0x64, 0x71, 0x61, 0xfd, 0x47, 0x4d,
+	0x63, 0x5c, 0xff, 0x55, 0xf4, 0xb4, 0x78, 0x36, 0xb7, 0x3c, 0xd7, 0x7d, 0x31, 0x1b, 0x9e, 0x0a,
+	0x74, 0x43, 0x24, 0x4a, 0x16, 0xca, 0x77, 0x48, 0xf9, 0x30, 0xbe, 0x6b, 0x4b, 0xe0, 0x86, 0x18,
+	0x54, 0x96, 0xc0, 0x77, 0x02, 0x6d, 0xf9, 0x32, 0x5b, 0x6a, 0xce, 0x98, 0x1b, 0x22, 0x63, 0x95,
+	0x89, 0x31, 0xdf, 0x61, 0x4c, 0xdb, 0x6e, 0xb7, 0x17, 0x3d, 0xbb, 0x3f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x04, 0x5c, 0x26, 0x09, 0xbc, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _GenderViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/gender_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/gender_view_service.proto", fileDescriptor_gender_view_service_cdbdad6124719293)
-}
-
-var fileDescriptor_gender_view_service_cdbdad6124719293 = []byte{
-	// 361 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4a, 0xc3, 0x50,
-	0x14, 0x86, 0x49, 0x04, 0xc1, 0x60, 0x07, 0x83, 0x88, 0x14, 0x87, 0x52, 0x3b, 0x48, 0xa1, 0xf7,
-	0x12, 0x8b, 0x0e, 0xb7, 0x38, 0xa4, 0x4b, 0x9c, 0xa4, 0x54, 0xc8, 0x20, 0x81, 0x72, 0x6d, 0x0e,
-	0x21, 0xd0, 0xe4, 0xd6, 0x7b, 0xd2, 0x74, 0x10, 0x17, 0x5f, 0xc1, 0x37, 0x70, 0x14, 0x7c, 0x0a,
-	0x37, 0x57, 0x5f, 0xc1, 0xc9, 0x77, 0x10, 0x24, 0xbd, 0xb9, 0x29, 0x55, 0x4b, 0xb7, 0x9f, 0xd3,
-	0xff, 0xfb, 0xef, 0x7f, 0x4e, 0x63, 0xb1, 0x48, 0x88, 0x68, 0x02, 0x94, 0x87, 0x48, 0x95, 0x2c,
-	0x54, 0xee, 0x50, 0x04, 0x99, 0xc7, 0x63, 0x40, 0x1a, 0x41, 0x1a, 0x82, 0x1c, 0xe5, 0x31, 0xcc,
-	0x47, 0xe5, 0x90, 0x4c, 0xa5, 0xc8, 0x84, 0xdd, 0x50, 0x00, 0xe1, 0x21, 0x92, 0x8a, 0x25, 0xb9,
-	0x43, 0x34, 0x5b, 0xef, 0xae, 0x4b, 0x97, 0x80, 0x62, 0x26, 0x7f, 0xc5, 0xab, 0xd8, 0xfa, 0x91,
-	0x86, 0xa6, 0x31, 0xe5, 0x69, 0x2a, 0x32, 0x9e, 0xc5, 0x22, 0x45, 0xf5, 0x6b, 0xb3, 0x67, 0xed,
-	0x7b, 0x90, 0x79, 0x0b, 0xca, 0x8f, 0x61, 0x3e, 0x84, 0xbb, 0x19, 0x60, 0x66, 0x1f, 0x5b, 0x35,
-	0x1d, 0x3a, 0x4a, 0x79, 0x02, 0x87, 0x46, 0xc3, 0x38, 0xd9, 0x19, 0xee, 0xea, 0xe1, 0x15, 0x4f,
-	0xe0, 0xf4, 0xcd, 0xb0, 0xf6, 0x96, 0xe8, 0xb5, 0xaa, 0x69, 0xbf, 0x1a, 0x56, 0x6d, 0x25, 0xd3,
-	0x3e, 0x27, 0x9b, 0x56, 0x23, 0xff, 0x95, 0xa8, 0x77, 0xd6, 0x72, 0xd5, 0xc2, 0x64, 0x49, 0x35,
-	0xcf, 0x1e, 0x3f, 0x3e, 0x9f, 0x4c, 0x6a, 0x77, 0x8a, 0x93, 0xdc, 0xaf, 0xd4, 0xbf, 0x18, 0xcf,
-	0x30, 0x13, 0x09, 0x48, 0xa4, 0xed, 0xf2, 0x46, 0x05, 0x82, 0xb4, 0xfd, 0xd0, 0xff, 0x36, 0xac,
-	0xd6, 0x58, 0x24, 0x1b, 0x3b, 0xf6, 0x0f, 0xfe, 0xec, 0x3a, 0x28, 0x6e, 0x38, 0x30, 0x6e, 0x2e,
-	0x4b, 0x36, 0x12, 0x13, 0x9e, 0x46, 0x44, 0xc8, 0xa8, 0x78, 0x64, 0x71, 0x61, 0xfd, 0x47, 0x4d,
-	0x63, 0x5c, 0xff, 0x55, 0xf4, 0xb4, 0x78, 0x36, 0xb7, 0x3c, 0xd7, 0x7d, 0x31, 0x1b, 0x9e, 0x0a,
-	0x74, 0x43, 0x24, 0x4a, 0x16, 0xca, 0x77, 0x48, 0xf9, 0x30, 0xbe, 0x6b, 0x4b, 0xe0, 0x86, 0x18,
-	0x54, 0x96, 0xc0, 0x77, 0x02, 0x6d, 0xf9, 0x32, 0x5b, 0x6a, 0xce, 0x98, 0x1b, 0x22, 0x63, 0x95,
-	0x89, 0x31, 0xdf, 0x61, 0x4c, 0xdb, 0x6e, 0xb7, 0x17, 0x3d, 0xbb, 0x3f, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0x04, 0x5c, 0x26, 0x09, 0xbc, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/geo_target_constant_service.pb.go b/googleapis/ads/googleads/v1/services/geo_target_constant_service.pb.go
index 62b4075bde..0a4930d69b 100644
--- a/googleapis/ads/googleads/v1/services/geo_target_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/geo_target_constant_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/geo_target_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [GeoTargetConstantService.GetGeoTargetConstant][google.ads.googleads.v1.services.GeoTargetConstantService.GetGeoTargetConstant].
 type GetGeoTargetConstantRequest struct {
@@ -39,16 +39,17 @@ func (m *GetGeoTargetConstantRequest) Reset()         { *m = GetGeoTargetConstan
 func (m *GetGeoTargetConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGeoTargetConstantRequest) ProtoMessage()    {}
 func (*GetGeoTargetConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c, []int{0}
+	return fileDescriptor_e5cd5da9ab19edb3, []int{0}
 }
+
 func (m *GetGeoTargetConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGeoTargetConstantRequest.Unmarshal(m, b)
 }
 func (m *GetGeoTargetConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGeoTargetConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGeoTargetConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGeoTargetConstantRequest.Merge(dst, src)
+func (m *GetGeoTargetConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGeoTargetConstantRequest.Merge(m, src)
 }
 func (m *GetGeoTargetConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGeoTargetConstantRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *SuggestGeoTargetConstantsRequest) Reset()         { *m = SuggestGeoTarg
 func (m *SuggestGeoTargetConstantsRequest) String() string { return proto.CompactTextString(m) }
 func (*SuggestGeoTargetConstantsRequest) ProtoMessage()    {}
 func (*SuggestGeoTargetConstantsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c, []int{1}
+	return fileDescriptor_e5cd5da9ab19edb3, []int{1}
 }
+
 func (m *SuggestGeoTargetConstantsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest.Unmarshal(m, b)
 }
 func (m *SuggestGeoTargetConstantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SuggestGeoTargetConstantsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SuggestGeoTargetConstantsRequest.Merge(dst, src)
+func (m *SuggestGeoTargetConstantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SuggestGeoTargetConstantsRequest.Merge(m, src)
 }
 func (m *SuggestGeoTargetConstantsRequest) XXX_Size() int {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest.Size(m)
@@ -161,80 +163,14 @@ func (m *SuggestGeoTargetConstantsRequest) GetGeoTargets() *SuggestGeoTargetCons
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SuggestGeoTargetConstantsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SuggestGeoTargetConstantsRequest_OneofMarshaler, _SuggestGeoTargetConstantsRequest_OneofUnmarshaler, _SuggestGeoTargetConstantsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SuggestGeoTargetConstantsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SuggestGeoTargetConstantsRequest_LocationNames_)(nil),
 		(*SuggestGeoTargetConstantsRequest_GeoTargets_)(nil),
 	}
 }
 
-func _SuggestGeoTargetConstantsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SuggestGeoTargetConstantsRequest)
-	// query
-	switch x := m.Query.(type) {
-	case *SuggestGeoTargetConstantsRequest_LocationNames_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LocationNames); err != nil {
-			return err
-		}
-	case *SuggestGeoTargetConstantsRequest_GeoTargets_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GeoTargets); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SuggestGeoTargetConstantsRequest.Query has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SuggestGeoTargetConstantsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SuggestGeoTargetConstantsRequest)
-	switch tag {
-	case 1: // query.location_names
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SuggestGeoTargetConstantsRequest_LocationNames)
-		err := b.DecodeMessage(msg)
-		m.Query = &SuggestGeoTargetConstantsRequest_LocationNames_{msg}
-		return true, err
-	case 2: // query.geo_targets
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SuggestGeoTargetConstantsRequest_GeoTargets)
-		err := b.DecodeMessage(msg)
-		m.Query = &SuggestGeoTargetConstantsRequest_GeoTargets_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SuggestGeoTargetConstantsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SuggestGeoTargetConstantsRequest)
-	// query
-	switch x := m.Query.(type) {
-	case *SuggestGeoTargetConstantsRequest_LocationNames_:
-		s := proto.Size(x.LocationNames)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SuggestGeoTargetConstantsRequest_GeoTargets_:
-		s := proto.Size(x.GeoTargets)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A list of location names.
 type SuggestGeoTargetConstantsRequest_LocationNames struct {
 	// A list of location names.
@@ -252,16 +188,17 @@ func (m *SuggestGeoTargetConstantsRequest_LocationNames) String() string {
 }
 func (*SuggestGeoTargetConstantsRequest_LocationNames) ProtoMessage() {}
 func (*SuggestGeoTargetConstantsRequest_LocationNames) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c, []int{1, 0}
+	return fileDescriptor_e5cd5da9ab19edb3, []int{1, 0}
 }
+
 func (m *SuggestGeoTargetConstantsRequest_LocationNames) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest_LocationNames.Unmarshal(m, b)
 }
 func (m *SuggestGeoTargetConstantsRequest_LocationNames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest_LocationNames.Marshal(b, m, deterministic)
 }
-func (dst *SuggestGeoTargetConstantsRequest_LocationNames) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SuggestGeoTargetConstantsRequest_LocationNames.Merge(dst, src)
+func (m *SuggestGeoTargetConstantsRequest_LocationNames) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SuggestGeoTargetConstantsRequest_LocationNames.Merge(m, src)
 }
 func (m *SuggestGeoTargetConstantsRequest_LocationNames) XXX_Size() int {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest_LocationNames.Size(m)
@@ -296,16 +233,17 @@ func (m *SuggestGeoTargetConstantsRequest_GeoTargets) String() string {
 }
 func (*SuggestGeoTargetConstantsRequest_GeoTargets) ProtoMessage() {}
 func (*SuggestGeoTargetConstantsRequest_GeoTargets) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c, []int{1, 1}
+	return fileDescriptor_e5cd5da9ab19edb3, []int{1, 1}
 }
+
 func (m *SuggestGeoTargetConstantsRequest_GeoTargets) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest_GeoTargets.Unmarshal(m, b)
 }
 func (m *SuggestGeoTargetConstantsRequest_GeoTargets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest_GeoTargets.Marshal(b, m, deterministic)
 }
-func (dst *SuggestGeoTargetConstantsRequest_GeoTargets) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SuggestGeoTargetConstantsRequest_GeoTargets.Merge(dst, src)
+func (m *SuggestGeoTargetConstantsRequest_GeoTargets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SuggestGeoTargetConstantsRequest_GeoTargets.Merge(m, src)
 }
 func (m *SuggestGeoTargetConstantsRequest_GeoTargets) XXX_Size() int {
 	return xxx_messageInfo_SuggestGeoTargetConstantsRequest_GeoTargets.Size(m)
@@ -336,16 +274,17 @@ func (m *SuggestGeoTargetConstantsResponse) Reset()         { *m = SuggestGeoTar
 func (m *SuggestGeoTargetConstantsResponse) String() string { return proto.CompactTextString(m) }
 func (*SuggestGeoTargetConstantsResponse) ProtoMessage()    {}
 func (*SuggestGeoTargetConstantsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c, []int{2}
+	return fileDescriptor_e5cd5da9ab19edb3, []int{2}
 }
+
 func (m *SuggestGeoTargetConstantsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SuggestGeoTargetConstantsResponse.Unmarshal(m, b)
 }
 func (m *SuggestGeoTargetConstantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SuggestGeoTargetConstantsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SuggestGeoTargetConstantsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SuggestGeoTargetConstantsResponse.Merge(dst, src)
+func (m *SuggestGeoTargetConstantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SuggestGeoTargetConstantsResponse.Merge(m, src)
 }
 func (m *SuggestGeoTargetConstantsResponse) XXX_Size() int {
 	return xxx_messageInfo_SuggestGeoTargetConstantsResponse.Size(m)
@@ -389,16 +328,17 @@ func (m *GeoTargetConstantSuggestion) Reset()         { *m = GeoTargetConstantSu
 func (m *GeoTargetConstantSuggestion) String() string { return proto.CompactTextString(m) }
 func (*GeoTargetConstantSuggestion) ProtoMessage()    {}
 func (*GeoTargetConstantSuggestion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c, []int{3}
+	return fileDescriptor_e5cd5da9ab19edb3, []int{3}
 }
+
 func (m *GeoTargetConstantSuggestion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GeoTargetConstantSuggestion.Unmarshal(m, b)
 }
 func (m *GeoTargetConstantSuggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GeoTargetConstantSuggestion.Marshal(b, m, deterministic)
 }
-func (dst *GeoTargetConstantSuggestion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GeoTargetConstantSuggestion.Merge(dst, src)
+func (m *GeoTargetConstantSuggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeoTargetConstantSuggestion.Merge(m, src)
 }
 func (m *GeoTargetConstantSuggestion) XXX_Size() int {
 	return xxx_messageInfo_GeoTargetConstantSuggestion.Size(m)
@@ -453,6 +393,59 @@ func init() {
 	proto.RegisterType((*GeoTargetConstantSuggestion)(nil), "google.ads.googleads.v1.services.GeoTargetConstantSuggestion")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/geo_target_constant_service.proto", fileDescriptor_e5cd5da9ab19edb3)
+}
+
+var fileDescriptor_e5cd5da9ab19edb3 = []byte{
+	// 714 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xfd, 0x9c, 0x34, 0xfd, 0xc4, 0xa4, 0x45, 0x62, 0xe8, 0xc2, 0xa4, 0xa5, 0x04, 0xb7, 0x8b,
+	0xd2, 0x85, 0x4d, 0x42, 0xc5, 0xc2, 0x55, 0x85, 0x92, 0x2c, 0x52, 0x24, 0xa8, 0xa2, 0xb4, 0xca,
+	0x02, 0x45, 0x8a, 0xa6, 0xf6, 0x65, 0x1a, 0x29, 0xf1, 0xb8, 0x33, 0xe3, 0xa2, 0x0a, 0xb1, 0x41,
+	0x7d, 0x03, 0x5e, 0x00, 0xb1, 0xac, 0x58, 0xb1, 0xe7, 0x05, 0xd8, 0xb0, 0xe0, 0x15, 0x58, 0xf1,
+	0x14, 0xc8, 0xf6, 0xd8, 0x6d, 0xe5, 0x98, 0x84, 0x96, 0xdd, 0x78, 0xee, 0xbd, 0xe7, 0xcc, 0xb9,
+	0x7f, 0x46, 0x4d, 0xca, 0x18, 0x1d, 0x81, 0x45, 0x5c, 0x61, 0xc5, 0xc7, 0xf0, 0x74, 0x52, 0xb3,
+	0x04, 0xf0, 0x93, 0xa1, 0x03, 0xc2, 0xa2, 0xc0, 0x06, 0x92, 0x70, 0x0a, 0x72, 0xe0, 0x30, 0x4f,
+	0x48, 0xe2, 0xc9, 0x81, 0x32, 0x9a, 0x3e, 0x67, 0x92, 0xe1, 0x6a, 0x1c, 0x68, 0x12, 0x57, 0x98,
+	0x29, 0x86, 0x79, 0x52, 0x33, 0x13, 0x8c, 0xca, 0x76, 0x1e, 0x0b, 0x07, 0xc1, 0x02, 0x9e, 0x43,
+	0x13, 0xc3, 0x57, 0x56, 0x92, 0x60, 0x7f, 0x68, 0x11, 0xcf, 0x63, 0x92, 0xc8, 0x21, 0xf3, 0x84,
+	0xb2, 0xae, 0x2a, 0x6b, 0xf4, 0x75, 0x18, 0xbc, 0xb6, 0xde, 0x70, 0xe2, 0xfb, 0xc0, 0x95, 0xdd,
+	0x68, 0xa2, 0xe5, 0x36, 0xc8, 0x36, 0xb0, 0x83, 0x08, 0xbc, 0xa5, 0xb0, 0xbb, 0x70, 0x1c, 0x80,
+	0x90, 0x78, 0x0d, 0x2d, 0x26, 0x6f, 0x18, 0x78, 0x64, 0x0c, 0xba, 0x56, 0xd5, 0x36, 0x6e, 0x75,
+	0x17, 0x92, 0xcb, 0x3d, 0x32, 0x06, 0xe3, 0xcb, 0x1c, 0xaa, 0xee, 0x07, 0x94, 0x82, 0xc8, 0x02,
+	0x89, 0x04, 0x69, 0x0b, 0xcd, 0x8f, 0x98, 0x43, 0x46, 0xa0, 0x17, 0xab, 0xda, 0x46, 0xb9, 0xbe,
+	0xa2, 0x72, 0x61, 0x26, 0x2f, 0x33, 0xf7, 0x25, 0x1f, 0x7a, 0xb4, 0x47, 0x46, 0x01, 0x74, 0x95,
+	0x2f, 0x7e, 0x86, 0x16, 0x1c, 0x16, 0x78, 0x92, 0x9f, 0x0e, 0x1c, 0xe6, 0x82, 0x5e, 0x9a, 0x21,
+	0xb6, 0xac, 0x22, 0x5a, 0xcc, 0x05, 0x7c, 0x8a, 0x6e, 0x87, 0x50, 0x61, 0x4a, 0x22, 0x01, 0x22,
+	0x52, 0x50, 0xae, 0x77, 0xcc, 0x69, 0x55, 0x31, 0xa7, 0x49, 0x32, 0x5f, 0x28, 0xe0, 0x30, 0x09,
+	0x62, 0xf7, 0xbf, 0xee, 0xe2, 0xe8, 0xf2, 0x05, 0xf6, 0x51, 0xf9, 0xa2, 0x6a, 0x42, 0x2f, 0x44,
+	0xbc, 0x2f, 0xff, 0x01, 0x6f, 0x6a, 0x09, 0x49, 0x11, 0x4d, 0xbf, 0x2a, 0x2d, 0xb4, 0x78, 0xe5,
+	0x4d, 0xb8, 0x8e, 0x4a, 0x89, 0xe8, 0xe2, 0xd4, 0xbc, 0xc5, 0xae, 0x95, 0x3e, 0x42, 0x17, 0x04,
+	0x78, 0x0f, 0x2d, 0x4d, 0x68, 0xbd, 0xd9, 0x00, 0x31, 0xcd, 0x48, 0x68, 0xfe, 0x8f, 0x4a, 0xc7,
+	0x01, 0xf0, 0x53, 0xe3, 0x5c, 0x43, 0x0f, 0xff, 0xa0, 0x54, 0xf8, 0xcc, 0x13, 0x80, 0xcf, 0x34,
+	0xf4, 0x60, 0xe2, 0x84, 0xc5, 0x91, 0x61, 0xa3, 0xab, 0xa7, 0xec, 0x4c, 0x4f, 0x6c, 0x86, 0x67,
+	0x3f, 0x45, 0xe9, 0xae, 0xd0, 0x7c, 0xa3, 0x30, 0x3e, 0x16, 0xc3, 0x31, 0xc9, 0x75, 0xb8, 0xd4,
+	0xdc, 0xda, 0x5f, 0x34, 0x77, 0x0d, 0x95, 0x38, 0x10, 0xe7, 0x48, 0xb5, 0xc6, 0x72, 0x26, 0xe8,
+	0xb9, 0x27, 0x9f, 0x6e, 0xa9, 0xe2, 0x44, 0x9e, 0x78, 0x07, 0x95, 0x05, 0x10, 0xee, 0x1c, 0x0d,
+	0x24, 0xf0, 0xf1, 0x4c, 0xa3, 0x84, 0xe2, 0x80, 0x03, 0xe0, 0x63, 0xec, 0xa2, 0xbb, 0x13, 0xb2,
+	0xa9, 0xcf, 0x45, 0x30, 0x5b, 0xb9, 0x19, 0x4c, 0xd7, 0x50, 0x36, 0x85, 0xdd, 0x3b, 0x99, 0xc4,
+	0x61, 0x81, 0x96, 0x27, 0xd5, 0xcc, 0x27, 0x1c, 0xc2, 0xd6, 0x29, 0x45, 0xf5, 0xba, 0x1e, 0x9b,
+	0x9e, 0x61, 0xeb, 0xc4, 0xa8, 0xf5, 0xcf, 0x45, 0xa4, 0x67, 0x4b, 0x14, 0x97, 0x1e, 0x7f, 0xd5,
+	0xd0, 0xd2, 0xa4, 0x35, 0x87, 0x67, 0xea, 0x9a, 0xdc, 0xf5, 0x58, 0xb9, 0x96, 0x08, 0xe3, 0xf1,
+	0xfb, 0x1f, 0x3f, 0x3f, 0x14, 0x36, 0xf1, 0x46, 0xb8, 0xe2, 0xdf, 0x5e, 0xd9, 0xaf, 0x3b, 0xd9,
+	0x91, 0xb1, 0x36, 0xdf, 0xe1, 0xef, 0x1a, 0xba, 0x97, 0x3b, 0x2c, 0xb8, 0x79, 0xf3, 0x9d, 0x52,
+	0x69, 0xdd, 0x08, 0x23, 0x9e, 0x56, 0xe3, 0x51, 0x24, 0x6c, 0xcd, 0x58, 0x0d, 0x85, 0x65, 0x95,
+	0xd8, 0x6a, 0x6a, 0x6d, 0x6d, 0xb3, 0x79, 0x56, 0x40, 0xeb, 0x0e, 0x1b, 0x4f, 0x65, 0x6d, 0xde,
+	0xcf, 0x2b, 0x6a, 0x27, 0x6c, 0xf6, 0x8e, 0xf6, 0x6a, 0x57, 0x41, 0x50, 0x36, 0x22, 0x1e, 0x35,
+	0x19, 0xa7, 0x16, 0x05, 0x2f, 0x1a, 0x85, 0xe4, 0x67, 0xea, 0x0f, 0x45, 0xfe, 0x1f, 0x7c, 0x3b,
+	0x39, 0x7c, 0x2a, 0x14, 0xdb, 0x8d, 0xc6, 0x79, 0xa1, 0xda, 0x8e, 0x01, 0x1b, 0xae, 0x30, 0xe3,
+	0x63, 0x78, 0xea, 0xd5, 0x4c, 0x45, 0x2c, 0xbe, 0x25, 0x2e, 0xfd, 0x86, 0x2b, 0xfa, 0xa9, 0x4b,
+	0xbf, 0x57, 0xeb, 0x27, 0x2e, 0xbf, 0x0a, 0xeb, 0xf1, 0xbd, 0x6d, 0x37, 0x5c, 0x61, 0xdb, 0xa9,
+	0x93, 0x6d, 0xf7, 0x6a, 0xb6, 0x9d, 0xb8, 0x1d, 0xce, 0x47, 0xef, 0x7c, 0xf2, 0x3b, 0x00, 0x00,
+	0xff, 0xff, 0x1e, 0xee, 0xdc, 0x5b, 0x68, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -561,56 +554,3 @@ var _GeoTargetConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/geo_target_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/geo_target_constant_service.proto", fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c)
-}
-
-var fileDescriptor_geo_target_constant_service_194f6c4b7231ee1c = []byte{
-	// 714 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0xfd, 0x9c, 0x34, 0xfd, 0xc4, 0xa4, 0x45, 0x62, 0xe8, 0xc2, 0xa4, 0xa5, 0x04, 0xb7, 0x8b,
-	0xd2, 0x85, 0x4d, 0x42, 0xc5, 0xc2, 0x55, 0x85, 0x92, 0x2c, 0x52, 0x24, 0xa8, 0xa2, 0xb4, 0xca,
-	0x02, 0x45, 0x8a, 0xa6, 0xf6, 0x65, 0x1a, 0x29, 0xf1, 0xb8, 0x33, 0xe3, 0xa2, 0x0a, 0xb1, 0x41,
-	0x7d, 0x03, 0x5e, 0x00, 0xb1, 0xac, 0x58, 0xb1, 0xe7, 0x05, 0xd8, 0xb0, 0xe0, 0x15, 0x58, 0xf1,
-	0x14, 0xc8, 0xf6, 0xd8, 0x6d, 0xe5, 0x98, 0x84, 0x96, 0xdd, 0x78, 0xee, 0xbd, 0xe7, 0xcc, 0xb9,
-	0x7f, 0x46, 0x4d, 0xca, 0x18, 0x1d, 0x81, 0x45, 0x5c, 0x61, 0xc5, 0xc7, 0xf0, 0x74, 0x52, 0xb3,
-	0x04, 0xf0, 0x93, 0xa1, 0x03, 0xc2, 0xa2, 0xc0, 0x06, 0x92, 0x70, 0x0a, 0x72, 0xe0, 0x30, 0x4f,
-	0x48, 0xe2, 0xc9, 0x81, 0x32, 0x9a, 0x3e, 0x67, 0x92, 0xe1, 0x6a, 0x1c, 0x68, 0x12, 0x57, 0x98,
-	0x29, 0x86, 0x79, 0x52, 0x33, 0x13, 0x8c, 0xca, 0x76, 0x1e, 0x0b, 0x07, 0xc1, 0x02, 0x9e, 0x43,
-	0x13, 0xc3, 0x57, 0x56, 0x92, 0x60, 0x7f, 0x68, 0x11, 0xcf, 0x63, 0x92, 0xc8, 0x21, 0xf3, 0x84,
-	0xb2, 0xae, 0x2a, 0x6b, 0xf4, 0x75, 0x18, 0xbc, 0xb6, 0xde, 0x70, 0xe2, 0xfb, 0xc0, 0x95, 0xdd,
-	0x68, 0xa2, 0xe5, 0x36, 0xc8, 0x36, 0xb0, 0x83, 0x08, 0xbc, 0xa5, 0xb0, 0xbb, 0x70, 0x1c, 0x80,
-	0x90, 0x78, 0x0d, 0x2d, 0x26, 0x6f, 0x18, 0x78, 0x64, 0x0c, 0xba, 0x56, 0xd5, 0x36, 0x6e, 0x75,
-	0x17, 0x92, 0xcb, 0x3d, 0x32, 0x06, 0xe3, 0xcb, 0x1c, 0xaa, 0xee, 0x07, 0x94, 0x82, 0xc8, 0x02,
-	0x89, 0x04, 0x69, 0x0b, 0xcd, 0x8f, 0x98, 0x43, 0x46, 0xa0, 0x17, 0xab, 0xda, 0x46, 0xb9, 0xbe,
-	0xa2, 0x72, 0x61, 0x26, 0x2f, 0x33, 0xf7, 0x25, 0x1f, 0x7a, 0xb4, 0x47, 0x46, 0x01, 0x74, 0x95,
-	0x2f, 0x7e, 0x86, 0x16, 0x1c, 0x16, 0x78, 0x92, 0x9f, 0x0e, 0x1c, 0xe6, 0x82, 0x5e, 0x9a, 0x21,
-	0xb6, 0xac, 0x22, 0x5a, 0xcc, 0x05, 0x7c, 0x8a, 0x6e, 0x87, 0x50, 0x61, 0x4a, 0x22, 0x01, 0x22,
-	0x52, 0x50, 0xae, 0x77, 0xcc, 0x69, 0x55, 0x31, 0xa7, 0x49, 0x32, 0x5f, 0x28, 0xe0, 0x30, 0x09,
-	0x62, 0xf7, 0xbf, 0xee, 0xe2, 0xe8, 0xf2, 0x05, 0xf6, 0x51, 0xf9, 0xa2, 0x6a, 0x42, 0x2f, 0x44,
-	0xbc, 0x2f, 0xff, 0x01, 0x6f, 0x6a, 0x09, 0x49, 0x11, 0x4d, 0xbf, 0x2a, 0x2d, 0xb4, 0x78, 0xe5,
-	0x4d, 0xb8, 0x8e, 0x4a, 0x89, 0xe8, 0xe2, 0xd4, 0xbc, 0xc5, 0xae, 0x95, 0x3e, 0x42, 0x17, 0x04,
-	0x78, 0x0f, 0x2d, 0x4d, 0x68, 0xbd, 0xd9, 0x00, 0x31, 0xcd, 0x48, 0x68, 0xfe, 0x8f, 0x4a, 0xc7,
-	0x01, 0xf0, 0x53, 0xe3, 0x5c, 0x43, 0x0f, 0xff, 0xa0, 0x54, 0xf8, 0xcc, 0x13, 0x80, 0xcf, 0x34,
-	0xf4, 0x60, 0xe2, 0x84, 0xc5, 0x91, 0x61, 0xa3, 0xab, 0xa7, 0xec, 0x4c, 0x4f, 0x6c, 0x86, 0x67,
-	0x3f, 0x45, 0xe9, 0xae, 0xd0, 0x7c, 0xa3, 0x30, 0x3e, 0x16, 0xc3, 0x31, 0xc9, 0x75, 0xb8, 0xd4,
-	0xdc, 0xda, 0x5f, 0x34, 0x77, 0x0d, 0x95, 0x38, 0x10, 0xe7, 0x48, 0xb5, 0xc6, 0x72, 0x26, 0xe8,
-	0xb9, 0x27, 0x9f, 0x6e, 0xa9, 0xe2, 0x44, 0x9e, 0x78, 0x07, 0x95, 0x05, 0x10, 0xee, 0x1c, 0x0d,
-	0x24, 0xf0, 0xf1, 0x4c, 0xa3, 0x84, 0xe2, 0x80, 0x03, 0xe0, 0x63, 0xec, 0xa2, 0xbb, 0x13, 0xb2,
-	0xa9, 0xcf, 0x45, 0x30, 0x5b, 0xb9, 0x19, 0x4c, 0xd7, 0x50, 0x36, 0x85, 0xdd, 0x3b, 0x99, 0xc4,
-	0x61, 0x81, 0x96, 0x27, 0xd5, 0xcc, 0x27, 0x1c, 0xc2, 0xd6, 0x29, 0x45, 0xf5, 0xba, 0x1e, 0x9b,
-	0x9e, 0x61, 0xeb, 0xc4, 0xa8, 0xf5, 0xcf, 0x45, 0xa4, 0x67, 0x4b, 0x14, 0x97, 0x1e, 0x7f, 0xd5,
-	0xd0, 0xd2, 0xa4, 0x35, 0x87, 0x67, 0xea, 0x9a, 0xdc, 0xf5, 0x58, 0xb9, 0x96, 0x08, 0xe3, 0xf1,
-	0xfb, 0x1f, 0x3f, 0x3f, 0x14, 0x36, 0xf1, 0x46, 0xb8, 0xe2, 0xdf, 0x5e, 0xd9, 0xaf, 0x3b, 0xd9,
-	0x91, 0xb1, 0x36, 0xdf, 0xe1, 0xef, 0x1a, 0xba, 0x97, 0x3b, 0x2c, 0xb8, 0x79, 0xf3, 0x9d, 0x52,
-	0x69, 0xdd, 0x08, 0x23, 0x9e, 0x56, 0xe3, 0x51, 0x24, 0x6c, 0xcd, 0x58, 0x0d, 0x85, 0x65, 0x95,
-	0xd8, 0x6a, 0x6a, 0x6d, 0x6d, 0xb3, 0x79, 0x56, 0x40, 0xeb, 0x0e, 0x1b, 0x4f, 0x65, 0x6d, 0xde,
-	0xcf, 0x2b, 0x6a, 0x27, 0x6c, 0xf6, 0x8e, 0xf6, 0x6a, 0x57, 0x41, 0x50, 0x36, 0x22, 0x1e, 0x35,
-	0x19, 0xa7, 0x16, 0x05, 0x2f, 0x1a, 0x85, 0xe4, 0x67, 0xea, 0x0f, 0x45, 0xfe, 0x1f, 0x7c, 0x3b,
-	0x39, 0x7c, 0x2a, 0x14, 0xdb, 0x8d, 0xc6, 0x79, 0xa1, 0xda, 0x8e, 0x01, 0x1b, 0xae, 0x30, 0xe3,
-	0x63, 0x78, 0xea, 0xd5, 0x4c, 0x45, 0x2c, 0xbe, 0x25, 0x2e, 0xfd, 0x86, 0x2b, 0xfa, 0xa9, 0x4b,
-	0xbf, 0x57, 0xeb, 0x27, 0x2e, 0xbf, 0x0a, 0xeb, 0xf1, 0xbd, 0x6d, 0x37, 0x5c, 0x61, 0xdb, 0xa9,
-	0x93, 0x6d, 0xf7, 0x6a, 0xb6, 0x9d, 0xb8, 0x1d, 0xce, 0x47, 0xef, 0x7c, 0xf2, 0x3b, 0x00, 0x00,
-	0xff, 0xff, 0x1e, 0xee, 0xdc, 0x5b, 0x68, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/geographic_view_service.pb.go b/googleapis/ads/googleads/v1/services/geographic_view_service.pb.go
index eccf4a986e..65f6054362 100644
--- a/googleapis/ads/googleads/v1/services/geographic_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/geographic_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/geographic_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [GeographicViewService.GetGeographicView][google.ads.googleads.v1.services.GeographicViewService.GetGeographicView].
 type GetGeographicViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetGeographicViewRequest) Reset()         { *m = GetGeographicViewReque
 func (m *GetGeographicViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGeographicViewRequest) ProtoMessage()    {}
 func (*GetGeographicViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geographic_view_service_33f5abb48adfe50d, []int{0}
+	return fileDescriptor_335a6346a1c9a2b7, []int{0}
 }
+
 func (m *GetGeographicViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGeographicViewRequest.Unmarshal(m, b)
 }
 func (m *GetGeographicViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGeographicViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGeographicViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGeographicViewRequest.Merge(dst, src)
+func (m *GetGeographicViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGeographicViewRequest.Merge(m, src)
 }
 func (m *GetGeographicViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGeographicViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetGeographicViewRequest)(nil), "google.ads.googleads.v1.services.GetGeographicViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/geographic_view_service.proto", fileDescriptor_335a6346a1c9a2b7)
+}
+
+var fileDescriptor_335a6346a1c9a2b7 = []byte{
+	// 365 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4a, 0xc3, 0x40,
+	0x1c, 0xc7, 0x49, 0x04, 0xc1, 0xa0, 0x83, 0x01, 0xa1, 0x04, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
+	0x62, 0x07, 0xf1, 0x44, 0x25, 0x5d, 0xe2, 0x24, 0xa5, 0x42, 0x06, 0x09, 0x94, 0x33, 0x39, 0xce,
+	0x40, 0x93, 0x8b, 0xf7, 0x4b, 0xd3, 0x41, 0x1c, 0xf4, 0x15, 0x7c, 0x03, 0x47, 0xdf, 0xc1, 0x17,
+	0x70, 0x75, 0xf0, 0x05, 0x9c, 0x7c, 0x0a, 0x49, 0xaf, 0x17, 0x2c, 0x36, 0x74, 0xfb, 0x72, 0xbf,
+	0xef, 0xe7, 0xf7, 0xe7, 0x9b, 0x58, 0xe7, 0x5c, 0x08, 0x3e, 0x61, 0x98, 0xc6, 0x80, 0x95, 0xac,
+	0x54, 0xe9, 0x62, 0x60, 0xb2, 0x4c, 0x22, 0x06, 0x98, 0x33, 0xc1, 0x25, 0xcd, 0xef, 0x92, 0x68,
+	0x5c, 0x26, 0x6c, 0x36, 0x5e, 0x14, 0x50, 0x2e, 0x45, 0x21, 0xec, 0xb6, 0x82, 0x10, 0x8d, 0x01,
+	0xd5, 0x3c, 0x2a, 0x5d, 0xa4, 0x79, 0xe7, 0xb8, 0x69, 0x82, 0x64, 0x20, 0xa6, 0x72, 0xc5, 0x08,
+	0xd5, 0xda, 0xd9, 0xd7, 0x60, 0x9e, 0x60, 0x9a, 0x65, 0xa2, 0xa0, 0x45, 0x22, 0x32, 0x50, 0xd5,
+	0xce, 0x85, 0xd5, 0xf2, 0x59, 0xe1, 0xd7, 0x64, 0x90, 0xb0, 0xd9, 0x88, 0xdd, 0x4f, 0x19, 0x14,
+	0xf6, 0x81, 0xb5, 0xa3, 0x9b, 0x8f, 0x33, 0x9a, 0xb2, 0x96, 0xd1, 0x36, 0x0e, 0xb7, 0x46, 0xdb,
+	0xfa, 0xf1, 0x8a, 0xa6, 0xec, 0xe8, 0xcb, 0xb0, 0xf6, 0x96, 0xf1, 0x6b, 0xb5, 0xb2, 0xfd, 0x6e,
+	0x58, 0xbb, 0xff, 0x7a, 0xdb, 0x04, 0xad, 0x3b, 0x15, 0x35, 0x2d, 0xe4, 0xb8, 0x8d, 0x6c, 0x1d,
+	0x02, 0x5a, 0x26, 0x3b, 0x27, 0xcf, 0x9f, 0xdf, 0x2f, 0x66, 0xdf, 0x76, 0xab, 0xa8, 0x1e, 0x96,
+	0xce, 0x39, 0x8b, 0xa6, 0x50, 0x88, 0x94, 0x49, 0xc0, 0xbd, 0x3f, 0xd9, 0x55, 0x18, 0xe0, 0xde,
+	0xe3, 0xe0, 0xc9, 0xb4, 0xba, 0x91, 0x48, 0xd7, 0xee, 0x3b, 0x70, 0x56, 0xde, 0x3f, 0xac, 0xf2,
+	0x1d, 0x1a, 0x37, 0x97, 0x0b, 0x9e, 0x8b, 0x09, 0xcd, 0x38, 0x12, 0x92, 0x63, 0xce, 0xb2, 0x79,
+	0xfa, 0xfa, 0x43, 0xe6, 0x09, 0x34, 0xff, 0x39, 0xa7, 0x5a, 0xbc, 0x9a, 0x1b, 0xbe, 0xe7, 0xbd,
+	0x99, 0x6d, 0x5f, 0x35, 0xf4, 0x62, 0x40, 0x4a, 0x56, 0x2a, 0x70, 0xd1, 0x62, 0x30, 0x7c, 0x68,
+	0x4b, 0xe8, 0xc5, 0x10, 0xd6, 0x96, 0x30, 0x70, 0x43, 0x6d, 0xf9, 0x31, 0xbb, 0xea, 0x9d, 0x10,
+	0x2f, 0x06, 0x42, 0x6a, 0x13, 0x21, 0x81, 0x4b, 0x88, 0xb6, 0xdd, 0x6e, 0xce, 0xf7, 0xec, 0xff,
+	0x06, 0x00, 0x00, 0xff, 0xff, 0x20, 0xad, 0x3a, 0xfd, 0xe0, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _GeographicViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/geographic_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/geographic_view_service.proto", fileDescriptor_geographic_view_service_33f5abb48adfe50d)
-}
-
-var fileDescriptor_geographic_view_service_33f5abb48adfe50d = []byte{
-	// 365 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4a, 0xc3, 0x40,
-	0x1c, 0xc7, 0x49, 0x04, 0xc1, 0xa0, 0x83, 0x01, 0xa1, 0x04, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
-	0x62, 0x07, 0xf1, 0x44, 0x25, 0x5d, 0xe2, 0x24, 0xa5, 0x42, 0x06, 0x09, 0x94, 0x33, 0x39, 0xce,
-	0x40, 0x93, 0x8b, 0xf7, 0x4b, 0xd3, 0x41, 0x1c, 0xf4, 0x15, 0x7c, 0x03, 0x47, 0xdf, 0xc1, 0x17,
-	0x70, 0x75, 0xf0, 0x05, 0x9c, 0x7c, 0x0a, 0x49, 0xaf, 0x17, 0x2c, 0x36, 0x74, 0xfb, 0x72, 0xbf,
-	0xef, 0xe7, 0xf7, 0xe7, 0x9b, 0x58, 0xe7, 0x5c, 0x08, 0x3e, 0x61, 0x98, 0xc6, 0x80, 0x95, 0xac,
-	0x54, 0xe9, 0x62, 0x60, 0xb2, 0x4c, 0x22, 0x06, 0x98, 0x33, 0xc1, 0x25, 0xcd, 0xef, 0x92, 0x68,
-	0x5c, 0x26, 0x6c, 0x36, 0x5e, 0x14, 0x50, 0x2e, 0x45, 0x21, 0xec, 0xb6, 0x82, 0x10, 0x8d, 0x01,
-	0xd5, 0x3c, 0x2a, 0x5d, 0xa4, 0x79, 0xe7, 0xb8, 0x69, 0x82, 0x64, 0x20, 0xa6, 0x72, 0xc5, 0x08,
-	0xd5, 0xda, 0xd9, 0xd7, 0x60, 0x9e, 0x60, 0x9a, 0x65, 0xa2, 0xa0, 0x45, 0x22, 0x32, 0x50, 0xd5,
-	0xce, 0x85, 0xd5, 0xf2, 0x59, 0xe1, 0xd7, 0x64, 0x90, 0xb0, 0xd9, 0x88, 0xdd, 0x4f, 0x19, 0x14,
-	0xf6, 0x81, 0xb5, 0xa3, 0x9b, 0x8f, 0x33, 0x9a, 0xb2, 0x96, 0xd1, 0x36, 0x0e, 0xb7, 0x46, 0xdb,
-	0xfa, 0xf1, 0x8a, 0xa6, 0xec, 0xe8, 0xcb, 0xb0, 0xf6, 0x96, 0xf1, 0x6b, 0xb5, 0xb2, 0xfd, 0x6e,
-	0x58, 0xbb, 0xff, 0x7a, 0xdb, 0x04, 0xad, 0x3b, 0x15, 0x35, 0x2d, 0xe4, 0xb8, 0x8d, 0x6c, 0x1d,
-	0x02, 0x5a, 0x26, 0x3b, 0x27, 0xcf, 0x9f, 0xdf, 0x2f, 0x66, 0xdf, 0x76, 0xab, 0xa8, 0x1e, 0x96,
-	0xce, 0x39, 0x8b, 0xa6, 0x50, 0x88, 0x94, 0x49, 0xc0, 0xbd, 0x3f, 0xd9, 0x55, 0x18, 0xe0, 0xde,
-	0xe3, 0xe0, 0xc9, 0xb4, 0xba, 0x91, 0x48, 0xd7, 0xee, 0x3b, 0x70, 0x56, 0xde, 0x3f, 0xac, 0xf2,
-	0x1d, 0x1a, 0x37, 0x97, 0x0b, 0x9e, 0x8b, 0x09, 0xcd, 0x38, 0x12, 0x92, 0x63, 0xce, 0xb2, 0x79,
-	0xfa, 0xfa, 0x43, 0xe6, 0x09, 0x34, 0xff, 0x39, 0xa7, 0x5a, 0xbc, 0x9a, 0x1b, 0xbe, 0xe7, 0xbd,
-	0x99, 0x6d, 0x5f, 0x35, 0xf4, 0x62, 0x40, 0x4a, 0x56, 0x2a, 0x70, 0xd1, 0x62, 0x30, 0x7c, 0x68,
-	0x4b, 0xe8, 0xc5, 0x10, 0xd6, 0x96, 0x30, 0x70, 0x43, 0x6d, 0xf9, 0x31, 0xbb, 0xea, 0x9d, 0x10,
-	0x2f, 0x06, 0x42, 0x6a, 0x13, 0x21, 0x81, 0x4b, 0x88, 0xb6, 0xdd, 0x6e, 0xce, 0xf7, 0xec, 0xff,
-	0x06, 0x00, 0x00, 0xff, 0xff, 0x20, 0xad, 0x3a, 0xfd, 0xe0, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/google_ads_field_service.pb.go b/googleapis/ads/googleads/v1/services/google_ads_field_service.pb.go
index 25dcdb56a2..3a94e0faba 100644
--- a/googleapis/ads/googleads/v1/services/google_ads_field_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/google_ads_field_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/google_ads_field_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [GoogleAdsFieldService.GetGoogleAdsField][google.ads.googleads.v1.services.GoogleAdsFieldService.GetGoogleAdsField].
 type GetGoogleAdsFieldRequest struct {
@@ -38,16 +38,17 @@ func (m *GetGoogleAdsFieldRequest) Reset()         { *m = GetGoogleAdsFieldReque
 func (m *GetGoogleAdsFieldRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGoogleAdsFieldRequest) ProtoMessage()    {}
 func (*GetGoogleAdsFieldRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_service_c68db3ae861d47e1, []int{0}
+	return fileDescriptor_bdc4a77920e176fd, []int{0}
 }
+
 func (m *GetGoogleAdsFieldRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGoogleAdsFieldRequest.Unmarshal(m, b)
 }
 func (m *GetGoogleAdsFieldRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGoogleAdsFieldRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGoogleAdsFieldRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGoogleAdsFieldRequest.Merge(dst, src)
+func (m *GetGoogleAdsFieldRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGoogleAdsFieldRequest.Merge(m, src)
 }
 func (m *GetGoogleAdsFieldRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGoogleAdsFieldRequest.Size(m)
@@ -86,16 +87,17 @@ func (m *SearchGoogleAdsFieldsRequest) Reset()         { *m = SearchGoogleAdsFie
 func (m *SearchGoogleAdsFieldsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchGoogleAdsFieldsRequest) ProtoMessage()    {}
 func (*SearchGoogleAdsFieldsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_service_c68db3ae861d47e1, []int{1}
+	return fileDescriptor_bdc4a77920e176fd, []int{1}
 }
+
 func (m *SearchGoogleAdsFieldsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchGoogleAdsFieldsRequest.Unmarshal(m, b)
 }
 func (m *SearchGoogleAdsFieldsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchGoogleAdsFieldsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchGoogleAdsFieldsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchGoogleAdsFieldsRequest.Merge(dst, src)
+func (m *SearchGoogleAdsFieldsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchGoogleAdsFieldsRequest.Merge(m, src)
 }
 func (m *SearchGoogleAdsFieldsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchGoogleAdsFieldsRequest.Size(m)
@@ -146,16 +148,17 @@ func (m *SearchGoogleAdsFieldsResponse) Reset()         { *m = SearchGoogleAdsFi
 func (m *SearchGoogleAdsFieldsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchGoogleAdsFieldsResponse) ProtoMessage()    {}
 func (*SearchGoogleAdsFieldsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_field_service_c68db3ae861d47e1, []int{2}
+	return fileDescriptor_bdc4a77920e176fd, []int{2}
 }
+
 func (m *SearchGoogleAdsFieldsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchGoogleAdsFieldsResponse.Unmarshal(m, b)
 }
 func (m *SearchGoogleAdsFieldsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchGoogleAdsFieldsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchGoogleAdsFieldsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchGoogleAdsFieldsResponse.Merge(dst, src)
+func (m *SearchGoogleAdsFieldsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchGoogleAdsFieldsResponse.Merge(m, src)
 }
 func (m *SearchGoogleAdsFieldsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchGoogleAdsFieldsResponse.Size(m)
@@ -193,6 +196,48 @@ func init() {
 	proto.RegisterType((*SearchGoogleAdsFieldsResponse)(nil), "google.ads.googleads.v1.services.SearchGoogleAdsFieldsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/google_ads_field_service.proto", fileDescriptor_bdc4a77920e176fd)
+}
+
+var fileDescriptor_bdc4a77920e176fd = []byte{
+	// 537 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x8b, 0xd3, 0x40,
+	0x14, 0x26, 0x29, 0xab, 0xee, 0xe8, 0x22, 0x3b, 0xba, 0x50, 0xe2, 0x2e, 0x96, 0xb8, 0xab, 0x65,
+	0xc1, 0x09, 0x59, 0x2f, 0x32, 0xa2, 0x25, 0x2b, 0x58, 0x41, 0x90, 0xd2, 0x4a, 0x0f, 0x52, 0x08,
+	0x63, 0xf3, 0x8c, 0xc1, 0x76, 0x26, 0x9b, 0x99, 0x16, 0x5d, 0xf1, 0xa0, 0x77, 0x4f, 0xfe, 0x03,
+	0x8f, 0xde, 0xfc, 0x05, 0x5e, 0x3c, 0x79, 0xf5, 0x2f, 0x78, 0xf2, 0x57, 0xc8, 0x64, 0x3a, 0xc5,
+	0xee, 0x36, 0x16, 0xbd, 0x4d, 0xde, 0xf7, 0xbe, 0xef, 0x7b, 0xf3, 0xde, 0x9b, 0xa0, 0x56, 0x2a,
+	0x44, 0x3a, 0x82, 0x80, 0x25, 0x32, 0x30, 0x47, 0x7d, 0x9a, 0x86, 0x81, 0x84, 0x62, 0x9a, 0x0d,
+	0xc1, 0x46, 0x63, 0x96, 0xc8, 0xf8, 0x79, 0x06, 0xa3, 0x24, 0x9e, 0x21, 0x24, 0x2f, 0x84, 0x12,
+	0xb8, 0x61, 0x70, 0xc2, 0x12, 0x49, 0xe6, 0x02, 0x64, 0x1a, 0x12, 0x2b, 0xe0, 0xdd, 0xae, 0xb2,
+	0x28, 0x40, 0x8a, 0x49, 0xb1, 0xcc, 0xc3, 0x68, 0x7b, 0xdb, 0x96, 0x99, 0x67, 0x01, 0xe3, 0x5c,
+	0x28, 0xa6, 0x32, 0xc1, 0xa5, 0x41, 0xfd, 0x16, 0xaa, 0xb7, 0x41, 0xb5, 0xcb, 0x94, 0x28, 0x91,
+	0x0f, 0x34, 0xb1, 0x0b, 0x47, 0x13, 0x90, 0x0a, 0x5f, 0x43, 0x1b, 0x56, 0x3d, 0xe6, 0x6c, 0x0c,
+	0x75, 0xa7, 0xe1, 0x34, 0xd7, 0xbb, 0x17, 0x6c, 0xf0, 0x31, 0x1b, 0x83, 0x9f, 0xa3, 0xed, 0x1e,
+	0xb0, 0x62, 0xf8, 0x62, 0x51, 0x43, 0x5a, 0x91, 0xcb, 0x68, 0xed, 0x68, 0x02, 0xc5, 0xeb, 0x19,
+	0xd9, 0x7c, 0xe0, 0x1d, 0x84, 0x72, 0x96, 0x42, 0xac, 0xc4, 0x4b, 0xe0, 0x75, 0xb7, 0x84, 0xd6,
+	0x75, 0xe4, 0x89, 0x0e, 0xe0, 0x2b, 0xa8, 0xfc, 0x88, 0x65, 0x76, 0x0c, 0xf5, 0x5a, 0xc3, 0x69,
+	0xae, 0x75, 0xcf, 0xe9, 0x40, 0x2f, 0x3b, 0x06, 0xff, 0x9b, 0x83, 0x76, 0x2a, 0x2c, 0x65, 0x2e,
+	0xb8, 0x04, 0xfc, 0x08, 0x9d, 0x2d, 0x40, 0x4e, 0x46, 0x4a, 0xd6, 0x9d, 0x46, 0xad, 0x79, 0xfe,
+	0x20, 0x24, 0x55, 0x0d, 0x9e, 0xb7, 0x8f, 0x9c, 0xe8, 0x81, 0x55, 0xc0, 0xd7, 0xd1, 0x45, 0x0e,
+	0xaf, 0x54, 0x7c, 0xaa, 0xde, 0x0d, 0x1d, 0xee, 0xcc, 0x6b, 0x26, 0xe8, 0x92, 0x12, 0x8a, 0x8d,
+	0xe2, 0x19, 0x31, 0x1e, 0x8a, 0x09, 0x57, 0x65, 0xf5, 0xb5, 0xee, 0x66, 0x09, 0x75, 0x0d, 0x72,
+	0x5f, 0x03, 0x07, 0x1f, 0x6a, 0x68, 0x6b, 0xd1, 0xb3, 0x67, 0x86, 0x8d, 0xbf, 0x38, 0x68, 0xf3,
+	0xd4, 0x50, 0x30, 0x25, 0xab, 0x96, 0x84, 0x54, 0x4d, 0xd2, 0xfb, 0xf7, 0xfb, 0xfb, 0x37, 0xdf,
+	0xff, 0xf8, 0xf9, 0xd1, 0xbd, 0x81, 0xf7, 0xf4, 0x92, 0xbd, 0x59, 0xd8, 0x83, 0xbb, 0xe9, 0x62,
+	0xdf, 0x83, 0xfd, 0xb7, 0xf8, 0xab, 0x83, 0xb6, 0x96, 0x0e, 0x05, 0xdf, 0x5b, 0x5d, 0xf7, 0xdf,
+	0x16, 0xc8, 0x6b, 0xfd, 0x37, 0xdf, 0x6c, 0x83, 0xbf, 0x57, 0xde, 0xe4, 0xaa, 0xef, 0xe9, 0x9b,
+	0x9c, 0x28, 0x9d, 0xca, 0x92, 0x4a, 0x9d, 0xfd, 0xc3, 0x77, 0x2e, 0xda, 0x1d, 0x8a, 0xf1, 0x4a,
+	0xb7, 0x43, 0x6f, 0xe9, 0xd4, 0x3a, 0xfa, 0x39, 0x75, 0x9c, 0xa7, 0x0f, 0x67, 0xfc, 0x54, 0x8c,
+	0x18, 0x4f, 0x89, 0x28, 0xd2, 0x20, 0x05, 0x5e, 0x3e, 0x36, 0xfb, 0x70, 0xf3, 0x4c, 0x56, 0xff,
+	0x2a, 0xee, 0xd8, 0xc3, 0x27, 0xb7, 0xd6, 0x8e, 0xa2, 0xcf, 0x6e, 0xc3, 0xd8, 0x91, 0x28, 0xf9,
+	0x63, 0x46, 0xa4, 0x1f, 0x92, 0x99, 0xb1, 0xfc, 0x6e, 0x53, 0x06, 0x51, 0x22, 0x07, 0xf3, 0x94,
+	0x41, 0x3f, 0x1c, 0xd8, 0x94, 0x5f, 0xee, 0xae, 0x89, 0x53, 0x1a, 0x25, 0x92, 0xd2, 0x79, 0x12,
+	0xa5, 0xfd, 0x90, 0x52, 0x9b, 0xf6, 0xec, 0x4c, 0x59, 0xe7, 0xad, 0xdf, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0xea, 0xe2, 0xe3, 0x8f, 0xd1, 0x04, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -301,45 +346,3 @@ var _GoogleAdsFieldService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/google_ads_field_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/google_ads_field_service.proto", fileDescriptor_google_ads_field_service_c68db3ae861d47e1)
-}
-
-var fileDescriptor_google_ads_field_service_c68db3ae861d47e1 = []byte{
-	// 537 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0x26, 0x29, 0xab, 0xee, 0xe8, 0x22, 0x3b, 0xba, 0x50, 0xe2, 0x2e, 0x96, 0xb8, 0xab, 0x65,
-	0xc1, 0x09, 0x59, 0x2f, 0x32, 0xa2, 0x25, 0x2b, 0x58, 0x41, 0x90, 0xd2, 0x4a, 0x0f, 0x52, 0x08,
-	0x63, 0xf3, 0x8c, 0xc1, 0x76, 0x26, 0x9b, 0x99, 0x16, 0x5d, 0xf1, 0xa0, 0x77, 0x4f, 0xfe, 0x03,
-	0x8f, 0xde, 0xfc, 0x05, 0x5e, 0x3c, 0x79, 0xf5, 0x2f, 0x78, 0xf2, 0x57, 0xc8, 0x64, 0x3a, 0xc5,
-	0xee, 0x36, 0x16, 0xbd, 0x4d, 0xde, 0xf7, 0xbe, 0xef, 0x7b, 0xf3, 0xde, 0x9b, 0xa0, 0x56, 0x2a,
-	0x44, 0x3a, 0x82, 0x80, 0x25, 0x32, 0x30, 0x47, 0x7d, 0x9a, 0x86, 0x81, 0x84, 0x62, 0x9a, 0x0d,
-	0xc1, 0x46, 0x63, 0x96, 0xc8, 0xf8, 0x79, 0x06, 0xa3, 0x24, 0x9e, 0x21, 0x24, 0x2f, 0x84, 0x12,
-	0xb8, 0x61, 0x70, 0xc2, 0x12, 0x49, 0xe6, 0x02, 0x64, 0x1a, 0x12, 0x2b, 0xe0, 0xdd, 0xae, 0xb2,
-	0x28, 0x40, 0x8a, 0x49, 0xb1, 0xcc, 0xc3, 0x68, 0x7b, 0xdb, 0x96, 0x99, 0x67, 0x01, 0xe3, 0x5c,
-	0x28, 0xa6, 0x32, 0xc1, 0xa5, 0x41, 0xfd, 0x16, 0xaa, 0xb7, 0x41, 0xb5, 0xcb, 0x94, 0x28, 0x91,
-	0x0f, 0x34, 0xb1, 0x0b, 0x47, 0x13, 0x90, 0x0a, 0x5f, 0x43, 0x1b, 0x56, 0x3d, 0xe6, 0x6c, 0x0c,
-	0x75, 0xa7, 0xe1, 0x34, 0xd7, 0xbb, 0x17, 0x6c, 0xf0, 0x31, 0x1b, 0x83, 0x9f, 0xa3, 0xed, 0x1e,
-	0xb0, 0x62, 0xf8, 0x62, 0x51, 0x43, 0x5a, 0x91, 0xcb, 0x68, 0xed, 0x68, 0x02, 0xc5, 0xeb, 0x19,
-	0xd9, 0x7c, 0xe0, 0x1d, 0x84, 0x72, 0x96, 0x42, 0xac, 0xc4, 0x4b, 0xe0, 0x75, 0xb7, 0x84, 0xd6,
-	0x75, 0xe4, 0x89, 0x0e, 0xe0, 0x2b, 0xa8, 0xfc, 0x88, 0x65, 0x76, 0x0c, 0xf5, 0x5a, 0xc3, 0x69,
-	0xae, 0x75, 0xcf, 0xe9, 0x40, 0x2f, 0x3b, 0x06, 0xff, 0x9b, 0x83, 0x76, 0x2a, 0x2c, 0x65, 0x2e,
-	0xb8, 0x04, 0xfc, 0x08, 0x9d, 0x2d, 0x40, 0x4e, 0x46, 0x4a, 0xd6, 0x9d, 0x46, 0xad, 0x79, 0xfe,
-	0x20, 0x24, 0x55, 0x0d, 0x9e, 0xb7, 0x8f, 0x9c, 0xe8, 0x81, 0x55, 0xc0, 0xd7, 0xd1, 0x45, 0x0e,
-	0xaf, 0x54, 0x7c, 0xaa, 0xde, 0x0d, 0x1d, 0xee, 0xcc, 0x6b, 0x26, 0xe8, 0x92, 0x12, 0x8a, 0x8d,
-	0xe2, 0x19, 0x31, 0x1e, 0x8a, 0x09, 0x57, 0x65, 0xf5, 0xb5, 0xee, 0x66, 0x09, 0x75, 0x0d, 0x72,
-	0x5f, 0x03, 0x07, 0x1f, 0x6a, 0x68, 0x6b, 0xd1, 0xb3, 0x67, 0x86, 0x8d, 0xbf, 0x38, 0x68, 0xf3,
-	0xd4, 0x50, 0x30, 0x25, 0xab, 0x96, 0x84, 0x54, 0x4d, 0xd2, 0xfb, 0xf7, 0xfb, 0xfb, 0x37, 0xdf,
-	0xff, 0xf8, 0xf9, 0xd1, 0xbd, 0x81, 0xf7, 0xf4, 0x92, 0xbd, 0x59, 0xd8, 0x83, 0xbb, 0xe9, 0x62,
-	0xdf, 0x83, 0xfd, 0xb7, 0xf8, 0xab, 0x83, 0xb6, 0x96, 0x0e, 0x05, 0xdf, 0x5b, 0x5d, 0xf7, 0xdf,
-	0x16, 0xc8, 0x6b, 0xfd, 0x37, 0xdf, 0x6c, 0x83, 0xbf, 0x57, 0xde, 0xe4, 0xaa, 0xef, 0xe9, 0x9b,
-	0x9c, 0x28, 0x9d, 0xca, 0x92, 0x4a, 0x9d, 0xfd, 0xc3, 0x77, 0x2e, 0xda, 0x1d, 0x8a, 0xf1, 0x4a,
-	0xb7, 0x43, 0x6f, 0xe9, 0xd4, 0x3a, 0xfa, 0x39, 0x75, 0x9c, 0xa7, 0x0f, 0x67, 0xfc, 0x54, 0x8c,
-	0x18, 0x4f, 0x89, 0x28, 0xd2, 0x20, 0x05, 0x5e, 0x3e, 0x36, 0xfb, 0x70, 0xf3, 0x4c, 0x56, 0xff,
-	0x2a, 0xee, 0xd8, 0xc3, 0x27, 0xb7, 0xd6, 0x8e, 0xa2, 0xcf, 0x6e, 0xc3, 0xd8, 0x91, 0x28, 0xf9,
-	0x63, 0x46, 0xa4, 0x1f, 0x92, 0x99, 0xb1, 0xfc, 0x6e, 0x53, 0x06, 0x51, 0x22, 0x07, 0xf3, 0x94,
-	0x41, 0x3f, 0x1c, 0xd8, 0x94, 0x5f, 0xee, 0xae, 0x89, 0x53, 0x1a, 0x25, 0x92, 0xd2, 0x79, 0x12,
-	0xa5, 0xfd, 0x90, 0x52, 0x9b, 0xf6, 0xec, 0x4c, 0x59, 0xe7, 0xad, 0xdf, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0xea, 0xe2, 0xe3, 0x8f, 0xd1, 0x04, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/google_ads_service.pb.go b/googleapis/ads/googleads/v1/services/google_ads_service.pb.go
index c42d5acbf1..be28e3af15 100644
--- a/googleapis/ads/googleads/v1/services/google_ads_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/google_ads_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/google_ads_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [GoogleAdsService.Search][google.ads.googleads.v1.services.GoogleAdsService.Search].
 type SearchGoogleAdsRequest struct {
@@ -54,16 +54,17 @@ func (m *SearchGoogleAdsRequest) Reset()         { *m = SearchGoogleAdsRequest{}
 func (m *SearchGoogleAdsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchGoogleAdsRequest) ProtoMessage()    {}
 func (*SearchGoogleAdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_service_75d9a9baabc9a843, []int{0}
+	return fileDescriptor_f29b4cd67e08d05c, []int{0}
 }
+
 func (m *SearchGoogleAdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchGoogleAdsRequest.Unmarshal(m, b)
 }
 func (m *SearchGoogleAdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchGoogleAdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchGoogleAdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchGoogleAdsRequest.Merge(dst, src)
+func (m *SearchGoogleAdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchGoogleAdsRequest.Merge(m, src)
 }
 func (m *SearchGoogleAdsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchGoogleAdsRequest.Size(m)
@@ -132,16 +133,17 @@ func (m *SearchGoogleAdsResponse) Reset()         { *m = SearchGoogleAdsResponse
 func (m *SearchGoogleAdsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchGoogleAdsResponse) ProtoMessage()    {}
 func (*SearchGoogleAdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_service_75d9a9baabc9a843, []int{1}
+	return fileDescriptor_f29b4cd67e08d05c, []int{1}
 }
+
 func (m *SearchGoogleAdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchGoogleAdsResponse.Unmarshal(m, b)
 }
 func (m *SearchGoogleAdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchGoogleAdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchGoogleAdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchGoogleAdsResponse.Merge(dst, src)
+func (m *SearchGoogleAdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchGoogleAdsResponse.Merge(m, src)
 }
 func (m *SearchGoogleAdsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchGoogleAdsResponse.Size(m)
@@ -377,16 +379,17 @@ func (m *GoogleAdsRow) Reset()         { *m = GoogleAdsRow{} }
 func (m *GoogleAdsRow) String() string { return proto.CompactTextString(m) }
 func (*GoogleAdsRow) ProtoMessage()    {}
 func (*GoogleAdsRow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_service_75d9a9baabc9a843, []int{2}
+	return fileDescriptor_f29b4cd67e08d05c, []int{2}
 }
+
 func (m *GoogleAdsRow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoogleAdsRow.Unmarshal(m, b)
 }
 func (m *GoogleAdsRow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoogleAdsRow.Marshal(b, m, deterministic)
 }
-func (dst *GoogleAdsRow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoogleAdsRow.Merge(dst, src)
+func (m *GoogleAdsRow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleAdsRow.Merge(m, src)
 }
 func (m *GoogleAdsRow) XXX_Size() int {
 	return xxx_messageInfo_GoogleAdsRow.Size(m)
@@ -1071,16 +1074,17 @@ func (m *MutateGoogleAdsRequest) Reset()         { *m = MutateGoogleAdsRequest{}
 func (m *MutateGoogleAdsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateGoogleAdsRequest) ProtoMessage()    {}
 func (*MutateGoogleAdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_service_75d9a9baabc9a843, []int{3}
+	return fileDescriptor_f29b4cd67e08d05c, []int{3}
 }
+
 func (m *MutateGoogleAdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateGoogleAdsRequest.Unmarshal(m, b)
 }
 func (m *MutateGoogleAdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateGoogleAdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateGoogleAdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateGoogleAdsRequest.Merge(dst, src)
+func (m *MutateGoogleAdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateGoogleAdsRequest.Merge(m, src)
 }
 func (m *MutateGoogleAdsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateGoogleAdsRequest.Size(m)
@@ -1137,16 +1141,17 @@ func (m *MutateGoogleAdsResponse) Reset()         { *m = MutateGoogleAdsResponse
 func (m *MutateGoogleAdsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateGoogleAdsResponse) ProtoMessage()    {}
 func (*MutateGoogleAdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_service_75d9a9baabc9a843, []int{4}
+	return fileDescriptor_f29b4cd67e08d05c, []int{4}
 }
+
 func (m *MutateGoogleAdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateGoogleAdsResponse.Unmarshal(m, b)
 }
 func (m *MutateGoogleAdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateGoogleAdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateGoogleAdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateGoogleAdsResponse.Merge(dst, src)
+func (m *MutateGoogleAdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateGoogleAdsResponse.Merge(m, src)
 }
 func (m *MutateGoogleAdsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateGoogleAdsResponse.Size(m)
@@ -1223,16 +1228,17 @@ func (m *MutateOperation) Reset()         { *m = MutateOperation{} }
 func (m *MutateOperation) String() string { return proto.CompactTextString(m) }
 func (*MutateOperation) ProtoMessage()    {}
 func (*MutateOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_service_75d9a9baabc9a843, []int{5}
+	return fileDescriptor_f29b4cd67e08d05c, []int{5}
 }
+
 func (m *MutateOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateOperation.Unmarshal(m, b)
 }
 func (m *MutateOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateOperation.Marshal(b, m, deterministic)
 }
-func (dst *MutateOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateOperation.Merge(dst, src)
+func (m *MutateOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateOperation.Merge(m, src)
 }
 func (m *MutateOperation) XXX_Size() int {
 	return xxx_messageInfo_MutateOperation.Size(m)
@@ -1735,9 +1741,9 @@ func (m *MutateOperation) GetUserListOperation() *UserListOperation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MutateOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MutateOperation_OneofMarshaler, _MutateOperation_OneofUnmarshaler, _MutateOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MutateOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MutateOperation_AdGroupAdLabelOperation)(nil),
 		(*MutateOperation_AdGroupAdOperation)(nil),
 		(*MutateOperation_AdGroupBidModifierOperation)(nil),
@@ -1778,702 +1784,6 @@ func (*MutateOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffe
 	}
 }
 
-func _MutateOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MutateOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *MutateOperation_AdGroupAdLabelOperation:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupAdLabelOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupAdOperation:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupAdOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupBidModifierOperation:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupBidModifierOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupCriterionLabelOperation:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupCriterionLabelOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupCriterionOperation:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupCriterionOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupExtensionSettingOperation:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupExtensionSettingOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupFeedOperation:
-		b.EncodeVarint(20<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupFeedOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupLabelOperation:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupLabelOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdGroupOperation:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AdParameterOperation:
-		b.EncodeVarint(22<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdParameterOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_AssetOperation:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AssetOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_BiddingStrategyOperation:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BiddingStrategyOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignBidModifierOperation:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignBidModifierOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignBudgetOperation:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignBudgetOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignCriterionOperation:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignCriterionOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignExtensionSettingOperation:
-		b.EncodeVarint(26<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignExtensionSettingOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignFeedOperation:
-		b.EncodeVarint(27<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignFeedOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignLabelOperation:
-		b.EncodeVarint(28<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignLabelOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignOperation:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CampaignSharedSetOperation:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignSharedSetOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_ConversionActionOperation:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConversionActionOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CustomerExtensionSettingOperation:
-		b.EncodeVarint(30<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerExtensionSettingOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CustomerFeedOperation:
-		b.EncodeVarint(31<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerFeedOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CustomerLabelOperation:
-		b.EncodeVarint(32<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerLabelOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CustomerNegativeCriterionOperation:
-		b.EncodeVarint(34<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerNegativeCriterionOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_CustomerOperation:
-		b.EncodeVarint(35<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_ExtensionFeedItemOperation:
-		b.EncodeVarint(36<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExtensionFeedItemOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_FeedItemOperation:
-		b.EncodeVarint(37<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedItemOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_FeedItemTargetOperation:
-		b.EncodeVarint(38<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedItemTargetOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_FeedMappingOperation:
-		b.EncodeVarint(39<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedMappingOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_FeedOperation:
-		b.EncodeVarint(40<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_LabelOperation:
-		b.EncodeVarint(41<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LabelOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_MediaFileOperation:
-		b.EncodeVarint(42<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MediaFileOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_RemarketingActionOperation:
-		b.EncodeVarint(43<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RemarketingActionOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_SharedCriterionOperation:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SharedCriterionOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_SharedSetOperation:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SharedSetOperation); err != nil {
-			return err
-		}
-	case *MutateOperation_UserListOperation:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UserListOperation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MutateOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MutateOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MutateOperation)
-	switch tag {
-	case 17: // operation.ad_group_ad_label_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupAdLabelOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupAdLabelOperation{msg}
-		return true, err
-	case 1: // operation.ad_group_ad_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupAdOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupAdOperation{msg}
-		return true, err
-	case 2: // operation.ad_group_bid_modifier_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupBidModifierOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupBidModifierOperation{msg}
-		return true, err
-	case 18: // operation.ad_group_criterion_label_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupCriterionLabelOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupCriterionLabelOperation{msg}
-		return true, err
-	case 3: // operation.ad_group_criterion_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupCriterionOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupCriterionOperation{msg}
-		return true, err
-	case 19: // operation.ad_group_extension_setting_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupExtensionSettingOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupExtensionSettingOperation{msg}
-		return true, err
-	case 20: // operation.ad_group_feed_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupFeedOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupFeedOperation{msg}
-		return true, err
-	case 21: // operation.ad_group_label_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupLabelOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupLabelOperation{msg}
-		return true, err
-	case 5: // operation.ad_group_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdGroupOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdGroupOperation{msg}
-		return true, err
-	case 22: // operation.ad_parameter_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AdParameterOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AdParameterOperation{msg}
-		return true, err
-	case 23: // operation.asset_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AssetOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_AssetOperation{msg}
-		return true, err
-	case 6: // operation.bidding_strategy_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BiddingStrategyOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_BiddingStrategyOperation{msg}
-		return true, err
-	case 7: // operation.campaign_bid_modifier_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignBidModifierOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignBidModifierOperation{msg}
-		return true, err
-	case 8: // operation.campaign_budget_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignBudgetOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignBudgetOperation{msg}
-		return true, err
-	case 13: // operation.campaign_criterion_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignCriterionOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignCriterionOperation{msg}
-		return true, err
-	case 26: // operation.campaign_extension_setting_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignExtensionSettingOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignExtensionSettingOperation{msg}
-		return true, err
-	case 27: // operation.campaign_feed_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignFeedOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignFeedOperation{msg}
-		return true, err
-	case 28: // operation.campaign_label_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignLabelOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignLabelOperation{msg}
-		return true, err
-	case 10: // operation.campaign_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignOperation{msg}
-		return true, err
-	case 11: // operation.campaign_shared_set_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CampaignSharedSetOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CampaignSharedSetOperation{msg}
-		return true, err
-	case 12: // operation.conversion_action_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ConversionActionOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_ConversionActionOperation{msg}
-		return true, err
-	case 30: // operation.customer_extension_setting_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomerExtensionSettingOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CustomerExtensionSettingOperation{msg}
-		return true, err
-	case 31: // operation.customer_feed_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomerFeedOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CustomerFeedOperation{msg}
-		return true, err
-	case 32: // operation.customer_label_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomerLabelOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CustomerLabelOperation{msg}
-		return true, err
-	case 34: // operation.customer_negative_criterion_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomerNegativeCriterionOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CustomerNegativeCriterionOperation{msg}
-		return true, err
-	case 35: // operation.customer_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomerOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_CustomerOperation{msg}
-		return true, err
-	case 36: // operation.extension_feed_item_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExtensionFeedItemOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_ExtensionFeedItemOperation{msg}
-		return true, err
-	case 37: // operation.feed_item_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FeedItemOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_FeedItemOperation{msg}
-		return true, err
-	case 38: // operation.feed_item_target_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FeedItemTargetOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_FeedItemTargetOperation{msg}
-		return true, err
-	case 39: // operation.feed_mapping_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FeedMappingOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_FeedMappingOperation{msg}
-		return true, err
-	case 40: // operation.feed_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FeedOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_FeedOperation{msg}
-		return true, err
-	case 41: // operation.label_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_LabelOperation{msg}
-		return true, err
-	case 42: // operation.media_file_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MediaFileOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_MediaFileOperation{msg}
-		return true, err
-	case 43: // operation.remarketing_action_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RemarketingActionOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_RemarketingActionOperation{msg}
-		return true, err
-	case 14: // operation.shared_criterion_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SharedCriterionOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_SharedCriterionOperation{msg}
-		return true, err
-	case 15: // operation.shared_set_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SharedSetOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_SharedSetOperation{msg}
-		return true, err
-	case 16: // operation.user_list_operation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UserListOperation)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MutateOperation_UserListOperation{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MutateOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MutateOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *MutateOperation_AdGroupAdLabelOperation:
-		s := proto.Size(x.AdGroupAdLabelOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupAdOperation:
-		s := proto.Size(x.AdGroupAdOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupBidModifierOperation:
-		s := proto.Size(x.AdGroupBidModifierOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupCriterionLabelOperation:
-		s := proto.Size(x.AdGroupCriterionLabelOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupCriterionOperation:
-		s := proto.Size(x.AdGroupCriterionOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupExtensionSettingOperation:
-		s := proto.Size(x.AdGroupExtensionSettingOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupFeedOperation:
-		s := proto.Size(x.AdGroupFeedOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupLabelOperation:
-		s := proto.Size(x.AdGroupLabelOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdGroupOperation:
-		s := proto.Size(x.AdGroupOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AdParameterOperation:
-		s := proto.Size(x.AdParameterOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_AssetOperation:
-		s := proto.Size(x.AssetOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_BiddingStrategyOperation:
-		s := proto.Size(x.BiddingStrategyOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignBidModifierOperation:
-		s := proto.Size(x.CampaignBidModifierOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignBudgetOperation:
-		s := proto.Size(x.CampaignBudgetOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignCriterionOperation:
-		s := proto.Size(x.CampaignCriterionOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignExtensionSettingOperation:
-		s := proto.Size(x.CampaignExtensionSettingOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignFeedOperation:
-		s := proto.Size(x.CampaignFeedOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignLabelOperation:
-		s := proto.Size(x.CampaignLabelOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignOperation:
-		s := proto.Size(x.CampaignOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CampaignSharedSetOperation:
-		s := proto.Size(x.CampaignSharedSetOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_ConversionActionOperation:
-		s := proto.Size(x.ConversionActionOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CustomerExtensionSettingOperation:
-		s := proto.Size(x.CustomerExtensionSettingOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CustomerFeedOperation:
-		s := proto.Size(x.CustomerFeedOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CustomerLabelOperation:
-		s := proto.Size(x.CustomerLabelOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CustomerNegativeCriterionOperation:
-		s := proto.Size(x.CustomerNegativeCriterionOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_CustomerOperation:
-		s := proto.Size(x.CustomerOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_ExtensionFeedItemOperation:
-		s := proto.Size(x.ExtensionFeedItemOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_FeedItemOperation:
-		s := proto.Size(x.FeedItemOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_FeedItemTargetOperation:
-		s := proto.Size(x.FeedItemTargetOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_FeedMappingOperation:
-		s := proto.Size(x.FeedMappingOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_FeedOperation:
-		s := proto.Size(x.FeedOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_LabelOperation:
-		s := proto.Size(x.LabelOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_MediaFileOperation:
-		s := proto.Size(x.MediaFileOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_RemarketingActionOperation:
-		s := proto.Size(x.RemarketingActionOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_SharedCriterionOperation:
-		s := proto.Size(x.SharedCriterionOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_SharedSetOperation:
-		s := proto.Size(x.SharedSetOperation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperation_UserListOperation:
-		s := proto.Size(x.UserListOperation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for the resource mutate.
 type MutateOperationResponse struct {
 	// The mutate response
@@ -2526,16 +1836,17 @@ func (m *MutateOperationResponse) Reset()         { *m = MutateOperationResponse
 func (m *MutateOperationResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateOperationResponse) ProtoMessage()    {}
 func (*MutateOperationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_google_ads_service_75d9a9baabc9a843, []int{6}
+	return fileDescriptor_f29b4cd67e08d05c, []int{6}
 }
+
 func (m *MutateOperationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateOperationResponse.Unmarshal(m, b)
 }
 func (m *MutateOperationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateOperationResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateOperationResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateOperationResponse.Merge(dst, src)
+func (m *MutateOperationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateOperationResponse.Merge(m, src)
 }
 func (m *MutateOperationResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateOperationResponse.Size(m)
@@ -3038,9 +2349,9 @@ func (m *MutateOperationResponse) GetUserListResult() *MutateUserListResult {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MutateOperationResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MutateOperationResponse_OneofMarshaler, _MutateOperationResponse_OneofUnmarshaler, _MutateOperationResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MutateOperationResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MutateOperationResponse_AdGroupAdLabelResult)(nil),
 		(*MutateOperationResponse_AdGroupAdResult)(nil),
 		(*MutateOperationResponse_AdGroupBidModifierResult)(nil),
@@ -3081,702 +2392,6 @@ func (*MutateOperationResponse) XXX_OneofFuncs() (func(msg proto.Message, b *pro
 	}
 }
 
-func _MutateOperationResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MutateOperationResponse)
-	// response
-	switch x := m.Response.(type) {
-	case *MutateOperationResponse_AdGroupAdLabelResult:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupAdLabelResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupAdResult:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupAdResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupBidModifierResult:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupBidModifierResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupCriterionLabelResult:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupCriterionLabelResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupCriterionResult:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupCriterionResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupExtensionSettingResult:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupExtensionSettingResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupFeedResult:
-		b.EncodeVarint(20<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupFeedResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupLabelResult:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupLabelResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdGroupResult:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdGroupResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AdParameterResult:
-		b.EncodeVarint(22<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AdParameterResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_AssetResult:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AssetResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_BiddingStrategyResult:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BiddingStrategyResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignBidModifierResult:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignBidModifierResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignBudgetResult:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignBudgetResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignCriterionResult:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignCriterionResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignExtensionSettingResult:
-		b.EncodeVarint(26<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignExtensionSettingResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignFeedResult:
-		b.EncodeVarint(27<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignFeedResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignLabelResult:
-		b.EncodeVarint(28<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignLabelResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignResult:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CampaignSharedSetResult:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignSharedSetResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_ConversionActionResult:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConversionActionResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CustomerExtensionSettingResult:
-		b.EncodeVarint(30<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerExtensionSettingResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CustomerFeedResult:
-		b.EncodeVarint(31<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerFeedResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CustomerLabelResult:
-		b.EncodeVarint(32<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerLabelResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CustomerNegativeCriterionResult:
-		b.EncodeVarint(34<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerNegativeCriterionResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_CustomerResult:
-		b.EncodeVarint(35<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomerResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_ExtensionFeedItemResult:
-		b.EncodeVarint(36<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExtensionFeedItemResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_FeedItemResult:
-		b.EncodeVarint(37<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedItemResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_FeedItemTargetResult:
-		b.EncodeVarint(38<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedItemTargetResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_FeedMappingResult:
-		b.EncodeVarint(39<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedMappingResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_FeedResult:
-		b.EncodeVarint(40<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FeedResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_LabelResult:
-		b.EncodeVarint(41<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LabelResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_MediaFileResult:
-		b.EncodeVarint(42<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MediaFileResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_RemarketingActionResult:
-		b.EncodeVarint(43<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RemarketingActionResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_SharedCriterionResult:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SharedCriterionResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_SharedSetResult:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SharedSetResult); err != nil {
-			return err
-		}
-	case *MutateOperationResponse_UserListResult:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UserListResult); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MutateOperationResponse.Response has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MutateOperationResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MutateOperationResponse)
-	switch tag {
-	case 17: // response.ad_group_ad_label_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupAdLabelResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupAdLabelResult{msg}
-		return true, err
-	case 1: // response.ad_group_ad_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupAdResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupAdResult{msg}
-		return true, err
-	case 2: // response.ad_group_bid_modifier_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupBidModifierResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupBidModifierResult{msg}
-		return true, err
-	case 18: // response.ad_group_criterion_label_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupCriterionLabelResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupCriterionLabelResult{msg}
-		return true, err
-	case 3: // response.ad_group_criterion_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupCriterionResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupCriterionResult{msg}
-		return true, err
-	case 19: // response.ad_group_extension_setting_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupExtensionSettingResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupExtensionSettingResult{msg}
-		return true, err
-	case 20: // response.ad_group_feed_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupFeedResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupFeedResult{msg}
-		return true, err
-	case 21: // response.ad_group_label_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupLabelResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupLabelResult{msg}
-		return true, err
-	case 5: // response.ad_group_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdGroupResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdGroupResult{msg}
-		return true, err
-	case 22: // response.ad_parameter_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAdParameterResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AdParameterResult{msg}
-		return true, err
-	case 23: // response.asset_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateAssetResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_AssetResult{msg}
-		return true, err
-	case 6: // response.bidding_strategy_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateBiddingStrategyResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_BiddingStrategyResult{msg}
-		return true, err
-	case 7: // response.campaign_bid_modifier_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignBidModifierResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignBidModifierResult{msg}
-		return true, err
-	case 8: // response.campaign_budget_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignBudgetResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignBudgetResult{msg}
-		return true, err
-	case 13: // response.campaign_criterion_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignCriterionResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignCriterionResult{msg}
-		return true, err
-	case 26: // response.campaign_extension_setting_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignExtensionSettingResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignExtensionSettingResult{msg}
-		return true, err
-	case 27: // response.campaign_feed_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignFeedResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignFeedResult{msg}
-		return true, err
-	case 28: // response.campaign_label_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignLabelResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignLabelResult{msg}
-		return true, err
-	case 10: // response.campaign_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignResult{msg}
-		return true, err
-	case 11: // response.campaign_shared_set_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCampaignSharedSetResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CampaignSharedSetResult{msg}
-		return true, err
-	case 12: // response.conversion_action_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateConversionActionResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_ConversionActionResult{msg}
-		return true, err
-	case 30: // response.customer_extension_setting_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCustomerExtensionSettingResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CustomerExtensionSettingResult{msg}
-		return true, err
-	case 31: // response.customer_feed_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCustomerFeedResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CustomerFeedResult{msg}
-		return true, err
-	case 32: // response.customer_label_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCustomerLabelResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CustomerLabelResult{msg}
-		return true, err
-	case 34: // response.customer_negative_criterion_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCustomerNegativeCriteriaResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CustomerNegativeCriterionResult{msg}
-		return true, err
-	case 35: // response.customer_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateCustomerResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_CustomerResult{msg}
-		return true, err
-	case 36: // response.extension_feed_item_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateExtensionFeedItemResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_ExtensionFeedItemResult{msg}
-		return true, err
-	case 37: // response.feed_item_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateFeedItemResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_FeedItemResult{msg}
-		return true, err
-	case 38: // response.feed_item_target_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateFeedItemTargetResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_FeedItemTargetResult{msg}
-		return true, err
-	case 39: // response.feed_mapping_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateFeedMappingResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_FeedMappingResult{msg}
-		return true, err
-	case 40: // response.feed_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateFeedResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_FeedResult{msg}
-		return true, err
-	case 41: // response.label_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateLabelResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_LabelResult{msg}
-		return true, err
-	case 42: // response.media_file_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateMediaFileResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_MediaFileResult{msg}
-		return true, err
-	case 43: // response.remarketing_action_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateRemarketingActionResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_RemarketingActionResult{msg}
-		return true, err
-	case 14: // response.shared_criterion_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateSharedCriterionResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_SharedCriterionResult{msg}
-		return true, err
-	case 15: // response.shared_set_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateSharedSetResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_SharedSetResult{msg}
-		return true, err
-	case 16: // response.user_list_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MutateUserListResult)
-		err := b.DecodeMessage(msg)
-		m.Response = &MutateOperationResponse_UserListResult{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MutateOperationResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MutateOperationResponse)
-	// response
-	switch x := m.Response.(type) {
-	case *MutateOperationResponse_AdGroupAdLabelResult:
-		s := proto.Size(x.AdGroupAdLabelResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupAdResult:
-		s := proto.Size(x.AdGroupAdResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupBidModifierResult:
-		s := proto.Size(x.AdGroupBidModifierResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupCriterionLabelResult:
-		s := proto.Size(x.AdGroupCriterionLabelResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupCriterionResult:
-		s := proto.Size(x.AdGroupCriterionResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupExtensionSettingResult:
-		s := proto.Size(x.AdGroupExtensionSettingResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupFeedResult:
-		s := proto.Size(x.AdGroupFeedResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupLabelResult:
-		s := proto.Size(x.AdGroupLabelResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdGroupResult:
-		s := proto.Size(x.AdGroupResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AdParameterResult:
-		s := proto.Size(x.AdParameterResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_AssetResult:
-		s := proto.Size(x.AssetResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_BiddingStrategyResult:
-		s := proto.Size(x.BiddingStrategyResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignBidModifierResult:
-		s := proto.Size(x.CampaignBidModifierResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignBudgetResult:
-		s := proto.Size(x.CampaignBudgetResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignCriterionResult:
-		s := proto.Size(x.CampaignCriterionResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignExtensionSettingResult:
-		s := proto.Size(x.CampaignExtensionSettingResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignFeedResult:
-		s := proto.Size(x.CampaignFeedResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignLabelResult:
-		s := proto.Size(x.CampaignLabelResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignResult:
-		s := proto.Size(x.CampaignResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CampaignSharedSetResult:
-		s := proto.Size(x.CampaignSharedSetResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_ConversionActionResult:
-		s := proto.Size(x.ConversionActionResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CustomerExtensionSettingResult:
-		s := proto.Size(x.CustomerExtensionSettingResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CustomerFeedResult:
-		s := proto.Size(x.CustomerFeedResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CustomerLabelResult:
-		s := proto.Size(x.CustomerLabelResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CustomerNegativeCriterionResult:
-		s := proto.Size(x.CustomerNegativeCriterionResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_CustomerResult:
-		s := proto.Size(x.CustomerResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_ExtensionFeedItemResult:
-		s := proto.Size(x.ExtensionFeedItemResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_FeedItemResult:
-		s := proto.Size(x.FeedItemResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_FeedItemTargetResult:
-		s := proto.Size(x.FeedItemTargetResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_FeedMappingResult:
-		s := proto.Size(x.FeedMappingResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_FeedResult:
-		s := proto.Size(x.FeedResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_LabelResult:
-		s := proto.Size(x.LabelResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_MediaFileResult:
-		s := proto.Size(x.MediaFileResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_RemarketingActionResult:
-		s := proto.Size(x.RemarketingActionResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_SharedCriterionResult:
-		s := proto.Size(x.SharedCriterionResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_SharedSetResult:
-		s := proto.Size(x.SharedSetResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MutateOperationResponse_UserListResult:
-		s := proto.Size(x.UserListResult)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*SearchGoogleAdsRequest)(nil), "google.ads.googleads.v1.services.SearchGoogleAdsRequest")
 	proto.RegisterType((*SearchGoogleAdsResponse)(nil), "google.ads.googleads.v1.services.SearchGoogleAdsResponse")
@@ -3787,216 +2402,11 @@ func init() {
 	proto.RegisterType((*MutateOperationResponse)(nil), "google.ads.googleads.v1.services.MutateOperationResponse")
 }
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// GoogleAdsServiceClient is the client API for GoogleAdsService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type GoogleAdsServiceClient interface {
-	// Returns all rows that match the search query.
-	Search(ctx context.Context, in *SearchGoogleAdsRequest, opts ...grpc.CallOption) (*SearchGoogleAdsResponse, error)
-	// Creates, updates, or removes resources. This method supports atomic
-	// transactions with multiple types of resources. For example, you can
-	// atomically create a campaign and a campaign budget, or perform up to
-	// thousands of mutates atomically.
-	//
-	// This method is essentially a wrapper around a series of mutate methods. The
-	// only features it offers over calling those methods directly are:
-	// - Atomic transactions
-	// - Temp resource names (described below)
-	// - Somewhat reduced latency over making a series of mutate calls.
-	//
-	// Note: Only resources that support atomic transactions are included, so this
-	// method can't replace all calls to individual services.
-	//
-	// ## Atomic Transaction Benefits
-	//
-	// Atomicity makes error handling much easier. If you're making a series of
-	// changes and one fails, it can leave your account in an inconsistent state.
-	// With atomicity, you either reach the desired state directly, or the request
-	// fails and you can retry.
-	//
-	// ## Temp Resource Names
-	//
-	// Temp resource names are a special type of resource name used to create a
-	// resource and reference that resource in the same request. For example, if a
-	// campaign budget is created with 'resource_name' equal to
-	// 'customers/123/campaignBudgets/-1', that resource name can be reused in
-	// the 'Campaign.budget' field in the same request. That way, the two
-	// resources are created and linked atomically.
-	//
-	// To create a temp resource name, put a negative number in the part of the
-	// name that the server would normally allocate.
-	//
-	// Note:
-	// - Resources must be created with a temp name before the name can be reused.
-	//   For example, the previous CampaignBudget+Campaign example would fail if
-	//   the mutate order was reversed.
-	// - Temp names are not remembered across requests.
-	// - There's no limit to the number of temp names in a request.
-	// - Each temp name must use a unique negative number, even if the resource
-	//   types differ.
-	//
-	// ## Latency
-	//
-	// It's important to group mutates by resource type or the request may time
-	// out and fail. Latency is roughly equal to a series of calls to individual
-	// mutate methods, where each change in resource type is a new call. For
-	// example, mutating 10 campaigns then 10 ad groups is like 2 calls, while
-	// mutating 1 campaign, 1 ad group, 1 campaign, 1 ad group is like 4 calls.
-	Mutate(ctx context.Context, in *MutateGoogleAdsRequest, opts ...grpc.CallOption) (*MutateGoogleAdsResponse, error)
-}
-
-type googleAdsServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewGoogleAdsServiceClient(cc *grpc.ClientConn) GoogleAdsServiceClient {
-	return &googleAdsServiceClient{cc}
-}
-
-func (c *googleAdsServiceClient) Search(ctx context.Context, in *SearchGoogleAdsRequest, opts ...grpc.CallOption) (*SearchGoogleAdsResponse, error) {
-	out := new(SearchGoogleAdsResponse)
-	err := c.cc.Invoke(ctx, "/google.ads.googleads.v1.services.GoogleAdsService/Search", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *googleAdsServiceClient) Mutate(ctx context.Context, in *MutateGoogleAdsRequest, opts ...grpc.CallOption) (*MutateGoogleAdsResponse, error) {
-	out := new(MutateGoogleAdsResponse)
-	err := c.cc.Invoke(ctx, "/google.ads.googleads.v1.services.GoogleAdsService/Mutate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// GoogleAdsServiceServer is the server API for GoogleAdsService service.
-type GoogleAdsServiceServer interface {
-	// Returns all rows that match the search query.
-	Search(context.Context, *SearchGoogleAdsRequest) (*SearchGoogleAdsResponse, error)
-	// Creates, updates, or removes resources. This method supports atomic
-	// transactions with multiple types of resources. For example, you can
-	// atomically create a campaign and a campaign budget, or perform up to
-	// thousands of mutates atomically.
-	//
-	// This method is essentially a wrapper around a series of mutate methods. The
-	// only features it offers over calling those methods directly are:
-	// - Atomic transactions
-	// - Temp resource names (described below)
-	// - Somewhat reduced latency over making a series of mutate calls.
-	//
-	// Note: Only resources that support atomic transactions are included, so this
-	// method can't replace all calls to individual services.
-	//
-	// ## Atomic Transaction Benefits
-	//
-	// Atomicity makes error handling much easier. If you're making a series of
-	// changes and one fails, it can leave your account in an inconsistent state.
-	// With atomicity, you either reach the desired state directly, or the request
-	// fails and you can retry.
-	//
-	// ## Temp Resource Names
-	//
-	// Temp resource names are a special type of resource name used to create a
-	// resource and reference that resource in the same request. For example, if a
-	// campaign budget is created with 'resource_name' equal to
-	// 'customers/123/campaignBudgets/-1', that resource name can be reused in
-	// the 'Campaign.budget' field in the same request. That way, the two
-	// resources are created and linked atomically.
-	//
-	// To create a temp resource name, put a negative number in the part of the
-	// name that the server would normally allocate.
-	//
-	// Note:
-	// - Resources must be created with a temp name before the name can be reused.
-	//   For example, the previous CampaignBudget+Campaign example would fail if
-	//   the mutate order was reversed.
-	// - Temp names are not remembered across requests.
-	// - There's no limit to the number of temp names in a request.
-	// - Each temp name must use a unique negative number, even if the resource
-	//   types differ.
-	//
-	// ## Latency
-	//
-	// It's important to group mutates by resource type or the request may time
-	// out and fail. Latency is roughly equal to a series of calls to individual
-	// mutate methods, where each change in resource type is a new call. For
-	// example, mutating 10 campaigns then 10 ad groups is like 2 calls, while
-	// mutating 1 campaign, 1 ad group, 1 campaign, 1 ad group is like 4 calls.
-	Mutate(context.Context, *MutateGoogleAdsRequest) (*MutateGoogleAdsResponse, error)
-}
-
-func RegisterGoogleAdsServiceServer(s *grpc.Server, srv GoogleAdsServiceServer) {
-	s.RegisterService(&_GoogleAdsService_serviceDesc, srv)
-}
-
-func _GoogleAdsService_Search_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SearchGoogleAdsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(GoogleAdsServiceServer).Search(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.ads.googleads.v1.services.GoogleAdsService/Search",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(GoogleAdsServiceServer).Search(ctx, req.(*SearchGoogleAdsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _GoogleAdsService_Mutate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MutateGoogleAdsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(GoogleAdsServiceServer).Mutate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.ads.googleads.v1.services.GoogleAdsService/Mutate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(GoogleAdsServiceServer).Mutate(ctx, req.(*MutateGoogleAdsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _GoogleAdsService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.ads.googleads.v1.services.GoogleAdsService",
-	HandlerType: (*GoogleAdsServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Search",
-			Handler:    _GoogleAdsService_Search_Handler,
-		},
-		{
-			MethodName: "Mutate",
-			Handler:    _GoogleAdsService_Mutate_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/ads/googleads/v1/services/google_ads_service.proto",
-}
-
 func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/google_ads_service.proto", fileDescriptor_google_ads_service_75d9a9baabc9a843)
+	proto.RegisterFile("google/ads/googleads/v1/services/google_ads_service.proto", fileDescriptor_f29b4cd67e08d05c)
 }
 
-var fileDescriptor_google_ads_service_75d9a9baabc9a843 = []byte{
+var fileDescriptor_f29b4cd67e08d05c = []byte{
 	// 5126 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x5d, 0xcd, 0x73, 0xdd, 0x46,
 	0x72, 0xcf, 0x93, 0x56, 0x36, 0x35, 0xa4, 0xf8, 0x31, 0x24, 0xc5, 0x11, 0xf5, 0x69, 0x4a, 0xb6,
@@ -4320,3 +2730,208 @@ var fileDescriptor_google_ads_service_75d9a9baabc9a843 = []byte{
 	0x96, 0xb7, 0x6d, 0x3f, 0xc7, 0xf5, 0xbc, 0xfe, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x62, 0xac,
 	0x7f, 0x75, 0x68, 0x6b, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// GoogleAdsServiceClient is the client API for GoogleAdsService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type GoogleAdsServiceClient interface {
+	// Returns all rows that match the search query.
+	Search(ctx context.Context, in *SearchGoogleAdsRequest, opts ...grpc.CallOption) (*SearchGoogleAdsResponse, error)
+	// Creates, updates, or removes resources. This method supports atomic
+	// transactions with multiple types of resources. For example, you can
+	// atomically create a campaign and a campaign budget, or perform up to
+	// thousands of mutates atomically.
+	//
+	// This method is essentially a wrapper around a series of mutate methods. The
+	// only features it offers over calling those methods directly are:
+	// - Atomic transactions
+	// - Temp resource names (described below)
+	// - Somewhat reduced latency over making a series of mutate calls.
+	//
+	// Note: Only resources that support atomic transactions are included, so this
+	// method can't replace all calls to individual services.
+	//
+	// ## Atomic Transaction Benefits
+	//
+	// Atomicity makes error handling much easier. If you're making a series of
+	// changes and one fails, it can leave your account in an inconsistent state.
+	// With atomicity, you either reach the desired state directly, or the request
+	// fails and you can retry.
+	//
+	// ## Temp Resource Names
+	//
+	// Temp resource names are a special type of resource name used to create a
+	// resource and reference that resource in the same request. For example, if a
+	// campaign budget is created with 'resource_name' equal to
+	// 'customers/123/campaignBudgets/-1', that resource name can be reused in
+	// the 'Campaign.budget' field in the same request. That way, the two
+	// resources are created and linked atomically.
+	//
+	// To create a temp resource name, put a negative number in the part of the
+	// name that the server would normally allocate.
+	//
+	// Note:
+	// - Resources must be created with a temp name before the name can be reused.
+	//   For example, the previous CampaignBudget+Campaign example would fail if
+	//   the mutate order was reversed.
+	// - Temp names are not remembered across requests.
+	// - There's no limit to the number of temp names in a request.
+	// - Each temp name must use a unique negative number, even if the resource
+	//   types differ.
+	//
+	// ## Latency
+	//
+	// It's important to group mutates by resource type or the request may time
+	// out and fail. Latency is roughly equal to a series of calls to individual
+	// mutate methods, where each change in resource type is a new call. For
+	// example, mutating 10 campaigns then 10 ad groups is like 2 calls, while
+	// mutating 1 campaign, 1 ad group, 1 campaign, 1 ad group is like 4 calls.
+	Mutate(ctx context.Context, in *MutateGoogleAdsRequest, opts ...grpc.CallOption) (*MutateGoogleAdsResponse, error)
+}
+
+type googleAdsServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewGoogleAdsServiceClient(cc *grpc.ClientConn) GoogleAdsServiceClient {
+	return &googleAdsServiceClient{cc}
+}
+
+func (c *googleAdsServiceClient) Search(ctx context.Context, in *SearchGoogleAdsRequest, opts ...grpc.CallOption) (*SearchGoogleAdsResponse, error) {
+	out := new(SearchGoogleAdsResponse)
+	err := c.cc.Invoke(ctx, "/google.ads.googleads.v1.services.GoogleAdsService/Search", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *googleAdsServiceClient) Mutate(ctx context.Context, in *MutateGoogleAdsRequest, opts ...grpc.CallOption) (*MutateGoogleAdsResponse, error) {
+	out := new(MutateGoogleAdsResponse)
+	err := c.cc.Invoke(ctx, "/google.ads.googleads.v1.services.GoogleAdsService/Mutate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// GoogleAdsServiceServer is the server API for GoogleAdsService service.
+type GoogleAdsServiceServer interface {
+	// Returns all rows that match the search query.
+	Search(context.Context, *SearchGoogleAdsRequest) (*SearchGoogleAdsResponse, error)
+	// Creates, updates, or removes resources. This method supports atomic
+	// transactions with multiple types of resources. For example, you can
+	// atomically create a campaign and a campaign budget, or perform up to
+	// thousands of mutates atomically.
+	//
+	// This method is essentially a wrapper around a series of mutate methods. The
+	// only features it offers over calling those methods directly are:
+	// - Atomic transactions
+	// - Temp resource names (described below)
+	// - Somewhat reduced latency over making a series of mutate calls.
+	//
+	// Note: Only resources that support atomic transactions are included, so this
+	// method can't replace all calls to individual services.
+	//
+	// ## Atomic Transaction Benefits
+	//
+	// Atomicity makes error handling much easier. If you're making a series of
+	// changes and one fails, it can leave your account in an inconsistent state.
+	// With atomicity, you either reach the desired state directly, or the request
+	// fails and you can retry.
+	//
+	// ## Temp Resource Names
+	//
+	// Temp resource names are a special type of resource name used to create a
+	// resource and reference that resource in the same request. For example, if a
+	// campaign budget is created with 'resource_name' equal to
+	// 'customers/123/campaignBudgets/-1', that resource name can be reused in
+	// the 'Campaign.budget' field in the same request. That way, the two
+	// resources are created and linked atomically.
+	//
+	// To create a temp resource name, put a negative number in the part of the
+	// name that the server would normally allocate.
+	//
+	// Note:
+	// - Resources must be created with a temp name before the name can be reused.
+	//   For example, the previous CampaignBudget+Campaign example would fail if
+	//   the mutate order was reversed.
+	// - Temp names are not remembered across requests.
+	// - There's no limit to the number of temp names in a request.
+	// - Each temp name must use a unique negative number, even if the resource
+	//   types differ.
+	//
+	// ## Latency
+	//
+	// It's important to group mutates by resource type or the request may time
+	// out and fail. Latency is roughly equal to a series of calls to individual
+	// mutate methods, where each change in resource type is a new call. For
+	// example, mutating 10 campaigns then 10 ad groups is like 2 calls, while
+	// mutating 1 campaign, 1 ad group, 1 campaign, 1 ad group is like 4 calls.
+	Mutate(context.Context, *MutateGoogleAdsRequest) (*MutateGoogleAdsResponse, error)
+}
+
+func RegisterGoogleAdsServiceServer(s *grpc.Server, srv GoogleAdsServiceServer) {
+	s.RegisterService(&_GoogleAdsService_serviceDesc, srv)
+}
+
+func _GoogleAdsService_Search_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SearchGoogleAdsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoogleAdsServiceServer).Search(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.ads.googleads.v1.services.GoogleAdsService/Search",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoogleAdsServiceServer).Search(ctx, req.(*SearchGoogleAdsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoogleAdsService_Mutate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MutateGoogleAdsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoogleAdsServiceServer).Mutate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.ads.googleads.v1.services.GoogleAdsService/Mutate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoogleAdsServiceServer).Mutate(ctx, req.(*MutateGoogleAdsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _GoogleAdsService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.ads.googleads.v1.services.GoogleAdsService",
+	HandlerType: (*GoogleAdsServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Search",
+			Handler:    _GoogleAdsService_Search_Handler,
+		},
+		{
+			MethodName: "Mutate",
+			Handler:    _GoogleAdsService_Mutate_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/ads/googleads/v1/services/google_ads_service.proto",
+}
diff --git a/googleapis/ads/googleads/v1/services/group_placement_view_service.pb.go b/googleapis/ads/googleads/v1/services/group_placement_view_service.pb.go
index 10041788b1..8d919f262a 100644
--- a/googleapis/ads/googleads/v1/services/group_placement_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/group_placement_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/group_placement_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [GroupPlacementViewService.GetGroupPlacementView][google.ads.googleads.v1.services.GroupPlacementViewService.GetGroupPlacementView].
 type GetGroupPlacementViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetGroupPlacementViewRequest) Reset()         { *m = GetGroupPlacementV
 func (m *GetGroupPlacementViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGroupPlacementViewRequest) ProtoMessage()    {}
 func (*GetGroupPlacementViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_placement_view_service_0ce1a68201b7e811, []int{0}
+	return fileDescriptor_722a806b0135cef4, []int{0}
 }
+
 func (m *GetGroupPlacementViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGroupPlacementViewRequest.Unmarshal(m, b)
 }
 func (m *GetGroupPlacementViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGroupPlacementViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGroupPlacementViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGroupPlacementViewRequest.Merge(dst, src)
+func (m *GetGroupPlacementViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGroupPlacementViewRequest.Merge(m, src)
 }
 func (m *GetGroupPlacementViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGroupPlacementViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetGroupPlacementViewRequest)(nil), "google.ads.googleads.v1.services.GetGroupPlacementViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/group_placement_view_service.proto", fileDescriptor_722a806b0135cef4)
+}
+
+var fileDescriptor_722a806b0135cef4 = []byte{
+	// 375 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x4a, 0xe3, 0x40,
+	0x18, 0x27, 0x59, 0x58, 0xd8, 0xb0, 0x7b, 0x09, 0x2c, 0xec, 0x96, 0xb2, 0x94, 0x6e, 0x0f, 0xd2,
+	0xc3, 0x0c, 0x51, 0x8a, 0x30, 0x5a, 0x21, 0xed, 0x21, 0x9e, 0xa4, 0x54, 0xc8, 0x41, 0x02, 0x61,
+	0x4c, 0x3e, 0x42, 0xa0, 0xc9, 0xc4, 0x7c, 0x49, 0x7a, 0x10, 0x2f, 0x82, 0x4f, 0xe0, 0x1b, 0x78,
+	0xf4, 0x51, 0x04, 0x4f, 0xbe, 0x82, 0x27, 0x7d, 0x09, 0x49, 0xa7, 0x13, 0x28, 0x35, 0xf6, 0xf6,
+	0x63, 0xe6, 0xf7, 0xe7, 0x9b, 0xdf, 0x37, 0xc6, 0x34, 0x12, 0x22, 0x5a, 0x00, 0xe5, 0x21, 0x52,
+	0x09, 0x6b, 0x54, 0x59, 0x14, 0x21, 0xaf, 0xe2, 0x00, 0x90, 0x46, 0xb9, 0x28, 0x33, 0x3f, 0x5b,
+	0xf0, 0x00, 0x12, 0x48, 0x0b, 0xbf, 0x8a, 0x61, 0xe9, 0xaf, 0x6f, 0x49, 0x96, 0x8b, 0x42, 0x98,
+	0x3d, 0xa9, 0x24, 0x3c, 0x44, 0xd2, 0x98, 0x90, 0xca, 0x22, 0xca, 0xa4, 0x73, 0xdc, 0x16, 0x93,
+	0x03, 0x8a, 0x32, 0x6f, 0xcb, 0x91, 0xfe, 0x9d, 0xae, 0x52, 0x67, 0x31, 0xe5, 0x69, 0x2a, 0x0a,
+	0x5e, 0xc4, 0x22, 0x45, 0x79, 0xdb, 0x9f, 0x1a, 0x5d, 0x07, 0x0a, 0xa7, 0x96, 0xcf, 0x94, 0xda,
+	0x8d, 0x61, 0x39, 0x87, 0xab, 0x12, 0xb0, 0x30, 0xff, 0x1b, 0xbf, 0x54, 0x8a, 0x9f, 0xf2, 0x04,
+	0xfe, 0x68, 0x3d, 0x6d, 0xef, 0xc7, 0xfc, 0xa7, 0x3a, 0x3c, 0xe3, 0x09, 0xec, 0xbf, 0x6b, 0xc6,
+	0xdf, 0x6d, 0x8b, 0x73, 0x39, 0xbf, 0xf9, 0xac, 0x19, 0xbf, 0x3f, 0xcd, 0x30, 0x4f, 0xc8, 0xae,
+	0xb7, 0x93, 0xaf, 0x86, 0xeb, 0x8c, 0x5a, 0xf5, 0x4d, 0x33, 0x64, 0x5b, 0xdd, 0x1f, 0xdf, 0xbe,
+	0xbc, 0xde, 0xeb, 0x87, 0xe6, 0xa8, 0xee, 0xf0, 0x7a, 0xe3, 0x79, 0xe3, 0xa0, 0xc4, 0x42, 0x24,
+	0x90, 0x23, 0x1d, 0xca, 0x52, 0x37, 0xa4, 0x48, 0x87, 0x37, 0x93, 0x3b, 0xdd, 0x18, 0x04, 0x22,
+	0xd9, 0x39, 0xfb, 0xe4, 0x5f, 0x6b, 0x27, 0xb3, 0xba, 0xfb, 0x99, 0x76, 0x71, 0xba, 0xf6, 0x88,
+	0xc4, 0x82, 0xa7, 0x11, 0x11, 0x79, 0x44, 0x23, 0x48, 0x57, 0x9b, 0x51, 0x9b, 0xce, 0x62, 0x6c,
+	0xff, 0x5f, 0x47, 0x0a, 0x3c, 0xe8, 0xdf, 0x1c, 0xdb, 0x7e, 0xd4, 0x7b, 0x8e, 0x34, 0xb4, 0x43,
+	0x24, 0x12, 0xd6, 0xc8, 0xb5, 0xc8, 0x3a, 0x18, 0x9f, 0x14, 0xc5, 0xb3, 0x43, 0xf4, 0x1a, 0x8a,
+	0xe7, 0x5a, 0x9e, 0xa2, 0xbc, 0xe9, 0x03, 0x79, 0xce, 0x98, 0x1d, 0x22, 0x63, 0x0d, 0x89, 0x31,
+	0xd7, 0x62, 0x4c, 0xd1, 0x2e, 0xbf, 0xaf, 0xe6, 0x3c, 0xf8, 0x08, 0x00, 0x00, 0xff, 0xff, 0x20,
+	0x98, 0xd3, 0x44, 0x06, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _GroupPlacementViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/group_placement_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/group_placement_view_service.proto", fileDescriptor_group_placement_view_service_0ce1a68201b7e811)
-}
-
-var fileDescriptor_group_placement_view_service_0ce1a68201b7e811 = []byte{
-	// 375 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x4a, 0xe3, 0x40,
-	0x18, 0x27, 0x59, 0x58, 0xd8, 0xb0, 0x7b, 0x09, 0x2c, 0xec, 0x96, 0xb2, 0x94, 0x6e, 0x0f, 0xd2,
-	0xc3, 0x0c, 0x51, 0x8a, 0x30, 0x5a, 0x21, 0xed, 0x21, 0x9e, 0xa4, 0x54, 0xc8, 0x41, 0x02, 0x61,
-	0x4c, 0x3e, 0x42, 0xa0, 0xc9, 0xc4, 0x7c, 0x49, 0x7a, 0x10, 0x2f, 0x82, 0x4f, 0xe0, 0x1b, 0x78,
-	0xf4, 0x51, 0x04, 0x4f, 0xbe, 0x82, 0x27, 0x7d, 0x09, 0x49, 0xa7, 0x13, 0x28, 0x35, 0xf6, 0xf6,
-	0x63, 0xe6, 0xf7, 0xe7, 0x9b, 0xdf, 0x37, 0xc6, 0x34, 0x12, 0x22, 0x5a, 0x00, 0xe5, 0x21, 0x52,
-	0x09, 0x6b, 0x54, 0x59, 0x14, 0x21, 0xaf, 0xe2, 0x00, 0x90, 0x46, 0xb9, 0x28, 0x33, 0x3f, 0x5b,
-	0xf0, 0x00, 0x12, 0x48, 0x0b, 0xbf, 0x8a, 0x61, 0xe9, 0xaf, 0x6f, 0x49, 0x96, 0x8b, 0x42, 0x98,
-	0x3d, 0xa9, 0x24, 0x3c, 0x44, 0xd2, 0x98, 0x90, 0xca, 0x22, 0xca, 0xa4, 0x73, 0xdc, 0x16, 0x93,
-	0x03, 0x8a, 0x32, 0x6f, 0xcb, 0x91, 0xfe, 0x9d, 0xae, 0x52, 0x67, 0x31, 0xe5, 0x69, 0x2a, 0x0a,
-	0x5e, 0xc4, 0x22, 0x45, 0x79, 0xdb, 0x9f, 0x1a, 0x5d, 0x07, 0x0a, 0xa7, 0x96, 0xcf, 0x94, 0xda,
-	0x8d, 0x61, 0x39, 0x87, 0xab, 0x12, 0xb0, 0x30, 0xff, 0x1b, 0xbf, 0x54, 0x8a, 0x9f, 0xf2, 0x04,
-	0xfe, 0x68, 0x3d, 0x6d, 0xef, 0xc7, 0xfc, 0xa7, 0x3a, 0x3c, 0xe3, 0x09, 0xec, 0xbf, 0x6b, 0xc6,
-	0xdf, 0x6d, 0x8b, 0x73, 0x39, 0xbf, 0xf9, 0xac, 0x19, 0xbf, 0x3f, 0xcd, 0x30, 0x4f, 0xc8, 0xae,
-	0xb7, 0x93, 0xaf, 0x86, 0xeb, 0x8c, 0x5a, 0xf5, 0x4d, 0x33, 0x64, 0x5b, 0xdd, 0x1f, 0xdf, 0xbe,
-	0xbc, 0xde, 0xeb, 0x87, 0xe6, 0xa8, 0xee, 0xf0, 0x7a, 0xe3, 0x79, 0xe3, 0xa0, 0xc4, 0x42, 0x24,
-	0x90, 0x23, 0x1d, 0xca, 0x52, 0x37, 0xa4, 0x48, 0x87, 0x37, 0x93, 0x3b, 0xdd, 0x18, 0x04, 0x22,
-	0xd9, 0x39, 0xfb, 0xe4, 0x5f, 0x6b, 0x27, 0xb3, 0xba, 0xfb, 0x99, 0x76, 0x71, 0xba, 0xf6, 0x88,
-	0xc4, 0x82, 0xa7, 0x11, 0x11, 0x79, 0x44, 0x23, 0x48, 0x57, 0x9b, 0x51, 0x9b, 0xce, 0x62, 0x6c,
-	0xff, 0x5f, 0x47, 0x0a, 0x3c, 0xe8, 0xdf, 0x1c, 0xdb, 0x7e, 0xd4, 0x7b, 0x8e, 0x34, 0xb4, 0x43,
-	0x24, 0x12, 0xd6, 0xc8, 0xb5, 0xc8, 0x3a, 0x18, 0x9f, 0x14, 0xc5, 0xb3, 0x43, 0xf4, 0x1a, 0x8a,
-	0xe7, 0x5a, 0x9e, 0xa2, 0xbc, 0xe9, 0x03, 0x79, 0xce, 0x98, 0x1d, 0x22, 0x63, 0x0d, 0x89, 0x31,
-	0xd7, 0x62, 0x4c, 0xd1, 0x2e, 0xbf, 0xaf, 0xe6, 0x3c, 0xf8, 0x08, 0x00, 0x00, 0xff, 0xff, 0x20,
-	0x98, 0xd3, 0x44, 0x06, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/hotel_group_view_service.pb.go b/googleapis/ads/googleads/v1/services/hotel_group_view_service.pb.go
index ec9efd50f4..e1319bbe11 100644
--- a/googleapis/ads/googleads/v1/services/hotel_group_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/hotel_group_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/hotel_group_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [HotelGroupViewService.GetHotelGroupView][google.ads.googleads.v1.services.HotelGroupViewService.GetHotelGroupView].
 type GetHotelGroupViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetHotelGroupViewRequest) Reset()         { *m = GetHotelGroupViewReque
 func (m *GetHotelGroupViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetHotelGroupViewRequest) ProtoMessage()    {}
 func (*GetHotelGroupViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_group_view_service_1b795ba7f86fa296, []int{0}
+	return fileDescriptor_f8f91366d6320e8b, []int{0}
 }
+
 func (m *GetHotelGroupViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetHotelGroupViewRequest.Unmarshal(m, b)
 }
 func (m *GetHotelGroupViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetHotelGroupViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetHotelGroupViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetHotelGroupViewRequest.Merge(dst, src)
+func (m *GetHotelGroupViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetHotelGroupViewRequest.Merge(m, src)
 }
 func (m *GetHotelGroupViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetHotelGroupViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetHotelGroupViewRequest)(nil), "google.ads.googleads.v1.services.GetHotelGroupViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/hotel_group_view_service.proto", fileDescriptor_f8f91366d6320e8b)
+}
+
+var fileDescriptor_f8f91366d6320e8b = []byte{
+	// 371 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x4a, 0xeb, 0x40,
+	0x14, 0x86, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0xba, 0x30, 0x20, 0x94, 0xe0, 0xa2, 0xd4, 0x2e, 0xa4,
+	0x8b, 0x19, 0x62, 0x37, 0x3a, 0x22, 0x25, 0xdd, 0xa4, 0x2b, 0x29, 0x15, 0xb2, 0x90, 0x40, 0x88,
+	0xcd, 0x21, 0x06, 0x9a, 0x4c, 0xcc, 0x99, 0xa4, 0x0b, 0x71, 0xa1, 0xaf, 0xe0, 0x1b, 0xb8, 0xf4,
+	0x1d, 0x7c, 0x01, 0xb7, 0x2e, 0x7c, 0x01, 0x57, 0x3e, 0x85, 0xa4, 0xd3, 0x09, 0x14, 0x1b, 0xba,
+	0xfb, 0x99, 0xf9, 0xbf, 0x7f, 0xce, 0xf9, 0x13, 0x63, 0x14, 0x73, 0x1e, 0x2f, 0x80, 0x86, 0x11,
+	0x52, 0x29, 0x6b, 0x55, 0xd9, 0x14, 0xa1, 0xa8, 0x92, 0x39, 0x20, 0xbd, 0xe5, 0x02, 0x16, 0x41,
+	0x5c, 0xf0, 0x32, 0x0f, 0xaa, 0x04, 0x96, 0xc1, 0xfa, 0x86, 0xe4, 0x05, 0x17, 0xdc, 0xec, 0x4a,
+	0x8a, 0x84, 0x11, 0x92, 0x26, 0x80, 0x54, 0x36, 0x51, 0x01, 0xd6, 0x69, 0xdb, 0x13, 0x05, 0x20,
+	0x2f, 0x8b, 0x6d, 0x6f, 0xc8, 0x6c, 0xeb, 0x50, 0x91, 0x79, 0x42, 0xc3, 0x2c, 0xe3, 0x22, 0x14,
+	0x09, 0xcf, 0x50, 0xde, 0xf6, 0x46, 0x46, 0xc7, 0x05, 0x31, 0xa9, 0x51, 0xb7, 0x26, 0xbd, 0x04,
+	0x96, 0x33, 0xb8, 0x2b, 0x01, 0x85, 0x79, 0x64, 0xec, 0xa9, 0xf4, 0x20, 0x0b, 0x53, 0xe8, 0x68,
+	0x5d, 0xed, 0xf8, 0xdf, 0xec, 0xbf, 0x3a, 0xbc, 0x0c, 0x53, 0x38, 0xf9, 0xd4, 0x8c, 0x83, 0x4d,
+	0xfc, 0x4a, 0xce, 0x6c, 0xbe, 0x69, 0xc6, 0xfe, 0xaf, 0x6c, 0x93, 0x91, 0x5d, 0xbb, 0x92, 0xb6,
+	0x81, 0x2c, 0xbb, 0x95, 0x6d, 0x5a, 0x20, 0x9b, 0x64, 0xef, 0xec, 0xe9, 0xe3, 0xeb, 0x59, 0x1f,
+	0x9a, 0x76, 0xdd, 0xd5, 0xfd, 0xc6, 0x3a, 0x17, 0xf3, 0x12, 0x05, 0x4f, 0xa1, 0x40, 0x3a, 0x90,
+	0xe5, 0x35, 0x18, 0xd2, 0xc1, 0xc3, 0xf8, 0x51, 0x37, 0xfa, 0x73, 0x9e, 0xee, 0x9c, 0x77, 0x6c,
+	0x6d, 0xdd, 0x7f, 0x5a, 0xf7, 0x3b, 0xd5, 0xae, 0x27, 0x6b, 0x3e, 0xe6, 0x8b, 0x30, 0x8b, 0x09,
+	0x2f, 0x62, 0x1a, 0x43, 0xb6, 0x6a, 0x5f, 0x7d, 0xc9, 0x3c, 0xc1, 0xf6, 0x7f, 0xe7, 0x5c, 0x89,
+	0x17, 0xfd, 0x8f, 0xeb, 0x38, 0xaf, 0x7a, 0xd7, 0x95, 0x81, 0x4e, 0x84, 0x44, 0xca, 0x5a, 0x79,
+	0x36, 0x59, 0x3f, 0x8c, 0xef, 0xca, 0xe2, 0x3b, 0x11, 0xfa, 0x8d, 0xc5, 0xf7, 0x6c, 0x5f, 0x59,
+	0xbe, 0xf5, 0xbe, 0x3c, 0x67, 0xcc, 0x89, 0x90, 0xb1, 0xc6, 0xc4, 0x98, 0x67, 0x33, 0xa6, 0x6c,
+	0x37, 0x7f, 0x57, 0x73, 0x0e, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x34, 0xd6, 0x3e, 0x66, 0xe2,
+	0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _HotelGroupViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/hotel_group_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/hotel_group_view_service.proto", fileDescriptor_hotel_group_view_service_1b795ba7f86fa296)
-}
-
-var fileDescriptor_hotel_group_view_service_1b795ba7f86fa296 = []byte{
-	// 371 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x4a, 0xeb, 0x40,
-	0x14, 0x86, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0xba, 0x30, 0x20, 0x94, 0xe0, 0xa2, 0xd4, 0x2e, 0xa4,
-	0x8b, 0x19, 0x62, 0x37, 0x3a, 0x22, 0x25, 0xdd, 0xa4, 0x2b, 0x29, 0x15, 0xb2, 0x90, 0x40, 0x88,
-	0xcd, 0x21, 0x06, 0x9a, 0x4c, 0xcc, 0x99, 0xa4, 0x0b, 0x71, 0xa1, 0xaf, 0xe0, 0x1b, 0xb8, 0xf4,
-	0x1d, 0x7c, 0x01, 0xb7, 0x2e, 0x7c, 0x01, 0x57, 0x3e, 0x85, 0xa4, 0xd3, 0x09, 0x14, 0x1b, 0xba,
-	0xfb, 0x99, 0xf9, 0xbf, 0x7f, 0xce, 0xf9, 0x13, 0x63, 0x14, 0x73, 0x1e, 0x2f, 0x80, 0x86, 0x11,
-	0x52, 0x29, 0x6b, 0x55, 0xd9, 0x14, 0xa1, 0xa8, 0x92, 0x39, 0x20, 0xbd, 0xe5, 0x02, 0x16, 0x41,
-	0x5c, 0xf0, 0x32, 0x0f, 0xaa, 0x04, 0x96, 0xc1, 0xfa, 0x86, 0xe4, 0x05, 0x17, 0xdc, 0xec, 0x4a,
-	0x8a, 0x84, 0x11, 0x92, 0x26, 0x80, 0x54, 0x36, 0x51, 0x01, 0xd6, 0x69, 0xdb, 0x13, 0x05, 0x20,
-	0x2f, 0x8b, 0x6d, 0x6f, 0xc8, 0x6c, 0xeb, 0x50, 0x91, 0x79, 0x42, 0xc3, 0x2c, 0xe3, 0x22, 0x14,
-	0x09, 0xcf, 0x50, 0xde, 0xf6, 0x46, 0x46, 0xc7, 0x05, 0x31, 0xa9, 0x51, 0xb7, 0x26, 0xbd, 0x04,
-	0x96, 0x33, 0xb8, 0x2b, 0x01, 0x85, 0x79, 0x64, 0xec, 0xa9, 0xf4, 0x20, 0x0b, 0x53, 0xe8, 0x68,
-	0x5d, 0xed, 0xf8, 0xdf, 0xec, 0xbf, 0x3a, 0xbc, 0x0c, 0x53, 0x38, 0xf9, 0xd4, 0x8c, 0x83, 0x4d,
-	0xfc, 0x4a, 0xce, 0x6c, 0xbe, 0x69, 0xc6, 0xfe, 0xaf, 0x6c, 0x93, 0x91, 0x5d, 0xbb, 0x92, 0xb6,
-	0x81, 0x2c, 0xbb, 0x95, 0x6d, 0x5a, 0x20, 0x9b, 0x64, 0xef, 0xec, 0xe9, 0xe3, 0xeb, 0x59, 0x1f,
-	0x9a, 0x76, 0xdd, 0xd5, 0xfd, 0xc6, 0x3a, 0x17, 0xf3, 0x12, 0x05, 0x4f, 0xa1, 0x40, 0x3a, 0x90,
-	0xe5, 0x35, 0x18, 0xd2, 0xc1, 0xc3, 0xf8, 0x51, 0x37, 0xfa, 0x73, 0x9e, 0xee, 0x9c, 0x77, 0x6c,
-	0x6d, 0xdd, 0x7f, 0x5a, 0xf7, 0x3b, 0xd5, 0xae, 0x27, 0x6b, 0x3e, 0xe6, 0x8b, 0x30, 0x8b, 0x09,
-	0x2f, 0x62, 0x1a, 0x43, 0xb6, 0x6a, 0x5f, 0x7d, 0xc9, 0x3c, 0xc1, 0xf6, 0x7f, 0xe7, 0x5c, 0x89,
-	0x17, 0xfd, 0x8f, 0xeb, 0x38, 0xaf, 0x7a, 0xd7, 0x95, 0x81, 0x4e, 0x84, 0x44, 0xca, 0x5a, 0x79,
-	0x36, 0x59, 0x3f, 0x8c, 0xef, 0xca, 0xe2, 0x3b, 0x11, 0xfa, 0x8d, 0xc5, 0xf7, 0x6c, 0x5f, 0x59,
-	0xbe, 0xf5, 0xbe, 0x3c, 0x67, 0xcc, 0x89, 0x90, 0xb1, 0xc6, 0xc4, 0x98, 0x67, 0x33, 0xa6, 0x6c,
-	0x37, 0x7f, 0x57, 0x73, 0x0e, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x34, 0xd6, 0x3e, 0x66, 0xe2,
-	0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/hotel_performance_view_service.pb.go b/googleapis/ads/googleads/v1/services/hotel_performance_view_service.pb.go
index 0915d8ae68..54bbfeaca5 100644
--- a/googleapis/ads/googleads/v1/services/hotel_performance_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/hotel_performance_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/hotel_performance_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [HotelPerformanceViewService.GetHotelPerformanceView][google.ads.googleads.v1.services.HotelPerformanceViewService.GetHotelPerformanceView].
 type GetHotelPerformanceViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetHotelPerformanceViewRequest) Reset()         { *m = GetHotelPerforma
 func (m *GetHotelPerformanceViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetHotelPerformanceViewRequest) ProtoMessage()    {}
 func (*GetHotelPerformanceViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_hotel_performance_view_service_31c85b21d7ab4aff, []int{0}
+	return fileDescriptor_a979e4cfb7098343, []int{0}
 }
+
 func (m *GetHotelPerformanceViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetHotelPerformanceViewRequest.Unmarshal(m, b)
 }
 func (m *GetHotelPerformanceViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetHotelPerformanceViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetHotelPerformanceViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetHotelPerformanceViewRequest.Merge(dst, src)
+func (m *GetHotelPerformanceViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetHotelPerformanceViewRequest.Merge(m, src)
 }
 func (m *GetHotelPerformanceViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetHotelPerformanceViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetHotelPerformanceViewRequest)(nil), "google.ads.googleads.v1.services.GetHotelPerformanceViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/hotel_performance_view_service.proto", fileDescriptor_a979e4cfb7098343)
+}
+
+var fileDescriptor_a979e4cfb7098343 = []byte{
+	// 374 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcd, 0x4a, 0xf3, 0x40,
+	0x14, 0x25, 0xf9, 0xe0, 0x03, 0x83, 0x6e, 0xb2, 0x51, 0xaa, 0x48, 0xa8, 0x5d, 0x88, 0x8b, 0x09,
+	0x51, 0x51, 0x18, 0x7f, 0x30, 0x85, 0xd2, 0xae, 0xa4, 0x54, 0xc8, 0x42, 0x02, 0x61, 0x4c, 0xae,
+	0x31, 0xd0, 0x64, 0xe2, 0xcc, 0x34, 0x5d, 0x88, 0x1b, 0x37, 0x3e, 0x80, 0x6f, 0xe0, 0xd2, 0x47,
+	0x71, 0xa9, 0xaf, 0xe0, 0xca, 0xa5, 0x4f, 0x20, 0xe9, 0x74, 0x22, 0x4a, 0xd3, 0xee, 0x0e, 0x33,
+	0xe7, 0xe7, 0xce, 0xb9, 0x63, 0x74, 0x62, 0x4a, 0xe3, 0x21, 0xd8, 0x24, 0xe2, 0xb6, 0x84, 0x25,
+	0x2a, 0x1c, 0x9b, 0x03, 0x2b, 0x92, 0x10, 0xb8, 0x7d, 0x43, 0x05, 0x0c, 0x83, 0x1c, 0xd8, 0x35,
+	0x65, 0x29, 0xc9, 0x42, 0x08, 0x8a, 0x04, 0xc6, 0xc1, 0xf4, 0x1e, 0xe5, 0x8c, 0x0a, 0x6a, 0x5a,
+	0x52, 0x8b, 0x48, 0xc4, 0x51, 0x65, 0x83, 0x0a, 0x07, 0x29, 0x9b, 0xc6, 0x69, 0x5d, 0x10, 0x03,
+	0x4e, 0x47, 0xac, 0x3e, 0x49, 0x26, 0x34, 0x36, 0x94, 0x3e, 0x4f, 0x6c, 0x92, 0x65, 0x54, 0x10,
+	0x91, 0xd0, 0x8c, 0xcb, 0xdb, 0x66, 0xc7, 0xd8, 0xec, 0x82, 0xe8, 0x95, 0x06, 0xfd, 0x1f, 0xbd,
+	0x97, 0xc0, 0x78, 0x00, 0xb7, 0x23, 0xe0, 0xc2, 0xdc, 0x32, 0x56, 0x54, 0x52, 0x90, 0x91, 0x14,
+	0xd6, 0x34, 0x4b, 0xdb, 0x5e, 0x1a, 0x2c, 0xab, 0xc3, 0x73, 0x92, 0xc2, 0xee, 0x97, 0x66, 0xac,
+	0xcf, 0x32, 0xb9, 0x90, 0xaf, 0x30, 0xdf, 0x34, 0x63, 0xb5, 0x26, 0xc7, 0x3c, 0x43, 0x8b, 0x3a,
+	0x40, 0xf3, 0x47, 0x6c, 0x1c, 0xd6, 0x3a, 0x54, 0x1d, 0xa1, 0x59, 0xfa, 0xe6, 0xf1, 0xc3, 0xfb,
+	0xc7, 0x93, 0x7e, 0x60, 0xee, 0x97, 0x7d, 0xde, 0xfd, 0x7a, 0xe6, 0x49, 0x38, 0xe2, 0x82, 0xa6,
+	0xc0, 0xb8, 0xbd, 0x23, 0x0b, 0xfe, 0x23, 0xbe, 0x6f, 0x3f, 0xea, 0x46, 0x2b, 0xa4, 0xe9, 0xc2,
+	0xf1, 0xdb, 0xd6, 0x9c, 0x6a, 0xfa, 0xe5, 0x1a, 0xfa, 0xda, 0x65, 0x6f, 0xea, 0x12, 0xd3, 0x21,
+	0xc9, 0x62, 0x44, 0x59, 0x6c, 0xc7, 0x90, 0x4d, 0x96, 0xa4, 0xd6, 0x9e, 0x27, 0xbc, 0xfe, 0xbb,
+	0x1d, 0x29, 0xf0, 0xac, 0xff, 0xeb, 0xba, 0xee, 0x8b, 0x6e, 0x75, 0xa5, 0xa1, 0x1b, 0x71, 0x24,
+	0x61, 0x89, 0x3c, 0x07, 0x4d, 0x83, 0xf9, 0xab, 0xa2, 0xf8, 0x6e, 0xc4, 0xfd, 0x8a, 0xe2, 0x7b,
+	0x8e, 0xaf, 0x28, 0x9f, 0x7a, 0x4b, 0x9e, 0x63, 0xec, 0x46, 0x1c, 0xe3, 0x8a, 0x84, 0xb1, 0xe7,
+	0x60, 0xac, 0x68, 0x57, 0xff, 0x27, 0x73, 0xee, 0x7d, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x4e,
+	0xc0, 0xba, 0x15, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _HotelPerformanceViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/hotel_performance_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/hotel_performance_view_service.proto", fileDescriptor_hotel_performance_view_service_31c85b21d7ab4aff)
-}
-
-var fileDescriptor_hotel_performance_view_service_31c85b21d7ab4aff = []byte{
-	// 374 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcd, 0x4a, 0xf3, 0x40,
-	0x14, 0x25, 0xf9, 0xe0, 0x03, 0x83, 0x6e, 0xb2, 0x51, 0xaa, 0x48, 0xa8, 0x5d, 0x88, 0x8b, 0x09,
-	0x51, 0x51, 0x18, 0x7f, 0x30, 0x85, 0xd2, 0xae, 0xa4, 0x54, 0xc8, 0x42, 0x02, 0x61, 0x4c, 0xae,
-	0x31, 0xd0, 0x64, 0xe2, 0xcc, 0x34, 0x5d, 0x88, 0x1b, 0x37, 0x3e, 0x80, 0x6f, 0xe0, 0xd2, 0x47,
-	0x71, 0xa9, 0xaf, 0xe0, 0xca, 0xa5, 0x4f, 0x20, 0xe9, 0x74, 0x22, 0x4a, 0xd3, 0xee, 0x0e, 0x33,
-	0xe7, 0xe7, 0xce, 0xb9, 0x63, 0x74, 0x62, 0x4a, 0xe3, 0x21, 0xd8, 0x24, 0xe2, 0xb6, 0x84, 0x25,
-	0x2a, 0x1c, 0x9b, 0x03, 0x2b, 0x92, 0x10, 0xb8, 0x7d, 0x43, 0x05, 0x0c, 0x83, 0x1c, 0xd8, 0x35,
-	0x65, 0x29, 0xc9, 0x42, 0x08, 0x8a, 0x04, 0xc6, 0xc1, 0xf4, 0x1e, 0xe5, 0x8c, 0x0a, 0x6a, 0x5a,
-	0x52, 0x8b, 0x48, 0xc4, 0x51, 0x65, 0x83, 0x0a, 0x07, 0x29, 0x9b, 0xc6, 0x69, 0x5d, 0x10, 0x03,
-	0x4e, 0x47, 0xac, 0x3e, 0x49, 0x26, 0x34, 0x36, 0x94, 0x3e, 0x4f, 0x6c, 0x92, 0x65, 0x54, 0x10,
-	0x91, 0xd0, 0x8c, 0xcb, 0xdb, 0x66, 0xc7, 0xd8, 0xec, 0x82, 0xe8, 0x95, 0x06, 0xfd, 0x1f, 0xbd,
-	0x97, 0xc0, 0x78, 0x00, 0xb7, 0x23, 0xe0, 0xc2, 0xdc, 0x32, 0x56, 0x54, 0x52, 0x90, 0x91, 0x14,
-	0xd6, 0x34, 0x4b, 0xdb, 0x5e, 0x1a, 0x2c, 0xab, 0xc3, 0x73, 0x92, 0xc2, 0xee, 0x97, 0x66, 0xac,
-	0xcf, 0x32, 0xb9, 0x90, 0xaf, 0x30, 0xdf, 0x34, 0x63, 0xb5, 0x26, 0xc7, 0x3c, 0x43, 0x8b, 0x3a,
-	0x40, 0xf3, 0x47, 0x6c, 0x1c, 0xd6, 0x3a, 0x54, 0x1d, 0xa1, 0x59, 0xfa, 0xe6, 0xf1, 0xc3, 0xfb,
-	0xc7, 0x93, 0x7e, 0x60, 0xee, 0x97, 0x7d, 0xde, 0xfd, 0x7a, 0xe6, 0x49, 0x38, 0xe2, 0x82, 0xa6,
-	0xc0, 0xb8, 0xbd, 0x23, 0x0b, 0xfe, 0x23, 0xbe, 0x6f, 0x3f, 0xea, 0x46, 0x2b, 0xa4, 0xe9, 0xc2,
-	0xf1, 0xdb, 0xd6, 0x9c, 0x6a, 0xfa, 0xe5, 0x1a, 0xfa, 0xda, 0x65, 0x6f, 0xea, 0x12, 0xd3, 0x21,
-	0xc9, 0x62, 0x44, 0x59, 0x6c, 0xc7, 0x90, 0x4d, 0x96, 0xa4, 0xd6, 0x9e, 0x27, 0xbc, 0xfe, 0xbb,
-	0x1d, 0x29, 0xf0, 0xac, 0xff, 0xeb, 0xba, 0xee, 0x8b, 0x6e, 0x75, 0xa5, 0xa1, 0x1b, 0x71, 0x24,
-	0x61, 0x89, 0x3c, 0x07, 0x4d, 0x83, 0xf9, 0xab, 0xa2, 0xf8, 0x6e, 0xc4, 0xfd, 0x8a, 0xe2, 0x7b,
-	0x8e, 0xaf, 0x28, 0x9f, 0x7a, 0x4b, 0x9e, 0x63, 0xec, 0x46, 0x1c, 0xe3, 0x8a, 0x84, 0xb1, 0xe7,
-	0x60, 0xac, 0x68, 0x57, 0xff, 0x27, 0x73, 0xee, 0x7d, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x4e,
-	0xc0, 0xba, 0x15, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/keyword_plan_ad_group_service.pb.go b/googleapis/ads/googleads/v1/services/keyword_plan_ad_group_service.pb.go
index 51cc63ac51..fbc4c6b599 100644
--- a/googleapis/ads/googleads/v1/services/keyword_plan_ad_group_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/keyword_plan_ad_group_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/keyword_plan_ad_group_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [KeywordPlanAdGroupService.GetKeywordPlanAdGroup][google.ads.googleads.v1.services.KeywordPlanAdGroupService.GetKeywordPlanAdGroup].
 type GetKeywordPlanAdGroupRequest struct {
@@ -41,16 +41,17 @@ func (m *GetKeywordPlanAdGroupRequest) Reset()         { *m = GetKeywordPlanAdGr
 func (m *GetKeywordPlanAdGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKeywordPlanAdGroupRequest) ProtoMessage()    {}
 func (*GetKeywordPlanAdGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_service_b366b1d5e0114e4e, []int{0}
+	return fileDescriptor_ccc3a69fa60910db, []int{0}
 }
+
 func (m *GetKeywordPlanAdGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKeywordPlanAdGroupRequest.Unmarshal(m, b)
 }
 func (m *GetKeywordPlanAdGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKeywordPlanAdGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKeywordPlanAdGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKeywordPlanAdGroupRequest.Merge(dst, src)
+func (m *GetKeywordPlanAdGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeywordPlanAdGroupRequest.Merge(m, src)
 }
 func (m *GetKeywordPlanAdGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKeywordPlanAdGroupRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateKeywordPlanAdGroupsRequest) Reset()         { *m = MutateKeywordP
 func (m *MutateKeywordPlanAdGroupsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanAdGroupsRequest) ProtoMessage()    {}
 func (*MutateKeywordPlanAdGroupsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_service_b366b1d5e0114e4e, []int{1}
+	return fileDescriptor_ccc3a69fa60910db, []int{1}
 }
+
 func (m *MutateKeywordPlanAdGroupsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupsRequest.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanAdGroupsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanAdGroupsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanAdGroupsRequest.Merge(dst, src)
+func (m *MutateKeywordPlanAdGroupsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanAdGroupsRequest.Merge(m, src)
 }
 func (m *MutateKeywordPlanAdGroupsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupsRequest.Size(m)
@@ -160,16 +162,17 @@ func (m *KeywordPlanAdGroupOperation) Reset()         { *m = KeywordPlanAdGroupO
 func (m *KeywordPlanAdGroupOperation) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanAdGroupOperation) ProtoMessage()    {}
 func (*KeywordPlanAdGroupOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_service_b366b1d5e0114e4e, []int{2}
+	return fileDescriptor_ccc3a69fa60910db, []int{2}
 }
+
 func (m *KeywordPlanAdGroupOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanAdGroupOperation.Unmarshal(m, b)
 }
 func (m *KeywordPlanAdGroupOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanAdGroupOperation.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanAdGroupOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanAdGroupOperation.Merge(dst, src)
+func (m *KeywordPlanAdGroupOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanAdGroupOperation.Merge(m, src)
 }
 func (m *KeywordPlanAdGroupOperation) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanAdGroupOperation.Size(m)
@@ -237,95 +240,15 @@ func (m *KeywordPlanAdGroupOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*KeywordPlanAdGroupOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _KeywordPlanAdGroupOperation_OneofMarshaler, _KeywordPlanAdGroupOperation_OneofUnmarshaler, _KeywordPlanAdGroupOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*KeywordPlanAdGroupOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*KeywordPlanAdGroupOperation_Create)(nil),
 		(*KeywordPlanAdGroupOperation_Update)(nil),
 		(*KeywordPlanAdGroupOperation_Remove)(nil),
 	}
 }
 
-func _KeywordPlanAdGroupOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*KeywordPlanAdGroupOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanAdGroupOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *KeywordPlanAdGroupOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *KeywordPlanAdGroupOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("KeywordPlanAdGroupOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _KeywordPlanAdGroupOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*KeywordPlanAdGroupOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanAdGroup)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanAdGroupOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanAdGroup)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanAdGroupOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &KeywordPlanAdGroupOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _KeywordPlanAdGroupOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*KeywordPlanAdGroupOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanAdGroupOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanAdGroupOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanAdGroupOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a Keyword Plan ad group mutate.
 type MutateKeywordPlanAdGroupsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -344,16 +267,17 @@ func (m *MutateKeywordPlanAdGroupsResponse) Reset()         { *m = MutateKeyword
 func (m *MutateKeywordPlanAdGroupsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanAdGroupsResponse) ProtoMessage()    {}
 func (*MutateKeywordPlanAdGroupsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_service_b366b1d5e0114e4e, []int{3}
+	return fileDescriptor_ccc3a69fa60910db, []int{3}
 }
+
 func (m *MutateKeywordPlanAdGroupsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupsResponse.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanAdGroupsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanAdGroupsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanAdGroupsResponse.Merge(dst, src)
+func (m *MutateKeywordPlanAdGroupsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanAdGroupsResponse.Merge(m, src)
 }
 func (m *MutateKeywordPlanAdGroupsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupsResponse.Size(m)
@@ -391,16 +315,17 @@ func (m *MutateKeywordPlanAdGroupResult) Reset()         { *m = MutateKeywordPla
 func (m *MutateKeywordPlanAdGroupResult) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanAdGroupResult) ProtoMessage()    {}
 func (*MutateKeywordPlanAdGroupResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_ad_group_service_b366b1d5e0114e4e, []int{4}
+	return fileDescriptor_ccc3a69fa60910db, []int{4}
 }
+
 func (m *MutateKeywordPlanAdGroupResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupResult.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanAdGroupResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanAdGroupResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanAdGroupResult.Merge(dst, src)
+func (m *MutateKeywordPlanAdGroupResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanAdGroupResult.Merge(m, src)
 }
 func (m *MutateKeywordPlanAdGroupResult) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanAdGroupResult.Size(m)
@@ -426,6 +351,60 @@ func init() {
 	proto.RegisterType((*MutateKeywordPlanAdGroupResult)(nil), "google.ads.googleads.v1.services.MutateKeywordPlanAdGroupResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_ad_group_service.proto", fileDescriptor_ccc3a69fa60910db)
+}
+
+var fileDescriptor_ccc3a69fa60910db = []byte{
+	// 730 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xdd, 0x6a, 0xd4, 0x4e,
+	0x14, 0xc0, 0xff, 0xc9, 0xfe, 0xa9, 0x76, 0xb6, 0x2a, 0x8c, 0x14, 0xb7, 0x6b, 0xa9, 0x6b, 0x2c,
+	0x58, 0xf6, 0x22, 0x61, 0x57, 0x8a, 0x92, 0xb2, 0xe2, 0x6e, 0x6d, 0xb7, 0x22, 0xb5, 0x25, 0x85,
+	0x5e, 0x94, 0x95, 0x30, 0xdd, 0x4c, 0x43, 0x68, 0x92, 0x89, 0x33, 0x93, 0x2d, 0xa5, 0xf4, 0x46,
+	0xf0, 0x09, 0x7c, 0x03, 0xbd, 0xf3, 0x45, 0x04, 0xc1, 0x2b, 0x2f, 0x7c, 0x01, 0x6f, 0xf4, 0xca,
+	0x47, 0x90, 0xc9, 0x64, 0xd6, 0x7e, 0x65, 0x57, 0xda, 0xbb, 0x93, 0x33, 0x27, 0xbf, 0xf3, 0x39,
+	0x67, 0xc0, 0x73, 0x9f, 0x10, 0x3f, 0xc4, 0x16, 0xf2, 0x98, 0x25, 0x45, 0x21, 0x0d, 0x1a, 0x16,
+	0xc3, 0x74, 0x10, 0xf4, 0x31, 0xb3, 0xf6, 0xf1, 0xe1, 0x01, 0xa1, 0x9e, 0x9b, 0x84, 0x28, 0x76,
+	0x91, 0xe7, 0xfa, 0x94, 0xa4, 0x89, 0x9b, 0x1f, 0x9b, 0x09, 0x25, 0x9c, 0xc0, 0x9a, 0xfc, 0xd5,
+	0x44, 0x1e, 0x33, 0x87, 0x14, 0x73, 0xd0, 0x30, 0x15, 0xa5, 0xda, 0x2a, 0xf2, 0x43, 0x31, 0x23,
+	0x29, 0x2d, 0x74, 0x24, 0x1d, 0x54, 0x67, 0xd5, 0xef, 0x49, 0x60, 0xa1, 0x38, 0x26, 0x1c, 0xf1,
+	0x80, 0xc4, 0x2c, 0x3f, 0xcd, 0xdd, 0x5b, 0xd9, 0xd7, 0x6e, 0xba, 0x67, 0xed, 0x05, 0x38, 0xf4,
+	0xdc, 0x08, 0xb1, 0xfd, 0xdc, 0x62, 0xee, 0xac, 0xc5, 0x01, 0x45, 0x49, 0x82, 0xa9, 0x22, 0xdc,
+	0xc9, 0xcf, 0x69, 0xd2, 0xb7, 0x18, 0x47, 0x3c, 0xcd, 0x0f, 0x8c, 0x65, 0x30, 0xdb, 0xc5, 0xfc,
+	0xa5, 0x0c, 0x6d, 0x33, 0x44, 0x71, 0xdb, 0xeb, 0x8a, 0xb8, 0x1c, 0xfc, 0x26, 0xc5, 0x8c, 0xc3,
+	0x07, 0xe0, 0x86, 0xca, 0xc0, 0x8d, 0x51, 0x84, 0x2b, 0x5a, 0x4d, 0x5b, 0x98, 0x74, 0xa6, 0x94,
+	0xf2, 0x15, 0x8a, 0xb0, 0xf1, 0x5b, 0x03, 0xb5, 0xf5, 0x94, 0x23, 0x8e, 0xcf, 0x83, 0x98, 0x22,
+	0xdd, 0x03, 0xe5, 0x7e, 0xca, 0x38, 0x89, 0x30, 0x75, 0x03, 0x2f, 0xe7, 0x00, 0xa5, 0x7a, 0xe1,
+	0xc1, 0xd7, 0x00, 0x90, 0x04, 0x53, 0x99, 0x79, 0x45, 0xaf, 0x95, 0x16, 0xca, 0xcd, 0x96, 0x39,
+	0xae, 0xf2, 0xe6, 0x79, 0x97, 0x1b, 0x8a, 0xe2, 0x9c, 0x00, 0xc2, 0x87, 0xe0, 0x56, 0x82, 0x28,
+	0x0f, 0x50, 0xe8, 0xee, 0xa1, 0x20, 0x4c, 0x29, 0xae, 0x94, 0x6a, 0xda, 0xc2, 0x75, 0xe7, 0x66,
+	0xae, 0x5e, 0x95, 0x5a, 0x91, 0xf2, 0x00, 0x85, 0x81, 0x87, 0x38, 0x76, 0x49, 0x1c, 0x1e, 0x56,
+	0xfe, 0xcf, 0xcc, 0xa6, 0x94, 0x72, 0x23, 0x0e, 0x0f, 0x8d, 0x8f, 0x3a, 0xb8, 0x3b, 0xc2, 0x33,
+	0x5c, 0x02, 0xe5, 0x34, 0xc9, 0x10, 0xa2, 0x4b, 0x19, 0xa2, 0xdc, 0xac, 0xaa, 0x6c, 0x54, 0x9b,
+	0xcc, 0x55, 0xd1, 0xc8, 0x75, 0xc4, 0xf6, 0x1d, 0x20, 0xcd, 0x85, 0x0c, 0x37, 0xc0, 0x44, 0x9f,
+	0x62, 0xc4, 0x65, 0xb5, 0xcb, 0xcd, 0xc5, 0xc2, 0x2a, 0x0c, 0xa7, 0xeb, 0x82, 0x32, 0xac, 0xfd,
+	0xe7, 0xe4, 0x18, 0x01, 0x94, 0xf8, 0x8a, 0x7e, 0x45, 0xa0, 0xc4, 0xc0, 0x0a, 0x98, 0xa0, 0x38,
+	0x22, 0x03, 0x59, 0xc3, 0x49, 0x71, 0x22, 0xbf, 0x3b, 0x65, 0x30, 0x39, 0x2c, 0xba, 0xf1, 0x59,
+	0x03, 0xf7, 0x47, 0x0c, 0x06, 0x4b, 0x48, 0xcc, 0x30, 0x5c, 0x05, 0xd3, 0x67, 0x3a, 0xe3, 0x62,
+	0x4a, 0x09, 0xcd, 0xd8, 0xe5, 0x26, 0x54, 0xc1, 0xd2, 0xa4, 0x6f, 0x6e, 0x65, 0xc3, 0xeb, 0xdc,
+	0x3e, 0xdd, 0xb3, 0x15, 0x61, 0x0e, 0x77, 0xc0, 0x35, 0x8a, 0x59, 0x1a, 0x72, 0x35, 0x3d, 0xcf,
+	0xc6, 0x4f, 0x4f, 0x51, 0x74, 0x4e, 0x06, 0x72, 0x14, 0xd0, 0x58, 0x01, 0x73, 0xa3, 0x4d, 0xff,
+	0xe9, 0xa6, 0x34, 0xbf, 0x97, 0xc0, 0xcc, 0x79, 0xc2, 0x96, 0x8c, 0x06, 0x7e, 0xd5, 0xc0, 0xf4,
+	0x85, 0xb7, 0x11, 0x3e, 0x1d, 0x9f, 0xc9, 0xa8, 0x6b, 0x5c, 0xbd, 0x5c, 0xc3, 0x8d, 0xd6, 0xdb,
+	0x6f, 0x3f, 0xde, 0xeb, 0x8f, 0xe1, 0xa2, 0xd8, 0x64, 0x47, 0xa7, 0xd2, 0x6b, 0xa9, 0x9b, 0xcb,
+	0xac, 0xba, 0x5a, 0x6d, 0x27, 0xbb, 0x6b, 0xd5, 0x8f, 0xe1, 0x4f, 0x0d, 0xcc, 0x14, 0xb6, 0x1f,
+	0x76, 0x2e, 0xdf, 0x1d, 0xb5, 0x54, 0xaa, 0xcb, 0x57, 0x62, 0xc8, 0xf9, 0x33, 0x96, 0xb3, 0x2c,
+	0x5b, 0xc6, 0x13, 0x91, 0xe5, 0xdf, 0xb4, 0x8e, 0x4e, 0xac, 0xab, 0x56, 0xfd, 0xf8, 0xa2, 0x24,
+	0xed, 0x28, 0x83, 0xdb, 0x5a, 0xbd, 0xf3, 0x4e, 0x07, 0xf3, 0x7d, 0x12, 0x8d, 0x8d, 0xa7, 0x33,
+	0x57, 0xd8, 0xff, 0x4d, 0xb1, 0x15, 0x36, 0xb5, 0x9d, 0xb5, 0x9c, 0xe1, 0x93, 0x10, 0xc5, 0xbe,
+	0x49, 0xa8, 0x6f, 0xf9, 0x38, 0xce, 0x76, 0x86, 0x7a, 0x5b, 0x92, 0x80, 0x15, 0x3f, 0x69, 0x4b,
+	0x4a, 0xf8, 0xa0, 0x97, 0xba, 0xed, 0xf6, 0x27, 0xbd, 0xd6, 0x95, 0xc0, 0xb6, 0xc7, 0x4c, 0x29,
+	0x0a, 0x69, 0xbb, 0x61, 0xe6, 0x8e, 0xd9, 0x17, 0x65, 0xd2, 0x6b, 0x7b, 0xac, 0x37, 0x34, 0xe9,
+	0x6d, 0x37, 0x7a, 0xca, 0xe4, 0x97, 0x3e, 0x2f, 0xf5, 0xb6, 0xdd, 0xf6, 0x98, 0x6d, 0x0f, 0x8d,
+	0x6c, 0x7b, 0xbb, 0x61, 0xdb, 0xca, 0x6c, 0x77, 0x22, 0x8b, 0xf3, 0xd1, 0x9f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xc6, 0x4d, 0x17, 0xa6, 0x79, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -536,57 +515,3 @@ var _KeywordPlanAdGroupService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/keyword_plan_ad_group_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_ad_group_service.proto", fileDescriptor_keyword_plan_ad_group_service_b366b1d5e0114e4e)
-}
-
-var fileDescriptor_keyword_plan_ad_group_service_b366b1d5e0114e4e = []byte{
-	// 730 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xdd, 0x6a, 0xd4, 0x4e,
-	0x14, 0xc0, 0xff, 0xc9, 0xfe, 0xa9, 0x76, 0xb6, 0x2a, 0x8c, 0x14, 0xb7, 0x6b, 0xa9, 0x6b, 0x2c,
-	0x58, 0xf6, 0x22, 0x61, 0x57, 0x8a, 0x92, 0xb2, 0xe2, 0x6e, 0x6d, 0xb7, 0x22, 0xb5, 0x25, 0x85,
-	0x5e, 0x94, 0x95, 0x30, 0xdd, 0x4c, 0x43, 0x68, 0x92, 0x89, 0x33, 0x93, 0x2d, 0xa5, 0xf4, 0x46,
-	0xf0, 0x09, 0x7c, 0x03, 0xbd, 0xf3, 0x45, 0x04, 0xc1, 0x2b, 0x2f, 0x7c, 0x01, 0x6f, 0xf4, 0xca,
-	0x47, 0x90, 0xc9, 0x64, 0xd6, 0x7e, 0x65, 0x57, 0xda, 0xbb, 0x93, 0x33, 0x27, 0xbf, 0xf3, 0x39,
-	0x67, 0xc0, 0x73, 0x9f, 0x10, 0x3f, 0xc4, 0x16, 0xf2, 0x98, 0x25, 0x45, 0x21, 0x0d, 0x1a, 0x16,
-	0xc3, 0x74, 0x10, 0xf4, 0x31, 0xb3, 0xf6, 0xf1, 0xe1, 0x01, 0xa1, 0x9e, 0x9b, 0x84, 0x28, 0x76,
-	0x91, 0xe7, 0xfa, 0x94, 0xa4, 0x89, 0x9b, 0x1f, 0x9b, 0x09, 0x25, 0x9c, 0xc0, 0x9a, 0xfc, 0xd5,
-	0x44, 0x1e, 0x33, 0x87, 0x14, 0x73, 0xd0, 0x30, 0x15, 0xa5, 0xda, 0x2a, 0xf2, 0x43, 0x31, 0x23,
-	0x29, 0x2d, 0x74, 0x24, 0x1d, 0x54, 0x67, 0xd5, 0xef, 0x49, 0x60, 0xa1, 0x38, 0x26, 0x1c, 0xf1,
-	0x80, 0xc4, 0x2c, 0x3f, 0xcd, 0xdd, 0x5b, 0xd9, 0xd7, 0x6e, 0xba, 0x67, 0xed, 0x05, 0x38, 0xf4,
-	0xdc, 0x08, 0xb1, 0xfd, 0xdc, 0x62, 0xee, 0xac, 0xc5, 0x01, 0x45, 0x49, 0x82, 0xa9, 0x22, 0xdc,
-	0xc9, 0xcf, 0x69, 0xd2, 0xb7, 0x18, 0x47, 0x3c, 0xcd, 0x0f, 0x8c, 0x65, 0x30, 0xdb, 0xc5, 0xfc,
-	0xa5, 0x0c, 0x6d, 0x33, 0x44, 0x71, 0xdb, 0xeb, 0x8a, 0xb8, 0x1c, 0xfc, 0x26, 0xc5, 0x8c, 0xc3,
-	0x07, 0xe0, 0x86, 0xca, 0xc0, 0x8d, 0x51, 0x84, 0x2b, 0x5a, 0x4d, 0x5b, 0x98, 0x74, 0xa6, 0x94,
-	0xf2, 0x15, 0x8a, 0xb0, 0xf1, 0x5b, 0x03, 0xb5, 0xf5, 0x94, 0x23, 0x8e, 0xcf, 0x83, 0x98, 0x22,
-	0xdd, 0x03, 0xe5, 0x7e, 0xca, 0x38, 0x89, 0x30, 0x75, 0x03, 0x2f, 0xe7, 0x00, 0xa5, 0x7a, 0xe1,
-	0xc1, 0xd7, 0x00, 0x90, 0x04, 0x53, 0x99, 0x79, 0x45, 0xaf, 0x95, 0x16, 0xca, 0xcd, 0x96, 0x39,
-	0xae, 0xf2, 0xe6, 0x79, 0x97, 0x1b, 0x8a, 0xe2, 0x9c, 0x00, 0xc2, 0x87, 0xe0, 0x56, 0x82, 0x28,
-	0x0f, 0x50, 0xe8, 0xee, 0xa1, 0x20, 0x4c, 0x29, 0xae, 0x94, 0x6a, 0xda, 0xc2, 0x75, 0xe7, 0x66,
-	0xae, 0x5e, 0x95, 0x5a, 0x91, 0xf2, 0x00, 0x85, 0x81, 0x87, 0x38, 0x76, 0x49, 0x1c, 0x1e, 0x56,
-	0xfe, 0xcf, 0xcc, 0xa6, 0x94, 0x72, 0x23, 0x0e, 0x0f, 0x8d, 0x8f, 0x3a, 0xb8, 0x3b, 0xc2, 0x33,
-	0x5c, 0x02, 0xe5, 0x34, 0xc9, 0x10, 0xa2, 0x4b, 0x19, 0xa2, 0xdc, 0xac, 0xaa, 0x6c, 0x54, 0x9b,
-	0xcc, 0x55, 0xd1, 0xc8, 0x75, 0xc4, 0xf6, 0x1d, 0x20, 0xcd, 0x85, 0x0c, 0x37, 0xc0, 0x44, 0x9f,
-	0x62, 0xc4, 0x65, 0xb5, 0xcb, 0xcd, 0xc5, 0xc2, 0x2a, 0x0c, 0xa7, 0xeb, 0x82, 0x32, 0xac, 0xfd,
-	0xe7, 0xe4, 0x18, 0x01, 0x94, 0xf8, 0x8a, 0x7e, 0x45, 0xa0, 0xc4, 0xc0, 0x0a, 0x98, 0xa0, 0x38,
-	0x22, 0x03, 0x59, 0xc3, 0x49, 0x71, 0x22, 0xbf, 0x3b, 0x65, 0x30, 0x39, 0x2c, 0xba, 0xf1, 0x59,
-	0x03, 0xf7, 0x47, 0x0c, 0x06, 0x4b, 0x48, 0xcc, 0x30, 0x5c, 0x05, 0xd3, 0x67, 0x3a, 0xe3, 0x62,
-	0x4a, 0x09, 0xcd, 0xd8, 0xe5, 0x26, 0x54, 0xc1, 0xd2, 0xa4, 0x6f, 0x6e, 0x65, 0xc3, 0xeb, 0xdc,
-	0x3e, 0xdd, 0xb3, 0x15, 0x61, 0x0e, 0x77, 0xc0, 0x35, 0x8a, 0x59, 0x1a, 0x72, 0x35, 0x3d, 0xcf,
-	0xc6, 0x4f, 0x4f, 0x51, 0x74, 0x4e, 0x06, 0x72, 0x14, 0xd0, 0x58, 0x01, 0x73, 0xa3, 0x4d, 0xff,
-	0xe9, 0xa6, 0x34, 0xbf, 0x97, 0xc0, 0xcc, 0x79, 0xc2, 0x96, 0x8c, 0x06, 0x7e, 0xd5, 0xc0, 0xf4,
-	0x85, 0xb7, 0x11, 0x3e, 0x1d, 0x9f, 0xc9, 0xa8, 0x6b, 0x5c, 0xbd, 0x5c, 0xc3, 0x8d, 0xd6, 0xdb,
-	0x6f, 0x3f, 0xde, 0xeb, 0x8f, 0xe1, 0xa2, 0xd8, 0x64, 0x47, 0xa7, 0xd2, 0x6b, 0xa9, 0x9b, 0xcb,
-	0xac, 0xba, 0x5a, 0x6d, 0x27, 0xbb, 0x6b, 0xd5, 0x8f, 0xe1, 0x4f, 0x0d, 0xcc, 0x14, 0xb6, 0x1f,
-	0x76, 0x2e, 0xdf, 0x1d, 0xb5, 0x54, 0xaa, 0xcb, 0x57, 0x62, 0xc8, 0xf9, 0x33, 0x96, 0xb3, 0x2c,
-	0x5b, 0xc6, 0x13, 0x91, 0xe5, 0xdf, 0xb4, 0x8e, 0x4e, 0xac, 0xab, 0x56, 0xfd, 0xf8, 0xa2, 0x24,
-	0xed, 0x28, 0x83, 0xdb, 0x5a, 0xbd, 0xf3, 0x4e, 0x07, 0xf3, 0x7d, 0x12, 0x8d, 0x8d, 0xa7, 0x33,
-	0x57, 0xd8, 0xff, 0x4d, 0xb1, 0x15, 0x36, 0xb5, 0x9d, 0xb5, 0x9c, 0xe1, 0x93, 0x10, 0xc5, 0xbe,
-	0x49, 0xa8, 0x6f, 0xf9, 0x38, 0xce, 0x76, 0x86, 0x7a, 0x5b, 0x92, 0x80, 0x15, 0x3f, 0x69, 0x4b,
-	0x4a, 0xf8, 0xa0, 0x97, 0xba, 0xed, 0xf6, 0x27, 0xbd, 0xd6, 0x95, 0xc0, 0xb6, 0xc7, 0x4c, 0x29,
-	0x0a, 0x69, 0xbb, 0x61, 0xe6, 0x8e, 0xd9, 0x17, 0x65, 0xd2, 0x6b, 0x7b, 0xac, 0x37, 0x34, 0xe9,
-	0x6d, 0x37, 0x7a, 0xca, 0xe4, 0x97, 0x3e, 0x2f, 0xf5, 0xb6, 0xdd, 0xf6, 0x98, 0x6d, 0x0f, 0x8d,
-	0x6c, 0x7b, 0xbb, 0x61, 0xdb, 0xca, 0x6c, 0x77, 0x22, 0x8b, 0xf3, 0xd1, 0x9f, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xc6, 0x4d, 0x17, 0xa6, 0x79, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/keyword_plan_campaign_service.pb.go b/googleapis/ads/googleads/v1/services/keyword_plan_campaign_service.pb.go
index 0866d3b62f..77fffff9cf 100644
--- a/googleapis/ads/googleads/v1/services/keyword_plan_campaign_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/keyword_plan_campaign_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/keyword_plan_campaign_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [KeywordPlanCampaignService.GetKeywordPlanCampaign][google.ads.googleads.v1.services.KeywordPlanCampaignService.GetKeywordPlanCampaign].
 type GetKeywordPlanCampaignRequest struct {
@@ -41,16 +41,17 @@ func (m *GetKeywordPlanCampaignRequest) Reset()         { *m = GetKeywordPlanCam
 func (m *GetKeywordPlanCampaignRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKeywordPlanCampaignRequest) ProtoMessage()    {}
 func (*GetKeywordPlanCampaignRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_service_3a49b026094afda2, []int{0}
+	return fileDescriptor_1fdb1b9d1a4eb099, []int{0}
 }
+
 func (m *GetKeywordPlanCampaignRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKeywordPlanCampaignRequest.Unmarshal(m, b)
 }
 func (m *GetKeywordPlanCampaignRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKeywordPlanCampaignRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKeywordPlanCampaignRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKeywordPlanCampaignRequest.Merge(dst, src)
+func (m *GetKeywordPlanCampaignRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeywordPlanCampaignRequest.Merge(m, src)
 }
 func (m *GetKeywordPlanCampaignRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKeywordPlanCampaignRequest.Size(m)
@@ -92,16 +93,17 @@ func (m *MutateKeywordPlanCampaignsRequest) Reset()         { *m = MutateKeyword
 func (m *MutateKeywordPlanCampaignsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanCampaignsRequest) ProtoMessage()    {}
 func (*MutateKeywordPlanCampaignsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_service_3a49b026094afda2, []int{1}
+	return fileDescriptor_1fdb1b9d1a4eb099, []int{1}
 }
+
 func (m *MutateKeywordPlanCampaignsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanCampaignsRequest.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanCampaignsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanCampaignsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanCampaignsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanCampaignsRequest.Merge(dst, src)
+func (m *MutateKeywordPlanCampaignsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanCampaignsRequest.Merge(m, src)
 }
 func (m *MutateKeywordPlanCampaignsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanCampaignsRequest.Size(m)
@@ -161,16 +163,17 @@ func (m *KeywordPlanCampaignOperation) Reset()         { *m = KeywordPlanCampaig
 func (m *KeywordPlanCampaignOperation) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanCampaignOperation) ProtoMessage()    {}
 func (*KeywordPlanCampaignOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_service_3a49b026094afda2, []int{2}
+	return fileDescriptor_1fdb1b9d1a4eb099, []int{2}
 }
+
 func (m *KeywordPlanCampaignOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanCampaignOperation.Unmarshal(m, b)
 }
 func (m *KeywordPlanCampaignOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanCampaignOperation.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanCampaignOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanCampaignOperation.Merge(dst, src)
+func (m *KeywordPlanCampaignOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanCampaignOperation.Merge(m, src)
 }
 func (m *KeywordPlanCampaignOperation) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanCampaignOperation.Size(m)
@@ -238,95 +241,15 @@ func (m *KeywordPlanCampaignOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*KeywordPlanCampaignOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _KeywordPlanCampaignOperation_OneofMarshaler, _KeywordPlanCampaignOperation_OneofUnmarshaler, _KeywordPlanCampaignOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*KeywordPlanCampaignOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*KeywordPlanCampaignOperation_Create)(nil),
 		(*KeywordPlanCampaignOperation_Update)(nil),
 		(*KeywordPlanCampaignOperation_Remove)(nil),
 	}
 }
 
-func _KeywordPlanCampaignOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*KeywordPlanCampaignOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanCampaignOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *KeywordPlanCampaignOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *KeywordPlanCampaignOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("KeywordPlanCampaignOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _KeywordPlanCampaignOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*KeywordPlanCampaignOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanCampaign)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanCampaignOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanCampaign)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanCampaignOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &KeywordPlanCampaignOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _KeywordPlanCampaignOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*KeywordPlanCampaignOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanCampaignOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanCampaignOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanCampaignOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a Keyword Plan campaign mutate.
 type MutateKeywordPlanCampaignsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -345,16 +268,17 @@ func (m *MutateKeywordPlanCampaignsResponse) Reset()         { *m = MutateKeywor
 func (m *MutateKeywordPlanCampaignsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanCampaignsResponse) ProtoMessage()    {}
 func (*MutateKeywordPlanCampaignsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_service_3a49b026094afda2, []int{3}
+	return fileDescriptor_1fdb1b9d1a4eb099, []int{3}
 }
+
 func (m *MutateKeywordPlanCampaignsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanCampaignsResponse.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanCampaignsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanCampaignsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanCampaignsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanCampaignsResponse.Merge(dst, src)
+func (m *MutateKeywordPlanCampaignsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanCampaignsResponse.Merge(m, src)
 }
 func (m *MutateKeywordPlanCampaignsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanCampaignsResponse.Size(m)
@@ -392,16 +316,17 @@ func (m *MutateKeywordPlanCampaignResult) Reset()         { *m = MutateKeywordPl
 func (m *MutateKeywordPlanCampaignResult) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanCampaignResult) ProtoMessage()    {}
 func (*MutateKeywordPlanCampaignResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_campaign_service_3a49b026094afda2, []int{4}
+	return fileDescriptor_1fdb1b9d1a4eb099, []int{4}
 }
+
 func (m *MutateKeywordPlanCampaignResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanCampaignResult.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanCampaignResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanCampaignResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanCampaignResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanCampaignResult.Merge(dst, src)
+func (m *MutateKeywordPlanCampaignResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanCampaignResult.Merge(m, src)
 }
 func (m *MutateKeywordPlanCampaignResult) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanCampaignResult.Size(m)
@@ -427,6 +352,60 @@ func init() {
 	proto.RegisterType((*MutateKeywordPlanCampaignResult)(nil), "google.ads.googleads.v1.services.MutateKeywordPlanCampaignResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_campaign_service.proto", fileDescriptor_1fdb1b9d1a4eb099)
+}
+
+var fileDescriptor_1fdb1b9d1a4eb099 = []byte{
+	// 728 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6b, 0xd4, 0x4c,
+	0x18, 0xc0, 0xdf, 0x64, 0x5f, 0xaa, 0x9d, 0x54, 0x85, 0x11, 0x75, 0x09, 0xd5, 0xae, 0xb1, 0x60,
+	0xd9, 0x43, 0xc2, 0xae, 0x50, 0x34, 0xa5, 0x95, 0x6d, 0xd7, 0x6d, 0x45, 0x6a, 0x97, 0x14, 0x7a,
+	0xd0, 0xc5, 0x30, 0x4d, 0xa6, 0x21, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0x96, 0x52, 0x7a, 0xf1, 0xe0,
+	0x17, 0xf0, 0x1b, 0x78, 0xf0, 0xe0, 0x37, 0xd1, 0x9b, 0xf8, 0x05, 0x3c, 0x78, 0x12, 0xbc, 0xf8,
+	0x09, 0x24, 0x99, 0xcc, 0xda, 0x96, 0x4d, 0x57, 0xec, 0xed, 0xc9, 0x33, 0x4f, 0x7e, 0xcf, 0xdf,
+	0x79, 0x06, 0x74, 0x03, 0x42, 0x82, 0x08, 0x5b, 0xc8, 0x67, 0x96, 0x10, 0x73, 0x69, 0xd8, 0xb2,
+	0x18, 0xa6, 0xc3, 0xd0, 0xc3, 0xcc, 0xda, 0xc7, 0x87, 0x07, 0x84, 0xfa, 0x6e, 0x1a, 0xa1, 0xc4,
+	0xf5, 0x50, 0x9c, 0xa2, 0x30, 0x48, 0xdc, 0xf2, 0xd8, 0x4c, 0x29, 0xe1, 0x04, 0x36, 0xc4, 0xaf,
+	0x26, 0xf2, 0x99, 0x39, 0xa2, 0x98, 0xc3, 0x96, 0x29, 0x29, 0xfa, 0x72, 0x95, 0x1f, 0x8a, 0x19,
+	0xc9, 0x68, 0xa5, 0x23, 0xe1, 0x40, 0x9f, 0x95, 0xbf, 0xa7, 0xa1, 0x85, 0x92, 0x84, 0x70, 0xc4,
+	0x43, 0x92, 0xb0, 0xf2, 0xb4, 0x74, 0x6f, 0x15, 0x5f, 0xbb, 0xd9, 0x9e, 0xb5, 0x17, 0xe2, 0xc8,
+	0x77, 0x63, 0xc4, 0xf6, 0x4b, 0x8b, 0x3b, 0x67, 0x2d, 0x0e, 0x28, 0x4a, 0x53, 0x4c, 0x25, 0xe1,
+	0x56, 0x79, 0x4e, 0x53, 0xcf, 0x62, 0x1c, 0xf1, 0xac, 0x3c, 0x30, 0xba, 0xe0, 0xf6, 0x3a, 0xe6,
+	0xcf, 0x44, 0x68, 0xfd, 0x08, 0x25, 0x6b, 0x65, 0x60, 0x0e, 0x7e, 0x9d, 0x61, 0xc6, 0xe1, 0x3d,
+	0x70, 0x45, 0xa6, 0xe0, 0x26, 0x28, 0xc6, 0x75, 0xa5, 0xa1, 0x2c, 0x4c, 0x3b, 0x33, 0x52, 0xf9,
+	0x1c, 0xc5, 0xd8, 0xf8, 0xa5, 0x80, 0xbb, 0x9b, 0x19, 0x47, 0x1c, 0x8f, 0x21, 0x31, 0x89, 0x9a,
+	0x03, 0x9a, 0x97, 0x31, 0x4e, 0x62, 0x4c, 0xdd, 0xd0, 0x2f, 0x41, 0x40, 0xaa, 0x9e, 0xfa, 0xf0,
+	0x15, 0x00, 0x24, 0xc5, 0x54, 0xe4, 0x5e, 0x57, 0x1b, 0xb5, 0x05, 0xad, 0xbd, 0x62, 0x4e, 0xaa,
+	0xbd, 0x39, 0xc6, 0xe7, 0x96, 0xc4, 0x38, 0x27, 0x88, 0xf0, 0x3e, 0xb8, 0x96, 0x22, 0xca, 0x43,
+	0x14, 0xb9, 0x7b, 0x28, 0x8c, 0x32, 0x8a, 0xeb, 0xb5, 0x86, 0xb2, 0x70, 0xd9, 0xb9, 0x5a, 0xaa,
+	0x7b, 0x42, 0x9b, 0x27, 0x3d, 0x44, 0x51, 0xe8, 0x23, 0x8e, 0x5d, 0x92, 0x44, 0x87, 0xf5, 0xff,
+	0x0b, 0xb3, 0x19, 0xa9, 0xdc, 0x4a, 0xa2, 0x43, 0xe3, 0x83, 0x0a, 0x66, 0xcf, 0x73, 0x0d, 0x97,
+	0x80, 0x96, 0xa5, 0x05, 0x23, 0xef, 0x54, 0xc1, 0xd0, 0xda, 0xba, 0xcc, 0x47, 0xb6, 0xca, 0xec,
+	0xe5, 0xcd, 0xdc, 0x44, 0x6c, 0xdf, 0x01, 0xc2, 0x3c, 0x97, 0x61, 0x1f, 0x4c, 0x79, 0x14, 0x23,
+	0x2e, 0x0a, 0xae, 0xb5, 0x17, 0x2b, 0xeb, 0x30, 0x9a, 0xb0, 0x71, 0x85, 0xd8, 0xf8, 0xcf, 0x29,
+	0x39, 0x39, 0x51, 0xf0, 0xeb, 0xea, 0x45, 0x89, 0x82, 0x03, 0xeb, 0x60, 0x8a, 0xe2, 0x98, 0x0c,
+	0x45, 0x19, 0xa7, 0xf3, 0x13, 0xf1, 0xbd, 0xaa, 0x81, 0xe9, 0x51, 0xdd, 0x8d, 0x4f, 0x0a, 0x30,
+	0xce, 0x9b, 0x0e, 0x96, 0x92, 0x84, 0x61, 0xd8, 0x03, 0x37, 0xce, 0x74, 0xc7, 0xc5, 0x94, 0x12,
+	0x5a, 0xc0, 0xb5, 0x36, 0x94, 0xe1, 0xd2, 0xd4, 0x33, 0xb7, 0x8b, 0x19, 0x76, 0xae, 0x9f, 0xee,
+	0xdb, 0x93, 0xdc, 0x1c, 0xbe, 0x04, 0x97, 0x28, 0x66, 0x59, 0xc4, 0xe5, 0x08, 0x75, 0x26, 0x8f,
+	0x50, 0x65, 0x78, 0x4e, 0x41, 0x72, 0x24, 0xd1, 0xe8, 0x81, 0xb9, 0x09, 0xb6, 0x7f, 0x75, 0x63,
+	0xda, 0xdf, 0x6a, 0x40, 0x1f, 0x83, 0xd8, 0x16, 0x01, 0xc1, 0x2f, 0x0a, 0xb8, 0x39, 0xfe, 0x5e,
+	0xc2, 0xc7, 0x93, 0xb3, 0x39, 0xf7, 0x46, 0xeb, 0xff, 0xd8, 0x77, 0x63, 0xe5, 0xcd, 0xd7, 0xef,
+	0xef, 0xd4, 0x87, 0x70, 0x31, 0x5f, 0x6b, 0x47, 0xa7, 0x52, 0x5c, 0x96, 0x97, 0x98, 0x59, 0x4d,
+	0xb9, 0xe7, 0x4e, 0x35, 0xd9, 0x6a, 0x1e, 0xc3, 0x9f, 0x0a, 0xd0, 0xab, 0xc7, 0x00, 0xae, 0x5d,
+	0xa0, 0x4b, 0x72, 0xc5, 0xe8, 0xdd, 0x8b, 0x41, 0xc4, 0x24, 0x1a, 0xdd, 0x22, 0xd3, 0x15, 0xe3,
+	0x51, 0x9e, 0xe9, 0x9f, 0xd4, 0x8e, 0x4e, 0x6c, 0xaf, 0xe5, 0xe6, 0xf1, 0xd8, 0x44, 0xed, 0xb8,
+	0xc0, 0xdb, 0x4a, 0x73, 0xf5, 0xad, 0x0a, 0xe6, 0x3d, 0x12, 0x4f, 0x8c, 0x68, 0x75, 0xae, 0x7a,
+	0x10, 0xfa, 0xf9, 0x92, 0xe8, 0x2b, 0x2f, 0x36, 0x4a, 0x48, 0x40, 0x22, 0x94, 0x04, 0x26, 0xa1,
+	0x81, 0x15, 0xe0, 0xa4, 0x58, 0x21, 0xf2, 0xb9, 0x49, 0x43, 0x56, 0xfd, 0xca, 0x2d, 0x49, 0xe1,
+	0xbd, 0x5a, 0x5b, 0xef, 0x74, 0x3e, 0xaa, 0x8d, 0x75, 0x01, 0xec, 0xf8, 0xcc, 0x14, 0x62, 0x2e,
+	0xed, 0xb4, 0xcc, 0xd2, 0x31, 0xfb, 0x2c, 0x4d, 0x06, 0x1d, 0x9f, 0x0d, 0x46, 0x26, 0x83, 0x9d,
+	0xd6, 0x40, 0x9a, 0xfc, 0x50, 0xe7, 0x85, 0xde, 0xb6, 0x3b, 0x3e, 0xb3, 0xed, 0x91, 0x91, 0x6d,
+	0xef, 0xb4, 0x6c, 0x5b, 0x9a, 0xed, 0x4e, 0x15, 0x71, 0x3e, 0xf8, 0x1d, 0x00, 0x00, 0xff, 0xff,
+	0x79, 0x2e, 0x5d, 0x8a, 0x8c, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -537,57 +516,3 @@ var _KeywordPlanCampaignService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/keyword_plan_campaign_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_campaign_service.proto", fileDescriptor_keyword_plan_campaign_service_3a49b026094afda2)
-}
-
-var fileDescriptor_keyword_plan_campaign_service_3a49b026094afda2 = []byte{
-	// 728 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6b, 0xd4, 0x4c,
-	0x18, 0xc0, 0xdf, 0x64, 0x5f, 0xaa, 0x9d, 0x54, 0x85, 0x11, 0x75, 0x09, 0xd5, 0xae, 0xb1, 0x60,
-	0xd9, 0x43, 0xc2, 0xae, 0x50, 0x34, 0xa5, 0x95, 0x6d, 0xd7, 0x6d, 0x45, 0x6a, 0x97, 0x14, 0x7a,
-	0xd0, 0xc5, 0x30, 0x4d, 0xa6, 0x21, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0x96, 0x52, 0x7a, 0xf1, 0xe0,
-	0x17, 0xf0, 0x1b, 0x78, 0xf0, 0xe0, 0x37, 0xd1, 0x9b, 0xf8, 0x05, 0x3c, 0x78, 0x12, 0xbc, 0xf8,
-	0x09, 0x24, 0x99, 0xcc, 0xda, 0x96, 0x4d, 0x57, 0xec, 0xed, 0xc9, 0x33, 0x4f, 0x7e, 0xcf, 0xdf,
-	0x79, 0x06, 0x74, 0x03, 0x42, 0x82, 0x08, 0x5b, 0xc8, 0x67, 0x96, 0x10, 0x73, 0x69, 0xd8, 0xb2,
-	0x18, 0xa6, 0xc3, 0xd0, 0xc3, 0xcc, 0xda, 0xc7, 0x87, 0x07, 0x84, 0xfa, 0x6e, 0x1a, 0xa1, 0xc4,
-	0xf5, 0x50, 0x9c, 0xa2, 0x30, 0x48, 0xdc, 0xf2, 0xd8, 0x4c, 0x29, 0xe1, 0x04, 0x36, 0xc4, 0xaf,
-	0x26, 0xf2, 0x99, 0x39, 0xa2, 0x98, 0xc3, 0x96, 0x29, 0x29, 0xfa, 0x72, 0x95, 0x1f, 0x8a, 0x19,
-	0xc9, 0x68, 0xa5, 0x23, 0xe1, 0x40, 0x9f, 0x95, 0xbf, 0xa7, 0xa1, 0x85, 0x92, 0x84, 0x70, 0xc4,
-	0x43, 0x92, 0xb0, 0xf2, 0xb4, 0x74, 0x6f, 0x15, 0x5f, 0xbb, 0xd9, 0x9e, 0xb5, 0x17, 0xe2, 0xc8,
-	0x77, 0x63, 0xc4, 0xf6, 0x4b, 0x8b, 0x3b, 0x67, 0x2d, 0x0e, 0x28, 0x4a, 0x53, 0x4c, 0x25, 0xe1,
-	0x56, 0x79, 0x4e, 0x53, 0xcf, 0x62, 0x1c, 0xf1, 0xac, 0x3c, 0x30, 0xba, 0xe0, 0xf6, 0x3a, 0xe6,
-	0xcf, 0x44, 0x68, 0xfd, 0x08, 0x25, 0x6b, 0x65, 0x60, 0x0e, 0x7e, 0x9d, 0x61, 0xc6, 0xe1, 0x3d,
-	0x70, 0x45, 0xa6, 0xe0, 0x26, 0x28, 0xc6, 0x75, 0xa5, 0xa1, 0x2c, 0x4c, 0x3b, 0x33, 0x52, 0xf9,
-	0x1c, 0xc5, 0xd8, 0xf8, 0xa5, 0x80, 0xbb, 0x9b, 0x19, 0x47, 0x1c, 0x8f, 0x21, 0x31, 0x89, 0x9a,
-	0x03, 0x9a, 0x97, 0x31, 0x4e, 0x62, 0x4c, 0xdd, 0xd0, 0x2f, 0x41, 0x40, 0xaa, 0x9e, 0xfa, 0xf0,
-	0x15, 0x00, 0x24, 0xc5, 0x54, 0xe4, 0x5e, 0x57, 0x1b, 0xb5, 0x05, 0xad, 0xbd, 0x62, 0x4e, 0xaa,
-	0xbd, 0x39, 0xc6, 0xe7, 0x96, 0xc4, 0x38, 0x27, 0x88, 0xf0, 0x3e, 0xb8, 0x96, 0x22, 0xca, 0x43,
-	0x14, 0xb9, 0x7b, 0x28, 0x8c, 0x32, 0x8a, 0xeb, 0xb5, 0x86, 0xb2, 0x70, 0xd9, 0xb9, 0x5a, 0xaa,
-	0x7b, 0x42, 0x9b, 0x27, 0x3d, 0x44, 0x51, 0xe8, 0x23, 0x8e, 0x5d, 0x92, 0x44, 0x87, 0xf5, 0xff,
-	0x0b, 0xb3, 0x19, 0xa9, 0xdc, 0x4a, 0xa2, 0x43, 0xe3, 0x83, 0x0a, 0x66, 0xcf, 0x73, 0x0d, 0x97,
-	0x80, 0x96, 0xa5, 0x05, 0x23, 0xef, 0x54, 0xc1, 0xd0, 0xda, 0xba, 0xcc, 0x47, 0xb6, 0xca, 0xec,
-	0xe5, 0xcd, 0xdc, 0x44, 0x6c, 0xdf, 0x01, 0xc2, 0x3c, 0x97, 0x61, 0x1f, 0x4c, 0x79, 0x14, 0x23,
-	0x2e, 0x0a, 0xae, 0xb5, 0x17, 0x2b, 0xeb, 0x30, 0x9a, 0xb0, 0x71, 0x85, 0xd8, 0xf8, 0xcf, 0x29,
-	0x39, 0x39, 0x51, 0xf0, 0xeb, 0xea, 0x45, 0x89, 0x82, 0x03, 0xeb, 0x60, 0x8a, 0xe2, 0x98, 0x0c,
-	0x45, 0x19, 0xa7, 0xf3, 0x13, 0xf1, 0xbd, 0xaa, 0x81, 0xe9, 0x51, 0xdd, 0x8d, 0x4f, 0x0a, 0x30,
-	0xce, 0x9b, 0x0e, 0x96, 0x92, 0x84, 0x61, 0xd8, 0x03, 0x37, 0xce, 0x74, 0xc7, 0xc5, 0x94, 0x12,
-	0x5a, 0xc0, 0xb5, 0x36, 0x94, 0xe1, 0xd2, 0xd4, 0x33, 0xb7, 0x8b, 0x19, 0x76, 0xae, 0x9f, 0xee,
-	0xdb, 0x93, 0xdc, 0x1c, 0xbe, 0x04, 0x97, 0x28, 0x66, 0x59, 0xc4, 0xe5, 0x08, 0x75, 0x26, 0x8f,
-	0x50, 0x65, 0x78, 0x4e, 0x41, 0x72, 0x24, 0xd1, 0xe8, 0x81, 0xb9, 0x09, 0xb6, 0x7f, 0x75, 0x63,
-	0xda, 0xdf, 0x6a, 0x40, 0x1f, 0x83, 0xd8, 0x16, 0x01, 0xc1, 0x2f, 0x0a, 0xb8, 0x39, 0xfe, 0x5e,
-	0xc2, 0xc7, 0x93, 0xb3, 0x39, 0xf7, 0x46, 0xeb, 0xff, 0xd8, 0x77, 0x63, 0xe5, 0xcd, 0xd7, 0xef,
-	0xef, 0xd4, 0x87, 0x70, 0x31, 0x5f, 0x6b, 0x47, 0xa7, 0x52, 0x5c, 0x96, 0x97, 0x98, 0x59, 0x4d,
-	0xb9, 0xe7, 0x4e, 0x35, 0xd9, 0x6a, 0x1e, 0xc3, 0x9f, 0x0a, 0xd0, 0xab, 0xc7, 0x00, 0xae, 0x5d,
-	0xa0, 0x4b, 0x72, 0xc5, 0xe8, 0xdd, 0x8b, 0x41, 0xc4, 0x24, 0x1a, 0xdd, 0x22, 0xd3, 0x15, 0xe3,
-	0x51, 0x9e, 0xe9, 0x9f, 0xd4, 0x8e, 0x4e, 0x6c, 0xaf, 0xe5, 0xe6, 0xf1, 0xd8, 0x44, 0xed, 0xb8,
-	0xc0, 0xdb, 0x4a, 0x73, 0xf5, 0xad, 0x0a, 0xe6, 0x3d, 0x12, 0x4f, 0x8c, 0x68, 0x75, 0xae, 0x7a,
-	0x10, 0xfa, 0xf9, 0x92, 0xe8, 0x2b, 0x2f, 0x36, 0x4a, 0x48, 0x40, 0x22, 0x94, 0x04, 0x26, 0xa1,
-	0x81, 0x15, 0xe0, 0xa4, 0x58, 0x21, 0xf2, 0xb9, 0x49, 0x43, 0x56, 0xfd, 0xca, 0x2d, 0x49, 0xe1,
-	0xbd, 0x5a, 0x5b, 0xef, 0x74, 0x3e, 0xaa, 0x8d, 0x75, 0x01, 0xec, 0xf8, 0xcc, 0x14, 0x62, 0x2e,
-	0xed, 0xb4, 0xcc, 0xd2, 0x31, 0xfb, 0x2c, 0x4d, 0x06, 0x1d, 0x9f, 0x0d, 0x46, 0x26, 0x83, 0x9d,
-	0xd6, 0x40, 0x9a, 0xfc, 0x50, 0xe7, 0x85, 0xde, 0xb6, 0x3b, 0x3e, 0xb3, 0xed, 0x91, 0x91, 0x6d,
-	0xef, 0xb4, 0x6c, 0x5b, 0x9a, 0xed, 0x4e, 0x15, 0x71, 0x3e, 0xf8, 0x1d, 0x00, 0x00, 0xff, 0xff,
-	0x79, 0x2e, 0x5d, 0x8a, 0x8c, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/keyword_plan_idea_service.pb.go b/googleapis/ads/googleads/v1/services/keyword_plan_idea_service.pb.go
index 3227046ac1..d3ab1d529d 100644
--- a/googleapis/ads/googleads/v1/services/keyword_plan_idea_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/keyword_plan_idea_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/keyword_plan_idea_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [KeywordIdeaService.GenerateKeywordIdeas][].
 type GenerateKeywordIdeasRequest struct {
@@ -55,16 +55,17 @@ func (m *GenerateKeywordIdeasRequest) Reset()         { *m = GenerateKeywordIdea
 func (m *GenerateKeywordIdeasRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateKeywordIdeasRequest) ProtoMessage()    {}
 func (*GenerateKeywordIdeasRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9, []int{0}
+	return fileDescriptor_78a60a26de5be656, []int{0}
 }
+
 func (m *GenerateKeywordIdeasRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateKeywordIdeasRequest.Unmarshal(m, b)
 }
 func (m *GenerateKeywordIdeasRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateKeywordIdeasRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateKeywordIdeasRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateKeywordIdeasRequest.Merge(dst, src)
+func (m *GenerateKeywordIdeasRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateKeywordIdeasRequest.Merge(m, src)
 }
 func (m *GenerateKeywordIdeasRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateKeywordIdeasRequest.Size(m)
@@ -153,99 +154,15 @@ func (m *GenerateKeywordIdeasRequest) GetUrlSeed() *UrlSeed {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GenerateKeywordIdeasRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GenerateKeywordIdeasRequest_OneofMarshaler, _GenerateKeywordIdeasRequest_OneofUnmarshaler, _GenerateKeywordIdeasRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GenerateKeywordIdeasRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GenerateKeywordIdeasRequest_KeywordAndUrlSeed)(nil),
 		(*GenerateKeywordIdeasRequest_KeywordSeed)(nil),
 		(*GenerateKeywordIdeasRequest_UrlSeed)(nil),
 	}
 }
 
-func _GenerateKeywordIdeasRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GenerateKeywordIdeasRequest)
-	// seed
-	switch x := m.Seed.(type) {
-	case *GenerateKeywordIdeasRequest_KeywordAndUrlSeed:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KeywordAndUrlSeed); err != nil {
-			return err
-		}
-	case *GenerateKeywordIdeasRequest_KeywordSeed:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KeywordSeed); err != nil {
-			return err
-		}
-	case *GenerateKeywordIdeasRequest_UrlSeed:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UrlSeed); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GenerateKeywordIdeasRequest.Seed has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GenerateKeywordIdeasRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GenerateKeywordIdeasRequest)
-	switch tag {
-	case 2: // seed.keyword_and_url_seed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(KeywordAndUrlSeed)
-		err := b.DecodeMessage(msg)
-		m.Seed = &GenerateKeywordIdeasRequest_KeywordAndUrlSeed{msg}
-		return true, err
-	case 3: // seed.keyword_seed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(KeywordSeed)
-		err := b.DecodeMessage(msg)
-		m.Seed = &GenerateKeywordIdeasRequest_KeywordSeed{msg}
-		return true, err
-	case 5: // seed.url_seed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UrlSeed)
-		err := b.DecodeMessage(msg)
-		m.Seed = &GenerateKeywordIdeasRequest_UrlSeed{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GenerateKeywordIdeasRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GenerateKeywordIdeasRequest)
-	// seed
-	switch x := m.Seed.(type) {
-	case *GenerateKeywordIdeasRequest_KeywordAndUrlSeed:
-		s := proto.Size(x.KeywordAndUrlSeed)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GenerateKeywordIdeasRequest_KeywordSeed:
-		s := proto.Size(x.KeywordSeed)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GenerateKeywordIdeasRequest_UrlSeed:
-		s := proto.Size(x.UrlSeed)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Keyword And Url Seed
 type KeywordAndUrlSeed struct {
 	// The URL to crawl in order to generate keyword ideas.
@@ -261,16 +178,17 @@ func (m *KeywordAndUrlSeed) Reset()         { *m = KeywordAndUrlSeed{} }
 func (m *KeywordAndUrlSeed) String() string { return proto.CompactTextString(m) }
 func (*KeywordAndUrlSeed) ProtoMessage()    {}
 func (*KeywordAndUrlSeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9, []int{1}
+	return fileDescriptor_78a60a26de5be656, []int{1}
 }
+
 func (m *KeywordAndUrlSeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordAndUrlSeed.Unmarshal(m, b)
 }
 func (m *KeywordAndUrlSeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordAndUrlSeed.Marshal(b, m, deterministic)
 }
-func (dst *KeywordAndUrlSeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordAndUrlSeed.Merge(dst, src)
+func (m *KeywordAndUrlSeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordAndUrlSeed.Merge(m, src)
 }
 func (m *KeywordAndUrlSeed) XXX_Size() int {
 	return xxx_messageInfo_KeywordAndUrlSeed.Size(m)
@@ -308,16 +226,17 @@ func (m *KeywordSeed) Reset()         { *m = KeywordSeed{} }
 func (m *KeywordSeed) String() string { return proto.CompactTextString(m) }
 func (*KeywordSeed) ProtoMessage()    {}
 func (*KeywordSeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9, []int{2}
+	return fileDescriptor_78a60a26de5be656, []int{2}
 }
+
 func (m *KeywordSeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordSeed.Unmarshal(m, b)
 }
 func (m *KeywordSeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordSeed.Marshal(b, m, deterministic)
 }
-func (dst *KeywordSeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordSeed.Merge(dst, src)
+func (m *KeywordSeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordSeed.Merge(m, src)
 }
 func (m *KeywordSeed) XXX_Size() int {
 	return xxx_messageInfo_KeywordSeed.Size(m)
@@ -348,16 +267,17 @@ func (m *UrlSeed) Reset()         { *m = UrlSeed{} }
 func (m *UrlSeed) String() string { return proto.CompactTextString(m) }
 func (*UrlSeed) ProtoMessage()    {}
 func (*UrlSeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9, []int{3}
+	return fileDescriptor_78a60a26de5be656, []int{3}
 }
+
 func (m *UrlSeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UrlSeed.Unmarshal(m, b)
 }
 func (m *UrlSeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UrlSeed.Marshal(b, m, deterministic)
 }
-func (dst *UrlSeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UrlSeed.Merge(dst, src)
+func (m *UrlSeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UrlSeed.Merge(m, src)
 }
 func (m *UrlSeed) XXX_Size() int {
 	return xxx_messageInfo_UrlSeed.Size(m)
@@ -388,16 +308,17 @@ func (m *GenerateKeywordIdeaResponse) Reset()         { *m = GenerateKeywordIdea
 func (m *GenerateKeywordIdeaResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateKeywordIdeaResponse) ProtoMessage()    {}
 func (*GenerateKeywordIdeaResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9, []int{4}
+	return fileDescriptor_78a60a26de5be656, []int{4}
 }
+
 func (m *GenerateKeywordIdeaResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateKeywordIdeaResponse.Unmarshal(m, b)
 }
 func (m *GenerateKeywordIdeaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateKeywordIdeaResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateKeywordIdeaResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateKeywordIdeaResponse.Merge(dst, src)
+func (m *GenerateKeywordIdeaResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateKeywordIdeaResponse.Merge(m, src)
 }
 func (m *GenerateKeywordIdeaResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateKeywordIdeaResponse.Size(m)
@@ -433,16 +354,17 @@ func (m *GenerateKeywordIdeaResult) Reset()         { *m = GenerateKeywordIdeaRe
 func (m *GenerateKeywordIdeaResult) String() string { return proto.CompactTextString(m) }
 func (*GenerateKeywordIdeaResult) ProtoMessage()    {}
 func (*GenerateKeywordIdeaResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9, []int{5}
+	return fileDescriptor_78a60a26de5be656, []int{5}
 }
+
 func (m *GenerateKeywordIdeaResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateKeywordIdeaResult.Unmarshal(m, b)
 }
 func (m *GenerateKeywordIdeaResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateKeywordIdeaResult.Marshal(b, m, deterministic)
 }
-func (dst *GenerateKeywordIdeaResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateKeywordIdeaResult.Merge(dst, src)
+func (m *GenerateKeywordIdeaResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateKeywordIdeaResult.Merge(m, src)
 }
 func (m *GenerateKeywordIdeaResult) XXX_Size() int {
 	return xxx_messageInfo_GenerateKeywordIdeaResult.Size(m)
@@ -476,6 +398,60 @@ func init() {
 	proto.RegisterType((*GenerateKeywordIdeaResult)(nil), "google.ads.googleads.v1.services.GenerateKeywordIdeaResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_idea_service.proto", fileDescriptor_78a60a26de5be656)
+}
+
+var fileDescriptor_78a60a26de5be656 = []byte{
+	// 727 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6e, 0xd3, 0x4e,
+	0x10, 0xfe, 0x39, 0xe9, 0xaf, 0x69, 0x37, 0x08, 0xa9, 0xab, 0x0a, 0x85, 0xb6, 0x82, 0x28, 0xea,
+	0xa1, 0x54, 0xc2, 0x26, 0xe9, 0x81, 0xe2, 0x12, 0x89, 0x14, 0x41, 0x52, 0x21, 0xaa, 0xca, 0xa5,
+	0x39, 0xa0, 0x48, 0xd6, 0x36, 0x9e, 0x5a, 0x56, 0x9c, 0xdd, 0xb0, 0xbb, 0x6e, 0xf9, 0xa3, 0x5e,
+	0xfa, 0x0a, 0xbc, 0x01, 0x47, 0xde, 0x81, 0x17, 0xe0, 0x84, 0xd4, 0x57, 0xe0, 0xc4, 0x81, 0x67,
+	0x40, 0xb6, 0x77, 0x93, 0xb4, 0x75, 0x48, 0xe9, 0x6d, 0x3c, 0xfb, 0xcd, 0x37, 0xdf, 0xce, 0xcc,
+	0x8e, 0xd1, 0x33, 0x9f, 0x31, 0x3f, 0x04, 0x8b, 0x78, 0xc2, 0x4a, 0xcd, 0xd8, 0x3a, 0xae, 0x5a,
+	0x02, 0xf8, 0x71, 0xd0, 0x05, 0x61, 0xf5, 0xe0, 0xc3, 0x09, 0xe3, 0x9e, 0x3b, 0x08, 0x09, 0x75,
+	0x03, 0x0f, 0x88, 0xab, 0x8e, 0xcc, 0x01, 0x67, 0x92, 0xe1, 0x72, 0x1a, 0x66, 0x12, 0x4f, 0x98,
+	0x43, 0x06, 0xf3, 0xb8, 0x6a, 0x6a, 0x86, 0xa5, 0xcd, 0x49, 0x39, 0xba, 0xac, 0xdf, 0x67, 0xf4,
+	0x62, 0x86, 0xd4, 0x97, 0x72, 0x4f, 0x8e, 0x04, 0x1a, 0xf5, 0x2f, 0x49, 0xa3, 0x20, 0x4f, 0x18,
+	0xef, 0xa9, 0xc8, 0x15, 0x1d, 0x39, 0x08, 0x2c, 0x42, 0x29, 0x93, 0x44, 0x06, 0x8c, 0x0a, 0x75,
+	0x7a, 0x4f, 0x9d, 0x26, 0x5f, 0x87, 0xd1, 0x91, 0x75, 0xc2, 0xc9, 0x60, 0x00, 0x5c, 0x9d, 0x57,
+	0x7e, 0xcc, 0xa0, 0xe5, 0x26, 0x50, 0xe0, 0x44, 0xc2, 0xab, 0x34, 0xc9, 0x8e, 0x07, 0x44, 0x38,
+	0xf0, 0x2e, 0x02, 0x21, 0xf1, 0x7d, 0x54, 0xec, 0x46, 0x42, 0xb2, 0x3e, 0x70, 0x37, 0xf0, 0x4a,
+	0x46, 0xd9, 0x58, 0x9b, 0x77, 0x90, 0x76, 0xed, 0x78, 0x78, 0x13, 0xcd, 0x85, 0x84, 0xfa, 0x11,
+	0xf1, 0xa1, 0x54, 0x28, 0x1b, 0x6b, 0xc5, 0xda, 0x8a, 0x2a, 0x8e, 0xa9, 0x73, 0x9a, 0xfb, 0x92,
+	0x07, 0xd4, 0x6f, 0x93, 0x30, 0x02, 0x67, 0x88, 0xc6, 0xbb, 0x68, 0xd1, 0x07, 0xe6, 0x4a, 0xc2,
+	0x7d, 0x90, 0x6e, 0x97, 0x51, 0x21, 0x09, 0x95, 0xa2, 0x34, 0x57, 0xce, 0x4f, 0x65, 0xc1, 0x3e,
+	0xb0, 0x37, 0x49, 0xe0, 0x73, 0x1d, 0x87, 0x3f, 0xa2, 0xc5, 0xac, 0x32, 0x95, 0xe6, 0xcb, 0xc6,
+	0xda, 0xed, 0x5a, 0xcb, 0x9c, 0xd4, 0xbd, 0xa4, 0xc2, 0xa6, 0xba, 0xfc, 0x5e, 0x48, 0xe8, 0x6e,
+	0x1a, 0xf8, 0x82, 0x46, 0xfd, 0x0c, 0xb7, 0x83, 0x7b, 0x57, 0x7c, 0xf8, 0x68, 0x94, 0x9b, 0x50,
+	0xcf, 0x8d, 0x78, 0xe8, 0x0a, 0x00, 0xaf, 0x94, 0x4b, 0x2a, 0xb2, 0x61, 0x4e, 0x9b, 0x1c, 0x9d,
+	0xa7, 0x41, 0xbd, 0x03, 0x1e, 0xee, 0x03, 0x78, 0xad, 0xff, 0x9c, 0x85, 0xde, 0x65, 0x27, 0x76,
+	0xd0, 0x2d, 0x9d, 0x27, 0xe1, 0xcf, 0x27, 0xfc, 0x0f, 0xaf, 0xcd, 0xaf, 0x98, 0x8b, 0xbd, 0xd1,
+	0x27, 0x7e, 0x89, 0xe6, 0x86, 0x7a, 0xff, 0x4f, 0xf8, 0x1e, 0x4c, 0xe7, 0x1b, 0xa9, 0x2c, 0x44,
+	0xa9, 0xb9, 0x3d, 0x8b, 0x66, 0x62, 0x8e, 0xca, 0x29, 0x5a, 0xb8, 0x72, 0x1b, 0x6c, 0xa2, 0x7c,
+	0xc4, 0xc3, 0x64, 0x7e, 0xa6, 0xf5, 0x36, 0x06, 0xc6, 0x63, 0xa5, 0x34, 0x8a, 0x52, 0xee, 0x1a,
+	0x03, 0x31, 0x44, 0x57, 0x9a, 0xa8, 0x38, 0x76, 0xd9, 0x0b, 0x44, 0xc6, 0x3f, 0x11, 0x3d, 0x41,
+	0x85, 0x1b, 0xaa, 0xaf, 0xc8, 0xcc, 0x47, 0xe5, 0x80, 0x18, 0x30, 0x2a, 0x00, 0x1f, 0xa0, 0x02,
+	0x07, 0x11, 0x85, 0x52, 0x4b, 0xda, 0x9a, 0x5e, 0xf0, 0x6c, 0xbe, 0x28, 0x94, 0x8e, 0xe6, 0xaa,
+	0x7c, 0x33, 0xd0, 0xdd, 0x89, 0x30, 0xfc, 0x08, 0xcd, 0x48, 0x78, 0x2f, 0xd5, 0x48, 0xfe, 0xfd,
+	0x12, 0x09, 0x12, 0xd3, 0xd1, 0x50, 0x27, 0xdb, 0xb0, 0x0f, 0x92, 0x07, 0x5d, 0xa1, 0x86, 0xee,
+	0xe9, 0x44, 0xcd, 0x6a, 0xb1, 0x8d, 0x3d, 0x9d, 0x56, 0x20, 0x24, 0xe3, 0x41, 0x97, 0x84, 0xaf,
+	0x53, 0x8e, 0xe1, 0x23, 0x8a, 0x05, 0x2a, 0x5f, 0xed, 0xb7, 0x81, 0xee, 0x8c, 0x05, 0xc5, 0x47,
+	0xfb, 0xe9, 0xf5, 0xf1, 0xb9, 0x81, 0x16, 0xb3, 0xd6, 0x14, 0xae, 0xdf, 0xa8, 0x72, 0x7a, 0xbd,
+	0x2d, 0xd5, 0x6f, 0x5a, 0xf8, 0xa4, 0x91, 0x95, 0xfa, 0xd9, 0xf9, 0xcf, 0xcf, 0xb9, 0xc7, 0x95,
+	0x5a, 0xb2, 0xe3, 0xd5, 0x52, 0x14, 0xd6, 0xa7, 0xb1, 0x95, 0x59, 0x5f, 0x3f, 0xb5, 0xfd, 0x0c,
+	0x05, 0xb6, 0xb1, 0xbe, 0x7d, 0x96, 0x43, 0xab, 0x5d, 0xd6, 0x9f, 0xaa, 0x61, 0x7b, 0x39, 0xbb,
+	0x2c, 0x7b, 0x71, 0xef, 0xf6, 0x8c, 0xb7, 0x2d, 0x45, 0xe0, 0xb3, 0x78, 0xb9, 0x9a, 0x8c, 0xfb,
+	0x96, 0x0f, 0x34, 0xe9, 0xac, 0xfe, 0x99, 0x0c, 0x02, 0x31, 0xf9, 0xcf, 0xb7, 0xa5, 0x8d, 0x2f,
+	0xb9, 0x7c, 0xb3, 0xd1, 0xf8, 0x9a, 0x2b, 0x37, 0x53, 0xc2, 0x86, 0x27, 0xcc, 0xd4, 0x8c, 0xad,
+	0x76, 0xd5, 0x54, 0x89, 0xc5, 0x77, 0x0d, 0xe9, 0x34, 0x3c, 0xd1, 0x19, 0x42, 0x3a, 0xed, 0x6a,
+	0x47, 0x43, 0x7e, 0xe5, 0x56, 0x53, 0xbf, 0x6d, 0x37, 0x3c, 0x61, 0xdb, 0x43, 0x90, 0x6d, 0xb7,
+	0xab, 0xb6, 0xad, 0x61, 0x87, 0xb3, 0x89, 0xce, 0x8d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfd,
+	0x13, 0x9c, 0xd6, 0xa0, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -549,57 +525,3 @@ var _KeywordPlanIdeaService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/keyword_plan_idea_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_idea_service.proto", fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9)
-}
-
-var fileDescriptor_keyword_plan_idea_service_2549e6cddf55a7a9 = []byte{
-	// 727 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6e, 0xd3, 0x4e,
-	0x10, 0xfe, 0x39, 0xe9, 0xaf, 0x69, 0x37, 0x08, 0xa9, 0xab, 0x0a, 0x85, 0xb6, 0x82, 0x28, 0xea,
-	0xa1, 0x54, 0xc2, 0x26, 0xe9, 0x81, 0xe2, 0x12, 0x89, 0x14, 0x41, 0x52, 0x21, 0xaa, 0xca, 0xa5,
-	0x39, 0xa0, 0x48, 0xd6, 0x36, 0x9e, 0x5a, 0x56, 0x9c, 0xdd, 0xb0, 0xbb, 0x6e, 0xf9, 0xa3, 0x5e,
-	0xfa, 0x0a, 0xbc, 0x01, 0x47, 0xde, 0x81, 0x17, 0xe0, 0x84, 0xd4, 0x57, 0xe0, 0xc4, 0x81, 0x67,
-	0x40, 0xb6, 0x77, 0x93, 0xb4, 0x75, 0x48, 0xe9, 0x6d, 0x3c, 0xfb, 0xcd, 0x37, 0xdf, 0xce, 0xcc,
-	0x8e, 0xd1, 0x33, 0x9f, 0x31, 0x3f, 0x04, 0x8b, 0x78, 0xc2, 0x4a, 0xcd, 0xd8, 0x3a, 0xae, 0x5a,
-	0x02, 0xf8, 0x71, 0xd0, 0x05, 0x61, 0xf5, 0xe0, 0xc3, 0x09, 0xe3, 0x9e, 0x3b, 0x08, 0x09, 0x75,
-	0x03, 0x0f, 0x88, 0xab, 0x8e, 0xcc, 0x01, 0x67, 0x92, 0xe1, 0x72, 0x1a, 0x66, 0x12, 0x4f, 0x98,
-	0x43, 0x06, 0xf3, 0xb8, 0x6a, 0x6a, 0x86, 0xa5, 0xcd, 0x49, 0x39, 0xba, 0xac, 0xdf, 0x67, 0xf4,
-	0x62, 0x86, 0xd4, 0x97, 0x72, 0x4f, 0x8e, 0x04, 0x1a, 0xf5, 0x2f, 0x49, 0xa3, 0x20, 0x4f, 0x18,
-	0xef, 0xa9, 0xc8, 0x15, 0x1d, 0x39, 0x08, 0x2c, 0x42, 0x29, 0x93, 0x44, 0x06, 0x8c, 0x0a, 0x75,
-	0x7a, 0x4f, 0x9d, 0x26, 0x5f, 0x87, 0xd1, 0x91, 0x75, 0xc2, 0xc9, 0x60, 0x00, 0x5c, 0x9d, 0x57,
-	0x7e, 0xcc, 0xa0, 0xe5, 0x26, 0x50, 0xe0, 0x44, 0xc2, 0xab, 0x34, 0xc9, 0x8e, 0x07, 0x44, 0x38,
-	0xf0, 0x2e, 0x02, 0x21, 0xf1, 0x7d, 0x54, 0xec, 0x46, 0x42, 0xb2, 0x3e, 0x70, 0x37, 0xf0, 0x4a,
-	0x46, 0xd9, 0x58, 0x9b, 0x77, 0x90, 0x76, 0xed, 0x78, 0x78, 0x13, 0xcd, 0x85, 0x84, 0xfa, 0x11,
-	0xf1, 0xa1, 0x54, 0x28, 0x1b, 0x6b, 0xc5, 0xda, 0x8a, 0x2a, 0x8e, 0xa9, 0x73, 0x9a, 0xfb, 0x92,
-	0x07, 0xd4, 0x6f, 0x93, 0x30, 0x02, 0x67, 0x88, 0xc6, 0xbb, 0x68, 0xd1, 0x07, 0xe6, 0x4a, 0xc2,
-	0x7d, 0x90, 0x6e, 0x97, 0x51, 0x21, 0x09, 0x95, 0xa2, 0x34, 0x57, 0xce, 0x4f, 0x65, 0xc1, 0x3e,
-	0xb0, 0x37, 0x49, 0xe0, 0x73, 0x1d, 0x87, 0x3f, 0xa2, 0xc5, 0xac, 0x32, 0x95, 0xe6, 0xcb, 0xc6,
-	0xda, 0xed, 0x5a, 0xcb, 0x9c, 0xd4, 0xbd, 0xa4, 0xc2, 0xa6, 0xba, 0xfc, 0x5e, 0x48, 0xe8, 0x6e,
-	0x1a, 0xf8, 0x82, 0x46, 0xfd, 0x0c, 0xb7, 0x83, 0x7b, 0x57, 0x7c, 0xf8, 0x68, 0x94, 0x9b, 0x50,
-	0xcf, 0x8d, 0x78, 0xe8, 0x0a, 0x00, 0xaf, 0x94, 0x4b, 0x2a, 0xb2, 0x61, 0x4e, 0x9b, 0x1c, 0x9d,
-	0xa7, 0x41, 0xbd, 0x03, 0x1e, 0xee, 0x03, 0x78, 0xad, 0xff, 0x9c, 0x85, 0xde, 0x65, 0x27, 0x76,
-	0xd0, 0x2d, 0x9d, 0x27, 0xe1, 0xcf, 0x27, 0xfc, 0x0f, 0xaf, 0xcd, 0xaf, 0x98, 0x8b, 0xbd, 0xd1,
-	0x27, 0x7e, 0x89, 0xe6, 0x86, 0x7a, 0xff, 0x4f, 0xf8, 0x1e, 0x4c, 0xe7, 0x1b, 0xa9, 0x2c, 0x44,
-	0xa9, 0xb9, 0x3d, 0x8b, 0x66, 0x62, 0x8e, 0xca, 0x29, 0x5a, 0xb8, 0x72, 0x1b, 0x6c, 0xa2, 0x7c,
-	0xc4, 0xc3, 0x64, 0x7e, 0xa6, 0xf5, 0x36, 0x06, 0xc6, 0x63, 0xa5, 0x34, 0x8a, 0x52, 0xee, 0x1a,
-	0x03, 0x31, 0x44, 0x57, 0x9a, 0xa8, 0x38, 0x76, 0xd9, 0x0b, 0x44, 0xc6, 0x3f, 0x11, 0x3d, 0x41,
-	0x85, 0x1b, 0xaa, 0xaf, 0xc8, 0xcc, 0x47, 0xe5, 0x80, 0x18, 0x30, 0x2a, 0x00, 0x1f, 0xa0, 0x02,
-	0x07, 0x11, 0x85, 0x52, 0x4b, 0xda, 0x9a, 0x5e, 0xf0, 0x6c, 0xbe, 0x28, 0x94, 0x8e, 0xe6, 0xaa,
-	0x7c, 0x33, 0xd0, 0xdd, 0x89, 0x30, 0xfc, 0x08, 0xcd, 0x48, 0x78, 0x2f, 0xd5, 0x48, 0xfe, 0xfd,
-	0x12, 0x09, 0x12, 0xd3, 0xd1, 0x50, 0x27, 0xdb, 0xb0, 0x0f, 0x92, 0x07, 0x5d, 0xa1, 0x86, 0xee,
-	0xe9, 0x44, 0xcd, 0x6a, 0xb1, 0x8d, 0x3d, 0x9d, 0x56, 0x20, 0x24, 0xe3, 0x41, 0x97, 0x84, 0xaf,
-	0x53, 0x8e, 0xe1, 0x23, 0x8a, 0x05, 0x2a, 0x5f, 0xed, 0xb7, 0x81, 0xee, 0x8c, 0x05, 0xc5, 0x47,
-	0xfb, 0xe9, 0xf5, 0xf1, 0xb9, 0x81, 0x16, 0xb3, 0xd6, 0x14, 0xae, 0xdf, 0xa8, 0x72, 0x7a, 0xbd,
-	0x2d, 0xd5, 0x6f, 0x5a, 0xf8, 0xa4, 0x91, 0x95, 0xfa, 0xd9, 0xf9, 0xcf, 0xcf, 0xb9, 0xc7, 0x95,
-	0x5a, 0xb2, 0xe3, 0xd5, 0x52, 0x14, 0xd6, 0xa7, 0xb1, 0x95, 0x59, 0x5f, 0x3f, 0xb5, 0xfd, 0x0c,
-	0x05, 0xb6, 0xb1, 0xbe, 0x7d, 0x96, 0x43, 0xab, 0x5d, 0xd6, 0x9f, 0xaa, 0x61, 0x7b, 0x39, 0xbb,
-	0x2c, 0x7b, 0x71, 0xef, 0xf6, 0x8c, 0xb7, 0x2d, 0x45, 0xe0, 0xb3, 0x78, 0xb9, 0x9a, 0x8c, 0xfb,
-	0x96, 0x0f, 0x34, 0xe9, 0xac, 0xfe, 0x99, 0x0c, 0x02, 0x31, 0xf9, 0xcf, 0xb7, 0xa5, 0x8d, 0x2f,
-	0xb9, 0x7c, 0xb3, 0xd1, 0xf8, 0x9a, 0x2b, 0x37, 0x53, 0xc2, 0x86, 0x27, 0xcc, 0xd4, 0x8c, 0xad,
-	0x76, 0xd5, 0x54, 0x89, 0xc5, 0x77, 0x0d, 0xe9, 0x34, 0x3c, 0xd1, 0x19, 0x42, 0x3a, 0xed, 0x6a,
-	0x47, 0x43, 0x7e, 0xe5, 0x56, 0x53, 0xbf, 0x6d, 0x37, 0x3c, 0x61, 0xdb, 0x43, 0x90, 0x6d, 0xb7,
-	0xab, 0xb6, 0xad, 0x61, 0x87, 0xb3, 0x89, 0xce, 0x8d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfd,
-	0x13, 0x9c, 0xd6, 0xa0, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/keyword_plan_keyword_service.pb.go b/googleapis/ads/googleads/v1/services/keyword_plan_keyword_service.pb.go
index b51442178f..b6b8ee1377 100644
--- a/googleapis/ads/googleads/v1/services/keyword_plan_keyword_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/keyword_plan_keyword_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/keyword_plan_keyword_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [KeywordPlanKeywordService.GetKeywordPlanKeyword][google.ads.googleads.v1.services.KeywordPlanKeywordService.GetKeywordPlanKeyword].
 type GetKeywordPlanKeywordRequest struct {
@@ -41,16 +41,17 @@ func (m *GetKeywordPlanKeywordRequest) Reset()         { *m = GetKeywordPlanKeyw
 func (m *GetKeywordPlanKeywordRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKeywordPlanKeywordRequest) ProtoMessage()    {}
 func (*GetKeywordPlanKeywordRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_service_6de2825a1b31e85e, []int{0}
+	return fileDescriptor_5b99a6d2764af50a, []int{0}
 }
+
 func (m *GetKeywordPlanKeywordRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKeywordPlanKeywordRequest.Unmarshal(m, b)
 }
 func (m *GetKeywordPlanKeywordRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKeywordPlanKeywordRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKeywordPlanKeywordRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKeywordPlanKeywordRequest.Merge(dst, src)
+func (m *GetKeywordPlanKeywordRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeywordPlanKeywordRequest.Merge(m, src)
 }
 func (m *GetKeywordPlanKeywordRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKeywordPlanKeywordRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateKeywordPlanKeywordsRequest) Reset()         { *m = MutateKeywordP
 func (m *MutateKeywordPlanKeywordsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanKeywordsRequest) ProtoMessage()    {}
 func (*MutateKeywordPlanKeywordsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_service_6de2825a1b31e85e, []int{1}
+	return fileDescriptor_5b99a6d2764af50a, []int{1}
 }
+
 func (m *MutateKeywordPlanKeywordsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanKeywordsRequest.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanKeywordsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanKeywordsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanKeywordsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanKeywordsRequest.Merge(dst, src)
+func (m *MutateKeywordPlanKeywordsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanKeywordsRequest.Merge(m, src)
 }
 func (m *MutateKeywordPlanKeywordsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanKeywordsRequest.Size(m)
@@ -160,16 +162,17 @@ func (m *KeywordPlanKeywordOperation) Reset()         { *m = KeywordPlanKeywordO
 func (m *KeywordPlanKeywordOperation) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanKeywordOperation) ProtoMessage()    {}
 func (*KeywordPlanKeywordOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_service_6de2825a1b31e85e, []int{2}
+	return fileDescriptor_5b99a6d2764af50a, []int{2}
 }
+
 func (m *KeywordPlanKeywordOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanKeywordOperation.Unmarshal(m, b)
 }
 func (m *KeywordPlanKeywordOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanKeywordOperation.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanKeywordOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanKeywordOperation.Merge(dst, src)
+func (m *KeywordPlanKeywordOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanKeywordOperation.Merge(m, src)
 }
 func (m *KeywordPlanKeywordOperation) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanKeywordOperation.Size(m)
@@ -237,95 +240,15 @@ func (m *KeywordPlanKeywordOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*KeywordPlanKeywordOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _KeywordPlanKeywordOperation_OneofMarshaler, _KeywordPlanKeywordOperation_OneofUnmarshaler, _KeywordPlanKeywordOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*KeywordPlanKeywordOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*KeywordPlanKeywordOperation_Create)(nil),
 		(*KeywordPlanKeywordOperation_Update)(nil),
 		(*KeywordPlanKeywordOperation_Remove)(nil),
 	}
 }
 
-func _KeywordPlanKeywordOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*KeywordPlanKeywordOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanKeywordOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *KeywordPlanKeywordOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *KeywordPlanKeywordOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("KeywordPlanKeywordOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _KeywordPlanKeywordOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*KeywordPlanKeywordOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanKeyword)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanKeywordOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanKeyword)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanKeywordOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &KeywordPlanKeywordOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _KeywordPlanKeywordOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*KeywordPlanKeywordOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanKeywordOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanKeywordOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanKeywordOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a Keyword Plan keyword mutate.
 type MutateKeywordPlanKeywordsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -344,16 +267,17 @@ func (m *MutateKeywordPlanKeywordsResponse) Reset()         { *m = MutateKeyword
 func (m *MutateKeywordPlanKeywordsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanKeywordsResponse) ProtoMessage()    {}
 func (*MutateKeywordPlanKeywordsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_service_6de2825a1b31e85e, []int{3}
+	return fileDescriptor_5b99a6d2764af50a, []int{3}
 }
+
 func (m *MutateKeywordPlanKeywordsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanKeywordsResponse.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanKeywordsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanKeywordsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanKeywordsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanKeywordsResponse.Merge(dst, src)
+func (m *MutateKeywordPlanKeywordsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanKeywordsResponse.Merge(m, src)
 }
 func (m *MutateKeywordPlanKeywordsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanKeywordsResponse.Size(m)
@@ -391,16 +315,17 @@ func (m *MutateKeywordPlanKeywordResult) Reset()         { *m = MutateKeywordPla
 func (m *MutateKeywordPlanKeywordResult) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanKeywordResult) ProtoMessage()    {}
 func (*MutateKeywordPlanKeywordResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_keyword_service_6de2825a1b31e85e, []int{4}
+	return fileDescriptor_5b99a6d2764af50a, []int{4}
 }
+
 func (m *MutateKeywordPlanKeywordResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanKeywordResult.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanKeywordResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanKeywordResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanKeywordResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanKeywordResult.Merge(dst, src)
+func (m *MutateKeywordPlanKeywordResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanKeywordResult.Merge(m, src)
 }
 func (m *MutateKeywordPlanKeywordResult) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanKeywordResult.Size(m)
@@ -426,6 +351,60 @@ func init() {
 	proto.RegisterType((*MutateKeywordPlanKeywordResult)(nil), "google.ads.googleads.v1.services.MutateKeywordPlanKeywordResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_keyword_service.proto", fileDescriptor_5b99a6d2764af50a)
+}
+
+var fileDescriptor_5b99a6d2764af50a = []byte{
+	// 721 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xdd, 0x6a, 0xd4, 0x4e,
+	0x14, 0xc0, 0xff, 0xc9, 0xfe, 0xa9, 0x76, 0x52, 0x15, 0x46, 0x8a, 0xdb, 0xb5, 0xd4, 0x35, 0x16,
+	0x2c, 0x7b, 0x91, 0xb0, 0x2b, 0x45, 0x49, 0x5d, 0x71, 0x77, 0xe9, 0x87, 0x48, 0x6d, 0x49, 0xa1,
+	0x17, 0x65, 0x25, 0x4c, 0x37, 0xd3, 0x25, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0x96, 0x52, 0x7a, 0x23,
+	0xf8, 0x04, 0xbe, 0x81, 0xde, 0xf9, 0x22, 0x82, 0xe0, 0x95, 0x17, 0xbe, 0x80, 0x37, 0x7a, 0xe5,
+	0x23, 0x48, 0x32, 0x33, 0x6b, 0xbf, 0xb2, 0x2b, 0xed, 0xdd, 0x99, 0x33, 0x27, 0xbf, 0xf3, 0x39,
+	0x27, 0xa0, 0xd3, 0x27, 0xa4, 0x1f, 0x62, 0x1b, 0xf9, 0xcc, 0x16, 0x62, 0x26, 0x0d, 0xea, 0x36,
+	0xc3, 0x74, 0x10, 0xf4, 0x30, 0xb3, 0xf7, 0xf1, 0xe1, 0x01, 0xa1, 0xbe, 0x97, 0x84, 0x28, 0xf6,
+	0xd4, 0x41, 0xde, 0x5a, 0x09, 0x25, 0x9c, 0xc0, 0xaa, 0xf8, 0xd2, 0x42, 0x3e, 0xb3, 0x86, 0x10,
+	0x6b, 0x50, 0xb7, 0x14, 0xa4, 0xf2, 0xb4, 0xc8, 0x0d, 0xc5, 0x8c, 0xa4, 0xb4, 0xc8, 0x8f, 0xe0,
+	0x57, 0x66, 0xd5, 0xd7, 0x49, 0x60, 0xa3, 0x38, 0x26, 0x1c, 0xf1, 0x80, 0xc4, 0x4c, 0xde, 0x4a,
+	0xef, 0x76, 0x7e, 0xda, 0x4d, 0xf7, 0xec, 0xbd, 0x00, 0x87, 0xbe, 0x17, 0x21, 0xb6, 0x2f, 0x2d,
+	0xe6, 0xce, 0x5a, 0x1c, 0x50, 0x94, 0x24, 0x98, 0x2a, 0xc2, 0x1d, 0x79, 0x4f, 0x93, 0x9e, 0xcd,
+	0x38, 0xe2, 0xa9, 0xbc, 0x30, 0x3b, 0x60, 0x76, 0x15, 0xf3, 0x97, 0x22, 0x98, 0xcd, 0x10, 0xc5,
+	0x52, 0x74, 0xf1, 0x9b, 0x14, 0x33, 0x0e, 0x1f, 0x80, 0x1b, 0x2a, 0x01, 0x2f, 0x46, 0x11, 0x2e,
+	0x6b, 0x55, 0x6d, 0x61, 0xd2, 0x9d, 0x52, 0xca, 0x57, 0x28, 0xc2, 0xe6, 0x6f, 0x0d, 0x54, 0xd7,
+	0x53, 0x8e, 0x38, 0x3e, 0x0f, 0x62, 0x8a, 0x74, 0x0f, 0x18, 0xbd, 0x94, 0x71, 0x12, 0x61, 0xea,
+	0x05, 0xbe, 0xe4, 0x00, 0xa5, 0x7a, 0xe1, 0xc3, 0xd7, 0x00, 0x90, 0x04, 0x53, 0x91, 0x79, 0x59,
+	0xaf, 0x96, 0x16, 0x8c, 0x46, 0xd3, 0x1a, 0x57, 0x78, 0xeb, 0xbc, 0xcb, 0x0d, 0x45, 0x71, 0x4f,
+	0x00, 0xe1, 0x43, 0x70, 0x2b, 0x41, 0x94, 0x07, 0x28, 0xf4, 0xf6, 0x50, 0x10, 0xa6, 0x14, 0x97,
+	0x4b, 0x55, 0x6d, 0xe1, 0xba, 0x7b, 0x53, 0xaa, 0x57, 0x84, 0x36, 0x4b, 0x79, 0x80, 0xc2, 0xc0,
+	0x47, 0x1c, 0x7b, 0x24, 0x0e, 0x0f, 0xcb, 0xff, 0xe7, 0x66, 0x53, 0x4a, 0xb9, 0x11, 0x87, 0x87,
+	0xe6, 0x47, 0x1d, 0xdc, 0x1d, 0xe1, 0x19, 0x2e, 0x01, 0x23, 0x4d, 0x72, 0x44, 0xd6, 0xa5, 0x1c,
+	0x61, 0x34, 0x2a, 0x2a, 0x1b, 0xd5, 0x26, 0x6b, 0x25, 0x6b, 0xe4, 0x3a, 0x62, 0xfb, 0x2e, 0x10,
+	0xe6, 0x99, 0x0c, 0x37, 0xc0, 0x44, 0x8f, 0x62, 0xc4, 0x45, 0xb5, 0x8d, 0xc6, 0x62, 0x61, 0x15,
+	0x86, 0xc3, 0x75, 0x41, 0x19, 0xd6, 0xfe, 0x73, 0x25, 0x26, 0x03, 0x0a, 0x7c, 0x59, 0xbf, 0x22,
+	0x50, 0x60, 0x60, 0x19, 0x4c, 0x50, 0x1c, 0x91, 0x81, 0xa8, 0xe1, 0x64, 0x76, 0x23, 0xce, 0x6d,
+	0x03, 0x4c, 0x0e, 0x8b, 0x6e, 0x7e, 0xd6, 0xc0, 0xfd, 0x11, 0x83, 0xc1, 0x12, 0x12, 0x33, 0x0c,
+	0x57, 0xc0, 0xf4, 0x99, 0xce, 0x78, 0x98, 0x52, 0x42, 0x73, 0xb6, 0xd1, 0x80, 0x2a, 0x58, 0x9a,
+	0xf4, 0xac, 0xad, 0x7c, 0x78, 0xdd, 0xdb, 0xa7, 0x7b, 0xb6, 0x9c, 0x99, 0xc3, 0x1d, 0x70, 0x8d,
+	0x62, 0x96, 0x86, 0x5c, 0x4d, 0xcf, 0xf3, 0xf1, 0xd3, 0x53, 0x14, 0x9d, 0x9b, 0x83, 0x5c, 0x05,
+	0x34, 0x97, 0xc1, 0xdc, 0x68, 0xd3, 0x7f, 0x7a, 0x29, 0x8d, 0xef, 0x25, 0x30, 0x73, 0x9e, 0xb0,
+	0x25, 0xa2, 0x81, 0x5f, 0x35, 0x30, 0x7d, 0xe1, 0x6b, 0x84, 0xcf, 0xc6, 0x67, 0x32, 0xea, 0x19,
+	0x57, 0x2e, 0xd7, 0x70, 0xb3, 0xf9, 0xf6, 0xdb, 0x8f, 0xf7, 0xfa, 0x63, 0xb8, 0x98, 0x2d, 0xb2,
+	0xa3, 0x53, 0xe9, 0x35, 0xd5, 0xcb, 0x65, 0x76, 0x4d, 0x6d, 0xb6, 0x93, 0xdd, 0xb5, 0x6b, 0xc7,
+	0xf0, 0xa7, 0x06, 0x66, 0x0a, 0xdb, 0x0f, 0xdb, 0x97, 0xef, 0x8e, 0x5a, 0x2a, 0x95, 0xce, 0x95,
+	0x18, 0x62, 0xfe, 0xcc, 0x4e, 0x9e, 0x65, 0xd3, 0x7c, 0x92, 0x65, 0xf9, 0x37, 0xad, 0xa3, 0x13,
+	0xeb, 0xaa, 0x59, 0x3b, 0xbe, 0x28, 0x49, 0x27, 0xca, 0xe1, 0x8e, 0x56, 0x6b, 0xbf, 0xd3, 0xc1,
+	0x7c, 0x8f, 0x44, 0x63, 0xe3, 0x69, 0xcf, 0x15, 0xf6, 0x7f, 0x33, 0xdb, 0x0a, 0x9b, 0xda, 0xce,
+	0x9a, 0x64, 0xf4, 0x49, 0x88, 0xe2, 0xbe, 0x45, 0x68, 0xdf, 0xee, 0xe3, 0x38, 0xdf, 0x19, 0xea,
+	0xd7, 0x92, 0x04, 0xac, 0xf8, 0x87, 0xb6, 0xa4, 0x84, 0x0f, 0x7a, 0x69, 0xb5, 0xd5, 0xfa, 0xa4,
+	0x57, 0x57, 0x05, 0xb0, 0xe5, 0x33, 0x4b, 0x88, 0x99, 0xb4, 0x5d, 0xb7, 0xa4, 0x63, 0xf6, 0x45,
+	0x99, 0x74, 0x5b, 0x3e, 0xeb, 0x0e, 0x4d, 0xba, 0xdb, 0xf5, 0xae, 0x32, 0xf9, 0xa5, 0xcf, 0x0b,
+	0xbd, 0xe3, 0xb4, 0x7c, 0xe6, 0x38, 0x43, 0x23, 0xc7, 0xd9, 0xae, 0x3b, 0x8e, 0x32, 0xdb, 0x9d,
+	0xc8, 0xe3, 0x7c, 0xf4, 0x27, 0x00, 0x00, 0xff, 0xff, 0x26, 0x9e, 0xc6, 0xcd, 0x77, 0x07, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -536,57 +515,3 @@ var _KeywordPlanKeywordService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/keyword_plan_keyword_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_keyword_service.proto", fileDescriptor_keyword_plan_keyword_service_6de2825a1b31e85e)
-}
-
-var fileDescriptor_keyword_plan_keyword_service_6de2825a1b31e85e = []byte{
-	// 721 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xdd, 0x6a, 0xd4, 0x4e,
-	0x14, 0xc0, 0xff, 0xc9, 0xfe, 0xa9, 0x76, 0x52, 0x15, 0x46, 0x8a, 0xdb, 0xb5, 0xd4, 0x35, 0x16,
-	0x2c, 0x7b, 0x91, 0xb0, 0x2b, 0x45, 0x49, 0x5d, 0x71, 0x77, 0xe9, 0x87, 0x48, 0x6d, 0x49, 0xa1,
-	0x17, 0x65, 0x25, 0x4c, 0x37, 0xd3, 0x25, 0x34, 0xc9, 0xc4, 0x99, 0xc9, 0x96, 0x52, 0x7a, 0x23,
-	0xf8, 0x04, 0xbe, 0x81, 0xde, 0xf9, 0x22, 0x82, 0xe0, 0x95, 0x17, 0xbe, 0x80, 0x37, 0x7a, 0xe5,
-	0x23, 0x48, 0x32, 0x33, 0x6b, 0xbf, 0xb2, 0x2b, 0xed, 0xdd, 0x99, 0x33, 0x27, 0xbf, 0xf3, 0x39,
-	0x27, 0xa0, 0xd3, 0x27, 0xa4, 0x1f, 0x62, 0x1b, 0xf9, 0xcc, 0x16, 0x62, 0x26, 0x0d, 0xea, 0x36,
-	0xc3, 0x74, 0x10, 0xf4, 0x30, 0xb3, 0xf7, 0xf1, 0xe1, 0x01, 0xa1, 0xbe, 0x97, 0x84, 0x28, 0xf6,
-	0xd4, 0x41, 0xde, 0x5a, 0x09, 0x25, 0x9c, 0xc0, 0xaa, 0xf8, 0xd2, 0x42, 0x3e, 0xb3, 0x86, 0x10,
-	0x6b, 0x50, 0xb7, 0x14, 0xa4, 0xf2, 0xb4, 0xc8, 0x0d, 0xc5, 0x8c, 0xa4, 0xb4, 0xc8, 0x8f, 0xe0,
-	0x57, 0x66, 0xd5, 0xd7, 0x49, 0x60, 0xa3, 0x38, 0x26, 0x1c, 0xf1, 0x80, 0xc4, 0x4c, 0xde, 0x4a,
-	0xef, 0x76, 0x7e, 0xda, 0x4d, 0xf7, 0xec, 0xbd, 0x00, 0x87, 0xbe, 0x17, 0x21, 0xb6, 0x2f, 0x2d,
-	0xe6, 0xce, 0x5a, 0x1c, 0x50, 0x94, 0x24, 0x98, 0x2a, 0xc2, 0x1d, 0x79, 0x4f, 0x93, 0x9e, 0xcd,
-	0x38, 0xe2, 0xa9, 0xbc, 0x30, 0x3b, 0x60, 0x76, 0x15, 0xf3, 0x97, 0x22, 0x98, 0xcd, 0x10, 0xc5,
-	0x52, 0x74, 0xf1, 0x9b, 0x14, 0x33, 0x0e, 0x1f, 0x80, 0x1b, 0x2a, 0x01, 0x2f, 0x46, 0x11, 0x2e,
-	0x6b, 0x55, 0x6d, 0x61, 0xd2, 0x9d, 0x52, 0xca, 0x57, 0x28, 0xc2, 0xe6, 0x6f, 0x0d, 0x54, 0xd7,
-	0x53, 0x8e, 0x38, 0x3e, 0x0f, 0x62, 0x8a, 0x74, 0x0f, 0x18, 0xbd, 0x94, 0x71, 0x12, 0x61, 0xea,
-	0x05, 0xbe, 0xe4, 0x00, 0xa5, 0x7a, 0xe1, 0xc3, 0xd7, 0x00, 0x90, 0x04, 0x53, 0x91, 0x79, 0x59,
-	0xaf, 0x96, 0x16, 0x8c, 0x46, 0xd3, 0x1a, 0x57, 0x78, 0xeb, 0xbc, 0xcb, 0x0d, 0x45, 0x71, 0x4f,
-	0x00, 0xe1, 0x43, 0x70, 0x2b, 0x41, 0x94, 0x07, 0x28, 0xf4, 0xf6, 0x50, 0x10, 0xa6, 0x14, 0x97,
-	0x4b, 0x55, 0x6d, 0xe1, 0xba, 0x7b, 0x53, 0xaa, 0x57, 0x84, 0x36, 0x4b, 0x79, 0x80, 0xc2, 0xc0,
-	0x47, 0x1c, 0x7b, 0x24, 0x0e, 0x0f, 0xcb, 0xff, 0xe7, 0x66, 0x53, 0x4a, 0xb9, 0x11, 0x87, 0x87,
-	0xe6, 0x47, 0x1d, 0xdc, 0x1d, 0xe1, 0x19, 0x2e, 0x01, 0x23, 0x4d, 0x72, 0x44, 0xd6, 0xa5, 0x1c,
-	0x61, 0x34, 0x2a, 0x2a, 0x1b, 0xd5, 0x26, 0x6b, 0x25, 0x6b, 0xe4, 0x3a, 0x62, 0xfb, 0x2e, 0x10,
-	0xe6, 0x99, 0x0c, 0x37, 0xc0, 0x44, 0x8f, 0x62, 0xc4, 0x45, 0xb5, 0x8d, 0xc6, 0x62, 0x61, 0x15,
-	0x86, 0xc3, 0x75, 0x41, 0x19, 0xd6, 0xfe, 0x73, 0x25, 0x26, 0x03, 0x0a, 0x7c, 0x59, 0xbf, 0x22,
-	0x50, 0x60, 0x60, 0x19, 0x4c, 0x50, 0x1c, 0x91, 0x81, 0xa8, 0xe1, 0x64, 0x76, 0x23, 0xce, 0x6d,
-	0x03, 0x4c, 0x0e, 0x8b, 0x6e, 0x7e, 0xd6, 0xc0, 0xfd, 0x11, 0x83, 0xc1, 0x12, 0x12, 0x33, 0x0c,
-	0x57, 0xc0, 0xf4, 0x99, 0xce, 0x78, 0x98, 0x52, 0x42, 0x73, 0xb6, 0xd1, 0x80, 0x2a, 0x58, 0x9a,
-	0xf4, 0xac, 0xad, 0x7c, 0x78, 0xdd, 0xdb, 0xa7, 0x7b, 0xb6, 0x9c, 0x99, 0xc3, 0x1d, 0x70, 0x8d,
-	0x62, 0x96, 0x86, 0x5c, 0x4d, 0xcf, 0xf3, 0xf1, 0xd3, 0x53, 0x14, 0x9d, 0x9b, 0x83, 0x5c, 0x05,
-	0x34, 0x97, 0xc1, 0xdc, 0x68, 0xd3, 0x7f, 0x7a, 0x29, 0x8d, 0xef, 0x25, 0x30, 0x73, 0x9e, 0xb0,
-	0x25, 0xa2, 0x81, 0x5f, 0x35, 0x30, 0x7d, 0xe1, 0x6b, 0x84, 0xcf, 0xc6, 0x67, 0x32, 0xea, 0x19,
-	0x57, 0x2e, 0xd7, 0x70, 0xb3, 0xf9, 0xf6, 0xdb, 0x8f, 0xf7, 0xfa, 0x63, 0xb8, 0x98, 0x2d, 0xb2,
-	0xa3, 0x53, 0xe9, 0x35, 0xd5, 0xcb, 0x65, 0x76, 0x4d, 0x6d, 0xb6, 0x93, 0xdd, 0xb5, 0x6b, 0xc7,
-	0xf0, 0xa7, 0x06, 0x66, 0x0a, 0xdb, 0x0f, 0xdb, 0x97, 0xef, 0x8e, 0x5a, 0x2a, 0x95, 0xce, 0x95,
-	0x18, 0x62, 0xfe, 0xcc, 0x4e, 0x9e, 0x65, 0xd3, 0x7c, 0x92, 0x65, 0xf9, 0x37, 0xad, 0xa3, 0x13,
-	0xeb, 0xaa, 0x59, 0x3b, 0xbe, 0x28, 0x49, 0x27, 0xca, 0xe1, 0x8e, 0x56, 0x6b, 0xbf, 0xd3, 0xc1,
-	0x7c, 0x8f, 0x44, 0x63, 0xe3, 0x69, 0xcf, 0x15, 0xf6, 0x7f, 0x33, 0xdb, 0x0a, 0x9b, 0xda, 0xce,
-	0x9a, 0x64, 0xf4, 0x49, 0x88, 0xe2, 0xbe, 0x45, 0x68, 0xdf, 0xee, 0xe3, 0x38, 0xdf, 0x19, 0xea,
-	0xd7, 0x92, 0x04, 0xac, 0xf8, 0x87, 0xb6, 0xa4, 0x84, 0x0f, 0x7a, 0x69, 0xb5, 0xd5, 0xfa, 0xa4,
-	0x57, 0x57, 0x05, 0xb0, 0xe5, 0x33, 0x4b, 0x88, 0x99, 0xb4, 0x5d, 0xb7, 0xa4, 0x63, 0xf6, 0x45,
-	0x99, 0x74, 0x5b, 0x3e, 0xeb, 0x0e, 0x4d, 0xba, 0xdb, 0xf5, 0xae, 0x32, 0xf9, 0xa5, 0xcf, 0x0b,
-	0xbd, 0xe3, 0xb4, 0x7c, 0xe6, 0x38, 0x43, 0x23, 0xc7, 0xd9, 0xae, 0x3b, 0x8e, 0x32, 0xdb, 0x9d,
-	0xc8, 0xe3, 0x7c, 0xf4, 0x27, 0x00, 0x00, 0xff, 0xff, 0x26, 0x9e, 0xc6, 0xcd, 0x77, 0x07, 0x00,
-	0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/keyword_plan_negative_keyword_service.pb.go b/googleapis/ads/googleads/v1/services/keyword_plan_negative_keyword_service.pb.go
index f4c97f5bd4..f2dad20b8e 100644
--- a/googleapis/ads/googleads/v1/services/keyword_plan_negative_keyword_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/keyword_plan_negative_keyword_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/keyword_plan_negative_keyword_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [KeywordPlanNegativeKeywordService.GetKeywordPlanNegativeKeyword][google.ads.googleads.v1.services.KeywordPlanNegativeKeywordService.GetKeywordPlanNegativeKeyword].
@@ -42,16 +42,17 @@ func (m *GetKeywordPlanNegativeKeywordRequest) Reset()         { *m = GetKeyword
 func (m *GetKeywordPlanNegativeKeywordRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKeywordPlanNegativeKeywordRequest) ProtoMessage()    {}
 func (*GetKeywordPlanNegativeKeywordRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_service_aebb6835f57b72b0, []int{0}
+	return fileDescriptor_7b48c1cdc5ae5df5, []int{0}
 }
+
 func (m *GetKeywordPlanNegativeKeywordRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKeywordPlanNegativeKeywordRequest.Unmarshal(m, b)
 }
 func (m *GetKeywordPlanNegativeKeywordRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKeywordPlanNegativeKeywordRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKeywordPlanNegativeKeywordRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKeywordPlanNegativeKeywordRequest.Merge(dst, src)
+func (m *GetKeywordPlanNegativeKeywordRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeywordPlanNegativeKeywordRequest.Merge(m, src)
 }
 func (m *GetKeywordPlanNegativeKeywordRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKeywordPlanNegativeKeywordRequest.Size(m)
@@ -96,16 +97,17 @@ func (m *MutateKeywordPlanNegativeKeywordsRequest) Reset() {
 func (m *MutateKeywordPlanNegativeKeywordsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanNegativeKeywordsRequest) ProtoMessage()    {}
 func (*MutateKeywordPlanNegativeKeywordsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_service_aebb6835f57b72b0, []int{1}
+	return fileDescriptor_7b48c1cdc5ae5df5, []int{1}
 }
+
 func (m *MutateKeywordPlanNegativeKeywordsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordsRequest.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanNegativeKeywordsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanNegativeKeywordsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanNegativeKeywordsRequest.Merge(dst, src)
+func (m *MutateKeywordPlanNegativeKeywordsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanNegativeKeywordsRequest.Merge(m, src)
 }
 func (m *MutateKeywordPlanNegativeKeywordsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordsRequest.Size(m)
@@ -166,16 +168,17 @@ func (m *KeywordPlanNegativeKeywordOperation) Reset()         { *m = KeywordPlan
 func (m *KeywordPlanNegativeKeywordOperation) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanNegativeKeywordOperation) ProtoMessage()    {}
 func (*KeywordPlanNegativeKeywordOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_service_aebb6835f57b72b0, []int{2}
+	return fileDescriptor_7b48c1cdc5ae5df5, []int{2}
 }
+
 func (m *KeywordPlanNegativeKeywordOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanNegativeKeywordOperation.Unmarshal(m, b)
 }
 func (m *KeywordPlanNegativeKeywordOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanNegativeKeywordOperation.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanNegativeKeywordOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanNegativeKeywordOperation.Merge(dst, src)
+func (m *KeywordPlanNegativeKeywordOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanNegativeKeywordOperation.Merge(m, src)
 }
 func (m *KeywordPlanNegativeKeywordOperation) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanNegativeKeywordOperation.Size(m)
@@ -243,95 +246,15 @@ func (m *KeywordPlanNegativeKeywordOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*KeywordPlanNegativeKeywordOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _KeywordPlanNegativeKeywordOperation_OneofMarshaler, _KeywordPlanNegativeKeywordOperation_OneofUnmarshaler, _KeywordPlanNegativeKeywordOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*KeywordPlanNegativeKeywordOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*KeywordPlanNegativeKeywordOperation_Create)(nil),
 		(*KeywordPlanNegativeKeywordOperation_Update)(nil),
 		(*KeywordPlanNegativeKeywordOperation_Remove)(nil),
 	}
 }
 
-func _KeywordPlanNegativeKeywordOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*KeywordPlanNegativeKeywordOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanNegativeKeywordOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *KeywordPlanNegativeKeywordOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *KeywordPlanNegativeKeywordOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("KeywordPlanNegativeKeywordOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _KeywordPlanNegativeKeywordOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*KeywordPlanNegativeKeywordOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanNegativeKeyword)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanNegativeKeywordOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlanNegativeKeyword)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanNegativeKeywordOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &KeywordPlanNegativeKeywordOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _KeywordPlanNegativeKeywordOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*KeywordPlanNegativeKeywordOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanNegativeKeywordOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanNegativeKeywordOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanNegativeKeywordOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a Keyword Plan negative keyword mutate.
 type MutateKeywordPlanNegativeKeywordsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -352,16 +275,17 @@ func (m *MutateKeywordPlanNegativeKeywordsResponse) Reset() {
 func (m *MutateKeywordPlanNegativeKeywordsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanNegativeKeywordsResponse) ProtoMessage()    {}
 func (*MutateKeywordPlanNegativeKeywordsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_service_aebb6835f57b72b0, []int{3}
+	return fileDescriptor_7b48c1cdc5ae5df5, []int{3}
 }
+
 func (m *MutateKeywordPlanNegativeKeywordsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordsResponse.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanNegativeKeywordsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanNegativeKeywordsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanNegativeKeywordsResponse.Merge(dst, src)
+func (m *MutateKeywordPlanNegativeKeywordsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanNegativeKeywordsResponse.Merge(m, src)
 }
 func (m *MutateKeywordPlanNegativeKeywordsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordsResponse.Size(m)
@@ -401,16 +325,17 @@ func (m *MutateKeywordPlanNegativeKeywordResult) Reset() {
 func (m *MutateKeywordPlanNegativeKeywordResult) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlanNegativeKeywordResult) ProtoMessage()    {}
 func (*MutateKeywordPlanNegativeKeywordResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_negative_keyword_service_aebb6835f57b72b0, []int{4}
+	return fileDescriptor_7b48c1cdc5ae5df5, []int{4}
 }
+
 func (m *MutateKeywordPlanNegativeKeywordResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordResult.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlanNegativeKeywordResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlanNegativeKeywordResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlanNegativeKeywordResult.Merge(dst, src)
+func (m *MutateKeywordPlanNegativeKeywordResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlanNegativeKeywordResult.Merge(m, src)
 }
 func (m *MutateKeywordPlanNegativeKeywordResult) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlanNegativeKeywordResult.Size(m)
@@ -436,6 +361,60 @@ func init() {
 	proto.RegisterType((*MutateKeywordPlanNegativeKeywordResult)(nil), "google.ads.googleads.v1.services.MutateKeywordPlanNegativeKeywordResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_negative_keyword_service.proto", fileDescriptor_7b48c1cdc5ae5df5)
+}
+
+var fileDescriptor_7b48c1cdc5ae5df5 = []byte{
+	// 736 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcd, 0x6a, 0xdb, 0x4a,
+	0x14, 0xc7, 0xaf, 0x94, 0x90, 0x7b, 0x33, 0xca, 0x6d, 0x61, 0x4a, 0xa9, 0x31, 0xfd, 0x70, 0x94,
+	0x90, 0xba, 0x5e, 0x48, 0xd8, 0xdd, 0x29, 0x98, 0xd6, 0x01, 0x3b, 0x69, 0xdd, 0x7c, 0xa0, 0x40,
+	0x0a, 0xc5, 0x20, 0x26, 0xd6, 0x44, 0x88, 0x48, 0x1a, 0x75, 0x66, 0xe4, 0x10, 0x42, 0xa0, 0x74,
+	0xd7, 0x45, 0x57, 0x7d, 0x80, 0x42, 0x97, 0x7d, 0x85, 0xbe, 0x41, 0xb7, 0x5d, 0xf4, 0x05, 0xba,
+	0x2a, 0xf4, 0x1d, 0x8a, 0x34, 0x33, 0x6e, 0x12, 0xea, 0xc8, 0x90, 0xec, 0x8e, 0xce, 0xfc, 0xf5,
+	0x3b, 0x67, 0xce, 0x39, 0x3a, 0x02, 0x2f, 0x02, 0x42, 0x82, 0x08, 0xdb, 0xc8, 0x67, 0xb6, 0x30,
+	0x73, 0x6b, 0xd4, 0xb4, 0x19, 0xa6, 0xa3, 0x70, 0x88, 0x99, 0x7d, 0x88, 0x8f, 0x8f, 0x08, 0xf5,
+	0xbd, 0x34, 0x42, 0x89, 0x97, 0xe0, 0x00, 0xf1, 0x70, 0x84, 0x3d, 0xe5, 0x95, 0x32, 0x2b, 0xa5,
+	0x84, 0x13, 0x58, 0x13, 0x08, 0x0b, 0xf9, 0xcc, 0x1a, 0xd3, 0xac, 0x51, 0xd3, 0x52, 0xb4, 0x6a,
+	0x77, 0x52, 0x3c, 0x8a, 0x19, 0xc9, 0x68, 0x69, 0x40, 0x11, 0xa8, 0x7a, 0x57, 0x61, 0xd2, 0xd0,
+	0x46, 0x49, 0x42, 0x38, 0xe2, 0x21, 0x49, 0x98, 0x3c, 0x95, 0x69, 0xd8, 0xc5, 0xd3, 0x7e, 0x76,
+	0x60, 0x1f, 0x84, 0x38, 0xf2, 0xbd, 0x18, 0xb1, 0x43, 0xa9, 0xb8, 0x7f, 0x51, 0x71, 0x44, 0x51,
+	0x9a, 0x62, 0xaa, 0x08, 0x77, 0xe4, 0x39, 0x4d, 0x87, 0x36, 0xe3, 0x88, 0x67, 0xf2, 0xc0, 0xec,
+	0x83, 0xe5, 0x75, 0xcc, 0xfb, 0x22, 0x99, 0x9d, 0x08, 0x25, 0x5b, 0x32, 0x41, 0xe9, 0x72, 0xf1,
+	0xeb, 0x0c, 0x33, 0x0e, 0x97, 0xc0, 0xff, 0xea, 0x46, 0x5e, 0x82, 0x62, 0x5c, 0xd1, 0x6a, 0x5a,
+	0x7d, 0xde, 0x5d, 0x50, 0xce, 0x2d, 0x14, 0x63, 0xf3, 0x8d, 0x0e, 0xea, 0x9b, 0x19, 0x47, 0x1c,
+	0x4f, 0x06, 0x32, 0x45, 0x7c, 0x00, 0x8c, 0x61, 0xc6, 0x38, 0x89, 0x31, 0xf5, 0x42, 0x5f, 0xf2,
+	0x80, 0x72, 0x3d, 0xf3, 0x21, 0x06, 0x80, 0xa4, 0x98, 0x8a, 0x4a, 0x54, 0xf4, 0xda, 0x4c, 0xdd,
+	0x68, 0x75, 0xad, 0xb2, 0x8e, 0x58, 0x93, 0x43, 0x6f, 0x2b, 0x9a, 0x7b, 0x06, 0x0c, 0x1f, 0x82,
+	0x9b, 0x29, 0xa2, 0x3c, 0x44, 0x91, 0x77, 0x80, 0xc2, 0x28, 0xa3, 0xb8, 0x32, 0x53, 0xd3, 0xea,
+	0xff, 0xb9, 0x37, 0xa4, 0xbb, 0x27, 0xbc, 0x79, 0x09, 0x46, 0x28, 0x0a, 0x7d, 0xc4, 0xb1, 0x47,
+	0x92, 0xe8, 0xb8, 0x32, 0x5b, 0xc8, 0x16, 0x94, 0x73, 0x3b, 0x89, 0x8e, 0xcd, 0x2f, 0x3a, 0x58,
+	0x9a, 0x22, 0x03, 0xb8, 0x0a, 0x8c, 0x2c, 0x2d, 0x50, 0x79, 0x17, 0x0b, 0x94, 0xd1, 0xaa, 0xaa,
+	0xdb, 0xa9, 0x36, 0x5a, 0xbd, 0xbc, 0xd1, 0x9b, 0x88, 0x1d, 0xba, 0x40, 0xc8, 0x73, 0x1b, 0xbe,
+	0x04, 0x73, 0x43, 0x8a, 0x11, 0x17, 0x5d, 0x30, 0x5a, 0xed, 0x89, 0x55, 0x19, 0x4f, 0xe1, 0x25,
+	0x65, 0xd9, 0xf8, 0xc7, 0x95, 0xb8, 0x1c, 0x2c, 0xc2, 0x54, 0xf4, 0x6b, 0x02, 0x0b, 0x1c, 0xac,
+	0x80, 0x39, 0x8a, 0x63, 0x32, 0x12, 0xb5, 0x9d, 0xcf, 0x4f, 0xc4, 0xf3, 0x9a, 0x01, 0xe6, 0xc7,
+	0xcd, 0x30, 0xbf, 0x6b, 0xe0, 0xd1, 0x14, 0x03, 0xc4, 0x52, 0x92, 0x30, 0x0c, 0x7b, 0xe0, 0xf6,
+	0x85, 0xce, 0x79, 0x98, 0x52, 0x42, 0x8b, 0x18, 0x46, 0x0b, 0xaa, 0xe4, 0x69, 0x3a, 0xb4, 0x76,
+	0x8b, 0xa1, 0x77, 0x6f, 0x9d, 0xef, 0x69, 0x37, 0x97, 0xc3, 0x7d, 0xf0, 0x2f, 0xc5, 0x2c, 0x8b,
+	0xb8, 0x9a, 0xb2, 0x8d, 0xf2, 0x29, 0x2b, 0xcb, 0xd2, 0x2d, 0x80, 0xae, 0x02, 0x9b, 0x9b, 0x60,
+	0x65, 0xba, 0x57, 0xa6, 0xfa, 0xd2, 0x5a, 0x1f, 0x67, 0xc1, 0xe2, 0x64, 0xd2, 0xae, 0xc8, 0x12,
+	0xfe, 0xd2, 0xc0, 0xbd, 0x4b, 0xbf, 0x6e, 0xd8, 0x2b, 0xbf, 0xe9, 0x34, 0xeb, 0xa1, 0x7a, 0xb5,
+	0x41, 0x31, 0xbb, 0x6f, 0xbf, 0xfd, 0xf8, 0xa0, 0x3f, 0x81, 0xed, 0x7c, 0x73, 0x9e, 0x9c, 0xbb,
+	0x7e, 0x5b, 0x6d, 0x04, 0x66, 0x37, 0xd4, 0x2a, 0xfd, 0xdb, 0x54, 0xd8, 0x8d, 0x53, 0xf8, 0x4e,
+	0x07, 0x8b, 0xa5, 0xe3, 0x03, 0x9f, 0x5f, 0xbd, 0xbb, 0x6a, 0x89, 0x55, 0xfb, 0xd7, 0xc2, 0x12,
+	0xf3, 0x6c, 0xf6, 0x8b, 0x2a, 0x74, 0xcd, 0xa7, 0x79, 0x15, 0xfe, 0x5c, 0xfb, 0xe4, 0xcc, 0x9a,
+	0x6c, 0x37, 0x4e, 0x2f, 0x2b, 0x82, 0x13, 0x17, 0xc1, 0x1c, 0xad, 0xb1, 0xf6, 0x5e, 0x07, 0xcb,
+	0x43, 0x12, 0x97, 0xe6, 0xb7, 0xb6, 0x52, 0x3a, 0x47, 0x3b, 0xf9, 0x36, 0xda, 0xd1, 0x5e, 0x6d,
+	0x48, 0x56, 0x40, 0x22, 0x94, 0x04, 0x16, 0xa1, 0x81, 0x1d, 0xe0, 0xa4, 0xd8, 0x55, 0xea, 0xdf,
+	0x97, 0x86, 0x6c, 0xf2, 0xaf, 0x77, 0x55, 0x19, 0x9f, 0xf4, 0x99, 0xf5, 0x4e, 0xe7, 0xb3, 0x5e,
+	0x5b, 0x17, 0xc0, 0x8e, 0xcf, 0x2c, 0x61, 0xe6, 0xd6, 0x5e, 0xd3, 0x92, 0x81, 0xd9, 0x57, 0x25,
+	0x19, 0x74, 0x7c, 0x36, 0x18, 0x4b, 0x06, 0x7b, 0xcd, 0x81, 0x92, 0xfc, 0xd4, 0x97, 0x85, 0xdf,
+	0x71, 0x3a, 0x3e, 0x73, 0x9c, 0xb1, 0xc8, 0x71, 0xf6, 0x9a, 0x8e, 0xa3, 0x64, 0xfb, 0x73, 0x45,
+	0x9e, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x21, 0xab, 0x07, 0x2a, 0x21, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -546,57 +525,3 @@ var _KeywordPlanNegativeKeywordService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/keyword_plan_negative_keyword_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_negative_keyword_service.proto", fileDescriptor_keyword_plan_negative_keyword_service_aebb6835f57b72b0)
-}
-
-var fileDescriptor_keyword_plan_negative_keyword_service_aebb6835f57b72b0 = []byte{
-	// 736 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcd, 0x6a, 0xdb, 0x4a,
-	0x14, 0xc7, 0xaf, 0x94, 0x90, 0x7b, 0x33, 0xca, 0x6d, 0x61, 0x4a, 0xa9, 0x31, 0xfd, 0x70, 0x94,
-	0x90, 0xba, 0x5e, 0x48, 0xd8, 0xdd, 0x29, 0x98, 0xd6, 0x01, 0x3b, 0x69, 0xdd, 0x7c, 0xa0, 0x40,
-	0x0a, 0xc5, 0x20, 0x26, 0xd6, 0x44, 0x88, 0x48, 0x1a, 0x75, 0x66, 0xe4, 0x10, 0x42, 0xa0, 0x74,
-	0xd7, 0x45, 0x57, 0x7d, 0x80, 0x42, 0x97, 0x7d, 0x85, 0xbe, 0x41, 0xb7, 0x5d, 0xf4, 0x05, 0xba,
-	0x2a, 0xf4, 0x1d, 0x8a, 0x34, 0x33, 0x6e, 0x12, 0xea, 0xc8, 0x90, 0xec, 0x8e, 0xce, 0xfc, 0xf5,
-	0x3b, 0x67, 0xce, 0x39, 0x3a, 0x02, 0x2f, 0x02, 0x42, 0x82, 0x08, 0xdb, 0xc8, 0x67, 0xb6, 0x30,
-	0x73, 0x6b, 0xd4, 0xb4, 0x19, 0xa6, 0xa3, 0x70, 0x88, 0x99, 0x7d, 0x88, 0x8f, 0x8f, 0x08, 0xf5,
-	0xbd, 0x34, 0x42, 0x89, 0x97, 0xe0, 0x00, 0xf1, 0x70, 0x84, 0x3d, 0xe5, 0x95, 0x32, 0x2b, 0xa5,
-	0x84, 0x13, 0x58, 0x13, 0x08, 0x0b, 0xf9, 0xcc, 0x1a, 0xd3, 0xac, 0x51, 0xd3, 0x52, 0xb4, 0x6a,
-	0x77, 0x52, 0x3c, 0x8a, 0x19, 0xc9, 0x68, 0x69, 0x40, 0x11, 0xa8, 0x7a, 0x57, 0x61, 0xd2, 0xd0,
-	0x46, 0x49, 0x42, 0x38, 0xe2, 0x21, 0x49, 0x98, 0x3c, 0x95, 0x69, 0xd8, 0xc5, 0xd3, 0x7e, 0x76,
-	0x60, 0x1f, 0x84, 0x38, 0xf2, 0xbd, 0x18, 0xb1, 0x43, 0xa9, 0xb8, 0x7f, 0x51, 0x71, 0x44, 0x51,
-	0x9a, 0x62, 0xaa, 0x08, 0x77, 0xe4, 0x39, 0x4d, 0x87, 0x36, 0xe3, 0x88, 0x67, 0xf2, 0xc0, 0xec,
-	0x83, 0xe5, 0x75, 0xcc, 0xfb, 0x22, 0x99, 0x9d, 0x08, 0x25, 0x5b, 0x32, 0x41, 0xe9, 0x72, 0xf1,
-	0xeb, 0x0c, 0x33, 0x0e, 0x97, 0xc0, 0xff, 0xea, 0x46, 0x5e, 0x82, 0x62, 0x5c, 0xd1, 0x6a, 0x5a,
-	0x7d, 0xde, 0x5d, 0x50, 0xce, 0x2d, 0x14, 0x63, 0xf3, 0x8d, 0x0e, 0xea, 0x9b, 0x19, 0x47, 0x1c,
-	0x4f, 0x06, 0x32, 0x45, 0x7c, 0x00, 0x8c, 0x61, 0xc6, 0x38, 0x89, 0x31, 0xf5, 0x42, 0x5f, 0xf2,
-	0x80, 0x72, 0x3d, 0xf3, 0x21, 0x06, 0x80, 0xa4, 0x98, 0x8a, 0x4a, 0x54, 0xf4, 0xda, 0x4c, 0xdd,
-	0x68, 0x75, 0xad, 0xb2, 0x8e, 0x58, 0x93, 0x43, 0x6f, 0x2b, 0x9a, 0x7b, 0x06, 0x0c, 0x1f, 0x82,
-	0x9b, 0x29, 0xa2, 0x3c, 0x44, 0x91, 0x77, 0x80, 0xc2, 0x28, 0xa3, 0xb8, 0x32, 0x53, 0xd3, 0xea,
-	0xff, 0xb9, 0x37, 0xa4, 0xbb, 0x27, 0xbc, 0x79, 0x09, 0x46, 0x28, 0x0a, 0x7d, 0xc4, 0xb1, 0x47,
-	0x92, 0xe8, 0xb8, 0x32, 0x5b, 0xc8, 0x16, 0x94, 0x73, 0x3b, 0x89, 0x8e, 0xcd, 0x2f, 0x3a, 0x58,
-	0x9a, 0x22, 0x03, 0xb8, 0x0a, 0x8c, 0x2c, 0x2d, 0x50, 0x79, 0x17, 0x0b, 0x94, 0xd1, 0xaa, 0xaa,
-	0xdb, 0xa9, 0x36, 0x5a, 0xbd, 0xbc, 0xd1, 0x9b, 0x88, 0x1d, 0xba, 0x40, 0xc8, 0x73, 0x1b, 0xbe,
-	0x04, 0x73, 0x43, 0x8a, 0x11, 0x17, 0x5d, 0x30, 0x5a, 0xed, 0x89, 0x55, 0x19, 0x4f, 0xe1, 0x25,
-	0x65, 0xd9, 0xf8, 0xc7, 0x95, 0xb8, 0x1c, 0x2c, 0xc2, 0x54, 0xf4, 0x6b, 0x02, 0x0b, 0x1c, 0xac,
-	0x80, 0x39, 0x8a, 0x63, 0x32, 0x12, 0xb5, 0x9d, 0xcf, 0x4f, 0xc4, 0xf3, 0x9a, 0x01, 0xe6, 0xc7,
-	0xcd, 0x30, 0xbf, 0x6b, 0xe0, 0xd1, 0x14, 0x03, 0xc4, 0x52, 0x92, 0x30, 0x0c, 0x7b, 0xe0, 0xf6,
-	0x85, 0xce, 0x79, 0x98, 0x52, 0x42, 0x8b, 0x18, 0x46, 0x0b, 0xaa, 0xe4, 0x69, 0x3a, 0xb4, 0x76,
-	0x8b, 0xa1, 0x77, 0x6f, 0x9d, 0xef, 0x69, 0x37, 0x97, 0xc3, 0x7d, 0xf0, 0x2f, 0xc5, 0x2c, 0x8b,
-	0xb8, 0x9a, 0xb2, 0x8d, 0xf2, 0x29, 0x2b, 0xcb, 0xd2, 0x2d, 0x80, 0xae, 0x02, 0x9b, 0x9b, 0x60,
-	0x65, 0xba, 0x57, 0xa6, 0xfa, 0xd2, 0x5a, 0x1f, 0x67, 0xc1, 0xe2, 0x64, 0xd2, 0xae, 0xc8, 0x12,
-	0xfe, 0xd2, 0xc0, 0xbd, 0x4b, 0xbf, 0x6e, 0xd8, 0x2b, 0xbf, 0xe9, 0x34, 0xeb, 0xa1, 0x7a, 0xb5,
-	0x41, 0x31, 0xbb, 0x6f, 0xbf, 0xfd, 0xf8, 0xa0, 0x3f, 0x81, 0xed, 0x7c, 0x73, 0x9e, 0x9c, 0xbb,
-	0x7e, 0x5b, 0x6d, 0x04, 0x66, 0x37, 0xd4, 0x2a, 0xfd, 0xdb, 0x54, 0xd8, 0x8d, 0x53, 0xf8, 0x4e,
-	0x07, 0x8b, 0xa5, 0xe3, 0x03, 0x9f, 0x5f, 0xbd, 0xbb, 0x6a, 0x89, 0x55, 0xfb, 0xd7, 0xc2, 0x12,
-	0xf3, 0x6c, 0xf6, 0x8b, 0x2a, 0x74, 0xcd, 0xa7, 0x79, 0x15, 0xfe, 0x5c, 0xfb, 0xe4, 0xcc, 0x9a,
-	0x6c, 0x37, 0x4e, 0x2f, 0x2b, 0x82, 0x13, 0x17, 0xc1, 0x1c, 0xad, 0xb1, 0xf6, 0x5e, 0x07, 0xcb,
-	0x43, 0x12, 0x97, 0xe6, 0xb7, 0xb6, 0x52, 0x3a, 0x47, 0x3b, 0xf9, 0x36, 0xda, 0xd1, 0x5e, 0x6d,
-	0x48, 0x56, 0x40, 0x22, 0x94, 0x04, 0x16, 0xa1, 0x81, 0x1d, 0xe0, 0xa4, 0xd8, 0x55, 0xea, 0xdf,
-	0x97, 0x86, 0x6c, 0xf2, 0xaf, 0x77, 0x55, 0x19, 0x9f, 0xf4, 0x99, 0xf5, 0x4e, 0xe7, 0xb3, 0x5e,
-	0x5b, 0x17, 0xc0, 0x8e, 0xcf, 0x2c, 0x61, 0xe6, 0xd6, 0x5e, 0xd3, 0x92, 0x81, 0xd9, 0x57, 0x25,
-	0x19, 0x74, 0x7c, 0x36, 0x18, 0x4b, 0x06, 0x7b, 0xcd, 0x81, 0x92, 0xfc, 0xd4, 0x97, 0x85, 0xdf,
-	0x71, 0x3a, 0x3e, 0x73, 0x9c, 0xb1, 0xc8, 0x71, 0xf6, 0x9a, 0x8e, 0xa3, 0x64, 0xfb, 0x73, 0x45,
-	0x9e, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x21, 0xab, 0x07, 0x2a, 0x21, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/keyword_plan_service.pb.go b/googleapis/ads/googleads/v1/services/keyword_plan_service.pb.go
index 466f89189f..b1d0c97875 100644
--- a/googleapis/ads/googleads/v1/services/keyword_plan_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/keyword_plan_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/keyword_plan_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [KeywordPlanService.GetKeywordPlan][google.ads.googleads.v1.services.KeywordPlanService.GetKeywordPlan].
 type GetKeywordPlanRequest struct {
@@ -42,16 +42,17 @@ func (m *GetKeywordPlanRequest) Reset()         { *m = GetKeywordPlanRequest{} }
 func (m *GetKeywordPlanRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKeywordPlanRequest) ProtoMessage()    {}
 func (*GetKeywordPlanRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{0}
+	return fileDescriptor_90c906905161d950, []int{0}
 }
+
 func (m *GetKeywordPlanRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKeywordPlanRequest.Unmarshal(m, b)
 }
 func (m *GetKeywordPlanRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKeywordPlanRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKeywordPlanRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKeywordPlanRequest.Merge(dst, src)
+func (m *GetKeywordPlanRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeywordPlanRequest.Merge(m, src)
 }
 func (m *GetKeywordPlanRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKeywordPlanRequest.Size(m)
@@ -92,16 +93,17 @@ func (m *MutateKeywordPlansRequest) Reset()         { *m = MutateKeywordPlansReq
 func (m *MutateKeywordPlansRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlansRequest) ProtoMessage()    {}
 func (*MutateKeywordPlansRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{1}
+	return fileDescriptor_90c906905161d950, []int{1}
 }
+
 func (m *MutateKeywordPlansRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlansRequest.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlansRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlansRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlansRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlansRequest.Merge(dst, src)
+func (m *MutateKeywordPlansRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlansRequest.Merge(m, src)
 }
 func (m *MutateKeywordPlansRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlansRequest.Size(m)
@@ -161,16 +163,17 @@ func (m *KeywordPlanOperation) Reset()         { *m = KeywordPlanOperation{} }
 func (m *KeywordPlanOperation) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanOperation) ProtoMessage()    {}
 func (*KeywordPlanOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{2}
+	return fileDescriptor_90c906905161d950, []int{2}
 }
+
 func (m *KeywordPlanOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanOperation.Unmarshal(m, b)
 }
 func (m *KeywordPlanOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanOperation.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanOperation.Merge(dst, src)
+func (m *KeywordPlanOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanOperation.Merge(m, src)
 }
 func (m *KeywordPlanOperation) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanOperation.Size(m)
@@ -238,95 +241,15 @@ func (m *KeywordPlanOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*KeywordPlanOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _KeywordPlanOperation_OneofMarshaler, _KeywordPlanOperation_OneofUnmarshaler, _KeywordPlanOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*KeywordPlanOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*KeywordPlanOperation_Create)(nil),
 		(*KeywordPlanOperation_Update)(nil),
 		(*KeywordPlanOperation_Remove)(nil),
 	}
 }
 
-func _KeywordPlanOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*KeywordPlanOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *KeywordPlanOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *KeywordPlanOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("KeywordPlanOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _KeywordPlanOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*KeywordPlanOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlan)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.KeywordPlan)
-		err := b.DecodeMessage(msg)
-		m.Operation = &KeywordPlanOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &KeywordPlanOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _KeywordPlanOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*KeywordPlanOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *KeywordPlanOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeywordPlanOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a keyword plan mutate.
 type MutateKeywordPlansResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -345,16 +268,17 @@ func (m *MutateKeywordPlansResponse) Reset()         { *m = MutateKeywordPlansRe
 func (m *MutateKeywordPlansResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlansResponse) ProtoMessage()    {}
 func (*MutateKeywordPlansResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{3}
+	return fileDescriptor_90c906905161d950, []int{3}
 }
+
 func (m *MutateKeywordPlansResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlansResponse.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlansResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlansResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlansResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlansResponse.Merge(dst, src)
+func (m *MutateKeywordPlansResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlansResponse.Merge(m, src)
 }
 func (m *MutateKeywordPlansResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlansResponse.Size(m)
@@ -392,16 +316,17 @@ func (m *MutateKeywordPlansResult) Reset()         { *m = MutateKeywordPlansResu
 func (m *MutateKeywordPlansResult) String() string { return proto.CompactTextString(m) }
 func (*MutateKeywordPlansResult) ProtoMessage()    {}
 func (*MutateKeywordPlansResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{4}
+	return fileDescriptor_90c906905161d950, []int{4}
 }
+
 func (m *MutateKeywordPlansResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateKeywordPlansResult.Unmarshal(m, b)
 }
 func (m *MutateKeywordPlansResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateKeywordPlansResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateKeywordPlansResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateKeywordPlansResult.Merge(dst, src)
+func (m *MutateKeywordPlansResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateKeywordPlansResult.Merge(m, src)
 }
 func (m *MutateKeywordPlansResult) XXX_Size() int {
 	return xxx_messageInfo_MutateKeywordPlansResult.Size(m)
@@ -432,16 +357,17 @@ func (m *GenerateForecastMetricsRequest) Reset()         { *m = GenerateForecast
 func (m *GenerateForecastMetricsRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateForecastMetricsRequest) ProtoMessage()    {}
 func (*GenerateForecastMetricsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{5}
+	return fileDescriptor_90c906905161d950, []int{5}
 }
+
 func (m *GenerateForecastMetricsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateForecastMetricsRequest.Unmarshal(m, b)
 }
 func (m *GenerateForecastMetricsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateForecastMetricsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateForecastMetricsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateForecastMetricsRequest.Merge(dst, src)
+func (m *GenerateForecastMetricsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateForecastMetricsRequest.Merge(m, src)
 }
 func (m *GenerateForecastMetricsRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateForecastMetricsRequest.Size(m)
@@ -477,16 +403,17 @@ func (m *GenerateForecastMetricsResponse) Reset()         { *m = GenerateForecas
 func (m *GenerateForecastMetricsResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateForecastMetricsResponse) ProtoMessage()    {}
 func (*GenerateForecastMetricsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{6}
+	return fileDescriptor_90c906905161d950, []int{6}
 }
+
 func (m *GenerateForecastMetricsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateForecastMetricsResponse.Unmarshal(m, b)
 }
 func (m *GenerateForecastMetricsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateForecastMetricsResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateForecastMetricsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateForecastMetricsResponse.Merge(dst, src)
+func (m *GenerateForecastMetricsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateForecastMetricsResponse.Merge(m, src)
 }
 func (m *GenerateForecastMetricsResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateForecastMetricsResponse.Size(m)
@@ -535,16 +462,17 @@ func (m *KeywordPlanCampaignForecast) Reset()         { *m = KeywordPlanCampaign
 func (m *KeywordPlanCampaignForecast) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanCampaignForecast) ProtoMessage()    {}
 func (*KeywordPlanCampaignForecast) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{7}
+	return fileDescriptor_90c906905161d950, []int{7}
 }
+
 func (m *KeywordPlanCampaignForecast) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanCampaignForecast.Unmarshal(m, b)
 }
 func (m *KeywordPlanCampaignForecast) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanCampaignForecast.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanCampaignForecast) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanCampaignForecast.Merge(dst, src)
+func (m *KeywordPlanCampaignForecast) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanCampaignForecast.Merge(m, src)
 }
 func (m *KeywordPlanCampaignForecast) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanCampaignForecast.Size(m)
@@ -586,16 +514,17 @@ func (m *KeywordPlanAdGroupForecast) Reset()         { *m = KeywordPlanAdGroupFo
 func (m *KeywordPlanAdGroupForecast) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanAdGroupForecast) ProtoMessage()    {}
 func (*KeywordPlanAdGroupForecast) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{8}
+	return fileDescriptor_90c906905161d950, []int{8}
 }
+
 func (m *KeywordPlanAdGroupForecast) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanAdGroupForecast.Unmarshal(m, b)
 }
 func (m *KeywordPlanAdGroupForecast) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanAdGroupForecast.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanAdGroupForecast) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanAdGroupForecast.Merge(dst, src)
+func (m *KeywordPlanAdGroupForecast) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanAdGroupForecast.Merge(m, src)
 }
 func (m *KeywordPlanAdGroupForecast) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanAdGroupForecast.Size(m)
@@ -638,16 +567,17 @@ func (m *KeywordPlanKeywordForecast) Reset()         { *m = KeywordPlanKeywordFo
 func (m *KeywordPlanKeywordForecast) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanKeywordForecast) ProtoMessage()    {}
 func (*KeywordPlanKeywordForecast) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{9}
+	return fileDescriptor_90c906905161d950, []int{9}
 }
+
 func (m *KeywordPlanKeywordForecast) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanKeywordForecast.Unmarshal(m, b)
 }
 func (m *KeywordPlanKeywordForecast) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanKeywordForecast.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanKeywordForecast) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanKeywordForecast.Merge(dst, src)
+func (m *KeywordPlanKeywordForecast) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanKeywordForecast.Merge(m, src)
 }
 func (m *KeywordPlanKeywordForecast) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanKeywordForecast.Size(m)
@@ -693,16 +623,17 @@ func (m *ForecastMetrics) Reset()         { *m = ForecastMetrics{} }
 func (m *ForecastMetrics) String() string { return proto.CompactTextString(m) }
 func (*ForecastMetrics) ProtoMessage()    {}
 func (*ForecastMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{10}
+	return fileDescriptor_90c906905161d950, []int{10}
 }
+
 func (m *ForecastMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ForecastMetrics.Unmarshal(m, b)
 }
 func (m *ForecastMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ForecastMetrics.Marshal(b, m, deterministic)
 }
-func (dst *ForecastMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ForecastMetrics.Merge(dst, src)
+func (m *ForecastMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ForecastMetrics.Merge(m, src)
 }
 func (m *ForecastMetrics) XXX_Size() int {
 	return xxx_messageInfo_ForecastMetrics.Size(m)
@@ -762,16 +693,17 @@ func (m *GenerateHistoricalMetricsRequest) Reset()         { *m = GenerateHistor
 func (m *GenerateHistoricalMetricsRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateHistoricalMetricsRequest) ProtoMessage()    {}
 func (*GenerateHistoricalMetricsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{11}
+	return fileDescriptor_90c906905161d950, []int{11}
 }
+
 func (m *GenerateHistoricalMetricsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateHistoricalMetricsRequest.Unmarshal(m, b)
 }
 func (m *GenerateHistoricalMetricsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateHistoricalMetricsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateHistoricalMetricsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateHistoricalMetricsRequest.Merge(dst, src)
+func (m *GenerateHistoricalMetricsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateHistoricalMetricsRequest.Merge(m, src)
 }
 func (m *GenerateHistoricalMetricsRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateHistoricalMetricsRequest.Size(m)
@@ -802,16 +734,17 @@ func (m *GenerateHistoricalMetricsResponse) Reset()         { *m = GenerateHisto
 func (m *GenerateHistoricalMetricsResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateHistoricalMetricsResponse) ProtoMessage()    {}
 func (*GenerateHistoricalMetricsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{12}
+	return fileDescriptor_90c906905161d950, []int{12}
 }
+
 func (m *GenerateHistoricalMetricsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateHistoricalMetricsResponse.Unmarshal(m, b)
 }
 func (m *GenerateHistoricalMetricsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateHistoricalMetricsResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateHistoricalMetricsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateHistoricalMetricsResponse.Merge(dst, src)
+func (m *GenerateHistoricalMetricsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateHistoricalMetricsResponse.Merge(m, src)
 }
 func (m *GenerateHistoricalMetricsResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateHistoricalMetricsResponse.Size(m)
@@ -851,16 +784,17 @@ func (m *KeywordPlanKeywordHistoricalMetrics) Reset()         { *m = KeywordPlan
 func (m *KeywordPlanKeywordHistoricalMetrics) String() string { return proto.CompactTextString(m) }
 func (*KeywordPlanKeywordHistoricalMetrics) ProtoMessage()    {}
 func (*KeywordPlanKeywordHistoricalMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_plan_service_b419730041d0dd6d, []int{13}
+	return fileDescriptor_90c906905161d950, []int{13}
 }
+
 func (m *KeywordPlanKeywordHistoricalMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeywordPlanKeywordHistoricalMetrics.Unmarshal(m, b)
 }
 func (m *KeywordPlanKeywordHistoricalMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeywordPlanKeywordHistoricalMetrics.Marshal(b, m, deterministic)
 }
-func (dst *KeywordPlanKeywordHistoricalMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeywordPlanKeywordHistoricalMetrics.Merge(dst, src)
+func (m *KeywordPlanKeywordHistoricalMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeywordPlanKeywordHistoricalMetrics.Merge(m, src)
 }
 func (m *KeywordPlanKeywordHistoricalMetrics) XXX_Size() int {
 	return xxx_messageInfo_KeywordPlanKeywordHistoricalMetrics.Size(m)
@@ -902,6 +836,92 @@ func init() {
 	proto.RegisterType((*KeywordPlanKeywordHistoricalMetrics)(nil), "google.ads.googleads.v1.services.KeywordPlanKeywordHistoricalMetrics")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_service.proto", fileDescriptor_90c906905161d950)
+}
+
+var fileDescriptor_90c906905161d950 = []byte{
+	// 1234 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x41, 0x6f, 0xdc, 0x44,
+	0x14, 0xc6, 0x1b, 0x48, 0xe9, 0xdb, 0xd0, 0x36, 0x53, 0xaa, 0x6e, 0xb7, 0xa5, 0x4d, 0xdd, 0x4a,
+	0x54, 0x39, 0xd8, 0x6c, 0xa8, 0x02, 0x72, 0x52, 0xca, 0x26, 0x24, 0x9b, 0x02, 0xa1, 0x61, 0x8b,
+	0x72, 0x40, 0xa1, 0xd6, 0xd4, 0x9e, 0x2c, 0x66, 0x6d, 0x8f, 0x3b, 0x63, 0x6f, 0x15, 0x55, 0xbd,
+	0x20, 0xc4, 0x91, 0x0b, 0xff, 0x80, 0x23, 0x37, 0xc4, 0x8d, 0x9f, 0x80, 0xa8, 0x38, 0x70, 0xe3,
+	0x88, 0x10, 0x07, 0x4e, 0x1c, 0x39, 0x21, 0x64, 0xcf, 0xcc, 0xd6, 0x6b, 0xaf, 0x93, 0xcd, 0xf6,
+	0x36, 0x7e, 0x7e, 0xef, 0x7b, 0xef, 0x7b, 0xef, 0xcd, 0xf3, 0x33, 0xac, 0xf4, 0x28, 0xed, 0xf9,
+	0xc4, 0xc4, 0x2e, 0x37, 0xc5, 0x31, 0x3d, 0x0d, 0x5a, 0x26, 0x27, 0x6c, 0xe0, 0x39, 0x84, 0x9b,
+	0x7d, 0x72, 0xf0, 0x88, 0x32, 0xd7, 0x8e, 0x7c, 0x1c, 0xda, 0x52, 0x6a, 0x44, 0x8c, 0xc6, 0x14,
+	0x2d, 0x08, 0x0b, 0x03, 0xbb, 0xdc, 0x18, 0x1a, 0x1b, 0x83, 0x96, 0xa1, 0x8c, 0x9b, 0x6f, 0x57,
+	0xc1, 0x3b, 0x34, 0x08, 0x68, 0x38, 0x0a, 0x2e, 0x64, 0x02, 0xbb, 0x79, 0xb3, 0xca, 0x92, 0x11,
+	0x4e, 0x13, 0x56, 0x8c, 0x4c, 0x5a, 0x5d, 0x52, 0x56, 0x91, 0x67, 0xe2, 0x30, 0xa4, 0x31, 0x8e,
+	0x3d, 0x1a, 0x72, 0xf9, 0x56, 0xc6, 0x6b, 0x66, 0x4f, 0x0f, 0x92, 0x7d, 0x73, 0xdf, 0x23, 0xbe,
+	0x6b, 0x07, 0x98, 0xf7, 0xa5, 0xc6, 0xe5, 0xa2, 0xc6, 0x23, 0x86, 0xa3, 0x88, 0x30, 0x85, 0x70,
+	0x5e, 0xbe, 0x67, 0x91, 0x63, 0xf2, 0x18, 0xc7, 0x89, 0x7c, 0xa1, 0xaf, 0xc2, 0xb9, 0x0e, 0x89,
+	0x3f, 0x10, 0x11, 0xed, 0xf8, 0x38, 0xec, 0x92, 0x87, 0x09, 0xe1, 0x31, 0xba, 0x06, 0xaf, 0xa8,
+	0x88, 0xed, 0x10, 0x07, 0xa4, 0xa1, 0x2d, 0x68, 0x37, 0x4e, 0x76, 0xe7, 0x94, 0xf0, 0x23, 0x1c,
+	0x10, 0xfd, 0x0f, 0x0d, 0x2e, 0x6c, 0x27, 0x31, 0x8e, 0x49, 0x0e, 0x81, 0x2b, 0x88, 0x2b, 0x50,
+	0x77, 0x12, 0x1e, 0xd3, 0x80, 0x30, 0xdb, 0x73, 0x25, 0x00, 0x28, 0xd1, 0x1d, 0x17, 0xed, 0x02,
+	0xd0, 0x88, 0x30, 0xc1, 0xb5, 0x51, 0x5b, 0x98, 0xb9, 0x51, 0x5f, 0x5a, 0x36, 0x8e, 0x2a, 0x8e,
+	0x91, 0xf3, 0x75, 0x57, 0x99, 0x77, 0x73, 0x48, 0xe8, 0x75, 0x38, 0x1d, 0x61, 0x16, 0x7b, 0xd8,
+	0xb7, 0xf7, 0xb1, 0xe7, 0x27, 0x8c, 0x34, 0x66, 0x16, 0xb4, 0x1b, 0x2f, 0x77, 0x4f, 0x49, 0xf1,
+	0xa6, 0x90, 0xa6, 0x24, 0x07, 0xd8, 0xf7, 0x5c, 0x1c, 0x13, 0x9b, 0x86, 0xfe, 0x41, 0xe3, 0xc5,
+	0x4c, 0x6d, 0x4e, 0x09, 0xef, 0x86, 0xfe, 0x81, 0xfe, 0x4d, 0x0d, 0x5e, 0x1d, 0xe7, 0x12, 0xad,
+	0x40, 0x3d, 0x89, 0x32, 0xdb, 0xb4, 0x12, 0x99, 0x6d, 0x7d, 0xa9, 0xa9, 0xe2, 0x57, 0xa5, 0x30,
+	0x36, 0xd3, 0x62, 0x6d, 0x63, 0xde, 0xef, 0x82, 0x50, 0x4f, 0xcf, 0x68, 0x0b, 0x66, 0x1d, 0x46,
+	0x70, 0x2c, 0x12, 0x5b, 0x5f, 0x32, 0x2a, 0x79, 0x0f, 0x1b, 0x27, 0x4f, 0x7c, 0xeb, 0x85, 0xae,
+	0xb4, 0x4f, 0x91, 0x04, 0x6e, 0xa3, 0x36, 0x2d, 0x92, 0xb0, 0x47, 0x0d, 0x98, 0x65, 0x24, 0xa0,
+	0x03, 0x91, 0xae, 0x93, 0xe9, 0x1b, 0xf1, 0xbc, 0x56, 0x87, 0x93, 0xc3, 0xfc, 0xea, 0x3f, 0x69,
+	0xd0, 0x1c, 0x57, 0x75, 0x1e, 0xd1, 0x90, 0x13, 0xb4, 0x09, 0xe7, 0x0a, 0xd9, 0xb7, 0x09, 0x63,
+	0x94, 0x65, 0xa0, 0xf5, 0x25, 0xa4, 0xc2, 0x63, 0x91, 0x63, 0xdc, 0xcb, 0x7a, 0xb1, 0x7b, 0x76,
+	0xb4, 0x2e, 0x1b, 0xa9, 0x3a, 0xfa, 0x04, 0x4e, 0x30, 0xc2, 0x13, 0x3f, 0x56, 0xad, 0x61, 0x1d,
+	0xdd, 0x1a, 0x63, 0xc3, 0x4a, 0xfc, 0xb8, 0xab, 0xa0, 0xf4, 0xdb, 0xd0, 0xa8, 0x52, 0x9a, 0xac,
+	0xe7, 0xd7, 0xe1, 0x72, 0x87, 0x84, 0x69, 0x2e, 0xc8, 0x26, 0x65, 0xc4, 0xc1, 0x3c, 0xde, 0x26,
+	0x31, 0xf3, 0x9c, 0x61, 0xdf, 0x5f, 0x85, 0xb9, 0xfc, 0x15, 0x97, 0x28, 0xf5, 0xfe, 0x33, 0x87,
+	0xfa, 0x5f, 0x35, 0xb8, 0x52, 0x89, 0x22, 0xf3, 0xe8, 0x03, 0x72, 0x70, 0x10, 0x61, 0xaf, 0x17,
+	0xda, 0xfb, 0x52, 0x87, 0x37, 0xb4, 0x2c, 0x15, 0xb7, 0x8e, 0x75, 0x4b, 0xd6, 0x25, 0x8c, 0xf2,
+	0xd4, 0x9d, 0x77, 0x0a, 0x12, 0x8e, 0xbe, 0x00, 0x84, 0x5d, 0xbb, 0xc7, 0x68, 0x12, 0xe5, 0xbc,
+	0x89, 0xc4, 0xaf, 0x1e, 0xcb, 0x5b, 0xdb, 0xed, 0xa4, 0x28, 0x43, 0x67, 0x67, 0xf0, 0xa8, 0x80,
+	0x23, 0x0f, 0xe6, 0x55, 0x82, 0x9e, 0xb9, 0x9a, 0x99, 0xc2, 0x95, 0x3c, 0x3e, 0x73, 0xd5, 0x1f,
+	0x15, 0x70, 0xfd, 0x57, 0x0d, 0x2e, 0x1e, 0x92, 0x09, 0xb4, 0x03, 0xe7, 0x46, 0x67, 0xb9, 0x54,
+	0x90, 0xb7, 0xf2, 0x52, 0xe9, 0x36, 0xdf, 0x8b, 0x99, 0x17, 0xf6, 0x76, 0xb1, 0x9f, 0x90, 0xee,
+	0xd9, 0x7e, 0x19, 0x19, 0xdd, 0x87, 0xf9, 0x52, 0xd9, 0xe4, 0xcd, 0x6c, 0x1d, 0x4d, 0xae, 0xd8,
+	0x0c, 0x67, 0x8a, 0x95, 0xd2, 0x7f, 0xd1, 0xa0, 0x59, 0x9d, 0x6d, 0x74, 0xb7, 0x40, 0x48, 0x15,
+	0x75, 0x22, 0x42, 0xa8, 0x5f, 0x02, 0x46, 0x9f, 0xc1, 0x7c, 0xa9, 0x31, 0xa6, 0xe7, 0x73, 0xba,
+	0xd0, 0x0c, 0xfa, 0xef, 0xa3, 0x74, 0x0a, 0x15, 0x45, 0xf7, 0xe1, 0xb5, 0xb1, 0x74, 0x6c, 0x29,
+	0x9d, 0x88, 0xd6, 0x85, 0x32, 0x2d, 0xe9, 0x07, 0xed, 0xc1, 0x99, 0x62, 0x2b, 0x3e, 0x07, 0xb9,
+	0x42, 0xfb, 0xe9, 0x3f, 0xd6, 0xe0, 0x74, 0x41, 0x09, 0xbd, 0x03, 0x75, 0x2f, 0x88, 0x18, 0xe1,
+	0x3c, 0xfb, 0xea, 0x55, 0xc5, 0xff, 0x1e, 0x4d, 0x1e, 0xf8, 0x44, 0xc4, 0x9f, 0x37, 0x40, 0x06,
+	0xcc, 0x38, 0x31, 0x93, 0x41, 0x1e, 0x6e, 0x97, 0x2a, 0xa2, 0x55, 0xa8, 0xe3, 0x01, 0x61, 0xb8,
+	0x47, 0x6c, 0x27, 0x72, 0xe4, 0x10, 0xbe, 0x58, 0xb2, 0xbb, 0x13, 0xc6, 0xcb, 0x37, 0x85, 0x19,
+	0x48, 0xfd, 0xf5, 0xc8, 0x41, 0x37, 0x61, 0xd6, 0xf1, 0x3d, 0xa7, 0xcf, 0x1b, 0x2f, 0x4d, 0xe0,
+	0x50, 0xea, 0xa6, 0x3e, 0x1d, 0xca, 0x63, 0x3b, 0xf0, 0x1c, 0x46, 0x79, 0x63, 0x76, 0x02, 0x9f,
+	0xa9, 0xfe, 0x76, 0xa6, 0xae, 0x6f, 0xc0, 0x82, 0x9a, 0x8d, 0x5b, 0x1e, 0x8f, 0x29, 0xf3, 0x1c,
+	0xec, 0x1f, 0x7f, 0xc6, 0x7e, 0xa5, 0xc1, 0xd5, 0x43, 0x70, 0xe4, 0x94, 0xb5, 0xe1, 0x44, 0x20,
+	0x44, 0x72, 0xb4, 0x6e, 0x4c, 0x33, 0x81, 0xca, 0xf8, 0x0a, 0x55, 0x7f, 0xaa, 0xc1, 0xb5, 0x09,
+	0x0c, 0xd0, 0x6d, 0x98, 0xe3, 0x04, 0x33, 0xe7, 0x73, 0xfb, 0x61, 0x42, 0xd8, 0xc1, 0x44, 0x8d,
+	0x5d, 0x17, 0x16, 0x1f, 0xa7, 0x06, 0x88, 0x80, 0xea, 0x3f, 0x5b, 0x31, 0x12, 0x4d, 0x52, 0x3d,
+	0x53, 0xe5, 0xe6, 0x9a, 0xdf, 0x06, 0x4a, 0x44, 0x4e, 0x49, 0x50, 0xf9, 0xbc, 0xf4, 0xf5, 0x09,
+	0x40, 0x39, 0x83, 0x7b, 0x22, 0x29, 0xe8, 0x07, 0x0d, 0x4e, 0x8d, 0x6e, 0x92, 0xe8, 0xad, 0xa3,
+	0x33, 0x39, 0x76, 0xf7, 0x6c, 0x1e, 0x73, 0x83, 0xd1, 0x97, 0xbf, 0xfc, 0xed, 0xcf, 0x6f, 0x6b,
+	0x6f, 0x20, 0x23, 0xdd, 0xb3, 0x1f, 0x8f, 0x7c, 0xc2, 0x6f, 0xa9, 0x75, 0x93, 0x9b, 0x8b, 0x66,
+	0xae, 0x3b, 0xb8, 0xb9, 0xf8, 0x04, 0x3d, 0xd5, 0x00, 0x95, 0x97, 0x01, 0xb4, 0x32, 0xdd, 0x9e,
+	0x21, 0x62, 0x5f, 0x9d, 0x72, 0x49, 0xc9, 0xba, 0x51, 0x5f, 0xcd, 0x98, 0x2c, 0xeb, 0xad, 0xec,
+	0x5f, 0x63, 0x18, 0xfa, 0xe3, 0xdc, 0x1e, 0x7d, 0x6b, 0xf1, 0xc9, 0x08, 0x11, 0x2b, 0xc8, 0xe0,
+	0x2c, 0x6d, 0x11, 0xfd, 0xa3, 0xc1, 0xf9, 0x8a, 0xad, 0x02, 0xbd, 0x3b, 0x49, 0x31, 0x0e, 0x5b,
+	0x6b, 0x9a, 0xed, 0xe7, 0x40, 0x90, 0xf4, 0x76, 0x32, 0x7a, 0xef, 0xeb, 0x1b, 0x59, 0xa1, 0xf2,
+	0x17, 0xf8, 0xb0, 0x3a, 0x59, 0xbd, 0xf1, 0xb0, 0x29, 0xe5, 0x7f, 0x35, 0xb8, 0x50, 0x79, 0xc9,
+	0xd1, 0xda, 0xe4, 0x21, 0x57, 0x4d, 0x9a, 0xe6, 0xfa, 0x73, 0x61, 0x48, 0xe2, 0xdd, 0x8c, 0xf8,
+	0x87, 0x7a, 0x67, 0x3a, 0xe2, 0x25, 0x60, 0x4b, 0x5b, 0x5c, 0xfb, 0x4f, 0x83, 0xeb, 0x0e, 0x0d,
+	0x8e, 0x0c, 0x6f, 0xed, 0x7c, 0xf9, 0xba, 0xee, 0xa4, 0xd3, 0x64, 0x47, 0xfb, 0x74, 0x4b, 0x1a,
+	0xf7, 0xa8, 0x8f, 0xc3, 0x9e, 0x41, 0x59, 0xcf, 0xec, 0x91, 0x30, 0x9b, 0x35, 0xea, 0xef, 0x35,
+	0xf2, 0x78, 0xf5, 0x5f, 0xf6, 0x8a, 0x3a, 0x7c, 0x57, 0x9b, 0xe9, 0xb4, 0xdb, 0xdf, 0xd7, 0x16,
+	0x3a, 0x02, 0xb0, 0xed, 0x72, 0x43, 0x1c, 0xd3, 0xd3, 0x6e, 0xcb, 0x90, 0x8e, 0xf9, 0xcf, 0x4a,
+	0x65, 0xaf, 0xed, 0xf2, 0xbd, 0xa1, 0xca, 0xde, 0x6e, 0x6b, 0x4f, 0xa9, 0xfc, 0x5d, 0xbb, 0x2e,
+	0xe4, 0x96, 0xd5, 0x76, 0xb9, 0x65, 0x0d, 0x95, 0x2c, 0x6b, 0xb7, 0x65, 0x59, 0x4a, 0xed, 0xc1,
+	0x6c, 0x16, 0xe7, 0x9b, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xff, 0xb9, 0x04, 0x88, 0x0c, 0x10,
+	0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1082,89 +1102,3 @@ var _KeywordPlanService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/keyword_plan_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/keyword_plan_service.proto", fileDescriptor_keyword_plan_service_b419730041d0dd6d)
-}
-
-var fileDescriptor_keyword_plan_service_b419730041d0dd6d = []byte{
-	// 1234 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x41, 0x6f, 0xdc, 0x44,
-	0x14, 0xc6, 0x1b, 0x48, 0xe9, 0xdb, 0xd0, 0x36, 0x53, 0xaa, 0x6e, 0xb7, 0xa5, 0x4d, 0xdd, 0x4a,
-	0x54, 0x39, 0xd8, 0x6c, 0xa8, 0x02, 0x72, 0x52, 0xca, 0x26, 0x24, 0x9b, 0x02, 0xa1, 0x61, 0x8b,
-	0x72, 0x40, 0xa1, 0xd6, 0xd4, 0x9e, 0x2c, 0x66, 0x6d, 0x8f, 0x3b, 0x63, 0x6f, 0x15, 0x55, 0xbd,
-	0x20, 0xc4, 0x91, 0x0b, 0xff, 0x80, 0x23, 0x37, 0xc4, 0x8d, 0x9f, 0x80, 0xa8, 0x38, 0x70, 0xe3,
-	0x88, 0x10, 0x07, 0x4e, 0x1c, 0x39, 0x21, 0x64, 0xcf, 0xcc, 0xd6, 0x6b, 0xaf, 0x93, 0xcd, 0xf6,
-	0x36, 0x7e, 0x7e, 0xef, 0x7b, 0xef, 0x7b, 0xef, 0xcd, 0xf3, 0x33, 0xac, 0xf4, 0x28, 0xed, 0xf9,
-	0xc4, 0xc4, 0x2e, 0x37, 0xc5, 0x31, 0x3d, 0x0d, 0x5a, 0x26, 0x27, 0x6c, 0xe0, 0x39, 0x84, 0x9b,
-	0x7d, 0x72, 0xf0, 0x88, 0x32, 0xd7, 0x8e, 0x7c, 0x1c, 0xda, 0x52, 0x6a, 0x44, 0x8c, 0xc6, 0x14,
-	0x2d, 0x08, 0x0b, 0x03, 0xbb, 0xdc, 0x18, 0x1a, 0x1b, 0x83, 0x96, 0xa1, 0x8c, 0x9b, 0x6f, 0x57,
-	0xc1, 0x3b, 0x34, 0x08, 0x68, 0x38, 0x0a, 0x2e, 0x64, 0x02, 0xbb, 0x79, 0xb3, 0xca, 0x92, 0x11,
-	0x4e, 0x13, 0x56, 0x8c, 0x4c, 0x5a, 0x5d, 0x52, 0x56, 0x91, 0x67, 0xe2, 0x30, 0xa4, 0x31, 0x8e,
-	0x3d, 0x1a, 0x72, 0xf9, 0x56, 0xc6, 0x6b, 0x66, 0x4f, 0x0f, 0x92, 0x7d, 0x73, 0xdf, 0x23, 0xbe,
-	0x6b, 0x07, 0x98, 0xf7, 0xa5, 0xc6, 0xe5, 0xa2, 0xc6, 0x23, 0x86, 0xa3, 0x88, 0x30, 0x85, 0x70,
-	0x5e, 0xbe, 0x67, 0x91, 0x63, 0xf2, 0x18, 0xc7, 0x89, 0x7c, 0xa1, 0xaf, 0xc2, 0xb9, 0x0e, 0x89,
-	0x3f, 0x10, 0x11, 0xed, 0xf8, 0x38, 0xec, 0x92, 0x87, 0x09, 0xe1, 0x31, 0xba, 0x06, 0xaf, 0xa8,
-	0x88, 0xed, 0x10, 0x07, 0xa4, 0xa1, 0x2d, 0x68, 0x37, 0x4e, 0x76, 0xe7, 0x94, 0xf0, 0x23, 0x1c,
-	0x10, 0xfd, 0x0f, 0x0d, 0x2e, 0x6c, 0x27, 0x31, 0x8e, 0x49, 0x0e, 0x81, 0x2b, 0x88, 0x2b, 0x50,
-	0x77, 0x12, 0x1e, 0xd3, 0x80, 0x30, 0xdb, 0x73, 0x25, 0x00, 0x28, 0xd1, 0x1d, 0x17, 0xed, 0x02,
-	0xd0, 0x88, 0x30, 0xc1, 0xb5, 0x51, 0x5b, 0x98, 0xb9, 0x51, 0x5f, 0x5a, 0x36, 0x8e, 0x2a, 0x8e,
-	0x91, 0xf3, 0x75, 0x57, 0x99, 0x77, 0x73, 0x48, 0xe8, 0x75, 0x38, 0x1d, 0x61, 0x16, 0x7b, 0xd8,
-	0xb7, 0xf7, 0xb1, 0xe7, 0x27, 0x8c, 0x34, 0x66, 0x16, 0xb4, 0x1b, 0x2f, 0x77, 0x4f, 0x49, 0xf1,
-	0xa6, 0x90, 0xa6, 0x24, 0x07, 0xd8, 0xf7, 0x5c, 0x1c, 0x13, 0x9b, 0x86, 0xfe, 0x41, 0xe3, 0xc5,
-	0x4c, 0x6d, 0x4e, 0x09, 0xef, 0x86, 0xfe, 0x81, 0xfe, 0x4d, 0x0d, 0x5e, 0x1d, 0xe7, 0x12, 0xad,
-	0x40, 0x3d, 0x89, 0x32, 0xdb, 0xb4, 0x12, 0x99, 0x6d, 0x7d, 0xa9, 0xa9, 0xe2, 0x57, 0xa5, 0x30,
-	0x36, 0xd3, 0x62, 0x6d, 0x63, 0xde, 0xef, 0x82, 0x50, 0x4f, 0xcf, 0x68, 0x0b, 0x66, 0x1d, 0x46,
-	0x70, 0x2c, 0x12, 0x5b, 0x5f, 0x32, 0x2a, 0x79, 0x0f, 0x1b, 0x27, 0x4f, 0x7c, 0xeb, 0x85, 0xae,
-	0xb4, 0x4f, 0x91, 0x04, 0x6e, 0xa3, 0x36, 0x2d, 0x92, 0xb0, 0x47, 0x0d, 0x98, 0x65, 0x24, 0xa0,
-	0x03, 0x91, 0xae, 0x93, 0xe9, 0x1b, 0xf1, 0xbc, 0x56, 0x87, 0x93, 0xc3, 0xfc, 0xea, 0x3f, 0x69,
-	0xd0, 0x1c, 0x57, 0x75, 0x1e, 0xd1, 0x90, 0x13, 0xb4, 0x09, 0xe7, 0x0a, 0xd9, 0xb7, 0x09, 0x63,
-	0x94, 0x65, 0xa0, 0xf5, 0x25, 0xa4, 0xc2, 0x63, 0x91, 0x63, 0xdc, 0xcb, 0x7a, 0xb1, 0x7b, 0x76,
-	0xb4, 0x2e, 0x1b, 0xa9, 0x3a, 0xfa, 0x04, 0x4e, 0x30, 0xc2, 0x13, 0x3f, 0x56, 0xad, 0x61, 0x1d,
-	0xdd, 0x1a, 0x63, 0xc3, 0x4a, 0xfc, 0xb8, 0xab, 0xa0, 0xf4, 0xdb, 0xd0, 0xa8, 0x52, 0x9a, 0xac,
-	0xe7, 0xd7, 0xe1, 0x72, 0x87, 0x84, 0x69, 0x2e, 0xc8, 0x26, 0x65, 0xc4, 0xc1, 0x3c, 0xde, 0x26,
-	0x31, 0xf3, 0x9c, 0x61, 0xdf, 0x5f, 0x85, 0xb9, 0xfc, 0x15, 0x97, 0x28, 0xf5, 0xfe, 0x33, 0x87,
-	0xfa, 0x5f, 0x35, 0xb8, 0x52, 0x89, 0x22, 0xf3, 0xe8, 0x03, 0x72, 0x70, 0x10, 0x61, 0xaf, 0x17,
-	0xda, 0xfb, 0x52, 0x87, 0x37, 0xb4, 0x2c, 0x15, 0xb7, 0x8e, 0x75, 0x4b, 0xd6, 0x25, 0x8c, 0xf2,
-	0xd4, 0x9d, 0x77, 0x0a, 0x12, 0x8e, 0xbe, 0x00, 0x84, 0x5d, 0xbb, 0xc7, 0x68, 0x12, 0xe5, 0xbc,
-	0x89, 0xc4, 0xaf, 0x1e, 0xcb, 0x5b, 0xdb, 0xed, 0xa4, 0x28, 0x43, 0x67, 0x67, 0xf0, 0xa8, 0x80,
-	0x23, 0x0f, 0xe6, 0x55, 0x82, 0x9e, 0xb9, 0x9a, 0x99, 0xc2, 0x95, 0x3c, 0x3e, 0x73, 0xd5, 0x1f,
-	0x15, 0x70, 0xfd, 0x57, 0x0d, 0x2e, 0x1e, 0x92, 0x09, 0xb4, 0x03, 0xe7, 0x46, 0x67, 0xb9, 0x54,
-	0x90, 0xb7, 0xf2, 0x52, 0xe9, 0x36, 0xdf, 0x8b, 0x99, 0x17, 0xf6, 0x76, 0xb1, 0x9f, 0x90, 0xee,
-	0xd9, 0x7e, 0x19, 0x19, 0xdd, 0x87, 0xf9, 0x52, 0xd9, 0xe4, 0xcd, 0x6c, 0x1d, 0x4d, 0xae, 0xd8,
-	0x0c, 0x67, 0x8a, 0x95, 0xd2, 0x7f, 0xd1, 0xa0, 0x59, 0x9d, 0x6d, 0x74, 0xb7, 0x40, 0x48, 0x15,
-	0x75, 0x22, 0x42, 0xa8, 0x5f, 0x02, 0x46, 0x9f, 0xc1, 0x7c, 0xa9, 0x31, 0xa6, 0xe7, 0x73, 0xba,
-	0xd0, 0x0c, 0xfa, 0xef, 0xa3, 0x74, 0x0a, 0x15, 0x45, 0xf7, 0xe1, 0xb5, 0xb1, 0x74, 0x6c, 0x29,
-	0x9d, 0x88, 0xd6, 0x85, 0x32, 0x2d, 0xe9, 0x07, 0xed, 0xc1, 0x99, 0x62, 0x2b, 0x3e, 0x07, 0xb9,
-	0x42, 0xfb, 0xe9, 0x3f, 0xd6, 0xe0, 0x74, 0x41, 0x09, 0xbd, 0x03, 0x75, 0x2f, 0x88, 0x18, 0xe1,
-	0x3c, 0xfb, 0xea, 0x55, 0xc5, 0xff, 0x1e, 0x4d, 0x1e, 0xf8, 0x44, 0xc4, 0x9f, 0x37, 0x40, 0x06,
-	0xcc, 0x38, 0x31, 0x93, 0x41, 0x1e, 0x6e, 0x97, 0x2a, 0xa2, 0x55, 0xa8, 0xe3, 0x01, 0x61, 0xb8,
-	0x47, 0x6c, 0x27, 0x72, 0xe4, 0x10, 0xbe, 0x58, 0xb2, 0xbb, 0x13, 0xc6, 0xcb, 0x37, 0x85, 0x19,
-	0x48, 0xfd, 0xf5, 0xc8, 0x41, 0x37, 0x61, 0xd6, 0xf1, 0x3d, 0xa7, 0xcf, 0x1b, 0x2f, 0x4d, 0xe0,
-	0x50, 0xea, 0xa6, 0x3e, 0x1d, 0xca, 0x63, 0x3b, 0xf0, 0x1c, 0x46, 0x79, 0x63, 0x76, 0x02, 0x9f,
-	0xa9, 0xfe, 0x76, 0xa6, 0xae, 0x6f, 0xc0, 0x82, 0x9a, 0x8d, 0x5b, 0x1e, 0x8f, 0x29, 0xf3, 0x1c,
-	0xec, 0x1f, 0x7f, 0xc6, 0x7e, 0xa5, 0xc1, 0xd5, 0x43, 0x70, 0xe4, 0x94, 0xb5, 0xe1, 0x44, 0x20,
-	0x44, 0x72, 0xb4, 0x6e, 0x4c, 0x33, 0x81, 0xca, 0xf8, 0x0a, 0x55, 0x7f, 0xaa, 0xc1, 0xb5, 0x09,
-	0x0c, 0xd0, 0x6d, 0x98, 0xe3, 0x04, 0x33, 0xe7, 0x73, 0xfb, 0x61, 0x42, 0xd8, 0xc1, 0x44, 0x8d,
-	0x5d, 0x17, 0x16, 0x1f, 0xa7, 0x06, 0x88, 0x80, 0xea, 0x3f, 0x5b, 0x31, 0x12, 0x4d, 0x52, 0x3d,
-	0x53, 0xe5, 0xe6, 0x9a, 0xdf, 0x06, 0x4a, 0x44, 0x4e, 0x49, 0x50, 0xf9, 0xbc, 0xf4, 0xf5, 0x09,
-	0x40, 0x39, 0x83, 0x7b, 0x22, 0x29, 0xe8, 0x07, 0x0d, 0x4e, 0x8d, 0x6e, 0x92, 0xe8, 0xad, 0xa3,
-	0x33, 0x39, 0x76, 0xf7, 0x6c, 0x1e, 0x73, 0x83, 0xd1, 0x97, 0xbf, 0xfc, 0xed, 0xcf, 0x6f, 0x6b,
-	0x6f, 0x20, 0x23, 0xdd, 0xb3, 0x1f, 0x8f, 0x7c, 0xc2, 0x6f, 0xa9, 0x75, 0x93, 0x9b, 0x8b, 0x66,
-	0xae, 0x3b, 0xb8, 0xb9, 0xf8, 0x04, 0x3d, 0xd5, 0x00, 0x95, 0x97, 0x01, 0xb4, 0x32, 0xdd, 0x9e,
-	0x21, 0x62, 0x5f, 0x9d, 0x72, 0x49, 0xc9, 0xba, 0x51, 0x5f, 0xcd, 0x98, 0x2c, 0xeb, 0xad, 0xec,
-	0x5f, 0x63, 0x18, 0xfa, 0xe3, 0xdc, 0x1e, 0x7d, 0x6b, 0xf1, 0xc9, 0x08, 0x11, 0x2b, 0xc8, 0xe0,
-	0x2c, 0x6d, 0x11, 0xfd, 0xa3, 0xc1, 0xf9, 0x8a, 0xad, 0x02, 0xbd, 0x3b, 0x49, 0x31, 0x0e, 0x5b,
-	0x6b, 0x9a, 0xed, 0xe7, 0x40, 0x90, 0xf4, 0x76, 0x32, 0x7a, 0xef, 0xeb, 0x1b, 0x59, 0xa1, 0xf2,
-	0x17, 0xf8, 0xb0, 0x3a, 0x59, 0xbd, 0xf1, 0xb0, 0x29, 0xe5, 0x7f, 0x35, 0xb8, 0x50, 0x79, 0xc9,
-	0xd1, 0xda, 0xe4, 0x21, 0x57, 0x4d, 0x9a, 0xe6, 0xfa, 0x73, 0x61, 0x48, 0xe2, 0xdd, 0x8c, 0xf8,
-	0x87, 0x7a, 0x67, 0x3a, 0xe2, 0x25, 0x60, 0x4b, 0x5b, 0x5c, 0xfb, 0x4f, 0x83, 0xeb, 0x0e, 0x0d,
-	0x8e, 0x0c, 0x6f, 0xed, 0x7c, 0xf9, 0xba, 0xee, 0xa4, 0xd3, 0x64, 0x47, 0xfb, 0x74, 0x4b, 0x1a,
-	0xf7, 0xa8, 0x8f, 0xc3, 0x9e, 0x41, 0x59, 0xcf, 0xec, 0x91, 0x30, 0x9b, 0x35, 0xea, 0xef, 0x35,
-	0xf2, 0x78, 0xf5, 0x5f, 0xf6, 0x8a, 0x3a, 0x7c, 0x57, 0x9b, 0xe9, 0xb4, 0xdb, 0xdf, 0xd7, 0x16,
-	0x3a, 0x02, 0xb0, 0xed, 0x72, 0x43, 0x1c, 0xd3, 0xd3, 0x6e, 0xcb, 0x90, 0x8e, 0xf9, 0xcf, 0x4a,
-	0x65, 0xaf, 0xed, 0xf2, 0xbd, 0xa1, 0xca, 0xde, 0x6e, 0x6b, 0x4f, 0xa9, 0xfc, 0x5d, 0xbb, 0x2e,
-	0xe4, 0x96, 0xd5, 0x76, 0xb9, 0x65, 0x0d, 0x95, 0x2c, 0x6b, 0xb7, 0x65, 0x59, 0x4a, 0xed, 0xc1,
-	0x6c, 0x16, 0xe7, 0x9b, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xff, 0xb9, 0x04, 0x88, 0x0c, 0x10,
-	0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/keyword_view_service.pb.go b/googleapis/ads/googleads/v1/services/keyword_view_service.pb.go
index 0b36709961..1faf3e6cc2 100644
--- a/googleapis/ads/googleads/v1/services/keyword_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/keyword_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/keyword_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [KeywordViewService.GetKeywordView][google.ads.googleads.v1.services.KeywordViewService.GetKeywordView].
 type GetKeywordViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetKeywordViewRequest) Reset()         { *m = GetKeywordViewRequest{} }
 func (m *GetKeywordViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKeywordViewRequest) ProtoMessage()    {}
 func (*GetKeywordViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keyword_view_service_e831bad7780f5509, []int{0}
+	return fileDescriptor_eaf4cb0c6c667eaf, []int{0}
 }
+
 func (m *GetKeywordViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKeywordViewRequest.Unmarshal(m, b)
 }
 func (m *GetKeywordViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKeywordViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKeywordViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKeywordViewRequest.Merge(dst, src)
+func (m *GetKeywordViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeywordViewRequest.Merge(m, src)
 }
 func (m *GetKeywordViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKeywordViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetKeywordViewRequest)(nil), "google.ads.googleads.v1.services.GetKeywordViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/keyword_view_service.proto", fileDescriptor_eaf4cb0c6c667eaf)
+}
+
+var fileDescriptor_eaf4cb0c6c667eaf = []byte{
+	// 363 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4a, 0xc3, 0x50,
+	0x14, 0x86, 0x49, 0x04, 0xc1, 0xa0, 0x0e, 0x01, 0x51, 0x8a, 0x43, 0xa9, 0x1d, 0xa4, 0xc3, 0xbd,
+	0x46, 0x45, 0xe1, 0x56, 0x87, 0x74, 0xa9, 0x20, 0x48, 0xa9, 0x90, 0x41, 0x02, 0xe5, 0xda, 0x1c,
+	0x42, 0xb0, 0xc9, 0xad, 0xf7, 0xa4, 0x29, 0x22, 0x2e, 0xbe, 0x82, 0x6f, 0xe0, 0xe8, 0xe6, 0x5b,
+	0x88, 0xab, 0xaf, 0xe0, 0xe4, 0x43, 0x88, 0xa4, 0xb7, 0x37, 0xb4, 0x6a, 0xe8, 0xf6, 0x73, 0xf2,
+	0x7f, 0x7f, 0xce, 0xf9, 0x13, 0xab, 0x19, 0x0a, 0x11, 0x0e, 0x80, 0xf2, 0x00, 0xa9, 0x92, 0xb9,
+	0xca, 0x1c, 0x8a, 0x20, 0xb3, 0xa8, 0x0f, 0x48, 0x6f, 0xe0, 0x6e, 0x2c, 0x64, 0xd0, 0xcb, 0x22,
+	0x18, 0xf7, 0xa6, 0x53, 0x32, 0x94, 0x22, 0x15, 0x76, 0x55, 0x11, 0x84, 0x07, 0x48, 0x0a, 0x98,
+	0x64, 0x0e, 0xd1, 0x70, 0xe5, 0xb0, 0x2c, 0x5e, 0x02, 0x8a, 0x91, 0xfc, 0x9d, 0xaf, 0x72, 0x2b,
+	0xdb, 0x9a, 0x1a, 0x46, 0x94, 0x27, 0x89, 0x48, 0x79, 0x1a, 0x89, 0x04, 0xd5, 0xd3, 0xda, 0x89,
+	0xb5, 0xd1, 0x86, 0xf4, 0x5c, 0x61, 0x5e, 0x04, 0xe3, 0x2e, 0xdc, 0x8e, 0x00, 0x53, 0x7b, 0xc7,
+	0x5a, 0xd3, 0xb1, 0xbd, 0x84, 0xc7, 0xb0, 0x65, 0x54, 0x8d, 0xdd, 0x95, 0xee, 0xaa, 0x1e, 0x5e,
+	0xf0, 0x18, 0xf6, 0xdf, 0x0c, 0xcb, 0x9e, 0x61, 0x2f, 0xd5, 0xa6, 0xf6, 0xab, 0x61, 0xad, 0xcf,
+	0xa7, 0xda, 0xc7, 0x64, 0xd1, 0x79, 0xe4, 0xdf, 0x3d, 0x2a, 0xa4, 0x14, 0x2c, 0xae, 0x26, 0x33,
+	0x58, 0xed, 0xe8, 0xf1, 0xe3, 0xf3, 0xc9, 0xdc, 0xb3, 0x49, 0x5e, 0xcc, 0xfd, 0xdc, 0x09, 0xa7,
+	0xfd, 0x11, 0xa6, 0x22, 0x06, 0x89, 0xb4, 0xa1, 0x9b, 0xca, 0x19, 0xa4, 0x8d, 0x87, 0xd6, 0xb7,
+	0x61, 0xd5, 0xfb, 0x22, 0x5e, 0xb8, 0x66, 0x6b, 0xf3, 0xef, 0xc1, 0x9d, 0xbc, 0xca, 0x8e, 0x71,
+	0x75, 0x36, 0x85, 0x43, 0x31, 0xe0, 0x49, 0x48, 0x84, 0x0c, 0x69, 0x08, 0xc9, 0xa4, 0x68, 0xfd,
+	0xc1, 0x86, 0x11, 0x96, 0xff, 0x1e, 0x4d, 0x2d, 0x9e, 0xcd, 0xa5, 0xb6, 0xeb, 0xbe, 0x98, 0xd5,
+	0xb6, 0x0a, 0x74, 0x03, 0x24, 0x4a, 0xe6, 0xca, 0x73, 0xc8, 0xf4, 0xc5, 0xf8, 0xae, 0x2d, 0xbe,
+	0x1b, 0xa0, 0x5f, 0x58, 0x7c, 0xcf, 0xf1, 0xb5, 0xe5, 0xcb, 0xac, 0xab, 0x39, 0x63, 0x6e, 0x80,
+	0x8c, 0x15, 0x26, 0xc6, 0x3c, 0x87, 0x31, 0x6d, 0xbb, 0x5e, 0x9e, 0xec, 0x79, 0xf0, 0x13, 0x00,
+	0x00, 0xff, 0xff, 0x0d, 0x72, 0x33, 0x52, 0xc5, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _KeywordViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/keyword_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/keyword_view_service.proto", fileDescriptor_keyword_view_service_e831bad7780f5509)
-}
-
-var fileDescriptor_keyword_view_service_e831bad7780f5509 = []byte{
-	// 363 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4a, 0xc3, 0x50,
-	0x14, 0x86, 0x49, 0x04, 0xc1, 0xa0, 0x0e, 0x01, 0x51, 0x8a, 0x43, 0xa9, 0x1d, 0xa4, 0xc3, 0xbd,
-	0x46, 0x45, 0xe1, 0x56, 0x87, 0x74, 0xa9, 0x20, 0x48, 0xa9, 0x90, 0x41, 0x02, 0xe5, 0xda, 0x1c,
-	0x42, 0xb0, 0xc9, 0xad, 0xf7, 0xa4, 0x29, 0x22, 0x2e, 0xbe, 0x82, 0x6f, 0xe0, 0xe8, 0xe6, 0x5b,
-	0x88, 0xab, 0xaf, 0xe0, 0xe4, 0x43, 0x88, 0xa4, 0xb7, 0x37, 0xb4, 0x6a, 0xe8, 0xf6, 0x73, 0xf2,
-	0x7f, 0x7f, 0xce, 0xf9, 0x13, 0xab, 0x19, 0x0a, 0x11, 0x0e, 0x80, 0xf2, 0x00, 0xa9, 0x92, 0xb9,
-	0xca, 0x1c, 0x8a, 0x20, 0xb3, 0xa8, 0x0f, 0x48, 0x6f, 0xe0, 0x6e, 0x2c, 0x64, 0xd0, 0xcb, 0x22,
-	0x18, 0xf7, 0xa6, 0x53, 0x32, 0x94, 0x22, 0x15, 0x76, 0x55, 0x11, 0x84, 0x07, 0x48, 0x0a, 0x98,
-	0x64, 0x0e, 0xd1, 0x70, 0xe5, 0xb0, 0x2c, 0x5e, 0x02, 0x8a, 0x91, 0xfc, 0x9d, 0xaf, 0x72, 0x2b,
-	0xdb, 0x9a, 0x1a, 0x46, 0x94, 0x27, 0x89, 0x48, 0x79, 0x1a, 0x89, 0x04, 0xd5, 0xd3, 0xda, 0x89,
-	0xb5, 0xd1, 0x86, 0xf4, 0x5c, 0x61, 0x5e, 0x04, 0xe3, 0x2e, 0xdc, 0x8e, 0x00, 0x53, 0x7b, 0xc7,
-	0x5a, 0xd3, 0xb1, 0xbd, 0x84, 0xc7, 0xb0, 0x65, 0x54, 0x8d, 0xdd, 0x95, 0xee, 0xaa, 0x1e, 0x5e,
-	0xf0, 0x18, 0xf6, 0xdf, 0x0c, 0xcb, 0x9e, 0x61, 0x2f, 0xd5, 0xa6, 0xf6, 0xab, 0x61, 0xad, 0xcf,
-	0xa7, 0xda, 0xc7, 0x64, 0xd1, 0x79, 0xe4, 0xdf, 0x3d, 0x2a, 0xa4, 0x14, 0x2c, 0xae, 0x26, 0x33,
-	0x58, 0xed, 0xe8, 0xf1, 0xe3, 0xf3, 0xc9, 0xdc, 0xb3, 0x49, 0x5e, 0xcc, 0xfd, 0xdc, 0x09, 0xa7,
-	0xfd, 0x11, 0xa6, 0x22, 0x06, 0x89, 0xb4, 0xa1, 0x9b, 0xca, 0x19, 0xa4, 0x8d, 0x87, 0xd6, 0xb7,
-	0x61, 0xd5, 0xfb, 0x22, 0x5e, 0xb8, 0x66, 0x6b, 0xf3, 0xef, 0xc1, 0x9d, 0xbc, 0xca, 0x8e, 0x71,
-	0x75, 0x36, 0x85, 0x43, 0x31, 0xe0, 0x49, 0x48, 0x84, 0x0c, 0x69, 0x08, 0xc9, 0xa4, 0x68, 0xfd,
-	0xc1, 0x86, 0x11, 0x96, 0xff, 0x1e, 0x4d, 0x2d, 0x9e, 0xcd, 0xa5, 0xb6, 0xeb, 0xbe, 0x98, 0xd5,
-	0xb6, 0x0a, 0x74, 0x03, 0x24, 0x4a, 0xe6, 0xca, 0x73, 0xc8, 0xf4, 0xc5, 0xf8, 0xae, 0x2d, 0xbe,
-	0x1b, 0xa0, 0x5f, 0x58, 0x7c, 0xcf, 0xf1, 0xb5, 0xe5, 0xcb, 0xac, 0xab, 0x39, 0x63, 0x6e, 0x80,
-	0x8c, 0x15, 0x26, 0xc6, 0x3c, 0x87, 0x31, 0x6d, 0xbb, 0x5e, 0x9e, 0xec, 0x79, 0xf0, 0x13, 0x00,
-	0x00, 0xff, 0xff, 0x0d, 0x72, 0x33, 0x52, 0xc5, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/label_service.pb.go b/googleapis/ads/googleads/v1/services/label_service.pb.go
index 89bd15900c..74e74a6f2f 100644
--- a/googleapis/ads/googleads/v1/services/label_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/label_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/label_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [LabelService.GetLabel][google.ads.googleads.v1.services.LabelService.GetLabel].
 type GetLabelRequest struct {
@@ -41,16 +41,17 @@ func (m *GetLabelRequest) Reset()         { *m = GetLabelRequest{} }
 func (m *GetLabelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLabelRequest) ProtoMessage()    {}
 func (*GetLabelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_service_11259d6fcb5427fb, []int{0}
+	return fileDescriptor_43c34accccca4b63, []int{0}
 }
+
 func (m *GetLabelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLabelRequest.Unmarshal(m, b)
 }
 func (m *GetLabelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLabelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLabelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLabelRequest.Merge(dst, src)
+func (m *GetLabelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLabelRequest.Merge(m, src)
 }
 func (m *GetLabelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLabelRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateLabelsRequest) Reset()         { *m = MutateLabelsRequest{} }
 func (m *MutateLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateLabelsRequest) ProtoMessage()    {}
 func (*MutateLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_service_11259d6fcb5427fb, []int{1}
+	return fileDescriptor_43c34accccca4b63, []int{1}
 }
+
 func (m *MutateLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateLabelsRequest.Unmarshal(m, b)
 }
 func (m *MutateLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateLabelsRequest.Merge(dst, src)
+func (m *MutateLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateLabelsRequest.Merge(m, src)
 }
 func (m *MutateLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateLabelsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *LabelOperation) Reset()         { *m = LabelOperation{} }
 func (m *LabelOperation) String() string { return proto.CompactTextString(m) }
 func (*LabelOperation) ProtoMessage()    {}
 func (*LabelOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_service_11259d6fcb5427fb, []int{2}
+	return fileDescriptor_43c34accccca4b63, []int{2}
 }
+
 func (m *LabelOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelOperation.Unmarshal(m, b)
 }
 func (m *LabelOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelOperation.Marshal(b, m, deterministic)
 }
-func (dst *LabelOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelOperation.Merge(dst, src)
+func (m *LabelOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelOperation.Merge(m, src)
 }
 func (m *LabelOperation) XXX_Size() int {
 	return xxx_messageInfo_LabelOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *LabelOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LabelOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LabelOperation_OneofMarshaler, _LabelOperation_OneofUnmarshaler, _LabelOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LabelOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LabelOperation_Create)(nil),
 		(*LabelOperation_Update)(nil),
 		(*LabelOperation_Remove)(nil),
 	}
 }
 
-func _LabelOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *LabelOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *LabelOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *LabelOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("LabelOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LabelOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LabelOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.Label)
-		err := b.DecodeMessage(msg)
-		m.Operation = &LabelOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.Label)
-		err := b.DecodeMessage(msg)
-		m.Operation = &LabelOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &LabelOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LabelOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LabelOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *LabelOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a labels mutate.
 type MutateLabelsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateLabelsResponse) Reset()         { *m = MutateLabelsResponse{} }
 func (m *MutateLabelsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateLabelsResponse) ProtoMessage()    {}
 func (*MutateLabelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_service_11259d6fcb5427fb, []int{3}
+	return fileDescriptor_43c34accccca4b63, []int{3}
 }
+
 func (m *MutateLabelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateLabelsResponse.Unmarshal(m, b)
 }
 func (m *MutateLabelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateLabelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateLabelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateLabelsResponse.Merge(dst, src)
+func (m *MutateLabelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateLabelsResponse.Merge(m, src)
 }
 func (m *MutateLabelsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateLabelsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateLabelResult) Reset()         { *m = MutateLabelResult{} }
 func (m *MutateLabelResult) String() string { return proto.CompactTextString(m) }
 func (*MutateLabelResult) ProtoMessage()    {}
 func (*MutateLabelResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_service_11259d6fcb5427fb, []int{4}
+	return fileDescriptor_43c34accccca4b63, []int{4}
 }
+
 func (m *MutateLabelResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateLabelResult.Unmarshal(m, b)
 }
 func (m *MutateLabelResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateLabelResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateLabelResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateLabelResult.Merge(dst, src)
+func (m *MutateLabelResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateLabelResult.Merge(m, src)
 }
 func (m *MutateLabelResult) XXX_Size() int {
 	return xxx_messageInfo_MutateLabelResult.Size(m)
@@ -425,6 +350,58 @@ func init() {
 	proto.RegisterType((*MutateLabelResult)(nil), "google.ads.googleads.v1.services.MutateLabelResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/label_service.proto", fileDescriptor_43c34accccca4b63)
+}
+
+var fileDescriptor_43c34accccca4b63 = []byte{
+	// 699 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6b, 0xd4, 0x40,
+	0x14, 0x36, 0xa9, 0xd4, 0x76, 0xb2, 0xb6, 0x74, 0xaa, 0xb8, 0x2c, 0xa2, 0x4b, 0x2c, 0xb8, 0xac,
+	0x98, 0x74, 0xb7, 0x5a, 0x24, 0xa5, 0x87, 0x5d, 0xb0, 0xad, 0x60, 0x6d, 0x49, 0xa1, 0x07, 0x59,
+	0x08, 0xd3, 0xcd, 0x74, 0x09, 0x4d, 0x32, 0x71, 0x66, 0xb2, 0x52, 0x4a, 0x2f, 0xfe, 0x05, 0x4f,
+	0x5e, 0x3d, 0x0a, 0x1e, 0xfd, 0x13, 0x5e, 0x05, 0x7f, 0x80, 0x78, 0xf2, 0x17, 0x78, 0xf0, 0x20,
+	0x33, 0x93, 0x89, 0xbb, 0x95, 0xb2, 0xdd, 0xdb, 0xcb, 0x9b, 0xef, 0xfb, 0xde, 0x37, 0xef, 0xe5,
+	0x0d, 0x78, 0x32, 0x20, 0x64, 0x10, 0x63, 0x17, 0x85, 0xcc, 0x55, 0xa1, 0x88, 0x86, 0x2d, 0x97,
+	0x61, 0x3a, 0x8c, 0xfa, 0x98, 0xb9, 0x31, 0x3a, 0xc2, 0x71, 0x50, 0x7c, 0x3a, 0x19, 0x25, 0x9c,
+	0xc0, 0xba, 0x82, 0x3a, 0x28, 0x64, 0x4e, 0xc9, 0x72, 0x86, 0x2d, 0x47, 0xb3, 0x6a, 0x8f, 0x2f,
+	0xd3, 0xa5, 0x98, 0x91, 0x9c, 0x96, 0xc2, 0x4a, 0xb0, 0x76, 0x57, 0xc3, 0xb3, 0xc8, 0x45, 0x69,
+	0x4a, 0x38, 0xe2, 0x11, 0x49, 0x59, 0x71, 0x5a, 0x94, 0x73, 0xe5, 0xd7, 0x51, 0x7e, 0xec, 0x1e,
+	0x47, 0x38, 0x0e, 0x83, 0x04, 0xb1, 0x93, 0x02, 0x71, 0xef, 0x22, 0xe2, 0x2d, 0x45, 0x59, 0x86,
+	0xa9, 0x56, 0xb8, 0x53, 0x9c, 0xd3, 0xac, 0xef, 0x32, 0x8e, 0x78, 0x5e, 0x1c, 0xd8, 0xeb, 0x60,
+	0x71, 0x1b, 0xf3, 0x97, 0xc2, 0x8a, 0x8f, 0xdf, 0xe4, 0x98, 0x71, 0xf8, 0x00, 0xdc, 0xd4, 0x26,
+	0x83, 0x14, 0x25, 0xb8, 0x6a, 0xd4, 0x8d, 0xc6, 0xbc, 0x5f, 0xd1, 0xc9, 0x57, 0x28, 0xc1, 0xf6,
+	0x77, 0x03, 0x2c, 0xef, 0xe6, 0x1c, 0x71, 0x2c, 0xb9, 0x4c, 0x93, 0xef, 0x03, 0xab, 0x9f, 0x33,
+	0x4e, 0x12, 0x4c, 0x83, 0x28, 0x2c, 0xa8, 0x40, 0xa7, 0x5e, 0x84, 0x70, 0x1f, 0x00, 0x92, 0x61,
+	0xaa, 0xee, 0x57, 0x35, 0xeb, 0x33, 0x0d, 0xab, 0xbd, 0xea, 0x4c, 0xea, 0xa7, 0x23, 0xab, 0xec,
+	0x69, 0xa2, 0x3f, 0xa2, 0x01, 0x1f, 0x82, 0xc5, 0x0c, 0x51, 0x1e, 0xa1, 0x38, 0x38, 0x46, 0x51,
+	0x9c, 0x53, 0x5c, 0x9d, 0xa9, 0x1b, 0x8d, 0x39, 0x7f, 0xa1, 0x48, 0x6f, 0xa9, 0xac, 0xb8, 0xd8,
+	0x10, 0xc5, 0x51, 0x88, 0x38, 0x0e, 0x48, 0x1a, 0x9f, 0x56, 0xaf, 0x4b, 0x58, 0x45, 0x27, 0xf7,
+	0xd2, 0xf8, 0xd4, 0xfe, 0x63, 0x80, 0x85, 0xf1, 0x62, 0x70, 0x03, 0x58, 0x79, 0x26, 0x59, 0xa2,
+	0xe3, 0x92, 0x65, 0xb5, 0x6b, 0xda, 0xb3, 0x6e, 0xb9, 0xb3, 0x25, 0x86, 0xb2, 0x8b, 0xd8, 0x89,
+	0x0f, 0x14, 0x5c, 0xc4, 0xb0, 0x0b, 0x66, 0xfb, 0x14, 0x23, 0xae, 0xda, 0x68, 0xb5, 0x1b, 0x97,
+	0xde, 0xb5, 0xfc, 0x33, 0xd4, 0x65, 0x77, 0xae, 0xf9, 0x05, 0x53, 0x68, 0x28, 0xc5, 0xaa, 0x39,
+	0xbd, 0x86, 0x62, 0xc2, 0x2a, 0x98, 0xa5, 0x38, 0x21, 0x43, 0xd5, 0x9c, 0x79, 0x71, 0xa2, 0xbe,
+	0xbb, 0x16, 0x98, 0x2f, 0xbb, 0x69, 0x7f, 0x36, 0xc0, 0xad, 0xf1, 0xb9, 0xb2, 0x8c, 0xa4, 0x0c,
+	0xc3, 0x2d, 0x70, 0xfb, 0x42, 0x97, 0x03, 0x4c, 0x29, 0xa1, 0x52, 0xce, 0x6a, 0x43, 0x6d, 0x89,
+	0x66, 0x7d, 0xe7, 0x40, 0xfe, 0x61, 0xfe, 0xf2, 0x78, 0xff, 0x9f, 0x0b, 0x38, 0xdc, 0x05, 0x37,
+	0x28, 0x66, 0x79, 0xcc, 0xf5, 0xf0, 0xd7, 0x26, 0x0f, 0x7f, 0xc4, 0x90, 0x2f, 0xb9, 0xbe, 0xd6,
+	0xb0, 0x9f, 0x81, 0xa5, 0xff, 0x4e, 0xaf, 0xf4, 0x07, 0xb7, 0x7f, 0x98, 0xa0, 0x22, 0x49, 0x07,
+	0xaa, 0x0c, 0xfc, 0x60, 0x80, 0x39, 0xbd, 0x0b, 0xb0, 0x35, 0xd9, 0xd5, 0x85, 0xbd, 0xa9, 0x5d,
+	0x79, 0x2a, 0xf6, 0xea, 0xbb, 0x6f, 0x3f, 0xdf, 0x9b, 0x4d, 0xd8, 0x10, 0x0f, 0xc2, 0xd9, 0x98,
+	0xd5, 0x4d, 0xbd, 0x2a, 0xcc, 0x6d, 0xaa, 0x17, 0x82, 0xb9, 0xcd, 0x73, 0xf8, 0xc5, 0x00, 0x95,
+	0xd1, 0xb1, 0xc0, 0xa7, 0x53, 0x75, 0x4d, 0xaf, 0x67, 0x6d, 0x7d, 0x5a, 0x9a, 0x9a, 0xbe, 0xbd,
+	0x2e, 0x1d, 0xaf, 0xda, 0x8f, 0x84, 0xe3, 0x7f, 0x16, 0xcf, 0x46, 0x76, 0x7d, 0xb3, 0x79, 0x5e,
+	0x18, 0xf6, 0x12, 0x29, 0xe1, 0x19, 0xcd, 0xee, 0x6f, 0x03, 0xac, 0xf4, 0x49, 0x32, 0xb1, 0x6a,
+	0x77, 0x69, 0x74, 0x14, 0xfb, 0x62, 0xa5, 0xf6, 0x8d, 0xd7, 0x3b, 0x05, 0x6d, 0x40, 0x62, 0x94,
+	0x0e, 0x1c, 0x42, 0x07, 0xee, 0x00, 0xa7, 0x72, 0xe1, 0xf4, 0xa3, 0x9a, 0x45, 0xec, 0xf2, 0xb7,
+	0x7b, 0x43, 0x07, 0x1f, 0xcd, 0x99, 0xed, 0x4e, 0xe7, 0x93, 0x59, 0xdf, 0x56, 0x82, 0x9d, 0x90,
+	0x39, 0x2a, 0x14, 0xd1, 0x61, 0xcb, 0x29, 0x0a, 0xb3, 0xaf, 0x1a, 0xd2, 0xeb, 0x84, 0xac, 0x57,
+	0x42, 0x7a, 0x87, 0xad, 0x9e, 0x86, 0xfc, 0x32, 0x57, 0x54, 0xde, 0xf3, 0x3a, 0x21, 0xf3, 0xbc,
+	0x12, 0xe4, 0x79, 0x87, 0x2d, 0xcf, 0xd3, 0xb0, 0xa3, 0x59, 0xe9, 0x73, 0xed, 0x6f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x38, 0xc2, 0xb6, 0xf8, 0x62, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -533,55 +510,3 @@ var _LabelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/label_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/label_service.proto", fileDescriptor_label_service_11259d6fcb5427fb)
-}
-
-var fileDescriptor_label_service_11259d6fcb5427fb = []byte{
-	// 699 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6b, 0xd4, 0x40,
-	0x14, 0x36, 0xa9, 0xd4, 0x76, 0xb2, 0xb6, 0x74, 0xaa, 0xb8, 0x2c, 0xa2, 0x4b, 0x2c, 0xb8, 0xac,
-	0x98, 0x74, 0xb7, 0x5a, 0x24, 0xa5, 0x87, 0x5d, 0xb0, 0xad, 0x60, 0x6d, 0x49, 0xa1, 0x07, 0x59,
-	0x08, 0xd3, 0xcd, 0x74, 0x09, 0x4d, 0x32, 0x71, 0x66, 0xb2, 0x52, 0x4a, 0x2f, 0xfe, 0x05, 0x4f,
-	0x5e, 0x3d, 0x0a, 0x1e, 0xfd, 0x13, 0x5e, 0x05, 0x7f, 0x80, 0x78, 0xf2, 0x17, 0x78, 0xf0, 0x20,
-	0x33, 0x93, 0x89, 0xbb, 0x95, 0xb2, 0xdd, 0xdb, 0xcb, 0x9b, 0xef, 0xfb, 0xde, 0x37, 0xef, 0xe5,
-	0x0d, 0x78, 0x32, 0x20, 0x64, 0x10, 0x63, 0x17, 0x85, 0xcc, 0x55, 0xa1, 0x88, 0x86, 0x2d, 0x97,
-	0x61, 0x3a, 0x8c, 0xfa, 0x98, 0xb9, 0x31, 0x3a, 0xc2, 0x71, 0x50, 0x7c, 0x3a, 0x19, 0x25, 0x9c,
-	0xc0, 0xba, 0x82, 0x3a, 0x28, 0x64, 0x4e, 0xc9, 0x72, 0x86, 0x2d, 0x47, 0xb3, 0x6a, 0x8f, 0x2f,
-	0xd3, 0xa5, 0x98, 0x91, 0x9c, 0x96, 0xc2, 0x4a, 0xb0, 0x76, 0x57, 0xc3, 0xb3, 0xc8, 0x45, 0x69,
-	0x4a, 0x38, 0xe2, 0x11, 0x49, 0x59, 0x71, 0x5a, 0x94, 0x73, 0xe5, 0xd7, 0x51, 0x7e, 0xec, 0x1e,
-	0x47, 0x38, 0x0e, 0x83, 0x04, 0xb1, 0x93, 0x02, 0x71, 0xef, 0x22, 0xe2, 0x2d, 0x45, 0x59, 0x86,
-	0xa9, 0x56, 0xb8, 0x53, 0x9c, 0xd3, 0xac, 0xef, 0x32, 0x8e, 0x78, 0x5e, 0x1c, 0xd8, 0xeb, 0x60,
-	0x71, 0x1b, 0xf3, 0x97, 0xc2, 0x8a, 0x8f, 0xdf, 0xe4, 0x98, 0x71, 0xf8, 0x00, 0xdc, 0xd4, 0x26,
-	0x83, 0x14, 0x25, 0xb8, 0x6a, 0xd4, 0x8d, 0xc6, 0xbc, 0x5f, 0xd1, 0xc9, 0x57, 0x28, 0xc1, 0xf6,
-	0x77, 0x03, 0x2c, 0xef, 0xe6, 0x1c, 0x71, 0x2c, 0xb9, 0x4c, 0x93, 0xef, 0x03, 0xab, 0x9f, 0x33,
-	0x4e, 0x12, 0x4c, 0x83, 0x28, 0x2c, 0xa8, 0x40, 0xa7, 0x5e, 0x84, 0x70, 0x1f, 0x00, 0x92, 0x61,
-	0xaa, 0xee, 0x57, 0x35, 0xeb, 0x33, 0x0d, 0xab, 0xbd, 0xea, 0x4c, 0xea, 0xa7, 0x23, 0xab, 0xec,
-	0x69, 0xa2, 0x3f, 0xa2, 0x01, 0x1f, 0x82, 0xc5, 0x0c, 0x51, 0x1e, 0xa1, 0x38, 0x38, 0x46, 0x51,
-	0x9c, 0x53, 0x5c, 0x9d, 0xa9, 0x1b, 0x8d, 0x39, 0x7f, 0xa1, 0x48, 0x6f, 0xa9, 0xac, 0xb8, 0xd8,
-	0x10, 0xc5, 0x51, 0x88, 0x38, 0x0e, 0x48, 0x1a, 0x9f, 0x56, 0xaf, 0x4b, 0x58, 0x45, 0x27, 0xf7,
-	0xd2, 0xf8, 0xd4, 0xfe, 0x63, 0x80, 0x85, 0xf1, 0x62, 0x70, 0x03, 0x58, 0x79, 0x26, 0x59, 0xa2,
-	0xe3, 0x92, 0x65, 0xb5, 0x6b, 0xda, 0xb3, 0x6e, 0xb9, 0xb3, 0x25, 0x86, 0xb2, 0x8b, 0xd8, 0x89,
-	0x0f, 0x14, 0x5c, 0xc4, 0xb0, 0x0b, 0x66, 0xfb, 0x14, 0x23, 0xae, 0xda, 0x68, 0xb5, 0x1b, 0x97,
-	0xde, 0xb5, 0xfc, 0x33, 0xd4, 0x65, 0x77, 0xae, 0xf9, 0x05, 0x53, 0x68, 0x28, 0xc5, 0xaa, 0x39,
-	0xbd, 0x86, 0x62, 0xc2, 0x2a, 0x98, 0xa5, 0x38, 0x21, 0x43, 0xd5, 0x9c, 0x79, 0x71, 0xa2, 0xbe,
-	0xbb, 0x16, 0x98, 0x2f, 0xbb, 0x69, 0x7f, 0x36, 0xc0, 0xad, 0xf1, 0xb9, 0xb2, 0x8c, 0xa4, 0x0c,
-	0xc3, 0x2d, 0x70, 0xfb, 0x42, 0x97, 0x03, 0x4c, 0x29, 0xa1, 0x52, 0xce, 0x6a, 0x43, 0x6d, 0x89,
-	0x66, 0x7d, 0xe7, 0x40, 0xfe, 0x61, 0xfe, 0xf2, 0x78, 0xff, 0x9f, 0x0b, 0x38, 0xdc, 0x05, 0x37,
-	0x28, 0x66, 0x79, 0xcc, 0xf5, 0xf0, 0xd7, 0x26, 0x0f, 0x7f, 0xc4, 0x90, 0x2f, 0xb9, 0xbe, 0xd6,
-	0xb0, 0x9f, 0x81, 0xa5, 0xff, 0x4e, 0xaf, 0xf4, 0x07, 0xb7, 0x7f, 0x98, 0xa0, 0x22, 0x49, 0x07,
-	0xaa, 0x0c, 0xfc, 0x60, 0x80, 0x39, 0xbd, 0x0b, 0xb0, 0x35, 0xd9, 0xd5, 0x85, 0xbd, 0xa9, 0x5d,
-	0x79, 0x2a, 0xf6, 0xea, 0xbb, 0x6f, 0x3f, 0xdf, 0x9b, 0x4d, 0xd8, 0x10, 0x0f, 0xc2, 0xd9, 0x98,
-	0xd5, 0x4d, 0xbd, 0x2a, 0xcc, 0x6d, 0xaa, 0x17, 0x82, 0xb9, 0xcd, 0x73, 0xf8, 0xc5, 0x00, 0x95,
-	0xd1, 0xb1, 0xc0, 0xa7, 0x53, 0x75, 0x4d, 0xaf, 0x67, 0x6d, 0x7d, 0x5a, 0x9a, 0x9a, 0xbe, 0xbd,
-	0x2e, 0x1d, 0xaf, 0xda, 0x8f, 0x84, 0xe3, 0x7f, 0x16, 0xcf, 0x46, 0x76, 0x7d, 0xb3, 0x79, 0x5e,
-	0x18, 0xf6, 0x12, 0x29, 0xe1, 0x19, 0xcd, 0xee, 0x6f, 0x03, 0xac, 0xf4, 0x49, 0x32, 0xb1, 0x6a,
-	0x77, 0x69, 0x74, 0x14, 0xfb, 0x62, 0xa5, 0xf6, 0x8d, 0xd7, 0x3b, 0x05, 0x6d, 0x40, 0x62, 0x94,
-	0x0e, 0x1c, 0x42, 0x07, 0xee, 0x00, 0xa7, 0x72, 0xe1, 0xf4, 0xa3, 0x9a, 0x45, 0xec, 0xf2, 0xb7,
-	0x7b, 0x43, 0x07, 0x1f, 0xcd, 0x99, 0xed, 0x4e, 0xe7, 0x93, 0x59, 0xdf, 0x56, 0x82, 0x9d, 0x90,
-	0x39, 0x2a, 0x14, 0xd1, 0x61, 0xcb, 0x29, 0x0a, 0xb3, 0xaf, 0x1a, 0xd2, 0xeb, 0x84, 0xac, 0x57,
-	0x42, 0x7a, 0x87, 0xad, 0x9e, 0x86, 0xfc, 0x32, 0x57, 0x54, 0xde, 0xf3, 0x3a, 0x21, 0xf3, 0xbc,
-	0x12, 0xe4, 0x79, 0x87, 0x2d, 0xcf, 0xd3, 0xb0, 0xa3, 0x59, 0xe9, 0x73, 0xed, 0x6f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x38, 0xc2, 0xb6, 0xf8, 0x62, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/landing_page_view_service.pb.go b/googleapis/ads/googleads/v1/services/landing_page_view_service.pb.go
index 8063d7b2b4..8fde2c997a 100644
--- a/googleapis/ads/googleads/v1/services/landing_page_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/landing_page_view_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/landing_page_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [LandingPageViewService.GetLandingPageView][google.ads.googleads.v1.services.LandingPageViewService.GetLandingPageView].
 type GetLandingPageViewRequest struct {
@@ -39,16 +39,17 @@ func (m *GetLandingPageViewRequest) Reset()         { *m = GetLandingPageViewReq
 func (m *GetLandingPageViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLandingPageViewRequest) ProtoMessage()    {}
 func (*GetLandingPageViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_landing_page_view_service_969504292394555a, []int{0}
+	return fileDescriptor_d96ac4a790ee5970, []int{0}
 }
+
 func (m *GetLandingPageViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLandingPageViewRequest.Unmarshal(m, b)
 }
 func (m *GetLandingPageViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLandingPageViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLandingPageViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLandingPageViewRequest.Merge(dst, src)
+func (m *GetLandingPageViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLandingPageViewRequest.Merge(m, src)
 }
 func (m *GetLandingPageViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLandingPageViewRequest.Size(m)
@@ -70,6 +71,39 @@ func init() {
 	proto.RegisterType((*GetLandingPageViewRequest)(nil), "google.ads.googleads.v1.services.GetLandingPageViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/landing_page_view_service.proto", fileDescriptor_d96ac4a790ee5970)
+}
+
+var fileDescriptor_d96ac4a790ee5970 = []byte{
+	// 387 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbf, 0x6a, 0xdb, 0x40,
+	0x18, 0x47, 0x2a, 0x14, 0x2a, 0xda, 0x45, 0x43, 0x69, 0xdd, 0x52, 0x8c, 0xeb, 0xa1, 0x78, 0xb8,
+	0x43, 0x6e, 0x97, 0x9e, 0x09, 0x58, 0x5e, 0x9c, 0x21, 0x04, 0xe3, 0x80, 0x86, 0x20, 0x10, 0x67,
+	0xeb, 0xcb, 0x21, 0xb0, 0xee, 0x94, 0x3b, 0x49, 0x1e, 0x42, 0x16, 0xbf, 0x42, 0xde, 0x20, 0x63,
+	0xde, 0x22, 0x6b, 0xd6, 0xac, 0x19, 0x33, 0xe5, 0x29, 0x82, 0x7c, 0x3a, 0x41, 0x1c, 0x0b, 0x6f,
+	0x3f, 0xdd, 0xf7, 0xfb, 0xf3, 0xdd, 0xef, 0xe4, 0x8c, 0x99, 0x10, 0x6c, 0x05, 0x98, 0xc6, 0x0a,
+	0x6b, 0x58, 0xa1, 0xd2, 0xc3, 0x0a, 0x64, 0x99, 0x2c, 0x41, 0xe1, 0x15, 0xe5, 0x71, 0xc2, 0x59,
+	0x94, 0x51, 0x06, 0x51, 0x99, 0xc0, 0x3a, 0xaa, 0x47, 0x28, 0x93, 0x22, 0x17, 0x6e, 0x57, 0xcb,
+	0x10, 0x8d, 0x15, 0x6a, 0x1c, 0x50, 0xe9, 0x21, 0xe3, 0xd0, 0xf9, 0xdf, 0x96, 0x21, 0x41, 0x89,
+	0x42, 0xee, 0x0d, 0xd1, 0xe6, 0x9d, 0x9f, 0x46, 0x9a, 0x25, 0x98, 0x72, 0x2e, 0x72, 0x9a, 0x27,
+	0x82, 0xab, 0x7a, 0xfa, 0xab, 0x9e, 0x6e, 0xbf, 0x16, 0xc5, 0x05, 0x5e, 0x4b, 0x9a, 0x65, 0x20,
+	0xeb, 0x79, 0x6f, 0xec, 0x7c, 0x9f, 0x42, 0x7e, 0xa2, 0xbd, 0x67, 0x94, 0x41, 0x90, 0xc0, 0x7a,
+	0x0e, 0x97, 0x05, 0xa8, 0xdc, 0xfd, 0xed, 0x7c, 0x31, 0xf9, 0x11, 0xa7, 0x29, 0x7c, 0xb3, 0xba,
+	0xd6, 0x9f, 0x4f, 0xf3, 0xcf, 0xe6, 0xf0, 0x94, 0xa6, 0x30, 0x7c, 0xb2, 0x9c, 0xaf, 0x3b, 0xfa,
+	0x33, 0x7d, 0x2d, 0xf7, 0xde, 0x72, 0xdc, 0xf7, 0xee, 0xee, 0x08, 0x1d, 0xea, 0x03, 0xb5, 0xee,
+	0xd4, 0x19, 0xb6, 0x8a, 0x9b, 0xaa, 0xd0, 0x8e, 0xb4, 0x47, 0x36, 0x8f, 0xcf, 0x37, 0xf6, 0x3f,
+	0x77, 0x58, 0x35, 0x7a, 0xf5, 0xe6, 0x4a, 0x47, 0xcb, 0x42, 0xe5, 0x22, 0x05, 0xa9, 0xf0, 0xc0,
+	0x54, 0x6c, 0x74, 0x0a, 0x0f, 0xae, 0x27, 0x1b, 0xdb, 0xe9, 0x2f, 0x45, 0x7a, 0x70, 0xe5, 0xc9,
+	0x8f, 0xfd, 0x25, 0xcc, 0xaa, 0x9a, 0x67, 0xd6, 0xf9, 0x71, 0x6d, 0xc0, 0xc4, 0x8a, 0x72, 0x86,
+	0x84, 0x64, 0x98, 0x01, 0xdf, 0x3e, 0x82, 0x79, 0xf1, 0x2c, 0x51, 0xed, 0x3f, 0xd9, 0xc8, 0x80,
+	0x5b, 0xfb, 0xc3, 0xd4, 0xf7, 0xef, 0xec, 0xee, 0x54, 0x1b, 0xfa, 0xb1, 0x42, 0x1a, 0x56, 0x28,
+	0xf0, 0x50, 0x1d, 0xac, 0x1e, 0x0c, 0x25, 0xf4, 0x63, 0x15, 0x36, 0x94, 0x30, 0xf0, 0x42, 0x43,
+	0x79, 0xb1, 0xfb, 0xfa, 0x9c, 0x10, 0x3f, 0x56, 0x84, 0x34, 0x24, 0x42, 0x02, 0x8f, 0x10, 0x43,
+	0x5b, 0x7c, 0xdc, 0xee, 0xf9, 0xf7, 0x35, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xa1, 0x45, 0x50, 0x0b,
+	0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,36 +177,3 @@ var _LandingPageViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/landing_page_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/landing_page_view_service.proto", fileDescriptor_landing_page_view_service_969504292394555a)
-}
-
-var fileDescriptor_landing_page_view_service_969504292394555a = []byte{
-	// 387 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbf, 0x6a, 0xdb, 0x40,
-	0x18, 0x47, 0x2a, 0x14, 0x2a, 0xda, 0x45, 0x43, 0x69, 0xdd, 0x52, 0x8c, 0xeb, 0xa1, 0x78, 0xb8,
-	0x43, 0x6e, 0x97, 0x9e, 0x09, 0x58, 0x5e, 0x9c, 0x21, 0x04, 0xe3, 0x80, 0x86, 0x20, 0x10, 0x67,
-	0xeb, 0xcb, 0x21, 0xb0, 0xee, 0x94, 0x3b, 0x49, 0x1e, 0x42, 0x16, 0xbf, 0x42, 0xde, 0x20, 0x63,
-	0xde, 0x22, 0x6b, 0xd6, 0xac, 0x19, 0x33, 0xe5, 0x29, 0x82, 0x7c, 0x3a, 0x41, 0x1c, 0x0b, 0x6f,
-	0x3f, 0xdd, 0xf7, 0xfb, 0xf3, 0xdd, 0xef, 0xe4, 0x8c, 0x99, 0x10, 0x6c, 0x05, 0x98, 0xc6, 0x0a,
-	0x6b, 0x58, 0xa1, 0xd2, 0xc3, 0x0a, 0x64, 0x99, 0x2c, 0x41, 0xe1, 0x15, 0xe5, 0x71, 0xc2, 0x59,
-	0x94, 0x51, 0x06, 0x51, 0x99, 0xc0, 0x3a, 0xaa, 0x47, 0x28, 0x93, 0x22, 0x17, 0x6e, 0x57, 0xcb,
-	0x10, 0x8d, 0x15, 0x6a, 0x1c, 0x50, 0xe9, 0x21, 0xe3, 0xd0, 0xf9, 0xdf, 0x96, 0x21, 0x41, 0x89,
-	0x42, 0xee, 0x0d, 0xd1, 0xe6, 0x9d, 0x9f, 0x46, 0x9a, 0x25, 0x98, 0x72, 0x2e, 0x72, 0x9a, 0x27,
-	0x82, 0xab, 0x7a, 0xfa, 0xab, 0x9e, 0x6e, 0xbf, 0x16, 0xc5, 0x05, 0x5e, 0x4b, 0x9a, 0x65, 0x20,
-	0xeb, 0x79, 0x6f, 0xec, 0x7c, 0x9f, 0x42, 0x7e, 0xa2, 0xbd, 0x67, 0x94, 0x41, 0x90, 0xc0, 0x7a,
-	0x0e, 0x97, 0x05, 0xa8, 0xdc, 0xfd, 0xed, 0x7c, 0x31, 0xf9, 0x11, 0xa7, 0x29, 0x7c, 0xb3, 0xba,
-	0xd6, 0x9f, 0x4f, 0xf3, 0xcf, 0xe6, 0xf0, 0x94, 0xa6, 0x30, 0x7c, 0xb2, 0x9c, 0xaf, 0x3b, 0xfa,
-	0x33, 0x7d, 0x2d, 0xf7, 0xde, 0x72, 0xdc, 0xf7, 0xee, 0xee, 0x08, 0x1d, 0xea, 0x03, 0xb5, 0xee,
-	0xd4, 0x19, 0xb6, 0x8a, 0x9b, 0xaa, 0xd0, 0x8e, 0xb4, 0x47, 0x36, 0x8f, 0xcf, 0x37, 0xf6, 0x3f,
-	0x77, 0x58, 0x35, 0x7a, 0xf5, 0xe6, 0x4a, 0x47, 0xcb, 0x42, 0xe5, 0x22, 0x05, 0xa9, 0xf0, 0xc0,
-	0x54, 0x6c, 0x74, 0x0a, 0x0f, 0xae, 0x27, 0x1b, 0xdb, 0xe9, 0x2f, 0x45, 0x7a, 0x70, 0xe5, 0xc9,
-	0x8f, 0xfd, 0x25, 0xcc, 0xaa, 0x9a, 0x67, 0xd6, 0xf9, 0x71, 0x6d, 0xc0, 0xc4, 0x8a, 0x72, 0x86,
-	0x84, 0x64, 0x98, 0x01, 0xdf, 0x3e, 0x82, 0x79, 0xf1, 0x2c, 0x51, 0xed, 0x3f, 0xd9, 0xc8, 0x80,
-	0x5b, 0xfb, 0xc3, 0xd4, 0xf7, 0xef, 0xec, 0xee, 0x54, 0x1b, 0xfa, 0xb1, 0x42, 0x1a, 0x56, 0x28,
-	0xf0, 0x50, 0x1d, 0xac, 0x1e, 0x0c, 0x25, 0xf4, 0x63, 0x15, 0x36, 0x94, 0x30, 0xf0, 0x42, 0x43,
-	0x79, 0xb1, 0xfb, 0xfa, 0x9c, 0x10, 0x3f, 0x56, 0x84, 0x34, 0x24, 0x42, 0x02, 0x8f, 0x10, 0x43,
-	0x5b, 0x7c, 0xdc, 0xee, 0xf9, 0xf7, 0x35, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xa1, 0x45, 0x50, 0x0b,
-	0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/language_constant_service.pb.go b/googleapis/ads/googleads/v1/services/language_constant_service.pb.go
index f4ee9771c4..931128193d 100644
--- a/googleapis/ads/googleads/v1/services/language_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/language_constant_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/language_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [LanguageConstantService.GetLanguageConstant][google.ads.googleads.v1.services.LanguageConstantService.GetLanguageConstant].
 type GetLanguageConstantRequest struct {
@@ -38,16 +38,17 @@ func (m *GetLanguageConstantRequest) Reset()         { *m = GetLanguageConstantR
 func (m *GetLanguageConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLanguageConstantRequest) ProtoMessage()    {}
 func (*GetLanguageConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_constant_service_a8b709dbef4a243c, []int{0}
+	return fileDescriptor_167ba166e955dde1, []int{0}
 }
+
 func (m *GetLanguageConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLanguageConstantRequest.Unmarshal(m, b)
 }
 func (m *GetLanguageConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLanguageConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLanguageConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLanguageConstantRequest.Merge(dst, src)
+func (m *GetLanguageConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLanguageConstantRequest.Merge(m, src)
 }
 func (m *GetLanguageConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLanguageConstantRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetLanguageConstantRequest)(nil), "google.ads.googleads.v1.services.GetLanguageConstantRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/language_constant_service.proto", fileDescriptor_167ba166e955dde1)
+}
+
+var fileDescriptor_167ba166e955dde1 = []byte{
+	// 355 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x4d, 0x4a, 0xc3, 0x40,
+	0x14, 0x26, 0x11, 0x04, 0x07, 0xdd, 0xc4, 0x85, 0x12, 0xba, 0x28, 0xb5, 0xe0, 0xcf, 0x62, 0x86,
+	0xd8, 0x95, 0xa3, 0x82, 0x53, 0x17, 0x75, 0x21, 0x52, 0x2a, 0x74, 0x21, 0x81, 0x32, 0x36, 0xc3,
+	0x10, 0x68, 0x67, 0x6a, 0xde, 0xb4, 0x1b, 0x71, 0xa3, 0x47, 0xf0, 0x06, 0x2e, 0xbd, 0x81, 0x57,
+	0x70, 0x2b, 0xde, 0xc0, 0x95, 0xa7, 0x90, 0x74, 0x32, 0x01, 0x4b, 0x43, 0x77, 0x1f, 0xf3, 0xbe,
+	0x9f, 0xf7, 0xbe, 0x04, 0x5d, 0x48, 0xad, 0xe5, 0x48, 0x10, 0x9e, 0x00, 0xb1, 0x30, 0x47, 0xb3,
+	0x88, 0x80, 0xc8, 0x66, 0xe9, 0x50, 0x00, 0x19, 0x71, 0x25, 0xa7, 0x5c, 0x8a, 0xc1, 0x50, 0x2b,
+	0x30, 0x5c, 0x99, 0x41, 0x31, 0xc2, 0x93, 0x4c, 0x1b, 0x1d, 0xd4, 0xad, 0x0c, 0xf3, 0x04, 0x70,
+	0xe9, 0x80, 0x67, 0x11, 0x76, 0x0e, 0xe1, 0x49, 0x55, 0x46, 0x26, 0x40, 0x4f, 0xb3, 0xa5, 0x21,
+	0xd6, 0x3c, 0xac, 0x39, 0xe9, 0x24, 0x25, 0x5c, 0x29, 0x6d, 0xb8, 0x49, 0xb5, 0x02, 0x3b, 0x6d,
+	0x30, 0x14, 0x76, 0x84, 0xb9, 0x2e, 0xb4, 0x97, 0x85, 0xb4, 0x27, 0x1e, 0xa6, 0x02, 0x4c, 0xb0,
+	0x87, 0xb6, 0x5c, 0xc0, 0x40, 0xf1, 0xb1, 0xd8, 0xf5, 0xea, 0xde, 0xc1, 0x46, 0x6f, 0xd3, 0x3d,
+	0xde, 0xf0, 0xb1, 0x38, 0xfe, 0xf6, 0xd0, 0xce, 0xa2, 0xc1, 0xad, 0x5d, 0x3c, 0xf8, 0xf0, 0xd0,
+	0xf6, 0x12, 0xff, 0xe0, 0x0c, 0xaf, 0x3a, 0x19, 0x57, 0xaf, 0x15, 0xb6, 0x2a, 0xd5, 0x65, 0x1d,
+	0x78, 0x51, 0xdb, 0x20, 0xcf, 0x5f, 0x3f, 0xaf, 0xfe, 0x61, 0xb0, 0x9f, 0xd7, 0xf6, 0xf8, 0xef,
+	0xac, 0xf3, 0xd1, 0x02, 0x19, 0xc8, 0xd1, 0x53, 0xfb, 0xc5, 0x47, 0xcd, 0xa1, 0x1e, 0xaf, 0xdc,
+	0xb4, 0x5d, 0xab, 0xb8, 0xbe, 0x9b, 0x37, 0xdc, 0xf5, 0xee, 0xae, 0x0a, 0x07, 0xa9, 0xf3, 0x1c,
+	0xac, 0x33, 0x49, 0xa4, 0x50, 0xf3, 0xfe, 0xdd, 0xc7, 0x9c, 0xa4, 0x50, 0xfd, 0xff, 0x9c, 0x3a,
+	0xf0, 0xe6, 0xaf, 0x75, 0x18, 0x7b, 0xf7, 0xeb, 0x1d, 0x6b, 0xc8, 0x12, 0xc0, 0x16, 0xe6, 0xa8,
+	0x1f, 0xe1, 0x22, 0x18, 0x3e, 0x1d, 0x25, 0x66, 0x09, 0xc4, 0x25, 0x25, 0xee, 0x47, 0xb1, 0xa3,
+	0xfc, 0xfa, 0x4d, 0xfb, 0x4e, 0x29, 0x4b, 0x80, 0xd2, 0x92, 0x44, 0x69, 0x3f, 0xa2, 0xd4, 0xd1,
+	0xee, 0xd7, 0xe7, 0x7b, 0xb6, 0xfe, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xf6, 0xfe, 0xfa, 0xe6,
+	0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _LanguageConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/language_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/language_constant_service.proto", fileDescriptor_language_constant_service_a8b709dbef4a243c)
-}
-
-var fileDescriptor_language_constant_service_a8b709dbef4a243c = []byte{
-	// 355 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x4d, 0x4a, 0xc3, 0x40,
-	0x14, 0x26, 0x11, 0x04, 0x07, 0xdd, 0xc4, 0x85, 0x12, 0xba, 0x28, 0xb5, 0xe0, 0xcf, 0x62, 0x86,
-	0xd8, 0x95, 0xa3, 0x82, 0x53, 0x17, 0x75, 0x21, 0x52, 0x2a, 0x74, 0x21, 0x81, 0x32, 0x36, 0xc3,
-	0x10, 0x68, 0x67, 0x6a, 0xde, 0xb4, 0x1b, 0x71, 0xa3, 0x47, 0xf0, 0x06, 0x2e, 0xbd, 0x81, 0x57,
-	0x70, 0x2b, 0xde, 0xc0, 0x95, 0xa7, 0x90, 0x74, 0x32, 0x01, 0x4b, 0x43, 0x77, 0x1f, 0xf3, 0xbe,
-	0x9f, 0xf7, 0xbe, 0x04, 0x5d, 0x48, 0xad, 0xe5, 0x48, 0x10, 0x9e, 0x00, 0xb1, 0x30, 0x47, 0xb3,
-	0x88, 0x80, 0xc8, 0x66, 0xe9, 0x50, 0x00, 0x19, 0x71, 0x25, 0xa7, 0x5c, 0x8a, 0xc1, 0x50, 0x2b,
-	0x30, 0x5c, 0x99, 0x41, 0x31, 0xc2, 0x93, 0x4c, 0x1b, 0x1d, 0xd4, 0xad, 0x0c, 0xf3, 0x04, 0x70,
-	0xe9, 0x80, 0x67, 0x11, 0x76, 0x0e, 0xe1, 0x49, 0x55, 0x46, 0x26, 0x40, 0x4f, 0xb3, 0xa5, 0x21,
-	0xd6, 0x3c, 0xac, 0x39, 0xe9, 0x24, 0x25, 0x5c, 0x29, 0x6d, 0xb8, 0x49, 0xb5, 0x02, 0x3b, 0x6d,
-	0x30, 0x14, 0x76, 0x84, 0xb9, 0x2e, 0xb4, 0x97, 0x85, 0xb4, 0x27, 0x1e, 0xa6, 0x02, 0x4c, 0xb0,
-	0x87, 0xb6, 0x5c, 0xc0, 0x40, 0xf1, 0xb1, 0xd8, 0xf5, 0xea, 0xde, 0xc1, 0x46, 0x6f, 0xd3, 0x3d,
-	0xde, 0xf0, 0xb1, 0x38, 0xfe, 0xf6, 0xd0, 0xce, 0xa2, 0xc1, 0xad, 0x5d, 0x3c, 0xf8, 0xf0, 0xd0,
-	0xf6, 0x12, 0xff, 0xe0, 0x0c, 0xaf, 0x3a, 0x19, 0x57, 0xaf, 0x15, 0xb6, 0x2a, 0xd5, 0x65, 0x1d,
-	0x78, 0x51, 0xdb, 0x20, 0xcf, 0x5f, 0x3f, 0xaf, 0xfe, 0x61, 0xb0, 0x9f, 0xd7, 0xf6, 0xf8, 0xef,
-	0xac, 0xf3, 0xd1, 0x02, 0x19, 0xc8, 0xd1, 0x53, 0xfb, 0xc5, 0x47, 0xcd, 0xa1, 0x1e, 0xaf, 0xdc,
-	0xb4, 0x5d, 0xab, 0xb8, 0xbe, 0x9b, 0x37, 0xdc, 0xf5, 0xee, 0xae, 0x0a, 0x07, 0xa9, 0xf3, 0x1c,
-	0xac, 0x33, 0x49, 0xa4, 0x50, 0xf3, 0xfe, 0xdd, 0xc7, 0x9c, 0xa4, 0x50, 0xfd, 0xff, 0x9c, 0x3a,
-	0xf0, 0xe6, 0xaf, 0x75, 0x18, 0x7b, 0xf7, 0xeb, 0x1d, 0x6b, 0xc8, 0x12, 0xc0, 0x16, 0xe6, 0xa8,
-	0x1f, 0xe1, 0x22, 0x18, 0x3e, 0x1d, 0x25, 0x66, 0x09, 0xc4, 0x25, 0x25, 0xee, 0x47, 0xb1, 0xa3,
-	0xfc, 0xfa, 0x4d, 0xfb, 0x4e, 0x29, 0x4b, 0x80, 0xd2, 0x92, 0x44, 0x69, 0x3f, 0xa2, 0xd4, 0xd1,
-	0xee, 0xd7, 0xe7, 0x7b, 0xb6, 0xfe, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xf6, 0xfe, 0xfa, 0xe6,
-	0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/location_view_service.pb.go b/googleapis/ads/googleads/v1/services/location_view_service.pb.go
index 476216f0bb..159d063c32 100644
--- a/googleapis/ads/googleads/v1/services/location_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/location_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/location_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [LocationViewService.GetLocationView][google.ads.googleads.v1.services.LocationViewService.GetLocationView].
 type GetLocationViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetLocationViewRequest) Reset()         { *m = GetLocationViewRequest{}
 func (m *GetLocationViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLocationViewRequest) ProtoMessage()    {}
 func (*GetLocationViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_view_service_3a92c03e961aee1c, []int{0}
+	return fileDescriptor_cee10bb181b86493, []int{0}
 }
+
 func (m *GetLocationViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLocationViewRequest.Unmarshal(m, b)
 }
 func (m *GetLocationViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLocationViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLocationViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLocationViewRequest.Merge(dst, src)
+func (m *GetLocationViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLocationViewRequest.Merge(m, src)
 }
 func (m *GetLocationViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLocationViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetLocationViewRequest)(nil), "google.ads.googleads.v1.services.GetLocationViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/location_view_service.proto", fileDescriptor_cee10bb181b86493)
+}
+
+var fileDescriptor_cee10bb181b86493 = []byte{
+	// 362 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3f, 0x4b, 0xc3, 0x40,
+	0x18, 0xc6, 0x49, 0x04, 0xc1, 0xa0, 0x08, 0x11, 0xa4, 0x14, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
+	0xa2, 0x88, 0x72, 0xda, 0x21, 0x5d, 0xea, 0x20, 0x52, 0x2a, 0x64, 0x90, 0x40, 0x39, 0x93, 0x97,
+	0x10, 0x68, 0x72, 0x35, 0xef, 0x35, 0x1d, 0xc4, 0xc5, 0xaf, 0xe0, 0x37, 0x70, 0x74, 0xf7, 0x4b,
+	0x08, 0x4e, 0x7e, 0x05, 0x27, 0xbf, 0x84, 0x92, 0x5e, 0x2e, 0x54, 0x6d, 0xe9, 0xf6, 0xf0, 0xe6,
+	0xf9, 0x3d, 0xef, 0x9f, 0x9c, 0x75, 0x1e, 0x09, 0x11, 0x8d, 0x80, 0xf2, 0x10, 0xa9, 0x92, 0x85,
+	0xca, 0x1d, 0x8a, 0x90, 0xe5, 0x71, 0x00, 0x48, 0x47, 0x22, 0xe0, 0x32, 0x16, 0xe9, 0x30, 0x8f,
+	0x61, 0x3a, 0x2c, 0xcb, 0x64, 0x9c, 0x09, 0x29, 0xec, 0x86, 0x42, 0x08, 0x0f, 0x91, 0x54, 0x34,
+	0xc9, 0x1d, 0xa2, 0xe9, 0xfa, 0xf1, 0xb2, 0xfc, 0x0c, 0x50, 0x4c, 0xb2, 0x7f, 0x0d, 0x54, 0x70,
+	0x7d, 0x4f, 0x63, 0xe3, 0x98, 0xf2, 0x34, 0x15, 0x72, 0xe6, 0x40, 0xf5, 0xb5, 0xd9, 0xb1, 0x76,
+	0x7b, 0x20, 0x2f, 0x4b, 0xce, 0x8b, 0x61, 0x3a, 0x80, 0xbb, 0x09, 0xa0, 0xb4, 0xf7, 0xad, 0x2d,
+	0x1d, 0x3c, 0x4c, 0x79, 0x02, 0x35, 0xa3, 0x61, 0x1c, 0x6c, 0x0c, 0x36, 0x75, 0xf1, 0x8a, 0x27,
+	0x70, 0xf8, 0x6e, 0x58, 0x3b, 0xf3, 0xf0, 0xb5, 0x1a, 0xd6, 0x7e, 0x35, 0xac, 0xed, 0x3f, 0xb9,
+	0xf6, 0x29, 0x59, 0xb5, 0x22, 0x59, 0x3c, 0x4a, 0x9d, 0x2e, 0x25, 0xab, 0xd5, 0xc9, 0x3c, 0xd7,
+	0x3c, 0x79, 0xfc, 0xf8, 0x7c, 0x32, 0x1d, 0x9b, 0x16, 0xe7, 0xb9, 0xff, 0xb5, 0x46, 0x27, 0x98,
+	0xa0, 0x14, 0x09, 0x64, 0x48, 0xdb, 0xd5, 0xbd, 0x0a, 0x08, 0x69, 0xfb, 0xa1, 0xfb, 0x6d, 0x58,
+	0xad, 0x40, 0x24, 0x2b, 0x27, 0xed, 0xd6, 0x16, 0x6c, 0xdd, 0x2f, 0x2e, 0xda, 0x37, 0x6e, 0x2e,
+	0x4a, 0x3a, 0x12, 0x23, 0x9e, 0x46, 0x44, 0x64, 0x11, 0x8d, 0x20, 0x9d, 0xdd, 0x5b, 0xff, 0xb8,
+	0x71, 0x8c, 0xcb, 0xdf, 0xc9, 0x99, 0x16, 0xcf, 0xe6, 0x5a, 0xcf, 0x75, 0x5f, 0xcc, 0x46, 0x4f,
+	0x05, 0xba, 0x21, 0x12, 0x25, 0x0b, 0xe5, 0x39, 0xa4, 0x6c, 0x8c, 0x6f, 0xda, 0xe2, 0xbb, 0x21,
+	0xfa, 0x95, 0xc5, 0xf7, 0x1c, 0x5f, 0x5b, 0xbe, 0xcc, 0x96, 0xaa, 0x33, 0xe6, 0x86, 0xc8, 0x58,
+	0x65, 0x62, 0xcc, 0x73, 0x18, 0xd3, 0xb6, 0xdb, 0xf5, 0xd9, 0x9c, 0x47, 0x3f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x91, 0x8a, 0x03, 0x21, 0xce, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _LocationViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/location_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/location_view_service.proto", fileDescriptor_location_view_service_3a92c03e961aee1c)
-}
-
-var fileDescriptor_location_view_service_3a92c03e961aee1c = []byte{
-	// 362 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3f, 0x4b, 0xc3, 0x40,
-	0x18, 0xc6, 0x49, 0x04, 0xc1, 0xa0, 0x08, 0x11, 0xa4, 0x14, 0x87, 0x52, 0x3b, 0x48, 0x87, 0x3b,
-	0xa2, 0x88, 0x72, 0xda, 0x21, 0x5d, 0xea, 0x20, 0x52, 0x2a, 0x64, 0x90, 0x40, 0x39, 0x93, 0x97,
-	0x10, 0x68, 0x72, 0x35, 0xef, 0x35, 0x1d, 0xc4, 0xc5, 0xaf, 0xe0, 0x37, 0x70, 0x74, 0xf7, 0x4b,
-	0x08, 0x4e, 0x7e, 0x05, 0x27, 0xbf, 0x84, 0x92, 0x5e, 0x2e, 0x54, 0x6d, 0xe9, 0xf6, 0xf0, 0xe6,
-	0xf9, 0x3d, 0xef, 0x9f, 0x9c, 0x75, 0x1e, 0x09, 0x11, 0x8d, 0x80, 0xf2, 0x10, 0xa9, 0x92, 0x85,
-	0xca, 0x1d, 0x8a, 0x90, 0xe5, 0x71, 0x00, 0x48, 0x47, 0x22, 0xe0, 0x32, 0x16, 0xe9, 0x30, 0x8f,
-	0x61, 0x3a, 0x2c, 0xcb, 0x64, 0x9c, 0x09, 0x29, 0xec, 0x86, 0x42, 0x08, 0x0f, 0x91, 0x54, 0x34,
-	0xc9, 0x1d, 0xa2, 0xe9, 0xfa, 0xf1, 0xb2, 0xfc, 0x0c, 0x50, 0x4c, 0xb2, 0x7f, 0x0d, 0x54, 0x70,
-	0x7d, 0x4f, 0x63, 0xe3, 0x98, 0xf2, 0x34, 0x15, 0x72, 0xe6, 0x40, 0xf5, 0xb5, 0xd9, 0xb1, 0x76,
-	0x7b, 0x20, 0x2f, 0x4b, 0xce, 0x8b, 0x61, 0x3a, 0x80, 0xbb, 0x09, 0xa0, 0xb4, 0xf7, 0xad, 0x2d,
-	0x1d, 0x3c, 0x4c, 0x79, 0x02, 0x35, 0xa3, 0x61, 0x1c, 0x6c, 0x0c, 0x36, 0x75, 0xf1, 0x8a, 0x27,
-	0x70, 0xf8, 0x6e, 0x58, 0x3b, 0xf3, 0xf0, 0xb5, 0x1a, 0xd6, 0x7e, 0x35, 0xac, 0xed, 0x3f, 0xb9,
-	0xf6, 0x29, 0x59, 0xb5, 0x22, 0x59, 0x3c, 0x4a, 0x9d, 0x2e, 0x25, 0xab, 0xd5, 0xc9, 0x3c, 0xd7,
-	0x3c, 0x79, 0xfc, 0xf8, 0x7c, 0x32, 0x1d, 0x9b, 0x16, 0xe7, 0xb9, 0xff, 0xb5, 0x46, 0x27, 0x98,
-	0xa0, 0x14, 0x09, 0x64, 0x48, 0xdb, 0xd5, 0xbd, 0x0a, 0x08, 0x69, 0xfb, 0xa1, 0xfb, 0x6d, 0x58,
-	0xad, 0x40, 0x24, 0x2b, 0x27, 0xed, 0xd6, 0x16, 0x6c, 0xdd, 0x2f, 0x2e, 0xda, 0x37, 0x6e, 0x2e,
-	0x4a, 0x3a, 0x12, 0x23, 0x9e, 0x46, 0x44, 0x64, 0x11, 0x8d, 0x20, 0x9d, 0xdd, 0x5b, 0xff, 0xb8,
-	0x71, 0x8c, 0xcb, 0xdf, 0xc9, 0x99, 0x16, 0xcf, 0xe6, 0x5a, 0xcf, 0x75, 0x5f, 0xcc, 0x46, 0x4f,
-	0x05, 0xba, 0x21, 0x12, 0x25, 0x0b, 0xe5, 0x39, 0xa4, 0x6c, 0x8c, 0x6f, 0xda, 0xe2, 0xbb, 0x21,
-	0xfa, 0x95, 0xc5, 0xf7, 0x1c, 0x5f, 0x5b, 0xbe, 0xcc, 0x96, 0xaa, 0x33, 0xe6, 0x86, 0xc8, 0x58,
-	0x65, 0x62, 0xcc, 0x73, 0x18, 0xd3, 0xb6, 0xdb, 0xf5, 0xd9, 0x9c, 0x47, 0x3f, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x91, 0x8a, 0x03, 0x21, 0xce, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/managed_placement_view_service.pb.go b/googleapis/ads/googleads/v1/services/managed_placement_view_service.pb.go
index fad0474879..be4eaab644 100644
--- a/googleapis/ads/googleads/v1/services/managed_placement_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/managed_placement_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/managed_placement_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ManagedPlacementViewService.GetManagedPlacementView][google.ads.googleads.v1.services.ManagedPlacementViewService.GetManagedPlacementView].
 type GetManagedPlacementViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetManagedPlacementViewRequest) Reset()         { *m = GetManagedPlacem
 func (m *GetManagedPlacementViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetManagedPlacementViewRequest) ProtoMessage()    {}
 func (*GetManagedPlacementViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_managed_placement_view_service_836fe3ce69526adc, []int{0}
+	return fileDescriptor_c301455ca7db209f, []int{0}
 }
+
 func (m *GetManagedPlacementViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetManagedPlacementViewRequest.Unmarshal(m, b)
 }
 func (m *GetManagedPlacementViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetManagedPlacementViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetManagedPlacementViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetManagedPlacementViewRequest.Merge(dst, src)
+func (m *GetManagedPlacementViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetManagedPlacementViewRequest.Merge(m, src)
 }
 func (m *GetManagedPlacementViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetManagedPlacementViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetManagedPlacementViewRequest)(nil), "google.ads.googleads.v1.services.GetManagedPlacementViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/managed_placement_view_service.proto", fileDescriptor_c301455ca7db209f)
+}
+
+var fileDescriptor_c301455ca7db209f = []byte{
+	// 378 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x3d, 0x6b, 0xdb, 0x40,
+	0x18, 0x46, 0x2a, 0x14, 0x2a, 0xda, 0x45, 0x4b, 0x8b, 0x5b, 0x8a, 0x70, 0x3d, 0x14, 0x0f, 0x77,
+	0xa8, 0x1d, 0x4c, 0x2e, 0xe4, 0x43, 0x06, 0xe3, 0x2c, 0x09, 0xc6, 0x01, 0x0d, 0x41, 0x20, 0x2e,
+	0xd2, 0x8b, 0x10, 0x58, 0x77, 0x8a, 0x5e, 0x59, 0x1e, 0x42, 0x96, 0x2c, 0xf9, 0x01, 0xf9, 0x07,
+	0x19, 0xf3, 0x53, 0xb2, 0x86, 0xfc, 0x83, 0x4c, 0xd9, 0xb3, 0x07, 0xf9, 0x7c, 0x02, 0x83, 0x65,
+	0x6f, 0x0f, 0x77, 0xcf, 0xc7, 0xbd, 0xcf, 0x7b, 0xd6, 0x28, 0x91, 0x32, 0x99, 0x01, 0xe5, 0x31,
+	0x52, 0x05, 0x6b, 0x54, 0xb9, 0x14, 0xa1, 0xa8, 0xd2, 0x08, 0x90, 0x66, 0x5c, 0xf0, 0x04, 0xe2,
+	0x30, 0x9f, 0xf1, 0x08, 0x32, 0x10, 0x65, 0x58, 0xa5, 0xb0, 0x08, 0x57, 0xf7, 0x24, 0x2f, 0x64,
+	0x29, 0x6d, 0x47, 0x69, 0x09, 0x8f, 0x91, 0x34, 0x36, 0xa4, 0x72, 0x89, 0xb6, 0xe9, 0x1c, 0xb6,
+	0x05, 0x15, 0x80, 0x72, 0x5e, 0xb4, 0x27, 0xa9, 0x84, 0xce, 0x2f, 0xad, 0xcf, 0x53, 0xca, 0x85,
+	0x90, 0x25, 0x2f, 0x53, 0x29, 0x50, 0xdd, 0x76, 0x47, 0xd6, 0xef, 0x31, 0x94, 0xa7, 0xca, 0x60,
+	0xa2, 0xf5, 0x7e, 0x0a, 0x8b, 0x29, 0x5c, 0xcd, 0x01, 0x4b, 0xfb, 0x8f, 0xf5, 0x4d, 0x27, 0x85,
+	0x82, 0x67, 0xf0, 0xc3, 0x70, 0x8c, 0xbf, 0x5f, 0xa6, 0x5f, 0xf5, 0xe1, 0x19, 0xcf, 0xe0, 0xdf,
+	0xbb, 0x61, 0xfd, 0xdc, 0x64, 0x72, 0xae, 0xa6, 0xb0, 0x5f, 0x0c, 0xeb, 0x7b, 0x4b, 0x8e, 0x7d,
+	0x4c, 0x76, 0x75, 0x40, 0xb6, 0x3f, 0xb1, 0x33, 0x68, 0x75, 0x68, 0x3a, 0x22, 0x9b, 0xf4, 0xdd,
+	0xa3, 0xdb, 0xe7, 0xd7, 0x7b, 0x73, 0xcf, 0x1e, 0xd4, 0x7d, 0x5e, 0xaf, 0x8d, 0x79, 0x10, 0xcd,
+	0xb1, 0x94, 0x19, 0x14, 0x48, 0xfb, 0xba, 0xe0, 0x35, 0x31, 0xd2, 0xfe, 0xcd, 0xf0, 0xce, 0xb4,
+	0x7a, 0x91, 0xcc, 0x76, 0x4e, 0x30, 0x74, 0xb6, 0xb4, 0x33, 0xa9, 0x37, 0x31, 0x31, 0x2e, 0x4e,
+	0x56, 0x2e, 0x89, 0x9c, 0x71, 0x91, 0x10, 0x59, 0x24, 0x34, 0x01, 0xb1, 0xdc, 0x93, 0xde, 0x7c,
+	0x9e, 0x62, 0xfb, 0x8f, 0xdb, 0xd7, 0xe0, 0xc1, 0xfc, 0x34, 0xf6, 0xbc, 0x47, 0xd3, 0x19, 0x2b,
+	0x43, 0x2f, 0x46, 0xa2, 0x60, 0x8d, 0x7c, 0x97, 0xac, 0x82, 0xf1, 0x49, 0x53, 0x02, 0x2f, 0xc6,
+	0xa0, 0xa1, 0x04, 0xbe, 0x1b, 0x68, 0xca, 0x9b, 0xd9, 0x53, 0xe7, 0x8c, 0x79, 0x31, 0x32, 0xd6,
+	0x90, 0x18, 0xf3, 0x5d, 0xc6, 0x34, 0xed, 0xf2, 0xf3, 0xf2, 0x9d, 0xff, 0x3f, 0x02, 0x00, 0x00,
+	0xff, 0xff, 0xc9, 0xd9, 0x16, 0xaa, 0x18, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _ManagedPlacementViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/managed_placement_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/managed_placement_view_service.proto", fileDescriptor_managed_placement_view_service_836fe3ce69526adc)
-}
-
-var fileDescriptor_managed_placement_view_service_836fe3ce69526adc = []byte{
-	// 378 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x3d, 0x6b, 0xdb, 0x40,
-	0x18, 0x46, 0x2a, 0x14, 0x2a, 0xda, 0x45, 0x4b, 0x8b, 0x5b, 0x8a, 0x70, 0x3d, 0x14, 0x0f, 0x77,
-	0xa8, 0x1d, 0x4c, 0x2e, 0xe4, 0x43, 0x06, 0xe3, 0x2c, 0x09, 0xc6, 0x01, 0x0d, 0x41, 0x20, 0x2e,
-	0xd2, 0x8b, 0x10, 0x58, 0x77, 0x8a, 0x5e, 0x59, 0x1e, 0x42, 0x96, 0x2c, 0xf9, 0x01, 0xf9, 0x07,
-	0x19, 0xf3, 0x53, 0xb2, 0x86, 0xfc, 0x83, 0x4c, 0xd9, 0xb3, 0x07, 0xf9, 0x7c, 0x02, 0x83, 0x65,
-	0x6f, 0x0f, 0x77, 0xcf, 0xc7, 0xbd, 0xcf, 0x7b, 0xd6, 0x28, 0x91, 0x32, 0x99, 0x01, 0xe5, 0x31,
-	0x52, 0x05, 0x6b, 0x54, 0xb9, 0x14, 0xa1, 0xa8, 0xd2, 0x08, 0x90, 0x66, 0x5c, 0xf0, 0x04, 0xe2,
-	0x30, 0x9f, 0xf1, 0x08, 0x32, 0x10, 0x65, 0x58, 0xa5, 0xb0, 0x08, 0x57, 0xf7, 0x24, 0x2f, 0x64,
-	0x29, 0x6d, 0x47, 0x69, 0x09, 0x8f, 0x91, 0x34, 0x36, 0xa4, 0x72, 0x89, 0xb6, 0xe9, 0x1c, 0xb6,
-	0x05, 0x15, 0x80, 0x72, 0x5e, 0xb4, 0x27, 0xa9, 0x84, 0xce, 0x2f, 0xad, 0xcf, 0x53, 0xca, 0x85,
-	0x90, 0x25, 0x2f, 0x53, 0x29, 0x50, 0xdd, 0x76, 0x47, 0xd6, 0xef, 0x31, 0x94, 0xa7, 0xca, 0x60,
-	0xa2, 0xf5, 0x7e, 0x0a, 0x8b, 0x29, 0x5c, 0xcd, 0x01, 0x4b, 0xfb, 0x8f, 0xf5, 0x4d, 0x27, 0x85,
-	0x82, 0x67, 0xf0, 0xc3, 0x70, 0x8c, 0xbf, 0x5f, 0xa6, 0x5f, 0xf5, 0xe1, 0x19, 0xcf, 0xe0, 0xdf,
-	0xbb, 0x61, 0xfd, 0xdc, 0x64, 0x72, 0xae, 0xa6, 0xb0, 0x5f, 0x0c, 0xeb, 0x7b, 0x4b, 0x8e, 0x7d,
-	0x4c, 0x76, 0x75, 0x40, 0xb6, 0x3f, 0xb1, 0x33, 0x68, 0x75, 0x68, 0x3a, 0x22, 0x9b, 0xf4, 0xdd,
-	0xa3, 0xdb, 0xe7, 0xd7, 0x7b, 0x73, 0xcf, 0x1e, 0xd4, 0x7d, 0x5e, 0xaf, 0x8d, 0x79, 0x10, 0xcd,
-	0xb1, 0x94, 0x19, 0x14, 0x48, 0xfb, 0xba, 0xe0, 0x35, 0x31, 0xd2, 0xfe, 0xcd, 0xf0, 0xce, 0xb4,
-	0x7a, 0x91, 0xcc, 0x76, 0x4e, 0x30, 0x74, 0xb6, 0xb4, 0x33, 0xa9, 0x37, 0x31, 0x31, 0x2e, 0x4e,
-	0x56, 0x2e, 0x89, 0x9c, 0x71, 0x91, 0x10, 0x59, 0x24, 0x34, 0x01, 0xb1, 0xdc, 0x93, 0xde, 0x7c,
-	0x9e, 0x62, 0xfb, 0x8f, 0xdb, 0xd7, 0xe0, 0xc1, 0xfc, 0x34, 0xf6, 0xbc, 0x47, 0xd3, 0x19, 0x2b,
-	0x43, 0x2f, 0x46, 0xa2, 0x60, 0x8d, 0x7c, 0x97, 0xac, 0x82, 0xf1, 0x49, 0x53, 0x02, 0x2f, 0xc6,
-	0xa0, 0xa1, 0x04, 0xbe, 0x1b, 0x68, 0xca, 0x9b, 0xd9, 0x53, 0xe7, 0x8c, 0x79, 0x31, 0x32, 0xd6,
-	0x90, 0x18, 0xf3, 0x5d, 0xc6, 0x34, 0xed, 0xf2, 0xf3, 0xf2, 0x9d, 0xff, 0x3f, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0xc9, 0xd9, 0x16, 0xaa, 0x18, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/media_file_service.pb.go b/googleapis/ads/googleads/v1/services/media_file_service.pb.go
index 178759c935..45dc785c35 100644
--- a/googleapis/ads/googleads/v1/services/media_file_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/media_file_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/media_file_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [MediaFileService.GetMediaFile][google.ads.googleads.v1.services.MediaFileService.GetMediaFile]
 type GetMediaFileRequest struct {
@@ -40,16 +40,17 @@ func (m *GetMediaFileRequest) Reset()         { *m = GetMediaFileRequest{} }
 func (m *GetMediaFileRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMediaFileRequest) ProtoMessage()    {}
 func (*GetMediaFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_service_a9f3cbbb085ac9a6, []int{0}
+	return fileDescriptor_793e9e1492d555b0, []int{0}
 }
+
 func (m *GetMediaFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMediaFileRequest.Unmarshal(m, b)
 }
 func (m *GetMediaFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMediaFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetMediaFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMediaFileRequest.Merge(dst, src)
+func (m *GetMediaFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMediaFileRequest.Merge(m, src)
 }
 func (m *GetMediaFileRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMediaFileRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateMediaFilesRequest) Reset()         { *m = MutateMediaFilesRequest
 func (m *MutateMediaFilesRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateMediaFilesRequest) ProtoMessage()    {}
 func (*MutateMediaFilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_service_a9f3cbbb085ac9a6, []int{1}
+	return fileDescriptor_793e9e1492d555b0, []int{1}
 }
+
 func (m *MutateMediaFilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateMediaFilesRequest.Unmarshal(m, b)
 }
 func (m *MutateMediaFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateMediaFilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateMediaFilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateMediaFilesRequest.Merge(dst, src)
+func (m *MutateMediaFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateMediaFilesRequest.Merge(m, src)
 }
 func (m *MutateMediaFilesRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateMediaFilesRequest.Size(m)
@@ -154,16 +156,17 @@ func (m *MediaFileOperation) Reset()         { *m = MediaFileOperation{} }
 func (m *MediaFileOperation) String() string { return proto.CompactTextString(m) }
 func (*MediaFileOperation) ProtoMessage()    {}
 func (*MediaFileOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_service_a9f3cbbb085ac9a6, []int{2}
+	return fileDescriptor_793e9e1492d555b0, []int{2}
 }
+
 func (m *MediaFileOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MediaFileOperation.Unmarshal(m, b)
 }
 func (m *MediaFileOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MediaFileOperation.Marshal(b, m, deterministic)
 }
-func (dst *MediaFileOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MediaFileOperation.Merge(dst, src)
+func (m *MediaFileOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MediaFileOperation.Merge(m, src)
 }
 func (m *MediaFileOperation) XXX_Size() int {
 	return xxx_messageInfo_MediaFileOperation.Size(m)
@@ -198,61 +201,13 @@ func (m *MediaFileOperation) GetCreate() *resources.MediaFile {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MediaFileOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MediaFileOperation_OneofMarshaler, _MediaFileOperation_OneofUnmarshaler, _MediaFileOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MediaFileOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MediaFileOperation_Create)(nil),
 	}
 }
 
-func _MediaFileOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MediaFileOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *MediaFileOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MediaFileOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MediaFileOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MediaFileOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.MediaFile)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MediaFileOperation_Create{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MediaFileOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MediaFileOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *MediaFileOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a media file mutate.
 type MutateMediaFilesResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -271,16 +226,17 @@ func (m *MutateMediaFilesResponse) Reset()         { *m = MutateMediaFilesRespon
 func (m *MutateMediaFilesResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateMediaFilesResponse) ProtoMessage()    {}
 func (*MutateMediaFilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_service_a9f3cbbb085ac9a6, []int{3}
+	return fileDescriptor_793e9e1492d555b0, []int{3}
 }
+
 func (m *MutateMediaFilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateMediaFilesResponse.Unmarshal(m, b)
 }
 func (m *MutateMediaFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateMediaFilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateMediaFilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateMediaFilesResponse.Merge(dst, src)
+func (m *MutateMediaFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateMediaFilesResponse.Merge(m, src)
 }
 func (m *MutateMediaFilesResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateMediaFilesResponse.Size(m)
@@ -318,16 +274,17 @@ func (m *MutateMediaFileResult) Reset()         { *m = MutateMediaFileResult{} }
 func (m *MutateMediaFileResult) String() string { return proto.CompactTextString(m) }
 func (*MutateMediaFileResult) ProtoMessage()    {}
 func (*MutateMediaFileResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_media_file_service_a9f3cbbb085ac9a6, []int{4}
+	return fileDescriptor_793e9e1492d555b0, []int{4}
 }
+
 func (m *MutateMediaFileResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateMediaFileResult.Unmarshal(m, b)
 }
 func (m *MutateMediaFileResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateMediaFileResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateMediaFileResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateMediaFileResult.Merge(dst, src)
+func (m *MutateMediaFileResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateMediaFileResult.Merge(m, src)
 }
 func (m *MutateMediaFileResult) XXX_Size() int {
 	return xxx_messageInfo_MutateMediaFileResult.Size(m)
@@ -353,6 +310,55 @@ func init() {
 	proto.RegisterType((*MutateMediaFileResult)(nil), "google.ads.googleads.v1.services.MutateMediaFileResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/media_file_service.proto", fileDescriptor_793e9e1492d555b0)
+}
+
+var fileDescriptor_793e9e1492d555b0 = []byte{
+	// 646 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xfd, 0x9c, 0x7c, 0x2a, 0x74, 0x52, 0xa0, 0x9a, 0xaa, 0x6a, 0x14, 0x21, 0x88, 0x4c, 0x25,
+	0xaa, 0xa8, 0x1a, 0x2b, 0xa1, 0x08, 0x75, 0xa0, 0x8b, 0x54, 0x22, 0x2d, 0x8b, 0xd2, 0xe2, 0xa2,
+	0x2e, 0x50, 0x24, 0x6b, 0x6a, 0x4f, 0xad, 0x91, 0x6c, 0x8f, 0x99, 0x19, 0x07, 0x55, 0x55, 0x37,
+	0x2c, 0x78, 0x01, 0xde, 0x80, 0x1d, 0xec, 0x79, 0x04, 0x36, 0x6c, 0xd9, 0xb3, 0x62, 0xc5, 0x33,
+	0xb0, 0x40, 0xf6, 0x78, 0xdc, 0xa4, 0x3f, 0x6a, 0xcb, 0xee, 0xfa, 0xde, 0x73, 0xee, 0x3d, 0xf7,
+	0xc7, 0x03, 0x56, 0x43, 0xce, 0xc3, 0x88, 0x3a, 0x24, 0x90, 0x8e, 0x36, 0x73, 0x6b, 0xd4, 0x75,
+	0x24, 0x15, 0x23, 0xe6, 0x53, 0xe9, 0xc4, 0x34, 0x60, 0xc4, 0x3b, 0x60, 0x11, 0xf5, 0x4a, 0x1f,
+	0x4a, 0x05, 0x57, 0x1c, 0xb6, 0x35, 0x1e, 0x91, 0x40, 0xa2, 0x8a, 0x8a, 0x46, 0x5d, 0x64, 0xa8,
+	0xad, 0xde, 0x45, 0xc9, 0x05, 0x95, 0x3c, 0x13, 0x93, 0xd9, 0x75, 0xd6, 0xd6, 0x5d, 0xc3, 0x49,
+	0x99, 0x43, 0x92, 0x84, 0x2b, 0xa2, 0x18, 0x4f, 0x64, 0x19, 0xbd, 0x57, 0x46, 0x8b, 0xaf, 0xfd,
+	0xec, 0xc0, 0x79, 0x27, 0x48, 0x9a, 0x52, 0x61, 0xe2, 0x0b, 0x65, 0x5c, 0xa4, 0xbe, 0x23, 0x15,
+	0x51, 0x59, 0x19, 0xb0, 0x31, 0x98, 0xdb, 0xa0, 0x6a, 0x2b, 0xaf, 0x36, 0x60, 0x11, 0x75, 0xe9,
+	0xdb, 0x8c, 0x4a, 0x05, 0x1f, 0x80, 0x5b, 0x46, 0x8b, 0x97, 0x90, 0x98, 0x36, 0xad, 0xb6, 0xb5,
+	0x34, 0xed, 0xce, 0x18, 0xe7, 0x4b, 0x12, 0x53, 0xfb, 0xa7, 0x05, 0x16, 0xb6, 0x32, 0x45, 0x14,
+	0xad, 0xf8, 0xd2, 0x24, 0xb8, 0x0f, 0x1a, 0x7e, 0x26, 0x15, 0x8f, 0xa9, 0xf0, 0x58, 0x50, 0xd2,
+	0x81, 0x71, 0xbd, 0x08, 0xe0, 0x6b, 0x00, 0x78, 0x4a, 0x85, 0xee, 0xa2, 0x59, 0x6b, 0xd7, 0x97,
+	0x1a, 0xbd, 0x15, 0x74, 0xd9, 0xe8, 0x50, 0x55, 0x69, 0xdb, 0x90, 0xdd, 0xb1, 0x3c, 0xf0, 0x21,
+	0xb8, 0x93, 0x12, 0xa1, 0x18, 0x89, 0xbc, 0x03, 0xc2, 0xa2, 0x4c, 0xd0, 0x66, 0xbd, 0x6d, 0x2d,
+	0xdd, 0x74, 0x6f, 0x97, 0xee, 0x81, 0xf6, 0xe6, 0x0d, 0x8e, 0x48, 0xc4, 0x02, 0xa2, 0xa8, 0xc7,
+	0x93, 0xe8, 0xb0, 0xf9, 0x7f, 0x01, 0x9b, 0x31, 0xce, 0xed, 0x24, 0x3a, 0xb4, 0x19, 0x80, 0x67,
+	0xeb, 0xc1, 0x01, 0x98, 0xf2, 0x05, 0x25, 0x4a, 0x0f, 0xa5, 0xd1, 0x5b, 0xbe, 0x50, 0x75, 0xb5,
+	0xce, 0x13, 0xd9, 0x9b, 0xff, 0xb9, 0x25, 0x7b, 0xbd, 0x01, 0xa6, 0x2b, 0xe5, 0xf6, 0x57, 0x0b,
+	0x34, 0xcf, 0xce, 0x52, 0xa6, 0x3c, 0x91, 0x14, 0x0e, 0xc0, 0xfc, 0xa9, 0xae, 0x3c, 0x2a, 0x04,
+	0x17, 0x45, 0x6f, 0x8d, 0x1e, 0x34, 0x02, 0x44, 0xea, 0xa3, 0xdd, 0x62, 0xbb, 0xee, 0xdc, 0x64,
+	0xbf, 0xcf, 0x73, 0x38, 0x7c, 0x05, 0x6e, 0x08, 0x2a, 0xb3, 0x48, 0x99, 0x81, 0x3f, 0xb9, 0xc2,
+	0xc0, 0x27, 0x45, 0xb9, 0x05, 0xdf, 0x35, 0x79, 0xec, 0x67, 0x60, 0xfe, 0x5c, 0xc4, 0x95, 0x2e,
+	0xa8, 0xf7, 0xa1, 0x0e, 0x66, 0x2b, 0xe2, 0xae, 0x2e, 0x09, 0x3f, 0x5b, 0x60, 0x66, 0xfc, 0x26,
+	0xe1, 0xe3, 0xcb, 0x55, 0x9e, 0x73, 0xc3, 0xad, 0x6b, 0xed, 0xc5, 0x5e, 0x79, 0xff, 0xe3, 0xd7,
+	0xc7, 0x1a, 0x82, 0xcb, 0xf9, 0x7f, 0x78, 0x34, 0x21, 0x7d, 0xcd, 0x9c, 0xad, 0x74, 0x3a, 0xfa,
+	0xc7, 0x2c, 0xd6, 0xe3, 0x74, 0x8e, 0xe1, 0x37, 0x0b, 0xcc, 0x9e, 0x5e, 0x1b, 0x5c, 0xbd, 0xf6,
+	0x54, 0xcd, 0x6f, 0xd3, 0xc2, 0xff, 0x42, 0xd5, 0x57, 0x62, 0xe3, 0xa2, 0x83, 0x15, 0xdb, 0xc9,
+	0x3b, 0x38, 0x91, 0x7c, 0x34, 0xf6, 0x1f, 0xae, 0x75, 0x8e, 0xc7, 0x1a, 0xc0, 0x71, 0x91, 0x0a,
+	0x5b, 0x9d, 0xf5, 0x3f, 0x16, 0x58, 0xf4, 0x79, 0x7c, 0x69, 0xf5, 0xf5, 0xf9, 0xd3, 0xeb, 0xda,
+	0xc9, 0x9f, 0x91, 0x1d, 0xeb, 0xcd, 0x66, 0x49, 0x0d, 0x79, 0x44, 0x92, 0x10, 0x71, 0x11, 0x3a,
+	0x21, 0x4d, 0x8a, 0x47, 0xc6, 0xbc, 0x71, 0x29, 0x93, 0x17, 0xbf, 0xa7, 0x4f, 0x8d, 0xf1, 0xa9,
+	0x56, 0xdf, 0xe8, 0xf7, 0xbf, 0xd4, 0xda, 0x1b, 0x3a, 0x61, 0x3f, 0x90, 0x48, 0x9b, 0xb9, 0xb5,
+	0xd7, 0x45, 0x65, 0x61, 0xf9, 0xdd, 0x40, 0x86, 0xfd, 0x40, 0x0e, 0x2b, 0xc8, 0x70, 0xaf, 0x3b,
+	0x34, 0x90, 0xdf, 0xb5, 0x45, 0xed, 0xc7, 0xb8, 0x1f, 0x48, 0x8c, 0x2b, 0x10, 0xc6, 0x7b, 0x5d,
+	0x8c, 0x0d, 0x6c, 0x7f, 0xaa, 0xd0, 0xf9, 0xe8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x84,
+	0xc8, 0x18, 0xf6, 0x05, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -461,52 +467,3 @@ var _MediaFileService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/media_file_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/media_file_service.proto", fileDescriptor_media_file_service_a9f3cbbb085ac9a6)
-}
-
-var fileDescriptor_media_file_service_a9f3cbbb085ac9a6 = []byte{
-	// 646 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0xfd, 0x9c, 0x7c, 0x2a, 0x74, 0x52, 0xa0, 0x9a, 0xaa, 0x6a, 0x14, 0x21, 0x88, 0x4c, 0x25,
-	0xaa, 0xa8, 0x1a, 0x2b, 0xa1, 0x08, 0x75, 0xa0, 0x8b, 0x54, 0x22, 0x2d, 0x8b, 0xd2, 0xe2, 0xa2,
-	0x2e, 0x50, 0x24, 0x6b, 0x6a, 0x4f, 0xad, 0x91, 0x6c, 0x8f, 0x99, 0x19, 0x07, 0x55, 0x55, 0x37,
-	0x2c, 0x78, 0x01, 0xde, 0x80, 0x1d, 0xec, 0x79, 0x04, 0x36, 0x6c, 0xd9, 0xb3, 0x62, 0xc5, 0x33,
-	0xb0, 0x40, 0xf6, 0x78, 0xdc, 0xa4, 0x3f, 0x6a, 0xcb, 0xee, 0xfa, 0xde, 0x73, 0xee, 0x3d, 0xf7,
-	0xc7, 0x03, 0x56, 0x43, 0xce, 0xc3, 0x88, 0x3a, 0x24, 0x90, 0x8e, 0x36, 0x73, 0x6b, 0xd4, 0x75,
-	0x24, 0x15, 0x23, 0xe6, 0x53, 0xe9, 0xc4, 0x34, 0x60, 0xc4, 0x3b, 0x60, 0x11, 0xf5, 0x4a, 0x1f,
-	0x4a, 0x05, 0x57, 0x1c, 0xb6, 0x35, 0x1e, 0x91, 0x40, 0xa2, 0x8a, 0x8a, 0x46, 0x5d, 0x64, 0xa8,
-	0xad, 0xde, 0x45, 0xc9, 0x05, 0x95, 0x3c, 0x13, 0x93, 0xd9, 0x75, 0xd6, 0xd6, 0x5d, 0xc3, 0x49,
-	0x99, 0x43, 0x92, 0x84, 0x2b, 0xa2, 0x18, 0x4f, 0x64, 0x19, 0xbd, 0x57, 0x46, 0x8b, 0xaf, 0xfd,
-	0xec, 0xc0, 0x79, 0x27, 0x48, 0x9a, 0x52, 0x61, 0xe2, 0x0b, 0x65, 0x5c, 0xa4, 0xbe, 0x23, 0x15,
-	0x51, 0x59, 0x19, 0xb0, 0x31, 0x98, 0xdb, 0xa0, 0x6a, 0x2b, 0xaf, 0x36, 0x60, 0x11, 0x75, 0xe9,
-	0xdb, 0x8c, 0x4a, 0x05, 0x1f, 0x80, 0x5b, 0x46, 0x8b, 0x97, 0x90, 0x98, 0x36, 0xad, 0xb6, 0xb5,
-	0x34, 0xed, 0xce, 0x18, 0xe7, 0x4b, 0x12, 0x53, 0xfb, 0xa7, 0x05, 0x16, 0xb6, 0x32, 0x45, 0x14,
-	0xad, 0xf8, 0xd2, 0x24, 0xb8, 0x0f, 0x1a, 0x7e, 0x26, 0x15, 0x8f, 0xa9, 0xf0, 0x58, 0x50, 0xd2,
-	0x81, 0x71, 0xbd, 0x08, 0xe0, 0x6b, 0x00, 0x78, 0x4a, 0x85, 0xee, 0xa2, 0x59, 0x6b, 0xd7, 0x97,
-	0x1a, 0xbd, 0x15, 0x74, 0xd9, 0xe8, 0x50, 0x55, 0x69, 0xdb, 0x90, 0xdd, 0xb1, 0x3c, 0xf0, 0x21,
-	0xb8, 0x93, 0x12, 0xa1, 0x18, 0x89, 0xbc, 0x03, 0xc2, 0xa2, 0x4c, 0xd0, 0x66, 0xbd, 0x6d, 0x2d,
-	0xdd, 0x74, 0x6f, 0x97, 0xee, 0x81, 0xf6, 0xe6, 0x0d, 0x8e, 0x48, 0xc4, 0x02, 0xa2, 0xa8, 0xc7,
-	0x93, 0xe8, 0xb0, 0xf9, 0x7f, 0x01, 0x9b, 0x31, 0xce, 0xed, 0x24, 0x3a, 0xb4, 0x19, 0x80, 0x67,
-	0xeb, 0xc1, 0x01, 0x98, 0xf2, 0x05, 0x25, 0x4a, 0x0f, 0xa5, 0xd1, 0x5b, 0xbe, 0x50, 0x75, 0xb5,
-	0xce, 0x13, 0xd9, 0x9b, 0xff, 0xb9, 0x25, 0x7b, 0xbd, 0x01, 0xa6, 0x2b, 0xe5, 0xf6, 0x57, 0x0b,
-	0x34, 0xcf, 0xce, 0x52, 0xa6, 0x3c, 0x91, 0x14, 0x0e, 0xc0, 0xfc, 0xa9, 0xae, 0x3c, 0x2a, 0x04,
-	0x17, 0x45, 0x6f, 0x8d, 0x1e, 0x34, 0x02, 0x44, 0xea, 0xa3, 0xdd, 0x62, 0xbb, 0xee, 0xdc, 0x64,
-	0xbf, 0xcf, 0x73, 0x38, 0x7c, 0x05, 0x6e, 0x08, 0x2a, 0xb3, 0x48, 0x99, 0x81, 0x3f, 0xb9, 0xc2,
-	0xc0, 0x27, 0x45, 0xb9, 0x05, 0xdf, 0x35, 0x79, 0xec, 0x67, 0x60, 0xfe, 0x5c, 0xc4, 0x95, 0x2e,
-	0xa8, 0xf7, 0xa1, 0x0e, 0x66, 0x2b, 0xe2, 0xae, 0x2e, 0x09, 0x3f, 0x5b, 0x60, 0x66, 0xfc, 0x26,
-	0xe1, 0xe3, 0xcb, 0x55, 0x9e, 0x73, 0xc3, 0xad, 0x6b, 0xed, 0xc5, 0x5e, 0x79, 0xff, 0xe3, 0xd7,
-	0xc7, 0x1a, 0x82, 0xcb, 0xf9, 0x7f, 0x78, 0x34, 0x21, 0x7d, 0xcd, 0x9c, 0xad, 0x74, 0x3a, 0xfa,
-	0xc7, 0x2c, 0xd6, 0xe3, 0x74, 0x8e, 0xe1, 0x37, 0x0b, 0xcc, 0x9e, 0x5e, 0x1b, 0x5c, 0xbd, 0xf6,
-	0x54, 0xcd, 0x6f, 0xd3, 0xc2, 0xff, 0x42, 0xd5, 0x57, 0x62, 0xe3, 0xa2, 0x83, 0x15, 0xdb, 0xc9,
-	0x3b, 0x38, 0x91, 0x7c, 0x34, 0xf6, 0x1f, 0xae, 0x75, 0x8e, 0xc7, 0x1a, 0xc0, 0x71, 0x91, 0x0a,
-	0x5b, 0x9d, 0xf5, 0x3f, 0x16, 0x58, 0xf4, 0x79, 0x7c, 0x69, 0xf5, 0xf5, 0xf9, 0xd3, 0xeb, 0xda,
-	0xc9, 0x9f, 0x91, 0x1d, 0xeb, 0xcd, 0x66, 0x49, 0x0d, 0x79, 0x44, 0x92, 0x10, 0x71, 0x11, 0x3a,
-	0x21, 0x4d, 0x8a, 0x47, 0xc6, 0xbc, 0x71, 0x29, 0x93, 0x17, 0xbf, 0xa7, 0x4f, 0x8d, 0xf1, 0xa9,
-	0x56, 0xdf, 0xe8, 0xf7, 0xbf, 0xd4, 0xda, 0x1b, 0x3a, 0x61, 0x3f, 0x90, 0x48, 0x9b, 0xb9, 0xb5,
-	0xd7, 0x45, 0x65, 0x61, 0xf9, 0xdd, 0x40, 0x86, 0xfd, 0x40, 0x0e, 0x2b, 0xc8, 0x70, 0xaf, 0x3b,
-	0x34, 0x90, 0xdf, 0xb5, 0x45, 0xed, 0xc7, 0xb8, 0x1f, 0x48, 0x8c, 0x2b, 0x10, 0xc6, 0x7b, 0x5d,
-	0x8c, 0x0d, 0x6c, 0x7f, 0xaa, 0xd0, 0xf9, 0xe8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x84,
-	0xc8, 0x18, 0xf6, 0x05, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/merchant_center_link_service.pb.go b/googleapis/ads/googleads/v1/services/merchant_center_link_service.pb.go
index 8701e5fbea..31b9121444 100644
--- a/googleapis/ads/googleads/v1/services/merchant_center_link_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/merchant_center_link_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/merchant_center_link_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [MerchantCenterLinkService.ListMerchantCenterLinks][google.ads.googleads.v1.services.MerchantCenterLinkService.ListMerchantCenterLinks].
 type ListMerchantCenterLinksRequest struct {
@@ -40,16 +40,17 @@ func (m *ListMerchantCenterLinksRequest) Reset()         { *m = ListMerchantCent
 func (m *ListMerchantCenterLinksRequest) String() string { return proto.CompactTextString(m) }
 func (*ListMerchantCenterLinksRequest) ProtoMessage()    {}
 func (*ListMerchantCenterLinksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc, []int{0}
+	return fileDescriptor_2f76fd8f3030942d, []int{0}
 }
+
 func (m *ListMerchantCenterLinksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMerchantCenterLinksRequest.Unmarshal(m, b)
 }
 func (m *ListMerchantCenterLinksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMerchantCenterLinksRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListMerchantCenterLinksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMerchantCenterLinksRequest.Merge(dst, src)
+func (m *ListMerchantCenterLinksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMerchantCenterLinksRequest.Merge(m, src)
 }
 func (m *ListMerchantCenterLinksRequest) XXX_Size() int {
 	return xxx_messageInfo_ListMerchantCenterLinksRequest.Size(m)
@@ -80,16 +81,17 @@ func (m *ListMerchantCenterLinksResponse) Reset()         { *m = ListMerchantCen
 func (m *ListMerchantCenterLinksResponse) String() string { return proto.CompactTextString(m) }
 func (*ListMerchantCenterLinksResponse) ProtoMessage()    {}
 func (*ListMerchantCenterLinksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc, []int{1}
+	return fileDescriptor_2f76fd8f3030942d, []int{1}
 }
+
 func (m *ListMerchantCenterLinksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMerchantCenterLinksResponse.Unmarshal(m, b)
 }
 func (m *ListMerchantCenterLinksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMerchantCenterLinksResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListMerchantCenterLinksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMerchantCenterLinksResponse.Merge(dst, src)
+func (m *ListMerchantCenterLinksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMerchantCenterLinksResponse.Merge(m, src)
 }
 func (m *ListMerchantCenterLinksResponse) XXX_Size() int {
 	return xxx_messageInfo_ListMerchantCenterLinksResponse.Size(m)
@@ -120,16 +122,17 @@ func (m *GetMerchantCenterLinkRequest) Reset()         { *m = GetMerchantCenterL
 func (m *GetMerchantCenterLinkRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMerchantCenterLinkRequest) ProtoMessage()    {}
 func (*GetMerchantCenterLinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc, []int{2}
+	return fileDescriptor_2f76fd8f3030942d, []int{2}
 }
+
 func (m *GetMerchantCenterLinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMerchantCenterLinkRequest.Unmarshal(m, b)
 }
 func (m *GetMerchantCenterLinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMerchantCenterLinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetMerchantCenterLinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMerchantCenterLinkRequest.Merge(dst, src)
+func (m *GetMerchantCenterLinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMerchantCenterLinkRequest.Merge(m, src)
 }
 func (m *GetMerchantCenterLinkRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMerchantCenterLinkRequest.Size(m)
@@ -162,16 +165,17 @@ func (m *MutateMerchantCenterLinkRequest) Reset()         { *m = MutateMerchantC
 func (m *MutateMerchantCenterLinkRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateMerchantCenterLinkRequest) ProtoMessage()    {}
 func (*MutateMerchantCenterLinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc, []int{3}
+	return fileDescriptor_2f76fd8f3030942d, []int{3}
 }
+
 func (m *MutateMerchantCenterLinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateMerchantCenterLinkRequest.Unmarshal(m, b)
 }
 func (m *MutateMerchantCenterLinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateMerchantCenterLinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateMerchantCenterLinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateMerchantCenterLinkRequest.Merge(dst, src)
+func (m *MutateMerchantCenterLinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateMerchantCenterLinkRequest.Merge(m, src)
 }
 func (m *MutateMerchantCenterLinkRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateMerchantCenterLinkRequest.Size(m)
@@ -215,16 +219,17 @@ func (m *MerchantCenterLinkOperation) Reset()         { *m = MerchantCenterLinkO
 func (m *MerchantCenterLinkOperation) String() string { return proto.CompactTextString(m) }
 func (*MerchantCenterLinkOperation) ProtoMessage()    {}
 func (*MerchantCenterLinkOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc, []int{4}
+	return fileDescriptor_2f76fd8f3030942d, []int{4}
 }
+
 func (m *MerchantCenterLinkOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MerchantCenterLinkOperation.Unmarshal(m, b)
 }
 func (m *MerchantCenterLinkOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MerchantCenterLinkOperation.Marshal(b, m, deterministic)
 }
-func (dst *MerchantCenterLinkOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MerchantCenterLinkOperation.Merge(dst, src)
+func (m *MerchantCenterLinkOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MerchantCenterLinkOperation.Merge(m, src)
 }
 func (m *MerchantCenterLinkOperation) XXX_Size() int {
 	return xxx_messageInfo_MerchantCenterLinkOperation.Size(m)
@@ -279,76 +284,14 @@ func (m *MerchantCenterLinkOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MerchantCenterLinkOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MerchantCenterLinkOperation_OneofMarshaler, _MerchantCenterLinkOperation_OneofUnmarshaler, _MerchantCenterLinkOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MerchantCenterLinkOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MerchantCenterLinkOperation_Update)(nil),
 		(*MerchantCenterLinkOperation_Remove)(nil),
 	}
 }
 
-func _MerchantCenterLinkOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MerchantCenterLinkOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *MerchantCenterLinkOperation_Update:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *MerchantCenterLinkOperation_Remove:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("MerchantCenterLinkOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MerchantCenterLinkOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MerchantCenterLinkOperation)
-	switch tag {
-	case 1: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.MerchantCenterLink)
-		err := b.DecodeMessage(msg)
-		m.Operation = &MerchantCenterLinkOperation_Update{msg}
-		return true, err
-	case 2: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &MerchantCenterLinkOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MerchantCenterLinkOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MerchantCenterLinkOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *MerchantCenterLinkOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *MerchantCenterLinkOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for Merchant Center link mutate.
 type MutateMerchantCenterLinkResponse struct {
 	// Result for the mutate.
@@ -362,16 +305,17 @@ func (m *MutateMerchantCenterLinkResponse) Reset()         { *m = MutateMerchant
 func (m *MutateMerchantCenterLinkResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateMerchantCenterLinkResponse) ProtoMessage()    {}
 func (*MutateMerchantCenterLinkResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc, []int{5}
+	return fileDescriptor_2f76fd8f3030942d, []int{5}
 }
+
 func (m *MutateMerchantCenterLinkResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateMerchantCenterLinkResponse.Unmarshal(m, b)
 }
 func (m *MutateMerchantCenterLinkResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateMerchantCenterLinkResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateMerchantCenterLinkResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateMerchantCenterLinkResponse.Merge(dst, src)
+func (m *MutateMerchantCenterLinkResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateMerchantCenterLinkResponse.Merge(m, src)
 }
 func (m *MutateMerchantCenterLinkResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateMerchantCenterLinkResponse.Size(m)
@@ -402,16 +346,17 @@ func (m *MutateMerchantCenterLinkResult) Reset()         { *m = MutateMerchantCe
 func (m *MutateMerchantCenterLinkResult) String() string { return proto.CompactTextString(m) }
 func (*MutateMerchantCenterLinkResult) ProtoMessage()    {}
 func (*MutateMerchantCenterLinkResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc, []int{6}
+	return fileDescriptor_2f76fd8f3030942d, []int{6}
 }
+
 func (m *MutateMerchantCenterLinkResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateMerchantCenterLinkResult.Unmarshal(m, b)
 }
 func (m *MutateMerchantCenterLinkResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateMerchantCenterLinkResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateMerchantCenterLinkResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateMerchantCenterLinkResult.Merge(dst, src)
+func (m *MutateMerchantCenterLinkResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateMerchantCenterLinkResult.Merge(m, src)
 }
 func (m *MutateMerchantCenterLinkResult) XXX_Size() int {
 	return xxx_messageInfo_MutateMerchantCenterLinkResult.Size(m)
@@ -439,6 +384,57 @@ func init() {
 	proto.RegisterType((*MutateMerchantCenterLinkResult)(nil), "google.ads.googleads.v1.services.MutateMerchantCenterLinkResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/merchant_center_link_service.proto", fileDescriptor_2f76fd8f3030942d)
+}
+
+var fileDescriptor_2f76fd8f3030942d = []byte{
+	// 679 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6b, 0x13, 0x4f,
+	0x14, 0xff, 0x4e, 0xca, 0xb7, 0xd0, 0x89, 0x5e, 0x46, 0x8a, 0x31, 0x96, 0x36, 0xac, 0x3d, 0x94,
+	0x1c, 0x66, 0x49, 0x4b, 0x51, 0xb7, 0x46, 0xdc, 0x04, 0x6d, 0x85, 0xd6, 0x96, 0x15, 0x8a, 0x68,
+	0x20, 0x4c, 0xb3, 0xd3, 0xb8, 0x34, 0xbb, 0xb3, 0xee, 0xcc, 0xe6, 0x52, 0x7b, 0x11, 0xbc, 0x79,
+	0xf3, 0x0f, 0x10, 0x3c, 0x7a, 0xf2, 0xef, 0x10, 0xbc, 0xe8, 0xc9, 0xbb, 0x78, 0xf0, 0xaf, 0x90,
+	0x9d, 0x1f, 0x69, 0xa5, 0xbb, 0x49, 0x6d, 0x6e, 0x6f, 0x66, 0xde, 0x7c, 0xde, 0xfb, 0xbc, 0xf7,
+	0x79, 0x33, 0xb0, 0xdd, 0x67, 0xac, 0x3f, 0xa0, 0x36, 0xf1, 0xb9, 0xad, 0xcc, 0xcc, 0x1a, 0x36,
+	0x6c, 0x4e, 0x93, 0x61, 0xd0, 0xa3, 0xdc, 0x0e, 0x69, 0xd2, 0x7b, 0x49, 0x22, 0xd1, 0xed, 0xd1,
+	0x48, 0xd0, 0xa4, 0x3b, 0x08, 0xa2, 0xa3, 0xae, 0x3e, 0xc5, 0x71, 0xc2, 0x04, 0x43, 0x35, 0x75,
+	0x13, 0x13, 0x9f, 0xe3, 0x11, 0x08, 0x1e, 0x36, 0xb0, 0x01, 0xa9, 0xde, 0x2b, 0x0a, 0x93, 0x50,
+	0xce, 0xd2, 0xa4, 0x28, 0x8e, 0xc2, 0xaf, 0x2e, 0x98, 0xdb, 0x71, 0x60, 0x93, 0x28, 0x62, 0x82,
+	0x88, 0x80, 0x45, 0x5c, 0x9f, 0xea, 0xe8, 0xb6, 0x5c, 0x1d, 0xa4, 0x87, 0xf6, 0x61, 0x40, 0x07,
+	0x7e, 0x37, 0x24, 0x5c, 0xdf, 0xb7, 0x5c, 0xb8, 0xb8, 0x1d, 0x70, 0xb1, 0xa3, 0x23, 0xb4, 0x65,
+	0x80, 0xed, 0x20, 0x3a, 0xe2, 0x1e, 0x7d, 0x95, 0x52, 0x2e, 0xd0, 0x12, 0x2c, 0xf7, 0x52, 0x2e,
+	0x58, 0x48, 0x93, 0x6e, 0xe0, 0x57, 0x40, 0x0d, 0xac, 0xcc, 0x79, 0xd0, 0x6c, 0x3d, 0xf6, 0xad,
+	0x77, 0x00, 0x2e, 0x15, 0x62, 0xf0, 0x98, 0x45, 0x9c, 0xa2, 0x00, 0xce, 0xe7, 0x91, 0xe0, 0x15,
+	0x50, 0x9b, 0x59, 0x29, 0xaf, 0xae, 0xe3, 0xa2, 0x32, 0x8d, 0x8a, 0x80, 0xcf, 0xc3, 0x7b, 0xd7,
+	0xc2, 0xf3, 0x21, 0xad, 0x36, 0x5c, 0xd8, 0xa4, 0x39, 0xc9, 0x18, 0x3e, 0xb7, 0xe0, 0x55, 0x03,
+	0xda, 0x8d, 0x48, 0x48, 0x35, 0xa3, 0x2b, 0x66, 0xf3, 0x09, 0x09, 0xa9, 0xf5, 0x01, 0xc0, 0xa5,
+	0x9d, 0x54, 0x10, 0x41, 0x8b, 0x81, 0x26, 0x15, 0x06, 0xbd, 0x80, 0x73, 0x2c, 0xa6, 0x89, 0xec,
+	0x48, 0xa5, 0x54, 0x03, 0x2b, 0xe5, 0xd5, 0x26, 0x9e, 0xa4, 0x87, 0x1c, 0x9e, 0xbb, 0x06, 0xc4,
+	0x3b, 0xc5, 0xb3, 0xbe, 0x01, 0x78, 0x73, 0x8c, 0x2b, 0xda, 0x80, 0xe5, 0x34, 0xf6, 0x89, 0xa0,
+	0xb2, 0xdb, 0x95, 0x19, 0x19, 0xbe, 0x6a, 0xc2, 0x1b, 0x41, 0xe0, 0x47, 0x99, 0x20, 0x76, 0x08,
+	0x3f, 0xf2, 0xa0, 0x72, 0xcf, 0x6c, 0xb4, 0x0b, 0x67, 0xd5, 0x4a, 0xb2, 0xba, 0x6c, 0x7f, 0xb6,
+	0xfe, 0xf3, 0x34, 0x0c, 0xaa, 0xc0, 0xd9, 0x84, 0x86, 0x6c, 0x48, 0x65, 0x1d, 0xe6, 0xb2, 0x13,
+	0xb5, 0x6e, 0x95, 0xcf, 0x14, 0xc9, 0x7a, 0x0d, 0x6b, 0xc5, 0x55, 0xd7, 0x52, 0x7a, 0x96, 0x41,
+	0xf1, 0x74, 0x20, 0x74, 0x49, 0x1f, 0x5c, 0xa0, 0xa4, 0xc5, 0x98, 0xe9, 0x40, 0x78, 0x1a, 0xcf,
+	0x7a, 0x08, 0x17, 0xc7, 0x7b, 0x5e, 0x48, 0x3b, 0xab, 0x9f, 0xff, 0x87, 0x37, 0xce, 0x23, 0x3c,
+	0x55, 0xc9, 0xa0, 0x1f, 0x00, 0x5e, 0x2f, 0x98, 0x16, 0x74, 0x01, 0x2a, 0xe3, 0x87, 0xb5, 0xea,
+	0x4e, 0x81, 0xa0, 0xea, 0x6b, 0xdd, 0x7d, 0xf3, 0xfd, 0xe7, 0xfb, 0xd2, 0x1a, 0x6a, 0x64, 0x6f,
+	0x90, 0x51, 0x33, 0xb7, 0x8f, 0xcf, 0x68, 0xbd, 0x59, 0x3f, 0xb1, 0x73, 0x46, 0x0f, 0x7d, 0x05,
+	0x70, 0x3e, 0x77, 0xf6, 0xd0, 0xfd, 0xc9, 0x79, 0x8d, 0x1b, 0xda, 0xea, 0xe5, 0x04, 0x68, 0x35,
+	0x25, 0x97, 0xdb, 0x68, 0x3d, 0xe3, 0x72, 0xfc, 0x57, 0xeb, 0x9a, 0xa7, 0xd4, 0xea, 0x79, 0x64,
+	0xec, 0xfa, 0x09, 0xfa, 0x05, 0x60, 0xa5, 0x48, 0x11, 0xc8, 0x9d, 0x46, 0x77, 0x8a, 0x55, 0x6b,
+	0x2a, 0xe9, 0xaa, 0x76, 0xb5, 0x25, 0xc5, 0xa6, 0x75, 0xe7, 0x9f, 0xdb, 0xe5, 0x84, 0x12, 0xdb,
+	0x01, 0xf5, 0xd6, 0xdb, 0x12, 0x5c, 0xee, 0xb1, 0x70, 0x62, 0x3a, 0xad, 0xc5, 0x42, 0x61, 0xef,
+	0x65, 0x2f, 0xca, 0x1e, 0x78, 0xbe, 0xa5, 0x31, 0xfa, 0x6c, 0x40, 0xa2, 0x3e, 0x66, 0x49, 0xdf,
+	0xee, 0xd3, 0x48, 0xbe, 0x37, 0xe6, 0x7b, 0x8b, 0x03, 0x5e, 0xfc, 0xa9, 0x6e, 0x18, 0xe3, 0x63,
+	0x69, 0x66, 0xd3, 0x75, 0x3f, 0x95, 0x6a, 0x9b, 0x0a, 0xd0, 0xf5, 0x39, 0x56, 0x66, 0x66, 0xed,
+	0x37, 0xb0, 0x0e, 0xcc, 0xbf, 0x18, 0x97, 0x8e, 0xeb, 0xf3, 0xce, 0xc8, 0xa5, 0xb3, 0xdf, 0xe8,
+	0x18, 0x97, 0xdf, 0xa5, 0x65, 0xb5, 0xef, 0x38, 0xae, 0xcf, 0x1d, 0x67, 0xe4, 0xe4, 0x38, 0xfb,
+	0x0d, 0xc7, 0x31, 0x6e, 0x07, 0xb3, 0x32, 0xcf, 0xb5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7e,
+	0xe0, 0x79, 0xc5, 0xfb, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -582,54 +578,3 @@ var _MerchantCenterLinkService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/merchant_center_link_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/merchant_center_link_service.proto", fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc)
-}
-
-var fileDescriptor_merchant_center_link_service_b9987cf1a2e346cc = []byte{
-	// 679 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6b, 0x13, 0x4f,
-	0x14, 0xff, 0x4e, 0xca, 0xb7, 0xd0, 0x89, 0x5e, 0x46, 0x8a, 0x31, 0x96, 0x36, 0xac, 0x3d, 0x94,
-	0x1c, 0x66, 0x49, 0x4b, 0x51, 0xb7, 0x46, 0xdc, 0x04, 0x6d, 0x85, 0xd6, 0x96, 0x15, 0x8a, 0x68,
-	0x20, 0x4c, 0xb3, 0xd3, 0xb8, 0x34, 0xbb, 0xb3, 0xee, 0xcc, 0xe6, 0x52, 0x7b, 0x11, 0xbc, 0x79,
-	0xf3, 0x0f, 0x10, 0x3c, 0x7a, 0xf2, 0xef, 0x10, 0xbc, 0xe8, 0xc9, 0xbb, 0x78, 0xf0, 0xaf, 0x90,
-	0x9d, 0x1f, 0x69, 0xa5, 0xbb, 0x49, 0x6d, 0x6e, 0x6f, 0x66, 0xde, 0x7c, 0xde, 0xfb, 0xbc, 0xf7,
-	0x79, 0x33, 0xb0, 0xdd, 0x67, 0xac, 0x3f, 0xa0, 0x36, 0xf1, 0xb9, 0xad, 0xcc, 0xcc, 0x1a, 0x36,
-	0x6c, 0x4e, 0x93, 0x61, 0xd0, 0xa3, 0xdc, 0x0e, 0x69, 0xd2, 0x7b, 0x49, 0x22, 0xd1, 0xed, 0xd1,
-	0x48, 0xd0, 0xa4, 0x3b, 0x08, 0xa2, 0xa3, 0xae, 0x3e, 0xc5, 0x71, 0xc2, 0x04, 0x43, 0x35, 0x75,
-	0x13, 0x13, 0x9f, 0xe3, 0x11, 0x08, 0x1e, 0x36, 0xb0, 0x01, 0xa9, 0xde, 0x2b, 0x0a, 0x93, 0x50,
-	0xce, 0xd2, 0xa4, 0x28, 0x8e, 0xc2, 0xaf, 0x2e, 0x98, 0xdb, 0x71, 0x60, 0x93, 0x28, 0x62, 0x82,
-	0x88, 0x80, 0x45, 0x5c, 0x9f, 0xea, 0xe8, 0xb6, 0x5c, 0x1d, 0xa4, 0x87, 0xf6, 0x61, 0x40, 0x07,
-	0x7e, 0x37, 0x24, 0x5c, 0xdf, 0xb7, 0x5c, 0xb8, 0xb8, 0x1d, 0x70, 0xb1, 0xa3, 0x23, 0xb4, 0x65,
-	0x80, 0xed, 0x20, 0x3a, 0xe2, 0x1e, 0x7d, 0x95, 0x52, 0x2e, 0xd0, 0x12, 0x2c, 0xf7, 0x52, 0x2e,
-	0x58, 0x48, 0x93, 0x6e, 0xe0, 0x57, 0x40, 0x0d, 0xac, 0xcc, 0x79, 0xd0, 0x6c, 0x3d, 0xf6, 0xad,
-	0x77, 0x00, 0x2e, 0x15, 0x62, 0xf0, 0x98, 0x45, 0x9c, 0xa2, 0x00, 0xce, 0xe7, 0x91, 0xe0, 0x15,
-	0x50, 0x9b, 0x59, 0x29, 0xaf, 0xae, 0xe3, 0xa2, 0x32, 0x8d, 0x8a, 0x80, 0xcf, 0xc3, 0x7b, 0xd7,
-	0xc2, 0xf3, 0x21, 0xad, 0x36, 0x5c, 0xd8, 0xa4, 0x39, 0xc9, 0x18, 0x3e, 0xb7, 0xe0, 0x55, 0x03,
-	0xda, 0x8d, 0x48, 0x48, 0x35, 0xa3, 0x2b, 0x66, 0xf3, 0x09, 0x09, 0xa9, 0xf5, 0x01, 0xc0, 0xa5,
-	0x9d, 0x54, 0x10, 0x41, 0x8b, 0x81, 0x26, 0x15, 0x06, 0xbd, 0x80, 0x73, 0x2c, 0xa6, 0x89, 0xec,
-	0x48, 0xa5, 0x54, 0x03, 0x2b, 0xe5, 0xd5, 0x26, 0x9e, 0xa4, 0x87, 0x1c, 0x9e, 0xbb, 0x06, 0xc4,
-	0x3b, 0xc5, 0xb3, 0xbe, 0x01, 0x78, 0x73, 0x8c, 0x2b, 0xda, 0x80, 0xe5, 0x34, 0xf6, 0x89, 0xa0,
-	0xb2, 0xdb, 0x95, 0x19, 0x19, 0xbe, 0x6a, 0xc2, 0x1b, 0x41, 0xe0, 0x47, 0x99, 0x20, 0x76, 0x08,
-	0x3f, 0xf2, 0xa0, 0x72, 0xcf, 0x6c, 0xb4, 0x0b, 0x67, 0xd5, 0x4a, 0xb2, 0xba, 0x6c, 0x7f, 0xb6,
-	0xfe, 0xf3, 0x34, 0x0c, 0xaa, 0xc0, 0xd9, 0x84, 0x86, 0x6c, 0x48, 0x65, 0x1d, 0xe6, 0xb2, 0x13,
-	0xb5, 0x6e, 0x95, 0xcf, 0x14, 0xc9, 0x7a, 0x0d, 0x6b, 0xc5, 0x55, 0xd7, 0x52, 0x7a, 0x96, 0x41,
-	0xf1, 0x74, 0x20, 0x74, 0x49, 0x1f, 0x5c, 0xa0, 0xa4, 0xc5, 0x98, 0xe9, 0x40, 0x78, 0x1a, 0xcf,
-	0x7a, 0x08, 0x17, 0xc7, 0x7b, 0x5e, 0x48, 0x3b, 0xab, 0x9f, 0xff, 0x87, 0x37, 0xce, 0x23, 0x3c,
-	0x55, 0xc9, 0xa0, 0x1f, 0x00, 0x5e, 0x2f, 0x98, 0x16, 0x74, 0x01, 0x2a, 0xe3, 0x87, 0xb5, 0xea,
-	0x4e, 0x81, 0xa0, 0xea, 0x6b, 0xdd, 0x7d, 0xf3, 0xfd, 0xe7, 0xfb, 0xd2, 0x1a, 0x6a, 0x64, 0x6f,
-	0x90, 0x51, 0x33, 0xb7, 0x8f, 0xcf, 0x68, 0xbd, 0x59, 0x3f, 0xb1, 0x73, 0x46, 0x0f, 0x7d, 0x05,
-	0x70, 0x3e, 0x77, 0xf6, 0xd0, 0xfd, 0xc9, 0x79, 0x8d, 0x1b, 0xda, 0xea, 0xe5, 0x04, 0x68, 0x35,
-	0x25, 0x97, 0xdb, 0x68, 0x3d, 0xe3, 0x72, 0xfc, 0x57, 0xeb, 0x9a, 0xa7, 0xd4, 0xea, 0x79, 0x64,
-	0xec, 0xfa, 0x09, 0xfa, 0x05, 0x60, 0xa5, 0x48, 0x11, 0xc8, 0x9d, 0x46, 0x77, 0x8a, 0x55, 0x6b,
-	0x2a, 0xe9, 0xaa, 0x76, 0xb5, 0x25, 0xc5, 0xa6, 0x75, 0xe7, 0x9f, 0xdb, 0xe5, 0x84, 0x12, 0xdb,
-	0x01, 0xf5, 0xd6, 0xdb, 0x12, 0x5c, 0xee, 0xb1, 0x70, 0x62, 0x3a, 0xad, 0xc5, 0x42, 0x61, 0xef,
-	0x65, 0x2f, 0xca, 0x1e, 0x78, 0xbe, 0xa5, 0x31, 0xfa, 0x6c, 0x40, 0xa2, 0x3e, 0x66, 0x49, 0xdf,
-	0xee, 0xd3, 0x48, 0xbe, 0x37, 0xe6, 0x7b, 0x8b, 0x03, 0x5e, 0xfc, 0xa9, 0x6e, 0x18, 0xe3, 0x63,
-	0x69, 0x66, 0xd3, 0x75, 0x3f, 0x95, 0x6a, 0x9b, 0x0a, 0xd0, 0xf5, 0x39, 0x56, 0x66, 0x66, 0xed,
-	0x37, 0xb0, 0x0e, 0xcc, 0xbf, 0x18, 0x97, 0x8e, 0xeb, 0xf3, 0xce, 0xc8, 0xa5, 0xb3, 0xdf, 0xe8,
-	0x18, 0x97, 0xdf, 0xa5, 0x65, 0xb5, 0xef, 0x38, 0xae, 0xcf, 0x1d, 0x67, 0xe4, 0xe4, 0x38, 0xfb,
-	0x0d, 0xc7, 0x31, 0x6e, 0x07, 0xb3, 0x32, 0xcf, 0xb5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7e,
-	0xe0, 0x79, 0xc5, 0xfb, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/mobile_app_category_constant_service.pb.go b/googleapis/ads/googleads/v1/services/mobile_app_category_constant_service.pb.go
index 4f98cb9ae3..6fab7fb024 100644
--- a/googleapis/ads/googleads/v1/services/mobile_app_category_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/mobile_app_category_constant_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/mobile_app_category_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [MobileAppCategoryConstantService.GetMobileAppCategoryConstant][google.ads.googleads.v1.services.MobileAppCategoryConstantService.GetMobileAppCategoryConstant].
@@ -39,16 +39,17 @@ func (m *GetMobileAppCategoryConstantRequest) Reset()         { *m = GetMobileAp
 func (m *GetMobileAppCategoryConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMobileAppCategoryConstantRequest) ProtoMessage()    {}
 func (*GetMobileAppCategoryConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mobile_app_category_constant_service_8ab2dafc094f53e2, []int{0}
+	return fileDescriptor_57065493a9a2f64e, []int{0}
 }
+
 func (m *GetMobileAppCategoryConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMobileAppCategoryConstantRequest.Unmarshal(m, b)
 }
 func (m *GetMobileAppCategoryConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMobileAppCategoryConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetMobileAppCategoryConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMobileAppCategoryConstantRequest.Merge(dst, src)
+func (m *GetMobileAppCategoryConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMobileAppCategoryConstantRequest.Merge(m, src)
 }
 func (m *GetMobileAppCategoryConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMobileAppCategoryConstantRequest.Size(m)
@@ -70,6 +71,38 @@ func init() {
 	proto.RegisterType((*GetMobileAppCategoryConstantRequest)(nil), "google.ads.googleads.v1.services.GetMobileAppCategoryConstantRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/mobile_app_category_constant_service.proto", fileDescriptor_57065493a9a2f64e)
+}
+
+var fileDescriptor_57065493a9a2f64e = []byte{
+	// 371 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x31, 0x4b, 0xfb, 0x40,
+	0x18, 0xc6, 0x49, 0xfe, 0xf0, 0x07, 0x83, 0x2e, 0x99, 0xa4, 0x74, 0x08, 0x6d, 0x05, 0x71, 0xb8,
+	0x98, 0xba, 0xc8, 0xa9, 0x43, 0x5a, 0xa5, 0xa2, 0x28, 0xa5, 0x42, 0x07, 0x09, 0x84, 0x6b, 0x72,
+	0x84, 0x40, 0x73, 0x77, 0xe6, 0xbd, 0x16, 0x44, 0x5c, 0x3a, 0xbb, 0xf9, 0x0d, 0x1c, 0xfd, 0x28,
+	0xae, 0xce, 0x6e, 0x4e, 0x7e, 0x0a, 0x49, 0x2f, 0x17, 0x70, 0x88, 0x71, 0x7b, 0xb8, 0x3c, 0xf9,
+	0x3d, 0xf7, 0x3e, 0xf7, 0x5a, 0x97, 0x09, 0xe7, 0xc9, 0x9c, 0xba, 0x24, 0x06, 0x57, 0xc9, 0x42,
+	0x2d, 0x3d, 0x17, 0x68, 0xbe, 0x4c, 0x23, 0x0a, 0x6e, 0xc6, 0x67, 0xe9, 0x9c, 0x86, 0x44, 0x88,
+	0x30, 0x22, 0x92, 0x26, 0x3c, 0xbf, 0x0f, 0x23, 0xce, 0x40, 0x12, 0x26, 0xc3, 0xd2, 0x85, 0x44,
+	0xce, 0x25, 0xb7, 0x1d, 0x45, 0x40, 0x24, 0x06, 0x54, 0xc1, 0xd0, 0xd2, 0x43, 0x1a, 0xd6, 0x3a,
+	0xad, 0x8b, 0xcb, 0x29, 0xf0, 0x45, 0xde, 0x94, 0xa7, 0x72, 0x5a, 0x6d, 0x4d, 0x11, 0xa9, 0x4b,
+	0x18, 0xe3, 0x92, 0xc8, 0x94, 0x33, 0x50, 0x5f, 0x3b, 0x17, 0x56, 0x77, 0x44, 0xe5, 0xd5, 0x1a,
+	0xe3, 0x0b, 0x31, 0x2c, 0x21, 0xc3, 0x92, 0x31, 0xa1, 0x77, 0x0b, 0x0a, 0xd2, 0xee, 0x5a, 0x5b,
+	0x3a, 0x34, 0x64, 0x24, 0xa3, 0xdb, 0x86, 0x63, 0xec, 0x6e, 0x4c, 0x36, 0xf5, 0xe1, 0x35, 0xc9,
+	0x68, 0x7f, 0x65, 0x5a, 0x4e, 0x2d, 0xe9, 0x46, 0x4d, 0x65, 0x7f, 0x18, 0x56, 0xfb, 0xb7, 0x44,
+	0xfb, 0x0c, 0x35, 0x15, 0x83, 0xfe, 0x70, 0xe3, 0xd6, 0x71, 0x2d, 0xa6, 0x6a, 0x0f, 0xd5, 0x42,
+	0x3a, 0x87, 0xab, 0xf7, 0xcf, 0x67, 0xb3, 0x6f, 0xef, 0x17, 0x75, 0x3f, 0xfc, 0x18, 0xfd, 0x24,
+	0xab, 0xfb, 0x0b, 0xdc, 0xbd, 0xc7, 0xc1, 0x93, 0x69, 0xf5, 0x22, 0x9e, 0x35, 0x0e, 0x31, 0xd8,
+	0x69, 0xaa, 0x6a, 0x5c, 0x3c, 0xd0, 0xd8, 0xb8, 0x3d, 0x2f, 0x51, 0x09, 0x9f, 0x13, 0x96, 0x20,
+	0x9e, 0x27, 0x6e, 0x42, 0xd9, 0xfa, 0xf9, 0xf4, 0x5a, 0x88, 0x14, 0xea, 0x97, 0xf2, 0x48, 0x8b,
+	0x17, 0xf3, 0xdf, 0xc8, 0xf7, 0x5f, 0x4d, 0x67, 0xa4, 0x80, 0x7e, 0x0c, 0x48, 0xc9, 0x42, 0x4d,
+	0x3d, 0x54, 0x06, 0xc3, 0x9b, 0xb6, 0x04, 0x7e, 0x0c, 0x41, 0x65, 0x09, 0xa6, 0x5e, 0xa0, 0x2d,
+	0x5f, 0x66, 0x4f, 0x9d, 0x63, 0xec, 0xc7, 0x80, 0x71, 0x65, 0xc2, 0x78, 0xea, 0x61, 0xac, 0x6d,
+	0xb3, 0xff, 0xeb, 0x7b, 0x1e, 0x7c, 0x07, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xfe, 0xdd, 0xd9, 0x3b,
+	0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,35 +176,3 @@ var _MobileAppCategoryConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/mobile_app_category_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/mobile_app_category_constant_service.proto", fileDescriptor_mobile_app_category_constant_service_8ab2dafc094f53e2)
-}
-
-var fileDescriptor_mobile_app_category_constant_service_8ab2dafc094f53e2 = []byte{
-	// 371 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x31, 0x4b, 0xfb, 0x40,
-	0x18, 0xc6, 0x49, 0xfe, 0xf0, 0x07, 0x83, 0x2e, 0x99, 0xa4, 0x74, 0x08, 0x6d, 0x05, 0x71, 0xb8,
-	0x98, 0xba, 0xc8, 0xa9, 0x43, 0x5a, 0xa5, 0xa2, 0x28, 0xa5, 0x42, 0x07, 0x09, 0x84, 0x6b, 0x72,
-	0x84, 0x40, 0x73, 0x77, 0xe6, 0xbd, 0x16, 0x44, 0x5c, 0x3a, 0xbb, 0xf9, 0x0d, 0x1c, 0xfd, 0x28,
-	0xae, 0xce, 0x6e, 0x4e, 0x7e, 0x0a, 0x49, 0x2f, 0x17, 0x70, 0x88, 0x71, 0x7b, 0xb8, 0x3c, 0xf9,
-	0x3d, 0xf7, 0x3e, 0xf7, 0x5a, 0x97, 0x09, 0xe7, 0xc9, 0x9c, 0xba, 0x24, 0x06, 0x57, 0xc9, 0x42,
-	0x2d, 0x3d, 0x17, 0x68, 0xbe, 0x4c, 0x23, 0x0a, 0x6e, 0xc6, 0x67, 0xe9, 0x9c, 0x86, 0x44, 0x88,
-	0x30, 0x22, 0x92, 0x26, 0x3c, 0xbf, 0x0f, 0x23, 0xce, 0x40, 0x12, 0x26, 0xc3, 0xd2, 0x85, 0x44,
-	0xce, 0x25, 0xb7, 0x1d, 0x45, 0x40, 0x24, 0x06, 0x54, 0xc1, 0xd0, 0xd2, 0x43, 0x1a, 0xd6, 0x3a,
-	0xad, 0x8b, 0xcb, 0x29, 0xf0, 0x45, 0xde, 0x94, 0xa7, 0x72, 0x5a, 0x6d, 0x4d, 0x11, 0xa9, 0x4b,
-	0x18, 0xe3, 0x92, 0xc8, 0x94, 0x33, 0x50, 0x5f, 0x3b, 0x17, 0x56, 0x77, 0x44, 0xe5, 0xd5, 0x1a,
-	0xe3, 0x0b, 0x31, 0x2c, 0x21, 0xc3, 0x92, 0x31, 0xa1, 0x77, 0x0b, 0x0a, 0xd2, 0xee, 0x5a, 0x5b,
-	0x3a, 0x34, 0x64, 0x24, 0xa3, 0xdb, 0x86, 0x63, 0xec, 0x6e, 0x4c, 0x36, 0xf5, 0xe1, 0x35, 0xc9,
-	0x68, 0x7f, 0x65, 0x5a, 0x4e, 0x2d, 0xe9, 0x46, 0x4d, 0x65, 0x7f, 0x18, 0x56, 0xfb, 0xb7, 0x44,
-	0xfb, 0x0c, 0x35, 0x15, 0x83, 0xfe, 0x70, 0xe3, 0xd6, 0x71, 0x2d, 0xa6, 0x6a, 0x0f, 0xd5, 0x42,
-	0x3a, 0x87, 0xab, 0xf7, 0xcf, 0x67, 0xb3, 0x6f, 0xef, 0x17, 0x75, 0x3f, 0xfc, 0x18, 0xfd, 0x24,
-	0xab, 0xfb, 0x0b, 0xdc, 0xbd, 0xc7, 0xc1, 0x93, 0x69, 0xf5, 0x22, 0x9e, 0x35, 0x0e, 0x31, 0xd8,
-	0x69, 0xaa, 0x6a, 0x5c, 0x3c, 0xd0, 0xd8, 0xb8, 0x3d, 0x2f, 0x51, 0x09, 0x9f, 0x13, 0x96, 0x20,
-	0x9e, 0x27, 0x6e, 0x42, 0xd9, 0xfa, 0xf9, 0xf4, 0x5a, 0x88, 0x14, 0xea, 0x97, 0xf2, 0x48, 0x8b,
-	0x17, 0xf3, 0xdf, 0xc8, 0xf7, 0x5f, 0x4d, 0x67, 0xa4, 0x80, 0x7e, 0x0c, 0x48, 0xc9, 0x42, 0x4d,
-	0x3d, 0x54, 0x06, 0xc3, 0x9b, 0xb6, 0x04, 0x7e, 0x0c, 0x41, 0x65, 0x09, 0xa6, 0x5e, 0xa0, 0x2d,
-	0x5f, 0x66, 0x4f, 0x9d, 0x63, 0xec, 0xc7, 0x80, 0x71, 0x65, 0xc2, 0x78, 0xea, 0x61, 0xac, 0x6d,
-	0xb3, 0xff, 0xeb, 0x7b, 0x1e, 0x7c, 0x07, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xfe, 0xdd, 0xd9, 0x3b,
-	0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/mobile_device_constant_service.pb.go b/googleapis/ads/googleads/v1/services/mobile_device_constant_service.pb.go
index 743ec61077..0bd20da3ec 100644
--- a/googleapis/ads/googleads/v1/services/mobile_device_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/mobile_device_constant_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/mobile_device_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [MobileDeviceConstantService.GetMobileDeviceConstant][google.ads.googleads.v1.services.MobileDeviceConstantService.GetMobileDeviceConstant].
 type GetMobileDeviceConstantRequest struct {
@@ -38,16 +38,17 @@ func (m *GetMobileDeviceConstantRequest) Reset()         { *m = GetMobileDeviceC
 func (m *GetMobileDeviceConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMobileDeviceConstantRequest) ProtoMessage()    {}
 func (*GetMobileDeviceConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mobile_device_constant_service_eac6f777d9ebb18e, []int{0}
+	return fileDescriptor_6dacc361447bd918, []int{0}
 }
+
 func (m *GetMobileDeviceConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMobileDeviceConstantRequest.Unmarshal(m, b)
 }
 func (m *GetMobileDeviceConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMobileDeviceConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetMobileDeviceConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMobileDeviceConstantRequest.Merge(dst, src)
+func (m *GetMobileDeviceConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMobileDeviceConstantRequest.Merge(m, src)
 }
 func (m *GetMobileDeviceConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMobileDeviceConstantRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetMobileDeviceConstantRequest)(nil), "google.ads.googleads.v1.services.GetMobileDeviceConstantRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/mobile_device_constant_service.proto", fileDescriptor_6dacc361447bd918)
+}
+
+var fileDescriptor_6dacc361447bd918 = []byte{
+	// 362 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbf, 0x4a, 0xc3, 0x40,
+	0x18, 0x27, 0x11, 0x04, 0x83, 0x2e, 0x59, 0x94, 0x2a, 0x12, 0x6a, 0x07, 0x51, 0xbc, 0x23, 0x76,
+	0x10, 0x4e, 0x14, 0x53, 0x2d, 0x75, 0x51, 0x4a, 0x85, 0x0e, 0x12, 0x08, 0xd7, 0xe6, 0x08, 0x81,
+	0xe6, 0xae, 0xe6, 0xbb, 0x76, 0x11, 0x17, 0x17, 0x1f, 0xc0, 0x37, 0x70, 0xf4, 0x4d, 0x74, 0xf5,
+	0x15, 0x5c, 0xf4, 0x29, 0x24, 0xb9, 0x5c, 0x40, 0x48, 0xda, 0xed, 0x97, 0xbb, 0xdf, 0x9f, 0xef,
+	0x7e, 0x5f, 0xac, 0x6e, 0x24, 0x44, 0x34, 0x61, 0x98, 0x86, 0x80, 0x15, 0xcc, 0xd0, 0xdc, 0xc5,
+	0xc0, 0xd2, 0x79, 0x3c, 0x66, 0x80, 0x13, 0x31, 0x8a, 0x27, 0x2c, 0x08, 0x59, 0xf6, 0x19, 0x8c,
+	0x05, 0x07, 0x49, 0xb9, 0x0c, 0x8a, 0x7b, 0x34, 0x4d, 0x85, 0x14, 0xb6, 0xa3, 0xb4, 0x88, 0x86,
+	0x80, 0x4a, 0x1b, 0x34, 0x77, 0x91, 0xb6, 0x69, 0x9c, 0xd7, 0x05, 0xa5, 0x0c, 0xc4, 0x2c, 0xad,
+	0x4f, 0x52, 0x09, 0x8d, 0x1d, 0xad, 0x9f, 0xc6, 0x98, 0x72, 0x2e, 0x24, 0x95, 0xb1, 0xe0, 0xa0,
+	0x6e, 0x9b, 0x5d, 0x6b, 0xb7, 0xc7, 0xe4, 0x4d, 0x6e, 0x70, 0x95, 0xeb, 0x2f, 0x0b, 0xf9, 0x80,
+	0x3d, 0xcc, 0x18, 0x48, 0x7b, 0xcf, 0xda, 0xd0, 0x49, 0x01, 0xa7, 0x09, 0xdb, 0x32, 0x1c, 0x63,
+	0x7f, 0x6d, 0xb0, 0xae, 0x0f, 0x6f, 0x69, 0xc2, 0x8e, 0x7f, 0x0c, 0x6b, 0xbb, 0xca, 0xe4, 0x4e,
+	0xbd, 0xc2, 0xfe, 0x30, 0xac, 0xcd, 0x9a, 0x1c, 0xfb, 0x02, 0x2d, 0xeb, 0x00, 0x2d, 0x1e, 0xb1,
+	0x71, 0x52, 0xeb, 0x50, 0x76, 0x84, 0xaa, 0xf4, 0xcd, 0xf6, 0xf3, 0xd7, 0xf7, 0xab, 0x79, 0x64,
+	0x1f, 0x66, 0x7d, 0x3e, 0xfe, 0x7b, 0xe6, 0x59, 0x52, 0x21, 0x00, 0x7c, 0xf0, 0xd4, 0x79, 0x31,
+	0xad, 0xd6, 0x58, 0x24, 0x4b, 0xa7, 0xee, 0x38, 0x0b, 0x1a, 0xe9, 0x67, 0xed, 0xf7, 0x8d, 0xfb,
+	0xeb, 0xc2, 0x25, 0x12, 0x13, 0xca, 0x23, 0x24, 0xd2, 0x08, 0x47, 0x8c, 0xe7, 0xbb, 0xd1, 0xdb,
+	0x9e, 0xc6, 0x50, 0xff, 0x97, 0x9d, 0x6a, 0xf0, 0x66, 0xae, 0xf4, 0x3c, 0xef, 0xdd, 0x74, 0x7a,
+	0xca, 0xd0, 0x0b, 0x01, 0x29, 0x98, 0xa1, 0xa1, 0x8b, 0x8a, 0x60, 0xf8, 0xd4, 0x14, 0xdf, 0x0b,
+	0xc1, 0x2f, 0x29, 0xfe, 0xd0, 0xf5, 0x35, 0xe5, 0xd7, 0x6c, 0xa9, 0x73, 0x42, 0xbc, 0x10, 0x08,
+	0x29, 0x49, 0x84, 0x0c, 0x5d, 0x42, 0x34, 0x6d, 0xb4, 0x9a, 0xcf, 0xd9, 0xfe, 0x0b, 0x00, 0x00,
+	0xff, 0xff, 0xc5, 0x86, 0x86, 0x6e, 0x0c, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _MobileDeviceConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/mobile_device_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/mobile_device_constant_service.proto", fileDescriptor_mobile_device_constant_service_eac6f777d9ebb18e)
-}
-
-var fileDescriptor_mobile_device_constant_service_eac6f777d9ebb18e = []byte{
-	// 362 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbf, 0x4a, 0xc3, 0x40,
-	0x18, 0x27, 0x11, 0x04, 0x83, 0x2e, 0x59, 0x94, 0x2a, 0x12, 0x6a, 0x07, 0x51, 0xbc, 0x23, 0x76,
-	0x10, 0x4e, 0x14, 0x53, 0x2d, 0x75, 0x51, 0x4a, 0x85, 0x0e, 0x12, 0x08, 0xd7, 0xe6, 0x08, 0x81,
-	0xe6, 0xae, 0xe6, 0xbb, 0x76, 0x11, 0x17, 0x17, 0x1f, 0xc0, 0x37, 0x70, 0xf4, 0x4d, 0x74, 0xf5,
-	0x15, 0x5c, 0xf4, 0x29, 0x24, 0xb9, 0x5c, 0x40, 0x48, 0xda, 0xed, 0x97, 0xbb, 0xdf, 0x9f, 0xef,
-	0x7e, 0x5f, 0xac, 0x6e, 0x24, 0x44, 0x34, 0x61, 0x98, 0x86, 0x80, 0x15, 0xcc, 0xd0, 0xdc, 0xc5,
-	0xc0, 0xd2, 0x79, 0x3c, 0x66, 0x80, 0x13, 0x31, 0x8a, 0x27, 0x2c, 0x08, 0x59, 0xf6, 0x19, 0x8c,
-	0x05, 0x07, 0x49, 0xb9, 0x0c, 0x8a, 0x7b, 0x34, 0x4d, 0x85, 0x14, 0xb6, 0xa3, 0xb4, 0x88, 0x86,
-	0x80, 0x4a, 0x1b, 0x34, 0x77, 0x91, 0xb6, 0x69, 0x9c, 0xd7, 0x05, 0xa5, 0x0c, 0xc4, 0x2c, 0xad,
-	0x4f, 0x52, 0x09, 0x8d, 0x1d, 0xad, 0x9f, 0xc6, 0x98, 0x72, 0x2e, 0x24, 0x95, 0xb1, 0xe0, 0xa0,
-	0x6e, 0x9b, 0x5d, 0x6b, 0xb7, 0xc7, 0xe4, 0x4d, 0x6e, 0x70, 0x95, 0xeb, 0x2f, 0x0b, 0xf9, 0x80,
-	0x3d, 0xcc, 0x18, 0x48, 0x7b, 0xcf, 0xda, 0xd0, 0x49, 0x01, 0xa7, 0x09, 0xdb, 0x32, 0x1c, 0x63,
-	0x7f, 0x6d, 0xb0, 0xae, 0x0f, 0x6f, 0x69, 0xc2, 0x8e, 0x7f, 0x0c, 0x6b, 0xbb, 0xca, 0xe4, 0x4e,
-	0xbd, 0xc2, 0xfe, 0x30, 0xac, 0xcd, 0x9a, 0x1c, 0xfb, 0x02, 0x2d, 0xeb, 0x00, 0x2d, 0x1e, 0xb1,
-	0x71, 0x52, 0xeb, 0x50, 0x76, 0x84, 0xaa, 0xf4, 0xcd, 0xf6, 0xf3, 0xd7, 0xf7, 0xab, 0x79, 0x64,
-	0x1f, 0x66, 0x7d, 0x3e, 0xfe, 0x7b, 0xe6, 0x59, 0x52, 0x21, 0x00, 0x7c, 0xf0, 0xd4, 0x79, 0x31,
-	0xad, 0xd6, 0x58, 0x24, 0x4b, 0xa7, 0xee, 0x38, 0x0b, 0x1a, 0xe9, 0x67, 0xed, 0xf7, 0x8d, 0xfb,
-	0xeb, 0xc2, 0x25, 0x12, 0x13, 0xca, 0x23, 0x24, 0xd2, 0x08, 0x47, 0x8c, 0xe7, 0xbb, 0xd1, 0xdb,
-	0x9e, 0xc6, 0x50, 0xff, 0x97, 0x9d, 0x6a, 0xf0, 0x66, 0xae, 0xf4, 0x3c, 0xef, 0xdd, 0x74, 0x7a,
-	0xca, 0xd0, 0x0b, 0x01, 0x29, 0x98, 0xa1, 0xa1, 0x8b, 0x8a, 0x60, 0xf8, 0xd4, 0x14, 0xdf, 0x0b,
-	0xc1, 0x2f, 0x29, 0xfe, 0xd0, 0xf5, 0x35, 0xe5, 0xd7, 0x6c, 0xa9, 0x73, 0x42, 0xbc, 0x10, 0x08,
-	0x29, 0x49, 0x84, 0x0c, 0x5d, 0x42, 0x34, 0x6d, 0xb4, 0x9a, 0xcf, 0xd9, 0xfe, 0x0b, 0x00, 0x00,
-	0xff, 0xff, 0xc5, 0x86, 0x86, 0x6e, 0x0c, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/mutate_job_service.pb.go b/googleapis/ads/googleads/v1/services/mutate_job_service.pb.go
index db3e3e640f..efc1d0e6c7 100644
--- a/googleapis/ads/googleads/v1/services/mutate_job_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/mutate_job_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/mutate_job_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [MutateJobService.CreateMutateJobRequest][]
 type CreateMutateJobRequest struct {
@@ -40,16 +40,17 @@ func (m *CreateMutateJobRequest) Reset()         { *m = CreateMutateJobRequest{}
 func (m *CreateMutateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateMutateJobRequest) ProtoMessage()    {}
 func (*CreateMutateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{0}
+	return fileDescriptor_4b20a6cc488e9516, []int{0}
 }
+
 func (m *CreateMutateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateMutateJobRequest.Unmarshal(m, b)
 }
 func (m *CreateMutateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateMutateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateMutateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateMutateJobRequest.Merge(dst, src)
+func (m *CreateMutateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateMutateJobRequest.Merge(m, src)
 }
 func (m *CreateMutateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateMutateJobRequest.Size(m)
@@ -80,16 +81,17 @@ func (m *CreateMutateJobResponse) Reset()         { *m = CreateMutateJobResponse
 func (m *CreateMutateJobResponse) String() string { return proto.CompactTextString(m) }
 func (*CreateMutateJobResponse) ProtoMessage()    {}
 func (*CreateMutateJobResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{1}
+	return fileDescriptor_4b20a6cc488e9516, []int{1}
 }
+
 func (m *CreateMutateJobResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateMutateJobResponse.Unmarshal(m, b)
 }
 func (m *CreateMutateJobResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateMutateJobResponse.Marshal(b, m, deterministic)
 }
-func (dst *CreateMutateJobResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateMutateJobResponse.Merge(dst, src)
+func (m *CreateMutateJobResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateMutateJobResponse.Merge(m, src)
 }
 func (m *CreateMutateJobResponse) XXX_Size() int {
 	return xxx_messageInfo_CreateMutateJobResponse.Size(m)
@@ -120,16 +122,17 @@ func (m *GetMutateJobRequest) Reset()         { *m = GetMutateJobRequest{} }
 func (m *GetMutateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMutateJobRequest) ProtoMessage()    {}
 func (*GetMutateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{2}
+	return fileDescriptor_4b20a6cc488e9516, []int{2}
 }
+
 func (m *GetMutateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMutateJobRequest.Unmarshal(m, b)
 }
 func (m *GetMutateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMutateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetMutateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMutateJobRequest.Merge(dst, src)
+func (m *GetMutateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMutateJobRequest.Merge(m, src)
 }
 func (m *GetMutateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMutateJobRequest.Size(m)
@@ -160,16 +163,17 @@ func (m *RunMutateJobRequest) Reset()         { *m = RunMutateJobRequest{} }
 func (m *RunMutateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*RunMutateJobRequest) ProtoMessage()    {}
 func (*RunMutateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{3}
+	return fileDescriptor_4b20a6cc488e9516, []int{3}
 }
+
 func (m *RunMutateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunMutateJobRequest.Unmarshal(m, b)
 }
 func (m *RunMutateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunMutateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunMutateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunMutateJobRequest.Merge(dst, src)
+func (m *RunMutateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunMutateJobRequest.Merge(m, src)
 }
 func (m *RunMutateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_RunMutateJobRequest.Size(m)
@@ -217,16 +221,17 @@ func (m *AddMutateJobOperationsRequest) Reset()         { *m = AddMutateJobOpera
 func (m *AddMutateJobOperationsRequest) String() string { return proto.CompactTextString(m) }
 func (*AddMutateJobOperationsRequest) ProtoMessage()    {}
 func (*AddMutateJobOperationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{4}
+	return fileDescriptor_4b20a6cc488e9516, []int{4}
 }
+
 func (m *AddMutateJobOperationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddMutateJobOperationsRequest.Unmarshal(m, b)
 }
 func (m *AddMutateJobOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddMutateJobOperationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *AddMutateJobOperationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddMutateJobOperationsRequest.Merge(dst, src)
+func (m *AddMutateJobOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddMutateJobOperationsRequest.Merge(m, src)
 }
 func (m *AddMutateJobOperationsRequest) XXX_Size() int {
 	return xxx_messageInfo_AddMutateJobOperationsRequest.Size(m)
@@ -275,16 +280,17 @@ func (m *AddMutateJobOperationsResponse) Reset()         { *m = AddMutateJobOper
 func (m *AddMutateJobOperationsResponse) String() string { return proto.CompactTextString(m) }
 func (*AddMutateJobOperationsResponse) ProtoMessage()    {}
 func (*AddMutateJobOperationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{5}
+	return fileDescriptor_4b20a6cc488e9516, []int{5}
 }
+
 func (m *AddMutateJobOperationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddMutateJobOperationsResponse.Unmarshal(m, b)
 }
 func (m *AddMutateJobOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddMutateJobOperationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *AddMutateJobOperationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddMutateJobOperationsResponse.Merge(dst, src)
+func (m *AddMutateJobOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddMutateJobOperationsResponse.Merge(m, src)
 }
 func (m *AddMutateJobOperationsResponse) XXX_Size() int {
 	return xxx_messageInfo_AddMutateJobOperationsResponse.Size(m)
@@ -331,16 +337,17 @@ func (m *ListMutateJobResultsRequest) Reset()         { *m = ListMutateJobResult
 func (m *ListMutateJobResultsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListMutateJobResultsRequest) ProtoMessage()    {}
 func (*ListMutateJobResultsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{6}
+	return fileDescriptor_4b20a6cc488e9516, []int{6}
 }
+
 func (m *ListMutateJobResultsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMutateJobResultsRequest.Unmarshal(m, b)
 }
 func (m *ListMutateJobResultsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMutateJobResultsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListMutateJobResultsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMutateJobResultsRequest.Merge(dst, src)
+func (m *ListMutateJobResultsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMutateJobResultsRequest.Merge(m, src)
 }
 func (m *ListMutateJobResultsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListMutateJobResultsRequest.Size(m)
@@ -390,16 +397,17 @@ func (m *ListMutateJobResultsResponse) Reset()         { *m = ListMutateJobResul
 func (m *ListMutateJobResultsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListMutateJobResultsResponse) ProtoMessage()    {}
 func (*ListMutateJobResultsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{7}
+	return fileDescriptor_4b20a6cc488e9516, []int{7}
 }
+
 func (m *ListMutateJobResultsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMutateJobResultsResponse.Unmarshal(m, b)
 }
 func (m *ListMutateJobResultsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMutateJobResultsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListMutateJobResultsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMutateJobResultsResponse.Merge(dst, src)
+func (m *ListMutateJobResultsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMutateJobResultsResponse.Merge(m, src)
 }
 func (m *ListMutateJobResultsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListMutateJobResultsResponse.Size(m)
@@ -442,16 +450,17 @@ func (m *MutateJobResult) Reset()         { *m = MutateJobResult{} }
 func (m *MutateJobResult) String() string { return proto.CompactTextString(m) }
 func (*MutateJobResult) ProtoMessage()    {}
 func (*MutateJobResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutate_job_service_ffc52ee77e0c9b27, []int{8}
+	return fileDescriptor_4b20a6cc488e9516, []int{8}
 }
+
 func (m *MutateJobResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateJobResult.Unmarshal(m, b)
 }
 func (m *MutateJobResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateJobResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateJobResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateJobResult.Merge(dst, src)
+func (m *MutateJobResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateJobResult.Merge(m, src)
 }
 func (m *MutateJobResult) XXX_Size() int {
 	return xxx_messageInfo_MutateJobResult.Size(m)
@@ -495,6 +504,69 @@ func init() {
 	proto.RegisterType((*MutateJobResult)(nil), "google.ads.googleads.v1.services.MutateJobResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/mutate_job_service.proto", fileDescriptor_4b20a6cc488e9516)
+}
+
+var fileDescriptor_4b20a6cc488e9516 = []byte{
+	// 867 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
+	0x14, 0xd7, 0x24, 0x62, 0x97, 0x9d, 0xb4, 0x9b, 0xee, 0x2c, 0x6c, 0x83, 0x77, 0x0b, 0x91, 0x77,
+	0x81, 0x12, 0xad, 0x6c, 0x12, 0x76, 0xa5, 0xcd, 0xac, 0xba, 0x6d, 0x8a, 0x50, 0x69, 0xf9, 0x57,
+	0x39, 0xa8, 0x07, 0x14, 0x61, 0x39, 0xf1, 0xc8, 0x32, 0x24, 0x33, 0xc6, 0x33, 0xae, 0xaa, 0x56,
+	0xe5, 0xc0, 0x57, 0xe8, 0x27, 0x80, 0x1b, 0x7c, 0x0c, 0x8e, 0x70, 0xe4, 0xc0, 0x89, 0x0b, 0x42,
+	0x1c, 0xf8, 0x0c, 0x1c, 0x56, 0xb6, 0x67, 0x1c, 0x27, 0x75, 0x9a, 0x26, 0xb7, 0xc9, 0x6f, 0xde,
+	0xef, 0xcd, 0xef, 0xf7, 0xe6, 0xe5, 0x79, 0x60, 0xdb, 0x63, 0xcc, 0x1b, 0x12, 0xd3, 0x71, 0xb9,
+	0x99, 0x2e, 0xe3, 0xd5, 0x71, 0xd3, 0xe4, 0x24, 0x3c, 0xf6, 0x07, 0x84, 0x9b, 0xa3, 0x48, 0x38,
+	0x82, 0xd8, 0xdf, 0xb0, 0xbe, 0x2d, 0x31, 0x23, 0x08, 0x99, 0x60, 0xa8, 0x9e, 0xc6, 0x1b, 0x8e,
+	0xcb, 0x8d, 0x8c, 0x6a, 0x1c, 0x37, 0x0d, 0x45, 0xd5, 0x5a, 0xb3, 0x92, 0x87, 0x84, 0xb3, 0x28,
+	0x9c, 0xcc, 0x9e, 0x66, 0xd5, 0xe6, 0x0b, 0x4a, 0x51, 0xdb, 0x71, 0xf9, 0xa4, 0x20, 0xed, 0x81,
+	0xa2, 0x06, 0xbe, 0xe9, 0x50, 0xca, 0x84, 0x23, 0x7c, 0x46, 0xb9, 0xdc, 0x7d, 0x28, 0x77, 0x87,
+	0x8c, 0x7a, 0x61, 0x44, 0xa9, 0x4f, 0x3d, 0x93, 0x05, 0x24, 0x9c, 0x08, 0x5a, 0x97, 0x41, 0x61,
+	0x30, 0x30, 0xb9, 0x70, 0x44, 0x24, 0x37, 0xf4, 0x36, 0xbc, 0xf7, 0x61, 0x48, 0x1c, 0x41, 0x3e,
+	0x4b, 0x04, 0x1f, 0xb0, 0xbe, 0x45, 0xbe, 0x8b, 0x08, 0x17, 0xe8, 0x2d, 0x58, 0x19, 0x44, 0x5c,
+	0xb0, 0x11, 0x09, 0x6d, 0xdf, 0xad, 0x81, 0x3a, 0xd8, 0xbc, 0x65, 0x41, 0x05, 0xed, 0xbb, 0xfa,
+	0x0b, 0xb8, 0x7e, 0x89, 0xca, 0x03, 0x46, 0x39, 0x41, 0x0f, 0xe1, 0xaa, 0x2a, 0x85, 0x4d, 0x9d,
+	0x11, 0x91, 0xec, 0x15, 0x05, 0x7e, 0xee, 0x8c, 0x88, 0x8e, 0xe1, 0xdd, 0x3d, 0x22, 0x2e, 0x9d,
+	0x7b, 0x5d, 0xae, 0x15, 0xd1, 0xe5, 0xb8, 0xbf, 0x03, 0xb8, 0xd1, 0x71, 0xdd, 0x8c, 0xfc, 0x45,
+	0x56, 0xac, 0x45, 0xd2, 0xa0, 0xb7, 0xe1, 0x6d, 0x1e, 0xc7, 0xd3, 0x01, 0xb1, 0x05, 0xfb, 0x96,
+	0xd0, 0x5a, 0x29, 0x89, 0x5a, 0x55, 0xe8, 0x97, 0x31, 0x88, 0xbe, 0x86, 0x77, 0x64, 0x2f, 0x8c,
+	0x2f, 0xa5, 0x56, 0xae, 0x97, 0x37, 0x2b, 0xad, 0xa6, 0x31, 0xaf, 0xd3, 0x8c, 0x54, 0x64, 0xa6,
+	0xd0, 0x5a, 0x1b, 0x4d, 0x02, 0x5c, 0x3f, 0x83, 0x6f, 0xce, 0x32, 0x23, 0x2f, 0xe3, 0x3d, 0xb8,
+	0x26, 0x98, 0x70, 0x86, 0x79, 0x01, 0xb1, 0xa1, 0xb2, 0x55, 0x4d, 0xf0, 0x31, 0x05, 0x19, 0xf0,
+	0x2e, 0x25, 0x27, 0xc2, 0x2e, 0x34, 0x76, 0x27, 0xde, 0xea, 0xe6, 0xcd, 0xe9, 0xdf, 0xc3, 0xfb,
+	0x9f, 0xfa, 0x3c, 0x7f, 0x87, 0x3c, 0x1a, 0x8a, 0xc5, 0xea, 0xb8, 0x01, 0x61, 0xe0, 0x78, 0x93,
+	0x47, 0xdd, 0x8a, 0x91, 0xb4, 0x7e, 0xf7, 0x61, 0xf2, 0xc3, 0xe6, 0xfe, 0x29, 0xa9, 0x95, 0xeb,
+	0x60, 0xf3, 0x15, 0xeb, 0xd5, 0x18, 0xe8, 0xfa, 0xa7, 0x44, 0xbf, 0x00, 0xf0, 0x41, 0xb1, 0x00,
+	0xe9, 0xfd, 0x13, 0x78, 0x33, 0x4c, 0xa1, 0x1a, 0x58, 0xac, 0xe6, 0x59, 0x32, 0x4b, 0x65, 0x40,
+	0xef, 0xc0, 0x6a, 0x52, 0x9d, 0x4b, 0x72, 0x57, 0x63, 0xf8, 0x50, 0x49, 0xd6, 0xff, 0x02, 0xb0,
+	0x3a, 0x95, 0x04, 0xbd, 0x0b, 0xab, 0x59, 0xf9, 0x6d, 0x9f, 0xba, 0xe4, 0x44, 0xde, 0xc1, 0xed,
+	0x0c, 0xde, 0x8f, 0x51, 0x14, 0xc1, 0x37, 0xa6, 0xfb, 0xc5, 0x0e, 0xa5, 0x9d, 0xe4, 0xb8, 0x4a,
+	0xab, 0xbd, 0x78, 0xdf, 0xc8, 0x04, 0xd6, 0xfa, 0xa8, 0x78, 0x03, 0x35, 0xe0, 0x8d, 0x74, 0x2e,
+	0x24, 0x35, 0xae, 0xb4, 0x90, 0x3a, 0x23, 0x0c, 0x06, 0x46, 0x37, 0xd9, 0xb1, 0x64, 0x44, 0xeb,
+	0xdf, 0x9b, 0x70, 0x2d, 0xf3, 0xd7, 0x4d, 0x8f, 0x44, 0xbf, 0x02, 0x58, 0x9d, 0x1a, 0x07, 0xe8,
+	0xd9, 0x7c, 0xa1, 0xc5, 0xc3, 0x47, 0x6b, 0x2f, 0xc1, 0x4c, 0x9d, 0xe8, 0xf8, 0x87, 0x3f, 0xfe,
+	0xb9, 0x28, 0x3d, 0xd1, 0xcd, 0x78, 0xb8, 0xaa, 0x71, 0xc5, 0xcd, 0xb3, 0xdc, 0x30, 0xdb, 0x6a,
+	0x9c, 0xcb, 0x01, 0x7d, 0xc0, 0xfa, 0x1c, 0x0f, 0x92, 0x4c, 0x18, 0x34, 0xd0, 0xcf, 0x00, 0xae,
+	0xe4, 0x67, 0x12, 0x7a, 0x3a, 0x5f, 0x47, 0xc1, 0x0c, 0xd3, 0x1e, 0xcf, 0xa4, 0x65, 0x5f, 0x88,
+	0x71, 0x9b, 0xe9, 0x4f, 0x12, 0xc5, 0x06, 0x7a, 0x1c, 0x2b, 0x3e, 0x9b, 0xf8, 0xc7, 0x6c, 0x8d,
+	0x0d, 0x34, 0x72, 0x92, 0xcd, 0xc6, 0x39, 0xfa, 0x13, 0xc0, 0xd7, 0x8a, 0x7a, 0x1f, 0x6d, 0xcd,
+	0xd7, 0x7c, 0xc5, 0x9f, 0x56, 0x7b, 0xb1, 0x2c, 0x5d, 0xd6, 0x7f, 0x27, 0x71, 0x83, 0xd1, 0xb3,
+	0x45, 0xdc, 0xe0, 0xa1, 0xcf, 0x85, 0x32, 0xf0, 0x23, 0x80, 0x2b, 0xf9, 0xe9, 0x7e, 0x9d, 0x5b,
+	0x28, 0xf8, 0x1a, 0x68, 0x1b, 0x8a, 0x96, 0xfb, 0x34, 0x1a, 0x59, 0xeb, 0xeb, 0xcf, 0x13, 0xa1,
+	0x4f, 0xf5, 0xf7, 0x17, 0x12, 0x1a, 0x46, 0x34, 0xee, 0x94, 0xbf, 0x01, 0xbc, 0x57, 0x3c, 0x77,
+	0xd1, 0xf6, 0x7c, 0xb5, 0x57, 0x7e, 0x7e, 0xb4, 0x9d, 0xe5, 0x13, 0xc8, 0x3b, 0xf8, 0x28, 0xb1,
+	0xb6, 0xad, 0xe3, 0x85, 0xac, 0x39, 0xae, 0x3b, 0xce, 0x85, 0x41, 0x63, 0xf7, 0x7f, 0x00, 0x1f,
+	0x0d, 0xd8, 0x68, 0xae, 0x9c, 0xdd, 0xd7, 0xa7, 0xc7, 0xc1, 0x61, 0xfc, 0xb8, 0x38, 0x04, 0x5f,
+	0x7d, 0x2c, 0xa9, 0x1e, 0x1b, 0x3a, 0xd4, 0x33, 0x58, 0xe8, 0x99, 0x1e, 0xa1, 0xc9, 0xd3, 0x43,
+	0xbd, 0x82, 0x02, 0x9f, 0xcf, 0x7e, 0x14, 0x3d, 0x57, 0x8b, 0x9f, 0x4a, 0xe5, 0xbd, 0x4e, 0xe7,
+	0x97, 0x52, 0x7d, 0x2f, 0x4d, 0xd8, 0x71, 0xb9, 0x91, 0x2e, 0xe3, 0xd5, 0x51, 0xd3, 0x90, 0x07,
+	0xf3, 0xdf, 0x54, 0x48, 0xaf, 0xe3, 0xf2, 0x5e, 0x16, 0xd2, 0x3b, 0x6a, 0xf6, 0x54, 0xc8, 0x7f,
+	0xa5, 0x47, 0x29, 0x8e, 0x71, 0xc7, 0xe5, 0x18, 0x67, 0x41, 0x18, 0x1f, 0x35, 0x31, 0x56, 0x61,
+	0xfd, 0x1b, 0x89, 0xce, 0x0f, 0x5e, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x3d, 0xcf, 0xf4, 0x4c,
+	0x0a, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -718,66 +790,3 @@ var _MutateJobService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/mutate_job_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/mutate_job_service.proto", fileDescriptor_mutate_job_service_ffc52ee77e0c9b27)
-}
-
-var fileDescriptor_mutate_job_service_ffc52ee77e0c9b27 = []byte{
-	// 867 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
-	0x14, 0xd7, 0x24, 0x62, 0x97, 0x9d, 0xb4, 0x9b, 0xee, 0x2c, 0x6c, 0x83, 0x77, 0x0b, 0x91, 0x77,
-	0x81, 0x12, 0xad, 0x6c, 0x12, 0x76, 0xa5, 0xcd, 0xac, 0xba, 0x6d, 0x8a, 0x50, 0x69, 0xf9, 0x57,
-	0x39, 0xa8, 0x07, 0x14, 0x61, 0x39, 0xf1, 0xc8, 0x32, 0x24, 0x33, 0xc6, 0x33, 0xae, 0xaa, 0x56,
-	0xe5, 0xc0, 0x57, 0xe8, 0x27, 0x80, 0x1b, 0x7c, 0x0c, 0x8e, 0x70, 0xe4, 0xc0, 0x89, 0x0b, 0x42,
-	0x1c, 0xf8, 0x0c, 0x1c, 0x56, 0xb6, 0x67, 0x1c, 0x27, 0x75, 0x9a, 0x26, 0xb7, 0xc9, 0x6f, 0xde,
-	0xef, 0xcd, 0xef, 0xf7, 0xe6, 0xe5, 0x79, 0x60, 0xdb, 0x63, 0xcc, 0x1b, 0x12, 0xd3, 0x71, 0xb9,
-	0x99, 0x2e, 0xe3, 0xd5, 0x71, 0xd3, 0xe4, 0x24, 0x3c, 0xf6, 0x07, 0x84, 0x9b, 0xa3, 0x48, 0x38,
-	0x82, 0xd8, 0xdf, 0xb0, 0xbe, 0x2d, 0x31, 0x23, 0x08, 0x99, 0x60, 0xa8, 0x9e, 0xc6, 0x1b, 0x8e,
-	0xcb, 0x8d, 0x8c, 0x6a, 0x1c, 0x37, 0x0d, 0x45, 0xd5, 0x5a, 0xb3, 0x92, 0x87, 0x84, 0xb3, 0x28,
-	0x9c, 0xcc, 0x9e, 0x66, 0xd5, 0xe6, 0x0b, 0x4a, 0x51, 0xdb, 0x71, 0xf9, 0xa4, 0x20, 0xed, 0x81,
-	0xa2, 0x06, 0xbe, 0xe9, 0x50, 0xca, 0x84, 0x23, 0x7c, 0x46, 0xb9, 0xdc, 0x7d, 0x28, 0x77, 0x87,
-	0x8c, 0x7a, 0x61, 0x44, 0xa9, 0x4f, 0x3d, 0x93, 0x05, 0x24, 0x9c, 0x08, 0x5a, 0x97, 0x41, 0x61,
-	0x30, 0x30, 0xb9, 0x70, 0x44, 0x24, 0x37, 0xf4, 0x36, 0xbc, 0xf7, 0x61, 0x48, 0x1c, 0x41, 0x3e,
-	0x4b, 0x04, 0x1f, 0xb0, 0xbe, 0x45, 0xbe, 0x8b, 0x08, 0x17, 0xe8, 0x2d, 0x58, 0x19, 0x44, 0x5c,
-	0xb0, 0x11, 0x09, 0x6d, 0xdf, 0xad, 0x81, 0x3a, 0xd8, 0xbc, 0x65, 0x41, 0x05, 0xed, 0xbb, 0xfa,
-	0x0b, 0xb8, 0x7e, 0x89, 0xca, 0x03, 0x46, 0x39, 0x41, 0x0f, 0xe1, 0xaa, 0x2a, 0x85, 0x4d, 0x9d,
-	0x11, 0x91, 0xec, 0x15, 0x05, 0x7e, 0xee, 0x8c, 0x88, 0x8e, 0xe1, 0xdd, 0x3d, 0x22, 0x2e, 0x9d,
-	0x7b, 0x5d, 0xae, 0x15, 0xd1, 0xe5, 0xb8, 0xbf, 0x03, 0xb8, 0xd1, 0x71, 0xdd, 0x8c, 0xfc, 0x45,
-	0x56, 0xac, 0x45, 0xd2, 0xa0, 0xb7, 0xe1, 0x6d, 0x1e, 0xc7, 0xd3, 0x01, 0xb1, 0x05, 0xfb, 0x96,
-	0xd0, 0x5a, 0x29, 0x89, 0x5a, 0x55, 0xe8, 0x97, 0x31, 0x88, 0xbe, 0x86, 0x77, 0x64, 0x2f, 0x8c,
-	0x2f, 0xa5, 0x56, 0xae, 0x97, 0x37, 0x2b, 0xad, 0xa6, 0x31, 0xaf, 0xd3, 0x8c, 0x54, 0x64, 0xa6,
-	0xd0, 0x5a, 0x1b, 0x4d, 0x02, 0x5c, 0x3f, 0x83, 0x6f, 0xce, 0x32, 0x23, 0x2f, 0xe3, 0x3d, 0xb8,
-	0x26, 0x98, 0x70, 0x86, 0x79, 0x01, 0xb1, 0xa1, 0xb2, 0x55, 0x4d, 0xf0, 0x31, 0x05, 0x19, 0xf0,
-	0x2e, 0x25, 0x27, 0xc2, 0x2e, 0x34, 0x76, 0x27, 0xde, 0xea, 0xe6, 0xcd, 0xe9, 0xdf, 0xc3, 0xfb,
-	0x9f, 0xfa, 0x3c, 0x7f, 0x87, 0x3c, 0x1a, 0x8a, 0xc5, 0xea, 0xb8, 0x01, 0x61, 0xe0, 0x78, 0x93,
-	0x47, 0xdd, 0x8a, 0x91, 0xb4, 0x7e, 0xf7, 0x61, 0xf2, 0xc3, 0xe6, 0xfe, 0x29, 0xa9, 0x95, 0xeb,
-	0x60, 0xf3, 0x15, 0xeb, 0xd5, 0x18, 0xe8, 0xfa, 0xa7, 0x44, 0xbf, 0x00, 0xf0, 0x41, 0xb1, 0x00,
-	0xe9, 0xfd, 0x13, 0x78, 0x33, 0x4c, 0xa1, 0x1a, 0x58, 0xac, 0xe6, 0x59, 0x32, 0x4b, 0x65, 0x40,
-	0xef, 0xc0, 0x6a, 0x52, 0x9d, 0x4b, 0x72, 0x57, 0x63, 0xf8, 0x50, 0x49, 0xd6, 0xff, 0x02, 0xb0,
-	0x3a, 0x95, 0x04, 0xbd, 0x0b, 0xab, 0x59, 0xf9, 0x6d, 0x9f, 0xba, 0xe4, 0x44, 0xde, 0xc1, 0xed,
-	0x0c, 0xde, 0x8f, 0x51, 0x14, 0xc1, 0x37, 0xa6, 0xfb, 0xc5, 0x0e, 0xa5, 0x9d, 0xe4, 0xb8, 0x4a,
-	0xab, 0xbd, 0x78, 0xdf, 0xc8, 0x04, 0xd6, 0xfa, 0xa8, 0x78, 0x03, 0x35, 0xe0, 0x8d, 0x74, 0x2e,
-	0x24, 0x35, 0xae, 0xb4, 0x90, 0x3a, 0x23, 0x0c, 0x06, 0x46, 0x37, 0xd9, 0xb1, 0x64, 0x44, 0xeb,
-	0xdf, 0x9b, 0x70, 0x2d, 0xf3, 0xd7, 0x4d, 0x8f, 0x44, 0xbf, 0x02, 0x58, 0x9d, 0x1a, 0x07, 0xe8,
-	0xd9, 0x7c, 0xa1, 0xc5, 0xc3, 0x47, 0x6b, 0x2f, 0xc1, 0x4c, 0x9d, 0xe8, 0xf8, 0x87, 0x3f, 0xfe,
-	0xb9, 0x28, 0x3d, 0xd1, 0xcd, 0x78, 0xb8, 0xaa, 0x71, 0xc5, 0xcd, 0xb3, 0xdc, 0x30, 0xdb, 0x6a,
-	0x9c, 0xcb, 0x01, 0x7d, 0xc0, 0xfa, 0x1c, 0x0f, 0x92, 0x4c, 0x18, 0x34, 0xd0, 0xcf, 0x00, 0xae,
-	0xe4, 0x67, 0x12, 0x7a, 0x3a, 0x5f, 0x47, 0xc1, 0x0c, 0xd3, 0x1e, 0xcf, 0xa4, 0x65, 0x5f, 0x88,
-	0x71, 0x9b, 0xe9, 0x4f, 0x12, 0xc5, 0x06, 0x7a, 0x1c, 0x2b, 0x3e, 0x9b, 0xf8, 0xc7, 0x6c, 0x8d,
-	0x0d, 0x34, 0x72, 0x92, 0xcd, 0xc6, 0x39, 0xfa, 0x13, 0xc0, 0xd7, 0x8a, 0x7a, 0x1f, 0x6d, 0xcd,
-	0xd7, 0x7c, 0xc5, 0x9f, 0x56, 0x7b, 0xb1, 0x2c, 0x5d, 0xd6, 0x7f, 0x27, 0x71, 0x83, 0xd1, 0xb3,
-	0x45, 0xdc, 0xe0, 0xa1, 0xcf, 0x85, 0x32, 0xf0, 0x23, 0x80, 0x2b, 0xf9, 0xe9, 0x7e, 0x9d, 0x5b,
-	0x28, 0xf8, 0x1a, 0x68, 0x1b, 0x8a, 0x96, 0xfb, 0x34, 0x1a, 0x59, 0xeb, 0xeb, 0xcf, 0x13, 0xa1,
-	0x4f, 0xf5, 0xf7, 0x17, 0x12, 0x1a, 0x46, 0x34, 0xee, 0x94, 0xbf, 0x01, 0xbc, 0x57, 0x3c, 0x77,
-	0xd1, 0xf6, 0x7c, 0xb5, 0x57, 0x7e, 0x7e, 0xb4, 0x9d, 0xe5, 0x13, 0xc8, 0x3b, 0xf8, 0x28, 0xb1,
-	0xb6, 0xad, 0xe3, 0x85, 0xac, 0x39, 0xae, 0x3b, 0xce, 0x85, 0x41, 0x63, 0xf7, 0x7f, 0x00, 0x1f,
-	0x0d, 0xd8, 0x68, 0xae, 0x9c, 0xdd, 0xd7, 0xa7, 0xc7, 0xc1, 0x61, 0xfc, 0xb8, 0x38, 0x04, 0x5f,
-	0x7d, 0x2c, 0xa9, 0x1e, 0x1b, 0x3a, 0xd4, 0x33, 0x58, 0xe8, 0x99, 0x1e, 0xa1, 0xc9, 0xd3, 0x43,
-	0xbd, 0x82, 0x02, 0x9f, 0xcf, 0x7e, 0x14, 0x3d, 0x57, 0x8b, 0x9f, 0x4a, 0xe5, 0xbd, 0x4e, 0xe7,
-	0x97, 0x52, 0x7d, 0x2f, 0x4d, 0xd8, 0x71, 0xb9, 0x91, 0x2e, 0xe3, 0xd5, 0x51, 0xd3, 0x90, 0x07,
-	0xf3, 0xdf, 0x54, 0x48, 0xaf, 0xe3, 0xf2, 0x5e, 0x16, 0xd2, 0x3b, 0x6a, 0xf6, 0x54, 0xc8, 0x7f,
-	0xa5, 0x47, 0x29, 0x8e, 0x71, 0xc7, 0xe5, 0x18, 0x67, 0x41, 0x18, 0x1f, 0x35, 0x31, 0x56, 0x61,
-	0xfd, 0x1b, 0x89, 0xce, 0x0f, 0x5e, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x3d, 0xcf, 0xf4, 0x4c,
-	0x0a, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/operating_system_version_constant_service.pb.go b/googleapis/ads/googleads/v1/services/operating_system_version_constant_service.pb.go
index a90cab45a9..4ed4ba39b6 100644
--- a/googleapis/ads/googleads/v1/services/operating_system_version_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/operating_system_version_constant_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/operating_system_version_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [OperatingSystemVersionConstantService.GetOperatingSystemVersionConstant][google.ads.googleads.v1.services.OperatingSystemVersionConstantService.GetOperatingSystemVersionConstant].
@@ -41,16 +41,17 @@ func (m *GetOperatingSystemVersionConstantRequest) Reset() {
 func (m *GetOperatingSystemVersionConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOperatingSystemVersionConstantRequest) ProtoMessage()    {}
 func (*GetOperatingSystemVersionConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operating_system_version_constant_service_2677ec2344d0da1f, []int{0}
+	return fileDescriptor_97a0893223528a69, []int{0}
 }
+
 func (m *GetOperatingSystemVersionConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOperatingSystemVersionConstantRequest.Unmarshal(m, b)
 }
 func (m *GetOperatingSystemVersionConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOperatingSystemVersionConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOperatingSystemVersionConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOperatingSystemVersionConstantRequest.Merge(dst, src)
+func (m *GetOperatingSystemVersionConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperatingSystemVersionConstantRequest.Merge(m, src)
 }
 func (m *GetOperatingSystemVersionConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOperatingSystemVersionConstantRequest.Size(m)
@@ -72,6 +73,38 @@ func init() {
 	proto.RegisterType((*GetOperatingSystemVersionConstantRequest)(nil), "google.ads.googleads.v1.services.GetOperatingSystemVersionConstantRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/operating_system_version_constant_service.proto", fileDescriptor_97a0893223528a69)
+}
+
+var fileDescriptor_97a0893223528a69 = []byte{
+	// 376 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4a, 0xf3, 0x40,
+	0x14, 0xc5, 0x49, 0x3e, 0xf8, 0xc0, 0xa0, 0x9b, 0xac, 0xa4, 0xb8, 0xa8, 0xb5, 0x42, 0xe9, 0x62,
+	0x42, 0x14, 0x11, 0x46, 0xba, 0x48, 0x5d, 0x54, 0x5d, 0xd8, 0xd2, 0x42, 0x16, 0x12, 0x08, 0x63,
+	0x33, 0x84, 0x40, 0x33, 0x37, 0xe6, 0x4e, 0x03, 0x22, 0x6e, 0x7c, 0x03, 0x71, 0xe9, 0xce, 0xa5,
+	0x8f, 0xe2, 0xd6, 0x57, 0x70, 0xe5, 0xce, 0x37, 0x90, 0x74, 0x32, 0x01, 0x17, 0xfd, 0xb3, 0x3b,
+	0x4c, 0x4e, 0x7e, 0x67, 0xee, 0xb9, 0x63, 0x8d, 0x62, 0x80, 0x78, 0xc6, 0x1d, 0x16, 0xa1, 0xa3,
+	0x64, 0xa9, 0x0a, 0xd7, 0x41, 0x9e, 0x17, 0xc9, 0x94, 0xa3, 0x03, 0x19, 0xcf, 0x99, 0x4c, 0x44,
+	0x1c, 0xe2, 0x3d, 0x4a, 0x9e, 0x86, 0x05, 0xcf, 0x31, 0x01, 0x11, 0x4e, 0x41, 0xa0, 0x64, 0x42,
+	0x86, 0x95, 0x95, 0x64, 0x39, 0x48, 0xb0, 0x9b, 0x0a, 0x43, 0x58, 0x84, 0xa4, 0x26, 0x92, 0xc2,
+	0x25, 0x9a, 0xd8, 0xb8, 0x5c, 0x96, 0x99, 0x73, 0x84, 0x79, 0xbe, 0x51, 0xa8, 0x0a, 0x6b, 0xec,
+	0x69, 0x54, 0x96, 0x38, 0x4c, 0x08, 0x90, 0x4c, 0x26, 0x20, 0x50, 0x7d, 0x6d, 0x0d, 0xad, 0xce,
+	0x80, 0xcb, 0xa1, 0x66, 0x4d, 0x16, 0x28, 0x5f, 0x91, 0xce, 0x2b, 0xd0, 0x98, 0xdf, 0xcd, 0x39,
+	0x4a, 0xfb, 0xc0, 0xda, 0xd1, 0xf1, 0xa1, 0x60, 0x29, 0xdf, 0x35, 0x9a, 0x46, 0x67, 0x6b, 0xbc,
+	0xad, 0x0f, 0xaf, 0x59, 0xca, 0x8f, 0x5e, 0x4d, 0xeb, 0x70, 0x35, 0x6e, 0xa2, 0x86, 0xb4, 0x7f,
+	0x0c, 0x6b, 0x7f, 0x6d, 0xb6, 0x7d, 0x45, 0xd6, 0x95, 0x45, 0x36, 0x1d, 0xa0, 0xe1, 0x2d, 0x65,
+	0xd5, 0xb5, 0x92, 0xd5, 0xa4, 0x56, 0xef, 0xe9, 0xf3, 0xeb, 0xc5, 0x3c, 0xb5, 0x4f, 0xca, 0x65,
+	0x3c, 0xfc, 0xa9, 0xa3, 0x07, 0x2b, 0x7f, 0x45, 0xa7, 0xfb, 0xd8, 0x7f, 0x36, 0xad, 0xf6, 0x14,
+	0xd2, 0xb5, 0x33, 0xf5, 0xbb, 0x1b, 0x75, 0x38, 0x2a, 0x77, 0x38, 0x32, 0x6e, 0x2e, 0x2a, 0x5e,
+	0x0c, 0x33, 0x26, 0x62, 0x02, 0x79, 0xec, 0xc4, 0x5c, 0x2c, 0x36, 0xac, 0x9f, 0x4f, 0x96, 0xe0,
+	0xf2, 0x17, 0x7c, 0xa6, 0xc5, 0x9b, 0xf9, 0x6f, 0xe0, 0x79, 0xef, 0x66, 0x73, 0xa0, 0x80, 0x5e,
+	0x84, 0x44, 0xc9, 0x52, 0xf9, 0x2e, 0xa9, 0x82, 0xf1, 0x43, 0x5b, 0x02, 0x2f, 0xc2, 0xa0, 0xb6,
+	0x04, 0xbe, 0x1b, 0x68, 0xcb, 0xb7, 0xd9, 0x56, 0xe7, 0x94, 0x7a, 0x11, 0x52, 0x5a, 0x9b, 0x28,
+	0xf5, 0x5d, 0x4a, 0xb5, 0xed, 0xf6, 0xff, 0xe2, 0x9e, 0xc7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0xcc, 0x3c, 0xee, 0x41, 0x68, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -145,35 +178,3 @@ var _OperatingSystemVersionConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/operating_system_version_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/operating_system_version_constant_service.proto", fileDescriptor_operating_system_version_constant_service_2677ec2344d0da1f)
-}
-
-var fileDescriptor_operating_system_version_constant_service_2677ec2344d0da1f = []byte{
-	// 376 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4a, 0xf3, 0x40,
-	0x14, 0xc5, 0x49, 0x3e, 0xf8, 0xc0, 0xa0, 0x9b, 0xac, 0xa4, 0xb8, 0xa8, 0xb5, 0x42, 0xe9, 0x62,
-	0x42, 0x14, 0x11, 0x46, 0xba, 0x48, 0x5d, 0x54, 0x5d, 0xd8, 0xd2, 0x42, 0x16, 0x12, 0x08, 0x63,
-	0x33, 0x84, 0x40, 0x33, 0x37, 0xe6, 0x4e, 0x03, 0x22, 0x6e, 0x7c, 0x03, 0x71, 0xe9, 0xce, 0xa5,
-	0x8f, 0xe2, 0xd6, 0x57, 0x70, 0xe5, 0xce, 0x37, 0x90, 0x74, 0x32, 0x01, 0x17, 0xfd, 0xb3, 0x3b,
-	0x4c, 0x4e, 0x7e, 0x67, 0xee, 0xb9, 0x63, 0x8d, 0x62, 0x80, 0x78, 0xc6, 0x1d, 0x16, 0xa1, 0xa3,
-	0x64, 0xa9, 0x0a, 0xd7, 0x41, 0x9e, 0x17, 0xc9, 0x94, 0xa3, 0x03, 0x19, 0xcf, 0x99, 0x4c, 0x44,
-	0x1c, 0xe2, 0x3d, 0x4a, 0x9e, 0x86, 0x05, 0xcf, 0x31, 0x01, 0x11, 0x4e, 0x41, 0xa0, 0x64, 0x42,
-	0x86, 0x95, 0x95, 0x64, 0x39, 0x48, 0xb0, 0x9b, 0x0a, 0x43, 0x58, 0x84, 0xa4, 0x26, 0x92, 0xc2,
-	0x25, 0x9a, 0xd8, 0xb8, 0x5c, 0x96, 0x99, 0x73, 0x84, 0x79, 0xbe, 0x51, 0xa8, 0x0a, 0x6b, 0xec,
-	0x69, 0x54, 0x96, 0x38, 0x4c, 0x08, 0x90, 0x4c, 0x26, 0x20, 0x50, 0x7d, 0x6d, 0x0d, 0xad, 0xce,
-	0x80, 0xcb, 0xa1, 0x66, 0x4d, 0x16, 0x28, 0x5f, 0x91, 0xce, 0x2b, 0xd0, 0x98, 0xdf, 0xcd, 0x39,
-	0x4a, 0xfb, 0xc0, 0xda, 0xd1, 0xf1, 0xa1, 0x60, 0x29, 0xdf, 0x35, 0x9a, 0x46, 0x67, 0x6b, 0xbc,
-	0xad, 0x0f, 0xaf, 0x59, 0xca, 0x8f, 0x5e, 0x4d, 0xeb, 0x70, 0x35, 0x6e, 0xa2, 0x86, 0xb4, 0x7f,
-	0x0c, 0x6b, 0x7f, 0x6d, 0xb6, 0x7d, 0x45, 0xd6, 0x95, 0x45, 0x36, 0x1d, 0xa0, 0xe1, 0x2d, 0x65,
-	0xd5, 0xb5, 0x92, 0xd5, 0xa4, 0x56, 0xef, 0xe9, 0xf3, 0xeb, 0xc5, 0x3c, 0xb5, 0x4f, 0xca, 0x65,
-	0x3c, 0xfc, 0xa9, 0xa3, 0x07, 0x2b, 0x7f, 0x45, 0xa7, 0xfb, 0xd8, 0x7f, 0x36, 0xad, 0xf6, 0x14,
-	0xd2, 0xb5, 0x33, 0xf5, 0xbb, 0x1b, 0x75, 0x38, 0x2a, 0x77, 0x38, 0x32, 0x6e, 0x2e, 0x2a, 0x5e,
-	0x0c, 0x33, 0x26, 0x62, 0x02, 0x79, 0xec, 0xc4, 0x5c, 0x2c, 0x36, 0xac, 0x9f, 0x4f, 0x96, 0xe0,
-	0xf2, 0x17, 0x7c, 0xa6, 0xc5, 0x9b, 0xf9, 0x6f, 0xe0, 0x79, 0xef, 0x66, 0x73, 0xa0, 0x80, 0x5e,
-	0x84, 0x44, 0xc9, 0x52, 0xf9, 0x2e, 0xa9, 0x82, 0xf1, 0x43, 0x5b, 0x02, 0x2f, 0xc2, 0xa0, 0xb6,
-	0x04, 0xbe, 0x1b, 0x68, 0xcb, 0xb7, 0xd9, 0x56, 0xe7, 0x94, 0x7a, 0x11, 0x52, 0x5a, 0x9b, 0x28,
-	0xf5, 0x5d, 0x4a, 0xb5, 0xed, 0xf6, 0xff, 0xe2, 0x9e, 0xc7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0xcc, 0x3c, 0xee, 0x41, 0x68, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/paid_organic_search_term_view_service.pb.go b/googleapis/ads/googleads/v1/services/paid_organic_search_term_view_service.pb.go
index 9a74a8894d..9fd21e4a0c 100644
--- a/googleapis/ads/googleads/v1/services/paid_organic_search_term_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/paid_organic_search_term_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/paid_organic_search_term_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [PaidOrganicSearchTermViewService.GetPaidOrganicSearchTermView][google.ads.googleads.v1.services.PaidOrganicSearchTermViewService.GetPaidOrganicSearchTermView].
@@ -39,16 +39,17 @@ func (m *GetPaidOrganicSearchTermViewRequest) Reset()         { *m = GetPaidOrga
 func (m *GetPaidOrganicSearchTermViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetPaidOrganicSearchTermViewRequest) ProtoMessage()    {}
 func (*GetPaidOrganicSearchTermViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_paid_organic_search_term_view_service_30d5905997917b5b, []int{0}
+	return fileDescriptor_ccacc683251a5992, []int{0}
 }
+
 func (m *GetPaidOrganicSearchTermViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaidOrganicSearchTermViewRequest.Unmarshal(m, b)
 }
 func (m *GetPaidOrganicSearchTermViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetPaidOrganicSearchTermViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetPaidOrganicSearchTermViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetPaidOrganicSearchTermViewRequest.Merge(dst, src)
+func (m *GetPaidOrganicSearchTermViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPaidOrganicSearchTermViewRequest.Merge(m, src)
 }
 func (m *GetPaidOrganicSearchTermViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetPaidOrganicSearchTermViewRequest.Size(m)
@@ -70,6 +71,39 @@ func init() {
 	proto.RegisterType((*GetPaidOrganicSearchTermViewRequest)(nil), "google.ads.googleads.v1.services.GetPaidOrganicSearchTermViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/paid_organic_search_term_view_service.proto", fileDescriptor_ccacc683251a5992)
+}
+
+var fileDescriptor_ccacc683251a5992 = []byte{
+	// 389 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x8b, 0xd3, 0x40,
+	0x18, 0x86, 0x49, 0x04, 0xc1, 0xa0, 0x97, 0x9c, 0xa4, 0xf4, 0x10, 0xda, 0x0a, 0xd2, 0xc3, 0x0c,
+	0xd1, 0xdb, 0x58, 0x85, 0x14, 0x4b, 0x45, 0x44, 0x4b, 0x2b, 0x39, 0x48, 0x20, 0x8c, 0xc9, 0x47,
+	0x1c, 0x68, 0x32, 0x71, 0xbe, 0x34, 0x3d, 0x88, 0x17, 0xcf, 0xe2, 0xc5, 0x7f, 0xe0, 0xd1, 0x9f,
+	0xb2, 0xd7, 0xfd, 0x0b, 0x7b, 0xd9, 0xfd, 0x15, 0x4b, 0x32, 0x9d, 0xc0, 0xc2, 0x66, 0xb3, 0xb7,
+	0x97, 0x99, 0x97, 0xe7, 0x9d, 0xef, 0xfd, 0xc6, 0xf9, 0x90, 0x49, 0x99, 0xed, 0x81, 0xf2, 0x14,
+	0xa9, 0x96, 0x8d, 0xaa, 0x7d, 0x8a, 0xa0, 0x6a, 0x91, 0x00, 0xd2, 0x92, 0x8b, 0x34, 0x96, 0x2a,
+	0xe3, 0x85, 0x48, 0x62, 0x04, 0xae, 0x92, 0x6f, 0x71, 0x05, 0x2a, 0x8f, 0x6b, 0x01, 0xc7, 0xf8,
+	0x64, 0x23, 0xa5, 0x92, 0x95, 0x74, 0x3d, 0x8d, 0x20, 0x3c, 0x45, 0xd2, 0xd1, 0x48, 0xed, 0x13,
+	0x43, 0x1b, 0xad, 0xfa, 0xf2, 0x14, 0xa0, 0x3c, 0xa8, 0xc1, 0x40, 0x1d, 0x34, 0x1a, 0x1b, 0x4c,
+	0x29, 0x28, 0x2f, 0x0a, 0x59, 0xf1, 0x4a, 0xc8, 0x02, 0xf5, 0xed, 0xe4, 0xbd, 0x33, 0x5d, 0x43,
+	0xb5, 0xe1, 0x22, 0xfd, 0xa4, 0x31, 0xbb, 0x96, 0xf2, 0x19, 0x54, 0x1e, 0x0a, 0x38, 0x6e, 0xe1,
+	0xfb, 0x01, 0xb0, 0x72, 0xa7, 0xce, 0x13, 0x93, 0x1a, 0x17, 0x3c, 0x87, 0xa7, 0x96, 0x67, 0x3d,
+	0x7f, 0xb4, 0x7d, 0x6c, 0x0e, 0x3f, 0xf2, 0x1c, 0x5e, 0xfc, 0xb1, 0x1d, 0xaf, 0x97, 0xb4, 0xd3,
+	0x63, 0xb9, 0x97, 0x96, 0x33, 0xbe, 0x2b, 0xd1, 0x5d, 0x91, 0xa1, 0x66, 0xc8, 0x3d, 0x5e, 0x3c,
+	0x5a, 0xf4, 0x62, 0xba, 0xfa, 0x48, 0x2f, 0x64, 0xf2, 0xf6, 0xd7, 0xf9, 0xc5, 0x5f, 0xfb, 0x8d,
+	0xbb, 0x68, 0xfa, 0xfe, 0x71, 0x63, 0xf4, 0xd7, 0xc9, 0x01, 0x2b, 0x99, 0x83, 0x42, 0x3a, 0x6f,
+	0x17, 0x70, 0x2b, 0x01, 0xe9, 0xfc, 0xe7, 0xf2, 0xb7, 0xed, 0xcc, 0x12, 0x99, 0x0f, 0x0e, 0xb4,
+	0x7c, 0x36, 0x54, 0xdb, 0xa6, 0x59, 0xd6, 0xc6, 0xfa, 0xf2, 0xee, 0x84, 0xca, 0xe4, 0x9e, 0x17,
+	0x19, 0x91, 0x2a, 0xa3, 0x19, 0x14, 0xed, 0x2a, 0xcd, 0x1f, 0x29, 0x05, 0xf6, 0x7f, 0xd1, 0x57,
+	0x46, 0xfc, 0xb3, 0x1f, 0xac, 0x83, 0xe0, 0xbf, 0xed, 0xad, 0x35, 0x30, 0x48, 0x91, 0x68, 0xd9,
+	0xa8, 0xd0, 0x27, 0xa7, 0x60, 0x3c, 0x33, 0x96, 0x28, 0x48, 0x31, 0xea, 0x2c, 0x51, 0xe8, 0x47,
+	0xc6, 0x72, 0x65, 0xcf, 0xf4, 0x39, 0x63, 0x41, 0x8a, 0x8c, 0x75, 0x26, 0xc6, 0x42, 0x9f, 0x31,
+	0x63, 0xfb, 0xfa, 0xb0, 0x7d, 0xe7, 0xcb, 0xeb, 0x00, 0x00, 0x00, 0xff, 0xff, 0x55, 0x18, 0xd6,
+	0x92, 0x49, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,36 +177,3 @@ var _PaidOrganicSearchTermViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/paid_organic_search_term_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/paid_organic_search_term_view_service.proto", fileDescriptor_paid_organic_search_term_view_service_30d5905997917b5b)
-}
-
-var fileDescriptor_paid_organic_search_term_view_service_30d5905997917b5b = []byte{
-	// 389 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x8b, 0xd3, 0x40,
-	0x18, 0x86, 0x49, 0x04, 0xc1, 0xa0, 0x97, 0x9c, 0xa4, 0xf4, 0x10, 0xda, 0x0a, 0xd2, 0xc3, 0x0c,
-	0xd1, 0xdb, 0x58, 0x85, 0x14, 0x4b, 0x45, 0x44, 0x4b, 0x2b, 0x39, 0x48, 0x20, 0x8c, 0xc9, 0x47,
-	0x1c, 0x68, 0x32, 0x71, 0xbe, 0x34, 0x3d, 0x88, 0x17, 0xcf, 0xe2, 0xc5, 0x7f, 0xe0, 0xd1, 0x9f,
-	0xb2, 0xd7, 0xfd, 0x0b, 0x7b, 0xd9, 0xfd, 0x15, 0x4b, 0x32, 0x9d, 0xc0, 0xc2, 0x66, 0xb3, 0xb7,
-	0x97, 0x99, 0x97, 0xe7, 0x9d, 0xef, 0xfd, 0xc6, 0xf9, 0x90, 0x49, 0x99, 0xed, 0x81, 0xf2, 0x14,
-	0xa9, 0x96, 0x8d, 0xaa, 0x7d, 0x8a, 0xa0, 0x6a, 0x91, 0x00, 0xd2, 0x92, 0x8b, 0x34, 0x96, 0x2a,
-	0xe3, 0x85, 0x48, 0x62, 0x04, 0xae, 0x92, 0x6f, 0x71, 0x05, 0x2a, 0x8f, 0x6b, 0x01, 0xc7, 0xf8,
-	0x64, 0x23, 0xa5, 0x92, 0x95, 0x74, 0x3d, 0x8d, 0x20, 0x3c, 0x45, 0xd2, 0xd1, 0x48, 0xed, 0x13,
-	0x43, 0x1b, 0xad, 0xfa, 0xf2, 0x14, 0xa0, 0x3c, 0xa8, 0xc1, 0x40, 0x1d, 0x34, 0x1a, 0x1b, 0x4c,
-	0x29, 0x28, 0x2f, 0x0a, 0x59, 0xf1, 0x4a, 0xc8, 0x02, 0xf5, 0xed, 0xe4, 0xbd, 0x33, 0x5d, 0x43,
-	0xb5, 0xe1, 0x22, 0xfd, 0xa4, 0x31, 0xbb, 0x96, 0xf2, 0x19, 0x54, 0x1e, 0x0a, 0x38, 0x6e, 0xe1,
-	0xfb, 0x01, 0xb0, 0x72, 0xa7, 0xce, 0x13, 0x93, 0x1a, 0x17, 0x3c, 0x87, 0xa7, 0x96, 0x67, 0x3d,
-	0x7f, 0xb4, 0x7d, 0x6c, 0x0e, 0x3f, 0xf2, 0x1c, 0x5e, 0xfc, 0xb1, 0x1d, 0xaf, 0x97, 0xb4, 0xd3,
-	0x63, 0xb9, 0x97, 0x96, 0x33, 0xbe, 0x2b, 0xd1, 0x5d, 0x91, 0xa1, 0x66, 0xc8, 0x3d, 0x5e, 0x3c,
-	0x5a, 0xf4, 0x62, 0xba, 0xfa, 0x48, 0x2f, 0x64, 0xf2, 0xf6, 0xd7, 0xf9, 0xc5, 0x5f, 0xfb, 0x8d,
-	0xbb, 0x68, 0xfa, 0xfe, 0x71, 0x63, 0xf4, 0xd7, 0xc9, 0x01, 0x2b, 0x99, 0x83, 0x42, 0x3a, 0x6f,
-	0x17, 0x70, 0x2b, 0x01, 0xe9, 0xfc, 0xe7, 0xf2, 0xb7, 0xed, 0xcc, 0x12, 0x99, 0x0f, 0x0e, 0xb4,
-	0x7c, 0x36, 0x54, 0xdb, 0xa6, 0x59, 0xd6, 0xc6, 0xfa, 0xf2, 0xee, 0x84, 0xca, 0xe4, 0x9e, 0x17,
-	0x19, 0x91, 0x2a, 0xa3, 0x19, 0x14, 0xed, 0x2a, 0xcd, 0x1f, 0x29, 0x05, 0xf6, 0x7f, 0xd1, 0x57,
-	0x46, 0xfc, 0xb3, 0x1f, 0xac, 0x83, 0xe0, 0xbf, 0xed, 0xad, 0x35, 0x30, 0x48, 0x91, 0x68, 0xd9,
-	0xa8, 0xd0, 0x27, 0xa7, 0x60, 0x3c, 0x33, 0x96, 0x28, 0x48, 0x31, 0xea, 0x2c, 0x51, 0xe8, 0x47,
-	0xc6, 0x72, 0x65, 0xcf, 0xf4, 0x39, 0x63, 0x41, 0x8a, 0x8c, 0x75, 0x26, 0xc6, 0x42, 0x9f, 0x31,
-	0x63, 0xfb, 0xfa, 0xb0, 0x7d, 0xe7, 0xcb, 0xeb, 0x00, 0x00, 0x00, 0xff, 0xff, 0x55, 0x18, 0xd6,
-	0x92, 0x49, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/parental_status_view_service.pb.go b/googleapis/ads/googleads/v1/services/parental_status_view_service.pb.go
index 642113994e..4841105998 100644
--- a/googleapis/ads/googleads/v1/services/parental_status_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/parental_status_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/parental_status_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ParentalStatusViewService.GetParentalStatusView][google.ads.googleads.v1.services.ParentalStatusViewService.GetParentalStatusView].
 type GetParentalStatusViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetParentalStatusViewRequest) Reset()         { *m = GetParentalStatusV
 func (m *GetParentalStatusViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetParentalStatusViewRequest) ProtoMessage()    {}
 func (*GetParentalStatusViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_parental_status_view_service_d789c0781624ed91, []int{0}
+	return fileDescriptor_3875092f69544412, []int{0}
 }
+
 func (m *GetParentalStatusViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetParentalStatusViewRequest.Unmarshal(m, b)
 }
 func (m *GetParentalStatusViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetParentalStatusViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetParentalStatusViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetParentalStatusViewRequest.Merge(dst, src)
+func (m *GetParentalStatusViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetParentalStatusViewRequest.Merge(m, src)
 }
 func (m *GetParentalStatusViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetParentalStatusViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetParentalStatusViewRequest)(nil), "google.ads.googleads.v1.services.GetParentalStatusViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/parental_status_view_service.proto", fileDescriptor_3875092f69544412)
+}
+
+var fileDescriptor_3875092f69544412 = []byte{
+	// 371 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x4a, 0xc3, 0x30,
+	0x18, 0xa7, 0x15, 0x04, 0x8b, 0x5e, 0x0a, 0x82, 0x8e, 0x21, 0x63, 0xee, 0x20, 0x3b, 0x24, 0x54,
+	0x19, 0x42, 0x74, 0x42, 0xb7, 0xc3, 0x3c, 0xc9, 0xd8, 0xa0, 0x07, 0x29, 0x94, 0xb8, 0x86, 0x52,
+	0x58, 0x9b, 0xda, 0x2f, 0xed, 0x0e, 0xe2, 0x45, 0xf0, 0x09, 0x7c, 0x03, 0x8f, 0x3e, 0x8a, 0xe0,
+	0xc9, 0x57, 0xf0, 0xa4, 0x2f, 0x21, 0x5d, 0x9a, 0x8a, 0xcc, 0xba, 0xdb, 0x8f, 0xe4, 0xf7, 0xe7,
+	0xcb, 0xef, 0x8b, 0x31, 0x0c, 0x38, 0x0f, 0xe6, 0x0c, 0x53, 0x1f, 0xb0, 0x84, 0x05, 0xca, 0x2d,
+	0x0c, 0x2c, 0xcd, 0xc3, 0x19, 0x03, 0x9c, 0xd0, 0x94, 0xc5, 0x82, 0xce, 0x3d, 0x10, 0x54, 0x64,
+	0xe0, 0xe5, 0x21, 0x5b, 0x78, 0xe5, 0x2d, 0x4a, 0x52, 0x2e, 0xb8, 0xd9, 0x92, 0x4a, 0x44, 0x7d,
+	0x40, 0x95, 0x09, 0xca, 0x2d, 0xa4, 0x4c, 0x1a, 0xe7, 0x75, 0x31, 0x29, 0x03, 0x9e, 0xa5, 0x75,
+	0x39, 0xd2, 0xbf, 0xd1, 0x54, 0xea, 0x24, 0xc4, 0x34, 0x8e, 0xb9, 0xa0, 0x22, 0xe4, 0x31, 0xc8,
+	0xdb, 0xf6, 0xd0, 0x68, 0x8e, 0x98, 0x18, 0x97, 0xf2, 0xe9, 0x52, 0xed, 0x84, 0x6c, 0x31, 0x61,
+	0xb7, 0x19, 0x03, 0x61, 0x1e, 0x1a, 0x3b, 0x2a, 0xc5, 0x8b, 0x69, 0xc4, 0xf6, 0xb4, 0x96, 0x76,
+	0xb4, 0x35, 0xd9, 0x56, 0x87, 0x57, 0x34, 0x62, 0xc7, 0x5f, 0x9a, 0xb1, 0xbf, 0x6a, 0x31, 0x95,
+	0xf3, 0x9b, 0x6f, 0x9a, 0xb1, 0xfb, 0x67, 0x86, 0x79, 0x81, 0xd6, 0xbd, 0x1d, 0xfd, 0x37, 0x5c,
+	0xa3, 0x57, 0xab, 0xaf, 0x9a, 0x41, 0xab, 0xea, 0x76, 0xff, 0xe1, 0xfd, 0xe3, 0x49, 0x3f, 0x35,
+	0x7b, 0x45, 0x87, 0x77, 0xbf, 0x9e, 0xd7, 0x9f, 0x65, 0x20, 0x78, 0xc4, 0x52, 0xc0, 0xdd, 0xaa,
+	0xd4, 0x1f, 0x29, 0xe0, 0xee, 0xfd, 0xe0, 0x51, 0x37, 0x3a, 0x33, 0x1e, 0xad, 0x9d, 0x7d, 0x70,
+	0x50, 0xdb, 0xc9, 0xb8, 0xe8, 0x7e, 0xac, 0x5d, 0x5f, 0x96, 0x1e, 0x01, 0x9f, 0xd3, 0x38, 0x40,
+	0x3c, 0x0d, 0x70, 0xc0, 0xe2, 0xe5, 0x66, 0xd4, 0xa6, 0x93, 0x10, 0xea, 0xff, 0xd7, 0x99, 0x02,
+	0xcf, 0xfa, 0xc6, 0xc8, 0xb6, 0x5f, 0xf4, 0xd6, 0x48, 0x1a, 0xda, 0x3e, 0x20, 0x09, 0x0b, 0xe4,
+	0x58, 0xa8, 0x0c, 0x86, 0x57, 0x45, 0x71, 0x6d, 0x1f, 0xdc, 0x8a, 0xe2, 0x3a, 0x96, 0xab, 0x28,
+	0x9f, 0x7a, 0x47, 0x9e, 0x13, 0x62, 0xfb, 0x40, 0x48, 0x45, 0x22, 0xc4, 0xb1, 0x08, 0x51, 0xb4,
+	0x9b, 0xcd, 0xe5, 0x9c, 0x27, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x08, 0x89, 0x70, 0x7e, 0x06,
+	0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _ParentalStatusViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/parental_status_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/parental_status_view_service.proto", fileDescriptor_parental_status_view_service_d789c0781624ed91)
-}
-
-var fileDescriptor_parental_status_view_service_d789c0781624ed91 = []byte{
-	// 371 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x4a, 0xc3, 0x30,
-	0x18, 0xa7, 0x15, 0x04, 0x8b, 0x5e, 0x0a, 0x82, 0x8e, 0x21, 0x63, 0xee, 0x20, 0x3b, 0x24, 0x54,
-	0x19, 0x42, 0x74, 0x42, 0xb7, 0xc3, 0x3c, 0xc9, 0xd8, 0xa0, 0x07, 0x29, 0x94, 0xb8, 0x86, 0x52,
-	0x58, 0x9b, 0xda, 0x2f, 0xed, 0x0e, 0xe2, 0x45, 0xf0, 0x09, 0x7c, 0x03, 0x8f, 0x3e, 0x8a, 0xe0,
-	0xc9, 0x57, 0xf0, 0xa4, 0x2f, 0x21, 0x5d, 0x9a, 0x8a, 0xcc, 0xba, 0xdb, 0x8f, 0xe4, 0xf7, 0xe7,
-	0xcb, 0xef, 0x8b, 0x31, 0x0c, 0x38, 0x0f, 0xe6, 0x0c, 0x53, 0x1f, 0xb0, 0x84, 0x05, 0xca, 0x2d,
-	0x0c, 0x2c, 0xcd, 0xc3, 0x19, 0x03, 0x9c, 0xd0, 0x94, 0xc5, 0x82, 0xce, 0x3d, 0x10, 0x54, 0x64,
-	0xe0, 0xe5, 0x21, 0x5b, 0x78, 0xe5, 0x2d, 0x4a, 0x52, 0x2e, 0xb8, 0xd9, 0x92, 0x4a, 0x44, 0x7d,
-	0x40, 0x95, 0x09, 0xca, 0x2d, 0xa4, 0x4c, 0x1a, 0xe7, 0x75, 0x31, 0x29, 0x03, 0x9e, 0xa5, 0x75,
-	0x39, 0xd2, 0xbf, 0xd1, 0x54, 0xea, 0x24, 0xc4, 0x34, 0x8e, 0xb9, 0xa0, 0x22, 0xe4, 0x31, 0xc8,
-	0xdb, 0xf6, 0xd0, 0x68, 0x8e, 0x98, 0x18, 0x97, 0xf2, 0xe9, 0x52, 0xed, 0x84, 0x6c, 0x31, 0x61,
-	0xb7, 0x19, 0x03, 0x61, 0x1e, 0x1a, 0x3b, 0x2a, 0xc5, 0x8b, 0x69, 0xc4, 0xf6, 0xb4, 0x96, 0x76,
-	0xb4, 0x35, 0xd9, 0x56, 0x87, 0x57, 0x34, 0x62, 0xc7, 0x5f, 0x9a, 0xb1, 0xbf, 0x6a, 0x31, 0x95,
-	0xf3, 0x9b, 0x6f, 0x9a, 0xb1, 0xfb, 0x67, 0x86, 0x79, 0x81, 0xd6, 0xbd, 0x1d, 0xfd, 0x37, 0x5c,
-	0xa3, 0x57, 0xab, 0xaf, 0x9a, 0x41, 0xab, 0xea, 0x76, 0xff, 0xe1, 0xfd, 0xe3, 0x49, 0x3f, 0x35,
-	0x7b, 0x45, 0x87, 0x77, 0xbf, 0x9e, 0xd7, 0x9f, 0x65, 0x20, 0x78, 0xc4, 0x52, 0xc0, 0xdd, 0xaa,
-	0xd4, 0x1f, 0x29, 0xe0, 0xee, 0xfd, 0xe0, 0x51, 0x37, 0x3a, 0x33, 0x1e, 0xad, 0x9d, 0x7d, 0x70,
-	0x50, 0xdb, 0xc9, 0xb8, 0xe8, 0x7e, 0xac, 0x5d, 0x5f, 0x96, 0x1e, 0x01, 0x9f, 0xd3, 0x38, 0x40,
-	0x3c, 0x0d, 0x70, 0xc0, 0xe2, 0xe5, 0x66, 0xd4, 0xa6, 0x93, 0x10, 0xea, 0xff, 0xd7, 0x99, 0x02,
-	0xcf, 0xfa, 0xc6, 0xc8, 0xb6, 0x5f, 0xf4, 0xd6, 0x48, 0x1a, 0xda, 0x3e, 0x20, 0x09, 0x0b, 0xe4,
-	0x58, 0xa8, 0x0c, 0x86, 0x57, 0x45, 0x71, 0x6d, 0x1f, 0xdc, 0x8a, 0xe2, 0x3a, 0x96, 0xab, 0x28,
-	0x9f, 0x7a, 0x47, 0x9e, 0x13, 0x62, 0xfb, 0x40, 0x48, 0x45, 0x22, 0xc4, 0xb1, 0x08, 0x51, 0xb4,
-	0x9b, 0xcd, 0xe5, 0x9c, 0x27, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x08, 0x89, 0x70, 0x7e, 0x06,
-	0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/payments_account_service.pb.go b/googleapis/ads/googleads/v1/services/payments_account_service.pb.go
index b9aae9e707..33ea49879e 100644
--- a/googleapis/ads/googleads/v1/services/payments_account_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/payments_account_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/payments_account_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for fetching all accessible Payments accounts.
 type ListPaymentsAccountsRequest struct {
@@ -38,16 +38,17 @@ func (m *ListPaymentsAccountsRequest) Reset()         { *m = ListPaymentsAccount
 func (m *ListPaymentsAccountsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListPaymentsAccountsRequest) ProtoMessage()    {}
 func (*ListPaymentsAccountsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_payments_account_service_4cd5864e195abdc3, []int{0}
+	return fileDescriptor_68acb38ba4f095b7, []int{0}
 }
+
 func (m *ListPaymentsAccountsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListPaymentsAccountsRequest.Unmarshal(m, b)
 }
 func (m *ListPaymentsAccountsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListPaymentsAccountsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListPaymentsAccountsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListPaymentsAccountsRequest.Merge(dst, src)
+func (m *ListPaymentsAccountsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPaymentsAccountsRequest.Merge(m, src)
 }
 func (m *ListPaymentsAccountsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListPaymentsAccountsRequest.Size(m)
@@ -78,16 +79,17 @@ func (m *ListPaymentsAccountsResponse) Reset()         { *m = ListPaymentsAccoun
 func (m *ListPaymentsAccountsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListPaymentsAccountsResponse) ProtoMessage()    {}
 func (*ListPaymentsAccountsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_payments_account_service_4cd5864e195abdc3, []int{1}
+	return fileDescriptor_68acb38ba4f095b7, []int{1}
 }
+
 func (m *ListPaymentsAccountsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListPaymentsAccountsResponse.Unmarshal(m, b)
 }
 func (m *ListPaymentsAccountsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListPaymentsAccountsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListPaymentsAccountsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListPaymentsAccountsResponse.Merge(dst, src)
+func (m *ListPaymentsAccountsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPaymentsAccountsResponse.Merge(m, src)
 }
 func (m *ListPaymentsAccountsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListPaymentsAccountsResponse.Size(m)
@@ -110,6 +112,39 @@ func init() {
 	proto.RegisterType((*ListPaymentsAccountsResponse)(nil), "google.ads.googleads.v1.services.ListPaymentsAccountsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/payments_account_service.proto", fileDescriptor_68acb38ba4f095b7)
+}
+
+var fileDescriptor_68acb38ba4f095b7 = []byte{
+	// 399 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xcf, 0x6a, 0xdb, 0x30,
+	0x18, 0xc7, 0x0e, 0x0c, 0xa6, 0x5c, 0x36, 0x33, 0x46, 0x48, 0x02, 0x33, 0x21, 0x87, 0xb0, 0x83,
+	0x34, 0x67, 0x30, 0x86, 0x46, 0x32, 0x9c, 0x4b, 0x36, 0xd8, 0x21, 0x64, 0x90, 0xc3, 0x30, 0x18,
+	0xcf, 0x16, 0xc6, 0x90, 0x48, 0xae, 0x3f, 0x39, 0x50, 0x4a, 0x29, 0xe4, 0x15, 0xfa, 0x06, 0x3d,
+	0xf6, 0x51, 0x0a, 0x3d, 0xf5, 0x15, 0x7a, 0x28, 0x7d, 0x8a, 0xe2, 0xc8, 0x32, 0xc5, 0x38, 0x0d,
+	0xf4, 0xf6, 0x43, 0xfa, 0xfd, 0xd1, 0xf7, 0xd3, 0x87, 0x7e, 0xc6, 0x42, 0xc4, 0x6b, 0x46, 0x82,
+	0x08, 0x88, 0x82, 0x05, 0xda, 0x3a, 0x04, 0x58, 0xb6, 0x4d, 0x42, 0x06, 0x24, 0x0d, 0x4e, 0x37,
+	0x8c, 0x4b, 0xf0, 0x83, 0x30, 0x14, 0x39, 0x97, 0x7e, 0x79, 0x83, 0xd3, 0x4c, 0x48, 0x61, 0xd9,
+	0x4a, 0x85, 0x83, 0x08, 0x70, 0x65, 0x80, 0xb7, 0x0e, 0xd6, 0x06, 0xdd, 0xef, 0x87, 0x22, 0x32,
+	0x06, 0x22, 0xcf, 0x9a, 0x32, 0x94, 0x77, 0xb7, 0xaf, 0x95, 0x69, 0x42, 0x02, 0xce, 0x85, 0x0c,
+	0x64, 0x22, 0x38, 0xa8, 0xdb, 0xc1, 0x14, 0xf5, 0xfe, 0x24, 0x20, 0x17, 0xa5, 0xd6, 0x55, 0x52,
+	0x58, 0xb2, 0x93, 0x9c, 0x81, 0xb4, 0x3e, 0xa1, 0x76, 0x98, 0x83, 0x14, 0x1b, 0x96, 0xf9, 0x49,
+	0xd4, 0x31, 0x6c, 0x63, 0xf4, 0x76, 0x89, 0xf4, 0xd1, 0xef, 0x68, 0x70, 0x81, 0xfa, 0xcd, 0x7a,
+	0x48, 0x05, 0x07, 0x66, 0xf9, 0xe8, 0x7d, 0xfd, 0x5d, 0xd0, 0x31, 0xec, 0xd6, 0xa8, 0x3d, 0x1e,
+	0xe3, 0x43, 0x53, 0x57, 0x33, 0xe1, 0x9a, 0xef, 0xf2, 0x5d, 0x5a, 0x0b, 0x1a, 0x3f, 0x18, 0xe8,
+	0x63, 0x8d, 0xf5, 0x57, 0x95, 0x66, 0xdd, 0x1a, 0xe8, 0x43, 0xd3, 0xe3, 0xac, 0x09, 0x3e, 0xd6,
+	0x37, 0x7e, 0xa1, 0x94, 0xee, 0xf4, 0xb5, 0x72, 0xd5, 0xc9, 0xe0, 0xdb, 0xee, 0xee, 0xfe, 0xd2,
+	0xfc, 0x62, 0xe1, 0xe2, 0xff, 0x74, 0x97, 0x40, 0xce, 0x9e, 0x35, 0x3d, 0xf9, 0x7c, 0x4e, 0xea,
+	0xa3, 0xce, 0x76, 0x26, 0x1a, 0x86, 0x62, 0x73, 0x34, 0x7d, 0xd6, 0x6b, 0x2e, 0x64, 0x51, 0xfc,
+	0xf8, 0xc2, 0xf8, 0xf7, 0xab, 0x34, 0x88, 0xc5, 0x3a, 0xe0, 0x31, 0x16, 0x59, 0x4c, 0x62, 0xc6,
+	0xf7, 0xfb, 0xa0, 0x77, 0x2b, 0x4d, 0xe0, 0xf0, 0x36, 0xff, 0xd0, 0xe0, 0xca, 0x6c, 0xcd, 0x5d,
+	0xf7, 0xda, 0xb4, 0xe7, 0xca, 0xd0, 0x8d, 0x00, 0x2b, 0x58, 0xa0, 0x95, 0x83, 0xcb, 0x60, 0xb8,
+	0xd1, 0x14, 0xcf, 0x8d, 0xc0, 0xab, 0x28, 0xde, 0xca, 0xf1, 0x34, 0xe5, 0xd1, 0x1c, 0xaa, 0x73,
+	0x4a, 0xdd, 0x08, 0x28, 0xad, 0x48, 0x94, 0xae, 0x1c, 0x4a, 0x35, 0xed, 0xff, 0x9b, 0xfd, 0x3b,
+	0xbf, 0x3e, 0x05, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xe9, 0x84, 0xbb, 0x74, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -187,36 +222,3 @@ var _PaymentsAccountService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/payments_account_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/payments_account_service.proto", fileDescriptor_payments_account_service_4cd5864e195abdc3)
-}
-
-var fileDescriptor_payments_account_service_4cd5864e195abdc3 = []byte{
-	// 399 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xcf, 0x6a, 0xdb, 0x30,
-	0x18, 0xc7, 0x0e, 0x0c, 0xa6, 0x5c, 0x36, 0x33, 0x46, 0x48, 0x02, 0x33, 0x21, 0x87, 0xb0, 0x83,
-	0x34, 0x67, 0x30, 0x86, 0x46, 0x32, 0x9c, 0x4b, 0x36, 0xd8, 0x21, 0x64, 0x90, 0xc3, 0x30, 0x18,
-	0xcf, 0x16, 0xc6, 0x90, 0x48, 0xae, 0x3f, 0x39, 0x50, 0x4a, 0x29, 0xe4, 0x15, 0xfa, 0x06, 0x3d,
-	0xf6, 0x51, 0x0a, 0x3d, 0xf5, 0x15, 0x7a, 0x28, 0x7d, 0x8a, 0xe2, 0xc8, 0x32, 0xc5, 0x38, 0x0d,
-	0xf4, 0xf6, 0x43, 0xfa, 0xfd, 0xd1, 0xf7, 0xd3, 0x87, 0x7e, 0xc6, 0x42, 0xc4, 0x6b, 0x46, 0x82,
-	0x08, 0x88, 0x82, 0x05, 0xda, 0x3a, 0x04, 0x58, 0xb6, 0x4d, 0x42, 0x06, 0x24, 0x0d, 0x4e, 0x37,
-	0x8c, 0x4b, 0xf0, 0x83, 0x30, 0x14, 0x39, 0x97, 0x7e, 0x79, 0x83, 0xd3, 0x4c, 0x48, 0x61, 0xd9,
-	0x4a, 0x85, 0x83, 0x08, 0x70, 0x65, 0x80, 0xb7, 0x0e, 0xd6, 0x06, 0xdd, 0xef, 0x87, 0x22, 0x32,
-	0x06, 0x22, 0xcf, 0x9a, 0x32, 0x94, 0x77, 0xb7, 0xaf, 0x95, 0x69, 0x42, 0x02, 0xce, 0x85, 0x0c,
-	0x64, 0x22, 0x38, 0xa8, 0xdb, 0xc1, 0x14, 0xf5, 0xfe, 0x24, 0x20, 0x17, 0xa5, 0xd6, 0x55, 0x52,
-	0x58, 0xb2, 0x93, 0x9c, 0x81, 0xb4, 0x3e, 0xa1, 0x76, 0x98, 0x83, 0x14, 0x1b, 0x96, 0xf9, 0x49,
-	0xd4, 0x31, 0x6c, 0x63, 0xf4, 0x76, 0x89, 0xf4, 0xd1, 0xef, 0x68, 0x70, 0x81, 0xfa, 0xcd, 0x7a,
-	0x48, 0x05, 0x07, 0x66, 0xf9, 0xe8, 0x7d, 0xfd, 0x5d, 0xd0, 0x31, 0xec, 0xd6, 0xa8, 0x3d, 0x1e,
-	0xe3, 0x43, 0x53, 0x57, 0x33, 0xe1, 0x9a, 0xef, 0xf2, 0x5d, 0x5a, 0x0b, 0x1a, 0x3f, 0x18, 0xe8,
-	0x63, 0x8d, 0xf5, 0x57, 0x95, 0x66, 0xdd, 0x1a, 0xe8, 0x43, 0xd3, 0xe3, 0xac, 0x09, 0x3e, 0xd6,
-	0x37, 0x7e, 0xa1, 0x94, 0xee, 0xf4, 0xb5, 0x72, 0xd5, 0xc9, 0xe0, 0xdb, 0xee, 0xee, 0xfe, 0xd2,
-	0xfc, 0x62, 0xe1, 0xe2, 0xff, 0x74, 0x97, 0x40, 0xce, 0x9e, 0x35, 0x3d, 0xf9, 0x7c, 0x4e, 0xea,
-	0xa3, 0xce, 0x76, 0x26, 0x1a, 0x86, 0x62, 0x73, 0x34, 0x7d, 0xd6, 0x6b, 0x2e, 0x64, 0x51, 0xfc,
-	0xf8, 0xc2, 0xf8, 0xf7, 0xab, 0x34, 0x88, 0xc5, 0x3a, 0xe0, 0x31, 0x16, 0x59, 0x4c, 0x62, 0xc6,
-	0xf7, 0xfb, 0xa0, 0x77, 0x2b, 0x4d, 0xe0, 0xf0, 0x36, 0xff, 0xd0, 0xe0, 0xca, 0x6c, 0xcd, 0x5d,
-	0xf7, 0xda, 0xb4, 0xe7, 0xca, 0xd0, 0x8d, 0x00, 0x2b, 0x58, 0xa0, 0x95, 0x83, 0xcb, 0x60, 0xb8,
-	0xd1, 0x14, 0xcf, 0x8d, 0xc0, 0xab, 0x28, 0xde, 0xca, 0xf1, 0x34, 0xe5, 0xd1, 0x1c, 0xaa, 0x73,
-	0x4a, 0xdd, 0x08, 0x28, 0xad, 0x48, 0x94, 0xae, 0x1c, 0x4a, 0x35, 0xed, 0xff, 0x9b, 0xfd, 0x3b,
-	0xbf, 0x3e, 0x05, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xe9, 0x84, 0xbb, 0x74, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/product_bidding_category_constant_service.pb.go b/googleapis/ads/googleads/v1/services/product_bidding_category_constant_service.pb.go
index 87b9f2b48f..f0a8cbe6f0 100644
--- a/googleapis/ads/googleads/v1/services/product_bidding_category_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/product_bidding_category_constant_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/product_bidding_category_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [ProductBiddingCategoryService.GetProductBiddingCategory][].
@@ -41,16 +41,17 @@ func (m *GetProductBiddingCategoryConstantRequest) Reset() {
 func (m *GetProductBiddingCategoryConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductBiddingCategoryConstantRequest) ProtoMessage()    {}
 func (*GetProductBiddingCategoryConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_bidding_category_constant_service_6978b02f4af5cdee, []int{0}
+	return fileDescriptor_db720fb3c3f176ea, []int{0}
 }
+
 func (m *GetProductBiddingCategoryConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductBiddingCategoryConstantRequest.Unmarshal(m, b)
 }
 func (m *GetProductBiddingCategoryConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductBiddingCategoryConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductBiddingCategoryConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductBiddingCategoryConstantRequest.Merge(dst, src)
+func (m *GetProductBiddingCategoryConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductBiddingCategoryConstantRequest.Merge(m, src)
 }
 func (m *GetProductBiddingCategoryConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductBiddingCategoryConstantRequest.Size(m)
@@ -72,6 +73,38 @@ func init() {
 	proto.RegisterType((*GetProductBiddingCategoryConstantRequest)(nil), "google.ads.googleads.v1.services.GetProductBiddingCategoryConstantRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/product_bidding_category_constant_service.proto", fileDescriptor_db720fb3c3f176ea)
+}
+
+var fileDescriptor_db720fb3c3f176ea = []byte{
+	// 379 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4a, 0xeb, 0x40,
+	0x18, 0xc5, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0xde, 0x4d, 0x56, 0x97, 0xe2, 0xa2, 0xd6, 0x0a, 0xa5,
+	0x8b, 0x09, 0x51, 0x44, 0x18, 0xe9, 0x22, 0xed, 0xa2, 0xea, 0x42, 0x43, 0x85, 0x2e, 0x24, 0x10,
+	0xa6, 0x99, 0x61, 0x08, 0xb4, 0x33, 0x71, 0xbe, 0x69, 0x41, 0xc4, 0x8d, 0x6f, 0x20, 0x2e, 0xdd,
+	0xb9, 0xf4, 0x51, 0xdc, 0xfa, 0x0a, 0xae, 0xdc, 0xf9, 0x06, 0x92, 0x4e, 0x26, 0xe0, 0xa2, 0x7f,
+	0x76, 0x87, 0xc9, 0xc9, 0xef, 0xcc, 0x77, 0xbe, 0xf1, 0x62, 0x2e, 0x25, 0x9f, 0xb2, 0x80, 0x50,
+	0x08, 0x8c, 0x2c, 0xd5, 0x22, 0x0c, 0x80, 0xa9, 0x45, 0x9e, 0x31, 0x08, 0x0a, 0x25, 0xe9, 0x3c,
+	0xd3, 0xe9, 0x24, 0xa7, 0x34, 0x17, 0x3c, 0xcd, 0x88, 0x66, 0x5c, 0xaa, 0xdb, 0x34, 0x93, 0x02,
+	0x34, 0x11, 0x3a, 0xad, 0xac, 0xa8, 0x50, 0x52, 0x4b, 0xbf, 0x69, 0x30, 0x88, 0x50, 0x40, 0x35,
+	0x11, 0x2d, 0x42, 0x64, 0x89, 0x8d, 0xb3, 0x55, 0x99, 0x8a, 0x81, 0x9c, 0xab, 0xad, 0x42, 0x4d,
+	0x58, 0x63, 0xc7, 0xa2, 0x8a, 0x3c, 0x20, 0x42, 0x48, 0x4d, 0x74, 0x2e, 0x05, 0x98, 0xaf, 0xad,
+	0x4b, 0xaf, 0x33, 0x64, 0x3a, 0x36, 0xac, 0xbe, 0x41, 0x0d, 0x2a, 0xd2, 0xa0, 0x02, 0x8d, 0xd8,
+	0xcd, 0x9c, 0x81, 0xf6, 0xf7, 0xbc, 0x7f, 0x36, 0x3e, 0x15, 0x64, 0xc6, 0xfe, 0x3b, 0x4d, 0xa7,
+	0xf3, 0x67, 0xf4, 0xd7, 0x1e, 0x5e, 0x90, 0x19, 0x3b, 0x78, 0x76, 0xbd, 0xfd, 0xf5, 0xb8, 0x2b,
+	0x33, 0xa4, 0xff, 0xe5, 0x78, 0xbb, 0x1b, 0xb3, 0xfd, 0x73, 0xb4, 0xa9, 0x2c, 0xb4, 0xed, 0x00,
+	0x8d, 0x68, 0x25, 0xab, 0xae, 0x15, 0xad, 0x27, 0xb5, 0x7a, 0x0f, 0xef, 0x1f, 0x4f, 0xee, 0xb1,
+	0x7f, 0x54, 0x2e, 0xe3, 0xee, 0x47, 0x1d, 0xbd, 0x62, 0xed, 0xaf, 0x10, 0x74, 0xef, 0xfb, 0x8f,
+	0xae, 0xd7, 0xce, 0xe4, 0x6c, 0xe3, 0x4c, 0xfd, 0xee, 0x56, 0x1d, 0xc6, 0xe5, 0x0e, 0x63, 0xe7,
+	0xfa, 0xb4, 0xe2, 0x71, 0x39, 0x25, 0x82, 0x23, 0xa9, 0x78, 0xc0, 0x99, 0x58, 0x6e, 0xd8, 0x3e,
+	0x9f, 0x22, 0x87, 0xd5, 0x2f, 0xf8, 0xc4, 0x8a, 0x17, 0xf7, 0xd7, 0x30, 0x8a, 0x5e, 0xdd, 0xe6,
+	0xd0, 0x00, 0x23, 0x0a, 0xc8, 0xc8, 0x52, 0x8d, 0x43, 0x54, 0x05, 0xc3, 0x9b, 0xb5, 0x24, 0x11,
+	0x85, 0xa4, 0xb6, 0x24, 0xe3, 0x30, 0xb1, 0x96, 0x4f, 0xb7, 0x6d, 0xce, 0x31, 0x8e, 0x28, 0x60,
+	0x5c, 0x9b, 0x30, 0x1e, 0x87, 0x18, 0x5b, 0xdb, 0xe4, 0xf7, 0xf2, 0x9e, 0x87, 0xdf, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x6e, 0x93, 0x85, 0xef, 0x68, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -145,35 +178,3 @@ var _ProductBiddingCategoryConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/product_bidding_category_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/product_bidding_category_constant_service.proto", fileDescriptor_product_bidding_category_constant_service_6978b02f4af5cdee)
-}
-
-var fileDescriptor_product_bidding_category_constant_service_6978b02f4af5cdee = []byte{
-	// 379 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4a, 0xeb, 0x40,
-	0x18, 0xc5, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0xde, 0x4d, 0x56, 0x97, 0xe2, 0xa2, 0xd6, 0x0a, 0xa5,
-	0x8b, 0x09, 0x51, 0x44, 0x18, 0xe9, 0x22, 0xed, 0xa2, 0xea, 0x42, 0x43, 0x85, 0x2e, 0x24, 0x10,
-	0xa6, 0x99, 0x61, 0x08, 0xb4, 0x33, 0x71, 0xbe, 0x69, 0x41, 0xc4, 0x8d, 0x6f, 0x20, 0x2e, 0xdd,
-	0xb9, 0xf4, 0x51, 0xdc, 0xfa, 0x0a, 0xae, 0xdc, 0xf9, 0x06, 0x92, 0x4e, 0x26, 0xe0, 0xa2, 0x7f,
-	0x76, 0x87, 0xc9, 0xc9, 0xef, 0xcc, 0x77, 0xbe, 0xf1, 0x62, 0x2e, 0x25, 0x9f, 0xb2, 0x80, 0x50,
-	0x08, 0x8c, 0x2c, 0xd5, 0x22, 0x0c, 0x80, 0xa9, 0x45, 0x9e, 0x31, 0x08, 0x0a, 0x25, 0xe9, 0x3c,
-	0xd3, 0xe9, 0x24, 0xa7, 0x34, 0x17, 0x3c, 0xcd, 0x88, 0x66, 0x5c, 0xaa, 0xdb, 0x34, 0x93, 0x02,
-	0x34, 0x11, 0x3a, 0xad, 0xac, 0xa8, 0x50, 0x52, 0x4b, 0xbf, 0x69, 0x30, 0x88, 0x50, 0x40, 0x35,
-	0x11, 0x2d, 0x42, 0x64, 0x89, 0x8d, 0xb3, 0x55, 0x99, 0x8a, 0x81, 0x9c, 0xab, 0xad, 0x42, 0x4d,
-	0x58, 0x63, 0xc7, 0xa2, 0x8a, 0x3c, 0x20, 0x42, 0x48, 0x4d, 0x74, 0x2e, 0x05, 0x98, 0xaf, 0xad,
-	0x4b, 0xaf, 0x33, 0x64, 0x3a, 0x36, 0xac, 0xbe, 0x41, 0x0d, 0x2a, 0xd2, 0xa0, 0x02, 0x8d, 0xd8,
-	0xcd, 0x9c, 0x81, 0xf6, 0xf7, 0xbc, 0x7f, 0x36, 0x3e, 0x15, 0x64, 0xc6, 0xfe, 0x3b, 0x4d, 0xa7,
-	0xf3, 0x67, 0xf4, 0xd7, 0x1e, 0x5e, 0x90, 0x19, 0x3b, 0x78, 0x76, 0xbd, 0xfd, 0xf5, 0xb8, 0x2b,
-	0x33, 0xa4, 0xff, 0xe5, 0x78, 0xbb, 0x1b, 0xb3, 0xfd, 0x73, 0xb4, 0xa9, 0x2c, 0xb4, 0xed, 0x00,
-	0x8d, 0x68, 0x25, 0xab, 0xae, 0x15, 0xad, 0x27, 0xb5, 0x7a, 0x0f, 0xef, 0x1f, 0x4f, 0xee, 0xb1,
-	0x7f, 0x54, 0x2e, 0xe3, 0xee, 0x47, 0x1d, 0xbd, 0x62, 0xed, 0xaf, 0x10, 0x74, 0xef, 0xfb, 0x8f,
-	0xae, 0xd7, 0xce, 0xe4, 0x6c, 0xe3, 0x4c, 0xfd, 0xee, 0x56, 0x1d, 0xc6, 0xe5, 0x0e, 0x63, 0xe7,
-	0xfa, 0xb4, 0xe2, 0x71, 0x39, 0x25, 0x82, 0x23, 0xa9, 0x78, 0xc0, 0x99, 0x58, 0x6e, 0xd8, 0x3e,
-	0x9f, 0x22, 0x87, 0xd5, 0x2f, 0xf8, 0xc4, 0x8a, 0x17, 0xf7, 0xd7, 0x30, 0x8a, 0x5e, 0xdd, 0xe6,
-	0xd0, 0x00, 0x23, 0x0a, 0xc8, 0xc8, 0x52, 0x8d, 0x43, 0x54, 0x05, 0xc3, 0x9b, 0xb5, 0x24, 0x11,
-	0x85, 0xa4, 0xb6, 0x24, 0xe3, 0x30, 0xb1, 0x96, 0x4f, 0xb7, 0x6d, 0xce, 0x31, 0x8e, 0x28, 0x60,
-	0x5c, 0x9b, 0x30, 0x1e, 0x87, 0x18, 0x5b, 0xdb, 0xe4, 0xf7, 0xf2, 0x9e, 0x87, 0xdf, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x6e, 0x93, 0x85, 0xef, 0x68, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/product_group_view_service.pb.go b/googleapis/ads/googleads/v1/services/product_group_view_service.pb.go
index 72428b3b22..8c136b03d9 100644
--- a/googleapis/ads/googleads/v1/services/product_group_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/product_group_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/product_group_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ProductGroupViewService.GetProductGroupView][google.ads.googleads.v1.services.ProductGroupViewService.GetProductGroupView].
 type GetProductGroupViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetProductGroupViewRequest) Reset()         { *m = GetProductGroupViewR
 func (m *GetProductGroupViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductGroupViewRequest) ProtoMessage()    {}
 func (*GetProductGroupViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_group_view_service_b224563427f47e03, []int{0}
+	return fileDescriptor_b1170300877f7364, []int{0}
 }
+
 func (m *GetProductGroupViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductGroupViewRequest.Unmarshal(m, b)
 }
 func (m *GetProductGroupViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductGroupViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductGroupViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductGroupViewRequest.Merge(dst, src)
+func (m *GetProductGroupViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductGroupViewRequest.Merge(m, src)
 }
 func (m *GetProductGroupViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductGroupViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetProductGroupViewRequest)(nil), "google.ads.googleads.v1.services.GetProductGroupViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/product_group_view_service.proto", fileDescriptor_b1170300877f7364)
+}
+
+var fileDescriptor_b1170300877f7364 = []byte{
+	// 369 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x4b, 0xfb, 0x40,
+	0x1c, 0x25, 0xf9, 0xc3, 0x1f, 0x0c, 0xba, 0xc4, 0x41, 0x09, 0x1d, 0x4a, 0xed, 0x20, 0x1d, 0xee,
+	0x88, 0xc5, 0xe5, 0xaa, 0x43, 0xba, 0xc4, 0x49, 0x4a, 0x85, 0x0c, 0x12, 0x08, 0x31, 0x39, 0x8e,
+	0x40, 0x93, 0x8b, 0xf7, 0xbb, 0xa4, 0x83, 0xb8, 0xe8, 0x47, 0xf0, 0x1b, 0x38, 0xfa, 0x3d, 0x5c,
+	0x5c, 0xfd, 0x04, 0x82, 0x93, 0x9f, 0x42, 0xd2, 0xeb, 0x05, 0x2c, 0x0d, 0xdd, 0x1e, 0x77, 0xef,
+	0xbd, 0xdf, 0xbb, 0xf7, 0x3b, 0xcb, 0x63, 0x9c, 0xb3, 0x05, 0xc5, 0x71, 0x0a, 0x58, 0xc1, 0x06,
+	0xd5, 0x2e, 0x06, 0x2a, 0xea, 0x2c, 0xa1, 0x80, 0x4b, 0xc1, 0xd3, 0x2a, 0x91, 0x11, 0x13, 0xbc,
+	0x2a, 0xa3, 0x3a, 0xa3, 0xcb, 0x68, 0x7d, 0x87, 0x4a, 0xc1, 0x25, 0xb7, 0xfb, 0x4a, 0x87, 0xe2,
+	0x14, 0x50, 0x6b, 0x81, 0x6a, 0x17, 0x69, 0x0b, 0x87, 0x74, 0x0d, 0x11, 0x14, 0x78, 0x25, 0xb6,
+	0x4f, 0x51, 0xee, 0x4e, 0x4f, 0x6b, 0xcb, 0x0c, 0xc7, 0x45, 0xc1, 0x65, 0x2c, 0x33, 0x5e, 0x80,
+	0xba, 0x1d, 0x78, 0x96, 0xe3, 0x53, 0x39, 0x53, 0x62, 0xbf, 0xd1, 0x06, 0x19, 0x5d, 0xce, 0xe9,
+	0x7d, 0x45, 0x41, 0xda, 0x27, 0xd6, 0x81, 0x9e, 0x10, 0x15, 0x71, 0x4e, 0x8f, 0x8d, 0xbe, 0x71,
+	0xba, 0x37, 0xdf, 0xd7, 0x87, 0xd7, 0x71, 0x4e, 0xcf, 0xbe, 0x0c, 0xeb, 0x68, 0xd3, 0xe0, 0x46,
+	0x25, 0xb7, 0xdf, 0x0d, 0xeb, 0x70, 0x8b, 0xbf, 0x7d, 0x81, 0x76, 0xbd, 0x19, 0x75, 0xc7, 0x72,
+	0xc6, 0x9d, 0xea, 0xb6, 0x0f, 0xb4, 0xa9, 0x1d, 0x4c, 0x9e, 0x3e, 0xbf, 0x5f, 0xcc, 0x73, 0x7b,
+	0xdc, 0xf4, 0xf6, 0xf0, 0xe7, 0x59, 0x97, 0x49, 0x05, 0x92, 0xe7, 0x54, 0x00, 0x1e, 0xe9, 0x22,
+	0x5b, 0x21, 0xe0, 0xd1, 0xe3, 0xf4, 0xd9, 0xb4, 0x86, 0x09, 0xcf, 0x77, 0xa6, 0x9e, 0xf6, 0x3a,
+	0x9a, 0x98, 0x35, 0x6d, 0xcf, 0x8c, 0xdb, 0xab, 0xb5, 0x03, 0xe3, 0x8b, 0xb8, 0x60, 0x88, 0x0b,
+	0x86, 0x19, 0x2d, 0x56, 0xbb, 0xd0, 0x9b, 0x2d, 0x33, 0xe8, 0xfe, 0x4d, 0x13, 0x0d, 0x5e, 0xcd,
+	0x7f, 0xbe, 0xe7, 0xbd, 0x99, 0x7d, 0x5f, 0x19, 0x7a, 0x29, 0x20, 0x05, 0x1b, 0x14, 0xb8, 0x68,
+	0x3d, 0x18, 0x3e, 0x34, 0x25, 0xf4, 0x52, 0x08, 0x5b, 0x4a, 0x18, 0xb8, 0xa1, 0xa6, 0xfc, 0x98,
+	0x43, 0x75, 0x4e, 0x88, 0x97, 0x02, 0x21, 0x2d, 0x89, 0x90, 0xc0, 0x25, 0x44, 0xd3, 0xee, 0xfe,
+	0xaf, 0x72, 0x8e, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xea, 0xc2, 0x72, 0x20, 0xf4, 0x02, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _ProductGroupViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/product_group_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/product_group_view_service.proto", fileDescriptor_product_group_view_service_b224563427f47e03)
-}
-
-var fileDescriptor_product_group_view_service_b224563427f47e03 = []byte{
-	// 369 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x4b, 0xfb, 0x40,
-	0x1c, 0x25, 0xf9, 0xc3, 0x1f, 0x0c, 0xba, 0xc4, 0x41, 0x09, 0x1d, 0x4a, 0xed, 0x20, 0x1d, 0xee,
-	0x88, 0xc5, 0xe5, 0xaa, 0x43, 0xba, 0xc4, 0x49, 0x4a, 0x85, 0x0c, 0x12, 0x08, 0x31, 0x39, 0x8e,
-	0x40, 0x93, 0x8b, 0xf7, 0xbb, 0xa4, 0x83, 0xb8, 0xe8, 0x47, 0xf0, 0x1b, 0x38, 0xfa, 0x3d, 0x5c,
-	0x5c, 0xfd, 0x04, 0x82, 0x93, 0x9f, 0x42, 0xd2, 0xeb, 0x05, 0x2c, 0x0d, 0xdd, 0x1e, 0x77, 0xef,
-	0xbd, 0xdf, 0xbb, 0xf7, 0x3b, 0xcb, 0x63, 0x9c, 0xb3, 0x05, 0xc5, 0x71, 0x0a, 0x58, 0xc1, 0x06,
-	0xd5, 0x2e, 0x06, 0x2a, 0xea, 0x2c, 0xa1, 0x80, 0x4b, 0xc1, 0xd3, 0x2a, 0x91, 0x11, 0x13, 0xbc,
-	0x2a, 0xa3, 0x3a, 0xa3, 0xcb, 0x68, 0x7d, 0x87, 0x4a, 0xc1, 0x25, 0xb7, 0xfb, 0x4a, 0x87, 0xe2,
-	0x14, 0x50, 0x6b, 0x81, 0x6a, 0x17, 0x69, 0x0b, 0x87, 0x74, 0x0d, 0x11, 0x14, 0x78, 0x25, 0xb6,
-	0x4f, 0x51, 0xee, 0x4e, 0x4f, 0x6b, 0xcb, 0x0c, 0xc7, 0x45, 0xc1, 0x65, 0x2c, 0x33, 0x5e, 0x80,
-	0xba, 0x1d, 0x78, 0x96, 0xe3, 0x53, 0x39, 0x53, 0x62, 0xbf, 0xd1, 0x06, 0x19, 0x5d, 0xce, 0xe9,
-	0x7d, 0x45, 0x41, 0xda, 0x27, 0xd6, 0x81, 0x9e, 0x10, 0x15, 0x71, 0x4e, 0x8f, 0x8d, 0xbe, 0x71,
-	0xba, 0x37, 0xdf, 0xd7, 0x87, 0xd7, 0x71, 0x4e, 0xcf, 0xbe, 0x0c, 0xeb, 0x68, 0xd3, 0xe0, 0x46,
-	0x25, 0xb7, 0xdf, 0x0d, 0xeb, 0x70, 0x8b, 0xbf, 0x7d, 0x81, 0x76, 0xbd, 0x19, 0x75, 0xc7, 0x72,
-	0xc6, 0x9d, 0xea, 0xb6, 0x0f, 0xb4, 0xa9, 0x1d, 0x4c, 0x9e, 0x3e, 0xbf, 0x5f, 0xcc, 0x73, 0x7b,
-	0xdc, 0xf4, 0xf6, 0xf0, 0xe7, 0x59, 0x97, 0x49, 0x05, 0x92, 0xe7, 0x54, 0x00, 0x1e, 0xe9, 0x22,
-	0x5b, 0x21, 0xe0, 0xd1, 0xe3, 0xf4, 0xd9, 0xb4, 0x86, 0x09, 0xcf, 0x77, 0xa6, 0x9e, 0xf6, 0x3a,
-	0x9a, 0x98, 0x35, 0x6d, 0xcf, 0x8c, 0xdb, 0xab, 0xb5, 0x03, 0xe3, 0x8b, 0xb8, 0x60, 0x88, 0x0b,
-	0x86, 0x19, 0x2d, 0x56, 0xbb, 0xd0, 0x9b, 0x2d, 0x33, 0xe8, 0xfe, 0x4d, 0x13, 0x0d, 0x5e, 0xcd,
-	0x7f, 0xbe, 0xe7, 0xbd, 0x99, 0x7d, 0x5f, 0x19, 0x7a, 0x29, 0x20, 0x05, 0x1b, 0x14, 0xb8, 0x68,
-	0x3d, 0x18, 0x3e, 0x34, 0x25, 0xf4, 0x52, 0x08, 0x5b, 0x4a, 0x18, 0xb8, 0xa1, 0xa6, 0xfc, 0x98,
-	0x43, 0x75, 0x4e, 0x88, 0x97, 0x02, 0x21, 0x2d, 0x89, 0x90, 0xc0, 0x25, 0x44, 0xd3, 0xee, 0xfe,
-	0xaf, 0x72, 0x8e, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xea, 0xc2, 0x72, 0x20, 0xf4, 0x02, 0x00,
-	0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/recommendation_service.pb.go b/googleapis/ads/googleads/v1/services/recommendation_service.pb.go
index 0e14a085cb..ad1990c58f 100644
--- a/googleapis/ads/googleads/v1/services/recommendation_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/recommendation_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/recommendation_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
-import enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	common "google.golang.org/genproto/googleapis/ads/googleads/v1/common"
+	enums "google.golang.org/genproto/googleapis/ads/googleads/v1/enums"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [RecommendationService.GetRecommendation][google.ads.googleads.v1.services.RecommendationService.GetRecommendation].
 type GetRecommendationRequest struct {
@@ -42,16 +42,17 @@ func (m *GetRecommendationRequest) Reset()         { *m = GetRecommendationReque
 func (m *GetRecommendationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetRecommendationRequest) ProtoMessage()    {}
 func (*GetRecommendationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{0}
+	return fileDescriptor_a744af7243d0735a, []int{0}
 }
+
 func (m *GetRecommendationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetRecommendationRequest.Unmarshal(m, b)
 }
 func (m *GetRecommendationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetRecommendationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetRecommendationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetRecommendationRequest.Merge(dst, src)
+func (m *GetRecommendationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetRecommendationRequest.Merge(m, src)
 }
 func (m *GetRecommendationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetRecommendationRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *ApplyRecommendationRequest) Reset()         { *m = ApplyRecommendationR
 func (m *ApplyRecommendationRequest) String() string { return proto.CompactTextString(m) }
 func (*ApplyRecommendationRequest) ProtoMessage()    {}
 func (*ApplyRecommendationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{1}
+	return fileDescriptor_a744af7243d0735a, []int{1}
 }
+
 func (m *ApplyRecommendationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationRequest.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationRequest.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationRequest.Merge(dst, src)
+func (m *ApplyRecommendationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationRequest.Merge(m, src)
 }
 func (m *ApplyRecommendationRequest) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationRequest.Size(m)
@@ -158,16 +160,17 @@ func (m *ApplyRecommendationOperation) Reset()         { *m = ApplyRecommendatio
 func (m *ApplyRecommendationOperation) String() string { return proto.CompactTextString(m) }
 func (*ApplyRecommendationOperation) ProtoMessage()    {}
 func (*ApplyRecommendationOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2}
+	return fileDescriptor_a744af7243d0735a, []int{2}
 }
+
 func (m *ApplyRecommendationOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation.Merge(dst, src)
+func (m *ApplyRecommendationOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation.Size(m)
@@ -303,9 +306,9 @@ func (m *ApplyRecommendationOperation) GetMoveUnusedBudget() *ApplyRecommendatio
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ApplyRecommendationOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ApplyRecommendationOperation_OneofMarshaler, _ApplyRecommendationOperation_OneofUnmarshaler, _ApplyRecommendationOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ApplyRecommendationOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ApplyRecommendationOperation_CampaignBudget)(nil),
 		(*ApplyRecommendationOperation_TextAd)(nil),
 		(*ApplyRecommendationOperation_Keyword)(nil),
@@ -317,180 +320,6 @@ func (*ApplyRecommendationOperation) XXX_OneofFuncs() (func(msg proto.Message, b
 	}
 }
 
-func _ApplyRecommendationOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ApplyRecommendationOperation)
-	// apply_parameters
-	switch x := m.ApplyParameters.(type) {
-	case *ApplyRecommendationOperation_CampaignBudget:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CampaignBudget); err != nil {
-			return err
-		}
-	case *ApplyRecommendationOperation_TextAd:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextAd); err != nil {
-			return err
-		}
-	case *ApplyRecommendationOperation_Keyword:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Keyword); err != nil {
-			return err
-		}
-	case *ApplyRecommendationOperation_TargetCpaOptIn:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetCpaOptIn); err != nil {
-			return err
-		}
-	case *ApplyRecommendationOperation_CalloutExtension:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CalloutExtension); err != nil {
-			return err
-		}
-	case *ApplyRecommendationOperation_CallExtension:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CallExtension); err != nil {
-			return err
-		}
-	case *ApplyRecommendationOperation_SitelinkExtension:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SitelinkExtension); err != nil {
-			return err
-		}
-	case *ApplyRecommendationOperation_MoveUnusedBudget:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MoveUnusedBudget); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ApplyRecommendationOperation.ApplyParameters has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ApplyRecommendationOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ApplyRecommendationOperation)
-	switch tag {
-	case 2: // apply_parameters.campaign_budget
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_CampaignBudgetParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_CampaignBudget{msg}
-		return true, err
-	case 3: // apply_parameters.text_ad
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_TextAdParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_TextAd{msg}
-		return true, err
-	case 4: // apply_parameters.keyword
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_KeywordParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_Keyword{msg}
-		return true, err
-	case 5: // apply_parameters.target_cpa_opt_in
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_TargetCpaOptInParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_TargetCpaOptIn{msg}
-		return true, err
-	case 6: // apply_parameters.callout_extension
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_CalloutExtensionParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_CalloutExtension{msg}
-		return true, err
-	case 7: // apply_parameters.call_extension
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_CallExtensionParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_CallExtension{msg}
-		return true, err
-	case 8: // apply_parameters.sitelink_extension
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_SitelinkExtensionParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_SitelinkExtension{msg}
-		return true, err
-	case 9: // apply_parameters.move_unused_budget
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApplyRecommendationOperation_MoveUnusedBudgetParameters)
-		err := b.DecodeMessage(msg)
-		m.ApplyParameters = &ApplyRecommendationOperation_MoveUnusedBudget{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ApplyRecommendationOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ApplyRecommendationOperation)
-	// apply_parameters
-	switch x := m.ApplyParameters.(type) {
-	case *ApplyRecommendationOperation_CampaignBudget:
-		s := proto.Size(x.CampaignBudget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ApplyRecommendationOperation_TextAd:
-		s := proto.Size(x.TextAd)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ApplyRecommendationOperation_Keyword:
-		s := proto.Size(x.Keyword)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ApplyRecommendationOperation_TargetCpaOptIn:
-		s := proto.Size(x.TargetCpaOptIn)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ApplyRecommendationOperation_CalloutExtension:
-		s := proto.Size(x.CalloutExtension)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ApplyRecommendationOperation_CallExtension:
-		s := proto.Size(x.CallExtension)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ApplyRecommendationOperation_SitelinkExtension:
-		s := proto.Size(x.SitelinkExtension)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ApplyRecommendationOperation_MoveUnusedBudget:
-		s := proto.Size(x.MoveUnusedBudget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Parameters to use when applying a campaign budget recommendation.
 type ApplyRecommendationOperation_CampaignBudgetParameters struct {
 	// New budget amount to set for target budget resource. This is a required
@@ -509,16 +338,17 @@ func (m *ApplyRecommendationOperation_CampaignBudgetParameters) String() string
 }
 func (*ApplyRecommendationOperation_CampaignBudgetParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_CampaignBudgetParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 0}
+	return fileDescriptor_a744af7243d0735a, []int{2, 0}
 }
+
 func (m *ApplyRecommendationOperation_CampaignBudgetParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_CampaignBudgetParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_CampaignBudgetParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_CampaignBudgetParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_CampaignBudgetParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_CampaignBudgetParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_CampaignBudgetParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_CampaignBudgetParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_CampaignBudgetParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_CampaignBudgetParameters.Size(m)
@@ -554,16 +384,17 @@ func (m *ApplyRecommendationOperation_TextAdParameters) String() string {
 }
 func (*ApplyRecommendationOperation_TextAdParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_TextAdParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 1}
+	return fileDescriptor_a744af7243d0735a, []int{2, 1}
 }
+
 func (m *ApplyRecommendationOperation_TextAdParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_TextAdParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_TextAdParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_TextAdParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_TextAdParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_TextAdParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_TextAdParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_TextAdParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_TextAdParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_TextAdParameters.Size(m)
@@ -603,16 +434,17 @@ func (m *ApplyRecommendationOperation_KeywordParameters) String() string {
 }
 func (*ApplyRecommendationOperation_KeywordParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_KeywordParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 2}
+	return fileDescriptor_a744af7243d0735a, []int{2, 2}
 }
+
 func (m *ApplyRecommendationOperation_KeywordParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_KeywordParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_KeywordParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_KeywordParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_KeywordParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_KeywordParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_KeywordParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_KeywordParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_KeywordParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_KeywordParameters.Size(m)
@@ -664,16 +496,17 @@ func (m *ApplyRecommendationOperation_TargetCpaOptInParameters) String() string
 }
 func (*ApplyRecommendationOperation_TargetCpaOptInParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_TargetCpaOptInParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 3}
+	return fileDescriptor_a744af7243d0735a, []int{2, 3}
 }
+
 func (m *ApplyRecommendationOperation_TargetCpaOptInParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_TargetCpaOptInParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_TargetCpaOptInParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_TargetCpaOptInParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_TargetCpaOptInParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_TargetCpaOptInParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_TargetCpaOptInParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_TargetCpaOptInParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_TargetCpaOptInParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_TargetCpaOptInParameters.Size(m)
@@ -715,16 +548,17 @@ func (m *ApplyRecommendationOperation_CalloutExtensionParameters) String() strin
 }
 func (*ApplyRecommendationOperation_CalloutExtensionParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_CalloutExtensionParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 4}
+	return fileDescriptor_a744af7243d0735a, []int{2, 4}
 }
+
 func (m *ApplyRecommendationOperation_CalloutExtensionParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_CalloutExtensionParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_CalloutExtensionParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_CalloutExtensionParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_CalloutExtensionParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_CalloutExtensionParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_CalloutExtensionParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_CalloutExtensionParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_CalloutExtensionParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_CalloutExtensionParameters.Size(m)
@@ -759,16 +593,17 @@ func (m *ApplyRecommendationOperation_CallExtensionParameters) String() string {
 }
 func (*ApplyRecommendationOperation_CallExtensionParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_CallExtensionParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 5}
+	return fileDescriptor_a744af7243d0735a, []int{2, 5}
 }
+
 func (m *ApplyRecommendationOperation_CallExtensionParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_CallExtensionParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_CallExtensionParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_CallExtensionParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_CallExtensionParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_CallExtensionParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_CallExtensionParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_CallExtensionParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_CallExtensionParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_CallExtensionParameters.Size(m)
@@ -803,16 +638,17 @@ func (m *ApplyRecommendationOperation_SitelinkExtensionParameters) String() stri
 }
 func (*ApplyRecommendationOperation_SitelinkExtensionParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_SitelinkExtensionParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 6}
+	return fileDescriptor_a744af7243d0735a, []int{2, 6}
 }
+
 func (m *ApplyRecommendationOperation_SitelinkExtensionParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_SitelinkExtensionParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_SitelinkExtensionParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_SitelinkExtensionParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_SitelinkExtensionParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_SitelinkExtensionParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_SitelinkExtensionParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_SitelinkExtensionParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_SitelinkExtensionParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_SitelinkExtensionParameters.Size(m)
@@ -848,16 +684,17 @@ func (m *ApplyRecommendationOperation_MoveUnusedBudgetParameters) String() strin
 }
 func (*ApplyRecommendationOperation_MoveUnusedBudgetParameters) ProtoMessage() {}
 func (*ApplyRecommendationOperation_MoveUnusedBudgetParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{2, 7}
+	return fileDescriptor_a744af7243d0735a, []int{2, 7}
 }
+
 func (m *ApplyRecommendationOperation_MoveUnusedBudgetParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationOperation_MoveUnusedBudgetParameters.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationOperation_MoveUnusedBudgetParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationOperation_MoveUnusedBudgetParameters.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationOperation_MoveUnusedBudgetParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationOperation_MoveUnusedBudgetParameters.Merge(dst, src)
+func (m *ApplyRecommendationOperation_MoveUnusedBudgetParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationOperation_MoveUnusedBudgetParameters.Merge(m, src)
 }
 func (m *ApplyRecommendationOperation_MoveUnusedBudgetParameters) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationOperation_MoveUnusedBudgetParameters.Size(m)
@@ -893,16 +730,17 @@ func (m *ApplyRecommendationResponse) Reset()         { *m = ApplyRecommendation
 func (m *ApplyRecommendationResponse) String() string { return proto.CompactTextString(m) }
 func (*ApplyRecommendationResponse) ProtoMessage()    {}
 func (*ApplyRecommendationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{3}
+	return fileDescriptor_a744af7243d0735a, []int{3}
 }
+
 func (m *ApplyRecommendationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationResponse.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationResponse.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationResponse.Merge(dst, src)
+func (m *ApplyRecommendationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationResponse.Merge(m, src)
 }
 func (m *ApplyRecommendationResponse) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationResponse.Size(m)
@@ -940,16 +778,17 @@ func (m *ApplyRecommendationResult) Reset()         { *m = ApplyRecommendationRe
 func (m *ApplyRecommendationResult) String() string { return proto.CompactTextString(m) }
 func (*ApplyRecommendationResult) ProtoMessage()    {}
 func (*ApplyRecommendationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{4}
+	return fileDescriptor_a744af7243d0735a, []int{4}
 }
+
 func (m *ApplyRecommendationResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyRecommendationResult.Unmarshal(m, b)
 }
 func (m *ApplyRecommendationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplyRecommendationResult.Marshal(b, m, deterministic)
 }
-func (dst *ApplyRecommendationResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyRecommendationResult.Merge(dst, src)
+func (m *ApplyRecommendationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplyRecommendationResult.Merge(m, src)
 }
 func (m *ApplyRecommendationResult) XXX_Size() int {
 	return xxx_messageInfo_ApplyRecommendationResult.Size(m)
@@ -989,16 +828,17 @@ func (m *DismissRecommendationRequest) Reset()         { *m = DismissRecommendat
 func (m *DismissRecommendationRequest) String() string { return proto.CompactTextString(m) }
 func (*DismissRecommendationRequest) ProtoMessage()    {}
 func (*DismissRecommendationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{5}
+	return fileDescriptor_a744af7243d0735a, []int{5}
 }
+
 func (m *DismissRecommendationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DismissRecommendationRequest.Unmarshal(m, b)
 }
 func (m *DismissRecommendationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DismissRecommendationRequest.Marshal(b, m, deterministic)
 }
-func (dst *DismissRecommendationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DismissRecommendationRequest.Merge(dst, src)
+func (m *DismissRecommendationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DismissRecommendationRequest.Merge(m, src)
 }
 func (m *DismissRecommendationRequest) XXX_Size() int {
 	return xxx_messageInfo_DismissRecommendationRequest.Size(m)
@@ -1047,16 +887,17 @@ func (m *DismissRecommendationRequest_DismissRecommendationOperation) String() s
 }
 func (*DismissRecommendationRequest_DismissRecommendationOperation) ProtoMessage() {}
 func (*DismissRecommendationRequest_DismissRecommendationOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{5, 0}
+	return fileDescriptor_a744af7243d0735a, []int{5, 0}
 }
+
 func (m *DismissRecommendationRequest_DismissRecommendationOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DismissRecommendationRequest_DismissRecommendationOperation.Unmarshal(m, b)
 }
 func (m *DismissRecommendationRequest_DismissRecommendationOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DismissRecommendationRequest_DismissRecommendationOperation.Marshal(b, m, deterministic)
 }
-func (dst *DismissRecommendationRequest_DismissRecommendationOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DismissRecommendationRequest_DismissRecommendationOperation.Merge(dst, src)
+func (m *DismissRecommendationRequest_DismissRecommendationOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DismissRecommendationRequest_DismissRecommendationOperation.Merge(m, src)
 }
 func (m *DismissRecommendationRequest_DismissRecommendationOperation) XXX_Size() int {
 	return xxx_messageInfo_DismissRecommendationRequest_DismissRecommendationOperation.Size(m)
@@ -1092,16 +933,17 @@ func (m *DismissRecommendationResponse) Reset()         { *m = DismissRecommenda
 func (m *DismissRecommendationResponse) String() string { return proto.CompactTextString(m) }
 func (*DismissRecommendationResponse) ProtoMessage()    {}
 func (*DismissRecommendationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{6}
+	return fileDescriptor_a744af7243d0735a, []int{6}
 }
+
 func (m *DismissRecommendationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DismissRecommendationResponse.Unmarshal(m, b)
 }
 func (m *DismissRecommendationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DismissRecommendationResponse.Marshal(b, m, deterministic)
 }
-func (dst *DismissRecommendationResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DismissRecommendationResponse.Merge(dst, src)
+func (m *DismissRecommendationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DismissRecommendationResponse.Merge(m, src)
 }
 func (m *DismissRecommendationResponse) XXX_Size() int {
 	return xxx_messageInfo_DismissRecommendationResponse.Size(m)
@@ -1143,16 +985,17 @@ func (m *DismissRecommendationResponse_DismissRecommendationResult) String() str
 }
 func (*DismissRecommendationResponse_DismissRecommendationResult) ProtoMessage() {}
 func (*DismissRecommendationResponse_DismissRecommendationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recommendation_service_6b12c247ec5a1022, []int{6, 0}
+	return fileDescriptor_a744af7243d0735a, []int{6, 0}
 }
+
 func (m *DismissRecommendationResponse_DismissRecommendationResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DismissRecommendationResponse_DismissRecommendationResult.Unmarshal(m, b)
 }
 func (m *DismissRecommendationResponse_DismissRecommendationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DismissRecommendationResponse_DismissRecommendationResult.Marshal(b, m, deterministic)
 }
-func (dst *DismissRecommendationResponse_DismissRecommendationResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DismissRecommendationResponse_DismissRecommendationResult.Merge(dst, src)
+func (m *DismissRecommendationResponse_DismissRecommendationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DismissRecommendationResponse_DismissRecommendationResult.Merge(m, src)
 }
 func (m *DismissRecommendationResponse_DismissRecommendationResult) XXX_Size() int {
 	return xxx_messageInfo_DismissRecommendationResponse_DismissRecommendationResult.Size(m)
@@ -1190,6 +1033,98 @@ func init() {
 	proto.RegisterType((*DismissRecommendationResponse_DismissRecommendationResult)(nil), "google.ads.googleads.v1.services.DismissRecommendationResponse.DismissRecommendationResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/recommendation_service.proto", fileDescriptor_a744af7243d0735a)
+}
+
+var fileDescriptor_a744af7243d0735a = []byte{
+	// 1333 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xc1, 0x73, 0x14, 0x45,
+	0x17, 0xff, 0x66, 0xf2, 0x41, 0xe0, 0x05, 0x42, 0xb6, 0xa9, 0x14, 0xfb, 0x4d, 0x02, 0x5f, 0x5c,
+	0xb1, 0x4c, 0xa5, 0xac, 0x19, 0x37, 0x08, 0xea, 0x60, 0x80, 0x0d, 0x84, 0x90, 0xb2, 0x80, 0xd4,
+	0x24, 0xc4, 0x12, 0x23, 0x53, 0x9d, 0x99, 0x66, 0x1d, 0xd9, 0x99, 0x1e, 0xbb, 0x7b, 0x12, 0x52,
+	0x48, 0xa9, 0x94, 0x07, 0x29, 0x8f, 0xfe, 0x07, 0x1c, 0x3d, 0xf8, 0x17, 0xe8, 0x51, 0x0f, 0x1c,
+	0xf5, 0xe6, 0xd9, 0x93, 0x67, 0xff, 0x00, 0x6b, 0x7a, 0xa6, 0x97, 0xcc, 0xee, 0x4e, 0x76, 0xcd,
+	0xe2, 0xad, 0xb7, 0x5f, 0xbf, 0xdf, 0xef, 0xbd, 0xd7, 0xaf, 0x7f, 0xdd, 0xb3, 0xb0, 0xd0, 0xa4,
+	0xb4, 0xd9, 0x22, 0x16, 0xf6, 0xb9, 0x95, 0x0d, 0xd3, 0xd1, 0x76, 0xdd, 0xe2, 0x84, 0x6d, 0x07,
+	0x1e, 0xe1, 0x16, 0x23, 0x1e, 0x0d, 0x43, 0x12, 0xf9, 0x58, 0x04, 0x34, 0x72, 0xf3, 0x79, 0x33,
+	0x66, 0x54, 0x50, 0x34, 0x93, 0xf9, 0x98, 0xd8, 0xe7, 0x66, 0xdb, 0xdd, 0xdc, 0xae, 0x9b, 0xca,
+	0xdd, 0xb0, 0xca, 0x08, 0x52, 0x54, 0x1a, 0x59, 0xe4, 0xa1, 0x20, 0x11, 0x0f, 0x68, 0xc4, 0x33,
+	0x48, 0xe3, 0x42, 0x99, 0x03, 0x89, 0x92, 0x90, 0x5b, 0x0f, 0xc8, 0xee, 0x0e, 0x65, 0xbe, 0x1b,
+	0x62, 0xe1, 0x7d, 0xe2, 0x8a, 0xdd, 0x38, 0x0f, 0xc5, 0x98, 0x2b, 0xf3, 0x63, 0x84, 0xd3, 0x84,
+	0xa5, 0xa9, 0x60, 0xbf, 0x1f, 0xc7, 0x8b, 0xb5, 0xc5, 0xb4, 0x73, 0xbf, 0x69, 0xe5, 0x17, 0x07,
+	0x16, 0x8e, 0x22, 0x2a, 0xa4, 0x51, 0x45, 0x7e, 0x26, 0xb7, 0xca, 0x5f, 0x5b, 0xc9, 0x7d, 0x6b,
+	0x87, 0xe1, 0x38, 0x26, 0x4c, 0xd9, 0x4f, 0xe5, 0x76, 0x16, 0x7b, 0x16, 0x17, 0x58, 0x24, 0xb9,
+	0xa1, 0x76, 0x19, 0xaa, 0xcb, 0x44, 0x38, 0x05, 0x46, 0x87, 0x7c, 0x96, 0x10, 0x2e, 0xd0, 0xab,
+	0x70, 0x5c, 0x05, 0xe5, 0x46, 0x38, 0x24, 0x55, 0x6d, 0x46, 0x9b, 0x3d, 0xea, 0x1c, 0x53, 0x93,
+	0xb7, 0x70, 0x48, 0x6a, 0xbf, 0x68, 0x60, 0x34, 0xe2, 0xb8, 0xb5, 0xdb, 0x1b, 0xe3, 0xff, 0x30,
+	0xe6, 0x25, 0x5c, 0xd0, 0x90, 0x30, 0x37, 0xf0, 0x73, 0x04, 0x50, 0x53, 0x2b, 0x3e, 0xba, 0x07,
+	0x40, 0x63, 0xc2, 0xb2, 0x6c, 0xaa, 0xfa, 0xcc, 0xc8, 0xec, 0xd8, 0xfc, 0x25, 0xb3, 0xdf, 0xde,
+	0x9a, 0x3d, 0x28, 0x6f, 0x2b, 0x18, 0x67, 0x0f, 0x22, 0x7a, 0x1d, 0x4e, 0xc4, 0x98, 0x89, 0x00,
+	0xb7, 0xdc, 0xfb, 0x38, 0x68, 0x25, 0x8c, 0x54, 0x47, 0x66, 0xb4, 0xd9, 0x23, 0xce, 0x78, 0x3e,
+	0x7d, 0x3d, 0x9b, 0xad, 0xfd, 0x5c, 0x81, 0xe9, 0xfd, 0x50, 0x07, 0x2a, 0x07, 0x7a, 0xa2, 0xc1,
+	0x09, 0x0f, 0x87, 0x31, 0x0e, 0x9a, 0x91, 0xbb, 0x95, 0xf8, 0x4d, 0x22, 0xaa, 0xfa, 0x8c, 0x36,
+	0x3b, 0x36, 0xff, 0xc1, 0x70, 0x49, 0x99, 0x57, 0x73, 0xd4, 0x45, 0x09, 0xba, 0x8a, 0x19, 0x0e,
+	0x89, 0x20, 0x8c, 0xdf, 0xf8, 0x8f, 0x33, 0xee, 0x15, 0x6c, 0xe8, 0x53, 0x18, 0x15, 0xe4, 0xa1,
+	0x70, 0xb1, 0x2f, 0x73, 0x1d, 0x9b, 0xbf, 0x3d, 0x24, 0xf7, 0x3a, 0x79, 0x28, 0x1a, 0x7e, 0x81,
+	0xf3, 0xb0, 0x90, 0x73, 0xa8, 0x05, 0xa3, 0xf9, 0xb9, 0xa8, 0xfe, 0x57, 0x72, 0xad, 0x0e, 0xc9,
+	0xf5, 0x7e, 0x86, 0x56, 0x20, 0x53, 0x14, 0xe8, 0x6b, 0x0d, 0x2a, 0x02, 0xb3, 0x26, 0x11, 0xae,
+	0x17, 0x63, 0x97, 0xc6, 0xc2, 0x0d, 0xa2, 0xea, 0xa1, 0x97, 0x52, 0xe0, 0x75, 0x89, 0x7b, 0x35,
+	0xc6, 0xb7, 0x63, 0xb1, 0x12, 0x15, 0x0b, 0x2c, 0x0a, 0x36, 0xf4, 0x8d, 0x06, 0x15, 0x0f, 0xb7,
+	0x5a, 0x34, 0x11, 0x6e, 0x5b, 0x45, 0xaa, 0x87, 0x65, 0x18, 0x1f, 0x0e, 0xbd, 0xcf, 0x12, 0x77,
+	0x49, 0xc1, 0x16, 0x02, 0x99, 0xf0, 0x3a, 0xac, 0xe8, 0x0b, 0x18, 0x4f, 0xe7, 0xf6, 0x84, 0x31,
+	0x2a, 0xc3, 0xd8, 0x78, 0x09, 0x61, 0xf4, 0x8e, 0xe1, 0xb8, 0xb7, 0xd7, 0x84, 0xbe, 0xd5, 0x00,
+	0xf1, 0x40, 0x90, 0x56, 0x10, 0x3d, 0xd8, 0x13, 0xc5, 0x11, 0x19, 0xc5, 0xdd, 0x21, 0xa3, 0x58,
+	0xcb, 0x81, 0x7b, 0x47, 0x52, 0xe1, 0x9d, 0x66, 0xf4, 0x54, 0x03, 0x14, 0xd2, 0x6d, 0xe2, 0x26,
+	0x51, 0xc2, 0x89, 0xaf, 0x8e, 0xe0, 0xd1, 0x97, 0xb2, 0x35, 0x37, 0xe9, 0x36, 0xb9, 0x23, 0x71,
+	0x7b, 0x1c, 0xc2, 0x89, 0xb0, 0xc3, 0x6a, 0xc4, 0x50, 0x2d, 0x3b, 0xb4, 0x68, 0x1d, 0xaa, 0x11,
+	0xd9, 0xc9, 0xc3, 0x73, 0x71, 0x48, 0x93, 0x48, 0xb8, 0x61, 0xe0, 0x31, 0xca, 0xa5, 0xae, 0x8c,
+	0xcd, 0x4f, 0xa9, 0x60, 0x95, 0xa6, 0x9b, 0x2b, 0x91, 0xb8, 0xf0, 0xd6, 0x06, 0x6e, 0x25, 0xc4,
+	0x99, 0x8c, 0xc8, 0x4e, 0x86, 0xd9, 0x90, 0xae, 0x37, 0xa5, 0xa7, 0xb1, 0x02, 0x13, 0x9d, 0x47,
+	0x15, 0x9d, 0x07, 0x1d, 0xfb, 0x39, 0xe6, 0x6b, 0xa5, 0x05, 0x68, 0xdf, 0x3e, 0x66, 0xc3, 0x77,
+	0x74, 0xec, 0x1b, 0x7f, 0x69, 0x50, 0xe9, 0x3a, 0x8a, 0xe8, 0x6d, 0x38, 0x82, 0x7d, 0xb7, 0xc9,
+	0x68, 0x12, 0xe7, 0x90, 0xd3, 0x5d, 0x61, 0xae, 0x09, 0x16, 0x44, 0xcd, 0x2c, 0xce, 0x51, 0xec,
+	0x2f, 0xa7, 0x8b, 0x91, 0x07, 0xf0, 0xe2, 0xda, 0x94, 0x8a, 0x38, 0x3e, 0x7f, 0xad, 0x34, 0x1a,
+	0x79, 0xdf, 0x2a, 0x25, 0xb8, 0x99, 0xfa, 0xad, 0xef, 0xc6, 0x64, 0x29, 0x4a, 0xc2, 0xae, 0x49,
+	0xe7, 0x68, 0xa8, 0x86, 0xa8, 0x01, 0xe3, 0x5e, 0xec, 0xb9, 0x5b, 0x81, 0xaf, 0x4a, 0x39, 0xd2,
+	0xbf, 0x94, 0xc7, 0xbc, 0xd8, 0x5b, 0x0c, 0xfc, 0xbc, 0x82, 0xcf, 0x35, 0xa8, 0x96, 0x09, 0x01,
+	0x5a, 0x2e, 0x88, 0xcf, 0xe0, 0xbb, 0x75, 0xa2, 0x2d, 0x1f, 0x19, 0x0b, 0x22, 0xf0, 0x4a, 0xba,
+	0xfb, 0x1d, 0x17, 0x45, 0x47, 0x1b, 0xe8, 0xfd, 0x81, 0x4f, 0x47, 0x64, 0xa7, 0xd8, 0x62, 0x85,
+	0x76, 0xf8, 0x1c, 0x8c, 0x72, 0x35, 0x41, 0xf7, 0x00, 0x75, 0x69, 0x58, 0x9a, 0x4e, 0x7a, 0x03,
+	0x5b, 0xa5, 0x5b, 0x93, 0xbd, 0x9d, 0x94, 0x4a, 0x5d, 0x27, 0xc4, 0x5f, 0x11, 0x24, 0x74, 0x2a,
+	0x9d, 0xc2, 0xc4, 0x8d, 0x18, 0x4e, 0x95, 0x88, 0x08, 0xba, 0x93, 0x5e, 0x92, 0x7b, 0x45, 0x4b,
+	0xf1, 0xbe, 0x31, 0x08, 0x6f, 0x9b, 0x74, 0xbc, 0xa0, 0x44, 0xdc, 0xf8, 0x52, 0x83, 0xa9, 0x7d,
+	0x14, 0x03, 0x61, 0x38, 0xd9, 0xad, 0x54, 0x8a, 0xfa, 0xcd, 0x7e, 0xd4, 0x0a, 0xb9, 0x4d, 0x8f,
+	0xba, 0xe4, 0x87, 0x1b, 0x2d, 0x30, 0xca, 0x55, 0x02, 0xdd, 0x82, 0xc9, 0x7c, 0xab, 0xb3, 0x3d,
+	0x76, 0x05, 0x75, 0x53, 0xd9, 0x18, 0xa4, 0x89, 0x50, 0xe6, 0x99, 0x6d, 0xed, 0x3a, 0x4d, 0x59,
+	0x16, 0x11, 0x4c, 0xe0, 0x54, 0xb0, 0xdc, 0xb8, 0xcd, 0x51, 0xfb, 0x51, 0x83, 0xa9, 0x9e, 0x0f,
+	0x32, 0x1e, 0xd3, 0x88, 0x13, 0x74, 0x07, 0x46, 0x19, 0xe1, 0x49, 0x4b, 0xa8, 0xc4, 0x2f, 0x1e,
+	0x48, 0x15, 0x1d, 0x89, 0xe1, 0x28, 0x2c, 0x74, 0x1d, 0x26, 0x3b, 0xde, 0x59, 0x2e, 0x61, 0x8c,
+	0xb2, 0xbc, 0x8d, 0x91, 0x22, 0x61, 0xb1, 0x67, 0xae, 0xc9, 0x17, 0xa8, 0x73, 0xb2, 0xf8, 0x02,
+	0x5b, 0x4a, 0x97, 0xd7, 0xae, 0xc0, 0xff, 0x4a, 0xd9, 0x06, 0x7b, 0x91, 0xfe, 0xa0, 0xc3, 0xf4,
+	0xb5, 0x80, 0x87, 0x01, 0xe7, 0x07, 0x7c, 0x93, 0x3e, 0x2e, 0xbc, 0x49, 0x47, 0x64, 0x95, 0x3e,
+	0xee, 0x5f, 0xa5, 0xfd, 0x48, 0x7b, 0x1b, 0x07, 0x7e, 0xb2, 0xea, 0xbd, 0x9e, 0xac, 0xc6, 0x12,
+	0x9c, 0xd9, 0x1f, 0x76, 0xb0, 0x82, 0x3d, 0xd3, 0xe1, 0x74, 0x49, 0xec, 0x79, 0xcf, 0x24, 0x9d,
+	0x3d, 0xf3, 0xd1, 0x81, 0xab, 0x91, 0x21, 0x96, 0x5a, 0xff, 0x8d, 0x9e, 0x32, 0x16, 0x61, 0x6a,
+	0x1f, 0xbe, 0x81, 0x8a, 0x34, 0xff, 0xf4, 0x10, 0x4c, 0x16, 0xbd, 0xd7, 0xb2, 0x4c, 0xd1, 0x4f,
+	0x1a, 0x54, 0xba, 0xbe, 0xa1, 0x90, 0xdd, 0xbf, 0x42, 0x65, 0x1f, 0x5e, 0x46, 0x7d, 0x80, 0x6b,
+	0xba, 0xe8, 0x59, 0x7b, 0xf7, 0xc9, 0x6f, 0x7f, 0x7c, 0xa7, 0x9f, 0x43, 0xf5, 0xf4, 0x53, 0xf2,
+	0x51, 0x21, 0x9d, 0x05, 0xd5, 0xd9, 0xdc, 0x9a, 0xeb, 0xf8, 0xb6, 0xe4, 0xd6, 0xdc, 0x63, 0xf4,
+	0xab, 0x06, 0x27, 0x7b, 0x1c, 0x39, 0xf4, 0xde, 0x01, 0x75, 0x21, 0xcb, 0x61, 0xe1, 0xa0, 0xaa,
+	0x22, 0xfb, 0xa3, 0x76, 0x49, 0xe6, 0xf3, 0x4e, 0xed, 0x9c, 0xfc, 0x5e, 0x6f, 0x27, 0xf0, 0x68,
+	0xcf, 0xc1, 0x5d, 0x98, 0x7b, 0xdc, 0x99, 0x8e, 0x2d, 0xd5, 0xd0, 0xd6, 0xe6, 0xd0, 0xef, 0x1a,
+	0x4c, 0xf6, 0xdc, 0x73, 0x74, 0x69, 0xb8, 0x83, 0x6c, 0x5c, 0x1e, 0xb2, 0xf5, 0x6b, 0x57, 0x64,
+	0x6a, 0x76, 0xed, 0xfc, 0x3f, 0x4b, 0xcd, 0xcf, 0x40, 0x6d, 0x6d, 0x6e, 0xf1, 0x2b, 0x1d, 0xce,
+	0x7a, 0x34, 0xec, 0x1b, 0xc8, 0xa2, 0xd1, 0xb3, 0x63, 0x57, 0xd3, 0xdb, 0x65, 0x55, 0xbb, 0x7b,
+	0x23, 0xf7, 0x6f, 0xd2, 0x16, 0x8e, 0x9a, 0x26, 0x65, 0x4d, 0xab, 0x49, 0x22, 0x79, 0xf7, 0xa8,
+	0xbf, 0x26, 0xe2, 0x80, 0x97, 0xff, 0x3f, 0x73, 0x51, 0x0d, 0x9e, 0xe9, 0x23, 0xcb, 0x8d, 0xc6,
+	0xf7, 0xfa, 0xcc, 0x72, 0x06, 0xd8, 0xf0, 0xb9, 0x99, 0x0d, 0xd3, 0xd1, 0x46, 0xdd, 0xcc, 0x89,
+	0xf9, 0x73, 0xb5, 0x64, 0xb3, 0xe1, 0xf3, 0xcd, 0xf6, 0x92, 0xcd, 0x8d, 0xfa, 0xa6, 0x5a, 0xf2,
+	0xa7, 0x7e, 0x36, 0x9b, 0xb7, 0xed, 0x86, 0xcf, 0x6d, 0xbb, 0xbd, 0xc8, 0xb6, 0x37, 0xea, 0xb6,
+	0xad, 0x96, 0x6d, 0x1d, 0x96, 0x71, 0x9e, 0xfb, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x73, 0x91,
+	0x69, 0x46, 0x12, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1333,95 +1268,3 @@ var _RecommendationService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/recommendation_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/recommendation_service.proto", fileDescriptor_recommendation_service_6b12c247ec5a1022)
-}
-
-var fileDescriptor_recommendation_service_6b12c247ec5a1022 = []byte{
-	// 1333 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xc1, 0x73, 0x14, 0x45,
-	0x17, 0xff, 0x66, 0xf2, 0x41, 0xe0, 0x05, 0x42, 0xb6, 0xa9, 0x14, 0xfb, 0x4d, 0x02, 0x5f, 0x5c,
-	0xb1, 0x4c, 0xa5, 0xac, 0x19, 0x37, 0x08, 0xea, 0x60, 0x80, 0x0d, 0x84, 0x90, 0xb2, 0x80, 0xd4,
-	0x24, 0xc4, 0x12, 0x23, 0x53, 0x9d, 0x99, 0x66, 0x1d, 0xd9, 0x99, 0x1e, 0xbb, 0x7b, 0x12, 0x52,
-	0x48, 0xa9, 0x94, 0x07, 0x29, 0x8f, 0xfe, 0x07, 0x1c, 0x3d, 0xf8, 0x17, 0xe8, 0x51, 0x0f, 0x1c,
-	0xf5, 0xe6, 0xd9, 0x93, 0x67, 0xff, 0x00, 0x6b, 0x7a, 0xa6, 0x97, 0xcc, 0xee, 0x4e, 0x76, 0xcd,
-	0xe2, 0xad, 0xb7, 0x5f, 0xbf, 0xdf, 0xef, 0xbd, 0xd7, 0xaf, 0x7f, 0xdd, 0xb3, 0xb0, 0xd0, 0xa4,
-	0xb4, 0xd9, 0x22, 0x16, 0xf6, 0xb9, 0x95, 0x0d, 0xd3, 0xd1, 0x76, 0xdd, 0xe2, 0x84, 0x6d, 0x07,
-	0x1e, 0xe1, 0x16, 0x23, 0x1e, 0x0d, 0x43, 0x12, 0xf9, 0x58, 0x04, 0x34, 0x72, 0xf3, 0x79, 0x33,
-	0x66, 0x54, 0x50, 0x34, 0x93, 0xf9, 0x98, 0xd8, 0xe7, 0x66, 0xdb, 0xdd, 0xdc, 0xae, 0x9b, 0xca,
-	0xdd, 0xb0, 0xca, 0x08, 0x52, 0x54, 0x1a, 0x59, 0xe4, 0xa1, 0x20, 0x11, 0x0f, 0x68, 0xc4, 0x33,
-	0x48, 0xe3, 0x42, 0x99, 0x03, 0x89, 0x92, 0x90, 0x5b, 0x0f, 0xc8, 0xee, 0x0e, 0x65, 0xbe, 0x1b,
-	0x62, 0xe1, 0x7d, 0xe2, 0x8a, 0xdd, 0x38, 0x0f, 0xc5, 0x98, 0x2b, 0xf3, 0x63, 0x84, 0xd3, 0x84,
-	0xa5, 0xa9, 0x60, 0xbf, 0x1f, 0xc7, 0x8b, 0xb5, 0xc5, 0xb4, 0x73, 0xbf, 0x69, 0xe5, 0x17, 0x07,
-	0x16, 0x8e, 0x22, 0x2a, 0xa4, 0x51, 0x45, 0x7e, 0x26, 0xb7, 0xca, 0x5f, 0x5b, 0xc9, 0x7d, 0x6b,
-	0x87, 0xe1, 0x38, 0x26, 0x4c, 0xd9, 0x4f, 0xe5, 0x76, 0x16, 0x7b, 0x16, 0x17, 0x58, 0x24, 0xb9,
-	0xa1, 0x76, 0x19, 0xaa, 0xcb, 0x44, 0x38, 0x05, 0x46, 0x87, 0x7c, 0x96, 0x10, 0x2e, 0xd0, 0xab,
-	0x70, 0x5c, 0x05, 0xe5, 0x46, 0x38, 0x24, 0x55, 0x6d, 0x46, 0x9b, 0x3d, 0xea, 0x1c, 0x53, 0x93,
-	0xb7, 0x70, 0x48, 0x6a, 0xbf, 0x68, 0x60, 0x34, 0xe2, 0xb8, 0xb5, 0xdb, 0x1b, 0xe3, 0xff, 0x30,
-	0xe6, 0x25, 0x5c, 0xd0, 0x90, 0x30, 0x37, 0xf0, 0x73, 0x04, 0x50, 0x53, 0x2b, 0x3e, 0xba, 0x07,
-	0x40, 0x63, 0xc2, 0xb2, 0x6c, 0xaa, 0xfa, 0xcc, 0xc8, 0xec, 0xd8, 0xfc, 0x25, 0xb3, 0xdf, 0xde,
-	0x9a, 0x3d, 0x28, 0x6f, 0x2b, 0x18, 0x67, 0x0f, 0x22, 0x7a, 0x1d, 0x4e, 0xc4, 0x98, 0x89, 0x00,
-	0xb7, 0xdc, 0xfb, 0x38, 0x68, 0x25, 0x8c, 0x54, 0x47, 0x66, 0xb4, 0xd9, 0x23, 0xce, 0x78, 0x3e,
-	0x7d, 0x3d, 0x9b, 0xad, 0xfd, 0x5c, 0x81, 0xe9, 0xfd, 0x50, 0x07, 0x2a, 0x07, 0x7a, 0xa2, 0xc1,
-	0x09, 0x0f, 0x87, 0x31, 0x0e, 0x9a, 0x91, 0xbb, 0x95, 0xf8, 0x4d, 0x22, 0xaa, 0xfa, 0x8c, 0x36,
-	0x3b, 0x36, 0xff, 0xc1, 0x70, 0x49, 0x99, 0x57, 0x73, 0xd4, 0x45, 0x09, 0xba, 0x8a, 0x19, 0x0e,
-	0x89, 0x20, 0x8c, 0xdf, 0xf8, 0x8f, 0x33, 0xee, 0x15, 0x6c, 0xe8, 0x53, 0x18, 0x15, 0xe4, 0xa1,
-	0x70, 0xb1, 0x2f, 0x73, 0x1d, 0x9b, 0xbf, 0x3d, 0x24, 0xf7, 0x3a, 0x79, 0x28, 0x1a, 0x7e, 0x81,
-	0xf3, 0xb0, 0x90, 0x73, 0xa8, 0x05, 0xa3, 0xf9, 0xb9, 0xa8, 0xfe, 0x57, 0x72, 0xad, 0x0e, 0xc9,
-	0xf5, 0x7e, 0x86, 0x56, 0x20, 0x53, 0x14, 0xe8, 0x6b, 0x0d, 0x2a, 0x02, 0xb3, 0x26, 0x11, 0xae,
-	0x17, 0x63, 0x97, 0xc6, 0xc2, 0x0d, 0xa2, 0xea, 0xa1, 0x97, 0x52, 0xe0, 0x75, 0x89, 0x7b, 0x35,
-	0xc6, 0xb7, 0x63, 0xb1, 0x12, 0x15, 0x0b, 0x2c, 0x0a, 0x36, 0xf4, 0x8d, 0x06, 0x15, 0x0f, 0xb7,
-	0x5a, 0x34, 0x11, 0x6e, 0x5b, 0x45, 0xaa, 0x87, 0x65, 0x18, 0x1f, 0x0e, 0xbd, 0xcf, 0x12, 0x77,
-	0x49, 0xc1, 0x16, 0x02, 0x99, 0xf0, 0x3a, 0xac, 0xe8, 0x0b, 0x18, 0x4f, 0xe7, 0xf6, 0x84, 0x31,
-	0x2a, 0xc3, 0xd8, 0x78, 0x09, 0x61, 0xf4, 0x8e, 0xe1, 0xb8, 0xb7, 0xd7, 0x84, 0xbe, 0xd5, 0x00,
-	0xf1, 0x40, 0x90, 0x56, 0x10, 0x3d, 0xd8, 0x13, 0xc5, 0x11, 0x19, 0xc5, 0xdd, 0x21, 0xa3, 0x58,
-	0xcb, 0x81, 0x7b, 0x47, 0x52, 0xe1, 0x9d, 0x66, 0xf4, 0x54, 0x03, 0x14, 0xd2, 0x6d, 0xe2, 0x26,
-	0x51, 0xc2, 0x89, 0xaf, 0x8e, 0xe0, 0xd1, 0x97, 0xb2, 0x35, 0x37, 0xe9, 0x36, 0xb9, 0x23, 0x71,
-	0x7b, 0x1c, 0xc2, 0x89, 0xb0, 0xc3, 0x6a, 0xc4, 0x50, 0x2d, 0x3b, 0xb4, 0x68, 0x1d, 0xaa, 0x11,
-	0xd9, 0xc9, 0xc3, 0x73, 0x71, 0x48, 0x93, 0x48, 0xb8, 0x61, 0xe0, 0x31, 0xca, 0xa5, 0xae, 0x8c,
-	0xcd, 0x4f, 0xa9, 0x60, 0x95, 0xa6, 0x9b, 0x2b, 0x91, 0xb8, 0xf0, 0xd6, 0x06, 0x6e, 0x25, 0xc4,
-	0x99, 0x8c, 0xc8, 0x4e, 0x86, 0xd9, 0x90, 0xae, 0x37, 0xa5, 0xa7, 0xb1, 0x02, 0x13, 0x9d, 0x47,
-	0x15, 0x9d, 0x07, 0x1d, 0xfb, 0x39, 0xe6, 0x6b, 0xa5, 0x05, 0x68, 0xdf, 0x3e, 0x66, 0xc3, 0x77,
-	0x74, 0xec, 0x1b, 0x7f, 0x69, 0x50, 0xe9, 0x3a, 0x8a, 0xe8, 0x6d, 0x38, 0x82, 0x7d, 0xb7, 0xc9,
-	0x68, 0x12, 0xe7, 0x90, 0xd3, 0x5d, 0x61, 0xae, 0x09, 0x16, 0x44, 0xcd, 0x2c, 0xce, 0x51, 0xec,
-	0x2f, 0xa7, 0x8b, 0x91, 0x07, 0xf0, 0xe2, 0xda, 0x94, 0x8a, 0x38, 0x3e, 0x7f, 0xad, 0x34, 0x1a,
-	0x79, 0xdf, 0x2a, 0x25, 0xb8, 0x99, 0xfa, 0xad, 0xef, 0xc6, 0x64, 0x29, 0x4a, 0xc2, 0xae, 0x49,
-	0xe7, 0x68, 0xa8, 0x86, 0xa8, 0x01, 0xe3, 0x5e, 0xec, 0xb9, 0x5b, 0x81, 0xaf, 0x4a, 0x39, 0xd2,
-	0xbf, 0x94, 0xc7, 0xbc, 0xd8, 0x5b, 0x0c, 0xfc, 0xbc, 0x82, 0xcf, 0x35, 0xa8, 0x96, 0x09, 0x01,
-	0x5a, 0x2e, 0x88, 0xcf, 0xe0, 0xbb, 0x75, 0xa2, 0x2d, 0x1f, 0x19, 0x0b, 0x22, 0xf0, 0x4a, 0xba,
-	0xfb, 0x1d, 0x17, 0x45, 0x47, 0x1b, 0xe8, 0xfd, 0x81, 0x4f, 0x47, 0x64, 0xa7, 0xd8, 0x62, 0x85,
-	0x76, 0xf8, 0x1c, 0x8c, 0x72, 0x35, 0x41, 0xf7, 0x00, 0x75, 0x69, 0x58, 0x9a, 0x4e, 0x7a, 0x03,
-	0x5b, 0xa5, 0x5b, 0x93, 0xbd, 0x9d, 0x94, 0x4a, 0x5d, 0x27, 0xc4, 0x5f, 0x11, 0x24, 0x74, 0x2a,
-	0x9d, 0xc2, 0xc4, 0x8d, 0x18, 0x4e, 0x95, 0x88, 0x08, 0xba, 0x93, 0x5e, 0x92, 0x7b, 0x45, 0x4b,
-	0xf1, 0xbe, 0x31, 0x08, 0x6f, 0x9b, 0x74, 0xbc, 0xa0, 0x44, 0xdc, 0xf8, 0x52, 0x83, 0xa9, 0x7d,
-	0x14, 0x03, 0x61, 0x38, 0xd9, 0xad, 0x54, 0x8a, 0xfa, 0xcd, 0x7e, 0xd4, 0x0a, 0xb9, 0x4d, 0x8f,
-	0xba, 0xe4, 0x87, 0x1b, 0x2d, 0x30, 0xca, 0x55, 0x02, 0xdd, 0x82, 0xc9, 0x7c, 0xab, 0xb3, 0x3d,
-	0x76, 0x05, 0x75, 0x53, 0xd9, 0x18, 0xa4, 0x89, 0x50, 0xe6, 0x99, 0x6d, 0xed, 0x3a, 0x4d, 0x59,
-	0x16, 0x11, 0x4c, 0xe0, 0x54, 0xb0, 0xdc, 0xb8, 0xcd, 0x51, 0xfb, 0x51, 0x83, 0xa9, 0x9e, 0x0f,
-	0x32, 0x1e, 0xd3, 0x88, 0x13, 0x74, 0x07, 0x46, 0x19, 0xe1, 0x49, 0x4b, 0xa8, 0xc4, 0x2f, 0x1e,
-	0x48, 0x15, 0x1d, 0x89, 0xe1, 0x28, 0x2c, 0x74, 0x1d, 0x26, 0x3b, 0xde, 0x59, 0x2e, 0x61, 0x8c,
-	0xb2, 0xbc, 0x8d, 0x91, 0x22, 0x61, 0xb1, 0x67, 0xae, 0xc9, 0x17, 0xa8, 0x73, 0xb2, 0xf8, 0x02,
-	0x5b, 0x4a, 0x97, 0xd7, 0xae, 0xc0, 0xff, 0x4a, 0xd9, 0x06, 0x7b, 0x91, 0xfe, 0xa0, 0xc3, 0xf4,
-	0xb5, 0x80, 0x87, 0x01, 0xe7, 0x07, 0x7c, 0x93, 0x3e, 0x2e, 0xbc, 0x49, 0x47, 0x64, 0x95, 0x3e,
-	0xee, 0x5f, 0xa5, 0xfd, 0x48, 0x7b, 0x1b, 0x07, 0x7e, 0xb2, 0xea, 0xbd, 0x9e, 0xac, 0xc6, 0x12,
-	0x9c, 0xd9, 0x1f, 0x76, 0xb0, 0x82, 0x3d, 0xd3, 0xe1, 0x74, 0x49, 0xec, 0x79, 0xcf, 0x24, 0x9d,
-	0x3d, 0xf3, 0xd1, 0x81, 0xab, 0x91, 0x21, 0x96, 0x5a, 0xff, 0x8d, 0x9e, 0x32, 0x16, 0x61, 0x6a,
-	0x1f, 0xbe, 0x81, 0x8a, 0x34, 0xff, 0xf4, 0x10, 0x4c, 0x16, 0xbd, 0xd7, 0xb2, 0x4c, 0xd1, 0x4f,
-	0x1a, 0x54, 0xba, 0xbe, 0xa1, 0x90, 0xdd, 0xbf, 0x42, 0x65, 0x1f, 0x5e, 0x46, 0x7d, 0x80, 0x6b,
-	0xba, 0xe8, 0x59, 0x7b, 0xf7, 0xc9, 0x6f, 0x7f, 0x7c, 0xa7, 0x9f, 0x43, 0xf5, 0xf4, 0x53, 0xf2,
-	0x51, 0x21, 0x9d, 0x05, 0xd5, 0xd9, 0xdc, 0x9a, 0xeb, 0xf8, 0xb6, 0xe4, 0xd6, 0xdc, 0x63, 0xf4,
-	0xab, 0x06, 0x27, 0x7b, 0x1c, 0x39, 0xf4, 0xde, 0x01, 0x75, 0x21, 0xcb, 0x61, 0xe1, 0xa0, 0xaa,
-	0x22, 0xfb, 0xa3, 0x76, 0x49, 0xe6, 0xf3, 0x4e, 0xed, 0x9c, 0xfc, 0x5e, 0x6f, 0x27, 0xf0, 0x68,
-	0xcf, 0xc1, 0x5d, 0x98, 0x7b, 0xdc, 0x99, 0x8e, 0x2d, 0xd5, 0xd0, 0xd6, 0xe6, 0xd0, 0xef, 0x1a,
-	0x4c, 0xf6, 0xdc, 0x73, 0x74, 0x69, 0xb8, 0x83, 0x6c, 0x5c, 0x1e, 0xb2, 0xf5, 0x6b, 0x57, 0x64,
-	0x6a, 0x76, 0xed, 0xfc, 0x3f, 0x4b, 0xcd, 0xcf, 0x40, 0x6d, 0x6d, 0x6e, 0xf1, 0x2b, 0x1d, 0xce,
-	0x7a, 0x34, 0xec, 0x1b, 0xc8, 0xa2, 0xd1, 0xb3, 0x63, 0x57, 0xd3, 0xdb, 0x65, 0x55, 0xbb, 0x7b,
-	0x23, 0xf7, 0x6f, 0xd2, 0x16, 0x8e, 0x9a, 0x26, 0x65, 0x4d, 0xab, 0x49, 0x22, 0x79, 0xf7, 0xa8,
-	0xbf, 0x26, 0xe2, 0x80, 0x97, 0xff, 0x3f, 0x73, 0x51, 0x0d, 0x9e, 0xe9, 0x23, 0xcb, 0x8d, 0xc6,
-	0xf7, 0xfa, 0xcc, 0x72, 0x06, 0xd8, 0xf0, 0xb9, 0x99, 0x0d, 0xd3, 0xd1, 0x46, 0xdd, 0xcc, 0x89,
-	0xf9, 0x73, 0xb5, 0x64, 0xb3, 0xe1, 0xf3, 0xcd, 0xf6, 0x92, 0xcd, 0x8d, 0xfa, 0xa6, 0x5a, 0xf2,
-	0xa7, 0x7e, 0x36, 0x9b, 0xb7, 0xed, 0x86, 0xcf, 0x6d, 0xbb, 0xbd, 0xc8, 0xb6, 0x37, 0xea, 0xb6,
-	0xad, 0x96, 0x6d, 0x1d, 0x96, 0x71, 0x9e, 0xfb, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x73, 0x91,
-	0x69, 0x46, 0x12, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/remarketing_action_service.pb.go b/googleapis/ads/googleads/v1/services/remarketing_action_service.pb.go
index 1ecdcda646..e2fbc12cdb 100644
--- a/googleapis/ads/googleads/v1/services/remarketing_action_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/remarketing_action_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/remarketing_action_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [RemarketingActionService.GetRemarketingAction][google.ads.googleads.v1.services.RemarketingActionService.GetRemarketingAction].
 type GetRemarketingActionRequest struct {
@@ -41,16 +41,17 @@ func (m *GetRemarketingActionRequest) Reset()         { *m = GetRemarketingActio
 func (m *GetRemarketingActionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetRemarketingActionRequest) ProtoMessage()    {}
 func (*GetRemarketingActionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remarketing_action_service_3bbcd94af93bf94e, []int{0}
+	return fileDescriptor_36f723f421bc30e8, []int{0}
 }
+
 func (m *GetRemarketingActionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetRemarketingActionRequest.Unmarshal(m, b)
 }
 func (m *GetRemarketingActionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetRemarketingActionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetRemarketingActionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetRemarketingActionRequest.Merge(dst, src)
+func (m *GetRemarketingActionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetRemarketingActionRequest.Merge(m, src)
 }
 func (m *GetRemarketingActionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetRemarketingActionRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateRemarketingActionsRequest) Reset()         { *m = MutateRemarketi
 func (m *MutateRemarketingActionsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateRemarketingActionsRequest) ProtoMessage()    {}
 func (*MutateRemarketingActionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remarketing_action_service_3bbcd94af93bf94e, []int{1}
+	return fileDescriptor_36f723f421bc30e8, []int{1}
 }
+
 func (m *MutateRemarketingActionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRemarketingActionsRequest.Unmarshal(m, b)
 }
 func (m *MutateRemarketingActionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRemarketingActionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateRemarketingActionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRemarketingActionsRequest.Merge(dst, src)
+func (m *MutateRemarketingActionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRemarketingActionsRequest.Merge(m, src)
 }
 func (m *MutateRemarketingActionsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateRemarketingActionsRequest.Size(m)
@@ -158,16 +160,17 @@ func (m *RemarketingActionOperation) Reset()         { *m = RemarketingActionOpe
 func (m *RemarketingActionOperation) String() string { return proto.CompactTextString(m) }
 func (*RemarketingActionOperation) ProtoMessage()    {}
 func (*RemarketingActionOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remarketing_action_service_3bbcd94af93bf94e, []int{2}
+	return fileDescriptor_36f723f421bc30e8, []int{2}
 }
+
 func (m *RemarketingActionOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemarketingActionOperation.Unmarshal(m, b)
 }
 func (m *RemarketingActionOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemarketingActionOperation.Marshal(b, m, deterministic)
 }
-func (dst *RemarketingActionOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemarketingActionOperation.Merge(dst, src)
+func (m *RemarketingActionOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemarketingActionOperation.Merge(m, src)
 }
 func (m *RemarketingActionOperation) XXX_Size() int {
 	return xxx_messageInfo_RemarketingActionOperation.Size(m)
@@ -222,80 +225,14 @@ func (m *RemarketingActionOperation) GetUpdate() *resources.RemarketingAction {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RemarketingActionOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RemarketingActionOperation_OneofMarshaler, _RemarketingActionOperation_OneofUnmarshaler, _RemarketingActionOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RemarketingActionOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RemarketingActionOperation_Create)(nil),
 		(*RemarketingActionOperation_Update)(nil),
 	}
 }
 
-func _RemarketingActionOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RemarketingActionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *RemarketingActionOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *RemarketingActionOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RemarketingActionOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RemarketingActionOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RemarketingActionOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.RemarketingAction)
-		err := b.DecodeMessage(msg)
-		m.Operation = &RemarketingActionOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.RemarketingAction)
-		err := b.DecodeMessage(msg)
-		m.Operation = &RemarketingActionOperation_Update{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RemarketingActionOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RemarketingActionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *RemarketingActionOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RemarketingActionOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for remarketing action mutate.
 type MutateRemarketingActionsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -314,16 +251,17 @@ func (m *MutateRemarketingActionsResponse) Reset()         { *m = MutateRemarket
 func (m *MutateRemarketingActionsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateRemarketingActionsResponse) ProtoMessage()    {}
 func (*MutateRemarketingActionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remarketing_action_service_3bbcd94af93bf94e, []int{3}
+	return fileDescriptor_36f723f421bc30e8, []int{3}
 }
+
 func (m *MutateRemarketingActionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRemarketingActionsResponse.Unmarshal(m, b)
 }
 func (m *MutateRemarketingActionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRemarketingActionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateRemarketingActionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRemarketingActionsResponse.Merge(dst, src)
+func (m *MutateRemarketingActionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRemarketingActionsResponse.Merge(m, src)
 }
 func (m *MutateRemarketingActionsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateRemarketingActionsResponse.Size(m)
@@ -361,16 +299,17 @@ func (m *MutateRemarketingActionResult) Reset()         { *m = MutateRemarketing
 func (m *MutateRemarketingActionResult) String() string { return proto.CompactTextString(m) }
 func (*MutateRemarketingActionResult) ProtoMessage()    {}
 func (*MutateRemarketingActionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remarketing_action_service_3bbcd94af93bf94e, []int{4}
+	return fileDescriptor_36f723f421bc30e8, []int{4}
 }
+
 func (m *MutateRemarketingActionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRemarketingActionResult.Unmarshal(m, b)
 }
 func (m *MutateRemarketingActionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRemarketingActionResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateRemarketingActionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRemarketingActionResult.Merge(dst, src)
+func (m *MutateRemarketingActionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRemarketingActionResult.Merge(m, src)
 }
 func (m *MutateRemarketingActionResult) XXX_Size() int {
 	return xxx_messageInfo_MutateRemarketingActionResult.Size(m)
@@ -396,6 +335,59 @@ func init() {
 	proto.RegisterType((*MutateRemarketingActionResult)(nil), "google.ads.googleads.v1.services.MutateRemarketingActionResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/remarketing_action_service.proto", fileDescriptor_36f723f421bc30e8)
+}
+
+var fileDescriptor_36f723f421bc30e8 = []byte{
+	// 705 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcf, 0x6a, 0xd4, 0x40,
+	0x1c, 0xc7, 0x4d, 0x56, 0xaa, 0x9d, 0x54, 0x85, 0x51, 0x31, 0xac, 0xd6, 0x2e, 0xb1, 0x60, 0xd9,
+	0x43, 0xc2, 0xae, 0x45, 0x21, 0x6d, 0x91, 0x2c, 0xda, 0xd6, 0x43, 0xff, 0x90, 0x42, 0x41, 0x59,
+	0x08, 0xd3, 0x64, 0x1a, 0x42, 0x93, 0x4c, 0x9c, 0x99, 0xac, 0x94, 0xd2, 0x8b, 0x88, 0x2f, 0xe0,
+	0x1b, 0x78, 0xf4, 0x3d, 0x3c, 0xe8, 0xc1, 0x8b, 0xaf, 0xa0, 0x17, 0x0f, 0x3e, 0x83, 0x24, 0x93,
+	0xd9, 0xfe, 0xd9, 0xa6, 0x2b, 0xed, 0x6d, 0xf6, 0x37, 0xdf, 0xfd, 0xfc, 0xfe, 0x7c, 0x67, 0x26,
+	0xc0, 0x09, 0x09, 0x09, 0x63, 0x6c, 0xa1, 0x80, 0x59, 0x62, 0x59, 0xac, 0x06, 0x1d, 0x8b, 0x61,
+	0x3a, 0x88, 0x7c, 0xcc, 0x2c, 0x8a, 0x13, 0x44, 0xf7, 0x30, 0x8f, 0xd2, 0xd0, 0x43, 0x3e, 0x8f,
+	0x48, 0xea, 0x55, 0x7b, 0x66, 0x46, 0x09, 0x27, 0xb0, 0x25, 0xfe, 0x67, 0xa2, 0x80, 0x99, 0x43,
+	0x84, 0x39, 0xe8, 0x98, 0x12, 0xd1, 0xb4, 0xeb, 0x92, 0x50, 0xcc, 0x48, 0x4e, 0xcf, 0xce, 0x22,
+	0xe8, 0xcd, 0x07, 0xf2, 0xbf, 0x59, 0x64, 0xa1, 0x34, 0x25, 0x1c, 0x15, 0x9b, 0xac, 0xda, 0xad,
+	0x72, 0x5b, 0xe5, 0xaf, 0x9d, 0x7c, 0xd7, 0xda, 0x8d, 0x70, 0x1c, 0x78, 0x09, 0x62, 0x7b, 0x95,
+	0xe2, 0xe1, 0x69, 0xc5, 0x3b, 0x8a, 0xb2, 0x0c, 0x53, 0x49, 0xb8, 0x57, 0xed, 0xd3, 0xcc, 0xb7,
+	0x18, 0x47, 0x3c, 0xaf, 0x36, 0x8c, 0x1e, 0xb8, 0xbf, 0x82, 0xb9, 0x7b, 0x54, 0x97, 0x53, 0x96,
+	0xe5, 0xe2, 0xb7, 0x39, 0x66, 0x1c, 0x3e, 0x02, 0x37, 0x64, 0xf5, 0x5e, 0x8a, 0x12, 0xac, 0x2b,
+	0x2d, 0x65, 0x6e, 0xd2, 0x9d, 0x92, 0xc1, 0x75, 0x94, 0x60, 0xe3, 0xaf, 0x02, 0x66, 0xd6, 0x72,
+	0x8e, 0x38, 0x1e, 0xe1, 0x30, 0x09, 0x9a, 0x01, 0x9a, 0x9f, 0x33, 0x4e, 0x12, 0x4c, 0xbd, 0x28,
+	0xa8, 0x30, 0x40, 0x86, 0x5e, 0x05, 0xb0, 0x0f, 0x00, 0xc9, 0x30, 0x15, 0x7d, 0xeb, 0x6a, 0xab,
+	0x31, 0xa7, 0x75, 0x17, 0xcd, 0x71, 0x43, 0x37, 0x47, 0x32, 0x6e, 0x48, 0x88, 0x7b, 0x8c, 0x07,
+	0x1f, 0x83, 0x5b, 0x19, 0xa2, 0x3c, 0x42, 0xb1, 0xb7, 0x8b, 0xa2, 0x38, 0xa7, 0x58, 0x6f, 0xb4,
+	0x94, 0xb9, 0xeb, 0xee, 0xcd, 0x2a, 0xbc, 0x2c, 0xa2, 0x45, 0xc3, 0x03, 0x14, 0x47, 0x01, 0xe2,
+	0xd8, 0x23, 0x69, 0xbc, 0xaf, 0x5f, 0x2d, 0x65, 0x53, 0x32, 0xb8, 0x91, 0xc6, 0xfb, 0xc6, 0x47,
+	0x15, 0x34, 0xeb, 0x13, 0xc3, 0x05, 0xa0, 0xe5, 0x59, 0x49, 0x28, 0x1c, 0x2a, 0x09, 0x5a, 0xb7,
+	0x29, 0x7b, 0x91, 0x16, 0x99, 0xcb, 0x85, 0x89, 0x6b, 0x88, 0xed, 0xb9, 0x40, 0xc8, 0x8b, 0x35,
+	0x5c, 0x07, 0x13, 0x3e, 0xc5, 0x88, 0x8b, 0x51, 0x6b, 0xdd, 0xf9, 0xda, 0x19, 0x0c, 0x8f, 0xd5,
+	0xe8, 0x10, 0x56, 0xaf, 0xb8, 0x15, 0xa5, 0xe0, 0x09, 0xba, 0xae, 0x5e, 0x8e, 0x27, 0x28, 0x3d,
+	0x0d, 0x4c, 0x0e, 0xe7, 0x6a, 0x7c, 0x55, 0x40, 0xab, 0xde, 0x79, 0x96, 0x91, 0x94, 0x61, 0xb8,
+	0x0c, 0xee, 0x9e, 0x9a, 0xbd, 0x87, 0x29, 0x25, 0xb4, 0x74, 0x40, 0xeb, 0x42, 0x59, 0x10, 0xcd,
+	0x7c, 0x73, 0xab, 0x3c, 0x9b, 0xee, 0xed, 0x93, 0xae, 0xbc, 0x2c, 0xe4, 0xf0, 0x35, 0xb8, 0x46,
+	0x31, 0xcb, 0x63, 0x2e, 0x8f, 0xc7, 0xf3, 0xf1, 0xc7, 0xa3, 0xa6, 0x38, 0xb7, 0xe4, 0xb8, 0x92,
+	0x67, 0xbc, 0x00, 0xd3, 0xe7, 0x2a, 0xff, 0xeb, 0x1e, 0x74, 0x7f, 0x34, 0x80, 0x3e, 0x02, 0xd8,
+	0x12, 0xa5, 0xc0, 0x6f, 0x0a, 0xb8, 0x73, 0xd6, 0x4d, 0x83, 0x4b, 0xe3, 0xbb, 0x38, 0xe7, 0x86,
+	0x36, 0x2f, 0xe4, 0xa7, 0xb1, 0xf8, 0xfe, 0xe7, 0xaf, 0x4f, 0xea, 0x53, 0x38, 0x5f, 0xbc, 0x4f,
+	0x07, 0x27, 0x5a, 0x5b, 0x92, 0x97, 0x92, 0x59, 0xed, 0xe3, 0x0f, 0x56, 0x65, 0xab, 0xd5, 0x3e,
+	0x84, 0xbf, 0x15, 0xa0, 0xd7, 0xd9, 0x0e, 0x9d, 0x0b, 0xbb, 0x22, 0x1f, 0x8b, 0x66, 0xef, 0x32,
+	0x08, 0x71, 0xea, 0x8c, 0x5e, 0xd9, 0xe1, 0xa2, 0xf1, 0xac, 0xe8, 0xf0, 0xa8, 0xa5, 0x83, 0x63,
+	0xaf, 0xd0, 0x52, 0xfb, 0xf0, 0x8c, 0x06, 0xed, 0xa4, 0x44, 0xdb, 0x4a, 0xbb, 0xf7, 0x41, 0x05,
+	0xb3, 0x3e, 0x49, 0xc6, 0x56, 0xd3, 0x9b, 0xae, 0xb3, 0x7d, 0xb3, 0xb8, 0xec, 0x9b, 0xca, 0x9b,
+	0xd5, 0x0a, 0x11, 0x92, 0x18, 0xa5, 0xa1, 0x49, 0x68, 0x68, 0x85, 0x38, 0x2d, 0x9f, 0x02, 0xf9,
+	0xad, 0xc8, 0x22, 0x56, 0xff, 0x7d, 0x5a, 0x90, 0x8b, 0xcf, 0x6a, 0x63, 0xc5, 0x71, 0xbe, 0xa8,
+	0xad, 0x15, 0x01, 0x74, 0x02, 0x66, 0x8a, 0x65, 0xb1, 0xda, 0xee, 0x98, 0x55, 0x62, 0xf6, 0x5d,
+	0x4a, 0xfa, 0x4e, 0xc0, 0xfa, 0x43, 0x49, 0x7f, 0xbb, 0xd3, 0x97, 0x92, 0x3f, 0xea, 0xac, 0x88,
+	0xdb, 0xb6, 0x13, 0x30, 0xdb, 0x1e, 0x8a, 0x6c, 0x7b, 0xbb, 0x63, 0xdb, 0x52, 0xb6, 0x33, 0x51,
+	0xd6, 0xf9, 0xe4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x49, 0x1e, 0x99, 0x46, 0x07, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -504,56 +496,3 @@ var _RemarketingActionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/remarketing_action_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/remarketing_action_service.proto", fileDescriptor_remarketing_action_service_3bbcd94af93bf94e)
-}
-
-var fileDescriptor_remarketing_action_service_3bbcd94af93bf94e = []byte{
-	// 705 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcf, 0x6a, 0xd4, 0x40,
-	0x1c, 0xc7, 0x4d, 0x56, 0xaa, 0x9d, 0x54, 0x85, 0x51, 0x31, 0xac, 0xd6, 0x2e, 0xb1, 0x60, 0xd9,
-	0x43, 0xc2, 0xae, 0x45, 0x21, 0x6d, 0x91, 0x2c, 0xda, 0xd6, 0x43, 0xff, 0x90, 0x42, 0x41, 0x59,
-	0x08, 0xd3, 0x64, 0x1a, 0x42, 0x93, 0x4c, 0x9c, 0x99, 0xac, 0x94, 0xd2, 0x8b, 0x88, 0x2f, 0xe0,
-	0x1b, 0x78, 0xf4, 0x3d, 0x3c, 0xe8, 0xc1, 0x8b, 0xaf, 0xa0, 0x17, 0x0f, 0x3e, 0x83, 0x24, 0x93,
-	0xd9, 0xfe, 0xd9, 0xa6, 0x2b, 0xed, 0x6d, 0xf6, 0x37, 0xdf, 0xfd, 0xfc, 0xfe, 0x7c, 0x67, 0x26,
-	0xc0, 0x09, 0x09, 0x09, 0x63, 0x6c, 0xa1, 0x80, 0x59, 0x62, 0x59, 0xac, 0x06, 0x1d, 0x8b, 0x61,
-	0x3a, 0x88, 0x7c, 0xcc, 0x2c, 0x8a, 0x13, 0x44, 0xf7, 0x30, 0x8f, 0xd2, 0xd0, 0x43, 0x3e, 0x8f,
-	0x48, 0xea, 0x55, 0x7b, 0x66, 0x46, 0x09, 0x27, 0xb0, 0x25, 0xfe, 0x67, 0xa2, 0x80, 0x99, 0x43,
-	0x84, 0x39, 0xe8, 0x98, 0x12, 0xd1, 0xb4, 0xeb, 0x92, 0x50, 0xcc, 0x48, 0x4e, 0xcf, 0xce, 0x22,
-	0xe8, 0xcd, 0x07, 0xf2, 0xbf, 0x59, 0x64, 0xa1, 0x34, 0x25, 0x1c, 0x15, 0x9b, 0xac, 0xda, 0xad,
-	0x72, 0x5b, 0xe5, 0xaf, 0x9d, 0x7c, 0xd7, 0xda, 0x8d, 0x70, 0x1c, 0x78, 0x09, 0x62, 0x7b, 0x95,
-	0xe2, 0xe1, 0x69, 0xc5, 0x3b, 0x8a, 0xb2, 0x0c, 0x53, 0x49, 0xb8, 0x57, 0xed, 0xd3, 0xcc, 0xb7,
-	0x18, 0x47, 0x3c, 0xaf, 0x36, 0x8c, 0x1e, 0xb8, 0xbf, 0x82, 0xb9, 0x7b, 0x54, 0x97, 0x53, 0x96,
-	0xe5, 0xe2, 0xb7, 0x39, 0x66, 0x1c, 0x3e, 0x02, 0x37, 0x64, 0xf5, 0x5e, 0x8a, 0x12, 0xac, 0x2b,
-	0x2d, 0x65, 0x6e, 0xd2, 0x9d, 0x92, 0xc1, 0x75, 0x94, 0x60, 0xe3, 0xaf, 0x02, 0x66, 0xd6, 0x72,
-	0x8e, 0x38, 0x1e, 0xe1, 0x30, 0x09, 0x9a, 0x01, 0x9a, 0x9f, 0x33, 0x4e, 0x12, 0x4c, 0xbd, 0x28,
-	0xa8, 0x30, 0x40, 0x86, 0x5e, 0x05, 0xb0, 0x0f, 0x00, 0xc9, 0x30, 0x15, 0x7d, 0xeb, 0x6a, 0xab,
-	0x31, 0xa7, 0x75, 0x17, 0xcd, 0x71, 0x43, 0x37, 0x47, 0x32, 0x6e, 0x48, 0x88, 0x7b, 0x8c, 0x07,
-	0x1f, 0x83, 0x5b, 0x19, 0xa2, 0x3c, 0x42, 0xb1, 0xb7, 0x8b, 0xa2, 0x38, 0xa7, 0x58, 0x6f, 0xb4,
-	0x94, 0xb9, 0xeb, 0xee, 0xcd, 0x2a, 0xbc, 0x2c, 0xa2, 0x45, 0xc3, 0x03, 0x14, 0x47, 0x01, 0xe2,
-	0xd8, 0x23, 0x69, 0xbc, 0xaf, 0x5f, 0x2d, 0x65, 0x53, 0x32, 0xb8, 0x91, 0xc6, 0xfb, 0xc6, 0x47,
-	0x15, 0x34, 0xeb, 0x13, 0xc3, 0x05, 0xa0, 0xe5, 0x59, 0x49, 0x28, 0x1c, 0x2a, 0x09, 0x5a, 0xb7,
-	0x29, 0x7b, 0x91, 0x16, 0x99, 0xcb, 0x85, 0x89, 0x6b, 0x88, 0xed, 0xb9, 0x40, 0xc8, 0x8b, 0x35,
-	0x5c, 0x07, 0x13, 0x3e, 0xc5, 0x88, 0x8b, 0x51, 0x6b, 0xdd, 0xf9, 0xda, 0x19, 0x0c, 0x8f, 0xd5,
-	0xe8, 0x10, 0x56, 0xaf, 0xb8, 0x15, 0xa5, 0xe0, 0x09, 0xba, 0xae, 0x5e, 0x8e, 0x27, 0x28, 0x3d,
-	0x0d, 0x4c, 0x0e, 0xe7, 0x6a, 0x7c, 0x55, 0x40, 0xab, 0xde, 0x79, 0x96, 0x91, 0x94, 0x61, 0xb8,
-	0x0c, 0xee, 0x9e, 0x9a, 0xbd, 0x87, 0x29, 0x25, 0xb4, 0x74, 0x40, 0xeb, 0x42, 0x59, 0x10, 0xcd,
-	0x7c, 0x73, 0xab, 0x3c, 0x9b, 0xee, 0xed, 0x93, 0xae, 0xbc, 0x2c, 0xe4, 0xf0, 0x35, 0xb8, 0x46,
-	0x31, 0xcb, 0x63, 0x2e, 0x8f, 0xc7, 0xf3, 0xf1, 0xc7, 0xa3, 0xa6, 0x38, 0xb7, 0xe4, 0xb8, 0x92,
-	0x67, 0xbc, 0x00, 0xd3, 0xe7, 0x2a, 0xff, 0xeb, 0x1e, 0x74, 0x7f, 0x34, 0x80, 0x3e, 0x02, 0xd8,
-	0x12, 0xa5, 0xc0, 0x6f, 0x0a, 0xb8, 0x73, 0xd6, 0x4d, 0x83, 0x4b, 0xe3, 0xbb, 0x38, 0xe7, 0x86,
-	0x36, 0x2f, 0xe4, 0xa7, 0xb1, 0xf8, 0xfe, 0xe7, 0xaf, 0x4f, 0xea, 0x53, 0x38, 0x5f, 0xbc, 0x4f,
-	0x07, 0x27, 0x5a, 0x5b, 0x92, 0x97, 0x92, 0x59, 0xed, 0xe3, 0x0f, 0x56, 0x65, 0xab, 0xd5, 0x3e,
-	0x84, 0xbf, 0x15, 0xa0, 0xd7, 0xd9, 0x0e, 0x9d, 0x0b, 0xbb, 0x22, 0x1f, 0x8b, 0x66, 0xef, 0x32,
-	0x08, 0x71, 0xea, 0x8c, 0x5e, 0xd9, 0xe1, 0xa2, 0xf1, 0xac, 0xe8, 0xf0, 0xa8, 0xa5, 0x83, 0x63,
-	0xaf, 0xd0, 0x52, 0xfb, 0xf0, 0x8c, 0x06, 0xed, 0xa4, 0x44, 0xdb, 0x4a, 0xbb, 0xf7, 0x41, 0x05,
-	0xb3, 0x3e, 0x49, 0xc6, 0x56, 0xd3, 0x9b, 0xae, 0xb3, 0x7d, 0xb3, 0xb8, 0xec, 0x9b, 0xca, 0x9b,
-	0xd5, 0x0a, 0x11, 0x92, 0x18, 0xa5, 0xa1, 0x49, 0x68, 0x68, 0x85, 0x38, 0x2d, 0x9f, 0x02, 0xf9,
-	0xad, 0xc8, 0x22, 0x56, 0xff, 0x7d, 0x5a, 0x90, 0x8b, 0xcf, 0x6a, 0x63, 0xc5, 0x71, 0xbe, 0xa8,
-	0xad, 0x15, 0x01, 0x74, 0x02, 0x66, 0x8a, 0x65, 0xb1, 0xda, 0xee, 0x98, 0x55, 0x62, 0xf6, 0x5d,
-	0x4a, 0xfa, 0x4e, 0xc0, 0xfa, 0x43, 0x49, 0x7f, 0xbb, 0xd3, 0x97, 0x92, 0x3f, 0xea, 0xac, 0x88,
-	0xdb, 0xb6, 0x13, 0x30, 0xdb, 0x1e, 0x8a, 0x6c, 0x7b, 0xbb, 0x63, 0xdb, 0x52, 0xb6, 0x33, 0x51,
-	0xd6, 0xf9, 0xe4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x49, 0x1e, 0x99, 0x46, 0x07, 0x00,
-	0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/search_term_view_service.pb.go b/googleapis/ads/googleads/v1/services/search_term_view_service.pb.go
index 5f24163433..afe5f0ae89 100644
--- a/googleapis/ads/googleads/v1/services/search_term_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/search_term_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/search_term_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [SearchTermViewService.GetSearchTermView][google.ads.googleads.v1.services.SearchTermViewService.GetSearchTermView].
 type GetSearchTermViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetSearchTermViewRequest) Reset()         { *m = GetSearchTermViewReque
 func (m *GetSearchTermViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSearchTermViewRequest) ProtoMessage()    {}
 func (*GetSearchTermViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_search_term_view_service_4af6bf4cca847c0e, []int{0}
+	return fileDescriptor_05af83b1baea038c, []int{0}
 }
+
 func (m *GetSearchTermViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSearchTermViewRequest.Unmarshal(m, b)
 }
 func (m *GetSearchTermViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSearchTermViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSearchTermViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSearchTermViewRequest.Merge(dst, src)
+func (m *GetSearchTermViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSearchTermViewRequest.Merge(m, src)
 }
 func (m *GetSearchTermViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSearchTermViewRequest.Size(m)
@@ -69,6 +70,38 @@ func init() {
 	proto.RegisterType((*GetSearchTermViewRequest)(nil), "google.ads.googleads.v1.services.GetSearchTermViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/search_term_view_service.proto", fileDescriptor_05af83b1baea038c)
+}
+
+var fileDescriptor_05af83b1baea038c = []byte{
+	// 372 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x6a, 0xe3, 0x40,
+	0x14, 0x45, 0x5a, 0x58, 0x58, 0xb1, 0x5b, 0xac, 0x60, 0xc1, 0x88, 0x2d, 0x8c, 0xd7, 0xc5, 0xe2,
+	0x62, 0x06, 0xc5, 0x4d, 0x32, 0x21, 0x18, 0xb9, 0x71, 0xaa, 0x60, 0xec, 0xa0, 0x22, 0x08, 0xc4,
+	0x44, 0xfa, 0x28, 0x02, 0x4b, 0xe3, 0xcc, 0x97, 0xe5, 0x22, 0xa4, 0x48, 0xae, 0x90, 0x1b, 0xa4,
+	0xcc, 0x1d, 0x72, 0x81, 0xb4, 0x29, 0x72, 0x81, 0x54, 0x39, 0x45, 0x90, 0x47, 0x23, 0x30, 0xb1,
+	0x70, 0xf7, 0x98, 0xff, 0xde, 0xfb, 0xef, 0x3f, 0xc9, 0x1a, 0x25, 0x42, 0x24, 0x0b, 0xa0, 0x3c,
+	0x46, 0xaa, 0x60, 0x85, 0x4a, 0x97, 0x22, 0xc8, 0x32, 0x8d, 0x00, 0x29, 0x02, 0x97, 0xd1, 0x55,
+	0x58, 0x80, 0xcc, 0xc2, 0x32, 0x85, 0x75, 0x58, 0x4f, 0xc8, 0x52, 0x8a, 0x42, 0xd8, 0x5d, 0xa5,
+	0x22, 0x3c, 0x46, 0xd2, 0x18, 0x90, 0xd2, 0x25, 0xda, 0xc0, 0x39, 0x6c, 0x5b, 0x21, 0x01, 0xc5,
+	0x4a, 0xee, 0xda, 0xa1, 0xbc, 0x9d, 0xbf, 0x5a, 0xb9, 0x4c, 0x29, 0xcf, 0x73, 0x51, 0xf0, 0x22,
+	0x15, 0x39, 0xaa, 0x69, 0x6f, 0x64, 0x75, 0x26, 0x50, 0xcc, 0x37, 0xd2, 0x73, 0x90, 0x99, 0x9f,
+	0xc2, 0x7a, 0x06, 0xd7, 0x2b, 0xc0, 0xc2, 0xfe, 0x67, 0xfd, 0xd2, 0xee, 0x61, 0xce, 0x33, 0xe8,
+	0x18, 0x5d, 0xe3, 0xff, 0x8f, 0xd9, 0x4f, 0xfd, 0x78, 0xc6, 0x33, 0x38, 0x78, 0x33, 0xac, 0x3f,
+	0xdb, 0xf2, 0xb9, 0xca, 0x6c, 0x3f, 0x1b, 0xd6, 0xef, 0x2f, 0xde, 0x36, 0x23, 0xfb, 0x6e, 0x25,
+	0x6d, 0x81, 0x1c, 0xb7, 0x55, 0xdb, 0xb4, 0x40, 0xb6, 0x95, 0xbd, 0xa3, 0xfb, 0xd7, 0xf7, 0x07,
+	0x73, 0x68, 0xbb, 0x55, 0x57, 0x37, 0x5b, 0xe7, 0x9c, 0x44, 0x2b, 0x2c, 0x44, 0x06, 0x12, 0xe9,
+	0xa0, 0x2e, 0x4f, 0xcb, 0x90, 0x0e, 0x6e, 0xc7, 0x77, 0xa6, 0xd5, 0x8f, 0x44, 0xb6, 0x37, 0xef,
+	0xd8, 0xd9, 0x79, 0xff, 0xb4, 0xea, 0x77, 0x6a, 0x5c, 0x9c, 0xd6, 0xfa, 0x44, 0x2c, 0x78, 0x9e,
+	0x10, 0x21, 0x13, 0x9a, 0x40, 0xbe, 0x69, 0x5f, 0x7f, 0xc9, 0x65, 0x8a, 0xed, 0xff, 0xce, 0xb1,
+	0x06, 0x8f, 0xe6, 0xb7, 0x89, 0xe7, 0x3d, 0x99, 0xdd, 0x89, 0x32, 0xf4, 0x62, 0x24, 0x0a, 0x56,
+	0xc8, 0x77, 0x49, 0xbd, 0x18, 0x5f, 0x34, 0x25, 0xf0, 0x62, 0x0c, 0x1a, 0x4a, 0xe0, 0xbb, 0x81,
+	0xa6, 0x7c, 0x98, 0x7d, 0xf5, 0xce, 0x98, 0x17, 0x23, 0x63, 0x0d, 0x89, 0x31, 0xdf, 0x65, 0x4c,
+	0xd3, 0x2e, 0xbf, 0x6f, 0x72, 0x0e, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x3e, 0x6e, 0xc9,
+	0xe2, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,35 +175,3 @@ var _SearchTermViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/search_term_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/search_term_view_service.proto", fileDescriptor_search_term_view_service_4af6bf4cca847c0e)
-}
-
-var fileDescriptor_search_term_view_service_4af6bf4cca847c0e = []byte{
-	// 372 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x6a, 0xe3, 0x40,
-	0x14, 0x45, 0x5a, 0x58, 0x58, 0xb1, 0x5b, 0xac, 0x60, 0xc1, 0x88, 0x2d, 0x8c, 0xd7, 0xc5, 0xe2,
-	0x62, 0x06, 0xc5, 0x4d, 0x32, 0x21, 0x18, 0xb9, 0x71, 0xaa, 0x60, 0xec, 0xa0, 0x22, 0x08, 0xc4,
-	0x44, 0xfa, 0x28, 0x02, 0x4b, 0xe3, 0xcc, 0x97, 0xe5, 0x22, 0xa4, 0x48, 0xae, 0x90, 0x1b, 0xa4,
-	0xcc, 0x1d, 0x72, 0x81, 0xb4, 0x29, 0x72, 0x81, 0x54, 0x39, 0x45, 0x90, 0x47, 0x23, 0x30, 0xb1,
-	0x70, 0xf7, 0x98, 0xff, 0xde, 0xfb, 0xef, 0x3f, 0xc9, 0x1a, 0x25, 0x42, 0x24, 0x0b, 0xa0, 0x3c,
-	0x46, 0xaa, 0x60, 0x85, 0x4a, 0x97, 0x22, 0xc8, 0x32, 0x8d, 0x00, 0x29, 0x02, 0x97, 0xd1, 0x55,
-	0x58, 0x80, 0xcc, 0xc2, 0x32, 0x85, 0x75, 0x58, 0x4f, 0xc8, 0x52, 0x8a, 0x42, 0xd8, 0x5d, 0xa5,
-	0x22, 0x3c, 0x46, 0xd2, 0x18, 0x90, 0xd2, 0x25, 0xda, 0xc0, 0x39, 0x6c, 0x5b, 0x21, 0x01, 0xc5,
-	0x4a, 0xee, 0xda, 0xa1, 0xbc, 0x9d, 0xbf, 0x5a, 0xb9, 0x4c, 0x29, 0xcf, 0x73, 0x51, 0xf0, 0x22,
-	0x15, 0x39, 0xaa, 0x69, 0x6f, 0x64, 0x75, 0x26, 0x50, 0xcc, 0x37, 0xd2, 0x73, 0x90, 0x99, 0x9f,
-	0xc2, 0x7a, 0x06, 0xd7, 0x2b, 0xc0, 0xc2, 0xfe, 0x67, 0xfd, 0xd2, 0xee, 0x61, 0xce, 0x33, 0xe8,
-	0x18, 0x5d, 0xe3, 0xff, 0x8f, 0xd9, 0x4f, 0xfd, 0x78, 0xc6, 0x33, 0x38, 0x78, 0x33, 0xac, 0x3f,
-	0xdb, 0xf2, 0xb9, 0xca, 0x6c, 0x3f, 0x1b, 0xd6, 0xef, 0x2f, 0xde, 0x36, 0x23, 0xfb, 0x6e, 0x25,
-	0x6d, 0x81, 0x1c, 0xb7, 0x55, 0xdb, 0xb4, 0x40, 0xb6, 0x95, 0xbd, 0xa3, 0xfb, 0xd7, 0xf7, 0x07,
-	0x73, 0x68, 0xbb, 0x55, 0x57, 0x37, 0x5b, 0xe7, 0x9c, 0x44, 0x2b, 0x2c, 0x44, 0x06, 0x12, 0xe9,
-	0xa0, 0x2e, 0x4f, 0xcb, 0x90, 0x0e, 0x6e, 0xc7, 0x77, 0xa6, 0xd5, 0x8f, 0x44, 0xb6, 0x37, 0xef,
-	0xd8, 0xd9, 0x79, 0xff, 0xb4, 0xea, 0x77, 0x6a, 0x5c, 0x9c, 0xd6, 0xfa, 0x44, 0x2c, 0x78, 0x9e,
-	0x10, 0x21, 0x13, 0x9a, 0x40, 0xbe, 0x69, 0x5f, 0x7f, 0xc9, 0x65, 0x8a, 0xed, 0xff, 0xce, 0xb1,
-	0x06, 0x8f, 0xe6, 0xb7, 0x89, 0xe7, 0x3d, 0x99, 0xdd, 0x89, 0x32, 0xf4, 0x62, 0x24, 0x0a, 0x56,
-	0xc8, 0x77, 0x49, 0xbd, 0x18, 0x5f, 0x34, 0x25, 0xf0, 0x62, 0x0c, 0x1a, 0x4a, 0xe0, 0xbb, 0x81,
-	0xa6, 0x7c, 0x98, 0x7d, 0xf5, 0xce, 0x98, 0x17, 0x23, 0x63, 0x0d, 0x89, 0x31, 0xdf, 0x65, 0x4c,
-	0xd3, 0x2e, 0xbf, 0x6f, 0x72, 0x0e, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x3e, 0x6e, 0xc9,
-	0xe2, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/shared_criterion_service.pb.go b/googleapis/ads/googleads/v1/services/shared_criterion_service.pb.go
index 70d9a39bad..49a4a400fc 100644
--- a/googleapis/ads/googleads/v1/services/shared_criterion_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/shared_criterion_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/shared_criterion_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [SharedCriterionService.GetSharedCriterion][google.ads.googleads.v1.services.SharedCriterionService.GetSharedCriterion].
 type GetSharedCriterionRequest struct {
@@ -40,16 +40,17 @@ func (m *GetSharedCriterionRequest) Reset()         { *m = GetSharedCriterionReq
 func (m *GetSharedCriterionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSharedCriterionRequest) ProtoMessage()    {}
 func (*GetSharedCriterionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_service_f3244070d9ea4ad5, []int{0}
+	return fileDescriptor_82b35fbbce441bac, []int{0}
 }
+
 func (m *GetSharedCriterionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSharedCriterionRequest.Unmarshal(m, b)
 }
 func (m *GetSharedCriterionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSharedCriterionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSharedCriterionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSharedCriterionRequest.Merge(dst, src)
+func (m *GetSharedCriterionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSharedCriterionRequest.Merge(m, src)
 }
 func (m *GetSharedCriterionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSharedCriterionRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *MutateSharedCriteriaRequest) Reset()         { *m = MutateSharedCriteri
 func (m *MutateSharedCriteriaRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateSharedCriteriaRequest) ProtoMessage()    {}
 func (*MutateSharedCriteriaRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_service_f3244070d9ea4ad5, []int{1}
+	return fileDescriptor_82b35fbbce441bac, []int{1}
 }
+
 func (m *MutateSharedCriteriaRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateSharedCriteriaRequest.Unmarshal(m, b)
 }
 func (m *MutateSharedCriteriaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateSharedCriteriaRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateSharedCriteriaRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateSharedCriteriaRequest.Merge(dst, src)
+func (m *MutateSharedCriteriaRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateSharedCriteriaRequest.Merge(m, src)
 }
 func (m *MutateSharedCriteriaRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateSharedCriteriaRequest.Size(m)
@@ -155,16 +157,17 @@ func (m *SharedCriterionOperation) Reset()         { *m = SharedCriterionOperati
 func (m *SharedCriterionOperation) String() string { return proto.CompactTextString(m) }
 func (*SharedCriterionOperation) ProtoMessage()    {}
 func (*SharedCriterionOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_service_f3244070d9ea4ad5, []int{2}
+	return fileDescriptor_82b35fbbce441bac, []int{2}
 }
+
 func (m *SharedCriterionOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedCriterionOperation.Unmarshal(m, b)
 }
 func (m *SharedCriterionOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedCriterionOperation.Marshal(b, m, deterministic)
 }
-func (dst *SharedCriterionOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedCriterionOperation.Merge(dst, src)
+func (m *SharedCriterionOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedCriterionOperation.Merge(m, src)
 }
 func (m *SharedCriterionOperation) XXX_Size() int {
 	return xxx_messageInfo_SharedCriterionOperation.Size(m)
@@ -212,76 +215,14 @@ func (m *SharedCriterionOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SharedCriterionOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SharedCriterionOperation_OneofMarshaler, _SharedCriterionOperation_OneofUnmarshaler, _SharedCriterionOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SharedCriterionOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SharedCriterionOperation_Create)(nil),
 		(*SharedCriterionOperation_Remove)(nil),
 	}
 }
 
-func _SharedCriterionOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SharedCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *SharedCriterionOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *SharedCriterionOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("SharedCriterionOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SharedCriterionOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SharedCriterionOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.SharedCriterion)
-		err := b.DecodeMessage(msg)
-		m.Operation = &SharedCriterionOperation_Create{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &SharedCriterionOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SharedCriterionOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SharedCriterionOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *SharedCriterionOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedCriterionOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a shared criterion mutate.
 type MutateSharedCriteriaResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -300,16 +241,17 @@ func (m *MutateSharedCriteriaResponse) Reset()         { *m = MutateSharedCriter
 func (m *MutateSharedCriteriaResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateSharedCriteriaResponse) ProtoMessage()    {}
 func (*MutateSharedCriteriaResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_service_f3244070d9ea4ad5, []int{3}
+	return fileDescriptor_82b35fbbce441bac, []int{3}
 }
+
 func (m *MutateSharedCriteriaResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateSharedCriteriaResponse.Unmarshal(m, b)
 }
 func (m *MutateSharedCriteriaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateSharedCriteriaResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateSharedCriteriaResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateSharedCriteriaResponse.Merge(dst, src)
+func (m *MutateSharedCriteriaResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateSharedCriteriaResponse.Merge(m, src)
 }
 func (m *MutateSharedCriteriaResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateSharedCriteriaResponse.Size(m)
@@ -347,16 +289,17 @@ func (m *MutateSharedCriterionResult) Reset()         { *m = MutateSharedCriteri
 func (m *MutateSharedCriterionResult) String() string { return proto.CompactTextString(m) }
 func (*MutateSharedCriterionResult) ProtoMessage()    {}
 func (*MutateSharedCriterionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_criterion_service_f3244070d9ea4ad5, []int{4}
+	return fileDescriptor_82b35fbbce441bac, []int{4}
 }
+
 func (m *MutateSharedCriterionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateSharedCriterionResult.Unmarshal(m, b)
 }
 func (m *MutateSharedCriterionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateSharedCriterionResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateSharedCriterionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateSharedCriterionResult.Merge(dst, src)
+func (m *MutateSharedCriterionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateSharedCriterionResult.Merge(m, src)
 }
 func (m *MutateSharedCriterionResult) XXX_Size() int {
 	return xxx_messageInfo_MutateSharedCriterionResult.Size(m)
@@ -382,6 +325,56 @@ func init() {
 	proto.RegisterType((*MutateSharedCriterionResult)(nil), "google.ads.googleads.v1.services.MutateSharedCriterionResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/shared_criterion_service.proto", fileDescriptor_82b35fbbce441bac)
+}
+
+var fileDescriptor_82b35fbbce441bac = []byte{
+	// 666 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xfd, 0xec, 0x7c, 0x2a, 0x74, 0x52, 0x40, 0x1a, 0xfe, 0x4c, 0x5a, 0x41, 0x64, 0x2a, 0x51,
+	0x65, 0x61, 0x13, 0x77, 0x53, 0xb9, 0x6a, 0x21, 0x41, 0xb4, 0x45, 0x02, 0x5a, 0x39, 0x52, 0x90,
+	0xaa, 0x48, 0xd6, 0xd4, 0x9e, 0x1a, 0x4b, 0xb6, 0xc7, 0xcc, 0x8c, 0x83, 0xaa, 0xaa, 0x9b, 0xbe,
+	0x00, 0x0b, 0xde, 0x80, 0x25, 0x4b, 0x5e, 0xa0, 0x7b, 0xb6, 0x88, 0x37, 0x60, 0x81, 0x78, 0x0a,
+	0x64, 0x8f, 0x27, 0x34, 0xc1, 0x51, 0x50, 0x76, 0x33, 0xf7, 0xde, 0x39, 0xf7, 0x9c, 0xfb, 0x33,
+	0xe0, 0x49, 0x40, 0x48, 0x10, 0x61, 0x13, 0xf9, 0xcc, 0x14, 0xc7, 0xfc, 0x34, 0x6c, 0x9b, 0x0c,
+	0xd3, 0x61, 0xe8, 0x61, 0x66, 0xb2, 0xb7, 0x88, 0x62, 0xdf, 0xf5, 0x68, 0xc8, 0x31, 0x0d, 0x49,
+	0xe2, 0x96, 0x1e, 0x23, 0xa5, 0x84, 0x13, 0xd8, 0x14, 0xaf, 0x0c, 0xe4, 0x33, 0x63, 0x04, 0x60,
+	0x0c, 0xdb, 0x86, 0x04, 0x68, 0x6c, 0x4c, 0x4b, 0x41, 0x31, 0x23, 0x19, 0xad, 0xca, 0x21, 0xb0,
+	0x1b, 0x2b, 0xf2, 0x65, 0x1a, 0x9a, 0x28, 0x49, 0x08, 0x47, 0x3c, 0x24, 0x09, 0x2b, 0xbd, 0xf7,
+	0x4b, 0x6f, 0x71, 0x3b, 0xca, 0x8e, 0xcd, 0xf7, 0x14, 0xa5, 0x29, 0xa6, 0xd2, 0x7f, 0xb7, 0xf4,
+	0xd3, 0xd4, 0x33, 0x19, 0x47, 0x3c, 0x2b, 0x1d, 0xfa, 0x53, 0x70, 0x6f, 0x17, 0xf3, 0x5e, 0x91,
+	0xf3, 0x99, 0x4c, 0xe9, 0xe0, 0x77, 0x19, 0x66, 0x1c, 0x3e, 0x04, 0xd7, 0x24, 0x2f, 0x37, 0x41,
+	0x31, 0xd6, 0x94, 0xa6, 0xb2, 0xb6, 0xe8, 0x2c, 0x49, 0xe3, 0x6b, 0x14, 0x63, 0xfd, 0xa7, 0x02,
+	0x96, 0x5f, 0x65, 0x1c, 0x71, 0x3c, 0x86, 0x82, 0x24, 0xc8, 0x03, 0x50, 0xf7, 0x32, 0xc6, 0x49,
+	0x8c, 0xa9, 0x1b, 0xfa, 0x25, 0x04, 0x90, 0xa6, 0x17, 0x3e, 0x3c, 0x04, 0x80, 0xa4, 0x98, 0x0a,
+	0x3d, 0x9a, 0xda, 0xac, 0xad, 0xd5, 0x2d, 0xdb, 0x98, 0x55, 0x4a, 0x63, 0x82, 0xf3, 0xbe, 0x84,
+	0x70, 0x2e, 0xa1, 0xc1, 0x47, 0xe0, 0x46, 0x8a, 0x28, 0x0f, 0x51, 0xe4, 0x1e, 0xa3, 0x30, 0xca,
+	0x28, 0xd6, 0x6a, 0x4d, 0x65, 0xed, 0xaa, 0x73, 0xbd, 0x34, 0xef, 0x08, 0x6b, 0x2e, 0x75, 0x88,
+	0xa2, 0xd0, 0x47, 0x1c, 0xbb, 0x24, 0x89, 0x4e, 0xb4, 0xff, 0x8b, 0xb0, 0x25, 0x69, 0xdc, 0x4f,
+	0xa2, 0x13, 0xfd, 0x83, 0x02, 0xb4, 0x69, 0x69, 0xe1, 0x4b, 0xb0, 0xe0, 0x51, 0x8c, 0xb8, 0xa8,
+	0x52, 0xdd, 0xb2, 0xa6, 0x4a, 0x18, 0xf5, 0x7a, 0x52, 0xc3, 0xde, 0x7f, 0x4e, 0x89, 0x01, 0x35,
+	0xb0, 0x40, 0x71, 0x4c, 0x86, 0x82, 0xef, 0x62, 0xee, 0x11, 0xf7, 0x6e, 0x1d, 0x2c, 0x8e, 0x04,
+	0xea, 0x17, 0x0a, 0x58, 0xa9, 0x2e, 0x3e, 0x4b, 0x49, 0xc2, 0x30, 0xdc, 0x01, 0xb7, 0x27, 0x0a,
+	0xe0, 0x62, 0x4a, 0x09, 0x2d, 0x60, 0xeb, 0x16, 0x94, 0x24, 0x69, 0xea, 0x19, 0xbd, 0x62, 0x30,
+	0x9c, 0x9b, 0xe3, 0xa5, 0x79, 0x9e, 0x87, 0xc3, 0x37, 0xe0, 0x0a, 0xc5, 0x2c, 0x8b, 0xb8, 0xec,
+	0xd0, 0xd6, 0xec, 0x0e, 0x55, 0x10, 0xcb, 0x67, 0x2b, 0x47, 0x71, 0x24, 0x9a, 0xde, 0xad, 0x9c,
+	0x1e, 0x19, 0xf7, 0x4f, 0x23, 0x68, 0x7d, 0xa9, 0x81, 0x3b, 0x13, 0xcf, 0x7b, 0x82, 0x04, 0xbc,
+	0x50, 0x00, 0xfc, 0x7b, 0xc0, 0xe1, 0xe6, 0x6c, 0xf6, 0x53, 0xd7, 0xa2, 0x31, 0x47, 0x67, 0xf5,
+	0x8d, 0xf3, 0x6f, 0x3f, 0x3e, 0xaa, 0x16, 0x7c, 0x9c, 0x2f, 0xfb, 0xe9, 0x98, 0xa4, 0x2d, 0xb9,
+	0x0b, 0xcc, 0x6c, 0x95, 0xdb, 0x2f, 0xdb, 0x68, 0xb6, 0xce, 0xe0, 0x77, 0x05, 0xdc, 0xaa, 0x6a,
+	0x31, 0x9c, 0xaf, 0x03, 0x72, 0x2f, 0x1b, 0xdb, 0xf3, 0x3e, 0x17, 0x93, 0xa5, 0x6f, 0x17, 0x8a,
+	0x36, 0xf4, 0xf5, 0x5c, 0xd1, 0x1f, 0x09, 0xa7, 0x97, 0x96, 0x7d, 0xab, 0x75, 0x36, 0x21, 0xc8,
+	0x8e, 0x0b, 0x48, 0x5b, 0x69, 0x75, 0xcf, 0x55, 0xb0, 0xea, 0x91, 0x78, 0x26, 0x8b, 0xee, 0x72,
+	0x75, 0x6b, 0x0f, 0xf2, 0xff, 0xeb, 0x40, 0x39, 0xdc, 0x2b, 0x01, 0x02, 0x12, 0xa1, 0x24, 0x30,
+	0x08, 0x0d, 0xcc, 0x00, 0x27, 0xc5, 0xef, 0x26, 0xbf, 0xd8, 0x34, 0x64, 0xd3, 0x3f, 0xf5, 0x4d,
+	0x79, 0xf8, 0xa4, 0xd6, 0x76, 0x3b, 0x9d, 0xcf, 0x6a, 0x73, 0x57, 0x00, 0x76, 0x7c, 0x66, 0x88,
+	0x63, 0x7e, 0xea, 0xb7, 0x8d, 0x32, 0x31, 0xfb, 0x2a, 0x43, 0x06, 0x1d, 0x9f, 0x0d, 0x46, 0x21,
+	0x83, 0x7e, 0x7b, 0x20, 0x43, 0x7e, 0xa9, 0xab, 0xc2, 0x6e, 0xdb, 0x1d, 0x9f, 0xd9, 0xf6, 0x28,
+	0xc8, 0xb6, 0xfb, 0x6d, 0xdb, 0x96, 0x61, 0x47, 0x0b, 0x05, 0xcf, 0xf5, 0xdf, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0xbe, 0x16, 0x12, 0x8a, 0x7b, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -490,53 +483,3 @@ var _SharedCriterionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/shared_criterion_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/shared_criterion_service.proto", fileDescriptor_shared_criterion_service_f3244070d9ea4ad5)
-}
-
-var fileDescriptor_shared_criterion_service_f3244070d9ea4ad5 = []byte{
-	// 666 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0xfd, 0xec, 0x7c, 0x2a, 0x74, 0x52, 0x40, 0x1a, 0xfe, 0x4c, 0x5a, 0x41, 0x64, 0x2a, 0x51,
-	0x65, 0x61, 0x13, 0x77, 0x53, 0xb9, 0x6a, 0x21, 0x41, 0xb4, 0x45, 0x02, 0x5a, 0x39, 0x52, 0x90,
-	0xaa, 0x48, 0xd6, 0xd4, 0x9e, 0x1a, 0x4b, 0xb6, 0xc7, 0xcc, 0x8c, 0x83, 0xaa, 0xaa, 0x9b, 0xbe,
-	0x00, 0x0b, 0xde, 0x80, 0x25, 0x4b, 0x5e, 0xa0, 0x7b, 0xb6, 0x88, 0x37, 0x60, 0x81, 0x78, 0x0a,
-	0x64, 0x8f, 0x27, 0x34, 0xc1, 0x51, 0x50, 0x76, 0x33, 0xf7, 0xde, 0x39, 0xf7, 0x9c, 0xfb, 0x33,
-	0xe0, 0x49, 0x40, 0x48, 0x10, 0x61, 0x13, 0xf9, 0xcc, 0x14, 0xc7, 0xfc, 0x34, 0x6c, 0x9b, 0x0c,
-	0xd3, 0x61, 0xe8, 0x61, 0x66, 0xb2, 0xb7, 0x88, 0x62, 0xdf, 0xf5, 0x68, 0xc8, 0x31, 0x0d, 0x49,
-	0xe2, 0x96, 0x1e, 0x23, 0xa5, 0x84, 0x13, 0xd8, 0x14, 0xaf, 0x0c, 0xe4, 0x33, 0x63, 0x04, 0x60,
-	0x0c, 0xdb, 0x86, 0x04, 0x68, 0x6c, 0x4c, 0x4b, 0x41, 0x31, 0x23, 0x19, 0xad, 0xca, 0x21, 0xb0,
-	0x1b, 0x2b, 0xf2, 0x65, 0x1a, 0x9a, 0x28, 0x49, 0x08, 0x47, 0x3c, 0x24, 0x09, 0x2b, 0xbd, 0xf7,
-	0x4b, 0x6f, 0x71, 0x3b, 0xca, 0x8e, 0xcd, 0xf7, 0x14, 0xa5, 0x29, 0xa6, 0xd2, 0x7f, 0xb7, 0xf4,
-	0xd3, 0xd4, 0x33, 0x19, 0x47, 0x3c, 0x2b, 0x1d, 0xfa, 0x53, 0x70, 0x6f, 0x17, 0xf3, 0x5e, 0x91,
-	0xf3, 0x99, 0x4c, 0xe9, 0xe0, 0x77, 0x19, 0x66, 0x1c, 0x3e, 0x04, 0xd7, 0x24, 0x2f, 0x37, 0x41,
-	0x31, 0xd6, 0x94, 0xa6, 0xb2, 0xb6, 0xe8, 0x2c, 0x49, 0xe3, 0x6b, 0x14, 0x63, 0xfd, 0xa7, 0x02,
-	0x96, 0x5f, 0x65, 0x1c, 0x71, 0x3c, 0x86, 0x82, 0x24, 0xc8, 0x03, 0x50, 0xf7, 0x32, 0xc6, 0x49,
-	0x8c, 0xa9, 0x1b, 0xfa, 0x25, 0x04, 0x90, 0xa6, 0x17, 0x3e, 0x3c, 0x04, 0x80, 0xa4, 0x98, 0x0a,
-	0x3d, 0x9a, 0xda, 0xac, 0xad, 0xd5, 0x2d, 0xdb, 0x98, 0x55, 0x4a, 0x63, 0x82, 0xf3, 0xbe, 0x84,
-	0x70, 0x2e, 0xa1, 0xc1, 0x47, 0xe0, 0x46, 0x8a, 0x28, 0x0f, 0x51, 0xe4, 0x1e, 0xa3, 0x30, 0xca,
-	0x28, 0xd6, 0x6a, 0x4d, 0x65, 0xed, 0xaa, 0x73, 0xbd, 0x34, 0xef, 0x08, 0x6b, 0x2e, 0x75, 0x88,
-	0xa2, 0xd0, 0x47, 0x1c, 0xbb, 0x24, 0x89, 0x4e, 0xb4, 0xff, 0x8b, 0xb0, 0x25, 0x69, 0xdc, 0x4f,
-	0xa2, 0x13, 0xfd, 0x83, 0x02, 0xb4, 0x69, 0x69, 0xe1, 0x4b, 0xb0, 0xe0, 0x51, 0x8c, 0xb8, 0xa8,
-	0x52, 0xdd, 0xb2, 0xa6, 0x4a, 0x18, 0xf5, 0x7a, 0x52, 0xc3, 0xde, 0x7f, 0x4e, 0x89, 0x01, 0x35,
-	0xb0, 0x40, 0x71, 0x4c, 0x86, 0x82, 0xef, 0x62, 0xee, 0x11, 0xf7, 0x6e, 0x1d, 0x2c, 0x8e, 0x04,
-	0xea, 0x17, 0x0a, 0x58, 0xa9, 0x2e, 0x3e, 0x4b, 0x49, 0xc2, 0x30, 0xdc, 0x01, 0xb7, 0x27, 0x0a,
-	0xe0, 0x62, 0x4a, 0x09, 0x2d, 0x60, 0xeb, 0x16, 0x94, 0x24, 0x69, 0xea, 0x19, 0xbd, 0x62, 0x30,
-	0x9c, 0x9b, 0xe3, 0xa5, 0x79, 0x9e, 0x87, 0xc3, 0x37, 0xe0, 0x0a, 0xc5, 0x2c, 0x8b, 0xb8, 0xec,
-	0xd0, 0xd6, 0xec, 0x0e, 0x55, 0x10, 0xcb, 0x67, 0x2b, 0x47, 0x71, 0x24, 0x9a, 0xde, 0xad, 0x9c,
-	0x1e, 0x19, 0xf7, 0x4f, 0x23, 0x68, 0x7d, 0xa9, 0x81, 0x3b, 0x13, 0xcf, 0x7b, 0x82, 0x04, 0xbc,
-	0x50, 0x00, 0xfc, 0x7b, 0xc0, 0xe1, 0xe6, 0x6c, 0xf6, 0x53, 0xd7, 0xa2, 0x31, 0x47, 0x67, 0xf5,
-	0x8d, 0xf3, 0x6f, 0x3f, 0x3e, 0xaa, 0x16, 0x7c, 0x9c, 0x2f, 0xfb, 0xe9, 0x98, 0xa4, 0x2d, 0xb9,
-	0x0b, 0xcc, 0x6c, 0x95, 0xdb, 0x2f, 0xdb, 0x68, 0xb6, 0xce, 0xe0, 0x77, 0x05, 0xdc, 0xaa, 0x6a,
-	0x31, 0x9c, 0xaf, 0x03, 0x72, 0x2f, 0x1b, 0xdb, 0xf3, 0x3e, 0x17, 0x93, 0xa5, 0x6f, 0x17, 0x8a,
-	0x36, 0xf4, 0xf5, 0x5c, 0xd1, 0x1f, 0x09, 0xa7, 0x97, 0x96, 0x7d, 0xab, 0x75, 0x36, 0x21, 0xc8,
-	0x8e, 0x0b, 0x48, 0x5b, 0x69, 0x75, 0xcf, 0x55, 0xb0, 0xea, 0x91, 0x78, 0x26, 0x8b, 0xee, 0x72,
-	0x75, 0x6b, 0x0f, 0xf2, 0xff, 0xeb, 0x40, 0x39, 0xdc, 0x2b, 0x01, 0x02, 0x12, 0xa1, 0x24, 0x30,
-	0x08, 0x0d, 0xcc, 0x00, 0x27, 0xc5, 0xef, 0x26, 0xbf, 0xd8, 0x34, 0x64, 0xd3, 0x3f, 0xf5, 0x4d,
-	0x79, 0xf8, 0xa4, 0xd6, 0x76, 0x3b, 0x9d, 0xcf, 0x6a, 0x73, 0x57, 0x00, 0x76, 0x7c, 0x66, 0x88,
-	0x63, 0x7e, 0xea, 0xb7, 0x8d, 0x32, 0x31, 0xfb, 0x2a, 0x43, 0x06, 0x1d, 0x9f, 0x0d, 0x46, 0x21,
-	0x83, 0x7e, 0x7b, 0x20, 0x43, 0x7e, 0xa9, 0xab, 0xc2, 0x6e, 0xdb, 0x1d, 0x9f, 0xd9, 0xf6, 0x28,
-	0xc8, 0xb6, 0xfb, 0x6d, 0xdb, 0x96, 0x61, 0x47, 0x0b, 0x05, 0xcf, 0xf5, 0xdf, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0xbe, 0x16, 0x12, 0x8a, 0x7b, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/shared_set_service.pb.go b/googleapis/ads/googleads/v1/services/shared_set_service.pb.go
index 6b2ad6da31..f087eeda74 100644
--- a/googleapis/ads/googleads/v1/services/shared_set_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/shared_set_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/shared_set_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [SharedSetService.GetSharedSet][google.ads.googleads.v1.services.SharedSetService.GetSharedSet].
 type GetSharedSetRequest struct {
@@ -41,16 +41,17 @@ func (m *GetSharedSetRequest) Reset()         { *m = GetSharedSetRequest{} }
 func (m *GetSharedSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSharedSetRequest) ProtoMessage()    {}
 func (*GetSharedSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_service_62e398adbb29dcc8, []int{0}
+	return fileDescriptor_76319871ac185e92, []int{0}
 }
+
 func (m *GetSharedSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSharedSetRequest.Unmarshal(m, b)
 }
 func (m *GetSharedSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSharedSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSharedSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSharedSetRequest.Merge(dst, src)
+func (m *GetSharedSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSharedSetRequest.Merge(m, src)
 }
 func (m *GetSharedSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSharedSetRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateSharedSetsRequest) Reset()         { *m = MutateSharedSetsRequest
 func (m *MutateSharedSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateSharedSetsRequest) ProtoMessage()    {}
 func (*MutateSharedSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_service_62e398adbb29dcc8, []int{1}
+	return fileDescriptor_76319871ac185e92, []int{1}
 }
+
 func (m *MutateSharedSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateSharedSetsRequest.Unmarshal(m, b)
 }
 func (m *MutateSharedSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateSharedSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateSharedSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateSharedSetsRequest.Merge(dst, src)
+func (m *MutateSharedSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateSharedSetsRequest.Merge(m, src)
 }
 func (m *MutateSharedSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateSharedSetsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *SharedSetOperation) Reset()         { *m = SharedSetOperation{} }
 func (m *SharedSetOperation) String() string { return proto.CompactTextString(m) }
 func (*SharedSetOperation) ProtoMessage()    {}
 func (*SharedSetOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_service_62e398adbb29dcc8, []int{2}
+	return fileDescriptor_76319871ac185e92, []int{2}
 }
+
 func (m *SharedSetOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SharedSetOperation.Unmarshal(m, b)
 }
 func (m *SharedSetOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SharedSetOperation.Marshal(b, m, deterministic)
 }
-func (dst *SharedSetOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SharedSetOperation.Merge(dst, src)
+func (m *SharedSetOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SharedSetOperation.Merge(m, src)
 }
 func (m *SharedSetOperation) XXX_Size() int {
 	return xxx_messageInfo_SharedSetOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *SharedSetOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SharedSetOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SharedSetOperation_OneofMarshaler, _SharedSetOperation_OneofUnmarshaler, _SharedSetOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SharedSetOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SharedSetOperation_Create)(nil),
 		(*SharedSetOperation_Update)(nil),
 		(*SharedSetOperation_Remove)(nil),
 	}
 }
 
-func _SharedSetOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SharedSetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *SharedSetOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *SharedSetOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *SharedSetOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("SharedSetOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SharedSetOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SharedSetOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.SharedSet)
-		err := b.DecodeMessage(msg)
-		m.Operation = &SharedSetOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.SharedSet)
-		err := b.DecodeMessage(msg)
-		m.Operation = &SharedSetOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &SharedSetOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SharedSetOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SharedSetOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *SharedSetOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedSetOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SharedSetOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for a shared set mutate.
 type MutateSharedSetsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateSharedSetsResponse) Reset()         { *m = MutateSharedSetsRespon
 func (m *MutateSharedSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateSharedSetsResponse) ProtoMessage()    {}
 func (*MutateSharedSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_service_62e398adbb29dcc8, []int{3}
+	return fileDescriptor_76319871ac185e92, []int{3}
 }
+
 func (m *MutateSharedSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateSharedSetsResponse.Unmarshal(m, b)
 }
 func (m *MutateSharedSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateSharedSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateSharedSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateSharedSetsResponse.Merge(dst, src)
+func (m *MutateSharedSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateSharedSetsResponse.Merge(m, src)
 }
 func (m *MutateSharedSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateSharedSetsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateSharedSetResult) Reset()         { *m = MutateSharedSetResult{} }
 func (m *MutateSharedSetResult) String() string { return proto.CompactTextString(m) }
 func (*MutateSharedSetResult) ProtoMessage()    {}
 func (*MutateSharedSetResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shared_set_service_62e398adbb29dcc8, []int{4}
+	return fileDescriptor_76319871ac185e92, []int{4}
 }
+
 func (m *MutateSharedSetResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateSharedSetResult.Unmarshal(m, b)
 }
 func (m *MutateSharedSetResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateSharedSetResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateSharedSetResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateSharedSetResult.Merge(dst, src)
+func (m *MutateSharedSetResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateSharedSetResult.Merge(m, src)
 }
 func (m *MutateSharedSetResult) XXX_Size() int {
 	return xxx_messageInfo_MutateSharedSetResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateSharedSetResult)(nil), "google.ads.googleads.v1.services.MutateSharedSetResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/shared_set_service.proto", fileDescriptor_76319871ac185e92)
+}
+
+var fileDescriptor_76319871ac185e92 = []byte{
+	// 705 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x4e, 0xd4, 0x40,
+	0x1c, 0xb6, 0xbb, 0x06, 0x65, 0x8a, 0x4a, 0x86, 0x10, 0x9a, 0x8d, 0xd1, 0x4d, 0x25, 0x91, 0x6c,
+	0x48, 0x9b, 0x5d, 0x31, 0x86, 0x41, 0x0e, 0x4b, 0x22, 0xe0, 0x01, 0xc1, 0xae, 0xe1, 0x60, 0x36,
+	0x69, 0x86, 0xed, 0xb0, 0x36, 0xb4, 0x9d, 0x3a, 0x33, 0x5d, 0x43, 0x08, 0x17, 0x0f, 0xc6, 0xbb,
+	0x6f, 0xe0, 0x4d, 0xef, 0x3e, 0x82, 0x17, 0xaf, 0xde, 0x3d, 0x79, 0xf2, 0x19, 0x3c, 0x98, 0xe9,
+	0x74, 0xca, 0xb2, 0x40, 0x56, 0xb8, 0x4d, 0x7f, 0xf3, 0x7d, 0xdf, 0xef, 0xff, 0x14, 0x2c, 0xf7,
+	0x29, 0xed, 0x47, 0xc4, 0xc5, 0x01, 0x77, 0xd5, 0x51, 0x9e, 0x06, 0x4d, 0x97, 0x13, 0x36, 0x08,
+	0x7b, 0x84, 0xbb, 0xfc, 0x0d, 0x66, 0x24, 0xf0, 0x39, 0x11, 0x7e, 0x61, 0x73, 0x52, 0x46, 0x05,
+	0x85, 0x75, 0x85, 0x77, 0x70, 0xc0, 0x9d, 0x92, 0xea, 0x0c, 0x9a, 0x8e, 0xa6, 0xd6, 0x5a, 0x17,
+	0x89, 0x33, 0xc2, 0x69, 0xc6, 0x4e, 0xab, 0x2b, 0xd5, 0xda, 0x5d, 0xcd, 0x49, 0x43, 0x17, 0x27,
+	0x09, 0x15, 0x58, 0x84, 0x34, 0xe1, 0xc5, 0x6d, 0xe1, 0xd3, 0xcd, 0xbf, 0xf6, 0xb2, 0x7d, 0x77,
+	0x3f, 0x24, 0x51, 0xe0, 0xc7, 0x98, 0x1f, 0x14, 0x88, 0x7b, 0xa3, 0x88, 0x77, 0x0c, 0xa7, 0x29,
+	0x61, 0x5a, 0x61, 0xae, 0xb8, 0x67, 0x69, 0xcf, 0xe5, 0x02, 0x8b, 0xac, 0xb8, 0xb0, 0x11, 0x98,
+	0xd9, 0x20, 0xa2, 0x93, 0xc7, 0xd3, 0x21, 0xc2, 0x23, 0x6f, 0x33, 0xc2, 0x05, 0x7c, 0x00, 0x6e,
+	0xe9, 0x68, 0xfd, 0x04, 0xc7, 0xc4, 0x32, 0xea, 0xc6, 0xc2, 0xa4, 0x37, 0xa5, 0x8d, 0x2f, 0x70,
+	0x4c, 0xec, 0x5f, 0x06, 0x98, 0xdb, 0xca, 0x04, 0x16, 0xa4, 0xe4, 0x73, 0x2d, 0x70, 0x1f, 0x98,
+	0xbd, 0x8c, 0x0b, 0x1a, 0x13, 0xe6, 0x87, 0x41, 0x41, 0x07, 0xda, 0xf4, 0x3c, 0x80, 0xaf, 0x00,
+	0xa0, 0x29, 0x61, 0x2a, 0x4f, 0xab, 0x52, 0xaf, 0x2e, 0x98, 0xad, 0x25, 0x67, 0x5c, 0x71, 0x9d,
+	0xd2, 0xd3, 0xb6, 0x26, 0x7b, 0x43, 0x3a, 0xf0, 0x21, 0xb8, 0x93, 0x62, 0x26, 0x42, 0x1c, 0xf9,
+	0xfb, 0x38, 0x8c, 0x32, 0x46, 0xac, 0x6a, 0xdd, 0x58, 0xb8, 0xe9, 0xdd, 0x2e, 0xcc, 0xeb, 0xca,
+	0x2a, 0x13, 0x1c, 0xe0, 0x28, 0x0c, 0xb0, 0x20, 0x3e, 0x4d, 0xa2, 0x43, 0xeb, 0x7a, 0x0e, 0x9b,
+	0xd2, 0xc6, 0xed, 0x24, 0x3a, 0xb4, 0x3f, 0x56, 0x00, 0x3c, 0xeb, 0x10, 0xae, 0x00, 0x33, 0x4b,
+	0x73, 0xa6, 0xec, 0x40, 0xce, 0x34, 0x5b, 0x35, 0x1d, 0xbb, 0x6e, 0x81, 0xb3, 0x2e, 0x9b, 0xb4,
+	0x85, 0xf9, 0x81, 0x07, 0x14, 0x5c, 0x9e, 0xe1, 0x3a, 0x98, 0xe8, 0x31, 0x82, 0x85, 0x2a, 0xa9,
+	0xd9, 0x5a, 0xbc, 0x30, 0xe7, 0x72, 0x5c, 0x4e, 0x92, 0xde, 0xbc, 0xe6, 0x15, 0x6c, 0xa9, 0xa3,
+	0x54, 0xad, 0xca, 0xd5, 0x74, 0x14, 0x1b, 0x5a, 0x60, 0x82, 0x91, 0x98, 0x0e, 0x54, 0xa1, 0x26,
+	0xe5, 0x8d, 0xfa, 0x5e, 0x33, 0xc1, 0x64, 0x59, 0x59, 0xfb, 0x9b, 0x01, 0xac, 0xb3, 0xbd, 0xe6,
+	0x29, 0x4d, 0xb8, 0x8c, 0x65, 0x76, 0xa4, 0xea, 0x3e, 0x61, 0x8c, 0xb2, 0x5c, 0xd2, 0x6c, 0x41,
+	0x1d, 0x1a, 0x4b, 0x7b, 0x4e, 0x27, 0x9f, 0x3e, 0x6f, 0xe6, 0x74, 0x3f, 0x9e, 0x49, 0x38, 0x7c,
+	0x09, 0x6e, 0x30, 0xc2, 0xb3, 0x48, 0xe8, 0x81, 0x78, 0x32, 0x7e, 0x20, 0x46, 0x82, 0xf2, 0x72,
+	0xbe, 0xa7, 0x75, 0xec, 0xa7, 0x60, 0xf6, 0x5c, 0xc4, 0x7f, 0x4d, 0x78, 0xeb, 0x43, 0x15, 0x4c,
+	0x97, 0xc4, 0x8e, 0x72, 0x09, 0xbf, 0x18, 0x60, 0x6a, 0x78, 0x67, 0xe0, 0xe3, 0xf1, 0x51, 0x9e,
+	0xb3, 0x63, 0xb5, 0x4b, 0x75, 0xcc, 0x5e, 0x7a, 0xff, 0xf3, 0xf7, 0xa7, 0x8a, 0x03, 0x17, 0xe5,
+	0x4b, 0x72, 0x74, 0x2a, 0xf4, 0x55, 0xbd, 0x56, 0xdc, 0x6d, 0x14, 0x4f, 0x8b, 0x6c, 0x8f, 0xdb,
+	0x38, 0x86, 0xdf, 0x0d, 0x30, 0x3d, 0xda, 0x36, 0xb8, 0x7c, 0xe9, 0xaa, 0xea, 0xb5, 0xae, 0xa1,
+	0xab, 0x50, 0xd5, 0x94, 0xd8, 0x28, 0xcf, 0x60, 0xc9, 0x76, 0x65, 0x06, 0x27, 0x21, 0x1f, 0x0d,
+	0xbd, 0x13, 0xab, 0x8d, 0xe3, 0xa1, 0x04, 0x50, 0x9c, 0x4b, 0x21, 0xa3, 0xb1, 0xf6, 0xd7, 0x00,
+	0xf3, 0x3d, 0x1a, 0x8f, 0xf5, 0xbe, 0x36, 0x3b, 0xda, 0xae, 0x1d, 0xb9, 0x8e, 0x3b, 0xc6, 0xeb,
+	0xcd, 0x82, 0xda, 0xa7, 0x11, 0x4e, 0xfa, 0x0e, 0x65, 0x7d, 0xb7, 0x4f, 0x92, 0x7c, 0x59, 0xf5,
+	0x2b, 0x9d, 0x86, 0xfc, 0xe2, 0x3f, 0xc2, 0x8a, 0x3e, 0x7c, 0xae, 0x54, 0x37, 0xda, 0xed, 0xaf,
+	0x95, 0xfa, 0x86, 0x12, 0x6c, 0x07, 0xdc, 0x51, 0x47, 0x79, 0xda, 0x6d, 0x3a, 0x85, 0x63, 0xfe,
+	0x43, 0x43, 0xba, 0xed, 0x80, 0x77, 0x4b, 0x48, 0x77, 0xb7, 0xd9, 0xd5, 0x90, 0x3f, 0x95, 0x79,
+	0x65, 0x47, 0xa8, 0x1d, 0x70, 0x84, 0x4a, 0x10, 0x42, 0xbb, 0x4d, 0x84, 0x34, 0x6c, 0x6f, 0x22,
+	0x8f, 0xf3, 0xd1, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0x23, 0x58, 0x23, 0xb8, 0x06, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -533,56 +511,3 @@ var _SharedSetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/shared_set_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/shared_set_service.proto", fileDescriptor_shared_set_service_62e398adbb29dcc8)
-}
-
-var fileDescriptor_shared_set_service_62e398adbb29dcc8 = []byte{
-	// 705 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x4e, 0xd4, 0x40,
-	0x1c, 0xb6, 0xbb, 0x06, 0x65, 0x8a, 0x4a, 0x86, 0x10, 0x9a, 0x8d, 0xd1, 0x4d, 0x25, 0x91, 0x6c,
-	0x48, 0x9b, 0x5d, 0x31, 0x86, 0x41, 0x0e, 0x4b, 0x22, 0xe0, 0x01, 0xc1, 0xae, 0xe1, 0x60, 0x36,
-	0x69, 0x86, 0xed, 0xb0, 0x36, 0xb4, 0x9d, 0x3a, 0x33, 0x5d, 0x43, 0x08, 0x17, 0x0f, 0xc6, 0xbb,
-	0x6f, 0xe0, 0x4d, 0xef, 0x3e, 0x82, 0x17, 0xaf, 0xde, 0x3d, 0x79, 0xf2, 0x19, 0x3c, 0x98, 0xe9,
-	0x74, 0xca, 0xb2, 0x40, 0x56, 0xb8, 0x4d, 0x7f, 0xf3, 0x7d, 0xdf, 0xef, 0xff, 0x14, 0x2c, 0xf7,
-	0x29, 0xed, 0x47, 0xc4, 0xc5, 0x01, 0x77, 0xd5, 0x51, 0x9e, 0x06, 0x4d, 0x97, 0x13, 0x36, 0x08,
-	0x7b, 0x84, 0xbb, 0xfc, 0x0d, 0x66, 0x24, 0xf0, 0x39, 0x11, 0x7e, 0x61, 0x73, 0x52, 0x46, 0x05,
-	0x85, 0x75, 0x85, 0x77, 0x70, 0xc0, 0x9d, 0x92, 0xea, 0x0c, 0x9a, 0x8e, 0xa6, 0xd6, 0x5a, 0x17,
-	0x89, 0x33, 0xc2, 0x69, 0xc6, 0x4e, 0xab, 0x2b, 0xd5, 0xda, 0x5d, 0xcd, 0x49, 0x43, 0x17, 0x27,
-	0x09, 0x15, 0x58, 0x84, 0x34, 0xe1, 0xc5, 0x6d, 0xe1, 0xd3, 0xcd, 0xbf, 0xf6, 0xb2, 0x7d, 0x77,
-	0x3f, 0x24, 0x51, 0xe0, 0xc7, 0x98, 0x1f, 0x14, 0x88, 0x7b, 0xa3, 0x88, 0x77, 0x0c, 0xa7, 0x29,
-	0x61, 0x5a, 0x61, 0xae, 0xb8, 0x67, 0x69, 0xcf, 0xe5, 0x02, 0x8b, 0xac, 0xb8, 0xb0, 0x11, 0x98,
-	0xd9, 0x20, 0xa2, 0x93, 0xc7, 0xd3, 0x21, 0xc2, 0x23, 0x6f, 0x33, 0xc2, 0x05, 0x7c, 0x00, 0x6e,
-	0xe9, 0x68, 0xfd, 0x04, 0xc7, 0xc4, 0x32, 0xea, 0xc6, 0xc2, 0xa4, 0x37, 0xa5, 0x8d, 0x2f, 0x70,
-	0x4c, 0xec, 0x5f, 0x06, 0x98, 0xdb, 0xca, 0x04, 0x16, 0xa4, 0xe4, 0x73, 0x2d, 0x70, 0x1f, 0x98,
-	0xbd, 0x8c, 0x0b, 0x1a, 0x13, 0xe6, 0x87, 0x41, 0x41, 0x07, 0xda, 0xf4, 0x3c, 0x80, 0xaf, 0x00,
-	0xa0, 0x29, 0x61, 0x2a, 0x4f, 0xab, 0x52, 0xaf, 0x2e, 0x98, 0xad, 0x25, 0x67, 0x5c, 0x71, 0x9d,
-	0xd2, 0xd3, 0xb6, 0x26, 0x7b, 0x43, 0x3a, 0xf0, 0x21, 0xb8, 0x93, 0x62, 0x26, 0x42, 0x1c, 0xf9,
-	0xfb, 0x38, 0x8c, 0x32, 0x46, 0xac, 0x6a, 0xdd, 0x58, 0xb8, 0xe9, 0xdd, 0x2e, 0xcc, 0xeb, 0xca,
-	0x2a, 0x13, 0x1c, 0xe0, 0x28, 0x0c, 0xb0, 0x20, 0x3e, 0x4d, 0xa2, 0x43, 0xeb, 0x7a, 0x0e, 0x9b,
-	0xd2, 0xc6, 0xed, 0x24, 0x3a, 0xb4, 0x3f, 0x56, 0x00, 0x3c, 0xeb, 0x10, 0xae, 0x00, 0x33, 0x4b,
-	0x73, 0xa6, 0xec, 0x40, 0xce, 0x34, 0x5b, 0x35, 0x1d, 0xbb, 0x6e, 0x81, 0xb3, 0x2e, 0x9b, 0xb4,
-	0x85, 0xf9, 0x81, 0x07, 0x14, 0x5c, 0x9e, 0xe1, 0x3a, 0x98, 0xe8, 0x31, 0x82, 0x85, 0x2a, 0xa9,
-	0xd9, 0x5a, 0xbc, 0x30, 0xe7, 0x72, 0x5c, 0x4e, 0x92, 0xde, 0xbc, 0xe6, 0x15, 0x6c, 0xa9, 0xa3,
-	0x54, 0xad, 0xca, 0xd5, 0x74, 0x14, 0x1b, 0x5a, 0x60, 0x82, 0x91, 0x98, 0x0e, 0x54, 0xa1, 0x26,
-	0xe5, 0x8d, 0xfa, 0x5e, 0x33, 0xc1, 0x64, 0x59, 0x59, 0xfb, 0x9b, 0x01, 0xac, 0xb3, 0xbd, 0xe6,
-	0x29, 0x4d, 0xb8, 0x8c, 0x65, 0x76, 0xa4, 0xea, 0x3e, 0x61, 0x8c, 0xb2, 0x5c, 0xd2, 0x6c, 0x41,
-	0x1d, 0x1a, 0x4b, 0x7b, 0x4e, 0x27, 0x9f, 0x3e, 0x6f, 0xe6, 0x74, 0x3f, 0x9e, 0x49, 0x38, 0x7c,
-	0x09, 0x6e, 0x30, 0xc2, 0xb3, 0x48, 0xe8, 0x81, 0x78, 0x32, 0x7e, 0x20, 0x46, 0x82, 0xf2, 0x72,
-	0xbe, 0xa7, 0x75, 0xec, 0xa7, 0x60, 0xf6, 0x5c, 0xc4, 0x7f, 0x4d, 0x78, 0xeb, 0x43, 0x15, 0x4c,
-	0x97, 0xc4, 0x8e, 0x72, 0x09, 0xbf, 0x18, 0x60, 0x6a, 0x78, 0x67, 0xe0, 0xe3, 0xf1, 0x51, 0x9e,
-	0xb3, 0x63, 0xb5, 0x4b, 0x75, 0xcc, 0x5e, 0x7a, 0xff, 0xf3, 0xf7, 0xa7, 0x8a, 0x03, 0x17, 0xe5,
-	0x4b, 0x72, 0x74, 0x2a, 0xf4, 0x55, 0xbd, 0x56, 0xdc, 0x6d, 0x14, 0x4f, 0x8b, 0x6c, 0x8f, 0xdb,
-	0x38, 0x86, 0xdf, 0x0d, 0x30, 0x3d, 0xda, 0x36, 0xb8, 0x7c, 0xe9, 0xaa, 0xea, 0xb5, 0xae, 0xa1,
-	0xab, 0x50, 0xd5, 0x94, 0xd8, 0x28, 0xcf, 0x60, 0xc9, 0x76, 0x65, 0x06, 0x27, 0x21, 0x1f, 0x0d,
-	0xbd, 0x13, 0xab, 0x8d, 0xe3, 0xa1, 0x04, 0x50, 0x9c, 0x4b, 0x21, 0xa3, 0xb1, 0xf6, 0xd7, 0x00,
-	0xf3, 0x3d, 0x1a, 0x8f, 0xf5, 0xbe, 0x36, 0x3b, 0xda, 0xae, 0x1d, 0xb9, 0x8e, 0x3b, 0xc6, 0xeb,
-	0xcd, 0x82, 0xda, 0xa7, 0x11, 0x4e, 0xfa, 0x0e, 0x65, 0x7d, 0xb7, 0x4f, 0x92, 0x7c, 0x59, 0xf5,
-	0x2b, 0x9d, 0x86, 0xfc, 0xe2, 0x3f, 0xc2, 0x8a, 0x3e, 0x7c, 0xae, 0x54, 0x37, 0xda, 0xed, 0xaf,
-	0x95, 0xfa, 0x86, 0x12, 0x6c, 0x07, 0xdc, 0x51, 0x47, 0x79, 0xda, 0x6d, 0x3a, 0x85, 0x63, 0xfe,
-	0x43, 0x43, 0xba, 0xed, 0x80, 0x77, 0x4b, 0x48, 0x77, 0xb7, 0xd9, 0xd5, 0x90, 0x3f, 0x95, 0x79,
-	0x65, 0x47, 0xa8, 0x1d, 0x70, 0x84, 0x4a, 0x10, 0x42, 0xbb, 0x4d, 0x84, 0x34, 0x6c, 0x6f, 0x22,
-	0x8f, 0xf3, 0xd1, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0x23, 0x58, 0x23, 0xb8, 0x06, 0x00,
-	0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/shopping_performance_view_service.pb.go b/googleapis/ads/googleads/v1/services/shopping_performance_view_service.pb.go
index bbb83409ec..f51799dee8 100644
--- a/googleapis/ads/googleads/v1/services/shopping_performance_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/shopping_performance_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/shopping_performance_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [ShoppingPerformanceViewService.GetShoppingPerformanceView][google.ads.googleads.v1.services.ShoppingPerformanceViewService.GetShoppingPerformanceView].
@@ -39,16 +39,17 @@ func (m *GetShoppingPerformanceViewRequest) Reset()         { *m = GetShoppingPe
 func (m *GetShoppingPerformanceViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetShoppingPerformanceViewRequest) ProtoMessage()    {}
 func (*GetShoppingPerformanceViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_shopping_performance_view_service_5aa39331bdf25925, []int{0}
+	return fileDescriptor_4d6c4cf22050d6d3, []int{0}
 }
+
 func (m *GetShoppingPerformanceViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetShoppingPerformanceViewRequest.Unmarshal(m, b)
 }
 func (m *GetShoppingPerformanceViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetShoppingPerformanceViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetShoppingPerformanceViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetShoppingPerformanceViewRequest.Merge(dst, src)
+func (m *GetShoppingPerformanceViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetShoppingPerformanceViewRequest.Merge(m, src)
 }
 func (m *GetShoppingPerformanceViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetShoppingPerformanceViewRequest.Size(m)
@@ -70,6 +71,38 @@ func init() {
 	proto.RegisterType((*GetShoppingPerformanceViewRequest)(nil), "google.ads.googleads.v1.services.GetShoppingPerformanceViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/shopping_performance_view_service.proto", fileDescriptor_4d6c4cf22050d6d3)
+}
+
+var fileDescriptor_4d6c4cf22050d6d3 = []byte{
+	// 378 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4b, 0xe4, 0x40,
+	0x14, 0xc6, 0x49, 0x0e, 0x0e, 0x2e, 0xdc, 0x35, 0xa9, 0x8e, 0x70, 0x1c, 0x7b, 0xbb, 0x5b, 0x1c,
+	0x57, 0x4c, 0xc8, 0x59, 0x88, 0x23, 0x22, 0x59, 0x8b, 0xdd, 0x4a, 0x96, 0x5d, 0x48, 0x21, 0x81,
+	0x30, 0x26, 0xcf, 0x18, 0xd8, 0xcc, 0xc4, 0x79, 0xd9, 0x6c, 0x21, 0x16, 0x5a, 0xda, 0xfa, 0x1f,
+	0x58, 0xfa, 0xa7, 0xd8, 0xda, 0x5b, 0x59, 0xf9, 0x57, 0x48, 0x76, 0x32, 0x11, 0x85, 0xec, 0x76,
+	0x1f, 0xc9, 0x37, 0xbf, 0x6f, 0xde, 0x37, 0xcf, 0x9a, 0xa4, 0x42, 0xa4, 0x0b, 0x70, 0x59, 0x82,
+	0xae, 0x92, 0xb5, 0xaa, 0x3c, 0x17, 0x41, 0x56, 0x59, 0x0c, 0xe8, 0xe2, 0xb9, 0x28, 0x8a, 0x8c,
+	0xa7, 0x51, 0x01, 0xf2, 0x4c, 0xc8, 0x9c, 0xf1, 0x18, 0xa2, 0x2a, 0x83, 0x55, 0xd4, 0x58, 0x48,
+	0x21, 0x45, 0x29, 0xec, 0x9e, 0x3a, 0x4e, 0x58, 0x82, 0xa4, 0x25, 0x91, 0xca, 0x23, 0x9a, 0xe4,
+	0xf8, 0x5d, 0x59, 0x12, 0x50, 0x2c, 0xe5, 0xc6, 0x30, 0x15, 0xe2, 0xfc, 0xd2, 0x88, 0x22, 0x73,
+	0x19, 0xe7, 0xa2, 0x64, 0x65, 0x26, 0x38, 0xaa, 0xbf, 0xfd, 0x89, 0xf5, 0x67, 0x0c, 0xe5, 0xbc,
+	0x61, 0x4c, 0xdf, 0x11, 0x41, 0x06, 0xab, 0x19, 0x5c, 0x2c, 0x01, 0x4b, 0x7b, 0x60, 0xfd, 0xd0,
+	0x79, 0x11, 0x67, 0x39, 0xfc, 0x34, 0x7a, 0xc6, 0xdf, 0x6f, 0xb3, 0xef, 0xfa, 0xe3, 0x31, 0xcb,
+	0xe1, 0xff, 0xb5, 0x69, 0xfd, 0xee, 0xe0, 0xcc, 0xd5, 0x38, 0xf6, 0xb3, 0x61, 0x39, 0xdd, 0x69,
+	0xf6, 0x11, 0xd9, 0xd6, 0x07, 0xd9, 0x7a, 0x57, 0x87, 0x76, 0x42, 0xda, 0xca, 0x48, 0x07, 0xa2,
+	0x7f, 0x78, 0xf3, 0xf4, 0x72, 0x67, 0xee, 0xd9, 0xbb, 0x75, 0xc3, 0x97, 0x1f, 0x46, 0x3e, 0x88,
+	0x97, 0x58, 0x8a, 0x1c, 0x24, 0xba, 0xff, 0xda, 0xca, 0x3f, 0x9d, 0xbf, 0x1a, 0xdd, 0x9a, 0xd6,
+	0x30, 0x16, 0xf9, 0xd6, 0x39, 0x46, 0x83, 0xcd, 0x4d, 0x4d, 0xeb, 0xb7, 0x99, 0x1a, 0x27, 0xcd,
+	0xaa, 0x91, 0x54, 0x2c, 0x18, 0x4f, 0x89, 0x90, 0xa9, 0x9b, 0x02, 0x5f, 0xbf, 0x9c, 0x5e, 0x87,
+	0x22, 0xc3, 0xee, 0x4d, 0xdc, 0xd7, 0xe2, 0xde, 0xfc, 0x32, 0xf6, 0xfd, 0x07, 0xb3, 0x37, 0x56,
+	0x40, 0x3f, 0x41, 0xa2, 0x64, 0xad, 0x02, 0x8f, 0x34, 0xc1, 0xf8, 0xa8, 0x2d, 0xa1, 0x9f, 0x60,
+	0xd8, 0x5a, 0xc2, 0xc0, 0x0b, 0xb5, 0xe5, 0xd5, 0x1c, 0xaa, 0xef, 0x94, 0xfa, 0x09, 0x52, 0xda,
+	0x9a, 0x28, 0x0d, 0x3c, 0x4a, 0xb5, 0xed, 0xf4, 0xeb, 0xfa, 0x9e, 0x3b, 0x6f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x6b, 0x59, 0x13, 0x0f, 0x30, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -143,35 +176,3 @@ var _ShoppingPerformanceViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/shopping_performance_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/shopping_performance_view_service.proto", fileDescriptor_shopping_performance_view_service_5aa39331bdf25925)
-}
-
-var fileDescriptor_shopping_performance_view_service_5aa39331bdf25925 = []byte{
-	// 378 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x4b, 0xe4, 0x40,
-	0x14, 0xc6, 0x49, 0x0e, 0x0e, 0x2e, 0xdc, 0x35, 0xa9, 0x8e, 0x70, 0x1c, 0x7b, 0xbb, 0x5b, 0x1c,
-	0x57, 0x4c, 0xc8, 0x59, 0x88, 0x23, 0x22, 0x59, 0x8b, 0xdd, 0x4a, 0x96, 0x5d, 0x48, 0x21, 0x81,
-	0x30, 0x26, 0xcf, 0x18, 0xd8, 0xcc, 0xc4, 0x79, 0xd9, 0x6c, 0x21, 0x16, 0x5a, 0xda, 0xfa, 0x1f,
-	0x58, 0xfa, 0xa7, 0xd8, 0xda, 0x5b, 0x59, 0xf9, 0x57, 0x48, 0x76, 0x32, 0x11, 0x85, 0xec, 0x76,
-	0x1f, 0xc9, 0x37, 0xbf, 0x6f, 0xde, 0x37, 0xcf, 0x9a, 0xa4, 0x42, 0xa4, 0x0b, 0x70, 0x59, 0x82,
-	0xae, 0x92, 0xb5, 0xaa, 0x3c, 0x17, 0x41, 0x56, 0x59, 0x0c, 0xe8, 0xe2, 0xb9, 0x28, 0x8a, 0x8c,
-	0xa7, 0x51, 0x01, 0xf2, 0x4c, 0xc8, 0x9c, 0xf1, 0x18, 0xa2, 0x2a, 0x83, 0x55, 0xd4, 0x58, 0x48,
-	0x21, 0x45, 0x29, 0xec, 0x9e, 0x3a, 0x4e, 0x58, 0x82, 0xa4, 0x25, 0x91, 0xca, 0x23, 0x9a, 0xe4,
-	0xf8, 0x5d, 0x59, 0x12, 0x50, 0x2c, 0xe5, 0xc6, 0x30, 0x15, 0xe2, 0xfc, 0xd2, 0x88, 0x22, 0x73,
-	0x19, 0xe7, 0xa2, 0x64, 0x65, 0x26, 0x38, 0xaa, 0xbf, 0xfd, 0x89, 0xf5, 0x67, 0x0c, 0xe5, 0xbc,
-	0x61, 0x4c, 0xdf, 0x11, 0x41, 0x06, 0xab, 0x19, 0x5c, 0x2c, 0x01, 0x4b, 0x7b, 0x60, 0xfd, 0xd0,
-	0x79, 0x11, 0x67, 0x39, 0xfc, 0x34, 0x7a, 0xc6, 0xdf, 0x6f, 0xb3, 0xef, 0xfa, 0xe3, 0x31, 0xcb,
-	0xe1, 0xff, 0xb5, 0x69, 0xfd, 0xee, 0xe0, 0xcc, 0xd5, 0x38, 0xf6, 0xb3, 0x61, 0x39, 0xdd, 0x69,
-	0xf6, 0x11, 0xd9, 0xd6, 0x07, 0xd9, 0x7a, 0x57, 0x87, 0x76, 0x42, 0xda, 0xca, 0x48, 0x07, 0xa2,
-	0x7f, 0x78, 0xf3, 0xf4, 0x72, 0x67, 0xee, 0xd9, 0xbb, 0x75, 0xc3, 0x97, 0x1f, 0x46, 0x3e, 0x88,
-	0x97, 0x58, 0x8a, 0x1c, 0x24, 0xba, 0xff, 0xda, 0xca, 0x3f, 0x9d, 0xbf, 0x1a, 0xdd, 0x9a, 0xd6,
-	0x30, 0x16, 0xf9, 0xd6, 0x39, 0x46, 0x83, 0xcd, 0x4d, 0x4d, 0xeb, 0xb7, 0x99, 0x1a, 0x27, 0xcd,
-	0xaa, 0x91, 0x54, 0x2c, 0x18, 0x4f, 0x89, 0x90, 0xa9, 0x9b, 0x02, 0x5f, 0xbf, 0x9c, 0x5e, 0x87,
-	0x22, 0xc3, 0xee, 0x4d, 0xdc, 0xd7, 0xe2, 0xde, 0xfc, 0x32, 0xf6, 0xfd, 0x07, 0xb3, 0x37, 0x56,
-	0x40, 0x3f, 0x41, 0xa2, 0x64, 0xad, 0x02, 0x8f, 0x34, 0xc1, 0xf8, 0xa8, 0x2d, 0xa1, 0x9f, 0x60,
-	0xd8, 0x5a, 0xc2, 0xc0, 0x0b, 0xb5, 0xe5, 0xd5, 0x1c, 0xaa, 0xef, 0x94, 0xfa, 0x09, 0x52, 0xda,
-	0x9a, 0x28, 0x0d, 0x3c, 0x4a, 0xb5, 0xed, 0xf4, 0xeb, 0xfa, 0x9e, 0x3b, 0x6f, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x6b, 0x59, 0x13, 0x0f, 0x30, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/topic_constant_service.pb.go b/googleapis/ads/googleads/v1/services/topic_constant_service.pb.go
index ab8462e585..fe0ba424a9 100644
--- a/googleapis/ads/googleads/v1/services/topic_constant_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/topic_constant_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/topic_constant_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [TopicConstantService.GetTopicConstant][google.ads.googleads.v1.services.TopicConstantService.GetTopicConstant].
 type GetTopicConstantRequest struct {
@@ -38,16 +38,17 @@ func (m *GetTopicConstantRequest) Reset()         { *m = GetTopicConstantRequest
 func (m *GetTopicConstantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTopicConstantRequest) ProtoMessage()    {}
 func (*GetTopicConstantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topic_constant_service_a951bc1267bf7762, []int{0}
+	return fileDescriptor_49736dbc2500820f, []int{0}
 }
+
 func (m *GetTopicConstantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTopicConstantRequest.Unmarshal(m, b)
 }
 func (m *GetTopicConstantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTopicConstantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTopicConstantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTopicConstantRequest.Merge(dst, src)
+func (m *GetTopicConstantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopicConstantRequest.Merge(m, src)
 }
 func (m *GetTopicConstantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTopicConstantRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetTopicConstantRequest)(nil), "google.ads.googleads.v1.services.GetTopicConstantRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/topic_constant_service.proto", fileDescriptor_49736dbc2500820f)
+}
+
+var fileDescriptor_49736dbc2500820f = []byte{
+	// 354 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4d, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xe2, 0xd4,
+	0xa2, 0xb2, 0xcc, 0xe4, 0xd4, 0x62, 0xfd, 0x92, 0xfc, 0x82, 0xcc, 0xe4, 0xf8, 0xe4, 0xfc, 0xbc,
+	0xe2, 0x92, 0xc4, 0xbc, 0x92, 0x78, 0xa8, 0xb8, 0x5e, 0x41, 0x51, 0x7e, 0x49, 0xbe, 0x90, 0x02,
+	0x44, 0x8f, 0x5e, 0x62, 0x4a, 0xb1, 0x1e, 0x5c, 0xbb, 0x5e, 0x99, 0xa1, 0x1e, 0x4c, 0xbb, 0x94,
+	0x19, 0x2e, 0x0b, 0x8a, 0x52, 0x8b, 0xf3, 0x4b, 0x8b, 0x30, 0x6d, 0x80, 0x98, 0x2c, 0x25, 0x03,
+	0xd3, 0x57, 0x90, 0xa9, 0x9f, 0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99, 0x9f, 0x57, 0x0c,
+	0x91, 0x55, 0xb2, 0xe3, 0x12, 0x77, 0x4f, 0x2d, 0x09, 0x01, 0x69, 0x74, 0x86, 0xea, 0x0b, 0x4a,
+	0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0x52, 0xe6, 0xe2, 0x85, 0x19, 0x1d, 0x9f, 0x97, 0x98, 0x9b,
+	0x2a, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x03, 0x13, 0xf4, 0x4b, 0xcc, 0x4d, 0x35, 0x3a,
+	0xc6, 0xc8, 0x25, 0x82, 0xa2, 0x3b, 0x18, 0xe2, 0x5e, 0xa1, 0xb5, 0x8c, 0x5c, 0x02, 0xe8, 0x26,
+	0x0b, 0x59, 0xea, 0x11, 0xf2, 0xa6, 0x1e, 0x0e, 0xd7, 0x48, 0x19, 0xe0, 0xd4, 0x0a, 0xf7, 0xbf,
+	0x1e, 0x8a, 0x46, 0x25, 0x9d, 0xa6, 0xcb, 0x4f, 0x26, 0x33, 0xa9, 0x09, 0xa9, 0x80, 0x02, 0xa9,
+	0x1a, 0xc5, 0x2b, 0xb6, 0x25, 0xc8, 0x2a, 0x8b, 0xf5, 0xb5, 0x6a, 0x9d, 0x1a, 0x98, 0xb8, 0x54,
+	0x92, 0xf3, 0x73, 0x09, 0x3a, 0xd0, 0x49, 0x12, 0x9b, 0x77, 0x03, 0x40, 0x81, 0x19, 0xc0, 0x18,
+	0xe5, 0x01, 0xd5, 0x9e, 0x9e, 0x9f, 0x93, 0x98, 0x97, 0xae, 0x97, 0x5f, 0x94, 0xae, 0x9f, 0x9e,
+	0x9a, 0x07, 0x0e, 0x6a, 0x58, 0xa4, 0x15, 0x64, 0x16, 0xe3, 0x4e, 0x24, 0xd6, 0x30, 0xc6, 0x22,
+	0x26, 0x66, 0x77, 0x47, 0xc7, 0x55, 0x4c, 0x0a, 0xee, 0x10, 0x03, 0x1d, 0x53, 0x8a, 0xf5, 0x20,
+	0x4c, 0x10, 0x2b, 0xcc, 0x50, 0x0f, 0x6a, 0x71, 0xf1, 0x29, 0x98, 0x92, 0x18, 0xc7, 0x94, 0xe2,
+	0x18, 0xb8, 0x92, 0x98, 0x30, 0xc3, 0x18, 0x98, 0x92, 0x57, 0x4c, 0x2a, 0x10, 0x71, 0x2b, 0x2b,
+	0xc7, 0x94, 0x62, 0x2b, 0x2b, 0xb8, 0x22, 0x2b, 0xab, 0x30, 0x43, 0x2b, 0x2b, 0x98, 0xb2, 0x24,
+	0x36, 0xb0, 0x3b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x19, 0x59, 0x7b, 0xd1, 0xcb, 0x02,
+	0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _TopicConstantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/topic_constant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/topic_constant_service.proto", fileDescriptor_topic_constant_service_a951bc1267bf7762)
-}
-
-var fileDescriptor_topic_constant_service_a951bc1267bf7762 = []byte{
-	// 354 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4d, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xe2, 0xd4,
-	0xa2, 0xb2, 0xcc, 0xe4, 0xd4, 0x62, 0xfd, 0x92, 0xfc, 0x82, 0xcc, 0xe4, 0xf8, 0xe4, 0xfc, 0xbc,
-	0xe2, 0x92, 0xc4, 0xbc, 0x92, 0x78, 0xa8, 0xb8, 0x5e, 0x41, 0x51, 0x7e, 0x49, 0xbe, 0x90, 0x02,
-	0x44, 0x8f, 0x5e, 0x62, 0x4a, 0xb1, 0x1e, 0x5c, 0xbb, 0x5e, 0x99, 0xa1, 0x1e, 0x4c, 0xbb, 0x94,
-	0x19, 0x2e, 0x0b, 0x8a, 0x52, 0x8b, 0xf3, 0x4b, 0x8b, 0x30, 0x6d, 0x80, 0x98, 0x2c, 0x25, 0x03,
-	0xd3, 0x57, 0x90, 0xa9, 0x9f, 0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99, 0x9f, 0x57, 0x0c,
-	0x91, 0x55, 0xb2, 0xe3, 0x12, 0x77, 0x4f, 0x2d, 0x09, 0x01, 0x69, 0x74, 0x86, 0xea, 0x0b, 0x4a,
-	0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0x52, 0xe6, 0xe2, 0x85, 0x19, 0x1d, 0x9f, 0x97, 0x98, 0x9b,
-	0x2a, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x03, 0x13, 0xf4, 0x4b, 0xcc, 0x4d, 0x35, 0x3a,
-	0xc6, 0xc8, 0x25, 0x82, 0xa2, 0x3b, 0x18, 0xe2, 0x5e, 0xa1, 0xb5, 0x8c, 0x5c, 0x02, 0xe8, 0x26,
-	0x0b, 0x59, 0xea, 0x11, 0xf2, 0xa6, 0x1e, 0x0e, 0xd7, 0x48, 0x19, 0xe0, 0xd4, 0x0a, 0xf7, 0xbf,
-	0x1e, 0x8a, 0x46, 0x25, 0x9d, 0xa6, 0xcb, 0x4f, 0x26, 0x33, 0xa9, 0x09, 0xa9, 0x80, 0x02, 0xa9,
-	0x1a, 0xc5, 0x2b, 0xb6, 0x25, 0xc8, 0x2a, 0x8b, 0xf5, 0xb5, 0x6a, 0x9d, 0x1a, 0x98, 0xb8, 0x54,
-	0x92, 0xf3, 0x73, 0x09, 0x3a, 0xd0, 0x49, 0x12, 0x9b, 0x77, 0x03, 0x40, 0x81, 0x19, 0xc0, 0x18,
-	0xe5, 0x01, 0xd5, 0x9e, 0x9e, 0x9f, 0x93, 0x98, 0x97, 0xae, 0x97, 0x5f, 0x94, 0xae, 0x9f, 0x9e,
-	0x9a, 0x07, 0x0e, 0x6a, 0x58, 0xa4, 0x15, 0x64, 0x16, 0xe3, 0x4e, 0x24, 0xd6, 0x30, 0xc6, 0x22,
-	0x26, 0x66, 0x77, 0x47, 0xc7, 0x55, 0x4c, 0x0a, 0xee, 0x10, 0x03, 0x1d, 0x53, 0x8a, 0xf5, 0x20,
-	0x4c, 0x10, 0x2b, 0xcc, 0x50, 0x0f, 0x6a, 0x71, 0xf1, 0x29, 0x98, 0x92, 0x18, 0xc7, 0x94, 0xe2,
-	0x18, 0xb8, 0x92, 0x98, 0x30, 0xc3, 0x18, 0x98, 0x92, 0x57, 0x4c, 0x2a, 0x10, 0x71, 0x2b, 0x2b,
-	0xc7, 0x94, 0x62, 0x2b, 0x2b, 0xb8, 0x22, 0x2b, 0xab, 0x30, 0x43, 0x2b, 0x2b, 0x98, 0xb2, 0x24,
-	0x36, 0xb0, 0x3b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x19, 0x59, 0x7b, 0xd1, 0xcb, 0x02,
-	0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/topic_view_service.pb.go b/googleapis/ads/googleads/v1/services/topic_view_service.pb.go
index d6f3b3b0dd..9969fbbbf7 100644
--- a/googleapis/ads/googleads/v1/services/topic_view_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/topic_view_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/topic_view_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [TopicViewService.GetTopicView][google.ads.googleads.v1.services.TopicViewService.GetTopicView].
 type GetTopicViewRequest struct {
@@ -38,16 +38,17 @@ func (m *GetTopicViewRequest) Reset()         { *m = GetTopicViewRequest{} }
 func (m *GetTopicViewRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTopicViewRequest) ProtoMessage()    {}
 func (*GetTopicViewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_topic_view_service_42250129c59eb567, []int{0}
+	return fileDescriptor_dddb7cd398291139, []int{0}
 }
+
 func (m *GetTopicViewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTopicViewRequest.Unmarshal(m, b)
 }
 func (m *GetTopicViewRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTopicViewRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTopicViewRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTopicViewRequest.Merge(dst, src)
+func (m *GetTopicViewRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopicViewRequest.Merge(m, src)
 }
 func (m *GetTopicViewRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTopicViewRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetTopicViewRequest)(nil), "google.ads.googleads.v1.services.GetTopicViewRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/topic_view_service.proto", fileDescriptor_dddb7cd398291139)
+}
+
+var fileDescriptor_dddb7cd398291139 = []byte{
+	// 363 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xe2, 0xd4,
+	0xa2, 0xb2, 0xcc, 0xe4, 0xd4, 0x62, 0xfd, 0x92, 0xfc, 0x82, 0xcc, 0xe4, 0xf8, 0xb2, 0xcc, 0xd4,
+	0xf2, 0x78, 0xa8, 0x98, 0x5e, 0x41, 0x51, 0x7e, 0x49, 0xbe, 0x90, 0x02, 0x44, 0xbd, 0x5e, 0x62,
+	0x4a, 0xb1, 0x1e, 0x5c, 0xab, 0x5e, 0x99, 0xa1, 0x1e, 0x4c, 0xab, 0x94, 0x11, 0x2e, 0xc3, 0x8b,
+	0x52, 0x8b, 0xf3, 0x4b, 0x8b, 0x50, 0x4d, 0x87, 0x98, 0x2a, 0x25, 0x03, 0xd3, 0x53, 0x90, 0xa9,
+	0x9f, 0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99, 0x9f, 0x57, 0x0c, 0x91, 0x55, 0xb2, 0xe2,
+	0x12, 0x76, 0x4f, 0x2d, 0x09, 0x01, 0x69, 0x0a, 0xcb, 0x4c, 0x2d, 0x0f, 0x4a, 0x2d, 0x2c, 0x4d,
+	0x2d, 0x2e, 0x11, 0x52, 0xe6, 0xe2, 0x85, 0x19, 0x19, 0x9f, 0x97, 0x98, 0x9b, 0x2a, 0xc1, 0xa8,
+	0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x03, 0x13, 0xf4, 0x4b, 0xcc, 0x4d, 0x35, 0xda, 0xc7, 0xc8, 0x25,
+	0x00, 0xd7, 0x19, 0x0c, 0x71, 0xa3, 0xd0, 0x4a, 0x46, 0x2e, 0x1e, 0x64, 0x13, 0x85, 0x4c, 0xf5,
+	0x08, 0x79, 0x4b, 0x0f, 0x8b, 0x0b, 0xa4, 0x74, 0x70, 0x6a, 0x83, 0xfb, 0x55, 0x0f, 0xae, 0x49,
+	0xc9, 0xa4, 0xe9, 0xf2, 0x93, 0xc9, 0x4c, 0x7a, 0x42, 0x3a, 0xa0, 0xc0, 0xa8, 0x46, 0x71, 0xba,
+	0x6d, 0x72, 0x69, 0x71, 0x49, 0x7e, 0x6e, 0x6a, 0x51, 0xb1, 0xbe, 0x16, 0x24, 0x74, 0x40, 0x3a,
+	0x8a, 0xf5, 0xb5, 0x6a, 0x9d, 0xfe, 0x30, 0x72, 0xa9, 0x24, 0xe7, 0xe7, 0x12, 0x74, 0xa0, 0x93,
+	0x28, 0xba, 0x37, 0x03, 0x40, 0x81, 0x17, 0xc0, 0x18, 0xe5, 0x01, 0xd5, 0x9a, 0x9e, 0x9f, 0x93,
+	0x98, 0x97, 0xae, 0x97, 0x5f, 0x94, 0xae, 0x9f, 0x9e, 0x9a, 0x07, 0x0e, 0x5a, 0x58, 0x04, 0x15,
+	0x64, 0x16, 0xe3, 0x4e, 0x0c, 0xd6, 0x30, 0xc6, 0x22, 0x26, 0x66, 0x77, 0x47, 0xc7, 0x55, 0x4c,
+	0x0a, 0xee, 0x10, 0x03, 0x1d, 0x53, 0x8a, 0xf5, 0x20, 0x4c, 0x10, 0x2b, 0xcc, 0x50, 0x0f, 0x6a,
+	0x71, 0xf1, 0x29, 0x98, 0x92, 0x18, 0xc7, 0x94, 0xe2, 0x18, 0xb8, 0x92, 0x98, 0x30, 0xc3, 0x18,
+	0x98, 0x92, 0x57, 0x4c, 0x2a, 0x10, 0x71, 0x2b, 0x2b, 0xc7, 0x94, 0x62, 0x2b, 0x2b, 0xb8, 0x22,
+	0x2b, 0xab, 0x30, 0x43, 0x2b, 0x2b, 0x98, 0xb2, 0x24, 0x36, 0xb0, 0x3b, 0x8d, 0x01, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x5f, 0xc0, 0x75, 0x26, 0xb3, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _TopicViewService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/topic_view_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/topic_view_service.proto", fileDescriptor_topic_view_service_42250129c59eb567)
-}
-
-var fileDescriptor_topic_view_service_42250129c59eb567 = []byte{
-	// 363 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x4f, 0x4c, 0x29, 0xd6, 0x87, 0x30, 0x41, 0xac, 0x32, 0x43, 0xfd, 0xe2, 0xd4,
-	0xa2, 0xb2, 0xcc, 0xe4, 0xd4, 0x62, 0xfd, 0x92, 0xfc, 0x82, 0xcc, 0xe4, 0xf8, 0xb2, 0xcc, 0xd4,
-	0xf2, 0x78, 0xa8, 0x98, 0x5e, 0x41, 0x51, 0x7e, 0x49, 0xbe, 0x90, 0x02, 0x44, 0xbd, 0x5e, 0x62,
-	0x4a, 0xb1, 0x1e, 0x5c, 0xab, 0x5e, 0x99, 0xa1, 0x1e, 0x4c, 0xab, 0x94, 0x11, 0x2e, 0xc3, 0x8b,
-	0x52, 0x8b, 0xf3, 0x4b, 0x8b, 0x50, 0x4d, 0x87, 0x98, 0x2a, 0x25, 0x03, 0xd3, 0x53, 0x90, 0xa9,
-	0x9f, 0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99, 0x9f, 0x57, 0x0c, 0x91, 0x55, 0xb2, 0xe2,
-	0x12, 0x76, 0x4f, 0x2d, 0x09, 0x01, 0x69, 0x0a, 0xcb, 0x4c, 0x2d, 0x0f, 0x4a, 0x2d, 0x2c, 0x4d,
-	0x2d, 0x2e, 0x11, 0x52, 0xe6, 0xe2, 0x85, 0x19, 0x19, 0x9f, 0x97, 0x98, 0x9b, 0x2a, 0xc1, 0xa8,
-	0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x03, 0x13, 0xf4, 0x4b, 0xcc, 0x4d, 0x35, 0xda, 0xc7, 0xc8, 0x25,
-	0x00, 0xd7, 0x19, 0x0c, 0x71, 0xa3, 0xd0, 0x4a, 0x46, 0x2e, 0x1e, 0x64, 0x13, 0x85, 0x4c, 0xf5,
-	0x08, 0x79, 0x4b, 0x0f, 0x8b, 0x0b, 0xa4, 0x74, 0x70, 0x6a, 0x83, 0xfb, 0x55, 0x0f, 0xae, 0x49,
-	0xc9, 0xa4, 0xe9, 0xf2, 0x93, 0xc9, 0x4c, 0x7a, 0x42, 0x3a, 0xa0, 0xc0, 0xa8, 0x46, 0x71, 0xba,
-	0x6d, 0x72, 0x69, 0x71, 0x49, 0x7e, 0x6e, 0x6a, 0x51, 0xb1, 0xbe, 0x16, 0x24, 0x74, 0x40, 0x3a,
-	0x8a, 0xf5, 0xb5, 0x6a, 0x9d, 0xfe, 0x30, 0x72, 0xa9, 0x24, 0xe7, 0xe7, 0x12, 0x74, 0xa0, 0x93,
-	0x28, 0xba, 0x37, 0x03, 0x40, 0x81, 0x17, 0xc0, 0x18, 0xe5, 0x01, 0xd5, 0x9a, 0x9e, 0x9f, 0x93,
-	0x98, 0x97, 0xae, 0x97, 0x5f, 0x94, 0xae, 0x9f, 0x9e, 0x9a, 0x07, 0x0e, 0x5a, 0x58, 0x04, 0x15,
-	0x64, 0x16, 0xe3, 0x4e, 0x0c, 0xd6, 0x30, 0xc6, 0x22, 0x26, 0x66, 0x77, 0x47, 0xc7, 0x55, 0x4c,
-	0x0a, 0xee, 0x10, 0x03, 0x1d, 0x53, 0x8a, 0xf5, 0x20, 0x4c, 0x10, 0x2b, 0xcc, 0x50, 0x0f, 0x6a,
-	0x71, 0xf1, 0x29, 0x98, 0x92, 0x18, 0xc7, 0x94, 0xe2, 0x18, 0xb8, 0x92, 0x98, 0x30, 0xc3, 0x18,
-	0x98, 0x92, 0x57, 0x4c, 0x2a, 0x10, 0x71, 0x2b, 0x2b, 0xc7, 0x94, 0x62, 0x2b, 0x2b, 0xb8, 0x22,
-	0x2b, 0xab, 0x30, 0x43, 0x2b, 0x2b, 0x98, 0xb2, 0x24, 0x36, 0xb0, 0x3b, 0x8d, 0x01, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x5f, 0xc0, 0x75, 0x26, 0xb3, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/user_interest_service.pb.go b/googleapis/ads/googleads/v1/services/user_interest_service.pb.go
index e8f8c2a80a..5ef3abaed8 100644
--- a/googleapis/ads/googleads/v1/services/user_interest_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/user_interest_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/user_interest_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [UserInterestService.GetUserInterest][google.ads.googleads.v1.services.UserInterestService.GetUserInterest].
 type GetUserInterestRequest struct {
@@ -38,16 +38,17 @@ func (m *GetUserInterestRequest) Reset()         { *m = GetUserInterestRequest{}
 func (m *GetUserInterestRequest) String() string { return proto.CompactTextString(m) }
 func (*GetUserInterestRequest) ProtoMessage()    {}
 func (*GetUserInterestRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_interest_service_76561fc7778b0898, []int{0}
+	return fileDescriptor_b25977798af6b285, []int{0}
 }
+
 func (m *GetUserInterestRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUserInterestRequest.Unmarshal(m, b)
 }
 func (m *GetUserInterestRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetUserInterestRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetUserInterestRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetUserInterestRequest.Merge(dst, src)
+func (m *GetUserInterestRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUserInterestRequest.Merge(m, src)
 }
 func (m *GetUserInterestRequest) XXX_Size() int {
 	return xxx_messageInfo_GetUserInterestRequest.Size(m)
@@ -69,6 +70,37 @@ func init() {
 	proto.RegisterType((*GetUserInterestRequest)(nil), "google.ads.googleads.v1.services.GetUserInterestRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/user_interest_service.proto", fileDescriptor_b25977798af6b285)
+}
+
+var fileDescriptor_b25977798af6b285 = []byte{
+	// 364 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4a, 0xeb, 0x40,
+	0x14, 0xc6, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0x5e, 0x2e, 0x44, 0x90, 0x52, 0x5c, 0x94, 0xda, 0x85,
+	0x74, 0x31, 0x43, 0x14, 0x51, 0x46, 0xbb, 0x48, 0x37, 0xd5, 0x8d, 0x94, 0x8a, 0x5d, 0x48, 0xa0,
+	0x8c, 0xcd, 0x21, 0x04, 0x9a, 0x99, 0x3a, 0x67, 0xd2, 0x8d, 0xb8, 0xf1, 0x15, 0x7c, 0x03, 0x97,
+	0xee, 0x7d, 0x09, 0xc1, 0x95, 0xaf, 0xe0, 0xca, 0x97, 0x50, 0xd2, 0xc9, 0x84, 0xaa, 0x2d, 0xdd,
+	0x7d, 0x9c, 0x7c, 0xbf, 0xef, 0xfc, 0xc9, 0x78, 0xc7, 0x89, 0x94, 0xc9, 0x04, 0x28, 0x8f, 0x91,
+	0x1a, 0x59, 0xa8, 0x59, 0x40, 0x11, 0xd4, 0x2c, 0x1d, 0x03, 0xd2, 0x1c, 0x41, 0x8d, 0x52, 0xa1,
+	0x41, 0x01, 0xea, 0x51, 0x59, 0x26, 0x53, 0x25, 0xb5, 0xf4, 0x1b, 0x06, 0x21, 0x3c, 0x46, 0x52,
+	0xd1, 0x64, 0x16, 0x10, 0x4b, 0xd7, 0xf7, 0x57, 0xe5, 0x2b, 0x40, 0x99, 0xab, 0x1f, 0x0d, 0x4c,
+	0x70, 0x7d, 0xcb, 0x62, 0xd3, 0x94, 0x72, 0x21, 0xa4, 0xe6, 0x3a, 0x95, 0x02, 0xcd, 0xd7, 0x66,
+	0xc7, 0xdb, 0xec, 0x81, 0xbe, 0x40, 0x50, 0xa7, 0x25, 0x36, 0x80, 0xeb, 0x1c, 0x50, 0xfb, 0xdb,
+	0xde, 0x3f, 0x1b, 0x3c, 0x12, 0x3c, 0x83, 0x9a, 0xd3, 0x70, 0x76, 0xfe, 0x0c, 0xfe, 0xda, 0xe2,
+	0x19, 0xcf, 0x60, 0xf7, 0xc5, 0xf1, 0x36, 0x16, 0xe1, 0x73, 0x33, 0xac, 0xff, 0xe4, 0x78, 0xff,
+	0xbf, 0xe5, 0xfa, 0x87, 0x64, 0xdd, 0x8a, 0x64, 0xf9, 0x28, 0x75, 0xba, 0x92, 0xac, 0x56, 0x27,
+	0x8b, 0x5c, 0xf3, 0xe0, 0xee, 0xf5, 0xed, 0xde, 0x0d, 0x7c, 0x5a, 0x9c, 0xe7, 0xe6, 0xcb, 0x1a,
+	0x9d, 0x71, 0x8e, 0x5a, 0x66, 0xa0, 0x90, 0xb6, 0xe7, 0xf7, 0xb2, 0x10, 0xd2, 0xf6, 0x6d, 0xf7,
+	0xc3, 0xf1, 0x5a, 0x63, 0x99, 0xad, 0x9d, 0xb4, 0x5b, 0x5b, 0xb2, 0x75, 0xbf, 0xb8, 0x68, 0xdf,
+	0xb9, 0x3c, 0x29, 0xe9, 0x44, 0x4e, 0xb8, 0x48, 0x88, 0x54, 0x09, 0x4d, 0x40, 0xcc, 0xef, 0x6d,
+	0x7f, 0xdc, 0x34, 0xc5, 0xd5, 0xef, 0xe4, 0xc8, 0x8a, 0x07, 0xf7, 0x57, 0x2f, 0x0c, 0x1f, 0xdd,
+	0x46, 0xcf, 0x04, 0x86, 0x31, 0x12, 0x23, 0x0b, 0x35, 0x0c, 0x48, 0xd9, 0x18, 0x9f, 0xad, 0x25,
+	0x0a, 0x63, 0x8c, 0x2a, 0x4b, 0x34, 0x0c, 0x22, 0x6b, 0x79, 0x77, 0x5b, 0xa6, 0xce, 0x58, 0x18,
+	0x23, 0x63, 0x95, 0x89, 0xb1, 0x61, 0xc0, 0x98, 0xb5, 0x5d, 0xfd, 0x9e, 0xcf, 0xb9, 0xf7, 0x19,
+	0x00, 0x00, 0xff, 0xff, 0x92, 0xe6, 0xf7, 0x12, 0xce, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,34 +174,3 @@ var _UserInterestService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/user_interest_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/user_interest_service.proto", fileDescriptor_user_interest_service_76561fc7778b0898)
-}
-
-var fileDescriptor_user_interest_service_76561fc7778b0898 = []byte{
-	// 364 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4a, 0xeb, 0x40,
-	0x14, 0xc6, 0x49, 0x2e, 0x5c, 0xb8, 0xe1, 0x5e, 0x2e, 0x44, 0x90, 0x52, 0x5c, 0x94, 0xda, 0x85,
-	0x74, 0x31, 0x43, 0x14, 0x51, 0x46, 0xbb, 0x48, 0x37, 0xd5, 0x8d, 0x94, 0x8a, 0x5d, 0x48, 0xa0,
-	0x8c, 0xcd, 0x21, 0x04, 0x9a, 0x99, 0x3a, 0x67, 0xd2, 0x8d, 0xb8, 0xf1, 0x15, 0x7c, 0x03, 0x97,
-	0xee, 0x7d, 0x09, 0xc1, 0x95, 0xaf, 0xe0, 0xca, 0x97, 0x50, 0xd2, 0xc9, 0x84, 0xaa, 0x2d, 0xdd,
-	0x7d, 0x9c, 0x7c, 0xbf, 0xef, 0xfc, 0xc9, 0x78, 0xc7, 0x89, 0x94, 0xc9, 0x04, 0x28, 0x8f, 0x91,
-	0x1a, 0x59, 0xa8, 0x59, 0x40, 0x11, 0xd4, 0x2c, 0x1d, 0x03, 0xd2, 0x1c, 0x41, 0x8d, 0x52, 0xa1,
-	0x41, 0x01, 0xea, 0x51, 0x59, 0x26, 0x53, 0x25, 0xb5, 0xf4, 0x1b, 0x06, 0x21, 0x3c, 0x46, 0x52,
-	0xd1, 0x64, 0x16, 0x10, 0x4b, 0xd7, 0xf7, 0x57, 0xe5, 0x2b, 0x40, 0x99, 0xab, 0x1f, 0x0d, 0x4c,
-	0x70, 0x7d, 0xcb, 0x62, 0xd3, 0x94, 0x72, 0x21, 0xa4, 0xe6, 0x3a, 0x95, 0x02, 0xcd, 0xd7, 0x66,
-	0xc7, 0xdb, 0xec, 0x81, 0xbe, 0x40, 0x50, 0xa7, 0x25, 0x36, 0x80, 0xeb, 0x1c, 0x50, 0xfb, 0xdb,
-	0xde, 0x3f, 0x1b, 0x3c, 0x12, 0x3c, 0x83, 0x9a, 0xd3, 0x70, 0x76, 0xfe, 0x0c, 0xfe, 0xda, 0xe2,
-	0x19, 0xcf, 0x60, 0xf7, 0xc5, 0xf1, 0x36, 0x16, 0xe1, 0x73, 0x33, 0xac, 0xff, 0xe4, 0x78, 0xff,
-	0xbf, 0xe5, 0xfa, 0x87, 0x64, 0xdd, 0x8a, 0x64, 0xf9, 0x28, 0x75, 0xba, 0x92, 0xac, 0x56, 0x27,
-	0x8b, 0x5c, 0xf3, 0xe0, 0xee, 0xf5, 0xed, 0xde, 0x0d, 0x7c, 0x5a, 0x9c, 0xe7, 0xe6, 0xcb, 0x1a,
-	0x9d, 0x71, 0x8e, 0x5a, 0x66, 0xa0, 0x90, 0xb6, 0xe7, 0xf7, 0xb2, 0x10, 0xd2, 0xf6, 0x6d, 0xf7,
-	0xc3, 0xf1, 0x5a, 0x63, 0x99, 0xad, 0x9d, 0xb4, 0x5b, 0x5b, 0xb2, 0x75, 0xbf, 0xb8, 0x68, 0xdf,
-	0xb9, 0x3c, 0x29, 0xe9, 0x44, 0x4e, 0xb8, 0x48, 0x88, 0x54, 0x09, 0x4d, 0x40, 0xcc, 0xef, 0x6d,
-	0x7f, 0xdc, 0x34, 0xc5, 0xd5, 0xef, 0xe4, 0xc8, 0x8a, 0x07, 0xf7, 0x57, 0x2f, 0x0c, 0x1f, 0xdd,
-	0x46, 0xcf, 0x04, 0x86, 0x31, 0x12, 0x23, 0x0b, 0x35, 0x0c, 0x48, 0xd9, 0x18, 0x9f, 0xad, 0x25,
-	0x0a, 0x63, 0x8c, 0x2a, 0x4b, 0x34, 0x0c, 0x22, 0x6b, 0x79, 0x77, 0x5b, 0xa6, 0xce, 0x58, 0x18,
-	0x23, 0x63, 0x95, 0x89, 0xb1, 0x61, 0xc0, 0x98, 0xb5, 0x5d, 0xfd, 0x9e, 0xcf, 0xb9, 0xf7, 0x19,
-	0x00, 0x00, 0xff, 0xff, 0x92, 0xe6, 0xf7, 0x12, 0xce, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/user_list_service.pb.go b/googleapis/ads/googleads/v1/services/user_list_service.pb.go
index f5c29519fc..059b54e868 100644
--- a/googleapis/ads/googleads/v1/services/user_list_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/user_list_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/user_list_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [UserListService.GetUserList][google.ads.googleads.v1.services.UserListService.GetUserList].
 type GetUserListRequest struct {
@@ -41,16 +41,17 @@ func (m *GetUserListRequest) Reset()         { *m = GetUserListRequest{} }
 func (m *GetUserListRequest) String() string { return proto.CompactTextString(m) }
 func (*GetUserListRequest) ProtoMessage()    {}
 func (*GetUserListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_service_a2edc6a3997d8389, []int{0}
+	return fileDescriptor_7187e04d3c35e864, []int{0}
 }
+
 func (m *GetUserListRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUserListRequest.Unmarshal(m, b)
 }
 func (m *GetUserListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetUserListRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetUserListRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetUserListRequest.Merge(dst, src)
+func (m *GetUserListRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUserListRequest.Merge(m, src)
 }
 func (m *GetUserListRequest) XXX_Size() int {
 	return xxx_messageInfo_GetUserListRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *MutateUserListsRequest) Reset()         { *m = MutateUserListsRequest{}
 func (m *MutateUserListsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateUserListsRequest) ProtoMessage()    {}
 func (*MutateUserListsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_service_a2edc6a3997d8389, []int{1}
+	return fileDescriptor_7187e04d3c35e864, []int{1}
 }
+
 func (m *MutateUserListsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateUserListsRequest.Unmarshal(m, b)
 }
 func (m *MutateUserListsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateUserListsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateUserListsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateUserListsRequest.Merge(dst, src)
+func (m *MutateUserListsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateUserListsRequest.Merge(m, src)
 }
 func (m *MutateUserListsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateUserListsRequest.Size(m)
@@ -159,16 +161,17 @@ func (m *UserListOperation) Reset()         { *m = UserListOperation{} }
 func (m *UserListOperation) String() string { return proto.CompactTextString(m) }
 func (*UserListOperation) ProtoMessage()    {}
 func (*UserListOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_service_a2edc6a3997d8389, []int{2}
+	return fileDescriptor_7187e04d3c35e864, []int{2}
 }
+
 func (m *UserListOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListOperation.Unmarshal(m, b)
 }
 func (m *UserListOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserListOperation.Marshal(b, m, deterministic)
 }
-func (dst *UserListOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserListOperation.Merge(dst, src)
+func (m *UserListOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserListOperation.Merge(m, src)
 }
 func (m *UserListOperation) XXX_Size() int {
 	return xxx_messageInfo_UserListOperation.Size(m)
@@ -236,95 +239,15 @@ func (m *UserListOperation) GetRemove() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*UserListOperation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _UserListOperation_OneofMarshaler, _UserListOperation_OneofUnmarshaler, _UserListOperation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*UserListOperation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*UserListOperation_Create)(nil),
 		(*UserListOperation_Update)(nil),
 		(*UserListOperation_Remove)(nil),
 	}
 }
 
-func _UserListOperation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*UserListOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *UserListOperation_Create:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *UserListOperation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *UserListOperation_Remove:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Remove)
-	case nil:
-	default:
-		return fmt.Errorf("UserListOperation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _UserListOperation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*UserListOperation)
-	switch tag {
-	case 1: // operation.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.UserList)
-		err := b.DecodeMessage(msg)
-		m.Operation = &UserListOperation_Create{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(resources.UserList)
-		err := b.DecodeMessage(msg)
-		m.Operation = &UserListOperation_Update{msg}
-		return true, err
-	case 3: // operation.remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &UserListOperation_Remove{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _UserListOperation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*UserListOperation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *UserListOperation_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserListOperation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UserListOperation_Remove:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Remove)))
-		n += len(x.Remove)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for user list mutate.
 type MutateUserListsResponse struct {
 	// Errors that pertain to operation failures in the partial failure mode.
@@ -343,16 +266,17 @@ func (m *MutateUserListsResponse) Reset()         { *m = MutateUserListsResponse
 func (m *MutateUserListsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateUserListsResponse) ProtoMessage()    {}
 func (*MutateUserListsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_service_a2edc6a3997d8389, []int{3}
+	return fileDescriptor_7187e04d3c35e864, []int{3}
 }
+
 func (m *MutateUserListsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateUserListsResponse.Unmarshal(m, b)
 }
 func (m *MutateUserListsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateUserListsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateUserListsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateUserListsResponse.Merge(dst, src)
+func (m *MutateUserListsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateUserListsResponse.Merge(m, src)
 }
 func (m *MutateUserListsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateUserListsResponse.Size(m)
@@ -390,16 +314,17 @@ func (m *MutateUserListResult) Reset()         { *m = MutateUserListResult{} }
 func (m *MutateUserListResult) String() string { return proto.CompactTextString(m) }
 func (*MutateUserListResult) ProtoMessage()    {}
 func (*MutateUserListResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_list_service_a2edc6a3997d8389, []int{4}
+	return fileDescriptor_7187e04d3c35e864, []int{4}
 }
+
 func (m *MutateUserListResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateUserListResult.Unmarshal(m, b)
 }
 func (m *MutateUserListResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateUserListResult.Marshal(b, m, deterministic)
 }
-func (dst *MutateUserListResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateUserListResult.Merge(dst, src)
+func (m *MutateUserListResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateUserListResult.Merge(m, src)
 }
 func (m *MutateUserListResult) XXX_Size() int {
 	return xxx_messageInfo_MutateUserListResult.Size(m)
@@ -425,6 +350,59 @@ func init() {
 	proto.RegisterType((*MutateUserListResult)(nil), "google.ads.googleads.v1.services.MutateUserListResult")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/user_list_service.proto", fileDescriptor_7187e04d3c35e864)
+}
+
+var fileDescriptor_7187e04d3c35e864 = []byte{
+	// 710 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0xd4, 0x4e,
+	0x18, 0xfe, 0x25, 0xfd, 0x51, 0xed, 0xa4, 0x5a, 0x1c, 0xab, 0x5d, 0x16, 0xd1, 0x25, 0x16, 0x2c,
+	0x5b, 0x9c, 0xb0, 0xbb, 0x22, 0x6d, 0x4a, 0x0f, 0x5b, 0xe8, 0x1f, 0xc1, 0xda, 0x92, 0x62, 0x0f,
+	0xb2, 0x10, 0xa6, 0x9b, 0xe9, 0x12, 0x9a, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0x04, 0x3f,
+	0x81, 0xdf, 0x40, 0xf0, 0xe2, 0xd5, 0x4f, 0xe0, 0xd5, 0xab, 0x57, 0x8f, 0x9e, 0xfc, 0x0a, 0x22,
+	0x48, 0x66, 0x32, 0x69, 0x77, 0xeb, 0xb2, 0xb6, 0xb7, 0x77, 0xde, 0x79, 0x9e, 0xe7, 0x7d, 0xe7,
+	0xfd, 0x33, 0x60, 0xa9, 0x47, 0x69, 0x2f, 0x22, 0x0e, 0x0e, 0xb8, 0xa3, 0xcc, 0xdc, 0xea, 0x37,
+	0x1c, 0x4e, 0x58, 0x3f, 0xec, 0x12, 0xee, 0x64, 0x9c, 0x30, 0x3f, 0x0a, 0xb9, 0xf0, 0x0b, 0x17,
+	0x4a, 0x19, 0x15, 0x14, 0xd6, 0x14, 0x1c, 0xe1, 0x80, 0xa3, 0x92, 0x89, 0xfa, 0x0d, 0xa4, 0x99,
+	0xd5, 0xc6, 0x28, 0x6d, 0x46, 0x38, 0xcd, 0xd8, 0x80, 0xb8, 0x12, 0xad, 0xde, 0xd3, 0x94, 0x34,
+	0x74, 0x70, 0x92, 0x50, 0x81, 0x45, 0x48, 0x13, 0x5e, 0xdc, 0x16, 0x21, 0x1d, 0x79, 0x3a, 0xc8,
+	0x0e, 0x9d, 0xc3, 0x90, 0x44, 0x81, 0x1f, 0x63, 0x7e, 0x54, 0x20, 0xee, 0x0f, 0x23, 0xde, 0x30,
+	0x9c, 0xa6, 0x84, 0x69, 0x85, 0xb9, 0xe2, 0x9e, 0xa5, 0x5d, 0x87, 0x0b, 0x2c, 0xb2, 0xe2, 0xc2,
+	0x5e, 0x06, 0x70, 0x93, 0x88, 0x97, 0x9c, 0xb0, 0xe7, 0x21, 0x17, 0x1e, 0x79, 0x9d, 0x11, 0x2e,
+	0xe0, 0x43, 0x70, 0x43, 0xe7, 0xea, 0x27, 0x38, 0x26, 0x15, 0xa3, 0x66, 0x2c, 0x4c, 0x79, 0xd3,
+	0xda, 0xf9, 0x02, 0xc7, 0xc4, 0xfe, 0x6e, 0x80, 0xbb, 0xdb, 0x99, 0xc0, 0x82, 0x68, 0x3a, 0xd7,
+	0xfc, 0x07, 0xc0, 0xea, 0x66, 0x5c, 0xd0, 0x98, 0x30, 0x3f, 0x0c, 0x0a, 0x36, 0xd0, 0xae, 0x67,
+	0x01, 0xdc, 0x03, 0x80, 0xa6, 0x84, 0xa9, 0x57, 0x56, 0xcc, 0xda, 0xc4, 0x82, 0xd5, 0x6c, 0xa1,
+	0x71, 0x95, 0x45, 0x3a, 0xd0, 0x8e, 0xe6, 0x7a, 0xe7, 0x64, 0xe0, 0x23, 0x30, 0x93, 0x62, 0x26,
+	0x42, 0x1c, 0xf9, 0x87, 0x38, 0x8c, 0x32, 0x46, 0x2a, 0x13, 0x35, 0x63, 0xe1, 0xba, 0x77, 0xb3,
+	0x70, 0x6f, 0x28, 0x6f, 0xfe, 0xbc, 0x3e, 0x8e, 0xc2, 0x00, 0x0b, 0xe2, 0xd3, 0x24, 0x3a, 0xae,
+	0xfc, 0x2f, 0x61, 0xd3, 0xda, 0xb9, 0x93, 0x44, 0xc7, 0xf6, 0x3b, 0x13, 0xdc, 0xba, 0x10, 0x0f,
+	0xae, 0x00, 0x2b, 0x4b, 0x25, 0x31, 0xaf, 0xbe, 0x24, 0x5a, 0xcd, 0xaa, 0xce, 0x5c, 0x97, 0x1f,
+	0x6d, 0xe4, 0x0d, 0xda, 0xc6, 0xfc, 0xc8, 0x03, 0x0a, 0x9e, 0xdb, 0x70, 0x1d, 0x4c, 0x76, 0x19,
+	0xc1, 0x42, 0xd5, 0xd3, 0x6a, 0x2e, 0x8e, 0x7c, 0x71, 0x39, 0x29, 0xe5, 0x93, 0xb7, 0xfe, 0xf3,
+	0x0a, 0x72, 0x2e, 0xa3, 0x44, 0x2b, 0xe6, 0x95, 0x64, 0x14, 0x19, 0x56, 0xc0, 0x24, 0x23, 0x31,
+	0xed, 0xab, 0x2a, 0x4d, 0xe5, 0x37, 0xea, 0xbc, 0x66, 0x81, 0xa9, 0xb2, 0xac, 0xf6, 0x67, 0x03,
+	0xcc, 0x5d, 0x68, 0x33, 0x4f, 0x69, 0xc2, 0x09, 0xdc, 0x00, 0x77, 0x86, 0x2a, 0xee, 0x13, 0xc6,
+	0x28, 0x93, 0x8a, 0x56, 0x13, 0xea, 0xc4, 0x58, 0xda, 0x45, 0x7b, 0x72, 0xec, 0xbc, 0xdb, 0x83,
+	0xbd, 0x58, 0xcf, 0xe1, 0x70, 0x17, 0x5c, 0x63, 0x84, 0x67, 0x91, 0xd0, 0xb3, 0xf0, 0x74, 0xfc,
+	0x2c, 0x0c, 0xe6, 0xe4, 0x49, 0xba, 0xa7, 0x65, 0xec, 0x15, 0x30, 0xfb, 0x37, 0xc0, 0x3f, 0x4d,
+	0x76, 0xf3, 0xb7, 0x09, 0x66, 0x34, 0x6f, 0x4f, 0xc5, 0x83, 0x1f, 0x0d, 0x60, 0x9d, 0xdb, 0x14,
+	0xf8, 0x64, 0x7c, 0x86, 0x17, 0x17, 0xab, 0x7a, 0x99, 0x56, 0xd9, 0xad, 0xb7, 0xdf, 0x7e, 0xbc,
+	0x37, 0x1f, 0xc3, 0xc5, 0xfc, 0xef, 0x38, 0x19, 0x48, 0x7b, 0x55, 0xef, 0x12, 0x77, 0xea, 0xf2,
+	0x33, 0x91, 0x7d, 0x71, 0xea, 0xa7, 0xf0, 0x8b, 0x01, 0x66, 0x86, 0xda, 0x05, 0x97, 0x2e, 0x5b,
+	0x4d, 0xbd, 0xc8, 0xd5, 0xe5, 0x2b, 0x30, 0xd5, 0x6c, 0xd8, 0xcb, 0x32, 0xfb, 0x96, 0x8d, 0xf2,
+	0xec, 0xcf, 0xd2, 0x3d, 0x39, 0xf7, 0x31, 0xac, 0xd6, 0x4f, 0xcf, 0x92, 0x77, 0x63, 0x29, 0xe4,
+	0x1a, 0xf5, 0xb5, 0x5f, 0x06, 0x98, 0xef, 0xd2, 0x78, 0x6c, 0xec, 0xb5, 0xd9, 0xa1, 0x2e, 0xed,
+	0xe6, 0xfb, 0xb7, 0x6b, 0xbc, 0xda, 0x2a, 0x98, 0x3d, 0x1a, 0xe1, 0xa4, 0x87, 0x28, 0xeb, 0x39,
+	0x3d, 0x92, 0xc8, 0xed, 0xd4, 0x3f, 0x72, 0x1a, 0xf2, 0xd1, 0x9f, 0xff, 0x8a, 0x36, 0x3e, 0x98,
+	0x13, 0x9b, 0xed, 0xf6, 0x27, 0xb3, 0xb6, 0xa9, 0x04, 0xdb, 0x01, 0x47, 0xca, 0xcc, 0xad, 0xfd,
+	0x06, 0x2a, 0x02, 0xf3, 0xaf, 0x1a, 0xd2, 0x69, 0x07, 0xbc, 0x53, 0x42, 0x3a, 0xfb, 0x8d, 0x8e,
+	0x86, 0xfc, 0x34, 0xe7, 0x95, 0xdf, 0x75, 0xdb, 0x01, 0x77, 0xdd, 0x12, 0xe4, 0xba, 0xfb, 0x0d,
+	0xd7, 0xd5, 0xb0, 0x83, 0x49, 0x99, 0x67, 0xeb, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x0d,
+	0xd1, 0x85, 0xa3, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -533,56 +511,3 @@ var _UserListService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/user_list_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/user_list_service.proto", fileDescriptor_user_list_service_a2edc6a3997d8389)
-}
-
-var fileDescriptor_user_list_service_a2edc6a3997d8389 = []byte{
-	// 710 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0xd4, 0x4e,
-	0x18, 0xfe, 0x25, 0xfd, 0x51, 0xed, 0xa4, 0x5a, 0x1c, 0xab, 0x5d, 0x16, 0xd1, 0x25, 0x16, 0x2c,
-	0x5b, 0x9c, 0xb0, 0xbb, 0x22, 0x6d, 0x4a, 0x0f, 0x5b, 0xe8, 0x1f, 0xc1, 0xda, 0x92, 0x62, 0x0f,
-	0xb2, 0x10, 0xa6, 0x9b, 0xe9, 0x12, 0x9a, 0x64, 0xe2, 0xcc, 0x64, 0xa5, 0x94, 0x5e, 0x04, 0x3f,
-	0x81, 0xdf, 0x40, 0xf0, 0xe2, 0xd5, 0x4f, 0xe0, 0xd5, 0xab, 0x57, 0x8f, 0x9e, 0xfc, 0x0a, 0x22,
-	0x48, 0x66, 0x32, 0x69, 0x77, 0xeb, 0xb2, 0xb6, 0xb7, 0x77, 0xde, 0x79, 0x9e, 0xe7, 0x7d, 0xe7,
-	0xfd, 0x33, 0x60, 0xa9, 0x47, 0x69, 0x2f, 0x22, 0x0e, 0x0e, 0xb8, 0xa3, 0xcc, 0xdc, 0xea, 0x37,
-	0x1c, 0x4e, 0x58, 0x3f, 0xec, 0x12, 0xee, 0x64, 0x9c, 0x30, 0x3f, 0x0a, 0xb9, 0xf0, 0x0b, 0x17,
-	0x4a, 0x19, 0x15, 0x14, 0xd6, 0x14, 0x1c, 0xe1, 0x80, 0xa3, 0x92, 0x89, 0xfa, 0x0d, 0xa4, 0x99,
-	0xd5, 0xc6, 0x28, 0x6d, 0x46, 0x38, 0xcd, 0xd8, 0x80, 0xb8, 0x12, 0xad, 0xde, 0xd3, 0x94, 0x34,
-	0x74, 0x70, 0x92, 0x50, 0x81, 0x45, 0x48, 0x13, 0x5e, 0xdc, 0x16, 0x21, 0x1d, 0x79, 0x3a, 0xc8,
-	0x0e, 0x9d, 0xc3, 0x90, 0x44, 0x81, 0x1f, 0x63, 0x7e, 0x54, 0x20, 0xee, 0x0f, 0x23, 0xde, 0x30,
-	0x9c, 0xa6, 0x84, 0x69, 0x85, 0xb9, 0xe2, 0x9e, 0xa5, 0x5d, 0x87, 0x0b, 0x2c, 0xb2, 0xe2, 0xc2,
-	0x5e, 0x06, 0x70, 0x93, 0x88, 0x97, 0x9c, 0xb0, 0xe7, 0x21, 0x17, 0x1e, 0x79, 0x9d, 0x11, 0x2e,
-	0xe0, 0x43, 0x70, 0x43, 0xe7, 0xea, 0x27, 0x38, 0x26, 0x15, 0xa3, 0x66, 0x2c, 0x4c, 0x79, 0xd3,
-	0xda, 0xf9, 0x02, 0xc7, 0xc4, 0xfe, 0x6e, 0x80, 0xbb, 0xdb, 0x99, 0xc0, 0x82, 0x68, 0x3a, 0xd7,
-	0xfc, 0x07, 0xc0, 0xea, 0x66, 0x5c, 0xd0, 0x98, 0x30, 0x3f, 0x0c, 0x0a, 0x36, 0xd0, 0xae, 0x67,
-	0x01, 0xdc, 0x03, 0x80, 0xa6, 0x84, 0xa9, 0x57, 0x56, 0xcc, 0xda, 0xc4, 0x82, 0xd5, 0x6c, 0xa1,
-	0x71, 0x95, 0x45, 0x3a, 0xd0, 0x8e, 0xe6, 0x7a, 0xe7, 0x64, 0xe0, 0x23, 0x30, 0x93, 0x62, 0x26,
-	0x42, 0x1c, 0xf9, 0x87, 0x38, 0x8c, 0x32, 0x46, 0x2a, 0x13, 0x35, 0x63, 0xe1, 0xba, 0x77, 0xb3,
-	0x70, 0x6f, 0x28, 0x6f, 0xfe, 0xbc, 0x3e, 0x8e, 0xc2, 0x00, 0x0b, 0xe2, 0xd3, 0x24, 0x3a, 0xae,
-	0xfc, 0x2f, 0x61, 0xd3, 0xda, 0xb9, 0x93, 0x44, 0xc7, 0xf6, 0x3b, 0x13, 0xdc, 0xba, 0x10, 0x0f,
-	0xae, 0x00, 0x2b, 0x4b, 0x25, 0x31, 0xaf, 0xbe, 0x24, 0x5a, 0xcd, 0xaa, 0xce, 0x5c, 0x97, 0x1f,
-	0x6d, 0xe4, 0x0d, 0xda, 0xc6, 0xfc, 0xc8, 0x03, 0x0a, 0x9e, 0xdb, 0x70, 0x1d, 0x4c, 0x76, 0x19,
-	0xc1, 0x42, 0xd5, 0xd3, 0x6a, 0x2e, 0x8e, 0x7c, 0x71, 0x39, 0x29, 0xe5, 0x93, 0xb7, 0xfe, 0xf3,
-	0x0a, 0x72, 0x2e, 0xa3, 0x44, 0x2b, 0xe6, 0x95, 0x64, 0x14, 0x19, 0x56, 0xc0, 0x24, 0x23, 0x31,
-	0xed, 0xab, 0x2a, 0x4d, 0xe5, 0x37, 0xea, 0xbc, 0x66, 0x81, 0xa9, 0xb2, 0xac, 0xf6, 0x67, 0x03,
-	0xcc, 0x5d, 0x68, 0x33, 0x4f, 0x69, 0xc2, 0x09, 0xdc, 0x00, 0x77, 0x86, 0x2a, 0xee, 0x13, 0xc6,
-	0x28, 0x93, 0x8a, 0x56, 0x13, 0xea, 0xc4, 0x58, 0xda, 0x45, 0x7b, 0x72, 0xec, 0xbc, 0xdb, 0x83,
-	0xbd, 0x58, 0xcf, 0xe1, 0x70, 0x17, 0x5c, 0x63, 0x84, 0x67, 0x91, 0xd0, 0xb3, 0xf0, 0x74, 0xfc,
-	0x2c, 0x0c, 0xe6, 0xe4, 0x49, 0xba, 0xa7, 0x65, 0xec, 0x15, 0x30, 0xfb, 0x37, 0xc0, 0x3f, 0x4d,
-	0x76, 0xf3, 0xb7, 0x09, 0x66, 0x34, 0x6f, 0x4f, 0xc5, 0x83, 0x1f, 0x0d, 0x60, 0x9d, 0xdb, 0x14,
-	0xf8, 0x64, 0x7c, 0x86, 0x17, 0x17, 0xab, 0x7a, 0x99, 0x56, 0xd9, 0xad, 0xb7, 0xdf, 0x7e, 0xbc,
-	0x37, 0x1f, 0xc3, 0xc5, 0xfc, 0xef, 0x38, 0x19, 0x48, 0x7b, 0x55, 0xef, 0x12, 0x77, 0xea, 0xf2,
-	0x33, 0x91, 0x7d, 0x71, 0xea, 0xa7, 0xf0, 0x8b, 0x01, 0x66, 0x86, 0xda, 0x05, 0x97, 0x2e, 0x5b,
-	0x4d, 0xbd, 0xc8, 0xd5, 0xe5, 0x2b, 0x30, 0xd5, 0x6c, 0xd8, 0xcb, 0x32, 0xfb, 0x96, 0x8d, 0xf2,
-	0xec, 0xcf, 0xd2, 0x3d, 0x39, 0xf7, 0x31, 0xac, 0xd6, 0x4f, 0xcf, 0x92, 0x77, 0x63, 0x29, 0xe4,
-	0x1a, 0xf5, 0xb5, 0x5f, 0x06, 0x98, 0xef, 0xd2, 0x78, 0x6c, 0xec, 0xb5, 0xd9, 0xa1, 0x2e, 0xed,
-	0xe6, 0xfb, 0xb7, 0x6b, 0xbc, 0xda, 0x2a, 0x98, 0x3d, 0x1a, 0xe1, 0xa4, 0x87, 0x28, 0xeb, 0x39,
-	0x3d, 0x92, 0xc8, 0xed, 0xd4, 0x3f, 0x72, 0x1a, 0xf2, 0xd1, 0x9f, 0xff, 0x8a, 0x36, 0x3e, 0x98,
-	0x13, 0x9b, 0xed, 0xf6, 0x27, 0xb3, 0xb6, 0xa9, 0x04, 0xdb, 0x01, 0x47, 0xca, 0xcc, 0xad, 0xfd,
-	0x06, 0x2a, 0x02, 0xf3, 0xaf, 0x1a, 0xd2, 0x69, 0x07, 0xbc, 0x53, 0x42, 0x3a, 0xfb, 0x8d, 0x8e,
-	0x86, 0xfc, 0x34, 0xe7, 0x95, 0xdf, 0x75, 0xdb, 0x01, 0x77, 0xdd, 0x12, 0xe4, 0xba, 0xfb, 0x0d,
-	0xd7, 0xd5, 0xb0, 0x83, 0x49, 0x99, 0x67, 0xeb, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x0d,
-	0xd1, 0x85, 0xa3, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/ads/googleads/v1/services/video_service.pb.go b/googleapis/ads/googleads/v1/services/video_service.pb.go
index 28af45535c..228d476cfe 100644
--- a/googleapis/ads/googleads/v1/services/video_service.pb.go
+++ b/googleapis/ads/googleads/v1/services/video_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/ads/googleads/v1/services/video_service.proto
 
-package services // import "google.golang.org/genproto/googleapis/ads/googleads/v1/services"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package services
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	resources "google.golang.org/genproto/googleapis/ads/googleads/v1/resources"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [VideoService.GetVideo][google.ads.googleads.v1.services.VideoService.GetVideo].
 type GetVideoRequest struct {
@@ -38,16 +38,17 @@ func (m *GetVideoRequest) Reset()         { *m = GetVideoRequest{} }
 func (m *GetVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVideoRequest) ProtoMessage()    {}
 func (*GetVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_service_4f246e1a4123a787, []int{0}
+	return fileDescriptor_7856cda63e5cca90, []int{0}
 }
+
 func (m *GetVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVideoRequest.Unmarshal(m, b)
 }
 func (m *GetVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVideoRequest.Merge(dst, src)
+func (m *GetVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVideoRequest.Merge(m, src)
 }
 func (m *GetVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVideoRequest.Size(m)
@@ -69,6 +70,36 @@ func init() {
 	proto.RegisterType((*GetVideoRequest)(nil), "google.ads.googleads.v1.services.GetVideoRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/ads/googleads/v1/services/video_service.proto", fileDescriptor_7856cda63e5cca90)
+}
+
+var fileDescriptor_7856cda63e5cca90 = []byte{
+	// 349 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x31, 0x4b, 0xfb, 0x40,
+	0x18, 0xc6, 0x49, 0xfe, 0xf0, 0x47, 0x43, 0x45, 0xcc, 0x24, 0xc5, 0xa1, 0xd4, 0x0e, 0xa5, 0xe0,
+	0x9d, 0x51, 0x71, 0x38, 0x71, 0x48, 0x97, 0x3a, 0x49, 0xa9, 0x90, 0x41, 0x02, 0xe5, 0x6c, 0x5e,
+	0x42, 0xa0, 0xc9, 0x5b, 0xf3, 0x5e, 0xb3, 0x88, 0x8b, 0x5f, 0xc1, 0xc9, 0xd5, 0xb1, 0x1f, 0xc5,
+	0xd5, 0xaf, 0xe0, 0xe4, 0x27, 0x70, 0x94, 0xe4, 0x7a, 0x41, 0x85, 0xd0, 0xed, 0xc9, 0xe5, 0xf7,
+	0x3c, 0xf7, 0xbe, 0xcf, 0x39, 0x67, 0x31, 0x62, 0x3c, 0x07, 0x2e, 0x23, 0xe2, 0x5a, 0x96, 0xaa,
+	0xf0, 0x38, 0x41, 0x5e, 0x24, 0x33, 0x20, 0x5e, 0x24, 0x11, 0xe0, 0x74, 0xfd, 0xc9, 0x16, 0x39,
+	0x2a, 0x74, 0x3b, 0x1a, 0x65, 0x32, 0x22, 0x56, 0xbb, 0x58, 0xe1, 0x31, 0xe3, 0x6a, 0x1f, 0x35,
+	0xe5, 0xe6, 0x40, 0xb8, 0xcc, 0xeb, 0x60, 0x1d, 0xd8, 0x3e, 0x30, 0xf8, 0x22, 0xe1, 0x32, 0xcb,
+	0x50, 0x49, 0x95, 0x60, 0x46, 0xfa, 0x6f, 0xf7, 0xdc, 0xd9, 0x1d, 0x81, 0x0a, 0x4a, 0x7e, 0x02,
+	0xf7, 0x4b, 0x20, 0xe5, 0x1e, 0x3a, 0x3b, 0x26, 0x69, 0x9a, 0xc9, 0x14, 0xf6, 0xad, 0x8e, 0xd5,
+	0xdf, 0x9e, 0xb4, 0xcc, 0xe1, 0xb5, 0x4c, 0xe1, 0x64, 0x65, 0x39, 0xad, 0xca, 0x75, 0xa3, 0xc7,
+	0x72, 0x5f, 0x2c, 0x67, 0xcb, 0x24, 0xb9, 0x1e, 0xdb, 0xb4, 0x05, 0xfb, 0x73, 0x6b, 0xbb, 0xdf,
+	0x68, 0xa9, 0xd7, 0x62, 0x95, 0xa1, 0x7b, 0xfc, 0xf4, 0xfe, 0xf1, 0x6c, 0x0f, 0xdc, 0x7e, 0xb9,
+	0xf3, 0xc3, 0xaf, 0x51, 0x2f, 0x67, 0x4b, 0x52, 0x98, 0x42, 0x4e, 0x7c, 0xa0, 0x4b, 0x20, 0x3e,
+	0x78, 0x1c, 0x7e, 0x59, 0x4e, 0x6f, 0x86, 0xe9, 0xc6, 0xa1, 0x86, 0x7b, 0x3f, 0x57, 0x1a, 0x97,
+	0x05, 0x8d, 0xad, 0xdb, 0xab, 0xb5, 0x2d, 0xc6, 0xb9, 0xcc, 0x62, 0x86, 0x79, 0xcc, 0x63, 0xc8,
+	0xaa, 0xfa, 0x4c, 0xff, 0x8b, 0x84, 0x9a, 0x9f, 0xf9, 0xc2, 0x88, 0x57, 0xfb, 0xdf, 0xc8, 0xf7,
+	0x57, 0x76, 0x67, 0xa4, 0x03, 0xfd, 0x88, 0x98, 0x96, 0xa5, 0x0a, 0x3c, 0xb6, 0xbe, 0x98, 0xde,
+	0x0c, 0x12, 0xfa, 0x11, 0x85, 0x35, 0x12, 0x06, 0x5e, 0x68, 0x90, 0x4f, 0xbb, 0xa7, 0xcf, 0x85,
+	0xf0, 0x23, 0x12, 0xa2, 0x86, 0x84, 0x08, 0x3c, 0x21, 0x0c, 0x76, 0xf7, 0xbf, 0x9a, 0xf3, 0xf4,
+	0x3b, 0x00, 0x00, 0xff, 0xff, 0x24, 0x5c, 0xd6, 0x52, 0x8d, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -142,33 +173,3 @@ var _VideoService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/ads/googleads/v1/services/video_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/ads/googleads/v1/services/video_service.proto", fileDescriptor_video_service_4f246e1a4123a787)
-}
-
-var fileDescriptor_video_service_4f246e1a4123a787 = []byte{
-	// 349 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x31, 0x4b, 0xfb, 0x40,
-	0x18, 0xc6, 0x49, 0xfe, 0xf0, 0x47, 0x43, 0x45, 0xcc, 0x24, 0xc5, 0xa1, 0xd4, 0x0e, 0xa5, 0xe0,
-	0x9d, 0x51, 0x71, 0x38, 0x71, 0x48, 0x97, 0x3a, 0x49, 0xa9, 0x90, 0x41, 0x02, 0xe5, 0x6c, 0x5e,
-	0x42, 0xa0, 0xc9, 0x5b, 0xf3, 0x5e, 0xb3, 0x88, 0x8b, 0x5f, 0xc1, 0xc9, 0xd5, 0xb1, 0x1f, 0xc5,
-	0xd5, 0xaf, 0xe0, 0xe4, 0x27, 0x70, 0x94, 0xe4, 0x7a, 0x41, 0x85, 0xd0, 0xed, 0xc9, 0xe5, 0xf7,
-	0x3c, 0xf7, 0xbe, 0xcf, 0x39, 0x67, 0x31, 0x62, 0x3c, 0x07, 0x2e, 0x23, 0xe2, 0x5a, 0x96, 0xaa,
-	0xf0, 0x38, 0x41, 0x5e, 0x24, 0x33, 0x20, 0x5e, 0x24, 0x11, 0xe0, 0x74, 0xfd, 0xc9, 0x16, 0x39,
-	0x2a, 0x74, 0x3b, 0x1a, 0x65, 0x32, 0x22, 0x56, 0xbb, 0x58, 0xe1, 0x31, 0xe3, 0x6a, 0x1f, 0x35,
-	0xe5, 0xe6, 0x40, 0xb8, 0xcc, 0xeb, 0x60, 0x1d, 0xd8, 0x3e, 0x30, 0xf8, 0x22, 0xe1, 0x32, 0xcb,
-	0x50, 0x49, 0x95, 0x60, 0x46, 0xfa, 0x6f, 0xf7, 0xdc, 0xd9, 0x1d, 0x81, 0x0a, 0x4a, 0x7e, 0x02,
-	0xf7, 0x4b, 0x20, 0xe5, 0x1e, 0x3a, 0x3b, 0x26, 0x69, 0x9a, 0xc9, 0x14, 0xf6, 0xad, 0x8e, 0xd5,
-	0xdf, 0x9e, 0xb4, 0xcc, 0xe1, 0xb5, 0x4c, 0xe1, 0x64, 0x65, 0x39, 0xad, 0xca, 0x75, 0xa3, 0xc7,
-	0x72, 0x5f, 0x2c, 0x67, 0xcb, 0x24, 0xb9, 0x1e, 0xdb, 0xb4, 0x05, 0xfb, 0x73, 0x6b, 0xbb, 0xdf,
-	0x68, 0xa9, 0xd7, 0x62, 0x95, 0xa1, 0x7b, 0xfc, 0xf4, 0xfe, 0xf1, 0x6c, 0x0f, 0xdc, 0x7e, 0xb9,
-	0xf3, 0xc3, 0xaf, 0x51, 0x2f, 0x67, 0x4b, 0x52, 0x98, 0x42, 0x4e, 0x7c, 0xa0, 0x4b, 0x20, 0x3e,
-	0x78, 0x1c, 0x7e, 0x59, 0x4e, 0x6f, 0x86, 0xe9, 0xc6, 0xa1, 0x86, 0x7b, 0x3f, 0x57, 0x1a, 0x97,
-	0x05, 0x8d, 0xad, 0xdb, 0xab, 0xb5, 0x2d, 0xc6, 0xb9, 0xcc, 0x62, 0x86, 0x79, 0xcc, 0x63, 0xc8,
-	0xaa, 0xfa, 0x4c, 0xff, 0x8b, 0x84, 0x9a, 0x9f, 0xf9, 0xc2, 0x88, 0x57, 0xfb, 0xdf, 0xc8, 0xf7,
-	0x57, 0x76, 0x67, 0xa4, 0x03, 0xfd, 0x88, 0x98, 0x96, 0xa5, 0x0a, 0x3c, 0xb6, 0xbe, 0x98, 0xde,
-	0x0c, 0x12, 0xfa, 0x11, 0x85, 0x35, 0x12, 0x06, 0x5e, 0x68, 0x90, 0x4f, 0xbb, 0xa7, 0xcf, 0x85,
-	0xf0, 0x23, 0x12, 0xa2, 0x86, 0x84, 0x08, 0x3c, 0x21, 0x0c, 0x76, 0xf7, 0xbf, 0x9a, 0xf3, 0xf4,
-	0x3b, 0x00, 0x00, 0xff, 0xff, 0x24, 0x5c, 0xd6, 0x52, 0x8d, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/api/annotations/annotations.pb.go b/googleapis/api/annotations/annotations.pb.go
index c7bb5398ad..bf2f703fff 100644
--- a/googleapis/api/annotations/annotations.pb.go
+++ b/googleapis/api/annotations/annotations.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/annotations.proto
 
-package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
+package annotations
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 var E_Http = &proto.ExtensionDesc{
 	ExtendedType:  (*descriptor.MethodOptions)(nil),
@@ -32,11 +35,9 @@ func init() {
 	proto.RegisterExtension(E_Http)
 }
 
-func init() {
-	proto.RegisterFile("google/api/annotations.proto", fileDescriptor_annotations_e7ebfecbdd9698dc)
-}
+func init() { proto.RegisterFile("google/api/annotations.proto", fileDescriptor_c591c5aa9fb79aab) }
 
-var fileDescriptor_annotations_e7ebfecbdd9698dc = []byte{
+var fileDescriptor_c591c5aa9fb79aab = []byte{
 	// 208 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xcc, 0xcb, 0xcb, 0x2f, 0x49, 0x2c, 0xc9, 0xcc,
diff --git a/googleapis/api/annotations/client.pb.go b/googleapis/api/annotations/client.pb.go
index 589e00d483..867fc0c3fa 100644
--- a/googleapis/api/annotations/client.pb.go
+++ b/googleapis/api/annotations/client.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/client.proto
 
-package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
+package annotations
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,14 +20,14 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 var E_MethodSignature = &proto.ExtensionDesc{
 	ExtendedType:  (*descriptor.MethodOptions)(nil),
 	ExtensionType: ([]string)(nil),
 	Field:         1051,
 	Name:          "google.api.method_signature",
-	Tag:           "bytes,1051,rep,name=method_signature,json=methodSignature",
+	Tag:           "bytes,1051,rep,name=method_signature",
 	Filename:      "google/api/client.proto",
 }
 
@@ -33,7 +36,7 @@ var E_DefaultHost = &proto.ExtensionDesc{
 	ExtensionType: (*string)(nil),
 	Field:         1049,
 	Name:          "google.api.default_host",
-	Tag:           "bytes,1049,opt,name=default_host,json=defaultHost",
+	Tag:           "bytes,1049,opt,name=default_host",
 	Filename:      "google/api/client.proto",
 }
 
@@ -42,7 +45,7 @@ var E_OauthScopes = &proto.ExtensionDesc{
 	ExtensionType: (*string)(nil),
 	Field:         1050,
 	Name:          "google.api.oauth_scopes",
-	Tag:           "bytes,1050,opt,name=oauth_scopes,json=oauthScopes",
+	Tag:           "bytes,1050,opt,name=oauth_scopes",
 	Filename:      "google/api/client.proto",
 }
 
@@ -52,9 +55,9 @@ func init() {
 	proto.RegisterExtension(E_OauthScopes)
 }
 
-func init() { proto.RegisterFile("google/api/client.proto", fileDescriptor_client_66b9a733374708c1) }
+func init() { proto.RegisterFile("google/api/client.proto", fileDescriptor_78f2c6f7c3a942c1) }
 
-var fileDescriptor_client_66b9a733374708c1 = []byte{
+var fileDescriptor_78f2c6f7c3a942c1 = []byte{
 	// 262 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x3f, 0x4f, 0xc3, 0x30,
 	0x10, 0xc5, 0x55, 0x40, 0xa8, 0x75, 0x11, 0xa0, 0x2c, 0x20, 0x06, 0xc8, 0xd8, 0xc9, 0x1e, 0xd8,
diff --git a/googleapis/api/annotations/field_behavior.pb.go b/googleapis/api/annotations/field_behavior.pb.go
index 4fc5c40b6a..31f87dd00d 100644
--- a/googleapis/api/annotations/field_behavior.pb.go
+++ b/googleapis/api/annotations/field_behavior.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/field_behavior.proto
 
-package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
+package annotations
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An indicator of the behavior of a given field (for example, that a field
 // is required in requests, or given as output but ignored as input).
@@ -61,6 +64,7 @@ var FieldBehavior_name = map[int32]string{
 	4: "INPUT_ONLY",
 	5: "IMMUTABLE",
 }
+
 var FieldBehavior_value = map[string]int32{
 	"FIELD_BEHAVIOR_UNSPECIFIED": 0,
 	"OPTIONAL":                   1,
@@ -73,8 +77,9 @@ var FieldBehavior_value = map[string]int32{
 func (x FieldBehavior) String() string {
 	return proto.EnumName(FieldBehavior_name, int32(x))
 }
+
 func (FieldBehavior) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_field_behavior_540d8be7c570e386, []int{0}
+	return fileDescriptor_4648f18fd5079967, []int{0}
 }
 
 var E_FieldBehavior = &proto.ExtensionDesc{
@@ -82,7 +87,7 @@ var E_FieldBehavior = &proto.ExtensionDesc{
 	ExtensionType: ([]FieldBehavior)(nil),
 	Field:         1052,
 	Name:          "google.api.field_behavior",
-	Tag:           "varint,1052,rep,name=field_behavior,json=fieldBehavior,enum=google.api.FieldBehavior",
+	Tag:           "varint,1052,rep,name=field_behavior,enum=google.api.FieldBehavior",
 	Filename:      "google/api/field_behavior.proto",
 }
 
@@ -91,11 +96,9 @@ func init() {
 	proto.RegisterExtension(E_FieldBehavior)
 }
 
-func init() {
-	proto.RegisterFile("google/api/field_behavior.proto", fileDescriptor_field_behavior_540d8be7c570e386)
-}
+func init() { proto.RegisterFile("google/api/field_behavior.proto", fileDescriptor_4648f18fd5079967) }
 
-var fileDescriptor_field_behavior_540d8be7c570e386 = []byte{
+var fileDescriptor_4648f18fd5079967 = []byte{
 	// 303 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x4f, 0x4f, 0xb3, 0x30,
 	0x1c, 0xc7, 0x9f, 0xfd, 0x79, 0xcc, 0xac, 0x0e, 0x49, 0x4f, 0xba, 0x44, 0xdd, 0xd1, 0x78, 0x28,
diff --git a/googleapis/api/annotations/http.pb.go b/googleapis/api/annotations/http.pb.go
index 5ee365a504..a63870374d 100644
--- a/googleapis/api/annotations/http.pb.go
+++ b/googleapis/api/annotations/http.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/http.proto
 
-package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
+package annotations
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Defines the HTTP configuration for an API service. It contains a list of
 // [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
@@ -42,16 +45,17 @@ func (m *Http) Reset()         { *m = Http{} }
 func (m *Http) String() string { return proto.CompactTextString(m) }
 func (*Http) ProtoMessage()    {}
 func (*Http) Descriptor() ([]byte, []int) {
-	return fileDescriptor_http_1e78ce0f8b702f4c, []int{0}
+	return fileDescriptor_ff9994be407cdcc9, []int{0}
 }
+
 func (m *Http) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Http.Unmarshal(m, b)
 }
 func (m *Http) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Http.Marshal(b, m, deterministic)
 }
-func (dst *Http) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Http.Merge(dst, src)
+func (m *Http) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Http.Merge(m, src)
 }
 func (m *Http) XXX_Size() int {
 	return xxx_messageInfo_Http.Size(m)
@@ -389,16 +393,17 @@ func (m *HttpRule) Reset()         { *m = HttpRule{} }
 func (m *HttpRule) String() string { return proto.CompactTextString(m) }
 func (*HttpRule) ProtoMessage()    {}
 func (*HttpRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_http_1e78ce0f8b702f4c, []int{1}
+	return fileDescriptor_ff9994be407cdcc9, []int{1}
 }
+
 func (m *HttpRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpRule.Unmarshal(m, b)
 }
 func (m *HttpRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpRule.Marshal(b, m, deterministic)
 }
-func (dst *HttpRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpRule.Merge(dst, src)
+func (m *HttpRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpRule.Merge(m, src)
 }
 func (m *HttpRule) XXX_Size() int {
 	return xxx_messageInfo_HttpRule.Size(m)
@@ -526,9 +531,9 @@ func (m *HttpRule) GetAdditionalBindings() []*HttpRule {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HttpRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HttpRule_OneofMarshaler, _HttpRule_OneofUnmarshaler, _HttpRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HttpRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HttpRule_Get)(nil),
 		(*HttpRule_Put)(nil),
 		(*HttpRule_Post)(nil),
@@ -538,124 +543,6 @@ func (*HttpRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _HttpRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HttpRule)
-	// pattern
-	switch x := m.Pattern.(type) {
-	case *HttpRule_Get:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Get)
-	case *HttpRule_Put:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Put)
-	case *HttpRule_Post:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Post)
-	case *HttpRule_Delete:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Delete)
-	case *HttpRule_Patch:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Patch)
-	case *HttpRule_Custom:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Custom); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("HttpRule.Pattern has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HttpRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HttpRule)
-	switch tag {
-	case 2: // pattern.get
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Pattern = &HttpRule_Get{x}
-		return true, err
-	case 3: // pattern.put
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Pattern = &HttpRule_Put{x}
-		return true, err
-	case 4: // pattern.post
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Pattern = &HttpRule_Post{x}
-		return true, err
-	case 5: // pattern.delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Pattern = &HttpRule_Delete{x}
-		return true, err
-	case 6: // pattern.patch
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Pattern = &HttpRule_Patch{x}
-		return true, err
-	case 8: // pattern.custom
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomHttpPattern)
-		err := b.DecodeMessage(msg)
-		m.Pattern = &HttpRule_Custom{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HttpRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HttpRule)
-	// pattern
-	switch x := m.Pattern.(type) {
-	case *HttpRule_Get:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Get)))
-		n += len(x.Get)
-	case *HttpRule_Put:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Put)))
-		n += len(x.Put)
-	case *HttpRule_Post:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Post)))
-		n += len(x.Post)
-	case *HttpRule_Delete:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Delete)))
-		n += len(x.Delete)
-	case *HttpRule_Patch:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Patch)))
-		n += len(x.Patch)
-	case *HttpRule_Custom:
-		s := proto.Size(x.Custom)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A custom pattern is used for defining custom HTTP verb.
 type CustomHttpPattern struct {
 	// The name of this custom HTTP verb.
@@ -671,16 +558,17 @@ func (m *CustomHttpPattern) Reset()         { *m = CustomHttpPattern{} }
 func (m *CustomHttpPattern) String() string { return proto.CompactTextString(m) }
 func (*CustomHttpPattern) ProtoMessage()    {}
 func (*CustomHttpPattern) Descriptor() ([]byte, []int) {
-	return fileDescriptor_http_1e78ce0f8b702f4c, []int{2}
+	return fileDescriptor_ff9994be407cdcc9, []int{2}
 }
+
 func (m *CustomHttpPattern) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomHttpPattern.Unmarshal(m, b)
 }
 func (m *CustomHttpPattern) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomHttpPattern.Marshal(b, m, deterministic)
 }
-func (dst *CustomHttpPattern) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomHttpPattern.Merge(dst, src)
+func (m *CustomHttpPattern) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomHttpPattern.Merge(m, src)
 }
 func (m *CustomHttpPattern) XXX_Size() int {
 	return xxx_messageInfo_CustomHttpPattern.Size(m)
@@ -711,9 +599,9 @@ func init() {
 	proto.RegisterType((*CustomHttpPattern)(nil), "google.api.CustomHttpPattern")
 }
 
-func init() { proto.RegisterFile("google/api/http.proto", fileDescriptor_http_1e78ce0f8b702f4c) }
+func init() { proto.RegisterFile("google/api/http.proto", fileDescriptor_ff9994be407cdcc9) }
 
-var fileDescriptor_http_1e78ce0f8b702f4c = []byte{
+var fileDescriptor_ff9994be407cdcc9 = []byte{
 	// 419 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x8e, 0xd3, 0x30,
 	0x10, 0x86, 0x49, 0x9b, 0x76, 0xdb, 0xe9, 0x82, 0x84, 0x59, 0x90, 0x85, 0x40, 0x54, 0xe5, 0x52,
diff --git a/googleapis/api/annotations/resource.pb.go b/googleapis/api/annotations/resource.pb.go
index 3622e0346f..8ff13f972d 100644
--- a/googleapis/api/annotations/resource.pb.go
+++ b/googleapis/api/annotations/resource.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/resource.proto
 
-package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
+package annotations
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A description of the historical or future-looking state of the
 // resource pattern.
@@ -40,6 +43,7 @@ var ResourceDescriptor_History_name = map[int32]string{
 	1: "ORIGINALLY_SINGLE_PATTERN",
 	2: "FUTURE_MULTI_PATTERN",
 }
+
 var ResourceDescriptor_History_value = map[string]int32{
 	"HISTORY_UNSPECIFIED":       0,
 	"ORIGINALLY_SINGLE_PATTERN": 1,
@@ -49,8 +53,9 @@ var ResourceDescriptor_History_value = map[string]int32{
 func (x ResourceDescriptor_History) String() string {
 	return proto.EnumName(ResourceDescriptor_History_name, int32(x))
 }
+
 func (ResourceDescriptor_History) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resource_8ecf418b4524f3f1, []int{0, 0}
+	return fileDescriptor_465e9122405d1bb5, []int{0, 0}
 }
 
 // A simple descriptor of a resource type.
@@ -134,16 +139,17 @@ func (m *ResourceDescriptor) Reset()         { *m = ResourceDescriptor{} }
 func (m *ResourceDescriptor) String() string { return proto.CompactTextString(m) }
 func (*ResourceDescriptor) ProtoMessage()    {}
 func (*ResourceDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resource_8ecf418b4524f3f1, []int{0}
+	return fileDescriptor_465e9122405d1bb5, []int{0}
 }
+
 func (m *ResourceDescriptor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceDescriptor.Unmarshal(m, b)
 }
 func (m *ResourceDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceDescriptor.Marshal(b, m, deterministic)
 }
-func (dst *ResourceDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceDescriptor.Merge(dst, src)
+func (m *ResourceDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceDescriptor.Merge(m, src)
 }
 func (m *ResourceDescriptor) XXX_Size() int {
 	return xxx_messageInfo_ResourceDescriptor.Size(m)
@@ -227,16 +233,17 @@ func (m *ResourceReference) Reset()         { *m = ResourceReference{} }
 func (m *ResourceReference) String() string { return proto.CompactTextString(m) }
 func (*ResourceReference) ProtoMessage()    {}
 func (*ResourceReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resource_8ecf418b4524f3f1, []int{1}
+	return fileDescriptor_465e9122405d1bb5, []int{1}
 }
+
 func (m *ResourceReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceReference.Unmarshal(m, b)
 }
 func (m *ResourceReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceReference.Marshal(b, m, deterministic)
 }
-func (dst *ResourceReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceReference.Merge(dst, src)
+func (m *ResourceReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceReference.Merge(m, src)
 }
 func (m *ResourceReference) XXX_Size() int {
 	return xxx_messageInfo_ResourceReference.Size(m)
@@ -266,7 +273,7 @@ var E_ResourceReference = &proto.ExtensionDesc{
 	ExtensionType: (*ResourceReference)(nil),
 	Field:         1055,
 	Name:          "google.api.resource_reference",
-	Tag:           "bytes,1055,opt,name=resource_reference,json=resourceReference",
+	Tag:           "bytes,1055,opt,name=resource_reference",
 	Filename:      "google/api/resource.proto",
 }
 
@@ -280,16 +287,16 @@ var E_Resource = &proto.ExtensionDesc{
 }
 
 func init() {
+	proto.RegisterEnum("google.api.ResourceDescriptor_History", ResourceDescriptor_History_name, ResourceDescriptor_History_value)
 	proto.RegisterType((*ResourceDescriptor)(nil), "google.api.ResourceDescriptor")
 	proto.RegisterType((*ResourceReference)(nil), "google.api.ResourceReference")
-	proto.RegisterEnum("google.api.ResourceDescriptor_History", ResourceDescriptor_History_name, ResourceDescriptor_History_value)
 	proto.RegisterExtension(E_ResourceReference)
 	proto.RegisterExtension(E_Resource)
 }
 
-func init() { proto.RegisterFile("google/api/resource.proto", fileDescriptor_resource_8ecf418b4524f3f1) }
+func init() { proto.RegisterFile("google/api/resource.proto", fileDescriptor_465e9122405d1bb5) }
 
-var fileDescriptor_resource_8ecf418b4524f3f1 = []byte{
+var fileDescriptor_465e9122405d1bb5 = []byte{
 	// 430 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x41, 0x6f, 0xd3, 0x30,
 	0x18, 0x25, 0x59, 0x45, 0xd7, 0x0f, 0x31, 0x6d, 0x06, 0x89, 0x0c, 0x29, 0x10, 0xf5, 0x80, 0x7a,
diff --git a/googleapis/api/authorization_config.pb.go b/googleapis/api/authorization_config.pb.go
index caddc13897..453f408e29 100644
--- a/googleapis/api/authorization_config.pb.go
+++ b/googleapis/api/authorization_config.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/experimental/authorization_config.proto
 
-package api // import "google.golang.org/genproto/googleapis/api"
+package api
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Configuration of authorization.
 //
@@ -41,16 +44,17 @@ func (m *AuthorizationConfig) Reset()         { *m = AuthorizationConfig{} }
 func (m *AuthorizationConfig) String() string { return proto.CompactTextString(m) }
 func (*AuthorizationConfig) ProtoMessage()    {}
 func (*AuthorizationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_authorization_config_4cffac9b7afd314b, []int{0}
+	return fileDescriptor_9a079278ac7754f2, []int{0}
 }
+
 func (m *AuthorizationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthorizationConfig.Unmarshal(m, b)
 }
 func (m *AuthorizationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthorizationConfig.Marshal(b, m, deterministic)
 }
-func (dst *AuthorizationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthorizationConfig.Merge(dst, src)
+func (m *AuthorizationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthorizationConfig.Merge(m, src)
 }
 func (m *AuthorizationConfig) XXX_Size() int {
 	return xxx_messageInfo_AuthorizationConfig.Size(m)
@@ -73,10 +77,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/experimental/authorization_config.proto", fileDescriptor_authorization_config_4cffac9b7afd314b)
+	proto.RegisterFile("google/api/experimental/authorization_config.proto", fileDescriptor_9a079278ac7754f2)
 }
 
-var fileDescriptor_authorization_config_4cffac9b7afd314b = []byte{
+var fileDescriptor_9a079278ac7754f2 = []byte{
 	// 180 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xad, 0x28, 0x48, 0x2d, 0xca, 0xcc, 0x4d, 0xcd,
diff --git a/googleapis/api/configchange/config_change.pb.go b/googleapis/api/configchange/config_change.pb.go
index 09d036ad42..d13e749c10 100644
--- a/googleapis/api/configchange/config_change.pb.go
+++ b/googleapis/api/configchange/config_change.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/config_change.proto
 
-package configchange // import "google.golang.org/genproto/googleapis/api/configchange"
+package configchange
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Classifies set of possible modifications to an object in the service
 // configuration.
@@ -42,6 +45,7 @@ var ChangeType_name = map[int32]string{
 	2: "REMOVED",
 	3: "MODIFIED",
 }
+
 var ChangeType_value = map[string]int32{
 	"CHANGE_TYPE_UNSPECIFIED": 0,
 	"ADDED":                   1,
@@ -52,8 +56,9 @@ var ChangeType_value = map[string]int32{
 func (x ChangeType) String() string {
 	return proto.EnumName(ChangeType_name, int32(x))
 }
+
 func (ChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_config_change_22274c34b306f4cb, []int{0}
+	return fileDescriptor_5c5c17e3f260da51, []int{0}
 }
 
 // Output generated from semantically comparing two versions of a service
@@ -93,16 +98,17 @@ func (m *ConfigChange) Reset()         { *m = ConfigChange{} }
 func (m *ConfigChange) String() string { return proto.CompactTextString(m) }
 func (*ConfigChange) ProtoMessage()    {}
 func (*ConfigChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_change_22274c34b306f4cb, []int{0}
+	return fileDescriptor_5c5c17e3f260da51, []int{0}
 }
+
 func (m *ConfigChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfigChange.Unmarshal(m, b)
 }
 func (m *ConfigChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfigChange.Marshal(b, m, deterministic)
 }
-func (dst *ConfigChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfigChange.Merge(dst, src)
+func (m *ConfigChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigChange.Merge(m, src)
 }
 func (m *ConfigChange) XXX_Size() int {
 	return xxx_messageInfo_ConfigChange.Size(m)
@@ -163,16 +169,17 @@ func (m *Advice) Reset()         { *m = Advice{} }
 func (m *Advice) String() string { return proto.CompactTextString(m) }
 func (*Advice) ProtoMessage()    {}
 func (*Advice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_change_22274c34b306f4cb, []int{1}
+	return fileDescriptor_5c5c17e3f260da51, []int{1}
 }
+
 func (m *Advice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Advice.Unmarshal(m, b)
 }
 func (m *Advice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Advice.Marshal(b, m, deterministic)
 }
-func (dst *Advice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Advice.Merge(dst, src)
+func (m *Advice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Advice.Merge(m, src)
 }
 func (m *Advice) XXX_Size() int {
 	return xxx_messageInfo_Advice.Size(m)
@@ -191,16 +198,14 @@ func (m *Advice) GetDescription() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.ChangeType", ChangeType_name, ChangeType_value)
 	proto.RegisterType((*ConfigChange)(nil), "google.api.ConfigChange")
 	proto.RegisterType((*Advice)(nil), "google.api.Advice")
-	proto.RegisterEnum("google.api.ChangeType", ChangeType_name, ChangeType_value)
 }
 
-func init() {
-	proto.RegisterFile("google/api/config_change.proto", fileDescriptor_config_change_22274c34b306f4cb)
-}
+func init() { proto.RegisterFile("google/api/config_change.proto", fileDescriptor_5c5c17e3f260da51) }
 
-var fileDescriptor_config_change_22274c34b306f4cb = []byte{
+var fileDescriptor_5c5c17e3f260da51 = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xcd, 0x4e, 0xc2, 0x40,
 	0x14, 0x85, 0x2d, 0xff, 0xdc, 0x12, 0x82, 0xb3, 0xd0, 0x26, 0x24, 0xa6, 0x61, 0x45, 0x88, 0x69,
diff --git a/googleapis/api/distribution/distribution.pb.go b/googleapis/api/distribution/distribution.pb.go
index 7e30f53174..39ff34cfb0 100644
--- a/googleapis/api/distribution/distribution.pb.go
+++ b/googleapis/api/distribution/distribution.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/distribution.proto
 
-package distribution // import "google.golang.org/genproto/googleapis/api/distribution"
+package distribution
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `Distribution` contains summary statistics for a population of values. It
 // optionally contains a histogram representing the distribution of those values
@@ -85,16 +88,17 @@ func (m *Distribution) Reset()         { *m = Distribution{} }
 func (m *Distribution) String() string { return proto.CompactTextString(m) }
 func (*Distribution) ProtoMessage()    {}
 func (*Distribution) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_f8b8947deb60fb1d, []int{0}
+	return fileDescriptor_0835ee0fd90bf943, []int{0}
 }
+
 func (m *Distribution) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution.Unmarshal(m, b)
 }
 func (m *Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution.Marshal(b, m, deterministic)
 }
-func (dst *Distribution) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution.Merge(dst, src)
+func (m *Distribution) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution.Merge(m, src)
 }
 func (m *Distribution) XXX_Size() int {
 	return xxx_messageInfo_Distribution.Size(m)
@@ -169,16 +173,17 @@ func (m *Distribution_Range) Reset()         { *m = Distribution_Range{} }
 func (m *Distribution_Range) String() string { return proto.CompactTextString(m) }
 func (*Distribution_Range) ProtoMessage()    {}
 func (*Distribution_Range) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_f8b8947deb60fb1d, []int{0, 0}
+	return fileDescriptor_0835ee0fd90bf943, []int{0, 0}
 }
+
 func (m *Distribution_Range) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_Range.Unmarshal(m, b)
 }
 func (m *Distribution_Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_Range.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_Range) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_Range.Merge(dst, src)
+func (m *Distribution_Range) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_Range.Merge(m, src)
 }
 func (m *Distribution_Range) XXX_Size() int {
 	return xxx_messageInfo_Distribution_Range.Size(m)
@@ -235,16 +240,17 @@ func (m *Distribution_BucketOptions) Reset()         { *m = Distribution_BucketO
 func (m *Distribution_BucketOptions) String() string { return proto.CompactTextString(m) }
 func (*Distribution_BucketOptions) ProtoMessage()    {}
 func (*Distribution_BucketOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_f8b8947deb60fb1d, []int{0, 1}
+	return fileDescriptor_0835ee0fd90bf943, []int{0, 1}
 }
+
 func (m *Distribution_BucketOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_BucketOptions.Unmarshal(m, b)
 }
 func (m *Distribution_BucketOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_BucketOptions.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_BucketOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_BucketOptions.Merge(dst, src)
+func (m *Distribution_BucketOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions.Merge(m, src)
 }
 func (m *Distribution_BucketOptions) XXX_Size() int {
 	return xxx_messageInfo_Distribution_BucketOptions.Size(m)
@@ -305,99 +311,15 @@ func (m *Distribution_BucketOptions) GetExplicitBuckets() *Distribution_BucketOp
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Distribution_BucketOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Distribution_BucketOptions_OneofMarshaler, _Distribution_BucketOptions_OneofUnmarshaler, _Distribution_BucketOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Distribution_BucketOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Distribution_BucketOptions_LinearBuckets)(nil),
 		(*Distribution_BucketOptions_ExponentialBuckets)(nil),
 		(*Distribution_BucketOptions_ExplicitBuckets)(nil),
 	}
 }
 
-func _Distribution_BucketOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Distribution_BucketOptions)
-	// options
-	switch x := m.Options.(type) {
-	case *Distribution_BucketOptions_LinearBuckets:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LinearBuckets); err != nil {
-			return err
-		}
-	case *Distribution_BucketOptions_ExponentialBuckets:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExponentialBuckets); err != nil {
-			return err
-		}
-	case *Distribution_BucketOptions_ExplicitBuckets:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExplicitBuckets); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Distribution_BucketOptions.Options has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Distribution_BucketOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Distribution_BucketOptions)
-	switch tag {
-	case 1: // options.linear_buckets
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Distribution_BucketOptions_Linear)
-		err := b.DecodeMessage(msg)
-		m.Options = &Distribution_BucketOptions_LinearBuckets{msg}
-		return true, err
-	case 2: // options.exponential_buckets
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Distribution_BucketOptions_Exponential)
-		err := b.DecodeMessage(msg)
-		m.Options = &Distribution_BucketOptions_ExponentialBuckets{msg}
-		return true, err
-	case 3: // options.explicit_buckets
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Distribution_BucketOptions_Explicit)
-		err := b.DecodeMessage(msg)
-		m.Options = &Distribution_BucketOptions_ExplicitBuckets{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Distribution_BucketOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Distribution_BucketOptions)
-	// options
-	switch x := m.Options.(type) {
-	case *Distribution_BucketOptions_LinearBuckets:
-		s := proto.Size(x.LinearBuckets)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Distribution_BucketOptions_ExponentialBuckets:
-		s := proto.Size(x.ExponentialBuckets)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Distribution_BucketOptions_ExplicitBuckets:
-		s := proto.Size(x.ExplicitBuckets)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Specifies a linear sequence of buckets that all have the same width
 // (except overflow and underflow). Each bucket represents a constant
 // absolute uncertainty on the specific value in the bucket.
@@ -423,16 +345,17 @@ func (m *Distribution_BucketOptions_Linear) Reset()         { *m = Distribution_
 func (m *Distribution_BucketOptions_Linear) String() string { return proto.CompactTextString(m) }
 func (*Distribution_BucketOptions_Linear) ProtoMessage()    {}
 func (*Distribution_BucketOptions_Linear) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_f8b8947deb60fb1d, []int{0, 1, 0}
+	return fileDescriptor_0835ee0fd90bf943, []int{0, 1, 0}
 }
+
 func (m *Distribution_BucketOptions_Linear) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_BucketOptions_Linear.Unmarshal(m, b)
 }
 func (m *Distribution_BucketOptions_Linear) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_BucketOptions_Linear.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_BucketOptions_Linear) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_BucketOptions_Linear.Merge(dst, src)
+func (m *Distribution_BucketOptions_Linear) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions_Linear.Merge(m, src)
 }
 func (m *Distribution_BucketOptions_Linear) XXX_Size() int {
 	return xxx_messageInfo_Distribution_BucketOptions_Linear.Size(m)
@@ -491,16 +414,17 @@ func (m *Distribution_BucketOptions_Exponential) Reset() {
 func (m *Distribution_BucketOptions_Exponential) String() string { return proto.CompactTextString(m) }
 func (*Distribution_BucketOptions_Exponential) ProtoMessage()    {}
 func (*Distribution_BucketOptions_Exponential) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_f8b8947deb60fb1d, []int{0, 1, 1}
+	return fileDescriptor_0835ee0fd90bf943, []int{0, 1, 1}
 }
+
 func (m *Distribution_BucketOptions_Exponential) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_BucketOptions_Exponential.Unmarshal(m, b)
 }
 func (m *Distribution_BucketOptions_Exponential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_BucketOptions_Exponential.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_BucketOptions_Exponential) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_BucketOptions_Exponential.Merge(dst, src)
+func (m *Distribution_BucketOptions_Exponential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions_Exponential.Merge(m, src)
 }
 func (m *Distribution_BucketOptions_Exponential) XXX_Size() int {
 	return xxx_messageInfo_Distribution_BucketOptions_Exponential.Size(m)
@@ -555,16 +479,17 @@ func (m *Distribution_BucketOptions_Explicit) Reset()         { *m = Distributio
 func (m *Distribution_BucketOptions_Explicit) String() string { return proto.CompactTextString(m) }
 func (*Distribution_BucketOptions_Explicit) ProtoMessage()    {}
 func (*Distribution_BucketOptions_Explicit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_f8b8947deb60fb1d, []int{0, 1, 2}
+	return fileDescriptor_0835ee0fd90bf943, []int{0, 1, 2}
 }
+
 func (m *Distribution_BucketOptions_Explicit) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_BucketOptions_Explicit.Unmarshal(m, b)
 }
 func (m *Distribution_BucketOptions_Explicit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_BucketOptions_Explicit.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_BucketOptions_Explicit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_BucketOptions_Explicit.Merge(dst, src)
+func (m *Distribution_BucketOptions_Explicit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions_Explicit.Merge(m, src)
 }
 func (m *Distribution_BucketOptions_Explicit) XXX_Size() int {
 	return xxx_messageInfo_Distribution_BucketOptions_Explicit.Size(m)
@@ -614,16 +539,17 @@ func (m *Distribution_Exemplar) Reset()         { *m = Distribution_Exemplar{} }
 func (m *Distribution_Exemplar) String() string { return proto.CompactTextString(m) }
 func (*Distribution_Exemplar) ProtoMessage()    {}
 func (*Distribution_Exemplar) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_f8b8947deb60fb1d, []int{0, 2}
+	return fileDescriptor_0835ee0fd90bf943, []int{0, 2}
 }
+
 func (m *Distribution_Exemplar) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_Exemplar.Unmarshal(m, b)
 }
 func (m *Distribution_Exemplar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_Exemplar.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_Exemplar) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_Exemplar.Merge(dst, src)
+func (m *Distribution_Exemplar) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_Exemplar.Merge(m, src)
 }
 func (m *Distribution_Exemplar) XXX_Size() int {
 	return xxx_messageInfo_Distribution_Exemplar.Size(m)
@@ -665,11 +591,9 @@ func init() {
 	proto.RegisterType((*Distribution_Exemplar)(nil), "google.api.Distribution.Exemplar")
 }
 
-func init() {
-	proto.RegisterFile("google/api/distribution.proto", fileDescriptor_distribution_f8b8947deb60fb1d)
-}
+func init() { proto.RegisterFile("google/api/distribution.proto", fileDescriptor_0835ee0fd90bf943) }
 
-var fileDescriptor_distribution_f8b8947deb60fb1d = []byte{
+var fileDescriptor_0835ee0fd90bf943 = []byte{
 	// 631 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xed, 0x6a, 0xd4, 0x40,
 	0x14, 0x6d, 0x9a, 0xdd, 0x6d, 0x7b, 0xb7, 0x5b, 0xeb, 0x58, 0x25, 0x06, 0xd4, 0xb5, 0x05, 0x59,
diff --git a/googleapis/api/experimental.pb.go b/googleapis/api/experimental.pb.go
index 0864b43d48..cc7f212945 100644
--- a/googleapis/api/experimental.pb.go
+++ b/googleapis/api/experimental.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/experimental/experimental.proto
 
-package api // import "google.golang.org/genproto/googleapis/api"
+package api
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Experimental service configuration. These configuration options can
 // only be used by whitelisted users.
@@ -33,16 +36,17 @@ func (m *Experimental) Reset()         { *m = Experimental{} }
 func (m *Experimental) String() string { return proto.CompactTextString(m) }
 func (*Experimental) ProtoMessage()    {}
 func (*Experimental) Descriptor() ([]byte, []int) {
-	return fileDescriptor_experimental_fa165d72ce8e6da4, []int{0}
+	return fileDescriptor_8ee43d601952ef58, []int{0}
 }
+
 func (m *Experimental) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Experimental.Unmarshal(m, b)
 }
 func (m *Experimental) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Experimental.Marshal(b, m, deterministic)
 }
-func (dst *Experimental) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Experimental.Merge(dst, src)
+func (m *Experimental) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Experimental.Merge(m, src)
 }
 func (m *Experimental) XXX_Size() int {
 	return xxx_messageInfo_Experimental.Size(m)
@@ -65,10 +69,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/experimental/experimental.proto", fileDescriptor_experimental_fa165d72ce8e6da4)
+	proto.RegisterFile("google/api/experimental/experimental.proto", fileDescriptor_8ee43d601952ef58)
 }
 
-var fileDescriptor_experimental_fa165d72ce8e6da4 = []byte{
+var fileDescriptor_8ee43d601952ef58 = []byte{
 	// 204 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xad, 0x28, 0x48, 0x2d, 0xca, 0xcc, 0x4d, 0xcd,
diff --git a/googleapis/api/expr/v1alpha1/cel_service.pb.go b/googleapis/api/expr/v1alpha1/cel_service.pb.go
index c8cdd648f1..b516c4e81b 100644
--- a/googleapis/api/expr/v1alpha1/cel_service.pb.go
+++ b/googleapis/api/expr/v1alpha1/cel_service.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/cel_service.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+package expr
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
 )
 
@@ -21,7 +21,30 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+func init() {
+	proto.RegisterFile("google/api/expr/v1alpha1/cel_service.proto", fileDescriptor_f35b2125e64b6d66)
+}
+
+var fileDescriptor_f35b2125e64b6d66 = []byte{
+	// 240 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd1, 0x31, 0x4b, 0xc4, 0x30,
+	0x14, 0xc0, 0x71, 0x2b, 0xea, 0x90, 0x45, 0xc8, 0x24, 0x87, 0x93, 0xe0, 0x09, 0x0e, 0x09, 0x77,
+	0x8e, 0x3a, 0xdd, 0xe1, 0x5e, 0x74, 0x10, 0x6e, 0x91, 0x67, 0x78, 0xe6, 0x82, 0x69, 0x5e, 0x4c,
+	0x6a, 0xf1, 0xcb, 0xf8, 0x3d, 0x1d, 0x25, 0x69, 0xab, 0x88, 0xc4, 0xde, 0xd8, 0xbe, 0x5f, 0xfe,
+	0x81, 0x17, 0x76, 0xa9, 0x89, 0xb4, 0x45, 0x09, 0xde, 0x48, 0x7c, 0xf7, 0x41, 0x76, 0x0b, 0xb0,
+	0x7e, 0x0b, 0x0b, 0xa9, 0xd0, 0x3e, 0x46, 0x0c, 0x9d, 0x51, 0x28, 0x7c, 0xa0, 0x96, 0xf8, 0x49,
+	0x6f, 0x05, 0x78, 0x23, 0x92, 0x15, 0xa3, 0x9d, 0x2d, 0xcb, 0x15, 0x72, 0xcf, 0x14, 0x1a, 0x70,
+	0x0a, 0x7f, 0xd7, 0x96, 0x1f, 0xfb, 0x8c, 0xad, 0xd1, 0xde, 0xf7, 0x3f, 0xf9, 0x86, 0x1d, 0xd6,
+	0x10, 0x22, 0xf2, 0xb9, 0x28, 0x5d, 0x23, 0x32, 0xb8, 0xc3, 0xd7, 0x37, 0x8c, 0xed, 0xec, 0x62,
+	0xd2, 0x45, 0x4f, 0x2e, 0xe2, 0xd9, 0x5e, 0x6a, 0xaf, 0xb7, 0xa8, 0x5e, 0xfe, 0x6b, 0x67, 0xb0,
+	0x43, 0x7b, 0x70, 0xdf, 0xed, 0x07, 0x76, 0x70, 0xdb, 0x81, 0xe5, 0xe7, 0xe5, 0x23, 0x69, 0x3e,
+	0x96, 0xe7, 0x53, 0x6c, 0x0c, 0xaf, 0x02, 0x3b, 0x55, 0xd4, 0x14, 0xf9, 0xea, 0xf8, 0x67, 0x79,
+	0x75, 0x5a, 0x68, 0x5d, 0x6d, 0x6e, 0x06, 0xac, 0xc9, 0x82, 0xd3, 0x82, 0x82, 0x96, 0x1a, 0x5d,
+	0x5e, 0xb7, 0xec, 0x47, 0xe0, 0x4d, 0xfc, 0xfb, 0x4a, 0xd7, 0xe9, 0xeb, 0xb3, 0xaa, 0x9e, 0x8e,
+	0xb2, 0xbd, 0xfa, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x97, 0x50, 0xb8, 0x16, 0x02, 0x00, 0x00,
+}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -170,26 +193,3 @@ var _CelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/api/expr/v1alpha1/cel_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/api/expr/v1alpha1/cel_service.proto", fileDescriptor_cel_service_35d601a3638fea4b)
-}
-
-var fileDescriptor_cel_service_35d601a3638fea4b = []byte{
-	// 240 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd1, 0x31, 0x4b, 0xc4, 0x30,
-	0x14, 0xc0, 0x71, 0x2b, 0xea, 0x90, 0x45, 0xc8, 0x24, 0x87, 0x93, 0xe0, 0x09, 0x0e, 0x09, 0x77,
-	0x8e, 0x3a, 0xdd, 0xe1, 0x5e, 0x74, 0x10, 0x6e, 0x91, 0x67, 0x78, 0xe6, 0x82, 0x69, 0x5e, 0x4c,
-	0x6a, 0xf1, 0xcb, 0xf8, 0x3d, 0x1d, 0x25, 0x69, 0xab, 0x88, 0xc4, 0xde, 0xd8, 0xbe, 0x5f, 0xfe,
-	0x81, 0x17, 0x76, 0xa9, 0x89, 0xb4, 0x45, 0x09, 0xde, 0x48, 0x7c, 0xf7, 0x41, 0x76, 0x0b, 0xb0,
-	0x7e, 0x0b, 0x0b, 0xa9, 0xd0, 0x3e, 0x46, 0x0c, 0x9d, 0x51, 0x28, 0x7c, 0xa0, 0x96, 0xf8, 0x49,
-	0x6f, 0x05, 0x78, 0x23, 0x92, 0x15, 0xa3, 0x9d, 0x2d, 0xcb, 0x15, 0x72, 0xcf, 0x14, 0x1a, 0x70,
-	0x0a, 0x7f, 0xd7, 0x96, 0x1f, 0xfb, 0x8c, 0xad, 0xd1, 0xde, 0xf7, 0x3f, 0xf9, 0x86, 0x1d, 0xd6,
-	0x10, 0x22, 0xf2, 0xb9, 0x28, 0x5d, 0x23, 0x32, 0xb8, 0xc3, 0xd7, 0x37, 0x8c, 0xed, 0xec, 0x62,
-	0xd2, 0x45, 0x4f, 0x2e, 0xe2, 0xd9, 0x5e, 0x6a, 0xaf, 0xb7, 0xa8, 0x5e, 0xfe, 0x6b, 0x67, 0xb0,
-	0x43, 0x7b, 0x70, 0xdf, 0xed, 0x07, 0x76, 0x70, 0xdb, 0x81, 0xe5, 0xe7, 0xe5, 0x23, 0x69, 0x3e,
-	0x96, 0xe7, 0x53, 0x6c, 0x0c, 0xaf, 0x02, 0x3b, 0x55, 0xd4, 0x14, 0xf9, 0xea, 0xf8, 0x67, 0x79,
-	0x75, 0x5a, 0x68, 0x5d, 0x6d, 0x6e, 0x06, 0xac, 0xc9, 0x82, 0xd3, 0x82, 0x82, 0x96, 0x1a, 0x5d,
-	0x5e, 0xb7, 0xec, 0x47, 0xe0, 0x4d, 0xfc, 0xfb, 0x4a, 0xd7, 0xe9, 0xeb, 0xb3, 0xaa, 0x9e, 0x8e,
-	0xb2, 0xbd, 0xfa, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x97, 0x50, 0xb8, 0x16, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/api/expr/v1alpha1/checked.pb.go b/googleapis/api/expr/v1alpha1/checked.pb.go
index b76f7db8a5..f6b2630110 100644
--- a/googleapis/api/expr/v1alpha1/checked.pb.go
+++ b/googleapis/api/expr/v1alpha1/checked.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/checked.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // CEL primitive types.
 type Type_PrimitiveType int32
@@ -55,6 +58,7 @@ var Type_PrimitiveType_name = map[int32]string{
 	5: "STRING",
 	6: "BYTES",
 }
+
 var Type_PrimitiveType_value = map[string]int32{
 	"PRIMITIVE_TYPE_UNSPECIFIED": 0,
 	"BOOL":                       1,
@@ -68,8 +72,9 @@ var Type_PrimitiveType_value = map[string]int32{
 func (x Type_PrimitiveType) String() string {
 	return proto.EnumName(Type_PrimitiveType_name, int32(x))
 }
+
 func (Type_PrimitiveType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{1, 0}
+	return fileDescriptor_30a741de3e790389, []int{1, 0}
 }
 
 // Well-known protobuf types treated with first-class support in CEL.
@@ -96,6 +101,7 @@ var Type_WellKnownType_name = map[int32]string{
 	2: "TIMESTAMP",
 	3: "DURATION",
 }
+
 var Type_WellKnownType_value = map[string]int32{
 	"WELL_KNOWN_TYPE_UNSPECIFIED": 0,
 	"ANY":                         1,
@@ -106,8 +112,9 @@ var Type_WellKnownType_value = map[string]int32{
 func (x Type_WellKnownType) String() string {
 	return proto.EnumName(Type_WellKnownType_name, int32(x))
 }
+
 func (Type_WellKnownType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{1, 1}
+	return fileDescriptor_30a741de3e790389, []int{1, 1}
 }
 
 // A CEL expression which has been successfully type checked.
@@ -149,16 +156,17 @@ func (m *CheckedExpr) Reset()         { *m = CheckedExpr{} }
 func (m *CheckedExpr) String() string { return proto.CompactTextString(m) }
 func (*CheckedExpr) ProtoMessage()    {}
 func (*CheckedExpr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{0}
+	return fileDescriptor_30a741de3e790389, []int{0}
 }
+
 func (m *CheckedExpr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckedExpr.Unmarshal(m, b)
 }
 func (m *CheckedExpr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckedExpr.Marshal(b, m, deterministic)
 }
-func (dst *CheckedExpr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckedExpr.Merge(dst, src)
+func (m *CheckedExpr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckedExpr.Merge(m, src)
 }
 func (m *CheckedExpr) XXX_Size() int {
 	return xxx_messageInfo_CheckedExpr.Size(m)
@@ -225,16 +233,17 @@ func (m *Type) Reset()         { *m = Type{} }
 func (m *Type) String() string { return proto.CompactTextString(m) }
 func (*Type) ProtoMessage()    {}
 func (*Type) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{1}
+	return fileDescriptor_30a741de3e790389, []int{1}
 }
+
 func (m *Type) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Type.Unmarshal(m, b)
 }
 func (m *Type) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Type.Marshal(b, m, deterministic)
 }
-func (dst *Type) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Type.Merge(dst, src)
+func (m *Type) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type.Merge(m, src)
 }
 func (m *Type) XXX_Size() int {
 	return xxx_messageInfo_Type.Size(m)
@@ -425,9 +434,9 @@ func (m *Type) GetAbstractType() *Type_AbstractType {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Type) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Type_OneofMarshaler, _Type_OneofUnmarshaler, _Type_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Type) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Type_Dyn)(nil),
 		(*Type_Null)(nil),
 		(*Type_Primitive)(nil),
@@ -444,242 +453,6 @@ func (*Type) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, f
 	}
 }
 
-func _Type_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Type)
-	// type_kind
-	switch x := m.TypeKind.(type) {
-	case *Type_Dyn:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Dyn); err != nil {
-			return err
-		}
-	case *Type_Null:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Null))
-	case *Type_Primitive:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Primitive))
-	case *Type_Wrapper:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Wrapper))
-	case *Type_WellKnown:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.WellKnown))
-	case *Type_ListType_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListType); err != nil {
-			return err
-		}
-	case *Type_MapType_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MapType); err != nil {
-			return err
-		}
-	case *Type_Function:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Function); err != nil {
-			return err
-		}
-	case *Type_MessageType:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MessageType)
-	case *Type_TypeParam:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TypeParam)
-	case *Type_Type:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Type); err != nil {
-			return err
-		}
-	case *Type_Error:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Error); err != nil {
-			return err
-		}
-	case *Type_AbstractType_:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AbstractType); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Type.TypeKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Type_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Type)
-	switch tag {
-	case 1: // type_kind.dyn
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(empty.Empty)
-		err := b.DecodeMessage(msg)
-		m.TypeKind = &Type_Dyn{msg}
-		return true, err
-	case 2: // type_kind.null
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TypeKind = &Type_Null{_struct.NullValue(x)}
-		return true, err
-	case 3: // type_kind.primitive
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TypeKind = &Type_Primitive{Type_PrimitiveType(x)}
-		return true, err
-	case 4: // type_kind.wrapper
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TypeKind = &Type_Wrapper{Type_PrimitiveType(x)}
-		return true, err
-	case 5: // type_kind.well_known
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TypeKind = &Type_WellKnown{Type_WellKnownType(x)}
-		return true, err
-	case 6: // type_kind.list_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Type_ListType)
-		err := b.DecodeMessage(msg)
-		m.TypeKind = &Type_ListType_{msg}
-		return true, err
-	case 7: // type_kind.map_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Type_MapType)
-		err := b.DecodeMessage(msg)
-		m.TypeKind = &Type_MapType_{msg}
-		return true, err
-	case 8: // type_kind.function
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Type_FunctionType)
-		err := b.DecodeMessage(msg)
-		m.TypeKind = &Type_Function{msg}
-		return true, err
-	case 9: // type_kind.message_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.TypeKind = &Type_MessageType{x}
-		return true, err
-	case 10: // type_kind.type_param
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.TypeKind = &Type_TypeParam{x}
-		return true, err
-	case 11: // type_kind.type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Type)
-		err := b.DecodeMessage(msg)
-		m.TypeKind = &Type_Type{msg}
-		return true, err
-	case 12: // type_kind.error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(empty.Empty)
-		err := b.DecodeMessage(msg)
-		m.TypeKind = &Type_Error{msg}
-		return true, err
-	case 14: // type_kind.abstract_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Type_AbstractType)
-		err := b.DecodeMessage(msg)
-		m.TypeKind = &Type_AbstractType_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Type_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Type)
-	// type_kind
-	switch x := m.TypeKind.(type) {
-	case *Type_Dyn:
-		s := proto.Size(x.Dyn)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Type_Null:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Null))
-	case *Type_Primitive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Primitive))
-	case *Type_Wrapper:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Wrapper))
-	case *Type_WellKnown:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.WellKnown))
-	case *Type_ListType_:
-		s := proto.Size(x.ListType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Type_MapType_:
-		s := proto.Size(x.MapType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Type_Function:
-		s := proto.Size(x.Function)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Type_MessageType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MessageType)))
-		n += len(x.MessageType)
-	case *Type_TypeParam:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TypeParam)))
-		n += len(x.TypeParam)
-	case *Type_Type:
-		s := proto.Size(x.Type)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Type_Error:
-		s := proto.Size(x.Error)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Type_AbstractType_:
-		s := proto.Size(x.AbstractType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // List type with typed elements, e.g. `list<example.proto.MyMessage>`.
 type Type_ListType struct {
 	// The element type.
@@ -693,16 +466,17 @@ func (m *Type_ListType) Reset()         { *m = Type_ListType{} }
 func (m *Type_ListType) String() string { return proto.CompactTextString(m) }
 func (*Type_ListType) ProtoMessage()    {}
 func (*Type_ListType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{1, 0}
+	return fileDescriptor_30a741de3e790389, []int{1, 0}
 }
+
 func (m *Type_ListType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Type_ListType.Unmarshal(m, b)
 }
 func (m *Type_ListType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Type_ListType.Marshal(b, m, deterministic)
 }
-func (dst *Type_ListType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Type_ListType.Merge(dst, src)
+func (m *Type_ListType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type_ListType.Merge(m, src)
 }
 func (m *Type_ListType) XXX_Size() int {
 	return xxx_messageInfo_Type_ListType.Size(m)
@@ -735,16 +509,17 @@ func (m *Type_MapType) Reset()         { *m = Type_MapType{} }
 func (m *Type_MapType) String() string { return proto.CompactTextString(m) }
 func (*Type_MapType) ProtoMessage()    {}
 func (*Type_MapType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{1, 1}
+	return fileDescriptor_30a741de3e790389, []int{1, 1}
 }
+
 func (m *Type_MapType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Type_MapType.Unmarshal(m, b)
 }
 func (m *Type_MapType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Type_MapType.Marshal(b, m, deterministic)
 }
-func (dst *Type_MapType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Type_MapType.Merge(dst, src)
+func (m *Type_MapType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type_MapType.Merge(m, src)
 }
 func (m *Type_MapType) XXX_Size() int {
 	return xxx_messageInfo_Type_MapType.Size(m)
@@ -784,16 +559,17 @@ func (m *Type_FunctionType) Reset()         { *m = Type_FunctionType{} }
 func (m *Type_FunctionType) String() string { return proto.CompactTextString(m) }
 func (*Type_FunctionType) ProtoMessage()    {}
 func (*Type_FunctionType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{1, 2}
+	return fileDescriptor_30a741de3e790389, []int{1, 2}
 }
+
 func (m *Type_FunctionType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Type_FunctionType.Unmarshal(m, b)
 }
 func (m *Type_FunctionType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Type_FunctionType.Marshal(b, m, deterministic)
 }
-func (dst *Type_FunctionType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Type_FunctionType.Merge(dst, src)
+func (m *Type_FunctionType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type_FunctionType.Merge(m, src)
 }
 func (m *Type_FunctionType) XXX_Size() int {
 	return xxx_messageInfo_Type_FunctionType.Size(m)
@@ -833,16 +609,17 @@ func (m *Type_AbstractType) Reset()         { *m = Type_AbstractType{} }
 func (m *Type_AbstractType) String() string { return proto.CompactTextString(m) }
 func (*Type_AbstractType) ProtoMessage()    {}
 func (*Type_AbstractType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{1, 3}
+	return fileDescriptor_30a741de3e790389, []int{1, 3}
 }
+
 func (m *Type_AbstractType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Type_AbstractType.Unmarshal(m, b)
 }
 func (m *Type_AbstractType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Type_AbstractType.Marshal(b, m, deterministic)
 }
-func (dst *Type_AbstractType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Type_AbstractType.Merge(dst, src)
+func (m *Type_AbstractType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type_AbstractType.Merge(m, src)
 }
 func (m *Type_AbstractType) XXX_Size() int {
 	return xxx_messageInfo_Type_AbstractType.Size(m)
@@ -898,16 +675,17 @@ func (m *Decl) Reset()         { *m = Decl{} }
 func (m *Decl) String() string { return proto.CompactTextString(m) }
 func (*Decl) ProtoMessage()    {}
 func (*Decl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{2}
+	return fileDescriptor_30a741de3e790389, []int{2}
 }
+
 func (m *Decl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Decl.Unmarshal(m, b)
 }
 func (m *Decl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Decl.Marshal(b, m, deterministic)
 }
-func (dst *Decl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Decl.Merge(dst, src)
+func (m *Decl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Decl.Merge(m, src)
 }
 func (m *Decl) XXX_Size() int {
 	return xxx_messageInfo_Decl.Size(m)
@@ -962,80 +740,14 @@ func (m *Decl) GetFunction() *Decl_FunctionDecl {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Decl) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Decl_OneofMarshaler, _Decl_OneofUnmarshaler, _Decl_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Decl) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Decl_Ident)(nil),
 		(*Decl_Function)(nil),
 	}
 }
 
-func _Decl_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Decl)
-	// decl_kind
-	switch x := m.DeclKind.(type) {
-	case *Decl_Ident:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Ident); err != nil {
-			return err
-		}
-	case *Decl_Function:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Function); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Decl.DeclKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Decl_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Decl)
-	switch tag {
-	case 2: // decl_kind.ident
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Decl_IdentDecl)
-		err := b.DecodeMessage(msg)
-		m.DeclKind = &Decl_Ident{msg}
-		return true, err
-	case 3: // decl_kind.function
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Decl_FunctionDecl)
-		err := b.DecodeMessage(msg)
-		m.DeclKind = &Decl_Function{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Decl_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Decl)
-	// decl_kind
-	switch x := m.DeclKind.(type) {
-	case *Decl_Ident:
-		s := proto.Size(x.Ident)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Decl_Function:
-		s := proto.Size(x.Function)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Identifier declaration which specifies its type and optional `Expr` value.
 //
 // An identifier without a value is a declaration that must be provided at
@@ -1059,16 +771,17 @@ func (m *Decl_IdentDecl) Reset()         { *m = Decl_IdentDecl{} }
 func (m *Decl_IdentDecl) String() string { return proto.CompactTextString(m) }
 func (*Decl_IdentDecl) ProtoMessage()    {}
 func (*Decl_IdentDecl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{2, 0}
+	return fileDescriptor_30a741de3e790389, []int{2, 0}
 }
+
 func (m *Decl_IdentDecl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Decl_IdentDecl.Unmarshal(m, b)
 }
 func (m *Decl_IdentDecl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Decl_IdentDecl.Marshal(b, m, deterministic)
 }
-func (dst *Decl_IdentDecl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Decl_IdentDecl.Merge(dst, src)
+func (m *Decl_IdentDecl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Decl_IdentDecl.Merge(m, src)
 }
 func (m *Decl_IdentDecl) XXX_Size() int {
 	return xxx_messageInfo_Decl_IdentDecl.Size(m)
@@ -1118,16 +831,17 @@ func (m *Decl_FunctionDecl) Reset()         { *m = Decl_FunctionDecl{} }
 func (m *Decl_FunctionDecl) String() string { return proto.CompactTextString(m) }
 func (*Decl_FunctionDecl) ProtoMessage()    {}
 func (*Decl_FunctionDecl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{2, 1}
+	return fileDescriptor_30a741de3e790389, []int{2, 1}
 }
+
 func (m *Decl_FunctionDecl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Decl_FunctionDecl.Unmarshal(m, b)
 }
 func (m *Decl_FunctionDecl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Decl_FunctionDecl.Marshal(b, m, deterministic)
 }
-func (dst *Decl_FunctionDecl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Decl_FunctionDecl.Merge(dst, src)
+func (m *Decl_FunctionDecl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Decl_FunctionDecl.Merge(m, src)
 }
 func (m *Decl_FunctionDecl) XXX_Size() int {
 	return xxx_messageInfo_Decl_FunctionDecl.Size(m)
@@ -1200,16 +914,17 @@ func (m *Decl_FunctionDecl_Overload) Reset()         { *m = Decl_FunctionDecl_Ov
 func (m *Decl_FunctionDecl_Overload) String() string { return proto.CompactTextString(m) }
 func (*Decl_FunctionDecl_Overload) ProtoMessage()    {}
 func (*Decl_FunctionDecl_Overload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{2, 1, 0}
+	return fileDescriptor_30a741de3e790389, []int{2, 1, 0}
 }
+
 func (m *Decl_FunctionDecl_Overload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Decl_FunctionDecl_Overload.Unmarshal(m, b)
 }
 func (m *Decl_FunctionDecl_Overload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Decl_FunctionDecl_Overload.Marshal(b, m, deterministic)
 }
-func (dst *Decl_FunctionDecl_Overload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Decl_FunctionDecl_Overload.Merge(dst, src)
+func (m *Decl_FunctionDecl_Overload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Decl_FunctionDecl_Overload.Merge(m, src)
 }
 func (m *Decl_FunctionDecl_Overload) XXX_Size() int {
 	return xxx_messageInfo_Decl_FunctionDecl_Overload.Size(m)
@@ -1288,16 +1003,17 @@ func (m *Reference) Reset()         { *m = Reference{} }
 func (m *Reference) String() string { return proto.CompactTextString(m) }
 func (*Reference) ProtoMessage()    {}
 func (*Reference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_checked_c2e2f3dfa4cfeebf, []int{3}
+	return fileDescriptor_30a741de3e790389, []int{3}
 }
+
 func (m *Reference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Reference.Unmarshal(m, b)
 }
 func (m *Reference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Reference.Marshal(b, m, deterministic)
 }
-func (dst *Reference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Reference.Merge(dst, src)
+func (m *Reference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Reference.Merge(m, src)
 }
 func (m *Reference) XXX_Size() int {
 	return xxx_messageInfo_Reference.Size(m)
@@ -1330,6 +1046,8 @@ func (m *Reference) GetValue() *Constant {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.expr.v1alpha1.Type_PrimitiveType", Type_PrimitiveType_name, Type_PrimitiveType_value)
+	proto.RegisterEnum("google.api.expr.v1alpha1.Type_WellKnownType", Type_WellKnownType_name, Type_WellKnownType_value)
 	proto.RegisterType((*CheckedExpr)(nil), "google.api.expr.v1alpha1.CheckedExpr")
 	proto.RegisterMapType((map[int64]*Reference)(nil), "google.api.expr.v1alpha1.CheckedExpr.ReferenceMapEntry")
 	proto.RegisterMapType((map[int64]*Type)(nil), "google.api.expr.v1alpha1.CheckedExpr.TypeMapEntry")
@@ -1343,15 +1061,13 @@ func init() {
 	proto.RegisterType((*Decl_FunctionDecl)(nil), "google.api.expr.v1alpha1.Decl.FunctionDecl")
 	proto.RegisterType((*Decl_FunctionDecl_Overload)(nil), "google.api.expr.v1alpha1.Decl.FunctionDecl.Overload")
 	proto.RegisterType((*Reference)(nil), "google.api.expr.v1alpha1.Reference")
-	proto.RegisterEnum("google.api.expr.v1alpha1.Type_PrimitiveType", Type_PrimitiveType_name, Type_PrimitiveType_value)
-	proto.RegisterEnum("google.api.expr.v1alpha1.Type_WellKnownType", Type_WellKnownType_name, Type_WellKnownType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/api/expr/v1alpha1/checked.proto", fileDescriptor_checked_c2e2f3dfa4cfeebf)
+	proto.RegisterFile("google/api/expr/v1alpha1/checked.proto", fileDescriptor_30a741de3e790389)
 }
 
-var fileDescriptor_checked_c2e2f3dfa4cfeebf = []byte{
+var fileDescriptor_30a741de3e790389 = []byte{
 	// 1144 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x5f, 0x6f, 0xdb, 0xb6,
 	0x17, 0x8d, 0x6c, 0xd9, 0x96, 0xae, 0x9c, 0xfe, 0xfc, 0x23, 0x86, 0x41, 0x50, 0x8b, 0x36, 0x70,
diff --git a/googleapis/api/expr/v1alpha1/conformance_service.pb.go b/googleapis/api/expr/v1alpha1/conformance_service.pb.go
index 63577b0c00..1eef1122c2 100644
--- a/googleapis/api/expr/v1alpha1/conformance_service.pb.go
+++ b/googleapis/api/expr/v1alpha1/conformance_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/conformance_service.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package expr
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Severities of issues.
 type IssueDetails_Severity int32
@@ -45,6 +45,7 @@ var IssueDetails_Severity_name = map[int32]string{
 	2: "WARNING",
 	3: "ERROR",
 }
+
 var IssueDetails_Severity_value = map[string]int32{
 	"SEVERITY_UNSPECIFIED": 0,
 	"DEPRECATION":          1,
@@ -55,8 +56,9 @@ var IssueDetails_Severity_value = map[string]int32{
 func (x IssueDetails_Severity) String() string {
 	return proto.EnumName(IssueDetails_Severity_name, int32(x))
 }
+
 func (IssueDetails_Severity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{6, 0}
+	return fileDescriptor_b3ca1183e6ceae83, []int{6, 0}
 }
 
 // Request message for the Parse method.
@@ -79,16 +81,17 @@ func (m *ParseRequest) Reset()         { *m = ParseRequest{} }
 func (m *ParseRequest) String() string { return proto.CompactTextString(m) }
 func (*ParseRequest) ProtoMessage()    {}
 func (*ParseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{0}
+	return fileDescriptor_b3ca1183e6ceae83, []int{0}
 }
+
 func (m *ParseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParseRequest.Unmarshal(m, b)
 }
 func (m *ParseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParseRequest.Marshal(b, m, deterministic)
 }
-func (dst *ParseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParseRequest.Merge(dst, src)
+func (m *ParseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParseRequest.Merge(m, src)
 }
 func (m *ParseRequest) XXX_Size() int {
 	return xxx_messageInfo_ParseRequest.Size(m)
@@ -142,16 +145,17 @@ func (m *ParseResponse) Reset()         { *m = ParseResponse{} }
 func (m *ParseResponse) String() string { return proto.CompactTextString(m) }
 func (*ParseResponse) ProtoMessage()    {}
 func (*ParseResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{1}
+	return fileDescriptor_b3ca1183e6ceae83, []int{1}
 }
+
 func (m *ParseResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParseResponse.Unmarshal(m, b)
 }
 func (m *ParseResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParseResponse.Marshal(b, m, deterministic)
 }
-func (dst *ParseResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParseResponse.Merge(dst, src)
+func (m *ParseResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParseResponse.Merge(m, src)
 }
 func (m *ParseResponse) XXX_Size() int {
 	return xxx_messageInfo_ParseResponse.Size(m)
@@ -201,16 +205,17 @@ func (m *CheckRequest) Reset()         { *m = CheckRequest{} }
 func (m *CheckRequest) String() string { return proto.CompactTextString(m) }
 func (*CheckRequest) ProtoMessage()    {}
 func (*CheckRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{2}
+	return fileDescriptor_b3ca1183e6ceae83, []int{2}
 }
+
 func (m *CheckRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckRequest.Unmarshal(m, b)
 }
 func (m *CheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckRequest.Marshal(b, m, deterministic)
 }
-func (dst *CheckRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckRequest.Merge(dst, src)
+func (m *CheckRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckRequest.Merge(m, src)
 }
 func (m *CheckRequest) XXX_Size() int {
 	return xxx_messageInfo_CheckRequest.Size(m)
@@ -264,16 +269,17 @@ func (m *CheckResponse) Reset()         { *m = CheckResponse{} }
 func (m *CheckResponse) String() string { return proto.CompactTextString(m) }
 func (*CheckResponse) ProtoMessage()    {}
 func (*CheckResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{3}
+	return fileDescriptor_b3ca1183e6ceae83, []int{3}
 }
+
 func (m *CheckResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckResponse.Unmarshal(m, b)
 }
 func (m *CheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckResponse.Marshal(b, m, deterministic)
 }
-func (dst *CheckResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckResponse.Merge(dst, src)
+func (m *CheckResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckResponse.Merge(m, src)
 }
 func (m *CheckResponse) XXX_Size() int {
 	return xxx_messageInfo_CheckResponse.Size(m)
@@ -322,16 +328,17 @@ func (m *EvalRequest) Reset()         { *m = EvalRequest{} }
 func (m *EvalRequest) String() string { return proto.CompactTextString(m) }
 func (*EvalRequest) ProtoMessage()    {}
 func (*EvalRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{4}
+	return fileDescriptor_b3ca1183e6ceae83, []int{4}
 }
+
 func (m *EvalRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EvalRequest.Unmarshal(m, b)
 }
 func (m *EvalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EvalRequest.Marshal(b, m, deterministic)
 }
-func (dst *EvalRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EvalRequest.Merge(dst, src)
+func (m *EvalRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvalRequest.Merge(m, src)
 }
 func (m *EvalRequest) XXX_Size() int {
 	return xxx_messageInfo_EvalRequest.Size(m)
@@ -393,80 +400,14 @@ func (m *EvalRequest) GetContainer() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*EvalRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _EvalRequest_OneofMarshaler, _EvalRequest_OneofUnmarshaler, _EvalRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*EvalRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*EvalRequest_ParsedExpr)(nil),
 		(*EvalRequest_CheckedExpr)(nil),
 	}
 }
 
-func _EvalRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*EvalRequest)
-	// expr_kind
-	switch x := m.ExprKind.(type) {
-	case *EvalRequest_ParsedExpr:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ParsedExpr); err != nil {
-			return err
-		}
-	case *EvalRequest_CheckedExpr:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CheckedExpr); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("EvalRequest.ExprKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _EvalRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*EvalRequest)
-	switch tag {
-	case 1: // expr_kind.parsed_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ParsedExpr)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &EvalRequest_ParsedExpr{msg}
-		return true, err
-	case 2: // expr_kind.checked_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CheckedExpr)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &EvalRequest_CheckedExpr{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _EvalRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*EvalRequest)
-	// expr_kind
-	switch x := m.ExprKind.(type) {
-	case *EvalRequest_ParsedExpr:
-		s := proto.Size(x.ParsedExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *EvalRequest_CheckedExpr:
-		s := proto.Size(x.CheckedExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for the Eval method.
 type EvalResponse struct {
 	// The execution result, or unset if execution couldn't start.
@@ -485,16 +426,17 @@ func (m *EvalResponse) Reset()         { *m = EvalResponse{} }
 func (m *EvalResponse) String() string { return proto.CompactTextString(m) }
 func (*EvalResponse) ProtoMessage()    {}
 func (*EvalResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{5}
+	return fileDescriptor_b3ca1183e6ceae83, []int{5}
 }
+
 func (m *EvalResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EvalResponse.Unmarshal(m, b)
 }
 func (m *EvalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EvalResponse.Marshal(b, m, deterministic)
 }
-func (dst *EvalResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EvalResponse.Merge(dst, src)
+func (m *EvalResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvalResponse.Merge(m, src)
 }
 func (m *EvalResponse) XXX_Size() int {
 	return xxx_messageInfo_EvalResponse.Size(m)
@@ -538,16 +480,17 @@ func (m *IssueDetails) Reset()         { *m = IssueDetails{} }
 func (m *IssueDetails) String() string { return proto.CompactTextString(m) }
 func (*IssueDetails) ProtoMessage()    {}
 func (*IssueDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conformance_service_35e6de9bb7108510, []int{6}
+	return fileDescriptor_b3ca1183e6ceae83, []int{6}
 }
+
 func (m *IssueDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssueDetails.Unmarshal(m, b)
 }
 func (m *IssueDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssueDetails.Marshal(b, m, deterministic)
 }
-func (dst *IssueDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssueDetails.Merge(dst, src)
+func (m *IssueDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssueDetails.Merge(m, src)
 }
 func (m *IssueDetails) XXX_Size() int {
 	return xxx_messageInfo_IssueDetails.Size(m)
@@ -580,6 +523,7 @@ func (m *IssueDetails) GetId() int64 {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.expr.v1alpha1.IssueDetails_Severity", IssueDetails_Severity_name, IssueDetails_Severity_value)
 	proto.RegisterType((*ParseRequest)(nil), "google.api.expr.v1alpha1.ParseRequest")
 	proto.RegisterType((*ParseResponse)(nil), "google.api.expr.v1alpha1.ParseResponse")
 	proto.RegisterType((*CheckRequest)(nil), "google.api.expr.v1alpha1.CheckRequest")
@@ -588,7 +532,65 @@ func init() {
 	proto.RegisterMapType((map[string]*ExprValue)(nil), "google.api.expr.v1alpha1.EvalRequest.BindingsEntry")
 	proto.RegisterType((*EvalResponse)(nil), "google.api.expr.v1alpha1.EvalResponse")
 	proto.RegisterType((*IssueDetails)(nil), "google.api.expr.v1alpha1.IssueDetails")
-	proto.RegisterEnum("google.api.expr.v1alpha1.IssueDetails_Severity", IssueDetails_Severity_name, IssueDetails_Severity_value)
+}
+
+func init() {
+	proto.RegisterFile("google/api/expr/v1alpha1/conformance_service.proto", fileDescriptor_b3ca1183e6ceae83)
+}
+
+var fileDescriptor_b3ca1183e6ceae83 = []byte{
+	// 807 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x41, 0x6f, 0xdb, 0x36,
+	0x18, 0xb5, 0xe4, 0x24, 0xb5, 0x3f, 0xd9, 0xa9, 0x41, 0x0c, 0xa8, 0x61, 0x64, 0x43, 0xa0, 0x2e,
+	0x69, 0xb0, 0x83, 0x84, 0xba, 0x97, 0x75, 0xdd, 0xa5, 0xb1, 0xb5, 0xc6, 0xdb, 0x9a, 0x18, 0x74,
+	0x97, 0x62, 0xbd, 0x68, 0x8c, 0xc4, 0xb9, 0x44, 0x14, 0x52, 0x23, 0x65, 0xcd, 0xde, 0x69, 0x18,
+	0xb0, 0x7f, 0xb2, 0xfd, 0x9b, 0xfd, 0xa0, 0x1d, 0x07, 0x89, 0xb4, 0x63, 0xb7, 0x50, 0xd2, 0x0c,
+	0xbd, 0x49, 0x9f, 0xde, 0x7b, 0xfa, 0xde, 0xe3, 0x47, 0x12, 0xfa, 0x53, 0x21, 0xa6, 0x09, 0xf5,
+	0x49, 0xca, 0x7c, 0x3a, 0x4f, 0xa5, 0x9f, 0x3f, 0x26, 0x49, 0xfa, 0x96, 0x3c, 0xf6, 0x23, 0xc1,
+	0x7f, 0x16, 0xf2, 0x8a, 0xf0, 0x88, 0x86, 0x8a, 0xca, 0x9c, 0x45, 0xd4, 0x4b, 0xa5, 0xc8, 0x04,
+	0xea, 0x6a, 0x8e, 0x47, 0x52, 0xe6, 0x15, 0x1c, 0x6f, 0xc9, 0xe9, 0x1d, 0x56, 0xab, 0xbd, 0xa5,
+	0xd1, 0x25, 0x8d, 0xb5, 0x42, 0xef, 0x61, 0x25, 0x8e, 0xe6, 0x24, 0x31, 0xa0, 0x83, 0x4a, 0x90,
+	0x5a, 0xf0, 0x8c, 0xcc, 0x0d, 0xec, 0x81, 0x81, 0xc9, 0x34, 0xf2, 0x55, 0x46, 0xb2, 0x99, 0xd2,
+	0x1f, 0xdc, 0xbf, 0x2c, 0x68, 0x8d, 0x89, 0x54, 0x14, 0xd3, 0x5f, 0x66, 0x54, 0x65, 0xe8, 0x53,
+	0x80, 0x88, 0x26, 0xa1, 0x12, 0x33, 0x19, 0xd1, 0xae, 0xb5, 0x6f, 0x1d, 0x35, 0x71, 0x33, 0xa2,
+	0xc9, 0xa4, 0x2c, 0xa0, 0x03, 0xd8, 0xd5, 0xc2, 0x61, 0x4e, 0xa5, 0x62, 0x82, 0x77, 0xed, 0x12,
+	0xd2, 0xd6, 0xd5, 0x73, 0x5d, 0x44, 0x8f, 0xe0, 0xbe, 0x56, 0x08, 0x13, 0x11, 0x91, 0xac, 0xc0,
+	0xd5, 0x4b, 0xdc, 0xae, 0x2e, 0x7f, 0x6f, 0xaa, 0x85, 0x5e, 0xcc, 0x14, 0xb9, 0x48, 0x68, 0x78,
+	0x45, 0x22, 0x29, 0x54, 0x77, 0x6b, 0xdf, 0x3a, 0x6a, 0xe0, 0xb6, 0xa9, 0xbe, 0x2c, 0x8b, 0xee,
+	0x1f, 0x16, 0xb4, 0x4d, 0x9b, 0x2a, 0x15, 0x5c, 0x51, 0x14, 0x80, 0x93, 0x16, 0x85, 0x38, 0x2c,
+	0x6c, 0x97, 0x8d, 0x3a, 0xfd, 0xcf, 0xbd, 0xaa, 0xd4, 0xbd, 0x92, 0x1d, 0x07, 0xf3, 0x54, 0x62,
+	0x48, 0x57, 0xcf, 0xe8, 0x0b, 0xd8, 0x61, 0x4a, 0xcd, 0xa8, 0xea, 0xda, 0xfb, 0xf5, 0x23, 0xa7,
+	0x8f, 0x96, 0x0a, 0x32, 0x8d, 0xbc, 0x49, 0x99, 0x14, 0x36, 0x08, 0xf7, 0x1f, 0x0b, 0x5a, 0x83,
+	0x62, 0x89, 0x96, 0x59, 0x7d, 0xa4, 0x1e, 0x9e, 0x42, 0x23, 0x5b, 0xa4, 0x34, 0xa4, 0x3c, 0x37,
+	0x5d, 0x7c, 0x56, 0xad, 0x31, 0xa4, 0x51, 0x82, 0xef, 0x15, 0xf8, 0x80, 0xe7, 0x68, 0x0f, 0x9a,
+	0x91, 0xe0, 0x19, 0x61, 0x9c, 0x4a, 0x93, 0xf0, 0x75, 0x01, 0xed, 0x01, 0x70, 0x11, 0xaa, 0x2c,
+	0x2e, 0xa5, 0x75, 0xb0, 0x0d, 0x2e, 0x26, 0x59, 0x1c, 0xf0, 0xdc, 0xfd, 0xd3, 0x82, 0xb6, 0xb1,
+	0x63, 0x32, 0x3d, 0x81, 0x96, 0x19, 0xc1, 0x75, 0x43, 0x07, 0xd5, 0xcd, 0x0c, 0x34, 0xba, 0x74,
+	0xe4, 0x44, 0xd7, 0x2f, 0x77, 0x8a, 0xf5, 0xf7, 0x3a, 0x38, 0x41, 0x4e, 0x92, 0x65, 0xaa, 0x2f,
+	0xfe, 0x77, 0xaa, 0x27, 0xb5, 0x8d, 0x5c, 0xbf, 0x7d, 0xc7, 0x8e, 0x7d, 0x07, 0x3b, 0x27, 0xb5,
+	0x4d, 0x43, 0x67, 0xd0, 0xb8, 0x60, 0x3c, 0x66, 0x7c, 0xaa, 0xba, 0xf5, 0xd2, 0xd2, 0x93, 0x6a,
+	0x9d, 0x35, 0x37, 0xde, 0xb1, 0x61, 0x05, 0x3c, 0x93, 0x0b, 0xbc, 0x12, 0xd9, 0x5c, 0xb9, 0xad,
+	0x77, 0x56, 0xae, 0xf7, 0x13, 0xb4, 0x37, 0x88, 0xa8, 0x03, 0xf5, 0x4b, 0xba, 0x30, 0xfb, 0xb1,
+	0x78, 0x44, 0x4f, 0x61, 0x3b, 0x27, 0xc9, 0x8c, 0x1a, 0x5b, 0x0f, 0x6f, 0x68, 0x67, 0x9e, 0xca,
+	0xf3, 0x02, 0x8a, 0x35, 0xe3, 0x2b, 0xfb, 0x4b, 0xeb, 0xd8, 0x81, 0x66, 0x81, 0x0a, 0x2f, 0x19,
+	0x8f, 0xdd, 0x5f, 0xa1, 0xa5, 0x7b, 0x36, 0x83, 0xf0, 0x0c, 0x76, 0x24, 0x55, 0xb3, 0x24, 0x33,
+	0xe9, 0x7f, 0x90, 0xb8, 0xa1, 0xdc, 0x6d, 0xed, 0x6d, 0x68, 0x8d, 0x8a, 0xc7, 0x21, 0xcd, 0x08,
+	0x4b, 0x14, 0xfa, 0x0e, 0x1a, 0x8a, 0xe6, 0x54, 0xb2, 0x4c, 0x9b, 0xdd, 0xed, 0xfb, 0xd5, 0xff,
+	0x5e, 0x67, 0x7a, 0x13, 0x43, 0xc3, 0x2b, 0x01, 0x34, 0x84, 0x46, 0x2a, 0x14, 0xcb, 0x96, 0xc7,
+	0x94, 0xd3, 0x3f, 0xaa, 0x16, 0xd3, 0x07, 0xdc, 0xd8, 0xe0, 0xf1, 0x8a, 0x89, 0x76, 0xc1, 0x66,
+	0x71, 0xb9, 0xb9, 0xea, 0xd8, 0x66, 0xb1, 0xfb, 0x12, 0x1a, 0xcb, 0x7f, 0xa1, 0x2e, 0x7c, 0x32,
+	0x09, 0xce, 0x03, 0x3c, 0x7a, 0xf5, 0x63, 0xf8, 0xc3, 0xe9, 0x64, 0x1c, 0x0c, 0x46, 0xdf, 0x8c,
+	0x82, 0x61, 0xa7, 0x86, 0xee, 0x83, 0x33, 0x0c, 0xc6, 0x38, 0x18, 0x3c, 0x7f, 0x35, 0x3a, 0x3b,
+	0xed, 0x58, 0xc8, 0x81, 0x7b, 0xaf, 0x9f, 0xe3, 0xd3, 0xd1, 0xe9, 0x8b, 0x8e, 0x8d, 0x9a, 0xb0,
+	0x1d, 0x60, 0x7c, 0x86, 0x3b, 0xf5, 0xfe, 0xdf, 0x36, 0xa0, 0xc1, 0xf5, 0x35, 0x32, 0xd1, 0xb7,
+	0x08, 0x7a, 0x03, 0xdb, 0xe5, 0x60, 0xa3, 0xc3, 0x5b, 0x26, 0xdf, 0x0c, 0x5a, 0xef, 0xd1, 0xad,
+	0x38, 0xbd, 0xb8, 0x6e, 0xad, 0xd0, 0x2e, 0x47, 0xfd, 0x26, 0xed, 0xf5, 0x83, 0xee, 0x26, 0xed,
+	0x8d, 0x13, 0xc4, 0xad, 0xa1, 0xd7, 0xb0, 0x55, 0x8c, 0x12, 0x3a, 0xf8, 0xa0, 0xed, 0xd1, 0x3b,
+	0xbc, 0x0d, 0xb6, 0x14, 0x3e, 0xfe, 0x0d, 0xf6, 0x22, 0x71, 0x55, 0x09, 0x3f, 0x7e, 0xf0, 0x7e,
+	0x88, 0xe3, 0xe2, 0x8a, 0x1b, 0x5b, 0x6f, 0xbe, 0x36, 0xa4, 0xa9, 0x48, 0x08, 0x9f, 0x7a, 0x42,
+	0x4e, 0xfd, 0x29, 0xe5, 0xe5, 0x05, 0xe8, 0xeb, 0x4f, 0x24, 0x65, 0xea, 0xfd, 0x3b, 0xf4, 0x59,
+	0xf1, 0xf6, 0xaf, 0x65, 0x5d, 0xec, 0x94, 0xd8, 0x27, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xf9,
+	0x66, 0xbb, 0xae, 0x09, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -738,62 +740,3 @@ var _ConformanceService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/api/expr/v1alpha1/conformance_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/api/expr/v1alpha1/conformance_service.proto", fileDescriptor_conformance_service_35e6de9bb7108510)
-}
-
-var fileDescriptor_conformance_service_35e6de9bb7108510 = []byte{
-	// 807 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x41, 0x6f, 0xdb, 0x36,
-	0x18, 0xb5, 0xe4, 0x24, 0xb5, 0x3f, 0xd9, 0xa9, 0x41, 0x0c, 0xa8, 0x61, 0x64, 0x43, 0xa0, 0x2e,
-	0x69, 0xb0, 0x83, 0x84, 0xba, 0x97, 0x75, 0xdd, 0xa5, 0xb1, 0xb5, 0xc6, 0xdb, 0x9a, 0x18, 0x74,
-	0x97, 0x62, 0xbd, 0x68, 0x8c, 0xc4, 0xb9, 0x44, 0x14, 0x52, 0x23, 0x65, 0xcd, 0xde, 0x69, 0x18,
-	0xb0, 0x7f, 0xb2, 0xfd, 0x9b, 0xfd, 0xa0, 0x1d, 0x07, 0x89, 0xb4, 0x63, 0xb7, 0x50, 0xd2, 0x0c,
-	0xbd, 0x49, 0x9f, 0xde, 0x7b, 0xfa, 0xde, 0xe3, 0x47, 0x12, 0xfa, 0x53, 0x21, 0xa6, 0x09, 0xf5,
-	0x49, 0xca, 0x7c, 0x3a, 0x4f, 0xa5, 0x9f, 0x3f, 0x26, 0x49, 0xfa, 0x96, 0x3c, 0xf6, 0x23, 0xc1,
-	0x7f, 0x16, 0xf2, 0x8a, 0xf0, 0x88, 0x86, 0x8a, 0xca, 0x9c, 0x45, 0xd4, 0x4b, 0xa5, 0xc8, 0x04,
-	0xea, 0x6a, 0x8e, 0x47, 0x52, 0xe6, 0x15, 0x1c, 0x6f, 0xc9, 0xe9, 0x1d, 0x56, 0xab, 0xbd, 0xa5,
-	0xd1, 0x25, 0x8d, 0xb5, 0x42, 0xef, 0x61, 0x25, 0x8e, 0xe6, 0x24, 0x31, 0xa0, 0x83, 0x4a, 0x90,
-	0x5a, 0xf0, 0x8c, 0xcc, 0x0d, 0xec, 0x81, 0x81, 0xc9, 0x34, 0xf2, 0x55, 0x46, 0xb2, 0x99, 0xd2,
-	0x1f, 0xdc, 0xbf, 0x2c, 0x68, 0x8d, 0x89, 0x54, 0x14, 0xd3, 0x5f, 0x66, 0x54, 0x65, 0xe8, 0x53,
-	0x80, 0x88, 0x26, 0xa1, 0x12, 0x33, 0x19, 0xd1, 0xae, 0xb5, 0x6f, 0x1d, 0x35, 0x71, 0x33, 0xa2,
-	0xc9, 0xa4, 0x2c, 0xa0, 0x03, 0xd8, 0xd5, 0xc2, 0x61, 0x4e, 0xa5, 0x62, 0x82, 0x77, 0xed, 0x12,
-	0xd2, 0xd6, 0xd5, 0x73, 0x5d, 0x44, 0x8f, 0xe0, 0xbe, 0x56, 0x08, 0x13, 0x11, 0x91, 0xac, 0xc0,
-	0xd5, 0x4b, 0xdc, 0xae, 0x2e, 0x7f, 0x6f, 0xaa, 0x85, 0x5e, 0xcc, 0x14, 0xb9, 0x48, 0x68, 0x78,
-	0x45, 0x22, 0x29, 0x54, 0x77, 0x6b, 0xdf, 0x3a, 0x6a, 0xe0, 0xb6, 0xa9, 0xbe, 0x2c, 0x8b, 0xee,
-	0x1f, 0x16, 0xb4, 0x4d, 0x9b, 0x2a, 0x15, 0x5c, 0x51, 0x14, 0x80, 0x93, 0x16, 0x85, 0x38, 0x2c,
-	0x6c, 0x97, 0x8d, 0x3a, 0xfd, 0xcf, 0xbd, 0xaa, 0xd4, 0xbd, 0x92, 0x1d, 0x07, 0xf3, 0x54, 0x62,
-	0x48, 0x57, 0xcf, 0xe8, 0x0b, 0xd8, 0x61, 0x4a, 0xcd, 0xa8, 0xea, 0xda, 0xfb, 0xf5, 0x23, 0xa7,
-	0x8f, 0x96, 0x0a, 0x32, 0x8d, 0xbc, 0x49, 0x99, 0x14, 0x36, 0x08, 0xf7, 0x1f, 0x0b, 0x5a, 0x83,
-	0x62, 0x89, 0x96, 0x59, 0x7d, 0xa4, 0x1e, 0x9e, 0x42, 0x23, 0x5b, 0xa4, 0x34, 0xa4, 0x3c, 0x37,
-	0x5d, 0x7c, 0x56, 0xad, 0x31, 0xa4, 0x51, 0x82, 0xef, 0x15, 0xf8, 0x80, 0xe7, 0x68, 0x0f, 0x9a,
-	0x91, 0xe0, 0x19, 0x61, 0x9c, 0x4a, 0x93, 0xf0, 0x75, 0x01, 0xed, 0x01, 0x70, 0x11, 0xaa, 0x2c,
-	0x2e, 0xa5, 0x75, 0xb0, 0x0d, 0x2e, 0x26, 0x59, 0x1c, 0xf0, 0xdc, 0xfd, 0xd3, 0x82, 0xb6, 0xb1,
-	0x63, 0x32, 0x3d, 0x81, 0x96, 0x19, 0xc1, 0x75, 0x43, 0x07, 0xd5, 0xcd, 0x0c, 0x34, 0xba, 0x74,
-	0xe4, 0x44, 0xd7, 0x2f, 0x77, 0x8a, 0xf5, 0xf7, 0x3a, 0x38, 0x41, 0x4e, 0x92, 0x65, 0xaa, 0x2f,
-	0xfe, 0x77, 0xaa, 0x27, 0xb5, 0x8d, 0x5c, 0xbf, 0x7d, 0xc7, 0x8e, 0x7d, 0x07, 0x3b, 0x27, 0xb5,
-	0x4d, 0x43, 0x67, 0xd0, 0xb8, 0x60, 0x3c, 0x66, 0x7c, 0xaa, 0xba, 0xf5, 0xd2, 0xd2, 0x93, 0x6a,
-	0x9d, 0x35, 0x37, 0xde, 0xb1, 0x61, 0x05, 0x3c, 0x93, 0x0b, 0xbc, 0x12, 0xd9, 0x5c, 0xb9, 0xad,
-	0x77, 0x56, 0xae, 0xf7, 0x13, 0xb4, 0x37, 0x88, 0xa8, 0x03, 0xf5, 0x4b, 0xba, 0x30, 0xfb, 0xb1,
-	0x78, 0x44, 0x4f, 0x61, 0x3b, 0x27, 0xc9, 0x8c, 0x1a, 0x5b, 0x0f, 0x6f, 0x68, 0x67, 0x9e, 0xca,
-	0xf3, 0x02, 0x8a, 0x35, 0xe3, 0x2b, 0xfb, 0x4b, 0xeb, 0xd8, 0x81, 0x66, 0x81, 0x0a, 0x2f, 0x19,
-	0x8f, 0xdd, 0x5f, 0xa1, 0xa5, 0x7b, 0x36, 0x83, 0xf0, 0x0c, 0x76, 0x24, 0x55, 0xb3, 0x24, 0x33,
-	0xe9, 0x7f, 0x90, 0xb8, 0xa1, 0xdc, 0x6d, 0xed, 0x6d, 0x68, 0x8d, 0x8a, 0xc7, 0x21, 0xcd, 0x08,
-	0x4b, 0x14, 0xfa, 0x0e, 0x1a, 0x8a, 0xe6, 0x54, 0xb2, 0x4c, 0x9b, 0xdd, 0xed, 0xfb, 0xd5, 0xff,
-	0x5e, 0x67, 0x7a, 0x13, 0x43, 0xc3, 0x2b, 0x01, 0x34, 0x84, 0x46, 0x2a, 0x14, 0xcb, 0x96, 0xc7,
-	0x94, 0xd3, 0x3f, 0xaa, 0x16, 0xd3, 0x07, 0xdc, 0xd8, 0xe0, 0xf1, 0x8a, 0x89, 0x76, 0xc1, 0x66,
-	0x71, 0xb9, 0xb9, 0xea, 0xd8, 0x66, 0xb1, 0xfb, 0x12, 0x1a, 0xcb, 0x7f, 0xa1, 0x2e, 0x7c, 0x32,
-	0x09, 0xce, 0x03, 0x3c, 0x7a, 0xf5, 0x63, 0xf8, 0xc3, 0xe9, 0x64, 0x1c, 0x0c, 0x46, 0xdf, 0x8c,
-	0x82, 0x61, 0xa7, 0x86, 0xee, 0x83, 0x33, 0x0c, 0xc6, 0x38, 0x18, 0x3c, 0x7f, 0x35, 0x3a, 0x3b,
-	0xed, 0x58, 0xc8, 0x81, 0x7b, 0xaf, 0x9f, 0xe3, 0xd3, 0xd1, 0xe9, 0x8b, 0x8e, 0x8d, 0x9a, 0xb0,
-	0x1d, 0x60, 0x7c, 0x86, 0x3b, 0xf5, 0xfe, 0xdf, 0x36, 0xa0, 0xc1, 0xf5, 0x35, 0x32, 0xd1, 0xb7,
-	0x08, 0x7a, 0x03, 0xdb, 0xe5, 0x60, 0xa3, 0xc3, 0x5b, 0x26, 0xdf, 0x0c, 0x5a, 0xef, 0xd1, 0xad,
-	0x38, 0xbd, 0xb8, 0x6e, 0xad, 0xd0, 0x2e, 0x47, 0xfd, 0x26, 0xed, 0xf5, 0x83, 0xee, 0x26, 0xed,
-	0x8d, 0x13, 0xc4, 0xad, 0xa1, 0xd7, 0xb0, 0x55, 0x8c, 0x12, 0x3a, 0xf8, 0xa0, 0xed, 0xd1, 0x3b,
-	0xbc, 0x0d, 0xb6, 0x14, 0x3e, 0xfe, 0x0d, 0xf6, 0x22, 0x71, 0x55, 0x09, 0x3f, 0x7e, 0xf0, 0x7e,
-	0x88, 0xe3, 0xe2, 0x8a, 0x1b, 0x5b, 0x6f, 0xbe, 0x36, 0xa4, 0xa9, 0x48, 0x08, 0x9f, 0x7a, 0x42,
-	0x4e, 0xfd, 0x29, 0xe5, 0xe5, 0x05, 0xe8, 0xeb, 0x4f, 0x24, 0x65, 0xea, 0xfd, 0x3b, 0xf4, 0x59,
-	0xf1, 0xf6, 0xaf, 0x65, 0x5d, 0xec, 0x94, 0xd8, 0x27, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xf9,
-	0x66, 0xbb, 0xae, 0x09, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/api/expr/v1alpha1/eval.pb.go b/googleapis/api/expr/v1alpha1/eval.pb.go
index 580f397d15..79d945c7e8 100644
--- a/googleapis/api/expr/v1alpha1/eval.pb.go
+++ b/googleapis/api/expr/v1alpha1/eval.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/eval.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The state of an evaluation.
 //
@@ -39,16 +42,17 @@ func (m *EvalState) Reset()         { *m = EvalState{} }
 func (m *EvalState) String() string { return proto.CompactTextString(m) }
 func (*EvalState) ProtoMessage()    {}
 func (*EvalState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_f3602fc52254f2fe, []int{0}
+	return fileDescriptor_1e95f32326d4b8b7, []int{0}
 }
+
 func (m *EvalState) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EvalState.Unmarshal(m, b)
 }
 func (m *EvalState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EvalState.Marshal(b, m, deterministic)
 }
-func (dst *EvalState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EvalState.Merge(dst, src)
+func (m *EvalState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvalState.Merge(m, src)
 }
 func (m *EvalState) XXX_Size() int {
 	return xxx_messageInfo_EvalState.Size(m)
@@ -88,16 +92,17 @@ func (m *EvalState_Result) Reset()         { *m = EvalState_Result{} }
 func (m *EvalState_Result) String() string { return proto.CompactTextString(m) }
 func (*EvalState_Result) ProtoMessage()    {}
 func (*EvalState_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_f3602fc52254f2fe, []int{0, 0}
+	return fileDescriptor_1e95f32326d4b8b7, []int{0, 0}
 }
+
 func (m *EvalState_Result) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EvalState_Result.Unmarshal(m, b)
 }
 func (m *EvalState_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EvalState_Result.Marshal(b, m, deterministic)
 }
-func (dst *EvalState_Result) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EvalState_Result.Merge(dst, src)
+func (m *EvalState_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvalState_Result.Merge(m, src)
 }
 func (m *EvalState_Result) XXX_Size() int {
 	return xxx_messageInfo_EvalState_Result.Size(m)
@@ -140,16 +145,17 @@ func (m *ExprValue) Reset()         { *m = ExprValue{} }
 func (m *ExprValue) String() string { return proto.CompactTextString(m) }
 func (*ExprValue) ProtoMessage()    {}
 func (*ExprValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_f3602fc52254f2fe, []int{1}
+	return fileDescriptor_1e95f32326d4b8b7, []int{1}
 }
+
 func (m *ExprValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExprValue.Unmarshal(m, b)
 }
 func (m *ExprValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExprValue.Marshal(b, m, deterministic)
 }
-func (dst *ExprValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExprValue.Merge(dst, src)
+func (m *ExprValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExprValue.Merge(m, src)
 }
 func (m *ExprValue) XXX_Size() int {
 	return xxx_messageInfo_ExprValue.Size(m)
@@ -210,99 +216,15 @@ func (m *ExprValue) GetUnknown() *UnknownSet {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExprValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExprValue_OneofMarshaler, _ExprValue_OneofUnmarshaler, _ExprValue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExprValue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExprValue_Value)(nil),
 		(*ExprValue_Error)(nil),
 		(*ExprValue_Unknown)(nil),
 	}
 }
 
-func _ExprValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExprValue)
-	// kind
-	switch x := m.Kind.(type) {
-	case *ExprValue_Value:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Value); err != nil {
-			return err
-		}
-	case *ExprValue_Error:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Error); err != nil {
-			return err
-		}
-	case *ExprValue_Unknown:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Unknown); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ExprValue.Kind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExprValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExprValue)
-	switch tag {
-	case 1: // kind.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.Kind = &ExprValue_Value{msg}
-		return true, err
-	case 2: // kind.error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ErrorSet)
-		err := b.DecodeMessage(msg)
-		m.Kind = &ExprValue_Error{msg}
-		return true, err
-	case 3: // kind.unknown
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UnknownSet)
-		err := b.DecodeMessage(msg)
-		m.Kind = &ExprValue_Unknown{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExprValue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExprValue)
-	// kind
-	switch x := m.Kind.(type) {
-	case *ExprValue_Value:
-		s := proto.Size(x.Value)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExprValue_Error:
-		s := proto.Size(x.Error)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExprValue_Unknown:
-		s := proto.Size(x.Unknown)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A set of errors.
 //
 // The errors included depend on the context. See `ExprValue.error`.
@@ -318,16 +240,17 @@ func (m *ErrorSet) Reset()         { *m = ErrorSet{} }
 func (m *ErrorSet) String() string { return proto.CompactTextString(m) }
 func (*ErrorSet) ProtoMessage()    {}
 func (*ErrorSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_f3602fc52254f2fe, []int{2}
+	return fileDescriptor_1e95f32326d4b8b7, []int{2}
 }
+
 func (m *ErrorSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorSet.Unmarshal(m, b)
 }
 func (m *ErrorSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorSet.Marshal(b, m, deterministic)
 }
-func (dst *ErrorSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorSet.Merge(dst, src)
+func (m *ErrorSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorSet.Merge(m, src)
 }
 func (m *ErrorSet) XXX_Size() int {
 	return xxx_messageInfo_ErrorSet.Size(m)
@@ -360,16 +283,17 @@ func (m *UnknownSet) Reset()         { *m = UnknownSet{} }
 func (m *UnknownSet) String() string { return proto.CompactTextString(m) }
 func (*UnknownSet) ProtoMessage()    {}
 func (*UnknownSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_f3602fc52254f2fe, []int{3}
+	return fileDescriptor_1e95f32326d4b8b7, []int{3}
 }
+
 func (m *UnknownSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnknownSet.Unmarshal(m, b)
 }
 func (m *UnknownSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UnknownSet.Marshal(b, m, deterministic)
 }
-func (dst *UnknownSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UnknownSet.Merge(dst, src)
+func (m *UnknownSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnknownSet.Merge(m, src)
 }
 func (m *UnknownSet) XXX_Size() int {
 	return xxx_messageInfo_UnknownSet.Size(m)
@@ -396,10 +320,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/expr/v1alpha1/eval.proto", fileDescriptor_eval_f3602fc52254f2fe)
+	proto.RegisterFile("google/api/expr/v1alpha1/eval.proto", fileDescriptor_1e95f32326d4b8b7)
 }
 
-var fileDescriptor_eval_f3602fc52254f2fe = []byte{
+var fileDescriptor_1e95f32326d4b8b7 = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x4b, 0xeb, 0x40,
 	0x10, 0xc7, 0x5f, 0x5e, 0xda, 0xf4, 0xbd, 0xe9, 0x6d, 0x11, 0x0c, 0x45, 0xb0, 0xa4, 0x3d, 0x94,
diff --git a/googleapis/api/expr/v1alpha1/explain.pb.go b/googleapis/api/expr/v1alpha1/explain.pb.go
index e720868c13..93f628f0da 100644
--- a/googleapis/api/expr/v1alpha1/explain.pb.go
+++ b/googleapis/api/expr/v1alpha1/explain.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/explain.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Values of intermediate expressions produced when evaluating expression.
 // Deprecated, use `EvalState` instead.
@@ -43,16 +46,17 @@ func (m *Explain) Reset()         { *m = Explain{} }
 func (m *Explain) String() string { return proto.CompactTextString(m) }
 func (*Explain) ProtoMessage()    {}
 func (*Explain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_explain_9d6f7c319e1e26a4, []int{0}
+	return fileDescriptor_2df9793dd8748e27, []int{0}
 }
+
 func (m *Explain) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Explain.Unmarshal(m, b)
 }
 func (m *Explain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Explain.Marshal(b, m, deterministic)
 }
-func (dst *Explain) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Explain.Merge(dst, src)
+func (m *Explain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Explain.Merge(m, src)
 }
 func (m *Explain) XXX_Size() int {
 	return xxx_messageInfo_Explain.Size(m)
@@ -92,16 +96,17 @@ func (m *Explain_ExprStep) Reset()         { *m = Explain_ExprStep{} }
 func (m *Explain_ExprStep) String() string { return proto.CompactTextString(m) }
 func (*Explain_ExprStep) ProtoMessage()    {}
 func (*Explain_ExprStep) Descriptor() ([]byte, []int) {
-	return fileDescriptor_explain_9d6f7c319e1e26a4, []int{0, 0}
+	return fileDescriptor_2df9793dd8748e27, []int{0, 0}
 }
+
 func (m *Explain_ExprStep) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Explain_ExprStep.Unmarshal(m, b)
 }
 func (m *Explain_ExprStep) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Explain_ExprStep.Marshal(b, m, deterministic)
 }
-func (dst *Explain_ExprStep) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Explain_ExprStep.Merge(dst, src)
+func (m *Explain_ExprStep) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Explain_ExprStep.Merge(m, src)
 }
 func (m *Explain_ExprStep) XXX_Size() int {
 	return xxx_messageInfo_Explain_ExprStep.Size(m)
@@ -132,10 +137,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/expr/v1alpha1/explain.proto", fileDescriptor_explain_9d6f7c319e1e26a4)
+	proto.RegisterFile("google/api/expr/v1alpha1/explain.proto", fileDescriptor_2df9793dd8748e27)
 }
 
-var fileDescriptor_explain_9d6f7c319e1e26a4 = []byte{
+var fileDescriptor_2df9793dd8748e27 = []byte{
 	// 261 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xb1, 0x4b, 0x03, 0x31,
 	0x14, 0xc6, 0x79, 0x29, 0x56, 0x7d, 0x15, 0x87, 0x4c, 0xa1, 0x08, 0x3d, 0x44, 0xe4, 0x70, 0x48,
diff --git a/googleapis/api/expr/v1alpha1/syntax.pb.go b/googleapis/api/expr/v1alpha1/syntax.pb.go
index c26f0de05e..7f13ff0927 100644
--- a/googleapis/api/expr/v1alpha1/syntax.pb.go
+++ b/googleapis/api/expr/v1alpha1/syntax.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/syntax.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An expression together with source information as returned by the parser.
 type ParsedExpr struct {
@@ -36,16 +39,17 @@ func (m *ParsedExpr) Reset()         { *m = ParsedExpr{} }
 func (m *ParsedExpr) String() string { return proto.CompactTextString(m) }
 func (*ParsedExpr) ProtoMessage()    {}
 func (*ParsedExpr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{0}
+	return fileDescriptor_d4e2be48009c83cb, []int{0}
 }
+
 func (m *ParsedExpr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParsedExpr.Unmarshal(m, b)
 }
 func (m *ParsedExpr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParsedExpr.Marshal(b, m, deterministic)
 }
-func (dst *ParsedExpr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParsedExpr.Merge(dst, src)
+func (m *ParsedExpr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParsedExpr.Merge(m, src)
 }
 func (m *ParsedExpr) XXX_Size() int {
 	return xxx_messageInfo_ParsedExpr.Size(m)
@@ -112,16 +116,17 @@ func (m *Expr) Reset()         { *m = Expr{} }
 func (m *Expr) String() string { return proto.CompactTextString(m) }
 func (*Expr) ProtoMessage()    {}
 func (*Expr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1}
+	return fileDescriptor_d4e2be48009c83cb, []int{1}
 }
+
 func (m *Expr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr.Unmarshal(m, b)
 }
 func (m *Expr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr.Marshal(b, m, deterministic)
 }
-func (dst *Expr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr.Merge(dst, src)
+func (m *Expr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr.Merge(m, src)
 }
 func (m *Expr) XXX_Size() int {
 	return xxx_messageInfo_Expr.Size(m)
@@ -241,9 +246,9 @@ func (m *Expr) GetComprehensionExpr() *Expr_Comprehension {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Expr) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Expr_OneofMarshaler, _Expr_OneofUnmarshaler, _Expr_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Expr) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Expr_ConstExpr)(nil),
 		(*Expr_IdentExpr)(nil),
 		(*Expr_SelectExpr)(nil),
@@ -254,162 +259,6 @@ func (*Expr) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, f
 	}
 }
 
-func _Expr_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Expr)
-	// expr_kind
-	switch x := m.ExprKind.(type) {
-	case *Expr_ConstExpr:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConstExpr); err != nil {
-			return err
-		}
-	case *Expr_IdentExpr:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.IdentExpr); err != nil {
-			return err
-		}
-	case *Expr_SelectExpr:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SelectExpr); err != nil {
-			return err
-		}
-	case *Expr_CallExpr:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CallExpr); err != nil {
-			return err
-		}
-	case *Expr_ListExpr:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListExpr); err != nil {
-			return err
-		}
-	case *Expr_StructExpr:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructExpr); err != nil {
-			return err
-		}
-	case *Expr_ComprehensionExpr:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ComprehensionExpr); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Expr.ExprKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Expr_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Expr)
-	switch tag {
-	case 3: // expr_kind.const_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Constant)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_ConstExpr{msg}
-		return true, err
-	case 4: // expr_kind.ident_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Ident)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_IdentExpr{msg}
-		return true, err
-	case 5: // expr_kind.select_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Select)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_SelectExpr{msg}
-		return true, err
-	case 6: // expr_kind.call_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Call)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_CallExpr{msg}
-		return true, err
-	case 7: // expr_kind.list_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_CreateList)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_ListExpr{msg}
-		return true, err
-	case 8: // expr_kind.struct_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_CreateStruct)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_StructExpr{msg}
-		return true, err
-	case 9: // expr_kind.comprehension_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Comprehension)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_ComprehensionExpr{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Expr_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Expr)
-	// expr_kind
-	switch x := m.ExprKind.(type) {
-	case *Expr_ConstExpr:
-		s := proto.Size(x.ConstExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_IdentExpr:
-		s := proto.Size(x.IdentExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_SelectExpr:
-		s := proto.Size(x.SelectExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_CallExpr:
-		s := proto.Size(x.CallExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_ListExpr:
-		s := proto.Size(x.ListExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_StructExpr:
-		s := proto.Size(x.StructExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_ComprehensionExpr:
-		s := proto.Size(x.ComprehensionExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An identifier expression. e.g. `request`.
 type Expr_Ident struct {
 	// Required. Holds a single, unqualified identifier, possibly preceded by a
@@ -427,16 +276,17 @@ func (m *Expr_Ident) Reset()         { *m = Expr_Ident{} }
 func (m *Expr_Ident) String() string { return proto.CompactTextString(m) }
 func (*Expr_Ident) ProtoMessage()    {}
 func (*Expr_Ident) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1, 0}
+	return fileDescriptor_d4e2be48009c83cb, []int{1, 0}
 }
+
 func (m *Expr_Ident) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Ident.Unmarshal(m, b)
 }
 func (m *Expr_Ident) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Ident.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Ident) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Ident.Merge(dst, src)
+func (m *Expr_Ident) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Ident.Merge(m, src)
 }
 func (m *Expr_Ident) XXX_Size() int {
 	return xxx_messageInfo_Expr_Ident.Size(m)
@@ -479,16 +329,17 @@ func (m *Expr_Select) Reset()         { *m = Expr_Select{} }
 func (m *Expr_Select) String() string { return proto.CompactTextString(m) }
 func (*Expr_Select) ProtoMessage()    {}
 func (*Expr_Select) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1, 1}
+	return fileDescriptor_d4e2be48009c83cb, []int{1, 1}
 }
+
 func (m *Expr_Select) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Select.Unmarshal(m, b)
 }
 func (m *Expr_Select) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Select.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Select) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Select.Merge(dst, src)
+func (m *Expr_Select) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Select.Merge(m, src)
 }
 func (m *Expr_Select) XXX_Size() int {
 	return xxx_messageInfo_Expr_Select.Size(m)
@@ -540,16 +391,17 @@ func (m *Expr_Call) Reset()         { *m = Expr_Call{} }
 func (m *Expr_Call) String() string { return proto.CompactTextString(m) }
 func (*Expr_Call) ProtoMessage()    {}
 func (*Expr_Call) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1, 2}
+	return fileDescriptor_d4e2be48009c83cb, []int{1, 2}
 }
+
 func (m *Expr_Call) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Call.Unmarshal(m, b)
 }
 func (m *Expr_Call) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Call.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Call) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Call.Merge(dst, src)
+func (m *Expr_Call) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Call.Merge(m, src)
 }
 func (m *Expr_Call) XXX_Size() int {
 	return xxx_messageInfo_Expr_Call.Size(m)
@@ -597,16 +449,17 @@ func (m *Expr_CreateList) Reset()         { *m = Expr_CreateList{} }
 func (m *Expr_CreateList) String() string { return proto.CompactTextString(m) }
 func (*Expr_CreateList) ProtoMessage()    {}
 func (*Expr_CreateList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1, 3}
+	return fileDescriptor_d4e2be48009c83cb, []int{1, 3}
 }
+
 func (m *Expr_CreateList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_CreateList.Unmarshal(m, b)
 }
 func (m *Expr_CreateList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_CreateList.Marshal(b, m, deterministic)
 }
-func (dst *Expr_CreateList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_CreateList.Merge(dst, src)
+func (m *Expr_CreateList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_CreateList.Merge(m, src)
 }
 func (m *Expr_CreateList) XXX_Size() int {
 	return xxx_messageInfo_Expr_CreateList.Size(m)
@@ -644,16 +497,17 @@ func (m *Expr_CreateStruct) Reset()         { *m = Expr_CreateStruct{} }
 func (m *Expr_CreateStruct) String() string { return proto.CompactTextString(m) }
 func (*Expr_CreateStruct) ProtoMessage()    {}
 func (*Expr_CreateStruct) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1, 4}
+	return fileDescriptor_d4e2be48009c83cb, []int{1, 4}
 }
+
 func (m *Expr_CreateStruct) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_CreateStruct.Unmarshal(m, b)
 }
 func (m *Expr_CreateStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_CreateStruct.Marshal(b, m, deterministic)
 }
-func (dst *Expr_CreateStruct) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_CreateStruct.Merge(dst, src)
+func (m *Expr_CreateStruct) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_CreateStruct.Merge(m, src)
 }
 func (m *Expr_CreateStruct) XXX_Size() int {
 	return xxx_messageInfo_Expr_CreateStruct.Size(m)
@@ -701,16 +555,17 @@ func (m *Expr_CreateStruct_Entry) Reset()         { *m = Expr_CreateStruct_Entry
 func (m *Expr_CreateStruct_Entry) String() string { return proto.CompactTextString(m) }
 func (*Expr_CreateStruct_Entry) ProtoMessage()    {}
 func (*Expr_CreateStruct_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1, 4, 0}
+	return fileDescriptor_d4e2be48009c83cb, []int{1, 4, 0}
 }
+
 func (m *Expr_CreateStruct_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_CreateStruct_Entry.Unmarshal(m, b)
 }
 func (m *Expr_CreateStruct_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_CreateStruct_Entry.Marshal(b, m, deterministic)
 }
-func (dst *Expr_CreateStruct_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_CreateStruct_Entry.Merge(dst, src)
+func (m *Expr_CreateStruct_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_CreateStruct_Entry.Merge(m, src)
 }
 func (m *Expr_CreateStruct_Entry) XXX_Size() int {
 	return xxx_messageInfo_Expr_CreateStruct_Entry.Size(m)
@@ -772,76 +627,14 @@ func (m *Expr_CreateStruct_Entry) GetValue() *Expr {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Expr_CreateStruct_Entry) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Expr_CreateStruct_Entry_OneofMarshaler, _Expr_CreateStruct_Entry_OneofUnmarshaler, _Expr_CreateStruct_Entry_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Expr_CreateStruct_Entry) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Expr_CreateStruct_Entry_FieldKey)(nil),
 		(*Expr_CreateStruct_Entry_MapKey)(nil),
 	}
 }
 
-func _Expr_CreateStruct_Entry_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Expr_CreateStruct_Entry)
-	// key_kind
-	switch x := m.KeyKind.(type) {
-	case *Expr_CreateStruct_Entry_FieldKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.FieldKey)
-	case *Expr_CreateStruct_Entry_MapKey:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MapKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Expr_CreateStruct_Entry.KeyKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Expr_CreateStruct_Entry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Expr_CreateStruct_Entry)
-	switch tag {
-	case 2: // key_kind.field_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.KeyKind = &Expr_CreateStruct_Entry_FieldKey{x}
-		return true, err
-	case 3: // key_kind.map_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr)
-		err := b.DecodeMessage(msg)
-		m.KeyKind = &Expr_CreateStruct_Entry_MapKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Expr_CreateStruct_Entry_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Expr_CreateStruct_Entry)
-	// key_kind
-	switch x := m.KeyKind.(type) {
-	case *Expr_CreateStruct_Entry_FieldKey:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.FieldKey)))
-		n += len(x.FieldKey)
-	case *Expr_CreateStruct_Entry_MapKey:
-		s := proto.Size(x.MapKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A comprehension expression applied to a list or map.
 //
 // Comprehensions are not part of the core syntax, but enabled with macros.
@@ -899,16 +692,17 @@ func (m *Expr_Comprehension) Reset()         { *m = Expr_Comprehension{} }
 func (m *Expr_Comprehension) String() string { return proto.CompactTextString(m) }
 func (*Expr_Comprehension) ProtoMessage()    {}
 func (*Expr_Comprehension) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{1, 5}
+	return fileDescriptor_d4e2be48009c83cb, []int{1, 5}
 }
+
 func (m *Expr_Comprehension) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Comprehension.Unmarshal(m, b)
 }
 func (m *Expr_Comprehension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Comprehension.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Comprehension) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Comprehension.Merge(dst, src)
+func (m *Expr_Comprehension) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Comprehension.Merge(m, src)
 }
 func (m *Expr_Comprehension) XXX_Size() int {
 	return xxx_messageInfo_Expr_Comprehension.Size(m)
@@ -1005,16 +799,17 @@ func (m *Constant) Reset()         { *m = Constant{} }
 func (m *Constant) String() string { return proto.CompactTextString(m) }
 func (*Constant) ProtoMessage()    {}
 func (*Constant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{2}
+	return fileDescriptor_d4e2be48009c83cb, []int{2}
 }
+
 func (m *Constant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Constant.Unmarshal(m, b)
 }
 func (m *Constant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Constant.Marshal(b, m, deterministic)
 }
-func (dst *Constant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Constant.Merge(dst, src)
+func (m *Constant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Constant.Merge(m, src)
 }
 func (m *Constant) XXX_Size() int {
 	return xxx_messageInfo_Constant.Size(m)
@@ -1139,6 +934,7 @@ func (m *Constant) GetBytesValue() []byte {
 	return nil
 }
 
+// Deprecated: Do not use.
 func (m *Constant) GetDurationValue() *duration.Duration {
 	if x, ok := m.GetConstantKind().(*Constant_DurationValue); ok {
 		return x.DurationValue
@@ -1146,6 +942,7 @@ func (m *Constant) GetDurationValue() *duration.Duration {
 	return nil
 }
 
+// Deprecated: Do not use.
 func (m *Constant) GetTimestampValue() *timestamp.Timestamp {
 	if x, ok := m.GetConstantKind().(*Constant_TimestampValue); ok {
 		return x.TimestampValue
@@ -1153,9 +950,9 @@ func (m *Constant) GetTimestampValue() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Constant) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Constant_OneofMarshaler, _Constant_OneofUnmarshaler, _Constant_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Constant) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Constant_NullValue)(nil),
 		(*Constant_BoolValue)(nil),
 		(*Constant_Int64Value)(nil),
@@ -1168,169 +965,6 @@ func (*Constant) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _Constant_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Constant)
-	// constant_kind
-	switch x := m.ConstantKind.(type) {
-	case *Constant_NullValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Constant_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Constant_Int64Value:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Value))
-	case *Constant_Uint64Value:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Uint64Value))
-	case *Constant_DoubleValue:
-		b.EncodeVarint(5<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Constant_StringValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Constant_BytesValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BytesValue)
-	case *Constant_DurationValue:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DurationValue); err != nil {
-			return err
-		}
-	case *Constant_TimestampValue:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Constant.ConstantKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Constant_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Constant)
-	switch tag {
-	case 1: // constant_kind.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Constant_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 2: // constant_kind.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Constant_BoolValue{x != 0}
-		return true, err
-	case 3: // constant_kind.int64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Constant_Int64Value{int64(x)}
-		return true, err
-	case 4: // constant_kind.uint64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Constant_Uint64Value{x}
-		return true, err
-	case 5: // constant_kind.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.ConstantKind = &Constant_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 6: // constant_kind.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ConstantKind = &Constant_StringValue{x}
-		return true, err
-	case 7: // constant_kind.bytes_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConstantKind = &Constant_BytesValue{x}
-		return true, err
-	case 8: // constant_kind.duration_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.ConstantKind = &Constant_DurationValue{msg}
-		return true, err
-	case 9: // constant_kind.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConstantKind = &Constant_TimestampValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Constant_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Constant)
-	// constant_kind
-	switch x := m.ConstantKind.(type) {
-	case *Constant_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Constant_BoolValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Constant_Int64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Value))
-	case *Constant_Uint64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Uint64Value))
-	case *Constant_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Constant_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Constant_BytesValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BytesValue)))
-		n += len(x.BytesValue)
-	case *Constant_DurationValue:
-		s := proto.Size(x.DurationValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Constant_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Source information collected at parse time.
 type SourceInfo struct {
 	// The syntax version of the source, e.g. `cel1`.
@@ -1359,16 +993,17 @@ func (m *SourceInfo) Reset()         { *m = SourceInfo{} }
 func (m *SourceInfo) String() string { return proto.CompactTextString(m) }
 func (*SourceInfo) ProtoMessage()    {}
 func (*SourceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{3}
+	return fileDescriptor_d4e2be48009c83cb, []int{3}
 }
+
 func (m *SourceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceInfo.Unmarshal(m, b)
 }
 func (m *SourceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceInfo.Marshal(b, m, deterministic)
 }
-func (dst *SourceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceInfo.Merge(dst, src)
+func (m *SourceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceInfo.Merge(m, src)
 }
 func (m *SourceInfo) XXX_Size() int {
 	return xxx_messageInfo_SourceInfo.Size(m)
@@ -1428,16 +1063,17 @@ func (m *SourcePosition) Reset()         { *m = SourcePosition{} }
 func (m *SourcePosition) String() string { return proto.CompactTextString(m) }
 func (*SourcePosition) ProtoMessage()    {}
 func (*SourcePosition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_syntax_467031a7c35e4eba, []int{4}
+	return fileDescriptor_d4e2be48009c83cb, []int{4}
 }
+
 func (m *SourcePosition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourcePosition.Unmarshal(m, b)
 }
 func (m *SourcePosition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourcePosition.Marshal(b, m, deterministic)
 }
-func (dst *SourcePosition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourcePosition.Merge(dst, src)
+func (m *SourcePosition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourcePosition.Merge(m, src)
 }
 func (m *SourcePosition) XXX_Size() int {
 	return xxx_messageInfo_SourcePosition.Size(m)
@@ -1493,10 +1129,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/expr/v1alpha1/syntax.proto", fileDescriptor_syntax_467031a7c35e4eba)
+	proto.RegisterFile("google/api/expr/v1alpha1/syntax.proto", fileDescriptor_d4e2be48009c83cb)
 }
 
-var fileDescriptor_syntax_467031a7c35e4eba = []byte{
+var fileDescriptor_d4e2be48009c83cb = []byte{
 	// 1134 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x6e, 0x1b, 0xb7,
 	0x13, 0xd6, 0xea, 0x9f, 0xb5, 0x23, 0x5b, 0xf9, 0xfd, 0x88, 0xa2, 0x50, 0x36, 0x69, 0xe2, 0x38,
diff --git a/googleapis/api/expr/v1alpha1/value.pb.go b/googleapis/api/expr/v1alpha1/value.pb.go
index c79bf0210d..cec841e86a 100644
--- a/googleapis/api/expr/v1alpha1/value.pb.go
+++ b/googleapis/api/expr/v1alpha1/value.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1alpha1/value.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a CEL value.
 //
@@ -50,16 +53,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_cbcd1b7bb7a24782, []int{0}
+	return fileDescriptor_24bee359d1e5798a, []int{0}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -237,9 +241,9 @@ func (m *Value) GetTypeValue() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_NullValue)(nil),
 		(*Value_BoolValue)(nil),
 		(*Value_Int64Value)(nil),
@@ -255,219 +259,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Value_NullValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Value_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_Int64Value:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Value))
-	case *Value_Uint64Value:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Uint64Value))
-	case *Value_DoubleValue:
-		b.EncodeVarint(5<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Value_StringValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BytesValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BytesValue)
-	case *Value_EnumValue:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EnumValue); err != nil {
-			return err
-		}
-	case *Value_ObjectValue:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ObjectValue); err != nil {
-			return err
-		}
-	case *Value_MapValue:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MapValue); err != nil {
-			return err
-		}
-	case *Value_ListValue:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListValue); err != nil {
-			return err
-		}
-	case *Value_TypeValue:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TypeValue)
-	case nil:
-	default:
-		return fmt.Errorf("Value.Kind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 1: // kind.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 2: // kind.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_BoolValue{x != 0}
-		return true, err
-	case 3: // kind.int64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_Int64Value{int64(x)}
-		return true, err
-	case 4: // kind.uint64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_Uint64Value{x}
-		return true, err
-	case 5: // kind.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Kind = &Value_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 6: // kind.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Kind = &Value_StringValue{x}
-		return true, err
-	case 7: // kind.bytes_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Kind = &Value_BytesValue{x}
-		return true, err
-	case 9: // kind.enum_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EnumValue)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_EnumValue{msg}
-		return true, err
-	case 10: // kind.object_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_ObjectValue{msg}
-		return true, err
-	case 11: // kind.map_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MapValue)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_MapValue{msg}
-		return true, err
-	case 12: // kind.list_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ListValue)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_ListValue{msg}
-		return true, err
-	case 15: // kind.type_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Kind = &Value_TypeValue{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Value_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Value_BoolValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_Int64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Value))
-	case *Value_Uint64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Uint64Value))
-	case *Value_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BytesValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BytesValue)))
-		n += len(x.BytesValue)
-	case *Value_EnumValue:
-		s := proto.Size(x.EnumValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ObjectValue:
-		s := proto.Size(x.ObjectValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_MapValue:
-		s := proto.Size(x.MapValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ListValue:
-		s := proto.Size(x.ListValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_TypeValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TypeValue)))
-		n += len(x.TypeValue)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An enum value.
 type EnumValue struct {
 	// The fully qualified name of the enum type.
@@ -483,16 +274,17 @@ func (m *EnumValue) Reset()         { *m = EnumValue{} }
 func (m *EnumValue) String() string { return proto.CompactTextString(m) }
 func (*EnumValue) ProtoMessage()    {}
 func (*EnumValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_cbcd1b7bb7a24782, []int{1}
+	return fileDescriptor_24bee359d1e5798a, []int{1}
 }
+
 func (m *EnumValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnumValue.Unmarshal(m, b)
 }
 func (m *EnumValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnumValue.Marshal(b, m, deterministic)
 }
-func (dst *EnumValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnumValue.Merge(dst, src)
+func (m *EnumValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumValue.Merge(m, src)
 }
 func (m *EnumValue) XXX_Size() int {
 	return xxx_messageInfo_EnumValue.Size(m)
@@ -533,16 +325,17 @@ func (m *ListValue) Reset()         { *m = ListValue{} }
 func (m *ListValue) String() string { return proto.CompactTextString(m) }
 func (*ListValue) ProtoMessage()    {}
 func (*ListValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_cbcd1b7bb7a24782, []int{2}
+	return fileDescriptor_24bee359d1e5798a, []int{2}
 }
+
 func (m *ListValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListValue.Unmarshal(m, b)
 }
 func (m *ListValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListValue.Marshal(b, m, deterministic)
 }
-func (dst *ListValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListValue.Merge(dst, src)
+func (m *ListValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListValue.Merge(m, src)
 }
 func (m *ListValue) XXX_Size() int {
 	return xxx_messageInfo_ListValue.Size(m)
@@ -579,16 +372,17 @@ func (m *MapValue) Reset()         { *m = MapValue{} }
 func (m *MapValue) String() string { return proto.CompactTextString(m) }
 func (*MapValue) ProtoMessage()    {}
 func (*MapValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_cbcd1b7bb7a24782, []int{3}
+	return fileDescriptor_24bee359d1e5798a, []int{3}
 }
+
 func (m *MapValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapValue.Unmarshal(m, b)
 }
 func (m *MapValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapValue.Marshal(b, m, deterministic)
 }
-func (dst *MapValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapValue.Merge(dst, src)
+func (m *MapValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapValue.Merge(m, src)
 }
 func (m *MapValue) XXX_Size() int {
 	return xxx_messageInfo_MapValue.Size(m)
@@ -624,16 +418,17 @@ func (m *MapValue_Entry) Reset()         { *m = MapValue_Entry{} }
 func (m *MapValue_Entry) String() string { return proto.CompactTextString(m) }
 func (*MapValue_Entry) ProtoMessage()    {}
 func (*MapValue_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_cbcd1b7bb7a24782, []int{3, 0}
+	return fileDescriptor_24bee359d1e5798a, []int{3, 0}
 }
+
 func (m *MapValue_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapValue_Entry.Unmarshal(m, b)
 }
 func (m *MapValue_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapValue_Entry.Marshal(b, m, deterministic)
 }
-func (dst *MapValue_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapValue_Entry.Merge(dst, src)
+func (m *MapValue_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapValue_Entry.Merge(m, src)
 }
 func (m *MapValue_Entry) XXX_Size() int {
 	return xxx_messageInfo_MapValue_Entry.Size(m)
@@ -667,10 +462,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/expr/v1alpha1/value.proto", fileDescriptor_value_cbcd1b7bb7a24782)
+	proto.RegisterFile("google/api/expr/v1alpha1/value.proto", fileDescriptor_24bee359d1e5798a)
 }
 
-var fileDescriptor_value_cbcd1b7bb7a24782 = []byte{
+var fileDescriptor_24bee359d1e5798a = []byte{
 	// 518 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcb, 0x6e, 0xd4, 0x30,
 	0x14, 0x86, 0x6b, 0xe6, 0xd2, 0xc9, 0x99, 0x11, 0x48, 0x56, 0x17, 0xc3, 0xa8, 0x52, 0x43, 0xca,
diff --git a/googleapis/api/expr/v1beta1/decl.pb.go b/googleapis/api/expr/v1beta1/decl.pb.go
index 12fa1ddc28..ab5012c68a 100644
--- a/googleapis/api/expr/v1beta1/decl.pb.go
+++ b/googleapis/api/expr/v1beta1/decl.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1beta1/decl.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1beta1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A declaration.
 type Decl struct {
@@ -41,16 +44,17 @@ func (m *Decl) Reset()         { *m = Decl{} }
 func (m *Decl) String() string { return proto.CompactTextString(m) }
 func (*Decl) ProtoMessage()    {}
 func (*Decl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_decl_1e9fea2f12eba89c, []int{0}
+	return fileDescriptor_7b13a6b7649d2726, []int{0}
 }
+
 func (m *Decl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Decl.Unmarshal(m, b)
 }
 func (m *Decl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Decl.Marshal(b, m, deterministic)
 }
-func (dst *Decl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Decl.Merge(dst, src)
+func (m *Decl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Decl.Merge(m, src)
 }
 func (m *Decl) XXX_Size() int {
 	return xxx_messageInfo_Decl.Size(m)
@@ -119,80 +123,14 @@ func (m *Decl) GetFunction() *FunctionDecl {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Decl) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Decl_OneofMarshaler, _Decl_OneofUnmarshaler, _Decl_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Decl) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Decl_Ident)(nil),
 		(*Decl_Function)(nil),
 	}
 }
 
-func _Decl_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Decl)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Decl_Ident:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Ident); err != nil {
-			return err
-		}
-	case *Decl_Function:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Function); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Decl.Kind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Decl_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Decl)
-	switch tag {
-	case 4: // kind.ident
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(IdentDecl)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Decl_Ident{msg}
-		return true, err
-	case 5: // kind.function
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FunctionDecl)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Decl_Function{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Decl_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Decl)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Decl_Ident:
-		s := proto.Size(x.Ident)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Decl_Function:
-		s := proto.Size(x.Function)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The declared type of a variable.
 //
 // Extends runtime type values with extra information used for type checking
@@ -214,16 +152,17 @@ func (m *DeclType) Reset()         { *m = DeclType{} }
 func (m *DeclType) String() string { return proto.CompactTextString(m) }
 func (*DeclType) ProtoMessage()    {}
 func (*DeclType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_decl_1e9fea2f12eba89c, []int{1}
+	return fileDescriptor_7b13a6b7649d2726, []int{1}
 }
+
 func (m *DeclType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeclType.Unmarshal(m, b)
 }
 func (m *DeclType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeclType.Marshal(b, m, deterministic)
 }
-func (dst *DeclType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeclType.Merge(dst, src)
+func (m *DeclType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeclType.Merge(m, src)
 }
 func (m *DeclType) XXX_Size() int {
 	return xxx_messageInfo_DeclType.Size(m)
@@ -270,16 +209,17 @@ func (m *IdentDecl) Reset()         { *m = IdentDecl{} }
 func (m *IdentDecl) String() string { return proto.CompactTextString(m) }
 func (*IdentDecl) ProtoMessage()    {}
 func (*IdentDecl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_decl_1e9fea2f12eba89c, []int{2}
+	return fileDescriptor_7b13a6b7649d2726, []int{2}
 }
+
 func (m *IdentDecl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IdentDecl.Unmarshal(m, b)
 }
 func (m *IdentDecl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IdentDecl.Marshal(b, m, deterministic)
 }
-func (dst *IdentDecl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IdentDecl.Merge(dst, src)
+func (m *IdentDecl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IdentDecl.Merge(m, src)
 }
 func (m *IdentDecl) XXX_Size() int {
 	return xxx_messageInfo_IdentDecl.Size(m)
@@ -321,16 +261,17 @@ func (m *FunctionDecl) Reset()         { *m = FunctionDecl{} }
 func (m *FunctionDecl) String() string { return proto.CompactTextString(m) }
 func (*FunctionDecl) ProtoMessage()    {}
 func (*FunctionDecl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_decl_1e9fea2f12eba89c, []int{3}
+	return fileDescriptor_7b13a6b7649d2726, []int{3}
 }
+
 func (m *FunctionDecl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionDecl.Unmarshal(m, b)
 }
 func (m *FunctionDecl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionDecl.Marshal(b, m, deterministic)
 }
-func (dst *FunctionDecl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionDecl.Merge(dst, src)
+func (m *FunctionDecl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionDecl.Merge(m, src)
 }
 func (m *FunctionDecl) XXX_Size() int {
 	return xxx_messageInfo_FunctionDecl.Size(m)
@@ -369,11 +310,9 @@ func init() {
 	proto.RegisterType((*FunctionDecl)(nil), "google.api.expr.v1beta1.FunctionDecl")
 }
 
-func init() {
-	proto.RegisterFile("google/api/expr/v1beta1/decl.proto", fileDescriptor_decl_1e9fea2f12eba89c)
-}
+func init() { proto.RegisterFile("google/api/expr/v1beta1/decl.proto", fileDescriptor_7b13a6b7649d2726) }
 
-var fileDescriptor_decl_1e9fea2f12eba89c = []byte{
+var fileDescriptor_7b13a6b7649d2726 = []byte{
 	// 398 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x4a, 0xeb, 0x40,
 	0x14, 0xc7, 0xef, 0x34, 0x49, 0x69, 0x4f, 0x2f, 0x97, 0xde, 0xd9, 0xdc, 0x70, 0x45, 0x88, 0x01,
diff --git a/googleapis/api/expr/v1beta1/eval.pb.go b/googleapis/api/expr/v1beta1/eval.pb.go
index a1fb7f0f5b..6450e354e4 100644
--- a/googleapis/api/expr/v1beta1/eval.pb.go
+++ b/googleapis/api/expr/v1beta1/eval.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1beta1/eval.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1beta1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The state of an evaluation.
 //
@@ -39,16 +42,17 @@ func (m *EvalState) Reset()         { *m = EvalState{} }
 func (m *EvalState) String() string { return proto.CompactTextString(m) }
 func (*EvalState) ProtoMessage()    {}
 func (*EvalState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_1837ac708dd48de9, []int{0}
+	return fileDescriptor_5cf79b1c58929ac8, []int{0}
 }
+
 func (m *EvalState) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EvalState.Unmarshal(m, b)
 }
 func (m *EvalState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EvalState.Marshal(b, m, deterministic)
 }
-func (dst *EvalState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EvalState.Merge(dst, src)
+func (m *EvalState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvalState.Merge(m, src)
 }
 func (m *EvalState) XXX_Size() int {
 	return xxx_messageInfo_EvalState.Size(m)
@@ -88,16 +92,17 @@ func (m *EvalState_Result) Reset()         { *m = EvalState_Result{} }
 func (m *EvalState_Result) String() string { return proto.CompactTextString(m) }
 func (*EvalState_Result) ProtoMessage()    {}
 func (*EvalState_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_1837ac708dd48de9, []int{0, 0}
+	return fileDescriptor_5cf79b1c58929ac8, []int{0, 0}
 }
+
 func (m *EvalState_Result) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EvalState_Result.Unmarshal(m, b)
 }
 func (m *EvalState_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EvalState_Result.Marshal(b, m, deterministic)
 }
-func (dst *EvalState_Result) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EvalState_Result.Merge(dst, src)
+func (m *EvalState_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvalState_Result.Merge(m, src)
 }
 func (m *EvalState_Result) XXX_Size() int {
 	return xxx_messageInfo_EvalState_Result.Size(m)
@@ -140,16 +145,17 @@ func (m *ExprValue) Reset()         { *m = ExprValue{} }
 func (m *ExprValue) String() string { return proto.CompactTextString(m) }
 func (*ExprValue) ProtoMessage()    {}
 func (*ExprValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_1837ac708dd48de9, []int{1}
+	return fileDescriptor_5cf79b1c58929ac8, []int{1}
 }
+
 func (m *ExprValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExprValue.Unmarshal(m, b)
 }
 func (m *ExprValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExprValue.Marshal(b, m, deterministic)
 }
-func (dst *ExprValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExprValue.Merge(dst, src)
+func (m *ExprValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExprValue.Merge(m, src)
 }
 func (m *ExprValue) XXX_Size() int {
 	return xxx_messageInfo_ExprValue.Size(m)
@@ -210,99 +216,15 @@ func (m *ExprValue) GetUnknown() *UnknownSet {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExprValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExprValue_OneofMarshaler, _ExprValue_OneofUnmarshaler, _ExprValue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExprValue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExprValue_Value)(nil),
 		(*ExprValue_Error)(nil),
 		(*ExprValue_Unknown)(nil),
 	}
 }
 
-func _ExprValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExprValue)
-	// kind
-	switch x := m.Kind.(type) {
-	case *ExprValue_Value:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Value); err != nil {
-			return err
-		}
-	case *ExprValue_Error:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Error); err != nil {
-			return err
-		}
-	case *ExprValue_Unknown:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Unknown); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ExprValue.Kind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExprValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExprValue)
-	switch tag {
-	case 1: // kind.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.Kind = &ExprValue_Value{msg}
-		return true, err
-	case 2: // kind.error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ErrorSet)
-		err := b.DecodeMessage(msg)
-		m.Kind = &ExprValue_Error{msg}
-		return true, err
-	case 3: // kind.unknown
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UnknownSet)
-		err := b.DecodeMessage(msg)
-		m.Kind = &ExprValue_Unknown{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExprValue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExprValue)
-	// kind
-	switch x := m.Kind.(type) {
-	case *ExprValue_Value:
-		s := proto.Size(x.Value)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExprValue_Error:
-		s := proto.Size(x.Error)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExprValue_Unknown:
-		s := proto.Size(x.Unknown)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A set of errors.
 //
 // The errors included depend on the context. See `ExprValue.error`.
@@ -318,16 +240,17 @@ func (m *ErrorSet) Reset()         { *m = ErrorSet{} }
 func (m *ErrorSet) String() string { return proto.CompactTextString(m) }
 func (*ErrorSet) ProtoMessage()    {}
 func (*ErrorSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_1837ac708dd48de9, []int{2}
+	return fileDescriptor_5cf79b1c58929ac8, []int{2}
 }
+
 func (m *ErrorSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorSet.Unmarshal(m, b)
 }
 func (m *ErrorSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorSet.Marshal(b, m, deterministic)
 }
-func (dst *ErrorSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorSet.Merge(dst, src)
+func (m *ErrorSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorSet.Merge(m, src)
 }
 func (m *ErrorSet) XXX_Size() int {
 	return xxx_messageInfo_ErrorSet.Size(m)
@@ -360,16 +283,17 @@ func (m *UnknownSet) Reset()         { *m = UnknownSet{} }
 func (m *UnknownSet) String() string { return proto.CompactTextString(m) }
 func (*UnknownSet) ProtoMessage()    {}
 func (*UnknownSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_1837ac708dd48de9, []int{3}
+	return fileDescriptor_5cf79b1c58929ac8, []int{3}
 }
+
 func (m *UnknownSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnknownSet.Unmarshal(m, b)
 }
 func (m *UnknownSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UnknownSet.Marshal(b, m, deterministic)
 }
-func (dst *UnknownSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UnknownSet.Merge(dst, src)
+func (m *UnknownSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnknownSet.Merge(m, src)
 }
 func (m *UnknownSet) XXX_Size() int {
 	return xxx_messageInfo_UnknownSet.Size(m)
@@ -400,16 +324,17 @@ func (m *IdRef) Reset()         { *m = IdRef{} }
 func (m *IdRef) String() string { return proto.CompactTextString(m) }
 func (*IdRef) ProtoMessage()    {}
 func (*IdRef) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eval_1837ac708dd48de9, []int{4}
+	return fileDescriptor_5cf79b1c58929ac8, []int{4}
 }
+
 func (m *IdRef) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IdRef.Unmarshal(m, b)
 }
 func (m *IdRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IdRef.Marshal(b, m, deterministic)
 }
-func (dst *IdRef) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IdRef.Merge(dst, src)
+func (m *IdRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IdRef.Merge(m, src)
 }
 func (m *IdRef) XXX_Size() int {
 	return xxx_messageInfo_IdRef.Size(m)
@@ -436,11 +361,9 @@ func init() {
 	proto.RegisterType((*IdRef)(nil), "google.api.expr.v1beta1.IdRef")
 }
 
-func init() {
-	proto.RegisterFile("google/api/expr/v1beta1/eval.proto", fileDescriptor_eval_1837ac708dd48de9)
-}
+func init() { proto.RegisterFile("google/api/expr/v1beta1/eval.proto", fileDescriptor_5cf79b1c58929ac8) }
 
-var fileDescriptor_eval_1837ac708dd48de9 = []byte{
+var fileDescriptor_5cf79b1c58929ac8 = []byte{
 	// 392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x8b, 0xd4, 0x30,
 	0x14, 0xc7, 0xcd, 0xcc, 0xb6, 0xab, 0x6f, 0xc0, 0x43, 0x10, 0xb6, 0x8c, 0x20, 0x63, 0xf7, 0x32,
diff --git a/googleapis/api/expr/v1beta1/expr.pb.go b/googleapis/api/expr/v1beta1/expr.pb.go
index e3d9d47a81..4cad2918a5 100644
--- a/googleapis/api/expr/v1beta1/expr.pb.go
+++ b/googleapis/api/expr/v1beta1/expr.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1beta1/expr.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1beta1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An expression together with source information as returned by the parser.
 type ParsedExpr struct {
@@ -36,16 +39,17 @@ func (m *ParsedExpr) Reset()         { *m = ParsedExpr{} }
 func (m *ParsedExpr) String() string { return proto.CompactTextString(m) }
 func (*ParsedExpr) ProtoMessage()    {}
 func (*ParsedExpr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{0}
+	return fileDescriptor_fb180304f2777248, []int{0}
 }
+
 func (m *ParsedExpr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParsedExpr.Unmarshal(m, b)
 }
 func (m *ParsedExpr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParsedExpr.Marshal(b, m, deterministic)
 }
-func (dst *ParsedExpr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParsedExpr.Merge(dst, src)
+func (m *ParsedExpr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParsedExpr.Merge(m, src)
 }
 func (m *ParsedExpr) XXX_Size() int {
 	return xxx_messageInfo_ParsedExpr.Size(m)
@@ -119,16 +123,17 @@ func (m *Expr) Reset()         { *m = Expr{} }
 func (m *Expr) String() string { return proto.CompactTextString(m) }
 func (*Expr) ProtoMessage()    {}
 func (*Expr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1}
+	return fileDescriptor_fb180304f2777248, []int{1}
 }
+
 func (m *Expr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr.Unmarshal(m, b)
 }
 func (m *Expr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr.Marshal(b, m, deterministic)
 }
-func (dst *Expr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr.Merge(dst, src)
+func (m *Expr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr.Merge(m, src)
 }
 func (m *Expr) XXX_Size() int {
 	return xxx_messageInfo_Expr.Size(m)
@@ -248,9 +253,9 @@ func (m *Expr) GetComprehensionExpr() *Expr_Comprehension {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Expr) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Expr_OneofMarshaler, _Expr_OneofUnmarshaler, _Expr_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Expr) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Expr_LiteralExpr)(nil),
 		(*Expr_IdentExpr)(nil),
 		(*Expr_SelectExpr)(nil),
@@ -261,162 +266,6 @@ func (*Expr) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, f
 	}
 }
 
-func _Expr_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Expr)
-	// expr_kind
-	switch x := m.ExprKind.(type) {
-	case *Expr_LiteralExpr:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LiteralExpr); err != nil {
-			return err
-		}
-	case *Expr_IdentExpr:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.IdentExpr); err != nil {
-			return err
-		}
-	case *Expr_SelectExpr:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SelectExpr); err != nil {
-			return err
-		}
-	case *Expr_CallExpr:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CallExpr); err != nil {
-			return err
-		}
-	case *Expr_ListExpr:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListExpr); err != nil {
-			return err
-		}
-	case *Expr_StructExpr:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructExpr); err != nil {
-			return err
-		}
-	case *Expr_ComprehensionExpr:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ComprehensionExpr); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Expr.ExprKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Expr_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Expr)
-	switch tag {
-	case 3: // expr_kind.literal_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Literal)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_LiteralExpr{msg}
-		return true, err
-	case 4: // expr_kind.ident_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Ident)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_IdentExpr{msg}
-		return true, err
-	case 5: // expr_kind.select_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Select)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_SelectExpr{msg}
-		return true, err
-	case 6: // expr_kind.call_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Call)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_CallExpr{msg}
-		return true, err
-	case 7: // expr_kind.list_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_CreateList)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_ListExpr{msg}
-		return true, err
-	case 8: // expr_kind.struct_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_CreateStruct)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_StructExpr{msg}
-		return true, err
-	case 9: // expr_kind.comprehension_expr
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr_Comprehension)
-		err := b.DecodeMessage(msg)
-		m.ExprKind = &Expr_ComprehensionExpr{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Expr_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Expr)
-	// expr_kind
-	switch x := m.ExprKind.(type) {
-	case *Expr_LiteralExpr:
-		s := proto.Size(x.LiteralExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_IdentExpr:
-		s := proto.Size(x.IdentExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_SelectExpr:
-		s := proto.Size(x.SelectExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_CallExpr:
-		s := proto.Size(x.CallExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_ListExpr:
-		s := proto.Size(x.ListExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_StructExpr:
-		s := proto.Size(x.StructExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Expr_ComprehensionExpr:
-		s := proto.Size(x.ComprehensionExpr)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An identifier expression. e.g. `request`.
 type Expr_Ident struct {
 	// Required. Holds a single, unqualified identifier, possibly preceded by a
@@ -434,16 +283,17 @@ func (m *Expr_Ident) Reset()         { *m = Expr_Ident{} }
 func (m *Expr_Ident) String() string { return proto.CompactTextString(m) }
 func (*Expr_Ident) ProtoMessage()    {}
 func (*Expr_Ident) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1, 0}
+	return fileDescriptor_fb180304f2777248, []int{1, 0}
 }
+
 func (m *Expr_Ident) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Ident.Unmarshal(m, b)
 }
 func (m *Expr_Ident) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Ident.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Ident) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Ident.Merge(dst, src)
+func (m *Expr_Ident) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Ident.Merge(m, src)
 }
 func (m *Expr_Ident) XXX_Size() int {
 	return xxx_messageInfo_Expr_Ident.Size(m)
@@ -486,16 +336,17 @@ func (m *Expr_Select) Reset()         { *m = Expr_Select{} }
 func (m *Expr_Select) String() string { return proto.CompactTextString(m) }
 func (*Expr_Select) ProtoMessage()    {}
 func (*Expr_Select) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1, 1}
+	return fileDescriptor_fb180304f2777248, []int{1, 1}
 }
+
 func (m *Expr_Select) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Select.Unmarshal(m, b)
 }
 func (m *Expr_Select) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Select.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Select) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Select.Merge(dst, src)
+func (m *Expr_Select) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Select.Merge(m, src)
 }
 func (m *Expr_Select) XXX_Size() int {
 	return xxx_messageInfo_Expr_Select.Size(m)
@@ -547,16 +398,17 @@ func (m *Expr_Call) Reset()         { *m = Expr_Call{} }
 func (m *Expr_Call) String() string { return proto.CompactTextString(m) }
 func (*Expr_Call) ProtoMessage()    {}
 func (*Expr_Call) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1, 2}
+	return fileDescriptor_fb180304f2777248, []int{1, 2}
 }
+
 func (m *Expr_Call) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Call.Unmarshal(m, b)
 }
 func (m *Expr_Call) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Call.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Call) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Call.Merge(dst, src)
+func (m *Expr_Call) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Call.Merge(m, src)
 }
 func (m *Expr_Call) XXX_Size() int {
 	return xxx_messageInfo_Expr_Call.Size(m)
@@ -604,16 +456,17 @@ func (m *Expr_CreateList) Reset()         { *m = Expr_CreateList{} }
 func (m *Expr_CreateList) String() string { return proto.CompactTextString(m) }
 func (*Expr_CreateList) ProtoMessage()    {}
 func (*Expr_CreateList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1, 3}
+	return fileDescriptor_fb180304f2777248, []int{1, 3}
 }
+
 func (m *Expr_CreateList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_CreateList.Unmarshal(m, b)
 }
 func (m *Expr_CreateList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_CreateList.Marshal(b, m, deterministic)
 }
-func (dst *Expr_CreateList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_CreateList.Merge(dst, src)
+func (m *Expr_CreateList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_CreateList.Merge(m, src)
 }
 func (m *Expr_CreateList) XXX_Size() int {
 	return xxx_messageInfo_Expr_CreateList.Size(m)
@@ -651,16 +504,17 @@ func (m *Expr_CreateStruct) Reset()         { *m = Expr_CreateStruct{} }
 func (m *Expr_CreateStruct) String() string { return proto.CompactTextString(m) }
 func (*Expr_CreateStruct) ProtoMessage()    {}
 func (*Expr_CreateStruct) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1, 4}
+	return fileDescriptor_fb180304f2777248, []int{1, 4}
 }
+
 func (m *Expr_CreateStruct) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_CreateStruct.Unmarshal(m, b)
 }
 func (m *Expr_CreateStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_CreateStruct.Marshal(b, m, deterministic)
 }
-func (dst *Expr_CreateStruct) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_CreateStruct.Merge(dst, src)
+func (m *Expr_CreateStruct) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_CreateStruct.Merge(m, src)
 }
 func (m *Expr_CreateStruct) XXX_Size() int {
 	return xxx_messageInfo_Expr_CreateStruct.Size(m)
@@ -708,16 +562,17 @@ func (m *Expr_CreateStruct_Entry) Reset()         { *m = Expr_CreateStruct_Entry
 func (m *Expr_CreateStruct_Entry) String() string { return proto.CompactTextString(m) }
 func (*Expr_CreateStruct_Entry) ProtoMessage()    {}
 func (*Expr_CreateStruct_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1, 4, 0}
+	return fileDescriptor_fb180304f2777248, []int{1, 4, 0}
 }
+
 func (m *Expr_CreateStruct_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_CreateStruct_Entry.Unmarshal(m, b)
 }
 func (m *Expr_CreateStruct_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_CreateStruct_Entry.Marshal(b, m, deterministic)
 }
-func (dst *Expr_CreateStruct_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_CreateStruct_Entry.Merge(dst, src)
+func (m *Expr_CreateStruct_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_CreateStruct_Entry.Merge(m, src)
 }
 func (m *Expr_CreateStruct_Entry) XXX_Size() int {
 	return xxx_messageInfo_Expr_CreateStruct_Entry.Size(m)
@@ -779,76 +634,14 @@ func (m *Expr_CreateStruct_Entry) GetValue() *Expr {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Expr_CreateStruct_Entry) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Expr_CreateStruct_Entry_OneofMarshaler, _Expr_CreateStruct_Entry_OneofUnmarshaler, _Expr_CreateStruct_Entry_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Expr_CreateStruct_Entry) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Expr_CreateStruct_Entry_FieldKey)(nil),
 		(*Expr_CreateStruct_Entry_MapKey)(nil),
 	}
 }
 
-func _Expr_CreateStruct_Entry_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Expr_CreateStruct_Entry)
-	// key_kind
-	switch x := m.KeyKind.(type) {
-	case *Expr_CreateStruct_Entry_FieldKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.FieldKey)
-	case *Expr_CreateStruct_Entry_MapKey:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MapKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Expr_CreateStruct_Entry.KeyKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Expr_CreateStruct_Entry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Expr_CreateStruct_Entry)
-	switch tag {
-	case 2: // key_kind.field_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.KeyKind = &Expr_CreateStruct_Entry_FieldKey{x}
-		return true, err
-	case 3: // key_kind.map_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Expr)
-		err := b.DecodeMessage(msg)
-		m.KeyKind = &Expr_CreateStruct_Entry_MapKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Expr_CreateStruct_Entry_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Expr_CreateStruct_Entry)
-	// key_kind
-	switch x := m.KeyKind.(type) {
-	case *Expr_CreateStruct_Entry_FieldKey:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.FieldKey)))
-		n += len(x.FieldKey)
-	case *Expr_CreateStruct_Entry_MapKey:
-		s := proto.Size(x.MapKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A comprehension expression applied to a list or map.
 //
 // Comprehensions are not part of the core syntax, but enabled with macros.
@@ -906,16 +699,17 @@ func (m *Expr_Comprehension) Reset()         { *m = Expr_Comprehension{} }
 func (m *Expr_Comprehension) String() string { return proto.CompactTextString(m) }
 func (*Expr_Comprehension) ProtoMessage()    {}
 func (*Expr_Comprehension) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{1, 5}
+	return fileDescriptor_fb180304f2777248, []int{1, 5}
 }
+
 func (m *Expr_Comprehension) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr_Comprehension.Unmarshal(m, b)
 }
 func (m *Expr_Comprehension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr_Comprehension.Marshal(b, m, deterministic)
 }
-func (dst *Expr_Comprehension) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr_Comprehension.Merge(dst, src)
+func (m *Expr_Comprehension) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr_Comprehension.Merge(m, src)
 }
 func (m *Expr_Comprehension) XXX_Size() int {
 	return xxx_messageInfo_Expr_Comprehension.Size(m)
@@ -1008,16 +802,17 @@ func (m *Literal) Reset()         { *m = Literal{} }
 func (m *Literal) String() string { return proto.CompactTextString(m) }
 func (*Literal) ProtoMessage()    {}
 func (*Literal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_53c57acc058f7369, []int{2}
+	return fileDescriptor_fb180304f2777248, []int{2}
 }
+
 func (m *Literal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Literal.Unmarshal(m, b)
 }
 func (m *Literal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Literal.Marshal(b, m, deterministic)
 }
-func (dst *Literal) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Literal.Merge(dst, src)
+func (m *Literal) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Literal.Merge(m, src)
 }
 func (m *Literal) XXX_Size() int {
 	return xxx_messageInfo_Literal.Size(m)
@@ -1130,9 +925,9 @@ func (m *Literal) GetBytesValue() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Literal) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Literal_OneofMarshaler, _Literal_OneofUnmarshaler, _Literal_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Literal) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Literal_NullValue)(nil),
 		(*Literal_BoolValue)(nil),
 		(*Literal_Int64Value)(nil),
@@ -1143,133 +938,6 @@ func (*Literal) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error
 	}
 }
 
-func _Literal_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Literal)
-	// constant_kind
-	switch x := m.ConstantKind.(type) {
-	case *Literal_NullValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Literal_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Literal_Int64Value:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Value))
-	case *Literal_Uint64Value:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Uint64Value))
-	case *Literal_DoubleValue:
-		b.EncodeVarint(5<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Literal_StringValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Literal_BytesValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BytesValue)
-	case nil:
-	default:
-		return fmt.Errorf("Literal.ConstantKind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Literal_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Literal)
-	switch tag {
-	case 1: // constant_kind.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Literal_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 2: // constant_kind.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Literal_BoolValue{x != 0}
-		return true, err
-	case 3: // constant_kind.int64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Literal_Int64Value{int64(x)}
-		return true, err
-	case 4: // constant_kind.uint64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConstantKind = &Literal_Uint64Value{x}
-		return true, err
-	case 5: // constant_kind.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.ConstantKind = &Literal_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 6: // constant_kind.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ConstantKind = &Literal_StringValue{x}
-		return true, err
-	case 7: // constant_kind.bytes_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConstantKind = &Literal_BytesValue{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Literal_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Literal)
-	// constant_kind
-	switch x := m.ConstantKind.(type) {
-	case *Literal_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Literal_BoolValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Literal_Int64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Value))
-	case *Literal_Uint64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Uint64Value))
-	case *Literal_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Literal_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Literal_BytesValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BytesValue)))
-		n += len(x.BytesValue)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*ParsedExpr)(nil), "google.api.expr.v1beta1.ParsedExpr")
 	proto.RegisterType((*Expr)(nil), "google.api.expr.v1beta1.Expr")
@@ -1283,11 +951,9 @@ func init() {
 	proto.RegisterType((*Literal)(nil), "google.api.expr.v1beta1.Literal")
 }
 
-func init() {
-	proto.RegisterFile("google/api/expr/v1beta1/expr.proto", fileDescriptor_expr_53c57acc058f7369)
-}
+func init() { proto.RegisterFile("google/api/expr/v1beta1/expr.proto", fileDescriptor_fb180304f2777248) }
 
-var fileDescriptor_expr_53c57acc058f7369 = []byte{
+var fileDescriptor_fb180304f2777248 = []byte{
 	// 936 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x96, 0x6f, 0x6f, 0x23, 0xb5,
 	0x13, 0xc7, 0xbb, 0xf9, 0xbb, 0x3b, 0x69, 0xfb, 0xd3, 0xcf, 0x42, 0x22, 0x6c, 0x39, 0x51, 0x7a,
diff --git a/googleapis/api/expr/v1beta1/source.pb.go b/googleapis/api/expr/v1beta1/source.pb.go
index 8d25220464..943dd0d03e 100644
--- a/googleapis/api/expr/v1beta1/source.pb.go
+++ b/googleapis/api/expr/v1beta1/source.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1beta1/source.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1beta1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Source information collected at parse time.
 type SourceInfo struct {
@@ -44,16 +47,17 @@ func (m *SourceInfo) Reset()         { *m = SourceInfo{} }
 func (m *SourceInfo) String() string { return proto.CompactTextString(m) }
 func (*SourceInfo) ProtoMessage()    {}
 func (*SourceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_9a101adf77e26b45, []int{0}
+	return fileDescriptor_26d280d77790e409, []int{0}
 }
+
 func (m *SourceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceInfo.Unmarshal(m, b)
 }
 func (m *SourceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceInfo.Marshal(b, m, deterministic)
 }
-func (dst *SourceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceInfo.Merge(dst, src)
+func (m *SourceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceInfo.Merge(m, src)
 }
 func (m *SourceInfo) XXX_Size() int {
 	return xxx_messageInfo_SourceInfo.Size(m)
@@ -106,16 +110,17 @@ func (m *SourcePosition) Reset()         { *m = SourcePosition{} }
 func (m *SourcePosition) String() string { return proto.CompactTextString(m) }
 func (*SourcePosition) ProtoMessage()    {}
 func (*SourcePosition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_9a101adf77e26b45, []int{1}
+	return fileDescriptor_26d280d77790e409, []int{1}
 }
+
 func (m *SourcePosition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourcePosition.Unmarshal(m, b)
 }
 func (m *SourcePosition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourcePosition.Marshal(b, m, deterministic)
 }
-func (dst *SourcePosition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourcePosition.Merge(dst, src)
+func (m *SourcePosition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourcePosition.Merge(m, src)
 }
 func (m *SourcePosition) XXX_Size() int {
 	return xxx_messageInfo_SourcePosition.Size(m)
@@ -161,10 +166,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/expr/v1beta1/source.proto", fileDescriptor_source_9a101adf77e26b45)
+	proto.RegisterFile("google/api/expr/v1beta1/source.proto", fileDescriptor_26d280d77790e409)
 }
 
-var fileDescriptor_source_9a101adf77e26b45 = []byte{
+var fileDescriptor_26d280d77790e409 = []byte{
 	// 311 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x4b, 0x3b, 0x31,
 	0x10, 0xc5, 0x49, 0xb7, 0x5b, 0xfe, 0x9d, 0xfe, 0x29, 0x12, 0x44, 0x97, 0x7a, 0x59, 0x8b, 0x87,
diff --git a/googleapis/api/expr/v1beta1/value.pb.go b/googleapis/api/expr/v1beta1/value.pb.go
index 902e1fb1da..fca9722e03 100644
--- a/googleapis/api/expr/v1beta1/value.pb.go
+++ b/googleapis/api/expr/v1beta1/value.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/expr/v1beta1/value.proto
 
-package expr // import "google.golang.org/genproto/googleapis/api/expr/v1beta1"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a CEL value.
 //
@@ -50,16 +53,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_20f19fe52ddbfe7f, []int{0}
+	return fileDescriptor_6677b81498dbb8ef, []int{0}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -237,9 +241,9 @@ func (m *Value) GetTypeValue() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_NullValue)(nil),
 		(*Value_BoolValue)(nil),
 		(*Value_Int64Value)(nil),
@@ -255,219 +259,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Value_NullValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Value_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_Int64Value:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Value))
-	case *Value_Uint64Value:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Uint64Value))
-	case *Value_DoubleValue:
-		b.EncodeVarint(5<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Value_StringValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BytesValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BytesValue)
-	case *Value_EnumValue:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EnumValue); err != nil {
-			return err
-		}
-	case *Value_ObjectValue:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ObjectValue); err != nil {
-			return err
-		}
-	case *Value_MapValue:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MapValue); err != nil {
-			return err
-		}
-	case *Value_ListValue:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListValue); err != nil {
-			return err
-		}
-	case *Value_TypeValue:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TypeValue)
-	case nil:
-	default:
-		return fmt.Errorf("Value.Kind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 1: // kind.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 2: // kind.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_BoolValue{x != 0}
-		return true, err
-	case 3: // kind.int64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_Int64Value{int64(x)}
-		return true, err
-	case 4: // kind.uint64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_Uint64Value{x}
-		return true, err
-	case 5: // kind.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Kind = &Value_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 6: // kind.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Kind = &Value_StringValue{x}
-		return true, err
-	case 7: // kind.bytes_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Kind = &Value_BytesValue{x}
-		return true, err
-	case 9: // kind.enum_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EnumValue)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_EnumValue{msg}
-		return true, err
-	case 10: // kind.object_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_ObjectValue{msg}
-		return true, err
-	case 11: // kind.map_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MapValue)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_MapValue{msg}
-		return true, err
-	case 12: // kind.list_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ListValue)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_ListValue{msg}
-		return true, err
-	case 15: // kind.type_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Kind = &Value_TypeValue{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Value_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Value_BoolValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_Int64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Value))
-	case *Value_Uint64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Uint64Value))
-	case *Value_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BytesValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BytesValue)))
-		n += len(x.BytesValue)
-	case *Value_EnumValue:
-		s := proto.Size(x.EnumValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ObjectValue:
-		s := proto.Size(x.ObjectValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_MapValue:
-		s := proto.Size(x.MapValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ListValue:
-		s := proto.Size(x.ListValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_TypeValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TypeValue)))
-		n += len(x.TypeValue)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An enum value.
 type EnumValue struct {
 	// The fully qualified name of the enum type.
@@ -483,16 +274,17 @@ func (m *EnumValue) Reset()         { *m = EnumValue{} }
 func (m *EnumValue) String() string { return proto.CompactTextString(m) }
 func (*EnumValue) ProtoMessage()    {}
 func (*EnumValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_20f19fe52ddbfe7f, []int{1}
+	return fileDescriptor_6677b81498dbb8ef, []int{1}
 }
+
 func (m *EnumValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnumValue.Unmarshal(m, b)
 }
 func (m *EnumValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnumValue.Marshal(b, m, deterministic)
 }
-func (dst *EnumValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnumValue.Merge(dst, src)
+func (m *EnumValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumValue.Merge(m, src)
 }
 func (m *EnumValue) XXX_Size() int {
 	return xxx_messageInfo_EnumValue.Size(m)
@@ -533,16 +325,17 @@ func (m *ListValue) Reset()         { *m = ListValue{} }
 func (m *ListValue) String() string { return proto.CompactTextString(m) }
 func (*ListValue) ProtoMessage()    {}
 func (*ListValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_20f19fe52ddbfe7f, []int{2}
+	return fileDescriptor_6677b81498dbb8ef, []int{2}
 }
+
 func (m *ListValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListValue.Unmarshal(m, b)
 }
 func (m *ListValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListValue.Marshal(b, m, deterministic)
 }
-func (dst *ListValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListValue.Merge(dst, src)
+func (m *ListValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListValue.Merge(m, src)
 }
 func (m *ListValue) XXX_Size() int {
 	return xxx_messageInfo_ListValue.Size(m)
@@ -579,16 +372,17 @@ func (m *MapValue) Reset()         { *m = MapValue{} }
 func (m *MapValue) String() string { return proto.CompactTextString(m) }
 func (*MapValue) ProtoMessage()    {}
 func (*MapValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_20f19fe52ddbfe7f, []int{3}
+	return fileDescriptor_6677b81498dbb8ef, []int{3}
 }
+
 func (m *MapValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapValue.Unmarshal(m, b)
 }
 func (m *MapValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapValue.Marshal(b, m, deterministic)
 }
-func (dst *MapValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapValue.Merge(dst, src)
+func (m *MapValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapValue.Merge(m, src)
 }
 func (m *MapValue) XXX_Size() int {
 	return xxx_messageInfo_MapValue.Size(m)
@@ -624,16 +418,17 @@ func (m *MapValue_Entry) Reset()         { *m = MapValue_Entry{} }
 func (m *MapValue_Entry) String() string { return proto.CompactTextString(m) }
 func (*MapValue_Entry) ProtoMessage()    {}
 func (*MapValue_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_value_20f19fe52ddbfe7f, []int{3, 0}
+	return fileDescriptor_6677b81498dbb8ef, []int{3, 0}
 }
+
 func (m *MapValue_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapValue_Entry.Unmarshal(m, b)
 }
 func (m *MapValue_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapValue_Entry.Marshal(b, m, deterministic)
 }
-func (dst *MapValue_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapValue_Entry.Merge(dst, src)
+func (m *MapValue_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapValue_Entry.Merge(m, src)
 }
 func (m *MapValue_Entry) XXX_Size() int {
 	return xxx_messageInfo_MapValue_Entry.Size(m)
@@ -667,10 +462,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/expr/v1beta1/value.proto", fileDescriptor_value_20f19fe52ddbfe7f)
+	proto.RegisterFile("google/api/expr/v1beta1/value.proto", fileDescriptor_6677b81498dbb8ef)
 }
 
-var fileDescriptor_value_20f19fe52ddbfe7f = []byte{
+var fileDescriptor_6677b81498dbb8ef = []byte{
 	// 516 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x4d, 0x6f, 0xd3, 0x30,
 	0x18, 0xc7, 0x6b, 0xfa, 0xb2, 0xe6, 0x69, 0x05, 0x92, 0x35, 0x89, 0x51, 0x10, 0x64, 0xdd, 0x81,
diff --git a/googleapis/api/httpbody/httpbody.pb.go b/googleapis/api/httpbody/httpbody.pb.go
index 08f5b8d6fd..5b6c587a96 100644
--- a/googleapis/api/httpbody/httpbody.pb.go
+++ b/googleapis/api/httpbody/httpbody.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/httpbody.proto
 
-package httpbody // import "google.golang.org/genproto/googleapis/api/httpbody"
+package httpbody
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Message that represents an arbitrary HTTP body. It should only be used for
 // payload formats that can't be represented as JSON, such as raw binary or
@@ -75,16 +78,17 @@ func (m *HttpBody) Reset()         { *m = HttpBody{} }
 func (m *HttpBody) String() string { return proto.CompactTextString(m) }
 func (*HttpBody) ProtoMessage()    {}
 func (*HttpBody) Descriptor() ([]byte, []int) {
-	return fileDescriptor_httpbody_b1715ad6d52ffa1f, []int{0}
+	return fileDescriptor_09ea2ecaa32a0070, []int{0}
 }
+
 func (m *HttpBody) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpBody.Unmarshal(m, b)
 }
 func (m *HttpBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpBody.Marshal(b, m, deterministic)
 }
-func (dst *HttpBody) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpBody.Merge(dst, src)
+func (m *HttpBody) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpBody.Merge(m, src)
 }
 func (m *HttpBody) XXX_Size() int {
 	return xxx_messageInfo_HttpBody.Size(m)
@@ -120,9 +124,9 @@ func init() {
 	proto.RegisterType((*HttpBody)(nil), "google.api.HttpBody")
 }
 
-func init() { proto.RegisterFile("google/api/httpbody.proto", fileDescriptor_httpbody_b1715ad6d52ffa1f) }
+func init() { proto.RegisterFile("google/api/httpbody.proto", fileDescriptor_09ea2ecaa32a0070) }
 
-var fileDescriptor_httpbody_b1715ad6d52ffa1f = []byte{
+var fileDescriptor_09ea2ecaa32a0070 = []byte{
 	// 229 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0x31, 0x4f, 0xc3, 0x30,
 	0x10, 0x85, 0xe5, 0xb6, 0x42, 0x70, 0x2d, 0x0c, 0x16, 0x43, 0x60, 0x0a, 0x4c, 0x99, 0x6c, 0x09,
diff --git a/googleapis/api/label/label.pb.go b/googleapis/api/label/label.pb.go
index 5824c0d234..8ecced45cd 100644
--- a/googleapis/api/label/label.pb.go
+++ b/googleapis/api/label/label.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/label.proto
 
-package label // import "google.golang.org/genproto/googleapis/api/label"
+package label
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Value types that can be used as label values.
 type LabelDescriptor_ValueType int32
@@ -35,6 +38,7 @@ var LabelDescriptor_ValueType_name = map[int32]string{
 	1: "BOOL",
 	2: "INT64",
 }
+
 var LabelDescriptor_ValueType_value = map[string]int32{
 	"STRING": 0,
 	"BOOL":   1,
@@ -44,8 +48,9 @@ var LabelDescriptor_ValueType_value = map[string]int32{
 func (x LabelDescriptor_ValueType) String() string {
 	return proto.EnumName(LabelDescriptor_ValueType_name, int32(x))
 }
+
 func (LabelDescriptor_ValueType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_label_4cc356b80657a87b, []int{0, 0}
+	return fileDescriptor_f372a463e25ba151, []int{0, 0}
 }
 
 // A description of a label.
@@ -65,16 +70,17 @@ func (m *LabelDescriptor) Reset()         { *m = LabelDescriptor{} }
 func (m *LabelDescriptor) String() string { return proto.CompactTextString(m) }
 func (*LabelDescriptor) ProtoMessage()    {}
 func (*LabelDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_label_4cc356b80657a87b, []int{0}
+	return fileDescriptor_f372a463e25ba151, []int{0}
 }
+
 func (m *LabelDescriptor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelDescriptor.Unmarshal(m, b)
 }
 func (m *LabelDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelDescriptor.Marshal(b, m, deterministic)
 }
-func (dst *LabelDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelDescriptor.Merge(dst, src)
+func (m *LabelDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDescriptor.Merge(m, src)
 }
 func (m *LabelDescriptor) XXX_Size() int {
 	return xxx_messageInfo_LabelDescriptor.Size(m)
@@ -107,13 +113,13 @@ func (m *LabelDescriptor) GetDescription() string {
 }
 
 func init() {
-	proto.RegisterType((*LabelDescriptor)(nil), "google.api.LabelDescriptor")
 	proto.RegisterEnum("google.api.LabelDescriptor_ValueType", LabelDescriptor_ValueType_name, LabelDescriptor_ValueType_value)
+	proto.RegisterType((*LabelDescriptor)(nil), "google.api.LabelDescriptor")
 }
 
-func init() { proto.RegisterFile("google/api/label.proto", fileDescriptor_label_4cc356b80657a87b) }
+func init() { proto.RegisterFile("google/api/label.proto", fileDescriptor_f372a463e25ba151) }
 
-var fileDescriptor_label_4cc356b80657a87b = []byte{
+var fileDescriptor_f372a463e25ba151 = []byte{
 	// 252 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0xcf, 0x49, 0x4c, 0x4a, 0xcd, 0xd1, 0x2b, 0x28, 0xca,
diff --git a/googleapis/api/launch_stage.pb.go b/googleapis/api/launch_stage.pb.go
index 9246e5563f..208ff134bf 100644
--- a/googleapis/api/launch_stage.pb.go
+++ b/googleapis/api/launch_stage.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/launch_stage.proto
 
-package api // import "google.golang.org/genproto/googleapis/api"
+package api
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The launch stage as defined by [Google Cloud Platform
 // Launch Stages](http://cloud.google.com/terms/launch-stages).
@@ -66,6 +69,7 @@ var LaunchStage_name = map[int32]string{
 	4: "GA",
 	5: "DEPRECATED",
 }
+
 var LaunchStage_value = map[string]int32{
 	"LAUNCH_STAGE_UNSPECIFIED": 0,
 	"EARLY_ACCESS":             1,
@@ -78,19 +82,18 @@ var LaunchStage_value = map[string]int32{
 func (x LaunchStage) String() string {
 	return proto.EnumName(LaunchStage_name, int32(x))
 }
+
 func (LaunchStage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_launch_stage_9684e9c225ce12c7, []int{0}
+	return fileDescriptor_6b5f68b6c1cefff8, []int{0}
 }
 
 func init() {
 	proto.RegisterEnum("google.api.LaunchStage", LaunchStage_name, LaunchStage_value)
 }
 
-func init() {
-	proto.RegisterFile("google/api/launch_stage.proto", fileDescriptor_launch_stage_9684e9c225ce12c7)
-}
+func init() { proto.RegisterFile("google/api/launch_stage.proto", fileDescriptor_6b5f68b6c1cefff8) }
 
-var fileDescriptor_launch_stage_9684e9c225ce12c7 = []byte{
+var fileDescriptor_6b5f68b6c1cefff8 = []byte{
 	// 225 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8f, 0xc1, 0x4a, 0xc3, 0x40,
 	0x14, 0x45, 0x6d, 0x4c, 0x8b, 0x3e, 0xa5, 0x3c, 0x66, 0xe5, 0x42, 0x7f, 0x40, 0x30, 0x59, 0xb8,
diff --git a/googleapis/api/metric/metric.pb.go b/googleapis/api/metric/metric.pb.go
index ad046ef3f0..dd03fc9d34 100644
--- a/googleapis/api/metric/metric.pb.go
+++ b/googleapis/api/metric/metric.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/metric.proto
 
-package metric // import "google.golang.org/genproto/googleapis/api/metric"
+package metric
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import api "google.golang.org/genproto/googleapis/api"
-import label "google.golang.org/genproto/googleapis/api/label"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	api "google.golang.org/genproto/googleapis/api"
+	label "google.golang.org/genproto/googleapis/api/label"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The kind of measurement. It describes how the data is reported.
 type MetricDescriptor_MetricKind int32
@@ -45,6 +48,7 @@ var MetricDescriptor_MetricKind_name = map[int32]string{
 	2: "DELTA",
 	3: "CUMULATIVE",
 }
+
 var MetricDescriptor_MetricKind_value = map[string]int32{
 	"METRIC_KIND_UNSPECIFIED": 0,
 	"GAUGE":                   1,
@@ -55,8 +59,9 @@ var MetricDescriptor_MetricKind_value = map[string]int32{
 func (x MetricDescriptor_MetricKind) String() string {
 	return proto.EnumName(MetricDescriptor_MetricKind_name, int32(x))
 }
+
 func (MetricDescriptor_MetricKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_metric_55f130a603acc212, []int{0, 0}
+	return fileDescriptor_927eaac1a24f8abb, []int{0, 0}
 }
 
 // The value type of a metric.
@@ -90,6 +95,7 @@ var MetricDescriptor_ValueType_name = map[int32]string{
 	5: "DISTRIBUTION",
 	6: "MONEY",
 }
+
 var MetricDescriptor_ValueType_value = map[string]int32{
 	"VALUE_TYPE_UNSPECIFIED": 0,
 	"BOOL":                   1,
@@ -103,8 +109,9 @@ var MetricDescriptor_ValueType_value = map[string]int32{
 func (x MetricDescriptor_ValueType) String() string {
 	return proto.EnumName(MetricDescriptor_ValueType_name, int32(x))
 }
+
 func (MetricDescriptor_ValueType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_metric_55f130a603acc212, []int{0, 1}
+	return fileDescriptor_927eaac1a24f8abb, []int{0, 1}
 }
 
 // Defines a metric type and its schema. Once a metric descriptor is created,
@@ -219,16 +226,17 @@ func (m *MetricDescriptor) Reset()         { *m = MetricDescriptor{} }
 func (m *MetricDescriptor) String() string { return proto.CompactTextString(m) }
 func (*MetricDescriptor) ProtoMessage()    {}
 func (*MetricDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_55f130a603acc212, []int{0}
+	return fileDescriptor_927eaac1a24f8abb, []int{0}
 }
+
 func (m *MetricDescriptor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MetricDescriptor.Unmarshal(m, b)
 }
 func (m *MetricDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MetricDescriptor.Marshal(b, m, deterministic)
 }
-func (dst *MetricDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricDescriptor.Merge(dst, src)
+func (m *MetricDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricDescriptor.Merge(m, src)
 }
 func (m *MetricDescriptor) XXX_Size() int {
 	return xxx_messageInfo_MetricDescriptor.Size(m)
@@ -326,16 +334,17 @@ func (m *MetricDescriptor_MetricDescriptorMetadata) Reset() {
 func (m *MetricDescriptor_MetricDescriptorMetadata) String() string { return proto.CompactTextString(m) }
 func (*MetricDescriptor_MetricDescriptorMetadata) ProtoMessage()    {}
 func (*MetricDescriptor_MetricDescriptorMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_55f130a603acc212, []int{0, 0}
+	return fileDescriptor_927eaac1a24f8abb, []int{0, 0}
 }
+
 func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Unmarshal(m, b)
 }
 func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Marshal(b, m, deterministic)
 }
-func (dst *MetricDescriptor_MetricDescriptorMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Merge(dst, src)
+func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Merge(m, src)
 }
 func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Size() int {
 	return xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Size(m)
@@ -385,16 +394,17 @@ func (m *Metric) Reset()         { *m = Metric{} }
 func (m *Metric) String() string { return proto.CompactTextString(m) }
 func (*Metric) ProtoMessage()    {}
 func (*Metric) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_55f130a603acc212, []int{1}
+	return fileDescriptor_927eaac1a24f8abb, []int{1}
 }
+
 func (m *Metric) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Metric.Unmarshal(m, b)
 }
 func (m *Metric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Metric.Marshal(b, m, deterministic)
 }
-func (dst *Metric) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Metric.Merge(dst, src)
+func (m *Metric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metric.Merge(m, src)
 }
 func (m *Metric) XXX_Size() int {
 	return xxx_messageInfo_Metric.Size(m)
@@ -420,17 +430,17 @@ func (m *Metric) GetLabels() map[string]string {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.MetricDescriptor_MetricKind", MetricDescriptor_MetricKind_name, MetricDescriptor_MetricKind_value)
+	proto.RegisterEnum("google.api.MetricDescriptor_ValueType", MetricDescriptor_ValueType_name, MetricDescriptor_ValueType_value)
 	proto.RegisterType((*MetricDescriptor)(nil), "google.api.MetricDescriptor")
 	proto.RegisterType((*MetricDescriptor_MetricDescriptorMetadata)(nil), "google.api.MetricDescriptor.MetricDescriptorMetadata")
 	proto.RegisterType((*Metric)(nil), "google.api.Metric")
 	proto.RegisterMapType((map[string]string)(nil), "google.api.Metric.LabelsEntry")
-	proto.RegisterEnum("google.api.MetricDescriptor_MetricKind", MetricDescriptor_MetricKind_name, MetricDescriptor_MetricKind_value)
-	proto.RegisterEnum("google.api.MetricDescriptor_ValueType", MetricDescriptor_ValueType_name, MetricDescriptor_ValueType_value)
 }
 
-func init() { proto.RegisterFile("google/api/metric.proto", fileDescriptor_metric_55f130a603acc212) }
+func init() { proto.RegisterFile("google/api/metric.proto", fileDescriptor_927eaac1a24f8abb) }
 
-var fileDescriptor_metric_55f130a603acc212 = []byte{
+var fileDescriptor_927eaac1a24f8abb = []byte{
 	// 648 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x5d, 0x6e, 0xd3, 0x40,
 	0x10, 0xc6, 0xf9, 0x31, 0xcd, 0x38, 0x44, 0xd6, 0x0a, 0xb5, 0x26, 0x15, 0x55, 0xc8, 0x03, 0xe4,
diff --git a/googleapis/api/monitoredres/monitored_resource.pb.go b/googleapis/api/monitoredres/monitored_resource.pb.go
index 8423d375d8..2452f557ac 100644
--- a/googleapis/api/monitoredres/monitored_resource.pb.go
+++ b/googleapis/api/monitoredres/monitored_resource.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/monitored_resource.proto
 
-package monitoredres // import "google.golang.org/genproto/googleapis/api/monitoredres"
+package monitoredres
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import label "google.golang.org/genproto/googleapis/api/label"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	label "google.golang.org/genproto/googleapis/api/label"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An object that describes the schema of a [MonitoredResource][google.api.MonitoredResource] object using a
 // type name and a set of labels.  For example, the monitored resource
@@ -62,16 +65,17 @@ func (m *MonitoredResourceDescriptor) Reset()         { *m = MonitoredResourceDe
 func (m *MonitoredResourceDescriptor) String() string { return proto.CompactTextString(m) }
 func (*MonitoredResourceDescriptor) ProtoMessage()    {}
 func (*MonitoredResourceDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_monitored_resource_d0f80e27b3474083, []int{0}
+	return fileDescriptor_6cd8bd738b08f2bf, []int{0}
 }
+
 func (m *MonitoredResourceDescriptor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MonitoredResourceDescriptor.Unmarshal(m, b)
 }
 func (m *MonitoredResourceDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MonitoredResourceDescriptor.Marshal(b, m, deterministic)
 }
-func (dst *MonitoredResourceDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MonitoredResourceDescriptor.Merge(dst, src)
+func (m *MonitoredResourceDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MonitoredResourceDescriptor.Merge(m, src)
 }
 func (m *MonitoredResourceDescriptor) XXX_Size() int {
 	return xxx_messageInfo_MonitoredResourceDescriptor.Size(m)
@@ -148,16 +152,17 @@ func (m *MonitoredResource) Reset()         { *m = MonitoredResource{} }
 func (m *MonitoredResource) String() string { return proto.CompactTextString(m) }
 func (*MonitoredResource) ProtoMessage()    {}
 func (*MonitoredResource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_monitored_resource_d0f80e27b3474083, []int{1}
+	return fileDescriptor_6cd8bd738b08f2bf, []int{1}
 }
+
 func (m *MonitoredResource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MonitoredResource.Unmarshal(m, b)
 }
 func (m *MonitoredResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MonitoredResource.Marshal(b, m, deterministic)
 }
-func (dst *MonitoredResource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MonitoredResource.Merge(dst, src)
+func (m *MonitoredResource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MonitoredResource.Merge(m, src)
 }
 func (m *MonitoredResource) XXX_Size() int {
 	return xxx_messageInfo_MonitoredResource.Size(m)
@@ -211,16 +216,17 @@ func (m *MonitoredResourceMetadata) Reset()         { *m = MonitoredResourceMeta
 func (m *MonitoredResourceMetadata) String() string { return proto.CompactTextString(m) }
 func (*MonitoredResourceMetadata) ProtoMessage()    {}
 func (*MonitoredResourceMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_monitored_resource_d0f80e27b3474083, []int{2}
+	return fileDescriptor_6cd8bd738b08f2bf, []int{2}
 }
+
 func (m *MonitoredResourceMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MonitoredResourceMetadata.Unmarshal(m, b)
 }
 func (m *MonitoredResourceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MonitoredResourceMetadata.Marshal(b, m, deterministic)
 }
-func (dst *MonitoredResourceMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MonitoredResourceMetadata.Merge(dst, src)
+func (m *MonitoredResourceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MonitoredResourceMetadata.Merge(m, src)
 }
 func (m *MonitoredResourceMetadata) XXX_Size() int {
 	return xxx_messageInfo_MonitoredResourceMetadata.Size(m)
@@ -254,10 +260,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/monitored_resource.proto", fileDescriptor_monitored_resource_d0f80e27b3474083)
+	proto.RegisterFile("google/api/monitored_resource.proto", fileDescriptor_6cd8bd738b08f2bf)
 }
 
-var fileDescriptor_monitored_resource_d0f80e27b3474083 = []byte{
+var fileDescriptor_6cd8bd738b08f2bf = []byte{
 	// 415 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0xab, 0xd3, 0x40,
 	0x14, 0x65, 0xd2, 0x0f, 0xf0, 0xa6, 0x7e, 0x0d, 0x52, 0x63, 0xea, 0xa2, 0xd6, 0x4d, 0xdd, 0x24,
diff --git a/googleapis/api/serviceconfig/auth.pb.go b/googleapis/api/serviceconfig/auth.pb.go
index 4cac698439..bfc83df3f2 100644
--- a/googleapis/api/serviceconfig/auth.pb.go
+++ b/googleapis/api/serviceconfig/auth.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/auth.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `Authentication` defines the authentication configuration for an API.
 //
@@ -48,16 +51,17 @@ func (m *Authentication) Reset()         { *m = Authentication{} }
 func (m *Authentication) String() string { return proto.CompactTextString(m) }
 func (*Authentication) ProtoMessage()    {}
 func (*Authentication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_20a218c05ef5a30e, []int{0}
+	return fileDescriptor_d6570d3c90e2b8ac, []int{0}
 }
+
 func (m *Authentication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Authentication.Unmarshal(m, b)
 }
 func (m *Authentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Authentication.Marshal(b, m, deterministic)
 }
-func (dst *Authentication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Authentication.Merge(dst, src)
+func (m *Authentication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Authentication.Merge(m, src)
 }
 func (m *Authentication) XXX_Size() int {
 	return xxx_messageInfo_Authentication.Size(m)
@@ -111,16 +115,17 @@ func (m *AuthenticationRule) Reset()         { *m = AuthenticationRule{} }
 func (m *AuthenticationRule) String() string { return proto.CompactTextString(m) }
 func (*AuthenticationRule) ProtoMessage()    {}
 func (*AuthenticationRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_20a218c05ef5a30e, []int{1}
+	return fileDescriptor_d6570d3c90e2b8ac, []int{1}
 }
+
 func (m *AuthenticationRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthenticationRule.Unmarshal(m, b)
 }
 func (m *AuthenticationRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthenticationRule.Marshal(b, m, deterministic)
 }
-func (dst *AuthenticationRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthenticationRule.Merge(dst, src)
+func (m *AuthenticationRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthenticationRule.Merge(m, src)
 }
 func (m *AuthenticationRule) XXX_Size() int {
 	return xxx_messageInfo_AuthenticationRule.Size(m)
@@ -214,16 +219,17 @@ func (m *AuthProvider) Reset()         { *m = AuthProvider{} }
 func (m *AuthProvider) String() string { return proto.CompactTextString(m) }
 func (*AuthProvider) ProtoMessage()    {}
 func (*AuthProvider) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_20a218c05ef5a30e, []int{2}
+	return fileDescriptor_d6570d3c90e2b8ac, []int{2}
 }
+
 func (m *AuthProvider) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthProvider.Unmarshal(m, b)
 }
 func (m *AuthProvider) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthProvider.Marshal(b, m, deterministic)
 }
-func (dst *AuthProvider) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthProvider.Merge(dst, src)
+func (m *AuthProvider) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthProvider.Merge(m, src)
 }
 func (m *AuthProvider) XXX_Size() int {
 	return xxx_messageInfo_AuthProvider.Size(m)
@@ -305,16 +311,17 @@ func (m *OAuthRequirements) Reset()         { *m = OAuthRequirements{} }
 func (m *OAuthRequirements) String() string { return proto.CompactTextString(m) }
 func (*OAuthRequirements) ProtoMessage()    {}
 func (*OAuthRequirements) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_20a218c05ef5a30e, []int{3}
+	return fileDescriptor_d6570d3c90e2b8ac, []int{3}
 }
+
 func (m *OAuthRequirements) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OAuthRequirements.Unmarshal(m, b)
 }
 func (m *OAuthRequirements) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OAuthRequirements.Marshal(b, m, deterministic)
 }
-func (dst *OAuthRequirements) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OAuthRequirements.Merge(dst, src)
+func (m *OAuthRequirements) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OAuthRequirements.Merge(m, src)
 }
 func (m *OAuthRequirements) XXX_Size() int {
 	return xxx_messageInfo_OAuthRequirements.Size(m)
@@ -368,16 +375,17 @@ func (m *AuthRequirement) Reset()         { *m = AuthRequirement{} }
 func (m *AuthRequirement) String() string { return proto.CompactTextString(m) }
 func (*AuthRequirement) ProtoMessage()    {}
 func (*AuthRequirement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_20a218c05ef5a30e, []int{4}
+	return fileDescriptor_d6570d3c90e2b8ac, []int{4}
 }
+
 func (m *AuthRequirement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthRequirement.Unmarshal(m, b)
 }
 func (m *AuthRequirement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthRequirement.Marshal(b, m, deterministic)
 }
-func (dst *AuthRequirement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthRequirement.Merge(dst, src)
+func (m *AuthRequirement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthRequirement.Merge(m, src)
 }
 func (m *AuthRequirement) XXX_Size() int {
 	return xxx_messageInfo_AuthRequirement.Size(m)
@@ -410,9 +418,9 @@ func init() {
 	proto.RegisterType((*AuthRequirement)(nil), "google.api.AuthRequirement")
 }
 
-func init() { proto.RegisterFile("google/api/auth.proto", fileDescriptor_auth_20a218c05ef5a30e) }
+func init() { proto.RegisterFile("google/api/auth.proto", fileDescriptor_d6570d3c90e2b8ac) }
 
-var fileDescriptor_auth_20a218c05ef5a30e = []byte{
+var fileDescriptor_d6570d3c90e2b8ac = []byte{
 	// 452 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0x4d, 0x6b, 0xdb, 0x40,
 	0x10, 0x45, 0x72, 0x9c, 0x58, 0xe3, 0xe0, 0x24, 0x0b, 0x0d, 0xea, 0xb7, 0xd1, 0xc9, 0xa5, 0x20,
diff --git a/googleapis/api/serviceconfig/backend.pb.go b/googleapis/api/serviceconfig/backend.pb.go
index 1d24457564..429d7ab774 100644
--- a/googleapis/api/serviceconfig/backend.pb.go
+++ b/googleapis/api/serviceconfig/backend.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/backend.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Path Translation specifies how to combine the backend address with the
 // request path in order to produce the appropriate forwarding URL for the
@@ -80,6 +83,7 @@ var BackendRule_PathTranslation_name = map[int32]string{
 	1: "CONSTANT_ADDRESS",
 	2: "APPEND_PATH_TO_ADDRESS",
 }
+
 var BackendRule_PathTranslation_value = map[string]int32{
 	"PATH_TRANSLATION_UNSPECIFIED": 0,
 	"CONSTANT_ADDRESS":             1,
@@ -89,8 +93,9 @@ var BackendRule_PathTranslation_value = map[string]int32{
 func (x BackendRule_PathTranslation) String() string {
 	return proto.EnumName(BackendRule_PathTranslation_name, int32(x))
 }
+
 func (BackendRule_PathTranslation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_backend_151dd2805952955b, []int{1, 0}
+	return fileDescriptor_87d0f28daa3f64f0, []int{1, 0}
 }
 
 // `Backend` defines the backend configuration for a service.
@@ -108,16 +113,17 @@ func (m *Backend) Reset()         { *m = Backend{} }
 func (m *Backend) String() string { return proto.CompactTextString(m) }
 func (*Backend) ProtoMessage()    {}
 func (*Backend) Descriptor() ([]byte, []int) {
-	return fileDescriptor_backend_151dd2805952955b, []int{0}
+	return fileDescriptor_87d0f28daa3f64f0, []int{0}
 }
+
 func (m *Backend) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Backend.Unmarshal(m, b)
 }
 func (m *Backend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Backend.Marshal(b, m, deterministic)
 }
-func (dst *Backend) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Backend.Merge(dst, src)
+func (m *Backend) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Backend.Merge(m, src)
 }
 func (m *Backend) XXX_Size() int {
 	return xxx_messageInfo_Backend.Size(m)
@@ -174,16 +180,17 @@ func (m *BackendRule) Reset()         { *m = BackendRule{} }
 func (m *BackendRule) String() string { return proto.CompactTextString(m) }
 func (*BackendRule) ProtoMessage()    {}
 func (*BackendRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_backend_151dd2805952955b, []int{1}
+	return fileDescriptor_87d0f28daa3f64f0, []int{1}
 }
+
 func (m *BackendRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BackendRule.Unmarshal(m, b)
 }
 func (m *BackendRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BackendRule.Marshal(b, m, deterministic)
 }
-func (dst *BackendRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BackendRule.Merge(dst, src)
+func (m *BackendRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BackendRule.Merge(m, src)
 }
 func (m *BackendRule) XXX_Size() int {
 	return xxx_messageInfo_BackendRule.Size(m)
@@ -260,66 +267,22 @@ func (m *BackendRule) GetJwtAudience() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BackendRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BackendRule_OneofMarshaler, _BackendRule_OneofUnmarshaler, _BackendRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BackendRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BackendRule_JwtAudience)(nil),
 	}
 }
 
-func _BackendRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BackendRule)
-	// authentication
-	switch x := m.Authentication.(type) {
-	case *BackendRule_JwtAudience:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.JwtAudience)
-	case nil:
-	default:
-		return fmt.Errorf("BackendRule.Authentication has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BackendRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BackendRule)
-	switch tag {
-	case 7: // authentication.jwt_audience
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Authentication = &BackendRule_JwtAudience{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BackendRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BackendRule)
-	// authentication
-	switch x := m.Authentication.(type) {
-	case *BackendRule_JwtAudience:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.JwtAudience)))
-		n += len(x.JwtAudience)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.api.BackendRule_PathTranslation", BackendRule_PathTranslation_name, BackendRule_PathTranslation_value)
 	proto.RegisterType((*Backend)(nil), "google.api.Backend")
 	proto.RegisterType((*BackendRule)(nil), "google.api.BackendRule")
-	proto.RegisterEnum("google.api.BackendRule_PathTranslation", BackendRule_PathTranslation_name, BackendRule_PathTranslation_value)
 }
 
-func init() { proto.RegisterFile("google/api/backend.proto", fileDescriptor_backend_151dd2805952955b) }
+func init() { proto.RegisterFile("google/api/backend.proto", fileDescriptor_87d0f28daa3f64f0) }
 
-var fileDescriptor_backend_151dd2805952955b = []byte{
+var fileDescriptor_87d0f28daa3f64f0 = []byte{
 	// 408 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0x97, 0x76, 0x5b, 0xe1, 0xb5, 0xea, 0x82, 0x85, 0x20, 0x9a, 0x38, 0x84, 0x72, 0xa0,
diff --git a/googleapis/api/serviceconfig/billing.pb.go b/googleapis/api/serviceconfig/billing.pb.go
index 82b0f686a2..ad6f3f3c4e 100644
--- a/googleapis/api/serviceconfig/billing.pb.go
+++ b/googleapis/api/serviceconfig/billing.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/billing.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/metric"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/metric"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Billing related configuration of the service.
 //
@@ -55,16 +58,17 @@ func (m *Billing) Reset()         { *m = Billing{} }
 func (m *Billing) String() string { return proto.CompactTextString(m) }
 func (*Billing) ProtoMessage()    {}
 func (*Billing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_7a62f78f020eadae, []int{0}
+	return fileDescriptor_21f14814cad56ddb, []int{0}
 }
+
 func (m *Billing) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Billing.Unmarshal(m, b)
 }
 func (m *Billing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Billing.Marshal(b, m, deterministic)
 }
-func (dst *Billing) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Billing.Merge(dst, src)
+func (m *Billing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Billing.Merge(m, src)
 }
 func (m *Billing) XXX_Size() int {
 	return xxx_messageInfo_Billing.Size(m)
@@ -100,16 +104,17 @@ func (m *Billing_BillingDestination) Reset()         { *m = Billing_BillingDesti
 func (m *Billing_BillingDestination) String() string { return proto.CompactTextString(m) }
 func (*Billing_BillingDestination) ProtoMessage()    {}
 func (*Billing_BillingDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_billing_7a62f78f020eadae, []int{0, 0}
+	return fileDescriptor_21f14814cad56ddb, []int{0, 0}
 }
+
 func (m *Billing_BillingDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Billing_BillingDestination.Unmarshal(m, b)
 }
 func (m *Billing_BillingDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Billing_BillingDestination.Marshal(b, m, deterministic)
 }
-func (dst *Billing_BillingDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Billing_BillingDestination.Merge(dst, src)
+func (m *Billing_BillingDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Billing_BillingDestination.Merge(m, src)
 }
 func (m *Billing_BillingDestination) XXX_Size() int {
 	return xxx_messageInfo_Billing_BillingDestination.Size(m)
@@ -139,9 +144,9 @@ func init() {
 	proto.RegisterType((*Billing_BillingDestination)(nil), "google.api.Billing.BillingDestination")
 }
 
-func init() { proto.RegisterFile("google/api/billing.proto", fileDescriptor_billing_7a62f78f020eadae) }
+func init() { proto.RegisterFile("google/api/billing.proto", fileDescriptor_21f14814cad56ddb) }
 
-var fileDescriptor_billing_7a62f78f020eadae = []byte{
+var fileDescriptor_21f14814cad56ddb = []byte{
 	// 255 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xc1, 0x4a, 0xc4, 0x30,
 	0x10, 0x86, 0xe9, 0xae, 0xb8, 0x6e, 0x14, 0xc1, 0xa0, 0x18, 0xf6, 0x54, 0x3c, 0x48, 0x2f, 0xa6,
diff --git a/googleapis/api/serviceconfig/consumer.pb.go b/googleapis/api/serviceconfig/consumer.pb.go
index 9d8ddebab9..455f2b63b3 100644
--- a/googleapis/api/serviceconfig/consumer.pb.go
+++ b/googleapis/api/serviceconfig/consumer.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/consumer.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Supported data type of the property values
 type Property_PropertyType int32
@@ -41,6 +44,7 @@ var Property_PropertyType_name = map[int32]string{
 	3: "STRING",
 	4: "DOUBLE",
 }
+
 var Property_PropertyType_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"INT64":       1,
@@ -52,8 +56,9 @@ var Property_PropertyType_value = map[string]int32{
 func (x Property_PropertyType) String() string {
 	return proto.EnumName(Property_PropertyType_name, int32(x))
 }
+
 func (Property_PropertyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_consumer_bc35b863b20645b4, []int{1, 0}
+	return fileDescriptor_bec5e69370b3104e, []int{1, 0}
 }
 
 // A descriptor for defining project properties for a service. One service may
@@ -84,16 +89,17 @@ func (m *ProjectProperties) Reset()         { *m = ProjectProperties{} }
 func (m *ProjectProperties) String() string { return proto.CompactTextString(m) }
 func (*ProjectProperties) ProtoMessage()    {}
 func (*ProjectProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_consumer_bc35b863b20645b4, []int{0}
+	return fileDescriptor_bec5e69370b3104e, []int{0}
 }
+
 func (m *ProjectProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProjectProperties.Unmarshal(m, b)
 }
 func (m *ProjectProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProjectProperties.Marshal(b, m, deterministic)
 }
-func (dst *ProjectProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProjectProperties.Merge(dst, src)
+func (m *ProjectProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectProperties.Merge(m, src)
 }
 func (m *ProjectProperties) XXX_Size() int {
 	return xxx_messageInfo_ProjectProperties.Size(m)
@@ -137,16 +143,17 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_consumer_bc35b863b20645b4, []int{1}
+	return fileDescriptor_bec5e69370b3104e, []int{1}
 }
+
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(dst, src)
+func (m *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(m, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -179,14 +186,14 @@ func (m *Property) GetDescription() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.Property_PropertyType", Property_PropertyType_name, Property_PropertyType_value)
 	proto.RegisterType((*ProjectProperties)(nil), "google.api.ProjectProperties")
 	proto.RegisterType((*Property)(nil), "google.api.Property")
-	proto.RegisterEnum("google.api.Property_PropertyType", Property_PropertyType_name, Property_PropertyType_value)
 }
 
-func init() { proto.RegisterFile("google/api/consumer.proto", fileDescriptor_consumer_bc35b863b20645b4) }
+func init() { proto.RegisterFile("google/api/consumer.proto", fileDescriptor_bec5e69370b3104e) }
 
-var fileDescriptor_consumer_bc35b863b20645b4 = []byte{
+var fileDescriptor_bec5e69370b3104e = []byte{
 	// 299 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x4f, 0xf2, 0x40,
 	0x10, 0xc6, 0xdf, 0x85, 0xbe, 0x04, 0x06, 0xc5, 0xba, 0xf1, 0x50, 0x6f, 0x95, 0x13, 0xa7, 0x36,
diff --git a/googleapis/api/serviceconfig/context.pb.go b/googleapis/api/serviceconfig/context.pb.go
index d5f20ff677..c68fe1064d 100644
--- a/googleapis/api/serviceconfig/context.pb.go
+++ b/googleapis/api/serviceconfig/context.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/context.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `Context` defines which contexts an API requests.
 //
@@ -68,16 +71,17 @@ func (m *Context) Reset()         { *m = Context{} }
 func (m *Context) String() string { return proto.CompactTextString(m) }
 func (*Context) ProtoMessage()    {}
 func (*Context) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_51b0254c3aab83a4, []int{0}
+	return fileDescriptor_48d8be90143bd46c, []int{0}
 }
+
 func (m *Context) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Context.Unmarshal(m, b)
 }
 func (m *Context) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Context.Marshal(b, m, deterministic)
 }
-func (dst *Context) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Context.Merge(dst, src)
+func (m *Context) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Context.Merge(m, src)
 }
 func (m *Context) XXX_Size() int {
 	return xxx_messageInfo_Context.Size(m)
@@ -121,16 +125,17 @@ func (m *ContextRule) Reset()         { *m = ContextRule{} }
 func (m *ContextRule) String() string { return proto.CompactTextString(m) }
 func (*ContextRule) ProtoMessage()    {}
 func (*ContextRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_51b0254c3aab83a4, []int{1}
+	return fileDescriptor_48d8be90143bd46c, []int{1}
 }
+
 func (m *ContextRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContextRule.Unmarshal(m, b)
 }
 func (m *ContextRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContextRule.Marshal(b, m, deterministic)
 }
-func (dst *ContextRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContextRule.Merge(dst, src)
+func (m *ContextRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContextRule.Merge(m, src)
 }
 func (m *ContextRule) XXX_Size() int {
 	return xxx_messageInfo_ContextRule.Size(m)
@@ -181,9 +186,9 @@ func init() {
 	proto.RegisterType((*ContextRule)(nil), "google.api.ContextRule")
 }
 
-func init() { proto.RegisterFile("google/api/context.proto", fileDescriptor_context_51b0254c3aab83a4) }
+func init() { proto.RegisterFile("google/api/context.proto", fileDescriptor_48d8be90143bd46c) }
 
-var fileDescriptor_context_51b0254c3aab83a4 = []byte{
+var fileDescriptor_48d8be90143bd46c = []byte{
 	// 281 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xbd, 0x4e, 0xc3, 0x30,
 	0x10, 0x80, 0x95, 0xfe, 0x00, 0x71, 0x11, 0x83, 0x17, 0x4c, 0x61, 0x88, 0x3a, 0x65, 0x21, 0x91,
diff --git a/googleapis/api/serviceconfig/control.pb.go b/googleapis/api/serviceconfig/control.pb.go
index fc9ddd8617..55128eebc0 100644
--- a/googleapis/api/serviceconfig/control.pb.go
+++ b/googleapis/api/serviceconfig/control.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/control.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Selects and configures the service controller used by the service.  The
 // service controller handles features like abuse, quota, billing, logging,
@@ -34,16 +37,17 @@ func (m *Control) Reset()         { *m = Control{} }
 func (m *Control) String() string { return proto.CompactTextString(m) }
 func (*Control) ProtoMessage()    {}
 func (*Control) Descriptor() ([]byte, []int) {
-	return fileDescriptor_control_6bbb3be1ecc58ed7, []int{0}
+	return fileDescriptor_74b55b5694b7f0a5, []int{0}
 }
+
 func (m *Control) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Control.Unmarshal(m, b)
 }
 func (m *Control) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Control.Marshal(b, m, deterministic)
 }
-func (dst *Control) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Control.Merge(dst, src)
+func (m *Control) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Control.Merge(m, src)
 }
 func (m *Control) XXX_Size() int {
 	return xxx_messageInfo_Control.Size(m)
@@ -65,9 +69,9 @@ func init() {
 	proto.RegisterType((*Control)(nil), "google.api.Control")
 }
 
-func init() { proto.RegisterFile("google/api/control.proto", fileDescriptor_control_6bbb3be1ecc58ed7) }
+func init() { proto.RegisterFile("google/api/control.proto", fileDescriptor_74b55b5694b7f0a5) }
 
-var fileDescriptor_control_6bbb3be1ecc58ed7 = []byte{
+var fileDescriptor_74b55b5694b7f0a5 = []byte{
 	// 165 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0xca, 0xcf, 0xd1, 0x2b,
diff --git a/googleapis/api/serviceconfig/documentation.pb.go b/googleapis/api/serviceconfig/documentation.pb.go
index 7ee6156928..7fcc05e66c 100644
--- a/googleapis/api/serviceconfig/documentation.pb.go
+++ b/googleapis/api/serviceconfig/documentation.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/documentation.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `Documentation` provides the information for describing a service.
 //
@@ -108,16 +111,17 @@ func (m *Documentation) Reset()         { *m = Documentation{} }
 func (m *Documentation) String() string { return proto.CompactTextString(m) }
 func (*Documentation) ProtoMessage()    {}
 func (*Documentation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_documentation_c22025712f3af31e, []int{0}
+	return fileDescriptor_dead24b587ac0742, []int{0}
 }
+
 func (m *Documentation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Documentation.Unmarshal(m, b)
 }
 func (m *Documentation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Documentation.Marshal(b, m, deterministic)
 }
-func (dst *Documentation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Documentation.Merge(dst, src)
+func (m *Documentation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Documentation.Merge(m, src)
 }
 func (m *Documentation) XXX_Size() int {
 	return xxx_messageInfo_Documentation.Size(m)
@@ -186,16 +190,17 @@ func (m *DocumentationRule) Reset()         { *m = DocumentationRule{} }
 func (m *DocumentationRule) String() string { return proto.CompactTextString(m) }
 func (*DocumentationRule) ProtoMessage()    {}
 func (*DocumentationRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_documentation_c22025712f3af31e, []int{1}
+	return fileDescriptor_dead24b587ac0742, []int{1}
 }
+
 func (m *DocumentationRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentationRule.Unmarshal(m, b)
 }
 func (m *DocumentationRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentationRule.Marshal(b, m, deterministic)
 }
-func (dst *DocumentationRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentationRule.Merge(dst, src)
+func (m *DocumentationRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentationRule.Merge(m, src)
 }
 func (m *DocumentationRule) XXX_Size() int {
 	return xxx_messageInfo_DocumentationRule.Size(m)
@@ -260,16 +265,17 @@ func (m *Page) Reset()         { *m = Page{} }
 func (m *Page) String() string { return proto.CompactTextString(m) }
 func (*Page) ProtoMessage()    {}
 func (*Page) Descriptor() ([]byte, []int) {
-	return fileDescriptor_documentation_c22025712f3af31e, []int{2}
+	return fileDescriptor_dead24b587ac0742, []int{2}
 }
+
 func (m *Page) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Page.Unmarshal(m, b)
 }
 func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
 }
-func (dst *Page) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Page.Merge(dst, src)
+func (m *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(m, src)
 }
 func (m *Page) XXX_Size() int {
 	return xxx_messageInfo_Page.Size(m)
@@ -307,11 +313,9 @@ func init() {
 	proto.RegisterType((*Page)(nil), "google.api.Page")
 }
 
-func init() {
-	proto.RegisterFile("google/api/documentation.proto", fileDescriptor_documentation_c22025712f3af31e)
-}
+func init() { proto.RegisterFile("google/api/documentation.proto", fileDescriptor_dead24b587ac0742) }
 
-var fileDescriptor_documentation_c22025712f3af31e = []byte{
+var fileDescriptor_dead24b587ac0742 = []byte{
 	// 356 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xc1, 0x6a, 0xe3, 0x30,
 	0x14, 0x45, 0x71, 0xec, 0xcc, 0x64, 0x5e, 0x98, 0x61, 0x46, 0x0c, 0x19, 0x33, 0xd0, 0x12, 0xb2,
diff --git a/googleapis/api/serviceconfig/endpoint.pb.go b/googleapis/api/serviceconfig/endpoint.pb.go
index 230b2e0714..3936697514 100644
--- a/googleapis/api/serviceconfig/endpoint.pb.go
+++ b/googleapis/api/serviceconfig/endpoint.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/endpoint.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `Endpoint` describes a network endpoint that serves a set of APIs.
 // A service may expose any number of endpoints, and all endpoints share the
@@ -67,16 +70,17 @@ func (m *Endpoint) Reset()         { *m = Endpoint{} }
 func (m *Endpoint) String() string { return proto.CompactTextString(m) }
 func (*Endpoint) ProtoMessage()    {}
 func (*Endpoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_endpoint_134b6a0db7c4f443, []int{0}
+	return fileDescriptor_ee48cbc4cc013456, []int{0}
 }
+
 func (m *Endpoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Endpoint.Unmarshal(m, b)
 }
 func (m *Endpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Endpoint.Marshal(b, m, deterministic)
 }
-func (dst *Endpoint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Endpoint.Merge(dst, src)
+func (m *Endpoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Endpoint.Merge(m, src)
 }
 func (m *Endpoint) XXX_Size() int {
 	return xxx_messageInfo_Endpoint.Size(m)
@@ -127,9 +131,9 @@ func init() {
 	proto.RegisterType((*Endpoint)(nil), "google.api.Endpoint")
 }
 
-func init() { proto.RegisterFile("google/api/endpoint.proto", fileDescriptor_endpoint_134b6a0db7c4f443) }
+func init() { proto.RegisterFile("google/api/endpoint.proto", fileDescriptor_ee48cbc4cc013456) }
 
-var fileDescriptor_endpoint_134b6a0db7c4f443 = []byte{
+var fileDescriptor_ee48cbc4cc013456 = []byte{
 	// 236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0xc1, 0x4a, 0xc4, 0x30,
 	0x10, 0x86, 0x49, 0xad, 0x6b, 0x3b, 0xa0, 0x87, 0x1c, 0x24, 0x8a, 0x42, 0xf1, 0xd4, 0x53, 0x7b,
diff --git a/googleapis/api/serviceconfig/log.pb.go b/googleapis/api/serviceconfig/log.pb.go
index c19f6cf72d..378109f93b 100644
--- a/googleapis/api/serviceconfig/log.pb.go
+++ b/googleapis/api/serviceconfig/log.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/log.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import label "google.golang.org/genproto/googleapis/api/label"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	label "google.golang.org/genproto/googleapis/api/label"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A description of a log type. Example in YAML format:
 //
@@ -52,16 +55,17 @@ func (m *LogDescriptor) Reset()         { *m = LogDescriptor{} }
 func (m *LogDescriptor) String() string { return proto.CompactTextString(m) }
 func (*LogDescriptor) ProtoMessage()    {}
 func (*LogDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_log_0e93d42992290c09, []int{0}
+	return fileDescriptor_6010a88b9216062d, []int{0}
 }
+
 func (m *LogDescriptor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogDescriptor.Unmarshal(m, b)
 }
 func (m *LogDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogDescriptor.Marshal(b, m, deterministic)
 }
-func (dst *LogDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogDescriptor.Merge(dst, src)
+func (m *LogDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogDescriptor.Merge(m, src)
 }
 func (m *LogDescriptor) XXX_Size() int {
 	return xxx_messageInfo_LogDescriptor.Size(m)
@@ -104,9 +108,9 @@ func init() {
 	proto.RegisterType((*LogDescriptor)(nil), "google.api.LogDescriptor")
 }
 
-func init() { proto.RegisterFile("google/api/log.proto", fileDescriptor_log_0e93d42992290c09) }
+func init() { proto.RegisterFile("google/api/log.proto", fileDescriptor_6010a88b9216062d) }
 
-var fileDescriptor_log_0e93d42992290c09 = []byte{
+var fileDescriptor_6010a88b9216062d = []byte{
 	// 238 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0xc1, 0x4a, 0xc3, 0x40,
 	0x10, 0x86, 0x49, 0x1b, 0x8a, 0x6e, 0xd5, 0xc3, 0x22, 0x12, 0xf4, 0x12, 0x3d, 0xf5, 0xb4, 0x01,
diff --git a/googleapis/api/serviceconfig/logging.pb.go b/googleapis/api/serviceconfig/logging.pb.go
index 88bd8927de..1d81b4770f 100644
--- a/googleapis/api/serviceconfig/logging.pb.go
+++ b/googleapis/api/serviceconfig/logging.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/logging.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Logging configuration of the service.
 //
@@ -67,16 +70,17 @@ func (m *Logging) Reset()         { *m = Logging{} }
 func (m *Logging) String() string { return proto.CompactTextString(m) }
 func (*Logging) ProtoMessage()    {}
 func (*Logging) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_72dc980851656a75, []int{0}
+	return fileDescriptor_9505b080db6dcefe, []int{0}
 }
+
 func (m *Logging) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Logging.Unmarshal(m, b)
 }
 func (m *Logging) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Logging.Marshal(b, m, deterministic)
 }
-func (dst *Logging) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Logging.Merge(dst, src)
+func (m *Logging) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Logging.Merge(m, src)
 }
 func (m *Logging) XXX_Size() int {
 	return xxx_messageInfo_Logging.Size(m)
@@ -121,16 +125,17 @@ func (m *Logging_LoggingDestination) Reset()         { *m = Logging_LoggingDesti
 func (m *Logging_LoggingDestination) String() string { return proto.CompactTextString(m) }
 func (*Logging_LoggingDestination) ProtoMessage()    {}
 func (*Logging_LoggingDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_72dc980851656a75, []int{0, 0}
+	return fileDescriptor_9505b080db6dcefe, []int{0, 0}
 }
+
 func (m *Logging_LoggingDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Logging_LoggingDestination.Unmarshal(m, b)
 }
 func (m *Logging_LoggingDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Logging_LoggingDestination.Marshal(b, m, deterministic)
 }
-func (dst *Logging_LoggingDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Logging_LoggingDestination.Merge(dst, src)
+func (m *Logging_LoggingDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Logging_LoggingDestination.Merge(m, src)
 }
 func (m *Logging_LoggingDestination) XXX_Size() int {
 	return xxx_messageInfo_Logging_LoggingDestination.Size(m)
@@ -160,9 +165,9 @@ func init() {
 	proto.RegisterType((*Logging_LoggingDestination)(nil), "google.api.Logging.LoggingDestination")
 }
 
-func init() { proto.RegisterFile("google/api/logging.proto", fileDescriptor_logging_72dc980851656a75) }
+func init() { proto.RegisterFile("google/api/logging.proto", fileDescriptor_9505b080db6dcefe) }
 
-var fileDescriptor_logging_72dc980851656a75 = []byte{
+var fileDescriptor_9505b080db6dcefe = []byte{
 	// 260 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0x4d, 0x4b, 0xc4, 0x30,
 	0x10, 0x86, 0x69, 0x77, 0x51, 0x36, 0x8a, 0x60, 0x50, 0x28, 0x9e, 0x16, 0x0f, 0xb2, 0x17, 0x53,
diff --git a/googleapis/api/serviceconfig/monitoring.pb.go b/googleapis/api/serviceconfig/monitoring.pb.go
index 4baad4a72e..fe74ef965b 100644
--- a/googleapis/api/serviceconfig/monitoring.pb.go
+++ b/googleapis/api/serviceconfig/monitoring.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/monitoring.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Monitoring configuration of the service.
 //
@@ -79,16 +82,17 @@ func (m *Monitoring) Reset()         { *m = Monitoring{} }
 func (m *Monitoring) String() string { return proto.CompactTextString(m) }
 func (*Monitoring) ProtoMessage()    {}
 func (*Monitoring) Descriptor() ([]byte, []int) {
-	return fileDescriptor_monitoring_bee01dc8a7135913, []int{0}
+	return fileDescriptor_6e2076230a37a7e3, []int{0}
 }
+
 func (m *Monitoring) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Monitoring.Unmarshal(m, b)
 }
 func (m *Monitoring) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Monitoring.Marshal(b, m, deterministic)
 }
-func (dst *Monitoring) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Monitoring.Merge(dst, src)
+func (m *Monitoring) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Monitoring.Merge(m, src)
 }
 func (m *Monitoring) XXX_Size() int {
 	return xxx_messageInfo_Monitoring.Size(m)
@@ -131,16 +135,17 @@ func (m *Monitoring_MonitoringDestination) Reset()         { *m = Monitoring_Mon
 func (m *Monitoring_MonitoringDestination) String() string { return proto.CompactTextString(m) }
 func (*Monitoring_MonitoringDestination) ProtoMessage()    {}
 func (*Monitoring_MonitoringDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_monitoring_bee01dc8a7135913, []int{0, 0}
+	return fileDescriptor_6e2076230a37a7e3, []int{0, 0}
 }
+
 func (m *Monitoring_MonitoringDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Monitoring_MonitoringDestination.Unmarshal(m, b)
 }
 func (m *Monitoring_MonitoringDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Monitoring_MonitoringDestination.Marshal(b, m, deterministic)
 }
-func (dst *Monitoring_MonitoringDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Monitoring_MonitoringDestination.Merge(dst, src)
+func (m *Monitoring_MonitoringDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Monitoring_MonitoringDestination.Merge(m, src)
 }
 func (m *Monitoring_MonitoringDestination) XXX_Size() int {
 	return xxx_messageInfo_Monitoring_MonitoringDestination.Size(m)
@@ -170,11 +175,9 @@ func init() {
 	proto.RegisterType((*Monitoring_MonitoringDestination)(nil), "google.api.Monitoring.MonitoringDestination")
 }
 
-func init() {
-	proto.RegisterFile("google/api/monitoring.proto", fileDescriptor_monitoring_bee01dc8a7135913)
-}
+func init() { proto.RegisterFile("google/api/monitoring.proto", fileDescriptor_6e2076230a37a7e3) }
 
-var fileDescriptor_monitoring_bee01dc8a7135913 = []byte{
+var fileDescriptor_6e2076230a37a7e3 = []byte{
 	// 263 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0xcf, 0x4a, 0xc4, 0x30,
 	0x10, 0xc6, 0xe9, 0x2a, 0xca, 0x46, 0x50, 0x0c, 0x2e, 0x14, 0xbd, 0x2c, 0x9e, 0xf6, 0xa0, 0x29,
diff --git a/googleapis/api/serviceconfig/quota.pb.go b/googleapis/api/serviceconfig/quota.pb.go
index 945801dbfa..ca0ba5ebd1 100644
--- a/googleapis/api/serviceconfig/quota.pb.go
+++ b/googleapis/api/serviceconfig/quota.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/quota.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Quota configuration helps to achieve fairness and budgeting in service
 // usage.
@@ -84,16 +87,17 @@ func (m *Quota) Reset()         { *m = Quota{} }
 func (m *Quota) String() string { return proto.CompactTextString(m) }
 func (*Quota) ProtoMessage()    {}
 func (*Quota) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_129273d1f869e90d, []int{0}
+	return fileDescriptor_6822ef0454b3845a, []int{0}
 }
+
 func (m *Quota) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Quota.Unmarshal(m, b)
 }
 func (m *Quota) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Quota.Marshal(b, m, deterministic)
 }
-func (dst *Quota) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Quota.Merge(dst, src)
+func (m *Quota) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Quota.Merge(m, src)
 }
 func (m *Quota) XXX_Size() int {
 	return xxx_messageInfo_Quota.Size(m)
@@ -141,16 +145,17 @@ func (m *MetricRule) Reset()         { *m = MetricRule{} }
 func (m *MetricRule) String() string { return proto.CompactTextString(m) }
 func (*MetricRule) ProtoMessage()    {}
 func (*MetricRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_129273d1f869e90d, []int{1}
+	return fileDescriptor_6822ef0454b3845a, []int{1}
 }
+
 func (m *MetricRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MetricRule.Unmarshal(m, b)
 }
 func (m *MetricRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MetricRule.Marshal(b, m, deterministic)
 }
-func (dst *MetricRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricRule.Merge(dst, src)
+func (m *MetricRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricRule.Merge(m, src)
 }
 func (m *MetricRule) XXX_Size() int {
 	return xxx_messageInfo_MetricRule.Size(m)
@@ -259,16 +264,17 @@ func (m *QuotaLimit) Reset()         { *m = QuotaLimit{} }
 func (m *QuotaLimit) String() string { return proto.CompactTextString(m) }
 func (*QuotaLimit) ProtoMessage()    {}
 func (*QuotaLimit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_129273d1f869e90d, []int{2}
+	return fileDescriptor_6822ef0454b3845a, []int{2}
 }
+
 func (m *QuotaLimit) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuotaLimit.Unmarshal(m, b)
 }
 func (m *QuotaLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuotaLimit.Marshal(b, m, deterministic)
 }
-func (dst *QuotaLimit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuotaLimit.Merge(dst, src)
+func (m *QuotaLimit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaLimit.Merge(m, src)
 }
 func (m *QuotaLimit) XXX_Size() int {
 	return xxx_messageInfo_QuotaLimit.Size(m)
@@ -357,9 +363,9 @@ func init() {
 	proto.RegisterMapType((map[string]int64)(nil), "google.api.QuotaLimit.ValuesEntry")
 }
 
-func init() { proto.RegisterFile("google/api/quota.proto", fileDescriptor_quota_129273d1f869e90d) }
+func init() { proto.RegisterFile("google/api/quota.proto", fileDescriptor_6822ef0454b3845a) }
 
-var fileDescriptor_quota_129273d1f869e90d = []byte{
+var fileDescriptor_6822ef0454b3845a = []byte{
 	// 453 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x8e, 0xd3, 0x30,
 	0x10, 0x55, 0x9a, 0x6e, 0x68, 0xa7, 0x05, 0xad, 0x2c, 0x54, 0x59, 0xe5, 0x52, 0xca, 0x81, 0x9e,
diff --git a/googleapis/api/serviceconfig/service.pb.go b/googleapis/api/serviceconfig/service.pb.go
index 66e49ceb87..e41c0a4460 100644
--- a/googleapis/api/serviceconfig/service.pb.go
+++ b/googleapis/api/serviceconfig/service.pb.go
@@ -1,20 +1,23 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/service.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import api1 "google.golang.org/genproto/googleapis/api"
-import annotations "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/label"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import api "google.golang.org/genproto/protobuf/api"
-import ptype "google.golang.org/genproto/protobuf/ptype"
+package serviceconfig
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	api1 "google.golang.org/genproto/googleapis/api"
+	annotations "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/label"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	api "google.golang.org/genproto/protobuf/api"
+	ptype "google.golang.org/genproto/protobuf/ptype"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -25,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `Service` is the root object of Google service configuration schema. It
 // describes basic information about a service, such as the name and the
@@ -140,16 +143,17 @@ func (m *Service) Reset()         { *m = Service{} }
 func (m *Service) String() string { return proto.CompactTextString(m) }
 func (*Service) ProtoMessage()    {}
 func (*Service) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_e2baf83097b3e099, []int{0}
+	return fileDescriptor_d556deeebe545813, []int{0}
 }
+
 func (m *Service) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Service.Unmarshal(m, b)
 }
 func (m *Service) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Service.Marshal(b, m, deterministic)
 }
-func (dst *Service) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Service.Merge(dst, src)
+func (m *Service) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Service.Merge(m, src)
 }
 func (m *Service) XXX_Size() int {
 	return xxx_messageInfo_Service.Size(m)
@@ -346,9 +350,9 @@ func init() {
 	proto.RegisterType((*Service)(nil), "google.api.Service")
 }
 
-func init() { proto.RegisterFile("google/api/service.proto", fileDescriptor_service_e2baf83097b3e099) }
+func init() { proto.RegisterFile("google/api/service.proto", fileDescriptor_d556deeebe545813) }
 
-var fileDescriptor_service_e2baf83097b3e099 = []byte{
+var fileDescriptor_d556deeebe545813 = []byte{
 	// 825 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x96, 0xdf, 0x6e, 0xdb, 0x36,
 	0x14, 0x87, 0x61, 0xd7, 0x6e, 0x16, 0x3a, 0xcd, 0x1a, 0xc6, 0x49, 0x19, 0xd7, 0x1b, 0xd2, 0xfd,
diff --git a/googleapis/api/serviceconfig/source_info.pb.go b/googleapis/api/serviceconfig/source_info.pb.go
index 0b40ddc111..1f4714128f 100644
--- a/googleapis/api/serviceconfig/source_info.pb.go
+++ b/googleapis/api/serviceconfig/source_info.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/source_info.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Source information used to create a Service Config
 type SourceInfo struct {
@@ -32,16 +35,17 @@ func (m *SourceInfo) Reset()         { *m = SourceInfo{} }
 func (m *SourceInfo) String() string { return proto.CompactTextString(m) }
 func (*SourceInfo) ProtoMessage()    {}
 func (*SourceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_info_17996d8c91d1c33a, []int{0}
+	return fileDescriptor_733a5fd590cc34b8, []int{0}
 }
+
 func (m *SourceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceInfo.Unmarshal(m, b)
 }
 func (m *SourceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceInfo.Marshal(b, m, deterministic)
 }
-func (dst *SourceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceInfo.Merge(dst, src)
+func (m *SourceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceInfo.Merge(m, src)
 }
 func (m *SourceInfo) XXX_Size() int {
 	return xxx_messageInfo_SourceInfo.Size(m)
@@ -63,11 +67,9 @@ func init() {
 	proto.RegisterType((*SourceInfo)(nil), "google.api.SourceInfo")
 }
 
-func init() {
-	proto.RegisterFile("google/api/source_info.proto", fileDescriptor_source_info_17996d8c91d1c33a)
-}
+func init() { proto.RegisterFile("google/api/source_info.proto", fileDescriptor_733a5fd590cc34b8) }
 
-var fileDescriptor_source_info_17996d8c91d1c33a = []byte{
+var fileDescriptor_733a5fd590cc34b8 = []byte{
 	// 198 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0x8d, 0xcf, 0xcc,
diff --git a/googleapis/api/serviceconfig/system_parameter.pb.go b/googleapis/api/serviceconfig/system_parameter.pb.go
index 9cd02dfc1b..e79cfe5f20 100644
--- a/googleapis/api/serviceconfig/system_parameter.pb.go
+++ b/googleapis/api/serviceconfig/system_parameter.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/system_parameter.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // ### System parameter configuration
 //
@@ -64,16 +67,17 @@ func (m *SystemParameters) Reset()         { *m = SystemParameters{} }
 func (m *SystemParameters) String() string { return proto.CompactTextString(m) }
 func (*SystemParameters) ProtoMessage()    {}
 func (*SystemParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_system_parameter_2f7efca4f2242165, []int{0}
+	return fileDescriptor_c69d4a5e03567ede, []int{0}
 }
+
 func (m *SystemParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SystemParameters.Unmarshal(m, b)
 }
 func (m *SystemParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SystemParameters.Marshal(b, m, deterministic)
 }
-func (dst *SystemParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SystemParameters.Merge(dst, src)
+func (m *SystemParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemParameters.Merge(m, src)
 }
 func (m *SystemParameters) XXX_Size() int {
 	return xxx_messageInfo_SystemParameters.Size(m)
@@ -114,16 +118,17 @@ func (m *SystemParameterRule) Reset()         { *m = SystemParameterRule{} }
 func (m *SystemParameterRule) String() string { return proto.CompactTextString(m) }
 func (*SystemParameterRule) ProtoMessage()    {}
 func (*SystemParameterRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_system_parameter_2f7efca4f2242165, []int{1}
+	return fileDescriptor_c69d4a5e03567ede, []int{1}
 }
+
 func (m *SystemParameterRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SystemParameterRule.Unmarshal(m, b)
 }
 func (m *SystemParameterRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SystemParameterRule.Marshal(b, m, deterministic)
 }
-func (dst *SystemParameterRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SystemParameterRule.Merge(dst, src)
+func (m *SystemParameterRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemParameterRule.Merge(m, src)
 }
 func (m *SystemParameterRule) XXX_Size() int {
 	return xxx_messageInfo_SystemParameterRule.Size(m)
@@ -169,16 +174,17 @@ func (m *SystemParameter) Reset()         { *m = SystemParameter{} }
 func (m *SystemParameter) String() string { return proto.CompactTextString(m) }
 func (*SystemParameter) ProtoMessage()    {}
 func (*SystemParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_system_parameter_2f7efca4f2242165, []int{2}
+	return fileDescriptor_c69d4a5e03567ede, []int{2}
 }
+
 func (m *SystemParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SystemParameter.Unmarshal(m, b)
 }
 func (m *SystemParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SystemParameter.Marshal(b, m, deterministic)
 }
-func (dst *SystemParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SystemParameter.Merge(dst, src)
+func (m *SystemParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemParameter.Merge(m, src)
 }
 func (m *SystemParameter) XXX_Size() int {
 	return xxx_messageInfo_SystemParameter.Size(m)
@@ -216,11 +222,9 @@ func init() {
 	proto.RegisterType((*SystemParameter)(nil), "google.api.SystemParameter")
 }
 
-func init() {
-	proto.RegisterFile("google/api/system_parameter.proto", fileDescriptor_system_parameter_2f7efca4f2242165)
-}
+func init() { proto.RegisterFile("google/api/system_parameter.proto", fileDescriptor_c69d4a5e03567ede) }
 
-var fileDescriptor_system_parameter_2f7efca4f2242165 = []byte{
+var fileDescriptor_c69d4a5e03567ede = []byte{
 	// 286 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x4e, 0xc3, 0x30,
 	0x10, 0x87, 0x95, 0xb6, 0x20, 0xb8, 0x4a, 0xfc, 0x71, 0x19, 0x22, 0x18, 0x5a, 0x3a, 0x75, 0x72,
diff --git a/googleapis/api/serviceconfig/usage.pb.go b/googleapis/api/serviceconfig/usage.pb.go
index 9ab776e408..e950f8ebe7 100644
--- a/googleapis/api/serviceconfig/usage.pb.go
+++ b/googleapis/api/serviceconfig/usage.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/usage.proto
 
-package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
+package serviceconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Configuration controlling usage of a service.
 type Usage struct {
@@ -46,16 +49,17 @@ func (m *Usage) Reset()         { *m = Usage{} }
 func (m *Usage) String() string { return proto.CompactTextString(m) }
 func (*Usage) ProtoMessage()    {}
 func (*Usage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_usage_5ff3c0173739d6b5, []int{0}
+	return fileDescriptor_701aa74a03c68f0a, []int{0}
 }
+
 func (m *Usage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Usage.Unmarshal(m, b)
 }
 func (m *Usage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Usage.Marshal(b, m, deterministic)
 }
-func (dst *Usage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Usage.Merge(dst, src)
+func (m *Usage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Usage.Merge(m, src)
 }
 func (m *Usage) XXX_Size() int {
 	return xxx_messageInfo_Usage.Size(m)
@@ -135,16 +139,17 @@ func (m *UsageRule) Reset()         { *m = UsageRule{} }
 func (m *UsageRule) String() string { return proto.CompactTextString(m) }
 func (*UsageRule) ProtoMessage()    {}
 func (*UsageRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_usage_5ff3c0173739d6b5, []int{1}
+	return fileDescriptor_701aa74a03c68f0a, []int{1}
 }
+
 func (m *UsageRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UsageRule.Unmarshal(m, b)
 }
 func (m *UsageRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UsageRule.Marshal(b, m, deterministic)
 }
-func (dst *UsageRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UsageRule.Merge(dst, src)
+func (m *UsageRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UsageRule.Merge(m, src)
 }
 func (m *UsageRule) XXX_Size() int {
 	return xxx_messageInfo_UsageRule.Size(m)
@@ -181,9 +186,9 @@ func init() {
 	proto.RegisterType((*UsageRule)(nil), "google.api.UsageRule")
 }
 
-func init() { proto.RegisterFile("google/api/usage.proto", fileDescriptor_usage_5ff3c0173739d6b5) }
+func init() { proto.RegisterFile("google/api/usage.proto", fileDescriptor_701aa74a03c68f0a) }
 
-var fileDescriptor_usage_5ff3c0173739d6b5 = []byte{
+var fileDescriptor_701aa74a03c68f0a = []byte{
 	// 319 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x4a, 0x33, 0x31,
 	0x14, 0x85, 0x49, 0xfb, 0xb7, 0x7f, 0x1b, 0xc5, 0x45, 0xd0, 0x12, 0x14, 0x61, 0xe8, 0x6a, 0x40,
diff --git a/googleapis/api/servicecontrol/v1/check_error.pb.go b/googleapis/api/servicecontrol/v1/check_error.pb.go
index b023f26054..658fff632a 100644
--- a/googleapis/api/servicecontrol/v1/check_error.pb.go
+++ b/googleapis/api/servicecontrol/v1/check_error.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/check_error.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Error codes for Check responses.
 type CheckError_Code int32
@@ -87,6 +90,7 @@ var CheckError_Code_name = map[int32]string{
 	301: "SERVICE_STATUS_UNAVAILABLE",
 	302: "BILLING_STATUS_UNAVAILABLE",
 }
+
 var CheckError_Code_value = map[string]int32{
 	"ERROR_CODE_UNSPECIFIED":       0,
 	"NOT_FOUND":                    5,
@@ -111,8 +115,9 @@ var CheckError_Code_value = map[string]int32{
 func (x CheckError_Code) String() string {
 	return proto.EnumName(CheckError_Code_name, int32(x))
 }
+
 func (CheckError_Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_check_error_95aa382d11b62e53, []int{0, 0}
+	return fileDescriptor_abfa738e19256db6, []int{0, 0}
 }
 
 // Defines the errors to be returned in
@@ -131,16 +136,17 @@ func (m *CheckError) Reset()         { *m = CheckError{} }
 func (m *CheckError) String() string { return proto.CompactTextString(m) }
 func (*CheckError) ProtoMessage()    {}
 func (*CheckError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_check_error_95aa382d11b62e53, []int{0}
+	return fileDescriptor_abfa738e19256db6, []int{0}
 }
+
 func (m *CheckError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckError.Unmarshal(m, b)
 }
 func (m *CheckError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckError.Marshal(b, m, deterministic)
 }
-func (dst *CheckError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckError.Merge(dst, src)
+func (m *CheckError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckError.Merge(m, src)
 }
 func (m *CheckError) XXX_Size() int {
 	return xxx_messageInfo_CheckError.Size(m)
@@ -166,15 +172,15 @@ func (m *CheckError) GetDetail() string {
 }
 
 func init() {
-	proto.RegisterType((*CheckError)(nil), "google.api.servicecontrol.v1.CheckError")
 	proto.RegisterEnum("google.api.servicecontrol.v1.CheckError_Code", CheckError_Code_name, CheckError_Code_value)
+	proto.RegisterType((*CheckError)(nil), "google.api.servicecontrol.v1.CheckError")
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/check_error.proto", fileDescriptor_check_error_95aa382d11b62e53)
+	proto.RegisterFile("google/api/servicecontrol/v1/check_error.proto", fileDescriptor_abfa738e19256db6)
 }
 
-var fileDescriptor_check_error_95aa382d11b62e53 = []byte{
+var fileDescriptor_abfa738e19256db6 = []byte{
 	// 493 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x4f, 0x6f, 0xd3, 0x30,
 	0x18, 0xc6, 0x49, 0x29, 0x83, 0x59, 0x82, 0x05, 0xc3, 0xaa, 0x51, 0x55, 0xa2, 0xec, 0xb4, 0x0b,
diff --git a/googleapis/api/servicecontrol/v1/distribution.pb.go b/googleapis/api/servicecontrol/v1/distribution.pb.go
index 35139f04bb..5b222a3e8a 100644
--- a/googleapis/api/servicecontrol/v1/distribution.pb.go
+++ b/googleapis/api/servicecontrol/v1/distribution.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/distribution.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Distribution represents a frequency distribution of double-valued sample
 // points. It contains the size of the population of sample points plus
@@ -91,16 +94,17 @@ func (m *Distribution) Reset()         { *m = Distribution{} }
 func (m *Distribution) String() string { return proto.CompactTextString(m) }
 func (*Distribution) ProtoMessage()    {}
 func (*Distribution) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_807f43a240f7aec0, []int{0}
+	return fileDescriptor_b3f590f4dffbeb4c, []int{0}
 }
+
 func (m *Distribution) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution.Unmarshal(m, b)
 }
 func (m *Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution.Marshal(b, m, deterministic)
 }
-func (dst *Distribution) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution.Merge(dst, src)
+func (m *Distribution) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution.Merge(m, src)
 }
 func (m *Distribution) XXX_Size() int {
 	return xxx_messageInfo_Distribution.Size(m)
@@ -203,99 +207,15 @@ func (m *Distribution) GetExplicitBuckets() *Distribution_ExplicitBuckets {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Distribution) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Distribution_OneofMarshaler, _Distribution_OneofUnmarshaler, _Distribution_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Distribution) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Distribution_LinearBuckets_)(nil),
 		(*Distribution_ExponentialBuckets_)(nil),
 		(*Distribution_ExplicitBuckets_)(nil),
 	}
 }
 
-func _Distribution_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Distribution)
-	// bucket_option
-	switch x := m.BucketOption.(type) {
-	case *Distribution_LinearBuckets_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LinearBuckets); err != nil {
-			return err
-		}
-	case *Distribution_ExponentialBuckets_:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExponentialBuckets); err != nil {
-			return err
-		}
-	case *Distribution_ExplicitBuckets_:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExplicitBuckets); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Distribution.BucketOption has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Distribution_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Distribution)
-	switch tag {
-	case 7: // bucket_option.linear_buckets
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Distribution_LinearBuckets)
-		err := b.DecodeMessage(msg)
-		m.BucketOption = &Distribution_LinearBuckets_{msg}
-		return true, err
-	case 8: // bucket_option.exponential_buckets
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Distribution_ExponentialBuckets)
-		err := b.DecodeMessage(msg)
-		m.BucketOption = &Distribution_ExponentialBuckets_{msg}
-		return true, err
-	case 9: // bucket_option.explicit_buckets
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Distribution_ExplicitBuckets)
-		err := b.DecodeMessage(msg)
-		m.BucketOption = &Distribution_ExplicitBuckets_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Distribution_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Distribution)
-	// bucket_option
-	switch x := m.BucketOption.(type) {
-	case *Distribution_LinearBuckets_:
-		s := proto.Size(x.LinearBuckets)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Distribution_ExponentialBuckets_:
-		s := proto.Size(x.ExponentialBuckets)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Distribution_ExplicitBuckets_:
-		s := proto.Size(x.ExplicitBuckets)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Describing buckets with constant width.
 type Distribution_LinearBuckets struct {
 	// The number of finite buckets. With the underflow and overflow buckets,
@@ -320,16 +240,17 @@ func (m *Distribution_LinearBuckets) Reset()         { *m = Distribution_LinearB
 func (m *Distribution_LinearBuckets) String() string { return proto.CompactTextString(m) }
 func (*Distribution_LinearBuckets) ProtoMessage()    {}
 func (*Distribution_LinearBuckets) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_807f43a240f7aec0, []int{0, 0}
+	return fileDescriptor_b3f590f4dffbeb4c, []int{0, 0}
 }
+
 func (m *Distribution_LinearBuckets) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_LinearBuckets.Unmarshal(m, b)
 }
 func (m *Distribution_LinearBuckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_LinearBuckets.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_LinearBuckets) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_LinearBuckets.Merge(dst, src)
+func (m *Distribution_LinearBuckets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_LinearBuckets.Merge(m, src)
 }
 func (m *Distribution_LinearBuckets) XXX_Size() int {
 	return xxx_messageInfo_Distribution_LinearBuckets.Size(m)
@@ -386,16 +307,17 @@ func (m *Distribution_ExponentialBuckets) Reset()         { *m = Distribution_Ex
 func (m *Distribution_ExponentialBuckets) String() string { return proto.CompactTextString(m) }
 func (*Distribution_ExponentialBuckets) ProtoMessage()    {}
 func (*Distribution_ExponentialBuckets) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_807f43a240f7aec0, []int{0, 1}
+	return fileDescriptor_b3f590f4dffbeb4c, []int{0, 1}
 }
+
 func (m *Distribution_ExponentialBuckets) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_ExponentialBuckets.Unmarshal(m, b)
 }
 func (m *Distribution_ExponentialBuckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_ExponentialBuckets.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_ExponentialBuckets) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_ExponentialBuckets.Merge(dst, src)
+func (m *Distribution_ExponentialBuckets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_ExponentialBuckets.Merge(m, src)
 }
 func (m *Distribution_ExponentialBuckets) XXX_Size() int {
 	return xxx_messageInfo_Distribution_ExponentialBuckets.Size(m)
@@ -454,16 +376,17 @@ func (m *Distribution_ExplicitBuckets) Reset()         { *m = Distribution_Expli
 func (m *Distribution_ExplicitBuckets) String() string { return proto.CompactTextString(m) }
 func (*Distribution_ExplicitBuckets) ProtoMessage()    {}
 func (*Distribution_ExplicitBuckets) Descriptor() ([]byte, []int) {
-	return fileDescriptor_distribution_807f43a240f7aec0, []int{0, 2}
+	return fileDescriptor_b3f590f4dffbeb4c, []int{0, 2}
 }
+
 func (m *Distribution_ExplicitBuckets) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution_ExplicitBuckets.Unmarshal(m, b)
 }
 func (m *Distribution_ExplicitBuckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution_ExplicitBuckets.Marshal(b, m, deterministic)
 }
-func (dst *Distribution_ExplicitBuckets) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution_ExplicitBuckets.Merge(dst, src)
+func (m *Distribution_ExplicitBuckets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_ExplicitBuckets.Merge(m, src)
 }
 func (m *Distribution_ExplicitBuckets) XXX_Size() int {
 	return xxx_messageInfo_Distribution_ExplicitBuckets.Size(m)
@@ -489,10 +412,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/distribution.proto", fileDescriptor_distribution_807f43a240f7aec0)
+	proto.RegisterFile("google/api/servicecontrol/v1/distribution.proto", fileDescriptor_b3f590f4dffbeb4c)
 }
 
-var fileDescriptor_distribution_807f43a240f7aec0 = []byte{
+var fileDescriptor_b3f590f4dffbeb4c = []byte{
 	// 486 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4d, 0x6f, 0xd3, 0x40,
 	0x10, 0x86, 0x31, 0x6e, 0x52, 0x18, 0x12, 0x52, 0x96, 0x82, 0xac, 0x88, 0x83, 0x45, 0x2f, 0x41,
diff --git a/googleapis/api/servicecontrol/v1/log_entry.pb.go b/googleapis/api/servicecontrol/v1/log_entry.pb.go
index 33f6ffc71e..02a55c3f77 100644
--- a/googleapis/api/servicecontrol/v1/log_entry.pb.go
+++ b/googleapis/api/servicecontrol/v1/log_entry.pb.go
@@ -1,16 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/log_entry.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _type "google.golang.org/genproto/googleapis/logging/type"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_type "google.golang.org/genproto/googleapis/logging/type"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -21,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An individual log entry.
 type LogEntry struct {
@@ -56,16 +59,17 @@ func (m *LogEntry) Reset()         { *m = LogEntry{} }
 func (m *LogEntry) String() string { return proto.CompactTextString(m) }
 func (*LogEntry) ProtoMessage()    {}
 func (*LogEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_log_entry_ab78733b8d6a30bb, []int{0}
+	return fileDescriptor_ca6b95357c9a05d1, []int{0}
 }
+
 func (m *LogEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogEntry.Unmarshal(m, b)
 }
 func (m *LogEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogEntry.Marshal(b, m, deterministic)
 }
-func (dst *LogEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogEntry.Merge(dst, src)
+func (m *LogEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntry.Merge(m, src)
 }
 func (m *LogEntry) XXX_Size() int {
 	return xxx_messageInfo_LogEntry.Size(m)
@@ -161,105 +165,25 @@ func (m *LogEntry) GetStructPayload() *_struct.Struct {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LogEntry) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LogEntry_OneofMarshaler, _LogEntry_OneofUnmarshaler, _LogEntry_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LogEntry) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LogEntry_ProtoPayload)(nil),
 		(*LogEntry_TextPayload)(nil),
 		(*LogEntry_StructPayload)(nil),
 	}
 }
 
-func _LogEntry_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LogEntry)
-	// payload
-	switch x := m.Payload.(type) {
-	case *LogEntry_ProtoPayload:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProtoPayload); err != nil {
-			return err
-		}
-	case *LogEntry_TextPayload:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TextPayload)
-	case *LogEntry_StructPayload:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructPayload); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LogEntry.Payload has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LogEntry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LogEntry)
-	switch tag {
-	case 2: // payload.proto_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Payload = &LogEntry_ProtoPayload{msg}
-		return true, err
-	case 3: // payload.text_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Payload = &LogEntry_TextPayload{x}
-		return true, err
-	case 6: // payload.struct_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.Struct)
-		err := b.DecodeMessage(msg)
-		m.Payload = &LogEntry_StructPayload{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LogEntry_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LogEntry)
-	// payload
-	switch x := m.Payload.(type) {
-	case *LogEntry_ProtoPayload:
-		s := proto.Size(x.ProtoPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LogEntry_TextPayload:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TextPayload)))
-		n += len(x.TextPayload)
-	case *LogEntry_StructPayload:
-		s := proto.Size(x.StructPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*LogEntry)(nil), "google.api.servicecontrol.v1.LogEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.api.servicecontrol.v1.LogEntry.LabelsEntry")
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/log_entry.proto", fileDescriptor_log_entry_ab78733b8d6a30bb)
+	proto.RegisterFile("google/api/servicecontrol/v1/log_entry.proto", fileDescriptor_ca6b95357c9a05d1)
 }
 
-var fileDescriptor_log_entry_ab78733b8d6a30bb = []byte{
+var fileDescriptor_ca6b95357c9a05d1 = []byte{
 	// 454 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x4f, 0x8f, 0xd3, 0x30,
 	0x10, 0xc5, 0x9b, 0xed, 0x52, 0x1a, 0xa7, 0x5d, 0x21, 0x6b, 0x25, 0x42, 0xa8, 0x44, 0x04, 0x12,
diff --git a/googleapis/api/servicecontrol/v1/metric_value.pb.go b/googleapis/api/servicecontrol/v1/metric_value.pb.go
index fee5b4a8c5..7592f79edb 100644
--- a/googleapis/api/servicecontrol/v1/metric_value.pb.go
+++ b/googleapis/api/servicecontrol/v1/metric_value.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/metric_value.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/money"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/money"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a single metric value.
 type MetricValue struct {
@@ -56,16 +59,17 @@ func (m *MetricValue) Reset()         { *m = MetricValue{} }
 func (m *MetricValue) String() string { return proto.CompactTextString(m) }
 func (*MetricValue) ProtoMessage()    {}
 func (*MetricValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_value_b13910fcfcfb831a, []int{0}
+	return fileDescriptor_8818c371cfc5a8d3, []int{0}
 }
+
 func (m *MetricValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MetricValue.Unmarshal(m, b)
 }
 func (m *MetricValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MetricValue.Marshal(b, m, deterministic)
 }
-func (dst *MetricValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricValue.Merge(dst, src)
+func (m *MetricValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricValue.Merge(m, src)
 }
 func (m *MetricValue) XXX_Size() int {
 	return xxx_messageInfo_MetricValue.Size(m)
@@ -173,9 +177,9 @@ func (m *MetricValue) GetDistributionValue() *Distribution {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MetricValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MetricValue_OneofMarshaler, _MetricValue_OneofUnmarshaler, _MetricValue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MetricValue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MetricValue_BoolValue)(nil),
 		(*MetricValue_Int64Value)(nil),
 		(*MetricValue_DoubleValue)(nil),
@@ -184,111 +188,6 @@ func (*MetricValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) e
 	}
 }
 
-func _MetricValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MetricValue)
-	// value
-	switch x := m.Value.(type) {
-	case *MetricValue_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *MetricValue_Int64Value:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Value))
-	case *MetricValue_DoubleValue:
-		b.EncodeVarint(6<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *MetricValue_StringValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *MetricValue_DistributionValue:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DistributionValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MetricValue.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MetricValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MetricValue)
-	switch tag {
-	case 4: // value.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &MetricValue_BoolValue{x != 0}
-		return true, err
-	case 5: // value.int64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &MetricValue_Int64Value{int64(x)}
-		return true, err
-	case 6: // value.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Value = &MetricValue_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 7: // value.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Value = &MetricValue_StringValue{x}
-		return true, err
-	case 8: // value.distribution_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Distribution)
-		err := b.DecodeMessage(msg)
-		m.Value = &MetricValue_DistributionValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MetricValue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MetricValue)
-	// value
-	switch x := m.Value.(type) {
-	case *MetricValue_BoolValue:
-		n += 1 // tag and wire
-		n += 1
-	case *MetricValue_Int64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Value))
-	case *MetricValue_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *MetricValue_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *MetricValue_DistributionValue:
-		s := proto.Size(x.DistributionValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a set of metric values in the same metric.
 // Each metric value in the set should have a unique combination of start time,
 // end time, and label values.
@@ -306,16 +205,17 @@ func (m *MetricValueSet) Reset()         { *m = MetricValueSet{} }
 func (m *MetricValueSet) String() string { return proto.CompactTextString(m) }
 func (*MetricValueSet) ProtoMessage()    {}
 func (*MetricValueSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_value_b13910fcfcfb831a, []int{1}
+	return fileDescriptor_8818c371cfc5a8d3, []int{1}
 }
+
 func (m *MetricValueSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MetricValueSet.Unmarshal(m, b)
 }
 func (m *MetricValueSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MetricValueSet.Marshal(b, m, deterministic)
 }
-func (dst *MetricValueSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricValueSet.Merge(dst, src)
+func (m *MetricValueSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricValueSet.Merge(m, src)
 }
 func (m *MetricValueSet) XXX_Size() int {
 	return xxx_messageInfo_MetricValueSet.Size(m)
@@ -347,10 +247,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/metric_value.proto", fileDescriptor_metric_value_b13910fcfcfb831a)
+	proto.RegisterFile("google/api/servicecontrol/v1/metric_value.proto", fileDescriptor_8818c371cfc5a8d3)
 }
 
-var fileDescriptor_metric_value_b13910fcfcfb831a = []byte{
+var fileDescriptor_8818c371cfc5a8d3 = []byte{
 	// 482 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x8b, 0xd3, 0x40,
 	0x14, 0xc7, 0x3b, 0x8d, 0xdb, 0x1f, 0x2f, 0xab, 0x68, 0x14, 0x0c, 0x65, 0xa1, 0x71, 0xbd, 0x44,
diff --git a/googleapis/api/servicecontrol/v1/operation.pb.go b/googleapis/api/servicecontrol/v1/operation.pb.go
index c3d887e799..dd6abb791a 100644
--- a/googleapis/api/servicecontrol/v1/operation.pb.go
+++ b/googleapis/api/servicecontrol/v1/operation.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/operation.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+package servicecontrol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Defines the importance of the data contained in the operation.
 type Operation_Importance int32
@@ -37,6 +40,7 @@ var Operation_Importance_name = map[int32]string{
 	0: "LOW",
 	1: "HIGH",
 }
+
 var Operation_Importance_value = map[string]int32{
 	"LOW":  0,
 	"HIGH": 1,
@@ -45,8 +49,9 @@ var Operation_Importance_value = map[string]int32{
 func (x Operation_Importance) String() string {
 	return proto.EnumName(Operation_Importance_name, int32(x))
 }
+
 func (Operation_Importance) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operation_3aad26a8020e2c86, []int{0, 0}
+	return fileDescriptor_afd5d09de2965ad3, []int{0, 0}
 }
 
 // Represents information regarding an operation.
@@ -121,16 +126,17 @@ func (m *Operation) Reset()         { *m = Operation{} }
 func (m *Operation) String() string { return proto.CompactTextString(m) }
 func (*Operation) ProtoMessage()    {}
 func (*Operation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_3aad26a8020e2c86, []int{0}
+	return fileDescriptor_afd5d09de2965ad3, []int{0}
 }
+
 func (m *Operation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operation.Unmarshal(m, b)
 }
 func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
 }
-func (dst *Operation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operation.Merge(dst, src)
+func (m *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(m, src)
 }
 func (m *Operation) XXX_Size() int {
 	return xxx_messageInfo_Operation.Size(m)
@@ -205,16 +211,16 @@ func (m *Operation) GetImportance() Operation_Importance {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.servicecontrol.v1.Operation_Importance", Operation_Importance_name, Operation_Importance_value)
 	proto.RegisterType((*Operation)(nil), "google.api.servicecontrol.v1.Operation")
 	proto.RegisterMapType((map[string]string)(nil), "google.api.servicecontrol.v1.Operation.LabelsEntry")
-	proto.RegisterEnum("google.api.servicecontrol.v1.Operation_Importance", Operation_Importance_name, Operation_Importance_value)
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/operation.proto", fileDescriptor_operation_3aad26a8020e2c86)
+	proto.RegisterFile("google/api/servicecontrol/v1/operation.proto", fileDescriptor_afd5d09de2965ad3)
 }
 
-var fileDescriptor_operation_3aad26a8020e2c86 = []byte{
+var fileDescriptor_afd5d09de2965ad3 = []byte{
 	// 483 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6b, 0x13, 0x41,
 	0x14, 0xc7, 0x9d, 0xa6, 0xf9, 0xf5, 0x56, 0x63, 0x1c, 0x3c, 0x2c, 0xa1, 0x90, 0x58, 0x50, 0x72,
diff --git a/googleapis/api/servicecontrol/v1/quota_controller.pb.go b/googleapis/api/servicecontrol/v1/quota_controller.pb.go
index 43984a5513..eb2766fa5b 100644
--- a/googleapis/api/servicecontrol/v1/quota_controller.pb.go
+++ b/googleapis/api/servicecontrol/v1/quota_controller.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/quota_controller.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package servicecontrol
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Supported quota modes.
 type QuotaOperation_QuotaMode int32
@@ -52,6 +52,7 @@ var QuotaOperation_QuotaMode_name = map[int32]string{
 	2: "BEST_EFFORT",
 	3: "CHECK_ONLY",
 }
+
 var QuotaOperation_QuotaMode_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"NORMAL":      1,
@@ -62,8 +63,9 @@ var QuotaOperation_QuotaMode_value = map[string]int32{
 func (x QuotaOperation_QuotaMode) String() string {
 	return proto.EnumName(QuotaOperation_QuotaMode_name, int32(x))
 }
+
 func (QuotaOperation_QuotaMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_quota_controller_635a8e629d18a12a, []int{1, 0}
+	return fileDescriptor_4401e348913df3b0, []int{1, 0}
 }
 
 // Error codes related to project config validations are deprecated since the
@@ -98,6 +100,7 @@ var QuotaError_Code_name = map[int32]string{
 	105: "API_KEY_INVALID",
 	112: "API_KEY_EXPIRED",
 }
+
 var QuotaError_Code_value = map[string]int32{
 	"UNSPECIFIED":        0,
 	"RESOURCE_EXHAUSTED": 8,
@@ -110,8 +113,9 @@ var QuotaError_Code_value = map[string]int32{
 func (x QuotaError_Code) String() string {
 	return proto.EnumName(QuotaError_Code_name, int32(x))
 }
+
 func (QuotaError_Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_quota_controller_635a8e629d18a12a, []int{3, 0}
+	return fileDescriptor_4401e348913df3b0, []int{3, 0}
 }
 
 // Request message for the AllocateQuota method.
@@ -137,16 +141,17 @@ func (m *AllocateQuotaRequest) Reset()         { *m = AllocateQuotaRequest{} }
 func (m *AllocateQuotaRequest) String() string { return proto.CompactTextString(m) }
 func (*AllocateQuotaRequest) ProtoMessage()    {}
 func (*AllocateQuotaRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_controller_635a8e629d18a12a, []int{0}
+	return fileDescriptor_4401e348913df3b0, []int{0}
 }
+
 func (m *AllocateQuotaRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocateQuotaRequest.Unmarshal(m, b)
 }
 func (m *AllocateQuotaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocateQuotaRequest.Marshal(b, m, deterministic)
 }
-func (dst *AllocateQuotaRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocateQuotaRequest.Merge(dst, src)
+func (m *AllocateQuotaRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateQuotaRequest.Merge(m, src)
 }
 func (m *AllocateQuotaRequest) XXX_Size() int {
 	return xxx_messageInfo_AllocateQuotaRequest.Size(m)
@@ -228,16 +233,17 @@ func (m *QuotaOperation) Reset()         { *m = QuotaOperation{} }
 func (m *QuotaOperation) String() string { return proto.CompactTextString(m) }
 func (*QuotaOperation) ProtoMessage()    {}
 func (*QuotaOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_controller_635a8e629d18a12a, []int{1}
+	return fileDescriptor_4401e348913df3b0, []int{1}
 }
+
 func (m *QuotaOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuotaOperation.Unmarshal(m, b)
 }
 func (m *QuotaOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuotaOperation.Marshal(b, m, deterministic)
 }
-func (dst *QuotaOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuotaOperation.Merge(dst, src)
+func (m *QuotaOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaOperation.Merge(m, src)
 }
 func (m *QuotaOperation) XXX_Size() int {
 	return xxx_messageInfo_QuotaOperation.Size(m)
@@ -319,16 +325,17 @@ func (m *AllocateQuotaResponse) Reset()         { *m = AllocateQuotaResponse{} }
 func (m *AllocateQuotaResponse) String() string { return proto.CompactTextString(m) }
 func (*AllocateQuotaResponse) ProtoMessage()    {}
 func (*AllocateQuotaResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_controller_635a8e629d18a12a, []int{2}
+	return fileDescriptor_4401e348913df3b0, []int{2}
 }
+
 func (m *AllocateQuotaResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocateQuotaResponse.Unmarshal(m, b)
 }
 func (m *AllocateQuotaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocateQuotaResponse.Marshal(b, m, deterministic)
 }
-func (dst *AllocateQuotaResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocateQuotaResponse.Merge(dst, src)
+func (m *AllocateQuotaResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateQuotaResponse.Merge(m, src)
 }
 func (m *AllocateQuotaResponse) XXX_Size() int {
 	return xxx_messageInfo_AllocateQuotaResponse.Size(m)
@@ -387,16 +394,17 @@ func (m *QuotaError) Reset()         { *m = QuotaError{} }
 func (m *QuotaError) String() string { return proto.CompactTextString(m) }
 func (*QuotaError) ProtoMessage()    {}
 func (*QuotaError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quota_controller_635a8e629d18a12a, []int{3}
+	return fileDescriptor_4401e348913df3b0, []int{3}
 }
+
 func (m *QuotaError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuotaError.Unmarshal(m, b)
 }
 func (m *QuotaError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuotaError.Marshal(b, m, deterministic)
 }
-func (dst *QuotaError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuotaError.Merge(dst, src)
+func (m *QuotaError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaError.Merge(m, src)
 }
 func (m *QuotaError) XXX_Size() int {
 	return xxx_messageInfo_QuotaError.Size(m)
@@ -429,13 +437,70 @@ func (m *QuotaError) GetDescription() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.servicecontrol.v1.QuotaOperation_QuotaMode", QuotaOperation_QuotaMode_name, QuotaOperation_QuotaMode_value)
+	proto.RegisterEnum("google.api.servicecontrol.v1.QuotaError_Code", QuotaError_Code_name, QuotaError_Code_value)
 	proto.RegisterType((*AllocateQuotaRequest)(nil), "google.api.servicecontrol.v1.AllocateQuotaRequest")
 	proto.RegisterType((*QuotaOperation)(nil), "google.api.servicecontrol.v1.QuotaOperation")
 	proto.RegisterMapType((map[string]string)(nil), "google.api.servicecontrol.v1.QuotaOperation.LabelsEntry")
 	proto.RegisterType((*AllocateQuotaResponse)(nil), "google.api.servicecontrol.v1.AllocateQuotaResponse")
 	proto.RegisterType((*QuotaError)(nil), "google.api.servicecontrol.v1.QuotaError")
-	proto.RegisterEnum("google.api.servicecontrol.v1.QuotaOperation_QuotaMode", QuotaOperation_QuotaMode_name, QuotaOperation_QuotaMode_value)
-	proto.RegisterEnum("google.api.servicecontrol.v1.QuotaError_Code", QuotaError_Code_name, QuotaError_Code_value)
+}
+
+func init() {
+	proto.RegisterFile("google/api/servicecontrol/v1/quota_controller.proto", fileDescriptor_4401e348913df3b0)
+}
+
+var fileDescriptor_4401e348913df3b0 = []byte{
+	// 775 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x6e, 0xea, 0x46,
+	0x14, 0xed, 0x18, 0x42, 0x9b, 0xeb, 0x04, 0x9c, 0x69, 0x5a, 0x59, 0x28, 0x52, 0x28, 0x2b, 0x1a,
+	0xb5, 0x46, 0x21, 0x55, 0x95, 0xa6, 0x2b, 0x30, 0x93, 0xc6, 0x09, 0x01, 0x62, 0x20, 0x4a, 0xda,
+	0x85, 0xe5, 0xd8, 0x53, 0xea, 0xc6, 0x78, 0x1c, 0xdb, 0x20, 0x45, 0x55, 0x37, 0x5d, 0x54, 0xaa,
+	0xd4, 0x5d, 0xfb, 0x1d, 0xfd, 0x88, 0xfc, 0x42, 0x7f, 0xe1, 0xfd, 0xc3, 0x7b, 0xcb, 0x27, 0x8f,
+	0x0d, 0x0f, 0x22, 0xc4, 0x0b, 0x7a, 0x3b, 0xcf, 0xf1, 0x9c, 0x33, 0xf7, 0xde, 0x73, 0xe7, 0x0e,
+	0x1c, 0x0d, 0x19, 0x1b, 0xba, 0xb4, 0x6a, 0xfa, 0x4e, 0x35, 0xa4, 0xc1, 0xc4, 0xb1, 0xa8, 0xc5,
+	0xbc, 0x28, 0x60, 0x6e, 0x75, 0x72, 0x58, 0x7d, 0x18, 0xb3, 0xc8, 0x34, 0x52, 0xc0, 0xa5, 0x81,
+	0xe2, 0x07, 0x2c, 0x62, 0x78, 0x2f, 0x21, 0x29, 0xa6, 0xef, 0x28, 0x8b, 0x24, 0x65, 0x72, 0x58,
+	0xdc, 0x9b, 0x93, 0x34, 0x3d, 0x8f, 0x45, 0x66, 0xe4, 0x30, 0x2f, 0x4c, 0xb8, 0xc5, 0xea, 0xca,
+	0x03, 0x47, 0x34, 0x0a, 0x1c, 0xcb, 0x98, 0x98, 0xee, 0x98, 0x26, 0x84, 0xf2, 0x13, 0x82, 0xdd,
+	0xba, 0xeb, 0x32, 0xcb, 0x8c, 0xe8, 0x55, 0x1c, 0x8f, 0x4e, 0x1f, 0xc6, 0x34, 0x8c, 0xf0, 0x17,
+	0xb0, 0x95, 0x0a, 0x18, 0x9e, 0x39, 0xa2, 0x32, 0x2a, 0xa1, 0xca, 0xa6, 0x2e, 0xa6, 0x58, 0xdb,
+	0x1c, 0x51, 0xfc, 0x13, 0x60, 0x33, 0xa5, 0x1a, 0xcc, 0xa7, 0x01, 0x8f, 0x44, 0x16, 0x4a, 0xa8,
+	0x22, 0xd6, 0xbe, 0x52, 0x56, 0x65, 0xa1, 0xf0, 0xa3, 0x3a, 0x53, 0x8e, 0xbe, 0x33, 0xd5, 0x99,
+	0x41, 0xf8, 0x00, 0x76, 0xa6, 0xe7, 0x5b, 0xcc, 0xfb, 0xd9, 0x19, 0x1a, 0x8e, 0x2d, 0x67, 0x79,
+	0x10, 0x85, 0xf4, 0x87, 0xca, 0x71, 0xcd, 0x2e, 0xbf, 0xce, 0x40, 0x7e, 0x51, 0x31, 0x0e, 0x7f,
+	0x16, 0x52, 0xcc, 0x4c, 0xc3, 0x9f, 0x61, 0x9a, 0x8d, 0xf7, 0x41, 0x1c, 0xd1, 0xe8, 0x17, 0x66,
+	0x27, 0x09, 0x0a, 0x7c, 0x07, 0x24, 0x10, 0xcf, 0x6f, 0x1f, 0x44, 0x8b, 0x79, 0xe1, 0x78, 0x44,
+	0x83, 0x58, 0x22, 0x93, 0x6c, 0x98, 0x42, 0x9a, 0x8d, 0xbb, 0x90, 0x73, 0xcd, 0x3b, 0xea, 0x86,
+	0x72, 0xb6, 0x94, 0xa9, 0x88, 0xb5, 0xe3, 0x75, 0x92, 0x56, 0x5a, 0x9c, 0x4a, 0xbc, 0x28, 0x78,
+	0xd4, 0x53, 0x1d, 0x7c, 0x05, 0xdb, 0x49, 0x57, 0x24, 0x56, 0x85, 0xf2, 0x06, 0x17, 0x7e, 0x4f,
+	0x35, 0x2f, 0xf9, 0xe6, 0xeb, 0xd8, 0xd6, 0x1e, 0x8d, 0xf4, 0x2d, 0x2e, 0x91, 0x80, 0x21, 0x1e,
+	0x00, 0xa4, 0x92, 0xcc, 0xa6, 0x72, 0xae, 0x84, 0x2a, 0xf9, 0xda, 0xb7, 0x6b, 0x05, 0xca, 0x97,
+	0x97, 0xcc, 0xa6, 0xfa, 0xe6, 0xc3, 0xf4, 0xb3, 0xf8, 0x1d, 0x88, 0x73, 0x09, 0x60, 0x09, 0x32,
+	0xf7, 0xf4, 0x31, 0x2d, 0x73, 0xfc, 0x89, 0x77, 0x61, 0x83, 0x37, 0x5a, 0x5a, 0xd8, 0x64, 0x71,
+	0x22, 0x1c, 0xa3, 0xb2, 0x06, 0x9b, 0x33, 0x49, 0x5c, 0x00, 0x71, 0xd0, 0xee, 0x75, 0x89, 0xaa,
+	0x9d, 0x6a, 0xa4, 0x29, 0x7d, 0x84, 0x01, 0x72, 0xed, 0x8e, 0x7e, 0x59, 0x6f, 0x49, 0x28, 0xfe,
+	0xd9, 0x20, 0xbd, 0xbe, 0x41, 0x4e, 0x4f, 0x3b, 0x7a, 0x5f, 0x12, 0x70, 0x1e, 0x40, 0x3d, 0x23,
+	0xea, 0x85, 0xd1, 0x69, 0xb7, 0x6e, 0xa5, 0x4c, 0xf9, 0x6f, 0x01, 0x3e, 0x7b, 0xd6, 0xbe, 0xa1,
+	0xcf, 0xbc, 0x90, 0xbe, 0xa4, 0x01, 0xae, 0xa0, 0x30, 0xeb, 0x5f, 0x1a, 0x04, 0x2c, 0x08, 0x65,
+	0x81, 0x97, 0xbb, 0xf2, 0x82, 0xf2, 0x90, 0x98, 0xa0, 0xe7, 0xa7, 0x02, 0x7c, 0xb9, 0xc4, 0xbf,
+	0xcc, 0x07, 0xfb, 0xb7, 0xce, 0x45, 0xf8, 0x57, 0x00, 0x78, 0x17, 0x1d, 0xae, 0x43, 0xd6, 0x8a,
+	0x4d, 0x47, 0xdc, 0xf4, 0xaf, 0x5f, 0x9a, 0x95, 0xa2, 0xc6, 0x5e, 0x73, 0x2a, 0x96, 0xe1, 0xe3,
+	0x70, 0x7c, 0xf7, 0x2b, 0xb5, 0xa2, 0xd4, 0xc7, 0xe9, 0x12, 0x97, 0x40, 0xb4, 0x69, 0x68, 0x05,
+	0x8e, 0xcf, 0xaf, 0x7d, 0x72, 0x3b, 0xe6, 0xa1, 0xf2, 0x9f, 0x08, 0xb2, 0xea, 0x52, 0x8f, 0x3f,
+	0x07, 0xac, 0x93, 0x5e, 0x67, 0xa0, 0xab, 0xc4, 0x20, 0x37, 0x67, 0xf5, 0x41, 0xaf, 0x4f, 0x9a,
+	0xd2, 0x27, 0x31, 0xde, 0xd0, 0x5a, 0x2d, 0xad, 0xfd, 0x83, 0xd1, 0xee, 0xf4, 0x8d, 0xba, 0xda,
+	0xd7, 0xae, 0x89, 0x74, 0x8f, 0x3f, 0x85, 0x42, 0x57, 0xef, 0x9c, 0x13, 0xb5, 0x6f, 0x34, 0x49,
+	0x8b, 0xc4, 0x9b, 0xdd, 0x18, 0xac, 0x77, 0x35, 0xe3, 0x82, 0xdc, 0x1a, 0x5a, 0xfb, 0xba, 0xde,
+	0xd2, 0x9a, 0x92, 0x33, 0x0f, 0x92, 0x9b, 0xae, 0xa6, 0x93, 0xa6, 0xe4, 0xd7, 0x9e, 0x10, 0x14,
+	0x78, 0x7a, 0xea, 0x6c, 0xd6, 0xe2, 0xff, 0x10, 0x6c, 0x2f, 0x74, 0x0e, 0xae, 0xad, 0xae, 0xcf,
+	0xb2, 0x29, 0x59, 0x3c, 0x5a, 0x8b, 0x93, 0xb4, 0x66, 0xf9, 0x9b, 0x3f, 0xfe, 0x7f, 0xf5, 0x8f,
+	0xa0, 0x94, 0xbf, 0x8c, 0x67, 0x72, 0x4a, 0x0a, 0xab, 0xbf, 0xcd, 0x8f, 0xdb, 0xdf, 0x4f, 0xcc,
+	0x79, 0xea, 0x09, 0x3a, 0x68, 0xfc, 0x85, 0xa0, 0x64, 0xb1, 0xd1, 0xca, 0x03, 0x1b, 0xbb, 0xcf,
+	0xd2, 0xec, 0xc6, 0x43, 0xbe, 0x8b, 0x7e, 0x3c, 0x4f, 0x59, 0x43, 0xe6, 0x9a, 0xde, 0x50, 0x61,
+	0xc1, 0xb0, 0x3a, 0xa4, 0x1e, 0x7f, 0x02, 0xd2, 0x27, 0xc3, 0xf4, 0x9d, 0x70, 0xf9, 0xb3, 0xf1,
+	0xfd, 0x22, 0xf2, 0x06, 0xa1, 0xbb, 0x1c, 0x67, 0x1e, 0xbd, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbb,
+	0x98, 0x03, 0x4f, 0xe0, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -531,60 +596,3 @@ var _QuotaController_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/api/servicecontrol/v1/quota_controller.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/quota_controller.proto", fileDescriptor_quota_controller_635a8e629d18a12a)
-}
-
-var fileDescriptor_quota_controller_635a8e629d18a12a = []byte{
-	// 775 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x6e, 0xea, 0x46,
-	0x14, 0xed, 0x18, 0x42, 0x9b, 0xeb, 0x04, 0x9c, 0x69, 0x5a, 0x59, 0x28, 0x52, 0x28, 0x2b, 0x1a,
-	0xb5, 0x46, 0x21, 0x55, 0x95, 0xa6, 0x2b, 0x30, 0x93, 0xc6, 0x09, 0x01, 0x62, 0x20, 0x4a, 0xda,
-	0x85, 0xe5, 0xd8, 0x53, 0xea, 0xc6, 0x78, 0x1c, 0xdb, 0x20, 0x45, 0x55, 0x37, 0x5d, 0x54, 0xaa,
-	0xd4, 0x5d, 0xfb, 0x1d, 0xfd, 0x88, 0xfc, 0x42, 0x7f, 0xe1, 0xfd, 0xc3, 0x7b, 0xcb, 0x27, 0x8f,
-	0x0d, 0x0f, 0x22, 0xc4, 0x0b, 0x7a, 0x3b, 0xcf, 0xf1, 0x9c, 0x33, 0xf7, 0xde, 0x73, 0xe7, 0x0e,
-	0x1c, 0x0d, 0x19, 0x1b, 0xba, 0xb4, 0x6a, 0xfa, 0x4e, 0x35, 0xa4, 0xc1, 0xc4, 0xb1, 0xa8, 0xc5,
-	0xbc, 0x28, 0x60, 0x6e, 0x75, 0x72, 0x58, 0x7d, 0x18, 0xb3, 0xc8, 0x34, 0x52, 0xc0, 0xa5, 0x81,
-	0xe2, 0x07, 0x2c, 0x62, 0x78, 0x2f, 0x21, 0x29, 0xa6, 0xef, 0x28, 0x8b, 0x24, 0x65, 0x72, 0x58,
-	0xdc, 0x9b, 0x93, 0x34, 0x3d, 0x8f, 0x45, 0x66, 0xe4, 0x30, 0x2f, 0x4c, 0xb8, 0xc5, 0xea, 0xca,
-	0x03, 0x47, 0x34, 0x0a, 0x1c, 0xcb, 0x98, 0x98, 0xee, 0x98, 0x26, 0x84, 0xf2, 0x13, 0x82, 0xdd,
-	0xba, 0xeb, 0x32, 0xcb, 0x8c, 0xe8, 0x55, 0x1c, 0x8f, 0x4e, 0x1f, 0xc6, 0x34, 0x8c, 0xf0, 0x17,
-	0xb0, 0x95, 0x0a, 0x18, 0x9e, 0x39, 0xa2, 0x32, 0x2a, 0xa1, 0xca, 0xa6, 0x2e, 0xa6, 0x58, 0xdb,
-	0x1c, 0x51, 0xfc, 0x13, 0x60, 0x33, 0xa5, 0x1a, 0xcc, 0xa7, 0x01, 0x8f, 0x44, 0x16, 0x4a, 0xa8,
-	0x22, 0xd6, 0xbe, 0x52, 0x56, 0x65, 0xa1, 0xf0, 0xa3, 0x3a, 0x53, 0x8e, 0xbe, 0x33, 0xd5, 0x99,
-	0x41, 0xf8, 0x00, 0x76, 0xa6, 0xe7, 0x5b, 0xcc, 0xfb, 0xd9, 0x19, 0x1a, 0x8e, 0x2d, 0x67, 0x79,
-	0x10, 0x85, 0xf4, 0x87, 0xca, 0x71, 0xcd, 0x2e, 0xbf, 0xce, 0x40, 0x7e, 0x51, 0x31, 0x0e, 0x7f,
-	0x16, 0x52, 0xcc, 0x4c, 0xc3, 0x9f, 0x61, 0x9a, 0x8d, 0xf7, 0x41, 0x1c, 0xd1, 0xe8, 0x17, 0x66,
-	0x27, 0x09, 0x0a, 0x7c, 0x07, 0x24, 0x10, 0xcf, 0x6f, 0x1f, 0x44, 0x8b, 0x79, 0xe1, 0x78, 0x44,
-	0x83, 0x58, 0x22, 0x93, 0x6c, 0x98, 0x42, 0x9a, 0x8d, 0xbb, 0x90, 0x73, 0xcd, 0x3b, 0xea, 0x86,
-	0x72, 0xb6, 0x94, 0xa9, 0x88, 0xb5, 0xe3, 0x75, 0x92, 0x56, 0x5a, 0x9c, 0x4a, 0xbc, 0x28, 0x78,
-	0xd4, 0x53, 0x1d, 0x7c, 0x05, 0xdb, 0x49, 0x57, 0x24, 0x56, 0x85, 0xf2, 0x06, 0x17, 0x7e, 0x4f,
-	0x35, 0x2f, 0xf9, 0xe6, 0xeb, 0xd8, 0xd6, 0x1e, 0x8d, 0xf4, 0x2d, 0x2e, 0x91, 0x80, 0x21, 0x1e,
-	0x00, 0xa4, 0x92, 0xcc, 0xa6, 0x72, 0xae, 0x84, 0x2a, 0xf9, 0xda, 0xb7, 0x6b, 0x05, 0xca, 0x97,
-	0x97, 0xcc, 0xa6, 0xfa, 0xe6, 0xc3, 0xf4, 0xb3, 0xf8, 0x1d, 0x88, 0x73, 0x09, 0x60, 0x09, 0x32,
-	0xf7, 0xf4, 0x31, 0x2d, 0x73, 0xfc, 0x89, 0x77, 0x61, 0x83, 0x37, 0x5a, 0x5a, 0xd8, 0x64, 0x71,
-	0x22, 0x1c, 0xa3, 0xb2, 0x06, 0x9b, 0x33, 0x49, 0x5c, 0x00, 0x71, 0xd0, 0xee, 0x75, 0x89, 0xaa,
-	0x9d, 0x6a, 0xa4, 0x29, 0x7d, 0x84, 0x01, 0x72, 0xed, 0x8e, 0x7e, 0x59, 0x6f, 0x49, 0x28, 0xfe,
-	0xd9, 0x20, 0xbd, 0xbe, 0x41, 0x4e, 0x4f, 0x3b, 0x7a, 0x5f, 0x12, 0x70, 0x1e, 0x40, 0x3d, 0x23,
-	0xea, 0x85, 0xd1, 0x69, 0xb7, 0x6e, 0xa5, 0x4c, 0xf9, 0x6f, 0x01, 0x3e, 0x7b, 0xd6, 0xbe, 0xa1,
-	0xcf, 0xbc, 0x90, 0xbe, 0xa4, 0x01, 0xae, 0xa0, 0x30, 0xeb, 0x5f, 0x1a, 0x04, 0x2c, 0x08, 0x65,
-	0x81, 0x97, 0xbb, 0xf2, 0x82, 0xf2, 0x90, 0x98, 0xa0, 0xe7, 0xa7, 0x02, 0x7c, 0xb9, 0xc4, 0xbf,
-	0xcc, 0x07, 0xfb, 0xb7, 0xce, 0x45, 0xf8, 0x57, 0x00, 0x78, 0x17, 0x1d, 0xae, 0x43, 0xd6, 0x8a,
-	0x4d, 0x47, 0xdc, 0xf4, 0xaf, 0x5f, 0x9a, 0x95, 0xa2, 0xc6, 0x5e, 0x73, 0x2a, 0x96, 0xe1, 0xe3,
-	0x70, 0x7c, 0xf7, 0x2b, 0xb5, 0xa2, 0xd4, 0xc7, 0xe9, 0x12, 0x97, 0x40, 0xb4, 0x69, 0x68, 0x05,
-	0x8e, 0xcf, 0xaf, 0x7d, 0x72, 0x3b, 0xe6, 0xa1, 0xf2, 0x9f, 0x08, 0xb2, 0xea, 0x52, 0x8f, 0x3f,
-	0x07, 0xac, 0x93, 0x5e, 0x67, 0xa0, 0xab, 0xc4, 0x20, 0x37, 0x67, 0xf5, 0x41, 0xaf, 0x4f, 0x9a,
-	0xd2, 0x27, 0x31, 0xde, 0xd0, 0x5a, 0x2d, 0xad, 0xfd, 0x83, 0xd1, 0xee, 0xf4, 0x8d, 0xba, 0xda,
-	0xd7, 0xae, 0x89, 0x74, 0x8f, 0x3f, 0x85, 0x42, 0x57, 0xef, 0x9c, 0x13, 0xb5, 0x6f, 0x34, 0x49,
-	0x8b, 0xc4, 0x9b, 0xdd, 0x18, 0xac, 0x77, 0x35, 0xe3, 0x82, 0xdc, 0x1a, 0x5a, 0xfb, 0xba, 0xde,
-	0xd2, 0x9a, 0x92, 0x33, 0x0f, 0x92, 0x9b, 0xae, 0xa6, 0x93, 0xa6, 0xe4, 0xd7, 0x9e, 0x10, 0x14,
-	0x78, 0x7a, 0xea, 0x6c, 0xd6, 0xe2, 0xff, 0x10, 0x6c, 0x2f, 0x74, 0x0e, 0xae, 0xad, 0xae, 0xcf,
-	0xb2, 0x29, 0x59, 0x3c, 0x5a, 0x8b, 0x93, 0xb4, 0x66, 0xf9, 0x9b, 0x3f, 0xfe, 0x7f, 0xf5, 0x8f,
-	0xa0, 0x94, 0xbf, 0x8c, 0x67, 0x72, 0x4a, 0x0a, 0xab, 0xbf, 0xcd, 0x8f, 0xdb, 0xdf, 0x4f, 0xcc,
-	0x79, 0xea, 0x09, 0x3a, 0x68, 0xfc, 0x85, 0xa0, 0x64, 0xb1, 0xd1, 0xca, 0x03, 0x1b, 0xbb, 0xcf,
-	0xd2, 0xec, 0xc6, 0x43, 0xbe, 0x8b, 0x7e, 0x3c, 0x4f, 0x59, 0x43, 0xe6, 0x9a, 0xde, 0x50, 0x61,
-	0xc1, 0xb0, 0x3a, 0xa4, 0x1e, 0x7f, 0x02, 0xd2, 0x27, 0xc3, 0xf4, 0x9d, 0x70, 0xf9, 0xb3, 0xf1,
-	0xfd, 0x22, 0xf2, 0x06, 0xa1, 0xbb, 0x1c, 0x67, 0x1e, 0xbd, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbb,
-	0x98, 0x03, 0x4f, 0xe0, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/api/servicecontrol/v1/service_controller.pb.go b/googleapis/api/servicecontrol/v1/service_controller.pb.go
index 4034ca3439..75fa4e2721 100644
--- a/googleapis/api/servicecontrol/v1/service_controller.pb.go
+++ b/googleapis/api/servicecontrol/v1/service_controller.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/service_controller.proto
 
-package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package servicecontrol
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for the Check method.
 type CheckRequest struct {
@@ -51,16 +51,17 @@ func (m *CheckRequest) Reset()         { *m = CheckRequest{} }
 func (m *CheckRequest) String() string { return proto.CompactTextString(m) }
 func (*CheckRequest) ProtoMessage()    {}
 func (*CheckRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_controller_fa10647c90d68c28, []int{0}
+	return fileDescriptor_8f215053b51b20e0, []int{0}
 }
+
 func (m *CheckRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckRequest.Unmarshal(m, b)
 }
 func (m *CheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckRequest.Marshal(b, m, deterministic)
 }
-func (dst *CheckRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckRequest.Merge(dst, src)
+func (m *CheckRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckRequest.Merge(m, src)
 }
 func (m *CheckRequest) XXX_Size() int {
 	return xxx_messageInfo_CheckRequest.Size(m)
@@ -117,16 +118,17 @@ func (m *CheckResponse) Reset()         { *m = CheckResponse{} }
 func (m *CheckResponse) String() string { return proto.CompactTextString(m) }
 func (*CheckResponse) ProtoMessage()    {}
 func (*CheckResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_controller_fa10647c90d68c28, []int{1}
+	return fileDescriptor_8f215053b51b20e0, []int{1}
 }
+
 func (m *CheckResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckResponse.Unmarshal(m, b)
 }
 func (m *CheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckResponse.Marshal(b, m, deterministic)
 }
-func (dst *CheckResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckResponse.Merge(dst, src)
+func (m *CheckResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckResponse.Merge(m, src)
 }
 func (m *CheckResponse) XXX_Size() int {
 	return xxx_messageInfo_CheckResponse.Size(m)
@@ -177,16 +179,17 @@ func (m *CheckResponse_CheckInfo) Reset()         { *m = CheckResponse_CheckInfo
 func (m *CheckResponse_CheckInfo) String() string { return proto.CompactTextString(m) }
 func (*CheckResponse_CheckInfo) ProtoMessage()    {}
 func (*CheckResponse_CheckInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_controller_fa10647c90d68c28, []int{1, 0}
+	return fileDescriptor_8f215053b51b20e0, []int{1, 0}
 }
+
 func (m *CheckResponse_CheckInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckResponse_CheckInfo.Unmarshal(m, b)
 }
 func (m *CheckResponse_CheckInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckResponse_CheckInfo.Marshal(b, m, deterministic)
 }
-func (dst *CheckResponse_CheckInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckResponse_CheckInfo.Merge(dst, src)
+func (m *CheckResponse_CheckInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckResponse_CheckInfo.Merge(m, src)
 }
 func (m *CheckResponse_CheckInfo) XXX_Size() int {
 	return xxx_messageInfo_CheckResponse_CheckInfo.Size(m)
@@ -218,16 +221,17 @@ func (m *CheckResponse_ConsumerInfo) Reset()         { *m = CheckResponse_Consum
 func (m *CheckResponse_ConsumerInfo) String() string { return proto.CompactTextString(m) }
 func (*CheckResponse_ConsumerInfo) ProtoMessage()    {}
 func (*CheckResponse_ConsumerInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_controller_fa10647c90d68c28, []int{1, 1}
+	return fileDescriptor_8f215053b51b20e0, []int{1, 1}
 }
+
 func (m *CheckResponse_ConsumerInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckResponse_ConsumerInfo.Unmarshal(m, b)
 }
 func (m *CheckResponse_ConsumerInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckResponse_ConsumerInfo.Marshal(b, m, deterministic)
 }
-func (dst *CheckResponse_ConsumerInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckResponse_ConsumerInfo.Merge(dst, src)
+func (m *CheckResponse_ConsumerInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckResponse_ConsumerInfo.Merge(m, src)
 }
 func (m *CheckResponse_ConsumerInfo) XXX_Size() int {
 	return xxx_messageInfo_CheckResponse_ConsumerInfo.Size(m)
@@ -281,16 +285,17 @@ func (m *ReportRequest) Reset()         { *m = ReportRequest{} }
 func (m *ReportRequest) String() string { return proto.CompactTextString(m) }
 func (*ReportRequest) ProtoMessage()    {}
 func (*ReportRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_controller_fa10647c90d68c28, []int{2}
+	return fileDescriptor_8f215053b51b20e0, []int{2}
 }
+
 func (m *ReportRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportRequest.Unmarshal(m, b)
 }
 func (m *ReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReportRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportRequest.Merge(dst, src)
+func (m *ReportRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportRequest.Merge(m, src)
 }
 func (m *ReportRequest) XXX_Size() int {
 	return xxx_messageInfo_ReportRequest.Size(m)
@@ -350,16 +355,17 @@ func (m *ReportResponse) Reset()         { *m = ReportResponse{} }
 func (m *ReportResponse) String() string { return proto.CompactTextString(m) }
 func (*ReportResponse) ProtoMessage()    {}
 func (*ReportResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_controller_fa10647c90d68c28, []int{3}
+	return fileDescriptor_8f215053b51b20e0, []int{3}
 }
+
 func (m *ReportResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportResponse.Unmarshal(m, b)
 }
 func (m *ReportResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReportResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportResponse.Merge(dst, src)
+func (m *ReportResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportResponse.Merge(m, src)
 }
 func (m *ReportResponse) XXX_Size() int {
 	return xxx_messageInfo_ReportResponse.Size(m)
@@ -403,16 +409,17 @@ func (m *ReportResponse_ReportError) Reset()         { *m = ReportResponse_Repor
 func (m *ReportResponse_ReportError) String() string { return proto.CompactTextString(m) }
 func (*ReportResponse_ReportError) ProtoMessage()    {}
 func (*ReportResponse_ReportError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_controller_fa10647c90d68c28, []int{3, 0}
+	return fileDescriptor_8f215053b51b20e0, []int{3, 0}
 }
+
 func (m *ReportResponse_ReportError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportResponse_ReportError.Unmarshal(m, b)
 }
 func (m *ReportResponse_ReportError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportResponse_ReportError.Marshal(b, m, deterministic)
 }
-func (dst *ReportResponse_ReportError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportResponse_ReportError.Merge(dst, src)
+func (m *ReportResponse_ReportError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportResponse_ReportError.Merge(m, src)
 }
 func (m *ReportResponse_ReportError) XXX_Size() int {
 	return xxx_messageInfo_ReportResponse_ReportError.Size(m)
@@ -447,6 +454,53 @@ func init() {
 	proto.RegisterType((*ReportResponse_ReportError)(nil), "google.api.servicecontrol.v1.ReportResponse.ReportError")
 }
 
+func init() {
+	proto.RegisterFile("google/api/servicecontrol/v1/service_controller.proto", fileDescriptor_8f215053b51b20e0)
+}
+
+var fileDescriptor_8f215053b51b20e0 = []byte{
+	// 619 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xc1, 0x6e, 0xd3, 0x4c,
+	0x10, 0xd6, 0x3a, 0x6d, 0xa4, 0x4c, 0x9c, 0xfe, 0xea, 0x1e, 0x7e, 0x22, 0xab, 0x87, 0xd4, 0x12,
+	0x34, 0x4a, 0x8b, 0xad, 0x16, 0x55, 0x42, 0xe1, 0x44, 0xa3, 0xaa, 0x0a, 0x48, 0xa5, 0x72, 0x38,
+	0x21, 0xaa, 0xc8, 0xdd, 0x6c, 0x8c, 0x4b, 0xb2, 0x6b, 0xd6, 0x4e, 0x2e, 0x88, 0x0b, 0x0f, 0xc0,
+	0xa1, 0xbc, 0x01, 0xaa, 0xc4, 0x33, 0xf0, 0x1c, 0xbc, 0x02, 0x0f, 0x01, 0x37, 0x94, 0xdd, 0xb5,
+	0xeb, 0x08, 0x63, 0x92, 0x9b, 0xf7, 0xdb, 0x99, 0xf9, 0xbe, 0x9d, 0xf9, 0x3c, 0x70, 0x1c, 0x70,
+	0x1e, 0x4c, 0xa8, 0xeb, 0x47, 0xa1, 0x1b, 0x53, 0x31, 0x0f, 0x09, 0x25, 0x9c, 0x25, 0x82, 0x4f,
+	0xdc, 0xf9, 0x61, 0x8a, 0x0c, 0x35, 0x34, 0xa1, 0xc2, 0x89, 0x04, 0x4f, 0x38, 0xde, 0x51, 0x69,
+	0x8e, 0x1f, 0x85, 0xce, 0x72, 0x9a, 0x33, 0x3f, 0xb4, 0x76, 0x72, 0x45, 0x7d, 0xc6, 0x78, 0xe2,
+	0x27, 0x21, 0x67, 0xb1, 0xca, 0xb5, 0x9c, 0x52, 0x4a, 0xf2, 0x86, 0x92, 0xb7, 0x43, 0x2a, 0x04,
+	0xd7, 0x5c, 0xd6, 0x41, 0x69, 0x3c, 0x8f, 0xa8, 0x90, 0xe5, 0x75, 0xf4, 0x3d, 0x1d, 0x2d, 0x22,
+	0xe2, 0xc6, 0x89, 0x9f, 0xcc, 0x34, 0xad, 0x7d, 0x8b, 0xc0, 0xec, 0x2d, 0x8a, 0x7b, 0xf4, 0xdd,
+	0x8c, 0xc6, 0x09, 0xde, 0x05, 0x33, 0x7d, 0x1f, 0xf3, 0xa7, 0xb4, 0x89, 0x5a, 0xa8, 0x5d, 0xf3,
+	0xea, 0x1a, 0x3b, 0xf7, 0xa7, 0x14, 0x9f, 0x42, 0x2d, 0xab, 0xdf, 0x34, 0x5a, 0xa8, 0x5d, 0x3f,
+	0xda, 0x73, 0xca, 0x9e, 0xee, 0xbc, 0x48, 0xc3, 0xbd, 0xbb, 0x4c, 0xdc, 0x81, 0xed, 0x5c, 0x27,
+	0xc7, 0x61, 0x30, 0x0c, 0x47, 0xcd, 0x0d, 0x49, 0xf7, 0x9f, 0xbe, 0xe8, 0x49, 0xbc, 0x3f, 0xb2,
+	0x6f, 0x2b, 0xd0, 0xd0, 0x32, 0xe3, 0x88, 0xb3, 0x98, 0x2e, 0x74, 0x66, 0xa5, 0x16, 0x89, 0x5a,
+	0x67, 0x86, 0xf5, 0x47, 0xf8, 0x39, 0x98, 0xb9, 0xbe, 0xc5, 0x4d, 0xa3, 0x55, 0x69, 0xd7, 0x8f,
+	0xda, 0xe5, 0x52, 0x25, 0xcb, 0xe9, 0x22, 0xc1, 0xab, 0x93, 0xec, 0x3b, 0x2e, 0x56, 0xbb, 0x59,
+	0xa8, 0x16, 0xbf, 0x04, 0x50, 0xc4, 0x21, 0x1b, 0xf3, 0x66, 0x55, 0x76, 0xe8, 0x78, 0x05, 0xda,
+	0xf4, 0x71, 0xea, 0xd4, 0x67, 0x63, 0xee, 0xd5, 0x48, 0xfa, 0x69, 0x5d, 0x43, 0x2d, 0xc3, 0xf1,
+	0x25, 0x34, 0x08, 0x67, 0xf1, 0x6c, 0x4a, 0x85, 0x62, 0x51, 0x73, 0x78, 0xbc, 0x16, 0x8b, 0x2e,
+	0x20, 0x89, 0x4c, 0x92, 0x3b, 0x59, 0xc7, 0x60, 0xe6, 0x6f, 0xf1, 0x7d, 0xd8, 0x8a, 0x04, 0xbf,
+	0xa6, 0x24, 0x19, 0xb2, 0xd9, 0xf4, 0x8a, 0x0a, 0xd9, 0xef, 0x8a, 0xd7, 0xd0, 0xe8, 0xb9, 0x04,
+	0xed, 0xaf, 0x08, 0x1a, 0x1e, 0x8d, 0xb8, 0x48, 0xd6, 0xb0, 0xd3, 0x19, 0x40, 0x36, 0xb5, 0x74,
+	0x48, 0x2b, 0xfb, 0x29, 0x97, 0x5a, 0x3c, 0xa2, 0x4a, 0xb1, 0xa1, 0x7e, 0x21, 0xd8, 0x4a, 0x95,
+	0x6a, 0x47, 0x5d, 0x42, 0x43, 0x48, 0x24, 0xf5, 0x0b, 0x92, 0x52, 0xfe, 0xd1, 0xd2, 0xe5, 0x22,
+	0xfa, 0xa8, 0xfc, 0x63, 0x8a, 0xbb, 0xc3, 0x5f, 0xd4, 0x19, 0x85, 0xea, 0xac, 0xd7, 0x50, 0xcf,
+	0x15, 0x5a, 0xc5, 0xeb, 0x1d, 0xa8, 0xaa, 0xff, 0x5a, 0x1b, 0x01, 0xa7, 0xaa, 0x45, 0x44, 0x9c,
+	0x81, 0xbc, 0xf1, 0x74, 0xc4, 0xd1, 0x37, 0x03, 0xb6, 0x07, 0x19, 0xa3, 0x5e, 0x61, 0xf8, 0x13,
+	0x82, 0x4d, 0xe9, 0x0f, 0xdc, 0x59, 0xc9, 0x44, 0x72, 0xbe, 0xd6, 0xfe, 0x1a, 0x86, 0xb3, 0x0f,
+	0x3e, 0x7e, 0xff, 0xf1, 0xd9, 0x78, 0x60, 0xef, 0xe6, 0xb6, 0x68, 0xec, 0xbe, 0xcf, 0x1b, 0xe4,
+	0x43, 0x57, 0x1a, 0xbe, 0x8b, 0x3a, 0xf8, 0x06, 0x41, 0x55, 0x75, 0x01, 0xef, 0xaf, 0x36, 0x03,
+	0x25, 0xe9, 0x60, 0x9d, 0x81, 0xd9, 0x0f, 0xa5, 0xa6, 0x3d, 0xdb, 0x2e, 0xd3, 0xa4, 0x06, 0xd9,
+	0x45, 0x9d, 0x93, 0x1b, 0x04, 0x2d, 0xc2, 0xa7, 0xa5, 0x14, 0x27, 0xff, 0xff, 0xd1, 0xdd, 0x8b,
+	0xc5, 0xb2, 0xbd, 0x40, 0xaf, 0x9e, 0xe9, 0xbc, 0x80, 0x4f, 0x7c, 0x16, 0x38, 0x5c, 0x04, 0x6e,
+	0x40, 0x99, 0x5c, 0xc5, 0xae, 0xba, 0xf2, 0xa3, 0x30, 0x2e, 0x5e, 0xea, 0x4f, 0x96, 0x91, 0x9f,
+	0x08, 0x7d, 0x31, 0x36, 0xce, 0x9e, 0x0e, 0x7a, 0x57, 0x55, 0x59, 0xe0, 0xd1, 0xef, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x5e, 0x28, 0x7b, 0xe6, 0xb7, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -609,50 +663,3 @@ var _ServiceController_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/api/servicecontrol/v1/service_controller.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/service_controller.proto", fileDescriptor_service_controller_fa10647c90d68c28)
-}
-
-var fileDescriptor_service_controller_fa10647c90d68c28 = []byte{
-	// 619 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0xd6, 0x3a, 0x6d, 0xa4, 0x4c, 0x9c, 0xfe, 0xea, 0x1e, 0x7e, 0x22, 0xab, 0x87, 0xd4, 0x12,
-	0x34, 0x4a, 0x8b, 0xad, 0x16, 0x55, 0x42, 0xe1, 0x44, 0xa3, 0xaa, 0x0a, 0x48, 0xa5, 0x72, 0x38,
-	0x21, 0xaa, 0xc8, 0xdd, 0x6c, 0x8c, 0x4b, 0xb2, 0x6b, 0xd6, 0x4e, 0x2e, 0x88, 0x0b, 0x0f, 0xc0,
-	0xa1, 0xbc, 0x01, 0xaa, 0xc4, 0x33, 0xf0, 0x1c, 0xbc, 0x02, 0x0f, 0x01, 0x37, 0x94, 0xdd, 0xb5,
-	0xeb, 0x08, 0x63, 0x92, 0x9b, 0xf7, 0xdb, 0x99, 0xf9, 0xbe, 0x9d, 0xf9, 0x3c, 0x70, 0x1c, 0x70,
-	0x1e, 0x4c, 0xa8, 0xeb, 0x47, 0xa1, 0x1b, 0x53, 0x31, 0x0f, 0x09, 0x25, 0x9c, 0x25, 0x82, 0x4f,
-	0xdc, 0xf9, 0x61, 0x8a, 0x0c, 0x35, 0x34, 0xa1, 0xc2, 0x89, 0x04, 0x4f, 0x38, 0xde, 0x51, 0x69,
-	0x8e, 0x1f, 0x85, 0xce, 0x72, 0x9a, 0x33, 0x3f, 0xb4, 0x76, 0x72, 0x45, 0x7d, 0xc6, 0x78, 0xe2,
-	0x27, 0x21, 0x67, 0xb1, 0xca, 0xb5, 0x9c, 0x52, 0x4a, 0xf2, 0x86, 0x92, 0xb7, 0x43, 0x2a, 0x04,
-	0xd7, 0x5c, 0xd6, 0x41, 0x69, 0x3c, 0x8f, 0xa8, 0x90, 0xe5, 0x75, 0xf4, 0x3d, 0x1d, 0x2d, 0x22,
-	0xe2, 0xc6, 0x89, 0x9f, 0xcc, 0x34, 0xad, 0x7d, 0x8b, 0xc0, 0xec, 0x2d, 0x8a, 0x7b, 0xf4, 0xdd,
-	0x8c, 0xc6, 0x09, 0xde, 0x05, 0x33, 0x7d, 0x1f, 0xf3, 0xa7, 0xb4, 0x89, 0x5a, 0xa8, 0x5d, 0xf3,
-	0xea, 0x1a, 0x3b, 0xf7, 0xa7, 0x14, 0x9f, 0x42, 0x2d, 0xab, 0xdf, 0x34, 0x5a, 0xa8, 0x5d, 0x3f,
-	0xda, 0x73, 0xca, 0x9e, 0xee, 0xbc, 0x48, 0xc3, 0xbd, 0xbb, 0x4c, 0xdc, 0x81, 0xed, 0x5c, 0x27,
-	0xc7, 0x61, 0x30, 0x0c, 0x47, 0xcd, 0x0d, 0x49, 0xf7, 0x9f, 0xbe, 0xe8, 0x49, 0xbc, 0x3f, 0xb2,
-	0x6f, 0x2b, 0xd0, 0xd0, 0x32, 0xe3, 0x88, 0xb3, 0x98, 0x2e, 0x74, 0x66, 0xa5, 0x16, 0x89, 0x5a,
-	0x67, 0x86, 0xf5, 0x47, 0xf8, 0x39, 0x98, 0xb9, 0xbe, 0xc5, 0x4d, 0xa3, 0x55, 0x69, 0xd7, 0x8f,
-	0xda, 0xe5, 0x52, 0x25, 0xcb, 0xe9, 0x22, 0xc1, 0xab, 0x93, 0xec, 0x3b, 0x2e, 0x56, 0xbb, 0x59,
-	0xa8, 0x16, 0xbf, 0x04, 0x50, 0xc4, 0x21, 0x1b, 0xf3, 0x66, 0x55, 0x76, 0xe8, 0x78, 0x05, 0xda,
-	0xf4, 0x71, 0xea, 0xd4, 0x67, 0x63, 0xee, 0xd5, 0x48, 0xfa, 0x69, 0x5d, 0x43, 0x2d, 0xc3, 0xf1,
-	0x25, 0x34, 0x08, 0x67, 0xf1, 0x6c, 0x4a, 0x85, 0x62, 0x51, 0x73, 0x78, 0xbc, 0x16, 0x8b, 0x2e,
-	0x20, 0x89, 0x4c, 0x92, 0x3b, 0x59, 0xc7, 0x60, 0xe6, 0x6f, 0xf1, 0x7d, 0xd8, 0x8a, 0x04, 0xbf,
-	0xa6, 0x24, 0x19, 0xb2, 0xd9, 0xf4, 0x8a, 0x0a, 0xd9, 0xef, 0x8a, 0xd7, 0xd0, 0xe8, 0xb9, 0x04,
-	0xed, 0xaf, 0x08, 0x1a, 0x1e, 0x8d, 0xb8, 0x48, 0xd6, 0xb0, 0xd3, 0x19, 0x40, 0x36, 0xb5, 0x74,
-	0x48, 0x2b, 0xfb, 0x29, 0x97, 0x5a, 0x3c, 0xa2, 0x4a, 0xb1, 0xa1, 0x7e, 0x21, 0xd8, 0x4a, 0x95,
-	0x6a, 0x47, 0x5d, 0x42, 0x43, 0x48, 0x24, 0xf5, 0x0b, 0x92, 0x52, 0xfe, 0xd1, 0xd2, 0xe5, 0x22,
-	0xfa, 0xa8, 0xfc, 0x63, 0x8a, 0xbb, 0xc3, 0x5f, 0xd4, 0x19, 0x85, 0xea, 0xac, 0xd7, 0x50, 0xcf,
-	0x15, 0x5a, 0xc5, 0xeb, 0x1d, 0xa8, 0xaa, 0xff, 0x5a, 0x1b, 0x01, 0xa7, 0xaa, 0x45, 0x44, 0x9c,
-	0x81, 0xbc, 0xf1, 0x74, 0xc4, 0xd1, 0x37, 0x03, 0xb6, 0x07, 0x19, 0xa3, 0x5e, 0x61, 0xf8, 0x13,
-	0x82, 0x4d, 0xe9, 0x0f, 0xdc, 0x59, 0xc9, 0x44, 0x72, 0xbe, 0xd6, 0xfe, 0x1a, 0x86, 0xb3, 0x0f,
-	0x3e, 0x7e, 0xff, 0xf1, 0xd9, 0x78, 0x60, 0xef, 0xe6, 0xb6, 0x68, 0xec, 0xbe, 0xcf, 0x1b, 0xe4,
-	0x43, 0x57, 0x1a, 0xbe, 0x8b, 0x3a, 0xf8, 0x06, 0x41, 0x55, 0x75, 0x01, 0xef, 0xaf, 0x36, 0x03,
-	0x25, 0xe9, 0x60, 0x9d, 0x81, 0xd9, 0x0f, 0xa5, 0xa6, 0x3d, 0xdb, 0x2e, 0xd3, 0xa4, 0x06, 0xd9,
-	0x45, 0x9d, 0x93, 0x1b, 0x04, 0x2d, 0xc2, 0xa7, 0xa5, 0x14, 0x27, 0xff, 0xff, 0xd1, 0xdd, 0x8b,
-	0xc5, 0xb2, 0xbd, 0x40, 0xaf, 0x9e, 0xe9, 0xbc, 0x80, 0x4f, 0x7c, 0x16, 0x38, 0x5c, 0x04, 0x6e,
-	0x40, 0x99, 0x5c, 0xc5, 0xae, 0xba, 0xf2, 0xa3, 0x30, 0x2e, 0x5e, 0xea, 0x4f, 0x96, 0x91, 0x9f,
-	0x08, 0x7d, 0x31, 0x36, 0xce, 0x9e, 0x0e, 0x7a, 0x57, 0x55, 0x59, 0xe0, 0xd1, 0xef, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x5e, 0x28, 0x7b, 0xe6, 0xb7, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/api/servicemanagement/v1/resources.pb.go b/googleapis/api/servicemanagement/v1/resources.pb.go
index d8b8b44928..a00ed2029d 100644
--- a/googleapis/api/servicemanagement/v1/resources.pb.go
+++ b/googleapis/api/servicemanagement/v1/resources.pb.go
@@ -1,21 +1,24 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicemanagement/v1/resources.proto
 
-package servicemanagement // import "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import configchange "google.golang.org/genproto/googleapis/api/configchange"
-import _ "google.golang.org/genproto/googleapis/api/metric"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import _ "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package servicemanagement
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	configchange "google.golang.org/genproto/googleapis/api/configchange"
+	_ "google.golang.org/genproto/googleapis/api/metric"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
+	_ "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -26,7 +29,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Code describes the status of the operation (or one of its steps).
 type OperationMetadata_Status int32
@@ -55,6 +58,7 @@ var OperationMetadata_Status_name = map[int32]string{
 	4: "FAILED",
 	5: "CANCELLED",
 }
+
 var OperationMetadata_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"DONE":               1,
@@ -67,8 +71,9 @@ var OperationMetadata_Status_value = map[string]int32{
 func (x OperationMetadata_Status) String() string {
 	return proto.EnumName(OperationMetadata_Status_name, int32(x))
 }
+
 func (OperationMetadata_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{1, 0}
+	return fileDescriptor_16a1de86d13c4f21, []int{1, 0}
 }
 
 // The kind of diagnostic information possible.
@@ -85,6 +90,7 @@ var Diagnostic_Kind_name = map[int32]string{
 	0: "WARNING",
 	1: "ERROR",
 }
+
 var Diagnostic_Kind_value = map[string]int32{
 	"WARNING": 0,
 	"ERROR":   1,
@@ -93,8 +99,9 @@ var Diagnostic_Kind_value = map[string]int32{
 func (x Diagnostic_Kind) String() string {
 	return proto.EnumName(Diagnostic_Kind_name, int32(x))
 }
+
 func (Diagnostic_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{2, 0}
+	return fileDescriptor_16a1de86d13c4f21, []int{2, 0}
 }
 
 type ConfigFile_FileType int32
@@ -132,6 +139,7 @@ var ConfigFile_FileType_name = map[int32]string{
 	4: "FILE_DESCRIPTOR_SET_PROTO",
 	6: "PROTO_FILE",
 }
+
 var ConfigFile_FileType_value = map[string]int32{
 	"FILE_TYPE_UNSPECIFIED":     0,
 	"SERVICE_CONFIG_YAML":       1,
@@ -144,8 +152,9 @@ var ConfigFile_FileType_value = map[string]int32{
 func (x ConfigFile_FileType) String() string {
 	return proto.EnumName(ConfigFile_FileType_name, int32(x))
 }
+
 func (ConfigFile_FileType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{4, 0}
+	return fileDescriptor_16a1de86d13c4f21, []int{4, 0}
 }
 
 // Status of a Rollout.
@@ -179,6 +188,7 @@ var Rollout_RolloutStatus_name = map[int32]string{
 	5: "PENDING",
 	6: "FAILED_ROLLED_BACK",
 }
+
 var Rollout_RolloutStatus_value = map[string]int32{
 	"ROLLOUT_STATUS_UNSPECIFIED": 0,
 	"IN_PROGRESS":                1,
@@ -192,8 +202,9 @@ var Rollout_RolloutStatus_value = map[string]int32{
 func (x Rollout_RolloutStatus) String() string {
 	return proto.EnumName(Rollout_RolloutStatus_name, int32(x))
 }
+
 func (Rollout_RolloutStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{7, 0}
+	return fileDescriptor_16a1de86d13c4f21, []int{7, 0}
 }
 
 // The full representation of a Service that is managed by
@@ -213,16 +224,17 @@ func (m *ManagedService) Reset()         { *m = ManagedService{} }
 func (m *ManagedService) String() string { return proto.CompactTextString(m) }
 func (*ManagedService) ProtoMessage()    {}
 func (*ManagedService) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{0}
+	return fileDescriptor_16a1de86d13c4f21, []int{0}
 }
+
 func (m *ManagedService) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManagedService.Unmarshal(m, b)
 }
 func (m *ManagedService) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManagedService.Marshal(b, m, deterministic)
 }
-func (dst *ManagedService) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManagedService.Merge(dst, src)
+func (m *ManagedService) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedService.Merge(m, src)
 }
 func (m *ManagedService) XXX_Size() int {
 	return xxx_messageInfo_ManagedService.Size(m)
@@ -267,16 +279,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{1}
+	return fileDescriptor_16a1de86d13c4f21, []int{1}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -330,16 +343,17 @@ func (m *OperationMetadata_Step) Reset()         { *m = OperationMetadata_Step{}
 func (m *OperationMetadata_Step) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata_Step) ProtoMessage()    {}
 func (*OperationMetadata_Step) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{1, 0}
+	return fileDescriptor_16a1de86d13c4f21, []int{1, 0}
 }
+
 func (m *OperationMetadata_Step) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata_Step.Unmarshal(m, b)
 }
 func (m *OperationMetadata_Step) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata_Step.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata_Step) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata_Step.Merge(dst, src)
+func (m *OperationMetadata_Step) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata_Step.Merge(m, src)
 }
 func (m *OperationMetadata_Step) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata_Step.Size(m)
@@ -381,16 +395,17 @@ func (m *Diagnostic) Reset()         { *m = Diagnostic{} }
 func (m *Diagnostic) String() string { return proto.CompactTextString(m) }
 func (*Diagnostic) ProtoMessage()    {}
 func (*Diagnostic) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{2}
+	return fileDescriptor_16a1de86d13c4f21, []int{2}
 }
+
 func (m *Diagnostic) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Diagnostic.Unmarshal(m, b)
 }
 func (m *Diagnostic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Diagnostic.Marshal(b, m, deterministic)
 }
-func (dst *Diagnostic) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Diagnostic.Merge(dst, src)
+func (m *Diagnostic) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Diagnostic.Merge(m, src)
 }
 func (m *Diagnostic) XXX_Size() int {
 	return xxx_messageInfo_Diagnostic.Size(m)
@@ -441,16 +456,17 @@ func (m *ConfigSource) Reset()         { *m = ConfigSource{} }
 func (m *ConfigSource) String() string { return proto.CompactTextString(m) }
 func (*ConfigSource) ProtoMessage()    {}
 func (*ConfigSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{3}
+	return fileDescriptor_16a1de86d13c4f21, []int{3}
 }
+
 func (m *ConfigSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfigSource.Unmarshal(m, b)
 }
 func (m *ConfigSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfigSource.Marshal(b, m, deterministic)
 }
-func (dst *ConfigSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfigSource.Merge(dst, src)
+func (m *ConfigSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigSource.Merge(m, src)
 }
 func (m *ConfigSource) XXX_Size() int {
 	return xxx_messageInfo_ConfigSource.Size(m)
@@ -492,16 +508,17 @@ func (m *ConfigFile) Reset()         { *m = ConfigFile{} }
 func (m *ConfigFile) String() string { return proto.CompactTextString(m) }
 func (*ConfigFile) ProtoMessage()    {}
 func (*ConfigFile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{4}
+	return fileDescriptor_16a1de86d13c4f21, []int{4}
 }
+
 func (m *ConfigFile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfigFile.Unmarshal(m, b)
 }
 func (m *ConfigFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfigFile.Marshal(b, m, deterministic)
 }
-func (dst *ConfigFile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfigFile.Merge(dst, src)
+func (m *ConfigFile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigFile.Merge(m, src)
 }
 func (m *ConfigFile) XXX_Size() int {
 	return xxx_messageInfo_ConfigFile.Size(m)
@@ -547,16 +564,17 @@ func (m *ConfigRef) Reset()         { *m = ConfigRef{} }
 func (m *ConfigRef) String() string { return proto.CompactTextString(m) }
 func (*ConfigRef) ProtoMessage()    {}
 func (*ConfigRef) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{5}
+	return fileDescriptor_16a1de86d13c4f21, []int{5}
 }
+
 func (m *ConfigRef) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfigRef.Unmarshal(m, b)
 }
 func (m *ConfigRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfigRef.Marshal(b, m, deterministic)
 }
-func (dst *ConfigRef) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfigRef.Merge(dst, src)
+func (m *ConfigRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigRef.Merge(m, src)
 }
 func (m *ConfigRef) XXX_Size() int {
 	return xxx_messageInfo_ConfigRef.Size(m)
@@ -594,16 +612,17 @@ func (m *ChangeReport) Reset()         { *m = ChangeReport{} }
 func (m *ChangeReport) String() string { return proto.CompactTextString(m) }
 func (*ChangeReport) ProtoMessage()    {}
 func (*ChangeReport) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{6}
+	return fileDescriptor_16a1de86d13c4f21, []int{6}
 }
+
 func (m *ChangeReport) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChangeReport.Unmarshal(m, b)
 }
 func (m *ChangeReport) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChangeReport.Marshal(b, m, deterministic)
 }
-func (dst *ChangeReport) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChangeReport.Merge(dst, src)
+func (m *ChangeReport) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeReport.Merge(m, src)
 }
 func (m *ChangeReport) XXX_Size() int {
 	return xxx_messageInfo_ChangeReport.Size(m)
@@ -661,16 +680,17 @@ func (m *Rollout) Reset()         { *m = Rollout{} }
 func (m *Rollout) String() string { return proto.CompactTextString(m) }
 func (*Rollout) ProtoMessage()    {}
 func (*Rollout) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{7}
+	return fileDescriptor_16a1de86d13c4f21, []int{7}
 }
+
 func (m *Rollout) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Rollout.Unmarshal(m, b)
 }
 func (m *Rollout) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Rollout.Marshal(b, m, deterministic)
 }
-func (dst *Rollout) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Rollout.Merge(dst, src)
+func (m *Rollout) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rollout.Merge(m, src)
 }
 func (m *Rollout) XXX_Size() int {
 	return xxx_messageInfo_Rollout.Size(m)
@@ -753,80 +773,14 @@ func (m *Rollout) GetServiceName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Rollout) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Rollout_OneofMarshaler, _Rollout_OneofUnmarshaler, _Rollout_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Rollout) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Rollout_TrafficPercentStrategy_)(nil),
 		(*Rollout_DeleteServiceStrategy_)(nil),
 	}
 }
 
-func _Rollout_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Rollout)
-	// strategy
-	switch x := m.Strategy.(type) {
-	case *Rollout_TrafficPercentStrategy_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TrafficPercentStrategy); err != nil {
-			return err
-		}
-	case *Rollout_DeleteServiceStrategy_:
-		b.EncodeVarint(200<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteServiceStrategy); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Rollout.Strategy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Rollout_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Rollout)
-	switch tag {
-	case 5: // strategy.traffic_percent_strategy
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Rollout_TrafficPercentStrategy)
-		err := b.DecodeMessage(msg)
-		m.Strategy = &Rollout_TrafficPercentStrategy_{msg}
-		return true, err
-	case 200: // strategy.delete_service_strategy
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Rollout_DeleteServiceStrategy)
-		err := b.DecodeMessage(msg)
-		m.Strategy = &Rollout_DeleteServiceStrategy_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Rollout_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Rollout)
-	// strategy
-	switch x := m.Strategy.(type) {
-	case *Rollout_TrafficPercentStrategy_:
-		s := proto.Size(x.TrafficPercentStrategy)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Rollout_DeleteServiceStrategy_:
-		s := proto.Size(x.DeleteServiceStrategy)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Strategy that specifies how clients of Google Service Controller want to
 // send traffic to use different config versions. This is generally
 // used by API proxy to split traffic based on your configured precentage for
@@ -871,16 +825,17 @@ func (m *Rollout_TrafficPercentStrategy) Reset()         { *m = Rollout_TrafficP
 func (m *Rollout_TrafficPercentStrategy) String() string { return proto.CompactTextString(m) }
 func (*Rollout_TrafficPercentStrategy) ProtoMessage()    {}
 func (*Rollout_TrafficPercentStrategy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{7, 0}
+	return fileDescriptor_16a1de86d13c4f21, []int{7, 0}
 }
+
 func (m *Rollout_TrafficPercentStrategy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Rollout_TrafficPercentStrategy.Unmarshal(m, b)
 }
 func (m *Rollout_TrafficPercentStrategy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Rollout_TrafficPercentStrategy.Marshal(b, m, deterministic)
 }
-func (dst *Rollout_TrafficPercentStrategy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Rollout_TrafficPercentStrategy.Merge(dst, src)
+func (m *Rollout_TrafficPercentStrategy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rollout_TrafficPercentStrategy.Merge(m, src)
 }
 func (m *Rollout_TrafficPercentStrategy) XXX_Size() int {
 	return xxx_messageInfo_Rollout_TrafficPercentStrategy.Size(m)
@@ -910,16 +865,17 @@ func (m *Rollout_DeleteServiceStrategy) Reset()         { *m = Rollout_DeleteSer
 func (m *Rollout_DeleteServiceStrategy) String() string { return proto.CompactTextString(m) }
 func (*Rollout_DeleteServiceStrategy) ProtoMessage()    {}
 func (*Rollout_DeleteServiceStrategy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_7973d4fc0911200f, []int{7, 1}
+	return fileDescriptor_16a1de86d13c4f21, []int{7, 1}
 }
+
 func (m *Rollout_DeleteServiceStrategy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Rollout_DeleteServiceStrategy.Unmarshal(m, b)
 }
 func (m *Rollout_DeleteServiceStrategy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Rollout_DeleteServiceStrategy.Marshal(b, m, deterministic)
 }
-func (dst *Rollout_DeleteServiceStrategy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Rollout_DeleteServiceStrategy.Merge(dst, src)
+func (m *Rollout_DeleteServiceStrategy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rollout_DeleteServiceStrategy.Merge(m, src)
 }
 func (m *Rollout_DeleteServiceStrategy) XXX_Size() int {
 	return xxx_messageInfo_Rollout_DeleteServiceStrategy.Size(m)
@@ -931,6 +887,10 @@ func (m *Rollout_DeleteServiceStrategy) XXX_DiscardUnknown() {
 var xxx_messageInfo_Rollout_DeleteServiceStrategy proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("google.api.servicemanagement.v1.OperationMetadata_Status", OperationMetadata_Status_name, OperationMetadata_Status_value)
+	proto.RegisterEnum("google.api.servicemanagement.v1.Diagnostic_Kind", Diagnostic_Kind_name, Diagnostic_Kind_value)
+	proto.RegisterEnum("google.api.servicemanagement.v1.ConfigFile_FileType", ConfigFile_FileType_name, ConfigFile_FileType_value)
+	proto.RegisterEnum("google.api.servicemanagement.v1.Rollout_RolloutStatus", Rollout_RolloutStatus_name, Rollout_RolloutStatus_value)
 	proto.RegisterType((*ManagedService)(nil), "google.api.servicemanagement.v1.ManagedService")
 	proto.RegisterType((*OperationMetadata)(nil), "google.api.servicemanagement.v1.OperationMetadata")
 	proto.RegisterType((*OperationMetadata_Step)(nil), "google.api.servicemanagement.v1.OperationMetadata.Step")
@@ -943,17 +903,13 @@ func init() {
 	proto.RegisterType((*Rollout_TrafficPercentStrategy)(nil), "google.api.servicemanagement.v1.Rollout.TrafficPercentStrategy")
 	proto.RegisterMapType((map[string]float64)(nil), "google.api.servicemanagement.v1.Rollout.TrafficPercentStrategy.PercentagesEntry")
 	proto.RegisterType((*Rollout_DeleteServiceStrategy)(nil), "google.api.servicemanagement.v1.Rollout.DeleteServiceStrategy")
-	proto.RegisterEnum("google.api.servicemanagement.v1.OperationMetadata_Status", OperationMetadata_Status_name, OperationMetadata_Status_value)
-	proto.RegisterEnum("google.api.servicemanagement.v1.Diagnostic_Kind", Diagnostic_Kind_name, Diagnostic_Kind_value)
-	proto.RegisterEnum("google.api.servicemanagement.v1.ConfigFile_FileType", ConfigFile_FileType_name, ConfigFile_FileType_value)
-	proto.RegisterEnum("google.api.servicemanagement.v1.Rollout_RolloutStatus", Rollout_RolloutStatus_name, Rollout_RolloutStatus_value)
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicemanagement/v1/resources.proto", fileDescriptor_resources_7973d4fc0911200f)
+	proto.RegisterFile("google/api/servicemanagement/v1/resources.proto", fileDescriptor_16a1de86d13c4f21)
 }
 
-var fileDescriptor_resources_7973d4fc0911200f = []byte{
+var fileDescriptor_16a1de86d13c4f21 = []byte{
 	// 1234 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xef, 0x8e, 0xdb, 0x44,
 	0x10, 0xaf, 0xf3, 0xef, 0x2e, 0x93, 0xbb, 0xe0, 0x6e, 0x69, 0x2f, 0x0d, 0xfd, 0x73, 0x4d, 0x85,
diff --git a/googleapis/api/servicemanagement/v1/servicemanager.pb.go b/googleapis/api/servicemanagement/v1/servicemanager.pb.go
index 45729df925..24042f170a 100644
--- a/googleapis/api/servicemanagement/v1/servicemanager.pb.go
+++ b/googleapis/api/servicemanagement/v1/servicemanager.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicemanagement/v1/servicemanager.proto
 
-package servicemanagement // import "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import serviceconfig "google.golang.org/genproto/googleapis/api/serviceconfig"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package servicemanagement
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	serviceconfig "google.golang.org/genproto/googleapis/api/serviceconfig"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -28,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type GetServiceConfigRequest_ConfigView int32
 
@@ -46,6 +46,7 @@ var GetServiceConfigRequest_ConfigView_name = map[int32]string{
 	0: "BASIC",
 	1: "FULL",
 }
+
 var GetServiceConfigRequest_ConfigView_value = map[string]int32{
 	"BASIC": 0,
 	"FULL":  1,
@@ -54,8 +55,9 @@ var GetServiceConfigRequest_ConfigView_value = map[string]int32{
 func (x GetServiceConfigRequest_ConfigView) String() string {
 	return proto.EnumName(GetServiceConfigRequest_ConfigView_name, int32(x))
 }
+
 func (GetServiceConfigRequest_ConfigView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{7, 0}
+	return fileDescriptor_e7934ed1b66ee227, []int{7, 0}
 }
 
 // Request message for `ListServices` method.
@@ -82,16 +84,17 @@ func (m *ListServicesRequest) Reset()         { *m = ListServicesRequest{} }
 func (m *ListServicesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListServicesRequest) ProtoMessage()    {}
 func (*ListServicesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{0}
+	return fileDescriptor_e7934ed1b66ee227, []int{0}
 }
+
 func (m *ListServicesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServicesRequest.Unmarshal(m, b)
 }
 func (m *ListServicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServicesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListServicesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServicesRequest.Merge(dst, src)
+func (m *ListServicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesRequest.Merge(m, src)
 }
 func (m *ListServicesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListServicesRequest.Size(m)
@@ -145,16 +148,17 @@ func (m *ListServicesResponse) Reset()         { *m = ListServicesResponse{} }
 func (m *ListServicesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListServicesResponse) ProtoMessage()    {}
 func (*ListServicesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{1}
+	return fileDescriptor_e7934ed1b66ee227, []int{1}
 }
+
 func (m *ListServicesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServicesResponse.Unmarshal(m, b)
 }
 func (m *ListServicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServicesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListServicesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServicesResponse.Merge(dst, src)
+func (m *ListServicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesResponse.Merge(m, src)
 }
 func (m *ListServicesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListServicesResponse.Size(m)
@@ -193,16 +197,17 @@ func (m *GetServiceRequest) Reset()         { *m = GetServiceRequest{} }
 func (m *GetServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServiceRequest) ProtoMessage()    {}
 func (*GetServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{2}
+	return fileDescriptor_e7934ed1b66ee227, []int{2}
 }
+
 func (m *GetServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServiceRequest.Unmarshal(m, b)
 }
 func (m *GetServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServiceRequest.Merge(dst, src)
+func (m *GetServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceRequest.Merge(m, src)
 }
 func (m *GetServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServiceRequest.Size(m)
@@ -233,16 +238,17 @@ func (m *CreateServiceRequest) Reset()         { *m = CreateServiceRequest{} }
 func (m *CreateServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateServiceRequest) ProtoMessage()    {}
 func (*CreateServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{3}
+	return fileDescriptor_e7934ed1b66ee227, []int{3}
 }
+
 func (m *CreateServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateServiceRequest.Unmarshal(m, b)
 }
 func (m *CreateServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateServiceRequest.Merge(dst, src)
+func (m *CreateServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceRequest.Merge(m, src)
 }
 func (m *CreateServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateServiceRequest.Size(m)
@@ -274,16 +280,17 @@ func (m *DeleteServiceRequest) Reset()         { *m = DeleteServiceRequest{} }
 func (m *DeleteServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteServiceRequest) ProtoMessage()    {}
 func (*DeleteServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{4}
+	return fileDescriptor_e7934ed1b66ee227, []int{4}
 }
+
 func (m *DeleteServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteServiceRequest.Unmarshal(m, b)
 }
 func (m *DeleteServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteServiceRequest.Merge(dst, src)
+func (m *DeleteServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceRequest.Merge(m, src)
 }
 func (m *DeleteServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteServiceRequest.Size(m)
@@ -315,16 +322,17 @@ func (m *UndeleteServiceRequest) Reset()         { *m = UndeleteServiceRequest{}
 func (m *UndeleteServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*UndeleteServiceRequest) ProtoMessage()    {}
 func (*UndeleteServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{5}
+	return fileDescriptor_e7934ed1b66ee227, []int{5}
 }
+
 func (m *UndeleteServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeleteServiceRequest.Unmarshal(m, b)
 }
 func (m *UndeleteServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeleteServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UndeleteServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeleteServiceRequest.Merge(dst, src)
+func (m *UndeleteServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteServiceRequest.Merge(m, src)
 }
 func (m *UndeleteServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_UndeleteServiceRequest.Size(m)
@@ -355,16 +363,17 @@ func (m *UndeleteServiceResponse) Reset()         { *m = UndeleteServiceResponse
 func (m *UndeleteServiceResponse) String() string { return proto.CompactTextString(m) }
 func (*UndeleteServiceResponse) ProtoMessage()    {}
 func (*UndeleteServiceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{6}
+	return fileDescriptor_e7934ed1b66ee227, []int{6}
 }
+
 func (m *UndeleteServiceResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeleteServiceResponse.Unmarshal(m, b)
 }
 func (m *UndeleteServiceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeleteServiceResponse.Marshal(b, m, deterministic)
 }
-func (dst *UndeleteServiceResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeleteServiceResponse.Merge(dst, src)
+func (m *UndeleteServiceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteServiceResponse.Merge(m, src)
 }
 func (m *UndeleteServiceResponse) XXX_Size() int {
 	return xxx_messageInfo_UndeleteServiceResponse.Size(m)
@@ -401,16 +410,17 @@ func (m *GetServiceConfigRequest) Reset()         { *m = GetServiceConfigRequest
 func (m *GetServiceConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServiceConfigRequest) ProtoMessage()    {}
 func (*GetServiceConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{7}
+	return fileDescriptor_e7934ed1b66ee227, []int{7}
 }
+
 func (m *GetServiceConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServiceConfigRequest.Unmarshal(m, b)
 }
 func (m *GetServiceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServiceConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServiceConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServiceConfigRequest.Merge(dst, src)
+func (m *GetServiceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceConfigRequest.Merge(m, src)
 }
 func (m *GetServiceConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServiceConfigRequest.Size(m)
@@ -460,16 +470,17 @@ func (m *ListServiceConfigsRequest) Reset()         { *m = ListServiceConfigsReq
 func (m *ListServiceConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListServiceConfigsRequest) ProtoMessage()    {}
 func (*ListServiceConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{8}
+	return fileDescriptor_e7934ed1b66ee227, []int{8}
 }
+
 func (m *ListServiceConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListServiceConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceConfigsRequest.Merge(dst, src)
+func (m *ListServiceConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceConfigsRequest.Merge(m, src)
 }
 func (m *ListServiceConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListServiceConfigsRequest.Size(m)
@@ -516,16 +527,17 @@ func (m *ListServiceConfigsResponse) Reset()         { *m = ListServiceConfigsRe
 func (m *ListServiceConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListServiceConfigsResponse) ProtoMessage()    {}
 func (*ListServiceConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{9}
+	return fileDescriptor_e7934ed1b66ee227, []int{9}
 }
+
 func (m *ListServiceConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListServiceConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceConfigsResponse.Merge(dst, src)
+func (m *ListServiceConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceConfigsResponse.Merge(m, src)
 }
 func (m *ListServiceConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListServiceConfigsResponse.Size(m)
@@ -566,16 +578,17 @@ func (m *CreateServiceConfigRequest) Reset()         { *m = CreateServiceConfigR
 func (m *CreateServiceConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateServiceConfigRequest) ProtoMessage()    {}
 func (*CreateServiceConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{10}
+	return fileDescriptor_e7934ed1b66ee227, []int{10}
 }
+
 func (m *CreateServiceConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateServiceConfigRequest.Unmarshal(m, b)
 }
 func (m *CreateServiceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateServiceConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateServiceConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateServiceConfigRequest.Merge(dst, src)
+func (m *CreateServiceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceConfigRequest.Merge(m, src)
 }
 func (m *CreateServiceConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateServiceConfigRequest.Size(m)
@@ -620,16 +633,17 @@ func (m *SubmitConfigSourceRequest) Reset()         { *m = SubmitConfigSourceReq
 func (m *SubmitConfigSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*SubmitConfigSourceRequest) ProtoMessage()    {}
 func (*SubmitConfigSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{11}
+	return fileDescriptor_e7934ed1b66ee227, []int{11}
 }
+
 func (m *SubmitConfigSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SubmitConfigSourceRequest.Unmarshal(m, b)
 }
 func (m *SubmitConfigSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SubmitConfigSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SubmitConfigSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SubmitConfigSourceRequest.Merge(dst, src)
+func (m *SubmitConfigSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitConfigSourceRequest.Merge(m, src)
 }
 func (m *SubmitConfigSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_SubmitConfigSourceRequest.Size(m)
@@ -674,16 +688,17 @@ func (m *SubmitConfigSourceResponse) Reset()         { *m = SubmitConfigSourceRe
 func (m *SubmitConfigSourceResponse) String() string { return proto.CompactTextString(m) }
 func (*SubmitConfigSourceResponse) ProtoMessage()    {}
 func (*SubmitConfigSourceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{12}
+	return fileDescriptor_e7934ed1b66ee227, []int{12}
 }
+
 func (m *SubmitConfigSourceResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SubmitConfigSourceResponse.Unmarshal(m, b)
 }
 func (m *SubmitConfigSourceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SubmitConfigSourceResponse.Marshal(b, m, deterministic)
 }
-func (dst *SubmitConfigSourceResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SubmitConfigSourceResponse.Merge(dst, src)
+func (m *SubmitConfigSourceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitConfigSourceResponse.Merge(m, src)
 }
 func (m *SubmitConfigSourceResponse) XXX_Size() int {
 	return xxx_messageInfo_SubmitConfigSourceResponse.Size(m)
@@ -717,16 +732,17 @@ func (m *CreateServiceRolloutRequest) Reset()         { *m = CreateServiceRollou
 func (m *CreateServiceRolloutRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateServiceRolloutRequest) ProtoMessage()    {}
 func (*CreateServiceRolloutRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{13}
+	return fileDescriptor_e7934ed1b66ee227, []int{13}
 }
+
 func (m *CreateServiceRolloutRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateServiceRolloutRequest.Unmarshal(m, b)
 }
 func (m *CreateServiceRolloutRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateServiceRolloutRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateServiceRolloutRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateServiceRolloutRequest.Merge(dst, src)
+func (m *CreateServiceRolloutRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceRolloutRequest.Merge(m, src)
 }
 func (m *CreateServiceRolloutRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateServiceRolloutRequest.Size(m)
@@ -778,16 +794,17 @@ func (m *ListServiceRolloutsRequest) Reset()         { *m = ListServiceRolloutsR
 func (m *ListServiceRolloutsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListServiceRolloutsRequest) ProtoMessage()    {}
 func (*ListServiceRolloutsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{14}
+	return fileDescriptor_e7934ed1b66ee227, []int{14}
 }
+
 func (m *ListServiceRolloutsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceRolloutsRequest.Unmarshal(m, b)
 }
 func (m *ListServiceRolloutsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceRolloutsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceRolloutsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceRolloutsRequest.Merge(dst, src)
+func (m *ListServiceRolloutsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceRolloutsRequest.Merge(m, src)
 }
 func (m *ListServiceRolloutsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListServiceRolloutsRequest.Size(m)
@@ -841,16 +858,17 @@ func (m *ListServiceRolloutsResponse) Reset()         { *m = ListServiceRollouts
 func (m *ListServiceRolloutsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListServiceRolloutsResponse) ProtoMessage()    {}
 func (*ListServiceRolloutsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{15}
+	return fileDescriptor_e7934ed1b66ee227, []int{15}
 }
+
 func (m *ListServiceRolloutsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceRolloutsResponse.Unmarshal(m, b)
 }
 func (m *ListServiceRolloutsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceRolloutsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceRolloutsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceRolloutsResponse.Merge(dst, src)
+func (m *ListServiceRolloutsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceRolloutsResponse.Merge(m, src)
 }
 func (m *ListServiceRolloutsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListServiceRolloutsResponse.Size(m)
@@ -891,16 +909,17 @@ func (m *GetServiceRolloutRequest) Reset()         { *m = GetServiceRolloutReque
 func (m *GetServiceRolloutRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServiceRolloutRequest) ProtoMessage()    {}
 func (*GetServiceRolloutRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{16}
+	return fileDescriptor_e7934ed1b66ee227, []int{16}
 }
+
 func (m *GetServiceRolloutRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServiceRolloutRequest.Unmarshal(m, b)
 }
 func (m *GetServiceRolloutRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServiceRolloutRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServiceRolloutRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServiceRolloutRequest.Merge(dst, src)
+func (m *GetServiceRolloutRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceRolloutRequest.Merge(m, src)
 }
 func (m *GetServiceRolloutRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServiceRolloutRequest.Size(m)
@@ -949,16 +968,17 @@ func (m *EnableServiceRequest) Reset()         { *m = EnableServiceRequest{} }
 func (m *EnableServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*EnableServiceRequest) ProtoMessage()    {}
 func (*EnableServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{17}
+	return fileDescriptor_e7934ed1b66ee227, []int{17}
 }
+
 func (m *EnableServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnableServiceRequest.Unmarshal(m, b)
 }
 func (m *EnableServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnableServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *EnableServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnableServiceRequest.Merge(dst, src)
+func (m *EnableServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnableServiceRequest.Merge(m, src)
 }
 func (m *EnableServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_EnableServiceRequest.Size(m)
@@ -1007,16 +1027,17 @@ func (m *DisableServiceRequest) Reset()         { *m = DisableServiceRequest{} }
 func (m *DisableServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*DisableServiceRequest) ProtoMessage()    {}
 func (*DisableServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{18}
+	return fileDescriptor_e7934ed1b66ee227, []int{18}
 }
+
 func (m *DisableServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DisableServiceRequest.Unmarshal(m, b)
 }
 func (m *DisableServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DisableServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DisableServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DisableServiceRequest.Merge(dst, src)
+func (m *DisableServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DisableServiceRequest.Merge(m, src)
 }
 func (m *DisableServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_DisableServiceRequest.Size(m)
@@ -1064,16 +1085,17 @@ func (m *GenerateConfigReportRequest) Reset()         { *m = GenerateConfigRepor
 func (m *GenerateConfigReportRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateConfigReportRequest) ProtoMessage()    {}
 func (*GenerateConfigReportRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{19}
+	return fileDescriptor_e7934ed1b66ee227, []int{19}
 }
+
 func (m *GenerateConfigReportRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateConfigReportRequest.Unmarshal(m, b)
 }
 func (m *GenerateConfigReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateConfigReportRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateConfigReportRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateConfigReportRequest.Merge(dst, src)
+func (m *GenerateConfigReportRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConfigReportRequest.Merge(m, src)
 }
 func (m *GenerateConfigReportRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateConfigReportRequest.Size(m)
@@ -1120,16 +1142,17 @@ func (m *GenerateConfigReportResponse) Reset()         { *m = GenerateConfigRepo
 func (m *GenerateConfigReportResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateConfigReportResponse) ProtoMessage()    {}
 func (*GenerateConfigReportResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_servicemanager_f197734cdf6c7769, []int{20}
+	return fileDescriptor_e7934ed1b66ee227, []int{20}
 }
+
 func (m *GenerateConfigReportResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateConfigReportResponse.Unmarshal(m, b)
 }
 func (m *GenerateConfigReportResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateConfigReportResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateConfigReportResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateConfigReportResponse.Merge(dst, src)
+func (m *GenerateConfigReportResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConfigReportResponse.Merge(m, src)
 }
 func (m *GenerateConfigReportResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateConfigReportResponse.Size(m)
@@ -1169,6 +1192,7 @@ func (m *GenerateConfigReportResponse) GetDiagnostics() []*Diagnostic {
 }
 
 func init() {
+	proto.RegisterEnum("google.api.servicemanagement.v1.GetServiceConfigRequest_ConfigView", GetServiceConfigRequest_ConfigView_name, GetServiceConfigRequest_ConfigView_value)
 	proto.RegisterType((*ListServicesRequest)(nil), "google.api.servicemanagement.v1.ListServicesRequest")
 	proto.RegisterType((*ListServicesResponse)(nil), "google.api.servicemanagement.v1.ListServicesResponse")
 	proto.RegisterType((*GetServiceRequest)(nil), "google.api.servicemanagement.v1.GetServiceRequest")
@@ -1190,7 +1214,105 @@ func init() {
 	proto.RegisterType((*DisableServiceRequest)(nil), "google.api.servicemanagement.v1.DisableServiceRequest")
 	proto.RegisterType((*GenerateConfigReportRequest)(nil), "google.api.servicemanagement.v1.GenerateConfigReportRequest")
 	proto.RegisterType((*GenerateConfigReportResponse)(nil), "google.api.servicemanagement.v1.GenerateConfigReportResponse")
-	proto.RegisterEnum("google.api.servicemanagement.v1.GetServiceConfigRequest_ConfigView", GetServiceConfigRequest_ConfigView_name, GetServiceConfigRequest_ConfigView_value)
+}
+
+func init() {
+	proto.RegisterFile("google/api/servicemanagement/v1/servicemanager.proto", fileDescriptor_e7934ed1b66ee227)
+}
+
+var fileDescriptor_e7934ed1b66ee227 = []byte{
+	// 1447 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0xdc, 0x44,
+	0x14, 0x66, 0x36, 0x69, 0x9b, 0xbc, 0x64, 0xb7, 0xed, 0x64, 0x69, 0xb6, 0x9b, 0x46, 0x4d, 0x9c,
+	0x52, 0xa2, 0x94, 0xda, 0x4a, 0xfa, 0x03, 0xba, 0x29, 0x87, 0x26, 0x81, 0x28, 0xa2, 0xa5, 0xd1,
+	0xa6, 0x3f, 0x50, 0x09, 0x5a, 0x39, 0xf6, 0xc4, 0x98, 0x7a, 0x67, 0x16, 0xdb, 0x9b, 0x90, 0x46,
+	0xbd, 0x54, 0x95, 0x90, 0xe0, 0x84, 0x8a, 0xe8, 0xbd, 0x42, 0x1c, 0x7a, 0xe5, 0x80, 0xc4, 0x01,
+	0xc1, 0x95, 0x2b, 0x70, 0xe4, 0xc6, 0xdf, 0xc0, 0x19, 0xed, 0x78, 0xbc, 0xf1, 0xec, 0x3a, 0x6b,
+	0x7b, 0x05, 0x1c, 0xe7, 0xcd, 0x7c, 0xef, 0x7d, 0xf3, 0xe6, 0xbd, 0x99, 0xcf, 0x86, 0xcb, 0x16,
+	0x63, 0x96, 0x43, 0x34, 0xbd, 0x61, 0x6b, 0x1e, 0x71, 0x77, 0x6c, 0x83, 0xd4, 0x75, 0xaa, 0x5b,
+	0xa4, 0x4e, 0xa8, 0xaf, 0xed, 0xcc, 0xcb, 0x46, 0x57, 0x6d, 0xb8, 0xcc, 0x67, 0xf8, 0x6c, 0x80,
+	0x52, 0xf5, 0x86, 0xad, 0x76, 0xa1, 0xd4, 0x9d, 0xf9, 0xf2, 0x99, 0x88, 0x5b, 0x9d, 0x52, 0xe6,
+	0xeb, 0xbe, 0xcd, 0xa8, 0x17, 0xc0, 0xcb, 0xa5, 0xee, 0xa0, 0x62, 0x46, 0x4b, 0xa2, 0xe3, 0x12,
+	0x8f, 0x35, 0x5d, 0x83, 0x84, 0xae, 0x66, 0x04, 0xc0, 0x61, 0xd4, 0x72, 0x9b, 0x94, 0xda, 0xd4,
+	0xd2, 0x58, 0x83, 0xb8, 0x52, 0xbc, 0xd3, 0x62, 0x11, 0x1f, 0x6d, 0x35, 0xb7, 0x35, 0x9d, 0xee,
+	0x89, 0xa9, 0xa9, 0xce, 0xa9, 0x6d, 0x9b, 0x38, 0x66, 0xad, 0xae, 0x7b, 0x0f, 0xc5, 0x8a, 0x33,
+	0x9d, 0x2b, 0x3c, 0xdf, 0x6d, 0x1a, 0xbe, 0x98, 0x1d, 0x17, 0xb3, 0x6e, 0xc3, 0xd0, 0x3c, 0x5f,
+	0xf7, 0x9b, 0x22, 0xa6, 0xf2, 0x02, 0xc1, 0xd8, 0x4d, 0xdb, 0xf3, 0x37, 0x82, 0x5d, 0x78, 0x55,
+	0xf2, 0x69, 0x93, 0x78, 0x3e, 0x56, 0x61, 0xac, 0xe1, 0x32, 0xb3, 0x69, 0x10, 0xb7, 0xd6, 0x70,
+	0xd9, 0x27, 0xc4, 0xf0, 0x6b, 0xb6, 0x59, 0x42, 0x53, 0x68, 0x76, 0xb8, 0x7a, 0x32, 0x9c, 0x5a,
+	0x0f, 0x66, 0xd6, 0x4c, 0x3c, 0x01, 0xc3, 0x0d, 0xdd, 0x22, 0x35, 0xcf, 0x7e, 0x44, 0x4a, 0x47,
+	0xa6, 0xd0, 0xec, 0x91, 0xea, 0x50, 0xcb, 0xb0, 0x61, 0x3f, 0x22, 0x78, 0x12, 0x80, 0x4f, 0xfa,
+	0xec, 0x21, 0xa1, 0xa5, 0xa3, 0xdc, 0x07, 0x5f, 0x7e, 0xa7, 0x65, 0xc0, 0x67, 0x61, 0xc4, 0x60,
+	0xd4, 0x6b, 0xd6, 0x89, 0xdb, 0x8a, 0x71, 0x8c, 0xcf, 0x43, 0x68, 0x5a, 0x33, 0x95, 0x2f, 0x11,
+	0x14, 0x65, 0x92, 0x5e, 0x83, 0x51, 0x8f, 0xe0, 0xf7, 0x60, 0x48, 0xa4, 0xdf, 0x2b, 0xa1, 0xa9,
+	0x81, 0xd9, 0x91, 0x05, 0x4d, 0x4d, 0x38, 0x73, 0xf5, 0x16, 0x1f, 0x99, 0xc2, 0x57, 0xb5, 0xed,
+	0x00, 0x9f, 0x87, 0xe3, 0x94, 0x7c, 0xe6, 0xd7, 0x22, 0x54, 0x73, 0x9c, 0x4a, 0xbe, 0x65, 0x5e,
+	0x0f, 0xe9, 0x2a, 0x57, 0xe1, 0xe4, 0x2a, 0x09, 0xb9, 0x84, 0xf9, 0x9a, 0x86, 0x51, 0xe1, 0xa8,
+	0x46, 0xf5, 0x3a, 0x11, 0x89, 0x1a, 0x11, 0xb6, 0xf7, 0xf5, 0x3a, 0x51, 0x74, 0x28, 0x2e, 0xbb,
+	0x44, 0xf7, 0x49, 0x07, 0x74, 0x0d, 0x8e, 0x89, 0x65, 0x1c, 0xd5, 0xc7, 0x1e, 0x42, 0xbc, 0x72,
+	0x0d, 0x8a, 0x2b, 0xc4, 0x21, 0x5d, 0x21, 0x52, 0xb0, 0x5b, 0x84, 0x53, 0x77, 0xa9, 0xd9, 0x27,
+	0xd8, 0x84, 0xf1, 0x2e, 0xb0, 0x38, 0xa2, 0x7f, 0x71, 0x77, 0x7f, 0x20, 0x18, 0x3f, 0xc8, 0xfc,
+	0x32, 0xa3, 0xdb, 0xb6, 0x95, 0x9e, 0x64, 0xab, 0x44, 0x0d, 0x8e, 0x69, 0x15, 0x59, 0x70, 0xb2,
+	0x43, 0x81, 0x61, 0xcd, 0xc4, 0xf7, 0x61, 0x70, 0xc7, 0x26, 0xbb, 0xa5, 0x81, 0x29, 0x34, 0x5b,
+	0x58, 0x58, 0x4e, 0xe4, 0x78, 0x08, 0x0f, 0x35, 0x18, 0xdd, 0xb3, 0xc9, 0x6e, 0x95, 0x3b, 0x54,
+	0xa6, 0x01, 0x0e, 0x6c, 0x78, 0x18, 0x8e, 0x2c, 0xdd, 0xd8, 0x58, 0x5b, 0x3e, 0xf1, 0x0a, 0x1e,
+	0x82, 0xc1, 0x77, 0xef, 0xde, 0xbc, 0x79, 0x02, 0x29, 0x8f, 0xe0, 0x74, 0xa4, 0xba, 0x83, 0xd5,
+	0x5e, 0x86, 0x8d, 0xc9, 0xed, 0x95, 0xeb, 0x6c, 0x2f, 0xa9, 0x35, 0x07, 0xe4, 0xd6, 0x54, 0x9e,
+	0x20, 0x28, 0xc7, 0x05, 0x17, 0xa7, 0x77, 0x1d, 0x8e, 0x87, 0xd1, 0x83, 0x54, 0x85, 0x7d, 0x36,
+	0x16, 0xcd, 0x50, 0x78, 0x52, 0x05, 0x4f, 0xf2, 0x92, 0xba, 0xa3, 0xf6, 0xa1, 0x2c, 0x75, 0x46,
+	0xe6, 0xa3, 0xad, 0x40, 0x41, 0xa6, 0xc9, 0xe3, 0x1c, 0xc2, 0x32, 0x2f, 0xb1, 0x54, 0x7e, 0x40,
+	0x70, 0x7a, 0xa3, 0xb9, 0x55, 0xb7, 0xfd, 0xc0, 0xb0, 0xc1, 0x2f, 0xee, 0x0c, 0xc1, 0xab, 0x90,
+	0x17, 0x75, 0x15, 0xdc, 0xf9, 0x22, 0xf6, 0xc5, 0xc4, 0x1a, 0x92, 0xe2, 0x8d, 0x1a, 0x91, 0x11,
+	0x9e, 0x81, 0xfc, 0x8e, 0xee, 0xd8, 0xa6, 0xee, 0x93, 0x1a, 0xa3, 0xce, 0x1e, 0x3f, 0xb7, 0xa1,
+	0xea, 0x68, 0x68, 0xbc, 0x4d, 0x9d, 0x3d, 0xe5, 0x03, 0x28, 0xc7, 0x11, 0x17, 0x47, 0xd7, 0x9d,
+	0x13, 0x94, 0x3a, 0x27, 0x4f, 0x11, 0x4c, 0xc8, 0x77, 0x15, 0x73, 0x1c, 0xd6, 0xf4, 0x33, 0x64,
+	0x65, 0x09, 0x8e, 0xb9, 0x01, 0x48, 0xe4, 0x63, 0x36, 0x31, 0x1f, 0x61, 0x90, 0x10, 0xa8, 0x3c,
+	0x93, 0x8b, 0x53, 0xcc, 0xff, 0x4f, 0xad, 0x81, 0x4f, 0xc1, 0xd1, 0x6d, 0xdb, 0xf1, 0x89, 0x5b,
+	0x1a, 0xe4, 0x38, 0x31, 0x6a, 0xbd, 0x46, 0x13, 0xb1, 0xac, 0x44, 0xe2, 0x57, 0x60, 0x48, 0x6c,
+	0x20, 0x6c, 0x96, 0xf4, 0x5b, 0x6f, 0x23, 0x53, 0xf7, 0xce, 0x26, 0x94, 0x22, 0xaf, 0x51, 0xe6,
+	0x63, 0x9a, 0x04, 0x10, 0x21, 0x0f, 0x6e, 0xc5, 0x61, 0x61, 0x59, 0x33, 0x95, 0x07, 0x50, 0x7c,
+	0x87, 0xea, 0x5b, 0x4e, 0xf6, 0x37, 0xa1, 0xf3, 0x55, 0xcf, 0x75, 0xbd, 0xea, 0x1f, 0xc2, 0xab,
+	0x2b, 0xb6, 0xf7, 0x1f, 0x39, 0xff, 0x1c, 0xc1, 0xc4, 0x2a, 0xa1, 0x2d, 0x85, 0xd5, 0xbe, 0x4e,
+	0x1a, 0xcc, 0x6d, 0xa7, 0xe6, 0x12, 0x00, 0x25, 0xbb, 0x72, 0x67, 0x14, 0xc3, 0x63, 0x0a, 0x35,
+	0x94, 0x7a, 0x83, 0xee, 0x55, 0x87, 0x29, 0xd9, 0x0d, 0x3c, 0xb4, 0x40, 0xcc, 0x31, 0xe5, 0x2b,
+	0xe6, 0x10, 0x10, 0x73, 0x4c, 0xd1, 0x4b, 0x7f, 0x23, 0x38, 0x13, 0xcf, 0x44, 0xd4, 0x4b, 0x8a,
+	0xed, 0x16, 0x20, 0xd7, 0xde, 0x65, 0xce, 0x36, 0xf1, 0x1d, 0x28, 0x18, 0x1f, 0xeb, 0xd4, 0x22,
+	0x35, 0x97, 0xfb, 0xf2, 0x4a, 0x03, 0xbc, 0xd0, 0x52, 0xdc, 0x39, 0x1c, 0x26, 0x18, 0xe4, 0x8d,
+	0xc8, 0xc8, 0xc3, 0xb7, 0x60, 0xc4, 0xb4, 0x75, 0x8b, 0x32, 0xcf, 0xb7, 0x0d, 0xaf, 0x34, 0xc8,
+	0x5d, 0x5e, 0x48, 0x74, 0xb9, 0xd2, 0xc6, 0x54, 0xa3, 0xf8, 0x85, 0xdf, 0xc7, 0xa0, 0x20, 0x4e,
+	0x36, 0x78, 0xd1, 0x5d, 0xfc, 0x15, 0x82, 0xd1, 0xa8, 0x90, 0xc3, 0x97, 0x13, 0xbd, 0xc7, 0x88,
+	0xd3, 0xf2, 0x95, 0x8c, 0xa8, 0x20, 0xd1, 0x4a, 0xf1, 0xc9, 0x6f, 0x7f, 0x3d, 0xcb, 0x15, 0xf0,
+	0x68, 0xe4, 0x83, 0xc1, 0xc3, 0xdf, 0x20, 0x80, 0x83, 0x0e, 0xc2, 0x0b, 0x19, 0x9e, 0xfe, 0x90,
+	0x4f, 0x56, 0x49, 0xa3, 0xcc, 0x70, 0x26, 0x93, 0x78, 0x22, 0xca, 0x44, 0xdb, 0x8f, 0x96, 0xc1,
+	0x63, 0xfc, 0x14, 0x41, 0x5e, 0xba, 0x84, 0x71, 0xf2, 0xbe, 0xe3, 0x04, 0x66, 0x79, 0x32, 0x84,
+	0x45, 0xbe, 0x3e, 0xd4, 0xdb, 0xe1, 0xd7, 0x87, 0x32, 0xc9, 0xc9, 0x8c, 0x2b, 0x52, 0x5a, 0x2a,
+	0xa1, 0xea, 0xc2, 0x5f, 0x20, 0xc8, 0x4b, 0xa2, 0x32, 0x05, 0x8d, 0x38, 0x11, 0x9a, 0x44, 0x43,
+	0xe4, 0x64, 0xae, 0x67, 0x4e, 0x9e, 0x23, 0x38, 0xde, 0xa1, 0x34, 0xf1, 0x9b, 0x89, 0x74, 0xe2,
+	0x85, 0x6d, 0x12, 0xa1, 0x37, 0x38, 0xa1, 0xf3, 0xca, 0xb9, 0x1e, 0x84, 0x2a, 0x4d, 0xe1, 0x1a,
+	0xff, 0x88, 0x00, 0x77, 0x0b, 0x29, 0x5c, 0xc9, 0x52, 0xaa, 0xb2, 0xf4, 0x2b, 0x2f, 0xf6, 0x85,
+	0x15, 0xc5, 0x7e, 0x81, 0xb3, 0x7f, 0x0d, 0xcf, 0xf4, 0x60, 0xaf, 0x09, 0x4d, 0x87, 0x7f, 0x46,
+	0x70, 0xa2, 0x53, 0xd1, 0xe2, 0xb7, 0xfa, 0x15, 0xc1, 0xe5, 0x38, 0x89, 0xa1, 0x7c, 0xc4, 0x09,
+	0xdd, 0xc7, 0x5a, 0x0a, 0x42, 0xda, 0x7e, 0x5b, 0xa9, 0x3f, 0x7e, 0x70, 0x0e, 0x2b, 0xc9, 0x10,
+	0xfc, 0x2d, 0x82, 0xb1, 0x18, 0x11, 0x89, 0x17, 0xb3, 0xf5, 0x4c, 0x8a, 0x8d, 0x2c, 0xf2, 0x8d,
+	0x5c, 0x51, 0xd2, 0x64, 0xb6, 0xd2, 0xa1, 0xc1, 0xf0, 0x77, 0x08, 0x70, 0xb7, 0x68, 0x4b, 0x51,
+	0x26, 0x87, 0x4a, 0xd4, 0xa4, 0x32, 0xbe, 0xc2, 0xe9, 0x6a, 0xca, 0x5c, 0x1a, 0xba, 0x1e, 0x8f,
+	0x52, 0x41, 0x73, 0xf8, 0x27, 0xf9, 0xc7, 0x40, 0xa8, 0x72, 0x70, 0xa6, 0xa2, 0xec, 0x50, 0x6c,
+	0xe5, 0xeb, 0xfd, 0x81, 0x45, 0x49, 0x8b, 0x86, 0xc4, 0xbd, 0x1a, 0x52, 0x6b, 0x0b, 0xa8, 0xef,
+	0x91, 0xf4, 0x9d, 0x1e, 0x98, 0xf1, 0xb5, 0x2c, 0xd7, 0xbb, 0xa4, 0xa6, 0xca, 0xa9, 0x55, 0x9c,
+	0x72, 0x8d, 0x13, 0xbd, 0x84, 0xe7, 0xd3, 0x10, 0xd5, 0xf6, 0x0f, 0x04, 0xd8, 0x63, 0xfc, 0x12,
+	0x75, 0xfe, 0x25, 0x10, 0xc4, 0xaf, 0x67, 0xbc, 0xfb, 0x65, 0xee, 0x29, 0x6b, 0x24, 0x55, 0x66,
+	0x2b, 0xa1, 0x3e, 0xc7, 0xbf, 0x20, 0x28, 0xc6, 0x49, 0x9b, 0x14, 0x64, 0x7b, 0x68, 0xb3, 0xf2,
+	0xdb, 0x7d, 0xa2, 0xe5, 0x32, 0x51, 0xa6, 0xa5, 0xf7, 0xcc, 0x8a, 0x81, 0xb4, 0xea, 0xfc, 0x6b,
+	0x04, 0x79, 0x49, 0xe2, 0xa6, 0x78, 0xde, 0xe2, 0x24, 0x71, 0x52, 0x8a, 0x2f, 0x72, 0x56, 0xaf,
+	0x2b, 0xbd, 0xee, 0xb2, 0x0a, 0xe1, 0x8e, 0x5b, 0xb4, 0x9e, 0x23, 0x28, 0xc8, 0xea, 0x18, 0x5f,
+	0x4d, 0xa1, 0xc4, 0xbc, 0xec, 0xc4, 0x54, 0x4e, 0x6c, 0xb6, 0xe7, 0x75, 0x56, 0x31, 0x03, 0xcf,
+	0x15, 0x34, 0xb7, 0xf4, 0x27, 0x82, 0x19, 0x83, 0xd5, 0x93, 0xc8, 0x2c, 0x8d, 0xc9, 0xda, 0x6f,
+	0xbd, 0x25, 0x8f, 0xd7, 0xd1, 0x83, 0x75, 0x81, 0xb3, 0x98, 0xa3, 0x53, 0x4b, 0x65, 0xae, 0xa5,
+	0x59, 0x84, 0x72, 0xf1, 0x2c, 0xfe, 0xaa, 0xea, 0x0d, 0xdb, 0x3b, 0xf4, 0xcf, 0xea, 0x62, 0x97,
+	0xf1, 0x45, 0x6e, 0x70, 0xf5, 0xc6, 0xc6, 0xad, 0x97, 0xb9, 0xe9, 0xd5, 0xc0, 0xf3, 0xb2, 0xc3,
+	0x9a, 0xa6, 0x2a, 0x45, 0xe7, 0x9c, 0xee, 0xcd, 0xff, 0x1a, 0xae, 0xd9, 0xe4, 0x6b, 0x36, 0xbb,
+	0xd6, 0x6c, 0xde, 0x9b, 0xdf, 0x3a, 0xca, 0xb9, 0x5c, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0x0e,
+	0x92, 0xfd, 0x90, 0x73, 0x16, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1914,102 +2036,3 @@ var _ServiceManager_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/api/servicemanagement/v1/servicemanager.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/api/servicemanagement/v1/servicemanager.proto", fileDescriptor_servicemanager_f197734cdf6c7769)
-}
-
-var fileDescriptor_servicemanager_f197734cdf6c7769 = []byte{
-	// 1447 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0xdc, 0x44,
-	0x14, 0x66, 0x36, 0x69, 0x9b, 0xbc, 0x64, 0xb7, 0xed, 0x64, 0x69, 0xb6, 0x9b, 0x46, 0x4d, 0x9c,
-	0x52, 0xa2, 0x94, 0xda, 0x4a, 0xfa, 0x03, 0xba, 0x29, 0x87, 0x26, 0x81, 0x28, 0xa2, 0xa5, 0xd1,
-	0xa6, 0x3f, 0x50, 0x09, 0x5a, 0x39, 0xf6, 0xc4, 0x98, 0x7a, 0x67, 0x16, 0xdb, 0x9b, 0x90, 0x46,
-	0xbd, 0x54, 0x95, 0x90, 0xe0, 0x84, 0x8a, 0xe8, 0xbd, 0x42, 0x1c, 0x7a, 0xe5, 0x80, 0xc4, 0x01,
-	0xc1, 0x95, 0x2b, 0x70, 0xe4, 0xc6, 0xdf, 0xc0, 0x19, 0xed, 0x78, 0xbc, 0xf1, 0xec, 0x3a, 0x6b,
-	0x7b, 0x05, 0x1c, 0xe7, 0xcd, 0x7c, 0xef, 0x7d, 0xf3, 0xe6, 0xbd, 0x99, 0xcf, 0x86, 0xcb, 0x16,
-	0x63, 0x96, 0x43, 0x34, 0xbd, 0x61, 0x6b, 0x1e, 0x71, 0x77, 0x6c, 0x83, 0xd4, 0x75, 0xaa, 0x5b,
-	0xa4, 0x4e, 0xa8, 0xaf, 0xed, 0xcc, 0xcb, 0x46, 0x57, 0x6d, 0xb8, 0xcc, 0x67, 0xf8, 0x6c, 0x80,
-	0x52, 0xf5, 0x86, 0xad, 0x76, 0xa1, 0xd4, 0x9d, 0xf9, 0xf2, 0x99, 0x88, 0x5b, 0x9d, 0x52, 0xe6,
-	0xeb, 0xbe, 0xcd, 0xa8, 0x17, 0xc0, 0xcb, 0xa5, 0xee, 0xa0, 0x62, 0x46, 0x4b, 0xa2, 0xe3, 0x12,
-	0x8f, 0x35, 0x5d, 0x83, 0x84, 0xae, 0x66, 0x04, 0xc0, 0x61, 0xd4, 0x72, 0x9b, 0x94, 0xda, 0xd4,
-	0xd2, 0x58, 0x83, 0xb8, 0x52, 0xbc, 0xd3, 0x62, 0x11, 0x1f, 0x6d, 0x35, 0xb7, 0x35, 0x9d, 0xee,
-	0x89, 0xa9, 0xa9, 0xce, 0xa9, 0x6d, 0x9b, 0x38, 0x66, 0xad, 0xae, 0x7b, 0x0f, 0xc5, 0x8a, 0x33,
-	0x9d, 0x2b, 0x3c, 0xdf, 0x6d, 0x1a, 0xbe, 0x98, 0x1d, 0x17, 0xb3, 0x6e, 0xc3, 0xd0, 0x3c, 0x5f,
-	0xf7, 0x9b, 0x22, 0xa6, 0xf2, 0x02, 0xc1, 0xd8, 0x4d, 0xdb, 0xf3, 0x37, 0x82, 0x5d, 0x78, 0x55,
-	0xf2, 0x69, 0x93, 0x78, 0x3e, 0x56, 0x61, 0xac, 0xe1, 0x32, 0xb3, 0x69, 0x10, 0xb7, 0xd6, 0x70,
-	0xd9, 0x27, 0xc4, 0xf0, 0x6b, 0xb6, 0x59, 0x42, 0x53, 0x68, 0x76, 0xb8, 0x7a, 0x32, 0x9c, 0x5a,
-	0x0f, 0x66, 0xd6, 0x4c, 0x3c, 0x01, 0xc3, 0x0d, 0xdd, 0x22, 0x35, 0xcf, 0x7e, 0x44, 0x4a, 0x47,
-	0xa6, 0xd0, 0xec, 0x91, 0xea, 0x50, 0xcb, 0xb0, 0x61, 0x3f, 0x22, 0x78, 0x12, 0x80, 0x4f, 0xfa,
-	0xec, 0x21, 0xa1, 0xa5, 0xa3, 0xdc, 0x07, 0x5f, 0x7e, 0xa7, 0x65, 0xc0, 0x67, 0x61, 0xc4, 0x60,
-	0xd4, 0x6b, 0xd6, 0x89, 0xdb, 0x8a, 0x71, 0x8c, 0xcf, 0x43, 0x68, 0x5a, 0x33, 0x95, 0x2f, 0x11,
-	0x14, 0x65, 0x92, 0x5e, 0x83, 0x51, 0x8f, 0xe0, 0xf7, 0x60, 0x48, 0xa4, 0xdf, 0x2b, 0xa1, 0xa9,
-	0x81, 0xd9, 0x91, 0x05, 0x4d, 0x4d, 0x38, 0x73, 0xf5, 0x16, 0x1f, 0x99, 0xc2, 0x57, 0xb5, 0xed,
-	0x00, 0x9f, 0x87, 0xe3, 0x94, 0x7c, 0xe6, 0xd7, 0x22, 0x54, 0x73, 0x9c, 0x4a, 0xbe, 0x65, 0x5e,
-	0x0f, 0xe9, 0x2a, 0x57, 0xe1, 0xe4, 0x2a, 0x09, 0xb9, 0x84, 0xf9, 0x9a, 0x86, 0x51, 0xe1, 0xa8,
-	0x46, 0xf5, 0x3a, 0x11, 0x89, 0x1a, 0x11, 0xb6, 0xf7, 0xf5, 0x3a, 0x51, 0x74, 0x28, 0x2e, 0xbb,
-	0x44, 0xf7, 0x49, 0x07, 0x74, 0x0d, 0x8e, 0x89, 0x65, 0x1c, 0xd5, 0xc7, 0x1e, 0x42, 0xbc, 0x72,
-	0x0d, 0x8a, 0x2b, 0xc4, 0x21, 0x5d, 0x21, 0x52, 0xb0, 0x5b, 0x84, 0x53, 0x77, 0xa9, 0xd9, 0x27,
-	0xd8, 0x84, 0xf1, 0x2e, 0xb0, 0x38, 0xa2, 0x7f, 0x71, 0x77, 0x7f, 0x20, 0x18, 0x3f, 0xc8, 0xfc,
-	0x32, 0xa3, 0xdb, 0xb6, 0x95, 0x9e, 0x64, 0xab, 0x44, 0x0d, 0x8e, 0x69, 0x15, 0x59, 0x70, 0xb2,
-	0x43, 0x81, 0x61, 0xcd, 0xc4, 0xf7, 0x61, 0x70, 0xc7, 0x26, 0xbb, 0xa5, 0x81, 0x29, 0x34, 0x5b,
-	0x58, 0x58, 0x4e, 0xe4, 0x78, 0x08, 0x0f, 0x35, 0x18, 0xdd, 0xb3, 0xc9, 0x6e, 0x95, 0x3b, 0x54,
-	0xa6, 0x01, 0x0e, 0x6c, 0x78, 0x18, 0x8e, 0x2c, 0xdd, 0xd8, 0x58, 0x5b, 0x3e, 0xf1, 0x0a, 0x1e,
-	0x82, 0xc1, 0x77, 0xef, 0xde, 0xbc, 0x79, 0x02, 0x29, 0x8f, 0xe0, 0x74, 0xa4, 0xba, 0x83, 0xd5,
-	0x5e, 0x86, 0x8d, 0xc9, 0xed, 0x95, 0xeb, 0x6c, 0x2f, 0xa9, 0x35, 0x07, 0xe4, 0xd6, 0x54, 0x9e,
-	0x20, 0x28, 0xc7, 0x05, 0x17, 0xa7, 0x77, 0x1d, 0x8e, 0x87, 0xd1, 0x83, 0x54, 0x85, 0x7d, 0x36,
-	0x16, 0xcd, 0x50, 0x78, 0x52, 0x05, 0x4f, 0xf2, 0x92, 0xba, 0xa3, 0xf6, 0xa1, 0x2c, 0x75, 0x46,
-	0xe6, 0xa3, 0xad, 0x40, 0x41, 0xa6, 0xc9, 0xe3, 0x1c, 0xc2, 0x32, 0x2f, 0xb1, 0x54, 0x7e, 0x40,
-	0x70, 0x7a, 0xa3, 0xb9, 0x55, 0xb7, 0xfd, 0xc0, 0xb0, 0xc1, 0x2f, 0xee, 0x0c, 0xc1, 0xab, 0x90,
-	0x17, 0x75, 0x15, 0xdc, 0xf9, 0x22, 0xf6, 0xc5, 0xc4, 0x1a, 0x92, 0xe2, 0x8d, 0x1a, 0x91, 0x11,
-	0x9e, 0x81, 0xfc, 0x8e, 0xee, 0xd8, 0xa6, 0xee, 0x93, 0x1a, 0xa3, 0xce, 0x1e, 0x3f, 0xb7, 0xa1,
-	0xea, 0x68, 0x68, 0xbc, 0x4d, 0x9d, 0x3d, 0xe5, 0x03, 0x28, 0xc7, 0x11, 0x17, 0x47, 0xd7, 0x9d,
-	0x13, 0x94, 0x3a, 0x27, 0x4f, 0x11, 0x4c, 0xc8, 0x77, 0x15, 0x73, 0x1c, 0xd6, 0xf4, 0x33, 0x64,
-	0x65, 0x09, 0x8e, 0xb9, 0x01, 0x48, 0xe4, 0x63, 0x36, 0x31, 0x1f, 0x61, 0x90, 0x10, 0xa8, 0x3c,
-	0x93, 0x8b, 0x53, 0xcc, 0xff, 0x4f, 0xad, 0x81, 0x4f, 0xc1, 0xd1, 0x6d, 0xdb, 0xf1, 0x89, 0x5b,
-	0x1a, 0xe4, 0x38, 0x31, 0x6a, 0xbd, 0x46, 0x13, 0xb1, 0xac, 0x44, 0xe2, 0x57, 0x60, 0x48, 0x6c,
-	0x20, 0x6c, 0x96, 0xf4, 0x5b, 0x6f, 0x23, 0x53, 0xf7, 0xce, 0x26, 0x94, 0x22, 0xaf, 0x51, 0xe6,
-	0x63, 0x9a, 0x04, 0x10, 0x21, 0x0f, 0x6e, 0xc5, 0x61, 0x61, 0x59, 0x33, 0x95, 0x07, 0x50, 0x7c,
-	0x87, 0xea, 0x5b, 0x4e, 0xf6, 0x37, 0xa1, 0xf3, 0x55, 0xcf, 0x75, 0xbd, 0xea, 0x1f, 0xc2, 0xab,
-	0x2b, 0xb6, 0xf7, 0x1f, 0x39, 0xff, 0x1c, 0xc1, 0xc4, 0x2a, 0xa1, 0x2d, 0x85, 0xd5, 0xbe, 0x4e,
-	0x1a, 0xcc, 0x6d, 0xa7, 0xe6, 0x12, 0x00, 0x25, 0xbb, 0x72, 0x67, 0x14, 0xc3, 0x63, 0x0a, 0x35,
-	0x94, 0x7a, 0x83, 0xee, 0x55, 0x87, 0x29, 0xd9, 0x0d, 0x3c, 0xb4, 0x40, 0xcc, 0x31, 0xe5, 0x2b,
-	0xe6, 0x10, 0x10, 0x73, 0x4c, 0xd1, 0x4b, 0x7f, 0x23, 0x38, 0x13, 0xcf, 0x44, 0xd4, 0x4b, 0x8a,
-	0xed, 0x16, 0x20, 0xd7, 0xde, 0x65, 0xce, 0x36, 0xf1, 0x1d, 0x28, 0x18, 0x1f, 0xeb, 0xd4, 0x22,
-	0x35, 0x97, 0xfb, 0xf2, 0x4a, 0x03, 0xbc, 0xd0, 0x52, 0xdc, 0x39, 0x1c, 0x26, 0x18, 0xe4, 0x8d,
-	0xc8, 0xc8, 0xc3, 0xb7, 0x60, 0xc4, 0xb4, 0x75, 0x8b, 0x32, 0xcf, 0xb7, 0x0d, 0xaf, 0x34, 0xc8,
-	0x5d, 0x5e, 0x48, 0x74, 0xb9, 0xd2, 0xc6, 0x54, 0xa3, 0xf8, 0x85, 0xdf, 0xc7, 0xa0, 0x20, 0x4e,
-	0x36, 0x78, 0xd1, 0x5d, 0xfc, 0x15, 0x82, 0xd1, 0xa8, 0x90, 0xc3, 0x97, 0x13, 0xbd, 0xc7, 0x88,
-	0xd3, 0xf2, 0x95, 0x8c, 0xa8, 0x20, 0xd1, 0x4a, 0xf1, 0xc9, 0x6f, 0x7f, 0x3d, 0xcb, 0x15, 0xf0,
-	0x68, 0xe4, 0x83, 0xc1, 0xc3, 0xdf, 0x20, 0x80, 0x83, 0x0e, 0xc2, 0x0b, 0x19, 0x9e, 0xfe, 0x90,
-	0x4f, 0x56, 0x49, 0xa3, 0xcc, 0x70, 0x26, 0x93, 0x78, 0x22, 0xca, 0x44, 0xdb, 0x8f, 0x96, 0xc1,
-	0x63, 0xfc, 0x14, 0x41, 0x5e, 0xba, 0x84, 0x71, 0xf2, 0xbe, 0xe3, 0x04, 0x66, 0x79, 0x32, 0x84,
-	0x45, 0xbe, 0x3e, 0xd4, 0xdb, 0xe1, 0xd7, 0x87, 0x32, 0xc9, 0xc9, 0x8c, 0x2b, 0x52, 0x5a, 0x2a,
-	0xa1, 0xea, 0xc2, 0x5f, 0x20, 0xc8, 0x4b, 0xa2, 0x32, 0x05, 0x8d, 0x38, 0x11, 0x9a, 0x44, 0x43,
-	0xe4, 0x64, 0xae, 0x67, 0x4e, 0x9e, 0x23, 0x38, 0xde, 0xa1, 0x34, 0xf1, 0x9b, 0x89, 0x74, 0xe2,
-	0x85, 0x6d, 0x12, 0xa1, 0x37, 0x38, 0xa1, 0xf3, 0xca, 0xb9, 0x1e, 0x84, 0x2a, 0x4d, 0xe1, 0x1a,
-	0xff, 0x88, 0x00, 0x77, 0x0b, 0x29, 0x5c, 0xc9, 0x52, 0xaa, 0xb2, 0xf4, 0x2b, 0x2f, 0xf6, 0x85,
-	0x15, 0xc5, 0x7e, 0x81, 0xb3, 0x7f, 0x0d, 0xcf, 0xf4, 0x60, 0xaf, 0x09, 0x4d, 0x87, 0x7f, 0x46,
-	0x70, 0xa2, 0x53, 0xd1, 0xe2, 0xb7, 0xfa, 0x15, 0xc1, 0xe5, 0x38, 0x89, 0xa1, 0x7c, 0xc4, 0x09,
-	0xdd, 0xc7, 0x5a, 0x0a, 0x42, 0xda, 0x7e, 0x5b, 0xa9, 0x3f, 0x7e, 0x70, 0x0e, 0x2b, 0xc9, 0x10,
-	0xfc, 0x2d, 0x82, 0xb1, 0x18, 0x11, 0x89, 0x17, 0xb3, 0xf5, 0x4c, 0x8a, 0x8d, 0x2c, 0xf2, 0x8d,
-	0x5c, 0x51, 0xd2, 0x64, 0xb6, 0xd2, 0xa1, 0xc1, 0xf0, 0x77, 0x08, 0x70, 0xb7, 0x68, 0x4b, 0x51,
-	0x26, 0x87, 0x4a, 0xd4, 0xa4, 0x32, 0xbe, 0xc2, 0xe9, 0x6a, 0xca, 0x5c, 0x1a, 0xba, 0x1e, 0x8f,
-	0x52, 0x41, 0x73, 0xf8, 0x27, 0xf9, 0xc7, 0x40, 0xa8, 0x72, 0x70, 0xa6, 0xa2, 0xec, 0x50, 0x6c,
-	0xe5, 0xeb, 0xfd, 0x81, 0x45, 0x49, 0x8b, 0x86, 0xc4, 0xbd, 0x1a, 0x52, 0x6b, 0x0b, 0xa8, 0xef,
-	0x91, 0xf4, 0x9d, 0x1e, 0x98, 0xf1, 0xb5, 0x2c, 0xd7, 0xbb, 0xa4, 0xa6, 0xca, 0xa9, 0x55, 0x9c,
-	0x72, 0x8d, 0x13, 0xbd, 0x84, 0xe7, 0xd3, 0x10, 0xd5, 0xf6, 0x0f, 0x04, 0xd8, 0x63, 0xfc, 0x12,
-	0x75, 0xfe, 0x25, 0x10, 0xc4, 0xaf, 0x67, 0xbc, 0xfb, 0x65, 0xee, 0x29, 0x6b, 0x24, 0x55, 0x66,
-	0x2b, 0xa1, 0x3e, 0xc7, 0xbf, 0x20, 0x28, 0xc6, 0x49, 0x9b, 0x14, 0x64, 0x7b, 0x68, 0xb3, 0xf2,
-	0xdb, 0x7d, 0xa2, 0xe5, 0x32, 0x51, 0xa6, 0xa5, 0xf7, 0xcc, 0x8a, 0x81, 0xb4, 0xea, 0xfc, 0x6b,
-	0x04, 0x79, 0x49, 0xe2, 0xa6, 0x78, 0xde, 0xe2, 0x24, 0x71, 0x52, 0x8a, 0x2f, 0x72, 0x56, 0xaf,
-	0x2b, 0xbd, 0xee, 0xb2, 0x0a, 0xe1, 0x8e, 0x5b, 0xb4, 0x9e, 0x23, 0x28, 0xc8, 0xea, 0x18, 0x5f,
-	0x4d, 0xa1, 0xc4, 0xbc, 0xec, 0xc4, 0x54, 0x4e, 0x6c, 0xb6, 0xe7, 0x75, 0x56, 0x31, 0x03, 0xcf,
-	0x15, 0x34, 0xb7, 0xf4, 0x27, 0x82, 0x19, 0x83, 0xd5, 0x93, 0xc8, 0x2c, 0x8d, 0xc9, 0xda, 0x6f,
-	0xbd, 0x25, 0x8f, 0xd7, 0xd1, 0x83, 0x75, 0x81, 0xb3, 0x98, 0xa3, 0x53, 0x4b, 0x65, 0xae, 0xa5,
-	0x59, 0x84, 0x72, 0xf1, 0x2c, 0xfe, 0xaa, 0xea, 0x0d, 0xdb, 0x3b, 0xf4, 0xcf, 0xea, 0x62, 0x97,
-	0xf1, 0x45, 0x6e, 0x70, 0xf5, 0xc6, 0xc6, 0xad, 0x97, 0xb9, 0xe9, 0xd5, 0xc0, 0xf3, 0xb2, 0xc3,
-	0x9a, 0xa6, 0x2a, 0x45, 0xe7, 0x9c, 0xee, 0xcd, 0xff, 0x1a, 0xae, 0xd9, 0xe4, 0x6b, 0x36, 0xbb,
-	0xd6, 0x6c, 0xde, 0x9b, 0xdf, 0x3a, 0xca, 0xb9, 0x5c, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0x0e,
-	0x92, 0xfd, 0x90, 0x73, 0x16, 0x00, 0x00,
-}
diff --git a/googleapis/appengine/legacy/audit_data.pb.go b/googleapis/appengine/legacy/audit_data.pb.go
index 35eb04056f..d30106e03d 100644
--- a/googleapis/appengine/legacy/audit_data.pb.go
+++ b/googleapis/appengine/legacy/audit_data.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/legacy/audit_data.proto
 
-package legacy // import "google.golang.org/genproto/googleapis/appengine/legacy"
+package legacy
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Admin Console legacy audit log.
 type AuditData struct {
@@ -35,16 +38,17 @@ func (m *AuditData) Reset()         { *m = AuditData{} }
 func (m *AuditData) String() string { return proto.CompactTextString(m) }
 func (*AuditData) ProtoMessage()    {}
 func (*AuditData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_37c3913c9f749e98, []int{0}
+	return fileDescriptor_74c360c1976d6377, []int{0}
 }
+
 func (m *AuditData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuditData.Unmarshal(m, b)
 }
 func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
 }
-func (dst *AuditData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuditData.Merge(dst, src)
+func (m *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(m, src)
 }
 func (m *AuditData) XXX_Size() int {
 	return xxx_messageInfo_AuditData.Size(m)
@@ -75,10 +79,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/appengine/legacy/audit_data.proto", fileDescriptor_audit_data_37c3913c9f749e98)
+	proto.RegisterFile("google/appengine/legacy/audit_data.proto", fileDescriptor_74c360c1976d6377)
 }
 
-var fileDescriptor_audit_data_37c3913c9f749e98 = []byte{
+var fileDescriptor_74c360c1976d6377 = []byte{
 	// 247 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x4f, 0x4b, 0x03, 0x31,
 	0x10, 0xc5, 0xc9, 0x16, 0x85, 0x1d, 0xb5, 0x48, 0x10, 0x5c, 0xf4, 0x52, 0xf4, 0xb2, 0xa7, 0x04,
diff --git a/googleapis/appengine/logging/v1/request_log.pb.go b/googleapis/appengine/logging/v1/request_log.pb.go
index ebf475b88d..dd210043c5 100644
--- a/googleapis/appengine/logging/v1/request_log.pb.go
+++ b/googleapis/appengine/logging/v1/request_log.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/logging/v1/request_log.proto
 
-package logging // import "google.golang.org/genproto/googleapis/appengine/logging/v1"
+package logging
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _type "google.golang.org/genproto/googleapis/logging/type"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_type "google.golang.org/genproto/googleapis/logging/type"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Application log line emitted while processing a request.
 type LogLine struct {
@@ -40,16 +43,17 @@ func (m *LogLine) Reset()         { *m = LogLine{} }
 func (m *LogLine) String() string { return proto.CompactTextString(m) }
 func (*LogLine) ProtoMessage()    {}
 func (*LogLine) Descriptor() ([]byte, []int) {
-	return fileDescriptor_request_log_d8583300719546b7, []int{0}
+	return fileDescriptor_bf83c8b28bf3fb01, []int{0}
 }
+
 func (m *LogLine) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogLine.Unmarshal(m, b)
 }
 func (m *LogLine) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogLine.Marshal(b, m, deterministic)
 }
-func (dst *LogLine) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogLine.Merge(dst, src)
+func (m *LogLine) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogLine.Merge(m, src)
 }
 func (m *LogLine) XXX_Size() int {
 	return xxx_messageInfo_LogLine.Size(m)
@@ -111,16 +115,17 @@ func (m *SourceLocation) Reset()         { *m = SourceLocation{} }
 func (m *SourceLocation) String() string { return proto.CompactTextString(m) }
 func (*SourceLocation) ProtoMessage()    {}
 func (*SourceLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_request_log_d8583300719546b7, []int{1}
+	return fileDescriptor_bf83c8b28bf3fb01, []int{1}
 }
+
 func (m *SourceLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceLocation.Unmarshal(m, b)
 }
 func (m *SourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceLocation.Marshal(b, m, deterministic)
 }
-func (dst *SourceLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceLocation.Merge(dst, src)
+func (m *SourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceLocation.Merge(m, src)
 }
 func (m *SourceLocation) XXX_Size() int {
 	return xxx_messageInfo_SourceLocation.Size(m)
@@ -170,16 +175,17 @@ func (m *SourceReference) Reset()         { *m = SourceReference{} }
 func (m *SourceReference) String() string { return proto.CompactTextString(m) }
 func (*SourceReference) ProtoMessage()    {}
 func (*SourceReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_request_log_d8583300719546b7, []int{2}
+	return fileDescriptor_bf83c8b28bf3fb01, []int{2}
 }
+
 func (m *SourceReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceReference.Unmarshal(m, b)
 }
 func (m *SourceReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceReference.Marshal(b, m, deterministic)
 }
-func (dst *SourceReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceReference.Merge(dst, src)
+func (m *SourceReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceReference.Merge(m, src)
 }
 func (m *SourceReference) XXX_Size() int {
 	return xxx_messageInfo_SourceReference.Size(m)
@@ -298,16 +304,17 @@ func (m *RequestLog) Reset()         { *m = RequestLog{} }
 func (m *RequestLog) String() string { return proto.CompactTextString(m) }
 func (*RequestLog) ProtoMessage()    {}
 func (*RequestLog) Descriptor() ([]byte, []int) {
-	return fileDescriptor_request_log_d8583300719546b7, []int{3}
+	return fileDescriptor_bf83c8b28bf3fb01, []int{3}
 }
+
 func (m *RequestLog) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestLog.Unmarshal(m, b)
 }
 func (m *RequestLog) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestLog.Marshal(b, m, deterministic)
 }
-func (dst *RequestLog) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestLog.Merge(dst, src)
+func (m *RequestLog) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestLog.Merge(m, src)
 }
 func (m *RequestLog) XXX_Size() int {
 	return xxx_messageInfo_RequestLog.Size(m)
@@ -550,10 +557,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/appengine/logging/v1/request_log.proto", fileDescriptor_request_log_d8583300719546b7)
+	proto.RegisterFile("google/appengine/logging/v1/request_log.proto", fileDescriptor_bf83c8b28bf3fb01)
 }
 
-var fileDescriptor_request_log_d8583300719546b7 = []byte{
+var fileDescriptor_bf83c8b28bf3fb01 = []byte{
 	// 921 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x7f, 0x6f, 0x1c, 0x35,
 	0x10, 0xd5, 0xe6, 0xe7, 0x9d, 0x2f, 0xb9, 0xa4, 0xa6, 0x2d, 0x4e, 0x42, 0x9b, 0x23, 0xd0, 0x70,
diff --git a/googleapis/appengine/v1/app_yaml.pb.go b/googleapis/appengine/v1/app_yaml.pb.go
index dc395d5c4f..ce1f61d147 100644
--- a/googleapis/appengine/v1/app_yaml.pb.go
+++ b/googleapis/appengine/v1/app_yaml.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/app_yaml.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Actions to take when the user is not logged in.
 type AuthFailAction int32
@@ -39,6 +42,7 @@ var AuthFailAction_name = map[int32]string{
 	1: "AUTH_FAIL_ACTION_REDIRECT",
 	2: "AUTH_FAIL_ACTION_UNAUTHORIZED",
 }
+
 var AuthFailAction_value = map[string]int32{
 	"AUTH_FAIL_ACTION_UNSPECIFIED":  0,
 	"AUTH_FAIL_ACTION_REDIRECT":     1,
@@ -48,8 +52,9 @@ var AuthFailAction_value = map[string]int32{
 func (x AuthFailAction) String() string {
 	return proto.EnumName(AuthFailAction_name, int32(x))
 }
+
 func (AuthFailAction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{0}
+	return fileDescriptor_2e3b6ce3f971717f, []int{0}
 }
 
 // Methods to restrict access to a URL based on login status.
@@ -77,6 +82,7 @@ var LoginRequirement_name = map[int32]string{
 	2: "LOGIN_ADMIN",
 	3: "LOGIN_REQUIRED",
 }
+
 var LoginRequirement_value = map[string]int32{
 	"LOGIN_UNSPECIFIED": 0,
 	"LOGIN_OPTIONAL":    1,
@@ -87,8 +93,9 @@ var LoginRequirement_value = map[string]int32{
 func (x LoginRequirement) String() string {
 	return proto.EnumName(LoginRequirement_name, int32(x))
 }
+
 func (LoginRequirement) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{1}
+	return fileDescriptor_2e3b6ce3f971717f, []int{1}
 }
 
 // Methods to enforce security (HTTPS) on a URL.
@@ -121,6 +128,7 @@ var SecurityLevel_name = map[int32]string{
 	2: "SECURE_OPTIONAL",
 	3: "SECURE_ALWAYS",
 }
+
 var SecurityLevel_value = map[string]int32{
 	"SECURE_UNSPECIFIED": 0,
 	"SECURE_DEFAULT":     0,
@@ -132,8 +140,9 @@ var SecurityLevel_value = map[string]int32{
 func (x SecurityLevel) String() string {
 	return proto.EnumName(SecurityLevel_name, int32(x))
 }
+
 func (SecurityLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{2}
+	return fileDescriptor_2e3b6ce3f971717f, []int{2}
 }
 
 // Error codes.
@@ -160,6 +169,7 @@ var ErrorHandler_ErrorCode_name = map[int32]string{
 	2: "ERROR_CODE_DOS_API_DENIAL",
 	3: "ERROR_CODE_TIMEOUT",
 }
+
 var ErrorHandler_ErrorCode_value = map[string]int32{
 	"ERROR_CODE_UNSPECIFIED":    0,
 	"ERROR_CODE_DEFAULT":        0,
@@ -171,8 +181,9 @@ var ErrorHandler_ErrorCode_value = map[string]int32{
 func (x ErrorHandler_ErrorCode) String() string {
 	return proto.EnumName(ErrorHandler_ErrorCode_name, int32(x))
 }
+
 func (ErrorHandler_ErrorCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{1, 0}
+	return fileDescriptor_2e3b6ce3f971717f, []int{1, 0}
 }
 
 // Redirect codes.
@@ -198,6 +209,7 @@ var UrlMap_RedirectHttpResponseCode_name = map[int32]string{
 	3: "REDIRECT_HTTP_RESPONSE_CODE_303",
 	4: "REDIRECT_HTTP_RESPONSE_CODE_307",
 }
+
 var UrlMap_RedirectHttpResponseCode_value = map[string]int32{
 	"REDIRECT_HTTP_RESPONSE_CODE_UNSPECIFIED": 0,
 	"REDIRECT_HTTP_RESPONSE_CODE_301":         1,
@@ -209,8 +221,9 @@ var UrlMap_RedirectHttpResponseCode_value = map[string]int32{
 func (x UrlMap_RedirectHttpResponseCode) String() string {
 	return proto.EnumName(UrlMap_RedirectHttpResponseCode_name, int32(x))
 }
+
 func (UrlMap_RedirectHttpResponseCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{2, 0}
+	return fileDescriptor_2e3b6ce3f971717f, []int{2, 0}
 }
 
 // [Google Cloud
@@ -238,16 +251,17 @@ func (m *ApiConfigHandler) Reset()         { *m = ApiConfigHandler{} }
 func (m *ApiConfigHandler) String() string { return proto.CompactTextString(m) }
 func (*ApiConfigHandler) ProtoMessage()    {}
 func (*ApiConfigHandler) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{0}
+	return fileDescriptor_2e3b6ce3f971717f, []int{0}
 }
+
 func (m *ApiConfigHandler) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApiConfigHandler.Unmarshal(m, b)
 }
 func (m *ApiConfigHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApiConfigHandler.Marshal(b, m, deterministic)
 }
-func (dst *ApiConfigHandler) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApiConfigHandler.Merge(dst, src)
+func (m *ApiConfigHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApiConfigHandler.Merge(m, src)
 }
 func (m *ApiConfigHandler) XXX_Size() int {
 	return xxx_messageInfo_ApiConfigHandler.Size(m)
@@ -310,16 +324,17 @@ func (m *ErrorHandler) Reset()         { *m = ErrorHandler{} }
 func (m *ErrorHandler) String() string { return proto.CompactTextString(m) }
 func (*ErrorHandler) ProtoMessage()    {}
 func (*ErrorHandler) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{1}
+	return fileDescriptor_2e3b6ce3f971717f, []int{1}
 }
+
 func (m *ErrorHandler) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorHandler.Unmarshal(m, b)
 }
 func (m *ErrorHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorHandler.Marshal(b, m, deterministic)
 }
-func (dst *ErrorHandler) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorHandler.Merge(dst, src)
+func (m *ErrorHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorHandler.Merge(m, src)
 }
 func (m *ErrorHandler) XXX_Size() int {
 	return xxx_messageInfo_ErrorHandler.Size(m)
@@ -386,16 +401,17 @@ func (m *UrlMap) Reset()         { *m = UrlMap{} }
 func (m *UrlMap) String() string { return proto.CompactTextString(m) }
 func (*UrlMap) ProtoMessage()    {}
 func (*UrlMap) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{2}
+	return fileDescriptor_2e3b6ce3f971717f, []int{2}
 }
+
 func (m *UrlMap) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UrlMap.Unmarshal(m, b)
 }
 func (m *UrlMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UrlMap.Marshal(b, m, deterministic)
 }
-func (dst *UrlMap) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UrlMap.Merge(dst, src)
+func (m *UrlMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UrlMap.Merge(m, src)
 }
 func (m *UrlMap) XXX_Size() int {
 	return xxx_messageInfo_UrlMap.Size(m)
@@ -491,99 +507,15 @@ func (m *UrlMap) GetRedirectHttpResponseCode() UrlMap_RedirectHttpResponseCode {
 	return UrlMap_REDIRECT_HTTP_RESPONSE_CODE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*UrlMap) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _UrlMap_OneofMarshaler, _UrlMap_OneofUnmarshaler, _UrlMap_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*UrlMap) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*UrlMap_StaticFiles)(nil),
 		(*UrlMap_Script)(nil),
 		(*UrlMap_ApiEndpoint)(nil),
 	}
 }
 
-func _UrlMap_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*UrlMap)
-	// handler_type
-	switch x := m.HandlerType.(type) {
-	case *UrlMap_StaticFiles:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StaticFiles); err != nil {
-			return err
-		}
-	case *UrlMap_Script:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Script); err != nil {
-			return err
-		}
-	case *UrlMap_ApiEndpoint:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ApiEndpoint); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("UrlMap.HandlerType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _UrlMap_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*UrlMap)
-	switch tag {
-	case 2: // handler_type.static_files
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StaticFilesHandler)
-		err := b.DecodeMessage(msg)
-		m.HandlerType = &UrlMap_StaticFiles{msg}
-		return true, err
-	case 3: // handler_type.script
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ScriptHandler)
-		err := b.DecodeMessage(msg)
-		m.HandlerType = &UrlMap_Script{msg}
-		return true, err
-	case 4: // handler_type.api_endpoint
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ApiEndpointHandler)
-		err := b.DecodeMessage(msg)
-		m.HandlerType = &UrlMap_ApiEndpoint{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _UrlMap_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*UrlMap)
-	// handler_type
-	switch x := m.HandlerType.(type) {
-	case *UrlMap_StaticFiles:
-		s := proto.Size(x.StaticFiles)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UrlMap_Script:
-		s := proto.Size(x.Script)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UrlMap_ApiEndpoint:
-		s := proto.Size(x.ApiEndpoint)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Files served directly to the user for a given URL, such as images, CSS
 // stylesheets, or JavaScript source files. Static file handlers describe which
 // files in the application directory are static files, and which URLs serve
@@ -624,16 +556,17 @@ func (m *StaticFilesHandler) Reset()         { *m = StaticFilesHandler{} }
 func (m *StaticFilesHandler) String() string { return proto.CompactTextString(m) }
 func (*StaticFilesHandler) ProtoMessage()    {}
 func (*StaticFilesHandler) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{3}
+	return fileDescriptor_2e3b6ce3f971717f, []int{3}
 }
+
 func (m *StaticFilesHandler) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StaticFilesHandler.Unmarshal(m, b)
 }
 func (m *StaticFilesHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StaticFilesHandler.Marshal(b, m, deterministic)
 }
-func (dst *StaticFilesHandler) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StaticFilesHandler.Merge(dst, src)
+func (m *StaticFilesHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StaticFilesHandler.Merge(m, src)
 }
 func (m *StaticFilesHandler) XXX_Size() int {
 	return xxx_messageInfo_StaticFilesHandler.Size(m)
@@ -706,16 +639,17 @@ func (m *ScriptHandler) Reset()         { *m = ScriptHandler{} }
 func (m *ScriptHandler) String() string { return proto.CompactTextString(m) }
 func (*ScriptHandler) ProtoMessage()    {}
 func (*ScriptHandler) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{4}
+	return fileDescriptor_2e3b6ce3f971717f, []int{4}
 }
+
 func (m *ScriptHandler) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScriptHandler.Unmarshal(m, b)
 }
 func (m *ScriptHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScriptHandler.Marshal(b, m, deterministic)
 }
-func (dst *ScriptHandler) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScriptHandler.Merge(dst, src)
+func (m *ScriptHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScriptHandler.Merge(m, src)
 }
 func (m *ScriptHandler) XXX_Size() int {
 	return xxx_messageInfo_ScriptHandler.Size(m)
@@ -746,16 +680,17 @@ func (m *ApiEndpointHandler) Reset()         { *m = ApiEndpointHandler{} }
 func (m *ApiEndpointHandler) String() string { return proto.CompactTextString(m) }
 func (*ApiEndpointHandler) ProtoMessage()    {}
 func (*ApiEndpointHandler) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{5}
+	return fileDescriptor_2e3b6ce3f971717f, []int{5}
 }
+
 func (m *ApiEndpointHandler) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApiEndpointHandler.Unmarshal(m, b)
 }
 func (m *ApiEndpointHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApiEndpointHandler.Marshal(b, m, deterministic)
 }
-func (dst *ApiEndpointHandler) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApiEndpointHandler.Merge(dst, src)
+func (m *ApiEndpointHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApiEndpointHandler.Merge(m, src)
 }
 func (m *ApiEndpointHandler) XXX_Size() int {
 	return xxx_messageInfo_ApiEndpointHandler.Size(m)
@@ -804,16 +739,17 @@ func (m *HealthCheck) Reset()         { *m = HealthCheck{} }
 func (m *HealthCheck) String() string { return proto.CompactTextString(m) }
 func (*HealthCheck) ProtoMessage()    {}
 func (*HealthCheck) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{6}
+	return fileDescriptor_2e3b6ce3f971717f, []int{6}
 }
+
 func (m *HealthCheck) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HealthCheck.Unmarshal(m, b)
 }
 func (m *HealthCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HealthCheck.Marshal(b, m, deterministic)
 }
-func (dst *HealthCheck) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HealthCheck.Merge(dst, src)
+func (m *HealthCheck) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HealthCheck.Merge(m, src)
 }
 func (m *HealthCheck) XXX_Size() int {
 	return xxx_messageInfo_HealthCheck.Size(m)
@@ -888,16 +824,17 @@ func (m *Library) Reset()         { *m = Library{} }
 func (m *Library) String() string { return proto.CompactTextString(m) }
 func (*Library) ProtoMessage()    {}
 func (*Library) Descriptor() ([]byte, []int) {
-	return fileDescriptor_app_yaml_a3518fc0a16627c5, []int{7}
+	return fileDescriptor_2e3b6ce3f971717f, []int{7}
 }
+
 func (m *Library) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Library.Unmarshal(m, b)
 }
 func (m *Library) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Library.Marshal(b, m, deterministic)
 }
-func (dst *Library) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Library.Merge(dst, src)
+func (m *Library) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Library.Merge(m, src)
 }
 func (m *Library) XXX_Size() int {
 	return xxx_messageInfo_Library.Size(m)
@@ -923,6 +860,11 @@ func (m *Library) GetVersion() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.appengine.v1.AuthFailAction", AuthFailAction_name, AuthFailAction_value)
+	proto.RegisterEnum("google.appengine.v1.LoginRequirement", LoginRequirement_name, LoginRequirement_value)
+	proto.RegisterEnum("google.appengine.v1.SecurityLevel", SecurityLevel_name, SecurityLevel_value)
+	proto.RegisterEnum("google.appengine.v1.ErrorHandler_ErrorCode", ErrorHandler_ErrorCode_name, ErrorHandler_ErrorCode_value)
+	proto.RegisterEnum("google.appengine.v1.UrlMap_RedirectHttpResponseCode", UrlMap_RedirectHttpResponseCode_name, UrlMap_RedirectHttpResponseCode_value)
 	proto.RegisterType((*ApiConfigHandler)(nil), "google.appengine.v1.ApiConfigHandler")
 	proto.RegisterType((*ErrorHandler)(nil), "google.appengine.v1.ErrorHandler")
 	proto.RegisterType((*UrlMap)(nil), "google.appengine.v1.UrlMap")
@@ -932,18 +874,11 @@ func init() {
 	proto.RegisterType((*ApiEndpointHandler)(nil), "google.appengine.v1.ApiEndpointHandler")
 	proto.RegisterType((*HealthCheck)(nil), "google.appengine.v1.HealthCheck")
 	proto.RegisterType((*Library)(nil), "google.appengine.v1.Library")
-	proto.RegisterEnum("google.appengine.v1.AuthFailAction", AuthFailAction_name, AuthFailAction_value)
-	proto.RegisterEnum("google.appengine.v1.LoginRequirement", LoginRequirement_name, LoginRequirement_value)
-	proto.RegisterEnum("google.appengine.v1.SecurityLevel", SecurityLevel_name, SecurityLevel_value)
-	proto.RegisterEnum("google.appengine.v1.ErrorHandler_ErrorCode", ErrorHandler_ErrorCode_name, ErrorHandler_ErrorCode_value)
-	proto.RegisterEnum("google.appengine.v1.UrlMap_RedirectHttpResponseCode", UrlMap_RedirectHttpResponseCode_name, UrlMap_RedirectHttpResponseCode_value)
 }
 
-func init() {
-	proto.RegisterFile("google/appengine/v1/app_yaml.proto", fileDescriptor_app_yaml_a3518fc0a16627c5)
-}
+func init() { proto.RegisterFile("google/appengine/v1/app_yaml.proto", fileDescriptor_2e3b6ce3f971717f) }
 
-var fileDescriptor_app_yaml_a3518fc0a16627c5 = []byte{
+var fileDescriptor_2e3b6ce3f971717f = []byte{
 	// 1232 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x13, 0x47,
 	0x14, 0xc6, 0x76, 0x7e, 0x8f, 0x1d, 0xb3, 0x99, 0x00, 0x75, 0x02, 0x94, 0xd4, 0xa8, 0x02, 0x25,
diff --git a/googleapis/appengine/v1/appengine.pb.go b/googleapis/appengine/v1/appengine.pb.go
index d5fb026227..b4bd37a1c8 100644
--- a/googleapis/appengine/v1/appengine.pb.go
+++ b/googleapis/appengine/v1/appengine.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/appengine.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package appengine
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Fields that should be returned when [Version][google.appengine.v1.Version]
 // resources are retreived.
@@ -46,6 +46,7 @@ var VersionView_name = map[int32]string{
 	0: "BASIC",
 	1: "FULL",
 }
+
 var VersionView_value = map[string]int32{
 	"BASIC": 0,
 	"FULL":  1,
@@ -54,8 +55,9 @@ var VersionView_value = map[string]int32{
 func (x VersionView) String() string {
 	return proto.EnumName(VersionView_name, int32(x))
 }
+
 func (VersionView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{0}
+	return fileDescriptor_b28c1d276df09fd1, []int{0}
 }
 
 // Request message for `Applications.GetApplication`.
@@ -71,16 +73,17 @@ func (m *GetApplicationRequest) Reset()         { *m = GetApplicationRequest{} }
 func (m *GetApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetApplicationRequest) ProtoMessage()    {}
 func (*GetApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{0}
+	return fileDescriptor_b28c1d276df09fd1, []int{0}
 }
+
 func (m *GetApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetApplicationRequest.Unmarshal(m, b)
 }
 func (m *GetApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetApplicationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetApplicationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetApplicationRequest.Merge(dst, src)
+func (m *GetApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetApplicationRequest.Merge(m, src)
 }
 func (m *GetApplicationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetApplicationRequest.Size(m)
@@ -111,16 +114,17 @@ func (m *RepairApplicationRequest) Reset()         { *m = RepairApplicationReque
 func (m *RepairApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*RepairApplicationRequest) ProtoMessage()    {}
 func (*RepairApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{1}
+	return fileDescriptor_b28c1d276df09fd1, []int{1}
 }
+
 func (m *RepairApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepairApplicationRequest.Unmarshal(m, b)
 }
 func (m *RepairApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepairApplicationRequest.Marshal(b, m, deterministic)
 }
-func (dst *RepairApplicationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepairApplicationRequest.Merge(dst, src)
+func (m *RepairApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepairApplicationRequest.Merge(m, src)
 }
 func (m *RepairApplicationRequest) XXX_Size() int {
 	return xxx_messageInfo_RepairApplicationRequest.Size(m)
@@ -155,16 +159,17 @@ func (m *ListServicesRequest) Reset()         { *m = ListServicesRequest{} }
 func (m *ListServicesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListServicesRequest) ProtoMessage()    {}
 func (*ListServicesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{2}
+	return fileDescriptor_b28c1d276df09fd1, []int{2}
 }
+
 func (m *ListServicesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServicesRequest.Unmarshal(m, b)
 }
 func (m *ListServicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServicesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListServicesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServicesRequest.Merge(dst, src)
+func (m *ListServicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesRequest.Merge(m, src)
 }
 func (m *ListServicesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListServicesRequest.Size(m)
@@ -211,16 +216,17 @@ func (m *ListServicesResponse) Reset()         { *m = ListServicesResponse{} }
 func (m *ListServicesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListServicesResponse) ProtoMessage()    {}
 func (*ListServicesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{3}
+	return fileDescriptor_b28c1d276df09fd1, []int{3}
 }
+
 func (m *ListServicesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServicesResponse.Unmarshal(m, b)
 }
 func (m *ListServicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServicesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListServicesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServicesResponse.Merge(dst, src)
+func (m *ListServicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesResponse.Merge(m, src)
 }
 func (m *ListServicesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListServicesResponse.Size(m)
@@ -258,16 +264,17 @@ func (m *GetServiceRequest) Reset()         { *m = GetServiceRequest{} }
 func (m *GetServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServiceRequest) ProtoMessage()    {}
 func (*GetServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{4}
+	return fileDescriptor_b28c1d276df09fd1, []int{4}
 }
+
 func (m *GetServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServiceRequest.Unmarshal(m, b)
 }
 func (m *GetServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServiceRequest.Merge(dst, src)
+func (m *GetServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceRequest.Merge(m, src)
 }
 func (m *GetServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServiceRequest.Size(m)
@@ -319,16 +326,17 @@ func (m *UpdateServiceRequest) Reset()         { *m = UpdateServiceRequest{} }
 func (m *UpdateServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateServiceRequest) ProtoMessage()    {}
 func (*UpdateServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{5}
+	return fileDescriptor_b28c1d276df09fd1, []int{5}
 }
+
 func (m *UpdateServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateServiceRequest.Unmarshal(m, b)
 }
 func (m *UpdateServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateServiceRequest.Merge(dst, src)
+func (m *UpdateServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateServiceRequest.Merge(m, src)
 }
 func (m *UpdateServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateServiceRequest.Size(m)
@@ -380,16 +388,17 @@ func (m *DeleteServiceRequest) Reset()         { *m = DeleteServiceRequest{} }
 func (m *DeleteServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteServiceRequest) ProtoMessage()    {}
 func (*DeleteServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{6}
+	return fileDescriptor_b28c1d276df09fd1, []int{6}
 }
+
 func (m *DeleteServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteServiceRequest.Unmarshal(m, b)
 }
 func (m *DeleteServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteServiceRequest.Merge(dst, src)
+func (m *DeleteServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceRequest.Merge(m, src)
 }
 func (m *DeleteServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteServiceRequest.Size(m)
@@ -427,16 +436,17 @@ func (m *ListVersionsRequest) Reset()         { *m = ListVersionsRequest{} }
 func (m *ListVersionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListVersionsRequest) ProtoMessage()    {}
 func (*ListVersionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{7}
+	return fileDescriptor_b28c1d276df09fd1, []int{7}
 }
+
 func (m *ListVersionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVersionsRequest.Unmarshal(m, b)
 }
 func (m *ListVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVersionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListVersionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVersionsRequest.Merge(dst, src)
+func (m *ListVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsRequest.Merge(m, src)
 }
 func (m *ListVersionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListVersionsRequest.Size(m)
@@ -490,16 +500,17 @@ func (m *ListVersionsResponse) Reset()         { *m = ListVersionsResponse{} }
 func (m *ListVersionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListVersionsResponse) ProtoMessage()    {}
 func (*ListVersionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{8}
+	return fileDescriptor_b28c1d276df09fd1, []int{8}
 }
+
 func (m *ListVersionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVersionsResponse.Unmarshal(m, b)
 }
 func (m *ListVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVersionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListVersionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVersionsResponse.Merge(dst, src)
+func (m *ListVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsResponse.Merge(m, src)
 }
 func (m *ListVersionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListVersionsResponse.Size(m)
@@ -540,16 +551,17 @@ func (m *GetVersionRequest) Reset()         { *m = GetVersionRequest{} }
 func (m *GetVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVersionRequest) ProtoMessage()    {}
 func (*GetVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{9}
+	return fileDescriptor_b28c1d276df09fd1, []int{9}
 }
+
 func (m *GetVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVersionRequest.Unmarshal(m, b)
 }
 func (m *GetVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVersionRequest.Merge(dst, src)
+func (m *GetVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVersionRequest.Merge(m, src)
 }
 func (m *GetVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVersionRequest.Size(m)
@@ -590,16 +602,17 @@ func (m *CreateVersionRequest) Reset()         { *m = CreateVersionRequest{} }
 func (m *CreateVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateVersionRequest) ProtoMessage()    {}
 func (*CreateVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{10}
+	return fileDescriptor_b28c1d276df09fd1, []int{10}
 }
+
 func (m *CreateVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateVersionRequest.Unmarshal(m, b)
 }
 func (m *CreateVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateVersionRequest.Merge(dst, src)
+func (m *CreateVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVersionRequest.Merge(m, src)
 }
 func (m *CreateVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateVersionRequest.Size(m)
@@ -643,16 +656,17 @@ func (m *UpdateVersionRequest) Reset()         { *m = UpdateVersionRequest{} }
 func (m *UpdateVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateVersionRequest) ProtoMessage()    {}
 func (*UpdateVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{11}
+	return fileDescriptor_b28c1d276df09fd1, []int{11}
 }
+
 func (m *UpdateVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateVersionRequest.Unmarshal(m, b)
 }
 func (m *UpdateVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateVersionRequest.Merge(dst, src)
+func (m *UpdateVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVersionRequest.Merge(m, src)
 }
 func (m *UpdateVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateVersionRequest.Size(m)
@@ -698,16 +712,17 @@ func (m *DeleteVersionRequest) Reset()         { *m = DeleteVersionRequest{} }
 func (m *DeleteVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteVersionRequest) ProtoMessage()    {}
 func (*DeleteVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{12}
+	return fileDescriptor_b28c1d276df09fd1, []int{12}
 }
+
 func (m *DeleteVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteVersionRequest.Unmarshal(m, b)
 }
 func (m *DeleteVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteVersionRequest.Merge(dst, src)
+func (m *DeleteVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVersionRequest.Merge(m, src)
 }
 func (m *DeleteVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteVersionRequest.Size(m)
@@ -743,16 +758,17 @@ func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
 func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesRequest) ProtoMessage()    {}
 func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{13}
+	return fileDescriptor_b28c1d276df09fd1, []int{13}
 }
+
 func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
 }
 func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+func (m *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(m, src)
 }
 func (m *ListInstancesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesRequest.Size(m)
@@ -799,16 +815,17 @@ func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
 func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesResponse) ProtoMessage()    {}
 func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{14}
+	return fileDescriptor_b28c1d276df09fd1, []int{14}
 }
+
 func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
 }
 func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+func (m *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(m, src)
 }
 func (m *ListInstancesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesResponse.Size(m)
@@ -847,16 +864,17 @@ func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
 func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInstanceRequest) ProtoMessage()    {}
 func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{15}
+	return fileDescriptor_b28c1d276df09fd1, []int{15}
 }
+
 func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
 }
 func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+func (m *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(m, src)
 }
 func (m *GetInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInstanceRequest.Size(m)
@@ -888,16 +906,17 @@ func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
 func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteInstanceRequest) ProtoMessage()    {}
 func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{16}
+	return fileDescriptor_b28c1d276df09fd1, []int{16}
 }
+
 func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
 }
 func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+func (m *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(m, src)
 }
 func (m *DeleteInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
@@ -929,16 +948,17 @@ func (m *DebugInstanceRequest) Reset()         { *m = DebugInstanceRequest{} }
 func (m *DebugInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*DebugInstanceRequest) ProtoMessage()    {}
 func (*DebugInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_appengine_4ea48fc042b3846d, []int{17}
+	return fileDescriptor_b28c1d276df09fd1, []int{17}
 }
+
 func (m *DebugInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DebugInstanceRequest.Unmarshal(m, b)
 }
 func (m *DebugInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DebugInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DebugInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DebugInstanceRequest.Merge(dst, src)
+func (m *DebugInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugInstanceRequest.Merge(m, src)
 }
 func (m *DebugInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_DebugInstanceRequest.Size(m)
@@ -957,6 +977,7 @@ func (m *DebugInstanceRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.appengine.v1.VersionView", VersionView_name, VersionView_value)
 	proto.RegisterType((*GetApplicationRequest)(nil), "google.appengine.v1.GetApplicationRequest")
 	proto.RegisterType((*RepairApplicationRequest)(nil), "google.appengine.v1.RepairApplicationRequest")
 	proto.RegisterType((*ListServicesRequest)(nil), "google.appengine.v1.ListServicesRequest")
@@ -975,7 +996,85 @@ func init() {
 	proto.RegisterType((*GetInstanceRequest)(nil), "google.appengine.v1.GetInstanceRequest")
 	proto.RegisterType((*DeleteInstanceRequest)(nil), "google.appengine.v1.DeleteInstanceRequest")
 	proto.RegisterType((*DebugInstanceRequest)(nil), "google.appengine.v1.DebugInstanceRequest")
-	proto.RegisterEnum("google.appengine.v1.VersionView", VersionView_name, VersionView_value)
+}
+
+func init() {
+	proto.RegisterFile("google/appengine/v1/appengine.proto", fileDescriptor_b28c1d276df09fd1)
+}
+
+var fileDescriptor_b28c1d276df09fd1 = []byte{
+	// 1134 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x6f, 0xdb, 0x54,
+	0x14, 0xc6, 0x6d, 0xba, 0x25, 0x27, 0x6b, 0xb6, 0xde, 0xb6, 0x10, 0xbc, 0x76, 0x0a, 0x1e, 0x2c,
+	0xa9, 0xa7, 0xc5, 0x9a, 0x07, 0xd3, 0x48, 0x01, 0xa9, 0xdd, 0xb4, 0x6a, 0x52, 0x11, 0x95, 0xbb,
+	0xed, 0x01, 0x09, 0x55, 0x6e, 0x7a, 0x63, 0x5d, 0x9a, 0xd8, 0xc6, 0x76, 0xb2, 0x6e, 0x10, 0x21,
+	0x31, 0x09, 0x01, 0x8f, 0x1b, 0x0f, 0x3c, 0x20, 0xed, 0x81, 0x7f, 0x86, 0x77, 0xfe, 0x01, 0x1e,
+	0xf8, 0x43, 0x90, 0xaf, 0xef, 0xb5, 0x63, 0xc7, 0xbf, 0x54, 0xc4, 0x5b, 0x7c, 0xef, 0x77, 0xef,
+	0xf9, 0xee, 0x77, 0x3e, 0xfb, 0x9c, 0x1b, 0xb8, 0x6e, 0x58, 0x96, 0x31, 0xc4, 0x8a, 0x6e, 0xdb,
+	0xd8, 0x34, 0x88, 0x89, 0x95, 0xc9, 0xed, 0xe8, 0xa1, 0x6b, 0x3b, 0x96, 0x67, 0xa1, 0xd5, 0x00,
+	0xd4, 0x8d, 0xc6, 0x27, 0xb7, 0xc5, 0x8d, 0x70, 0x25, 0x51, 0x74, 0xd3, 0xb4, 0x3c, 0xdd, 0x23,
+	0x96, 0xe9, 0x06, 0x4b, 0xc4, 0x0f, 0x32, 0xf6, 0x1d, 0x92, 0x3e, 0xc5, 0x31, 0x98, 0x94, 0x06,
+	0x23, 0xa6, 0xeb, 0xe9, 0x66, 0x9f, 0x45, 0x17, 0xdf, 0x4b, 0xc3, 0xb8, 0xd8, 0x99, 0x90, 0x7c,
+	0xc8, 0x04, 0x3b, 0x6e, 0x14, 0xe9, 0x1a, 0x83, 0x10, 0x7d, 0x44, 0x63, 0xe8, 0xa3, 0x23, 0xdb,
+	0x1a, 0x92, 0xfe, 0x73, 0x36, 0x2f, 0xc6, 0xe7, 0x63, 0x73, 0x5c, 0xa4, 0xa1, 0x65, 0x1a, 0xce,
+	0xd8, 0x34, 0x89, 0x69, 0x28, 0x96, 0x8d, 0x9d, 0xd8, 0x89, 0xaf, 0x32, 0x10, 0x7d, 0x3a, 0x1e,
+	0x0f, 0x14, 0x3c, 0xb2, 0x3d, 0xbe, 0x43, 0x2b, 0x39, 0x39, 0x20, 0x78, 0x78, 0x72, 0x34, 0xd2,
+	0xdd, 0xd3, 0x00, 0x21, 0xdd, 0x84, 0xf5, 0x3d, 0xec, 0xed, 0x44, 0x0a, 0x69, 0xf8, 0x9b, 0x31,
+	0x76, 0x3d, 0x84, 0xa0, 0x62, 0xea, 0x23, 0xdc, 0x14, 0x5a, 0x42, 0xa7, 0xa6, 0xd1, 0xdf, 0x52,
+	0x17, 0x9a, 0x1a, 0xb6, 0x75, 0xe2, 0x94, 0xc4, 0x13, 0x58, 0xdd, 0x27, 0xae, 0x77, 0x18, 0x88,
+	0xe6, 0x72, 0xe8, 0xdb, 0x70, 0xc1, 0xd6, 0x1d, 0x6c, 0x7a, 0x0c, 0xcc, 0x9e, 0xd0, 0x55, 0xa8,
+	0xd9, 0xba, 0x81, 0x8f, 0x5c, 0xf2, 0x02, 0x37, 0x17, 0x5a, 0x42, 0x67, 0x49, 0xab, 0xfa, 0x03,
+	0x87, 0xe4, 0x05, 0x46, 0x9b, 0x00, 0x74, 0xd2, 0xb3, 0x4e, 0xb1, 0xd9, 0x5c, 0xa4, 0x0b, 0x29,
+	0xfc, 0xb1, 0x3f, 0x20, 0x9d, 0xc1, 0x5a, 0x3c, 0x94, 0x6b, 0x5b, 0xa6, 0x8b, 0xd1, 0x3d, 0xa8,
+	0xb2, 0x9c, 0xb9, 0x4d, 0xa1, 0xb5, 0xd8, 0xa9, 0xab, 0x1b, 0xdd, 0x14, 0x5b, 0x75, 0xd9, 0x42,
+	0x2d, 0x44, 0xa3, 0x1b, 0x70, 0xd9, 0xc4, 0x67, 0xde, 0xd1, 0x4c, 0xd4, 0x05, 0x1a, 0x75, 0xd9,
+	0x1f, 0x3e, 0x08, 0x23, 0xb7, 0x61, 0x65, 0x0f, 0xf3, 0xc0, 0x79, 0x6a, 0xfc, 0x29, 0xc0, 0xda,
+	0x13, 0xfb, 0x44, 0xf7, 0x70, 0x31, 0x18, 0xdd, 0x85, 0x8b, 0x8c, 0x09, 0x8d, 0x5a, 0x44, 0x9b,
+	0x83, 0xd1, 0x36, 0xd4, 0xc7, 0x34, 0x06, 0x4d, 0x32, 0xd5, 0xa9, 0xae, 0x8a, 0x7c, 0x2d, 0xf7,
+	0x41, 0xf7, 0xa1, 0xef, 0x83, 0xcf, 0x75, 0xf7, 0x54, 0x83, 0x00, 0xee, 0xff, 0x46, 0x6d, 0xb8,
+	0x3c, 0x22, 0x86, 0xe3, 0xaf, 0xf6, 0x1c, 0x7d, 0x30, 0x20, 0xfd, 0x66, 0xa5, 0x25, 0x74, 0xaa,
+	0x5a, 0x83, 0x0d, 0x3f, 0x0e, 0x46, 0x25, 0x19, 0xd6, 0x1e, 0xe0, 0x21, 0x2e, 0x73, 0x12, 0xe9,
+	0x8d, 0x10, 0xb8, 0xe0, 0x69, 0xf0, 0x5e, 0x14, 0xba, 0xe0, 0x43, 0xa8, 0x4c, 0x08, 0x7e, 0x46,
+	0x8f, 0xdd, 0x50, 0x5b, 0xa9, 0xc7, 0x66, 0x7b, 0x3d, 0x25, 0xf8, 0x99, 0x46, 0xd1, 0x71, 0xef,
+	0x2c, 0xe6, 0x7a, 0xa7, 0x92, 0xe1, 0x9d, 0x88, 0x60, 0xe4, 0x1d, 0xf6, 0x32, 0xe7, 0x7b, 0x87,
+	0x2d, 0xd4, 0x42, 0x74, 0x69, 0xef, 0x7c, 0x45, 0xbd, 0xc3, 0xd7, 0xe7, 0xd8, 0xe1, 0x5c, 0xa2,
+	0x48, 0x03, 0x58, 0xbb, 0xef, 0x60, 0xdd, 0xc3, 0x89, 0x08, 0x59, 0xd2, 0xdf, 0x85, 0x8b, 0xec,
+	0x08, 0xb9, 0xa6, 0xe3, 0xbb, 0x71, 0xb0, 0x9f, 0x62, 0xe6, 0xec, 0x12, 0x47, 0x39, 0x67, 0x90,
+	0xff, 0xe4, 0xec, 0xc8, 0xb0, 0xc5, 0x04, 0xa5, 0xaf, 0x03, 0x3b, 0x3c, 0x62, 0xe5, 0xe0, 0x7f,
+	0xfd, 0x6c, 0x7d, 0x07, 0xeb, 0x89, 0x58, 0xcc, 0x7b, 0xdb, 0x50, 0xe3, 0xf5, 0x88, 0x9b, 0x6f,
+	0x33, 0x55, 0x27, 0xbe, 0x54, 0x8b, 0xf0, 0xa5, 0xed, 0xd7, 0x01, 0xb4, 0x87, 0xc3, 0xe0, 0x79,
+	0x9a, 0xdc, 0x84, 0xf5, 0x40, 0xbf, 0x32, 0x60, 0x2a, 0xf6, 0xf1, 0xd8, 0x28, 0x81, 0x95, 0x25,
+	0xa8, 0xcf, 0xf8, 0x16, 0xd5, 0x60, 0x69, 0x77, 0xe7, 0xf0, 0xd1, 0xfd, 0x2b, 0x6f, 0xa1, 0x2a,
+	0x54, 0x1e, 0x3e, 0xd9, 0xdf, 0xbf, 0x22, 0xa8, 0x2f, 0x97, 0xa0, 0x16, 0x2a, 0x84, 0xfe, 0x10,
+	0x60, 0x39, 0xa6, 0x19, 0xda, 0x4a, 0x15, 0x26, 0x2d, 0x87, 0xa2, 0x5c, 0x06, 0x1a, 0xa4, 0x40,
+	0xda, 0xfe, 0xe1, 0xaf, 0x7f, 0x5e, 0x2f, 0x7c, 0x84, 0xee, 0xf8, 0x85, 0xf9, 0xdb, 0x20, 0xd9,
+	0x9f, 0xea, 0xb6, 0xed, 0x2a, 0x32, 0xef, 0x03, 0xfc, 0x9f, 0xfc, 0xa5, 0x57, 0xe4, 0xa9, 0x12,
+	0xa5, 0xe0, 0x95, 0x00, 0xf5, 0x19, 0x6d, 0x51, 0x3b, 0x35, 0xf0, 0xbc, 0xfa, 0x62, 0x7e, 0x96,
+	0x13, 0xa4, 0x7c, 0x09, 0x73, 0x29, 0x45, 0x8c, 0x14, 0x79, 0x8a, 0x7e, 0x13, 0xa0, 0x11, 0x4f,
+	0x23, 0x4a, 0x17, 0x24, 0x35, 0xd7, 0x11, 0xb5, 0x99, 0x86, 0xa4, 0xfb, 0x05, 0x6f, 0x48, 0x38,
+	0x35, 0xf9, 0x5c, 0xd4, 0xde, 0x08, 0xb0, 0x1c, 0x33, 0x4d, 0x46, 0x56, 0xd3, 0x8c, 0x55, 0x44,
+	0xec, 0x01, 0x25, 0xf6, 0x99, 0xf4, 0xf1, 0x39, 0x88, 0xf5, 0x4e, 0xfc, 0x80, 0x3d, 0x41, 0x56,
+	0xff, 0x5e, 0x82, 0x2a, 0x2f, 0x11, 0xe8, 0x57, 0x01, 0x2e, 0xcd, 0xd6, 0x0c, 0xd4, 0xc9, 0x34,
+	0x56, 0xa2, 0xee, 0x89, 0x5b, 0x25, 0x90, 0xcc, 0x81, 0x0a, 0x25, 0xbe, 0x85, 0xda, 0xb9, 0x0e,
+	0x9c, 0x86, 0xdc, 0xd1, 0x4b, 0x01, 0x20, 0x2a, 0x28, 0xe8, 0x46, 0x96, 0xe9, 0xe2, 0x5f, 0x41,
+	0x31, 0xf7, 0x0b, 0x9c, 0x60, 0x51, 0x28, 0xdf, 0x14, 0xbd, 0x16, 0x60, 0x39, 0x56, 0x77, 0x32,
+	0x72, 0x99, 0x56, 0x9b, 0x8a, 0x72, 0x79, 0x8f, 0x92, 0x51, 0xa5, 0xb2, 0x92, 0xf4, 0xc2, 0xfa,
+	0xe1, 0xb3, 0x8a, 0x15, 0xa9, 0x0c, 0x56, 0x69, 0x85, 0xac, 0x24, 0x2b, 0xb5, 0xac, 0x44, 0x11,
+	0xab, 0x5f, 0xa8, 0xef, 0x67, 0x2a, 0x53, 0xa6, 0xef, 0xe7, 0xab, 0x57, 0x11, 0x2b, 0x96, 0x38,
+	0xb9, 0x2c, 0x2b, 0xf5, 0xf7, 0x0a, 0x54, 0x79, 0x07, 0x8d, 0x7e, 0x66, 0x16, 0x0f, 0x07, 0xb2,
+	0x2d, 0x9e, 0x68, 0xf0, 0x73, 0x2c, 0x9e, 0xec, 0xcf, 0xa5, 0xf7, 0x29, 0xc7, 0x6b, 0x68, 0x63,
+	0x3e, 0x9f, 0xd3, 0x90, 0x26, 0x3a, 0xa3, 0xb6, 0x66, 0x8b, 0xb3, 0x6d, 0x1d, 0xef, 0x46, 0xc5,
+	0xdc, 0x96, 0x39, 0x11, 0x39, 0x5d, 0x9d, 0x29, 0xfa, 0x29, 0x74, 0x0d, 0x8f, 0x9e, 0xe7, 0x9a,
+	0x04, 0x81, 0x82, 0xfc, 0xdc, 0xa2, 0x0c, 0xda, 0x6a, 0x2e, 0x83, 0x5e, 0xd8, 0xda, 0x7f, 0xcf,
+	0x9d, 0x92, 0xcf, 0x24, 0xad, 0x31, 0x2f, 0x62, 0xc2, 0xb4, 0x90, 0x73, 0x99, 0xa8, 0xaf, 0x16,
+	0xe0, 0xd2, 0xcc, 0xcd, 0xcf, 0x45, 0xcf, 0xa1, 0x11, 0xbf, 0x3c, 0x66, 0x94, 0x93, 0xd4, 0x1b,
+	0xa6, 0x98, 0xde, 0xc5, 0xce, 0x00, 0xa5, 0x77, 0x29, 0xad, 0x55, 0xb4, 0x92, 0xa4, 0x35, 0x45,
+	0x3f, 0x0a, 0xb0, 0x32, 0x77, 0x17, 0x45, 0xb7, 0x52, 0xb7, 0xcc, 0xba, 0xb3, 0x16, 0xa9, 0x72,
+	0x9d, 0x86, 0xdf, 0x94, 0x9a, 0x73, 0xe1, 0x7b, 0x0e, 0xdd, 0xb2, 0x27, 0xc8, 0xbb, 0x04, 0xde,
+	0xe9, 0x5b, 0xa3, 0xb4, 0xb8, 0xbb, 0x8d, 0x1d, 0xfe, 0x74, 0xe0, 0x77, 0xa7, 0x07, 0xc2, 0x97,
+	0x9f, 0x30, 0x98, 0x61, 0x0d, 0x75, 0xd3, 0xe8, 0x5a, 0x8e, 0xa1, 0x18, 0xd8, 0xa4, 0xbd, 0xab,
+	0x12, 0x4c, 0xe9, 0x36, 0x71, 0x63, 0xff, 0x27, 0x6c, 0x87, 0x0f, 0xc7, 0x17, 0x28, 0xf0, 0xce,
+	0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x89, 0x36, 0x22, 0x8f, 0x3d, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1686,82 +1785,3 @@ var _Applications_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/appengine/v1/appengine.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/appengine/v1/appengine.proto", fileDescriptor_appengine_4ea48fc042b3846d)
-}
-
-var fileDescriptor_appengine_4ea48fc042b3846d = []byte{
-	// 1134 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x6f, 0xdb, 0x54,
-	0x14, 0xc6, 0x6d, 0xba, 0x25, 0x27, 0x6b, 0xb6, 0xde, 0xb6, 0x10, 0xbc, 0x76, 0x0a, 0x1e, 0x2c,
-	0xa9, 0xa7, 0xc5, 0x9a, 0x07, 0xd3, 0x48, 0x01, 0xa9, 0xdd, 0xb4, 0x6a, 0x52, 0x11, 0x95, 0xbb,
-	0xed, 0x01, 0x09, 0x55, 0x6e, 0x7a, 0x63, 0x5d, 0x9a, 0xd8, 0xc6, 0x76, 0xb2, 0x6e, 0x10, 0x21,
-	0x31, 0x09, 0x01, 0x8f, 0x1b, 0x0f, 0x3c, 0x20, 0xed, 0x81, 0x7f, 0x86, 0x77, 0xfe, 0x01, 0x1e,
-	0xf8, 0x43, 0x90, 0xaf, 0xef, 0xb5, 0x63, 0xc7, 0xbf, 0x54, 0xc4, 0x5b, 0x7c, 0xef, 0x77, 0xef,
-	0xf9, 0xee, 0x77, 0x3e, 0xfb, 0x9c, 0x1b, 0xb8, 0x6e, 0x58, 0x96, 0x31, 0xc4, 0x8a, 0x6e, 0xdb,
-	0xd8, 0x34, 0x88, 0x89, 0x95, 0xc9, 0xed, 0xe8, 0xa1, 0x6b, 0x3b, 0x96, 0x67, 0xa1, 0xd5, 0x00,
-	0xd4, 0x8d, 0xc6, 0x27, 0xb7, 0xc5, 0x8d, 0x70, 0x25, 0x51, 0x74, 0xd3, 0xb4, 0x3c, 0xdd, 0x23,
-	0x96, 0xe9, 0x06, 0x4b, 0xc4, 0x0f, 0x32, 0xf6, 0x1d, 0x92, 0x3e, 0xc5, 0x31, 0x98, 0x94, 0x06,
-	0x23, 0xa6, 0xeb, 0xe9, 0x66, 0x9f, 0x45, 0x17, 0xdf, 0x4b, 0xc3, 0xb8, 0xd8, 0x99, 0x90, 0x7c,
-	0xc8, 0x04, 0x3b, 0x6e, 0x14, 0xe9, 0x1a, 0x83, 0x10, 0x7d, 0x44, 0x63, 0xe8, 0xa3, 0x23, 0xdb,
-	0x1a, 0x92, 0xfe, 0x73, 0x36, 0x2f, 0xc6, 0xe7, 0x63, 0x73, 0x5c, 0xa4, 0xa1, 0x65, 0x1a, 0xce,
-	0xd8, 0x34, 0x89, 0x69, 0x28, 0x96, 0x8d, 0x9d, 0xd8, 0x89, 0xaf, 0x32, 0x10, 0x7d, 0x3a, 0x1e,
-	0x0f, 0x14, 0x3c, 0xb2, 0x3d, 0xbe, 0x43, 0x2b, 0x39, 0x39, 0x20, 0x78, 0x78, 0x72, 0x34, 0xd2,
-	0xdd, 0xd3, 0x00, 0x21, 0xdd, 0x84, 0xf5, 0x3d, 0xec, 0xed, 0x44, 0x0a, 0x69, 0xf8, 0x9b, 0x31,
-	0x76, 0x3d, 0x84, 0xa0, 0x62, 0xea, 0x23, 0xdc, 0x14, 0x5a, 0x42, 0xa7, 0xa6, 0xd1, 0xdf, 0x52,
-	0x17, 0x9a, 0x1a, 0xb6, 0x75, 0xe2, 0x94, 0xc4, 0x13, 0x58, 0xdd, 0x27, 0xae, 0x77, 0x18, 0x88,
-	0xe6, 0x72, 0xe8, 0xdb, 0x70, 0xc1, 0xd6, 0x1d, 0x6c, 0x7a, 0x0c, 0xcc, 0x9e, 0xd0, 0x55, 0xa8,
-	0xd9, 0xba, 0x81, 0x8f, 0x5c, 0xf2, 0x02, 0x37, 0x17, 0x5a, 0x42, 0x67, 0x49, 0xab, 0xfa, 0x03,
-	0x87, 0xe4, 0x05, 0x46, 0x9b, 0x00, 0x74, 0xd2, 0xb3, 0x4e, 0xb1, 0xd9, 0x5c, 0xa4, 0x0b, 0x29,
-	0xfc, 0xb1, 0x3f, 0x20, 0x9d, 0xc1, 0x5a, 0x3c, 0x94, 0x6b, 0x5b, 0xa6, 0x8b, 0xd1, 0x3d, 0xa8,
-	0xb2, 0x9c, 0xb9, 0x4d, 0xa1, 0xb5, 0xd8, 0xa9, 0xab, 0x1b, 0xdd, 0x14, 0x5b, 0x75, 0xd9, 0x42,
-	0x2d, 0x44, 0xa3, 0x1b, 0x70, 0xd9, 0xc4, 0x67, 0xde, 0xd1, 0x4c, 0xd4, 0x05, 0x1a, 0x75, 0xd9,
-	0x1f, 0x3e, 0x08, 0x23, 0xb7, 0x61, 0x65, 0x0f, 0xf3, 0xc0, 0x79, 0x6a, 0xfc, 0x29, 0xc0, 0xda,
-	0x13, 0xfb, 0x44, 0xf7, 0x70, 0x31, 0x18, 0xdd, 0x85, 0x8b, 0x8c, 0x09, 0x8d, 0x5a, 0x44, 0x9b,
-	0x83, 0xd1, 0x36, 0xd4, 0xc7, 0x34, 0x06, 0x4d, 0x32, 0xd5, 0xa9, 0xae, 0x8a, 0x7c, 0x2d, 0xf7,
-	0x41, 0xf7, 0xa1, 0xef, 0x83, 0xcf, 0x75, 0xf7, 0x54, 0x83, 0x00, 0xee, 0xff, 0x46, 0x6d, 0xb8,
-	0x3c, 0x22, 0x86, 0xe3, 0xaf, 0xf6, 0x1c, 0x7d, 0x30, 0x20, 0xfd, 0x66, 0xa5, 0x25, 0x74, 0xaa,
-	0x5a, 0x83, 0x0d, 0x3f, 0x0e, 0x46, 0x25, 0x19, 0xd6, 0x1e, 0xe0, 0x21, 0x2e, 0x73, 0x12, 0xe9,
-	0x8d, 0x10, 0xb8, 0xe0, 0x69, 0xf0, 0x5e, 0x14, 0xba, 0xe0, 0x43, 0xa8, 0x4c, 0x08, 0x7e, 0x46,
-	0x8f, 0xdd, 0x50, 0x5b, 0xa9, 0xc7, 0x66, 0x7b, 0x3d, 0x25, 0xf8, 0x99, 0x46, 0xd1, 0x71, 0xef,
-	0x2c, 0xe6, 0x7a, 0xa7, 0x92, 0xe1, 0x9d, 0x88, 0x60, 0xe4, 0x1d, 0xf6, 0x32, 0xe7, 0x7b, 0x87,
-	0x2d, 0xd4, 0x42, 0x74, 0x69, 0xef, 0x7c, 0x45, 0xbd, 0xc3, 0xd7, 0xe7, 0xd8, 0xe1, 0x5c, 0xa2,
-	0x48, 0x03, 0x58, 0xbb, 0xef, 0x60, 0xdd, 0xc3, 0x89, 0x08, 0x59, 0xd2, 0xdf, 0x85, 0x8b, 0xec,
-	0x08, 0xb9, 0xa6, 0xe3, 0xbb, 0x71, 0xb0, 0x9f, 0x62, 0xe6, 0xec, 0x12, 0x47, 0x39, 0x67, 0x90,
-	0xff, 0xe4, 0xec, 0xc8, 0xb0, 0xc5, 0x04, 0xa5, 0xaf, 0x03, 0x3b, 0x3c, 0x62, 0xe5, 0xe0, 0x7f,
-	0xfd, 0x6c, 0x7d, 0x07, 0xeb, 0x89, 0x58, 0xcc, 0x7b, 0xdb, 0x50, 0xe3, 0xf5, 0x88, 0x9b, 0x6f,
-	0x33, 0x55, 0x27, 0xbe, 0x54, 0x8b, 0xf0, 0xa5, 0xed, 0xd7, 0x01, 0xb4, 0x87, 0xc3, 0xe0, 0x79,
-	0x9a, 0xdc, 0x84, 0xf5, 0x40, 0xbf, 0x32, 0x60, 0x2a, 0xf6, 0xf1, 0xd8, 0x28, 0x81, 0x95, 0x25,
-	0xa8, 0xcf, 0xf8, 0x16, 0xd5, 0x60, 0x69, 0x77, 0xe7, 0xf0, 0xd1, 0xfd, 0x2b, 0x6f, 0xa1, 0x2a,
-	0x54, 0x1e, 0x3e, 0xd9, 0xdf, 0xbf, 0x22, 0xa8, 0x2f, 0x97, 0xa0, 0x16, 0x2a, 0x84, 0xfe, 0x10,
-	0x60, 0x39, 0xa6, 0x19, 0xda, 0x4a, 0x15, 0x26, 0x2d, 0x87, 0xa2, 0x5c, 0x06, 0x1a, 0xa4, 0x40,
-	0xda, 0xfe, 0xe1, 0xaf, 0x7f, 0x5e, 0x2f, 0x7c, 0x84, 0xee, 0xf8, 0x85, 0xf9, 0xdb, 0x20, 0xd9,
-	0x9f, 0xea, 0xb6, 0xed, 0x2a, 0x32, 0xef, 0x03, 0xfc, 0x9f, 0xfc, 0xa5, 0x57, 0xe4, 0xa9, 0x12,
-	0xa5, 0xe0, 0x95, 0x00, 0xf5, 0x19, 0x6d, 0x51, 0x3b, 0x35, 0xf0, 0xbc, 0xfa, 0x62, 0x7e, 0x96,
-	0x13, 0xa4, 0x7c, 0x09, 0x73, 0x29, 0x45, 0x8c, 0x14, 0x79, 0x8a, 0x7e, 0x13, 0xa0, 0x11, 0x4f,
-	0x23, 0x4a, 0x17, 0x24, 0x35, 0xd7, 0x11, 0xb5, 0x99, 0x86, 0xa4, 0xfb, 0x05, 0x6f, 0x48, 0x38,
-	0x35, 0xf9, 0x5c, 0xd4, 0xde, 0x08, 0xb0, 0x1c, 0x33, 0x4d, 0x46, 0x56, 0xd3, 0x8c, 0x55, 0x44,
-	0xec, 0x01, 0x25, 0xf6, 0x99, 0xf4, 0xf1, 0x39, 0x88, 0xf5, 0x4e, 0xfc, 0x80, 0x3d, 0x41, 0x56,
-	0xff, 0x5e, 0x82, 0x2a, 0x2f, 0x11, 0xe8, 0x57, 0x01, 0x2e, 0xcd, 0xd6, 0x0c, 0xd4, 0xc9, 0x34,
-	0x56, 0xa2, 0xee, 0x89, 0x5b, 0x25, 0x90, 0xcc, 0x81, 0x0a, 0x25, 0xbe, 0x85, 0xda, 0xb9, 0x0e,
-	0x9c, 0x86, 0xdc, 0xd1, 0x4b, 0x01, 0x20, 0x2a, 0x28, 0xe8, 0x46, 0x96, 0xe9, 0xe2, 0x5f, 0x41,
-	0x31, 0xf7, 0x0b, 0x9c, 0x60, 0x51, 0x28, 0xdf, 0x14, 0xbd, 0x16, 0x60, 0x39, 0x56, 0x77, 0x32,
-	0x72, 0x99, 0x56, 0x9b, 0x8a, 0x72, 0x79, 0x8f, 0x92, 0x51, 0xa5, 0xb2, 0x92, 0xf4, 0xc2, 0xfa,
-	0xe1, 0xb3, 0x8a, 0x15, 0xa9, 0x0c, 0x56, 0x69, 0x85, 0xac, 0x24, 0x2b, 0xb5, 0xac, 0x44, 0x11,
-	0xab, 0x5f, 0xa8, 0xef, 0x67, 0x2a, 0x53, 0xa6, 0xef, 0xe7, 0xab, 0x57, 0x11, 0x2b, 0x96, 0x38,
-	0xb9, 0x2c, 0x2b, 0xf5, 0xf7, 0x0a, 0x54, 0x79, 0x07, 0x8d, 0x7e, 0x66, 0x16, 0x0f, 0x07, 0xb2,
-	0x2d, 0x9e, 0x68, 0xf0, 0x73, 0x2c, 0x9e, 0xec, 0xcf, 0xa5, 0xf7, 0x29, 0xc7, 0x6b, 0x68, 0x63,
-	0x3e, 0x9f, 0xd3, 0x90, 0x26, 0x3a, 0xa3, 0xb6, 0x66, 0x8b, 0xb3, 0x6d, 0x1d, 0xef, 0x46, 0xc5,
-	0xdc, 0x96, 0x39, 0x11, 0x39, 0x5d, 0x9d, 0x29, 0xfa, 0x29, 0x74, 0x0d, 0x8f, 0x9e, 0xe7, 0x9a,
-	0x04, 0x81, 0x82, 0xfc, 0xdc, 0xa2, 0x0c, 0xda, 0x6a, 0x2e, 0x83, 0x5e, 0xd8, 0xda, 0x7f, 0xcf,
-	0x9d, 0x92, 0xcf, 0x24, 0xad, 0x31, 0x2f, 0x62, 0xc2, 0xb4, 0x90, 0x73, 0x99, 0xa8, 0xaf, 0x16,
-	0xe0, 0xd2, 0xcc, 0xcd, 0xcf, 0x45, 0xcf, 0xa1, 0x11, 0xbf, 0x3c, 0x66, 0x94, 0x93, 0xd4, 0x1b,
-	0xa6, 0x98, 0xde, 0xc5, 0xce, 0x00, 0xa5, 0x77, 0x29, 0xad, 0x55, 0xb4, 0x92, 0xa4, 0x35, 0x45,
-	0x3f, 0x0a, 0xb0, 0x32, 0x77, 0x17, 0x45, 0xb7, 0x52, 0xb7, 0xcc, 0xba, 0xb3, 0x16, 0xa9, 0x72,
-	0x9d, 0x86, 0xdf, 0x94, 0x9a, 0x73, 0xe1, 0x7b, 0x0e, 0xdd, 0xb2, 0x27, 0xc8, 0xbb, 0x04, 0xde,
-	0xe9, 0x5b, 0xa3, 0xb4, 0xb8, 0xbb, 0x8d, 0x1d, 0xfe, 0x74, 0xe0, 0x77, 0xa7, 0x07, 0xc2, 0x97,
-	0x9f, 0x30, 0x98, 0x61, 0x0d, 0x75, 0xd3, 0xe8, 0x5a, 0x8e, 0xa1, 0x18, 0xd8, 0xa4, 0xbd, 0xab,
-	0x12, 0x4c, 0xe9, 0x36, 0x71, 0x63, 0xff, 0x27, 0x6c, 0x87, 0x0f, 0xc7, 0x17, 0x28, 0xf0, 0xce,
-	0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x89, 0x36, 0x22, 0x8f, 0x3d, 0x11, 0x00, 0x00,
-}
diff --git a/googleapis/appengine/v1/application.pb.go b/googleapis/appengine/v1/application.pb.go
index e54c2cf078..fffd953b1f 100644
--- a/googleapis/appengine/v1/application.pb.go
+++ b/googleapis/appengine/v1/application.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/application.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An Application resource contains the top-level configuration of an App
 // Engine application.
@@ -85,16 +88,17 @@ func (m *Application) Reset()         { *m = Application{} }
 func (m *Application) String() string { return proto.CompactTextString(m) }
 func (*Application) ProtoMessage()    {}
 func (*Application) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_ac9d8695b16963cf, []int{0}
+	return fileDescriptor_fd91fbd11f8d8d62, []int{0}
 }
+
 func (m *Application) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Application.Unmarshal(m, b)
 }
 func (m *Application) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Application.Marshal(b, m, deterministic)
 }
-func (dst *Application) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Application.Merge(dst, src)
+func (m *Application) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Application.Merge(m, src)
 }
 func (m *Application) XXX_Size() int {
 	return xxx_messageInfo_Application.Size(m)
@@ -193,16 +197,17 @@ func (m *UrlDispatchRule) Reset()         { *m = UrlDispatchRule{} }
 func (m *UrlDispatchRule) String() string { return proto.CompactTextString(m) }
 func (*UrlDispatchRule) ProtoMessage()    {}
 func (*UrlDispatchRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_ac9d8695b16963cf, []int{1}
+	return fileDescriptor_fd91fbd11f8d8d62, []int{1}
 }
+
 func (m *UrlDispatchRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UrlDispatchRule.Unmarshal(m, b)
 }
 func (m *UrlDispatchRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UrlDispatchRule.Marshal(b, m, deterministic)
 }
-func (dst *UrlDispatchRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UrlDispatchRule.Merge(dst, src)
+func (m *UrlDispatchRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UrlDispatchRule.Merge(m, src)
 }
 func (m *UrlDispatchRule) XXX_Size() int {
 	return xxx_messageInfo_UrlDispatchRule.Size(m)
@@ -240,10 +245,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/appengine/v1/application.proto", fileDescriptor_application_ac9d8695b16963cf)
+	proto.RegisterFile("google/appengine/v1/application.proto", fileDescriptor_fd91fbd11f8d8d62)
 }
 
-var fileDescriptor_application_ac9d8695b16963cf = []byte{
+var fileDescriptor_fd91fbd11f8d8d62 = []byte{
 	// 409 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x5f, 0x6b, 0xdb, 0x30,
 	0x14, 0xc5, 0x71, 0x3c, 0x92, 0x45, 0x5e, 0xfe, 0xa0, 0xc1, 0xa2, 0x84, 0xb1, 0x85, 0xb0, 0x40,
diff --git a/googleapis/appengine/v1/audit_data.pb.go b/googleapis/appengine/v1/audit_data.pb.go
index 8e4c4b2e59..fbcd6ea108 100644
--- a/googleapis/appengine/v1/audit_data.pb.go
+++ b/googleapis/appengine/v1/audit_data.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/audit_data.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/iam/v1"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/iam/v1"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // App Engine admin service audit log.
 type AuditData struct {
@@ -39,16 +42,17 @@ func (m *AuditData) Reset()         { *m = AuditData{} }
 func (m *AuditData) String() string { return proto.CompactTextString(m) }
 func (*AuditData) ProtoMessage()    {}
 func (*AuditData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_60458bc78538b81a, []int{0}
+	return fileDescriptor_7c735bfd5270b805, []int{0}
 }
+
 func (m *AuditData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuditData.Unmarshal(m, b)
 }
 func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
 }
-func (dst *AuditData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuditData.Merge(dst, src)
+func (m *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(m, src)
 }
 func (m *AuditData) XXX_Size() int {
 	return xxx_messageInfo_AuditData.Size(m)
@@ -96,80 +100,14 @@ func (m *AuditData) GetCreateVersion() *CreateVersionMethod {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AuditData) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AuditData_OneofMarshaler, _AuditData_OneofUnmarshaler, _AuditData_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AuditData) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AuditData_UpdateService)(nil),
 		(*AuditData_CreateVersion)(nil),
 	}
 }
 
-func _AuditData_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AuditData)
-	// method
-	switch x := m.Method.(type) {
-	case *AuditData_UpdateService:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UpdateService); err != nil {
-			return err
-		}
-	case *AuditData_CreateVersion:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CreateVersion); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AuditData.Method has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AuditData_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AuditData)
-	switch tag {
-	case 1: // method.update_service
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UpdateServiceMethod)
-		err := b.DecodeMessage(msg)
-		m.Method = &AuditData_UpdateService{msg}
-		return true, err
-	case 2: // method.create_version
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CreateVersionMethod)
-		err := b.DecodeMessage(msg)
-		m.Method = &AuditData_CreateVersion{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AuditData_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AuditData)
-	// method
-	switch x := m.Method.(type) {
-	case *AuditData_UpdateService:
-		s := proto.Size(x.UpdateService)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_CreateVersion:
-		s := proto.Size(x.CreateVersion)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Detailed information about UpdateService call.
 type UpdateServiceMethod struct {
 	// Update service request.
@@ -183,16 +121,17 @@ func (m *UpdateServiceMethod) Reset()         { *m = UpdateServiceMethod{} }
 func (m *UpdateServiceMethod) String() string { return proto.CompactTextString(m) }
 func (*UpdateServiceMethod) ProtoMessage()    {}
 func (*UpdateServiceMethod) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_60458bc78538b81a, []int{1}
+	return fileDescriptor_7c735bfd5270b805, []int{1}
 }
+
 func (m *UpdateServiceMethod) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateServiceMethod.Unmarshal(m, b)
 }
 func (m *UpdateServiceMethod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateServiceMethod.Marshal(b, m, deterministic)
 }
-func (dst *UpdateServiceMethod) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateServiceMethod.Merge(dst, src)
+func (m *UpdateServiceMethod) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateServiceMethod.Merge(m, src)
 }
 func (m *UpdateServiceMethod) XXX_Size() int {
 	return xxx_messageInfo_UpdateServiceMethod.Size(m)
@@ -223,16 +162,17 @@ func (m *CreateVersionMethod) Reset()         { *m = CreateVersionMethod{} }
 func (m *CreateVersionMethod) String() string { return proto.CompactTextString(m) }
 func (*CreateVersionMethod) ProtoMessage()    {}
 func (*CreateVersionMethod) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_60458bc78538b81a, []int{2}
+	return fileDescriptor_7c735bfd5270b805, []int{2}
 }
+
 func (m *CreateVersionMethod) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateVersionMethod.Unmarshal(m, b)
 }
 func (m *CreateVersionMethod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateVersionMethod.Marshal(b, m, deterministic)
 }
-func (dst *CreateVersionMethod) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateVersionMethod.Merge(dst, src)
+func (m *CreateVersionMethod) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVersionMethod.Merge(m, src)
 }
 func (m *CreateVersionMethod) XXX_Size() int {
 	return xxx_messageInfo_CreateVersionMethod.Size(m)
@@ -257,10 +197,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/appengine/v1/audit_data.proto", fileDescriptor_audit_data_60458bc78538b81a)
+	proto.RegisterFile("google/appengine/v1/audit_data.proto", fileDescriptor_7c735bfd5270b805)
 }
 
-var fileDescriptor_audit_data_60458bc78538b81a = []byte{
+var fileDescriptor_7c735bfd5270b805 = []byte{
 	// 290 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x4e, 0xc3, 0x30,
 	0x10, 0x86, 0x09, 0x43, 0x01, 0x23, 0x3a, 0xa4, 0x03, 0x55, 0x07, 0x84, 0x0a, 0x43, 0x59, 0x1c,
diff --git a/googleapis/appengine/v1/deploy.pb.go b/googleapis/appengine/v1/deploy.pb.go
index 8003902506..ce608ade67 100644
--- a/googleapis/appengine/v1/deploy.pb.go
+++ b/googleapis/appengine/v1/deploy.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/deploy.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Code and application artifacts used to deploy a version to App Engine.
 type Deployment struct {
@@ -39,16 +42,17 @@ func (m *Deployment) Reset()         { *m = Deployment{} }
 func (m *Deployment) String() string { return proto.CompactTextString(m) }
 func (*Deployment) ProtoMessage()    {}
 func (*Deployment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_deploy_c2d1a3b963500eae, []int{0}
+	return fileDescriptor_744f483f02f61d1c, []int{0}
 }
+
 func (m *Deployment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Deployment.Unmarshal(m, b)
 }
 func (m *Deployment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Deployment.Marshal(b, m, deterministic)
 }
-func (dst *Deployment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Deployment.Merge(dst, src)
+func (m *Deployment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployment.Merge(m, src)
 }
 func (m *Deployment) XXX_Size() int {
 	return xxx_messageInfo_Deployment.Size(m)
@@ -102,16 +106,17 @@ func (m *FileInfo) Reset()         { *m = FileInfo{} }
 func (m *FileInfo) String() string { return proto.CompactTextString(m) }
 func (*FileInfo) ProtoMessage()    {}
 func (*FileInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_deploy_c2d1a3b963500eae, []int{1}
+	return fileDescriptor_744f483f02f61d1c, []int{1}
 }
+
 func (m *FileInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileInfo.Unmarshal(m, b)
 }
 func (m *FileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileInfo.Marshal(b, m, deterministic)
 }
-func (dst *FileInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileInfo.Merge(dst, src)
+func (m *FileInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileInfo.Merge(m, src)
 }
 func (m *FileInfo) XXX_Size() int {
 	return xxx_messageInfo_FileInfo.Size(m)
@@ -159,16 +164,17 @@ func (m *ContainerInfo) Reset()         { *m = ContainerInfo{} }
 func (m *ContainerInfo) String() string { return proto.CompactTextString(m) }
 func (*ContainerInfo) ProtoMessage()    {}
 func (*ContainerInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_deploy_c2d1a3b963500eae, []int{2}
+	return fileDescriptor_744f483f02f61d1c, []int{2}
 }
+
 func (m *ContainerInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContainerInfo.Unmarshal(m, b)
 }
 func (m *ContainerInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContainerInfo.Marshal(b, m, deterministic)
 }
-func (dst *ContainerInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContainerInfo.Merge(dst, src)
+func (m *ContainerInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContainerInfo.Merge(m, src)
 }
 func (m *ContainerInfo) XXX_Size() int {
 	return xxx_messageInfo_ContainerInfo.Size(m)
@@ -204,16 +210,17 @@ func (m *ZipInfo) Reset()         { *m = ZipInfo{} }
 func (m *ZipInfo) String() string { return proto.CompactTextString(m) }
 func (*ZipInfo) ProtoMessage()    {}
 func (*ZipInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_deploy_c2d1a3b963500eae, []int{3}
+	return fileDescriptor_744f483f02f61d1c, []int{3}
 }
+
 func (m *ZipInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ZipInfo.Unmarshal(m, b)
 }
 func (m *ZipInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ZipInfo.Marshal(b, m, deterministic)
 }
-func (dst *ZipInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ZipInfo.Merge(dst, src)
+func (m *ZipInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ZipInfo.Merge(m, src)
 }
 func (m *ZipInfo) XXX_Size() int {
 	return xxx_messageInfo_ZipInfo.Size(m)
@@ -246,11 +253,9 @@ func init() {
 	proto.RegisterType((*ZipInfo)(nil), "google.appengine.v1.ZipInfo")
 }
 
-func init() {
-	proto.RegisterFile("google/appengine/v1/deploy.proto", fileDescriptor_deploy_c2d1a3b963500eae)
-}
+func init() { proto.RegisterFile("google/appengine/v1/deploy.proto", fileDescriptor_744f483f02f61d1c) }
 
-var fileDescriptor_deploy_c2d1a3b963500eae = []byte{
+var fileDescriptor_744f483f02f61d1c = []byte{
 	// 394 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xd1, 0xab, 0xd3, 0x30,
 	0x14, 0xc6, 0xe9, 0x6a, 0xbd, 0xeb, 0x29, 0x82, 0x44, 0xc1, 0x7a, 0xbd, 0x17, 0x4b, 0x41, 0x28,
diff --git a/googleapis/appengine/v1/instance.pb.go b/googleapis/appengine/v1/instance.pb.go
index 0adf2e63ce..82e6810677 100644
--- a/googleapis/appengine/v1/instance.pb.go
+++ b/googleapis/appengine/v1/instance.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/instance.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Availability of the instance.
 type Instance_Availability int32
@@ -34,6 +37,7 @@ var Instance_Availability_name = map[int32]string{
 	1: "RESIDENT",
 	2: "DYNAMIC",
 }
+
 var Instance_Availability_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"RESIDENT":    1,
@@ -43,8 +47,9 @@ var Instance_Availability_value = map[string]int32{
 func (x Instance_Availability) String() string {
 	return proto.EnumName(Instance_Availability_name, int32(x))
 }
+
 func (Instance_Availability) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_instance_db2e4a2fffd7a808, []int{0, 0}
+	return fileDescriptor_3b3f5aa565fc77c9, []int{0, 0}
 }
 
 // An Instance resource is the computing unit that App Engine uses to
@@ -126,16 +131,17 @@ func (m *Instance) Reset()         { *m = Instance{} }
 func (m *Instance) String() string { return proto.CompactTextString(m) }
 func (*Instance) ProtoMessage()    {}
 func (*Instance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instance_db2e4a2fffd7a808, []int{0}
+	return fileDescriptor_3b3f5aa565fc77c9, []int{0}
 }
+
 func (m *Instance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instance.Unmarshal(m, b)
 }
 func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
 }
-func (dst *Instance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instance.Merge(dst, src)
+func (m *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(m, src)
 }
 func (m *Instance) XXX_Size() int {
 	return xxx_messageInfo_Instance.Size(m)
@@ -252,15 +258,13 @@ func (m *Instance) GetVmDebugEnabled() bool {
 }
 
 func init() {
-	proto.RegisterType((*Instance)(nil), "google.appengine.v1.Instance")
 	proto.RegisterEnum("google.appengine.v1.Instance_Availability", Instance_Availability_name, Instance_Availability_value)
+	proto.RegisterType((*Instance)(nil), "google.appengine.v1.Instance")
 }
 
-func init() {
-	proto.RegisterFile("google/appengine/v1/instance.proto", fileDescriptor_instance_db2e4a2fffd7a808)
-}
+func init() { proto.RegisterFile("google/appengine/v1/instance.proto", fileDescriptor_3b3f5aa565fc77c9) }
 
-var fileDescriptor_instance_db2e4a2fffd7a808 = []byte{
+var fileDescriptor_3b3f5aa565fc77c9 = []byte{
 	// 521 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x5d, 0x6b, 0xdb, 0x3c,
 	0x14, 0x7e, 0x9d, 0xb6, 0xa9, 0x73, 0xe2, 0x26, 0x46, 0x85, 0xb7, 0x22, 0x1b, 0xcc, 0xcb, 0xcd,
diff --git a/googleapis/appengine/v1/location.pb.go b/googleapis/appengine/v1/location.pb.go
index 1a05129802..3acbc096cd 100644
--- a/googleapis/appengine/v1/location.pb.go
+++ b/googleapis/appengine/v1/location.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/location.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Metadata for the given
 // [google.cloud.location.Location][google.cloud.location.Location].
@@ -40,16 +43,17 @@ func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
 func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LocationMetadata) ProtoMessage()    {}
 func (*LocationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_d54799c7cf43fb8a, []int{0}
+	return fileDescriptor_c86665b4be2de7f4, []int{0}
 }
+
 func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
 }
 func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+func (m *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(m, src)
 }
 func (m *LocationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LocationMetadata.Size(m)
@@ -78,11 +82,9 @@ func init() {
 	proto.RegisterType((*LocationMetadata)(nil), "google.appengine.v1.LocationMetadata")
 }
 
-func init() {
-	proto.RegisterFile("google/appengine/v1/location.proto", fileDescriptor_location_d54799c7cf43fb8a)
-}
+func init() { proto.RegisterFile("google/appengine/v1/location.proto", fileDescriptor_c86665b4be2de7f4) }
 
-var fileDescriptor_location_d54799c7cf43fb8a = []byte{
+var fileDescriptor_c86665b4be2de7f4 = []byte{
 	// 236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x41, 0x4b, 0xc3, 0x40,
 	0x10, 0x85, 0x89, 0x88, 0x48, 0x40, 0x90, 0x7a, 0xb0, 0x94, 0x22, 0xd2, 0x93, 0xa7, 0x5d, 0x8a,
diff --git a/googleapis/appengine/v1/operation.pb.go b/googleapis/appengine/v1/operation.pb.go
index 7c5b0db41e..7c6240a66e 100644
--- a/googleapis/appengine/v1/operation.pb.go
+++ b/googleapis/appengine/v1/operation.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/operation.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Metadata for the given
 // [google.longrunning.Operation][google.longrunning.Operation].
@@ -54,16 +57,17 @@ func (m *OperationMetadataV1) Reset()         { *m = OperationMetadataV1{} }
 func (m *OperationMetadataV1) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadataV1) ProtoMessage()    {}
 func (*OperationMetadataV1) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_326b57a977d1c44b, []int{0}
+	return fileDescriptor_cd79c83122c3fcce, []int{0}
 }
+
 func (m *OperationMetadataV1) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadataV1.Unmarshal(m, b)
 }
 func (m *OperationMetadataV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadataV1.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadataV1) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadataV1.Merge(dst, src)
+func (m *OperationMetadataV1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadataV1.Merge(m, src)
 }
 func (m *OperationMetadataV1) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadataV1.Size(m)
@@ -114,10 +118,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/appengine/v1/operation.proto", fileDescriptor_operation_326b57a977d1c44b)
+	proto.RegisterFile("google/appengine/v1/operation.proto", fileDescriptor_cd79c83122c3fcce)
 }
 
-var fileDescriptor_operation_326b57a977d1c44b = []byte{
+var fileDescriptor_cd79c83122c3fcce = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x41, 0x4b, 0x03, 0x31,
 	0x10, 0x85, 0x59, 0xad, 0x55, 0x53, 0xf0, 0xb0, 0x05, 0x5d, 0x16, 0xc1, 0xa2, 0x97, 0x9e, 0x12,
diff --git a/googleapis/appengine/v1/service.pb.go b/googleapis/appengine/v1/service.pb.go
index d275e39fae..e32778516b 100644
--- a/googleapis/appengine/v1/service.pb.go
+++ b/googleapis/appengine/v1/service.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/service.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Available sharding mechanisms.
 type TrafficSplit_ShardBy int32
@@ -38,6 +41,7 @@ var TrafficSplit_ShardBy_name = map[int32]string{
 	1: "COOKIE",
 	2: "IP",
 }
+
 var TrafficSplit_ShardBy_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"COOKIE":      1,
@@ -47,8 +51,9 @@ var TrafficSplit_ShardBy_value = map[string]int32{
 func (x TrafficSplit_ShardBy) String() string {
 	return proto.EnumName(TrafficSplit_ShardBy_name, int32(x))
 }
+
 func (TrafficSplit_ShardBy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_service_5cc1e3a69330c73e, []int{1, 0}
+	return fileDescriptor_c1fc975248a879f7, []int{1, 0}
 }
 
 // A Service resource is a logical component of an application that can share
@@ -81,16 +86,17 @@ func (m *Service) Reset()         { *m = Service{} }
 func (m *Service) String() string { return proto.CompactTextString(m) }
 func (*Service) ProtoMessage()    {}
 func (*Service) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_5cc1e3a69330c73e, []int{0}
+	return fileDescriptor_c1fc975248a879f7, []int{0}
 }
+
 func (m *Service) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Service.Unmarshal(m, b)
 }
 func (m *Service) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Service.Marshal(b, m, deterministic)
 }
-func (dst *Service) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Service.Merge(dst, src)
+func (m *Service) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Service.Merge(m, src)
 }
 func (m *Service) XXX_Size() int {
 	return xxx_messageInfo_Service.Size(m)
@@ -147,16 +153,17 @@ func (m *TrafficSplit) Reset()         { *m = TrafficSplit{} }
 func (m *TrafficSplit) String() string { return proto.CompactTextString(m) }
 func (*TrafficSplit) ProtoMessage()    {}
 func (*TrafficSplit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_5cc1e3a69330c73e, []int{1}
+	return fileDescriptor_c1fc975248a879f7, []int{1}
 }
+
 func (m *TrafficSplit) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrafficSplit.Unmarshal(m, b)
 }
 func (m *TrafficSplit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrafficSplit.Marshal(b, m, deterministic)
 }
-func (dst *TrafficSplit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrafficSplit.Merge(dst, src)
+func (m *TrafficSplit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrafficSplit.Merge(m, src)
 }
 func (m *TrafficSplit) XXX_Size() int {
 	return xxx_messageInfo_TrafficSplit.Size(m)
@@ -182,17 +189,15 @@ func (m *TrafficSplit) GetAllocations() map[string]float64 {
 }
 
 func init() {
+	proto.RegisterEnum("google.appengine.v1.TrafficSplit_ShardBy", TrafficSplit_ShardBy_name, TrafficSplit_ShardBy_value)
 	proto.RegisterType((*Service)(nil), "google.appengine.v1.Service")
 	proto.RegisterType((*TrafficSplit)(nil), "google.appengine.v1.TrafficSplit")
 	proto.RegisterMapType((map[string]float64)(nil), "google.appengine.v1.TrafficSplit.AllocationsEntry")
-	proto.RegisterEnum("google.appengine.v1.TrafficSplit_ShardBy", TrafficSplit_ShardBy_name, TrafficSplit_ShardBy_value)
 }
 
-func init() {
-	proto.RegisterFile("google/appengine/v1/service.proto", fileDescriptor_service_5cc1e3a69330c73e)
-}
+func init() { proto.RegisterFile("google/appengine/v1/service.proto", fileDescriptor_c1fc975248a879f7) }
 
-var fileDescriptor_service_5cc1e3a69330c73e = []byte{
+var fileDescriptor_c1fc975248a879f7 = []byte{
 	// 356 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x51, 0x8b, 0xda, 0x40,
 	0x10, 0xc7, 0x9b, 0xb5, 0x6a, 0x3b, 0x11, 0x1b, 0xb6, 0x85, 0x06, 0xe9, 0x83, 0xfa, 0x64, 0x5f,
diff --git a/googleapis/appengine/v1/version.pb.go b/googleapis/appengine/v1/version.pb.go
index a581910f40..0cfe47c817 100644
--- a/googleapis/appengine/v1/version.pb.go
+++ b/googleapis/appengine/v1/version.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/version.proto
 
-package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
+package appengine
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Available inbound services.
 type InboundServiceType int32
@@ -57,6 +60,7 @@ var InboundServiceType_name = map[int32]string{
 	7: "INBOUND_SERVICE_CHANNEL_PRESENCE",
 	9: "INBOUND_SERVICE_WARMUP",
 }
+
 var InboundServiceType_value = map[string]int32{
 	"INBOUND_SERVICE_UNSPECIFIED":      0,
 	"INBOUND_SERVICE_MAIL":             1,
@@ -72,8 +76,9 @@ var InboundServiceType_value = map[string]int32{
 func (x InboundServiceType) String() string {
 	return proto.EnumName(InboundServiceType_name, int32(x))
 }
+
 func (InboundServiceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{0}
+	return fileDescriptor_fbe3eca208d62f7c, []int{0}
 }
 
 // Run states of a version.
@@ -96,6 +101,7 @@ var ServingStatus_name = map[int32]string{
 	1: "SERVING",
 	2: "STOPPED",
 }
+
 var ServingStatus_value = map[string]int32{
 	"SERVING_STATUS_UNSPECIFIED": 0,
 	"SERVING":                    1,
@@ -105,8 +111,9 @@ var ServingStatus_value = map[string]int32{
 func (x ServingStatus) String() string {
 	return proto.EnumName(ServingStatus_name, int32(x))
 }
+
 func (ServingStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{1}
+	return fileDescriptor_fbe3eca208d62f7c, []int{1}
 }
 
 // A Version resource is a specific set of source code and configuration files
@@ -236,16 +243,17 @@ func (m *Version) Reset()         { *m = Version{} }
 func (m *Version) String() string { return proto.CompactTextString(m) }
 func (*Version) ProtoMessage()    {}
 func (*Version) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{0}
+	return fileDescriptor_fbe3eca208d62f7c, []int{0}
 }
+
 func (m *Version) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Version.Unmarshal(m, b)
 }
 func (m *Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Version.Marshal(b, m, deterministic)
 }
-func (dst *Version) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Version.Merge(dst, src)
+func (m *Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Version.Merge(m, src)
 }
 func (m *Version) XXX_Size() int {
 	return xxx_messageInfo_Version.Size(m)
@@ -481,99 +489,15 @@ func (m *Version) GetVersionUrl() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Version) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Version_OneofMarshaler, _Version_OneofUnmarshaler, _Version_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Version) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Version_AutomaticScaling)(nil),
 		(*Version_BasicScaling)(nil),
 		(*Version_ManualScaling)(nil),
 	}
 }
 
-func _Version_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Version)
-	// scaling
-	switch x := m.Scaling.(type) {
-	case *Version_AutomaticScaling:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AutomaticScaling); err != nil {
-			return err
-		}
-	case *Version_BasicScaling:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BasicScaling); err != nil {
-			return err
-		}
-	case *Version_ManualScaling:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ManualScaling); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Version.Scaling has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Version_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Version)
-	switch tag {
-	case 3: // scaling.automatic_scaling
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AutomaticScaling)
-		err := b.DecodeMessage(msg)
-		m.Scaling = &Version_AutomaticScaling{msg}
-		return true, err
-	case 4: // scaling.basic_scaling
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BasicScaling)
-		err := b.DecodeMessage(msg)
-		m.Scaling = &Version_BasicScaling{msg}
-		return true, err
-	case 5: // scaling.manual_scaling
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ManualScaling)
-		err := b.DecodeMessage(msg)
-		m.Scaling = &Version_ManualScaling{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Version_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Version)
-	// scaling
-	switch x := m.Scaling.(type) {
-	case *Version_AutomaticScaling:
-		s := proto.Size(x.AutomaticScaling)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Version_BasicScaling:
-		s := proto.Size(x.BasicScaling)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Version_ManualScaling:
-		s := proto.Size(x.ManualScaling)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Automatic scaling is based on request rate, response latencies, and other
 // application metrics.
 type AutomaticScaling struct {
@@ -620,16 +544,17 @@ func (m *AutomaticScaling) Reset()         { *m = AutomaticScaling{} }
 func (m *AutomaticScaling) String() string { return proto.CompactTextString(m) }
 func (*AutomaticScaling) ProtoMessage()    {}
 func (*AutomaticScaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{1}
+	return fileDescriptor_fbe3eca208d62f7c, []int{1}
 }
+
 func (m *AutomaticScaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AutomaticScaling.Unmarshal(m, b)
 }
 func (m *AutomaticScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AutomaticScaling.Marshal(b, m, deterministic)
 }
-func (dst *AutomaticScaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AutomaticScaling.Merge(dst, src)
+func (m *AutomaticScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutomaticScaling.Merge(m, src)
 }
 func (m *AutomaticScaling) XXX_Size() int {
 	return xxx_messageInfo_AutomaticScaling.Size(m)
@@ -743,16 +668,17 @@ func (m *BasicScaling) Reset()         { *m = BasicScaling{} }
 func (m *BasicScaling) String() string { return proto.CompactTextString(m) }
 func (*BasicScaling) ProtoMessage()    {}
 func (*BasicScaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{2}
+	return fileDescriptor_fbe3eca208d62f7c, []int{2}
 }
+
 func (m *BasicScaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BasicScaling.Unmarshal(m, b)
 }
 func (m *BasicScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BasicScaling.Marshal(b, m, deterministic)
 }
-func (dst *BasicScaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BasicScaling.Merge(dst, src)
+func (m *BasicScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BasicScaling.Merge(m, src)
 }
 func (m *BasicScaling) XXX_Size() int {
 	return xxx_messageInfo_BasicScaling.Size(m)
@@ -795,16 +721,17 @@ func (m *ManualScaling) Reset()         { *m = ManualScaling{} }
 func (m *ManualScaling) String() string { return proto.CompactTextString(m) }
 func (*ManualScaling) ProtoMessage()    {}
 func (*ManualScaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{3}
+	return fileDescriptor_fbe3eca208d62f7c, []int{3}
 }
+
 func (m *ManualScaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManualScaling.Unmarshal(m, b)
 }
 func (m *ManualScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManualScaling.Marshal(b, m, deterministic)
 }
-func (dst *ManualScaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManualScaling.Merge(dst, src)
+func (m *ManualScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManualScaling.Merge(m, src)
 }
 func (m *ManualScaling) XXX_Size() int {
 	return xxx_messageInfo_ManualScaling.Size(m)
@@ -838,16 +765,17 @@ func (m *CpuUtilization) Reset()         { *m = CpuUtilization{} }
 func (m *CpuUtilization) String() string { return proto.CompactTextString(m) }
 func (*CpuUtilization) ProtoMessage()    {}
 func (*CpuUtilization) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{4}
+	return fileDescriptor_fbe3eca208d62f7c, []int{4}
 }
+
 func (m *CpuUtilization) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CpuUtilization.Unmarshal(m, b)
 }
 func (m *CpuUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CpuUtilization.Marshal(b, m, deterministic)
 }
-func (dst *CpuUtilization) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CpuUtilization.Merge(dst, src)
+func (m *CpuUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CpuUtilization.Merge(m, src)
 }
 func (m *CpuUtilization) XXX_Size() int {
 	return xxx_messageInfo_CpuUtilization.Size(m)
@@ -887,16 +815,17 @@ func (m *RequestUtilization) Reset()         { *m = RequestUtilization{} }
 func (m *RequestUtilization) String() string { return proto.CompactTextString(m) }
 func (*RequestUtilization) ProtoMessage()    {}
 func (*RequestUtilization) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{5}
+	return fileDescriptor_fbe3eca208d62f7c, []int{5}
 }
+
 func (m *RequestUtilization) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestUtilization.Unmarshal(m, b)
 }
 func (m *RequestUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestUtilization.Marshal(b, m, deterministic)
 }
-func (dst *RequestUtilization) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestUtilization.Merge(dst, src)
+func (m *RequestUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestUtilization.Merge(m, src)
 }
 func (m *RequestUtilization) XXX_Size() int {
 	return xxx_messageInfo_RequestUtilization.Size(m)
@@ -940,16 +869,17 @@ func (m *DiskUtilization) Reset()         { *m = DiskUtilization{} }
 func (m *DiskUtilization) String() string { return proto.CompactTextString(m) }
 func (*DiskUtilization) ProtoMessage()    {}
 func (*DiskUtilization) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{6}
+	return fileDescriptor_fbe3eca208d62f7c, []int{6}
 }
+
 func (m *DiskUtilization) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DiskUtilization.Unmarshal(m, b)
 }
 func (m *DiskUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DiskUtilization.Marshal(b, m, deterministic)
 }
-func (dst *DiskUtilization) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DiskUtilization.Merge(dst, src)
+func (m *DiskUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiskUtilization.Merge(m, src)
 }
 func (m *DiskUtilization) XXX_Size() int {
 	return xxx_messageInfo_DiskUtilization.Size(m)
@@ -1007,16 +937,17 @@ func (m *NetworkUtilization) Reset()         { *m = NetworkUtilization{} }
 func (m *NetworkUtilization) String() string { return proto.CompactTextString(m) }
 func (*NetworkUtilization) ProtoMessage()    {}
 func (*NetworkUtilization) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{7}
+	return fileDescriptor_fbe3eca208d62f7c, []int{7}
 }
+
 func (m *NetworkUtilization) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkUtilization.Unmarshal(m, b)
 }
 func (m *NetworkUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkUtilization.Marshal(b, m, deterministic)
 }
-func (dst *NetworkUtilization) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkUtilization.Merge(dst, src)
+func (m *NetworkUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkUtilization.Merge(m, src)
 }
 func (m *NetworkUtilization) XXX_Size() int {
 	return xxx_messageInfo_NetworkUtilization.Size(m)
@@ -1076,16 +1007,17 @@ func (m *Network) Reset()         { *m = Network{} }
 func (m *Network) String() string { return proto.CompactTextString(m) }
 func (*Network) ProtoMessage()    {}
 func (*Network) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{8}
+	return fileDescriptor_fbe3eca208d62f7c, []int{8}
 }
+
 func (m *Network) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Network.Unmarshal(m, b)
 }
 func (m *Network) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Network.Marshal(b, m, deterministic)
 }
-func (dst *Network) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Network.Merge(dst, src)
+func (m *Network) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Network.Merge(m, src)
 }
 func (m *Network) XXX_Size() int {
 	return xxx_messageInfo_Network.Size(m)
@@ -1134,16 +1066,17 @@ func (m *Resources) Reset()         { *m = Resources{} }
 func (m *Resources) String() string { return proto.CompactTextString(m) }
 func (*Resources) ProtoMessage()    {}
 func (*Resources) Descriptor() ([]byte, []int) {
-	return fileDescriptor_version_af454e22c8704a00, []int{9}
+	return fileDescriptor_fbe3eca208d62f7c, []int{9}
 }
+
 func (m *Resources) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resources.Unmarshal(m, b)
 }
 func (m *Resources) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Resources.Marshal(b, m, deterministic)
 }
-func (dst *Resources) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resources.Merge(dst, src)
+func (m *Resources) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resources.Merge(m, src)
 }
 func (m *Resources) XXX_Size() int {
 	return xxx_messageInfo_Resources.Size(m)
@@ -1176,6 +1109,8 @@ func (m *Resources) GetMemoryGb() float64 {
 }
 
 func init() {
+	proto.RegisterEnum("google.appengine.v1.InboundServiceType", InboundServiceType_name, InboundServiceType_value)
+	proto.RegisterEnum("google.appengine.v1.ServingStatus", ServingStatus_name, ServingStatus_value)
 	proto.RegisterType((*Version)(nil), "google.appengine.v1.Version")
 	proto.RegisterMapType((map[string]string)(nil), "google.appengine.v1.Version.BetaSettingsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.appengine.v1.Version.EnvVariablesEntry")
@@ -1188,15 +1123,11 @@ func init() {
 	proto.RegisterType((*NetworkUtilization)(nil), "google.appengine.v1.NetworkUtilization")
 	proto.RegisterType((*Network)(nil), "google.appengine.v1.Network")
 	proto.RegisterType((*Resources)(nil), "google.appengine.v1.Resources")
-	proto.RegisterEnum("google.appengine.v1.InboundServiceType", InboundServiceType_name, InboundServiceType_value)
-	proto.RegisterEnum("google.appengine.v1.ServingStatus", ServingStatus_name, ServingStatus_value)
 }
 
-func init() {
-	proto.RegisterFile("google/appengine/v1/version.proto", fileDescriptor_version_af454e22c8704a00)
-}
+func init() { proto.RegisterFile("google/appengine/v1/version.proto", fileDescriptor_fbe3eca208d62f7c) }
 
-var fileDescriptor_version_af454e22c8704a00 = []byte{
+var fileDescriptor_fbe3eca208d62f7c = []byte{
 	// 1767 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0x5d, 0x73, 0xdb, 0xc6,
 	0x15, 0x0d, 0x29, 0x4b, 0x14, 0x2f, 0x3f, 0x04, 0xad, 0xd3, 0x08, 0x96, 0x64, 0x89, 0x66, 0x92,
diff --git a/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go b/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
index ebd7170b4b..f8aa03e8a1 100644
--- a/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
+++ b/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/assistant/embedded/v1alpha1/embedded_assistant.proto
 
-package embedded // import "google.golang.org/genproto/googleapis/assistant/embedded/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package embedded
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Audio encoding of the data sent in the audio message.
 // Audio must be one-channel (mono). The only language supported is "en-US".
@@ -50,6 +50,7 @@ var AudioInConfig_Encoding_name = map[int32]string{
 	1: "LINEAR16",
 	2: "FLAC",
 }
+
 var AudioInConfig_Encoding_value = map[string]int32{
 	"ENCODING_UNSPECIFIED": 0,
 	"LINEAR16":             1,
@@ -59,8 +60,9 @@ var AudioInConfig_Encoding_value = map[string]int32{
 func (x AudioInConfig_Encoding) String() string {
 	return proto.EnumName(AudioInConfig_Encoding_name, int32(x))
 }
+
 func (AudioInConfig_Encoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{1, 0}
+	return fileDescriptor_2a6c80cea3f0c886, []int{1, 0}
 }
 
 // Audio encoding of the data returned in the audio message. All encodings are
@@ -87,6 +89,7 @@ var AudioOutConfig_Encoding_name = map[int32]string{
 	2: "MP3",
 	3: "OPUS_IN_OGG",
 }
+
 var AudioOutConfig_Encoding_value = map[string]int32{
 	"ENCODING_UNSPECIFIED": 0,
 	"LINEAR16":             1,
@@ -97,8 +100,9 @@ var AudioOutConfig_Encoding_value = map[string]int32{
 func (x AudioOutConfig_Encoding) String() string {
 	return proto.EnumName(AudioOutConfig_Encoding_name, int32(x))
 }
+
 func (AudioOutConfig_Encoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{2, 0}
+	return fileDescriptor_2a6c80cea3f0c886, []int{2, 0}
 }
 
 // Possible states of the microphone after a `Converse` RPC completes.
@@ -121,6 +125,7 @@ var ConverseResult_MicrophoneMode_name = map[int32]string{
 	1: "CLOSE_MICROPHONE",
 	2: "DIALOG_FOLLOW_ON",
 }
+
 var ConverseResult_MicrophoneMode_value = map[string]int32{
 	"MICROPHONE_MODE_UNSPECIFIED": 0,
 	"CLOSE_MICROPHONE":            1,
@@ -130,8 +135,9 @@ var ConverseResult_MicrophoneMode_value = map[string]int32{
 func (x ConverseResult_MicrophoneMode) String() string {
 	return proto.EnumName(ConverseResult_MicrophoneMode_name, int32(x))
 }
+
 func (ConverseResult_MicrophoneMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{5, 0}
+	return fileDescriptor_2a6c80cea3f0c886, []int{5, 0}
 }
 
 // Indicates the type of event.
@@ -153,6 +159,7 @@ var ConverseResponse_EventType_name = map[int32]string{
 	0: "EVENT_TYPE_UNSPECIFIED",
 	1: "END_OF_UTTERANCE",
 }
+
 var ConverseResponse_EventType_value = map[string]int32{
 	"EVENT_TYPE_UNSPECIFIED": 0,
 	"END_OF_UTTERANCE":       1,
@@ -161,8 +168,9 @@ var ConverseResponse_EventType_value = map[string]int32{
 func (x ConverseResponse_EventType) String() string {
 	return proto.EnumName(ConverseResponse_EventType_name, int32(x))
 }
+
 func (ConverseResponse_EventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{7, 0}
+	return fileDescriptor_2a6c80cea3f0c886, []int{7, 0}
 }
 
 // Specifies how to process the `ConverseRequest` messages.
@@ -182,16 +190,17 @@ func (m *ConverseConfig) Reset()         { *m = ConverseConfig{} }
 func (m *ConverseConfig) String() string { return proto.CompactTextString(m) }
 func (*ConverseConfig) ProtoMessage()    {}
 func (*ConverseConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{0}
+	return fileDescriptor_2a6c80cea3f0c886, []int{0}
 }
+
 func (m *ConverseConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConverseConfig.Unmarshal(m, b)
 }
 func (m *ConverseConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConverseConfig.Marshal(b, m, deterministic)
 }
-func (dst *ConverseConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConverseConfig.Merge(dst, src)
+func (m *ConverseConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseConfig.Merge(m, src)
 }
 func (m *ConverseConfig) XXX_Size() int {
 	return xxx_messageInfo_ConverseConfig.Size(m)
@@ -245,16 +254,17 @@ func (m *AudioInConfig) Reset()         { *m = AudioInConfig{} }
 func (m *AudioInConfig) String() string { return proto.CompactTextString(m) }
 func (*AudioInConfig) ProtoMessage()    {}
 func (*AudioInConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{1}
+	return fileDescriptor_2a6c80cea3f0c886, []int{1}
 }
+
 func (m *AudioInConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioInConfig.Unmarshal(m, b)
 }
 func (m *AudioInConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioInConfig.Marshal(b, m, deterministic)
 }
-func (dst *AudioInConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioInConfig.Merge(dst, src)
+func (m *AudioInConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioInConfig.Merge(m, src)
 }
 func (m *AudioInConfig) XXX_Size() int {
 	return xxx_messageInfo_AudioInConfig.Size(m)
@@ -300,16 +310,17 @@ func (m *AudioOutConfig) Reset()         { *m = AudioOutConfig{} }
 func (m *AudioOutConfig) String() string { return proto.CompactTextString(m) }
 func (*AudioOutConfig) ProtoMessage()    {}
 func (*AudioOutConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{2}
+	return fileDescriptor_2a6c80cea3f0c886, []int{2}
 }
+
 func (m *AudioOutConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioOutConfig.Unmarshal(m, b)
 }
 func (m *AudioOutConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioOutConfig.Marshal(b, m, deterministic)
 }
-func (dst *AudioOutConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioOutConfig.Merge(dst, src)
+func (m *AudioOutConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOutConfig.Merge(m, src)
 }
 func (m *AudioOutConfig) XXX_Size() int {
 	return xxx_messageInfo_AudioOutConfig.Size(m)
@@ -358,16 +369,17 @@ func (m *ConverseState) Reset()         { *m = ConverseState{} }
 func (m *ConverseState) String() string { return proto.CompactTextString(m) }
 func (*ConverseState) ProtoMessage()    {}
 func (*ConverseState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{3}
+	return fileDescriptor_2a6c80cea3f0c886, []int{3}
 }
+
 func (m *ConverseState) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConverseState.Unmarshal(m, b)
 }
 func (m *ConverseState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConverseState.Marshal(b, m, deterministic)
 }
-func (dst *ConverseState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConverseState.Merge(dst, src)
+func (m *ConverseState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseState.Merge(m, src)
 }
 func (m *ConverseState) XXX_Size() int {
 	return xxx_messageInfo_ConverseState.Size(m)
@@ -401,16 +413,17 @@ func (m *AudioOut) Reset()         { *m = AudioOut{} }
 func (m *AudioOut) String() string { return proto.CompactTextString(m) }
 func (*AudioOut) ProtoMessage()    {}
 func (*AudioOut) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{4}
+	return fileDescriptor_2a6c80cea3f0c886, []int{4}
 }
+
 func (m *AudioOut) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioOut.Unmarshal(m, b)
 }
 func (m *AudioOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioOut.Marshal(b, m, deterministic)
 }
-func (dst *AudioOut) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioOut.Merge(dst, src)
+func (m *AudioOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOut.Merge(m, src)
 }
 func (m *AudioOut) XXX_Size() int {
 	return xxx_messageInfo_AudioOut.Size(m)
@@ -463,16 +476,17 @@ func (m *ConverseResult) Reset()         { *m = ConverseResult{} }
 func (m *ConverseResult) String() string { return proto.CompactTextString(m) }
 func (*ConverseResult) ProtoMessage()    {}
 func (*ConverseResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{5}
+	return fileDescriptor_2a6c80cea3f0c886, []int{5}
 }
+
 func (m *ConverseResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConverseResult.Unmarshal(m, b)
 }
 func (m *ConverseResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConverseResult.Marshal(b, m, deterministic)
 }
-func (dst *ConverseResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConverseResult.Merge(dst, src)
+func (m *ConverseResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseResult.Merge(m, src)
 }
 func (m *ConverseResult) XXX_Size() int {
 	return xxx_messageInfo_ConverseResult.Size(m)
@@ -539,16 +553,17 @@ func (m *ConverseRequest) Reset()         { *m = ConverseRequest{} }
 func (m *ConverseRequest) String() string { return proto.CompactTextString(m) }
 func (*ConverseRequest) ProtoMessage()    {}
 func (*ConverseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{6}
+	return fileDescriptor_2a6c80cea3f0c886, []int{6}
 }
+
 func (m *ConverseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConverseRequest.Unmarshal(m, b)
 }
 func (m *ConverseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConverseRequest.Marshal(b, m, deterministic)
 }
-func (dst *ConverseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConverseRequest.Merge(dst, src)
+func (m *ConverseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseRequest.Merge(m, src)
 }
 func (m *ConverseRequest) XXX_Size() int {
 	return xxx_messageInfo_ConverseRequest.Size(m)
@@ -596,76 +611,14 @@ func (m *ConverseRequest) GetAudioIn() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ConverseRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ConverseRequest_OneofMarshaler, _ConverseRequest_OneofUnmarshaler, _ConverseRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ConverseRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ConverseRequest_Config)(nil),
 		(*ConverseRequest_AudioIn)(nil),
 	}
 }
 
-func _ConverseRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ConverseRequest)
-	// converse_request
-	switch x := m.ConverseRequest.(type) {
-	case *ConverseRequest_Config:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Config); err != nil {
-			return err
-		}
-	case *ConverseRequest_AudioIn:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AudioIn)
-	case nil:
-	default:
-		return fmt.Errorf("ConverseRequest.ConverseRequest has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ConverseRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ConverseRequest)
-	switch tag {
-	case 1: // converse_request.config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ConverseConfig)
-		err := b.DecodeMessage(msg)
-		m.ConverseRequest = &ConverseRequest_Config{msg}
-		return true, err
-	case 2: // converse_request.audio_in
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConverseRequest = &ConverseRequest_AudioIn{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ConverseRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ConverseRequest)
-	// converse_request
-	switch x := m.ConverseRequest.(type) {
-	case *ConverseRequest_Config:
-		s := proto.Size(x.Config)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ConverseRequest_AudioIn:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AudioIn)))
-		n += len(x.AudioIn)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The top-level message received by the client. A series of one or more
 // `ConverseResponse` messages are streamed back to the client.
 type ConverseResponse struct {
@@ -686,16 +639,17 @@ func (m *ConverseResponse) Reset()         { *m = ConverseResponse{} }
 func (m *ConverseResponse) String() string { return proto.CompactTextString(m) }
 func (*ConverseResponse) ProtoMessage()    {}
 func (*ConverseResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_ed9e8ba6964a09be, []int{7}
+	return fileDescriptor_2a6c80cea3f0c886, []int{7}
 }
+
 func (m *ConverseResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConverseResponse.Unmarshal(m, b)
 }
 func (m *ConverseResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConverseResponse.Marshal(b, m, deterministic)
 }
-func (dst *ConverseResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConverseResponse.Merge(dst, src)
+func (m *ConverseResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseResponse.Merge(m, src)
 }
 func (m *ConverseResponse) XXX_Size() int {
 	return xxx_messageInfo_ConverseResponse.Size(m)
@@ -769,9 +723,9 @@ func (m *ConverseResponse) GetResult() *ConverseResult {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ConverseResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ConverseResponse_OneofMarshaler, _ConverseResponse_OneofUnmarshaler, _ConverseResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ConverseResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ConverseResponse_Error)(nil),
 		(*ConverseResponse_EventType_)(nil),
 		(*ConverseResponse_AudioOut)(nil),
@@ -779,104 +733,11 @@ func (*ConverseResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buff
 	}
 }
 
-func _ConverseResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ConverseResponse)
-	// converse_response
-	switch x := m.ConverseResponse.(type) {
-	case *ConverseResponse_Error:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Error); err != nil {
-			return err
-		}
-	case *ConverseResponse_EventType_:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.EventType))
-	case *ConverseResponse_AudioOut:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioOut); err != nil {
-			return err
-		}
-	case *ConverseResponse_Result:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Result); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ConverseResponse.ConverseResponse has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ConverseResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ConverseResponse)
-	switch tag {
-	case 1: // converse_response.error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(status.Status)
-		err := b.DecodeMessage(msg)
-		m.ConverseResponse = &ConverseResponse_Error{msg}
-		return true, err
-	case 2: // converse_response.event_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConverseResponse = &ConverseResponse_EventType_{ConverseResponse_EventType(x)}
-		return true, err
-	case 3: // converse_response.audio_out
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AudioOut)
-		err := b.DecodeMessage(msg)
-		m.ConverseResponse = &ConverseResponse_AudioOut{msg}
-		return true, err
-	case 5: // converse_response.result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ConverseResult)
-		err := b.DecodeMessage(msg)
-		m.ConverseResponse = &ConverseResponse_Result{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ConverseResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ConverseResponse)
-	// converse_response
-	switch x := m.ConverseResponse.(type) {
-	case *ConverseResponse_Error:
-		s := proto.Size(x.Error)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ConverseResponse_EventType_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.EventType))
-	case *ConverseResponse_AudioOut:
-		s := proto.Size(x.AudioOut)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ConverseResponse_Result:
-		s := proto.Size(x.Result)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.assistant.embedded.v1alpha1.AudioInConfig_Encoding", AudioInConfig_Encoding_name, AudioInConfig_Encoding_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha1.AudioOutConfig_Encoding", AudioOutConfig_Encoding_name, AudioOutConfig_Encoding_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha1.ConverseResult_MicrophoneMode", ConverseResult_MicrophoneMode_name, ConverseResult_MicrophoneMode_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha1.ConverseResponse_EventType", ConverseResponse_EventType_name, ConverseResponse_EventType_value)
 	proto.RegisterType((*ConverseConfig)(nil), "google.assistant.embedded.v1alpha1.ConverseConfig")
 	proto.RegisterType((*AudioInConfig)(nil), "google.assistant.embedded.v1alpha1.AudioInConfig")
 	proto.RegisterType((*AudioOutConfig)(nil), "google.assistant.embedded.v1alpha1.AudioOutConfig")
@@ -885,10 +746,70 @@ func init() {
 	proto.RegisterType((*ConverseResult)(nil), "google.assistant.embedded.v1alpha1.ConverseResult")
 	proto.RegisterType((*ConverseRequest)(nil), "google.assistant.embedded.v1alpha1.ConverseRequest")
 	proto.RegisterType((*ConverseResponse)(nil), "google.assistant.embedded.v1alpha1.ConverseResponse")
-	proto.RegisterEnum("google.assistant.embedded.v1alpha1.AudioInConfig_Encoding", AudioInConfig_Encoding_name, AudioInConfig_Encoding_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha1.AudioOutConfig_Encoding", AudioOutConfig_Encoding_name, AudioOutConfig_Encoding_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha1.ConverseResult_MicrophoneMode", ConverseResult_MicrophoneMode_name, ConverseResult_MicrophoneMode_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha1.ConverseResponse_EventType", ConverseResponse_EventType_name, ConverseResponse_EventType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/assistant/embedded/v1alpha1/embedded_assistant.proto", fileDescriptor_2a6c80cea3f0c886)
+}
+
+var fileDescriptor_2a6c80cea3f0c886 = []byte{
+	// 892 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x51, 0x73, 0xdb, 0x44,
+	0x10, 0xb6, 0xec, 0xa6, 0xb5, 0xb7, 0x89, 0x2c, 0x5f, 0x33, 0x90, 0x49, 0x61, 0x60, 0xf4, 0xc0,
+	0x94, 0x02, 0x72, 0xe3, 0x30, 0x3c, 0x10, 0xe8, 0x8c, 0x63, 0x2b, 0xb1, 0xc1, 0x96, 0x3c, 0x67,
+	0xa7, 0xa5, 0x0c, 0xcc, 0xcd, 0x55, 0x3e, 0x1c, 0x81, 0x7d, 0x27, 0xa4, 0x73, 0xa6, 0xe1, 0x07,
+	0xf0, 0xd8, 0xe1, 0x95, 0x67, 0x7e, 0x11, 0xff, 0x88, 0xd1, 0x9d, 0xa4, 0xd8, 0x90, 0x42, 0x1c,
+	0x1e, 0x6f, 0xf7, 0xbe, 0x4f, 0xbb, 0xdf, 0x7e, 0xb7, 0x23, 0x38, 0x9a, 0x09, 0x31, 0x9b, 0xb3,
+	0x26, 0x4d, 0x92, 0x30, 0x91, 0x94, 0xcb, 0x26, 0x5b, 0xbc, 0x64, 0xd3, 0x29, 0x9b, 0x36, 0x2f,
+	0x0e, 0xe8, 0x3c, 0x3a, 0xa7, 0x07, 0x45, 0x84, 0x14, 0x97, 0x9c, 0x28, 0x16, 0x52, 0x20, 0x5b,
+	0x83, 0x9d, 0xab, 0x78, 0x7e, 0xd5, 0xc9, 0xc1, 0xfb, 0xef, 0xe4, 0x1f, 0x88, 0xc2, 0x26, 0xe5,
+	0x5c, 0x48, 0x2a, 0x43, 0xc1, 0x13, 0xcd, 0xb0, 0xff, 0x76, 0x96, 0x8d, 0xa3, 0xa0, 0x99, 0x48,
+	0x2a, 0x97, 0x59, 0xc2, 0xfe, 0xa3, 0x0c, 0x66, 0x47, 0xf0, 0x0b, 0x16, 0x27, 0xac, 0x23, 0xf8,
+	0x0f, 0xe1, 0x0c, 0xbd, 0x80, 0x3a, 0x5d, 0x4e, 0x43, 0x41, 0x42, 0x4e, 0x02, 0x15, 0xda, 0x33,
+	0xde, 0x37, 0x1e, 0xdd, 0x6f, 0x1d, 0x38, 0xff, 0x5d, 0x87, 0xd3, 0x4e, 0xa1, 0x7d, 0xae, 0xb9,
+	0xf0, 0x0e, 0x5d, 0x3d, 0xa2, 0xef, 0xc0, 0xd2, 0xd4, 0x62, 0x29, 0x73, 0xee, 0xb2, 0xe2, 0x6e,
+	0xdd, 0x98, 0xdb, 0x5f, 0xca, 0x8c, 0xdc, 0xa4, 0x6b, 0x67, 0xf4, 0x0d, 0x98, 0x41, 0xd6, 0x0a,
+	0x49, 0x9b, 0x64, 0x7b, 0x95, 0x9b, 0xd7, 0x9d, 0x8b, 0x30, 0x4e, 0x81, 0x78, 0x27, 0x58, 0x3d,
+	0xda, 0x7f, 0x1a, 0xb0, 0xb3, 0xd6, 0x18, 0x7a, 0x06, 0x55, 0xc6, 0x03, 0x31, 0x0d, 0xb9, 0x56,
+	0xc7, 0x6c, 0x7d, 0xbe, 0xb1, 0x3a, 0x8e, 0x9b, 0x31, 0xe0, 0x82, 0x0b, 0x3d, 0x86, 0x46, 0x42,
+	0x17, 0xd1, 0x9c, 0x91, 0x98, 0x4a, 0x46, 0xce, 0x59, 0x2c, 0x7f, 0x51, 0x12, 0x6d, 0xe1, 0xba,
+	0x4e, 0x60, 0x2a, 0x59, 0x2f, 0x0d, 0xdb, 0x5f, 0x40, 0x35, 0x67, 0x40, 0x7b, 0xb0, 0xeb, 0x7a,
+	0x1d, 0xbf, 0xdb, 0xf7, 0x4e, 0xc9, 0x99, 0x37, 0x1e, 0xb9, 0x9d, 0xfe, 0x49, 0xdf, 0xed, 0x5a,
+	0x25, 0xb4, 0x0d, 0xd5, 0x41, 0xdf, 0x73, 0xdb, 0xf8, 0xe0, 0x33, 0xcb, 0x40, 0x55, 0xb8, 0x73,
+	0x32, 0x68, 0x77, 0xac, 0xb2, 0xfd, 0x5b, 0x19, 0xcc, 0x75, 0x41, 0xd1, 0xf3, 0x7f, 0x34, 0x75,
+	0xb4, 0xf9, 0x58, 0xfe, 0x67, 0x57, 0xe8, 0x23, 0x68, 0x5c, 0x88, 0xf9, 0x72, 0xc1, 0x48, 0xc4,
+	0xe2, 0x80, 0x71, 0x49, 0x67, 0x7a, 0x90, 0x5b, 0xd8, 0xd2, 0x89, 0x51, 0x11, 0xb7, 0x07, 0xb7,
+	0x90, 0xe0, 0x1e, 0x54, 0x86, 0xa3, 0x43, 0xab, 0x8c, 0xea, 0x70, 0xdf, 0x1f, 0x9d, 0x8d, 0x49,
+	0xdf, 0x23, 0xfe, 0xe9, 0xa9, 0x55, 0xb1, 0x9f, 0xc2, 0xce, 0x9a, 0x0d, 0xd0, 0x27, 0x80, 0x32,
+	0x23, 0xa8, 0xd7, 0x94, 0xb9, 0x2a, 0x95, 0x66, 0x1b, 0x37, 0x56, 0x33, 0xda, 0x26, 0x1f, 0x42,
+	0x35, 0xd7, 0x02, 0xbd, 0x0b, 0xa0, 0xad, 0x3e, 0xa5, 0x92, 0x66, 0x90, 0x9a, 0x8a, 0x74, 0xa9,
+	0xa4, 0xf6, 0xef, 0x95, 0xab, 0x77, 0x87, 0x59, 0xb2, 0x9c, 0x4b, 0xe4, 0xc0, 0x83, 0x24, 0x12,
+	0x3f, 0x31, 0x4e, 0x62, 0xf6, 0xf3, 0x92, 0x25, 0x92, 0x48, 0xf6, 0x4a, 0x2a, 0x68, 0x0d, 0x37,
+	0x74, 0x0a, 0xeb, 0xcc, 0x84, 0xbd, 0x92, 0xe8, 0x09, 0xec, 0x16, 0xf7, 0x93, 0x48, 0xf0, 0x84,
+	0x69, 0x40, 0x59, 0x01, 0x50, 0x0e, 0xd0, 0x29, 0x85, 0xb8, 0xbe, 0x9d, 0xca, 0x1b, 0xda, 0x41,
+	0x3f, 0x42, 0x7d, 0x11, 0x06, 0xb1, 0x88, 0xce, 0x05, 0x67, 0x64, 0x21, 0xa6, 0x6c, 0xef, 0x8e,
+	0x72, 0x45, 0x7b, 0x93, 0x07, 0xa5, 0xbb, 0x73, 0x86, 0x05, 0xd3, 0x50, 0x4c, 0x19, 0x36, 0x17,
+	0x6b, 0xe7, 0xeb, 0xa7, 0xbe, 0xf5, 0x86, 0xa9, 0x7f, 0x0f, 0xe6, 0x3a, 0x1d, 0x7a, 0x0f, 0x1e,
+	0x0e, 0xfb, 0x1d, 0xec, 0x8f, 0x7a, 0xbe, 0xe7, 0x92, 0xa1, 0xdf, 0x75, 0xff, 0x66, 0x81, 0x5d,
+	0xb0, 0x3a, 0x03, 0x7f, 0xec, 0x92, 0xab, 0x6b, 0x96, 0x91, 0x46, 0xbb, 0xfd, 0xf6, 0xc0, 0x3f,
+	0x25, 0x27, 0xfe, 0x60, 0xe0, 0x3f, 0x27, 0xbe, 0x97, 0xbe, 0x0c, 0x03, 0xea, 0x57, 0xd5, 0x2b,
+	0xc1, 0xd1, 0x00, 0xee, 0xae, 0xed, 0xc2, 0xd6, 0x26, 0x12, 0xe8, 0x87, 0xd1, 0x2b, 0xe1, 0x8c,
+	0x03, 0x3d, 0x84, 0x6a, 0xbe, 0x62, 0xd5, 0xb8, 0xb6, 0x7b, 0x25, 0x7c, 0x2f, 0x5b, 0x95, 0xc7,
+	0x08, 0xac, 0x62, 0x8d, 0x65, 0x4e, 0xb0, 0x5f, 0x57, 0xc0, 0x5a, 0x11, 0x54, 0x8d, 0x14, 0x3d,
+	0x86, 0x2d, 0x16, 0xc7, 0x22, 0xce, 0x4a, 0x42, 0x79, 0x49, 0x71, 0x14, 0x38, 0x63, 0xb5, 0xe4,
+	0x7b, 0x25, 0xac, 0xaf, 0x20, 0x02, 0xc0, 0x2e, 0x18, 0x97, 0x44, 0x5e, 0x46, 0x4c, 0x7d, 0xd3,
+	0x6c, 0x3d, 0xdd, 0x70, 0x8c, 0xea, 0xab, 0x8e, 0x9b, 0xd2, 0x4c, 0x2e, 0x23, 0xd6, 0x2b, 0xe1,
+	0x1a, 0xcb, 0x0f, 0xe8, 0x6b, 0xa8, 0x15, 0xab, 0x3d, 0xdb, 0xbb, 0x1f, 0x6f, 0xb2, 0x3c, 0x7a,
+	0x25, 0x5c, 0xcd, 0xf7, 0x79, 0xaa, 0x76, 0xac, 0x6c, 0xa3, 0x2c, 0xb0, 0xa1, 0xda, 0xda, 0x70,
+	0xa9, 0xda, 0x9a, 0xc3, 0xfe, 0x12, 0x6a, 0x45, 0xd1, 0x68, 0x1f, 0xde, 0x72, 0x9f, 0xb9, 0xde,
+	0x84, 0x4c, 0x5e, 0x8c, 0xae, 0x31, 0x89, 0xeb, 0x75, 0x89, 0x7f, 0x42, 0xce, 0x26, 0x13, 0x17,
+	0xb7, 0xbd, 0x8e, 0x6b, 0x19, 0xc7, 0x0f, 0xa0, 0xb1, 0x32, 0x0f, 0xad, 0x42, 0xeb, 0xb5, 0x01,
+	0x0d, 0x37, 0x2b, 0xa1, 0x9d, 0x17, 0x85, 0x2e, 0xa1, 0x9a, 0x57, 0x81, 0x0e, 0x37, 0xab, 0x59,
+	0xcd, 0x79, 0xff, 0xd3, 0xdb, 0x8c, 0xe4, 0x91, 0xf1, 0xc4, 0x38, 0xfe, 0xd5, 0x80, 0x0f, 0x02,
+	0xb1, 0xb8, 0x01, 0xfe, 0xd8, 0x2c, 0x0a, 0x1e, 0xa5, 0xff, 0x00, 0x23, 0xe3, 0xdb, 0xaf, 0x32,
+	0xd4, 0x4c, 0xcc, 0x29, 0x9f, 0x39, 0x22, 0x9e, 0x35, 0x67, 0x8c, 0xab, 0x3f, 0x84, 0xa6, 0x4e,
+	0xd1, 0x28, 0x4c, 0xfe, 0xed, 0xe7, 0xe5, 0x28, 0x8f, 0xbc, 0xbc, 0xab, 0x60, 0x87, 0x7f, 0x05,
+	0x00, 0x00, 0xff, 0xff, 0xec, 0x7a, 0x68, 0xfa, 0xf2, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1076,67 +997,3 @@ var _EmbeddedAssistant_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/assistant/embedded/v1alpha1/embedded_assistant.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/assistant/embedded/v1alpha1/embedded_assistant.proto", fileDescriptor_embedded_assistant_ed9e8ba6964a09be)
-}
-
-var fileDescriptor_embedded_assistant_ed9e8ba6964a09be = []byte{
-	// 892 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x51, 0x73, 0xdb, 0x44,
-	0x10, 0xb6, 0xec, 0xa6, 0xb5, 0xb7, 0x89, 0x2c, 0x5f, 0x33, 0x90, 0x49, 0x61, 0x60, 0xf4, 0xc0,
-	0x94, 0x02, 0x72, 0xe3, 0x30, 0x3c, 0x10, 0xe8, 0x8c, 0x63, 0x2b, 0xb1, 0xc1, 0x96, 0x3c, 0x67,
-	0xa7, 0xa5, 0x0c, 0xcc, 0xcd, 0x55, 0x3e, 0x1c, 0x81, 0x7d, 0x27, 0xa4, 0x73, 0xa6, 0xe1, 0x07,
-	0xf0, 0xd8, 0xe1, 0x95, 0x67, 0x7e, 0x11, 0xff, 0x88, 0xd1, 0x9d, 0xa4, 0xd8, 0x90, 0x42, 0x1c,
-	0x1e, 0x6f, 0xf7, 0xbe, 0x4f, 0xbb, 0xdf, 0x7e, 0xb7, 0x23, 0x38, 0x9a, 0x09, 0x31, 0x9b, 0xb3,
-	0x26, 0x4d, 0x92, 0x30, 0x91, 0x94, 0xcb, 0x26, 0x5b, 0xbc, 0x64, 0xd3, 0x29, 0x9b, 0x36, 0x2f,
-	0x0e, 0xe8, 0x3c, 0x3a, 0xa7, 0x07, 0x45, 0x84, 0x14, 0x97, 0x9c, 0x28, 0x16, 0x52, 0x20, 0x5b,
-	0x83, 0x9d, 0xab, 0x78, 0x7e, 0xd5, 0xc9, 0xc1, 0xfb, 0xef, 0xe4, 0x1f, 0x88, 0xc2, 0x26, 0xe5,
-	0x5c, 0x48, 0x2a, 0x43, 0xc1, 0x13, 0xcd, 0xb0, 0xff, 0x76, 0x96, 0x8d, 0xa3, 0xa0, 0x99, 0x48,
-	0x2a, 0x97, 0x59, 0xc2, 0xfe, 0xa3, 0x0c, 0x66, 0x47, 0xf0, 0x0b, 0x16, 0x27, 0xac, 0x23, 0xf8,
-	0x0f, 0xe1, 0x0c, 0xbd, 0x80, 0x3a, 0x5d, 0x4e, 0x43, 0x41, 0x42, 0x4e, 0x02, 0x15, 0xda, 0x33,
-	0xde, 0x37, 0x1e, 0xdd, 0x6f, 0x1d, 0x38, 0xff, 0x5d, 0x87, 0xd3, 0x4e, 0xa1, 0x7d, 0xae, 0xb9,
-	0xf0, 0x0e, 0x5d, 0x3d, 0xa2, 0xef, 0xc0, 0xd2, 0xd4, 0x62, 0x29, 0x73, 0xee, 0xb2, 0xe2, 0x6e,
-	0xdd, 0x98, 0xdb, 0x5f, 0xca, 0x8c, 0xdc, 0xa4, 0x6b, 0x67, 0xf4, 0x0d, 0x98, 0x41, 0xd6, 0x0a,
-	0x49, 0x9b, 0x64, 0x7b, 0x95, 0x9b, 0xd7, 0x9d, 0x8b, 0x30, 0x4e, 0x81, 0x78, 0x27, 0x58, 0x3d,
-	0xda, 0x7f, 0x1a, 0xb0, 0xb3, 0xd6, 0x18, 0x7a, 0x06, 0x55, 0xc6, 0x03, 0x31, 0x0d, 0xb9, 0x56,
-	0xc7, 0x6c, 0x7d, 0xbe, 0xb1, 0x3a, 0x8e, 0x9b, 0x31, 0xe0, 0x82, 0x0b, 0x3d, 0x86, 0x46, 0x42,
-	0x17, 0xd1, 0x9c, 0x91, 0x98, 0x4a, 0x46, 0xce, 0x59, 0x2c, 0x7f, 0x51, 0x12, 0x6d, 0xe1, 0xba,
-	0x4e, 0x60, 0x2a, 0x59, 0x2f, 0x0d, 0xdb, 0x5f, 0x40, 0x35, 0x67, 0x40, 0x7b, 0xb0, 0xeb, 0x7a,
-	0x1d, 0xbf, 0xdb, 0xf7, 0x4e, 0xc9, 0x99, 0x37, 0x1e, 0xb9, 0x9d, 0xfe, 0x49, 0xdf, 0xed, 0x5a,
-	0x25, 0xb4, 0x0d, 0xd5, 0x41, 0xdf, 0x73, 0xdb, 0xf8, 0xe0, 0x33, 0xcb, 0x40, 0x55, 0xb8, 0x73,
-	0x32, 0x68, 0x77, 0xac, 0xb2, 0xfd, 0x5b, 0x19, 0xcc, 0x75, 0x41, 0xd1, 0xf3, 0x7f, 0x34, 0x75,
-	0xb4, 0xf9, 0x58, 0xfe, 0x67, 0x57, 0xe8, 0x23, 0x68, 0x5c, 0x88, 0xf9, 0x72, 0xc1, 0x48, 0xc4,
-	0xe2, 0x80, 0x71, 0x49, 0x67, 0x7a, 0x90, 0x5b, 0xd8, 0xd2, 0x89, 0x51, 0x11, 0xb7, 0x07, 0xb7,
-	0x90, 0xe0, 0x1e, 0x54, 0x86, 0xa3, 0x43, 0xab, 0x8c, 0xea, 0x70, 0xdf, 0x1f, 0x9d, 0x8d, 0x49,
-	0xdf, 0x23, 0xfe, 0xe9, 0xa9, 0x55, 0xb1, 0x9f, 0xc2, 0xce, 0x9a, 0x0d, 0xd0, 0x27, 0x80, 0x32,
-	0x23, 0xa8, 0xd7, 0x94, 0xb9, 0x2a, 0x95, 0x66, 0x1b, 0x37, 0x56, 0x33, 0xda, 0x26, 0x1f, 0x42,
-	0x35, 0xd7, 0x02, 0xbd, 0x0b, 0xa0, 0xad, 0x3e, 0xa5, 0x92, 0x66, 0x90, 0x9a, 0x8a, 0x74, 0xa9,
-	0xa4, 0xf6, 0xef, 0x95, 0xab, 0x77, 0x87, 0x59, 0xb2, 0x9c, 0x4b, 0xe4, 0xc0, 0x83, 0x24, 0x12,
-	0x3f, 0x31, 0x4e, 0x62, 0xf6, 0xf3, 0x92, 0x25, 0x92, 0x48, 0xf6, 0x4a, 0x2a, 0x68, 0x0d, 0x37,
-	0x74, 0x0a, 0xeb, 0xcc, 0x84, 0xbd, 0x92, 0xe8, 0x09, 0xec, 0x16, 0xf7, 0x93, 0x48, 0xf0, 0x84,
-	0x69, 0x40, 0x59, 0x01, 0x50, 0x0e, 0xd0, 0x29, 0x85, 0xb8, 0xbe, 0x9d, 0xca, 0x1b, 0xda, 0x41,
-	0x3f, 0x42, 0x7d, 0x11, 0x06, 0xb1, 0x88, 0xce, 0x05, 0x67, 0x64, 0x21, 0xa6, 0x6c, 0xef, 0x8e,
-	0x72, 0x45, 0x7b, 0x93, 0x07, 0xa5, 0xbb, 0x73, 0x86, 0x05, 0xd3, 0x50, 0x4c, 0x19, 0x36, 0x17,
-	0x6b, 0xe7, 0xeb, 0xa7, 0xbe, 0xf5, 0x86, 0xa9, 0x7f, 0x0f, 0xe6, 0x3a, 0x1d, 0x7a, 0x0f, 0x1e,
-	0x0e, 0xfb, 0x1d, 0xec, 0x8f, 0x7a, 0xbe, 0xe7, 0x92, 0xa1, 0xdf, 0x75, 0xff, 0x66, 0x81, 0x5d,
-	0xb0, 0x3a, 0x03, 0x7f, 0xec, 0x92, 0xab, 0x6b, 0x96, 0x91, 0x46, 0xbb, 0xfd, 0xf6, 0xc0, 0x3f,
-	0x25, 0x27, 0xfe, 0x60, 0xe0, 0x3f, 0x27, 0xbe, 0x97, 0xbe, 0x0c, 0x03, 0xea, 0x57, 0xd5, 0x2b,
-	0xc1, 0xd1, 0x00, 0xee, 0xae, 0xed, 0xc2, 0xd6, 0x26, 0x12, 0xe8, 0x87, 0xd1, 0x2b, 0xe1, 0x8c,
-	0x03, 0x3d, 0x84, 0x6a, 0xbe, 0x62, 0xd5, 0xb8, 0xb6, 0x7b, 0x25, 0x7c, 0x2f, 0x5b, 0x95, 0xc7,
-	0x08, 0xac, 0x62, 0x8d, 0x65, 0x4e, 0xb0, 0x5f, 0x57, 0xc0, 0x5a, 0x11, 0x54, 0x8d, 0x14, 0x3d,
-	0x86, 0x2d, 0x16, 0xc7, 0x22, 0xce, 0x4a, 0x42, 0x79, 0x49, 0x71, 0x14, 0x38, 0x63, 0xb5, 0xe4,
-	0x7b, 0x25, 0xac, 0xaf, 0x20, 0x02, 0xc0, 0x2e, 0x18, 0x97, 0x44, 0x5e, 0x46, 0x4c, 0x7d, 0xd3,
-	0x6c, 0x3d, 0xdd, 0x70, 0x8c, 0xea, 0xab, 0x8e, 0x9b, 0xd2, 0x4c, 0x2e, 0x23, 0xd6, 0x2b, 0xe1,
-	0x1a, 0xcb, 0x0f, 0xe8, 0x6b, 0xa8, 0x15, 0xab, 0x3d, 0xdb, 0xbb, 0x1f, 0x6f, 0xb2, 0x3c, 0x7a,
-	0x25, 0x5c, 0xcd, 0xf7, 0x79, 0xaa, 0x76, 0xac, 0x6c, 0xa3, 0x2c, 0xb0, 0xa1, 0xda, 0xda, 0x70,
-	0xa9, 0xda, 0x9a, 0xc3, 0xfe, 0x12, 0x6a, 0x45, 0xd1, 0x68, 0x1f, 0xde, 0x72, 0x9f, 0xb9, 0xde,
-	0x84, 0x4c, 0x5e, 0x8c, 0xae, 0x31, 0x89, 0xeb, 0x75, 0x89, 0x7f, 0x42, 0xce, 0x26, 0x13, 0x17,
-	0xb7, 0xbd, 0x8e, 0x6b, 0x19, 0xc7, 0x0f, 0xa0, 0xb1, 0x32, 0x0f, 0xad, 0x42, 0xeb, 0xb5, 0x01,
-	0x0d, 0x37, 0x2b, 0xa1, 0x9d, 0x17, 0x85, 0x2e, 0xa1, 0x9a, 0x57, 0x81, 0x0e, 0x37, 0xab, 0x59,
-	0xcd, 0x79, 0xff, 0xd3, 0xdb, 0x8c, 0xe4, 0x91, 0xf1, 0xc4, 0x38, 0xfe, 0xd5, 0x80, 0x0f, 0x02,
-	0xb1, 0xb8, 0x01, 0xfe, 0xd8, 0x2c, 0x0a, 0x1e, 0xa5, 0xff, 0x00, 0x23, 0xe3, 0xdb, 0xaf, 0x32,
-	0xd4, 0x4c, 0xcc, 0x29, 0x9f, 0x39, 0x22, 0x9e, 0x35, 0x67, 0x8c, 0xab, 0x3f, 0x84, 0xa6, 0x4e,
-	0xd1, 0x28, 0x4c, 0xfe, 0xed, 0xe7, 0xe5, 0x28, 0x8f, 0xbc, 0xbc, 0xab, 0x60, 0x87, 0x7f, 0x05,
-	0x00, 0x00, 0xff, 0xff, 0xec, 0x7a, 0x68, 0xfa, 0xf2, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go b/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
index 2c376cf50e..622486d72d 100644
--- a/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
+++ b/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/assistant/embedded/v1alpha2/embedded_assistant.proto
 
-package embedded // import "google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package embedded
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates the type of event.
 type AssistResponse_EventType int32
@@ -44,6 +44,7 @@ var AssistResponse_EventType_name = map[int32]string{
 	0: "EVENT_TYPE_UNSPECIFIED",
 	1: "END_OF_UTTERANCE",
 }
+
 var AssistResponse_EventType_value = map[string]int32{
 	"EVENT_TYPE_UNSPECIFIED": 0,
 	"END_OF_UTTERANCE":       1,
@@ -52,8 +53,9 @@ var AssistResponse_EventType_value = map[string]int32{
 func (x AssistResponse_EventType) String() string {
 	return proto.EnumName(AssistResponse_EventType_name, int32(x))
 }
+
 func (AssistResponse_EventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{1, 0}
+	return fileDescriptor_a514007bdf931c71, []int{1, 0}
 }
 
 // Audio encoding of the data sent in the audio message.
@@ -81,6 +83,7 @@ var AudioInConfig_Encoding_name = map[int32]string{
 	1: "LINEAR16",
 	2: "FLAC",
 }
+
 var AudioInConfig_Encoding_value = map[string]int32{
 	"ENCODING_UNSPECIFIED": 0,
 	"LINEAR16":             1,
@@ -90,8 +93,9 @@ var AudioInConfig_Encoding_value = map[string]int32{
 func (x AudioInConfig_Encoding) String() string {
 	return proto.EnumName(AudioInConfig_Encoding_name, int32(x))
 }
+
 func (AudioInConfig_Encoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{4, 0}
+	return fileDescriptor_a514007bdf931c71, []int{4, 0}
 }
 
 // Audio encoding of the data returned in the audio message. All encodings are
@@ -118,6 +122,7 @@ var AudioOutConfig_Encoding_name = map[int32]string{
 	2: "MP3",
 	3: "OPUS_IN_OGG",
 }
+
 var AudioOutConfig_Encoding_value = map[string]int32{
 	"ENCODING_UNSPECIFIED": 0,
 	"LINEAR16":             1,
@@ -128,8 +133,9 @@ var AudioOutConfig_Encoding_value = map[string]int32{
 func (x AudioOutConfig_Encoding) String() string {
 	return proto.EnumName(AudioOutConfig_Encoding_name, int32(x))
 }
+
 func (AudioOutConfig_Encoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{5, 0}
+	return fileDescriptor_a514007bdf931c71, []int{5, 0}
 }
 
 // Possible modes for visual screen-output on the device.
@@ -153,6 +159,7 @@ var ScreenOutConfig_ScreenMode_name = map[int32]string{
 	1: "OFF",
 	3: "PLAYING",
 }
+
 var ScreenOutConfig_ScreenMode_value = map[string]int32{
 	"SCREEN_MODE_UNSPECIFIED": 0,
 	"OFF":                     1,
@@ -162,8 +169,9 @@ var ScreenOutConfig_ScreenMode_value = map[string]int32{
 func (x ScreenOutConfig_ScreenMode) String() string {
 	return proto.EnumName(ScreenOutConfig_ScreenMode_name, int32(x))
 }
+
 func (ScreenOutConfig_ScreenMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{6, 0}
+	return fileDescriptor_a514007bdf931c71, []int{6, 0}
 }
 
 // Possible formats of the screen data.
@@ -183,6 +191,7 @@ var ScreenOut_Format_name = map[int32]string{
 	0: "FORMAT_UNSPECIFIED",
 	1: "HTML",
 }
+
 var ScreenOut_Format_value = map[string]int32{
 	"FORMAT_UNSPECIFIED": 0,
 	"HTML":               1,
@@ -191,8 +200,9 @@ var ScreenOut_Format_value = map[string]int32{
 func (x ScreenOut_Format) String() string {
 	return proto.EnumName(ScreenOut_Format_name, int32(x))
 }
+
 func (ScreenOut_Format) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{10, 0}
+	return fileDescriptor_a514007bdf931c71, []int{10, 0}
 }
 
 // Possible states of the microphone after a `Assist` RPC completes.
@@ -215,6 +225,7 @@ var DialogStateOut_MicrophoneMode_name = map[int32]string{
 	1: "CLOSE_MICROPHONE",
 	2: "DIALOG_FOLLOW_ON",
 }
+
 var DialogStateOut_MicrophoneMode_value = map[string]int32{
 	"MICROPHONE_MODE_UNSPECIFIED": 0,
 	"CLOSE_MICROPHONE":            1,
@@ -224,8 +235,9 @@ var DialogStateOut_MicrophoneMode_value = map[string]int32{
 func (x DialogStateOut_MicrophoneMode) String() string {
 	return proto.EnumName(DialogStateOut_MicrophoneMode_name, int32(x))
 }
+
 func (DialogStateOut_MicrophoneMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{13, 0}
+	return fileDescriptor_a514007bdf931c71, []int{13, 0}
 }
 
 // The top-level message sent by the client. Clients must send at least two, and
@@ -249,16 +261,17 @@ func (m *AssistRequest) Reset()         { *m = AssistRequest{} }
 func (m *AssistRequest) String() string { return proto.CompactTextString(m) }
 func (*AssistRequest) ProtoMessage()    {}
 func (*AssistRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{0}
+	return fileDescriptor_a514007bdf931c71, []int{0}
 }
+
 func (m *AssistRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AssistRequest.Unmarshal(m, b)
 }
 func (m *AssistRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AssistRequest.Marshal(b, m, deterministic)
 }
-func (dst *AssistRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AssistRequest.Merge(dst, src)
+func (m *AssistRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssistRequest.Merge(m, src)
 }
 func (m *AssistRequest) XXX_Size() int {
 	return xxx_messageInfo_AssistRequest.Size(m)
@@ -306,76 +319,14 @@ func (m *AssistRequest) GetAudioIn() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AssistRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AssistRequest_OneofMarshaler, _AssistRequest_OneofUnmarshaler, _AssistRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AssistRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AssistRequest_Config)(nil),
 		(*AssistRequest_AudioIn)(nil),
 	}
 }
 
-func _AssistRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AssistRequest)
-	// type
-	switch x := m.Type.(type) {
-	case *AssistRequest_Config:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Config); err != nil {
-			return err
-		}
-	case *AssistRequest_AudioIn:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AudioIn)
-	case nil:
-	default:
-		return fmt.Errorf("AssistRequest.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AssistRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AssistRequest)
-	switch tag {
-	case 1: // type.config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AssistConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &AssistRequest_Config{msg}
-		return true, err
-	case 2: // type.audio_in
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Type = &AssistRequest_AudioIn{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AssistRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AssistRequest)
-	// type
-	switch x := m.Type.(type) {
-	case *AssistRequest_Config:
-		s := proto.Size(x.Config)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AssistRequest_AudioIn:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AudioIn)))
-		n += len(x.AudioIn)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The top-level message received by the client. A series of one or more
 // `AssistResponse` messages are streamed back to the client.
 type AssistResponse struct {
@@ -410,16 +361,17 @@ func (m *AssistResponse) Reset()         { *m = AssistResponse{} }
 func (m *AssistResponse) String() string { return proto.CompactTextString(m) }
 func (*AssistResponse) ProtoMessage()    {}
 func (*AssistResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{1}
+	return fileDescriptor_a514007bdf931c71, []int{1}
 }
+
 func (m *AssistResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AssistResponse.Unmarshal(m, b)
 }
 func (m *AssistResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AssistResponse.Marshal(b, m, deterministic)
 }
-func (dst *AssistResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AssistResponse.Merge(dst, src)
+func (m *AssistResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssistResponse.Merge(m, src)
 }
 func (m *AssistResponse) XXX_Size() int {
 	return xxx_messageInfo_AssistResponse.Size(m)
@@ -497,16 +449,17 @@ func (m *DebugInfo) Reset()         { *m = DebugInfo{} }
 func (m *DebugInfo) String() string { return proto.CompactTextString(m) }
 func (*DebugInfo) ProtoMessage()    {}
 func (*DebugInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{2}
+	return fileDescriptor_a514007bdf931c71, []int{2}
 }
+
 func (m *DebugInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DebugInfo.Unmarshal(m, b)
 }
 func (m *DebugInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DebugInfo.Marshal(b, m, deterministic)
 }
-func (dst *DebugInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DebugInfo.Merge(dst, src)
+func (m *DebugInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugInfo.Merge(m, src)
 }
 func (m *DebugInfo) XXX_Size() int {
 	return xxx_messageInfo_DebugInfo.Size(m)
@@ -550,16 +503,17 @@ func (m *AssistConfig) Reset()         { *m = AssistConfig{} }
 func (m *AssistConfig) String() string { return proto.CompactTextString(m) }
 func (*AssistConfig) ProtoMessage()    {}
 func (*AssistConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{3}
+	return fileDescriptor_a514007bdf931c71, []int{3}
 }
+
 func (m *AssistConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AssistConfig.Unmarshal(m, b)
 }
 func (m *AssistConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AssistConfig.Marshal(b, m, deterministic)
 }
-func (dst *AssistConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AssistConfig.Merge(dst, src)
+func (m *AssistConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssistConfig.Merge(m, src)
 }
 func (m *AssistConfig) XXX_Size() int {
 	return xxx_messageInfo_AssistConfig.Size(m)
@@ -642,76 +596,14 @@ func (m *AssistConfig) GetDebugConfig() *DebugConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AssistConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AssistConfig_OneofMarshaler, _AssistConfig_OneofUnmarshaler, _AssistConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AssistConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AssistConfig_AudioInConfig)(nil),
 		(*AssistConfig_TextQuery)(nil),
 	}
 }
 
-func _AssistConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AssistConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *AssistConfig_AudioInConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioInConfig); err != nil {
-			return err
-		}
-	case *AssistConfig_TextQuery:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TextQuery)
-	case nil:
-	default:
-		return fmt.Errorf("AssistConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AssistConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AssistConfig)
-	switch tag {
-	case 1: // type.audio_in_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AudioInConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &AssistConfig_AudioInConfig{msg}
-		return true, err
-	case 6: // type.text_query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Type = &AssistConfig_TextQuery{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AssistConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AssistConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *AssistConfig_AudioInConfig:
-		s := proto.Size(x.AudioInConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AssistConfig_TextQuery:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TextQuery)))
-		n += len(x.TextQuery)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Specifies how to process the `audio_in` data that will be provided in
 // subsequent requests. For recommended settings, see the Google Assistant SDK
 // [best
@@ -734,16 +626,17 @@ func (m *AudioInConfig) Reset()         { *m = AudioInConfig{} }
 func (m *AudioInConfig) String() string { return proto.CompactTextString(m) }
 func (*AudioInConfig) ProtoMessage()    {}
 func (*AudioInConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{4}
+	return fileDescriptor_a514007bdf931c71, []int{4}
 }
+
 func (m *AudioInConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioInConfig.Unmarshal(m, b)
 }
 func (m *AudioInConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioInConfig.Marshal(b, m, deterministic)
 }
-func (dst *AudioInConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioInConfig.Merge(dst, src)
+func (m *AudioInConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioInConfig.Merge(m, src)
 }
 func (m *AudioInConfig) XXX_Size() int {
 	return xxx_messageInfo_AudioInConfig.Size(m)
@@ -789,16 +682,17 @@ func (m *AudioOutConfig) Reset()         { *m = AudioOutConfig{} }
 func (m *AudioOutConfig) String() string { return proto.CompactTextString(m) }
 func (*AudioOutConfig) ProtoMessage()    {}
 func (*AudioOutConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{5}
+	return fileDescriptor_a514007bdf931c71, []int{5}
 }
+
 func (m *AudioOutConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioOutConfig.Unmarshal(m, b)
 }
 func (m *AudioOutConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioOutConfig.Marshal(b, m, deterministic)
 }
-func (dst *AudioOutConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioOutConfig.Merge(dst, src)
+func (m *AudioOutConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOutConfig.Merge(m, src)
 }
 func (m *AudioOutConfig) XXX_Size() int {
 	return xxx_messageInfo_AudioOutConfig.Size(m)
@@ -844,16 +738,17 @@ func (m *ScreenOutConfig) Reset()         { *m = ScreenOutConfig{} }
 func (m *ScreenOutConfig) String() string { return proto.CompactTextString(m) }
 func (*ScreenOutConfig) ProtoMessage()    {}
 func (*ScreenOutConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{6}
+	return fileDescriptor_a514007bdf931c71, []int{6}
 }
+
 func (m *ScreenOutConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScreenOutConfig.Unmarshal(m, b)
 }
 func (m *ScreenOutConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScreenOutConfig.Marshal(b, m, deterministic)
 }
-func (dst *ScreenOutConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScreenOutConfig.Merge(dst, src)
+func (m *ScreenOutConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScreenOutConfig.Merge(m, src)
 }
 func (m *ScreenOutConfig) XXX_Size() int {
 	return xxx_messageInfo_ScreenOutConfig.Size(m)
@@ -906,16 +801,17 @@ func (m *DialogStateIn) Reset()         { *m = DialogStateIn{} }
 func (m *DialogStateIn) String() string { return proto.CompactTextString(m) }
 func (*DialogStateIn) ProtoMessage()    {}
 func (*DialogStateIn) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{7}
+	return fileDescriptor_a514007bdf931c71, []int{7}
 }
+
 func (m *DialogStateIn) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DialogStateIn.Unmarshal(m, b)
 }
 func (m *DialogStateIn) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DialogStateIn.Marshal(b, m, deterministic)
 }
-func (dst *DialogStateIn) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DialogStateIn.Merge(dst, src)
+func (m *DialogStateIn) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DialogStateIn.Merge(m, src)
 }
 func (m *DialogStateIn) XXX_Size() int {
 	return xxx_messageInfo_DialogStateIn.Size(m)
@@ -986,16 +882,17 @@ func (m *DeviceConfig) Reset()         { *m = DeviceConfig{} }
 func (m *DeviceConfig) String() string { return proto.CompactTextString(m) }
 func (*DeviceConfig) ProtoMessage()    {}
 func (*DeviceConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{8}
+	return fileDescriptor_a514007bdf931c71, []int{8}
 }
+
 func (m *DeviceConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceConfig.Unmarshal(m, b)
 }
 func (m *DeviceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceConfig.Marshal(b, m, deterministic)
 }
-func (dst *DeviceConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceConfig.Merge(dst, src)
+func (m *DeviceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceConfig.Merge(m, src)
 }
 func (m *DeviceConfig) XXX_Size() int {
 	return xxx_messageInfo_DeviceConfig.Size(m)
@@ -1036,16 +933,17 @@ func (m *AudioOut) Reset()         { *m = AudioOut{} }
 func (m *AudioOut) String() string { return proto.CompactTextString(m) }
 func (*AudioOut) ProtoMessage()    {}
 func (*AudioOut) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{9}
+	return fileDescriptor_a514007bdf931c71, []int{9}
 }
+
 func (m *AudioOut) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioOut.Unmarshal(m, b)
 }
 func (m *AudioOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioOut.Marshal(b, m, deterministic)
 }
-func (dst *AudioOut) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioOut.Merge(dst, src)
+func (m *AudioOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOut.Merge(m, src)
 }
 func (m *AudioOut) XXX_Size() int {
 	return xxx_messageInfo_AudioOut.Size(m)
@@ -1080,16 +978,17 @@ func (m *ScreenOut) Reset()         { *m = ScreenOut{} }
 func (m *ScreenOut) String() string { return proto.CompactTextString(m) }
 func (*ScreenOut) ProtoMessage()    {}
 func (*ScreenOut) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{10}
+	return fileDescriptor_a514007bdf931c71, []int{10}
 }
+
 func (m *ScreenOut) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScreenOut.Unmarshal(m, b)
 }
 func (m *ScreenOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScreenOut.Marshal(b, m, deterministic)
 }
-func (dst *ScreenOut) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScreenOut.Merge(dst, src)
+func (m *ScreenOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScreenOut.Merge(m, src)
 }
 func (m *ScreenOut) XXX_Size() int {
 	return xxx_messageInfo_ScreenOut.Size(m)
@@ -1133,16 +1032,17 @@ func (m *DeviceAction) Reset()         { *m = DeviceAction{} }
 func (m *DeviceAction) String() string { return proto.CompactTextString(m) }
 func (*DeviceAction) ProtoMessage()    {}
 func (*DeviceAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{11}
+	return fileDescriptor_a514007bdf931c71, []int{11}
 }
+
 func (m *DeviceAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceAction.Unmarshal(m, b)
 }
 func (m *DeviceAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceAction.Marshal(b, m, deterministic)
 }
-func (dst *DeviceAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceAction.Merge(dst, src)
+func (m *DeviceAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceAction.Merge(m, src)
 }
 func (m *DeviceAction) XXX_Size() int {
 	return xxx_messageInfo_DeviceAction.Size(m)
@@ -1179,16 +1079,17 @@ func (m *SpeechRecognitionResult) Reset()         { *m = SpeechRecognitionResult
 func (m *SpeechRecognitionResult) String() string { return proto.CompactTextString(m) }
 func (*SpeechRecognitionResult) ProtoMessage()    {}
 func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{12}
+	return fileDescriptor_a514007bdf931c71, []int{12}
 }
+
 func (m *SpeechRecognitionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechRecognitionResult.Unmarshal(m, b)
 }
 func (m *SpeechRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechRecognitionResult.Marshal(b, m, deterministic)
 }
-func (dst *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechRecognitionResult.Merge(dst, src)
+func (m *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionResult.Merge(m, src)
 }
 func (m *SpeechRecognitionResult) XXX_Size() int {
 	return xxx_messageInfo_SpeechRecognitionResult.Size(m)
@@ -1250,16 +1151,17 @@ func (m *DialogStateOut) Reset()         { *m = DialogStateOut{} }
 func (m *DialogStateOut) String() string { return proto.CompactTextString(m) }
 func (*DialogStateOut) ProtoMessage()    {}
 func (*DialogStateOut) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{13}
+	return fileDescriptor_a514007bdf931c71, []int{13}
 }
+
 func (m *DialogStateOut) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DialogStateOut.Unmarshal(m, b)
 }
 func (m *DialogStateOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DialogStateOut.Marshal(b, m, deterministic)
 }
-func (dst *DialogStateOut) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DialogStateOut.Merge(dst, src)
+func (m *DialogStateOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DialogStateOut.Merge(m, src)
 }
 func (m *DialogStateOut) XXX_Size() int {
 	return xxx_messageInfo_DialogStateOut.Size(m)
@@ -1313,16 +1215,17 @@ func (m *DebugConfig) Reset()         { *m = DebugConfig{} }
 func (m *DebugConfig) String() string { return proto.CompactTextString(m) }
 func (*DebugConfig) ProtoMessage()    {}
 func (*DebugConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{14}
+	return fileDescriptor_a514007bdf931c71, []int{14}
 }
+
 func (m *DebugConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DebugConfig.Unmarshal(m, b)
 }
 func (m *DebugConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DebugConfig.Marshal(b, m, deterministic)
 }
-func (dst *DebugConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DebugConfig.Merge(dst, src)
+func (m *DebugConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugConfig.Merge(m, src)
 }
 func (m *DebugConfig) XXX_Size() int {
 	return xxx_messageInfo_DebugConfig.Size(m)
@@ -1361,16 +1264,17 @@ func (m *DeviceLocation) Reset()         { *m = DeviceLocation{} }
 func (m *DeviceLocation) String() string { return proto.CompactTextString(m) }
 func (*DeviceLocation) ProtoMessage()    {}
 func (*DeviceLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_embedded_assistant_0b559f064bf1f88e, []int{15}
+	return fileDescriptor_a514007bdf931c71, []int{15}
 }
+
 func (m *DeviceLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceLocation.Unmarshal(m, b)
 }
 func (m *DeviceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceLocation.Marshal(b, m, deterministic)
 }
-func (dst *DeviceLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceLocation.Merge(dst, src)
+func (m *DeviceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceLocation.Merge(m, src)
 }
 func (m *DeviceLocation) XXX_Size() int {
 	return xxx_messageInfo_DeviceLocation.Size(m)
@@ -1405,62 +1309,20 @@ func (m *DeviceLocation) GetCoordinates() *latlng.LatLng {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DeviceLocation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DeviceLocation_OneofMarshaler, _DeviceLocation_OneofUnmarshaler, _DeviceLocation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DeviceLocation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DeviceLocation_Coordinates)(nil),
 	}
 }
 
-func _DeviceLocation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DeviceLocation)
-	// type
-	switch x := m.Type.(type) {
-	case *DeviceLocation_Coordinates:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Coordinates); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DeviceLocation.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DeviceLocation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DeviceLocation)
-	switch tag {
-	case 1: // type.coordinates
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(latlng.LatLng)
-		err := b.DecodeMessage(msg)
-		m.Type = &DeviceLocation_Coordinates{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DeviceLocation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DeviceLocation)
-	// type
-	switch x := m.Type.(type) {
-	case *DeviceLocation_Coordinates:
-		s := proto.Size(x.Coordinates)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AssistResponse_EventType", AssistResponse_EventType_name, AssistResponse_EventType_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AudioInConfig_Encoding", AudioInConfig_Encoding_name, AudioInConfig_Encoding_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AudioOutConfig_Encoding", AudioOutConfig_Encoding_name, AudioOutConfig_Encoding_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.ScreenOutConfig_ScreenMode", ScreenOutConfig_ScreenMode_name, ScreenOutConfig_ScreenMode_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.ScreenOut_Format", ScreenOut_Format_name, ScreenOut_Format_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.DialogStateOut_MicrophoneMode", DialogStateOut_MicrophoneMode_name, DialogStateOut_MicrophoneMode_value)
 	proto.RegisterType((*AssistRequest)(nil), "google.assistant.embedded.v1alpha2.AssistRequest")
 	proto.RegisterType((*AssistResponse)(nil), "google.assistant.embedded.v1alpha2.AssistResponse")
 	proto.RegisterType((*DebugInfo)(nil), "google.assistant.embedded.v1alpha2.DebugInfo")
@@ -1477,12 +1339,105 @@ func init() {
 	proto.RegisterType((*DialogStateOut)(nil), "google.assistant.embedded.v1alpha2.DialogStateOut")
 	proto.RegisterType((*DebugConfig)(nil), "google.assistant.embedded.v1alpha2.DebugConfig")
 	proto.RegisterType((*DeviceLocation)(nil), "google.assistant.embedded.v1alpha2.DeviceLocation")
-	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AssistResponse_EventType", AssistResponse_EventType_name, AssistResponse_EventType_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AudioInConfig_Encoding", AudioInConfig_Encoding_name, AudioInConfig_Encoding_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AudioOutConfig_Encoding", AudioOutConfig_Encoding_name, AudioOutConfig_Encoding_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha2.ScreenOutConfig_ScreenMode", ScreenOutConfig_ScreenMode_name, ScreenOutConfig_ScreenMode_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha2.ScreenOut_Format", ScreenOut_Format_name, ScreenOut_Format_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha2.DialogStateOut_MicrophoneMode", DialogStateOut_MicrophoneMode_name, DialogStateOut_MicrophoneMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/assistant/embedded/v1alpha2/embedded_assistant.proto", fileDescriptor_a514007bdf931c71)
+}
+
+var fileDescriptor_a514007bdf931c71 = []byte{
+	// 1449 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x41, 0x73, 0xdb, 0xc6,
+	0x15, 0x16, 0x28, 0x8a, 0x22, 0x1f, 0x29, 0x92, 0x5a, 0x7b, 0x6c, 0x56, 0x72, 0x6b, 0x0d, 0x3a,
+	0xe3, 0x51, 0xdd, 0x9a, 0xb4, 0xe8, 0x4e, 0x3b, 0xb5, 0x5c, 0x77, 0x68, 0x12, 0x94, 0xe0, 0x52,
+	0x04, 0x0d, 0x52, 0xf6, 0xb8, 0x6e, 0x07, 0xb3, 0x22, 0x56, 0x10, 0x3c, 0xe0, 0x2e, 0x0d, 0x2c,
+	0x65, 0xab, 0xa7, 0x1c, 0x73, 0x4b, 0xae, 0xb9, 0xe6, 0x9c, 0x5b, 0x7e, 0x49, 0x8e, 0xf9, 0x17,
+	0x99, 0xc9, 0x1f, 0xc8, 0xec, 0x62, 0x41, 0x91, 0x8a, 0x95, 0x90, 0xce, 0x0d, 0xfb, 0xde, 0xbe,
+	0x0f, 0x0f, 0xbb, 0xdf, 0xf7, 0xde, 0x03, 0xec, 0x7b, 0x8c, 0x79, 0x01, 0xa9, 0xe1, 0x28, 0xf2,
+	0x23, 0x8e, 0x29, 0xaf, 0x91, 0xd1, 0x09, 0x71, 0x5d, 0xe2, 0xd6, 0xce, 0xf7, 0x70, 0x30, 0x3e,
+	0xc3, 0xf5, 0xa9, 0xc5, 0x99, 0x6e, 0xaa, 0x8e, 0x43, 0xc6, 0x19, 0xd2, 0xe3, 0xe0, 0xea, 0xa5,
+	0x3d, 0xd9, 0x5a, 0x4d, 0x82, 0xb7, 0xee, 0x24, 0x2f, 0x18, 0xfb, 0x35, 0x4c, 0x29, 0xe3, 0x98,
+	0xfb, 0x8c, 0x46, 0x31, 0xc2, 0x56, 0x45, 0x79, 0xf9, 0xc5, 0x98, 0xd4, 0x02, 0xcc, 0x03, 0xea,
+	0xc5, 0x1e, 0xfd, 0x33, 0x0d, 0x36, 0x1a, 0x12, 0xd7, 0x26, 0xef, 0x26, 0x24, 0xe2, 0xe8, 0x39,
+	0x64, 0x86, 0x8c, 0x9e, 0xfa, 0x5e, 0x45, 0xdb, 0xd1, 0x76, 0xf3, 0xf5, 0x87, 0xd5, 0x5f, 0x7f,
+	0x7d, 0x35, 0x86, 0x68, 0xca, 0xb8, 0xc3, 0x15, 0x5b, 0x21, 0xa0, 0x6d, 0xc8, 0xe2, 0x89, 0xeb,
+	0x33, 0xc7, 0xa7, 0x95, 0xd4, 0x8e, 0xb6, 0x5b, 0x38, 0x5c, 0xb1, 0xd7, 0xa5, 0xc5, 0xa4, 0xcf,
+	0x32, 0x90, 0x16, 0xf9, 0xe8, 0xdf, 0xac, 0x41, 0x31, 0x49, 0x21, 0x1a, 0x33, 0x1a, 0x11, 0xf4,
+	0x06, 0x80, 0x9c, 0x13, 0xca, 0x1d, 0xb1, 0x41, 0xe6, 0x51, 0xac, 0x3f, 0x59, 0x3c, 0x8f, 0x04,
+	0xa7, 0x6a, 0x08, 0x90, 0xc1, 0xc5, 0x98, 0xd8, 0x39, 0x92, 0x3c, 0x22, 0x13, 0x72, 0x71, 0x52,
+	0x6c, 0xc2, 0x2b, 0xab, 0xf2, 0x1b, 0xff, 0xb2, 0x10, 0xb6, 0x08, 0xb2, 0x26, 0xdc, 0x8e, 0xbf,
+	0xc9, 0x9a, 0x70, 0xd4, 0x01, 0x88, 0x86, 0x21, 0x21, 0x54, 0x62, 0xa5, 0x25, 0xd6, 0x83, 0x45,
+	0xb0, 0xfa, 0x32, 0x4a, 0x80, 0xe5, 0xa2, 0xe4, 0x11, 0x1d, 0xc3, 0x86, 0x4b, 0xce, 0xfd, 0x21,
+	0x71, 0xf0, 0x50, 0xdc, 0x5e, 0x25, 0xb3, 0xf8, 0x05, 0xb4, 0x64, 0x60, 0x43, 0xc6, 0xd9, 0x05,
+	0x77, 0x66, 0x85, 0x4e, 0xa0, 0x18, 0x8d, 0x09, 0x19, 0x9e, 0x39, 0x21, 0x89, 0x26, 0x01, 0x8f,
+	0x2a, 0xa9, 0x9d, 0xd5, 0xdd, 0x7c, 0x7d, 0x7f, 0xa1, 0x44, 0x65, 0xa4, 0x4d, 0x86, 0xcc, 0xa3,
+	0xbe, 0x04, 0x97, 0x18, 0xf6, 0x46, 0xa4, 0x1c, 0x12, 0x11, 0xfd, 0x17, 0xca, 0xae, 0x8f, 0x03,
+	0xe6, 0x39, 0x11, 0xc7, 0x9c, 0xc8, 0xe3, 0x58, 0x93, 0xd9, 0xd7, 0x17, 0xca, 0x5e, 0xc6, 0xf6,
+	0x45, 0xa8, 0x38, 0x93, 0xa2, 0x3b, 0xb7, 0x16, 0xc7, 0xec, 0x92, 0x93, 0x89, 0xe7, 0xf8, 0xf4,
+	0x94, 0x55, 0xb2, 0x8b, 0x1f, 0x73, 0x4b, 0x44, 0x99, 0xf4, 0x94, 0xd9, 0x39, 0x37, 0x79, 0xd4,
+	0xff, 0x09, 0xb9, 0x29, 0x2f, 0xd0, 0x16, 0xdc, 0x32, 0x5e, 0x1a, 0xdd, 0x81, 0x33, 0x78, 0xdd,
+	0x33, 0x9c, 0xe3, 0x6e, 0xbf, 0x67, 0x34, 0xcd, 0xb6, 0x69, 0xb4, 0xca, 0x2b, 0xe8, 0x26, 0x94,
+	0x8d, 0x6e, 0xcb, 0xb1, 0xda, 0xce, 0xf1, 0x60, 0x60, 0xd8, 0x8d, 0x6e, 0xd3, 0x28, 0x6b, 0xba,
+	0x09, 0xb9, 0x29, 0x2c, 0x7a, 0x02, 0xdb, 0x98, 0x79, 0x0e, 0xf6, 0x24, 0x59, 0xd9, 0xa5, 0x74,
+	0x9d, 0xb7, 0x11, 0xa3, 0x92, 0xb9, 0x39, 0xfb, 0x36, 0x66, 0x5e, 0x43, 0xec, 0x18, 0xb0, 0x46,
+	0xe2, 0x7f, 0x1e, 0x31, 0xaa, 0x7f, 0x9f, 0x86, 0xc2, 0xac, 0x72, 0xd0, 0x1b, 0x28, 0x25, 0x7a,
+	0x71, 0xe6, 0x44, 0xb8, 0xb7, 0x30, 0x41, 0x4d, 0x3a, 0x55, 0xe1, 0x06, 0x9e, 0x35, 0xa0, 0xbb,
+	0x00, 0x9c, 0x7c, 0xe0, 0xce, 0xbb, 0x09, 0x09, 0x2f, 0x24, 0xb7, 0x72, 0x87, 0x2b, 0x76, 0x4e,
+	0xd8, 0x5e, 0x08, 0x93, 0xb8, 0xc4, 0xa9, 0x30, 0x92, 0xd7, 0xa7, 0x16, 0xbf, 0xc4, 0x44, 0x1f,
+	0xf1, 0xeb, 0xec, 0x22, 0x9e, 0x5b, 0x23, 0x07, 0x36, 0x2f, 0xb5, 0x92, 0xc0, 0xc7, 0x77, 0xf9,
+	0x68, 0x29, 0xc9, 0x28, 0xfc, 0x52, 0x34, 0x6f, 0x40, 0xaf, 0xa1, 0x34, 0xc7, 0x41, 0x9f, 0x2a,
+	0x75, 0xef, 0x2d, 0x49, 0x41, 0x93, 0xda, 0x1b, 0xee, 0xec, 0x72, 0x46, 0x99, 0x2a, 0xef, 0xf4,
+	0xb2, 0xca, 0x54, 0x49, 0x2b, 0x65, 0xaa, 0x8c, 0x6d, 0x28, 0xc4, 0xbc, 0x56, 0xa8, 0xb1, 0x62,
+	0x6a, 0x0b, 0x33, 0x5b, 0x81, 0xe6, 0xdd, 0xcb, 0xc5, 0xb4, 0xaa, 0x7e, 0x27, 0x0a, 0xfb, 0xdc,
+	0xfd, 0xbf, 0x84, 0x2c, 0xa1, 0x43, 0xe6, 0xfa, 0xd4, 0x53, 0x25, 0xf5, 0xf1, 0xd2, 0xac, 0xaa,
+	0x1a, 0x0a, 0xc1, 0x9e, 0x62, 0xa1, 0xfb, 0xb0, 0x19, 0xe1, 0xd1, 0x38, 0x20, 0x4e, 0x28, 0x8e,
+	0xfd, 0x8c, 0x84, 0xfc, 0xff, 0x92, 0x37, 0x6b, 0x76, 0x29, 0x76, 0xd8, 0x98, 0x93, 0x43, 0x61,
+	0xd6, 0x9f, 0x40, 0x36, 0x41, 0x40, 0x15, 0xb8, 0x69, 0x74, 0x9b, 0x56, 0xcb, 0xec, 0x1e, 0x5c,
+	0x11, 0x5e, 0x01, 0xb2, 0x1d, 0xb3, 0x6b, 0x34, 0xec, 0xbd, 0xbf, 0x95, 0x35, 0x94, 0x85, 0x74,
+	0xbb, 0xd3, 0x68, 0x96, 0x53, 0xfa, 0x97, 0x29, 0x28, 0xce, 0xb3, 0x0c, 0xbd, 0xfa, 0xd9, 0x47,
+	0xed, 0x2f, 0xcf, 0xd5, 0xdf, 0xf8, 0x55, 0xe8, 0xcf, 0xb0, 0x79, 0xce, 0x82, 0xc9, 0x88, 0x38,
+	0x63, 0x12, 0x0e, 0x09, 0xe5, 0xd8, 0x23, 0x92, 0x7b, 0x6b, 0x76, 0x39, 0x76, 0xf4, 0xa6, 0x76,
+	0xbd, 0xf3, 0x09, 0x47, 0xb0, 0x0e, 0xab, 0x47, 0xbd, 0x47, 0xe5, 0x14, 0x2a, 0x41, 0xde, 0xea,
+	0x1d, 0xf7, 0x1d, 0xb3, 0xeb, 0x58, 0x07, 0x07, 0xe5, 0x55, 0xfd, 0x5b, 0x0d, 0x4a, 0x57, 0x94,
+	0x81, 0x1c, 0xc8, 0x2b, 0xa5, 0x8d, 0x98, 0x9b, 0xb4, 0xcf, 0xa7, 0x9f, 0xa0, 0x31, 0xb5, 0x3e,
+	0x62, 0x2e, 0xb1, 0x55, 0xa3, 0x13, 0xcf, 0xfa, 0xbf, 0x00, 0x2e, 0x3d, 0x68, 0x1b, 0x6e, 0xf7,
+	0x9b, 0xb6, 0x61, 0x74, 0x9d, 0x23, 0xab, 0x75, 0xb5, 0x86, 0xae, 0xc3, 0xaa, 0xd5, 0x6e, 0x97,
+	0x35, 0x94, 0x87, 0xf5, 0x5e, 0xa7, 0xf1, 0xda, 0xec, 0x8a, 0xac, 0x7f, 0xd0, 0x60, 0x63, 0x4e,
+	0x70, 0xe8, 0x01, 0xa0, 0x21, 0xa3, 0xe7, 0x24, 0x8c, 0xe4, 0xe0, 0x12, 0x4b, 0x58, 0xa6, 0x5e,
+	0xb0, 0x37, 0x67, 0x3d, 0x32, 0x00, 0xfd, 0x11, 0x36, 0x02, 0x4c, 0xbd, 0x09, 0xf6, 0x84, 0x24,
+	0x5d, 0x22, 0x6f, 0x26, 0x67, 0x17, 0x12, 0x63, 0x53, 0x24, 0xf6, 0x06, 0x4a, 0x4a, 0xb5, 0x01,
+	0x1b, 0xca, 0xe0, 0xa5, 0x7a, 0x92, 0x0c, 0xed, 0xa8, 0x48, 0xbb, 0xe8, 0xce, 0xad, 0x51, 0x15,
+	0x6e, 0xf8, 0x91, 0x43, 0xc9, 0x7b, 0x67, 0x36, 0xbb, 0xca, 0xfa, 0x8e, 0xb6, 0x9b, 0xb5, 0x37,
+	0xfd, 0xa8, 0x4b, 0xde, 0x37, 0x67, 0x1c, 0x7a, 0x1f, 0x0a, 0xb3, 0x95, 0x00, 0x6d, 0x43, 0x4e,
+	0x25, 0xe7, 0xbb, 0xaa, 0x4f, 0x64, 0x63, 0x83, 0xe9, 0xa2, 0x7b, 0xd3, 0xcc, 0xc5, 0x0d, 0x06,
+	0x62, 0xcb, 0xaa, 0xdc, 0xa2, 0xca, 0x90, 0x38, 0xf7, 0xc0, 0x74, 0xf5, 0x3f, 0x41, 0x36, 0x61,
+	0x32, 0xfa, 0x3d, 0x40, 0x5c, 0xbd, 0x5d, 0xcc, 0xb1, 0x3a, 0xb9, 0x78, 0xd0, 0x69, 0x61, 0x8e,
+	0xf5, 0xaf, 0x34, 0xc8, 0x4d, 0xaf, 0x17, 0x75, 0x20, 0x73, 0xca, 0xc2, 0x11, 0xe6, 0x8a, 0x1d,
+	0x7f, 0x5d, 0x8a, 0x1d, 0xd5, 0xb6, 0x8c, 0xb5, 0x15, 0x06, 0x42, 0x90, 0x96, 0x2f, 0x95, 0x23,
+	0x9e, 0x2d, 0x9f, 0xf5, 0xfb, 0x90, 0x89, 0x77, 0xa1, 0x5b, 0x80, 0xda, 0x96, 0x7d, 0xd4, 0x18,
+	0x5c, 0xa1, 0x46, 0x16, 0xd2, 0x87, 0x83, 0xa3, 0x4e, 0x59, 0xd3, 0x9f, 0x26, 0x67, 0xa3, 0x26,
+	0x96, 0x2a, 0xdc, 0x50, 0x9f, 0x1f, 0xc6, 0x43, 0xe9, 0x6c, 0x37, 0xdd, 0x8c, 0x5d, 0x6a, 0x5c,
+	0x95, 0x7d, 0xf4, 0x15, 0xdc, 0xbe, 0x66, 0x4e, 0x41, 0x7f, 0x00, 0xe0, 0x21, 0xa6, 0xd1, 0x30,
+	0xf4, 0xc7, 0x5c, 0x21, 0xcc, 0x58, 0xd0, 0x1d, 0xc8, 0x45, 0x1c, 0x9f, 0xf8, 0x81, 0xcf, 0x2f,
+	0x64, 0xfe, 0x29, 0xfb, 0xd2, 0xa0, 0xff, 0x98, 0x82, 0xe2, 0xfc, 0x6c, 0x82, 0x1e, 0xc3, 0xef,
+	0xa2, 0xc9, 0x78, 0x1c, 0x90, 0x91, 0xd0, 0x73, 0xe0, 0xb8, 0x7e, 0x34, 0x0e, 0xf0, 0x85, 0x23,
+	0xda, 0x68, 0xd2, 0xef, 0x67, 0x37, 0xb4, 0x62, 0xff, 0x80, 0x7c, 0xe0, 0xd7, 0x90, 0x3c, 0x75,
+	0x1d, 0xc9, 0xdf, 0x42, 0x69, 0xe4, 0x0f, 0x43, 0x36, 0x3e, 0x63, 0x34, 0x66, 0x82, 0x64, 0x41,
+	0xb1, 0xde, 0x58, 0x7e, 0xa6, 0xaa, 0x1e, 0x4d, 0x91, 0xa4, 0x9c, 0x8b, 0xa3, 0xb9, 0xf5, 0xc7,
+	0x4b, 0x58, 0xfa, 0x9a, 0x12, 0xf6, 0x3f, 0x28, 0xce, 0xc3, 0xa1, 0xbb, 0xb0, 0x7d, 0x64, 0x36,
+	0x6d, 0xab, 0x77, 0x68, 0x75, 0x8d, 0x8f, 0xd5, 0x81, 0x9b, 0x50, 0x6e, 0x76, 0xac, 0xbe, 0xe1,
+	0x5c, 0x6e, 0x2b, 0x6b, 0xc2, 0xda, 0x32, 0x1b, 0x1d, 0xeb, 0xc0, 0x69, 0x5b, 0x9d, 0x8e, 0xf5,
+	0xca, 0xb1, 0xba, 0xe5, 0x94, 0xfe, 0x0f, 0xc8, 0xcf, 0xb4, 0x37, 0x51, 0x89, 0x43, 0xc2, 0x27,
+	0x21, 0x75, 0x66, 0x86, 0xc0, 0x8c, 0xd4, 0x59, 0x29, 0x76, 0x4c, 0xe7, 0x31, 0xfd, 0x05, 0x14,
+	0xe7, 0x75, 0x8b, 0xfe, 0x0e, 0xf9, 0x21, 0x63, 0xa1, 0xeb, 0x53, 0xcc, 0x49, 0xa4, 0xc6, 0xa9,
+	0x1b, 0xc9, 0x01, 0x8a, 0x56, 0x59, 0xed, 0x60, 0xde, 0xa1, 0x62, 0x60, 0x9a, 0xdd, 0x99, 0x34,
+	0xd2, 0xfa, 0xe7, 0x1a, 0x6c, 0x1a, 0xea, 0x74, 0xa7, 0xe3, 0x1b, 0x8a, 0x20, 0x13, 0x2f, 0xd0,
+	0xde, 0x32, 0xff, 0x25, 0x92, 0xb3, 0x5b, 0xf5, 0xe5, 0x7f, 0x65, 0x76, 0xb5, 0x87, 0xda, 0xb3,
+	0x2f, 0x34, 0xb8, 0x37, 0x64, 0xa3, 0x05, 0xa2, 0x9f, 0x15, 0xa7, 0xa9, 0xf6, 0xc4, 0x7f, 0x5e,
+	0x4f, 0xfb, 0xcf, 0x73, 0x15, 0xe5, 0x31, 0x51, 0x24, 0xab, 0x2c, 0xf4, 0x6a, 0x1e, 0xa1, 0xf2,
+	0x2f, 0xb0, 0x16, 0xbb, 0xf0, 0xd8, 0x8f, 0x7e, 0xe9, 0x0f, 0x75, 0x3f, 0xb1, 0x7c, 0x9d, 0xca,
+	0x34, 0xfa, 0x83, 0x7e, 0xeb, 0xdf, 0x27, 0x19, 0x19, 0xff, 0xe8, 0xa7, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xb9, 0x08, 0x29, 0x0f, 0xe0, 0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1674,102 +1629,3 @@ var _EmbeddedAssistant_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/assistant/embedded/v1alpha2/embedded_assistant.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/assistant/embedded/v1alpha2/embedded_assistant.proto", fileDescriptor_embedded_assistant_0b559f064bf1f88e)
-}
-
-var fileDescriptor_embedded_assistant_0b559f064bf1f88e = []byte{
-	// 1449 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x41, 0x73, 0xdb, 0xc6,
-	0x15, 0x16, 0x28, 0x8a, 0x22, 0x1f, 0x29, 0x92, 0x5a, 0x7b, 0x6c, 0x56, 0x72, 0x6b, 0x0d, 0x3a,
-	0xe3, 0x51, 0xdd, 0x9a, 0xb4, 0xe8, 0x4e, 0x3b, 0xb5, 0x5c, 0x77, 0x68, 0x12, 0x94, 0xe0, 0x52,
-	0x04, 0x0d, 0x52, 0xf6, 0xb8, 0x6e, 0x07, 0xb3, 0x22, 0x56, 0x10, 0x3c, 0xe0, 0x2e, 0x0d, 0x2c,
-	0x65, 0xab, 0xa7, 0x1c, 0x73, 0x4b, 0xae, 0xb9, 0xe6, 0x9c, 0x5b, 0x7e, 0x49, 0x8e, 0xf9, 0x17,
-	0x99, 0xc9, 0x1f, 0xc8, 0xec, 0x62, 0x41, 0x91, 0x8a, 0x95, 0x90, 0xce, 0x0d, 0xfb, 0xde, 0xbe,
-	0x0f, 0x0f, 0xbb, 0xdf, 0xf7, 0xde, 0x03, 0xec, 0x7b, 0x8c, 0x79, 0x01, 0xa9, 0xe1, 0x28, 0xf2,
-	0x23, 0x8e, 0x29, 0xaf, 0x91, 0xd1, 0x09, 0x71, 0x5d, 0xe2, 0xd6, 0xce, 0xf7, 0x70, 0x30, 0x3e,
-	0xc3, 0xf5, 0xa9, 0xc5, 0x99, 0x6e, 0xaa, 0x8e, 0x43, 0xc6, 0x19, 0xd2, 0xe3, 0xe0, 0xea, 0xa5,
-	0x3d, 0xd9, 0x5a, 0x4d, 0x82, 0xb7, 0xee, 0x24, 0x2f, 0x18, 0xfb, 0x35, 0x4c, 0x29, 0xe3, 0x98,
-	0xfb, 0x8c, 0x46, 0x31, 0xc2, 0x56, 0x45, 0x79, 0xf9, 0xc5, 0x98, 0xd4, 0x02, 0xcc, 0x03, 0xea,
-	0xc5, 0x1e, 0xfd, 0x33, 0x0d, 0x36, 0x1a, 0x12, 0xd7, 0x26, 0xef, 0x26, 0x24, 0xe2, 0xe8, 0x39,
-	0x64, 0x86, 0x8c, 0x9e, 0xfa, 0x5e, 0x45, 0xdb, 0xd1, 0x76, 0xf3, 0xf5, 0x87, 0xd5, 0x5f, 0x7f,
-	0x7d, 0x35, 0x86, 0x68, 0xca, 0xb8, 0xc3, 0x15, 0x5b, 0x21, 0xa0, 0x6d, 0xc8, 0xe2, 0x89, 0xeb,
-	0x33, 0xc7, 0xa7, 0x95, 0xd4, 0x8e, 0xb6, 0x5b, 0x38, 0x5c, 0xb1, 0xd7, 0xa5, 0xc5, 0xa4, 0xcf,
-	0x32, 0x90, 0x16, 0xf9, 0xe8, 0xdf, 0xac, 0x41, 0x31, 0x49, 0x21, 0x1a, 0x33, 0x1a, 0x11, 0xf4,
-	0x06, 0x80, 0x9c, 0x13, 0xca, 0x1d, 0xb1, 0x41, 0xe6, 0x51, 0xac, 0x3f, 0x59, 0x3c, 0x8f, 0x04,
-	0xa7, 0x6a, 0x08, 0x90, 0xc1, 0xc5, 0x98, 0xd8, 0x39, 0x92, 0x3c, 0x22, 0x13, 0x72, 0x71, 0x52,
-	0x6c, 0xc2, 0x2b, 0xab, 0xf2, 0x1b, 0xff, 0xb2, 0x10, 0xb6, 0x08, 0xb2, 0x26, 0xdc, 0x8e, 0xbf,
-	0xc9, 0x9a, 0x70, 0xd4, 0x01, 0x88, 0x86, 0x21, 0x21, 0x54, 0x62, 0xa5, 0x25, 0xd6, 0x83, 0x45,
-	0xb0, 0xfa, 0x32, 0x4a, 0x80, 0xe5, 0xa2, 0xe4, 0x11, 0x1d, 0xc3, 0x86, 0x4b, 0xce, 0xfd, 0x21,
-	0x71, 0xf0, 0x50, 0xdc, 0x5e, 0x25, 0xb3, 0xf8, 0x05, 0xb4, 0x64, 0x60, 0x43, 0xc6, 0xd9, 0x05,
-	0x77, 0x66, 0x85, 0x4e, 0xa0, 0x18, 0x8d, 0x09, 0x19, 0x9e, 0x39, 0x21, 0x89, 0x26, 0x01, 0x8f,
-	0x2a, 0xa9, 0x9d, 0xd5, 0xdd, 0x7c, 0x7d, 0x7f, 0xa1, 0x44, 0x65, 0xa4, 0x4d, 0x86, 0xcc, 0xa3,
-	0xbe, 0x04, 0x97, 0x18, 0xf6, 0x46, 0xa4, 0x1c, 0x12, 0x11, 0xfd, 0x17, 0xca, 0xae, 0x8f, 0x03,
-	0xe6, 0x39, 0x11, 0xc7, 0x9c, 0xc8, 0xe3, 0x58, 0x93, 0xd9, 0xd7, 0x17, 0xca, 0x5e, 0xc6, 0xf6,
-	0x45, 0xa8, 0x38, 0x93, 0xa2, 0x3b, 0xb7, 0x16, 0xc7, 0xec, 0x92, 0x93, 0x89, 0xe7, 0xf8, 0xf4,
-	0x94, 0x55, 0xb2, 0x8b, 0x1f, 0x73, 0x4b, 0x44, 0x99, 0xf4, 0x94, 0xd9, 0x39, 0x37, 0x79, 0xd4,
-	0xff, 0x09, 0xb9, 0x29, 0x2f, 0xd0, 0x16, 0xdc, 0x32, 0x5e, 0x1a, 0xdd, 0x81, 0x33, 0x78, 0xdd,
-	0x33, 0x9c, 0xe3, 0x6e, 0xbf, 0x67, 0x34, 0xcd, 0xb6, 0x69, 0xb4, 0xca, 0x2b, 0xe8, 0x26, 0x94,
-	0x8d, 0x6e, 0xcb, 0xb1, 0xda, 0xce, 0xf1, 0x60, 0x60, 0xd8, 0x8d, 0x6e, 0xd3, 0x28, 0x6b, 0xba,
-	0x09, 0xb9, 0x29, 0x2c, 0x7a, 0x02, 0xdb, 0x98, 0x79, 0x0e, 0xf6, 0x24, 0x59, 0xd9, 0xa5, 0x74,
-	0x9d, 0xb7, 0x11, 0xa3, 0x92, 0xb9, 0x39, 0xfb, 0x36, 0x66, 0x5e, 0x43, 0xec, 0x18, 0xb0, 0x46,
-	0xe2, 0x7f, 0x1e, 0x31, 0xaa, 0x7f, 0x9f, 0x86, 0xc2, 0xac, 0x72, 0xd0, 0x1b, 0x28, 0x25, 0x7a,
-	0x71, 0xe6, 0x44, 0xb8, 0xb7, 0x30, 0x41, 0x4d, 0x3a, 0x55, 0xe1, 0x06, 0x9e, 0x35, 0xa0, 0xbb,
-	0x00, 0x9c, 0x7c, 0xe0, 0xce, 0xbb, 0x09, 0x09, 0x2f, 0x24, 0xb7, 0x72, 0x87, 0x2b, 0x76, 0x4e,
-	0xd8, 0x5e, 0x08, 0x93, 0xb8, 0xc4, 0xa9, 0x30, 0x92, 0xd7, 0xa7, 0x16, 0xbf, 0xc4, 0x44, 0x1f,
-	0xf1, 0xeb, 0xec, 0x22, 0x9e, 0x5b, 0x23, 0x07, 0x36, 0x2f, 0xb5, 0x92, 0xc0, 0xc7, 0x77, 0xf9,
-	0x68, 0x29, 0xc9, 0x28, 0xfc, 0x52, 0x34, 0x6f, 0x40, 0xaf, 0xa1, 0x34, 0xc7, 0x41, 0x9f, 0x2a,
-	0x75, 0xef, 0x2d, 0x49, 0x41, 0x93, 0xda, 0x1b, 0xee, 0xec, 0x72, 0x46, 0x99, 0x2a, 0xef, 0xf4,
-	0xb2, 0xca, 0x54, 0x49, 0x2b, 0x65, 0xaa, 0x8c, 0x6d, 0x28, 0xc4, 0xbc, 0x56, 0xa8, 0xb1, 0x62,
-	0x6a, 0x0b, 0x33, 0x5b, 0x81, 0xe6, 0xdd, 0xcb, 0xc5, 0xb4, 0xaa, 0x7e, 0x27, 0x0a, 0xfb, 0xdc,
-	0xfd, 0xbf, 0x84, 0x2c, 0xa1, 0x43, 0xe6, 0xfa, 0xd4, 0x53, 0x25, 0xf5, 0xf1, 0xd2, 0xac, 0xaa,
-	0x1a, 0x0a, 0xc1, 0x9e, 0x62, 0xa1, 0xfb, 0xb0, 0x19, 0xe1, 0xd1, 0x38, 0x20, 0x4e, 0x28, 0x8e,
-	0xfd, 0x8c, 0x84, 0xfc, 0xff, 0x92, 0x37, 0x6b, 0x76, 0x29, 0x76, 0xd8, 0x98, 0x93, 0x43, 0x61,
-	0xd6, 0x9f, 0x40, 0x36, 0x41, 0x40, 0x15, 0xb8, 0x69, 0x74, 0x9b, 0x56, 0xcb, 0xec, 0x1e, 0x5c,
-	0x11, 0x5e, 0x01, 0xb2, 0x1d, 0xb3, 0x6b, 0x34, 0xec, 0xbd, 0xbf, 0x95, 0x35, 0x94, 0x85, 0x74,
-	0xbb, 0xd3, 0x68, 0x96, 0x53, 0xfa, 0x97, 0x29, 0x28, 0xce, 0xb3, 0x0c, 0xbd, 0xfa, 0xd9, 0x47,
-	0xed, 0x2f, 0xcf, 0xd5, 0xdf, 0xf8, 0x55, 0xe8, 0xcf, 0xb0, 0x79, 0xce, 0x82, 0xc9, 0x88, 0x38,
-	0x63, 0x12, 0x0e, 0x09, 0xe5, 0xd8, 0x23, 0x92, 0x7b, 0x6b, 0x76, 0x39, 0x76, 0xf4, 0xa6, 0x76,
-	0xbd, 0xf3, 0x09, 0x47, 0xb0, 0x0e, 0xab, 0x47, 0xbd, 0x47, 0xe5, 0x14, 0x2a, 0x41, 0xde, 0xea,
-	0x1d, 0xf7, 0x1d, 0xb3, 0xeb, 0x58, 0x07, 0x07, 0xe5, 0x55, 0xfd, 0x5b, 0x0d, 0x4a, 0x57, 0x94,
-	0x81, 0x1c, 0xc8, 0x2b, 0xa5, 0x8d, 0x98, 0x9b, 0xb4, 0xcf, 0xa7, 0x9f, 0xa0, 0x31, 0xb5, 0x3e,
-	0x62, 0x2e, 0xb1, 0x55, 0xa3, 0x13, 0xcf, 0xfa, 0xbf, 0x00, 0x2e, 0x3d, 0x68, 0x1b, 0x6e, 0xf7,
-	0x9b, 0xb6, 0x61, 0x74, 0x9d, 0x23, 0xab, 0x75, 0xb5, 0x86, 0xae, 0xc3, 0xaa, 0xd5, 0x6e, 0x97,
-	0x35, 0x94, 0x87, 0xf5, 0x5e, 0xa7, 0xf1, 0xda, 0xec, 0x8a, 0xac, 0x7f, 0xd0, 0x60, 0x63, 0x4e,
-	0x70, 0xe8, 0x01, 0xa0, 0x21, 0xa3, 0xe7, 0x24, 0x8c, 0xe4, 0xe0, 0x12, 0x4b, 0x58, 0xa6, 0x5e,
-	0xb0, 0x37, 0x67, 0x3d, 0x32, 0x00, 0xfd, 0x11, 0x36, 0x02, 0x4c, 0xbd, 0x09, 0xf6, 0x84, 0x24,
-	0x5d, 0x22, 0x6f, 0x26, 0x67, 0x17, 0x12, 0x63, 0x53, 0x24, 0xf6, 0x06, 0x4a, 0x4a, 0xb5, 0x01,
-	0x1b, 0xca, 0xe0, 0xa5, 0x7a, 0x92, 0x0c, 0xed, 0xa8, 0x48, 0xbb, 0xe8, 0xce, 0xad, 0x51, 0x15,
-	0x6e, 0xf8, 0x91, 0x43, 0xc9, 0x7b, 0x67, 0x36, 0xbb, 0xca, 0xfa, 0x8e, 0xb6, 0x9b, 0xb5, 0x37,
-	0xfd, 0xa8, 0x4b, 0xde, 0x37, 0x67, 0x1c, 0x7a, 0x1f, 0x0a, 0xb3, 0x95, 0x00, 0x6d, 0x43, 0x4e,
-	0x25, 0xe7, 0xbb, 0xaa, 0x4f, 0x64, 0x63, 0x83, 0xe9, 0xa2, 0x7b, 0xd3, 0xcc, 0xc5, 0x0d, 0x06,
-	0x62, 0xcb, 0xaa, 0xdc, 0xa2, 0xca, 0x90, 0x38, 0xf7, 0xc0, 0x74, 0xf5, 0x3f, 0x41, 0x36, 0x61,
-	0x32, 0xfa, 0x3d, 0x40, 0x5c, 0xbd, 0x5d, 0xcc, 0xb1, 0x3a, 0xb9, 0x78, 0xd0, 0x69, 0x61, 0x8e,
-	0xf5, 0xaf, 0x34, 0xc8, 0x4d, 0xaf, 0x17, 0x75, 0x20, 0x73, 0xca, 0xc2, 0x11, 0xe6, 0x8a, 0x1d,
-	0x7f, 0x5d, 0x8a, 0x1d, 0xd5, 0xb6, 0x8c, 0xb5, 0x15, 0x06, 0x42, 0x90, 0x96, 0x2f, 0x95, 0x23,
-	0x9e, 0x2d, 0x9f, 0xf5, 0xfb, 0x90, 0x89, 0x77, 0xa1, 0x5b, 0x80, 0xda, 0x96, 0x7d, 0xd4, 0x18,
-	0x5c, 0xa1, 0x46, 0x16, 0xd2, 0x87, 0x83, 0xa3, 0x4e, 0x59, 0xd3, 0x9f, 0x26, 0x67, 0xa3, 0x26,
-	0x96, 0x2a, 0xdc, 0x50, 0x9f, 0x1f, 0xc6, 0x43, 0xe9, 0x6c, 0x37, 0xdd, 0x8c, 0x5d, 0x6a, 0x5c,
-	0x95, 0x7d, 0xf4, 0x15, 0xdc, 0xbe, 0x66, 0x4e, 0x41, 0x7f, 0x00, 0xe0, 0x21, 0xa6, 0xd1, 0x30,
-	0xf4, 0xc7, 0x5c, 0x21, 0xcc, 0x58, 0xd0, 0x1d, 0xc8, 0x45, 0x1c, 0x9f, 0xf8, 0x81, 0xcf, 0x2f,
-	0x64, 0xfe, 0x29, 0xfb, 0xd2, 0xa0, 0xff, 0x98, 0x82, 0xe2, 0xfc, 0x6c, 0x82, 0x1e, 0xc3, 0xef,
-	0xa2, 0xc9, 0x78, 0x1c, 0x90, 0x91, 0xd0, 0x73, 0xe0, 0xb8, 0x7e, 0x34, 0x0e, 0xf0, 0x85, 0x23,
-	0xda, 0x68, 0xd2, 0xef, 0x67, 0x37, 0xb4, 0x62, 0xff, 0x80, 0x7c, 0xe0, 0xd7, 0x90, 0x3c, 0x75,
-	0x1d, 0xc9, 0xdf, 0x42, 0x69, 0xe4, 0x0f, 0x43, 0x36, 0x3e, 0x63, 0x34, 0x66, 0x82, 0x64, 0x41,
-	0xb1, 0xde, 0x58, 0x7e, 0xa6, 0xaa, 0x1e, 0x4d, 0x91, 0xa4, 0x9c, 0x8b, 0xa3, 0xb9, 0xf5, 0xc7,
-	0x4b, 0x58, 0xfa, 0x9a, 0x12, 0xf6, 0x3f, 0x28, 0xce, 0xc3, 0xa1, 0xbb, 0xb0, 0x7d, 0x64, 0x36,
-	0x6d, 0xab, 0x77, 0x68, 0x75, 0x8d, 0x8f, 0xd5, 0x81, 0x9b, 0x50, 0x6e, 0x76, 0xac, 0xbe, 0xe1,
-	0x5c, 0x6e, 0x2b, 0x6b, 0xc2, 0xda, 0x32, 0x1b, 0x1d, 0xeb, 0xc0, 0x69, 0x5b, 0x9d, 0x8e, 0xf5,
-	0xca, 0xb1, 0xba, 0xe5, 0x94, 0xfe, 0x0f, 0xc8, 0xcf, 0xb4, 0x37, 0x51, 0x89, 0x43, 0xc2, 0x27,
-	0x21, 0x75, 0x66, 0x86, 0xc0, 0x8c, 0xd4, 0x59, 0x29, 0x76, 0x4c, 0xe7, 0x31, 0xfd, 0x05, 0x14,
-	0xe7, 0x75, 0x8b, 0xfe, 0x0e, 0xf9, 0x21, 0x63, 0xa1, 0xeb, 0x53, 0xcc, 0x49, 0xa4, 0xc6, 0xa9,
-	0x1b, 0xc9, 0x01, 0x8a, 0x56, 0x59, 0xed, 0x60, 0xde, 0xa1, 0x62, 0x60, 0x9a, 0xdd, 0x99, 0x34,
-	0xd2, 0xfa, 0xe7, 0x1a, 0x6c, 0x1a, 0xea, 0x74, 0xa7, 0xe3, 0x1b, 0x8a, 0x20, 0x13, 0x2f, 0xd0,
-	0xde, 0x32, 0xff, 0x25, 0x92, 0xb3, 0x5b, 0xf5, 0xe5, 0x7f, 0x65, 0x76, 0xb5, 0x87, 0xda, 0xb3,
-	0x2f, 0x34, 0xb8, 0x37, 0x64, 0xa3, 0x05, 0xa2, 0x9f, 0x15, 0xa7, 0xa9, 0xf6, 0xc4, 0x7f, 0x5e,
-	0x4f, 0xfb, 0xcf, 0x73, 0x15, 0xe5, 0x31, 0x51, 0x24, 0xab, 0x2c, 0xf4, 0x6a, 0x1e, 0xa1, 0xf2,
-	0x2f, 0xb0, 0x16, 0xbb, 0xf0, 0xd8, 0x8f, 0x7e, 0xe9, 0x0f, 0x75, 0x3f, 0xb1, 0x7c, 0x9d, 0xca,
-	0x34, 0xfa, 0x83, 0x7e, 0xeb, 0xdf, 0x27, 0x19, 0x19, 0xff, 0xe8, 0xa7, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xb9, 0x08, 0x29, 0x0f, 0xe0, 0x0e, 0x00, 0x00,
-}
diff --git a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
index 393b80213d..36ffd14346 100644
--- a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
+++ b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto
 
-package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
+package cluster
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type StorageType int32
 
@@ -38,6 +41,7 @@ var StorageType_name = map[int32]string{
 	1: "STORAGE_SSD",
 	2: "STORAGE_HDD",
 }
+
 var StorageType_value = map[string]int32{
 	"STORAGE_UNSPECIFIED": 0,
 	"STORAGE_SSD":         1,
@@ -47,8 +51,9 @@ var StorageType_value = map[string]int32{
 func (x StorageType) String() string {
 	return proto.EnumName(StorageType_name, int32(x))
 }
+
 func (StorageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_data_ec90ed011929fd01, []int{0}
+	return fileDescriptor_33bf61dbf3bd7369, []int{0}
 }
 
 // Possible states of a zone.
@@ -71,6 +76,7 @@ var Zone_Status_name = map[int32]string{
 	2: "PLANNED_MAINTENANCE",
 	3: "EMERGENCY_MAINENANCE",
 }
+
 var Zone_Status_value = map[string]int32{
 	"UNKNOWN":              0,
 	"OK":                   1,
@@ -81,8 +87,9 @@ var Zone_Status_value = map[string]int32{
 func (x Zone_Status) String() string {
 	return proto.EnumName(Zone_Status_name, int32(x))
 }
+
 func (Zone_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_data_ec90ed011929fd01, []int{0, 0}
+	return fileDescriptor_33bf61dbf3bd7369, []int{0, 0}
 }
 
 // A physical location in which a particular project can allocate Cloud BigTable
@@ -104,16 +111,17 @@ func (m *Zone) Reset()         { *m = Zone{} }
 func (m *Zone) String() string { return proto.CompactTextString(m) }
 func (*Zone) ProtoMessage()    {}
 func (*Zone) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_data_ec90ed011929fd01, []int{0}
+	return fileDescriptor_33bf61dbf3bd7369, []int{0}
 }
+
 func (m *Zone) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Zone.Unmarshal(m, b)
 }
 func (m *Zone) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Zone.Marshal(b, m, deterministic)
 }
-func (dst *Zone) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Zone.Merge(dst, src)
+func (m *Zone) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Zone.Merge(m, src)
 }
 func (m *Zone) XXX_Size() int {
 	return xxx_messageInfo_Zone.Size(m)
@@ -174,16 +182,17 @@ func (m *Cluster) Reset()         { *m = Cluster{} }
 func (m *Cluster) String() string { return proto.CompactTextString(m) }
 func (*Cluster) ProtoMessage()    {}
 func (*Cluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_data_ec90ed011929fd01, []int{1}
+	return fileDescriptor_33bf61dbf3bd7369, []int{1}
 }
+
 func (m *Cluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cluster.Unmarshal(m, b)
 }
 func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
 }
-func (dst *Cluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cluster.Merge(dst, src)
+func (m *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(m, src)
 }
 func (m *Cluster) XXX_Size() int {
 	return xxx_messageInfo_Cluster.Size(m)
@@ -230,17 +239,17 @@ func (m *Cluster) GetDefaultStorageType() StorageType {
 }
 
 func init() {
-	proto.RegisterType((*Zone)(nil), "google.bigtable.admin.cluster.v1.Zone")
-	proto.RegisterType((*Cluster)(nil), "google.bigtable.admin.cluster.v1.Cluster")
 	proto.RegisterEnum("google.bigtable.admin.cluster.v1.StorageType", StorageType_name, StorageType_value)
 	proto.RegisterEnum("google.bigtable.admin.cluster.v1.Zone_Status", Zone_Status_name, Zone_Status_value)
+	proto.RegisterType((*Zone)(nil), "google.bigtable.admin.cluster.v1.Zone")
+	proto.RegisterType((*Cluster)(nil), "google.bigtable.admin.cluster.v1.Cluster")
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto", fileDescriptor_bigtable_cluster_data_ec90ed011929fd01)
+	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto", fileDescriptor_33bf61dbf3bd7369)
 }
 
-var fileDescriptor_bigtable_cluster_data_ec90ed011929fd01 = []byte{
+var fileDescriptor_33bf61dbf3bd7369 = []byte{
 	// 493 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xd1, 0x6e, 0xd3, 0x3c,
 	0x1c, 0xc5, 0x97, 0xae, 0xeb, 0xbe, 0xcf, 0x41, 0x10, 0xcc, 0x24, 0xa2, 0x09, 0xb4, 0x52, 0xb8,
diff --git a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
index df9a9fd275..453cc601b1 100644
--- a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
+++ b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto
 
-package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package cluster
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,48 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+func init() {
+	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto", fileDescriptor_597cf005382fe64c)
+}
+
+var fileDescriptor_597cf005382fe64c = []byte{
+	// 515 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x6b, 0x14, 0x31,
+	0x18, 0xc6, 0x89, 0x07, 0xa1, 0xc1, 0x45, 0xc8, 0xa1, 0x87, 0x6d, 0x0b, 0x32, 0x15, 0xb1, 0x23,
+	0x26, 0x6e, 0x17, 0xc5, 0xbf, 0x08, 0x5b, 0xa5, 0x1e, 0x04, 0x8b, 0xd2, 0x4b, 0x2f, 0x4b, 0x76,
+	0xe7, 0x35, 0x8c, 0xcc, 0x24, 0x31, 0xc9, 0x2c, 0xa8, 0xf4, 0xe2, 0xcd, 0x93, 0x88, 0x27, 0x3d,
+	0x78, 0xeb, 0xdd, 0xef, 0xe2, 0x57, 0xf0, 0x83, 0xc8, 0x64, 0x92, 0xb5, 0x2b, 0x6b, 0x77, 0xa6,
+	0xb7, 0x99, 0xc9, 0xfb, 0xbc, 0xcf, 0x6f, 0x9e, 0x24, 0x2f, 0x7e, 0x2c, 0x94, 0x12, 0x05, 0xb0,
+	0x49, 0x2e, 0x1c, 0x9f, 0x14, 0xc0, 0x78, 0x56, 0xe6, 0x92, 0x4d, 0x8b, 0xca, 0x3a, 0x30, 0x6c,
+	0x36, 0x98, 0xaf, 0x8c, 0xc3, 0xb7, 0xb1, 0x05, 0x33, 0xcb, 0xa7, 0x40, 0xb5, 0x51, 0x4e, 0x91,
+	0x2b, 0x4d, 0x03, 0x1a, 0xcb, 0xa8, 0x6f, 0x40, 0x43, 0x31, 0x9d, 0x0d, 0xfa, 0x9b, 0xc1, 0x82,
+	0xeb, 0x9c, 0x71, 0x29, 0x95, 0xe3, 0x2e, 0x57, 0xd2, 0x36, 0xfa, 0xfe, 0xc3, 0xee, 0x00, 0x19,
+	0x77, 0x3c, 0xa8, 0x9f, 0x9d, 0x1b, 0x7f, 0x5c, 0x82, 0xb5, 0x5c, 0x40, 0xe4, 0xd8, 0x0e, 0x9d,
+	0x0a, 0x25, 0x85, 0xa9, 0xa4, 0xcc, 0xa5, 0x60, 0x4a, 0x83, 0x59, 0x80, 0xdd, 0x08, 0x45, 0xfe,
+	0x6d, 0x52, 0xbd, 0x66, 0x50, 0x6a, 0xf7, 0xae, 0x59, 0xdc, 0xfd, 0xb4, 0x86, 0xd7, 0x47, 0xc1,
+	0x6d, 0xaf, 0x31, 0x7b, 0xd5, 0x78, 0x91, 0x6f, 0x08, 0xaf, 0x3d, 0xcf, 0xad, 0x3b, 0x52, 0x12,
+	0x2c, 0xd9, 0xa5, 0xab, 0x32, 0xa3, 0xf3, 0xe2, 0x97, 0xf0, 0xb6, 0x02, 0xeb, 0xfa, 0xc3, 0x4e,
+	0x1a, 0xab, 0x95, 0xb4, 0x90, 0x6c, 0x7f, 0xfc, 0xf5, 0xfb, 0xeb, 0x85, 0x2d, 0xb2, 0x51, 0x07,
+	0xf1, 0x41, 0xf2, 0x12, 0x1e, 0x69, 0xa3, 0xde, 0xc0, 0xd4, 0x59, 0x96, 0x1e, 0xb3, 0xf7, 0x9e,
+	0xe6, 0x07, 0xc2, 0x78, 0x1f, 0x5c, 0x20, 0x26, 0x2d, 0x8c, 0xfe, 0x56, 0x47, 0xba, 0x9d, 0xd5,
+	0xa2, 0xa0, 0x48, 0x6e, 0x79, 0xa6, 0x94, 0x5c, 0x5f, 0xc6, 0xd4, 0x20, 0xb1, 0x34, 0x6e, 0x60,
+	0x8d, 0x49, 0x7e, 0x22, 0x7c, 0xa9, 0xfe, 0xb7, 0xd0, 0xc1, 0x92, 0xdb, 0xed, 0xb2, 0x88, 0xf5,
+	0x11, 0xf2, 0x4e, 0x57, 0x59, 0x48, 0x71, 0xe0, 0x89, 0x6f, 0x90, 0x9d, 0xe5, 0x29, 0x72, 0x21,
+	0x0c, 0x08, 0xee, 0x20, 0x9b, 0x53, 0x93, 0x13, 0x84, 0x7b, 0x7b, 0x06, 0xb8, 0x8b, 0x07, 0x81,
+	0xb4, 0x30, 0x5f, 0x10, 0x9c, 0x23, 0xd9, 0xc0, 0x99, 0x5c, 0x3b, 0x2b, 0xd9, 0xe3, 0x39, 0xe4,
+	0x7d, 0x94, 0x92, 0xef, 0x08, 0xf7, 0x0e, 0x75, 0x76, 0x8a, 0xb3, 0xbd, 0x5f, 0x17, 0xb4, 0xa1,
+	0x47, 0xbb, 0xd9, 0x6f, 0xbd, 0xe9, 0x35, 0xdc, 0x17, 0x84, 0x7b, 0x4f, 0xa0, 0x80, 0x4e, 0x21,
+	0x2e, 0x08, 0x62, 0x88, 0xeb, 0x51, 0x17, 0xef, 0x2d, 0x7d, 0x5a, 0xdf, 0xdb, 0x78, 0x16, 0xd3,
+	0xf6, 0x67, 0xf1, 0x04, 0xe1, 0xcb, 0x87, 0x32, 0x5b, 0xa0, 0xba, 0xbb, 0x9a, 0xea, 0x1f, 0x49,
+	0xe4, 0xda, 0x8a, 0xca, 0x53, 0x43, 0x87, 0xbe, 0x88, 0x43, 0x27, 0xb9, 0xe7, 0xf1, 0x86, 0xc9,
+	0xa0, 0x75, 0x6a, 0x55, 0xf0, 0x19, 0x7d, 0x46, 0xf8, 0xea, 0x54, 0x95, 0x2b, 0xc9, 0x46, 0x9b,
+	0xcb, 0x27, 0x96, 0x3d, 0xa8, 0x93, 0x3a, 0x40, 0x47, 0xfb, 0xa1, 0x83, 0x50, 0x05, 0x97, 0x82,
+	0x2a, 0x23, 0x98, 0x00, 0xe9, 0x73, 0x64, 0xcd, 0x12, 0xd7, 0xb9, 0xfd, 0xff, 0xfc, 0x7d, 0x10,
+	0x1e, 0x27, 0x17, 0xbd, 0x66, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x50, 0x92, 0x91, 0x86, 0x71,
+	0x06, 0x00, 0x00,
+}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -441,44 +482,3 @@ var _BigtableClusterService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto", fileDescriptor_bigtable_cluster_service_b6e5a4d5a86f8b34)
-}
-
-var fileDescriptor_bigtable_cluster_service_b6e5a4d5a86f8b34 = []byte{
-	// 515 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x6b, 0x14, 0x31,
-	0x18, 0xc6, 0x89, 0x07, 0xa1, 0xc1, 0x45, 0xc8, 0xa1, 0x87, 0x6d, 0x0b, 0x32, 0x15, 0xb1, 0x23,
-	0x26, 0x6e, 0x17, 0xc5, 0xbf, 0x08, 0x5b, 0xa5, 0x1e, 0x04, 0x8b, 0xd2, 0x4b, 0x2f, 0x4b, 0x76,
-	0xe7, 0x35, 0x8c, 0xcc, 0x24, 0x31, 0xc9, 0x2c, 0xa8, 0xf4, 0xe2, 0xcd, 0x93, 0x88, 0x27, 0x3d,
-	0x78, 0xeb, 0xdd, 0xef, 0xe2, 0x57, 0xf0, 0x83, 0xc8, 0x64, 0x92, 0xb5, 0x2b, 0x6b, 0x77, 0xa6,
-	0xb7, 0x99, 0xc9, 0xfb, 0xbc, 0xcf, 0x6f, 0x9e, 0x24, 0x2f, 0x7e, 0x2c, 0x94, 0x12, 0x05, 0xb0,
-	0x49, 0x2e, 0x1c, 0x9f, 0x14, 0xc0, 0x78, 0x56, 0xe6, 0x92, 0x4d, 0x8b, 0xca, 0x3a, 0x30, 0x6c,
-	0x36, 0x98, 0xaf, 0x8c, 0xc3, 0xb7, 0xb1, 0x05, 0x33, 0xcb, 0xa7, 0x40, 0xb5, 0x51, 0x4e, 0x91,
-	0x2b, 0x4d, 0x03, 0x1a, 0xcb, 0xa8, 0x6f, 0x40, 0x43, 0x31, 0x9d, 0x0d, 0xfa, 0x9b, 0xc1, 0x82,
-	0xeb, 0x9c, 0x71, 0x29, 0x95, 0xe3, 0x2e, 0x57, 0xd2, 0x36, 0xfa, 0xfe, 0xc3, 0xee, 0x00, 0x19,
-	0x77, 0x3c, 0xa8, 0x9f, 0x9d, 0x1b, 0x7f, 0x5c, 0x82, 0xb5, 0x5c, 0x40, 0xe4, 0xd8, 0x0e, 0x9d,
-	0x0a, 0x25, 0x85, 0xa9, 0xa4, 0xcc, 0xa5, 0x60, 0x4a, 0x83, 0x59, 0x80, 0xdd, 0x08, 0x45, 0xfe,
-	0x6d, 0x52, 0xbd, 0x66, 0x50, 0x6a, 0xf7, 0xae, 0x59, 0xdc, 0xfd, 0xb4, 0x86, 0xd7, 0x47, 0xc1,
-	0x6d, 0xaf, 0x31, 0x7b, 0xd5, 0x78, 0x91, 0x6f, 0x08, 0xaf, 0x3d, 0xcf, 0xad, 0x3b, 0x52, 0x12,
-	0x2c, 0xd9, 0xa5, 0xab, 0x32, 0xa3, 0xf3, 0xe2, 0x97, 0xf0, 0xb6, 0x02, 0xeb, 0xfa, 0xc3, 0x4e,
-	0x1a, 0xab, 0x95, 0xb4, 0x90, 0x6c, 0x7f, 0xfc, 0xf5, 0xfb, 0xeb, 0x85, 0x2d, 0xb2, 0x51, 0x07,
-	0xf1, 0x41, 0xf2, 0x12, 0x1e, 0x69, 0xa3, 0xde, 0xc0, 0xd4, 0x59, 0x96, 0x1e, 0xb3, 0xf7, 0x9e,
-	0xe6, 0x07, 0xc2, 0x78, 0x1f, 0x5c, 0x20, 0x26, 0x2d, 0x8c, 0xfe, 0x56, 0x47, 0xba, 0x9d, 0xd5,
-	0xa2, 0xa0, 0x48, 0x6e, 0x79, 0xa6, 0x94, 0x5c, 0x5f, 0xc6, 0xd4, 0x20, 0xb1, 0x34, 0x6e, 0x60,
-	0x8d, 0x49, 0x7e, 0x22, 0x7c, 0xa9, 0xfe, 0xb7, 0xd0, 0xc1, 0x92, 0xdb, 0xed, 0xb2, 0x88, 0xf5,
-	0x11, 0xf2, 0x4e, 0x57, 0x59, 0x48, 0x71, 0xe0, 0x89, 0x6f, 0x90, 0x9d, 0xe5, 0x29, 0x72, 0x21,
-	0x0c, 0x08, 0xee, 0x20, 0x9b, 0x53, 0x93, 0x13, 0x84, 0x7b, 0x7b, 0x06, 0xb8, 0x8b, 0x07, 0x81,
-	0xb4, 0x30, 0x5f, 0x10, 0x9c, 0x23, 0xd9, 0xc0, 0x99, 0x5c, 0x3b, 0x2b, 0xd9, 0xe3, 0x39, 0xe4,
-	0x7d, 0x94, 0x92, 0xef, 0x08, 0xf7, 0x0e, 0x75, 0x76, 0x8a, 0xb3, 0xbd, 0x5f, 0x17, 0xb4, 0xa1,
-	0x47, 0xbb, 0xd9, 0x6f, 0xbd, 0xe9, 0x35, 0xdc, 0x17, 0x84, 0x7b, 0x4f, 0xa0, 0x80, 0x4e, 0x21,
-	0x2e, 0x08, 0x62, 0x88, 0xeb, 0x51, 0x17, 0xef, 0x2d, 0x7d, 0x5a, 0xdf, 0xdb, 0x78, 0x16, 0xd3,
-	0xf6, 0x67, 0xf1, 0x04, 0xe1, 0xcb, 0x87, 0x32, 0x5b, 0xa0, 0xba, 0xbb, 0x9a, 0xea, 0x1f, 0x49,
-	0xe4, 0xda, 0x8a, 0xca, 0x53, 0x43, 0x87, 0xbe, 0x88, 0x43, 0x27, 0xb9, 0xe7, 0xf1, 0x86, 0xc9,
-	0xa0, 0x75, 0x6a, 0x55, 0xf0, 0x19, 0x7d, 0x46, 0xf8, 0xea, 0x54, 0x95, 0x2b, 0xc9, 0x46, 0x9b,
-	0xcb, 0x27, 0x96, 0x3d, 0xa8, 0x93, 0x3a, 0x40, 0x47, 0xfb, 0xa1, 0x83, 0x50, 0x05, 0x97, 0x82,
-	0x2a, 0x23, 0x98, 0x00, 0xe9, 0x73, 0x64, 0xcd, 0x12, 0xd7, 0xb9, 0xfd, 0xff, 0xfc, 0x7d, 0x10,
-	0x1e, 0x27, 0x17, 0xbd, 0x66, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x50, 0x92, 0x91, 0x86, 0x71,
-	0x06, 0x00, 0x00,
-}
diff --git a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
index ef17edca95..4ce7fb8746 100644
--- a/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
+++ b/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto
 
-package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
+package cluster
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for BigtableClusterService.ListZones.
 type ListZonesRequest struct {
@@ -34,16 +37,17 @@ func (m *ListZonesRequest) Reset()         { *m = ListZonesRequest{} }
 func (m *ListZonesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListZonesRequest) ProtoMessage()    {}
 func (*ListZonesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{0}
+	return fileDescriptor_2a8715cfb8408734, []int{0}
 }
+
 func (m *ListZonesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListZonesRequest.Unmarshal(m, b)
 }
 func (m *ListZonesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListZonesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListZonesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListZonesRequest.Merge(dst, src)
+func (m *ListZonesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListZonesRequest.Merge(m, src)
 }
 func (m *ListZonesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListZonesRequest.Size(m)
@@ -74,16 +78,17 @@ func (m *ListZonesResponse) Reset()         { *m = ListZonesResponse{} }
 func (m *ListZonesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListZonesResponse) ProtoMessage()    {}
 func (*ListZonesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{1}
+	return fileDescriptor_2a8715cfb8408734, []int{1}
 }
+
 func (m *ListZonesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListZonesResponse.Unmarshal(m, b)
 }
 func (m *ListZonesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListZonesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListZonesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListZonesResponse.Merge(dst, src)
+func (m *ListZonesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListZonesResponse.Merge(m, src)
 }
 func (m *ListZonesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListZonesResponse.Size(m)
@@ -115,16 +120,17 @@ func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
 func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterRequest) ProtoMessage()    {}
 func (*GetClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{2}
+	return fileDescriptor_2a8715cfb8408734, []int{2}
 }
+
 func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
 }
 func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+func (m *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(m, src)
 }
 func (m *GetClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClusterRequest.Size(m)
@@ -156,16 +162,17 @@ func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
 func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListClustersRequest) ProtoMessage()    {}
 func (*ListClustersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{3}
+	return fileDescriptor_2a8715cfb8408734, []int{3}
 }
+
 func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
 }
 func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+func (m *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(m, src)
 }
 func (m *ListClustersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListClustersRequest.Size(m)
@@ -198,16 +205,17 @@ func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
 func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListClustersResponse) ProtoMessage()    {}
 func (*ListClustersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{4}
+	return fileDescriptor_2a8715cfb8408734, []int{4}
 }
+
 func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
 }
 func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+func (m *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(m, src)
 }
 func (m *ListClustersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListClustersResponse.Size(m)
@@ -254,16 +262,17 @@ func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
 func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterRequest) ProtoMessage()    {}
 func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{5}
+	return fileDescriptor_2a8715cfb8408734, []int{5}
 }
+
 func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
 }
 func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+func (m *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(m, src)
 }
 func (m *CreateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterRequest.Size(m)
@@ -313,16 +322,17 @@ func (m *CreateClusterMetadata) Reset()         { *m = CreateClusterMetadata{} }
 func (m *CreateClusterMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterMetadata) ProtoMessage()    {}
 func (*CreateClusterMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{6}
+	return fileDescriptor_2a8715cfb8408734, []int{6}
 }
+
 func (m *CreateClusterMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterMetadata.Unmarshal(m, b)
 }
 func (m *CreateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterMetadata.Merge(dst, src)
+func (m *CreateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterMetadata.Merge(m, src)
 }
 func (m *CreateClusterMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterMetadata.Size(m)
@@ -376,16 +386,17 @@ func (m *UpdateClusterMetadata) Reset()         { *m = UpdateClusterMetadata{} }
 func (m *UpdateClusterMetadata) String() string { return proto.CompactTextString(m) }
 func (*UpdateClusterMetadata) ProtoMessage()    {}
 func (*UpdateClusterMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{7}
+	return fileDescriptor_2a8715cfb8408734, []int{7}
 }
+
 func (m *UpdateClusterMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateClusterMetadata.Unmarshal(m, b)
 }
 func (m *UpdateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateClusterMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UpdateClusterMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateClusterMetadata.Merge(dst, src)
+func (m *UpdateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterMetadata.Merge(m, src)
 }
 func (m *UpdateClusterMetadata) XXX_Size() int {
 	return xxx_messageInfo_UpdateClusterMetadata.Size(m)
@@ -438,16 +449,17 @@ func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
 func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteClusterRequest) ProtoMessage()    {}
 func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{8}
+	return fileDescriptor_2a8715cfb8408734, []int{8}
 }
+
 func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+func (m *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(m, src)
 }
 func (m *DeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteClusterRequest.Size(m)
@@ -479,16 +491,17 @@ func (m *UndeleteClusterRequest) Reset()         { *m = UndeleteClusterRequest{}
 func (m *UndeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*UndeleteClusterRequest) ProtoMessage()    {}
 func (*UndeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{9}
+	return fileDescriptor_2a8715cfb8408734, []int{9}
 }
+
 func (m *UndeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *UndeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UndeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeleteClusterRequest.Merge(dst, src)
+func (m *UndeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteClusterRequest.Merge(m, src)
 }
 func (m *UndeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_UndeleteClusterRequest.Size(m)
@@ -522,16 +535,17 @@ func (m *UndeleteClusterMetadata) Reset()         { *m = UndeleteClusterMetadata
 func (m *UndeleteClusterMetadata) String() string { return proto.CompactTextString(m) }
 func (*UndeleteClusterMetadata) ProtoMessage()    {}
 func (*UndeleteClusterMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{10}
+	return fileDescriptor_2a8715cfb8408734, []int{10}
 }
+
 func (m *UndeleteClusterMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeleteClusterMetadata.Unmarshal(m, b)
 }
 func (m *UndeleteClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeleteClusterMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UndeleteClusterMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeleteClusterMetadata.Merge(dst, src)
+func (m *UndeleteClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteClusterMetadata.Merge(m, src)
 }
 func (m *UndeleteClusterMetadata) XXX_Size() int {
 	return xxx_messageInfo_UndeleteClusterMetadata.Size(m)
@@ -568,16 +582,17 @@ func (m *V2OperationMetadata) Reset()         { *m = V2OperationMetadata{} }
 func (m *V2OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*V2OperationMetadata) ProtoMessage()    {}
 func (*V2OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0, []int{11}
+	return fileDescriptor_2a8715cfb8408734, []int{11}
 }
+
 func (m *V2OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_V2OperationMetadata.Unmarshal(m, b)
 }
 func (m *V2OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_V2OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *V2OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_V2OperationMetadata.Merge(dst, src)
+func (m *V2OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_V2OperationMetadata.Merge(m, src)
 }
 func (m *V2OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_V2OperationMetadata.Size(m)
@@ -604,10 +619,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto", fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0)
+	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto", fileDescriptor_2a8715cfb8408734)
 }
 
-var fileDescriptor_bigtable_cluster_service_messages_b1fb635d2f4efcd0 = []byte{
+var fileDescriptor_2a8715cfb8408734 = []byte{
 	// 541 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x40,
 	0x10, 0xd5, 0x26, 0xe5, 0xa3, 0xe3, 0x4a, 0xb4, 0x6e, 0x02, 0x51, 0x24, 0x44, 0x64, 0x50, 0x69,
diff --git a/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go b/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
index 6c1057b8de..4286ddb5ef 100644
--- a/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
+++ b/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_data.proto
 
-package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
+package table
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Table_TimestampGranularity int32
 
@@ -29,6 +32,7 @@ const (
 var Table_TimestampGranularity_name = map[int32]string{
 	0: "MILLIS",
 }
+
 var Table_TimestampGranularity_value = map[string]int32{
 	"MILLIS": 0,
 }
@@ -36,8 +40,9 @@ var Table_TimestampGranularity_value = map[string]int32{
 func (x Table_TimestampGranularity) String() string {
 	return proto.EnumName(Table_TimestampGranularity_name, int32(x))
 }
+
 func (Table_TimestampGranularity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_data_1213651e7f65c4a9, []int{0, 0}
+	return fileDescriptor_b9ed6c4c9bdaf892, []int{0, 0}
 }
 
 // A collection of user data indexed by row, column, and timestamp.
@@ -65,16 +70,17 @@ func (m *Table) Reset()         { *m = Table{} }
 func (m *Table) String() string { return proto.CompactTextString(m) }
 func (*Table) ProtoMessage()    {}
 func (*Table) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_data_1213651e7f65c4a9, []int{0}
+	return fileDescriptor_b9ed6c4c9bdaf892, []int{0}
 }
+
 func (m *Table) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Table.Unmarshal(m, b)
 }
 func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
 }
-func (dst *Table) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Table.Merge(dst, src)
+func (m *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(m, src)
 }
 func (m *Table) XXX_Size() int {
 	return xxx_messageInfo_Table.Size(m)
@@ -162,16 +168,17 @@ func (m *ColumnFamily) Reset()         { *m = ColumnFamily{} }
 func (m *ColumnFamily) String() string { return proto.CompactTextString(m) }
 func (*ColumnFamily) ProtoMessage()    {}
 func (*ColumnFamily) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_data_1213651e7f65c4a9, []int{1}
+	return fileDescriptor_b9ed6c4c9bdaf892, []int{1}
 }
+
 func (m *ColumnFamily) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColumnFamily.Unmarshal(m, b)
 }
 func (m *ColumnFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColumnFamily.Marshal(b, m, deterministic)
 }
-func (dst *ColumnFamily) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColumnFamily.Merge(dst, src)
+func (m *ColumnFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnFamily.Merge(m, src)
 }
 func (m *ColumnFamily) XXX_Size() int {
 	return xxx_messageInfo_ColumnFamily.Size(m)
@@ -220,16 +227,17 @@ func (m *GcRule) Reset()         { *m = GcRule{} }
 func (m *GcRule) String() string { return proto.CompactTextString(m) }
 func (*GcRule) ProtoMessage()    {}
 func (*GcRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_data_1213651e7f65c4a9, []int{2}
+	return fileDescriptor_b9ed6c4c9bdaf892, []int{2}
 }
+
 func (m *GcRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcRule.Unmarshal(m, b)
 }
 func (m *GcRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcRule.Marshal(b, m, deterministic)
 }
-func (dst *GcRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcRule.Merge(dst, src)
+func (m *GcRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule.Merge(m, src)
 }
 func (m *GcRule) XXX_Size() int {
 	return xxx_messageInfo_GcRule.Size(m)
@@ -303,9 +311,9 @@ func (m *GcRule) GetUnion() *GcRule_Union {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GcRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GcRule_OneofMarshaler, _GcRule_OneofUnmarshaler, _GcRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GcRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GcRule_MaxNumVersions)(nil),
 		(*GcRule_MaxAge)(nil),
 		(*GcRule_Intersection_)(nil),
@@ -313,103 +321,6 @@ func (*GcRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _GcRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GcRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *GcRule_MaxNumVersions:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MaxNumVersions))
-	case *GcRule_MaxAge:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MaxAge); err != nil {
-			return err
-		}
-	case *GcRule_Intersection_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Intersection); err != nil {
-			return err
-		}
-	case *GcRule_Union_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Union); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GcRule.Rule has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GcRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GcRule)
-	switch tag {
-	case 1: // rule.max_num_versions
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Rule = &GcRule_MaxNumVersions{int32(x)}
-		return true, err
-	case 2: // rule.max_age
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.Rule = &GcRule_MaxAge{msg}
-		return true, err
-	case 3: // rule.intersection
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcRule_Intersection)
-		err := b.DecodeMessage(msg)
-		m.Rule = &GcRule_Intersection_{msg}
-		return true, err
-	case 4: // rule.union
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcRule_Union)
-		err := b.DecodeMessage(msg)
-		m.Rule = &GcRule_Union_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GcRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GcRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *GcRule_MaxNumVersions:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.MaxNumVersions))
-	case *GcRule_MaxAge:
-		s := proto.Size(x.MaxAge)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GcRule_Intersection_:
-		s := proto.Size(x.Intersection)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GcRule_Union_:
-		s := proto.Size(x.Union)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A GcRule which deletes cells matching all of the given rules.
 type GcRule_Intersection struct {
 	// Only delete cells which would be deleted by every element of `rules`.
@@ -423,16 +334,17 @@ func (m *GcRule_Intersection) Reset()         { *m = GcRule_Intersection{} }
 func (m *GcRule_Intersection) String() string { return proto.CompactTextString(m) }
 func (*GcRule_Intersection) ProtoMessage()    {}
 func (*GcRule_Intersection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_data_1213651e7f65c4a9, []int{2, 0}
+	return fileDescriptor_b9ed6c4c9bdaf892, []int{2, 0}
 }
+
 func (m *GcRule_Intersection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcRule_Intersection.Unmarshal(m, b)
 }
 func (m *GcRule_Intersection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcRule_Intersection.Marshal(b, m, deterministic)
 }
-func (dst *GcRule_Intersection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcRule_Intersection.Merge(dst, src)
+func (m *GcRule_Intersection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Intersection.Merge(m, src)
 }
 func (m *GcRule_Intersection) XXX_Size() int {
 	return xxx_messageInfo_GcRule_Intersection.Size(m)
@@ -463,16 +375,17 @@ func (m *GcRule_Union) Reset()         { *m = GcRule_Union{} }
 func (m *GcRule_Union) String() string { return proto.CompactTextString(m) }
 func (*GcRule_Union) ProtoMessage()    {}
 func (*GcRule_Union) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_data_1213651e7f65c4a9, []int{2, 1}
+	return fileDescriptor_b9ed6c4c9bdaf892, []int{2, 1}
 }
+
 func (m *GcRule_Union) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcRule_Union.Unmarshal(m, b)
 }
 func (m *GcRule_Union) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcRule_Union.Marshal(b, m, deterministic)
 }
-func (dst *GcRule_Union) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcRule_Union.Merge(dst, src)
+func (m *GcRule_Union) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Union.Merge(m, src)
 }
 func (m *GcRule_Union) XXX_Size() int {
 	return xxx_messageInfo_GcRule_Union.Size(m)
@@ -491,20 +404,20 @@ func (m *GcRule_Union) GetRules() []*GcRule {
 }
 
 func init() {
+	proto.RegisterEnum("google.bigtable.admin.table.v1.Table_TimestampGranularity", Table_TimestampGranularity_name, Table_TimestampGranularity_value)
 	proto.RegisterType((*Table)(nil), "google.bigtable.admin.table.v1.Table")
 	proto.RegisterMapType((map[string]*ColumnFamily)(nil), "google.bigtable.admin.table.v1.Table.ColumnFamiliesEntry")
 	proto.RegisterType((*ColumnFamily)(nil), "google.bigtable.admin.table.v1.ColumnFamily")
 	proto.RegisterType((*GcRule)(nil), "google.bigtable.admin.table.v1.GcRule")
 	proto.RegisterType((*GcRule_Intersection)(nil), "google.bigtable.admin.table.v1.GcRule.Intersection")
 	proto.RegisterType((*GcRule_Union)(nil), "google.bigtable.admin.table.v1.GcRule.Union")
-	proto.RegisterEnum("google.bigtable.admin.table.v1.Table_TimestampGranularity", Table_TimestampGranularity_name, Table_TimestampGranularity_value)
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_data.proto", fileDescriptor_bigtable_table_data_1213651e7f65c4a9)
+	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_data.proto", fileDescriptor_b9ed6c4c9bdaf892)
 }
 
-var fileDescriptor_bigtable_table_data_1213651e7f65c4a9 = []byte{
+var fileDescriptor_b9ed6c4c9bdaf892 = []byte{
 	// 579 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x61, 0x6b, 0xd3, 0x40,
 	0x18, 0xc7, 0x9b, 0xa5, 0xed, 0xd8, 0xb3, 0x3a, 0xeb, 0x29, 0x52, 0x0b, 0x4a, 0xc9, 0x40, 0x8a,
diff --git a/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go b/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
index f2c91fc72e..f52bf39409 100644
--- a/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
+++ b/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_service.proto
 
-package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package table
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,50 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+func init() {
+	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service.proto", fileDescriptor_3185ad3e7140bd14)
+}
+
+var fileDescriptor_3185ad3e7140bd14 = []byte{
+	// 560 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xbf, 0x6f, 0xd4, 0x30,
+	0x14, 0xc7, 0x65, 0x06, 0x84, 0x7c, 0x88, 0xc1, 0x42, 0x0c, 0x07, 0x62, 0x88, 0xc4, 0x12, 0xa1,
+	0x58, 0xb9, 0x82, 0x68, 0xaf, 0xaa, 0x84, 0x72, 0xd7, 0x56, 0xa2, 0x20, 0x95, 0x03, 0x16, 0x96,
+	0xca, 0xc9, 0x3d, 0xa2, 0x40, 0x62, 0x87, 0xd8, 0x39, 0x54, 0x50, 0x17, 0x16, 0xfe, 0x00, 0x58,
+	0x61, 0x62, 0x64, 0x82, 0x1d, 0x76, 0x56, 0xfe, 0x05, 0xfe, 0x10, 0x14, 0x3b, 0xa1, 0x69, 0xf9,
+	0xe1, 0x73, 0xd5, 0x25, 0xe7, 0xb3, 0xbf, 0xdf, 0xf7, 0x3e, 0xcf, 0x7e, 0x96, 0xf1, 0x7a, 0x2a,
+	0x44, 0x9a, 0x03, 0x8d, 0xb3, 0x54, 0xb1, 0x38, 0x07, 0xca, 0xe6, 0x45, 0xc6, 0xa9, 0x19, 0x2f,
+	0xc2, 0xdf, 0xf3, 0x7b, 0xe6, 0x2b, 0xa1, 0x5a, 0x64, 0x09, 0x04, 0x65, 0x25, 0x94, 0x20, 0x57,
+	0x8d, 0x39, 0xe8, 0x44, 0x81, 0x36, 0x07, 0x66, 0xbc, 0x08, 0x87, 0x57, 0xda, 0xe0, 0xac, 0xcc,
+	0x28, 0xe3, 0x5c, 0x28, 0xa6, 0x32, 0xc1, 0xa5, 0x71, 0x0f, 0x57, 0xdd, 0x52, 0xcf, 0x99, 0x62,
+	0xad, 0x73, 0x7a, 0x22, 0xe8, 0xbd, 0x02, 0xa4, 0x64, 0x29, 0x74, 0xf9, 0x2f, 0xb7, 0x51, 0xf4,
+	0xbf, 0xb8, 0x7e, 0x42, 0xa1, 0x28, 0xd5, 0xbe, 0x59, 0x1c, 0x7d, 0x3d, 0x8f, 0x2f, 0x46, 0x6d,
+	0x98, 0x87, 0xcd, 0xe7, 0x81, 0x09, 0x42, 0x3e, 0x22, 0x3c, 0x98, 0x54, 0xc0, 0x94, 0x99, 0x26,
+	0xa3, 0xe0, 0xff, 0x9b, 0x10, 0xf4, 0xc4, 0x33, 0x78, 0x5e, 0x83, 0x54, 0xc3, 0x6b, 0x36, 0x8f,
+	0x56, 0x7b, 0xe3, 0xd7, 0x3f, 0x7e, 0xbe, 0x3d, 0x73, 0xc3, 0xa3, 0x4d, 0x4d, 0xaf, 0x38, 0x2b,
+	0x60, 0xa3, 0xac, 0xc4, 0x53, 0x48, 0x94, 0xa4, 0x3e, 0x7d, 0x29, 0x38, 0x34, 0xbf, 0x49, 0x5e,
+	0x4b, 0x05, 0x95, 0xa4, 0xfe, 0x81, 0xd9, 0x01, 0x39, 0x46, 0x3e, 0xf9, 0x84, 0x30, 0xbe, 0x9b,
+	0x49, 0xa5, 0x23, 0x49, 0x12, 0xda, 0x32, 0x1e, 0x6a, 0x3b, 0xc8, 0x91, 0x8b, 0x45, 0x96, 0x82,
+	0x4b, 0xf0, 0x6e, 0x69, 0xe2, 0x90, 0xb8, 0x12, 0x93, 0xf7, 0x08, 0x9f, 0xdb, 0x06, 0x13, 0x8e,
+	0x50, 0x5b, 0xe6, 0x4e, 0xe9, 0xb8, 0x9f, 0x6b, 0x9a, 0x6e, 0x85, 0x84, 0x4b, 0xd2, 0xb5, 0x70,
+	0xd4, 0x3f, 0x20, 0xef, 0x10, 0x1e, 0x4c, 0x21, 0x87, 0xa5, 0x4f, 0xbd, 0x27, 0xee, 0x28, 0x2f,
+	0x75, 0x9e, 0xae, 0xe1, 0x82, 0xcd, 0xa6, 0xe1, 0x3a, 0x2c, 0xff, 0x04, 0x58, 0x1f, 0x10, 0x1e,
+	0xcc, 0xa0, 0xb1, 0x2c, 0x89, 0xd5, 0x13, 0xdb, 0xb0, 0x26, 0x1a, 0x6b, 0xc3, 0x5b, 0x75, 0xc6,
+	0x1a, 0x57, 0x3a, 0x4b, 0xd3, 0x86, 0xdf, 0x11, 0x26, 0xe6, 0x02, 0x4c, 0x44, 0x5e, 0x17, 0x7c,
+	0x8b, 0x15, 0x59, 0xbe, 0x4f, 0xd6, 0x96, 0xbb, 0x34, 0x7d, 0x4f, 0x87, 0x7b, 0xdd, 0x6a, 0xed,
+	0x99, 0xbc, 0x1d, 0x5d, 0xc4, 0xa6, 0x77, 0xdb, 0xb9, 0x08, 0x9a, 0x1c, 0xc6, 0xc9, 0xcc, 0x9d,
+	0xfa, 0x86, 0x30, 0x79, 0x54, 0xce, 0x8f, 0x17, 0xe3, 0x44, 0xe4, 0xc8, 0x7f, 0x4f, 0xf3, 0x6f,
+	0x0f, 0x23, 0x57, 0xfe, 0x63, 0xf8, 0xcd, 0xa9, 0x20, 0x9f, 0x7c, 0x41, 0x98, 0x98, 0xce, 0x74,
+	0x3b, 0x8e, 0x3f, 0x3d, 0xb6, 0xee, 0xb9, 0xa3, 0xc1, 0xa7, 0xfe, 0x29, 0x80, 0x93, 0xcf, 0x08,
+	0x5f, 0x88, 0xea, 0xfc, 0x99, 0xa1, 0x98, 0x89, 0x17, 0x92, 0xdc, 0xb4, 0x11, 0x1f, 0xd5, 0xdb,
+	0x68, 0xef, 0x6b, 0xda, 0x1d, 0x6f, 0x4b, 0xd3, 0x9a, 0x57, 0xc3, 0xa9, 0xe3, 0xe3, 0x23, 0xe9,
+	0xc6, 0xc8, 0x8f, 0xde, 0x20, 0xec, 0x25, 0xa2, 0xb0, 0x70, 0x46, 0xc3, 0xbf, 0x3d, 0x32, 0x72,
+	0xb7, 0xc1, 0xdb, 0x45, 0x8f, 0x27, 0xad, 0x3b, 0x15, 0x39, 0xe3, 0x69, 0x20, 0xaa, 0x94, 0xa6,
+	0xc0, 0x35, 0x3c, 0x35, 0x4b, 0xac, 0xcc, 0xe4, 0xbf, 0xde, 0xc1, 0x75, 0x3d, 0x88, 0xcf, 0x6a,
+	0xfd, 0xca, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x65, 0xb4, 0xe0, 0xeb, 0x07, 0x00, 0x00,
+}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -384,46 +427,3 @@ var _BigtableTableService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/bigtable/admin/table/v1/bigtable_table_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service.proto", fileDescriptor_bigtable_table_service_be80dba644cb3823)
-}
-
-var fileDescriptor_bigtable_table_service_be80dba644cb3823 = []byte{
-	// 560 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xbf, 0x6f, 0xd4, 0x30,
-	0x14, 0xc7, 0x65, 0x06, 0x84, 0x7c, 0x88, 0xc1, 0x42, 0x0c, 0x07, 0x62, 0x88, 0xc4, 0x12, 0xa1,
-	0x58, 0xb9, 0x82, 0x68, 0xaf, 0xaa, 0x84, 0x72, 0xd7, 0x56, 0xa2, 0x20, 0x95, 0x03, 0x16, 0x96,
-	0xca, 0xc9, 0x3d, 0xa2, 0x40, 0x62, 0x87, 0xd8, 0x39, 0x54, 0x50, 0x17, 0x16, 0xfe, 0x00, 0x58,
-	0x61, 0x62, 0x64, 0x82, 0x1d, 0x76, 0x56, 0xfe, 0x05, 0xfe, 0x10, 0x14, 0x3b, 0xa1, 0x69, 0xf9,
-	0xe1, 0x73, 0xd5, 0x25, 0xe7, 0xb3, 0xbf, 0xdf, 0xf7, 0x3e, 0xcf, 0x7e, 0x96, 0xf1, 0x7a, 0x2a,
-	0x44, 0x9a, 0x03, 0x8d, 0xb3, 0x54, 0xb1, 0x38, 0x07, 0xca, 0xe6, 0x45, 0xc6, 0xa9, 0x19, 0x2f,
-	0xc2, 0xdf, 0xf3, 0x7b, 0xe6, 0x2b, 0xa1, 0x5a, 0x64, 0x09, 0x04, 0x65, 0x25, 0x94, 0x20, 0x57,
-	0x8d, 0x39, 0xe8, 0x44, 0x81, 0x36, 0x07, 0x66, 0xbc, 0x08, 0x87, 0x57, 0xda, 0xe0, 0xac, 0xcc,
-	0x28, 0xe3, 0x5c, 0x28, 0xa6, 0x32, 0xc1, 0xa5, 0x71, 0x0f, 0x57, 0xdd, 0x52, 0xcf, 0x99, 0x62,
-	0xad, 0x73, 0x7a, 0x22, 0xe8, 0xbd, 0x02, 0xa4, 0x64, 0x29, 0x74, 0xf9, 0x2f, 0xb7, 0x51, 0xf4,
-	0xbf, 0xb8, 0x7e, 0x42, 0xa1, 0x28, 0xd5, 0xbe, 0x59, 0x1c, 0x7d, 0x3d, 0x8f, 0x2f, 0x46, 0x6d,
-	0x98, 0x87, 0xcd, 0xe7, 0x81, 0x09, 0x42, 0x3e, 0x22, 0x3c, 0x98, 0x54, 0xc0, 0x94, 0x99, 0x26,
-	0xa3, 0xe0, 0xff, 0x9b, 0x10, 0xf4, 0xc4, 0x33, 0x78, 0x5e, 0x83, 0x54, 0xc3, 0x6b, 0x36, 0x8f,
-	0x56, 0x7b, 0xe3, 0xd7, 0x3f, 0x7e, 0xbe, 0x3d, 0x73, 0xc3, 0xa3, 0x4d, 0x4d, 0xaf, 0x38, 0x2b,
-	0x60, 0xa3, 0xac, 0xc4, 0x53, 0x48, 0x94, 0xa4, 0x3e, 0x7d, 0x29, 0x38, 0x34, 0xbf, 0x49, 0x5e,
-	0x4b, 0x05, 0x95, 0xa4, 0xfe, 0x81, 0xd9, 0x01, 0x39, 0x46, 0x3e, 0xf9, 0x84, 0x30, 0xbe, 0x9b,
-	0x49, 0xa5, 0x23, 0x49, 0x12, 0xda, 0x32, 0x1e, 0x6a, 0x3b, 0xc8, 0x91, 0x8b, 0x45, 0x96, 0x82,
-	0x4b, 0xf0, 0x6e, 0x69, 0xe2, 0x90, 0xb8, 0x12, 0x93, 0xf7, 0x08, 0x9f, 0xdb, 0x06, 0x13, 0x8e,
-	0x50, 0x5b, 0xe6, 0x4e, 0xe9, 0xb8, 0x9f, 0x6b, 0x9a, 0x6e, 0x85, 0x84, 0x4b, 0xd2, 0xb5, 0x70,
-	0xd4, 0x3f, 0x20, 0xef, 0x10, 0x1e, 0x4c, 0x21, 0x87, 0xa5, 0x4f, 0xbd, 0x27, 0xee, 0x28, 0x2f,
-	0x75, 0x9e, 0xae, 0xe1, 0x82, 0xcd, 0xa6, 0xe1, 0x3a, 0x2c, 0xff, 0x04, 0x58, 0x1f, 0x10, 0x1e,
-	0xcc, 0xa0, 0xb1, 0x2c, 0x89, 0xd5, 0x13, 0xdb, 0xb0, 0x26, 0x1a, 0x6b, 0xc3, 0x5b, 0x75, 0xc6,
-	0x1a, 0x57, 0x3a, 0x4b, 0xd3, 0x86, 0xdf, 0x11, 0x26, 0xe6, 0x02, 0x4c, 0x44, 0x5e, 0x17, 0x7c,
-	0x8b, 0x15, 0x59, 0xbe, 0x4f, 0xd6, 0x96, 0xbb, 0x34, 0x7d, 0x4f, 0x87, 0x7b, 0xdd, 0x6a, 0xed,
-	0x99, 0xbc, 0x1d, 0x5d, 0xc4, 0xa6, 0x77, 0xdb, 0xb9, 0x08, 0x9a, 0x1c, 0xc6, 0xc9, 0xcc, 0x9d,
-	0xfa, 0x86, 0x30, 0x79, 0x54, 0xce, 0x8f, 0x17, 0xe3, 0x44, 0xe4, 0xc8, 0x7f, 0x4f, 0xf3, 0x6f,
-	0x0f, 0x23, 0x57, 0xfe, 0x63, 0xf8, 0xcd, 0xa9, 0x20, 0x9f, 0x7c, 0x41, 0x98, 0x98, 0xce, 0x74,
-	0x3b, 0x8e, 0x3f, 0x3d, 0xb6, 0xee, 0xb9, 0xa3, 0xc1, 0xa7, 0xfe, 0x29, 0x80, 0x93, 0xcf, 0x08,
-	0x5f, 0x88, 0xea, 0xfc, 0x99, 0xa1, 0x98, 0x89, 0x17, 0x92, 0xdc, 0xb4, 0x11, 0x1f, 0xd5, 0xdb,
-	0x68, 0xef, 0x6b, 0xda, 0x1d, 0x6f, 0x4b, 0xd3, 0x9a, 0x57, 0xc3, 0xa9, 0xe3, 0xe3, 0x23, 0xe9,
-	0xc6, 0xc8, 0x8f, 0xde, 0x20, 0xec, 0x25, 0xa2, 0xb0, 0x70, 0x46, 0xc3, 0xbf, 0x3d, 0x32, 0x72,
-	0xb7, 0xc1, 0xdb, 0x45, 0x8f, 0x27, 0xad, 0x3b, 0x15, 0x39, 0xe3, 0x69, 0x20, 0xaa, 0x94, 0xa6,
-	0xc0, 0x35, 0x3c, 0x35, 0x4b, 0xac, 0xcc, 0xe4, 0xbf, 0xde, 0xc1, 0x75, 0x3d, 0x88, 0xcf, 0x6a,
-	0xfd, 0xca, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x65, 0xb4, 0xe0, 0xeb, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go b/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
index 7bf22787df..aab7bc3c91 100644
--- a/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
+++ b/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_service_messages.proto
 
-package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
+package table
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type CreateTableRequest struct {
 	// The unique name of the cluster in which to create the new table.
@@ -52,16 +55,17 @@ func (m *CreateTableRequest) Reset()         { *m = CreateTableRequest{} }
 func (m *CreateTableRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTableRequest) ProtoMessage()    {}
 func (*CreateTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{0}
+	return fileDescriptor_a159d72e7e8b0be6, []int{0}
 }
+
 func (m *CreateTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTableRequest.Unmarshal(m, b)
 }
 func (m *CreateTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTableRequest.Merge(dst, src)
+func (m *CreateTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableRequest.Merge(m, src)
 }
 func (m *CreateTableRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTableRequest.Size(m)
@@ -112,16 +116,17 @@ func (m *ListTablesRequest) Reset()         { *m = ListTablesRequest{} }
 func (m *ListTablesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTablesRequest) ProtoMessage()    {}
 func (*ListTablesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{1}
+	return fileDescriptor_a159d72e7e8b0be6, []int{1}
 }
+
 func (m *ListTablesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTablesRequest.Unmarshal(m, b)
 }
 func (m *ListTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTablesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTablesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTablesRequest.Merge(dst, src)
+func (m *ListTablesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesRequest.Merge(m, src)
 }
 func (m *ListTablesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTablesRequest.Size(m)
@@ -152,16 +157,17 @@ func (m *ListTablesResponse) Reset()         { *m = ListTablesResponse{} }
 func (m *ListTablesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTablesResponse) ProtoMessage()    {}
 func (*ListTablesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{2}
+	return fileDescriptor_a159d72e7e8b0be6, []int{2}
 }
+
 func (m *ListTablesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTablesResponse.Unmarshal(m, b)
 }
 func (m *ListTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTablesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTablesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTablesResponse.Merge(dst, src)
+func (m *ListTablesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesResponse.Merge(m, src)
 }
 func (m *ListTablesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTablesResponse.Size(m)
@@ -191,16 +197,17 @@ func (m *GetTableRequest) Reset()         { *m = GetTableRequest{} }
 func (m *GetTableRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTableRequest) ProtoMessage()    {}
 func (*GetTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{3}
+	return fileDescriptor_a159d72e7e8b0be6, []int{3}
 }
+
 func (m *GetTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTableRequest.Unmarshal(m, b)
 }
 func (m *GetTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTableRequest.Merge(dst, src)
+func (m *GetTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTableRequest.Merge(m, src)
 }
 func (m *GetTableRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTableRequest.Size(m)
@@ -230,16 +237,17 @@ func (m *DeleteTableRequest) Reset()         { *m = DeleteTableRequest{} }
 func (m *DeleteTableRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTableRequest) ProtoMessage()    {}
 func (*DeleteTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{4}
+	return fileDescriptor_a159d72e7e8b0be6, []int{4}
 }
+
 func (m *DeleteTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTableRequest.Unmarshal(m, b)
 }
 func (m *DeleteTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTableRequest.Merge(dst, src)
+func (m *DeleteTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTableRequest.Merge(m, src)
 }
 func (m *DeleteTableRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTableRequest.Size(m)
@@ -272,16 +280,17 @@ func (m *RenameTableRequest) Reset()         { *m = RenameTableRequest{} }
 func (m *RenameTableRequest) String() string { return proto.CompactTextString(m) }
 func (*RenameTableRequest) ProtoMessage()    {}
 func (*RenameTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{5}
+	return fileDescriptor_a159d72e7e8b0be6, []int{5}
 }
+
 func (m *RenameTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RenameTableRequest.Unmarshal(m, b)
 }
 func (m *RenameTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RenameTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *RenameTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RenameTableRequest.Merge(dst, src)
+func (m *RenameTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RenameTableRequest.Merge(m, src)
 }
 func (m *RenameTableRequest) XXX_Size() int {
 	return xxx_messageInfo_RenameTableRequest.Size(m)
@@ -323,16 +332,17 @@ func (m *CreateColumnFamilyRequest) Reset()         { *m = CreateColumnFamilyReq
 func (m *CreateColumnFamilyRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateColumnFamilyRequest) ProtoMessage()    {}
 func (*CreateColumnFamilyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{6}
+	return fileDescriptor_a159d72e7e8b0be6, []int{6}
 }
+
 func (m *CreateColumnFamilyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateColumnFamilyRequest.Unmarshal(m, b)
 }
 func (m *CreateColumnFamilyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateColumnFamilyRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateColumnFamilyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateColumnFamilyRequest.Merge(dst, src)
+func (m *CreateColumnFamilyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateColumnFamilyRequest.Merge(m, src)
 }
 func (m *CreateColumnFamilyRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateColumnFamilyRequest.Size(m)
@@ -376,16 +386,17 @@ func (m *DeleteColumnFamilyRequest) Reset()         { *m = DeleteColumnFamilyReq
 func (m *DeleteColumnFamilyRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteColumnFamilyRequest) ProtoMessage()    {}
 func (*DeleteColumnFamilyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{7}
+	return fileDescriptor_a159d72e7e8b0be6, []int{7}
 }
+
 func (m *DeleteColumnFamilyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteColumnFamilyRequest.Unmarshal(m, b)
 }
 func (m *DeleteColumnFamilyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteColumnFamilyRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteColumnFamilyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteColumnFamilyRequest.Merge(dst, src)
+func (m *DeleteColumnFamilyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteColumnFamilyRequest.Merge(m, src)
 }
 func (m *DeleteColumnFamilyRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteColumnFamilyRequest.Size(m)
@@ -419,16 +430,17 @@ func (m *BulkDeleteRowsRequest) Reset()         { *m = BulkDeleteRowsRequest{} }
 func (m *BulkDeleteRowsRequest) String() string { return proto.CompactTextString(m) }
 func (*BulkDeleteRowsRequest) ProtoMessage()    {}
 func (*BulkDeleteRowsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_service_messages_b4971580659b019f, []int{8}
+	return fileDescriptor_a159d72e7e8b0be6, []int{8}
 }
+
 func (m *BulkDeleteRowsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BulkDeleteRowsRequest.Unmarshal(m, b)
 }
 func (m *BulkDeleteRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BulkDeleteRowsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BulkDeleteRowsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BulkDeleteRowsRequest.Merge(dst, src)
+func (m *BulkDeleteRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BulkDeleteRowsRequest.Merge(m, src)
 }
 func (m *BulkDeleteRowsRequest) XXX_Size() int {
 	return xxx_messageInfo_BulkDeleteRowsRequest.Size(m)
@@ -483,75 +495,14 @@ func (m *BulkDeleteRowsRequest) GetDeleteAllDataFromTable() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BulkDeleteRowsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BulkDeleteRowsRequest_OneofMarshaler, _BulkDeleteRowsRequest_OneofUnmarshaler, _BulkDeleteRowsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BulkDeleteRowsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BulkDeleteRowsRequest_RowKeyPrefix)(nil),
 		(*BulkDeleteRowsRequest_DeleteAllDataFromTable)(nil),
 	}
 }
 
-func _BulkDeleteRowsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BulkDeleteRowsRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *BulkDeleteRowsRequest_RowKeyPrefix:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.RowKeyPrefix)
-	case *BulkDeleteRowsRequest_DeleteAllDataFromTable:
-		t := uint64(0)
-		if x.DeleteAllDataFromTable {
-			t = 1
-		}
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("BulkDeleteRowsRequest.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BulkDeleteRowsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BulkDeleteRowsRequest)
-	switch tag {
-	case 2: // target.row_key_prefix
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Target = &BulkDeleteRowsRequest_RowKeyPrefix{x}
-		return true, err
-	case 3: // target.delete_all_data_from_table
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &BulkDeleteRowsRequest_DeleteAllDataFromTable{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BulkDeleteRowsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BulkDeleteRowsRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *BulkDeleteRowsRequest_RowKeyPrefix:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RowKeyPrefix)))
-		n += len(x.RowKeyPrefix)
-	case *BulkDeleteRowsRequest_DeleteAllDataFromTable:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*CreateTableRequest)(nil), "google.bigtable.admin.table.v1.CreateTableRequest")
 	proto.RegisterType((*ListTablesRequest)(nil), "google.bigtable.admin.table.v1.ListTablesRequest")
@@ -565,10 +516,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service_messages.proto", fileDescriptor_bigtable_table_service_messages_b4971580659b019f)
+	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service_messages.proto", fileDescriptor_a159d72e7e8b0be6)
 }
 
-var fileDescriptor_bigtable_table_service_messages_b4971580659b019f = []byte{
+var fileDescriptor_a159d72e7e8b0be6 = []byte{
 	// 514 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x6e, 0xd3, 0x40,
 	0x10, 0xad, 0x49, 0x1b, 0x92, 0x21, 0x94, 0xb2, 0x52, 0x51, 0x52, 0x09, 0x14, 0x56, 0x2a, 0xe4,
diff --git a/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go b/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
index 4fdfd8347c..2d1e039c41 100644
--- a/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
+++ b/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/bigtable_instance_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for BigtableInstanceAdmin.CreateInstance.
 type CreateInstanceRequest struct {
@@ -56,16 +56,17 @@ func (m *CreateInstanceRequest) Reset()         { *m = CreateInstanceRequest{} }
 func (m *CreateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateInstanceRequest) ProtoMessage()    {}
 func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{0}
+	return fileDescriptor_7e62c0eb67875591, []int{0}
 }
+
 func (m *CreateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstanceRequest.Unmarshal(m, b)
 }
 func (m *CreateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstanceRequest.Merge(dst, src)
+func (m *CreateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceRequest.Merge(m, src)
 }
 func (m *CreateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateInstanceRequest.Size(m)
@@ -118,16 +119,17 @@ func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
 func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInstanceRequest) ProtoMessage()    {}
 func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{1}
+	return fileDescriptor_7e62c0eb67875591, []int{1}
 }
+
 func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
 }
 func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+func (m *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(m, src)
 }
 func (m *GetInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInstanceRequest.Size(m)
@@ -161,16 +163,17 @@ func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
 func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesRequest) ProtoMessage()    {}
 func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{2}
+	return fileDescriptor_7e62c0eb67875591, []int{2}
 }
+
 func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
 }
 func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+func (m *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(m, src)
 }
 func (m *ListInstancesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesRequest.Size(m)
@@ -217,16 +220,17 @@ func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
 func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesResponse) ProtoMessage()    {}
 func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{3}
+	return fileDescriptor_7e62c0eb67875591, []int{3}
 }
+
 func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
 }
 func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+func (m *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(m, src)
 }
 func (m *ListInstancesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesResponse.Size(m)
@@ -274,16 +278,17 @@ func (m *PartialUpdateInstanceRequest) Reset()         { *m = PartialUpdateInsta
 func (m *PartialUpdateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*PartialUpdateInstanceRequest) ProtoMessage()    {}
 func (*PartialUpdateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{4}
+	return fileDescriptor_7e62c0eb67875591, []int{4}
 }
+
 func (m *PartialUpdateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartialUpdateInstanceRequest.Unmarshal(m, b)
 }
 func (m *PartialUpdateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartialUpdateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *PartialUpdateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartialUpdateInstanceRequest.Merge(dst, src)
+func (m *PartialUpdateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartialUpdateInstanceRequest.Merge(m, src)
 }
 func (m *PartialUpdateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_PartialUpdateInstanceRequest.Size(m)
@@ -322,16 +327,17 @@ func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
 func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteInstanceRequest) ProtoMessage()    {}
 func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{5}
+	return fileDescriptor_7e62c0eb67875591, []int{5}
 }
+
 func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
 }
 func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+func (m *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(m, src)
 }
 func (m *DeleteInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
@@ -371,16 +377,17 @@ func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
 func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterRequest) ProtoMessage()    {}
 func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{6}
+	return fileDescriptor_7e62c0eb67875591, []int{6}
 }
+
 func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
 }
 func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+func (m *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(m, src)
 }
 func (m *CreateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterRequest.Size(m)
@@ -426,16 +433,17 @@ func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
 func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterRequest) ProtoMessage()    {}
 func (*GetClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{7}
+	return fileDescriptor_7e62c0eb67875591, []int{7}
 }
+
 func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
 }
 func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+func (m *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(m, src)
 }
 func (m *GetClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClusterRequest.Size(m)
@@ -471,16 +479,17 @@ func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
 func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListClustersRequest) ProtoMessage()    {}
 func (*ListClustersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{8}
+	return fileDescriptor_7e62c0eb67875591, []int{8}
 }
+
 func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
 }
 func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+func (m *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(m, src)
 }
 func (m *ListClustersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListClustersRequest.Size(m)
@@ -526,16 +535,17 @@ func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
 func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListClustersResponse) ProtoMessage()    {}
 func (*ListClustersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{9}
+	return fileDescriptor_7e62c0eb67875591, []int{9}
 }
+
 func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
 }
 func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+func (m *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(m, src)
 }
 func (m *ListClustersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListClustersResponse.Size(m)
@@ -581,16 +591,17 @@ func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
 func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteClusterRequest) ProtoMessage()    {}
 func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{10}
+	return fileDescriptor_7e62c0eb67875591, []int{10}
 }
+
 func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+func (m *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(m, src)
 }
 func (m *DeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteClusterRequest.Size(m)
@@ -625,16 +636,17 @@ func (m *CreateInstanceMetadata) Reset()         { *m = CreateInstanceMetadata{}
 func (m *CreateInstanceMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateInstanceMetadata) ProtoMessage()    {}
 func (*CreateInstanceMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{11}
+	return fileDescriptor_7e62c0eb67875591, []int{11}
 }
+
 func (m *CreateInstanceMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstanceMetadata.Unmarshal(m, b)
 }
 func (m *CreateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstanceMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstanceMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstanceMetadata.Merge(dst, src)
+func (m *CreateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceMetadata.Merge(m, src)
 }
 func (m *CreateInstanceMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateInstanceMetadata.Size(m)
@@ -683,16 +695,17 @@ func (m *UpdateInstanceMetadata) Reset()         { *m = UpdateInstanceMetadata{}
 func (m *UpdateInstanceMetadata) String() string { return proto.CompactTextString(m) }
 func (*UpdateInstanceMetadata) ProtoMessage()    {}
 func (*UpdateInstanceMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{12}
+	return fileDescriptor_7e62c0eb67875591, []int{12}
 }
+
 func (m *UpdateInstanceMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateInstanceMetadata.Unmarshal(m, b)
 }
 func (m *UpdateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateInstanceMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UpdateInstanceMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateInstanceMetadata.Merge(dst, src)
+func (m *UpdateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceMetadata.Merge(m, src)
 }
 func (m *UpdateInstanceMetadata) XXX_Size() int {
 	return xxx_messageInfo_UpdateInstanceMetadata.Size(m)
@@ -741,16 +754,17 @@ func (m *CreateClusterMetadata) Reset()         { *m = CreateClusterMetadata{} }
 func (m *CreateClusterMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterMetadata) ProtoMessage()    {}
 func (*CreateClusterMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{13}
+	return fileDescriptor_7e62c0eb67875591, []int{13}
 }
+
 func (m *CreateClusterMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterMetadata.Unmarshal(m, b)
 }
 func (m *CreateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterMetadata.Merge(dst, src)
+func (m *CreateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterMetadata.Merge(m, src)
 }
 func (m *CreateClusterMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterMetadata.Size(m)
@@ -799,16 +813,17 @@ func (m *UpdateClusterMetadata) Reset()         { *m = UpdateClusterMetadata{} }
 func (m *UpdateClusterMetadata) String() string { return proto.CompactTextString(m) }
 func (*UpdateClusterMetadata) ProtoMessage()    {}
 func (*UpdateClusterMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{14}
+	return fileDescriptor_7e62c0eb67875591, []int{14}
 }
+
 func (m *UpdateClusterMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateClusterMetadata.Unmarshal(m, b)
 }
 func (m *UpdateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateClusterMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UpdateClusterMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateClusterMetadata.Merge(dst, src)
+func (m *UpdateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterMetadata.Merge(m, src)
 }
 func (m *UpdateClusterMetadata) XXX_Size() int {
 	return xxx_messageInfo_UpdateClusterMetadata.Size(m)
@@ -864,16 +879,17 @@ func (m *CreateAppProfileRequest) Reset()         { *m = CreateAppProfileRequest
 func (m *CreateAppProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAppProfileRequest) ProtoMessage()    {}
 func (*CreateAppProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{15}
+	return fileDescriptor_7e62c0eb67875591, []int{15}
 }
+
 func (m *CreateAppProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAppProfileRequest.Unmarshal(m, b)
 }
 func (m *CreateAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAppProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAppProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAppProfileRequest.Merge(dst, src)
+func (m *CreateAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAppProfileRequest.Merge(m, src)
 }
 func (m *CreateAppProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAppProfileRequest.Size(m)
@@ -926,16 +942,17 @@ func (m *GetAppProfileRequest) Reset()         { *m = GetAppProfileRequest{} }
 func (m *GetAppProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAppProfileRequest) ProtoMessage()    {}
 func (*GetAppProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{16}
+	return fileDescriptor_7e62c0eb67875591, []int{16}
 }
+
 func (m *GetAppProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAppProfileRequest.Unmarshal(m, b)
 }
 func (m *GetAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAppProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAppProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAppProfileRequest.Merge(dst, src)
+func (m *GetAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAppProfileRequest.Merge(m, src)
 }
 func (m *GetAppProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAppProfileRequest.Size(m)
@@ -975,16 +992,17 @@ func (m *ListAppProfilesRequest) Reset()         { *m = ListAppProfilesRequest{}
 func (m *ListAppProfilesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAppProfilesRequest) ProtoMessage()    {}
 func (*ListAppProfilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{17}
+	return fileDescriptor_7e62c0eb67875591, []int{17}
 }
+
 func (m *ListAppProfilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAppProfilesRequest.Unmarshal(m, b)
 }
 func (m *ListAppProfilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAppProfilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAppProfilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAppProfilesRequest.Merge(dst, src)
+func (m *ListAppProfilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAppProfilesRequest.Merge(m, src)
 }
 func (m *ListAppProfilesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAppProfilesRequest.Size(m)
@@ -1038,16 +1056,17 @@ func (m *ListAppProfilesResponse) Reset()         { *m = ListAppProfilesResponse
 func (m *ListAppProfilesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAppProfilesResponse) ProtoMessage()    {}
 func (*ListAppProfilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{18}
+	return fileDescriptor_7e62c0eb67875591, []int{18}
 }
+
 func (m *ListAppProfilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAppProfilesResponse.Unmarshal(m, b)
 }
 func (m *ListAppProfilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAppProfilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAppProfilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAppProfilesResponse.Merge(dst, src)
+func (m *ListAppProfilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAppProfilesResponse.Merge(m, src)
 }
 func (m *ListAppProfilesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAppProfilesResponse.Size(m)
@@ -1097,16 +1116,17 @@ func (m *UpdateAppProfileRequest) Reset()         { *m = UpdateAppProfileRequest
 func (m *UpdateAppProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateAppProfileRequest) ProtoMessage()    {}
 func (*UpdateAppProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{19}
+	return fileDescriptor_7e62c0eb67875591, []int{19}
 }
+
 func (m *UpdateAppProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateAppProfileRequest.Unmarshal(m, b)
 }
 func (m *UpdateAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateAppProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateAppProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateAppProfileRequest.Merge(dst, src)
+func (m *UpdateAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAppProfileRequest.Merge(m, src)
 }
 func (m *UpdateAppProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateAppProfileRequest.Size(m)
@@ -1154,16 +1174,17 @@ func (m *DeleteAppProfileRequest) Reset()         { *m = DeleteAppProfileRequest
 func (m *DeleteAppProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAppProfileRequest) ProtoMessage()    {}
 func (*DeleteAppProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{20}
+	return fileDescriptor_7e62c0eb67875591, []int{20}
 }
+
 func (m *DeleteAppProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAppProfileRequest.Unmarshal(m, b)
 }
 func (m *DeleteAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAppProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAppProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAppProfileRequest.Merge(dst, src)
+func (m *DeleteAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAppProfileRequest.Merge(m, src)
 }
 func (m *DeleteAppProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAppProfileRequest.Size(m)
@@ -1199,16 +1220,17 @@ func (m *UpdateAppProfileMetadata) Reset()         { *m = UpdateAppProfileMetada
 func (m *UpdateAppProfileMetadata) String() string { return proto.CompactTextString(m) }
 func (*UpdateAppProfileMetadata) ProtoMessage()    {}
 func (*UpdateAppProfileMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5, []int{21}
+	return fileDescriptor_7e62c0eb67875591, []int{21}
 }
+
 func (m *UpdateAppProfileMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateAppProfileMetadata.Unmarshal(m, b)
 }
 func (m *UpdateAppProfileMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateAppProfileMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UpdateAppProfileMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateAppProfileMetadata.Merge(dst, src)
+func (m *UpdateAppProfileMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAppProfileMetadata.Merge(m, src)
 }
 func (m *UpdateAppProfileMetadata) XXX_Size() int {
 	return xxx_messageInfo_UpdateAppProfileMetadata.Size(m)
@@ -1245,6 +1267,114 @@ func init() {
 	proto.RegisterType((*UpdateAppProfileMetadata)(nil), "google.bigtable.admin.v2.UpdateAppProfileMetadata")
 }
 
+func init() {
+	proto.RegisterFile("google/bigtable/admin/v2/bigtable_instance_admin.proto", fileDescriptor_7e62c0eb67875591)
+}
+
+var fileDescriptor_7e62c0eb67875591 = []byte{
+	// 1592 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x6f, 0xdc, 0x44,
+	0x14, 0xd7, 0xec, 0xb6, 0x25, 0x79, 0x9b, 0x2f, 0x86, 0x26, 0x59, 0xb9, 0x5f, 0xa9, 0x5b, 0xb5,
+	0xe9, 0x36, 0xd8, 0x64, 0x41, 0x6d, 0x95, 0x90, 0x8a, 0x36, 0x2d, 0x51, 0x50, 0x2a, 0xa2, 0x6d,
+	0x29, 0x6a, 0x15, 0xb1, 0x9a, 0x64, 0x27, 0x8b, 0x89, 0xd7, 0x36, 0xb6, 0x37, 0xd0, 0xa2, 0x5e,
+	0x10, 0x42, 0xa8, 0x12, 0x1c, 0x40, 0xe2, 0x52, 0xc1, 0x85, 0x0b, 0xaa, 0x10, 0x88, 0x03, 0xdc,
+	0xb8, 0x82, 0x04, 0x47, 0xfe, 0x02, 0x24, 0xce, 0x88, 0x1b, 0x57, 0x34, 0xe3, 0x19, 0xaf, 0xed,
+	0xb5, 0xd7, 0x4e, 0xab, 0x4a, 0x3d, 0x75, 0x3d, 0xf3, 0xe6, 0xcd, 0xef, 0xbd, 0xf7, 0x7b, 0x6f,
+	0xde, 0x4b, 0xe1, 0x5c, 0xdb, 0xb6, 0xdb, 0x26, 0xd5, 0x37, 0x8d, 0xb6, 0x4f, 0x36, 0x4d, 0xaa,
+	0x93, 0x56, 0xc7, 0xb0, 0xf4, 0xdd, 0x7a, 0xb8, 0xd2, 0x34, 0x2c, 0xcf, 0x27, 0xd6, 0x16, 0x6d,
+	0xf2, 0x2d, 0xcd, 0x71, 0x6d, 0xdf, 0xc6, 0xd5, 0xe0, 0x9c, 0x26, 0xa5, 0xb4, 0x60, 0x73, 0xb7,
+	0xae, 0x1c, 0x16, 0x1a, 0x89, 0x63, 0xe8, 0xc4, 0xb2, 0x6c, 0x9f, 0xf8, 0x86, 0x6d, 0x79, 0xc1,
+	0x39, 0xe5, 0x74, 0xe6, 0x7d, 0xf2, 0x1a, 0x21, 0x78, 0x54, 0x08, 0x1a, 0xa4, 0xa3, 0xef, 0xce,
+	0xb3, 0x7f, 0x9a, 0x8e, 0x6d, 0x1a, 0x5b, 0x77, 0xc4, 0xbe, 0x12, 0xdf, 0x8f, 0xed, 0x9d, 0x10,
+	0x7b, 0xa6, 0x6d, 0xb5, 0xdd, 0xae, 0x65, 0x19, 0x56, 0x5b, 0xb7, 0x1d, 0xea, 0xc6, 0x90, 0x1c,
+	0x12, 0x42, 0xfc, 0x6b, 0xb3, 0xbb, 0xad, 0xd3, 0x8e, 0xe3, 0x4b, 0x0d, 0x33, 0xc9, 0xcd, 0x6d,
+	0x83, 0x9a, 0xad, 0x66, 0x87, 0x78, 0x3b, 0x42, 0xe2, 0x58, 0x52, 0xc2, 0x37, 0x3a, 0xd4, 0xf3,
+	0x49, 0xc7, 0x09, 0x04, 0xd4, 0x3f, 0x4a, 0x30, 0xb9, 0xec, 0x52, 0xe2, 0xd3, 0x55, 0x61, 0x59,
+	0x83, 0xbe, 0xdb, 0xa5, 0x9e, 0x8f, 0xa7, 0xe0, 0x80, 0x43, 0x5c, 0x6a, 0xf9, 0x55, 0x34, 0x83,
+	0x66, 0x87, 0x1b, 0xe2, 0x0b, 0x1f, 0x83, 0x4a, 0xe8, 0x6b, 0xa3, 0x55, 0x2d, 0xf1, 0x4d, 0x90,
+	0x4b, 0xab, 0x2d, 0x7c, 0x11, 0x86, 0xe4, 0x57, 0xb5, 0x3c, 0x83, 0x66, 0x2b, 0x75, 0x55, 0xcb,
+	0x8a, 0x83, 0x16, 0xde, 0x1a, 0x9e, 0xc1, 0xb7, 0x60, 0x68, 0xcb, 0xec, 0x7a, 0x3e, 0x75, 0xbd,
+	0xea, 0xbe, 0x99, 0xf2, 0x6c, 0xa5, 0xbe, 0x94, 0x7d, 0x3e, 0x15, 0xbb, 0xb6, 0x2c, 0xce, 0x5f,
+	0xb5, 0x7c, 0xf7, 0x4e, 0x23, 0x54, 0xa7, 0xbc, 0x05, 0xa3, 0xb1, 0x2d, 0x3c, 0x01, 0xe5, 0x1d,
+	0x7a, 0x47, 0x58, 0xc8, 0x7e, 0xe2, 0xf3, 0xb0, 0x7f, 0x97, 0x98, 0x5d, 0xca, 0x0d, 0xab, 0xd4,
+	0x8f, 0x0f, 0xb8, 0x3a, 0xd0, 0xd4, 0x08, 0xe4, 0x17, 0x4a, 0x17, 0x90, 0x3a, 0x0b, 0x78, 0x85,
+	0xfa, 0x49, 0x4f, 0x62, 0xd8, 0x67, 0x91, 0x0e, 0x15, 0xb7, 0xf0, 0xdf, 0xea, 0x35, 0x38, 0xb8,
+	0x66, 0x78, 0xa1, 0xa8, 0x97, 0xe7, 0xf5, 0x23, 0x00, 0x0e, 0x69, 0xd3, 0xa6, 0x6f, 0xef, 0x50,
+	0x4b, 0x38, 0x7d, 0x98, 0xad, 0xdc, 0x60, 0x0b, 0xea, 0x77, 0x08, 0x26, 0x13, 0xfa, 0x3c, 0xc7,
+	0xb6, 0x3c, 0x8a, 0x5f, 0x81, 0x61, 0xe9, 0x59, 0xaf, 0x8a, 0xb8, 0x3b, 0x8b, 0x84, 0xa3, 0x77,
+	0x08, 0x9f, 0x81, 0x89, 0x6d, 0x62, 0x98, 0xb4, 0xd5, 0x34, 0xed, 0xad, 0x80, 0x9c, 0xd5, 0xd2,
+	0x4c, 0x79, 0x76, 0xb8, 0x31, 0x1e, 0xac, 0xaf, 0xc9, 0x65, 0x7c, 0x0a, 0xc6, 0x2d, 0xfa, 0xbe,
+	0xdf, 0x8c, 0x40, 0x2d, 0x73, 0xa8, 0xa3, 0x6c, 0x79, 0x3d, 0x84, 0xfb, 0x00, 0xc1, 0xe1, 0x75,
+	0xe2, 0xfa, 0x06, 0x31, 0xdf, 0x70, 0x5a, 0x29, 0xe4, 0x8b, 0x72, 0x08, 0x3d, 0x02, 0x87, 0x16,
+	0xa1, 0xd2, 0xe5, 0x8a, 0x79, 0x32, 0x88, 0x58, 0x2a, 0x52, 0x85, 0xcc, 0x06, 0xed, 0x55, 0x96,
+	0x2f, 0xd7, 0x88, 0xb7, 0xd3, 0x80, 0x40, 0x9c, 0xfd, 0x56, 0xcf, 0xc2, 0xe4, 0x15, 0x6a, 0xd2,
+	0x7e, 0x54, 0x69, 0x81, 0xbc, 0x8f, 0xe0, 0x60, 0x40, 0x42, 0xc9, 0x87, 0xfc, 0x48, 0x0a, 0x3e,
+	0xf6, 0xd2, 0x67, 0x58, 0xac, 0xac, 0xb6, 0xf0, 0x22, 0x3c, 0x23, 0x3e, 0x44, 0xf2, 0x14, 0x60,
+	0xa0, 0x3c, 0xa1, 0x9e, 0x86, 0x67, 0x57, 0xa8, 0x9f, 0x00, 0x92, 0x86, 0x7a, 0x0d, 0x9e, 0x63,
+	0x74, 0x91, 0xc9, 0xf0, 0x98, 0xec, 0xfb, 0x16, 0x05, 0x6c, 0xee, 0xa9, 0x13, 0xe4, 0x5b, 0x8a,
+	0xa4, 0x72, 0xc0, 0xbd, 0x02, 0xd6, 0x84, 0x47, 0x9e, 0x04, 0xf3, 0x6a, 0x70, 0x30, 0x88, 0x6d,
+	0x01, 0x27, 0xfd, 0x8b, 0x60, 0x2a, 0x5e, 0x5f, 0xae, 0x51, 0x9f, 0xb4, 0x88, 0x4f, 0xf0, 0x6d,
+	0x98, 0xb0, 0x5d, 0xa3, 0x6d, 0x58, 0xc4, 0x6c, 0xba, 0x81, 0x0a, 0xc1, 0x53, 0x7d, 0x8f, 0xb5,
+	0xaa, 0x31, 0x2e, 0x15, 0x49, 0x28, 0x4b, 0x30, 0x22, 0x54, 0x36, 0x59, 0xb5, 0xce, 0x24, 0xef,
+	0x0d, 0x59, 0xca, 0x1b, 0x15, 0x21, 0xcf, 0x56, 0x18, 0xf5, 0xb7, 0x0d, 0xcb, 0xf0, 0xde, 0x0e,
+	0x4e, 0x97, 0x73, 0x4f, 0x43, 0x20, 0xce, 0x16, 0xd4, 0xff, 0x10, 0x4c, 0xc5, 0x33, 0x32, 0x34,
+	0x99, 0x64, 0x9a, 0x7c, 0x2e, 0xdb, 0xe4, 0x41, 0x49, 0xfe, 0x74, 0x59, 0xfe, 0x0f, 0x92, 0x0f,
+	0xa1, 0x60, 0x46, 0x68, 0xf8, 0xad, 0x4c, 0xc3, 0xb5, 0xbc, 0x58, 0xc7, 0x49, 0xf6, 0x74, 0x19,
+	0xfc, 0x17, 0x82, 0xc9, 0x20, 0x2e, 0x49, 0x83, 0xd7, 0x32, 0x0d, 0x2e, 0x90, 0xbd, 0x4f, 0x95,
+	0x8d, 0xbf, 0x21, 0x98, 0x0e, 0x22, 0x71, 0xc9, 0x71, 0xd6, 0x5d, 0x7b, 0xdb, 0x30, 0x73, 0xfb,
+	0x9b, 0x93, 0x30, 0x46, 0x1c, 0xa7, 0xe9, 0x04, 0xd2, 0xbd, 0x1a, 0x3d, 0x42, 0x42, 0x15, 0xab,
+	0x2d, 0x7c, 0x15, 0x2a, 0x11, 0x29, 0x01, 0xeb, 0x64, 0xb6, 0x7b, 0x22, 0xf7, 0x43, 0x4f, 0x11,
+	0x3e, 0x0d, 0xe3, 0x46, 0xdb, 0xb2, 0x5d, 0xda, 0x7c, 0x8f, 0xb8, 0xac, 0x03, 0x64, 0x2d, 0x0f,
+	0x9a, 0x1d, 0x6a, 0x8c, 0x05, 0xcb, 0x6f, 0x8a, 0x55, 0x56, 0xb7, 0x56, 0xa8, 0xdf, 0x6f, 0x45,
+	0x5a, 0xdd, 0x32, 0x61, 0x8a, 0x55, 0xe3, 0x9e, 0x70, 0x6e, 0x7d, 0x3f, 0x04, 0xbc, 0x9a, 0x37,
+	0x3d, 0xe3, 0x6e, 0x60, 0xcb, 0xfe, 0xc6, 0x10, 0x5b, 0xb8, 0x6e, 0xdc, 0xa5, 0x79, 0xc5, 0xff,
+	0x27, 0x04, 0xd3, 0x7d, 0xd7, 0x89, 0xfa, 0xbf, 0x02, 0x23, 0x11, 0x2f, 0xc9, 0x37, 0xa0, 0x98,
+	0x9b, 0x2a, 0x3d, 0x37, 0xa5, 0x96, 0xf7, 0x52, 0x4a, 0x79, 0x4f, 0x7d, 0x31, 0xca, 0xa9, 0x2f,
+	0x86, 0xfa, 0x2b, 0x82, 0xe9, 0x80, 0xff, 0xfd, 0x5e, 0x4d, 0x44, 0x17, 0x3d, 0x62, 0x74, 0x1f,
+	0xa7, 0x0b, 0x49, 0xa3, 0x46, 0x39, 0x95, 0x1a, 0x37, 0x61, 0x3a, 0x78, 0xd2, 0x0a, 0xb1, 0x23,
+	0x4d, 0x6f, 0x29, 0x55, 0xaf, 0x02, 0xd5, 0xa4, 0x7f, 0x64, 0x89, 0xa8, 0x3f, 0x9c, 0x86, 0xc9,
+	0xcb, 0xc2, 0x0d, 0xb2, 0xac, 0x5f, 0x62, 0xde, 0xc0, 0x9f, 0x21, 0x18, 0x8b, 0x3f, 0x74, 0x78,
+	0xaf, 0x4f, 0xa2, 0x72, 0x44, 0x1e, 0x88, 0x8c, 0x46, 0xda, 0xeb, 0x72, 0x34, 0x52, 0xe7, 0x3e,
+	0xfc, 0xf3, 0xef, 0x2f, 0x4a, 0xa7, 0xd4, 0xe3, 0x6c, 0x20, 0xfb, 0x20, 0xa0, 0xf0, 0x92, 0xe3,
+	0xda, 0xef, 0xd0, 0x2d, 0xdf, 0xd3, 0x6b, 0xf7, 0xc2, 0x21, 0xcd, 0x5b, 0x40, 0x35, 0x7c, 0x1f,
+	0x41, 0x25, 0xd2, 0x94, 0xe3, 0xb9, 0x6c, 0x34, 0xfd, 0xbd, 0xbb, 0x52, 0xa0, 0xed, 0x54, 0xcf,
+	0x70, 0x3c, 0x27, 0x70, 0x80, 0x87, 0x39, 0x39, 0x82, 0xa6, 0x07, 0x46, 0xaf, 0xdd, 0xc3, 0x0f,
+	0x10, 0x8c, 0xc6, 0xfa, 0x74, 0x3c, 0xe0, 0x0d, 0x49, 0x1b, 0x10, 0x14, 0xbd, 0xb0, 0x7c, 0x90,
+	0x83, 0x09, 0x74, 0x83, 0xbc, 0x85, 0x3f, 0x46, 0x30, 0x16, 0x7f, 0xaa, 0x71, 0x01, 0xfb, 0x0b,
+	0xf9, 0x48, 0xc4, 0x4c, 0xc9, 0xf7, 0x11, 0x8b, 0x19, 0x1b, 0x67, 0x52, 0x5b, 0x07, 0xfc, 0x88,
+	0xbd, 0x46, 0x1e, 0xa5, 0x5e, 0xe6, 0xf0, 0xce, 0xd5, 0x6b, 0x1c, 0x5e, 0x38, 0xe4, 0x0f, 0xc4,
+	0xd9, 0x9b, 0x36, 0x3e, 0x42, 0x30, 0x16, 0x9f, 0x18, 0x06, 0x71, 0x3e, 0x75, 0xb6, 0x50, 0xa6,
+	0xfa, 0xca, 0xc2, 0x55, 0x36, 0xe9, 0xcb, 0xf0, 0xd5, 0x0a, 0x90, 0xeb, 0x2b, 0x04, 0xa3, 0xb1,
+	0xbe, 0x03, 0xef, 0xb1, 0x41, 0xc9, 0xf3, 0xd2, 0x12, 0xc7, 0x72, 0x5e, 0x9d, 0x4b, 0xa7, 0x52,
+	0x0c, 0x8d, 0x2e, 0xbb, 0xf8, 0x05, 0x39, 0x9d, 0xe0, 0xcf, 0x11, 0x40, 0x6f, 0x3c, 0xc1, 0x67,
+	0x07, 0x26, 0x62, 0x02, 0x59, 0x7e, 0xe7, 0xa1, 0xbe, 0xc4, 0xd1, 0x69, 0x78, 0x2e, 0xcf, 0x53,
+	0x21, 0x34, 0xe6, 0xb4, 0x6f, 0x10, 0x8c, 0x44, 0x67, 0x17, 0xfc, 0xfc, 0xe0, 0x04, 0x4b, 0x8c,
+	0x4c, 0x8a, 0x56, 0x54, 0x5c, 0xa4, 0x63, 0x1c, 0x65, 0x41, 0x1f, 0xb2, 0x22, 0x36, 0x1a, 0x6b,
+	0xd6, 0x70, 0xbe, 0x43, 0xf2, 0xa2, 0x79, 0x9e, 0x23, 0x99, 0x57, 0xf6, 0xe4, 0x2f, 0x96, 0x9d,
+	0x9f, 0x22, 0x18, 0x8d, 0x0d, 0x51, 0x83, 0x78, 0x96, 0x36, 0x6d, 0x65, 0x92, 0x5d, 0x38, 0xa7,
+	0xb6, 0xb7, 0x10, 0xfe, 0x88, 0x60, 0x22, 0xd9, 0xe5, 0xe1, 0xf9, 0x3c, 0xea, 0xf7, 0xbd, 0x96,
+	0x4a, 0xa1, 0x07, 0x5e, 0xbd, 0xc2, 0x31, 0x5e, 0x54, 0xf5, 0x22, 0x01, 0x8c, 0xf4, 0x30, 0x0b,
+	0xd1, 0x96, 0x02, 0x7f, 0x8d, 0x60, 0x34, 0xd6, 0xd0, 0x0d, 0xf2, 0x61, 0x5a, 0xe7, 0x57, 0x10,
+	0xad, 0x08, 0x32, 0xd6, 0x73, 0x3d, 0x1a, 0x81, 0xca, 0x9c, 0xfa, 0x03, 0x82, 0xf1, 0x44, 0x5b,
+	0x87, 0x5f, 0x18, 0xcc, 0xf5, 0xfe, 0x86, 0x53, 0x99, 0xdf, 0xc3, 0x09, 0x91, 0x20, 0x71, 0xc4,
+	0xc5, 0xfd, 0x8b, 0x7f, 0x46, 0x30, 0x91, 0x6c, 0x58, 0x06, 0xd1, 0x20, 0xa3, 0xf9, 0xcb, 0x4b,
+	0x9b, 0x75, 0x8e, 0xef, 0xb5, 0xfa, 0x22, 0xc7, 0x17, 0x89, 0xa9, 0x56, 0xdc, 0xbb, 0x71, 0x2e,
+	0x7c, 0x89, 0x60, 0x22, 0xd9, 0xc1, 0x0d, 0x02, 0x9e, 0xd1, 0xed, 0x65, 0x66, 0x95, 0xf0, 0x68,
+	0x6d, 0xcf, 0x1c, 0xf8, 0x04, 0xc1, 0x08, 0xeb, 0x89, 0x48, 0x67, 0x9d, 0xff, 0xe1, 0xba, 0xd7,
+	0x0d, 0x18, 0xa4, 0xa3, 0xed, 0xce, 0x6b, 0xd1, 0x4d, 0x89, 0x62, 0x32, 0x21, 0x13, 0xec, 0x86,
+	0x6f, 0x47, 0x9d, 0x83, 0x70, 0xa9, 0x67, 0x77, 0xdd, 0xad, 0xec, 0xc7, 0xb5, 0x1d, 0xd1, 0xcc,
+	0x6a, 0x0e, 0x83, 0x72, 0x7d, 0x10, 0x94, 0xeb, 0x4f, 0x0c, 0x8a, 0x97, 0x80, 0xf2, 0x3d, 0x02,
+	0x7c, 0x83, 0x7a, 0x7c, 0x91, 0xba, 0x1d, 0xc3, 0xf3, 0xf8, 0x5f, 0xa0, 0x66, 0x13, 0x97, 0xf5,
+	0x8b, 0x48, 0x58, 0x67, 0x0a, 0x48, 0x8a, 0x64, 0x58, 0xe6, 0x50, 0x97, 0xd4, 0x0b, 0xc5, 0xa0,
+	0xfa, 0x7d, 0x9a, 0x16, 0x50, 0xed, 0xf2, 0x2f, 0x08, 0x0e, 0x6f, 0xd9, 0x9d, 0x4c, 0x42, 0x5d,
+	0x56, 0x52, 0x5b, 0xf9, 0x75, 0xc6, 0xa2, 0x75, 0x74, 0x7b, 0x49, 0x9c, 0x6b, 0xdb, 0x26, 0xb1,
+	0xda, 0x9a, 0xed, 0xb6, 0xf5, 0x36, 0xb5, 0x38, 0xc7, 0xf4, 0x60, 0x8b, 0x38, 0x86, 0xd7, 0xff,
+	0x7f, 0x25, 0x8b, 0xfc, 0xc7, 0xc3, 0xd2, 0xd1, 0x95, 0xe0, 0xfc, 0xb2, 0x69, 0x77, 0x5b, 0x9a,
+	0xbc, 0x4a, 0xe3, 0x77, 0x68, 0x37, 0xeb, 0xbf, 0x4b, 0x81, 0x0d, 0x2e, 0xb0, 0x21, 0x05, 0x36,
+	0xb8, 0xc0, 0xc6, 0xcd, 0xfa, 0xe6, 0x01, 0x7e, 0xd7, 0x8b, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff,
+	0x5c, 0x29, 0x0c, 0x23, 0x06, 0x1a, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1952,111 +2082,3 @@ var _BigtableInstanceAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/bigtable/admin/v2/bigtable_instance_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/bigtable/admin/v2/bigtable_instance_admin.proto", fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5)
-}
-
-var fileDescriptor_bigtable_instance_admin_7a6cd7ed1a550de5 = []byte{
-	// 1592 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x6f, 0xdc, 0x44,
-	0x14, 0xd7, 0xec, 0xb6, 0x25, 0x79, 0x9b, 0x2f, 0x86, 0x26, 0x59, 0xb9, 0x5f, 0xa9, 0x5b, 0xb5,
-	0xe9, 0x36, 0xd8, 0x64, 0x41, 0x6d, 0x95, 0x90, 0x8a, 0x36, 0x2d, 0x51, 0x50, 0x2a, 0xa2, 0x6d,
-	0x29, 0x6a, 0x15, 0xb1, 0x9a, 0x64, 0x27, 0x8b, 0x89, 0xd7, 0x36, 0xb6, 0x37, 0xd0, 0xa2, 0x5e,
-	0x10, 0x42, 0xa8, 0x12, 0x1c, 0x40, 0xe2, 0x52, 0xc1, 0x85, 0x0b, 0xaa, 0x10, 0x88, 0x03, 0xdc,
-	0xb8, 0x82, 0x04, 0x47, 0xfe, 0x02, 0x24, 0xce, 0x88, 0x1b, 0x57, 0x34, 0xe3, 0x19, 0xaf, 0xed,
-	0xb5, 0xd7, 0x4e, 0xab, 0x4a, 0x3d, 0x75, 0x3d, 0xf3, 0xe6, 0xcd, 0xef, 0xbd, 0xf7, 0x7b, 0x6f,
-	0xde, 0x4b, 0xe1, 0x5c, 0xdb, 0xb6, 0xdb, 0x26, 0xd5, 0x37, 0x8d, 0xb6, 0x4f, 0x36, 0x4d, 0xaa,
-	0x93, 0x56, 0xc7, 0xb0, 0xf4, 0xdd, 0x7a, 0xb8, 0xd2, 0x34, 0x2c, 0xcf, 0x27, 0xd6, 0x16, 0x6d,
-	0xf2, 0x2d, 0xcd, 0x71, 0x6d, 0xdf, 0xc6, 0xd5, 0xe0, 0x9c, 0x26, 0xa5, 0xb4, 0x60, 0x73, 0xb7,
-	0xae, 0x1c, 0x16, 0x1a, 0x89, 0x63, 0xe8, 0xc4, 0xb2, 0x6c, 0x9f, 0xf8, 0x86, 0x6d, 0x79, 0xc1,
-	0x39, 0xe5, 0x74, 0xe6, 0x7d, 0xf2, 0x1a, 0x21, 0x78, 0x54, 0x08, 0x1a, 0xa4, 0xa3, 0xef, 0xce,
-	0xb3, 0x7f, 0x9a, 0x8e, 0x6d, 0x1a, 0x5b, 0x77, 0xc4, 0xbe, 0x12, 0xdf, 0x8f, 0xed, 0x9d, 0x10,
-	0x7b, 0xa6, 0x6d, 0xb5, 0xdd, 0xae, 0x65, 0x19, 0x56, 0x5b, 0xb7, 0x1d, 0xea, 0xc6, 0x90, 0x1c,
-	0x12, 0x42, 0xfc, 0x6b, 0xb3, 0xbb, 0xad, 0xd3, 0x8e, 0xe3, 0x4b, 0x0d, 0x33, 0xc9, 0xcd, 0x6d,
-	0x83, 0x9a, 0xad, 0x66, 0x87, 0x78, 0x3b, 0x42, 0xe2, 0x58, 0x52, 0xc2, 0x37, 0x3a, 0xd4, 0xf3,
-	0x49, 0xc7, 0x09, 0x04, 0xd4, 0x3f, 0x4a, 0x30, 0xb9, 0xec, 0x52, 0xe2, 0xd3, 0x55, 0x61, 0x59,
-	0x83, 0xbe, 0xdb, 0xa5, 0x9e, 0x8f, 0xa7, 0xe0, 0x80, 0x43, 0x5c, 0x6a, 0xf9, 0x55, 0x34, 0x83,
-	0x66, 0x87, 0x1b, 0xe2, 0x0b, 0x1f, 0x83, 0x4a, 0xe8, 0x6b, 0xa3, 0x55, 0x2d, 0xf1, 0x4d, 0x90,
-	0x4b, 0xab, 0x2d, 0x7c, 0x11, 0x86, 0xe4, 0x57, 0xb5, 0x3c, 0x83, 0x66, 0x2b, 0x75, 0x55, 0xcb,
-	0x8a, 0x83, 0x16, 0xde, 0x1a, 0x9e, 0xc1, 0xb7, 0x60, 0x68, 0xcb, 0xec, 0x7a, 0x3e, 0x75, 0xbd,
-	0xea, 0xbe, 0x99, 0xf2, 0x6c, 0xa5, 0xbe, 0x94, 0x7d, 0x3e, 0x15, 0xbb, 0xb6, 0x2c, 0xce, 0x5f,
-	0xb5, 0x7c, 0xf7, 0x4e, 0x23, 0x54, 0xa7, 0xbc, 0x05, 0xa3, 0xb1, 0x2d, 0x3c, 0x01, 0xe5, 0x1d,
-	0x7a, 0x47, 0x58, 0xc8, 0x7e, 0xe2, 0xf3, 0xb0, 0x7f, 0x97, 0x98, 0x5d, 0xca, 0x0d, 0xab, 0xd4,
-	0x8f, 0x0f, 0xb8, 0x3a, 0xd0, 0xd4, 0x08, 0xe4, 0x17, 0x4a, 0x17, 0x90, 0x3a, 0x0b, 0x78, 0x85,
-	0xfa, 0x49, 0x4f, 0x62, 0xd8, 0x67, 0x91, 0x0e, 0x15, 0xb7, 0xf0, 0xdf, 0xea, 0x35, 0x38, 0xb8,
-	0x66, 0x78, 0xa1, 0xa8, 0x97, 0xe7, 0xf5, 0x23, 0x00, 0x0e, 0x69, 0xd3, 0xa6, 0x6f, 0xef, 0x50,
-	0x4b, 0x38, 0x7d, 0x98, 0xad, 0xdc, 0x60, 0x0b, 0xea, 0x77, 0x08, 0x26, 0x13, 0xfa, 0x3c, 0xc7,
-	0xb6, 0x3c, 0x8a, 0x5f, 0x81, 0x61, 0xe9, 0x59, 0xaf, 0x8a, 0xb8, 0x3b, 0x8b, 0x84, 0xa3, 0x77,
-	0x08, 0x9f, 0x81, 0x89, 0x6d, 0x62, 0x98, 0xb4, 0xd5, 0x34, 0xed, 0xad, 0x80, 0x9c, 0xd5, 0xd2,
-	0x4c, 0x79, 0x76, 0xb8, 0x31, 0x1e, 0xac, 0xaf, 0xc9, 0x65, 0x7c, 0x0a, 0xc6, 0x2d, 0xfa, 0xbe,
-	0xdf, 0x8c, 0x40, 0x2d, 0x73, 0xa8, 0xa3, 0x6c, 0x79, 0x3d, 0x84, 0xfb, 0x00, 0xc1, 0xe1, 0x75,
-	0xe2, 0xfa, 0x06, 0x31, 0xdf, 0x70, 0x5a, 0x29, 0xe4, 0x8b, 0x72, 0x08, 0x3d, 0x02, 0x87, 0x16,
-	0xa1, 0xd2, 0xe5, 0x8a, 0x79, 0x32, 0x88, 0x58, 0x2a, 0x52, 0x85, 0xcc, 0x06, 0xed, 0x55, 0x96,
-	0x2f, 0xd7, 0x88, 0xb7, 0xd3, 0x80, 0x40, 0x9c, 0xfd, 0x56, 0xcf, 0xc2, 0xe4, 0x15, 0x6a, 0xd2,
-	0x7e, 0x54, 0x69, 0x81, 0xbc, 0x8f, 0xe0, 0x60, 0x40, 0x42, 0xc9, 0x87, 0xfc, 0x48, 0x0a, 0x3e,
-	0xf6, 0xd2, 0x67, 0x58, 0xac, 0xac, 0xb6, 0xf0, 0x22, 0x3c, 0x23, 0x3e, 0x44, 0xf2, 0x14, 0x60,
-	0xa0, 0x3c, 0xa1, 0x9e, 0x86, 0x67, 0x57, 0xa8, 0x9f, 0x00, 0x92, 0x86, 0x7a, 0x0d, 0x9e, 0x63,
-	0x74, 0x91, 0xc9, 0xf0, 0x98, 0xec, 0xfb, 0x16, 0x05, 0x6c, 0xee, 0xa9, 0x13, 0xe4, 0x5b, 0x8a,
-	0xa4, 0x72, 0xc0, 0xbd, 0x02, 0xd6, 0x84, 0x47, 0x9e, 0x04, 0xf3, 0x6a, 0x70, 0x30, 0x88, 0x6d,
-	0x01, 0x27, 0xfd, 0x8b, 0x60, 0x2a, 0x5e, 0x5f, 0xae, 0x51, 0x9f, 0xb4, 0x88, 0x4f, 0xf0, 0x6d,
-	0x98, 0xb0, 0x5d, 0xa3, 0x6d, 0x58, 0xc4, 0x6c, 0xba, 0x81, 0x0a, 0xc1, 0x53, 0x7d, 0x8f, 0xb5,
-	0xaa, 0x31, 0x2e, 0x15, 0x49, 0x28, 0x4b, 0x30, 0x22, 0x54, 0x36, 0x59, 0xb5, 0xce, 0x24, 0xef,
-	0x0d, 0x59, 0xca, 0x1b, 0x15, 0x21, 0xcf, 0x56, 0x18, 0xf5, 0xb7, 0x0d, 0xcb, 0xf0, 0xde, 0x0e,
-	0x4e, 0x97, 0x73, 0x4f, 0x43, 0x20, 0xce, 0x16, 0xd4, 0xff, 0x10, 0x4c, 0xc5, 0x33, 0x32, 0x34,
-	0x99, 0x64, 0x9a, 0x7c, 0x2e, 0xdb, 0xe4, 0x41, 0x49, 0xfe, 0x74, 0x59, 0xfe, 0x0f, 0x92, 0x0f,
-	0xa1, 0x60, 0x46, 0x68, 0xf8, 0xad, 0x4c, 0xc3, 0xb5, 0xbc, 0x58, 0xc7, 0x49, 0xf6, 0x74, 0x19,
-	0xfc, 0x17, 0x82, 0xc9, 0x20, 0x2e, 0x49, 0x83, 0xd7, 0x32, 0x0d, 0x2e, 0x90, 0xbd, 0x4f, 0x95,
-	0x8d, 0xbf, 0x21, 0x98, 0x0e, 0x22, 0x71, 0xc9, 0x71, 0xd6, 0x5d, 0x7b, 0xdb, 0x30, 0x73, 0xfb,
-	0x9b, 0x93, 0x30, 0x46, 0x1c, 0xa7, 0xe9, 0x04, 0xd2, 0xbd, 0x1a, 0x3d, 0x42, 0x42, 0x15, 0xab,
-	0x2d, 0x7c, 0x15, 0x2a, 0x11, 0x29, 0x01, 0xeb, 0x64, 0xb6, 0x7b, 0x22, 0xf7, 0x43, 0x4f, 0x11,
-	0x3e, 0x0d, 0xe3, 0x46, 0xdb, 0xb2, 0x5d, 0xda, 0x7c, 0x8f, 0xb8, 0xac, 0x03, 0x64, 0x2d, 0x0f,
-	0x9a, 0x1d, 0x6a, 0x8c, 0x05, 0xcb, 0x6f, 0x8a, 0x55, 0x56, 0xb7, 0x56, 0xa8, 0xdf, 0x6f, 0x45,
-	0x5a, 0xdd, 0x32, 0x61, 0x8a, 0x55, 0xe3, 0x9e, 0x70, 0x6e, 0x7d, 0x3f, 0x04, 0xbc, 0x9a, 0x37,
-	0x3d, 0xe3, 0x6e, 0x60, 0xcb, 0xfe, 0xc6, 0x10, 0x5b, 0xb8, 0x6e, 0xdc, 0xa5, 0x79, 0xc5, 0xff,
-	0x27, 0x04, 0xd3, 0x7d, 0xd7, 0x89, 0xfa, 0xbf, 0x02, 0x23, 0x11, 0x2f, 0xc9, 0x37, 0xa0, 0x98,
-	0x9b, 0x2a, 0x3d, 0x37, 0xa5, 0x96, 0xf7, 0x52, 0x4a, 0x79, 0x4f, 0x7d, 0x31, 0xca, 0xa9, 0x2f,
-	0x86, 0xfa, 0x2b, 0x82, 0xe9, 0x80, 0xff, 0xfd, 0x5e, 0x4d, 0x44, 0x17, 0x3d, 0x62, 0x74, 0x1f,
-	0xa7, 0x0b, 0x49, 0xa3, 0x46, 0x39, 0x95, 0x1a, 0x37, 0x61, 0x3a, 0x78, 0xd2, 0x0a, 0xb1, 0x23,
-	0x4d, 0x6f, 0x29, 0x55, 0xaf, 0x02, 0xd5, 0xa4, 0x7f, 0x64, 0x89, 0xa8, 0x3f, 0x9c, 0x86, 0xc9,
-	0xcb, 0xc2, 0x0d, 0xb2, 0xac, 0x5f, 0x62, 0xde, 0xc0, 0x9f, 0x21, 0x18, 0x8b, 0x3f, 0x74, 0x78,
-	0xaf, 0x4f, 0xa2, 0x72, 0x44, 0x1e, 0x88, 0x8c, 0x46, 0xda, 0xeb, 0x72, 0x34, 0x52, 0xe7, 0x3e,
-	0xfc, 0xf3, 0xef, 0x2f, 0x4a, 0xa7, 0xd4, 0xe3, 0x6c, 0x20, 0xfb, 0x20, 0xa0, 0xf0, 0x92, 0xe3,
-	0xda, 0xef, 0xd0, 0x2d, 0xdf, 0xd3, 0x6b, 0xf7, 0xc2, 0x21, 0xcd, 0x5b, 0x40, 0x35, 0x7c, 0x1f,
-	0x41, 0x25, 0xd2, 0x94, 0xe3, 0xb9, 0x6c, 0x34, 0xfd, 0xbd, 0xbb, 0x52, 0xa0, 0xed, 0x54, 0xcf,
-	0x70, 0x3c, 0x27, 0x70, 0x80, 0x87, 0x39, 0x39, 0x82, 0xa6, 0x07, 0x46, 0xaf, 0xdd, 0xc3, 0x0f,
-	0x10, 0x8c, 0xc6, 0xfa, 0x74, 0x3c, 0xe0, 0x0d, 0x49, 0x1b, 0x10, 0x14, 0xbd, 0xb0, 0x7c, 0x90,
-	0x83, 0x09, 0x74, 0x83, 0xbc, 0x85, 0x3f, 0x46, 0x30, 0x16, 0x7f, 0xaa, 0x71, 0x01, 0xfb, 0x0b,
-	0xf9, 0x48, 0xc4, 0x4c, 0xc9, 0xf7, 0x11, 0x8b, 0x19, 0x1b, 0x67, 0x52, 0x5b, 0x07, 0xfc, 0x88,
-	0xbd, 0x46, 0x1e, 0xa5, 0x5e, 0xe6, 0xf0, 0xce, 0xd5, 0x6b, 0x1c, 0x5e, 0x38, 0xe4, 0x0f, 0xc4,
-	0xd9, 0x9b, 0x36, 0x3e, 0x42, 0x30, 0x16, 0x9f, 0x18, 0x06, 0x71, 0x3e, 0x75, 0xb6, 0x50, 0xa6,
-	0xfa, 0xca, 0xc2, 0x55, 0x36, 0xe9, 0xcb, 0xf0, 0xd5, 0x0a, 0x90, 0xeb, 0x2b, 0x04, 0xa3, 0xb1,
-	0xbe, 0x03, 0xef, 0xb1, 0x41, 0xc9, 0xf3, 0xd2, 0x12, 0xc7, 0x72, 0x5e, 0x9d, 0x4b, 0xa7, 0x52,
-	0x0c, 0x8d, 0x2e, 0xbb, 0xf8, 0x05, 0x39, 0x9d, 0xe0, 0xcf, 0x11, 0x40, 0x6f, 0x3c, 0xc1, 0x67,
-	0x07, 0x26, 0x62, 0x02, 0x59, 0x7e, 0xe7, 0xa1, 0xbe, 0xc4, 0xd1, 0x69, 0x78, 0x2e, 0xcf, 0x53,
-	0x21, 0x34, 0xe6, 0xb4, 0x6f, 0x10, 0x8c, 0x44, 0x67, 0x17, 0xfc, 0xfc, 0xe0, 0x04, 0x4b, 0x8c,
-	0x4c, 0x8a, 0x56, 0x54, 0x5c, 0xa4, 0x63, 0x1c, 0x65, 0x41, 0x1f, 0xb2, 0x22, 0x36, 0x1a, 0x6b,
-	0xd6, 0x70, 0xbe, 0x43, 0xf2, 0xa2, 0x79, 0x9e, 0x23, 0x99, 0x57, 0xf6, 0xe4, 0x2f, 0x96, 0x9d,
-	0x9f, 0x22, 0x18, 0x8d, 0x0d, 0x51, 0x83, 0x78, 0x96, 0x36, 0x6d, 0x65, 0x92, 0x5d, 0x38, 0xa7,
-	0xb6, 0xb7, 0x10, 0xfe, 0x88, 0x60, 0x22, 0xd9, 0xe5, 0xe1, 0xf9, 0x3c, 0xea, 0xf7, 0xbd, 0x96,
-	0x4a, 0xa1, 0x07, 0x5e, 0xbd, 0xc2, 0x31, 0x5e, 0x54, 0xf5, 0x22, 0x01, 0x8c, 0xf4, 0x30, 0x0b,
-	0xd1, 0x96, 0x02, 0x7f, 0x8d, 0x60, 0x34, 0xd6, 0xd0, 0x0d, 0xf2, 0x61, 0x5a, 0xe7, 0x57, 0x10,
-	0xad, 0x08, 0x32, 0xd6, 0x73, 0x3d, 0x1a, 0x81, 0xca, 0x9c, 0xfa, 0x03, 0x82, 0xf1, 0x44, 0x5b,
-	0x87, 0x5f, 0x18, 0xcc, 0xf5, 0xfe, 0x86, 0x53, 0x99, 0xdf, 0xc3, 0x09, 0x91, 0x20, 0x71, 0xc4,
-	0xc5, 0xfd, 0x8b, 0x7f, 0x46, 0x30, 0x91, 0x6c, 0x58, 0x06, 0xd1, 0x20, 0xa3, 0xf9, 0xcb, 0x4b,
-	0x9b, 0x75, 0x8e, 0xef, 0xb5, 0xfa, 0x22, 0xc7, 0x17, 0x89, 0xa9, 0x56, 0xdc, 0xbb, 0x71, 0x2e,
-	0x7c, 0x89, 0x60, 0x22, 0xd9, 0xc1, 0x0d, 0x02, 0x9e, 0xd1, 0xed, 0x65, 0x66, 0x95, 0xf0, 0x68,
-	0x6d, 0xcf, 0x1c, 0xf8, 0x04, 0xc1, 0x08, 0xeb, 0x89, 0x48, 0x67, 0x9d, 0xff, 0xe1, 0xba, 0xd7,
-	0x0d, 0x18, 0xa4, 0xa3, 0xed, 0xce, 0x6b, 0xd1, 0x4d, 0x89, 0x62, 0x32, 0x21, 0x13, 0xec, 0x86,
-	0x6f, 0x47, 0x9d, 0x83, 0x70, 0xa9, 0x67, 0x77, 0xdd, 0xad, 0xec, 0xc7, 0xb5, 0x1d, 0xd1, 0xcc,
-	0x6a, 0x0e, 0x83, 0x72, 0x7d, 0x10, 0x94, 0xeb, 0x4f, 0x0c, 0x8a, 0x97, 0x80, 0xf2, 0x3d, 0x02,
-	0x7c, 0x83, 0x7a, 0x7c, 0x91, 0xba, 0x1d, 0xc3, 0xf3, 0xf8, 0x5f, 0xa0, 0x66, 0x13, 0x97, 0xf5,
-	0x8b, 0x48, 0x58, 0x67, 0x0a, 0x48, 0x8a, 0x64, 0x58, 0xe6, 0x50, 0x97, 0xd4, 0x0b, 0xc5, 0xa0,
-	0xfa, 0x7d, 0x9a, 0x16, 0x50, 0xed, 0xf2, 0x2f, 0x08, 0x0e, 0x6f, 0xd9, 0x9d, 0x4c, 0x42, 0x5d,
-	0x56, 0x52, 0x5b, 0xf9, 0x75, 0xc6, 0xa2, 0x75, 0x74, 0x7b, 0x49, 0x9c, 0x6b, 0xdb, 0x26, 0xb1,
-	0xda, 0x9a, 0xed, 0xb6, 0xf5, 0x36, 0xb5, 0x38, 0xc7, 0xf4, 0x60, 0x8b, 0x38, 0x86, 0xd7, 0xff,
-	0x7f, 0x25, 0x8b, 0xfc, 0xc7, 0xc3, 0xd2, 0xd1, 0x95, 0xe0, 0xfc, 0xb2, 0x69, 0x77, 0x5b, 0x9a,
-	0xbc, 0x4a, 0xe3, 0x77, 0x68, 0x37, 0xeb, 0xbf, 0x4b, 0x81, 0x0d, 0x2e, 0xb0, 0x21, 0x05, 0x36,
-	0xb8, 0xc0, 0xc6, 0xcd, 0xfa, 0xe6, 0x01, 0x7e, 0xd7, 0x8b, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff,
-	0x5c, 0x29, 0x0c, 0x23, 0x06, 0x1a, 0x00, 0x00,
-}
diff --git a/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go b/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
index 6b01ce3839..62813b6287 100644
--- a/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
+++ b/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/bigtable_table_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CreateTable][google.bigtable.admin.v2.BigtableTableAdmin.CreateTable]
@@ -65,16 +65,17 @@ func (m *CreateTableRequest) Reset()         { *m = CreateTableRequest{} }
 func (m *CreateTableRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTableRequest) ProtoMessage()    {}
 func (*CreateTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{0}
+	return fileDescriptor_43baa00e5f96b1e4, []int{0}
 }
+
 func (m *CreateTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTableRequest.Unmarshal(m, b)
 }
 func (m *CreateTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTableRequest.Merge(dst, src)
+func (m *CreateTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableRequest.Merge(m, src)
 }
 func (m *CreateTableRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTableRequest.Size(m)
@@ -126,16 +127,17 @@ func (m *CreateTableRequest_Split) Reset()         { *m = CreateTableRequest_Spl
 func (m *CreateTableRequest_Split) String() string { return proto.CompactTextString(m) }
 func (*CreateTableRequest_Split) ProtoMessage()    {}
 func (*CreateTableRequest_Split) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{0, 0}
+	return fileDescriptor_43baa00e5f96b1e4, []int{0, 0}
 }
+
 func (m *CreateTableRequest_Split) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTableRequest_Split.Unmarshal(m, b)
 }
 func (m *CreateTableRequest_Split) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTableRequest_Split.Marshal(b, m, deterministic)
 }
-func (dst *CreateTableRequest_Split) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTableRequest_Split.Merge(dst, src)
+func (m *CreateTableRequest_Split) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableRequest_Split.Merge(m, src)
 }
 func (m *CreateTableRequest_Split) XXX_Size() int {
 	return xxx_messageInfo_CreateTableRequest_Split.Size(m)
@@ -181,16 +183,17 @@ func (m *CreateTableFromSnapshotRequest) Reset()         { *m = CreateTableFromS
 func (m *CreateTableFromSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTableFromSnapshotRequest) ProtoMessage()    {}
 func (*CreateTableFromSnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{1}
+	return fileDescriptor_43baa00e5f96b1e4, []int{1}
 }
+
 func (m *CreateTableFromSnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTableFromSnapshotRequest.Unmarshal(m, b)
 }
 func (m *CreateTableFromSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTableFromSnapshotRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTableFromSnapshotRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTableFromSnapshotRequest.Merge(dst, src)
+func (m *CreateTableFromSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableFromSnapshotRequest.Merge(m, src)
 }
 func (m *CreateTableFromSnapshotRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTableFromSnapshotRequest.Size(m)
@@ -244,16 +247,17 @@ func (m *DropRowRangeRequest) Reset()         { *m = DropRowRangeRequest{} }
 func (m *DropRowRangeRequest) String() string { return proto.CompactTextString(m) }
 func (*DropRowRangeRequest) ProtoMessage()    {}
 func (*DropRowRangeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{2}
+	return fileDescriptor_43baa00e5f96b1e4, []int{2}
 }
+
 func (m *DropRowRangeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DropRowRangeRequest.Unmarshal(m, b)
 }
 func (m *DropRowRangeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DropRowRangeRequest.Marshal(b, m, deterministic)
 }
-func (dst *DropRowRangeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DropRowRangeRequest.Merge(dst, src)
+func (m *DropRowRangeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DropRowRangeRequest.Merge(m, src)
 }
 func (m *DropRowRangeRequest) XXX_Size() int {
 	return xxx_messageInfo_DropRowRangeRequest.Size(m)
@@ -308,75 +312,14 @@ func (m *DropRowRangeRequest) GetDeleteAllDataFromTable() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DropRowRangeRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DropRowRangeRequest_OneofMarshaler, _DropRowRangeRequest_OneofUnmarshaler, _DropRowRangeRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DropRowRangeRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DropRowRangeRequest_RowKeyPrefix)(nil),
 		(*DropRowRangeRequest_DeleteAllDataFromTable)(nil),
 	}
 }
 
-func _DropRowRangeRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DropRowRangeRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *DropRowRangeRequest_RowKeyPrefix:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.RowKeyPrefix)
-	case *DropRowRangeRequest_DeleteAllDataFromTable:
-		t := uint64(0)
-		if x.DeleteAllDataFromTable {
-			t = 1
-		}
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("DropRowRangeRequest.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DropRowRangeRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DropRowRangeRequest)
-	switch tag {
-	case 2: // target.row_key_prefix
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Target = &DropRowRangeRequest_RowKeyPrefix{x}
-		return true, err
-	case 3: // target.delete_all_data_from_table
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &DropRowRangeRequest_DeleteAllDataFromTable{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DropRowRangeRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DropRowRangeRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *DropRowRangeRequest_RowKeyPrefix:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RowKeyPrefix)))
-		n += len(x.RowKeyPrefix)
-	case *DropRowRangeRequest_DeleteAllDataFromTable:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.ListTables][google.bigtable.admin.v2.BigtableTableAdmin.ListTables]
 type ListTablesRequest struct {
@@ -400,16 +343,17 @@ func (m *ListTablesRequest) Reset()         { *m = ListTablesRequest{} }
 func (m *ListTablesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTablesRequest) ProtoMessage()    {}
 func (*ListTablesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{3}
+	return fileDescriptor_43baa00e5f96b1e4, []int{3}
 }
+
 func (m *ListTablesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTablesRequest.Unmarshal(m, b)
 }
 func (m *ListTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTablesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTablesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTablesRequest.Merge(dst, src)
+func (m *ListTablesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesRequest.Merge(m, src)
 }
 func (m *ListTablesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTablesRequest.Size(m)
@@ -466,16 +410,17 @@ func (m *ListTablesResponse) Reset()         { *m = ListTablesResponse{} }
 func (m *ListTablesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTablesResponse) ProtoMessage()    {}
 func (*ListTablesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{4}
+	return fileDescriptor_43baa00e5f96b1e4, []int{4}
 }
+
 func (m *ListTablesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTablesResponse.Unmarshal(m, b)
 }
 func (m *ListTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTablesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTablesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTablesResponse.Merge(dst, src)
+func (m *ListTablesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesResponse.Merge(m, src)
 }
 func (m *ListTablesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTablesResponse.Size(m)
@@ -519,16 +464,17 @@ func (m *GetTableRequest) Reset()         { *m = GetTableRequest{} }
 func (m *GetTableRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTableRequest) ProtoMessage()    {}
 func (*GetTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{5}
+	return fileDescriptor_43baa00e5f96b1e4, []int{5}
 }
+
 func (m *GetTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTableRequest.Unmarshal(m, b)
 }
 func (m *GetTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTableRequest.Merge(dst, src)
+func (m *GetTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTableRequest.Merge(m, src)
 }
 func (m *GetTableRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTableRequest.Size(m)
@@ -569,16 +515,17 @@ func (m *DeleteTableRequest) Reset()         { *m = DeleteTableRequest{} }
 func (m *DeleteTableRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTableRequest) ProtoMessage()    {}
 func (*DeleteTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{6}
+	return fileDescriptor_43baa00e5f96b1e4, []int{6}
 }
+
 func (m *DeleteTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTableRequest.Unmarshal(m, b)
 }
 func (m *DeleteTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTableRequest.Merge(dst, src)
+func (m *DeleteTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTableRequest.Merge(m, src)
 }
 func (m *DeleteTableRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTableRequest.Size(m)
@@ -617,16 +564,17 @@ func (m *ModifyColumnFamiliesRequest) Reset()         { *m = ModifyColumnFamilie
 func (m *ModifyColumnFamiliesRequest) String() string { return proto.CompactTextString(m) }
 func (*ModifyColumnFamiliesRequest) ProtoMessage()    {}
 func (*ModifyColumnFamiliesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{7}
+	return fileDescriptor_43baa00e5f96b1e4, []int{7}
 }
+
 func (m *ModifyColumnFamiliesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyColumnFamiliesRequest.Unmarshal(m, b)
 }
 func (m *ModifyColumnFamiliesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModifyColumnFamiliesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ModifyColumnFamiliesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyColumnFamiliesRequest.Merge(dst, src)
+func (m *ModifyColumnFamiliesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyColumnFamiliesRequest.Merge(m, src)
 }
 func (m *ModifyColumnFamiliesRequest) XXX_Size() int {
 	return xxx_messageInfo_ModifyColumnFamiliesRequest.Size(m)
@@ -673,16 +621,17 @@ func (m *ModifyColumnFamiliesRequest_Modification) Reset() {
 func (m *ModifyColumnFamiliesRequest_Modification) String() string { return proto.CompactTextString(m) }
 func (*ModifyColumnFamiliesRequest_Modification) ProtoMessage()    {}
 func (*ModifyColumnFamiliesRequest_Modification) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{7, 0}
+	return fileDescriptor_43baa00e5f96b1e4, []int{7, 0}
 }
+
 func (m *ModifyColumnFamiliesRequest_Modification) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Unmarshal(m, b)
 }
 func (m *ModifyColumnFamiliesRequest_Modification) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Marshal(b, m, deterministic)
 }
-func (dst *ModifyColumnFamiliesRequest_Modification) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Merge(dst, src)
+func (m *ModifyColumnFamiliesRequest_Modification) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Merge(m, src)
 }
 func (m *ModifyColumnFamiliesRequest_Modification) XXX_Size() int {
 	return xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Size(m)
@@ -753,98 +702,15 @@ func (m *ModifyColumnFamiliesRequest_Modification) GetDrop() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ModifyColumnFamiliesRequest_Modification) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ModifyColumnFamiliesRequest_Modification_OneofMarshaler, _ModifyColumnFamiliesRequest_Modification_OneofUnmarshaler, _ModifyColumnFamiliesRequest_Modification_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ModifyColumnFamiliesRequest_Modification) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ModifyColumnFamiliesRequest_Modification_Create)(nil),
 		(*ModifyColumnFamiliesRequest_Modification_Update)(nil),
 		(*ModifyColumnFamiliesRequest_Modification_Drop)(nil),
 	}
 }
 
-func _ModifyColumnFamiliesRequest_Modification_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ModifyColumnFamiliesRequest_Modification)
-	// mod
-	switch x := m.Mod.(type) {
-	case *ModifyColumnFamiliesRequest_Modification_Create:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Create); err != nil {
-			return err
-		}
-	case *ModifyColumnFamiliesRequest_Modification_Update:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *ModifyColumnFamiliesRequest_Modification_Drop:
-		t := uint64(0)
-		if x.Drop {
-			t = 1
-		}
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("ModifyColumnFamiliesRequest_Modification.Mod has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ModifyColumnFamiliesRequest_Modification_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ModifyColumnFamiliesRequest_Modification)
-	switch tag {
-	case 2: // mod.create
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ColumnFamily)
-		err := b.DecodeMessage(msg)
-		m.Mod = &ModifyColumnFamiliesRequest_Modification_Create{msg}
-		return true, err
-	case 3: // mod.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ColumnFamily)
-		err := b.DecodeMessage(msg)
-		m.Mod = &ModifyColumnFamiliesRequest_Modification_Update{msg}
-		return true, err
-	case 4: // mod.drop
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Mod = &ModifyColumnFamiliesRequest_Modification_Drop{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ModifyColumnFamiliesRequest_Modification_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ModifyColumnFamiliesRequest_Modification)
-	// mod
-	switch x := m.Mod.(type) {
-	case *ModifyColumnFamiliesRequest_Modification_Create:
-		s := proto.Size(x.Create)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModifyColumnFamiliesRequest_Modification_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModifyColumnFamiliesRequest_Modification_Drop:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
 type GenerateConsistencyTokenRequest struct {
@@ -861,16 +727,17 @@ func (m *GenerateConsistencyTokenRequest) Reset()         { *m = GenerateConsist
 func (m *GenerateConsistencyTokenRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateConsistencyTokenRequest) ProtoMessage()    {}
 func (*GenerateConsistencyTokenRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{8}
+	return fileDescriptor_43baa00e5f96b1e4, []int{8}
 }
+
 func (m *GenerateConsistencyTokenRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateConsistencyTokenRequest.Unmarshal(m, b)
 }
 func (m *GenerateConsistencyTokenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateConsistencyTokenRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateConsistencyTokenRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateConsistencyTokenRequest.Merge(dst, src)
+func (m *GenerateConsistencyTokenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConsistencyTokenRequest.Merge(m, src)
 }
 func (m *GenerateConsistencyTokenRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateConsistencyTokenRequest.Size(m)
@@ -902,16 +769,17 @@ func (m *GenerateConsistencyTokenResponse) Reset()         { *m = GenerateConsis
 func (m *GenerateConsistencyTokenResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateConsistencyTokenResponse) ProtoMessage()    {}
 func (*GenerateConsistencyTokenResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{9}
+	return fileDescriptor_43baa00e5f96b1e4, []int{9}
 }
+
 func (m *GenerateConsistencyTokenResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateConsistencyTokenResponse.Unmarshal(m, b)
 }
 func (m *GenerateConsistencyTokenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateConsistencyTokenResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateConsistencyTokenResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateConsistencyTokenResponse.Merge(dst, src)
+func (m *GenerateConsistencyTokenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConsistencyTokenResponse.Merge(m, src)
 }
 func (m *GenerateConsistencyTokenResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateConsistencyTokenResponse.Size(m)
@@ -947,16 +815,17 @@ func (m *CheckConsistencyRequest) Reset()         { *m = CheckConsistencyRequest
 func (m *CheckConsistencyRequest) String() string { return proto.CompactTextString(m) }
 func (*CheckConsistencyRequest) ProtoMessage()    {}
 func (*CheckConsistencyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{10}
+	return fileDescriptor_43baa00e5f96b1e4, []int{10}
 }
+
 func (m *CheckConsistencyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckConsistencyRequest.Unmarshal(m, b)
 }
 func (m *CheckConsistencyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckConsistencyRequest.Marshal(b, m, deterministic)
 }
-func (dst *CheckConsistencyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckConsistencyRequest.Merge(dst, src)
+func (m *CheckConsistencyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckConsistencyRequest.Merge(m, src)
 }
 func (m *CheckConsistencyRequest) XXX_Size() int {
 	return xxx_messageInfo_CheckConsistencyRequest.Size(m)
@@ -996,16 +865,17 @@ func (m *CheckConsistencyResponse) Reset()         { *m = CheckConsistencyRespon
 func (m *CheckConsistencyResponse) String() string { return proto.CompactTextString(m) }
 func (*CheckConsistencyResponse) ProtoMessage()    {}
 func (*CheckConsistencyResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{11}
+	return fileDescriptor_43baa00e5f96b1e4, []int{11}
 }
+
 func (m *CheckConsistencyResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckConsistencyResponse.Unmarshal(m, b)
 }
 func (m *CheckConsistencyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckConsistencyResponse.Marshal(b, m, deterministic)
 }
-func (dst *CheckConsistencyResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckConsistencyResponse.Merge(dst, src)
+func (m *CheckConsistencyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckConsistencyResponse.Merge(m, src)
 }
 func (m *CheckConsistencyResponse) XXX_Size() int {
 	return xxx_messageInfo_CheckConsistencyResponse.Size(m)
@@ -1060,16 +930,17 @@ func (m *SnapshotTableRequest) Reset()         { *m = SnapshotTableRequest{} }
 func (m *SnapshotTableRequest) String() string { return proto.CompactTextString(m) }
 func (*SnapshotTableRequest) ProtoMessage()    {}
 func (*SnapshotTableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{12}
+	return fileDescriptor_43baa00e5f96b1e4, []int{12}
 }
+
 func (m *SnapshotTableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SnapshotTableRequest.Unmarshal(m, b)
 }
 func (m *SnapshotTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SnapshotTableRequest.Marshal(b, m, deterministic)
 }
-func (dst *SnapshotTableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SnapshotTableRequest.Merge(dst, src)
+func (m *SnapshotTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SnapshotTableRequest.Merge(m, src)
 }
 func (m *SnapshotTableRequest) XXX_Size() int {
 	return xxx_messageInfo_SnapshotTableRequest.Size(m)
@@ -1136,16 +1007,17 @@ func (m *GetSnapshotRequest) Reset()         { *m = GetSnapshotRequest{} }
 func (m *GetSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSnapshotRequest) ProtoMessage()    {}
 func (*GetSnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{13}
+	return fileDescriptor_43baa00e5f96b1e4, []int{13}
 }
+
 func (m *GetSnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSnapshotRequest.Unmarshal(m, b)
 }
 func (m *GetSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSnapshotRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSnapshotRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSnapshotRequest.Merge(dst, src)
+func (m *GetSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSnapshotRequest.Merge(m, src)
 }
 func (m *GetSnapshotRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSnapshotRequest.Size(m)
@@ -1191,16 +1063,17 @@ func (m *ListSnapshotsRequest) Reset()         { *m = ListSnapshotsRequest{} }
 func (m *ListSnapshotsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSnapshotsRequest) ProtoMessage()    {}
 func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{14}
+	return fileDescriptor_43baa00e5f96b1e4, []int{14}
 }
+
 func (m *ListSnapshotsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSnapshotsRequest.Unmarshal(m, b)
 }
 func (m *ListSnapshotsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSnapshotsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSnapshotsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSnapshotsRequest.Merge(dst, src)
+func (m *ListSnapshotsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsRequest.Merge(m, src)
 }
 func (m *ListSnapshotsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSnapshotsRequest.Size(m)
@@ -1255,16 +1128,17 @@ func (m *ListSnapshotsResponse) Reset()         { *m = ListSnapshotsResponse{} }
 func (m *ListSnapshotsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSnapshotsResponse) ProtoMessage()    {}
 func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{15}
+	return fileDescriptor_43baa00e5f96b1e4, []int{15}
 }
+
 func (m *ListSnapshotsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSnapshotsResponse.Unmarshal(m, b)
 }
 func (m *ListSnapshotsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSnapshotsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSnapshotsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSnapshotsResponse.Merge(dst, src)
+func (m *ListSnapshotsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsResponse.Merge(m, src)
 }
 func (m *ListSnapshotsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSnapshotsResponse.Size(m)
@@ -1310,16 +1184,17 @@ func (m *DeleteSnapshotRequest) Reset()         { *m = DeleteSnapshotRequest{} }
 func (m *DeleteSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSnapshotRequest) ProtoMessage()    {}
 func (*DeleteSnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{16}
+	return fileDescriptor_43baa00e5f96b1e4, []int{16}
 }
+
 func (m *DeleteSnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSnapshotRequest.Unmarshal(m, b)
 }
 func (m *DeleteSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSnapshotRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSnapshotRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSnapshotRequest.Merge(dst, src)
+func (m *DeleteSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSnapshotRequest.Merge(m, src)
 }
 func (m *DeleteSnapshotRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSnapshotRequest.Size(m)
@@ -1359,16 +1234,17 @@ func (m *SnapshotTableMetadata) Reset()         { *m = SnapshotTableMetadata{} }
 func (m *SnapshotTableMetadata) String() string { return proto.CompactTextString(m) }
 func (*SnapshotTableMetadata) ProtoMessage()    {}
 func (*SnapshotTableMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{17}
+	return fileDescriptor_43baa00e5f96b1e4, []int{17}
 }
+
 func (m *SnapshotTableMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SnapshotTableMetadata.Unmarshal(m, b)
 }
 func (m *SnapshotTableMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SnapshotTableMetadata.Marshal(b, m, deterministic)
 }
-func (dst *SnapshotTableMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SnapshotTableMetadata.Merge(dst, src)
+func (m *SnapshotTableMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SnapshotTableMetadata.Merge(m, src)
 }
 func (m *SnapshotTableMetadata) XXX_Size() int {
 	return xxx_messageInfo_SnapshotTableMetadata.Size(m)
@@ -1423,16 +1299,17 @@ func (m *CreateTableFromSnapshotMetadata) Reset()         { *m = CreateTableFrom
 func (m *CreateTableFromSnapshotMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateTableFromSnapshotMetadata) ProtoMessage()    {}
 func (*CreateTableFromSnapshotMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_table_admin_4c164c60709448e2, []int{18}
+	return fileDescriptor_43baa00e5f96b1e4, []int{18}
 }
+
 func (m *CreateTableFromSnapshotMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTableFromSnapshotMetadata.Unmarshal(m, b)
 }
 func (m *CreateTableFromSnapshotMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTableFromSnapshotMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateTableFromSnapshotMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTableFromSnapshotMetadata.Merge(dst, src)
+func (m *CreateTableFromSnapshotMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableFromSnapshotMetadata.Merge(m, src)
 }
 func (m *CreateTableFromSnapshotMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateTableFromSnapshotMetadata.Size(m)
@@ -1488,6 +1365,109 @@ func init() {
 	proto.RegisterType((*CreateTableFromSnapshotMetadata)(nil), "google.bigtable.admin.v2.CreateTableFromSnapshotMetadata")
 }
 
+func init() {
+	proto.RegisterFile("google/bigtable/admin/v2/bigtable_table_admin.proto", fileDescriptor_43baa00e5f96b1e4)
+}
+
+var fileDescriptor_43baa00e5f96b1e4 = []byte{
+	// 1520 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcb, 0x6f, 0xdc, 0x54,
+	0x17, 0xaf, 0x27, 0x8f, 0x26, 0x67, 0xf2, 0xea, 0xfd, 0xd2, 0x76, 0x3a, 0x6d, 0x93, 0xc8, 0x5f,
+	0x55, 0x42, 0x52, 0xc6, 0x62, 0xaa, 0xa8, 0x21, 0x6d, 0x20, 0x9d, 0x84, 0x26, 0x05, 0x4a, 0x23,
+	0xb7, 0xaa, 0xd4, 0x2a, 0xd2, 0xc8, 0xb1, 0x6f, 0x9c, 0xdb, 0x78, 0x7c, 0x8d, 0x7d, 0xa7, 0x69,
+	0x0a, 0x5d, 0xd0, 0x0d, 0x12, 0xdb, 0xae, 0x2a, 0x24, 0xa4, 0x6e, 0x59, 0x22, 0x24, 0xa4, 0x0a,
+	0x09, 0xb1, 0x65, 0xcb, 0x9a, 0x05, 0x12, 0x6b, 0x56, 0xfc, 0x01, 0xe8, 0x3e, 0x9c, 0x78, 0x1e,
+	0x1e, 0xcf, 0x84, 0x0d, 0x9b, 0xc8, 0xf7, 0xdc, 0xf3, 0xf8, 0x9d, 0x73, 0xee, 0x3d, 0xf7, 0x37,
+	0x81, 0xab, 0x2e, 0xa5, 0xae, 0x87, 0x8d, 0x6d, 0xe2, 0x32, 0x6b, 0xdb, 0xc3, 0x86, 0xe5, 0xd4,
+	0x88, 0x6f, 0x3c, 0x29, 0x1f, 0x4a, 0xaa, 0xf2, 0xaf, 0x90, 0x97, 0x82, 0x90, 0x32, 0x8a, 0x0a,
+	0xd2, 0xa8, 0x14, 0xab, 0x94, 0xe4, 0xe6, 0x93, 0x72, 0xf1, 0x82, 0x72, 0x67, 0x05, 0xc4, 0xb0,
+	0x7c, 0x9f, 0x32, 0x8b, 0x11, 0xea, 0x47, 0xd2, 0xae, 0x78, 0x29, 0x35, 0x98, 0x74, 0x23, 0xb5,
+	0xfe, 0xaf, 0xb4, 0x3c, 0xea, 0xbb, 0x61, 0xdd, 0xf7, 0x89, 0xef, 0x1a, 0x34, 0xc0, 0x61, 0x83,
+	0xab, 0x29, 0xa5, 0x24, 0x56, 0xdb, 0xf5, 0x1d, 0xc3, 0xa9, 0x4b, 0x05, 0xb5, 0x7f, 0xbe, 0x79,
+	0x1f, 0xd7, 0x02, 0x76, 0xa0, 0x36, 0xa7, 0x9b, 0x37, 0x19, 0xa9, 0xe1, 0x88, 0x59, 0xb5, 0x40,
+	0x2a, 0xe8, 0x7f, 0x6b, 0x80, 0x56, 0x43, 0x6c, 0x31, 0x7c, 0x9f, 0x03, 0x33, 0xf1, 0x67, 0x75,
+	0x1c, 0x31, 0x74, 0x06, 0x06, 0x03, 0x2b, 0xc4, 0x3e, 0x2b, 0x68, 0x33, 0xda, 0xec, 0xb0, 0xa9,
+	0x56, 0xe8, 0x1c, 0x0c, 0xc9, 0x22, 0x11, 0xa7, 0x90, 0x13, 0x3b, 0x27, 0xc5, 0xfa, 0xb6, 0x83,
+	0x16, 0x60, 0x40, 0x7c, 0x16, 0xfa, 0x66, 0xb4, 0xd9, 0x7c, 0x79, 0xba, 0x94, 0x56, 0xba, 0x92,
+	0x8c, 0x24, 0xb5, 0xd1, 0x43, 0x18, 0x23, 0x3e, 0x61, 0xc4, 0xf2, 0xaa, 0x51, 0xe0, 0x11, 0x16,
+	0x15, 0xfa, 0x67, 0xfa, 0x66, 0xf3, 0xe5, 0x72, 0xba, 0x7d, 0x2b, 0xde, 0xd2, 0x3d, 0x6e, 0x6a,
+	0x8e, 0x2a, 0x4f, 0x62, 0x15, 0x15, 0xcf, 0xc1, 0x80, 0xf8, 0x42, 0x13, 0xd0, 0xb7, 0x87, 0x0f,
+	0x44, 0x2a, 0x23, 0x26, 0xff, 0xd4, 0xbf, 0x80, 0xa9, 0x84, 0x97, 0x5b, 0x21, 0xad, 0xdd, 0xf3,
+	0xad, 0x20, 0xda, 0xa5, 0xec, 0x5f, 0x54, 0xe0, 0x2d, 0x18, 0x8f, 0x68, 0x3d, 0xb4, 0x71, 0x35,
+	0x52, 0xce, 0x44, 0x2d, 0x86, 0xcd, 0x31, 0x29, 0x8e, 0x43, 0xe8, 0xaf, 0x34, 0xf8, 0xdf, 0x5a,
+	0x48, 0x03, 0x93, 0xee, 0x9b, 0x96, 0xef, 0x1e, 0x56, 0x1d, 0x41, 0xbf, 0x6f, 0xd5, 0xb0, 0x8a,
+	0x28, 0xbe, 0xd1, 0x65, 0x18, 0x0b, 0xe9, 0x7e, 0x75, 0x0f, 0x1f, 0x54, 0x83, 0x10, 0xef, 0x90,
+	0xa7, 0x22, 0xea, 0xc8, 0xc6, 0x09, 0x73, 0x24, 0xa4, 0xfb, 0x1f, 0xe3, 0x83, 0x4d, 0x21, 0x45,
+	0x37, 0xa0, 0xe8, 0x60, 0x0f, 0x33, 0x5c, 0xb5, 0x3c, 0xaf, 0xea, 0x58, 0xcc, 0xaa, 0xee, 0x84,
+	0xb4, 0x56, 0x3d, 0xea, 0xc9, 0xd0, 0xc6, 0x09, 0xf3, 0x8c, 0xd4, 0xb9, 0xe9, 0x79, 0x6b, 0x16,
+	0xb3, 0x78, 0xde, 0xa2, 0x00, 0x95, 0x21, 0x18, 0x64, 0x56, 0xe8, 0x62, 0xa6, 0xbf, 0xd6, 0xe0,
+	0xd4, 0x27, 0x24, 0x62, 0x42, 0x1e, 0x65, 0x55, 0x63, 0x11, 0xfa, 0x9f, 0x10, 0xbc, 0x2f, 0x30,
+	0x8d, 0x95, 0x2f, 0x65, 0xf4, 0xbc, 0xf4, 0x80, 0xe0, 0x7d, 0x53, 0x58, 0xa0, 0xf3, 0x30, 0x1c,
+	0x58, 0x2e, 0xae, 0x46, 0xe4, 0x19, 0x2e, 0xf4, 0xcf, 0x68, 0xb3, 0x03, 0xe6, 0x10, 0x17, 0xdc,
+	0x23, 0xcf, 0x30, 0xba, 0x08, 0x20, 0x36, 0x19, 0xdd, 0xc3, 0xbe, 0x2a, 0xa2, 0x50, 0xbf, 0xcf,
+	0x05, 0x7a, 0x1d, 0x50, 0x12, 0x62, 0x14, 0x50, 0x3f, 0xc2, 0xe8, 0x1a, 0xcf, 0x81, 0x4b, 0x0a,
+	0x9a, 0x38, 0x41, 0x99, 0x27, 0x50, 0xa9, 0xa3, 0xcb, 0x30, 0xee, 0xe3, 0xa7, 0xac, 0x9a, 0x08,
+	0x29, 0x3b, 0x3b, 0xca, 0xc5, 0x9b, 0x87, 0x61, 0xab, 0x30, 0xbe, 0x8e, 0x59, 0xc3, 0x3d, 0x69,
+	0xd7, 0xb1, 0x63, 0xd7, 0x44, 0x9f, 0x05, 0xb4, 0x26, 0xfa, 0x93, 0x15, 0x43, 0xff, 0x3d, 0x07,
+	0xe7, 0xef, 0x50, 0x87, 0xec, 0x1c, 0xac, 0x52, 0xaf, 0x5e, 0xf3, 0x6f, 0x59, 0x35, 0xe2, 0x91,
+	0xa3, 0x7e, 0xb5, 0xc3, 0xb5, 0x0b, 0xa3, 0x35, 0x6e, 0x42, 0x6c, 0x39, 0x5f, 0x0a, 0x39, 0x51,
+	0xa6, 0x4a, 0x3a, 0xc0, 0x0e, 0x11, 0xe4, 0x9e, 0x72, 0x65, 0x36, 0x3a, 0x2e, 0xfe, 0xac, 0xc1,
+	0x48, 0x72, 0x1f, 0x8d, 0x41, 0x8e, 0x38, 0x0a, 0x4c, 0x8e, 0x38, 0x68, 0x05, 0x06, 0x6d, 0x71,
+	0xfd, 0x44, 0x91, 0xf2, 0xe5, 0xcb, 0x1d, 0x2e, 0xfb, 0x51, 0xf4, 0x83, 0x8d, 0x13, 0xa6, 0xb2,
+	0xe3, 0x1e, 0xea, 0x81, 0xc3, 0x3d, 0xf4, 0xf5, 0xea, 0x41, 0xda, 0xa1, 0x49, 0xe8, 0x77, 0x42,
+	0x1a, 0x88, 0xb3, 0xc7, 0xaf, 0x86, 0x58, 0x55, 0x06, 0xa0, 0xaf, 0x46, 0x1d, 0x7d, 0x01, 0xa6,
+	0xd7, 0xb1, 0xcf, 0x27, 0x31, 0x5e, 0xa5, 0x7e, 0x44, 0x22, 0x86, 0x7d, 0xfb, 0x40, 0x1c, 0x83,
+	0x4e, 0x6d, 0xb9, 0x0b, 0x33, 0xe9, 0x66, 0xea, 0x98, 0xce, 0xc3, 0x29, 0xfb, 0x68, 0x4f, 0x9d,
+	0x37, 0xe9, 0x64, 0xc2, 0x6e, 0x32, 0xd2, 0x1f, 0xc1, 0xd9, 0xd5, 0x5d, 0x6c, 0xef, 0x25, 0xbc,
+	0x75, 0x6a, 0x71, 0x5b, 0xdf, 0xb9, 0x14, 0xdf, 0x4b, 0x50, 0x68, 0xf5, 0xad, 0x40, 0x4e, 0x01,
+	0x1c, 0xea, 0xcb, 0x3b, 0x3f, 0x64, 0x26, 0x24, 0xfa, 0x0f, 0x1a, 0x4c, 0xc6, 0xe3, 0x2c, 0xf3,
+	0x42, 0x14, 0xe0, 0xa4, 0xed, 0xd5, 0x23, 0x86, 0xc3, 0x78, 0x62, 0xaa, 0x25, 0x9a, 0x86, 0x7c,
+	0x3c, 0x2a, 0xf9, 0x3c, 0x95, 0x17, 0x1d, 0x62, 0xd1, 0x6d, 0x07, 0xcd, 0x43, 0x1f, 0x63, 0x9e,
+	0xe8, 0x51, 0xbe, 0x7c, 0x2e, 0xee, 0x71, 0xfc, 0x9a, 0x95, 0xd6, 0xd4, 0x53, 0x68, 0x72, 0x2d,
+	0x34, 0x03, 0x79, 0x07, 0x47, 0x76, 0x48, 0x02, 0x2e, 0x2b, 0x0c, 0x08, 0x6f, 0x49, 0x11, 0xbf,
+	0x60, 0xeb, 0x98, 0x35, 0x8f, 0xfa, 0x76, 0x9d, 0x7c, 0x0c, 0x93, 0x7c, 0xc4, 0xc4, 0xaa, 0x99,
+	0x83, 0xb0, 0x61, 0x9c, 0xe5, 0x7a, 0x1b, 0x67, 0x5f, 0x6a, 0x70, 0xba, 0x29, 0x98, 0x6a, 0xc3,
+	0x0a, 0x0c, 0xc7, 0xc5, 0x88, 0xa7, 0x9a, 0x9e, 0x7e, 0xd0, 0x0f, 0xf3, 0x3a, 0x32, 0xea, 0x7a,
+	0xb6, 0xcd, 0xc3, 0x69, 0x39, 0x7a, 0xba, 0x29, 0xce, 0x5f, 0x1a, 0x9c, 0x6e, 0xe8, 0xfe, 0x1d,
+	0xcc, 0x2c, 0xfe, 0xe4, 0xa0, 0x87, 0x30, 0x41, 0x43, 0xe2, 0x12, 0xdf, 0xf2, 0xaa, 0xa1, 0xf4,
+	0x20, 0x2c, 0xf3, 0xe5, 0x52, 0x36, 0xee, 0xe4, 0x41, 0x32, 0xc7, 0x63, 0x3f, 0x31, 0x90, 0x65,
+	0x18, 0x51, 0x1e, 0xab, 0x9c, 0xc4, 0xa8, 0xc9, 0x51, 0x6c, 0x39, 0x13, 0xf7, 0x63, 0x86, 0x63,
+	0xe6, 0x95, 0x3e, 0x97, 0xa0, 0xeb, 0x90, 0xdf, 0x21, 0x3e, 0x89, 0x76, 0xa5, 0x75, 0x5f, 0xa6,
+	0x35, 0x48, 0x75, 0x2e, 0xd0, 0x5f, 0xe4, 0x60, 0x3a, 0x85, 0x2f, 0x1c, 0xa6, 0x6e, 0xa7, 0xa6,
+	0xbe, 0xd8, 0x15, 0x95, 0x69, 0x43, 0x42, 0xfe, 0x53, 0x45, 0x28, 0xff, 0x78, 0x0a, 0x50, 0x45,
+	0x65, 0x20, 0x10, 0xdf, 0xe4, 0x59, 0xa0, 0x97, 0x1a, 0xe4, 0x13, 0x69, 0xa0, 0x2b, 0xbd, 0x10,
+	0xb7, 0x62, 0xd6, 0x23, 0xad, 0x2f, 0xbc, 0xf8, 0xed, 0xcf, 0x97, 0x39, 0x43, 0x9f, 0xe3, 0xe4,
+	0xf9, 0x73, 0x79, 0xdb, 0x96, 0x83, 0x90, 0x3e, 0xc6, 0x36, 0x8b, 0x8c, 0x39, 0x83, 0xf8, 0x11,
+	0xb3, 0x7c, 0x1b, 0x47, 0xc6, 0xdc, 0x73, 0x49, 0xae, 0xa3, 0x25, 0x6d, 0x0e, 0xfd, 0xa4, 0xc1,
+	0xd9, 0x94, 0xe2, 0xa2, 0x63, 0xf7, 0xa3, 0x78, 0x31, 0xb6, 0x4c, 0x30, 0xf6, 0xd2, 0xdd, 0x98,
+	0xb1, 0xeb, 0x1b, 0x02, 0x6b, 0x45, 0x5f, 0xee, 0x01, 0xab, 0x7c, 0xcf, 0x92, 0xc1, 0x38, 0xfc,
+	0x6f, 0x34, 0x80, 0x23, 0x8a, 0x83, 0xe6, 0xd3, 0x11, 0xb7, 0x70, 0xb5, 0xe2, 0x95, 0xee, 0x94,
+	0xe5, 0x88, 0xd1, 0xcb, 0x02, 0xf3, 0x15, 0xd4, 0x43, 0x7d, 0xd1, 0xd7, 0x1a, 0x0c, 0xc5, 0x4c,
+	0x08, 0xbd, 0x9d, 0x1e, 0xae, 0x89, 0x2d, 0x65, 0x37, 0xbb, 0x11, 0x0c, 0x9f, 0x35, 0x29, 0x50,
+	0x14, 0x12, 0x63, 0xee, 0x39, 0xfa, 0x4a, 0x83, 0x7c, 0x82, 0x35, 0x75, 0x3a, 0x7f, 0xad, 0xe4,
+	0xaa, 0x78, 0xa6, 0xe5, 0xf0, 0x7f, 0xc8, 0x7f, 0x3e, 0xc5, 0x48, 0xe6, 0x7a, 0x41, 0xf2, 0x46,
+	0x83, 0xc9, 0x76, 0x94, 0x09, 0x2d, 0x1c, 0x8b, 0x62, 0x65, 0x97, 0xeb, 0x23, 0x01, 0x72, 0x4d,
+	0xff, 0xa0, 0x7b, 0x90, 0x4b, 0xb5, 0x36, 0x01, 0xf9, 0x89, 0x7b, 0xa5, 0xc1, 0x48, 0xf2, 0x37,
+	0x09, 0x7a, 0xa7, 0x43, 0x1d, 0x5b, 0x7f, 0xbb, 0xa4, 0x16, 0xb2, 0x22, 0x30, 0xde, 0xd0, 0xaf,
+	0xf5, 0x80, 0xd1, 0x49, 0xf8, 0xe7, 0xd8, 0xfe, 0xd0, 0xa0, 0x90, 0xc6, 0xab, 0xd0, 0x7b, 0x9d,
+	0xce, 0x5f, 0x47, 0x0a, 0x57, 0x5c, 0x3a, 0x8e, 0xa9, 0xba, 0x37, 0x9f, 0x8a, 0xbc, 0x36, 0xf4,
+	0xd5, 0x1e, 0xf2, 0x72, 0x53, 0x9c, 0xf2, 0x1c, 0x7f, 0xd1, 0x60, 0xa2, 0x99, 0x8e, 0xa1, 0x77,
+	0x3b, 0x4c, 0xaa, 0xf6, 0xb4, 0xb0, 0x58, 0xee, 0xc5, 0x44, 0xe5, 0x72, 0x4b, 0xe4, 0xb2, 0xa2,
+	0x5f, 0xef, 0x21, 0x17, 0xbb, 0xc9, 0x19, 0xcf, 0xe1, 0x5b, 0x0d, 0x46, 0x1b, 0x1e, 0x73, 0xd4,
+	0xe3, 0xab, 0x9f, 0x35, 0x60, 0xdf, 0x17, 0x40, 0x17, 0xf5, 0xab, 0x3d, 0x00, 0x8d, 0x12, 0x63,
+	0xf5, 0xb5, 0x06, 0xf9, 0x04, 0x01, 0xec, 0x34, 0x2b, 0x5a, 0x79, 0x62, 0xb1, 0x0b, 0xea, 0xa5,
+	0xaf, 0x08, 0x84, 0x4b, 0x68, 0x31, 0x13, 0xa1, 0xe2, 0xc0, 0xfc, 0xf3, 0x90, 0xae, 0xf1, 0x29,
+	0xf2, 0xbd, 0x06, 0xa3, 0x0d, 0x6c, 0xb0, 0x53, 0x11, 0xdb, 0x71, 0xd4, 0xa2, 0xd1, 0xb5, 0xbe,
+	0xea, 0x7f, 0x23, 0xe8, 0x8e, 0x6f, 0x40, 0x02, 0xf6, 0xf3, 0x23, 0xdc, 0xfc, 0xbd, 0x1a, 0x6b,
+	0xe4, 0x8f, 0xc8, 0xc8, 0x9a, 0xc3, 0xcd, 0xe5, 0x4d, 0x9b, 0x20, 0x0a, 0xdd, 0xdc, 0xb1, 0x4b,
+	0x5a, 0x79, 0xa3, 0xc1, 0x05, 0x9b, 0xd6, 0x52, 0x01, 0x55, 0xce, 0xb6, 0xf2, 0x9a, 0x4d, 0x0e,
+	0x62, 0x53, 0x7b, 0xb4, 0xac, 0x8c, 0x5c, 0xea, 0x59, 0xbe, 0x5b, 0xa2, 0xa1, 0x6b, 0xb8, 0xd8,
+	0x17, 0x10, 0x0d, 0xb9, 0x65, 0x05, 0x24, 0x6a, 0xfd, 0x47, 0xdf, 0x75, 0xf1, 0xf1, 0x5d, 0x6e,
+	0x6a, 0x5d, 0xda, 0xaf, 0x7a, 0xb4, 0xee, 0x94, 0xe2, 0x38, 0x25, 0x11, 0xa3, 0xf4, 0xa0, 0xfc,
+	0x6b, 0xac, 0xb0, 0x25, 0x14, 0xb6, 0x62, 0x85, 0x2d, 0xa1, 0xb0, 0xf5, 0xa0, 0xbc, 0x3d, 0x28,
+	0x62, 0x5d, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x17, 0x6a, 0x6f, 0xc0, 0x14, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2069,106 +2049,3 @@ var _BigtableTableAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/bigtable/admin/v2/bigtable_table_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/bigtable/admin/v2/bigtable_table_admin.proto", fileDescriptor_bigtable_table_admin_4c164c60709448e2)
-}
-
-var fileDescriptor_bigtable_table_admin_4c164c60709448e2 = []byte{
-	// 1520 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcb, 0x6f, 0xdc, 0x54,
-	0x17, 0xaf, 0x27, 0x8f, 0x26, 0x67, 0xf2, 0xea, 0xfd, 0xd2, 0x76, 0x3a, 0x6d, 0x93, 0xc8, 0x5f,
-	0x55, 0x42, 0x52, 0xc6, 0x62, 0xaa, 0xa8, 0x21, 0x6d, 0x20, 0x9d, 0x84, 0x26, 0x05, 0x4a, 0x23,
-	0xb7, 0xaa, 0xd4, 0x2a, 0xd2, 0xc8, 0xb1, 0x6f, 0x9c, 0xdb, 0x78, 0x7c, 0x8d, 0x7d, 0xa7, 0x69,
-	0x0a, 0x5d, 0xd0, 0x0d, 0x12, 0xdb, 0xae, 0x2a, 0x24, 0xa4, 0x6e, 0x59, 0x22, 0x24, 0xa4, 0x0a,
-	0x09, 0xb1, 0x65, 0xcb, 0x9a, 0x05, 0x12, 0x6b, 0x56, 0xfc, 0x01, 0xe8, 0x3e, 0x9c, 0x78, 0x1e,
-	0x1e, 0xcf, 0x84, 0x0d, 0x9b, 0xc8, 0xf7, 0xdc, 0xf3, 0xf8, 0x9d, 0x73, 0xee, 0x3d, 0xf7, 0x37,
-	0x81, 0xab, 0x2e, 0xa5, 0xae, 0x87, 0x8d, 0x6d, 0xe2, 0x32, 0x6b, 0xdb, 0xc3, 0x86, 0xe5, 0xd4,
-	0x88, 0x6f, 0x3c, 0x29, 0x1f, 0x4a, 0xaa, 0xf2, 0xaf, 0x90, 0x97, 0x82, 0x90, 0x32, 0x8a, 0x0a,
-	0xd2, 0xa8, 0x14, 0xab, 0x94, 0xe4, 0xe6, 0x93, 0x72, 0xf1, 0x82, 0x72, 0x67, 0x05, 0xc4, 0xb0,
-	0x7c, 0x9f, 0x32, 0x8b, 0x11, 0xea, 0x47, 0xd2, 0xae, 0x78, 0x29, 0x35, 0x98, 0x74, 0x23, 0xb5,
-	0xfe, 0xaf, 0xb4, 0x3c, 0xea, 0xbb, 0x61, 0xdd, 0xf7, 0x89, 0xef, 0x1a, 0x34, 0xc0, 0x61, 0x83,
-	0xab, 0x29, 0xa5, 0x24, 0x56, 0xdb, 0xf5, 0x1d, 0xc3, 0xa9, 0x4b, 0x05, 0xb5, 0x7f, 0xbe, 0x79,
-	0x1f, 0xd7, 0x02, 0x76, 0xa0, 0x36, 0xa7, 0x9b, 0x37, 0x19, 0xa9, 0xe1, 0x88, 0x59, 0xb5, 0x40,
-	0x2a, 0xe8, 0x7f, 0x6b, 0x80, 0x56, 0x43, 0x6c, 0x31, 0x7c, 0x9f, 0x03, 0x33, 0xf1, 0x67, 0x75,
-	0x1c, 0x31, 0x74, 0x06, 0x06, 0x03, 0x2b, 0xc4, 0x3e, 0x2b, 0x68, 0x33, 0xda, 0xec, 0xb0, 0xa9,
-	0x56, 0xe8, 0x1c, 0x0c, 0xc9, 0x22, 0x11, 0xa7, 0x90, 0x13, 0x3b, 0x27, 0xc5, 0xfa, 0xb6, 0x83,
-	0x16, 0x60, 0x40, 0x7c, 0x16, 0xfa, 0x66, 0xb4, 0xd9, 0x7c, 0x79, 0xba, 0x94, 0x56, 0xba, 0x92,
-	0x8c, 0x24, 0xb5, 0xd1, 0x43, 0x18, 0x23, 0x3e, 0x61, 0xc4, 0xf2, 0xaa, 0x51, 0xe0, 0x11, 0x16,
-	0x15, 0xfa, 0x67, 0xfa, 0x66, 0xf3, 0xe5, 0x72, 0xba, 0x7d, 0x2b, 0xde, 0xd2, 0x3d, 0x6e, 0x6a,
-	0x8e, 0x2a, 0x4f, 0x62, 0x15, 0x15, 0xcf, 0xc1, 0x80, 0xf8, 0x42, 0x13, 0xd0, 0xb7, 0x87, 0x0f,
-	0x44, 0x2a, 0x23, 0x26, 0xff, 0xd4, 0xbf, 0x80, 0xa9, 0x84, 0x97, 0x5b, 0x21, 0xad, 0xdd, 0xf3,
-	0xad, 0x20, 0xda, 0xa5, 0xec, 0x5f, 0x54, 0xe0, 0x2d, 0x18, 0x8f, 0x68, 0x3d, 0xb4, 0x71, 0x35,
-	0x52, 0xce, 0x44, 0x2d, 0x86, 0xcd, 0x31, 0x29, 0x8e, 0x43, 0xe8, 0xaf, 0x34, 0xf8, 0xdf, 0x5a,
-	0x48, 0x03, 0x93, 0xee, 0x9b, 0x96, 0xef, 0x1e, 0x56, 0x1d, 0x41, 0xbf, 0x6f, 0xd5, 0xb0, 0x8a,
-	0x28, 0xbe, 0xd1, 0x65, 0x18, 0x0b, 0xe9, 0x7e, 0x75, 0x0f, 0x1f, 0x54, 0x83, 0x10, 0xef, 0x90,
-	0xa7, 0x22, 0xea, 0xc8, 0xc6, 0x09, 0x73, 0x24, 0xa4, 0xfb, 0x1f, 0xe3, 0x83, 0x4d, 0x21, 0x45,
-	0x37, 0xa0, 0xe8, 0x60, 0x0f, 0x33, 0x5c, 0xb5, 0x3c, 0xaf, 0xea, 0x58, 0xcc, 0xaa, 0xee, 0x84,
-	0xb4, 0x56, 0x3d, 0xea, 0xc9, 0xd0, 0xc6, 0x09, 0xf3, 0x8c, 0xd4, 0xb9, 0xe9, 0x79, 0x6b, 0x16,
-	0xb3, 0x78, 0xde, 0xa2, 0x00, 0x95, 0x21, 0x18, 0x64, 0x56, 0xe8, 0x62, 0xa6, 0xbf, 0xd6, 0xe0,
-	0xd4, 0x27, 0x24, 0x62, 0x42, 0x1e, 0x65, 0x55, 0x63, 0x11, 0xfa, 0x9f, 0x10, 0xbc, 0x2f, 0x30,
-	0x8d, 0x95, 0x2f, 0x65, 0xf4, 0xbc, 0xf4, 0x80, 0xe0, 0x7d, 0x53, 0x58, 0xa0, 0xf3, 0x30, 0x1c,
-	0x58, 0x2e, 0xae, 0x46, 0xe4, 0x19, 0x2e, 0xf4, 0xcf, 0x68, 0xb3, 0x03, 0xe6, 0x10, 0x17, 0xdc,
-	0x23, 0xcf, 0x30, 0xba, 0x08, 0x20, 0x36, 0x19, 0xdd, 0xc3, 0xbe, 0x2a, 0xa2, 0x50, 0xbf, 0xcf,
-	0x05, 0x7a, 0x1d, 0x50, 0x12, 0x62, 0x14, 0x50, 0x3f, 0xc2, 0xe8, 0x1a, 0xcf, 0x81, 0x4b, 0x0a,
-	0x9a, 0x38, 0x41, 0x99, 0x27, 0x50, 0xa9, 0xa3, 0xcb, 0x30, 0xee, 0xe3, 0xa7, 0xac, 0x9a, 0x08,
-	0x29, 0x3b, 0x3b, 0xca, 0xc5, 0x9b, 0x87, 0x61, 0xab, 0x30, 0xbe, 0x8e, 0x59, 0xc3, 0x3d, 0x69,
-	0xd7, 0xb1, 0x63, 0xd7, 0x44, 0x9f, 0x05, 0xb4, 0x26, 0xfa, 0x93, 0x15, 0x43, 0xff, 0x3d, 0x07,
-	0xe7, 0xef, 0x50, 0x87, 0xec, 0x1c, 0xac, 0x52, 0xaf, 0x5e, 0xf3, 0x6f, 0x59, 0x35, 0xe2, 0x91,
-	0xa3, 0x7e, 0xb5, 0xc3, 0xb5, 0x0b, 0xa3, 0x35, 0x6e, 0x42, 0x6c, 0x39, 0x5f, 0x0a, 0x39, 0x51,
-	0xa6, 0x4a, 0x3a, 0xc0, 0x0e, 0x11, 0xe4, 0x9e, 0x72, 0x65, 0x36, 0x3a, 0x2e, 0xfe, 0xac, 0xc1,
-	0x48, 0x72, 0x1f, 0x8d, 0x41, 0x8e, 0x38, 0x0a, 0x4c, 0x8e, 0x38, 0x68, 0x05, 0x06, 0x6d, 0x71,
-	0xfd, 0x44, 0x91, 0xf2, 0xe5, 0xcb, 0x1d, 0x2e, 0xfb, 0x51, 0xf4, 0x83, 0x8d, 0x13, 0xa6, 0xb2,
-	0xe3, 0x1e, 0xea, 0x81, 0xc3, 0x3d, 0xf4, 0xf5, 0xea, 0x41, 0xda, 0xa1, 0x49, 0xe8, 0x77, 0x42,
-	0x1a, 0x88, 0xb3, 0xc7, 0xaf, 0x86, 0x58, 0x55, 0x06, 0xa0, 0xaf, 0x46, 0x1d, 0x7d, 0x01, 0xa6,
-	0xd7, 0xb1, 0xcf, 0x27, 0x31, 0x5e, 0xa5, 0x7e, 0x44, 0x22, 0x86, 0x7d, 0xfb, 0x40, 0x1c, 0x83,
-	0x4e, 0x6d, 0xb9, 0x0b, 0x33, 0xe9, 0x66, 0xea, 0x98, 0xce, 0xc3, 0x29, 0xfb, 0x68, 0x4f, 0x9d,
-	0x37, 0xe9, 0x64, 0xc2, 0x6e, 0x32, 0xd2, 0x1f, 0xc1, 0xd9, 0xd5, 0x5d, 0x6c, 0xef, 0x25, 0xbc,
-	0x75, 0x6a, 0x71, 0x5b, 0xdf, 0xb9, 0x14, 0xdf, 0x4b, 0x50, 0x68, 0xf5, 0xad, 0x40, 0x4e, 0x01,
-	0x1c, 0xea, 0xcb, 0x3b, 0x3f, 0x64, 0x26, 0x24, 0xfa, 0x0f, 0x1a, 0x4c, 0xc6, 0xe3, 0x2c, 0xf3,
-	0x42, 0x14, 0xe0, 0xa4, 0xed, 0xd5, 0x23, 0x86, 0xc3, 0x78, 0x62, 0xaa, 0x25, 0x9a, 0x86, 0x7c,
-	0x3c, 0x2a, 0xf9, 0x3c, 0x95, 0x17, 0x1d, 0x62, 0xd1, 0x6d, 0x07, 0xcd, 0x43, 0x1f, 0x63, 0x9e,
-	0xe8, 0x51, 0xbe, 0x7c, 0x2e, 0xee, 0x71, 0xfc, 0x9a, 0x95, 0xd6, 0xd4, 0x53, 0x68, 0x72, 0x2d,
-	0x34, 0x03, 0x79, 0x07, 0x47, 0x76, 0x48, 0x02, 0x2e, 0x2b, 0x0c, 0x08, 0x6f, 0x49, 0x11, 0xbf,
-	0x60, 0xeb, 0x98, 0x35, 0x8f, 0xfa, 0x76, 0x9d, 0x7c, 0x0c, 0x93, 0x7c, 0xc4, 0xc4, 0xaa, 0x99,
-	0x83, 0xb0, 0x61, 0x9c, 0xe5, 0x7a, 0x1b, 0x67, 0x5f, 0x6a, 0x70, 0xba, 0x29, 0x98, 0x6a, 0xc3,
-	0x0a, 0x0c, 0xc7, 0xc5, 0x88, 0xa7, 0x9a, 0x9e, 0x7e, 0xd0, 0x0f, 0xf3, 0x3a, 0x32, 0xea, 0x7a,
-	0xb6, 0xcd, 0xc3, 0x69, 0x39, 0x7a, 0xba, 0x29, 0xce, 0x5f, 0x1a, 0x9c, 0x6e, 0xe8, 0xfe, 0x1d,
-	0xcc, 0x2c, 0xfe, 0xe4, 0xa0, 0x87, 0x30, 0x41, 0x43, 0xe2, 0x12, 0xdf, 0xf2, 0xaa, 0xa1, 0xf4,
-	0x20, 0x2c, 0xf3, 0xe5, 0x52, 0x36, 0xee, 0xe4, 0x41, 0x32, 0xc7, 0x63, 0x3f, 0x31, 0x90, 0x65,
-	0x18, 0x51, 0x1e, 0xab, 0x9c, 0xc4, 0xa8, 0xc9, 0x51, 0x6c, 0x39, 0x13, 0xf7, 0x63, 0x86, 0x63,
-	0xe6, 0x95, 0x3e, 0x97, 0xa0, 0xeb, 0x90, 0xdf, 0x21, 0x3e, 0x89, 0x76, 0xa5, 0x75, 0x5f, 0xa6,
-	0x35, 0x48, 0x75, 0x2e, 0xd0, 0x5f, 0xe4, 0x60, 0x3a, 0x85, 0x2f, 0x1c, 0xa6, 0x6e, 0xa7, 0xa6,
-	0xbe, 0xd8, 0x15, 0x95, 0x69, 0x43, 0x42, 0xfe, 0x53, 0x45, 0x28, 0xff, 0x78, 0x0a, 0x50, 0x45,
-	0x65, 0x20, 0x10, 0xdf, 0xe4, 0x59, 0xa0, 0x97, 0x1a, 0xe4, 0x13, 0x69, 0xa0, 0x2b, 0xbd, 0x10,
-	0xb7, 0x62, 0xd6, 0x23, 0xad, 0x2f, 0xbc, 0xf8, 0xed, 0xcf, 0x97, 0x39, 0x43, 0x9f, 0xe3, 0xe4,
-	0xf9, 0x73, 0x79, 0xdb, 0x96, 0x83, 0x90, 0x3e, 0xc6, 0x36, 0x8b, 0x8c, 0x39, 0x83, 0xf8, 0x11,
-	0xb3, 0x7c, 0x1b, 0x47, 0xc6, 0xdc, 0x73, 0x49, 0xae, 0xa3, 0x25, 0x6d, 0x0e, 0xfd, 0xa4, 0xc1,
-	0xd9, 0x94, 0xe2, 0xa2, 0x63, 0xf7, 0xa3, 0x78, 0x31, 0xb6, 0x4c, 0x30, 0xf6, 0xd2, 0xdd, 0x98,
-	0xb1, 0xeb, 0x1b, 0x02, 0x6b, 0x45, 0x5f, 0xee, 0x01, 0xab, 0x7c, 0xcf, 0x92, 0xc1, 0x38, 0xfc,
-	0x6f, 0x34, 0x80, 0x23, 0x8a, 0x83, 0xe6, 0xd3, 0x11, 0xb7, 0x70, 0xb5, 0xe2, 0x95, 0xee, 0x94,
-	0xe5, 0x88, 0xd1, 0xcb, 0x02, 0xf3, 0x15, 0xd4, 0x43, 0x7d, 0xd1, 0xd7, 0x1a, 0x0c, 0xc5, 0x4c,
-	0x08, 0xbd, 0x9d, 0x1e, 0xae, 0x89, 0x2d, 0x65, 0x37, 0xbb, 0x11, 0x0c, 0x9f, 0x35, 0x29, 0x50,
-	0x14, 0x12, 0x63, 0xee, 0x39, 0xfa, 0x4a, 0x83, 0x7c, 0x82, 0x35, 0x75, 0x3a, 0x7f, 0xad, 0xe4,
-	0xaa, 0x78, 0xa6, 0xe5, 0xf0, 0x7f, 0xc8, 0x7f, 0x3e, 0xc5, 0x48, 0xe6, 0x7a, 0x41, 0xf2, 0x46,
-	0x83, 0xc9, 0x76, 0x94, 0x09, 0x2d, 0x1c, 0x8b, 0x62, 0x65, 0x97, 0xeb, 0x23, 0x01, 0x72, 0x4d,
-	0xff, 0xa0, 0x7b, 0x90, 0x4b, 0xb5, 0x36, 0x01, 0xf9, 0x89, 0x7b, 0xa5, 0xc1, 0x48, 0xf2, 0x37,
-	0x09, 0x7a, 0xa7, 0x43, 0x1d, 0x5b, 0x7f, 0xbb, 0xa4, 0x16, 0xb2, 0x22, 0x30, 0xde, 0xd0, 0xaf,
-	0xf5, 0x80, 0xd1, 0x49, 0xf8, 0xe7, 0xd8, 0xfe, 0xd0, 0xa0, 0x90, 0xc6, 0xab, 0xd0, 0x7b, 0x9d,
-	0xce, 0x5f, 0x47, 0x0a, 0x57, 0x5c, 0x3a, 0x8e, 0xa9, 0xba, 0x37, 0x9f, 0x8a, 0xbc, 0x36, 0xf4,
-	0xd5, 0x1e, 0xf2, 0x72, 0x53, 0x9c, 0xf2, 0x1c, 0x7f, 0xd1, 0x60, 0xa2, 0x99, 0x8e, 0xa1, 0x77,
-	0x3b, 0x4c, 0xaa, 0xf6, 0xb4, 0xb0, 0x58, 0xee, 0xc5, 0x44, 0xe5, 0x72, 0x4b, 0xe4, 0xb2, 0xa2,
-	0x5f, 0xef, 0x21, 0x17, 0xbb, 0xc9, 0x19, 0xcf, 0xe1, 0x5b, 0x0d, 0x46, 0x1b, 0x1e, 0x73, 0xd4,
-	0xe3, 0xab, 0x9f, 0x35, 0x60, 0xdf, 0x17, 0x40, 0x17, 0xf5, 0xab, 0x3d, 0x00, 0x8d, 0x12, 0x63,
-	0xf5, 0xb5, 0x06, 0xf9, 0x04, 0x01, 0xec, 0x34, 0x2b, 0x5a, 0x79, 0x62, 0xb1, 0x0b, 0xea, 0xa5,
-	0xaf, 0x08, 0x84, 0x4b, 0x68, 0x31, 0x13, 0xa1, 0xe2, 0xc0, 0xfc, 0xf3, 0x90, 0xae, 0xf1, 0x29,
-	0xf2, 0xbd, 0x06, 0xa3, 0x0d, 0x6c, 0xb0, 0x53, 0x11, 0xdb, 0x71, 0xd4, 0xa2, 0xd1, 0xb5, 0xbe,
-	0xea, 0x7f, 0x23, 0xe8, 0x8e, 0x6f, 0x40, 0x02, 0xf6, 0xf3, 0x23, 0xdc, 0xfc, 0xbd, 0x1a, 0x6b,
-	0xe4, 0x8f, 0xc8, 0xc8, 0x9a, 0xc3, 0xcd, 0xe5, 0x4d, 0x9b, 0x20, 0x0a, 0xdd, 0xdc, 0xb1, 0x4b,
-	0x5a, 0x79, 0xa3, 0xc1, 0x05, 0x9b, 0xd6, 0x52, 0x01, 0x55, 0xce, 0xb6, 0xf2, 0x9a, 0x4d, 0x0e,
-	0x62, 0x53, 0x7b, 0xb4, 0xac, 0x8c, 0x5c, 0xea, 0x59, 0xbe, 0x5b, 0xa2, 0xa1, 0x6b, 0xb8, 0xd8,
-	0x17, 0x10, 0x0d, 0xb9, 0x65, 0x05, 0x24, 0x6a, 0xfd, 0x47, 0xdf, 0x75, 0xf1, 0xf1, 0x5d, 0x6e,
-	0x6a, 0x5d, 0xda, 0xaf, 0x7a, 0xb4, 0xee, 0x94, 0xe2, 0x38, 0x25, 0x11, 0xa3, 0xf4, 0xa0, 0xfc,
-	0x6b, 0xac, 0xb0, 0x25, 0x14, 0xb6, 0x62, 0x85, 0x2d, 0xa1, 0xb0, 0xf5, 0xa0, 0xbc, 0x3d, 0x28,
-	0x62, 0x5d, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x17, 0x6a, 0x6f, 0xc0, 0x14, 0x00, 0x00,
-}
diff --git a/googleapis/bigtable/admin/v2/common.pb.go b/googleapis/bigtable/admin/v2/common.pb.go
index 72fe729dbc..b70a18a326 100644
--- a/googleapis/bigtable/admin/v2/common.pb.go
+++ b/googleapis/bigtable/admin/v2/common.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/common.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Storage media types for persisting Bigtable data.
 type StorageType int32
@@ -37,6 +40,7 @@ var StorageType_name = map[int32]string{
 	1: "SSD",
 	2: "HDD",
 }
+
 var StorageType_value = map[string]int32{
 	"STORAGE_TYPE_UNSPECIFIED": 0,
 	"SSD":                      1,
@@ -46,8 +50,9 @@ var StorageType_value = map[string]int32{
 func (x StorageType) String() string {
 	return proto.EnumName(StorageType_name, int32(x))
 }
+
 func (StorageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_0e01de0fdbb848ad, []int{0}
+	return fileDescriptor_79ab584e3c858108, []int{0}
 }
 
 func init() {
@@ -55,10 +60,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/v2/common.proto", fileDescriptor_common_0e01de0fdbb848ad)
+	proto.RegisterFile("google/bigtable/admin/v2/common.proto", fileDescriptor_79ab584e3c858108)
 }
 
-var fileDescriptor_common_0e01de0fdbb848ad = []byte{
+var fileDescriptor_79ab584e3c858108 = []byte{
 	// 270 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd0, 0xcf, 0x4b, 0xc3, 0x30,
 	0x14, 0x07, 0x70, 0x3b, 0x41, 0x21, 0xbb, 0x94, 0x9e, 0xc6, 0x28, 0x7a, 0xf2, 0xe2, 0x21, 0x81,
diff --git a/googleapis/bigtable/admin/v2/instance.pb.go b/googleapis/bigtable/admin/v2/instance.pb.go
index b5e936cef8..c1032b0ea2 100644
--- a/googleapis/bigtable/admin/v2/instance.pb.go
+++ b/googleapis/bigtable/admin/v2/instance.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/instance.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible states of an instance.
 type Instance_State int32
@@ -38,6 +41,7 @@ var Instance_State_name = map[int32]string{
 	1: "READY",
 	2: "CREATING",
 }
+
 var Instance_State_value = map[string]int32{
 	"STATE_NOT_KNOWN": 0,
 	"READY":           1,
@@ -47,8 +51,9 @@ var Instance_State_value = map[string]int32{
 func (x Instance_State) String() string {
 	return proto.EnumName(Instance_State_name, int32(x))
 }
+
 func (Instance_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{0, 0}
+	return fileDescriptor_712127d2a900984d, []int{0, 0}
 }
 
 // The type of the instance.
@@ -77,6 +82,7 @@ var Instance_Type_name = map[int32]string{
 	1: "PRODUCTION",
 	2: "DEVELOPMENT",
 }
+
 var Instance_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"PRODUCTION":       1,
@@ -86,8 +92,9 @@ var Instance_Type_value = map[string]int32{
 func (x Instance_Type) String() string {
 	return proto.EnumName(Instance_Type_name, int32(x))
 }
+
 func (Instance_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{0, 1}
+	return fileDescriptor_712127d2a900984d, []int{0, 1}
 }
 
 // Possible states of a cluster.
@@ -120,6 +127,7 @@ var Cluster_State_name = map[int32]string{
 	3: "RESIZING",
 	4: "DISABLED",
 }
+
 var Cluster_State_value = map[string]int32{
 	"STATE_NOT_KNOWN": 0,
 	"READY":           1,
@@ -131,8 +139,9 @@ var Cluster_State_value = map[string]int32{
 func (x Cluster_State) String() string {
 	return proto.EnumName(Cluster_State_name, int32(x))
 }
+
 func (Cluster_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{1, 0}
+	return fileDescriptor_712127d2a900984d, []int{1, 0}
 }
 
 // A collection of Bigtable [Tables][google.bigtable.admin.v2.Table] and
@@ -174,16 +183,17 @@ func (m *Instance) Reset()         { *m = Instance{} }
 func (m *Instance) String() string { return proto.CompactTextString(m) }
 func (*Instance) ProtoMessage()    {}
 func (*Instance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{0}
+	return fileDescriptor_712127d2a900984d, []int{0}
 }
+
 func (m *Instance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instance.Unmarshal(m, b)
 }
 func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
 }
-func (dst *Instance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instance.Merge(dst, src)
+func (m *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(m, src)
 }
 func (m *Instance) XXX_Size() int {
 	return xxx_messageInfo_Instance.Size(m)
@@ -262,16 +272,17 @@ func (m *Cluster) Reset()         { *m = Cluster{} }
 func (m *Cluster) String() string { return proto.CompactTextString(m) }
 func (*Cluster) ProtoMessage()    {}
 func (*Cluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{1}
+	return fileDescriptor_712127d2a900984d, []int{1}
 }
+
 func (m *Cluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cluster.Unmarshal(m, b)
 }
 func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
 }
-func (dst *Cluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cluster.Merge(dst, src)
+func (m *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(m, src)
 }
 func (m *Cluster) XXX_Size() int {
 	return xxx_messageInfo_Cluster.Size(m)
@@ -351,16 +362,17 @@ func (m *AppProfile) Reset()         { *m = AppProfile{} }
 func (m *AppProfile) String() string { return proto.CompactTextString(m) }
 func (*AppProfile) ProtoMessage()    {}
 func (*AppProfile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{2}
+	return fileDescriptor_712127d2a900984d, []int{2}
 }
+
 func (m *AppProfile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppProfile.Unmarshal(m, b)
 }
 func (m *AppProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppProfile.Marshal(b, m, deterministic)
 }
-func (dst *AppProfile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppProfile.Merge(dst, src)
+func (m *AppProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppProfile.Merge(m, src)
 }
 func (m *AppProfile) XXX_Size() int {
 	return xxx_messageInfo_AppProfile.Size(m)
@@ -429,80 +441,14 @@ func (m *AppProfile) GetSingleClusterRouting() *AppProfile_SingleClusterRouting
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AppProfile) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AppProfile_OneofMarshaler, _AppProfile_OneofUnmarshaler, _AppProfile_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AppProfile) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AppProfile_MultiClusterRoutingUseAny_)(nil),
 		(*AppProfile_SingleClusterRouting_)(nil),
 	}
 }
 
-func _AppProfile_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AppProfile)
-	// routing_policy
-	switch x := m.RoutingPolicy.(type) {
-	case *AppProfile_MultiClusterRoutingUseAny_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MultiClusterRoutingUseAny); err != nil {
-			return err
-		}
-	case *AppProfile_SingleClusterRouting_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SingleClusterRouting); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AppProfile.RoutingPolicy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AppProfile_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AppProfile)
-	switch tag {
-	case 5: // routing_policy.multi_cluster_routing_use_any
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppProfile_MultiClusterRoutingUseAny)
-		err := b.DecodeMessage(msg)
-		m.RoutingPolicy = &AppProfile_MultiClusterRoutingUseAny_{msg}
-		return true, err
-	case 6: // routing_policy.single_cluster_routing
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppProfile_SingleClusterRouting)
-		err := b.DecodeMessage(msg)
-		m.RoutingPolicy = &AppProfile_SingleClusterRouting_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AppProfile_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AppProfile)
-	// routing_policy
-	switch x := m.RoutingPolicy.(type) {
-	case *AppProfile_MultiClusterRoutingUseAny_:
-		s := proto.Size(x.MultiClusterRoutingUseAny)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AppProfile_SingleClusterRouting_:
-		s := proto.Size(x.SingleClusterRouting)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Read/write requests may be routed to any cluster in the instance, and will
 // fail over to another cluster in the event of transient errors or delays.
 // Choosing this option sacrifices read-your-writes consistency to improve
@@ -517,16 +463,17 @@ func (m *AppProfile_MultiClusterRoutingUseAny) Reset()         { *m = AppProfile
 func (m *AppProfile_MultiClusterRoutingUseAny) String() string { return proto.CompactTextString(m) }
 func (*AppProfile_MultiClusterRoutingUseAny) ProtoMessage()    {}
 func (*AppProfile_MultiClusterRoutingUseAny) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{2, 0}
+	return fileDescriptor_712127d2a900984d, []int{2, 0}
 }
+
 func (m *AppProfile_MultiClusterRoutingUseAny) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Unmarshal(m, b)
 }
 func (m *AppProfile_MultiClusterRoutingUseAny) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Marshal(b, m, deterministic)
 }
-func (dst *AppProfile_MultiClusterRoutingUseAny) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Merge(dst, src)
+func (m *AppProfile_MultiClusterRoutingUseAny) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Merge(m, src)
 }
 func (m *AppProfile_MultiClusterRoutingUseAny) XXX_Size() int {
 	return xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Size(m)
@@ -556,16 +503,17 @@ func (m *AppProfile_SingleClusterRouting) Reset()         { *m = AppProfile_Sing
 func (m *AppProfile_SingleClusterRouting) String() string { return proto.CompactTextString(m) }
 func (*AppProfile_SingleClusterRouting) ProtoMessage()    {}
 func (*AppProfile_SingleClusterRouting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instance_e9d126e00e9552ae, []int{2, 1}
+	return fileDescriptor_712127d2a900984d, []int{2, 1}
 }
+
 func (m *AppProfile_SingleClusterRouting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppProfile_SingleClusterRouting.Unmarshal(m, b)
 }
 func (m *AppProfile_SingleClusterRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppProfile_SingleClusterRouting.Marshal(b, m, deterministic)
 }
-func (dst *AppProfile_SingleClusterRouting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppProfile_SingleClusterRouting.Merge(dst, src)
+func (m *AppProfile_SingleClusterRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppProfile_SingleClusterRouting.Merge(m, src)
 }
 func (m *AppProfile_SingleClusterRouting) XXX_Size() int {
 	return xxx_messageInfo_AppProfile_SingleClusterRouting.Size(m)
@@ -591,22 +539,22 @@ func (m *AppProfile_SingleClusterRouting) GetAllowTransactionalWrites() bool {
 }
 
 func init() {
+	proto.RegisterEnum("google.bigtable.admin.v2.Instance_State", Instance_State_name, Instance_State_value)
+	proto.RegisterEnum("google.bigtable.admin.v2.Instance_Type", Instance_Type_name, Instance_Type_value)
+	proto.RegisterEnum("google.bigtable.admin.v2.Cluster_State", Cluster_State_name, Cluster_State_value)
 	proto.RegisterType((*Instance)(nil), "google.bigtable.admin.v2.Instance")
 	proto.RegisterMapType((map[string]string)(nil), "google.bigtable.admin.v2.Instance.LabelsEntry")
 	proto.RegisterType((*Cluster)(nil), "google.bigtable.admin.v2.Cluster")
 	proto.RegisterType((*AppProfile)(nil), "google.bigtable.admin.v2.AppProfile")
 	proto.RegisterType((*AppProfile_MultiClusterRoutingUseAny)(nil), "google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny")
 	proto.RegisterType((*AppProfile_SingleClusterRouting)(nil), "google.bigtable.admin.v2.AppProfile.SingleClusterRouting")
-	proto.RegisterEnum("google.bigtable.admin.v2.Instance_State", Instance_State_name, Instance_State_value)
-	proto.RegisterEnum("google.bigtable.admin.v2.Instance_Type", Instance_Type_name, Instance_Type_value)
-	proto.RegisterEnum("google.bigtable.admin.v2.Cluster_State", Cluster_State_name, Cluster_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/v2/instance.proto", fileDescriptor_instance_e9d126e00e9552ae)
+	proto.RegisterFile("google/bigtable/admin/v2/instance.proto", fileDescriptor_712127d2a900984d)
 }
 
-var fileDescriptor_instance_e9d126e00e9552ae = []byte{
+var fileDescriptor_712127d2a900984d = []byte{
 	// 765 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x8e, 0xdb, 0x44,
 	0x14, 0x8e, 0xf3, 0xb3, 0x64, 0x4f, 0xca, 0xd6, 0x1a, 0x22, 0x94, 0x86, 0x16, 0x42, 0xa4, 0xaa,
diff --git a/googleapis/bigtable/admin/v2/table.pb.go b/googleapis/bigtable/admin/v2/table.pb.go
index 6dd38e1b35..8a98b6f305 100644
--- a/googleapis/bigtable/admin/v2/table.pb.go
+++ b/googleapis/bigtable/admin/v2/table.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/table.proto
 
-package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible timestamp granularities to use when keeping multiple versions
 // of data in a table.
@@ -37,6 +40,7 @@ var Table_TimestampGranularity_name = map[int32]string{
 	0: "TIMESTAMP_GRANULARITY_UNSPECIFIED",
 	1: "MILLIS",
 }
+
 var Table_TimestampGranularity_value = map[string]int32{
 	"TIMESTAMP_GRANULARITY_UNSPECIFIED": 0,
 	"MILLIS":                            1,
@@ -45,8 +49,9 @@ var Table_TimestampGranularity_value = map[string]int32{
 func (x Table_TimestampGranularity) String() string {
 	return proto.EnumName(Table_TimestampGranularity_name, int32(x))
 }
+
 func (Table_TimestampGranularity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{0, 0}
+	return fileDescriptor_ea1666be9e81bb35, []int{0, 0}
 }
 
 // Defines a view over a table's fields.
@@ -73,6 +78,7 @@ var Table_View_name = map[int32]string{
 	3: "REPLICATION_VIEW",
 	4: "FULL",
 }
+
 var Table_View_value = map[string]int32{
 	"VIEW_UNSPECIFIED": 0,
 	"NAME_ONLY":        1,
@@ -84,8 +90,9 @@ var Table_View_value = map[string]int32{
 func (x Table_View) String() string {
 	return proto.EnumName(Table_View_name, int32(x))
 }
+
 func (Table_View) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{0, 1}
+	return fileDescriptor_ea1666be9e81bb35, []int{0, 1}
 }
 
 // Table replication states.
@@ -117,6 +124,7 @@ var Table_ClusterState_ReplicationState_name = map[int32]string{
 	3: "UNPLANNED_MAINTENANCE",
 	4: "READY",
 }
+
 var Table_ClusterState_ReplicationState_value = map[string]int32{
 	"STATE_NOT_KNOWN":       0,
 	"INITIALIZING":          1,
@@ -128,8 +136,9 @@ var Table_ClusterState_ReplicationState_value = map[string]int32{
 func (x Table_ClusterState_ReplicationState) String() string {
 	return proto.EnumName(Table_ClusterState_ReplicationState_name, int32(x))
 }
+
 func (Table_ClusterState_ReplicationState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{0, 0, 0}
+	return fileDescriptor_ea1666be9e81bb35, []int{0, 0, 0}
 }
 
 // Possible states of a snapshot.
@@ -151,6 +160,7 @@ var Snapshot_State_name = map[int32]string{
 	1: "READY",
 	2: "CREATING",
 }
+
 var Snapshot_State_value = map[string]int32{
 	"STATE_NOT_KNOWN": 0,
 	"READY":           1,
@@ -160,8 +170,9 @@ var Snapshot_State_value = map[string]int32{
 func (x Snapshot_State) String() string {
 	return proto.EnumName(Snapshot_State_name, int32(x))
 }
+
 func (Snapshot_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{3, 0}
+	return fileDescriptor_ea1666be9e81bb35, []int{3, 0}
 }
 
 // A collection of user data indexed by row, column, and timestamp.
@@ -198,16 +209,17 @@ func (m *Table) Reset()         { *m = Table{} }
 func (m *Table) String() string { return proto.CompactTextString(m) }
 func (*Table) ProtoMessage()    {}
 func (*Table) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{0}
+	return fileDescriptor_ea1666be9e81bb35, []int{0}
 }
+
 func (m *Table) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Table.Unmarshal(m, b)
 }
 func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
 }
-func (dst *Table) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Table.Merge(dst, src)
+func (m *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(m, src)
 }
 func (m *Table) XXX_Size() int {
 	return xxx_messageInfo_Table.Size(m)
@@ -260,16 +272,17 @@ func (m *Table_ClusterState) Reset()         { *m = Table_ClusterState{} }
 func (m *Table_ClusterState) String() string { return proto.CompactTextString(m) }
 func (*Table_ClusterState) ProtoMessage()    {}
 func (*Table_ClusterState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{0, 0}
+	return fileDescriptor_ea1666be9e81bb35, []int{0, 0}
 }
+
 func (m *Table_ClusterState) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Table_ClusterState.Unmarshal(m, b)
 }
 func (m *Table_ClusterState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Table_ClusterState.Marshal(b, m, deterministic)
 }
-func (dst *Table_ClusterState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Table_ClusterState.Merge(dst, src)
+func (m *Table_ClusterState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table_ClusterState.Merge(m, src)
 }
 func (m *Table_ClusterState) XXX_Size() int {
 	return xxx_messageInfo_Table_ClusterState.Size(m)
@@ -305,16 +318,17 @@ func (m *ColumnFamily) Reset()         { *m = ColumnFamily{} }
 func (m *ColumnFamily) String() string { return proto.CompactTextString(m) }
 func (*ColumnFamily) ProtoMessage()    {}
 func (*ColumnFamily) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{1}
+	return fileDescriptor_ea1666be9e81bb35, []int{1}
 }
+
 func (m *ColumnFamily) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColumnFamily.Unmarshal(m, b)
 }
 func (m *ColumnFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColumnFamily.Marshal(b, m, deterministic)
 }
-func (dst *ColumnFamily) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColumnFamily.Merge(dst, src)
+func (m *ColumnFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnFamily.Merge(m, src)
 }
 func (m *ColumnFamily) XXX_Size() int {
 	return xxx_messageInfo_ColumnFamily.Size(m)
@@ -351,16 +365,17 @@ func (m *GcRule) Reset()         { *m = GcRule{} }
 func (m *GcRule) String() string { return proto.CompactTextString(m) }
 func (*GcRule) ProtoMessage()    {}
 func (*GcRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{2}
+	return fileDescriptor_ea1666be9e81bb35, []int{2}
 }
+
 func (m *GcRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcRule.Unmarshal(m, b)
 }
 func (m *GcRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcRule.Marshal(b, m, deterministic)
 }
-func (dst *GcRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcRule.Merge(dst, src)
+func (m *GcRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule.Merge(m, src)
 }
 func (m *GcRule) XXX_Size() int {
 	return xxx_messageInfo_GcRule.Size(m)
@@ -434,9 +449,9 @@ func (m *GcRule) GetUnion() *GcRule_Union {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GcRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GcRule_OneofMarshaler, _GcRule_OneofUnmarshaler, _GcRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GcRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GcRule_MaxNumVersions)(nil),
 		(*GcRule_MaxAge)(nil),
 		(*GcRule_Intersection_)(nil),
@@ -444,103 +459,6 @@ func (*GcRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _GcRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GcRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *GcRule_MaxNumVersions:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MaxNumVersions))
-	case *GcRule_MaxAge:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MaxAge); err != nil {
-			return err
-		}
-	case *GcRule_Intersection_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Intersection); err != nil {
-			return err
-		}
-	case *GcRule_Union_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Union); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GcRule.Rule has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GcRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GcRule)
-	switch tag {
-	case 1: // rule.max_num_versions
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Rule = &GcRule_MaxNumVersions{int32(x)}
-		return true, err
-	case 2: // rule.max_age
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.Rule = &GcRule_MaxAge{msg}
-		return true, err
-	case 3: // rule.intersection
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcRule_Intersection)
-		err := b.DecodeMessage(msg)
-		m.Rule = &GcRule_Intersection_{msg}
-		return true, err
-	case 4: // rule.union
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcRule_Union)
-		err := b.DecodeMessage(msg)
-		m.Rule = &GcRule_Union_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GcRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GcRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *GcRule_MaxNumVersions:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.MaxNumVersions))
-	case *GcRule_MaxAge:
-		s := proto.Size(x.MaxAge)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GcRule_Intersection_:
-		s := proto.Size(x.Intersection)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GcRule_Union_:
-		s := proto.Size(x.Union)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A GcRule which deletes cells matching all of the given rules.
 type GcRule_Intersection struct {
 	// Only delete cells which would be deleted by every element of `rules`.
@@ -554,16 +472,17 @@ func (m *GcRule_Intersection) Reset()         { *m = GcRule_Intersection{} }
 func (m *GcRule_Intersection) String() string { return proto.CompactTextString(m) }
 func (*GcRule_Intersection) ProtoMessage()    {}
 func (*GcRule_Intersection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{2, 0}
+	return fileDescriptor_ea1666be9e81bb35, []int{2, 0}
 }
+
 func (m *GcRule_Intersection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcRule_Intersection.Unmarshal(m, b)
 }
 func (m *GcRule_Intersection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcRule_Intersection.Marshal(b, m, deterministic)
 }
-func (dst *GcRule_Intersection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcRule_Intersection.Merge(dst, src)
+func (m *GcRule_Intersection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Intersection.Merge(m, src)
 }
 func (m *GcRule_Intersection) XXX_Size() int {
 	return xxx_messageInfo_GcRule_Intersection.Size(m)
@@ -594,16 +513,17 @@ func (m *GcRule_Union) Reset()         { *m = GcRule_Union{} }
 func (m *GcRule_Union) String() string { return proto.CompactTextString(m) }
 func (*GcRule_Union) ProtoMessage()    {}
 func (*GcRule_Union) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{2, 1}
+	return fileDescriptor_ea1666be9e81bb35, []int{2, 1}
 }
+
 func (m *GcRule_Union) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcRule_Union.Unmarshal(m, b)
 }
 func (m *GcRule_Union) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcRule_Union.Marshal(b, m, deterministic)
 }
-func (dst *GcRule_Union) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcRule_Union.Merge(dst, src)
+func (m *GcRule_Union) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Union.Merge(m, src)
 }
 func (m *GcRule_Union) XXX_Size() int {
 	return xxx_messageInfo_GcRule_Union.Size(m)
@@ -665,16 +585,17 @@ func (m *Snapshot) Reset()         { *m = Snapshot{} }
 func (m *Snapshot) String() string { return proto.CompactTextString(m) }
 func (*Snapshot) ProtoMessage()    {}
 func (*Snapshot) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_e7caf794c322cd95, []int{3}
+	return fileDescriptor_ea1666be9e81bb35, []int{3}
 }
+
 func (m *Snapshot) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Snapshot.Unmarshal(m, b)
 }
 func (m *Snapshot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Snapshot.Marshal(b, m, deterministic)
 }
-func (dst *Snapshot) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Snapshot.Merge(dst, src)
+func (m *Snapshot) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Snapshot.Merge(m, src)
 }
 func (m *Snapshot) XXX_Size() int {
 	return xxx_messageInfo_Snapshot.Size(m)
@@ -735,6 +656,10 @@ func (m *Snapshot) GetDescription() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.bigtable.admin.v2.Table_TimestampGranularity", Table_TimestampGranularity_name, Table_TimestampGranularity_value)
+	proto.RegisterEnum("google.bigtable.admin.v2.Table_View", Table_View_name, Table_View_value)
+	proto.RegisterEnum("google.bigtable.admin.v2.Table_ClusterState_ReplicationState", Table_ClusterState_ReplicationState_name, Table_ClusterState_ReplicationState_value)
+	proto.RegisterEnum("google.bigtable.admin.v2.Snapshot_State", Snapshot_State_name, Snapshot_State_value)
 	proto.RegisterType((*Table)(nil), "google.bigtable.admin.v2.Table")
 	proto.RegisterMapType((map[string]*Table_ClusterState)(nil), "google.bigtable.admin.v2.Table.ClusterStatesEntry")
 	proto.RegisterMapType((map[string]*ColumnFamily)(nil), "google.bigtable.admin.v2.Table.ColumnFamiliesEntry")
@@ -744,17 +669,13 @@ func init() {
 	proto.RegisterType((*GcRule_Intersection)(nil), "google.bigtable.admin.v2.GcRule.Intersection")
 	proto.RegisterType((*GcRule_Union)(nil), "google.bigtable.admin.v2.GcRule.Union")
 	proto.RegisterType((*Snapshot)(nil), "google.bigtable.admin.v2.Snapshot")
-	proto.RegisterEnum("google.bigtable.admin.v2.Table_TimestampGranularity", Table_TimestampGranularity_name, Table_TimestampGranularity_value)
-	proto.RegisterEnum("google.bigtable.admin.v2.Table_View", Table_View_name, Table_View_value)
-	proto.RegisterEnum("google.bigtable.admin.v2.Table_ClusterState_ReplicationState", Table_ClusterState_ReplicationState_name, Table_ClusterState_ReplicationState_value)
-	proto.RegisterEnum("google.bigtable.admin.v2.Snapshot_State", Snapshot_State_name, Snapshot_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/v2/table.proto", fileDescriptor_table_e7caf794c322cd95)
+	proto.RegisterFile("google/bigtable/admin/v2/table.proto", fileDescriptor_ea1666be9e81bb35)
 }
 
-var fileDescriptor_table_e7caf794c322cd95 = []byte{
+var fileDescriptor_ea1666be9e81bb35 = []byte{
 	// 965 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xff, 0x6e, 0xdb, 0x54,
 	0x18, 0xad, 0xe3, 0x38, 0x6d, 0xbf, 0xa4, 0xad, 0xb9, 0x1d, 0x22, 0x8b, 0xa6, 0x2d, 0x44, 0x30,
diff --git a/googleapis/bigtable/v1/bigtable_data.pb.go b/googleapis/bigtable/v1/bigtable_data.pb.go
index e9f6b00a45..db1a7591f2 100644
--- a/googleapis/bigtable/v1/bigtable_data.pb.go
+++ b/googleapis/bigtable/v1/bigtable_data.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_data.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
+package bigtable
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies the complete (requested) contents of a single row of a table.
 // Rows which exceed 256MiB in size cannot be read in full.
@@ -37,16 +40,17 @@ func (m *Row) Reset()         { *m = Row{} }
 func (m *Row) String() string { return proto.CompactTextString(m) }
 func (*Row) ProtoMessage()    {}
 func (*Row) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{0}
+	return fileDescriptor_234346170b768b8c, []int{0}
 }
+
 func (m *Row) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Row.Unmarshal(m, b)
 }
 func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
 }
-func (dst *Row) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Row.Merge(dst, src)
+func (m *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(m, src)
 }
 func (m *Row) XXX_Size() int {
 	return xxx_messageInfo_Row.Size(m)
@@ -91,16 +95,17 @@ func (m *Family) Reset()         { *m = Family{} }
 func (m *Family) String() string { return proto.CompactTextString(m) }
 func (*Family) ProtoMessage()    {}
 func (*Family) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{1}
+	return fileDescriptor_234346170b768b8c, []int{1}
 }
+
 func (m *Family) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Family.Unmarshal(m, b)
 }
 func (m *Family) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Family.Marshal(b, m, deterministic)
 }
-func (dst *Family) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Family.Merge(dst, src)
+func (m *Family) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Family.Merge(m, src)
 }
 func (m *Family) XXX_Size() int {
 	return xxx_messageInfo_Family.Size(m)
@@ -144,16 +149,17 @@ func (m *Column) Reset()         { *m = Column{} }
 func (m *Column) String() string { return proto.CompactTextString(m) }
 func (*Column) ProtoMessage()    {}
 func (*Column) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{2}
+	return fileDescriptor_234346170b768b8c, []int{2}
 }
+
 func (m *Column) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Column.Unmarshal(m, b)
 }
 func (m *Column) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Column.Marshal(b, m, deterministic)
 }
-func (dst *Column) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Column.Merge(dst, src)
+func (m *Column) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Column.Merge(m, src)
 }
 func (m *Column) XXX_Size() int {
 	return xxx_messageInfo_Column.Size(m)
@@ -202,16 +208,17 @@ func (m *Cell) Reset()         { *m = Cell{} }
 func (m *Cell) String() string { return proto.CompactTextString(m) }
 func (*Cell) ProtoMessage()    {}
 func (*Cell) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{3}
+	return fileDescriptor_234346170b768b8c, []int{3}
 }
+
 func (m *Cell) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cell.Unmarshal(m, b)
 }
 func (m *Cell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cell.Marshal(b, m, deterministic)
 }
-func (dst *Cell) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cell.Merge(dst, src)
+func (m *Cell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cell.Merge(m, src)
 }
 func (m *Cell) XXX_Size() int {
 	return xxx_messageInfo_Cell.Size(m)
@@ -258,16 +265,17 @@ func (m *RowRange) Reset()         { *m = RowRange{} }
 func (m *RowRange) String() string { return proto.CompactTextString(m) }
 func (*RowRange) ProtoMessage()    {}
 func (*RowRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{4}
+	return fileDescriptor_234346170b768b8c, []int{4}
 }
+
 func (m *RowRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowRange.Unmarshal(m, b)
 }
 func (m *RowRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowRange.Marshal(b, m, deterministic)
 }
-func (dst *RowRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowRange.Merge(dst, src)
+func (m *RowRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowRange.Merge(m, src)
 }
 func (m *RowRange) XXX_Size() int {
 	return xxx_messageInfo_RowRange.Size(m)
@@ -307,16 +315,17 @@ func (m *RowSet) Reset()         { *m = RowSet{} }
 func (m *RowSet) String() string { return proto.CompactTextString(m) }
 func (*RowSet) ProtoMessage()    {}
 func (*RowSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{5}
+	return fileDescriptor_234346170b768b8c, []int{5}
 }
+
 func (m *RowSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowSet.Unmarshal(m, b)
 }
 func (m *RowSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowSet.Marshal(b, m, deterministic)
 }
-func (dst *RowSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowSet.Merge(dst, src)
+func (m *RowSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowSet.Merge(m, src)
 }
 func (m *RowSet) XXX_Size() int {
 	return xxx_messageInfo_RowSet.Size(m)
@@ -371,16 +380,17 @@ func (m *ColumnRange) Reset()         { *m = ColumnRange{} }
 func (m *ColumnRange) String() string { return proto.CompactTextString(m) }
 func (*ColumnRange) ProtoMessage()    {}
 func (*ColumnRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{6}
+	return fileDescriptor_234346170b768b8c, []int{6}
 }
+
 func (m *ColumnRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColumnRange.Unmarshal(m, b)
 }
 func (m *ColumnRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColumnRange.Marshal(b, m, deterministic)
 }
-func (dst *ColumnRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColumnRange.Merge(dst, src)
+func (m *ColumnRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnRange.Merge(m, src)
 }
 func (m *ColumnRange) XXX_Size() int {
 	return xxx_messageInfo_ColumnRange.Size(m)
@@ -472,9 +482,9 @@ func (m *ColumnRange) GetEndQualifierExclusive() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ColumnRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ColumnRange_OneofMarshaler, _ColumnRange_OneofUnmarshaler, _ColumnRange_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ColumnRange) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ColumnRange_StartQualifierInclusive)(nil),
 		(*ColumnRange_StartQualifierExclusive)(nil),
 		(*ColumnRange_EndQualifierInclusive)(nil),
@@ -482,104 +492,6 @@ func (*ColumnRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) e
 	}
 }
 
-func _ColumnRange_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ColumnRange)
-	// start_qualifier
-	switch x := m.StartQualifier.(type) {
-	case *ColumnRange_StartQualifierInclusive:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartQualifierInclusive)
-	case *ColumnRange_StartQualifierExclusive:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartQualifierExclusive)
-	case nil:
-	default:
-		return fmt.Errorf("ColumnRange.StartQualifier has unexpected type %T", x)
-	}
-	// end_qualifier
-	switch x := m.EndQualifier.(type) {
-	case *ColumnRange_EndQualifierInclusive:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndQualifierInclusive)
-	case *ColumnRange_EndQualifierExclusive:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndQualifierExclusive)
-	case nil:
-	default:
-		return fmt.Errorf("ColumnRange.EndQualifier has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ColumnRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ColumnRange)
-	switch tag {
-	case 2: // start_qualifier.start_qualifier_inclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartQualifier = &ColumnRange_StartQualifierInclusive{x}
-		return true, err
-	case 3: // start_qualifier.start_qualifier_exclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartQualifier = &ColumnRange_StartQualifierExclusive{x}
-		return true, err
-	case 4: // end_qualifier.end_qualifier_inclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndQualifier = &ColumnRange_EndQualifierInclusive{x}
-		return true, err
-	case 5: // end_qualifier.end_qualifier_exclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndQualifier = &ColumnRange_EndQualifierExclusive{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ColumnRange)
-	// start_qualifier
-	switch x := m.StartQualifier.(type) {
-	case *ColumnRange_StartQualifierInclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartQualifierInclusive)))
-		n += len(x.StartQualifierInclusive)
-	case *ColumnRange_StartQualifierExclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartQualifierExclusive)))
-		n += len(x.StartQualifierExclusive)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// end_qualifier
-	switch x := m.EndQualifier.(type) {
-	case *ColumnRange_EndQualifierInclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndQualifierInclusive)))
-		n += len(x.EndQualifierInclusive)
-	case *ColumnRange_EndQualifierExclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndQualifierExclusive)))
-		n += len(x.EndQualifierExclusive)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Specified a contiguous range of microsecond timestamps.
 type TimestampRange struct {
 	// Inclusive lower bound. If left empty, interpreted as 0.
@@ -595,16 +507,17 @@ func (m *TimestampRange) Reset()         { *m = TimestampRange{} }
 func (m *TimestampRange) String() string { return proto.CompactTextString(m) }
 func (*TimestampRange) ProtoMessage()    {}
 func (*TimestampRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{7}
+	return fileDescriptor_234346170b768b8c, []int{7}
 }
+
 func (m *TimestampRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampRange.Unmarshal(m, b)
 }
 func (m *TimestampRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimestampRange.Marshal(b, m, deterministic)
 }
-func (dst *TimestampRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimestampRange.Merge(dst, src)
+func (m *TimestampRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampRange.Merge(m, src)
 }
 func (m *TimestampRange) XXX_Size() int {
 	return xxx_messageInfo_TimestampRange.Size(m)
@@ -654,16 +567,17 @@ func (m *ValueRange) Reset()         { *m = ValueRange{} }
 func (m *ValueRange) String() string { return proto.CompactTextString(m) }
 func (*ValueRange) ProtoMessage()    {}
 func (*ValueRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{8}
+	return fileDescriptor_234346170b768b8c, []int{8}
 }
+
 func (m *ValueRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ValueRange.Unmarshal(m, b)
 }
 func (m *ValueRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ValueRange.Marshal(b, m, deterministic)
 }
-func (dst *ValueRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ValueRange.Merge(dst, src)
+func (m *ValueRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueRange.Merge(m, src)
 }
 func (m *ValueRange) XXX_Size() int {
 	return xxx_messageInfo_ValueRange.Size(m)
@@ -748,9 +662,9 @@ func (m *ValueRange) GetEndValueExclusive() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ValueRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ValueRange_OneofMarshaler, _ValueRange_OneofUnmarshaler, _ValueRange_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ValueRange) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ValueRange_StartValueInclusive)(nil),
 		(*ValueRange_StartValueExclusive)(nil),
 		(*ValueRange_EndValueInclusive)(nil),
@@ -758,104 +672,6 @@ func (*ValueRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _ValueRange_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ValueRange)
-	// start_value
-	switch x := m.StartValue.(type) {
-	case *ValueRange_StartValueInclusive:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartValueInclusive)
-	case *ValueRange_StartValueExclusive:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartValueExclusive)
-	case nil:
-	default:
-		return fmt.Errorf("ValueRange.StartValue has unexpected type %T", x)
-	}
-	// end_value
-	switch x := m.EndValue.(type) {
-	case *ValueRange_EndValueInclusive:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndValueInclusive)
-	case *ValueRange_EndValueExclusive:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndValueExclusive)
-	case nil:
-	default:
-		return fmt.Errorf("ValueRange.EndValue has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ValueRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ValueRange)
-	switch tag {
-	case 1: // start_value.start_value_inclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartValue = &ValueRange_StartValueInclusive{x}
-		return true, err
-	case 2: // start_value.start_value_exclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartValue = &ValueRange_StartValueExclusive{x}
-		return true, err
-	case 3: // end_value.end_value_inclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndValue = &ValueRange_EndValueInclusive{x}
-		return true, err
-	case 4: // end_value.end_value_exclusive
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndValue = &ValueRange_EndValueExclusive{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ValueRange_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ValueRange)
-	// start_value
-	switch x := m.StartValue.(type) {
-	case *ValueRange_StartValueInclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartValueInclusive)))
-		n += len(x.StartValueInclusive)
-	case *ValueRange_StartValueExclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartValueExclusive)))
-		n += len(x.StartValueExclusive)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// end_value
-	switch x := m.EndValue.(type) {
-	case *ValueRange_EndValueInclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndValueInclusive)))
-		n += len(x.EndValueInclusive)
-	case *ValueRange_EndValueExclusive:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndValueExclusive)))
-		n += len(x.EndValueExclusive)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Takes a row as input and produces an alternate view of the row based on
 // specified rules. For example, a RowFilter might trim down a row to include
 // just the cells from columns matching a given regular expression, or might
@@ -923,16 +739,17 @@ func (m *RowFilter) Reset()         { *m = RowFilter{} }
 func (m *RowFilter) String() string { return proto.CompactTextString(m) }
 func (*RowFilter) ProtoMessage()    {}
 func (*RowFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{9}
+	return fileDescriptor_234346170b768b8c, []int{9}
 }
+
 func (m *RowFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter.Unmarshal(m, b)
 }
 func (m *RowFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter.Merge(dst, src)
+func (m *RowFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter.Merge(m, src)
 }
 func (m *RowFilter) XXX_Size() int {
 	return xxx_messageInfo_RowFilter.Size(m)
@@ -1201,9 +1018,9 @@ func (m *RowFilter) GetApplyLabelTransformer() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RowFilter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RowFilter_OneofMarshaler, _RowFilter_OneofUnmarshaler, _RowFilter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RowFilter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RowFilter_Chain_)(nil),
 		(*RowFilter_Interleave_)(nil),
 		(*RowFilter_Condition_)(nil),
@@ -1226,334 +1043,6 @@ func (*RowFilter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) err
 	}
 }
 
-func _RowFilter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RowFilter)
-	// filter
-	switch x := m.Filter.(type) {
-	case *RowFilter_Chain_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Chain); err != nil {
-			return err
-		}
-	case *RowFilter_Interleave_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Interleave); err != nil {
-			return err
-		}
-	case *RowFilter_Condition_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Condition); err != nil {
-			return err
-		}
-	case *RowFilter_Sink:
-		t := uint64(0)
-		if x.Sink {
-			t = 1
-		}
-		b.EncodeVarint(16<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_PassAllFilter:
-		t := uint64(0)
-		if x.PassAllFilter {
-			t = 1
-		}
-		b.EncodeVarint(17<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_BlockAllFilter:
-		t := uint64(0)
-		if x.BlockAllFilter {
-			t = 1
-		}
-		b.EncodeVarint(18<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_RowKeyRegexFilter:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.RowKeyRegexFilter)
-	case *RowFilter_RowSampleFilter:
-		b.EncodeVarint(14<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.RowSampleFilter))
-	case *RowFilter_FamilyNameRegexFilter:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.FamilyNameRegexFilter)
-	case *RowFilter_ColumnQualifierRegexFilter:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ColumnQualifierRegexFilter)
-	case *RowFilter_ColumnRangeFilter:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ColumnRangeFilter); err != nil {
-			return err
-		}
-	case *RowFilter_TimestampRangeFilter:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampRangeFilter); err != nil {
-			return err
-		}
-	case *RowFilter_ValueRegexFilter:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ValueRegexFilter)
-	case *RowFilter_ValueRangeFilter:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ValueRangeFilter); err != nil {
-			return err
-		}
-	case *RowFilter_CellsPerRowOffsetFilter:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CellsPerRowOffsetFilter))
-	case *RowFilter_CellsPerRowLimitFilter:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CellsPerRowLimitFilter))
-	case *RowFilter_CellsPerColumnLimitFilter:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CellsPerColumnLimitFilter))
-	case *RowFilter_StripValueTransformer:
-		t := uint64(0)
-		if x.StripValueTransformer {
-			t = 1
-		}
-		b.EncodeVarint(13<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_ApplyLabelTransformer:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ApplyLabelTransformer)
-	case nil:
-	default:
-		return fmt.Errorf("RowFilter.Filter has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RowFilter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RowFilter)
-	switch tag {
-	case 1: // filter.chain
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowFilter_Chain)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_Chain_{msg}
-		return true, err
-	case 2: // filter.interleave
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowFilter_Interleave)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_Interleave_{msg}
-		return true, err
-	case 3: // filter.condition
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowFilter_Condition)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_Condition_{msg}
-		return true, err
-	case 16: // filter.sink
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_Sink{x != 0}
-		return true, err
-	case 17: // filter.pass_all_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_PassAllFilter{x != 0}
-		return true, err
-	case 18: // filter.block_all_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_BlockAllFilter{x != 0}
-		return true, err
-	case 4: // filter.row_key_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Filter = &RowFilter_RowKeyRegexFilter{x}
-		return true, err
-	case 14: // filter.row_sample_filter
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Filter = &RowFilter_RowSampleFilter{math.Float64frombits(x)}
-		return true, err
-	case 5: // filter.family_name_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &RowFilter_FamilyNameRegexFilter{x}
-		return true, err
-	case 6: // filter.column_qualifier_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Filter = &RowFilter_ColumnQualifierRegexFilter{x}
-		return true, err
-	case 7: // filter.column_range_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ColumnRange)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_ColumnRangeFilter{msg}
-		return true, err
-	case 8: // filter.timestamp_range_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TimestampRange)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_TimestampRangeFilter{msg}
-		return true, err
-	case 9: // filter.value_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Filter = &RowFilter_ValueRegexFilter{x}
-		return true, err
-	case 15: // filter.value_range_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ValueRange)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_ValueRangeFilter{msg}
-		return true, err
-	case 10: // filter.cells_per_row_offset_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_CellsPerRowOffsetFilter{int32(x)}
-		return true, err
-	case 11: // filter.cells_per_row_limit_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_CellsPerRowLimitFilter{int32(x)}
-		return true, err
-	case 12: // filter.cells_per_column_limit_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_CellsPerColumnLimitFilter{int32(x)}
-		return true, err
-	case 13: // filter.strip_value_transformer
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_StripValueTransformer{x != 0}
-		return true, err
-	case 19: // filter.apply_label_transformer
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &RowFilter_ApplyLabelTransformer{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RowFilter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RowFilter)
-	// filter
-	switch x := m.Filter.(type) {
-	case *RowFilter_Chain_:
-		s := proto.Size(x.Chain)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_Interleave_:
-		s := proto.Size(x.Interleave)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_Condition_:
-		s := proto.Size(x.Condition)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_Sink:
-		n += 2 // tag and wire
-		n += 1
-	case *RowFilter_PassAllFilter:
-		n += 2 // tag and wire
-		n += 1
-	case *RowFilter_BlockAllFilter:
-		n += 2 // tag and wire
-		n += 1
-	case *RowFilter_RowKeyRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RowKeyRegexFilter)))
-		n += len(x.RowKeyRegexFilter)
-	case *RowFilter_RowSampleFilter:
-		n += 1 // tag and wire
-		n += 8
-	case *RowFilter_FamilyNameRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.FamilyNameRegexFilter)))
-		n += len(x.FamilyNameRegexFilter)
-	case *RowFilter_ColumnQualifierRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ColumnQualifierRegexFilter)))
-		n += len(x.ColumnQualifierRegexFilter)
-	case *RowFilter_ColumnRangeFilter:
-		s := proto.Size(x.ColumnRangeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_TimestampRangeFilter:
-		s := proto.Size(x.TimestampRangeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_ValueRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ValueRegexFilter)))
-		n += len(x.ValueRegexFilter)
-	case *RowFilter_ValueRangeFilter:
-		s := proto.Size(x.ValueRangeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_CellsPerRowOffsetFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CellsPerRowOffsetFilter))
-	case *RowFilter_CellsPerRowLimitFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CellsPerRowLimitFilter))
-	case *RowFilter_CellsPerColumnLimitFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CellsPerColumnLimitFilter))
-	case *RowFilter_StripValueTransformer:
-		n += 1 // tag and wire
-		n += 1
-	case *RowFilter_ApplyLabelTransformer:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ApplyLabelTransformer)))
-		n += len(x.ApplyLabelTransformer)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A RowFilter which sends rows through several RowFilters in sequence.
 type RowFilter_Chain struct {
 	// The elements of "filters" are chained together to process the input row:
@@ -1569,16 +1058,17 @@ func (m *RowFilter_Chain) Reset()         { *m = RowFilter_Chain{} }
 func (m *RowFilter_Chain) String() string { return proto.CompactTextString(m) }
 func (*RowFilter_Chain) ProtoMessage()    {}
 func (*RowFilter_Chain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{9, 0}
+	return fileDescriptor_234346170b768b8c, []int{9, 0}
 }
+
 func (m *RowFilter_Chain) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter_Chain.Unmarshal(m, b)
 }
 func (m *RowFilter_Chain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter_Chain.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter_Chain) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter_Chain.Merge(dst, src)
+func (m *RowFilter_Chain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Chain.Merge(m, src)
 }
 func (m *RowFilter_Chain) XXX_Size() int {
 	return xxx_messageInfo_RowFilter_Chain.Size(m)
@@ -1633,16 +1123,17 @@ func (m *RowFilter_Interleave) Reset()         { *m = RowFilter_Interleave{} }
 func (m *RowFilter_Interleave) String() string { return proto.CompactTextString(m) }
 func (*RowFilter_Interleave) ProtoMessage()    {}
 func (*RowFilter_Interleave) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{9, 1}
+	return fileDescriptor_234346170b768b8c, []int{9, 1}
 }
+
 func (m *RowFilter_Interleave) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter_Interleave.Unmarshal(m, b)
 }
 func (m *RowFilter_Interleave) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter_Interleave.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter_Interleave) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter_Interleave.Merge(dst, src)
+func (m *RowFilter_Interleave) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Interleave.Merge(m, src)
 }
 func (m *RowFilter_Interleave) XXX_Size() int {
 	return xxx_messageInfo_RowFilter_Interleave.Size(m)
@@ -1687,16 +1178,17 @@ func (m *RowFilter_Condition) Reset()         { *m = RowFilter_Condition{} }
 func (m *RowFilter_Condition) String() string { return proto.CompactTextString(m) }
 func (*RowFilter_Condition) ProtoMessage()    {}
 func (*RowFilter_Condition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{9, 2}
+	return fileDescriptor_234346170b768b8c, []int{9, 2}
 }
+
 func (m *RowFilter_Condition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter_Condition.Unmarshal(m, b)
 }
 func (m *RowFilter_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter_Condition.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter_Condition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter_Condition.Merge(dst, src)
+func (m *RowFilter_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Condition.Merge(m, src)
 }
 func (m *RowFilter_Condition) XXX_Size() int {
 	return xxx_messageInfo_RowFilter_Condition.Size(m)
@@ -1747,16 +1239,17 @@ func (m *Mutation) Reset()         { *m = Mutation{} }
 func (m *Mutation) String() string { return proto.CompactTextString(m) }
 func (*Mutation) ProtoMessage()    {}
 func (*Mutation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{10}
+	return fileDescriptor_234346170b768b8c, []int{10}
 }
+
 func (m *Mutation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation.Unmarshal(m, b)
 }
 func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
 }
-func (dst *Mutation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation.Merge(dst, src)
+func (m *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(m, src)
 }
 func (m *Mutation) XXX_Size() int {
 	return xxx_messageInfo_Mutation.Size(m)
@@ -1830,9 +1323,9 @@ func (m *Mutation) GetDeleteFromRow() *Mutation_DeleteFromRow {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Mutation_OneofMarshaler, _Mutation_OneofUnmarshaler, _Mutation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Mutation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Mutation_SetCell_)(nil),
 		(*Mutation_DeleteFromColumn_)(nil),
 		(*Mutation_DeleteFromFamily_)(nil),
@@ -1840,108 +1333,6 @@ func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _Mutation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Mutation)
-	// mutation
-	switch x := m.Mutation.(type) {
-	case *Mutation_SetCell_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SetCell); err != nil {
-			return err
-		}
-	case *Mutation_DeleteFromColumn_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteFromColumn); err != nil {
-			return err
-		}
-	case *Mutation_DeleteFromFamily_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteFromFamily); err != nil {
-			return err
-		}
-	case *Mutation_DeleteFromRow_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteFromRow); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Mutation.Mutation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Mutation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Mutation)
-	switch tag {
-	case 1: // mutation.set_cell
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_SetCell)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_SetCell_{msg}
-		return true, err
-	case 2: // mutation.delete_from_column
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_DeleteFromColumn)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_DeleteFromColumn_{msg}
-		return true, err
-	case 3: // mutation.delete_from_family
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_DeleteFromFamily)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_DeleteFromFamily_{msg}
-		return true, err
-	case 4: // mutation.delete_from_row
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_DeleteFromRow)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_DeleteFromRow_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Mutation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Mutation)
-	// mutation
-	switch x := m.Mutation.(type) {
-	case *Mutation_SetCell_:
-		s := proto.Size(x.SetCell)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_DeleteFromColumn_:
-		s := proto.Size(x.DeleteFromColumn)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_DeleteFromFamily_:
-		s := proto.Size(x.DeleteFromFamily)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_DeleteFromRow_:
-		s := proto.Size(x.DeleteFromRow)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Mutation which sets the value of the specified cell.
 type Mutation_SetCell struct {
 	// The name of the family into which new data should be written.
@@ -1967,16 +1358,17 @@ func (m *Mutation_SetCell) Reset()         { *m = Mutation_SetCell{} }
 func (m *Mutation_SetCell) String() string { return proto.CompactTextString(m) }
 func (*Mutation_SetCell) ProtoMessage()    {}
 func (*Mutation_SetCell) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{10, 0}
+	return fileDescriptor_234346170b768b8c, []int{10, 0}
 }
+
 func (m *Mutation_SetCell) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_SetCell.Unmarshal(m, b)
 }
 func (m *Mutation_SetCell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_SetCell.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_SetCell) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_SetCell.Merge(dst, src)
+func (m *Mutation_SetCell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_SetCell.Merge(m, src)
 }
 func (m *Mutation_SetCell) XXX_Size() int {
 	return xxx_messageInfo_Mutation_SetCell.Size(m)
@@ -2035,16 +1427,17 @@ func (m *Mutation_DeleteFromColumn) Reset()         { *m = Mutation_DeleteFromCo
 func (m *Mutation_DeleteFromColumn) String() string { return proto.CompactTextString(m) }
 func (*Mutation_DeleteFromColumn) ProtoMessage()    {}
 func (*Mutation_DeleteFromColumn) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{10, 1}
+	return fileDescriptor_234346170b768b8c, []int{10, 1}
 }
+
 func (m *Mutation_DeleteFromColumn) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_DeleteFromColumn.Unmarshal(m, b)
 }
 func (m *Mutation_DeleteFromColumn) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_DeleteFromColumn.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_DeleteFromColumn) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_DeleteFromColumn.Merge(dst, src)
+func (m *Mutation_DeleteFromColumn) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromColumn.Merge(m, src)
 }
 func (m *Mutation_DeleteFromColumn) XXX_Size() int {
 	return xxx_messageInfo_Mutation_DeleteFromColumn.Size(m)
@@ -2090,16 +1483,17 @@ func (m *Mutation_DeleteFromFamily) Reset()         { *m = Mutation_DeleteFromFa
 func (m *Mutation_DeleteFromFamily) String() string { return proto.CompactTextString(m) }
 func (*Mutation_DeleteFromFamily) ProtoMessage()    {}
 func (*Mutation_DeleteFromFamily) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{10, 2}
+	return fileDescriptor_234346170b768b8c, []int{10, 2}
 }
+
 func (m *Mutation_DeleteFromFamily) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_DeleteFromFamily.Unmarshal(m, b)
 }
 func (m *Mutation_DeleteFromFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_DeleteFromFamily.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_DeleteFromFamily) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_DeleteFromFamily.Merge(dst, src)
+func (m *Mutation_DeleteFromFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromFamily.Merge(m, src)
 }
 func (m *Mutation_DeleteFromFamily) XXX_Size() int {
 	return xxx_messageInfo_Mutation_DeleteFromFamily.Size(m)
@@ -2128,16 +1522,17 @@ func (m *Mutation_DeleteFromRow) Reset()         { *m = Mutation_DeleteFromRow{}
 func (m *Mutation_DeleteFromRow) String() string { return proto.CompactTextString(m) }
 func (*Mutation_DeleteFromRow) ProtoMessage()    {}
 func (*Mutation_DeleteFromRow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{10, 3}
+	return fileDescriptor_234346170b768b8c, []int{10, 3}
 }
+
 func (m *Mutation_DeleteFromRow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_DeleteFromRow.Unmarshal(m, b)
 }
 func (m *Mutation_DeleteFromRow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_DeleteFromRow.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_DeleteFromRow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_DeleteFromRow.Merge(dst, src)
+func (m *Mutation_DeleteFromRow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromRow.Merge(m, src)
 }
 func (m *Mutation_DeleteFromRow) XXX_Size() int {
 	return xxx_messageInfo_Mutation_DeleteFromRow.Size(m)
@@ -2174,16 +1569,17 @@ func (m *ReadModifyWriteRule) Reset()         { *m = ReadModifyWriteRule{} }
 func (m *ReadModifyWriteRule) String() string { return proto.CompactTextString(m) }
 func (*ReadModifyWriteRule) ProtoMessage()    {}
 func (*ReadModifyWriteRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_data_ec1ed9ad6f99305a, []int{11}
+	return fileDescriptor_234346170b768b8c, []int{11}
 }
+
 func (m *ReadModifyWriteRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadModifyWriteRule.Unmarshal(m, b)
 }
 func (m *ReadModifyWriteRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadModifyWriteRule.Marshal(b, m, deterministic)
 }
-func (dst *ReadModifyWriteRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadModifyWriteRule.Merge(dst, src)
+func (m *ReadModifyWriteRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRule.Merge(m, src)
 }
 func (m *ReadModifyWriteRule) XXX_Size() int {
 	return xxx_messageInfo_ReadModifyWriteRule.Size(m)
@@ -2245,71 +1641,14 @@ func (m *ReadModifyWriteRule) GetIncrementAmount() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadModifyWriteRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadModifyWriteRule_OneofMarshaler, _ReadModifyWriteRule_OneofUnmarshaler, _ReadModifyWriteRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadModifyWriteRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadModifyWriteRule_AppendValue)(nil),
 		(*ReadModifyWriteRule_IncrementAmount)(nil),
 	}
 }
 
-func _ReadModifyWriteRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadModifyWriteRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *ReadModifyWriteRule_AppendValue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AppendValue)
-	case *ReadModifyWriteRule_IncrementAmount:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IncrementAmount))
-	case nil:
-	default:
-		return fmt.Errorf("ReadModifyWriteRule.Rule has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadModifyWriteRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadModifyWriteRule)
-	switch tag {
-	case 3: // rule.append_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Rule = &ReadModifyWriteRule_AppendValue{x}
-		return true, err
-	case 4: // rule.increment_amount
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Rule = &ReadModifyWriteRule_IncrementAmount{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadModifyWriteRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadModifyWriteRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *ReadModifyWriteRule_AppendValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AppendValue)))
-		n += len(x.AppendValue)
-	case *ReadModifyWriteRule_IncrementAmount:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IncrementAmount))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*Row)(nil), "google.bigtable.v1.Row")
 	proto.RegisterType((*Family)(nil), "google.bigtable.v1.Family")
@@ -2333,10 +1672,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/v1/bigtable_data.proto", fileDescriptor_bigtable_data_ec1ed9ad6f99305a)
+	proto.RegisterFile("google/bigtable/v1/bigtable_data.proto", fileDescriptor_234346170b768b8c)
 }
 
-var fileDescriptor_bigtable_data_ec1ed9ad6f99305a = []byte{
+var fileDescriptor_234346170b768b8c = []byte{
 	// 1378 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdb, 0x6e, 0x1b, 0x37,
 	0x13, 0xd6, 0x5a, 0xb2, 0x0e, 0xb3, 0x76, 0x24, 0xd3, 0x27, 0x45, 0x49, 0xfe, 0x18, 0xca, 0x8f,
diff --git a/googleapis/bigtable/v1/bigtable_service.pb.go b/googleapis/bigtable/v1/bigtable_service.pb.go
index e21abb38df..2bda210509 100644
--- a/googleapis/bigtable/v1/bigtable_service.pb.go
+++ b/googleapis/bigtable/v1/bigtable_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_service.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package bigtable
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,48 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+func init() {
+	proto.RegisterFile("google/bigtable/v1/bigtable_service.proto", fileDescriptor_a9a2f3a013379609)
+}
+
+var fileDescriptor_a9a2f3a013379609 = []byte{
+	// 521 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcd, 0x6e, 0xd4, 0x30,
+	0x10, 0xc7, 0x65, 0x0e, 0xa8, 0x58, 0x42, 0x08, 0x4b, 0x14, 0x69, 0xe1, 0x14, 0xa0, 0xa2, 0x11,
+	0x8d, 0xdb, 0x72, 0x0b, 0xe2, 0xd0, 0x45, 0x50, 0x21, 0x58, 0x51, 0xa5, 0xe2, 0x43, 0xe5, 0xb0,
+	0x78, 0x93, 0x69, 0x08, 0x4d, 0xe2, 0x60, 0x7b, 0x37, 0x5a, 0xaa, 0x5e, 0x38, 0x71, 0xe7, 0x11,
+	0x10, 0x17, 0x5e, 0x80, 0x23, 0xef, 0x00, 0x67, 0x6e, 0x3c, 0x08, 0xb2, 0x63, 0x2f, 0x2c, 0x0d,
+	0xcb, 0x8a, 0xee, 0x29, 0x8e, 0xe6, 0x3f, 0x33, 0xbf, 0xff, 0xf8, 0x03, 0xaf, 0xa6, 0x9c, 0xa7,
+	0x39, 0xd0, 0x41, 0x96, 0x2a, 0x36, 0xc8, 0x81, 0x8e, 0x36, 0x26, 0xeb, 0xbe, 0x04, 0x31, 0xca,
+	0x62, 0x08, 0x2a, 0xc1, 0x15, 0x27, 0xa4, 0x91, 0x06, 0x2e, 0x1c, 0x8c, 0x36, 0x3a, 0x97, 0x6d,
+	0x3a, 0xab, 0x32, 0xca, 0xca, 0x92, 0x2b, 0xa6, 0x32, 0x5e, 0xca, 0x26, 0xa3, 0xb3, 0x32, 0xab,
+	0x78, 0xc2, 0x14, 0xb3, 0xba, 0xcd, 0x39, 0x20, 0xfa, 0x05, 0x48, 0xc9, 0x52, 0x70, 0xb5, 0x2f,
+	0xd9, 0x1c, 0xf3, 0x37, 0x18, 0xee, 0x53, 0x28, 0x2a, 0x35, 0x6e, 0x82, 0x9b, 0xdf, 0x97, 0xf0,
+	0xb9, 0xae, 0x2d, 0xb0, 0xdb, 0xe4, 0x93, 0x8f, 0x08, 0x2f, 0x45, 0xc0, 0x92, 0x88, 0xd7, 0x92,
+	0x5c, 0x09, 0x8e, 0x9b, 0x09, 0x5c, 0x34, 0x82, 0xd7, 0x43, 0x90, 0xaa, 0x73, 0x75, 0xb6, 0x48,
+	0x56, 0xbc, 0x94, 0xe0, 0x3d, 0x7c, 0xfb, 0xed, 0xc7, 0xfb, 0x53, 0xf7, 0xbc, 0x2d, 0x4d, 0x7d,
+	0xd8, 0x30, 0x97, 0xac, 0x80, 0xdb, 0x95, 0xe0, 0xaf, 0x20, 0x56, 0x92, 0xfa, 0xf4, 0x0d, 0x2f,
+	0x41, 0x7f, 0xe3, 0x7c, 0x28, 0x15, 0x08, 0xbd, 0x34, 0x42, 0x49, 0xfd, 0x23, 0x2a, 0x78, 0x2d,
+	0x43, 0x01, 0x2c, 0x09, 0x91, 0xbf, 0x8e, 0xc8, 0x67, 0x84, 0xcf, 0xee, 0xb2, 0xa2, 0xca, 0x21,
+	0xe2, 0xf5, 0x03, 0x18, 0x4b, 0x72, 0xbd, 0x8d, 0x63, 0x4a, 0xe2, 0x88, 0x57, 0xe7, 0x50, 0x5a,
+	0xec, 0x47, 0x06, 0xfb, 0x3e, 0xd9, 0x3e, 0x11, 0xb6, 0x34, 0xb5, 0x75, 0xe1, 0x75, 0x44, 0x3e,
+	0x20, 0x7c, 0xa6, 0x37, 0x54, 0x4c, 0xe9, 0x66, 0xa4, 0x75, 0x7a, 0x93, 0xb0, 0x23, 0x5e, 0x76,
+	0x2a, 0xb7, 0x8f, 0xc1, 0x5d, 0xbd, 0x8f, 0xde, 0x33, 0x83, 0x17, 0x79, 0xbd, 0x93, 0xe0, 0xd1,
+	0x43, 0xc1, 0xeb, 0xfe, 0x01, 0x8c, 0x8f, 0xc2, 0xc2, 0x34, 0x0e, 0x91, 0x4f, 0x3e, 0x21, 0x8c,
+	0x27, 0x18, 0x92, 0x5c, 0x9b, 0x89, 0x39, 0x99, 0xec, 0xca, 0xbf, 0x64, 0x76, 0xac, 0x3d, 0xc3,
+	0xbd, 0xed, 0x75, 0xff, 0x93, 0xdb, 0x82, 0xea, 0x9a, 0x1a, 0xf6, 0x2b, 0xc2, 0xe7, 0xef, 0xbc,
+	0x84, 0xf8, 0x60, 0xab, 0x4c, 0x7e, 0x8d, 0xf6, 0x46, 0x1b, 0xcc, 0x31, 0x99, 0x43, 0x5f, 0x9b,
+	0x53, 0x6d, 0x1d, 0xbc, 0x30, 0x0e, 0xf6, 0xbc, 0xc7, 0x0b, 0x9a, 0x7c, 0x3c, 0xd5, 0x49, 0x9b,
+	0xfa, 0x82, 0x30, 0xd1, 0xd7, 0xa8, 0xc7, 0x93, 0x6c, 0x7f, 0xfc, 0x54, 0x64, 0x8d, 0xab, 0xb5,
+	0xbf, 0x5d, 0xb7, 0x69, 0x9d, 0xb3, 0x75, 0xb1, 0x55, 0xce, 0x6b, 0x8f, 0x19, 0x03, 0xcf, 0xbd,
+	0x27, 0x0b, 0x32, 0x20, 0xa6, 0x11, 0x42, 0xe4, 0x77, 0x2b, 0xbc, 0x1c, 0xf3, 0xa2, 0x05, 0xa0,
+	0x7b, 0xe1, 0x8f, 0x67, 0x47, 0xee, 0xe8, 0x73, 0xbd, 0x83, 0xf6, 0x42, 0x2b, 0x4e, 0x79, 0xce,
+	0xca, 0x34, 0xe0, 0x22, 0xa5, 0x29, 0x94, 0xe6, 0xd4, 0xd3, 0x26, 0xc4, 0xaa, 0x4c, 0xfe, 0xfe,
+	0x04, 0xde, 0x72, 0xeb, 0x77, 0x08, 0x0d, 0x4e, 0x1b, 0xe5, 0xcd, 0x9f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x4c, 0x27, 0x6e, 0x9a, 0xb0, 0x05, 0x00, 0x00,
+}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -352,44 +393,3 @@ var _BigtableService_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/bigtable/v1/bigtable_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/bigtable/v1/bigtable_service.proto", fileDescriptor_bigtable_service_77c4f27ba0e27769)
-}
-
-var fileDescriptor_bigtable_service_77c4f27ba0e27769 = []byte{
-	// 521 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcd, 0x6e, 0xd4, 0x30,
-	0x10, 0xc7, 0x65, 0x0e, 0xa8, 0x58, 0x42, 0x08, 0x4b, 0x14, 0x69, 0xe1, 0x14, 0xa0, 0xa2, 0x11,
-	0x8d, 0xdb, 0x72, 0x0b, 0xe2, 0xd0, 0x45, 0x50, 0x21, 0x58, 0x51, 0xa5, 0xe2, 0x43, 0xe5, 0xb0,
-	0x78, 0x93, 0x69, 0x08, 0x4d, 0xe2, 0x60, 0x7b, 0x37, 0x5a, 0xaa, 0x5e, 0x38, 0x71, 0xe7, 0x11,
-	0x10, 0x17, 0x5e, 0x80, 0x23, 0xef, 0x00, 0x67, 0x6e, 0x3c, 0x08, 0xb2, 0x63, 0x2f, 0x2c, 0x0d,
-	0xcb, 0x8a, 0xee, 0x29, 0x8e, 0xe6, 0x3f, 0x33, 0xbf, 0xff, 0xf8, 0x03, 0xaf, 0xa6, 0x9c, 0xa7,
-	0x39, 0xd0, 0x41, 0x96, 0x2a, 0x36, 0xc8, 0x81, 0x8e, 0x36, 0x26, 0xeb, 0xbe, 0x04, 0x31, 0xca,
-	0x62, 0x08, 0x2a, 0xc1, 0x15, 0x27, 0xa4, 0x91, 0x06, 0x2e, 0x1c, 0x8c, 0x36, 0x3a, 0x97, 0x6d,
-	0x3a, 0xab, 0x32, 0xca, 0xca, 0x92, 0x2b, 0xa6, 0x32, 0x5e, 0xca, 0x26, 0xa3, 0xb3, 0x32, 0xab,
-	0x78, 0xc2, 0x14, 0xb3, 0xba, 0xcd, 0x39, 0x20, 0xfa, 0x05, 0x48, 0xc9, 0x52, 0x70, 0xb5, 0x2f,
-	0xd9, 0x1c, 0xf3, 0x37, 0x18, 0xee, 0x53, 0x28, 0x2a, 0x35, 0x6e, 0x82, 0x9b, 0xdf, 0x97, 0xf0,
-	0xb9, 0xae, 0x2d, 0xb0, 0xdb, 0xe4, 0x93, 0x8f, 0x08, 0x2f, 0x45, 0xc0, 0x92, 0x88, 0xd7, 0x92,
-	0x5c, 0x09, 0x8e, 0x9b, 0x09, 0x5c, 0x34, 0x82, 0xd7, 0x43, 0x90, 0xaa, 0x73, 0x75, 0xb6, 0x48,
-	0x56, 0xbc, 0x94, 0xe0, 0x3d, 0x7c, 0xfb, 0xed, 0xc7, 0xfb, 0x53, 0xf7, 0xbc, 0x2d, 0x4d, 0x7d,
-	0xd8, 0x30, 0x97, 0xac, 0x80, 0xdb, 0x95, 0xe0, 0xaf, 0x20, 0x56, 0x92, 0xfa, 0xf4, 0x0d, 0x2f,
-	0x41, 0x7f, 0xe3, 0x7c, 0x28, 0x15, 0x08, 0xbd, 0x34, 0x42, 0x49, 0xfd, 0x23, 0x2a, 0x78, 0x2d,
-	0x43, 0x01, 0x2c, 0x09, 0x91, 0xbf, 0x8e, 0xc8, 0x67, 0x84, 0xcf, 0xee, 0xb2, 0xa2, 0xca, 0x21,
-	0xe2, 0xf5, 0x03, 0x18, 0x4b, 0x72, 0xbd, 0x8d, 0x63, 0x4a, 0xe2, 0x88, 0x57, 0xe7, 0x50, 0x5a,
-	0xec, 0x47, 0x06, 0xfb, 0x3e, 0xd9, 0x3e, 0x11, 0xb6, 0x34, 0xb5, 0x75, 0xe1, 0x75, 0x44, 0x3e,
-	0x20, 0x7c, 0xa6, 0x37, 0x54, 0x4c, 0xe9, 0x66, 0xa4, 0x75, 0x7a, 0x93, 0xb0, 0x23, 0x5e, 0x76,
-	0x2a, 0xb7, 0x8f, 0xc1, 0x5d, 0xbd, 0x8f, 0xde, 0x33, 0x83, 0x17, 0x79, 0xbd, 0x93, 0xe0, 0xd1,
-	0x43, 0xc1, 0xeb, 0xfe, 0x01, 0x8c, 0x8f, 0xc2, 0xc2, 0x34, 0x0e, 0x91, 0x4f, 0x3e, 0x21, 0x8c,
-	0x27, 0x18, 0x92, 0x5c, 0x9b, 0x89, 0x39, 0x99, 0xec, 0xca, 0xbf, 0x64, 0x76, 0xac, 0x3d, 0xc3,
-	0xbd, 0xed, 0x75, 0xff, 0x93, 0xdb, 0x82, 0xea, 0x9a, 0x1a, 0xf6, 0x2b, 0xc2, 0xe7, 0xef, 0xbc,
-	0x84, 0xf8, 0x60, 0xab, 0x4c, 0x7e, 0x8d, 0xf6, 0x46, 0x1b, 0xcc, 0x31, 0x99, 0x43, 0x5f, 0x9b,
-	0x53, 0x6d, 0x1d, 0xbc, 0x30, 0x0e, 0xf6, 0xbc, 0xc7, 0x0b, 0x9a, 0x7c, 0x3c, 0xd5, 0x49, 0x9b,
-	0xfa, 0x82, 0x30, 0xd1, 0xd7, 0xa8, 0xc7, 0x93, 0x6c, 0x7f, 0xfc, 0x54, 0x64, 0x8d, 0xab, 0xb5,
-	0xbf, 0x5d, 0xb7, 0x69, 0x9d, 0xb3, 0x75, 0xb1, 0x55, 0xce, 0x6b, 0x8f, 0x19, 0x03, 0xcf, 0xbd,
-	0x27, 0x0b, 0x32, 0x20, 0xa6, 0x11, 0x42, 0xe4, 0x77, 0x2b, 0xbc, 0x1c, 0xf3, 0xa2, 0x05, 0xa0,
-	0x7b, 0xe1, 0x8f, 0x67, 0x47, 0xee, 0xe8, 0x73, 0xbd, 0x83, 0xf6, 0x42, 0x2b, 0x4e, 0x79, 0xce,
-	0xca, 0x34, 0xe0, 0x22, 0xa5, 0x29, 0x94, 0xe6, 0xd4, 0xd3, 0x26, 0xc4, 0xaa, 0x4c, 0xfe, 0xfe,
-	0x04, 0xde, 0x72, 0xeb, 0x77, 0x08, 0x0d, 0x4e, 0x1b, 0xe5, 0xcd, 0x9f, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0x4c, 0x27, 0x6e, 0x9a, 0xb0, 0x05, 0x00, 0x00,
-}
diff --git a/googleapis/bigtable/v1/bigtable_service_messages.pb.go b/googleapis/bigtable/v1/bigtable_service_messages.pb.go
index d65b29f74a..62cdc07b24 100644
--- a/googleapis/bigtable/v1/bigtable_service_messages.pb.go
+++ b/googleapis/bigtable/v1/bigtable_service_messages.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_service_messages.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
+package bigtable
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for BigtableServer.ReadRows.
 type ReadRowsRequest struct {
@@ -53,16 +56,17 @@ func (m *ReadRowsRequest) Reset()         { *m = ReadRowsRequest{} }
 func (m *ReadRowsRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsRequest) ProtoMessage()    {}
 func (*ReadRowsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{0}
+	return fileDescriptor_f3f31120fcc6bad7, []int{0}
 }
+
 func (m *ReadRowsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsRequest.Unmarshal(m, b)
 }
 func (m *ReadRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsRequest.Merge(dst, src)
+func (m *ReadRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsRequest.Merge(m, src)
 }
 func (m *ReadRowsRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsRequest.Size(m)
@@ -151,95 +155,15 @@ func (m *ReadRowsRequest) GetNumRowsLimit() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadRowsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadRowsRequest_OneofMarshaler, _ReadRowsRequest_OneofUnmarshaler, _ReadRowsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadRowsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadRowsRequest_RowKey)(nil),
 		(*ReadRowsRequest_RowRange)(nil),
 		(*ReadRowsRequest_RowSet)(nil),
 	}
 }
 
-func _ReadRowsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadRowsRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *ReadRowsRequest_RowKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.RowKey)
-	case *ReadRowsRequest_RowRange:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RowRange); err != nil {
-			return err
-		}
-	case *ReadRowsRequest_RowSet:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RowSet); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ReadRowsRequest.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadRowsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadRowsRequest)
-	switch tag {
-	case 2: // target.row_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Target = &ReadRowsRequest_RowKey{x}
-		return true, err
-	case 3: // target.row_range
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowRange)
-		err := b.DecodeMessage(msg)
-		m.Target = &ReadRowsRequest_RowRange{msg}
-		return true, err
-	case 8: // target.row_set
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowSet)
-		err := b.DecodeMessage(msg)
-		m.Target = &ReadRowsRequest_RowSet{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadRowsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadRowsRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *ReadRowsRequest_RowKey:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RowKey)))
-		n += len(x.RowKey)
-	case *ReadRowsRequest_RowRange:
-		s := proto.Size(x.RowRange)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ReadRowsRequest_RowSet:
-		s := proto.Size(x.RowSet)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response message for BigtableService.ReadRows.
 type ReadRowsResponse struct {
 	// The key of the row for which we're receiving data.
@@ -257,16 +181,17 @@ func (m *ReadRowsResponse) Reset()         { *m = ReadRowsResponse{} }
 func (m *ReadRowsResponse) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsResponse) ProtoMessage()    {}
 func (*ReadRowsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{1}
+	return fileDescriptor_f3f31120fcc6bad7, []int{1}
 }
+
 func (m *ReadRowsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsResponse.Unmarshal(m, b)
 }
 func (m *ReadRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsResponse.Merge(dst, src)
+func (m *ReadRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse.Merge(m, src)
 }
 func (m *ReadRowsResponse) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsResponse.Size(m)
@@ -308,16 +233,17 @@ func (m *ReadRowsResponse_Chunk) Reset()         { *m = ReadRowsResponse_Chunk{}
 func (m *ReadRowsResponse_Chunk) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsResponse_Chunk) ProtoMessage()    {}
 func (*ReadRowsResponse_Chunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{1, 0}
+	return fileDescriptor_f3f31120fcc6bad7, []int{1, 0}
 }
+
 func (m *ReadRowsResponse_Chunk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsResponse_Chunk.Unmarshal(m, b)
 }
 func (m *ReadRowsResponse_Chunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsResponse_Chunk.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsResponse_Chunk) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsResponse_Chunk.Merge(dst, src)
+func (m *ReadRowsResponse_Chunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse_Chunk.Merge(m, src)
 }
 func (m *ReadRowsResponse_Chunk) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsResponse_Chunk.Size(m)
@@ -378,97 +304,15 @@ func (m *ReadRowsResponse_Chunk) GetCommitRow() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadRowsResponse_Chunk) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadRowsResponse_Chunk_OneofMarshaler, _ReadRowsResponse_Chunk_OneofUnmarshaler, _ReadRowsResponse_Chunk_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadRowsResponse_Chunk) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadRowsResponse_Chunk_RowContents)(nil),
 		(*ReadRowsResponse_Chunk_ResetRow)(nil),
 		(*ReadRowsResponse_Chunk_CommitRow)(nil),
 	}
 }
 
-func _ReadRowsResponse_Chunk_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadRowsResponse_Chunk)
-	// chunk
-	switch x := m.Chunk.(type) {
-	case *ReadRowsResponse_Chunk_RowContents:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RowContents); err != nil {
-			return err
-		}
-	case *ReadRowsResponse_Chunk_ResetRow:
-		t := uint64(0)
-		if x.ResetRow {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *ReadRowsResponse_Chunk_CommitRow:
-		t := uint64(0)
-		if x.CommitRow {
-			t = 1
-		}
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("ReadRowsResponse_Chunk.Chunk has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadRowsResponse_Chunk_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadRowsResponse_Chunk)
-	switch tag {
-	case 1: // chunk.row_contents
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Family)
-		err := b.DecodeMessage(msg)
-		m.Chunk = &ReadRowsResponse_Chunk_RowContents{msg}
-		return true, err
-	case 2: // chunk.reset_row
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Chunk = &ReadRowsResponse_Chunk_ResetRow{x != 0}
-		return true, err
-	case 3: // chunk.commit_row
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Chunk = &ReadRowsResponse_Chunk_CommitRow{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadRowsResponse_Chunk_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadRowsResponse_Chunk)
-	// chunk
-	switch x := m.Chunk.(type) {
-	case *ReadRowsResponse_Chunk_RowContents:
-		s := proto.Size(x.RowContents)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ReadRowsResponse_Chunk_ResetRow:
-		n += 1 // tag and wire
-		n += 1
-	case *ReadRowsResponse_Chunk_CommitRow:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for BigtableService.SampleRowKeys.
 type SampleRowKeysRequest struct {
 	// The unique name of the table from which to sample row keys.
@@ -482,16 +326,17 @@ func (m *SampleRowKeysRequest) Reset()         { *m = SampleRowKeysRequest{} }
 func (m *SampleRowKeysRequest) String() string { return proto.CompactTextString(m) }
 func (*SampleRowKeysRequest) ProtoMessage()    {}
 func (*SampleRowKeysRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{2}
+	return fileDescriptor_f3f31120fcc6bad7, []int{2}
 }
+
 func (m *SampleRowKeysRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SampleRowKeysRequest.Unmarshal(m, b)
 }
 func (m *SampleRowKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SampleRowKeysRequest.Marshal(b, m, deterministic)
 }
-func (dst *SampleRowKeysRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SampleRowKeysRequest.Merge(dst, src)
+func (m *SampleRowKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysRequest.Merge(m, src)
 }
 func (m *SampleRowKeysRequest) XXX_Size() int {
 	return xxx_messageInfo_SampleRowKeysRequest.Size(m)
@@ -533,16 +378,17 @@ func (m *SampleRowKeysResponse) Reset()         { *m = SampleRowKeysResponse{} }
 func (m *SampleRowKeysResponse) String() string { return proto.CompactTextString(m) }
 func (*SampleRowKeysResponse) ProtoMessage()    {}
 func (*SampleRowKeysResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{3}
+	return fileDescriptor_f3f31120fcc6bad7, []int{3}
 }
+
 func (m *SampleRowKeysResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SampleRowKeysResponse.Unmarshal(m, b)
 }
 func (m *SampleRowKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SampleRowKeysResponse.Marshal(b, m, deterministic)
 }
-func (dst *SampleRowKeysResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SampleRowKeysResponse.Merge(dst, src)
+func (m *SampleRowKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysResponse.Merge(m, src)
 }
 func (m *SampleRowKeysResponse) XXX_Size() int {
 	return xxx_messageInfo_SampleRowKeysResponse.Size(m)
@@ -586,16 +432,17 @@ func (m *MutateRowRequest) Reset()         { *m = MutateRowRequest{} }
 func (m *MutateRowRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateRowRequest) ProtoMessage()    {}
 func (*MutateRowRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{4}
+	return fileDescriptor_f3f31120fcc6bad7, []int{4}
 }
+
 func (m *MutateRowRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowRequest.Unmarshal(m, b)
 }
 func (m *MutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowRequest.Merge(dst, src)
+func (m *MutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowRequest.Merge(m, src)
 }
 func (m *MutateRowRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateRowRequest.Size(m)
@@ -646,16 +493,17 @@ func (m *MutateRowsRequest) Reset()         { *m = MutateRowsRequest{} }
 func (m *MutateRowsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateRowsRequest) ProtoMessage()    {}
 func (*MutateRowsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{5}
+	return fileDescriptor_f3f31120fcc6bad7, []int{5}
 }
+
 func (m *MutateRowsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowsRequest.Unmarshal(m, b)
 }
 func (m *MutateRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowsRequest.Merge(dst, src)
+func (m *MutateRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest.Merge(m, src)
 }
 func (m *MutateRowsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateRowsRequest.Size(m)
@@ -697,16 +545,17 @@ func (m *MutateRowsRequest_Entry) Reset()         { *m = MutateRowsRequest_Entry
 func (m *MutateRowsRequest_Entry) String() string { return proto.CompactTextString(m) }
 func (*MutateRowsRequest_Entry) ProtoMessage()    {}
 func (*MutateRowsRequest_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{5, 0}
+	return fileDescriptor_f3f31120fcc6bad7, []int{5, 0}
 }
+
 func (m *MutateRowsRequest_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowsRequest_Entry.Unmarshal(m, b)
 }
 func (m *MutateRowsRequest_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowsRequest_Entry.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowsRequest_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowsRequest_Entry.Merge(dst, src)
+func (m *MutateRowsRequest_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest_Entry.Merge(m, src)
 }
 func (m *MutateRowsRequest_Entry) XXX_Size() int {
 	return xxx_messageInfo_MutateRowsRequest_Entry.Size(m)
@@ -748,16 +597,17 @@ func (m *MutateRowsResponse) Reset()         { *m = MutateRowsResponse{} }
 func (m *MutateRowsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateRowsResponse) ProtoMessage()    {}
 func (*MutateRowsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{6}
+	return fileDescriptor_f3f31120fcc6bad7, []int{6}
 }
+
 func (m *MutateRowsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowsResponse.Unmarshal(m, b)
 }
 func (m *MutateRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowsResponse.Merge(dst, src)
+func (m *MutateRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsResponse.Merge(m, src)
 }
 func (m *MutateRowsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateRowsResponse.Size(m)
@@ -808,16 +658,17 @@ func (m *CheckAndMutateRowRequest) Reset()         { *m = CheckAndMutateRowReque
 func (m *CheckAndMutateRowRequest) String() string { return proto.CompactTextString(m) }
 func (*CheckAndMutateRowRequest) ProtoMessage()    {}
 func (*CheckAndMutateRowRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{7}
+	return fileDescriptor_f3f31120fcc6bad7, []int{7}
 }
+
 func (m *CheckAndMutateRowRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckAndMutateRowRequest.Unmarshal(m, b)
 }
 func (m *CheckAndMutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckAndMutateRowRequest.Marshal(b, m, deterministic)
 }
-func (dst *CheckAndMutateRowRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckAndMutateRowRequest.Merge(dst, src)
+func (m *CheckAndMutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowRequest.Merge(m, src)
 }
 func (m *CheckAndMutateRowRequest) XXX_Size() int {
 	return xxx_messageInfo_CheckAndMutateRowRequest.Size(m)
@@ -877,16 +728,17 @@ func (m *CheckAndMutateRowResponse) Reset()         { *m = CheckAndMutateRowResp
 func (m *CheckAndMutateRowResponse) String() string { return proto.CompactTextString(m) }
 func (*CheckAndMutateRowResponse) ProtoMessage()    {}
 func (*CheckAndMutateRowResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{8}
+	return fileDescriptor_f3f31120fcc6bad7, []int{8}
 }
+
 func (m *CheckAndMutateRowResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckAndMutateRowResponse.Unmarshal(m, b)
 }
 func (m *CheckAndMutateRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckAndMutateRowResponse.Marshal(b, m, deterministic)
 }
-func (dst *CheckAndMutateRowResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckAndMutateRowResponse.Merge(dst, src)
+func (m *CheckAndMutateRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowResponse.Merge(m, src)
 }
 func (m *CheckAndMutateRowResponse) XXX_Size() int {
 	return xxx_messageInfo_CheckAndMutateRowResponse.Size(m)
@@ -924,16 +776,17 @@ func (m *ReadModifyWriteRowRequest) Reset()         { *m = ReadModifyWriteRowReq
 func (m *ReadModifyWriteRowRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadModifyWriteRowRequest) ProtoMessage()    {}
 func (*ReadModifyWriteRowRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84, []int{9}
+	return fileDescriptor_f3f31120fcc6bad7, []int{9}
 }
+
 func (m *ReadModifyWriteRowRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadModifyWriteRowRequest.Unmarshal(m, b)
 }
 func (m *ReadModifyWriteRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadModifyWriteRowRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadModifyWriteRowRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadModifyWriteRowRequest.Merge(dst, src)
+func (m *ReadModifyWriteRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRowRequest.Merge(m, src)
 }
 func (m *ReadModifyWriteRowRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadModifyWriteRowRequest.Size(m)
@@ -981,10 +834,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/v1/bigtable_service_messages.proto", fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84)
+	proto.RegisterFile("google/bigtable/v1/bigtable_service_messages.proto", fileDescriptor_f3f31120fcc6bad7)
 }
 
-var fileDescriptor_bigtable_service_messages_4f7fbb80f2eeca84 = []byte{
+var fileDescriptor_f3f31120fcc6bad7 = []byte{
 	// 788 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5f, 0x8b, 0x23, 0x45,
 	0x10, 0xdf, 0x49, 0xcc, 0xbf, 0x4a, 0xdc, 0xdd, 0x6b, 0xce, 0xdb, 0xd9, 0x70, 0x8b, 0x71, 0x10,
diff --git a/googleapis/bigtable/v2/bigtable.pb.go b/googleapis/bigtable/v2/bigtable.pb.go
index 1d24f09e2c..de0745041c 100644
--- a/googleapis/bigtable/v2/bigtable.pb.go
+++ b/googleapis/bigtable/v2/bigtable.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v2/bigtable.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package bigtable
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for Bigtable.ReadRows.
 type ReadRowsRequest struct {
@@ -52,16 +52,17 @@ func (m *ReadRowsRequest) Reset()         { *m = ReadRowsRequest{} }
 func (m *ReadRowsRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsRequest) ProtoMessage()    {}
 func (*ReadRowsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{0}
+	return fileDescriptor_7e9247725ec9a6cf, []int{0}
 }
+
 func (m *ReadRowsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsRequest.Unmarshal(m, b)
 }
 func (m *ReadRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsRequest.Merge(dst, src)
+func (m *ReadRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsRequest.Merge(m, src)
 }
 func (m *ReadRowsRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsRequest.Size(m)
@@ -127,16 +128,17 @@ func (m *ReadRowsResponse) Reset()         { *m = ReadRowsResponse{} }
 func (m *ReadRowsResponse) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsResponse) ProtoMessage()    {}
 func (*ReadRowsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{1}
+	return fileDescriptor_7e9247725ec9a6cf, []int{1}
 }
+
 func (m *ReadRowsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsResponse.Unmarshal(m, b)
 }
 func (m *ReadRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsResponse.Merge(dst, src)
+func (m *ReadRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse.Merge(m, src)
 }
 func (m *ReadRowsResponse) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsResponse.Size(m)
@@ -219,16 +221,17 @@ func (m *ReadRowsResponse_CellChunk) Reset()         { *m = ReadRowsResponse_Cel
 func (m *ReadRowsResponse_CellChunk) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsResponse_CellChunk) ProtoMessage()    {}
 func (*ReadRowsResponse_CellChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{1, 0}
+	return fileDescriptor_7e9247725ec9a6cf, []int{1, 0}
 }
+
 func (m *ReadRowsResponse_CellChunk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsResponse_CellChunk.Unmarshal(m, b)
 }
 func (m *ReadRowsResponse_CellChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsResponse_CellChunk.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsResponse_CellChunk) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsResponse_CellChunk.Merge(dst, src)
+func (m *ReadRowsResponse_CellChunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse_CellChunk.Merge(m, src)
 }
 func (m *ReadRowsResponse_CellChunk) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsResponse_CellChunk.Size(m)
@@ -325,78 +328,14 @@ func (m *ReadRowsResponse_CellChunk) GetCommitRow() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadRowsResponse_CellChunk) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadRowsResponse_CellChunk_OneofMarshaler, _ReadRowsResponse_CellChunk_OneofUnmarshaler, _ReadRowsResponse_CellChunk_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadRowsResponse_CellChunk) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadRowsResponse_CellChunk_ResetRow)(nil),
 		(*ReadRowsResponse_CellChunk_CommitRow)(nil),
 	}
 }
 
-func _ReadRowsResponse_CellChunk_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadRowsResponse_CellChunk)
-	// row_status
-	switch x := m.RowStatus.(type) {
-	case *ReadRowsResponse_CellChunk_ResetRow:
-		t := uint64(0)
-		if x.ResetRow {
-			t = 1
-		}
-		b.EncodeVarint(8<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *ReadRowsResponse_CellChunk_CommitRow:
-		t := uint64(0)
-		if x.CommitRow {
-			t = 1
-		}
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("ReadRowsResponse_CellChunk.RowStatus has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadRowsResponse_CellChunk_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadRowsResponse_CellChunk)
-	switch tag {
-	case 8: // row_status.reset_row
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.RowStatus = &ReadRowsResponse_CellChunk_ResetRow{x != 0}
-		return true, err
-	case 9: // row_status.commit_row
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.RowStatus = &ReadRowsResponse_CellChunk_CommitRow{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadRowsResponse_CellChunk_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadRowsResponse_CellChunk)
-	// row_status
-	switch x := m.RowStatus.(type) {
-	case *ReadRowsResponse_CellChunk_ResetRow:
-		n += 1 // tag and wire
-		n += 1
-	case *ReadRowsResponse_CellChunk_CommitRow:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for Bigtable.SampleRowKeys.
 type SampleRowKeysRequest struct {
 	// The unique name of the table from which to sample row keys.
@@ -415,16 +354,17 @@ func (m *SampleRowKeysRequest) Reset()         { *m = SampleRowKeysRequest{} }
 func (m *SampleRowKeysRequest) String() string { return proto.CompactTextString(m) }
 func (*SampleRowKeysRequest) ProtoMessage()    {}
 func (*SampleRowKeysRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{2}
+	return fileDescriptor_7e9247725ec9a6cf, []int{2}
 }
+
 func (m *SampleRowKeysRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SampleRowKeysRequest.Unmarshal(m, b)
 }
 func (m *SampleRowKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SampleRowKeysRequest.Marshal(b, m, deterministic)
 }
-func (dst *SampleRowKeysRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SampleRowKeysRequest.Merge(dst, src)
+func (m *SampleRowKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysRequest.Merge(m, src)
 }
 func (m *SampleRowKeysRequest) XXX_Size() int {
 	return xxx_messageInfo_SampleRowKeysRequest.Size(m)
@@ -473,16 +413,17 @@ func (m *SampleRowKeysResponse) Reset()         { *m = SampleRowKeysResponse{} }
 func (m *SampleRowKeysResponse) String() string { return proto.CompactTextString(m) }
 func (*SampleRowKeysResponse) ProtoMessage()    {}
 func (*SampleRowKeysResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{3}
+	return fileDescriptor_7e9247725ec9a6cf, []int{3}
 }
+
 func (m *SampleRowKeysResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SampleRowKeysResponse.Unmarshal(m, b)
 }
 func (m *SampleRowKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SampleRowKeysResponse.Marshal(b, m, deterministic)
 }
-func (dst *SampleRowKeysResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SampleRowKeysResponse.Merge(dst, src)
+func (m *SampleRowKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysResponse.Merge(m, src)
 }
 func (m *SampleRowKeysResponse) XXX_Size() int {
 	return xxx_messageInfo_SampleRowKeysResponse.Size(m)
@@ -531,16 +472,17 @@ func (m *MutateRowRequest) Reset()         { *m = MutateRowRequest{} }
 func (m *MutateRowRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateRowRequest) ProtoMessage()    {}
 func (*MutateRowRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{4}
+	return fileDescriptor_7e9247725ec9a6cf, []int{4}
 }
+
 func (m *MutateRowRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowRequest.Unmarshal(m, b)
 }
 func (m *MutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowRequest.Merge(dst, src)
+func (m *MutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowRequest.Merge(m, src)
 }
 func (m *MutateRowRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateRowRequest.Size(m)
@@ -590,16 +532,17 @@ func (m *MutateRowResponse) Reset()         { *m = MutateRowResponse{} }
 func (m *MutateRowResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateRowResponse) ProtoMessage()    {}
 func (*MutateRowResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{5}
+	return fileDescriptor_7e9247725ec9a6cf, []int{5}
 }
+
 func (m *MutateRowResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowResponse.Unmarshal(m, b)
 }
 func (m *MutateRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowResponse.Merge(dst, src)
+func (m *MutateRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowResponse.Merge(m, src)
 }
 func (m *MutateRowResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateRowResponse.Size(m)
@@ -632,16 +575,17 @@ func (m *MutateRowsRequest) Reset()         { *m = MutateRowsRequest{} }
 func (m *MutateRowsRequest) String() string { return proto.CompactTextString(m) }
 func (*MutateRowsRequest) ProtoMessage()    {}
 func (*MutateRowsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{6}
+	return fileDescriptor_7e9247725ec9a6cf, []int{6}
 }
+
 func (m *MutateRowsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowsRequest.Unmarshal(m, b)
 }
 func (m *MutateRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowsRequest.Merge(dst, src)
+func (m *MutateRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest.Merge(m, src)
 }
 func (m *MutateRowsRequest) XXX_Size() int {
 	return xxx_messageInfo_MutateRowsRequest.Size(m)
@@ -690,16 +634,17 @@ func (m *MutateRowsRequest_Entry) Reset()         { *m = MutateRowsRequest_Entry
 func (m *MutateRowsRequest_Entry) String() string { return proto.CompactTextString(m) }
 func (*MutateRowsRequest_Entry) ProtoMessage()    {}
 func (*MutateRowsRequest_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{6, 0}
+	return fileDescriptor_7e9247725ec9a6cf, []int{6, 0}
 }
+
 func (m *MutateRowsRequest_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowsRequest_Entry.Unmarshal(m, b)
 }
 func (m *MutateRowsRequest_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowsRequest_Entry.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowsRequest_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowsRequest_Entry.Merge(dst, src)
+func (m *MutateRowsRequest_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest_Entry.Merge(m, src)
 }
 func (m *MutateRowsRequest_Entry) XXX_Size() int {
 	return xxx_messageInfo_MutateRowsRequest_Entry.Size(m)
@@ -737,16 +682,17 @@ func (m *MutateRowsResponse) Reset()         { *m = MutateRowsResponse{} }
 func (m *MutateRowsResponse) String() string { return proto.CompactTextString(m) }
 func (*MutateRowsResponse) ProtoMessage()    {}
 func (*MutateRowsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{7}
+	return fileDescriptor_7e9247725ec9a6cf, []int{7}
 }
+
 func (m *MutateRowsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowsResponse.Unmarshal(m, b)
 }
 func (m *MutateRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowsResponse.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowsResponse.Merge(dst, src)
+func (m *MutateRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsResponse.Merge(m, src)
 }
 func (m *MutateRowsResponse) XXX_Size() int {
 	return xxx_messageInfo_MutateRowsResponse.Size(m)
@@ -782,16 +728,17 @@ func (m *MutateRowsResponse_Entry) Reset()         { *m = MutateRowsResponse_Ent
 func (m *MutateRowsResponse_Entry) String() string { return proto.CompactTextString(m) }
 func (*MutateRowsResponse_Entry) ProtoMessage()    {}
 func (*MutateRowsResponse_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{7, 0}
+	return fileDescriptor_7e9247725ec9a6cf, []int{7, 0}
 }
+
 func (m *MutateRowsResponse_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutateRowsResponse_Entry.Unmarshal(m, b)
 }
 func (m *MutateRowsResponse_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutateRowsResponse_Entry.Marshal(b, m, deterministic)
 }
-func (dst *MutateRowsResponse_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutateRowsResponse_Entry.Merge(dst, src)
+func (m *MutateRowsResponse_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsResponse_Entry.Merge(m, src)
 }
 func (m *MutateRowsResponse_Entry) XXX_Size() int {
 	return xxx_messageInfo_MutateRowsResponse_Entry.Size(m)
@@ -854,16 +801,17 @@ func (m *CheckAndMutateRowRequest) Reset()         { *m = CheckAndMutateRowReque
 func (m *CheckAndMutateRowRequest) String() string { return proto.CompactTextString(m) }
 func (*CheckAndMutateRowRequest) ProtoMessage()    {}
 func (*CheckAndMutateRowRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{8}
+	return fileDescriptor_7e9247725ec9a6cf, []int{8}
 }
+
 func (m *CheckAndMutateRowRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckAndMutateRowRequest.Unmarshal(m, b)
 }
 func (m *CheckAndMutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckAndMutateRowRequest.Marshal(b, m, deterministic)
 }
-func (dst *CheckAndMutateRowRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckAndMutateRowRequest.Merge(dst, src)
+func (m *CheckAndMutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowRequest.Merge(m, src)
 }
 func (m *CheckAndMutateRowRequest) XXX_Size() int {
 	return xxx_messageInfo_CheckAndMutateRowRequest.Size(m)
@@ -930,16 +878,17 @@ func (m *CheckAndMutateRowResponse) Reset()         { *m = CheckAndMutateRowResp
 func (m *CheckAndMutateRowResponse) String() string { return proto.CompactTextString(m) }
 func (*CheckAndMutateRowResponse) ProtoMessage()    {}
 func (*CheckAndMutateRowResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{9}
+	return fileDescriptor_7e9247725ec9a6cf, []int{9}
 }
+
 func (m *CheckAndMutateRowResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckAndMutateRowResponse.Unmarshal(m, b)
 }
 func (m *CheckAndMutateRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckAndMutateRowResponse.Marshal(b, m, deterministic)
 }
-func (dst *CheckAndMutateRowResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckAndMutateRowResponse.Merge(dst, src)
+func (m *CheckAndMutateRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowResponse.Merge(m, src)
 }
 func (m *CheckAndMutateRowResponse) XXX_Size() int {
 	return xxx_messageInfo_CheckAndMutateRowResponse.Size(m)
@@ -982,16 +931,17 @@ func (m *ReadModifyWriteRowRequest) Reset()         { *m = ReadModifyWriteRowReq
 func (m *ReadModifyWriteRowRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadModifyWriteRowRequest) ProtoMessage()    {}
 func (*ReadModifyWriteRowRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{10}
+	return fileDescriptor_7e9247725ec9a6cf, []int{10}
 }
+
 func (m *ReadModifyWriteRowRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadModifyWriteRowRequest.Unmarshal(m, b)
 }
 func (m *ReadModifyWriteRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadModifyWriteRowRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadModifyWriteRowRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadModifyWriteRowRequest.Merge(dst, src)
+func (m *ReadModifyWriteRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRowRequest.Merge(m, src)
 }
 func (m *ReadModifyWriteRowRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadModifyWriteRowRequest.Size(m)
@@ -1043,16 +993,17 @@ func (m *ReadModifyWriteRowResponse) Reset()         { *m = ReadModifyWriteRowRe
 func (m *ReadModifyWriteRowResponse) String() string { return proto.CompactTextString(m) }
 func (*ReadModifyWriteRowResponse) ProtoMessage()    {}
 func (*ReadModifyWriteRowResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bigtable_b796ce6ccdb99cd8, []int{11}
+	return fileDescriptor_7e9247725ec9a6cf, []int{11}
 }
+
 func (m *ReadModifyWriteRowResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadModifyWriteRowResponse.Unmarshal(m, b)
 }
 func (m *ReadModifyWriteRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadModifyWriteRowResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReadModifyWriteRowResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadModifyWriteRowResponse.Merge(dst, src)
+func (m *ReadModifyWriteRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRowResponse.Merge(m, src)
 }
 func (m *ReadModifyWriteRowResponse) XXX_Size() int {
 	return xxx_messageInfo_ReadModifyWriteRowResponse.Size(m)
@@ -1088,6 +1039,88 @@ func init() {
 	proto.RegisterType((*ReadModifyWriteRowResponse)(nil), "google.bigtable.v2.ReadModifyWriteRowResponse")
 }
 
+func init() { proto.RegisterFile("google/bigtable/v2/bigtable.proto", fileDescriptor_7e9247725ec9a6cf) }
+
+var fileDescriptor_7e9247725ec9a6cf = []byte{
+	// 1210 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0x66, 0xec, 0xd8, 0xf1, 0xbe, 0xa4, 0x4d, 0x32, 0x84, 0x76, 0x6b, 0x5a, 0x70, 0x97, 0x16,
+	0xdc, 0x94, 0xae, 0x2b, 0x23, 0x0e, 0x75, 0xd5, 0x02, 0x09, 0x69, 0x53, 0x41, 0xaa, 0x6a, 0x2c,
+	0x15, 0x09, 0x22, 0xad, 0xc6, 0xeb, 0xb1, 0x3b, 0x74, 0x77, 0x67, 0xbb, 0x3b, 0x5b, 0xe3, 0x22,
+	0x2e, 0xfc, 0x05, 0x8e, 0x08, 0x71, 0x42, 0x48, 0x08, 0x38, 0x73, 0xe3, 0xc0, 0x8d, 0x03, 0x17,
+	0xae, 0x1c, 0xfb, 0x0b, 0xb8, 0x23, 0xa1, 0x9d, 0x9d, 0xb5, 0x9d, 0xc4, 0x6e, 0x9d, 0x20, 0x71,
+	0xdb, 0x7d, 0xef, 0x7d, 0x6f, 0xbf, 0xf7, 0xbd, 0x37, 0x6f, 0x6c, 0x38, 0xdf, 0x17, 0xa2, 0xef,
+	0xb1, 0x46, 0x87, 0xf7, 0x25, 0xed, 0x78, 0xac, 0xf1, 0xb8, 0x39, 0x7a, 0xb6, 0xc3, 0x48, 0x48,
+	0x81, 0x71, 0x16, 0x62, 0x8f, 0xcc, 0x8f, 0x9b, 0xd5, 0xb3, 0x1a, 0x46, 0x43, 0xde, 0xa0, 0x41,
+	0x20, 0x24, 0x95, 0x5c, 0x04, 0x71, 0x86, 0xa8, 0x9e, 0x9b, 0x92, 0xb4, 0x4b, 0x25, 0xd5, 0xee,
+	0x57, 0xb4, 0x5b, 0xbd, 0x75, 0x92, 0x5e, 0x63, 0x10, 0xd1, 0x30, 0x64, 0x51, 0x0e, 0x3f, 0xad,
+	0xfd, 0x51, 0xe8, 0x36, 0x62, 0x49, 0x65, 0xa2, 0x1d, 0xd6, 0x5f, 0x08, 0x56, 0x08, 0xa3, 0x5d,
+	0x22, 0x06, 0x31, 0x61, 0x8f, 0x12, 0x16, 0x4b, 0x7c, 0x0e, 0x40, 0x7d, 0xc3, 0x09, 0xa8, 0xcf,
+	0x4c, 0x54, 0x43, 0x75, 0x83, 0x18, 0xca, 0x72, 0x97, 0xfa, 0x0c, 0x5f, 0x80, 0x93, 0x34, 0x0c,
+	0x9d, 0x30, 0x12, 0x3d, 0xee, 0x31, 0x87, 0x77, 0xcd, 0x92, 0x0a, 0x59, 0xa6, 0x61, 0x78, 0x2f,
+	0x33, 0xde, 0xe9, 0x62, 0x1b, 0x16, 0x22, 0x31, 0x88, 0xcd, 0x42, 0x0d, 0xd5, 0x97, 0x9a, 0x55,
+	0xfb, 0x70, 0xc5, 0x36, 0x11, 0x83, 0x36, 0x93, 0x44, 0xc5, 0xe1, 0xb7, 0xa1, 0xdc, 0xe3, 0x9e,
+	0x64, 0x91, 0x59, 0x54, 0x88, 0x73, 0x33, 0x10, 0xb7, 0x54, 0x10, 0xd1, 0xc1, 0x29, 0xd7, 0x14,
+	0xee, 0x78, 0xdc, 0xe7, 0xd2, 0x5c, 0xa8, 0xa1, 0x7a, 0x91, 0x18, 0xa9, 0xe5, 0xc3, 0xd4, 0x60,
+	0xfd, 0x5d, 0x84, 0xd5, 0x71, 0x79, 0x71, 0x28, 0x82, 0x98, 0xe1, 0x5b, 0x50, 0x76, 0x1f, 0x24,
+	0xc1, 0xc3, 0xd8, 0x44, 0xb5, 0x62, 0x7d, 0xa9, 0x69, 0x4f, 0xfd, 0xd4, 0x01, 0x94, 0xbd, 0xc5,
+	0x3c, 0x6f, 0x2b, 0x85, 0x11, 0x8d, 0xc6, 0x0d, 0x58, 0xf7, 0x68, 0x2c, 0x9d, 0xd8, 0xa5, 0x41,
+	0xc0, 0xba, 0x4e, 0x24, 0x06, 0xce, 0x43, 0x36, 0x54, 0x25, 0x2f, 0x93, 0xb5, 0xd4, 0xd7, 0xce,
+	0x5c, 0x44, 0x0c, 0x3e, 0x60, 0xc3, 0xea, 0xd3, 0x02, 0x18, 0xa3, 0x34, 0xf8, 0x34, 0x2c, 0xe6,
+	0x08, 0xa4, 0x10, 0xe5, 0x48, 0x85, 0xe1, 0x1b, 0xb0, 0xd4, 0xa3, 0x3e, 0xf7, 0x86, 0x59, 0x03,
+	0x32, 0x05, 0xcf, 0xe6, 0x24, 0xf3, 0x16, 0xdb, 0x6d, 0x19, 0xf1, 0xa0, 0x7f, 0x9f, 0x7a, 0x09,
+	0x23, 0x90, 0x01, 0x54, 0x7f, 0xae, 0x81, 0xf1, 0x28, 0xa1, 0x1e, 0xef, 0xf1, 0x91, 0x98, 0x2f,
+	0x1f, 0x02, 0x6f, 0x0e, 0x25, 0x8b, 0x33, 0xec, 0x38, 0x1a, 0x5f, 0x82, 0x55, 0xc9, 0x7d, 0x16,
+	0x4b, 0xea, 0x87, 0x8e, 0xcf, 0xdd, 0x48, 0xc4, 0x5a, 0xd3, 0x95, 0x91, 0x7d, 0x57, 0x99, 0xf1,
+	0x29, 0x28, 0x7b, 0xb4, 0xc3, 0xbc, 0xd8, 0x2c, 0xd5, 0x8a, 0x75, 0x83, 0xe8, 0x37, 0xbc, 0x0e,
+	0xa5, 0xc7, 0x69, 0x5a, 0xb3, 0xac, 0x6a, 0xca, 0x5e, 0xd2, 0x36, 0xa9, 0x07, 0x27, 0xe6, 0x4f,
+	0x98, 0xb9, 0x58, 0x43, 0xf5, 0x12, 0x31, 0x94, 0xa5, 0xcd, 0x9f, 0xa4, 0x6e, 0x23, 0x62, 0x31,
+	0x93, 0xa9, 0x84, 0x66, 0xa5, 0x86, 0xea, 0x95, 0x9d, 0x17, 0x48, 0x45, 0x99, 0x88, 0x18, 0xe0,
+	0x57, 0x01, 0x5c, 0xe1, 0xfb, 0x3c, 0xf3, 0x1b, 0xda, 0x6f, 0x64, 0x36, 0x22, 0x06, 0x9b, 0xcb,
+	0x6a, 0x0a, 0x9c, 0x6c, 0xb2, 0xad, 0x4f, 0x60, 0xbd, 0x4d, 0xfd, 0xd0, 0x63, 0x99, 0xec, 0xc7,
+	0x9f, 0xeb, 0xc2, 0xe1, 0xb9, 0xb6, 0xda, 0xf0, 0xd2, 0x81, 0xe4, 0x7a, 0xaa, 0x66, 0xb6, 0xf3,
+	0x3c, 0x2c, 0x8b, 0x5e, 0x2f, 0xad, 0xae, 0x93, 0x8a, 0xae, 0xb2, 0x16, 0xc9, 0x52, 0x66, 0x53,
+	0x7d, 0xb0, 0x7e, 0x44, 0xb0, 0xba, 0x9b, 0x48, 0x2a, 0xd3, 0xac, 0xc7, 0xa6, 0xbb, 0x30, 0xe5,
+	0x18, 0x4e, 0xb0, 0x2a, 0xec, 0x63, 0xd5, 0x02, 0xc3, 0x4f, 0xf4, 0x8e, 0x31, 0x8b, 0xea, 0x1c,
+	0x9c, 0x9d, 0x76, 0x0e, 0x76, 0x75, 0x10, 0x19, 0x87, 0x5b, 0x2f, 0xc2, 0xda, 0x04, 0xdb, 0xac,
+	0x7e, 0xeb, 0x1f, 0x34, 0x61, 0x3d, 0xbe, 0xe6, 0xc5, 0x29, 0x45, 0x6c, 0xc3, 0x22, 0x0b, 0x64,
+	0xc4, 0x95, 0x78, 0x29, 0xd3, 0xcb, 0x33, 0x99, 0x4e, 0x7e, 0xdc, 0xde, 0x0e, 0x64, 0x34, 0x24,
+	0x39, 0xb6, 0xba, 0x07, 0x25, 0x65, 0x99, 0xdd, 0xaa, 0x7d, 0xa2, 0x14, 0x8e, 0x26, 0xca, 0xf7,
+	0x08, 0xf0, 0x24, 0x85, 0xd1, 0xb2, 0x19, 0x71, 0xcf, 0xb6, 0xcd, 0x9b, 0xcf, 0xe3, 0xae, 0xf7,
+	0xcd, 0x01, 0xf2, 0x77, 0x72, 0xf2, 0xeb, 0x50, 0xe2, 0x41, 0x97, 0x7d, 0xa6, 0xa8, 0x17, 0x49,
+	0xf6, 0x82, 0x37, 0xa0, 0x9c, 0x4d, 0xbf, 0x5e, 0x17, 0x38, 0xff, 0x4a, 0x14, 0xba, 0x76, 0x5b,
+	0x79, 0x88, 0x8e, 0xb0, 0xfe, 0x28, 0x80, 0xb9, 0xf5, 0x80, 0xb9, 0x0f, 0xdf, 0x0b, 0xba, 0xff,
+	0x7d, 0xea, 0x16, 0x8f, 0x32, 0x75, 0x3b, 0xb0, 0x1a, 0x46, 0xac, 0xcb, 0x5d, 0x2a, 0x99, 0xa3,
+	0xf7, 0x7d, 0x79, 0x9e, 0x7d, 0xbf, 0x32, 0x82, 0x65, 0x06, 0xbc, 0x05, 0x27, 0x65, 0x94, 0x30,
+	0x67, 0xdc, 0xaf, 0x85, 0x39, 0xfa, 0x75, 0x22, 0xc5, 0xe4, 0x6f, 0x31, 0xde, 0x86, 0x95, 0x1e,
+	0xf5, 0xe2, 0xc9, 0x2c, 0xa5, 0x39, 0xb2, 0x9c, 0x54, 0xa0, 0x51, 0x1a, 0x6b, 0x07, 0xce, 0x4c,
+	0xd1, 0x53, 0x0f, 0xc0, 0x65, 0x58, 0x1b, 0x97, 0xec, 0x53, 0xe9, 0x3e, 0x60, 0x5d, 0xa5, 0x6b,
+	0x85, 0x8c, 0xb5, 0xd8, 0xcd, 0xec, 0xd6, 0x2f, 0x08, 0xce, 0xa4, 0x37, 0xcf, 0xae, 0xe8, 0xf2,
+	0xde, 0xf0, 0xa3, 0x88, 0xff, 0x8f, 0x1b, 0xe1, 0x06, 0x94, 0xa2, 0xc4, 0x63, 0xf9, 0x36, 0x78,
+	0x63, 0xd6, 0xad, 0x38, 0xc9, 0x2d, 0xf1, 0x18, 0xc9, 0x50, 0xd6, 0x6d, 0xa8, 0x4e, 0x63, 0xae,
+	0x55, 0xb8, 0x04, 0xc5, 0x74, 0x77, 0x23, 0xd5, 0xeb, 0xd3, 0x33, 0x7a, 0x4d, 0xd2, 0x98, 0xe6,
+	0x4f, 0x15, 0xa8, 0x6c, 0x6a, 0x07, 0xfe, 0x06, 0x41, 0x25, 0xbf, 0x8a, 0xf1, 0x6b, 0xcf, 0xbe,
+	0xa8, 0x95, 0x48, 0xd5, 0x0b, 0xf3, 0xdc, 0xe6, 0xd6, 0xfb, 0x5f, 0xfe, 0xf9, 0xf4, 0xab, 0xc2,
+	0x4d, 0xeb, 0x5a, 0xfa, 0x43, 0xea, 0xf3, 0xb1, 0xaa, 0x37, 0xc2, 0x48, 0x7c, 0xca, 0x5c, 0x19,
+	0x37, 0x36, 0x1a, 0x3c, 0x88, 0x25, 0x0d, 0x5c, 0x96, 0x3e, 0xab, 0x88, 0xb8, 0xb1, 0xf1, 0x45,
+	0x2b, 0xd2, 0xa9, 0x5a, 0x68, 0xe3, 0x2a, 0xc2, 0x3f, 0x23, 0x38, 0xb1, 0xef, 0x3e, 0xc0, 0xf5,
+	0x69, 0xdf, 0x9f, 0x76, 0x1f, 0x55, 0x2f, 0xcd, 0x11, 0xa9, 0xe9, 0xde, 0x52, 0x74, 0xdf, 0xc5,
+	0x37, 0x8f, 0x4c, 0x37, 0x9e, 0xcc, 0x77, 0x15, 0xe1, 0x6f, 0x11, 0x18, 0xa3, 0x21, 0xc5, 0x17,
+	0x9e, 0xb9, 0x8c, 0x72, 0xa2, 0x17, 0x9f, 0x13, 0xa5, 0x49, 0x6e, 0x2b, 0x92, 0xef, 0x58, 0xad,
+	0x23, 0x93, 0xf4, 0xf3, 0x5c, 0x2d, 0xb4, 0x81, 0xbf, 0x43, 0x00, 0xe3, 0x7d, 0x88, 0x2f, 0xce,
+	0xb5, 0xeb, 0xab, 0xaf, 0xcf, 0xb7, 0x56, 0x73, 0x25, 0xad, 0xeb, 0xc7, 0x27, 0xa9, 0x5b, 0xff,
+	0x2b, 0x82, 0xb5, 0x43, 0xc7, 0x1e, 0x4f, 0x5d, 0xef, 0xb3, 0xb6, 0x6d, 0xf5, 0xca, 0x9c, 0xd1,
+	0x9a, 0xfc, 0xae, 0x22, 0x7f, 0xdb, 0xda, 0x3c, 0x32, 0x79, 0xf7, 0x60, 0xce, 0x54, 0xe9, 0xdf,
+	0x10, 0xe0, 0xc3, 0x67, 0x16, 0x5f, 0x99, 0xe7, 0xe4, 0x8f, 0x6b, 0xb0, 0xe7, 0x0d, 0xd7, 0x45,
+	0xdc, 0x55, 0x45, 0xec, 0x58, 0x5b, 0xc7, 0x3a, 0x7a, 0xfb, 0x93, 0xb6, 0xd0, 0xc6, 0xe6, 0xd7,
+	0x08, 0x4e, 0xb9, 0xc2, 0x9f, 0xc2, 0x62, 0xf3, 0x44, 0xbe, 0x47, 0xee, 0xa5, 0xbf, 0x7b, 0xef,
+	0xa1, 0x8f, 0x5b, 0x3a, 0xa8, 0x2f, 0x3c, 0x1a, 0xf4, 0x6d, 0x11, 0xf5, 0x1b, 0x7d, 0x16, 0xa8,
+	0x5f, 0xc5, 0x8d, 0xcc, 0x45, 0x43, 0x1e, 0x4f, 0xfe, 0xcb, 0xba, 0x9e, 0x3f, 0xff, 0x50, 0x30,
+	0x6f, 0x67, 0xe0, 0x2d, 0x4f, 0x24, 0x5d, 0x3b, 0x4f, 0x6d, 0xdf, 0x6f, 0xfe, 0x9e, 0xbb, 0xf6,
+	0x94, 0x6b, 0x2f, 0x77, 0xed, 0xdd, 0x6f, 0x76, 0xca, 0x2a, 0xf9, 0x5b, 0xff, 0x06, 0x00, 0x00,
+	0xff, 0xff, 0xd6, 0x35, 0xfc, 0x0e, 0x16, 0x0e, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1446,87 +1479,3 @@ var _Bigtable_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/bigtable/v2/bigtable.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/bigtable/v2/bigtable.proto", fileDescriptor_bigtable_b796ce6ccdb99cd8)
-}
-
-var fileDescriptor_bigtable_b796ce6ccdb99cd8 = []byte{
-	// 1210 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x41, 0x6f, 0x1b, 0x45,
-	0x14, 0x66, 0xec, 0xd8, 0xf1, 0xbe, 0xa4, 0x4d, 0x32, 0x84, 0x76, 0x6b, 0x5a, 0x70, 0x97, 0x16,
-	0xdc, 0x94, 0xae, 0x2b, 0x23, 0x0e, 0x75, 0xd5, 0x02, 0x09, 0x69, 0x53, 0x41, 0xaa, 0x6a, 0x2c,
-	0x15, 0x09, 0x22, 0xad, 0xc6, 0xeb, 0xb1, 0x3b, 0x74, 0x77, 0x67, 0xbb, 0x3b, 0x5b, 0xe3, 0x22,
-	0x2e, 0xfc, 0x05, 0x8e, 0x08, 0x71, 0x42, 0x48, 0x08, 0x38, 0x73, 0xe3, 0xc0, 0x8d, 0x03, 0x17,
-	0xae, 0x1c, 0xfb, 0x0b, 0xb8, 0x23, 0xa1, 0x9d, 0x9d, 0xb5, 0x9d, 0xc4, 0x6e, 0x9d, 0x20, 0x71,
-	0xdb, 0x7d, 0xef, 0x7d, 0x6f, 0xbf, 0xf7, 0xbd, 0x37, 0x6f, 0x6c, 0x38, 0xdf, 0x17, 0xa2, 0xef,
-	0xb1, 0x46, 0x87, 0xf7, 0x25, 0xed, 0x78, 0xac, 0xf1, 0xb8, 0x39, 0x7a, 0xb6, 0xc3, 0x48, 0x48,
-	0x81, 0x71, 0x16, 0x62, 0x8f, 0xcc, 0x8f, 0x9b, 0xd5, 0xb3, 0x1a, 0x46, 0x43, 0xde, 0xa0, 0x41,
-	0x20, 0x24, 0x95, 0x5c, 0x04, 0x71, 0x86, 0xa8, 0x9e, 0x9b, 0x92, 0xb4, 0x4b, 0x25, 0xd5, 0xee,
-	0x57, 0xb4, 0x5b, 0xbd, 0x75, 0x92, 0x5e, 0x63, 0x10, 0xd1, 0x30, 0x64, 0x51, 0x0e, 0x3f, 0xad,
-	0xfd, 0x51, 0xe8, 0x36, 0x62, 0x49, 0x65, 0xa2, 0x1d, 0xd6, 0x5f, 0x08, 0x56, 0x08, 0xa3, 0x5d,
-	0x22, 0x06, 0x31, 0x61, 0x8f, 0x12, 0x16, 0x4b, 0x7c, 0x0e, 0x40, 0x7d, 0xc3, 0x09, 0xa8, 0xcf,
-	0x4c, 0x54, 0x43, 0x75, 0x83, 0x18, 0xca, 0x72, 0x97, 0xfa, 0x0c, 0x5f, 0x80, 0x93, 0x34, 0x0c,
-	0x9d, 0x30, 0x12, 0x3d, 0xee, 0x31, 0x87, 0x77, 0xcd, 0x92, 0x0a, 0x59, 0xa6, 0x61, 0x78, 0x2f,
-	0x33, 0xde, 0xe9, 0x62, 0x1b, 0x16, 0x22, 0x31, 0x88, 0xcd, 0x42, 0x0d, 0xd5, 0x97, 0x9a, 0x55,
-	0xfb, 0x70, 0xc5, 0x36, 0x11, 0x83, 0x36, 0x93, 0x44, 0xc5, 0xe1, 0xb7, 0xa1, 0xdc, 0xe3, 0x9e,
-	0x64, 0x91, 0x59, 0x54, 0x88, 0x73, 0x33, 0x10, 0xb7, 0x54, 0x10, 0xd1, 0xc1, 0x29, 0xd7, 0x14,
-	0xee, 0x78, 0xdc, 0xe7, 0xd2, 0x5c, 0xa8, 0xa1, 0x7a, 0x91, 0x18, 0xa9, 0xe5, 0xc3, 0xd4, 0x60,
-	0xfd, 0x5d, 0x84, 0xd5, 0x71, 0x79, 0x71, 0x28, 0x82, 0x98, 0xe1, 0x5b, 0x50, 0x76, 0x1f, 0x24,
-	0xc1, 0xc3, 0xd8, 0x44, 0xb5, 0x62, 0x7d, 0xa9, 0x69, 0x4f, 0xfd, 0xd4, 0x01, 0x94, 0xbd, 0xc5,
-	0x3c, 0x6f, 0x2b, 0x85, 0x11, 0x8d, 0xc6, 0x0d, 0x58, 0xf7, 0x68, 0x2c, 0x9d, 0xd8, 0xa5, 0x41,
-	0xc0, 0xba, 0x4e, 0x24, 0x06, 0xce, 0x43, 0x36, 0x54, 0x25, 0x2f, 0x93, 0xb5, 0xd4, 0xd7, 0xce,
-	0x5c, 0x44, 0x0c, 0x3e, 0x60, 0xc3, 0xea, 0xd3, 0x02, 0x18, 0xa3, 0x34, 0xf8, 0x34, 0x2c, 0xe6,
-	0x08, 0xa4, 0x10, 0xe5, 0x48, 0x85, 0xe1, 0x1b, 0xb0, 0xd4, 0xa3, 0x3e, 0xf7, 0x86, 0x59, 0x03,
-	0x32, 0x05, 0xcf, 0xe6, 0x24, 0xf3, 0x16, 0xdb, 0x6d, 0x19, 0xf1, 0xa0, 0x7f, 0x9f, 0x7a, 0x09,
-	0x23, 0x90, 0x01, 0x54, 0x7f, 0xae, 0x81, 0xf1, 0x28, 0xa1, 0x1e, 0xef, 0xf1, 0x91, 0x98, 0x2f,
-	0x1f, 0x02, 0x6f, 0x0e, 0x25, 0x8b, 0x33, 0xec, 0x38, 0x1a, 0x5f, 0x82, 0x55, 0xc9, 0x7d, 0x16,
-	0x4b, 0xea, 0x87, 0x8e, 0xcf, 0xdd, 0x48, 0xc4, 0x5a, 0xd3, 0x95, 0x91, 0x7d, 0x57, 0x99, 0xf1,
-	0x29, 0x28, 0x7b, 0xb4, 0xc3, 0xbc, 0xd8, 0x2c, 0xd5, 0x8a, 0x75, 0x83, 0xe8, 0x37, 0xbc, 0x0e,
-	0xa5, 0xc7, 0x69, 0x5a, 0xb3, 0xac, 0x6a, 0xca, 0x5e, 0xd2, 0x36, 0xa9, 0x07, 0x27, 0xe6, 0x4f,
-	0x98, 0xb9, 0x58, 0x43, 0xf5, 0x12, 0x31, 0x94, 0xa5, 0xcd, 0x9f, 0xa4, 0x6e, 0x23, 0x62, 0x31,
-	0x93, 0xa9, 0x84, 0x66, 0xa5, 0x86, 0xea, 0x95, 0x9d, 0x17, 0x48, 0x45, 0x99, 0x88, 0x18, 0xe0,
-	0x57, 0x01, 0x5c, 0xe1, 0xfb, 0x3c, 0xf3, 0x1b, 0xda, 0x6f, 0x64, 0x36, 0x22, 0x06, 0x9b, 0xcb,
-	0x6a, 0x0a, 0x9c, 0x6c, 0xb2, 0xad, 0x4f, 0x60, 0xbd, 0x4d, 0xfd, 0xd0, 0x63, 0x99, 0xec, 0xc7,
-	0x9f, 0xeb, 0xc2, 0xe1, 0xb9, 0xb6, 0xda, 0xf0, 0xd2, 0x81, 0xe4, 0x7a, 0xaa, 0x66, 0xb6, 0xf3,
-	0x3c, 0x2c, 0x8b, 0x5e, 0x2f, 0xad, 0xae, 0x93, 0x8a, 0xae, 0xb2, 0x16, 0xc9, 0x52, 0x66, 0x53,
-	0x7d, 0xb0, 0x7e, 0x44, 0xb0, 0xba, 0x9b, 0x48, 0x2a, 0xd3, 0xac, 0xc7, 0xa6, 0xbb, 0x30, 0xe5,
-	0x18, 0x4e, 0xb0, 0x2a, 0xec, 0x63, 0xd5, 0x02, 0xc3, 0x4f, 0xf4, 0x8e, 0x31, 0x8b, 0xea, 0x1c,
-	0x9c, 0x9d, 0x76, 0x0e, 0x76, 0x75, 0x10, 0x19, 0x87, 0x5b, 0x2f, 0xc2, 0xda, 0x04, 0xdb, 0xac,
-	0x7e, 0xeb, 0x1f, 0x34, 0x61, 0x3d, 0xbe, 0xe6, 0xc5, 0x29, 0x45, 0x6c, 0xc3, 0x22, 0x0b, 0x64,
-	0xc4, 0x95, 0x78, 0x29, 0xd3, 0xcb, 0x33, 0x99, 0x4e, 0x7e, 0xdc, 0xde, 0x0e, 0x64, 0x34, 0x24,
-	0x39, 0xb6, 0xba, 0x07, 0x25, 0x65, 0x99, 0xdd, 0xaa, 0x7d, 0xa2, 0x14, 0x8e, 0x26, 0xca, 0xf7,
-	0x08, 0xf0, 0x24, 0x85, 0xd1, 0xb2, 0x19, 0x71, 0xcf, 0xb6, 0xcd, 0x9b, 0xcf, 0xe3, 0xae, 0xf7,
-	0xcd, 0x01, 0xf2, 0x77, 0x72, 0xf2, 0xeb, 0x50, 0xe2, 0x41, 0x97, 0x7d, 0xa6, 0xa8, 0x17, 0x49,
-	0xf6, 0x82, 0x37, 0xa0, 0x9c, 0x4d, 0xbf, 0x5e, 0x17, 0x38, 0xff, 0x4a, 0x14, 0xba, 0x76, 0x5b,
-	0x79, 0x88, 0x8e, 0xb0, 0xfe, 0x28, 0x80, 0xb9, 0xf5, 0x80, 0xb9, 0x0f, 0xdf, 0x0b, 0xba, 0xff,
-	0x7d, 0xea, 0x16, 0x8f, 0x32, 0x75, 0x3b, 0xb0, 0x1a, 0x46, 0xac, 0xcb, 0x5d, 0x2a, 0x99, 0xa3,
-	0xf7, 0x7d, 0x79, 0x9e, 0x7d, 0xbf, 0x32, 0x82, 0x65, 0x06, 0xbc, 0x05, 0x27, 0x65, 0x94, 0x30,
-	0x67, 0xdc, 0xaf, 0x85, 0x39, 0xfa, 0x75, 0x22, 0xc5, 0xe4, 0x6f, 0x31, 0xde, 0x86, 0x95, 0x1e,
-	0xf5, 0xe2, 0xc9, 0x2c, 0xa5, 0x39, 0xb2, 0x9c, 0x54, 0xa0, 0x51, 0x1a, 0x6b, 0x07, 0xce, 0x4c,
-	0xd1, 0x53, 0x0f, 0xc0, 0x65, 0x58, 0x1b, 0x97, 0xec, 0x53, 0xe9, 0x3e, 0x60, 0x5d, 0xa5, 0x6b,
-	0x85, 0x8c, 0xb5, 0xd8, 0xcd, 0xec, 0xd6, 0x2f, 0x08, 0xce, 0xa4, 0x37, 0xcf, 0xae, 0xe8, 0xf2,
-	0xde, 0xf0, 0xa3, 0x88, 0xff, 0x8f, 0x1b, 0xe1, 0x06, 0x94, 0xa2, 0xc4, 0x63, 0xf9, 0x36, 0x78,
-	0x63, 0xd6, 0xad, 0x38, 0xc9, 0x2d, 0xf1, 0x18, 0xc9, 0x50, 0xd6, 0x6d, 0xa8, 0x4e, 0x63, 0xae,
-	0x55, 0xb8, 0x04, 0xc5, 0x74, 0x77, 0x23, 0xd5, 0xeb, 0xd3, 0x33, 0x7a, 0x4d, 0xd2, 0x98, 0xe6,
-	0x4f, 0x15, 0xa8, 0x6c, 0x6a, 0x07, 0xfe, 0x06, 0x41, 0x25, 0xbf, 0x8a, 0xf1, 0x6b, 0xcf, 0xbe,
-	0xa8, 0x95, 0x48, 0xd5, 0x0b, 0xf3, 0xdc, 0xe6, 0xd6, 0xfb, 0x5f, 0xfe, 0xf9, 0xf4, 0xab, 0xc2,
-	0x4d, 0xeb, 0x5a, 0xfa, 0x43, 0xea, 0xf3, 0xb1, 0xaa, 0x37, 0xc2, 0x48, 0x7c, 0xca, 0x5c, 0x19,
-	0x37, 0x36, 0x1a, 0x3c, 0x88, 0x25, 0x0d, 0x5c, 0x96, 0x3e, 0xab, 0x88, 0xb8, 0xb1, 0xf1, 0x45,
-	0x2b, 0xd2, 0xa9, 0x5a, 0x68, 0xe3, 0x2a, 0xc2, 0x3f, 0x23, 0x38, 0xb1, 0xef, 0x3e, 0xc0, 0xf5,
-	0x69, 0xdf, 0x9f, 0x76, 0x1f, 0x55, 0x2f, 0xcd, 0x11, 0xa9, 0xe9, 0xde, 0x52, 0x74, 0xdf, 0xc5,
-	0x37, 0x8f, 0x4c, 0x37, 0x9e, 0xcc, 0x77, 0x15, 0xe1, 0x6f, 0x11, 0x18, 0xa3, 0x21, 0xc5, 0x17,
-	0x9e, 0xb9, 0x8c, 0x72, 0xa2, 0x17, 0x9f, 0x13, 0xa5, 0x49, 0x6e, 0x2b, 0x92, 0xef, 0x58, 0xad,
-	0x23, 0x93, 0xf4, 0xf3, 0x5c, 0x2d, 0xb4, 0x81, 0xbf, 0x43, 0x00, 0xe3, 0x7d, 0x88, 0x2f, 0xce,
-	0xb5, 0xeb, 0xab, 0xaf, 0xcf, 0xb7, 0x56, 0x73, 0x25, 0xad, 0xeb, 0xc7, 0x27, 0xa9, 0x5b, 0xff,
-	0x2b, 0x82, 0xb5, 0x43, 0xc7, 0x1e, 0x4f, 0x5d, 0xef, 0xb3, 0xb6, 0x6d, 0xf5, 0xca, 0x9c, 0xd1,
-	0x9a, 0xfc, 0xae, 0x22, 0x7f, 0xdb, 0xda, 0x3c, 0x32, 0x79, 0xf7, 0x60, 0xce, 0x54, 0xe9, 0xdf,
-	0x10, 0xe0, 0xc3, 0x67, 0x16, 0x5f, 0x99, 0xe7, 0xe4, 0x8f, 0x6b, 0xb0, 0xe7, 0x0d, 0xd7, 0x45,
-	0xdc, 0x55, 0x45, 0xec, 0x58, 0x5b, 0xc7, 0x3a, 0x7a, 0xfb, 0x93, 0xb6, 0xd0, 0xc6, 0xe6, 0xd7,
-	0x08, 0x4e, 0xb9, 0xc2, 0x9f, 0xc2, 0x62, 0xf3, 0x44, 0xbe, 0x47, 0xee, 0xa5, 0xbf, 0x7b, 0xef,
-	0xa1, 0x8f, 0x5b, 0x3a, 0xa8, 0x2f, 0x3c, 0x1a, 0xf4, 0x6d, 0x11, 0xf5, 0x1b, 0x7d, 0x16, 0xa8,
-	0x5f, 0xc5, 0x8d, 0xcc, 0x45, 0x43, 0x1e, 0x4f, 0xfe, 0xcb, 0xba, 0x9e, 0x3f, 0xff, 0x50, 0x30,
-	0x6f, 0x67, 0xe0, 0x2d, 0x4f, 0x24, 0x5d, 0x3b, 0x4f, 0x6d, 0xdf, 0x6f, 0xfe, 0x9e, 0xbb, 0xf6,
-	0x94, 0x6b, 0x2f, 0x77, 0xed, 0xdd, 0x6f, 0x76, 0xca, 0x2a, 0xf9, 0x5b, 0xff, 0x06, 0x00, 0x00,
-	0xff, 0xff, 0xd6, 0x35, 0xfc, 0x0e, 0x16, 0x0e, 0x00, 0x00,
-}
diff --git a/googleapis/bigtable/v2/data.pb.go b/googleapis/bigtable/v2/data.pb.go
index 858db403fa..197de496c3 100644
--- a/googleapis/bigtable/v2/data.pb.go
+++ b/googleapis/bigtable/v2/data.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v2/data.proto
 
-package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v2"
+package bigtable
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies the complete (requested) contents of a single row of a table.
 // Rows which exceed 256MiB in size cannot be read in full.
@@ -37,16 +40,17 @@ func (m *Row) Reset()         { *m = Row{} }
 func (m *Row) String() string { return proto.CompactTextString(m) }
 func (*Row) ProtoMessage()    {}
 func (*Row) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{0}
+	return fileDescriptor_343df51a8f7aa933, []int{0}
 }
+
 func (m *Row) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Row.Unmarshal(m, b)
 }
 func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
 }
-func (dst *Row) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Row.Merge(dst, src)
+func (m *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(m, src)
 }
 func (m *Row) XXX_Size() int {
 	return xxx_messageInfo_Row.Size(m)
@@ -92,16 +96,17 @@ func (m *Family) Reset()         { *m = Family{} }
 func (m *Family) String() string { return proto.CompactTextString(m) }
 func (*Family) ProtoMessage()    {}
 func (*Family) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{1}
+	return fileDescriptor_343df51a8f7aa933, []int{1}
 }
+
 func (m *Family) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Family.Unmarshal(m, b)
 }
 func (m *Family) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Family.Marshal(b, m, deterministic)
 }
-func (dst *Family) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Family.Merge(dst, src)
+func (m *Family) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Family.Merge(m, src)
 }
 func (m *Family) XXX_Size() int {
 	return xxx_messageInfo_Family.Size(m)
@@ -146,16 +151,17 @@ func (m *Column) Reset()         { *m = Column{} }
 func (m *Column) String() string { return proto.CompactTextString(m) }
 func (*Column) ProtoMessage()    {}
 func (*Column) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{2}
+	return fileDescriptor_343df51a8f7aa933, []int{2}
 }
+
 func (m *Column) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Column.Unmarshal(m, b)
 }
 func (m *Column) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Column.Marshal(b, m, deterministic)
 }
-func (dst *Column) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Column.Merge(dst, src)
+func (m *Column) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Column.Merge(m, src)
 }
 func (m *Column) XXX_Size() int {
 	return xxx_messageInfo_Column.Size(m)
@@ -204,16 +210,17 @@ func (m *Cell) Reset()         { *m = Cell{} }
 func (m *Cell) String() string { return proto.CompactTextString(m) }
 func (*Cell) ProtoMessage()    {}
 func (*Cell) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{3}
+	return fileDescriptor_343df51a8f7aa933, []int{3}
 }
+
 func (m *Cell) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cell.Unmarshal(m, b)
 }
 func (m *Cell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cell.Marshal(b, m, deterministic)
 }
-func (dst *Cell) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cell.Merge(dst, src)
+func (m *Cell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cell.Merge(m, src)
 }
 func (m *Cell) XXX_Size() int {
 	return xxx_messageInfo_Cell.Size(m)
@@ -270,16 +277,17 @@ func (m *RowRange) Reset()         { *m = RowRange{} }
 func (m *RowRange) String() string { return proto.CompactTextString(m) }
 func (*RowRange) ProtoMessage()    {}
 func (*RowRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{4}
+	return fileDescriptor_343df51a8f7aa933, []int{4}
 }
+
 func (m *RowRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowRange.Unmarshal(m, b)
 }
 func (m *RowRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowRange.Marshal(b, m, deterministic)
 }
-func (dst *RowRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowRange.Merge(dst, src)
+func (m *RowRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowRange.Merge(m, src)
 }
 func (m *RowRange) XXX_Size() int {
 	return xxx_messageInfo_RowRange.Size(m)
@@ -364,9 +372,9 @@ func (m *RowRange) GetEndKeyClosed() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RowRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RowRange_OneofMarshaler, _RowRange_OneofUnmarshaler, _RowRange_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RowRange) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RowRange_StartKeyClosed)(nil),
 		(*RowRange_StartKeyOpen)(nil),
 		(*RowRange_EndKeyOpen)(nil),
@@ -374,104 +382,6 @@ func (*RowRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _RowRange_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RowRange)
-	// start_key
-	switch x := m.StartKey.(type) {
-	case *RowRange_StartKeyClosed:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartKeyClosed)
-	case *RowRange_StartKeyOpen:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartKeyOpen)
-	case nil:
-	default:
-		return fmt.Errorf("RowRange.StartKey has unexpected type %T", x)
-	}
-	// end_key
-	switch x := m.EndKey.(type) {
-	case *RowRange_EndKeyOpen:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndKeyOpen)
-	case *RowRange_EndKeyClosed:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndKeyClosed)
-	case nil:
-	default:
-		return fmt.Errorf("RowRange.EndKey has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RowRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RowRange)
-	switch tag {
-	case 1: // start_key.start_key_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartKey = &RowRange_StartKeyClosed{x}
-		return true, err
-	case 2: // start_key.start_key_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartKey = &RowRange_StartKeyOpen{x}
-		return true, err
-	case 3: // end_key.end_key_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndKey = &RowRange_EndKeyOpen{x}
-		return true, err
-	case 4: // end_key.end_key_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndKey = &RowRange_EndKeyClosed{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RowRange_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RowRange)
-	// start_key
-	switch x := m.StartKey.(type) {
-	case *RowRange_StartKeyClosed:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartKeyClosed)))
-		n += len(x.StartKeyClosed)
-	case *RowRange_StartKeyOpen:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartKeyOpen)))
-		n += len(x.StartKeyOpen)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// end_key
-	switch x := m.EndKey.(type) {
-	case *RowRange_EndKeyOpen:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndKeyOpen)))
-		n += len(x.EndKeyOpen)
-	case *RowRange_EndKeyClosed:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndKeyClosed)))
-		n += len(x.EndKeyClosed)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Specifies a non-contiguous set of rows.
 type RowSet struct {
 	// Single rows included in the set.
@@ -487,16 +397,17 @@ func (m *RowSet) Reset()         { *m = RowSet{} }
 func (m *RowSet) String() string { return proto.CompactTextString(m) }
 func (*RowSet) ProtoMessage()    {}
 func (*RowSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{5}
+	return fileDescriptor_343df51a8f7aa933, []int{5}
 }
+
 func (m *RowSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowSet.Unmarshal(m, b)
 }
 func (m *RowSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowSet.Marshal(b, m, deterministic)
 }
-func (dst *RowSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowSet.Merge(dst, src)
+func (m *RowSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowSet.Merge(m, src)
 }
 func (m *RowSet) XXX_Size() int {
 	return xxx_messageInfo_RowSet.Size(m)
@@ -551,16 +462,17 @@ func (m *ColumnRange) Reset()         { *m = ColumnRange{} }
 func (m *ColumnRange) String() string { return proto.CompactTextString(m) }
 func (*ColumnRange) ProtoMessage()    {}
 func (*ColumnRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{6}
+	return fileDescriptor_343df51a8f7aa933, []int{6}
 }
+
 func (m *ColumnRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColumnRange.Unmarshal(m, b)
 }
 func (m *ColumnRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColumnRange.Marshal(b, m, deterministic)
 }
-func (dst *ColumnRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColumnRange.Merge(dst, src)
+func (m *ColumnRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnRange.Merge(m, src)
 }
 func (m *ColumnRange) XXX_Size() int {
 	return xxx_messageInfo_ColumnRange.Size(m)
@@ -652,9 +564,9 @@ func (m *ColumnRange) GetEndQualifierOpen() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ColumnRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ColumnRange_OneofMarshaler, _ColumnRange_OneofUnmarshaler, _ColumnRange_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ColumnRange) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ColumnRange_StartQualifierClosed)(nil),
 		(*ColumnRange_StartQualifierOpen)(nil),
 		(*ColumnRange_EndQualifierClosed)(nil),
@@ -662,104 +574,6 @@ func (*ColumnRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) e
 	}
 }
 
-func _ColumnRange_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ColumnRange)
-	// start_qualifier
-	switch x := m.StartQualifier.(type) {
-	case *ColumnRange_StartQualifierClosed:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartQualifierClosed)
-	case *ColumnRange_StartQualifierOpen:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartQualifierOpen)
-	case nil:
-	default:
-		return fmt.Errorf("ColumnRange.StartQualifier has unexpected type %T", x)
-	}
-	// end_qualifier
-	switch x := m.EndQualifier.(type) {
-	case *ColumnRange_EndQualifierClosed:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndQualifierClosed)
-	case *ColumnRange_EndQualifierOpen:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndQualifierOpen)
-	case nil:
-	default:
-		return fmt.Errorf("ColumnRange.EndQualifier has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ColumnRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ColumnRange)
-	switch tag {
-	case 2: // start_qualifier.start_qualifier_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartQualifier = &ColumnRange_StartQualifierClosed{x}
-		return true, err
-	case 3: // start_qualifier.start_qualifier_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartQualifier = &ColumnRange_StartQualifierOpen{x}
-		return true, err
-	case 4: // end_qualifier.end_qualifier_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndQualifier = &ColumnRange_EndQualifierClosed{x}
-		return true, err
-	case 5: // end_qualifier.end_qualifier_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndQualifier = &ColumnRange_EndQualifierOpen{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ColumnRange)
-	// start_qualifier
-	switch x := m.StartQualifier.(type) {
-	case *ColumnRange_StartQualifierClosed:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartQualifierClosed)))
-		n += len(x.StartQualifierClosed)
-	case *ColumnRange_StartQualifierOpen:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartQualifierOpen)))
-		n += len(x.StartQualifierOpen)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// end_qualifier
-	switch x := m.EndQualifier.(type) {
-	case *ColumnRange_EndQualifierClosed:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndQualifierClosed)))
-		n += len(x.EndQualifierClosed)
-	case *ColumnRange_EndQualifierOpen:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndQualifierOpen)))
-		n += len(x.EndQualifierOpen)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Specified a contiguous range of microsecond timestamps.
 type TimestampRange struct {
 	// Inclusive lower bound. If left empty, interpreted as 0.
@@ -775,16 +589,17 @@ func (m *TimestampRange) Reset()         { *m = TimestampRange{} }
 func (m *TimestampRange) String() string { return proto.CompactTextString(m) }
 func (*TimestampRange) ProtoMessage()    {}
 func (*TimestampRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{7}
+	return fileDescriptor_343df51a8f7aa933, []int{7}
 }
+
 func (m *TimestampRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampRange.Unmarshal(m, b)
 }
 func (m *TimestampRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimestampRange.Marshal(b, m, deterministic)
 }
-func (dst *TimestampRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimestampRange.Merge(dst, src)
+func (m *TimestampRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampRange.Merge(m, src)
 }
 func (m *TimestampRange) XXX_Size() int {
 	return xxx_messageInfo_TimestampRange.Size(m)
@@ -834,16 +649,17 @@ func (m *ValueRange) Reset()         { *m = ValueRange{} }
 func (m *ValueRange) String() string { return proto.CompactTextString(m) }
 func (*ValueRange) ProtoMessage()    {}
 func (*ValueRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{8}
+	return fileDescriptor_343df51a8f7aa933, []int{8}
 }
+
 func (m *ValueRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ValueRange.Unmarshal(m, b)
 }
 func (m *ValueRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ValueRange.Marshal(b, m, deterministic)
 }
-func (dst *ValueRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ValueRange.Merge(dst, src)
+func (m *ValueRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueRange.Merge(m, src)
 }
 func (m *ValueRange) XXX_Size() int {
 	return xxx_messageInfo_ValueRange.Size(m)
@@ -928,9 +744,9 @@ func (m *ValueRange) GetEndValueOpen() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ValueRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ValueRange_OneofMarshaler, _ValueRange_OneofUnmarshaler, _ValueRange_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ValueRange) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ValueRange_StartValueClosed)(nil),
 		(*ValueRange_StartValueOpen)(nil),
 		(*ValueRange_EndValueClosed)(nil),
@@ -938,104 +754,6 @@ func (*ValueRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _ValueRange_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ValueRange)
-	// start_value
-	switch x := m.StartValue.(type) {
-	case *ValueRange_StartValueClosed:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartValueClosed)
-	case *ValueRange_StartValueOpen:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.StartValueOpen)
-	case nil:
-	default:
-		return fmt.Errorf("ValueRange.StartValue has unexpected type %T", x)
-	}
-	// end_value
-	switch x := m.EndValue.(type) {
-	case *ValueRange_EndValueClosed:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndValueClosed)
-	case *ValueRange_EndValueOpen:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.EndValueOpen)
-	case nil:
-	default:
-		return fmt.Errorf("ValueRange.EndValue has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ValueRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ValueRange)
-	switch tag {
-	case 1: // start_value.start_value_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartValue = &ValueRange_StartValueClosed{x}
-		return true, err
-	case 2: // start_value.start_value_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StartValue = &ValueRange_StartValueOpen{x}
-		return true, err
-	case 3: // end_value.end_value_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndValue = &ValueRange_EndValueClosed{x}
-		return true, err
-	case 4: // end_value.end_value_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.EndValue = &ValueRange_EndValueOpen{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ValueRange_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ValueRange)
-	// start_value
-	switch x := m.StartValue.(type) {
-	case *ValueRange_StartValueClosed:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartValueClosed)))
-		n += len(x.StartValueClosed)
-	case *ValueRange_StartValueOpen:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StartValueOpen)))
-		n += len(x.StartValueOpen)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// end_value
-	switch x := m.EndValue.(type) {
-	case *ValueRange_EndValueClosed:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndValueClosed)))
-		n += len(x.EndValueClosed)
-	case *ValueRange_EndValueOpen:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EndValueOpen)))
-		n += len(x.EndValueOpen)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Takes a row as input and produces an alternate view of the row based on
 // specified rules. For example, a RowFilter might trim down a row to include
 // just the cells from columns matching a given regular expression, or might
@@ -1103,16 +821,17 @@ func (m *RowFilter) Reset()         { *m = RowFilter{} }
 func (m *RowFilter) String() string { return proto.CompactTextString(m) }
 func (*RowFilter) ProtoMessage()    {}
 func (*RowFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{9}
+	return fileDescriptor_343df51a8f7aa933, []int{9}
 }
+
 func (m *RowFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter.Unmarshal(m, b)
 }
 func (m *RowFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter.Merge(dst, src)
+func (m *RowFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter.Merge(m, src)
 }
 func (m *RowFilter) XXX_Size() int {
 	return xxx_messageInfo_RowFilter.Size(m)
@@ -1381,9 +1100,9 @@ func (m *RowFilter) GetApplyLabelTransformer() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RowFilter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RowFilter_OneofMarshaler, _RowFilter_OneofUnmarshaler, _RowFilter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RowFilter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RowFilter_Chain_)(nil),
 		(*RowFilter_Interleave_)(nil),
 		(*RowFilter_Condition_)(nil),
@@ -1406,334 +1125,6 @@ func (*RowFilter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) err
 	}
 }
 
-func _RowFilter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RowFilter)
-	// filter
-	switch x := m.Filter.(type) {
-	case *RowFilter_Chain_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Chain); err != nil {
-			return err
-		}
-	case *RowFilter_Interleave_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Interleave); err != nil {
-			return err
-		}
-	case *RowFilter_Condition_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Condition); err != nil {
-			return err
-		}
-	case *RowFilter_Sink:
-		t := uint64(0)
-		if x.Sink {
-			t = 1
-		}
-		b.EncodeVarint(16<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_PassAllFilter:
-		t := uint64(0)
-		if x.PassAllFilter {
-			t = 1
-		}
-		b.EncodeVarint(17<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_BlockAllFilter:
-		t := uint64(0)
-		if x.BlockAllFilter {
-			t = 1
-		}
-		b.EncodeVarint(18<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_RowKeyRegexFilter:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.RowKeyRegexFilter)
-	case *RowFilter_RowSampleFilter:
-		b.EncodeVarint(14<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.RowSampleFilter))
-	case *RowFilter_FamilyNameRegexFilter:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.FamilyNameRegexFilter)
-	case *RowFilter_ColumnQualifierRegexFilter:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ColumnQualifierRegexFilter)
-	case *RowFilter_ColumnRangeFilter:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ColumnRangeFilter); err != nil {
-			return err
-		}
-	case *RowFilter_TimestampRangeFilter:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampRangeFilter); err != nil {
-			return err
-		}
-	case *RowFilter_ValueRegexFilter:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ValueRegexFilter)
-	case *RowFilter_ValueRangeFilter:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ValueRangeFilter); err != nil {
-			return err
-		}
-	case *RowFilter_CellsPerRowOffsetFilter:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CellsPerRowOffsetFilter))
-	case *RowFilter_CellsPerRowLimitFilter:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CellsPerRowLimitFilter))
-	case *RowFilter_CellsPerColumnLimitFilter:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CellsPerColumnLimitFilter))
-	case *RowFilter_StripValueTransformer:
-		t := uint64(0)
-		if x.StripValueTransformer {
-			t = 1
-		}
-		b.EncodeVarint(13<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *RowFilter_ApplyLabelTransformer:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ApplyLabelTransformer)
-	case nil:
-	default:
-		return fmt.Errorf("RowFilter.Filter has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RowFilter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RowFilter)
-	switch tag {
-	case 1: // filter.chain
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowFilter_Chain)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_Chain_{msg}
-		return true, err
-	case 2: // filter.interleave
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowFilter_Interleave)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_Interleave_{msg}
-		return true, err
-	case 3: // filter.condition
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RowFilter_Condition)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_Condition_{msg}
-		return true, err
-	case 16: // filter.sink
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_Sink{x != 0}
-		return true, err
-	case 17: // filter.pass_all_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_PassAllFilter{x != 0}
-		return true, err
-	case 18: // filter.block_all_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_BlockAllFilter{x != 0}
-		return true, err
-	case 4: // filter.row_key_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Filter = &RowFilter_RowKeyRegexFilter{x}
-		return true, err
-	case 14: // filter.row_sample_filter
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Filter = &RowFilter_RowSampleFilter{math.Float64frombits(x)}
-		return true, err
-	case 5: // filter.family_name_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &RowFilter_FamilyNameRegexFilter{x}
-		return true, err
-	case 6: // filter.column_qualifier_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Filter = &RowFilter_ColumnQualifierRegexFilter{x}
-		return true, err
-	case 7: // filter.column_range_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ColumnRange)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_ColumnRangeFilter{msg}
-		return true, err
-	case 8: // filter.timestamp_range_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TimestampRange)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_TimestampRangeFilter{msg}
-		return true, err
-	case 9: // filter.value_regex_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Filter = &RowFilter_ValueRegexFilter{x}
-		return true, err
-	case 15: // filter.value_range_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ValueRange)
-		err := b.DecodeMessage(msg)
-		m.Filter = &RowFilter_ValueRangeFilter{msg}
-		return true, err
-	case 10: // filter.cells_per_row_offset_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_CellsPerRowOffsetFilter{int32(x)}
-		return true, err
-	case 11: // filter.cells_per_row_limit_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_CellsPerRowLimitFilter{int32(x)}
-		return true, err
-	case 12: // filter.cells_per_column_limit_filter
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_CellsPerColumnLimitFilter{int32(x)}
-		return true, err
-	case 13: // filter.strip_value_transformer
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &RowFilter_StripValueTransformer{x != 0}
-		return true, err
-	case 19: // filter.apply_label_transformer
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &RowFilter_ApplyLabelTransformer{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RowFilter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RowFilter)
-	// filter
-	switch x := m.Filter.(type) {
-	case *RowFilter_Chain_:
-		s := proto.Size(x.Chain)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_Interleave_:
-		s := proto.Size(x.Interleave)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_Condition_:
-		s := proto.Size(x.Condition)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_Sink:
-		n += 2 // tag and wire
-		n += 1
-	case *RowFilter_PassAllFilter:
-		n += 2 // tag and wire
-		n += 1
-	case *RowFilter_BlockAllFilter:
-		n += 2 // tag and wire
-		n += 1
-	case *RowFilter_RowKeyRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RowKeyRegexFilter)))
-		n += len(x.RowKeyRegexFilter)
-	case *RowFilter_RowSampleFilter:
-		n += 1 // tag and wire
-		n += 8
-	case *RowFilter_FamilyNameRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.FamilyNameRegexFilter)))
-		n += len(x.FamilyNameRegexFilter)
-	case *RowFilter_ColumnQualifierRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ColumnQualifierRegexFilter)))
-		n += len(x.ColumnQualifierRegexFilter)
-	case *RowFilter_ColumnRangeFilter:
-		s := proto.Size(x.ColumnRangeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_TimestampRangeFilter:
-		s := proto.Size(x.TimestampRangeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_ValueRegexFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ValueRegexFilter)))
-		n += len(x.ValueRegexFilter)
-	case *RowFilter_ValueRangeFilter:
-		s := proto.Size(x.ValueRangeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RowFilter_CellsPerRowOffsetFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CellsPerRowOffsetFilter))
-	case *RowFilter_CellsPerRowLimitFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CellsPerRowLimitFilter))
-	case *RowFilter_CellsPerColumnLimitFilter:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CellsPerColumnLimitFilter))
-	case *RowFilter_StripValueTransformer:
-		n += 1 // tag and wire
-		n += 1
-	case *RowFilter_ApplyLabelTransformer:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ApplyLabelTransformer)))
-		n += len(x.ApplyLabelTransformer)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A RowFilter which sends rows through several RowFilters in sequence.
 type RowFilter_Chain struct {
 	// The elements of "filters" are chained together to process the input row:
@@ -1749,16 +1140,17 @@ func (m *RowFilter_Chain) Reset()         { *m = RowFilter_Chain{} }
 func (m *RowFilter_Chain) String() string { return proto.CompactTextString(m) }
 func (*RowFilter_Chain) ProtoMessage()    {}
 func (*RowFilter_Chain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{9, 0}
+	return fileDescriptor_343df51a8f7aa933, []int{9, 0}
 }
+
 func (m *RowFilter_Chain) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter_Chain.Unmarshal(m, b)
 }
 func (m *RowFilter_Chain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter_Chain.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter_Chain) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter_Chain.Merge(dst, src)
+func (m *RowFilter_Chain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Chain.Merge(m, src)
 }
 func (m *RowFilter_Chain) XXX_Size() int {
 	return xxx_messageInfo_RowFilter_Chain.Size(m)
@@ -1814,16 +1206,17 @@ func (m *RowFilter_Interleave) Reset()         { *m = RowFilter_Interleave{} }
 func (m *RowFilter_Interleave) String() string { return proto.CompactTextString(m) }
 func (*RowFilter_Interleave) ProtoMessage()    {}
 func (*RowFilter_Interleave) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{9, 1}
+	return fileDescriptor_343df51a8f7aa933, []int{9, 1}
 }
+
 func (m *RowFilter_Interleave) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter_Interleave.Unmarshal(m, b)
 }
 func (m *RowFilter_Interleave) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter_Interleave.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter_Interleave) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter_Interleave.Merge(dst, src)
+func (m *RowFilter_Interleave) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Interleave.Merge(m, src)
 }
 func (m *RowFilter_Interleave) XXX_Size() int {
 	return xxx_messageInfo_RowFilter_Interleave.Size(m)
@@ -1868,16 +1261,17 @@ func (m *RowFilter_Condition) Reset()         { *m = RowFilter_Condition{} }
 func (m *RowFilter_Condition) String() string { return proto.CompactTextString(m) }
 func (*RowFilter_Condition) ProtoMessage()    {}
 func (*RowFilter_Condition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{9, 2}
+	return fileDescriptor_343df51a8f7aa933, []int{9, 2}
 }
+
 func (m *RowFilter_Condition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RowFilter_Condition.Unmarshal(m, b)
 }
 func (m *RowFilter_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RowFilter_Condition.Marshal(b, m, deterministic)
 }
-func (dst *RowFilter_Condition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RowFilter_Condition.Merge(dst, src)
+func (m *RowFilter_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Condition.Merge(m, src)
 }
 func (m *RowFilter_Condition) XXX_Size() int {
 	return xxx_messageInfo_RowFilter_Condition.Size(m)
@@ -1928,16 +1322,17 @@ func (m *Mutation) Reset()         { *m = Mutation{} }
 func (m *Mutation) String() string { return proto.CompactTextString(m) }
 func (*Mutation) ProtoMessage()    {}
 func (*Mutation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{10}
+	return fileDescriptor_343df51a8f7aa933, []int{10}
 }
+
 func (m *Mutation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation.Unmarshal(m, b)
 }
 func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
 }
-func (dst *Mutation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation.Merge(dst, src)
+func (m *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(m, src)
 }
 func (m *Mutation) XXX_Size() int {
 	return xxx_messageInfo_Mutation.Size(m)
@@ -2011,9 +1406,9 @@ func (m *Mutation) GetDeleteFromRow() *Mutation_DeleteFromRow {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Mutation_OneofMarshaler, _Mutation_OneofUnmarshaler, _Mutation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Mutation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Mutation_SetCell_)(nil),
 		(*Mutation_DeleteFromColumn_)(nil),
 		(*Mutation_DeleteFromFamily_)(nil),
@@ -2021,108 +1416,6 @@ func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _Mutation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Mutation)
-	// mutation
-	switch x := m.Mutation.(type) {
-	case *Mutation_SetCell_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SetCell); err != nil {
-			return err
-		}
-	case *Mutation_DeleteFromColumn_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteFromColumn); err != nil {
-			return err
-		}
-	case *Mutation_DeleteFromFamily_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteFromFamily); err != nil {
-			return err
-		}
-	case *Mutation_DeleteFromRow_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteFromRow); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Mutation.Mutation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Mutation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Mutation)
-	switch tag {
-	case 1: // mutation.set_cell
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_SetCell)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_SetCell_{msg}
-		return true, err
-	case 2: // mutation.delete_from_column
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_DeleteFromColumn)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_DeleteFromColumn_{msg}
-		return true, err
-	case 3: // mutation.delete_from_family
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_DeleteFromFamily)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_DeleteFromFamily_{msg}
-		return true, err
-	case 4: // mutation.delete_from_row
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_DeleteFromRow)
-		err := b.DecodeMessage(msg)
-		m.Mutation = &Mutation_DeleteFromRow_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Mutation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Mutation)
-	// mutation
-	switch x := m.Mutation.(type) {
-	case *Mutation_SetCell_:
-		s := proto.Size(x.SetCell)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_DeleteFromColumn_:
-		s := proto.Size(x.DeleteFromColumn)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_DeleteFromFamily_:
-		s := proto.Size(x.DeleteFromFamily)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_DeleteFromRow_:
-		s := proto.Size(x.DeleteFromRow)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Mutation which sets the value of the specified cell.
 type Mutation_SetCell struct {
 	// The name of the family into which new data should be written.
@@ -2148,16 +1441,17 @@ func (m *Mutation_SetCell) Reset()         { *m = Mutation_SetCell{} }
 func (m *Mutation_SetCell) String() string { return proto.CompactTextString(m) }
 func (*Mutation_SetCell) ProtoMessage()    {}
 func (*Mutation_SetCell) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{10, 0}
+	return fileDescriptor_343df51a8f7aa933, []int{10, 0}
 }
+
 func (m *Mutation_SetCell) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_SetCell.Unmarshal(m, b)
 }
 func (m *Mutation_SetCell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_SetCell.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_SetCell) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_SetCell.Merge(dst, src)
+func (m *Mutation_SetCell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_SetCell.Merge(m, src)
 }
 func (m *Mutation_SetCell) XXX_Size() int {
 	return xxx_messageInfo_Mutation_SetCell.Size(m)
@@ -2216,16 +1510,17 @@ func (m *Mutation_DeleteFromColumn) Reset()         { *m = Mutation_DeleteFromCo
 func (m *Mutation_DeleteFromColumn) String() string { return proto.CompactTextString(m) }
 func (*Mutation_DeleteFromColumn) ProtoMessage()    {}
 func (*Mutation_DeleteFromColumn) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{10, 1}
+	return fileDescriptor_343df51a8f7aa933, []int{10, 1}
 }
+
 func (m *Mutation_DeleteFromColumn) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_DeleteFromColumn.Unmarshal(m, b)
 }
 func (m *Mutation_DeleteFromColumn) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_DeleteFromColumn.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_DeleteFromColumn) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_DeleteFromColumn.Merge(dst, src)
+func (m *Mutation_DeleteFromColumn) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromColumn.Merge(m, src)
 }
 func (m *Mutation_DeleteFromColumn) XXX_Size() int {
 	return xxx_messageInfo_Mutation_DeleteFromColumn.Size(m)
@@ -2271,16 +1566,17 @@ func (m *Mutation_DeleteFromFamily) Reset()         { *m = Mutation_DeleteFromFa
 func (m *Mutation_DeleteFromFamily) String() string { return proto.CompactTextString(m) }
 func (*Mutation_DeleteFromFamily) ProtoMessage()    {}
 func (*Mutation_DeleteFromFamily) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{10, 2}
+	return fileDescriptor_343df51a8f7aa933, []int{10, 2}
 }
+
 func (m *Mutation_DeleteFromFamily) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_DeleteFromFamily.Unmarshal(m, b)
 }
 func (m *Mutation_DeleteFromFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_DeleteFromFamily.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_DeleteFromFamily) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_DeleteFromFamily.Merge(dst, src)
+func (m *Mutation_DeleteFromFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromFamily.Merge(m, src)
 }
 func (m *Mutation_DeleteFromFamily) XXX_Size() int {
 	return xxx_messageInfo_Mutation_DeleteFromFamily.Size(m)
@@ -2309,16 +1605,17 @@ func (m *Mutation_DeleteFromRow) Reset()         { *m = Mutation_DeleteFromRow{}
 func (m *Mutation_DeleteFromRow) String() string { return proto.CompactTextString(m) }
 func (*Mutation_DeleteFromRow) ProtoMessage()    {}
 func (*Mutation_DeleteFromRow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{10, 3}
+	return fileDescriptor_343df51a8f7aa933, []int{10, 3}
 }
+
 func (m *Mutation_DeleteFromRow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_DeleteFromRow.Unmarshal(m, b)
 }
 func (m *Mutation_DeleteFromRow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_DeleteFromRow.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_DeleteFromRow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_DeleteFromRow.Merge(dst, src)
+func (m *Mutation_DeleteFromRow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromRow.Merge(m, src)
 }
 func (m *Mutation_DeleteFromRow) XXX_Size() int {
 	return xxx_messageInfo_Mutation_DeleteFromRow.Size(m)
@@ -2355,16 +1652,17 @@ func (m *ReadModifyWriteRule) Reset()         { *m = ReadModifyWriteRule{} }
 func (m *ReadModifyWriteRule) String() string { return proto.CompactTextString(m) }
 func (*ReadModifyWriteRule) ProtoMessage()    {}
 func (*ReadModifyWriteRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_617bf329776ab134, []int{11}
+	return fileDescriptor_343df51a8f7aa933, []int{11}
 }
+
 func (m *ReadModifyWriteRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadModifyWriteRule.Unmarshal(m, b)
 }
 func (m *ReadModifyWriteRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadModifyWriteRule.Marshal(b, m, deterministic)
 }
-func (dst *ReadModifyWriteRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadModifyWriteRule.Merge(dst, src)
+func (m *ReadModifyWriteRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRule.Merge(m, src)
 }
 func (m *ReadModifyWriteRule) XXX_Size() int {
 	return xxx_messageInfo_ReadModifyWriteRule.Size(m)
@@ -2426,71 +1724,14 @@ func (m *ReadModifyWriteRule) GetIncrementAmount() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadModifyWriteRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadModifyWriteRule_OneofMarshaler, _ReadModifyWriteRule_OneofUnmarshaler, _ReadModifyWriteRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadModifyWriteRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadModifyWriteRule_AppendValue)(nil),
 		(*ReadModifyWriteRule_IncrementAmount)(nil),
 	}
 }
 
-func _ReadModifyWriteRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadModifyWriteRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *ReadModifyWriteRule_AppendValue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AppendValue)
-	case *ReadModifyWriteRule_IncrementAmount:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IncrementAmount))
-	case nil:
-	default:
-		return fmt.Errorf("ReadModifyWriteRule.Rule has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadModifyWriteRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadModifyWriteRule)
-	switch tag {
-	case 3: // rule.append_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Rule = &ReadModifyWriteRule_AppendValue{x}
-		return true, err
-	case 4: // rule.increment_amount
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Rule = &ReadModifyWriteRule_IncrementAmount{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadModifyWriteRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadModifyWriteRule)
-	// rule
-	switch x := m.Rule.(type) {
-	case *ReadModifyWriteRule_AppendValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AppendValue)))
-		n += len(x.AppendValue)
-	case *ReadModifyWriteRule_IncrementAmount:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IncrementAmount))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*Row)(nil), "google.bigtable.v2.Row")
 	proto.RegisterType((*Family)(nil), "google.bigtable.v2.Family")
@@ -2513,9 +1754,9 @@ func init() {
 	proto.RegisterType((*ReadModifyWriteRule)(nil), "google.bigtable.v2.ReadModifyWriteRule")
 }
 
-func init() { proto.RegisterFile("google/bigtable/v2/data.proto", fileDescriptor_data_617bf329776ab134) }
+func init() { proto.RegisterFile("google/bigtable/v2/data.proto", fileDescriptor_343df51a8f7aa933) }
 
-var fileDescriptor_data_617bf329776ab134 = []byte{
+var fileDescriptor_343df51a8f7aa933 = []byte{
 	// 1444 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdb, 0x72, 0x1b, 0x45,
 	0x13, 0xd6, 0x5a, 0xb6, 0x2c, 0xf5, 0xca, 0x96, 0x32, 0x71, 0x1c, 0x45, 0x7f, 0xfc, 0xc7, 0xa5,
diff --git a/googleapis/bytestream/bytestream.pb.go b/googleapis/bytestream/bytestream.pb.go
index bfa0a2d6c7..f7f5554b67 100644
--- a/googleapis/bytestream/bytestream.pb.go
+++ b/googleapis/bytestream/bytestream.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bytestream/bytestream.proto
 
-package bytestream // import "google.golang.org/genproto/googleapis/bytestream"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package bytestream
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request object for ByteStream.Read.
 type ReadRequest struct {
@@ -52,16 +52,17 @@ func (m *ReadRequest) Reset()         { *m = ReadRequest{} }
 func (m *ReadRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadRequest) ProtoMessage()    {}
 func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bytestream_52dd791ecad88fee, []int{0}
+	return fileDescriptor_657cab877f44cd08, []int{0}
 }
+
 func (m *ReadRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRequest.Unmarshal(m, b)
 }
 func (m *ReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRequest.Merge(dst, src)
+func (m *ReadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRequest.Merge(m, src)
 }
 func (m *ReadRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadRequest.Size(m)
@@ -109,16 +110,17 @@ func (m *ReadResponse) Reset()         { *m = ReadResponse{} }
 func (m *ReadResponse) String() string { return proto.CompactTextString(m) }
 func (*ReadResponse) ProtoMessage()    {}
 func (*ReadResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bytestream_52dd791ecad88fee, []int{1}
+	return fileDescriptor_657cab877f44cd08, []int{1}
 }
+
 func (m *ReadResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadResponse.Unmarshal(m, b)
 }
 func (m *ReadResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReadResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadResponse.Merge(dst, src)
+func (m *ReadResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadResponse.Merge(m, src)
 }
 func (m *ReadResponse) XXX_Size() int {
 	return xxx_messageInfo_ReadResponse.Size(m)
@@ -173,16 +175,17 @@ func (m *WriteRequest) Reset()         { *m = WriteRequest{} }
 func (m *WriteRequest) String() string { return proto.CompactTextString(m) }
 func (*WriteRequest) ProtoMessage()    {}
 func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bytestream_52dd791ecad88fee, []int{2}
+	return fileDescriptor_657cab877f44cd08, []int{2}
 }
+
 func (m *WriteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteRequest.Unmarshal(m, b)
 }
 func (m *WriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteRequest.Marshal(b, m, deterministic)
 }
-func (dst *WriteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteRequest.Merge(dst, src)
+func (m *WriteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteRequest.Merge(m, src)
 }
 func (m *WriteRequest) XXX_Size() int {
 	return xxx_messageInfo_WriteRequest.Size(m)
@@ -234,16 +237,17 @@ func (m *WriteResponse) Reset()         { *m = WriteResponse{} }
 func (m *WriteResponse) String() string { return proto.CompactTextString(m) }
 func (*WriteResponse) ProtoMessage()    {}
 func (*WriteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bytestream_52dd791ecad88fee, []int{3}
+	return fileDescriptor_657cab877f44cd08, []int{3}
 }
+
 func (m *WriteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteResponse.Unmarshal(m, b)
 }
 func (m *WriteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteResponse.Marshal(b, m, deterministic)
 }
-func (dst *WriteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteResponse.Merge(dst, src)
+func (m *WriteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResponse.Merge(m, src)
 }
 func (m *WriteResponse) XXX_Size() int {
 	return xxx_messageInfo_WriteResponse.Size(m)
@@ -274,16 +278,17 @@ func (m *QueryWriteStatusRequest) Reset()         { *m = QueryWriteStatusRequest
 func (m *QueryWriteStatusRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryWriteStatusRequest) ProtoMessage()    {}
 func (*QueryWriteStatusRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bytestream_52dd791ecad88fee, []int{4}
+	return fileDescriptor_657cab877f44cd08, []int{4}
 }
+
 func (m *QueryWriteStatusRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryWriteStatusRequest.Unmarshal(m, b)
 }
 func (m *QueryWriteStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryWriteStatusRequest.Marshal(b, m, deterministic)
 }
-func (dst *QueryWriteStatusRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryWriteStatusRequest.Merge(dst, src)
+func (m *QueryWriteStatusRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryWriteStatusRequest.Merge(m, src)
 }
 func (m *QueryWriteStatusRequest) XXX_Size() int {
 	return xxx_messageInfo_QueryWriteStatusRequest.Size(m)
@@ -317,16 +322,17 @@ func (m *QueryWriteStatusResponse) Reset()         { *m = QueryWriteStatusRespon
 func (m *QueryWriteStatusResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryWriteStatusResponse) ProtoMessage()    {}
 func (*QueryWriteStatusResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bytestream_52dd791ecad88fee, []int{5}
+	return fileDescriptor_657cab877f44cd08, []int{5}
 }
+
 func (m *QueryWriteStatusResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryWriteStatusResponse.Unmarshal(m, b)
 }
 func (m *QueryWriteStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryWriteStatusResponse.Marshal(b, m, deterministic)
 }
-func (dst *QueryWriteStatusResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryWriteStatusResponse.Merge(dst, src)
+func (m *QueryWriteStatusResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryWriteStatusResponse.Merge(m, src)
 }
 func (m *QueryWriteStatusResponse) XXX_Size() int {
 	return xxx_messageInfo_QueryWriteStatusResponse.Size(m)
@@ -360,6 +366,40 @@ func init() {
 	proto.RegisterType((*QueryWriteStatusResponse)(nil), "google.bytestream.QueryWriteStatusResponse")
 }
 
+func init() { proto.RegisterFile("google/bytestream/bytestream.proto", fileDescriptor_657cab877f44cd08) }
+
+var fileDescriptor_657cab877f44cd08 = []byte{
+	// 446 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5b, 0x8b, 0x13, 0x31,
+	0x14, 0x66, 0xb6, 0xab, 0x74, 0x4f, 0xa7, 0x5e, 0x02, 0xe2, 0x30, 0xe8, 0x6e, 0x77, 0x44, 0x28,
+	0x0a, 0x33, 0xa2, 0xe0, 0xcb, 0x82, 0x0f, 0x7d, 0x13, 0x16, 0x2f, 0xd9, 0x07, 0x41, 0x90, 0x21,
+	0x6d, 0x4f, 0xc7, 0x60, 0x93, 0x8c, 0x49, 0x86, 0xa5, 0xfb, 0x1f, 0x7c, 0xf1, 0x17, 0x4b, 0x92,
+	0xb1, 0x1d, 0x6d, 0x0b, 0xdb, 0xb7, 0xe4, 0xbb, 0xcc, 0xf9, 0xe6, 0xe4, 0x1c, 0xc8, 0x2a, 0xa5,
+	0xaa, 0x25, 0x16, 0xd3, 0x95, 0x45, 0x63, 0x35, 0x32, 0xd1, 0x39, 0xe6, 0xb5, 0x56, 0x56, 0x91,
+	0x87, 0x41, 0x93, 0x6f, 0x88, 0xf4, 0x49, 0x6b, 0x63, 0x35, 0x2f, 0x98, 0x94, 0xca, 0x32, 0xcb,
+	0x95, 0x34, 0xc1, 0x90, 0x9e, 0xb6, 0xac, 0xbf, 0x4d, 0x9b, 0x45, 0x71, 0xad, 0x59, 0x5d, 0xa3,
+	0x6e, 0xf9, 0x4c, 0xc3, 0x80, 0x22, 0x9b, 0x53, 0xfc, 0xd9, 0xa0, 0xb1, 0xe4, 0x19, 0x0c, 0x35,
+	0x1a, 0xd5, 0xe8, 0x19, 0x96, 0x92, 0x09, 0x4c, 0xa2, 0x51, 0x34, 0x3e, 0xa1, 0xf1, 0x5f, 0xf0,
+	0x03, 0x13, 0x48, 0xce, 0x60, 0xa0, 0x91, 0xcd, 0x4b, 0xb5, 0x58, 0x18, 0xb4, 0xc9, 0xd1, 0x28,
+	0x1a, 0xf7, 0x28, 0x38, 0xe8, 0xa3, 0x47, 0xc8, 0x53, 0xf0, 0xb7, 0x72, 0xc9, 0x05, 0xb7, 0x49,
+	0xcf, 0xf3, 0x27, 0x0e, 0xb9, 0x74, 0x40, 0x96, 0x41, 0x1c, 0x6a, 0x9a, 0x5a, 0x49, 0x83, 0x84,
+	0xc0, 0xf1, 0x9c, 0x59, 0x96, 0xc0, 0x28, 0x1a, 0xc7, 0xd4, 0x9f, 0xb3, 0x5f, 0x11, 0xc4, 0x5f,
+	0x34, 0xb7, 0x78, 0x50, 0xb2, 0x73, 0x88, 0xaf, 0x9d, 0xe9, 0xdf, 0x68, 0x03, 0x8f, 0xb5, 0xd9,
+	0xce, 0x21, 0x5e, 0x70, 0xc9, 0xcd, 0xf7, 0xd2, 0xa3, 0x3e, 0x5d, 0x9f, 0x0e, 0x02, 0xe6, 0x2b,
+	0xee, 0xcc, 0xf3, 0x16, 0x86, 0x6d, 0x9c, 0x36, 0xf4, 0x73, 0xb8, 0x37, 0x53, 0x42, 0x70, 0x6b,
+	0x71, 0x5e, 0x1a, 0x7e, 0x13, 0x02, 0xf5, 0xe8, 0x70, 0x8d, 0x5e, 0xf1, 0x1b, 0xcc, 0xde, 0xc1,
+	0xe3, 0xcf, 0x0d, 0xea, 0x95, 0x37, 0x5f, 0x59, 0x66, 0x1b, 0x73, 0xc8, 0x1f, 0x65, 0xdf, 0x20,
+	0xd9, 0xf6, 0x1f, 0x14, 0x81, 0xa4, 0xd0, 0x9f, 0x29, 0x51, 0x2f, 0xd1, 0xa2, 0x6f, 0x48, 0x9f,
+	0xae, 0xef, 0xaf, 0x7f, 0x1f, 0x01, 0x4c, 0x56, 0xee, 0xcb, 0x6e, 0x96, 0xc8, 0x7b, 0x38, 0x76,
+	0x2f, 0x43, 0x4e, 0xf3, 0xad, 0x39, 0xcb, 0x3b, 0x63, 0x92, 0x9e, 0xed, 0xe5, 0x43, 0xb4, 0x57,
+	0x11, 0xb9, 0x84, 0x3b, 0xa1, 0x9b, 0xbb, 0xb4, 0xdd, 0x97, 0x4d, 0x47, 0xfb, 0x05, 0xe1, 0x6b,
+	0xe3, 0x88, 0xfc, 0x80, 0x07, 0xff, 0xb7, 0x81, 0xbc, 0xd8, 0xe1, 0xdb, 0xd3, 0xeb, 0xf4, 0xe5,
+	0xad, 0xb4, 0xa1, 0xdc, 0x04, 0xe1, 0xd1, 0x4c, 0x89, 0x6d, 0xc7, 0xe4, 0xfe, 0xa6, 0x55, 0x9f,
+	0xdc, 0xf6, 0x7c, 0xbd, 0x68, 0x35, 0x95, 0x5a, 0x32, 0x59, 0xe5, 0x4a, 0x57, 0x45, 0x85, 0xd2,
+	0x6f, 0x56, 0x11, 0x28, 0x56, 0x73, 0xd3, 0x59, 0xe3, 0x8b, 0xcd, 0x71, 0x7a, 0xd7, 0xeb, 0xde,
+	0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x91, 0x09, 0xd4, 0xf8, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -637,39 +677,3 @@ var _ByteStream_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/bytestream/bytestream.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/bytestream/bytestream.proto", fileDescriptor_bytestream_52dd791ecad88fee)
-}
-
-var fileDescriptor_bytestream_52dd791ecad88fee = []byte{
-	// 446 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5b, 0x8b, 0x13, 0x31,
-	0x14, 0x66, 0xb6, 0xab, 0x74, 0x4f, 0xa7, 0x5e, 0x02, 0xe2, 0x30, 0xe8, 0x6e, 0x77, 0x44, 0x28,
-	0x0a, 0x33, 0xa2, 0xe0, 0xcb, 0x82, 0x0f, 0x7d, 0x13, 0x16, 0x2f, 0xd9, 0x07, 0x41, 0x90, 0x21,
-	0x6d, 0x4f, 0xc7, 0x60, 0x93, 0x8c, 0x49, 0x86, 0xa5, 0xfb, 0x1f, 0x7c, 0xf1, 0x17, 0x4b, 0x92,
-	0xb1, 0x1d, 0x6d, 0x0b, 0xdb, 0xb7, 0xe4, 0xbb, 0xcc, 0xf9, 0xe6, 0xe4, 0x1c, 0xc8, 0x2a, 0xa5,
-	0xaa, 0x25, 0x16, 0xd3, 0x95, 0x45, 0x63, 0x35, 0x32, 0xd1, 0x39, 0xe6, 0xb5, 0x56, 0x56, 0x91,
-	0x87, 0x41, 0x93, 0x6f, 0x88, 0xf4, 0x49, 0x6b, 0x63, 0x35, 0x2f, 0x98, 0x94, 0xca, 0x32, 0xcb,
-	0x95, 0x34, 0xc1, 0x90, 0x9e, 0xb6, 0xac, 0xbf, 0x4d, 0x9b, 0x45, 0x71, 0xad, 0x59, 0x5d, 0xa3,
-	0x6e, 0xf9, 0x4c, 0xc3, 0x80, 0x22, 0x9b, 0x53, 0xfc, 0xd9, 0xa0, 0xb1, 0xe4, 0x19, 0x0c, 0x35,
-	0x1a, 0xd5, 0xe8, 0x19, 0x96, 0x92, 0x09, 0x4c, 0xa2, 0x51, 0x34, 0x3e, 0xa1, 0xf1, 0x5f, 0xf0,
-	0x03, 0x13, 0x48, 0xce, 0x60, 0xa0, 0x91, 0xcd, 0x4b, 0xb5, 0x58, 0x18, 0xb4, 0xc9, 0xd1, 0x28,
-	0x1a, 0xf7, 0x28, 0x38, 0xe8, 0xa3, 0x47, 0xc8, 0x53, 0xf0, 0xb7, 0x72, 0xc9, 0x05, 0xb7, 0x49,
-	0xcf, 0xf3, 0x27, 0x0e, 0xb9, 0x74, 0x40, 0x96, 0x41, 0x1c, 0x6a, 0x9a, 0x5a, 0x49, 0x83, 0x84,
-	0xc0, 0xf1, 0x9c, 0x59, 0x96, 0xc0, 0x28, 0x1a, 0xc7, 0xd4, 0x9f, 0xb3, 0x5f, 0x11, 0xc4, 0x5f,
-	0x34, 0xb7, 0x78, 0x50, 0xb2, 0x73, 0x88, 0xaf, 0x9d, 0xe9, 0xdf, 0x68, 0x03, 0x8f, 0xb5, 0xd9,
-	0xce, 0x21, 0x5e, 0x70, 0xc9, 0xcd, 0xf7, 0xd2, 0xa3, 0x3e, 0x5d, 0x9f, 0x0e, 0x02, 0xe6, 0x2b,
-	0xee, 0xcc, 0xf3, 0x16, 0x86, 0x6d, 0x9c, 0x36, 0xf4, 0x73, 0xb8, 0x37, 0x53, 0x42, 0x70, 0x6b,
-	0x71, 0x5e, 0x1a, 0x7e, 0x13, 0x02, 0xf5, 0xe8, 0x70, 0x8d, 0x5e, 0xf1, 0x1b, 0xcc, 0xde, 0xc1,
-	0xe3, 0xcf, 0x0d, 0xea, 0x95, 0x37, 0x5f, 0x59, 0x66, 0x1b, 0x73, 0xc8, 0x1f, 0x65, 0xdf, 0x20,
-	0xd9, 0xf6, 0x1f, 0x14, 0x81, 0xa4, 0xd0, 0x9f, 0x29, 0x51, 0x2f, 0xd1, 0xa2, 0x6f, 0x48, 0x9f,
-	0xae, 0xef, 0xaf, 0x7f, 0x1f, 0x01, 0x4c, 0x56, 0xee, 0xcb, 0x6e, 0x96, 0xc8, 0x7b, 0x38, 0x76,
-	0x2f, 0x43, 0x4e, 0xf3, 0xad, 0x39, 0xcb, 0x3b, 0x63, 0x92, 0x9e, 0xed, 0xe5, 0x43, 0xb4, 0x57,
-	0x11, 0xb9, 0x84, 0x3b, 0xa1, 0x9b, 0xbb, 0xb4, 0xdd, 0x97, 0x4d, 0x47, 0xfb, 0x05, 0xe1, 0x6b,
-	0xe3, 0x88, 0xfc, 0x80, 0x07, 0xff, 0xb7, 0x81, 0xbc, 0xd8, 0xe1, 0xdb, 0xd3, 0xeb, 0xf4, 0xe5,
-	0xad, 0xb4, 0xa1, 0xdc, 0x04, 0xe1, 0xd1, 0x4c, 0x89, 0x6d, 0xc7, 0xe4, 0xfe, 0xa6, 0x55, 0x9f,
-	0xdc, 0xf6, 0x7c, 0xbd, 0x68, 0x35, 0x95, 0x5a, 0x32, 0x59, 0xe5, 0x4a, 0x57, 0x45, 0x85, 0xd2,
-	0x6f, 0x56, 0x11, 0x28, 0x56, 0x73, 0xd3, 0x59, 0xe3, 0x8b, 0xcd, 0x71, 0x7a, 0xd7, 0xeb, 0xde,
-	0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x91, 0x09, 0xd4, 0xf8, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/asset/v1/asset_service.pb.go b/googleapis/cloud/asset/v1/asset_service.pb.go
index 43d71c8b8f..f73ff07380 100644
--- a/googleapis/cloud/asset/v1/asset_service.pb.go
+++ b/googleapis/cloud/asset/v1/asset_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/asset/v1/asset_service.proto
 
-package asset // import "google.golang.org/genproto/googleapis/cloud/asset/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package asset
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Asset content type.
 type ContentType int32
@@ -43,6 +43,7 @@ var ContentType_name = map[int32]string{
 	1: "RESOURCE",
 	2: "IAM_POLICY",
 }
+
 var ContentType_value = map[string]int32{
 	"CONTENT_TYPE_UNSPECIFIED": 0,
 	"RESOURCE":                 1,
@@ -52,8 +53,9 @@ var ContentType_value = map[string]int32{
 func (x ContentType) String() string {
 	return proto.EnumName(ContentType_name, int32(x))
 }
+
 func (ContentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_4116b6e08342e761, []int{0}
+	return fileDescriptor_5104159f18b2092a, []int{0}
 }
 
 // Export asset request.
@@ -90,16 +92,17 @@ func (m *ExportAssetsRequest) Reset()         { *m = ExportAssetsRequest{} }
 func (m *ExportAssetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportAssetsRequest) ProtoMessage()    {}
 func (*ExportAssetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_4116b6e08342e761, []int{0}
+	return fileDescriptor_5104159f18b2092a, []int{0}
 }
+
 func (m *ExportAssetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAssetsRequest.Unmarshal(m, b)
 }
 func (m *ExportAssetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAssetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportAssetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAssetsRequest.Merge(dst, src)
+func (m *ExportAssetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAssetsRequest.Merge(m, src)
 }
 func (m *ExportAssetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportAssetsRequest.Size(m)
@@ -163,16 +166,17 @@ func (m *ExportAssetsResponse) Reset()         { *m = ExportAssetsResponse{} }
 func (m *ExportAssetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportAssetsResponse) ProtoMessage()    {}
 func (*ExportAssetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_4116b6e08342e761, []int{1}
+	return fileDescriptor_5104159f18b2092a, []int{1}
 }
+
 func (m *ExportAssetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAssetsResponse.Unmarshal(m, b)
 }
 func (m *ExportAssetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAssetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportAssetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAssetsResponse.Merge(dst, src)
+func (m *ExportAssetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAssetsResponse.Merge(m, src)
 }
 func (m *ExportAssetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportAssetsResponse.Size(m)
@@ -231,16 +235,17 @@ func (m *BatchGetAssetsHistoryRequest) Reset()         { *m = BatchGetAssetsHist
 func (m *BatchGetAssetsHistoryRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchGetAssetsHistoryRequest) ProtoMessage()    {}
 func (*BatchGetAssetsHistoryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_4116b6e08342e761, []int{2}
+	return fileDescriptor_5104159f18b2092a, []int{2}
 }
+
 func (m *BatchGetAssetsHistoryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetAssetsHistoryRequest.Unmarshal(m, b)
 }
 func (m *BatchGetAssetsHistoryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetAssetsHistoryRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetAssetsHistoryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetAssetsHistoryRequest.Merge(dst, src)
+func (m *BatchGetAssetsHistoryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetAssetsHistoryRequest.Merge(m, src)
 }
 func (m *BatchGetAssetsHistoryRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchGetAssetsHistoryRequest.Size(m)
@@ -292,16 +297,17 @@ func (m *BatchGetAssetsHistoryResponse) Reset()         { *m = BatchGetAssetsHis
 func (m *BatchGetAssetsHistoryResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchGetAssetsHistoryResponse) ProtoMessage()    {}
 func (*BatchGetAssetsHistoryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_4116b6e08342e761, []int{3}
+	return fileDescriptor_5104159f18b2092a, []int{3}
 }
+
 func (m *BatchGetAssetsHistoryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetAssetsHistoryResponse.Unmarshal(m, b)
 }
 func (m *BatchGetAssetsHistoryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetAssetsHistoryResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetAssetsHistoryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetAssetsHistoryResponse.Merge(dst, src)
+func (m *BatchGetAssetsHistoryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetAssetsHistoryResponse.Merge(m, src)
 }
 func (m *BatchGetAssetsHistoryResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchGetAssetsHistoryResponse.Size(m)
@@ -335,16 +341,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_4116b6e08342e761, []int{4}
+	return fileDescriptor_5104159f18b2092a, []int{4}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -379,61 +386,13 @@ func (m *OutputConfig) GetGcsDestination() *GcsDestination {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputConfig_OneofMarshaler, _OutputConfig_OneofUnmarshaler, _OutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OutputConfig_GcsDestination)(nil),
 	}
 }
 
-func _OutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputConfig)
-	switch tag {
-	case 1: // destination.gcs_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &OutputConfig_GcsDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		s := proto.Size(x.GcsDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Storage location.
 type GcsDestination struct {
 	// Required.
@@ -450,16 +409,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_4116b6e08342e761, []int{5}
+	return fileDescriptor_5104159f18b2092a, []int{5}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -494,65 +454,76 @@ func (m *GcsDestination) GetUri() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GcsDestination) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GcsDestination_OneofMarshaler, _GcsDestination_OneofUnmarshaler, _GcsDestination_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GcsDestination) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GcsDestination_Uri)(nil),
 	}
 }
 
-func _GcsDestination_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GcsDestination)
-	// object_uri
-	switch x := m.ObjectUri.(type) {
-	case *GcsDestination_Uri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uri)
-	case nil:
-	default:
-		return fmt.Errorf("GcsDestination.ObjectUri has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GcsDestination_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GcsDestination)
-	switch tag {
-	case 1: // object_uri.uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ObjectUri = &GcsDestination_Uri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GcsDestination_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GcsDestination)
-	// object_uri
-	switch x := m.ObjectUri.(type) {
-	case *GcsDestination_Uri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uri)))
-		n += len(x.Uri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.asset.v1.ContentType", ContentType_name, ContentType_value)
 	proto.RegisterType((*ExportAssetsRequest)(nil), "google.cloud.asset.v1.ExportAssetsRequest")
 	proto.RegisterType((*ExportAssetsResponse)(nil), "google.cloud.asset.v1.ExportAssetsResponse")
 	proto.RegisterType((*BatchGetAssetsHistoryRequest)(nil), "google.cloud.asset.v1.BatchGetAssetsHistoryRequest")
 	proto.RegisterType((*BatchGetAssetsHistoryResponse)(nil), "google.cloud.asset.v1.BatchGetAssetsHistoryResponse")
 	proto.RegisterType((*OutputConfig)(nil), "google.cloud.asset.v1.OutputConfig")
 	proto.RegisterType((*GcsDestination)(nil), "google.cloud.asset.v1.GcsDestination")
-	proto.RegisterEnum("google.cloud.asset.v1.ContentType", ContentType_name, ContentType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/asset/v1/asset_service.proto", fileDescriptor_5104159f18b2092a)
+}
+
+var fileDescriptor_5104159f18b2092a = []byte{
+	// 739 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x6e, 0xd3, 0x4a,
+	0x14, 0xad, 0x9d, 0xf7, 0xaa, 0x76, 0x92, 0xe6, 0xe5, 0xcd, 0x7b, 0x45, 0x26, 0x6a, 0xd5, 0xe0,
+	0x02, 0x0a, 0x59, 0xd8, 0x4a, 0x8a, 0x84, 0x54, 0x60, 0xd1, 0xa4, 0xa6, 0x89, 0x80, 0x24, 0x72,
+	0xd3, 0xa2, 0xa2, 0x22, 0xcb, 0x71, 0xa6, 0xc6, 0x28, 0x99, 0x31, 0x9e, 0x71, 0x4b, 0x85, 0xd8,
+	0xc0, 0x27, 0xb0, 0x01, 0x89, 0x2f, 0x60, 0xc9, 0x5f, 0xc0, 0x96, 0x5f, 0x60, 0xc7, 0x4f, 0x20,
+	0xcf, 0x38, 0xad, 0x43, 0xe3, 0xa2, 0x76, 0xe7, 0x7b, 0x7d, 0xee, 0xb9, 0x77, 0xce, 0x99, 0xb9,
+	0xe0, 0x96, 0x4b, 0x88, 0x3b, 0x44, 0xba, 0x33, 0x24, 0xe1, 0x40, 0xb7, 0x29, 0x45, 0x4c, 0x3f,
+	0xac, 0x8a, 0x0f, 0x8b, 0xa2, 0xe0, 0xd0, 0x73, 0x90, 0xe6, 0x07, 0x84, 0x11, 0xb8, 0x28, 0xa0,
+	0x1a, 0x87, 0x6a, 0x1c, 0xa1, 0x1d, 0x56, 0x8b, 0x4b, 0x31, 0x83, 0xed, 0x7b, 0xba, 0x8d, 0x31,
+	0x61, 0x36, 0xf3, 0x08, 0xa6, 0xa2, 0xa8, 0xa8, 0x9e, 0xc3, 0x3f, 0xc6, 0xac, 0xc6, 0x98, 0x21,
+	0xc1, 0x6e, 0x10, 0x62, 0xec, 0x61, 0x57, 0x27, 0x3e, 0x0a, 0x26, 0x88, 0x56, 0x62, 0x10, 0x8f,
+	0xfa, 0xe1, 0x81, 0xce, 0xbc, 0x11, 0xa2, 0xcc, 0x1e, 0xf9, 0x02, 0xa0, 0x7e, 0x90, 0xc1, 0x7f,
+	0xc6, 0x2b, 0x9f, 0x04, 0x6c, 0x83, 0x93, 0x9b, 0xe8, 0x65, 0x88, 0x28, 0x83, 0x57, 0xc0, 0xac,
+	0x6f, 0x07, 0x08, 0x33, 0x45, 0x2a, 0x49, 0xe5, 0x79, 0x33, 0x8e, 0xe0, 0x1d, 0x30, 0x1f, 0x20,
+	0x7b, 0x60, 0x45, 0x3c, 0x8a, 0x5c, 0x92, 0xca, 0xd9, 0x5a, 0x51, 0x8b, 0x8f, 0x38, 0x6e, 0xa2,
+	0xf5, 0xc6, 0x4d, 0xcc, 0xb9, 0x08, 0x1c, 0x85, 0x70, 0x05, 0x64, 0x85, 0x3c, 0xec, 0xd8, 0x47,
+	0x54, 0xc9, 0x94, 0x32, 0xe5, 0x79, 0x13, 0xf0, 0x54, 0x2f, 0xca, 0x40, 0x03, 0xe4, 0x1c, 0x82,
+	0x19, 0xc2, 0x02, 0xa2, 0xfc, 0x55, 0x92, 0xca, 0xf9, 0x9a, 0xaa, 0x4d, 0xd5, 0x4f, 0x6b, 0x08,
+	0x68, 0x54, 0x6a, 0x66, 0x9d, 0xd3, 0x00, 0x36, 0xc1, 0x02, 0x09, 0x99, 0x1f, 0x32, 0xcb, 0x21,
+	0xf8, 0xc0, 0x73, 0x95, 0xbf, 0xf9, 0x90, 0xab, 0x29, 0x3c, 0x1d, 0x8e, 0x6d, 0x70, 0xa8, 0x99,
+	0x23, 0x89, 0x48, 0xfd, 0x28, 0x81, 0xff, 0x27, 0xa5, 0xa1, 0x3e, 0xc1, 0x14, 0x4d, 0x6a, 0x20,
+	0x5d, 0x40, 0x83, 0x33, 0xb3, 0xc9, 0x97, 0x9d, 0xed, 0xa7, 0x04, 0x96, 0xea, 0x36, 0x73, 0x9e,
+	0x6f, 0xa1, 0x78, 0xba, 0xa6, 0x47, 0x19, 0x09, 0x8e, 0xff, 0xe4, 0xdf, 0x89, 0x0d, 0xd8, 0x1e,
+	0x21, 0xaa, 0xc8, 0x09, 0x1b, 0xda, 0x51, 0xe6, 0x8c, 0x0d, 0x99, 0xcb, 0xd9, 0xf0, 0x10, 0x14,
+	0x4e, 0x34, 0xb2, 0x8e, 0x3c, 0x3c, 0x20, 0x47, 0xdc, 0xd1, 0x6c, 0xed, 0x5a, 0x0a, 0x55, 0xa4,
+	0xd0, 0x13, 0x0e, 0x34, 0xf3, 0x63, 0xc5, 0x44, 0xac, 0x3e, 0x03, 0xcb, 0x29, 0x87, 0x8d, 0x1d,
+	0xb9, 0x07, 0x66, 0xc5, 0xdb, 0x50, 0xa4, 0x52, 0xa6, 0x9c, 0xad, 0x5d, 0x4f, 0xeb, 0x81, 0x46,
+	0x3e, 0x09, 0xec, 0x21, 0x67, 0x31, 0xe3, 0x1a, 0x95, 0x80, 0x5c, 0x52, 0x6a, 0xd8, 0x05, 0xff,
+	0xb8, 0x0e, 0xb5, 0x06, 0x88, 0x32, 0x0f, 0xf3, 0xe7, 0x14, 0xbb, 0x7c, 0x23, 0x85, 0x76, 0xcb,
+	0xa1, 0x9b, 0xa7, 0xe0, 0xe6, 0x8c, 0x99, 0x77, 0x27, 0x32, 0xf5, 0x05, 0x90, 0x4d, 0xb0, 0xa9,
+	0x35, 0x90, 0x9f, 0x2c, 0x81, 0x10, 0x64, 0xc2, 0xc0, 0x13, 0x5e, 0x35, 0x67, 0xcc, 0x28, 0xa8,
+	0xe7, 0x00, 0x20, 0xfd, 0x17, 0xc8, 0x61, 0x56, 0x18, 0x78, 0x95, 0x16, 0xc8, 0x26, 0xc4, 0x86,
+	0x4b, 0x40, 0x69, 0x74, 0xda, 0x3d, 0xa3, 0xdd, 0xb3, 0x7a, 0x7b, 0x5d, 0xc3, 0xda, 0x69, 0x6f,
+	0x77, 0x8d, 0x46, 0xeb, 0x41, 0xcb, 0xd8, 0x2c, 0xcc, 0xc0, 0x1c, 0x98, 0x33, 0x8d, 0xed, 0xce,
+	0x8e, 0xd9, 0x30, 0x0a, 0x12, 0xcc, 0x03, 0xd0, 0xda, 0x78, 0x6c, 0x75, 0x3b, 0x8f, 0x5a, 0x8d,
+	0xbd, 0x82, 0x5c, 0xfb, 0x2a, 0x83, 0x1c, 0x57, 0x60, 0x5b, 0x6c, 0x2a, 0xf8, 0x4e, 0x02, 0xb9,
+	0xe4, 0x4d, 0x87, 0x95, 0x94, 0x83, 0x4e, 0xd9, 0x14, 0xc5, 0xe5, 0x31, 0x36, 0xb1, 0x88, 0xb4,
+	0xce, 0x78, 0x11, 0xa9, 0xe5, 0xb7, 0xdf, 0x7f, 0xbc, 0x97, 0x55, 0x75, 0x39, 0x5a, 0x60, 0xaf,
+	0xc5, 0x2d, 0xbc, 0x5f, 0xd1, 0x2b, 0x6f, 0xd6, 0x51, 0x82, 0x6c, 0x5d, 0xaa, 0xc0, 0x2f, 0x12,
+	0x58, 0x9c, 0x6a, 0x33, 0x5c, 0x4b, 0x19, 0xe7, 0xbc, 0x17, 0x50, 0xbc, 0x7d, 0xb1, 0x22, 0x71,
+	0x93, 0x54, 0x8d, 0x8f, 0x5b, 0x86, 0x37, 0xcf, 0x8c, 0xdb, 0x9f, 0x56, 0x57, 0xff, 0x24, 0x81,
+	0xab, 0x0e, 0x19, 0x4d, 0xef, 0x55, 0xff, 0x37, 0x29, 0x73, 0x37, 0x5a, 0x0d, 0x5d, 0xe9, 0xe9,
+	0x7a, 0x8c, 0x75, 0xc9, 0xd0, 0xc6, 0xae, 0x46, 0x02, 0x57, 0x77, 0x11, 0xe6, 0x8b, 0x43, 0x17,
+	0xbf, 0x6c, 0xdf, 0xa3, 0xbf, 0xed, 0xfe, 0xbb, 0xfc, 0xe3, 0xb3, 0xbc, 0xb8, 0x25, 0x8a, 0x1b,
+	0xbc, 0x11, 0xa7, 0xd7, 0x76, 0xab, 0xdf, 0xc6, 0xf9, 0x7d, 0x9e, 0xdf, 0xe7, 0xf9, 0xfd, 0xdd,
+	0x6a, 0x7f, 0x96, 0xd3, 0xae, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xb5, 0xf3, 0x28, 0xb1,
+	0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -681,58 +652,3 @@ var _AssetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/asset/v1/asset_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/asset/v1/asset_service.proto", fileDescriptor_asset_service_4116b6e08342e761)
-}
-
-var fileDescriptor_asset_service_4116b6e08342e761 = []byte{
-	// 739 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x6e, 0xd3, 0x4a,
-	0x14, 0xad, 0x9d, 0xf7, 0xaa, 0x76, 0x92, 0xe6, 0xe5, 0xcd, 0x7b, 0x45, 0x26, 0x6a, 0xd5, 0xe0,
-	0x02, 0x0a, 0x59, 0xd8, 0x4a, 0x8a, 0x84, 0x54, 0x60, 0xd1, 0xa4, 0xa6, 0x89, 0x80, 0x24, 0x72,
-	0xd3, 0xa2, 0xa2, 0x22, 0xcb, 0x71, 0xa6, 0xc6, 0x28, 0x99, 0x31, 0x9e, 0x71, 0x4b, 0x85, 0xd8,
-	0xc0, 0x27, 0xb0, 0x01, 0x89, 0x2f, 0x60, 0xc9, 0x5f, 0xc0, 0x96, 0x5f, 0x60, 0xc7, 0x4f, 0x20,
-	0xcf, 0x38, 0xad, 0x43, 0xe3, 0xa2, 0x76, 0xe7, 0x7b, 0x7d, 0xee, 0xb9, 0x77, 0xce, 0x99, 0xb9,
-	0xe0, 0x96, 0x4b, 0x88, 0x3b, 0x44, 0xba, 0x33, 0x24, 0xe1, 0x40, 0xb7, 0x29, 0x45, 0x4c, 0x3f,
-	0xac, 0x8a, 0x0f, 0x8b, 0xa2, 0xe0, 0xd0, 0x73, 0x90, 0xe6, 0x07, 0x84, 0x11, 0xb8, 0x28, 0xa0,
-	0x1a, 0x87, 0x6a, 0x1c, 0xa1, 0x1d, 0x56, 0x8b, 0x4b, 0x31, 0x83, 0xed, 0x7b, 0xba, 0x8d, 0x31,
-	0x61, 0x36, 0xf3, 0x08, 0xa6, 0xa2, 0xa8, 0xa8, 0x9e, 0xc3, 0x3f, 0xc6, 0xac, 0xc6, 0x98, 0x21,
-	0xc1, 0x6e, 0x10, 0x62, 0xec, 0x61, 0x57, 0x27, 0x3e, 0x0a, 0x26, 0x88, 0x56, 0x62, 0x10, 0x8f,
-	0xfa, 0xe1, 0x81, 0xce, 0xbc, 0x11, 0xa2, 0xcc, 0x1e, 0xf9, 0x02, 0xa0, 0x7e, 0x90, 0xc1, 0x7f,
-	0xc6, 0x2b, 0x9f, 0x04, 0x6c, 0x83, 0x93, 0x9b, 0xe8, 0x65, 0x88, 0x28, 0x83, 0x57, 0xc0, 0xac,
-	0x6f, 0x07, 0x08, 0x33, 0x45, 0x2a, 0x49, 0xe5, 0x79, 0x33, 0x8e, 0xe0, 0x1d, 0x30, 0x1f, 0x20,
-	0x7b, 0x60, 0x45, 0x3c, 0x8a, 0x5c, 0x92, 0xca, 0xd9, 0x5a, 0x51, 0x8b, 0x8f, 0x38, 0x6e, 0xa2,
-	0xf5, 0xc6, 0x4d, 0xcc, 0xb9, 0x08, 0x1c, 0x85, 0x70, 0x05, 0x64, 0x85, 0x3c, 0xec, 0xd8, 0x47,
-	0x54, 0xc9, 0x94, 0x32, 0xe5, 0x79, 0x13, 0xf0, 0x54, 0x2f, 0xca, 0x40, 0x03, 0xe4, 0x1c, 0x82,
-	0x19, 0xc2, 0x02, 0xa2, 0xfc, 0x55, 0x92, 0xca, 0xf9, 0x9a, 0xaa, 0x4d, 0xd5, 0x4f, 0x6b, 0x08,
-	0x68, 0x54, 0x6a, 0x66, 0x9d, 0xd3, 0x00, 0x36, 0xc1, 0x02, 0x09, 0x99, 0x1f, 0x32, 0xcb, 0x21,
-	0xf8, 0xc0, 0x73, 0x95, 0xbf, 0xf9, 0x90, 0xab, 0x29, 0x3c, 0x1d, 0x8e, 0x6d, 0x70, 0xa8, 0x99,
-	0x23, 0x89, 0x48, 0xfd, 0x28, 0x81, 0xff, 0x27, 0xa5, 0xa1, 0x3e, 0xc1, 0x14, 0x4d, 0x6a, 0x20,
-	0x5d, 0x40, 0x83, 0x33, 0xb3, 0xc9, 0x97, 0x9d, 0xed, 0xa7, 0x04, 0x96, 0xea, 0x36, 0x73, 0x9e,
-	0x6f, 0xa1, 0x78, 0xba, 0xa6, 0x47, 0x19, 0x09, 0x8e, 0xff, 0xe4, 0xdf, 0x89, 0x0d, 0xd8, 0x1e,
-	0x21, 0xaa, 0xc8, 0x09, 0x1b, 0xda, 0x51, 0xe6, 0x8c, 0x0d, 0x99, 0xcb, 0xd9, 0xf0, 0x10, 0x14,
-	0x4e, 0x34, 0xb2, 0x8e, 0x3c, 0x3c, 0x20, 0x47, 0xdc, 0xd1, 0x6c, 0xed, 0x5a, 0x0a, 0x55, 0xa4,
-	0xd0, 0x13, 0x0e, 0x34, 0xf3, 0x63, 0xc5, 0x44, 0xac, 0x3e, 0x03, 0xcb, 0x29, 0x87, 0x8d, 0x1d,
-	0xb9, 0x07, 0x66, 0xc5, 0xdb, 0x50, 0xa4, 0x52, 0xa6, 0x9c, 0xad, 0x5d, 0x4f, 0xeb, 0x81, 0x46,
-	0x3e, 0x09, 0xec, 0x21, 0x67, 0x31, 0xe3, 0x1a, 0x95, 0x80, 0x5c, 0x52, 0x6a, 0xd8, 0x05, 0xff,
-	0xb8, 0x0e, 0xb5, 0x06, 0x88, 0x32, 0x0f, 0xf3, 0xe7, 0x14, 0xbb, 0x7c, 0x23, 0x85, 0x76, 0xcb,
-	0xa1, 0x9b, 0xa7, 0xe0, 0xe6, 0x8c, 0x99, 0x77, 0x27, 0x32, 0xf5, 0x05, 0x90, 0x4d, 0xb0, 0xa9,
-	0x35, 0x90, 0x9f, 0x2c, 0x81, 0x10, 0x64, 0xc2, 0xc0, 0x13, 0x5e, 0x35, 0x67, 0xcc, 0x28, 0xa8,
-	0xe7, 0x00, 0x20, 0xfd, 0x17, 0xc8, 0x61, 0x56, 0x18, 0x78, 0x95, 0x16, 0xc8, 0x26, 0xc4, 0x86,
-	0x4b, 0x40, 0x69, 0x74, 0xda, 0x3d, 0xa3, 0xdd, 0xb3, 0x7a, 0x7b, 0x5d, 0xc3, 0xda, 0x69, 0x6f,
-	0x77, 0x8d, 0x46, 0xeb, 0x41, 0xcb, 0xd8, 0x2c, 0xcc, 0xc0, 0x1c, 0x98, 0x33, 0x8d, 0xed, 0xce,
-	0x8e, 0xd9, 0x30, 0x0a, 0x12, 0xcc, 0x03, 0xd0, 0xda, 0x78, 0x6c, 0x75, 0x3b, 0x8f, 0x5a, 0x8d,
-	0xbd, 0x82, 0x5c, 0xfb, 0x2a, 0x83, 0x1c, 0x57, 0x60, 0x5b, 0x6c, 0x2a, 0xf8, 0x4e, 0x02, 0xb9,
-	0xe4, 0x4d, 0x87, 0x95, 0x94, 0x83, 0x4e, 0xd9, 0x14, 0xc5, 0xe5, 0x31, 0x36, 0xb1, 0x88, 0xb4,
-	0xce, 0x78, 0x11, 0xa9, 0xe5, 0xb7, 0xdf, 0x7f, 0xbc, 0x97, 0x55, 0x75, 0x39, 0x5a, 0x60, 0xaf,
-	0xc5, 0x2d, 0xbc, 0x5f, 0xd1, 0x2b, 0x6f, 0xd6, 0x51, 0x82, 0x6c, 0x5d, 0xaa, 0xc0, 0x2f, 0x12,
-	0x58, 0x9c, 0x6a, 0x33, 0x5c, 0x4b, 0x19, 0xe7, 0xbc, 0x17, 0x50, 0xbc, 0x7d, 0xb1, 0x22, 0x71,
-	0x93, 0x54, 0x8d, 0x8f, 0x5b, 0x86, 0x37, 0xcf, 0x8c, 0xdb, 0x9f, 0x56, 0x57, 0xff, 0x24, 0x81,
-	0xab, 0x0e, 0x19, 0x4d, 0xef, 0x55, 0xff, 0x37, 0x29, 0x73, 0x37, 0x5a, 0x0d, 0x5d, 0xe9, 0xe9,
-	0x7a, 0x8c, 0x75, 0xc9, 0xd0, 0xc6, 0xae, 0x46, 0x02, 0x57, 0x77, 0x11, 0xe6, 0x8b, 0x43, 0x17,
-	0xbf, 0x6c, 0xdf, 0xa3, 0xbf, 0xed, 0xfe, 0xbb, 0xfc, 0xe3, 0xb3, 0xbc, 0xb8, 0x25, 0x8a, 0x1b,
-	0xbc, 0x11, 0xa7, 0xd7, 0x76, 0xab, 0xdf, 0xc6, 0xf9, 0x7d, 0x9e, 0xdf, 0xe7, 0xf9, 0xfd, 0xdd,
-	0x6a, 0x7f, 0x96, 0xd3, 0xae, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xb5, 0xf3, 0x28, 0xb1,
-	0x06, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/asset/v1/assets.pb.go b/googleapis/cloud/asset/v1/assets.pb.go
index 8560e0a6a1..16a4742974 100644
--- a/googleapis/cloud/asset/v1/assets.pb.go
+++ b/googleapis/cloud/asset/v1/assets.pb.go
@@ -1,16 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/asset/v1/assets.proto
 
-package asset // import "google.golang.org/genproto/googleapis/cloud/asset/v1"
+package asset
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -21,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Temporal asset. In addition to the asset, the temporal asset includes the
 // status of the asset and valid from and to time of it.
@@ -41,16 +44,17 @@ func (m *TemporalAsset) Reset()         { *m = TemporalAsset{} }
 func (m *TemporalAsset) String() string { return proto.CompactTextString(m) }
 func (*TemporalAsset) ProtoMessage()    {}
 func (*TemporalAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_6b5b5abd731d0fdc, []int{0}
+	return fileDescriptor_e71186cd3ee2fb90, []int{0}
 }
+
 func (m *TemporalAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TemporalAsset.Unmarshal(m, b)
 }
 func (m *TemporalAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TemporalAsset.Marshal(b, m, deterministic)
 }
-func (dst *TemporalAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TemporalAsset.Merge(dst, src)
+func (m *TemporalAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TemporalAsset.Merge(m, src)
 }
 func (m *TemporalAsset) XXX_Size() int {
 	return xxx_messageInfo_TemporalAsset.Size(m)
@@ -98,16 +102,17 @@ func (m *TimeWindow) Reset()         { *m = TimeWindow{} }
 func (m *TimeWindow) String() string { return proto.CompactTextString(m) }
 func (*TimeWindow) ProtoMessage()    {}
 func (*TimeWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_6b5b5abd731d0fdc, []int{1}
+	return fileDescriptor_e71186cd3ee2fb90, []int{1}
 }
+
 func (m *TimeWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeWindow.Unmarshal(m, b)
 }
 func (m *TimeWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeWindow.Marshal(b, m, deterministic)
 }
-func (dst *TimeWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeWindow.Merge(dst, src)
+func (m *TimeWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeWindow.Merge(m, src)
 }
 func (m *TimeWindow) XXX_Size() int {
 	return xxx_messageInfo_TimeWindow.Size(m)
@@ -157,16 +162,17 @@ func (m *Asset) Reset()         { *m = Asset{} }
 func (m *Asset) String() string { return proto.CompactTextString(m) }
 func (*Asset) ProtoMessage()    {}
 func (*Asset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_6b5b5abd731d0fdc, []int{2}
+	return fileDescriptor_e71186cd3ee2fb90, []int{2}
 }
+
 func (m *Asset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset.Unmarshal(m, b)
 }
 func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset.Marshal(b, m, deterministic)
 }
-func (dst *Asset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset.Merge(dst, src)
+func (m *Asset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset.Merge(m, src)
 }
 func (m *Asset) XXX_Size() int {
 	return xxx_messageInfo_Asset.Size(m)
@@ -249,16 +255,17 @@ func (m *Resource) Reset()         { *m = Resource{} }
 func (m *Resource) String() string { return proto.CompactTextString(m) }
 func (*Resource) ProtoMessage()    {}
 func (*Resource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_6b5b5abd731d0fdc, []int{3}
+	return fileDescriptor_e71186cd3ee2fb90, []int{3}
 }
+
 func (m *Resource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resource.Unmarshal(m, b)
 }
 func (m *Resource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Resource.Marshal(b, m, deterministic)
 }
-func (dst *Resource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resource.Merge(dst, src)
+func (m *Resource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resource.Merge(m, src)
 }
 func (m *Resource) XXX_Size() int {
 	return xxx_messageInfo_Resource.Size(m)
@@ -318,11 +325,9 @@ func init() {
 	proto.RegisterType((*Resource)(nil), "google.cloud.asset.v1.Resource")
 }
 
-func init() {
-	proto.RegisterFile("google/cloud/asset/v1/assets.proto", fileDescriptor_assets_6b5b5abd731d0fdc)
-}
+func init() { proto.RegisterFile("google/cloud/asset/v1/assets.proto", fileDescriptor_e71186cd3ee2fb90) }
 
-var fileDescriptor_assets_6b5b5abd731d0fdc = []byte{
+var fileDescriptor_e71186cd3ee2fb90 = []byte{
 	// 541 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xdf, 0x6a, 0xdb, 0x3c,
 	0x14, 0xc7, 0x69, 0x92, 0xc6, 0xa7, 0x5f, 0xbf, 0x0b, 0xb1, 0x74, 0x6e, 0xc8, 0x68, 0x6b, 0x18,
diff --git a/googleapis/cloud/asset/v1beta1/asset_service.pb.go b/googleapis/cloud/asset/v1beta1/asset_service.pb.go
index 820127b0a7..19a809386f 100644
--- a/googleapis/cloud/asset/v1beta1/asset_service.pb.go
+++ b/googleapis/cloud/asset/v1beta1/asset_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/asset/v1beta1/asset_service.proto
 
-package asset // import "google.golang.org/genproto/googleapis/cloud/asset/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package asset
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Asset content type.
 type ContentType int32
@@ -43,6 +43,7 @@ var ContentType_name = map[int32]string{
 	1: "RESOURCE",
 	2: "IAM_POLICY",
 }
+
 var ContentType_value = map[string]int32{
 	"CONTENT_TYPE_UNSPECIFIED": 0,
 	"RESOURCE":                 1,
@@ -52,8 +53,9 @@ var ContentType_value = map[string]int32{
 func (x ContentType) String() string {
 	return proto.EnumName(ContentType_name, int32(x))
 }
+
 func (ContentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_c557f498426d873d, []int{0}
+	return fileDescriptor_565cfbddaa85b7d6, []int{0}
 }
 
 // Export asset request.
@@ -90,16 +92,17 @@ func (m *ExportAssetsRequest) Reset()         { *m = ExportAssetsRequest{} }
 func (m *ExportAssetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportAssetsRequest) ProtoMessage()    {}
 func (*ExportAssetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_c557f498426d873d, []int{0}
+	return fileDescriptor_565cfbddaa85b7d6, []int{0}
 }
+
 func (m *ExportAssetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAssetsRequest.Unmarshal(m, b)
 }
 func (m *ExportAssetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAssetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportAssetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAssetsRequest.Merge(dst, src)
+func (m *ExportAssetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAssetsRequest.Merge(m, src)
 }
 func (m *ExportAssetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportAssetsRequest.Size(m)
@@ -165,16 +168,17 @@ func (m *ExportAssetsResponse) Reset()         { *m = ExportAssetsResponse{} }
 func (m *ExportAssetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportAssetsResponse) ProtoMessage()    {}
 func (*ExportAssetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_c557f498426d873d, []int{1}
+	return fileDescriptor_565cfbddaa85b7d6, []int{1}
 }
+
 func (m *ExportAssetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAssetsResponse.Unmarshal(m, b)
 }
 func (m *ExportAssetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAssetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportAssetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAssetsResponse.Merge(dst, src)
+func (m *ExportAssetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAssetsResponse.Merge(m, src)
 }
 func (m *ExportAssetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportAssetsResponse.Size(m)
@@ -232,16 +236,17 @@ func (m *BatchGetAssetsHistoryRequest) Reset()         { *m = BatchGetAssetsHist
 func (m *BatchGetAssetsHistoryRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchGetAssetsHistoryRequest) ProtoMessage()    {}
 func (*BatchGetAssetsHistoryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_c557f498426d873d, []int{2}
+	return fileDescriptor_565cfbddaa85b7d6, []int{2}
 }
+
 func (m *BatchGetAssetsHistoryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetAssetsHistoryRequest.Unmarshal(m, b)
 }
 func (m *BatchGetAssetsHistoryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetAssetsHistoryRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetAssetsHistoryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetAssetsHistoryRequest.Merge(dst, src)
+func (m *BatchGetAssetsHistoryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetAssetsHistoryRequest.Merge(m, src)
 }
 func (m *BatchGetAssetsHistoryRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchGetAssetsHistoryRequest.Size(m)
@@ -293,16 +298,17 @@ func (m *BatchGetAssetsHistoryResponse) Reset()         { *m = BatchGetAssetsHis
 func (m *BatchGetAssetsHistoryResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchGetAssetsHistoryResponse) ProtoMessage()    {}
 func (*BatchGetAssetsHistoryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_c557f498426d873d, []int{3}
+	return fileDescriptor_565cfbddaa85b7d6, []int{3}
 }
+
 func (m *BatchGetAssetsHistoryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetAssetsHistoryResponse.Unmarshal(m, b)
 }
 func (m *BatchGetAssetsHistoryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetAssetsHistoryResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetAssetsHistoryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetAssetsHistoryResponse.Merge(dst, src)
+func (m *BatchGetAssetsHistoryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetAssetsHistoryResponse.Merge(m, src)
 }
 func (m *BatchGetAssetsHistoryResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchGetAssetsHistoryResponse.Size(m)
@@ -336,16 +342,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_c557f498426d873d, []int{4}
+	return fileDescriptor_565cfbddaa85b7d6, []int{4}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -380,61 +387,13 @@ func (m *OutputConfig) GetGcsDestination() *GcsDestination {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputConfig_OneofMarshaler, _OutputConfig_OneofUnmarshaler, _OutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OutputConfig_GcsDestination)(nil),
 	}
 }
 
-func _OutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputConfig)
-	switch tag {
-	case 1: // destination.gcs_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &OutputConfig_GcsDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		s := proto.Size(x.GcsDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Storage location.
 type GcsDestination struct {
 	// Required.
@@ -451,16 +410,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_service_c557f498426d873d, []int{5}
+	return fileDescriptor_565cfbddaa85b7d6, []int{5}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -495,65 +455,79 @@ func (m *GcsDestination) GetUri() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GcsDestination) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GcsDestination_OneofMarshaler, _GcsDestination_OneofUnmarshaler, _GcsDestination_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GcsDestination) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GcsDestination_Uri)(nil),
 	}
 }
 
-func _GcsDestination_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GcsDestination)
-	// object_uri
-	switch x := m.ObjectUri.(type) {
-	case *GcsDestination_Uri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uri)
-	case nil:
-	default:
-		return fmt.Errorf("GcsDestination.ObjectUri has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GcsDestination_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GcsDestination)
-	switch tag {
-	case 1: // object_uri.uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ObjectUri = &GcsDestination_Uri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GcsDestination_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GcsDestination)
-	// object_uri
-	switch x := m.ObjectUri.(type) {
-	case *GcsDestination_Uri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uri)))
-		n += len(x.Uri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.asset.v1beta1.ContentType", ContentType_name, ContentType_value)
 	proto.RegisterType((*ExportAssetsRequest)(nil), "google.cloud.asset.v1beta1.ExportAssetsRequest")
 	proto.RegisterType((*ExportAssetsResponse)(nil), "google.cloud.asset.v1beta1.ExportAssetsResponse")
 	proto.RegisterType((*BatchGetAssetsHistoryRequest)(nil), "google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest")
 	proto.RegisterType((*BatchGetAssetsHistoryResponse)(nil), "google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse")
 	proto.RegisterType((*OutputConfig)(nil), "google.cloud.asset.v1beta1.OutputConfig")
 	proto.RegisterType((*GcsDestination)(nil), "google.cloud.asset.v1beta1.GcsDestination")
-	proto.RegisterEnum("google.cloud.asset.v1beta1.ContentType", ContentType_name, ContentType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/asset/v1beta1/asset_service.proto", fileDescriptor_565cfbddaa85b7d6)
+}
+
+var fileDescriptor_565cfbddaa85b7d6 = []byte{
+	// 793 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xd3, 0x4a,
+	0x14, 0xae, 0x9d, 0xde, 0xaa, 0x9d, 0xa4, 0xb9, 0xb9, 0x73, 0x7f, 0x64, 0x45, 0xed, 0x6d, 0x64,
+	0x24, 0x9a, 0x46, 0xc2, 0x56, 0xd3, 0x45, 0x69, 0x11, 0x42, 0x4d, 0x1a, 0xda, 0x20, 0x9a, 0x44,
+	0x6e, 0x5a, 0xd4, 0xaa, 0x92, 0xe5, 0x38, 0x53, 0x63, 0x94, 0xcc, 0x18, 0xcf, 0xb8, 0xa5, 0x20,
+	0x36, 0xf0, 0x04, 0xc0, 0x8a, 0x0d, 0x0b, 0x96, 0xac, 0x78, 0x0e, 0xb6, 0xbc, 0x02, 0xaf, 0xc0,
+	0x86, 0x15, 0xf2, 0x8c, 0xd3, 0x3a, 0x4a, 0xea, 0x0a, 0xba, 0x3c, 0x33, 0xdf, 0xf7, 0x9d, 0x33,
+	0xdf, 0x99, 0x39, 0x03, 0x34, 0x87, 0x10, 0xa7, 0x87, 0x74, 0xbb, 0x47, 0x82, 0xae, 0x6e, 0x51,
+	0x8a, 0x98, 0x7e, 0xb2, 0xdc, 0x41, 0xcc, 0x5a, 0x16, 0x91, 0x49, 0x91, 0x7f, 0xe2, 0xda, 0x48,
+	0xf3, 0x7c, 0xc2, 0x08, 0xcc, 0x0b, 0xbc, 0xc6, 0xf1, 0x1a, 0x47, 0x68, 0x11, 0x3e, 0x3f, 0x17,
+	0x69, 0x59, 0x9e, 0xab, 0x5b, 0x18, 0x13, 0x66, 0x31, 0x97, 0x60, 0x2a, 0x98, 0xf9, 0xc5, 0xab,
+	0x32, 0x0d, 0x80, 0x37, 0x22, 0x60, 0x8f, 0x60, 0xc7, 0x0f, 0x30, 0x76, 0xb1, 0xa3, 0x13, 0x0f,
+	0xf9, 0x43, 0x6a, 0x0b, 0x11, 0x88, 0x47, 0x9d, 0xe0, 0x58, 0x67, 0x6e, 0x1f, 0x51, 0x66, 0xf5,
+	0x3d, 0x01, 0x50, 0x3f, 0xca, 0xe0, 0xef, 0xda, 0x33, 0x8f, 0xf8, 0x6c, 0x83, 0x8b, 0x1b, 0xe8,
+	0x69, 0x80, 0x28, 0x83, 0xff, 0x81, 0x29, 0xcf, 0xf2, 0x11, 0x66, 0x8a, 0x54, 0x90, 0x8a, 0x33,
+	0x46, 0x14, 0xc1, 0x55, 0x30, 0xe3, 0x23, 0xab, 0x6b, 0x86, 0x3a, 0x8a, 0x5c, 0x90, 0x8a, 0xe9,
+	0x72, 0x3e, 0x32, 0x47, 0x1b, 0x24, 0xd1, 0xda, 0x83, 0x24, 0xc6, 0x74, 0x08, 0x0e, 0x43, 0xb8,
+	0x00, 0xd2, 0xc2, 0x28, 0x76, 0xe6, 0x21, 0xaa, 0xa4, 0x0a, 0xa9, 0xe2, 0x8c, 0x01, 0xf8, 0x52,
+	0x3b, 0x5c, 0x81, 0x0f, 0x40, 0xc6, 0x26, 0x98, 0x21, 0x2c, 0x20, 0xca, 0x64, 0x41, 0x2a, 0x66,
+	0xcb, 0x8b, 0xda, 0xe5, 0x4e, 0x6a, 0x55, 0x81, 0x0f, 0xf9, 0x46, 0xda, 0xbe, 0x08, 0xe0, 0x0e,
+	0x98, 0x25, 0x01, 0xf3, 0x02, 0x66, 0xda, 0x04, 0x1f, 0xbb, 0x8e, 0xf2, 0x07, 0xaf, 0xb4, 0x98,
+	0x24, 0xd6, 0xe4, 0x84, 0x2a, 0xc7, 0x1b, 0x19, 0x12, 0x8b, 0xd4, 0x0f, 0x12, 0xf8, 0x67, 0xd8,
+	0x24, 0xea, 0x11, 0x4c, 0xd1, 0xb0, 0x1b, 0xd2, 0x2f, 0xb8, 0x31, 0x52, 0xa0, 0x7c, 0xad, 0x02,
+	0xbf, 0x4b, 0x60, 0xae, 0x62, 0x31, 0xfb, 0xf1, 0x16, 0x8a, 0x4a, 0xdc, 0x76, 0x29, 0x23, 0xfe,
+	0xd9, 0x55, 0xed, 0x3c, 0xef, 0x0a, 0xb6, 0xfa, 0x88, 0x2a, 0x72, 0xac, 0x2b, 0x8d, 0x70, 0x65,
+	0xa4, 0x2b, 0xa9, 0x6b, 0x74, 0xa5, 0x05, 0x72, 0xe7, 0x6e, 0x99, 0xa7, 0x2e, 0xee, 0x92, 0x53,
+	0xde, 0xe5, 0x74, 0xf9, 0x66, 0x92, 0x5e, 0x68, 0xd8, 0x23, 0x8e, 0x36, 0xb2, 0x03, 0x03, 0x45,
+	0xac, 0x76, 0xc0, 0xfc, 0x25, 0xc7, 0x8e, 0x1a, 0xb4, 0x01, 0xa6, 0xc4, 0xa3, 0x51, 0xa4, 0x42,
+	0xaa, 0x98, 0x2e, 0x2f, 0x25, 0x26, 0x42, 0x7d, 0x8f, 0xf8, 0x56, 0x8f, 0x4b, 0x19, 0x11, 0x51,
+	0x65, 0x20, 0x13, 0x77, 0x1e, 0xee, 0x81, 0x3f, 0x1d, 0x9b, 0x9a, 0x5d, 0x44, 0x99, 0x8b, 0xf9,
+	0x63, 0x8b, 0x3a, 0x5f, 0x4a, 0xd2, 0xde, 0xb2, 0xe9, 0xe6, 0x05, 0x63, 0x7b, 0xc2, 0xc8, 0x3a,
+	0x43, 0x2b, 0x95, 0x59, 0x90, 0x8e, 0x49, 0xaa, 0x65, 0x90, 0x1d, 0xa6, 0x40, 0x08, 0x52, 0x81,
+	0xef, 0x8a, 0xfe, 0x6d, 0x4f, 0x18, 0x61, 0x50, 0xc9, 0x00, 0x40, 0x3a, 0x4f, 0x90, 0xcd, 0xcc,
+	0xc0, 0x77, 0x4b, 0x75, 0x90, 0x8e, 0x79, 0x0f, 0xe7, 0x80, 0x52, 0x6d, 0x36, 0xda, 0xb5, 0x46,
+	0xdb, 0x6c, 0x1f, 0xb4, 0x6a, 0xe6, 0x5e, 0x63, 0xb7, 0x55, 0xab, 0xd6, 0xef, 0xd7, 0x6b, 0x9b,
+	0xb9, 0x09, 0x98, 0x01, 0xd3, 0x46, 0x6d, 0xb7, 0xb9, 0x67, 0x54, 0x6b, 0x39, 0x09, 0x66, 0x01,
+	0xa8, 0x6f, 0xec, 0x98, 0xad, 0xe6, 0xc3, 0x7a, 0xf5, 0x20, 0x27, 0x97, 0xdf, 0x4c, 0x82, 0x0c,
+	0xb7, 0x61, 0x57, 0x8c, 0x35, 0xf8, 0x43, 0x02, 0x99, 0xf8, 0x13, 0x80, 0x7a, 0xd2, 0x69, 0xc7,
+	0x4c, 0x94, 0xfc, 0xfc, 0x80, 0x10, 0x1b, 0x58, 0x5a, 0x73, 0x30, 0xb0, 0xd4, 0xf7, 0xd2, 0xab,
+	0xaf, 0xdf, 0xde, 0xc9, 0x6f, 0x25, 0x75, 0xe9, 0x7c, 0xde, 0xbd, 0x10, 0xb7, 0xf4, 0xae, 0xe7,
+	0x93, 0xf0, 0x90, 0x54, 0x2f, 0xbd, 0x5c, 0x47, 0x31, 0xe9, 0x75, 0xa9, 0x74, 0x78, 0x4b, 0x2d,
+	0x8e, 0xe0, 0x8f, 0x49, 0xaf, 0x8b, 0xfc, 0xb1, 0xf0, 0x15, 0x55, 0x1b, 0x81, 0x13, 0xdf, 0xb1,
+	0xb0, 0xfb, 0x5c, 0x0c, 0xce, 0x31, 0x24, 0xf8, 0x5a, 0x06, 0xff, 0x8e, 0xbd, 0x67, 0xf0, 0x76,
+	0x92, 0x0b, 0x49, 0x2f, 0x32, 0xbf, 0xf6, 0x1b, 0x4c, 0x71, 0xa9, 0xd5, 0x80, 0x3b, 0x45, 0x60,
+	0x39, 0xd1, 0xa8, 0xce, 0x38, 0x8d, 0xc3, 0x35, 0xb8, 0x7a, 0xf5, 0xf9, 0xc7, 0x52, 0x2b, 0x9f,
+	0x25, 0xf0, 0xbf, 0x4d, 0xfa, 0x09, 0x75, 0x57, 0xfe, 0x8a, 0xdf, 0x99, 0x56, 0x38, 0x00, 0x5b,
+	0xd2, 0xe1, 0xbd, 0x88, 0xe0, 0x90, 0x9e, 0x85, 0x1d, 0x8d, 0xf8, 0x8e, 0xee, 0x20, 0xcc, 0xc7,
+	0xa3, 0x2e, 0xb6, 0x2c, 0xcf, 0xa5, 0xe3, 0x3e, 0xbc, 0x3b, 0x3c, 0xfa, 0x24, 0xe7, 0xb7, 0x84,
+	0x42, 0x95, 0xa7, 0xe4, 0x39, 0xb4, 0xfd, 0xe5, 0x4a, 0x08, 0xf9, 0x32, 0xd8, 0x3c, 0xe2, 0x9b,
+	0x47, 0x7c, 0xf3, 0x68, 0x5f, 0xf0, 0x3b, 0x53, 0x3c, 0xcb, 0xca, 0xcf, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xc4, 0xf2, 0x88, 0x01, 0xbf, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -680,61 +654,3 @@ var _AssetService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/asset/v1beta1/asset_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/asset/v1beta1/asset_service.proto", fileDescriptor_asset_service_c557f498426d873d)
-}
-
-var fileDescriptor_asset_service_c557f498426d873d = []byte{
-	// 793 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xd3, 0x4a,
-	0x14, 0xae, 0x9d, 0xde, 0xaa, 0x9d, 0xa4, 0xb9, 0xb9, 0x73, 0x7f, 0x64, 0x45, 0xed, 0x6d, 0x64,
-	0x24, 0x9a, 0x46, 0xc2, 0x56, 0xd3, 0x45, 0x69, 0x11, 0x42, 0x4d, 0x1a, 0xda, 0x20, 0x9a, 0x44,
-	0x6e, 0x5a, 0xd4, 0xaa, 0x92, 0xe5, 0x38, 0x53, 0x63, 0x94, 0xcc, 0x18, 0xcf, 0xb8, 0xa5, 0x20,
-	0x36, 0xf0, 0x04, 0xc0, 0x8a, 0x0d, 0x0b, 0x96, 0xac, 0x78, 0x0e, 0xb6, 0xbc, 0x02, 0xaf, 0xc0,
-	0x86, 0x15, 0xf2, 0x8c, 0xd3, 0x3a, 0x4a, 0xea, 0x0a, 0xba, 0x3c, 0x33, 0xdf, 0xf7, 0x9d, 0x33,
-	0xdf, 0x99, 0x39, 0x03, 0x34, 0x87, 0x10, 0xa7, 0x87, 0x74, 0xbb, 0x47, 0x82, 0xae, 0x6e, 0x51,
-	0x8a, 0x98, 0x7e, 0xb2, 0xdc, 0x41, 0xcc, 0x5a, 0x16, 0x91, 0x49, 0x91, 0x7f, 0xe2, 0xda, 0x48,
-	0xf3, 0x7c, 0xc2, 0x08, 0xcc, 0x0b, 0xbc, 0xc6, 0xf1, 0x1a, 0x47, 0x68, 0x11, 0x3e, 0x3f, 0x17,
-	0x69, 0x59, 0x9e, 0xab, 0x5b, 0x18, 0x13, 0x66, 0x31, 0x97, 0x60, 0x2a, 0x98, 0xf9, 0xc5, 0xab,
-	0x32, 0x0d, 0x80, 0x37, 0x22, 0x60, 0x8f, 0x60, 0xc7, 0x0f, 0x30, 0x76, 0xb1, 0xa3, 0x13, 0x0f,
-	0xf9, 0x43, 0x6a, 0x0b, 0x11, 0x88, 0x47, 0x9d, 0xe0, 0x58, 0x67, 0x6e, 0x1f, 0x51, 0x66, 0xf5,
-	0x3d, 0x01, 0x50, 0x3f, 0xca, 0xe0, 0xef, 0xda, 0x33, 0x8f, 0xf8, 0x6c, 0x83, 0x8b, 0x1b, 0xe8,
-	0x69, 0x80, 0x28, 0x83, 0xff, 0x81, 0x29, 0xcf, 0xf2, 0x11, 0x66, 0x8a, 0x54, 0x90, 0x8a, 0x33,
-	0x46, 0x14, 0xc1, 0x55, 0x30, 0xe3, 0x23, 0xab, 0x6b, 0x86, 0x3a, 0x8a, 0x5c, 0x90, 0x8a, 0xe9,
-	0x72, 0x3e, 0x32, 0x47, 0x1b, 0x24, 0xd1, 0xda, 0x83, 0x24, 0xc6, 0x74, 0x08, 0x0e, 0x43, 0xb8,
-	0x00, 0xd2, 0xc2, 0x28, 0x76, 0xe6, 0x21, 0xaa, 0xa4, 0x0a, 0xa9, 0xe2, 0x8c, 0x01, 0xf8, 0x52,
-	0x3b, 0x5c, 0x81, 0x0f, 0x40, 0xc6, 0x26, 0x98, 0x21, 0x2c, 0x20, 0xca, 0x64, 0x41, 0x2a, 0x66,
-	0xcb, 0x8b, 0xda, 0xe5, 0x4e, 0x6a, 0x55, 0x81, 0x0f, 0xf9, 0x46, 0xda, 0xbe, 0x08, 0xe0, 0x0e,
-	0x98, 0x25, 0x01, 0xf3, 0x02, 0x66, 0xda, 0x04, 0x1f, 0xbb, 0x8e, 0xf2, 0x07, 0xaf, 0xb4, 0x98,
-	0x24, 0xd6, 0xe4, 0x84, 0x2a, 0xc7, 0x1b, 0x19, 0x12, 0x8b, 0xd4, 0x0f, 0x12, 0xf8, 0x67, 0xd8,
-	0x24, 0xea, 0x11, 0x4c, 0xd1, 0xb0, 0x1b, 0xd2, 0x2f, 0xb8, 0x31, 0x52, 0xa0, 0x7c, 0xad, 0x02,
-	0xbf, 0x4b, 0x60, 0xae, 0x62, 0x31, 0xfb, 0xf1, 0x16, 0x8a, 0x4a, 0xdc, 0x76, 0x29, 0x23, 0xfe,
-	0xd9, 0x55, 0xed, 0x3c, 0xef, 0x0a, 0xb6, 0xfa, 0x88, 0x2a, 0x72, 0xac, 0x2b, 0x8d, 0x70, 0x65,
-	0xa4, 0x2b, 0xa9, 0x6b, 0x74, 0xa5, 0x05, 0x72, 0xe7, 0x6e, 0x99, 0xa7, 0x2e, 0xee, 0x92, 0x53,
-	0xde, 0xe5, 0x74, 0xf9, 0x66, 0x92, 0x5e, 0x68, 0xd8, 0x23, 0x8e, 0x36, 0xb2, 0x03, 0x03, 0x45,
-	0xac, 0x76, 0xc0, 0xfc, 0x25, 0xc7, 0x8e, 0x1a, 0xb4, 0x01, 0xa6, 0xc4, 0xa3, 0x51, 0xa4, 0x42,
-	0xaa, 0x98, 0x2e, 0x2f, 0x25, 0x26, 0x42, 0x7d, 0x8f, 0xf8, 0x56, 0x8f, 0x4b, 0x19, 0x11, 0x51,
-	0x65, 0x20, 0x13, 0x77, 0x1e, 0xee, 0x81, 0x3f, 0x1d, 0x9b, 0x9a, 0x5d, 0x44, 0x99, 0x8b, 0xf9,
-	0x63, 0x8b, 0x3a, 0x5f, 0x4a, 0xd2, 0xde, 0xb2, 0xe9, 0xe6, 0x05, 0x63, 0x7b, 0xc2, 0xc8, 0x3a,
-	0x43, 0x2b, 0x95, 0x59, 0x90, 0x8e, 0x49, 0xaa, 0x65, 0x90, 0x1d, 0xa6, 0x40, 0x08, 0x52, 0x81,
-	0xef, 0x8a, 0xfe, 0x6d, 0x4f, 0x18, 0x61, 0x50, 0xc9, 0x00, 0x40, 0x3a, 0x4f, 0x90, 0xcd, 0xcc,
-	0xc0, 0x77, 0x4b, 0x75, 0x90, 0x8e, 0x79, 0x0f, 0xe7, 0x80, 0x52, 0x6d, 0x36, 0xda, 0xb5, 0x46,
-	0xdb, 0x6c, 0x1f, 0xb4, 0x6a, 0xe6, 0x5e, 0x63, 0xb7, 0x55, 0xab, 0xd6, 0xef, 0xd7, 0x6b, 0x9b,
-	0xb9, 0x09, 0x98, 0x01, 0xd3, 0x46, 0x6d, 0xb7, 0xb9, 0x67, 0x54, 0x6b, 0x39, 0x09, 0x66, 0x01,
-	0xa8, 0x6f, 0xec, 0x98, 0xad, 0xe6, 0xc3, 0x7a, 0xf5, 0x20, 0x27, 0x97, 0xdf, 0x4c, 0x82, 0x0c,
-	0xb7, 0x61, 0x57, 0x8c, 0x35, 0xf8, 0x43, 0x02, 0x99, 0xf8, 0x13, 0x80, 0x7a, 0xd2, 0x69, 0xc7,
-	0x4c, 0x94, 0xfc, 0xfc, 0x80, 0x10, 0x1b, 0x58, 0x5a, 0x73, 0x30, 0xb0, 0xd4, 0xf7, 0xd2, 0xab,
-	0xaf, 0xdf, 0xde, 0xc9, 0x6f, 0x25, 0x75, 0xe9, 0x7c, 0xde, 0xbd, 0x10, 0xb7, 0xf4, 0xae, 0xe7,
-	0x93, 0xf0, 0x90, 0x54, 0x2f, 0xbd, 0x5c, 0x47, 0x31, 0xe9, 0x75, 0xa9, 0x74, 0x78, 0x4b, 0x2d,
-	0x8e, 0xe0, 0x8f, 0x49, 0xaf, 0x8b, 0xfc, 0xb1, 0xf0, 0x15, 0x55, 0x1b, 0x81, 0x13, 0xdf, 0xb1,
-	0xb0, 0xfb, 0x5c, 0x0c, 0xce, 0x31, 0x24, 0xf8, 0x5a, 0x06, 0xff, 0x8e, 0xbd, 0x67, 0xf0, 0x76,
-	0x92, 0x0b, 0x49, 0x2f, 0x32, 0xbf, 0xf6, 0x1b, 0x4c, 0x71, 0xa9, 0xd5, 0x80, 0x3b, 0x45, 0x60,
-	0x39, 0xd1, 0xa8, 0xce, 0x38, 0x8d, 0xc3, 0x35, 0xb8, 0x7a, 0xf5, 0xf9, 0xc7, 0x52, 0x2b, 0x9f,
-	0x25, 0xf0, 0xbf, 0x4d, 0xfa, 0x09, 0x75, 0x57, 0xfe, 0x8a, 0xdf, 0x99, 0x56, 0x38, 0x00, 0x5b,
-	0xd2, 0xe1, 0xbd, 0x88, 0xe0, 0x90, 0x9e, 0x85, 0x1d, 0x8d, 0xf8, 0x8e, 0xee, 0x20, 0xcc, 0xc7,
-	0xa3, 0x2e, 0xb6, 0x2c, 0xcf, 0xa5, 0xe3, 0x3e, 0xbc, 0x3b, 0x3c, 0xfa, 0x24, 0xe7, 0xb7, 0x84,
-	0x42, 0x95, 0xa7, 0xe4, 0x39, 0xb4, 0xfd, 0xe5, 0x4a, 0x08, 0xf9, 0x32, 0xd8, 0x3c, 0xe2, 0x9b,
-	0x47, 0x7c, 0xf3, 0x68, 0x5f, 0xf0, 0x3b, 0x53, 0x3c, 0xcb, 0xca, 0xcf, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xc4, 0xf2, 0x88, 0x01, 0xbf, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/asset/v1beta1/assets.pb.go b/googleapis/cloud/asset/v1beta1/assets.pb.go
index b54022d2ad..b7765990db 100644
--- a/googleapis/cloud/asset/v1beta1/assets.pb.go
+++ b/googleapis/cloud/asset/v1beta1/assets.pb.go
@@ -1,16 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/asset/v1beta1/assets.proto
 
-package asset // import "google.golang.org/genproto/googleapis/cloud/asset/v1beta1"
+package asset
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -21,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Temporal asset. In addition to the asset, the temporal asset includes the
 // status of the asset and valid from and to time of it.
@@ -41,16 +44,17 @@ func (m *TemporalAsset) Reset()         { *m = TemporalAsset{} }
 func (m *TemporalAsset) String() string { return proto.CompactTextString(m) }
 func (*TemporalAsset) ProtoMessage()    {}
 func (*TemporalAsset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_534010dc2a646cb2, []int{0}
+	return fileDescriptor_2e0a79b6d8a101c1, []int{0}
 }
+
 func (m *TemporalAsset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TemporalAsset.Unmarshal(m, b)
 }
 func (m *TemporalAsset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TemporalAsset.Marshal(b, m, deterministic)
 }
-func (dst *TemporalAsset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TemporalAsset.Merge(dst, src)
+func (m *TemporalAsset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TemporalAsset.Merge(m, src)
 }
 func (m *TemporalAsset) XXX_Size() int {
 	return xxx_messageInfo_TemporalAsset.Size(m)
@@ -98,16 +102,17 @@ func (m *TimeWindow) Reset()         { *m = TimeWindow{} }
 func (m *TimeWindow) String() string { return proto.CompactTextString(m) }
 func (*TimeWindow) ProtoMessage()    {}
 func (*TimeWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_534010dc2a646cb2, []int{1}
+	return fileDescriptor_2e0a79b6d8a101c1, []int{1}
 }
+
 func (m *TimeWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeWindow.Unmarshal(m, b)
 }
 func (m *TimeWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeWindow.Marshal(b, m, deterministic)
 }
-func (dst *TimeWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeWindow.Merge(dst, src)
+func (m *TimeWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeWindow.Merge(m, src)
 }
 func (m *TimeWindow) XXX_Size() int {
 	return xxx_messageInfo_TimeWindow.Size(m)
@@ -157,16 +162,17 @@ func (m *Asset) Reset()         { *m = Asset{} }
 func (m *Asset) String() string { return proto.CompactTextString(m) }
 func (*Asset) ProtoMessage()    {}
 func (*Asset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_534010dc2a646cb2, []int{2}
+	return fileDescriptor_2e0a79b6d8a101c1, []int{2}
 }
+
 func (m *Asset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset.Unmarshal(m, b)
 }
 func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset.Marshal(b, m, deterministic)
 }
-func (dst *Asset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset.Merge(dst, src)
+func (m *Asset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset.Merge(m, src)
 }
 func (m *Asset) XXX_Size() int {
 	return xxx_messageInfo_Asset.Size(m)
@@ -249,16 +255,17 @@ func (m *Resource) Reset()         { *m = Resource{} }
 func (m *Resource) String() string { return proto.CompactTextString(m) }
 func (*Resource) ProtoMessage()    {}
 func (*Resource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_assets_534010dc2a646cb2, []int{3}
+	return fileDescriptor_2e0a79b6d8a101c1, []int{3}
 }
+
 func (m *Resource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resource.Unmarshal(m, b)
 }
 func (m *Resource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Resource.Marshal(b, m, deterministic)
 }
-func (dst *Resource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resource.Merge(dst, src)
+func (m *Resource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resource.Merge(m, src)
 }
 func (m *Resource) XXX_Size() int {
 	return xxx_messageInfo_Resource.Size(m)
@@ -319,10 +326,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/asset/v1beta1/assets.proto", fileDescriptor_assets_534010dc2a646cb2)
+	proto.RegisterFile("google/cloud/asset/v1beta1/assets.proto", fileDescriptor_2e0a79b6d8a101c1)
 }
 
-var fileDescriptor_assets_534010dc2a646cb2 = []byte{
+var fileDescriptor_2e0a79b6d8a101c1 = []byte{
 	// 551 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xdb, 0x6a, 0xd4, 0x40,
 	0x18, 0x26, 0xed, 0xee, 0x76, 0xf3, 0xd7, 0x7a, 0x31, 0x68, 0x8d, 0x4b, 0xd5, 0x76, 0xf1, 0x50,
diff --git a/googleapis/cloud/audit/audit_log.pb.go b/googleapis/cloud/audit/audit_log.pb.go
index df6296d3d4..f18c0dae18 100644
--- a/googleapis/cloud/audit/audit_log.pb.go
+++ b/googleapis/cloud/audit/audit_log.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/audit/audit_log.proto
 
-package audit // import "google.golang.org/genproto/googleapis/cloud/audit"
+package audit
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Common audit log format for Google Cloud Platform API operations.
 type AuditLog struct {
@@ -80,16 +83,17 @@ func (m *AuditLog) Reset()         { *m = AuditLog{} }
 func (m *AuditLog) String() string { return proto.CompactTextString(m) }
 func (*AuditLog) ProtoMessage()    {}
 func (*AuditLog) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_log_8adb2c14fea76ea3, []int{0}
+	return fileDescriptor_197799a4334e4cbf, []int{0}
 }
+
 func (m *AuditLog) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuditLog.Unmarshal(m, b)
 }
 func (m *AuditLog) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuditLog.Marshal(b, m, deterministic)
 }
-func (dst *AuditLog) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuditLog.Merge(dst, src)
+func (m *AuditLog) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditLog.Merge(m, src)
 }
 func (m *AuditLog) XXX_Size() int {
 	return xxx_messageInfo_AuditLog.Size(m)
@@ -190,16 +194,17 @@ func (m *AuthenticationInfo) Reset()         { *m = AuthenticationInfo{} }
 func (m *AuthenticationInfo) String() string { return proto.CompactTextString(m) }
 func (*AuthenticationInfo) ProtoMessage()    {}
 func (*AuthenticationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_log_8adb2c14fea76ea3, []int{1}
+	return fileDescriptor_197799a4334e4cbf, []int{1}
 }
+
 func (m *AuthenticationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthenticationInfo.Unmarshal(m, b)
 }
 func (m *AuthenticationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthenticationInfo.Marshal(b, m, deterministic)
 }
-func (dst *AuthenticationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthenticationInfo.Merge(dst, src)
+func (m *AuthenticationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthenticationInfo.Merge(m, src)
 }
 func (m *AuthenticationInfo) XXX_Size() int {
 	return xxx_messageInfo_AuthenticationInfo.Size(m)
@@ -237,16 +242,17 @@ func (m *AuthorizationInfo) Reset()         { *m = AuthorizationInfo{} }
 func (m *AuthorizationInfo) String() string { return proto.CompactTextString(m) }
 func (*AuthorizationInfo) ProtoMessage()    {}
 func (*AuthorizationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_log_8adb2c14fea76ea3, []int{2}
+	return fileDescriptor_197799a4334e4cbf, []int{2}
 }
+
 func (m *AuthorizationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthorizationInfo.Unmarshal(m, b)
 }
 func (m *AuthorizationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuthorizationInfo.Marshal(b, m, deterministic)
 }
-func (dst *AuthorizationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuthorizationInfo.Merge(dst, src)
+func (m *AuthorizationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthorizationInfo.Merge(m, src)
 }
 func (m *AuthorizationInfo) XXX_Size() int {
 	return xxx_messageInfo_AuthorizationInfo.Size(m)
@@ -303,16 +309,17 @@ func (m *RequestMetadata) Reset()         { *m = RequestMetadata{} }
 func (m *RequestMetadata) String() string { return proto.CompactTextString(m) }
 func (*RequestMetadata) ProtoMessage()    {}
 func (*RequestMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_log_8adb2c14fea76ea3, []int{3}
+	return fileDescriptor_197799a4334e4cbf, []int{3}
 }
+
 func (m *RequestMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestMetadata.Unmarshal(m, b)
 }
 func (m *RequestMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestMetadata.Marshal(b, m, deterministic)
 }
-func (dst *RequestMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestMetadata.Merge(dst, src)
+func (m *RequestMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestMetadata.Merge(m, src)
 }
 func (m *RequestMetadata) XXX_Size() int {
 	return xxx_messageInfo_RequestMetadata.Size(m)
@@ -344,11 +351,9 @@ func init() {
 	proto.RegisterType((*RequestMetadata)(nil), "google.cloud.audit.RequestMetadata")
 }
 
-func init() {
-	proto.RegisterFile("google/cloud/audit/audit_log.proto", fileDescriptor_audit_log_8adb2c14fea76ea3)
-}
+func init() { proto.RegisterFile("google/cloud/audit/audit_log.proto", fileDescriptor_197799a4334e4cbf) }
 
-var fileDescriptor_audit_log_8adb2c14fea76ea3 = []byte{
+var fileDescriptor_197799a4334e4cbf = []byte{
 	// 576 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x5f, 0x6f, 0xd3, 0x30,
 	0x14, 0xc5, 0x55, 0x36, 0x6d, 0xad, 0xbb, 0xd1, 0xd6, 0x20, 0x1a, 0xca, 0x04, 0xa5, 0x13, 0x50,
diff --git a/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go b/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
index 7510e6abf3..b83957f81e 100644
--- a/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
+++ b/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/annotation_payload.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Contains annotation information that is relevant to AutoML.
 type AnnotationPayload struct {
@@ -53,16 +56,17 @@ func (m *AnnotationPayload) Reset()         { *m = AnnotationPayload{} }
 func (m *AnnotationPayload) String() string { return proto.CompactTextString(m) }
 func (*AnnotationPayload) ProtoMessage()    {}
 func (*AnnotationPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_payload_62fedaea4ad5a830, []int{0}
+	return fileDescriptor_cb8fb684261d0460, []int{0}
 }
+
 func (m *AnnotationPayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotationPayload.Unmarshal(m, b)
 }
 func (m *AnnotationPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotationPayload.Marshal(b, m, deterministic)
 }
-func (dst *AnnotationPayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotationPayload.Merge(dst, src)
+func (m *AnnotationPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationPayload.Merge(m, src)
 }
 func (m *AnnotationPayload) XXX_Size() int {
 	return xxx_messageInfo_AnnotationPayload.Size(m)
@@ -189,9 +193,9 @@ func (m *AnnotationPayload) GetDisplayName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AnnotationPayload) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AnnotationPayload_OneofMarshaler, _AnnotationPayload_OneofUnmarshaler, _AnnotationPayload_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AnnotationPayload) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AnnotationPayload_Translation)(nil),
 		(*AnnotationPayload_Classification)(nil),
 		(*AnnotationPayload_ImageObjectDetection)(nil),
@@ -202,171 +206,15 @@ func (*AnnotationPayload) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _AnnotationPayload_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AnnotationPayload)
-	// detail
-	switch x := m.Detail.(type) {
-	case *AnnotationPayload_Translation:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Translation); err != nil {
-			return err
-		}
-	case *AnnotationPayload_Classification:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Classification); err != nil {
-			return err
-		}
-	case *AnnotationPayload_ImageObjectDetection:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageObjectDetection); err != nil {
-			return err
-		}
-	case *AnnotationPayload_VideoClassification:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoClassification); err != nil {
-			return err
-		}
-	case *AnnotationPayload_TextExtraction:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextExtraction); err != nil {
-			return err
-		}
-	case *AnnotationPayload_TextSentiment:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextSentiment); err != nil {
-			return err
-		}
-	case *AnnotationPayload_Tables:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Tables); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AnnotationPayload.Detail has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AnnotationPayload_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AnnotationPayload)
-	switch tag {
-	case 2: // detail.translation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TranslationAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Detail = &AnnotationPayload_Translation{msg}
-		return true, err
-	case 3: // detail.classification
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ClassificationAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Detail = &AnnotationPayload_Classification{msg}
-		return true, err
-	case 4: // detail.image_object_detection
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageObjectDetectionAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Detail = &AnnotationPayload_ImageObjectDetection{msg}
-		return true, err
-	case 9: // detail.video_classification
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoClassificationAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Detail = &AnnotationPayload_VideoClassification{msg}
-		return true, err
-	case 6: // detail.text_extraction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextExtractionAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Detail = &AnnotationPayload_TextExtraction{msg}
-		return true, err
-	case 7: // detail.text_sentiment
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextSentimentAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Detail = &AnnotationPayload_TextSentiment{msg}
-		return true, err
-	case 10: // detail.tables
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TablesAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Detail = &AnnotationPayload_Tables{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AnnotationPayload_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AnnotationPayload)
-	// detail
-	switch x := m.Detail.(type) {
-	case *AnnotationPayload_Translation:
-		s := proto.Size(x.Translation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationPayload_Classification:
-		s := proto.Size(x.Classification)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationPayload_ImageObjectDetection:
-		s := proto.Size(x.ImageObjectDetection)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationPayload_VideoClassification:
-		s := proto.Size(x.VideoClassification)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationPayload_TextExtraction:
-		s := proto.Size(x.TextExtraction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationPayload_TextSentiment:
-		s := proto.Size(x.TextSentiment)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationPayload_Tables:
-		s := proto.Size(x.Tables)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*AnnotationPayload)(nil), "google.cloud.automl.v1beta1.AnnotationPayload")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/annotation_payload.proto", fileDescriptor_annotation_payload_62fedaea4ad5a830)
+	proto.RegisterFile("google/cloud/automl/v1beta1/annotation_payload.proto", fileDescriptor_cb8fb684261d0460)
 }
 
-var fileDescriptor_annotation_payload_62fedaea4ad5a830 = []byte{
+var fileDescriptor_cb8fb684261d0460 = []byte{
 	// 497 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x41, 0x6f, 0xd3, 0x30,
 	0x18, 0x86, 0xc9, 0x80, 0xc0, 0x5c, 0x18, 0x60, 0x26, 0x14, 0x36, 0x24, 0x06, 0xa7, 0x4a, 0xb0,
diff --git a/googleapis/cloud/automl/v1beta1/classification.pb.go b/googleapis/cloud/automl/v1beta1/classification.pb.go
index 1ce2e0933b..f21d2ca5a2 100644
--- a/googleapis/cloud/automl/v1beta1/classification.pb.go
+++ b/googleapis/cloud/automl/v1beta1/classification.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/classification.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Type of the classification problem.
 type ClassificationType int32
@@ -36,6 +39,7 @@ var ClassificationType_name = map[int32]string{
 	1: "MULTICLASS",
 	2: "MULTILABEL",
 }
+
 var ClassificationType_value = map[string]int32{
 	"CLASSIFICATION_TYPE_UNSPECIFIED": 0,
 	"MULTICLASS":                      1,
@@ -45,8 +49,9 @@ var ClassificationType_value = map[string]int32{
 func (x ClassificationType) String() string {
 	return proto.EnumName(ClassificationType_name, int32(x))
 }
+
 func (ClassificationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_classification_337031297c7f069d, []int{0}
+	return fileDescriptor_7b436fefe6ae5367, []int{0}
 }
 
 // Contains annotation details specific to classification.
@@ -66,16 +71,17 @@ func (m *ClassificationAnnotation) Reset()         { *m = ClassificationAnnotati
 func (m *ClassificationAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ClassificationAnnotation) ProtoMessage()    {}
 func (*ClassificationAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_classification_337031297c7f069d, []int{0}
+	return fileDescriptor_7b436fefe6ae5367, []int{0}
 }
+
 func (m *ClassificationAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassificationAnnotation.Unmarshal(m, b)
 }
 func (m *ClassificationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassificationAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ClassificationAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassificationAnnotation.Merge(dst, src)
+func (m *ClassificationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationAnnotation.Merge(m, src)
 }
 func (m *ClassificationAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ClassificationAnnotation.Size(m)
@@ -133,16 +139,17 @@ func (m *VideoClassificationAnnotation) Reset()         { *m = VideoClassificati
 func (m *VideoClassificationAnnotation) String() string { return proto.CompactTextString(m) }
 func (*VideoClassificationAnnotation) ProtoMessage()    {}
 func (*VideoClassificationAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_classification_337031297c7f069d, []int{1}
+	return fileDescriptor_7b436fefe6ae5367, []int{1}
 }
+
 func (m *VideoClassificationAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoClassificationAnnotation.Unmarshal(m, b)
 }
 func (m *VideoClassificationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoClassificationAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *VideoClassificationAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoClassificationAnnotation.Merge(dst, src)
+func (m *VideoClassificationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoClassificationAnnotation.Merge(m, src)
 }
 func (m *VideoClassificationAnnotation) XXX_Size() int {
 	return xxx_messageInfo_VideoClassificationAnnotation.Size(m)
@@ -213,16 +220,17 @@ func (m *ClassificationEvaluationMetrics) Reset()         { *m = ClassificationE
 func (m *ClassificationEvaluationMetrics) String() string { return proto.CompactTextString(m) }
 func (*ClassificationEvaluationMetrics) ProtoMessage()    {}
 func (*ClassificationEvaluationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_classification_337031297c7f069d, []int{2}
+	return fileDescriptor_7b436fefe6ae5367, []int{2}
 }
+
 func (m *ClassificationEvaluationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassificationEvaluationMetrics.Unmarshal(m, b)
 }
 func (m *ClassificationEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassificationEvaluationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *ClassificationEvaluationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassificationEvaluationMetrics.Merge(dst, src)
+func (m *ClassificationEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics.Merge(m, src)
 }
 func (m *ClassificationEvaluationMetrics) XXX_Size() int {
 	return xxx_messageInfo_ClassificationEvaluationMetrics.Size(m)
@@ -340,16 +348,17 @@ func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) String() string
 }
 func (*ClassificationEvaluationMetrics_ConfidenceMetricsEntry) ProtoMessage() {}
 func (*ClassificationEvaluationMetrics_ConfidenceMetricsEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_classification_337031297c7f069d, []int{2, 0}
+	return fileDescriptor_7b436fefe6ae5367, []int{2, 0}
 }
+
 func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Unmarshal(m, b)
 }
 func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Marshal(b, m, deterministic)
 }
-func (dst *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Merge(dst, src)
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Merge(m, src)
 }
 func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Size() int {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Size(m)
@@ -481,16 +490,17 @@ func (m *ClassificationEvaluationMetrics_ConfusionMatrix) String() string {
 }
 func (*ClassificationEvaluationMetrics_ConfusionMatrix) ProtoMessage() {}
 func (*ClassificationEvaluationMetrics_ConfusionMatrix) Descriptor() ([]byte, []int) {
-	return fileDescriptor_classification_337031297c7f069d, []int{2, 1}
+	return fileDescriptor_7b436fefe6ae5367, []int{2, 1}
 }
+
 func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Unmarshal(m, b)
 }
 func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Marshal(b, m, deterministic)
 }
-func (dst *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Merge(dst, src)
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Merge(m, src)
 }
 func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Size() int {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Size(m)
@@ -534,16 +544,17 @@ func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) String() string {
 }
 func (*ClassificationEvaluationMetrics_ConfusionMatrix_Row) ProtoMessage() {}
 func (*ClassificationEvaluationMetrics_ConfusionMatrix_Row) Descriptor() ([]byte, []int) {
-	return fileDescriptor_classification_337031297c7f069d, []int{2, 1, 0}
+	return fileDescriptor_7b436fefe6ae5367, []int{2, 1, 0}
 }
+
 func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Unmarshal(m, b)
 }
 func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Marshal(b, m, deterministic)
 }
-func (dst *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Merge(dst, src)
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Merge(m, src)
 }
 func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Size() int {
 	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Size(m)
@@ -562,20 +573,20 @@ func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) GetExampleCount()
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.automl.v1beta1.ClassificationType", ClassificationType_name, ClassificationType_value)
 	proto.RegisterType((*ClassificationAnnotation)(nil), "google.cloud.automl.v1beta1.ClassificationAnnotation")
 	proto.RegisterType((*VideoClassificationAnnotation)(nil), "google.cloud.automl.v1beta1.VideoClassificationAnnotation")
 	proto.RegisterType((*ClassificationEvaluationMetrics)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics")
 	proto.RegisterType((*ClassificationEvaluationMetrics_ConfidenceMetricsEntry)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfidenceMetricsEntry")
 	proto.RegisterType((*ClassificationEvaluationMetrics_ConfusionMatrix)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfusionMatrix")
 	proto.RegisterType((*ClassificationEvaluationMetrics_ConfusionMatrix_Row)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfusionMatrix.Row")
-	proto.RegisterEnum("google.cloud.automl.v1beta1.ClassificationType", ClassificationType_name, ClassificationType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/classification.proto", fileDescriptor_classification_337031297c7f069d)
+	proto.RegisterFile("google/cloud/automl/v1beta1/classification.proto", fileDescriptor_7b436fefe6ae5367)
 }
 
-var fileDescriptor_classification_337031297c7f069d = []byte{
+var fileDescriptor_7b436fefe6ae5367 = []byte{
 	// 841 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xd1, 0x6e, 0xdb, 0x36,
 	0x14, 0x9d, 0xec, 0x38, 0xad, 0xaf, 0xdd, 0xd6, 0x61, 0xb2, 0x4c, 0x75, 0x5b, 0xc4, 0x48, 0x5f,
diff --git a/googleapis/cloud/automl/v1beta1/column_spec.pb.go b/googleapis/cloud/automl/v1beta1/column_spec.pb.go
index 30ff709199..baad9b65c0 100644
--- a/googleapis/cloud/automl/v1beta1/column_spec.pb.go
+++ b/googleapis/cloud/automl/v1beta1/column_spec.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/column_spec.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A representation of a column in a relational table. When listing them, column specs are returned in the same order in which they were
 // given on import .
@@ -60,16 +63,17 @@ func (m *ColumnSpec) Reset()         { *m = ColumnSpec{} }
 func (m *ColumnSpec) String() string { return proto.CompactTextString(m) }
 func (*ColumnSpec) ProtoMessage()    {}
 func (*ColumnSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_column_spec_5bd50af362cf7442, []int{0}
+	return fileDescriptor_828eac69e0599d60, []int{0}
 }
+
 func (m *ColumnSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColumnSpec.Unmarshal(m, b)
 }
 func (m *ColumnSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColumnSpec.Marshal(b, m, deterministic)
 }
-func (dst *ColumnSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColumnSpec.Merge(dst, src)
+func (m *ColumnSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnSpec.Merge(m, src)
 }
 func (m *ColumnSpec) XXX_Size() int {
 	return xxx_messageInfo_ColumnSpec.Size(m)
@@ -139,16 +143,17 @@ func (m *ColumnSpec_CorrelatedColumn) Reset()         { *m = ColumnSpec_Correlat
 func (m *ColumnSpec_CorrelatedColumn) String() string { return proto.CompactTextString(m) }
 func (*ColumnSpec_CorrelatedColumn) ProtoMessage()    {}
 func (*ColumnSpec_CorrelatedColumn) Descriptor() ([]byte, []int) {
-	return fileDescriptor_column_spec_5bd50af362cf7442, []int{0, 0}
+	return fileDescriptor_828eac69e0599d60, []int{0, 0}
 }
+
 func (m *ColumnSpec_CorrelatedColumn) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColumnSpec_CorrelatedColumn.Unmarshal(m, b)
 }
 func (m *ColumnSpec_CorrelatedColumn) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColumnSpec_CorrelatedColumn.Marshal(b, m, deterministic)
 }
-func (dst *ColumnSpec_CorrelatedColumn) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColumnSpec_CorrelatedColumn.Merge(dst, src)
+func (m *ColumnSpec_CorrelatedColumn) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnSpec_CorrelatedColumn.Merge(m, src)
 }
 func (m *ColumnSpec_CorrelatedColumn) XXX_Size() int {
 	return xxx_messageInfo_ColumnSpec_CorrelatedColumn.Size(m)
@@ -179,10 +184,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/column_spec.proto", fileDescriptor_column_spec_5bd50af362cf7442)
+	proto.RegisterFile("google/cloud/automl/v1beta1/column_spec.proto", fileDescriptor_828eac69e0599d60)
 }
 
-var fileDescriptor_column_spec_5bd50af362cf7442 = []byte{
+var fileDescriptor_828eac69e0599d60 = []byte{
 	// 396 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xd1, 0xea, 0xd3, 0x30,
 	0x14, 0xc6, 0xe9, 0x7f, 0x7f, 0x87, 0xcb, 0x86, 0xcc, 0x20, 0x52, 0x36, 0xc1, 0x29, 0x2a, 0xbb,
diff --git a/googleapis/cloud/automl/v1beta1/data_items.pb.go b/googleapis/cloud/automl/v1beta1/data_items.pb.go
index 6b19515d05..f6c48488af 100644
--- a/googleapis/cloud/automl/v1beta1/data_items.pb.go
+++ b/googleapis/cloud/automl/v1beta1/data_items.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/data_items.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A representation of an image.
 // Only images up to 30MB in size are supported.
@@ -45,16 +48,17 @@ func (m *Image) Reset()         { *m = Image{} }
 func (m *Image) String() string { return proto.CompactTextString(m) }
 func (*Image) ProtoMessage()    {}
 func (*Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_items_5b5af88f35c66f99, []int{0}
+	return fileDescriptor_bd1fd4e23d5f1ca3, []int{0}
 }
+
 func (m *Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Image.Unmarshal(m, b)
 }
 func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
 }
-func (dst *Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Image.Merge(dst, src)
+func (m *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(m, src)
 }
 func (m *Image) XXX_Size() int {
 	return xxx_messageInfo_Image.Size(m)
@@ -109,76 +113,14 @@ func (m *Image) GetThumbnailUri() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Image) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Image_OneofMarshaler, _Image_OneofUnmarshaler, _Image_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Image) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Image_ImageBytes)(nil),
 		(*Image_InputConfig)(nil),
 	}
 }
 
-func _Image_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Image)
-	// data
-	switch x := m.Data.(type) {
-	case *Image_ImageBytes:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ImageBytes)
-	case *Image_InputConfig:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InputConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Image.Data has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Image_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Image)
-	switch tag {
-	case 1: // data.image_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Data = &Image_ImageBytes{x}
-		return true, err
-	case 6: // data.input_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InputConfig)
-		err := b.DecodeMessage(msg)
-		m.Data = &Image_InputConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Image_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Image)
-	// data
-	switch x := m.Data.(type) {
-	case *Image_ImageBytes:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ImageBytes)))
-		n += len(x.ImageBytes)
-	case *Image_InputConfig:
-		s := proto.Size(x.InputConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A representation of a text snippet.
 type TextSnippet struct {
 	// Required. The content of the text snippet as a string. Up to 250000
@@ -199,16 +141,17 @@ func (m *TextSnippet) Reset()         { *m = TextSnippet{} }
 func (m *TextSnippet) String() string { return proto.CompactTextString(m) }
 func (*TextSnippet) ProtoMessage()    {}
 func (*TextSnippet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_items_5b5af88f35c66f99, []int{1}
+	return fileDescriptor_bd1fd4e23d5f1ca3, []int{1}
 }
+
 func (m *TextSnippet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSnippet.Unmarshal(m, b)
 }
 func (m *TextSnippet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSnippet.Marshal(b, m, deterministic)
 }
-func (dst *TextSnippet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSnippet.Merge(dst, src)
+func (m *TextSnippet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSnippet.Merge(m, src)
 }
 func (m *TextSnippet) XXX_Size() int {
 	return xxx_messageInfo_TextSnippet.Size(m)
@@ -253,16 +196,17 @@ func (m *Document) Reset()         { *m = Document{} }
 func (m *Document) String() string { return proto.CompactTextString(m) }
 func (*Document) ProtoMessage()    {}
 func (*Document) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_items_5b5af88f35c66f99, []int{2}
+	return fileDescriptor_bd1fd4e23d5f1ca3, []int{2}
 }
+
 func (m *Document) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Document.Unmarshal(m, b)
 }
 func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
 }
-func (dst *Document) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Document.Merge(dst, src)
+func (m *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(m, src)
 }
 func (m *Document) XXX_Size() int {
 	return xxx_messageInfo_Document.Size(m)
@@ -305,16 +249,17 @@ func (m *Row) Reset()         { *m = Row{} }
 func (m *Row) String() string { return proto.CompactTextString(m) }
 func (*Row) ProtoMessage()    {}
 func (*Row) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_items_5b5af88f35c66f99, []int{3}
+	return fileDescriptor_bd1fd4e23d5f1ca3, []int{3}
 }
+
 func (m *Row) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Row.Unmarshal(m, b)
 }
 func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
 }
-func (dst *Row) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Row.Merge(dst, src)
+func (m *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(m, src)
 }
 func (m *Row) XXX_Size() int {
 	return xxx_messageInfo_Row.Size(m)
@@ -358,16 +303,17 @@ func (m *ExamplePayload) Reset()         { *m = ExamplePayload{} }
 func (m *ExamplePayload) String() string { return proto.CompactTextString(m) }
 func (*ExamplePayload) ProtoMessage()    {}
 func (*ExamplePayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_items_5b5af88f35c66f99, []int{4}
+	return fileDescriptor_bd1fd4e23d5f1ca3, []int{4}
 }
+
 func (m *ExamplePayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExamplePayload.Unmarshal(m, b)
 }
 func (m *ExamplePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExamplePayload.Marshal(b, m, deterministic)
 }
-func (dst *ExamplePayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExamplePayload.Merge(dst, src)
+func (m *ExamplePayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExamplePayload.Merge(m, src)
 }
 func (m *ExamplePayload) XXX_Size() int {
 	return xxx_messageInfo_ExamplePayload.Size(m)
@@ -441,9 +387,9 @@ func (m *ExamplePayload) GetRow() *Row {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExamplePayload) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExamplePayload_OneofMarshaler, _ExamplePayload_OneofUnmarshaler, _ExamplePayload_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExamplePayload) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExamplePayload_Image)(nil),
 		(*ExamplePayload_TextSnippet)(nil),
 		(*ExamplePayload_Document)(nil),
@@ -451,108 +397,6 @@ func (*ExamplePayload) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _ExamplePayload_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExamplePayload)
-	// payload
-	switch x := m.Payload.(type) {
-	case *ExamplePayload_Image:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Image); err != nil {
-			return err
-		}
-	case *ExamplePayload_TextSnippet:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextSnippet); err != nil {
-			return err
-		}
-	case *ExamplePayload_Document:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Document); err != nil {
-			return err
-		}
-	case *ExamplePayload_Row:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Row); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ExamplePayload.Payload has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExamplePayload_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExamplePayload)
-	switch tag {
-	case 1: // payload.image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Image)
-		err := b.DecodeMessage(msg)
-		m.Payload = &ExamplePayload_Image{msg}
-		return true, err
-	case 2: // payload.text_snippet
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextSnippet)
-		err := b.DecodeMessage(msg)
-		m.Payload = &ExamplePayload_TextSnippet{msg}
-		return true, err
-	case 4: // payload.document
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Document)
-		err := b.DecodeMessage(msg)
-		m.Payload = &ExamplePayload_Document{msg}
-		return true, err
-	case 3: // payload.row
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Row)
-		err := b.DecodeMessage(msg)
-		m.Payload = &ExamplePayload_Row{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExamplePayload_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExamplePayload)
-	// payload
-	switch x := m.Payload.(type) {
-	case *ExamplePayload_Image:
-		s := proto.Size(x.Image)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExamplePayload_TextSnippet:
-		s := proto.Size(x.TextSnippet)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExamplePayload_Document:
-		s := proto.Size(x.Document)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExamplePayload_Row:
-		s := proto.Size(x.Row)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*Image)(nil), "google.cloud.automl.v1beta1.Image")
 	proto.RegisterType((*TextSnippet)(nil), "google.cloud.automl.v1beta1.TextSnippet")
@@ -562,10 +406,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/data_items.proto", fileDescriptor_data_items_5b5af88f35c66f99)
+	proto.RegisterFile("google/cloud/automl/v1beta1/data_items.proto", fileDescriptor_bd1fd4e23d5f1ca3)
 }
 
-var fileDescriptor_data_items_5b5af88f35c66f99 = []byte{
+var fileDescriptor_bd1fd4e23d5f1ca3 = []byte{
 	// 559 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcf, 0x6f, 0xd3, 0x30,
 	0x14, 0x6e, 0x9a, 0xad, 0x5b, 0x9d, 0x0d, 0xa4, 0x1c, 0x50, 0xd8, 0x26, 0x16, 0xc2, 0x0f, 0xe5,
diff --git a/googleapis/cloud/automl/v1beta1/data_stats.pb.go b/googleapis/cloud/automl/v1beta1/data_stats.pb.go
index a7c46bb0d9..936f87d2ff 100644
--- a/googleapis/cloud/automl/v1beta1/data_stats.pb.go
+++ b/googleapis/cloud/automl/v1beta1/data_stats.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/data_stats.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The data statistics of a series of values that share the same DataType.
 type DataStats struct {
@@ -44,16 +47,17 @@ func (m *DataStats) Reset()         { *m = DataStats{} }
 func (m *DataStats) String() string { return proto.CompactTextString(m) }
 func (*DataStats) ProtoMessage()    {}
 func (*DataStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{0}
+	return fileDescriptor_1f99b1d575d82961, []int{0}
 }
+
 func (m *DataStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataStats.Unmarshal(m, b)
 }
 func (m *DataStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DataStats.Marshal(b, m, deterministic)
 }
-func (dst *DataStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DataStats.Merge(dst, src)
+func (m *DataStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataStats.Merge(m, src)
 }
 func (m *DataStats) XXX_Size() int {
 	return xxx_messageInfo_DataStats.Size(m)
@@ -167,9 +171,9 @@ func (m *DataStats) GetNullValueCount() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DataStats) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DataStats_OneofMarshaler, _DataStats_OneofUnmarshaler, _DataStats_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DataStats) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DataStats_Float64Stats)(nil),
 		(*DataStats_StringStats)(nil),
 		(*DataStats_TimestampStats)(nil),
@@ -179,144 +183,6 @@ func (*DataStats) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) err
 	}
 }
 
-func _DataStats_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DataStats)
-	// stats
-	switch x := m.Stats.(type) {
-	case *DataStats_Float64Stats:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Float64Stats); err != nil {
-			return err
-		}
-	case *DataStats_StringStats:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StringStats); err != nil {
-			return err
-		}
-	case *DataStats_TimestampStats:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampStats); err != nil {
-			return err
-		}
-	case *DataStats_ArrayStats:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ArrayStats); err != nil {
-			return err
-		}
-	case *DataStats_StructStats:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructStats); err != nil {
-			return err
-		}
-	case *DataStats_CategoryStats:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CategoryStats); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DataStats.Stats has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DataStats_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DataStats)
-	switch tag {
-	case 3: // stats.float64_stats
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Float64Stats)
-		err := b.DecodeMessage(msg)
-		m.Stats = &DataStats_Float64Stats{msg}
-		return true, err
-	case 4: // stats.string_stats
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StringStats)
-		err := b.DecodeMessage(msg)
-		m.Stats = &DataStats_StringStats{msg}
-		return true, err
-	case 5: // stats.timestamp_stats
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TimestampStats)
-		err := b.DecodeMessage(msg)
-		m.Stats = &DataStats_TimestampStats{msg}
-		return true, err
-	case 6: // stats.array_stats
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayStats)
-		err := b.DecodeMessage(msg)
-		m.Stats = &DataStats_ArrayStats{msg}
-		return true, err
-	case 7: // stats.struct_stats
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructStats)
-		err := b.DecodeMessage(msg)
-		m.Stats = &DataStats_StructStats{msg}
-		return true, err
-	case 8: // stats.category_stats
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CategoryStats)
-		err := b.DecodeMessage(msg)
-		m.Stats = &DataStats_CategoryStats{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DataStats_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DataStats)
-	// stats
-	switch x := m.Stats.(type) {
-	case *DataStats_Float64Stats:
-		s := proto.Size(x.Float64Stats)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataStats_StringStats:
-		s := proto.Size(x.StringStats)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataStats_TimestampStats:
-		s := proto.Size(x.TimestampStats)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataStats_ArrayStats:
-		s := proto.Size(x.ArrayStats)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataStats_StructStats:
-		s := proto.Size(x.StructStats)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataStats_CategoryStats:
-		s := proto.Size(x.CategoryStats)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The data statistics of a series of FLOAT64 values.
 type Float64Stats struct {
 	// The mean of the series.
@@ -343,16 +209,17 @@ func (m *Float64Stats) Reset()         { *m = Float64Stats{} }
 func (m *Float64Stats) String() string { return proto.CompactTextString(m) }
 func (*Float64Stats) ProtoMessage()    {}
 func (*Float64Stats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{1}
+	return fileDescriptor_1f99b1d575d82961, []int{1}
 }
+
 func (m *Float64Stats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Float64Stats.Unmarshal(m, b)
 }
 func (m *Float64Stats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Float64Stats.Marshal(b, m, deterministic)
 }
-func (dst *Float64Stats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Float64Stats.Merge(dst, src)
+func (m *Float64Stats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Float64Stats.Merge(m, src)
 }
 func (m *Float64Stats) XXX_Size() int {
 	return xxx_messageInfo_Float64Stats.Size(m)
@@ -410,16 +277,17 @@ func (m *Float64Stats_HistogramBucket) Reset()         { *m = Float64Stats_Histo
 func (m *Float64Stats_HistogramBucket) String() string { return proto.CompactTextString(m) }
 func (*Float64Stats_HistogramBucket) ProtoMessage()    {}
 func (*Float64Stats_HistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{1, 0}
+	return fileDescriptor_1f99b1d575d82961, []int{1, 0}
 }
+
 func (m *Float64Stats_HistogramBucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Float64Stats_HistogramBucket.Unmarshal(m, b)
 }
 func (m *Float64Stats_HistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Float64Stats_HistogramBucket.Marshal(b, m, deterministic)
 }
-func (dst *Float64Stats_HistogramBucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Float64Stats_HistogramBucket.Merge(dst, src)
+func (m *Float64Stats_HistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Float64Stats_HistogramBucket.Merge(m, src)
 }
 func (m *Float64Stats_HistogramBucket) XXX_Size() int {
 	return xxx_messageInfo_Float64Stats_HistogramBucket.Size(m)
@@ -465,16 +333,17 @@ func (m *StringStats) Reset()         { *m = StringStats{} }
 func (m *StringStats) String() string { return proto.CompactTextString(m) }
 func (*StringStats) ProtoMessage()    {}
 func (*StringStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{2}
+	return fileDescriptor_1f99b1d575d82961, []int{2}
 }
+
 func (m *StringStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StringStats.Unmarshal(m, b)
 }
 func (m *StringStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StringStats.Marshal(b, m, deterministic)
 }
-func (dst *StringStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StringStats.Merge(dst, src)
+func (m *StringStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StringStats.Merge(m, src)
 }
 func (m *StringStats) XXX_Size() int {
 	return xxx_messageInfo_StringStats.Size(m)
@@ -507,16 +376,17 @@ func (m *StringStats_UnigramStats) Reset()         { *m = StringStats_UnigramSta
 func (m *StringStats_UnigramStats) String() string { return proto.CompactTextString(m) }
 func (*StringStats_UnigramStats) ProtoMessage()    {}
 func (*StringStats_UnigramStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{2, 0}
+	return fileDescriptor_1f99b1d575d82961, []int{2, 0}
 }
+
 func (m *StringStats_UnigramStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StringStats_UnigramStats.Unmarshal(m, b)
 }
 func (m *StringStats_UnigramStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StringStats_UnigramStats.Marshal(b, m, deterministic)
 }
-func (dst *StringStats_UnigramStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StringStats_UnigramStats.Merge(dst, src)
+func (m *StringStats_UnigramStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StringStats_UnigramStats.Merge(m, src)
 }
 func (m *StringStats_UnigramStats) XXX_Size() int {
 	return xxx_messageInfo_StringStats_UnigramStats.Size(m)
@@ -558,16 +428,17 @@ func (m *TimestampStats) Reset()         { *m = TimestampStats{} }
 func (m *TimestampStats) String() string { return proto.CompactTextString(m) }
 func (*TimestampStats) ProtoMessage()    {}
 func (*TimestampStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{3}
+	return fileDescriptor_1f99b1d575d82961, []int{3}
 }
+
 func (m *TimestampStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampStats.Unmarshal(m, b)
 }
 func (m *TimestampStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimestampStats.Marshal(b, m, deterministic)
 }
-func (dst *TimestampStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimestampStats.Merge(dst, src)
+func (m *TimestampStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampStats.Merge(m, src)
 }
 func (m *TimestampStats) XXX_Size() int {
 	return xxx_messageInfo_TimestampStats.Size(m)
@@ -599,16 +470,17 @@ func (m *TimestampStats_GranularStats) Reset()         { *m = TimestampStats_Gra
 func (m *TimestampStats_GranularStats) String() string { return proto.CompactTextString(m) }
 func (*TimestampStats_GranularStats) ProtoMessage()    {}
 func (*TimestampStats_GranularStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{3, 0}
+	return fileDescriptor_1f99b1d575d82961, []int{3, 0}
 }
+
 func (m *TimestampStats_GranularStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampStats_GranularStats.Unmarshal(m, b)
 }
 func (m *TimestampStats_GranularStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimestampStats_GranularStats.Marshal(b, m, deterministic)
 }
-func (dst *TimestampStats_GranularStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimestampStats_GranularStats.Merge(dst, src)
+func (m *TimestampStats_GranularStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampStats_GranularStats.Merge(m, src)
 }
 func (m *TimestampStats_GranularStats) XXX_Size() int {
 	return xxx_messageInfo_TimestampStats_GranularStats.Size(m)
@@ -640,16 +512,17 @@ func (m *ArrayStats) Reset()         { *m = ArrayStats{} }
 func (m *ArrayStats) String() string { return proto.CompactTextString(m) }
 func (*ArrayStats) ProtoMessage()    {}
 func (*ArrayStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{4}
+	return fileDescriptor_1f99b1d575d82961, []int{4}
 }
+
 func (m *ArrayStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ArrayStats.Unmarshal(m, b)
 }
 func (m *ArrayStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ArrayStats.Marshal(b, m, deterministic)
 }
-func (dst *ArrayStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ArrayStats.Merge(dst, src)
+func (m *ArrayStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayStats.Merge(m, src)
 }
 func (m *ArrayStats) XXX_Size() int {
 	return xxx_messageInfo_ArrayStats.Size(m)
@@ -681,16 +554,17 @@ func (m *StructStats) Reset()         { *m = StructStats{} }
 func (m *StructStats) String() string { return proto.CompactTextString(m) }
 func (*StructStats) ProtoMessage()    {}
 func (*StructStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{5}
+	return fileDescriptor_1f99b1d575d82961, []int{5}
 }
+
 func (m *StructStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructStats.Unmarshal(m, b)
 }
 func (m *StructStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructStats.Marshal(b, m, deterministic)
 }
-func (dst *StructStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructStats.Merge(dst, src)
+func (m *StructStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructStats.Merge(m, src)
 }
 func (m *StructStats) XXX_Size() int {
 	return xxx_messageInfo_StructStats.Size(m)
@@ -723,16 +597,17 @@ func (m *CategoryStats) Reset()         { *m = CategoryStats{} }
 func (m *CategoryStats) String() string { return proto.CompactTextString(m) }
 func (*CategoryStats) ProtoMessage()    {}
 func (*CategoryStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{6}
+	return fileDescriptor_1f99b1d575d82961, []int{6}
 }
+
 func (m *CategoryStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CategoryStats.Unmarshal(m, b)
 }
 func (m *CategoryStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CategoryStats.Marshal(b, m, deterministic)
 }
-func (dst *CategoryStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CategoryStats.Merge(dst, src)
+func (m *CategoryStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CategoryStats.Merge(m, src)
 }
 func (m *CategoryStats) XXX_Size() int {
 	return xxx_messageInfo_CategoryStats.Size(m)
@@ -765,16 +640,17 @@ func (m *CategoryStats_SingleCategoryStats) Reset()         { *m = CategoryStats
 func (m *CategoryStats_SingleCategoryStats) String() string { return proto.CompactTextString(m) }
 func (*CategoryStats_SingleCategoryStats) ProtoMessage()    {}
 func (*CategoryStats_SingleCategoryStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{6, 0}
+	return fileDescriptor_1f99b1d575d82961, []int{6, 0}
 }
+
 func (m *CategoryStats_SingleCategoryStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CategoryStats_SingleCategoryStats.Unmarshal(m, b)
 }
 func (m *CategoryStats_SingleCategoryStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CategoryStats_SingleCategoryStats.Marshal(b, m, deterministic)
 }
-func (dst *CategoryStats_SingleCategoryStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CategoryStats_SingleCategoryStats.Merge(dst, src)
+func (m *CategoryStats_SingleCategoryStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CategoryStats_SingleCategoryStats.Merge(m, src)
 }
 func (m *CategoryStats_SingleCategoryStats) XXX_Size() int {
 	return xxx_messageInfo_CategoryStats_SingleCategoryStats.Size(m)
@@ -814,16 +690,17 @@ func (m *CorrelationStats) Reset()         { *m = CorrelationStats{} }
 func (m *CorrelationStats) String() string { return proto.CompactTextString(m) }
 func (*CorrelationStats) ProtoMessage()    {}
 func (*CorrelationStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_stats_e2571ab261ca3ffb, []int{7}
+	return fileDescriptor_1f99b1d575d82961, []int{7}
 }
+
 func (m *CorrelationStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CorrelationStats.Unmarshal(m, b)
 }
 func (m *CorrelationStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CorrelationStats.Marshal(b, m, deterministic)
 }
-func (dst *CorrelationStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CorrelationStats.Merge(dst, src)
+func (m *CorrelationStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CorrelationStats.Merge(m, src)
 }
 func (m *CorrelationStats) XXX_Size() int {
 	return xxx_messageInfo_CorrelationStats.Size(m)
@@ -860,10 +737,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/data_stats.proto", fileDescriptor_data_stats_e2571ab261ca3ffb)
+	proto.RegisterFile("google/cloud/automl/v1beta1/data_stats.proto", fileDescriptor_1f99b1d575d82961)
 }
 
-var fileDescriptor_data_stats_e2571ab261ca3ffb = []byte{
+var fileDescriptor_1f99b1d575d82961 = []byte{
 	// 830 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0xcb, 0x6f, 0xd3, 0x48,
 	0x18, 0xc0, 0xd7, 0x49, 0xd3, 0x36, 0x5f, 0x9e, 0x9d, 0xed, 0xa1, 0x4a, 0x2b, 0x6d, 0x95, 0xc3,
diff --git a/googleapis/cloud/automl/v1beta1/data_types.pb.go b/googleapis/cloud/automl/v1beta1/data_types.pb.go
index bc168e15e2..7124e6a0ed 100644
--- a/googleapis/cloud/automl/v1beta1/data_types.pb.go
+++ b/googleapis/cloud/automl/v1beta1/data_types.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/data_types.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `TypeCode` is used as a part of
 // [DataType][google.cloud.automl.v1beta1.DataType].
@@ -70,6 +73,7 @@ var TypeCode_name = map[int32]string{
 	9:  "STRUCT",
 	10: "CATEGORY",
 }
+
 var TypeCode_value = map[string]int32{
 	"TYPE_CODE_UNSPECIFIED": 0,
 	"FLOAT64":               3,
@@ -83,8 +87,9 @@ var TypeCode_value = map[string]int32{
 func (x TypeCode) String() string {
 	return proto.EnumName(TypeCode_name, int32(x))
 }
+
 func (TypeCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_types_f857041c6e153cb1, []int{0}
+	return fileDescriptor_43071a57be770d81, []int{0}
 }
 
 // Indicated the type of data that can be stored in a structured data entity
@@ -110,16 +115,17 @@ func (m *DataType) Reset()         { *m = DataType{} }
 func (m *DataType) String() string { return proto.CompactTextString(m) }
 func (*DataType) ProtoMessage()    {}
 func (*DataType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_types_f857041c6e153cb1, []int{0}
+	return fileDescriptor_43071a57be770d81, []int{0}
 }
+
 func (m *DataType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataType.Unmarshal(m, b)
 }
 func (m *DataType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DataType.Marshal(b, m, deterministic)
 }
-func (dst *DataType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DataType.Merge(dst, src)
+func (m *DataType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataType.Merge(m, src)
 }
 func (m *DataType) XXX_Size() int {
 	return xxx_messageInfo_DataType.Size(m)
@@ -194,95 +200,15 @@ func (m *DataType) GetNullable() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DataType) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DataType_OneofMarshaler, _DataType_OneofUnmarshaler, _DataType_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DataType) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DataType_ListElementType)(nil),
 		(*DataType_StructType)(nil),
 		(*DataType_TimeFormat)(nil),
 	}
 }
 
-func _DataType_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DataType)
-	// details
-	switch x := m.Details.(type) {
-	case *DataType_ListElementType:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListElementType); err != nil {
-			return err
-		}
-	case *DataType_StructType:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructType); err != nil {
-			return err
-		}
-	case *DataType_TimeFormat:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TimeFormat)
-	case nil:
-	default:
-		return fmt.Errorf("DataType.Details has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DataType_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DataType)
-	switch tag {
-	case 2: // details.list_element_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DataType)
-		err := b.DecodeMessage(msg)
-		m.Details = &DataType_ListElementType{msg}
-		return true, err
-	case 3: // details.struct_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructType)
-		err := b.DecodeMessage(msg)
-		m.Details = &DataType_StructType{msg}
-		return true, err
-	case 5: // details.time_format
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Details = &DataType_TimeFormat{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DataType_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DataType)
-	// details
-	switch x := m.Details.(type) {
-	case *DataType_ListElementType:
-		s := proto.Size(x.ListElementType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataType_StructType:
-		s := proto.Size(x.StructType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataType_TimeFormat:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TimeFormat)))
-		n += len(x.TimeFormat)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // `StructType` defines the DataType-s of a [STRUCT][google.cloud.automl.v1beta1.TypeCode.STRUCT] type.
 type StructType struct {
 	// Unordered map of struct field names to their data types.
@@ -298,16 +224,17 @@ func (m *StructType) Reset()         { *m = StructType{} }
 func (m *StructType) String() string { return proto.CompactTextString(m) }
 func (*StructType) ProtoMessage()    {}
 func (*StructType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_types_f857041c6e153cb1, []int{1}
+	return fileDescriptor_43071a57be770d81, []int{1}
 }
+
 func (m *StructType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructType.Unmarshal(m, b)
 }
 func (m *StructType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructType.Marshal(b, m, deterministic)
 }
-func (dst *StructType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructType.Merge(dst, src)
+func (m *StructType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructType.Merge(m, src)
 }
 func (m *StructType) XXX_Size() int {
 	return xxx_messageInfo_StructType.Size(m)
@@ -326,17 +253,17 @@ func (m *StructType) GetFields() map[string]*DataType {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.automl.v1beta1.TypeCode", TypeCode_name, TypeCode_value)
 	proto.RegisterType((*DataType)(nil), "google.cloud.automl.v1beta1.DataType")
 	proto.RegisterType((*StructType)(nil), "google.cloud.automl.v1beta1.StructType")
 	proto.RegisterMapType((map[string]*DataType)(nil), "google.cloud.automl.v1beta1.StructType.FieldsEntry")
-	proto.RegisterEnum("google.cloud.automl.v1beta1.TypeCode", TypeCode_name, TypeCode_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/data_types.proto", fileDescriptor_data_types_f857041c6e153cb1)
+	proto.RegisterFile("google/cloud/automl/v1beta1/data_types.proto", fileDescriptor_43071a57be770d81)
 }
 
-var fileDescriptor_data_types_f857041c6e153cb1 = []byte{
+var fileDescriptor_43071a57be770d81 = []byte{
 	// 528 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x5f, 0x8b, 0xd3, 0x40,
 	0x10, 0xc0, 0x2f, 0xed, 0xb5, 0x97, 0x4c, 0xfc, 0x13, 0x17, 0x84, 0x5e, 0x4f, 0xb0, 0x1e, 0x8a,
diff --git a/googleapis/cloud/automl/v1beta1/dataset.pb.go b/googleapis/cloud/automl/v1beta1/dataset.pb.go
index 5b962b782f..29add06fd4 100644
--- a/googleapis/cloud/automl/v1beta1/dataset.pb.go
+++ b/googleapis/cloud/automl/v1beta1/dataset.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/dataset.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A workspace for solving a single, particular machine learning (ML) problem.
 // A workspace contains examples that may be annotated.
@@ -63,16 +66,17 @@ func (m *Dataset) Reset()         { *m = Dataset{} }
 func (m *Dataset) String() string { return proto.CompactTextString(m) }
 func (*Dataset) ProtoMessage()    {}
 func (*Dataset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_954237b3f3904ab8, []int{0}
+	return fileDescriptor_1f2b1dc66a1e92da, []int{0}
 }
+
 func (m *Dataset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Dataset.Unmarshal(m, b)
 }
 func (m *Dataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Dataset.Marshal(b, m, deterministic)
 }
-func (dst *Dataset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Dataset.Merge(dst, src)
+func (m *Dataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dataset.Merge(m, src)
 }
 func (m *Dataset) XXX_Size() int {
 	return xxx_messageInfo_Dataset.Size(m)
@@ -240,9 +244,9 @@ func (m *Dataset) GetEtag() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Dataset) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Dataset_OneofMarshaler, _Dataset_OneofUnmarshaler, _Dataset_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Dataset) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Dataset_TranslationDatasetMetadata)(nil),
 		(*Dataset_ImageClassificationDatasetMetadata)(nil),
 		(*Dataset_TextClassificationDatasetMetadata)(nil),
@@ -254,180 +258,6 @@ func (*Dataset) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error
 	}
 }
 
-func _Dataset_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Dataset)
-	// dataset_metadata
-	switch x := m.DatasetMetadata.(type) {
-	case *Dataset_TranslationDatasetMetadata:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TranslationDatasetMetadata); err != nil {
-			return err
-		}
-	case *Dataset_ImageClassificationDatasetMetadata:
-		b.EncodeVarint(24<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageClassificationDatasetMetadata); err != nil {
-			return err
-		}
-	case *Dataset_TextClassificationDatasetMetadata:
-		b.EncodeVarint(25<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextClassificationDatasetMetadata); err != nil {
-			return err
-		}
-	case *Dataset_ImageObjectDetectionDatasetMetadata:
-		b.EncodeVarint(26<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageObjectDetectionDatasetMetadata); err != nil {
-			return err
-		}
-	case *Dataset_VideoClassificationDatasetMetadata:
-		b.EncodeVarint(31<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoClassificationDatasetMetadata); err != nil {
-			return err
-		}
-	case *Dataset_TextExtractionDatasetMetadata:
-		b.EncodeVarint(28<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextExtractionDatasetMetadata); err != nil {
-			return err
-		}
-	case *Dataset_TextSentimentDatasetMetadata:
-		b.EncodeVarint(30<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextSentimentDatasetMetadata); err != nil {
-			return err
-		}
-	case *Dataset_TablesDatasetMetadata:
-		b.EncodeVarint(33<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TablesDatasetMetadata); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Dataset.DatasetMetadata has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Dataset_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Dataset)
-	switch tag {
-	case 23: // dataset_metadata.translation_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TranslationDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_TranslationDatasetMetadata{msg}
-		return true, err
-	case 24: // dataset_metadata.image_classification_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageClassificationDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_ImageClassificationDatasetMetadata{msg}
-		return true, err
-	case 25: // dataset_metadata.text_classification_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextClassificationDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_TextClassificationDatasetMetadata{msg}
-		return true, err
-	case 26: // dataset_metadata.image_object_detection_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageObjectDetectionDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_ImageObjectDetectionDatasetMetadata{msg}
-		return true, err
-	case 31: // dataset_metadata.video_classification_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoClassificationDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_VideoClassificationDatasetMetadata{msg}
-		return true, err
-	case 28: // dataset_metadata.text_extraction_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextExtractionDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_TextExtractionDatasetMetadata{msg}
-		return true, err
-	case 30: // dataset_metadata.text_sentiment_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextSentimentDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_TextSentimentDatasetMetadata{msg}
-		return true, err
-	case 33: // dataset_metadata.tables_dataset_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TablesDatasetMetadata)
-		err := b.DecodeMessage(msg)
-		m.DatasetMetadata = &Dataset_TablesDatasetMetadata{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Dataset_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Dataset)
-	// dataset_metadata
-	switch x := m.DatasetMetadata.(type) {
-	case *Dataset_TranslationDatasetMetadata:
-		s := proto.Size(x.TranslationDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Dataset_ImageClassificationDatasetMetadata:
-		s := proto.Size(x.ImageClassificationDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Dataset_TextClassificationDatasetMetadata:
-		s := proto.Size(x.TextClassificationDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Dataset_ImageObjectDetectionDatasetMetadata:
-		s := proto.Size(x.ImageObjectDetectionDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Dataset_VideoClassificationDatasetMetadata:
-		s := proto.Size(x.VideoClassificationDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Dataset_TextExtractionDatasetMetadata:
-		s := proto.Size(x.TextExtractionDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Dataset_TextSentimentDatasetMetadata:
-		s := proto.Size(x.TextSentimentDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Dataset_TablesDatasetMetadata:
-		s := proto.Size(x.TablesDatasetMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A definition of an annotation.
 type AnnotationSpec struct {
 	// Output only. Resource name of the annotation spec.
@@ -453,16 +283,17 @@ func (m *AnnotationSpec) Reset()         { *m = AnnotationSpec{} }
 func (m *AnnotationSpec) String() string { return proto.CompactTextString(m) }
 func (*AnnotationSpec) ProtoMessage()    {}
 func (*AnnotationSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_954237b3f3904ab8, []int{1}
+	return fileDescriptor_1f2b1dc66a1e92da, []int{1}
 }
+
 func (m *AnnotationSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotationSpec.Unmarshal(m, b)
 }
 func (m *AnnotationSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotationSpec.Marshal(b, m, deterministic)
 }
-func (dst *AnnotationSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotationSpec.Merge(dst, src)
+func (m *AnnotationSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationSpec.Merge(m, src)
 }
 func (m *AnnotationSpec) XXX_Size() int {
 	return xxx_messageInfo_AnnotationSpec.Size(m)
@@ -500,10 +331,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/dataset.proto", fileDescriptor_dataset_954237b3f3904ab8)
+	proto.RegisterFile("google/cloud/automl/v1beta1/dataset.proto", fileDescriptor_1f2b1dc66a1e92da)
 }
 
-var fileDescriptor_dataset_954237b3f3904ab8 = []byte{
+var fileDescriptor_1f2b1dc66a1e92da = []byte{
 	// 647 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x5d, 0x6b, 0xd4, 0x4c,
 	0x14, 0xc7, 0x9f, 0xf4, 0xf1, 0x85, 0xce, 0xd6, 0xa2, 0x03, 0xa5, 0x71, 0xbb, 0xba, 0xdb, 0x56,
diff --git a/googleapis/cloud/automl/v1beta1/detection.pb.go b/googleapis/cloud/automl/v1beta1/detection.pb.go
index a1458b3d24..c93a70ae4d 100644
--- a/googleapis/cloud/automl/v1beta1/detection.pb.go
+++ b/googleapis/cloud/automl/v1beta1/detection.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/detection.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Annotation details for image object detection.
 type ImageObjectDetectionAnnotation struct {
@@ -38,16 +41,17 @@ func (m *ImageObjectDetectionAnnotation) Reset()         { *m = ImageObjectDetec
 func (m *ImageObjectDetectionAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ImageObjectDetectionAnnotation) ProtoMessage()    {}
 func (*ImageObjectDetectionAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_detection_fc1cbf42da607929, []int{0}
+	return fileDescriptor_85c92c72aeb2dfbd, []int{0}
 }
+
 func (m *ImageObjectDetectionAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageObjectDetectionAnnotation.Unmarshal(m, b)
 }
 func (m *ImageObjectDetectionAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageObjectDetectionAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ImageObjectDetectionAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageObjectDetectionAnnotation.Merge(dst, src)
+func (m *ImageObjectDetectionAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageObjectDetectionAnnotation.Merge(m, src)
 }
 func (m *ImageObjectDetectionAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ImageObjectDetectionAnnotation.Size(m)
@@ -93,16 +97,17 @@ func (m *BoundingBoxMetricsEntry) Reset()         { *m = BoundingBoxMetricsEntry
 func (m *BoundingBoxMetricsEntry) String() string { return proto.CompactTextString(m) }
 func (*BoundingBoxMetricsEntry) ProtoMessage()    {}
 func (*BoundingBoxMetricsEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_detection_fc1cbf42da607929, []int{1}
+	return fileDescriptor_85c92c72aeb2dfbd, []int{1}
 }
+
 func (m *BoundingBoxMetricsEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingBoxMetricsEntry.Unmarshal(m, b)
 }
 func (m *BoundingBoxMetricsEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingBoxMetricsEntry.Marshal(b, m, deterministic)
 }
-func (dst *BoundingBoxMetricsEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingBoxMetricsEntry.Merge(dst, src)
+func (m *BoundingBoxMetricsEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingBoxMetricsEntry.Merge(m, src)
 }
 func (m *BoundingBoxMetricsEntry) XXX_Size() int {
 	return xxx_messageInfo_BoundingBoxMetricsEntry.Size(m)
@@ -157,16 +162,17 @@ func (m *BoundingBoxMetricsEntry_ConfidenceMetricsEntry) String() string {
 }
 func (*BoundingBoxMetricsEntry_ConfidenceMetricsEntry) ProtoMessage() {}
 func (*BoundingBoxMetricsEntry_ConfidenceMetricsEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_detection_fc1cbf42da607929, []int{1, 0}
+	return fileDescriptor_85c92c72aeb2dfbd, []int{1, 0}
 }
+
 func (m *BoundingBoxMetricsEntry_ConfidenceMetricsEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingBoxMetricsEntry_ConfidenceMetricsEntry.Unmarshal(m, b)
 }
 func (m *BoundingBoxMetricsEntry_ConfidenceMetricsEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingBoxMetricsEntry_ConfidenceMetricsEntry.Marshal(b, m, deterministic)
 }
-func (dst *BoundingBoxMetricsEntry_ConfidenceMetricsEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingBoxMetricsEntry_ConfidenceMetricsEntry.Merge(dst, src)
+func (m *BoundingBoxMetricsEntry_ConfidenceMetricsEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingBoxMetricsEntry_ConfidenceMetricsEntry.Merge(m, src)
 }
 func (m *BoundingBoxMetricsEntry_ConfidenceMetricsEntry) XXX_Size() int {
 	return xxx_messageInfo_BoundingBoxMetricsEntry_ConfidenceMetricsEntry.Size(m)
@@ -228,16 +234,17 @@ func (m *ImageObjectDetectionEvaluationMetrics) Reset()         { *m = ImageObje
 func (m *ImageObjectDetectionEvaluationMetrics) String() string { return proto.CompactTextString(m) }
 func (*ImageObjectDetectionEvaluationMetrics) ProtoMessage()    {}
 func (*ImageObjectDetectionEvaluationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_detection_fc1cbf42da607929, []int{2}
+	return fileDescriptor_85c92c72aeb2dfbd, []int{2}
 }
+
 func (m *ImageObjectDetectionEvaluationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageObjectDetectionEvaluationMetrics.Unmarshal(m, b)
 }
 func (m *ImageObjectDetectionEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageObjectDetectionEvaluationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *ImageObjectDetectionEvaluationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageObjectDetectionEvaluationMetrics.Merge(dst, src)
+func (m *ImageObjectDetectionEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageObjectDetectionEvaluationMetrics.Merge(m, src)
 }
 func (m *ImageObjectDetectionEvaluationMetrics) XXX_Size() int {
 	return xxx_messageInfo_ImageObjectDetectionEvaluationMetrics.Size(m)
@@ -277,10 +284,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/detection.proto", fileDescriptor_detection_fc1cbf42da607929)
+	proto.RegisterFile("google/cloud/automl/v1beta1/detection.proto", fileDescriptor_85c92c72aeb2dfbd)
 }
 
-var fileDescriptor_detection_fc1cbf42da607929 = []byte{
+var fileDescriptor_85c92c72aeb2dfbd = []byte{
 	// 537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xc1, 0x6e, 0xd3, 0x4c,
 	0x10, 0x96, 0x9d, 0xbf, 0xfd, 0x61, 0x5b, 0x2e, 0x4b, 0x55, 0xd2, 0x34, 0x6a, 0xab, 0x56, 0x48,
diff --git a/googleapis/cloud/automl/v1beta1/geometry.pb.go b/googleapis/cloud/automl/v1beta1/geometry.pb.go
index 41a479155a..172e4db4be 100644
--- a/googleapis/cloud/automl/v1beta1/geometry.pb.go
+++ b/googleapis/cloud/automl/v1beta1/geometry.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/geometry.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A vertex represents a 2D point in the image.
 // The normalized vertex coordinates are between 0 to 1 fractions relative to
@@ -38,16 +41,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_693f597e33c64c76, []int{0}
+	return fileDescriptor_cbaead6fc80bf3a2, []int{0}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -87,16 +91,17 @@ func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
 func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*BoundingPoly) ProtoMessage()    {}
 func (*BoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_693f597e33c64c76, []int{1}
+	return fileDescriptor_cbaead6fc80bf3a2, []int{1}
 }
+
 func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
 }
 func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+func (m *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(m, src)
 }
 func (m *BoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_BoundingPoly.Size(m)
@@ -120,10 +125,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/geometry.proto", fileDescriptor_geometry_693f597e33c64c76)
+	proto.RegisterFile("google/cloud/automl/v1beta1/geometry.proto", fileDescriptor_cbaead6fc80bf3a2)
 }
 
-var fileDescriptor_geometry_693f597e33c64c76 = []byte{
+var fileDescriptor_cbaead6fc80bf3a2 = []byte{
 	// 260 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4b, 0xc3, 0x30,
 	0x14, 0xc7, 0x49, 0x05, 0x0f, 0x71, 0x07, 0xa9, 0x97, 0xe2, 0x04, 0xc7, 0x4e, 0x43, 0x30, 0x61,
diff --git a/googleapis/cloud/automl/v1beta1/image.pb.go b/googleapis/cloud/automl/v1beta1/image.pb.go
index 18bbfc67a0..280ec86036 100644
--- a/googleapis/cloud/automl/v1beta1/image.pb.go
+++ b/googleapis/cloud/automl/v1beta1/image.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/image.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Dataset metadata that is specific to image classification.
 type ImageClassificationDatasetMetadata struct {
@@ -33,16 +36,17 @@ func (m *ImageClassificationDatasetMetadata) Reset()         { *m = ImageClassif
 func (m *ImageClassificationDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImageClassificationDatasetMetadata) ProtoMessage()    {}
 func (*ImageClassificationDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_b1aa6fd5524822c5, []int{0}
+	return fileDescriptor_29b9f2bc900da869, []int{0}
 }
+
 func (m *ImageClassificationDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageClassificationDatasetMetadata.Unmarshal(m, b)
 }
 func (m *ImageClassificationDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageClassificationDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImageClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageClassificationDatasetMetadata.Merge(dst, src)
+func (m *ImageClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageClassificationDatasetMetadata.Merge(m, src)
 }
 func (m *ImageClassificationDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImageClassificationDatasetMetadata.Size(m)
@@ -71,16 +75,17 @@ func (m *ImageObjectDetectionDatasetMetadata) Reset()         { *m = ImageObject
 func (m *ImageObjectDetectionDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImageObjectDetectionDatasetMetadata) ProtoMessage()    {}
 func (*ImageObjectDetectionDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_b1aa6fd5524822c5, []int{1}
+	return fileDescriptor_29b9f2bc900da869, []int{1}
 }
+
 func (m *ImageObjectDetectionDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageObjectDetectionDatasetMetadata.Unmarshal(m, b)
 }
 func (m *ImageObjectDetectionDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageObjectDetectionDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImageObjectDetectionDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageObjectDetectionDatasetMetadata.Merge(dst, src)
+func (m *ImageObjectDetectionDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageObjectDetectionDatasetMetadata.Merge(m, src)
 }
 func (m *ImageObjectDetectionDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImageObjectDetectionDatasetMetadata.Size(m)
@@ -152,16 +157,17 @@ func (m *ImageClassificationModelMetadata) Reset()         { *m = ImageClassific
 func (m *ImageClassificationModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImageClassificationModelMetadata) ProtoMessage()    {}
 func (*ImageClassificationModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_b1aa6fd5524822c5, []int{2}
+	return fileDescriptor_29b9f2bc900da869, []int{2}
 }
+
 func (m *ImageClassificationModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageClassificationModelMetadata.Unmarshal(m, b)
 }
 func (m *ImageClassificationModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageClassificationModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImageClassificationModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageClassificationModelMetadata.Merge(dst, src)
+func (m *ImageClassificationModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageClassificationModelMetadata.Merge(m, src)
 }
 func (m *ImageClassificationModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImageClassificationModelMetadata.Size(m)
@@ -234,16 +240,17 @@ func (m *ImageObjectDetectionModelMetadata) Reset()         { *m = ImageObjectDe
 func (m *ImageObjectDetectionModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImageObjectDetectionModelMetadata) ProtoMessage()    {}
 func (*ImageObjectDetectionModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_b1aa6fd5524822c5, []int{3}
+	return fileDescriptor_29b9f2bc900da869, []int{3}
 }
+
 func (m *ImageObjectDetectionModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageObjectDetectionModelMetadata.Unmarshal(m, b)
 }
 func (m *ImageObjectDetectionModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageObjectDetectionModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImageObjectDetectionModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageObjectDetectionModelMetadata.Merge(dst, src)
+func (m *ImageObjectDetectionModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageObjectDetectionModelMetadata.Merge(m, src)
 }
 func (m *ImageObjectDetectionModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImageObjectDetectionModelMetadata.Size(m)
@@ -297,16 +304,17 @@ func (m *ImageObjectDetectionModelDeploymentMetadata) String() string {
 }
 func (*ImageObjectDetectionModelDeploymentMetadata) ProtoMessage() {}
 func (*ImageObjectDetectionModelDeploymentMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_b1aa6fd5524822c5, []int{4}
+	return fileDescriptor_29b9f2bc900da869, []int{4}
 }
+
 func (m *ImageObjectDetectionModelDeploymentMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageObjectDetectionModelDeploymentMetadata.Unmarshal(m, b)
 }
 func (m *ImageObjectDetectionModelDeploymentMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageObjectDetectionModelDeploymentMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImageObjectDetectionModelDeploymentMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageObjectDetectionModelDeploymentMetadata.Merge(dst, src)
+func (m *ImageObjectDetectionModelDeploymentMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageObjectDetectionModelDeploymentMetadata.Merge(m, src)
 }
 func (m *ImageObjectDetectionModelDeploymentMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImageObjectDetectionModelDeploymentMetadata.Size(m)
@@ -333,10 +341,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/image.proto", fileDescriptor_image_b1aa6fd5524822c5)
+	proto.RegisterFile("google/cloud/automl/v1beta1/image.proto", fileDescriptor_29b9f2bc900da869)
 }
 
-var fileDescriptor_image_b1aa6fd5524822c5 = []byte{
+var fileDescriptor_29b9f2bc900da869 = []byte{
 	// 458 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xd1, 0x6b, 0xd4, 0x40,
 	0x10, 0xc6, 0xd9, 0x56, 0xad, 0xdd, 0x53, 0x1f, 0xe2, 0x4b, 0x6c, 0x95, 0xbb, 0x46, 0xc4, 0x03,
diff --git a/googleapis/cloud/automl/v1beta1/io.pb.go b/googleapis/cloud/automl/v1beta1/io.pb.go
index d0f3971d79..9ac4c4afe8 100644
--- a/googleapis/cloud/automl/v1beta1/io.pb.go
+++ b/googleapis/cloud/automl/v1beta1/io.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/io.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Input configuration for ImportData Action.
 //
@@ -269,16 +272,17 @@ func (m *InputConfig) Reset()         { *m = InputConfig{} }
 func (m *InputConfig) String() string { return proto.CompactTextString(m) }
 func (*InputConfig) ProtoMessage()    {}
 func (*InputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{0}
+	return fileDescriptor_6e2d768504aa30d7, []int{0}
 }
+
 func (m *InputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
 }
 func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputConfig.Merge(dst, src)
+func (m *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(m, src)
 }
 func (m *InputConfig) XXX_Size() int {
 	return xxx_messageInfo_InputConfig.Size(m)
@@ -333,80 +337,14 @@ func (m *InputConfig) GetParams() map[string]string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*InputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _InputConfig_OneofMarshaler, _InputConfig_OneofUnmarshaler, _InputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*InputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*InputConfig_GcsSource)(nil),
 		(*InputConfig_BigquerySource)(nil),
 	}
 }
 
-func _InputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*InputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *InputConfig_GcsSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case *InputConfig_BigquerySource:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigquerySource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("InputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _InputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*InputConfig)
-	switch tag {
-	case 1: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &InputConfig_GcsSource{msg}
-		return true, err
-	case 3: // source.bigquery_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQuerySource)
-		err := b.DecodeMessage(msg)
-		m.Source = &InputConfig_BigquerySource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _InputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*InputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *InputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *InputConfig_BigquerySource:
-		s := proto.Size(x.BigquerySource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Input configuration for BatchPredict Action.
 //
 // The format of input depends on the ML problem of the model used for
@@ -545,16 +483,17 @@ func (m *BatchPredictInputConfig) Reset()         { *m = BatchPredictInputConfig
 func (m *BatchPredictInputConfig) String() string { return proto.CompactTextString(m) }
 func (*BatchPredictInputConfig) ProtoMessage()    {}
 func (*BatchPredictInputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{1}
+	return fileDescriptor_6e2d768504aa30d7, []int{1}
 }
+
 func (m *BatchPredictInputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchPredictInputConfig.Unmarshal(m, b)
 }
 func (m *BatchPredictInputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchPredictInputConfig.Marshal(b, m, deterministic)
 }
-func (dst *BatchPredictInputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchPredictInputConfig.Merge(dst, src)
+func (m *BatchPredictInputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchPredictInputConfig.Merge(m, src)
 }
 func (m *BatchPredictInputConfig) XXX_Size() int {
 	return xxx_messageInfo_BatchPredictInputConfig.Size(m)
@@ -602,80 +541,14 @@ func (m *BatchPredictInputConfig) GetBigquerySource() *BigQuerySource {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchPredictInputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchPredictInputConfig_OneofMarshaler, _BatchPredictInputConfig_OneofUnmarshaler, _BatchPredictInputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchPredictInputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchPredictInputConfig_GcsSource)(nil),
 		(*BatchPredictInputConfig_BigquerySource)(nil),
 	}
 }
 
-func _BatchPredictInputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchPredictInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *BatchPredictInputConfig_GcsSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case *BatchPredictInputConfig_BigquerySource:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigquerySource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchPredictInputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchPredictInputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchPredictInputConfig)
-	switch tag {
-	case 1: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &BatchPredictInputConfig_GcsSource{msg}
-		return true, err
-	case 2: // source.bigquery_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQuerySource)
-		err := b.DecodeMessage(msg)
-		m.Source = &BatchPredictInputConfig_BigquerySource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchPredictInputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchPredictInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *BatchPredictInputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BatchPredictInputConfig_BigquerySource:
-		s := proto.Size(x.BigquerySource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Input configuration of a [Document][google.cloud.automl.v1beta1.Document].
 type DocumentInputConfig struct {
 	// The Google Cloud Storage location of the document file. Only a single path
@@ -692,16 +565,17 @@ func (m *DocumentInputConfig) Reset()         { *m = DocumentInputConfig{} }
 func (m *DocumentInputConfig) String() string { return proto.CompactTextString(m) }
 func (*DocumentInputConfig) ProtoMessage()    {}
 func (*DocumentInputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{2}
+	return fileDescriptor_6e2d768504aa30d7, []int{2}
 }
+
 func (m *DocumentInputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentInputConfig.Unmarshal(m, b)
 }
 func (m *DocumentInputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentInputConfig.Marshal(b, m, deterministic)
 }
-func (dst *DocumentInputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentInputConfig.Merge(dst, src)
+func (m *DocumentInputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentInputConfig.Merge(m, src)
 }
 func (m *DocumentInputConfig) XXX_Size() int {
 	return xxx_messageInfo_DocumentInputConfig.Size(m)
@@ -798,16 +672,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{3}
+	return fileDescriptor_6e2d768504aa30d7, []int{3}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -855,80 +730,14 @@ func (m *OutputConfig) GetBigqueryDestination() *BigQueryDestination {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputConfig_OneofMarshaler, _OutputConfig_OneofUnmarshaler, _OutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OutputConfig_GcsDestination)(nil),
 		(*OutputConfig_BigqueryDestination)(nil),
 	}
 }
 
-func _OutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDestination); err != nil {
-			return err
-		}
-	case *OutputConfig_BigqueryDestination:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigqueryDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputConfig)
-	switch tag {
-	case 1: // destination.gcs_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &OutputConfig_GcsDestination{msg}
-		return true, err
-	case 2: // destination.bigquery_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &OutputConfig_BigqueryDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		s := proto.Size(x.GcsDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OutputConfig_BigqueryDestination:
-		s := proto.Size(x.BigqueryDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Output configuration for BatchPredict Action.
 //
 // As destination the
@@ -1105,16 +914,17 @@ func (m *BatchPredictOutputConfig) Reset()         { *m = BatchPredictOutputConf
 func (m *BatchPredictOutputConfig) String() string { return proto.CompactTextString(m) }
 func (*BatchPredictOutputConfig) ProtoMessage()    {}
 func (*BatchPredictOutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{4}
+	return fileDescriptor_6e2d768504aa30d7, []int{4}
 }
+
 func (m *BatchPredictOutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchPredictOutputConfig.Unmarshal(m, b)
 }
 func (m *BatchPredictOutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchPredictOutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *BatchPredictOutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchPredictOutputConfig.Merge(dst, src)
+func (m *BatchPredictOutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchPredictOutputConfig.Merge(m, src)
 }
 func (m *BatchPredictOutputConfig) XXX_Size() int {
 	return xxx_messageInfo_BatchPredictOutputConfig.Size(m)
@@ -1162,80 +972,14 @@ func (m *BatchPredictOutputConfig) GetBigqueryDestination() *BigQueryDestination
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchPredictOutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchPredictOutputConfig_OneofMarshaler, _BatchPredictOutputConfig_OneofUnmarshaler, _BatchPredictOutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchPredictOutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchPredictOutputConfig_GcsDestination)(nil),
 		(*BatchPredictOutputConfig_BigqueryDestination)(nil),
 	}
 }
 
-func _BatchPredictOutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchPredictOutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *BatchPredictOutputConfig_GcsDestination:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDestination); err != nil {
-			return err
-		}
-	case *BatchPredictOutputConfig_BigqueryDestination:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigqueryDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchPredictOutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchPredictOutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchPredictOutputConfig)
-	switch tag {
-	case 1: // destination.gcs_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &BatchPredictOutputConfig_GcsDestination{msg}
-		return true, err
-	case 2: // destination.bigquery_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &BatchPredictOutputConfig_BigqueryDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchPredictOutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchPredictOutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *BatchPredictOutputConfig_GcsDestination:
-		s := proto.Size(x.GcsDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BatchPredictOutputConfig_BigqueryDestination:
-		s := proto.Size(x.BigqueryDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Output configuration for ModelExport Action.
 type ModelExportOutputConfig struct {
 	// Required. The destination of the output.
@@ -1284,16 +1028,17 @@ func (m *ModelExportOutputConfig) Reset()         { *m = ModelExportOutputConfig
 func (m *ModelExportOutputConfig) String() string { return proto.CompactTextString(m) }
 func (*ModelExportOutputConfig) ProtoMessage()    {}
 func (*ModelExportOutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{5}
+	return fileDescriptor_6e2d768504aa30d7, []int{5}
 }
+
 func (m *ModelExportOutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModelExportOutputConfig.Unmarshal(m, b)
 }
 func (m *ModelExportOutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModelExportOutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *ModelExportOutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModelExportOutputConfig.Merge(dst, src)
+func (m *ModelExportOutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModelExportOutputConfig.Merge(m, src)
 }
 func (m *ModelExportOutputConfig) XXX_Size() int {
 	return xxx_messageInfo_ModelExportOutputConfig.Size(m)
@@ -1355,80 +1100,14 @@ func (m *ModelExportOutputConfig) GetParams() map[string]string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ModelExportOutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ModelExportOutputConfig_OneofMarshaler, _ModelExportOutputConfig_OneofUnmarshaler, _ModelExportOutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ModelExportOutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ModelExportOutputConfig_GcsDestination)(nil),
 		(*ModelExportOutputConfig_GcrDestination)(nil),
 	}
 }
 
-func _ModelExportOutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ModelExportOutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *ModelExportOutputConfig_GcsDestination:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDestination); err != nil {
-			return err
-		}
-	case *ModelExportOutputConfig_GcrDestination:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcrDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ModelExportOutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ModelExportOutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ModelExportOutputConfig)
-	switch tag {
-	case 1: // destination.gcs_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &ModelExportOutputConfig_GcsDestination{msg}
-		return true, err
-	case 3: // destination.gcr_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcrDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &ModelExportOutputConfig_GcrDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ModelExportOutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ModelExportOutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *ModelExportOutputConfig_GcsDestination:
-		s := proto.Size(x.GcsDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModelExportOutputConfig_GcrDestination:
-		s := proto.Size(x.GcrDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Output configuration for ExportEvaluatedExamples Action. Note that this call
 // is available only for 30 days since the moment the model was evaluated.
 // The output depends on the domain, as follows (note that only examples from
@@ -1474,16 +1153,17 @@ func (m *ExportEvaluatedExamplesOutputConfig) Reset()         { *m = ExportEvalu
 func (m *ExportEvaluatedExamplesOutputConfig) String() string { return proto.CompactTextString(m) }
 func (*ExportEvaluatedExamplesOutputConfig) ProtoMessage()    {}
 func (*ExportEvaluatedExamplesOutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{6}
+	return fileDescriptor_6e2d768504aa30d7, []int{6}
 }
+
 func (m *ExportEvaluatedExamplesOutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEvaluatedExamplesOutputConfig.Unmarshal(m, b)
 }
 func (m *ExportEvaluatedExamplesOutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEvaluatedExamplesOutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *ExportEvaluatedExamplesOutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEvaluatedExamplesOutputConfig.Merge(dst, src)
+func (m *ExportEvaluatedExamplesOutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEvaluatedExamplesOutputConfig.Merge(m, src)
 }
 func (m *ExportEvaluatedExamplesOutputConfig) XXX_Size() int {
 	return xxx_messageInfo_ExportEvaluatedExamplesOutputConfig.Size(m)
@@ -1519,61 +1199,13 @@ func (m *ExportEvaluatedExamplesOutputConfig) GetBigqueryDestination() *BigQuery
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExportEvaluatedExamplesOutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExportEvaluatedExamplesOutputConfig_OneofMarshaler, _ExportEvaluatedExamplesOutputConfig_OneofUnmarshaler, _ExportEvaluatedExamplesOutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExportEvaluatedExamplesOutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExportEvaluatedExamplesOutputConfig_BigqueryDestination)(nil),
 	}
 }
 
-func _ExportEvaluatedExamplesOutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExportEvaluatedExamplesOutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *ExportEvaluatedExamplesOutputConfig_BigqueryDestination:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigqueryDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ExportEvaluatedExamplesOutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExportEvaluatedExamplesOutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExportEvaluatedExamplesOutputConfig)
-	switch tag {
-	case 2: // destination.bigquery_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &ExportEvaluatedExamplesOutputConfig_BigqueryDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExportEvaluatedExamplesOutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExportEvaluatedExamplesOutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *ExportEvaluatedExamplesOutputConfig_BigqueryDestination:
-		s := proto.Size(x.BigqueryDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The Google Cloud Storage location for the input content.
 type GcsSource struct {
 	// Required. Google Cloud Storage URIs to input files, up to 2000 characters
@@ -1589,16 +1221,17 @@ func (m *GcsSource) Reset()         { *m = GcsSource{} }
 func (m *GcsSource) String() string { return proto.CompactTextString(m) }
 func (*GcsSource) ProtoMessage()    {}
 func (*GcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{7}
+	return fileDescriptor_6e2d768504aa30d7, []int{7}
 }
+
 func (m *GcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
 }
 func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
 }
-func (dst *GcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsSource.Merge(dst, src)
+func (m *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(m, src)
 }
 func (m *GcsSource) XXX_Size() int {
 	return xxx_messageInfo_GcsSource.Size(m)
@@ -1631,16 +1264,17 @@ func (m *BigQuerySource) Reset()         { *m = BigQuerySource{} }
 func (m *BigQuerySource) String() string { return proto.CompactTextString(m) }
 func (*BigQuerySource) ProtoMessage()    {}
 func (*BigQuerySource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{8}
+	return fileDescriptor_6e2d768504aa30d7, []int{8}
 }
+
 func (m *BigQuerySource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQuerySource.Unmarshal(m, b)
 }
 func (m *BigQuerySource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQuerySource.Marshal(b, m, deterministic)
 }
-func (dst *BigQuerySource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQuerySource.Merge(dst, src)
+func (m *BigQuerySource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQuerySource.Merge(m, src)
 }
 func (m *BigQuerySource) XXX_Size() int {
 	return xxx_messageInfo_BigQuerySource.Size(m)
@@ -1676,16 +1310,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{9}
+	return fileDescriptor_6e2d768504aa30d7, []int{9}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -1718,16 +1353,17 @@ func (m *BigQueryDestination) Reset()         { *m = BigQueryDestination{} }
 func (m *BigQueryDestination) String() string { return proto.CompactTextString(m) }
 func (*BigQueryDestination) ProtoMessage()    {}
 func (*BigQueryDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{10}
+	return fileDescriptor_6e2d768504aa30d7, []int{10}
 }
+
 func (m *BigQueryDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryDestination.Unmarshal(m, b)
 }
 func (m *BigQueryDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryDestination.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryDestination.Merge(dst, src)
+func (m *BigQueryDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryDestination.Merge(m, src)
 }
 func (m *BigQueryDestination) XXX_Size() int {
 	return xxx_messageInfo_BigQueryDestination.Size(m)
@@ -1768,16 +1404,17 @@ func (m *GcrDestination) Reset()         { *m = GcrDestination{} }
 func (m *GcrDestination) String() string { return proto.CompactTextString(m) }
 func (*GcrDestination) ProtoMessage()    {}
 func (*GcrDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_io_bc3ab7a921debf0e, []int{11}
+	return fileDescriptor_6e2d768504aa30d7, []int{11}
 }
+
 func (m *GcrDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcrDestination.Unmarshal(m, b)
 }
 func (m *GcrDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcrDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcrDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcrDestination.Merge(dst, src)
+func (m *GcrDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcrDestination.Merge(m, src)
 }
 func (m *GcrDestination) XXX_Size() int {
 	return xxx_messageInfo_GcrDestination.Size(m)
@@ -1813,10 +1450,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/io.proto", fileDescriptor_io_bc3ab7a921debf0e)
+	proto.RegisterFile("google/cloud/automl/v1beta1/io.proto", fileDescriptor_6e2d768504aa30d7)
 }
 
-var fileDescriptor_io_bc3ab7a921debf0e = []byte{
+var fileDescriptor_6e2d768504aa30d7 = []byte{
 	// 630 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x96, 0xcf, 0x6e, 0xd3, 0x4c,
 	0x14, 0xc5, 0x3f, 0xdb, 0x1f, 0x55, 0x7d, 0x5d, 0x5a, 0x70, 0x2b, 0xd5, 0x6a, 0x41, 0x14, 0x83,
diff --git a/googleapis/cloud/automl/v1beta1/model.pb.go b/googleapis/cloud/automl/v1beta1/model.pb.go
index 45b8cd4fee..938c7c812e 100644
--- a/googleapis/cloud/automl/v1beta1/model.pb.go
+++ b/googleapis/cloud/automl/v1beta1/model.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/model.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Deployment state of the model.
 type Model_DeploymentState int32
@@ -37,6 +40,7 @@ var Model_DeploymentState_name = map[int32]string{
 	1: "DEPLOYED",
 	2: "UNDEPLOYED",
 }
+
 var Model_DeploymentState_value = map[string]int32{
 	"DEPLOYMENT_STATE_UNSPECIFIED": 0,
 	"DEPLOYED":                     1,
@@ -46,8 +50,9 @@ var Model_DeploymentState_value = map[string]int32{
 func (x Model_DeploymentState) String() string {
 	return proto.EnumName(Model_DeploymentState_name, int32(x))
 }
+
 func (Model_DeploymentState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_model_9828559028c2521f, []int{0, 0}
+	return fileDescriptor_27c9ed3a1b40360b, []int{0, 0}
 }
 
 // API proto representing a trained machine learning model.
@@ -97,16 +102,17 @@ func (m *Model) Reset()         { *m = Model{} }
 func (m *Model) String() string { return proto.CompactTextString(m) }
 func (*Model) ProtoMessage()    {}
 func (*Model) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_9828559028c2521f, []int{0}
+	return fileDescriptor_27c9ed3a1b40360b, []int{0}
 }
+
 func (m *Model) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model.Unmarshal(m, b)
 }
 func (m *Model) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model.Marshal(b, m, deterministic)
 }
-func (dst *Model) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model.Merge(dst, src)
+func (m *Model) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model.Merge(m, src)
 }
 func (m *Model) XXX_Size() int {
 	return xxx_messageInfo_Model.Size(m)
@@ -274,9 +280,9 @@ func (m *Model) GetDeploymentState() Model_DeploymentState {
 	return Model_DEPLOYMENT_STATE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Model) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Model_OneofMarshaler, _Model_OneofUnmarshaler, _Model_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Model) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Model_TranslationModelMetadata)(nil),
 		(*Model_ImageClassificationModelMetadata)(nil),
 		(*Model_TextClassificationModelMetadata)(nil),
@@ -288,190 +294,16 @@ func (*Model) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Model_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Model)
-	// model_metadata
-	switch x := m.ModelMetadata.(type) {
-	case *Model_TranslationModelMetadata:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TranslationModelMetadata); err != nil {
-			return err
-		}
-	case *Model_ImageClassificationModelMetadata:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageClassificationModelMetadata); err != nil {
-			return err
-		}
-	case *Model_TextClassificationModelMetadata:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextClassificationModelMetadata); err != nil {
-			return err
-		}
-	case *Model_ImageObjectDetectionModelMetadata:
-		b.EncodeVarint(20<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageObjectDetectionModelMetadata); err != nil {
-			return err
-		}
-	case *Model_VideoClassificationModelMetadata:
-		b.EncodeVarint(23<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoClassificationModelMetadata); err != nil {
-			return err
-		}
-	case *Model_TextExtractionModelMetadata:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextExtractionModelMetadata); err != nil {
-			return err
-		}
-	case *Model_TablesModelMetadata:
-		b.EncodeVarint(24<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TablesModelMetadata); err != nil {
-			return err
-		}
-	case *Model_TextSentimentModelMetadata:
-		b.EncodeVarint(22<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextSentimentModelMetadata); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Model.ModelMetadata has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Model_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Model)
-	switch tag {
-	case 15: // model_metadata.translation_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TranslationModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_TranslationModelMetadata{msg}
-		return true, err
-	case 13: // model_metadata.image_classification_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageClassificationModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_ImageClassificationModelMetadata{msg}
-		return true, err
-	case 14: // model_metadata.text_classification_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextClassificationModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_TextClassificationModelMetadata{msg}
-		return true, err
-	case 20: // model_metadata.image_object_detection_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageObjectDetectionModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_ImageObjectDetectionModelMetadata{msg}
-		return true, err
-	case 23: // model_metadata.video_classification_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoClassificationModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_VideoClassificationModelMetadata{msg}
-		return true, err
-	case 19: // model_metadata.text_extraction_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextExtractionModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_TextExtractionModelMetadata{msg}
-		return true, err
-	case 24: // model_metadata.tables_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TablesModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_TablesModelMetadata{msg}
-		return true, err
-	case 22: // model_metadata.text_sentiment_model_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextSentimentModelMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelMetadata = &Model_TextSentimentModelMetadata{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Model_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Model)
-	// model_metadata
-	switch x := m.ModelMetadata.(type) {
-	case *Model_TranslationModelMetadata:
-		s := proto.Size(x.TranslationModelMetadata)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_ImageClassificationModelMetadata:
-		s := proto.Size(x.ImageClassificationModelMetadata)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_TextClassificationModelMetadata:
-		s := proto.Size(x.TextClassificationModelMetadata)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_ImageObjectDetectionModelMetadata:
-		s := proto.Size(x.ImageObjectDetectionModelMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_VideoClassificationModelMetadata:
-		s := proto.Size(x.VideoClassificationModelMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_TextExtractionModelMetadata:
-		s := proto.Size(x.TextExtractionModelMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_TablesModelMetadata:
-		s := proto.Size(x.TablesModelMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_TextSentimentModelMetadata:
-		s := proto.Size(x.TextSentimentModelMetadata)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
-	proto.RegisterType((*Model)(nil), "google.cloud.automl.v1beta1.Model")
 	proto.RegisterEnum("google.cloud.automl.v1beta1.Model_DeploymentState", Model_DeploymentState_name, Model_DeploymentState_value)
+	proto.RegisterType((*Model)(nil), "google.cloud.automl.v1beta1.Model")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/model.proto", fileDescriptor_model_9828559028c2521f)
+	proto.RegisterFile("google/cloud/automl/v1beta1/model.proto", fileDescriptor_27c9ed3a1b40360b)
 }
 
-var fileDescriptor_model_9828559028c2521f = []byte{
+var fileDescriptor_27c9ed3a1b40360b = []byte{
 	// 673 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0x6f, 0x4f, 0xd3, 0x5e,
 	0x14, 0xc7, 0x29, 0xbf, 0x9f, 0x0a, 0x77, 0x38, 0x96, 0x8b, 0x7f, 0x9a, 0x01, 0x32, 0x30, 0xea,
diff --git a/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go b/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
index b21dadb2ca..f3470e2a29 100644
--- a/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
+++ b/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/model_evaluation.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Evaluation results of a model.
 type ModelEvaluation struct {
@@ -78,16 +81,17 @@ func (m *ModelEvaluation) Reset()         { *m = ModelEvaluation{} }
 func (m *ModelEvaluation) String() string { return proto.CompactTextString(m) }
 func (*ModelEvaluation) ProtoMessage()    {}
 func (*ModelEvaluation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_evaluation_c883823b7cd2bdc7, []int{0}
+	return fileDescriptor_2d3cea51cfd5443a, []int{0}
 }
+
 func (m *ModelEvaluation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModelEvaluation.Unmarshal(m, b)
 }
 func (m *ModelEvaluation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModelEvaluation.Marshal(b, m, deterministic)
 }
-func (dst *ModelEvaluation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModelEvaluation.Merge(dst, src)
+func (m *ModelEvaluation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModelEvaluation.Merge(m, src)
 }
 func (m *ModelEvaluation) XXX_Size() int {
 	return xxx_messageInfo_ModelEvaluation.Size(m)
@@ -222,9 +226,9 @@ func (m *ModelEvaluation) GetEvaluatedExampleCount() int32 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ModelEvaluation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ModelEvaluation_OneofMarshaler, _ModelEvaluation_OneofUnmarshaler, _ModelEvaluation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ModelEvaluation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ModelEvaluation_ClassificationEvaluationMetrics)(nil),
 		(*ModelEvaluation_RegressionEvaluationMetrics)(nil),
 		(*ModelEvaluation_TranslationEvaluationMetrics)(nil),
@@ -234,153 +238,15 @@ func (*ModelEvaluation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffe
 	}
 }
 
-func _ModelEvaluation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ModelEvaluation)
-	// metrics
-	switch x := m.Metrics.(type) {
-	case *ModelEvaluation_ClassificationEvaluationMetrics:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ClassificationEvaluationMetrics); err != nil {
-			return err
-		}
-	case *ModelEvaluation_RegressionEvaluationMetrics:
-		b.EncodeVarint(24<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RegressionEvaluationMetrics); err != nil {
-			return err
-		}
-	case *ModelEvaluation_TranslationEvaluationMetrics:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TranslationEvaluationMetrics); err != nil {
-			return err
-		}
-	case *ModelEvaluation_ImageObjectDetectionEvaluationMetrics:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageObjectDetectionEvaluationMetrics); err != nil {
-			return err
-		}
-	case *ModelEvaluation_TextSentimentEvaluationMetrics:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextSentimentEvaluationMetrics); err != nil {
-			return err
-		}
-	case *ModelEvaluation_TextExtractionEvaluationMetrics:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextExtractionEvaluationMetrics); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ModelEvaluation.Metrics has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ModelEvaluation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ModelEvaluation)
-	switch tag {
-	case 8: // metrics.classification_evaluation_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ClassificationEvaluationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &ModelEvaluation_ClassificationEvaluationMetrics{msg}
-		return true, err
-	case 24: // metrics.regression_evaluation_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RegressionEvaluationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &ModelEvaluation_RegressionEvaluationMetrics{msg}
-		return true, err
-	case 9: // metrics.translation_evaluation_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TranslationEvaluationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &ModelEvaluation_TranslationEvaluationMetrics{msg}
-		return true, err
-	case 12: // metrics.image_object_detection_evaluation_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageObjectDetectionEvaluationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &ModelEvaluation_ImageObjectDetectionEvaluationMetrics{msg}
-		return true, err
-	case 11: // metrics.text_sentiment_evaluation_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextSentimentEvaluationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &ModelEvaluation_TextSentimentEvaluationMetrics{msg}
-		return true, err
-	case 13: // metrics.text_extraction_evaluation_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextExtractionEvaluationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &ModelEvaluation_TextExtractionEvaluationMetrics{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ModelEvaluation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ModelEvaluation)
-	// metrics
-	switch x := m.Metrics.(type) {
-	case *ModelEvaluation_ClassificationEvaluationMetrics:
-		s := proto.Size(x.ClassificationEvaluationMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModelEvaluation_RegressionEvaluationMetrics:
-		s := proto.Size(x.RegressionEvaluationMetrics)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModelEvaluation_TranslationEvaluationMetrics:
-		s := proto.Size(x.TranslationEvaluationMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModelEvaluation_ImageObjectDetectionEvaluationMetrics:
-		s := proto.Size(x.ImageObjectDetectionEvaluationMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModelEvaluation_TextSentimentEvaluationMetrics:
-		s := proto.Size(x.TextSentimentEvaluationMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ModelEvaluation_TextExtractionEvaluationMetrics:
-		s := proto.Size(x.TextExtractionEvaluationMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*ModelEvaluation)(nil), "google.cloud.automl.v1beta1.ModelEvaluation")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/model_evaluation.proto", fileDescriptor_model_evaluation_c883823b7cd2bdc7)
+	proto.RegisterFile("google/cloud/automl/v1beta1/model_evaluation.proto", fileDescriptor_2d3cea51cfd5443a)
 }
 
-var fileDescriptor_model_evaluation_c883823b7cd2bdc7 = []byte{
+var fileDescriptor_2d3cea51cfd5443a = []byte{
 	// 595 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x41, 0x6b, 0xd4, 0x40,
 	0x14, 0xc7, 0x4d, 0xb1, 0xb5, 0x9d, 0xad, 0x54, 0x06, 0xc4, 0xb0, 0xad, 0xed, 0x6e, 0x41, 0x58,
diff --git a/googleapis/cloud/automl/v1beta1/operations.pb.go b/googleapis/cloud/automl/v1beta1/operations.pb.go
index 5706a905ee..308933cbbd 100644
--- a/googleapis/cloud/automl/v1beta1/operations.pb.go
+++ b/googleapis/cloud/automl/v1beta1/operations.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/operations.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Metadata used across all long running operations returned by AutoML API.
 type OperationMetadata struct {
@@ -59,16 +62,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{0}
+	return fileDescriptor_07afd87baa9bfac3, []int{0}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -235,9 +239,9 @@ func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OperationMetadata) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OperationMetadata_OneofMarshaler, _OperationMetadata_OneofUnmarshaler, _OperationMetadata_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OperationMetadata) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OperationMetadata_DeleteDetails)(nil),
 		(*OperationMetadata_DeployModelDetails)(nil),
 		(*OperationMetadata_UndeployModelDetails)(nil),
@@ -250,198 +254,6 @@ func (*OperationMetadata) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _OperationMetadata_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OperationMetadata)
-	// details
-	switch x := m.Details.(type) {
-	case *OperationMetadata_DeleteDetails:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeleteDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_DeployModelDetails:
-		b.EncodeVarint(24<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeployModelDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_UndeployModelDetails:
-		b.EncodeVarint(25<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UndeployModelDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_CreateModelDetails:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CreateModelDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_ImportDataDetails:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImportDataDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_BatchPredictDetails:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BatchPredictDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_ExportDataDetails:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExportDataDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_ExportModelDetails:
-		b.EncodeVarint(22<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExportModelDetails); err != nil {
-			return err
-		}
-	case *OperationMetadata_ExportEvaluatedExamplesDetails:
-		b.EncodeVarint(26<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExportEvaluatedExamplesDetails); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OperationMetadata.Details has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OperationMetadata_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OperationMetadata)
-	switch tag {
-	case 8: // details.delete_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DeleteOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_DeleteDetails{msg}
-		return true, err
-	case 24: // details.deploy_model_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DeployModelOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_DeployModelDetails{msg}
-		return true, err
-	case 25: // details.undeploy_model_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UndeployModelOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_UndeployModelDetails{msg}
-		return true, err
-	case 10: // details.create_model_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CreateModelOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_CreateModelDetails{msg}
-		return true, err
-	case 15: // details.import_data_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImportDataOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_ImportDataDetails{msg}
-		return true, err
-	case 16: // details.batch_predict_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BatchPredictOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_BatchPredictDetails{msg}
-		return true, err
-	case 21: // details.export_data_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExportDataOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_ExportDataDetails{msg}
-		return true, err
-	case 22: // details.export_model_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExportModelOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_ExportModelDetails{msg}
-		return true, err
-	case 26: // details.export_evaluated_examples_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExportEvaluatedExamplesOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &OperationMetadata_ExportEvaluatedExamplesDetails{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OperationMetadata_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OperationMetadata)
-	// details
-	switch x := m.Details.(type) {
-	case *OperationMetadata_DeleteDetails:
-		s := proto.Size(x.DeleteDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_DeployModelDetails:
-		s := proto.Size(x.DeployModelDetails)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_UndeployModelDetails:
-		s := proto.Size(x.UndeployModelDetails)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_CreateModelDetails:
-		s := proto.Size(x.CreateModelDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_ImportDataDetails:
-		s := proto.Size(x.ImportDataDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_BatchPredictDetails:
-		s := proto.Size(x.BatchPredictDetails)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_ExportDataDetails:
-		s := proto.Size(x.ExportDataDetails)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_ExportModelDetails:
-		s := proto.Size(x.ExportModelDetails)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OperationMetadata_ExportEvaluatedExamplesDetails:
-		s := proto.Size(x.ExportEvaluatedExamplesDetails)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Details of operations that perform deletes of any entities.
 type DeleteOperationMetadata struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -453,16 +265,17 @@ func (m *DeleteOperationMetadata) Reset()         { *m = DeleteOperationMetadata
 func (m *DeleteOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*DeleteOperationMetadata) ProtoMessage()    {}
 func (*DeleteOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{1}
+	return fileDescriptor_07afd87baa9bfac3, []int{1}
 }
+
 func (m *DeleteOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteOperationMetadata.Unmarshal(m, b)
 }
 func (m *DeleteOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *DeleteOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteOperationMetadata.Merge(dst, src)
+func (m *DeleteOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteOperationMetadata.Merge(m, src)
 }
 func (m *DeleteOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_DeleteOperationMetadata.Size(m)
@@ -484,16 +297,17 @@ func (m *DeployModelOperationMetadata) Reset()         { *m = DeployModelOperati
 func (m *DeployModelOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*DeployModelOperationMetadata) ProtoMessage()    {}
 func (*DeployModelOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{2}
+	return fileDescriptor_07afd87baa9bfac3, []int{2}
 }
+
 func (m *DeployModelOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeployModelOperationMetadata.Unmarshal(m, b)
 }
 func (m *DeployModelOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeployModelOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *DeployModelOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeployModelOperationMetadata.Merge(dst, src)
+func (m *DeployModelOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeployModelOperationMetadata.Merge(m, src)
 }
 func (m *DeployModelOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_DeployModelOperationMetadata.Size(m)
@@ -515,16 +329,17 @@ func (m *UndeployModelOperationMetadata) Reset()         { *m = UndeployModelOpe
 func (m *UndeployModelOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*UndeployModelOperationMetadata) ProtoMessage()    {}
 func (*UndeployModelOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{3}
+	return fileDescriptor_07afd87baa9bfac3, []int{3}
 }
+
 func (m *UndeployModelOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeployModelOperationMetadata.Unmarshal(m, b)
 }
 func (m *UndeployModelOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeployModelOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UndeployModelOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeployModelOperationMetadata.Merge(dst, src)
+func (m *UndeployModelOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeployModelOperationMetadata.Merge(m, src)
 }
 func (m *UndeployModelOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_UndeployModelOperationMetadata.Size(m)
@@ -546,16 +361,17 @@ func (m *CreateModelOperationMetadata) Reset()         { *m = CreateModelOperati
 func (m *CreateModelOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateModelOperationMetadata) ProtoMessage()    {}
 func (*CreateModelOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{4}
+	return fileDescriptor_07afd87baa9bfac3, []int{4}
 }
+
 func (m *CreateModelOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateModelOperationMetadata.Unmarshal(m, b)
 }
 func (m *CreateModelOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateModelOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateModelOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateModelOperationMetadata.Merge(dst, src)
+func (m *CreateModelOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateModelOperationMetadata.Merge(m, src)
 }
 func (m *CreateModelOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateModelOperationMetadata.Size(m)
@@ -577,16 +393,17 @@ func (m *ImportDataOperationMetadata) Reset()         { *m = ImportDataOperation
 func (m *ImportDataOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImportDataOperationMetadata) ProtoMessage()    {}
 func (*ImportDataOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{5}
+	return fileDescriptor_07afd87baa9bfac3, []int{5}
 }
+
 func (m *ImportDataOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDataOperationMetadata.Unmarshal(m, b)
 }
 func (m *ImportDataOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDataOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImportDataOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDataOperationMetadata.Merge(dst, src)
+func (m *ImportDataOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDataOperationMetadata.Merge(m, src)
 }
 func (m *ImportDataOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImportDataOperationMetadata.Size(m)
@@ -610,16 +427,17 @@ func (m *ExportDataOperationMetadata) Reset()         { *m = ExportDataOperation
 func (m *ExportDataOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportDataOperationMetadata) ProtoMessage()    {}
 func (*ExportDataOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{6}
+	return fileDescriptor_07afd87baa9bfac3, []int{6}
 }
+
 func (m *ExportDataOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDataOperationMetadata.Unmarshal(m, b)
 }
 func (m *ExportDataOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDataOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportDataOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDataOperationMetadata.Merge(dst, src)
+func (m *ExportDataOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDataOperationMetadata.Merge(m, src)
 }
 func (m *ExportDataOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportDataOperationMetadata.Size(m)
@@ -660,16 +478,17 @@ func (m *ExportDataOperationMetadata_ExportDataOutputInfo) String() string {
 }
 func (*ExportDataOperationMetadata_ExportDataOutputInfo) ProtoMessage() {}
 func (*ExportDataOperationMetadata_ExportDataOutputInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{6, 0}
+	return fileDescriptor_07afd87baa9bfac3, []int{6, 0}
 }
+
 func (m *ExportDataOperationMetadata_ExportDataOutputInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDataOperationMetadata_ExportDataOutputInfo.Unmarshal(m, b)
 }
 func (m *ExportDataOperationMetadata_ExportDataOutputInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDataOperationMetadata_ExportDataOutputInfo.Marshal(b, m, deterministic)
 }
-func (dst *ExportDataOperationMetadata_ExportDataOutputInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDataOperationMetadata_ExportDataOutputInfo.Merge(dst, src)
+func (m *ExportDataOperationMetadata_ExportDataOutputInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDataOperationMetadata_ExportDataOutputInfo.Merge(m, src)
 }
 func (m *ExportDataOperationMetadata_ExportDataOutputInfo) XXX_Size() int {
 	return xxx_messageInfo_ExportDataOperationMetadata_ExportDataOutputInfo.Size(m)
@@ -719,72 +538,14 @@ func (m *ExportDataOperationMetadata_ExportDataOutputInfo) GetBigqueryOutputData
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExportDataOperationMetadata_ExportDataOutputInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExportDataOperationMetadata_ExportDataOutputInfo_OneofMarshaler, _ExportDataOperationMetadata_ExportDataOutputInfo_OneofUnmarshaler, _ExportDataOperationMetadata_ExportDataOutputInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExportDataOperationMetadata_ExportDataOutputInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExportDataOperationMetadata_ExportDataOutputInfo_GcsOutputDirectory)(nil),
 		(*ExportDataOperationMetadata_ExportDataOutputInfo_BigqueryOutputDataset)(nil),
 	}
 }
 
-func _ExportDataOperationMetadata_ExportDataOutputInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExportDataOperationMetadata_ExportDataOutputInfo)
-	// output_location
-	switch x := m.OutputLocation.(type) {
-	case *ExportDataOperationMetadata_ExportDataOutputInfo_GcsOutputDirectory:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.GcsOutputDirectory)
-	case *ExportDataOperationMetadata_ExportDataOutputInfo_BigqueryOutputDataset:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.BigqueryOutputDataset)
-	case nil:
-	default:
-		return fmt.Errorf("ExportDataOperationMetadata_ExportDataOutputInfo.OutputLocation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExportDataOperationMetadata_ExportDataOutputInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExportDataOperationMetadata_ExportDataOutputInfo)
-	switch tag {
-	case 1: // output_location.gcs_output_directory
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OutputLocation = &ExportDataOperationMetadata_ExportDataOutputInfo_GcsOutputDirectory{x}
-		return true, err
-	case 2: // output_location.bigquery_output_dataset
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OutputLocation = &ExportDataOperationMetadata_ExportDataOutputInfo_BigqueryOutputDataset{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExportDataOperationMetadata_ExportDataOutputInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExportDataOperationMetadata_ExportDataOutputInfo)
-	// output_location
-	switch x := m.OutputLocation.(type) {
-	case *ExportDataOperationMetadata_ExportDataOutputInfo_GcsOutputDirectory:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.GcsOutputDirectory)))
-		n += len(x.GcsOutputDirectory)
-	case *ExportDataOperationMetadata_ExportDataOutputInfo_BigqueryOutputDataset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BigqueryOutputDataset)))
-		n += len(x.BigqueryOutputDataset)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Details of BatchPredict operation.
 type BatchPredictOperationMetadata struct {
 	// Output only. The input config that was given upon starting this
@@ -801,16 +562,17 @@ func (m *BatchPredictOperationMetadata) Reset()         { *m = BatchPredictOpera
 func (m *BatchPredictOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*BatchPredictOperationMetadata) ProtoMessage()    {}
 func (*BatchPredictOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{7}
+	return fileDescriptor_07afd87baa9bfac3, []int{7}
 }
+
 func (m *BatchPredictOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchPredictOperationMetadata.Unmarshal(m, b)
 }
 func (m *BatchPredictOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchPredictOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *BatchPredictOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchPredictOperationMetadata.Merge(dst, src)
+func (m *BatchPredictOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchPredictOperationMetadata.Merge(m, src)
 }
 func (m *BatchPredictOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_BatchPredictOperationMetadata.Size(m)
@@ -859,16 +621,17 @@ func (m *BatchPredictOperationMetadata_BatchPredictOutputInfo) String() string {
 }
 func (*BatchPredictOperationMetadata_BatchPredictOutputInfo) ProtoMessage() {}
 func (*BatchPredictOperationMetadata_BatchPredictOutputInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{7, 0}
+	return fileDescriptor_07afd87baa9bfac3, []int{7, 0}
 }
+
 func (m *BatchPredictOperationMetadata_BatchPredictOutputInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchPredictOperationMetadata_BatchPredictOutputInfo.Unmarshal(m, b)
 }
 func (m *BatchPredictOperationMetadata_BatchPredictOutputInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchPredictOperationMetadata_BatchPredictOutputInfo.Marshal(b, m, deterministic)
 }
-func (dst *BatchPredictOperationMetadata_BatchPredictOutputInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchPredictOperationMetadata_BatchPredictOutputInfo.Merge(dst, src)
+func (m *BatchPredictOperationMetadata_BatchPredictOutputInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchPredictOperationMetadata_BatchPredictOutputInfo.Merge(m, src)
 }
 func (m *BatchPredictOperationMetadata_BatchPredictOutputInfo) XXX_Size() int {
 	return xxx_messageInfo_BatchPredictOperationMetadata_BatchPredictOutputInfo.Size(m)
@@ -918,72 +681,14 @@ func (m *BatchPredictOperationMetadata_BatchPredictOutputInfo) GetBigqueryOutput
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchPredictOperationMetadata_BatchPredictOutputInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchPredictOperationMetadata_BatchPredictOutputInfo_OneofMarshaler, _BatchPredictOperationMetadata_BatchPredictOutputInfo_OneofUnmarshaler, _BatchPredictOperationMetadata_BatchPredictOutputInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchPredictOperationMetadata_BatchPredictOutputInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchPredictOperationMetadata_BatchPredictOutputInfo_GcsOutputDirectory)(nil),
 		(*BatchPredictOperationMetadata_BatchPredictOutputInfo_BigqueryOutputDataset)(nil),
 	}
 }
 
-func _BatchPredictOperationMetadata_BatchPredictOutputInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchPredictOperationMetadata_BatchPredictOutputInfo)
-	// output_location
-	switch x := m.OutputLocation.(type) {
-	case *BatchPredictOperationMetadata_BatchPredictOutputInfo_GcsOutputDirectory:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.GcsOutputDirectory)
-	case *BatchPredictOperationMetadata_BatchPredictOutputInfo_BigqueryOutputDataset:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.BigqueryOutputDataset)
-	case nil:
-	default:
-		return fmt.Errorf("BatchPredictOperationMetadata_BatchPredictOutputInfo.OutputLocation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchPredictOperationMetadata_BatchPredictOutputInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchPredictOperationMetadata_BatchPredictOutputInfo)
-	switch tag {
-	case 1: // output_location.gcs_output_directory
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OutputLocation = &BatchPredictOperationMetadata_BatchPredictOutputInfo_GcsOutputDirectory{x}
-		return true, err
-	case 2: // output_location.bigquery_output_dataset
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OutputLocation = &BatchPredictOperationMetadata_BatchPredictOutputInfo_BigqueryOutputDataset{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchPredictOperationMetadata_BatchPredictOutputInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchPredictOperationMetadata_BatchPredictOutputInfo)
-	// output_location
-	switch x := m.OutputLocation.(type) {
-	case *BatchPredictOperationMetadata_BatchPredictOutputInfo_GcsOutputDirectory:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.GcsOutputDirectory)))
-		n += len(x.GcsOutputDirectory)
-	case *BatchPredictOperationMetadata_BatchPredictOutputInfo_BigqueryOutputDataset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BigqueryOutputDataset)))
-		n += len(x.BigqueryOutputDataset)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Details of ExportModel operation.
 type ExportModelOperationMetadata struct {
 	// Output only. Information further describing the output of this model
@@ -998,16 +703,17 @@ func (m *ExportModelOperationMetadata) Reset()         { *m = ExportModelOperati
 func (m *ExportModelOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportModelOperationMetadata) ProtoMessage()    {}
 func (*ExportModelOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{8}
+	return fileDescriptor_07afd87baa9bfac3, []int{8}
 }
+
 func (m *ExportModelOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportModelOperationMetadata.Unmarshal(m, b)
 }
 func (m *ExportModelOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportModelOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportModelOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportModelOperationMetadata.Merge(dst, src)
+func (m *ExportModelOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportModelOperationMetadata.Merge(m, src)
 }
 func (m *ExportModelOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportModelOperationMetadata.Size(m)
@@ -1046,16 +752,17 @@ func (m *ExportModelOperationMetadata_ExportModelOutputInfo) String() string {
 }
 func (*ExportModelOperationMetadata_ExportModelOutputInfo) ProtoMessage() {}
 func (*ExportModelOperationMetadata_ExportModelOutputInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{8, 0}
+	return fileDescriptor_07afd87baa9bfac3, []int{8, 0}
 }
+
 func (m *ExportModelOperationMetadata_ExportModelOutputInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportModelOperationMetadata_ExportModelOutputInfo.Unmarshal(m, b)
 }
 func (m *ExportModelOperationMetadata_ExportModelOutputInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportModelOperationMetadata_ExportModelOutputInfo.Marshal(b, m, deterministic)
 }
-func (dst *ExportModelOperationMetadata_ExportModelOutputInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportModelOperationMetadata_ExportModelOutputInfo.Merge(dst, src)
+func (m *ExportModelOperationMetadata_ExportModelOutputInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportModelOperationMetadata_ExportModelOutputInfo.Merge(m, src)
 }
 func (m *ExportModelOperationMetadata_ExportModelOutputInfo) XXX_Size() int {
 	return xxx_messageInfo_ExportModelOperationMetadata_ExportModelOutputInfo.Size(m)
@@ -1089,16 +796,17 @@ func (m *ExportEvaluatedExamplesOperationMetadata) Reset() {
 func (m *ExportEvaluatedExamplesOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportEvaluatedExamplesOperationMetadata) ProtoMessage()    {}
 func (*ExportEvaluatedExamplesOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{9}
+	return fileDescriptor_07afd87baa9bfac3, []int{9}
 }
+
 func (m *ExportEvaluatedExamplesOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata.Unmarshal(m, b)
 }
 func (m *ExportEvaluatedExamplesOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportEvaluatedExamplesOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata.Merge(dst, src)
+func (m *ExportEvaluatedExamplesOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata.Merge(m, src)
 }
 func (m *ExportEvaluatedExamplesOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata.Size(m)
@@ -1137,16 +845,17 @@ func (m *ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputI
 }
 func (*ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo) ProtoMessage() {}
 func (*ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_3312906655c3448c, []int{9, 0}
+	return fileDescriptor_07afd87baa9bfac3, []int{9, 0}
 }
+
 func (m *ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo.Unmarshal(m, b)
 }
 func (m *ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo.Marshal(b, m, deterministic)
 }
-func (dst *ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo.Merge(dst, src)
+func (m *ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo.Merge(m, src)
 }
 func (m *ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo) XXX_Size() int {
 	return xxx_messageInfo_ExportEvaluatedExamplesOperationMetadata_ExportEvaluatedExamplesOutputInfo.Size(m)
@@ -1182,10 +891,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/operations.proto", fileDescriptor_operations_3312906655c3448c)
+	proto.RegisterFile("google/cloud/automl/v1beta1/operations.proto", fileDescriptor_07afd87baa9bfac3)
 }
 
-var fileDescriptor_operations_3312906655c3448c = []byte{
+var fileDescriptor_07afd87baa9bfac3 = []byte{
 	// 884 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x96, 0xdd, 0x6e, 0x1b, 0x45,
 	0x14, 0xc7, 0x59, 0x87, 0xaf, 0x1e, 0x53, 0x92, 0x4c, 0x9d, 0xc4, 0x75, 0xd2, 0x34, 0x5d, 0x21,
diff --git a/googleapis/cloud/automl/v1beta1/prediction_service.pb.go b/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
index 44cbe35ee7..8ea4e65407 100644
--- a/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
+++ b/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/prediction_service.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package automl
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [PredictionService.Predict][google.cloud.automl.v1beta1.PredictionService.Predict].
 type PredictRequest struct {
@@ -59,16 +59,17 @@ func (m *PredictRequest) Reset()         { *m = PredictRequest{} }
 func (m *PredictRequest) String() string { return proto.CompactTextString(m) }
 func (*PredictRequest) ProtoMessage()    {}
 func (*PredictRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_prediction_service_4cd94add91ccba6b, []int{0}
+	return fileDescriptor_59a9dba5da3c687d, []int{0}
 }
+
 func (m *PredictRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PredictRequest.Unmarshal(m, b)
 }
 func (m *PredictRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PredictRequest.Marshal(b, m, deterministic)
 }
-func (dst *PredictRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PredictRequest.Merge(dst, src)
+func (m *PredictRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictRequest.Merge(m, src)
 }
 func (m *PredictRequest) XXX_Size() int {
 	return xxx_messageInfo_PredictRequest.Size(m)
@@ -130,16 +131,17 @@ func (m *PredictResponse) Reset()         { *m = PredictResponse{} }
 func (m *PredictResponse) String() string { return proto.CompactTextString(m) }
 func (*PredictResponse) ProtoMessage()    {}
 func (*PredictResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_prediction_service_4cd94add91ccba6b, []int{1}
+	return fileDescriptor_59a9dba5da3c687d, []int{1}
 }
+
 func (m *PredictResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PredictResponse.Unmarshal(m, b)
 }
 func (m *PredictResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PredictResponse.Marshal(b, m, deterministic)
 }
-func (dst *PredictResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PredictResponse.Merge(dst, src)
+func (m *PredictResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictResponse.Merge(m, src)
 }
 func (m *PredictResponse) XXX_Size() int {
 	return xxx_messageInfo_PredictResponse.Size(m)
@@ -213,16 +215,17 @@ func (m *BatchPredictRequest) Reset()         { *m = BatchPredictRequest{} }
 func (m *BatchPredictRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchPredictRequest) ProtoMessage()    {}
 func (*BatchPredictRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_prediction_service_4cd94add91ccba6b, []int{2}
+	return fileDescriptor_59a9dba5da3c687d, []int{2}
 }
+
 func (m *BatchPredictRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchPredictRequest.Unmarshal(m, b)
 }
 func (m *BatchPredictRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchPredictRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchPredictRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchPredictRequest.Merge(dst, src)
+func (m *BatchPredictRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchPredictRequest.Merge(m, src)
 }
 func (m *BatchPredictRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchPredictRequest.Size(m)
@@ -272,16 +275,17 @@ func (m *BatchPredictResult) Reset()         { *m = BatchPredictResult{} }
 func (m *BatchPredictResult) String() string { return proto.CompactTextString(m) }
 func (*BatchPredictResult) ProtoMessage()    {}
 func (*BatchPredictResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_prediction_service_4cd94add91ccba6b, []int{3}
+	return fileDescriptor_59a9dba5da3c687d, []int{3}
 }
+
 func (m *BatchPredictResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchPredictResult.Unmarshal(m, b)
 }
 func (m *BatchPredictResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchPredictResult.Marshal(b, m, deterministic)
 }
-func (dst *BatchPredictResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchPredictResult.Merge(dst, src)
+func (m *BatchPredictResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchPredictResult.Merge(m, src)
 }
 func (m *BatchPredictResult) XXX_Size() int {
 	return xxx_messageInfo_BatchPredictResult.Size(m)
@@ -302,6 +306,54 @@ func init() {
 	proto.RegisterType((*BatchPredictResult)(nil), "google.cloud.automl.v1beta1.BatchPredictResult")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/prediction_service.proto", fileDescriptor_59a9dba5da3c687d)
+}
+
+var fileDescriptor_59a9dba5da3c687d = []byte{
+	// 634 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xd4, 0x3c,
+	0x14, 0x95, 0x33, 0xfd, 0xf9, 0xea, 0x69, 0x3f, 0xc0, 0x54, 0x68, 0x94, 0x82, 0xa8, 0x02, 0x8b,
+	0x6a, 0x5a, 0xc5, 0xb4, 0x14, 0x15, 0xa6, 0x65, 0x31, 0x53, 0x55, 0x85, 0x45, 0xd5, 0x28, 0xa0,
+	0x22, 0x55, 0x95, 0x46, 0x6e, 0xc6, 0x84, 0x80, 0x63, 0x87, 0xc4, 0xa9, 0xa8, 0x10, 0x1b, 0x5e,
+	0x81, 0x2d, 0x0f, 0xc0, 0xb3, 0xb0, 0xe5, 0x15, 0xd8, 0xb0, 0x82, 0x1d, 0x5b, 0x14, 0xdb, 0x93,
+	0x66, 0x54, 0x14, 0xcd, 0x2c, 0xd8, 0xc5, 0xc9, 0x3d, 0xe7, 0x9e, 0x73, 0xaf, 0x73, 0xe0, 0x66,
+	0x28, 0x44, 0xc8, 0x28, 0x0e, 0x98, 0xc8, 0x07, 0x98, 0xe4, 0x52, 0xc4, 0x0c, 0x9f, 0xad, 0x9f,
+	0x52, 0x49, 0xd6, 0x71, 0x92, 0xd2, 0x41, 0x14, 0xc8, 0x48, 0xf0, 0x7e, 0x46, 0xd3, 0xb3, 0x28,
+	0xa0, 0x6e, 0x92, 0x0a, 0x29, 0xd0, 0x92, 0x46, 0xb9, 0x0a, 0xe5, 0x6a, 0x94, 0x6b, 0x50, 0xf6,
+	0x4d, 0x43, 0x49, 0x92, 0x08, 0x13, 0xce, 0x85, 0x24, 0x05, 0x43, 0xa6, 0xa1, 0x76, 0x6d, 0xc3,
+	0x8b, 0xf2, 0x7e, 0x42, 0xce, 0x99, 0x20, 0x03, 0x83, 0x5a, 0xab, 0x43, 0x0d, 0x88, 0x24, 0xfd,
+	0x48, 0xd2, 0x78, 0xd8, 0xe3, 0x6e, 0x5d, 0x75, 0x24, 0xc6, 0xe1, 0x14, 0x09, 0x4d, 0x47, 0x74,
+	0xdf, 0x31, 0xd5, 0x4c, 0xf0, 0x30, 0xcd, 0x39, 0x8f, 0x78, 0x78, 0xa9, 0xc8, 0xf9, 0x0d, 0xe0,
+	0xff, 0x9e, 0x1e, 0x9a, 0x4f, 0xdf, 0xe6, 0x34, 0x93, 0x08, 0xc1, 0x29, 0x4e, 0x62, 0xda, 0x02,
+	0xcb, 0x60, 0x65, 0xce, 0x57, 0xcf, 0x68, 0x0f, 0xce, 0x1a, 0x7b, 0x2d, 0x6b, 0x19, 0xac, 0x34,
+	0x37, 0x56, 0xdd, 0x9a, 0x81, 0xba, 0x7b, 0xef, 0x48, 0x9c, 0x30, 0xea, 0x69, 0x88, 0x3f, 0xc4,
+	0xa2, 0x43, 0x38, 0x93, 0x90, 0x94, 0xc4, 0x59, 0xab, 0xb1, 0xdc, 0x58, 0x69, 0x6e, 0x6c, 0xd5,
+	0xb2, 0x8c, 0xea, 0x72, 0x3d, 0x85, 0xdc, 0xe3, 0x32, 0x3d, 0xf7, 0x0d, 0x8d, 0xfd, 0x08, 0x36,
+	0x2b, 0xaf, 0xd1, 0x55, 0xd8, 0x78, 0x43, 0xcf, 0x8d, 0xf2, 0xe2, 0x11, 0x2d, 0xc2, 0xe9, 0x33,
+	0xc2, 0x72, 0xaa, 0x64, 0xcf, 0xf9, 0xfa, 0xd0, 0xb1, 0x1e, 0x02, 0xe7, 0x17, 0x80, 0x57, 0xca,
+	0x0e, 0x59, 0x22, 0x78, 0x46, 0xd1, 0x93, 0x0b, 0x9b, 0x40, 0x09, 0x74, 0x6b, 0x05, 0x76, 0xcb,
+	0xe5, 0x5f, 0x72, 0x7a, 0x04, 0xff, 0x8b, 0xa9, 0x24, 0xc5, 0xa2, 0x5b, 0x96, 0xa2, 0xea, 0x8c,
+	0xe7, 0x55, 0x2b, 0x71, 0x0f, 0x0c, 0x58, 0xdb, 0x2d, 0xb9, 0xec, 0x6d, 0xb8, 0x30, 0xf2, 0x69,
+	0x22, 0xcb, 0x3f, 0x2d, 0x78, 0xbd, 0x47, 0x64, 0xf0, 0x6a, 0x8c, 0x8d, 0xbf, 0x80, 0xf3, 0x11,
+	0x4f, 0x72, 0xd9, 0x0f, 0x04, 0x7f, 0x19, 0x85, 0xad, 0x86, 0x5a, 0xfb, 0x66, 0xad, 0x89, 0x2a,
+	0xf7, 0xd3, 0x02, 0xbc, 0xab, 0xb0, 0x7e, 0x33, 0xba, 0x38, 0xa0, 0x63, 0xb8, 0x20, 0x72, 0x59,
+	0x61, 0x9e, 0x52, 0xcc, 0x0f, 0xc6, 0x66, 0x3e, 0x54, 0x68, 0x43, 0x3d, 0x2f, 0x2a, 0x27, 0xf4,
+	0xbc, 0xbc, 0x5f, 0xd3, 0x6a, 0xe6, 0x3b, 0x63, 0x93, 0xfe, 0xa3, 0x4b, 0xb6, 0x08, 0xd1, 0x68,
+	0x97, 0x2c, 0x67, 0x72, 0xe3, 0x87, 0x05, 0xaf, 0x79, 0x65, 0x52, 0x3d, 0xd3, 0x41, 0x85, 0xbe,
+	0x00, 0x38, 0x6b, 0xde, 0xa2, 0xd5, 0x09, 0x7e, 0x0c, 0x7b, 0x6d, 0x92, 0x9b, 0xe5, 0xf4, 0x3e,
+	0x7e, 0xfb, 0xfe, 0xc9, 0xda, 0x71, 0xb6, 0xca, 0xe4, 0x78, 0x5f, 0x2c, 0xfc, 0x71, 0x92, 0x8a,
+	0xd7, 0x34, 0x90, 0x19, 0x6e, 0x63, 0x26, 0x02, 0x1d, 0x12, 0xb8, 0x8d, 0x63, 0x31, 0xa0, 0x2c,
+	0xc3, 0xed, 0x0f, 0x1d, 0x93, 0xad, 0x1d, 0xd0, 0x2e, 0xa4, 0xce, 0x57, 0x7d, 0xa1, 0x7b, 0x93,
+	0x0e, 0xda, 0xbe, 0x35, 0x44, 0x54, 0xe2, 0xc9, 0x3d, 0x1c, 0xc6, 0x93, 0xb3, 0xaf, 0x54, 0x76,
+	0x9d, 0x9d, 0x49, 0x55, 0x9e, 0x56, 0x7a, 0x75, 0x40, 0xbb, 0xf7, 0x19, 0xc0, 0xdb, 0x81, 0x88,
+	0xeb, 0xf4, 0xf5, 0x6e, 0x5c, 0x5a, 0x86, 0x57, 0x84, 0xa3, 0x07, 0x8e, 0xbb, 0x06, 0x16, 0x0a,
+	0x46, 0x78, 0xe8, 0x8a, 0x34, 0xc4, 0x21, 0xe5, 0x2a, 0x3a, 0xb1, 0xfe, 0x44, 0x92, 0x28, 0xfb,
+	0x6b, 0x20, 0x6f, 0xeb, 0xe3, 0x57, 0x6b, 0x69, 0x5f, 0x15, 0x9e, 0xec, 0x16, 0x45, 0x27, 0xdd,
+	0x5c, 0x8a, 0x03, 0x76, 0x72, 0xa4, 0x8b, 0x4e, 0x67, 0x14, 0xd7, 0xfd, 0x3f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0xda, 0xb7, 0xf9, 0x0c, 0xd6, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -456,51 +508,3 @@ var _PredictionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/automl/v1beta1/prediction_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/prediction_service.proto", fileDescriptor_prediction_service_4cd94add91ccba6b)
-}
-
-var fileDescriptor_prediction_service_4cd94add91ccba6b = []byte{
-	// 634 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xd4, 0x3c,
-	0x14, 0x95, 0x33, 0xfd, 0xf9, 0xea, 0x69, 0x3f, 0xc0, 0x54, 0x68, 0x94, 0x82, 0xa8, 0x02, 0x8b,
-	0x6a, 0x5a, 0xc5, 0xb4, 0x14, 0x15, 0xa6, 0x65, 0x31, 0x53, 0x55, 0x85, 0x45, 0xd5, 0x28, 0xa0,
-	0x22, 0x55, 0x95, 0x46, 0x6e, 0xc6, 0x84, 0x80, 0x63, 0x87, 0xc4, 0xa9, 0xa8, 0x10, 0x1b, 0x5e,
-	0x81, 0x2d, 0x0f, 0xc0, 0xb3, 0xb0, 0xe5, 0x15, 0xd8, 0xb0, 0x82, 0x1d, 0x5b, 0x14, 0xdb, 0x93,
-	0x66, 0x54, 0x14, 0xcd, 0x2c, 0xd8, 0xc5, 0xc9, 0x3d, 0xe7, 0x9e, 0x73, 0xaf, 0x73, 0xe0, 0x66,
-	0x28, 0x44, 0xc8, 0x28, 0x0e, 0x98, 0xc8, 0x07, 0x98, 0xe4, 0x52, 0xc4, 0x0c, 0x9f, 0xad, 0x9f,
-	0x52, 0x49, 0xd6, 0x71, 0x92, 0xd2, 0x41, 0x14, 0xc8, 0x48, 0xf0, 0x7e, 0x46, 0xd3, 0xb3, 0x28,
-	0xa0, 0x6e, 0x92, 0x0a, 0x29, 0xd0, 0x92, 0x46, 0xb9, 0x0a, 0xe5, 0x6a, 0x94, 0x6b, 0x50, 0xf6,
-	0x4d, 0x43, 0x49, 0x92, 0x08, 0x13, 0xce, 0x85, 0x24, 0x05, 0x43, 0xa6, 0xa1, 0x76, 0x6d, 0xc3,
-	0x8b, 0xf2, 0x7e, 0x42, 0xce, 0x99, 0x20, 0x03, 0x83, 0x5a, 0xab, 0x43, 0x0d, 0x88, 0x24, 0xfd,
-	0x48, 0xd2, 0x78, 0xd8, 0xe3, 0x6e, 0x5d, 0x75, 0x24, 0xc6, 0xe1, 0x14, 0x09, 0x4d, 0x47, 0x74,
-	0xdf, 0x31, 0xd5, 0x4c, 0xf0, 0x30, 0xcd, 0x39, 0x8f, 0x78, 0x78, 0xa9, 0xc8, 0xf9, 0x0d, 0xe0,
-	0xff, 0x9e, 0x1e, 0x9a, 0x4f, 0xdf, 0xe6, 0x34, 0x93, 0x08, 0xc1, 0x29, 0x4e, 0x62, 0xda, 0x02,
-	0xcb, 0x60, 0x65, 0xce, 0x57, 0xcf, 0x68, 0x0f, 0xce, 0x1a, 0x7b, 0x2d, 0x6b, 0x19, 0xac, 0x34,
-	0x37, 0x56, 0xdd, 0x9a, 0x81, 0xba, 0x7b, 0xef, 0x48, 0x9c, 0x30, 0xea, 0x69, 0x88, 0x3f, 0xc4,
-	0xa2, 0x43, 0x38, 0x93, 0x90, 0x94, 0xc4, 0x59, 0xab, 0xb1, 0xdc, 0x58, 0x69, 0x6e, 0x6c, 0xd5,
-	0xb2, 0x8c, 0xea, 0x72, 0x3d, 0x85, 0xdc, 0xe3, 0x32, 0x3d, 0xf7, 0x0d, 0x8d, 0xfd, 0x08, 0x36,
-	0x2b, 0xaf, 0xd1, 0x55, 0xd8, 0x78, 0x43, 0xcf, 0x8d, 0xf2, 0xe2, 0x11, 0x2d, 0xc2, 0xe9, 0x33,
-	0xc2, 0x72, 0xaa, 0x64, 0xcf, 0xf9, 0xfa, 0xd0, 0xb1, 0x1e, 0x02, 0xe7, 0x17, 0x80, 0x57, 0xca,
-	0x0e, 0x59, 0x22, 0x78, 0x46, 0xd1, 0x93, 0x0b, 0x9b, 0x40, 0x09, 0x74, 0x6b, 0x05, 0x76, 0xcb,
-	0xe5, 0x5f, 0x72, 0x7a, 0x04, 0xff, 0x8b, 0xa9, 0x24, 0xc5, 0xa2, 0x5b, 0x96, 0xa2, 0xea, 0x8c,
-	0xe7, 0x55, 0x2b, 0x71, 0x0f, 0x0c, 0x58, 0xdb, 0x2d, 0xb9, 0xec, 0x6d, 0xb8, 0x30, 0xf2, 0x69,
-	0x22, 0xcb, 0x3f, 0x2d, 0x78, 0xbd, 0x47, 0x64, 0xf0, 0x6a, 0x8c, 0x8d, 0xbf, 0x80, 0xf3, 0x11,
-	0x4f, 0x72, 0xd9, 0x0f, 0x04, 0x7f, 0x19, 0x85, 0xad, 0x86, 0x5a, 0xfb, 0x66, 0xad, 0x89, 0x2a,
-	0xf7, 0xd3, 0x02, 0xbc, 0xab, 0xb0, 0x7e, 0x33, 0xba, 0x38, 0xa0, 0x63, 0xb8, 0x20, 0x72, 0x59,
-	0x61, 0x9e, 0x52, 0xcc, 0x0f, 0xc6, 0x66, 0x3e, 0x54, 0x68, 0x43, 0x3d, 0x2f, 0x2a, 0x27, 0xf4,
-	0xbc, 0xbc, 0x5f, 0xd3, 0x6a, 0xe6, 0x3b, 0x63, 0x93, 0xfe, 0xa3, 0x4b, 0xb6, 0x08, 0xd1, 0x68,
-	0x97, 0x2c, 0x67, 0x72, 0xe3, 0x87, 0x05, 0xaf, 0x79, 0x65, 0x52, 0x3d, 0xd3, 0x41, 0x85, 0xbe,
-	0x00, 0x38, 0x6b, 0xde, 0xa2, 0xd5, 0x09, 0x7e, 0x0c, 0x7b, 0x6d, 0x92, 0x9b, 0xe5, 0xf4, 0x3e,
-	0x7e, 0xfb, 0xfe, 0xc9, 0xda, 0x71, 0xb6, 0xca, 0xe4, 0x78, 0x5f, 0x2c, 0xfc, 0x71, 0x92, 0x8a,
-	0xd7, 0x34, 0x90, 0x19, 0x6e, 0x63, 0x26, 0x02, 0x1d, 0x12, 0xb8, 0x8d, 0x63, 0x31, 0xa0, 0x2c,
-	0xc3, 0xed, 0x0f, 0x1d, 0x93, 0xad, 0x1d, 0xd0, 0x2e, 0xa4, 0xce, 0x57, 0x7d, 0xa1, 0x7b, 0x93,
-	0x0e, 0xda, 0xbe, 0x35, 0x44, 0x54, 0xe2, 0xc9, 0x3d, 0x1c, 0xc6, 0x93, 0xb3, 0xaf, 0x54, 0x76,
-	0x9d, 0x9d, 0x49, 0x55, 0x9e, 0x56, 0x7a, 0x75, 0x40, 0xbb, 0xf7, 0x19, 0xc0, 0xdb, 0x81, 0x88,
-	0xeb, 0xf4, 0xf5, 0x6e, 0x5c, 0x5a, 0x86, 0x57, 0x84, 0xa3, 0x07, 0x8e, 0xbb, 0x06, 0x16, 0x0a,
-	0x46, 0x78, 0xe8, 0x8a, 0x34, 0xc4, 0x21, 0xe5, 0x2a, 0x3a, 0xb1, 0xfe, 0x44, 0x92, 0x28, 0xfb,
-	0x6b, 0x20, 0x6f, 0xeb, 0xe3, 0x57, 0x6b, 0x69, 0x5f, 0x15, 0x9e, 0xec, 0x16, 0x45, 0x27, 0xdd,
-	0x5c, 0x8a, 0x03, 0x76, 0x72, 0xa4, 0x8b, 0x4e, 0x67, 0x14, 0xd7, 0xfd, 0x3f, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0xda, 0xb7, 0xf9, 0x0c, 0xd6, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/automl/v1beta1/ranges.pb.go b/googleapis/cloud/automl/v1beta1/ranges.pb.go
index 80a9afc262..78dcb45ee2 100644
--- a/googleapis/cloud/automl/v1beta1/ranges.pb.go
+++ b/googleapis/cloud/automl/v1beta1/ranges.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/ranges.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A range between two double numbers.
 type DoubleRange struct {
@@ -34,16 +37,17 @@ func (m *DoubleRange) Reset()         { *m = DoubleRange{} }
 func (m *DoubleRange) String() string { return proto.CompactTextString(m) }
 func (*DoubleRange) ProtoMessage()    {}
 func (*DoubleRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ranges_d6420aeb5e8fc6d2, []int{0}
+	return fileDescriptor_a166e9960f6d1167, []int{0}
 }
+
 func (m *DoubleRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DoubleRange.Unmarshal(m, b)
 }
 func (m *DoubleRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DoubleRange.Marshal(b, m, deterministic)
 }
-func (dst *DoubleRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DoubleRange.Merge(dst, src)
+func (m *DoubleRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DoubleRange.Merge(m, src)
 }
 func (m *DoubleRange) XXX_Size() int {
 	return xxx_messageInfo_DoubleRange.Size(m)
@@ -73,10 +77,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/ranges.proto", fileDescriptor_ranges_d6420aeb5e8fc6d2)
+	proto.RegisterFile("google/cloud/automl/v1beta1/ranges.proto", fileDescriptor_a166e9960f6d1167)
 }
 
-var fileDescriptor_ranges_d6420aeb5e8fc6d2 = []byte{
+var fileDescriptor_a166e9960f6d1167 = []byte{
 	// 222 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xcf, 0xbf, 0x4a, 0xc5, 0x30,
 	0x14, 0x06, 0x70, 0x72, 0x45, 0x87, 0xdc, 0x45, 0x8a, 0xc3, 0xc5, 0x2b, 0x28, 0x4e, 0x77, 0x4a,
diff --git a/googleapis/cloud/automl/v1beta1/regression.pb.go b/googleapis/cloud/automl/v1beta1/regression.pb.go
index b4c565d7f1..35bbbe56e9 100644
--- a/googleapis/cloud/automl/v1beta1/regression.pb.go
+++ b/googleapis/cloud/automl/v1beta1/regression.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/regression.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Metrics for regression problems.
 type RegressionEvaluationMetrics struct {
@@ -39,16 +42,17 @@ func (m *RegressionEvaluationMetrics) Reset()         { *m = RegressionEvaluatio
 func (m *RegressionEvaluationMetrics) String() string { return proto.CompactTextString(m) }
 func (*RegressionEvaluationMetrics) ProtoMessage()    {}
 func (*RegressionEvaluationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_regression_ca949e981cd1d01b, []int{0}
+	return fileDescriptor_b0fa6250b0d4b440, []int{0}
 }
+
 func (m *RegressionEvaluationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegressionEvaluationMetrics.Unmarshal(m, b)
 }
 func (m *RegressionEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RegressionEvaluationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *RegressionEvaluationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RegressionEvaluationMetrics.Merge(dst, src)
+func (m *RegressionEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegressionEvaluationMetrics.Merge(m, src)
 }
 func (m *RegressionEvaluationMetrics) XXX_Size() int {
 	return xxx_messageInfo_RegressionEvaluationMetrics.Size(m)
@@ -92,10 +96,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/regression.proto", fileDescriptor_regression_ca949e981cd1d01b)
+	proto.RegisterFile("google/cloud/automl/v1beta1/regression.proto", fileDescriptor_b0fa6250b0d4b440)
 }
 
-var fileDescriptor_regression_ca949e981cd1d01b = []byte{
+var fileDescriptor_b0fa6250b0d4b440 = []byte{
 	// 300 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4a, 0x33, 0x31,
 	0x14, 0x85, 0x99, 0xfe, 0x3f, 0xa2, 0xd9, 0x88, 0x55, 0xb0, 0x38, 0xa2, 0xe2, 0xca, 0x85, 0x24,
diff --git a/googleapis/cloud/automl/v1beta1/service.pb.go b/googleapis/cloud/automl/v1beta1/service.pb.go
index 516d7c4ca8..8562a6150a 100644
--- a/googleapis/cloud/automl/v1beta1/service.pb.go
+++ b/googleapis/cloud/automl/v1beta1/service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/service.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package automl
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [AutoMl.CreateDataset][google.cloud.automl.v1beta1.AutoMl.CreateDataset].
 type CreateDatasetRequest struct {
@@ -41,16 +41,17 @@ func (m *CreateDatasetRequest) Reset()         { *m = CreateDatasetRequest{} }
 func (m *CreateDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDatasetRequest) ProtoMessage()    {}
 func (*CreateDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{0}
+	return fileDescriptor_62cd04b8735a9250, []int{0}
 }
+
 func (m *CreateDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDatasetRequest.Unmarshal(m, b)
 }
 func (m *CreateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDatasetRequest.Merge(dst, src)
+func (m *CreateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatasetRequest.Merge(m, src)
 }
 func (m *CreateDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDatasetRequest.Size(m)
@@ -88,16 +89,17 @@ func (m *GetDatasetRequest) Reset()         { *m = GetDatasetRequest{} }
 func (m *GetDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDatasetRequest) ProtoMessage()    {}
 func (*GetDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{1}
+	return fileDescriptor_62cd04b8735a9250, []int{1}
 }
+
 func (m *GetDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDatasetRequest.Unmarshal(m, b)
 }
 func (m *GetDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDatasetRequest.Merge(dst, src)
+func (m *GetDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatasetRequest.Merge(m, src)
 }
 func (m *GetDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDatasetRequest.Size(m)
@@ -144,16 +146,17 @@ func (m *ListDatasetsRequest) Reset()         { *m = ListDatasetsRequest{} }
 func (m *ListDatasetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDatasetsRequest) ProtoMessage()    {}
 func (*ListDatasetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{2}
+	return fileDescriptor_62cd04b8735a9250, []int{2}
 }
+
 func (m *ListDatasetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatasetsRequest.Unmarshal(m, b)
 }
 func (m *ListDatasetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatasetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDatasetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatasetsRequest.Merge(dst, src)
+func (m *ListDatasetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsRequest.Merge(m, src)
 }
 func (m *ListDatasetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDatasetsRequest.Size(m)
@@ -208,16 +211,17 @@ func (m *ListDatasetsResponse) Reset()         { *m = ListDatasetsResponse{} }
 func (m *ListDatasetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDatasetsResponse) ProtoMessage()    {}
 func (*ListDatasetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{3}
+	return fileDescriptor_62cd04b8735a9250, []int{3}
 }
+
 func (m *ListDatasetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatasetsResponse.Unmarshal(m, b)
 }
 func (m *ListDatasetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatasetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDatasetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatasetsResponse.Merge(dst, src)
+func (m *ListDatasetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsResponse.Merge(m, src)
 }
 func (m *ListDatasetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDatasetsResponse.Size(m)
@@ -262,16 +266,17 @@ func (m *UpdateDatasetRequest) Reset()         { *m = UpdateDatasetRequest{} }
 func (m *UpdateDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDatasetRequest) ProtoMessage()    {}
 func (*UpdateDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{4}
+	return fileDescriptor_62cd04b8735a9250, []int{4}
 }
+
 func (m *UpdateDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDatasetRequest.Unmarshal(m, b)
 }
 func (m *UpdateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDatasetRequest.Merge(dst, src)
+func (m *UpdateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDatasetRequest.Merge(m, src)
 }
 func (m *UpdateDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDatasetRequest.Size(m)
@@ -309,16 +314,17 @@ func (m *DeleteDatasetRequest) Reset()         { *m = DeleteDatasetRequest{} }
 func (m *DeleteDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDatasetRequest) ProtoMessage()    {}
 func (*DeleteDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{5}
+	return fileDescriptor_62cd04b8735a9250, []int{5}
 }
+
 func (m *DeleteDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDatasetRequest.Unmarshal(m, b)
 }
 func (m *DeleteDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDatasetRequest.Merge(dst, src)
+func (m *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDatasetRequest.Merge(m, src)
 }
 func (m *DeleteDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDatasetRequest.Size(m)
@@ -353,16 +359,17 @@ func (m *ImportDataRequest) Reset()         { *m = ImportDataRequest{} }
 func (m *ImportDataRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportDataRequest) ProtoMessage()    {}
 func (*ImportDataRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{6}
+	return fileDescriptor_62cd04b8735a9250, []int{6}
 }
+
 func (m *ImportDataRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDataRequest.Unmarshal(m, b)
 }
 func (m *ImportDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDataRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportDataRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDataRequest.Merge(dst, src)
+func (m *ImportDataRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDataRequest.Merge(m, src)
 }
 func (m *ImportDataRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportDataRequest.Size(m)
@@ -402,16 +409,17 @@ func (m *ExportDataRequest) Reset()         { *m = ExportDataRequest{} }
 func (m *ExportDataRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportDataRequest) ProtoMessage()    {}
 func (*ExportDataRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{7}
+	return fileDescriptor_62cd04b8735a9250, []int{7}
 }
+
 func (m *ExportDataRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDataRequest.Unmarshal(m, b)
 }
 func (m *ExportDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDataRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportDataRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDataRequest.Merge(dst, src)
+func (m *ExportDataRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDataRequest.Merge(m, src)
 }
 func (m *ExportDataRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportDataRequest.Size(m)
@@ -449,16 +457,17 @@ func (m *GetAnnotationSpecRequest) Reset()         { *m = GetAnnotationSpecReque
 func (m *GetAnnotationSpecRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAnnotationSpecRequest) ProtoMessage()    {}
 func (*GetAnnotationSpecRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{8}
+	return fileDescriptor_62cd04b8735a9250, []int{8}
 }
+
 func (m *GetAnnotationSpecRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAnnotationSpecRequest.Unmarshal(m, b)
 }
 func (m *GetAnnotationSpecRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAnnotationSpecRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAnnotationSpecRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAnnotationSpecRequest.Merge(dst, src)
+func (m *GetAnnotationSpecRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAnnotationSpecRequest.Merge(m, src)
 }
 func (m *GetAnnotationSpecRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAnnotationSpecRequest.Size(m)
@@ -491,16 +500,17 @@ func (m *GetTableSpecRequest) Reset()         { *m = GetTableSpecRequest{} }
 func (m *GetTableSpecRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTableSpecRequest) ProtoMessage()    {}
 func (*GetTableSpecRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{9}
+	return fileDescriptor_62cd04b8735a9250, []int{9}
 }
+
 func (m *GetTableSpecRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTableSpecRequest.Unmarshal(m, b)
 }
 func (m *GetTableSpecRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTableSpecRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTableSpecRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTableSpecRequest.Merge(dst, src)
+func (m *GetTableSpecRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTableSpecRequest.Merge(m, src)
 }
 func (m *GetTableSpecRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTableSpecRequest.Size(m)
@@ -550,16 +560,17 @@ func (m *ListTableSpecsRequest) Reset()         { *m = ListTableSpecsRequest{} }
 func (m *ListTableSpecsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTableSpecsRequest) ProtoMessage()    {}
 func (*ListTableSpecsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{10}
+	return fileDescriptor_62cd04b8735a9250, []int{10}
 }
+
 func (m *ListTableSpecsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTableSpecsRequest.Unmarshal(m, b)
 }
 func (m *ListTableSpecsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTableSpecsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTableSpecsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTableSpecsRequest.Merge(dst, src)
+func (m *ListTableSpecsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTableSpecsRequest.Merge(m, src)
 }
 func (m *ListTableSpecsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTableSpecsRequest.Size(m)
@@ -621,16 +632,17 @@ func (m *ListTableSpecsResponse) Reset()         { *m = ListTableSpecsResponse{}
 func (m *ListTableSpecsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTableSpecsResponse) ProtoMessage()    {}
 func (*ListTableSpecsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{11}
+	return fileDescriptor_62cd04b8735a9250, []int{11}
 }
+
 func (m *ListTableSpecsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTableSpecsResponse.Unmarshal(m, b)
 }
 func (m *ListTableSpecsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTableSpecsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTableSpecsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTableSpecsResponse.Merge(dst, src)
+func (m *ListTableSpecsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTableSpecsResponse.Merge(m, src)
 }
 func (m *ListTableSpecsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTableSpecsResponse.Size(m)
@@ -675,16 +687,17 @@ func (m *UpdateTableSpecRequest) Reset()         { *m = UpdateTableSpecRequest{}
 func (m *UpdateTableSpecRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateTableSpecRequest) ProtoMessage()    {}
 func (*UpdateTableSpecRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{12}
+	return fileDescriptor_62cd04b8735a9250, []int{12}
 }
+
 func (m *UpdateTableSpecRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateTableSpecRequest.Unmarshal(m, b)
 }
 func (m *UpdateTableSpecRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateTableSpecRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateTableSpecRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateTableSpecRequest.Merge(dst, src)
+func (m *UpdateTableSpecRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTableSpecRequest.Merge(m, src)
 }
 func (m *UpdateTableSpecRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateTableSpecRequest.Size(m)
@@ -724,16 +737,17 @@ func (m *GetColumnSpecRequest) Reset()         { *m = GetColumnSpecRequest{} }
 func (m *GetColumnSpecRequest) String() string { return proto.CompactTextString(m) }
 func (*GetColumnSpecRequest) ProtoMessage()    {}
 func (*GetColumnSpecRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{13}
+	return fileDescriptor_62cd04b8735a9250, []int{13}
 }
+
 func (m *GetColumnSpecRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetColumnSpecRequest.Unmarshal(m, b)
 }
 func (m *GetColumnSpecRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetColumnSpecRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetColumnSpecRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetColumnSpecRequest.Merge(dst, src)
+func (m *GetColumnSpecRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetColumnSpecRequest.Merge(m, src)
 }
 func (m *GetColumnSpecRequest) XXX_Size() int {
 	return xxx_messageInfo_GetColumnSpecRequest.Size(m)
@@ -783,16 +797,17 @@ func (m *ListColumnSpecsRequest) Reset()         { *m = ListColumnSpecsRequest{}
 func (m *ListColumnSpecsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListColumnSpecsRequest) ProtoMessage()    {}
 func (*ListColumnSpecsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{14}
+	return fileDescriptor_62cd04b8735a9250, []int{14}
 }
+
 func (m *ListColumnSpecsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListColumnSpecsRequest.Unmarshal(m, b)
 }
 func (m *ListColumnSpecsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListColumnSpecsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListColumnSpecsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListColumnSpecsRequest.Merge(dst, src)
+func (m *ListColumnSpecsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListColumnSpecsRequest.Merge(m, src)
 }
 func (m *ListColumnSpecsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListColumnSpecsRequest.Size(m)
@@ -854,16 +869,17 @@ func (m *ListColumnSpecsResponse) Reset()         { *m = ListColumnSpecsResponse
 func (m *ListColumnSpecsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListColumnSpecsResponse) ProtoMessage()    {}
 func (*ListColumnSpecsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{15}
+	return fileDescriptor_62cd04b8735a9250, []int{15}
 }
+
 func (m *ListColumnSpecsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListColumnSpecsResponse.Unmarshal(m, b)
 }
 func (m *ListColumnSpecsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListColumnSpecsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListColumnSpecsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListColumnSpecsResponse.Merge(dst, src)
+func (m *ListColumnSpecsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListColumnSpecsResponse.Merge(m, src)
 }
 func (m *ListColumnSpecsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListColumnSpecsResponse.Size(m)
@@ -908,16 +924,17 @@ func (m *UpdateColumnSpecRequest) Reset()         { *m = UpdateColumnSpecRequest
 func (m *UpdateColumnSpecRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateColumnSpecRequest) ProtoMessage()    {}
 func (*UpdateColumnSpecRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{16}
+	return fileDescriptor_62cd04b8735a9250, []int{16}
 }
+
 func (m *UpdateColumnSpecRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateColumnSpecRequest.Unmarshal(m, b)
 }
 func (m *UpdateColumnSpecRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateColumnSpecRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateColumnSpecRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateColumnSpecRequest.Merge(dst, src)
+func (m *UpdateColumnSpecRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateColumnSpecRequest.Merge(m, src)
 }
 func (m *UpdateColumnSpecRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateColumnSpecRequest.Size(m)
@@ -957,16 +974,17 @@ func (m *CreateModelRequest) Reset()         { *m = CreateModelRequest{} }
 func (m *CreateModelRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateModelRequest) ProtoMessage()    {}
 func (*CreateModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{17}
+	return fileDescriptor_62cd04b8735a9250, []int{17}
 }
+
 func (m *CreateModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateModelRequest.Unmarshal(m, b)
 }
 func (m *CreateModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateModelRequest.Merge(dst, src)
+func (m *CreateModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateModelRequest.Merge(m, src)
 }
 func (m *CreateModelRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateModelRequest.Size(m)
@@ -1004,16 +1022,17 @@ func (m *GetModelRequest) Reset()         { *m = GetModelRequest{} }
 func (m *GetModelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetModelRequest) ProtoMessage()    {}
 func (*GetModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{18}
+	return fileDescriptor_62cd04b8735a9250, []int{18}
 }
+
 func (m *GetModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetModelRequest.Unmarshal(m, b)
 }
 func (m *GetModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetModelRequest.Merge(dst, src)
+func (m *GetModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetModelRequest.Merge(m, src)
 }
 func (m *GetModelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetModelRequest.Size(m)
@@ -1061,16 +1080,17 @@ func (m *ListModelsRequest) Reset()         { *m = ListModelsRequest{} }
 func (m *ListModelsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListModelsRequest) ProtoMessage()    {}
 func (*ListModelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{19}
+	return fileDescriptor_62cd04b8735a9250, []int{19}
 }
+
 func (m *ListModelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelsRequest.Unmarshal(m, b)
 }
 func (m *ListModelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListModelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelsRequest.Merge(dst, src)
+func (m *ListModelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsRequest.Merge(m, src)
 }
 func (m *ListModelsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListModelsRequest.Size(m)
@@ -1125,16 +1145,17 @@ func (m *ListModelsResponse) Reset()         { *m = ListModelsResponse{} }
 func (m *ListModelsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListModelsResponse) ProtoMessage()    {}
 func (*ListModelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{20}
+	return fileDescriptor_62cd04b8735a9250, []int{20}
 }
+
 func (m *ListModelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelsResponse.Unmarshal(m, b)
 }
 func (m *ListModelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListModelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelsResponse.Merge(dst, src)
+func (m *ListModelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsResponse.Merge(m, src)
 }
 func (m *ListModelsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListModelsResponse.Size(m)
@@ -1172,16 +1193,17 @@ func (m *DeleteModelRequest) Reset()         { *m = DeleteModelRequest{} }
 func (m *DeleteModelRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteModelRequest) ProtoMessage()    {}
 func (*DeleteModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{21}
+	return fileDescriptor_62cd04b8735a9250, []int{21}
 }
+
 func (m *DeleteModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteModelRequest.Unmarshal(m, b)
 }
 func (m *DeleteModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteModelRequest.Merge(dst, src)
+func (m *DeleteModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteModelRequest.Merge(m, src)
 }
 func (m *DeleteModelRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteModelRequest.Size(m)
@@ -1217,16 +1239,17 @@ func (m *DeployModelRequest) Reset()         { *m = DeployModelRequest{} }
 func (m *DeployModelRequest) String() string { return proto.CompactTextString(m) }
 func (*DeployModelRequest) ProtoMessage()    {}
 func (*DeployModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{22}
+	return fileDescriptor_62cd04b8735a9250, []int{22}
 }
+
 func (m *DeployModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeployModelRequest.Unmarshal(m, b)
 }
 func (m *DeployModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeployModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeployModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeployModelRequest.Merge(dst, src)
+func (m *DeployModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeployModelRequest.Merge(m, src)
 }
 func (m *DeployModelRequest) XXX_Size() int {
 	return xxx_messageInfo_DeployModelRequest.Size(m)
@@ -1269,61 +1292,13 @@ func (m *DeployModelRequest) GetName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DeployModelRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DeployModelRequest_OneofMarshaler, _DeployModelRequest_OneofUnmarshaler, _DeployModelRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DeployModelRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DeployModelRequest_ImageObjectDetectionModelDeploymentMetadata)(nil),
 	}
 }
 
-func _DeployModelRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DeployModelRequest)
-	// model_deployment_metadata
-	switch x := m.ModelDeploymentMetadata.(type) {
-	case *DeployModelRequest_ImageObjectDetectionModelDeploymentMetadata:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageObjectDetectionModelDeploymentMetadata); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DeployModelRequest.ModelDeploymentMetadata has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DeployModelRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DeployModelRequest)
-	switch tag {
-	case 2: // model_deployment_metadata.image_object_detection_model_deployment_metadata
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageObjectDetectionModelDeploymentMetadata)
-		err := b.DecodeMessage(msg)
-		m.ModelDeploymentMetadata = &DeployModelRequest_ImageObjectDetectionModelDeploymentMetadata{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DeployModelRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DeployModelRequest)
-	// model_deployment_metadata
-	switch x := m.ModelDeploymentMetadata.(type) {
-	case *DeployModelRequest_ImageObjectDetectionModelDeploymentMetadata:
-		s := proto.Size(x.ImageObjectDetectionModelDeploymentMetadata)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for [AutoMl.UndeployModel][google.cloud.automl.v1beta1.AutoMl.UndeployModel].
 type UndeployModelRequest struct {
 	// Resource name of the model to undeploy.
@@ -1337,16 +1312,17 @@ func (m *UndeployModelRequest) Reset()         { *m = UndeployModelRequest{} }
 func (m *UndeployModelRequest) String() string { return proto.CompactTextString(m) }
 func (*UndeployModelRequest) ProtoMessage()    {}
 func (*UndeployModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{23}
+	return fileDescriptor_62cd04b8735a9250, []int{23}
 }
+
 func (m *UndeployModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeployModelRequest.Unmarshal(m, b)
 }
 func (m *UndeployModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeployModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *UndeployModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeployModelRequest.Merge(dst, src)
+func (m *UndeployModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeployModelRequest.Merge(m, src)
 }
 func (m *UndeployModelRequest) XXX_Size() int {
 	return xxx_messageInfo_UndeployModelRequest.Size(m)
@@ -1381,16 +1357,17 @@ func (m *ExportModelRequest) Reset()         { *m = ExportModelRequest{} }
 func (m *ExportModelRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportModelRequest) ProtoMessage()    {}
 func (*ExportModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{24}
+	return fileDescriptor_62cd04b8735a9250, []int{24}
 }
+
 func (m *ExportModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportModelRequest.Unmarshal(m, b)
 }
 func (m *ExportModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportModelRequest.Merge(dst, src)
+func (m *ExportModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportModelRequest.Merge(m, src)
 }
 func (m *ExportModelRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportModelRequest.Size(m)
@@ -1431,16 +1408,17 @@ func (m *ExportEvaluatedExamplesRequest) Reset()         { *m = ExportEvaluatedE
 func (m *ExportEvaluatedExamplesRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportEvaluatedExamplesRequest) ProtoMessage()    {}
 func (*ExportEvaluatedExamplesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{25}
+	return fileDescriptor_62cd04b8735a9250, []int{25}
 }
+
 func (m *ExportEvaluatedExamplesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEvaluatedExamplesRequest.Unmarshal(m, b)
 }
 func (m *ExportEvaluatedExamplesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEvaluatedExamplesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportEvaluatedExamplesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEvaluatedExamplesRequest.Merge(dst, src)
+func (m *ExportEvaluatedExamplesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEvaluatedExamplesRequest.Merge(m, src)
 }
 func (m *ExportEvaluatedExamplesRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportEvaluatedExamplesRequest.Size(m)
@@ -1478,16 +1456,17 @@ func (m *GetModelEvaluationRequest) Reset()         { *m = GetModelEvaluationReq
 func (m *GetModelEvaluationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetModelEvaluationRequest) ProtoMessage()    {}
 func (*GetModelEvaluationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{26}
+	return fileDescriptor_62cd04b8735a9250, []int{26}
 }
+
 func (m *GetModelEvaluationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetModelEvaluationRequest.Unmarshal(m, b)
 }
 func (m *GetModelEvaluationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetModelEvaluationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetModelEvaluationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetModelEvaluationRequest.Merge(dst, src)
+func (m *GetModelEvaluationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetModelEvaluationRequest.Merge(m, src)
 }
 func (m *GetModelEvaluationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetModelEvaluationRequest.Size(m)
@@ -1539,16 +1518,17 @@ func (m *ListModelEvaluationsRequest) Reset()         { *m = ListModelEvaluation
 func (m *ListModelEvaluationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListModelEvaluationsRequest) ProtoMessage()    {}
 func (*ListModelEvaluationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{27}
+	return fileDescriptor_62cd04b8735a9250, []int{27}
 }
+
 func (m *ListModelEvaluationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelEvaluationsRequest.Unmarshal(m, b)
 }
 func (m *ListModelEvaluationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelEvaluationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListModelEvaluationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelEvaluationsRequest.Merge(dst, src)
+func (m *ListModelEvaluationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelEvaluationsRequest.Merge(m, src)
 }
 func (m *ListModelEvaluationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListModelEvaluationsRequest.Size(m)
@@ -1604,16 +1584,17 @@ func (m *ListModelEvaluationsResponse) Reset()         { *m = ListModelEvaluatio
 func (m *ListModelEvaluationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListModelEvaluationsResponse) ProtoMessage()    {}
 func (*ListModelEvaluationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_49f84df6902cc1f1, []int{28}
+	return fileDescriptor_62cd04b8735a9250, []int{28}
 }
+
 func (m *ListModelEvaluationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelEvaluationsResponse.Unmarshal(m, b)
 }
 func (m *ListModelEvaluationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelEvaluationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListModelEvaluationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelEvaluationsResponse.Merge(dst, src)
+func (m *ListModelEvaluationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelEvaluationsResponse.Merge(m, src)
 }
 func (m *ListModelEvaluationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListModelEvaluationsResponse.Size(m)
@@ -1670,6 +1651,125 @@ func init() {
 	proto.RegisterType((*ListModelEvaluationsResponse)(nil), "google.cloud.automl.v1beta1.ListModelEvaluationsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/service.proto", fileDescriptor_62cd04b8735a9250)
+}
+
+var fileDescriptor_62cd04b8735a9250 = []byte{
+	// 1776 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0x14, 0x47,
+	0x16, 0xdf, 0x32, 0xe0, 0xc5, 0x6f, 0xec, 0x35, 0x2e, 0xbc, 0xc6, 0xb4, 0x61, 0xd7, 0xea, 0x65,
+	0xc1, 0x18, 0x76, 0x1a, 0x8f, 0xbd, 0xac, 0x3f, 0x00, 0xe1, 0x2f, 0x86, 0x2f, 0x03, 0x32, 0xb0,
+	0xec, 0x46, 0x44, 0xa3, 0xf6, 0x4c, 0x79, 0xd4, 0xa1, 0xa7, 0xab, 0x33, 0xdd, 0xe3, 0x18, 0x22,
+	0x94, 0xaf, 0x13, 0x87, 0x44, 0x8a, 0x50, 0x72, 0x09, 0x51, 0x38, 0x44, 0x9c, 0xa2, 0x28, 0x91,
+	0x72, 0x4e, 0x14, 0x29, 0x8a, 0x94, 0x48, 0xb9, 0x24, 0x87, 0x5c, 0x73, 0xc8, 0x3f, 0x91, 0x5b,
+	0xd4, 0x55, 0xd5, 0x1f, 0x33, 0xdd, 0xee, 0xae, 0x19, 0xcb, 0x42, 0xb9, 0xb9, 0xdb, 0xef, 0xd5,
+	0xfb, 0xbd, 0xaf, 0xea, 0xf7, 0x7b, 0x03, 0xc7, 0xab, 0x94, 0x56, 0x4d, 0xa2, 0x95, 0x4d, 0xda,
+	0xa8, 0x68, 0x7a, 0xc3, 0xa5, 0x35, 0x53, 0xdb, 0x98, 0x58, 0x23, 0xae, 0x3e, 0xa1, 0x39, 0xa4,
+	0xbe, 0x61, 0x94, 0x49, 0xde, 0xae, 0x53, 0x97, 0xe2, 0x11, 0x2e, 0x9a, 0x67, 0xa2, 0x79, 0x2e,
+	0x9a, 0x17, 0xa2, 0xca, 0x21, 0x71, 0x8e, 0x6e, 0x1b, 0x9a, 0x6e, 0x59, 0xd4, 0xd5, 0x5d, 0x83,
+	0x5a, 0x0e, 0x57, 0x55, 0xa6, 0xd2, 0xac, 0x84, 0xe2, 0x25, 0x5b, 0xbf, 0x6f, 0x52, 0xbd, 0x22,
+	0xb4, 0xfe, 0x95, 0xa6, 0x55, 0xa6, 0x66, 0xa3, 0x66, 0x95, 0x1c, 0x9b, 0x94, 0x85, 0x78, 0xaa,
+	0x2b, 0x15, 0xdd, 0xd5, 0x1d, 0xe2, 0x0a, 0xd1, 0x63, 0x69, 0xa2, 0x46, 0x4d, 0xaf, 0x0a, 0x9f,
+	0x95, 0x23, 0xa9, 0x82, 0x54, 0xe6, 0xb8, 0x1a, 0xad, 0x10, 0x53, 0x08, 0x16, 0x32, 0x05, 0x4b,
+	0x64, 0x43, 0x37, 0x1b, 0x2c, 0x1a, 0x42, 0xe7, 0x64, 0x9a, 0x0e, 0xb5, 0x49, 0xbd, 0x29, 0xd2,
+	0xa9, 0xd2, 0xae, 0xbe, 0x66, 0x92, 0x68, 0xc8, 0xfe, 0x21, 0xa4, 0x4d, 0x6a, 0x55, 0xeb, 0x0d,
+	0xcb, 0x32, 0xac, 0x6a, 0xfc, 0xc8, 0x51, 0x21, 0xc4, 0x9e, 0xd6, 0x1a, 0xeb, 0xda, 0xba, 0x41,
+	0xcc, 0x4a, 0xa9, 0xa6, 0x3b, 0xf7, 0xb8, 0x84, 0x6a, 0xc1, 0xe0, 0x62, 0x9d, 0xe8, 0x2e, 0x59,
+	0xe2, 0x51, 0x5e, 0x25, 0x2f, 0x37, 0x88, 0xe3, 0xe2, 0x21, 0xe8, 0xb6, 0xf5, 0x3a, 0xb1, 0xdc,
+	0x61, 0x34, 0x8a, 0xc6, 0x7a, 0x56, 0xc5, 0x13, 0x3e, 0x07, 0x7f, 0x16, 0xf9, 0x18, 0xee, 0x1a,
+	0x45, 0x63, 0xb9, 0xc2, 0x91, 0x7c, 0x4a, 0x6d, 0xe5, 0xfd, 0x53, 0x7d, 0x25, 0xf5, 0x18, 0x0c,
+	0x14, 0x89, 0xdb, 0x62, 0x0c, 0xc3, 0x6e, 0x4b, 0xaf, 0x11, 0x61, 0x8a, 0xfd, 0xad, 0xbe, 0x81,
+	0x60, 0xff, 0x55, 0xc3, 0xf1, 0x45, 0x9d, 0x2c, 0x60, 0x43, 0xd0, 0xbd, 0x6e, 0x98, 0x2e, 0xa9,
+	0x0f, 0xef, 0xe2, 0xef, 0xf9, 0x13, 0x1e, 0x81, 0x1e, 0x5b, 0xaf, 0x92, 0x92, 0x63, 0x3c, 0x20,
+	0xc3, 0xbb, 0x47, 0xd1, 0xd8, 0x9e, 0xd5, 0xbd, 0xde, 0x8b, 0x9b, 0xc6, 0x03, 0x82, 0x0f, 0x03,
+	0xb0, 0x7f, 0xba, 0xf4, 0x1e, 0xb1, 0x86, 0xbb, 0x99, 0x22, 0x13, 0xbf, 0xe5, 0xbd, 0x50, 0x5f,
+	0x47, 0x30, 0xd8, 0x8c, 0xc1, 0xb1, 0xa9, 0xe5, 0x10, 0x7c, 0x1e, 0xf6, 0x0a, 0x87, 0x9c, 0x61,
+	0x34, 0xba, 0x4b, 0x3a, 0x0c, 0x81, 0x16, 0x3e, 0x0a, 0xfd, 0x16, 0xd9, 0x74, 0x4b, 0x11, 0xf3,
+	0x5d, 0xcc, 0x7c, 0x9f, 0xf7, 0xfa, 0x46, 0x00, 0xe1, 0x31, 0x82, 0xc1, 0xdb, 0x76, 0x25, 0x9e,
+	0xa0, 0x48, 0x22, 0x50, 0x07, 0x89, 0xc0, 0x73, 0x90, 0x6b, 0xb0, 0x73, 0x59, 0x35, 0x88, 0x64,
+	0x2a, 0xfe, 0x19, 0x7e, 0xc1, 0xe4, 0x2f, 0x78, 0x05, 0xb3, 0xa2, 0x3b, 0xf7, 0x56, 0x81, 0x8b,
+	0x7b, 0x7f, 0xab, 0xe3, 0x30, 0xb8, 0x44, 0x4c, 0x12, 0x03, 0x95, 0x94, 0x48, 0x17, 0x06, 0x2e,
+	0xd5, 0x6c, 0x5a, 0x67, 0x51, 0x4c, 0x11, 0xc4, 0x57, 0xa0, 0xd7, 0xb0, 0xec, 0x86, 0x5b, 0x2a,
+	0x53, 0x6b, 0xdd, 0xa8, 0xb2, 0x3c, 0xe6, 0x0a, 0x63, 0xa9, 0x6e, 0x5d, 0xf2, 0x14, 0x16, 0x99,
+	0xfc, 0x6a, 0xce, 0x08, 0x1f, 0xd4, 0x57, 0x60, 0x60, 0x79, 0x53, 0xc6, 0xea, 0x35, 0xe8, 0xa3,
+	0x0d, 0x37, 0x66, 0xf6, 0x78, 0xaa, 0xd9, 0xeb, 0x4c, 0x43, 0xd8, 0xed, 0xa5, 0x91, 0x27, 0x35,
+	0x0f, 0xc3, 0x45, 0xe2, 0xce, 0x07, 0x17, 0xe3, 0x4d, 0x9b, 0x94, 0xd3, 0xc2, 0x53, 0x81, 0xfd,
+	0x45, 0xe2, 0xde, 0xf2, 0xda, 0x3b, 0x43, 0x14, 0xcf, 0x00, 0x84, 0xfd, 0x2b, 0x91, 0xb1, 0x9e,
+	0x75, 0xff, 0x4f, 0xf5, 0x4b, 0x04, 0x7f, 0xf5, 0x2a, 0x39, 0xb0, 0x93, 0xd9, 0x4f, 0x9d, 0x1b,
+	0xdb, 0x91, 0x56, 0x7c, 0x84, 0x60, 0xa8, 0xd5, 0x01, 0xd1, 0x8c, 0x45, 0xc8, 0x85, 0xb7, 0xa3,
+	0xdf, 0x8f, 0x47, 0x53, 0xf3, 0x17, 0x86, 0x1b, 0xdc, 0xe0, 0x40, 0xe9, 0x9e, 0x7c, 0x82, 0x60,
+	0x88, 0xf7, 0x64, 0x2c, 0x6d, 0xcb, 0x00, 0x21, 0x16, 0xd1, 0x98, 0xb2, 0x50, 0x7a, 0x02, 0x28,
+	0xdb, 0x6b, 0x4e, 0x02, 0x83, 0x45, 0xe2, 0x2e, 0xb2, 0x8f, 0xec, 0x0e, 0x96, 0xd4, 0x57, 0x22,
+	0x23, 0xa1, 0xa1, 0x3f, 0x5a, 0x4d, 0xbd, 0x8d, 0xe0, 0x40, 0xcc, 0x03, 0x51, 0x54, 0x97, 0xa1,
+	0x37, 0x32, 0xa6, 0xf8, 0x55, 0x75, 0x2c, 0x35, 0x95, 0x91, 0x90, 0xe7, 0xca, 0xe1, 0x99, 0xd2,
+	0x75, 0xf5, 0x14, 0xc1, 0x01, 0x5e, 0x57, 0xf1, 0xe4, 0x5d, 0x84, 0x5c, 0x04, 0x8f, 0xa8, 0x2c,
+	0x69, 0x38, 0x10, 0xc2, 0xd9, 0x5e, 0x6d, 0xad, 0x03, 0xe6, 0xe3, 0xc2, 0x8a, 0x37, 0xf1, 0x64,
+	0xe5, 0x7b, 0x1a, 0xf6, 0xb0, 0xc9, 0x88, 0x25, 0x26, 0x57, 0x50, 0x53, 0xe1, 0xf2, 0x13, 0xb9,
+	0x82, 0xfa, 0x4f, 0xe8, 0x2f, 0x12, 0xb7, 0xc9, 0x48, 0xd2, 0xe5, 0xf9, 0x1a, 0x0c, 0x78, 0x09,
+	0x64, 0x72, 0xcf, 0x65, 0x42, 0xd8, 0x00, 0x1c, 0x05, 0x20, 0x8a, 0x27, 0xf0, 0x9b, 0x57, 0x8d,
+	0xbc, 0xdf, 0xd2, 0xa5, 0x32, 0x06, 0x98, 0x7f, 0x80, 0x33, 0x43, 0xf4, 0x1b, 0xf2, 0x44, 0x6d,
+	0x93, 0xde, 0x6f, 0x12, 0xfd, 0x1c, 0xc1, 0x29, 0x36, 0x2d, 0x97, 0xe8, 0xda, 0x4b, 0xa4, 0xec,
+	0x96, 0x2a, 0xc4, 0x25, 0x65, 0x36, 0xc9, 0xf3, 0x61, 0xb6, 0xc2, 0x74, 0x6a, 0xc4, 0x72, 0x4b,
+	0x35, 0xe2, 0xea, 0xde, 0xd8, 0x20, 0x6a, 0xe5, 0x62, 0xfa, 0x17, 0xd9, 0x3b, 0xf4, 0x3a, 0x3b,
+	0x73, 0xc9, 0x3f, 0x92, 0x59, 0x5e, 0x0a, 0x0e, 0x5c, 0x11, 0xe7, 0x5d, 0xfc, 0xd3, 0xea, 0x09,
+	0x43, 0x5e, 0x3c, 0xc9, 0xbd, 0x85, 0x11, 0x38, 0xb8, 0x25, 0x5e, 0x6f, 0x4c, 0xb9, 0x6d, 0x55,
+	0xe2, 0xce, 0x27, 0xc5, 0xe9, 0x2d, 0x04, 0x98, 0x4f, 0x0c, 0x59, 0xa2, 0xf8, 0xff, 0xc9, 0x23,
+	0xc3, 0x54, 0x76, 0x9a, 0xb9, 0x81, 0x94, 0xe9, 0xe1, 0x03, 0x04, 0x7f, 0xe3, 0x42, 0xcb, 0x9c,
+	0x4c, 0x90, 0xca, 0xf2, 0xa6, 0x5e, 0xb3, 0x4d, 0xe2, 0xa4, 0x21, 0x22, 0xc9, 0x88, 0xce, 0xa7,
+	0x22, 0xda, 0xc2, 0x4e, 0x0a, 0x3a, 0x0d, 0x0e, 0xfa, 0x5d, 0xb9, 0x1c, 0x70, 0x9d, 0xb4, 0xa0,
+	0x3e, 0x42, 0x30, 0x12, 0xf4, 0x47, 0xa8, 0xf2, 0x5c, 0x5a, 0xf5, 0x23, 0x04, 0x87, 0x92, 0xb1,
+	0x88, 0xae, 0xbd, 0x03, 0xfb, 0x5a, 0x79, 0x9c, 0x68, 0xe0, 0x93, 0x12, 0x99, 0x0d, 0xe3, 0xd1,
+	0x5f, 0x6b, 0x7e, 0x21, 0xdb, 0xd4, 0x85, 0x77, 0x54, 0xe8, 0x9e, 0x6f, 0xb8, 0x74, 0xc5, 0xc4,
+	0x9f, 0x20, 0xe8, 0x6b, 0xe2, 0x65, 0x78, 0x22, 0xfd, 0xae, 0x4f, 0xe0, 0x70, 0x8a, 0x14, 0x23,
+	0x50, 0x17, 0xde, 0xfc, 0xe9, 0xd7, 0xc7, 0x5d, 0x67, 0xd4, 0x89, 0x80, 0x6b, 0xbe, 0xca, 0xb3,
+	0x70, 0xd6, 0xae, 0x53, 0xaf, 0x2f, 0x1d, 0x6d, 0x5c, 0x33, 0x69, 0x99, 0x47, 0x4b, 0x1b, 0x7f,
+	0xe8, 0x13, 0x72, 0x67, 0x36, 0x20, 0x13, 0x1f, 0x22, 0x80, 0x90, 0xd6, 0xe1, 0x7c, 0xaa, 0xe1,
+	0x18, 0xff, 0x93, 0x04, 0x3a, 0xc3, 0x80, 0x4e, 0xe2, 0x08, 0x50, 0xaf, 0xc8, 0xb6, 0x80, 0x19,
+	0xa0, 0xd4, 0xc6, 0x1f, 0xe2, 0x4f, 0x11, 0xf4, 0x46, 0x89, 0x1c, 0x3e, 0x95, 0x6a, 0x31, 0x81,
+	0x77, 0x2a, 0x13, 0x6d, 0x68, 0xf0, 0x82, 0x4a, 0x02, 0x2c, 0x19, 0x59, 0xfc, 0x05, 0x82, 0xbe,
+	0x26, 0xda, 0x97, 0x91, 0xff, 0x24, 0x8a, 0x28, 0x19, 0xd6, 0xcb, 0x0c, 0xe5, 0x52, 0x61, 0x26,
+	0x44, 0xe9, 0x6f, 0x5c, 0x24, 0xc3, 0x1b, 0xd6, 0xc1, 0x13, 0x04, 0x7d, 0x4d, 0xc4, 0x30, 0x03,
+	0x76, 0x12, 0x89, 0x54, 0x0e, 0xfb, 0x2a, 0x91, 0xd5, 0x46, 0xfe, 0xba, 0xbf, 0xda, 0xf0, 0xa3,
+	0x3a, 0xde, 0x41, 0x19, 0x7c, 0x8c, 0x00, 0x42, 0x2e, 0x9a, 0x51, 0xa6, 0x31, 0xd2, 0x9a, 0x05,
+	0xac, 0xc8, 0x80, 0xcd, 0xab, 0x67, 0xda, 0x06, 0x36, 0x6b, 0x04, 0xb6, 0x66, 0xd1, 0x38, 0x83,
+	0x19, 0x92, 0xd7, 0x0c, 0x98, 0x31, 0x96, 0xbb, 0x83, 0x30, 0xc9, 0x66, 0x14, 0xe6, 0x37, 0x88,
+	0xed, 0x72, 0x9a, 0xa9, 0x2e, 0xfe, 0x77, 0x56, 0xef, 0x27, 0x52, 0x63, 0xe5, 0x44, 0xaa, 0x5a,
+	0xb3, 0x8e, 0x7a, 0x85, 0xb9, 0xb0, 0x8c, 0x17, 0xdb, 0x75, 0x21, 0xb2, 0xb0, 0x64, 0xa3, 0xb9,
+	0x57, 0x14, 0x9f, 0x21, 0xe8, 0x8d, 0x32, 0xf0, 0x8c, 0xbb, 0x21, 0x81, 0xac, 0x2b, 0x92, 0x0c,
+	0x4f, 0xbd, 0xc0, 0x70, 0x9f, 0xc7, 0xe7, 0xda, 0xc6, 0x1d, 0xb2, 0x54, 0x0f, 0xf2, 0xd7, 0x08,
+	0xfe, 0xd2, 0x4c, 0x86, 0x71, 0x21, 0xf3, 0x7a, 0x8a, 0x51, 0x7f, 0x65, 0xb2, 0x2d, 0x1d, 0x71,
+	0xa9, 0x25, 0xf8, 0x90, 0x7a, 0xa9, 0x45, 0x0b, 0x28, 0xe2, 0x06, 0xfe, 0x01, 0x41, 0x7f, 0x0b,
+	0x89, 0xc6, 0x93, 0x12, 0x77, 0x5c, 0xc7, 0xc1, 0x7f, 0x91, 0x01, 0xbf, 0x53, 0xb8, 0x14, 0x02,
+	0x8f, 0x2c, 0x55, 0x3b, 0xc9, 0xc3, 0x6c, 0x84, 0xeb, 0x7b, 0x39, 0xe9, 0x6b, 0xa2, 0xdd, 0x19,
+	0x57, 0x5f, 0x12, 0x45, 0x57, 0x64, 0x09, 0x9d, 0x7a, 0x8b, 0x39, 0x73, 0x0d, 0x5f, 0xdd, 0x56,
+	0x25, 0x69, 0x11, 0x96, 0xea, 0xd5, 0xd5, 0x8f, 0x08, 0xfa, 0x5b, 0x08, 0x31, 0xce, 0x2e, 0x92,
+	0xf8, 0x02, 0x40, 0x99, 0x6a, 0x4f, 0x49, 0x94, 0x56, 0x82, 0x53, 0xb2, 0xa5, 0xd5, 0x9c, 0x98,
+	0xa8, 0x5f, 0xf8, 0x17, 0x04, 0xfb, 0x5a, 0x59, 0x35, 0x9e, 0x92, 0xa8, 0xb4, 0x6d, 0xa4, 0xa7,
+	0xc6, 0x3c, 0xa9, 0x16, 0xfe, 0x17, 0x7a, 0x12, 0xfd, 0xd1, 0x63, 0xfb, 0xa9, 0x9a, 0x8d, 0x6e,
+	0x03, 0xbc, 0xf1, 0x2b, 0x17, 0xa1, 0xe5, 0x58, 0x93, 0x98, 0x15, 0xa3, 0x2c, 0x27, 0xeb, 0x93,
+	0x71, 0x8e, 0xb9, 0x33, 0xad, 0x6a, 0xd2, 0x83, 0x0c, 0x1b, 0x81, 0x9d, 0x59, 0xc1, 0x6a, 0xdf,
+	0x43, 0xb0, 0xd7, 0x27, 0x0e, 0xf8, 0x64, 0x56, 0x5b, 0x34, 0x21, 0x93, 0xe0, 0xce, 0xea, 0x7f,
+	0x18, 0xbc, 0x09, 0xac, 0xc9, 0x35, 0x03, 0xc7, 0xe6, 0xd5, 0xfb, 0x33, 0x04, 0x10, 0xd2, 0xf7,
+	0x8c, 0x0f, 0x6d, 0x6c, 0xd1, 0xa0, 0x68, 0xd2, 0xf2, 0xa2, 0xc0, 0x13, 0x80, 0x4a, 0xc5, 0x11,
+	0xbf, 0x8f, 0x20, 0x17, 0xe1, 0xfb, 0x19, 0x09, 0x8e, 0x6f, 0x06, 0xb2, 0x12, 0x2c, 0x80, 0x8d,
+	0xb7, 0x1d, 0xc1, 0xa7, 0x0c, 0x58, 0x40, 0xb0, 0x33, 0x81, 0xb5, 0x52, 0xf1, 0x2c, 0x60, 0xf3,
+	0x0c, 0xd8, 0x9c, 0x7a, 0xba, 0x4d, 0x60, 0xb3, 0x9c, 0xf5, 0x7b, 0x63, 0xca, 0x33, 0x6f, 0x94,
+	0x8e, 0x6e, 0x01, 0xb2, 0x46, 0xe9, 0x84, 0x8d, 0x41, 0x16, 0xcc, 0x45, 0x06, 0xf3, 0xac, 0x3a,
+	0xdd, 0x2e, 0xcc, 0x86, 0x15, 0x02, 0xf5, 0x62, 0x19, 0xd9, 0x40, 0x64, 0xc4, 0x32, 0xbe, 0xab,
+	0xd8, 0xb1, 0x58, 0xf2, 0xb1, 0xcf, 0x83, 0xf8, 0x1d, 0x82, 0x03, 0x5b, 0xac, 0x0d, 0xf0, 0x5c,
+	0x27, 0xcb, 0x06, 0x49, 0xe8, 0xab, 0x0c, 0xfa, 0x55, 0xb5, 0xd8, 0x19, 0xf4, 0x98, 0x59, 0xcf,
+	0x97, 0x6f, 0x11, 0xe0, 0xf8, 0x36, 0x03, 0x9f, 0x96, 0xba, 0x9e, 0x62, 0xeb, 0x0f, 0xa5, 0xad,
+	0x1d, 0x81, 0x4f, 0xba, 0xf0, 0x42, 0x7b, 0x0e, 0x69, 0x2d, 0xab, 0x05, 0xd6, 0x83, 0x3f, 0x8b,
+	0x5f, 0x29, 0x5b, 0x17, 0x1b, 0x78, 0x5a, 0xee, 0x7e, 0x8a, 0xef, 0x65, 0x94, 0x99, 0x0e, 0x34,
+	0xc5, 0x1d, 0x97, 0xe0, 0x59, 0xfa, 0x47, 0x3c, 0x48, 0x56, 0xcc, 0xb9, 0x85, 0x77, 0x11, 0xfc,
+	0xbd, 0x4c, 0x6b, 0x69, 0x60, 0x16, 0x72, 0x7c, 0x63, 0x72, 0xa3, 0x4e, 0x5d, 0x7a, 0x03, 0xbd,
+	0x30, 0x2f, 0x64, 0xab, 0xd4, 0xd4, 0xad, 0x6a, 0x9e, 0xd6, 0xab, 0x5a, 0x95, 0x58, 0x6c, 0xab,
+	0xad, 0xf1, 0x7f, 0xe9, 0xb6, 0xe1, 0x24, 0xfe, 0xc6, 0x3e, 0xc7, 0x1f, 0xbf, 0xef, 0x1a, 0x29,
+	0x32, 0xc1, 0xbb, 0x8b, 0x9e, 0xd0, 0x5d, 0x7e, 0xfe, 0xdd, 0xff, 0x72, 0xa1, 0xb5, 0x6e, 0x76,
+	0xd6, 0xe4, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xe1, 0xf9, 0x9a, 0x7e, 0x21, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2664,122 +2764,3 @@ var _AutoMl_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/automl/v1beta1/service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/service.proto", fileDescriptor_service_49f84df6902cc1f1)
-}
-
-var fileDescriptor_service_49f84df6902cc1f1 = []byte{
-	// 1776 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0x14, 0x47,
-	0x16, 0xdf, 0x32, 0xe0, 0xc5, 0x6f, 0xec, 0x35, 0x2e, 0xbc, 0xc6, 0xb4, 0x61, 0xd7, 0xea, 0x65,
-	0xc1, 0x18, 0x76, 0x1a, 0x8f, 0xbd, 0xac, 0x3f, 0x00, 0xe1, 0x2f, 0x86, 0x2f, 0x03, 0x32, 0xb0,
-	0xec, 0x46, 0x44, 0xa3, 0xf6, 0x4c, 0x79, 0xd4, 0xa1, 0xa7, 0xab, 0x33, 0xdd, 0xe3, 0x18, 0x22,
-	0x94, 0xaf, 0x13, 0x87, 0x44, 0x8a, 0x50, 0x72, 0x09, 0x51, 0x38, 0x44, 0x9c, 0xa2, 0x28, 0x91,
-	0x72, 0x4e, 0x14, 0x29, 0x8a, 0x94, 0x48, 0xb9, 0x24, 0x87, 0x5c, 0x73, 0xc8, 0x3f, 0x91, 0x5b,
-	0xd4, 0x55, 0xd5, 0x1f, 0x33, 0xdd, 0xee, 0xae, 0x19, 0xcb, 0x42, 0xb9, 0xb9, 0xdb, 0xef, 0xd5,
-	0xfb, 0xbd, 0xaf, 0xea, 0xf7, 0x7b, 0x03, 0xc7, 0xab, 0x94, 0x56, 0x4d, 0xa2, 0x95, 0x4d, 0xda,
-	0xa8, 0x68, 0x7a, 0xc3, 0xa5, 0x35, 0x53, 0xdb, 0x98, 0x58, 0x23, 0xae, 0x3e, 0xa1, 0x39, 0xa4,
-	0xbe, 0x61, 0x94, 0x49, 0xde, 0xae, 0x53, 0x97, 0xe2, 0x11, 0x2e, 0x9a, 0x67, 0xa2, 0x79, 0x2e,
-	0x9a, 0x17, 0xa2, 0xca, 0x21, 0x71, 0x8e, 0x6e, 0x1b, 0x9a, 0x6e, 0x59, 0xd4, 0xd5, 0x5d, 0x83,
-	0x5a, 0x0e, 0x57, 0x55, 0xa6, 0xd2, 0xac, 0x84, 0xe2, 0x25, 0x5b, 0xbf, 0x6f, 0x52, 0xbd, 0x22,
-	0xb4, 0xfe, 0x95, 0xa6, 0x55, 0xa6, 0x66, 0xa3, 0x66, 0x95, 0x1c, 0x9b, 0x94, 0x85, 0x78, 0xaa,
-	0x2b, 0x15, 0xdd, 0xd5, 0x1d, 0xe2, 0x0a, 0xd1, 0x63, 0x69, 0xa2, 0x46, 0x4d, 0xaf, 0x0a, 0x9f,
-	0x95, 0x23, 0xa9, 0x82, 0x54, 0xe6, 0xb8, 0x1a, 0xad, 0x10, 0x53, 0x08, 0x16, 0x32, 0x05, 0x4b,
-	0x64, 0x43, 0x37, 0x1b, 0x2c, 0x1a, 0x42, 0xe7, 0x64, 0x9a, 0x0e, 0xb5, 0x49, 0xbd, 0x29, 0xd2,
-	0xa9, 0xd2, 0xae, 0xbe, 0x66, 0x92, 0x68, 0xc8, 0xfe, 0x21, 0xa4, 0x4d, 0x6a, 0x55, 0xeb, 0x0d,
-	0xcb, 0x32, 0xac, 0x6a, 0xfc, 0xc8, 0x51, 0x21, 0xc4, 0x9e, 0xd6, 0x1a, 0xeb, 0xda, 0xba, 0x41,
-	0xcc, 0x4a, 0xa9, 0xa6, 0x3b, 0xf7, 0xb8, 0x84, 0x6a, 0xc1, 0xe0, 0x62, 0x9d, 0xe8, 0x2e, 0x59,
-	0xe2, 0x51, 0x5e, 0x25, 0x2f, 0x37, 0x88, 0xe3, 0xe2, 0x21, 0xe8, 0xb6, 0xf5, 0x3a, 0xb1, 0xdc,
-	0x61, 0x34, 0x8a, 0xc6, 0x7a, 0x56, 0xc5, 0x13, 0x3e, 0x07, 0x7f, 0x16, 0xf9, 0x18, 0xee, 0x1a,
-	0x45, 0x63, 0xb9, 0xc2, 0x91, 0x7c, 0x4a, 0x6d, 0xe5, 0xfd, 0x53, 0x7d, 0x25, 0xf5, 0x18, 0x0c,
-	0x14, 0x89, 0xdb, 0x62, 0x0c, 0xc3, 0x6e, 0x4b, 0xaf, 0x11, 0x61, 0x8a, 0xfd, 0xad, 0xbe, 0x81,
-	0x60, 0xff, 0x55, 0xc3, 0xf1, 0x45, 0x9d, 0x2c, 0x60, 0x43, 0xd0, 0xbd, 0x6e, 0x98, 0x2e, 0xa9,
-	0x0f, 0xef, 0xe2, 0xef, 0xf9, 0x13, 0x1e, 0x81, 0x1e, 0x5b, 0xaf, 0x92, 0x92, 0x63, 0x3c, 0x20,
-	0xc3, 0xbb, 0x47, 0xd1, 0xd8, 0x9e, 0xd5, 0xbd, 0xde, 0x8b, 0x9b, 0xc6, 0x03, 0x82, 0x0f, 0x03,
-	0xb0, 0x7f, 0xba, 0xf4, 0x1e, 0xb1, 0x86, 0xbb, 0x99, 0x22, 0x13, 0xbf, 0xe5, 0xbd, 0x50, 0x5f,
-	0x47, 0x30, 0xd8, 0x8c, 0xc1, 0xb1, 0xa9, 0xe5, 0x10, 0x7c, 0x1e, 0xf6, 0x0a, 0x87, 0x9c, 0x61,
-	0x34, 0xba, 0x4b, 0x3a, 0x0c, 0x81, 0x16, 0x3e, 0x0a, 0xfd, 0x16, 0xd9, 0x74, 0x4b, 0x11, 0xf3,
-	0x5d, 0xcc, 0x7c, 0x9f, 0xf7, 0xfa, 0x46, 0x00, 0xe1, 0x31, 0x82, 0xc1, 0xdb, 0x76, 0x25, 0x9e,
-	0xa0, 0x48, 0x22, 0x50, 0x07, 0x89, 0xc0, 0x73, 0x90, 0x6b, 0xb0, 0x73, 0x59, 0x35, 0x88, 0x64,
-	0x2a, 0xfe, 0x19, 0x7e, 0xc1, 0xe4, 0x2f, 0x78, 0x05, 0xb3, 0xa2, 0x3b, 0xf7, 0x56, 0x81, 0x8b,
-	0x7b, 0x7f, 0xab, 0xe3, 0x30, 0xb8, 0x44, 0x4c, 0x12, 0x03, 0x95, 0x94, 0x48, 0x17, 0x06, 0x2e,
-	0xd5, 0x6c, 0x5a, 0x67, 0x51, 0x4c, 0x11, 0xc4, 0x57, 0xa0, 0xd7, 0xb0, 0xec, 0x86, 0x5b, 0x2a,
-	0x53, 0x6b, 0xdd, 0xa8, 0xb2, 0x3c, 0xe6, 0x0a, 0x63, 0xa9, 0x6e, 0x5d, 0xf2, 0x14, 0x16, 0x99,
-	0xfc, 0x6a, 0xce, 0x08, 0x1f, 0xd4, 0x57, 0x60, 0x60, 0x79, 0x53, 0xc6, 0xea, 0x35, 0xe8, 0xa3,
-	0x0d, 0x37, 0x66, 0xf6, 0x78, 0xaa, 0xd9, 0xeb, 0x4c, 0x43, 0xd8, 0xed, 0xa5, 0x91, 0x27, 0x35,
-	0x0f, 0xc3, 0x45, 0xe2, 0xce, 0x07, 0x17, 0xe3, 0x4d, 0x9b, 0x94, 0xd3, 0xc2, 0x53, 0x81, 0xfd,
-	0x45, 0xe2, 0xde, 0xf2, 0xda, 0x3b, 0x43, 0x14, 0xcf, 0x00, 0x84, 0xfd, 0x2b, 0x91, 0xb1, 0x9e,
-	0x75, 0xff, 0x4f, 0xf5, 0x4b, 0x04, 0x7f, 0xf5, 0x2a, 0x39, 0xb0, 0x93, 0xd9, 0x4f, 0x9d, 0x1b,
-	0xdb, 0x91, 0x56, 0x7c, 0x84, 0x60, 0xa8, 0xd5, 0x01, 0xd1, 0x8c, 0x45, 0xc8, 0x85, 0xb7, 0xa3,
-	0xdf, 0x8f, 0x47, 0x53, 0xf3, 0x17, 0x86, 0x1b, 0xdc, 0xe0, 0x40, 0xe9, 0x9e, 0x7c, 0x82, 0x60,
-	0x88, 0xf7, 0x64, 0x2c, 0x6d, 0xcb, 0x00, 0x21, 0x16, 0xd1, 0x98, 0xb2, 0x50, 0x7a, 0x02, 0x28,
-	0xdb, 0x6b, 0x4e, 0x02, 0x83, 0x45, 0xe2, 0x2e, 0xb2, 0x8f, 0xec, 0x0e, 0x96, 0xd4, 0x57, 0x22,
-	0x23, 0xa1, 0xa1, 0x3f, 0x5a, 0x4d, 0xbd, 0x8d, 0xe0, 0x40, 0xcc, 0x03, 0x51, 0x54, 0x97, 0xa1,
-	0x37, 0x32, 0xa6, 0xf8, 0x55, 0x75, 0x2c, 0x35, 0x95, 0x91, 0x90, 0xe7, 0xca, 0xe1, 0x99, 0xd2,
-	0x75, 0xf5, 0x14, 0xc1, 0x01, 0x5e, 0x57, 0xf1, 0xe4, 0x5d, 0x84, 0x5c, 0x04, 0x8f, 0xa8, 0x2c,
-	0x69, 0x38, 0x10, 0xc2, 0xd9, 0x5e, 0x6d, 0xad, 0x03, 0xe6, 0xe3, 0xc2, 0x8a, 0x37, 0xf1, 0x64,
-	0xe5, 0x7b, 0x1a, 0xf6, 0xb0, 0xc9, 0x88, 0x25, 0x26, 0x57, 0x50, 0x53, 0xe1, 0xf2, 0x13, 0xb9,
-	0x82, 0xfa, 0x4f, 0xe8, 0x2f, 0x12, 0xb7, 0xc9, 0x48, 0xd2, 0xe5, 0xf9, 0x1a, 0x0c, 0x78, 0x09,
-	0x64, 0x72, 0xcf, 0x65, 0x42, 0xd8, 0x00, 0x1c, 0x05, 0x20, 0x8a, 0x27, 0xf0, 0x9b, 0x57, 0x8d,
-	0xbc, 0xdf, 0xd2, 0xa5, 0x32, 0x06, 0x98, 0x7f, 0x80, 0x33, 0x43, 0xf4, 0x1b, 0xf2, 0x44, 0x6d,
-	0x93, 0xde, 0x6f, 0x12, 0xfd, 0x1c, 0xc1, 0x29, 0x36, 0x2d, 0x97, 0xe8, 0xda, 0x4b, 0xa4, 0xec,
-	0x96, 0x2a, 0xc4, 0x25, 0x65, 0x36, 0xc9, 0xf3, 0x61, 0xb6, 0xc2, 0x74, 0x6a, 0xc4, 0x72, 0x4b,
-	0x35, 0xe2, 0xea, 0xde, 0xd8, 0x20, 0x6a, 0xe5, 0x62, 0xfa, 0x17, 0xd9, 0x3b, 0xf4, 0x3a, 0x3b,
-	0x73, 0xc9, 0x3f, 0x92, 0x59, 0x5e, 0x0a, 0x0e, 0x5c, 0x11, 0xe7, 0x5d, 0xfc, 0xd3, 0xea, 0x09,
-	0x43, 0x5e, 0x3c, 0xc9, 0xbd, 0x85, 0x11, 0x38, 0xb8, 0x25, 0x5e, 0x6f, 0x4c, 0xb9, 0x6d, 0x55,
-	0xe2, 0xce, 0x27, 0xc5, 0xe9, 0x2d, 0x04, 0x98, 0x4f, 0x0c, 0x59, 0xa2, 0xf8, 0xff, 0xc9, 0x23,
-	0xc3, 0x54, 0x76, 0x9a, 0xb9, 0x81, 0x94, 0xe9, 0xe1, 0x03, 0x04, 0x7f, 0xe3, 0x42, 0xcb, 0x9c,
-	0x4c, 0x90, 0xca, 0xf2, 0xa6, 0x5e, 0xb3, 0x4d, 0xe2, 0xa4, 0x21, 0x22, 0xc9, 0x88, 0xce, 0xa7,
-	0x22, 0xda, 0xc2, 0x4e, 0x0a, 0x3a, 0x0d, 0x0e, 0xfa, 0x5d, 0xb9, 0x1c, 0x70, 0x9d, 0xb4, 0xa0,
-	0x3e, 0x42, 0x30, 0x12, 0xf4, 0x47, 0xa8, 0xf2, 0x5c, 0x5a, 0xf5, 0x23, 0x04, 0x87, 0x92, 0xb1,
-	0x88, 0xae, 0xbd, 0x03, 0xfb, 0x5a, 0x79, 0x9c, 0x68, 0xe0, 0x93, 0x12, 0x99, 0x0d, 0xe3, 0xd1,
-	0x5f, 0x6b, 0x7e, 0x21, 0xdb, 0xd4, 0x85, 0x77, 0x54, 0xe8, 0x9e, 0x6f, 0xb8, 0x74, 0xc5, 0xc4,
-	0x9f, 0x20, 0xe8, 0x6b, 0xe2, 0x65, 0x78, 0x22, 0xfd, 0xae, 0x4f, 0xe0, 0x70, 0x8a, 0x14, 0x23,
-	0x50, 0x17, 0xde, 0xfc, 0xe9, 0xd7, 0xc7, 0x5d, 0x67, 0xd4, 0x89, 0x80, 0x6b, 0xbe, 0xca, 0xb3,
-	0x70, 0xd6, 0xae, 0x53, 0xaf, 0x2f, 0x1d, 0x6d, 0x5c, 0x33, 0x69, 0x99, 0x47, 0x4b, 0x1b, 0x7f,
-	0xe8, 0x13, 0x72, 0x67, 0x36, 0x20, 0x13, 0x1f, 0x22, 0x80, 0x90, 0xd6, 0xe1, 0x7c, 0xaa, 0xe1,
-	0x18, 0xff, 0x93, 0x04, 0x3a, 0xc3, 0x80, 0x4e, 0xe2, 0x08, 0x50, 0xaf, 0xc8, 0xb6, 0x80, 0x19,
-	0xa0, 0xd4, 0xc6, 0x1f, 0xe2, 0x4f, 0x11, 0xf4, 0x46, 0x89, 0x1c, 0x3e, 0x95, 0x6a, 0x31, 0x81,
-	0x77, 0x2a, 0x13, 0x6d, 0x68, 0xf0, 0x82, 0x4a, 0x02, 0x2c, 0x19, 0x59, 0xfc, 0x05, 0x82, 0xbe,
-	0x26, 0xda, 0x97, 0x91, 0xff, 0x24, 0x8a, 0x28, 0x19, 0xd6, 0xcb, 0x0c, 0xe5, 0x52, 0x61, 0x26,
-	0x44, 0xe9, 0x6f, 0x5c, 0x24, 0xc3, 0x1b, 0xd6, 0xc1, 0x13, 0x04, 0x7d, 0x4d, 0xc4, 0x30, 0x03,
-	0x76, 0x12, 0x89, 0x54, 0x0e, 0xfb, 0x2a, 0x91, 0xd5, 0x46, 0xfe, 0xba, 0xbf, 0xda, 0xf0, 0xa3,
-	0x3a, 0xde, 0x41, 0x19, 0x7c, 0x8c, 0x00, 0x42, 0x2e, 0x9a, 0x51, 0xa6, 0x31, 0xd2, 0x9a, 0x05,
-	0xac, 0xc8, 0x80, 0xcd, 0xab, 0x67, 0xda, 0x06, 0x36, 0x6b, 0x04, 0xb6, 0x66, 0xd1, 0x38, 0x83,
-	0x19, 0x92, 0xd7, 0x0c, 0x98, 0x31, 0x96, 0xbb, 0x83, 0x30, 0xc9, 0x66, 0x14, 0xe6, 0x37, 0x88,
-	0xed, 0x72, 0x9a, 0xa9, 0x2e, 0xfe, 0x77, 0x56, 0xef, 0x27, 0x52, 0x63, 0xe5, 0x44, 0xaa, 0x5a,
-	0xb3, 0x8e, 0x7a, 0x85, 0xb9, 0xb0, 0x8c, 0x17, 0xdb, 0x75, 0x21, 0xb2, 0xb0, 0x64, 0xa3, 0xb9,
-	0x57, 0x14, 0x9f, 0x21, 0xe8, 0x8d, 0x32, 0xf0, 0x8c, 0xbb, 0x21, 0x81, 0xac, 0x2b, 0x92, 0x0c,
-	0x4f, 0xbd, 0xc0, 0x70, 0x9f, 0xc7, 0xe7, 0xda, 0xc6, 0x1d, 0xb2, 0x54, 0x0f, 0xf2, 0xd7, 0x08,
-	0xfe, 0xd2, 0x4c, 0x86, 0x71, 0x21, 0xf3, 0x7a, 0x8a, 0x51, 0x7f, 0x65, 0xb2, 0x2d, 0x1d, 0x71,
-	0xa9, 0x25, 0xf8, 0x90, 0x7a, 0xa9, 0x45, 0x0b, 0x28, 0xe2, 0x06, 0xfe, 0x01, 0x41, 0x7f, 0x0b,
-	0x89, 0xc6, 0x93, 0x12, 0x77, 0x5c, 0xc7, 0xc1, 0x7f, 0x91, 0x01, 0xbf, 0x53, 0xb8, 0x14, 0x02,
-	0x8f, 0x2c, 0x55, 0x3b, 0xc9, 0xc3, 0x6c, 0x84, 0xeb, 0x7b, 0x39, 0xe9, 0x6b, 0xa2, 0xdd, 0x19,
-	0x57, 0x5f, 0x12, 0x45, 0x57, 0x64, 0x09, 0x9d, 0x7a, 0x8b, 0x39, 0x73, 0x0d, 0x5f, 0xdd, 0x56,
-	0x25, 0x69, 0x11, 0x96, 0xea, 0xd5, 0xd5, 0x8f, 0x08, 0xfa, 0x5b, 0x08, 0x31, 0xce, 0x2e, 0x92,
-	0xf8, 0x02, 0x40, 0x99, 0x6a, 0x4f, 0x49, 0x94, 0x56, 0x82, 0x53, 0xb2, 0xa5, 0xd5, 0x9c, 0x98,
-	0xa8, 0x5f, 0xf8, 0x17, 0x04, 0xfb, 0x5a, 0x59, 0x35, 0x9e, 0x92, 0xa8, 0xb4, 0x6d, 0xa4, 0xa7,
-	0xc6, 0x3c, 0xa9, 0x16, 0xfe, 0x17, 0x7a, 0x12, 0xfd, 0xd1, 0x63, 0xfb, 0xa9, 0x9a, 0x8d, 0x6e,
-	0x03, 0xbc, 0xf1, 0x2b, 0x17, 0xa1, 0xe5, 0x58, 0x93, 0x98, 0x15, 0xa3, 0x2c, 0x27, 0xeb, 0x93,
-	0x71, 0x8e, 0xb9, 0x33, 0xad, 0x6a, 0xd2, 0x83, 0x0c, 0x1b, 0x81, 0x9d, 0x59, 0xc1, 0x6a, 0xdf,
-	0x43, 0xb0, 0xd7, 0x27, 0x0e, 0xf8, 0x64, 0x56, 0x5b, 0x34, 0x21, 0x93, 0xe0, 0xce, 0xea, 0x7f,
-	0x18, 0xbc, 0x09, 0xac, 0xc9, 0x35, 0x03, 0xc7, 0xe6, 0xd5, 0xfb, 0x33, 0x04, 0x10, 0xd2, 0xf7,
-	0x8c, 0x0f, 0x6d, 0x6c, 0xd1, 0xa0, 0x68, 0xd2, 0xf2, 0xa2, 0xc0, 0x13, 0x80, 0x4a, 0xc5, 0x11,
-	0xbf, 0x8f, 0x20, 0x17, 0xe1, 0xfb, 0x19, 0x09, 0x8e, 0x6f, 0x06, 0xb2, 0x12, 0x2c, 0x80, 0x8d,
-	0xb7, 0x1d, 0xc1, 0xa7, 0x0c, 0x58, 0x40, 0xb0, 0x33, 0x81, 0xb5, 0x52, 0xf1, 0x2c, 0x60, 0xf3,
-	0x0c, 0xd8, 0x9c, 0x7a, 0xba, 0x4d, 0x60, 0xb3, 0x9c, 0xf5, 0x7b, 0x63, 0xca, 0x33, 0x6f, 0x94,
-	0x8e, 0x6e, 0x01, 0xb2, 0x46, 0xe9, 0x84, 0x8d, 0x41, 0x16, 0xcc, 0x45, 0x06, 0xf3, 0xac, 0x3a,
-	0xdd, 0x2e, 0xcc, 0x86, 0x15, 0x02, 0xf5, 0x62, 0x19, 0xd9, 0x40, 0x64, 0xc4, 0x32, 0xbe, 0xab,
-	0xd8, 0xb1, 0x58, 0xf2, 0xb1, 0xcf, 0x83, 0xf8, 0x1d, 0x82, 0x03, 0x5b, 0xac, 0x0d, 0xf0, 0x5c,
-	0x27, 0xcb, 0x06, 0x49, 0xe8, 0xab, 0x0c, 0xfa, 0x55, 0xb5, 0xd8, 0x19, 0xf4, 0x98, 0x59, 0xcf,
-	0x97, 0x6f, 0x11, 0xe0, 0xf8, 0x36, 0x03, 0x9f, 0x96, 0xba, 0x9e, 0x62, 0xeb, 0x0f, 0xa5, 0xad,
-	0x1d, 0x81, 0x4f, 0xba, 0xf0, 0x42, 0x7b, 0x0e, 0x69, 0x2d, 0xab, 0x05, 0xd6, 0x83, 0x3f, 0x8b,
-	0x5f, 0x29, 0x5b, 0x17, 0x1b, 0x78, 0x5a, 0xee, 0x7e, 0x8a, 0xef, 0x65, 0x94, 0x99, 0x0e, 0x34,
-	0xc5, 0x1d, 0x97, 0xe0, 0x59, 0xfa, 0x47, 0x3c, 0x48, 0x56, 0xcc, 0xb9, 0x85, 0x77, 0x11, 0xfc,
-	0xbd, 0x4c, 0x6b, 0x69, 0x60, 0x16, 0x72, 0x7c, 0x63, 0x72, 0xa3, 0x4e, 0x5d, 0x7a, 0x03, 0xbd,
-	0x30, 0x2f, 0x64, 0xab, 0xd4, 0xd4, 0xad, 0x6a, 0x9e, 0xd6, 0xab, 0x5a, 0x95, 0x58, 0x6c, 0xab,
-	0xad, 0xf1, 0x7f, 0xe9, 0xb6, 0xe1, 0x24, 0xfe, 0xc6, 0x3e, 0xc7, 0x1f, 0xbf, 0xef, 0x1a, 0x29,
-	0x32, 0xc1, 0xbb, 0x8b, 0x9e, 0xd0, 0x5d, 0x7e, 0xfe, 0xdd, 0xff, 0x72, 0xa1, 0xb5, 0x6e, 0x76,
-	0xd6, 0xe4, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xe1, 0xf9, 0x9a, 0x7e, 0x21, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/automl/v1beta1/table_spec.pb.go b/googleapis/cloud/automl/v1beta1/table_spec.pb.go
index 40af9a2620..cd87297ba3 100644
--- a/googleapis/cloud/automl/v1beta1/table_spec.pb.go
+++ b/googleapis/cloud/automl/v1beta1/table_spec.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/table_spec.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A specification of a relational table.
 // The table's schema is represented via its child column specs. It is
@@ -63,16 +66,17 @@ func (m *TableSpec) Reset()         { *m = TableSpec{} }
 func (m *TableSpec) String() string { return proto.CompactTextString(m) }
 func (*TableSpec) ProtoMessage()    {}
 func (*TableSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_spec_f59803a440a81f32, []int{0}
+	return fileDescriptor_67819f165062ce17, []int{0}
 }
+
 func (m *TableSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableSpec.Unmarshal(m, b)
 }
 func (m *TableSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableSpec.Marshal(b, m, deterministic)
 }
-func (dst *TableSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableSpec.Merge(dst, src)
+func (m *TableSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableSpec.Merge(m, src)
 }
 func (m *TableSpec) XXX_Size() int {
 	return xxx_messageInfo_TableSpec.Size(m)
@@ -130,10 +134,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/table_spec.proto", fileDescriptor_table_spec_f59803a440a81f32)
+	proto.RegisterFile("google/cloud/automl/v1beta1/table_spec.proto", fileDescriptor_67819f165062ce17)
 }
 
-var fileDescriptor_table_spec_f59803a440a81f32 = []byte{
+var fileDescriptor_67819f165062ce17 = []byte{
 	// 322 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0x03, 0x31,
 	0x10, 0x86, 0xd9, 0x56, 0xab, 0x4d, 0x2b, 0xc8, 0x7a, 0x59, 0x5a, 0xc1, 0x2a, 0x1e, 0xf6, 0xa0,
diff --git a/googleapis/cloud/automl/v1beta1/tables.pb.go b/googleapis/cloud/automl/v1beta1/tables.pb.go
index 89a6ea55cd..1e0b6f1682 100644
--- a/googleapis/cloud/automl/v1beta1/tables.pb.go
+++ b/googleapis/cloud/automl/v1beta1/tables.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/tables.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Metadata for a dataset used for AutoML Tables.
 type TablesDatasetMetadata struct {
@@ -91,16 +94,17 @@ func (m *TablesDatasetMetadata) Reset()         { *m = TablesDatasetMetadata{} }
 func (m *TablesDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*TablesDatasetMetadata) ProtoMessage()    {}
 func (*TablesDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tables_2ffb928805ee705e, []int{0}
+	return fileDescriptor_a4edb25480826735, []int{0}
 }
+
 func (m *TablesDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TablesDatasetMetadata.Unmarshal(m, b)
 }
 func (m *TablesDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TablesDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TablesDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TablesDatasetMetadata.Merge(dst, src)
+func (m *TablesDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TablesDatasetMetadata.Merge(m, src)
 }
 func (m *TablesDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_TablesDatasetMetadata.Size(m)
@@ -240,16 +244,17 @@ func (m *TablesModelMetadata) Reset()         { *m = TablesModelMetadata{} }
 func (m *TablesModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*TablesModelMetadata) ProtoMessage()    {}
 func (*TablesModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tables_2ffb928805ee705e, []int{1}
+	return fileDescriptor_a4edb25480826735, []int{1}
 }
+
 func (m *TablesModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TablesModelMetadata.Unmarshal(m, b)
 }
 func (m *TablesModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TablesModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TablesModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TablesModelMetadata.Merge(dst, src)
+func (m *TablesModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TablesModelMetadata.Merge(m, src)
 }
 func (m *TablesModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_TablesModelMetadata.Size(m)
@@ -346,16 +351,17 @@ func (m *TablesAnnotation) Reset()         { *m = TablesAnnotation{} }
 func (m *TablesAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TablesAnnotation) ProtoMessage()    {}
 func (*TablesAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tables_2ffb928805ee705e, []int{2}
+	return fileDescriptor_a4edb25480826735, []int{2}
 }
+
 func (m *TablesAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TablesAnnotation.Unmarshal(m, b)
 }
 func (m *TablesAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TablesAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TablesAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TablesAnnotation.Merge(dst, src)
+func (m *TablesAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TablesAnnotation.Merge(m, src)
 }
 func (m *TablesAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TablesAnnotation.Size(m)
@@ -426,16 +432,17 @@ func (m *TablesModelColumnInfo) Reset()         { *m = TablesModelColumnInfo{} }
 func (m *TablesModelColumnInfo) String() string { return proto.CompactTextString(m) }
 func (*TablesModelColumnInfo) ProtoMessage()    {}
 func (*TablesModelColumnInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tables_2ffb928805ee705e, []int{3}
+	return fileDescriptor_a4edb25480826735, []int{3}
 }
+
 func (m *TablesModelColumnInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TablesModelColumnInfo.Unmarshal(m, b)
 }
 func (m *TablesModelColumnInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TablesModelColumnInfo.Marshal(b, m, deterministic)
 }
-func (dst *TablesModelColumnInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TablesModelColumnInfo.Merge(dst, src)
+func (m *TablesModelColumnInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TablesModelColumnInfo.Merge(m, src)
 }
 func (m *TablesModelColumnInfo) XXX_Size() int {
 	return xxx_messageInfo_TablesModelColumnInfo.Size(m)
@@ -476,10 +483,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/tables.proto", fileDescriptor_tables_2ffb928805ee705e)
+	proto.RegisterFile("google/cloud/automl/v1beta1/tables.proto", fileDescriptor_a4edb25480826735)
 }
 
-var fileDescriptor_tables_2ffb928805ee705e = []byte{
+var fileDescriptor_a4edb25480826735 = []byte{
 	// 797 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xdb, 0x38,
 	0x10, 0x86, 0xec, 0xfc, 0x60, 0x69, 0x60, 0xd7, 0x66, 0xd6, 0x89, 0xd7, 0xd9, 0x20, 0x81, 0x2f,
diff --git a/googleapis/cloud/automl/v1beta1/temporal.pb.go b/googleapis/cloud/automl/v1beta1/temporal.pb.go
index cbd8a4a1e5..464a7209df 100644
--- a/googleapis/cloud/automl/v1beta1/temporal.pb.go
+++ b/googleapis/cloud/automl/v1beta1/temporal.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/temporal.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A time period inside of an example that has a time dimension (e.g. video).
 type TimeSegment struct {
@@ -37,16 +40,17 @@ func (m *TimeSegment) Reset()         { *m = TimeSegment{} }
 func (m *TimeSegment) String() string { return proto.CompactTextString(m) }
 func (*TimeSegment) ProtoMessage()    {}
 func (*TimeSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_temporal_20cabaedddc21db8, []int{0}
+	return fileDescriptor_7ab98b0922d3bd6f, []int{0}
 }
+
 func (m *TimeSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeSegment.Unmarshal(m, b)
 }
 func (m *TimeSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeSegment.Marshal(b, m, deterministic)
 }
-func (dst *TimeSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeSegment.Merge(dst, src)
+func (m *TimeSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeSegment.Merge(m, src)
 }
 func (m *TimeSegment) XXX_Size() int {
 	return xxx_messageInfo_TimeSegment.Size(m)
@@ -76,10 +80,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/temporal.proto", fileDescriptor_temporal_20cabaedddc21db8)
+	proto.RegisterFile("google/cloud/automl/v1beta1/temporal.proto", fileDescriptor_7ab98b0922d3bd6f)
 }
 
-var fileDescriptor_temporal_20cabaedddc21db8 = []byte{
+var fileDescriptor_7ab98b0922d3bd6f = []byte{
 	// 264 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xbf, 0x4a, 0x34, 0x31,
 	0x14, 0xc5, 0xc9, 0x16, 0x5f, 0x91, 0xe5, 0x63, 0x71, 0x2a, 0xdd, 0x15, 0x15, 0x2b, 0xb1, 0x48,
diff --git a/googleapis/cloud/automl/v1beta1/text.pb.go b/googleapis/cloud/automl/v1beta1/text.pb.go
index febfeb1292..952dd86d8e 100644
--- a/googleapis/cloud/automl/v1beta1/text.pb.go
+++ b/googleapis/cloud/automl/v1beta1/text.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/text.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Dataset metadata for classification.
 type TextClassificationDatasetMetadata struct {
@@ -33,16 +36,17 @@ func (m *TextClassificationDatasetMetadata) Reset()         { *m = TextClassific
 func (m *TextClassificationDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*TextClassificationDatasetMetadata) ProtoMessage()    {}
 func (*TextClassificationDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_15189e358b88704e, []int{0}
+	return fileDescriptor_c1121cf231f416fd, []int{0}
 }
+
 func (m *TextClassificationDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextClassificationDatasetMetadata.Unmarshal(m, b)
 }
 func (m *TextClassificationDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextClassificationDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TextClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextClassificationDatasetMetadata.Merge(dst, src)
+func (m *TextClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextClassificationDatasetMetadata.Merge(m, src)
 }
 func (m *TextClassificationDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_TextClassificationDatasetMetadata.Size(m)
@@ -71,16 +75,17 @@ func (m *TextClassificationModelMetadata) Reset()         { *m = TextClassificat
 func (m *TextClassificationModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*TextClassificationModelMetadata) ProtoMessage()    {}
 func (*TextClassificationModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_15189e358b88704e, []int{1}
+	return fileDescriptor_c1121cf231f416fd, []int{1}
 }
+
 func (m *TextClassificationModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextClassificationModelMetadata.Unmarshal(m, b)
 }
 func (m *TextClassificationModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextClassificationModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TextClassificationModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextClassificationModelMetadata.Merge(dst, src)
+func (m *TextClassificationModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextClassificationModelMetadata.Merge(m, src)
 }
 func (m *TextClassificationModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_TextClassificationModelMetadata.Size(m)
@@ -102,16 +107,17 @@ func (m *TextExtractionDatasetMetadata) Reset()         { *m = TextExtractionDat
 func (m *TextExtractionDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*TextExtractionDatasetMetadata) ProtoMessage()    {}
 func (*TextExtractionDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_15189e358b88704e, []int{2}
+	return fileDescriptor_c1121cf231f416fd, []int{2}
 }
+
 func (m *TextExtractionDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextExtractionDatasetMetadata.Unmarshal(m, b)
 }
 func (m *TextExtractionDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextExtractionDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TextExtractionDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextExtractionDatasetMetadata.Merge(dst, src)
+func (m *TextExtractionDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextExtractionDatasetMetadata.Merge(m, src)
 }
 func (m *TextExtractionDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_TextExtractionDatasetMetadata.Size(m)
@@ -133,16 +139,17 @@ func (m *TextExtractionModelMetadata) Reset()         { *m = TextExtractionModel
 func (m *TextExtractionModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*TextExtractionModelMetadata) ProtoMessage()    {}
 func (*TextExtractionModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_15189e358b88704e, []int{3}
+	return fileDescriptor_c1121cf231f416fd, []int{3}
 }
+
 func (m *TextExtractionModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextExtractionModelMetadata.Unmarshal(m, b)
 }
 func (m *TextExtractionModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextExtractionModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TextExtractionModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextExtractionModelMetadata.Merge(dst, src)
+func (m *TextExtractionModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextExtractionModelMetadata.Merge(m, src)
 }
 func (m *TextExtractionModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_TextExtractionModelMetadata.Size(m)
@@ -172,16 +179,17 @@ func (m *TextSentimentDatasetMetadata) Reset()         { *m = TextSentimentDatas
 func (m *TextSentimentDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*TextSentimentDatasetMetadata) ProtoMessage()    {}
 func (*TextSentimentDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_15189e358b88704e, []int{4}
+	return fileDescriptor_c1121cf231f416fd, []int{4}
 }
+
 func (m *TextSentimentDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSentimentDatasetMetadata.Unmarshal(m, b)
 }
 func (m *TextSentimentDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSentimentDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TextSentimentDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSentimentDatasetMetadata.Merge(dst, src)
+func (m *TextSentimentDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSentimentDatasetMetadata.Merge(m, src)
 }
 func (m *TextSentimentDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_TextSentimentDatasetMetadata.Size(m)
@@ -210,16 +218,17 @@ func (m *TextSentimentModelMetadata) Reset()         { *m = TextSentimentModelMe
 func (m *TextSentimentModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*TextSentimentModelMetadata) ProtoMessage()    {}
 func (*TextSentimentModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_15189e358b88704e, []int{5}
+	return fileDescriptor_c1121cf231f416fd, []int{5}
 }
+
 func (m *TextSentimentModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSentimentModelMetadata.Unmarshal(m, b)
 }
 func (m *TextSentimentModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSentimentModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TextSentimentModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSentimentModelMetadata.Merge(dst, src)
+func (m *TextSentimentModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSentimentModelMetadata.Merge(m, src)
 }
 func (m *TextSentimentModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_TextSentimentModelMetadata.Size(m)
@@ -240,10 +249,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/text.proto", fileDescriptor_text_15189e358b88704e)
+	proto.RegisterFile("google/cloud/automl/v1beta1/text.proto", fileDescriptor_c1121cf231f416fd)
 }
 
-var fileDescriptor_text_15189e358b88704e = []byte{
+var fileDescriptor_c1121cf231f416fd = []byte{
 	// 322 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x4b, 0x03, 0x31,
 	0x10, 0xc5, 0x59, 0x41, 0xc1, 0xa0, 0x1e, 0xea, 0x45, 0xfa, 0x87, 0xda, 0x15, 0xc4, 0x53, 0x62,
diff --git a/googleapis/cloud/automl/v1beta1/text_extraction.pb.go b/googleapis/cloud/automl/v1beta1/text_extraction.pb.go
index e22dc62c28..e2a26a31ba 100644
--- a/googleapis/cloud/automl/v1beta1/text_extraction.pb.go
+++ b/googleapis/cloud/automl/v1beta1/text_extraction.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/text_extraction.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Annotation for identifying spans of text.
 type TextExtractionAnnotation struct {
@@ -35,16 +38,17 @@ func (m *TextExtractionAnnotation) Reset()         { *m = TextExtractionAnnotati
 func (m *TextExtractionAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextExtractionAnnotation) ProtoMessage()    {}
 func (*TextExtractionAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_extraction_819b64ab635b378e, []int{0}
+	return fileDescriptor_425e57cc225e529c, []int{0}
 }
+
 func (m *TextExtractionAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextExtractionAnnotation.Unmarshal(m, b)
 }
 func (m *TextExtractionAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextExtractionAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextExtractionAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextExtractionAnnotation.Merge(dst, src)
+func (m *TextExtractionAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextExtractionAnnotation.Merge(m, src)
 }
 func (m *TextExtractionAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextExtractionAnnotation.Size(m)
@@ -85,16 +89,17 @@ func (m *TextExtractionEvaluationMetrics) Reset()         { *m = TextExtractionE
 func (m *TextExtractionEvaluationMetrics) String() string { return proto.CompactTextString(m) }
 func (*TextExtractionEvaluationMetrics) ProtoMessage()    {}
 func (*TextExtractionEvaluationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_extraction_819b64ab635b378e, []int{1}
+	return fileDescriptor_425e57cc225e529c, []int{1}
 }
+
 func (m *TextExtractionEvaluationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextExtractionEvaluationMetrics.Unmarshal(m, b)
 }
 func (m *TextExtractionEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextExtractionEvaluationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *TextExtractionEvaluationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextExtractionEvaluationMetrics.Merge(dst, src)
+func (m *TextExtractionEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextExtractionEvaluationMetrics.Merge(m, src)
 }
 func (m *TextExtractionEvaluationMetrics) XXX_Size() int {
 	return xxx_messageInfo_TextExtractionEvaluationMetrics.Size(m)
@@ -144,16 +149,17 @@ func (m *TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) String() string
 }
 func (*TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) ProtoMessage() {}
 func (*TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_extraction_819b64ab635b378e, []int{1, 0}
+	return fileDescriptor_425e57cc225e529c, []int{1, 0}
 }
+
 func (m *TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextExtractionEvaluationMetrics_ConfidenceMetricsEntry.Unmarshal(m, b)
 }
 func (m *TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextExtractionEvaluationMetrics_ConfidenceMetricsEntry.Marshal(b, m, deterministic)
 }
-func (dst *TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextExtractionEvaluationMetrics_ConfidenceMetricsEntry.Merge(dst, src)
+func (m *TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextExtractionEvaluationMetrics_ConfidenceMetricsEntry.Merge(m, src)
 }
 func (m *TextExtractionEvaluationMetrics_ConfidenceMetricsEntry) XXX_Size() int {
 	return xxx_messageInfo_TextExtractionEvaluationMetrics_ConfidenceMetricsEntry.Size(m)
@@ -199,10 +205,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/text_extraction.proto", fileDescriptor_text_extraction_819b64ab635b378e)
+	proto.RegisterFile("google/cloud/automl/v1beta1/text_extraction.proto", fileDescriptor_425e57cc225e529c)
 }
 
-var fileDescriptor_text_extraction_819b64ab635b378e = []byte{
+var fileDescriptor_425e57cc225e529c = []byte{
 	// 406 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x6a, 0xdb, 0x30,
 	0x18, 0xc7, 0xee, 0x9a, 0x6d, 0xca, 0x4e, 0x5a, 0x57, 0xbc, 0xb4, 0xd0, 0xd0, 0x53, 0x4e, 0x32,
diff --git a/googleapis/cloud/automl/v1beta1/text_segment.pb.go b/googleapis/cloud/automl/v1beta1/text_segment.pb.go
index 18aaf877d6..3031b50b32 100644
--- a/googleapis/cloud/automl/v1beta1/text_segment.pb.go
+++ b/googleapis/cloud/automl/v1beta1/text_segment.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/text_segment.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A contiguous part of a text (string), assuming it has an UTF-8 NFC encoding.
 // .
@@ -40,16 +43,17 @@ func (m *TextSegment) Reset()         { *m = TextSegment{} }
 func (m *TextSegment) String() string { return proto.CompactTextString(m) }
 func (*TextSegment) ProtoMessage()    {}
 func (*TextSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_segment_7b666583e5e1b1ed, []int{0}
+	return fileDescriptor_bbd0421c131b44e6, []int{0}
 }
+
 func (m *TextSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSegment.Unmarshal(m, b)
 }
 func (m *TextSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSegment.Marshal(b, m, deterministic)
 }
-func (dst *TextSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSegment.Merge(dst, src)
+func (m *TextSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSegment.Merge(m, src)
 }
 func (m *TextSegment) XXX_Size() int {
 	return xxx_messageInfo_TextSegment.Size(m)
@@ -86,10 +90,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/text_segment.proto", fileDescriptor_text_segment_7b666583e5e1b1ed)
+	proto.RegisterFile("google/cloud/automl/v1beta1/text_segment.proto", fileDescriptor_bbd0421c131b44e6)
 }
 
-var fileDescriptor_text_segment_7b666583e5e1b1ed = []byte{
+var fileDescriptor_bbd0421c131b44e6 = []byte{
 	// 255 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xd0, 0xc1, 0x4a, 0x03, 0x31,
 	0x10, 0x06, 0x60, 0xd2, 0x82, 0xd2, 0xd4, 0x83, 0xec, 0x69, 0xb1, 0x8a, 0xd5, 0x53, 0x4f, 0x09,
diff --git a/googleapis/cloud/automl/v1beta1/text_sentiment.pb.go b/googleapis/cloud/automl/v1beta1/text_sentiment.pb.go
index 28c057ee08..c922ed0f32 100644
--- a/googleapis/cloud/automl/v1beta1/text_sentiment.pb.go
+++ b/googleapis/cloud/automl/v1beta1/text_sentiment.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/text_sentiment.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Contains annotation details specific to text sentiment.
 type TextSentimentAnnotation struct {
@@ -43,16 +46,17 @@ func (m *TextSentimentAnnotation) Reset()         { *m = TextSentimentAnnotation
 func (m *TextSentimentAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextSentimentAnnotation) ProtoMessage()    {}
 func (*TextSentimentAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_sentiment_5175e400ab562620, []int{0}
+	return fileDescriptor_2c3765cde9ff2509, []int{0}
 }
+
 func (m *TextSentimentAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSentimentAnnotation.Unmarshal(m, b)
 }
 func (m *TextSentimentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSentimentAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextSentimentAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSentimentAnnotation.Merge(dst, src)
+func (m *TextSentimentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSentimentAnnotation.Merge(m, src)
 }
 func (m *TextSentimentAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextSentimentAnnotation.Size(m)
@@ -109,16 +113,17 @@ func (m *TextSentimentEvaluationMetrics) Reset()         { *m = TextSentimentEva
 func (m *TextSentimentEvaluationMetrics) String() string { return proto.CompactTextString(m) }
 func (*TextSentimentEvaluationMetrics) ProtoMessage()    {}
 func (*TextSentimentEvaluationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_sentiment_5175e400ab562620, []int{1}
+	return fileDescriptor_2c3765cde9ff2509, []int{1}
 }
+
 func (m *TextSentimentEvaluationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSentimentEvaluationMetrics.Unmarshal(m, b)
 }
 func (m *TextSentimentEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSentimentEvaluationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *TextSentimentEvaluationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSentimentEvaluationMetrics.Merge(dst, src)
+func (m *TextSentimentEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSentimentEvaluationMetrics.Merge(m, src)
 }
 func (m *TextSentimentEvaluationMetrics) XXX_Size() int {
 	return xxx_messageInfo_TextSentimentEvaluationMetrics.Size(m)
@@ -198,10 +203,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/text_sentiment.proto", fileDescriptor_text_sentiment_5175e400ab562620)
+	proto.RegisterFile("google/cloud/automl/v1beta1/text_sentiment.proto", fileDescriptor_2c3765cde9ff2509)
 }
 
-var fileDescriptor_text_sentiment_5175e400ab562620 = []byte{
+var fileDescriptor_2c3765cde9ff2509 = []byte{
 	// 452 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x6f, 0x13, 0x31,
 	0x10, 0x85, 0x95, 0x84, 0xa6, 0x8d, 0x8b, 0x68, 0x30, 0x12, 0x2c, 0x6d, 0x05, 0xa1, 0x17, 0x72,
diff --git a/googleapis/cloud/automl/v1beta1/translation.pb.go b/googleapis/cloud/automl/v1beta1/translation.pb.go
index e899235835..4ad3d48a22 100644
--- a/googleapis/cloud/automl/v1beta1/translation.pb.go
+++ b/googleapis/cloud/automl/v1beta1/translation.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/translation.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Dataset metadata that is specific to translation.
 type TranslationDatasetMetadata struct {
@@ -34,16 +37,17 @@ func (m *TranslationDatasetMetadata) Reset()         { *m = TranslationDatasetMe
 func (m *TranslationDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*TranslationDatasetMetadata) ProtoMessage()    {}
 func (*TranslationDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_a3798f334391f423, []int{0}
+	return fileDescriptor_74f6484316c15700, []int{0}
 }
+
 func (m *TranslationDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TranslationDatasetMetadata.Unmarshal(m, b)
 }
 func (m *TranslationDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TranslationDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TranslationDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TranslationDatasetMetadata.Merge(dst, src)
+func (m *TranslationDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationDatasetMetadata.Merge(m, src)
 }
 func (m *TranslationDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_TranslationDatasetMetadata.Size(m)
@@ -83,16 +87,17 @@ func (m *TranslationEvaluationMetrics) Reset()         { *m = TranslationEvaluat
 func (m *TranslationEvaluationMetrics) String() string { return proto.CompactTextString(m) }
 func (*TranslationEvaluationMetrics) ProtoMessage()    {}
 func (*TranslationEvaluationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_a3798f334391f423, []int{1}
+	return fileDescriptor_74f6484316c15700, []int{1}
 }
+
 func (m *TranslationEvaluationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TranslationEvaluationMetrics.Unmarshal(m, b)
 }
 func (m *TranslationEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TranslationEvaluationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *TranslationEvaluationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TranslationEvaluationMetrics.Merge(dst, src)
+func (m *TranslationEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationEvaluationMetrics.Merge(m, src)
 }
 func (m *TranslationEvaluationMetrics) XXX_Size() int {
 	return xxx_messageInfo_TranslationEvaluationMetrics.Size(m)
@@ -139,16 +144,17 @@ func (m *TranslationModelMetadata) Reset()         { *m = TranslationModelMetada
 func (m *TranslationModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*TranslationModelMetadata) ProtoMessage()    {}
 func (*TranslationModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_a3798f334391f423, []int{2}
+	return fileDescriptor_74f6484316c15700, []int{2}
 }
+
 func (m *TranslationModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TranslationModelMetadata.Unmarshal(m, b)
 }
 func (m *TranslationModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TranslationModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *TranslationModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TranslationModelMetadata.Merge(dst, src)
+func (m *TranslationModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationModelMetadata.Merge(m, src)
 }
 func (m *TranslationModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_TranslationModelMetadata.Size(m)
@@ -193,16 +199,17 @@ func (m *TranslationAnnotation) Reset()         { *m = TranslationAnnotation{} }
 func (m *TranslationAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TranslationAnnotation) ProtoMessage()    {}
 func (*TranslationAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_a3798f334391f423, []int{3}
+	return fileDescriptor_74f6484316c15700, []int{3}
 }
+
 func (m *TranslationAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TranslationAnnotation.Unmarshal(m, b)
 }
 func (m *TranslationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TranslationAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TranslationAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TranslationAnnotation.Merge(dst, src)
+func (m *TranslationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationAnnotation.Merge(m, src)
 }
 func (m *TranslationAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TranslationAnnotation.Size(m)
@@ -228,10 +235,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/translation.proto", fileDescriptor_translation_a3798f334391f423)
+	proto.RegisterFile("google/cloud/automl/v1beta1/translation.proto", fileDescriptor_74f6484316c15700)
 }
 
-var fileDescriptor_translation_a3798f334391f423 = []byte{
+var fileDescriptor_74f6484316c15700 = []byte{
 	// 398 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0xcb, 0xd3, 0x40,
 	0x10, 0xc6, 0x49, 0x04, 0xa1, 0x2b, 0xa2, 0x06, 0x85, 0x97, 0xbe, 0x15, 0xa5, 0x07, 0xe9, 0x41,
diff --git a/googleapis/cloud/automl/v1beta1/video.pb.go b/googleapis/cloud/automl/v1beta1/video.pb.go
index 75587e96ce..58f155bbaa 100644
--- a/googleapis/cloud/automl/v1beta1/video.pb.go
+++ b/googleapis/cloud/automl/v1beta1/video.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/automl/v1beta1/video.proto
 
-package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+package automl
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Dataset metadata specific to video classification.
 // All Video Classification datasets are treated as multi label.
@@ -31,16 +34,17 @@ func (m *VideoClassificationDatasetMetadata) Reset()         { *m = VideoClassif
 func (m *VideoClassificationDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*VideoClassificationDatasetMetadata) ProtoMessage()    {}
 func (*VideoClassificationDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_1ed0bfbdbbce0c1a, []int{0}
+	return fileDescriptor_ec8c6b74d94d2916, []int{0}
 }
+
 func (m *VideoClassificationDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoClassificationDatasetMetadata.Unmarshal(m, b)
 }
 func (m *VideoClassificationDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoClassificationDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *VideoClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoClassificationDatasetMetadata.Merge(dst, src)
+func (m *VideoClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoClassificationDatasetMetadata.Merge(m, src)
 }
 func (m *VideoClassificationDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_VideoClassificationDatasetMetadata.Size(m)
@@ -62,16 +66,17 @@ func (m *VideoClassificationModelMetadata) Reset()         { *m = VideoClassific
 func (m *VideoClassificationModelMetadata) String() string { return proto.CompactTextString(m) }
 func (*VideoClassificationModelMetadata) ProtoMessage()    {}
 func (*VideoClassificationModelMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_1ed0bfbdbbce0c1a, []int{1}
+	return fileDescriptor_ec8c6b74d94d2916, []int{1}
 }
+
 func (m *VideoClassificationModelMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoClassificationModelMetadata.Unmarshal(m, b)
 }
 func (m *VideoClassificationModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoClassificationModelMetadata.Marshal(b, m, deterministic)
 }
-func (dst *VideoClassificationModelMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoClassificationModelMetadata.Merge(dst, src)
+func (m *VideoClassificationModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoClassificationModelMetadata.Merge(m, src)
 }
 func (m *VideoClassificationModelMetadata) XXX_Size() int {
 	return xxx_messageInfo_VideoClassificationModelMetadata.Size(m)
@@ -88,10 +93,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/automl/v1beta1/video.proto", fileDescriptor_video_1ed0bfbdbbce0c1a)
+	proto.RegisterFile("google/cloud/automl/v1beta1/video.proto", fileDescriptor_ec8c6b74d94d2916)
 }
 
-var fileDescriptor_video_1ed0bfbdbbce0c1a = []byte{
+var fileDescriptor_ec8c6b74d94d2916 = []byte{
 	// 225 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xcf, 0x31, 0x4b, 0xc5, 0x30,
 	0x10, 0x07, 0x70, 0x9e, 0x83, 0x43, 0x46, 0xc7, 0xf7, 0x04, 0x25, 0x08, 0x6e, 0x89, 0x0f, 0x47,
diff --git a/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go b/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
index 0ceb68995f..efecd5733d 100644
--- a/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
+++ b/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
-package datatransfer // import "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package datatransfer
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Parameter type.
 type DataSourceParameter_Type int32
@@ -59,6 +59,7 @@ var DataSourceParameter_Type_name = map[int32]string{
 	5: "RECORD",
 	6: "PLUS_PAGE",
 }
+
 var DataSourceParameter_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"STRING":           1,
@@ -72,8 +73,9 @@ var DataSourceParameter_Type_value = map[string]int32{
 func (x DataSourceParameter_Type) String() string {
 	return proto.EnumName(DataSourceParameter_Type_name, int32(x))
 }
+
 func (DataSourceParameter_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{0, 0}
+	return fileDescriptor_8edec8f64c27b8a4, []int{0, 0}
 }
 
 // The type of authorization needed for this data source.
@@ -95,6 +97,7 @@ var DataSource_AuthorizationType_name = map[int32]string{
 	1: "AUTHORIZATION_CODE",
 	2: "GOOGLE_PLUS_AUTHORIZATION_CODE",
 }
+
 var DataSource_AuthorizationType_value = map[string]int32{
 	"AUTHORIZATION_TYPE_UNSPECIFIED": 0,
 	"AUTHORIZATION_CODE":             1,
@@ -104,8 +107,9 @@ var DataSource_AuthorizationType_value = map[string]int32{
 func (x DataSource_AuthorizationType) String() string {
 	return proto.EnumName(DataSource_AuthorizationType_name, int32(x))
 }
+
 func (DataSource_AuthorizationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{1, 0}
+	return fileDescriptor_8edec8f64c27b8a4, []int{1, 0}
 }
 
 // Represents how the data source supports data auto refresh.
@@ -129,6 +133,7 @@ var DataSource_DataRefreshType_name = map[int32]string{
 	1: "SLIDING_WINDOW",
 	2: "CUSTOM_SLIDING_WINDOW",
 }
+
 var DataSource_DataRefreshType_value = map[string]int32{
 	"DATA_REFRESH_TYPE_UNSPECIFIED": 0,
 	"SLIDING_WINDOW":                1,
@@ -138,8 +143,9 @@ var DataSource_DataRefreshType_value = map[string]int32{
 func (x DataSource_DataRefreshType) String() string {
 	return proto.EnumName(DataSource_DataRefreshType_name, int32(x))
 }
+
 func (DataSource_DataRefreshType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{1, 1}
+	return fileDescriptor_8edec8f64c27b8a4, []int{1, 1}
 }
 
 // Represents which runs should be pulled.
@@ -156,6 +162,7 @@ var ListTransferRunsRequest_RunAttempt_name = map[int32]string{
 	0: "RUN_ATTEMPT_UNSPECIFIED",
 	1: "LATEST",
 }
+
 var ListTransferRunsRequest_RunAttempt_value = map[string]int32{
 	"RUN_ATTEMPT_UNSPECIFIED": 0,
 	"LATEST":                  1,
@@ -164,8 +171,9 @@ var ListTransferRunsRequest_RunAttempt_value = map[string]int32{
 func (x ListTransferRunsRequest_RunAttempt) String() string {
 	return proto.EnumName(ListTransferRunsRequest_RunAttempt_name, int32(x))
 }
+
 func (ListTransferRunsRequest_RunAttempt) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{13, 0}
+	return fileDescriptor_8edec8f64c27b8a4, []int{13, 0}
 }
 
 // Represents a data source parameter with validation rules, so that
@@ -216,16 +224,17 @@ func (m *DataSourceParameter) Reset()         { *m = DataSourceParameter{} }
 func (m *DataSourceParameter) String() string { return proto.CompactTextString(m) }
 func (*DataSourceParameter) ProtoMessage()    {}
 func (*DataSourceParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{0}
+	return fileDescriptor_8edec8f64c27b8a4, []int{0}
 }
+
 func (m *DataSourceParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataSourceParameter.Unmarshal(m, b)
 }
 func (m *DataSourceParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DataSourceParameter.Marshal(b, m, deterministic)
 }
-func (dst *DataSourceParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DataSourceParameter.Merge(dst, src)
+func (m *DataSourceParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataSourceParameter.Merge(m, src)
 }
 func (m *DataSourceParameter) XXX_Size() int {
 	return xxx_messageInfo_DataSourceParameter.Size(m)
@@ -406,16 +415,17 @@ func (m *DataSource) Reset()         { *m = DataSource{} }
 func (m *DataSource) String() string { return proto.CompactTextString(m) }
 func (*DataSource) ProtoMessage()    {}
 func (*DataSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{1}
+	return fileDescriptor_8edec8f64c27b8a4, []int{1}
 }
+
 func (m *DataSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataSource.Unmarshal(m, b)
 }
 func (m *DataSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DataSource.Marshal(b, m, deterministic)
 }
-func (dst *DataSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DataSource.Merge(dst, src)
+func (m *DataSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataSource.Merge(m, src)
 }
 func (m *DataSource) XXX_Size() int {
 	return xxx_messageInfo_DataSource.Size(m)
@@ -566,16 +576,17 @@ func (m *GetDataSourceRequest) Reset()         { *m = GetDataSourceRequest{} }
 func (m *GetDataSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDataSourceRequest) ProtoMessage()    {}
 func (*GetDataSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{2}
+	return fileDescriptor_8edec8f64c27b8a4, []int{2}
 }
+
 func (m *GetDataSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDataSourceRequest.Unmarshal(m, b)
 }
 func (m *GetDataSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDataSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDataSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDataSourceRequest.Merge(dst, src)
+func (m *GetDataSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDataSourceRequest.Merge(m, src)
 }
 func (m *GetDataSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDataSourceRequest.Size(m)
@@ -615,16 +626,17 @@ func (m *ListDataSourcesRequest) Reset()         { *m = ListDataSourcesRequest{}
 func (m *ListDataSourcesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDataSourcesRequest) ProtoMessage()    {}
 func (*ListDataSourcesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{3}
+	return fileDescriptor_8edec8f64c27b8a4, []int{3}
 }
+
 func (m *ListDataSourcesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDataSourcesRequest.Unmarshal(m, b)
 }
 func (m *ListDataSourcesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDataSourcesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDataSourcesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDataSourcesRequest.Merge(dst, src)
+func (m *ListDataSourcesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDataSourcesRequest.Merge(m, src)
 }
 func (m *ListDataSourcesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDataSourcesRequest.Size(m)
@@ -674,16 +686,17 @@ func (m *ListDataSourcesResponse) Reset()         { *m = ListDataSourcesResponse
 func (m *ListDataSourcesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDataSourcesResponse) ProtoMessage()    {}
 func (*ListDataSourcesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{4}
+	return fileDescriptor_8edec8f64c27b8a4, []int{4}
 }
+
 func (m *ListDataSourcesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDataSourcesResponse.Unmarshal(m, b)
 }
 func (m *ListDataSourcesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDataSourcesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDataSourcesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDataSourcesResponse.Merge(dst, src)
+func (m *ListDataSourcesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDataSourcesResponse.Merge(m, src)
 }
 func (m *ListDataSourcesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDataSourcesResponse.Size(m)
@@ -748,16 +761,17 @@ func (m *CreateTransferConfigRequest) Reset()         { *m = CreateTransferConfi
 func (m *CreateTransferConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTransferConfigRequest) ProtoMessage()    {}
 func (*CreateTransferConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{5}
+	return fileDescriptor_8edec8f64c27b8a4, []int{5}
 }
+
 func (m *CreateTransferConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTransferConfigRequest.Unmarshal(m, b)
 }
 func (m *CreateTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTransferConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTransferConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTransferConfigRequest.Merge(dst, src)
+func (m *CreateTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTransferConfigRequest.Merge(m, src)
 }
 func (m *CreateTransferConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTransferConfigRequest.Size(m)
@@ -822,16 +836,17 @@ func (m *UpdateTransferConfigRequest) Reset()         { *m = UpdateTransferConfi
 func (m *UpdateTransferConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateTransferConfigRequest) ProtoMessage()    {}
 func (*UpdateTransferConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{6}
+	return fileDescriptor_8edec8f64c27b8a4, []int{6}
 }
+
 func (m *UpdateTransferConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateTransferConfigRequest.Unmarshal(m, b)
 }
 func (m *UpdateTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateTransferConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateTransferConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateTransferConfigRequest.Merge(dst, src)
+func (m *UpdateTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTransferConfigRequest.Merge(m, src)
 }
 func (m *UpdateTransferConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateTransferConfigRequest.Size(m)
@@ -877,16 +892,17 @@ func (m *GetTransferConfigRequest) Reset()         { *m = GetTransferConfigReque
 func (m *GetTransferConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTransferConfigRequest) ProtoMessage()    {}
 func (*GetTransferConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{7}
+	return fileDescriptor_8edec8f64c27b8a4, []int{7}
 }
+
 func (m *GetTransferConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTransferConfigRequest.Unmarshal(m, b)
 }
 func (m *GetTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTransferConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTransferConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTransferConfigRequest.Merge(dst, src)
+func (m *GetTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransferConfigRequest.Merge(m, src)
 }
 func (m *GetTransferConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTransferConfigRequest.Size(m)
@@ -919,16 +935,17 @@ func (m *DeleteTransferConfigRequest) Reset()         { *m = DeleteTransferConfi
 func (m *DeleteTransferConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTransferConfigRequest) ProtoMessage()    {}
 func (*DeleteTransferConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{8}
+	return fileDescriptor_8edec8f64c27b8a4, []int{8}
 }
+
 func (m *DeleteTransferConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTransferConfigRequest.Unmarshal(m, b)
 }
 func (m *DeleteTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTransferConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTransferConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTransferConfigRequest.Merge(dst, src)
+func (m *DeleteTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTransferConfigRequest.Merge(m, src)
 }
 func (m *DeleteTransferConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTransferConfigRequest.Size(m)
@@ -960,16 +977,17 @@ func (m *GetTransferRunRequest) Reset()         { *m = GetTransferRunRequest{} }
 func (m *GetTransferRunRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTransferRunRequest) ProtoMessage()    {}
 func (*GetTransferRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{9}
+	return fileDescriptor_8edec8f64c27b8a4, []int{9}
 }
+
 func (m *GetTransferRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTransferRunRequest.Unmarshal(m, b)
 }
 func (m *GetTransferRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTransferRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTransferRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTransferRunRequest.Merge(dst, src)
+func (m *GetTransferRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransferRunRequest.Merge(m, src)
 }
 func (m *GetTransferRunRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTransferRunRequest.Size(m)
@@ -1001,16 +1019,17 @@ func (m *DeleteTransferRunRequest) Reset()         { *m = DeleteTransferRunReque
 func (m *DeleteTransferRunRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTransferRunRequest) ProtoMessage()    {}
 func (*DeleteTransferRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{10}
+	return fileDescriptor_8edec8f64c27b8a4, []int{10}
 }
+
 func (m *DeleteTransferRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTransferRunRequest.Unmarshal(m, b)
 }
 func (m *DeleteTransferRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTransferRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTransferRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTransferRunRequest.Merge(dst, src)
+func (m *DeleteTransferRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTransferRunRequest.Merge(m, src)
 }
 func (m *DeleteTransferRunRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTransferRunRequest.Size(m)
@@ -1052,16 +1071,17 @@ func (m *ListTransferConfigsRequest) Reset()         { *m = ListTransferConfigsR
 func (m *ListTransferConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTransferConfigsRequest) ProtoMessage()    {}
 func (*ListTransferConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{11}
+	return fileDescriptor_8edec8f64c27b8a4, []int{11}
 }
+
 func (m *ListTransferConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListTransferConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferConfigsRequest.Merge(dst, src)
+func (m *ListTransferConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferConfigsRequest.Merge(m, src)
 }
 func (m *ListTransferConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTransferConfigsRequest.Size(m)
@@ -1118,16 +1138,17 @@ func (m *ListTransferConfigsResponse) Reset()         { *m = ListTransferConfigs
 func (m *ListTransferConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTransferConfigsResponse) ProtoMessage()    {}
 func (*ListTransferConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{12}
+	return fileDescriptor_8edec8f64c27b8a4, []int{12}
 }
+
 func (m *ListTransferConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListTransferConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferConfigsResponse.Merge(dst, src)
+func (m *ListTransferConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferConfigsResponse.Merge(m, src)
 }
 func (m *ListTransferConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTransferConfigsResponse.Size(m)
@@ -1181,16 +1202,17 @@ func (m *ListTransferRunsRequest) Reset()         { *m = ListTransferRunsRequest
 func (m *ListTransferRunsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTransferRunsRequest) ProtoMessage()    {}
 func (*ListTransferRunsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{13}
+	return fileDescriptor_8edec8f64c27b8a4, []int{13}
 }
+
 func (m *ListTransferRunsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferRunsRequest.Unmarshal(m, b)
 }
 func (m *ListTransferRunsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferRunsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferRunsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferRunsRequest.Merge(dst, src)
+func (m *ListTransferRunsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferRunsRequest.Merge(m, src)
 }
 func (m *ListTransferRunsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTransferRunsRequest.Size(m)
@@ -1254,16 +1276,17 @@ func (m *ListTransferRunsResponse) Reset()         { *m = ListTransferRunsRespon
 func (m *ListTransferRunsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTransferRunsResponse) ProtoMessage()    {}
 func (*ListTransferRunsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{14}
+	return fileDescriptor_8edec8f64c27b8a4, []int{14}
 }
+
 func (m *ListTransferRunsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferRunsResponse.Unmarshal(m, b)
 }
 func (m *ListTransferRunsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferRunsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferRunsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferRunsResponse.Merge(dst, src)
+func (m *ListTransferRunsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferRunsResponse.Merge(m, src)
 }
 func (m *ListTransferRunsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTransferRunsResponse.Size(m)
@@ -1313,16 +1336,17 @@ func (m *ListTransferLogsRequest) Reset()         { *m = ListTransferLogsRequest
 func (m *ListTransferLogsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTransferLogsRequest) ProtoMessage()    {}
 func (*ListTransferLogsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{15}
+	return fileDescriptor_8edec8f64c27b8a4, []int{15}
 }
+
 func (m *ListTransferLogsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferLogsRequest.Unmarshal(m, b)
 }
 func (m *ListTransferLogsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferLogsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferLogsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferLogsRequest.Merge(dst, src)
+func (m *ListTransferLogsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferLogsRequest.Merge(m, src)
 }
 func (m *ListTransferLogsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTransferLogsRequest.Size(m)
@@ -1379,16 +1403,17 @@ func (m *ListTransferLogsResponse) Reset()         { *m = ListTransferLogsRespon
 func (m *ListTransferLogsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTransferLogsResponse) ProtoMessage()    {}
 func (*ListTransferLogsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{16}
+	return fileDescriptor_8edec8f64c27b8a4, []int{16}
 }
+
 func (m *ListTransferLogsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferLogsResponse.Unmarshal(m, b)
 }
 func (m *ListTransferLogsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferLogsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferLogsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferLogsResponse.Merge(dst, src)
+func (m *ListTransferLogsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferLogsResponse.Merge(m, src)
 }
 func (m *ListTransferLogsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTransferLogsResponse.Size(m)
@@ -1432,16 +1457,17 @@ func (m *CheckValidCredsRequest) Reset()         { *m = CheckValidCredsRequest{}
 func (m *CheckValidCredsRequest) String() string { return proto.CompactTextString(m) }
 func (*CheckValidCredsRequest) ProtoMessage()    {}
 func (*CheckValidCredsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{17}
+	return fileDescriptor_8edec8f64c27b8a4, []int{17}
 }
+
 func (m *CheckValidCredsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckValidCredsRequest.Unmarshal(m, b)
 }
 func (m *CheckValidCredsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckValidCredsRequest.Marshal(b, m, deterministic)
 }
-func (dst *CheckValidCredsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckValidCredsRequest.Merge(dst, src)
+func (m *CheckValidCredsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckValidCredsRequest.Merge(m, src)
 }
 func (m *CheckValidCredsRequest) XXX_Size() int {
 	return xxx_messageInfo_CheckValidCredsRequest.Size(m)
@@ -1472,16 +1498,17 @@ func (m *CheckValidCredsResponse) Reset()         { *m = CheckValidCredsResponse
 func (m *CheckValidCredsResponse) String() string { return proto.CompactTextString(m) }
 func (*CheckValidCredsResponse) ProtoMessage()    {}
 func (*CheckValidCredsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{18}
+	return fileDescriptor_8edec8f64c27b8a4, []int{18}
 }
+
 func (m *CheckValidCredsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CheckValidCredsResponse.Unmarshal(m, b)
 }
 func (m *CheckValidCredsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CheckValidCredsResponse.Marshal(b, m, deterministic)
 }
-func (dst *CheckValidCredsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckValidCredsResponse.Merge(dst, src)
+func (m *CheckValidCredsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckValidCredsResponse.Merge(m, src)
 }
 func (m *CheckValidCredsResponse) XXX_Size() int {
 	return xxx_messageInfo_CheckValidCredsResponse.Size(m)
@@ -1519,16 +1546,17 @@ func (m *ScheduleTransferRunsRequest) Reset()         { *m = ScheduleTransferRun
 func (m *ScheduleTransferRunsRequest) String() string { return proto.CompactTextString(m) }
 func (*ScheduleTransferRunsRequest) ProtoMessage()    {}
 func (*ScheduleTransferRunsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{19}
+	return fileDescriptor_8edec8f64c27b8a4, []int{19}
 }
+
 func (m *ScheduleTransferRunsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScheduleTransferRunsRequest.Unmarshal(m, b)
 }
 func (m *ScheduleTransferRunsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScheduleTransferRunsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ScheduleTransferRunsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScheduleTransferRunsRequest.Merge(dst, src)
+func (m *ScheduleTransferRunsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScheduleTransferRunsRequest.Merge(m, src)
 }
 func (m *ScheduleTransferRunsRequest) XXX_Size() int {
 	return xxx_messageInfo_ScheduleTransferRunsRequest.Size(m)
@@ -1573,16 +1601,17 @@ func (m *ScheduleTransferRunsResponse) Reset()         { *m = ScheduleTransferRu
 func (m *ScheduleTransferRunsResponse) String() string { return proto.CompactTextString(m) }
 func (*ScheduleTransferRunsResponse) ProtoMessage()    {}
 func (*ScheduleTransferRunsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datatransfer_102617b20f253925, []int{20}
+	return fileDescriptor_8edec8f64c27b8a4, []int{20}
 }
+
 func (m *ScheduleTransferRunsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScheduleTransferRunsResponse.Unmarshal(m, b)
 }
 func (m *ScheduleTransferRunsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScheduleTransferRunsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ScheduleTransferRunsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScheduleTransferRunsResponse.Merge(dst, src)
+func (m *ScheduleTransferRunsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScheduleTransferRunsResponse.Merge(m, src)
 }
 func (m *ScheduleTransferRunsResponse) XXX_Size() int {
 	return xxx_messageInfo_ScheduleTransferRunsResponse.Size(m)
@@ -1601,6 +1630,10 @@ func (m *ScheduleTransferRunsResponse) GetRuns() []*TransferRun {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.DataSourceParameter_Type", DataSourceParameter_Type_name, DataSourceParameter_Type_value)
+	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.DataSource_AuthorizationType", DataSource_AuthorizationType_name, DataSource_AuthorizationType_value)
+	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.DataSource_DataRefreshType", DataSource_DataRefreshType_name, DataSource_DataRefreshType_value)
+	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest_RunAttempt", ListTransferRunsRequest_RunAttempt_name, ListTransferRunsRequest_RunAttempt_value)
 	proto.RegisterType((*DataSourceParameter)(nil), "google.cloud.bigquery.datatransfer.v1.DataSourceParameter")
 	proto.RegisterType((*DataSource)(nil), "google.cloud.bigquery.datatransfer.v1.DataSource")
 	proto.RegisterType((*GetDataSourceRequest)(nil), "google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest")
@@ -1622,10 +1655,161 @@ func init() {
 	proto.RegisterType((*CheckValidCredsResponse)(nil), "google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse")
 	proto.RegisterType((*ScheduleTransferRunsRequest)(nil), "google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest")
 	proto.RegisterType((*ScheduleTransferRunsResponse)(nil), "google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse")
-	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.DataSourceParameter_Type", DataSourceParameter_Type_name, DataSourceParameter_Type_value)
-	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.DataSource_AuthorizationType", DataSource_AuthorizationType_name, DataSource_AuthorizationType_value)
-	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.DataSource_DataRefreshType", DataSource_DataRefreshType_name, DataSource_DataRefreshType_value)
-	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest_RunAttempt", ListTransferRunsRequest_RunAttempt_name, ListTransferRunsRequest_RunAttempt_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/datatransfer.proto", fileDescriptor_8edec8f64c27b8a4)
+}
+
+var fileDescriptor_8edec8f64c27b8a4 = []byte{
+	// 2343 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0xdb, 0xc8,
+	0xf5, 0xff, 0x52, 0xfe, 0xfd, 0x64, 0x5b, 0xf2, 0xc4, 0x71, 0x18, 0x39, 0xbb, 0x5f, 0x2f, 0xdb,
+	0x64, 0x1d, 0xb7, 0x95, 0xd6, 0xca, 0x26, 0xcd, 0x3a, 0x4d, 0x02, 0x59, 0x92, 0x1d, 0x15, 0x8e,
+	0xe5, 0xa5, 0xe4, 0x64, 0x6b, 0x04, 0xcb, 0x65, 0xc4, 0xb1, 0xcc, 0x0d, 0x45, 0x32, 0x1c, 0xd2,
+	0x89, 0x53, 0xa4, 0x87, 0x45, 0x50, 0x60, 0xd1, 0xde, 0xf6, 0xb0, 0x05, 0x8a, 0x5e, 0x7a, 0x69,
+	0xb7, 0x40, 0xff, 0x84, 0xde, 0x7a, 0xea, 0xb5, 0xb7, 0x3d, 0xb4, 0x40, 0xdb, 0x4b, 0x6f, 0x05,
+	0x7a, 0xe9, 0xa1, 0x87, 0x62, 0x86, 0x43, 0x89, 0x92, 0x68, 0x8b, 0x92, 0x0b, 0xf4, 0x64, 0xcd,
+	0xbc, 0x1f, 0x33, 0xef, 0xc7, 0xe7, 0xcd, 0x7b, 0x84, 0xe1, 0x76, 0xd3, 0xb2, 0x9a, 0x06, 0xce,
+	0x35, 0x0c, 0xcb, 0xd3, 0x72, 0x4f, 0xf5, 0xe6, 0x73, 0x0f, 0x3b, 0x27, 0x39, 0x4d, 0x75, 0x55,
+	0xd7, 0x51, 0x4d, 0x72, 0x88, 0x9d, 0xdc, 0xf1, 0x7a, 0xd7, 0x3a, 0x6b, 0x3b, 0x96, 0x6b, 0xa1,
+	0xab, 0xbe, 0x64, 0x96, 0x49, 0x66, 0x03, 0xc9, 0x6c, 0x17, 0xe7, 0xf1, 0x7a, 0xe6, 0x0a, 0x3f,
+	0x40, 0xb5, 0xf5, 0x9c, 0x6a, 0x9a, 0x96, 0xab, 0xba, 0xba, 0x65, 0x12, 0x5f, 0x49, 0xe6, 0xfd,
+	0x78, 0xc7, 0x77, 0x1f, 0x9d, 0x79, 0x9b, 0x4b, 0xb1, 0xd5, 0x53, 0xef, 0x30, 0xa7, 0x79, 0x0e,
+	0x53, 0xcb, 0xe9, 0xcb, 0xbd, 0x74, 0xdc, 0xb2, 0xdd, 0x13, 0x4e, 0x5c, 0xe9, 0x25, 0x1e, 0xea,
+	0xd8, 0xd0, 0x94, 0x96, 0x4a, 0x9e, 0x71, 0x8e, 0xff, 0xef, 0xe5, 0x70, 0xf5, 0x16, 0x26, 0xae,
+	0xda, 0xb2, 0x4f, 0x3b, 0xff, 0x85, 0xa3, 0xda, 0x36, 0x76, 0xb8, 0x55, 0xd2, 0xaf, 0x27, 0xe1,
+	0x42, 0x49, 0x75, 0xd5, 0x9a, 0xe5, 0x39, 0x0d, 0xbc, 0xa7, 0x3a, 0x6a, 0x0b, 0xbb, 0xd8, 0x41,
+	0x97, 0x61, 0xda, 0xa6, 0x0b, 0x45, 0xd7, 0x44, 0x61, 0x45, 0x58, 0x9d, 0x91, 0xa7, 0xd8, 0xba,
+	0xa2, 0xa1, 0x77, 0x60, 0x56, 0xd3, 0x89, 0x6d, 0xa8, 0x27, 0x8a, 0xa9, 0xb6, 0xb0, 0x98, 0x60,
+	0xe4, 0x24, 0xdf, 0xdb, 0x55, 0x5b, 0x18, 0xad, 0x40, 0x52, 0xc3, 0xa4, 0xe1, 0xe8, 0x36, 0x35,
+	0x55, 0x1c, 0xe3, 0x1c, 0x9d, 0x2d, 0x54, 0x83, 0x71, 0xf7, 0xc4, 0xc6, 0xe2, 0xf8, 0x8a, 0xb0,
+	0x3a, 0x9f, 0xbf, 0x9f, 0x8d, 0x15, 0xa1, 0x6c, 0xc4, 0x4d, 0xb3, 0xf5, 0x13, 0x1b, 0xcb, 0x4c,
+	0x19, 0xca, 0xc0, 0xb4, 0x83, 0x9f, 0x7b, 0xba, 0x83, 0x35, 0x71, 0x62, 0x45, 0x58, 0x9d, 0x96,
+	0xdb, 0x6b, 0x9f, 0x66, 0x63, 0xd5, 0xc5, 0x9a, 0x38, 0x19, 0xd0, 0xfc, 0x35, 0xba, 0x0e, 0xe9,
+	0x63, 0xd5, 0xd0, 0x35, 0x16, 0x18, 0xc5, 0xc1, 0x4d, 0xfc, 0x52, 0x9c, 0x62, 0x77, 0x4e, 0x75,
+	0xf6, 0x65, 0xba, 0x8d, 0xae, 0xc2, 0xbc, 0x6a, 0x18, 0xd6, 0x0b, 0xac, 0x29, 0xc7, 0xaa, 0xe1,
+	0x61, 0x22, 0x4e, 0xaf, 0x8c, 0xad, 0xce, 0xc8, 0x73, 0x7c, 0xf7, 0x11, 0xdb, 0x44, 0x1f, 0xc0,
+	0x4c, 0x4b, 0x37, 0x7d, 0x16, 0x71, 0x66, 0x45, 0x58, 0x4d, 0xe6, 0xaf, 0x04, 0x36, 0x06, 0xa1,
+	0xc8, 0x96, 0x2c, 0xef, 0xa9, 0x81, 0x99, 0x84, 0x3c, 0xdd, 0xd2, 0x4d, 0xf6, 0x8b, 0x89, 0xaa,
+	0x2f, 0xb9, 0x28, 0xc4, 0x12, 0x55, 0x5f, 0xfa, 0xa2, 0x32, 0x4c, 0xb2, 0x0c, 0x21, 0x62, 0x72,
+	0x65, 0x6c, 0x35, 0x99, 0xdf, 0x18, 0xdd, 0xad, 0x32, 0xd7, 0x84, 0x6e, 0xc2, 0x52, 0xc8, 0x37,
+	0xe1, 0xa8, 0xce, 0x32, 0x0f, 0x5d, 0xec, 0x50, 0x4b, 0xa1, 0xf8, 0x66, 0xe1, 0x42, 0x48, 0xec,
+	0x08, 0x1b, 0xb6, 0xe2, 0x39, 0x86, 0x38, 0xc7, 0x64, 0x16, 0x3a, 0xa4, 0x07, 0xd8, 0xb0, 0xf7,
+	0x1d, 0x03, 0x5d, 0x81, 0x19, 0xbd, 0xd5, 0xf2, 0x5c, 0xf5, 0xa9, 0x81, 0xc5, 0x79, 0x16, 0x9f,
+	0xce, 0x06, 0x12, 0x61, 0xca, 0xc1, 0x0d, 0xcf, 0x21, 0x58, 0x4c, 0x31, 0x5a, 0xb0, 0x94, 0x74,
+	0x18, 0xa7, 0x09, 0x80, 0x16, 0x21, 0x5d, 0xff, 0xc1, 0x5e, 0x59, 0xd9, 0xdf, 0xad, 0xed, 0x95,
+	0x8b, 0x95, 0xad, 0x4a, 0xb9, 0x94, 0xfe, 0x3f, 0x04, 0x30, 0x59, 0xab, 0xcb, 0x95, 0xdd, 0xed,
+	0xb4, 0x80, 0x92, 0x30, 0x55, 0xd9, 0xad, 0x97, 0xb7, 0xcb, 0x72, 0x3a, 0x41, 0x09, 0xa5, 0xea,
+	0xfe, 0xe6, 0x4e, 0x39, 0x3d, 0x46, 0x09, 0x9b, 0xd5, 0xea, 0x4e, 0xb9, 0xb0, 0x9b, 0x1e, 0xa7,
+	0x04, 0xb9, 0x5c, 0xac, 0xca, 0xa5, 0xf4, 0x04, 0x9a, 0x83, 0x99, 0xbd, 0x9d, 0xfd, 0x9a, 0xb2,
+	0x57, 0xd8, 0x2e, 0xa7, 0x27, 0xa5, 0x7f, 0xcf, 0x00, 0x74, 0x3c, 0x85, 0x10, 0x8c, 0xb3, 0xf4,
+	0xf7, 0xd1, 0xc1, 0x7e, 0xa3, 0x6f, 0xc2, 0x3c, 0xf5, 0xad, 0x42, 0x18, 0x0b, 0xc5, 0x8e, 0x0f,
+	0x8e, 0x59, 0xad, 0x2d, 0x17, 0x01, 0xa0, 0xb1, 0x81, 0x00, 0x1a, 0xef, 0x07, 0xd0, 0x32, 0xcc,
+	0x34, 0x0c, 0x1d, 0x9b, 0x2e, 0x3d, 0x65, 0x82, 0xd1, 0xa7, 0xfd, 0x8d, 0x8a, 0x86, 0x96, 0x60,
+	0x92, 0x34, 0x2c, 0x1b, 0x13, 0x71, 0x92, 0x65, 0x27, 0x5f, 0xa1, 0x8f, 0x60, 0x2e, 0x88, 0xbb,
+	0xc2, 0xe0, 0x37, 0xc5, 0xe0, 0x77, 0x23, 0x66, 0x9e, 0xd4, 0xf9, 0x6f, 0x06, 0xb9, 0x59, 0x37,
+	0xb4, 0x42, 0xf7, 0x60, 0x99, 0x78, 0xb6, 0x6d, 0x39, 0x2e, 0x51, 0x5a, 0x9e, 0xe1, 0xea, 0xb6,
+	0x81, 0x95, 0x80, 0x83, 0x82, 0x84, 0x46, 0xed, 0x72, 0xc0, 0xf2, 0x90, 0x73, 0x04, 0x0a, 0x09,
+	0xba, 0x05, 0x97, 0x3c, 0x5b, 0x53, 0x5d, 0xac, 0x68, 0x58, 0xd5, 0x0c, 0xdd, 0xc4, 0x0a, 0xc1,
+	0x0d, 0xcb, 0xd4, 0x08, 0x83, 0xcf, 0x84, 0x7c, 0xd1, 0x27, 0x97, 0x38, 0xb5, 0xe6, 0x13, 0x29,
+	0x74, 0x35, 0x7c, 0xa8, 0x7a, 0x86, 0xab, 0x90, 0xc6, 0x11, 0xd6, 0x3c, 0xc3, 0x07, 0xcd, 0x8c,
+	0x9c, 0xe2, 0xfb, 0x35, 0xbe, 0x8d, 0x6e, 0x83, 0xd8, 0xbe, 0x62, 0xc3, 0x23, 0xae, 0xd5, 0xea,
+	0x88, 0x24, 0xd9, 0xfd, 0x96, 0x02, 0x7a, 0x91, 0x91, 0xdb, 0x92, 0x07, 0x00, 0x76, 0x00, 0x0c,
+	0x22, 0xce, 0x9e, 0x1b, 0x5b, 0x21, 0x6d, 0xb4, 0xd0, 0xf6, 0xa0, 0x63, 0xea, 0x88, 0x63, 0xc2,
+	0x01, 0xa4, 0x7a, 0xee, 0x91, 0xe5, 0xe8, 0xaf, 0x7c, 0x18, 0xb1, 0x90, 0xcd, 0xb3, 0x90, 0x15,
+	0x87, 0x3e, 0x3e, 0x5b, 0x08, 0xeb, 0x62, 0x21, 0x5c, 0x50, 0x7b, 0xb7, 0x50, 0x0b, 0x16, 0x58,
+	0x06, 0x3b, 0xf8, 0xd0, 0xc1, 0xe4, 0xc8, 0x3f, 0x32, 0xc5, 0x8e, 0x2c, 0x0c, 0x7f, 0x24, 0xfd,
+	0x29, 0xfb, 0x9a, 0xd8, 0x81, 0x29, 0xad, 0x7b, 0x03, 0x6d, 0xc1, 0x4a, 0x10, 0xbe, 0xae, 0x63,
+	0x5f, 0xe8, 0xa6, 0x66, 0xbd, 0x50, 0x34, 0xf5, 0x84, 0x88, 0x69, 0x16, 0xff, 0x2b, 0x9c, 0x2f,
+	0xa4, 0xf2, 0x31, 0x63, 0x2a, 0xa9, 0x27, 0x04, 0xbd, 0x07, 0x8b, 0x2d, 0xd5, 0xf4, 0x54, 0x43,
+	0x71, 0x3c, 0x93, 0x28, 0x9a, 0x4e, 0x68, 0xdd, 0xd0, 0xc4, 0x05, 0x16, 0x57, 0xe4, 0xd3, 0x64,
+	0xcf, 0x24, 0x25, 0x4e, 0x41, 0xfb, 0x70, 0xb9, 0xa5, 0x9b, 0x7a, 0xcb, 0xeb, 0x64, 0x81, 0xa2,
+	0x9b, 0x2e, 0x76, 0x8e, 0x55, 0x43, 0x44, 0xac, 0xec, 0x5e, 0xee, 0x2f, 0xbb, 0xfc, 0xf1, 0x96,
+	0x2f, 0x71, 0xd9, 0x20, 0x45, 0x2a, 0x5c, 0x52, 0x22, 0xb0, 0xd0, 0xe7, 0x67, 0x24, 0xc1, 0xdb,
+	0x85, 0xfd, 0xfa, 0x83, 0xaa, 0x5c, 0x39, 0x28, 0xd4, 0x2b, 0xd5, 0x5d, 0x25, 0xa2, 0x54, 0x2d,
+	0x01, 0xea, 0xe6, 0x29, 0x56, 0x4b, 0xe5, 0xb4, 0x40, 0x65, 0xb7, 0xab, 0xd5, 0xed, 0x9d, 0xb2,
+	0xc2, 0x6a, 0x51, 0x04, 0x4f, 0x42, 0x6a, 0x40, 0xaa, 0xc7, 0xd3, 0xe8, 0x1d, 0x78, 0xab, 0x54,
+	0xa8, 0x17, 0x14, 0xb9, 0xbc, 0x25, 0x97, 0x6b, 0x0f, 0xa2, 0x4e, 0x44, 0x30, 0x5f, 0xdb, 0xa9,
+	0x94, 0x2a, 0xbb, 0xdb, 0xca, 0xe3, 0xca, 0x6e, 0xa9, 0xfa, 0x38, 0x2d, 0xa0, 0xcb, 0x70, 0xb1,
+	0xb8, 0x5f, 0xab, 0x57, 0x1f, 0x2a, 0x3d, 0xa4, 0x84, 0xb4, 0x06, 0x8b, 0xdb, 0xd8, 0xed, 0x04,
+	0x57, 0xc6, 0xcf, 0x3d, 0x4c, 0xdc, 0xa8, 0x3a, 0x28, 0x19, 0xb0, 0xb4, 0xa3, 0x93, 0x10, 0x33,
+	0x09, 0xb8, 0x97, 0x60, 0xd2, 0x56, 0x1d, 0x6c, 0xba, 0x9c, 0x9f, 0xaf, 0xd0, 0x5b, 0x14, 0x62,
+	0x4d, 0xac, 0xb8, 0xd6, 0x33, 0x1c, 0x34, 0x0c, 0x33, 0x74, 0xa7, 0x4e, 0x37, 0x68, 0xb5, 0x63,
+	0x64, 0xa2, 0xbf, 0xf2, 0x7b, 0x86, 0x09, 0x79, 0x9a, 0x6e, 0xd4, 0xf4, 0x57, 0x58, 0xfa, 0x52,
+	0x80, 0x4b, 0x7d, 0xc7, 0x11, 0xdb, 0x32, 0x09, 0x46, 0x75, 0x98, 0x0d, 0x55, 0x64, 0x22, 0x0a,
+	0x0c, 0xbc, 0xeb, 0x43, 0xa7, 0xb2, 0x9c, 0xec, 0x94, 0x70, 0x82, 0xae, 0x41, 0xca, 0xc4, 0x2f,
+	0x5d, 0x25, 0x74, 0x65, 0xbf, 0xd0, 0xcf, 0xd1, 0xed, 0xbd, 0xe0, 0xda, 0xd2, 0xef, 0x05, 0x58,
+	0x2e, 0x3a, 0xb4, 0xc9, 0x08, 0x2a, 0x5d, 0xd1, 0x32, 0x0f, 0xf5, 0xe6, 0x20, 0x6f, 0x7c, 0x0c,
+	0xa9, 0x76, 0x9d, 0x6e, 0x30, 0x09, 0xa6, 0x3f, 0x99, 0xbf, 0x39, 0x64, 0xa5, 0xe6, 0xc7, 0xcd,
+	0xbb, 0x5d, 0x6b, 0xf4, 0x9d, 0xde, 0xca, 0xd2, 0xb0, 0xb4, 0xe0, 0x1d, 0xea, 0x2e, 0x0a, 0x45,
+	0x4b, 0xc3, 0xd2, 0xdf, 0x05, 0x58, 0xde, 0x67, 0xe5, 0x37, 0xda, 0x8c, 0x88, 0xeb, 0x0a, 0xff,
+	0xbb, 0xeb, 0xa2, 0x3b, 0x90, 0xe4, 0x6f, 0x09, 0xed, 0x94, 0x59, 0xba, 0x24, 0xf3, 0x99, 0x3e,
+	0x30, 0x6f, 0xd1, 0x06, 0xe7, 0xa1, 0x4a, 0x9e, 0xc9, 0xe0, 0xb3, 0xd3, 0xdf, 0x52, 0x16, 0xc4,
+	0x6d, 0xec, 0x46, 0xdb, 0x19, 0x95, 0xea, 0xeb, 0xb0, 0x5c, 0xc2, 0x06, 0x3e, 0xcd, 0x35, 0x51,
+	0x22, 0xdf, 0x82, 0x8b, 0xa1, 0x23, 0x64, 0xcf, 0x3c, 0x8b, 0x39, 0x0b, 0x62, 0xb7, 0xfe, 0x01,
+	0xfc, 0x3f, 0x13, 0x20, 0x43, 0xc1, 0xd0, 0x7d, 0x9d, 0x81, 0xf8, 0xbb, 0x06, 0xa9, 0xee, 0xce,
+	0x85, 0x88, 0x09, 0xbf, 0xb1, 0x0d, 0xb7, 0x2e, 0xe4, 0x5c, 0x38, 0xfd, 0x95, 0x00, 0xcb, 0x91,
+	0x57, 0xe3, 0x58, 0xfd, 0x04, 0xd2, 0x3d, 0x69, 0x14, 0xe0, 0x75, 0xc4, 0x3c, 0x4a, 0x75, 0xe7,
+	0x51, 0x7c, 0xdc, 0xfe, 0x29, 0xe1, 0x57, 0x94, 0x90, 0xcf, 0x07, 0x7a, 0x70, 0x07, 0x26, 0x89,
+	0xab, 0xba, 0xd8, 0x77, 0xdc, 0x7c, 0xfe, 0xfd, 0x21, 0xef, 0x5c, 0xa3, 0xc2, 0x32, 0xd7, 0x71,
+	0x1e, 0x3f, 0xa3, 0x4f, 0x21, 0xe9, 0x78, 0xa6, 0xa2, 0xba, 0x2e, 0x1d, 0x26, 0x59, 0x73, 0x38,
+	0x9f, 0xaf, 0xc4, 0xbc, 0xce, 0x29, 0x66, 0x67, 0x65, 0xcf, 0x2c, 0xf8, 0x0a, 0x65, 0x70, 0xda,
+	0xbf, 0xa5, 0x9b, 0x00, 0x1d, 0x0a, 0x5a, 0x86, 0x4b, 0xf2, 0xfe, 0xae, 0x52, 0xa8, 0xd7, 0xcb,
+	0x0f, 0xf7, 0xea, 0xfd, 0xcd, 0xf8, 0x4e, 0xa1, 0x5e, 0xae, 0xd5, 0xd3, 0x82, 0xf4, 0x73, 0x01,
+	0xc4, 0xfe, 0x93, 0x78, 0x1e, 0x3c, 0x0e, 0x75, 0xa9, 0xf4, 0x39, 0xe7, 0x49, 0x90, 0x1f, 0xd2,
+	0xa1, 0x14, 0x28, 0xed, 0x26, 0x95, 0x1e, 0x10, 0x3b, 0xfc, 0x5f, 0x0b, 0xdd, 0xe1, 0xdf, 0xb1,
+	0x9a, 0x43, 0x3e, 0x60, 0xe3, 0x67, 0x06, 0x6c, 0xa2, 0x27, 0x60, 0xcf, 0x60, 0xae, 0x85, 0x09,
+	0x61, 0xe2, 0x27, 0x41, 0xd7, 0x3e, 0x9f, 0xdf, 0x1a, 0xd2, 0xe0, 0x87, 0xbe, 0x8e, 0x2c, 0xff,
+	0x5b, 0xc3, 0xc7, 0xd8, 0xd1, 0xdd, 0x13, 0x79, 0x96, 0x2b, 0xa7, 0x8d, 0x01, 0xa1, 0x28, 0x14,
+	0xfb, 0x8d, 0xe3, 0xae, 0x6f, 0xc0, 0x42, 0xdb, 0xf5, 0x5c, 0x2a, 0x70, 0xff, 0xad, 0xd1, 0x6e,
+	0x23, 0xb7, 0x31, 0xcd, 0x37, 0xe2, 0x87, 0xe1, 0xdb, 0xb0, 0x54, 0x3c, 0xc2, 0x8d, 0x67, 0x8f,
+	0xe8, 0xb4, 0x58, 0x74, 0xb0, 0x46, 0xce, 0x2a, 0x7c, 0x05, 0xb8, 0xd4, 0xc7, 0xcd, 0xad, 0xba,
+	0x06, 0xa9, 0x23, 0x95, 0x28, 0x6c, 0xea, 0x54, 0x1a, 0x94, 0xc4, 0x24, 0xa7, 0xe5, 0xb9, 0x23,
+	0x95, 0x74, 0xf8, 0x59, 0x81, 0x0a, 0x3a, 0xba, 0x61, 0xa0, 0xff, 0x01, 0x00, 0x71, 0x55, 0xc7,
+	0x55, 0x5c, 0x9d, 0x7f, 0x0f, 0x89, 0x7a, 0x6f, 0xea, 0xc1, 0xa7, 0x19, 0x79, 0x86, 0x71, 0xd3,
+	0x35, 0xba, 0x09, 0xd3, 0xd8, 0xd4, 0x7c, 0xc1, 0xb1, 0x81, 0x82, 0x53, 0xd8, 0xd4, 0xe8, 0x4a,
+	0x3a, 0x84, 0x2b, 0xd1, 0x17, 0xe5, 0x16, 0x6f, 0xc1, 0xf8, 0x39, 0x91, 0xc3, 0xe4, 0xf3, 0x3f,
+	0x5e, 0xf6, 0x3f, 0x0f, 0xb5, 0x8b, 0x14, 0x76, 0x8e, 0xf5, 0x06, 0x46, 0x7f, 0x16, 0x60, 0xae,
+	0xab, 0x1b, 0x44, 0x77, 0x62, 0x9e, 0x11, 0xd5, 0x43, 0x66, 0x86, 0xef, 0xc7, 0xa4, 0x8f, 0x3f,
+	0xfb, 0xe3, 0xdf, 0xbe, 0x48, 0x7c, 0x84, 0x72, 0xb9, 0xe3, 0xf5, 0xdc, 0x0f, 0x69, 0x06, 0xdc,
+	0xb5, 0x1d, 0xeb, 0x53, 0xdc, 0x70, 0x49, 0x6e, 0x2d, 0x67, 0x58, 0x0d, 0xff, 0xe3, 0x5d, 0x6e,
+	0x2d, 0x17, 0x6a, 0xdc, 0x72, 0x6b, 0xaf, 0x0f, 0xae, 0xa2, 0x6f, 0x44, 0x8a, 0x74, 0xb3, 0xa1,
+	0x7f, 0x08, 0x90, 0xea, 0x69, 0x2a, 0xd1, 0xdd, 0x21, 0x6a, 0x68, 0x7f, 0xef, 0x9b, 0xb9, 0x37,
+	0xaa, 0xb8, 0x1f, 0xd4, 0x1e, 0x93, 0xfd, 0xdc, 0x3b, 0xc5, 0xe8, 0xd7, 0x61, 0x73, 0xda, 0x26,
+	0xf7, 0x89, 0x74, 0xb1, 0xa1, 0x5f, 0x24, 0x60, 0x31, 0xaa, 0x5b, 0x45, 0x9b, 0x31, 0x2f, 0x7e,
+	0x46, 0xab, 0x9b, 0x19, 0xed, 0x09, 0x97, 0x3e, 0x17, 0x98, 0xd1, 0x9f, 0x09, 0xd2, 0x8d, 0x38,
+	0x56, 0xf7, 0x3c, 0xf8, 0x1b, 0xbd, 0x7d, 0xe9, 0xc1, 0x86, 0xf4, 0xee, 0x69, 0xae, 0x18, 0x24,
+	0x8b, 0x7e, 0x97, 0x80, 0xc5, 0xa8, 0x36, 0x38, 0xb6, 0x7f, 0xce, 0xe8, 0xa1, 0x47, 0xf5, 0xcf,
+	0x57, 0xbe, 0x7f, 0x7e, 0x29, 0xe4, 0x8b, 0xcc, 0xae, 0x9e, 0x3b, 0x67, 0xcf, 0x02, 0x46, 0x8f,
+	0xc1, 0xb9, 0xb5, 0xd7, 0xfd, 0xfe, 0xfa, 0x7e, 0xfe, 0xbb, 0xb1, 0xf4, 0xc6, 0xd0, 0x85, 0xbe,
+	0x16, 0x60, 0x31, 0xaa, 0x57, 0x8e, 0xed, 0xbf, 0x33, 0x1a, 0xed, 0xcc, 0x52, 0x5f, 0xd9, 0x2c,
+	0xb7, 0x6c, 0xf7, 0x44, 0x3a, 0x64, 0xfe, 0xf9, 0x64, 0xed, 0xc6, 0xc0, 0x3a, 0xd1, 0x6f, 0xc2,
+	0xc1, 0xf5, 0xb5, 0x77, 0x23, 0xc5, 0xfa, 0x59, 0xd1, 0x3f, 0x05, 0x58, 0xe8, 0x1b, 0x1c, 0xd0,
+	0xfd, 0xf8, 0x55, 0xf1, 0xbf, 0x9a, 0x16, 0xdc, 0x6a, 0x34, 0x9a, 0xd5, 0x28, 0xb6, 0xd5, 0x6f,
+	0x12, 0x70, 0x21, 0xa2, 0xa5, 0x47, 0x85, 0x11, 0xba, 0xcd, 0xee, 0x49, 0x25, 0xb3, 0x79, 0x1e,
+	0x15, 0xbc, 0x62, 0x76, 0xbb, 0x61, 0xb8, 0xda, 0xd1, 0x76, 0xc3, 0xe0, 0x52, 0x81, 0x7e, 0x9b,
+	0x80, 0xc5, 0xa8, 0xf7, 0x38, 0x76, 0x66, 0x9f, 0xd1, 0x75, 0x64, 0x8a, 0xe7, 0xd2, 0xc1, 0x3d,
+	0xf1, 0x13, 0xbf, 0x4e, 0xbc, 0x11, 0xa4, 0xcd, 0xc1, 0xbe, 0x88, 0x42, 0x73, 0xf0, 0x91, 0x8c,
+	0x6a, 0xdd, 0x10, 0xd6, 0x0e, 0xee, 0x48, 0xb7, 0x4e, 0x51, 0x34, 0x58, 0x18, 0xfd, 0x4b, 0x80,
+	0xf9, 0xee, 0x11, 0x18, 0x7d, 0x6f, 0x78, 0xa4, 0x74, 0x26, 0xe1, 0xcc, 0x08, 0x1d, 0x8e, 0xe4,
+	0x32, 0x8f, 0x98, 0x68, 0x63, 0x78, 0x8c, 0xe4, 0x68, 0x73, 0x44, 0xa1, 0xf2, 0x1e, 0xca, 0xc6,
+	0x83, 0x4a, 0x20, 0x81, 0xfe, 0x22, 0xc0, 0x42, 0xdf, 0x40, 0x1f, 0xbb, 0x4e, 0x9c, 0xf6, 0x29,
+	0xe0, 0xd4, 0xf2, 0xc7, 0x8d, 0x5c, 0x3b, 0x97, 0x91, 0x6b, 0xc3, 0x1a, 0xf9, 0x79, 0x02, 0xd2,
+	0xbd, 0xe3, 0x1d, 0xba, 0x77, 0xbe, 0x09, 0x34, 0x73, 0x7f, 0x64, 0x79, 0x8e, 0x81, 0xee, 0x80,
+	0x0f, 0x8b, 0x00, 0x66, 0x5c, 0x3b, 0xe0, 0x71, 0xd2, 0x9e, 0x49, 0xa0, 0xaf, 0x7a, 0x7c, 0x41,
+	0xe7, 0xad, 0x91, 0x7c, 0x11, 0x9a, 0x42, 0x47, 0xf2, 0x45, 0x78, 0xd0, 0x93, 0xbe, 0xf0, 0xeb,
+	0xc1, 0x4f, 0x05, 0x54, 0x19, 0xc5, 0x1b, 0x41, 0xa4, 0xdb, 0x14, 0xaa, 0xfc, 0xe0, 0x3e, 0xba,
+	0x1b, 0xd7, 0x39, 0x91, 0x0a, 0xd0, 0x97, 0x09, 0x48, 0xf5, 0x0c, 0x71, 0xb1, 0x9b, 0xee, 0xe8,
+	0x51, 0x31, 0x76, 0xd3, 0x7d, 0xca, 0xec, 0x28, 0xbd, 0xf1, 0x1d, 0xf5, 0x23, 0xe9, 0xfe, 0x90,
+	0x83, 0xc6, 0x46, 0xa3, 0x5b, 0x23, 0x2d, 0x9a, 0xb7, 0xa5, 0x1b, 0x31, 0x66, 0x8f, 0x08, 0xc9,
+	0xcd, 0xbf, 0x0a, 0x70, 0xbd, 0x61, 0xb5, 0xe2, 0x19, 0xb3, 0xb9, 0x10, 0x9e, 0xd9, 0xf6, 0x68,
+	0x45, 0xd8, 0x13, 0x0e, 0x3e, 0xe4, 0xb2, 0x4d, 0xcb, 0x50, 0xcd, 0x66, 0xd6, 0x72, 0x9a, 0xb9,
+	0x26, 0x36, 0x59, 0xbd, 0xc8, 0xf9, 0x24, 0xd5, 0xd6, 0xc9, 0x80, 0xff, 0x6f, 0xb8, 0x13, 0x5e,
+	0xff, 0x26, 0x71, 0x75, 0xdb, 0xd7, 0x59, 0x64, 0xf7, 0xd9, 0xd4, 0x9b, 0x1f, 0xb2, 0xfb, 0x84,
+	0x8f, 0xcf, 0x3e, 0x5a, 0xff, 0x43, 0xc0, 0xf7, 0x84, 0xf1, 0x3d, 0x09, 0xf8, 0x9e, 0x84, 0xf9,
+	0x9e, 0x3c, 0x5a, 0x7f, 0x3a, 0xc9, 0x6e, 0x73, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x48,
+	0xcd, 0xb8, 0x10, 0xeb, 0x21, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2145,158 +2329,3 @@ var _DataTransferService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/bigquery/datatransfer/v1/datatransfer.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/datatransfer.proto", fileDescriptor_datatransfer_102617b20f253925)
-}
-
-var fileDescriptor_datatransfer_102617b20f253925 = []byte{
-	// 2343 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0xdb, 0xc8,
-	0xf5, 0xff, 0x52, 0xfe, 0xfd, 0x64, 0x5b, 0xf2, 0xc4, 0x71, 0x18, 0x39, 0xbb, 0x5f, 0x2f, 0xdb,
-	0x64, 0x1d, 0xb7, 0x95, 0xd6, 0xca, 0x26, 0xcd, 0x3a, 0x4d, 0x02, 0x59, 0x92, 0x1d, 0x15, 0x8e,
-	0xe5, 0xa5, 0xe4, 0x64, 0x6b, 0x04, 0xcb, 0x65, 0xc4, 0xb1, 0xcc, 0x0d, 0x45, 0x32, 0x1c, 0xd2,
-	0x89, 0x53, 0xa4, 0x87, 0x45, 0x50, 0x60, 0xd1, 0xde, 0xf6, 0xb0, 0x05, 0x8a, 0x5e, 0x7a, 0x69,
-	0xb7, 0x40, 0xff, 0x84, 0xde, 0x7a, 0xea, 0xb5, 0xb7, 0x3d, 0xb4, 0x40, 0xdb, 0x4b, 0x6f, 0x05,
-	0x7a, 0xe9, 0xa1, 0x87, 0x62, 0x86, 0x43, 0x89, 0x92, 0x68, 0x8b, 0x92, 0x0b, 0xf4, 0x64, 0xcd,
-	0xbc, 0x1f, 0x33, 0xef, 0xc7, 0xe7, 0xcd, 0x7b, 0x84, 0xe1, 0x76, 0xd3, 0xb2, 0x9a, 0x06, 0xce,
-	0x35, 0x0c, 0xcb, 0xd3, 0x72, 0x4f, 0xf5, 0xe6, 0x73, 0x0f, 0x3b, 0x27, 0x39, 0x4d, 0x75, 0x55,
-	0xd7, 0x51, 0x4d, 0x72, 0x88, 0x9d, 0xdc, 0xf1, 0x7a, 0xd7, 0x3a, 0x6b, 0x3b, 0x96, 0x6b, 0xa1,
-	0xab, 0xbe, 0x64, 0x96, 0x49, 0x66, 0x03, 0xc9, 0x6c, 0x17, 0xe7, 0xf1, 0x7a, 0xe6, 0x0a, 0x3f,
-	0x40, 0xb5, 0xf5, 0x9c, 0x6a, 0x9a, 0x96, 0xab, 0xba, 0xba, 0x65, 0x12, 0x5f, 0x49, 0xe6, 0xfd,
-	0x78, 0xc7, 0x77, 0x1f, 0x9d, 0x79, 0x9b, 0x4b, 0xb1, 0xd5, 0x53, 0xef, 0x30, 0xa7, 0x79, 0x0e,
-	0x53, 0xcb, 0xe9, 0xcb, 0xbd, 0x74, 0xdc, 0xb2, 0xdd, 0x13, 0x4e, 0x5c, 0xe9, 0x25, 0x1e, 0xea,
-	0xd8, 0xd0, 0x94, 0x96, 0x4a, 0x9e, 0x71, 0x8e, 0xff, 0xef, 0xe5, 0x70, 0xf5, 0x16, 0x26, 0xae,
-	0xda, 0xb2, 0x4f, 0x3b, 0xff, 0x85, 0xa3, 0xda, 0x36, 0x76, 0xb8, 0x55, 0xd2, 0xaf, 0x27, 0xe1,
-	0x42, 0x49, 0x75, 0xd5, 0x9a, 0xe5, 0x39, 0x0d, 0xbc, 0xa7, 0x3a, 0x6a, 0x0b, 0xbb, 0xd8, 0x41,
-	0x97, 0x61, 0xda, 0xa6, 0x0b, 0x45, 0xd7, 0x44, 0x61, 0x45, 0x58, 0x9d, 0x91, 0xa7, 0xd8, 0xba,
-	0xa2, 0xa1, 0x77, 0x60, 0x56, 0xd3, 0x89, 0x6d, 0xa8, 0x27, 0x8a, 0xa9, 0xb6, 0xb0, 0x98, 0x60,
-	0xe4, 0x24, 0xdf, 0xdb, 0x55, 0x5b, 0x18, 0xad, 0x40, 0x52, 0xc3, 0xa4, 0xe1, 0xe8, 0x36, 0x35,
-	0x55, 0x1c, 0xe3, 0x1c, 0x9d, 0x2d, 0x54, 0x83, 0x71, 0xf7, 0xc4, 0xc6, 0xe2, 0xf8, 0x8a, 0xb0,
-	0x3a, 0x9f, 0xbf, 0x9f, 0x8d, 0x15, 0xa1, 0x6c, 0xc4, 0x4d, 0xb3, 0xf5, 0x13, 0x1b, 0xcb, 0x4c,
-	0x19, 0xca, 0xc0, 0xb4, 0x83, 0x9f, 0x7b, 0xba, 0x83, 0x35, 0x71, 0x62, 0x45, 0x58, 0x9d, 0x96,
-	0xdb, 0x6b, 0x9f, 0x66, 0x63, 0xd5, 0xc5, 0x9a, 0x38, 0x19, 0xd0, 0xfc, 0x35, 0xba, 0x0e, 0xe9,
-	0x63, 0xd5, 0xd0, 0x35, 0x16, 0x18, 0xc5, 0xc1, 0x4d, 0xfc, 0x52, 0x9c, 0x62, 0x77, 0x4e, 0x75,
-	0xf6, 0x65, 0xba, 0x8d, 0xae, 0xc2, 0xbc, 0x6a, 0x18, 0xd6, 0x0b, 0xac, 0x29, 0xc7, 0xaa, 0xe1,
-	0x61, 0x22, 0x4e, 0xaf, 0x8c, 0xad, 0xce, 0xc8, 0x73, 0x7c, 0xf7, 0x11, 0xdb, 0x44, 0x1f, 0xc0,
-	0x4c, 0x4b, 0x37, 0x7d, 0x16, 0x71, 0x66, 0x45, 0x58, 0x4d, 0xe6, 0xaf, 0x04, 0x36, 0x06, 0xa1,
-	0xc8, 0x96, 0x2c, 0xef, 0xa9, 0x81, 0x99, 0x84, 0x3c, 0xdd, 0xd2, 0x4d, 0xf6, 0x8b, 0x89, 0xaa,
-	0x2f, 0xb9, 0x28, 0xc4, 0x12, 0x55, 0x5f, 0xfa, 0xa2, 0x32, 0x4c, 0xb2, 0x0c, 0x21, 0x62, 0x72,
-	0x65, 0x6c, 0x35, 0x99, 0xdf, 0x18, 0xdd, 0xad, 0x32, 0xd7, 0x84, 0x6e, 0xc2, 0x52, 0xc8, 0x37,
-	0xe1, 0xa8, 0xce, 0x32, 0x0f, 0x5d, 0xec, 0x50, 0x4b, 0xa1, 0xf8, 0x66, 0xe1, 0x42, 0x48, 0xec,
-	0x08, 0x1b, 0xb6, 0xe2, 0x39, 0x86, 0x38, 0xc7, 0x64, 0x16, 0x3a, 0xa4, 0x07, 0xd8, 0xb0, 0xf7,
-	0x1d, 0x03, 0x5d, 0x81, 0x19, 0xbd, 0xd5, 0xf2, 0x5c, 0xf5, 0xa9, 0x81, 0xc5, 0x79, 0x16, 0x9f,
-	0xce, 0x06, 0x12, 0x61, 0xca, 0xc1, 0x0d, 0xcf, 0x21, 0x58, 0x4c, 0x31, 0x5a, 0xb0, 0x94, 0x74,
-	0x18, 0xa7, 0x09, 0x80, 0x16, 0x21, 0x5d, 0xff, 0xc1, 0x5e, 0x59, 0xd9, 0xdf, 0xad, 0xed, 0x95,
-	0x8b, 0x95, 0xad, 0x4a, 0xb9, 0x94, 0xfe, 0x3f, 0x04, 0x30, 0x59, 0xab, 0xcb, 0x95, 0xdd, 0xed,
-	0xb4, 0x80, 0x92, 0x30, 0x55, 0xd9, 0xad, 0x97, 0xb7, 0xcb, 0x72, 0x3a, 0x41, 0x09, 0xa5, 0xea,
-	0xfe, 0xe6, 0x4e, 0x39, 0x3d, 0x46, 0x09, 0x9b, 0xd5, 0xea, 0x4e, 0xb9, 0xb0, 0x9b, 0x1e, 0xa7,
-	0x04, 0xb9, 0x5c, 0xac, 0xca, 0xa5, 0xf4, 0x04, 0x9a, 0x83, 0x99, 0xbd, 0x9d, 0xfd, 0x9a, 0xb2,
-	0x57, 0xd8, 0x2e, 0xa7, 0x27, 0xa5, 0x7f, 0xcf, 0x00, 0x74, 0x3c, 0x85, 0x10, 0x8c, 0xb3, 0xf4,
-	0xf7, 0xd1, 0xc1, 0x7e, 0xa3, 0x6f, 0xc2, 0x3c, 0xf5, 0xad, 0x42, 0x18, 0x0b, 0xc5, 0x8e, 0x0f,
-	0x8e, 0x59, 0xad, 0x2d, 0x17, 0x01, 0xa0, 0xb1, 0x81, 0x00, 0x1a, 0xef, 0x07, 0xd0, 0x32, 0xcc,
-	0x34, 0x0c, 0x1d, 0x9b, 0x2e, 0x3d, 0x65, 0x82, 0xd1, 0xa7, 0xfd, 0x8d, 0x8a, 0x86, 0x96, 0x60,
-	0x92, 0x34, 0x2c, 0x1b, 0x13, 0x71, 0x92, 0x65, 0x27, 0x5f, 0xa1, 0x8f, 0x60, 0x2e, 0x88, 0xbb,
-	0xc2, 0xe0, 0x37, 0xc5, 0xe0, 0x77, 0x23, 0x66, 0x9e, 0xd4, 0xf9, 0x6f, 0x06, 0xb9, 0x59, 0x37,
-	0xb4, 0x42, 0xf7, 0x60, 0x99, 0x78, 0xb6, 0x6d, 0x39, 0x2e, 0x51, 0x5a, 0x9e, 0xe1, 0xea, 0xb6,
-	0x81, 0x95, 0x80, 0x83, 0x82, 0x84, 0x46, 0xed, 0x72, 0xc0, 0xf2, 0x90, 0x73, 0x04, 0x0a, 0x09,
-	0xba, 0x05, 0x97, 0x3c, 0x5b, 0x53, 0x5d, 0xac, 0x68, 0x58, 0xd5, 0x0c, 0xdd, 0xc4, 0x0a, 0xc1,
-	0x0d, 0xcb, 0xd4, 0x08, 0x83, 0xcf, 0x84, 0x7c, 0xd1, 0x27, 0x97, 0x38, 0xb5, 0xe6, 0x13, 0x29,
-	0x74, 0x35, 0x7c, 0xa8, 0x7a, 0x86, 0xab, 0x90, 0xc6, 0x11, 0xd6, 0x3c, 0xc3, 0x07, 0xcd, 0x8c,
-	0x9c, 0xe2, 0xfb, 0x35, 0xbe, 0x8d, 0x6e, 0x83, 0xd8, 0xbe, 0x62, 0xc3, 0x23, 0xae, 0xd5, 0xea,
-	0x88, 0x24, 0xd9, 0xfd, 0x96, 0x02, 0x7a, 0x91, 0x91, 0xdb, 0x92, 0x07, 0x00, 0x76, 0x00, 0x0c,
-	0x22, 0xce, 0x9e, 0x1b, 0x5b, 0x21, 0x6d, 0xb4, 0xd0, 0xf6, 0xa0, 0x63, 0xea, 0x88, 0x63, 0xc2,
-	0x01, 0xa4, 0x7a, 0xee, 0x91, 0xe5, 0xe8, 0xaf, 0x7c, 0x18, 0xb1, 0x90, 0xcd, 0xb3, 0x90, 0x15,
-	0x87, 0x3e, 0x3e, 0x5b, 0x08, 0xeb, 0x62, 0x21, 0x5c, 0x50, 0x7b, 0xb7, 0x50, 0x0b, 0x16, 0x58,
-	0x06, 0x3b, 0xf8, 0xd0, 0xc1, 0xe4, 0xc8, 0x3f, 0x32, 0xc5, 0x8e, 0x2c, 0x0c, 0x7f, 0x24, 0xfd,
-	0x29, 0xfb, 0x9a, 0xd8, 0x81, 0x29, 0xad, 0x7b, 0x03, 0x6d, 0xc1, 0x4a, 0x10, 0xbe, 0xae, 0x63,
-	0x5f, 0xe8, 0xa6, 0x66, 0xbd, 0x50, 0x34, 0xf5, 0x84, 0x88, 0x69, 0x16, 0xff, 0x2b, 0x9c, 0x2f,
-	0xa4, 0xf2, 0x31, 0x63, 0x2a, 0xa9, 0x27, 0x04, 0xbd, 0x07, 0x8b, 0x2d, 0xd5, 0xf4, 0x54, 0x43,
-	0x71, 0x3c, 0x93, 0x28, 0x9a, 0x4e, 0x68, 0xdd, 0xd0, 0xc4, 0x05, 0x16, 0x57, 0xe4, 0xd3, 0x64,
-	0xcf, 0x24, 0x25, 0x4e, 0x41, 0xfb, 0x70, 0xb9, 0xa5, 0x9b, 0x7a, 0xcb, 0xeb, 0x64, 0x81, 0xa2,
-	0x9b, 0x2e, 0x76, 0x8e, 0x55, 0x43, 0x44, 0xac, 0xec, 0x5e, 0xee, 0x2f, 0xbb, 0xfc, 0xf1, 0x96,
-	0x2f, 0x71, 0xd9, 0x20, 0x45, 0x2a, 0x5c, 0x52, 0x22, 0xb0, 0xd0, 0xe7, 0x67, 0x24, 0xc1, 0xdb,
-	0x85, 0xfd, 0xfa, 0x83, 0xaa, 0x5c, 0x39, 0x28, 0xd4, 0x2b, 0xd5, 0x5d, 0x25, 0xa2, 0x54, 0x2d,
-	0x01, 0xea, 0xe6, 0x29, 0x56, 0x4b, 0xe5, 0xb4, 0x40, 0x65, 0xb7, 0xab, 0xd5, 0xed, 0x9d, 0xb2,
-	0xc2, 0x6a, 0x51, 0x04, 0x4f, 0x42, 0x6a, 0x40, 0xaa, 0xc7, 0xd3, 0xe8, 0x1d, 0x78, 0xab, 0x54,
-	0xa8, 0x17, 0x14, 0xb9, 0xbc, 0x25, 0x97, 0x6b, 0x0f, 0xa2, 0x4e, 0x44, 0x30, 0x5f, 0xdb, 0xa9,
-	0x94, 0x2a, 0xbb, 0xdb, 0xca, 0xe3, 0xca, 0x6e, 0xa9, 0xfa, 0x38, 0x2d, 0xa0, 0xcb, 0x70, 0xb1,
-	0xb8, 0x5f, 0xab, 0x57, 0x1f, 0x2a, 0x3d, 0xa4, 0x84, 0xb4, 0x06, 0x8b, 0xdb, 0xd8, 0xed, 0x04,
-	0x57, 0xc6, 0xcf, 0x3d, 0x4c, 0xdc, 0xa8, 0x3a, 0x28, 0x19, 0xb0, 0xb4, 0xa3, 0x93, 0x10, 0x33,
-	0x09, 0xb8, 0x97, 0x60, 0xd2, 0x56, 0x1d, 0x6c, 0xba, 0x9c, 0x9f, 0xaf, 0xd0, 0x5b, 0x14, 0x62,
-	0x4d, 0xac, 0xb8, 0xd6, 0x33, 0x1c, 0x34, 0x0c, 0x33, 0x74, 0xa7, 0x4e, 0x37, 0x68, 0xb5, 0x63,
-	0x64, 0xa2, 0xbf, 0xf2, 0x7b, 0x86, 0x09, 0x79, 0x9a, 0x6e, 0xd4, 0xf4, 0x57, 0x58, 0xfa, 0x52,
-	0x80, 0x4b, 0x7d, 0xc7, 0x11, 0xdb, 0x32, 0x09, 0x46, 0x75, 0x98, 0x0d, 0x55, 0x64, 0x22, 0x0a,
-	0x0c, 0xbc, 0xeb, 0x43, 0xa7, 0xb2, 0x9c, 0xec, 0x94, 0x70, 0x82, 0xae, 0x41, 0xca, 0xc4, 0x2f,
-	0x5d, 0x25, 0x74, 0x65, 0xbf, 0xd0, 0xcf, 0xd1, 0xed, 0xbd, 0xe0, 0xda, 0xd2, 0xef, 0x05, 0x58,
-	0x2e, 0x3a, 0xb4, 0xc9, 0x08, 0x2a, 0x5d, 0xd1, 0x32, 0x0f, 0xf5, 0xe6, 0x20, 0x6f, 0x7c, 0x0c,
-	0xa9, 0x76, 0x9d, 0x6e, 0x30, 0x09, 0xa6, 0x3f, 0x99, 0xbf, 0x39, 0x64, 0xa5, 0xe6, 0xc7, 0xcd,
-	0xbb, 0x5d, 0x6b, 0xf4, 0x9d, 0xde, 0xca, 0xd2, 0xb0, 0xb4, 0xe0, 0x1d, 0xea, 0x2e, 0x0a, 0x45,
-	0x4b, 0xc3, 0xd2, 0xdf, 0x05, 0x58, 0xde, 0x67, 0xe5, 0x37, 0xda, 0x8c, 0x88, 0xeb, 0x0a, 0xff,
-	0xbb, 0xeb, 0xa2, 0x3b, 0x90, 0xe4, 0x6f, 0x09, 0xed, 0x94, 0x59, 0xba, 0x24, 0xf3, 0x99, 0x3e,
-	0x30, 0x6f, 0xd1, 0x06, 0xe7, 0xa1, 0x4a, 0x9e, 0xc9, 0xe0, 0xb3, 0xd3, 0xdf, 0x52, 0x16, 0xc4,
-	0x6d, 0xec, 0x46, 0xdb, 0x19, 0x95, 0xea, 0xeb, 0xb0, 0x5c, 0xc2, 0x06, 0x3e, 0xcd, 0x35, 0x51,
-	0x22, 0xdf, 0x82, 0x8b, 0xa1, 0x23, 0x64, 0xcf, 0x3c, 0x8b, 0x39, 0x0b, 0x62, 0xb7, 0xfe, 0x01,
-	0xfc, 0x3f, 0x13, 0x20, 0x43, 0xc1, 0xd0, 0x7d, 0x9d, 0x81, 0xf8, 0xbb, 0x06, 0xa9, 0xee, 0xce,
-	0x85, 0x88, 0x09, 0xbf, 0xb1, 0x0d, 0xb7, 0x2e, 0xe4, 0x5c, 0x38, 0xfd, 0x95, 0x00, 0xcb, 0x91,
-	0x57, 0xe3, 0x58, 0xfd, 0x04, 0xd2, 0x3d, 0x69, 0x14, 0xe0, 0x75, 0xc4, 0x3c, 0x4a, 0x75, 0xe7,
-	0x51, 0x7c, 0xdc, 0xfe, 0x29, 0xe1, 0x57, 0x94, 0x90, 0xcf, 0x07, 0x7a, 0x70, 0x07, 0x26, 0x89,
-	0xab, 0xba, 0xd8, 0x77, 0xdc, 0x7c, 0xfe, 0xfd, 0x21, 0xef, 0x5c, 0xa3, 0xc2, 0x32, 0xd7, 0x71,
-	0x1e, 0x3f, 0xa3, 0x4f, 0x21, 0xe9, 0x78, 0xa6, 0xa2, 0xba, 0x2e, 0x1d, 0x26, 0x59, 0x73, 0x38,
-	0x9f, 0xaf, 0xc4, 0xbc, 0xce, 0x29, 0x66, 0x67, 0x65, 0xcf, 0x2c, 0xf8, 0x0a, 0x65, 0x70, 0xda,
-	0xbf, 0xa5, 0x9b, 0x00, 0x1d, 0x0a, 0x5a, 0x86, 0x4b, 0xf2, 0xfe, 0xae, 0x52, 0xa8, 0xd7, 0xcb,
-	0x0f, 0xf7, 0xea, 0xfd, 0xcd, 0xf8, 0x4e, 0xa1, 0x5e, 0xae, 0xd5, 0xd3, 0x82, 0xf4, 0x73, 0x01,
-	0xc4, 0xfe, 0x93, 0x78, 0x1e, 0x3c, 0x0e, 0x75, 0xa9, 0xf4, 0x39, 0xe7, 0x49, 0x90, 0x1f, 0xd2,
-	0xa1, 0x14, 0x28, 0xed, 0x26, 0x95, 0x1e, 0x10, 0x3b, 0xfc, 0x5f, 0x0b, 0xdd, 0xe1, 0xdf, 0xb1,
-	0x9a, 0x43, 0x3e, 0x60, 0xe3, 0x67, 0x06, 0x6c, 0xa2, 0x27, 0x60, 0xcf, 0x60, 0xae, 0x85, 0x09,
-	0x61, 0xe2, 0x27, 0x41, 0xd7, 0x3e, 0x9f, 0xdf, 0x1a, 0xd2, 0xe0, 0x87, 0xbe, 0x8e, 0x2c, 0xff,
-	0x5b, 0xc3, 0xc7, 0xd8, 0xd1, 0xdd, 0x13, 0x79, 0x96, 0x2b, 0xa7, 0x8d, 0x01, 0xa1, 0x28, 0x14,
-	0xfb, 0x8d, 0xe3, 0xae, 0x6f, 0xc0, 0x42, 0xdb, 0xf5, 0x5c, 0x2a, 0x70, 0xff, 0xad, 0xd1, 0x6e,
-	0x23, 0xb7, 0x31, 0xcd, 0x37, 0xe2, 0x87, 0xe1, 0xdb, 0xb0, 0x54, 0x3c, 0xc2, 0x8d, 0x67, 0x8f,
-	0xe8, 0xb4, 0x58, 0x74, 0xb0, 0x46, 0xce, 0x2a, 0x7c, 0x05, 0xb8, 0xd4, 0xc7, 0xcd, 0xad, 0xba,
-	0x06, 0xa9, 0x23, 0x95, 0x28, 0x6c, 0xea, 0x54, 0x1a, 0x94, 0xc4, 0x24, 0xa7, 0xe5, 0xb9, 0x23,
-	0x95, 0x74, 0xf8, 0x59, 0x81, 0x0a, 0x3a, 0xba, 0x61, 0xa0, 0xff, 0x01, 0x00, 0x71, 0x55, 0xc7,
-	0x55, 0x5c, 0x9d, 0x7f, 0x0f, 0x89, 0x7a, 0x6f, 0xea, 0xc1, 0xa7, 0x19, 0x79, 0x86, 0x71, 0xd3,
-	0x35, 0xba, 0x09, 0xd3, 0xd8, 0xd4, 0x7c, 0xc1, 0xb1, 0x81, 0x82, 0x53, 0xd8, 0xd4, 0xe8, 0x4a,
-	0x3a, 0x84, 0x2b, 0xd1, 0x17, 0xe5, 0x16, 0x6f, 0xc1, 0xf8, 0x39, 0x91, 0xc3, 0xe4, 0xf3, 0x3f,
-	0x5e, 0xf6, 0x3f, 0x0f, 0xb5, 0x8b, 0x14, 0x76, 0x8e, 0xf5, 0x06, 0x46, 0x7f, 0x16, 0x60, 0xae,
-	0xab, 0x1b, 0x44, 0x77, 0x62, 0x9e, 0x11, 0xd5, 0x43, 0x66, 0x86, 0xef, 0xc7, 0xa4, 0x8f, 0x3f,
-	0xfb, 0xe3, 0xdf, 0xbe, 0x48, 0x7c, 0x84, 0x72, 0xb9, 0xe3, 0xf5, 0xdc, 0x0f, 0x69, 0x06, 0xdc,
-	0xb5, 0x1d, 0xeb, 0x53, 0xdc, 0x70, 0x49, 0x6e, 0x2d, 0x67, 0x58, 0x0d, 0xff, 0xe3, 0x5d, 0x6e,
-	0x2d, 0x17, 0x6a, 0xdc, 0x72, 0x6b, 0xaf, 0x0f, 0xae, 0xa2, 0x6f, 0x44, 0x8a, 0x74, 0xb3, 0xa1,
-	0x7f, 0x08, 0x90, 0xea, 0x69, 0x2a, 0xd1, 0xdd, 0x21, 0x6a, 0x68, 0x7f, 0xef, 0x9b, 0xb9, 0x37,
-	0xaa, 0xb8, 0x1f, 0xd4, 0x1e, 0x93, 0xfd, 0xdc, 0x3b, 0xc5, 0xe8, 0xd7, 0x61, 0x73, 0xda, 0x26,
-	0xf7, 0x89, 0x74, 0xb1, 0xa1, 0x5f, 0x24, 0x60, 0x31, 0xaa, 0x5b, 0x45, 0x9b, 0x31, 0x2f, 0x7e,
-	0x46, 0xab, 0x9b, 0x19, 0xed, 0x09, 0x97, 0x3e, 0x17, 0x98, 0xd1, 0x9f, 0x09, 0xd2, 0x8d, 0x38,
-	0x56, 0xf7, 0x3c, 0xf8, 0x1b, 0xbd, 0x7d, 0xe9, 0xc1, 0x86, 0xf4, 0xee, 0x69, 0xae, 0x18, 0x24,
-	0x8b, 0x7e, 0x97, 0x80, 0xc5, 0xa8, 0x36, 0x38, 0xb6, 0x7f, 0xce, 0xe8, 0xa1, 0x47, 0xf5, 0xcf,
-	0x57, 0xbe, 0x7f, 0x7e, 0x29, 0xe4, 0x8b, 0xcc, 0xae, 0x9e, 0x3b, 0x67, 0xcf, 0x02, 0x46, 0x8f,
-	0xc1, 0xb9, 0xb5, 0xd7, 0xfd, 0xfe, 0xfa, 0x7e, 0xfe, 0xbb, 0xb1, 0xf4, 0xc6, 0xd0, 0x85, 0xbe,
-	0x16, 0x60, 0x31, 0xaa, 0x57, 0x8e, 0xed, 0xbf, 0x33, 0x1a, 0xed, 0xcc, 0x52, 0x5f, 0xd9, 0x2c,
-	0xb7, 0x6c, 0xf7, 0x44, 0x3a, 0x64, 0xfe, 0xf9, 0x64, 0xed, 0xc6, 0xc0, 0x3a, 0xd1, 0x6f, 0xc2,
-	0xc1, 0xf5, 0xb5, 0x77, 0x23, 0xc5, 0xfa, 0x59, 0xd1, 0x3f, 0x05, 0x58, 0xe8, 0x1b, 0x1c, 0xd0,
-	0xfd, 0xf8, 0x55, 0xf1, 0xbf, 0x9a, 0x16, 0xdc, 0x6a, 0x34, 0x9a, 0xd5, 0x28, 0xb6, 0xd5, 0x6f,
-	0x12, 0x70, 0x21, 0xa2, 0xa5, 0x47, 0x85, 0x11, 0xba, 0xcd, 0xee, 0x49, 0x25, 0xb3, 0x79, 0x1e,
-	0x15, 0xbc, 0x62, 0x76, 0xbb, 0x61, 0xb8, 0xda, 0xd1, 0x76, 0xc3, 0xe0, 0x52, 0x81, 0x7e, 0x9b,
-	0x80, 0xc5, 0xa8, 0xf7, 0x38, 0x76, 0x66, 0x9f, 0xd1, 0x75, 0x64, 0x8a, 0xe7, 0xd2, 0xc1, 0x3d,
-	0xf1, 0x13, 0xbf, 0x4e, 0xbc, 0x11, 0xa4, 0xcd, 0xc1, 0xbe, 0x88, 0x42, 0x73, 0xf0, 0x91, 0x8c,
-	0x6a, 0xdd, 0x10, 0xd6, 0x0e, 0xee, 0x48, 0xb7, 0x4e, 0x51, 0x34, 0x58, 0x18, 0xfd, 0x4b, 0x80,
-	0xf9, 0xee, 0x11, 0x18, 0x7d, 0x6f, 0x78, 0xa4, 0x74, 0x26, 0xe1, 0xcc, 0x08, 0x1d, 0x8e, 0xe4,
-	0x32, 0x8f, 0x98, 0x68, 0x63, 0x78, 0x8c, 0xe4, 0x68, 0x73, 0x44, 0xa1, 0xf2, 0x1e, 0xca, 0xc6,
-	0x83, 0x4a, 0x20, 0x81, 0xfe, 0x22, 0xc0, 0x42, 0xdf, 0x40, 0x1f, 0xbb, 0x4e, 0x9c, 0xf6, 0x29,
-	0xe0, 0xd4, 0xf2, 0xc7, 0x8d, 0x5c, 0x3b, 0x97, 0x91, 0x6b, 0xc3, 0x1a, 0xf9, 0x79, 0x02, 0xd2,
-	0xbd, 0xe3, 0x1d, 0xba, 0x77, 0xbe, 0x09, 0x34, 0x73, 0x7f, 0x64, 0x79, 0x8e, 0x81, 0xee, 0x80,
-	0x0f, 0x8b, 0x00, 0x66, 0x5c, 0x3b, 0xe0, 0x71, 0xd2, 0x9e, 0x49, 0xa0, 0xaf, 0x7a, 0x7c, 0x41,
-	0xe7, 0xad, 0x91, 0x7c, 0x11, 0x9a, 0x42, 0x47, 0xf2, 0x45, 0x78, 0xd0, 0x93, 0xbe, 0xf0, 0xeb,
-	0xc1, 0x4f, 0x05, 0x54, 0x19, 0xc5, 0x1b, 0x41, 0xa4, 0xdb, 0x14, 0xaa, 0xfc, 0xe0, 0x3e, 0xba,
-	0x1b, 0xd7, 0x39, 0x91, 0x0a, 0xd0, 0x97, 0x09, 0x48, 0xf5, 0x0c, 0x71, 0xb1, 0x9b, 0xee, 0xe8,
-	0x51, 0x31, 0x76, 0xd3, 0x7d, 0xca, 0xec, 0x28, 0xbd, 0xf1, 0x1d, 0xf5, 0x23, 0xe9, 0xfe, 0x90,
-	0x83, 0xc6, 0x46, 0xa3, 0x5b, 0x23, 0x2d, 0x9a, 0xb7, 0xa5, 0x1b, 0x31, 0x66, 0x8f, 0x08, 0xc9,
-	0xcd, 0xbf, 0x0a, 0x70, 0xbd, 0x61, 0xb5, 0xe2, 0x19, 0xb3, 0xb9, 0x10, 0x9e, 0xd9, 0xf6, 0x68,
-	0x45, 0xd8, 0x13, 0x0e, 0x3e, 0xe4, 0xb2, 0x4d, 0xcb, 0x50, 0xcd, 0x66, 0xd6, 0x72, 0x9a, 0xb9,
-	0x26, 0x36, 0x59, 0xbd, 0xc8, 0xf9, 0x24, 0xd5, 0xd6, 0xc9, 0x80, 0xff, 0x6f, 0xb8, 0x13, 0x5e,
-	0xff, 0x26, 0x71, 0x75, 0xdb, 0xd7, 0x59, 0x64, 0xf7, 0xd9, 0xd4, 0x9b, 0x1f, 0xb2, 0xfb, 0x84,
-	0x8f, 0xcf, 0x3e, 0x5a, 0xff, 0x43, 0xc0, 0xf7, 0x84, 0xf1, 0x3d, 0x09, 0xf8, 0x9e, 0x84, 0xf9,
-	0x9e, 0x3c, 0x5a, 0x7f, 0x3a, 0xc9, 0x6e, 0x73, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x48,
-	0xcd, 0xb8, 0x10, 0xeb, 0x21, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go b/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
index 0aa964dcc0..2dd231b924 100644
--- a/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
+++ b/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/datatransfer/v1/transfer.proto
 
-package datatransfer // import "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
+package datatransfer
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // DEPRECATED. Represents data transfer type.
 type TransferType int32
@@ -40,6 +43,7 @@ var TransferType_name = map[int32]string{
 	1: "BATCH",
 	2: "STREAMING",
 }
+
 var TransferType_value = map[string]int32{
 	"TRANSFER_TYPE_UNSPECIFIED": 0,
 	"BATCH":                     1,
@@ -49,8 +53,9 @@ var TransferType_value = map[string]int32{
 func (x TransferType) String() string {
 	return proto.EnumName(TransferType_name, int32(x))
 }
+
 func (TransferType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_f4aaf0447c06b362, []int{0}
+	return fileDescriptor_90c2574420b818ad, []int{0}
 }
 
 // Represents data transfer run state.
@@ -80,6 +85,7 @@ var TransferState_name = map[int32]string{
 	5: "FAILED",
 	6: "CANCELLED",
 }
+
 var TransferState_value = map[string]int32{
 	"TRANSFER_STATE_UNSPECIFIED": 0,
 	"PENDING":                    2,
@@ -92,8 +98,9 @@ var TransferState_value = map[string]int32{
 func (x TransferState) String() string {
 	return proto.EnumName(TransferState_name, int32(x))
 }
+
 func (TransferState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_f4aaf0447c06b362, []int{1}
+	return fileDescriptor_90c2574420b818ad, []int{1}
 }
 
 // Represents data transfer user facing message severity.
@@ -116,6 +123,7 @@ var TransferMessage_MessageSeverity_name = map[int32]string{
 	2: "WARNING",
 	3: "ERROR",
 }
+
 var TransferMessage_MessageSeverity_value = map[string]int32{
 	"MESSAGE_SEVERITY_UNSPECIFIED": 0,
 	"INFO":                         1,
@@ -126,8 +134,9 @@ var TransferMessage_MessageSeverity_value = map[string]int32{
 func (x TransferMessage_MessageSeverity) String() string {
 	return proto.EnumName(TransferMessage_MessageSeverity_name, int32(x))
 }
+
 func (TransferMessage_MessageSeverity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_f4aaf0447c06b362, []int{2, 0}
+	return fileDescriptor_90c2574420b818ad, []int{2, 0}
 }
 
 // Represents a data transfer configuration. A transfer configuration
@@ -198,16 +207,17 @@ func (m *TransferConfig) Reset()         { *m = TransferConfig{} }
 func (m *TransferConfig) String() string { return proto.CompactTextString(m) }
 func (*TransferConfig) ProtoMessage()    {}
 func (*TransferConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_f4aaf0447c06b362, []int{0}
+	return fileDescriptor_90c2574420b818ad, []int{0}
 }
+
 func (m *TransferConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferConfig.Unmarshal(m, b)
 }
 func (m *TransferConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferConfig.Marshal(b, m, deterministic)
 }
-func (dst *TransferConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferConfig.Merge(dst, src)
+func (m *TransferConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferConfig.Merge(m, src)
 }
 func (m *TransferConfig) XXX_Size() int {
 	return xxx_messageInfo_TransferConfig.Size(m)
@@ -360,16 +370,17 @@ func (m *TransferRun) Reset()         { *m = TransferRun{} }
 func (m *TransferRun) String() string { return proto.CompactTextString(m) }
 func (*TransferRun) ProtoMessage()    {}
 func (*TransferRun) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_f4aaf0447c06b362, []int{1}
+	return fileDescriptor_90c2574420b818ad, []int{1}
 }
+
 func (m *TransferRun) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferRun.Unmarshal(m, b)
 }
 func (m *TransferRun) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferRun.Marshal(b, m, deterministic)
 }
-func (dst *TransferRun) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferRun.Merge(dst, src)
+func (m *TransferRun) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferRun.Merge(m, src)
 }
 func (m *TransferRun) XXX_Size() int {
 	return xxx_messageInfo_TransferRun.Size(m)
@@ -488,16 +499,17 @@ func (m *TransferMessage) Reset()         { *m = TransferMessage{} }
 func (m *TransferMessage) String() string { return proto.CompactTextString(m) }
 func (*TransferMessage) ProtoMessage()    {}
 func (*TransferMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_f4aaf0447c06b362, []int{2}
+	return fileDescriptor_90c2574420b818ad, []int{2}
 }
+
 func (m *TransferMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferMessage.Unmarshal(m, b)
 }
 func (m *TransferMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferMessage.Marshal(b, m, deterministic)
 }
-func (dst *TransferMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferMessage.Merge(dst, src)
+func (m *TransferMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferMessage.Merge(m, src)
 }
 func (m *TransferMessage) XXX_Size() int {
 	return xxx_messageInfo_TransferMessage.Size(m)
@@ -530,19 +542,19 @@ func (m *TransferMessage) GetMessageText() string {
 }
 
 func init() {
-	proto.RegisterType((*TransferConfig)(nil), "google.cloud.bigquery.datatransfer.v1.TransferConfig")
-	proto.RegisterType((*TransferRun)(nil), "google.cloud.bigquery.datatransfer.v1.TransferRun")
-	proto.RegisterType((*TransferMessage)(nil), "google.cloud.bigquery.datatransfer.v1.TransferMessage")
 	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.TransferType", TransferType_name, TransferType_value)
 	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.TransferState", TransferState_name, TransferState_value)
 	proto.RegisterEnum("google.cloud.bigquery.datatransfer.v1.TransferMessage_MessageSeverity", TransferMessage_MessageSeverity_name, TransferMessage_MessageSeverity_value)
+	proto.RegisterType((*TransferConfig)(nil), "google.cloud.bigquery.datatransfer.v1.TransferConfig")
+	proto.RegisterType((*TransferRun)(nil), "google.cloud.bigquery.datatransfer.v1.TransferRun")
+	proto.RegisterType((*TransferMessage)(nil), "google.cloud.bigquery.datatransfer.v1.TransferMessage")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/transfer.proto", fileDescriptor_transfer_f4aaf0447c06b362)
+	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/transfer.proto", fileDescriptor_90c2574420b818ad)
 }
 
-var fileDescriptor_transfer_f4aaf0447c06b362 = []byte{
+var fileDescriptor_90c2574420b818ad = []byte{
 	// 922 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0xc6, 0xf9, 0xcf, 0x71, 0x92, 0x8d, 0x46, 0x2c, 0x35, 0xd5, 0x02, 0xa1, 0xa2, 0x52, 0xd8,
diff --git a/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go b/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
index e0d4d60ccd..cec7795208 100644
--- a/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
+++ b/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/logging/v1/audit_data.proto
 
-package logging // import "google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1"
+package logging
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // BigQuery request and response messages for audit log.
 // Note: `Table.schema` has been deprecated in favor of `Table.schemaJson`.
@@ -63,16 +66,17 @@ func (m *AuditData) Reset()         { *m = AuditData{} }
 func (m *AuditData) String() string { return proto.CompactTextString(m) }
 func (*AuditData) ProtoMessage()    {}
 func (*AuditData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{0}
+	return fileDescriptor_3d113473d81b6d20, []int{0}
 }
+
 func (m *AuditData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuditData.Unmarshal(m, b)
 }
 func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
 }
-func (dst *AuditData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuditData.Merge(dst, src)
+func (m *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(m, src)
 }
 func (m *AuditData) XXX_Size() int {
 	return xxx_messageInfo_AuditData.Size(m)
@@ -333,9 +337,9 @@ func (m *AuditData) GetJobCompletedEvent() *JobCompletedEvent {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AuditData) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AuditData_OneofMarshaler, _AuditData_OneofUnmarshaler, _AuditData_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AuditData) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AuditData_TableInsertRequest)(nil),
 		(*AuditData_TableUpdateRequest)(nil),
 		(*AuditData_DatasetListRequest)(nil),
@@ -356,354 +360,6 @@ func (*AuditData) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) err
 	}
 }
 
-func _AuditData_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AuditData)
-	// request
-	switch x := m.Request.(type) {
-	case *AuditData_TableInsertRequest:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TableInsertRequest); err != nil {
-			return err
-		}
-	case *AuditData_TableUpdateRequest:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TableUpdateRequest); err != nil {
-			return err
-		}
-	case *AuditData_DatasetListRequest:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatasetListRequest); err != nil {
-			return err
-		}
-	case *AuditData_DatasetInsertRequest:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatasetInsertRequest); err != nil {
-			return err
-		}
-	case *AuditData_DatasetUpdateRequest:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatasetUpdateRequest); err != nil {
-			return err
-		}
-	case *AuditData_JobInsertRequest:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobInsertRequest); err != nil {
-			return err
-		}
-	case *AuditData_JobQueryRequest:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobQueryRequest); err != nil {
-			return err
-		}
-	case *AuditData_JobGetQueryResultsRequest:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobGetQueryResultsRequest); err != nil {
-			return err
-		}
-	case *AuditData_TableDataListRequest:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TableDataListRequest); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AuditData.Request has unexpected type %T", x)
-	}
-	// response
-	switch x := m.Response.(type) {
-	case *AuditData_TableInsertResponse:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TableInsertResponse); err != nil {
-			return err
-		}
-	case *AuditData_TableUpdateResponse:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TableUpdateResponse); err != nil {
-			return err
-		}
-	case *AuditData_DatasetInsertResponse:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatasetInsertResponse); err != nil {
-			return err
-		}
-	case *AuditData_DatasetUpdateResponse:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatasetUpdateResponse); err != nil {
-			return err
-		}
-	case *AuditData_JobInsertResponse:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobInsertResponse); err != nil {
-			return err
-		}
-	case *AuditData_JobQueryResponse:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobQueryResponse); err != nil {
-			return err
-		}
-	case *AuditData_JobGetQueryResultsResponse:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobGetQueryResultsResponse); err != nil {
-			return err
-		}
-	case *AuditData_JobQueryDoneResponse:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobQueryDoneResponse); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AuditData.Response has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AuditData_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AuditData)
-	switch tag {
-	case 1: // request.table_insert_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TableInsertRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_TableInsertRequest{msg}
-		return true, err
-	case 16: // request.table_update_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TableUpdateRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_TableUpdateRequest{msg}
-		return true, err
-	case 2: // request.dataset_list_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatasetListRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_DatasetListRequest{msg}
-		return true, err
-	case 3: // request.dataset_insert_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatasetInsertRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_DatasetInsertRequest{msg}
-		return true, err
-	case 4: // request.dataset_update_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatasetUpdateRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_DatasetUpdateRequest{msg}
-		return true, err
-	case 5: // request.job_insert_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobInsertRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_JobInsertRequest{msg}
-		return true, err
-	case 6: // request.job_query_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobQueryRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_JobQueryRequest{msg}
-		return true, err
-	case 7: // request.job_get_query_results_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobGetQueryResultsRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_JobGetQueryResultsRequest{msg}
-		return true, err
-	case 8: // request.table_data_list_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TableDataListRequest)
-		err := b.DecodeMessage(msg)
-		m.Request = &AuditData_TableDataListRequest{msg}
-		return true, err
-	case 9: // response.table_insert_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TableInsertResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_TableInsertResponse{msg}
-		return true, err
-	case 10: // response.table_update_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TableUpdateResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_TableUpdateResponse{msg}
-		return true, err
-	case 11: // response.dataset_insert_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatasetInsertResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_DatasetInsertResponse{msg}
-		return true, err
-	case 12: // response.dataset_update_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatasetUpdateResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_DatasetUpdateResponse{msg}
-		return true, err
-	case 18: // response.job_insert_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobInsertResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_JobInsertResponse{msg}
-		return true, err
-	case 13: // response.job_query_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobQueryResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_JobQueryResponse{msg}
-		return true, err
-	case 14: // response.job_get_query_results_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobGetQueryResultsResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_JobGetQueryResultsResponse{msg}
-		return true, err
-	case 15: // response.job_query_done_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobQueryDoneResponse)
-		err := b.DecodeMessage(msg)
-		m.Response = &AuditData_JobQueryDoneResponse{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AuditData_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AuditData)
-	// request
-	switch x := m.Request.(type) {
-	case *AuditData_TableInsertRequest:
-		s := proto.Size(x.TableInsertRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_TableUpdateRequest:
-		s := proto.Size(x.TableUpdateRequest)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_DatasetListRequest:
-		s := proto.Size(x.DatasetListRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_DatasetInsertRequest:
-		s := proto.Size(x.DatasetInsertRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_DatasetUpdateRequest:
-		s := proto.Size(x.DatasetUpdateRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_JobInsertRequest:
-		s := proto.Size(x.JobInsertRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_JobQueryRequest:
-		s := proto.Size(x.JobQueryRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_JobGetQueryResultsRequest:
-		s := proto.Size(x.JobGetQueryResultsRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_TableDataListRequest:
-		s := proto.Size(x.TableDataListRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// response
-	switch x := m.Response.(type) {
-	case *AuditData_TableInsertResponse:
-		s := proto.Size(x.TableInsertResponse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_TableUpdateResponse:
-		s := proto.Size(x.TableUpdateResponse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_DatasetInsertResponse:
-		s := proto.Size(x.DatasetInsertResponse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_DatasetUpdateResponse:
-		s := proto.Size(x.DatasetUpdateResponse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_JobInsertResponse:
-		s := proto.Size(x.JobInsertResponse)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_JobQueryResponse:
-		s := proto.Size(x.JobQueryResponse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_JobGetQueryResultsResponse:
-		s := proto.Size(x.JobGetQueryResultsResponse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AuditData_JobQueryDoneResponse:
-		s := proto.Size(x.JobQueryDoneResponse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Table insert request.
 type TableInsertRequest struct {
 	// The new table.
@@ -717,16 +373,17 @@ func (m *TableInsertRequest) Reset()         { *m = TableInsertRequest{} }
 func (m *TableInsertRequest) String() string { return proto.CompactTextString(m) }
 func (*TableInsertRequest) ProtoMessage()    {}
 func (*TableInsertRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{1}
+	return fileDescriptor_3d113473d81b6d20, []int{1}
 }
+
 func (m *TableInsertRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableInsertRequest.Unmarshal(m, b)
 }
 func (m *TableInsertRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableInsertRequest.Marshal(b, m, deterministic)
 }
-func (dst *TableInsertRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableInsertRequest.Merge(dst, src)
+func (m *TableInsertRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableInsertRequest.Merge(m, src)
 }
 func (m *TableInsertRequest) XXX_Size() int {
 	return xxx_messageInfo_TableInsertRequest.Size(m)
@@ -757,16 +414,17 @@ func (m *TableUpdateRequest) Reset()         { *m = TableUpdateRequest{} }
 func (m *TableUpdateRequest) String() string { return proto.CompactTextString(m) }
 func (*TableUpdateRequest) ProtoMessage()    {}
 func (*TableUpdateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{2}
+	return fileDescriptor_3d113473d81b6d20, []int{2}
 }
+
 func (m *TableUpdateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableUpdateRequest.Unmarshal(m, b)
 }
 func (m *TableUpdateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableUpdateRequest.Marshal(b, m, deterministic)
 }
-func (dst *TableUpdateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableUpdateRequest.Merge(dst, src)
+func (m *TableUpdateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableUpdateRequest.Merge(m, src)
 }
 func (m *TableUpdateRequest) XXX_Size() int {
 	return xxx_messageInfo_TableUpdateRequest.Size(m)
@@ -797,16 +455,17 @@ func (m *TableInsertResponse) Reset()         { *m = TableInsertResponse{} }
 func (m *TableInsertResponse) String() string { return proto.CompactTextString(m) }
 func (*TableInsertResponse) ProtoMessage()    {}
 func (*TableInsertResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{3}
+	return fileDescriptor_3d113473d81b6d20, []int{3}
 }
+
 func (m *TableInsertResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableInsertResponse.Unmarshal(m, b)
 }
 func (m *TableInsertResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableInsertResponse.Marshal(b, m, deterministic)
 }
-func (dst *TableInsertResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableInsertResponse.Merge(dst, src)
+func (m *TableInsertResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableInsertResponse.Merge(m, src)
 }
 func (m *TableInsertResponse) XXX_Size() int {
 	return xxx_messageInfo_TableInsertResponse.Size(m)
@@ -837,16 +496,17 @@ func (m *TableUpdateResponse) Reset()         { *m = TableUpdateResponse{} }
 func (m *TableUpdateResponse) String() string { return proto.CompactTextString(m) }
 func (*TableUpdateResponse) ProtoMessage()    {}
 func (*TableUpdateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{4}
+	return fileDescriptor_3d113473d81b6d20, []int{4}
 }
+
 func (m *TableUpdateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableUpdateResponse.Unmarshal(m, b)
 }
 func (m *TableUpdateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableUpdateResponse.Marshal(b, m, deterministic)
 }
-func (dst *TableUpdateResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableUpdateResponse.Merge(dst, src)
+func (m *TableUpdateResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableUpdateResponse.Merge(m, src)
 }
 func (m *TableUpdateResponse) XXX_Size() int {
 	return xxx_messageInfo_TableUpdateResponse.Size(m)
@@ -877,16 +537,17 @@ func (m *DatasetListRequest) Reset()         { *m = DatasetListRequest{} }
 func (m *DatasetListRequest) String() string { return proto.CompactTextString(m) }
 func (*DatasetListRequest) ProtoMessage()    {}
 func (*DatasetListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{5}
+	return fileDescriptor_3d113473d81b6d20, []int{5}
 }
+
 func (m *DatasetListRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatasetListRequest.Unmarshal(m, b)
 }
 func (m *DatasetListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatasetListRequest.Marshal(b, m, deterministic)
 }
-func (dst *DatasetListRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatasetListRequest.Merge(dst, src)
+func (m *DatasetListRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetListRequest.Merge(m, src)
 }
 func (m *DatasetListRequest) XXX_Size() int {
 	return xxx_messageInfo_DatasetListRequest.Size(m)
@@ -917,16 +578,17 @@ func (m *DatasetInsertRequest) Reset()         { *m = DatasetInsertRequest{} }
 func (m *DatasetInsertRequest) String() string { return proto.CompactTextString(m) }
 func (*DatasetInsertRequest) ProtoMessage()    {}
 func (*DatasetInsertRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{6}
+	return fileDescriptor_3d113473d81b6d20, []int{6}
 }
+
 func (m *DatasetInsertRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatasetInsertRequest.Unmarshal(m, b)
 }
 func (m *DatasetInsertRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatasetInsertRequest.Marshal(b, m, deterministic)
 }
-func (dst *DatasetInsertRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatasetInsertRequest.Merge(dst, src)
+func (m *DatasetInsertRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetInsertRequest.Merge(m, src)
 }
 func (m *DatasetInsertRequest) XXX_Size() int {
 	return xxx_messageInfo_DatasetInsertRequest.Size(m)
@@ -957,16 +619,17 @@ func (m *DatasetInsertResponse) Reset()         { *m = DatasetInsertResponse{} }
 func (m *DatasetInsertResponse) String() string { return proto.CompactTextString(m) }
 func (*DatasetInsertResponse) ProtoMessage()    {}
 func (*DatasetInsertResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{7}
+	return fileDescriptor_3d113473d81b6d20, []int{7}
 }
+
 func (m *DatasetInsertResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatasetInsertResponse.Unmarshal(m, b)
 }
 func (m *DatasetInsertResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatasetInsertResponse.Marshal(b, m, deterministic)
 }
-func (dst *DatasetInsertResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatasetInsertResponse.Merge(dst, src)
+func (m *DatasetInsertResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetInsertResponse.Merge(m, src)
 }
 func (m *DatasetInsertResponse) XXX_Size() int {
 	return xxx_messageInfo_DatasetInsertResponse.Size(m)
@@ -997,16 +660,17 @@ func (m *DatasetUpdateRequest) Reset()         { *m = DatasetUpdateRequest{} }
 func (m *DatasetUpdateRequest) String() string { return proto.CompactTextString(m) }
 func (*DatasetUpdateRequest) ProtoMessage()    {}
 func (*DatasetUpdateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{8}
+	return fileDescriptor_3d113473d81b6d20, []int{8}
 }
+
 func (m *DatasetUpdateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatasetUpdateRequest.Unmarshal(m, b)
 }
 func (m *DatasetUpdateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatasetUpdateRequest.Marshal(b, m, deterministic)
 }
-func (dst *DatasetUpdateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatasetUpdateRequest.Merge(dst, src)
+func (m *DatasetUpdateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetUpdateRequest.Merge(m, src)
 }
 func (m *DatasetUpdateRequest) XXX_Size() int {
 	return xxx_messageInfo_DatasetUpdateRequest.Size(m)
@@ -1037,16 +701,17 @@ func (m *DatasetUpdateResponse) Reset()         { *m = DatasetUpdateResponse{} }
 func (m *DatasetUpdateResponse) String() string { return proto.CompactTextString(m) }
 func (*DatasetUpdateResponse) ProtoMessage()    {}
 func (*DatasetUpdateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{9}
+	return fileDescriptor_3d113473d81b6d20, []int{9}
 }
+
 func (m *DatasetUpdateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatasetUpdateResponse.Unmarshal(m, b)
 }
 func (m *DatasetUpdateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatasetUpdateResponse.Marshal(b, m, deterministic)
 }
-func (dst *DatasetUpdateResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatasetUpdateResponse.Merge(dst, src)
+func (m *DatasetUpdateResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetUpdateResponse.Merge(m, src)
 }
 func (m *DatasetUpdateResponse) XXX_Size() int {
 	return xxx_messageInfo_DatasetUpdateResponse.Size(m)
@@ -1077,16 +742,17 @@ func (m *JobInsertRequest) Reset()         { *m = JobInsertRequest{} }
 func (m *JobInsertRequest) String() string { return proto.CompactTextString(m) }
 func (*JobInsertRequest) ProtoMessage()    {}
 func (*JobInsertRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{10}
+	return fileDescriptor_3d113473d81b6d20, []int{10}
 }
+
 func (m *JobInsertRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobInsertRequest.Unmarshal(m, b)
 }
 func (m *JobInsertRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobInsertRequest.Marshal(b, m, deterministic)
 }
-func (dst *JobInsertRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobInsertRequest.Merge(dst, src)
+func (m *JobInsertRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobInsertRequest.Merge(m, src)
 }
 func (m *JobInsertRequest) XXX_Size() int {
 	return xxx_messageInfo_JobInsertRequest.Size(m)
@@ -1117,16 +783,17 @@ func (m *JobInsertResponse) Reset()         { *m = JobInsertResponse{} }
 func (m *JobInsertResponse) String() string { return proto.CompactTextString(m) }
 func (*JobInsertResponse) ProtoMessage()    {}
 func (*JobInsertResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{11}
+	return fileDescriptor_3d113473d81b6d20, []int{11}
 }
+
 func (m *JobInsertResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobInsertResponse.Unmarshal(m, b)
 }
 func (m *JobInsertResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobInsertResponse.Marshal(b, m, deterministic)
 }
-func (dst *JobInsertResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobInsertResponse.Merge(dst, src)
+func (m *JobInsertResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobInsertResponse.Merge(m, src)
 }
 func (m *JobInsertResponse) XXX_Size() int {
 	return xxx_messageInfo_JobInsertResponse.Size(m)
@@ -1165,16 +832,17 @@ func (m *JobQueryRequest) Reset()         { *m = JobQueryRequest{} }
 func (m *JobQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*JobQueryRequest) ProtoMessage()    {}
 func (*JobQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{12}
+	return fileDescriptor_3d113473d81b6d20, []int{12}
 }
+
 func (m *JobQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobQueryRequest.Unmarshal(m, b)
 }
 func (m *JobQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *JobQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobQueryRequest.Merge(dst, src)
+func (m *JobQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobQueryRequest.Merge(m, src)
 }
 func (m *JobQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_JobQueryRequest.Size(m)
@@ -1235,16 +903,17 @@ func (m *JobQueryResponse) Reset()         { *m = JobQueryResponse{} }
 func (m *JobQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*JobQueryResponse) ProtoMessage()    {}
 func (*JobQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{13}
+	return fileDescriptor_3d113473d81b6d20, []int{13}
 }
+
 func (m *JobQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobQueryResponse.Unmarshal(m, b)
 }
 func (m *JobQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *JobQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobQueryResponse.Merge(dst, src)
+func (m *JobQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobQueryResponse.Merge(m, src)
 }
 func (m *JobQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_JobQueryResponse.Size(m)
@@ -1284,16 +953,17 @@ func (m *JobGetQueryResultsRequest) Reset()         { *m = JobGetQueryResultsReq
 func (m *JobGetQueryResultsRequest) String() string { return proto.CompactTextString(m) }
 func (*JobGetQueryResultsRequest) ProtoMessage()    {}
 func (*JobGetQueryResultsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{14}
+	return fileDescriptor_3d113473d81b6d20, []int{14}
 }
+
 func (m *JobGetQueryResultsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobGetQueryResultsRequest.Unmarshal(m, b)
 }
 func (m *JobGetQueryResultsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobGetQueryResultsRequest.Marshal(b, m, deterministic)
 }
-func (dst *JobGetQueryResultsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobGetQueryResultsRequest.Merge(dst, src)
+func (m *JobGetQueryResultsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobGetQueryResultsRequest.Merge(m, src)
 }
 func (m *JobGetQueryResultsRequest) XXX_Size() int {
 	return xxx_messageInfo_JobGetQueryResultsRequest.Size(m)
@@ -1335,16 +1005,17 @@ func (m *JobGetQueryResultsResponse) Reset()         { *m = JobGetQueryResultsRe
 func (m *JobGetQueryResultsResponse) String() string { return proto.CompactTextString(m) }
 func (*JobGetQueryResultsResponse) ProtoMessage()    {}
 func (*JobGetQueryResultsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{15}
+	return fileDescriptor_3d113473d81b6d20, []int{15}
 }
+
 func (m *JobGetQueryResultsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobGetQueryResultsResponse.Unmarshal(m, b)
 }
 func (m *JobGetQueryResultsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobGetQueryResultsResponse.Marshal(b, m, deterministic)
 }
-func (dst *JobGetQueryResultsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobGetQueryResultsResponse.Merge(dst, src)
+func (m *JobGetQueryResultsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobGetQueryResultsResponse.Merge(m, src)
 }
 func (m *JobGetQueryResultsResponse) XXX_Size() int {
 	return xxx_messageInfo_JobGetQueryResultsResponse.Size(m)
@@ -1383,16 +1054,17 @@ func (m *JobQueryDoneResponse) Reset()         { *m = JobQueryDoneResponse{} }
 func (m *JobQueryDoneResponse) String() string { return proto.CompactTextString(m) }
 func (*JobQueryDoneResponse) ProtoMessage()    {}
 func (*JobQueryDoneResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{16}
+	return fileDescriptor_3d113473d81b6d20, []int{16}
 }
+
 func (m *JobQueryDoneResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobQueryDoneResponse.Unmarshal(m, b)
 }
 func (m *JobQueryDoneResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobQueryDoneResponse.Marshal(b, m, deterministic)
 }
-func (dst *JobQueryDoneResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobQueryDoneResponse.Merge(dst, src)
+func (m *JobQueryDoneResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobQueryDoneResponse.Merge(m, src)
 }
 func (m *JobQueryDoneResponse) XXX_Size() int {
 	return xxx_messageInfo_JobQueryDoneResponse.Size(m)
@@ -1425,16 +1097,17 @@ func (m *JobCompletedEvent) Reset()         { *m = JobCompletedEvent{} }
 func (m *JobCompletedEvent) String() string { return proto.CompactTextString(m) }
 func (*JobCompletedEvent) ProtoMessage()    {}
 func (*JobCompletedEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{17}
+	return fileDescriptor_3d113473d81b6d20, []int{17}
 }
+
 func (m *JobCompletedEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobCompletedEvent.Unmarshal(m, b)
 }
 func (m *JobCompletedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobCompletedEvent.Marshal(b, m, deterministic)
 }
-func (dst *JobCompletedEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobCompletedEvent.Merge(dst, src)
+func (m *JobCompletedEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobCompletedEvent.Merge(m, src)
 }
 func (m *JobCompletedEvent) XXX_Size() int {
 	return xxx_messageInfo_JobCompletedEvent.Size(m)
@@ -1474,16 +1147,17 @@ func (m *TableDataListRequest) Reset()         { *m = TableDataListRequest{} }
 func (m *TableDataListRequest) String() string { return proto.CompactTextString(m) }
 func (*TableDataListRequest) ProtoMessage()    {}
 func (*TableDataListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{18}
+	return fileDescriptor_3d113473d81b6d20, []int{18}
 }
+
 func (m *TableDataListRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableDataListRequest.Unmarshal(m, b)
 }
 func (m *TableDataListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableDataListRequest.Marshal(b, m, deterministic)
 }
-func (dst *TableDataListRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableDataListRequest.Merge(dst, src)
+func (m *TableDataListRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableDataListRequest.Merge(m, src)
 }
 func (m *TableDataListRequest) XXX_Size() int {
 	return xxx_messageInfo_TableDataListRequest.Size(m)
@@ -1541,16 +1215,17 @@ func (m *Table) Reset()         { *m = Table{} }
 func (m *Table) String() string { return proto.CompactTextString(m) }
 func (*Table) ProtoMessage()    {}
 func (*Table) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{19}
+	return fileDescriptor_3d113473d81b6d20, []int{19}
 }
+
 func (m *Table) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Table.Unmarshal(m, b)
 }
 func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
 }
-func (dst *Table) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Table.Merge(dst, src)
+func (m *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(m, src)
 }
 func (m *Table) XXX_Size() int {
 	return xxx_messageInfo_Table.Size(m)
@@ -1626,16 +1301,17 @@ func (m *TableInfo) Reset()         { *m = TableInfo{} }
 func (m *TableInfo) String() string { return proto.CompactTextString(m) }
 func (*TableInfo) ProtoMessage()    {}
 func (*TableInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{20}
+	return fileDescriptor_3d113473d81b6d20, []int{20}
 }
+
 func (m *TableInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableInfo.Unmarshal(m, b)
 }
 func (m *TableInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableInfo.Marshal(b, m, deterministic)
 }
-func (dst *TableInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableInfo.Merge(dst, src)
+func (m *TableInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableInfo.Merge(m, src)
 }
 func (m *TableInfo) XXX_Size() int {
 	return xxx_messageInfo_TableInfo.Size(m)
@@ -1673,16 +1349,17 @@ func (m *TableViewDefinition) Reset()         { *m = TableViewDefinition{} }
 func (m *TableViewDefinition) String() string { return proto.CompactTextString(m) }
 func (*TableViewDefinition) ProtoMessage()    {}
 func (*TableViewDefinition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{21}
+	return fileDescriptor_3d113473d81b6d20, []int{21}
 }
+
 func (m *TableViewDefinition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableViewDefinition.Unmarshal(m, b)
 }
 func (m *TableViewDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableViewDefinition.Marshal(b, m, deterministic)
 }
-func (dst *TableViewDefinition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableViewDefinition.Merge(dst, src)
+func (m *TableViewDefinition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableViewDefinition.Merge(m, src)
 }
 func (m *TableViewDefinition) XXX_Size() int {
 	return xxx_messageInfo_TableViewDefinition.Size(m)
@@ -1728,16 +1405,17 @@ func (m *Dataset) Reset()         { *m = Dataset{} }
 func (m *Dataset) String() string { return proto.CompactTextString(m) }
 func (*Dataset) ProtoMessage()    {}
 func (*Dataset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{22}
+	return fileDescriptor_3d113473d81b6d20, []int{22}
 }
+
 func (m *Dataset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Dataset.Unmarshal(m, b)
 }
 func (m *Dataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Dataset.Marshal(b, m, deterministic)
 }
-func (dst *Dataset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Dataset.Merge(dst, src)
+func (m *Dataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dataset.Merge(m, src)
 }
 func (m *Dataset) XXX_Size() int {
 	return xxx_messageInfo_Dataset.Size(m)
@@ -1806,16 +1484,17 @@ func (m *DatasetInfo) Reset()         { *m = DatasetInfo{} }
 func (m *DatasetInfo) String() string { return proto.CompactTextString(m) }
 func (*DatasetInfo) ProtoMessage()    {}
 func (*DatasetInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{23}
+	return fileDescriptor_3d113473d81b6d20, []int{23}
 }
+
 func (m *DatasetInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatasetInfo.Unmarshal(m, b)
 }
 func (m *DatasetInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatasetInfo.Marshal(b, m, deterministic)
 }
-func (dst *DatasetInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatasetInfo.Merge(dst, src)
+func (m *DatasetInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetInfo.Merge(m, src)
 }
 func (m *DatasetInfo) XXX_Size() int {
 	return xxx_messageInfo_DatasetInfo.Size(m)
@@ -1853,16 +1532,17 @@ func (m *BigQueryAcl) Reset()         { *m = BigQueryAcl{} }
 func (m *BigQueryAcl) String() string { return proto.CompactTextString(m) }
 func (*BigQueryAcl) ProtoMessage()    {}
 func (*BigQueryAcl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{24}
+	return fileDescriptor_3d113473d81b6d20, []int{24}
 }
+
 func (m *BigQueryAcl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryAcl.Unmarshal(m, b)
 }
 func (m *BigQueryAcl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryAcl.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryAcl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryAcl.Merge(dst, src)
+func (m *BigQueryAcl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryAcl.Merge(m, src)
 }
 func (m *BigQueryAcl) XXX_Size() int {
 	return xxx_messageInfo_BigQueryAcl.Size(m)
@@ -1904,16 +1584,17 @@ func (m *BigQueryAcl_Entry) Reset()         { *m = BigQueryAcl_Entry{} }
 func (m *BigQueryAcl_Entry) String() string { return proto.CompactTextString(m) }
 func (*BigQueryAcl_Entry) ProtoMessage()    {}
 func (*BigQueryAcl_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{24, 0}
+	return fileDescriptor_3d113473d81b6d20, []int{24, 0}
 }
+
 func (m *BigQueryAcl_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryAcl_Entry.Unmarshal(m, b)
 }
 func (m *BigQueryAcl_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryAcl_Entry.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryAcl_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryAcl_Entry.Merge(dst, src)
+func (m *BigQueryAcl_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryAcl_Entry.Merge(m, src)
 }
 func (m *BigQueryAcl_Entry) XXX_Size() int {
 	return xxx_messageInfo_BigQueryAcl_Entry.Size(m)
@@ -1985,16 +1666,17 @@ func (m *Job) Reset()         { *m = Job{} }
 func (m *Job) String() string { return proto.CompactTextString(m) }
 func (*Job) ProtoMessage()    {}
 func (*Job) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{25}
+	return fileDescriptor_3d113473d81b6d20, []int{25}
 }
+
 func (m *Job) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job.Unmarshal(m, b)
 }
 func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
 }
-func (dst *Job) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job.Merge(dst, src)
+func (m *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(m, src)
 }
 func (m *Job) XXX_Size() int {
 	return xxx_messageInfo_Job.Size(m)
@@ -2056,16 +1738,17 @@ func (m *JobConfiguration) Reset()         { *m = JobConfiguration{} }
 func (m *JobConfiguration) String() string { return proto.CompactTextString(m) }
 func (*JobConfiguration) ProtoMessage()    {}
 func (*JobConfiguration) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{26}
+	return fileDescriptor_3d113473d81b6d20, []int{26}
 }
+
 func (m *JobConfiguration) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobConfiguration.Unmarshal(m, b)
 }
 func (m *JobConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobConfiguration.Marshal(b, m, deterministic)
 }
-func (dst *JobConfiguration) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobConfiguration.Merge(dst, src)
+func (m *JobConfiguration) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration.Merge(m, src)
 }
 func (m *JobConfiguration) XXX_Size() int {
 	return xxx_messageInfo_JobConfiguration.Size(m)
@@ -2146,9 +1829,9 @@ func (m *JobConfiguration) GetDryRun() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*JobConfiguration) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _JobConfiguration_OneofMarshaler, _JobConfiguration_OneofUnmarshaler, _JobConfiguration_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*JobConfiguration) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*JobConfiguration_Query_)(nil),
 		(*JobConfiguration_Load_)(nil),
 		(*JobConfiguration_Extract_)(nil),
@@ -2156,108 +1839,6 @@ func (*JobConfiguration) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buff
 	}
 }
 
-func _JobConfiguration_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*JobConfiguration)
-	// configuration
-	switch x := m.Configuration.(type) {
-	case *JobConfiguration_Query_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Query); err != nil {
-			return err
-		}
-	case *JobConfiguration_Load_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Load); err != nil {
-			return err
-		}
-	case *JobConfiguration_Extract_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Extract); err != nil {
-			return err
-		}
-	case *JobConfiguration_TableCopy_:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TableCopy); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("JobConfiguration.Configuration has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _JobConfiguration_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*JobConfiguration)
-	switch tag {
-	case 5: // configuration.query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobConfiguration_Query)
-		err := b.DecodeMessage(msg)
-		m.Configuration = &JobConfiguration_Query_{msg}
-		return true, err
-	case 6: // configuration.load
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobConfiguration_Load)
-		err := b.DecodeMessage(msg)
-		m.Configuration = &JobConfiguration_Load_{msg}
-		return true, err
-	case 7: // configuration.extract
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobConfiguration_Extract)
-		err := b.DecodeMessage(msg)
-		m.Configuration = &JobConfiguration_Extract_{msg}
-		return true, err
-	case 8: // configuration.table_copy
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobConfiguration_TableCopy)
-		err := b.DecodeMessage(msg)
-		m.Configuration = &JobConfiguration_TableCopy_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _JobConfiguration_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*JobConfiguration)
-	// configuration
-	switch x := m.Configuration.(type) {
-	case *JobConfiguration_Query_:
-		s := proto.Size(x.Query)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *JobConfiguration_Load_:
-		s := proto.Size(x.Load)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *JobConfiguration_Extract_:
-		s := proto.Size(x.Extract)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *JobConfiguration_TableCopy_:
-		s := proto.Size(x.TableCopy)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Describes a query job, which executes a SQL-like query.
 type JobConfiguration_Query struct {
 	// The SQL query to run.
@@ -2284,16 +1865,17 @@ func (m *JobConfiguration_Query) Reset()         { *m = JobConfiguration_Query{}
 func (m *JobConfiguration_Query) String() string { return proto.CompactTextString(m) }
 func (*JobConfiguration_Query) ProtoMessage()    {}
 func (*JobConfiguration_Query) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{26, 0}
+	return fileDescriptor_3d113473d81b6d20, []int{26, 0}
 }
+
 func (m *JobConfiguration_Query) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobConfiguration_Query.Unmarshal(m, b)
 }
 func (m *JobConfiguration_Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobConfiguration_Query.Marshal(b, m, deterministic)
 }
-func (dst *JobConfiguration_Query) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobConfiguration_Query.Merge(dst, src)
+func (m *JobConfiguration_Query) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_Query.Merge(m, src)
 }
 func (m *JobConfiguration_Query) XXX_Size() int {
 	return xxx_messageInfo_JobConfiguration_Query.Size(m)
@@ -2371,16 +1953,17 @@ func (m *JobConfiguration_Load) Reset()         { *m = JobConfiguration_Load{} }
 func (m *JobConfiguration_Load) String() string { return proto.CompactTextString(m) }
 func (*JobConfiguration_Load) ProtoMessage()    {}
 func (*JobConfiguration_Load) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{26, 1}
+	return fileDescriptor_3d113473d81b6d20, []int{26, 1}
 }
+
 func (m *JobConfiguration_Load) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobConfiguration_Load.Unmarshal(m, b)
 }
 func (m *JobConfiguration_Load) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobConfiguration_Load.Marshal(b, m, deterministic)
 }
-func (dst *JobConfiguration_Load) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobConfiguration_Load.Merge(dst, src)
+func (m *JobConfiguration_Load) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_Load.Merge(m, src)
 }
 func (m *JobConfiguration_Load) XXX_Size() int {
 	return xxx_messageInfo_JobConfiguration_Load.Size(m)
@@ -2442,16 +2025,17 @@ func (m *JobConfiguration_Extract) Reset()         { *m = JobConfiguration_Extra
 func (m *JobConfiguration_Extract) String() string { return proto.CompactTextString(m) }
 func (*JobConfiguration_Extract) ProtoMessage()    {}
 func (*JobConfiguration_Extract) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{26, 2}
+	return fileDescriptor_3d113473d81b6d20, []int{26, 2}
 }
+
 func (m *JobConfiguration_Extract) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobConfiguration_Extract.Unmarshal(m, b)
 }
 func (m *JobConfiguration_Extract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobConfiguration_Extract.Marshal(b, m, deterministic)
 }
-func (dst *JobConfiguration_Extract) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobConfiguration_Extract.Merge(dst, src)
+func (m *JobConfiguration_Extract) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_Extract.Merge(m, src)
 }
 func (m *JobConfiguration_Extract) XXX_Size() int {
 	return xxx_messageInfo_JobConfiguration_Extract.Size(m)
@@ -2497,16 +2081,17 @@ func (m *JobConfiguration_TableCopy) Reset()         { *m = JobConfiguration_Tab
 func (m *JobConfiguration_TableCopy) String() string { return proto.CompactTextString(m) }
 func (*JobConfiguration_TableCopy) ProtoMessage()    {}
 func (*JobConfiguration_TableCopy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{26, 3}
+	return fileDescriptor_3d113473d81b6d20, []int{26, 3}
 }
+
 func (m *JobConfiguration_TableCopy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobConfiguration_TableCopy.Unmarshal(m, b)
 }
 func (m *JobConfiguration_TableCopy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobConfiguration_TableCopy.Marshal(b, m, deterministic)
 }
-func (dst *JobConfiguration_TableCopy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobConfiguration_TableCopy.Merge(dst, src)
+func (m *JobConfiguration_TableCopy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_TableCopy.Merge(m, src)
 }
 func (m *JobConfiguration_TableCopy) XXX_Size() int {
 	return xxx_messageInfo_JobConfiguration_TableCopy.Size(m)
@@ -2560,16 +2145,17 @@ func (m *TableDefinition) Reset()         { *m = TableDefinition{} }
 func (m *TableDefinition) String() string { return proto.CompactTextString(m) }
 func (*TableDefinition) ProtoMessage()    {}
 func (*TableDefinition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{27}
+	return fileDescriptor_3d113473d81b6d20, []int{27}
 }
+
 func (m *TableDefinition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableDefinition.Unmarshal(m, b)
 }
 func (m *TableDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableDefinition.Marshal(b, m, deterministic)
 }
-func (dst *TableDefinition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableDefinition.Merge(dst, src)
+func (m *TableDefinition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableDefinition.Merge(m, src)
 }
 func (m *TableDefinition) XXX_Size() int {
 	return xxx_messageInfo_TableDefinition.Size(m)
@@ -2609,16 +2195,17 @@ func (m *JobStatus) Reset()         { *m = JobStatus{} }
 func (m *JobStatus) String() string { return proto.CompactTextString(m) }
 func (*JobStatus) ProtoMessage()    {}
 func (*JobStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{28}
+	return fileDescriptor_3d113473d81b6d20, []int{28}
 }
+
 func (m *JobStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobStatus.Unmarshal(m, b)
 }
 func (m *JobStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobStatus.Marshal(b, m, deterministic)
 }
-func (dst *JobStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobStatus.Merge(dst, src)
+func (m *JobStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatus.Merge(m, src)
 }
 func (m *JobStatus) XXX_Size() int {
 	return xxx_messageInfo_JobStatus.Size(m)
@@ -2666,16 +2253,17 @@ func (m *JobStatistics) Reset()         { *m = JobStatistics{} }
 func (m *JobStatistics) String() string { return proto.CompactTextString(m) }
 func (*JobStatistics) ProtoMessage()    {}
 func (*JobStatistics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{29}
+	return fileDescriptor_3d113473d81b6d20, []int{29}
 }
+
 func (m *JobStatistics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobStatistics.Unmarshal(m, b)
 }
 func (m *JobStatistics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobStatistics.Marshal(b, m, deterministic)
 }
-func (dst *JobStatistics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobStatistics.Merge(dst, src)
+func (m *JobStatistics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatistics.Merge(m, src)
 }
 func (m *JobStatistics) XXX_Size() int {
 	return xxx_messageInfo_JobStatistics.Size(m)
@@ -2743,16 +2331,17 @@ func (m *DatasetName) Reset()         { *m = DatasetName{} }
 func (m *DatasetName) String() string { return proto.CompactTextString(m) }
 func (*DatasetName) ProtoMessage()    {}
 func (*DatasetName) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{30}
+	return fileDescriptor_3d113473d81b6d20, []int{30}
 }
+
 func (m *DatasetName) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatasetName.Unmarshal(m, b)
 }
 func (m *DatasetName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatasetName.Marshal(b, m, deterministic)
 }
-func (dst *DatasetName) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatasetName.Merge(dst, src)
+func (m *DatasetName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetName.Merge(m, src)
 }
 func (m *DatasetName) XXX_Size() int {
 	return xxx_messageInfo_DatasetName.Size(m)
@@ -2794,16 +2383,17 @@ func (m *TableName) Reset()         { *m = TableName{} }
 func (m *TableName) String() string { return proto.CompactTextString(m) }
 func (*TableName) ProtoMessage()    {}
 func (*TableName) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{31}
+	return fileDescriptor_3d113473d81b6d20, []int{31}
 }
+
 func (m *TableName) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableName.Unmarshal(m, b)
 }
 func (m *TableName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableName.Marshal(b, m, deterministic)
 }
-func (dst *TableName) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableName.Merge(dst, src)
+func (m *TableName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableName.Merge(m, src)
 }
 func (m *TableName) XXX_Size() int {
 	return xxx_messageInfo_TableName.Size(m)
@@ -2850,16 +2440,17 @@ func (m *JobName) Reset()         { *m = JobName{} }
 func (m *JobName) String() string { return proto.CompactTextString(m) }
 func (*JobName) ProtoMessage()    {}
 func (*JobName) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_12e22cd9ac1143c8, []int{32}
+	return fileDescriptor_3d113473d81b6d20, []int{32}
 }
+
 func (m *JobName) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobName.Unmarshal(m, b)
 }
 func (m *JobName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobName.Marshal(b, m, deterministic)
 }
-func (dst *JobName) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobName.Merge(dst, src)
+func (m *JobName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobName.Merge(m, src)
 }
 func (m *JobName) XXX_Size() int {
 	return xxx_messageInfo_JobName.Size(m)
@@ -2926,10 +2517,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/logging/v1/audit_data.proto", fileDescriptor_audit_data_12e22cd9ac1143c8)
+	proto.RegisterFile("google/cloud/bigquery/logging/v1/audit_data.proto", fileDescriptor_3d113473d81b6d20)
 }
 
-var fileDescriptor_audit_data_12e22cd9ac1143c8 = []byte{
+var fileDescriptor_3d113473d81b6d20 = []byte{
 	// 2036 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x73, 0x1b, 0x49,
 	0x15, 0x8f, 0x2c, 0xc9, 0x92, 0x9e, 0xec, 0xd8, 0xee, 0xd8, 0x9b, 0x58, 0x90, 0xdd, 0x30, 0x40,
diff --git a/googleapis/cloud/bigquery/storage/v1beta1/avro.pb.go b/googleapis/cloud/bigquery/storage/v1beta1/avro.pb.go
index 11b89dd58f..9208ede2f8 100644
--- a/googleapis/cloud/bigquery/storage/v1beta1/avro.pb.go
+++ b/googleapis/cloud/bigquery/storage/v1beta1/avro.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/storage/v1beta1/avro.proto
 
-package storage // import "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1"
+package storage
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Avro schema.
 type AvroSchema struct {
@@ -32,16 +35,17 @@ func (m *AvroSchema) Reset()         { *m = AvroSchema{} }
 func (m *AvroSchema) String() string { return proto.CompactTextString(m) }
 func (*AvroSchema) ProtoMessage()    {}
 func (*AvroSchema) Descriptor() ([]byte, []int) {
-	return fileDescriptor_avro_4770a0731176dc2d, []int{0}
+	return fileDescriptor_8664acda99313b12, []int{0}
 }
+
 func (m *AvroSchema) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AvroSchema.Unmarshal(m, b)
 }
 func (m *AvroSchema) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AvroSchema.Marshal(b, m, deterministic)
 }
-func (dst *AvroSchema) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AvroSchema.Merge(dst, src)
+func (m *AvroSchema) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AvroSchema.Merge(m, src)
 }
 func (m *AvroSchema) XXX_Size() int {
 	return xxx_messageInfo_AvroSchema.Size(m)
@@ -74,16 +78,17 @@ func (m *AvroRows) Reset()         { *m = AvroRows{} }
 func (m *AvroRows) String() string { return proto.CompactTextString(m) }
 func (*AvroRows) ProtoMessage()    {}
 func (*AvroRows) Descriptor() ([]byte, []int) {
-	return fileDescriptor_avro_4770a0731176dc2d, []int{1}
+	return fileDescriptor_8664acda99313b12, []int{1}
 }
+
 func (m *AvroRows) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AvroRows.Unmarshal(m, b)
 }
 func (m *AvroRows) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AvroRows.Marshal(b, m, deterministic)
 }
-func (dst *AvroRows) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AvroRows.Merge(dst, src)
+func (m *AvroRows) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AvroRows.Merge(m, src)
 }
 func (m *AvroRows) XXX_Size() int {
 	return xxx_messageInfo_AvroRows.Size(m)
@@ -114,10 +119,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/avro.proto", fileDescriptor_avro_4770a0731176dc2d)
+	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/avro.proto", fileDescriptor_8664acda99313b12)
 }
 
-var fileDescriptor_avro_4770a0731176dc2d = []byte{
+var fileDescriptor_8664acda99313b12 = []byte{
 	// 242 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd0, 0xcf, 0x4b, 0xc3, 0x30,
 	0x14, 0x07, 0x70, 0xaa, 0x30, 0xd6, 0xe0, 0xa9, 0xc8, 0x18, 0x78, 0x19, 0x43, 0x61, 0x5e, 0x12,
diff --git a/googleapis/cloud/bigquery/storage/v1beta1/read_options.pb.go b/googleapis/cloud/bigquery/storage/v1beta1/read_options.pb.go
index 28c99a25f0..f619505b6d 100644
--- a/googleapis/cloud/bigquery/storage/v1beta1/read_options.pb.go
+++ b/googleapis/cloud/bigquery/storage/v1beta1/read_options.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/storage/v1beta1/read_options.proto
 
-package storage // import "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1"
+package storage
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Options dictating how we read a table.
 type TableReadOptions struct {
@@ -44,16 +47,17 @@ func (m *TableReadOptions) Reset()         { *m = TableReadOptions{} }
 func (m *TableReadOptions) String() string { return proto.CompactTextString(m) }
 func (*TableReadOptions) ProtoMessage()    {}
 func (*TableReadOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_read_options_931be2a30741eb81, []int{0}
+	return fileDescriptor_b5cb6d339ef0ad09, []int{0}
 }
+
 func (m *TableReadOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableReadOptions.Unmarshal(m, b)
 }
 func (m *TableReadOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableReadOptions.Marshal(b, m, deterministic)
 }
-func (dst *TableReadOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableReadOptions.Merge(dst, src)
+func (m *TableReadOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableReadOptions.Merge(m, src)
 }
 func (m *TableReadOptions) XXX_Size() int {
 	return xxx_messageInfo_TableReadOptions.Size(m)
@@ -83,10 +87,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/read_options.proto", fileDescriptor_read_options_931be2a30741eb81)
+	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/read_options.proto", fileDescriptor_b5cb6d339ef0ad09)
 }
 
-var fileDescriptor_read_options_931be2a30741eb81 = []byte{
+var fileDescriptor_b5cb6d339ef0ad09 = []byte{
 	// 213 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd0, 0x3f, 0x4b, 0xc6, 0x30,
 	0x10, 0x06, 0x70, 0x5e, 0x05, 0xc1, 0x0c, 0x2a, 0x9d, 0x3a, 0x16, 0x41, 0xd4, 0x25, 0xa1, 0xb8,
diff --git a/googleapis/cloud/bigquery/storage/v1beta1/storage.pb.go b/googleapis/cloud/bigquery/storage/v1beta1/storage.pb.go
index a4466808e2..2eeff69e79 100644
--- a/googleapis/cloud/bigquery/storage/v1beta1/storage.pb.go
+++ b/googleapis/cloud/bigquery/storage/v1beta1/storage.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/storage/v1beta1/storage.proto
 
-package storage // import "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package storage
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Data format for input or output data.
 type DataFormat int32
@@ -41,6 +41,7 @@ var DataFormat_name = map[int32]string{
 	0: "DATA_FORMAT_UNSPECIFIED",
 	1: "AVRO",
 }
+
 var DataFormat_value = map[string]int32{
 	"DATA_FORMAT_UNSPECIFIED": 0,
 	"AVRO":                    1,
@@ -49,8 +50,9 @@ var DataFormat_value = map[string]int32{
 func (x DataFormat) String() string {
 	return proto.EnumName(DataFormat_name, int32(x))
 }
+
 func (DataFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{0}
+	return fileDescriptor_2a3518a93fa439fd, []int{0}
 }
 
 // Information about a single data stream within a read session.
@@ -69,16 +71,17 @@ func (m *Stream) Reset()         { *m = Stream{} }
 func (m *Stream) String() string { return proto.CompactTextString(m) }
 func (*Stream) ProtoMessage()    {}
 func (*Stream) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{0}
+	return fileDescriptor_2a3518a93fa439fd, []int{0}
 }
+
 func (m *Stream) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Stream.Unmarshal(m, b)
 }
 func (m *Stream) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Stream.Marshal(b, m, deterministic)
 }
-func (dst *Stream) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Stream.Merge(dst, src)
+func (m *Stream) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Stream.Merge(m, src)
 }
 func (m *Stream) XXX_Size() int {
 	return xxx_messageInfo_Stream.Size(m)
@@ -118,16 +121,17 @@ func (m *StreamPosition) Reset()         { *m = StreamPosition{} }
 func (m *StreamPosition) String() string { return proto.CompactTextString(m) }
 func (*StreamPosition) ProtoMessage()    {}
 func (*StreamPosition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{1}
+	return fileDescriptor_2a3518a93fa439fd, []int{1}
 }
+
 func (m *StreamPosition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamPosition.Unmarshal(m, b)
 }
 func (m *StreamPosition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamPosition.Marshal(b, m, deterministic)
 }
-func (dst *StreamPosition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamPosition.Merge(dst, src)
+func (m *StreamPosition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamPosition.Merge(m, src)
 }
 func (m *StreamPosition) XXX_Size() int {
 	return xxx_messageInfo_StreamPosition.Size(m)
@@ -182,16 +186,17 @@ func (m *ReadSession) Reset()         { *m = ReadSession{} }
 func (m *ReadSession) String() string { return proto.CompactTextString(m) }
 func (*ReadSession) ProtoMessage()    {}
 func (*ReadSession) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{2}
+	return fileDescriptor_2a3518a93fa439fd, []int{2}
 }
+
 func (m *ReadSession) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadSession.Unmarshal(m, b)
 }
 func (m *ReadSession) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadSession.Marshal(b, m, deterministic)
 }
-func (dst *ReadSession) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadSession.Merge(dst, src)
+func (m *ReadSession) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadSession.Merge(m, src)
 }
 func (m *ReadSession) XXX_Size() int {
 	return xxx_messageInfo_ReadSession.Size(m)
@@ -261,61 +266,13 @@ func (m *ReadSession) GetTableModifiers() *TableModifiers {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadSession) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadSession_OneofMarshaler, _ReadSession_OneofUnmarshaler, _ReadSession_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadSession) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadSession_AvroSchema)(nil),
 	}
 }
 
-func _ReadSession_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadSession)
-	// schema
-	switch x := m.Schema.(type) {
-	case *ReadSession_AvroSchema:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AvroSchema); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ReadSession.Schema has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadSession_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadSession)
-	switch tag {
-	case 5: // schema.avro_schema
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AvroSchema)
-		err := b.DecodeMessage(msg)
-		m.Schema = &ReadSession_AvroSchema{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadSession_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadSession)
-	// schema
-	switch x := m.Schema.(type) {
-	case *ReadSession_AvroSchema:
-		s := proto.Size(x.AvroSchema)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Creates a new read session, which may include additional options such as
 // requested parallelism, projection filters and constraints.
 type CreateReadSessionRequest struct {
@@ -348,16 +305,17 @@ func (m *CreateReadSessionRequest) Reset()         { *m = CreateReadSessionReque
 func (m *CreateReadSessionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateReadSessionRequest) ProtoMessage()    {}
 func (*CreateReadSessionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{3}
+	return fileDescriptor_2a3518a93fa439fd, []int{3}
 }
+
 func (m *CreateReadSessionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateReadSessionRequest.Unmarshal(m, b)
 }
 func (m *CreateReadSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateReadSessionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateReadSessionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateReadSessionRequest.Merge(dst, src)
+func (m *CreateReadSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateReadSessionRequest.Merge(m, src)
 }
 func (m *CreateReadSessionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateReadSessionRequest.Size(m)
@@ -425,16 +383,17 @@ func (m *ReadRowsRequest) Reset()         { *m = ReadRowsRequest{} }
 func (m *ReadRowsRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsRequest) ProtoMessage()    {}
 func (*ReadRowsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{4}
+	return fileDescriptor_2a3518a93fa439fd, []int{4}
 }
+
 func (m *ReadRowsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsRequest.Unmarshal(m, b)
 }
 func (m *ReadRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsRequest.Merge(dst, src)
+func (m *ReadRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsRequest.Merge(m, src)
 }
 func (m *ReadRowsRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsRequest.Size(m)
@@ -467,16 +426,17 @@ func (m *StreamStatus) Reset()         { *m = StreamStatus{} }
 func (m *StreamStatus) String() string { return proto.CompactTextString(m) }
 func (*StreamStatus) ProtoMessage()    {}
 func (*StreamStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{5}
+	return fileDescriptor_2a3518a93fa439fd, []int{5}
 }
+
 func (m *StreamStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamStatus.Unmarshal(m, b)
 }
 func (m *StreamStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamStatus.Marshal(b, m, deterministic)
 }
-func (dst *StreamStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamStatus.Merge(dst, src)
+func (m *StreamStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamStatus.Merge(m, src)
 }
 func (m *StreamStatus) XXX_Size() int {
 	return xxx_messageInfo_StreamStatus.Size(m)
@@ -508,16 +468,17 @@ func (m *ThrottleStatus) Reset()         { *m = ThrottleStatus{} }
 func (m *ThrottleStatus) String() string { return proto.CompactTextString(m) }
 func (*ThrottleStatus) ProtoMessage()    {}
 func (*ThrottleStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{6}
+	return fileDescriptor_2a3518a93fa439fd, []int{6}
 }
+
 func (m *ThrottleStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ThrottleStatus.Unmarshal(m, b)
 }
 func (m *ThrottleStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ThrottleStatus.Marshal(b, m, deterministic)
 }
-func (dst *ThrottleStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ThrottleStatus.Merge(dst, src)
+func (m *ThrottleStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ThrottleStatus.Merge(m, src)
 }
 func (m *ThrottleStatus) XXX_Size() int {
 	return xxx_messageInfo_ThrottleStatus.Size(m)
@@ -557,16 +518,17 @@ func (m *ReadRowsResponse) Reset()         { *m = ReadRowsResponse{} }
 func (m *ReadRowsResponse) String() string { return proto.CompactTextString(m) }
 func (*ReadRowsResponse) ProtoMessage()    {}
 func (*ReadRowsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{7}
+	return fileDescriptor_2a3518a93fa439fd, []int{7}
 }
+
 func (m *ReadRowsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRowsResponse.Unmarshal(m, b)
 }
 func (m *ReadRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRowsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReadRowsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRowsResponse.Merge(dst, src)
+func (m *ReadRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse.Merge(m, src)
 }
 func (m *ReadRowsResponse) XXX_Size() int {
 	return xxx_messageInfo_ReadRowsResponse.Size(m)
@@ -615,61 +577,13 @@ func (m *ReadRowsResponse) GetThrottleStatus() *ThrottleStatus {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadRowsResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadRowsResponse_OneofMarshaler, _ReadRowsResponse_OneofUnmarshaler, _ReadRowsResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadRowsResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadRowsResponse_AvroRows)(nil),
 	}
 }
 
-func _ReadRowsResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadRowsResponse)
-	// rows
-	switch x := m.Rows.(type) {
-	case *ReadRowsResponse_AvroRows:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AvroRows); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ReadRowsResponse.Rows has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadRowsResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadRowsResponse)
-	switch tag {
-	case 3: // rows.avro_rows
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AvroRows)
-		err := b.DecodeMessage(msg)
-		m.Rows = &ReadRowsResponse_AvroRows{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadRowsResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadRowsResponse)
-	// rows
-	switch x := m.Rows.(type) {
-	case *ReadRowsResponse_AvroRows:
-		s := proto.Size(x.AvroRows)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Information needed to request additional streams for an established read
 // session.
 type BatchCreateReadSessionStreamsRequest struct {
@@ -689,16 +603,17 @@ func (m *BatchCreateReadSessionStreamsRequest) Reset()         { *m = BatchCreat
 func (m *BatchCreateReadSessionStreamsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateReadSessionStreamsRequest) ProtoMessage()    {}
 func (*BatchCreateReadSessionStreamsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{8}
+	return fileDescriptor_2a3518a93fa439fd, []int{8}
 }
+
 func (m *BatchCreateReadSessionStreamsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateReadSessionStreamsRequest.Unmarshal(m, b)
 }
 func (m *BatchCreateReadSessionStreamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateReadSessionStreamsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateReadSessionStreamsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateReadSessionStreamsRequest.Merge(dst, src)
+func (m *BatchCreateReadSessionStreamsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateReadSessionStreamsRequest.Merge(m, src)
 }
 func (m *BatchCreateReadSessionStreamsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateReadSessionStreamsRequest.Size(m)
@@ -737,16 +652,17 @@ func (m *BatchCreateReadSessionStreamsResponse) Reset()         { *m = BatchCrea
 func (m *BatchCreateReadSessionStreamsResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateReadSessionStreamsResponse) ProtoMessage()    {}
 func (*BatchCreateReadSessionStreamsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{9}
+	return fileDescriptor_2a3518a93fa439fd, []int{9}
 }
+
 func (m *BatchCreateReadSessionStreamsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateReadSessionStreamsResponse.Unmarshal(m, b)
 }
 func (m *BatchCreateReadSessionStreamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateReadSessionStreamsResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateReadSessionStreamsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateReadSessionStreamsResponse.Merge(dst, src)
+func (m *BatchCreateReadSessionStreamsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateReadSessionStreamsResponse.Merge(m, src)
 }
 func (m *BatchCreateReadSessionStreamsResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateReadSessionStreamsResponse.Size(m)
@@ -777,16 +693,17 @@ func (m *FinalizeStreamRequest) Reset()         { *m = FinalizeStreamRequest{} }
 func (m *FinalizeStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*FinalizeStreamRequest) ProtoMessage()    {}
 func (*FinalizeStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{10}
+	return fileDescriptor_2a3518a93fa439fd, []int{10}
 }
+
 func (m *FinalizeStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinalizeStreamRequest.Unmarshal(m, b)
 }
 func (m *FinalizeStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinalizeStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *FinalizeStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinalizeStreamRequest.Merge(dst, src)
+func (m *FinalizeStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinalizeStreamRequest.Merge(m, src)
 }
 func (m *FinalizeStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_FinalizeStreamRequest.Size(m)
@@ -817,16 +734,17 @@ func (m *SplitReadStreamRequest) Reset()         { *m = SplitReadStreamRequest{}
 func (m *SplitReadStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*SplitReadStreamRequest) ProtoMessage()    {}
 func (*SplitReadStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{11}
+	return fileDescriptor_2a3518a93fa439fd, []int{11}
 }
+
 func (m *SplitReadStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitReadStreamRequest.Unmarshal(m, b)
 }
 func (m *SplitReadStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitReadStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *SplitReadStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitReadStreamRequest.Merge(dst, src)
+func (m *SplitReadStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitReadStreamRequest.Merge(m, src)
 }
 func (m *SplitReadStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_SplitReadStreamRequest.Size(m)
@@ -860,16 +778,17 @@ func (m *SplitReadStreamResponse) Reset()         { *m = SplitReadStreamResponse
 func (m *SplitReadStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*SplitReadStreamResponse) ProtoMessage()    {}
 func (*SplitReadStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_ba3968bfc61218b8, []int{12}
+	return fileDescriptor_2a3518a93fa439fd, []int{12}
 }
+
 func (m *SplitReadStreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SplitReadStreamResponse.Unmarshal(m, b)
 }
 func (m *SplitReadStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SplitReadStreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *SplitReadStreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SplitReadStreamResponse.Merge(dst, src)
+func (m *SplitReadStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SplitReadStreamResponse.Merge(m, src)
 }
 func (m *SplitReadStreamResponse) XXX_Size() int {
 	return xxx_messageInfo_SplitReadStreamResponse.Size(m)
@@ -895,6 +814,7 @@ func (m *SplitReadStreamResponse) GetRemainderStream() *Stream {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.bigquery.storage.v1beta1.DataFormat", DataFormat_name, DataFormat_value)
 	proto.RegisterType((*Stream)(nil), "google.cloud.bigquery.storage.v1beta1.Stream")
 	proto.RegisterType((*StreamPosition)(nil), "google.cloud.bigquery.storage.v1beta1.StreamPosition")
 	proto.RegisterType((*ReadSession)(nil), "google.cloud.bigquery.storage.v1beta1.ReadSession")
@@ -908,7 +828,87 @@ func init() {
 	proto.RegisterType((*FinalizeStreamRequest)(nil), "google.cloud.bigquery.storage.v1beta1.FinalizeStreamRequest")
 	proto.RegisterType((*SplitReadStreamRequest)(nil), "google.cloud.bigquery.storage.v1beta1.SplitReadStreamRequest")
 	proto.RegisterType((*SplitReadStreamResponse)(nil), "google.cloud.bigquery.storage.v1beta1.SplitReadStreamResponse")
-	proto.RegisterEnum("google.cloud.bigquery.storage.v1beta1.DataFormat", DataFormat_name, DataFormat_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/storage.proto", fileDescriptor_2a3518a93fa439fd)
+}
+
+var fileDescriptor_2a3518a93fa439fd = []byte{
+	// 1160 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0x1b, 0x45,
+	0x14, 0xee, 0x3a, 0x89, 0xeb, 0x1e, 0xb7, 0xb6, 0x33, 0x88, 0xd4, 0x38, 0x20, 0xa2, 0x15, 0x95,
+	0xd2, 0x54, 0xdd, 0x4d, 0x1c, 0x48, 0x5b, 0xdc, 0x16, 0x9c, 0x3f, 0x1a, 0x35, 0x6d, 0xc2, 0xda,
+	0x54, 0x28, 0x17, 0x5d, 0x4d, 0xec, 0xb1, 0xb3, 0xc8, 0xbb, 0xb3, 0x9d, 0x19, 0x27, 0x04, 0x94,
+	0x1b, 0x6e, 0x78, 0x00, 0x2e, 0xb8, 0x43, 0xe2, 0x4d, 0xb8, 0xa2, 0xe2, 0x86, 0x1b, 0x5e, 0x81,
+	0x47, 0xe0, 0x01, 0xd0, 0xce, 0xcc, 0xfa, 0x27, 0x71, 0x9b, 0x75, 0x93, 0x3b, 0x9f, 0x99, 0xfd,
+	0xbe, 0x39, 0xdf, 0x39, 0x67, 0xbf, 0x59, 0xc3, 0x72, 0x9b, 0xd2, 0x76, 0x87, 0xd8, 0x8d, 0x0e,
+	0xed, 0x36, 0xed, 0x7d, 0xaf, 0xfd, 0xaa, 0x4b, 0xd8, 0xb1, 0xcd, 0x05, 0x65, 0xb8, 0x4d, 0xec,
+	0xc3, 0xa5, 0x7d, 0x22, 0xf0, 0x52, 0x1c, 0x5b, 0x21, 0xa3, 0x82, 0xa2, 0x5b, 0x0a, 0x64, 0x49,
+	0x90, 0x15, 0x83, 0xac, 0xf8, 0x21, 0x0d, 0x2a, 0x7d, 0xa8, 0xb9, 0x71, 0xe8, 0xd9, 0x38, 0x08,
+	0xa8, 0xc0, 0xc2, 0xa3, 0x01, 0x57, 0x24, 0xa5, 0x0f, 0x06, 0x76, 0x19, 0xe1, 0xb4, 0xcb, 0x1a,
+	0x9a, 0xbf, 0xb4, 0x98, 0x2c, 0x29, 0x7c, 0xc8, 0xa8, 0x46, 0xdc, 0x4f, 0x86, 0x60, 0x04, 0x37,
+	0x5d, 0x1a, 0x0e, 0xa6, 0x51, 0x49, 0x86, 0x14, 0x78, 0xbf, 0x43, 0x5c, 0x46, 0x5a, 0x84, 0x91,
+	0xa0, 0x97, 0xe8, 0xac, 0x06, 0xcb, 0x68, 0xbf, 0xdb, 0xb2, 0x89, 0x1f, 0x8a, 0x63, 0xbd, 0xf9,
+	0xf1, 0xe9, 0x4d, 0xe1, 0xf9, 0x84, 0x0b, 0xec, 0x87, 0xea, 0x01, 0xf3, 0x01, 0xa4, 0x6b, 0x82,
+	0x11, 0xec, 0x23, 0x04, 0x93, 0x01, 0xf6, 0x49, 0xd1, 0x98, 0x33, 0xe6, 0xaf, 0x39, 0xf2, 0x37,
+	0x9a, 0x85, 0x6b, 0x8c, 0x1e, 0xb9, 0x0d, 0xda, 0x0d, 0x44, 0x31, 0x35, 0x67, 0xcc, 0x4f, 0x38,
+	0x19, 0x46, 0x8f, 0xd6, 0xa2, 0xd8, 0xa4, 0x90, 0x53, 0xd0, 0x5d, 0xca, 0xbd, 0x48, 0x0e, 0xda,
+	0x80, 0x34, 0x97, 0x2b, 0x92, 0x24, 0x5b, 0xbe, 0x6b, 0x25, 0x6a, 0x92, 0xa5, 0x68, 0x1c, 0x0d,
+	0x46, 0x33, 0x90, 0xa6, 0xad, 0x16, 0x27, 0xf1, 0x91, 0x3a, 0x32, 0x5f, 0x4f, 0x40, 0xd6, 0x21,
+	0xb8, 0x59, 0x23, 0x9c, 0x47, 0xc7, 0x8d, 0xca, 0xb8, 0x02, 0x59, 0xf2, 0x7d, 0xe8, 0x31, 0xe2,
+	0x46, 0x4a, 0x25, 0x41, 0xb6, 0x5c, 0x8a, 0xf3, 0x88, 0xcb, 0x60, 0xd5, 0xe3, 0x32, 0x38, 0xa0,
+	0x1e, 0x8f, 0x16, 0x50, 0x1d, 0xb2, 0x51, 0x3f, 0x5d, 0xde, 0x38, 0x20, 0x3e, 0x2e, 0x4e, 0x49,
+	0xf0, 0x52, 0x42, 0x11, 0xd5, 0x43, 0x46, 0x6b, 0x12, 0xf8, 0xe4, 0x8a, 0x03, 0xb8, 0x17, 0xa1,
+	0xaf, 0xe0, 0xaa, 0x12, 0xc6, 0x8b, 0x93, 0x73, 0x13, 0xe3, 0x97, 0x25, 0x46, 0xa3, 0x97, 0x90,
+	0x3f, 0x35, 0x02, 0xc5, 0xab, 0x32, 0xc5, 0xcf, 0x12, 0x12, 0xd6, 0x23, 0xb4, 0x13, 0x83, 0x9d,
+	0x9c, 0x18, 0x8a, 0xfb, 0xfc, 0x3e, 0x6d, 0x7a, 0x2d, 0x8f, 0x30, 0x5e, 0xcc, 0x8c, 0xcf, 0xff,
+	0x2c, 0x06, 0x6b, 0xfe, 0x5e, 0xbc, 0x9a, 0x81, 0xb4, 0xaa, 0xac, 0xf9, 0xe7, 0x04, 0x14, 0xd7,
+	0x18, 0xc1, 0x82, 0x0c, 0xf4, 0xd3, 0x21, 0xaf, 0xba, 0x84, 0x8b, 0x51, 0x32, 0x8d, 0xcb, 0x94,
+	0x39, 0x03, 0xe9, 0x10, 0x33, 0x12, 0x88, 0x62, 0x5a, 0x0e, 0x8e, 0x8e, 0x46, 0xc9, 0x4f, 0x5d,
+	0xa2, 0x7c, 0x74, 0x07, 0xa6, 0x99, 0x92, 0x48, 0x9a, 0x6e, 0x3c, 0x11, 0x13, 0x73, 0xc6, 0xfc,
+	0x94, 0x53, 0xe8, 0x6d, 0xd4, 0x74, 0xaf, 0xf7, 0xe0, 0xfa, 0xa0, 0x51, 0x14, 0x27, 0x65, 0x26,
+	0xf7, 0xc6, 0xab, 0x00, 0x6e, 0xee, 0x28, 0xb8, 0x93, 0x65, 0xfd, 0x00, 0x6d, 0x41, 0xba, 0x45,
+	0x99, 0x8f, 0x85, 0x9c, 0xf0, 0x5c, 0xe2, 0x09, 0x5f, 0xc7, 0x02, 0x6f, 0x4a, 0xa0, 0xa3, 0x09,
+	0x4c, 0x1f, 0xf2, 0xd1, 0x31, 0x0e, 0x3d, 0xe2, 0x71, 0xfb, 0xf6, 0xe0, 0x86, 0xcc, 0x3c, 0xd4,
+	0xae, 0x30, 0x66, 0xf3, 0x86, 0x2d, 0xc5, 0x91, 0x55, 0x88, 0x23, 0xf3, 0x31, 0x5c, 0x57, 0xfb,
+	0x35, 0x81, 0x45, 0x97, 0x23, 0x0b, 0xde, 0x23, 0x5c, 0x78, 0x3e, 0x8e, 0x4a, 0xda, 0x77, 0x2a,
+	0x43, 0xda, 0xc6, 0x74, 0x6f, 0xcb, 0x89, 0x2d, 0xab, 0x02, 0xb9, 0xfa, 0x01, 0xa3, 0x42, 0x74,
+	0x88, 0x66, 0xb8, 0x0d, 0x05, 0xa1, 0x57, 0xdc, 0x90, 0xb0, 0x06, 0xd1, 0xf0, 0x29, 0x27, 0x1f,
+	0xaf, 0xef, 0xaa, 0x65, 0xf3, 0xd7, 0x14, 0x14, 0xfa, 0x62, 0x79, 0x48, 0x03, 0x4e, 0xd0, 0x73,
+	0xb8, 0x26, 0x2d, 0x83, 0xd1, 0x23, 0xd5, 0xcc, 0x6c, 0xd9, 0x1e, 0xc3, 0x30, 0x22, 0xae, 0x27,
+	0x57, 0x9c, 0x0c, 0xd6, 0xbf, 0xd1, 0xd3, 0xc8, 0x42, 0xa3, 0xcc, 0xf4, 0xec, 0x2d, 0x8f, 0x55,
+	0x36, 0x25, 0xca, 0xd1, 0x14, 0x72, 0xa2, 0x63, 0x71, 0x9a, 0x75, 0x6a, 0xbc, 0x89, 0x1e, 0x2a,
+	0x96, 0x93, 0x13, 0x43, 0xf1, 0x6a, 0x1a, 0x26, 0x23, 0xdd, 0xe6, 0xef, 0x06, 0x7c, 0xb2, 0x8a,
+	0x45, 0xe3, 0xe0, 0xcc, 0x3b, 0xad, 0xc7, 0x39, 0x9e, 0x8d, 0x6d, 0xb8, 0xca, 0xd5, 0x86, 0x9e,
+	0x8a, 0x72, 0xc2, 0x44, 0x06, 0x6d, 0x22, 0xa6, 0x18, 0xfd, 0x42, 0xa5, 0x46, 0xbf, 0x50, 0x66,
+	0x08, 0xb7, 0xce, 0x49, 0x51, 0x77, 0x74, 0xc0, 0xae, 0x8d, 0x8b, 0xd8, 0xb5, 0xf9, 0x12, 0xde,
+	0xdf, 0xf4, 0x02, 0xdc, 0xf1, 0x7e, 0x20, 0x7a, 0x4b, 0x57, 0xa1, 0x7f, 0x4d, 0xa6, 0x2e, 0x70,
+	0x4d, 0x9a, 0x21, 0xcc, 0xd4, 0xc2, 0x8e, 0x27, 0xa4, 0x96, 0xa1, 0x03, 0x5e, 0x40, 0x9e, 0x32,
+	0xaf, 0x1d, 0x1d, 0xee, 0x5e, 0xe4, 0x42, 0xce, 0xc5, 0x2c, 0x2a, 0x36, 0xff, 0x32, 0xe0, 0xe6,
+	0x99, 0x23, 0x75, 0xd9, 0xea, 0x90, 0x0b, 0x99, 0xe7, 0x63, 0x76, 0x7c, 0xa1, 0x23, 0x6f, 0x68,
+	0x12, 0xfd, 0x51, 0xf2, 0x2d, 0x14, 0x18, 0xf1, 0xb1, 0x17, 0x34, 0x09, 0x73, 0x2f, 0x52, 0xb4,
+	0x7c, 0x8f, 0x46, 0x2d, 0x2c, 0x2c, 0x03, 0xf4, 0xfd, 0x0c, 0xcd, 0xc2, 0xcd, 0xf5, 0x6a, 0xbd,
+	0xea, 0x6e, 0xee, 0x38, 0xcf, 0xaa, 0x75, 0xf7, 0x9b, 0xe7, 0xb5, 0xdd, 0x8d, 0xb5, 0xad, 0xcd,
+	0xad, 0x8d, 0xf5, 0xc2, 0x15, 0x94, 0x81, 0xc9, 0xea, 0x0b, 0x67, 0xa7, 0x60, 0x94, 0x5f, 0x67,
+	0x20, 0xbf, 0xea, 0xb5, 0xbf, 0x8e, 0x4e, 0xaa, 0xa9, 0x83, 0xd0, 0xcf, 0x29, 0x98, 0x3e, 0x33,
+	0x54, 0xe8, 0x8b, 0x84, 0xe9, 0xbd, 0xe9, 0x16, 0x2c, 0xbd, 0xc3, 0x9b, 0x61, 0x9e, 0xfc, 0xf4,
+	0xcf, 0xbf, 0xbf, 0xa4, 0x8e, 0xcc, 0xc5, 0xde, 0x27, 0xe3, 0x8f, 0x23, 0xbe, 0x19, 0xbf, 0x23,
+	0x0d, 0xe1, 0x7a, 0xcd, 0x47, 0xfa, 0x27, 0xb7, 0x17, 0x4e, 0x3e, 0x37, 0x16, 0xf6, 0xbe, 0x34,
+	0x2b, 0x6f, 0x86, 0x35, 0xb1, 0xc0, 0x9c, 0x9c, 0x82, 0xd9, 0x7a, 0x55, 0x33, 0xa0, 0x3f, 0x0c,
+	0xc8, 0xc4, 0x06, 0x89, 0x56, 0xc6, 0xc8, 0x7f, 0xe0, 0xfa, 0x28, 0xdd, 0x1b, 0x1b, 0xa7, 0x06,
+	0xd0, 0xac, 0x4a, 0xf1, 0x15, 0xf4, 0xa0, 0xaf, 0x62, 0xe8, 0x1e, 0xb2, 0xd4, 0xf8, 0x58, 0xd1,
+	0x67, 0xe2, 0xa0, 0x08, 0xfd, 0xba, 0xda, 0x0b, 0x27, 0x8b, 0x06, 0xfa, 0xcf, 0x80, 0x8f, 0xde,
+	0x6a, 0x13, 0xe8, 0x69, 0xc2, 0xfc, 0x92, 0xf8, 0x61, 0x69, 0xfb, 0x72, 0xc8, 0x74, 0x05, 0xee,
+	0xcb, 0x0a, 0x94, 0xcd, 0xbb, 0xfd, 0x0a, 0x68, 0xab, 0x3c, 0x2b, 0x5a, 0xad, 0xc7, 0x9d, 0xfb,
+	0xcd, 0x80, 0xdc, 0xb0, 0x57, 0xa1, 0x87, 0x09, 0x53, 0x1b, 0x69, 0x71, 0xa5, 0x99, 0x33, 0x5f,
+	0xdc, 0x1b, 0xd1, 0xbf, 0x12, 0x73, 0x45, 0xa6, 0xb8, 0x68, 0xde, 0x19, 0x48, 0xf1, 0xbc, 0xb6,
+	0x44, 0x09, 0xfe, 0x6d, 0x40, 0xfe, 0x94, 0xf3, 0xa0, 0x47, 0x49, 0x1d, 0x60, 0xa4, 0x49, 0x96,
+	0x1e, 0xbf, 0x2b, 0x5c, 0x57, 0xfb, 0xa1, 0x94, 0xb2, 0x82, 0x3e, 0xed, 0x4b, 0x39, 0x65, 0xba,
+	0x6f, 0xd1, 0xb4, 0x7a, 0x0c, 0xb7, 0x1b, 0xd4, 0x4f, 0x96, 0xc2, 0xde, 0xb6, 0x7e, 0xac, 0x4d,
+	0x3b, 0x38, 0x68, 0x5b, 0x94, 0xb5, 0xed, 0x36, 0x09, 0x64, 0x69, 0x6d, 0xb5, 0x85, 0x43, 0x8f,
+	0x9f, 0xf3, 0xf7, 0xb1, 0xa2, 0xe3, 0xfd, 0xb4, 0x04, 0x2e, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff,
+	0xca, 0xfc, 0x5f, 0xb4, 0x77, 0x0f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1244,84 +1244,3 @@ var _BigQueryStorage_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/cloud/bigquery/storage/v1beta1/storage.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/storage.proto", fileDescriptor_storage_ba3968bfc61218b8)
-}
-
-var fileDescriptor_storage_ba3968bfc61218b8 = []byte{
-	// 1160 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0x1b, 0x45,
-	0x14, 0xee, 0x3a, 0x89, 0xeb, 0x1e, 0xb7, 0xb6, 0x33, 0x88, 0xd4, 0x38, 0x20, 0xa2, 0x15, 0x95,
-	0xd2, 0x54, 0xdd, 0x4d, 0x1c, 0x48, 0x5b, 0xdc, 0x16, 0x9c, 0x3f, 0x1a, 0x35, 0x6d, 0xc2, 0xda,
-	0x54, 0x28, 0x17, 0x5d, 0x4d, 0xec, 0xb1, 0xb3, 0xc8, 0xbb, 0xb3, 0x9d, 0x19, 0x27, 0x04, 0x94,
-	0x1b, 0x6e, 0x78, 0x00, 0x2e, 0xb8, 0x43, 0xe2, 0x4d, 0xb8, 0xa2, 0xe2, 0x86, 0x1b, 0x5e, 0x81,
-	0x47, 0xe0, 0x01, 0xd0, 0xce, 0xcc, 0xfa, 0x27, 0x71, 0x9b, 0x75, 0x93, 0x3b, 0x9f, 0x99, 0xfd,
-	0xbe, 0x39, 0xdf, 0x39, 0x67, 0xbf, 0x59, 0xc3, 0x72, 0x9b, 0xd2, 0x76, 0x87, 0xd8, 0x8d, 0x0e,
-	0xed, 0x36, 0xed, 0x7d, 0xaf, 0xfd, 0xaa, 0x4b, 0xd8, 0xb1, 0xcd, 0x05, 0x65, 0xb8, 0x4d, 0xec,
-	0xc3, 0xa5, 0x7d, 0x22, 0xf0, 0x52, 0x1c, 0x5b, 0x21, 0xa3, 0x82, 0xa2, 0x5b, 0x0a, 0x64, 0x49,
-	0x90, 0x15, 0x83, 0xac, 0xf8, 0x21, 0x0d, 0x2a, 0x7d, 0xa8, 0xb9, 0x71, 0xe8, 0xd9, 0x38, 0x08,
-	0xa8, 0xc0, 0xc2, 0xa3, 0x01, 0x57, 0x24, 0xa5, 0x0f, 0x06, 0x76, 0x19, 0xe1, 0xb4, 0xcb, 0x1a,
-	0x9a, 0xbf, 0xb4, 0x98, 0x2c, 0x29, 0x7c, 0xc8, 0xa8, 0x46, 0xdc, 0x4f, 0x86, 0x60, 0x04, 0x37,
-	0x5d, 0x1a, 0x0e, 0xa6, 0x51, 0x49, 0x86, 0x14, 0x78, 0xbf, 0x43, 0x5c, 0x46, 0x5a, 0x84, 0x91,
-	0xa0, 0x97, 0xe8, 0xac, 0x06, 0xcb, 0x68, 0xbf, 0xdb, 0xb2, 0x89, 0x1f, 0x8a, 0x63, 0xbd, 0xf9,
-	0xf1, 0xe9, 0x4d, 0xe1, 0xf9, 0x84, 0x0b, 0xec, 0x87, 0xea, 0x01, 0xf3, 0x01, 0xa4, 0x6b, 0x82,
-	0x11, 0xec, 0x23, 0x04, 0x93, 0x01, 0xf6, 0x49, 0xd1, 0x98, 0x33, 0xe6, 0xaf, 0x39, 0xf2, 0x37,
-	0x9a, 0x85, 0x6b, 0x8c, 0x1e, 0xb9, 0x0d, 0xda, 0x0d, 0x44, 0x31, 0x35, 0x67, 0xcc, 0x4f, 0x38,
-	0x19, 0x46, 0x8f, 0xd6, 0xa2, 0xd8, 0xa4, 0x90, 0x53, 0xd0, 0x5d, 0xca, 0xbd, 0x48, 0x0e, 0xda,
-	0x80, 0x34, 0x97, 0x2b, 0x92, 0x24, 0x5b, 0xbe, 0x6b, 0x25, 0x6a, 0x92, 0xa5, 0x68, 0x1c, 0x0d,
-	0x46, 0x33, 0x90, 0xa6, 0xad, 0x16, 0x27, 0xf1, 0x91, 0x3a, 0x32, 0x5f, 0x4f, 0x40, 0xd6, 0x21,
-	0xb8, 0x59, 0x23, 0x9c, 0x47, 0xc7, 0x8d, 0xca, 0xb8, 0x02, 0x59, 0xf2, 0x7d, 0xe8, 0x31, 0xe2,
-	0x46, 0x4a, 0x25, 0x41, 0xb6, 0x5c, 0x8a, 0xf3, 0x88, 0xcb, 0x60, 0xd5, 0xe3, 0x32, 0x38, 0xa0,
-	0x1e, 0x8f, 0x16, 0x50, 0x1d, 0xb2, 0x51, 0x3f, 0x5d, 0xde, 0x38, 0x20, 0x3e, 0x2e, 0x4e, 0x49,
-	0xf0, 0x52, 0x42, 0x11, 0xd5, 0x43, 0x46, 0x6b, 0x12, 0xf8, 0xe4, 0x8a, 0x03, 0xb8, 0x17, 0xa1,
-	0xaf, 0xe0, 0xaa, 0x12, 0xc6, 0x8b, 0x93, 0x73, 0x13, 0xe3, 0x97, 0x25, 0x46, 0xa3, 0x97, 0x90,
-	0x3f, 0x35, 0x02, 0xc5, 0xab, 0x32, 0xc5, 0xcf, 0x12, 0x12, 0xd6, 0x23, 0xb4, 0x13, 0x83, 0x9d,
-	0x9c, 0x18, 0x8a, 0xfb, 0xfc, 0x3e, 0x6d, 0x7a, 0x2d, 0x8f, 0x30, 0x5e, 0xcc, 0x8c, 0xcf, 0xff,
-	0x2c, 0x06, 0x6b, 0xfe, 0x5e, 0xbc, 0x9a, 0x81, 0xb4, 0xaa, 0xac, 0xf9, 0xe7, 0x04, 0x14, 0xd7,
-	0x18, 0xc1, 0x82, 0x0c, 0xf4, 0xd3, 0x21, 0xaf, 0xba, 0x84, 0x8b, 0x51, 0x32, 0x8d, 0xcb, 0x94,
-	0x39, 0x03, 0xe9, 0x10, 0x33, 0x12, 0x88, 0x62, 0x5a, 0x0e, 0x8e, 0x8e, 0x46, 0xc9, 0x4f, 0x5d,
-	0xa2, 0x7c, 0x74, 0x07, 0xa6, 0x99, 0x92, 0x48, 0x9a, 0x6e, 0x3c, 0x11, 0x13, 0x73, 0xc6, 0xfc,
-	0x94, 0x53, 0xe8, 0x6d, 0xd4, 0x74, 0xaf, 0xf7, 0xe0, 0xfa, 0xa0, 0x51, 0x14, 0x27, 0x65, 0x26,
-	0xf7, 0xc6, 0xab, 0x00, 0x6e, 0xee, 0x28, 0xb8, 0x93, 0x65, 0xfd, 0x00, 0x6d, 0x41, 0xba, 0x45,
-	0x99, 0x8f, 0x85, 0x9c, 0xf0, 0x5c, 0xe2, 0x09, 0x5f, 0xc7, 0x02, 0x6f, 0x4a, 0xa0, 0xa3, 0x09,
-	0x4c, 0x1f, 0xf2, 0xd1, 0x31, 0x0e, 0x3d, 0xe2, 0x71, 0xfb, 0xf6, 0xe0, 0x86, 0xcc, 0x3c, 0xd4,
-	0xae, 0x30, 0x66, 0xf3, 0x86, 0x2d, 0xc5, 0x91, 0x55, 0x88, 0x23, 0xf3, 0x31, 0x5c, 0x57, 0xfb,
-	0x35, 0x81, 0x45, 0x97, 0x23, 0x0b, 0xde, 0x23, 0x5c, 0x78, 0x3e, 0x8e, 0x4a, 0xda, 0x77, 0x2a,
-	0x43, 0xda, 0xc6, 0x74, 0x6f, 0xcb, 0x89, 0x2d, 0xab, 0x02, 0xb9, 0xfa, 0x01, 0xa3, 0x42, 0x74,
-	0x88, 0x66, 0xb8, 0x0d, 0x05, 0xa1, 0x57, 0xdc, 0x90, 0xb0, 0x06, 0xd1, 0xf0, 0x29, 0x27, 0x1f,
-	0xaf, 0xef, 0xaa, 0x65, 0xf3, 0xd7, 0x14, 0x14, 0xfa, 0x62, 0x79, 0x48, 0x03, 0x4e, 0xd0, 0x73,
-	0xb8, 0x26, 0x2d, 0x83, 0xd1, 0x23, 0xd5, 0xcc, 0x6c, 0xd9, 0x1e, 0xc3, 0x30, 0x22, 0xae, 0x27,
-	0x57, 0x9c, 0x0c, 0xd6, 0xbf, 0xd1, 0xd3, 0xc8, 0x42, 0xa3, 0xcc, 0xf4, 0xec, 0x2d, 0x8f, 0x55,
-	0x36, 0x25, 0xca, 0xd1, 0x14, 0x72, 0xa2, 0x63, 0x71, 0x9a, 0x75, 0x6a, 0xbc, 0x89, 0x1e, 0x2a,
-	0x96, 0x93, 0x13, 0x43, 0xf1, 0x6a, 0x1a, 0x26, 0x23, 0xdd, 0xe6, 0xef, 0x06, 0x7c, 0xb2, 0x8a,
-	0x45, 0xe3, 0xe0, 0xcc, 0x3b, 0xad, 0xc7, 0x39, 0x9e, 0x8d, 0x6d, 0xb8, 0xca, 0xd5, 0x86, 0x9e,
-	0x8a, 0x72, 0xc2, 0x44, 0x06, 0x6d, 0x22, 0xa6, 0x18, 0xfd, 0x42, 0xa5, 0x46, 0xbf, 0x50, 0x66,
-	0x08, 0xb7, 0xce, 0x49, 0x51, 0x77, 0x74, 0xc0, 0xae, 0x8d, 0x8b, 0xd8, 0xb5, 0xf9, 0x12, 0xde,
-	0xdf, 0xf4, 0x02, 0xdc, 0xf1, 0x7e, 0x20, 0x7a, 0x4b, 0x57, 0xa1, 0x7f, 0x4d, 0xa6, 0x2e, 0x70,
-	0x4d, 0x9a, 0x21, 0xcc, 0xd4, 0xc2, 0x8e, 0x27, 0xa4, 0x96, 0xa1, 0x03, 0x5e, 0x40, 0x9e, 0x32,
-	0xaf, 0x1d, 0x1d, 0xee, 0x5e, 0xe4, 0x42, 0xce, 0xc5, 0x2c, 0x2a, 0x36, 0xff, 0x32, 0xe0, 0xe6,
-	0x99, 0x23, 0x75, 0xd9, 0xea, 0x90, 0x0b, 0x99, 0xe7, 0x63, 0x76, 0x7c, 0xa1, 0x23, 0x6f, 0x68,
-	0x12, 0xfd, 0x51, 0xf2, 0x2d, 0x14, 0x18, 0xf1, 0xb1, 0x17, 0x34, 0x09, 0x73, 0x2f, 0x52, 0xb4,
-	0x7c, 0x8f, 0x46, 0x2d, 0x2c, 0x2c, 0x03, 0xf4, 0xfd, 0x0c, 0xcd, 0xc2, 0xcd, 0xf5, 0x6a, 0xbd,
-	0xea, 0x6e, 0xee, 0x38, 0xcf, 0xaa, 0x75, 0xf7, 0x9b, 0xe7, 0xb5, 0xdd, 0x8d, 0xb5, 0xad, 0xcd,
-	0xad, 0x8d, 0xf5, 0xc2, 0x15, 0x94, 0x81, 0xc9, 0xea, 0x0b, 0x67, 0xa7, 0x60, 0x94, 0x5f, 0x67,
-	0x20, 0xbf, 0xea, 0xb5, 0xbf, 0x8e, 0x4e, 0xaa, 0xa9, 0x83, 0xd0, 0xcf, 0x29, 0x98, 0x3e, 0x33,
-	0x54, 0xe8, 0x8b, 0x84, 0xe9, 0xbd, 0xe9, 0x16, 0x2c, 0xbd, 0xc3, 0x9b, 0x61, 0x9e, 0xfc, 0xf4,
-	0xcf, 0xbf, 0xbf, 0xa4, 0x8e, 0xcc, 0xc5, 0xde, 0x27, 0xe3, 0x8f, 0x23, 0xbe, 0x19, 0xbf, 0x23,
-	0x0d, 0xe1, 0x7a, 0xcd, 0x47, 0xfa, 0x27, 0xb7, 0x17, 0x4e, 0x3e, 0x37, 0x16, 0xf6, 0xbe, 0x34,
-	0x2b, 0x6f, 0x86, 0x35, 0xb1, 0xc0, 0x9c, 0x9c, 0x82, 0xd9, 0x7a, 0x55, 0x33, 0xa0, 0x3f, 0x0c,
-	0xc8, 0xc4, 0x06, 0x89, 0x56, 0xc6, 0xc8, 0x7f, 0xe0, 0xfa, 0x28, 0xdd, 0x1b, 0x1b, 0xa7, 0x06,
-	0xd0, 0xac, 0x4a, 0xf1, 0x15, 0xf4, 0xa0, 0xaf, 0x62, 0xe8, 0x1e, 0xb2, 0xd4, 0xf8, 0x58, 0xd1,
-	0x67, 0xe2, 0xa0, 0x08, 0xfd, 0xba, 0xda, 0x0b, 0x27, 0x8b, 0x06, 0xfa, 0xcf, 0x80, 0x8f, 0xde,
-	0x6a, 0x13, 0xe8, 0x69, 0xc2, 0xfc, 0x92, 0xf8, 0x61, 0x69, 0xfb, 0x72, 0xc8, 0x74, 0x05, 0xee,
-	0xcb, 0x0a, 0x94, 0xcd, 0xbb, 0xfd, 0x0a, 0x68, 0xab, 0x3c, 0x2b, 0x5a, 0xad, 0xc7, 0x9d, 0xfb,
-	0xcd, 0x80, 0xdc, 0xb0, 0x57, 0xa1, 0x87, 0x09, 0x53, 0x1b, 0x69, 0x71, 0xa5, 0x99, 0x33, 0x5f,
-	0xdc, 0x1b, 0xd1, 0xbf, 0x12, 0x73, 0x45, 0xa6, 0xb8, 0x68, 0xde, 0x19, 0x48, 0xf1, 0xbc, 0xb6,
-	0x44, 0x09, 0xfe, 0x6d, 0x40, 0xfe, 0x94, 0xf3, 0xa0, 0x47, 0x49, 0x1d, 0x60, 0xa4, 0x49, 0x96,
-	0x1e, 0xbf, 0x2b, 0x5c, 0x57, 0xfb, 0xa1, 0x94, 0xb2, 0x82, 0x3e, 0xed, 0x4b, 0x39, 0x65, 0xba,
-	0x6f, 0xd1, 0xb4, 0x7a, 0x0c, 0xb7, 0x1b, 0xd4, 0x4f, 0x96, 0xc2, 0xde, 0xb6, 0x7e, 0xac, 0x4d,
-	0x3b, 0x38, 0x68, 0x5b, 0x94, 0xb5, 0xed, 0x36, 0x09, 0x64, 0x69, 0x6d, 0xb5, 0x85, 0x43, 0x8f,
-	0x9f, 0xf3, 0xf7, 0xb1, 0xa2, 0xe3, 0xfd, 0xb4, 0x04, 0x2e, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff,
-	0xca, 0xfc, 0x5f, 0xb4, 0x77, 0x0f, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/bigquery/storage/v1beta1/table_reference.pb.go b/googleapis/cloud/bigquery/storage/v1beta1/table_reference.pb.go
index 07e45bddd0..dd7c1a2d86 100644
--- a/googleapis/cloud/bigquery/storage/v1beta1/table_reference.pb.go
+++ b/googleapis/cloud/bigquery/storage/v1beta1/table_reference.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/storage/v1beta1/table_reference.proto
 
-package storage // import "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1"
+package storage
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Table reference that includes just the 3 strings needed to identify a table.
 type TableReference struct {
@@ -37,16 +40,17 @@ func (m *TableReference) Reset()         { *m = TableReference{} }
 func (m *TableReference) String() string { return proto.CompactTextString(m) }
 func (*TableReference) ProtoMessage()    {}
 func (*TableReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_reference_d7a619381c8a4dbe, []int{0}
+	return fileDescriptor_00fafb38a9ed74ff, []int{0}
 }
+
 func (m *TableReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableReference.Unmarshal(m, b)
 }
 func (m *TableReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableReference.Marshal(b, m, deterministic)
 }
-func (dst *TableReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableReference.Merge(dst, src)
+func (m *TableReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableReference.Merge(m, src)
 }
 func (m *TableReference) XXX_Size() int {
 	return xxx_messageInfo_TableReference.Size(m)
@@ -91,16 +95,17 @@ func (m *TableModifiers) Reset()         { *m = TableModifiers{} }
 func (m *TableModifiers) String() string { return proto.CompactTextString(m) }
 func (*TableModifiers) ProtoMessage()    {}
 func (*TableModifiers) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_reference_d7a619381c8a4dbe, []int{1}
+	return fileDescriptor_00fafb38a9ed74ff, []int{1}
 }
+
 func (m *TableModifiers) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableModifiers.Unmarshal(m, b)
 }
 func (m *TableModifiers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableModifiers.Marshal(b, m, deterministic)
 }
-func (dst *TableModifiers) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableModifiers.Merge(dst, src)
+func (m *TableModifiers) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableModifiers.Merge(m, src)
 }
 func (m *TableModifiers) XXX_Size() int {
 	return xxx_messageInfo_TableModifiers.Size(m)
@@ -124,10 +129,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/table_reference.proto", fileDescriptor_table_reference_d7a619381c8a4dbe)
+	proto.RegisterFile("google/cloud/bigquery/storage/v1beta1/table_reference.proto", fileDescriptor_00fafb38a9ed74ff)
 }
 
-var fileDescriptor_table_reference_d7a619381c8a4dbe = []byte{
+var fileDescriptor_00fafb38a9ed74ff = []byte{
 	// 293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x4d, 0x4b, 0xc4, 0x30,
 	0x10, 0x86, 0x59, 0x05, 0x75, 0xe3, 0xc7, 0xa1, 0x5e, 0x76, 0x0b, 0xa2, 0x2c, 0x08, 0x7a, 0x49,
diff --git a/googleapis/cloud/bigquery/v2/model.pb.go b/googleapis/cloud/bigquery/v2/model.pb.go
index 4ce48d7ed2..6fcb8f7aa9 100644
--- a/googleapis/cloud/bigquery/v2/model.pb.go
+++ b/googleapis/cloud/bigquery/v2/model.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/v2/model.proto
 
-package bigquery // import "google.golang.org/genproto/googleapis/cloud/bigquery/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package bigquery
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates the type of the Model.
 type Model_ModelType int32
@@ -46,6 +46,7 @@ var Model_ModelType_name = map[int32]string{
 	2: "LOGISTIC_REGRESSION",
 	3: "KMEANS",
 }
+
 var Model_ModelType_value = map[string]int32{
 	"MODEL_TYPE_UNSPECIFIED": 0,
 	"LINEAR_REGRESSION":      1,
@@ -56,8 +57,9 @@ var Model_ModelType_value = map[string]int32{
 func (x Model_ModelType) String() string {
 	return proto.EnumName(Model_ModelType_name, int32(x))
 }
+
 func (Model_ModelType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 0}
 }
 
 // Loss metric to evaluate model training performance.
@@ -76,6 +78,7 @@ var Model_LossType_name = map[int32]string{
 	1: "MEAN_SQUARED_LOSS",
 	2: "MEAN_LOG_LOSS",
 }
+
 var Model_LossType_value = map[string]int32{
 	"LOSS_TYPE_UNSPECIFIED": 0,
 	"MEAN_SQUARED_LOSS":     1,
@@ -85,8 +88,9 @@ var Model_LossType_value = map[string]int32{
 func (x Model_LossType) String() string {
 	return proto.EnumName(Model_LossType_name, int32(x))
 }
+
 func (Model_LossType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 1}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 1}
 }
 
 // Distance metric used to compute the distance between two points.
@@ -105,6 +109,7 @@ var Model_DistanceType_name = map[int32]string{
 	1: "EUCLIDEAN",
 	2: "COSINE",
 }
+
 var Model_DistanceType_value = map[string]int32{
 	"DISTANCE_TYPE_UNSPECIFIED": 0,
 	"EUCLIDEAN":                 1,
@@ -114,8 +119,9 @@ var Model_DistanceType_value = map[string]int32{
 func (x Model_DistanceType) String() string {
 	return proto.EnumName(Model_DistanceType_name, int32(x))
 }
+
 func (Model_DistanceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 2}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 2}
 }
 
 // Indicates the method to split input data into multiple tables.
@@ -144,6 +150,7 @@ var Model_DataSplitMethod_name = map[int32]string{
 	4: "NO_SPLIT",
 	5: "AUTO_SPLIT",
 }
+
 var Model_DataSplitMethod_value = map[string]int32{
 	"DATA_SPLIT_METHOD_UNSPECIFIED": 0,
 	"RANDOM":                        1,
@@ -156,8 +163,9 @@ var Model_DataSplitMethod_value = map[string]int32{
 func (x Model_DataSplitMethod) String() string {
 	return proto.EnumName(Model_DataSplitMethod_name, int32(x))
 }
+
 func (Model_DataSplitMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 3}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 3}
 }
 
 // Indicates the learning rate optimization strategy to use.
@@ -176,6 +184,7 @@ var Model_LearnRateStrategy_name = map[int32]string{
 	1: "LINE_SEARCH",
 	2: "CONSTANT",
 }
+
 var Model_LearnRateStrategy_value = map[string]int32{
 	"LEARN_RATE_STRATEGY_UNSPECIFIED": 0,
 	"LINE_SEARCH":                     1,
@@ -185,8 +194,9 @@ var Model_LearnRateStrategy_value = map[string]int32{
 func (x Model_LearnRateStrategy) String() string {
 	return proto.EnumName(Model_LearnRateStrategy_name, int32(x))
 }
+
 func (Model_LearnRateStrategy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 4}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 4}
 }
 
 type Model struct {
@@ -243,16 +253,17 @@ func (m *Model) Reset()         { *m = Model{} }
 func (m *Model) String() string { return proto.CompactTextString(m) }
 func (*Model) ProtoMessage()    {}
 func (*Model) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0}
 }
+
 func (m *Model) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model.Unmarshal(m, b)
 }
 func (m *Model) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model.Marshal(b, m, deterministic)
 }
-func (dst *Model) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model.Merge(dst, src)
+func (m *Model) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model.Merge(m, src)
 }
 func (m *Model) XXX_Size() int {
 	return xxx_messageInfo_Model.Size(m)
@@ -375,16 +386,17 @@ func (m *Model_RegressionMetrics) Reset()         { *m = Model_RegressionMetrics
 func (m *Model_RegressionMetrics) String() string { return proto.CompactTextString(m) }
 func (*Model_RegressionMetrics) ProtoMessage()    {}
 func (*Model_RegressionMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 0}
 }
+
 func (m *Model_RegressionMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_RegressionMetrics.Unmarshal(m, b)
 }
 func (m *Model_RegressionMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_RegressionMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Model_RegressionMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_RegressionMetrics.Merge(dst, src)
+func (m *Model_RegressionMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_RegressionMetrics.Merge(m, src)
 }
 func (m *Model_RegressionMetrics) XXX_Size() int {
 	return xxx_messageInfo_Model_RegressionMetrics.Size(m)
@@ -468,16 +480,17 @@ func (m *Model_AggregateClassificationMetrics) Reset()         { *m = Model_Aggr
 func (m *Model_AggregateClassificationMetrics) String() string { return proto.CompactTextString(m) }
 func (*Model_AggregateClassificationMetrics) ProtoMessage()    {}
 func (*Model_AggregateClassificationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 1}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 1}
 }
+
 func (m *Model_AggregateClassificationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_AggregateClassificationMetrics.Unmarshal(m, b)
 }
 func (m *Model_AggregateClassificationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_AggregateClassificationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Model_AggregateClassificationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_AggregateClassificationMetrics.Merge(dst, src)
+func (m *Model_AggregateClassificationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_AggregateClassificationMetrics.Merge(m, src)
 }
 func (m *Model_AggregateClassificationMetrics) XXX_Size() int {
 	return xxx_messageInfo_Model_AggregateClassificationMetrics.Size(m)
@@ -552,16 +565,17 @@ func (m *Model_BinaryClassificationMetrics) Reset()         { *m = Model_BinaryC
 func (m *Model_BinaryClassificationMetrics) String() string { return proto.CompactTextString(m) }
 func (*Model_BinaryClassificationMetrics) ProtoMessage()    {}
 func (*Model_BinaryClassificationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 2}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 2}
 }
+
 func (m *Model_BinaryClassificationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_BinaryClassificationMetrics.Unmarshal(m, b)
 }
 func (m *Model_BinaryClassificationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_BinaryClassificationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Model_BinaryClassificationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_BinaryClassificationMetrics.Merge(dst, src)
+func (m *Model_BinaryClassificationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_BinaryClassificationMetrics.Merge(m, src)
 }
 func (m *Model_BinaryClassificationMetrics) XXX_Size() int {
 	return xxx_messageInfo_Model_BinaryClassificationMetrics.Size(m)
@@ -615,16 +629,17 @@ func (m *Model_BinaryClassificationMetrics_BinaryConfusionMatrix) String() strin
 }
 func (*Model_BinaryClassificationMetrics_BinaryConfusionMatrix) ProtoMessage() {}
 func (*Model_BinaryClassificationMetrics_BinaryConfusionMatrix) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 2, 0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 2, 0}
 }
+
 func (m *Model_BinaryClassificationMetrics_BinaryConfusionMatrix) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_BinaryClassificationMetrics_BinaryConfusionMatrix.Unmarshal(m, b)
 }
 func (m *Model_BinaryClassificationMetrics_BinaryConfusionMatrix) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_BinaryClassificationMetrics_BinaryConfusionMatrix.Marshal(b, m, deterministic)
 }
-func (dst *Model_BinaryClassificationMetrics_BinaryConfusionMatrix) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_BinaryClassificationMetrics_BinaryConfusionMatrix.Merge(dst, src)
+func (m *Model_BinaryClassificationMetrics_BinaryConfusionMatrix) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_BinaryClassificationMetrics_BinaryConfusionMatrix.Merge(m, src)
 }
 func (m *Model_BinaryClassificationMetrics_BinaryConfusionMatrix) XXX_Size() int {
 	return xxx_messageInfo_Model_BinaryClassificationMetrics_BinaryConfusionMatrix.Size(m)
@@ -699,16 +714,17 @@ func (m *Model_MultiClassClassificationMetrics) Reset()         { *m = Model_Mul
 func (m *Model_MultiClassClassificationMetrics) String() string { return proto.CompactTextString(m) }
 func (*Model_MultiClassClassificationMetrics) ProtoMessage()    {}
 func (*Model_MultiClassClassificationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 3}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 3}
 }
+
 func (m *Model_MultiClassClassificationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics.Unmarshal(m, b)
 }
 func (m *Model_MultiClassClassificationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Model_MultiClassClassificationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_MultiClassClassificationMetrics.Merge(dst, src)
+func (m *Model_MultiClassClassificationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_MultiClassClassificationMetrics.Merge(m, src)
 }
 func (m *Model_MultiClassClassificationMetrics) XXX_Size() int {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics.Size(m)
@@ -753,16 +769,17 @@ func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix) String() string
 }
 func (*Model_MultiClassClassificationMetrics_ConfusionMatrix) ProtoMessage() {}
 func (*Model_MultiClassClassificationMetrics_ConfusionMatrix) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 3, 0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 3, 0}
 }
+
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix.Unmarshal(m, b)
 }
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix.Marshal(b, m, deterministic)
 }
-func (dst *Model_MultiClassClassificationMetrics_ConfusionMatrix) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix.Merge(dst, src)
+func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix.Merge(m, src)
 }
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix) XXX_Size() int {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix.Size(m)
@@ -808,16 +825,17 @@ func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) String() s
 }
 func (*Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) ProtoMessage() {}
 func (*Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 3, 0, 0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 3, 0, 0}
 }
+
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry.Unmarshal(m, b)
 }
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry.Marshal(b, m, deterministic)
 }
-func (dst *Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry.Merge(dst, src)
+func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry.Merge(m, src)
 }
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry) XXX_Size() int {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Entry.Size(m)
@@ -861,16 +879,17 @@ func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) String() str
 }
 func (*Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) ProtoMessage() {}
 func (*Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 3, 0, 1}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 3, 0, 1}
 }
+
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Row.Unmarshal(m, b)
 }
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Row.Marshal(b, m, deterministic)
 }
-func (dst *Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Row.Merge(dst, src)
+func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Row.Merge(m, src)
 }
 func (m *Model_MultiClassClassificationMetrics_ConfusionMatrix_Row) XXX_Size() int {
 	return xxx_messageInfo_Model_MultiClassClassificationMetrics_ConfusionMatrix_Row.Size(m)
@@ -910,16 +929,17 @@ func (m *Model_ClusteringMetrics) Reset()         { *m = Model_ClusteringMetrics
 func (m *Model_ClusteringMetrics) String() string { return proto.CompactTextString(m) }
 func (*Model_ClusteringMetrics) ProtoMessage()    {}
 func (*Model_ClusteringMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 4}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 4}
 }
+
 func (m *Model_ClusteringMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_ClusteringMetrics.Unmarshal(m, b)
 }
 func (m *Model_ClusteringMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_ClusteringMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Model_ClusteringMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_ClusteringMetrics.Merge(dst, src)
+func (m *Model_ClusteringMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_ClusteringMetrics.Merge(m, src)
 }
 func (m *Model_ClusteringMetrics) XXX_Size() int {
 	return xxx_messageInfo_Model_ClusteringMetrics.Size(m)
@@ -963,16 +983,17 @@ func (m *Model_EvaluationMetrics) Reset()         { *m = Model_EvaluationMetrics
 func (m *Model_EvaluationMetrics) String() string { return proto.CompactTextString(m) }
 func (*Model_EvaluationMetrics) ProtoMessage()    {}
 func (*Model_EvaluationMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 5}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 5}
 }
+
 func (m *Model_EvaluationMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_EvaluationMetrics.Unmarshal(m, b)
 }
 func (m *Model_EvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_EvaluationMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Model_EvaluationMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_EvaluationMetrics.Merge(dst, src)
+func (m *Model_EvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_EvaluationMetrics.Merge(m, src)
 }
 func (m *Model_EvaluationMetrics) XXX_Size() int {
 	return xxx_messageInfo_Model_EvaluationMetrics.Size(m)
@@ -1046,9 +1067,9 @@ func (m *Model_EvaluationMetrics) GetClusteringMetrics() *Model_ClusteringMetric
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Model_EvaluationMetrics) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Model_EvaluationMetrics_OneofMarshaler, _Model_EvaluationMetrics_OneofUnmarshaler, _Model_EvaluationMetrics_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Model_EvaluationMetrics) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Model_EvaluationMetrics_RegressionMetrics)(nil),
 		(*Model_EvaluationMetrics_BinaryClassificationMetrics)(nil),
 		(*Model_EvaluationMetrics_MultiClassClassificationMetrics)(nil),
@@ -1056,108 +1077,6 @@ func (*Model_EvaluationMetrics) XXX_OneofFuncs() (func(msg proto.Message, b *pro
 	}
 }
 
-func _Model_EvaluationMetrics_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Model_EvaluationMetrics)
-	// metrics
-	switch x := m.Metrics.(type) {
-	case *Model_EvaluationMetrics_RegressionMetrics:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RegressionMetrics); err != nil {
-			return err
-		}
-	case *Model_EvaluationMetrics_BinaryClassificationMetrics:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BinaryClassificationMetrics); err != nil {
-			return err
-		}
-	case *Model_EvaluationMetrics_MultiClassClassificationMetrics:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MultiClassClassificationMetrics); err != nil {
-			return err
-		}
-	case *Model_EvaluationMetrics_ClusteringMetrics:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ClusteringMetrics); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Model_EvaluationMetrics.Metrics has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Model_EvaluationMetrics_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Model_EvaluationMetrics)
-	switch tag {
-	case 1: // metrics.regression_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Model_RegressionMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &Model_EvaluationMetrics_RegressionMetrics{msg}
-		return true, err
-	case 2: // metrics.binary_classification_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Model_BinaryClassificationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &Model_EvaluationMetrics_BinaryClassificationMetrics{msg}
-		return true, err
-	case 3: // metrics.multi_class_classification_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Model_MultiClassClassificationMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &Model_EvaluationMetrics_MultiClassClassificationMetrics{msg}
-		return true, err
-	case 4: // metrics.clustering_metrics
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Model_ClusteringMetrics)
-		err := b.DecodeMessage(msg)
-		m.Metrics = &Model_EvaluationMetrics_ClusteringMetrics{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Model_EvaluationMetrics_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Model_EvaluationMetrics)
-	// metrics
-	switch x := m.Metrics.(type) {
-	case *Model_EvaluationMetrics_RegressionMetrics:
-		s := proto.Size(x.RegressionMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_EvaluationMetrics_BinaryClassificationMetrics:
-		s := proto.Size(x.BinaryClassificationMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_EvaluationMetrics_MultiClassClassificationMetrics:
-		s := proto.Size(x.MultiClassClassificationMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Model_EvaluationMetrics_ClusteringMetrics:
-		s := proto.Size(x.ClusteringMetrics)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Information about a single training query run for the model.
 type Model_TrainingRun struct {
 	// Options that were used for this training run, includes
@@ -1179,16 +1098,17 @@ func (m *Model_TrainingRun) Reset()         { *m = Model_TrainingRun{} }
 func (m *Model_TrainingRun) String() string { return proto.CompactTextString(m) }
 func (*Model_TrainingRun) ProtoMessage()    {}
 func (*Model_TrainingRun) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 6}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 6}
 }
+
 func (m *Model_TrainingRun) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_TrainingRun.Unmarshal(m, b)
 }
 func (m *Model_TrainingRun) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_TrainingRun.Marshal(b, m, deterministic)
 }
-func (dst *Model_TrainingRun) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_TrainingRun.Merge(dst, src)
+func (m *Model_TrainingRun) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_TrainingRun.Merge(m, src)
 }
 func (m *Model_TrainingRun) XXX_Size() int {
 	return xxx_messageInfo_Model_TrainingRun.Size(m)
@@ -1286,16 +1206,17 @@ func (m *Model_TrainingRun_TrainingOptions) Reset()         { *m = Model_Trainin
 func (m *Model_TrainingRun_TrainingOptions) String() string { return proto.CompactTextString(m) }
 func (*Model_TrainingRun_TrainingOptions) ProtoMessage()    {}
 func (*Model_TrainingRun_TrainingOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 6, 0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 6, 0}
 }
+
 func (m *Model_TrainingRun_TrainingOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_TrainingRun_TrainingOptions.Unmarshal(m, b)
 }
 func (m *Model_TrainingRun_TrainingOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_TrainingRun_TrainingOptions.Marshal(b, m, deterministic)
 }
-func (dst *Model_TrainingRun_TrainingOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_TrainingRun_TrainingOptions.Merge(dst, src)
+func (m *Model_TrainingRun_TrainingOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_TrainingRun_TrainingOptions.Merge(m, src)
 }
 func (m *Model_TrainingRun_TrainingOptions) XXX_Size() int {
 	return xxx_messageInfo_Model_TrainingRun_TrainingOptions.Size(m)
@@ -1448,16 +1369,17 @@ func (m *Model_TrainingRun_IterationResult) Reset()         { *m = Model_Trainin
 func (m *Model_TrainingRun_IterationResult) String() string { return proto.CompactTextString(m) }
 func (*Model_TrainingRun_IterationResult) ProtoMessage()    {}
 func (*Model_TrainingRun_IterationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 6, 1}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 6, 1}
 }
+
 func (m *Model_TrainingRun_IterationResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_TrainingRun_IterationResult.Unmarshal(m, b)
 }
 func (m *Model_TrainingRun_IterationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_TrainingRun_IterationResult.Marshal(b, m, deterministic)
 }
-func (dst *Model_TrainingRun_IterationResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_TrainingRun_IterationResult.Merge(dst, src)
+func (m *Model_TrainingRun_IterationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_TrainingRun_IterationResult.Merge(m, src)
 }
 func (m *Model_TrainingRun_IterationResult) XXX_Size() int {
 	return xxx_messageInfo_Model_TrainingRun_IterationResult.Size(m)
@@ -1532,16 +1454,17 @@ func (m *Model_TrainingRun_IterationResult_ClusterInfo) String() string {
 }
 func (*Model_TrainingRun_IterationResult_ClusterInfo) ProtoMessage() {}
 func (*Model_TrainingRun_IterationResult_ClusterInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{0, 6, 1, 0}
+	return fileDescriptor_0bf703c728e4b09a, []int{0, 6, 1, 0}
 }
+
 func (m *Model_TrainingRun_IterationResult_ClusterInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model_TrainingRun_IterationResult_ClusterInfo.Unmarshal(m, b)
 }
 func (m *Model_TrainingRun_IterationResult_ClusterInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model_TrainingRun_IterationResult_ClusterInfo.Marshal(b, m, deterministic)
 }
-func (dst *Model_TrainingRun_IterationResult_ClusterInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model_TrainingRun_IterationResult_ClusterInfo.Merge(dst, src)
+func (m *Model_TrainingRun_IterationResult_ClusterInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model_TrainingRun_IterationResult_ClusterInfo.Merge(m, src)
 }
 func (m *Model_TrainingRun_IterationResult_ClusterInfo) XXX_Size() int {
 	return xxx_messageInfo_Model_TrainingRun_IterationResult_ClusterInfo.Size(m)
@@ -1589,16 +1512,17 @@ func (m *GetModelRequest) Reset()         { *m = GetModelRequest{} }
 func (m *GetModelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetModelRequest) ProtoMessage()    {}
 func (*GetModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{1}
+	return fileDescriptor_0bf703c728e4b09a, []int{1}
 }
+
 func (m *GetModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetModelRequest.Unmarshal(m, b)
 }
 func (m *GetModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetModelRequest.Merge(dst, src)
+func (m *GetModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetModelRequest.Merge(m, src)
 }
 func (m *GetModelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetModelRequest.Size(m)
@@ -1650,16 +1574,17 @@ func (m *PatchModelRequest) Reset()         { *m = PatchModelRequest{} }
 func (m *PatchModelRequest) String() string { return proto.CompactTextString(m) }
 func (*PatchModelRequest) ProtoMessage()    {}
 func (*PatchModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{2}
+	return fileDescriptor_0bf703c728e4b09a, []int{2}
 }
+
 func (m *PatchModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PatchModelRequest.Unmarshal(m, b)
 }
 func (m *PatchModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PatchModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *PatchModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PatchModelRequest.Merge(dst, src)
+func (m *PatchModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PatchModelRequest.Merge(m, src)
 }
 func (m *PatchModelRequest) XXX_Size() int {
 	return xxx_messageInfo_PatchModelRequest.Size(m)
@@ -1714,16 +1639,17 @@ func (m *DeleteModelRequest) Reset()         { *m = DeleteModelRequest{} }
 func (m *DeleteModelRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteModelRequest) ProtoMessage()    {}
 func (*DeleteModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{3}
+	return fileDescriptor_0bf703c728e4b09a, []int{3}
 }
+
 func (m *DeleteModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteModelRequest.Unmarshal(m, b)
 }
 func (m *DeleteModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteModelRequest.Merge(dst, src)
+func (m *DeleteModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteModelRequest.Merge(m, src)
 }
 func (m *DeleteModelRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteModelRequest.Size(m)
@@ -1774,16 +1700,17 @@ func (m *ListModelsRequest) Reset()         { *m = ListModelsRequest{} }
 func (m *ListModelsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListModelsRequest) ProtoMessage()    {}
 func (*ListModelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{4}
+	return fileDescriptor_0bf703c728e4b09a, []int{4}
 }
+
 func (m *ListModelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelsRequest.Unmarshal(m, b)
 }
 func (m *ListModelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListModelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelsRequest.Merge(dst, src)
+func (m *ListModelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsRequest.Merge(m, src)
 }
 func (m *ListModelsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListModelsRequest.Size(m)
@@ -1838,16 +1765,17 @@ func (m *ListModelsResponse) Reset()         { *m = ListModelsResponse{} }
 func (m *ListModelsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListModelsResponse) ProtoMessage()    {}
 func (*ListModelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_5def960f0bdfad81, []int{5}
+	return fileDescriptor_0bf703c728e4b09a, []int{5}
 }
+
 func (m *ListModelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelsResponse.Unmarshal(m, b)
 }
 func (m *ListModelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListModelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelsResponse.Merge(dst, src)
+func (m *ListModelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsResponse.Merge(m, src)
 }
 func (m *ListModelsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListModelsResponse.Size(m)
@@ -1873,6 +1801,11 @@ func (m *ListModelsResponse) GetNextPageToken() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.bigquery.v2.Model_ModelType", Model_ModelType_name, Model_ModelType_value)
+	proto.RegisterEnum("google.cloud.bigquery.v2.Model_LossType", Model_LossType_name, Model_LossType_value)
+	proto.RegisterEnum("google.cloud.bigquery.v2.Model_DistanceType", Model_DistanceType_name, Model_DistanceType_value)
+	proto.RegisterEnum("google.cloud.bigquery.v2.Model_DataSplitMethod", Model_DataSplitMethod_name, Model_DataSplitMethod_value)
+	proto.RegisterEnum("google.cloud.bigquery.v2.Model_LearnRateStrategy", Model_LearnRateStrategy_name, Model_LearnRateStrategy_value)
 	proto.RegisterType((*Model)(nil), "google.cloud.bigquery.v2.Model")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.bigquery.v2.Model.LabelsEntry")
 	proto.RegisterType((*Model_RegressionMetrics)(nil), "google.cloud.bigquery.v2.Model.RegressionMetrics")
@@ -1895,11 +1828,173 @@ func init() {
 	proto.RegisterType((*DeleteModelRequest)(nil), "google.cloud.bigquery.v2.DeleteModelRequest")
 	proto.RegisterType((*ListModelsRequest)(nil), "google.cloud.bigquery.v2.ListModelsRequest")
 	proto.RegisterType((*ListModelsResponse)(nil), "google.cloud.bigquery.v2.ListModelsResponse")
-	proto.RegisterEnum("google.cloud.bigquery.v2.Model_ModelType", Model_ModelType_name, Model_ModelType_value)
-	proto.RegisterEnum("google.cloud.bigquery.v2.Model_LossType", Model_LossType_name, Model_LossType_value)
-	proto.RegisterEnum("google.cloud.bigquery.v2.Model_DistanceType", Model_DistanceType_name, Model_DistanceType_value)
-	proto.RegisterEnum("google.cloud.bigquery.v2.Model_DataSplitMethod", Model_DataSplitMethod_name, Model_DataSplitMethod_value)
-	proto.RegisterEnum("google.cloud.bigquery.v2.Model_LearnRateStrategy", Model_LearnRateStrategy_name, Model_LearnRateStrategy_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/bigquery/v2/model.proto", fileDescriptor_0bf703c728e4b09a)
+}
+
+var fileDescriptor_0bf703c728e4b09a = []byte{
+	// 2541 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xdd, 0x73, 0x23, 0x47,
+	0x11, 0xb7, 0x2c, 0x7f, 0xa9, 0x65, 0x5b, 0xd2, 0xf8, 0x7c, 0xe8, 0x74, 0x77, 0x39, 0x47, 0xe1,
+	0xc3, 0x24, 0x57, 0x72, 0x9d, 0x93, 0x90, 0x5c, 0x02, 0x01, 0x59, 0x52, 0xce, 0x02, 0x59, 0xf2,
+	0xed, 0xca, 0x09, 0x01, 0xaa, 0x96, 0xf1, 0xee, 0x48, 0x37, 0xc9, 0x7e, 0xe8, 0x66, 0x66, 0xcf,
+	0xf6, 0xbd, 0x01, 0x2f, 0x29, 0xaa, 0xe0, 0x81, 0x27, 0x78, 0xe6, 0x0f, 0xa0, 0x28, 0x2a, 0xef,
+	0x54, 0xf1, 0x37, 0xf0, 0x8f, 0x50, 0xc5, 0x13, 0x2f, 0xd4, 0xcc, 0xce, 0xea, 0xd3, 0xb6, 0xf6,
+	0xb8, 0xab, 0x14, 0x2f, 0xf6, 0x4e, 0x4f, 0xf7, 0x6f, 0xba, 0x7b, 0xba, 0x7b, 0x7a, 0x46, 0xf0,
+	0xcd, 0x7e, 0x10, 0xf4, 0x5d, 0xb2, 0x67, 0xbb, 0x41, 0xe8, 0xec, 0x9d, 0xd2, 0xfe, 0xd3, 0x90,
+	0xb0, 0x8b, 0xbd, 0x67, 0xfb, 0x7b, 0x5e, 0xe0, 0x10, 0xb7, 0x32, 0x60, 0x81, 0x08, 0x50, 0x31,
+	0xe2, 0xaa, 0x28, 0xae, 0x4a, 0xcc, 0x55, 0x79, 0xb6, 0x5f, 0xaa, 0x5c, 0x2f, 0x6f, 0x31, 0xd2,
+	0x23, 0x8c, 0xf8, 0x36, 0x89, 0x90, 0x4a, 0x6f, 0x5d, 0xc9, 0xcf, 0x05, 0xf6, 0x1d, 0xcc, 0x1c,
+	0x8b, 0x3f, 0xd5, 0xcb, 0x96, 0x6e, 0x6b, 0x66, 0x35, 0x3a, 0x0d, 0x7b, 0x7b, 0xc4, 0x1b, 0x88,
+	0x0b, 0x3d, 0x79, 0x6f, 0x7a, 0x52, 0x50, 0x8f, 0x70, 0x81, 0xbd, 0x81, 0x66, 0x78, 0x6d, 0x9a,
+	0xe1, 0x8c, 0xe1, 0xc1, 0x80, 0x30, 0xae, 0xe7, 0xef, 0xe8, 0x79, 0x3c, 0xa0, 0x7b, 0xd8, 0xf7,
+	0x03, 0x81, 0x05, 0x0d, 0x7c, 0x3d, 0x5b, 0xfe, 0xe3, 0xdb, 0xb0, 0x7c, 0x24, 0x4d, 0x40, 0x08,
+	0x96, 0x88, 0xc0, 0xfd, 0x62, 0x6a, 0x27, 0xb5, 0x9b, 0x31, 0xd4, 0x37, 0x7a, 0x0c, 0xb9, 0x29,
+	0xfb, 0x8a, 0x8b, 0x3b, 0xa9, 0xdd, 0xec, 0xfe, 0x6e, 0xe5, 0x2a, 0x57, 0x55, 0x14, 0x9a, 0x11,
+	0xf3, 0x1b, 0x9b, 0xde, 0xc4, 0x18, 0xbd, 0x01, 0x1b, 0x36, 0x23, 0x4a, 0x07, 0x4b, 0x9a, 0x52,
+	0x5c, 0xde, 0x49, 0xed, 0xa6, 0x8d, 0xf5, 0x98, 0xd8, 0xa5, 0x1e, 0x41, 0xf7, 0x01, 0xb9, 0x98,
+	0x0b, 0xcb, 0x0b, 0x1c, 0xda, 0xa3, 0xc4, 0x89, 0x38, 0x57, 0x14, 0x67, 0x5e, 0xce, 0x1c, 0xe9,
+	0x09, 0xc5, 0xbd, 0x03, 0x59, 0x87, 0x70, 0x9b, 0xd1, 0x81, 0x04, 0x28, 0xae, 0x2b, 0x03, 0xc6,
+	0x49, 0x72, 0xd1, 0x1e, 0xa3, 0xc4, 0x77, 0xdc, 0x0b, 0xcb, 0xc7, 0x1e, 0x29, 0x6e, 0x2a, 0x9e,
+	0xf5, 0x98, 0xd8, 0xc6, 0x1e, 0x41, 0x35, 0x58, 0x71, 0xf1, 0x29, 0x71, 0x79, 0x31, 0xb7, 0x93,
+	0xde, 0xcd, 0xee, 0xbf, 0x35, 0xc7, 0xc6, 0x4a, 0x4b, 0x71, 0x37, 0x7c, 0xc1, 0x2e, 0x0c, 0x2d,
+	0x8a, 0xbe, 0x03, 0x39, 0x72, 0x3e, 0xa0, 0x6c, 0xcc, 0xc0, 0xbc, 0x52, 0x7b, 0x73, 0x44, 0x56,
+	0x4a, 0x97, 0x60, 0xcd, 0x0d, 0x6c, 0x35, 0x2e, 0x6e, 0x28, 0x6d, 0x86, 0x63, 0x74, 0x08, 0x10,
+	0xb9, 0x5d, 0x5c, 0x0c, 0x48, 0x71, 0x75, 0x27, 0xb5, 0xbb, 0xb9, 0xff, 0xdd, 0x79, 0xda, 0xa8,
+	0xbf, 0xdd, 0x8b, 0x01, 0x31, 0x32, 0x5e, 0xfc, 0x89, 0x8e, 0x61, 0x43, 0x30, 0x4c, 0x7d, 0xea,
+	0xf7, 0x2d, 0x16, 0xfa, 0xbc, 0x98, 0x49, 0x66, 0x5a, 0x57, 0x0b, 0x19, 0xa1, 0x6f, 0xac, 0x8b,
+	0xd1, 0x80, 0x23, 0x13, 0x72, 0x3d, 0x82, 0x45, 0xc8, 0x88, 0x65, 0x07, 0x6e, 0xe8, 0xf9, 0xbc,
+	0x08, 0x0a, 0xf3, 0xcd, 0xab, 0x31, 0x4d, 0x1d, 0xf3, 0xe6, 0x53, 0xf7, 0x63, 0x4a, 0x5c, 0xc7,
+	0xd8, 0xd4, 0x10, 0xb5, 0x08, 0x01, 0x75, 0x60, 0x43, 0xf9, 0x6f, 0x08, 0x99, 0x7d, 0x61, 0xc8,
+	0x75, 0x05, 0xa0, 0x01, 0x4b, 0xbf, 0x4b, 0x43, 0xc1, 0x20, 0x7d, 0x46, 0x38, 0xa7, 0x81, 0x7f,
+	0x44, 0x04, 0xa3, 0x36, 0x47, 0x2d, 0xd8, 0xf2, 0x08, 0xf6, 0x2d, 0x7c, 0xca, 0x03, 0x37, 0x14,
+	0xc4, 0x22, 0x8c, 0x05, 0x4c, 0x45, 0x7c, 0x76, 0xff, 0x4e, 0xbc, 0x58, 0x9c, 0x48, 0x95, 0x7a,
+	0x10, 0x9e, 0xba, 0xe4, 0x13, 0xec, 0x86, 0xc4, 0x28, 0x48, 0xc1, 0xaa, 0x96, 0x6b, 0x48, 0x31,
+	0xf4, 0x63, 0x40, 0x0a, 0x8d, 0x3f, 0x0d, 0x31, 0x23, 0x8e, 0x06, 0x5b, 0x4c, 0x00, 0x96, 0x97,
+	0x72, 0x66, 0x24, 0x16, 0x61, 0x3d, 0x86, 0x9b, 0x13, 0x58, 0x6e, 0xd0, 0xd7, 0x78, 0xe9, 0x04,
+	0x78, 0x5b, 0x63, 0x78, 0xad, 0xa0, 0x1f, 0x41, 0x1e, 0xc3, 0xb6, 0x47, 0x1c, 0x3a, 0x6b, 0xee,
+	0x52, 0x32, 0x44, 0x29, 0x3a, 0x69, 0xf0, 0x43, 0xc8, 0xb0, 0x58, 0x43, 0x95, 0xb6, 0xf3, 0x50,
+	0xd6, 0x98, 0x56, 0xaa, 0xf4, 0xd7, 0x34, 0xbc, 0x56, 0xed, 0xf7, 0x19, 0xe9, 0x63, 0x41, 0x6a,
+	0x2e, 0xe6, 0x9c, 0xf6, 0x68, 0x14, 0xed, 0xf1, 0xe6, 0x7c, 0x00, 0x99, 0x01, 0x23, 0x36, 0x95,
+	0x1b, 0x96, 0x68, 0x4b, 0x46, 0xec, 0xe8, 0x1d, 0x58, 0x61, 0xc4, 0xc6, 0xae, 0x9b, 0xc8, 0xfd,
+	0x9a, 0x17, 0xbd, 0x0f, 0x6b, 0xd8, 0xb6, 0x43, 0x86, 0xed, 0x8b, 0x44, 0x6e, 0x1e, 0x72, 0x4b,
+	0x5d, 0xc5, 0x13, 0x46, 0xf8, 0x93, 0xc0, 0x75, 0x12, 0xf9, 0x73, 0xc4, 0x8e, 0xde, 0x83, 0xb5,
+	0xde, 0x03, 0x8b, 0xdb, 0x01, 0x23, 0x89, 0x9c, 0xb8, 0xda, 0x7b, 0x60, 0x4a, 0x66, 0x29, 0x28,
+	0xc3, 0xc2, 0x0d, 0x38, 0x57, 0xa5, 0x70, 0xae, 0xa0, 0x1b, 0xf4, 0x5b, 0x01, 0xe7, 0xe8, 0x5d,
+	0x58, 0x65, 0x81, 0x6d, 0xe1, 0xd0, 0x56, 0xb5, 0x64, 0xbe, 0x7b, 0x02, 0xbb, 0x1a, 0xda, 0xa5,
+	0xaf, 0x56, 0xe0, 0xf6, 0x01, 0xf5, 0x31, 0xbb, 0xb8, 0x7c, 0xc3, 0xbe, 0x4c, 0xc1, 0x0e, 0x8e,
+	0xf7, 0xd4, 0xb2, 0x27, 0x78, 0x2c, 0x2f, 0x62, 0xd2, 0x1b, 0xf9, 0xd1, 0xbc, 0x7a, 0x73, 0x7d,
+	0x6c, 0x18, 0xaf, 0xe1, 0xeb, 0x63, 0xe7, 0x0f, 0x29, 0xb8, 0x73, 0xaa, 0x54, 0xb5, 0xec, 0xc0,
+	0xef, 0x85, 0x5c, 0xa9, 0x80, 0x05, 0xa3, 0xe7, 0x96, 0x4b, 0xb9, 0x28, 0x2e, 0xaa, 0x7a, 0xf2,
+	0x78, 0x9e, 0x1a, 0xd7, 0x98, 0x1b, 0xcf, 0xc5, 0xf0, 0x47, 0x0a, 0xdd, 0xb8, 0x75, 0x7a, 0x19,
+	0xb9, 0x45, 0xb9, 0x28, 0xfd, 0x3b, 0x0d, 0xdb, 0x97, 0x0a, 0xa1, 0x4f, 0xa0, 0x38, 0x08, 0x38,
+	0x15, 0xf4, 0x99, 0xf6, 0x9b, 0x35, 0x8a, 0xa6, 0x24, 0x91, 0x7f, 0x33, 0x96, 0x56, 0x9a, 0x76,
+	0x87, 0xa1, 0x75, 0x00, 0x9b, 0x82, 0x85, 0xc4, 0x8a, 0xa7, 0xb9, 0x4e, 0x87, 0xdb, 0x33, 0x68,
+	0x4d, 0x5f, 0x7c, 0xef, 0x9d, 0x08, 0x6c, 0x43, 0x8a, 0x1c, 0xc7, 0x12, 0xa8, 0x0e, 0xb9, 0x1e,
+	0x76, 0xf9, 0x38, 0x48, 0x7a, 0x3e, 0xc8, 0xa6, 0x92, 0x19, 0xa1, 0xc4, 0x9a, 0xf8, 0x72, 0xd3,
+	0x14, 0xc8, 0x52, 0x42, 0x4d, 0xda, 0xb1, 0xc4, 0x48, 0x93, 0x11, 0xc8, 0x72, 0x52, 0x4d, 0x46,
+	0x28, 0x13, 0x65, 0x65, 0xe5, 0x7f, 0x2d, 0x2b, 0xab, 0xc9, 0xcb, 0x4a, 0xe9, 0xb7, 0x2b, 0x70,
+	0xef, 0x28, 0x74, 0x05, 0x55, 0xbb, 0xf3, 0x7f, 0x9f, 0x3b, 0xbf, 0x49, 0xc1, 0xf6, 0x75, 0x49,
+	0xd3, 0x99, 0xdb, 0x78, 0x5c, 0x6f, 0x6b, 0x65, 0x3a, 0x65, 0xb6, 0xec, 0x4b, 0x92, 0xe5, 0x9f,
+	0x69, 0xc8, 0x4d, 0xa7, 0x49, 0x07, 0x6e, 0x48, 0x56, 0xea, 0xc8, 0xc6, 0xf1, 0x05, 0x53, 0x64,
+	0x6b, 0x24, 0x39, 0xca, 0x8f, 0x3e, 0x2c, 0xb1, 0xe0, 0x8c, 0x6b, 0xc3, 0xcc, 0x57, 0x6c, 0x58,
+	0xc5, 0x08, 0xce, 0x0c, 0xb5, 0x40, 0xc9, 0x85, 0x65, 0xd5, 0x16, 0xca, 0x76, 0x70, 0xc0, 0x88,
+	0x43, 0x6d, 0x21, 0x0f, 0x75, 0xd9, 0xa1, 0xe8, 0xfe, 0x7a, 0x73, 0x48, 0x56, 0x5d, 0x24, 0xfa,
+	0x00, 0x80, 0x0a, 0xe2, 0x59, 0x76, 0x10, 0xfa, 0x22, 0x49, 0xda, 0x66, 0x24, 0x7b, 0x4d, 0x72,
+	0x97, 0xfe, 0x94, 0x82, 0xb4, 0x11, 0x9c, 0xa1, 0xd7, 0x61, 0x1d, 0xdb, 0x22, 0xc4, 0xee, 0xc4,
+	0x4a, 0xd9, 0x88, 0x16, 0x2d, 0x13, 0xc0, 0x2a, 0xf1, 0x05, 0xa3, 0x24, 0x76, 0xc2, 0xc9, 0xab,
+	0x76, 0x42, 0xd4, 0x0e, 0xc7, 0xab, 0x94, 0xbe, 0x4a, 0x41, 0xa1, 0xe6, 0x86, 0x5c, 0x10, 0x46,
+	0xfd, 0x7e, 0x1c, 0x73, 0x6d, 0xb8, 0xe1, 0xe0, 0x67, 0x94, 0x70, 0xeb, 0x34, 0x08, 0x5d, 0x87,
+	0xfa, 0x16, 0xf5, 0x1d, 0x72, 0x9e, 0x68, 0x67, 0x51, 0x24, 0x79, 0x10, 0x09, 0x36, 0xa5, 0x5c,
+	0xd4, 0xeb, 0x8c, 0xb5, 0x4f, 0x0e, 0x95, 0xd7, 0xac, 0xe1, 0x6d, 0x25, 0x79, 0xf7, 0x54, 0xd7,
+	0x82, 0xa5, 0xff, 0xa4, 0xa1, 0xd0, 0x78, 0x86, 0xdd, 0x70, 0x22, 0x57, 0x4e, 0x01, 0xb1, 0x61,
+	0x57, 0x39, 0x95, 0xa7, 0x0f, 0xe6, 0x79, 0x72, 0xa6, 0x1f, 0x3d, 0x5c, 0x30, 0x0a, 0x6c, 0xa6,
+	0x49, 0xfd, 0x55, 0x0a, 0xee, 0xc6, 0x67, 0xd9, 0xe5, 0x75, 0x21, 0x32, 0xea, 0xc3, 0x97, 0x38,
+	0xcc, 0x0e, 0x17, 0x8c, 0xdb, 0xa7, 0xd7, 0x1c, 0xed, 0xbf, 0x4f, 0x41, 0xd9, 0x93, 0x1b, 0xaf,
+	0x8f, 0xa7, 0x2b, 0x14, 0x89, 0x0e, 0x86, 0x1f, 0xbe, 0x64, 0x08, 0x1d, 0x2e, 0x18, 0xf7, 0xbc,
+	0x39, 0xf5, 0xf2, 0x14, 0x90, 0x3d, 0x8c, 0xa2, 0xe1, 0xfa, 0x4b, 0xc9, 0x1c, 0x3f, 0x13, 0x7f,
+	0xd2, 0xf1, 0xf6, 0x34, 0xf1, 0x20, 0x03, 0xab, 0x1a, 0xb8, 0xf4, 0xaf, 0x3c, 0x64, 0xc7, 0xae,
+	0x40, 0xa8, 0x07, 0xf9, 0xe1, 0x35, 0x2a, 0x50, 0x57, 0xca, 0x78, 0xd7, 0x3f, 0x7c, 0x81, 0x9b,
+	0xd4, 0xf0, 0xbb, 0x13, 0x41, 0x18, 0x39, 0x31, 0x49, 0x40, 0x0f, 0x01, 0xb8, 0xc0, 0x4c, 0x44,
+	0x17, 0xc7, 0x35, 0xb5, 0x42, 0x69, 0x26, 0x78, 0xbb, 0xf1, 0x0b, 0x80, 0x91, 0x51, 0xdc, 0xea,
+	0x3e, 0x79, 0x02, 0xab, 0x8c, 0xf0, 0xd0, 0x15, 0xb2, 0x39, 0x4c, 0xbf, 0xa8, 0x66, 0x4d, 0x41,
+	0xa2, 0xbb, 0xa9, 0xa1, 0x30, 0x8c, 0x18, 0x0b, 0xfd, 0x12, 0x10, 0x19, 0xa6, 0xc1, 0xd0, 0xf1,
+	0xab, 0xc9, 0x1c, 0x3f, 0x93, 0x40, 0x46, 0x81, 0x4c, 0x93, 0x4a, 0x7f, 0xcf, 0x40, 0x6e, 0xca,
+	0x31, 0xe8, 0x5b, 0xb0, 0xe9, 0xe1, 0x73, 0x8b, 0xc6, 0x5a, 0x45, 0xde, 0x4e, 0x1b, 0x1b, 0x1e,
+	0x3e, 0x1f, 0xaa, 0xca, 0x51, 0x03, 0x32, 0xb2, 0x1b, 0x8e, 0xae, 0xc9, 0x8b, 0xea, 0x9a, 0xbc,
+	0x3b, 0xf7, 0xd2, 0x1e, 0x70, 0xae, 0x6e, 0xc9, 0x6b, 0xae, 0xfe, 0x42, 0x77, 0x01, 0x5c, 0x82,
+	0x99, 0x6f, 0x31, 0x2c, 0x88, 0x0a, 0xea, 0x94, 0x91, 0x51, 0x14, 0x03, 0x0b, 0x82, 0x9a, 0x50,
+	0x70, 0x1f, 0x58, 0x8c, 0xf4, 0x43, 0x17, 0x33, 0xfa, 0x3c, 0xba, 0xb2, 0x27, 0x69, 0xfa, 0xf3,
+	0xee, 0x03, 0x63, 0x42, 0x4a, 0x41, 0xed, 0x4f, 0x43, 0x2d, 0x27, 0x82, 0xda, 0x9f, 0x82, 0x92,
+	0x25, 0x8f, 0xfa, 0x16, 0x23, 0xae, 0x6a, 0x74, 0xac, 0x01, 0x0b, 0x54, 0x25, 0x49, 0xd4, 0xe3,
+	0x6c, 0x79, 0xd4, 0x37, 0xb4, 0xe4, 0xb1, 0x16, 0x94, 0xc1, 0x77, 0x86, 0x99, 0x67, 0xa9, 0x98,
+	0xd2, 0x5b, 0x3c, 0x1b, 0x7c, 0x07, 0x41, 0xe0, 0xea, 0x13, 0x48, 0x72, 0x9b, 0x92, 0x59, 0x8a,
+	0x12, 0xcc, 0xdc, 0x0b, 0x8b, 0x8b, 0x60, 0x70, 0x65, 0xdc, 0x8e, 0x89, 0x2a, 0x6e, 0x53, 0x04,
+	0x03, 0x54, 0x81, 0x2d, 0xea, 0x0f, 0x42, 0x61, 0x4d, 0x3e, 0x00, 0x64, 0x76, 0xd2, 0xbb, 0x19,
+	0xa3, 0xa0, 0xa6, 0x5a, 0x63, 0x37, 0x7b, 0xf4, 0x73, 0x28, 0x38, 0x58, 0x60, 0x8b, 0x0f, 0x5c,
+	0x2a, 0x64, 0x40, 0x3e, 0x09, 0x9c, 0x22, 0xa8, 0xbd, 0xdf, 0x9b, 0xb7, 0xf7, 0x75, 0x2c, 0xb0,
+	0x29, 0xe5, 0x8e, 0x94, 0x98, 0x91, 0x73, 0x26, 0x09, 0xe8, 0x3d, 0x28, 0x8e, 0x81, 0xcb, 0x58,
+	0xb5, 0x7a, 0x0c, 0xdb, 0x6a, 0x9b, 0xb2, 0x2a, 0x2e, 0xb6, 0x87, 0x22, 0x32, 0xb8, 0x3f, 0xd6,
+	0x93, 0xe8, 0xcd, 0x09, 0xad, 0x22, 0x23, 0xf4, 0x43, 0xd4, 0x68, 0x91, 0xc8, 0x04, 0x84, 0x61,
+	0x6b, 0x14, 0x6e, 0x16, 0x17, 0xf2, 0x5f, 0xff, 0x42, 0x3d, 0x02, 0x6d, 0xce, 0xcf, 0xa9, 0x56,
+	0x1c, 0x97, 0xa6, 0x16, 0x34, 0x0a, 0xee, 0x34, 0x09, 0xdd, 0x07, 0x44, 0x7d, 0x2a, 0xa8, 0x6c,
+	0x05, 0x46, 0x91, 0x9d, 0x57, 0x16, 0xe4, 0xf5, 0xcc, 0x10, 0x08, 0xfd, 0x3a, 0x05, 0x5b, 0xda,
+	0xfb, 0xaa, 0xda, 0x9f, 0x11, 0xda, 0x7f, 0x22, 0x78, 0xb1, 0xa0, 0xea, 0x88, 0xf1, 0x12, 0x15,
+	0x2e, 0x7a, 0x22, 0x53, 0x25, 0xfd, 0xd3, 0x08, 0x34, 0x6a, 0x0f, 0x0a, 0xee, 0x34, 0x1d, 0x3d,
+	0x86, 0x8d, 0xf8, 0xd4, 0x8e, 0xf2, 0xf9, 0x86, 0xf2, 0xc7, 0xfd, 0xb9, 0x7b, 0xaa, 0x85, 0x54,
+	0x4e, 0xaf, 0x3b, 0x63, 0x23, 0xd9, 0x0f, 0xf9, 0xa1, 0x67, 0xe9, 0x4a, 0xcf, 0x8b, 0xdb, 0xaa,
+	0x86, 0x64, 0xfd, 0xd0, 0xd3, 0x27, 0x02, 0x2f, 0xd5, 0xe1, 0xe6, 0xe5, 0x2a, 0xa2, 0x3c, 0xa4,
+	0xbf, 0x20, 0x17, 0xba, 0x87, 0x92, 0x9f, 0xe8, 0x06, 0x2c, 0xcb, 0xe2, 0x15, 0x55, 0x9a, 0x94,
+	0x11, 0x0d, 0x3e, 0x58, 0x7c, 0x3f, 0x55, 0xfa, 0xc7, 0x12, 0xe4, 0xa6, 0x2a, 0x28, 0x7a, 0x00,
+	0xcb, 0xe3, 0x3d, 0xcd, 0xa5, 0xbd, 0xdc, 0xdb, 0xfb, 0x51, 0x3a, 0x44, 0x9c, 0xe8, 0xfb, 0x90,
+	0x75, 0x42, 0xfd, 0x72, 0xe8, 0x25, 0xba, 0x31, 0x41, 0xcc, 0x7f, 0xc4, 0x51, 0x75, 0xec, 0xa9,
+	0x4f, 0xbd, 0x11, 0x24, 0xa9, 0x2b, 0xc3, 0xb7, 0x3d, 0xf5, 0x50, 0xf0, 0x10, 0x32, 0x2a, 0xe6,
+	0x13, 0x3f, 0x31, 0xac, 0x49, 0x76, 0x25, 0x3a, 0x59, 0x43, 0x57, 0xa7, 0x6b, 0xa8, 0x0b, 0x1b,
+	0x7a, 0x1b, 0x2c, 0xea, 0xf7, 0x02, 0x5e, 0x5c, 0x53, 0xb1, 0xf5, 0xe8, 0x25, 0xce, 0xa8, 0xf8,
+	0x58, 0x6f, 0xfa, 0xbd, 0xc0, 0x58, 0xb7, 0x47, 0x03, 0x5e, 0xfa, 0x5b, 0x0a, 0xb2, 0x63, 0xb3,
+	0xe8, 0x1e, 0x64, 0x6d, 0xd9, 0x90, 0x06, 0xd4, 0xb1, 0xa8, 0xa3, 0xcf, 0x12, 0x88, 0x49, 0x4d,
+	0x07, 0xd5, 0x60, 0x33, 0x56, 0x8f, 0x61, 0x87, 0x86, 0x3c, 0x51, 0xe3, 0x18, 0x9b, 0x64, 0x28,
+	0x11, 0xf4, 0x11, 0xc4, 0x5a, 0x58, 0x9c, 0x3e, 0x27, 0x49, 0xae, 0xcd, 0x59, 0x2d, 0x60, 0xd2,
+	0xe7, 0xa4, 0xf4, 0x10, 0xb2, 0x63, 0x2f, 0xca, 0xf3, 0x02, 0x30, 0x33, 0x16, 0x80, 0x65, 0x1b,
+	0x32, 0xc3, 0xe7, 0x5f, 0x54, 0x82, 0x9b, 0x47, 0x9d, 0x7a, 0xa3, 0x65, 0x75, 0x3f, 0x3b, 0x6e,
+	0x58, 0x27, 0x6d, 0xf3, 0xb8, 0x51, 0x6b, 0x7e, 0xdc, 0x6c, 0xd4, 0xf3, 0x0b, 0x68, 0x1b, 0x0a,
+	0xad, 0x66, 0xbb, 0x51, 0x35, 0x2c, 0xa3, 0xf1, 0xc8, 0x68, 0x98, 0x66, 0xb3, 0xd3, 0xce, 0xa7,
+	0xd0, 0x37, 0x60, 0xab, 0xd5, 0x79, 0xd4, 0x34, 0xbb, 0xcd, 0xda, 0xf8, 0xc4, 0x22, 0x02, 0x58,
+	0xf9, 0xc9, 0x51, 0xa3, 0xda, 0x36, 0xf3, 0xe9, 0x72, 0x07, 0xd6, 0xe2, 0xc3, 0x13, 0xdd, 0x82,
+	0xed, 0x56, 0xc7, 0x34, 0xaf, 0x58, 0x42, 0x4a, 0x58, 0xe6, 0xe3, 0x93, 0xaa, 0xd1, 0xa8, 0x5b,
+	0x92, 0x2f, 0x9f, 0x42, 0x05, 0xd8, 0x50, 0xe4, 0x56, 0xe7, 0x51, 0x44, 0x5a, 0x2c, 0x1f, 0xc2,
+	0xfa, 0x78, 0xf6, 0xa2, 0xbb, 0x70, 0xab, 0xde, 0x34, 0xbb, 0xd5, 0x76, 0xad, 0x71, 0x19, 0xf0,
+	0x06, 0x64, 0x1a, 0x27, 0xb5, 0x56, 0xb3, 0xde, 0xa8, 0x4a, 0x9d, 0x01, 0x56, 0x6a, 0x1d, 0xb3,
+	0xd9, 0x6e, 0xe4, 0x17, 0xcb, 0xcf, 0x21, 0x37, 0x55, 0xdb, 0xd1, 0xeb, 0x70, 0xb7, 0x5e, 0xed,
+	0x56, 0x2d, 0xf3, 0xb8, 0xd5, 0xec, 0x5a, 0x47, 0x8d, 0xee, 0x61, 0xa7, 0x3e, 0x05, 0x08, 0xb0,
+	0x62, 0x54, 0xdb, 0xf5, 0xce, 0x91, 0x46, 0x3b, 0x31, 0xbb, 0x9d, 0xa3, 0xfc, 0x22, 0xda, 0x04,
+	0x30, 0x1b, 0x8f, 0x4f, 0x1a, 0xed, 0x6e, 0xb3, 0xda, 0xca, 0xa7, 0xd1, 0x3a, 0xac, 0xb5, 0x3b,
+	0x11, 0x50, 0x7e, 0x49, 0xce, 0x56, 0x4f, 0xba, 0xf1, 0x78, 0xb9, 0xfc, 0x29, 0x14, 0x66, 0x6a,
+	0x32, 0x7a, 0x03, 0xee, 0xb5, 0x1a, 0x55, 0xa3, 0x6d, 0x19, 0xd5, 0x6e, 0xc3, 0x32, 0xbb, 0xf2,
+	0xdf, 0xa3, 0xcf, 0xa6, 0xd6, 0xcf, 0x41, 0x56, 0x6e, 0x86, 0x65, 0x36, 0xaa, 0x46, 0xed, 0x30,
+	0x9f, 0x92, 0x0b, 0xd5, 0x3a, 0x6d, 0xe9, 0x81, 0x6e, 0x7e, 0xb1, 0xfc, 0x39, 0xe4, 0x1e, 0x11,
+	0xa1, 0x7f, 0x4e, 0x79, 0x1a, 0x12, 0x2e, 0x64, 0x96, 0x0d, 0x58, 0xf0, 0x39, 0xb1, 0x45, 0x1c,
+	0xc7, 0x19, 0x23, 0xa3, 0x29, 0x4d, 0x47, 0x4e, 0xcb, 0xc3, 0x86, 0x13, 0x35, 0x1d, 0x45, 0x49,
+	0x46, 0x53, 0x9a, 0x0e, 0xba, 0x05, 0x6b, 0xd1, 0xcf, 0x0a, 0xd4, 0x51, 0xc1, 0x99, 0x31, 0x56,
+	0xd5, 0xb8, 0xe9, 0x94, 0xff, 0x9c, 0x82, 0xc2, 0x31, 0x16, 0xf6, 0x93, 0xaf, 0x65, 0x39, 0xf4,
+	0x2e, 0x2c, 0xab, 0x4f, 0x5d, 0xe3, 0xee, 0xcd, 0xfb, 0x35, 0x29, 0xe2, 0x2e, 0x7b, 0x80, 0xea,
+	0xc4, 0x25, 0x82, 0x7c, 0x3d, 0x4e, 0xf9, 0x4b, 0x0a, 0x0a, 0x2d, 0xca, 0xa3, 0x2d, 0xe0, 0xaf,
+	0x66, 0xb9, 0x1f, 0x40, 0x56, 0x76, 0xb6, 0x71, 0xab, 0x7e, 0xd5, 0xb3, 0xf3, 0xc9, 0xd8, 0xe9,
+	0x00, 0x1e, 0x3e, 0x37, 0x74, 0x3b, 0x2e, 0x17, 0xc7, 0x7d, 0x62, 0x89, 0xe0, 0x0b, 0x12, 0x35,
+	0xa1, 0x72, 0x71, 0xdc, 0x27, 0x5d, 0x49, 0x28, 0x87, 0x80, 0xc6, 0x15, 0xe6, 0x83, 0xc0, 0xe7,
+	0x04, 0xbd, 0x07, 0x2b, 0xca, 0x24, 0xd9, 0x45, 0xa7, 0x93, 0xb8, 0x5b, 0xb3, 0xa3, 0x6f, 0x43,
+	0xce, 0x27, 0xe7, 0xc2, 0x1a, 0x5b, 0x32, 0x32, 0x68, 0x43, 0x92, 0x8f, 0xe3, 0x65, 0xf7, 0xbf,
+	0x4c, 0xc3, 0xba, 0x92, 0x34, 0x09, 0x7b, 0x46, 0x6d, 0x82, 0x7e, 0x0a, 0x6b, 0x71, 0xe8, 0xa2,
+	0x6b, 0x7e, 0xb8, 0x9a, 0x0a, 0xef, 0xd2, 0x3c, 0xc5, 0xca, 0x0b, 0x88, 0x02, 0x8c, 0x2c, 0x44,
+	0xd7, 0xfc, 0x8e, 0x35, 0xb3, 0x71, 0xa5, 0xfb, 0xc9, 0x98, 0x23, 0xa7, 0x95, 0x17, 0xd0, 0x2f,
+	0x00, 0x46, 0x29, 0x71, 0xdd, 0x52, 0x33, 0x89, 0x93, 0xc4, 0x90, 0x13, 0xc8, 0x8e, 0xc5, 0x32,
+	0xba, 0x46, 0xb9, 0xd9, 0x90, 0x2f, 0xdd, 0x9c, 0x09, 0x98, 0x86, 0x37, 0x10, 0x17, 0xe5, 0x85,
+	0x03, 0x17, 0xee, 0xd8, 0x81, 0x77, 0x25, 0xd8, 0x01, 0x28, 0x9c, 0x63, 0x29, 0xf6, 0xb3, 0x1f,
+	0x69, 0xae, 0x7e, 0xe0, 0x62, 0xbf, 0x5f, 0x09, 0x58, 0x7f, 0xaf, 0x4f, 0x7c, 0x05, 0xb9, 0x17,
+	0x4d, 0xe1, 0x01, 0xe5, 0xb3, 0xbf, 0x61, 0x7f, 0x18, 0x7f, 0x9f, 0xae, 0x28, 0xe6, 0xb7, 0xff,
+	0x1b, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x46, 0x69, 0xef, 0x5f, 0x1f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2082,170 +2177,3 @@ var _ModelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/bigquery/v2/model.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/bigquery/v2/model.proto", fileDescriptor_model_5def960f0bdfad81)
-}
-
-var fileDescriptor_model_5def960f0bdfad81 = []byte{
-	// 2541 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xdd, 0x73, 0x23, 0x47,
-	0x11, 0xb7, 0x2c, 0x7f, 0xa9, 0x65, 0x5b, 0xd2, 0xf8, 0x7c, 0xe8, 0x74, 0x77, 0x39, 0x47, 0xe1,
-	0xc3, 0x24, 0x57, 0x72, 0x9d, 0x93, 0x90, 0x5c, 0x02, 0x01, 0x59, 0x52, 0xce, 0x02, 0x59, 0xf2,
-	0xed, 0xca, 0x09, 0x01, 0xaa, 0x96, 0xf1, 0xee, 0x48, 0x37, 0xc9, 0x7e, 0xe8, 0x66, 0x66, 0xcf,
-	0xf6, 0xbd, 0x01, 0x2f, 0x29, 0xaa, 0xe0, 0x81, 0x27, 0x78, 0xe6, 0x0f, 0xa0, 0x28, 0x2a, 0xef,
-	0x54, 0xf1, 0x37, 0xf0, 0x8f, 0x50, 0xc5, 0x13, 0x2f, 0xd4, 0xcc, 0xce, 0xea, 0xd3, 0xb6, 0xf6,
-	0xb8, 0xab, 0x14, 0x2f, 0xf6, 0x4e, 0x4f, 0xf7, 0x6f, 0xba, 0x7b, 0xba, 0x7b, 0x7a, 0x46, 0xf0,
-	0xcd, 0x7e, 0x10, 0xf4, 0x5d, 0xb2, 0x67, 0xbb, 0x41, 0xe8, 0xec, 0x9d, 0xd2, 0xfe, 0xd3, 0x90,
-	0xb0, 0x8b, 0xbd, 0x67, 0xfb, 0x7b, 0x5e, 0xe0, 0x10, 0xb7, 0x32, 0x60, 0x81, 0x08, 0x50, 0x31,
-	0xe2, 0xaa, 0x28, 0xae, 0x4a, 0xcc, 0x55, 0x79, 0xb6, 0x5f, 0xaa, 0x5c, 0x2f, 0x6f, 0x31, 0xd2,
-	0x23, 0x8c, 0xf8, 0x36, 0x89, 0x90, 0x4a, 0x6f, 0x5d, 0xc9, 0xcf, 0x05, 0xf6, 0x1d, 0xcc, 0x1c,
-	0x8b, 0x3f, 0xd5, 0xcb, 0x96, 0x6e, 0x6b, 0x66, 0x35, 0x3a, 0x0d, 0x7b, 0x7b, 0xc4, 0x1b, 0x88,
-	0x0b, 0x3d, 0x79, 0x6f, 0x7a, 0x52, 0x50, 0x8f, 0x70, 0x81, 0xbd, 0x81, 0x66, 0x78, 0x6d, 0x9a,
-	0xe1, 0x8c, 0xe1, 0xc1, 0x80, 0x30, 0xae, 0xe7, 0xef, 0xe8, 0x79, 0x3c, 0xa0, 0x7b, 0xd8, 0xf7,
-	0x03, 0x81, 0x05, 0x0d, 0x7c, 0x3d, 0x5b, 0xfe, 0xe3, 0xdb, 0xb0, 0x7c, 0x24, 0x4d, 0x40, 0x08,
-	0x96, 0x88, 0xc0, 0xfd, 0x62, 0x6a, 0x27, 0xb5, 0x9b, 0x31, 0xd4, 0x37, 0x7a, 0x0c, 0xb9, 0x29,
-	0xfb, 0x8a, 0x8b, 0x3b, 0xa9, 0xdd, 0xec, 0xfe, 0x6e, 0xe5, 0x2a, 0x57, 0x55, 0x14, 0x9a, 0x11,
-	0xf3, 0x1b, 0x9b, 0xde, 0xc4, 0x18, 0xbd, 0x01, 0x1b, 0x36, 0x23, 0x4a, 0x07, 0x4b, 0x9a, 0x52,
-	0x5c, 0xde, 0x49, 0xed, 0xa6, 0x8d, 0xf5, 0x98, 0xd8, 0xa5, 0x1e, 0x41, 0xf7, 0x01, 0xb9, 0x98,
-	0x0b, 0xcb, 0x0b, 0x1c, 0xda, 0xa3, 0xc4, 0x89, 0x38, 0x57, 0x14, 0x67, 0x5e, 0xce, 0x1c, 0xe9,
-	0x09, 0xc5, 0xbd, 0x03, 0x59, 0x87, 0x70, 0x9b, 0xd1, 0x81, 0x04, 0x28, 0xae, 0x2b, 0x03, 0xc6,
-	0x49, 0x72, 0xd1, 0x1e, 0xa3, 0xc4, 0x77, 0xdc, 0x0b, 0xcb, 0xc7, 0x1e, 0x29, 0x6e, 0x2a, 0x9e,
-	0xf5, 0x98, 0xd8, 0xc6, 0x1e, 0x41, 0x35, 0x58, 0x71, 0xf1, 0x29, 0x71, 0x79, 0x31, 0xb7, 0x93,
-	0xde, 0xcd, 0xee, 0xbf, 0x35, 0xc7, 0xc6, 0x4a, 0x4b, 0x71, 0x37, 0x7c, 0xc1, 0x2e, 0x0c, 0x2d,
-	0x8a, 0xbe, 0x03, 0x39, 0x72, 0x3e, 0xa0, 0x6c, 0xcc, 0xc0, 0xbc, 0x52, 0x7b, 0x73, 0x44, 0x56,
-	0x4a, 0x97, 0x60, 0xcd, 0x0d, 0x6c, 0x35, 0x2e, 0x6e, 0x28, 0x6d, 0x86, 0x63, 0x74, 0x08, 0x10,
-	0xb9, 0x5d, 0x5c, 0x0c, 0x48, 0x71, 0x75, 0x27, 0xb5, 0xbb, 0xb9, 0xff, 0xdd, 0x79, 0xda, 0xa8,
-	0xbf, 0xdd, 0x8b, 0x01, 0x31, 0x32, 0x5e, 0xfc, 0x89, 0x8e, 0x61, 0x43, 0x30, 0x4c, 0x7d, 0xea,
-	0xf7, 0x2d, 0x16, 0xfa, 0xbc, 0x98, 0x49, 0x66, 0x5a, 0x57, 0x0b, 0x19, 0xa1, 0x6f, 0xac, 0x8b,
-	0xd1, 0x80, 0x23, 0x13, 0x72, 0x3d, 0x82, 0x45, 0xc8, 0x88, 0x65, 0x07, 0x6e, 0xe8, 0xf9, 0xbc,
-	0x08, 0x0a, 0xf3, 0xcd, 0xab, 0x31, 0x4d, 0x1d, 0xf3, 0xe6, 0x53, 0xf7, 0x63, 0x4a, 0x5c, 0xc7,
-	0xd8, 0xd4, 0x10, 0xb5, 0x08, 0x01, 0x75, 0x60, 0x43, 0xf9, 0x6f, 0x08, 0x99, 0x7d, 0x61, 0xc8,
-	0x75, 0x05, 0xa0, 0x01, 0x4b, 0xbf, 0x4b, 0x43, 0xc1, 0x20, 0x7d, 0x46, 0x38, 0xa7, 0x81, 0x7f,
-	0x44, 0x04, 0xa3, 0x36, 0x47, 0x2d, 0xd8, 0xf2, 0x08, 0xf6, 0x2d, 0x7c, 0xca, 0x03, 0x37, 0x14,
-	0xc4, 0x22, 0x8c, 0x05, 0x4c, 0x45, 0x7c, 0x76, 0xff, 0x4e, 0xbc, 0x58, 0x9c, 0x48, 0x95, 0x7a,
-	0x10, 0x9e, 0xba, 0xe4, 0x13, 0xec, 0x86, 0xc4, 0x28, 0x48, 0xc1, 0xaa, 0x96, 0x6b, 0x48, 0x31,
-	0xf4, 0x63, 0x40, 0x0a, 0x8d, 0x3f, 0x0d, 0x31, 0x23, 0x8e, 0x06, 0x5b, 0x4c, 0x00, 0x96, 0x97,
-	0x72, 0x66, 0x24, 0x16, 0x61, 0x3d, 0x86, 0x9b, 0x13, 0x58, 0x6e, 0xd0, 0xd7, 0x78, 0xe9, 0x04,
-	0x78, 0x5b, 0x63, 0x78, 0xad, 0xa0, 0x1f, 0x41, 0x1e, 0xc3, 0xb6, 0x47, 0x1c, 0x3a, 0x6b, 0xee,
-	0x52, 0x32, 0x44, 0x29, 0x3a, 0x69, 0xf0, 0x43, 0xc8, 0xb0, 0x58, 0x43, 0x95, 0xb6, 0xf3, 0x50,
-	0xd6, 0x98, 0x56, 0xaa, 0xf4, 0xd7, 0x34, 0xbc, 0x56, 0xed, 0xf7, 0x19, 0xe9, 0x63, 0x41, 0x6a,
-	0x2e, 0xe6, 0x9c, 0xf6, 0x68, 0x14, 0xed, 0xf1, 0xe6, 0x7c, 0x00, 0x99, 0x01, 0x23, 0x36, 0x95,
-	0x1b, 0x96, 0x68, 0x4b, 0x46, 0xec, 0xe8, 0x1d, 0x58, 0x61, 0xc4, 0xc6, 0xae, 0x9b, 0xc8, 0xfd,
-	0x9a, 0x17, 0xbd, 0x0f, 0x6b, 0xd8, 0xb6, 0x43, 0x86, 0xed, 0x8b, 0x44, 0x6e, 0x1e, 0x72, 0x4b,
-	0x5d, 0xc5, 0x13, 0x46, 0xf8, 0x93, 0xc0, 0x75, 0x12, 0xf9, 0x73, 0xc4, 0x8e, 0xde, 0x83, 0xb5,
-	0xde, 0x03, 0x8b, 0xdb, 0x01, 0x23, 0x89, 0x9c, 0xb8, 0xda, 0x7b, 0x60, 0x4a, 0x66, 0x29, 0x28,
-	0xc3, 0xc2, 0x0d, 0x38, 0x57, 0xa5, 0x70, 0xae, 0xa0, 0x1b, 0xf4, 0x5b, 0x01, 0xe7, 0xe8, 0x5d,
-	0x58, 0x65, 0x81, 0x6d, 0xe1, 0xd0, 0x56, 0xb5, 0x64, 0xbe, 0x7b, 0x02, 0xbb, 0x1a, 0xda, 0xa5,
-	0xaf, 0x56, 0xe0, 0xf6, 0x01, 0xf5, 0x31, 0xbb, 0xb8, 0x7c, 0xc3, 0xbe, 0x4c, 0xc1, 0x0e, 0x8e,
-	0xf7, 0xd4, 0xb2, 0x27, 0x78, 0x2c, 0x2f, 0x62, 0xd2, 0x1b, 0xf9, 0xd1, 0xbc, 0x7a, 0x73, 0x7d,
-	0x6c, 0x18, 0xaf, 0xe1, 0xeb, 0x63, 0xe7, 0x0f, 0x29, 0xb8, 0x73, 0xaa, 0x54, 0xb5, 0xec, 0xc0,
-	0xef, 0x85, 0x5c, 0xa9, 0x80, 0x05, 0xa3, 0xe7, 0x96, 0x4b, 0xb9, 0x28, 0x2e, 0xaa, 0x7a, 0xf2,
-	0x78, 0x9e, 0x1a, 0xd7, 0x98, 0x1b, 0xcf, 0xc5, 0xf0, 0x47, 0x0a, 0xdd, 0xb8, 0x75, 0x7a, 0x19,
-	0xb9, 0x45, 0xb9, 0x28, 0xfd, 0x3b, 0x0d, 0xdb, 0x97, 0x0a, 0xa1, 0x4f, 0xa0, 0x38, 0x08, 0x38,
-	0x15, 0xf4, 0x99, 0xf6, 0x9b, 0x35, 0x8a, 0xa6, 0x24, 0x91, 0x7f, 0x33, 0x96, 0x56, 0x9a, 0x76,
-	0x87, 0xa1, 0x75, 0x00, 0x9b, 0x82, 0x85, 0xc4, 0x8a, 0xa7, 0xb9, 0x4e, 0x87, 0xdb, 0x33, 0x68,
-	0x4d, 0x5f, 0x7c, 0xef, 0x9d, 0x08, 0x6c, 0x43, 0x8a, 0x1c, 0xc7, 0x12, 0xa8, 0x0e, 0xb9, 0x1e,
-	0x76, 0xf9, 0x38, 0x48, 0x7a, 0x3e, 0xc8, 0xa6, 0x92, 0x19, 0xa1, 0xc4, 0x9a, 0xf8, 0x72, 0xd3,
-	0x14, 0xc8, 0x52, 0x42, 0x4d, 0xda, 0xb1, 0xc4, 0x48, 0x93, 0x11, 0xc8, 0x72, 0x52, 0x4d, 0x46,
-	0x28, 0x13, 0x65, 0x65, 0xe5, 0x7f, 0x2d, 0x2b, 0xab, 0xc9, 0xcb, 0x4a, 0xe9, 0xb7, 0x2b, 0x70,
-	0xef, 0x28, 0x74, 0x05, 0x55, 0xbb, 0xf3, 0x7f, 0x9f, 0x3b, 0xbf, 0x49, 0xc1, 0xf6, 0x75, 0x49,
-	0xd3, 0x99, 0xdb, 0x78, 0x5c, 0x6f, 0x6b, 0x65, 0x3a, 0x65, 0xb6, 0xec, 0x4b, 0x92, 0xe5, 0x9f,
-	0x69, 0xc8, 0x4d, 0xa7, 0x49, 0x07, 0x6e, 0x48, 0x56, 0xea, 0xc8, 0xc6, 0xf1, 0x05, 0x53, 0x64,
-	0x6b, 0x24, 0x39, 0xca, 0x8f, 0x3e, 0x2c, 0xb1, 0xe0, 0x8c, 0x6b, 0xc3, 0xcc, 0x57, 0x6c, 0x58,
-	0xc5, 0x08, 0xce, 0x0c, 0xb5, 0x40, 0xc9, 0x85, 0x65, 0xd5, 0x16, 0xca, 0x76, 0x70, 0xc0, 0x88,
-	0x43, 0x6d, 0x21, 0x0f, 0x75, 0xd9, 0xa1, 0xe8, 0xfe, 0x7a, 0x73, 0x48, 0x56, 0x5d, 0x24, 0xfa,
-	0x00, 0x80, 0x0a, 0xe2, 0x59, 0x76, 0x10, 0xfa, 0x22, 0x49, 0xda, 0x66, 0x24, 0x7b, 0x4d, 0x72,
-	0x97, 0xfe, 0x94, 0x82, 0xb4, 0x11, 0x9c, 0xa1, 0xd7, 0x61, 0x1d, 0xdb, 0x22, 0xc4, 0xee, 0xc4,
-	0x4a, 0xd9, 0x88, 0x16, 0x2d, 0x13, 0xc0, 0x2a, 0xf1, 0x05, 0xa3, 0x24, 0x76, 0xc2, 0xc9, 0xab,
-	0x76, 0x42, 0xd4, 0x0e, 0xc7, 0xab, 0x94, 0xbe, 0x4a, 0x41, 0xa1, 0xe6, 0x86, 0x5c, 0x10, 0x46,
-	0xfd, 0x7e, 0x1c, 0x73, 0x6d, 0xb8, 0xe1, 0xe0, 0x67, 0x94, 0x70, 0xeb, 0x34, 0x08, 0x5d, 0x87,
-	0xfa, 0x16, 0xf5, 0x1d, 0x72, 0x9e, 0x68, 0x67, 0x51, 0x24, 0x79, 0x10, 0x09, 0x36, 0xa5, 0x5c,
-	0xd4, 0xeb, 0x8c, 0xb5, 0x4f, 0x0e, 0x95, 0xd7, 0xac, 0xe1, 0x6d, 0x25, 0x79, 0xf7, 0x54, 0xd7,
-	0x82, 0xa5, 0xff, 0xa4, 0xa1, 0xd0, 0x78, 0x86, 0xdd, 0x70, 0x22, 0x57, 0x4e, 0x01, 0xb1, 0x61,
-	0x57, 0x39, 0x95, 0xa7, 0x0f, 0xe6, 0x79, 0x72, 0xa6, 0x1f, 0x3d, 0x5c, 0x30, 0x0a, 0x6c, 0xa6,
-	0x49, 0xfd, 0x55, 0x0a, 0xee, 0xc6, 0x67, 0xd9, 0xe5, 0x75, 0x21, 0x32, 0xea, 0xc3, 0x97, 0x38,
-	0xcc, 0x0e, 0x17, 0x8c, 0xdb, 0xa7, 0xd7, 0x1c, 0xed, 0xbf, 0x4f, 0x41, 0xd9, 0x93, 0x1b, 0xaf,
-	0x8f, 0xa7, 0x2b, 0x14, 0x89, 0x0e, 0x86, 0x1f, 0xbe, 0x64, 0x08, 0x1d, 0x2e, 0x18, 0xf7, 0xbc,
-	0x39, 0xf5, 0xf2, 0x14, 0x90, 0x3d, 0x8c, 0xa2, 0xe1, 0xfa, 0x4b, 0xc9, 0x1c, 0x3f, 0x13, 0x7f,
-	0xd2, 0xf1, 0xf6, 0x34, 0xf1, 0x20, 0x03, 0xab, 0x1a, 0xb8, 0xf4, 0xaf, 0x3c, 0x64, 0xc7, 0xae,
-	0x40, 0xa8, 0x07, 0xf9, 0xe1, 0x35, 0x2a, 0x50, 0x57, 0xca, 0x78, 0xd7, 0x3f, 0x7c, 0x81, 0x9b,
-	0xd4, 0xf0, 0xbb, 0x13, 0x41, 0x18, 0x39, 0x31, 0x49, 0x40, 0x0f, 0x01, 0xb8, 0xc0, 0x4c, 0x44,
-	0x17, 0xc7, 0x35, 0xb5, 0x42, 0x69, 0x26, 0x78, 0xbb, 0xf1, 0x0b, 0x80, 0x91, 0x51, 0xdc, 0xea,
-	0x3e, 0x79, 0x02, 0xab, 0x8c, 0xf0, 0xd0, 0x15, 0xb2, 0x39, 0x4c, 0xbf, 0xa8, 0x66, 0x4d, 0x41,
-	0xa2, 0xbb, 0xa9, 0xa1, 0x30, 0x8c, 0x18, 0x0b, 0xfd, 0x12, 0x10, 0x19, 0xa6, 0xc1, 0xd0, 0xf1,
-	0xab, 0xc9, 0x1c, 0x3f, 0x93, 0x40, 0x46, 0x81, 0x4c, 0x93, 0x4a, 0x7f, 0xcf, 0x40, 0x6e, 0xca,
-	0x31, 0xe8, 0x5b, 0xb0, 0xe9, 0xe1, 0x73, 0x8b, 0xc6, 0x5a, 0x45, 0xde, 0x4e, 0x1b, 0x1b, 0x1e,
-	0x3e, 0x1f, 0xaa, 0xca, 0x51, 0x03, 0x32, 0xb2, 0x1b, 0x8e, 0xae, 0xc9, 0x8b, 0xea, 0x9a, 0xbc,
-	0x3b, 0xf7, 0xd2, 0x1e, 0x70, 0xae, 0x6e, 0xc9, 0x6b, 0xae, 0xfe, 0x42, 0x77, 0x01, 0x5c, 0x82,
-	0x99, 0x6f, 0x31, 0x2c, 0x88, 0x0a, 0xea, 0x94, 0x91, 0x51, 0x14, 0x03, 0x0b, 0x82, 0x9a, 0x50,
-	0x70, 0x1f, 0x58, 0x8c, 0xf4, 0x43, 0x17, 0x33, 0xfa, 0x3c, 0xba, 0xb2, 0x27, 0x69, 0xfa, 0xf3,
-	0xee, 0x03, 0x63, 0x42, 0x4a, 0x41, 0xed, 0x4f, 0x43, 0x2d, 0x27, 0x82, 0xda, 0x9f, 0x82, 0x92,
-	0x25, 0x8f, 0xfa, 0x16, 0x23, 0xae, 0x6a, 0x74, 0xac, 0x01, 0x0b, 0x54, 0x25, 0x49, 0xd4, 0xe3,
-	0x6c, 0x79, 0xd4, 0x37, 0xb4, 0xe4, 0xb1, 0x16, 0x94, 0xc1, 0x77, 0x86, 0x99, 0x67, 0xa9, 0x98,
-	0xd2, 0x5b, 0x3c, 0x1b, 0x7c, 0x07, 0x41, 0xe0, 0xea, 0x13, 0x48, 0x72, 0x9b, 0x92, 0x59, 0x8a,
-	0x12, 0xcc, 0xdc, 0x0b, 0x8b, 0x8b, 0x60, 0x70, 0x65, 0xdc, 0x8e, 0x89, 0x2a, 0x6e, 0x53, 0x04,
-	0x03, 0x54, 0x81, 0x2d, 0xea, 0x0f, 0x42, 0x61, 0x4d, 0x3e, 0x00, 0x64, 0x76, 0xd2, 0xbb, 0x19,
-	0xa3, 0xa0, 0xa6, 0x5a, 0x63, 0x37, 0x7b, 0xf4, 0x73, 0x28, 0x38, 0x58, 0x60, 0x8b, 0x0f, 0x5c,
-	0x2a, 0x64, 0x40, 0x3e, 0x09, 0x9c, 0x22, 0xa8, 0xbd, 0xdf, 0x9b, 0xb7, 0xf7, 0x75, 0x2c, 0xb0,
-	0x29, 0xe5, 0x8e, 0x94, 0x98, 0x91, 0x73, 0x26, 0x09, 0xe8, 0x3d, 0x28, 0x8e, 0x81, 0xcb, 0x58,
-	0xb5, 0x7a, 0x0c, 0xdb, 0x6a, 0x9b, 0xb2, 0x2a, 0x2e, 0xb6, 0x87, 0x22, 0x32, 0xb8, 0x3f, 0xd6,
-	0x93, 0xe8, 0xcd, 0x09, 0xad, 0x22, 0x23, 0xf4, 0x43, 0xd4, 0x68, 0x91, 0xc8, 0x04, 0x84, 0x61,
-	0x6b, 0x14, 0x6e, 0x16, 0x17, 0xf2, 0x5f, 0xff, 0x42, 0x3d, 0x02, 0x6d, 0xce, 0xcf, 0xa9, 0x56,
-	0x1c, 0x97, 0xa6, 0x16, 0x34, 0x0a, 0xee, 0x34, 0x09, 0xdd, 0x07, 0x44, 0x7d, 0x2a, 0xa8, 0x6c,
-	0x05, 0x46, 0x91, 0x9d, 0x57, 0x16, 0xe4, 0xf5, 0xcc, 0x10, 0x08, 0xfd, 0x3a, 0x05, 0x5b, 0xda,
-	0xfb, 0xaa, 0xda, 0x9f, 0x11, 0xda, 0x7f, 0x22, 0x78, 0xb1, 0xa0, 0xea, 0x88, 0xf1, 0x12, 0x15,
-	0x2e, 0x7a, 0x22, 0x53, 0x25, 0xfd, 0xd3, 0x08, 0x34, 0x6a, 0x0f, 0x0a, 0xee, 0x34, 0x1d, 0x3d,
-	0x86, 0x8d, 0xf8, 0xd4, 0x8e, 0xf2, 0xf9, 0x86, 0xf2, 0xc7, 0xfd, 0xb9, 0x7b, 0xaa, 0x85, 0x54,
-	0x4e, 0xaf, 0x3b, 0x63, 0x23, 0xd9, 0x0f, 0xf9, 0xa1, 0x67, 0xe9, 0x4a, 0xcf, 0x8b, 0xdb, 0xaa,
-	0x86, 0x64, 0xfd, 0xd0, 0xd3, 0x27, 0x02, 0x2f, 0xd5, 0xe1, 0xe6, 0xe5, 0x2a, 0xa2, 0x3c, 0xa4,
-	0xbf, 0x20, 0x17, 0xba, 0x87, 0x92, 0x9f, 0xe8, 0x06, 0x2c, 0xcb, 0xe2, 0x15, 0x55, 0x9a, 0x94,
-	0x11, 0x0d, 0x3e, 0x58, 0x7c, 0x3f, 0x55, 0xfa, 0xc7, 0x12, 0xe4, 0xa6, 0x2a, 0x28, 0x7a, 0x00,
-	0xcb, 0xe3, 0x3d, 0xcd, 0xa5, 0xbd, 0xdc, 0xdb, 0xfb, 0x51, 0x3a, 0x44, 0x9c, 0xe8, 0xfb, 0x90,
-	0x75, 0x42, 0xfd, 0x72, 0xe8, 0x25, 0xba, 0x31, 0x41, 0xcc, 0x7f, 0xc4, 0x51, 0x75, 0xec, 0xa9,
-	0x4f, 0xbd, 0x11, 0x24, 0xa9, 0x2b, 0xc3, 0xb7, 0x3d, 0xf5, 0x50, 0xf0, 0x10, 0x32, 0x2a, 0xe6,
-	0x13, 0x3f, 0x31, 0xac, 0x49, 0x76, 0x25, 0x3a, 0x59, 0x43, 0x57, 0xa7, 0x6b, 0xa8, 0x0b, 0x1b,
-	0x7a, 0x1b, 0x2c, 0xea, 0xf7, 0x02, 0x5e, 0x5c, 0x53, 0xb1, 0xf5, 0xe8, 0x25, 0xce, 0xa8, 0xf8,
-	0x58, 0x6f, 0xfa, 0xbd, 0xc0, 0x58, 0xb7, 0x47, 0x03, 0x5e, 0xfa, 0x5b, 0x0a, 0xb2, 0x63, 0xb3,
-	0xe8, 0x1e, 0x64, 0x6d, 0xd9, 0x90, 0x06, 0xd4, 0xb1, 0xa8, 0xa3, 0xcf, 0x12, 0x88, 0x49, 0x4d,
-	0x07, 0xd5, 0x60, 0x33, 0x56, 0x8f, 0x61, 0x87, 0x86, 0x3c, 0x51, 0xe3, 0x18, 0x9b, 0x64, 0x28,
-	0x11, 0xf4, 0x11, 0xc4, 0x5a, 0x58, 0x9c, 0x3e, 0x27, 0x49, 0xae, 0xcd, 0x59, 0x2d, 0x60, 0xd2,
-	0xe7, 0xa4, 0xf4, 0x10, 0xb2, 0x63, 0x2f, 0xca, 0xf3, 0x02, 0x30, 0x33, 0x16, 0x80, 0x65, 0x1b,
-	0x32, 0xc3, 0xe7, 0x5f, 0x54, 0x82, 0x9b, 0x47, 0x9d, 0x7a, 0xa3, 0x65, 0x75, 0x3f, 0x3b, 0x6e,
-	0x58, 0x27, 0x6d, 0xf3, 0xb8, 0x51, 0x6b, 0x7e, 0xdc, 0x6c, 0xd4, 0xf3, 0x0b, 0x68, 0x1b, 0x0a,
-	0xad, 0x66, 0xbb, 0x51, 0x35, 0x2c, 0xa3, 0xf1, 0xc8, 0x68, 0x98, 0x66, 0xb3, 0xd3, 0xce, 0xa7,
-	0xd0, 0x37, 0x60, 0xab, 0xd5, 0x79, 0xd4, 0x34, 0xbb, 0xcd, 0xda, 0xf8, 0xc4, 0x22, 0x02, 0x58,
-	0xf9, 0xc9, 0x51, 0xa3, 0xda, 0x36, 0xf3, 0xe9, 0x72, 0x07, 0xd6, 0xe2, 0xc3, 0x13, 0xdd, 0x82,
-	0xed, 0x56, 0xc7, 0x34, 0xaf, 0x58, 0x42, 0x4a, 0x58, 0xe6, 0xe3, 0x93, 0xaa, 0xd1, 0xa8, 0x5b,
-	0x92, 0x2f, 0x9f, 0x42, 0x05, 0xd8, 0x50, 0xe4, 0x56, 0xe7, 0x51, 0x44, 0x5a, 0x2c, 0x1f, 0xc2,
-	0xfa, 0x78, 0xf6, 0xa2, 0xbb, 0x70, 0xab, 0xde, 0x34, 0xbb, 0xd5, 0x76, 0xad, 0x71, 0x19, 0xf0,
-	0x06, 0x64, 0x1a, 0x27, 0xb5, 0x56, 0xb3, 0xde, 0xa8, 0x4a, 0x9d, 0x01, 0x56, 0x6a, 0x1d, 0xb3,
-	0xd9, 0x6e, 0xe4, 0x17, 0xcb, 0xcf, 0x21, 0x37, 0x55, 0xdb, 0xd1, 0xeb, 0x70, 0xb7, 0x5e, 0xed,
-	0x56, 0x2d, 0xf3, 0xb8, 0xd5, 0xec, 0x5a, 0x47, 0x8d, 0xee, 0x61, 0xa7, 0x3e, 0x05, 0x08, 0xb0,
-	0x62, 0x54, 0xdb, 0xf5, 0xce, 0x91, 0x46, 0x3b, 0x31, 0xbb, 0x9d, 0xa3, 0xfc, 0x22, 0xda, 0x04,
-	0x30, 0x1b, 0x8f, 0x4f, 0x1a, 0xed, 0x6e, 0xb3, 0xda, 0xca, 0xa7, 0xd1, 0x3a, 0xac, 0xb5, 0x3b,
-	0x11, 0x50, 0x7e, 0x49, 0xce, 0x56, 0x4f, 0xba, 0xf1, 0x78, 0xb9, 0xfc, 0x29, 0x14, 0x66, 0x6a,
-	0x32, 0x7a, 0x03, 0xee, 0xb5, 0x1a, 0x55, 0xa3, 0x6d, 0x19, 0xd5, 0x6e, 0xc3, 0x32, 0xbb, 0xf2,
-	0xdf, 0xa3, 0xcf, 0xa6, 0xd6, 0xcf, 0x41, 0x56, 0x6e, 0x86, 0x65, 0x36, 0xaa, 0x46, 0xed, 0x30,
-	0x9f, 0x92, 0x0b, 0xd5, 0x3a, 0x6d, 0xe9, 0x81, 0x6e, 0x7e, 0xb1, 0xfc, 0x39, 0xe4, 0x1e, 0x11,
-	0xa1, 0x7f, 0x4e, 0x79, 0x1a, 0x12, 0x2e, 0x64, 0x96, 0x0d, 0x58, 0xf0, 0x39, 0xb1, 0x45, 0x1c,
-	0xc7, 0x19, 0x23, 0xa3, 0x29, 0x4d, 0x47, 0x4e, 0xcb, 0xc3, 0x86, 0x13, 0x35, 0x1d, 0x45, 0x49,
-	0x46, 0x53, 0x9a, 0x0e, 0xba, 0x05, 0x6b, 0xd1, 0xcf, 0x0a, 0xd4, 0x51, 0xc1, 0x99, 0x31, 0x56,
-	0xd5, 0xb8, 0xe9, 0x94, 0xff, 0x9c, 0x82, 0xc2, 0x31, 0x16, 0xf6, 0x93, 0xaf, 0x65, 0x39, 0xf4,
-	0x2e, 0x2c, 0xab, 0x4f, 0x5d, 0xe3, 0xee, 0xcd, 0xfb, 0x35, 0x29, 0xe2, 0x2e, 0x7b, 0x80, 0xea,
-	0xc4, 0x25, 0x82, 0x7c, 0x3d, 0x4e, 0xf9, 0x4b, 0x0a, 0x0a, 0x2d, 0xca, 0xa3, 0x2d, 0xe0, 0xaf,
-	0x66, 0xb9, 0x1f, 0x40, 0x56, 0x76, 0xb6, 0x71, 0xab, 0x7e, 0xd5, 0xb3, 0xf3, 0xc9, 0xd8, 0xe9,
-	0x00, 0x1e, 0x3e, 0x37, 0x74, 0x3b, 0x2e, 0x17, 0xc7, 0x7d, 0x62, 0x89, 0xe0, 0x0b, 0x12, 0x35,
-	0xa1, 0x72, 0x71, 0xdc, 0x27, 0x5d, 0x49, 0x28, 0x87, 0x80, 0xc6, 0x15, 0xe6, 0x83, 0xc0, 0xe7,
-	0x04, 0xbd, 0x07, 0x2b, 0xca, 0x24, 0xd9, 0x45, 0xa7, 0x93, 0xb8, 0x5b, 0xb3, 0xa3, 0x6f, 0x43,
-	0xce, 0x27, 0xe7, 0xc2, 0x1a, 0x5b, 0x32, 0x32, 0x68, 0x43, 0x92, 0x8f, 0xe3, 0x65, 0xf7, 0xbf,
-	0x4c, 0xc3, 0xba, 0x92, 0x34, 0x09, 0x7b, 0x46, 0x6d, 0x82, 0x7e, 0x0a, 0x6b, 0x71, 0xe8, 0xa2,
-	0x6b, 0x7e, 0xb8, 0x9a, 0x0a, 0xef, 0xd2, 0x3c, 0xc5, 0xca, 0x0b, 0x88, 0x02, 0x8c, 0x2c, 0x44,
-	0xd7, 0xfc, 0x8e, 0x35, 0xb3, 0x71, 0xa5, 0xfb, 0xc9, 0x98, 0x23, 0xa7, 0x95, 0x17, 0xd0, 0x2f,
-	0x00, 0x46, 0x29, 0x71, 0xdd, 0x52, 0x33, 0x89, 0x93, 0xc4, 0x90, 0x13, 0xc8, 0x8e, 0xc5, 0x32,
-	0xba, 0x46, 0xb9, 0xd9, 0x90, 0x2f, 0xdd, 0x9c, 0x09, 0x98, 0x86, 0x37, 0x10, 0x17, 0xe5, 0x85,
-	0x03, 0x17, 0xee, 0xd8, 0x81, 0x77, 0x25, 0xd8, 0x01, 0x28, 0x9c, 0x63, 0x29, 0xf6, 0xb3, 0x1f,
-	0x69, 0xae, 0x7e, 0xe0, 0x62, 0xbf, 0x5f, 0x09, 0x58, 0x7f, 0xaf, 0x4f, 0x7c, 0x05, 0xb9, 0x17,
-	0x4d, 0xe1, 0x01, 0xe5, 0xb3, 0xbf, 0x61, 0x7f, 0x18, 0x7f, 0x9f, 0xae, 0x28, 0xe6, 0xb7, 0xff,
-	0x1b, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x46, 0x69, 0xef, 0x5f, 0x1f, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/bigquery/v2/model_reference.pb.go b/googleapis/cloud/bigquery/v2/model_reference.pb.go
index 0ec61f9791..4a0df61541 100644
--- a/googleapis/cloud/bigquery/v2/model_reference.pb.go
+++ b/googleapis/cloud/bigquery/v2/model_reference.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/v2/model_reference.proto
 
-package bigquery // import "google.golang.org/genproto/googleapis/cloud/bigquery/v2"
+package bigquery
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Id path of a model.
 type ModelReference struct {
@@ -38,16 +41,17 @@ func (m *ModelReference) Reset()         { *m = ModelReference{} }
 func (m *ModelReference) String() string { return proto.CompactTextString(m) }
 func (*ModelReference) ProtoMessage()    {}
 func (*ModelReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_reference_02ff0d475f40d0ab, []int{0}
+	return fileDescriptor_4c8f9aced577e06a, []int{0}
 }
+
 func (m *ModelReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModelReference.Unmarshal(m, b)
 }
 func (m *ModelReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModelReference.Marshal(b, m, deterministic)
 }
-func (dst *ModelReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModelReference.Merge(dst, src)
+func (m *ModelReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModelReference.Merge(m, src)
 }
 func (m *ModelReference) XXX_Size() int {
 	return xxx_messageInfo_ModelReference.Size(m)
@@ -84,10 +88,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/v2/model_reference.proto", fileDescriptor_model_reference_02ff0d475f40d0ab)
+	proto.RegisterFile("google/cloud/bigquery/v2/model_reference.proto", fileDescriptor_4c8f9aced577e06a)
 }
 
-var fileDescriptor_model_reference_02ff0d475f40d0ab = []byte{
+var fileDescriptor_4c8f9aced577e06a = []byte{
 	// 223 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x31, 0x4b, 0xc4, 0x30,
 	0x14, 0x80, 0x39, 0x05, 0xf5, 0x32, 0x38, 0xd4, 0xa5, 0xca, 0x09, 0xe2, 0xe4, 0x94, 0xc0, 0x39,
diff --git a/googleapis/cloud/bigquery/v2/standard_sql.pb.go b/googleapis/cloud/bigquery/v2/standard_sql.pb.go
index 57ec4b90f6..42c0301cb5 100644
--- a/googleapis/cloud/bigquery/v2/standard_sql.pb.go
+++ b/googleapis/cloud/bigquery/v2/standard_sql.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/v2/standard_sql.proto
 
-package bigquery // import "google.golang.org/genproto/googleapis/cloud/bigquery/v2"
+package bigquery
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type StandardSqlDataType_TypeKind int32
 
@@ -70,6 +73,7 @@ var StandardSqlDataType_TypeKind_name = map[int32]string{
 	16: "ARRAY",
 	17: "STRUCT",
 }
+
 var StandardSqlDataType_TypeKind_value = map[string]int32{
 	"TYPE_KIND_UNSPECIFIED": 0,
 	"INT64":                 2,
@@ -90,8 +94,9 @@ var StandardSqlDataType_TypeKind_value = map[string]int32{
 func (x StandardSqlDataType_TypeKind) String() string {
 	return proto.EnumName(StandardSqlDataType_TypeKind_name, int32(x))
 }
+
 func (StandardSqlDataType_TypeKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_standard_sql_f6e17ae27add020e, []int{0, 0}
+	return fileDescriptor_17cd17721212b1f9, []int{0, 0}
 }
 
 // The type of a variable, e.g., a function argument.
@@ -121,16 +126,17 @@ func (m *StandardSqlDataType) Reset()         { *m = StandardSqlDataType{} }
 func (m *StandardSqlDataType) String() string { return proto.CompactTextString(m) }
 func (*StandardSqlDataType) ProtoMessage()    {}
 func (*StandardSqlDataType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_standard_sql_f6e17ae27add020e, []int{0}
+	return fileDescriptor_17cd17721212b1f9, []int{0}
 }
+
 func (m *StandardSqlDataType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StandardSqlDataType.Unmarshal(m, b)
 }
 func (m *StandardSqlDataType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StandardSqlDataType.Marshal(b, m, deterministic)
 }
-func (dst *StandardSqlDataType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StandardSqlDataType.Merge(dst, src)
+func (m *StandardSqlDataType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StandardSqlDataType.Merge(m, src)
 }
 func (m *StandardSqlDataType) XXX_Size() int {
 	return xxx_messageInfo_StandardSqlDataType.Size(m)
@@ -185,80 +191,14 @@ func (m *StandardSqlDataType) GetStructType() *StandardSqlStructType {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StandardSqlDataType) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StandardSqlDataType_OneofMarshaler, _StandardSqlDataType_OneofUnmarshaler, _StandardSqlDataType_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StandardSqlDataType) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StandardSqlDataType_ArrayElementType)(nil),
 		(*StandardSqlDataType_StructType)(nil),
 	}
 }
 
-func _StandardSqlDataType_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StandardSqlDataType)
-	// sub_type
-	switch x := m.SubType.(type) {
-	case *StandardSqlDataType_ArrayElementType:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ArrayElementType); err != nil {
-			return err
-		}
-	case *StandardSqlDataType_StructType:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructType); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StandardSqlDataType.SubType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StandardSqlDataType_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StandardSqlDataType)
-	switch tag {
-	case 2: // sub_type.array_element_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StandardSqlDataType)
-		err := b.DecodeMessage(msg)
-		m.SubType = &StandardSqlDataType_ArrayElementType{msg}
-		return true, err
-	case 3: // sub_type.struct_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StandardSqlStructType)
-		err := b.DecodeMessage(msg)
-		m.SubType = &StandardSqlDataType_StructType{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StandardSqlDataType_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StandardSqlDataType)
-	// sub_type
-	switch x := m.SubType.(type) {
-	case *StandardSqlDataType_ArrayElementType:
-		s := proto.Size(x.ArrayElementType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StandardSqlDataType_StructType:
-		s := proto.Size(x.StructType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A field or a column.
 type StandardSqlField struct {
 	// Optional. The name of this field. Can be absent for struct fields.
@@ -276,16 +216,17 @@ func (m *StandardSqlField) Reset()         { *m = StandardSqlField{} }
 func (m *StandardSqlField) String() string { return proto.CompactTextString(m) }
 func (*StandardSqlField) ProtoMessage()    {}
 func (*StandardSqlField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_standard_sql_f6e17ae27add020e, []int{1}
+	return fileDescriptor_17cd17721212b1f9, []int{1}
 }
+
 func (m *StandardSqlField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StandardSqlField.Unmarshal(m, b)
 }
 func (m *StandardSqlField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StandardSqlField.Marshal(b, m, deterministic)
 }
-func (dst *StandardSqlField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StandardSqlField.Merge(dst, src)
+func (m *StandardSqlField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StandardSqlField.Merge(m, src)
 }
 func (m *StandardSqlField) XXX_Size() int {
 	return xxx_messageInfo_StandardSqlField.Size(m)
@@ -321,16 +262,17 @@ func (m *StandardSqlStructType) Reset()         { *m = StandardSqlStructType{} }
 func (m *StandardSqlStructType) String() string { return proto.CompactTextString(m) }
 func (*StandardSqlStructType) ProtoMessage()    {}
 func (*StandardSqlStructType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_standard_sql_f6e17ae27add020e, []int{2}
+	return fileDescriptor_17cd17721212b1f9, []int{2}
 }
+
 func (m *StandardSqlStructType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StandardSqlStructType.Unmarshal(m, b)
 }
 func (m *StandardSqlStructType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StandardSqlStructType.Marshal(b, m, deterministic)
 }
-func (dst *StandardSqlStructType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StandardSqlStructType.Merge(dst, src)
+func (m *StandardSqlStructType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StandardSqlStructType.Merge(m, src)
 }
 func (m *StandardSqlStructType) XXX_Size() int {
 	return xxx_messageInfo_StandardSqlStructType.Size(m)
@@ -349,17 +291,17 @@ func (m *StandardSqlStructType) GetFields() []*StandardSqlField {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.bigquery.v2.StandardSqlDataType_TypeKind", StandardSqlDataType_TypeKind_name, StandardSqlDataType_TypeKind_value)
 	proto.RegisterType((*StandardSqlDataType)(nil), "google.cloud.bigquery.v2.StandardSqlDataType")
 	proto.RegisterType((*StandardSqlField)(nil), "google.cloud.bigquery.v2.StandardSqlField")
 	proto.RegisterType((*StandardSqlStructType)(nil), "google.cloud.bigquery.v2.StandardSqlStructType")
-	proto.RegisterEnum("google.cloud.bigquery.v2.StandardSqlDataType_TypeKind", StandardSqlDataType_TypeKind_name, StandardSqlDataType_TypeKind_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/v2/standard_sql.proto", fileDescriptor_standard_sql_f6e17ae27add020e)
+	proto.RegisterFile("google/cloud/bigquery/v2/standard_sql.proto", fileDescriptor_17cd17721212b1f9)
 }
 
-var fileDescriptor_standard_sql_f6e17ae27add020e = []byte{
+var fileDescriptor_17cd17721212b1f9 = []byte{
 	// 491 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x41, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0xd7, 0xad, 0xeb, 0xd2, 0x57, 0x40, 0xc6, 0xa3, 0x50, 0xd0, 0x0e, 0x55, 0x4f, 0x15,
diff --git a/googleapis/cloud/billing/v1/cloud_billing.pb.go b/googleapis/cloud/billing/v1/cloud_billing.pb.go
index 7191e5886e..df47212085 100644
--- a/googleapis/cloud/billing/v1/cloud_billing.pb.go
+++ b/googleapis/cloud/billing/v1/cloud_billing.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/billing/v1/cloud_billing.proto
 
-package billing // import "google.golang.org/genproto/googleapis/cloud/billing/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package billing
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A billing account in [Google Cloud
 // Console](https://console.cloud.google.com/). You can assign a billing account
@@ -49,16 +49,17 @@ func (m *BillingAccount) Reset()         { *m = BillingAccount{} }
 func (m *BillingAccount) String() string { return proto.CompactTextString(m) }
 func (*BillingAccount) ProtoMessage()    {}
 func (*BillingAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{0}
+	return fileDescriptor_47fe072480332805, []int{0}
 }
+
 func (m *BillingAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BillingAccount.Unmarshal(m, b)
 }
 func (m *BillingAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BillingAccount.Marshal(b, m, deterministic)
 }
-func (dst *BillingAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BillingAccount.Merge(dst, src)
+func (m *BillingAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BillingAccount.Merge(m, src)
 }
 func (m *BillingAccount) XXX_Size() int {
 	return xxx_messageInfo_BillingAccount.Size(m)
@@ -120,16 +121,17 @@ func (m *ProjectBillingInfo) Reset()         { *m = ProjectBillingInfo{} }
 func (m *ProjectBillingInfo) String() string { return proto.CompactTextString(m) }
 func (*ProjectBillingInfo) ProtoMessage()    {}
 func (*ProjectBillingInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{1}
+	return fileDescriptor_47fe072480332805, []int{1}
 }
+
 func (m *ProjectBillingInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProjectBillingInfo.Unmarshal(m, b)
 }
 func (m *ProjectBillingInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProjectBillingInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProjectBillingInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProjectBillingInfo.Merge(dst, src)
+func (m *ProjectBillingInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectBillingInfo.Merge(m, src)
 }
 func (m *ProjectBillingInfo) XXX_Size() int {
 	return xxx_messageInfo_ProjectBillingInfo.Size(m)
@@ -182,16 +184,17 @@ func (m *GetBillingAccountRequest) Reset()         { *m = GetBillingAccountReque
 func (m *GetBillingAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBillingAccountRequest) ProtoMessage()    {}
 func (*GetBillingAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{2}
+	return fileDescriptor_47fe072480332805, []int{2}
 }
+
 func (m *GetBillingAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBillingAccountRequest.Unmarshal(m, b)
 }
 func (m *GetBillingAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBillingAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetBillingAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBillingAccountRequest.Merge(dst, src)
+func (m *GetBillingAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBillingAccountRequest.Merge(m, src)
 }
 func (m *GetBillingAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBillingAccountRequest.Size(m)
@@ -227,16 +230,17 @@ func (m *ListBillingAccountsRequest) Reset()         { *m = ListBillingAccountsR
 func (m *ListBillingAccountsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListBillingAccountsRequest) ProtoMessage()    {}
 func (*ListBillingAccountsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{3}
+	return fileDescriptor_47fe072480332805, []int{3}
 }
+
 func (m *ListBillingAccountsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBillingAccountsRequest.Unmarshal(m, b)
 }
 func (m *ListBillingAccountsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBillingAccountsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListBillingAccountsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBillingAccountsRequest.Merge(dst, src)
+func (m *ListBillingAccountsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBillingAccountsRequest.Merge(m, src)
 }
 func (m *ListBillingAccountsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListBillingAccountsRequest.Size(m)
@@ -278,16 +282,17 @@ func (m *ListBillingAccountsResponse) Reset()         { *m = ListBillingAccounts
 func (m *ListBillingAccountsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListBillingAccountsResponse) ProtoMessage()    {}
 func (*ListBillingAccountsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{4}
+	return fileDescriptor_47fe072480332805, []int{4}
 }
+
 func (m *ListBillingAccountsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBillingAccountsResponse.Unmarshal(m, b)
 }
 func (m *ListBillingAccountsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBillingAccountsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListBillingAccountsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBillingAccountsResponse.Merge(dst, src)
+func (m *ListBillingAccountsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBillingAccountsResponse.Merge(m, src)
 }
 func (m *ListBillingAccountsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListBillingAccountsResponse.Size(m)
@@ -333,16 +338,17 @@ func (m *ListProjectBillingInfoRequest) Reset()         { *m = ListProjectBillin
 func (m *ListProjectBillingInfoRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProjectBillingInfoRequest) ProtoMessage()    {}
 func (*ListProjectBillingInfoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{5}
+	return fileDescriptor_47fe072480332805, []int{5}
 }
+
 func (m *ListProjectBillingInfoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProjectBillingInfoRequest.Unmarshal(m, b)
 }
 func (m *ListProjectBillingInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProjectBillingInfoRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProjectBillingInfoRequest.Merge(dst, src)
+func (m *ListProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProjectBillingInfoRequest.Merge(m, src)
 }
 func (m *ListProjectBillingInfoRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProjectBillingInfoRequest.Size(m)
@@ -392,16 +398,17 @@ func (m *ListProjectBillingInfoResponse) Reset()         { *m = ListProjectBilli
 func (m *ListProjectBillingInfoResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProjectBillingInfoResponse) ProtoMessage()    {}
 func (*ListProjectBillingInfoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{6}
+	return fileDescriptor_47fe072480332805, []int{6}
 }
+
 func (m *ListProjectBillingInfoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProjectBillingInfoResponse.Unmarshal(m, b)
 }
 func (m *ListProjectBillingInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProjectBillingInfoResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProjectBillingInfoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProjectBillingInfoResponse.Merge(dst, src)
+func (m *ListProjectBillingInfoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProjectBillingInfoResponse.Merge(m, src)
 }
 func (m *ListProjectBillingInfoResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProjectBillingInfoResponse.Size(m)
@@ -440,16 +447,17 @@ func (m *GetProjectBillingInfoRequest) Reset()         { *m = GetProjectBillingI
 func (m *GetProjectBillingInfoRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProjectBillingInfoRequest) ProtoMessage()    {}
 func (*GetProjectBillingInfoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{7}
+	return fileDescriptor_47fe072480332805, []int{7}
 }
+
 func (m *GetProjectBillingInfoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProjectBillingInfoRequest.Unmarshal(m, b)
 }
 func (m *GetProjectBillingInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProjectBillingInfoRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProjectBillingInfoRequest.Merge(dst, src)
+func (m *GetProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProjectBillingInfoRequest.Merge(m, src)
 }
 func (m *GetProjectBillingInfoRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProjectBillingInfoRequest.Size(m)
@@ -484,16 +492,17 @@ func (m *UpdateProjectBillingInfoRequest) Reset()         { *m = UpdateProjectBi
 func (m *UpdateProjectBillingInfoRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProjectBillingInfoRequest) ProtoMessage()    {}
 func (*UpdateProjectBillingInfoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_billing_afc96ac7b12ba62e, []int{8}
+	return fileDescriptor_47fe072480332805, []int{8}
 }
+
 func (m *UpdateProjectBillingInfoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProjectBillingInfoRequest.Unmarshal(m, b)
 }
 func (m *UpdateProjectBillingInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProjectBillingInfoRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProjectBillingInfoRequest.Merge(dst, src)
+func (m *UpdateProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProjectBillingInfoRequest.Merge(m, src)
 }
 func (m *UpdateProjectBillingInfoRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProjectBillingInfoRequest.Size(m)
@@ -530,6 +539,56 @@ func init() {
 	proto.RegisterType((*UpdateProjectBillingInfoRequest)(nil), "google.cloud.billing.v1.UpdateProjectBillingInfoRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/billing/v1/cloud_billing.proto", fileDescriptor_47fe072480332805)
+}
+
+var fileDescriptor_47fe072480332805 = []byte{
+	// 667 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x4e, 0xd4, 0x40,
+	0x14, 0xce, 0x00, 0x12, 0xf6, 0x80, 0x20, 0x03, 0xe8, 0x66, 0x17, 0x10, 0xea, 0x0f, 0x28, 0xb1,
+	0x15, 0xf0, 0xdf, 0xa8, 0x11, 0x63, 0x08, 0x89, 0x31, 0x9b, 0xaa, 0x89, 0xd1, 0x98, 0x66, 0x76,
+	0x3b, 0x34, 0xd5, 0x32, 0x53, 0x77, 0x0a, 0x51, 0x8c, 0x37, 0xbe, 0x82, 0x7a, 0xe1, 0x85, 0x37,
+	0x5e, 0xe8, 0x2b, 0x78, 0xed, 0x2b, 0xf8, 0x0a, 0xde, 0xfb, 0x0a, 0x66, 0xa6, 0x53, 0x65, 0xbb,
+	0x9d, 0x85, 0xc6, 0xbb, 0xe6, 0x9b, 0x73, 0xfa, 0x7d, 0xe7, 0x9b, 0xef, 0x6c, 0x17, 0x96, 0x02,
+	0xce, 0x83, 0x88, 0x3a, 0xad, 0x88, 0x6f, 0xfb, 0x4e, 0x33, 0x8c, 0xa2, 0x90, 0x05, 0xce, 0xce,
+	0x72, 0x0a, 0x78, 0x1a, 0xb0, 0xe3, 0x36, 0x4f, 0x38, 0x3e, 0x96, 0x16, 0xdb, 0xea, 0xcc, 0xce,
+	0xce, 0x76, 0x96, 0x6b, 0xd3, 0xfa, 0x2d, 0x24, 0x0e, 0x1d, 0xc2, 0x18, 0x4f, 0x48, 0x12, 0x72,
+	0x26, 0xd2, 0x36, 0xeb, 0x29, 0x8c, 0xae, 0xa5, 0xb5, 0xb7, 0x5b, 0x2d, 0xbe, 0xcd, 0x12, 0x8c,
+	0x61, 0x80, 0x91, 0x2d, 0x5a, 0x45, 0x73, 0x68, 0xb1, 0xe2, 0xaa, 0x67, 0x89, 0xf1, 0x98, 0xb2,
+	0x6a, 0xdf, 0x1c, 0x5a, 0x1c, 0x72, 0xd5, 0x33, 0x9e, 0x87, 0x11, 0x3f, 0x14, 0x71, 0x44, 0x5e,
+	0x7b, 0xaa, 0xbe, 0x5f, 0xd5, 0x0f, 0x6b, 0xec, 0x3e, 0xd9, 0xa2, 0xd6, 0x17, 0x04, 0xb8, 0xd1,
+	0xe6, 0xcf, 0x69, 0x2b, 0xd1, 0x24, 0x1b, 0x6c, 0x93, 0x17, 0x32, 0xcc, 0x00, 0xc4, 0x69, 0xa5,
+	0x17, 0xfa, 0x8a, 0xa7, 0xe2, 0x56, 0x34, 0xb2, 0xe1, 0xe3, 0xf3, 0x30, 0xa9, 0x47, 0xf2, 0x48,
+	0xaa, 0x73, 0x2f, 0x29, 0x6e, 0x76, 0x8c, 0x20, 0xb9, 0xf1, 0x02, 0x8c, 0x65, 0x1d, 0x94, 0x91,
+	0x66, 0x44, 0xfd, 0xea, 0x80, 0x52, 0x3f, 0xaa, 0xe1, 0xbb, 0x29, 0x6a, 0xd9, 0x50, 0x5d, 0xa7,
+	0x49, 0xa7, 0x09, 0x2e, 0x7d, 0xb9, 0x4d, 0x45, 0xa1, 0x17, 0xd6, 0x63, 0xa8, 0xdd, 0x0b, 0x45,
+	0xae, 0x41, 0x64, 0x1d, 0x75, 0xa8, 0xc4, 0x24, 0xa0, 0x9e, 0x08, 0x77, 0xd3, 0xb6, 0x43, 0xee,
+	0x90, 0x04, 0x1e, 0x84, 0xbb, 0xe9, 0x90, 0xf2, 0x30, 0xe1, 0x2f, 0xb4, 0x99, 0x72, 0x48, 0x12,
+	0xd0, 0x87, 0x12, 0xb0, 0x3e, 0x21, 0xa8, 0x17, 0xbe, 0x5a, 0xc4, 0x9c, 0x09, 0x8a, 0x5d, 0x38,
+	0x92, 0x33, 0x41, 0x54, 0xd1, 0x5c, 0xff, 0xe2, 0xf0, 0xca, 0x82, 0x6d, 0xb8, 0x7d, 0x3b, 0x37,
+	0xd7, 0x58, 0xa7, 0x53, 0x02, 0x9f, 0x86, 0x31, 0x46, 0x5f, 0x25, 0x5e, 0x97, 0xae, 0xc3, 0x12,
+	0x6e, 0xfc, 0xd5, 0xc6, 0x61, 0x46, 0x4a, 0xeb, 0xbe, 0xcd, 0x1e, 0x56, 0x75, 0x9a, 0xd1, 0xd7,
+	0xd3, 0x8c, 0xfe, 0xbc, 0x19, 0xdf, 0x10, 0xcc, 0x9a, 0x18, 0xb5, 0x1f, 0xcf, 0x60, 0x32, 0xcb,
+	0x4c, 0xe6, 0x4b, 0xc8, 0x36, 0xb9, 0xf6, 0x64, 0xc9, 0xe8, 0x49, 0xc1, 0x2b, 0x71, 0xdc, 0x1d,
+	0xd3, 0x83, 0x5a, 0xb3, 0x02, 0xd3, 0xeb, 0xb4, 0x9c, 0x33, 0xd6, 0x07, 0x04, 0xc7, 0x1f, 0xc5,
+	0x3e, 0x49, 0x68, 0x39, 0x47, 0x4d, 0x23, 0x4b, 0x61, 0xff, 0x3f, 0xf2, 0xca, 0xef, 0x41, 0x18,
+	0xb9, 0x23, 0x7b, 0x35, 0x88, 0x3f, 0x22, 0x18, 0xef, 0xda, 0x0e, 0xbc, 0x6c, 0xe4, 0x31, 0x6d,
+	0x52, 0xed, 0xa0, 0x09, 0xb5, 0x4e, 0xbe, 0xfb, 0xf9, 0xeb, 0x7d, 0xdf, 0x2c, 0x9e, 0x96, 0x3f,
+	0x74, 0x6f, 0xe4, 0xd0, 0x37, 0x72, 0x99, 0x75, 0xce, 0xbe, 0xc5, 0x9f, 0x11, 0x4c, 0x14, 0xac,
+	0x0a, 0x5e, 0x35, 0xd2, 0x98, 0x77, 0xb6, 0x76, 0xa1, 0x5c, 0x53, 0x9a, 0x3e, 0xab, 0xae, 0x84,
+	0x4e, 0xe1, 0x09, 0x29, 0x34, 0xbf, 0x56, 0xdf, 0x11, 0x1c, 0x2d, 0x4e, 0x2f, 0xbe, 0xd4, 0x93,
+	0xcd, 0x18, 0x87, 0xda, 0xe5, 0xd2, 0x7d, 0x5a, 0xe8, 0x39, 0x25, 0x74, 0x01, 0x9f, 0xea, 0xe5,
+	0xa8, 0xa3, 0xd3, 0x20, 0xf0, 0x57, 0x04, 0x53, 0x85, 0x79, 0xc6, 0x17, 0x7b, 0x5d, 0xbb, 0x59,
+	0x78, 0x99, 0x54, 0x5a, 0x67, 0x94, 0xd8, 0x13, 0x78, 0xfe, 0x9f, 0xd8, 0x4c, 0x99, 0x54, 0xd9,
+	0xdc, 0x23, 0xe7, 0x07, 0x82, 0xaa, 0x69, 0x87, 0xf0, 0x15, 0x23, 0xe9, 0x3e, 0x6b, 0x57, 0x4e,
+	0xee, 0x2d, 0x25, 0xf7, 0x6a, 0x6d, 0x7f, 0xb9, 0xd7, 0x0a, 0x17, 0x77, 0xad, 0x0d, 0xf5, 0x16,
+	0xdf, 0x32, 0x51, 0xae, 0x8d, 0xef, 0xdd, 0xc6, 0x86, 0xfc, 0x62, 0x37, 0xd0, 0x93, 0x9b, 0xba,
+	0x3a, 0xe0, 0x11, 0x61, 0x81, 0xcd, 0xdb, 0x81, 0x13, 0x50, 0xa6, 0xbe, 0xe7, 0x4e, 0x7a, 0x44,
+	0xe2, 0x50, 0x74, 0xfd, 0x6d, 0xb8, 0xae, 0x1f, 0x9b, 0x83, 0xaa, 0x74, 0xf5, 0x4f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xc0, 0x01, 0x24, 0x32, 0x60, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -819,53 +878,3 @@ var _CloudBilling_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/billing/v1/cloud_billing.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/billing/v1/cloud_billing.proto", fileDescriptor_cloud_billing_afc96ac7b12ba62e)
-}
-
-var fileDescriptor_cloud_billing_afc96ac7b12ba62e = []byte{
-	// 667 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x4e, 0xd4, 0x40,
-	0x14, 0xce, 0x00, 0x12, 0xf6, 0x80, 0x20, 0x03, 0xe8, 0x66, 0x17, 0x10, 0xea, 0x0f, 0x28, 0xb1,
-	0x15, 0xf0, 0xdf, 0xa8, 0x11, 0x63, 0x08, 0x89, 0x31, 0x9b, 0xaa, 0x89, 0xd1, 0x98, 0x66, 0x76,
-	0x3b, 0x34, 0xd5, 0x32, 0x53, 0x77, 0x0a, 0x51, 0x8c, 0x37, 0xbe, 0x82, 0x7a, 0xe1, 0x85, 0x37,
-	0x5e, 0xe8, 0x2b, 0x78, 0xed, 0x2b, 0xf8, 0x0a, 0xde, 0xfb, 0x0a, 0x66, 0xa6, 0x53, 0x65, 0xbb,
-	0x9d, 0x85, 0xc6, 0xbb, 0xe6, 0x9b, 0x73, 0xfa, 0x7d, 0xe7, 0x9b, 0xef, 0x6c, 0x17, 0x96, 0x02,
-	0xce, 0x83, 0x88, 0x3a, 0xad, 0x88, 0x6f, 0xfb, 0x4e, 0x33, 0x8c, 0xa2, 0x90, 0x05, 0xce, 0xce,
-	0x72, 0x0a, 0x78, 0x1a, 0xb0, 0xe3, 0x36, 0x4f, 0x38, 0x3e, 0x96, 0x16, 0xdb, 0xea, 0xcc, 0xce,
-	0xce, 0x76, 0x96, 0x6b, 0xd3, 0xfa, 0x2d, 0x24, 0x0e, 0x1d, 0xc2, 0x18, 0x4f, 0x48, 0x12, 0x72,
-	0x26, 0xd2, 0x36, 0xeb, 0x29, 0x8c, 0xae, 0xa5, 0xb5, 0xb7, 0x5b, 0x2d, 0xbe, 0xcd, 0x12, 0x8c,
-	0x61, 0x80, 0x91, 0x2d, 0x5a, 0x45, 0x73, 0x68, 0xb1, 0xe2, 0xaa, 0x67, 0x89, 0xf1, 0x98, 0xb2,
-	0x6a, 0xdf, 0x1c, 0x5a, 0x1c, 0x72, 0xd5, 0x33, 0x9e, 0x87, 0x11, 0x3f, 0x14, 0x71, 0x44, 0x5e,
-	0x7b, 0xaa, 0xbe, 0x5f, 0xd5, 0x0f, 0x6b, 0xec, 0x3e, 0xd9, 0xa2, 0xd6, 0x17, 0x04, 0xb8, 0xd1,
-	0xe6, 0xcf, 0x69, 0x2b, 0xd1, 0x24, 0x1b, 0x6c, 0x93, 0x17, 0x32, 0xcc, 0x00, 0xc4, 0x69, 0xa5,
-	0x17, 0xfa, 0x8a, 0xa7, 0xe2, 0x56, 0x34, 0xb2, 0xe1, 0xe3, 0xf3, 0x30, 0xa9, 0x47, 0xf2, 0x48,
-	0xaa, 0x73, 0x2f, 0x29, 0x6e, 0x76, 0x8c, 0x20, 0xb9, 0xf1, 0x02, 0x8c, 0x65, 0x1d, 0x94, 0x91,
-	0x66, 0x44, 0xfd, 0xea, 0x80, 0x52, 0x3f, 0xaa, 0xe1, 0xbb, 0x29, 0x6a, 0xd9, 0x50, 0x5d, 0xa7,
-	0x49, 0xa7, 0x09, 0x2e, 0x7d, 0xb9, 0x4d, 0x45, 0xa1, 0x17, 0xd6, 0x63, 0xa8, 0xdd, 0x0b, 0x45,
-	0xae, 0x41, 0x64, 0x1d, 0x75, 0xa8, 0xc4, 0x24, 0xa0, 0x9e, 0x08, 0x77, 0xd3, 0xb6, 0x43, 0xee,
-	0x90, 0x04, 0x1e, 0x84, 0xbb, 0xe9, 0x90, 0xf2, 0x30, 0xe1, 0x2f, 0xb4, 0x99, 0x72, 0x48, 0x12,
-	0xd0, 0x87, 0x12, 0xb0, 0x3e, 0x21, 0xa8, 0x17, 0xbe, 0x5a, 0xc4, 0x9c, 0x09, 0x8a, 0x5d, 0x38,
-	0x92, 0x33, 0x41, 0x54, 0xd1, 0x5c, 0xff, 0xe2, 0xf0, 0xca, 0x82, 0x6d, 0xb8, 0x7d, 0x3b, 0x37,
-	0xd7, 0x58, 0xa7, 0x53, 0x02, 0x9f, 0x86, 0x31, 0x46, 0x5f, 0x25, 0x5e, 0x97, 0xae, 0xc3, 0x12,
-	0x6e, 0xfc, 0xd5, 0xc6, 0x61, 0x46, 0x4a, 0xeb, 0xbe, 0xcd, 0x1e, 0x56, 0x75, 0x9a, 0xd1, 0xd7,
-	0xd3, 0x8c, 0xfe, 0xbc, 0x19, 0xdf, 0x10, 0xcc, 0x9a, 0x18, 0xb5, 0x1f, 0xcf, 0x60, 0x32, 0xcb,
-	0x4c, 0xe6, 0x4b, 0xc8, 0x36, 0xb9, 0xf6, 0x64, 0xc9, 0xe8, 0x49, 0xc1, 0x2b, 0x71, 0xdc, 0x1d,
-	0xd3, 0x83, 0x5a, 0xb3, 0x02, 0xd3, 0xeb, 0xb4, 0x9c, 0x33, 0xd6, 0x07, 0x04, 0xc7, 0x1f, 0xc5,
-	0x3e, 0x49, 0x68, 0x39, 0x47, 0x4d, 0x23, 0x4b, 0x61, 0xff, 0x3f, 0xf2, 0xca, 0xef, 0x41, 0x18,
-	0xb9, 0x23, 0x7b, 0x35, 0x88, 0x3f, 0x22, 0x18, 0xef, 0xda, 0x0e, 0xbc, 0x6c, 0xe4, 0x31, 0x6d,
-	0x52, 0xed, 0xa0, 0x09, 0xb5, 0x4e, 0xbe, 0xfb, 0xf9, 0xeb, 0x7d, 0xdf, 0x2c, 0x9e, 0x96, 0x3f,
-	0x74, 0x6f, 0xe4, 0xd0, 0x37, 0x72, 0x99, 0x75, 0xce, 0xbe, 0xc5, 0x9f, 0x11, 0x4c, 0x14, 0xac,
-	0x0a, 0x5e, 0x35, 0xd2, 0x98, 0x77, 0xb6, 0x76, 0xa1, 0x5c, 0x53, 0x9a, 0x3e, 0xab, 0xae, 0x84,
-	0x4e, 0xe1, 0x09, 0x29, 0x34, 0xbf, 0x56, 0xdf, 0x11, 0x1c, 0x2d, 0x4e, 0x2f, 0xbe, 0xd4, 0x93,
-	0xcd, 0x18, 0x87, 0xda, 0xe5, 0xd2, 0x7d, 0x5a, 0xe8, 0x39, 0x25, 0x74, 0x01, 0x9f, 0xea, 0xe5,
-	0xa8, 0xa3, 0xd3, 0x20, 0xf0, 0x57, 0x04, 0x53, 0x85, 0x79, 0xc6, 0x17, 0x7b, 0x5d, 0xbb, 0x59,
-	0x78, 0x99, 0x54, 0x5a, 0x67, 0x94, 0xd8, 0x13, 0x78, 0xfe, 0x9f, 0xd8, 0x4c, 0x99, 0x54, 0xd9,
-	0xdc, 0x23, 0xe7, 0x07, 0x82, 0xaa, 0x69, 0x87, 0xf0, 0x15, 0x23, 0xe9, 0x3e, 0x6b, 0x57, 0x4e,
-	0xee, 0x2d, 0x25, 0xf7, 0x6a, 0x6d, 0x7f, 0xb9, 0xd7, 0x0a, 0x17, 0x77, 0xad, 0x0d, 0xf5, 0x16,
-	0xdf, 0x32, 0x51, 0xae, 0x8d, 0xef, 0xdd, 0xc6, 0x86, 0xfc, 0x62, 0x37, 0xd0, 0x93, 0x9b, 0xba,
-	0x3a, 0xe0, 0x11, 0x61, 0x81, 0xcd, 0xdb, 0x81, 0x13, 0x50, 0xa6, 0xbe, 0xe7, 0x4e, 0x7a, 0x44,
-	0xe2, 0x50, 0x74, 0xfd, 0x6d, 0xb8, 0xae, 0x1f, 0x9b, 0x83, 0xaa, 0x74, 0xf5, 0x4f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xc0, 0x01, 0x24, 0x32, 0x60, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/binaryauthorization/v1beta1/resources.pb.go b/googleapis/cloud/binaryauthorization/v1beta1/resources.pb.go
index 4983ea49ec..3cb25fd139 100644
--- a/googleapis/cloud/binaryauthorization/v1beta1/resources.pb.go
+++ b/googleapis/cloud/binaryauthorization/v1beta1/resources.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/binaryauthorization/v1beta1/resources.proto
 
-package binaryauthorization // import "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1beta1"
+package binaryauthorization
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Policy_GlobalPolicyEvaluationMode int32
 
@@ -36,6 +39,7 @@ var Policy_GlobalPolicyEvaluationMode_name = map[int32]string{
 	1: "ENABLE",
 	2: "DISABLE",
 }
+
 var Policy_GlobalPolicyEvaluationMode_value = map[string]int32{
 	"GLOBAL_POLICY_EVALUATION_MODE_UNSPECIFIED": 0,
 	"ENABLE":  1,
@@ -45,8 +49,9 @@ var Policy_GlobalPolicyEvaluationMode_value = map[string]int32{
 func (x Policy_GlobalPolicyEvaluationMode) String() string {
 	return proto.EnumName(Policy_GlobalPolicyEvaluationMode_name, int32(x))
 }
+
 func (Policy_GlobalPolicyEvaluationMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{0, 0}
+	return fileDescriptor_1b83e716c45ff98c, []int{0, 0}
 }
 
 type AdmissionRule_EvaluationMode int32
@@ -70,6 +75,7 @@ var AdmissionRule_EvaluationMode_name = map[int32]string{
 	2: "REQUIRE_ATTESTATION",
 	3: "ALWAYS_DENY",
 }
+
 var AdmissionRule_EvaluationMode_value = map[string]int32{
 	"EVALUATION_MODE_UNSPECIFIED": 0,
 	"ALWAYS_ALLOW":                1,
@@ -80,8 +86,9 @@ var AdmissionRule_EvaluationMode_value = map[string]int32{
 func (x AdmissionRule_EvaluationMode) String() string {
 	return proto.EnumName(AdmissionRule_EvaluationMode_name, int32(x))
 }
+
 func (AdmissionRule_EvaluationMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{2, 0}
+	return fileDescriptor_1b83e716c45ff98c, []int{2, 0}
 }
 
 // Defines the possible actions when a pod creation is denied by an admission
@@ -103,6 +110,7 @@ var AdmissionRule_EnforcementMode_name = map[int32]string{
 	1: "ENFORCED_BLOCK_AND_AUDIT_LOG",
 	2: "DRYRUN_AUDIT_LOG_ONLY",
 }
+
 var AdmissionRule_EnforcementMode_value = map[string]int32{
 	"ENFORCEMENT_MODE_UNSPECIFIED": 0,
 	"ENFORCED_BLOCK_AND_AUDIT_LOG": 1,
@@ -112,8 +120,9 @@ var AdmissionRule_EnforcementMode_value = map[string]int32{
 func (x AdmissionRule_EnforcementMode) String() string {
 	return proto.EnumName(AdmissionRule_EnforcementMode_name, int32(x))
 }
+
 func (AdmissionRule_EnforcementMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{2, 1}
+	return fileDescriptor_1b83e716c45ff98c, []int{2, 1}
 }
 
 // Represents a signature algorithm and other information necessary to verify
@@ -165,6 +174,7 @@ var PkixPublicKey_SignatureAlgorithm_name = map[int32]string{
 	10: "ECDSA_P384_SHA384",
 	11: "ECDSA_P521_SHA512",
 }
+
 var PkixPublicKey_SignatureAlgorithm_value = map[string]int32{
 	"SIGNATURE_ALGORITHM_UNSPECIFIED": 0,
 	"RSA_PSS_2048_SHA256":             1,
@@ -183,8 +193,9 @@ var PkixPublicKey_SignatureAlgorithm_value = map[string]int32{
 func (x PkixPublicKey_SignatureAlgorithm) String() string {
 	return proto.EnumName(PkixPublicKey_SignatureAlgorithm_name, int32(x))
 }
+
 func (PkixPublicKey_SignatureAlgorithm) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{5, 0}
+	return fileDescriptor_1b83e716c45ff98c, []int{5, 0}
 }
 
 // A [policy][google.cloud.binaryauthorization.v1beta1.Policy] for container image binary authorization.
@@ -225,16 +236,17 @@ func (m *Policy) Reset()         { *m = Policy{} }
 func (m *Policy) String() string { return proto.CompactTextString(m) }
 func (*Policy) ProtoMessage()    {}
 func (*Policy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{0}
+	return fileDescriptor_1b83e716c45ff98c, []int{0}
 }
+
 func (m *Policy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Policy.Unmarshal(m, b)
 }
 func (m *Policy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Policy.Marshal(b, m, deterministic)
 }
-func (dst *Policy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Policy.Merge(dst, src)
+func (m *Policy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Policy.Merge(m, src)
 }
 func (m *Policy) XXX_Size() int {
 	return xxx_messageInfo_Policy.Size(m)
@@ -310,16 +322,17 @@ func (m *AdmissionWhitelistPattern) Reset()         { *m = AdmissionWhitelistPat
 func (m *AdmissionWhitelistPattern) String() string { return proto.CompactTextString(m) }
 func (*AdmissionWhitelistPattern) ProtoMessage()    {}
 func (*AdmissionWhitelistPattern) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{1}
+	return fileDescriptor_1b83e716c45ff98c, []int{1}
 }
+
 func (m *AdmissionWhitelistPattern) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdmissionWhitelistPattern.Unmarshal(m, b)
 }
 func (m *AdmissionWhitelistPattern) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdmissionWhitelistPattern.Marshal(b, m, deterministic)
 }
-func (dst *AdmissionWhitelistPattern) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdmissionWhitelistPattern.Merge(dst, src)
+func (m *AdmissionWhitelistPattern) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdmissionWhitelistPattern.Merge(m, src)
 }
 func (m *AdmissionWhitelistPattern) XXX_Size() int {
 	return xxx_messageInfo_AdmissionWhitelistPattern.Size(m)
@@ -367,16 +380,17 @@ func (m *AdmissionRule) Reset()         { *m = AdmissionRule{} }
 func (m *AdmissionRule) String() string { return proto.CompactTextString(m) }
 func (*AdmissionRule) ProtoMessage()    {}
 func (*AdmissionRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{2}
+	return fileDescriptor_1b83e716c45ff98c, []int{2}
 }
+
 func (m *AdmissionRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdmissionRule.Unmarshal(m, b)
 }
 func (m *AdmissionRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdmissionRule.Marshal(b, m, deterministic)
 }
-func (dst *AdmissionRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdmissionRule.Merge(dst, src)
+func (m *AdmissionRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdmissionRule.Merge(m, src)
 }
 func (m *AdmissionRule) XXX_Size() int {
 	return xxx_messageInfo_AdmissionRule.Size(m)
@@ -438,16 +452,17 @@ func (m *Attestor) Reset()         { *m = Attestor{} }
 func (m *Attestor) String() string { return proto.CompactTextString(m) }
 func (*Attestor) ProtoMessage()    {}
 func (*Attestor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{3}
+	return fileDescriptor_1b83e716c45ff98c, []int{3}
 }
+
 func (m *Attestor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Attestor.Unmarshal(m, b)
 }
 func (m *Attestor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Attestor.Marshal(b, m, deterministic)
 }
-func (dst *Attestor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Attestor.Merge(dst, src)
+func (m *Attestor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Attestor.Merge(m, src)
 }
 func (m *Attestor) XXX_Size() int {
 	return xxx_messageInfo_Attestor.Size(m)
@@ -503,61 +518,13 @@ func (m *Attestor) GetUpdateTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Attestor) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Attestor_OneofMarshaler, _Attestor_OneofUnmarshaler, _Attestor_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Attestor) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Attestor_UserOwnedDrydockNote)(nil),
 	}
 }
 
-func _Attestor_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Attestor)
-	// attestor_type
-	switch x := m.AttestorType.(type) {
-	case *Attestor_UserOwnedDrydockNote:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UserOwnedDrydockNote); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Attestor.AttestorType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Attestor_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Attestor)
-	switch tag {
-	case 3: // attestor_type.user_owned_drydock_note
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UserOwnedDrydockNote)
-		err := b.DecodeMessage(msg)
-		m.AttestorType = &Attestor_UserOwnedDrydockNote{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Attestor_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Attestor)
-	// attestor_type
-	switch x := m.AttestorType.(type) {
-	case *Attestor_UserOwnedDrydockNote:
-		s := proto.Size(x.UserOwnedDrydockNote)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An [user owned drydock note][google.cloud.binaryauthorization.v1beta1.UserOwnedDrydockNote] references a Drydock
 // ATTESTATION_AUTHORITY Note created by the user.
 type UserOwnedDrydockNote struct {
@@ -598,16 +565,17 @@ func (m *UserOwnedDrydockNote) Reset()         { *m = UserOwnedDrydockNote{} }
 func (m *UserOwnedDrydockNote) String() string { return proto.CompactTextString(m) }
 func (*UserOwnedDrydockNote) ProtoMessage()    {}
 func (*UserOwnedDrydockNote) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{4}
+	return fileDescriptor_1b83e716c45ff98c, []int{4}
 }
+
 func (m *UserOwnedDrydockNote) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserOwnedDrydockNote.Unmarshal(m, b)
 }
 func (m *UserOwnedDrydockNote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UserOwnedDrydockNote.Marshal(b, m, deterministic)
 }
-func (dst *UserOwnedDrydockNote) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UserOwnedDrydockNote.Merge(dst, src)
+func (m *UserOwnedDrydockNote) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserOwnedDrydockNote.Merge(m, src)
 }
 func (m *UserOwnedDrydockNote) XXX_Size() int {
 	return xxx_messageInfo_UserOwnedDrydockNote.Size(m)
@@ -662,16 +630,17 @@ func (m *PkixPublicKey) Reset()         { *m = PkixPublicKey{} }
 func (m *PkixPublicKey) String() string { return proto.CompactTextString(m) }
 func (*PkixPublicKey) ProtoMessage()    {}
 func (*PkixPublicKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{5}
+	return fileDescriptor_1b83e716c45ff98c, []int{5}
 }
+
 func (m *PkixPublicKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PkixPublicKey.Unmarshal(m, b)
 }
 func (m *PkixPublicKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PkixPublicKey.Marshal(b, m, deterministic)
 }
-func (dst *PkixPublicKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PkixPublicKey.Merge(dst, src)
+func (m *PkixPublicKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PkixPublicKey.Merge(m, src)
 }
 func (m *PkixPublicKey) XXX_Size() int {
 	return xxx_messageInfo_PkixPublicKey.Size(m)
@@ -725,16 +694,17 @@ func (m *AttestorPublicKey) Reset()         { *m = AttestorPublicKey{} }
 func (m *AttestorPublicKey) String() string { return proto.CompactTextString(m) }
 func (*AttestorPublicKey) ProtoMessage()    {}
 func (*AttestorPublicKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_15311d1ac079a106, []int{6}
+	return fileDescriptor_1b83e716c45ff98c, []int{6}
 }
+
 func (m *AttestorPublicKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttestorPublicKey.Unmarshal(m, b)
 }
 func (m *AttestorPublicKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttestorPublicKey.Marshal(b, m, deterministic)
 }
-func (dst *AttestorPublicKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttestorPublicKey.Merge(dst, src)
+func (m *AttestorPublicKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttestorPublicKey.Merge(m, src)
 }
 func (m *AttestorPublicKey) XXX_Size() int {
 	return xxx_messageInfo_AttestorPublicKey.Size(m)
@@ -796,77 +766,19 @@ func (m *AttestorPublicKey) GetPkixPublicKey() *PkixPublicKey {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AttestorPublicKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AttestorPublicKey_OneofMarshaler, _AttestorPublicKey_OneofUnmarshaler, _AttestorPublicKey_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AttestorPublicKey) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AttestorPublicKey_AsciiArmoredPgpPublicKey)(nil),
 		(*AttestorPublicKey_PkixPublicKey)(nil),
 	}
 }
 
-func _AttestorPublicKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AttestorPublicKey)
-	// public_key
-	switch x := m.PublicKey.(type) {
-	case *AttestorPublicKey_AsciiArmoredPgpPublicKey:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AsciiArmoredPgpPublicKey)
-	case *AttestorPublicKey_PkixPublicKey:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PkixPublicKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AttestorPublicKey.PublicKey has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AttestorPublicKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AttestorPublicKey)
-	switch tag {
-	case 3: // public_key.ascii_armored_pgp_public_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PublicKey = &AttestorPublicKey_AsciiArmoredPgpPublicKey{x}
-		return true, err
-	case 5: // public_key.pkix_public_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PkixPublicKey)
-		err := b.DecodeMessage(msg)
-		m.PublicKey = &AttestorPublicKey_PkixPublicKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AttestorPublicKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AttestorPublicKey)
-	// public_key
-	switch x := m.PublicKey.(type) {
-	case *AttestorPublicKey_AsciiArmoredPgpPublicKey:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AsciiArmoredPgpPublicKey)))
-		n += len(x.AsciiArmoredPgpPublicKey)
-	case *AttestorPublicKey_PkixPublicKey:
-		s := proto.Size(x.PkixPublicKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.Policy_GlobalPolicyEvaluationMode", Policy_GlobalPolicyEvaluationMode_name, Policy_GlobalPolicyEvaluationMode_value)
+	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.AdmissionRule_EvaluationMode", AdmissionRule_EvaluationMode_name, AdmissionRule_EvaluationMode_value)
+	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.AdmissionRule_EnforcementMode", AdmissionRule_EnforcementMode_name, AdmissionRule_EnforcementMode_value)
+	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.PkixPublicKey_SignatureAlgorithm", PkixPublicKey_SignatureAlgorithm_name, PkixPublicKey_SignatureAlgorithm_value)
 	proto.RegisterType((*Policy)(nil), "google.cloud.binaryauthorization.v1beta1.Policy")
 	proto.RegisterMapType((map[string]*AdmissionRule)(nil), "google.cloud.binaryauthorization.v1beta1.Policy.ClusterAdmissionRulesEntry")
 	proto.RegisterType((*AdmissionWhitelistPattern)(nil), "google.cloud.binaryauthorization.v1beta1.AdmissionWhitelistPattern")
@@ -875,17 +787,13 @@ func init() {
 	proto.RegisterType((*UserOwnedDrydockNote)(nil), "google.cloud.binaryauthorization.v1beta1.UserOwnedDrydockNote")
 	proto.RegisterType((*PkixPublicKey)(nil), "google.cloud.binaryauthorization.v1beta1.PkixPublicKey")
 	proto.RegisterType((*AttestorPublicKey)(nil), "google.cloud.binaryauthorization.v1beta1.AttestorPublicKey")
-	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.Policy_GlobalPolicyEvaluationMode", Policy_GlobalPolicyEvaluationMode_name, Policy_GlobalPolicyEvaluationMode_value)
-	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.AdmissionRule_EvaluationMode", AdmissionRule_EvaluationMode_name, AdmissionRule_EvaluationMode_value)
-	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.AdmissionRule_EnforcementMode", AdmissionRule_EnforcementMode_name, AdmissionRule_EnforcementMode_value)
-	proto.RegisterEnum("google.cloud.binaryauthorization.v1beta1.PkixPublicKey_SignatureAlgorithm", PkixPublicKey_SignatureAlgorithm_name, PkixPublicKey_SignatureAlgorithm_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/binaryauthorization/v1beta1/resources.proto", fileDescriptor_resources_15311d1ac079a106)
+	proto.RegisterFile("google/cloud/binaryauthorization/v1beta1/resources.proto", fileDescriptor_1b83e716c45ff98c)
 }
 
-var fileDescriptor_resources_15311d1ac079a106 = []byte{
+var fileDescriptor_1b83e716c45ff98c = []byte{
 	// 1214 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x5f, 0x73, 0xdb, 0xc4,
 	0x17, 0x8d, 0x9c, 0x7f, 0xcd, 0x75, 0xe2, 0xb8, 0xdb, 0xe6, 0x17, 0xd7, 0xbf, 0x94, 0x1a, 0x03,
diff --git a/googleapis/cloud/binaryauthorization/v1beta1/service.pb.go b/googleapis/cloud/binaryauthorization/v1beta1/service.pb.go
index cc64b2e014..2099610b55 100644
--- a/googleapis/cloud/binaryauthorization/v1beta1/service.pb.go
+++ b/googleapis/cloud/binaryauthorization/v1beta1/service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/binaryauthorization/v1beta1/service.proto
 
-package binaryauthorization // import "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package binaryauthorization
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [BinauthzManagementService.GetPolicy][].
 type GetPolicyRequest struct {
@@ -39,16 +39,17 @@ func (m *GetPolicyRequest) Reset()         { *m = GetPolicyRequest{} }
 func (m *GetPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetPolicyRequest) ProtoMessage()    {}
 func (*GetPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{0}
+	return fileDescriptor_b5f16bed3f845be4, []int{0}
 }
+
 func (m *GetPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPolicyRequest.Unmarshal(m, b)
 }
 func (m *GetPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetPolicyRequest.Merge(dst, src)
+func (m *GetPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPolicyRequest.Merge(m, src)
 }
 func (m *GetPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetPolicyRequest.Size(m)
@@ -81,16 +82,17 @@ func (m *UpdatePolicyRequest) Reset()         { *m = UpdatePolicyRequest{} }
 func (m *UpdatePolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdatePolicyRequest) ProtoMessage()    {}
 func (*UpdatePolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{1}
+	return fileDescriptor_b5f16bed3f845be4, []int{1}
 }
+
 func (m *UpdatePolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdatePolicyRequest.Unmarshal(m, b)
 }
 func (m *UpdatePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdatePolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdatePolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdatePolicyRequest.Merge(dst, src)
+func (m *UpdatePolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdatePolicyRequest.Merge(m, src)
 }
 func (m *UpdatePolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdatePolicyRequest.Size(m)
@@ -127,16 +129,17 @@ func (m *CreateAttestorRequest) Reset()         { *m = CreateAttestorRequest{} }
 func (m *CreateAttestorRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAttestorRequest) ProtoMessage()    {}
 func (*CreateAttestorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{2}
+	return fileDescriptor_b5f16bed3f845be4, []int{2}
 }
+
 func (m *CreateAttestorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAttestorRequest.Unmarshal(m, b)
 }
 func (m *CreateAttestorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAttestorRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAttestorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAttestorRequest.Merge(dst, src)
+func (m *CreateAttestorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAttestorRequest.Merge(m, src)
 }
 func (m *CreateAttestorRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAttestorRequest.Size(m)
@@ -182,16 +185,17 @@ func (m *GetAttestorRequest) Reset()         { *m = GetAttestorRequest{} }
 func (m *GetAttestorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAttestorRequest) ProtoMessage()    {}
 func (*GetAttestorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{3}
+	return fileDescriptor_b5f16bed3f845be4, []int{3}
 }
+
 func (m *GetAttestorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAttestorRequest.Unmarshal(m, b)
 }
 func (m *GetAttestorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAttestorRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAttestorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAttestorRequest.Merge(dst, src)
+func (m *GetAttestorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAttestorRequest.Merge(m, src)
 }
 func (m *GetAttestorRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAttestorRequest.Size(m)
@@ -224,16 +228,17 @@ func (m *UpdateAttestorRequest) Reset()         { *m = UpdateAttestorRequest{} }
 func (m *UpdateAttestorRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateAttestorRequest) ProtoMessage()    {}
 func (*UpdateAttestorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{4}
+	return fileDescriptor_b5f16bed3f845be4, []int{4}
 }
+
 func (m *UpdateAttestorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateAttestorRequest.Unmarshal(m, b)
 }
 func (m *UpdateAttestorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateAttestorRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateAttestorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateAttestorRequest.Merge(dst, src)
+func (m *UpdateAttestorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAttestorRequest.Merge(m, src)
 }
 func (m *UpdateAttestorRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateAttestorRequest.Size(m)
@@ -272,16 +277,17 @@ func (m *ListAttestorsRequest) Reset()         { *m = ListAttestorsRequest{} }
 func (m *ListAttestorsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAttestorsRequest) ProtoMessage()    {}
 func (*ListAttestorsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{5}
+	return fileDescriptor_b5f16bed3f845be4, []int{5}
 }
+
 func (m *ListAttestorsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAttestorsRequest.Unmarshal(m, b)
 }
 func (m *ListAttestorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAttestorsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAttestorsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAttestorsRequest.Merge(dst, src)
+func (m *ListAttestorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAttestorsRequest.Merge(m, src)
 }
 func (m *ListAttestorsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAttestorsRequest.Size(m)
@@ -330,16 +336,17 @@ func (m *ListAttestorsResponse) Reset()         { *m = ListAttestorsResponse{} }
 func (m *ListAttestorsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAttestorsResponse) ProtoMessage()    {}
 func (*ListAttestorsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{6}
+	return fileDescriptor_b5f16bed3f845be4, []int{6}
 }
+
 func (m *ListAttestorsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAttestorsResponse.Unmarshal(m, b)
 }
 func (m *ListAttestorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAttestorsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAttestorsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAttestorsResponse.Merge(dst, src)
+func (m *ListAttestorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAttestorsResponse.Merge(m, src)
 }
 func (m *ListAttestorsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAttestorsResponse.Size(m)
@@ -378,16 +385,17 @@ func (m *DeleteAttestorRequest) Reset()         { *m = DeleteAttestorRequest{} }
 func (m *DeleteAttestorRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAttestorRequest) ProtoMessage()    {}
 func (*DeleteAttestorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_416c3c6c0a0ebbdc, []int{7}
+	return fileDescriptor_b5f16bed3f845be4, []int{7}
 }
+
 func (m *DeleteAttestorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAttestorRequest.Unmarshal(m, b)
 }
 func (m *DeleteAttestorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAttestorRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAttestorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAttestorRequest.Merge(dst, src)
+func (m *DeleteAttestorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAttestorRequest.Merge(m, src)
 }
 func (m *DeleteAttestorRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAttestorRequest.Size(m)
@@ -416,6 +424,58 @@ func init() {
 	proto.RegisterType((*DeleteAttestorRequest)(nil), "google.cloud.binaryauthorization.v1beta1.DeleteAttestorRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/binaryauthorization/v1beta1/service.proto", fileDescriptor_b5f16bed3f845be4)
+}
+
+var fileDescriptor_b5f16bed3f845be4 = []byte{
+	// 701 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x4f, 0x13, 0x41,
+	0x14, 0xc7, 0x33, 0xa0, 0x84, 0x3e, 0x04, 0xcd, 0x68, 0x49, 0xb3, 0x68, 0xc4, 0x35, 0x69, 0x2a,
+	0x26, 0xbb, 0x52, 0x13, 0x43, 0x40, 0x24, 0xa0, 0x06, 0x4d, 0xd4, 0x90, 0xa2, 0x1e, 0xf4, 0x50,
+	0xa7, 0xed, 0x73, 0x5d, 0x2c, 0x33, 0xeb, 0xce, 0x94, 0x48, 0x0d, 0x17, 0xff, 0x03, 0xe3, 0xc9,
+	0x9b, 0x89, 0xde, 0x3d, 0x7b, 0xd2, 0xa3, 0x77, 0xff, 0x05, 0xff, 0x08, 0x8f, 0x66, 0x67, 0x7f,
+	0xb0, 0xad, 0x0b, 0x6c, 0x1b, 0x6e, 0x9d, 0x1f, 0xef, 0xbd, 0xcf, 0x7b, 0xf3, 0xbe, 0x6f, 0x0b,
+	0x37, 0x1c, 0x21, 0x9c, 0x36, 0xda, 0xcd, 0xb6, 0xe8, 0xb4, 0xec, 0x86, 0xcb, 0x99, 0xbf, 0xcb,
+	0x3a, 0xea, 0x95, 0xf0, 0xdd, 0x2e, 0x53, 0xae, 0xe0, 0xf6, 0xce, 0x7c, 0x03, 0x15, 0x9b, 0xb7,
+	0x25, 0xfa, 0x3b, 0x6e, 0x13, 0x2d, 0xcf, 0x17, 0x4a, 0xd0, 0x4a, 0x68, 0x67, 0x69, 0x3b, 0x2b,
+	0xc3, 0xce, 0x8a, 0xec, 0x8c, 0xf3, 0x51, 0x04, 0xe6, 0xb9, 0x36, 0xe3, 0x5c, 0x28, 0x7d, 0x2c,
+	0x43, 0x3f, 0xc6, 0x42, 0xee, 0xf8, 0x3e, 0x4a, 0xd1, 0xf1, 0x9b, 0x18, 0x5b, 0xce, 0x44, 0x96,
+	0x7a, 0xd5, 0xe8, 0xbc, 0xb4, 0x71, 0xdb, 0x53, 0xbb, 0xe1, 0xa1, 0x59, 0x86, 0x33, 0xeb, 0xa8,
+	0x36, 0x44, 0xdb, 0x6d, 0xee, 0xd6, 0xf0, 0x4d, 0x07, 0xa5, 0xa2, 0x14, 0x4e, 0x70, 0xb6, 0x8d,
+	0x25, 0x32, 0x4b, 0x2a, 0x85, 0x9a, 0xfe, 0x6d, 0xd6, 0xe1, 0xec, 0x13, 0xaf, 0xc5, 0x14, 0xf6,
+	0x5e, 0xbd, 0x07, 0x63, 0x9e, 0xde, 0xd0, 0x97, 0x27, 0xaa, 0xd7, 0xac, 0xbc, 0xe9, 0x5a, 0x91,
+	0xa3, 0xc8, 0xde, 0xfc, 0x4c, 0xa0, 0x78, 0xdb, 0x47, 0xa6, 0x70, 0x55, 0x29, 0x94, 0x4a, 0xf8,
+	0x71, 0x8c, 0x69, 0x18, 0xf3, 0x98, 0x8f, 0x5c, 0x45, 0x40, 0xd1, 0x8a, 0x5e, 0x84, 0x09, 0x16,
+	0x5d, 0xad, 0xbb, 0xad, 0xd2, 0x88, 0x3e, 0x84, 0x78, 0xeb, 0x7e, 0x8b, 0x3e, 0x82, 0xf1, 0x78,
+	0x55, 0x1a, 0xd5, 0x78, 0xd5, 0xfc, 0x78, 0x09, 0x45, 0xe2, 0xc3, 0xac, 0x00, 0x5d, 0x47, 0xd5,
+	0x8f, 0x97, 0x55, 0x2d, 0x07, 0x8a, 0x61, 0xb5, 0xfa, 0x2f, 0xa7, 0x91, 0xc8, 0x31, 0x20, 0x6d,
+	0xc1, 0xb9, 0x07, 0xae, 0x4c, 0x98, 0xe4, 0x51, 0x35, 0x9b, 0x81, 0x82, 0xc7, 0x1c, 0xac, 0x4b,
+	0xb7, 0x8b, 0xba, 0x62, 0x27, 0x6b, 0xe3, 0xc1, 0xc6, 0xa6, 0xdb, 0x45, 0x7a, 0x01, 0x40, 0x1f,
+	0x2a, 0xf1, 0x1a, 0xb9, 0xae, 0x58, 0xa1, 0xa6, 0xaf, 0x3f, 0x0e, 0x36, 0xcc, 0x0f, 0x04, 0x8a,
+	0x7d, 0xc1, 0xa4, 0x27, 0xb8, 0x44, 0xba, 0x01, 0x85, 0x98, 0x48, 0x96, 0xc8, 0xec, 0xe8, 0x90,
+	0x69, 0xed, 0x3b, 0xa1, 0x65, 0x38, 0xcd, 0xf1, 0xad, 0xaa, 0xa7, 0x78, 0xc2, 0xf7, 0x9d, 0x0c,
+	0xb6, 0x37, 0x12, 0xa6, 0xab, 0x50, 0xbc, 0x83, 0x6d, 0xfc, 0xbf, 0xd0, 0x19, 0xaf, 0x52, 0xfd,
+	0x02, 0x30, 0xbb, 0xe6, 0xf2, 0x80, 0xa2, 0xfb, 0x90, 0x71, 0xe6, 0xe0, 0x36, 0x72, 0xb5, 0x19,
+	0xca, 0xf5, 0xe9, 0xfc, 0x5a, 0x40, 0x43, 0xbf, 0x12, 0x28, 0x24, 0x8a, 0xa0, 0x8b, 0xf9, 0xd3,
+	0xe8, 0x97, 0x91, 0x31, 0xb0, 0x16, 0xcc, 0x2b, 0xef, 0x7f, 0xff, 0xf9, 0x38, 0x72, 0x99, 0x5e,
+	0x4a, 0xb4, 0xfc, 0x2e, 0x00, 0x5f, 0xf6, 0x7c, 0xb1, 0x85, 0x4d, 0x25, 0xed, 0x39, 0x3b, 0x54,
+	0xcb, 0x1e, 0xfd, 0x4e, 0xe0, 0x54, 0x5a, 0x90, 0x74, 0x39, 0x7f, 0xb4, 0x0c, 0x21, 0x0f, 0x01,
+	0xbb, 0xa0, 0x61, 0xab, 0x46, 0x65, 0x1f, 0x36, 0x84, 0xb3, 0x0e, 0x60, 0x5e, 0x8c, 0xa4, 0x4e,
+	0x7f, 0x10, 0x98, 0xea, 0x95, 0x3a, 0x5d, 0xc9, 0x1f, 0x3e, 0x73, 0x48, 0x18, 0x43, 0xf4, 0x5b,
+	0x9c, 0x81, 0x59, 0x4e, 0x65, 0xa0, 0x65, 0x92, 0x82, 0xdf, 0xb3, 0x93, 0xa6, 0x5c, 0x4c, 0x64,
+	0x47, 0xbf, 0x11, 0x98, 0x48, 0x8d, 0x02, 0x7a, 0x73, 0xa0, 0x36, 0x39, 0x0e, 0x76, 0x4b, 0xb3,
+	0x57, 0x68, 0xf9, 0xe0, 0x56, 0x49, 0xc0, 0xed, 0xb9, 0x3d, 0xfa, 0x8b, 0xc0, 0x54, 0xef, 0x48,
+	0x1a, 0xa4, 0xe6, 0x99, 0xc3, 0x6c, 0x28, 0xee, 0x55, 0xcd, 0xbd, 0x64, 0xd8, 0xfb, 0xdc, 0x31,
+	0xa7, 0x75, 0x58, 0x02, 0xa9, 0xe2, 0xff, 0x24, 0x30, 0xd9, 0x33, 0x87, 0xe8, 0xad, 0xfc, 0x20,
+	0x59, 0xd3, 0xd2, 0x58, 0x19, 0xda, 0x3e, 0x1c, 0x80, 0x59, 0xaf, 0x71, 0x58, 0x27, 0xd1, 0x4f,
+	0x04, 0xa6, 0x7a, 0xe7, 0xd6, 0x20, 0xaf, 0x91, 0x39, 0xf1, 0x8c, 0xe9, 0xd8, 0x41, 0xfc, 0x9d,
+	0xb7, 0xee, 0x06, 0xdf, 0xf9, 0x98, 0x6d, 0x2e, 0x67, 0xa7, 0xac, 0xbd, 0x78, 0xf6, 0x3c, 0x72,
+	0xe4, 0x88, 0x36, 0xe3, 0x8e, 0x25, 0x7c, 0xc7, 0x76, 0x90, 0x6b, 0xb7, 0x76, 0x78, 0xc4, 0x3c,
+	0x57, 0x1e, 0xfd, 0x4f, 0x64, 0x29, 0xe3, 0xec, 0x2f, 0x21, 0x8d, 0x31, 0xed, 0xea, 0xfa, 0xbf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xda, 0x4c, 0x49, 0x53, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -723,55 +783,3 @@ var _BinauthzManagementServiceV1Beta1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/binaryauthorization/v1beta1/service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/binaryauthorization/v1beta1/service.proto", fileDescriptor_service_416c3c6c0a0ebbdc)
-}
-
-var fileDescriptor_service_416c3c6c0a0ebbdc = []byte{
-	// 701 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x4f, 0x13, 0x41,
-	0x14, 0xc7, 0x33, 0xa0, 0x84, 0x3e, 0x04, 0xcd, 0x68, 0x49, 0xb3, 0x68, 0xc4, 0x35, 0x69, 0x2a,
-	0x26, 0xbb, 0x52, 0x13, 0x43, 0x40, 0x24, 0xa0, 0x06, 0x4d, 0xd4, 0x90, 0xa2, 0x1e, 0xf4, 0x50,
-	0xa7, 0xed, 0x73, 0x5d, 0x2c, 0x33, 0xeb, 0xce, 0x94, 0x48, 0x0d, 0x17, 0xff, 0x03, 0xe3, 0xc9,
-	0x9b, 0x89, 0xde, 0x3d, 0x7b, 0xd2, 0xa3, 0x77, 0xff, 0x05, 0xff, 0x08, 0x8f, 0x66, 0x67, 0x7f,
-	0xb0, 0xad, 0x0b, 0x6c, 0x1b, 0x6e, 0x9d, 0x1f, 0xef, 0xbd, 0xcf, 0x7b, 0xf3, 0xbe, 0x6f, 0x0b,
-	0x37, 0x1c, 0x21, 0x9c, 0x36, 0xda, 0xcd, 0xb6, 0xe8, 0xb4, 0xec, 0x86, 0xcb, 0x99, 0xbf, 0xcb,
-	0x3a, 0xea, 0x95, 0xf0, 0xdd, 0x2e, 0x53, 0xae, 0xe0, 0xf6, 0xce, 0x7c, 0x03, 0x15, 0x9b, 0xb7,
-	0x25, 0xfa, 0x3b, 0x6e, 0x13, 0x2d, 0xcf, 0x17, 0x4a, 0xd0, 0x4a, 0x68, 0x67, 0x69, 0x3b, 0x2b,
-	0xc3, 0xce, 0x8a, 0xec, 0x8c, 0xf3, 0x51, 0x04, 0xe6, 0xb9, 0x36, 0xe3, 0x5c, 0x28, 0x7d, 0x2c,
-	0x43, 0x3f, 0xc6, 0x42, 0xee, 0xf8, 0x3e, 0x4a, 0xd1, 0xf1, 0x9b, 0x18, 0x5b, 0xce, 0x44, 0x96,
-	0x7a, 0xd5, 0xe8, 0xbc, 0xb4, 0x71, 0xdb, 0x53, 0xbb, 0xe1, 0xa1, 0x59, 0x86, 0x33, 0xeb, 0xa8,
-	0x36, 0x44, 0xdb, 0x6d, 0xee, 0xd6, 0xf0, 0x4d, 0x07, 0xa5, 0xa2, 0x14, 0x4e, 0x70, 0xb6, 0x8d,
-	0x25, 0x32, 0x4b, 0x2a, 0x85, 0x9a, 0xfe, 0x6d, 0xd6, 0xe1, 0xec, 0x13, 0xaf, 0xc5, 0x14, 0xf6,
-	0x5e, 0xbd, 0x07, 0x63, 0x9e, 0xde, 0xd0, 0x97, 0x27, 0xaa, 0xd7, 0xac, 0xbc, 0xe9, 0x5a, 0x91,
-	0xa3, 0xc8, 0xde, 0xfc, 0x4c, 0xa0, 0x78, 0xdb, 0x47, 0xa6, 0x70, 0x55, 0x29, 0x94, 0x4a, 0xf8,
-	0x71, 0x8c, 0x69, 0x18, 0xf3, 0x98, 0x8f, 0x5c, 0x45, 0x40, 0xd1, 0x8a, 0x5e, 0x84, 0x09, 0x16,
-	0x5d, 0xad, 0xbb, 0xad, 0xd2, 0x88, 0x3e, 0x84, 0x78, 0xeb, 0x7e, 0x8b, 0x3e, 0x82, 0xf1, 0x78,
-	0x55, 0x1a, 0xd5, 0x78, 0xd5, 0xfc, 0x78, 0x09, 0x45, 0xe2, 0xc3, 0xac, 0x00, 0x5d, 0x47, 0xd5,
-	0x8f, 0x97, 0x55, 0x2d, 0x07, 0x8a, 0x61, 0xb5, 0xfa, 0x2f, 0xa7, 0x91, 0xc8, 0x31, 0x20, 0x6d,
-	0xc1, 0xb9, 0x07, 0xae, 0x4c, 0x98, 0xe4, 0x51, 0x35, 0x9b, 0x81, 0x82, 0xc7, 0x1c, 0xac, 0x4b,
-	0xb7, 0x8b, 0xba, 0x62, 0x27, 0x6b, 0xe3, 0xc1, 0xc6, 0xa6, 0xdb, 0x45, 0x7a, 0x01, 0x40, 0x1f,
-	0x2a, 0xf1, 0x1a, 0xb9, 0xae, 0x58, 0xa1, 0xa6, 0xaf, 0x3f, 0x0e, 0x36, 0xcc, 0x0f, 0x04, 0x8a,
-	0x7d, 0xc1, 0xa4, 0x27, 0xb8, 0x44, 0xba, 0x01, 0x85, 0x98, 0x48, 0x96, 0xc8, 0xec, 0xe8, 0x90,
-	0x69, 0xed, 0x3b, 0xa1, 0x65, 0x38, 0xcd, 0xf1, 0xad, 0xaa, 0xa7, 0x78, 0xc2, 0xf7, 0x9d, 0x0c,
-	0xb6, 0x37, 0x12, 0xa6, 0xab, 0x50, 0xbc, 0x83, 0x6d, 0xfc, 0xbf, 0xd0, 0x19, 0xaf, 0x52, 0xfd,
-	0x02, 0x30, 0xbb, 0xe6, 0xf2, 0x80, 0xa2, 0xfb, 0x90, 0x71, 0xe6, 0xe0, 0x36, 0x72, 0xb5, 0x19,
-	0xca, 0xf5, 0xe9, 0xfc, 0x5a, 0x40, 0x43, 0xbf, 0x12, 0x28, 0x24, 0x8a, 0xa0, 0x8b, 0xf9, 0xd3,
-	0xe8, 0x97, 0x91, 0x31, 0xb0, 0x16, 0xcc, 0x2b, 0xef, 0x7f, 0xff, 0xf9, 0x38, 0x72, 0x99, 0x5e,
-	0x4a, 0xb4, 0xfc, 0x2e, 0x00, 0x5f, 0xf6, 0x7c, 0xb1, 0x85, 0x4d, 0x25, 0xed, 0x39, 0x3b, 0x54,
-	0xcb, 0x1e, 0xfd, 0x4e, 0xe0, 0x54, 0x5a, 0x90, 0x74, 0x39, 0x7f, 0xb4, 0x0c, 0x21, 0x0f, 0x01,
-	0xbb, 0xa0, 0x61, 0xab, 0x46, 0x65, 0x1f, 0x36, 0x84, 0xb3, 0x0e, 0x60, 0x5e, 0x8c, 0xa4, 0x4e,
-	0x7f, 0x10, 0x98, 0xea, 0x95, 0x3a, 0x5d, 0xc9, 0x1f, 0x3e, 0x73, 0x48, 0x18, 0x43, 0xf4, 0x5b,
-	0x9c, 0x81, 0x59, 0x4e, 0x65, 0xa0, 0x65, 0x92, 0x82, 0xdf, 0xb3, 0x93, 0xa6, 0x5c, 0x4c, 0x64,
-	0x47, 0xbf, 0x11, 0x98, 0x48, 0x8d, 0x02, 0x7a, 0x73, 0xa0, 0x36, 0x39, 0x0e, 0x76, 0x4b, 0xb3,
-	0x57, 0x68, 0xf9, 0xe0, 0x56, 0x49, 0xc0, 0xed, 0xb9, 0x3d, 0xfa, 0x8b, 0xc0, 0x54, 0xef, 0x48,
-	0x1a, 0xa4, 0xe6, 0x99, 0xc3, 0x6c, 0x28, 0xee, 0x55, 0xcd, 0xbd, 0x64, 0xd8, 0xfb, 0xdc, 0x31,
-	0xa7, 0x75, 0x58, 0x02, 0xa9, 0xe2, 0xff, 0x24, 0x30, 0xd9, 0x33, 0x87, 0xe8, 0xad, 0xfc, 0x20,
-	0x59, 0xd3, 0xd2, 0x58, 0x19, 0xda, 0x3e, 0x1c, 0x80, 0x59, 0xaf, 0x71, 0x58, 0x27, 0xd1, 0x4f,
-	0x04, 0xa6, 0x7a, 0xe7, 0xd6, 0x20, 0xaf, 0x91, 0x39, 0xf1, 0x8c, 0xe9, 0xd8, 0x41, 0xfc, 0x9d,
-	0xb7, 0xee, 0x06, 0xdf, 0xf9, 0x98, 0x6d, 0x2e, 0x67, 0xa7, 0xac, 0xbd, 0x78, 0xf6, 0x3c, 0x72,
-	0xe4, 0x88, 0x36, 0xe3, 0x8e, 0x25, 0x7c, 0xc7, 0x76, 0x90, 0x6b, 0xb7, 0x76, 0x78, 0xc4, 0x3c,
-	0x57, 0x1e, 0xfd, 0x4f, 0x64, 0x29, 0xe3, 0xec, 0x2f, 0x21, 0x8d, 0x31, 0xed, 0xea, 0xfa, 0xbf,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xda, 0x4c, 0x49, 0x53, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/datacatalog/v1beta1/datacatalog.pb.go b/googleapis/cloud/datacatalog/v1beta1/datacatalog.pb.go
index c851853988..9a77b47009 100644
--- a/googleapis/cloud/datacatalog/v1beta1/datacatalog.pb.go
+++ b/googleapis/cloud/datacatalog/v1beta1/datacatalog.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datacatalog/v1beta1/datacatalog.proto
 
-package datacatalog // import "google.golang.org/genproto/googleapis/cloud/datacatalog/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package datacatalog
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Entry resources in Cloud Data Catalog can be of different types e.g. BigQuery
 // Table entry is of type 'TABLE'. This enum describes all the possible types
@@ -43,6 +43,7 @@ var EntryType_name = map[int32]string{
 	2: "TABLE",
 	3: "DATA_STREAM",
 }
+
 var EntryType_value = map[string]int32{
 	"ENTRY_TYPE_UNSPECIFIED": 0,
 	"TABLE":                  2,
@@ -52,8 +53,9 @@ var EntryType_value = map[string]int32{
 func (x EntryType) String() string {
 	return proto.EnumName(EntryType_name, int32(x))
 }
+
 func (EntryType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datacatalog_2e06be1501804d5c, []int{0}
+	return fileDescriptor_2054d97e7b16f897, []int{0}
 }
 
 // Request message for
@@ -75,16 +77,17 @@ func (m *LookupEntryRequest) Reset()         { *m = LookupEntryRequest{} }
 func (m *LookupEntryRequest) String() string { return proto.CompactTextString(m) }
 func (*LookupEntryRequest) ProtoMessage()    {}
 func (*LookupEntryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datacatalog_2e06be1501804d5c, []int{0}
+	return fileDescriptor_2054d97e7b16f897, []int{0}
 }
+
 func (m *LookupEntryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LookupEntryRequest.Unmarshal(m, b)
 }
 func (m *LookupEntryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LookupEntryRequest.Marshal(b, m, deterministic)
 }
-func (dst *LookupEntryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LookupEntryRequest.Merge(dst, src)
+func (m *LookupEntryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupEntryRequest.Merge(m, src)
 }
 func (m *LookupEntryRequest) XXX_Size() int {
 	return xxx_messageInfo_LookupEntryRequest.Size(m)
@@ -132,72 +135,14 @@ func (m *LookupEntryRequest) GetSqlResource() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LookupEntryRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LookupEntryRequest_OneofMarshaler, _LookupEntryRequest_OneofUnmarshaler, _LookupEntryRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LookupEntryRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LookupEntryRequest_LinkedResource)(nil),
 		(*LookupEntryRequest_SqlResource)(nil),
 	}
 }
 
-func _LookupEntryRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LookupEntryRequest)
-	// target_name
-	switch x := m.TargetName.(type) {
-	case *LookupEntryRequest_LinkedResource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.LinkedResource)
-	case *LookupEntryRequest_SqlResource:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.SqlResource)
-	case nil:
-	default:
-		return fmt.Errorf("LookupEntryRequest.TargetName has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LookupEntryRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LookupEntryRequest)
-	switch tag {
-	case 1: // target_name.linked_resource
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.TargetName = &LookupEntryRequest_LinkedResource{x}
-		return true, err
-	case 3: // target_name.sql_resource
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.TargetName = &LookupEntryRequest_SqlResource{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LookupEntryRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LookupEntryRequest)
-	// target_name
-	switch x := m.TargetName.(type) {
-	case *LookupEntryRequest_LinkedResource:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.LinkedResource)))
-		n += len(x.LinkedResource)
-	case *LookupEntryRequest_SqlResource:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.SqlResource)))
-		n += len(x.SqlResource)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Entry Metadata.
 // A Data Catalog Entry resource represents another resource in Google
 // Cloud Platform, such as a BigQuery Dataset or a Pub/Sub Topic. Clients can
@@ -247,16 +192,17 @@ func (m *Entry) Reset()         { *m = Entry{} }
 func (m *Entry) String() string { return proto.CompactTextString(m) }
 func (*Entry) ProtoMessage()    {}
 func (*Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datacatalog_2e06be1501804d5c, []int{1}
+	return fileDescriptor_2054d97e7b16f897, []int{1}
 }
+
 func (m *Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entry.Unmarshal(m, b)
 }
 func (m *Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entry.Marshal(b, m, deterministic)
 }
-func (dst *Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entry.Merge(dst, src)
+func (m *Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entry.Merge(m, src)
 }
 func (m *Entry) XXX_Size() int {
 	return xxx_messageInfo_Entry.Size(m)
@@ -340,65 +286,61 @@ func (m *Entry) GetSourceSystemTimestamps() *SystemTimestamps {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Entry) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Entry_OneofMarshaler, _Entry_OneofUnmarshaler, _Entry_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Entry) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Entry_BigqueryTableSpec)(nil),
 	}
 }
 
-func _Entry_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Entry)
-	// type_spec
-	switch x := m.TypeSpec.(type) {
-	case *Entry_BigqueryTableSpec:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigqueryTableSpec); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Entry.TypeSpec has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Entry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Entry)
-	switch tag {
-	case 12: // type_spec.bigquery_table_spec
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryTableSpec)
-		err := b.DecodeMessage(msg)
-		m.TypeSpec = &Entry_BigqueryTableSpec{msg}
-		return true, err
-	default:
-		return false, nil
-	}
+func init() {
+	proto.RegisterEnum("google.cloud.datacatalog.v1beta1.EntryType", EntryType_name, EntryType_value)
+	proto.RegisterType((*LookupEntryRequest)(nil), "google.cloud.datacatalog.v1beta1.LookupEntryRequest")
+	proto.RegisterType((*Entry)(nil), "google.cloud.datacatalog.v1beta1.Entry")
 }
 
-func _Entry_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Entry)
-	// type_spec
-	switch x := m.TypeSpec.(type) {
-	case *Entry_BigqueryTableSpec:
-		s := proto.Size(x.BigqueryTableSpec)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
+func init() {
+	proto.RegisterFile("google/cloud/datacatalog/v1beta1/datacatalog.proto", fileDescriptor_2054d97e7b16f897)
 }
 
-func init() {
-	proto.RegisterType((*LookupEntryRequest)(nil), "google.cloud.datacatalog.v1beta1.LookupEntryRequest")
-	proto.RegisterType((*Entry)(nil), "google.cloud.datacatalog.v1beta1.Entry")
-	proto.RegisterEnum("google.cloud.datacatalog.v1beta1.EntryType", EntryType_name, EntryType_value)
+var fileDescriptor_2054d97e7b16f897 = []byte{
+	// 563 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
+	0x10, 0x8d, 0xf3, 0x51, 0x94, 0x75, 0x68, 0xc3, 0x22, 0x15, 0x13, 0x55, 0x22, 0x84, 0x43, 0x03,
+	0x08, 0x5b, 0x49, 0x39, 0xc1, 0x01, 0xf2, 0x61, 0xd4, 0x8a, 0x12, 0x05, 0xc7, 0x1c, 0xca, 0xc5,
+	0xda, 0x38, 0x23, 0x63, 0xd5, 0xf6, 0x6e, 0xbc, 0x1b, 0x24, 0x5f, 0xb9, 0x73, 0xe2, 0xcc, 0xaf,
+	0xe2, 0x2f, 0x70, 0xe6, 0xcc, 0xb1, 0xf2, 0xda, 0x4d, 0xa2, 0x56, 0x95, 0x73, 0xb3, 0xde, 0xbc,
+	0xf7, 0x66, 0x76, 0xfc, 0x06, 0xf5, 0x3d, 0x4a, 0xbd, 0x00, 0x0c, 0x37, 0xa0, 0xab, 0x85, 0xb1,
+	0x20, 0x82, 0xb8, 0x44, 0x90, 0x80, 0x7a, 0xc6, 0xf7, 0xde, 0x1c, 0x04, 0xe9, 0x6d, 0x63, 0x3a,
+	0x8b, 0xa9, 0xa0, 0xb8, 0x9d, 0x69, 0x74, 0xa9, 0xd1, 0xb7, 0xeb, 0xb9, 0xa6, 0x75, 0x94, 0xbb,
+	0x12, 0xe6, 0x1b, 0x24, 0x8a, 0xa8, 0x20, 0xc2, 0xa7, 0x11, 0xcf, 0xf4, 0xad, 0x57, 0x85, 0x3d,
+	0xb9, 0xfb, 0x0d, 0x42, 0x92, 0xd3, 0x7b, 0x85, 0x74, 0x41, 0xe6, 0x01, 0x38, 0x9c, 0x81, 0xbb,
+	0xbb, 0xc4, 0x0f, 0x81, 0x0b, 0x12, 0xb2, 0x7c, 0xa8, 0x0e, 0x47, 0xf8, 0x9c, 0xd2, 0xcb, 0x15,
+	0x33, 0x23, 0x11, 0x27, 0x16, 0x2c, 0x57, 0xc0, 0x05, 0x7e, 0x8e, 0x0e, 0x02, 0x3f, 0xba, 0x84,
+	0x85, 0x13, 0x03, 0xa7, 0xab, 0xd8, 0x05, 0x4d, 0x69, 0x2b, 0xdd, 0xfa, 0x69, 0xc9, 0xda, 0xcf,
+	0x0a, 0x56, 0x8e, 0xe3, 0x67, 0xa8, 0xc1, 0x97, 0xc1, 0x86, 0x57, 0xc9, 0x79, 0x2a, 0x5f, 0x06,
+	0xd7, 0xa4, 0xe1, 0x7d, 0xa4, 0x0a, 0x12, 0x7b, 0x20, 0x9c, 0x88, 0x84, 0xd0, 0xf9, 0x57, 0x41,
+	0x35, 0xd9, 0x0f, 0x63, 0x54, 0x4d, 0x91, 0xcc, 0xdd, 0x92, 0xdf, 0xf8, 0xf8, 0x76, 0xf3, 0xba,
+	0x2c, 0xdf, 0x6c, 0xfd, 0x0e, 0x55, 0x45, 0xc2, 0x40, 0x2b, 0xb7, 0x95, 0xee, 0x7e, 0xff, 0xa5,
+	0x5e, 0xf4, 0x7f, 0x74, 0xd9, 0xd3, 0x4e, 0x18, 0x58, 0x52, 0x88, 0x01, 0x3d, 0x9c, 0xfb, 0xde,
+	0x72, 0x05, 0x71, 0xe2, 0x6c, 0x96, 0xa9, 0x35, 0xda, 0x4a, 0x57, 0xed, 0x9f, 0x14, 0xfb, 0x0d,
+	0x7d, 0xef, 0x73, 0x2a, 0xb6, 0x53, 0xed, 0x8c, 0x81, 0x7b, 0x5a, 0xb2, 0x1e, 0x5c, 0x3b, 0xae,
+	0x41, 0xfc, 0x14, 0x35, 0x16, 0x3e, 0x67, 0x01, 0x49, 0xe4, 0xf3, 0xb3, 0x15, 0x59, 0x6a, 0x8e,
+	0x4d, 0xd2, 0x37, 0xb7, 0x91, 0xba, 0x00, 0xee, 0xc6, 0x3e, 0x4b, 0x13, 0xa3, 0x55, 0x73, 0xc6,
+	0x06, 0xc2, 0xef, 0xd1, 0x5e, 0x16, 0x0f, 0xad, 0x26, 0xc7, 0xeb, 0x16, 0x8f, 0x37, 0x93, 0x7c,
+	0x2b, 0xd7, 0xe1, 0x00, 0x69, 0xd9, 0xe2, 0x1c, 0x9e, 0x70, 0x01, 0xa1, 0xb3, 0x09, 0x83, 0x76,
+	0x4f, 0x7a, 0xf6, 0x77, 0xf0, 0x94, 0x52, 0x7b, 0xad, 0xb4, 0x0e, 0x33, 0xcf, 0x9b, 0xf8, 0x50,
+	0x45, 0xf5, 0x74, 0xc7, 0x72, 0xa3, 0x2f, 0x46, 0xa8, 0xbe, 0xde, 0x3d, 0x6e, 0xa1, 0x43, 0x73,
+	0x62, 0x5b, 0x17, 0x8e, 0x7d, 0x31, 0x35, 0x9d, 0x2f, 0x93, 0xd9, 0xd4, 0x1c, 0x9d, 0x7d, 0x38,
+	0x33, 0xc7, 0xcd, 0x12, 0xae, 0xa3, 0x9a, 0x3d, 0x18, 0x9e, 0x9b, 0xcd, 0x32, 0x3e, 0x40, 0xea,
+	0x78, 0x60, 0x0f, 0x9c, 0x99, 0x6d, 0x99, 0x83, 0x4f, 0xcd, 0x4a, 0xff, 0xb7, 0x82, 0xd4, 0x31,
+	0x11, 0x64, 0x94, 0x8d, 0x84, 0x7f, 0x2a, 0x48, 0xdd, 0xca, 0x2e, 0x7e, 0x5d, 0x3c, 0xfd, 0xed,
+	0xa8, 0xb7, 0x8e, 0x77, 0x8c, 0x4d, 0xe7, 0xc9, 0x8f, 0x3f, 0x7f, 0x7f, 0x95, 0x1f, 0xe3, 0x47,
+	0xeb, 0x63, 0x82, 0x48, 0xc4, 0x3e, 0xf0, 0x37, 0x81, 0x74, 0x1d, 0x32, 0x74, 0xe4, 0xd2, 0xf0,
+	0x4e, 0xbb, 0xa9, 0xf2, 0xf5, 0x63, 0x5e, 0xf3, 0x68, 0x40, 0x22, 0x4f, 0xa7, 0xb1, 0x67, 0x78,
+	0x10, 0xc9, 0x43, 0x34, 0xb2, 0x12, 0x61, 0x3e, 0xbf, 0xfb, 0x7c, 0xdf, 0x6e, 0x61, 0xff, 0x15,
+	0x65, 0xbe, 0x27, 0xa5, 0x27, 0x57, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xc1, 0xb0, 0xec, 0xce,
+	0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -478,47 +420,3 @@ var _DataCatalog_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/datacatalog/v1beta1/datacatalog.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/datacatalog/v1beta1/datacatalog.proto", fileDescriptor_datacatalog_2e06be1501804d5c)
-}
-
-var fileDescriptor_datacatalog_2e06be1501804d5c = []byte{
-	// 563 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
-	0x10, 0x8d, 0xf3, 0x51, 0x94, 0x75, 0x68, 0xc3, 0x22, 0x15, 0x13, 0x55, 0x22, 0x84, 0x43, 0x03,
-	0x08, 0x5b, 0x49, 0x39, 0xc1, 0x01, 0xf2, 0x61, 0xd4, 0x8a, 0x12, 0x05, 0xc7, 0x1c, 0xca, 0xc5,
-	0xda, 0x38, 0x23, 0x63, 0xd5, 0xf6, 0x6e, 0xbc, 0x1b, 0x24, 0x5f, 0xb9, 0x73, 0xe2, 0xcc, 0xaf,
-	0xe2, 0x2f, 0x70, 0xe6, 0xcc, 0xb1, 0xf2, 0xda, 0x4d, 0xa2, 0x56, 0x95, 0x73, 0xb3, 0xde, 0xbc,
-	0xf7, 0x66, 0x76, 0xfc, 0x06, 0xf5, 0x3d, 0x4a, 0xbd, 0x00, 0x0c, 0x37, 0xa0, 0xab, 0x85, 0xb1,
-	0x20, 0x82, 0xb8, 0x44, 0x90, 0x80, 0x7a, 0xc6, 0xf7, 0xde, 0x1c, 0x04, 0xe9, 0x6d, 0x63, 0x3a,
-	0x8b, 0xa9, 0xa0, 0xb8, 0x9d, 0x69, 0x74, 0xa9, 0xd1, 0xb7, 0xeb, 0xb9, 0xa6, 0x75, 0x94, 0xbb,
-	0x12, 0xe6, 0x1b, 0x24, 0x8a, 0xa8, 0x20, 0xc2, 0xa7, 0x11, 0xcf, 0xf4, 0xad, 0x57, 0x85, 0x3d,
-	0xb9, 0xfb, 0x0d, 0x42, 0x92, 0xd3, 0x7b, 0x85, 0x74, 0x41, 0xe6, 0x01, 0x38, 0x9c, 0x81, 0xbb,
-	0xbb, 0xc4, 0x0f, 0x81, 0x0b, 0x12, 0xb2, 0x7c, 0xa8, 0x0e, 0x47, 0xf8, 0x9c, 0xd2, 0xcb, 0x15,
-	0x33, 0x23, 0x11, 0x27, 0x16, 0x2c, 0x57, 0xc0, 0x05, 0x7e, 0x8e, 0x0e, 0x02, 0x3f, 0xba, 0x84,
-	0x85, 0x13, 0x03, 0xa7, 0xab, 0xd8, 0x05, 0x4d, 0x69, 0x2b, 0xdd, 0xfa, 0x69, 0xc9, 0xda, 0xcf,
-	0x0a, 0x56, 0x8e, 0xe3, 0x67, 0xa8, 0xc1, 0x97, 0xc1, 0x86, 0x57, 0xc9, 0x79, 0x2a, 0x5f, 0x06,
-	0xd7, 0xa4, 0xe1, 0x7d, 0xa4, 0x0a, 0x12, 0x7b, 0x20, 0x9c, 0x88, 0x84, 0xd0, 0xf9, 0x57, 0x41,
-	0x35, 0xd9, 0x0f, 0x63, 0x54, 0x4d, 0x91, 0xcc, 0xdd, 0x92, 0xdf, 0xf8, 0xf8, 0x76, 0xf3, 0xba,
-	0x2c, 0xdf, 0x6c, 0xfd, 0x0e, 0x55, 0x45, 0xc2, 0x40, 0x2b, 0xb7, 0x95, 0xee, 0x7e, 0xff, 0xa5,
-	0x5e, 0xf4, 0x7f, 0x74, 0xd9, 0xd3, 0x4e, 0x18, 0x58, 0x52, 0x88, 0x01, 0x3d, 0x9c, 0xfb, 0xde,
-	0x72, 0x05, 0x71, 0xe2, 0x6c, 0x96, 0xa9, 0x35, 0xda, 0x4a, 0x57, 0xed, 0x9f, 0x14, 0xfb, 0x0d,
-	0x7d, 0xef, 0x73, 0x2a, 0xb6, 0x53, 0xed, 0x8c, 0x81, 0x7b, 0x5a, 0xb2, 0x1e, 0x5c, 0x3b, 0xae,
-	0x41, 0xfc, 0x14, 0x35, 0x16, 0x3e, 0x67, 0x01, 0x49, 0xe4, 0xf3, 0xb3, 0x15, 0x59, 0x6a, 0x8e,
-	0x4d, 0xd2, 0x37, 0xb7, 0x91, 0xba, 0x00, 0xee, 0xc6, 0x3e, 0x4b, 0x13, 0xa3, 0x55, 0x73, 0xc6,
-	0x06, 0xc2, 0xef, 0xd1, 0x5e, 0x16, 0x0f, 0xad, 0x26, 0xc7, 0xeb, 0x16, 0x8f, 0x37, 0x93, 0x7c,
-	0x2b, 0xd7, 0xe1, 0x00, 0x69, 0xd9, 0xe2, 0x1c, 0x9e, 0x70, 0x01, 0xa1, 0xb3, 0x09, 0x83, 0x76,
-	0x4f, 0x7a, 0xf6, 0x77, 0xf0, 0x94, 0x52, 0x7b, 0xad, 0xb4, 0x0e, 0x33, 0xcf, 0x9b, 0xf8, 0x50,
-	0x45, 0xf5, 0x74, 0xc7, 0x72, 0xa3, 0x2f, 0x46, 0xa8, 0xbe, 0xde, 0x3d, 0x6e, 0xa1, 0x43, 0x73,
-	0x62, 0x5b, 0x17, 0x8e, 0x7d, 0x31, 0x35, 0x9d, 0x2f, 0x93, 0xd9, 0xd4, 0x1c, 0x9d, 0x7d, 0x38,
-	0x33, 0xc7, 0xcd, 0x12, 0xae, 0xa3, 0x9a, 0x3d, 0x18, 0x9e, 0x9b, 0xcd, 0x32, 0x3e, 0x40, 0xea,
-	0x78, 0x60, 0x0f, 0x9c, 0x99, 0x6d, 0x99, 0x83, 0x4f, 0xcd, 0x4a, 0xff, 0xb7, 0x82, 0xd4, 0x31,
-	0x11, 0x64, 0x94, 0x8d, 0x84, 0x7f, 0x2a, 0x48, 0xdd, 0xca, 0x2e, 0x7e, 0x5d, 0x3c, 0xfd, 0xed,
-	0xa8, 0xb7, 0x8e, 0x77, 0x8c, 0x4d, 0xe7, 0xc9, 0x8f, 0x3f, 0x7f, 0x7f, 0x95, 0x1f, 0xe3, 0x47,
-	0xeb, 0x63, 0x82, 0x48, 0xc4, 0x3e, 0xf0, 0x37, 0x81, 0x74, 0x1d, 0x32, 0x74, 0xe4, 0xd2, 0xf0,
-	0x4e, 0xbb, 0xa9, 0xf2, 0xf5, 0x63, 0x5e, 0xf3, 0x68, 0x40, 0x22, 0x4f, 0xa7, 0xb1, 0x67, 0x78,
-	0x10, 0xc9, 0x43, 0x34, 0xb2, 0x12, 0x61, 0x3e, 0xbf, 0xfb, 0x7c, 0xdf, 0x6e, 0x61, 0xff, 0x15,
-	0x65, 0xbe, 0x27, 0xa5, 0x27, 0x57, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xc1, 0xb0, 0xec, 0xce,
-	0x04, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/datacatalog/v1beta1/schema.pb.go b/googleapis/cloud/datacatalog/v1beta1/schema.pb.go
index 35cb06edb2..1d6fbf49bd 100644
--- a/googleapis/cloud/datacatalog/v1beta1/schema.pb.go
+++ b/googleapis/cloud/datacatalog/v1beta1/schema.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datacatalog/v1beta1/schema.proto
 
-package datacatalog // import "google.golang.org/genproto/googleapis/cloud/datacatalog/v1beta1"
+package datacatalog
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a schema (e.g. BigQuery, GoogleSQL, Avro schema).
 type Schema struct {
@@ -32,16 +35,17 @@ func (m *Schema) Reset()         { *m = Schema{} }
 func (m *Schema) String() string { return proto.CompactTextString(m) }
 func (*Schema) ProtoMessage()    {}
 func (*Schema) Descriptor() ([]byte, []int) {
-	return fileDescriptor_schema_be14e9cb1c70fc2b, []int{0}
+	return fileDescriptor_834760e0ed3be1cb, []int{0}
 }
+
 func (m *Schema) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Schema.Unmarshal(m, b)
 }
 func (m *Schema) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Schema.Marshal(b, m, deterministic)
 }
-func (dst *Schema) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Schema.Merge(dst, src)
+func (m *Schema) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Schema.Merge(m, src)
 }
 func (m *Schema) XXX_Size() int {
 	return xxx_messageInfo_Schema.Size(m)
@@ -83,16 +87,17 @@ func (m *ColumnSchema) Reset()         { *m = ColumnSchema{} }
 func (m *ColumnSchema) String() string { return proto.CompactTextString(m) }
 func (*ColumnSchema) ProtoMessage()    {}
 func (*ColumnSchema) Descriptor() ([]byte, []int) {
-	return fileDescriptor_schema_be14e9cb1c70fc2b, []int{1}
+	return fileDescriptor_834760e0ed3be1cb, []int{1}
 }
+
 func (m *ColumnSchema) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColumnSchema.Unmarshal(m, b)
 }
 func (m *ColumnSchema) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColumnSchema.Marshal(b, m, deterministic)
 }
-func (dst *ColumnSchema) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColumnSchema.Merge(dst, src)
+func (m *ColumnSchema) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnSchema.Merge(m, src)
 }
 func (m *ColumnSchema) XXX_Size() int {
 	return xxx_messageInfo_ColumnSchema.Size(m)
@@ -144,10 +149,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datacatalog/v1beta1/schema.proto", fileDescriptor_schema_be14e9cb1c70fc2b)
+	proto.RegisterFile("google/cloud/datacatalog/v1beta1/schema.proto", fileDescriptor_834760e0ed3be1cb)
 }
 
-var fileDescriptor_schema_be14e9cb1c70fc2b = []byte{
+var fileDescriptor_834760e0ed3be1cb = []byte{
 	// 251 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0x31, 0x4b, 0x04, 0x31,
 	0x10, 0x85, 0xc9, 0x9d, 0xec, 0xe1, 0x9c, 0x55, 0x0a, 0x49, 0x61, 0xb1, 0x5c, 0x75, 0x8d, 0x09,
diff --git a/googleapis/cloud/datacatalog/v1beta1/table_spec.pb.go b/googleapis/cloud/datacatalog/v1beta1/table_spec.pb.go
index 30d9f987f4..b989bf8c3d 100644
--- a/googleapis/cloud/datacatalog/v1beta1/table_spec.pb.go
+++ b/googleapis/cloud/datacatalog/v1beta1/table_spec.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datacatalog/v1beta1/table_spec.proto
 
-package datacatalog // import "google.golang.org/genproto/googleapis/cloud/datacatalog/v1beta1"
+package datacatalog
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Table source type.
 type TableSourceType int32
@@ -35,6 +38,7 @@ var TableSourceType_name = map[int32]string{
 	2: "BIGQUERY_VIEW",
 	5: "BIGQUERY_TABLE",
 }
+
 var TableSourceType_value = map[string]int32{
 	"TABLE_SOURCE_TYPE_UNSPECIFIED": 0,
 	"BIGQUERY_VIEW":                 2,
@@ -44,8 +48,9 @@ var TableSourceType_value = map[string]int32{
 func (x TableSourceType) String() string {
 	return proto.EnumName(TableSourceType_name, int32(x))
 }
+
 func (TableSourceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_table_spec_345702233622a222, []int{0}
+	return fileDescriptor_2effb41fca72136b, []int{0}
 }
 
 // Describes a BigQuery table.
@@ -64,16 +69,17 @@ func (m *BigQueryTableSpec) Reset()         { *m = BigQueryTableSpec{} }
 func (m *BigQueryTableSpec) String() string { return proto.CompactTextString(m) }
 func (*BigQueryTableSpec) ProtoMessage()    {}
 func (*BigQueryTableSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_spec_345702233622a222, []int{0}
+	return fileDescriptor_2effb41fca72136b, []int{0}
 }
+
 func (m *BigQueryTableSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryTableSpec.Unmarshal(m, b)
 }
 func (m *BigQueryTableSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryTableSpec.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryTableSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryTableSpec.Merge(dst, src)
+func (m *BigQueryTableSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryTableSpec.Merge(m, src)
 }
 func (m *BigQueryTableSpec) XXX_Size() int {
 	return xxx_messageInfo_BigQueryTableSpec.Size(m)
@@ -111,16 +117,17 @@ func (m *ViewSpec) Reset()         { *m = ViewSpec{} }
 func (m *ViewSpec) String() string { return proto.CompactTextString(m) }
 func (*ViewSpec) ProtoMessage()    {}
 func (*ViewSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_table_spec_345702233622a222, []int{1}
+	return fileDescriptor_2effb41fca72136b, []int{1}
 }
+
 func (m *ViewSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ViewSpec.Unmarshal(m, b)
 }
 func (m *ViewSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ViewSpec.Marshal(b, m, deterministic)
 }
-func (dst *ViewSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ViewSpec.Merge(dst, src)
+func (m *ViewSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ViewSpec.Merge(m, src)
 }
 func (m *ViewSpec) XXX_Size() int {
 	return xxx_messageInfo_ViewSpec.Size(m)
@@ -139,16 +146,16 @@ func (m *ViewSpec) GetViewQuery() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.datacatalog.v1beta1.TableSourceType", TableSourceType_name, TableSourceType_value)
 	proto.RegisterType((*BigQueryTableSpec)(nil), "google.cloud.datacatalog.v1beta1.BigQueryTableSpec")
 	proto.RegisterType((*ViewSpec)(nil), "google.cloud.datacatalog.v1beta1.ViewSpec")
-	proto.RegisterEnum("google.cloud.datacatalog.v1beta1.TableSourceType", TableSourceType_name, TableSourceType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datacatalog/v1beta1/table_spec.proto", fileDescriptor_table_spec_345702233622a222)
+	proto.RegisterFile("google/cloud/datacatalog/v1beta1/table_spec.proto", fileDescriptor_2effb41fca72136b)
 }
 
-var fileDescriptor_table_spec_345702233622a222 = []byte{
+var fileDescriptor_2effb41fca72136b = []byte{
 	// 319 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcf, 0x4b, 0x02, 0x41,
 	0x14, 0xc7, 0x1b, 0xa1, 0xd0, 0x89, 0xfc, 0x31, 0x27, 0x0f, 0x09, 0xe6, 0xc9, 0x3c, 0xcc, 0xb2,
diff --git a/googleapis/cloud/datacatalog/v1beta1/timestamps.pb.go b/googleapis/cloud/datacatalog/v1beta1/timestamps.pb.go
index 241e5a20ad..200ba32c17 100644
--- a/googleapis/cloud/datacatalog/v1beta1/timestamps.pb.go
+++ b/googleapis/cloud/datacatalog/v1beta1/timestamps.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datacatalog/v1beta1/timestamps.proto
 
-package datacatalog // import "google.golang.org/genproto/googleapis/cloud/datacatalog/v1beta1"
+package datacatalog
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Timestamps about this resource according to a particular system.
 type SystemTimestamps struct {
@@ -37,16 +40,17 @@ func (m *SystemTimestamps) Reset()         { *m = SystemTimestamps{} }
 func (m *SystemTimestamps) String() string { return proto.CompactTextString(m) }
 func (*SystemTimestamps) ProtoMessage()    {}
 func (*SystemTimestamps) Descriptor() ([]byte, []int) {
-	return fileDescriptor_timestamps_d8e8b54cbb1fb3a6, []int{0}
+	return fileDescriptor_a178faa5e507582b, []int{0}
 }
+
 func (m *SystemTimestamps) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SystemTimestamps.Unmarshal(m, b)
 }
 func (m *SystemTimestamps) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SystemTimestamps.Marshal(b, m, deterministic)
 }
-func (dst *SystemTimestamps) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SystemTimestamps.Merge(dst, src)
+func (m *SystemTimestamps) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemTimestamps.Merge(m, src)
 }
 func (m *SystemTimestamps) XXX_Size() int {
 	return xxx_messageInfo_SystemTimestamps.Size(m)
@@ -83,10 +87,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datacatalog/v1beta1/timestamps.proto", fileDescriptor_timestamps_d8e8b54cbb1fb3a6)
+	proto.RegisterFile("google/cloud/datacatalog/v1beta1/timestamps.proto", fileDescriptor_a178faa5e507582b)
 }
 
-var fileDescriptor_timestamps_d8e8b54cbb1fb3a6 = []byte{
+var fileDescriptor_a178faa5e507582b = []byte{
 	// 229 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xd1, 0x3f, 0x4b, 0x03, 0x41,
 	0x10, 0x05, 0x70, 0x56, 0xc1, 0x62, 0xd3, 0x48, 0x2a, 0x09, 0x82, 0xc1, 0xca, 0x6a, 0x96, 0xd3,
diff --git a/googleapis/cloud/datalabeling/v1beta1/annotation.pb.go b/googleapis/cloud/datalabeling/v1beta1/annotation.pb.go
index 1c45041a3b..af3313dd24 100644
--- a/googleapis/cloud/datalabeling/v1beta1/annotation.pb.go
+++ b/googleapis/cloud/datalabeling/v1beta1/annotation.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datalabeling/v1beta1/annotation.proto
 
-package datalabeling // import "google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1"
+package datalabeling
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies where is the answer from.
 type AnnotationSource int32
@@ -35,6 +38,7 @@ var AnnotationSource_name = map[int32]string{
 	0: "ANNOTATION_SOURCE_UNSPECIFIED",
 	3: "OPERATOR",
 }
+
 var AnnotationSource_value = map[string]int32{
 	"ANNOTATION_SOURCE_UNSPECIFIED": 0,
 	"OPERATOR":                      3,
@@ -43,8 +47,9 @@ var AnnotationSource_value = map[string]int32{
 func (x AnnotationSource) String() string {
 	return proto.EnumName(AnnotationSource_name, int32(x))
 }
+
 func (AnnotationSource) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{0}
+	return fileDescriptor_4bb97872d232a7f7, []int{0}
 }
 
 type AnnotationSentiment int32
@@ -62,6 +67,7 @@ var AnnotationSentiment_name = map[int32]string{
 	1: "NEGATIVE",
 	2: "POSITIVE",
 }
+
 var AnnotationSentiment_value = map[string]int32{
 	"ANNOTATION_SENTIMENT_UNSPECIFIED": 0,
 	"NEGATIVE":                         1,
@@ -71,8 +77,9 @@ var AnnotationSentiment_value = map[string]int32{
 func (x AnnotationSentiment) String() string {
 	return proto.EnumName(AnnotationSentiment_name, int32(x))
 }
+
 func (AnnotationSentiment) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{1}
+	return fileDescriptor_4bb97872d232a7f7, []int{1}
 }
 
 type AnnotationType int32
@@ -124,6 +131,7 @@ var AnnotationType_name = map[int32]string{
 	8:  "TEXT_CLASSIFICATION_ANNOTATION",
 	9:  "TEXT_ENTITY_EXTRACTION_ANNOTATION",
 }
+
 var AnnotationType_value = map[string]int32{
 	"ANNOTATION_TYPE_UNSPECIFIED":            0,
 	"IMAGE_CLASSIFICATION_ANNOTATION":        1,
@@ -144,8 +152,9 @@ var AnnotationType_value = map[string]int32{
 func (x AnnotationType) String() string {
 	return proto.EnumName(AnnotationType_name, int32(x))
 }
+
 func (AnnotationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{2}
+	return fileDescriptor_4bb97872d232a7f7, []int{2}
 }
 
 // Annotation for Example. Each example may have one or more annotations. For
@@ -175,16 +184,17 @@ func (m *Annotation) Reset()         { *m = Annotation{} }
 func (m *Annotation) String() string { return proto.CompactTextString(m) }
 func (*Annotation) ProtoMessage()    {}
 func (*Annotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{0}
+	return fileDescriptor_4bb97872d232a7f7, []int{0}
 }
+
 func (m *Annotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Annotation.Unmarshal(m, b)
 }
 func (m *Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Annotation.Marshal(b, m, deterministic)
 }
-func (dst *Annotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Annotation.Merge(dst, src)
+func (m *Annotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Annotation.Merge(m, src)
 }
 func (m *Annotation) XXX_Size() int {
 	return xxx_messageInfo_Annotation.Size(m)
@@ -252,16 +262,17 @@ func (m *AnnotationValue) Reset()         { *m = AnnotationValue{} }
 func (m *AnnotationValue) String() string { return proto.CompactTextString(m) }
 func (*AnnotationValue) ProtoMessage()    {}
 func (*AnnotationValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{1}
+	return fileDescriptor_4bb97872d232a7f7, []int{1}
 }
+
 func (m *AnnotationValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotationValue.Unmarshal(m, b)
 }
 func (m *AnnotationValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotationValue.Marshal(b, m, deterministic)
 }
-func (dst *AnnotationValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotationValue.Merge(dst, src)
+func (m *AnnotationValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationValue.Merge(m, src)
 }
 func (m *AnnotationValue) XXX_Size() int {
 	return xxx_messageInfo_AnnotationValue.Size(m)
@@ -400,9 +411,9 @@ func (m *AnnotationValue) GetAudioRecognitionAnnotation() *AudioRecognitionAnnot
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AnnotationValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AnnotationValue_OneofMarshaler, _AnnotationValue_OneofUnmarshaler, _AnnotationValue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AnnotationValue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AnnotationValue_ImageClassificationAnnotation)(nil),
 		(*AnnotationValue_ImageBoundingPolyAnnotation)(nil),
 		(*AnnotationValue_ImagePolylineAnnotation)(nil),
@@ -415,198 +426,6 @@ func (*AnnotationValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffe
 	}
 }
 
-func _AnnotationValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AnnotationValue)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *AnnotationValue_ImageClassificationAnnotation:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageClassificationAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_ImageBoundingPolyAnnotation:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageBoundingPolyAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_ImagePolylineAnnotation:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImagePolylineAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_ImageSegmentationAnnotation:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageSegmentationAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_TextClassificationAnnotation:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextClassificationAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_VideoClassificationAnnotation:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoClassificationAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_VideoObjectTrackingAnnotation:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoObjectTrackingAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_VideoEventAnnotation:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoEventAnnotation); err != nil {
-			return err
-		}
-	case *AnnotationValue_AudioRecognitionAnnotation:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioRecognitionAnnotation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AnnotationValue.ValueType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AnnotationValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AnnotationValue)
-	switch tag {
-	case 1: // value_type.image_classification_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageClassificationAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_ImageClassificationAnnotation{msg}
-		return true, err
-	case 2: // value_type.image_bounding_poly_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageBoundingPolyAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_ImageBoundingPolyAnnotation{msg}
-		return true, err
-	case 8: // value_type.image_polyline_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImagePolylineAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_ImagePolylineAnnotation{msg}
-		return true, err
-	case 9: // value_type.image_segmentation_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageSegmentationAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_ImageSegmentationAnnotation{msg}
-		return true, err
-	case 3: // value_type.text_classification_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextClassificationAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_TextClassificationAnnotation{msg}
-		return true, err
-	case 4: // value_type.video_classification_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoClassificationAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_VideoClassificationAnnotation{msg}
-		return true, err
-	case 5: // value_type.video_object_tracking_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoObjectTrackingAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_VideoObjectTrackingAnnotation{msg}
-		return true, err
-	case 6: // value_type.video_event_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoEventAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_VideoEventAnnotation{msg}
-		return true, err
-	case 7: // value_type.audio_recognition_annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AudioRecognitionAnnotation)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &AnnotationValue_AudioRecognitionAnnotation{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AnnotationValue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AnnotationValue)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *AnnotationValue_ImageClassificationAnnotation:
-		s := proto.Size(x.ImageClassificationAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_ImageBoundingPolyAnnotation:
-		s := proto.Size(x.ImageBoundingPolyAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_ImagePolylineAnnotation:
-		s := proto.Size(x.ImagePolylineAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_ImageSegmentationAnnotation:
-		s := proto.Size(x.ImageSegmentationAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_TextClassificationAnnotation:
-		s := proto.Size(x.TextClassificationAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_VideoClassificationAnnotation:
-		s := proto.Size(x.VideoClassificationAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_VideoObjectTrackingAnnotation:
-		s := proto.Size(x.VideoObjectTrackingAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_VideoEventAnnotation:
-		s := proto.Size(x.VideoEventAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotationValue_AudioRecognitionAnnotation:
-		s := proto.Size(x.AudioRecognitionAnnotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Image classification annotation definition.
 type ImageClassificationAnnotation struct {
 	// Label of image.
@@ -620,16 +439,17 @@ func (m *ImageClassificationAnnotation) Reset()         { *m = ImageClassificati
 func (m *ImageClassificationAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ImageClassificationAnnotation) ProtoMessage()    {}
 func (*ImageClassificationAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{2}
+	return fileDescriptor_4bb97872d232a7f7, []int{2}
 }
+
 func (m *ImageClassificationAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageClassificationAnnotation.Unmarshal(m, b)
 }
 func (m *ImageClassificationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageClassificationAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ImageClassificationAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageClassificationAnnotation.Merge(dst, src)
+func (m *ImageClassificationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageClassificationAnnotation.Merge(m, src)
 }
 func (m *ImageClassificationAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ImageClassificationAnnotation.Size(m)
@@ -663,16 +483,17 @@ func (m *Vertex) Reset()         { *m = Vertex{} }
 func (m *Vertex) String() string { return proto.CompactTextString(m) }
 func (*Vertex) ProtoMessage()    {}
 func (*Vertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{3}
+	return fileDescriptor_4bb97872d232a7f7, []int{3}
 }
+
 func (m *Vertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vertex.Unmarshal(m, b)
 }
 func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
 }
-func (dst *Vertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vertex.Merge(dst, src)
+func (m *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(m, src)
 }
 func (m *Vertex) XXX_Size() int {
 	return xxx_messageInfo_Vertex.Size(m)
@@ -714,16 +535,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{4}
+	return fileDescriptor_4bb97872d232a7f7, []int{4}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -761,16 +583,17 @@ func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
 func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*BoundingPoly) ProtoMessage()    {}
 func (*BoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{5}
+	return fileDescriptor_4bb97872d232a7f7, []int{5}
 }
+
 func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
 }
 func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+func (m *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(m, src)
 }
 func (m *BoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_BoundingPoly.Size(m)
@@ -801,16 +624,17 @@ func (m *NormalizedBoundingPoly) Reset()         { *m = NormalizedBoundingPoly{}
 func (m *NormalizedBoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingPoly) ProtoMessage()    {}
 func (*NormalizedBoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{6}
+	return fileDescriptor_4bb97872d232a7f7, []int{6}
 }
+
 func (m *NormalizedBoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingPoly.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingPoly.Merge(dst, src)
+func (m *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingPoly.Merge(m, src)
 }
 func (m *NormalizedBoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingPoly.Size(m)
@@ -849,16 +673,17 @@ func (m *ImageBoundingPolyAnnotation) Reset()         { *m = ImageBoundingPolyAn
 func (m *ImageBoundingPolyAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ImageBoundingPolyAnnotation) ProtoMessage()    {}
 func (*ImageBoundingPolyAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{7}
+	return fileDescriptor_4bb97872d232a7f7, []int{7}
 }
+
 func (m *ImageBoundingPolyAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageBoundingPolyAnnotation.Unmarshal(m, b)
 }
 func (m *ImageBoundingPolyAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageBoundingPolyAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ImageBoundingPolyAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageBoundingPolyAnnotation.Merge(dst, src)
+func (m *ImageBoundingPolyAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageBoundingPolyAnnotation.Merge(m, src)
 }
 func (m *ImageBoundingPolyAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ImageBoundingPolyAnnotation.Size(m)
@@ -914,80 +739,14 @@ func (m *ImageBoundingPolyAnnotation) GetAnnotationSpec() *AnnotationSpec {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImageBoundingPolyAnnotation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImageBoundingPolyAnnotation_OneofMarshaler, _ImageBoundingPolyAnnotation_OneofUnmarshaler, _ImageBoundingPolyAnnotation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImageBoundingPolyAnnotation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImageBoundingPolyAnnotation_BoundingPoly)(nil),
 		(*ImageBoundingPolyAnnotation_NormalizedBoundingPoly)(nil),
 	}
 }
 
-func _ImageBoundingPolyAnnotation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImageBoundingPolyAnnotation)
-	// bounded_area
-	switch x := m.BoundedArea.(type) {
-	case *ImageBoundingPolyAnnotation_BoundingPoly:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BoundingPoly); err != nil {
-			return err
-		}
-	case *ImageBoundingPolyAnnotation_NormalizedBoundingPoly:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NormalizedBoundingPoly); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ImageBoundingPolyAnnotation.BoundedArea has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImageBoundingPolyAnnotation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImageBoundingPolyAnnotation)
-	switch tag {
-	case 2: // bounded_area.bounding_poly
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BoundingPoly)
-		err := b.DecodeMessage(msg)
-		m.BoundedArea = &ImageBoundingPolyAnnotation_BoundingPoly{msg}
-		return true, err
-	case 3: // bounded_area.normalized_bounding_poly
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(NormalizedBoundingPoly)
-		err := b.DecodeMessage(msg)
-		m.BoundedArea = &ImageBoundingPolyAnnotation_NormalizedBoundingPoly{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImageBoundingPolyAnnotation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImageBoundingPolyAnnotation)
-	// bounded_area
-	switch x := m.BoundedArea.(type) {
-	case *ImageBoundingPolyAnnotation_BoundingPoly:
-		s := proto.Size(x.BoundingPoly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ImageBoundingPolyAnnotation_NormalizedBoundingPoly:
-		s := proto.Size(x.NormalizedBoundingPoly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A line with multiple line segments.
 type Polyline struct {
 	// The polyline vertices.
@@ -1001,16 +760,17 @@ func (m *Polyline) Reset()         { *m = Polyline{} }
 func (m *Polyline) String() string { return proto.CompactTextString(m) }
 func (*Polyline) ProtoMessage()    {}
 func (*Polyline) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{8}
+	return fileDescriptor_4bb97872d232a7f7, []int{8}
 }
+
 func (m *Polyline) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Polyline.Unmarshal(m, b)
 }
 func (m *Polyline) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Polyline.Marshal(b, m, deterministic)
 }
-func (dst *Polyline) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Polyline.Merge(dst, src)
+func (m *Polyline) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Polyline.Merge(m, src)
 }
 func (m *Polyline) XXX_Size() int {
 	return xxx_messageInfo_Polyline.Size(m)
@@ -1041,16 +801,17 @@ func (m *NormalizedPolyline) Reset()         { *m = NormalizedPolyline{} }
 func (m *NormalizedPolyline) String() string { return proto.CompactTextString(m) }
 func (*NormalizedPolyline) ProtoMessage()    {}
 func (*NormalizedPolyline) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{9}
+	return fileDescriptor_4bb97872d232a7f7, []int{9}
 }
+
 func (m *NormalizedPolyline) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedPolyline.Unmarshal(m, b)
 }
 func (m *NormalizedPolyline) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedPolyline.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedPolyline) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedPolyline.Merge(dst, src)
+func (m *NormalizedPolyline) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedPolyline.Merge(m, src)
 }
 func (m *NormalizedPolyline) XXX_Size() int {
 	return xxx_messageInfo_NormalizedPolyline.Size(m)
@@ -1085,16 +846,17 @@ func (m *ImagePolylineAnnotation) Reset()         { *m = ImagePolylineAnnotation
 func (m *ImagePolylineAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ImagePolylineAnnotation) ProtoMessage()    {}
 func (*ImagePolylineAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{10}
+	return fileDescriptor_4bb97872d232a7f7, []int{10}
 }
+
 func (m *ImagePolylineAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImagePolylineAnnotation.Unmarshal(m, b)
 }
 func (m *ImagePolylineAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImagePolylineAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ImagePolylineAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImagePolylineAnnotation.Merge(dst, src)
+func (m *ImagePolylineAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImagePolylineAnnotation.Merge(m, src)
 }
 func (m *ImagePolylineAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ImagePolylineAnnotation.Size(m)
@@ -1149,80 +911,14 @@ func (m *ImagePolylineAnnotation) GetAnnotationSpec() *AnnotationSpec {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImagePolylineAnnotation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImagePolylineAnnotation_OneofMarshaler, _ImagePolylineAnnotation_OneofUnmarshaler, _ImagePolylineAnnotation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImagePolylineAnnotation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImagePolylineAnnotation_Polyline)(nil),
 		(*ImagePolylineAnnotation_NormalizedPolyline)(nil),
 	}
 }
 
-func _ImagePolylineAnnotation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImagePolylineAnnotation)
-	// poly
-	switch x := m.Poly.(type) {
-	case *ImagePolylineAnnotation_Polyline:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Polyline); err != nil {
-			return err
-		}
-	case *ImagePolylineAnnotation_NormalizedPolyline:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NormalizedPolyline); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ImagePolylineAnnotation.Poly has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImagePolylineAnnotation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImagePolylineAnnotation)
-	switch tag {
-	case 2: // poly.polyline
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Polyline)
-		err := b.DecodeMessage(msg)
-		m.Poly = &ImagePolylineAnnotation_Polyline{msg}
-		return true, err
-	case 3: // poly.normalized_polyline
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(NormalizedPolyline)
-		err := b.DecodeMessage(msg)
-		m.Poly = &ImagePolylineAnnotation_NormalizedPolyline{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImagePolylineAnnotation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImagePolylineAnnotation)
-	// poly
-	switch x := m.Poly.(type) {
-	case *ImagePolylineAnnotation_Polyline:
-		s := proto.Size(x.Polyline)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ImagePolylineAnnotation_NormalizedPolyline:
-		s := proto.Size(x.NormalizedPolyline)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Image segmentation annotation.
 type ImageSegmentationAnnotation struct {
 	// The mapping between rgb color and annotation spec. The key is the rgb
@@ -1242,16 +938,17 @@ func (m *ImageSegmentationAnnotation) Reset()         { *m = ImageSegmentationAn
 func (m *ImageSegmentationAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ImageSegmentationAnnotation) ProtoMessage()    {}
 func (*ImageSegmentationAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{11}
+	return fileDescriptor_4bb97872d232a7f7, []int{11}
 }
+
 func (m *ImageSegmentationAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageSegmentationAnnotation.Unmarshal(m, b)
 }
 func (m *ImageSegmentationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageSegmentationAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ImageSegmentationAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageSegmentationAnnotation.Merge(dst, src)
+func (m *ImageSegmentationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSegmentationAnnotation.Merge(m, src)
 }
 func (m *ImageSegmentationAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ImageSegmentationAnnotation.Size(m)
@@ -1296,16 +993,17 @@ func (m *TextClassificationAnnotation) Reset()         { *m = TextClassification
 func (m *TextClassificationAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextClassificationAnnotation) ProtoMessage()    {}
 func (*TextClassificationAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{12}
+	return fileDescriptor_4bb97872d232a7f7, []int{12}
 }
+
 func (m *TextClassificationAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextClassificationAnnotation.Unmarshal(m, b)
 }
 func (m *TextClassificationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextClassificationAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextClassificationAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextClassificationAnnotation.Merge(dst, src)
+func (m *TextClassificationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextClassificationAnnotation.Merge(m, src)
 }
 func (m *TextClassificationAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextClassificationAnnotation.Size(m)
@@ -1340,16 +1038,17 @@ func (m *TimeSegment) Reset()         { *m = TimeSegment{} }
 func (m *TimeSegment) String() string { return proto.CompactTextString(m) }
 func (*TimeSegment) ProtoMessage()    {}
 func (*TimeSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{13}
+	return fileDescriptor_4bb97872d232a7f7, []int{13}
 }
+
 func (m *TimeSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeSegment.Unmarshal(m, b)
 }
 func (m *TimeSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeSegment.Marshal(b, m, deterministic)
 }
-func (dst *TimeSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeSegment.Merge(dst, src)
+func (m *TimeSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeSegment.Merge(m, src)
 }
 func (m *TimeSegment) XXX_Size() int {
 	return xxx_messageInfo_TimeSegment.Size(m)
@@ -1389,16 +1088,17 @@ func (m *VideoClassificationAnnotation) Reset()         { *m = VideoClassificati
 func (m *VideoClassificationAnnotation) String() string { return proto.CompactTextString(m) }
 func (*VideoClassificationAnnotation) ProtoMessage()    {}
 func (*VideoClassificationAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{14}
+	return fileDescriptor_4bb97872d232a7f7, []int{14}
 }
+
 func (m *VideoClassificationAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoClassificationAnnotation.Unmarshal(m, b)
 }
 func (m *VideoClassificationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoClassificationAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *VideoClassificationAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoClassificationAnnotation.Merge(dst, src)
+func (m *VideoClassificationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoClassificationAnnotation.Merge(m, src)
 }
 func (m *VideoClassificationAnnotation) XXX_Size() int {
 	return xxx_messageInfo_VideoClassificationAnnotation.Size(m)
@@ -1442,16 +1142,17 @@ func (m *ObjectTrackingFrame) Reset()         { *m = ObjectTrackingFrame{} }
 func (m *ObjectTrackingFrame) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingFrame) ProtoMessage()    {}
 func (*ObjectTrackingFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{15}
+	return fileDescriptor_4bb97872d232a7f7, []int{15}
 }
+
 func (m *ObjectTrackingFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingFrame.Unmarshal(m, b)
 }
 func (m *ObjectTrackingFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingFrame.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingFrame.Merge(dst, src)
+func (m *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingFrame.Merge(m, src)
 }
 func (m *ObjectTrackingFrame) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingFrame.Size(m)
@@ -1506,80 +1207,14 @@ func (m *ObjectTrackingFrame) GetTimeOffset() *duration.Duration {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ObjectTrackingFrame) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ObjectTrackingFrame_OneofMarshaler, _ObjectTrackingFrame_OneofUnmarshaler, _ObjectTrackingFrame_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ObjectTrackingFrame) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ObjectTrackingFrame_BoundingPoly)(nil),
 		(*ObjectTrackingFrame_NormalizedBoundingPoly)(nil),
 	}
 }
 
-func _ObjectTrackingFrame_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ObjectTrackingFrame)
-	// bounded_area
-	switch x := m.BoundedArea.(type) {
-	case *ObjectTrackingFrame_BoundingPoly:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BoundingPoly); err != nil {
-			return err
-		}
-	case *ObjectTrackingFrame_NormalizedBoundingPoly:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NormalizedBoundingPoly); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ObjectTrackingFrame.BoundedArea has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ObjectTrackingFrame_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ObjectTrackingFrame)
-	switch tag {
-	case 1: // bounded_area.bounding_poly
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BoundingPoly)
-		err := b.DecodeMessage(msg)
-		m.BoundedArea = &ObjectTrackingFrame_BoundingPoly{msg}
-		return true, err
-	case 2: // bounded_area.normalized_bounding_poly
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(NormalizedBoundingPoly)
-		err := b.DecodeMessage(msg)
-		m.BoundedArea = &ObjectTrackingFrame_NormalizedBoundingPoly{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ObjectTrackingFrame_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ObjectTrackingFrame)
-	// bounded_area
-	switch x := m.BoundedArea.(type) {
-	case *ObjectTrackingFrame_BoundingPoly:
-		s := proto.Size(x.BoundingPoly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ObjectTrackingFrame_NormalizedBoundingPoly:
-		s := proto.Size(x.NormalizedBoundingPoly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Video object tracking annotation.
 type VideoObjectTrackingAnnotation struct {
 	// Label of the object tracked in this annotation.
@@ -1597,16 +1232,17 @@ func (m *VideoObjectTrackingAnnotation) Reset()         { *m = VideoObjectTracki
 func (m *VideoObjectTrackingAnnotation) String() string { return proto.CompactTextString(m) }
 func (*VideoObjectTrackingAnnotation) ProtoMessage()    {}
 func (*VideoObjectTrackingAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{16}
+	return fileDescriptor_4bb97872d232a7f7, []int{16}
 }
+
 func (m *VideoObjectTrackingAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoObjectTrackingAnnotation.Unmarshal(m, b)
 }
 func (m *VideoObjectTrackingAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoObjectTrackingAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *VideoObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoObjectTrackingAnnotation.Merge(dst, src)
+func (m *VideoObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoObjectTrackingAnnotation.Merge(m, src)
 }
 func (m *VideoObjectTrackingAnnotation) XXX_Size() int {
 	return xxx_messageInfo_VideoObjectTrackingAnnotation.Size(m)
@@ -1653,16 +1289,17 @@ func (m *VideoEventAnnotation) Reset()         { *m = VideoEventAnnotation{} }
 func (m *VideoEventAnnotation) String() string { return proto.CompactTextString(m) }
 func (*VideoEventAnnotation) ProtoMessage()    {}
 func (*VideoEventAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{17}
+	return fileDescriptor_4bb97872d232a7f7, []int{17}
 }
+
 func (m *VideoEventAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoEventAnnotation.Unmarshal(m, b)
 }
 func (m *VideoEventAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoEventAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *VideoEventAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoEventAnnotation.Merge(dst, src)
+func (m *VideoEventAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoEventAnnotation.Merge(m, src)
 }
 func (m *VideoEventAnnotation) XXX_Size() int {
 	return xxx_messageInfo_VideoEventAnnotation.Size(m)
@@ -1704,16 +1341,17 @@ func (m *AudioRecognitionAnnotation) Reset()         { *m = AudioRecognitionAnno
 func (m *AudioRecognitionAnnotation) String() string { return proto.CompactTextString(m) }
 func (*AudioRecognitionAnnotation) ProtoMessage()    {}
 func (*AudioRecognitionAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{18}
+	return fileDescriptor_4bb97872d232a7f7, []int{18}
 }
+
 func (m *AudioRecognitionAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioRecognitionAnnotation.Unmarshal(m, b)
 }
 func (m *AudioRecognitionAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioRecognitionAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *AudioRecognitionAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioRecognitionAnnotation.Merge(dst, src)
+func (m *AudioRecognitionAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioRecognitionAnnotation.Merge(m, src)
 }
 func (m *AudioRecognitionAnnotation) XXX_Size() int {
 	return xxx_messageInfo_AudioRecognitionAnnotation.Size(m)
@@ -1758,16 +1396,17 @@ func (m *AnnotationMetadata) Reset()         { *m = AnnotationMetadata{} }
 func (m *AnnotationMetadata) String() string { return proto.CompactTextString(m) }
 func (*AnnotationMetadata) ProtoMessage()    {}
 func (*AnnotationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{19}
+	return fileDescriptor_4bb97872d232a7f7, []int{19}
 }
+
 func (m *AnnotationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotationMetadata.Unmarshal(m, b)
 }
 func (m *AnnotationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *AnnotationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotationMetadata.Merge(dst, src)
+func (m *AnnotationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationMetadata.Merge(m, src)
 }
 func (m *AnnotationMetadata) XXX_Size() int {
 	return xxx_messageInfo_AnnotationMetadata.Size(m)
@@ -1805,16 +1444,17 @@ func (m *OperatorMetadata) Reset()         { *m = OperatorMetadata{} }
 func (m *OperatorMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperatorMetadata) ProtoMessage()    {}
 func (*OperatorMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_7e34849fb820a58f, []int{20}
+	return fileDescriptor_4bb97872d232a7f7, []int{20}
 }
+
 func (m *OperatorMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperatorMetadata.Unmarshal(m, b)
 }
 func (m *OperatorMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperatorMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperatorMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperatorMetadata.Merge(dst, src)
+func (m *OperatorMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperatorMetadata.Merge(m, src)
 }
 func (m *OperatorMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperatorMetadata.Size(m)
@@ -1854,6 +1494,9 @@ func (m *OperatorMetadata) GetComments() []string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.AnnotationSource", AnnotationSource_name, AnnotationSource_value)
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.AnnotationSentiment", AnnotationSentiment_name, AnnotationSentiment_value)
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.AnnotationType", AnnotationType_name, AnnotationType_value)
 	proto.RegisterType((*Annotation)(nil), "google.cloud.datalabeling.v1beta1.Annotation")
 	proto.RegisterType((*AnnotationValue)(nil), "google.cloud.datalabeling.v1beta1.AnnotationValue")
 	proto.RegisterType((*ImageClassificationAnnotation)(nil), "google.cloud.datalabeling.v1beta1.ImageClassificationAnnotation")
@@ -1876,16 +1519,13 @@ func init() {
 	proto.RegisterType((*AudioRecognitionAnnotation)(nil), "google.cloud.datalabeling.v1beta1.AudioRecognitionAnnotation")
 	proto.RegisterType((*AnnotationMetadata)(nil), "google.cloud.datalabeling.v1beta1.AnnotationMetadata")
 	proto.RegisterType((*OperatorMetadata)(nil), "google.cloud.datalabeling.v1beta1.OperatorMetadata")
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.AnnotationSource", AnnotationSource_name, AnnotationSource_value)
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.AnnotationSentiment", AnnotationSentiment_name, AnnotationSentiment_value)
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.AnnotationType", AnnotationType_name, AnnotationType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datalabeling/v1beta1/annotation.proto", fileDescriptor_annotation_7e34849fb820a58f)
+	proto.RegisterFile("google/cloud/datalabeling/v1beta1/annotation.proto", fileDescriptor_4bb97872d232a7f7)
 }
 
-var fileDescriptor_annotation_7e34849fb820a58f = []byte{
+var fileDescriptor_4bb97872d232a7f7 = []byte{
 	// 1630 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdd, 0x6f, 0xdb, 0x46,
 	0x12, 0x37, 0x29, 0xdb, 0x91, 0x47, 0x8a, 0xad, 0xac, 0x7d, 0x8e, 0x22, 0x7f, 0x46, 0x97, 0x1c,
diff --git a/googleapis/cloud/datalabeling/v1beta1/annotation_spec_set.pb.go b/googleapis/cloud/datalabeling/v1beta1/annotation_spec_set.pb.go
index 8bfbf536f4..3083103270 100644
--- a/googleapis/cloud/datalabeling/v1beta1/annotation_spec_set.pb.go
+++ b/googleapis/cloud/datalabeling/v1beta1/annotation_spec_set.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datalabeling/v1beta1/annotation_spec_set.proto
 
-package datalabeling // import "google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1"
+package datalabeling
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // AnnotationSpecSet is a collection of label definitions. For example, in
 // image classification tasks, we define a set of labels, this set is called
@@ -44,16 +47,17 @@ func (m *AnnotationSpecSet) Reset()         { *m = AnnotationSpecSet{} }
 func (m *AnnotationSpecSet) String() string { return proto.CompactTextString(m) }
 func (*AnnotationSpecSet) ProtoMessage()    {}
 func (*AnnotationSpecSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_spec_set_b6f42ddbc1614a11, []int{0}
+	return fileDescriptor_ee18bab2b343845e, []int{0}
 }
+
 func (m *AnnotationSpecSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotationSpecSet.Unmarshal(m, b)
 }
 func (m *AnnotationSpecSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotationSpecSet.Marshal(b, m, deterministic)
 }
-func (dst *AnnotationSpecSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotationSpecSet.Merge(dst, src)
+func (m *AnnotationSpecSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationSpecSet.Merge(m, src)
 }
 func (m *AnnotationSpecSet) XXX_Size() int {
 	return xxx_messageInfo_AnnotationSpecSet.Size(m)
@@ -108,16 +112,17 @@ func (m *AnnotationSpec) Reset()         { *m = AnnotationSpec{} }
 func (m *AnnotationSpec) String() string { return proto.CompactTextString(m) }
 func (*AnnotationSpec) ProtoMessage()    {}
 func (*AnnotationSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotation_spec_set_b6f42ddbc1614a11, []int{1}
+	return fileDescriptor_ee18bab2b343845e, []int{1}
 }
+
 func (m *AnnotationSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotationSpec.Unmarshal(m, b)
 }
 func (m *AnnotationSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotationSpec.Marshal(b, m, deterministic)
 }
-func (dst *AnnotationSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotationSpec.Merge(dst, src)
+func (m *AnnotationSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationSpec.Merge(m, src)
 }
 func (m *AnnotationSpec) XXX_Size() int {
 	return xxx_messageInfo_AnnotationSpec.Size(m)
@@ -148,10 +153,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datalabeling/v1beta1/annotation_spec_set.proto", fileDescriptor_annotation_spec_set_b6f42ddbc1614a11)
+	proto.RegisterFile("google/cloud/datalabeling/v1beta1/annotation_spec_set.proto", fileDescriptor_ee18bab2b343845e)
 }
 
-var fileDescriptor_annotation_spec_set_b6f42ddbc1614a11 = []byte{
+var fileDescriptor_ee18bab2b343845e = []byte{
 	// 268 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x5f, 0x4b, 0xc3, 0x30,
 	0x14, 0xc5, 0xe9, 0x36, 0x04, 0x33, 0xf1, 0x4f, 0x9f, 0x8a, 0xf8, 0xd0, 0x0d, 0x84, 0x3d, 0x25,
diff --git a/googleapis/cloud/datalabeling/v1beta1/data_labeling_service.pb.go b/googleapis/cloud/datalabeling/v1beta1/data_labeling_service.pb.go
index f5be7dd92c..54679bbda1 100644
--- a/googleapis/cloud/datalabeling/v1beta1/data_labeling_service.pb.go
+++ b/googleapis/cloud/datalabeling/v1beta1/data_labeling_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datalabeling/v1beta1/data_labeling_service.proto
 
-package datalabeling // import "google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package datalabeling
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Image labeling task feature.
 type LabelImageRequest_Feature int32
@@ -59,6 +59,7 @@ var LabelImageRequest_Feature_name = map[int32]string{
 	4: "POLYLINE",
 	5: "SEGMENTATION",
 }
+
 var LabelImageRequest_Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":   0,
 	"CLASSIFICATION":        1,
@@ -72,8 +73,9 @@ var LabelImageRequest_Feature_value = map[string]int32{
 func (x LabelImageRequest_Feature) String() string {
 	return proto.EnumName(LabelImageRequest_Feature_name, int32(x))
 }
+
 func (LabelImageRequest_Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{14, 0}
+	return fileDescriptor_a21c40690da1750b, []int{14, 0}
 }
 
 // Video labeling task feature.
@@ -98,6 +100,7 @@ var LabelVideoRequest_Feature_name = map[int32]string{
 	3: "OBJECT_TRACKING",
 	4: "EVENT",
 }
+
 var LabelVideoRequest_Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED": 0,
 	"CLASSIFICATION":      1,
@@ -109,8 +112,9 @@ var LabelVideoRequest_Feature_value = map[string]int32{
 func (x LabelVideoRequest_Feature) String() string {
 	return proto.EnumName(LabelVideoRequest_Feature_name, int32(x))
 }
+
 func (LabelVideoRequest_Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{15, 0}
+	return fileDescriptor_a21c40690da1750b, []int{15, 0}
 }
 
 // Text labeling task feature.
@@ -129,6 +133,7 @@ var LabelTextRequest_Feature_name = map[int32]string{
 	1: "TEXT_CLASSIFICATION",
 	2: "TEXT_ENTITY_EXTRACTION",
 }
+
 var LabelTextRequest_Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":    0,
 	"TEXT_CLASSIFICATION":    1,
@@ -138,8 +143,9 @@ var LabelTextRequest_Feature_value = map[string]int32{
 func (x LabelTextRequest_Feature) String() string {
 	return proto.EnumName(LabelTextRequest_Feature_name, int32(x))
 }
+
 func (LabelTextRequest_Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{16, 0}
+	return fileDescriptor_a21c40690da1750b, []int{16, 0}
 }
 
 // Audio labeling task feature.
@@ -155,6 +161,7 @@ var LabelAudioRequest_Feature_name = map[int32]string{
 	0: "FEATURE_UNSPECIFIED",
 	1: "AUDIO_TRANSCRIPTION",
 }
+
 var LabelAudioRequest_Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED": 0,
 	"AUDIO_TRANSCRIPTION": 1,
@@ -163,8 +170,9 @@ var LabelAudioRequest_Feature_value = map[string]int32{
 func (x LabelAudioRequest_Feature) String() string {
 	return proto.EnumName(LabelAudioRequest_Feature_name, int32(x))
 }
+
 func (LabelAudioRequest_Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{17, 0}
+	return fileDescriptor_a21c40690da1750b, []int{17, 0}
 }
 
 // Request message for CreateDataset.
@@ -183,16 +191,17 @@ func (m *CreateDatasetRequest) Reset()         { *m = CreateDatasetRequest{} }
 func (m *CreateDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDatasetRequest) ProtoMessage()    {}
 func (*CreateDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{0}
+	return fileDescriptor_a21c40690da1750b, []int{0}
 }
+
 func (m *CreateDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDatasetRequest.Unmarshal(m, b)
 }
 func (m *CreateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDatasetRequest.Merge(dst, src)
+func (m *CreateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatasetRequest.Merge(m, src)
 }
 func (m *CreateDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDatasetRequest.Size(m)
@@ -231,16 +240,17 @@ func (m *GetDatasetRequest) Reset()         { *m = GetDatasetRequest{} }
 func (m *GetDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDatasetRequest) ProtoMessage()    {}
 func (*GetDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{1}
+	return fileDescriptor_a21c40690da1750b, []int{1}
 }
+
 func (m *GetDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDatasetRequest.Unmarshal(m, b)
 }
 func (m *GetDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDatasetRequest.Merge(dst, src)
+func (m *GetDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatasetRequest.Merge(m, src)
 }
 func (m *GetDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDatasetRequest.Size(m)
@@ -283,16 +293,17 @@ func (m *ListDatasetsRequest) Reset()         { *m = ListDatasetsRequest{} }
 func (m *ListDatasetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDatasetsRequest) ProtoMessage()    {}
 func (*ListDatasetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{2}
+	return fileDescriptor_a21c40690da1750b, []int{2}
 }
+
 func (m *ListDatasetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatasetsRequest.Unmarshal(m, b)
 }
 func (m *ListDatasetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatasetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDatasetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatasetsRequest.Merge(dst, src)
+func (m *ListDatasetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsRequest.Merge(m, src)
 }
 func (m *ListDatasetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDatasetsRequest.Size(m)
@@ -346,16 +357,17 @@ func (m *ListDatasetsResponse) Reset()         { *m = ListDatasetsResponse{} }
 func (m *ListDatasetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDatasetsResponse) ProtoMessage()    {}
 func (*ListDatasetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{3}
+	return fileDescriptor_a21c40690da1750b, []int{3}
 }
+
 func (m *ListDatasetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatasetsResponse.Unmarshal(m, b)
 }
 func (m *ListDatasetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatasetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDatasetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatasetsResponse.Merge(dst, src)
+func (m *ListDatasetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsResponse.Merge(m, src)
 }
 func (m *ListDatasetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDatasetsResponse.Size(m)
@@ -394,16 +406,17 @@ func (m *DeleteDatasetRequest) Reset()         { *m = DeleteDatasetRequest{} }
 func (m *DeleteDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDatasetRequest) ProtoMessage()    {}
 func (*DeleteDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{4}
+	return fileDescriptor_a21c40690da1750b, []int{4}
 }
+
 func (m *DeleteDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDatasetRequest.Unmarshal(m, b)
 }
 func (m *DeleteDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDatasetRequest.Merge(dst, src)
+func (m *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDatasetRequest.Merge(m, src)
 }
 func (m *DeleteDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDatasetRequest.Size(m)
@@ -437,16 +450,17 @@ func (m *ImportDataRequest) Reset()         { *m = ImportDataRequest{} }
 func (m *ImportDataRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportDataRequest) ProtoMessage()    {}
 func (*ImportDataRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{5}
+	return fileDescriptor_a21c40690da1750b, []int{5}
 }
+
 func (m *ImportDataRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDataRequest.Unmarshal(m, b)
 }
 func (m *ImportDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDataRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportDataRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDataRequest.Merge(dst, src)
+func (m *ImportDataRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDataRequest.Merge(m, src)
 }
 func (m *ImportDataRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportDataRequest.Size(m)
@@ -495,16 +509,17 @@ func (m *ExportDataRequest) Reset()         { *m = ExportDataRequest{} }
 func (m *ExportDataRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportDataRequest) ProtoMessage()    {}
 func (*ExportDataRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{6}
+	return fileDescriptor_a21c40690da1750b, []int{6}
 }
+
 func (m *ExportDataRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDataRequest.Unmarshal(m, b)
 }
 func (m *ExportDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDataRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportDataRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDataRequest.Merge(dst, src)
+func (m *ExportDataRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDataRequest.Merge(m, src)
 }
 func (m *ExportDataRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportDataRequest.Size(m)
@@ -557,16 +572,17 @@ func (m *GetDataItemRequest) Reset()         { *m = GetDataItemRequest{} }
 func (m *GetDataItemRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDataItemRequest) ProtoMessage()    {}
 func (*GetDataItemRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{7}
+	return fileDescriptor_a21c40690da1750b, []int{7}
 }
+
 func (m *GetDataItemRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDataItemRequest.Unmarshal(m, b)
 }
 func (m *GetDataItemRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDataItemRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDataItemRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDataItemRequest.Merge(dst, src)
+func (m *GetDataItemRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDataItemRequest.Merge(m, src)
 }
 func (m *GetDataItemRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDataItemRequest.Size(m)
@@ -609,16 +625,17 @@ func (m *ListDataItemsRequest) Reset()         { *m = ListDataItemsRequest{} }
 func (m *ListDataItemsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDataItemsRequest) ProtoMessage()    {}
 func (*ListDataItemsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{8}
+	return fileDescriptor_a21c40690da1750b, []int{8}
 }
+
 func (m *ListDataItemsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDataItemsRequest.Unmarshal(m, b)
 }
 func (m *ListDataItemsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDataItemsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDataItemsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDataItemsRequest.Merge(dst, src)
+func (m *ListDataItemsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDataItemsRequest.Merge(m, src)
 }
 func (m *ListDataItemsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDataItemsRequest.Size(m)
@@ -672,16 +689,17 @@ func (m *ListDataItemsResponse) Reset()         { *m = ListDataItemsResponse{} }
 func (m *ListDataItemsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDataItemsResponse) ProtoMessage()    {}
 func (*ListDataItemsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{9}
+	return fileDescriptor_a21c40690da1750b, []int{9}
 }
+
 func (m *ListDataItemsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDataItemsResponse.Unmarshal(m, b)
 }
 func (m *ListDataItemsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDataItemsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDataItemsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDataItemsResponse.Merge(dst, src)
+func (m *ListDataItemsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDataItemsResponse.Merge(m, src)
 }
 func (m *ListDataItemsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDataItemsResponse.Size(m)
@@ -721,16 +739,17 @@ func (m *GetAnnotatedDatasetRequest) Reset()         { *m = GetAnnotatedDatasetR
 func (m *GetAnnotatedDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAnnotatedDatasetRequest) ProtoMessage()    {}
 func (*GetAnnotatedDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{10}
+	return fileDescriptor_a21c40690da1750b, []int{10}
 }
+
 func (m *GetAnnotatedDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAnnotatedDatasetRequest.Unmarshal(m, b)
 }
 func (m *GetAnnotatedDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAnnotatedDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAnnotatedDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAnnotatedDatasetRequest.Merge(dst, src)
+func (m *GetAnnotatedDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAnnotatedDatasetRequest.Merge(m, src)
 }
 func (m *GetAnnotatedDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAnnotatedDatasetRequest.Size(m)
@@ -773,16 +792,17 @@ func (m *ListAnnotatedDatasetsRequest) Reset()         { *m = ListAnnotatedDatas
 func (m *ListAnnotatedDatasetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAnnotatedDatasetsRequest) ProtoMessage()    {}
 func (*ListAnnotatedDatasetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{11}
+	return fileDescriptor_a21c40690da1750b, []int{11}
 }
+
 func (m *ListAnnotatedDatasetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAnnotatedDatasetsRequest.Unmarshal(m, b)
 }
 func (m *ListAnnotatedDatasetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAnnotatedDatasetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAnnotatedDatasetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAnnotatedDatasetsRequest.Merge(dst, src)
+func (m *ListAnnotatedDatasetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAnnotatedDatasetsRequest.Merge(m, src)
 }
 func (m *ListAnnotatedDatasetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAnnotatedDatasetsRequest.Size(m)
@@ -836,16 +856,17 @@ func (m *DeleteAnnotatedDatasetRequest) Reset()         { *m = DeleteAnnotatedDa
 func (m *DeleteAnnotatedDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAnnotatedDatasetRequest) ProtoMessage()    {}
 func (*DeleteAnnotatedDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{12}
+	return fileDescriptor_a21c40690da1750b, []int{12}
 }
+
 func (m *DeleteAnnotatedDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAnnotatedDatasetRequest.Unmarshal(m, b)
 }
 func (m *DeleteAnnotatedDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAnnotatedDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAnnotatedDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAnnotatedDatasetRequest.Merge(dst, src)
+func (m *DeleteAnnotatedDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAnnotatedDatasetRequest.Merge(m, src)
 }
 func (m *DeleteAnnotatedDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAnnotatedDatasetRequest.Size(m)
@@ -878,16 +899,17 @@ func (m *ListAnnotatedDatasetsResponse) Reset()         { *m = ListAnnotatedData
 func (m *ListAnnotatedDatasetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAnnotatedDatasetsResponse) ProtoMessage()    {}
 func (*ListAnnotatedDatasetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{13}
+	return fileDescriptor_a21c40690da1750b, []int{13}
 }
+
 func (m *ListAnnotatedDatasetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAnnotatedDatasetsResponse.Unmarshal(m, b)
 }
 func (m *ListAnnotatedDatasetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAnnotatedDatasetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAnnotatedDatasetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAnnotatedDatasetsResponse.Merge(dst, src)
+func (m *ListAnnotatedDatasetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAnnotatedDatasetsResponse.Merge(m, src)
 }
 func (m *ListAnnotatedDatasetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAnnotatedDatasetsResponse.Size(m)
@@ -939,16 +961,17 @@ func (m *LabelImageRequest) Reset()         { *m = LabelImageRequest{} }
 func (m *LabelImageRequest) String() string { return proto.CompactTextString(m) }
 func (*LabelImageRequest) ProtoMessage()    {}
 func (*LabelImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{14}
+	return fileDescriptor_a21c40690da1750b, []int{14}
 }
+
 func (m *LabelImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelImageRequest.Unmarshal(m, b)
 }
 func (m *LabelImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *LabelImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelImageRequest.Merge(dst, src)
+func (m *LabelImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelImageRequest.Merge(m, src)
 }
 func (m *LabelImageRequest) XXX_Size() int {
 	return xxx_messageInfo_LabelImageRequest.Size(m)
@@ -1043,9 +1066,9 @@ func (m *LabelImageRequest) GetFeature() LabelImageRequest_Feature {
 	return LabelImageRequest_FEATURE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LabelImageRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LabelImageRequest_OneofMarshaler, _LabelImageRequest_OneofUnmarshaler, _LabelImageRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LabelImageRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LabelImageRequest_ImageClassificationConfig)(nil),
 		(*LabelImageRequest_BoundingPolyConfig)(nil),
 		(*LabelImageRequest_PolylineConfig)(nil),
@@ -1053,108 +1076,6 @@ func (*LabelImageRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _LabelImageRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LabelImageRequest)
-	// request_config
-	switch x := m.RequestConfig.(type) {
-	case *LabelImageRequest_ImageClassificationConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageClassificationConfig); err != nil {
-			return err
-		}
-	case *LabelImageRequest_BoundingPolyConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BoundingPolyConfig); err != nil {
-			return err
-		}
-	case *LabelImageRequest_PolylineConfig:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PolylineConfig); err != nil {
-			return err
-		}
-	case *LabelImageRequest_SegmentationConfig:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SegmentationConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LabelImageRequest.RequestConfig has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LabelImageRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LabelImageRequest)
-	switch tag {
-	case 4: // request_config.image_classification_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageClassificationConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelImageRequest_ImageClassificationConfig{msg}
-		return true, err
-	case 5: // request_config.bounding_poly_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BoundingPolyConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelImageRequest_BoundingPolyConfig{msg}
-		return true, err
-	case 6: // request_config.polyline_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolylineConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelImageRequest_PolylineConfig{msg}
-		return true, err
-	case 7: // request_config.segmentation_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SegmentationConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelImageRequest_SegmentationConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LabelImageRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LabelImageRequest)
-	// request_config
-	switch x := m.RequestConfig.(type) {
-	case *LabelImageRequest_ImageClassificationConfig:
-		s := proto.Size(x.ImageClassificationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelImageRequest_BoundingPolyConfig:
-		s := proto.Size(x.BoundingPolyConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelImageRequest_PolylineConfig:
-		s := proto.Size(x.PolylineConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelImageRequest_SegmentationConfig:
-		s := proto.Size(x.SegmentationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for LabelVideo.
 type LabelVideoRequest struct {
 	// Required. Config for labeling tasks. The type of request config must
@@ -1182,16 +1103,17 @@ func (m *LabelVideoRequest) Reset()         { *m = LabelVideoRequest{} }
 func (m *LabelVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*LabelVideoRequest) ProtoMessage()    {}
 func (*LabelVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{15}
+	return fileDescriptor_a21c40690da1750b, []int{15}
 }
+
 func (m *LabelVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelVideoRequest.Unmarshal(m, b)
 }
 func (m *LabelVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *LabelVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelVideoRequest.Merge(dst, src)
+func (m *LabelVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelVideoRequest.Merge(m, src)
 }
 func (m *LabelVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_LabelVideoRequest.Size(m)
@@ -1286,9 +1208,9 @@ func (m *LabelVideoRequest) GetFeature() LabelVideoRequest_Feature {
 	return LabelVideoRequest_FEATURE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LabelVideoRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LabelVideoRequest_OneofMarshaler, _LabelVideoRequest_OneofUnmarshaler, _LabelVideoRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LabelVideoRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LabelVideoRequest_VideoClassificationConfig)(nil),
 		(*LabelVideoRequest_ObjectDetectionConfig)(nil),
 		(*LabelVideoRequest_ObjectTrackingConfig)(nil),
@@ -1296,108 +1218,6 @@ func (*LabelVideoRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _LabelVideoRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LabelVideoRequest)
-	// request_config
-	switch x := m.RequestConfig.(type) {
-	case *LabelVideoRequest_VideoClassificationConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoClassificationConfig); err != nil {
-			return err
-		}
-	case *LabelVideoRequest_ObjectDetectionConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ObjectDetectionConfig); err != nil {
-			return err
-		}
-	case *LabelVideoRequest_ObjectTrackingConfig:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ObjectTrackingConfig); err != nil {
-			return err
-		}
-	case *LabelVideoRequest_EventConfig:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EventConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LabelVideoRequest.RequestConfig has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LabelVideoRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LabelVideoRequest)
-	switch tag {
-	case 4: // request_config.video_classification_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoClassificationConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelVideoRequest_VideoClassificationConfig{msg}
-		return true, err
-	case 5: // request_config.object_detection_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ObjectDetectionConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelVideoRequest_ObjectDetectionConfig{msg}
-		return true, err
-	case 6: // request_config.object_tracking_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ObjectTrackingConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelVideoRequest_ObjectTrackingConfig{msg}
-		return true, err
-	case 7: // request_config.event_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EventConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelVideoRequest_EventConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LabelVideoRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LabelVideoRequest)
-	// request_config
-	switch x := m.RequestConfig.(type) {
-	case *LabelVideoRequest_VideoClassificationConfig:
-		s := proto.Size(x.VideoClassificationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelVideoRequest_ObjectDetectionConfig:
-		s := proto.Size(x.ObjectDetectionConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelVideoRequest_ObjectTrackingConfig:
-		s := proto.Size(x.ObjectTrackingConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelVideoRequest_EventConfig:
-		s := proto.Size(x.EventConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for LabelText.
 type LabelTextRequest struct {
 	// Required. Config for labeling tasks. The type of request config must
@@ -1423,16 +1243,17 @@ func (m *LabelTextRequest) Reset()         { *m = LabelTextRequest{} }
 func (m *LabelTextRequest) String() string { return proto.CompactTextString(m) }
 func (*LabelTextRequest) ProtoMessage()    {}
 func (*LabelTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{16}
+	return fileDescriptor_a21c40690da1750b, []int{16}
 }
+
 func (m *LabelTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelTextRequest.Unmarshal(m, b)
 }
 func (m *LabelTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *LabelTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelTextRequest.Merge(dst, src)
+func (m *LabelTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelTextRequest.Merge(m, src)
 }
 func (m *LabelTextRequest) XXX_Size() int {
 	return xxx_messageInfo_LabelTextRequest.Size(m)
@@ -1501,80 +1322,14 @@ func (m *LabelTextRequest) GetFeature() LabelTextRequest_Feature {
 	return LabelTextRequest_FEATURE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LabelTextRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LabelTextRequest_OneofMarshaler, _LabelTextRequest_OneofUnmarshaler, _LabelTextRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LabelTextRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LabelTextRequest_TextClassificationConfig)(nil),
 		(*LabelTextRequest_TextEntityExtractionConfig)(nil),
 	}
 }
 
-func _LabelTextRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LabelTextRequest)
-	// request_config
-	switch x := m.RequestConfig.(type) {
-	case *LabelTextRequest_TextClassificationConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextClassificationConfig); err != nil {
-			return err
-		}
-	case *LabelTextRequest_TextEntityExtractionConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextEntityExtractionConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LabelTextRequest.RequestConfig has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LabelTextRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LabelTextRequest)
-	switch tag {
-	case 4: // request_config.text_classification_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextClassificationConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelTextRequest_TextClassificationConfig{msg}
-		return true, err
-	case 5: // request_config.text_entity_extraction_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextEntityExtractionConfig)
-		err := b.DecodeMessage(msg)
-		m.RequestConfig = &LabelTextRequest_TextEntityExtractionConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LabelTextRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LabelTextRequest)
-	// request_config
-	switch x := m.RequestConfig.(type) {
-	case *LabelTextRequest_TextClassificationConfig:
-		s := proto.Size(x.TextClassificationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelTextRequest_TextEntityExtractionConfig:
-		s := proto.Size(x.TextEntityExtractionConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for LabelAudio.
 type LabelAudioRequest struct {
 	// Required. Name of the dataset to request labeling task, format:
@@ -1593,16 +1348,17 @@ func (m *LabelAudioRequest) Reset()         { *m = LabelAudioRequest{} }
 func (m *LabelAudioRequest) String() string { return proto.CompactTextString(m) }
 func (*LabelAudioRequest) ProtoMessage()    {}
 func (*LabelAudioRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{17}
+	return fileDescriptor_a21c40690da1750b, []int{17}
 }
+
 func (m *LabelAudioRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAudioRequest.Unmarshal(m, b)
 }
 func (m *LabelAudioRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAudioRequest.Marshal(b, m, deterministic)
 }
-func (dst *LabelAudioRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAudioRequest.Merge(dst, src)
+func (m *LabelAudioRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAudioRequest.Merge(m, src)
 }
 func (m *LabelAudioRequest) XXX_Size() int {
 	return xxx_messageInfo_LabelAudioRequest.Size(m)
@@ -1653,16 +1409,17 @@ func (m *GetExampleRequest) Reset()         { *m = GetExampleRequest{} }
 func (m *GetExampleRequest) String() string { return proto.CompactTextString(m) }
 func (*GetExampleRequest) ProtoMessage()    {}
 func (*GetExampleRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{18}
+	return fileDescriptor_a21c40690da1750b, []int{18}
 }
+
 func (m *GetExampleRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetExampleRequest.Unmarshal(m, b)
 }
 func (m *GetExampleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetExampleRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetExampleRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetExampleRequest.Merge(dst, src)
+func (m *GetExampleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetExampleRequest.Merge(m, src)
 }
 func (m *GetExampleRequest) XXX_Size() int {
 	return xxx_messageInfo_GetExampleRequest.Size(m)
@@ -1714,16 +1471,17 @@ func (m *ListExamplesRequest) Reset()         { *m = ListExamplesRequest{} }
 func (m *ListExamplesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListExamplesRequest) ProtoMessage()    {}
 func (*ListExamplesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{19}
+	return fileDescriptor_a21c40690da1750b, []int{19}
 }
+
 func (m *ListExamplesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListExamplesRequest.Unmarshal(m, b)
 }
 func (m *ListExamplesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListExamplesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListExamplesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListExamplesRequest.Merge(dst, src)
+func (m *ListExamplesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListExamplesRequest.Merge(m, src)
 }
 func (m *ListExamplesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListExamplesRequest.Size(m)
@@ -1777,16 +1535,17 @@ func (m *ListExamplesResponse) Reset()         { *m = ListExamplesResponse{} }
 func (m *ListExamplesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListExamplesResponse) ProtoMessage()    {}
 func (*ListExamplesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{20}
+	return fileDescriptor_a21c40690da1750b, []int{20}
 }
+
 func (m *ListExamplesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListExamplesResponse.Unmarshal(m, b)
 }
 func (m *ListExamplesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListExamplesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListExamplesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListExamplesResponse.Merge(dst, src)
+func (m *ListExamplesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListExamplesResponse.Merge(m, src)
 }
 func (m *ListExamplesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListExamplesResponse.Size(m)
@@ -1829,16 +1588,17 @@ func (m *CreateAnnotationSpecSetRequest) Reset()         { *m = CreateAnnotation
 func (m *CreateAnnotationSpecSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAnnotationSpecSetRequest) ProtoMessage()    {}
 func (*CreateAnnotationSpecSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{21}
+	return fileDescriptor_a21c40690da1750b, []int{21}
 }
+
 func (m *CreateAnnotationSpecSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAnnotationSpecSetRequest.Unmarshal(m, b)
 }
 func (m *CreateAnnotationSpecSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAnnotationSpecSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAnnotationSpecSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAnnotationSpecSetRequest.Merge(dst, src)
+func (m *CreateAnnotationSpecSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAnnotationSpecSetRequest.Merge(m, src)
 }
 func (m *CreateAnnotationSpecSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAnnotationSpecSetRequest.Size(m)
@@ -1877,16 +1637,17 @@ func (m *GetAnnotationSpecSetRequest) Reset()         { *m = GetAnnotationSpecSe
 func (m *GetAnnotationSpecSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAnnotationSpecSetRequest) ProtoMessage()    {}
 func (*GetAnnotationSpecSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{22}
+	return fileDescriptor_a21c40690da1750b, []int{22}
 }
+
 func (m *GetAnnotationSpecSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAnnotationSpecSetRequest.Unmarshal(m, b)
 }
 func (m *GetAnnotationSpecSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAnnotationSpecSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAnnotationSpecSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAnnotationSpecSetRequest.Merge(dst, src)
+func (m *GetAnnotationSpecSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAnnotationSpecSetRequest.Merge(m, src)
 }
 func (m *GetAnnotationSpecSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAnnotationSpecSetRequest.Size(m)
@@ -1929,16 +1690,17 @@ func (m *ListAnnotationSpecSetsRequest) Reset()         { *m = ListAnnotationSpe
 func (m *ListAnnotationSpecSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAnnotationSpecSetsRequest) ProtoMessage()    {}
 func (*ListAnnotationSpecSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{23}
+	return fileDescriptor_a21c40690da1750b, []int{23}
 }
+
 func (m *ListAnnotationSpecSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAnnotationSpecSetsRequest.Unmarshal(m, b)
 }
 func (m *ListAnnotationSpecSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAnnotationSpecSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAnnotationSpecSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAnnotationSpecSetsRequest.Merge(dst, src)
+func (m *ListAnnotationSpecSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAnnotationSpecSetsRequest.Merge(m, src)
 }
 func (m *ListAnnotationSpecSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAnnotationSpecSetsRequest.Size(m)
@@ -1992,16 +1754,17 @@ func (m *ListAnnotationSpecSetsResponse) Reset()         { *m = ListAnnotationSp
 func (m *ListAnnotationSpecSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAnnotationSpecSetsResponse) ProtoMessage()    {}
 func (*ListAnnotationSpecSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{24}
+	return fileDescriptor_a21c40690da1750b, []int{24}
 }
+
 func (m *ListAnnotationSpecSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAnnotationSpecSetsResponse.Unmarshal(m, b)
 }
 func (m *ListAnnotationSpecSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAnnotationSpecSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAnnotationSpecSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAnnotationSpecSetsResponse.Merge(dst, src)
+func (m *ListAnnotationSpecSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAnnotationSpecSetsResponse.Merge(m, src)
 }
 func (m *ListAnnotationSpecSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAnnotationSpecSetsResponse.Size(m)
@@ -2040,16 +1803,17 @@ func (m *DeleteAnnotationSpecSetRequest) Reset()         { *m = DeleteAnnotation
 func (m *DeleteAnnotationSpecSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAnnotationSpecSetRequest) ProtoMessage()    {}
 func (*DeleteAnnotationSpecSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{25}
+	return fileDescriptor_a21c40690da1750b, []int{25}
 }
+
 func (m *DeleteAnnotationSpecSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAnnotationSpecSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteAnnotationSpecSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAnnotationSpecSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAnnotationSpecSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAnnotationSpecSetRequest.Merge(dst, src)
+func (m *DeleteAnnotationSpecSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAnnotationSpecSetRequest.Merge(m, src)
 }
 func (m *DeleteAnnotationSpecSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAnnotationSpecSetRequest.Size(m)
@@ -2083,16 +1847,17 @@ func (m *CreateInstructionRequest) Reset()         { *m = CreateInstructionReque
 func (m *CreateInstructionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateInstructionRequest) ProtoMessage()    {}
 func (*CreateInstructionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{26}
+	return fileDescriptor_a21c40690da1750b, []int{26}
 }
+
 func (m *CreateInstructionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstructionRequest.Unmarshal(m, b)
 }
 func (m *CreateInstructionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstructionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstructionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstructionRequest.Merge(dst, src)
+func (m *CreateInstructionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstructionRequest.Merge(m, src)
 }
 func (m *CreateInstructionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateInstructionRequest.Size(m)
@@ -2131,16 +1896,17 @@ func (m *GetInstructionRequest) Reset()         { *m = GetInstructionRequest{} }
 func (m *GetInstructionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInstructionRequest) ProtoMessage()    {}
 func (*GetInstructionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{27}
+	return fileDescriptor_a21c40690da1750b, []int{27}
 }
+
 func (m *GetInstructionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInstructionRequest.Unmarshal(m, b)
 }
 func (m *GetInstructionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInstructionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInstructionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInstructionRequest.Merge(dst, src)
+func (m *GetInstructionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstructionRequest.Merge(m, src)
 }
 func (m *GetInstructionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInstructionRequest.Size(m)
@@ -2172,16 +1938,17 @@ func (m *DeleteInstructionRequest) Reset()         { *m = DeleteInstructionReque
 func (m *DeleteInstructionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteInstructionRequest) ProtoMessage()    {}
 func (*DeleteInstructionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{28}
+	return fileDescriptor_a21c40690da1750b, []int{28}
 }
+
 func (m *DeleteInstructionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteInstructionRequest.Unmarshal(m, b)
 }
 func (m *DeleteInstructionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteInstructionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteInstructionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteInstructionRequest.Merge(dst, src)
+func (m *DeleteInstructionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstructionRequest.Merge(m, src)
 }
 func (m *DeleteInstructionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteInstructionRequest.Size(m)
@@ -2224,16 +1991,17 @@ func (m *ListInstructionsRequest) Reset()         { *m = ListInstructionsRequest
 func (m *ListInstructionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInstructionsRequest) ProtoMessage()    {}
 func (*ListInstructionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{29}
+	return fileDescriptor_a21c40690da1750b, []int{29}
 }
+
 func (m *ListInstructionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstructionsRequest.Unmarshal(m, b)
 }
 func (m *ListInstructionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstructionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInstructionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstructionsRequest.Merge(dst, src)
+func (m *ListInstructionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstructionsRequest.Merge(m, src)
 }
 func (m *ListInstructionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInstructionsRequest.Size(m)
@@ -2287,16 +2055,17 @@ func (m *ListInstructionsResponse) Reset()         { *m = ListInstructionsRespon
 func (m *ListInstructionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInstructionsResponse) ProtoMessage()    {}
 func (*ListInstructionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3, []int{30}
+	return fileDescriptor_a21c40690da1750b, []int{30}
 }
+
 func (m *ListInstructionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstructionsResponse.Unmarshal(m, b)
 }
 func (m *ListInstructionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstructionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInstructionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstructionsResponse.Merge(dst, src)
+func (m *ListInstructionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstructionsResponse.Merge(m, src)
 }
 func (m *ListInstructionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInstructionsResponse.Size(m)
@@ -2322,6 +2091,10 @@ func (m *ListInstructionsResponse) GetNextPageToken() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelImageRequest_Feature", LabelImageRequest_Feature_name, LabelImageRequest_Feature_value)
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelVideoRequest_Feature", LabelVideoRequest_Feature_name, LabelVideoRequest_Feature_value)
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelTextRequest_Feature", LabelTextRequest_Feature_name, LabelTextRequest_Feature_value)
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelAudioRequest_Feature", LabelAudioRequest_Feature_name, LabelAudioRequest_Feature_value)
 	proto.RegisterType((*CreateDatasetRequest)(nil), "google.cloud.datalabeling.v1beta1.CreateDatasetRequest")
 	proto.RegisterType((*GetDatasetRequest)(nil), "google.cloud.datalabeling.v1beta1.GetDatasetRequest")
 	proto.RegisterType((*ListDatasetsRequest)(nil), "google.cloud.datalabeling.v1beta1.ListDatasetsRequest")
@@ -2353,10 +2126,151 @@ func init() {
 	proto.RegisterType((*DeleteInstructionRequest)(nil), "google.cloud.datalabeling.v1beta1.DeleteInstructionRequest")
 	proto.RegisterType((*ListInstructionsRequest)(nil), "google.cloud.datalabeling.v1beta1.ListInstructionsRequest")
 	proto.RegisterType((*ListInstructionsResponse)(nil), "google.cloud.datalabeling.v1beta1.ListInstructionsResponse")
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelImageRequest_Feature", LabelImageRequest_Feature_name, LabelImageRequest_Feature_value)
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelVideoRequest_Feature", LabelVideoRequest_Feature_name, LabelVideoRequest_Feature_value)
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelTextRequest_Feature", LabelTextRequest_Feature_name, LabelTextRequest_Feature_value)
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.LabelAudioRequest_Feature", LabelAudioRequest_Feature_name, LabelAudioRequest_Feature_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/datalabeling/v1beta1/data_labeling_service.proto", fileDescriptor_a21c40690da1750b)
+}
+
+var fileDescriptor_a21c40690da1750b = []byte{
+	// 2191 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x6f, 0x1b, 0xc7,
+	0x15, 0xcf, 0xe8, 0xcb, 0xd6, 0xd3, 0x87, 0xc9, 0x91, 0x2c, 0x31, 0x74, 0x64, 0xa8, 0x1b, 0xa4,
+	0x71, 0x68, 0x94, 0xb4, 0x2c, 0xbb, 0x76, 0xa4, 0x2a, 0x0e, 0x45, 0xae, 0x14, 0xa6, 0x0a, 0xa9,
+	0x92, 0x94, 0xeb, 0xb4, 0x05, 0x88, 0x25, 0x39, 0x62, 0xb6, 0x26, 0x77, 0x59, 0xee, 0x52, 0x90,
+	0x1c, 0xa4, 0x40, 0x8d, 0xb6, 0x87, 0xe6, 0xd0, 0x43, 0x81, 0x1c, 0x5a, 0xc4, 0x40, 0x0f, 0xed,
+	0xa5, 0x4d, 0xd0, 0x4b, 0x6f, 0x6d, 0x0e, 0x05, 0x7a, 0xea, 0xc7, 0xa5, 0x40, 0x6f, 0xbd, 0xf5,
+	0x0f, 0x29, 0x66, 0x76, 0xf6, 0x8b, 0xbb, 0x4b, 0x0e, 0x65, 0x03, 0x6a, 0x6e, 0xda, 0xd9, 0x7d,
+	0xef, 0xfd, 0xde, 0x7b, 0xbf, 0xb7, 0x3b, 0xf3, 0x13, 0x61, 0xa7, 0xa5, 0xeb, 0xad, 0x36, 0xc9,
+	0x34, 0xda, 0x7a, 0xbf, 0x99, 0x69, 0x2a, 0xa6, 0xd2, 0x56, 0xea, 0xa4, 0xad, 0x6a, 0xad, 0xcc,
+	0xc9, 0x46, 0x9d, 0x98, 0xca, 0x06, 0x5b, 0xac, 0xd9, 0xab, 0x35, 0x83, 0xf4, 0x4e, 0xd4, 0x06,
+	0x49, 0x77, 0x7b, 0xba, 0xa9, 0xe3, 0xaf, 0x58, 0xe6, 0x69, 0x66, 0x9e, 0xf6, 0x9a, 0xa7, 0xb9,
+	0x79, 0xf2, 0x15, 0x1e, 0x41, 0xe9, 0xaa, 0x19, 0x45, 0xd3, 0x74, 0x53, 0x31, 0x55, 0x5d, 0x33,
+	0x2c, 0x07, 0xc9, 0xed, 0xd1, 0xf1, 0x5d, 0xa3, 0x9a, 0xd1, 0x25, 0x8d, 0x9a, 0x41, 0x4c, 0x6e,
+	0x9c, 0x11, 0x03, 0xef, 0x1a, 0x3c, 0x18, 0x6d, 0xf0, 0x41, 0xbf, 0xa3, 0x68, 0x35, 0x4f, 0xcc,
+	0x86, 0xae, 0x1d, 0xab, 0x2d, 0xee, 0x60, 0x73, 0xb4, 0x03, 0x55, 0x33, 0xcc, 0x5e, 0xbf, 0x41,
+	0x6d, 0xb9, 0xd1, 0xed, 0xd1, 0x46, 0x7a, 0x97, 0xf4, 0x7c, 0x75, 0x79, 0x95, 0xdb, 0xb4, 0x75,
+	0xad, 0xd5, 0xeb, 0x6b, 0x1a, 0x7d, 0x38, 0xf0, 0xd0, 0x35, 0xfe, 0x10, 0xbb, 0xaa, 0xf7, 0x8f,
+	0x33, 0xa4, 0xd3, 0x35, 0xcf, 0xf8, 0xcd, 0xf5, 0xc1, 0x9b, 0xc7, 0x2a, 0x69, 0x37, 0x6b, 0x1d,
+	0xc5, 0x78, 0x6c, 0x3d, 0x21, 0x99, 0xb0, 0x9c, 0xeb, 0x11, 0xc5, 0x24, 0x79, 0xab, 0x48, 0x65,
+	0xf2, 0x83, 0x3e, 0x31, 0x4c, 0xbc, 0x02, 0x33, 0x5d, 0xa5, 0x47, 0x34, 0x33, 0x81, 0xd6, 0xd1,
+	0x8d, 0xd9, 0x32, 0xbf, 0xc2, 0x79, 0xb8, 0xc4, 0xcb, 0x99, 0x98, 0x58, 0x47, 0x37, 0xe6, 0x6e,
+	0xa7, 0xd2, 0x23, 0xdb, 0x9f, 0xb6, 0x7d, 0xdb, 0xa6, 0xd2, 0xeb, 0x10, 0xdf, 0x27, 0xe6, 0x40,
+	0x48, 0x0c, 0x53, 0x9a, 0xd2, 0x21, 0x3c, 0x20, 0xfb, 0x5b, 0xfa, 0x11, 0x82, 0xa5, 0x03, 0xd5,
+	0xb0, 0x1f, 0x35, 0x46, 0xc1, 0x5b, 0x81, 0x99, 0x63, 0xb5, 0x6d, 0x92, 0x1e, 0x43, 0x37, 0x5b,
+	0xe6, 0x57, 0xf8, 0x1a, 0xcc, 0x76, 0x95, 0x16, 0xa9, 0x19, 0xea, 0x13, 0x92, 0x98, 0x5c, 0x47,
+	0x37, 0xa6, 0xcb, 0x97, 0xe9, 0x42, 0x45, 0x7d, 0x42, 0xf0, 0x1a, 0x00, 0xbb, 0x69, 0xea, 0x8f,
+	0x89, 0x96, 0x98, 0x62, 0x86, 0xec, 0xf1, 0x2a, 0x5d, 0x90, 0x7e, 0x8a, 0x60, 0xd9, 0x8f, 0xc1,
+	0xe8, 0xea, 0x9a, 0x41, 0xf0, 0x1e, 0x5c, 0xe6, 0x09, 0x19, 0x09, 0xb4, 0x3e, 0x39, 0x66, 0x31,
+	0x1c, 0x5b, 0xfc, 0x55, 0xb8, 0xa2, 0x91, 0x53, 0xb3, 0xe6, 0x01, 0x61, 0xa1, 0x5f, 0xa0, 0xcb,
+	0x87, 0x0e, 0x90, 0x14, 0x2c, 0xe7, 0x49, 0x9b, 0x04, 0x7a, 0x15, 0x56, 0xb8, 0x27, 0x10, 0x2f,
+	0x74, 0xba, 0x7a, 0x8f, 0xa1, 0x1e, 0xf2, 0x20, 0xfe, 0x16, 0xcc, 0xab, 0x5a, 0xb7, 0x6f, 0x72,
+	0x8e, 0xf3, 0xae, 0xa6, 0x05, 0x12, 0x29, 0x50, 0xb3, 0x1c, 0xb3, 0x2a, 0xcf, 0xa9, 0xee, 0x85,
+	0xf4, 0x17, 0x04, 0x71, 0xf9, 0x54, 0x24, 0xf8, 0x4d, 0x88, 0xf3, 0x29, 0x23, 0xcd, 0x9a, 0x97,
+	0x57, 0xb3, 0xe5, 0x98, 0x73, 0x83, 0x67, 0xeb, 0xe9, 0xed, 0xa4, 0xaf, 0xb7, 0x55, 0x58, 0xd0,
+	0xfb, 0xa6, 0x27, 0x85, 0x29, 0x96, 0x42, 0x46, 0x20, 0x85, 0x12, 0xb3, 0xe3, 0x39, 0xcc, 0xeb,
+	0x9e, 0x2b, 0xe9, 0x06, 0x60, 0x4e, 0xd1, 0x82, 0x49, 0x3a, 0xc3, 0x4a, 0xfd, 0xd4, 0xc3, 0x0f,
+	0xfa, 0xec, 0x85, 0x90, 0xf4, 0x63, 0x04, 0x57, 0x07, 0x40, 0x70, 0x96, 0xbe, 0x0b, 0xc0, 0xde,
+	0xde, 0x2a, 0x5d, 0xe5, 0x3c, 0xbd, 0x29, 0xc8, 0x53, 0x96, 0xfa, 0x6c, 0xd3, 0xf6, 0x29, 0xcc,
+	0xd4, 0x5b, 0x90, 0xdc, 0x27, 0x66, 0x76, 0xa0, 0x83, 0xc3, 0x8a, 0xf8, 0x33, 0x04, 0xaf, 0x50,
+	0xfc, 0x83, 0x36, 0x17, 0x52, 0xcc, 0x4d, 0x58, 0xb3, 0x06, 0x6d, 0x9c, 0x0c, 0x7e, 0x87, 0x60,
+	0x2d, 0x22, 0x03, 0xde, 0x89, 0x3a, 0xe0, 0x00, 0xdb, 0xed, 0x8e, 0x6c, 0x0a, 0x74, 0x24, 0x80,
+	0x26, 0x3e, 0x38, 0x23, 0xe2, 0x1d, 0xfa, 0x62, 0x06, 0xe2, 0x07, 0x34, 0x40, 0xa1, 0xa3, 0xb4,
+	0x88, 0x9d, 0xd7, 0x0f, 0xe1, 0x9a, 0x4a, 0xaf, 0x6b, 0x8d, 0xb6, 0x62, 0x18, 0xea, 0xb1, 0xda,
+	0xf0, 0x7e, 0xff, 0xf8, 0x60, 0x7d, 0x43, 0xe4, 0xdd, 0x40, 0xbd, 0xe4, 0x7c, 0x4e, 0xac, 0xb9,
+	0x7a, 0xe7, 0xa5, 0xf2, 0xcb, 0x6a, 0xd4, 0x4d, 0xac, 0xc2, 0x72, 0x5d, 0xef, 0x6b, 0x4d, 0xba,
+	0xc9, 0xe8, 0xea, 0xed, 0x33, 0x3b, 0xf0, 0x34, 0x0b, 0x7c, 0x57, 0x20, 0xf0, 0x2e, 0x37, 0x3f,
+	0xd4, 0xdb, 0x67, 0x4e, 0x44, 0x5c, 0x0f, 0xac, 0xe2, 0xef, 0xc1, 0x15, 0x1a, 0xa1, 0xad, 0x6a,
+	0xc4, 0x8e, 0x32, 0xc3, 0xa2, 0x6c, 0x08, 0x44, 0x39, 0xe4, 0x96, 0x4e, 0x84, 0xc5, 0xae, 0x6f,
+	0x05, 0x7f, 0x00, 0x4b, 0x06, 0x69, 0x75, 0x88, 0xe6, 0xdb, 0x40, 0x24, 0x2e, 0x09, 0xe7, 0x51,
+	0xf1, 0x58, 0xbb, 0x79, 0x18, 0x81, 0xd5, 0xc8, 0xb9, 0xf8, 0x2e, 0xcc, 0xd7, 0x15, 0x43, 0x6d,
+	0xf8, 0xdf, 0xeb, 0xf7, 0x05, 0x42, 0xbf, 0x43, 0x77, 0x3f, 0x59, 0x67, 0xf3, 0x63, 0xbf, 0xe1,
+	0x99, 0x37, 0x1e, 0xf4, 0x21, 0x5c, 0x3a, 0x26, 0x8a, 0xd9, 0xef, 0x59, 0xa3, 0xb5, 0x28, 0xc4,
+	0x89, 0x00, 0xdd, 0xd2, 0x7b, 0x96, 0x8f, 0xb2, 0xed, 0x4c, 0xfa, 0x04, 0xc1, 0x25, 0xbe, 0x88,
+	0x57, 0x61, 0x69, 0x4f, 0xce, 0x56, 0x8f, 0xca, 0x72, 0xed, 0xa8, 0x58, 0x39, 0x94, 0x73, 0x85,
+	0xbd, 0x82, 0x9c, 0x8f, 0xbd, 0x84, 0x31, 0x2c, 0xe6, 0x0e, 0xb2, 0x95, 0x4a, 0x61, 0xaf, 0x90,
+	0xcb, 0x56, 0x0b, 0xa5, 0x62, 0x0c, 0xe1, 0x18, 0xcc, 0xef, 0x96, 0x8e, 0x8a, 0xf9, 0x42, 0x71,
+	0xbf, 0xb6, 0x5b, 0x7a, 0x14, 0x9b, 0xc0, 0x2f, 0xc3, 0xd5, 0x52, 0xb9, 0x20, 0x17, 0xab, 0x72,
+	0xbe, 0xe6, 0xbb, 0x35, 0x83, 0xe3, 0xb0, 0xe0, 0xac, 0x1c, 0x96, 0x0e, 0xde, 0x8f, 0x4d, 0xe2,
+	0x79, 0xb8, 0x4c, 0xff, 0x3a, 0x28, 0x14, 0xe5, 0xd8, 0x14, 0xf5, 0x56, 0x91, 0xf7, 0xdf, 0x93,
+	0x8b, 0x55, 0xcb, 0xff, 0xf4, 0x6e, 0x0c, 0x16, 0x7b, 0x16, 0x68, 0x5e, 0x4f, 0xe9, 0x97, 0xf6,
+	0x00, 0x3d, 0x54, 0x9b, 0x44, 0xf7, 0x0c, 0xd0, 0x09, 0xbd, 0x7e, 0xee, 0x01, 0x62, 0x5e, 0xa3,
+	0x06, 0xe8, 0x24, 0xea, 0x26, 0xee, 0xc1, 0xaa, 0x5e, 0xff, 0x3e, 0x69, 0x98, 0xb5, 0x26, 0x31,
+	0x49, 0xc3, 0x1b, 0x7b, 0x5a, 0x98, 0x00, 0x25, 0xe6, 0x21, 0x6f, 0x3b, 0x70, 0xe2, 0x5e, 0xd5,
+	0xc3, 0x6e, 0x60, 0x1d, 0x56, 0x78, 0x4c, 0xb3, 0xa7, 0x34, 0x1e, 0xd3, 0xd9, 0xf5, 0x0d, 0xd4,
+	0x3d, 0xe1, 0x90, 0x55, 0x6e, 0xef, 0x44, 0x5c, 0xd6, 0x43, 0xd6, 0x71, 0x05, 0xe6, 0xc9, 0x09,
+	0xd1, 0x4c, 0xff, 0x54, 0x89, 0x6c, 0x59, 0x64, 0x6a, 0xe6, 0x78, 0x9f, 0x23, 0xee, 0xe5, 0x97,
+	0x6d, 0x8e, 0xbc, 0xac, 0x0b, 0xce, 0x51, 0xfb, 0x9c, 0x63, 0xb4, 0x0c, 0xb1, 0xd2, 0xee, 0xbb,
+	0x72, 0xae, 0x5a, 0xcb, 0xcb, 0x55, 0x39, 0xc7, 0x56, 0x27, 0xf0, 0x12, 0x5c, 0xe1, 0xab, 0xd5,
+	0x72, 0x36, 0xf7, 0xcd, 0x42, 0x71, 0x3f, 0x36, 0x89, 0x67, 0x61, 0x5a, 0x7e, 0x28, 0x17, 0xab,
+	0xb1, 0xa9, 0x90, 0xe1, 0xf8, 0xdb, 0x14, 0xc4, 0x18, 0xcc, 0x2a, 0x39, 0x75, 0x3e, 0x9a, 0x1f,
+	0x42, 0xd2, 0xa4, 0x9f, 0xa6, 0x61, 0xa3, 0xb1, 0x2d, 0x90, 0x3f, 0xf5, 0x19, 0x31, 0x19, 0x09,
+	0x33, 0xe2, 0x1e, 0x7e, 0x8a, 0x60, 0x8d, 0x45, 0x27, 0x9a, 0xa9, 0x9a, 0x67, 0x35, 0x72, 0x4a,
+	0xc9, 0x1a, 0x9c, 0x8f, 0x1d, 0x41, 0x00, 0x32, 0x73, 0x23, 0x3b, 0x5e, 0x1c, 0x08, 0x2c, 0xc7,
+	0xf0, 0xbb, 0x17, 0xc3, 0xb1, 0x23, 0x97, 0x63, 0x33, 0x8c, 0x63, 0xdb, 0xa2, 0x1c, 0xf3, 0x34,
+	0x2f, 0x48, 0xb1, 0x6f, 0x0b, 0x50, 0x6c, 0x15, 0x96, 0xaa, 0xf2, 0xa3, 0x6a, 0x2d, 0xc0, 0xb3,
+	0x24, 0xac, 0xb0, 0x1b, 0x72, 0xb1, 0x5a, 0xa8, 0xbe, 0x5f, 0x93, 0x1f, 0x51, 0x62, 0x59, 0x6c,
+	0x0b, 0x61, 0xd3, 0xa7, 0x13, 0xfc, 0x55, 0x9b, 0xed, 0x37, 0x55, 0x7d, 0xd4, 0x86, 0xf0, 0xff,
+	0x74, 0x60, 0xbd, 0xd8, 0x83, 0xd5, 0xdc, 0x16, 0xab, 0x66, 0xf6, 0x28, 0x5f, 0x28, 0xd1, 0x29,
+	0x2c, 0x56, 0x72, 0xe5, 0xc2, 0xa1, 0x55, 0x4d, 0xe9, 0x01, 0x3b, 0x4d, 0xcb, 0xa7, 0x4a, 0xa7,
+	0xdb, 0x26, 0xc3, 0x8e, 0x5b, 0x11, 0x7b, 0x65, 0xe7, 0x94, 0xcd, 0x5d, 0x5c, 0xe8, 0x29, 0xdb,
+	0xc5, 0xe0, 0x9e, 0xb2, 0x09, 0x5f, 0x1b, 0xe3, 0x94, 0x6d, 0x57, 0xc3, 0xb1, 0x15, 0xde, 0x19,
+	0x3f, 0x43, 0x70, 0xdd, 0x92, 0x44, 0x5c, 0x2a, 0x54, 0xba, 0xa4, 0x51, 0x19, 0x2d, 0x8e, 0x34,
+	0x61, 0x29, 0x44, 0xa8, 0xe2, 0x0c, 0xbc, 0x23, 0xbe, 0xc3, 0xf7, 0x44, 0x8c, 0x2b, 0x83, 0x4b,
+	0xd2, 0x06, 0x5c, 0x73, 0x0f, 0x57, 0x41, 0x70, 0x61, 0x67, 0x93, 0x8f, 0xfd, 0x67, 0x13, 0xd7,
+	0xe8, 0x42, 0x5a, 0xfd, 0x07, 0x04, 0xd7, 0xa3, 0xd0, 0xf0, 0xa6, 0x1f, 0xc3, 0x72, 0x48, 0x25,
+	0x6d, 0x02, 0x9c, 0xaf, 0x94, 0x38, 0x50, 0x4a, 0x71, 0x52, 0xdc, 0x81, 0xeb, 0xbe, 0x13, 0xa1,
+	0x58, 0xd9, 0x7f, 0x8c, 0x20, 0x61, 0x51, 0xa9, 0xe0, 0x0a, 0x82, 0xa3, 0x2a, 0x7e, 0x08, 0x73,
+	0x1e, 0xf9, 0x70, 0x2c, 0x3d, 0xc6, 0x8d, 0xe1, 0x75, 0x21, 0xdd, 0x84, 0xab, 0xfb, 0xc4, 0x0c,
+	0x81, 0x10, 0x86, 0x39, 0x0d, 0x09, 0x2b, 0x53, 0xc1, 0xe7, 0x7f, 0x82, 0x60, 0x95, 0x36, 0xd3,
+	0xf3, 0xf8, 0x85, 0x90, 0xea, 0x13, 0x04, 0x89, 0x20, 0x0e, 0x4e, 0xa7, 0x32, 0xcc, 0x7b, 0x0a,
+	0x62, 0xd3, 0x68, 0xdc, 0xa2, 0xfa, 0x7c, 0x88, 0x52, 0xe7, 0xf6, 0xe7, 0xaf, 0xc2, 0x12, 0x3d,
+	0x9e, 0x1f, 0x70, 0xd7, 0x15, 0x4b, 0x3c, 0xc7, 0xbf, 0x45, 0xb0, 0xe0, 0x93, 0x5e, 0xb1, 0xc8,
+	0x46, 0x39, 0x4c, 0xac, 0x4d, 0x8e, 0x21, 0x3b, 0x4a, 0xb7, 0x9e, 0xfe, 0xeb, 0xbf, 0xbf, 0x98,
+	0x48, 0x49, 0xaf, 0x39, 0xba, 0xf3, 0x87, 0x56, 0x57, 0x76, 0xba, 0x3d, 0x9d, 0x6e, 0xb6, 0x8d,
+	0x4c, 0xea, 0x23, 0x5b, 0x32, 0x37, 0xb6, 0x50, 0x0a, 0x7f, 0x8a, 0x00, 0x5c, 0xb5, 0x16, 0x8b,
+	0x0c, 0x5f, 0x40, 0xdc, 0x1d, 0x0b, 0xe2, 0xd7, 0x18, 0xc4, 0xd7, 0xb1, 0x07, 0x22, 0xa5, 0x9a,
+	0x07, 0xa0, 0x83, 0x2f, 0x93, 0xfa, 0x08, 0x7f, 0x8e, 0x60, 0xde, 0xab, 0xcf, 0xe2, 0xaf, 0x8b,
+	0x7c, 0x93, 0x83, 0xa2, 0x72, 0xf2, 0xde, 0xd8, 0x76, 0x16, 0xbd, 0xc2, 0x00, 0x0f, 0xa9, 0x29,
+	0xfe, 0x39, 0x82, 0x05, 0x9f, 0x90, 0x2b, 0xd4, 0xf9, 0x30, 0xe9, 0x37, 0xb9, 0x62, 0x1b, 0xda,
+	0x0a, 0x7f, 0x5a, 0xee, 0x74, 0xcd, 0x33, 0x1b, 0x51, 0x4a, 0xb0, 0x84, 0xcf, 0x10, 0x80, 0x2b,
+	0x17, 0x0b, 0xb5, 0x38, 0xa0, 0x2e, 0x27, 0xd7, 0x6c, 0x2b, 0xcf, 0xff, 0x2b, 0xd2, 0x25, 0xfb,
+	0xff, 0x15, 0xd2, 0x36, 0x83, 0x74, 0x57, 0xba, 0x25, 0x04, 0x69, 0x4b, 0x75, 0xfc, 0x53, 0x0e,
+	0x52, 0x80, 0xae, 0xa4, 0x2c, 0x04, 0x30, 0xa0, 0x40, 0xbf, 0x60, 0x80, 0xe4, 0xd4, 0x0b, 0xf0,
+	0xf7, 0x08, 0xe6, 0x3c, 0x7a, 0x31, 0xbe, 0x2b, 0x3e, 0x25, 0x1e, 0x7d, 0x39, 0x39, 0x8e, 0x30,
+	0x2b, 0xbd, 0xc9, 0x00, 0x6f, 0xe2, 0x0d, 0x11, 0xc0, 0x19, 0x47, 0xc5, 0xa5, 0x0d, 0xff, 0x33,
+	0x82, 0x05, 0x9f, 0x5c, 0x8c, 0xc7, 0x21, 0xbf, 0x57, 0xe5, 0x4e, 0xde, 0x1f, 0xdf, 0x90, 0x8f,
+	0x4d, 0x08, 0xfe, 0xc0, 0xd8, 0x78, 0x4b, 0xee, 0xa6, 0x80, 0xff, 0x8e, 0x60, 0x29, 0x44, 0x61,
+	0xc6, 0x3b, 0x62, 0x65, 0x8f, 0xd0, 0x75, 0x93, 0xe7, 0x51, 0x61, 0xa5, 0x2c, 0x4b, 0x63, 0x1b,
+	0xbf, 0x29, 0xd4, 0x86, 0x80, 0x64, 0x4b, 0xdb, 0xf1, 0x1f, 0xae, 0xde, 0x07, 0xb4, 0x63, 0xfc,
+	0x40, 0xb0, 0xba, 0x51, 0xba, 0x79, 0xf2, 0xed, 0xf3, 0x3b, 0xe0, 0x6d, 0x0a, 0xc9, 0x6f, 0x78,
+	0x9b, 0x82, 0xaa, 0xf4, 0x1f, 0x11, 0xac, 0x84, 0x2b, 0xea, 0xf8, 0x6d, 0xe1, 0x57, 0x5f, 0x54,
+	0xd3, 0xa2, 0xde, 0x81, 0x1c, 0x77, 0xea, 0x39, 0xfa, 0xf2, 0x6b, 0x04, 0xe0, 0xca, 0x96, 0x42,
+	0xaf, 0x9d, 0x80, 0xca, 0x39, 0xea, 0xb5, 0xf3, 0x16, 0x83, 0x79, 0x5f, 0xda, 0x14, 0x2d, 0x2f,
+	0x93, 0xcf, 0xb7, 0x58, 0x60, 0xfa, 0xe6, 0x71, 0x30, 0x32, 0x49, 0x48, 0x1c, 0xa3, 0x57, 0x41,
+	0x7a, 0xe1, 0x18, 0x99, 0x42, 0xe9, 0x62, 0x7c, 0x86, 0x60, 0xd6, 0x91, 0x14, 0xf0, 0xe6, 0x39,
+	0x04, 0x88, 0x51, 0x08, 0x77, 0x18, 0xc2, 0x7b, 0xd2, 0x6d, 0x51, 0x84, 0x26, 0x39, 0x35, 0x43,
+	0x8a, 0xc8, 0x8e, 0xe9, 0xe2, 0x45, 0xf4, 0x9e, 0xea, 0x5f, 0x78, 0x11, 0x15, 0xea, 0xdc, 0xc5,
+	0xf8, 0x27, 0x6b, 0x1f, 0xc6, 0x4f, 0xb6, 0xa2, 0xfb, 0x30, 0xbf, 0x2c, 0x90, 0x1c, 0xe3, 0xec,
+	0x2c, 0x1d, 0x30, 0xc0, 0x7b, 0x38, 0x7f, 0xde, 0x01, 0xca, 0xd8, 0x87, 0x6f, 0x3a, 0x4b, 0xff,
+	0xe0, 0xdb, 0x34, 0xfb, 0x80, 0x2f, 0xbc, 0x4d, 0x1b, 0x50, 0x25, 0x84, 0xb7, 0x69, 0x83, 0x4a,
+	0x42, 0x58, 0x3e, 0xc3, 0x1a, 0x10, 0xfa, 0x4a, 0x70, 0x52, 0xc2, 0xff, 0x44, 0xb0, 0x1a, 0xa1,
+	0x13, 0xe0, 0xac, 0xf0, 0x4e, 0x3e, 0xea, 0x3c, 0x99, 0x3c, 0xd7, 0x19, 0x57, 0xda, 0x62, 0x29,
+	0xde, 0x91, 0x32, 0x43, 0x77, 0xa2, 0xc1, 0x83, 0x30, 0xe5, 0xd7, 0x5f, 0x11, 0x2c, 0x87, 0x09,
+	0x0b, 0xf8, 0xad, 0xb1, 0x3e, 0xaa, 0x2f, 0x2a, 0x95, 0x7b, 0x2c, 0x95, 0x0d, 0x9c, 0x89, 0x66,
+	0x5f, 0x30, 0x0f, 0x4a, 0xb4, 0x7f, 0x23, 0x58, 0x09, 0x97, 0x17, 0xf0, 0x98, 0x1f, 0xc3, 0xa0,
+	0x4e, 0x92, 0xcc, 0x3e, 0x87, 0x07, 0x4e, 0xc3, 0x90, 0xc4, 0x84, 0x7a, 0x84, 0x3f, 0x43, 0xb0,
+	0x1a, 0xa1, 0x42, 0x08, 0x31, 0x6e, 0xb8, 0x82, 0x11, 0xf9, 0x1d, 0xe5, 0x78, 0x53, 0x63, 0x37,
+	0xe2, 0x37, 0x08, 0xe2, 0x01, 0xf9, 0x03, 0x6f, 0x0b, 0xcf, 0x46, 0x50, 0x81, 0x18, 0xf5, 0x8a,
+	0xbd, 0xc3, 0xa0, 0xa6, 0xa5, 0x37, 0x86, 0x96, 0xd6, 0x7b, 0x8c, 0xa7, 0xc4, 0xff, 0x0c, 0xc1,
+	0xa2, 0x5f, 0x20, 0xc1, 0xf7, 0xc5, 0x28, 0x1f, 0x82, 0x70, 0x4c, 0x51, 0x41, 0xda, 0x60, 0x90,
+	0x6f, 0xe2, 0x37, 0xa2, 0xab, 0xeb, 0xc5, 0x4b, 0xeb, 0xfa, 0x05, 0x82, 0xd8, 0xa0, 0xd4, 0x81,
+	0xb7, 0x04, 0x89, 0x19, 0xa2, 0xd3, 0x24, 0xb7, 0xcf, 0x65, 0xcb, 0xe9, 0x1c, 0x92, 0xc0, 0x88,
+	0x9a, 0xe3, 0x5f, 0x21, 0x88, 0x07, 0x44, 0x26, 0x21, 0x62, 0x44, 0x49, 0x53, 0x91, 0xe4, 0xe5,
+	0xe8, 0x52, 0xe2, 0xe5, 0xdd, 0x3d, 0x85, 0xd7, 0x1a, 0x7a, 0x67, 0x34, 0x98, 0x43, 0xf4, 0x9d,
+	0xf7, 0xf8, 0x43, 0x2d, 0xbd, 0xad, 0x68, 0xad, 0xb4, 0xde, 0x6b, 0x65, 0x5a, 0x44, 0x63, 0x10,
+	0xf8, 0xef, 0x12, 0x95, 0xae, 0x6a, 0x0c, 0xf9, 0xd1, 0xdf, 0xb6, 0x77, 0xb1, 0x3e, 0xc3, 0x2c,
+	0x37, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x26, 0x81, 0x0d, 0xe1, 0x91, 0x29, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3292,148 +3206,3 @@ var _DataLabelingService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/datalabeling/v1beta1/data_labeling_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/datalabeling/v1beta1/data_labeling_service.proto", fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3)
-}
-
-var fileDescriptor_data_labeling_service_e7f2e6cc30ea93c3 = []byte{
-	// 2191 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x6f, 0x1b, 0xc7,
-	0x15, 0xcf, 0xe8, 0xcb, 0xd6, 0xd3, 0x87, 0xc9, 0x91, 0x2c, 0x31, 0x74, 0x64, 0xa8, 0x1b, 0xa4,
-	0x71, 0x68, 0x94, 0xb4, 0x2c, 0xbb, 0x76, 0xa4, 0x2a, 0x0e, 0x45, 0xae, 0x14, 0xa6, 0x0a, 0xa9,
-	0x92, 0x94, 0xeb, 0xb4, 0x05, 0x88, 0x25, 0x39, 0x62, 0xb6, 0x26, 0x77, 0x59, 0xee, 0x52, 0x90,
-	0x1c, 0xa4, 0x40, 0x8d, 0xb6, 0x87, 0xe6, 0xd0, 0x43, 0x81, 0x1c, 0x5a, 0xc4, 0x40, 0x0f, 0xed,
-	0xa5, 0x4d, 0xd0, 0x4b, 0x6f, 0x6d, 0x0e, 0x05, 0x7a, 0xea, 0xc7, 0xa5, 0x40, 0x6f, 0xbd, 0xf5,
-	0x0f, 0x29, 0x66, 0x76, 0xf6, 0x8b, 0xbb, 0x4b, 0x0e, 0x65, 0x03, 0x6a, 0x6e, 0xda, 0xd9, 0x7d,
-	0xef, 0xfd, 0xde, 0x7b, 0xbf, 0xb7, 0x3b, 0xf3, 0x13, 0x61, 0xa7, 0xa5, 0xeb, 0xad, 0x36, 0xc9,
-	0x34, 0xda, 0x7a, 0xbf, 0x99, 0x69, 0x2a, 0xa6, 0xd2, 0x56, 0xea, 0xa4, 0xad, 0x6a, 0xad, 0xcc,
-	0xc9, 0x46, 0x9d, 0x98, 0xca, 0x06, 0x5b, 0xac, 0xd9, 0xab, 0x35, 0x83, 0xf4, 0x4e, 0xd4, 0x06,
-	0x49, 0x77, 0x7b, 0xba, 0xa9, 0xe3, 0xaf, 0x58, 0xe6, 0x69, 0x66, 0x9e, 0xf6, 0x9a, 0xa7, 0xb9,
-	0x79, 0xf2, 0x15, 0x1e, 0x41, 0xe9, 0xaa, 0x19, 0x45, 0xd3, 0x74, 0x53, 0x31, 0x55, 0x5d, 0x33,
-	0x2c, 0x07, 0xc9, 0xed, 0xd1, 0xf1, 0x5d, 0xa3, 0x9a, 0xd1, 0x25, 0x8d, 0x9a, 0x41, 0x4c, 0x6e,
-	0x9c, 0x11, 0x03, 0xef, 0x1a, 0x3c, 0x18, 0x6d, 0xf0, 0x41, 0xbf, 0xa3, 0x68, 0x35, 0x4f, 0xcc,
-	0x86, 0xae, 0x1d, 0xab, 0x2d, 0xee, 0x60, 0x73, 0xb4, 0x03, 0x55, 0x33, 0xcc, 0x5e, 0xbf, 0x41,
-	0x6d, 0xb9, 0xd1, 0xed, 0xd1, 0x46, 0x7a, 0x97, 0xf4, 0x7c, 0x75, 0x79, 0x95, 0xdb, 0xb4, 0x75,
-	0xad, 0xd5, 0xeb, 0x6b, 0x1a, 0x7d, 0x38, 0xf0, 0xd0, 0x35, 0xfe, 0x10, 0xbb, 0xaa, 0xf7, 0x8f,
-	0x33, 0xa4, 0xd3, 0x35, 0xcf, 0xf8, 0xcd, 0xf5, 0xc1, 0x9b, 0xc7, 0x2a, 0x69, 0x37, 0x6b, 0x1d,
-	0xc5, 0x78, 0x6c, 0x3d, 0x21, 0x99, 0xb0, 0x9c, 0xeb, 0x11, 0xc5, 0x24, 0x79, 0xab, 0x48, 0x65,
-	0xf2, 0x83, 0x3e, 0x31, 0x4c, 0xbc, 0x02, 0x33, 0x5d, 0xa5, 0x47, 0x34, 0x33, 0x81, 0xd6, 0xd1,
-	0x8d, 0xd9, 0x32, 0xbf, 0xc2, 0x79, 0xb8, 0xc4, 0xcb, 0x99, 0x98, 0x58, 0x47, 0x37, 0xe6, 0x6e,
-	0xa7, 0xd2, 0x23, 0xdb, 0x9f, 0xb6, 0x7d, 0xdb, 0xa6, 0xd2, 0xeb, 0x10, 0xdf, 0x27, 0xe6, 0x40,
-	0x48, 0x0c, 0x53, 0x9a, 0xd2, 0x21, 0x3c, 0x20, 0xfb, 0x5b, 0xfa, 0x11, 0x82, 0xa5, 0x03, 0xd5,
-	0xb0, 0x1f, 0x35, 0x46, 0xc1, 0x5b, 0x81, 0x99, 0x63, 0xb5, 0x6d, 0x92, 0x1e, 0x43, 0x37, 0x5b,
-	0xe6, 0x57, 0xf8, 0x1a, 0xcc, 0x76, 0x95, 0x16, 0xa9, 0x19, 0xea, 0x13, 0x92, 0x98, 0x5c, 0x47,
-	0x37, 0xa6, 0xcb, 0x97, 0xe9, 0x42, 0x45, 0x7d, 0x42, 0xf0, 0x1a, 0x00, 0xbb, 0x69, 0xea, 0x8f,
-	0x89, 0x96, 0x98, 0x62, 0x86, 0xec, 0xf1, 0x2a, 0x5d, 0x90, 0x7e, 0x8a, 0x60, 0xd9, 0x8f, 0xc1,
-	0xe8, 0xea, 0x9a, 0x41, 0xf0, 0x1e, 0x5c, 0xe6, 0x09, 0x19, 0x09, 0xb4, 0x3e, 0x39, 0x66, 0x31,
-	0x1c, 0x5b, 0xfc, 0x55, 0xb8, 0xa2, 0x91, 0x53, 0xb3, 0xe6, 0x01, 0x61, 0xa1, 0x5f, 0xa0, 0xcb,
-	0x87, 0x0e, 0x90, 0x14, 0x2c, 0xe7, 0x49, 0x9b, 0x04, 0x7a, 0x15, 0x56, 0xb8, 0x27, 0x10, 0x2f,
-	0x74, 0xba, 0x7a, 0x8f, 0xa1, 0x1e, 0xf2, 0x20, 0xfe, 0x16, 0xcc, 0xab, 0x5a, 0xb7, 0x6f, 0x72,
-	0x8e, 0xf3, 0xae, 0xa6, 0x05, 0x12, 0x29, 0x50, 0xb3, 0x1c, 0xb3, 0x2a, 0xcf, 0xa9, 0xee, 0x85,
-	0xf4, 0x17, 0x04, 0x71, 0xf9, 0x54, 0x24, 0xf8, 0x4d, 0x88, 0xf3, 0x29, 0x23, 0xcd, 0x9a, 0x97,
-	0x57, 0xb3, 0xe5, 0x98, 0x73, 0x83, 0x67, 0xeb, 0xe9, 0xed, 0xa4, 0xaf, 0xb7, 0x55, 0x58, 0xd0,
-	0xfb, 0xa6, 0x27, 0x85, 0x29, 0x96, 0x42, 0x46, 0x20, 0x85, 0x12, 0xb3, 0xe3, 0x39, 0xcc, 0xeb,
-	0x9e, 0x2b, 0xe9, 0x06, 0x60, 0x4e, 0xd1, 0x82, 0x49, 0x3a, 0xc3, 0x4a, 0xfd, 0xd4, 0xc3, 0x0f,
-	0xfa, 0xec, 0x85, 0x90, 0xf4, 0x63, 0x04, 0x57, 0x07, 0x40, 0x70, 0x96, 0xbe, 0x0b, 0xc0, 0xde,
-	0xde, 0x2a, 0x5d, 0xe5, 0x3c, 0xbd, 0x29, 0xc8, 0x53, 0x96, 0xfa, 0x6c, 0xd3, 0xf6, 0x29, 0xcc,
-	0xd4, 0x5b, 0x90, 0xdc, 0x27, 0x66, 0x76, 0xa0, 0x83, 0xc3, 0x8a, 0xf8, 0x33, 0x04, 0xaf, 0x50,
-	0xfc, 0x83, 0x36, 0x17, 0x52, 0xcc, 0x4d, 0x58, 0xb3, 0x06, 0x6d, 0x9c, 0x0c, 0x7e, 0x87, 0x60,
-	0x2d, 0x22, 0x03, 0xde, 0x89, 0x3a, 0xe0, 0x00, 0xdb, 0xed, 0x8e, 0x6c, 0x0a, 0x74, 0x24, 0x80,
-	0x26, 0x3e, 0x38, 0x23, 0xe2, 0x1d, 0xfa, 0x62, 0x06, 0xe2, 0x07, 0x34, 0x40, 0xa1, 0xa3, 0xb4,
-	0x88, 0x9d, 0xd7, 0x0f, 0xe1, 0x9a, 0x4a, 0xaf, 0x6b, 0x8d, 0xb6, 0x62, 0x18, 0xea, 0xb1, 0xda,
-	0xf0, 0x7e, 0xff, 0xf8, 0x60, 0x7d, 0x43, 0xe4, 0xdd, 0x40, 0xbd, 0xe4, 0x7c, 0x4e, 0xac, 0xb9,
-	0x7a, 0xe7, 0xa5, 0xf2, 0xcb, 0x6a, 0xd4, 0x4d, 0xac, 0xc2, 0x72, 0x5d, 0xef, 0x6b, 0x4d, 0xba,
-	0xc9, 0xe8, 0xea, 0xed, 0x33, 0x3b, 0xf0, 0x34, 0x0b, 0x7c, 0x57, 0x20, 0xf0, 0x2e, 0x37, 0x3f,
-	0xd4, 0xdb, 0x67, 0x4e, 0x44, 0x5c, 0x0f, 0xac, 0xe2, 0xef, 0xc1, 0x15, 0x1a, 0xa1, 0xad, 0x6a,
-	0xc4, 0x8e, 0x32, 0xc3, 0xa2, 0x6c, 0x08, 0x44, 0x39, 0xe4, 0x96, 0x4e, 0x84, 0xc5, 0xae, 0x6f,
-	0x05, 0x7f, 0x00, 0x4b, 0x06, 0x69, 0x75, 0x88, 0xe6, 0xdb, 0x40, 0x24, 0x2e, 0x09, 0xe7, 0x51,
-	0xf1, 0x58, 0xbb, 0x79, 0x18, 0x81, 0xd5, 0xc8, 0xb9, 0xf8, 0x2e, 0xcc, 0xd7, 0x15, 0x43, 0x6d,
-	0xf8, 0xdf, 0xeb, 0xf7, 0x05, 0x42, 0xbf, 0x43, 0x77, 0x3f, 0x59, 0x67, 0xf3, 0x63, 0xbf, 0xe1,
-	0x99, 0x37, 0x1e, 0xf4, 0x21, 0x5c, 0x3a, 0x26, 0x8a, 0xd9, 0xef, 0x59, 0xa3, 0xb5, 0x28, 0xc4,
-	0x89, 0x00, 0xdd, 0xd2, 0x7b, 0x96, 0x8f, 0xb2, 0xed, 0x4c, 0xfa, 0x04, 0xc1, 0x25, 0xbe, 0x88,
-	0x57, 0x61, 0x69, 0x4f, 0xce, 0x56, 0x8f, 0xca, 0x72, 0xed, 0xa8, 0x58, 0x39, 0x94, 0x73, 0x85,
-	0xbd, 0x82, 0x9c, 0x8f, 0xbd, 0x84, 0x31, 0x2c, 0xe6, 0x0e, 0xb2, 0x95, 0x4a, 0x61, 0xaf, 0x90,
-	0xcb, 0x56, 0x0b, 0xa5, 0x62, 0x0c, 0xe1, 0x18, 0xcc, 0xef, 0x96, 0x8e, 0x8a, 0xf9, 0x42, 0x71,
-	0xbf, 0xb6, 0x5b, 0x7a, 0x14, 0x9b, 0xc0, 0x2f, 0xc3, 0xd5, 0x52, 0xb9, 0x20, 0x17, 0xab, 0x72,
-	0xbe, 0xe6, 0xbb, 0x35, 0x83, 0xe3, 0xb0, 0xe0, 0xac, 0x1c, 0x96, 0x0e, 0xde, 0x8f, 0x4d, 0xe2,
-	0x79, 0xb8, 0x4c, 0xff, 0x3a, 0x28, 0x14, 0xe5, 0xd8, 0x14, 0xf5, 0x56, 0x91, 0xf7, 0xdf, 0x93,
-	0x8b, 0x55, 0xcb, 0xff, 0xf4, 0x6e, 0x0c, 0x16, 0x7b, 0x16, 0x68, 0x5e, 0x4f, 0xe9, 0x97, 0xf6,
-	0x00, 0x3d, 0x54, 0x9b, 0x44, 0xf7, 0x0c, 0xd0, 0x09, 0xbd, 0x7e, 0xee, 0x01, 0x62, 0x5e, 0xa3,
-	0x06, 0xe8, 0x24, 0xea, 0x26, 0xee, 0xc1, 0xaa, 0x5e, 0xff, 0x3e, 0x69, 0x98, 0xb5, 0x26, 0x31,
-	0x49, 0xc3, 0x1b, 0x7b, 0x5a, 0x98, 0x00, 0x25, 0xe6, 0x21, 0x6f, 0x3b, 0x70, 0xe2, 0x5e, 0xd5,
-	0xc3, 0x6e, 0x60, 0x1d, 0x56, 0x78, 0x4c, 0xb3, 0xa7, 0x34, 0x1e, 0xd3, 0xd9, 0xf5, 0x0d, 0xd4,
-	0x3d, 0xe1, 0x90, 0x55, 0x6e, 0xef, 0x44, 0x5c, 0xd6, 0x43, 0xd6, 0x71, 0x05, 0xe6, 0xc9, 0x09,
-	0xd1, 0x4c, 0xff, 0x54, 0x89, 0x6c, 0x59, 0x64, 0x6a, 0xe6, 0x78, 0x9f, 0x23, 0xee, 0xe5, 0x97,
-	0x6d, 0x8e, 0xbc, 0xac, 0x0b, 0xce, 0x51, 0xfb, 0x9c, 0x63, 0xb4, 0x0c, 0xb1, 0xd2, 0xee, 0xbb,
-	0x72, 0xae, 0x5a, 0xcb, 0xcb, 0x55, 0x39, 0xc7, 0x56, 0x27, 0xf0, 0x12, 0x5c, 0xe1, 0xab, 0xd5,
-	0x72, 0x36, 0xf7, 0xcd, 0x42, 0x71, 0x3f, 0x36, 0x89, 0x67, 0x61, 0x5a, 0x7e, 0x28, 0x17, 0xab,
-	0xb1, 0xa9, 0x90, 0xe1, 0xf8, 0xdb, 0x14, 0xc4, 0x18, 0xcc, 0x2a, 0x39, 0x75, 0x3e, 0x9a, 0x1f,
-	0x42, 0xd2, 0xa4, 0x9f, 0xa6, 0x61, 0xa3, 0xb1, 0x2d, 0x90, 0x3f, 0xf5, 0x19, 0x31, 0x19, 0x09,
-	0x33, 0xe2, 0x1e, 0x7e, 0x8a, 0x60, 0x8d, 0x45, 0x27, 0x9a, 0xa9, 0x9a, 0x67, 0x35, 0x72, 0x4a,
-	0xc9, 0x1a, 0x9c, 0x8f, 0x1d, 0x41, 0x00, 0x32, 0x73, 0x23, 0x3b, 0x5e, 0x1c, 0x08, 0x2c, 0xc7,
-	0xf0, 0xbb, 0x17, 0xc3, 0xb1, 0x23, 0x97, 0x63, 0x33, 0x8c, 0x63, 0xdb, 0xa2, 0x1c, 0xf3, 0x34,
-	0x2f, 0x48, 0xb1, 0x6f, 0x0b, 0x50, 0x6c, 0x15, 0x96, 0xaa, 0xf2, 0xa3, 0x6a, 0x2d, 0xc0, 0xb3,
-	0x24, 0xac, 0xb0, 0x1b, 0x72, 0xb1, 0x5a, 0xa8, 0xbe, 0x5f, 0x93, 0x1f, 0x51, 0x62, 0x59, 0x6c,
-	0x0b, 0x61, 0xd3, 0xa7, 0x13, 0xfc, 0x55, 0x9b, 0xed, 0x37, 0x55, 0x7d, 0xd4, 0x86, 0xf0, 0xff,
-	0x74, 0x60, 0xbd, 0xd8, 0x83, 0xd5, 0xdc, 0x16, 0xab, 0x66, 0xf6, 0x28, 0x5f, 0x28, 0xd1, 0x29,
-	0x2c, 0x56, 0x72, 0xe5, 0xc2, 0xa1, 0x55, 0x4d, 0xe9, 0x01, 0x3b, 0x4d, 0xcb, 0xa7, 0x4a, 0xa7,
-	0xdb, 0x26, 0xc3, 0x8e, 0x5b, 0x11, 0x7b, 0x65, 0xe7, 0x94, 0xcd, 0x5d, 0x5c, 0xe8, 0x29, 0xdb,
-	0xc5, 0xe0, 0x9e, 0xb2, 0x09, 0x5f, 0x1b, 0xe3, 0x94, 0x6d, 0x57, 0xc3, 0xb1, 0x15, 0xde, 0x19,
-	0x3f, 0x43, 0x70, 0xdd, 0x92, 0x44, 0x5c, 0x2a, 0x54, 0xba, 0xa4, 0x51, 0x19, 0x2d, 0x8e, 0x34,
-	0x61, 0x29, 0x44, 0xa8, 0xe2, 0x0c, 0xbc, 0x23, 0xbe, 0xc3, 0xf7, 0x44, 0x8c, 0x2b, 0x83, 0x4b,
-	0xd2, 0x06, 0x5c, 0x73, 0x0f, 0x57, 0x41, 0x70, 0x61, 0x67, 0x93, 0x8f, 0xfd, 0x67, 0x13, 0xd7,
-	0xe8, 0x42, 0x5a, 0xfd, 0x07, 0x04, 0xd7, 0xa3, 0xd0, 0xf0, 0xa6, 0x1f, 0xc3, 0x72, 0x48, 0x25,
-	0x6d, 0x02, 0x9c, 0xaf, 0x94, 0x38, 0x50, 0x4a, 0x71, 0x52, 0xdc, 0x81, 0xeb, 0xbe, 0x13, 0xa1,
-	0x58, 0xd9, 0x7f, 0x8c, 0x20, 0x61, 0x51, 0xa9, 0xe0, 0x0a, 0x82, 0xa3, 0x2a, 0x7e, 0x08, 0x73,
-	0x1e, 0xf9, 0x70, 0x2c, 0x3d, 0xc6, 0x8d, 0xe1, 0x75, 0x21, 0xdd, 0x84, 0xab, 0xfb, 0xc4, 0x0c,
-	0x81, 0x10, 0x86, 0x39, 0x0d, 0x09, 0x2b, 0x53, 0xc1, 0xe7, 0x7f, 0x82, 0x60, 0x95, 0x36, 0xd3,
-	0xf3, 0xf8, 0x85, 0x90, 0xea, 0x13, 0x04, 0x89, 0x20, 0x0e, 0x4e, 0xa7, 0x32, 0xcc, 0x7b, 0x0a,
-	0x62, 0xd3, 0x68, 0xdc, 0xa2, 0xfa, 0x7c, 0x88, 0x52, 0xe7, 0xf6, 0xe7, 0xaf, 0xc2, 0x12, 0x3d,
-	0x9e, 0x1f, 0x70, 0xd7, 0x15, 0x4b, 0x3c, 0xc7, 0xbf, 0x45, 0xb0, 0xe0, 0x93, 0x5e, 0xb1, 0xc8,
-	0x46, 0x39, 0x4c, 0xac, 0x4d, 0x8e, 0x21, 0x3b, 0x4a, 0xb7, 0x9e, 0xfe, 0xeb, 0xbf, 0xbf, 0x98,
-	0x48, 0x49, 0xaf, 0x39, 0xba, 0xf3, 0x87, 0x56, 0x57, 0x76, 0xba, 0x3d, 0x9d, 0x6e, 0xb6, 0x8d,
-	0x4c, 0xea, 0x23, 0x5b, 0x32, 0x37, 0xb6, 0x50, 0x0a, 0x7f, 0x8a, 0x00, 0x5c, 0xb5, 0x16, 0x8b,
-	0x0c, 0x5f, 0x40, 0xdc, 0x1d, 0x0b, 0xe2, 0xd7, 0x18, 0xc4, 0xd7, 0xb1, 0x07, 0x22, 0xa5, 0x9a,
-	0x07, 0xa0, 0x83, 0x2f, 0x93, 0xfa, 0x08, 0x7f, 0x8e, 0x60, 0xde, 0xab, 0xcf, 0xe2, 0xaf, 0x8b,
-	0x7c, 0x93, 0x83, 0xa2, 0x72, 0xf2, 0xde, 0xd8, 0x76, 0x16, 0xbd, 0xc2, 0x00, 0x0f, 0xa9, 0x29,
-	0xfe, 0x39, 0x82, 0x05, 0x9f, 0x90, 0x2b, 0xd4, 0xf9, 0x30, 0xe9, 0x37, 0xb9, 0x62, 0x1b, 0xda,
-	0x0a, 0x7f, 0x5a, 0xee, 0x74, 0xcd, 0x33, 0x1b, 0x51, 0x4a, 0xb0, 0x84, 0xcf, 0x10, 0x80, 0x2b,
-	0x17, 0x0b, 0xb5, 0x38, 0xa0, 0x2e, 0x27, 0xd7, 0x6c, 0x2b, 0xcf, 0xff, 0x2b, 0xd2, 0x25, 0xfb,
-	0xff, 0x15, 0xd2, 0x36, 0x83, 0x74, 0x57, 0xba, 0x25, 0x04, 0x69, 0x4b, 0x75, 0xfc, 0x53, 0x0e,
-	0x52, 0x80, 0xae, 0xa4, 0x2c, 0x04, 0x30, 0xa0, 0x40, 0xbf, 0x60, 0x80, 0xe4, 0xd4, 0x0b, 0xf0,
-	0xf7, 0x08, 0xe6, 0x3c, 0x7a, 0x31, 0xbe, 0x2b, 0x3e, 0x25, 0x1e, 0x7d, 0x39, 0x39, 0x8e, 0x30,
-	0x2b, 0xbd, 0xc9, 0x00, 0x6f, 0xe2, 0x0d, 0x11, 0xc0, 0x19, 0x47, 0xc5, 0xa5, 0x0d, 0xff, 0x33,
-	0x82, 0x05, 0x9f, 0x5c, 0x8c, 0xc7, 0x21, 0xbf, 0x57, 0xe5, 0x4e, 0xde, 0x1f, 0xdf, 0x90, 0x8f,
-	0x4d, 0x08, 0xfe, 0xc0, 0xd8, 0x78, 0x4b, 0xee, 0xa6, 0x80, 0xff, 0x8e, 0x60, 0x29, 0x44, 0x61,
-	0xc6, 0x3b, 0x62, 0x65, 0x8f, 0xd0, 0x75, 0x93, 0xe7, 0x51, 0x61, 0xa5, 0x2c, 0x4b, 0x63, 0x1b,
-	0xbf, 0x29, 0xd4, 0x86, 0x80, 0x64, 0x4b, 0xdb, 0xf1, 0x1f, 0xae, 0xde, 0x07, 0xb4, 0x63, 0xfc,
-	0x40, 0xb0, 0xba, 0x51, 0xba, 0x79, 0xf2, 0xed, 0xf3, 0x3b, 0xe0, 0x6d, 0x0a, 0xc9, 0x6f, 0x78,
-	0x9b, 0x82, 0xaa, 0xf4, 0x1f, 0x11, 0xac, 0x84, 0x2b, 0xea, 0xf8, 0x6d, 0xe1, 0x57, 0x5f, 0x54,
-	0xd3, 0xa2, 0xde, 0x81, 0x1c, 0x77, 0xea, 0x39, 0xfa, 0xf2, 0x6b, 0x04, 0xe0, 0xca, 0x96, 0x42,
-	0xaf, 0x9d, 0x80, 0xca, 0x39, 0xea, 0xb5, 0xf3, 0x16, 0x83, 0x79, 0x5f, 0xda, 0x14, 0x2d, 0x2f,
-	0x93, 0xcf, 0xb7, 0x58, 0x60, 0xfa, 0xe6, 0x71, 0x30, 0x32, 0x49, 0x48, 0x1c, 0xa3, 0x57, 0x41,
-	0x7a, 0xe1, 0x18, 0x99, 0x42, 0xe9, 0x62, 0x7c, 0x86, 0x60, 0xd6, 0x91, 0x14, 0xf0, 0xe6, 0x39,
-	0x04, 0x88, 0x51, 0x08, 0x77, 0x18, 0xc2, 0x7b, 0xd2, 0x6d, 0x51, 0x84, 0x26, 0x39, 0x35, 0x43,
-	0x8a, 0xc8, 0x8e, 0xe9, 0xe2, 0x45, 0xf4, 0x9e, 0xea, 0x5f, 0x78, 0x11, 0x15, 0xea, 0xdc, 0xc5,
-	0xf8, 0x27, 0x6b, 0x1f, 0xc6, 0x4f, 0xb6, 0xa2, 0xfb, 0x30, 0xbf, 0x2c, 0x90, 0x1c, 0xe3, 0xec,
-	0x2c, 0x1d, 0x30, 0xc0, 0x7b, 0x38, 0x7f, 0xde, 0x01, 0xca, 0xd8, 0x87, 0x6f, 0x3a, 0x4b, 0xff,
-	0xe0, 0xdb, 0x34, 0xfb, 0x80, 0x2f, 0xbc, 0x4d, 0x1b, 0x50, 0x25, 0x84, 0xb7, 0x69, 0x83, 0x4a,
-	0x42, 0x58, 0x3e, 0xc3, 0x1a, 0x10, 0xfa, 0x4a, 0x70, 0x52, 0xc2, 0xff, 0x44, 0xb0, 0x1a, 0xa1,
-	0x13, 0xe0, 0xac, 0xf0, 0x4e, 0x3e, 0xea, 0x3c, 0x99, 0x3c, 0xd7, 0x19, 0x57, 0xda, 0x62, 0x29,
-	0xde, 0x91, 0x32, 0x43, 0x77, 0xa2, 0xc1, 0x83, 0x30, 0xe5, 0xd7, 0x5f, 0x11, 0x2c, 0x87, 0x09,
-	0x0b, 0xf8, 0xad, 0xb1, 0x3e, 0xaa, 0x2f, 0x2a, 0x95, 0x7b, 0x2c, 0x95, 0x0d, 0x9c, 0x89, 0x66,
-	0x5f, 0x30, 0x0f, 0x4a, 0xb4, 0x7f, 0x23, 0x58, 0x09, 0x97, 0x17, 0xf0, 0x98, 0x1f, 0xc3, 0xa0,
-	0x4e, 0x92, 0xcc, 0x3e, 0x87, 0x07, 0x4e, 0xc3, 0x90, 0xc4, 0x84, 0x7a, 0x84, 0x3f, 0x43, 0xb0,
-	0x1a, 0xa1, 0x42, 0x08, 0x31, 0x6e, 0xb8, 0x82, 0x11, 0xf9, 0x1d, 0xe5, 0x78, 0x53, 0x63, 0x37,
-	0xe2, 0x37, 0x08, 0xe2, 0x01, 0xf9, 0x03, 0x6f, 0x0b, 0xcf, 0x46, 0x50, 0x81, 0x18, 0xf5, 0x8a,
-	0xbd, 0xc3, 0xa0, 0xa6, 0xa5, 0x37, 0x86, 0x96, 0xd6, 0x7b, 0x8c, 0xa7, 0xc4, 0xff, 0x0c, 0xc1,
-	0xa2, 0x5f, 0x20, 0xc1, 0xf7, 0xc5, 0x28, 0x1f, 0x82, 0x70, 0x4c, 0x51, 0x41, 0xda, 0x60, 0x90,
-	0x6f, 0xe2, 0x37, 0xa2, 0xab, 0xeb, 0xc5, 0x4b, 0xeb, 0xfa, 0x05, 0x82, 0xd8, 0xa0, 0xd4, 0x81,
-	0xb7, 0x04, 0x89, 0x19, 0xa2, 0xd3, 0x24, 0xb7, 0xcf, 0x65, 0xcb, 0xe9, 0x1c, 0x92, 0xc0, 0x88,
-	0x9a, 0xe3, 0x5f, 0x21, 0x88, 0x07, 0x44, 0x26, 0x21, 0x62, 0x44, 0x49, 0x53, 0x91, 0xe4, 0xe5,
-	0xe8, 0x52, 0xe2, 0xe5, 0xdd, 0x3d, 0x85, 0xd7, 0x1a, 0x7a, 0x67, 0x34, 0x98, 0x43, 0xf4, 0x9d,
-	0xf7, 0xf8, 0x43, 0x2d, 0xbd, 0xad, 0x68, 0xad, 0xb4, 0xde, 0x6b, 0x65, 0x5a, 0x44, 0x63, 0x10,
-	0xf8, 0xef, 0x12, 0x95, 0xae, 0x6a, 0x0c, 0xf9, 0xd1, 0xdf, 0xb6, 0x77, 0xb1, 0x3e, 0xc3, 0x2c,
-	0x37, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x26, 0x81, 0x0d, 0xe1, 0x91, 0x29, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/datalabeling/v1beta1/dataset.pb.go b/googleapis/cloud/datalabeling/v1beta1/dataset.pb.go
index 5574fc23bf..b121341de5 100644
--- a/googleapis/cloud/datalabeling/v1beta1/dataset.pb.go
+++ b/googleapis/cloud/datalabeling/v1beta1/dataset.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datalabeling/v1beta1/dataset.proto
 
-package datalabeling // import "google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1"
+package datalabeling
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type DataType int32
 
@@ -39,6 +42,7 @@ var DataType_name = map[int32]string{
 	4: "TEXT",
 	5: "AUDIO",
 }
+
 var DataType_value = map[string]int32{
 	"DATA_TYPE_UNSPECIFIED": 0,
 	"IMAGE":                 1,
@@ -50,8 +54,9 @@ var DataType_value = map[string]int32{
 func (x DataType) String() string {
 	return proto.EnumName(DataType_name, int32(x))
 }
+
 func (DataType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{0}
+	return fileDescriptor_70a9435b8b2ad223, []int{0}
 }
 
 // Dataset is the resource to hold your data. You can request multiple labeling
@@ -81,16 +86,17 @@ func (m *Dataset) Reset()         { *m = Dataset{} }
 func (m *Dataset) String() string { return proto.CompactTextString(m) }
 func (*Dataset) ProtoMessage()    {}
 func (*Dataset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{0}
+	return fileDescriptor_70a9435b8b2ad223, []int{0}
 }
+
 func (m *Dataset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Dataset.Unmarshal(m, b)
 }
 func (m *Dataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Dataset.Marshal(b, m, deterministic)
 }
-func (dst *Dataset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Dataset.Merge(dst, src)
+func (m *Dataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dataset.Merge(m, src)
 }
 func (m *Dataset) XXX_Size() int {
 	return xxx_messageInfo_Dataset.Size(m)
@@ -154,16 +160,17 @@ func (m *InputConfig) Reset()         { *m = InputConfig{} }
 func (m *InputConfig) String() string { return proto.CompactTextString(m) }
 func (*InputConfig) ProtoMessage()    {}
 func (*InputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{1}
+	return fileDescriptor_70a9435b8b2ad223, []int{1}
 }
+
 func (m *InputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
 }
 func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputConfig.Merge(dst, src)
+func (m *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(m, src)
 }
 func (m *InputConfig) XXX_Size() int {
 	return xxx_messageInfo_InputConfig.Size(m)
@@ -205,61 +212,13 @@ func (m *InputConfig) GetDataType() DataType {
 	return DataType_DATA_TYPE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*InputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _InputConfig_OneofMarshaler, _InputConfig_OneofUnmarshaler, _InputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*InputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*InputConfig_GcsSource)(nil),
 	}
 }
 
-func _InputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*InputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *InputConfig_GcsSource:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("InputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _InputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*InputConfig)
-	switch tag {
-	case 2: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &InputConfig_GcsSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _InputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*InputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *InputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Source of the GCS file to be imported. Only gcs path is allowed in
 // input_uri.
 type GcsSource struct {
@@ -276,16 +235,17 @@ func (m *GcsSource) Reset()         { *m = GcsSource{} }
 func (m *GcsSource) String() string { return proto.CompactTextString(m) }
 func (*GcsSource) ProtoMessage()    {}
 func (*GcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{2}
+	return fileDescriptor_70a9435b8b2ad223, []int{2}
 }
+
 func (m *GcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
 }
 func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
 }
-func (dst *GcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsSource.Merge(dst, src)
+func (m *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(m, src)
 }
 func (m *GcsSource) XXX_Size() int {
 	return xxx_messageInfo_GcsSource.Size(m)
@@ -327,16 +287,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{3}
+	return fileDescriptor_70a9435b8b2ad223, []int{3}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -384,80 +345,14 @@ func (m *OutputConfig) GetGcsFolderDestination() *GcsFolderDestination {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputConfig_OneofMarshaler, _OutputConfig_OneofUnmarshaler, _OutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OutputConfig_GcsDestination)(nil),
 		(*OutputConfig_GcsFolderDestination)(nil),
 	}
 }
 
-func _OutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDestination); err != nil {
-			return err
-		}
-	case *OutputConfig_GcsFolderDestination:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsFolderDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputConfig)
-	switch tag {
-	case 1: // destination.gcs_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &OutputConfig_GcsDestination{msg}
-		return true, err
-	case 2: // destination.gcs_folder_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsFolderDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &OutputConfig_GcsFolderDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		s := proto.Size(x.GcsDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OutputConfig_GcsFolderDestination:
-		s := proto.Size(x.GcsFolderDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Export destination of the data.Only gcs path is allowed in
 // output_uri.
 type GcsDestination struct {
@@ -476,16 +371,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{4}
+	return fileDescriptor_70a9435b8b2ad223, []int{4}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -523,16 +419,17 @@ func (m *GcsFolderDestination) Reset()         { *m = GcsFolderDestination{} }
 func (m *GcsFolderDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsFolderDestination) ProtoMessage()    {}
 func (*GcsFolderDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{5}
+	return fileDescriptor_70a9435b8b2ad223, []int{5}
 }
+
 func (m *GcsFolderDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsFolderDestination.Unmarshal(m, b)
 }
 func (m *GcsFolderDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsFolderDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsFolderDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsFolderDestination.Merge(dst, src)
+func (m *GcsFolderDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsFolderDestination.Merge(m, src)
 }
 func (m *GcsFolderDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsFolderDestination.Size(m)
@@ -572,16 +469,17 @@ func (m *DataItem) Reset()         { *m = DataItem{} }
 func (m *DataItem) String() string { return proto.CompactTextString(m) }
 func (*DataItem) ProtoMessage()    {}
 func (*DataItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{6}
+	return fileDescriptor_70a9435b8b2ad223, []int{6}
 }
+
 func (m *DataItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataItem.Unmarshal(m, b)
 }
 func (m *DataItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DataItem.Marshal(b, m, deterministic)
 }
-func (dst *DataItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DataItem.Merge(dst, src)
+func (m *DataItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataItem.Merge(m, src)
 }
 func (m *DataItem) XXX_Size() int {
 	return xxx_messageInfo_DataItem.Size(m)
@@ -662,9 +560,9 @@ func (m *DataItem) GetName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DataItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DataItem_OneofMarshaler, _DataItem_OneofUnmarshaler, _DataItem_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DataItem) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DataItem_ImagePayload)(nil),
 		(*DataItem_TextPayload)(nil),
 		(*DataItem_VideoPayload)(nil),
@@ -672,108 +570,6 @@ func (*DataItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _DataItem_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DataItem)
-	// payload
-	switch x := m.Payload.(type) {
-	case *DataItem_ImagePayload:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImagePayload); err != nil {
-			return err
-		}
-	case *DataItem_TextPayload:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextPayload); err != nil {
-			return err
-		}
-	case *DataItem_VideoPayload:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoPayload); err != nil {
-			return err
-		}
-	case *DataItem_AudioPayload:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioPayload); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DataItem.Payload has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DataItem_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DataItem)
-	switch tag {
-	case 2: // payload.image_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImagePayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &DataItem_ImagePayload{msg}
-		return true, err
-	case 3: // payload.text_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextPayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &DataItem_TextPayload{msg}
-		return true, err
-	case 4: // payload.video_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoPayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &DataItem_VideoPayload{msg}
-		return true, err
-	case 5: // payload.audio_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AudioPayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &DataItem_AudioPayload{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DataItem_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DataItem)
-	// payload
-	switch x := m.Payload.(type) {
-	case *DataItem_ImagePayload:
-		s := proto.Size(x.ImagePayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataItem_TextPayload:
-		s := proto.Size(x.TextPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataItem_VideoPayload:
-		s := proto.Size(x.VideoPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DataItem_AudioPayload:
-		s := proto.Size(x.AudioPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // AnnotatedDataset is a set holding annotations for data in a Dataset. Each
 // labeling task will generate an AnnotatedDataset under the Dataset that the
 // task is requested for.
@@ -816,16 +612,17 @@ func (m *AnnotatedDataset) Reset()         { *m = AnnotatedDataset{} }
 func (m *AnnotatedDataset) String() string { return proto.CompactTextString(m) }
 func (*AnnotatedDataset) ProtoMessage()    {}
 func (*AnnotatedDataset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{7}
+	return fileDescriptor_70a9435b8b2ad223, []int{7}
 }
+
 func (m *AnnotatedDataset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotatedDataset.Unmarshal(m, b)
 }
 func (m *AnnotatedDataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotatedDataset.Marshal(b, m, deterministic)
 }
-func (dst *AnnotatedDataset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotatedDataset.Merge(dst, src)
+func (m *AnnotatedDataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotatedDataset.Merge(m, src)
 }
 func (m *AnnotatedDataset) XXX_Size() int {
 	return xxx_messageInfo_AnnotatedDataset.Size(m)
@@ -934,16 +731,17 @@ func (m *AnnotatedDatasetMetadata) Reset()         { *m = AnnotatedDatasetMetada
 func (m *AnnotatedDatasetMetadata) String() string { return proto.CompactTextString(m) }
 func (*AnnotatedDatasetMetadata) ProtoMessage()    {}
 func (*AnnotatedDatasetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{8}
+	return fileDescriptor_70a9435b8b2ad223, []int{8}
 }
+
 func (m *AnnotatedDatasetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotatedDatasetMetadata.Unmarshal(m, b)
 }
 func (m *AnnotatedDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotatedDatasetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *AnnotatedDatasetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotatedDatasetMetadata.Merge(dst, src)
+func (m *AnnotatedDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotatedDatasetMetadata.Merge(m, src)
 }
 func (m *AnnotatedDatasetMetadata) XXX_Size() int {
 	return xxx_messageInfo_AnnotatedDatasetMetadata.Size(m)
@@ -1110,9 +908,9 @@ func (m *AnnotatedDatasetMetadata) GetTextEntityExtractionConfig() *TextEntityEx
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AnnotatedDatasetMetadata) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AnnotatedDatasetMetadata_OneofMarshaler, _AnnotatedDatasetMetadata_OneofUnmarshaler, _AnnotatedDatasetMetadata_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AnnotatedDatasetMetadata) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AnnotatedDatasetMetadata_ImageClassificationConfig)(nil),
 		(*AnnotatedDatasetMetadata_BoundingPolyConfig)(nil),
 		(*AnnotatedDatasetMetadata_PolylineConfig)(nil),
@@ -1126,216 +924,6 @@ func (*AnnotatedDatasetMetadata) XXX_OneofFuncs() (func(msg proto.Message, b *pr
 	}
 }
 
-func _AnnotatedDatasetMetadata_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AnnotatedDatasetMetadata)
-	// annotation_request_config
-	switch x := m.AnnotationRequestConfig.(type) {
-	case *AnnotatedDatasetMetadata_ImageClassificationConfig:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageClassificationConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_BoundingPolyConfig:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BoundingPolyConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_PolylineConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PolylineConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_SegmentationConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SegmentationConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_VideoClassificationConfig:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoClassificationConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_ObjectDetectionConfig:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ObjectDetectionConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_ObjectTrackingConfig:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ObjectTrackingConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_EventConfig:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EventConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_TextClassificationConfig:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextClassificationConfig); err != nil {
-			return err
-		}
-	case *AnnotatedDatasetMetadata_TextEntityExtractionConfig:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextEntityExtractionConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AnnotatedDatasetMetadata.AnnotationRequestConfig has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AnnotatedDatasetMetadata_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AnnotatedDatasetMetadata)
-	switch tag {
-	case 2: // annotation_request_config.image_classification_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageClassificationConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_ImageClassificationConfig{msg}
-		return true, err
-	case 3: // annotation_request_config.bounding_poly_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BoundingPolyConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_BoundingPolyConfig{msg}
-		return true, err
-	case 4: // annotation_request_config.polyline_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PolylineConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_PolylineConfig{msg}
-		return true, err
-	case 5: // annotation_request_config.segmentation_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SegmentationConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_SegmentationConfig{msg}
-		return true, err
-	case 6: // annotation_request_config.video_classification_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoClassificationConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_VideoClassificationConfig{msg}
-		return true, err
-	case 7: // annotation_request_config.object_detection_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ObjectDetectionConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_ObjectDetectionConfig{msg}
-		return true, err
-	case 8: // annotation_request_config.object_tracking_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ObjectTrackingConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_ObjectTrackingConfig{msg}
-		return true, err
-	case 9: // annotation_request_config.event_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EventConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_EventConfig{msg}
-		return true, err
-	case 10: // annotation_request_config.text_classification_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextClassificationConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_TextClassificationConfig{msg}
-		return true, err
-	case 11: // annotation_request_config.text_entity_extraction_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextEntityExtractionConfig)
-		err := b.DecodeMessage(msg)
-		m.AnnotationRequestConfig = &AnnotatedDatasetMetadata_TextEntityExtractionConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AnnotatedDatasetMetadata_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AnnotatedDatasetMetadata)
-	// annotation_request_config
-	switch x := m.AnnotationRequestConfig.(type) {
-	case *AnnotatedDatasetMetadata_ImageClassificationConfig:
-		s := proto.Size(x.ImageClassificationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_BoundingPolyConfig:
-		s := proto.Size(x.BoundingPolyConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_PolylineConfig:
-		s := proto.Size(x.PolylineConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_SegmentationConfig:
-		s := proto.Size(x.SegmentationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_VideoClassificationConfig:
-		s := proto.Size(x.VideoClassificationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_ObjectDetectionConfig:
-		s := proto.Size(x.ObjectDetectionConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_ObjectTrackingConfig:
-		s := proto.Size(x.ObjectTrackingConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_EventConfig:
-		s := proto.Size(x.EventConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_TextClassificationConfig:
-		s := proto.Size(x.TextClassificationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnnotatedDatasetMetadata_TextEntityExtractionConfig:
-		s := proto.Size(x.TextEntityExtractionConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Statistics about annotation specs.
 type LabelStats struct {
 	// Map of each annotation spec's example count. Key is the annotation spec
@@ -1350,16 +938,17 @@ func (m *LabelStats) Reset()         { *m = LabelStats{} }
 func (m *LabelStats) String() string { return proto.CompactTextString(m) }
 func (*LabelStats) ProtoMessage()    {}
 func (*LabelStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{9}
+	return fileDescriptor_70a9435b8b2ad223, []int{9}
 }
+
 func (m *LabelStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelStats.Unmarshal(m, b)
 }
 func (m *LabelStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelStats.Marshal(b, m, deterministic)
 }
-func (dst *LabelStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelStats.Merge(dst, src)
+func (m *LabelStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelStats.Merge(m, src)
 }
 func (m *LabelStats) XXX_Size() int {
 	return xxx_messageInfo_LabelStats.Size(m)
@@ -1404,16 +993,17 @@ func (m *Example) Reset()         { *m = Example{} }
 func (m *Example) String() string { return proto.CompactTextString(m) }
 func (*Example) ProtoMessage()    {}
 func (*Example) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{10}
+	return fileDescriptor_70a9435b8b2ad223, []int{10}
 }
+
 func (m *Example) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Example.Unmarshal(m, b)
 }
 func (m *Example) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Example.Marshal(b, m, deterministic)
 }
-func (dst *Example) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Example.Merge(dst, src)
+func (m *Example) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Example.Merge(m, src)
 }
 func (m *Example) XXX_Size() int {
 	return xxx_messageInfo_Example.Size(m)
@@ -1501,9 +1091,9 @@ func (m *Example) GetAnnotations() []*Annotation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Example) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Example_OneofMarshaler, _Example_OneofUnmarshaler, _Example_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Example) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Example_ImagePayload)(nil),
 		(*Example_TextPayload)(nil),
 		(*Example_VideoPayload)(nil),
@@ -1511,108 +1101,6 @@ func (*Example) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error
 	}
 }
 
-func _Example_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Example)
-	// payload
-	switch x := m.Payload.(type) {
-	case *Example_ImagePayload:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImagePayload); err != nil {
-			return err
-		}
-	case *Example_TextPayload:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextPayload); err != nil {
-			return err
-		}
-	case *Example_VideoPayload:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoPayload); err != nil {
-			return err
-		}
-	case *Example_AudioPayload:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioPayload); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Example.Payload has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Example_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Example)
-	switch tag {
-	case 2: // payload.image_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImagePayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &Example_ImagePayload{msg}
-		return true, err
-	case 6: // payload.text_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextPayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &Example_TextPayload{msg}
-		return true, err
-	case 7: // payload.video_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoPayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &Example_VideoPayload{msg}
-		return true, err
-	case 8: // payload.audio_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AudioPayload)
-		err := b.DecodeMessage(msg)
-		m.Payload = &Example_AudioPayload{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Example_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Example)
-	// payload
-	switch x := m.Payload.(type) {
-	case *Example_ImagePayload:
-		s := proto.Size(x.ImagePayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Example_TextPayload:
-		s := proto.Size(x.TextPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Example_VideoPayload:
-		s := proto.Size(x.VideoPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Example_AudioPayload:
-		s := proto.Size(x.AudioPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Container of information about an image.
 type ImagePayload struct {
 	// Image format.
@@ -1630,16 +1118,17 @@ func (m *ImagePayload) Reset()         { *m = ImagePayload{} }
 func (m *ImagePayload) String() string { return proto.CompactTextString(m) }
 func (*ImagePayload) ProtoMessage()    {}
 func (*ImagePayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{11}
+	return fileDescriptor_70a9435b8b2ad223, []int{11}
 }
+
 func (m *ImagePayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImagePayload.Unmarshal(m, b)
 }
 func (m *ImagePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImagePayload.Marshal(b, m, deterministic)
 }
-func (dst *ImagePayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImagePayload.Merge(dst, src)
+func (m *ImagePayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImagePayload.Merge(m, src)
 }
 func (m *ImagePayload) XXX_Size() int {
 	return xxx_messageInfo_ImagePayload.Size(m)
@@ -1684,16 +1173,17 @@ func (m *TextPayload) Reset()         { *m = TextPayload{} }
 func (m *TextPayload) String() string { return proto.CompactTextString(m) }
 func (*TextPayload) ProtoMessage()    {}
 func (*TextPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{12}
+	return fileDescriptor_70a9435b8b2ad223, []int{12}
 }
+
 func (m *TextPayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextPayload.Unmarshal(m, b)
 }
 func (m *TextPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextPayload.Marshal(b, m, deterministic)
 }
-func (dst *TextPayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextPayload.Merge(dst, src)
+func (m *TextPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextPayload.Merge(m, src)
 }
 func (m *TextPayload) XXX_Size() int {
 	return xxx_messageInfo_TextPayload.Size(m)
@@ -1727,16 +1217,17 @@ func (m *VideoThumbnail) Reset()         { *m = VideoThumbnail{} }
 func (m *VideoThumbnail) String() string { return proto.CompactTextString(m) }
 func (*VideoThumbnail) ProtoMessage()    {}
 func (*VideoThumbnail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{13}
+	return fileDescriptor_70a9435b8b2ad223, []int{13}
 }
+
 func (m *VideoThumbnail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoThumbnail.Unmarshal(m, b)
 }
 func (m *VideoThumbnail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoThumbnail.Marshal(b, m, deterministic)
 }
-func (dst *VideoThumbnail) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoThumbnail.Merge(dst, src)
+func (m *VideoThumbnail) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoThumbnail.Merge(m, src)
 }
 func (m *VideoThumbnail) XXX_Size() int {
 	return xxx_messageInfo_VideoThumbnail.Size(m)
@@ -1780,16 +1271,17 @@ func (m *VideoPayload) Reset()         { *m = VideoPayload{} }
 func (m *VideoPayload) String() string { return proto.CompactTextString(m) }
 func (*VideoPayload) ProtoMessage()    {}
 func (*VideoPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{14}
+	return fileDescriptor_70a9435b8b2ad223, []int{14}
 }
+
 func (m *VideoPayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoPayload.Unmarshal(m, b)
 }
 func (m *VideoPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoPayload.Marshal(b, m, deterministic)
 }
-func (dst *VideoPayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoPayload.Merge(dst, src)
+func (m *VideoPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoPayload.Merge(m, src)
 }
 func (m *VideoPayload) XXX_Size() int {
 	return xxx_messageInfo_VideoPayload.Size(m)
@@ -1846,16 +1338,17 @@ func (m *AudioPayload) Reset()         { *m = AudioPayload{} }
 func (m *AudioPayload) String() string { return proto.CompactTextString(m) }
 func (*AudioPayload) ProtoMessage()    {}
 func (*AudioPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dataset_800ce425cbaef310, []int{15}
+	return fileDescriptor_70a9435b8b2ad223, []int{15}
 }
+
 func (m *AudioPayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioPayload.Unmarshal(m, b)
 }
 func (m *AudioPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioPayload.Marshal(b, m, deterministic)
 }
-func (dst *AudioPayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioPayload.Merge(dst, src)
+func (m *AudioPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioPayload.Merge(m, src)
 }
 func (m *AudioPayload) XXX_Size() int {
 	return xxx_messageInfo_AudioPayload.Size(m)
@@ -1881,6 +1374,7 @@ func (m *AudioPayload) GetSampleRateHertz() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.DataType", DataType_name, DataType_value)
 	proto.RegisterType((*Dataset)(nil), "google.cloud.datalabeling.v1beta1.Dataset")
 	proto.RegisterType((*InputConfig)(nil), "google.cloud.datalabeling.v1beta1.InputConfig")
 	proto.RegisterType((*GcsSource)(nil), "google.cloud.datalabeling.v1beta1.GcsSource")
@@ -1898,14 +1392,13 @@ func init() {
 	proto.RegisterType((*VideoThumbnail)(nil), "google.cloud.datalabeling.v1beta1.VideoThumbnail")
 	proto.RegisterType((*VideoPayload)(nil), "google.cloud.datalabeling.v1beta1.VideoPayload")
 	proto.RegisterType((*AudioPayload)(nil), "google.cloud.datalabeling.v1beta1.AudioPayload")
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.DataType", DataType_name, DataType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datalabeling/v1beta1/dataset.proto", fileDescriptor_dataset_800ce425cbaef310)
+	proto.RegisterFile("google/cloud/datalabeling/v1beta1/dataset.proto", fileDescriptor_70a9435b8b2ad223)
 }
 
-var fileDescriptor_dataset_800ce425cbaef310 = []byte{
+var fileDescriptor_70a9435b8b2ad223 = []byte{
 	// 1504 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xef, 0x4e, 0x1b, 0x47,
 	0x10, 0xe7, 0x30, 0x06, 0x7b, 0xce, 0x80, 0xd9, 0x42, 0x63, 0x20, 0x69, 0x89, 0xab, 0xaa, 0x51,
diff --git a/googleapis/cloud/datalabeling/v1beta1/human_annotation_config.pb.go b/googleapis/cloud/datalabeling/v1beta1/human_annotation_config.pb.go
index b0dddcc16b..28ea1f40f1 100644
--- a/googleapis/cloud/datalabeling/v1beta1/human_annotation_config.pb.go
+++ b/googleapis/cloud/datalabeling/v1beta1/human_annotation_config.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datalabeling/v1beta1/human_annotation_config.proto
 
-package datalabeling // import "google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1"
+package datalabeling
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type StringAggregationType int32
 
@@ -38,6 +41,7 @@ var StringAggregationType_name = map[int32]string{
 	2: "UNANIMOUS_VOTE",
 	3: "NO_AGGREGATION",
 }
+
 var StringAggregationType_value = map[string]int32{
 	"STRING_AGGREGATION_TYPE_UNSPECIFIED": 0,
 	"MAJORITY_VOTE":                       1,
@@ -48,8 +52,9 @@ var StringAggregationType_value = map[string]int32{
 func (x StringAggregationType) String() string {
 	return proto.EnumName(StringAggregationType_name, int32(x))
 }
+
 func (StringAggregationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{0}
+	return fileDescriptor_331725facbee63fc, []int{0}
 }
 
 // Configuration for how human labeling task should be done.
@@ -95,16 +100,17 @@ func (m *HumanAnnotationConfig) Reset()         { *m = HumanAnnotationConfig{} }
 func (m *HumanAnnotationConfig) String() string { return proto.CompactTextString(m) }
 func (*HumanAnnotationConfig) ProtoMessage()    {}
 func (*HumanAnnotationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{0}
+	return fileDescriptor_331725facbee63fc, []int{0}
 }
+
 func (m *HumanAnnotationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HumanAnnotationConfig.Unmarshal(m, b)
 }
 func (m *HumanAnnotationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HumanAnnotationConfig.Marshal(b, m, deterministic)
 }
-func (dst *HumanAnnotationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HumanAnnotationConfig.Merge(dst, src)
+func (m *HumanAnnotationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HumanAnnotationConfig.Merge(m, src)
 }
 func (m *HumanAnnotationConfig) XXX_Size() int {
 	return xxx_messageInfo_HumanAnnotationConfig.Size(m)
@@ -189,16 +195,17 @@ func (m *ImageClassificationConfig) Reset()         { *m = ImageClassificationCo
 func (m *ImageClassificationConfig) String() string { return proto.CompactTextString(m) }
 func (*ImageClassificationConfig) ProtoMessage()    {}
 func (*ImageClassificationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{1}
+	return fileDescriptor_331725facbee63fc, []int{1}
 }
+
 func (m *ImageClassificationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageClassificationConfig.Unmarshal(m, b)
 }
 func (m *ImageClassificationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageClassificationConfig.Marshal(b, m, deterministic)
 }
-func (dst *ImageClassificationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageClassificationConfig.Merge(dst, src)
+func (m *ImageClassificationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageClassificationConfig.Merge(m, src)
 }
 func (m *ImageClassificationConfig) XXX_Size() int {
 	return xxx_messageInfo_ImageClassificationConfig.Size(m)
@@ -245,16 +252,17 @@ func (m *BoundingPolyConfig) Reset()         { *m = BoundingPolyConfig{} }
 func (m *BoundingPolyConfig) String() string { return proto.CompactTextString(m) }
 func (*BoundingPolyConfig) ProtoMessage()    {}
 func (*BoundingPolyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{2}
+	return fileDescriptor_331725facbee63fc, []int{2}
 }
+
 func (m *BoundingPolyConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPolyConfig.Unmarshal(m, b)
 }
 func (m *BoundingPolyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPolyConfig.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPolyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPolyConfig.Merge(dst, src)
+func (m *BoundingPolyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPolyConfig.Merge(m, src)
 }
 func (m *BoundingPolyConfig) XXX_Size() int {
 	return xxx_messageInfo_BoundingPolyConfig.Size(m)
@@ -294,16 +302,17 @@ func (m *PolylineConfig) Reset()         { *m = PolylineConfig{} }
 func (m *PolylineConfig) String() string { return proto.CompactTextString(m) }
 func (*PolylineConfig) ProtoMessage()    {}
 func (*PolylineConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{3}
+	return fileDescriptor_331725facbee63fc, []int{3}
 }
+
 func (m *PolylineConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolylineConfig.Unmarshal(m, b)
 }
 func (m *PolylineConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolylineConfig.Marshal(b, m, deterministic)
 }
-func (dst *PolylineConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolylineConfig.Merge(dst, src)
+func (m *PolylineConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolylineConfig.Merge(m, src)
 }
 func (m *PolylineConfig) XXX_Size() int {
 	return xxx_messageInfo_PolylineConfig.Size(m)
@@ -344,16 +353,17 @@ func (m *SegmentationConfig) Reset()         { *m = SegmentationConfig{} }
 func (m *SegmentationConfig) String() string { return proto.CompactTextString(m) }
 func (*SegmentationConfig) ProtoMessage()    {}
 func (*SegmentationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{4}
+	return fileDescriptor_331725facbee63fc, []int{4}
 }
+
 func (m *SegmentationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SegmentationConfig.Unmarshal(m, b)
 }
 func (m *SegmentationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SegmentationConfig.Marshal(b, m, deterministic)
 }
-func (dst *SegmentationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SegmentationConfig.Merge(dst, src)
+func (m *SegmentationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SegmentationConfig.Merge(m, src)
 }
 func (m *SegmentationConfig) XXX_Size() int {
 	return xxx_messageInfo_SegmentationConfig.Size(m)
@@ -402,16 +412,17 @@ func (m *VideoClassificationConfig) Reset()         { *m = VideoClassificationCo
 func (m *VideoClassificationConfig) String() string { return proto.CompactTextString(m) }
 func (*VideoClassificationConfig) ProtoMessage()    {}
 func (*VideoClassificationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{5}
+	return fileDescriptor_331725facbee63fc, []int{5}
 }
+
 func (m *VideoClassificationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoClassificationConfig.Unmarshal(m, b)
 }
 func (m *VideoClassificationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoClassificationConfig.Marshal(b, m, deterministic)
 }
-func (dst *VideoClassificationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoClassificationConfig.Merge(dst, src)
+func (m *VideoClassificationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoClassificationConfig.Merge(m, src)
 }
 func (m *VideoClassificationConfig) XXX_Size() int {
 	return xxx_messageInfo_VideoClassificationConfig.Size(m)
@@ -456,16 +467,17 @@ func (m *VideoClassificationConfig_AnnotationSpecSetConfig) String() string {
 }
 func (*VideoClassificationConfig_AnnotationSpecSetConfig) ProtoMessage() {}
 func (*VideoClassificationConfig_AnnotationSpecSetConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{5, 0}
+	return fileDescriptor_331725facbee63fc, []int{5, 0}
 }
+
 func (m *VideoClassificationConfig_AnnotationSpecSetConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoClassificationConfig_AnnotationSpecSetConfig.Unmarshal(m, b)
 }
 func (m *VideoClassificationConfig_AnnotationSpecSetConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoClassificationConfig_AnnotationSpecSetConfig.Marshal(b, m, deterministic)
 }
-func (dst *VideoClassificationConfig_AnnotationSpecSetConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoClassificationConfig_AnnotationSpecSetConfig.Merge(dst, src)
+func (m *VideoClassificationConfig_AnnotationSpecSetConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoClassificationConfig_AnnotationSpecSetConfig.Merge(m, src)
 }
 func (m *VideoClassificationConfig_AnnotationSpecSetConfig) XXX_Size() int {
 	return xxx_messageInfo_VideoClassificationConfig_AnnotationSpecSetConfig.Size(m)
@@ -511,16 +523,17 @@ func (m *ObjectDetectionConfig) Reset()         { *m = ObjectDetectionConfig{} }
 func (m *ObjectDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ObjectDetectionConfig) ProtoMessage()    {}
 func (*ObjectDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{6}
+	return fileDescriptor_331725facbee63fc, []int{6}
 }
+
 func (m *ObjectDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectDetectionConfig.Unmarshal(m, b)
 }
 func (m *ObjectDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ObjectDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectDetectionConfig.Merge(dst, src)
+func (m *ObjectDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectDetectionConfig.Merge(m, src)
 }
 func (m *ObjectDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ObjectDetectionConfig.Size(m)
@@ -565,16 +578,17 @@ func (m *ObjectTrackingConfig) Reset()         { *m = ObjectTrackingConfig{} }
 func (m *ObjectTrackingConfig) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingConfig) ProtoMessage()    {}
 func (*ObjectTrackingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{7}
+	return fileDescriptor_331725facbee63fc, []int{7}
 }
+
 func (m *ObjectTrackingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingConfig.Unmarshal(m, b)
 }
 func (m *ObjectTrackingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingConfig.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingConfig.Merge(dst, src)
+func (m *ObjectTrackingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingConfig.Merge(m, src)
 }
 func (m *ObjectTrackingConfig) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingConfig.Size(m)
@@ -607,16 +621,17 @@ func (m *EventConfig) Reset()         { *m = EventConfig{} }
 func (m *EventConfig) String() string { return proto.CompactTextString(m) }
 func (*EventConfig) ProtoMessage()    {}
 func (*EventConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{8}
+	return fileDescriptor_331725facbee63fc, []int{8}
 }
+
 func (m *EventConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventConfig.Unmarshal(m, b)
 }
 func (m *EventConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EventConfig.Marshal(b, m, deterministic)
 }
-func (dst *EventConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventConfig.Merge(dst, src)
+func (m *EventConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventConfig.Merge(m, src)
 }
 func (m *EventConfig) XXX_Size() int {
 	return xxx_messageInfo_EventConfig.Size(m)
@@ -652,16 +667,17 @@ func (m *TextClassificationConfig) Reset()         { *m = TextClassificationConf
 func (m *TextClassificationConfig) String() string { return proto.CompactTextString(m) }
 func (*TextClassificationConfig) ProtoMessage()    {}
 func (*TextClassificationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{9}
+	return fileDescriptor_331725facbee63fc, []int{9}
 }
+
 func (m *TextClassificationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextClassificationConfig.Unmarshal(m, b)
 }
 func (m *TextClassificationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextClassificationConfig.Marshal(b, m, deterministic)
 }
-func (dst *TextClassificationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextClassificationConfig.Merge(dst, src)
+func (m *TextClassificationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextClassificationConfig.Merge(m, src)
 }
 func (m *TextClassificationConfig) XXX_Size() int {
 	return xxx_messageInfo_TextClassificationConfig.Size(m)
@@ -708,16 +724,17 @@ func (m *SentimentConfig) Reset()         { *m = SentimentConfig{} }
 func (m *SentimentConfig) String() string { return proto.CompactTextString(m) }
 func (*SentimentConfig) ProtoMessage()    {}
 func (*SentimentConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{10}
+	return fileDescriptor_331725facbee63fc, []int{10}
 }
+
 func (m *SentimentConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SentimentConfig.Unmarshal(m, b)
 }
 func (m *SentimentConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SentimentConfig.Marshal(b, m, deterministic)
 }
-func (dst *SentimentConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SentimentConfig.Merge(dst, src)
+func (m *SentimentConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SentimentConfig.Merge(m, src)
 }
 func (m *SentimentConfig) XXX_Size() int {
 	return xxx_messageInfo_SentimentConfig.Size(m)
@@ -748,16 +765,17 @@ func (m *TextEntityExtractionConfig) Reset()         { *m = TextEntityExtraction
 func (m *TextEntityExtractionConfig) String() string { return proto.CompactTextString(m) }
 func (*TextEntityExtractionConfig) ProtoMessage()    {}
 func (*TextEntityExtractionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_human_annotation_config_28dd7106b95baa9e, []int{11}
+	return fileDescriptor_331725facbee63fc, []int{11}
 }
+
 func (m *TextEntityExtractionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextEntityExtractionConfig.Unmarshal(m, b)
 }
 func (m *TextEntityExtractionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextEntityExtractionConfig.Marshal(b, m, deterministic)
 }
-func (dst *TextEntityExtractionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextEntityExtractionConfig.Merge(dst, src)
+func (m *TextEntityExtractionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextEntityExtractionConfig.Merge(m, src)
 }
 func (m *TextEntityExtractionConfig) XXX_Size() int {
 	return xxx_messageInfo_TextEntityExtractionConfig.Size(m)
@@ -776,6 +794,7 @@ func (m *TextEntityExtractionConfig) GetAnnotationSpecSet() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.StringAggregationType", StringAggregationType_name, StringAggregationType_value)
 	proto.RegisterType((*HumanAnnotationConfig)(nil), "google.cloud.datalabeling.v1beta1.HumanAnnotationConfig")
 	proto.RegisterType((*ImageClassificationConfig)(nil), "google.cloud.datalabeling.v1beta1.ImageClassificationConfig")
 	proto.RegisterType((*BoundingPolyConfig)(nil), "google.cloud.datalabeling.v1beta1.BoundingPolyConfig")
@@ -789,14 +808,13 @@ func init() {
 	proto.RegisterType((*TextClassificationConfig)(nil), "google.cloud.datalabeling.v1beta1.TextClassificationConfig")
 	proto.RegisterType((*SentimentConfig)(nil), "google.cloud.datalabeling.v1beta1.SentimentConfig")
 	proto.RegisterType((*TextEntityExtractionConfig)(nil), "google.cloud.datalabeling.v1beta1.TextEntityExtractionConfig")
-	proto.RegisterEnum("google.cloud.datalabeling.v1beta1.StringAggregationType", StringAggregationType_name, StringAggregationType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datalabeling/v1beta1/human_annotation_config.proto", fileDescriptor_human_annotation_config_28dd7106b95baa9e)
+	proto.RegisterFile("google/cloud/datalabeling/v1beta1/human_annotation_config.proto", fileDescriptor_331725facbee63fc)
 }
 
-var fileDescriptor_human_annotation_config_28dd7106b95baa9e = []byte{
+var fileDescriptor_331725facbee63fc = []byte{
 	// 912 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xd1, 0x6e, 0xdb, 0x36,
 	0x14, 0x9d, 0xe2, 0xb5, 0x6b, 0xe8, 0x36, 0xb1, 0x99, 0x1a, 0x55, 0xd2, 0xb5, 0xf3, 0x54, 0x0c,
diff --git a/googleapis/cloud/datalabeling/v1beta1/instruction.pb.go b/googleapis/cloud/datalabeling/v1beta1/instruction.pb.go
index 76485d2c04..587f17838a 100644
--- a/googleapis/cloud/datalabeling/v1beta1/instruction.pb.go
+++ b/googleapis/cloud/datalabeling/v1beta1/instruction.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datalabeling/v1beta1/instruction.proto
 
-package datalabeling // import "google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1"
+package datalabeling
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Instruction of how to perform the labeling task for human operators.
 // Currently two types of instruction are supported - CSV file and PDF.
@@ -59,16 +62,17 @@ func (m *Instruction) Reset()         { *m = Instruction{} }
 func (m *Instruction) String() string { return proto.CompactTextString(m) }
 func (*Instruction) ProtoMessage()    {}
 func (*Instruction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instruction_e84d048d533056c9, []int{0}
+	return fileDescriptor_683081924dd940d7, []int{0}
 }
+
 func (m *Instruction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instruction.Unmarshal(m, b)
 }
 func (m *Instruction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instruction.Marshal(b, m, deterministic)
 }
-func (dst *Instruction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instruction.Merge(dst, src)
+func (m *Instruction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instruction.Merge(m, src)
 }
 func (m *Instruction) XXX_Size() int {
 	return xxx_messageInfo_Instruction.Size(m)
@@ -148,16 +152,17 @@ func (m *CsvInstruction) Reset()         { *m = CsvInstruction{} }
 func (m *CsvInstruction) String() string { return proto.CompactTextString(m) }
 func (*CsvInstruction) ProtoMessage()    {}
 func (*CsvInstruction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instruction_e84d048d533056c9, []int{1}
+	return fileDescriptor_683081924dd940d7, []int{1}
 }
+
 func (m *CsvInstruction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CsvInstruction.Unmarshal(m, b)
 }
 func (m *CsvInstruction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CsvInstruction.Marshal(b, m, deterministic)
 }
-func (dst *CsvInstruction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CsvInstruction.Merge(dst, src)
+func (m *CsvInstruction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CsvInstruction.Merge(m, src)
 }
 func (m *CsvInstruction) XXX_Size() int {
 	return xxx_messageInfo_CsvInstruction.Size(m)
@@ -188,16 +193,17 @@ func (m *PdfInstruction) Reset()         { *m = PdfInstruction{} }
 func (m *PdfInstruction) String() string { return proto.CompactTextString(m) }
 func (*PdfInstruction) ProtoMessage()    {}
 func (*PdfInstruction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_instruction_e84d048d533056c9, []int{2}
+	return fileDescriptor_683081924dd940d7, []int{2}
 }
+
 func (m *PdfInstruction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PdfInstruction.Unmarshal(m, b)
 }
 func (m *PdfInstruction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PdfInstruction.Marshal(b, m, deterministic)
 }
-func (dst *PdfInstruction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PdfInstruction.Merge(dst, src)
+func (m *PdfInstruction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PdfInstruction.Merge(m, src)
 }
 func (m *PdfInstruction) XXX_Size() int {
 	return xxx_messageInfo_PdfInstruction.Size(m)
@@ -222,10 +228,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datalabeling/v1beta1/instruction.proto", fileDescriptor_instruction_e84d048d533056c9)
+	proto.RegisterFile("google/cloud/datalabeling/v1beta1/instruction.proto", fileDescriptor_683081924dd940d7)
 }
 
-var fileDescriptor_instruction_e84d048d533056c9 = []byte{
+var fileDescriptor_683081924dd940d7 = []byte{
 	// 398 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x8b, 0xdb, 0x30,
 	0x10, 0x85, 0x71, 0x77, 0xbb, 0x6d, 0xe4, 0x25, 0x05, 0x9f, 0x4c, 0x28, 0xd4, 0xbb, 0x50, 0x08,
diff --git a/googleapis/cloud/datalabeling/v1beta1/operations.pb.go b/googleapis/cloud/datalabeling/v1beta1/operations.pb.go
index adce19565c..de4138bc06 100644
--- a/googleapis/cloud/datalabeling/v1beta1/operations.pb.go
+++ b/googleapis/cloud/datalabeling/v1beta1/operations.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/datalabeling/v1beta1/operations.proto
 
-package datalabeling // import "google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1"
+package datalabeling
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Response used for ImportData longrunning operation.
 type ImportDataOperationResponse struct {
@@ -38,16 +41,17 @@ func (m *ImportDataOperationResponse) Reset()         { *m = ImportDataOperation
 func (m *ImportDataOperationResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportDataOperationResponse) ProtoMessage()    {}
 func (*ImportDataOperationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{0}
+	return fileDescriptor_1364cf1609076a0d, []int{0}
 }
+
 func (m *ImportDataOperationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDataOperationResponse.Unmarshal(m, b)
 }
 func (m *ImportDataOperationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDataOperationResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportDataOperationResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDataOperationResponse.Merge(dst, src)
+func (m *ImportDataOperationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDataOperationResponse.Merge(m, src)
 }
 func (m *ImportDataOperationResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportDataOperationResponse.Size(m)
@@ -101,16 +105,17 @@ func (m *ExportDataOperationResponse) Reset()         { *m = ExportDataOperation
 func (m *ExportDataOperationResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportDataOperationResponse) ProtoMessage()    {}
 func (*ExportDataOperationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{1}
+	return fileDescriptor_1364cf1609076a0d, []int{1}
 }
+
 func (m *ExportDataOperationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDataOperationResponse.Unmarshal(m, b)
 }
 func (m *ExportDataOperationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDataOperationResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportDataOperationResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDataOperationResponse.Merge(dst, src)
+func (m *ExportDataOperationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDataOperationResponse.Merge(m, src)
 }
 func (m *ExportDataOperationResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportDataOperationResponse.Size(m)
@@ -174,16 +179,17 @@ func (m *ImportDataOperationMetadata) Reset()         { *m = ImportDataOperation
 func (m *ImportDataOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImportDataOperationMetadata) ProtoMessage()    {}
 func (*ImportDataOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{2}
+	return fileDescriptor_1364cf1609076a0d, []int{2}
 }
+
 func (m *ImportDataOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDataOperationMetadata.Unmarshal(m, b)
 }
 func (m *ImportDataOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDataOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImportDataOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDataOperationMetadata.Merge(dst, src)
+func (m *ImportDataOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDataOperationMetadata.Merge(m, src)
 }
 func (m *ImportDataOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImportDataOperationMetadata.Size(m)
@@ -226,16 +232,17 @@ func (m *ExportDataOperationMetadata) Reset()         { *m = ExportDataOperation
 func (m *ExportDataOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportDataOperationMetadata) ProtoMessage()    {}
 func (*ExportDataOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{3}
+	return fileDescriptor_1364cf1609076a0d, []int{3}
 }
+
 func (m *ExportDataOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDataOperationMetadata.Unmarshal(m, b)
 }
 func (m *ExportDataOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDataOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportDataOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDataOperationMetadata.Merge(dst, src)
+func (m *ExportDataOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDataOperationMetadata.Merge(m, src)
 }
 func (m *ExportDataOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportDataOperationMetadata.Size(m)
@@ -296,16 +303,17 @@ func (m *LabelOperationMetadata) Reset()         { *m = LabelOperationMetadata{}
 func (m *LabelOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelOperationMetadata) ProtoMessage()    {}
 func (*LabelOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{4}
+	return fileDescriptor_1364cf1609076a0d, []int{4}
 }
+
 func (m *LabelOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelOperationMetadata.Merge(dst, src)
+func (m *LabelOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelOperationMetadata.Merge(m, src)
 }
 func (m *LabelOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelOperationMetadata.Size(m)
@@ -510,9 +518,9 @@ func (m *LabelOperationMetadata) GetTextEntityExtractionDetails() *LabelTextEnti
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LabelOperationMetadata) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LabelOperationMetadata_OneofMarshaler, _LabelOperationMetadata_OneofUnmarshaler, _LabelOperationMetadata_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LabelOperationMetadata) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LabelOperationMetadata_ImageClassificationDetails)(nil),
 		(*LabelOperationMetadata_ImageBoundingBoxDetails)(nil),
 		(*LabelOperationMetadata_ImageBoundingPolyDetails)(nil),
@@ -529,270 +537,6 @@ func (*LabelOperationMetadata) XXX_OneofFuncs() (func(msg proto.Message, b *prot
 	}
 }
 
-func _LabelOperationMetadata_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LabelOperationMetadata)
-	// details
-	switch x := m.Details.(type) {
-	case *LabelOperationMetadata_ImageClassificationDetails:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageClassificationDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_ImageBoundingBoxDetails:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageBoundingBoxDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_ImageBoundingPolyDetails:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageBoundingPolyDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_ImageOrientedBoundingBoxDetails:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageOrientedBoundingBoxDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_ImagePolylineDetails:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImagePolylineDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_ImageSegmentationDetails:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageSegmentationDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_VideoClassificationDetails:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoClassificationDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_VideoObjectDetectionDetails:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoObjectDetectionDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_VideoObjectTrackingDetails:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoObjectTrackingDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_VideoEventDetails:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoEventDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_TextClassificationDetails:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextClassificationDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_AudioTranscriptionDetails:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioTranscriptionDetails); err != nil {
-			return err
-		}
-	case *LabelOperationMetadata_TextEntityExtractionDetails:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TextEntityExtractionDetails); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LabelOperationMetadata.Details has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LabelOperationMetadata_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LabelOperationMetadata)
-	switch tag {
-	case 3: // details.image_classification_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelImageClassificationOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_ImageClassificationDetails{msg}
-		return true, err
-	case 4: // details.image_bounding_box_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelImageBoundingBoxOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_ImageBoundingBoxDetails{msg}
-		return true, err
-	case 11: // details.image_bounding_poly_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelImageBoundingPolyOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_ImageBoundingPolyDetails{msg}
-		return true, err
-	case 14: // details.image_oriented_bounding_box_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelImageOrientedBoundingBoxOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_ImageOrientedBoundingBoxDetails{msg}
-		return true, err
-	case 12: // details.image_polyline_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelImagePolylineOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_ImagePolylineDetails{msg}
-		return true, err
-	case 15: // details.image_segmentation_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelImageSegmentationOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_ImageSegmentationDetails{msg}
-		return true, err
-	case 5: // details.video_classification_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelVideoClassificationOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_VideoClassificationDetails{msg}
-		return true, err
-	case 6: // details.video_object_detection_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelVideoObjectDetectionOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_VideoObjectDetectionDetails{msg}
-		return true, err
-	case 7: // details.video_object_tracking_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelVideoObjectTrackingOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_VideoObjectTrackingDetails{msg}
-		return true, err
-	case 8: // details.video_event_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelVideoEventOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_VideoEventDetails{msg}
-		return true, err
-	case 9: // details.text_classification_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelTextClassificationOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_TextClassificationDetails{msg}
-		return true, err
-	case 10: // details.audio_transcription_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelAudioTranscriptionOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_AudioTranscriptionDetails{msg}
-		return true, err
-	case 13: // details.text_entity_extraction_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LabelTextEntityExtractionOperationMetadata)
-		err := b.DecodeMessage(msg)
-		m.Details = &LabelOperationMetadata_TextEntityExtractionDetails{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LabelOperationMetadata_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LabelOperationMetadata)
-	// details
-	switch x := m.Details.(type) {
-	case *LabelOperationMetadata_ImageClassificationDetails:
-		s := proto.Size(x.ImageClassificationDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_ImageBoundingBoxDetails:
-		s := proto.Size(x.ImageBoundingBoxDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_ImageBoundingPolyDetails:
-		s := proto.Size(x.ImageBoundingPolyDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_ImageOrientedBoundingBoxDetails:
-		s := proto.Size(x.ImageOrientedBoundingBoxDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_ImagePolylineDetails:
-		s := proto.Size(x.ImagePolylineDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_ImageSegmentationDetails:
-		s := proto.Size(x.ImageSegmentationDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_VideoClassificationDetails:
-		s := proto.Size(x.VideoClassificationDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_VideoObjectDetectionDetails:
-		s := proto.Size(x.VideoObjectDetectionDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_VideoObjectTrackingDetails:
-		s := proto.Size(x.VideoObjectTrackingDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_VideoEventDetails:
-		s := proto.Size(x.VideoEventDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_TextClassificationDetails:
-		s := proto.Size(x.TextClassificationDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_AudioTranscriptionDetails:
-		s := proto.Size(x.AudioTranscriptionDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LabelOperationMetadata_TextEntityExtractionDetails:
-		s := proto.Size(x.TextEntityExtractionDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Metadata of a LabelImageClassification operation.
 type LabelImageClassificationOperationMetadata struct {
 	// Basic human annotation config used in labeling request.
@@ -808,16 +552,17 @@ func (m *LabelImageClassificationOperationMetadata) Reset() {
 func (m *LabelImageClassificationOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelImageClassificationOperationMetadata) ProtoMessage()    {}
 func (*LabelImageClassificationOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{5}
+	return fileDescriptor_1364cf1609076a0d, []int{5}
 }
+
 func (m *LabelImageClassificationOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelImageClassificationOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelImageClassificationOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelImageClassificationOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelImageClassificationOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelImageClassificationOperationMetadata.Merge(dst, src)
+func (m *LabelImageClassificationOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelImageClassificationOperationMetadata.Merge(m, src)
 }
 func (m *LabelImageClassificationOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelImageClassificationOperationMetadata.Size(m)
@@ -850,16 +595,17 @@ func (m *LabelImageBoundingBoxOperationMetadata) Reset() {
 func (m *LabelImageBoundingBoxOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelImageBoundingBoxOperationMetadata) ProtoMessage()    {}
 func (*LabelImageBoundingBoxOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{6}
+	return fileDescriptor_1364cf1609076a0d, []int{6}
 }
+
 func (m *LabelImageBoundingBoxOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelImageBoundingBoxOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelImageBoundingBoxOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelImageBoundingBoxOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelImageBoundingBoxOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelImageBoundingBoxOperationMetadata.Merge(dst, src)
+func (m *LabelImageBoundingBoxOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelImageBoundingBoxOperationMetadata.Merge(m, src)
 }
 func (m *LabelImageBoundingBoxOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelImageBoundingBoxOperationMetadata.Size(m)
@@ -894,16 +640,17 @@ func (m *LabelImageOrientedBoundingBoxOperationMetadata) String() string {
 }
 func (*LabelImageOrientedBoundingBoxOperationMetadata) ProtoMessage() {}
 func (*LabelImageOrientedBoundingBoxOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{7}
+	return fileDescriptor_1364cf1609076a0d, []int{7}
 }
+
 func (m *LabelImageOrientedBoundingBoxOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelImageOrientedBoundingBoxOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelImageOrientedBoundingBoxOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelImageOrientedBoundingBoxOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelImageOrientedBoundingBoxOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelImageOrientedBoundingBoxOperationMetadata.Merge(dst, src)
+func (m *LabelImageOrientedBoundingBoxOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelImageOrientedBoundingBoxOperationMetadata.Merge(m, src)
 }
 func (m *LabelImageOrientedBoundingBoxOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelImageOrientedBoundingBoxOperationMetadata.Size(m)
@@ -936,16 +683,17 @@ func (m *LabelImageBoundingPolyOperationMetadata) Reset() {
 func (m *LabelImageBoundingPolyOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelImageBoundingPolyOperationMetadata) ProtoMessage()    {}
 func (*LabelImageBoundingPolyOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{8}
+	return fileDescriptor_1364cf1609076a0d, []int{8}
 }
+
 func (m *LabelImageBoundingPolyOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelImageBoundingPolyOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelImageBoundingPolyOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelImageBoundingPolyOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelImageBoundingPolyOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelImageBoundingPolyOperationMetadata.Merge(dst, src)
+func (m *LabelImageBoundingPolyOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelImageBoundingPolyOperationMetadata.Merge(m, src)
 }
 func (m *LabelImageBoundingPolyOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelImageBoundingPolyOperationMetadata.Size(m)
@@ -976,16 +724,17 @@ func (m *LabelImagePolylineOperationMetadata) Reset()         { *m = LabelImageP
 func (m *LabelImagePolylineOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelImagePolylineOperationMetadata) ProtoMessage()    {}
 func (*LabelImagePolylineOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{9}
+	return fileDescriptor_1364cf1609076a0d, []int{9}
 }
+
 func (m *LabelImagePolylineOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelImagePolylineOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelImagePolylineOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelImagePolylineOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelImagePolylineOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelImagePolylineOperationMetadata.Merge(dst, src)
+func (m *LabelImagePolylineOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelImagePolylineOperationMetadata.Merge(m, src)
 }
 func (m *LabelImagePolylineOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelImagePolylineOperationMetadata.Size(m)
@@ -1018,16 +767,17 @@ func (m *LabelImageSegmentationOperationMetadata) Reset() {
 func (m *LabelImageSegmentationOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelImageSegmentationOperationMetadata) ProtoMessage()    {}
 func (*LabelImageSegmentationOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{10}
+	return fileDescriptor_1364cf1609076a0d, []int{10}
 }
+
 func (m *LabelImageSegmentationOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelImageSegmentationOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelImageSegmentationOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelImageSegmentationOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelImageSegmentationOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelImageSegmentationOperationMetadata.Merge(dst, src)
+func (m *LabelImageSegmentationOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelImageSegmentationOperationMetadata.Merge(m, src)
 }
 func (m *LabelImageSegmentationOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelImageSegmentationOperationMetadata.Size(m)
@@ -1060,16 +810,17 @@ func (m *LabelVideoClassificationOperationMetadata) Reset() {
 func (m *LabelVideoClassificationOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelVideoClassificationOperationMetadata) ProtoMessage()    {}
 func (*LabelVideoClassificationOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{11}
+	return fileDescriptor_1364cf1609076a0d, []int{11}
 }
+
 func (m *LabelVideoClassificationOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelVideoClassificationOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelVideoClassificationOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelVideoClassificationOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelVideoClassificationOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelVideoClassificationOperationMetadata.Merge(dst, src)
+func (m *LabelVideoClassificationOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelVideoClassificationOperationMetadata.Merge(m, src)
 }
 func (m *LabelVideoClassificationOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelVideoClassificationOperationMetadata.Size(m)
@@ -1104,16 +855,17 @@ func (m *LabelVideoObjectDetectionOperationMetadata) String() string {
 }
 func (*LabelVideoObjectDetectionOperationMetadata) ProtoMessage() {}
 func (*LabelVideoObjectDetectionOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{12}
+	return fileDescriptor_1364cf1609076a0d, []int{12}
 }
+
 func (m *LabelVideoObjectDetectionOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelVideoObjectDetectionOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelVideoObjectDetectionOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelVideoObjectDetectionOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelVideoObjectDetectionOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelVideoObjectDetectionOperationMetadata.Merge(dst, src)
+func (m *LabelVideoObjectDetectionOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelVideoObjectDetectionOperationMetadata.Merge(m, src)
 }
 func (m *LabelVideoObjectDetectionOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelVideoObjectDetectionOperationMetadata.Size(m)
@@ -1146,16 +898,17 @@ func (m *LabelVideoObjectTrackingOperationMetadata) Reset() {
 func (m *LabelVideoObjectTrackingOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelVideoObjectTrackingOperationMetadata) ProtoMessage()    {}
 func (*LabelVideoObjectTrackingOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{13}
+	return fileDescriptor_1364cf1609076a0d, []int{13}
 }
+
 func (m *LabelVideoObjectTrackingOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelVideoObjectTrackingOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelVideoObjectTrackingOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelVideoObjectTrackingOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelVideoObjectTrackingOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelVideoObjectTrackingOperationMetadata.Merge(dst, src)
+func (m *LabelVideoObjectTrackingOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelVideoObjectTrackingOperationMetadata.Merge(m, src)
 }
 func (m *LabelVideoObjectTrackingOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelVideoObjectTrackingOperationMetadata.Size(m)
@@ -1186,16 +939,17 @@ func (m *LabelVideoEventOperationMetadata) Reset()         { *m = LabelVideoEven
 func (m *LabelVideoEventOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelVideoEventOperationMetadata) ProtoMessage()    {}
 func (*LabelVideoEventOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{14}
+	return fileDescriptor_1364cf1609076a0d, []int{14}
 }
+
 func (m *LabelVideoEventOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelVideoEventOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelVideoEventOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelVideoEventOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelVideoEventOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelVideoEventOperationMetadata.Merge(dst, src)
+func (m *LabelVideoEventOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelVideoEventOperationMetadata.Merge(m, src)
 }
 func (m *LabelVideoEventOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelVideoEventOperationMetadata.Size(m)
@@ -1228,16 +982,17 @@ func (m *LabelTextClassificationOperationMetadata) Reset() {
 func (m *LabelTextClassificationOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelTextClassificationOperationMetadata) ProtoMessage()    {}
 func (*LabelTextClassificationOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{15}
+	return fileDescriptor_1364cf1609076a0d, []int{15}
 }
+
 func (m *LabelTextClassificationOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelTextClassificationOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelTextClassificationOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelTextClassificationOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelTextClassificationOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelTextClassificationOperationMetadata.Merge(dst, src)
+func (m *LabelTextClassificationOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelTextClassificationOperationMetadata.Merge(m, src)
 }
 func (m *LabelTextClassificationOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelTextClassificationOperationMetadata.Size(m)
@@ -1269,16 +1024,17 @@ func (m *LabelAudioTranscriptionOperationMetadata) Reset() {
 func (m *LabelAudioTranscriptionOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LabelAudioTranscriptionOperationMetadata) ProtoMessage()    {}
 func (*LabelAudioTranscriptionOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{16}
+	return fileDescriptor_1364cf1609076a0d, []int{16}
 }
+
 func (m *LabelAudioTranscriptionOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAudioTranscriptionOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelAudioTranscriptionOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAudioTranscriptionOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelAudioTranscriptionOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAudioTranscriptionOperationMetadata.Merge(dst, src)
+func (m *LabelAudioTranscriptionOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAudioTranscriptionOperationMetadata.Merge(m, src)
 }
 func (m *LabelAudioTranscriptionOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelAudioTranscriptionOperationMetadata.Size(m)
@@ -1313,16 +1069,17 @@ func (m *LabelTextEntityExtractionOperationMetadata) String() string {
 }
 func (*LabelTextEntityExtractionOperationMetadata) ProtoMessage() {}
 func (*LabelTextEntityExtractionOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{17}
+	return fileDescriptor_1364cf1609076a0d, []int{17}
 }
+
 func (m *LabelTextEntityExtractionOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelTextEntityExtractionOperationMetadata.Unmarshal(m, b)
 }
 func (m *LabelTextEntityExtractionOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelTextEntityExtractionOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LabelTextEntityExtractionOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelTextEntityExtractionOperationMetadata.Merge(dst, src)
+func (m *LabelTextEntityExtractionOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelTextEntityExtractionOperationMetadata.Merge(m, src)
 }
 func (m *LabelTextEntityExtractionOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LabelTextEntityExtractionOperationMetadata.Size(m)
@@ -1358,16 +1115,17 @@ func (m *CreateInstructionMetadata) Reset()         { *m = CreateInstructionMeta
 func (m *CreateInstructionMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateInstructionMetadata) ProtoMessage()    {}
 func (*CreateInstructionMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_f915b1b50117c3fa, []int{18}
+	return fileDescriptor_1364cf1609076a0d, []int{18}
 }
+
 func (m *CreateInstructionMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstructionMetadata.Unmarshal(m, b)
 }
 func (m *CreateInstructionMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstructionMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstructionMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstructionMetadata.Merge(dst, src)
+func (m *CreateInstructionMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstructionMetadata.Merge(m, src)
 }
 func (m *CreateInstructionMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateInstructionMetadata.Size(m)
@@ -1415,10 +1173,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/datalabeling/v1beta1/operations.proto", fileDescriptor_operations_f915b1b50117c3fa)
+	proto.RegisterFile("google/cloud/datalabeling/v1beta1/operations.proto", fileDescriptor_1364cf1609076a0d)
 }
 
-var fileDescriptor_operations_f915b1b50117c3fa = []byte{
+var fileDescriptor_1364cf1609076a0d = []byte{
 	// 1042 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0x61, 0x6f, 0xdb, 0x44,
 	0x18, 0xc7, 0xb9, 0x8e, 0xae, 0xf4, 0x71, 0x47, 0x87, 0x41, 0x5b, 0xd6, 0x0e, 0x9a, 0x75, 0x02,
diff --git a/googleapis/cloud/dataproc/v1/clusters.pb.go b/googleapis/cloud/dataproc/v1/clusters.pb.go
index 602d69cc15..a5eda22d4a 100644
--- a/googleapis/cloud/dataproc/v1/clusters.pb.go
+++ b/googleapis/cloud/dataproc/v1/clusters.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/clusters.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The cluster state.
 type ClusterStatus_State int32
@@ -54,6 +54,7 @@ var ClusterStatus_State_name = map[int32]string{
 	4: "DELETING",
 	5: "UPDATING",
 }
+
 var ClusterStatus_State_value = map[string]int32{
 	"UNKNOWN":  0,
 	"CREATING": 1,
@@ -66,8 +67,9 @@ var ClusterStatus_State_value = map[string]int32{
 func (x ClusterStatus_State) String() string {
 	return proto.EnumName(ClusterStatus_State_name, int32(x))
 }
+
 func (ClusterStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{9, 0}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{9, 0}
 }
 
 // The cluster substate.
@@ -94,6 +96,7 @@ var ClusterStatus_Substate_name = map[int32]string{
 	1: "UNHEALTHY",
 	2: "STALE_STATUS",
 }
+
 var ClusterStatus_Substate_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNHEALTHY":    1,
@@ -103,8 +106,9 @@ var ClusterStatus_Substate_value = map[string]int32{
 func (x ClusterStatus_Substate) String() string {
 	return proto.EnumName(ClusterStatus_Substate_name, int32(x))
 }
+
 func (ClusterStatus_Substate) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{9, 1}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{9, 1}
 }
 
 // Describes the identifying information, config, and status of
@@ -147,16 +151,17 @@ func (m *Cluster) Reset()         { *m = Cluster{} }
 func (m *Cluster) String() string { return proto.CompactTextString(m) }
 func (*Cluster) ProtoMessage()    {}
 func (*Cluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{0}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{0}
 }
+
 func (m *Cluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cluster.Unmarshal(m, b)
 }
 func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
 }
-func (dst *Cluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cluster.Merge(dst, src)
+func (m *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(m, src)
 }
 func (m *Cluster) XXX_Size() int {
 	return xxx_messageInfo_Cluster.Size(m)
@@ -271,16 +276,17 @@ func (m *ClusterConfig) Reset()         { *m = ClusterConfig{} }
 func (m *ClusterConfig) String() string { return proto.CompactTextString(m) }
 func (*ClusterConfig) ProtoMessage()    {}
 func (*ClusterConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{1}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{1}
 }
+
 func (m *ClusterConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterConfig.Unmarshal(m, b)
 }
 func (m *ClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClusterConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterConfig.Merge(dst, src)
+func (m *ClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterConfig.Merge(m, src)
 }
 func (m *ClusterConfig) XXX_Size() int {
 	return xxx_messageInfo_ClusterConfig.Size(m)
@@ -361,16 +367,17 @@ func (m *EncryptionConfig) Reset()         { *m = EncryptionConfig{} }
 func (m *EncryptionConfig) String() string { return proto.CompactTextString(m) }
 func (*EncryptionConfig) ProtoMessage()    {}
 func (*EncryptionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{2}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{2}
 }
+
 func (m *EncryptionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EncryptionConfig.Unmarshal(m, b)
 }
 func (m *EncryptionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EncryptionConfig.Marshal(b, m, deterministic)
 }
-func (dst *EncryptionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EncryptionConfig.Merge(dst, src)
+func (m *EncryptionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EncryptionConfig.Merge(m, src)
 }
 func (m *EncryptionConfig) XXX_Size() int {
 	return xxx_messageInfo_EncryptionConfig.Size(m)
@@ -474,16 +481,17 @@ func (m *GceClusterConfig) Reset()         { *m = GceClusterConfig{} }
 func (m *GceClusterConfig) String() string { return proto.CompactTextString(m) }
 func (*GceClusterConfig) ProtoMessage()    {}
 func (*GceClusterConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{3}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{3}
 }
+
 func (m *GceClusterConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GceClusterConfig.Unmarshal(m, b)
 }
 func (m *GceClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GceClusterConfig.Marshal(b, m, deterministic)
 }
-func (dst *GceClusterConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GceClusterConfig.Merge(dst, src)
+func (m *GceClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GceClusterConfig.Merge(m, src)
 }
 func (m *GceClusterConfig) XXX_Size() int {
 	return xxx_messageInfo_GceClusterConfig.Size(m)
@@ -601,16 +609,17 @@ func (m *InstanceGroupConfig) Reset()         { *m = InstanceGroupConfig{} }
 func (m *InstanceGroupConfig) String() string { return proto.CompactTextString(m) }
 func (*InstanceGroupConfig) ProtoMessage()    {}
 func (*InstanceGroupConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{4}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{4}
 }
+
 func (m *InstanceGroupConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InstanceGroupConfig.Unmarshal(m, b)
 }
 func (m *InstanceGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InstanceGroupConfig.Marshal(b, m, deterministic)
 }
-func (dst *InstanceGroupConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InstanceGroupConfig.Merge(dst, src)
+func (m *InstanceGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstanceGroupConfig.Merge(m, src)
 }
 func (m *InstanceGroupConfig) XXX_Size() int {
 	return xxx_messageInfo_InstanceGroupConfig.Size(m)
@@ -693,16 +702,17 @@ func (m *ManagedGroupConfig) Reset()         { *m = ManagedGroupConfig{} }
 func (m *ManagedGroupConfig) String() string { return proto.CompactTextString(m) }
 func (*ManagedGroupConfig) ProtoMessage()    {}
 func (*ManagedGroupConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{5}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{5}
 }
+
 func (m *ManagedGroupConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManagedGroupConfig.Unmarshal(m, b)
 }
 func (m *ManagedGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManagedGroupConfig.Marshal(b, m, deterministic)
 }
-func (dst *ManagedGroupConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManagedGroupConfig.Merge(dst, src)
+func (m *ManagedGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedGroupConfig.Merge(m, src)
 }
 func (m *ManagedGroupConfig) XXX_Size() int {
 	return xxx_messageInfo_ManagedGroupConfig.Size(m)
@@ -758,16 +768,17 @@ func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
 func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
 func (*AcceleratorConfig) ProtoMessage()    {}
 func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{6}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{6}
 }
+
 func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
 }
 func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
 }
-func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+func (m *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(m, src)
 }
 func (m *AcceleratorConfig) XXX_Size() int {
 	return xxx_messageInfo_AcceleratorConfig.Size(m)
@@ -816,16 +827,17 @@ func (m *DiskConfig) Reset()         { *m = DiskConfig{} }
 func (m *DiskConfig) String() string { return proto.CompactTextString(m) }
 func (*DiskConfig) ProtoMessage()    {}
 func (*DiskConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{7}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{7}
 }
+
 func (m *DiskConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DiskConfig.Unmarshal(m, b)
 }
 func (m *DiskConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DiskConfig.Marshal(b, m, deterministic)
 }
-func (dst *DiskConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DiskConfig.Merge(dst, src)
+func (m *DiskConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiskConfig.Merge(m, src)
 }
 func (m *DiskConfig) XXX_Size() int {
 	return xxx_messageInfo_DiskConfig.Size(m)
@@ -876,16 +888,17 @@ func (m *NodeInitializationAction) Reset()         { *m = NodeInitializationActi
 func (m *NodeInitializationAction) String() string { return proto.CompactTextString(m) }
 func (*NodeInitializationAction) ProtoMessage()    {}
 func (*NodeInitializationAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{8}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{8}
 }
+
 func (m *NodeInitializationAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeInitializationAction.Unmarshal(m, b)
 }
 func (m *NodeInitializationAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeInitializationAction.Marshal(b, m, deterministic)
 }
-func (dst *NodeInitializationAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeInitializationAction.Merge(dst, src)
+func (m *NodeInitializationAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeInitializationAction.Merge(m, src)
 }
 func (m *NodeInitializationAction) XXX_Size() int {
 	return xxx_messageInfo_NodeInitializationAction.Size(m)
@@ -930,16 +943,17 @@ func (m *ClusterStatus) Reset()         { *m = ClusterStatus{} }
 func (m *ClusterStatus) String() string { return proto.CompactTextString(m) }
 func (*ClusterStatus) ProtoMessage()    {}
 func (*ClusterStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{9}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{9}
 }
+
 func (m *ClusterStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterStatus.Unmarshal(m, b)
 }
 func (m *ClusterStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterStatus.Marshal(b, m, deterministic)
 }
-func (dst *ClusterStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterStatus.Merge(dst, src)
+func (m *ClusterStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterStatus.Merge(m, src)
 }
 func (m *ClusterStatus) XXX_Size() int {
 	return xxx_messageInfo_ClusterStatus.Size(m)
@@ -1016,16 +1030,17 @@ func (m *SoftwareConfig) Reset()         { *m = SoftwareConfig{} }
 func (m *SoftwareConfig) String() string { return proto.CompactTextString(m) }
 func (*SoftwareConfig) ProtoMessage()    {}
 func (*SoftwareConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{10}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{10}
 }
+
 func (m *SoftwareConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SoftwareConfig.Unmarshal(m, b)
 }
 func (m *SoftwareConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SoftwareConfig.Marshal(b, m, deterministic)
 }
-func (dst *SoftwareConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SoftwareConfig.Merge(dst, src)
+func (m *SoftwareConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SoftwareConfig.Merge(m, src)
 }
 func (m *SoftwareConfig) XXX_Size() int {
 	return xxx_messageInfo_SoftwareConfig.Size(m)
@@ -1068,16 +1083,17 @@ func (m *ClusterMetrics) Reset()         { *m = ClusterMetrics{} }
 func (m *ClusterMetrics) String() string { return proto.CompactTextString(m) }
 func (*ClusterMetrics) ProtoMessage()    {}
 func (*ClusterMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{11}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{11}
 }
+
 func (m *ClusterMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterMetrics.Unmarshal(m, b)
 }
 func (m *ClusterMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterMetrics.Marshal(b, m, deterministic)
 }
-func (dst *ClusterMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterMetrics.Merge(dst, src)
+func (m *ClusterMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterMetrics.Merge(m, src)
 }
 func (m *ClusterMetrics) XXX_Size() int {
 	return xxx_messageInfo_ClusterMetrics.Size(m)
@@ -1133,16 +1149,17 @@ func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
 func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterRequest) ProtoMessage()    {}
 func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{12}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{12}
 }
+
 func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
 }
 func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+func (m *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(m, src)
 }
 func (m *CreateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterRequest.Size(m)
@@ -1271,16 +1288,17 @@ func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
 func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateClusterRequest) ProtoMessage()    {}
 func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{13}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{13}
 }
+
 func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
 }
 func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+func (m *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(m, src)
 }
 func (m *UpdateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateClusterRequest.Size(m)
@@ -1374,16 +1392,17 @@ func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
 func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteClusterRequest) ProtoMessage()    {}
 func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{14}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{14}
 }
+
 func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+func (m *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(m, src)
 }
 func (m *DeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteClusterRequest.Size(m)
@@ -1447,16 +1466,17 @@ func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
 func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterRequest) ProtoMessage()    {}
 func (*GetClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{15}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{15}
 }
+
 func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
 }
 func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+func (m *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(m, src)
 }
 func (m *GetClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClusterRequest.Size(m)
@@ -1528,16 +1548,17 @@ func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
 func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListClustersRequest) ProtoMessage()    {}
 func (*ListClustersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{16}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{16}
 }
+
 func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
 }
 func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+func (m *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(m, src)
 }
 func (m *ListClustersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListClustersRequest.Size(m)
@@ -1600,16 +1621,17 @@ func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
 func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListClustersResponse) ProtoMessage()    {}
 func (*ListClustersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{17}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{17}
 }
+
 func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
 }
 func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+func (m *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(m, src)
 }
 func (m *ListClustersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListClustersResponse.Size(m)
@@ -1652,16 +1674,17 @@ func (m *DiagnoseClusterRequest) Reset()         { *m = DiagnoseClusterRequest{}
 func (m *DiagnoseClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DiagnoseClusterRequest) ProtoMessage()    {}
 func (*DiagnoseClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{18}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{18}
 }
+
 func (m *DiagnoseClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DiagnoseClusterRequest.Unmarshal(m, b)
 }
 func (m *DiagnoseClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DiagnoseClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DiagnoseClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DiagnoseClusterRequest.Merge(dst, src)
+func (m *DiagnoseClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterRequest.Merge(m, src)
 }
 func (m *DiagnoseClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DiagnoseClusterRequest.Size(m)
@@ -1708,16 +1731,17 @@ func (m *DiagnoseClusterResults) Reset()         { *m = DiagnoseClusterResults{}
 func (m *DiagnoseClusterResults) String() string { return proto.CompactTextString(m) }
 func (*DiagnoseClusterResults) ProtoMessage()    {}
 func (*DiagnoseClusterResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_7d2ba1001a92fd64, []int{19}
+	return fileDescriptor_29f9b85b3c7e3a5f, []int{19}
 }
+
 func (m *DiagnoseClusterResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DiagnoseClusterResults.Unmarshal(m, b)
 }
 func (m *DiagnoseClusterResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DiagnoseClusterResults.Marshal(b, m, deterministic)
 }
-func (dst *DiagnoseClusterResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DiagnoseClusterResults.Merge(dst, src)
+func (m *DiagnoseClusterResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterResults.Merge(m, src)
 }
 func (m *DiagnoseClusterResults) XXX_Size() int {
 	return xxx_messageInfo_DiagnoseClusterResults.Size(m)
@@ -1736,6 +1760,8 @@ func (m *DiagnoseClusterResults) GetOutputUri() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1.ClusterStatus_State", ClusterStatus_State_name, ClusterStatus_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1.ClusterStatus_Substate", ClusterStatus_Substate_name, ClusterStatus_Substate_value)
 	proto.RegisterType((*Cluster)(nil), "google.cloud.dataproc.v1.Cluster")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.Cluster.LabelsEntry")
 	proto.RegisterType((*ClusterConfig)(nil), "google.cloud.dataproc.v1.ClusterConfig")
@@ -1761,8 +1787,144 @@ func init() {
 	proto.RegisterType((*ListClustersResponse)(nil), "google.cloud.dataproc.v1.ListClustersResponse")
 	proto.RegisterType((*DiagnoseClusterRequest)(nil), "google.cloud.dataproc.v1.DiagnoseClusterRequest")
 	proto.RegisterType((*DiagnoseClusterResults)(nil), "google.cloud.dataproc.v1.DiagnoseClusterResults")
-	proto.RegisterEnum("google.cloud.dataproc.v1.ClusterStatus_State", ClusterStatus_State_name, ClusterStatus_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1.ClusterStatus_Substate", ClusterStatus_Substate_name, ClusterStatus_Substate_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1/clusters.proto", fileDescriptor_29f9b85b3c7e3a5f)
+}
+
+var fileDescriptor_29f9b85b3c7e3a5f = []byte{
+	// 2079 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x73, 0x1c, 0x47,
+	0x15, 0xcf, 0x68, 0xb5, 0xd2, 0xea, 0xed, 0x87, 0x56, 0x1d, 0x45, 0x6c, 0x94, 0x84, 0x38, 0x93,
+	0x80, 0x15, 0x27, 0xec, 0xda, 0x0a, 0x14, 0x89, 0x4d, 0x42, 0x64, 0xed, 0xda, 0x16, 0x96, 0xd7,
+	0x62, 0x76, 0x65, 0x27, 0x14, 0x30, 0xd5, 0x3b, 0xd3, 0x5a, 0x37, 0x9a, 0xaf, 0x4c, 0xf7, 0x28,
+	0x59, 0xbb, 0x7c, 0x81, 0x2a, 0xaa, 0x28, 0x8e, 0x54, 0x71, 0xe6, 0x00, 0x55, 0x90, 0x63, 0xe0,
+	0xc4, 0x3f, 0xc0, 0x85, 0xe2, 0xc2, 0xbf, 0xc0, 0x81, 0x3f, 0x83, 0xea, 0x8f, 0xd9, 0x9d, 0x59,
+	0x7d, 0xac, 0x64, 0x5c, 0x39, 0x69, 0xe6, 0xf5, 0xef, 0xbd, 0xf7, 0xeb, 0xee, 0xd7, 0xbf, 0x79,
+	0xbd, 0x82, 0xcb, 0xc3, 0x30, 0x1c, 0x7a, 0xa4, 0xe5, 0x78, 0x61, 0xe2, 0xb6, 0x5c, 0xcc, 0x71,
+	0x14, 0x87, 0x4e, 0xeb, 0xe8, 0x5a, 0xcb, 0xf1, 0x12, 0xc6, 0x49, 0xcc, 0x9a, 0x51, 0x1c, 0xf2,
+	0x10, 0x35, 0x14, 0xb0, 0x29, 0x81, 0xcd, 0x14, 0xd8, 0x3c, 0xba, 0xb6, 0xfe, 0xaa, 0x0e, 0x81,
+	0x23, 0xda, 0xc2, 0x41, 0x10, 0x72, 0xcc, 0x69, 0x18, 0x68, 0xbf, 0xf5, 0xb7, 0x4f, 0x4d, 0x10,
+	0x46, 0x24, 0xce, 0x41, 0xdf, 0xd4, 0x50, 0x2f, 0x0c, 0x86, 0x71, 0x12, 0x04, 0x34, 0x18, 0x1e,
+	0x07, 0x7d, 0x53, 0x83, 0xe4, 0xdb, 0x20, 0x39, 0x68, 0xb9, 0x89, 0x02, 0xe8, 0xf1, 0x4b, 0xd3,
+	0xe3, 0x07, 0x94, 0x78, 0xae, 0xed, 0x63, 0x76, 0xa8, 0x11, 0xaf, 0x4f, 0x23, 0x38, 0xf5, 0x09,
+	0xe3, 0xd8, 0x8f, 0x14, 0xc0, 0xfc, 0xf5, 0x3c, 0x2c, 0x6e, 0xab, 0xd9, 0xa3, 0xd7, 0x00, 0xa2,
+	0x38, 0xfc, 0x05, 0x71, 0xb8, 0x4d, 0xdd, 0x86, 0x71, 0xc9, 0xd8, 0x58, 0xb2, 0x96, 0xb4, 0x65,
+	0xc7, 0x45, 0x6f, 0x40, 0x45, 0xaf, 0x93, 0x1d, 0x60, 0x9f, 0x34, 0xe6, 0x24, 0xa0, 0xac, 0x6d,
+	0x5d, 0xec, 0x13, 0xf4, 0x43, 0x58, 0x70, 0xc2, 0xe0, 0x80, 0x0e, 0x1b, 0x85, 0x4b, 0xc6, 0x46,
+	0x79, 0xf3, 0x72, 0xf3, 0xb4, 0x95, 0x6c, 0xea, 0xa4, 0xdb, 0x12, 0x6e, 0x69, 0x37, 0xd4, 0x81,
+	0x05, 0x0f, 0x0f, 0x88, 0xc7, 0x1a, 0xa5, 0x4b, 0x85, 0x8d, 0xf2, 0xe6, 0x77, 0x66, 0x06, 0x68,
+	0xee, 0x4a, 0x7c, 0x27, 0xe0, 0xf1, 0xc8, 0xd2, 0xce, 0x82, 0x07, 0xe3, 0x98, 0x27, 0xac, 0x31,
+	0x7f, 0x4e, 0x1e, 0x3d, 0x09, 0xb7, 0xb4, 0x1b, 0xea, 0x42, 0x4d, 0x3d, 0xd9, 0x8f, 0x28, 0xe3,
+	0x61, 0x3c, 0x6a, 0x2c, 0x4a, 0x3e, 0xe7, 0x0e, 0x54, 0x55, 0xee, 0x77, 0x94, 0x77, 0x76, 0xed,
+	0x92, 0x84, 0xba, 0x8d, 0x85, 0xdc, 0xda, 0xed, 0x27, 0xd4, 0x45, 0x37, 0x61, 0xd1, 0x27, 0x3c,
+	0xa6, 0x0e, 0x6b, 0x2c, 0x49, 0xd2, 0x1b, 0x33, 0x73, 0xdd, 0x53, 0x78, 0x2b, 0x75, 0x5c, 0xff,
+	0x00, 0xca, 0x99, 0xe5, 0x40, 0x75, 0x28, 0x1c, 0x92, 0x91, 0xde, 0x49, 0xf1, 0x88, 0x56, 0xa1,
+	0x78, 0x84, 0xbd, 0x24, 0xdd, 0x3c, 0xf5, 0x72, 0x7d, 0xee, 0x7d, 0xc3, 0xfc, 0x5b, 0x11, 0xaa,
+	0xb9, 0x3d, 0x41, 0x6f, 0x42, 0x55, 0xed, 0x8a, 0x3d, 0x48, 0x9c, 0x43, 0xc2, 0x75, 0x9c, 0x8a,
+	0x32, 0xde, 0x94, 0x36, 0xf4, 0x09, 0xa0, 0xa1, 0x43, 0xec, 0x74, 0x72, 0x7a, 0xf7, 0x4b, 0x72,
+	0x02, 0x57, 0x4e, 0x9f, 0xc0, 0x6d, 0x87, 0xe4, 0x0b, 0xa0, 0x3e, 0x9c, 0xb2, 0x20, 0x0b, 0xaa,
+	0x3e, 0xce, 0x06, 0x55, 0xab, 0x72, 0x46, 0x45, 0xec, 0x04, 0x8c, 0xe3, 0xc0, 0x21, 0xb7, 0xe3,
+	0x30, 0x89, 0x74, 0xdc, 0x8a, 0x8a, 0x31, 0x89, 0xf9, 0x79, 0x18, 0x1f, 0x4e, 0x62, 0xc2, 0x33,
+	0xc5, 0x54, 0x31, 0x74, 0x4c, 0x02, 0xdf, 0x60, 0xc4, 0x09, 0x03, 0x17, 0xc7, 0x23, 0x3b, 0x1f,
+	0xbd, 0xf2, 0x2c, 0xd1, 0x5f, 0x1a, 0x47, 0x7b, 0x98, 0x4d, 0xf3, 0x63, 0x58, 0x66, 0xe1, 0x01,
+	0xff, 0x1c, 0xc7, 0x24, 0x0d, 0x5f, 0x9d, 0x55, 0x26, 0x3d, 0xed, 0xa0, 0x23, 0xd7, 0x58, 0xee,
+	0x1d, 0x51, 0x58, 0xa3, 0x01, 0xe5, 0x14, 0x7b, 0xf4, 0xb1, 0x94, 0x15, 0x1b, 0x3b, 0x52, 0x7e,
+	0x1a, 0x65, 0x59, 0xec, 0x9b, 0xa7, 0x47, 0xee, 0x86, 0x2e, 0xd9, 0xc9, 0xf9, 0x6e, 0x49, 0x57,
+	0xeb, 0x25, 0x7a, 0x82, 0x95, 0xa1, 0x87, 0xb0, 0x42, 0x02, 0x27, 0x1e, 0x45, 0x32, 0x8d, 0xe6,
+	0xbf, 0x3c, 0xab, 0x4a, 0x3a, 0x63, 0x97, 0xb4, 0x4a, 0xc8, 0x94, 0xc5, 0xfc, 0x18, 0xea, 0xd3,
+	0x28, 0xf4, 0x2e, 0xbc, 0x28, 0x6a, 0x32, 0x72, 0xed, 0x43, 0x9f, 0xd9, 0x87, 0x64, 0xa4, 0xf4,
+	0x4a, 0x95, 0xef, 0xf2, 0xd0, 0x21, 0x7b, 0xee, 0x5d, 0x9f, 0xdd, 0x25, 0x23, 0xa1, 0x59, 0xe6,
+	0x9f, 0x0a, 0x50, 0x9f, 0x2e, 0x47, 0xf4, 0x32, 0x94, 0x1e, 0x87, 0x01, 0xb1, 0x93, 0x98, 0x6a,
+	0xbf, 0x45, 0xf1, 0xbe, 0x1f, 0x53, 0xf4, 0x3a, 0x94, 0x03, 0xc2, 0xc5, 0x46, 0xcb, 0x51, 0x75,
+	0x90, 0x40, 0x9b, 0x04, 0xe0, 0x5b, 0x50, 0x63, 0xc9, 0x20, 0x8b, 0x51, 0xa7, 0xbd, 0x3a, 0xb1,
+	0x0a, 0xd8, 0x06, 0xd4, 0x69, 0xc0, 0x49, 0x1c, 0x60, 0xcf, 0xa6, 0x91, 0x1d, 0x06, 0x9e, 0x10,
+	0x19, 0x63, 0xa3, 0x64, 0xd5, 0x52, 0xfb, 0x4e, 0x74, 0x3f, 0xf0, 0x46, 0xe8, 0x32, 0x2c, 0x33,
+	0x12, 0x1f, 0x51, 0x87, 0xd8, 0xd8, 0x71, 0xc2, 0x24, 0xe0, 0xf2, 0x80, 0x2d, 0x59, 0x35, 0x6d,
+	0xde, 0x52, 0x56, 0xf4, 0x5d, 0x58, 0x9b, 0x02, 0xda, 0xcc, 0x09, 0x23, 0xc2, 0x1a, 0x85, 0x4b,
+	0x85, 0x8d, 0x25, 0x6b, 0x35, 0x8f, 0xef, 0xc9, 0x31, 0x84, 0x60, 0x9e, 0xe3, 0xa1, 0x90, 0x4a,
+	0x81, 0x91, 0xcf, 0xa8, 0x0f, 0x25, 0x9f, 0x70, 0x2c, 0x36, 0xa3, 0x51, 0x94, 0xc5, 0xf0, 0xfe,
+	0xf9, 0x0f, 0x73, 0xf3, 0x9e, 0x76, 0x55, 0xa2, 0x3c, 0x8e, 0xb4, 0x7e, 0x03, 0xaa, 0xb9, 0xa1,
+	0x0b, 0x09, 0xd4, 0x3f, 0x0a, 0xf0, 0xe2, 0x09, 0xe7, 0x45, 0xc8, 0x54, 0x90, 0xf8, 0x36, 0xd5,
+	0x43, 0x4c, 0x46, 0x2b, 0x5a, 0x95, 0x20, 0xf1, 0x53, 0x38, 0x13, 0x7b, 0x92, 0x02, 0x64, 0x31,
+	0xb0, 0xc6, 0x9c, 0x9c, 0x6d, 0x35, 0xb5, 0x8a, 0x52, 0x60, 0xe8, 0x15, 0x58, 0xa2, 0x3e, 0x1e,
+	0xaa, 0x7d, 0x2f, 0x48, 0x06, 0x25, 0x69, 0xd0, 0x1b, 0xe6, 0x63, 0xe7, 0x11, 0x0d, 0x88, 0xcd,
+	0x47, 0x91, 0xc2, 0xcc, 0xab, 0x7d, 0xd0, 0xf6, 0xfe, 0x28, 0x92, 0xc8, 0x0e, 0x94, 0x5d, 0xca,
+	0x0e, 0xd3, 0x3a, 0x2f, 0xca, 0x3a, 0x7f, 0xeb, 0xf4, 0x05, 0x6c, 0x53, 0x76, 0xa8, 0x2b, 0x1c,
+	0xdc, 0xf1, 0xb3, 0x24, 0xcd, 0xec, 0x28, 0x26, 0xc4, 0x8f, 0x38, 0x1d, 0x78, 0x44, 0x16, 0x52,
+	0xc9, 0xaa, 0x52, 0xb6, 0x37, 0x31, 0xa2, 0x9f, 0xc3, 0xaa, 0x8f, 0x03, 0x3c, 0x24, 0xae, 0x3d,
+	0x14, 0xeb, 0x92, 0xa6, 0x5d, 0x94, 0x69, 0xdf, 0x3d, 0x3d, 0xed, 0x3d, 0xe5, 0x95, 0x15, 0x1f,
+	0xe4, 0x1f, 0xb3, 0xa1, 0xfb, 0x50, 0xc1, 0x8e, 0x43, 0x3c, 0xd1, 0x9c, 0x84, 0x71, 0xfa, 0x65,
+	0x7e, 0xe7, 0xf4, 0xb8, 0x5b, 0x13, 0x74, 0xaa, 0x98, 0xd9, 0x00, 0xe6, 0x6f, 0x0c, 0x40, 0xc7,
+	0x73, 0x8b, 0xea, 0x1d, 0xef, 0x11, 0x27, 0x7e, 0xe4, 0x61, 0x4e, 0xb2, 0x27, 0x77, 0x35, 0x1d,
+	0xed, 0xeb, 0x41, 0xd9, 0x72, 0x7c, 0x08, 0xaf, 0x8c, 0xbd, 0xd4, 0xf4, 0xd5, 0x14, 0x72, 0x4d,
+	0x4a, 0x83, 0x66, 0x0b, 0x47, 0xe5, 0x96, 0x1d, 0x8b, 0x19, 0xc3, 0xca, 0x31, 0xba, 0xe8, 0x2a,
+	0xac, 0x66, 0x08, 0x4f, 0x76, 0x5b, 0xf1, 0x40, 0x99, 0xb1, 0x74, 0xc7, 0xdf, 0x81, 0x95, 0xac,
+	0x87, 0x3a, 0xa4, 0x73, 0xb2, 0x10, 0xeb, 0x38, 0x1b, 0x3f, 0x09, 0xb8, 0xf9, 0x2b, 0x03, 0x60,
+	0xb2, 0xe5, 0xe8, 0x2d, 0xa8, 0x0d, 0xc2, 0x90, 0xdb, 0xb2, 0x64, 0x44, 0x2e, 0x5d, 0x79, 0x15,
+	0x61, 0x15, 0x38, 0x91, 0x04, 0xbd, 0x0d, 0x2b, 0x13, 0x14, 0xa3, 0x8f, 0x89, 0x3d, 0x1c, 0xe8,
+	0x52, 0xaf, 0xa5, 0xc0, 0x1e, 0x7d, 0x4c, 0x6e, 0x0f, 0x44, 0x40, 0x71, 0x22, 0xbc, 0xd0, 0xc1,
+	0x9e, 0xcd, 0x98, 0xcb, 0x34, 0x13, 0x71, 0x24, 0x76, 0x85, 0xb1, 0xc7, 0x5c, 0x66, 0xfe, 0xd6,
+	0x80, 0xc6, 0x69, 0x32, 0x2e, 0x24, 0x87, 0x7c, 0x41, 0x9c, 0x84, 0xe3, 0x81, 0x47, 0xec, 0x03,
+	0xea, 0xa5, 0x9b, 0x50, 0x9b, 0x98, 0x6f, 0x51, 0x8f, 0xa0, 0x5b, 0xb0, 0xa2, 0x2c, 0x42, 0xd7,
+	0x45, 0x73, 0x19, 0x26, 0x6a, 0xe2, 0xe5, 0xcd, 0x97, 0xd3, 0x0a, 0x49, 0x9b, 0xcf, 0x66, 0x5b,
+	0xb7, 0xaf, 0x56, 0x7d, 0xec, 0xd3, 0x57, 0x2e, 0xe6, 0xef, 0x0b, 0xe3, 0xf6, 0x43, 0x75, 0x50,
+	0x68, 0x1b, 0x8a, 0xa2, 0x87, 0x52, 0x89, 0x6b, 0xe7, 0xe8, 0x04, 0x95, 0x5f, 0x53, 0xfc, 0x21,
+	0x96, 0xf2, 0x45, 0x6b, 0xb0, 0xe0, 0x12, 0x8e, 0xa9, 0xa7, 0x0b, 0x41, 0xbf, 0xa1, 0x36, 0xd4,
+	0x25, 0xc0, 0x66, 0x1c, 0xc7, 0x5c, 0x12, 0xd7, 0x2d, 0xeb, 0xfa, 0x31, 0xd6, 0xfd, 0xb4, 0x65,
+	0xb6, 0x64, 0x4f, 0x48, 0x7a, 0xc2, 0x45, 0x18, 0xd1, 0x2e, 0x94, 0x58, 0x32, 0x50, 0x2c, 0xe7,
+	0x25, 0xcb, 0xab, 0xe7, 0x66, 0xa9, 0xfd, 0xac, 0x71, 0x04, 0xf3, 0x01, 0x14, 0x25, 0x77, 0x54,
+	0x86, 0xc5, 0xfd, 0xee, 0xdd, 0xee, 0xfd, 0x87, 0xdd, 0xfa, 0x0b, 0xa8, 0x02, 0xa5, 0x6d, 0xab,
+	0xb3, 0xd5, 0xdf, 0xe9, 0xde, 0xae, 0x1b, 0x62, 0xc8, 0xda, 0xef, 0x76, 0xc5, 0xcb, 0x1c, 0x5a,
+	0x82, 0x62, 0xc7, 0xb2, 0xee, 0x5b, 0xf5, 0x82, 0x40, 0xb5, 0x3b, 0xbb, 0x1d, 0x89, 0x9a, 0x17,
+	0x6f, 0xfb, 0x7b, 0x6d, 0xe5, 0x53, 0x34, 0x7f, 0x00, 0xa5, 0x34, 0x1b, 0x5a, 0x86, 0xf2, 0x7e,
+	0xb7, 0xb7, 0xd7, 0xd9, 0xde, 0xb9, 0xb5, 0xd3, 0x69, 0xd7, 0x5f, 0x40, 0x55, 0x58, 0xda, 0xef,
+	0xde, 0xe9, 0x6c, 0xed, 0xf6, 0xef, 0x7c, 0x5a, 0x37, 0x50, 0x1d, 0x2a, 0xbd, 0xfe, 0xd6, 0x6e,
+	0xc7, 0xee, 0xf5, 0xb7, 0xfa, 0xfb, 0xbd, 0xfa, 0x9c, 0xf9, 0x2f, 0x03, 0x6a, 0xf9, 0x3e, 0x42,
+	0x28, 0xae, 0x52, 0xc9, 0x23, 0x12, 0x33, 0x1a, 0x06, 0x69, 0x63, 0x28, 0x8d, 0x0f, 0x94, 0x0d,
+	0x7d, 0x22, 0x2f, 0x13, 0x11, 0x89, 0x39, 0xd5, 0x6a, 0x7b, 0xe6, 0x37, 0x24, 0x9f, 0xa2, 0xb9,
+	0x37, 0x76, 0x55, 0xdf, 0x90, 0x4c, 0xac, 0xf5, 0x0f, 0x61, 0x79, 0x6a, 0xf8, 0x42, 0xdf, 0x91,
+	0x7f, 0xce, 0x41, 0x2d, 0xdf, 0x3f, 0xa3, 0x9f, 0x42, 0xe5, 0x91, 0x7b, 0xc0, 0xec, 0xb4, 0xff,
+	0x36, 0x24, 0xdb, 0x0f, 0xce, 0xdb, 0x7f, 0x37, 0xef, 0xb8, 0x07, 0x4c, 0x3f, 0x2b, 0xba, 0xe5,
+	0x47, 0x13, 0x8b, 0x88, 0x3e, 0xc2, 0x71, 0x30, 0x8e, 0x3e, 0x77, 0xc1, 0xe8, 0x9f, 0xe2, 0x38,
+	0xc8, 0x47, 0x1f, 0x4d, 0x2c, 0xeb, 0x1f, 0x41, 0x7d, 0x3a, 0xfd, 0xac, 0xe5, 0x28, 0x64, 0x96,
+	0x43, 0xf8, 0x4f, 0x27, 0xb8, 0x88, 0xbf, 0xf9, 0x17, 0x03, 0x56, 0xb7, 0x63, 0x82, 0x79, 0xda,
+	0x03, 0x58, 0xe4, 0xb3, 0x84, 0x30, 0x3e, 0xeb, 0x36, 0xb9, 0x06, 0x0b, 0x31, 0x19, 0x8a, 0xea,
+	0x51, 0x6a, 0xa7, 0xdf, 0xd0, 0x0d, 0x58, 0xd4, 0x97, 0x09, 0x2d, 0x23, 0x6f, 0xcc, 0x5c, 0x28,
+	0x2b, 0xf5, 0x10, 0x39, 0x63, 0x95, 0x5e, 0xe4, 0x54, 0x1f, 0xe7, 0x25, 0x6d, 0xd9, 0x71, 0xcd,
+	0xff, 0xce, 0xc1, 0xea, 0x7e, 0xe4, 0xfe, 0x1f, 0x5c, 0x8b, 0x39, 0xae, 0xe7, 0xb8, 0x11, 0x67,
+	0xa6, 0x53, 0xb8, 0xf0, 0x74, 0x7e, 0x06, 0xaf, 0x0d, 0x63, 0xec, 0x90, 0x83, 0xc4, 0xb3, 0x5d,
+	0xe2, 0x84, 0xbe, 0x4f, 0x19, 0xcb, 0x0a, 0xed, 0xc2, 0x2c, 0xa1, 0x7d, 0x25, 0xf5, 0x6f, 0x67,
+	0xdc, 0xb5, 0xe6, 0xa2, 0x1b, 0x50, 0x4e, 0xe4, 0x6a, 0xc8, 0x5f, 0x0c, 0xf4, 0x55, 0xf9, 0xb8,
+	0xfe, 0xdd, 0xa2, 0xc4, 0x73, 0xef, 0x61, 0x76, 0x68, 0x81, 0x82, 0x8b, 0xe7, 0xa9, 0xa5, 0x5e,
+	0x9c, 0x5e, 0xea, 0xaf, 0x0c, 0x58, 0x6d, 0x13, 0x8f, 0x3c, 0xaf, 0xb2, 0x38, 0xc7, 0x52, 0x4f,
+	0xdf, 0xb1, 0xe7, 0x8f, 0xdf, 0xb1, 0xf3, 0xa4, 0x8b, 0xd3, 0xa4, 0x7d, 0x58, 0xb9, 0x4d, 0xf8,
+	0xd7, 0x45, 0xd8, 0xfc, 0x83, 0x01, 0x2f, 0xee, 0x52, 0x96, 0x26, 0x64, 0x17, 0xce, 0x38, 0x9f,
+	0xcb, 0xb8, 0x06, 0x0b, 0x07, 0xd4, 0x13, 0x95, 0xa6, 0xab, 0x54, 0xbd, 0x89, 0xa6, 0x36, 0x12,
+	0x6a, 0x2d, 0x9a, 0x06, 0xdd, 0x09, 0x94, 0x84, 0x41, 0x74, 0x0b, 0x32, 0x97, 0x18, 0xe4, 0xe1,
+	0x21, 0x49, 0xa7, 0x20, 0xe1, 0x7d, 0x61, 0x30, 0x9f, 0xc2, 0x6a, 0x9e, 0x21, 0x8b, 0xc2, 0x80,
+	0x89, 0xae, 0xab, 0x94, 0xfe, 0x66, 0xa6, 0xd5, 0xf2, 0x1c, 0x75, 0x3d, 0x76, 0x41, 0xdf, 0x86,
+	0xe5, 0x80, 0x7c, 0xc1, 0xed, 0x4c, 0x6a, 0xb5, 0x3e, 0x55, 0x61, 0xde, 0x1b, 0xa7, 0x8f, 0x61,
+	0xad, 0x4d, 0xf1, 0x30, 0x08, 0xd9, 0xd7, 0x56, 0x46, 0xe6, 0xf7, 0x4f, 0xc8, 0xc9, 0x12, 0x8f,
+	0x33, 0x91, 0x33, 0x4c, 0x78, 0x94, 0xf0, 0x4c, 0x33, 0xb8, 0xa4, 0x2c, 0xfb, 0x31, 0xdd, 0xfc,
+	0xaa, 0x04, 0x2b, 0x93, 0x7b, 0x10, 0x8f, 0x43, 0xcf, 0x23, 0x31, 0xfa, 0xa3, 0x01, 0xd5, 0x9c,
+	0x3e, 0xa2, 0xe6, 0x19, 0x2b, 0x75, 0x82, 0x90, 0xae, 0xbf, 0x96, 0xe2, 0x33, 0xbf, 0x15, 0x36,
+	0xef, 0xa7, 0xbf, 0x15, 0x9a, 0xed, 0x5f, 0xfe, 0xfb, 0x3f, 0xbf, 0x9b, 0xfb, 0xc8, 0x7c, 0xaf,
+	0x75, 0x74, 0xad, 0xa5, 0x57, 0x80, 0xb5, 0x9e, 0x4c, 0x56, 0xe7, 0x69, 0x4b, 0x4d, 0x9e, 0xb5,
+	0x9e, 0xa8, 0x87, 0xa7, 0xe3, 0xdf, 0x3b, 0xaf, 0x8f, 0xa5, 0xe6, 0xaf, 0x06, 0x54, 0x73, 0xd2,
+	0x78, 0x16, 0xcd, 0x93, 0x34, 0x74, 0x16, 0xcd, 0x9e, 0xa4, 0x79, 0x6f, 0xf3, 0xe6, 0x33, 0xd0,
+	0x6c, 0x3d, 0xc9, 0x6e, 0xda, 0xd3, 0x09, 0xeb, 0x2f, 0x0d, 0xa8, 0xe6, 0x54, 0xe6, 0x2c, 0xd6,
+	0x27, 0xc9, 0xd1, 0x2c, 0xd6, 0x3f, 0x92, 0xac, 0xdb, 0x57, 0x9e, 0x03, 0x6b, 0xf4, 0x67, 0x03,
+	0x60, 0x22, 0x2f, 0xe8, 0x8c, 0x0b, 0xd4, 0x31, 0x11, 0x5a, 0x9f, 0x7d, 0xba, 0x52, 0xaa, 0xe8,
+	0x79, 0x50, 0xfd, 0xd2, 0x80, 0x4a, 0xf6, 0xdc, 0xa3, 0x33, 0xba, 0xef, 0x13, 0x14, 0x6c, 0xbd,
+	0x79, 0x5e, 0xb8, 0x92, 0x13, 0xf3, 0x86, 0xe4, 0xfe, 0x3d, 0xf4, 0x2c, 0x35, 0x8c, 0xfe, 0x6e,
+	0xc0, 0xf2, 0xd4, 0x89, 0x45, 0x57, 0xcf, 0xba, 0x6c, 0x9f, 0x24, 0x28, 0xb3, 0x0a, 0xe1, 0x81,
+	0x64, 0xb8, 0x67, 0xde, 0x7d, 0x0e, 0xe5, 0xeb, 0x6a, 0x06, 0xd7, 0x8d, 0x2b, 0x37, 0x3f, 0x83,
+	0x57, 0x9d, 0xd0, 0x3f, 0x95, 0xed, 0xcd, 0xf4, 0x52, 0xc4, 0xf6, 0xc4, 0xe7, 0x78, 0xcf, 0xf8,
+	0xc9, 0xc7, 0x1a, 0x3a, 0x0c, 0x3d, 0x1c, 0x0c, 0x9b, 0x61, 0x3c, 0x6c, 0x0d, 0x49, 0x20, 0x3f,
+	0xd6, 0x2d, 0x35, 0x84, 0x23, 0xca, 0x8e, 0xff, 0x0b, 0xe2, 0x46, 0xfa, 0x3c, 0x58, 0x90, 0xe0,
+	0xf7, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x97, 0xd2, 0xcf, 0x0f, 0x19, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2017,141 +2179,3 @@ var _ClusterController_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dataproc/v1/clusters.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1/clusters.proto", fileDescriptor_clusters_7d2ba1001a92fd64)
-}
-
-var fileDescriptor_clusters_7d2ba1001a92fd64 = []byte{
-	// 2079 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x73, 0x1c, 0x47,
-	0x15, 0xcf, 0x68, 0xb5, 0xd2, 0xea, 0xed, 0x87, 0x56, 0x1d, 0x45, 0x6c, 0x94, 0x84, 0x38, 0x93,
-	0x80, 0x15, 0x27, 0xec, 0xda, 0x0a, 0x14, 0x89, 0x4d, 0x42, 0x64, 0xed, 0xda, 0x16, 0x96, 0xd7,
-	0x62, 0x76, 0x65, 0x27, 0x14, 0x30, 0xd5, 0x3b, 0xd3, 0x5a, 0x37, 0x9a, 0xaf, 0x4c, 0xf7, 0x28,
-	0x59, 0xbb, 0x7c, 0x81, 0x2a, 0xaa, 0x28, 0x8e, 0x54, 0x71, 0xe6, 0x00, 0x55, 0x90, 0x63, 0xe0,
-	0xc4, 0x3f, 0xc0, 0x85, 0xe2, 0xc2, 0xbf, 0xc0, 0x81, 0x3f, 0x83, 0xea, 0x8f, 0xd9, 0x9d, 0x59,
-	0x7d, 0xac, 0x64, 0x5c, 0x39, 0x69, 0xe6, 0xf5, 0xef, 0xbd, 0xf7, 0xeb, 0xee, 0xd7, 0xbf, 0x79,
-	0xbd, 0x82, 0xcb, 0xc3, 0x30, 0x1c, 0x7a, 0xa4, 0xe5, 0x78, 0x61, 0xe2, 0xb6, 0x5c, 0xcc, 0x71,
-	0x14, 0x87, 0x4e, 0xeb, 0xe8, 0x5a, 0xcb, 0xf1, 0x12, 0xc6, 0x49, 0xcc, 0x9a, 0x51, 0x1c, 0xf2,
-	0x10, 0x35, 0x14, 0xb0, 0x29, 0x81, 0xcd, 0x14, 0xd8, 0x3c, 0xba, 0xb6, 0xfe, 0xaa, 0x0e, 0x81,
-	0x23, 0xda, 0xc2, 0x41, 0x10, 0x72, 0xcc, 0x69, 0x18, 0x68, 0xbf, 0xf5, 0xb7, 0x4f, 0x4d, 0x10,
-	0x46, 0x24, 0xce, 0x41, 0xdf, 0xd4, 0x50, 0x2f, 0x0c, 0x86, 0x71, 0x12, 0x04, 0x34, 0x18, 0x1e,
-	0x07, 0x7d, 0x53, 0x83, 0xe4, 0xdb, 0x20, 0x39, 0x68, 0xb9, 0x89, 0x02, 0xe8, 0xf1, 0x4b, 0xd3,
-	0xe3, 0x07, 0x94, 0x78, 0xae, 0xed, 0x63, 0x76, 0xa8, 0x11, 0xaf, 0x4f, 0x23, 0x38, 0xf5, 0x09,
-	0xe3, 0xd8, 0x8f, 0x14, 0xc0, 0xfc, 0xf5, 0x3c, 0x2c, 0x6e, 0xab, 0xd9, 0xa3, 0xd7, 0x00, 0xa2,
-	0x38, 0xfc, 0x05, 0x71, 0xb8, 0x4d, 0xdd, 0x86, 0x71, 0xc9, 0xd8, 0x58, 0xb2, 0x96, 0xb4, 0x65,
-	0xc7, 0x45, 0x6f, 0x40, 0x45, 0xaf, 0x93, 0x1d, 0x60, 0x9f, 0x34, 0xe6, 0x24, 0xa0, 0xac, 0x6d,
-	0x5d, 0xec, 0x13, 0xf4, 0x43, 0x58, 0x70, 0xc2, 0xe0, 0x80, 0x0e, 0x1b, 0x85, 0x4b, 0xc6, 0x46,
-	0x79, 0xf3, 0x72, 0xf3, 0xb4, 0x95, 0x6c, 0xea, 0xa4, 0xdb, 0x12, 0x6e, 0x69, 0x37, 0xd4, 0x81,
-	0x05, 0x0f, 0x0f, 0x88, 0xc7, 0x1a, 0xa5, 0x4b, 0x85, 0x8d, 0xf2, 0xe6, 0x77, 0x66, 0x06, 0x68,
-	0xee, 0x4a, 0x7c, 0x27, 0xe0, 0xf1, 0xc8, 0xd2, 0xce, 0x82, 0x07, 0xe3, 0x98, 0x27, 0xac, 0x31,
-	0x7f, 0x4e, 0x1e, 0x3d, 0x09, 0xb7, 0xb4, 0x1b, 0xea, 0x42, 0x4d, 0x3d, 0xd9, 0x8f, 0x28, 0xe3,
-	0x61, 0x3c, 0x6a, 0x2c, 0x4a, 0x3e, 0xe7, 0x0e, 0x54, 0x55, 0xee, 0x77, 0x94, 0x77, 0x76, 0xed,
-	0x92, 0x84, 0xba, 0x8d, 0x85, 0xdc, 0xda, 0xed, 0x27, 0xd4, 0x45, 0x37, 0x61, 0xd1, 0x27, 0x3c,
-	0xa6, 0x0e, 0x6b, 0x2c, 0x49, 0xd2, 0x1b, 0x33, 0x73, 0xdd, 0x53, 0x78, 0x2b, 0x75, 0x5c, 0xff,
-	0x00, 0xca, 0x99, 0xe5, 0x40, 0x75, 0x28, 0x1c, 0x92, 0x91, 0xde, 0x49, 0xf1, 0x88, 0x56, 0xa1,
-	0x78, 0x84, 0xbd, 0x24, 0xdd, 0x3c, 0xf5, 0x72, 0x7d, 0xee, 0x7d, 0xc3, 0xfc, 0x5b, 0x11, 0xaa,
-	0xb9, 0x3d, 0x41, 0x6f, 0x42, 0x55, 0xed, 0x8a, 0x3d, 0x48, 0x9c, 0x43, 0xc2, 0x75, 0x9c, 0x8a,
-	0x32, 0xde, 0x94, 0x36, 0xf4, 0x09, 0xa0, 0xa1, 0x43, 0xec, 0x74, 0x72, 0x7a, 0xf7, 0x4b, 0x72,
-	0x02, 0x57, 0x4e, 0x9f, 0xc0, 0x6d, 0x87, 0xe4, 0x0b, 0xa0, 0x3e, 0x9c, 0xb2, 0x20, 0x0b, 0xaa,
-	0x3e, 0xce, 0x06, 0x55, 0xab, 0x72, 0x46, 0x45, 0xec, 0x04, 0x8c, 0xe3, 0xc0, 0x21, 0xb7, 0xe3,
-	0x30, 0x89, 0x74, 0xdc, 0x8a, 0x8a, 0x31, 0x89, 0xf9, 0x79, 0x18, 0x1f, 0x4e, 0x62, 0xc2, 0x33,
-	0xc5, 0x54, 0x31, 0x74, 0x4c, 0x02, 0xdf, 0x60, 0xc4, 0x09, 0x03, 0x17, 0xc7, 0x23, 0x3b, 0x1f,
-	0xbd, 0xf2, 0x2c, 0xd1, 0x5f, 0x1a, 0x47, 0x7b, 0x98, 0x4d, 0xf3, 0x63, 0x58, 0x66, 0xe1, 0x01,
-	0xff, 0x1c, 0xc7, 0x24, 0x0d, 0x5f, 0x9d, 0x55, 0x26, 0x3d, 0xed, 0xa0, 0x23, 0xd7, 0x58, 0xee,
-	0x1d, 0x51, 0x58, 0xa3, 0x01, 0xe5, 0x14, 0x7b, 0xf4, 0xb1, 0x94, 0x15, 0x1b, 0x3b, 0x52, 0x7e,
-	0x1a, 0x65, 0x59, 0xec, 0x9b, 0xa7, 0x47, 0xee, 0x86, 0x2e, 0xd9, 0xc9, 0xf9, 0x6e, 0x49, 0x57,
-	0xeb, 0x25, 0x7a, 0x82, 0x95, 0xa1, 0x87, 0xb0, 0x42, 0x02, 0x27, 0x1e, 0x45, 0x32, 0x8d, 0xe6,
-	0xbf, 0x3c, 0xab, 0x4a, 0x3a, 0x63, 0x97, 0xb4, 0x4a, 0xc8, 0x94, 0xc5, 0xfc, 0x18, 0xea, 0xd3,
-	0x28, 0xf4, 0x2e, 0xbc, 0x28, 0x6a, 0x32, 0x72, 0xed, 0x43, 0x9f, 0xd9, 0x87, 0x64, 0xa4, 0xf4,
-	0x4a, 0x95, 0xef, 0xf2, 0xd0, 0x21, 0x7b, 0xee, 0x5d, 0x9f, 0xdd, 0x25, 0x23, 0xa1, 0x59, 0xe6,
-	0x9f, 0x0a, 0x50, 0x9f, 0x2e, 0x47, 0xf4, 0x32, 0x94, 0x1e, 0x87, 0x01, 0xb1, 0x93, 0x98, 0x6a,
-	0xbf, 0x45, 0xf1, 0xbe, 0x1f, 0x53, 0xf4, 0x3a, 0x94, 0x03, 0xc2, 0xc5, 0x46, 0xcb, 0x51, 0x75,
-	0x90, 0x40, 0x9b, 0x04, 0xe0, 0x5b, 0x50, 0x63, 0xc9, 0x20, 0x8b, 0x51, 0xa7, 0xbd, 0x3a, 0xb1,
-	0x0a, 0xd8, 0x06, 0xd4, 0x69, 0xc0, 0x49, 0x1c, 0x60, 0xcf, 0xa6, 0x91, 0x1d, 0x06, 0x9e, 0x10,
-	0x19, 0x63, 0xa3, 0x64, 0xd5, 0x52, 0xfb, 0x4e, 0x74, 0x3f, 0xf0, 0x46, 0xe8, 0x32, 0x2c, 0x33,
-	0x12, 0x1f, 0x51, 0x87, 0xd8, 0xd8, 0x71, 0xc2, 0x24, 0xe0, 0xf2, 0x80, 0x2d, 0x59, 0x35, 0x6d,
-	0xde, 0x52, 0x56, 0xf4, 0x5d, 0x58, 0x9b, 0x02, 0xda, 0xcc, 0x09, 0x23, 0xc2, 0x1a, 0x85, 0x4b,
-	0x85, 0x8d, 0x25, 0x6b, 0x35, 0x8f, 0xef, 0xc9, 0x31, 0x84, 0x60, 0x9e, 0xe3, 0xa1, 0x90, 0x4a,
-	0x81, 0x91, 0xcf, 0xa8, 0x0f, 0x25, 0x9f, 0x70, 0x2c, 0x36, 0xa3, 0x51, 0x94, 0xc5, 0xf0, 0xfe,
-	0xf9, 0x0f, 0x73, 0xf3, 0x9e, 0x76, 0x55, 0xa2, 0x3c, 0x8e, 0xb4, 0x7e, 0x03, 0xaa, 0xb9, 0xa1,
-	0x0b, 0x09, 0xd4, 0x3f, 0x0a, 0xf0, 0xe2, 0x09, 0xe7, 0x45, 0xc8, 0x54, 0x90, 0xf8, 0x36, 0xd5,
-	0x43, 0x4c, 0x46, 0x2b, 0x5a, 0x95, 0x20, 0xf1, 0x53, 0x38, 0x13, 0x7b, 0x92, 0x02, 0x64, 0x31,
-	0xb0, 0xc6, 0x9c, 0x9c, 0x6d, 0x35, 0xb5, 0x8a, 0x52, 0x60, 0xe8, 0x15, 0x58, 0xa2, 0x3e, 0x1e,
-	0xaa, 0x7d, 0x2f, 0x48, 0x06, 0x25, 0x69, 0xd0, 0x1b, 0xe6, 0x63, 0xe7, 0x11, 0x0d, 0x88, 0xcd,
-	0x47, 0x91, 0xc2, 0xcc, 0xab, 0x7d, 0xd0, 0xf6, 0xfe, 0x28, 0x92, 0xc8, 0x0e, 0x94, 0x5d, 0xca,
-	0x0e, 0xd3, 0x3a, 0x2f, 0xca, 0x3a, 0x7f, 0xeb, 0xf4, 0x05, 0x6c, 0x53, 0x76, 0xa8, 0x2b, 0x1c,
-	0xdc, 0xf1, 0xb3, 0x24, 0xcd, 0xec, 0x28, 0x26, 0xc4, 0x8f, 0x38, 0x1d, 0x78, 0x44, 0x16, 0x52,
-	0xc9, 0xaa, 0x52, 0xb6, 0x37, 0x31, 0xa2, 0x9f, 0xc3, 0xaa, 0x8f, 0x03, 0x3c, 0x24, 0xae, 0x3d,
-	0x14, 0xeb, 0x92, 0xa6, 0x5d, 0x94, 0x69, 0xdf, 0x3d, 0x3d, 0xed, 0x3d, 0xe5, 0x95, 0x15, 0x1f,
-	0xe4, 0x1f, 0xb3, 0xa1, 0xfb, 0x50, 0xc1, 0x8e, 0x43, 0x3c, 0xd1, 0x9c, 0x84, 0x71, 0xfa, 0x65,
-	0x7e, 0xe7, 0xf4, 0xb8, 0x5b, 0x13, 0x74, 0xaa, 0x98, 0xd9, 0x00, 0xe6, 0x6f, 0x0c, 0x40, 0xc7,
-	0x73, 0x8b, 0xea, 0x1d, 0xef, 0x11, 0x27, 0x7e, 0xe4, 0x61, 0x4e, 0xb2, 0x27, 0x77, 0x35, 0x1d,
-	0xed, 0xeb, 0x41, 0xd9, 0x72, 0x7c, 0x08, 0xaf, 0x8c, 0xbd, 0xd4, 0xf4, 0xd5, 0x14, 0x72, 0x4d,
-	0x4a, 0x83, 0x66, 0x0b, 0x47, 0xe5, 0x96, 0x1d, 0x8b, 0x19, 0xc3, 0xca, 0x31, 0xba, 0xe8, 0x2a,
-	0xac, 0x66, 0x08, 0x4f, 0x76, 0x5b, 0xf1, 0x40, 0x99, 0xb1, 0x74, 0xc7, 0xdf, 0x81, 0x95, 0xac,
-	0x87, 0x3a, 0xa4, 0x73, 0xb2, 0x10, 0xeb, 0x38, 0x1b, 0x3f, 0x09, 0xb8, 0xf9, 0x2b, 0x03, 0x60,
-	0xb2, 0xe5, 0xe8, 0x2d, 0xa8, 0x0d, 0xc2, 0x90, 0xdb, 0xb2, 0x64, 0x44, 0x2e, 0x5d, 0x79, 0x15,
-	0x61, 0x15, 0x38, 0x91, 0x04, 0xbd, 0x0d, 0x2b, 0x13, 0x14, 0xa3, 0x8f, 0x89, 0x3d, 0x1c, 0xe8,
-	0x52, 0xaf, 0xa5, 0xc0, 0x1e, 0x7d, 0x4c, 0x6e, 0x0f, 0x44, 0x40, 0x71, 0x22, 0xbc, 0xd0, 0xc1,
-	0x9e, 0xcd, 0x98, 0xcb, 0x34, 0x13, 0x71, 0x24, 0x76, 0x85, 0xb1, 0xc7, 0x5c, 0x66, 0xfe, 0xd6,
-	0x80, 0xc6, 0x69, 0x32, 0x2e, 0x24, 0x87, 0x7c, 0x41, 0x9c, 0x84, 0xe3, 0x81, 0x47, 0xec, 0x03,
-	0xea, 0xa5, 0x9b, 0x50, 0x9b, 0x98, 0x6f, 0x51, 0x8f, 0xa0, 0x5b, 0xb0, 0xa2, 0x2c, 0x42, 0xd7,
-	0x45, 0x73, 0x19, 0x26, 0x6a, 0xe2, 0xe5, 0xcd, 0x97, 0xd3, 0x0a, 0x49, 0x9b, 0xcf, 0x66, 0x5b,
-	0xb7, 0xaf, 0x56, 0x7d, 0xec, 0xd3, 0x57, 0x2e, 0xe6, 0xef, 0x0b, 0xe3, 0xf6, 0x43, 0x75, 0x50,
-	0x68, 0x1b, 0x8a, 0xa2, 0x87, 0x52, 0x89, 0x6b, 0xe7, 0xe8, 0x04, 0x95, 0x5f, 0x53, 0xfc, 0x21,
-	0x96, 0xf2, 0x45, 0x6b, 0xb0, 0xe0, 0x12, 0x8e, 0xa9, 0xa7, 0x0b, 0x41, 0xbf, 0xa1, 0x36, 0xd4,
-	0x25, 0xc0, 0x66, 0x1c, 0xc7, 0x5c, 0x12, 0xd7, 0x2d, 0xeb, 0xfa, 0x31, 0xd6, 0xfd, 0xb4, 0x65,
-	0xb6, 0x64, 0x4f, 0x48, 0x7a, 0xc2, 0x45, 0x18, 0xd1, 0x2e, 0x94, 0x58, 0x32, 0x50, 0x2c, 0xe7,
-	0x25, 0xcb, 0xab, 0xe7, 0x66, 0xa9, 0xfd, 0xac, 0x71, 0x04, 0xf3, 0x01, 0x14, 0x25, 0x77, 0x54,
-	0x86, 0xc5, 0xfd, 0xee, 0xdd, 0xee, 0xfd, 0x87, 0xdd, 0xfa, 0x0b, 0xa8, 0x02, 0xa5, 0x6d, 0xab,
-	0xb3, 0xd5, 0xdf, 0xe9, 0xde, 0xae, 0x1b, 0x62, 0xc8, 0xda, 0xef, 0x76, 0xc5, 0xcb, 0x1c, 0x5a,
-	0x82, 0x62, 0xc7, 0xb2, 0xee, 0x5b, 0xf5, 0x82, 0x40, 0xb5, 0x3b, 0xbb, 0x1d, 0x89, 0x9a, 0x17,
-	0x6f, 0xfb, 0x7b, 0x6d, 0xe5, 0x53, 0x34, 0x7f, 0x00, 0xa5, 0x34, 0x1b, 0x5a, 0x86, 0xf2, 0x7e,
-	0xb7, 0xb7, 0xd7, 0xd9, 0xde, 0xb9, 0xb5, 0xd3, 0x69, 0xd7, 0x5f, 0x40, 0x55, 0x58, 0xda, 0xef,
-	0xde, 0xe9, 0x6c, 0xed, 0xf6, 0xef, 0x7c, 0x5a, 0x37, 0x50, 0x1d, 0x2a, 0xbd, 0xfe, 0xd6, 0x6e,
-	0xc7, 0xee, 0xf5, 0xb7, 0xfa, 0xfb, 0xbd, 0xfa, 0x9c, 0xf9, 0x2f, 0x03, 0x6a, 0xf9, 0x3e, 0x42,
-	0x28, 0xae, 0x52, 0xc9, 0x23, 0x12, 0x33, 0x1a, 0x06, 0x69, 0x63, 0x28, 0x8d, 0x0f, 0x94, 0x0d,
-	0x7d, 0x22, 0x2f, 0x13, 0x11, 0x89, 0x39, 0xd5, 0x6a, 0x7b, 0xe6, 0x37, 0x24, 0x9f, 0xa2, 0xb9,
-	0x37, 0x76, 0x55, 0xdf, 0x90, 0x4c, 0xac, 0xf5, 0x0f, 0x61, 0x79, 0x6a, 0xf8, 0x42, 0xdf, 0x91,
-	0x7f, 0xce, 0x41, 0x2d, 0xdf, 0x3f, 0xa3, 0x9f, 0x42, 0xe5, 0x91, 0x7b, 0xc0, 0xec, 0xb4, 0xff,
-	0x36, 0x24, 0xdb, 0x0f, 0xce, 0xdb, 0x7f, 0x37, 0xef, 0xb8, 0x07, 0x4c, 0x3f, 0x2b, 0xba, 0xe5,
-	0x47, 0x13, 0x8b, 0x88, 0x3e, 0xc2, 0x71, 0x30, 0x8e, 0x3e, 0x77, 0xc1, 0xe8, 0x9f, 0xe2, 0x38,
-	0xc8, 0x47, 0x1f, 0x4d, 0x2c, 0xeb, 0x1f, 0x41, 0x7d, 0x3a, 0xfd, 0xac, 0xe5, 0x28, 0x64, 0x96,
-	0x43, 0xf8, 0x4f, 0x27, 0xb8, 0x88, 0xbf, 0xf9, 0x17, 0x03, 0x56, 0xb7, 0x63, 0x82, 0x79, 0xda,
-	0x03, 0x58, 0xe4, 0xb3, 0x84, 0x30, 0x3e, 0xeb, 0x36, 0xb9, 0x06, 0x0b, 0x31, 0x19, 0x8a, 0xea,
-	0x51, 0x6a, 0xa7, 0xdf, 0xd0, 0x0d, 0x58, 0xd4, 0x97, 0x09, 0x2d, 0x23, 0x6f, 0xcc, 0x5c, 0x28,
-	0x2b, 0xf5, 0x10, 0x39, 0x63, 0x95, 0x5e, 0xe4, 0x54, 0x1f, 0xe7, 0x25, 0x6d, 0xd9, 0x71, 0xcd,
-	0xff, 0xce, 0xc1, 0xea, 0x7e, 0xe4, 0xfe, 0x1f, 0x5c, 0x8b, 0x39, 0xae, 0xe7, 0xb8, 0x11, 0x67,
-	0xa6, 0x53, 0xb8, 0xf0, 0x74, 0x7e, 0x06, 0xaf, 0x0d, 0x63, 0xec, 0x90, 0x83, 0xc4, 0xb3, 0x5d,
-	0xe2, 0x84, 0xbe, 0x4f, 0x19, 0xcb, 0x0a, 0xed, 0xc2, 0x2c, 0xa1, 0x7d, 0x25, 0xf5, 0x6f, 0x67,
-	0xdc, 0xb5, 0xe6, 0xa2, 0x1b, 0x50, 0x4e, 0xe4, 0x6a, 0xc8, 0x5f, 0x0c, 0xf4, 0x55, 0xf9, 0xb8,
-	0xfe, 0xdd, 0xa2, 0xc4, 0x73, 0xef, 0x61, 0x76, 0x68, 0x81, 0x82, 0x8b, 0xe7, 0xa9, 0xa5, 0x5e,
-	0x9c, 0x5e, 0xea, 0xaf, 0x0c, 0x58, 0x6d, 0x13, 0x8f, 0x3c, 0xaf, 0xb2, 0x38, 0xc7, 0x52, 0x4f,
-	0xdf, 0xb1, 0xe7, 0x8f, 0xdf, 0xb1, 0xf3, 0xa4, 0x8b, 0xd3, 0xa4, 0x7d, 0x58, 0xb9, 0x4d, 0xf8,
-	0xd7, 0x45, 0xd8, 0xfc, 0x83, 0x01, 0x2f, 0xee, 0x52, 0x96, 0x26, 0x64, 0x17, 0xce, 0x38, 0x9f,
-	0xcb, 0xb8, 0x06, 0x0b, 0x07, 0xd4, 0x13, 0x95, 0xa6, 0xab, 0x54, 0xbd, 0x89, 0xa6, 0x36, 0x12,
-	0x6a, 0x2d, 0x9a, 0x06, 0xdd, 0x09, 0x94, 0x84, 0x41, 0x74, 0x0b, 0x32, 0x97, 0x18, 0xe4, 0xe1,
-	0x21, 0x49, 0xa7, 0x20, 0xe1, 0x7d, 0x61, 0x30, 0x9f, 0xc2, 0x6a, 0x9e, 0x21, 0x8b, 0xc2, 0x80,
-	0x89, 0xae, 0xab, 0x94, 0xfe, 0x66, 0xa6, 0xd5, 0xf2, 0x1c, 0x75, 0x3d, 0x76, 0x41, 0xdf, 0x86,
-	0xe5, 0x80, 0x7c, 0xc1, 0xed, 0x4c, 0x6a, 0xb5, 0x3e, 0x55, 0x61, 0xde, 0x1b, 0xa7, 0x8f, 0x61,
-	0xad, 0x4d, 0xf1, 0x30, 0x08, 0xd9, 0xd7, 0x56, 0x46, 0xe6, 0xf7, 0x4f, 0xc8, 0xc9, 0x12, 0x8f,
-	0x33, 0x91, 0x33, 0x4c, 0x78, 0x94, 0xf0, 0x4c, 0x33, 0xb8, 0xa4, 0x2c, 0xfb, 0x31, 0xdd, 0xfc,
-	0xaa, 0x04, 0x2b, 0x93, 0x7b, 0x10, 0x8f, 0x43, 0xcf, 0x23, 0x31, 0xfa, 0xa3, 0x01, 0xd5, 0x9c,
-	0x3e, 0xa2, 0xe6, 0x19, 0x2b, 0x75, 0x82, 0x90, 0xae, 0xbf, 0x96, 0xe2, 0x33, 0xbf, 0x15, 0x36,
-	0xef, 0xa7, 0xbf, 0x15, 0x9a, 0xed, 0x5f, 0xfe, 0xfb, 0x3f, 0xbf, 0x9b, 0xfb, 0xc8, 0x7c, 0xaf,
-	0x75, 0x74, 0xad, 0xa5, 0x57, 0x80, 0xb5, 0x9e, 0x4c, 0x56, 0xe7, 0x69, 0x4b, 0x4d, 0x9e, 0xb5,
-	0x9e, 0xa8, 0x87, 0xa7, 0xe3, 0xdf, 0x3b, 0xaf, 0x8f, 0xa5, 0xe6, 0xaf, 0x06, 0x54, 0x73, 0xd2,
-	0x78, 0x16, 0xcd, 0x93, 0x34, 0x74, 0x16, 0xcd, 0x9e, 0xa4, 0x79, 0x6f, 0xf3, 0xe6, 0x33, 0xd0,
-	0x6c, 0x3d, 0xc9, 0x6e, 0xda, 0xd3, 0x09, 0xeb, 0x2f, 0x0d, 0xa8, 0xe6, 0x54, 0xe6, 0x2c, 0xd6,
-	0x27, 0xc9, 0xd1, 0x2c, 0xd6, 0x3f, 0x92, 0xac, 0xdb, 0x57, 0x9e, 0x03, 0x6b, 0xf4, 0x67, 0x03,
-	0x60, 0x22, 0x2f, 0xe8, 0x8c, 0x0b, 0xd4, 0x31, 0x11, 0x5a, 0x9f, 0x7d, 0xba, 0x52, 0xaa, 0xe8,
-	0x79, 0x50, 0xfd, 0xd2, 0x80, 0x4a, 0xf6, 0xdc, 0xa3, 0x33, 0xba, 0xef, 0x13, 0x14, 0x6c, 0xbd,
-	0x79, 0x5e, 0xb8, 0x92, 0x13, 0xf3, 0x86, 0xe4, 0xfe, 0x3d, 0xf4, 0x2c, 0x35, 0x8c, 0xfe, 0x6e,
-	0xc0, 0xf2, 0xd4, 0x89, 0x45, 0x57, 0xcf, 0xba, 0x6c, 0x9f, 0x24, 0x28, 0xb3, 0x0a, 0xe1, 0x81,
-	0x64, 0xb8, 0x67, 0xde, 0x7d, 0x0e, 0xe5, 0xeb, 0x6a, 0x06, 0xd7, 0x8d, 0x2b, 0x37, 0x3f, 0x83,
-	0x57, 0x9d, 0xd0, 0x3f, 0x95, 0xed, 0xcd, 0xf4, 0x52, 0xc4, 0xf6, 0xc4, 0xe7, 0x78, 0xcf, 0xf8,
-	0xc9, 0xc7, 0x1a, 0x3a, 0x0c, 0x3d, 0x1c, 0x0c, 0x9b, 0x61, 0x3c, 0x6c, 0x0d, 0x49, 0x20, 0x3f,
-	0xd6, 0x2d, 0x35, 0x84, 0x23, 0xca, 0x8e, 0xff, 0x0b, 0xe2, 0x46, 0xfa, 0x3c, 0x58, 0x90, 0xe0,
-	0xf7, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x97, 0xd2, 0xcf, 0x0f, 0x19, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dataproc/v1/jobs.pb.go b/googleapis/cloud/dataproc/v1/jobs.pb.go
index 43daa052d3..544f1f78ba 100644
--- a/googleapis/cloud/dataproc/v1/jobs.pb.go
+++ b/googleapis/cloud/dataproc/v1/jobs.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/jobs.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The Log4j level for job execution. When running an
 // [Apache Hive](http://hive.apache.org/) job, Cloud
@@ -64,6 +64,7 @@ var LoggingConfig_Level_name = map[int32]string{
 	7: "FATAL",
 	8: "OFF",
 }
+
 var LoggingConfig_Level_value = map[string]int32{
 	"LEVEL_UNSPECIFIED": 0,
 	"ALL":               1,
@@ -79,8 +80,9 @@ var LoggingConfig_Level_value = map[string]int32{
 func (x LoggingConfig_Level) String() string {
 	return proto.EnumName(LoggingConfig_Level_name, int32(x))
 }
+
 func (LoggingConfig_Level) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{0, 0}
+	return fileDescriptor_37e0b42bcf4d103b, []int{0, 0}
 }
 
 // The job state.
@@ -126,6 +128,7 @@ var JobStatus_State_name = map[int32]string{
 	6: "ERROR",
 	9: "ATTEMPT_FAILURE",
 }
+
 var JobStatus_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"PENDING":           1,
@@ -142,8 +145,9 @@ var JobStatus_State_value = map[string]int32{
 func (x JobStatus_State) String() string {
 	return proto.EnumName(JobStatus_State_name, int32(x))
 }
+
 func (JobStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{9, 0}
+	return fileDescriptor_37e0b42bcf4d103b, []int{9, 0}
 }
 
 // The job substate.
@@ -176,6 +180,7 @@ var JobStatus_Substate_name = map[int32]string{
 	2: "QUEUED",
 	3: "STALE_STATUS",
 }
+
 var JobStatus_Substate_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"SUBMITTED":    1,
@@ -186,8 +191,9 @@ var JobStatus_Substate_value = map[string]int32{
 func (x JobStatus_Substate) String() string {
 	return proto.EnumName(JobStatus_Substate_name, int32(x))
 }
+
 func (JobStatus_Substate) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{9, 1}
+	return fileDescriptor_37e0b42bcf4d103b, []int{9, 1}
 }
 
 // The application state, corresponding to
@@ -226,6 +232,7 @@ var YarnApplication_State_name = map[int32]string{
 	7: "FAILED",
 	8: "KILLED",
 }
+
 var YarnApplication_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"NEW":               1,
@@ -241,8 +248,9 @@ var YarnApplication_State_value = map[string]int32{
 func (x YarnApplication_State) String() string {
 	return proto.EnumName(YarnApplication_State_name, int32(x))
 }
+
 func (YarnApplication_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{11, 0}
+	return fileDescriptor_37e0b42bcf4d103b, []int{11, 0}
 }
 
 // A matcher that specifies categories of job states.
@@ -263,6 +271,7 @@ var ListJobsRequest_JobStateMatcher_name = map[int32]string{
 	1: "ACTIVE",
 	2: "NON_ACTIVE",
 }
+
 var ListJobsRequest_JobStateMatcher_value = map[string]int32{
 	"ALL":        0,
 	"ACTIVE":     1,
@@ -272,8 +281,9 @@ var ListJobsRequest_JobStateMatcher_value = map[string]int32{
 func (x ListJobsRequest_JobStateMatcher) String() string {
 	return proto.EnumName(ListJobsRequest_JobStateMatcher_name, int32(x))
 }
+
 func (ListJobsRequest_JobStateMatcher) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{16, 0}
+	return fileDescriptor_37e0b42bcf4d103b, []int{16, 0}
 }
 
 // The runtime logging config of the job.
@@ -292,16 +302,17 @@ func (m *LoggingConfig) Reset()         { *m = LoggingConfig{} }
 func (m *LoggingConfig) String() string { return proto.CompactTextString(m) }
 func (*LoggingConfig) ProtoMessage()    {}
 func (*LoggingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{0}
+	return fileDescriptor_37e0b42bcf4d103b, []int{0}
 }
+
 func (m *LoggingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LoggingConfig.Unmarshal(m, b)
 }
 func (m *LoggingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LoggingConfig.Marshal(b, m, deterministic)
 }
-func (dst *LoggingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LoggingConfig.Merge(dst, src)
+func (m *LoggingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoggingConfig.Merge(m, src)
 }
 func (m *LoggingConfig) XXX_Size() int {
 	return xxx_messageInfo_LoggingConfig.Size(m)
@@ -366,16 +377,17 @@ func (m *HadoopJob) Reset()         { *m = HadoopJob{} }
 func (m *HadoopJob) String() string { return proto.CompactTextString(m) }
 func (*HadoopJob) ProtoMessage()    {}
 func (*HadoopJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{1}
+	return fileDescriptor_37e0b42bcf4d103b, []int{1}
 }
+
 func (m *HadoopJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HadoopJob.Unmarshal(m, b)
 }
 func (m *HadoopJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HadoopJob.Marshal(b, m, deterministic)
 }
-func (dst *HadoopJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HadoopJob.Merge(dst, src)
+func (m *HadoopJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HadoopJob.Merge(m, src)
 }
 func (m *HadoopJob) XXX_Size() int {
 	return xxx_messageInfo_HadoopJob.Size(m)
@@ -465,72 +477,14 @@ func (m *HadoopJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HadoopJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HadoopJob_OneofMarshaler, _HadoopJob_OneofUnmarshaler, _HadoopJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HadoopJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HadoopJob_MainJarFileUri)(nil),
 		(*HadoopJob_MainClass)(nil),
 	}
 }
 
-func _HadoopJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HadoopJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *HadoopJob_MainJarFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainJarFileUri)
-	case *HadoopJob_MainClass:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainClass)
-	case nil:
-	default:
-		return fmt.Errorf("HadoopJob.Driver has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HadoopJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HadoopJob)
-	switch tag {
-	case 1: // driver.main_jar_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &HadoopJob_MainJarFileUri{x}
-		return true, err
-	case 2: // driver.main_class
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &HadoopJob_MainClass{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HadoopJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HadoopJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *HadoopJob_MainJarFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
-		n += len(x.MainJarFileUri)
-	case *HadoopJob_MainClass:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainClass)))
-		n += len(x.MainClass)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running [Apache Spark](http://spark.apache.org/)
 // applications on YARN.
 type SparkJob struct {
@@ -574,16 +528,17 @@ func (m *SparkJob) Reset()         { *m = SparkJob{} }
 func (m *SparkJob) String() string { return proto.CompactTextString(m) }
 func (*SparkJob) ProtoMessage()    {}
 func (*SparkJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{2}
+	return fileDescriptor_37e0b42bcf4d103b, []int{2}
 }
+
 func (m *SparkJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SparkJob.Unmarshal(m, b)
 }
 func (m *SparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SparkJob.Marshal(b, m, deterministic)
 }
-func (dst *SparkJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SparkJob.Merge(dst, src)
+func (m *SparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkJob.Merge(m, src)
 }
 func (m *SparkJob) XXX_Size() int {
 	return xxx_messageInfo_SparkJob.Size(m)
@@ -673,72 +628,14 @@ func (m *SparkJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SparkJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SparkJob_OneofMarshaler, _SparkJob_OneofUnmarshaler, _SparkJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SparkJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SparkJob_MainJarFileUri)(nil),
 		(*SparkJob_MainClass)(nil),
 	}
 }
 
-func _SparkJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SparkJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *SparkJob_MainJarFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainJarFileUri)
-	case *SparkJob_MainClass:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainClass)
-	case nil:
-	default:
-		return fmt.Errorf("SparkJob.Driver has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SparkJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SparkJob)
-	switch tag {
-	case 1: // driver.main_jar_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &SparkJob_MainJarFileUri{x}
-		return true, err
-	case 2: // driver.main_class
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &SparkJob_MainClass{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SparkJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SparkJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *SparkJob_MainJarFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
-		n += len(x.MainJarFileUri)
-	case *SparkJob_MainClass:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainClass)))
-		n += len(x.MainClass)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running
 // [Apache
 // PySpark](https://spark.apache.org/docs/0.9.0/python-programming-guide.html)
@@ -779,16 +676,17 @@ func (m *PySparkJob) Reset()         { *m = PySparkJob{} }
 func (m *PySparkJob) String() string { return proto.CompactTextString(m) }
 func (*PySparkJob) ProtoMessage()    {}
 func (*PySparkJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{3}
+	return fileDescriptor_37e0b42bcf4d103b, []int{3}
 }
+
 func (m *PySparkJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PySparkJob.Unmarshal(m, b)
 }
 func (m *PySparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PySparkJob.Marshal(b, m, deterministic)
 }
-func (dst *PySparkJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PySparkJob.Merge(dst, src)
+func (m *PySparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PySparkJob.Merge(m, src)
 }
 func (m *PySparkJob) XXX_Size() int {
 	return xxx_messageInfo_PySparkJob.Size(m)
@@ -881,16 +779,17 @@ func (m *QueryList) Reset()         { *m = QueryList{} }
 func (m *QueryList) String() string { return proto.CompactTextString(m) }
 func (*QueryList) ProtoMessage()    {}
 func (*QueryList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{4}
+	return fileDescriptor_37e0b42bcf4d103b, []int{4}
 }
+
 func (m *QueryList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryList.Unmarshal(m, b)
 }
 func (m *QueryList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryList.Marshal(b, m, deterministic)
 }
-func (dst *QueryList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryList.Merge(dst, src)
+func (m *QueryList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryList.Merge(m, src)
 }
 func (m *QueryList) XXX_Size() int {
 	return xxx_messageInfo_QueryList.Size(m)
@@ -943,16 +842,17 @@ func (m *HiveJob) Reset()         { *m = HiveJob{} }
 func (m *HiveJob) String() string { return proto.CompactTextString(m) }
 func (*HiveJob) ProtoMessage()    {}
 func (*HiveJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{5}
+	return fileDescriptor_37e0b42bcf4d103b, []int{5}
 }
+
 func (m *HiveJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HiveJob.Unmarshal(m, b)
 }
 func (m *HiveJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HiveJob.Marshal(b, m, deterministic)
 }
-func (dst *HiveJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HiveJob.Merge(dst, src)
+func (m *HiveJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HiveJob.Merge(m, src)
 }
 func (m *HiveJob) XXX_Size() int {
 	return xxx_messageInfo_HiveJob.Size(m)
@@ -1028,76 +928,14 @@ func (m *HiveJob) GetJarFileUris() []string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HiveJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HiveJob_OneofMarshaler, _HiveJob_OneofUnmarshaler, _HiveJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HiveJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HiveJob_QueryFileUri)(nil),
 		(*HiveJob_QueryList)(nil),
 	}
 }
 
-func _HiveJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HiveJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *HiveJob_QueryFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.QueryFileUri)
-	case *HiveJob_QueryList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QueryList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("HiveJob.Queries has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HiveJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HiveJob)
-	switch tag {
-	case 1: // queries.query_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Queries = &HiveJob_QueryFileUri{x}
-		return true, err
-	case 2: // queries.query_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(QueryList)
-		err := b.DecodeMessage(msg)
-		m.Queries = &HiveJob_QueryList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HiveJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HiveJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *HiveJob_QueryFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
-		n += len(x.QueryFileUri)
-	case *HiveJob_QueryList:
-		s := proto.Size(x.QueryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running [Apache Spark
 // SQL](http://spark.apache.org/sql/) queries.
 type SparkSqlJob struct {
@@ -1128,16 +966,17 @@ func (m *SparkSqlJob) Reset()         { *m = SparkSqlJob{} }
 func (m *SparkSqlJob) String() string { return proto.CompactTextString(m) }
 func (*SparkSqlJob) ProtoMessage()    {}
 func (*SparkSqlJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{6}
+	return fileDescriptor_37e0b42bcf4d103b, []int{6}
 }
+
 func (m *SparkSqlJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SparkSqlJob.Unmarshal(m, b)
 }
 func (m *SparkSqlJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SparkSqlJob.Marshal(b, m, deterministic)
 }
-func (dst *SparkSqlJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SparkSqlJob.Merge(dst, src)
+func (m *SparkSqlJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkSqlJob.Merge(m, src)
 }
 func (m *SparkSqlJob) XXX_Size() int {
 	return xxx_messageInfo_SparkSqlJob.Size(m)
@@ -1213,76 +1052,14 @@ func (m *SparkSqlJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SparkSqlJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SparkSqlJob_OneofMarshaler, _SparkSqlJob_OneofUnmarshaler, _SparkSqlJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SparkSqlJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SparkSqlJob_QueryFileUri)(nil),
 		(*SparkSqlJob_QueryList)(nil),
 	}
 }
 
-func _SparkSqlJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SparkSqlJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *SparkSqlJob_QueryFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.QueryFileUri)
-	case *SparkSqlJob_QueryList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QueryList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SparkSqlJob.Queries has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SparkSqlJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SparkSqlJob)
-	switch tag {
-	case 1: // queries.query_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Queries = &SparkSqlJob_QueryFileUri{x}
-		return true, err
-	case 2: // queries.query_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(QueryList)
-		err := b.DecodeMessage(msg)
-		m.Queries = &SparkSqlJob_QueryList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SparkSqlJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SparkSqlJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *SparkSqlJob_QueryFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
-		n += len(x.QueryFileUri)
-	case *SparkSqlJob_QueryList:
-		s := proto.Size(x.QueryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running [Apache Pig](https://pig.apache.org/)
 // queries on YARN.
 type PigJob struct {
@@ -1319,16 +1096,17 @@ func (m *PigJob) Reset()         { *m = PigJob{} }
 func (m *PigJob) String() string { return proto.CompactTextString(m) }
 func (*PigJob) ProtoMessage()    {}
 func (*PigJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{7}
+	return fileDescriptor_37e0b42bcf4d103b, []int{7}
 }
+
 func (m *PigJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PigJob.Unmarshal(m, b)
 }
 func (m *PigJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PigJob.Marshal(b, m, deterministic)
 }
-func (dst *PigJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PigJob.Merge(dst, src)
+func (m *PigJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PigJob.Merge(m, src)
 }
 func (m *PigJob) XXX_Size() int {
 	return xxx_messageInfo_PigJob.Size(m)
@@ -1411,76 +1189,14 @@ func (m *PigJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PigJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PigJob_OneofMarshaler, _PigJob_OneofUnmarshaler, _PigJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PigJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PigJob_QueryFileUri)(nil),
 		(*PigJob_QueryList)(nil),
 	}
 }
 
-func _PigJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PigJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *PigJob_QueryFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.QueryFileUri)
-	case *PigJob_QueryList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QueryList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PigJob.Queries has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PigJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PigJob)
-	switch tag {
-	case 1: // queries.query_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Queries = &PigJob_QueryFileUri{x}
-		return true, err
-	case 2: // queries.query_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(QueryList)
-		err := b.DecodeMessage(msg)
-		m.Queries = &PigJob_QueryList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PigJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PigJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *PigJob_QueryFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
-		n += len(x.QueryFileUri)
-	case *PigJob_QueryList:
-		s := proto.Size(x.QueryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Cloud Dataproc job config.
 type JobPlacement struct {
 	// Required. The name of the cluster where the job will be submitted.
@@ -1497,16 +1213,17 @@ func (m *JobPlacement) Reset()         { *m = JobPlacement{} }
 func (m *JobPlacement) String() string { return proto.CompactTextString(m) }
 func (*JobPlacement) ProtoMessage()    {}
 func (*JobPlacement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{8}
+	return fileDescriptor_37e0b42bcf4d103b, []int{8}
 }
+
 func (m *JobPlacement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobPlacement.Unmarshal(m, b)
 }
 func (m *JobPlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobPlacement.Marshal(b, m, deterministic)
 }
-func (dst *JobPlacement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobPlacement.Merge(dst, src)
+func (m *JobPlacement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobPlacement.Merge(m, src)
 }
 func (m *JobPlacement) XXX_Size() int {
 	return xxx_messageInfo_JobPlacement.Size(m)
@@ -1552,16 +1269,17 @@ func (m *JobStatus) Reset()         { *m = JobStatus{} }
 func (m *JobStatus) String() string { return proto.CompactTextString(m) }
 func (*JobStatus) ProtoMessage()    {}
 func (*JobStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{9}
+	return fileDescriptor_37e0b42bcf4d103b, []int{9}
 }
+
 func (m *JobStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobStatus.Unmarshal(m, b)
 }
 func (m *JobStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobStatus.Marshal(b, m, deterministic)
 }
-func (dst *JobStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobStatus.Merge(dst, src)
+func (m *JobStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatus.Merge(m, src)
 }
 func (m *JobStatus) XXX_Size() int {
 	return xxx_messageInfo_JobStatus.Size(m)
@@ -1620,16 +1338,17 @@ func (m *JobReference) Reset()         { *m = JobReference{} }
 func (m *JobReference) String() string { return proto.CompactTextString(m) }
 func (*JobReference) ProtoMessage()    {}
 func (*JobReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{10}
+	return fileDescriptor_37e0b42bcf4d103b, []int{10}
 }
+
 func (m *JobReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobReference.Unmarshal(m, b)
 }
 func (m *JobReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobReference.Marshal(b, m, deterministic)
 }
-func (dst *JobReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobReference.Merge(dst, src)
+func (m *JobReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobReference.Merge(m, src)
 }
 func (m *JobReference) XXX_Size() int {
 	return xxx_messageInfo_JobReference.Size(m)
@@ -1680,16 +1399,17 @@ func (m *YarnApplication) Reset()         { *m = YarnApplication{} }
 func (m *YarnApplication) String() string { return proto.CompactTextString(m) }
 func (*YarnApplication) ProtoMessage()    {}
 func (*YarnApplication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{11}
+	return fileDescriptor_37e0b42bcf4d103b, []int{11}
 }
+
 func (m *YarnApplication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_YarnApplication.Unmarshal(m, b)
 }
 func (m *YarnApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_YarnApplication.Marshal(b, m, deterministic)
 }
-func (dst *YarnApplication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_YarnApplication.Merge(dst, src)
+func (m *YarnApplication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YarnApplication.Merge(m, src)
 }
 func (m *YarnApplication) XXX_Size() int {
 	return xxx_messageInfo_YarnApplication.Size(m)
@@ -1789,16 +1509,17 @@ func (m *Job) Reset()         { *m = Job{} }
 func (m *Job) String() string { return proto.CompactTextString(m) }
 func (*Job) ProtoMessage()    {}
 func (*Job) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{12}
+	return fileDescriptor_37e0b42bcf4d103b, []int{12}
 }
+
 func (m *Job) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job.Unmarshal(m, b)
 }
 func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
 }
-func (dst *Job) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job.Merge(dst, src)
+func (m *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(m, src)
 }
 func (m *Job) XXX_Size() int {
 	return xxx_messageInfo_Job.Size(m)
@@ -1968,9 +1689,9 @@ func (m *Job) GetJobUuid() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Job_OneofMarshaler, _Job_OneofUnmarshaler, _Job_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Job) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Job_HadoopJob)(nil),
 		(*Job_SparkJob)(nil),
 		(*Job_PysparkJob)(nil),
@@ -1980,144 +1701,6 @@ func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, fu
 	}
 }
 
-func _Job_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Job)
-	// type_job
-	switch x := m.TypeJob.(type) {
-	case *Job_HadoopJob:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HadoopJob); err != nil {
-			return err
-		}
-	case *Job_SparkJob:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkJob); err != nil {
-			return err
-		}
-	case *Job_PysparkJob:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PysparkJob); err != nil {
-			return err
-		}
-	case *Job_HiveJob:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HiveJob); err != nil {
-			return err
-		}
-	case *Job_PigJob:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PigJob); err != nil {
-			return err
-		}
-	case *Job_SparkSqlJob:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkSqlJob); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.TypeJob has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Job_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Job)
-	switch tag {
-	case 3: // type_job.hadoop_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HadoopJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_HadoopJob{msg}
-		return true, err
-	case 4: // type_job.spark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_SparkJob{msg}
-		return true, err
-	case 5: // type_job.pyspark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PySparkJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_PysparkJob{msg}
-		return true, err
-	case 6: // type_job.hive_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HiveJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_HiveJob{msg}
-		return true, err
-	case 7: // type_job.pig_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PigJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_PigJob{msg}
-		return true, err
-	case 12: // type_job.spark_sql_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkSqlJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_SparkSqlJob{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Job_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Job)
-	// type_job
-	switch x := m.TypeJob.(type) {
-	case *Job_HadoopJob:
-		s := proto.Size(x.HadoopJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_SparkJob:
-		s := proto.Size(x.SparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PysparkJob:
-		s := proto.Size(x.PysparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_HiveJob:
-		s := proto.Size(x.HiveJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PigJob:
-		s := proto.Size(x.PigJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_SparkSqlJob:
-		s := proto.Size(x.SparkSqlJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Job scheduling options.
 type JobScheduling struct {
 	// Optional. Maximum number of times per hour a driver may be restarted as
@@ -2138,16 +1721,17 @@ func (m *JobScheduling) Reset()         { *m = JobScheduling{} }
 func (m *JobScheduling) String() string { return proto.CompactTextString(m) }
 func (*JobScheduling) ProtoMessage()    {}
 func (*JobScheduling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{13}
+	return fileDescriptor_37e0b42bcf4d103b, []int{13}
 }
+
 func (m *JobScheduling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobScheduling.Unmarshal(m, b)
 }
 func (m *JobScheduling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobScheduling.Marshal(b, m, deterministic)
 }
-func (dst *JobScheduling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobScheduling.Merge(dst, src)
+func (m *JobScheduling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobScheduling.Merge(m, src)
 }
 func (m *JobScheduling) XXX_Size() int {
 	return xxx_messageInfo_JobScheduling.Size(m)
@@ -2195,16 +1779,17 @@ func (m *SubmitJobRequest) Reset()         { *m = SubmitJobRequest{} }
 func (m *SubmitJobRequest) String() string { return proto.CompactTextString(m) }
 func (*SubmitJobRequest) ProtoMessage()    {}
 func (*SubmitJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{14}
+	return fileDescriptor_37e0b42bcf4d103b, []int{14}
 }
+
 func (m *SubmitJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SubmitJobRequest.Unmarshal(m, b)
 }
 func (m *SubmitJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SubmitJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *SubmitJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SubmitJobRequest.Merge(dst, src)
+func (m *SubmitJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitJobRequest.Merge(m, src)
 }
 func (m *SubmitJobRequest) XXX_Size() int {
 	return xxx_messageInfo_SubmitJobRequest.Size(m)
@@ -2261,16 +1846,17 @@ func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
 func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetJobRequest) ProtoMessage()    {}
 func (*GetJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{15}
+	return fileDescriptor_37e0b42bcf4d103b, []int{15}
 }
+
 func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
 }
 func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+func (m *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(m, src)
 }
 func (m *GetJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetJobRequest.Size(m)
@@ -2346,16 +1932,17 @@ func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
 func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListJobsRequest) ProtoMessage()    {}
 func (*ListJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{16}
+	return fileDescriptor_37e0b42bcf4d103b, []int{16}
 }
+
 func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
 }
 func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+func (m *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(m, src)
 }
 func (m *ListJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListJobsRequest.Size(m)
@@ -2442,16 +2029,17 @@ func (m *UpdateJobRequest) Reset()         { *m = UpdateJobRequest{} }
 func (m *UpdateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateJobRequest) ProtoMessage()    {}
 func (*UpdateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{17}
+	return fileDescriptor_37e0b42bcf4d103b, []int{17}
 }
+
 func (m *UpdateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateJobRequest.Unmarshal(m, b)
 }
 func (m *UpdateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateJobRequest.Merge(dst, src)
+func (m *UpdateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobRequest.Merge(m, src)
 }
 func (m *UpdateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateJobRequest.Size(m)
@@ -2514,16 +2102,17 @@ func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
 func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListJobsResponse) ProtoMessage()    {}
 func (*ListJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{18}
+	return fileDescriptor_37e0b42bcf4d103b, []int{18}
 }
+
 func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
 }
 func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+func (m *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(m, src)
 }
 func (m *ListJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListJobsResponse.Size(m)
@@ -2566,16 +2155,17 @@ func (m *CancelJobRequest) Reset()         { *m = CancelJobRequest{} }
 func (m *CancelJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelJobRequest) ProtoMessage()    {}
 func (*CancelJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{19}
+	return fileDescriptor_37e0b42bcf4d103b, []int{19}
 }
+
 func (m *CancelJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelJobRequest.Unmarshal(m, b)
 }
 func (m *CancelJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelJobRequest.Merge(dst, src)
+func (m *CancelJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelJobRequest.Merge(m, src)
 }
 func (m *CancelJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelJobRequest.Size(m)
@@ -2625,16 +2215,17 @@ func (m *DeleteJobRequest) Reset()         { *m = DeleteJobRequest{} }
 func (m *DeleteJobRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteJobRequest) ProtoMessage()    {}
 func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_a9b426fd7b89528f, []int{20}
+	return fileDescriptor_37e0b42bcf4d103b, []int{20}
 }
+
 func (m *DeleteJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteJobRequest.Unmarshal(m, b)
 }
 func (m *DeleteJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteJobRequest.Merge(dst, src)
+func (m *DeleteJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobRequest.Merge(m, src)
 }
 func (m *DeleteJobRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteJobRequest.Size(m)
@@ -2667,6 +2258,11 @@ func (m *DeleteJobRequest) GetJobId() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1.LoggingConfig_Level", LoggingConfig_Level_name, LoggingConfig_Level_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1.JobStatus_State", JobStatus_State_name, JobStatus_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1.JobStatus_Substate", JobStatus_Substate_name, JobStatus_Substate_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1.YarnApplication_State", YarnApplication_State_name, YarnApplication_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1.ListJobsRequest_JobStateMatcher", ListJobsRequest_JobStateMatcher_name, ListJobsRequest_JobStateMatcher_value)
 	proto.RegisterType((*LoggingConfig)(nil), "google.cloud.dataproc.v1.LoggingConfig")
 	proto.RegisterMapType((map[string]LoggingConfig_Level)(nil), "google.cloud.dataproc.v1.LoggingConfig.DriverLogLevelsEntry")
 	proto.RegisterType((*HadoopJob)(nil), "google.cloud.dataproc.v1.HadoopJob")
@@ -2699,11 +2295,159 @@ func init() {
 	proto.RegisterType((*ListJobsResponse)(nil), "google.cloud.dataproc.v1.ListJobsResponse")
 	proto.RegisterType((*CancelJobRequest)(nil), "google.cloud.dataproc.v1.CancelJobRequest")
 	proto.RegisterType((*DeleteJobRequest)(nil), "google.cloud.dataproc.v1.DeleteJobRequest")
-	proto.RegisterEnum("google.cloud.dataproc.v1.LoggingConfig_Level", LoggingConfig_Level_name, LoggingConfig_Level_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1.JobStatus_State", JobStatus_State_name, JobStatus_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1.JobStatus_Substate", JobStatus_Substate_name, JobStatus_Substate_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1.YarnApplication_State", YarnApplication_State_name, YarnApplication_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1.ListJobsRequest_JobStateMatcher", ListJobsRequest_JobStateMatcher_name, ListJobsRequest_JobStateMatcher_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1/jobs.proto", fileDescriptor_37e0b42bcf4d103b)
+}
+
+var fileDescriptor_37e0b42bcf4d103b = []byte{
+	// 2320 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcf, 0x73, 0x23, 0x47,
+	0xf5, 0xb7, 0x7e, 0x6b, 0x9e, 0x6c, 0x79, 0xdc, 0xd9, 0xcd, 0x57, 0x5f, 0x25, 0xa9, 0x38, 0xb3,
+	0x64, 0xf1, 0x2e, 0x20, 0x61, 0x05, 0x36, 0x1b, 0x1b, 0xd8, 0xc8, 0xd2, 0x78, 0x25, 0x47, 0x2b,
+	0x6b, 0x47, 0xd2, 0x6e, 0x41, 0x15, 0x35, 0x3b, 0x92, 0xda, 0xf2, 0xd8, 0xa3, 0x99, 0xf1, 0xf4,
+	0x8c, 0x6b, 0x95, 0xad, 0xbd, 0x70, 0xe1, 0x48, 0x01, 0xa7, 0x50, 0xc5, 0x85, 0x1b, 0x7f, 0x00,
+	0x5c, 0x28, 0x8a, 0x0b, 0x67, 0x2e, 0x5c, 0xa9, 0x9c, 0x38, 0x72, 0xe2, 0x2f, 0xa0, 0xba, 0x7b,
+	0x46, 0x96, 0x64, 0xeb, 0x87, 0x77, 0x21, 0x95, 0xe4, 0xe4, 0x9e, 0x7e, 0x3f, 0xfa, 0x75, 0x7f,
+	0x3e, 0xfd, 0xde, 0x6b, 0x19, 0x6e, 0xf5, 0x2d, 0xab, 0x6f, 0xe0, 0x7c, 0xd7, 0xb0, 0xbc, 0x5e,
+	0xbe, 0xa7, 0xb9, 0x9a, 0xed, 0x58, 0xdd, 0xfc, 0xf9, 0x76, 0xfe, 0xc4, 0xea, 0x90, 0x9c, 0xed,
+	0x58, 0xae, 0x85, 0x32, 0x5c, 0x29, 0xc7, 0x94, 0x72, 0x81, 0x52, 0xee, 0x7c, 0x3b, 0xfb, 0xb6,
+	0x6f, 0xae, 0xd9, 0x7a, 0x5e, 0x33, 0x4d, 0xcb, 0xd5, 0x5c, 0xdd, 0x32, 0x7d, 0xbb, 0xec, 0x5b,
+	0xbe, 0x94, 0x7d, 0x75, 0xbc, 0xa3, 0x3c, 0x1e, 0xd8, 0xee, 0xd0, 0x17, 0x6e, 0x4e, 0x0b, 0x8f,
+	0x74, 0x6c, 0xf4, 0xd4, 0x81, 0x46, 0x4e, 0x7d, 0x8d, 0x77, 0xa7, 0x35, 0x5c, 0x7d, 0x80, 0x89,
+	0xab, 0x0d, 0x6c, 0xae, 0x20, 0x7d, 0x1e, 0x86, 0xb5, 0x9a, 0xd5, 0xef, 0xeb, 0x66, 0xbf, 0x64,
+	0x99, 0x47, 0x7a, 0x1f, 0x1d, 0xc3, 0x46, 0xcf, 0xd1, 0xcf, 0xb1, 0xa3, 0x1a, 0x56, 0x5f, 0x35,
+	0xf0, 0x39, 0x36, 0x48, 0x26, 0xbc, 0x19, 0xd9, 0x4a, 0x15, 0x7e, 0x90, 0x9b, 0xb5, 0x8b, 0xdc,
+	0x84, 0x8f, 0x5c, 0x99, 0x39, 0xa8, 0x59, 0xfd, 0x1a, 0x33, 0x97, 0x4d, 0xd7, 0x19, 0x2a, 0xeb,
+	0xbd, 0xc9, 0xd9, 0xec, 0x19, 0xdc, 0xb8, 0x4a, 0x11, 0x89, 0x10, 0x39, 0xc5, 0xc3, 0x4c, 0x68,
+	0x33, 0xb4, 0x25, 0x28, 0x74, 0x88, 0x4a, 0x10, 0x3b, 0xd7, 0x0c, 0x0f, 0x67, 0xc2, 0x9b, 0xa1,
+	0xad, 0x74, 0xe1, 0x3b, 0xcb, 0xc6, 0xc1, 0xbc, 0x2a, 0xdc, 0x76, 0x27, 0x7c, 0x3f, 0x24, 0xd9,
+	0x10, 0x63, 0x73, 0xe8, 0x26, 0x6c, 0xd4, 0xe4, 0x27, 0x72, 0x4d, 0x6d, 0xd7, 0x9b, 0x0d, 0xb9,
+	0x54, 0xdd, 0xaf, 0xca, 0x65, 0x71, 0x05, 0x25, 0x20, 0x52, 0xac, 0xd5, 0xc4, 0x10, 0x12, 0x20,
+	0xd6, 0x52, 0x8a, 0x25, 0x59, 0x0c, 0xd3, 0x61, 0x59, 0xde, 0x6b, 0x3f, 0x14, 0x23, 0x28, 0x09,
+	0xd1, 0x6a, 0x7d, 0xff, 0x50, 0x8c, 0xd2, 0xd1, 0xd3, 0xa2, 0x52, 0x17, 0x63, 0x54, 0x2c, 0x2b,
+	0xca, 0xa1, 0x22, 0xc6, 0xe9, 0x70, 0xbf, 0xd8, 0x2a, 0xd6, 0xc4, 0x04, 0x75, 0x74, 0xb8, 0xbf,
+	0x2f, 0x26, 0xa5, 0xbf, 0x44, 0x40, 0xa8, 0x68, 0x3d, 0xcb, 0xb2, 0x0f, 0xac, 0x0e, 0xfa, 0x16,
+	0x6c, 0x0c, 0x34, 0xdd, 0x54, 0x4f, 0x34, 0x47, 0x3d, 0xd2, 0x0d, 0xac, 0x7a, 0x8e, 0xce, 0x37,
+	0x5a, 0x59, 0x51, 0xd2, 0x54, 0x74, 0xa0, 0x39, 0xfb, 0xba, 0x81, 0xdb, 0x8e, 0x8e, 0xde, 0x05,
+	0x60, 0xca, 0x5d, 0x43, 0x23, 0x84, 0x6d, 0x9d, 0x6a, 0x09, 0x74, 0xae, 0x44, 0xa7, 0x10, 0x82,
+	0xa8, 0xe6, 0xf4, 0x49, 0x26, 0xb2, 0x19, 0xd9, 0x12, 0x14, 0x36, 0x46, 0x12, 0xac, 0x8d, 0x3b,
+	0x27, 0x99, 0x28, 0x13, 0xa6, 0x4e, 0x46, 0x7e, 0x09, 0x7a, 0x0b, 0x84, 0x0b, 0x79, 0x8c, 0xc9,
+	0x93, 0x47, 0x81, 0xf0, 0x3d, 0x58, 0xd5, 0x9c, 0xee, 0xb1, 0x7e, 0xee, 0xcb, 0xe3, 0xdc, 0xde,
+	0x9f, 0x63, 0x2a, 0x4d, 0x00, 0xdb, 0xb1, 0x6c, 0xec, 0xb8, 0x3a, 0x26, 0x99, 0x04, 0xe3, 0xc6,
+	0x07, 0xb3, 0x31, 0x19, 0x6d, 0x3f, 0xd7, 0x18, 0x59, 0x71, 0x4a, 0x8c, 0xb9, 0x41, 0x75, 0x48,
+	0x1b, 0x1c, 0x3c, 0xb5, 0xcb, 0xd0, 0xcb, 0x24, 0x37, 0x43, 0x5b, 0xa9, 0xc2, 0x37, 0x97, 0x04,
+	0x5b, 0x59, 0x33, 0xc6, 0x3f, 0xb3, 0x3f, 0x84, 0xf5, 0xa9, 0xe5, 0xae, 0x20, 0xd6, 0x8d, 0x71,
+	0x62, 0x09, 0x63, 0x4c, 0xd9, 0x4b, 0x42, 0x9c, 0xf3, 0x55, 0xfa, 0x73, 0x04, 0x92, 0x4d, 0x5b,
+	0x73, 0x4e, 0xbf, 0x3e, 0x00, 0x2a, 0x57, 0x00, 0x58, 0x98, 0x7d, 0xce, 0xc1, 0xee, 0xbf, 0x9a,
+	0xf8, 0xfd, 0x35, 0x02, 0xd0, 0x18, 0x8e, 0x10, 0xcc, 0xc3, 0x0d, 0x06, 0x8a, 0x3d, 0x74, 0x8f,
+	0x2d, 0x73, 0x0a, 0x44, 0x85, 0xa1, 0xdb, 0x60, 0xa2, 0x00, 0xc5, 0x00, 0xa4, 0xf0, 0x18, 0x48,
+	0x5b, 0x20, 0x4e, 0xd9, 0x07, 0x20, 0xa6, 0xed, 0x71, 0xe3, 0x2f, 0x06, 0xce, 0xd6, 0x15, 0x70,
+	0x7e, 0x6f, 0xf6, 0xb1, 0x5f, 0x1c, 0xc6, 0x57, 0x08, 0x50, 0xe9, 0x7d, 0x10, 0x1e, 0x7b, 0xd8,
+	0x19, 0xd6, 0x74, 0xe2, 0xa2, 0x0c, 0x24, 0xce, 0x3c, 0xec, 0xd0, 0xed, 0x86, 0xd8, 0x79, 0x04,
+	0x9f, 0xd2, 0x2f, 0xa2, 0x90, 0xa8, 0xe8, 0xe7, 0x98, 0x42, 0x7d, 0x1b, 0xd2, 0x74, 0x7a, 0x78,
+	0xf9, 0xa6, 0xae, 0xb2, 0xf9, 0x00, 0xe1, 0x32, 0x00, 0xd7, 0x33, 0x74, 0xe2, 0xb2, 0x95, 0x53,
+	0x85, 0x5b, 0xb3, 0x77, 0x39, 0x0a, 0x83, 0x5e, 0xe6, 0xb3, 0x51, 0x4c, 0x39, 0x78, 0xa3, 0x6b,
+	0x99, 0xae, 0x6e, 0x7a, 0x58, 0xa5, 0xc4, 0xd0, 0x74, 0xc3, 0x73, 0x70, 0x26, 0xb2, 0x19, 0xda,
+	0x4a, 0x2a, 0x1b, 0x81, 0xe8, 0xd0, 0xdc, 0xe7, 0x02, 0xa4, 0x81, 0x48, 0xba, 0x8e, 0x6e, 0xbb,
+	0xea, 0xb9, 0xe6, 0xe8, 0x5a, 0xc7, 0xc0, 0x9c, 0x1c, 0xa9, 0xc2, 0xbd, 0x39, 0xb9, 0x94, 0x6f,
+	0x2d, 0xd7, 0x64, 0x96, 0x4f, 0x02, 0x43, 0xbf, 0xc2, 0x92, 0xc9, 0x59, 0xf4, 0x78, 0x82, 0x18,
+	0x31, 0xe6, 0x7c, 0x7b, 0xb1, 0xf3, 0x79, 0xac, 0xb8, 0xc4, 0xe7, 0xf8, 0x25, 0x3e, 0x67, 0xf7,
+	0xe0, 0xc6, 0x55, 0xf1, 0x5d, 0x07, 0xee, 0xd7, 0xbd, 0xfe, 0xc2, 0x88, 0x20, 0xd2, 0x9f, 0xa2,
+	0x90, 0x62, 0x84, 0x6f, 0x9e, 0x19, 0x5f, 0x3c, 0x2b, 0xf0, 0x15, 0x28, 0x47, 0x18, 0x10, 0x3b,
+	0x0b, 0x12, 0x2e, 0x0f, 0x77, 0x49, 0xa4, 0xdb, 0x13, 0x48, 0x73, 0x1a, 0x7d, 0x7f, 0xb9, 0x05,
+	0xae, 0x85, 0xf6, 0xfd, 0xcb, 0xd9, 0xeb, 0x72, 0x9e, 0x88, 0xbf, 0x56, 0x9e, 0xf8, 0x72, 0xb1,
+	0xe7, 0x1f, 0x51, 0x88, 0x37, 0xf4, 0xfe, 0x97, 0x3f, 0x9d, 0x3c, 0x9b, 0x99, 0x4e, 0xe6, 0xf0,
+	0x80, 0xef, 0x6c, 0x49, 0x8e, 0x35, 0xae, 0xc8, 0x26, 0xdf, 0x5d, 0xe8, 0xfb, 0x35, 0x93, 0xc9,
+	0x15, 0xf4, 0x4a, 0x7c, 0x8d, 0xe8, 0xd5, 0x82, 0xd5, 0x03, 0xab, 0xd3, 0x30, 0xb4, 0x2e, 0x1e,
+	0x60, 0xd3, 0xa5, 0xd5, 0xbe, 0x6b, 0x78, 0xc4, 0xc5, 0x8e, 0x6a, 0x6a, 0x03, 0xec, 0xfb, 0x4b,
+	0xf9, 0x73, 0x75, 0x6d, 0x80, 0xc7, 0x55, 0x3c, 0x4f, 0xef, 0xf9, 0xee, 0x03, 0x95, 0xb6, 0xa7,
+	0xf7, 0xa4, 0x7f, 0x45, 0x40, 0x38, 0xb0, 0x3a, 0x4d, 0x57, 0x73, 0x3d, 0x82, 0x1e, 0x40, 0x8c,
+	0xb8, 0x9a, 0xcb, 0x9d, 0xa5, 0x0b, 0x77, 0x66, 0x1f, 0xdc, 0xc8, 0x26, 0x47, 0xff, 0x60, 0x85,
+	0xdb, 0xd1, 0x6a, 0xdb, 0xc3, 0xae, 0xa6, 0x1b, 0x7e, 0x13, 0xab, 0x04, 0x9f, 0xa8, 0x0c, 0x22,
+	0x53, 0x51, 0x89, 0xab, 0x39, 0xae, 0x4a, 0x5f, 0x97, 0xfe, 0xed, 0xcf, 0x06, 0xab, 0x04, 0x4f,
+	0xcf, 0x5c, 0x2b, 0x78, 0x7a, 0x2a, 0x69, 0x66, 0xd3, 0xa4, 0x26, 0x74, 0x12, 0x55, 0x20, 0x49,
+	0xbc, 0x0e, 0x8f, 0x31, 0xc1, 0x62, 0xfc, 0xf6, 0x52, 0x31, 0xfa, 0x36, 0xca, 0xc8, 0x5a, 0xfa,
+	0x7d, 0x08, 0x62, 0x2c, 0x74, 0xfa, 0xc0, 0x6b, 0xb6, 0x8a, 0x2d, 0x79, 0xea, 0x81, 0x97, 0x82,
+	0x44, 0x43, 0xae, 0x97, 0xab, 0xf5, 0x87, 0x62, 0x08, 0xa5, 0x01, 0x9a, 0x72, 0xab, 0xdd, 0x50,
+	0xcb, 0x87, 0x75, 0x59, 0x4c, 0x52, 0xa1, 0xd2, 0xae, 0xd7, 0xa9, 0x30, 0x8c, 0x10, 0xa4, 0x4b,
+	0xc5, 0x7a, 0x49, 0xae, 0xa9, 0x81, 0x41, 0x64, 0x6c, 0xae, 0xd9, 0x2a, 0x2a, 0x2d, 0xb9, 0x2c,
+	0x26, 0xd0, 0x1a, 0x08, 0x7c, 0xae, 0x26, 0x97, 0xf9, 0xc3, 0x90, 0x79, 0x9b, 0x78, 0x18, 0xbe,
+	0x01, 0xeb, 0xc5, 0x56, 0x4b, 0x7e, 0xd4, 0x68, 0xa9, 0xfb, 0xc5, 0x6a, 0xad, 0xad, 0xc8, 0xa2,
+	0x20, 0x55, 0x20, 0x19, 0xec, 0x00, 0xad, 0x43, 0x6a, 0x32, 0xce, 0x35, 0x10, 0x9a, 0xed, 0xbd,
+	0x47, 0xd5, 0x16, 0x5d, 0x24, 0x84, 0x00, 0xe2, 0x8f, 0xdb, 0x72, 0x5b, 0x2e, 0x8b, 0x61, 0x24,
+	0xc2, 0x6a, 0xb3, 0x55, 0xac, 0xc9, 0x34, 0x86, 0x56, 0xbb, 0x29, 0x46, 0xa4, 0x32, 0x23, 0x91,
+	0x82, 0x8f, 0xb0, 0x83, 0xcd, 0x2e, 0x46, 0xef, 0xb0, 0x8b, 0x7a, 0x82, 0xbb, 0xae, 0xaa, 0xf7,
+	0x7c, 0x0a, 0x09, 0xfe, 0x4c, 0xb5, 0x87, 0x6e, 0x42, 0xfc, 0xc4, 0xea, 0xa8, 0x23, 0xea, 0xc4,
+	0x4e, 0xac, 0x4e, 0xb5, 0x27, 0xfd, 0x21, 0x0c, 0xeb, 0x3f, 0xd6, 0x1c, 0xb3, 0x68, 0xdb, 0x86,
+	0xde, 0x65, 0xbf, 0x42, 0xd0, 0xde, 0x77, 0x8c, 0x86, 0x6c, 0x8c, 0xe4, 0x80, 0x4e, 0xfc, 0x31,
+	0x9e, 0x9f, 0x0d, 0xd5, 0x94, 0xb7, 0x49, 0x52, 0x65, 0x21, 0x69, 0x3b, 0x56, 0xdf, 0xc1, 0x84,
+	0xb0, 0xa4, 0x16, 0x56, 0x46, 0xdf, 0x94, 0xe2, 0xae, 0xa3, 0x75, 0x4f, 0xe9, 0xa5, 0xf7, 0x1c,
+	0x23, 0x13, 0xe5, 0x14, 0x0f, 0xe6, 0xda, 0x8e, 0x21, 0xfd, 0x7c, 0x11, 0xd2, 0x09, 0x88, 0xd4,
+	0xe5, 0xa7, 0x1c, 0xe5, 0xba, 0xfc, 0x54, 0x6d, 0x16, 0x9f, 0x70, 0x60, 0x27, 0x8e, 0x36, 0x82,
+	0x56, 0x21, 0x59, 0x2c, 0x95, 0xe4, 0x46, 0x8b, 0xc1, 0x37, 0x46, 0x81, 0x18, 0x15, 0xed, 0x57,
+	0xeb, 0xd5, 0x66, 0x45, 0x2e, 0x8b, 0x71, 0x8a, 0x01, 0x05, 0x8f, 0x81, 0x0e, 0x10, 0xff, 0xa4,
+	0xca, 0x10, 0x4f, 0x4a, 0xff, 0x4e, 0x42, 0x84, 0x96, 0x87, 0x32, 0x08, 0x4e, 0x00, 0x01, 0x3b,
+	0xb0, 0x54, 0xe1, 0xf6, 0x5c, 0x1a, 0x8f, 0x00, 0x53, 0x2e, 0x0c, 0xa9, 0x17, 0x3b, 0xc8, 0x06,
+	0x7e, 0xed, 0x98, 0xef, 0x65, 0x94, 0x3b, 0x94, 0x0b, 0x43, 0x5a, 0x82, 0x8e, 0xd9, 0xab, 0x5b,
+	0x3d, 0xb1, 0x3a, 0xec, 0x78, 0xe7, 0x96, 0xa0, 0xd1, 0x0b, 0x9d, 0x96, 0xa0, 0xe3, 0xd1, 0xaf,
+	0x15, 0x45, 0x10, 0x08, 0x6d, 0x14, 0x98, 0x93, 0x28, 0x73, 0x22, 0x2d, 0x7e, 0x25, 0x56, 0x56,
+	0x94, 0x24, 0x09, 0x5e, 0x5b, 0x0f, 0x21, 0x65, 0x0f, 0x2f, 0x9c, 0xc4, 0x98, 0x93, 0x6f, 0x2c,
+	0xf3, 0x36, 0xa9, 0xac, 0x28, 0xe0, 0x9b, 0x52, 0x47, 0x3f, 0x82, 0x24, 0x7b, 0x03, 0x51, 0x2f,
+	0x3c, 0xc3, 0xbc, 0xb7, 0xb0, 0x91, 0xad, 0xac, 0x28, 0x89, 0x63, 0xff, 0x2d, 0xb0, 0x0b, 0x09,
+	0x5b, 0xef, 0x33, 0x73, 0x5e, 0x3f, 0x36, 0x17, 0x55, 0xae, 0xca, 0x8a, 0x12, 0xb7, 0x79, 0xe5,
+	0xff, 0x04, 0xd6, 0xf8, 0x1e, 0xc8, 0x99, 0xc1, 0x5c, 0xac, 0x32, 0x17, 0xef, 0x2f, 0xd5, 0x60,
+	0x55, 0x56, 0x94, 0x14, 0x19, 0xeb, 0x3f, 0x77, 0x21, 0x4e, 0x58, 0x02, 0xf3, 0xdf, 0x53, 0xb7,
+	0x96, 0xc8, 0x75, 0x8a, 0x6f, 0x82, 0x0e, 0x20, 0xcd, 0x47, 0xea, 0xb1, 0x4e, 0x5c, 0xcb, 0x19,
+	0x66, 0xd6, 0x58, 0x1d, 0x5e, 0xca, 0xc9, 0x1a, 0x37, 0xad, 0x70, 0x4b, 0xf4, 0x04, 0x36, 0x86,
+	0x9a, 0x63, 0xaa, 0xda, 0xc5, 0x15, 0x25, 0x19, 0x81, 0xb9, 0xbb, 0xb3, 0xf4, 0xa5, 0x56, 0xc4,
+	0xe1, 0xe4, 0x04, 0x41, 0xbb, 0x90, 0xf5, 0x7f, 0x41, 0xb4, 0x3c, 0xd7, 0xf6, 0x5c, 0xd5, 0xc1,
+	0xc4, 0xf2, 0x9c, 0x2e, 0xef, 0x99, 0x36, 0xd8, 0x5d, 0xfe, 0x3f, 0xae, 0x71, 0xc8, 0x14, 0x14,
+	0x5f, 0x4e, 0x9b, 0xa7, 0x0f, 0x21, 0xe3, 0x1b, 0xd3, 0x16, 0xc7, 0xb1, 0x0c, 0xd6, 0x1d, 0x10,
+	0x66, 0xba, 0xce, 0x4c, 0x6f, 0x72, 0x79, 0x89, 0x8b, 0x69, 0x9f, 0x40, 0xa8, 0x61, 0x11, 0xe2,
+	0x86, 0xd6, 0xc1, 0x06, 0xc9, 0xa0, 0x45, 0x5b, 0xa0, 0x6d, 0x49, 0x8d, 0xe9, 0xf2, 0x96, 0xc4,
+	0x37, 0x44, 0x0f, 0x01, 0x48, 0xf7, 0x18, 0xf7, 0x3c, 0x43, 0x37, 0xfb, 0x99, 0x1b, 0x8b, 0xda,
+	0x0c, 0x7a, 0xb0, 0x23, 0x75, 0x65, 0xcc, 0x14, 0xfd, 0x3f, 0x24, 0x69, 0x86, 0x65, 0xe5, 0xf9,
+	0x4d, 0x5e, 0x31, 0x4f, 0xac, 0x0e, 0x2d, 0xcd, 0xd9, 0x8f, 0x20, 0x35, 0xb6, 0xf4, 0xb5, 0xda,
+	0x06, 0x80, 0xa4, 0x3b, 0xb4, 0xd9, 0x15, 0x90, 0xf6, 0x60, 0x6d, 0x62, 0x79, 0xb4, 0x0d, 0x37,
+	0x07, 0xda, 0xf3, 0xa0, 0x4d, 0x24, 0xaa, 0x8d, 0x1d, 0xf5, 0xd8, 0xf2, 0x1c, 0xe6, 0x3a, 0xa6,
+	0xa0, 0x81, 0xf6, 0xdc, 0xef, 0x14, 0x49, 0x03, 0x3b, 0x15, 0xcb, 0x73, 0xa4, 0xcf, 0x42, 0x20,
+	0x36, 0xbd, 0xce, 0x40, 0x77, 0x59, 0x32, 0x3a, 0xf3, 0x30, 0x71, 0x17, 0xd5, 0x8e, 0x37, 0x21,
+	0xee, 0xe0, 0xbe, 0x6e, 0x99, 0x2c, 0xa9, 0x08, 0x8a, 0xff, 0x85, 0xf2, 0x10, 0xa1, 0xf7, 0x82,
+	0x27, 0xac, 0x77, 0xe6, 0xa7, 0x3d, 0xaa, 0x49, 0xd7, 0x71, 0xf8, 0x92, 0x74, 0x1d, 0x9e, 0xe0,
+	0x05, 0x7f, 0xa6, 0xda, 0x93, 0x7e, 0x0a, 0x6b, 0x0f, 0xf1, 0x7f, 0x21, 0xae, 0x19, 0xb5, 0xee,
+	0xf3, 0x30, 0xac, 0xd3, 0x2e, 0xfb, 0xc0, 0xea, 0x90, 0x6b, 0xaf, 0x10, 0x9f, 0x58, 0xe1, 0x2d,
+	0x10, 0x6c, 0xad, 0x8f, 0x55, 0xa2, 0x7f, 0xca, 0x31, 0x8b, 0x29, 0x49, 0x3a, 0xd1, 0xd4, 0x3f,
+	0xe5, 0x95, 0x98, 0x0a, 0x5d, 0xeb, 0x14, 0x07, 0xa1, 0x31, 0xf5, 0x16, 0x9d, 0xb8, 0xd4, 0xed,
+	0x45, 0x2f, 0x77, 0x7b, 0x18, 0x36, 0xe8, 0x06, 0x78, 0x97, 0x35, 0xd0, 0xdc, 0xee, 0x31, 0x76,
+	0x58, 0x1a, 0x4d, 0x17, 0x3e, 0x9a, 0xd3, 0x01, 0x4f, 0xee, 0x2d, 0xc8, 0x01, 0xf8, 0x11, 0x77,
+	0xa0, 0xac, 0x9f, 0x4c, 0x4e, 0xd0, 0xdd, 0x1d, 0xe9, 0x86, 0x8b, 0x1d, 0x96, 0x1d, 0x05, 0xc5,
+	0xff, 0x92, 0xee, 0xc1, 0xfa, 0x94, 0x6d, 0xf0, 0x1b, 0xf9, 0x0a, 0x2d, 0x82, 0xc5, 0x52, 0xab,
+	0xfa, 0x44, 0xf6, 0x8b, 0xec, 0x61, 0x5d, 0xf5, 0xbf, 0xc3, 0xd2, 0xdf, 0x42, 0x20, 0xb6, 0xed,
+	0x9e, 0xe6, 0xe2, 0x57, 0xc1, 0x30, 0x3c, 0x03, 0xc3, 0xc8, 0x18, 0x86, 0x01, 0xe5, 0xa2, 0x4b,
+	0x53, 0x6e, 0x17, 0x52, 0x1e, 0x0b, 0x89, 0xfd, 0x87, 0xc4, 0xaf, 0x45, 0x97, 0xfb, 0xd4, 0x7d,
+	0x1d, 0x1b, 0xbd, 0x47, 0x1a, 0x39, 0x55, 0x80, 0xab, 0xd3, 0xb1, 0x34, 0x00, 0xf1, 0xe2, 0x50,
+	0x89, 0x6d, 0x99, 0x04, 0xa3, 0x6d, 0x88, 0x9e, 0x58, 0x1d, 0xfe, 0x13, 0xd4, 0xc2, 0x10, 0x98,
+	0x2a, 0xba, 0x0d, 0xeb, 0x26, 0x7e, 0xee, 0xaa, 0x63, 0xac, 0xe0, 0x9b, 0x5d, 0xa3, 0xd3, 0x8d,
+	0x80, 0x19, 0xd2, 0x33, 0x10, 0x4b, 0x9a, 0xd9, 0xc5, 0xc6, 0xff, 0xec, 0x0a, 0x3c, 0x03, 0xb1,
+	0x8c, 0x0d, 0xfc, 0x6a, 0x00, 0x2d, 0xb3, 0x42, 0xe1, 0x8f, 0x09, 0x96, 0xa4, 0xfc, 0x44, 0x6d,
+	0x60, 0x07, 0x7d, 0x16, 0x02, 0x61, 0x94, 0x71, 0xd0, 0xdd, 0x39, 0xe5, 0x73, 0x2a, 0x2d, 0x65,
+	0xe7, 0x1f, 0xae, 0x54, 0xfc, 0xd9, 0xdf, 0xff, 0xf9, 0xeb, 0xf0, 0xae, 0x74, 0x2f, 0x7f, 0xbe,
+	0x9d, 0xf7, 0x03, 0x26, 0xf9, 0x17, 0x17, 0x9b, 0x79, 0x99, 0xe7, 0xb1, 0x92, 0xfc, 0x0b, 0x3e,
+	0x78, 0xc9, 0xfe, 0x3b, 0xb7, 0x43, 0xd8, 0x42, 0x3b, 0xa1, 0xbb, 0xe8, 0x57, 0x21, 0x88, 0xf3,
+	0x94, 0x83, 0xe6, 0xe4, 0xfc, 0x89, 0xa4, 0xb4, 0x28, 0xaa, 0x8f, 0x59, 0x54, 0x3b, 0xe8, 0xfe,
+	0x35, 0xa3, 0xca, 0xbf, 0xe0, 0xc7, 0xf9, 0x12, 0xfd, 0x26, 0x04, 0xc9, 0x80, 0x76, 0xe8, 0xce,
+	0xd2, 0xf7, 0x3d, 0x7b, 0x77, 0x19, 0x55, 0xce, 0x62, 0xe9, 0x43, 0x16, 0xe5, 0x36, 0xca, 0x5f,
+	0x33, 0x4a, 0xf4, 0xdb, 0x10, 0x08, 0xa3, 0x3b, 0x3e, 0x0f, 0xcd, 0xe9, 0x44, 0xb0, 0xe8, 0xdc,
+	0x64, 0x16, 0xd1, 0x83, 0xc2, 0x2b, 0x9f, 0xdb, 0x0e, 0xbb, 0xef, 0xbf, 0x0b, 0x81, 0x30, 0xba,
+	0x44, 0xf3, 0xe2, 0x9b, 0xbe, 0x69, 0x8b, 0xe2, 0x3b, 0x60, 0xf1, 0x95, 0xa5, 0x07, 0xaf, 0x1c,
+	0x5f, 0x97, 0xad, 0x48, 0x69, 0xf7, 0xcb, 0x10, 0x08, 0xa3, 0x7b, 0x38, 0x2f, 0xc8, 0xe9, 0xcb,
+	0x9a, 0x7d, 0xf3, 0x52, 0xe6, 0x92, 0x07, 0xb6, 0x3b, 0x0c, 0x58, 0x77, 0xf7, 0x95, 0x4f, 0x6f,
+	0x6f, 0x00, 0x6f, 0x77, 0xad, 0xc1, 0xcc, 0x50, 0xf6, 0x04, 0xca, 0x9f, 0x06, 0x5d, 0xb5, 0x11,
+	0xfa, 0xc9, 0xc7, 0xbe, 0x5a, 0xdf, 0x32, 0x34, 0xb3, 0x9f, 0xb3, 0x9c, 0x7e, 0xbe, 0x8f, 0x4d,
+	0x16, 0x53, 0x9e, 0x8b, 0x34, 0x5b, 0x27, 0x97, 0xff, 0x3b, 0xbe, 0x1b, 0x8c, 0x3b, 0x71, 0xa6,
+	0xfc, 0xc1, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x58, 0x75, 0xc0, 0x49, 0x1f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2964,156 +2708,3 @@ var _JobController_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dataproc/v1/jobs.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1/jobs.proto", fileDescriptor_jobs_a9b426fd7b89528f)
-}
-
-var fileDescriptor_jobs_a9b426fd7b89528f = []byte{
-	// 2320 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcf, 0x73, 0x23, 0x47,
-	0xf5, 0xb7, 0x7e, 0x6b, 0x9e, 0x6c, 0x79, 0xdc, 0xd9, 0xcd, 0x57, 0x5f, 0x25, 0xa9, 0x38, 0xb3,
-	0x64, 0xf1, 0x2e, 0x20, 0x61, 0x05, 0x36, 0x1b, 0x1b, 0xd8, 0xc8, 0xd2, 0x78, 0x25, 0x47, 0x2b,
-	0x6b, 0x47, 0xd2, 0x6e, 0x41, 0x15, 0x35, 0x3b, 0x92, 0xda, 0xf2, 0xd8, 0xa3, 0x99, 0xf1, 0xf4,
-	0x8c, 0x6b, 0x95, 0xad, 0xbd, 0x70, 0xe1, 0x48, 0x01, 0xa7, 0x50, 0xc5, 0x85, 0x1b, 0x7f, 0x00,
-	0x5c, 0x28, 0x8a, 0x0b, 0x67, 0x2e, 0x5c, 0xa9, 0x9c, 0x38, 0x72, 0xe2, 0x2f, 0xa0, 0xba, 0x7b,
-	0x46, 0x96, 0x64, 0xeb, 0x87, 0x77, 0x21, 0x95, 0xe4, 0xe4, 0x9e, 0x7e, 0x3f, 0xfa, 0x75, 0x7f,
-	0x3e, 0xfd, 0xde, 0x6b, 0x19, 0x6e, 0xf5, 0x2d, 0xab, 0x6f, 0xe0, 0x7c, 0xd7, 0xb0, 0xbc, 0x5e,
-	0xbe, 0xa7, 0xb9, 0x9a, 0xed, 0x58, 0xdd, 0xfc, 0xf9, 0x76, 0xfe, 0xc4, 0xea, 0x90, 0x9c, 0xed,
-	0x58, 0xae, 0x85, 0x32, 0x5c, 0x29, 0xc7, 0x94, 0x72, 0x81, 0x52, 0xee, 0x7c, 0x3b, 0xfb, 0xb6,
-	0x6f, 0xae, 0xd9, 0x7a, 0x5e, 0x33, 0x4d, 0xcb, 0xd5, 0x5c, 0xdd, 0x32, 0x7d, 0xbb, 0xec, 0x5b,
-	0xbe, 0x94, 0x7d, 0x75, 0xbc, 0xa3, 0x3c, 0x1e, 0xd8, 0xee, 0xd0, 0x17, 0x6e, 0x4e, 0x0b, 0x8f,
-	0x74, 0x6c, 0xf4, 0xd4, 0x81, 0x46, 0x4e, 0x7d, 0x8d, 0x77, 0xa7, 0x35, 0x5c, 0x7d, 0x80, 0x89,
-	0xab, 0x0d, 0x6c, 0xae, 0x20, 0x7d, 0x1e, 0x86, 0xb5, 0x9a, 0xd5, 0xef, 0xeb, 0x66, 0xbf, 0x64,
-	0x99, 0x47, 0x7a, 0x1f, 0x1d, 0xc3, 0x46, 0xcf, 0xd1, 0xcf, 0xb1, 0xa3, 0x1a, 0x56, 0x5f, 0x35,
-	0xf0, 0x39, 0x36, 0x48, 0x26, 0xbc, 0x19, 0xd9, 0x4a, 0x15, 0x7e, 0x90, 0x9b, 0xb5, 0x8b, 0xdc,
-	0x84, 0x8f, 0x5c, 0x99, 0x39, 0xa8, 0x59, 0xfd, 0x1a, 0x33, 0x97, 0x4d, 0xd7, 0x19, 0x2a, 0xeb,
-	0xbd, 0xc9, 0xd9, 0xec, 0x19, 0xdc, 0xb8, 0x4a, 0x11, 0x89, 0x10, 0x39, 0xc5, 0xc3, 0x4c, 0x68,
-	0x33, 0xb4, 0x25, 0x28, 0x74, 0x88, 0x4a, 0x10, 0x3b, 0xd7, 0x0c, 0x0f, 0x67, 0xc2, 0x9b, 0xa1,
-	0xad, 0x74, 0xe1, 0x3b, 0xcb, 0xc6, 0xc1, 0xbc, 0x2a, 0xdc, 0x76, 0x27, 0x7c, 0x3f, 0x24, 0xd9,
-	0x10, 0x63, 0x73, 0xe8, 0x26, 0x6c, 0xd4, 0xe4, 0x27, 0x72, 0x4d, 0x6d, 0xd7, 0x9b, 0x0d, 0xb9,
-	0x54, 0xdd, 0xaf, 0xca, 0x65, 0x71, 0x05, 0x25, 0x20, 0x52, 0xac, 0xd5, 0xc4, 0x10, 0x12, 0x20,
-	0xd6, 0x52, 0x8a, 0x25, 0x59, 0x0c, 0xd3, 0x61, 0x59, 0xde, 0x6b, 0x3f, 0x14, 0x23, 0x28, 0x09,
-	0xd1, 0x6a, 0x7d, 0xff, 0x50, 0x8c, 0xd2, 0xd1, 0xd3, 0xa2, 0x52, 0x17, 0x63, 0x54, 0x2c, 0x2b,
-	0xca, 0xa1, 0x22, 0xc6, 0xe9, 0x70, 0xbf, 0xd8, 0x2a, 0xd6, 0xc4, 0x04, 0x75, 0x74, 0xb8, 0xbf,
-	0x2f, 0x26, 0xa5, 0xbf, 0x44, 0x40, 0xa8, 0x68, 0x3d, 0xcb, 0xb2, 0x0f, 0xac, 0x0e, 0xfa, 0x16,
-	0x6c, 0x0c, 0x34, 0xdd, 0x54, 0x4f, 0x34, 0x47, 0x3d, 0xd2, 0x0d, 0xac, 0x7a, 0x8e, 0xce, 0x37,
-	0x5a, 0x59, 0x51, 0xd2, 0x54, 0x74, 0xa0, 0x39, 0xfb, 0xba, 0x81, 0xdb, 0x8e, 0x8e, 0xde, 0x05,
-	0x60, 0xca, 0x5d, 0x43, 0x23, 0x84, 0x6d, 0x9d, 0x6a, 0x09, 0x74, 0xae, 0x44, 0xa7, 0x10, 0x82,
-	0xa8, 0xe6, 0xf4, 0x49, 0x26, 0xb2, 0x19, 0xd9, 0x12, 0x14, 0x36, 0x46, 0x12, 0xac, 0x8d, 0x3b,
-	0x27, 0x99, 0x28, 0x13, 0xa6, 0x4e, 0x46, 0x7e, 0x09, 0x7a, 0x0b, 0x84, 0x0b, 0x79, 0x8c, 0xc9,
-	0x93, 0x47, 0x81, 0xf0, 0x3d, 0x58, 0xd5, 0x9c, 0xee, 0xb1, 0x7e, 0xee, 0xcb, 0xe3, 0xdc, 0xde,
-	0x9f, 0x63, 0x2a, 0x4d, 0x00, 0xdb, 0xb1, 0x6c, 0xec, 0xb8, 0x3a, 0x26, 0x99, 0x04, 0xe3, 0xc6,
-	0x07, 0xb3, 0x31, 0x19, 0x6d, 0x3f, 0xd7, 0x18, 0x59, 0x71, 0x4a, 0x8c, 0xb9, 0x41, 0x75, 0x48,
-	0x1b, 0x1c, 0x3c, 0xb5, 0xcb, 0xd0, 0xcb, 0x24, 0x37, 0x43, 0x5b, 0xa9, 0xc2, 0x37, 0x97, 0x04,
-	0x5b, 0x59, 0x33, 0xc6, 0x3f, 0xb3, 0x3f, 0x84, 0xf5, 0xa9, 0xe5, 0xae, 0x20, 0xd6, 0x8d, 0x71,
-	0x62, 0x09, 0x63, 0x4c, 0xd9, 0x4b, 0x42, 0x9c, 0xf3, 0x55, 0xfa, 0x73, 0x04, 0x92, 0x4d, 0x5b,
-	0x73, 0x4e, 0xbf, 0x3e, 0x00, 0x2a, 0x57, 0x00, 0x58, 0x98, 0x7d, 0xce, 0xc1, 0xee, 0xbf, 0x9a,
-	0xf8, 0xfd, 0x35, 0x02, 0xd0, 0x18, 0x8e, 0x10, 0xcc, 0xc3, 0x0d, 0x06, 0x8a, 0x3d, 0x74, 0x8f,
-	0x2d, 0x73, 0x0a, 0x44, 0x85, 0xa1, 0xdb, 0x60, 0xa2, 0x00, 0xc5, 0x00, 0xa4, 0xf0, 0x18, 0x48,
-	0x5b, 0x20, 0x4e, 0xd9, 0x07, 0x20, 0xa6, 0xed, 0x71, 0xe3, 0x2f, 0x06, 0xce, 0xd6, 0x15, 0x70,
-	0x7e, 0x6f, 0xf6, 0xb1, 0x5f, 0x1c, 0xc6, 0x57, 0x08, 0x50, 0xe9, 0x7d, 0x10, 0x1e, 0x7b, 0xd8,
-	0x19, 0xd6, 0x74, 0xe2, 0xa2, 0x0c, 0x24, 0xce, 0x3c, 0xec, 0xd0, 0xed, 0x86, 0xd8, 0x79, 0x04,
-	0x9f, 0xd2, 0x2f, 0xa2, 0x90, 0xa8, 0xe8, 0xe7, 0x98, 0x42, 0x7d, 0x1b, 0xd2, 0x74, 0x7a, 0x78,
-	0xf9, 0xa6, 0xae, 0xb2, 0xf9, 0x00, 0xe1, 0x32, 0x00, 0xd7, 0x33, 0x74, 0xe2, 0xb2, 0x95, 0x53,
-	0x85, 0x5b, 0xb3, 0x77, 0x39, 0x0a, 0x83, 0x5e, 0xe6, 0xb3, 0x51, 0x4c, 0x39, 0x78, 0xa3, 0x6b,
-	0x99, 0xae, 0x6e, 0x7a, 0x58, 0xa5, 0xc4, 0xd0, 0x74, 0xc3, 0x73, 0x70, 0x26, 0xb2, 0x19, 0xda,
-	0x4a, 0x2a, 0x1b, 0x81, 0xe8, 0xd0, 0xdc, 0xe7, 0x02, 0xa4, 0x81, 0x48, 0xba, 0x8e, 0x6e, 0xbb,
-	0xea, 0xb9, 0xe6, 0xe8, 0x5a, 0xc7, 0xc0, 0x9c, 0x1c, 0xa9, 0xc2, 0xbd, 0x39, 0xb9, 0x94, 0x6f,
-	0x2d, 0xd7, 0x64, 0x96, 0x4f, 0x02, 0x43, 0xbf, 0xc2, 0x92, 0xc9, 0x59, 0xf4, 0x78, 0x82, 0x18,
-	0x31, 0xe6, 0x7c, 0x7b, 0xb1, 0xf3, 0x79, 0xac, 0xb8, 0xc4, 0xe7, 0xf8, 0x25, 0x3e, 0x67, 0xf7,
-	0xe0, 0xc6, 0x55, 0xf1, 0x5d, 0x07, 0xee, 0xd7, 0xbd, 0xfe, 0xc2, 0x88, 0x20, 0xd2, 0x9f, 0xa2,
-	0x90, 0x62, 0x84, 0x6f, 0x9e, 0x19, 0x5f, 0x3c, 0x2b, 0xf0, 0x15, 0x28, 0x47, 0x18, 0x10, 0x3b,
-	0x0b, 0x12, 0x2e, 0x0f, 0x77, 0x49, 0xa4, 0xdb, 0x13, 0x48, 0x73, 0x1a, 0x7d, 0x7f, 0xb9, 0x05,
-	0xae, 0x85, 0xf6, 0xfd, 0xcb, 0xd9, 0xeb, 0x72, 0x9e, 0x88, 0xbf, 0x56, 0x9e, 0xf8, 0x72, 0xb1,
-	0xe7, 0x1f, 0x51, 0x88, 0x37, 0xf4, 0xfe, 0x97, 0x3f, 0x9d, 0x3c, 0x9b, 0x99, 0x4e, 0xe6, 0xf0,
-	0x80, 0xef, 0x6c, 0x49, 0x8e, 0x35, 0xae, 0xc8, 0x26, 0xdf, 0x5d, 0xe8, 0xfb, 0x35, 0x93, 0xc9,
-	0x15, 0xf4, 0x4a, 0x7c, 0x8d, 0xe8, 0xd5, 0x82, 0xd5, 0x03, 0xab, 0xd3, 0x30, 0xb4, 0x2e, 0x1e,
-	0x60, 0xd3, 0xa5, 0xd5, 0xbe, 0x6b, 0x78, 0xc4, 0xc5, 0x8e, 0x6a, 0x6a, 0x03, 0xec, 0xfb, 0x4b,
-	0xf9, 0x73, 0x75, 0x6d, 0x80, 0xc7, 0x55, 0x3c, 0x4f, 0xef, 0xf9, 0xee, 0x03, 0x95, 0xb6, 0xa7,
-	0xf7, 0xa4, 0x7f, 0x45, 0x40, 0x38, 0xb0, 0x3a, 0x4d, 0x57, 0x73, 0x3d, 0x82, 0x1e, 0x40, 0x8c,
-	0xb8, 0x9a, 0xcb, 0x9d, 0xa5, 0x0b, 0x77, 0x66, 0x1f, 0xdc, 0xc8, 0x26, 0x47, 0xff, 0x60, 0x85,
-	0xdb, 0xd1, 0x6a, 0xdb, 0xc3, 0xae, 0xa6, 0x1b, 0x7e, 0x13, 0xab, 0x04, 0x9f, 0xa8, 0x0c, 0x22,
-	0x53, 0x51, 0x89, 0xab, 0x39, 0xae, 0x4a, 0x5f, 0x97, 0xfe, 0xed, 0xcf, 0x06, 0xab, 0x04, 0x4f,
-	0xcf, 0x5c, 0x2b, 0x78, 0x7a, 0x2a, 0x69, 0x66, 0xd3, 0xa4, 0x26, 0x74, 0x12, 0x55, 0x20, 0x49,
-	0xbc, 0x0e, 0x8f, 0x31, 0xc1, 0x62, 0xfc, 0xf6, 0x52, 0x31, 0xfa, 0x36, 0xca, 0xc8, 0x5a, 0xfa,
-	0x7d, 0x08, 0x62, 0x2c, 0x74, 0xfa, 0xc0, 0x6b, 0xb6, 0x8a, 0x2d, 0x79, 0xea, 0x81, 0x97, 0x82,
-	0x44, 0x43, 0xae, 0x97, 0xab, 0xf5, 0x87, 0x62, 0x08, 0xa5, 0x01, 0x9a, 0x72, 0xab, 0xdd, 0x50,
-	0xcb, 0x87, 0x75, 0x59, 0x4c, 0x52, 0xa1, 0xd2, 0xae, 0xd7, 0xa9, 0x30, 0x8c, 0x10, 0xa4, 0x4b,
-	0xc5, 0x7a, 0x49, 0xae, 0xa9, 0x81, 0x41, 0x64, 0x6c, 0xae, 0xd9, 0x2a, 0x2a, 0x2d, 0xb9, 0x2c,
-	0x26, 0xd0, 0x1a, 0x08, 0x7c, 0xae, 0x26, 0x97, 0xf9, 0xc3, 0x90, 0x79, 0x9b, 0x78, 0x18, 0xbe,
-	0x01, 0xeb, 0xc5, 0x56, 0x4b, 0x7e, 0xd4, 0x68, 0xa9, 0xfb, 0xc5, 0x6a, 0xad, 0xad, 0xc8, 0xa2,
-	0x20, 0x55, 0x20, 0x19, 0xec, 0x00, 0xad, 0x43, 0x6a, 0x32, 0xce, 0x35, 0x10, 0x9a, 0xed, 0xbd,
-	0x47, 0xd5, 0x16, 0x5d, 0x24, 0x84, 0x00, 0xe2, 0x8f, 0xdb, 0x72, 0x5b, 0x2e, 0x8b, 0x61, 0x24,
-	0xc2, 0x6a, 0xb3, 0x55, 0xac, 0xc9, 0x34, 0x86, 0x56, 0xbb, 0x29, 0x46, 0xa4, 0x32, 0x23, 0x91,
-	0x82, 0x8f, 0xb0, 0x83, 0xcd, 0x2e, 0x46, 0xef, 0xb0, 0x8b, 0x7a, 0x82, 0xbb, 0xae, 0xaa, 0xf7,
-	0x7c, 0x0a, 0x09, 0xfe, 0x4c, 0xb5, 0x87, 0x6e, 0x42, 0xfc, 0xc4, 0xea, 0xa8, 0x23, 0xea, 0xc4,
-	0x4e, 0xac, 0x4e, 0xb5, 0x27, 0xfd, 0x21, 0x0c, 0xeb, 0x3f, 0xd6, 0x1c, 0xb3, 0x68, 0xdb, 0x86,
-	0xde, 0x65, 0xbf, 0x42, 0xd0, 0xde, 0x77, 0x8c, 0x86, 0x6c, 0x8c, 0xe4, 0x80, 0x4e, 0xfc, 0x31,
-	0x9e, 0x9f, 0x0d, 0xd5, 0x94, 0xb7, 0x49, 0x52, 0x65, 0x21, 0x69, 0x3b, 0x56, 0xdf, 0xc1, 0x84,
-	0xb0, 0xa4, 0x16, 0x56, 0x46, 0xdf, 0x94, 0xe2, 0xae, 0xa3, 0x75, 0x4f, 0xe9, 0xa5, 0xf7, 0x1c,
-	0x23, 0x13, 0xe5, 0x14, 0x0f, 0xe6, 0xda, 0x8e, 0x21, 0xfd, 0x7c, 0x11, 0xd2, 0x09, 0x88, 0xd4,
-	0xe5, 0xa7, 0x1c, 0xe5, 0xba, 0xfc, 0x54, 0x6d, 0x16, 0x9f, 0x70, 0x60, 0x27, 0x8e, 0x36, 0x82,
-	0x56, 0x21, 0x59, 0x2c, 0x95, 0xe4, 0x46, 0x8b, 0xc1, 0x37, 0x46, 0x81, 0x18, 0x15, 0xed, 0x57,
-	0xeb, 0xd5, 0x66, 0x45, 0x2e, 0x8b, 0x71, 0x8a, 0x01, 0x05, 0x8f, 0x81, 0x0e, 0x10, 0xff, 0xa4,
-	0xca, 0x10, 0x4f, 0x4a, 0xff, 0x4e, 0x42, 0x84, 0x96, 0x87, 0x32, 0x08, 0x4e, 0x00, 0x01, 0x3b,
-	0xb0, 0x54, 0xe1, 0xf6, 0x5c, 0x1a, 0x8f, 0x00, 0x53, 0x2e, 0x0c, 0xa9, 0x17, 0x3b, 0xc8, 0x06,
-	0x7e, 0xed, 0x98, 0xef, 0x65, 0x94, 0x3b, 0x94, 0x0b, 0x43, 0x5a, 0x82, 0x8e, 0xd9, 0xab, 0x5b,
-	0x3d, 0xb1, 0x3a, 0xec, 0x78, 0xe7, 0x96, 0xa0, 0xd1, 0x0b, 0x9d, 0x96, 0xa0, 0xe3, 0xd1, 0xaf,
-	0x15, 0x45, 0x10, 0x08, 0x6d, 0x14, 0x98, 0x93, 0x28, 0x73, 0x22, 0x2d, 0x7e, 0x25, 0x56, 0x56,
-	0x94, 0x24, 0x09, 0x5e, 0x5b, 0x0f, 0x21, 0x65, 0x0f, 0x2f, 0x9c, 0xc4, 0x98, 0x93, 0x6f, 0x2c,
-	0xf3, 0x36, 0xa9, 0xac, 0x28, 0xe0, 0x9b, 0x52, 0x47, 0x3f, 0x82, 0x24, 0x7b, 0x03, 0x51, 0x2f,
-	0x3c, 0xc3, 0xbc, 0xb7, 0xb0, 0x91, 0xad, 0xac, 0x28, 0x89, 0x63, 0xff, 0x2d, 0xb0, 0x0b, 0x09,
-	0x5b, 0xef, 0x33, 0x73, 0x5e, 0x3f, 0x36, 0x17, 0x55, 0xae, 0xca, 0x8a, 0x12, 0xb7, 0x79, 0xe5,
-	0xff, 0x04, 0xd6, 0xf8, 0x1e, 0xc8, 0x99, 0xc1, 0x5c, 0xac, 0x32, 0x17, 0xef, 0x2f, 0xd5, 0x60,
-	0x55, 0x56, 0x94, 0x14, 0x19, 0xeb, 0x3f, 0x77, 0x21, 0x4e, 0x58, 0x02, 0xf3, 0xdf, 0x53, 0xb7,
-	0x96, 0xc8, 0x75, 0x8a, 0x6f, 0x82, 0x0e, 0x20, 0xcd, 0x47, 0xea, 0xb1, 0x4e, 0x5c, 0xcb, 0x19,
-	0x66, 0xd6, 0x58, 0x1d, 0x5e, 0xca, 0xc9, 0x1a, 0x37, 0xad, 0x70, 0x4b, 0xf4, 0x04, 0x36, 0x86,
-	0x9a, 0x63, 0xaa, 0xda, 0xc5, 0x15, 0x25, 0x19, 0x81, 0xb9, 0xbb, 0xb3, 0xf4, 0xa5, 0x56, 0xc4,
-	0xe1, 0xe4, 0x04, 0x41, 0xbb, 0x90, 0xf5, 0x7f, 0x41, 0xb4, 0x3c, 0xd7, 0xf6, 0x5c, 0xd5, 0xc1,
-	0xc4, 0xf2, 0x9c, 0x2e, 0xef, 0x99, 0x36, 0xd8, 0x5d, 0xfe, 0x3f, 0xae, 0x71, 0xc8, 0x14, 0x14,
-	0x5f, 0x4e, 0x9b, 0xa7, 0x0f, 0x21, 0xe3, 0x1b, 0xd3, 0x16, 0xc7, 0xb1, 0x0c, 0xd6, 0x1d, 0x10,
-	0x66, 0xba, 0xce, 0x4c, 0x6f, 0x72, 0x79, 0x89, 0x8b, 0x69, 0x9f, 0x40, 0xa8, 0x61, 0x11, 0xe2,
-	0x86, 0xd6, 0xc1, 0x06, 0xc9, 0xa0, 0x45, 0x5b, 0xa0, 0x6d, 0x49, 0x8d, 0xe9, 0xf2, 0x96, 0xc4,
-	0x37, 0x44, 0x0f, 0x01, 0x48, 0xf7, 0x18, 0xf7, 0x3c, 0x43, 0x37, 0xfb, 0x99, 0x1b, 0x8b, 0xda,
-	0x0c, 0x7a, 0xb0, 0x23, 0x75, 0x65, 0xcc, 0x14, 0xfd, 0x3f, 0x24, 0x69, 0x86, 0x65, 0xe5, 0xf9,
-	0x4d, 0x5e, 0x31, 0x4f, 0xac, 0x0e, 0x2d, 0xcd, 0xd9, 0x8f, 0x20, 0x35, 0xb6, 0xf4, 0xb5, 0xda,
-	0x06, 0x80, 0xa4, 0x3b, 0xb4, 0xd9, 0x15, 0x90, 0xf6, 0x60, 0x6d, 0x62, 0x79, 0xb4, 0x0d, 0x37,
-	0x07, 0xda, 0xf3, 0xa0, 0x4d, 0x24, 0xaa, 0x8d, 0x1d, 0xf5, 0xd8, 0xf2, 0x1c, 0xe6, 0x3a, 0xa6,
-	0xa0, 0x81, 0xf6, 0xdc, 0xef, 0x14, 0x49, 0x03, 0x3b, 0x15, 0xcb, 0x73, 0xa4, 0xcf, 0x42, 0x20,
-	0x36, 0xbd, 0xce, 0x40, 0x77, 0x59, 0x32, 0x3a, 0xf3, 0x30, 0x71, 0x17, 0xd5, 0x8e, 0x37, 0x21,
-	0xee, 0xe0, 0xbe, 0x6e, 0x99, 0x2c, 0xa9, 0x08, 0x8a, 0xff, 0x85, 0xf2, 0x10, 0xa1, 0xf7, 0x82,
-	0x27, 0xac, 0x77, 0xe6, 0xa7, 0x3d, 0xaa, 0x49, 0xd7, 0x71, 0xf8, 0x92, 0x74, 0x1d, 0x9e, 0xe0,
-	0x05, 0x7f, 0xa6, 0xda, 0x93, 0x7e, 0x0a, 0x6b, 0x0f, 0xf1, 0x7f, 0x21, 0xae, 0x19, 0xb5, 0xee,
-	0xf3, 0x30, 0xac, 0xd3, 0x2e, 0xfb, 0xc0, 0xea, 0x90, 0x6b, 0xaf, 0x10, 0x9f, 0x58, 0xe1, 0x2d,
-	0x10, 0x6c, 0xad, 0x8f, 0x55, 0xa2, 0x7f, 0xca, 0x31, 0x8b, 0x29, 0x49, 0x3a, 0xd1, 0xd4, 0x3f,
-	0xe5, 0x95, 0x98, 0x0a, 0x5d, 0xeb, 0x14, 0x07, 0xa1, 0x31, 0xf5, 0x16, 0x9d, 0xb8, 0xd4, 0xed,
-	0x45, 0x2f, 0x77, 0x7b, 0x18, 0x36, 0xe8, 0x06, 0x78, 0x97, 0x35, 0xd0, 0xdc, 0xee, 0x31, 0x76,
-	0x58, 0x1a, 0x4d, 0x17, 0x3e, 0x9a, 0xd3, 0x01, 0x4f, 0xee, 0x2d, 0xc8, 0x01, 0xf8, 0x11, 0x77,
-	0xa0, 0xac, 0x9f, 0x4c, 0x4e, 0xd0, 0xdd, 0x1d, 0xe9, 0x86, 0x8b, 0x1d, 0x96, 0x1d, 0x05, 0xc5,
-	0xff, 0x92, 0xee, 0xc1, 0xfa, 0x94, 0x6d, 0xf0, 0x1b, 0xf9, 0x0a, 0x2d, 0x82, 0xc5, 0x52, 0xab,
-	0xfa, 0x44, 0xf6, 0x8b, 0xec, 0x61, 0x5d, 0xf5, 0xbf, 0xc3, 0xd2, 0xdf, 0x42, 0x20, 0xb6, 0xed,
-	0x9e, 0xe6, 0xe2, 0x57, 0xc1, 0x30, 0x3c, 0x03, 0xc3, 0xc8, 0x18, 0x86, 0x01, 0xe5, 0xa2, 0x4b,
-	0x53, 0x6e, 0x17, 0x52, 0x1e, 0x0b, 0x89, 0xfd, 0x87, 0xc4, 0xaf, 0x45, 0x97, 0xfb, 0xd4, 0x7d,
-	0x1d, 0x1b, 0xbd, 0x47, 0x1a, 0x39, 0x55, 0x80, 0xab, 0xd3, 0xb1, 0x34, 0x00, 0xf1, 0xe2, 0x50,
-	0x89, 0x6d, 0x99, 0x04, 0xa3, 0x6d, 0x88, 0x9e, 0x58, 0x1d, 0xfe, 0x13, 0xd4, 0xc2, 0x10, 0x98,
-	0x2a, 0xba, 0x0d, 0xeb, 0x26, 0x7e, 0xee, 0xaa, 0x63, 0xac, 0xe0, 0x9b, 0x5d, 0xa3, 0xd3, 0x8d,
-	0x80, 0x19, 0xd2, 0x33, 0x10, 0x4b, 0x9a, 0xd9, 0xc5, 0xc6, 0xff, 0xec, 0x0a, 0x3c, 0x03, 0xb1,
-	0x8c, 0x0d, 0xfc, 0x6a, 0x00, 0x2d, 0xb3, 0x42, 0xe1, 0x8f, 0x09, 0x96, 0xa4, 0xfc, 0x44, 0x6d,
-	0x60, 0x07, 0x7d, 0x16, 0x02, 0x61, 0x94, 0x71, 0xd0, 0xdd, 0x39, 0xe5, 0x73, 0x2a, 0x2d, 0x65,
-	0xe7, 0x1f, 0xae, 0x54, 0xfc, 0xd9, 0xdf, 0xff, 0xf9, 0xeb, 0xf0, 0xae, 0x74, 0x2f, 0x7f, 0xbe,
-	0x9d, 0xf7, 0x03, 0x26, 0xf9, 0x17, 0x17, 0x9b, 0x79, 0x99, 0xe7, 0xb1, 0x92, 0xfc, 0x0b, 0x3e,
-	0x78, 0xc9, 0xfe, 0x3b, 0xb7, 0x43, 0xd8, 0x42, 0x3b, 0xa1, 0xbb, 0xe8, 0x57, 0x21, 0x88, 0xf3,
-	0x94, 0x83, 0xe6, 0xe4, 0xfc, 0x89, 0xa4, 0xb4, 0x28, 0xaa, 0x8f, 0x59, 0x54, 0x3b, 0xe8, 0xfe,
-	0x35, 0xa3, 0xca, 0xbf, 0xe0, 0xc7, 0xf9, 0x12, 0xfd, 0x26, 0x04, 0xc9, 0x80, 0x76, 0xe8, 0xce,
-	0xd2, 0xf7, 0x3d, 0x7b, 0x77, 0x19, 0x55, 0xce, 0x62, 0xe9, 0x43, 0x16, 0xe5, 0x36, 0xca, 0x5f,
-	0x33, 0x4a, 0xf4, 0xdb, 0x10, 0x08, 0xa3, 0x3b, 0x3e, 0x0f, 0xcd, 0xe9, 0x44, 0xb0, 0xe8, 0xdc,
-	0x64, 0x16, 0xd1, 0x83, 0xc2, 0x2b, 0x9f, 0xdb, 0x0e, 0xbb, 0xef, 0xbf, 0x0b, 0x81, 0x30, 0xba,
-	0x44, 0xf3, 0xe2, 0x9b, 0xbe, 0x69, 0x8b, 0xe2, 0x3b, 0x60, 0xf1, 0x95, 0xa5, 0x07, 0xaf, 0x1c,
-	0x5f, 0x97, 0xad, 0x48, 0x69, 0xf7, 0xcb, 0x10, 0x08, 0xa3, 0x7b, 0x38, 0x2f, 0xc8, 0xe9, 0xcb,
-	0x9a, 0x7d, 0xf3, 0x52, 0xe6, 0x92, 0x07, 0xb6, 0x3b, 0x0c, 0x58, 0x77, 0xf7, 0x95, 0x4f, 0x6f,
-	0x6f, 0x00, 0x6f, 0x77, 0xad, 0xc1, 0xcc, 0x50, 0xf6, 0x04, 0xca, 0x9f, 0x06, 0x5d, 0xb5, 0x11,
-	0xfa, 0xc9, 0xc7, 0xbe, 0x5a, 0xdf, 0x32, 0x34, 0xb3, 0x9f, 0xb3, 0x9c, 0x7e, 0xbe, 0x8f, 0x4d,
-	0x16, 0x53, 0x9e, 0x8b, 0x34, 0x5b, 0x27, 0x97, 0xff, 0x3b, 0xbe, 0x1b, 0x8c, 0x3b, 0x71, 0xa6,
-	0xfc, 0xc1, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x58, 0x75, 0xc0, 0x49, 0x1f, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dataproc/v1/operations.pb.go b/googleapis/cloud/dataproc/v1/operations.pb.go
index ff470d6fa9..fb4ed334e6 100644
--- a/googleapis/cloud/dataproc/v1/operations.pb.go
+++ b/googleapis/cloud/dataproc/v1/operations.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/operations.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+package dataproc
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The operation state.
 type ClusterOperationStatus_State int32
@@ -40,6 +43,7 @@ var ClusterOperationStatus_State_name = map[int32]string{
 	2: "RUNNING",
 	3: "DONE",
 }
+
 var ClusterOperationStatus_State_value = map[string]int32{
 	"UNKNOWN": 0,
 	"PENDING": 1,
@@ -50,8 +54,9 @@ var ClusterOperationStatus_State_value = map[string]int32{
 func (x ClusterOperationStatus_State) String() string {
 	return proto.EnumName(ClusterOperationStatus_State_name, int32(x))
 }
+
 func (ClusterOperationStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operations_5e90e9db40c022db, []int{0, 0}
+	return fileDescriptor_78b4f56947714756, []int{0, 0}
 }
 
 // The status of the operation.
@@ -73,16 +78,17 @@ func (m *ClusterOperationStatus) Reset()         { *m = ClusterOperationStatus{}
 func (m *ClusterOperationStatus) String() string { return proto.CompactTextString(m) }
 func (*ClusterOperationStatus) ProtoMessage()    {}
 func (*ClusterOperationStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_5e90e9db40c022db, []int{0}
+	return fileDescriptor_78b4f56947714756, []int{0}
 }
+
 func (m *ClusterOperationStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterOperationStatus.Unmarshal(m, b)
 }
 func (m *ClusterOperationStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterOperationStatus.Marshal(b, m, deterministic)
 }
-func (dst *ClusterOperationStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterOperationStatus.Merge(dst, src)
+func (m *ClusterOperationStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationStatus.Merge(m, src)
 }
 func (m *ClusterOperationStatus) XXX_Size() int {
 	return xxx_messageInfo_ClusterOperationStatus.Size(m)
@@ -148,16 +154,17 @@ func (m *ClusterOperationMetadata) Reset()         { *m = ClusterOperationMetada
 func (m *ClusterOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ClusterOperationMetadata) ProtoMessage()    {}
 func (*ClusterOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_5e90e9db40c022db, []int{1}
+	return fileDescriptor_78b4f56947714756, []int{1}
 }
+
 func (m *ClusterOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterOperationMetadata.Unmarshal(m, b)
 }
 func (m *ClusterOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ClusterOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterOperationMetadata.Merge(dst, src)
+func (m *ClusterOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationMetadata.Merge(m, src)
 }
 func (m *ClusterOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ClusterOperationMetadata.Size(m)
@@ -225,17 +232,17 @@ func (m *ClusterOperationMetadata) GetWarnings() []string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1.ClusterOperationStatus_State", ClusterOperationStatus_State_name, ClusterOperationStatus_State_value)
 	proto.RegisterType((*ClusterOperationStatus)(nil), "google.cloud.dataproc.v1.ClusterOperationStatus")
 	proto.RegisterType((*ClusterOperationMetadata)(nil), "google.cloud.dataproc.v1.ClusterOperationMetadata")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.ClusterOperationMetadata.LabelsEntry")
-	proto.RegisterEnum("google.cloud.dataproc.v1.ClusterOperationStatus_State", ClusterOperationStatus_State_name, ClusterOperationStatus_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1/operations.proto", fileDescriptor_operations_5e90e9db40c022db)
+	proto.RegisterFile("google/cloud/dataproc/v1/operations.proto", fileDescriptor_78b4f56947714756)
 }
 
-var fileDescriptor_operations_5e90e9db40c022db = []byte{
+var fileDescriptor_78b4f56947714756 = []byte{
 	// 531 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x5d, 0x8b, 0xd3, 0x40,
 	0x14, 0x35, 0xcd, 0xee, 0xb6, 0xbd, 0xd9, 0xd6, 0x32, 0x88, 0x0c, 0x65, 0x61, 0x63, 0x41, 0xa8,
diff --git a/googleapis/cloud/dataproc/v1/workflow_templates.pb.go b/googleapis/cloud/dataproc/v1/workflow_templates.pb.go
index 9104799729..3d2f25a146 100644
--- a/googleapis/cloud/dataproc/v1/workflow_templates.pb.go
+++ b/googleapis/cloud/dataproc/v1/workflow_templates.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/workflow_templates.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package dataproc
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The operation state.
 type WorkflowMetadata_State int32
@@ -47,6 +47,7 @@ var WorkflowMetadata_State_name = map[int32]string{
 	2: "RUNNING",
 	3: "DONE",
 }
+
 var WorkflowMetadata_State_value = map[string]int32{
 	"UNKNOWN": 0,
 	"PENDING": 1,
@@ -57,8 +58,9 @@ var WorkflowMetadata_State_value = map[string]int32{
 func (x WorkflowMetadata_State) String() string {
 	return proto.EnumName(WorkflowMetadata_State_name, int32(x))
 }
+
 func (WorkflowMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{9, 0}
+	return fileDescriptor_a839f5a867063db9, []int{9, 0}
 }
 
 // The workflow node state.
@@ -88,6 +90,7 @@ var WorkflowNode_NodeState_name = map[int32]string{
 	4: "COMPLETED",
 	5: "FAILED",
 }
+
 var WorkflowNode_NodeState_value = map[string]int32{
 	"NODE_STATE_UNSPECIFIED": 0,
 	"BLOCKED":                1,
@@ -100,8 +103,9 @@ var WorkflowNode_NodeState_value = map[string]int32{
 func (x WorkflowNode_NodeState) String() string {
 	return proto.EnumName(WorkflowNode_NodeState_name, int32(x))
 }
+
 func (WorkflowNode_NodeState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{12, 0}
+	return fileDescriptor_a839f5a867063db9, []int{12, 0}
 }
 
 // A Cloud Dataproc workflow template resource.
@@ -160,16 +164,17 @@ func (m *WorkflowTemplate) Reset()         { *m = WorkflowTemplate{} }
 func (m *WorkflowTemplate) String() string { return proto.CompactTextString(m) }
 func (*WorkflowTemplate) ProtoMessage()    {}
 func (*WorkflowTemplate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{0}
+	return fileDescriptor_a839f5a867063db9, []int{0}
 }
+
 func (m *WorkflowTemplate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowTemplate.Unmarshal(m, b)
 }
 func (m *WorkflowTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowTemplate.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowTemplate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowTemplate.Merge(dst, src)
+func (m *WorkflowTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowTemplate.Merge(m, src)
 }
 func (m *WorkflowTemplate) XXX_Size() int {
 	return xxx_messageInfo_WorkflowTemplate.Size(m)
@@ -263,16 +268,17 @@ func (m *WorkflowTemplatePlacement) Reset()         { *m = WorkflowTemplatePlace
 func (m *WorkflowTemplatePlacement) String() string { return proto.CompactTextString(m) }
 func (*WorkflowTemplatePlacement) ProtoMessage()    {}
 func (*WorkflowTemplatePlacement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{1}
+	return fileDescriptor_a839f5a867063db9, []int{1}
 }
+
 func (m *WorkflowTemplatePlacement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowTemplatePlacement.Unmarshal(m, b)
 }
 func (m *WorkflowTemplatePlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowTemplatePlacement.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowTemplatePlacement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowTemplatePlacement.Merge(dst, src)
+func (m *WorkflowTemplatePlacement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowTemplatePlacement.Merge(m, src)
 }
 func (m *WorkflowTemplatePlacement) XXX_Size() int {
 	return xxx_messageInfo_WorkflowTemplatePlacement.Size(m)
@@ -320,80 +326,14 @@ func (m *WorkflowTemplatePlacement) GetClusterSelector() *ClusterSelector {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*WorkflowTemplatePlacement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _WorkflowTemplatePlacement_OneofMarshaler, _WorkflowTemplatePlacement_OneofUnmarshaler, _WorkflowTemplatePlacement_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*WorkflowTemplatePlacement) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*WorkflowTemplatePlacement_ManagedCluster)(nil),
 		(*WorkflowTemplatePlacement_ClusterSelector)(nil),
 	}
 }
 
-func _WorkflowTemplatePlacement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*WorkflowTemplatePlacement)
-	// placement
-	switch x := m.Placement.(type) {
-	case *WorkflowTemplatePlacement_ManagedCluster:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ManagedCluster); err != nil {
-			return err
-		}
-	case *WorkflowTemplatePlacement_ClusterSelector:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ClusterSelector); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("WorkflowTemplatePlacement.Placement has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _WorkflowTemplatePlacement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*WorkflowTemplatePlacement)
-	switch tag {
-	case 1: // placement.managed_cluster
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ManagedCluster)
-		err := b.DecodeMessage(msg)
-		m.Placement = &WorkflowTemplatePlacement_ManagedCluster{msg}
-		return true, err
-	case 2: // placement.cluster_selector
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ClusterSelector)
-		err := b.DecodeMessage(msg)
-		m.Placement = &WorkflowTemplatePlacement_ClusterSelector{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _WorkflowTemplatePlacement_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*WorkflowTemplatePlacement)
-	// placement
-	switch x := m.Placement.(type) {
-	case *WorkflowTemplatePlacement_ManagedCluster:
-		s := proto.Size(x.ManagedCluster)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *WorkflowTemplatePlacement_ClusterSelector:
-		s := proto.Size(x.ClusterSelector)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Cluster that is managed by the workflow.
 type ManagedCluster struct {
 	// Required. The cluster name prefix. A unique cluster name will be formed by
@@ -425,16 +365,17 @@ func (m *ManagedCluster) Reset()         { *m = ManagedCluster{} }
 func (m *ManagedCluster) String() string { return proto.CompactTextString(m) }
 func (*ManagedCluster) ProtoMessage()    {}
 func (*ManagedCluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{2}
+	return fileDescriptor_a839f5a867063db9, []int{2}
 }
+
 func (m *ManagedCluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManagedCluster.Unmarshal(m, b)
 }
 func (m *ManagedCluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManagedCluster.Marshal(b, m, deterministic)
 }
-func (dst *ManagedCluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManagedCluster.Merge(dst, src)
+func (m *ManagedCluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedCluster.Merge(m, src)
 }
 func (m *ManagedCluster) XXX_Size() int {
 	return xxx_messageInfo_ManagedCluster.Size(m)
@@ -486,16 +427,17 @@ func (m *ClusterSelector) Reset()         { *m = ClusterSelector{} }
 func (m *ClusterSelector) String() string { return proto.CompactTextString(m) }
 func (*ClusterSelector) ProtoMessage()    {}
 func (*ClusterSelector) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{3}
+	return fileDescriptor_a839f5a867063db9, []int{3}
 }
+
 func (m *ClusterSelector) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterSelector.Unmarshal(m, b)
 }
 func (m *ClusterSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterSelector.Marshal(b, m, deterministic)
 }
-func (dst *ClusterSelector) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterSelector.Merge(dst, src)
+func (m *ClusterSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterSelector.Merge(m, src)
 }
 func (m *ClusterSelector) XXX_Size() int {
 	return xxx_messageInfo_ClusterSelector.Size(m)
@@ -569,16 +511,17 @@ func (m *OrderedJob) Reset()         { *m = OrderedJob{} }
 func (m *OrderedJob) String() string { return proto.CompactTextString(m) }
 func (*OrderedJob) ProtoMessage()    {}
 func (*OrderedJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{4}
+	return fileDescriptor_a839f5a867063db9, []int{4}
 }
+
 func (m *OrderedJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OrderedJob.Unmarshal(m, b)
 }
 func (m *OrderedJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OrderedJob.Marshal(b, m, deterministic)
 }
-func (dst *OrderedJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OrderedJob.Merge(dst, src)
+func (m *OrderedJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrderedJob.Merge(m, src)
 }
 func (m *OrderedJob) XXX_Size() int {
 	return xxx_messageInfo_OrderedJob.Size(m)
@@ -706,9 +649,9 @@ func (m *OrderedJob) GetPrerequisiteStepIds() []string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OrderedJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OrderedJob_OneofMarshaler, _OrderedJob_OneofUnmarshaler, _OrderedJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OrderedJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OrderedJob_HadoopJob)(nil),
 		(*OrderedJob_SparkJob)(nil),
 		(*OrderedJob_PysparkJob)(nil),
@@ -718,144 +661,6 @@ func (*OrderedJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _OrderedJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OrderedJob)
-	// job_type
-	switch x := m.JobType.(type) {
-	case *OrderedJob_HadoopJob:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HadoopJob); err != nil {
-			return err
-		}
-	case *OrderedJob_SparkJob:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkJob); err != nil {
-			return err
-		}
-	case *OrderedJob_PysparkJob:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PysparkJob); err != nil {
-			return err
-		}
-	case *OrderedJob_HiveJob:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HiveJob); err != nil {
-			return err
-		}
-	case *OrderedJob_PigJob:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PigJob); err != nil {
-			return err
-		}
-	case *OrderedJob_SparkSqlJob:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkSqlJob); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OrderedJob.JobType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OrderedJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OrderedJob)
-	switch tag {
-	case 2: // job_type.hadoop_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HadoopJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_HadoopJob{msg}
-		return true, err
-	case 3: // job_type.spark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_SparkJob{msg}
-		return true, err
-	case 4: // job_type.pyspark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PySparkJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_PysparkJob{msg}
-		return true, err
-	case 5: // job_type.hive_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HiveJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_HiveJob{msg}
-		return true, err
-	case 6: // job_type.pig_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PigJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_PigJob{msg}
-		return true, err
-	case 7: // job_type.spark_sql_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkSqlJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_SparkSqlJob{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OrderedJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OrderedJob)
-	// job_type
-	switch x := m.JobType.(type) {
-	case *OrderedJob_HadoopJob:
-		s := proto.Size(x.HadoopJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_SparkJob:
-		s := proto.Size(x.SparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_PysparkJob:
-		s := proto.Size(x.PysparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_HiveJob:
-		s := proto.Size(x.HiveJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_PigJob:
-		s := proto.Size(x.PigJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_SparkSqlJob:
-		s := proto.Size(x.SparkSqlJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A configurable parameter that replaces one or more fields in the template.
 // Parameterizable fields:
 // - Labels
@@ -933,16 +738,17 @@ func (m *TemplateParameter) Reset()         { *m = TemplateParameter{} }
 func (m *TemplateParameter) String() string { return proto.CompactTextString(m) }
 func (*TemplateParameter) ProtoMessage()    {}
 func (*TemplateParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{5}
+	return fileDescriptor_a839f5a867063db9, []int{5}
 }
+
 func (m *TemplateParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TemplateParameter.Unmarshal(m, b)
 }
 func (m *TemplateParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TemplateParameter.Marshal(b, m, deterministic)
 }
-func (dst *TemplateParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TemplateParameter.Merge(dst, src)
+func (m *TemplateParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TemplateParameter.Merge(m, src)
 }
 func (m *TemplateParameter) XXX_Size() int {
 	return xxx_messageInfo_TemplateParameter.Size(m)
@@ -998,16 +804,17 @@ func (m *ParameterValidation) Reset()         { *m = ParameterValidation{} }
 func (m *ParameterValidation) String() string { return proto.CompactTextString(m) }
 func (*ParameterValidation) ProtoMessage()    {}
 func (*ParameterValidation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{6}
+	return fileDescriptor_a839f5a867063db9, []int{6}
 }
+
 func (m *ParameterValidation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParameterValidation.Unmarshal(m, b)
 }
 func (m *ParameterValidation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParameterValidation.Marshal(b, m, deterministic)
 }
-func (dst *ParameterValidation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParameterValidation.Merge(dst, src)
+func (m *ParameterValidation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParameterValidation.Merge(m, src)
 }
 func (m *ParameterValidation) XXX_Size() int {
 	return xxx_messageInfo_ParameterValidation.Size(m)
@@ -1055,80 +862,14 @@ func (m *ParameterValidation) GetValues() *ValueValidation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ParameterValidation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ParameterValidation_OneofMarshaler, _ParameterValidation_OneofUnmarshaler, _ParameterValidation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ParameterValidation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ParameterValidation_Regex)(nil),
 		(*ParameterValidation_Values)(nil),
 	}
 }
 
-func _ParameterValidation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ParameterValidation)
-	// validation_type
-	switch x := m.ValidationType.(type) {
-	case *ParameterValidation_Regex:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Regex); err != nil {
-			return err
-		}
-	case *ParameterValidation_Values:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Values); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ParameterValidation.ValidationType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ParameterValidation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ParameterValidation)
-	switch tag {
-	case 1: // validation_type.regex
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RegexValidation)
-		err := b.DecodeMessage(msg)
-		m.ValidationType = &ParameterValidation_Regex{msg}
-		return true, err
-	case 2: // validation_type.values
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ValueValidation)
-		err := b.DecodeMessage(msg)
-		m.ValidationType = &ParameterValidation_Values{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ParameterValidation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ParameterValidation)
-	// validation_type
-	switch x := m.ValidationType.(type) {
-	case *ParameterValidation_Regex:
-		s := proto.Size(x.Regex)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ParameterValidation_Values:
-		s := proto.Size(x.Values)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Validation based on regular expressions.
 type RegexValidation struct {
 	// Required. RE2 regular expressions used to validate the parameter's value.
@@ -1144,16 +885,17 @@ func (m *RegexValidation) Reset()         { *m = RegexValidation{} }
 func (m *RegexValidation) String() string { return proto.CompactTextString(m) }
 func (*RegexValidation) ProtoMessage()    {}
 func (*RegexValidation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{7}
+	return fileDescriptor_a839f5a867063db9, []int{7}
 }
+
 func (m *RegexValidation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegexValidation.Unmarshal(m, b)
 }
 func (m *RegexValidation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RegexValidation.Marshal(b, m, deterministic)
 }
-func (dst *RegexValidation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RegexValidation.Merge(dst, src)
+func (m *RegexValidation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegexValidation.Merge(m, src)
 }
 func (m *RegexValidation) XXX_Size() int {
 	return xxx_messageInfo_RegexValidation.Size(m)
@@ -1184,16 +926,17 @@ func (m *ValueValidation) Reset()         { *m = ValueValidation{} }
 func (m *ValueValidation) String() string { return proto.CompactTextString(m) }
 func (*ValueValidation) ProtoMessage()    {}
 func (*ValueValidation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{8}
+	return fileDescriptor_a839f5a867063db9, []int{8}
 }
+
 func (m *ValueValidation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ValueValidation.Unmarshal(m, b)
 }
 func (m *ValueValidation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ValueValidation.Marshal(b, m, deterministic)
 }
-func (dst *ValueValidation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ValueValidation.Merge(dst, src)
+func (m *ValueValidation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueValidation.Merge(m, src)
 }
 func (m *ValueValidation) XXX_Size() int {
 	return xxx_messageInfo_ValueValidation.Size(m)
@@ -1245,16 +988,17 @@ func (m *WorkflowMetadata) Reset()         { *m = WorkflowMetadata{} }
 func (m *WorkflowMetadata) String() string { return proto.CompactTextString(m) }
 func (*WorkflowMetadata) ProtoMessage()    {}
 func (*WorkflowMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{9}
+	return fileDescriptor_a839f5a867063db9, []int{9}
 }
+
 func (m *WorkflowMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowMetadata.Unmarshal(m, b)
 }
 func (m *WorkflowMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowMetadata.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowMetadata.Merge(dst, src)
+func (m *WorkflowMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowMetadata.Merge(m, src)
 }
 func (m *WorkflowMetadata) XXX_Size() int {
 	return xxx_messageInfo_WorkflowMetadata.Size(m)
@@ -1359,16 +1103,17 @@ func (m *ClusterOperation) Reset()         { *m = ClusterOperation{} }
 func (m *ClusterOperation) String() string { return proto.CompactTextString(m) }
 func (*ClusterOperation) ProtoMessage()    {}
 func (*ClusterOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{10}
+	return fileDescriptor_a839f5a867063db9, []int{10}
 }
+
 func (m *ClusterOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterOperation.Unmarshal(m, b)
 }
 func (m *ClusterOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterOperation.Marshal(b, m, deterministic)
 }
-func (dst *ClusterOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterOperation.Merge(dst, src)
+func (m *ClusterOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperation.Merge(m, src)
 }
 func (m *ClusterOperation) XXX_Size() int {
 	return xxx_messageInfo_ClusterOperation.Size(m)
@@ -1413,16 +1158,17 @@ func (m *WorkflowGraph) Reset()         { *m = WorkflowGraph{} }
 func (m *WorkflowGraph) String() string { return proto.CompactTextString(m) }
 func (*WorkflowGraph) ProtoMessage()    {}
 func (*WorkflowGraph) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{11}
+	return fileDescriptor_a839f5a867063db9, []int{11}
 }
+
 func (m *WorkflowGraph) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowGraph.Unmarshal(m, b)
 }
 func (m *WorkflowGraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowGraph.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowGraph) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowGraph.Merge(dst, src)
+func (m *WorkflowGraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowGraph.Merge(m, src)
 }
 func (m *WorkflowGraph) XXX_Size() int {
 	return xxx_messageInfo_WorkflowGraph.Size(m)
@@ -1461,16 +1207,17 @@ func (m *WorkflowNode) Reset()         { *m = WorkflowNode{} }
 func (m *WorkflowNode) String() string { return proto.CompactTextString(m) }
 func (*WorkflowNode) ProtoMessage()    {}
 func (*WorkflowNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{12}
+	return fileDescriptor_a839f5a867063db9, []int{12}
 }
+
 func (m *WorkflowNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowNode.Unmarshal(m, b)
 }
 func (m *WorkflowNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowNode.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowNode.Merge(dst, src)
+func (m *WorkflowNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowNode.Merge(m, src)
 }
 func (m *WorkflowNode) XXX_Size() int {
 	return xxx_messageInfo_WorkflowNode.Size(m)
@@ -1533,16 +1280,17 @@ func (m *CreateWorkflowTemplateRequest) Reset()         { *m = CreateWorkflowTem
 func (m *CreateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateWorkflowTemplateRequest) ProtoMessage()    {}
 func (*CreateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{13}
+	return fileDescriptor_a839f5a867063db9, []int{13}
 }
+
 func (m *CreateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *CreateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateWorkflowTemplateRequest.Merge(dst, src)
+func (m *CreateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *CreateWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateWorkflowTemplateRequest.Size(m)
@@ -1587,16 +1335,17 @@ func (m *GetWorkflowTemplateRequest) Reset()         { *m = GetWorkflowTemplateR
 func (m *GetWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*GetWorkflowTemplateRequest) ProtoMessage()    {}
 func (*GetWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{14}
+	return fileDescriptor_a839f5a867063db9, []int{14}
 }
+
 func (m *GetWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *GetWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetWorkflowTemplateRequest.Merge(dst, src)
+func (m *GetWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *GetWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_GetWorkflowTemplateRequest.Size(m)
@@ -1656,16 +1405,17 @@ func (m *InstantiateWorkflowTemplateRequest) Reset()         { *m = InstantiateW
 func (m *InstantiateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*InstantiateWorkflowTemplateRequest) ProtoMessage()    {}
 func (*InstantiateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{15}
+	return fileDescriptor_a839f5a867063db9, []int{15}
 }
+
 func (m *InstantiateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *InstantiateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *InstantiateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InstantiateWorkflowTemplateRequest.Merge(dst, src)
+func (m *InstantiateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstantiateWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *InstantiateWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Size(m)
@@ -1733,16 +1483,17 @@ func (m *InstantiateInlineWorkflowTemplateRequest) Reset() {
 func (m *InstantiateInlineWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*InstantiateInlineWorkflowTemplateRequest) ProtoMessage()    {}
 func (*InstantiateInlineWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{16}
+	return fileDescriptor_a839f5a867063db9, []int{16}
 }
+
 func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *InstantiateInlineWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Merge(dst, src)
+func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Size(m)
@@ -1789,16 +1540,17 @@ func (m *UpdateWorkflowTemplateRequest) Reset()         { *m = UpdateWorkflowTem
 func (m *UpdateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateWorkflowTemplateRequest) ProtoMessage()    {}
 func (*UpdateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{17}
+	return fileDescriptor_a839f5a867063db9, []int{17}
 }
+
 func (m *UpdateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *UpdateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateWorkflowTemplateRequest.Merge(dst, src)
+func (m *UpdateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *UpdateWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Size(m)
@@ -1836,16 +1588,17 @@ func (m *ListWorkflowTemplatesRequest) Reset()         { *m = ListWorkflowTempla
 func (m *ListWorkflowTemplatesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListWorkflowTemplatesRequest) ProtoMessage()    {}
 func (*ListWorkflowTemplatesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{18}
+	return fileDescriptor_a839f5a867063db9, []int{18}
 }
+
 func (m *ListWorkflowTemplatesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListWorkflowTemplatesRequest.Unmarshal(m, b)
 }
 func (m *ListWorkflowTemplatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListWorkflowTemplatesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListWorkflowTemplatesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListWorkflowTemplatesRequest.Merge(dst, src)
+func (m *ListWorkflowTemplatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWorkflowTemplatesRequest.Merge(m, src)
 }
 func (m *ListWorkflowTemplatesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListWorkflowTemplatesRequest.Size(m)
@@ -1894,16 +1647,17 @@ func (m *ListWorkflowTemplatesResponse) Reset()         { *m = ListWorkflowTempl
 func (m *ListWorkflowTemplatesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListWorkflowTemplatesResponse) ProtoMessage()    {}
 func (*ListWorkflowTemplatesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{19}
+	return fileDescriptor_a839f5a867063db9, []int{19}
 }
+
 func (m *ListWorkflowTemplatesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListWorkflowTemplatesResponse.Unmarshal(m, b)
 }
 func (m *ListWorkflowTemplatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListWorkflowTemplatesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListWorkflowTemplatesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListWorkflowTemplatesResponse.Merge(dst, src)
+func (m *ListWorkflowTemplatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWorkflowTemplatesResponse.Merge(m, src)
 }
 func (m *ListWorkflowTemplatesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListWorkflowTemplatesResponse.Size(m)
@@ -1949,16 +1703,17 @@ func (m *DeleteWorkflowTemplateRequest) Reset()         { *m = DeleteWorkflowTem
 func (m *DeleteWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteWorkflowTemplateRequest) ProtoMessage()    {}
 func (*DeleteWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_68e4e5d738482813, []int{20}
+	return fileDescriptor_a839f5a867063db9, []int{20}
 }
+
 func (m *DeleteWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *DeleteWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteWorkflowTemplateRequest.Merge(dst, src)
+func (m *DeleteWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *DeleteWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Size(m)
@@ -1984,6 +1739,8 @@ func (m *DeleteWorkflowTemplateRequest) GetVersion() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1.WorkflowMetadata_State", WorkflowMetadata_State_name, WorkflowMetadata_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1.WorkflowNode_NodeState", WorkflowNode_NodeState_name, WorkflowNode_NodeState_value)
 	proto.RegisterType((*WorkflowTemplate)(nil), "google.cloud.dataproc.v1.WorkflowTemplate")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.WorkflowTemplate.LabelsEntry")
 	proto.RegisterType((*WorkflowTemplatePlacement)(nil), "google.cloud.dataproc.v1.WorkflowTemplatePlacement")
@@ -2011,8 +1768,139 @@ func init() {
 	proto.RegisterType((*ListWorkflowTemplatesRequest)(nil), "google.cloud.dataproc.v1.ListWorkflowTemplatesRequest")
 	proto.RegisterType((*ListWorkflowTemplatesResponse)(nil), "google.cloud.dataproc.v1.ListWorkflowTemplatesResponse")
 	proto.RegisterType((*DeleteWorkflowTemplateRequest)(nil), "google.cloud.dataproc.v1.DeleteWorkflowTemplateRequest")
-	proto.RegisterEnum("google.cloud.dataproc.v1.WorkflowMetadata_State", WorkflowMetadata_State_name, WorkflowMetadata_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1.WorkflowNode_NodeState", WorkflowNode_NodeState_name, WorkflowNode_NodeState_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1/workflow_templates.proto", fileDescriptor_a839f5a867063db9)
+}
+
+var fileDescriptor_a839f5a867063db9 = []byte{
+	// 2000 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
+	0x15, 0x37, 0x65, 0x4b, 0x96, 0x9e, 0x62, 0x5b, 0x3b, 0x69, 0xbc, 0xaa, 0x12, 0xa3, 0x0e, 0xb7,
+	0xdd, 0x78, 0xbd, 0xa8, 0xd4, 0x38, 0x4d, 0x37, 0xeb, 0x24, 0x9b, 0xb5, 0x2d, 0xd9, 0x56, 0x62,
+	0xcb, 0x0e, 0x65, 0x67, 0x01, 0x5f, 0x04, 0x4a, 0x9c, 0xd0, 0x74, 0x28, 0x0e, 0x43, 0x52, 0xda,
+	0x75, 0x8a, 0x45, 0x81, 0xdc, 0x16, 0xe8, 0xa1, 0xc5, 0xf6, 0x16, 0xa0, 0xc7, 0x02, 0x3d, 0x14,
+	0xed, 0xa9, 0xa7, 0xfe, 0x09, 0x05, 0x7a, 0x28, 0x7a, 0x2e, 0x50, 0xf4, 0xda, 0x3f, 0xa1, 0x45,
+	0x31, 0x1f, 0xa4, 0xa8, 0x0f, 0x52, 0x96, 0x5d, 0xa0, 0x17, 0x83, 0x33, 0x7a, 0xbf, 0x37, 0xef,
+	0x6b, 0x7e, 0xef, 0x91, 0x86, 0xbb, 0x3a, 0x21, 0xba, 0x89, 0x4b, 0x2d, 0x93, 0x74, 0xb4, 0x92,
+	0xa6, 0x7a, 0xaa, 0xed, 0x90, 0x56, 0xa9, 0x7b, 0xb7, 0xf4, 0x25, 0x71, 0x5e, 0xbd, 0x34, 0xc9,
+	0x97, 0x0d, 0x0f, 0xb7, 0x6d, 0x53, 0xf5, 0xb0, 0x5b, 0xb4, 0x1d, 0xe2, 0x11, 0x94, 0xe7, 0x90,
+	0x22, 0x83, 0x14, 0x7d, 0x48, 0xb1, 0x7b, 0xb7, 0x70, 0x4b, 0x28, 0x53, 0x6d, 0xa3, 0xa4, 0x5a,
+	0x16, 0xf1, 0x54, 0xcf, 0x20, 0x96, 0xc0, 0x15, 0xee, 0x44, 0x1e, 0xd5, 0x32, 0x3b, 0xae, 0x87,
+	0x1d, 0x5f, 0xf0, 0x83, 0x48, 0xc1, 0x33, 0xd2, 0x1c, 0x14, 0x32, 0x89, 0xa5, 0x3b, 0x1d, 0xcb,
+	0x32, 0x2c, 0xbd, 0x44, 0x6c, 0xec, 0xf4, 0x1d, 0x79, 0x53, 0x08, 0xb1, 0x55, 0xb3, 0xf3, 0xb2,
+	0x84, 0xdb, 0xb6, 0x77, 0x2e, 0x7e, 0xfc, 0xde, 0xe0, 0x8f, 0x9e, 0xd1, 0xc6, 0xae, 0xa7, 0xb6,
+	0x6d, 0x2e, 0x20, 0xff, 0x7e, 0x06, 0x72, 0x5f, 0x88, 0x28, 0x1c, 0x89, 0x20, 0xa0, 0x79, 0x48,
+	0x18, 0x5a, 0x3e, 0xb1, 0x2c, 0xad, 0x64, 0x94, 0x84, 0xa1, 0x21, 0x04, 0x33, 0x96, 0xda, 0xc6,
+	0x79, 0x89, 0xed, 0xb0, 0x67, 0x94, 0x87, 0xd9, 0x2e, 0x76, 0x5c, 0x83, 0x58, 0xf9, 0xe9, 0x65,
+	0x69, 0x25, 0xa9, 0xf8, 0x4b, 0xf4, 0x10, 0xb2, 0x2d, 0x07, 0xab, 0x1e, 0x6e, 0xd0, 0xc3, 0xf2,
+	0x33, 0xcb, 0xd2, 0x4a, 0x76, 0xad, 0x50, 0x14, 0x11, 0xf5, 0x2d, 0x29, 0x1e, 0xf9, 0x96, 0x28,
+	0xc0, 0xc5, 0xe9, 0x06, 0x05, 0x77, 0x6c, 0x2d, 0x00, 0x27, 0xc7, 0x83, 0xb9, 0x38, 0x03, 0xd7,
+	0x20, 0x65, 0xaa, 0x4d, 0x6c, 0xba, 0xf9, 0xd4, 0xf2, 0xf4, 0x4a, 0x76, 0xed, 0x27, 0xc5, 0xa8,
+	0x34, 0x16, 0x07, 0x7d, 0x2e, 0xee, 0x31, 0x60, 0xc5, 0xf2, 0x9c, 0x73, 0x45, 0x68, 0x41, 0xcf,
+	0x21, 0x63, 0x9b, 0x6a, 0x0b, 0xb7, 0xb1, 0xe5, 0xe5, 0x67, 0x99, 0x29, 0xf7, 0x2e, 0xae, 0xf2,
+	0xd0, 0x87, 0x2a, 0x3d, 0x2d, 0xe8, 0x01, 0xcc, 0xd0, 0x04, 0xe7, 0xd3, 0xcc, 0xc0, 0xef, 0x47,
+	0x6b, 0x3b, 0x70, 0x34, 0xec, 0x60, 0xed, 0x29, 0x69, 0x2a, 0x0c, 0x81, 0x9e, 0x01, 0xd8, 0xaa,
+	0xa3, 0xb6, 0x31, 0xad, 0xa2, 0x7c, 0x86, 0xe1, 0x3f, 0x8e, 0xc6, 0x07, 0x56, 0xf8, 0x18, 0x25,
+	0x04, 0x2f, 0x7c, 0x0a, 0xd9, 0x90, 0xc3, 0x28, 0x07, 0xd3, 0xaf, 0xf0, 0xb9, 0xc8, 0x2f, 0x7d,
+	0x44, 0xdf, 0x81, 0x64, 0x57, 0x35, 0x3b, 0x58, 0x54, 0x01, 0x5f, 0xac, 0x27, 0x1e, 0x48, 0xf2,
+	0xdf, 0x24, 0xf8, 0x6e, 0xa4, 0xab, 0xa8, 0x0e, 0x0b, 0x6d, 0xd5, 0x52, 0x75, 0xac, 0x35, 0x44,
+	0xc5, 0x33, 0xad, 0xd9, 0xb5, 0x95, 0x68, 0x53, 0xf7, 0x39, 0x60, 0x8b, 0xcb, 0xef, 0x4e, 0x29,
+	0xf3, 0xed, 0xbe, 0x1d, 0xf4, 0x02, 0x72, 0x42, 0x59, 0xc3, 0xc5, 0x26, 0x6e, 0x79, 0xc4, 0x61,
+	0x76, 0x65, 0xd7, 0x3e, 0x8a, 0xd6, 0x2a, 0xc0, 0x75, 0x01, 0xd8, 0x9d, 0x52, 0x16, 0x5a, 0xfd,
+	0x5b, 0x9b, 0xd9, 0x50, 0x7e, 0xe5, 0x7f, 0x4b, 0x30, 0xdf, 0x6f, 0x09, 0xba, 0x0d, 0xd7, 0xfc,
+	0x73, 0x59, 0xfd, 0xf3, 0x58, 0x64, 0xc5, 0x5e, 0x8d, 0x5e, 0x83, 0x27, 0x90, 0x6a, 0x11, 0xeb,
+	0xa5, 0xa1, 0xb3, 0x5b, 0x90, 0x5d, 0xbb, 0x33, 0xd6, 0xa0, 0x2d, 0x26, 0xae, 0x08, 0x18, 0xda,
+	0x0b, 0x6a, 0x76, 0x86, 0xa5, 0xf4, 0xc7, 0x17, 0x8d, 0xd3, 0xa8, 0x8a, 0xbd, 0x4a, 0x5e, 0xff,
+	0x2c, 0xc1, 0xc2, 0x40, 0xcc, 0xe8, 0xc5, 0x7f, 0x43, 0xac, 0xe0, 0xe2, 0xd3, 0x67, 0xd4, 0x82,
+	0x79, 0x3f, 0x28, 0xc2, 0xf0, 0x04, 0x33, 0xfc, 0xd1, 0x85, 0x53, 0xe1, 0xaf, 0xc3, 0x0e, 0xcc,
+	0xb5, 0xc2, 0x7b, 0x85, 0xcf, 0x01, 0x0d, 0x0b, 0x4d, 0xe4, 0xce, 0x5f, 0x92, 0x00, 0xbd, 0x3b,
+	0x84, 0xde, 0x87, 0x59, 0xd7, 0xc3, 0x76, 0xc3, 0xd0, 0x04, 0x3c, 0x45, 0x97, 0x55, 0x0d, 0x95,
+	0x01, 0x4e, 0x55, 0x8d, 0x10, 0xbb, 0x71, 0x46, 0x9a, 0xa2, 0xaa, 0x3e, 0x88, 0x76, 0x65, 0x97,
+	0xc9, 0x3e, 0x25, 0xcd, 0xdd, 0x29, 0x25, 0x73, 0xea, 0x2f, 0xd0, 0x06, 0x64, 0x5c, 0x5b, 0x75,
+	0x5e, 0x31, 0x25, 0xbc, 0x12, 0xe4, 0x68, 0x25, 0x75, 0x2a, 0xca, 0x75, 0xa4, 0x5d, 0xf1, 0x8c,
+	0x76, 0x20, 0x6b, 0x9f, 0xf7, 0x94, 0x70, 0xda, 0x8c, 0x21, 0x88, 0xc3, 0xf3, 0x90, 0x1a, 0x10,
+	0x50, 0xaa, 0xe8, 0x33, 0x48, 0x9f, 0x1a, 0x5d, 0xcc, 0xb4, 0x70, 0xfe, 0xbc, 0x1d, 0xe3, 0x8f,
+	0xd1, 0xc5, 0x5c, 0xc5, 0xec, 0x29, 0x7f, 0x44, 0x0f, 0x61, 0xd6, 0x36, 0x74, 0x06, 0x4f, 0x31,
+	0xf8, 0x72, 0x8c, 0x11, 0x86, 0xce, 0xd1, 0x29, 0x9b, 0x3d, 0xa1, 0x67, 0x30, 0xc7, 0x7d, 0x70,
+	0x5f, 0x9b, 0x4c, 0x05, 0xa7, 0xcd, 0x1f, 0x8c, 0x09, 0x46, 0xfd, 0xb5, 0xc9, 0xf5, 0x64, 0xdd,
+	0xde, 0x12, 0xed, 0x06, 0x77, 0x83, 0xd3, 0xe5, 0x8f, 0x2e, 0x42, 0x97, 0x23, 0x99, 0x7c, 0x07,
+	0xc0, 0x6d, 0x9d, 0x62, 0xad, 0x63, 0x1a, 0x96, 0x9e, 0xcf, 0x8c, 0xbb, 0xaa, 0x4f, 0x49, 0xb3,
+	0x1e, 0x88, 0x2b, 0x21, 0x28, 0x5a, 0x83, 0x1b, 0xb6, 0x83, 0x1d, 0xfc, 0xba, 0x63, 0xb8, 0x86,
+	0x87, 0x1b, 0xa2, 0xa8, 0xdc, 0x3c, 0x2c, 0x4f, 0xaf, 0x64, 0x94, 0xeb, 0xe1, 0x1f, 0xeb, 0xac,
+	0xc2, 0xae, 0x72, 0x29, 0x37, 0x01, 0xd2, 0x67, 0xa4, 0xd9, 0xf0, 0xce, 0x6d, 0x2c, 0xff, 0x41,
+	0x82, 0xf7, 0x86, 0x58, 0x7d, 0x64, 0x6f, 0x5e, 0x84, 0xd4, 0x4b, 0x03, 0x9b, 0x1a, 0xbf, 0x9a,
+	0x19, 0x45, 0xac, 0xd0, 0x32, 0x64, 0x35, 0xec, 0xb6, 0x1c, 0xc3, 0xf6, 0xfc, 0xbe, 0x9d, 0x51,
+	0xc2, 0x5b, 0x68, 0x1f, 0xa0, 0xab, 0x9a, 0x86, 0xc6, 0x26, 0x0c, 0x51, 0x83, 0x3f, 0x8c, 0x49,
+	0xbf, 0x6f, 0xc6, 0x8b, 0x00, 0xa4, 0x84, 0x14, 0x50, 0x93, 0xaf, 0x8f, 0x90, 0x41, 0x1b, 0x90,
+	0x74, 0xb0, 0x8e, 0xbf, 0x12, 0xbd, 0x21, 0x86, 0xc5, 0x15, 0x2a, 0xd6, 0x43, 0xee, 0x4e, 0x29,
+	0x1c, 0x89, 0xb6, 0x20, 0xc5, 0xc2, 0xe4, 0x8e, 0xef, 0x04, 0x2f, 0xa8, 0x5c, 0x9f, 0x0e, 0x01,
+	0xdd, 0x7c, 0x0f, 0x16, 0x7a, 0xd6, 0xf2, 0x28, 0x7f, 0x0c, 0x0b, 0x03, 0x67, 0xd2, 0x51, 0x87,
+	0x9d, 0x89, 0xdd, 0xbc, 0xc4, 0xe2, 0xe9, 0x2f, 0xe5, 0x8f, 0x60, 0x61, 0x40, 0x39, 0x8d, 0xbd,
+	0xb0, 0x8b, 0xcb, 0x8a, 0x95, 0xfc, 0x36, 0xd5, 0x1b, 0xb4, 0xf6, 0xb1, 0xa7, 0x52, 0x03, 0x51,
+	0x01, 0xd2, 0xfe, 0xe4, 0x29, 0x12, 0x18, 0xac, 0xc3, 0x03, 0x56, 0xa2, 0x7f, 0xc0, 0x7a, 0x0e,
+	0xf3, 0x62, 0xc0, 0xf2, 0x5b, 0x2c, 0x67, 0x9c, 0xd5, 0xb1, 0x0c, 0x7c, 0xe0, 0x0f, 0x8f, 0xca,
+	0x1c, 0xd7, 0xe0, 0x77, 0xba, 0xc7, 0x90, 0xd4, 0x1d, 0xd5, 0x3e, 0x15, 0x29, 0xbf, 0x33, 0x7e,
+	0xca, 0xd9, 0xa1, 0xe2, 0x0a, 0x47, 0x51, 0x8b, 0x34, 0x6c, 0xe2, 0x90, 0x45, 0xc9, 0xc9, 0x2d,
+	0xe2, 0x1a, 0x7c, 0x8b, 0xb6, 0x21, 0xe9, 0x7a, 0x34, 0x2e, 0x94, 0x83, 0xe6, 0xe3, 0xae, 0xfe,
+	0x60, 0x54, 0x8b, 0x75, 0x8a, 0x53, 0x38, 0x7c, 0xa8, 0x87, 0xcf, 0x0e, 0xf7, 0xf0, 0x93, 0xbe,
+	0xc9, 0x8a, 0x53, 0xcd, 0xfa, 0x04, 0xe7, 0x05, 0x15, 0x2e, 0x48, 0x27, 0xa4, 0x0d, 0x7d, 0x0a,
+	0xe0, 0x7a, 0xaa, 0xe3, 0xf1, 0x71, 0x36, 0x33, 0x76, 0x9c, 0xcd, 0x30, 0x69, 0x36, 0xcd, 0xde,
+	0x87, 0x34, 0xb6, 0x34, 0x0e, 0x84, 0xb1, 0xc0, 0x59, 0x6c, 0x69, 0x0c, 0x16, 0x72, 0xb8, 0xd3,
+	0x31, 0xb4, 0x7c, 0xb6, 0xcf, 0xe1, 0xe3, 0x8e, 0xa1, 0x15, 0x1e, 0xc3, 0xc2, 0x80, 0xcd, 0x13,
+	0xb5, 0xd6, 0x07, 0x90, 0x64, 0x21, 0x46, 0x59, 0x98, 0x3d, 0xae, 0x3d, 0xab, 0x1d, 0x7c, 0x51,
+	0xcb, 0x4d, 0xd1, 0xc5, 0x61, 0xa5, 0x56, 0xae, 0xd6, 0x76, 0x72, 0x12, 0x5d, 0x28, 0xc7, 0xb5,
+	0x1a, 0x5d, 0x24, 0x50, 0x1a, 0x66, 0xca, 0x07, 0xb5, 0x4a, 0x6e, 0x5a, 0x6e, 0x40, 0x6e, 0x30,
+	0xef, 0xd4, 0xde, 0xe0, 0x9d, 0xa6, 0xd7, 0x9e, 0xb3, 0xc1, 0x5e, 0x55, 0xa3, 0xa6, 0x60, 0xc7,
+	0x11, 0x43, 0x5f, 0x46, 0xe1, 0x0b, 0xca, 0x7c, 0x1a, 0x1d, 0x4e, 0x68, 0xf1, 0xa7, 0x15, 0xf6,
+	0x2c, 0xef, 0xc3, 0x5c, 0x5f, 0x81, 0xa2, 0x47, 0x90, 0xb4, 0x88, 0x26, 0x6e, 0x63, 0x76, 0xed,
+	0xc3, 0xf1, 0x69, 0xad, 0x11, 0x0d, 0x2b, 0x1c, 0x24, 0xff, 0x29, 0x01, 0xd7, 0xc2, 0xfb, 0xd1,
+	0x63, 0x44, 0x64, 0x5f, 0x48, 0x44, 0xf6, 0x05, 0x74, 0x03, 0x52, 0x94, 0xdc, 0x0d, 0x4d, 0x30,
+	0x71, 0xf2, 0x8c, 0x34, 0xab, 0x5a, 0xaf, 0xf2, 0x93, 0x17, 0xad, 0x7c, 0x6a, 0x5a, 0x91, 0xfe,
+	0xe9, 0xab, 0xfc, 0x20, 0x6a, 0xa9, 0x50, 0xd4, 0xe4, 0x33, 0xc8, 0x04, 0x92, 0xa8, 0x00, 0x8b,
+	0xb5, 0x83, 0x72, 0xa5, 0x51, 0x3f, 0xda, 0x38, 0xaa, 0x34, 0x8e, 0x6b, 0xf5, 0xc3, 0xca, 0x56,
+	0x75, 0xbb, 0x5a, 0x29, 0xf3, 0x7c, 0x6e, 0xee, 0x1d, 0x6c, 0x3d, 0xab, 0x94, 0x73, 0x12, 0xba,
+	0x06, 0x69, 0x9a, 0xcf, 0x8d, 0xcd, 0xbd, 0x4a, 0x2e, 0x11, 0xce, 0xee, 0x34, 0x9a, 0x83, 0xcc,
+	0xd6, 0xc1, 0xfe, 0xe1, 0x5e, 0xe5, 0xa8, 0x52, 0xce, 0xcd, 0x20, 0x80, 0xd4, 0xf6, 0x46, 0x75,
+	0xaf, 0x52, 0xce, 0x25, 0xe5, 0x9f, 0xc1, 0xd2, 0x16, 0xa3, 0x99, 0xc1, 0xf7, 0x05, 0x05, 0xbf,
+	0xee, 0x60, 0xd7, 0xa3, 0x64, 0x69, 0xab, 0x0e, 0x7d, 0xbb, 0x12, 0xd1, 0xe4, 0x2b, 0xb4, 0x1d,
+	0xe2, 0xc5, 0xc4, 0x38, 0x26, 0x19, 0x52, 0x1e, 0x60, 0xe5, 0xa7, 0x50, 0xd8, 0xc1, 0x5e, 0xd4,
+	0xe9, 0x63, 0x5e, 0x6b, 0xfb, 0x59, 0x57, 0xfe, 0x75, 0x02, 0xe4, 0xaa, 0xe5, 0x7a, 0xaa, 0xe5,
+	0x19, 0x31, 0x2e, 0x4d, 0xa4, 0x14, 0x2d, 0x01, 0x38, 0x1c, 0x48, 0xcb, 0x20, 0xc9, 0x30, 0x19,
+	0xb1, 0x53, 0xd5, 0x90, 0xd9, 0xc7, 0x4c, 0xfc, 0xa5, 0x76, 0x2f, 0x3a, 0x12, 0xe3, 0xcd, 0x8b,
+	0xe3, 0xaa, 0xab, 0xd2, 0xc2, 0x6f, 0x25, 0x58, 0x09, 0x59, 0x50, 0xb5, 0x4c, 0xc3, 0xfa, 0x7f,
+	0x65, 0x7e, 0x20, 0xb0, 0xd3, 0x03, 0x81, 0x95, 0x75, 0x58, 0x3a, 0x66, 0xdf, 0x0d, 0xa2, 0xec,
+	0xdb, 0x1e, 0xe8, 0xcc, 0x97, 0xad, 0x40, 0x07, 0x6e, 0xed, 0x19, 0xee, 0x50, 0x09, 0xba, 0xe3,
+	0xe2, 0x70, 0x13, 0x32, 0xb6, 0xaa, 0xe3, 0x86, 0x6b, 0xbc, 0xc1, 0xa2, 0x68, 0xd2, 0x74, 0xa3,
+	0x6e, 0xbc, 0x61, 0xce, 0xb1, 0x1f, 0x3d, 0xf2, 0x0a, 0xfb, 0x63, 0x1c, 0x13, 0x3f, 0xa2, 0x1b,
+	0xf2, 0x2f, 0x25, 0x58, 0x8a, 0x38, 0xd4, 0xb5, 0x89, 0xe5, 0x62, 0xb4, 0x0b, 0x99, 0xe0, 0x8b,
+	0x97, 0x60, 0xc6, 0x49, 0xdc, 0xeb, 0x81, 0xd1, 0x87, 0xb0, 0x60, 0xe1, 0xaf, 0xbc, 0x46, 0xc8,
+	0x1e, 0x5e, 0x18, 0x73, 0x74, 0xfb, 0x30, 0xb0, 0x69, 0x1f, 0x96, 0xca, 0xac, 0xbf, 0xff, 0x4f,
+	0xee, 0xcd, 0xda, 0x3f, 0xe6, 0xe1, 0xfd, 0x41, 0x4d, 0x75, 0xec, 0x74, 0x8d, 0x16, 0x46, 0xdf,
+	0x24, 0x60, 0x71, 0x34, 0xed, 0xa0, 0x4f, 0x62, 0xe6, 0x91, 0x38, 0xa2, 0x2a, 0x4c, 0x10, 0x1d,
+	0xf9, 0x1b, 0xe9, 0xed, 0x5f, 0xff, 0xf9, 0x6d, 0xe2, 0xad, 0x24, 0xdf, 0x2f, 0x75, 0xef, 0x96,
+	0x7e, 0xca, 0x33, 0xfa, 0xd8, 0x76, 0xc8, 0x19, 0x6e, 0x79, 0x6e, 0x69, 0xb5, 0x64, 0x92, 0x16,
+	0xff, 0x84, 0x57, 0x5a, 0xfd, 0x3a, 0xf8, 0x06, 0x19, 0x64, 0x69, 0x3d, 0xa8, 0x9e, 0x93, 0x27,
+	0xf2, 0xbd, 0x08, 0x15, 0x0e, 0xd6, 0x2f, 0xa0, 0x00, 0xfd, 0x4b, 0x82, 0xeb, 0x23, 0x18, 0x10,
+	0xc5, 0x7c, 0x65, 0x88, 0x26, 0xcc, 0x89, 0xa2, 0xe0, 0xb1, 0x20, 0x58, 0x88, 0xc7, 0x80, 0xa6,
+	0x33, 0x22, 0x02, 0xc3, 0xf6, 0x97, 0x56, 0xbf, 0x3e, 0xb9, 0x8f, 0xee, 0x8d, 0x04, 0x06, 0x7e,
+	0x8f, 0x84, 0xa1, 0x5f, 0x24, 0xe0, 0x66, 0x0c, 0x0b, 0xa2, 0x47, 0x57, 0x21, 0xcf, 0xc2, 0x92,
+	0x8f, 0x0e, 0x7d, 0x90, 0x2d, 0x06, 0x93, 0x8c, 0xfc, 0x2d, 0x4f, 0xfc, 0xcf, 0x25, 0x79, 0xe3,
+	0x52, 0x4e, 0xaf, 0x1b, 0x3d, 0x13, 0xd6, 0xa5, 0xd5, 0x93, 0xb2, 0xfc, 0xe4, 0x12, 0x31, 0x18,
+	0xd0, 0x82, 0xfe, 0x98, 0x80, 0xdb, 0x63, 0x69, 0x19, 0x6d, 0x5e, 0x28, 0x30, 0xb1, 0x9c, 0x3e,
+	0x2e, 0x3c, 0xbf, 0xe3, 0xe1, 0xf9, 0x8d, 0x24, 0xef, 0x5c, 0xee, 0x5e, 0x18, 0x83, 0x86, 0x84,
+	0x6e, 0xca, 0x73, 0xb9, 0x72, 0x99, 0x9b, 0x12, 0xa3, 0x12, 0xbd, 0x4b, 0xc0, 0xe2, 0xe8, 0x26,
+	0x11, 0xc7, 0x23, 0xb1, 0x6d, 0x65, 0xa2, 0x1b, 0xf4, 0x8e, 0xc7, 0xeb, 0x57, 0x52, 0xe1, 0x33,
+	0xe6, 0x9a, 0x6f, 0x58, 0x71, 0xe2, 0xba, 0xea, 0x85, 0x69, 0xb7, 0xf0, 0x28, 0x5e, 0xd7, 0x98,
+	0xda, 0xea, 0x45, 0xe7, 0x3f, 0x12, 0xdc, 0x18, 0xd9, 0x64, 0x50, 0xcc, 0x57, 0xf7, 0xb8, 0x56,
+	0x58, 0xf8, 0x64, 0x62, 0x1c, 0xef, 0x66, 0x03, 0x54, 0x33, 0x69, 0x59, 0x05, 0x54, 0x33, 0x59,
+	0xe9, 0xa0, 0xbf, 0x4b, 0xb0, 0x38, 0xba, 0xa5, 0xc5, 0x95, 0x47, 0x6c, 0x13, 0x2c, 0x2c, 0x0e,
+	0xbd, 0xe0, 0x55, 0xda, 0xb6, 0x77, 0xee, 0x7b, 0xb8, 0x7a, 0x59, 0x32, 0x5d, 0xbd, 0x0c, 0x99,
+	0x6e, 0xbe, 0x81, 0x5b, 0x2d, 0xd2, 0x8e, 0xf4, 0x65, 0x73, 0x71, 0x28, 0x25, 0x87, 0xd4, 0xec,
+	0x43, 0xe9, 0xe4, 0x73, 0x81, 0xd1, 0x89, 0xa9, 0x5a, 0x7a, 0x91, 0x38, 0x7a, 0x49, 0xc7, 0x16,
+	0x73, 0xaa, 0xc4, 0x7f, 0x52, 0x6d, 0xc3, 0x1d, 0xfe, 0xe7, 0xd7, 0x43, 0xff, 0xb9, 0x99, 0x62,
+	0xc2, 0xf7, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x70, 0xa3, 0x03, 0xbc, 0xbc, 0x1b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2384,136 +2272,3 @@ var _WorkflowTemplateService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dataproc/v1/workflow_templates.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1/workflow_templates.proto", fileDescriptor_workflow_templates_68e4e5d738482813)
-}
-
-var fileDescriptor_workflow_templates_68e4e5d738482813 = []byte{
-	// 2000 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
-	0x15, 0x37, 0x65, 0x4b, 0x96, 0x9e, 0x62, 0x5b, 0x3b, 0x69, 0xbc, 0xaa, 0x12, 0xa3, 0x0e, 0xb7,
-	0xdd, 0x78, 0xbd, 0xa8, 0xd4, 0x38, 0x4d, 0x37, 0xeb, 0x24, 0x9b, 0xb5, 0x2d, 0xd9, 0x56, 0x62,
-	0xcb, 0x0e, 0x65, 0x67, 0x01, 0x5f, 0x04, 0x4a, 0x9c, 0xd0, 0x74, 0x28, 0x0e, 0x43, 0x52, 0xda,
-	0x75, 0x8a, 0x45, 0x81, 0xdc, 0x16, 0xe8, 0xa1, 0xc5, 0xf6, 0x16, 0xa0, 0xc7, 0x02, 0x3d, 0x14,
-	0xed, 0xa9, 0xa7, 0xfe, 0x09, 0x05, 0x7a, 0x28, 0x7a, 0x2e, 0x50, 0xf4, 0xda, 0x3f, 0xa1, 0x45,
-	0x31, 0x1f, 0xa4, 0xa8, 0x0f, 0x52, 0x96, 0x5d, 0xa0, 0x17, 0x83, 0x33, 0x7a, 0xbf, 0x37, 0xef,
-	0x6b, 0x7e, 0xef, 0x91, 0x86, 0xbb, 0x3a, 0x21, 0xba, 0x89, 0x4b, 0x2d, 0x93, 0x74, 0xb4, 0x92,
-	0xa6, 0x7a, 0xaa, 0xed, 0x90, 0x56, 0xa9, 0x7b, 0xb7, 0xf4, 0x25, 0x71, 0x5e, 0xbd, 0x34, 0xc9,
-	0x97, 0x0d, 0x0f, 0xb7, 0x6d, 0x53, 0xf5, 0xb0, 0x5b, 0xb4, 0x1d, 0xe2, 0x11, 0x94, 0xe7, 0x90,
-	0x22, 0x83, 0x14, 0x7d, 0x48, 0xb1, 0x7b, 0xb7, 0x70, 0x4b, 0x28, 0x53, 0x6d, 0xa3, 0xa4, 0x5a,
-	0x16, 0xf1, 0x54, 0xcf, 0x20, 0x96, 0xc0, 0x15, 0xee, 0x44, 0x1e, 0xd5, 0x32, 0x3b, 0xae, 0x87,
-	0x1d, 0x5f, 0xf0, 0x83, 0x48, 0xc1, 0x33, 0xd2, 0x1c, 0x14, 0x32, 0x89, 0xa5, 0x3b, 0x1d, 0xcb,
-	0x32, 0x2c, 0xbd, 0x44, 0x6c, 0xec, 0xf4, 0x1d, 0x79, 0x53, 0x08, 0xb1, 0x55, 0xb3, 0xf3, 0xb2,
-	0x84, 0xdb, 0xb6, 0x77, 0x2e, 0x7e, 0xfc, 0xde, 0xe0, 0x8f, 0x9e, 0xd1, 0xc6, 0xae, 0xa7, 0xb6,
-	0x6d, 0x2e, 0x20, 0xff, 0x7e, 0x06, 0x72, 0x5f, 0x88, 0x28, 0x1c, 0x89, 0x20, 0xa0, 0x79, 0x48,
-	0x18, 0x5a, 0x3e, 0xb1, 0x2c, 0xad, 0x64, 0x94, 0x84, 0xa1, 0x21, 0x04, 0x33, 0x96, 0xda, 0xc6,
-	0x79, 0x89, 0xed, 0xb0, 0x67, 0x94, 0x87, 0xd9, 0x2e, 0x76, 0x5c, 0x83, 0x58, 0xf9, 0xe9, 0x65,
-	0x69, 0x25, 0xa9, 0xf8, 0x4b, 0xf4, 0x10, 0xb2, 0x2d, 0x07, 0xab, 0x1e, 0x6e, 0xd0, 0xc3, 0xf2,
-	0x33, 0xcb, 0xd2, 0x4a, 0x76, 0xad, 0x50, 0x14, 0x11, 0xf5, 0x2d, 0x29, 0x1e, 0xf9, 0x96, 0x28,
-	0xc0, 0xc5, 0xe9, 0x06, 0x05, 0x77, 0x6c, 0x2d, 0x00, 0x27, 0xc7, 0x83, 0xb9, 0x38, 0x03, 0xd7,
-	0x20, 0x65, 0xaa, 0x4d, 0x6c, 0xba, 0xf9, 0xd4, 0xf2, 0xf4, 0x4a, 0x76, 0xed, 0x27, 0xc5, 0xa8,
-	0x34, 0x16, 0x07, 0x7d, 0x2e, 0xee, 0x31, 0x60, 0xc5, 0xf2, 0x9c, 0x73, 0x45, 0x68, 0x41, 0xcf,
-	0x21, 0x63, 0x9b, 0x6a, 0x0b, 0xb7, 0xb1, 0xe5, 0xe5, 0x67, 0x99, 0x29, 0xf7, 0x2e, 0xae, 0xf2,
-	0xd0, 0x87, 0x2a, 0x3d, 0x2d, 0xe8, 0x01, 0xcc, 0xd0, 0x04, 0xe7, 0xd3, 0xcc, 0xc0, 0xef, 0x47,
-	0x6b, 0x3b, 0x70, 0x34, 0xec, 0x60, 0xed, 0x29, 0x69, 0x2a, 0x0c, 0x81, 0x9e, 0x01, 0xd8, 0xaa,
-	0xa3, 0xb6, 0x31, 0xad, 0xa2, 0x7c, 0x86, 0xe1, 0x3f, 0x8e, 0xc6, 0x07, 0x56, 0xf8, 0x18, 0x25,
-	0x04, 0x2f, 0x7c, 0x0a, 0xd9, 0x90, 0xc3, 0x28, 0x07, 0xd3, 0xaf, 0xf0, 0xb9, 0xc8, 0x2f, 0x7d,
-	0x44, 0xdf, 0x81, 0x64, 0x57, 0x35, 0x3b, 0x58, 0x54, 0x01, 0x5f, 0xac, 0x27, 0x1e, 0x48, 0xf2,
-	0xdf, 0x24, 0xf8, 0x6e, 0xa4, 0xab, 0xa8, 0x0e, 0x0b, 0x6d, 0xd5, 0x52, 0x75, 0xac, 0x35, 0x44,
-	0xc5, 0x33, 0xad, 0xd9, 0xb5, 0x95, 0x68, 0x53, 0xf7, 0x39, 0x60, 0x8b, 0xcb, 0xef, 0x4e, 0x29,
-	0xf3, 0xed, 0xbe, 0x1d, 0xf4, 0x02, 0x72, 0x42, 0x59, 0xc3, 0xc5, 0x26, 0x6e, 0x79, 0xc4, 0x61,
-	0x76, 0x65, 0xd7, 0x3e, 0x8a, 0xd6, 0x2a, 0xc0, 0x75, 0x01, 0xd8, 0x9d, 0x52, 0x16, 0x5a, 0xfd,
-	0x5b, 0x9b, 0xd9, 0x50, 0x7e, 0xe5, 0x7f, 0x4b, 0x30, 0xdf, 0x6f, 0x09, 0xba, 0x0d, 0xd7, 0xfc,
-	0x73, 0x59, 0xfd, 0xf3, 0x58, 0x64, 0xc5, 0x5e, 0x8d, 0x5e, 0x83, 0x27, 0x90, 0x6a, 0x11, 0xeb,
-	0xa5, 0xa1, 0xb3, 0x5b, 0x90, 0x5d, 0xbb, 0x33, 0xd6, 0xa0, 0x2d, 0x26, 0xae, 0x08, 0x18, 0xda,
-	0x0b, 0x6a, 0x76, 0x86, 0xa5, 0xf4, 0xc7, 0x17, 0x8d, 0xd3, 0xa8, 0x8a, 0xbd, 0x4a, 0x5e, 0xff,
-	0x2c, 0xc1, 0xc2, 0x40, 0xcc, 0xe8, 0xc5, 0x7f, 0x43, 0xac, 0xe0, 0xe2, 0xd3, 0x67, 0xd4, 0x82,
-	0x79, 0x3f, 0x28, 0xc2, 0xf0, 0x04, 0x33, 0xfc, 0xd1, 0x85, 0x53, 0xe1, 0xaf, 0xc3, 0x0e, 0xcc,
-	0xb5, 0xc2, 0x7b, 0x85, 0xcf, 0x01, 0x0d, 0x0b, 0x4d, 0xe4, 0xce, 0x5f, 0x92, 0x00, 0xbd, 0x3b,
-	0x84, 0xde, 0x87, 0x59, 0xd7, 0xc3, 0x76, 0xc3, 0xd0, 0x04, 0x3c, 0x45, 0x97, 0x55, 0x0d, 0x95,
-	0x01, 0x4e, 0x55, 0x8d, 0x10, 0xbb, 0x71, 0x46, 0x9a, 0xa2, 0xaa, 0x3e, 0x88, 0x76, 0x65, 0x97,
-	0xc9, 0x3e, 0x25, 0xcd, 0xdd, 0x29, 0x25, 0x73, 0xea, 0x2f, 0xd0, 0x06, 0x64, 0x5c, 0x5b, 0x75,
-	0x5e, 0x31, 0x25, 0xbc, 0x12, 0xe4, 0x68, 0x25, 0x75, 0x2a, 0xca, 0x75, 0xa4, 0x5d, 0xf1, 0x8c,
-	0x76, 0x20, 0x6b, 0x9f, 0xf7, 0x94, 0x70, 0xda, 0x8c, 0x21, 0x88, 0xc3, 0xf3, 0x90, 0x1a, 0x10,
-	0x50, 0xaa, 0xe8, 0x33, 0x48, 0x9f, 0x1a, 0x5d, 0xcc, 0xb4, 0x70, 0xfe, 0xbc, 0x1d, 0xe3, 0x8f,
-	0xd1, 0xc5, 0x5c, 0xc5, 0xec, 0x29, 0x7f, 0x44, 0x0f, 0x61, 0xd6, 0x36, 0x74, 0x06, 0x4f, 0x31,
-	0xf8, 0x72, 0x8c, 0x11, 0x86, 0xce, 0xd1, 0x29, 0x9b, 0x3d, 0xa1, 0x67, 0x30, 0xc7, 0x7d, 0x70,
-	0x5f, 0x9b, 0x4c, 0x05, 0xa7, 0xcd, 0x1f, 0x8c, 0x09, 0x46, 0xfd, 0xb5, 0xc9, 0xf5, 0x64, 0xdd,
-	0xde, 0x12, 0xed, 0x06, 0x77, 0x83, 0xd3, 0xe5, 0x8f, 0x2e, 0x42, 0x97, 0x23, 0x99, 0x7c, 0x07,
-	0xc0, 0x6d, 0x9d, 0x62, 0xad, 0x63, 0x1a, 0x96, 0x9e, 0xcf, 0x8c, 0xbb, 0xaa, 0x4f, 0x49, 0xb3,
-	0x1e, 0x88, 0x2b, 0x21, 0x28, 0x5a, 0x83, 0x1b, 0xb6, 0x83, 0x1d, 0xfc, 0xba, 0x63, 0xb8, 0x86,
-	0x87, 0x1b, 0xa2, 0xa8, 0xdc, 0x3c, 0x2c, 0x4f, 0xaf, 0x64, 0x94, 0xeb, 0xe1, 0x1f, 0xeb, 0xac,
-	0xc2, 0xae, 0x72, 0x29, 0x37, 0x01, 0xd2, 0x67, 0xa4, 0xd9, 0xf0, 0xce, 0x6d, 0x2c, 0xff, 0x41,
-	0x82, 0xf7, 0x86, 0x58, 0x7d, 0x64, 0x6f, 0x5e, 0x84, 0xd4, 0x4b, 0x03, 0x9b, 0x1a, 0xbf, 0x9a,
-	0x19, 0x45, 0xac, 0xd0, 0x32, 0x64, 0x35, 0xec, 0xb6, 0x1c, 0xc3, 0xf6, 0xfc, 0xbe, 0x9d, 0x51,
-	0xc2, 0x5b, 0x68, 0x1f, 0xa0, 0xab, 0x9a, 0x86, 0xc6, 0x26, 0x0c, 0x51, 0x83, 0x3f, 0x8c, 0x49,
-	0xbf, 0x6f, 0xc6, 0x8b, 0x00, 0xa4, 0x84, 0x14, 0x50, 0x93, 0xaf, 0x8f, 0x90, 0x41, 0x1b, 0x90,
-	0x74, 0xb0, 0x8e, 0xbf, 0x12, 0xbd, 0x21, 0x86, 0xc5, 0x15, 0x2a, 0xd6, 0x43, 0xee, 0x4e, 0x29,
-	0x1c, 0x89, 0xb6, 0x20, 0xc5, 0xc2, 0xe4, 0x8e, 0xef, 0x04, 0x2f, 0xa8, 0x5c, 0x9f, 0x0e, 0x01,
-	0xdd, 0x7c, 0x0f, 0x16, 0x7a, 0xd6, 0xf2, 0x28, 0x7f, 0x0c, 0x0b, 0x03, 0x67, 0xd2, 0x51, 0x87,
-	0x9d, 0x89, 0xdd, 0xbc, 0xc4, 0xe2, 0xe9, 0x2f, 0xe5, 0x8f, 0x60, 0x61, 0x40, 0x39, 0x8d, 0xbd,
-	0xb0, 0x8b, 0xcb, 0x8a, 0x95, 0xfc, 0x36, 0xd5, 0x1b, 0xb4, 0xf6, 0xb1, 0xa7, 0x52, 0x03, 0x51,
-	0x01, 0xd2, 0xfe, 0xe4, 0x29, 0x12, 0x18, 0xac, 0xc3, 0x03, 0x56, 0xa2, 0x7f, 0xc0, 0x7a, 0x0e,
-	0xf3, 0x62, 0xc0, 0xf2, 0x5b, 0x2c, 0x67, 0x9c, 0xd5, 0xb1, 0x0c, 0x7c, 0xe0, 0x0f, 0x8f, 0xca,
-	0x1c, 0xd7, 0xe0, 0x77, 0xba, 0xc7, 0x90, 0xd4, 0x1d, 0xd5, 0x3e, 0x15, 0x29, 0xbf, 0x33, 0x7e,
-	0xca, 0xd9, 0xa1, 0xe2, 0x0a, 0x47, 0x51, 0x8b, 0x34, 0x6c, 0xe2, 0x90, 0x45, 0xc9, 0xc9, 0x2d,
-	0xe2, 0x1a, 0x7c, 0x8b, 0xb6, 0x21, 0xe9, 0x7a, 0x34, 0x2e, 0x94, 0x83, 0xe6, 0xe3, 0xae, 0xfe,
-	0x60, 0x54, 0x8b, 0x75, 0x8a, 0x53, 0x38, 0x7c, 0xa8, 0x87, 0xcf, 0x0e, 0xf7, 0xf0, 0x93, 0xbe,
-	0xc9, 0x8a, 0x53, 0xcd, 0xfa, 0x04, 0xe7, 0x05, 0x15, 0x2e, 0x48, 0x27, 0xa4, 0x0d, 0x7d, 0x0a,
-	0xe0, 0x7a, 0xaa, 0xe3, 0xf1, 0x71, 0x36, 0x33, 0x76, 0x9c, 0xcd, 0x30, 0x69, 0x36, 0xcd, 0xde,
-	0x87, 0x34, 0xb6, 0x34, 0x0e, 0x84, 0xb1, 0xc0, 0x59, 0x6c, 0x69, 0x0c, 0x16, 0x72, 0xb8, 0xd3,
-	0x31, 0xb4, 0x7c, 0xb6, 0xcf, 0xe1, 0xe3, 0x8e, 0xa1, 0x15, 0x1e, 0xc3, 0xc2, 0x80, 0xcd, 0x13,
-	0xb5, 0xd6, 0x07, 0x90, 0x64, 0x21, 0x46, 0x59, 0x98, 0x3d, 0xae, 0x3d, 0xab, 0x1d, 0x7c, 0x51,
-	0xcb, 0x4d, 0xd1, 0xc5, 0x61, 0xa5, 0x56, 0xae, 0xd6, 0x76, 0x72, 0x12, 0x5d, 0x28, 0xc7, 0xb5,
-	0x1a, 0x5d, 0x24, 0x50, 0x1a, 0x66, 0xca, 0x07, 0xb5, 0x4a, 0x6e, 0x5a, 0x6e, 0x40, 0x6e, 0x30,
-	0xef, 0xd4, 0xde, 0xe0, 0x9d, 0xa6, 0xd7, 0x9e, 0xb3, 0xc1, 0x5e, 0x55, 0xa3, 0xa6, 0x60, 0xc7,
-	0x11, 0x43, 0x5f, 0x46, 0xe1, 0x0b, 0xca, 0x7c, 0x1a, 0x1d, 0x4e, 0x68, 0xf1, 0xa7, 0x15, 0xf6,
-	0x2c, 0xef, 0xc3, 0x5c, 0x5f, 0x81, 0xa2, 0x47, 0x90, 0xb4, 0x88, 0x26, 0x6e, 0x63, 0x76, 0xed,
-	0xc3, 0xf1, 0x69, 0xad, 0x11, 0x0d, 0x2b, 0x1c, 0x24, 0xff, 0x29, 0x01, 0xd7, 0xc2, 0xfb, 0xd1,
-	0x63, 0x44, 0x64, 0x5f, 0x48, 0x44, 0xf6, 0x05, 0x74, 0x03, 0x52, 0x94, 0xdc, 0x0d, 0x4d, 0x30,
-	0x71, 0xf2, 0x8c, 0x34, 0xab, 0x5a, 0xaf, 0xf2, 0x93, 0x17, 0xad, 0x7c, 0x6a, 0x5a, 0x91, 0xfe,
-	0xe9, 0xab, 0xfc, 0x20, 0x6a, 0xa9, 0x50, 0xd4, 0xe4, 0x33, 0xc8, 0x04, 0x92, 0xa8, 0x00, 0x8b,
-	0xb5, 0x83, 0x72, 0xa5, 0x51, 0x3f, 0xda, 0x38, 0xaa, 0x34, 0x8e, 0x6b, 0xf5, 0xc3, 0xca, 0x56,
-	0x75, 0xbb, 0x5a, 0x29, 0xf3, 0x7c, 0x6e, 0xee, 0x1d, 0x6c, 0x3d, 0xab, 0x94, 0x73, 0x12, 0xba,
-	0x06, 0x69, 0x9a, 0xcf, 0x8d, 0xcd, 0xbd, 0x4a, 0x2e, 0x11, 0xce, 0xee, 0x34, 0x9a, 0x83, 0xcc,
-	0xd6, 0xc1, 0xfe, 0xe1, 0x5e, 0xe5, 0xa8, 0x52, 0xce, 0xcd, 0x20, 0x80, 0xd4, 0xf6, 0x46, 0x75,
-	0xaf, 0x52, 0xce, 0x25, 0xe5, 0x9f, 0xc1, 0xd2, 0x16, 0xa3, 0x99, 0xc1, 0xf7, 0x05, 0x05, 0xbf,
-	0xee, 0x60, 0xd7, 0xa3, 0x64, 0x69, 0xab, 0x0e, 0x7d, 0xbb, 0x12, 0xd1, 0xe4, 0x2b, 0xb4, 0x1d,
-	0xe2, 0xc5, 0xc4, 0x38, 0x26, 0x19, 0x52, 0x1e, 0x60, 0xe5, 0xa7, 0x50, 0xd8, 0xc1, 0x5e, 0xd4,
-	0xe9, 0x63, 0x5e, 0x6b, 0xfb, 0x59, 0x57, 0xfe, 0x75, 0x02, 0xe4, 0xaa, 0xe5, 0x7a, 0xaa, 0xe5,
-	0x19, 0x31, 0x2e, 0x4d, 0xa4, 0x14, 0x2d, 0x01, 0x38, 0x1c, 0x48, 0xcb, 0x20, 0xc9, 0x30, 0x19,
-	0xb1, 0x53, 0xd5, 0x90, 0xd9, 0xc7, 0x4c, 0xfc, 0xa5, 0x76, 0x2f, 0x3a, 0x12, 0xe3, 0xcd, 0x8b,
-	0xe3, 0xaa, 0xab, 0xd2, 0xc2, 0x6f, 0x25, 0x58, 0x09, 0x59, 0x50, 0xb5, 0x4c, 0xc3, 0xfa, 0x7f,
-	0x65, 0x7e, 0x20, 0xb0, 0xd3, 0x03, 0x81, 0x95, 0x75, 0x58, 0x3a, 0x66, 0xdf, 0x0d, 0xa2, 0xec,
-	0xdb, 0x1e, 0xe8, 0xcc, 0x97, 0xad, 0x40, 0x07, 0x6e, 0xed, 0x19, 0xee, 0x50, 0x09, 0xba, 0xe3,
-	0xe2, 0x70, 0x13, 0x32, 0xb6, 0xaa, 0xe3, 0x86, 0x6b, 0xbc, 0xc1, 0xa2, 0x68, 0xd2, 0x74, 0xa3,
-	0x6e, 0xbc, 0x61, 0xce, 0xb1, 0x1f, 0x3d, 0xf2, 0x0a, 0xfb, 0x63, 0x1c, 0x13, 0x3f, 0xa2, 0x1b,
-	0xf2, 0x2f, 0x25, 0x58, 0x8a, 0x38, 0xd4, 0xb5, 0x89, 0xe5, 0x62, 0xb4, 0x0b, 0x99, 0xe0, 0x8b,
-	0x97, 0x60, 0xc6, 0x49, 0xdc, 0xeb, 0x81, 0xd1, 0x87, 0xb0, 0x60, 0xe1, 0xaf, 0xbc, 0x46, 0xc8,
-	0x1e, 0x5e, 0x18, 0x73, 0x74, 0xfb, 0x30, 0xb0, 0x69, 0x1f, 0x96, 0xca, 0xac, 0xbf, 0xff, 0x4f,
-	0xee, 0xcd, 0xda, 0x3f, 0xe6, 0xe1, 0xfd, 0x41, 0x4d, 0x75, 0xec, 0x74, 0x8d, 0x16, 0x46, 0xdf,
-	0x24, 0x60, 0x71, 0x34, 0xed, 0xa0, 0x4f, 0x62, 0xe6, 0x91, 0x38, 0xa2, 0x2a, 0x4c, 0x10, 0x1d,
-	0xf9, 0x1b, 0xe9, 0xed, 0x5f, 0xff, 0xf9, 0x6d, 0xe2, 0xad, 0x24, 0xdf, 0x2f, 0x75, 0xef, 0x96,
-	0x7e, 0xca, 0x33, 0xfa, 0xd8, 0x76, 0xc8, 0x19, 0x6e, 0x79, 0x6e, 0x69, 0xb5, 0x64, 0x92, 0x16,
-	0xff, 0x84, 0x57, 0x5a, 0xfd, 0x3a, 0xf8, 0x06, 0x19, 0x64, 0x69, 0x3d, 0xa8, 0x9e, 0x93, 0x27,
-	0xf2, 0xbd, 0x08, 0x15, 0x0e, 0xd6, 0x2f, 0xa0, 0x00, 0xfd, 0x4b, 0x82, 0xeb, 0x23, 0x18, 0x10,
-	0xc5, 0x7c, 0x65, 0x88, 0x26, 0xcc, 0x89, 0xa2, 0xe0, 0xb1, 0x20, 0x58, 0x88, 0xc7, 0x80, 0xa6,
-	0x33, 0x22, 0x02, 0xc3, 0xf6, 0x97, 0x56, 0xbf, 0x3e, 0xb9, 0x8f, 0xee, 0x8d, 0x04, 0x06, 0x7e,
-	0x8f, 0x84, 0xa1, 0x5f, 0x24, 0xe0, 0x66, 0x0c, 0x0b, 0xa2, 0x47, 0x57, 0x21, 0xcf, 0xc2, 0x92,
-	0x8f, 0x0e, 0x7d, 0x90, 0x2d, 0x06, 0x93, 0x8c, 0xfc, 0x2d, 0x4f, 0xfc, 0xcf, 0x25, 0x79, 0xe3,
-	0x52, 0x4e, 0xaf, 0x1b, 0x3d, 0x13, 0xd6, 0xa5, 0xd5, 0x93, 0xb2, 0xfc, 0xe4, 0x12, 0x31, 0x18,
-	0xd0, 0x82, 0xfe, 0x98, 0x80, 0xdb, 0x63, 0x69, 0x19, 0x6d, 0x5e, 0x28, 0x30, 0xb1, 0x9c, 0x3e,
-	0x2e, 0x3c, 0xbf, 0xe3, 0xe1, 0xf9, 0x8d, 0x24, 0xef, 0x5c, 0xee, 0x5e, 0x18, 0x83, 0x86, 0x84,
-	0x6e, 0xca, 0x73, 0xb9, 0x72, 0x99, 0x9b, 0x12, 0xa3, 0x12, 0xbd, 0x4b, 0xc0, 0xe2, 0xe8, 0x26,
-	0x11, 0xc7, 0x23, 0xb1, 0x6d, 0x65, 0xa2, 0x1b, 0xf4, 0x8e, 0xc7, 0xeb, 0x57, 0x52, 0xe1, 0x33,
-	0xe6, 0x9a, 0x6f, 0x58, 0x71, 0xe2, 0xba, 0xea, 0x85, 0x69, 0xb7, 0xf0, 0x28, 0x5e, 0xd7, 0x98,
-	0xda, 0xea, 0x45, 0xe7, 0x3f, 0x12, 0xdc, 0x18, 0xd9, 0x64, 0x50, 0xcc, 0x57, 0xf7, 0xb8, 0x56,
-	0x58, 0xf8, 0x64, 0x62, 0x1c, 0xef, 0x66, 0x03, 0x54, 0x33, 0x69, 0x59, 0x05, 0x54, 0x33, 0x59,
-	0xe9, 0xa0, 0xbf, 0x4b, 0xb0, 0x38, 0xba, 0xa5, 0xc5, 0x95, 0x47, 0x6c, 0x13, 0x2c, 0x2c, 0x0e,
-	0xbd, 0xe0, 0x55, 0xda, 0xb6, 0x77, 0xee, 0x7b, 0xb8, 0x7a, 0x59, 0x32, 0x5d, 0xbd, 0x0c, 0x99,
-	0x6e, 0xbe, 0x81, 0x5b, 0x2d, 0xd2, 0x8e, 0xf4, 0x65, 0x73, 0x71, 0x28, 0x25, 0x87, 0xd4, 0xec,
-	0x43, 0xe9, 0xe4, 0x73, 0x81, 0xd1, 0x89, 0xa9, 0x5a, 0x7a, 0x91, 0x38, 0x7a, 0x49, 0xc7, 0x16,
-	0x73, 0xaa, 0xc4, 0x7f, 0x52, 0x6d, 0xc3, 0x1d, 0xfe, 0xe7, 0xd7, 0x43, 0xff, 0xb9, 0x99, 0x62,
-	0xc2, 0xf7, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x70, 0xa3, 0x03, 0xbc, 0xbc, 0x1b, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dataproc/v1beta2/clusters.pb.go b/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
index ca145519f4..ef2bdabba5 100644
--- a/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/clusters.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The cluster state.
 type ClusterStatus_State int32
@@ -54,6 +54,7 @@ var ClusterStatus_State_name = map[int32]string{
 	4: "DELETING",
 	5: "UPDATING",
 }
+
 var ClusterStatus_State_value = map[string]int32{
 	"UNKNOWN":  0,
 	"CREATING": 1,
@@ -66,8 +67,9 @@ var ClusterStatus_State_value = map[string]int32{
 func (x ClusterStatus_State) String() string {
 	return proto.EnumName(ClusterStatus_State_name, int32(x))
 }
+
 func (ClusterStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{10, 0}
+	return fileDescriptor_abc993f8d220b626, []int{10, 0}
 }
 
 // The cluster substate.
@@ -94,6 +96,7 @@ var ClusterStatus_Substate_name = map[int32]string{
 	1: "UNHEALTHY",
 	2: "STALE_STATUS",
 }
+
 var ClusterStatus_Substate_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"UNHEALTHY":    1,
@@ -103,8 +106,9 @@ var ClusterStatus_Substate_value = map[string]int32{
 func (x ClusterStatus_Substate) String() string {
 	return proto.EnumName(ClusterStatus_Substate_name, int32(x))
 }
+
 func (ClusterStatus_Substate) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{10, 1}
+	return fileDescriptor_abc993f8d220b626, []int{10, 1}
 }
 
 // Describes the identifying information, config, and status of
@@ -147,16 +151,17 @@ func (m *Cluster) Reset()         { *m = Cluster{} }
 func (m *Cluster) String() string { return proto.CompactTextString(m) }
 func (*Cluster) ProtoMessage()    {}
 func (*Cluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{0}
+	return fileDescriptor_abc993f8d220b626, []int{0}
 }
+
 func (m *Cluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cluster.Unmarshal(m, b)
 }
 func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
 }
-func (dst *Cluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cluster.Merge(dst, src)
+func (m *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(m, src)
 }
 func (m *Cluster) XXX_Size() int {
 	return xxx_messageInfo_Cluster.Size(m)
@@ -273,16 +278,17 @@ func (m *ClusterConfig) Reset()         { *m = ClusterConfig{} }
 func (m *ClusterConfig) String() string { return proto.CompactTextString(m) }
 func (*ClusterConfig) ProtoMessage()    {}
 func (*ClusterConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{1}
+	return fileDescriptor_abc993f8d220b626, []int{1}
 }
+
 func (m *ClusterConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterConfig.Unmarshal(m, b)
 }
 func (m *ClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClusterConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterConfig.Merge(dst, src)
+func (m *ClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterConfig.Merge(m, src)
 }
 func (m *ClusterConfig) XXX_Size() int {
 	return xxx_messageInfo_ClusterConfig.Size(m)
@@ -370,16 +376,17 @@ func (m *EncryptionConfig) Reset()         { *m = EncryptionConfig{} }
 func (m *EncryptionConfig) String() string { return proto.CompactTextString(m) }
 func (*EncryptionConfig) ProtoMessage()    {}
 func (*EncryptionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{2}
+	return fileDescriptor_abc993f8d220b626, []int{2}
 }
+
 func (m *EncryptionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EncryptionConfig.Unmarshal(m, b)
 }
 func (m *EncryptionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EncryptionConfig.Marshal(b, m, deterministic)
 }
-func (dst *EncryptionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EncryptionConfig.Merge(dst, src)
+func (m *EncryptionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EncryptionConfig.Merge(m, src)
 }
 func (m *EncryptionConfig) XXX_Size() int {
 	return xxx_messageInfo_EncryptionConfig.Size(m)
@@ -483,16 +490,17 @@ func (m *GceClusterConfig) Reset()         { *m = GceClusterConfig{} }
 func (m *GceClusterConfig) String() string { return proto.CompactTextString(m) }
 func (*GceClusterConfig) ProtoMessage()    {}
 func (*GceClusterConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{3}
+	return fileDescriptor_abc993f8d220b626, []int{3}
 }
+
 func (m *GceClusterConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GceClusterConfig.Unmarshal(m, b)
 }
 func (m *GceClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GceClusterConfig.Marshal(b, m, deterministic)
 }
-func (dst *GceClusterConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GceClusterConfig.Merge(dst, src)
+func (m *GceClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GceClusterConfig.Merge(m, src)
 }
 func (m *GceClusterConfig) XXX_Size() int {
 	return xxx_messageInfo_GceClusterConfig.Size(m)
@@ -614,16 +622,17 @@ func (m *InstanceGroupConfig) Reset()         { *m = InstanceGroupConfig{} }
 func (m *InstanceGroupConfig) String() string { return proto.CompactTextString(m) }
 func (*InstanceGroupConfig) ProtoMessage()    {}
 func (*InstanceGroupConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{4}
+	return fileDescriptor_abc993f8d220b626, []int{4}
 }
+
 func (m *InstanceGroupConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InstanceGroupConfig.Unmarshal(m, b)
 }
 func (m *InstanceGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InstanceGroupConfig.Marshal(b, m, deterministic)
 }
-func (dst *InstanceGroupConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InstanceGroupConfig.Merge(dst, src)
+func (m *InstanceGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstanceGroupConfig.Merge(m, src)
 }
 func (m *InstanceGroupConfig) XXX_Size() int {
 	return xxx_messageInfo_InstanceGroupConfig.Size(m)
@@ -713,16 +722,17 @@ func (m *ManagedGroupConfig) Reset()         { *m = ManagedGroupConfig{} }
 func (m *ManagedGroupConfig) String() string { return proto.CompactTextString(m) }
 func (*ManagedGroupConfig) ProtoMessage()    {}
 func (*ManagedGroupConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{5}
+	return fileDescriptor_abc993f8d220b626, []int{5}
 }
+
 func (m *ManagedGroupConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManagedGroupConfig.Unmarshal(m, b)
 }
 func (m *ManagedGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManagedGroupConfig.Marshal(b, m, deterministic)
 }
-func (dst *ManagedGroupConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManagedGroupConfig.Merge(dst, src)
+func (m *ManagedGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedGroupConfig.Merge(m, src)
 }
 func (m *ManagedGroupConfig) XXX_Size() int {
 	return xxx_messageInfo_ManagedGroupConfig.Size(m)
@@ -776,16 +786,17 @@ func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
 func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
 func (*AcceleratorConfig) ProtoMessage()    {}
 func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{6}
+	return fileDescriptor_abc993f8d220b626, []int{6}
 }
+
 func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
 }
 func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
 }
-func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+func (m *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(m, src)
 }
 func (m *AcceleratorConfig) XXX_Size() int {
 	return xxx_messageInfo_AcceleratorConfig.Size(m)
@@ -834,16 +845,17 @@ func (m *DiskConfig) Reset()         { *m = DiskConfig{} }
 func (m *DiskConfig) String() string { return proto.CompactTextString(m) }
 func (*DiskConfig) ProtoMessage()    {}
 func (*DiskConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{7}
+	return fileDescriptor_abc993f8d220b626, []int{7}
 }
+
 func (m *DiskConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DiskConfig.Unmarshal(m, b)
 }
 func (m *DiskConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DiskConfig.Marshal(b, m, deterministic)
 }
-func (dst *DiskConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DiskConfig.Merge(dst, src)
+func (m *DiskConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiskConfig.Merge(m, src)
 }
 func (m *DiskConfig) XXX_Size() int {
 	return xxx_messageInfo_DiskConfig.Size(m)
@@ -900,16 +912,17 @@ func (m *LifecycleConfig) Reset()         { *m = LifecycleConfig{} }
 func (m *LifecycleConfig) String() string { return proto.CompactTextString(m) }
 func (*LifecycleConfig) ProtoMessage()    {}
 func (*LifecycleConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{8}
+	return fileDescriptor_abc993f8d220b626, []int{8}
 }
+
 func (m *LifecycleConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LifecycleConfig.Unmarshal(m, b)
 }
 func (m *LifecycleConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LifecycleConfig.Marshal(b, m, deterministic)
 }
-func (dst *LifecycleConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LifecycleConfig.Merge(dst, src)
+func (m *LifecycleConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LifecycleConfig.Merge(m, src)
 }
 func (m *LifecycleConfig) XXX_Size() int {
 	return xxx_messageInfo_LifecycleConfig.Size(m)
@@ -964,80 +977,14 @@ func (m *LifecycleConfig) GetAutoDeleteTtl() *duration.Duration {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LifecycleConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LifecycleConfig_OneofMarshaler, _LifecycleConfig_OneofUnmarshaler, _LifecycleConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LifecycleConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LifecycleConfig_AutoDeleteTime)(nil),
 		(*LifecycleConfig_AutoDeleteTtl)(nil),
 	}
 }
 
-func _LifecycleConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LifecycleConfig)
-	// ttl
-	switch x := m.Ttl.(type) {
-	case *LifecycleConfig_AutoDeleteTime:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AutoDeleteTime); err != nil {
-			return err
-		}
-	case *LifecycleConfig_AutoDeleteTtl:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AutoDeleteTtl); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LifecycleConfig.Ttl has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LifecycleConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LifecycleConfig)
-	switch tag {
-	case 2: // ttl.auto_delete_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.Ttl = &LifecycleConfig_AutoDeleteTime{msg}
-		return true, err
-	case 3: // ttl.auto_delete_ttl
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.Ttl = &LifecycleConfig_AutoDeleteTtl{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LifecycleConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LifecycleConfig)
-	// ttl
-	switch x := m.Ttl.(type) {
-	case *LifecycleConfig_AutoDeleteTime:
-		s := proto.Size(x.AutoDeleteTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LifecycleConfig_AutoDeleteTtl:
-		s := proto.Size(x.AutoDeleteTtl)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Specifies an executable to run on a fully configured node and a
 // timeout period for executable completion.
 type NodeInitializationAction struct {
@@ -1057,16 +1004,17 @@ func (m *NodeInitializationAction) Reset()         { *m = NodeInitializationActi
 func (m *NodeInitializationAction) String() string { return proto.CompactTextString(m) }
 func (*NodeInitializationAction) ProtoMessage()    {}
 func (*NodeInitializationAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{9}
+	return fileDescriptor_abc993f8d220b626, []int{9}
 }
+
 func (m *NodeInitializationAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeInitializationAction.Unmarshal(m, b)
 }
 func (m *NodeInitializationAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeInitializationAction.Marshal(b, m, deterministic)
 }
-func (dst *NodeInitializationAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeInitializationAction.Merge(dst, src)
+func (m *NodeInitializationAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeInitializationAction.Merge(m, src)
 }
 func (m *NodeInitializationAction) XXX_Size() int {
 	return xxx_messageInfo_NodeInitializationAction.Size(m)
@@ -1111,16 +1059,17 @@ func (m *ClusterStatus) Reset()         { *m = ClusterStatus{} }
 func (m *ClusterStatus) String() string { return proto.CompactTextString(m) }
 func (*ClusterStatus) ProtoMessage()    {}
 func (*ClusterStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{10}
+	return fileDescriptor_abc993f8d220b626, []int{10}
 }
+
 func (m *ClusterStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterStatus.Unmarshal(m, b)
 }
 func (m *ClusterStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterStatus.Marshal(b, m, deterministic)
 }
-func (dst *ClusterStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterStatus.Merge(dst, src)
+func (m *ClusterStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterStatus.Merge(m, src)
 }
 func (m *ClusterStatus) XXX_Size() int {
 	return xxx_messageInfo_ClusterStatus.Size(m)
@@ -1197,16 +1146,17 @@ func (m *SoftwareConfig) Reset()         { *m = SoftwareConfig{} }
 func (m *SoftwareConfig) String() string { return proto.CompactTextString(m) }
 func (*SoftwareConfig) ProtoMessage()    {}
 func (*SoftwareConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{11}
+	return fileDescriptor_abc993f8d220b626, []int{11}
 }
+
 func (m *SoftwareConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SoftwareConfig.Unmarshal(m, b)
 }
 func (m *SoftwareConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SoftwareConfig.Marshal(b, m, deterministic)
 }
-func (dst *SoftwareConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SoftwareConfig.Merge(dst, src)
+func (m *SoftwareConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SoftwareConfig.Merge(m, src)
 }
 func (m *SoftwareConfig) XXX_Size() int {
 	return xxx_messageInfo_SoftwareConfig.Size(m)
@@ -1249,16 +1199,17 @@ func (m *ClusterMetrics) Reset()         { *m = ClusterMetrics{} }
 func (m *ClusterMetrics) String() string { return proto.CompactTextString(m) }
 func (*ClusterMetrics) ProtoMessage()    {}
 func (*ClusterMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{12}
+	return fileDescriptor_abc993f8d220b626, []int{12}
 }
+
 func (m *ClusterMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterMetrics.Unmarshal(m, b)
 }
 func (m *ClusterMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterMetrics.Marshal(b, m, deterministic)
 }
-func (dst *ClusterMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterMetrics.Merge(dst, src)
+func (m *ClusterMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterMetrics.Merge(m, src)
 }
 func (m *ClusterMetrics) XXX_Size() int {
 	return xxx_messageInfo_ClusterMetrics.Size(m)
@@ -1314,16 +1265,17 @@ func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
 func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterRequest) ProtoMessage()    {}
 func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{13}
+	return fileDescriptor_abc993f8d220b626, []int{13}
 }
+
 func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
 }
 func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+func (m *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(m, src)
 }
 func (m *CreateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterRequest.Size(m)
@@ -1461,16 +1413,17 @@ func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
 func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateClusterRequest) ProtoMessage()    {}
 func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{14}
+	return fileDescriptor_abc993f8d220b626, []int{14}
 }
+
 func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
 }
 func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+func (m *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(m, src)
 }
 func (m *UpdateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateClusterRequest.Size(m)
@@ -1564,16 +1517,17 @@ func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
 func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteClusterRequest) ProtoMessage()    {}
 func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{15}
+	return fileDescriptor_abc993f8d220b626, []int{15}
 }
+
 func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+func (m *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(m, src)
 }
 func (m *DeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteClusterRequest.Size(m)
@@ -1637,16 +1591,17 @@ func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
 func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterRequest) ProtoMessage()    {}
 func (*GetClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{16}
+	return fileDescriptor_abc993f8d220b626, []int{16}
 }
+
 func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
 }
 func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+func (m *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(m, src)
 }
 func (m *GetClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClusterRequest.Size(m)
@@ -1718,16 +1673,17 @@ func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
 func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListClustersRequest) ProtoMessage()    {}
 func (*ListClustersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{17}
+	return fileDescriptor_abc993f8d220b626, []int{17}
 }
+
 func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
 }
 func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+func (m *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(m, src)
 }
 func (m *ListClustersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListClustersRequest.Size(m)
@@ -1790,16 +1746,17 @@ func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
 func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListClustersResponse) ProtoMessage()    {}
 func (*ListClustersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{18}
+	return fileDescriptor_abc993f8d220b626, []int{18}
 }
+
 func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
 }
 func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+func (m *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(m, src)
 }
 func (m *ListClustersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListClustersResponse.Size(m)
@@ -1842,16 +1799,17 @@ func (m *DiagnoseClusterRequest) Reset()         { *m = DiagnoseClusterRequest{}
 func (m *DiagnoseClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DiagnoseClusterRequest) ProtoMessage()    {}
 func (*DiagnoseClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{19}
+	return fileDescriptor_abc993f8d220b626, []int{19}
 }
+
 func (m *DiagnoseClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DiagnoseClusterRequest.Unmarshal(m, b)
 }
 func (m *DiagnoseClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DiagnoseClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DiagnoseClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DiagnoseClusterRequest.Merge(dst, src)
+func (m *DiagnoseClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterRequest.Merge(m, src)
 }
 func (m *DiagnoseClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DiagnoseClusterRequest.Size(m)
@@ -1898,16 +1856,17 @@ func (m *DiagnoseClusterResults) Reset()         { *m = DiagnoseClusterResults{}
 func (m *DiagnoseClusterResults) String() string { return proto.CompactTextString(m) }
 func (*DiagnoseClusterResults) ProtoMessage()    {}
 func (*DiagnoseClusterResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_clusters_794cf83e9cf994b6, []int{20}
+	return fileDescriptor_abc993f8d220b626, []int{20}
 }
+
 func (m *DiagnoseClusterResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DiagnoseClusterResults.Unmarshal(m, b)
 }
 func (m *DiagnoseClusterResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DiagnoseClusterResults.Marshal(b, m, deterministic)
 }
-func (dst *DiagnoseClusterResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DiagnoseClusterResults.Merge(dst, src)
+func (m *DiagnoseClusterResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterResults.Merge(m, src)
 }
 func (m *DiagnoseClusterResults) XXX_Size() int {
 	return xxx_messageInfo_DiagnoseClusterResults.Size(m)
@@ -1926,6 +1885,8 @@ func (m *DiagnoseClusterResults) GetOutputUri() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ClusterStatus_State", ClusterStatus_State_name, ClusterStatus_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ClusterStatus_Substate", ClusterStatus_Substate_name, ClusterStatus_Substate_value)
 	proto.RegisterType((*Cluster)(nil), "google.cloud.dataproc.v1beta2.Cluster")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.Cluster.LabelsEntry")
 	proto.RegisterType((*ClusterConfig)(nil), "google.cloud.dataproc.v1beta2.ClusterConfig")
@@ -1952,8 +1913,154 @@ func init() {
 	proto.RegisterType((*ListClustersResponse)(nil), "google.cloud.dataproc.v1beta2.ListClustersResponse")
 	proto.RegisterType((*DiagnoseClusterRequest)(nil), "google.cloud.dataproc.v1beta2.DiagnoseClusterRequest")
 	proto.RegisterType((*DiagnoseClusterResults)(nil), "google.cloud.dataproc.v1beta2.DiagnoseClusterResults")
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ClusterStatus_State", ClusterStatus_State_name, ClusterStatus_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ClusterStatus_Substate", ClusterStatus_Substate_name, ClusterStatus_Substate_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/clusters.proto", fileDescriptor_abc993f8d220b626)
+}
+
+var fileDescriptor_abc993f8d220b626 = []byte{
+	// 2227 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4b, 0x73, 0x1b, 0xc7,
+	0x11, 0xd6, 0x12, 0x7c, 0x80, 0x0d, 0xe2, 0xc1, 0x31, 0xcd, 0xc0, 0x74, 0x14, 0xcb, 0xeb, 0xc4,
+	0xa1, 0x1d, 0x05, 0xb0, 0xa9, 0xb8, 0xec, 0x48, 0x91, 0x4b, 0x14, 0x09, 0x91, 0xb4, 0x28, 0x8a,
+	0x59, 0x00, 0x52, 0x94, 0x44, 0xb5, 0x35, 0xd8, 0x1d, 0x40, 0x63, 0xee, 0x2b, 0x3b, 0xb3, 0xb2,
+	0x21, 0x95, 0xaa, 0x52, 0xce, 0x29, 0x95, 0x63, 0x7e, 0x40, 0x7c, 0xce, 0xc1, 0x07, 0x57, 0xaa,
+	0x52, 0x39, 0xe4, 0x96, 0x7f, 0xe0, 0xaa, 0xfc, 0x82, 0x1c, 0x72, 0xc9, 0x3d, 0xc7, 0xd4, 0x3c,
+	0x16, 0xd8, 0x05, 0x29, 0x81, 0x64, 0x54, 0x3e, 0x11, 0xdb, 0xd3, 0xfd, 0xf5, 0x37, 0x3d, 0x3d,
+	0x3d, 0x3d, 0x43, 0xb8, 0x3c, 0x08, 0xc3, 0x81, 0x47, 0x9a, 0x8e, 0x17, 0x26, 0x6e, 0xd3, 0xc5,
+	0x1c, 0x47, 0x71, 0xe8, 0x34, 0x1f, 0xbf, 0xdf, 0x23, 0x1c, 0x6f, 0x34, 0x1d, 0x2f, 0x61, 0x9c,
+	0xc4, 0xac, 0x11, 0xc5, 0x21, 0x0f, 0xd1, 0x45, 0xa5, 0xdd, 0x90, 0xda, 0x8d, 0x54, 0xbb, 0xa1,
+	0xb5, 0xd7, 0xbe, 0xab, 0xc1, 0x70, 0x44, 0x9b, 0x38, 0x08, 0x42, 0x8e, 0x39, 0x0d, 0x03, 0x6d,
+	0xbc, 0xd6, 0x78, 0xb1, 0xab, 0x30, 0x22, 0x71, 0x4e, 0xff, 0xdd, 0x17, 0xeb, 0xb3, 0x47, 0x38,
+	0x26, 0xae, 0xd6, 0x7d, 0x4b, 0xeb, 0x7a, 0x61, 0x30, 0x88, 0x93, 0x20, 0xa0, 0xc1, 0xe0, 0x38,
+	0xe0, 0xf7, 0xb4, 0x92, 0xfc, 0xea, 0x25, 0xfd, 0xa6, 0x9b, 0x28, 0x05, 0x3d, 0x7e, 0x69, 0x72,
+	0xbc, 0x4f, 0x89, 0xe7, 0xda, 0x3e, 0x66, 0x47, 0x5a, 0xe3, 0x8d, 0x49, 0x0d, 0x4e, 0x7d, 0xc2,
+	0x38, 0xf6, 0x23, 0xa5, 0x60, 0xfe, 0x69, 0x16, 0x16, 0xb6, 0x54, 0xcc, 0xd0, 0x45, 0x80, 0x28,
+	0x0e, 0x3f, 0x25, 0x0e, 0xb7, 0xa9, 0x5b, 0x37, 0x2e, 0x19, 0xeb, 0x8b, 0xd6, 0xa2, 0x96, 0xec,
+	0xb9, 0xe8, 0x4d, 0x58, 0xd2, 0xd1, 0xb5, 0x03, 0xec, 0x93, 0xfa, 0x8c, 0x54, 0x28, 0x69, 0xd9,
+	0x01, 0xf6, 0x09, 0xda, 0x86, 0x79, 0x27, 0x0c, 0xfa, 0x74, 0x50, 0x2f, 0x5c, 0x32, 0xd6, 0x4b,
+	0x1b, 0x97, 0x1b, 0x2f, 0x8c, 0x7f, 0x43, 0x7b, 0xde, 0x92, 0x36, 0x96, 0xb6, 0x45, 0x9f, 0xc0,
+	0xbc, 0x87, 0x7b, 0xc4, 0x63, 0xf5, 0xe2, 0xa5, 0xc2, 0x7a, 0x69, 0x63, 0xe3, 0x74, 0x28, 0x8d,
+	0x7d, 0x69, 0xd4, 0x0a, 0x78, 0x3c, 0xb4, 0x34, 0x82, 0x60, 0xc4, 0x38, 0xe6, 0x09, 0xab, 0xcf,
+	0x9e, 0x85, 0x51, 0x5b, 0xda, 0x58, 0xda, 0x16, 0xb5, 0xa1, 0xa2, 0x7e, 0xd9, 0x8f, 0x28, 0xe3,
+	0x61, 0x3c, 0xac, 0x2f, 0x48, 0x66, 0x67, 0x43, 0x2b, 0x2b, 0x8c, 0x5d, 0x05, 0x91, 0x8d, 0x67,
+	0x92, 0x50, 0xb7, 0x3e, 0x9f, 0x8b, 0x67, 0x37, 0xa1, 0x2e, 0xda, 0x81, 0x05, 0x9f, 0xf0, 0x98,
+	0x3a, 0xac, 0xbe, 0x28, 0xe9, 0xff, 0xf8, 0x74, 0x0e, 0xef, 0x28, 0x23, 0x2b, 0xb5, 0x5e, 0xfb,
+	0x29, 0x94, 0x32, 0xd1, 0x41, 0x35, 0x28, 0x1c, 0x91, 0xa1, 0x5e, 0x62, 0xf1, 0x13, 0xad, 0xc0,
+	0xdc, 0x63, 0xec, 0x25, 0xe9, 0xaa, 0xaa, 0x8f, 0xab, 0x33, 0x1f, 0x19, 0xe6, 0xd7, 0xf3, 0x50,
+	0xce, 0xad, 0x13, 0x7a, 0x0b, 0xca, 0x6a, 0xa5, 0xec, 0x5e, 0xe2, 0x1c, 0x11, 0xae, 0x71, 0x96,
+	0x94, 0xf0, 0xa6, 0x94, 0xa1, 0x87, 0x80, 0x06, 0x0e, 0xb1, 0xd3, 0x19, 0xea, 0xb4, 0x28, 0xca,
+	0x59, 0x34, 0xa7, 0xcc, 0x62, 0xc7, 0x21, 0xf9, 0xcc, 0xa8, 0x0d, 0x26, 0x24, 0xe8, 0x3e, 0x94,
+	0x7d, 0x9c, 0x45, 0x56, 0xf1, 0x99, 0x96, 0x2a, 0x7b, 0x01, 0xe3, 0x38, 0x70, 0xc8, 0x4e, 0x1c,
+	0x26, 0x91, 0x06, 0x5f, 0x52, 0x40, 0x63, 0xe0, 0xcf, 0xc2, 0xf8, 0x68, 0x0c, 0x0c, 0xe7, 0x07,
+	0x56, 0x40, 0x1a, 0xf8, 0x53, 0xf8, 0x0e, 0x23, 0x4e, 0x18, 0xb8, 0x38, 0x1e, 0xda, 0x79, 0x17,
+	0x4b, 0xe7, 0x76, 0xf1, 0xea, 0x08, 0xf2, 0x7e, 0xd6, 0xd7, 0x3d, 0xa8, 0xb2, 0xb0, 0xcf, 0x3f,
+	0xc3, 0x31, 0x49, 0x7d, 0x94, 0x4f, 0x95, 0x3f, 0x6d, 0x6d, 0xa5, 0xe1, 0x2b, 0x2c, 0xf7, 0x8d,
+	0x1e, 0x40, 0xcd, 0xa3, 0x7d, 0xe2, 0x0c, 0x1d, 0x6f, 0x04, 0x5c, 0x91, 0xc0, 0x8d, 0x29, 0xc0,
+	0xfb, 0xa9, 0x99, 0x46, 0xae, 0x7a, 0x79, 0x01, 0x0a, 0x60, 0x95, 0x06, 0x94, 0x53, 0xec, 0xd1,
+	0x27, 0xb2, 0xc6, 0xd9, 0xd8, 0x91, 0xb5, 0xb0, 0x5e, 0x92, 0x5b, 0xed, 0xc3, 0x29, 0x0e, 0x0e,
+	0x42, 0x97, 0xec, 0xe5, 0x00, 0x36, 0xa5, 0xbd, 0xf5, 0x2a, 0x3d, 0x41, 0xca, 0xd0, 0xaf, 0x61,
+	0x99, 0x04, 0x4e, 0x3c, 0x8c, 0xa4, 0x2f, 0x3d, 0x97, 0xea, 0xa9, 0xd2, 0xb3, 0x35, 0xb2, 0x4b,
+	0xd3, 0x93, 0x4c, 0x48, 0xcc, 0x1b, 0x50, 0x9b, 0xd4, 0x42, 0x97, 0xe1, 0x15, 0xb1, 0x23, 0x22,
+	0xd7, 0x3e, 0xf2, 0x99, 0x7d, 0x44, 0x86, 0xaa, 0x8c, 0xaa, 0xcd, 0x53, 0x1d, 0x38, 0xe4, 0xd0,
+	0xbd, 0xed, 0xb3, 0xdb, 0x64, 0x28, 0x4a, 0xa9, 0xf9, 0xe7, 0x02, 0xd4, 0x26, 0xf7, 0x01, 0x7a,
+	0x0d, 0x8a, 0x4f, 0xc2, 0x80, 0xd8, 0x49, 0x4c, 0xb5, 0xdd, 0x82, 0xf8, 0xee, 0xc6, 0x14, 0xbd,
+	0x01, 0xa5, 0x80, 0x70, 0x91, 0x57, 0x72, 0x54, 0x6d, 0x63, 0xd0, 0x22, 0xa1, 0xf0, 0x03, 0xa8,
+	0xb0, 0xa4, 0x97, 0xd5, 0x51, 0x05, 0xa7, 0x3c, 0x96, 0x0a, 0xb5, 0x75, 0xa8, 0xd1, 0x80, 0x93,
+	0x38, 0xc0, 0x9e, 0x4d, 0x23, 0x3b, 0x0c, 0x3c, 0x51, 0xec, 0x8c, 0xf5, 0xa2, 0x55, 0x49, 0xe5,
+	0x7b, 0xd1, 0xdd, 0xc0, 0x1b, 0xa2, 0x1f, 0x42, 0x95, 0x91, 0xf8, 0x31, 0x75, 0x88, 0x8d, 0x1d,
+	0x27, 0x4c, 0x02, 0x2e, 0xb7, 0xf7, 0xa2, 0x55, 0xd1, 0xe2, 0x4d, 0x25, 0x45, 0x3f, 0x81, 0xd5,
+	0x09, 0x45, 0x9b, 0x39, 0x61, 0x44, 0x58, 0xbd, 0x70, 0xa9, 0xb0, 0xbe, 0x68, 0xad, 0xe4, 0xf5,
+	0xdb, 0x72, 0x0c, 0x21, 0x98, 0xe5, 0x78, 0x20, 0xea, 0xb6, 0xd0, 0x91, 0xbf, 0xd1, 0x03, 0x28,
+	0xfa, 0x84, 0x63, 0xb1, 0x22, 0xf5, 0x39, 0x99, 0x16, 0xd7, 0xcf, 0x58, 0x4a, 0x1a, 0x77, 0xb4,
+	0xbd, 0x3a, 0x26, 0x46, 0x70, 0x6b, 0xd7, 0xa0, 0x9c, 0x1b, 0x3a, 0x53, 0x8d, 0xfc, 0xed, 0x2c,
+	0xbc, 0x72, 0xc2, 0xf6, 0x14, 0x95, 0x32, 0x48, 0x7c, 0x9b, 0xea, 0x21, 0x26, 0xd1, 0xe6, 0xac,
+	0xa5, 0x20, 0xf1, 0x53, 0x75, 0x26, 0x16, 0x26, 0x55, 0x90, 0x19, 0xc1, 0xea, 0x33, 0x72, 0xca,
+	0xe5, 0x54, 0x2a, 0xf2, 0x81, 0xa1, 0xd7, 0x61, 0x91, 0xfa, 0x78, 0xa0, 0x16, 0xbf, 0x20, 0x19,
+	0x14, 0xa5, 0x40, 0xaf, 0x9a, 0x8f, 0x9d, 0x47, 0x34, 0x20, 0x36, 0x1f, 0x46, 0x4a, 0x67, 0x56,
+	0x2d, 0x86, 0x96, 0x77, 0x86, 0x91, 0xd4, 0xfc, 0x04, 0x4a, 0x2e, 0x65, 0x47, 0x69, 0xc6, 0xcf,
+	0xc9, 0x8c, 0x7f, 0x67, 0x4a, 0x14, 0xb7, 0x29, 0x3b, 0xd2, 0xb9, 0x0e, 0xee, 0xe8, 0xb7, 0x64,
+	0xce, 0xec, 0x28, 0x26, 0xc4, 0x8f, 0x38, 0xed, 0x79, 0x44, 0xa6, 0x54, 0xd1, 0x2a, 0x53, 0x76,
+	0x38, 0x16, 0x22, 0x07, 0x56, 0x7c, 0x1c, 0xe0, 0x01, 0x71, 0xed, 0x81, 0x08, 0x4e, 0xea, 0x7b,
+	0x41, 0xfa, 0x7e, 0x7f, 0x8a, 0xef, 0x3b, 0xca, 0x34, 0x5b, 0xf5, 0x90, 0x7f, 0x4c, 0x86, 0x3a,
+	0xb0, 0x84, 0x1d, 0x87, 0x78, 0xa2, 0x85, 0x0a, 0xe3, 0xb4, 0x75, 0x78, 0x6f, 0x0a, 0xf8, 0xe6,
+	0xd8, 0x24, 0x2d, 0xda, 0x59, 0x14, 0x19, 0x57, 0x1a, 0xd8, 0x4e, 0x94, 0xd8, 0x91, 0x87, 0x79,
+	0x3f, 0x8c, 0x7d, 0x79, 0xd2, 0x88, 0xb8, 0xd2, 0x60, 0x2b, 0x4a, 0x0e, 0xb5, 0xd4, 0xfc, 0xbd,
+	0x01, 0xe8, 0x38, 0x55, 0x91, 0xfb, 0xa3, 0xc5, 0xe5, 0xc4, 0x17, 0x20, 0x24, 0xbb, 0xef, 0x57,
+	0xd2, 0xd1, 0x8e, 0x1e, 0x94, 0x7d, 0xd4, 0x75, 0x78, 0x7d, 0x64, 0xa5, 0x42, 0xa6, 0x66, 0x9c,
+	0xeb, 0xbc, 0xea, 0x34, 0x9b, 0x71, 0xca, 0xb7, 0x6c, 0xc3, 0xcc, 0x18, 0x96, 0x8f, 0x4d, 0x0c,
+	0xbd, 0x07, 0x2b, 0x99, 0xa9, 0x8d, 0xd3, 0x44, 0xf1, 0x40, 0x99, 0xb1, 0x34, 0x55, 0x7e, 0x04,
+	0xcb, 0x59, 0x0b, 0xb5, 0xc5, 0x67, 0x64, 0x06, 0xd7, 0x70, 0x16, 0x3f, 0x09, 0xb8, 0xf9, 0x3b,
+	0x03, 0x60, 0x9c, 0x26, 0xe8, 0xfb, 0x50, 0xe9, 0x85, 0x21, 0xb7, 0x65, 0xae, 0x09, 0x5f, 0x3a,
+	0x65, 0x97, 0x84, 0x54, 0xe8, 0x09, 0x27, 0xe8, 0x1d, 0x58, 0x1e, 0x6b, 0x31, 0xfa, 0x84, 0xd8,
+	0x83, 0x9e, 0xde, 0x23, 0x95, 0x54, 0xb1, 0x4d, 0x9f, 0x90, 0x9d, 0x9e, 0x00, 0x14, 0x5b, 0xc9,
+	0x0b, 0x1d, 0xec, 0xd9, 0x8c, 0xb9, 0x4c, 0x33, 0x11, 0x7b, 0x69, 0x5f, 0x08, 0xdb, 0xcc, 0x65,
+	0xe6, 0xbf, 0x0d, 0xa8, 0x4e, 0x1c, 0x35, 0x68, 0x13, 0xaa, 0xd4, 0xf5, 0x88, 0xed, 0x12, 0x8f,
+	0x70, 0x62, 0x73, 0xee, 0x49, 0x17, 0xa5, 0x8d, 0xd7, 0xd2, 0xe4, 0x48, 0xbb, 0xe3, 0xc6, 0xb6,
+	0xee, 0xaf, 0xad, 0xb2, 0xb0, 0xd8, 0x96, 0x06, 0x1d, 0xee, 0xa1, 0x5b, 0x50, 0xc3, 0x09, 0x0f,
+	0x47, 0x10, 0x54, 0x2f, 0x42, 0x69, 0x63, 0xed, 0x18, 0x46, 0x27, 0xed, 0xb0, 0x77, 0x2f, 0x58,
+	0x15, 0x61, 0xa5, 0x61, 0xa8, 0x4f, 0xd0, 0x16, 0x54, 0x73, 0x38, 0xdc, 0xd3, 0x8d, 0xf2, 0xf3,
+	0xa9, 0xec, 0x5e, 0xb0, 0xca, 0x19, 0x14, 0xee, 0xdd, 0x9c, 0x83, 0x02, 0xe7, 0x9e, 0xf9, 0x07,
+	0x03, 0xea, 0xcf, 0x3b, 0xf4, 0x44, 0x6d, 0x26, 0x9f, 0x13, 0x27, 0xe1, 0xb8, 0xe7, 0x11, 0xbb,
+	0x4f, 0xbd, 0x34, 0xdf, 0x2a, 0x63, 0xf1, 0x2d, 0xea, 0x11, 0x74, 0x0b, 0x96, 0x95, 0x44, 0x9c,
+	0x82, 0x62, 0x5e, 0x61, 0xc2, 0xf5, 0xd4, 0x5e, 0x10, 0x9e, 0xda, 0xc8, 0xa6, 0xa3, 0x4c, 0xcc,
+	0x2f, 0x0b, 0xa3, 0x2e, 0x51, 0x75, 0xbb, 0x68, 0x17, 0xe6, 0x44, 0xbf, 0xab, 0x1c, 0x57, 0x4e,
+	0xdb, 0xc4, 0x2b, 0xe3, 0x86, 0xf8, 0x43, 0x2c, 0x05, 0x80, 0x56, 0x61, 0xde, 0x25, 0x1c, 0x53,
+	0x4f, 0x27, 0xbe, 0xfe, 0x42, 0xdb, 0x50, 0x93, 0x0a, 0x36, 0xe3, 0x38, 0xe6, 0x6a, 0x55, 0x0a,
+	0xd3, 0x56, 0xc5, 0x92, 0x9d, 0x3c, 0x69, 0x0b, 0x13, 0xb9, 0x26, 0x3f, 0x87, 0x22, 0x4b, 0x7a,
+	0x8a, 0xea, 0xac, 0xa4, 0xfa, 0xc1, 0xd9, 0xa8, 0x6a, 0x63, 0x6b, 0x04, 0x63, 0xde, 0x83, 0x39,
+	0x39, 0x01, 0x54, 0x82, 0x85, 0xee, 0xc1, 0xed, 0x83, 0xbb, 0xf7, 0x0f, 0x6a, 0x17, 0xd0, 0x12,
+	0x14, 0xb7, 0xac, 0xd6, 0x66, 0x67, 0xef, 0x60, 0xa7, 0x66, 0x88, 0x21, 0xab, 0x7b, 0x70, 0x20,
+	0x3e, 0x66, 0xd0, 0x22, 0xcc, 0xb5, 0x2c, 0xeb, 0xae, 0x55, 0x2b, 0x08, 0xad, 0xed, 0xd6, 0x7e,
+	0x4b, 0x6a, 0xcd, 0x8a, 0xaf, 0xee, 0xe1, 0xb6, 0xb2, 0x99, 0x33, 0x7f, 0x06, 0xc5, 0xd4, 0x1b,
+	0xaa, 0x42, 0xa9, 0x7b, 0xd0, 0x3e, 0x6c, 0x6d, 0xed, 0xdd, 0xda, 0x6b, 0x6d, 0xd7, 0x2e, 0xa0,
+	0x32, 0x2c, 0x76, 0x0f, 0x76, 0x5b, 0x9b, 0xfb, 0x9d, 0xdd, 0x07, 0x35, 0x03, 0xd5, 0x60, 0xa9,
+	0xdd, 0xd9, 0xdc, 0x6f, 0xd9, 0xed, 0xce, 0x66, 0xa7, 0xdb, 0xae, 0xcd, 0x98, 0xdf, 0x18, 0x50,
+	0xc9, 0xf7, 0x77, 0xe2, 0x7c, 0x52, 0x67, 0xca, 0x63, 0x12, 0x33, 0x1a, 0x06, 0x69, 0x27, 0x2f,
+	0x85, 0xf7, 0x94, 0x0c, 0x3d, 0x94, 0xd7, 0xc2, 0x88, 0xc4, 0x9c, 0xea, 0xb3, 0x69, 0xfa, 0xb1,
+	0x9b, 0xf7, 0xd3, 0x38, 0x1c, 0xd9, 0xab, 0x63, 0x37, 0x03, 0xb8, 0x76, 0x1d, 0xaa, 0x13, 0xc3,
+	0x67, 0x3a, 0x7a, 0xff, 0x39, 0x03, 0x95, 0xfc, 0xad, 0x07, 0x61, 0x58, 0x7a, 0xe4, 0xf6, 0x99,
+	0x9d, 0x5e, 0x9d, 0x0c, 0x49, 0xf9, 0xe3, 0x33, 0x5d, 0x9d, 0x1a, 0xbb, 0x6e, 0x9f, 0xe9, 0xdf,
+	0x8a, 0x73, 0xe9, 0xd1, 0x58, 0x22, 0x5c, 0x0c, 0x71, 0x1c, 0x8c, 0x5c, 0xcc, 0x9c, 0xc7, 0xc5,
+	0x03, 0x1c, 0x07, 0x79, 0x17, 0xc3, 0xb1, 0x64, 0xed, 0x63, 0xa8, 0x4d, 0x72, 0x98, 0x16, 0x98,
+	0x42, 0x26, 0x30, 0xc2, 0x7e, 0xd2, 0xc1, 0x59, 0xec, 0xcd, 0xaf, 0x0c, 0x58, 0xd9, 0x8a, 0x09,
+	0xe6, 0x69, 0x03, 0x65, 0x91, 0xdf, 0x24, 0x84, 0xf1, 0x69, 0xcf, 0x04, 0xab, 0x30, 0x1f, 0x93,
+	0x81, 0x48, 0x26, 0x55, 0xf1, 0xf5, 0x17, 0xba, 0x01, 0x0b, 0xfa, 0x32, 0xa8, 0xeb, 0xcb, 0xdb,
+	0xa7, 0x8b, 0x96, 0x95, 0x9a, 0x09, 0xc7, 0xb1, 0xe2, 0x20, 0x1c, 0xab, 0xf6, 0x66, 0x51, 0x4b,
+	0xf6, 0x5c, 0xf3, 0x3f, 0x33, 0xb0, 0xd2, 0x8d, 0xdc, 0xff, 0x83, 0xf0, 0x5c, 0x8e, 0xf0, 0x29,
+	0xde, 0x3b, 0x32, 0x73, 0x2a, 0x9c, 0x6f, 0x4e, 0x0f, 0xe1, 0xe2, 0x20, 0xc6, 0x0e, 0xe9, 0x27,
+	0x9e, 0xed, 0x12, 0x27, 0xf4, 0x7d, 0xca, 0x58, 0xb6, 0x16, 0xcf, 0x4f, 0xab, 0xc5, 0xaf, 0xa7,
+	0xf6, 0xdb, 0x19, 0x73, 0x5d, 0x96, 0xd1, 0x35, 0x28, 0x25, 0x32, 0x24, 0xf2, 0x51, 0x48, 0xbf,
+	0x81, 0x1c, 0xaf, 0x8e, 0xb7, 0x28, 0xf1, 0xdc, 0x3b, 0x98, 0x1d, 0x59, 0xa0, 0xd4, 0xc5, 0xef,
+	0x89, 0x78, 0x2f, 0x4c, 0xc6, 0xfb, 0x6b, 0x03, 0x56, 0xd4, 0xa9, 0xf4, 0x72, 0x12, 0xe4, 0x14,
+	0xf1, 0x9e, 0x7c, 0x32, 0x99, 0x3d, 0xfe, 0x64, 0x92, 0x27, 0x3d, 0x37, 0x49, 0xda, 0x87, 0xe5,
+	0x1d, 0xc2, 0xbf, 0x2d, 0xc2, 0xe6, 0x97, 0x06, 0xbc, 0xb2, 0x4f, 0x59, 0xea, 0x90, 0x9d, 0xd9,
+	0xe3, 0x6c, 0xce, 0xe3, 0x2a, 0xcc, 0xf7, 0xa9, 0x27, 0xd2, 0x4d, 0xa7, 0xaa, 0xfa, 0x12, 0x77,
+	0x83, 0x48, 0x94, 0x71, 0xd1, 0x42, 0xe9, 0xbe, 0xa8, 0x28, 0x04, 0xa2, 0x77, 0x92, 0xbe, 0xc4,
+	0x20, 0x0f, 0x8f, 0x48, 0x3a, 0x05, 0xa9, 0xde, 0x11, 0x02, 0xf3, 0x0b, 0x03, 0x56, 0xf2, 0x14,
+	0x59, 0x14, 0x06, 0x8c, 0xa0, 0x9b, 0x50, 0x4c, 0x5f, 0x53, 0x75, 0x09, 0x3d, 0x6d, 0x76, 0x8f,
+	0xec, 0xd0, 0xdb, 0x50, 0x0d, 0xc8, 0xe7, 0xdc, 0xce, 0x10, 0x50, 0x51, 0x2a, 0x0b, 0xf1, 0xe1,
+	0x88, 0x44, 0x0c, 0xab, 0xdb, 0x14, 0x0f, 0x82, 0x90, 0x7d, 0x6b, 0xc9, 0x64, 0x7e, 0x78, 0x82,
+	0x4f, 0x96, 0x78, 0x9c, 0x09, 0x9f, 0x61, 0xc2, 0xa3, 0x84, 0x67, 0x1a, 0xe4, 0x45, 0x25, 0xe9,
+	0xc6, 0x74, 0xe3, 0xbf, 0x45, 0x58, 0x1e, 0x5f, 0x2a, 0x79, 0x1c, 0x7a, 0x1e, 0x89, 0xd1, 0x57,
+	0x06, 0x94, 0x73, 0xf5, 0x12, 0x5d, 0x99, 0x16, 0xae, 0x13, 0xaa, 0xeb, 0xda, 0xc5, 0xd4, 0x28,
+	0xf3, 0x32, 0xdc, 0xb8, 0x9b, 0xbe, 0x0c, 0x9b, 0x7b, 0x5f, 0x7c, 0xf3, 0xaf, 0x3f, 0xce, 0x6c,
+	0x99, 0x1f, 0x8d, 0x9e, 0x95, 0x75, 0x2c, 0x58, 0xf3, 0xe9, 0x38, 0x4e, 0xcf, 0x9a, 0x2a, 0x0c,
+	0xac, 0xf9, 0x54, 0xfd, 0x78, 0x36, 0x7a, 0x18, 0xbf, 0x3a, 0x2a, 0x3d, 0x7f, 0x37, 0xa0, 0x9c,
+	0xab, 0x97, 0x53, 0x09, 0x9f, 0x54, 0x5d, 0xa7, 0x11, 0xfe, 0x85, 0x24, 0x6c, 0x6d, 0xec, 0x9c,
+	0x97, 0x70, 0xf3, 0x69, 0x76, 0x21, 0x9f, 0x8d, 0xf9, 0xff, 0xc5, 0x80, 0x72, 0xae, 0xfe, 0x4c,
+	0xe5, 0x7f, 0x52, 0xb5, 0x9a, 0xc6, 0xff, 0xae, 0xe4, 0xbf, 0xf7, 0xee, 0xcb, 0xe2, 0x8f, 0xfe,
+	0x6a, 0x00, 0x8c, 0x4b, 0x10, 0x9a, 0x76, 0x43, 0x3d, 0x56, 0xad, 0xd6, 0x4e, 0xb9, 0x0b, 0x53,
+	0xe6, 0xe8, 0xa5, 0x31, 0xff, 0x9b, 0x01, 0x4b, 0xd9, 0x4a, 0x81, 0x36, 0xa6, 0x3e, 0xfa, 0x1d,
+	0xab, 0x7c, 0x6b, 0x57, 0xce, 0x64, 0xa3, 0x4a, 0x91, 0x79, 0x43, 0x4e, 0xe5, 0x2a, 0x3a, 0x77,
+	0xd6, 0xa3, 0x7f, 0x18, 0x50, 0x9d, 0xd8, 0xed, 0xe8, 0x83, 0xa9, 0xaf, 0x1e, 0x27, 0x55, 0xa4,
+	0x69, 0x09, 0xf3, 0x2b, 0xc9, 0xb5, 0x6b, 0x1e, 0xbe, 0xac, 0x84, 0x77, 0x35, 0x8d, 0xab, 0xc6,
+	0xbb, 0x37, 0x9f, 0xc2, 0x9b, 0x4e, 0xe8, 0xbf, 0x98, 0xf7, 0xcd, 0xf4, 0x22, 0xc6, 0x0e, 0xc5,
+	0xf9, 0x7e, 0x68, 0xfc, 0xb2, 0xa5, 0xf5, 0x07, 0xa1, 0x87, 0x83, 0x41, 0x23, 0x8c, 0x07, 0xcd,
+	0x01, 0x09, 0xe4, 0xe9, 0xdf, 0x54, 0x43, 0x38, 0xa2, 0xec, 0x39, 0xff, 0xb7, 0xba, 0x96, 0x0a,
+	0x7a, 0xf3, 0xd2, 0xe2, 0xca, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x71, 0x37, 0xfc, 0x0f, 0x83,
+	0x1b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2208,151 +2315,3 @@ var _ClusterController_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dataproc/v1beta2/clusters.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1beta2/clusters.proto", fileDescriptor_clusters_794cf83e9cf994b6)
-}
-
-var fileDescriptor_clusters_794cf83e9cf994b6 = []byte{
-	// 2227 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4b, 0x73, 0x1b, 0xc7,
-	0x11, 0xd6, 0x12, 0x7c, 0x80, 0x0d, 0xe2, 0xc1, 0x31, 0xcd, 0xc0, 0x74, 0x14, 0xcb, 0xeb, 0xc4,
-	0xa1, 0x1d, 0x05, 0xb0, 0xa9, 0xb8, 0xec, 0x48, 0x91, 0x4b, 0x14, 0x09, 0x91, 0xb4, 0x28, 0x8a,
-	0x59, 0x00, 0x52, 0x94, 0x44, 0xb5, 0x35, 0xd8, 0x1d, 0x40, 0x63, 0xee, 0x2b, 0x3b, 0xb3, 0xb2,
-	0x21, 0x95, 0xaa, 0x52, 0xce, 0x29, 0x95, 0x63, 0x7e, 0x40, 0x7c, 0xce, 0xc1, 0x07, 0x57, 0xaa,
-	0x52, 0x39, 0xe4, 0x96, 0x7f, 0xe0, 0xaa, 0xfc, 0x82, 0x1c, 0x72, 0xc9, 0x3d, 0xc7, 0xd4, 0x3c,
-	0x16, 0xd8, 0x05, 0x29, 0x81, 0x64, 0x54, 0x3e, 0x11, 0xdb, 0xd3, 0xfd, 0xf5, 0x37, 0x3d, 0x3d,
-	0x3d, 0x3d, 0x43, 0xb8, 0x3c, 0x08, 0xc3, 0x81, 0x47, 0x9a, 0x8e, 0x17, 0x26, 0x6e, 0xd3, 0xc5,
-	0x1c, 0x47, 0x71, 0xe8, 0x34, 0x1f, 0xbf, 0xdf, 0x23, 0x1c, 0x6f, 0x34, 0x1d, 0x2f, 0x61, 0x9c,
-	0xc4, 0xac, 0x11, 0xc5, 0x21, 0x0f, 0xd1, 0x45, 0xa5, 0xdd, 0x90, 0xda, 0x8d, 0x54, 0xbb, 0xa1,
-	0xb5, 0xd7, 0xbe, 0xab, 0xc1, 0x70, 0x44, 0x9b, 0x38, 0x08, 0x42, 0x8e, 0x39, 0x0d, 0x03, 0x6d,
-	0xbc, 0xd6, 0x78, 0xb1, 0xab, 0x30, 0x22, 0x71, 0x4e, 0xff, 0xdd, 0x17, 0xeb, 0xb3, 0x47, 0x38,
-	0x26, 0xae, 0xd6, 0x7d, 0x4b, 0xeb, 0x7a, 0x61, 0x30, 0x88, 0x93, 0x20, 0xa0, 0xc1, 0xe0, 0x38,
-	0xe0, 0xf7, 0xb4, 0x92, 0xfc, 0xea, 0x25, 0xfd, 0xa6, 0x9b, 0x28, 0x05, 0x3d, 0x7e, 0x69, 0x72,
-	0xbc, 0x4f, 0x89, 0xe7, 0xda, 0x3e, 0x66, 0x47, 0x5a, 0xe3, 0x8d, 0x49, 0x0d, 0x4e, 0x7d, 0xc2,
-	0x38, 0xf6, 0x23, 0xa5, 0x60, 0xfe, 0x69, 0x16, 0x16, 0xb6, 0x54, 0xcc, 0xd0, 0x45, 0x80, 0x28,
-	0x0e, 0x3f, 0x25, 0x0e, 0xb7, 0xa9, 0x5b, 0x37, 0x2e, 0x19, 0xeb, 0x8b, 0xd6, 0xa2, 0x96, 0xec,
-	0xb9, 0xe8, 0x4d, 0x58, 0xd2, 0xd1, 0xb5, 0x03, 0xec, 0x93, 0xfa, 0x8c, 0x54, 0x28, 0x69, 0xd9,
-	0x01, 0xf6, 0x09, 0xda, 0x86, 0x79, 0x27, 0x0c, 0xfa, 0x74, 0x50, 0x2f, 0x5c, 0x32, 0xd6, 0x4b,
-	0x1b, 0x97, 0x1b, 0x2f, 0x8c, 0x7f, 0x43, 0x7b, 0xde, 0x92, 0x36, 0x96, 0xb6, 0x45, 0x9f, 0xc0,
-	0xbc, 0x87, 0x7b, 0xc4, 0x63, 0xf5, 0xe2, 0xa5, 0xc2, 0x7a, 0x69, 0x63, 0xe3, 0x74, 0x28, 0x8d,
-	0x7d, 0x69, 0xd4, 0x0a, 0x78, 0x3c, 0xb4, 0x34, 0x82, 0x60, 0xc4, 0x38, 0xe6, 0x09, 0xab, 0xcf,
-	0x9e, 0x85, 0x51, 0x5b, 0xda, 0x58, 0xda, 0x16, 0xb5, 0xa1, 0xa2, 0x7e, 0xd9, 0x8f, 0x28, 0xe3,
-	0x61, 0x3c, 0xac, 0x2f, 0x48, 0x66, 0x67, 0x43, 0x2b, 0x2b, 0x8c, 0x5d, 0x05, 0x91, 0x8d, 0x67,
-	0x92, 0x50, 0xb7, 0x3e, 0x9f, 0x8b, 0x67, 0x37, 0xa1, 0x2e, 0xda, 0x81, 0x05, 0x9f, 0xf0, 0x98,
-	0x3a, 0xac, 0xbe, 0x28, 0xe9, 0xff, 0xf8, 0x74, 0x0e, 0xef, 0x28, 0x23, 0x2b, 0xb5, 0x5e, 0xfb,
-	0x29, 0x94, 0x32, 0xd1, 0x41, 0x35, 0x28, 0x1c, 0x91, 0xa1, 0x5e, 0x62, 0xf1, 0x13, 0xad, 0xc0,
-	0xdc, 0x63, 0xec, 0x25, 0xe9, 0xaa, 0xaa, 0x8f, 0xab, 0x33, 0x1f, 0x19, 0xe6, 0xd7, 0xf3, 0x50,
-	0xce, 0xad, 0x13, 0x7a, 0x0b, 0xca, 0x6a, 0xa5, 0xec, 0x5e, 0xe2, 0x1c, 0x11, 0xae, 0x71, 0x96,
-	0x94, 0xf0, 0xa6, 0x94, 0xa1, 0x87, 0x80, 0x06, 0x0e, 0xb1, 0xd3, 0x19, 0xea, 0xb4, 0x28, 0xca,
-	0x59, 0x34, 0xa7, 0xcc, 0x62, 0xc7, 0x21, 0xf9, 0xcc, 0xa8, 0x0d, 0x26, 0x24, 0xe8, 0x3e, 0x94,
-	0x7d, 0x9c, 0x45, 0x56, 0xf1, 0x99, 0x96, 0x2a, 0x7b, 0x01, 0xe3, 0x38, 0x70, 0xc8, 0x4e, 0x1c,
-	0x26, 0x91, 0x06, 0x5f, 0x52, 0x40, 0x63, 0xe0, 0xcf, 0xc2, 0xf8, 0x68, 0x0c, 0x0c, 0xe7, 0x07,
-	0x56, 0x40, 0x1a, 0xf8, 0x53, 0xf8, 0x0e, 0x23, 0x4e, 0x18, 0xb8, 0x38, 0x1e, 0xda, 0x79, 0x17,
-	0x4b, 0xe7, 0x76, 0xf1, 0xea, 0x08, 0xf2, 0x7e, 0xd6, 0xd7, 0x3d, 0xa8, 0xb2, 0xb0, 0xcf, 0x3f,
-	0xc3, 0x31, 0x49, 0x7d, 0x94, 0x4f, 0x95, 0x3f, 0x6d, 0x6d, 0xa5, 0xe1, 0x2b, 0x2c, 0xf7, 0x8d,
-	0x1e, 0x40, 0xcd, 0xa3, 0x7d, 0xe2, 0x0c, 0x1d, 0x6f, 0x04, 0x5c, 0x91, 0xc0, 0x8d, 0x29, 0xc0,
-	0xfb, 0xa9, 0x99, 0x46, 0xae, 0x7a, 0x79, 0x01, 0x0a, 0x60, 0x95, 0x06, 0x94, 0x53, 0xec, 0xd1,
-	0x27, 0xb2, 0xc6, 0xd9, 0xd8, 0x91, 0xb5, 0xb0, 0x5e, 0x92, 0x5b, 0xed, 0xc3, 0x29, 0x0e, 0x0e,
-	0x42, 0x97, 0xec, 0xe5, 0x00, 0x36, 0xa5, 0xbd, 0xf5, 0x2a, 0x3d, 0x41, 0xca, 0xd0, 0xaf, 0x61,
-	0x99, 0x04, 0x4e, 0x3c, 0x8c, 0xa4, 0x2f, 0x3d, 0x97, 0xea, 0xa9, 0xd2, 0xb3, 0x35, 0xb2, 0x4b,
-	0xd3, 0x93, 0x4c, 0x48, 0xcc, 0x1b, 0x50, 0x9b, 0xd4, 0x42, 0x97, 0xe1, 0x15, 0xb1, 0x23, 0x22,
-	0xd7, 0x3e, 0xf2, 0x99, 0x7d, 0x44, 0x86, 0xaa, 0x8c, 0xaa, 0xcd, 0x53, 0x1d, 0x38, 0xe4, 0xd0,
-	0xbd, 0xed, 0xb3, 0xdb, 0x64, 0x28, 0x4a, 0xa9, 0xf9, 0xe7, 0x02, 0xd4, 0x26, 0xf7, 0x01, 0x7a,
-	0x0d, 0x8a, 0x4f, 0xc2, 0x80, 0xd8, 0x49, 0x4c, 0xb5, 0xdd, 0x82, 0xf8, 0xee, 0xc6, 0x14, 0xbd,
-	0x01, 0xa5, 0x80, 0x70, 0x91, 0x57, 0x72, 0x54, 0x6d, 0x63, 0xd0, 0x22, 0xa1, 0xf0, 0x03, 0xa8,
-	0xb0, 0xa4, 0x97, 0xd5, 0x51, 0x05, 0xa7, 0x3c, 0x96, 0x0a, 0xb5, 0x75, 0xa8, 0xd1, 0x80, 0x93,
-	0x38, 0xc0, 0x9e, 0x4d, 0x23, 0x3b, 0x0c, 0x3c, 0x51, 0xec, 0x8c, 0xf5, 0xa2, 0x55, 0x49, 0xe5,
-	0x7b, 0xd1, 0xdd, 0xc0, 0x1b, 0xa2, 0x1f, 0x42, 0x95, 0x91, 0xf8, 0x31, 0x75, 0x88, 0x8d, 0x1d,
-	0x27, 0x4c, 0x02, 0x2e, 0xb7, 0xf7, 0xa2, 0x55, 0xd1, 0xe2, 0x4d, 0x25, 0x45, 0x3f, 0x81, 0xd5,
-	0x09, 0x45, 0x9b, 0x39, 0x61, 0x44, 0x58, 0xbd, 0x70, 0xa9, 0xb0, 0xbe, 0x68, 0xad, 0xe4, 0xf5,
-	0xdb, 0x72, 0x0c, 0x21, 0x98, 0xe5, 0x78, 0x20, 0xea, 0xb6, 0xd0, 0x91, 0xbf, 0xd1, 0x03, 0x28,
-	0xfa, 0x84, 0x63, 0xb1, 0x22, 0xf5, 0x39, 0x99, 0x16, 0xd7, 0xcf, 0x58, 0x4a, 0x1a, 0x77, 0xb4,
-	0xbd, 0x3a, 0x26, 0x46, 0x70, 0x6b, 0xd7, 0xa0, 0x9c, 0x1b, 0x3a, 0x53, 0x8d, 0xfc, 0xed, 0x2c,
-	0xbc, 0x72, 0xc2, 0xf6, 0x14, 0x95, 0x32, 0x48, 0x7c, 0x9b, 0xea, 0x21, 0x26, 0xd1, 0xe6, 0xac,
-	0xa5, 0x20, 0xf1, 0x53, 0x75, 0x26, 0x16, 0x26, 0x55, 0x90, 0x19, 0xc1, 0xea, 0x33, 0x72, 0xca,
-	0xe5, 0x54, 0x2a, 0xf2, 0x81, 0xa1, 0xd7, 0x61, 0x91, 0xfa, 0x78, 0xa0, 0x16, 0xbf, 0x20, 0x19,
-	0x14, 0xa5, 0x40, 0xaf, 0x9a, 0x8f, 0x9d, 0x47, 0x34, 0x20, 0x36, 0x1f, 0x46, 0x4a, 0x67, 0x56,
-	0x2d, 0x86, 0x96, 0x77, 0x86, 0x91, 0xd4, 0xfc, 0x04, 0x4a, 0x2e, 0x65, 0x47, 0x69, 0xc6, 0xcf,
-	0xc9, 0x8c, 0x7f, 0x67, 0x4a, 0x14, 0xb7, 0x29, 0x3b, 0xd2, 0xb9, 0x0e, 0xee, 0xe8, 0xb7, 0x64,
-	0xce, 0xec, 0x28, 0x26, 0xc4, 0x8f, 0x38, 0xed, 0x79, 0x44, 0xa6, 0x54, 0xd1, 0x2a, 0x53, 0x76,
-	0x38, 0x16, 0x22, 0x07, 0x56, 0x7c, 0x1c, 0xe0, 0x01, 0x71, 0xed, 0x81, 0x08, 0x4e, 0xea, 0x7b,
-	0x41, 0xfa, 0x7e, 0x7f, 0x8a, 0xef, 0x3b, 0xca, 0x34, 0x5b, 0xf5, 0x90, 0x7f, 0x4c, 0x86, 0x3a,
-	0xb0, 0x84, 0x1d, 0x87, 0x78, 0xa2, 0x85, 0x0a, 0xe3, 0xb4, 0x75, 0x78, 0x6f, 0x0a, 0xf8, 0xe6,
-	0xd8, 0x24, 0x2d, 0xda, 0x59, 0x14, 0x19, 0x57, 0x1a, 0xd8, 0x4e, 0x94, 0xd8, 0x91, 0x87, 0x79,
-	0x3f, 0x8c, 0x7d, 0x79, 0xd2, 0x88, 0xb8, 0xd2, 0x60, 0x2b, 0x4a, 0x0e, 0xb5, 0xd4, 0xfc, 0xbd,
-	0x01, 0xe8, 0x38, 0x55, 0x91, 0xfb, 0xa3, 0xc5, 0xe5, 0xc4, 0x17, 0x20, 0x24, 0xbb, 0xef, 0x57,
-	0xd2, 0xd1, 0x8e, 0x1e, 0x94, 0x7d, 0xd4, 0x75, 0x78, 0x7d, 0x64, 0xa5, 0x42, 0xa6, 0x66, 0x9c,
-	0xeb, 0xbc, 0xea, 0x34, 0x9b, 0x71, 0xca, 0xb7, 0x6c, 0xc3, 0xcc, 0x18, 0x96, 0x8f, 0x4d, 0x0c,
-	0xbd, 0x07, 0x2b, 0x99, 0xa9, 0x8d, 0xd3, 0x44, 0xf1, 0x40, 0x99, 0xb1, 0x34, 0x55, 0x7e, 0x04,
-	0xcb, 0x59, 0x0b, 0xb5, 0xc5, 0x67, 0x64, 0x06, 0xd7, 0x70, 0x16, 0x3f, 0x09, 0xb8, 0xf9, 0x3b,
-	0x03, 0x60, 0x9c, 0x26, 0xe8, 0xfb, 0x50, 0xe9, 0x85, 0x21, 0xb7, 0x65, 0xae, 0x09, 0x5f, 0x3a,
-	0x65, 0x97, 0x84, 0x54, 0xe8, 0x09, 0x27, 0xe8, 0x1d, 0x58, 0x1e, 0x6b, 0x31, 0xfa, 0x84, 0xd8,
-	0x83, 0x9e, 0xde, 0x23, 0x95, 0x54, 0xb1, 0x4d, 0x9f, 0x90, 0x9d, 0x9e, 0x00, 0x14, 0x5b, 0xc9,
-	0x0b, 0x1d, 0xec, 0xd9, 0x8c, 0xb9, 0x4c, 0x33, 0x11, 0x7b, 0x69, 0x5f, 0x08, 0xdb, 0xcc, 0x65,
-	0xe6, 0xbf, 0x0d, 0xa8, 0x4e, 0x1c, 0x35, 0x68, 0x13, 0xaa, 0xd4, 0xf5, 0x88, 0xed, 0x12, 0x8f,
-	0x70, 0x62, 0x73, 0xee, 0x49, 0x17, 0xa5, 0x8d, 0xd7, 0xd2, 0xe4, 0x48, 0xbb, 0xe3, 0xc6, 0xb6,
-	0xee, 0xaf, 0xad, 0xb2, 0xb0, 0xd8, 0x96, 0x06, 0x1d, 0xee, 0xa1, 0x5b, 0x50, 0xc3, 0x09, 0x0f,
-	0x47, 0x10, 0x54, 0x2f, 0x42, 0x69, 0x63, 0xed, 0x18, 0x46, 0x27, 0xed, 0xb0, 0x77, 0x2f, 0x58,
-	0x15, 0x61, 0xa5, 0x61, 0xa8, 0x4f, 0xd0, 0x16, 0x54, 0x73, 0x38, 0xdc, 0xd3, 0x8d, 0xf2, 0xf3,
-	0xa9, 0xec, 0x5e, 0xb0, 0xca, 0x19, 0x14, 0xee, 0xdd, 0x9c, 0x83, 0x02, 0xe7, 0x9e, 0xf9, 0x07,
-	0x03, 0xea, 0xcf, 0x3b, 0xf4, 0x44, 0x6d, 0x26, 0x9f, 0x13, 0x27, 0xe1, 0xb8, 0xe7, 0x11, 0xbb,
-	0x4f, 0xbd, 0x34, 0xdf, 0x2a, 0x63, 0xf1, 0x2d, 0xea, 0x11, 0x74, 0x0b, 0x96, 0x95, 0x44, 0x9c,
-	0x82, 0x62, 0x5e, 0x61, 0xc2, 0xf5, 0xd4, 0x5e, 0x10, 0x9e, 0xda, 0xc8, 0xa6, 0xa3, 0x4c, 0xcc,
-	0x2f, 0x0b, 0xa3, 0x2e, 0x51, 0x75, 0xbb, 0x68, 0x17, 0xe6, 0x44, 0xbf, 0xab, 0x1c, 0x57, 0x4e,
-	0xdb, 0xc4, 0x2b, 0xe3, 0x86, 0xf8, 0x43, 0x2c, 0x05, 0x80, 0x56, 0x61, 0xde, 0x25, 0x1c, 0x53,
-	0x4f, 0x27, 0xbe, 0xfe, 0x42, 0xdb, 0x50, 0x93, 0x0a, 0x36, 0xe3, 0x38, 0xe6, 0x6a, 0x55, 0x0a,
-	0xd3, 0x56, 0xc5, 0x92, 0x9d, 0x3c, 0x69, 0x0b, 0x13, 0xb9, 0x26, 0x3f, 0x87, 0x22, 0x4b, 0x7a,
-	0x8a, 0xea, 0xac, 0xa4, 0xfa, 0xc1, 0xd9, 0xa8, 0x6a, 0x63, 0x6b, 0x04, 0x63, 0xde, 0x83, 0x39,
-	0x39, 0x01, 0x54, 0x82, 0x85, 0xee, 0xc1, 0xed, 0x83, 0xbb, 0xf7, 0x0f, 0x6a, 0x17, 0xd0, 0x12,
-	0x14, 0xb7, 0xac, 0xd6, 0x66, 0x67, 0xef, 0x60, 0xa7, 0x66, 0x88, 0x21, 0xab, 0x7b, 0x70, 0x20,
-	0x3e, 0x66, 0xd0, 0x22, 0xcc, 0xb5, 0x2c, 0xeb, 0xae, 0x55, 0x2b, 0x08, 0xad, 0xed, 0xd6, 0x7e,
-	0x4b, 0x6a, 0xcd, 0x8a, 0xaf, 0xee, 0xe1, 0xb6, 0xb2, 0x99, 0x33, 0x7f, 0x06, 0xc5, 0xd4, 0x1b,
-	0xaa, 0x42, 0xa9, 0x7b, 0xd0, 0x3e, 0x6c, 0x6d, 0xed, 0xdd, 0xda, 0x6b, 0x6d, 0xd7, 0x2e, 0xa0,
-	0x32, 0x2c, 0x76, 0x0f, 0x76, 0x5b, 0x9b, 0xfb, 0x9d, 0xdd, 0x07, 0x35, 0x03, 0xd5, 0x60, 0xa9,
-	0xdd, 0xd9, 0xdc, 0x6f, 0xd9, 0xed, 0xce, 0x66, 0xa7, 0xdb, 0xae, 0xcd, 0x98, 0xdf, 0x18, 0x50,
-	0xc9, 0xf7, 0x77, 0xe2, 0x7c, 0x52, 0x67, 0xca, 0x63, 0x12, 0x33, 0x1a, 0x06, 0x69, 0x27, 0x2f,
-	0x85, 0xf7, 0x94, 0x0c, 0x3d, 0x94, 0xd7, 0xc2, 0x88, 0xc4, 0x9c, 0xea, 0xb3, 0x69, 0xfa, 0xb1,
-	0x9b, 0xf7, 0xd3, 0x38, 0x1c, 0xd9, 0xab, 0x63, 0x37, 0x03, 0xb8, 0x76, 0x1d, 0xaa, 0x13, 0xc3,
-	0x67, 0x3a, 0x7a, 0xff, 0x39, 0x03, 0x95, 0xfc, 0xad, 0x07, 0x61, 0x58, 0x7a, 0xe4, 0xf6, 0x99,
-	0x9d, 0x5e, 0x9d, 0x0c, 0x49, 0xf9, 0xe3, 0x33, 0x5d, 0x9d, 0x1a, 0xbb, 0x6e, 0x9f, 0xe9, 0xdf,
-	0x8a, 0x73, 0xe9, 0xd1, 0x58, 0x22, 0x5c, 0x0c, 0x71, 0x1c, 0x8c, 0x5c, 0xcc, 0x9c, 0xc7, 0xc5,
-	0x03, 0x1c, 0x07, 0x79, 0x17, 0xc3, 0xb1, 0x64, 0xed, 0x63, 0xa8, 0x4d, 0x72, 0x98, 0x16, 0x98,
-	0x42, 0x26, 0x30, 0xc2, 0x7e, 0xd2, 0xc1, 0x59, 0xec, 0xcd, 0xaf, 0x0c, 0x58, 0xd9, 0x8a, 0x09,
-	0xe6, 0x69, 0x03, 0x65, 0x91, 0xdf, 0x24, 0x84, 0xf1, 0x69, 0xcf, 0x04, 0xab, 0x30, 0x1f, 0x93,
-	0x81, 0x48, 0x26, 0x55, 0xf1, 0xf5, 0x17, 0xba, 0x01, 0x0b, 0xfa, 0x32, 0xa8, 0xeb, 0xcb, 0xdb,
-	0xa7, 0x8b, 0x96, 0x95, 0x9a, 0x09, 0xc7, 0xb1, 0xe2, 0x20, 0x1c, 0xab, 0xf6, 0x66, 0x51, 0x4b,
-	0xf6, 0x5c, 0xf3, 0x3f, 0x33, 0xb0, 0xd2, 0x8d, 0xdc, 0xff, 0x83, 0xf0, 0x5c, 0x8e, 0xf0, 0x29,
-	0xde, 0x3b, 0x32, 0x73, 0x2a, 0x9c, 0x6f, 0x4e, 0x0f, 0xe1, 0xe2, 0x20, 0xc6, 0x0e, 0xe9, 0x27,
-	0x9e, 0xed, 0x12, 0x27, 0xf4, 0x7d, 0xca, 0x58, 0xb6, 0x16, 0xcf, 0x4f, 0xab, 0xc5, 0xaf, 0xa7,
-	0xf6, 0xdb, 0x19, 0x73, 0x5d, 0x96, 0xd1, 0x35, 0x28, 0x25, 0x32, 0x24, 0xf2, 0x51, 0x48, 0xbf,
-	0x81, 0x1c, 0xaf, 0x8e, 0xb7, 0x28, 0xf1, 0xdc, 0x3b, 0x98, 0x1d, 0x59, 0xa0, 0xd4, 0xc5, 0xef,
-	0x89, 0x78, 0x2f, 0x4c, 0xc6, 0xfb, 0x6b, 0x03, 0x56, 0xd4, 0xa9, 0xf4, 0x72, 0x12, 0xe4, 0x14,
-	0xf1, 0x9e, 0x7c, 0x32, 0x99, 0x3d, 0xfe, 0x64, 0x92, 0x27, 0x3d, 0x37, 0x49, 0xda, 0x87, 0xe5,
-	0x1d, 0xc2, 0xbf, 0x2d, 0xc2, 0xe6, 0x97, 0x06, 0xbc, 0xb2, 0x4f, 0x59, 0xea, 0x90, 0x9d, 0xd9,
-	0xe3, 0x6c, 0xce, 0xe3, 0x2a, 0xcc, 0xf7, 0xa9, 0x27, 0xd2, 0x4d, 0xa7, 0xaa, 0xfa, 0x12, 0x77,
-	0x83, 0x48, 0x94, 0x71, 0xd1, 0x42, 0xe9, 0xbe, 0xa8, 0x28, 0x04, 0xa2, 0x77, 0x92, 0xbe, 0xc4,
-	0x20, 0x0f, 0x8f, 0x48, 0x3a, 0x05, 0xa9, 0xde, 0x11, 0x02, 0xf3, 0x0b, 0x03, 0x56, 0xf2, 0x14,
-	0x59, 0x14, 0x06, 0x8c, 0xa0, 0x9b, 0x50, 0x4c, 0x5f, 0x53, 0x75, 0x09, 0x3d, 0x6d, 0x76, 0x8f,
-	0xec, 0xd0, 0xdb, 0x50, 0x0d, 0xc8, 0xe7, 0xdc, 0xce, 0x10, 0x50, 0x51, 0x2a, 0x0b, 0xf1, 0xe1,
-	0x88, 0x44, 0x0c, 0xab, 0xdb, 0x14, 0x0f, 0x82, 0x90, 0x7d, 0x6b, 0xc9, 0x64, 0x7e, 0x78, 0x82,
-	0x4f, 0x96, 0x78, 0x9c, 0x09, 0x9f, 0x61, 0xc2, 0xa3, 0x84, 0x67, 0x1a, 0xe4, 0x45, 0x25, 0xe9,
-	0xc6, 0x74, 0xe3, 0xbf, 0x45, 0x58, 0x1e, 0x5f, 0x2a, 0x79, 0x1c, 0x7a, 0x1e, 0x89, 0xd1, 0x57,
-	0x06, 0x94, 0x73, 0xf5, 0x12, 0x5d, 0x99, 0x16, 0xae, 0x13, 0xaa, 0xeb, 0xda, 0xc5, 0xd4, 0x28,
-	0xf3, 0x32, 0xdc, 0xb8, 0x9b, 0xbe, 0x0c, 0x9b, 0x7b, 0x5f, 0x7c, 0xf3, 0xaf, 0x3f, 0xce, 0x6c,
-	0x99, 0x1f, 0x8d, 0x9e, 0x95, 0x75, 0x2c, 0x58, 0xf3, 0xe9, 0x38, 0x4e, 0xcf, 0x9a, 0x2a, 0x0c,
-	0xac, 0xf9, 0x54, 0xfd, 0x78, 0x36, 0x7a, 0x18, 0xbf, 0x3a, 0x2a, 0x3d, 0x7f, 0x37, 0xa0, 0x9c,
-	0xab, 0x97, 0x53, 0x09, 0x9f, 0x54, 0x5d, 0xa7, 0x11, 0xfe, 0x85, 0x24, 0x6c, 0x6d, 0xec, 0x9c,
-	0x97, 0x70, 0xf3, 0x69, 0x76, 0x21, 0x9f, 0x8d, 0xf9, 0xff, 0xc5, 0x80, 0x72, 0xae, 0xfe, 0x4c,
-	0xe5, 0x7f, 0x52, 0xb5, 0x9a, 0xc6, 0xff, 0xae, 0xe4, 0xbf, 0xf7, 0xee, 0xcb, 0xe2, 0x8f, 0xfe,
-	0x6a, 0x00, 0x8c, 0x4b, 0x10, 0x9a, 0x76, 0x43, 0x3d, 0x56, 0xad, 0xd6, 0x4e, 0xb9, 0x0b, 0x53,
-	0xe6, 0xe8, 0xa5, 0x31, 0xff, 0x9b, 0x01, 0x4b, 0xd9, 0x4a, 0x81, 0x36, 0xa6, 0x3e, 0xfa, 0x1d,
-	0xab, 0x7c, 0x6b, 0x57, 0xce, 0x64, 0xa3, 0x4a, 0x91, 0x79, 0x43, 0x4e, 0xe5, 0x2a, 0x3a, 0x77,
-	0xd6, 0xa3, 0x7f, 0x18, 0x50, 0x9d, 0xd8, 0xed, 0xe8, 0x83, 0xa9, 0xaf, 0x1e, 0x27, 0x55, 0xa4,
-	0x69, 0x09, 0xf3, 0x2b, 0xc9, 0xb5, 0x6b, 0x1e, 0xbe, 0xac, 0x84, 0x77, 0x35, 0x8d, 0xab, 0xc6,
-	0xbb, 0x37, 0x9f, 0xc2, 0x9b, 0x4e, 0xe8, 0xbf, 0x98, 0xf7, 0xcd, 0xf4, 0x22, 0xc6, 0x0e, 0xc5,
-	0xf9, 0x7e, 0x68, 0xfc, 0xb2, 0xa5, 0xf5, 0x07, 0xa1, 0x87, 0x83, 0x41, 0x23, 0x8c, 0x07, 0xcd,
-	0x01, 0x09, 0xe4, 0xe9, 0xdf, 0x54, 0x43, 0x38, 0xa2, 0xec, 0x39, 0xff, 0xb7, 0xba, 0x96, 0x0a,
-	0x7a, 0xf3, 0xd2, 0xe2, 0xca, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x71, 0x37, 0xfc, 0x0f, 0x83,
-	0x1b, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dataproc/v1beta2/jobs.pb.go b/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
index 8ea6e8e3be..c1a7d91564 100644
--- a/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/jobs.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dataproc
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The Log4j level for job execution. When running an
 // [Apache Hive](http://hive.apache.org/) job, Cloud
@@ -64,6 +64,7 @@ var LoggingConfig_Level_name = map[int32]string{
 	7: "FATAL",
 	8: "OFF",
 }
+
 var LoggingConfig_Level_value = map[string]int32{
 	"LEVEL_UNSPECIFIED": 0,
 	"ALL":               1,
@@ -79,8 +80,9 @@ var LoggingConfig_Level_value = map[string]int32{
 func (x LoggingConfig_Level) String() string {
 	return proto.EnumName(LoggingConfig_Level_name, int32(x))
 }
+
 func (LoggingConfig_Level) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{0, 0}
+	return fileDescriptor_20fb118582e1d7de, []int{0, 0}
 }
 
 // The job state.
@@ -126,6 +128,7 @@ var JobStatus_State_name = map[int32]string{
 	6: "ERROR",
 	9: "ATTEMPT_FAILURE",
 }
+
 var JobStatus_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"PENDING":           1,
@@ -142,8 +145,9 @@ var JobStatus_State_value = map[string]int32{
 func (x JobStatus_State) String() string {
 	return proto.EnumName(JobStatus_State_name, int32(x))
 }
+
 func (JobStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{9, 0}
+	return fileDescriptor_20fb118582e1d7de, []int{9, 0}
 }
 
 // The job substate.
@@ -176,6 +180,7 @@ var JobStatus_Substate_name = map[int32]string{
 	2: "QUEUED",
 	3: "STALE_STATUS",
 }
+
 var JobStatus_Substate_value = map[string]int32{
 	"UNSPECIFIED":  0,
 	"SUBMITTED":    1,
@@ -186,8 +191,9 @@ var JobStatus_Substate_value = map[string]int32{
 func (x JobStatus_Substate) String() string {
 	return proto.EnumName(JobStatus_Substate_name, int32(x))
 }
+
 func (JobStatus_Substate) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{9, 1}
+	return fileDescriptor_20fb118582e1d7de, []int{9, 1}
 }
 
 // The application state, corresponding to
@@ -226,6 +232,7 @@ var YarnApplication_State_name = map[int32]string{
 	7: "FAILED",
 	8: "KILLED",
 }
+
 var YarnApplication_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"NEW":               1,
@@ -241,8 +248,9 @@ var YarnApplication_State_value = map[string]int32{
 func (x YarnApplication_State) String() string {
 	return proto.EnumName(YarnApplication_State_name, int32(x))
 }
+
 func (YarnApplication_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{11, 0}
+	return fileDescriptor_20fb118582e1d7de, []int{11, 0}
 }
 
 // A matcher that specifies categories of job states.
@@ -263,6 +271,7 @@ var ListJobsRequest_JobStateMatcher_name = map[int32]string{
 	1: "ACTIVE",
 	2: "NON_ACTIVE",
 }
+
 var ListJobsRequest_JobStateMatcher_value = map[string]int32{
 	"ALL":        0,
 	"ACTIVE":     1,
@@ -272,8 +281,9 @@ var ListJobsRequest_JobStateMatcher_value = map[string]int32{
 func (x ListJobsRequest_JobStateMatcher) String() string {
 	return proto.EnumName(ListJobsRequest_JobStateMatcher_name, int32(x))
 }
+
 func (ListJobsRequest_JobStateMatcher) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{16, 0}
+	return fileDescriptor_20fb118582e1d7de, []int{16, 0}
 }
 
 // The runtime logging config of the job.
@@ -292,16 +302,17 @@ func (m *LoggingConfig) Reset()         { *m = LoggingConfig{} }
 func (m *LoggingConfig) String() string { return proto.CompactTextString(m) }
 func (*LoggingConfig) ProtoMessage()    {}
 func (*LoggingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{0}
+	return fileDescriptor_20fb118582e1d7de, []int{0}
 }
+
 func (m *LoggingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LoggingConfig.Unmarshal(m, b)
 }
 func (m *LoggingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LoggingConfig.Marshal(b, m, deterministic)
 }
-func (dst *LoggingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LoggingConfig.Merge(dst, src)
+func (m *LoggingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoggingConfig.Merge(m, src)
 }
 func (m *LoggingConfig) XXX_Size() int {
 	return xxx_messageInfo_LoggingConfig.Size(m)
@@ -366,16 +377,17 @@ func (m *HadoopJob) Reset()         { *m = HadoopJob{} }
 func (m *HadoopJob) String() string { return proto.CompactTextString(m) }
 func (*HadoopJob) ProtoMessage()    {}
 func (*HadoopJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{1}
+	return fileDescriptor_20fb118582e1d7de, []int{1}
 }
+
 func (m *HadoopJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HadoopJob.Unmarshal(m, b)
 }
 func (m *HadoopJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HadoopJob.Marshal(b, m, deterministic)
 }
-func (dst *HadoopJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HadoopJob.Merge(dst, src)
+func (m *HadoopJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HadoopJob.Merge(m, src)
 }
 func (m *HadoopJob) XXX_Size() int {
 	return xxx_messageInfo_HadoopJob.Size(m)
@@ -465,72 +477,14 @@ func (m *HadoopJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HadoopJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HadoopJob_OneofMarshaler, _HadoopJob_OneofUnmarshaler, _HadoopJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HadoopJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HadoopJob_MainJarFileUri)(nil),
 		(*HadoopJob_MainClass)(nil),
 	}
 }
 
-func _HadoopJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HadoopJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *HadoopJob_MainJarFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainJarFileUri)
-	case *HadoopJob_MainClass:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainClass)
-	case nil:
-	default:
-		return fmt.Errorf("HadoopJob.Driver has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HadoopJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HadoopJob)
-	switch tag {
-	case 1: // driver.main_jar_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &HadoopJob_MainJarFileUri{x}
-		return true, err
-	case 2: // driver.main_class
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &HadoopJob_MainClass{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HadoopJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HadoopJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *HadoopJob_MainJarFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
-		n += len(x.MainJarFileUri)
-	case *HadoopJob_MainClass:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainClass)))
-		n += len(x.MainClass)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running [Apache Spark](http://spark.apache.org/)
 // applications on YARN.
 type SparkJob struct {
@@ -574,16 +528,17 @@ func (m *SparkJob) Reset()         { *m = SparkJob{} }
 func (m *SparkJob) String() string { return proto.CompactTextString(m) }
 func (*SparkJob) ProtoMessage()    {}
 func (*SparkJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{2}
+	return fileDescriptor_20fb118582e1d7de, []int{2}
 }
+
 func (m *SparkJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SparkJob.Unmarshal(m, b)
 }
 func (m *SparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SparkJob.Marshal(b, m, deterministic)
 }
-func (dst *SparkJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SparkJob.Merge(dst, src)
+func (m *SparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkJob.Merge(m, src)
 }
 func (m *SparkJob) XXX_Size() int {
 	return xxx_messageInfo_SparkJob.Size(m)
@@ -673,72 +628,14 @@ func (m *SparkJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SparkJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SparkJob_OneofMarshaler, _SparkJob_OneofUnmarshaler, _SparkJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SparkJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SparkJob_MainJarFileUri)(nil),
 		(*SparkJob_MainClass)(nil),
 	}
 }
 
-func _SparkJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SparkJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *SparkJob_MainJarFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainJarFileUri)
-	case *SparkJob_MainClass:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.MainClass)
-	case nil:
-	default:
-		return fmt.Errorf("SparkJob.Driver has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SparkJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SparkJob)
-	switch tag {
-	case 1: // driver.main_jar_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &SparkJob_MainJarFileUri{x}
-		return true, err
-	case 2: // driver.main_class
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Driver = &SparkJob_MainClass{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SparkJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SparkJob)
-	// driver
-	switch x := m.Driver.(type) {
-	case *SparkJob_MainJarFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
-		n += len(x.MainJarFileUri)
-	case *SparkJob_MainClass:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.MainClass)))
-		n += len(x.MainClass)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running
 // [Apache
 // PySpark](https://spark.apache.org/docs/0.9.0/python-programming-guide.html)
@@ -779,16 +676,17 @@ func (m *PySparkJob) Reset()         { *m = PySparkJob{} }
 func (m *PySparkJob) String() string { return proto.CompactTextString(m) }
 func (*PySparkJob) ProtoMessage()    {}
 func (*PySparkJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{3}
+	return fileDescriptor_20fb118582e1d7de, []int{3}
 }
+
 func (m *PySparkJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PySparkJob.Unmarshal(m, b)
 }
 func (m *PySparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PySparkJob.Marshal(b, m, deterministic)
 }
-func (dst *PySparkJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PySparkJob.Merge(dst, src)
+func (m *PySparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PySparkJob.Merge(m, src)
 }
 func (m *PySparkJob) XXX_Size() int {
 	return xxx_messageInfo_PySparkJob.Size(m)
@@ -881,16 +779,17 @@ func (m *QueryList) Reset()         { *m = QueryList{} }
 func (m *QueryList) String() string { return proto.CompactTextString(m) }
 func (*QueryList) ProtoMessage()    {}
 func (*QueryList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{4}
+	return fileDescriptor_20fb118582e1d7de, []int{4}
 }
+
 func (m *QueryList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryList.Unmarshal(m, b)
 }
 func (m *QueryList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryList.Marshal(b, m, deterministic)
 }
-func (dst *QueryList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryList.Merge(dst, src)
+func (m *QueryList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryList.Merge(m, src)
 }
 func (m *QueryList) XXX_Size() int {
 	return xxx_messageInfo_QueryList.Size(m)
@@ -943,16 +842,17 @@ func (m *HiveJob) Reset()         { *m = HiveJob{} }
 func (m *HiveJob) String() string { return proto.CompactTextString(m) }
 func (*HiveJob) ProtoMessage()    {}
 func (*HiveJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{5}
+	return fileDescriptor_20fb118582e1d7de, []int{5}
 }
+
 func (m *HiveJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HiveJob.Unmarshal(m, b)
 }
 func (m *HiveJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HiveJob.Marshal(b, m, deterministic)
 }
-func (dst *HiveJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HiveJob.Merge(dst, src)
+func (m *HiveJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HiveJob.Merge(m, src)
 }
 func (m *HiveJob) XXX_Size() int {
 	return xxx_messageInfo_HiveJob.Size(m)
@@ -1028,76 +928,14 @@ func (m *HiveJob) GetJarFileUris() []string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HiveJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HiveJob_OneofMarshaler, _HiveJob_OneofUnmarshaler, _HiveJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HiveJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HiveJob_QueryFileUri)(nil),
 		(*HiveJob_QueryList)(nil),
 	}
 }
 
-func _HiveJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HiveJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *HiveJob_QueryFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.QueryFileUri)
-	case *HiveJob_QueryList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QueryList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("HiveJob.Queries has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HiveJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HiveJob)
-	switch tag {
-	case 1: // queries.query_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Queries = &HiveJob_QueryFileUri{x}
-		return true, err
-	case 2: // queries.query_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(QueryList)
-		err := b.DecodeMessage(msg)
-		m.Queries = &HiveJob_QueryList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HiveJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HiveJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *HiveJob_QueryFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
-		n += len(x.QueryFileUri)
-	case *HiveJob_QueryList:
-		s := proto.Size(x.QueryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running [Apache Spark
 // SQL](http://spark.apache.org/sql/) queries.
 type SparkSqlJob struct {
@@ -1128,16 +966,17 @@ func (m *SparkSqlJob) Reset()         { *m = SparkSqlJob{} }
 func (m *SparkSqlJob) String() string { return proto.CompactTextString(m) }
 func (*SparkSqlJob) ProtoMessage()    {}
 func (*SparkSqlJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{6}
+	return fileDescriptor_20fb118582e1d7de, []int{6}
 }
+
 func (m *SparkSqlJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SparkSqlJob.Unmarshal(m, b)
 }
 func (m *SparkSqlJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SparkSqlJob.Marshal(b, m, deterministic)
 }
-func (dst *SparkSqlJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SparkSqlJob.Merge(dst, src)
+func (m *SparkSqlJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkSqlJob.Merge(m, src)
 }
 func (m *SparkSqlJob) XXX_Size() int {
 	return xxx_messageInfo_SparkSqlJob.Size(m)
@@ -1213,76 +1052,14 @@ func (m *SparkSqlJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SparkSqlJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SparkSqlJob_OneofMarshaler, _SparkSqlJob_OneofUnmarshaler, _SparkSqlJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SparkSqlJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SparkSqlJob_QueryFileUri)(nil),
 		(*SparkSqlJob_QueryList)(nil),
 	}
 }
 
-func _SparkSqlJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SparkSqlJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *SparkSqlJob_QueryFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.QueryFileUri)
-	case *SparkSqlJob_QueryList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QueryList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SparkSqlJob.Queries has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SparkSqlJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SparkSqlJob)
-	switch tag {
-	case 1: // queries.query_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Queries = &SparkSqlJob_QueryFileUri{x}
-		return true, err
-	case 2: // queries.query_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(QueryList)
-		err := b.DecodeMessage(msg)
-		m.Queries = &SparkSqlJob_QueryList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SparkSqlJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SparkSqlJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *SparkSqlJob_QueryFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
-		n += len(x.QueryFileUri)
-	case *SparkSqlJob_QueryList:
-		s := proto.Size(x.QueryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cloud Dataproc job for running [Apache Pig](https://pig.apache.org/)
 // queries on YARN.
 type PigJob struct {
@@ -1319,16 +1096,17 @@ func (m *PigJob) Reset()         { *m = PigJob{} }
 func (m *PigJob) String() string { return proto.CompactTextString(m) }
 func (*PigJob) ProtoMessage()    {}
 func (*PigJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{7}
+	return fileDescriptor_20fb118582e1d7de, []int{7}
 }
+
 func (m *PigJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PigJob.Unmarshal(m, b)
 }
 func (m *PigJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PigJob.Marshal(b, m, deterministic)
 }
-func (dst *PigJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PigJob.Merge(dst, src)
+func (m *PigJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PigJob.Merge(m, src)
 }
 func (m *PigJob) XXX_Size() int {
 	return xxx_messageInfo_PigJob.Size(m)
@@ -1411,76 +1189,14 @@ func (m *PigJob) GetLoggingConfig() *LoggingConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PigJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PigJob_OneofMarshaler, _PigJob_OneofUnmarshaler, _PigJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PigJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PigJob_QueryFileUri)(nil),
 		(*PigJob_QueryList)(nil),
 	}
 }
 
-func _PigJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PigJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *PigJob_QueryFileUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.QueryFileUri)
-	case *PigJob_QueryList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QueryList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PigJob.Queries has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PigJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PigJob)
-	switch tag {
-	case 1: // queries.query_file_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Queries = &PigJob_QueryFileUri{x}
-		return true, err
-	case 2: // queries.query_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(QueryList)
-		err := b.DecodeMessage(msg)
-		m.Queries = &PigJob_QueryList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PigJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PigJob)
-	// queries
-	switch x := m.Queries.(type) {
-	case *PigJob_QueryFileUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
-		n += len(x.QueryFileUri)
-	case *PigJob_QueryList:
-		s := proto.Size(x.QueryList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Cloud Dataproc job config.
 type JobPlacement struct {
 	// Required. The name of the cluster where the job will be submitted.
@@ -1497,16 +1213,17 @@ func (m *JobPlacement) Reset()         { *m = JobPlacement{} }
 func (m *JobPlacement) String() string { return proto.CompactTextString(m) }
 func (*JobPlacement) ProtoMessage()    {}
 func (*JobPlacement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{8}
+	return fileDescriptor_20fb118582e1d7de, []int{8}
 }
+
 func (m *JobPlacement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobPlacement.Unmarshal(m, b)
 }
 func (m *JobPlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobPlacement.Marshal(b, m, deterministic)
 }
-func (dst *JobPlacement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobPlacement.Merge(dst, src)
+func (m *JobPlacement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobPlacement.Merge(m, src)
 }
 func (m *JobPlacement) XXX_Size() int {
 	return xxx_messageInfo_JobPlacement.Size(m)
@@ -1552,16 +1269,17 @@ func (m *JobStatus) Reset()         { *m = JobStatus{} }
 func (m *JobStatus) String() string { return proto.CompactTextString(m) }
 func (*JobStatus) ProtoMessage()    {}
 func (*JobStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{9}
+	return fileDescriptor_20fb118582e1d7de, []int{9}
 }
+
 func (m *JobStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobStatus.Unmarshal(m, b)
 }
 func (m *JobStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobStatus.Marshal(b, m, deterministic)
 }
-func (dst *JobStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobStatus.Merge(dst, src)
+func (m *JobStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatus.Merge(m, src)
 }
 func (m *JobStatus) XXX_Size() int {
 	return xxx_messageInfo_JobStatus.Size(m)
@@ -1620,16 +1338,17 @@ func (m *JobReference) Reset()         { *m = JobReference{} }
 func (m *JobReference) String() string { return proto.CompactTextString(m) }
 func (*JobReference) ProtoMessage()    {}
 func (*JobReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{10}
+	return fileDescriptor_20fb118582e1d7de, []int{10}
 }
+
 func (m *JobReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobReference.Unmarshal(m, b)
 }
 func (m *JobReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobReference.Marshal(b, m, deterministic)
 }
-func (dst *JobReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobReference.Merge(dst, src)
+func (m *JobReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobReference.Merge(m, src)
 }
 func (m *JobReference) XXX_Size() int {
 	return xxx_messageInfo_JobReference.Size(m)
@@ -1680,16 +1399,17 @@ func (m *YarnApplication) Reset()         { *m = YarnApplication{} }
 func (m *YarnApplication) String() string { return proto.CompactTextString(m) }
 func (*YarnApplication) ProtoMessage()    {}
 func (*YarnApplication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{11}
+	return fileDescriptor_20fb118582e1d7de, []int{11}
 }
+
 func (m *YarnApplication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_YarnApplication.Unmarshal(m, b)
 }
 func (m *YarnApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_YarnApplication.Marshal(b, m, deterministic)
 }
-func (dst *YarnApplication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_YarnApplication.Merge(dst, src)
+func (m *YarnApplication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YarnApplication.Merge(m, src)
 }
 func (m *YarnApplication) XXX_Size() int {
 	return xxx_messageInfo_YarnApplication.Size(m)
@@ -1792,16 +1512,17 @@ func (m *Job) Reset()         { *m = Job{} }
 func (m *Job) String() string { return proto.CompactTextString(m) }
 func (*Job) ProtoMessage()    {}
 func (*Job) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{12}
+	return fileDescriptor_20fb118582e1d7de, []int{12}
 }
+
 func (m *Job) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job.Unmarshal(m, b)
 }
 func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
 }
-func (dst *Job) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job.Merge(dst, src)
+func (m *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(m, src)
 }
 func (m *Job) XXX_Size() int {
 	return xxx_messageInfo_Job.Size(m)
@@ -1978,9 +1699,9 @@ func (m *Job) GetJobUuid() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Job_OneofMarshaler, _Job_OneofUnmarshaler, _Job_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Job) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Job_HadoopJob)(nil),
 		(*Job_SparkJob)(nil),
 		(*Job_PysparkJob)(nil),
@@ -1990,144 +1711,6 @@ func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, fu
 	}
 }
 
-func _Job_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Job)
-	// type_job
-	switch x := m.TypeJob.(type) {
-	case *Job_HadoopJob:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HadoopJob); err != nil {
-			return err
-		}
-	case *Job_SparkJob:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkJob); err != nil {
-			return err
-		}
-	case *Job_PysparkJob:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PysparkJob); err != nil {
-			return err
-		}
-	case *Job_HiveJob:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HiveJob); err != nil {
-			return err
-		}
-	case *Job_PigJob:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PigJob); err != nil {
-			return err
-		}
-	case *Job_SparkSqlJob:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkSqlJob); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.TypeJob has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Job_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Job)
-	switch tag {
-	case 3: // type_job.hadoop_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HadoopJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_HadoopJob{msg}
-		return true, err
-	case 4: // type_job.spark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_SparkJob{msg}
-		return true, err
-	case 5: // type_job.pyspark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PySparkJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_PysparkJob{msg}
-		return true, err
-	case 6: // type_job.hive_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HiveJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_HiveJob{msg}
-		return true, err
-	case 7: // type_job.pig_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PigJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_PigJob{msg}
-		return true, err
-	case 12: // type_job.spark_sql_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkSqlJob)
-		err := b.DecodeMessage(msg)
-		m.TypeJob = &Job_SparkSqlJob{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Job_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Job)
-	// type_job
-	switch x := m.TypeJob.(type) {
-	case *Job_HadoopJob:
-		s := proto.Size(x.HadoopJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_SparkJob:
-		s := proto.Size(x.SparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PysparkJob:
-		s := proto.Size(x.PysparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_HiveJob:
-		s := proto.Size(x.HiveJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PigJob:
-		s := proto.Size(x.PigJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_SparkSqlJob:
-		s := proto.Size(x.SparkSqlJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Job scheduling options.
 type JobScheduling struct {
 	// Optional. Maximum number of times per hour a driver may be restarted as
@@ -2148,16 +1731,17 @@ func (m *JobScheduling) Reset()         { *m = JobScheduling{} }
 func (m *JobScheduling) String() string { return proto.CompactTextString(m) }
 func (*JobScheduling) ProtoMessage()    {}
 func (*JobScheduling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{13}
+	return fileDescriptor_20fb118582e1d7de, []int{13}
 }
+
 func (m *JobScheduling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobScheduling.Unmarshal(m, b)
 }
 func (m *JobScheduling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobScheduling.Marshal(b, m, deterministic)
 }
-func (dst *JobScheduling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobScheduling.Merge(dst, src)
+func (m *JobScheduling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobScheduling.Merge(m, src)
 }
 func (m *JobScheduling) XXX_Size() int {
 	return xxx_messageInfo_JobScheduling.Size(m)
@@ -2206,16 +1790,17 @@ func (m *SubmitJobRequest) Reset()         { *m = SubmitJobRequest{} }
 func (m *SubmitJobRequest) String() string { return proto.CompactTextString(m) }
 func (*SubmitJobRequest) ProtoMessage()    {}
 func (*SubmitJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{14}
+	return fileDescriptor_20fb118582e1d7de, []int{14}
 }
+
 func (m *SubmitJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SubmitJobRequest.Unmarshal(m, b)
 }
 func (m *SubmitJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SubmitJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *SubmitJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SubmitJobRequest.Merge(dst, src)
+func (m *SubmitJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitJobRequest.Merge(m, src)
 }
 func (m *SubmitJobRequest) XXX_Size() int {
 	return xxx_messageInfo_SubmitJobRequest.Size(m)
@@ -2272,16 +1857,17 @@ func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
 func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetJobRequest) ProtoMessage()    {}
 func (*GetJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{15}
+	return fileDescriptor_20fb118582e1d7de, []int{15}
 }
+
 func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
 }
 func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+func (m *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(m, src)
 }
 func (m *GetJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetJobRequest.Size(m)
@@ -2357,16 +1943,17 @@ func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
 func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListJobsRequest) ProtoMessage()    {}
 func (*ListJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{16}
+	return fileDescriptor_20fb118582e1d7de, []int{16}
 }
+
 func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
 }
 func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+func (m *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(m, src)
 }
 func (m *ListJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListJobsRequest.Size(m)
@@ -2453,16 +2040,17 @@ func (m *UpdateJobRequest) Reset()         { *m = UpdateJobRequest{} }
 func (m *UpdateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateJobRequest) ProtoMessage()    {}
 func (*UpdateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{17}
+	return fileDescriptor_20fb118582e1d7de, []int{17}
 }
+
 func (m *UpdateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateJobRequest.Unmarshal(m, b)
 }
 func (m *UpdateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateJobRequest.Merge(dst, src)
+func (m *UpdateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobRequest.Merge(m, src)
 }
 func (m *UpdateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateJobRequest.Size(m)
@@ -2525,16 +2113,17 @@ func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
 func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListJobsResponse) ProtoMessage()    {}
 func (*ListJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{18}
+	return fileDescriptor_20fb118582e1d7de, []int{18}
 }
+
 func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
 }
 func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+func (m *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(m, src)
 }
 func (m *ListJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListJobsResponse.Size(m)
@@ -2577,16 +2166,17 @@ func (m *CancelJobRequest) Reset()         { *m = CancelJobRequest{} }
 func (m *CancelJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelJobRequest) ProtoMessage()    {}
 func (*CancelJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{19}
+	return fileDescriptor_20fb118582e1d7de, []int{19}
 }
+
 func (m *CancelJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelJobRequest.Unmarshal(m, b)
 }
 func (m *CancelJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelJobRequest.Merge(dst, src)
+func (m *CancelJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelJobRequest.Merge(m, src)
 }
 func (m *CancelJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelJobRequest.Size(m)
@@ -2636,16 +2226,17 @@ func (m *DeleteJobRequest) Reset()         { *m = DeleteJobRequest{} }
 func (m *DeleteJobRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteJobRequest) ProtoMessage()    {}
 func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_jobs_283891adf4097baf, []int{20}
+	return fileDescriptor_20fb118582e1d7de, []int{20}
 }
+
 func (m *DeleteJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteJobRequest.Unmarshal(m, b)
 }
 func (m *DeleteJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteJobRequest.Merge(dst, src)
+func (m *DeleteJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobRequest.Merge(m, src)
 }
 func (m *DeleteJobRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteJobRequest.Size(m)
@@ -2678,6 +2269,11 @@ func (m *DeleteJobRequest) GetJobId() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.LoggingConfig_Level", LoggingConfig_Level_name, LoggingConfig_Level_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.JobStatus_State", JobStatus_State_name, JobStatus_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.JobStatus_Substate", JobStatus_Substate_name, JobStatus_Substate_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.YarnApplication_State", YarnApplication_State_name, YarnApplication_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ListJobsRequest_JobStateMatcher", ListJobsRequest_JobStateMatcher_name, ListJobsRequest_JobStateMatcher_value)
 	proto.RegisterType((*LoggingConfig)(nil), "google.cloud.dataproc.v1beta2.LoggingConfig")
 	proto.RegisterMapType((map[string]LoggingConfig_Level)(nil), "google.cloud.dataproc.v1beta2.LoggingConfig.DriverLogLevelsEntry")
 	proto.RegisterType((*HadoopJob)(nil), "google.cloud.dataproc.v1beta2.HadoopJob")
@@ -2710,11 +2306,161 @@ func init() {
 	proto.RegisterType((*ListJobsResponse)(nil), "google.cloud.dataproc.v1beta2.ListJobsResponse")
 	proto.RegisterType((*CancelJobRequest)(nil), "google.cloud.dataproc.v1beta2.CancelJobRequest")
 	proto.RegisterType((*DeleteJobRequest)(nil), "google.cloud.dataproc.v1beta2.DeleteJobRequest")
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.LoggingConfig_Level", LoggingConfig_Level_name, LoggingConfig_Level_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.JobStatus_State", JobStatus_State_name, JobStatus_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.JobStatus_Substate", JobStatus_Substate_name, JobStatus_Substate_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.YarnApplication_State", YarnApplication_State_name, YarnApplication_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ListJobsRequest_JobStateMatcher", ListJobsRequest_JobStateMatcher_name, ListJobsRequest_JobStateMatcher_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/jobs.proto", fileDescriptor_20fb118582e1d7de)
+}
+
+var fileDescriptor_20fb118582e1d7de = []byte{
+	// 2341 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcf, 0x73, 0xdb, 0xc6,
+	0xf5, 0x17, 0x7f, 0x13, 0x8f, 0xfa, 0x01, 0x6d, 0xec, 0x7c, 0xf9, 0xa5, 0x9b, 0x89, 0x82, 0x99,
+	0xb8, 0xaa, 0xd3, 0x21, 0xc7, 0xac, 0xeb, 0x38, 0x76, 0xd3, 0x98, 0x22, 0x41, 0x93, 0x2a, 0x4d,
+	0x31, 0x20, 0x69, 0x37, 0xe9, 0x74, 0x10, 0x90, 0x5c, 0x51, 0xa0, 0x40, 0x02, 0xde, 0x05, 0x54,
+	0x33, 0x1e, 0x5f, 0x7a, 0xe9, 0xa1, 0xc7, 0x1e, 0x3b, 0x93, 0x99, 0xde, 0x9a, 0x99, 0x5e, 0x7a,
+	0xed, 0x3f, 0xd0, 0xe9, 0xa5, 0x3d, 0x64, 0xa6, 0xff, 0x40, 0x7b, 0xe8, 0xb1, 0xa7, 0x9e, 0x3b,
+	0xbb, 0x0b, 0x50, 0x24, 0x25, 0x9b, 0x90, 0xd5, 0x5f, 0xce, 0x49, 0xc0, 0xdb, 0xf7, 0xde, 0xbe,
+	0xdd, 0xcf, 0x67, 0xdf, 0x7b, 0x0b, 0x0a, 0x76, 0x87, 0xb6, 0x3d, 0xb4, 0x70, 0xa1, 0x6f, 0xd9,
+	0xde, 0xa0, 0x30, 0x30, 0x5c, 0xc3, 0x21, 0x76, 0xbf, 0x70, 0x72, 0xb3, 0x87, 0x5d, 0xa3, 0x58,
+	0x18, 0xd9, 0x3d, 0x9a, 0x77, 0x88, 0xed, 0xda, 0xe8, 0x2d, 0xa1, 0x99, 0xe7, 0x9a, 0xf9, 0x40,
+	0x33, 0xef, 0x6b, 0xe6, 0xbe, 0xe1, 0x3b, 0x32, 0x1c, 0xb3, 0x60, 0x4c, 0x26, 0xb6, 0x6b, 0xb8,
+	0xa6, 0x3d, 0xf1, 0x8d, 0x73, 0xd7, 0xfc, 0x51, 0xfe, 0xd6, 0xf3, 0x0e, 0x0b, 0x78, 0xec, 0xb8,
+	0x53, 0x7f, 0x70, 0x67, 0x79, 0xf0, 0xd0, 0xc4, 0xd6, 0x40, 0x1f, 0x1b, 0xf4, 0xd8, 0xd7, 0x78,
+	0x7b, 0x59, 0xc3, 0x35, 0xc7, 0x98, 0xba, 0xc6, 0xd8, 0x11, 0x0a, 0xca, 0xdf, 0xa2, 0xb0, 0xd1,
+	0xb0, 0x87, 0x43, 0x73, 0x32, 0x2c, 0xdb, 0x93, 0x43, 0x73, 0x88, 0xc6, 0xb0, 0x3d, 0x20, 0xe6,
+	0x09, 0x26, 0xba, 0x65, 0x0f, 0x75, 0x0b, 0x9f, 0x60, 0x8b, 0x66, 0xa3, 0x3b, 0xb1, 0xdd, 0x4c,
+	0xb1, 0x94, 0x7f, 0xe9, 0x52, 0xf2, 0x0b, 0x8e, 0xf2, 0x15, 0xee, 0xa5, 0x61, 0x0f, 0x1b, 0xdc,
+	0x87, 0x3a, 0x71, 0xc9, 0x54, 0xdb, 0x1a, 0x2c, 0x4a, 0x73, 0x27, 0x70, 0xe5, 0x3c, 0x45, 0x24,
+	0x43, 0xec, 0x18, 0x4f, 0xb3, 0x91, 0x9d, 0xc8, 0xae, 0xa4, 0xb1, 0x47, 0x54, 0x83, 0xc4, 0x89,
+	0x61, 0x79, 0x38, 0x1b, 0xdd, 0x89, 0xec, 0x6e, 0x16, 0x8b, 0x17, 0x0a, 0x86, 0xbb, 0xd6, 0x84,
+	0x83, 0xbb, 0xd1, 0x3b, 0x11, 0xc5, 0x81, 0x04, 0x97, 0xa1, 0xab, 0xb0, 0xdd, 0x50, 0x1f, 0xa9,
+	0x0d, 0xbd, 0xdb, 0x6c, 0xb7, 0xd4, 0x72, 0xbd, 0x5a, 0x57, 0x2b, 0xf2, 0x1a, 0x4a, 0x41, 0xac,
+	0xd4, 0x68, 0xc8, 0x11, 0x24, 0x41, 0xa2, 0xa3, 0x95, 0xca, 0xaa, 0x1c, 0x65, 0x8f, 0x15, 0x75,
+	0xaf, 0xfb, 0x40, 0x8e, 0xa1, 0x34, 0xc4, 0xeb, 0xcd, 0xea, 0x81, 0x1c, 0x67, 0x4f, 0x8f, 0x4b,
+	0x5a, 0x53, 0x4e, 0xb0, 0x61, 0x55, 0xd3, 0x0e, 0x34, 0x39, 0xc9, 0x1e, 0xab, 0xa5, 0x4e, 0xa9,
+	0x21, 0xa7, 0x98, 0xa3, 0x83, 0x6a, 0x55, 0x4e, 0x2b, 0x7f, 0x88, 0x81, 0x54, 0x33, 0x06, 0xb6,
+	0xed, 0xec, 0xdb, 0x3d, 0xf4, 0x1e, 0x6c, 0x8f, 0x0d, 0x73, 0xa2, 0x8f, 0x0c, 0xa2, 0x1f, 0x9a,
+	0x16, 0xd6, 0x3d, 0x62, 0x8a, 0xd5, 0xd6, 0xd6, 0xb4, 0x4d, 0x36, 0xb4, 0x6f, 0x90, 0xaa, 0x69,
+	0xe1, 0x2e, 0x31, 0xd1, 0xdb, 0x00, 0x5c, 0xb9, 0x6f, 0x19, 0x94, 0xf2, 0xf5, 0x33, 0x2d, 0x89,
+	0xc9, 0xca, 0x4c, 0x84, 0x10, 0xc4, 0x0d, 0x32, 0xa4, 0xd9, 0xd8, 0x4e, 0x6c, 0x57, 0xd2, 0xf8,
+	0x33, 0x52, 0x60, 0x63, 0xde, 0x39, 0xcd, 0xc6, 0xf9, 0x60, 0x66, 0x34, 0xf3, 0x4b, 0xd1, 0x35,
+	0x90, 0x4e, 0xc7, 0x13, 0x7c, 0x3c, 0x7d, 0x18, 0x0c, 0xbe, 0x03, 0xeb, 0x06, 0xe9, 0x1f, 0x99,
+	0x27, 0xfe, 0x78, 0x52, 0xd8, 0xfb, 0x32, 0xae, 0xf2, 0x43, 0x00, 0x87, 0xd8, 0x0e, 0x26, 0xae,
+	0x89, 0x69, 0x36, 0xc5, 0x59, 0x72, 0x67, 0x05, 0x30, 0xb3, 0x3d, 0xc8, 0xb7, 0x66, 0xa6, 0x82,
+	0x1c, 0x73, 0xbe, 0x50, 0x1b, 0x36, 0x2d, 0x81, 0xa0, 0xde, 0xe7, 0x10, 0x66, 0xd3, 0x3b, 0x91,
+	0xdd, 0x4c, 0xf1, 0xdb, 0x17, 0x81, 0x5d, 0xdb, 0xb0, 0xe6, 0x5f, 0x73, 0x1f, 0xc2, 0xd6, 0xd2,
+	0x9c, 0xe7, 0xf0, 0xec, 0xca, 0x3c, 0xcf, 0xa4, 0x39, 0xce, 0xec, 0xa5, 0x21, 0x29, 0xe8, 0xab,
+	0xfc, 0x3e, 0x06, 0xe9, 0xb6, 0x63, 0x90, 0xe3, 0xaf, 0x0f, 0x94, 0x8f, 0xcf, 0x81, 0xf2, 0xfd,
+	0x15, 0x9b, 0x1d, 0x6c, 0xc1, 0x6b, 0x8c, 0xe4, 0x1f, 0x63, 0x00, 0xad, 0xe9, 0x0c, 0xcb, 0x02,
+	0x5c, 0xe1, 0xf0, 0x38, 0x53, 0xf7, 0xc8, 0x9e, 0x2c, 0xc1, 0xa9, 0x71, 0x9c, 0x5b, 0x7c, 0x28,
+	0xc0, 0x33, 0x80, 0x2b, 0x3a, 0x07, 0xd7, 0x2e, 0xc8, 0x4b, 0xf6, 0x01, 0x9c, 0x9b, 0xce, 0xbc,
+	0xf1, 0x7f, 0x06, 0xd8, 0x4f, 0xce, 0x01, 0xf6, 0x83, 0x15, 0x7b, 0x7f, 0xba, 0x23, 0xaf, 0x1b,
+	0xb4, 0xca, 0xbb, 0x20, 0x7d, 0xec, 0x61, 0x32, 0x6d, 0x98, 0xd4, 0x45, 0x59, 0x48, 0x3d, 0xf1,
+	0x30, 0x61, 0x0b, 0x8f, 0xf0, 0x9d, 0x09, 0x5e, 0x95, 0x2f, 0xe2, 0x90, 0xaa, 0x99, 0x27, 0x98,
+	0x81, 0x7e, 0x1d, 0x36, 0x99, 0x78, 0x7a, 0xf6, 0xf4, 0xae, 0x73, 0x79, 0x80, 0x75, 0x1d, 0x40,
+	0xe8, 0x59, 0x26, 0x75, 0xf9, 0xcc, 0x99, 0xe2, 0xee, 0x8a, 0xa5, 0xce, 0x62, 0x61, 0xa7, 0xfc,
+	0xc9, 0x2c, 0xb0, 0x3c, 0xbc, 0xd1, 0xb7, 0x27, 0xae, 0x39, 0xf1, 0xb0, 0xce, 0x78, 0x62, 0x98,
+	0x96, 0x47, 0x70, 0x36, 0xb6, 0x13, 0xd9, 0x4d, 0x6b, 0xdb, 0xc1, 0xd0, 0xc1, 0xa4, 0x2a, 0x06,
+	0xd0, 0x21, 0xc8, 0xb4, 0x4f, 0x4c, 0xc7, 0xd5, 0x4f, 0x0c, 0x62, 0x1a, 0x3d, 0x0b, 0x0b, 0xae,
+	0x64, 0x8a, 0xf7, 0x56, 0xa5, 0x5b, 0xb1, 0xc8, 0x7c, 0x9b, 0x9b, 0x3f, 0x0a, 0xac, 0xfd, 0x72,
+	0x4c, 0x17, 0xa5, 0xe8, 0xd1, 0x02, 0x59, 0x12, 0x7c, 0x86, 0xdb, 0x21, 0x67, 0x78, 0x19, 0x53,
+	0xce, 0x10, 0x3d, 0x79, 0x86, 0xe8, 0xb9, 0x3d, 0xb8, 0x72, 0x5e, 0x90, 0x17, 0x41, 0xff, 0xb2,
+	0x79, 0x41, 0x9a, 0xf1, 0x45, 0xf9, 0x53, 0x1c, 0x32, 0xfc, 0x10, 0xb4, 0x9f, 0x58, 0xff, 0x25,
+	0x92, 0x8c, 0xce, 0x01, 0x3d, 0xc6, 0x21, 0xf9, 0x28, 0x4c, 0x62, 0x16, 0x81, 0x87, 0x04, 0xfe,
+	0xd3, 0x05, 0xe0, 0x05, 0xb5, 0xee, 0x5e, 0x60, 0x96, 0x0b, 0x81, 0x7f, 0xe7, 0x6c, 0x96, 0x3b,
+	0x9b, 0x4a, 0x92, 0x97, 0x4f, 0x25, 0xff, 0x5b, 0x8c, 0xfa, 0x7b, 0x1c, 0x92, 0x2d, 0x73, 0xf8,
+	0x9a, 0x64, 0x1c, 0xfc, 0xc2, 0x8c, 0xb3, 0x8a, 0x16, 0x62, 0x8d, 0x21, 0x79, 0xd7, 0x3d, 0x27,
+	0xe1, 0x7c, 0x37, 0xdc, 0x04, 0x97, 0xcc, 0x37, 0xe7, 0x50, 0x2e, 0xf5, 0x75, 0xa3, 0x5c, 0x07,
+	0xd6, 0xf7, 0xed, 0x5e, 0xcb, 0x32, 0xfa, 0x78, 0x8c, 0x27, 0x2e, 0x6b, 0x17, 0xfa, 0x96, 0x47,
+	0x5d, 0x4c, 0xf4, 0x89, 0x31, 0xc6, 0xbe, 0xbf, 0x8c, 0x2f, 0x6b, 0x1a, 0x63, 0x3c, 0xaf, 0xe2,
+	0x79, 0xe6, 0xc0, 0x77, 0x1f, 0xa8, 0x74, 0x3d, 0x73, 0xa0, 0xfc, 0x23, 0x06, 0xd2, 0xbe, 0xdd,
+	0x6b, 0xbb, 0x86, 0xeb, 0x51, 0x54, 0x81, 0x04, 0x75, 0x0d, 0x57, 0x38, 0xdb, 0x2c, 0xe6, 0x57,
+	0xec, 0xde, 0xcc, 0x30, 0xcf, 0xfe, 0x60, 0x4d, 0x18, 0xb3, 0x4a, 0x3d, 0xc0, 0xae, 0x61, 0x5a,
+	0x7e, 0x53, 0xac, 0x05, 0xaf, 0xa8, 0x02, 0x32, 0x57, 0xd1, 0xa9, 0x6b, 0x10, 0x57, 0x67, 0x37,
+	0x58, 0x3f, 0x37, 0xe4, 0x82, 0xa9, 0x82, 0xeb, 0x6d, 0xbe, 0x13, 0x5c, 0x6f, 0xb5, 0x4d, 0x6e,
+	0xd3, 0x66, 0x26, 0x4c, 0x88, 0x1e, 0x42, 0x9a, 0x7a, 0x3d, 0x11, 0x68, 0x8a, 0x07, 0x7a, 0x33,
+	0x7c, 0xa0, 0xbe, 0xa1, 0x36, 0x73, 0xa1, 0x7c, 0x19, 0x81, 0x04, 0x8f, 0x9f, 0xdd, 0x1f, 0xdb,
+	0x9d, 0x52, 0x47, 0x5d, 0xba, 0x3f, 0x66, 0x20, 0xd5, 0x52, 0x9b, 0x95, 0x7a, 0xf3, 0x81, 0x1c,
+	0x41, 0x9b, 0x00, 0x6d, 0xb5, 0xd3, 0x6d, 0xe9, 0x95, 0x83, 0xa6, 0x2a, 0xa7, 0xd9, 0xa0, 0xd6,
+	0x6d, 0x36, 0xd9, 0x60, 0x14, 0x21, 0xd8, 0x2c, 0x97, 0x9a, 0x65, 0xb5, 0xa1, 0x07, 0x06, 0xb1,
+	0x39, 0x59, 0xbb, 0x53, 0xd2, 0x3a, 0x6a, 0x45, 0x4e, 0xa1, 0x0d, 0x90, 0x84, 0xac, 0xa1, 0x56,
+	0xc4, 0xbd, 0x93, 0x7b, 0x5b, 0xb8, 0x77, 0xbe, 0x01, 0x5b, 0xa5, 0x4e, 0x47, 0x7d, 0xd8, 0xea,
+	0xe8, 0xd5, 0x52, 0xbd, 0xd1, 0xd5, 0x54, 0x59, 0x52, 0x6a, 0x90, 0x0e, 0x56, 0x80, 0xb6, 0x20,
+	0xb3, 0x18, 0xe7, 0x06, 0x48, 0xed, 0xee, 0xde, 0xc3, 0x7a, 0x87, 0x4d, 0x12, 0x41, 0x00, 0xc9,
+	0x8f, 0xbb, 0x6a, 0x57, 0xad, 0xc8, 0x51, 0x24, 0xc3, 0x7a, 0xbb, 0x53, 0x6a, 0xa8, 0x2c, 0x86,
+	0x4e, 0xb7, 0x2d, 0xc7, 0x94, 0x0a, 0xa7, 0x93, 0x86, 0x0f, 0x31, 0xc1, 0x93, 0x3e, 0x46, 0x6f,
+	0xf1, 0xc3, 0x3b, 0xc2, 0x7d, 0x57, 0x37, 0x07, 0x3e, 0x99, 0x24, 0x5f, 0x52, 0x1f, 0xa0, 0xab,
+	0x90, 0x1c, 0xd9, 0x3d, 0x7d, 0x46, 0xa2, 0xc4, 0xc8, 0xee, 0xd5, 0x07, 0xca, 0xef, 0xa2, 0xb0,
+	0xf5, 0x89, 0x41, 0x26, 0x25, 0xc7, 0xb1, 0xcc, 0x3e, 0xff, 0xdc, 0xc1, 0xda, 0xe8, 0x39, 0x42,
+	0xf2, 0x67, 0xb4, 0x1f, 0x10, 0x4b, 0x5c, 0xf8, 0x6f, 0xad, 0xc0, 0x6b, 0xc9, 0xe5, 0x22, 0xbd,
+	0x72, 0x90, 0x76, 0x88, 0x3d, 0x24, 0x98, 0x52, 0x9e, 0xf2, 0xa2, 0xda, 0xec, 0x9d, 0x31, 0xde,
+	0x25, 0x46, 0xff, 0x98, 0x25, 0x02, 0x8f, 0x58, 0xd9, 0xb8, 0x60, 0x7c, 0x20, 0xeb, 0x12, 0x4b,
+	0xf9, 0xd9, 0x2a, 0xb8, 0x53, 0x10, 0x6b, 0xaa, 0x8f, 0x05, 0xd4, 0x4d, 0xf5, 0xb1, 0xde, 0x2e,
+	0x3d, 0x12, 0xe8, 0x2e, 0xec, 0x6f, 0x0c, 0xad, 0x43, 0xba, 0x54, 0x2e, 0xab, 0xad, 0x0e, 0xc7,
+	0x70, 0x8e, 0x07, 0x09, 0x36, 0x54, 0xad, 0x37, 0xeb, 0xed, 0x9a, 0x5a, 0x91, 0x93, 0x0c, 0x08,
+	0x86, 0x20, 0x47, 0x1e, 0x20, 0xf9, 0x83, 0x3a, 0x87, 0x3d, 0xad, 0xfc, 0x59, 0x82, 0x18, 0xab,
+	0x20, 0x75, 0x90, 0x48, 0x80, 0x03, 0xdf, 0xb5, 0x4c, 0xf1, 0xbd, 0xd5, 0x84, 0x9e, 0x41, 0xa7,
+	0x9d, 0x5a, 0x33, 0x57, 0x4e, 0x90, 0x21, 0xfc, 0x1a, 0x13, 0xc2, 0xd5, 0x2c, 0xa9, 0x68, 0xa7,
+	0xd6, 0xac, 0x5e, 0x1d, 0xf1, 0xeb, 0xbd, 0x3e, 0xb2, 0x7b, 0x7c, 0xa3, 0x57, 0xd7, 0xab, 0xd9,
+	0xf7, 0x00, 0x56, 0xaf, 0x8e, 0x66, 0x1f, 0x48, 0xaa, 0x20, 0x51, 0xd6, 0x5f, 0x70, 0x4f, 0x71,
+	0xee, 0xe9, 0x9b, 0x21, 0xaf, 0xa3, 0xb5, 0x35, 0x2d, 0x4d, 0x83, 0x1b, 0x5d, 0x03, 0x32, 0xce,
+	0xf4, 0xd4, 0x53, 0x82, 0x7b, 0xfa, 0x56, 0xe8, 0xfb, 0x4f, 0x6d, 0x4d, 0x03, 0xdf, 0x9e, 0x79,
+	0x2b, 0x43, 0x9a, 0x5f, 0xb6, 0x98, 0x2b, 0x91, 0x84, 0xae, 0x87, 0xeb, 0x8e, 0x6b, 0x6b, 0x5a,
+	0xea, 0xc8, 0xbf, 0x6f, 0xdc, 0x87, 0x94, 0x63, 0x0e, 0xb9, 0x0f, 0x51, 0x71, 0xde, 0x0d, 0x55,
+	0xf0, 0x6a, 0x6b, 0x5a, 0xd2, 0x11, 0xfd, 0x43, 0x0b, 0x36, 0xc4, 0x92, 0xe8, 0x13, 0x8b, 0xfb,
+	0x59, 0xe7, 0x7e, 0x6e, 0x84, 0x6f, 0xd8, 0x6a, 0x6b, 0x5a, 0x86, 0xce, 0xb5, 0xb7, 0xf7, 0x21,
+	0x49, 0x79, 0xb6, 0xf3, 0xaf, 0x70, 0xbb, 0x61, 0xb3, 0xa3, 0xe6, 0xdb, 0xa1, 0x03, 0xd8, 0x14,
+	0x4f, 0xfa, 0x91, 0x49, 0x5d, 0x9b, 0x4c, 0xb3, 0x1b, 0xbc, 0x9a, 0x87, 0xf7, 0xb4, 0x21, 0xec,
+	0x6b, 0xc2, 0x1c, 0xfd, 0x08, 0xb6, 0xa7, 0x06, 0x99, 0xe8, 0xc6, 0xe9, 0xa1, 0xa6, 0x59, 0x89,
+	0xfb, 0xcc, 0x5f, 0x2c, 0x17, 0x68, 0xf2, 0x74, 0x51, 0xc0, 0x0f, 0x3d, 0xf5, 0x7a, 0x63, 0xd3,
+	0x75, 0xf1, 0x40, 0xef, 0x4d, 0xb3, 0x20, 0x0e, 0xfd, 0x4c, 0xb6, 0x37, 0x45, 0xf7, 0x20, 0xe7,
+	0x7f, 0x09, 0xb5, 0x3d, 0xd7, 0xf1, 0x5c, 0x9d, 0x60, 0x6a, 0x7b, 0xa4, 0x2f, 0x1a, 0xb6, 0x6d,
+	0x6e, 0xf0, 0x7f, 0x42, 0xe3, 0x80, 0x2b, 0x68, 0xfe, 0x38, 0xeb, 0xdc, 0xde, 0x87, 0xac, 0x6f,
+	0xcc, 0x5a, 0x2b, 0x62, 0x5b, 0xbc, 0x17, 0xa1, 0xdc, 0x74, 0x8b, 0x9b, 0x5e, 0x15, 0xe3, 0x65,
+	0x31, 0xcc, 0xba, 0x12, 0xca, 0x0c, 0xab, 0x90, 0xb4, 0x8c, 0x1e, 0xb6, 0x68, 0x16, 0x85, 0x5a,
+	0x2a, 0xeb, 0x84, 0x1a, 0xdc, 0x40, 0x74, 0x41, 0xbe, 0x35, 0x6a, 0x00, 0xd0, 0xfe, 0x11, 0x1e,
+	0x78, 0x96, 0x39, 0x19, 0x66, 0xaf, 0x84, 0xea, 0x6c, 0x18, 0x14, 0x33, 0x1b, 0x6d, 0xce, 0x1e,
+	0xfd, 0x3f, 0xa4, 0x59, 0x2a, 0xe7, 0x1d, 0xc1, 0x9b, 0xa2, 0x3e, 0x8f, 0xec, 0x1e, 0xeb, 0x06,
+	0x72, 0x1f, 0x40, 0x66, 0x6e, 0xfe, 0x0b, 0x75, 0x2a, 0x00, 0x69, 0x77, 0xea, 0xf0, 0xd3, 0xa4,
+	0xec, 0xc1, 0xc6, 0xc2, 0xf4, 0xe8, 0x26, 0x5c, 0x1d, 0x1b, 0x4f, 0x83, 0x46, 0x95, 0xea, 0x0e,
+	0x26, 0xfa, 0x91, 0xed, 0x11, 0xee, 0x3a, 0xa1, 0xa1, 0xb1, 0xf1, 0xd4, 0xef, 0x55, 0x69, 0x0b,
+	0x93, 0x9a, 0xed, 0x11, 0xe5, 0x8b, 0x08, 0xc8, 0x6d, 0x8e, 0x20, 0xcf, 0x75, 0x4f, 0x3c, 0x4c,
+	0xdd, 0x55, 0x45, 0xea, 0x4d, 0x48, 0x12, 0x3c, 0x34, 0xed, 0x09, 0x4f, 0x57, 0x92, 0xe6, 0xbf,
+	0xa1, 0x5b, 0x10, 0x63, 0x07, 0x4b, 0xe4, 0x43, 0x25, 0x44, 0x6a, 0x65, 0xea, 0x6c, 0x32, 0x22,
+	0xe6, 0x65, 0x93, 0x89, 0x4a, 0x22, 0xf9, 0x92, 0xfa, 0x40, 0xf9, 0x31, 0x6c, 0x3c, 0xc0, 0xff,
+	0x82, 0xe0, 0x5e, 0x50, 0x59, 0xff, 0x12, 0x85, 0x2d, 0xd6, 0xec, 0xef, 0xdb, 0x3d, 0x7a, 0xe1,
+	0x19, 0x92, 0x0b, 0x33, 0x5c, 0x03, 0xc9, 0x31, 0x86, 0x58, 0xa7, 0xe6, 0xe7, 0x02, 0xb8, 0x84,
+	0x96, 0x66, 0x82, 0xb6, 0xf9, 0xb9, 0xa8, 0xfb, 0x6c, 0xd0, 0xb5, 0x8f, 0x71, 0x10, 0x1a, 0x57,
+	0xef, 0x30, 0xc1, 0x99, 0x2e, 0x33, 0x7e, 0xb6, 0xcb, 0x1c, 0xc1, 0x36, 0x5b, 0x80, 0x68, 0xec,
+	0xc6, 0x86, 0xdb, 0x3f, 0xc2, 0x84, 0xe7, 0xe6, 0xcd, 0xe2, 0xf7, 0x57, 0xb5, 0xdf, 0x8b, 0x0b,
+	0x0c, 0xf2, 0x07, 0x7e, 0x28, 0xbc, 0x68, 0x5b, 0xa3, 0x45, 0x01, 0x5b, 0xe2, 0xa1, 0x69, 0xb9,
+	0x98, 0xf0, 0x6c, 0x2b, 0x69, 0xfe, 0x9b, 0x72, 0x1b, 0xb6, 0x96, 0x6c, 0x83, 0xaf, 0xfe, 0x6b,
+	0xac, 0xe4, 0x96, 0xca, 0x9d, 0xfa, 0x23, 0xd5, 0x2f, 0xe9, 0x07, 0x4d, 0xdd, 0x7f, 0x8f, 0x2a,
+	0x5f, 0x45, 0x40, 0xee, 0x3a, 0x03, 0xc3, 0xc5, 0xaf, 0x02, 0x64, 0xf4, 0x05, 0x40, 0xc6, 0xe6,
+	0x80, 0x0c, 0xc8, 0x17, 0xbf, 0x18, 0xf9, 0xee, 0x41, 0xc6, 0xe3, 0x71, 0xf1, 0x9f, 0x80, 0xfc,
+	0x52, 0x77, 0xb6, 0x49, 0xae, 0x9a, 0xd8, 0x1a, 0x3c, 0x34, 0xe8, 0xb1, 0x06, 0x42, 0x9d, 0x3d,
+	0x2b, 0x04, 0xe4, 0xd3, 0x9d, 0xa5, 0x8e, 0x3d, 0xa1, 0x18, 0xdd, 0x86, 0xf8, 0xc8, 0xee, 0x89,
+	0x6f, 0x67, 0xe1, 0xe2, 0xe0, 0xfa, 0xe8, 0x3a, 0x6c, 0x4d, 0xf0, 0x53, 0x57, 0x9f, 0x23, 0x89,
+	0x58, 0xf6, 0x06, 0x13, 0xb7, 0x02, 0xa2, 0x28, 0x9f, 0x81, 0x5c, 0x36, 0x26, 0x7d, 0x6c, 0xfd,
+	0xdb, 0x4e, 0xc4, 0x67, 0x20, 0x57, 0xb0, 0x85, 0x5f, 0x0d, 0xaa, 0x30, 0x33, 0x14, 0x7f, 0x9e,
+	0xe6, 0x89, 0xcb, 0x4f, 0xe3, 0x16, 0x26, 0xe8, 0xd7, 0x11, 0x90, 0x66, 0x59, 0x08, 0x15, 0x56,
+	0xd5, 0xe4, 0xa5, 0x7c, 0x95, 0x0b, 0xb1, 0xcd, 0x4a, 0xf5, 0xa7, 0x5f, 0xfd, 0xf5, 0x17, 0xd1,
+	0xfb, 0xca, 0xbd, 0xd9, 0x0f, 0x8e, 0x7e, 0xfc, 0xb4, 0xf0, 0xec, 0x74, 0x6d, 0xcf, 0x0b, 0x22,
+	0x74, 0x5a, 0x78, 0x26, 0x1e, 0x9e, 0xf3, 0xdf, 0x25, 0xef, 0x8a, 0x22, 0x77, 0x37, 0x72, 0x03,
+	0xfd, 0x2a, 0x02, 0x49, 0x91, 0x90, 0xd0, 0xaa, 0xda, 0xb0, 0x90, 0xb7, 0x42, 0x05, 0xa9, 0xf2,
+	0x20, 0x3f, 0x42, 0x1f, 0xbe, 0x4a, 0x90, 0x85, 0x67, 0x62, 0xb3, 0x9f, 0xa3, 0x2f, 0x23, 0x90,
+	0x0e, 0x98, 0x89, 0xf2, 0x17, 0x4b, 0x0e, 0xb9, 0x42, 0x68, 0x7d, 0x41, 0x79, 0xe5, 0x7b, 0x3c,
+	0xe8, 0xdb, 0xe8, 0xd6, 0xab, 0x04, 0x8d, 0x7e, 0x13, 0x01, 0x69, 0x96, 0x1a, 0x56, 0x42, 0xbf,
+	0x9c, 0x44, 0x42, 0xed, 0xea, 0x3e, 0x0f, 0xb0, 0x52, 0xbc, 0xdc, 0xae, 0xde, 0xe5, 0x09, 0xe3,
+	0xb7, 0x11, 0x90, 0x66, 0x07, 0x70, 0x65, 0xb8, 0xcb, 0x47, 0x35, 0x54, 0xb8, 0x07, 0x3c, 0xdc,
+	0xba, 0x52, 0xb9, 0x5c, 0xb8, 0x7d, 0x3e, 0x37, 0xa3, 0xec, 0x2f, 0x23, 0x20, 0xcd, 0x8e, 0xf4,
+	0xca, 0x98, 0x97, 0x0f, 0x7f, 0xee, 0xcd, 0x33, 0xe9, 0x50, 0x1d, 0x3b, 0xee, 0x34, 0x20, 0xeb,
+	0x8d, 0xcb, 0x6d, 0xeb, 0xde, 0x4f, 0xe0, 0x9d, 0xbe, 0x3d, 0x7e, 0x79, 0x50, 0x7b, 0x12, 0x63,
+	0x5c, 0x8b, 0xcd, 0xdf, 0x8a, 0x7c, 0xaa, 0xfa, 0xba, 0x43, 0xdb, 0x32, 0x26, 0xc3, 0xbc, 0x4d,
+	0x86, 0x85, 0x21, 0x9e, 0xf0, 0xe8, 0x0a, 0x62, 0xc8, 0x70, 0x4c, 0xfa, 0x82, 0xff, 0x33, 0xb8,
+	0x17, 0x08, 0x7a, 0x49, 0x6e, 0xf1, 0x9d, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xbb, 0x4e,
+	0xb3, 0x98, 0x20, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2975,158 +2721,3 @@ var _JobController_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dataproc/v1beta2/jobs.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1beta2/jobs.proto", fileDescriptor_jobs_283891adf4097baf)
-}
-
-var fileDescriptor_jobs_283891adf4097baf = []byte{
-	// 2341 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcf, 0x73, 0xdb, 0xc6,
-	0xf5, 0x17, 0x7f, 0x13, 0x8f, 0xfa, 0x01, 0x6d, 0xec, 0x7c, 0xf9, 0xa5, 0x9b, 0x89, 0x82, 0x99,
-	0xb8, 0xaa, 0xd3, 0x21, 0xc7, 0xac, 0xeb, 0x38, 0x76, 0xd3, 0x98, 0x22, 0x41, 0x93, 0x2a, 0x4d,
-	0x31, 0x20, 0x69, 0x37, 0xe9, 0x74, 0x10, 0x90, 0x5c, 0x51, 0xa0, 0x40, 0x02, 0xde, 0x05, 0x54,
-	0x33, 0x1e, 0x5f, 0x7a, 0xe9, 0xa1, 0xc7, 0x1e, 0x3b, 0x93, 0x99, 0xde, 0x9a, 0x99, 0x5e, 0x7a,
-	0xed, 0x3f, 0xd0, 0xe9, 0xa5, 0x3d, 0x64, 0xa6, 0xff, 0x40, 0x7b, 0xe8, 0xb1, 0xa7, 0x9e, 0x3b,
-	0xbb, 0x0b, 0x50, 0x24, 0x25, 0x9b, 0x90, 0xd5, 0x5f, 0xce, 0x49, 0xc0, 0xdb, 0xf7, 0xde, 0xbe,
-	0xdd, 0xcf, 0x67, 0xdf, 0x7b, 0x0b, 0x0a, 0x76, 0x87, 0xb6, 0x3d, 0xb4, 0x70, 0xa1, 0x6f, 0xd9,
-	0xde, 0xa0, 0x30, 0x30, 0x5c, 0xc3, 0x21, 0x76, 0xbf, 0x70, 0x72, 0xb3, 0x87, 0x5d, 0xa3, 0x58,
-	0x18, 0xd9, 0x3d, 0x9a, 0x77, 0x88, 0xed, 0xda, 0xe8, 0x2d, 0xa1, 0x99, 0xe7, 0x9a, 0xf9, 0x40,
-	0x33, 0xef, 0x6b, 0xe6, 0xbe, 0xe1, 0x3b, 0x32, 0x1c, 0xb3, 0x60, 0x4c, 0x26, 0xb6, 0x6b, 0xb8,
-	0xa6, 0x3d, 0xf1, 0x8d, 0x73, 0xd7, 0xfc, 0x51, 0xfe, 0xd6, 0xf3, 0x0e, 0x0b, 0x78, 0xec, 0xb8,
-	0x53, 0x7f, 0x70, 0x67, 0x79, 0xf0, 0xd0, 0xc4, 0xd6, 0x40, 0x1f, 0x1b, 0xf4, 0xd8, 0xd7, 0x78,
-	0x7b, 0x59, 0xc3, 0x35, 0xc7, 0x98, 0xba, 0xc6, 0xd8, 0x11, 0x0a, 0xca, 0xdf, 0xa2, 0xb0, 0xd1,
-	0xb0, 0x87, 0x43, 0x73, 0x32, 0x2c, 0xdb, 0x93, 0x43, 0x73, 0x88, 0xc6, 0xb0, 0x3d, 0x20, 0xe6,
-	0x09, 0x26, 0xba, 0x65, 0x0f, 0x75, 0x0b, 0x9f, 0x60, 0x8b, 0x66, 0xa3, 0x3b, 0xb1, 0xdd, 0x4c,
-	0xb1, 0x94, 0x7f, 0xe9, 0x52, 0xf2, 0x0b, 0x8e, 0xf2, 0x15, 0xee, 0xa5, 0x61, 0x0f, 0x1b, 0xdc,
-	0x87, 0x3a, 0x71, 0xc9, 0x54, 0xdb, 0x1a, 0x2c, 0x4a, 0x73, 0x27, 0x70, 0xe5, 0x3c, 0x45, 0x24,
-	0x43, 0xec, 0x18, 0x4f, 0xb3, 0x91, 0x9d, 0xc8, 0xae, 0xa4, 0xb1, 0x47, 0x54, 0x83, 0xc4, 0x89,
-	0x61, 0x79, 0x38, 0x1b, 0xdd, 0x89, 0xec, 0x6e, 0x16, 0x8b, 0x17, 0x0a, 0x86, 0xbb, 0xd6, 0x84,
-	0x83, 0xbb, 0xd1, 0x3b, 0x11, 0xc5, 0x81, 0x04, 0x97, 0xa1, 0xab, 0xb0, 0xdd, 0x50, 0x1f, 0xa9,
-	0x0d, 0xbd, 0xdb, 0x6c, 0xb7, 0xd4, 0x72, 0xbd, 0x5a, 0x57, 0x2b, 0xf2, 0x1a, 0x4a, 0x41, 0xac,
-	0xd4, 0x68, 0xc8, 0x11, 0x24, 0x41, 0xa2, 0xa3, 0x95, 0xca, 0xaa, 0x1c, 0x65, 0x8f, 0x15, 0x75,
-	0xaf, 0xfb, 0x40, 0x8e, 0xa1, 0x34, 0xc4, 0xeb, 0xcd, 0xea, 0x81, 0x1c, 0x67, 0x4f, 0x8f, 0x4b,
-	0x5a, 0x53, 0x4e, 0xb0, 0x61, 0x55, 0xd3, 0x0e, 0x34, 0x39, 0xc9, 0x1e, 0xab, 0xa5, 0x4e, 0xa9,
-	0x21, 0xa7, 0x98, 0xa3, 0x83, 0x6a, 0x55, 0x4e, 0x2b, 0x7f, 0x88, 0x81, 0x54, 0x33, 0x06, 0xb6,
-	0xed, 0xec, 0xdb, 0x3d, 0xf4, 0x1e, 0x6c, 0x8f, 0x0d, 0x73, 0xa2, 0x8f, 0x0c, 0xa2, 0x1f, 0x9a,
-	0x16, 0xd6, 0x3d, 0x62, 0x8a, 0xd5, 0xd6, 0xd6, 0xb4, 0x4d, 0x36, 0xb4, 0x6f, 0x90, 0xaa, 0x69,
-	0xe1, 0x2e, 0x31, 0xd1, 0xdb, 0x00, 0x5c, 0xb9, 0x6f, 0x19, 0x94, 0xf2, 0xf5, 0x33, 0x2d, 0x89,
-	0xc9, 0xca, 0x4c, 0x84, 0x10, 0xc4, 0x0d, 0x32, 0xa4, 0xd9, 0xd8, 0x4e, 0x6c, 0x57, 0xd2, 0xf8,
-	0x33, 0x52, 0x60, 0x63, 0xde, 0x39, 0xcd, 0xc6, 0xf9, 0x60, 0x66, 0x34, 0xf3, 0x4b, 0xd1, 0x35,
-	0x90, 0x4e, 0xc7, 0x13, 0x7c, 0x3c, 0x7d, 0x18, 0x0c, 0xbe, 0x03, 0xeb, 0x06, 0xe9, 0x1f, 0x99,
-	0x27, 0xfe, 0x78, 0x52, 0xd8, 0xfb, 0x32, 0xae, 0xf2, 0x43, 0x00, 0x87, 0xd8, 0x0e, 0x26, 0xae,
-	0x89, 0x69, 0x36, 0xc5, 0x59, 0x72, 0x67, 0x05, 0x30, 0xb3, 0x3d, 0xc8, 0xb7, 0x66, 0xa6, 0x82,
-	0x1c, 0x73, 0xbe, 0x50, 0x1b, 0x36, 0x2d, 0x81, 0xa0, 0xde, 0xe7, 0x10, 0x66, 0xd3, 0x3b, 0x91,
-	0xdd, 0x4c, 0xf1, 0xdb, 0x17, 0x81, 0x5d, 0xdb, 0xb0, 0xe6, 0x5f, 0x73, 0x1f, 0xc2, 0xd6, 0xd2,
-	0x9c, 0xe7, 0xf0, 0xec, 0xca, 0x3c, 0xcf, 0xa4, 0x39, 0xce, 0xec, 0xa5, 0x21, 0x29, 0xe8, 0xab,
-	0xfc, 0x3e, 0x06, 0xe9, 0xb6, 0x63, 0x90, 0xe3, 0xaf, 0x0f, 0x94, 0x8f, 0xcf, 0x81, 0xf2, 0xfd,
-	0x15, 0x9b, 0x1d, 0x6c, 0xc1, 0x6b, 0x8c, 0xe4, 0x1f, 0x63, 0x00, 0xad, 0xe9, 0x0c, 0xcb, 0x02,
-	0x5c, 0xe1, 0xf0, 0x38, 0x53, 0xf7, 0xc8, 0x9e, 0x2c, 0xc1, 0xa9, 0x71, 0x9c, 0x5b, 0x7c, 0x28,
-	0xc0, 0x33, 0x80, 0x2b, 0x3a, 0x07, 0xd7, 0x2e, 0xc8, 0x4b, 0xf6, 0x01, 0x9c, 0x9b, 0xce, 0xbc,
-	0xf1, 0x7f, 0x06, 0xd8, 0x4f, 0xce, 0x01, 0xf6, 0x83, 0x15, 0x7b, 0x7f, 0xba, 0x23, 0xaf, 0x1b,
-	0xb4, 0xca, 0xbb, 0x20, 0x7d, 0xec, 0x61, 0x32, 0x6d, 0x98, 0xd4, 0x45, 0x59, 0x48, 0x3d, 0xf1,
-	0x30, 0x61, 0x0b, 0x8f, 0xf0, 0x9d, 0x09, 0x5e, 0x95, 0x2f, 0xe2, 0x90, 0xaa, 0x99, 0x27, 0x98,
-	0x81, 0x7e, 0x1d, 0x36, 0x99, 0x78, 0x7a, 0xf6, 0xf4, 0xae, 0x73, 0x79, 0x80, 0x75, 0x1d, 0x40,
-	0xe8, 0x59, 0x26, 0x75, 0xf9, 0xcc, 0x99, 0xe2, 0xee, 0x8a, 0xa5, 0xce, 0x62, 0x61, 0xa7, 0xfc,
-	0xc9, 0x2c, 0xb0, 0x3c, 0xbc, 0xd1, 0xb7, 0x27, 0xae, 0x39, 0xf1, 0xb0, 0xce, 0x78, 0x62, 0x98,
-	0x96, 0x47, 0x70, 0x36, 0xb6, 0x13, 0xd9, 0x4d, 0x6b, 0xdb, 0xc1, 0xd0, 0xc1, 0xa4, 0x2a, 0x06,
-	0xd0, 0x21, 0xc8, 0xb4, 0x4f, 0x4c, 0xc7, 0xd5, 0x4f, 0x0c, 0x62, 0x1a, 0x3d, 0x0b, 0x0b, 0xae,
-	0x64, 0x8a, 0xf7, 0x56, 0xa5, 0x5b, 0xb1, 0xc8, 0x7c, 0x9b, 0x9b, 0x3f, 0x0a, 0xac, 0xfd, 0x72,
-	0x4c, 0x17, 0xa5, 0xe8, 0xd1, 0x02, 0x59, 0x12, 0x7c, 0x86, 0xdb, 0x21, 0x67, 0x78, 0x19, 0x53,
-	0xce, 0x10, 0x3d, 0x79, 0x86, 0xe8, 0xb9, 0x3d, 0xb8, 0x72, 0x5e, 0x90, 0x17, 0x41, 0xff, 0xb2,
-	0x79, 0x41, 0x9a, 0xf1, 0x45, 0xf9, 0x53, 0x1c, 0x32, 0xfc, 0x10, 0xb4, 0x9f, 0x58, 0xff, 0x25,
-	0x92, 0x8c, 0xce, 0x01, 0x3d, 0xc6, 0x21, 0xf9, 0x28, 0x4c, 0x62, 0x16, 0x81, 0x87, 0x04, 0xfe,
-	0xd3, 0x05, 0xe0, 0x05, 0xb5, 0xee, 0x5e, 0x60, 0x96, 0x0b, 0x81, 0x7f, 0xe7, 0x6c, 0x96, 0x3b,
-	0x9b, 0x4a, 0x92, 0x97, 0x4f, 0x25, 0xff, 0x5b, 0x8c, 0xfa, 0x7b, 0x1c, 0x92, 0x2d, 0x73, 0xf8,
-	0x9a, 0x64, 0x1c, 0xfc, 0xc2, 0x8c, 0xb3, 0x8a, 0x16, 0x62, 0x8d, 0x21, 0x79, 0xd7, 0x3d, 0x27,
-	0xe1, 0x7c, 0x37, 0xdc, 0x04, 0x97, 0xcc, 0x37, 0xe7, 0x50, 0x2e, 0xf5, 0x75, 0xa3, 0x5c, 0x07,
-	0xd6, 0xf7, 0xed, 0x5e, 0xcb, 0x32, 0xfa, 0x78, 0x8c, 0x27, 0x2e, 0x6b, 0x17, 0xfa, 0x96, 0x47,
-	0x5d, 0x4c, 0xf4, 0x89, 0x31, 0xc6, 0xbe, 0xbf, 0x8c, 0x2f, 0x6b, 0x1a, 0x63, 0x3c, 0xaf, 0xe2,
-	0x79, 0xe6, 0xc0, 0x77, 0x1f, 0xa8, 0x74, 0x3d, 0x73, 0xa0, 0xfc, 0x23, 0x06, 0xd2, 0xbe, 0xdd,
-	0x6b, 0xbb, 0x86, 0xeb, 0x51, 0x54, 0x81, 0x04, 0x75, 0x0d, 0x57, 0x38, 0xdb, 0x2c, 0xe6, 0x57,
-	0xec, 0xde, 0xcc, 0x30, 0xcf, 0xfe, 0x60, 0x4d, 0x18, 0xb3, 0x4a, 0x3d, 0xc0, 0xae, 0x61, 0x5a,
-	0x7e, 0x53, 0xac, 0x05, 0xaf, 0xa8, 0x02, 0x32, 0x57, 0xd1, 0xa9, 0x6b, 0x10, 0x57, 0x67, 0x37,
-	0x58, 0x3f, 0x37, 0xe4, 0x82, 0xa9, 0x82, 0xeb, 0x6d, 0xbe, 0x13, 0x5c, 0x6f, 0xb5, 0x4d, 0x6e,
-	0xd3, 0x66, 0x26, 0x4c, 0x88, 0x1e, 0x42, 0x9a, 0x7a, 0x3d, 0x11, 0x68, 0x8a, 0x07, 0x7a, 0x33,
-	0x7c, 0xa0, 0xbe, 0xa1, 0x36, 0x73, 0xa1, 0x7c, 0x19, 0x81, 0x04, 0x8f, 0x9f, 0xdd, 0x1f, 0xdb,
-	0x9d, 0x52, 0x47, 0x5d, 0xba, 0x3f, 0x66, 0x20, 0xd5, 0x52, 0x9b, 0x95, 0x7a, 0xf3, 0x81, 0x1c,
-	0x41, 0x9b, 0x00, 0x6d, 0xb5, 0xd3, 0x6d, 0xe9, 0x95, 0x83, 0xa6, 0x2a, 0xa7, 0xd9, 0xa0, 0xd6,
-	0x6d, 0x36, 0xd9, 0x60, 0x14, 0x21, 0xd8, 0x2c, 0x97, 0x9a, 0x65, 0xb5, 0xa1, 0x07, 0x06, 0xb1,
-	0x39, 0x59, 0xbb, 0x53, 0xd2, 0x3a, 0x6a, 0x45, 0x4e, 0xa1, 0x0d, 0x90, 0x84, 0xac, 0xa1, 0x56,
-	0xc4, 0xbd, 0x93, 0x7b, 0x5b, 0xb8, 0x77, 0xbe, 0x01, 0x5b, 0xa5, 0x4e, 0x47, 0x7d, 0xd8, 0xea,
-	0xe8, 0xd5, 0x52, 0xbd, 0xd1, 0xd5, 0x54, 0x59, 0x52, 0x6a, 0x90, 0x0e, 0x56, 0x80, 0xb6, 0x20,
-	0xb3, 0x18, 0xe7, 0x06, 0x48, 0xed, 0xee, 0xde, 0xc3, 0x7a, 0x87, 0x4d, 0x12, 0x41, 0x00, 0xc9,
-	0x8f, 0xbb, 0x6a, 0x57, 0xad, 0xc8, 0x51, 0x24, 0xc3, 0x7a, 0xbb, 0x53, 0x6a, 0xa8, 0x2c, 0x86,
-	0x4e, 0xb7, 0x2d, 0xc7, 0x94, 0x0a, 0xa7, 0x93, 0x86, 0x0f, 0x31, 0xc1, 0x93, 0x3e, 0x46, 0x6f,
-	0xf1, 0xc3, 0x3b, 0xc2, 0x7d, 0x57, 0x37, 0x07, 0x3e, 0x99, 0x24, 0x5f, 0x52, 0x1f, 0xa0, 0xab,
-	0x90, 0x1c, 0xd9, 0x3d, 0x7d, 0x46, 0xa2, 0xc4, 0xc8, 0xee, 0xd5, 0x07, 0xca, 0xef, 0xa2, 0xb0,
-	0xf5, 0x89, 0x41, 0x26, 0x25, 0xc7, 0xb1, 0xcc, 0x3e, 0xff, 0xdc, 0xc1, 0xda, 0xe8, 0x39, 0x42,
-	0xf2, 0x67, 0xb4, 0x1f, 0x10, 0x4b, 0x5c, 0xf8, 0x6f, 0xad, 0xc0, 0x6b, 0xc9, 0xe5, 0x22, 0xbd,
-	0x72, 0x90, 0x76, 0x88, 0x3d, 0x24, 0x98, 0x52, 0x9e, 0xf2, 0xa2, 0xda, 0xec, 0x9d, 0x31, 0xde,
-	0x25, 0x46, 0xff, 0x98, 0x25, 0x02, 0x8f, 0x58, 0xd9, 0xb8, 0x60, 0x7c, 0x20, 0xeb, 0x12, 0x4b,
-	0xf9, 0xd9, 0x2a, 0xb8, 0x53, 0x10, 0x6b, 0xaa, 0x8f, 0x05, 0xd4, 0x4d, 0xf5, 0xb1, 0xde, 0x2e,
-	0x3d, 0x12, 0xe8, 0x2e, 0xec, 0x6f, 0x0c, 0xad, 0x43, 0xba, 0x54, 0x2e, 0xab, 0xad, 0x0e, 0xc7,
-	0x70, 0x8e, 0x07, 0x09, 0x36, 0x54, 0xad, 0x37, 0xeb, 0xed, 0x9a, 0x5a, 0x91, 0x93, 0x0c, 0x08,
-	0x86, 0x20, 0x47, 0x1e, 0x20, 0xf9, 0x83, 0x3a, 0x87, 0x3d, 0xad, 0xfc, 0x59, 0x82, 0x18, 0xab,
-	0x20, 0x75, 0x90, 0x48, 0x80, 0x03, 0xdf, 0xb5, 0x4c, 0xf1, 0xbd, 0xd5, 0x84, 0x9e, 0x41, 0xa7,
-	0x9d, 0x5a, 0x33, 0x57, 0x4e, 0x90, 0x21, 0xfc, 0x1a, 0x13, 0xc2, 0xd5, 0x2c, 0xa9, 0x68, 0xa7,
-	0xd6, 0xac, 0x5e, 0x1d, 0xf1, 0xeb, 0xbd, 0x3e, 0xb2, 0x7b, 0x7c, 0xa3, 0x57, 0xd7, 0xab, 0xd9,
-	0xf7, 0x00, 0x56, 0xaf, 0x8e, 0x66, 0x1f, 0x48, 0xaa, 0x20, 0x51, 0xd6, 0x5f, 0x70, 0x4f, 0x71,
-	0xee, 0xe9, 0x9b, 0x21, 0xaf, 0xa3, 0xb5, 0x35, 0x2d, 0x4d, 0x83, 0x1b, 0x5d, 0x03, 0x32, 0xce,
-	0xf4, 0xd4, 0x53, 0x82, 0x7b, 0xfa, 0x56, 0xe8, 0xfb, 0x4f, 0x6d, 0x4d, 0x03, 0xdf, 0x9e, 0x79,
-	0x2b, 0x43, 0x9a, 0x5f, 0xb6, 0x98, 0x2b, 0x91, 0x84, 0xae, 0x87, 0xeb, 0x8e, 0x6b, 0x6b, 0x5a,
-	0xea, 0xc8, 0xbf, 0x6f, 0xdc, 0x87, 0x94, 0x63, 0x0e, 0xb9, 0x0f, 0x51, 0x71, 0xde, 0x0d, 0x55,
-	0xf0, 0x6a, 0x6b, 0x5a, 0xd2, 0x11, 0xfd, 0x43, 0x0b, 0x36, 0xc4, 0x92, 0xe8, 0x13, 0x8b, 0xfb,
-	0x59, 0xe7, 0x7e, 0x6e, 0x84, 0x6f, 0xd8, 0x6a, 0x6b, 0x5a, 0x86, 0xce, 0xb5, 0xb7, 0xf7, 0x21,
-	0x49, 0x79, 0xb6, 0xf3, 0xaf, 0x70, 0xbb, 0x61, 0xb3, 0xa3, 0xe6, 0xdb, 0xa1, 0x03, 0xd8, 0x14,
-	0x4f, 0xfa, 0x91, 0x49, 0x5d, 0x9b, 0x4c, 0xb3, 0x1b, 0xbc, 0x9a, 0x87, 0xf7, 0xb4, 0x21, 0xec,
-	0x6b, 0xc2, 0x1c, 0xfd, 0x08, 0xb6, 0xa7, 0x06, 0x99, 0xe8, 0xc6, 0xe9, 0xa1, 0xa6, 0x59, 0x89,
-	0xfb, 0xcc, 0x5f, 0x2c, 0x17, 0x68, 0xf2, 0x74, 0x51, 0xc0, 0x0f, 0x3d, 0xf5, 0x7a, 0x63, 0xd3,
-	0x75, 0xf1, 0x40, 0xef, 0x4d, 0xb3, 0x20, 0x0e, 0xfd, 0x4c, 0xb6, 0x37, 0x45, 0xf7, 0x20, 0xe7,
-	0x7f, 0x09, 0xb5, 0x3d, 0xd7, 0xf1, 0x5c, 0x9d, 0x60, 0x6a, 0x7b, 0xa4, 0x2f, 0x1a, 0xb6, 0x6d,
-	0x6e, 0xf0, 0x7f, 0x42, 0xe3, 0x80, 0x2b, 0x68, 0xfe, 0x38, 0xeb, 0xdc, 0xde, 0x87, 0xac, 0x6f,
-	0xcc, 0x5a, 0x2b, 0x62, 0x5b, 0xbc, 0x17, 0xa1, 0xdc, 0x74, 0x8b, 0x9b, 0x5e, 0x15, 0xe3, 0x65,
-	0x31, 0xcc, 0xba, 0x12, 0xca, 0x0c, 0xab, 0x90, 0xb4, 0x8c, 0x1e, 0xb6, 0x68, 0x16, 0x85, 0x5a,
-	0x2a, 0xeb, 0x84, 0x1a, 0xdc, 0x40, 0x74, 0x41, 0xbe, 0x35, 0x6a, 0x00, 0xd0, 0xfe, 0x11, 0x1e,
-	0x78, 0x96, 0x39, 0x19, 0x66, 0xaf, 0x84, 0xea, 0x6c, 0x18, 0x14, 0x33, 0x1b, 0x6d, 0xce, 0x1e,
-	0xfd, 0x3f, 0xa4, 0x59, 0x2a, 0xe7, 0x1d, 0xc1, 0x9b, 0xa2, 0x3e, 0x8f, 0xec, 0x1e, 0xeb, 0x06,
-	0x72, 0x1f, 0x40, 0x66, 0x6e, 0xfe, 0x0b, 0x75, 0x2a, 0x00, 0x69, 0x77, 0xea, 0xf0, 0xd3, 0xa4,
-	0xec, 0xc1, 0xc6, 0xc2, 0xf4, 0xe8, 0x26, 0x5c, 0x1d, 0x1b, 0x4f, 0x83, 0x46, 0x95, 0xea, 0x0e,
-	0x26, 0xfa, 0x91, 0xed, 0x11, 0xee, 0x3a, 0xa1, 0xa1, 0xb1, 0xf1, 0xd4, 0xef, 0x55, 0x69, 0x0b,
-	0x93, 0x9a, 0xed, 0x11, 0xe5, 0x8b, 0x08, 0xc8, 0x6d, 0x8e, 0x20, 0xcf, 0x75, 0x4f, 0x3c, 0x4c,
-	0xdd, 0x55, 0x45, 0xea, 0x4d, 0x48, 0x12, 0x3c, 0x34, 0xed, 0x09, 0x4f, 0x57, 0x92, 0xe6, 0xbf,
-	0xa1, 0x5b, 0x10, 0x63, 0x07, 0x4b, 0xe4, 0x43, 0x25, 0x44, 0x6a, 0x65, 0xea, 0x6c, 0x32, 0x22,
-	0xe6, 0x65, 0x93, 0x89, 0x4a, 0x22, 0xf9, 0x92, 0xfa, 0x40, 0xf9, 0x31, 0x6c, 0x3c, 0xc0, 0xff,
-	0x82, 0xe0, 0x5e, 0x50, 0x59, 0xff, 0x12, 0x85, 0x2d, 0xd6, 0xec, 0xef, 0xdb, 0x3d, 0x7a, 0xe1,
-	0x19, 0x92, 0x0b, 0x33, 0x5c, 0x03, 0xc9, 0x31, 0x86, 0x58, 0xa7, 0xe6, 0xe7, 0x02, 0xb8, 0x84,
-	0x96, 0x66, 0x82, 0xb6, 0xf9, 0xb9, 0xa8, 0xfb, 0x6c, 0xd0, 0xb5, 0x8f, 0x71, 0x10, 0x1a, 0x57,
-	0xef, 0x30, 0xc1, 0x99, 0x2e, 0x33, 0x7e, 0xb6, 0xcb, 0x1c, 0xc1, 0x36, 0x5b, 0x80, 0x68, 0xec,
-	0xc6, 0x86, 0xdb, 0x3f, 0xc2, 0x84, 0xe7, 0xe6, 0xcd, 0xe2, 0xf7, 0x57, 0xb5, 0xdf, 0x8b, 0x0b,
-	0x0c, 0xf2, 0x07, 0x7e, 0x28, 0xbc, 0x68, 0x5b, 0xa3, 0x45, 0x01, 0x5b, 0xe2, 0xa1, 0x69, 0xb9,
-	0x98, 0xf0, 0x6c, 0x2b, 0x69, 0xfe, 0x9b, 0x72, 0x1b, 0xb6, 0x96, 0x6c, 0x83, 0xaf, 0xfe, 0x6b,
-	0xac, 0xe4, 0x96, 0xca, 0x9d, 0xfa, 0x23, 0xd5, 0x2f, 0xe9, 0x07, 0x4d, 0xdd, 0x7f, 0x8f, 0x2a,
-	0x5f, 0x45, 0x40, 0xee, 0x3a, 0x03, 0xc3, 0xc5, 0xaf, 0x02, 0x64, 0xf4, 0x05, 0x40, 0xc6, 0xe6,
-	0x80, 0x0c, 0xc8, 0x17, 0xbf, 0x18, 0xf9, 0xee, 0x41, 0xc6, 0xe3, 0x71, 0xf1, 0x9f, 0x80, 0xfc,
-	0x52, 0x77, 0xb6, 0x49, 0xae, 0x9a, 0xd8, 0x1a, 0x3c, 0x34, 0xe8, 0xb1, 0x06, 0x42, 0x9d, 0x3d,
-	0x2b, 0x04, 0xe4, 0xd3, 0x9d, 0xa5, 0x8e, 0x3d, 0xa1, 0x18, 0xdd, 0x86, 0xf8, 0xc8, 0xee, 0x89,
-	0x6f, 0x67, 0xe1, 0xe2, 0xe0, 0xfa, 0xe8, 0x3a, 0x6c, 0x4d, 0xf0, 0x53, 0x57, 0x9f, 0x23, 0x89,
-	0x58, 0xf6, 0x06, 0x13, 0xb7, 0x02, 0xa2, 0x28, 0x9f, 0x81, 0x5c, 0x36, 0x26, 0x7d, 0x6c, 0xfd,
-	0xdb, 0x4e, 0xc4, 0x67, 0x20, 0x57, 0xb0, 0x85, 0x5f, 0x0d, 0xaa, 0x30, 0x33, 0x14, 0x7f, 0x9e,
-	0xe6, 0x89, 0xcb, 0x4f, 0xe3, 0x16, 0x26, 0xe8, 0xd7, 0x11, 0x90, 0x66, 0x59, 0x08, 0x15, 0x56,
-	0xd5, 0xe4, 0xa5, 0x7c, 0x95, 0x0b, 0xb1, 0xcd, 0x4a, 0xf5, 0xa7, 0x5f, 0xfd, 0xf5, 0x17, 0xd1,
-	0xfb, 0xca, 0xbd, 0xd9, 0x0f, 0x8e, 0x7e, 0xfc, 0xb4, 0xf0, 0xec, 0x74, 0x6d, 0xcf, 0x0b, 0x22,
-	0x74, 0x5a, 0x78, 0x26, 0x1e, 0x9e, 0xf3, 0xdf, 0x25, 0xef, 0x8a, 0x22, 0x77, 0x37, 0x72, 0x03,
-	0xfd, 0x2a, 0x02, 0x49, 0x91, 0x90, 0xd0, 0xaa, 0xda, 0xb0, 0x90, 0xb7, 0x42, 0x05, 0xa9, 0xf2,
-	0x20, 0x3f, 0x42, 0x1f, 0xbe, 0x4a, 0x90, 0x85, 0x67, 0x62, 0xb3, 0x9f, 0xa3, 0x2f, 0x23, 0x90,
-	0x0e, 0x98, 0x89, 0xf2, 0x17, 0x4b, 0x0e, 0xb9, 0x42, 0x68, 0x7d, 0x41, 0x79, 0xe5, 0x7b, 0x3c,
-	0xe8, 0xdb, 0xe8, 0xd6, 0xab, 0x04, 0x8d, 0x7e, 0x13, 0x01, 0x69, 0x96, 0x1a, 0x56, 0x42, 0xbf,
-	0x9c, 0x44, 0x42, 0xed, 0xea, 0x3e, 0x0f, 0xb0, 0x52, 0xbc, 0xdc, 0xae, 0xde, 0xe5, 0x09, 0xe3,
-	0xb7, 0x11, 0x90, 0x66, 0x07, 0x70, 0x65, 0xb8, 0xcb, 0x47, 0x35, 0x54, 0xb8, 0x07, 0x3c, 0xdc,
-	0xba, 0x52, 0xb9, 0x5c, 0xb8, 0x7d, 0x3e, 0x37, 0xa3, 0xec, 0x2f, 0x23, 0x20, 0xcd, 0x8e, 0xf4,
-	0xca, 0x98, 0x97, 0x0f, 0x7f, 0xee, 0xcd, 0x33, 0xe9, 0x50, 0x1d, 0x3b, 0xee, 0x34, 0x20, 0xeb,
-	0x8d, 0xcb, 0x6d, 0xeb, 0xde, 0x4f, 0xe0, 0x9d, 0xbe, 0x3d, 0x7e, 0x79, 0x50, 0x7b, 0x12, 0x63,
-	0x5c, 0x8b, 0xcd, 0xdf, 0x8a, 0x7c, 0xaa, 0xfa, 0xba, 0x43, 0xdb, 0x32, 0x26, 0xc3, 0xbc, 0x4d,
-	0x86, 0x85, 0x21, 0x9e, 0xf0, 0xe8, 0x0a, 0x62, 0xc8, 0x70, 0x4c, 0xfa, 0x82, 0xff, 0x33, 0xb8,
-	0x17, 0x08, 0x7a, 0x49, 0x6e, 0xf1, 0x9d, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xbb, 0x4e,
-	0xb3, 0x98, 0x20, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dataproc/v1beta2/operations.pb.go b/googleapis/cloud/dataproc/v1beta2/operations.pb.go
index 5966dac13f..b1a78dbbb5 100644
--- a/googleapis/cloud/dataproc/v1beta2/operations.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/operations.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/operations.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
+package dataproc
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The operation state.
 type ClusterOperationStatus_State int32
@@ -40,6 +43,7 @@ var ClusterOperationStatus_State_name = map[int32]string{
 	2: "RUNNING",
 	3: "DONE",
 }
+
 var ClusterOperationStatus_State_value = map[string]int32{
 	"UNKNOWN": 0,
 	"PENDING": 1,
@@ -50,8 +54,9 @@ var ClusterOperationStatus_State_value = map[string]int32{
 func (x ClusterOperationStatus_State) String() string {
 	return proto.EnumName(ClusterOperationStatus_State_name, int32(x))
 }
+
 func (ClusterOperationStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operations_80c07007f2fde7d1, []int{0, 0}
+	return fileDescriptor_e6e7a565fff113fd, []int{0, 0}
 }
 
 // The status of the operation.
@@ -73,16 +78,17 @@ func (m *ClusterOperationStatus) Reset()         { *m = ClusterOperationStatus{}
 func (m *ClusterOperationStatus) String() string { return proto.CompactTextString(m) }
 func (*ClusterOperationStatus) ProtoMessage()    {}
 func (*ClusterOperationStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_80c07007f2fde7d1, []int{0}
+	return fileDescriptor_e6e7a565fff113fd, []int{0}
 }
+
 func (m *ClusterOperationStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterOperationStatus.Unmarshal(m, b)
 }
 func (m *ClusterOperationStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterOperationStatus.Marshal(b, m, deterministic)
 }
-func (dst *ClusterOperationStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterOperationStatus.Merge(dst, src)
+func (m *ClusterOperationStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationStatus.Merge(m, src)
 }
 func (m *ClusterOperationStatus) XXX_Size() int {
 	return xxx_messageInfo_ClusterOperationStatus.Size(m)
@@ -148,16 +154,17 @@ func (m *ClusterOperationMetadata) Reset()         { *m = ClusterOperationMetada
 func (m *ClusterOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ClusterOperationMetadata) ProtoMessage()    {}
 func (*ClusterOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_80c07007f2fde7d1, []int{1}
+	return fileDescriptor_e6e7a565fff113fd, []int{1}
 }
+
 func (m *ClusterOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterOperationMetadata.Unmarshal(m, b)
 }
 func (m *ClusterOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ClusterOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterOperationMetadata.Merge(dst, src)
+func (m *ClusterOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationMetadata.Merge(m, src)
 }
 func (m *ClusterOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ClusterOperationMetadata.Size(m)
@@ -225,17 +232,17 @@ func (m *ClusterOperationMetadata) GetWarnings() []string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ClusterOperationStatus_State", ClusterOperationStatus_State_name, ClusterOperationStatus_State_value)
 	proto.RegisterType((*ClusterOperationStatus)(nil), "google.cloud.dataproc.v1beta2.ClusterOperationStatus")
 	proto.RegisterType((*ClusterOperationMetadata)(nil), "google.cloud.dataproc.v1beta2.ClusterOperationMetadata")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.ClusterOperationMetadata.LabelsEntry")
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ClusterOperationStatus_State", ClusterOperationStatus_State_name, ClusterOperationStatus_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1beta2/operations.proto", fileDescriptor_operations_80c07007f2fde7d1)
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/operations.proto", fileDescriptor_e6e7a565fff113fd)
 }
 
-var fileDescriptor_operations_80c07007f2fde7d1 = []byte{
+var fileDescriptor_e6e7a565fff113fd = []byte{
 	// 537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5f, 0x8b, 0xd3, 0x4e,
 	0x14, 0xfd, 0xa5, 0xff, 0x7b, 0xb3, 0xed, 0xaf, 0x0c, 0x22, 0x43, 0x51, 0x36, 0x5b, 0x10, 0xfa,
diff --git a/googleapis/cloud/dataproc/v1beta2/shared.pb.go b/googleapis/cloud/dataproc/v1beta2/shared.pb.go
index 51c8eb616d..430f16b01c 100644
--- a/googleapis/cloud/dataproc/v1beta2/shared.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/shared.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/shared.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
+package dataproc
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,13 +20,13 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1beta2/shared.proto", fileDescriptor_shared_5c6b7853e2deb331)
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/shared.proto", fileDescriptor_2474c85b30841989)
 }
 
-var fileDescriptor_shared_5c6b7853e2deb331 = []byte{
+var fileDescriptor_2474c85b30841989 = []byte{
 	// 157 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x8e, 0xa1, 0x0e, 0x02, 0x31,
 	0x0c, 0x40, 0x83, 0x41, 0x1c, 0x0e, 0x49, 0x40, 0x60, 0x11, 0x6d, 0x00, 0x89, 0xbb, 0x04, 0x7f,
diff --git a/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go b/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
index 10d5bace9d..bf2f757f7d 100644
--- a/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
+++ b/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/workflow_templates.proto
 
-package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package dataproc
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The operation state.
 type WorkflowMetadata_State int32
@@ -47,6 +47,7 @@ var WorkflowMetadata_State_name = map[int32]string{
 	2: "RUNNING",
 	3: "DONE",
 }
+
 var WorkflowMetadata_State_value = map[string]int32{
 	"UNKNOWN": 0,
 	"PENDING": 1,
@@ -57,8 +58,9 @@ var WorkflowMetadata_State_value = map[string]int32{
 func (x WorkflowMetadata_State) String() string {
 	return proto.EnumName(WorkflowMetadata_State_name, int32(x))
 }
+
 func (WorkflowMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{9, 0}
+	return fileDescriptor_49d658bedf9bdbee, []int{9, 0}
 }
 
 // The workflow node state.
@@ -88,6 +90,7 @@ var WorkflowNode_NodeState_name = map[int32]string{
 	4: "COMPLETED",
 	5: "FAILED",
 }
+
 var WorkflowNode_NodeState_value = map[string]int32{
 	"NODE_STATUS_UNSPECIFIED": 0,
 	"BLOCKED":                 1,
@@ -100,8 +103,9 @@ var WorkflowNode_NodeState_value = map[string]int32{
 func (x WorkflowNode_NodeState) String() string {
 	return proto.EnumName(WorkflowNode_NodeState_name, int32(x))
 }
+
 func (WorkflowNode_NodeState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{12, 0}
+	return fileDescriptor_49d658bedf9bdbee, []int{12, 0}
 }
 
 // A Cloud Dataproc workflow template resource.
@@ -160,16 +164,17 @@ func (m *WorkflowTemplate) Reset()         { *m = WorkflowTemplate{} }
 func (m *WorkflowTemplate) String() string { return proto.CompactTextString(m) }
 func (*WorkflowTemplate) ProtoMessage()    {}
 func (*WorkflowTemplate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{0}
+	return fileDescriptor_49d658bedf9bdbee, []int{0}
 }
+
 func (m *WorkflowTemplate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowTemplate.Unmarshal(m, b)
 }
 func (m *WorkflowTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowTemplate.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowTemplate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowTemplate.Merge(dst, src)
+func (m *WorkflowTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowTemplate.Merge(m, src)
 }
 func (m *WorkflowTemplate) XXX_Size() int {
 	return xxx_messageInfo_WorkflowTemplate.Size(m)
@@ -263,16 +268,17 @@ func (m *WorkflowTemplatePlacement) Reset()         { *m = WorkflowTemplatePlace
 func (m *WorkflowTemplatePlacement) String() string { return proto.CompactTextString(m) }
 func (*WorkflowTemplatePlacement) ProtoMessage()    {}
 func (*WorkflowTemplatePlacement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{1}
+	return fileDescriptor_49d658bedf9bdbee, []int{1}
 }
+
 func (m *WorkflowTemplatePlacement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowTemplatePlacement.Unmarshal(m, b)
 }
 func (m *WorkflowTemplatePlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowTemplatePlacement.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowTemplatePlacement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowTemplatePlacement.Merge(dst, src)
+func (m *WorkflowTemplatePlacement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowTemplatePlacement.Merge(m, src)
 }
 func (m *WorkflowTemplatePlacement) XXX_Size() int {
 	return xxx_messageInfo_WorkflowTemplatePlacement.Size(m)
@@ -320,80 +326,14 @@ func (m *WorkflowTemplatePlacement) GetClusterSelector() *ClusterSelector {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*WorkflowTemplatePlacement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _WorkflowTemplatePlacement_OneofMarshaler, _WorkflowTemplatePlacement_OneofUnmarshaler, _WorkflowTemplatePlacement_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*WorkflowTemplatePlacement) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*WorkflowTemplatePlacement_ManagedCluster)(nil),
 		(*WorkflowTemplatePlacement_ClusterSelector)(nil),
 	}
 }
 
-func _WorkflowTemplatePlacement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*WorkflowTemplatePlacement)
-	// placement
-	switch x := m.Placement.(type) {
-	case *WorkflowTemplatePlacement_ManagedCluster:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ManagedCluster); err != nil {
-			return err
-		}
-	case *WorkflowTemplatePlacement_ClusterSelector:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ClusterSelector); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("WorkflowTemplatePlacement.Placement has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _WorkflowTemplatePlacement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*WorkflowTemplatePlacement)
-	switch tag {
-	case 1: // placement.managed_cluster
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ManagedCluster)
-		err := b.DecodeMessage(msg)
-		m.Placement = &WorkflowTemplatePlacement_ManagedCluster{msg}
-		return true, err
-	case 2: // placement.cluster_selector
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ClusterSelector)
-		err := b.DecodeMessage(msg)
-		m.Placement = &WorkflowTemplatePlacement_ClusterSelector{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _WorkflowTemplatePlacement_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*WorkflowTemplatePlacement)
-	// placement
-	switch x := m.Placement.(type) {
-	case *WorkflowTemplatePlacement_ManagedCluster:
-		s := proto.Size(x.ManagedCluster)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *WorkflowTemplatePlacement_ClusterSelector:
-		s := proto.Size(x.ClusterSelector)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Cluster that is managed by the workflow.
 type ManagedCluster struct {
 	// Required. The cluster name prefix. A unique cluster name will be formed by
@@ -425,16 +365,17 @@ func (m *ManagedCluster) Reset()         { *m = ManagedCluster{} }
 func (m *ManagedCluster) String() string { return proto.CompactTextString(m) }
 func (*ManagedCluster) ProtoMessage()    {}
 func (*ManagedCluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{2}
+	return fileDescriptor_49d658bedf9bdbee, []int{2}
 }
+
 func (m *ManagedCluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManagedCluster.Unmarshal(m, b)
 }
 func (m *ManagedCluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManagedCluster.Marshal(b, m, deterministic)
 }
-func (dst *ManagedCluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManagedCluster.Merge(dst, src)
+func (m *ManagedCluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedCluster.Merge(m, src)
 }
 func (m *ManagedCluster) XXX_Size() int {
 	return xxx_messageInfo_ManagedCluster.Size(m)
@@ -486,16 +427,17 @@ func (m *ClusterSelector) Reset()         { *m = ClusterSelector{} }
 func (m *ClusterSelector) String() string { return proto.CompactTextString(m) }
 func (*ClusterSelector) ProtoMessage()    {}
 func (*ClusterSelector) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{3}
+	return fileDescriptor_49d658bedf9bdbee, []int{3}
 }
+
 func (m *ClusterSelector) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterSelector.Unmarshal(m, b)
 }
 func (m *ClusterSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterSelector.Marshal(b, m, deterministic)
 }
-func (dst *ClusterSelector) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterSelector.Merge(dst, src)
+func (m *ClusterSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterSelector.Merge(m, src)
 }
 func (m *ClusterSelector) XXX_Size() int {
 	return xxx_messageInfo_ClusterSelector.Size(m)
@@ -569,16 +511,17 @@ func (m *OrderedJob) Reset()         { *m = OrderedJob{} }
 func (m *OrderedJob) String() string { return proto.CompactTextString(m) }
 func (*OrderedJob) ProtoMessage()    {}
 func (*OrderedJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{4}
+	return fileDescriptor_49d658bedf9bdbee, []int{4}
 }
+
 func (m *OrderedJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OrderedJob.Unmarshal(m, b)
 }
 func (m *OrderedJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OrderedJob.Marshal(b, m, deterministic)
 }
-func (dst *OrderedJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OrderedJob.Merge(dst, src)
+func (m *OrderedJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrderedJob.Merge(m, src)
 }
 func (m *OrderedJob) XXX_Size() int {
 	return xxx_messageInfo_OrderedJob.Size(m)
@@ -706,9 +649,9 @@ func (m *OrderedJob) GetPrerequisiteStepIds() []string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OrderedJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OrderedJob_OneofMarshaler, _OrderedJob_OneofUnmarshaler, _OrderedJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OrderedJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OrderedJob_HadoopJob)(nil),
 		(*OrderedJob_SparkJob)(nil),
 		(*OrderedJob_PysparkJob)(nil),
@@ -718,144 +661,6 @@ func (*OrderedJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _OrderedJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OrderedJob)
-	// job_type
-	switch x := m.JobType.(type) {
-	case *OrderedJob_HadoopJob:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HadoopJob); err != nil {
-			return err
-		}
-	case *OrderedJob_SparkJob:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkJob); err != nil {
-			return err
-		}
-	case *OrderedJob_PysparkJob:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PysparkJob); err != nil {
-			return err
-		}
-	case *OrderedJob_HiveJob:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HiveJob); err != nil {
-			return err
-		}
-	case *OrderedJob_PigJob:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PigJob); err != nil {
-			return err
-		}
-	case *OrderedJob_SparkSqlJob:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SparkSqlJob); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OrderedJob.JobType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OrderedJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OrderedJob)
-	switch tag {
-	case 2: // job_type.hadoop_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HadoopJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_HadoopJob{msg}
-		return true, err
-	case 3: // job_type.spark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_SparkJob{msg}
-		return true, err
-	case 4: // job_type.pyspark_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PySparkJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_PysparkJob{msg}
-		return true, err
-	case 5: // job_type.hive_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HiveJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_HiveJob{msg}
-		return true, err
-	case 6: // job_type.pig_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PigJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_PigJob{msg}
-		return true, err
-	case 7: // job_type.spark_sql_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SparkSqlJob)
-		err := b.DecodeMessage(msg)
-		m.JobType = &OrderedJob_SparkSqlJob{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OrderedJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OrderedJob)
-	// job_type
-	switch x := m.JobType.(type) {
-	case *OrderedJob_HadoopJob:
-		s := proto.Size(x.HadoopJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_SparkJob:
-		s := proto.Size(x.SparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_PysparkJob:
-		s := proto.Size(x.PysparkJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_HiveJob:
-		s := proto.Size(x.HiveJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_PigJob:
-		s := proto.Size(x.PigJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OrderedJob_SparkSqlJob:
-		s := proto.Size(x.SparkSqlJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A configurable parameter that replaces one or more fields in the template.
 // Parameterizable fields:
 // - Labels
@@ -933,16 +738,17 @@ func (m *TemplateParameter) Reset()         { *m = TemplateParameter{} }
 func (m *TemplateParameter) String() string { return proto.CompactTextString(m) }
 func (*TemplateParameter) ProtoMessage()    {}
 func (*TemplateParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{5}
+	return fileDescriptor_49d658bedf9bdbee, []int{5}
 }
+
 func (m *TemplateParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TemplateParameter.Unmarshal(m, b)
 }
 func (m *TemplateParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TemplateParameter.Marshal(b, m, deterministic)
 }
-func (dst *TemplateParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TemplateParameter.Merge(dst, src)
+func (m *TemplateParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TemplateParameter.Merge(m, src)
 }
 func (m *TemplateParameter) XXX_Size() int {
 	return xxx_messageInfo_TemplateParameter.Size(m)
@@ -998,16 +804,17 @@ func (m *ParameterValidation) Reset()         { *m = ParameterValidation{} }
 func (m *ParameterValidation) String() string { return proto.CompactTextString(m) }
 func (*ParameterValidation) ProtoMessage()    {}
 func (*ParameterValidation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{6}
+	return fileDescriptor_49d658bedf9bdbee, []int{6}
 }
+
 func (m *ParameterValidation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParameterValidation.Unmarshal(m, b)
 }
 func (m *ParameterValidation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParameterValidation.Marshal(b, m, deterministic)
 }
-func (dst *ParameterValidation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParameterValidation.Merge(dst, src)
+func (m *ParameterValidation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParameterValidation.Merge(m, src)
 }
 func (m *ParameterValidation) XXX_Size() int {
 	return xxx_messageInfo_ParameterValidation.Size(m)
@@ -1055,80 +862,14 @@ func (m *ParameterValidation) GetValues() *ValueValidation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ParameterValidation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ParameterValidation_OneofMarshaler, _ParameterValidation_OneofUnmarshaler, _ParameterValidation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ParameterValidation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ParameterValidation_Regex)(nil),
 		(*ParameterValidation_Values)(nil),
 	}
 }
 
-func _ParameterValidation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ParameterValidation)
-	// validation_type
-	switch x := m.ValidationType.(type) {
-	case *ParameterValidation_Regex:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Regex); err != nil {
-			return err
-		}
-	case *ParameterValidation_Values:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Values); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ParameterValidation.ValidationType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ParameterValidation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ParameterValidation)
-	switch tag {
-	case 1: // validation_type.regex
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RegexValidation)
-		err := b.DecodeMessage(msg)
-		m.ValidationType = &ParameterValidation_Regex{msg}
-		return true, err
-	case 2: // validation_type.values
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ValueValidation)
-		err := b.DecodeMessage(msg)
-		m.ValidationType = &ParameterValidation_Values{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ParameterValidation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ParameterValidation)
-	// validation_type
-	switch x := m.ValidationType.(type) {
-	case *ParameterValidation_Regex:
-		s := proto.Size(x.Regex)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ParameterValidation_Values:
-		s := proto.Size(x.Values)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Validation based on regular expressions.
 type RegexValidation struct {
 	// Required. RE2 regular expressions used to validate the parameter's value.
@@ -1144,16 +885,17 @@ func (m *RegexValidation) Reset()         { *m = RegexValidation{} }
 func (m *RegexValidation) String() string { return proto.CompactTextString(m) }
 func (*RegexValidation) ProtoMessage()    {}
 func (*RegexValidation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{7}
+	return fileDescriptor_49d658bedf9bdbee, []int{7}
 }
+
 func (m *RegexValidation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegexValidation.Unmarshal(m, b)
 }
 func (m *RegexValidation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RegexValidation.Marshal(b, m, deterministic)
 }
-func (dst *RegexValidation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RegexValidation.Merge(dst, src)
+func (m *RegexValidation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegexValidation.Merge(m, src)
 }
 func (m *RegexValidation) XXX_Size() int {
 	return xxx_messageInfo_RegexValidation.Size(m)
@@ -1184,16 +926,17 @@ func (m *ValueValidation) Reset()         { *m = ValueValidation{} }
 func (m *ValueValidation) String() string { return proto.CompactTextString(m) }
 func (*ValueValidation) ProtoMessage()    {}
 func (*ValueValidation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{8}
+	return fileDescriptor_49d658bedf9bdbee, []int{8}
 }
+
 func (m *ValueValidation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ValueValidation.Unmarshal(m, b)
 }
 func (m *ValueValidation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ValueValidation.Marshal(b, m, deterministic)
 }
-func (dst *ValueValidation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ValueValidation.Merge(dst, src)
+func (m *ValueValidation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueValidation.Merge(m, src)
 }
 func (m *ValueValidation) XXX_Size() int {
 	return xxx_messageInfo_ValueValidation.Size(m)
@@ -1245,16 +988,17 @@ func (m *WorkflowMetadata) Reset()         { *m = WorkflowMetadata{} }
 func (m *WorkflowMetadata) String() string { return proto.CompactTextString(m) }
 func (*WorkflowMetadata) ProtoMessage()    {}
 func (*WorkflowMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{9}
+	return fileDescriptor_49d658bedf9bdbee, []int{9}
 }
+
 func (m *WorkflowMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowMetadata.Unmarshal(m, b)
 }
 func (m *WorkflowMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowMetadata.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowMetadata.Merge(dst, src)
+func (m *WorkflowMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowMetadata.Merge(m, src)
 }
 func (m *WorkflowMetadata) XXX_Size() int {
 	return xxx_messageInfo_WorkflowMetadata.Size(m)
@@ -1359,16 +1103,17 @@ func (m *ClusterOperation) Reset()         { *m = ClusterOperation{} }
 func (m *ClusterOperation) String() string { return proto.CompactTextString(m) }
 func (*ClusterOperation) ProtoMessage()    {}
 func (*ClusterOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{10}
+	return fileDescriptor_49d658bedf9bdbee, []int{10}
 }
+
 func (m *ClusterOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterOperation.Unmarshal(m, b)
 }
 func (m *ClusterOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterOperation.Marshal(b, m, deterministic)
 }
-func (dst *ClusterOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterOperation.Merge(dst, src)
+func (m *ClusterOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperation.Merge(m, src)
 }
 func (m *ClusterOperation) XXX_Size() int {
 	return xxx_messageInfo_ClusterOperation.Size(m)
@@ -1413,16 +1158,17 @@ func (m *WorkflowGraph) Reset()         { *m = WorkflowGraph{} }
 func (m *WorkflowGraph) String() string { return proto.CompactTextString(m) }
 func (*WorkflowGraph) ProtoMessage()    {}
 func (*WorkflowGraph) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{11}
+	return fileDescriptor_49d658bedf9bdbee, []int{11}
 }
+
 func (m *WorkflowGraph) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowGraph.Unmarshal(m, b)
 }
 func (m *WorkflowGraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowGraph.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowGraph) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowGraph.Merge(dst, src)
+func (m *WorkflowGraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowGraph.Merge(m, src)
 }
 func (m *WorkflowGraph) XXX_Size() int {
 	return xxx_messageInfo_WorkflowGraph.Size(m)
@@ -1461,16 +1207,17 @@ func (m *WorkflowNode) Reset()         { *m = WorkflowNode{} }
 func (m *WorkflowNode) String() string { return proto.CompactTextString(m) }
 func (*WorkflowNode) ProtoMessage()    {}
 func (*WorkflowNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{12}
+	return fileDescriptor_49d658bedf9bdbee, []int{12}
 }
+
 func (m *WorkflowNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkflowNode.Unmarshal(m, b)
 }
 func (m *WorkflowNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkflowNode.Marshal(b, m, deterministic)
 }
-func (dst *WorkflowNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkflowNode.Merge(dst, src)
+func (m *WorkflowNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowNode.Merge(m, src)
 }
 func (m *WorkflowNode) XXX_Size() int {
 	return xxx_messageInfo_WorkflowNode.Size(m)
@@ -1533,16 +1280,17 @@ func (m *CreateWorkflowTemplateRequest) Reset()         { *m = CreateWorkflowTem
 func (m *CreateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateWorkflowTemplateRequest) ProtoMessage()    {}
 func (*CreateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{13}
+	return fileDescriptor_49d658bedf9bdbee, []int{13}
 }
+
 func (m *CreateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *CreateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateWorkflowTemplateRequest.Merge(dst, src)
+func (m *CreateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *CreateWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateWorkflowTemplateRequest.Size(m)
@@ -1587,16 +1335,17 @@ func (m *GetWorkflowTemplateRequest) Reset()         { *m = GetWorkflowTemplateR
 func (m *GetWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*GetWorkflowTemplateRequest) ProtoMessage()    {}
 func (*GetWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{14}
+	return fileDescriptor_49d658bedf9bdbee, []int{14}
 }
+
 func (m *GetWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *GetWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetWorkflowTemplateRequest.Merge(dst, src)
+func (m *GetWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *GetWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_GetWorkflowTemplateRequest.Size(m)
@@ -1658,16 +1407,17 @@ func (m *InstantiateWorkflowTemplateRequest) Reset()         { *m = InstantiateW
 func (m *InstantiateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*InstantiateWorkflowTemplateRequest) ProtoMessage()    {}
 func (*InstantiateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{15}
+	return fileDescriptor_49d658bedf9bdbee, []int{15}
 }
+
 func (m *InstantiateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *InstantiateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *InstantiateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InstantiateWorkflowTemplateRequest.Merge(dst, src)
+func (m *InstantiateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstantiateWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *InstantiateWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Size(m)
@@ -1745,16 +1495,17 @@ func (m *InstantiateInlineWorkflowTemplateRequest) Reset() {
 func (m *InstantiateInlineWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*InstantiateInlineWorkflowTemplateRequest) ProtoMessage()    {}
 func (*InstantiateInlineWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{16}
+	return fileDescriptor_49d658bedf9bdbee, []int{16}
 }
+
 func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *InstantiateInlineWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Merge(dst, src)
+func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Size(m)
@@ -1808,16 +1559,17 @@ func (m *UpdateWorkflowTemplateRequest) Reset()         { *m = UpdateWorkflowTem
 func (m *UpdateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateWorkflowTemplateRequest) ProtoMessage()    {}
 func (*UpdateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{17}
+	return fileDescriptor_49d658bedf9bdbee, []int{17}
 }
+
 func (m *UpdateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *UpdateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateWorkflowTemplateRequest.Merge(dst, src)
+func (m *UpdateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *UpdateWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Size(m)
@@ -1855,16 +1607,17 @@ func (m *ListWorkflowTemplatesRequest) Reset()         { *m = ListWorkflowTempla
 func (m *ListWorkflowTemplatesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListWorkflowTemplatesRequest) ProtoMessage()    {}
 func (*ListWorkflowTemplatesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{18}
+	return fileDescriptor_49d658bedf9bdbee, []int{18}
 }
+
 func (m *ListWorkflowTemplatesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListWorkflowTemplatesRequest.Unmarshal(m, b)
 }
 func (m *ListWorkflowTemplatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListWorkflowTemplatesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListWorkflowTemplatesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListWorkflowTemplatesRequest.Merge(dst, src)
+func (m *ListWorkflowTemplatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWorkflowTemplatesRequest.Merge(m, src)
 }
 func (m *ListWorkflowTemplatesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListWorkflowTemplatesRequest.Size(m)
@@ -1913,16 +1666,17 @@ func (m *ListWorkflowTemplatesResponse) Reset()         { *m = ListWorkflowTempl
 func (m *ListWorkflowTemplatesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListWorkflowTemplatesResponse) ProtoMessage()    {}
 func (*ListWorkflowTemplatesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{19}
+	return fileDescriptor_49d658bedf9bdbee, []int{19}
 }
+
 func (m *ListWorkflowTemplatesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListWorkflowTemplatesResponse.Unmarshal(m, b)
 }
 func (m *ListWorkflowTemplatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListWorkflowTemplatesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListWorkflowTemplatesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListWorkflowTemplatesResponse.Merge(dst, src)
+func (m *ListWorkflowTemplatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWorkflowTemplatesResponse.Merge(m, src)
 }
 func (m *ListWorkflowTemplatesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListWorkflowTemplatesResponse.Size(m)
@@ -1968,16 +1722,17 @@ func (m *DeleteWorkflowTemplateRequest) Reset()         { *m = DeleteWorkflowTem
 func (m *DeleteWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteWorkflowTemplateRequest) ProtoMessage()    {}
 func (*DeleteWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_workflow_templates_fbee3ed8540fe470, []int{20}
+	return fileDescriptor_49d658bedf9bdbee, []int{20}
 }
+
 func (m *DeleteWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Unmarshal(m, b)
 }
 func (m *DeleteWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteWorkflowTemplateRequest.Merge(dst, src)
+func (m *DeleteWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteWorkflowTemplateRequest.Merge(m, src)
 }
 func (m *DeleteWorkflowTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Size(m)
@@ -2003,6 +1758,8 @@ func (m *DeleteWorkflowTemplateRequest) GetVersion() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.WorkflowMetadata_State", WorkflowMetadata_State_name, WorkflowMetadata_State_value)
+	proto.RegisterEnum("google.cloud.dataproc.v1beta2.WorkflowNode_NodeState", WorkflowNode_NodeState_name, WorkflowNode_NodeState_value)
 	proto.RegisterType((*WorkflowTemplate)(nil), "google.cloud.dataproc.v1beta2.WorkflowTemplate")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.WorkflowTemplate.LabelsEntry")
 	proto.RegisterType((*WorkflowTemplatePlacement)(nil), "google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement")
@@ -2030,8 +1787,142 @@ func init() {
 	proto.RegisterType((*ListWorkflowTemplatesRequest)(nil), "google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest")
 	proto.RegisterType((*ListWorkflowTemplatesResponse)(nil), "google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse")
 	proto.RegisterType((*DeleteWorkflowTemplateRequest)(nil), "google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest")
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.WorkflowMetadata_State", WorkflowMetadata_State_name, WorkflowMetadata_State_value)
-	proto.RegisterEnum("google.cloud.dataproc.v1beta2.WorkflowNode_NodeState", WorkflowNode_NodeState_name, WorkflowNode_NodeState_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/workflow_templates.proto", fileDescriptor_49d658bedf9bdbee)
+}
+
+var fileDescriptor_49d658bedf9bdbee = []byte{
+	// 2038 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0x58,
+	0x1d, 0xaf, 0xdd, 0x26, 0x4d, 0xbe, 0x99, 0x36, 0xd9, 0x37, 0x4c, 0x27, 0x64, 0xb6, 0xda, 0x8e,
+	0x57, 0x2c, 0xdd, 0xee, 0x90, 0x40, 0xd0, 0xa2, 0x99, 0xce, 0x8c, 0xd8, 0xa6, 0x49, 0xa7, 0x69,
+	0xd3, 0x34, 0xeb, 0xb4, 0x5d, 0x34, 0x1c, 0x22, 0x27, 0x7e, 0x4d, 0xdd, 0x3a, 0xb6, 0x6b, 0x3b,
+	0xdd, 0xe9, 0xa0, 0x45, 0x02, 0xad, 0xc4, 0x85, 0x13, 0x2b, 0xed, 0x05, 0x2d, 0x9c, 0x38, 0xc3,
+	0x05, 0x21, 0x71, 0x04, 0x21, 0x71, 0x43, 0x88, 0x3f, 0x60, 0x2e, 0x9c, 0xb9, 0x72, 0x45, 0xef,
+	0x87, 0x1d, 0xe7, 0xa7, 0x93, 0x16, 0x69, 0x2f, 0x95, 0xdf, 0xcb, 0xfb, 0x7c, 0xde, 0xf7, 0xf7,
+	0xf7, 0x6b, 0x17, 0x7e, 0xd0, 0x36, 0xcd, 0xb6, 0x8e, 0x73, 0x2d, 0xdd, 0xec, 0xaa, 0x39, 0x55,
+	0x71, 0x15, 0xcb, 0x36, 0x5b, 0xb9, 0xab, 0xef, 0x35, 0xb1, 0xab, 0xe4, 0x73, 0x9f, 0x9a, 0xf6,
+	0xc5, 0xa9, 0x6e, 0x7e, 0xda, 0x70, 0x71, 0xc7, 0xd2, 0x15, 0x17, 0x3b, 0x59, 0xcb, 0x36, 0x5d,
+	0x13, 0xad, 0x32, 0x5c, 0x96, 0xe2, 0xb2, 0x1e, 0x2e, 0xcb, 0x71, 0x99, 0xb7, 0x39, 0xad, 0x62,
+	0x69, 0x39, 0xc5, 0x30, 0x4c, 0x57, 0x71, 0x35, 0xd3, 0xe0, 0xe0, 0xcc, 0xa3, 0xc9, 0x97, 0xb6,
+	0xf4, 0xae, 0xe3, 0x62, 0xdb, 0x3b, 0xbd, 0x3e, 0xf9, 0xf4, 0xb9, 0xd9, 0xf4, 0x4e, 0xbe, 0xcb,
+	0x4f, 0xea, 0xa6, 0xd1, 0xb6, 0xbb, 0x86, 0xa1, 0x19, 0xed, 0x9c, 0x69, 0x61, 0xbb, 0xef, 0xf2,
+	0x07, 0xfc, 0x10, 0x5d, 0x35, 0xbb, 0xa7, 0x39, 0xdc, 0xb1, 0xdc, 0x6b, 0xfe, 0xe3, 0x3b, 0x83,
+	0x3f, 0xba, 0x5a, 0x07, 0x3b, 0xae, 0xd2, 0xb1, 0xd8, 0x01, 0xe9, 0xaf, 0x0b, 0x90, 0xfa, 0x84,
+	0x1b, 0xe5, 0x88, 0xdb, 0x04, 0x2d, 0x83, 0xa8, 0xa9, 0x69, 0x71, 0x4d, 0x58, 0x8f, 0xcb, 0xa2,
+	0xa6, 0x22, 0x04, 0x0b, 0x86, 0xd2, 0xc1, 0x69, 0x81, 0xee, 0xd0, 0x67, 0x94, 0x86, 0xc5, 0x2b,
+	0x6c, 0x3b, 0x9a, 0x69, 0xa4, 0xe7, 0xd7, 0x84, 0xf5, 0x88, 0xec, 0x2d, 0xd1, 0x53, 0x48, 0xb4,
+	0x6c, 0xac, 0xb8, 0xb8, 0x41, 0x2e, 0x4b, 0x2f, 0xac, 0x09, 0xeb, 0x89, 0x7c, 0x26, 0xcb, 0x0d,
+	0xec, 0x49, 0x92, 0x3d, 0xf2, 0x24, 0x91, 0x81, 0x1d, 0x27, 0x1b, 0x04, 0xdc, 0xb5, 0x54, 0x1f,
+	0x1c, 0x09, 0x07, 0xb3, 0xe3, 0x14, 0x5c, 0x87, 0xa8, 0xae, 0x34, 0xb1, 0xee, 0xa4, 0xa3, 0x6b,
+	0xf3, 0xeb, 0x89, 0xfc, 0xd3, 0xec, 0x44, 0xaf, 0x66, 0x07, 0x15, 0xcf, 0x56, 0x28, 0xba, 0x64,
+	0xb8, 0xf6, 0xb5, 0xcc, 0xa9, 0xd0, 0x09, 0xc4, 0x2d, 0x5d, 0x69, 0xe1, 0x0e, 0x36, 0xdc, 0xf4,
+	0x22, 0x95, 0xe7, 0xf1, 0x8c, 0xbc, 0x35, 0x0f, 0x2f, 0xf7, 0xa8, 0xd0, 0x73, 0x58, 0x20, 0xae,
+	0x4e, 0xc7, 0xa8, 0xa8, 0xef, 0x87, 0x50, 0x1e, 0xda, 0x2a, 0xb6, 0xb1, 0xba, 0x67, 0x36, 0x65,
+	0x0a, 0x43, 0x35, 0x00, 0x4b, 0xb1, 0x95, 0x0e, 0x26, 0x91, 0x95, 0x8e, 0x53, 0x92, 0xef, 0x86,
+	0x90, 0xf8, 0xf2, 0x78, 0x40, 0x39, 0xc0, 0x91, 0x79, 0x02, 0x89, 0x80, 0xfe, 0x28, 0x05, 0xf3,
+	0x17, 0xf8, 0x9a, 0xfb, 0x9c, 0x3c, 0xa2, 0x6f, 0x40, 0xe4, 0x4a, 0xd1, 0xbb, 0x98, 0x47, 0x06,
+	0x5b, 0x6c, 0x8a, 0x8f, 0x05, 0xe9, 0x8d, 0x00, 0xdf, 0x1c, 0xab, 0x34, 0xfa, 0x11, 0x24, 0x3b,
+	0x8a, 0xa1, 0xb4, 0xb1, 0xda, 0xe0, 0xa9, 0x40, 0x59, 0x13, 0xf9, 0xef, 0x84, 0xc8, 0x7b, 0xc0,
+	0x50, 0xdb, 0x0c, 0xb4, 0x3b, 0x27, 0x2f, 0x77, 0xfa, 0x76, 0xd0, 0x8f, 0x21, 0xc5, 0x19, 0x1b,
+	0x0e, 0xd6, 0x71, 0xcb, 0x35, 0x6d, 0x2a, 0x5c, 0x22, 0x9f, 0x0d, 0xa1, 0xe6, 0x0c, 0x75, 0x8e,
+	0xda, 0x9d, 0x93, 0x93, 0xad, 0xfe, 0xad, 0x42, 0x22, 0xe0, 0x78, 0xe9, 0x17, 0x22, 0x2c, 0xf7,
+	0x8b, 0x83, 0x1e, 0xc2, 0x1d, 0xef, 0x72, 0x9a, 0x1d, 0xcc, 0x2a, 0x09, 0xbe, 0x57, 0x25, 0x49,
+	0x52, 0x84, 0x68, 0xcb, 0x34, 0x4e, 0xb5, 0x36, 0xcd, 0x91, 0x44, 0xfe, 0xd1, 0x74, 0x52, 0x6d,
+	0x53, 0x8c, 0xcc, 0xb1, 0xe8, 0x63, 0x3f, 0xac, 0x17, 0xa8, 0x9b, 0x9f, 0xcc, 0x64, 0xb6, 0x51,
+	0x41, 0x7d, 0x1b, 0x5f, 0xff, 0x53, 0x80, 0xe4, 0x80, 0xf5, 0x48, 0x81, 0x78, 0x6d, 0x1a, 0x7e,
+	0x81, 0x20, 0xcf, 0xe8, 0x0c, 0x96, 0x3d, 0xf3, 0x70, 0xe9, 0x45, 0x2a, 0xfd, 0xd6, 0x6c, 0x9e,
+	0xf1, 0xd6, 0x41, 0x2d, 0x96, 0x5a, 0xc1, 0xbd, 0xcc, 0x47, 0x80, 0x86, 0x0f, 0xcd, 0xa4, 0xd3,
+	0x7f, 0x23, 0x00, 0xbd, 0x0c, 0x43, 0xf7, 0x61, 0xd1, 0x71, 0xb1, 0xd5, 0xd0, 0x54, 0x0e, 0x8f,
+	0x92, 0x65, 0x59, 0x45, 0x65, 0x80, 0x33, 0x45, 0x35, 0x4d, 0xab, 0x71, 0x6e, 0x36, 0x79, 0xa4,
+	0xad, 0x87, 0xe8, 0xb3, 0x4b, 0x01, 0x7b, 0x66, 0x73, 0x77, 0x4e, 0x8e, 0x9f, 0x79, 0x0b, 0xb4,
+	0x03, 0x71, 0xc7, 0x52, 0xec, 0x0b, 0xca, 0xc4, 0xa2, 0xe3, 0xdb, 0x21, 0x4c, 0x75, 0x72, 0x9e,
+	0x11, 0xc5, 0x1c, 0xfe, 0x8c, 0x2a, 0x90, 0xb0, 0xae, 0x7b, 0x4c, 0xac, 0xda, 0x86, 0x55, 0x93,
+	0xda, 0x75, 0x80, 0x0b, 0x38, 0x9e, 0xb0, 0x6d, 0x43, 0xec, 0x4c, 0xbb, 0xc2, 0x94, 0x8a, 0xd5,
+	0xde, 0xf7, 0xc2, 0xd4, 0xd3, 0xae, 0x30, 0xe3, 0x59, 0x3c, 0x63, 0x8f, 0xe8, 0x23, 0x58, 0xb4,
+	0xb4, 0x36, 0xe5, 0x88, 0x52, 0x8e, 0x6f, 0x85, 0x89, 0xa3, 0xb5, 0x19, 0x45, 0xd4, 0xa2, 0x4f,
+	0xa8, 0x06, 0x4b, 0x4c, 0x25, 0xe7, 0x52, 0xa7, 0x3c, 0xac, 0xee, 0x6e, 0x4c, 0x63, 0xa0, 0xfa,
+	0xa5, 0xce, 0xc8, 0x12, 0x4e, 0x6f, 0x89, 0x0e, 0xfc, 0x1c, 0x62, 0xf5, 0xf6, 0xc3, 0xa9, 0xeb,
+	0xed, 0xc8, 0xa6, 0x50, 0x01, 0x70, 0x5a, 0x67, 0x58, 0xed, 0xea, 0x9a, 0xd1, 0x4e, 0xc7, 0xa7,
+	0x4a, 0xee, 0x3d, 0xb3, 0x59, 0xf7, 0x31, 0x72, 0x00, 0x8f, 0xf2, 0x70, 0xcf, 0xb2, 0xb1, 0x8d,
+	0x2f, 0xbb, 0x9a, 0xa3, 0xb9, 0xb8, 0xc1, 0x83, 0xcf, 0x49, 0xc3, 0xda, 0xfc, 0x7a, 0x5c, 0xbe,
+	0x1b, 0xfc, 0xb1, 0x4e, 0x23, 0xf1, 0x36, 0x19, 0x5c, 0x00, 0x88, 0x9d, 0x9b, 0xcd, 0x86, 0x7b,
+	0x6d, 0x61, 0xe9, 0x8f, 0x02, 0xbc, 0x35, 0xd4, 0x16, 0x46, 0x36, 0xfc, 0x15, 0x88, 0x9e, 0x6a,
+	0x58, 0x57, 0x59, 0x1e, 0xc7, 0x65, 0xbe, 0x42, 0x6b, 0x90, 0x50, 0xb1, 0xd3, 0xb2, 0x35, 0xcb,
+	0xf5, 0x86, 0x81, 0xb8, 0x1c, 0xdc, 0x42, 0x32, 0xc0, 0x95, 0xa2, 0x6b, 0x2a, 0x1d, 0x5b, 0x78,
+	0x84, 0xe6, 0xc3, 0x42, 0xc2, 0x93, 0xe5, 0xc4, 0x47, 0xca, 0x01, 0x16, 0xe9, 0xcf, 0x02, 0xdc,
+	0x1d, 0x71, 0x06, 0xed, 0x40, 0xc4, 0xc6, 0x6d, 0xfc, 0x8a, 0x77, 0x98, 0xb0, 0x36, 0x20, 0x93,
+	0xb3, 0x3d, 0xf8, 0xee, 0x9c, 0xcc, 0xe0, 0x68, 0x17, 0xa2, 0xd4, 0x60, 0xce, 0x94, 0xfd, 0xe4,
+	0x84, 0x1c, 0xee, 0x23, 0xe2, 0xf8, 0xc2, 0x5b, 0x90, 0xec, 0xc9, 0xcd, 0x8c, 0xfe, 0x01, 0x24,
+	0x07, 0x2e, 0x26, 0xe3, 0x14, 0xbd, 0x18, 0x3b, 0x69, 0x81, 0x9a, 0xd7, 0x5b, 0x4a, 0xef, 0x43,
+	0x72, 0x80, 0x9c, 0xb8, 0x82, 0x0b, 0xc7, 0xce, 0xf2, 0x95, 0xf4, 0xeb, 0x68, 0x6f, 0x98, 0x3b,
+	0xc0, 0xae, 0x42, 0xa4, 0x44, 0x19, 0x88, 0x79, 0xc3, 0x2e, 0xf7, 0xa7, 0xbf, 0x0e, 0x0e, 0x71,
+	0x62, 0xff, 0x10, 0x77, 0x02, 0xcb, 0x7c, 0x88, 0xf3, 0x5a, 0x36, 0xab, 0x51, 0xb9, 0xe9, 0xaa,
+	0xf7, 0xa1, 0x37, 0xa5, 0xca, 0x4b, 0x8c, 0xc6, 0x6b, 0x9a, 0x05, 0x88, 0xb4, 0x6d, 0xc5, 0x3a,
+	0xe3, 0x61, 0xf0, 0x68, 0xca, 0x49, 0xea, 0x05, 0xc1, 0xc8, 0x0c, 0x4a, 0x64, 0x53, 0xb1, 0x8e,
+	0x03, 0xb2, 0x45, 0x6e, 0x28, 0x1b, 0xa3, 0xf1, 0x64, 0xdb, 0x87, 0x88, 0xe3, 0x12, 0x33, 0x91,
+	0xaa, 0xb5, 0x1c, 0x5a, 0x22, 0x06, 0x2d, 0x9d, 0xad, 0x13, 0xb0, 0xcc, 0x38, 0x86, 0xa6, 0x83,
+	0xc5, 0xe1, 0xe9, 0xa0, 0xd1, 0x37, 0xc2, 0xb1, 0xba, 0xf4, 0xc3, 0x59, 0x2f, 0xf5, 0x93, 0x80,
+	0x57, 0xa8, 0x00, 0x25, 0x7a, 0x02, 0xe0, 0xb8, 0x8a, 0xed, 0xb2, 0x59, 0x3a, 0x1e, 0x3a, 0x4b,
+	0xc7, 0xe9, 0x69, 0x3a, 0x4a, 0x7f, 0x08, 0x31, 0x6c, 0xa8, 0x0c, 0x08, 0xa1, 0xc0, 0x45, 0x6c,
+	0xa8, 0x14, 0x16, 0xd0, 0xba, 0xdb, 0xd5, 0xd4, 0x74, 0xa2, 0x4f, 0xeb, 0xe3, 0xae, 0xa6, 0x66,
+	0x9e, 0x43, 0x72, 0x40, 0xe6, 0x99, 0x5a, 0xf5, 0x63, 0x88, 0x50, 0x3b, 0xa3, 0x04, 0x2c, 0x1e,
+	0x57, 0xf7, 0xab, 0x87, 0x9f, 0x54, 0x53, 0x73, 0x64, 0x51, 0x2b, 0x55, 0x8b, 0xe5, 0xea, 0x8b,
+	0x94, 0x40, 0x16, 0xf2, 0x71, 0xb5, 0x4a, 0x16, 0x22, 0x8a, 0xc1, 0x42, 0xf1, 0xb0, 0x5a, 0x4a,
+	0xcd, 0x4b, 0x0d, 0x48, 0x0d, 0x46, 0x00, 0x91, 0xd7, 0x7f, 0xa1, 0xea, 0xb5, 0xfb, 0x84, 0xbf,
+	0x57, 0x56, 0x89, 0x28, 0xd8, 0xb6, 0xf9, 0x60, 0x19, 0x97, 0xd9, 0x82, 0x54, 0x48, 0x95, 0x4c,
+	0x3c, 0x24, 0x2b, 0x62, 0x32, 0x7d, 0x96, 0x64, 0x58, 0xea, 0x8b, 0x57, 0xb4, 0x05, 0x11, 0xc3,
+	0x54, 0x79, 0x9a, 0x26, 0xf2, 0x1f, 0x4c, 0xe9, 0xdb, 0xaa, 0xa9, 0x62, 0x99, 0x21, 0xa5, 0xbf,
+	0x88, 0x70, 0x27, 0xb8, 0x3f, 0x7e, 0x36, 0x19, 0xdb, 0x44, 0xc4, 0xb1, 0x4d, 0x04, 0xdd, 0x83,
+	0x28, 0xe9, 0x04, 0x9a, 0xca, 0xcb, 0x76, 0xe4, 0xdc, 0x6c, 0x96, 0xd5, 0x5e, 0x22, 0x44, 0x66,
+	0x4a, 0x04, 0x22, 0x5f, 0x96, 0xfc, 0xe9, 0x4b, 0x04, 0xdf, 0x7e, 0xd1, 0x80, 0xfd, 0xa4, 0x0b,
+	0x88, 0xfb, 0x27, 0xd1, 0x03, 0xb8, 0x5f, 0x3d, 0x2c, 0x96, 0x1a, 0xf5, 0xa3, 0xad, 0xa3, 0xe3,
+	0x7a, 0xe3, 0xb8, 0x5a, 0xaf, 0x95, 0xb6, 0xcb, 0x3b, 0xe5, 0x52, 0x91, 0xb9, 0xb6, 0x50, 0x39,
+	0xdc, 0xde, 0x2f, 0x15, 0x53, 0x02, 0xba, 0x03, 0x31, 0xe2, 0xda, 0xad, 0x42, 0xa5, 0x94, 0x12,
+	0x83, 0x8e, 0x9e, 0x47, 0x4b, 0x10, 0xdf, 0x3e, 0x3c, 0xa8, 0x55, 0x4a, 0x47, 0xa5, 0x62, 0x6a,
+	0x01, 0x01, 0x44, 0x77, 0xb6, 0xca, 0x95, 0x52, 0x31, 0x15, 0x91, 0x3e, 0x17, 0x60, 0x75, 0x9b,
+	0x96, 0xa1, 0xc1, 0x97, 0x14, 0x19, 0x5f, 0x76, 0xb1, 0xe3, 0x92, 0x8a, 0x6a, 0x29, 0x36, 0x79,
+	0xc3, 0xe3, 0x46, 0x65, 0x2b, 0xb4, 0x1f, 0x28, 0x9e, 0xe2, 0x54, 0x45, 0x66, 0xe8, 0x06, 0x9f,
+	0x40, 0xda, 0x83, 0xcc, 0x0b, 0xec, 0x8e, 0x13, 0x21, 0xe4, 0x25, 0xbb, 0xbf, 0x3e, 0x4b, 0x7f,
+	0x17, 0x41, 0x2a, 0x1b, 0x8e, 0xab, 0x18, 0xae, 0x36, 0x41, 0xaf, 0x99, 0x48, 0xd1, 0xbb, 0x90,
+	0xd0, 0x28, 0x67, 0x0b, 0xfb, 0x31, 0x51, 0x10, 0xd3, 0x82, 0x0c, 0xde, 0x76, 0x59, 0x45, 0xab,
+	0x00, 0x36, 0x63, 0x27, 0x67, 0x22, 0x94, 0x38, 0xce, 0x77, 0xca, 0x2a, 0xba, 0xec, 0x2b, 0x6a,
+	0xec, 0x85, 0xe5, 0xe3, 0x10, 0x9b, 0x85, 0x2b, 0x32, 0xa9, 0xcc, 0xdd, 0xb6, 0xa2, 0xfc, 0x43,
+	0x80, 0xf5, 0x80, 0x04, 0x65, 0x43, 0xd7, 0x8c, 0xaf, 0x35, 0x50, 0xd0, 0x3b, 0x23, 0xfc, 0x30,
+	0xc1, 0x07, 0x0b, 0x03, 0x3e, 0x90, 0x74, 0x58, 0x3d, 0xa6, 0x5f, 0x45, 0xc6, 0x69, 0xb1, 0x3f,
+	0x30, 0x13, 0xdc, 0x2a, 0xac, 0x6d, 0x78, 0xbb, 0xa2, 0x39, 0x43, 0x71, 0xed, 0x84, 0x99, 0xec,
+	0x01, 0xc4, 0x2d, 0xa5, 0x8d, 0x1b, 0x8e, 0xf6, 0x1a, 0xf3, 0x48, 0x8c, 0x91, 0x8d, 0xba, 0xf6,
+	0x1a, 0x13, 0x0d, 0xe9, 0x8f, 0xae, 0x79, 0x81, 0xbd, 0xa1, 0x92, 0x1e, 0x3f, 0x22, 0x1b, 0xd2,
+	0x97, 0x02, 0xac, 0x8e, 0xb9, 0xd4, 0xb1, 0x4c, 0xc3, 0xc1, 0xe8, 0x00, 0xe2, 0xfe, 0x37, 0x3e,
+	0x5e, 0x7f, 0x67, 0xd6, 0xb1, 0xc7, 0x80, 0xde, 0x83, 0xa4, 0x81, 0x5f, 0xb9, 0x8d, 0x80, 0x50,
+	0x2c, 0x90, 0x96, 0xc8, 0x76, 0xcd, 0x17, 0xec, 0x00, 0x56, 0x8b, 0x74, 0xa8, 0xf8, 0xbf, 0x64,
+	0x64, 0xfe, 0x4d, 0x12, 0xee, 0x0f, 0x32, 0xd5, 0xb1, 0x7d, 0xa5, 0xb5, 0x30, 0xfa, 0x4a, 0x84,
+	0x95, 0xd1, 0x55, 0x0d, 0x3d, 0x0b, 0x9b, 0x84, 0x26, 0x15, 0xc3, 0xcc, 0xac, 0x76, 0x92, 0xbe,
+	0x10, 0x7e, 0xfe, 0xaf, 0x7f, 0x7f, 0x21, 0xfe, 0x52, 0x90, 0x1e, 0xfb, 0x9f, 0x31, 0x7f, 0xc2,
+	0xbc, 0xfc, 0xdc, 0xb2, 0xcd, 0x73, 0xdc, 0x72, 0x9d, 0xdc, 0x46, 0xce, 0xc6, 0x6d, 0xcd, 0x34,
+	0x9c, 0xdc, 0xc6, 0x67, 0xfe, 0x77, 0x58, 0xdf, 0x6f, 0x9b, 0x7e, 0x3c, 0xbd, 0xdc, 0x91, 0x36,
+	0x27, 0xb1, 0xe8, 0x66, 0x8b, 0x7d, 0xff, 0x0c, 0xe1, 0x41, 0x3f, 0x13, 0xe1, 0xee, 0x88, 0x7a,
+	0x8b, 0xc2, 0x3e, 0x9f, 0x8c, 0xaf, 0xd1, 0xb3, 0x5b, 0xe6, 0xa7, 0xd4, 0x30, 0xaf, 0x50, 0xc0,
+	0x2e, 0xc4, 0xe3, 0x23, 0xad, 0x32, 0xac, 0x4c, 0x6e, 0xe3, 0xb3, 0x97, 0xcf, 0xd0, 0xe6, 0x78,
+	0x6c, 0xc0, 0x16, 0x23, 0xd1, 0xe8, 0xb7, 0x22, 0x3c, 0x98, 0x50, 0x5d, 0xd1, 0xd6, 0xad, 0x2b,
+	0x73, 0x66, 0xd5, 0xa3, 0x08, 0x7c, 0xa5, 0xce, 0xfa, 0x13, 0x96, 0xf4, 0x15, 0x8b, 0x8d, 0x2f,
+	0x05, 0xa9, 0x78, 0x53, 0x1b, 0x6c, 0x6a, 0x3d, 0x29, 0x36, 0x85, 0x8d, 0x97, 0xfb, 0xd2, 0xce,
+	0xcd, 0x4d, 0x32, 0x40, 0x86, 0xfe, 0x26, 0xc2, 0xc3, 0xd0, 0xea, 0x8f, 0x5e, 0x4c, 0x6f, 0xa7,
+	0x89, 0xfd, 0x23, 0xcc, 0x5a, 0x7f, 0x62, 0xd6, 0xfa, 0x83, 0x20, 0x55, 0x6e, 0x91, 0x03, 0xda,
+	0xa0, 0x34, 0x81, 0xec, 0x3a, 0x91, 0xf6, 0x6e, 0x9c, 0xa3, 0x13, 0x78, 0xd1, 0xef, 0x45, 0x58,
+	0x19, 0xdd, 0x74, 0x42, 0xab, 0xd1, 0xc4, 0x5e, 0x35, 0x7b, 0xce, 0xfd, 0x8e, 0xd9, 0xf0, 0x37,
+	0x42, 0x66, 0xab, 0xa7, 0xa9, 0x27, 0x67, 0x76, 0xc6, 0xd0, 0xeb, 0x19, 0xee, 0x30, 0xb3, 0x3d,
+	0x05, 0x5d, 0x68, 0xf8, 0xf5, 0x2c, 0xf6, 0x2b, 0x11, 0xee, 0x8d, 0xec, 0x61, 0x28, 0xec, 0xff,
+	0x16, 0x93, 0xda, 0x6d, 0xe6, 0xd9, 0xcd, 0xc0, 0xac, 0x6d, 0x8e, 0x2a, 0x58, 0xb3, 0x05, 0x49,
+	0x7f, 0xc1, 0x9a, 0x35, 0x74, 0xd1, 0x7f, 0x04, 0x58, 0x19, 0xdd, 0x40, 0x43, 0xc3, 0x68, 0x62,
+	0xdf, 0xcd, 0xac, 0x0c, 0xbd, 0xbe, 0x96, 0x3a, 0x96, 0x7b, 0xed, 0x29, 0xbc, 0x71, 0x8b, 0x0a,
+	0xbd, 0x71, 0x8b, 0x0a, 0x5d, 0xf8, 0x5c, 0x80, 0x87, 0x2d, 0xb3, 0x33, 0x59, 0xb7, 0xc2, 0xca,
+	0x90, 0xc7, 0x6a, 0x44, 0x8d, 0x9a, 0xf0, 0xb2, 0xc4, 0x81, 0x6d, 0x53, 0x57, 0x8c, 0x76, 0xd6,
+	0xb4, 0xdb, 0xb9, 0x36, 0x36, 0xa8, 0x92, 0x39, 0xf6, 0x93, 0x62, 0x69, 0xce, 0x98, 0x7f, 0x36,
+	0x3e, 0xf5, 0x36, 0x9a, 0x51, 0x8a, 0xf8, 0xfe, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x16, 0x05,
+	0x09, 0xf3, 0x40, 0x1d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2403,139 +2294,3 @@ var _WorkflowTemplateService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dataproc/v1beta2/workflow_templates.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1beta2/workflow_templates.proto", fileDescriptor_workflow_templates_fbee3ed8540fe470)
-}
-
-var fileDescriptor_workflow_templates_fbee3ed8540fe470 = []byte{
-	// 2038 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0x58,
-	0x1d, 0xaf, 0xdd, 0x26, 0x4d, 0xbe, 0x99, 0x36, 0xd9, 0x37, 0x4c, 0x27, 0x64, 0xb6, 0xda, 0x8e,
-	0x57, 0x2c, 0xdd, 0xee, 0x90, 0x40, 0xd0, 0xa2, 0x99, 0xce, 0x8c, 0xd8, 0xa6, 0x49, 0xa7, 0x69,
-	0xd3, 0x34, 0xeb, 0xb4, 0x5d, 0x34, 0x1c, 0x22, 0x27, 0x7e, 0x4d, 0xdd, 0x3a, 0xb6, 0x6b, 0x3b,
-	0xdd, 0xe9, 0xa0, 0x45, 0x02, 0xad, 0xc4, 0x85, 0x13, 0x2b, 0xed, 0x05, 0x2d, 0x9c, 0x38, 0xc3,
-	0x05, 0x21, 0x71, 0x04, 0x21, 0x71, 0x43, 0x88, 0x3f, 0x60, 0x2e, 0x9c, 0xb9, 0x72, 0x45, 0xef,
-	0x87, 0x1d, 0xe7, 0xa7, 0x93, 0x16, 0x69, 0x2f, 0x95, 0xdf, 0xcb, 0xfb, 0x7c, 0xde, 0xf7, 0xf7,
-	0xf7, 0x6b, 0x17, 0x7e, 0xd0, 0x36, 0xcd, 0xb6, 0x8e, 0x73, 0x2d, 0xdd, 0xec, 0xaa, 0x39, 0x55,
-	0x71, 0x15, 0xcb, 0x36, 0x5b, 0xb9, 0xab, 0xef, 0x35, 0xb1, 0xab, 0xe4, 0x73, 0x9f, 0x9a, 0xf6,
-	0xc5, 0xa9, 0x6e, 0x7e, 0xda, 0x70, 0x71, 0xc7, 0xd2, 0x15, 0x17, 0x3b, 0x59, 0xcb, 0x36, 0x5d,
-	0x13, 0xad, 0x32, 0x5c, 0x96, 0xe2, 0xb2, 0x1e, 0x2e, 0xcb, 0x71, 0x99, 0xb7, 0x39, 0xad, 0x62,
-	0x69, 0x39, 0xc5, 0x30, 0x4c, 0x57, 0x71, 0x35, 0xd3, 0xe0, 0xe0, 0xcc, 0xa3, 0xc9, 0x97, 0xb6,
-	0xf4, 0xae, 0xe3, 0x62, 0xdb, 0x3b, 0xbd, 0x3e, 0xf9, 0xf4, 0xb9, 0xd9, 0xf4, 0x4e, 0xbe, 0xcb,
-	0x4f, 0xea, 0xa6, 0xd1, 0xb6, 0xbb, 0x86, 0xa1, 0x19, 0xed, 0x9c, 0x69, 0x61, 0xbb, 0xef, 0xf2,
-	0x07, 0xfc, 0x10, 0x5d, 0x35, 0xbb, 0xa7, 0x39, 0xdc, 0xb1, 0xdc, 0x6b, 0xfe, 0xe3, 0x3b, 0x83,
-	0x3f, 0xba, 0x5a, 0x07, 0x3b, 0xae, 0xd2, 0xb1, 0xd8, 0x01, 0xe9, 0xaf, 0x0b, 0x90, 0xfa, 0x84,
-	0x1b, 0xe5, 0x88, 0xdb, 0x04, 0x2d, 0x83, 0xa8, 0xa9, 0x69, 0x71, 0x4d, 0x58, 0x8f, 0xcb, 0xa2,
-	0xa6, 0x22, 0x04, 0x0b, 0x86, 0xd2, 0xc1, 0x69, 0x81, 0xee, 0xd0, 0x67, 0x94, 0x86, 0xc5, 0x2b,
-	0x6c, 0x3b, 0x9a, 0x69, 0xa4, 0xe7, 0xd7, 0x84, 0xf5, 0x88, 0xec, 0x2d, 0xd1, 0x53, 0x48, 0xb4,
-	0x6c, 0xac, 0xb8, 0xb8, 0x41, 0x2e, 0x4b, 0x2f, 0xac, 0x09, 0xeb, 0x89, 0x7c, 0x26, 0xcb, 0x0d,
-	0xec, 0x49, 0x92, 0x3d, 0xf2, 0x24, 0x91, 0x81, 0x1d, 0x27, 0x1b, 0x04, 0xdc, 0xb5, 0x54, 0x1f,
-	0x1c, 0x09, 0x07, 0xb3, 0xe3, 0x14, 0x5c, 0x87, 0xa8, 0xae, 0x34, 0xb1, 0xee, 0xa4, 0xa3, 0x6b,
-	0xf3, 0xeb, 0x89, 0xfc, 0xd3, 0xec, 0x44, 0xaf, 0x66, 0x07, 0x15, 0xcf, 0x56, 0x28, 0xba, 0x64,
-	0xb8, 0xf6, 0xb5, 0xcc, 0xa9, 0xd0, 0x09, 0xc4, 0x2d, 0x5d, 0x69, 0xe1, 0x0e, 0x36, 0xdc, 0xf4,
-	0x22, 0x95, 0xe7, 0xf1, 0x8c, 0xbc, 0x35, 0x0f, 0x2f, 0xf7, 0xa8, 0xd0, 0x73, 0x58, 0x20, 0xae,
-	0x4e, 0xc7, 0xa8, 0xa8, 0xef, 0x87, 0x50, 0x1e, 0xda, 0x2a, 0xb6, 0xb1, 0xba, 0x67, 0x36, 0x65,
-	0x0a, 0x43, 0x35, 0x00, 0x4b, 0xb1, 0x95, 0x0e, 0x26, 0x91, 0x95, 0x8e, 0x53, 0x92, 0xef, 0x86,
-	0x90, 0xf8, 0xf2, 0x78, 0x40, 0x39, 0xc0, 0x91, 0x79, 0x02, 0x89, 0x80, 0xfe, 0x28, 0x05, 0xf3,
-	0x17, 0xf8, 0x9a, 0xfb, 0x9c, 0x3c, 0xa2, 0x6f, 0x40, 0xe4, 0x4a, 0xd1, 0xbb, 0x98, 0x47, 0x06,
-	0x5b, 0x6c, 0x8a, 0x8f, 0x05, 0xe9, 0x8d, 0x00, 0xdf, 0x1c, 0xab, 0x34, 0xfa, 0x11, 0x24, 0x3b,
-	0x8a, 0xa1, 0xb4, 0xb1, 0xda, 0xe0, 0xa9, 0x40, 0x59, 0x13, 0xf9, 0xef, 0x84, 0xc8, 0x7b, 0xc0,
-	0x50, 0xdb, 0x0c, 0xb4, 0x3b, 0x27, 0x2f, 0x77, 0xfa, 0x76, 0xd0, 0x8f, 0x21, 0xc5, 0x19, 0x1b,
-	0x0e, 0xd6, 0x71, 0xcb, 0x35, 0x6d, 0x2a, 0x5c, 0x22, 0x9f, 0x0d, 0xa1, 0xe6, 0x0c, 0x75, 0x8e,
-	0xda, 0x9d, 0x93, 0x93, 0xad, 0xfe, 0xad, 0x42, 0x22, 0xe0, 0x78, 0xe9, 0x17, 0x22, 0x2c, 0xf7,
-	0x8b, 0x83, 0x1e, 0xc2, 0x1d, 0xef, 0x72, 0x9a, 0x1d, 0xcc, 0x2a, 0x09, 0xbe, 0x57, 0x25, 0x49,
-	0x52, 0x84, 0x68, 0xcb, 0x34, 0x4e, 0xb5, 0x36, 0xcd, 0x91, 0x44, 0xfe, 0xd1, 0x74, 0x52, 0x6d,
-	0x53, 0x8c, 0xcc, 0xb1, 0xe8, 0x63, 0x3f, 0xac, 0x17, 0xa8, 0x9b, 0x9f, 0xcc, 0x64, 0xb6, 0x51,
-	0x41, 0x7d, 0x1b, 0x5f, 0xff, 0x53, 0x80, 0xe4, 0x80, 0xf5, 0x48, 0x81, 0x78, 0x6d, 0x1a, 0x7e,
-	0x81, 0x20, 0xcf, 0xe8, 0x0c, 0x96, 0x3d, 0xf3, 0x70, 0xe9, 0x45, 0x2a, 0xfd, 0xd6, 0x6c, 0x9e,
-	0xf1, 0xd6, 0x41, 0x2d, 0x96, 0x5a, 0xc1, 0xbd, 0xcc, 0x47, 0x80, 0x86, 0x0f, 0xcd, 0xa4, 0xd3,
-	0x7f, 0x23, 0x00, 0xbd, 0x0c, 0x43, 0xf7, 0x61, 0xd1, 0x71, 0xb1, 0xd5, 0xd0, 0x54, 0x0e, 0x8f,
-	0x92, 0x65, 0x59, 0x45, 0x65, 0x80, 0x33, 0x45, 0x35, 0x4d, 0xab, 0x71, 0x6e, 0x36, 0x79, 0xa4,
-	0xad, 0x87, 0xe8, 0xb3, 0x4b, 0x01, 0x7b, 0x66, 0x73, 0x77, 0x4e, 0x8e, 0x9f, 0x79, 0x0b, 0xb4,
-	0x03, 0x71, 0xc7, 0x52, 0xec, 0x0b, 0xca, 0xc4, 0xa2, 0xe3, 0xdb, 0x21, 0x4c, 0x75, 0x72, 0x9e,
-	0x11, 0xc5, 0x1c, 0xfe, 0x8c, 0x2a, 0x90, 0xb0, 0xae, 0x7b, 0x4c, 0xac, 0xda, 0x86, 0x55, 0x93,
-	0xda, 0x75, 0x80, 0x0b, 0x38, 0x9e, 0xb0, 0x6d, 0x43, 0xec, 0x4c, 0xbb, 0xc2, 0x94, 0x8a, 0xd5,
-	0xde, 0xf7, 0xc2, 0xd4, 0xd3, 0xae, 0x30, 0xe3, 0x59, 0x3c, 0x63, 0x8f, 0xe8, 0x23, 0x58, 0xb4,
-	0xb4, 0x36, 0xe5, 0x88, 0x52, 0x8e, 0x6f, 0x85, 0x89, 0xa3, 0xb5, 0x19, 0x45, 0xd4, 0xa2, 0x4f,
-	0xa8, 0x06, 0x4b, 0x4c, 0x25, 0xe7, 0x52, 0xa7, 0x3c, 0xac, 0xee, 0x6e, 0x4c, 0x63, 0xa0, 0xfa,
-	0xa5, 0xce, 0xc8, 0x12, 0x4e, 0x6f, 0x89, 0x0e, 0xfc, 0x1c, 0x62, 0xf5, 0xf6, 0xc3, 0xa9, 0xeb,
-	0xed, 0xc8, 0xa6, 0x50, 0x01, 0x70, 0x5a, 0x67, 0x58, 0xed, 0xea, 0x9a, 0xd1, 0x4e, 0xc7, 0xa7,
-	0x4a, 0xee, 0x3d, 0xb3, 0x59, 0xf7, 0x31, 0x72, 0x00, 0x8f, 0xf2, 0x70, 0xcf, 0xb2, 0xb1, 0x8d,
-	0x2f, 0xbb, 0x9a, 0xa3, 0xb9, 0xb8, 0xc1, 0x83, 0xcf, 0x49, 0xc3, 0xda, 0xfc, 0x7a, 0x5c, 0xbe,
-	0x1b, 0xfc, 0xb1, 0x4e, 0x23, 0xf1, 0x36, 0x19, 0x5c, 0x00, 0x88, 0x9d, 0x9b, 0xcd, 0x86, 0x7b,
-	0x6d, 0x61, 0xe9, 0x8f, 0x02, 0xbc, 0x35, 0xd4, 0x16, 0x46, 0x36, 0xfc, 0x15, 0x88, 0x9e, 0x6a,
-	0x58, 0x57, 0x59, 0x1e, 0xc7, 0x65, 0xbe, 0x42, 0x6b, 0x90, 0x50, 0xb1, 0xd3, 0xb2, 0x35, 0xcb,
-	0xf5, 0x86, 0x81, 0xb8, 0x1c, 0xdc, 0x42, 0x32, 0xc0, 0x95, 0xa2, 0x6b, 0x2a, 0x1d, 0x5b, 0x78,
-	0x84, 0xe6, 0xc3, 0x42, 0xc2, 0x93, 0xe5, 0xc4, 0x47, 0xca, 0x01, 0x16, 0xe9, 0xcf, 0x02, 0xdc,
-	0x1d, 0x71, 0x06, 0xed, 0x40, 0xc4, 0xc6, 0x6d, 0xfc, 0x8a, 0x77, 0x98, 0xb0, 0x36, 0x20, 0x93,
-	0xb3, 0x3d, 0xf8, 0xee, 0x9c, 0xcc, 0xe0, 0x68, 0x17, 0xa2, 0xd4, 0x60, 0xce, 0x94, 0xfd, 0xe4,
-	0x84, 0x1c, 0xee, 0x23, 0xe2, 0xf8, 0xc2, 0x5b, 0x90, 0xec, 0xc9, 0xcd, 0x8c, 0xfe, 0x01, 0x24,
-	0x07, 0x2e, 0x26, 0xe3, 0x14, 0xbd, 0x18, 0x3b, 0x69, 0x81, 0x9a, 0xd7, 0x5b, 0x4a, 0xef, 0x43,
-	0x72, 0x80, 0x9c, 0xb8, 0x82, 0x0b, 0xc7, 0xce, 0xf2, 0x95, 0xf4, 0xeb, 0x68, 0x6f, 0x98, 0x3b,
-	0xc0, 0xae, 0x42, 0xa4, 0x44, 0x19, 0x88, 0x79, 0xc3, 0x2e, 0xf7, 0xa7, 0xbf, 0x0e, 0x0e, 0x71,
-	0x62, 0xff, 0x10, 0x77, 0x02, 0xcb, 0x7c, 0x88, 0xf3, 0x5a, 0x36, 0xab, 0x51, 0xb9, 0xe9, 0xaa,
-	0xf7, 0xa1, 0x37, 0xa5, 0xca, 0x4b, 0x8c, 0xc6, 0x6b, 0x9a, 0x05, 0x88, 0xb4, 0x6d, 0xc5, 0x3a,
-	0xe3, 0x61, 0xf0, 0x68, 0xca, 0x49, 0xea, 0x05, 0xc1, 0xc8, 0x0c, 0x4a, 0x64, 0x53, 0xb1, 0x8e,
-	0x03, 0xb2, 0x45, 0x6e, 0x28, 0x1b, 0xa3, 0xf1, 0x64, 0xdb, 0x87, 0x88, 0xe3, 0x12, 0x33, 0x91,
-	0xaa, 0xb5, 0x1c, 0x5a, 0x22, 0x06, 0x2d, 0x9d, 0xad, 0x13, 0xb0, 0xcc, 0x38, 0x86, 0xa6, 0x83,
-	0xc5, 0xe1, 0xe9, 0xa0, 0xd1, 0x37, 0xc2, 0xb1, 0xba, 0xf4, 0xc3, 0x59, 0x2f, 0xf5, 0x93, 0x80,
-	0x57, 0xa8, 0x00, 0x25, 0x7a, 0x02, 0xe0, 0xb8, 0x8a, 0xed, 0xb2, 0x59, 0x3a, 0x1e, 0x3a, 0x4b,
-	0xc7, 0xe9, 0x69, 0x3a, 0x4a, 0x7f, 0x08, 0x31, 0x6c, 0xa8, 0x0c, 0x08, 0xa1, 0xc0, 0x45, 0x6c,
-	0xa8, 0x14, 0x16, 0xd0, 0xba, 0xdb, 0xd5, 0xd4, 0x74, 0xa2, 0x4f, 0xeb, 0xe3, 0xae, 0xa6, 0x66,
-	0x9e, 0x43, 0x72, 0x40, 0xe6, 0x99, 0x5a, 0xf5, 0x63, 0x88, 0x50, 0x3b, 0xa3, 0x04, 0x2c, 0x1e,
-	0x57, 0xf7, 0xab, 0x87, 0x9f, 0x54, 0x53, 0x73, 0x64, 0x51, 0x2b, 0x55, 0x8b, 0xe5, 0xea, 0x8b,
-	0x94, 0x40, 0x16, 0xf2, 0x71, 0xb5, 0x4a, 0x16, 0x22, 0x8a, 0xc1, 0x42, 0xf1, 0xb0, 0x5a, 0x4a,
-	0xcd, 0x4b, 0x0d, 0x48, 0x0d, 0x46, 0x00, 0x91, 0xd7, 0x7f, 0xa1, 0xea, 0xb5, 0xfb, 0x84, 0xbf,
-	0x57, 0x56, 0x89, 0x28, 0xd8, 0xb6, 0xf9, 0x60, 0x19, 0x97, 0xd9, 0x82, 0x54, 0x48, 0x95, 0x4c,
-	0x3c, 0x24, 0x2b, 0x62, 0x32, 0x7d, 0x96, 0x64, 0x58, 0xea, 0x8b, 0x57, 0xb4, 0x05, 0x11, 0xc3,
-	0x54, 0x79, 0x9a, 0x26, 0xf2, 0x1f, 0x4c, 0xe9, 0xdb, 0xaa, 0xa9, 0x62, 0x99, 0x21, 0xa5, 0xbf,
-	0x88, 0x70, 0x27, 0xb8, 0x3f, 0x7e, 0x36, 0x19, 0xdb, 0x44, 0xc4, 0xb1, 0x4d, 0x04, 0xdd, 0x83,
-	0x28, 0xe9, 0x04, 0x9a, 0xca, 0xcb, 0x76, 0xe4, 0xdc, 0x6c, 0x96, 0xd5, 0x5e, 0x22, 0x44, 0x66,
-	0x4a, 0x04, 0x22, 0x5f, 0x96, 0xfc, 0xe9, 0x4b, 0x04, 0xdf, 0x7e, 0xd1, 0x80, 0xfd, 0xa4, 0x0b,
-	0x88, 0xfb, 0x27, 0xd1, 0x03, 0xb8, 0x5f, 0x3d, 0x2c, 0x96, 0x1a, 0xf5, 0xa3, 0xad, 0xa3, 0xe3,
-	0x7a, 0xe3, 0xb8, 0x5a, 0xaf, 0x95, 0xb6, 0xcb, 0x3b, 0xe5, 0x52, 0x91, 0xb9, 0xb6, 0x50, 0x39,
-	0xdc, 0xde, 0x2f, 0x15, 0x53, 0x02, 0xba, 0x03, 0x31, 0xe2, 0xda, 0xad, 0x42, 0xa5, 0x94, 0x12,
-	0x83, 0x8e, 0x9e, 0x47, 0x4b, 0x10, 0xdf, 0x3e, 0x3c, 0xa8, 0x55, 0x4a, 0x47, 0xa5, 0x62, 0x6a,
-	0x01, 0x01, 0x44, 0x77, 0xb6, 0xca, 0x95, 0x52, 0x31, 0x15, 0x91, 0x3e, 0x17, 0x60, 0x75, 0x9b,
-	0x96, 0xa1, 0xc1, 0x97, 0x14, 0x19, 0x5f, 0x76, 0xb1, 0xe3, 0x92, 0x8a, 0x6a, 0x29, 0x36, 0x79,
-	0xc3, 0xe3, 0x46, 0x65, 0x2b, 0xb4, 0x1f, 0x28, 0x9e, 0xe2, 0x54, 0x45, 0x66, 0xe8, 0x06, 0x9f,
-	0x40, 0xda, 0x83, 0xcc, 0x0b, 0xec, 0x8e, 0x13, 0x21, 0xe4, 0x25, 0xbb, 0xbf, 0x3e, 0x4b, 0x7f,
-	0x17, 0x41, 0x2a, 0x1b, 0x8e, 0xab, 0x18, 0xae, 0x36, 0x41, 0xaf, 0x99, 0x48, 0xd1, 0xbb, 0x90,
-	0xd0, 0x28, 0x67, 0x0b, 0xfb, 0x31, 0x51, 0x10, 0xd3, 0x82, 0x0c, 0xde, 0x76, 0x59, 0x45, 0xab,
-	0x00, 0x36, 0x63, 0x27, 0x67, 0x22, 0x94, 0x38, 0xce, 0x77, 0xca, 0x2a, 0xba, 0xec, 0x2b, 0x6a,
-	0xec, 0x85, 0xe5, 0xe3, 0x10, 0x9b, 0x85, 0x2b, 0x32, 0xa9, 0xcc, 0xdd, 0xb6, 0xa2, 0xfc, 0x43,
-	0x80, 0xf5, 0x80, 0x04, 0x65, 0x43, 0xd7, 0x8c, 0xaf, 0x35, 0x50, 0xd0, 0x3b, 0x23, 0xfc, 0x30,
-	0xc1, 0x07, 0x0b, 0x03, 0x3e, 0x90, 0x74, 0x58, 0x3d, 0xa6, 0x5f, 0x45, 0xc6, 0x69, 0xb1, 0x3f,
-	0x30, 0x13, 0xdc, 0x2a, 0xac, 0x6d, 0x78, 0xbb, 0xa2, 0x39, 0x43, 0x71, 0xed, 0x84, 0x99, 0xec,
-	0x01, 0xc4, 0x2d, 0xa5, 0x8d, 0x1b, 0x8e, 0xf6, 0x1a, 0xf3, 0x48, 0x8c, 0x91, 0x8d, 0xba, 0xf6,
-	0x1a, 0x13, 0x0d, 0xe9, 0x8f, 0xae, 0x79, 0x81, 0xbd, 0xa1, 0x92, 0x1e, 0x3f, 0x22, 0x1b, 0xd2,
-	0x97, 0x02, 0xac, 0x8e, 0xb9, 0xd4, 0xb1, 0x4c, 0xc3, 0xc1, 0xe8, 0x00, 0xe2, 0xfe, 0x37, 0x3e,
-	0x5e, 0x7f, 0x67, 0xd6, 0xb1, 0xc7, 0x80, 0xde, 0x83, 0xa4, 0x81, 0x5f, 0xb9, 0x8d, 0x80, 0x50,
-	0x2c, 0x90, 0x96, 0xc8, 0x76, 0xcd, 0x17, 0xec, 0x00, 0x56, 0x8b, 0x74, 0xa8, 0xf8, 0xbf, 0x64,
-	0x64, 0xfe, 0x4d, 0x12, 0xee, 0x0f, 0x32, 0xd5, 0xb1, 0x7d, 0xa5, 0xb5, 0x30, 0xfa, 0x4a, 0x84,
-	0x95, 0xd1, 0x55, 0x0d, 0x3d, 0x0b, 0x9b, 0x84, 0x26, 0x15, 0xc3, 0xcc, 0xac, 0x76, 0x92, 0xbe,
-	0x10, 0x7e, 0xfe, 0xaf, 0x7f, 0x7f, 0x21, 0xfe, 0x52, 0x90, 0x1e, 0xfb, 0x9f, 0x31, 0x7f, 0xc2,
-	0xbc, 0xfc, 0xdc, 0xb2, 0xcd, 0x73, 0xdc, 0x72, 0x9d, 0xdc, 0x46, 0xce, 0xc6, 0x6d, 0xcd, 0x34,
-	0x9c, 0xdc, 0xc6, 0x67, 0xfe, 0x77, 0x58, 0xdf, 0x6f, 0x9b, 0x7e, 0x3c, 0xbd, 0xdc, 0x91, 0x36,
-	0x27, 0xb1, 0xe8, 0x66, 0x8b, 0x7d, 0xff, 0x0c, 0xe1, 0x41, 0x3f, 0x13, 0xe1, 0xee, 0x88, 0x7a,
-	0x8b, 0xc2, 0x3e, 0x9f, 0x8c, 0xaf, 0xd1, 0xb3, 0x5b, 0xe6, 0xa7, 0xd4, 0x30, 0xaf, 0x50, 0xc0,
-	0x2e, 0xc4, 0xe3, 0x23, 0xad, 0x32, 0xac, 0x4c, 0x6e, 0xe3, 0xb3, 0x97, 0xcf, 0xd0, 0xe6, 0x78,
-	0x6c, 0xc0, 0x16, 0x23, 0xd1, 0xe8, 0xb7, 0x22, 0x3c, 0x98, 0x50, 0x5d, 0xd1, 0xd6, 0xad, 0x2b,
-	0x73, 0x66, 0xd5, 0xa3, 0x08, 0x7c, 0xa5, 0xce, 0xfa, 0x13, 0x96, 0xf4, 0x15, 0x8b, 0x8d, 0x2f,
-	0x05, 0xa9, 0x78, 0x53, 0x1b, 0x6c, 0x6a, 0x3d, 0x29, 0x36, 0x85, 0x8d, 0x97, 0xfb, 0xd2, 0xce,
-	0xcd, 0x4d, 0x32, 0x40, 0x86, 0xfe, 0x26, 0xc2, 0xc3, 0xd0, 0xea, 0x8f, 0x5e, 0x4c, 0x6f, 0xa7,
-	0x89, 0xfd, 0x23, 0xcc, 0x5a, 0x7f, 0x62, 0xd6, 0xfa, 0x83, 0x20, 0x55, 0x6e, 0x91, 0x03, 0xda,
-	0xa0, 0x34, 0x81, 0xec, 0x3a, 0x91, 0xf6, 0x6e, 0x9c, 0xa3, 0x13, 0x78, 0xd1, 0xef, 0x45, 0x58,
-	0x19, 0xdd, 0x74, 0x42, 0xab, 0xd1, 0xc4, 0x5e, 0x35, 0x7b, 0xce, 0xfd, 0x8e, 0xd9, 0xf0, 0x37,
-	0x42, 0x66, 0xab, 0xa7, 0xa9, 0x27, 0x67, 0x76, 0xc6, 0xd0, 0xeb, 0x19, 0xee, 0x30, 0xb3, 0x3d,
-	0x05, 0x5d, 0x68, 0xf8, 0xf5, 0x2c, 0xf6, 0x2b, 0x11, 0xee, 0x8d, 0xec, 0x61, 0x28, 0xec, 0xff,
-	0x16, 0x93, 0xda, 0x6d, 0xe6, 0xd9, 0xcd, 0xc0, 0xac, 0x6d, 0x8e, 0x2a, 0x58, 0xb3, 0x05, 0x49,
-	0x7f, 0xc1, 0x9a, 0x35, 0x74, 0xd1, 0x7f, 0x04, 0x58, 0x19, 0xdd, 0x40, 0x43, 0xc3, 0x68, 0x62,
-	0xdf, 0xcd, 0xac, 0x0c, 0xbd, 0xbe, 0x96, 0x3a, 0x96, 0x7b, 0xed, 0x29, 0xbc, 0x71, 0x8b, 0x0a,
-	0xbd, 0x71, 0x8b, 0x0a, 0x5d, 0xf8, 0x5c, 0x80, 0x87, 0x2d, 0xb3, 0x33, 0x59, 0xb7, 0xc2, 0xca,
-	0x90, 0xc7, 0x6a, 0x44, 0x8d, 0x9a, 0xf0, 0xb2, 0xc4, 0x81, 0x6d, 0x53, 0x57, 0x8c, 0x76, 0xd6,
-	0xb4, 0xdb, 0xb9, 0x36, 0x36, 0xa8, 0x92, 0x39, 0xf6, 0x93, 0x62, 0x69, 0xce, 0x98, 0x7f, 0x36,
-	0x3e, 0xf5, 0x36, 0x9a, 0x51, 0x8a, 0xf8, 0xfe, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x16, 0x05,
-	0x09, 0xf3, 0x40, 0x1d, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2/agent.pb.go b/googleapis/cloud/dialogflow/v2/agent.pb.go
index 9bc8f7c636..8b7708069c 100644
--- a/googleapis/cloud/dialogflow/v2/agent.pb.go
+++ b/googleapis/cloud/dialogflow/v2/agent.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/agent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Match mode determines how intents are detected from user queries.
 type Agent_MatchMode int32
@@ -47,6 +47,7 @@ var Agent_MatchMode_name = map[int32]string{
 	1: "MATCH_MODE_HYBRID",
 	2: "MATCH_MODE_ML_ONLY",
 }
+
 var Agent_MatchMode_value = map[string]int32{
 	"MATCH_MODE_UNSPECIFIED": 0,
 	"MATCH_MODE_HYBRID":      1,
@@ -56,8 +57,9 @@ var Agent_MatchMode_value = map[string]int32{
 func (x Agent_MatchMode) String() string {
 	return proto.EnumName(Agent_MatchMode_name, int32(x))
 }
+
 func (Agent_MatchMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{0, 0}
+	return fileDescriptor_59198d2091110e70, []int{0, 0}
 }
 
 // Represents a conversational agent.
@@ -110,16 +112,17 @@ func (m *Agent) Reset()         { *m = Agent{} }
 func (m *Agent) String() string { return proto.CompactTextString(m) }
 func (*Agent) ProtoMessage()    {}
 func (*Agent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{0}
+	return fileDescriptor_59198d2091110e70, []int{0}
 }
+
 func (m *Agent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Agent.Unmarshal(m, b)
 }
 func (m *Agent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Agent.Marshal(b, m, deterministic)
 }
-func (dst *Agent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Agent.Merge(dst, src)
+func (m *Agent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Agent.Merge(m, src)
 }
 func (m *Agent) XXX_Size() int {
 	return xxx_messageInfo_Agent.Size(m)
@@ -214,16 +217,17 @@ func (m *GetAgentRequest) Reset()         { *m = GetAgentRequest{} }
 func (m *GetAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAgentRequest) ProtoMessage()    {}
 func (*GetAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{1}
+	return fileDescriptor_59198d2091110e70, []int{1}
 }
+
 func (m *GetAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAgentRequest.Unmarshal(m, b)
 }
 func (m *GetAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAgentRequest.Merge(dst, src)
+func (m *GetAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAgentRequest.Merge(m, src)
 }
 func (m *GetAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAgentRequest.Size(m)
@@ -260,16 +264,17 @@ func (m *SearchAgentsRequest) Reset()         { *m = SearchAgentsRequest{} }
 func (m *SearchAgentsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchAgentsRequest) ProtoMessage()    {}
 func (*SearchAgentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{2}
+	return fileDescriptor_59198d2091110e70, []int{2}
 }
+
 func (m *SearchAgentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAgentsRequest.Unmarshal(m, b)
 }
 func (m *SearchAgentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAgentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchAgentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAgentsRequest.Merge(dst, src)
+func (m *SearchAgentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsRequest.Merge(m, src)
 }
 func (m *SearchAgentsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchAgentsRequest.Size(m)
@@ -318,16 +323,17 @@ func (m *SearchAgentsResponse) Reset()         { *m = SearchAgentsResponse{} }
 func (m *SearchAgentsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchAgentsResponse) ProtoMessage()    {}
 func (*SearchAgentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{3}
+	return fileDescriptor_59198d2091110e70, []int{3}
 }
+
 func (m *SearchAgentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAgentsResponse.Unmarshal(m, b)
 }
 func (m *SearchAgentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAgentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchAgentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAgentsResponse.Merge(dst, src)
+func (m *SearchAgentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsResponse.Merge(m, src)
 }
 func (m *SearchAgentsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchAgentsResponse.Size(m)
@@ -366,16 +372,17 @@ func (m *TrainAgentRequest) Reset()         { *m = TrainAgentRequest{} }
 func (m *TrainAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*TrainAgentRequest) ProtoMessage()    {}
 func (*TrainAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{4}
+	return fileDescriptor_59198d2091110e70, []int{4}
 }
+
 func (m *TrainAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrainAgentRequest.Unmarshal(m, b)
 }
 func (m *TrainAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrainAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *TrainAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrainAgentRequest.Merge(dst, src)
+func (m *TrainAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainAgentRequest.Merge(m, src)
 }
 func (m *TrainAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_TrainAgentRequest.Size(m)
@@ -413,16 +420,17 @@ func (m *ExportAgentRequest) Reset()         { *m = ExportAgentRequest{} }
 func (m *ExportAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportAgentRequest) ProtoMessage()    {}
 func (*ExportAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{5}
+	return fileDescriptor_59198d2091110e70, []int{5}
 }
+
 func (m *ExportAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAgentRequest.Unmarshal(m, b)
 }
 func (m *ExportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAgentRequest.Merge(dst, src)
+func (m *ExportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentRequest.Merge(m, src)
 }
 func (m *ExportAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportAgentRequest.Size(m)
@@ -464,16 +472,17 @@ func (m *ExportAgentResponse) Reset()         { *m = ExportAgentResponse{} }
 func (m *ExportAgentResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportAgentResponse) ProtoMessage()    {}
 func (*ExportAgentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{6}
+	return fileDescriptor_59198d2091110e70, []int{6}
 }
+
 func (m *ExportAgentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAgentResponse.Unmarshal(m, b)
 }
 func (m *ExportAgentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAgentResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportAgentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAgentResponse.Merge(dst, src)
+func (m *ExportAgentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentResponse.Merge(m, src)
 }
 func (m *ExportAgentResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportAgentResponse.Size(m)
@@ -521,72 +530,14 @@ func (m *ExportAgentResponse) GetAgentContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExportAgentResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExportAgentResponse_OneofMarshaler, _ExportAgentResponse_OneofUnmarshaler, _ExportAgentResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExportAgentResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExportAgentResponse_AgentUri)(nil),
 		(*ExportAgentResponse_AgentContent)(nil),
 	}
 }
 
-func _ExportAgentResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExportAgentResponse)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ExportAgentResponse_AgentUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AgentUri)
-	case *ExportAgentResponse_AgentContent:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AgentContent)
-	case nil:
-	default:
-		return fmt.Errorf("ExportAgentResponse.Agent has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExportAgentResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExportAgentResponse)
-	switch tag {
-	case 1: // agent.agent_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Agent = &ExportAgentResponse_AgentUri{x}
-		return true, err
-	case 2: // agent.agent_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Agent = &ExportAgentResponse_AgentContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExportAgentResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExportAgentResponse)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ExportAgentResponse_AgentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentUri)))
-		n += len(x.AgentUri)
-	case *ExportAgentResponse_AgentContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentContent)))
-		n += len(x.AgentContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request message for [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
 type ImportAgentRequest struct {
 	// Required. The project that the agent to import is associated with.
@@ -607,16 +558,17 @@ func (m *ImportAgentRequest) Reset()         { *m = ImportAgentRequest{} }
 func (m *ImportAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportAgentRequest) ProtoMessage()    {}
 func (*ImportAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{7}
+	return fileDescriptor_59198d2091110e70, []int{7}
 }
+
 func (m *ImportAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportAgentRequest.Unmarshal(m, b)
 }
 func (m *ImportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportAgentRequest.Merge(dst, src)
+func (m *ImportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportAgentRequest.Merge(m, src)
 }
 func (m *ImportAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportAgentRequest.Size(m)
@@ -671,72 +623,14 @@ func (m *ImportAgentRequest) GetAgentContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImportAgentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImportAgentRequest_OneofMarshaler, _ImportAgentRequest_OneofUnmarshaler, _ImportAgentRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImportAgentRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImportAgentRequest_AgentUri)(nil),
 		(*ImportAgentRequest_AgentContent)(nil),
 	}
 }
 
-func _ImportAgentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImportAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ImportAgentRequest_AgentUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AgentUri)
-	case *ImportAgentRequest_AgentContent:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AgentContent)
-	case nil:
-	default:
-		return fmt.Errorf("ImportAgentRequest.Agent has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImportAgentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImportAgentRequest)
-	switch tag {
-	case 2: // agent.agent_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Agent = &ImportAgentRequest_AgentUri{x}
-		return true, err
-	case 3: // agent.agent_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Agent = &ImportAgentRequest_AgentContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImportAgentRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImportAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ImportAgentRequest_AgentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentUri)))
-		n += len(x.AgentUri)
-	case *ImportAgentRequest_AgentContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentContent)))
-		n += len(x.AgentContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request message for [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
 type RestoreAgentRequest struct {
 	// Required. The project that the agent to restore is associated with.
@@ -757,16 +651,17 @@ func (m *RestoreAgentRequest) Reset()         { *m = RestoreAgentRequest{} }
 func (m *RestoreAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*RestoreAgentRequest) ProtoMessage()    {}
 func (*RestoreAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_df65ea9e23826b36, []int{8}
+	return fileDescriptor_59198d2091110e70, []int{8}
 }
+
 func (m *RestoreAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RestoreAgentRequest.Unmarshal(m, b)
 }
 func (m *RestoreAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RestoreAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *RestoreAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RestoreAgentRequest.Merge(dst, src)
+func (m *RestoreAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestoreAgentRequest.Merge(m, src)
 }
 func (m *RestoreAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_RestoreAgentRequest.Size(m)
@@ -821,73 +716,16 @@ func (m *RestoreAgentRequest) GetAgentContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RestoreAgentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RestoreAgentRequest_OneofMarshaler, _RestoreAgentRequest_OneofUnmarshaler, _RestoreAgentRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RestoreAgentRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RestoreAgentRequest_AgentUri)(nil),
 		(*RestoreAgentRequest_AgentContent)(nil),
 	}
 }
 
-func _RestoreAgentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RestoreAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *RestoreAgentRequest_AgentUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AgentUri)
-	case *RestoreAgentRequest_AgentContent:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AgentContent)
-	case nil:
-	default:
-		return fmt.Errorf("RestoreAgentRequest.Agent has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RestoreAgentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RestoreAgentRequest)
-	switch tag {
-	case 2: // agent.agent_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Agent = &RestoreAgentRequest_AgentUri{x}
-		return true, err
-	case 3: // agent.agent_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Agent = &RestoreAgentRequest_AgentContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RestoreAgentRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RestoreAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *RestoreAgentRequest_AgentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentUri)))
-		n += len(x.AgentUri)
-	case *RestoreAgentRequest_AgentContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentContent)))
-		n += len(x.AgentContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Agent_MatchMode", Agent_MatchMode_name, Agent_MatchMode_value)
 	proto.RegisterType((*Agent)(nil), "google.cloud.dialogflow.v2.Agent")
 	proto.RegisterType((*GetAgentRequest)(nil), "google.cloud.dialogflow.v2.GetAgentRequest")
 	proto.RegisterType((*SearchAgentsRequest)(nil), "google.cloud.dialogflow.v2.SearchAgentsRequest")
@@ -897,7 +735,75 @@ func init() {
 	proto.RegisterType((*ExportAgentResponse)(nil), "google.cloud.dialogflow.v2.ExportAgentResponse")
 	proto.RegisterType((*ImportAgentRequest)(nil), "google.cloud.dialogflow.v2.ImportAgentRequest")
 	proto.RegisterType((*RestoreAgentRequest)(nil), "google.cloud.dialogflow.v2.RestoreAgentRequest")
-	proto.RegisterEnum("google.cloud.dialogflow.v2.Agent_MatchMode", Agent_MatchMode_name, Agent_MatchMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/agent.proto", fileDescriptor_59198d2091110e70)
+}
+
+var fileDescriptor_59198d2091110e70 = []byte{
+	// 975 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
+	0x14, 0x8e, 0x37, 0xcd, 0x76, 0x77, 0x92, 0xb4, 0xe9, 0x84, 0x06, 0xb3, 0x6d, 0x60, 0xeb, 0x92,
+	0x68, 0x9b, 0x82, 0x5d, 0x2d, 0x17, 0x08, 0xe2, 0xd0, 0x64, 0xd3, 0x66, 0x51, 0x36, 0x89, 0x9c,
+	0xa4, 0x52, 0x7b, 0xb1, 0x26, 0xf6, 0xac, 0x33, 0xd4, 0x9e, 0x31, 0x33, 0xe3, 0xd0, 0xa4, 0x70,
+	0x80, 0x23, 0x12, 0x12, 0x12, 0x5c, 0x38, 0x21, 0x71, 0xe4, 0xef, 0xf0, 0x17, 0x38, 0x73, 0xe6,
+	0x88, 0x66, 0xec, 0xcd, 0x7a, 0x93, 0xd4, 0x9b, 0x03, 0x52, 0x6f, 0xf6, 0xfb, 0xbe, 0xf7, 0xde,
+	0x37, 0x33, 0xdf, 0xd3, 0x0c, 0x58, 0x0e, 0x19, 0x0b, 0x23, 0xec, 0xf8, 0x11, 0x4b, 0x03, 0x27,
+	0x20, 0x28, 0x62, 0x61, 0x3f, 0x62, 0xdf, 0x38, 0xc7, 0x6d, 0x07, 0x85, 0x98, 0x4a, 0x3b, 0xe1,
+	0x4c, 0x32, 0xd8, 0xc8, 0x78, 0xb6, 0xe6, 0xd9, 0x43, 0x9e, 0x7d, 0xdc, 0x6e, 0xdc, 0xcd, 0x6b,
+	0xa0, 0x84, 0x38, 0x88, 0x52, 0x26, 0x91, 0x24, 0x8c, 0x8a, 0x2c, 0xb3, 0xf1, 0x5e, 0x01, 0xe5,
+	0x58, 0xb0, 0x94, 0xfb, 0x38, 0x87, 0xee, 0xe7, 0x50, 0xc4, 0x68, 0xc8, 0x53, 0x4a, 0x09, 0x0d,
+	0x1d, 0x96, 0x60, 0x3e, 0x92, 0x7f, 0x27, 0x27, 0xe9, 0xbf, 0xc3, 0xb4, 0xef, 0xe0, 0x38, 0x91,
+	0x27, 0x39, 0xd8, 0x3c, 0x0f, 0xf6, 0x09, 0x8e, 0x02, 0x2f, 0x46, 0xe2, 0x65, 0xce, 0xb8, 0x7b,
+	0x9e, 0x21, 0x24, 0x4f, 0xfd, 0x7c, 0x59, 0xd6, 0xaf, 0xd7, 0xc0, 0xd4, 0x63, 0xb5, 0x4c, 0xb8,
+	0x00, 0xaa, 0x09, 0xe2, 0x98, 0x4a, 0xd3, 0x68, 0x1a, 0xad, 0xba, 0x9b, 0xff, 0xc1, 0x7b, 0x60,
+	0x26, 0x20, 0x22, 0x89, 0xd0, 0x89, 0x47, 0x51, 0x8c, 0xcd, 0x8a, 0x46, 0xa7, 0xf3, 0xd8, 0x36,
+	0x8a, 0x31, 0x6c, 0x83, 0xdb, 0x01, 0xee, 0xa3, 0x34, 0x92, 0x5e, 0x84, 0x68, 0x98, 0xa2, 0x10,
+	0x7b, 0x3e, 0x0b, 0xb0, 0x39, 0xa9, 0xb9, 0xf3, 0x39, 0xb8, 0x95, 0x63, 0xeb, 0x2c, 0xc0, 0xf0,
+	0x53, 0x60, 0x8a, 0x34, 0x49, 0x18, 0x97, 0x38, 0x18, 0xcd, 0x12, 0xe6, 0xb5, 0xe6, 0x64, 0xab,
+	0xee, 0x2e, 0x9c, 0xe1, 0xc5, 0x44, 0x01, 0xef, 0x80, 0xba, 0x24, 0x31, 0xf6, 0x4e, 0x19, 0xc5,
+	0xe6, 0x94, 0xee, 0x50, 0x53, 0x81, 0x17, 0x8c, 0x62, 0xd8, 0x04, 0xd3, 0x01, 0x16, 0x3e, 0x27,
+	0x89, 0xda, 0x42, 0xb3, 0x9a, 0x8b, 0x1d, 0x86, 0xe0, 0x22, 0x00, 0xe8, 0x18, 0x49, 0xc4, 0xbd,
+	0x94, 0x13, 0xf3, 0xba, 0x26, 0xd4, 0xb3, 0xc8, 0x01, 0x27, 0x70, 0x09, 0xdc, 0xc0, 0x14, 0x1d,
+	0x46, 0xd8, 0x8b, 0x58, 0x18, 0x12, 0x1a, 0x9a, 0xb5, 0xa6, 0xd1, 0xaa, 0xb9, 0xb3, 0x59, 0x74,
+	0x2b, 0x0b, 0xc2, 0x2f, 0x01, 0x88, 0x91, 0xf4, 0x8f, 0xbc, 0x58, 0xad, 0xb3, 0xde, 0x34, 0x5a,
+	0x37, 0xda, 0x0f, 0xed, 0x37, 0x7b, 0xc4, 0xd6, 0x9b, 0x6c, 0xf7, 0x54, 0x4e, 0x8f, 0x05, 0xd8,
+	0xad, 0xc7, 0x83, 0x4f, 0xf8, 0x19, 0x30, 0xfd, 0x08, 0x09, 0x41, 0xfa, 0xc4, 0xd7, 0x27, 0xef,
+	0xc9, 0x23, 0x8e, 0xc5, 0x11, 0x8b, 0x02, 0x13, 0x34, 0x8d, 0x56, 0xc5, 0x7d, 0x77, 0x14, 0xdf,
+	0x1f, 0xc0, 0xd6, 0x33, 0x50, 0x3f, 0x2b, 0x09, 0x1b, 0x60, 0xa1, 0xf7, 0x78, 0x7f, 0x7d, 0xd3,
+	0xeb, 0xed, 0x74, 0x36, 0xbc, 0x83, 0xed, 0xbd, 0xdd, 0x8d, 0xf5, 0xee, 0x93, 0xee, 0x46, 0x67,
+	0x6e, 0x02, 0xde, 0x06, 0xb7, 0x0a, 0xd8, 0xe6, 0xf3, 0x35, 0xb7, 0xdb, 0x99, 0x33, 0xe0, 0x02,
+	0x80, 0x85, 0x70, 0x6f, 0xcb, 0xdb, 0xd9, 0xde, 0x7a, 0x3e, 0x57, 0xb1, 0x1e, 0x80, 0x9b, 0x4f,
+	0xb1, 0xd4, 0x9a, 0x5d, 0xfc, 0x75, 0x8a, 0xc5, 0x1b, 0xfd, 0x61, 0x11, 0x30, 0xbf, 0x87, 0x11,
+	0xf7, 0x8f, 0x34, 0x5b, 0x8c, 0xa1, 0xab, 0xd3, 0x4b, 0xd4, 0x49, 0x0b, 0x72, 0x9a, 0x79, 0x69,
+	0xca, 0xad, 0xa9, 0xc0, 0x1e, 0x39, 0xc5, 0xea, 0x6c, 0x34, 0x28, 0xd9, 0x4b, 0x4c, 0x73, 0xf7,
+	0x68, 0xfa, 0xbe, 0x0a, 0x58, 0x27, 0xe0, 0x9d, 0xd1, 0x56, 0x22, 0x61, 0x54, 0xa8, 0x0d, 0xac,
+	0xea, 0x51, 0x15, 0xa6, 0xd1, 0x9c, 0x6c, 0x4d, 0xb7, 0xef, 0x8d, 0x3d, 0x08, 0x37, 0x4f, 0x80,
+	0xcb, 0xe0, 0x26, 0xc5, 0xaf, 0xa4, 0x57, 0x68, 0x9b, 0x19, 0x7c, 0x56, 0x85, 0x77, 0xcf, 0x5a,
+	0x3f, 0x04, 0xb7, 0xf6, 0x39, 0x22, 0xf4, 0x4a, 0x5b, 0xd2, 0x05, 0x70, 0xe3, 0x95, 0xb2, 0xee,
+	0x55, 0xd8, 0x6a, 0x47, 0xb4, 0x18, 0xed, 0xc7, 0xac, 0x79, 0x4d, 0x07, 0x0e, 0x38, 0xb1, 0x02,
+	0x30, 0x3f, 0x52, 0x2a, 0x5f, 0xf1, 0x62, 0x31, 0x47, 0x97, 0xdb, 0x9c, 0x18, 0x66, 0xc1, 0x25,
+	0x30, 0x9b, 0xc1, 0x3e, 0xa3, 0x52, 0x75, 0x54, 0x65, 0x67, 0x36, 0x27, 0xdc, 0x19, 0x1d, 0x5e,
+	0xcf, 0xa2, 0x6b, 0xd7, 0xc1, 0x94, 0xfe, 0xb7, 0x5e, 0x03, 0xd8, 0x8d, 0xaf, 0x2c, 0x78, 0xf1,
+	0x82, 0xe0, 0xf2, 0xe6, 0x93, 0xe5, 0xcd, 0xbf, 0x05, 0xf3, 0x2e, 0x16, 0x92, 0x71, 0xfc, 0x16,
+	0xba, 0xb7, 0xff, 0xa9, 0x82, 0x6a, 0x66, 0x27, 0xf8, 0xbd, 0x01, 0x6a, 0x03, 0xd7, 0xc3, 0xd2,
+	0x61, 0x3e, 0x37, 0x1b, 0x8d, 0xf1, 0x86, 0xb3, 0x96, 0x7e, 0xf8, 0xeb, 0xef, 0x5f, 0x2a, 0x1f,
+	0xc0, 0x45, 0x75, 0xb1, 0xbc, 0xce, 0xd6, 0xf2, 0x45, 0xc2, 0xd9, 0x57, 0xd8, 0x97, 0xc2, 0x59,
+	0xf9, 0x2e, 0xbb, 0x6c, 0xe0, 0xef, 0x06, 0x98, 0x29, 0x7a, 0x1c, 0x3a, 0x65, 0xa5, 0x2f, 0x19,
+	0xbc, 0xc6, 0xa3, 0xab, 0x27, 0x64, 0x66, 0xb2, 0x3e, 0xd2, 0xd2, 0x96, 0xe1, 0x87, 0xa5, 0xd2,
+	0x56, 0x85, 0xce, 0x85, 0x3f, 0x1a, 0x00, 0x0c, 0x47, 0x01, 0x7e, 0x5c, 0xd6, 0xee, 0xc2, 0xc8,
+	0x34, 0x16, 0x07, 0xf4, 0xc2, 0x95, 0x67, 0xef, 0x0c, 0xae, 0x3c, 0xcb, 0xd6, 0x52, 0x5a, 0xd6,
+	0xfd, 0x72, 0x29, 0x52, 0xd5, 0x5d, 0x35, 0x56, 0xe0, 0x4f, 0x06, 0x98, 0x2e, 0xcc, 0x07, 0xb4,
+	0xcb, 0xd4, 0x5c, 0x9c, 0xc9, 0x71, 0x72, 0x1c, 0x2d, 0xe7, 0x81, 0x35, 0x66, 0x67, 0xb0, 0x2e,
+	0x3c, 0xd0, 0x53, 0x98, 0xa4, 0x72, 0x3d, 0x17, 0x47, 0xee, 0x7f, 0xd2, 0x43, 0xe2, 0x81, 0x9e,
+	0x9f, 0x0d, 0x30, 0x53, 0x1c, 0xae, 0x72, 0x3b, 0x5d, 0x32, 0x86, 0xe3, 0x14, 0x3d, 0xd2, 0x8a,
+	0x56, 0xac, 0xa5, 0x72, 0x45, 0x3c, 0xab, 0xbc, 0x6a, 0xac, 0xac, 0xfd, 0x66, 0x80, 0xf7, 0x7d,
+	0x16, 0x97, 0xe8, 0x58, 0x03, 0x5a, 0xc1, 0xae, 0x7a, 0xa0, 0xec, 0x1a, 0x2f, 0x3a, 0x39, 0x33,
+	0x64, 0xea, 0x99, 0x60, 0x33, 0x1e, 0x3a, 0x21, 0xa6, 0xfa, 0xf9, 0xe2, 0x64, 0x10, 0x4a, 0x88,
+	0xb8, 0xec, 0x01, 0xf7, 0xf9, 0xf0, 0xef, 0x5f, 0xc3, 0xf8, 0xa3, 0x52, 0xe9, 0x3c, 0xf9, 0xb3,
+	0xd2, 0x78, 0x9a, 0x95, 0x5b, 0xd7, 0x8d, 0x3b, 0xc3, 0xc6, 0xcf, 0xda, 0x87, 0x55, 0x5d, 0xf5,
+	0x93, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x49, 0x30, 0x4b, 0xa6, 0x15, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1190,72 +1096,3 @@ var _Agents_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2/agent.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/agent.proto", fileDescriptor_agent_df65ea9e23826b36)
-}
-
-var fileDescriptor_agent_df65ea9e23826b36 = []byte{
-	// 975 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
-	0x14, 0x8e, 0x37, 0xcd, 0x76, 0x77, 0x92, 0xb4, 0xe9, 0x84, 0x06, 0xb3, 0x6d, 0x60, 0xeb, 0x92,
-	0x68, 0x9b, 0x82, 0x5d, 0x2d, 0x17, 0x08, 0xe2, 0xd0, 0x64, 0xd3, 0x66, 0x51, 0x36, 0x89, 0x9c,
-	0xa4, 0x52, 0x7b, 0xb1, 0x26, 0xf6, 0xac, 0x33, 0xd4, 0x9e, 0x31, 0x33, 0xe3, 0xd0, 0xa4, 0x70,
-	0x80, 0x23, 0x12, 0x12, 0x12, 0x5c, 0x38, 0x21, 0x71, 0xe4, 0xef, 0xf0, 0x17, 0x38, 0x73, 0xe6,
-	0x88, 0x66, 0xec, 0xcd, 0x7a, 0x93, 0xd4, 0x9b, 0x03, 0x52, 0x6f, 0xf6, 0xfb, 0xbe, 0xf7, 0xde,
-	0x37, 0x33, 0xdf, 0xd3, 0x0c, 0x58, 0x0e, 0x19, 0x0b, 0x23, 0xec, 0xf8, 0x11, 0x4b, 0x03, 0x27,
-	0x20, 0x28, 0x62, 0x61, 0x3f, 0x62, 0xdf, 0x38, 0xc7, 0x6d, 0x07, 0x85, 0x98, 0x4a, 0x3b, 0xe1,
-	0x4c, 0x32, 0xd8, 0xc8, 0x78, 0xb6, 0xe6, 0xd9, 0x43, 0x9e, 0x7d, 0xdc, 0x6e, 0xdc, 0xcd, 0x6b,
-	0xa0, 0x84, 0x38, 0x88, 0x52, 0x26, 0x91, 0x24, 0x8c, 0x8a, 0x2c, 0xb3, 0xf1, 0x5e, 0x01, 0xe5,
-	0x58, 0xb0, 0x94, 0xfb, 0x38, 0x87, 0xee, 0xe7, 0x50, 0xc4, 0x68, 0xc8, 0x53, 0x4a, 0x09, 0x0d,
-	0x1d, 0x96, 0x60, 0x3e, 0x92, 0x7f, 0x27, 0x27, 0xe9, 0xbf, 0xc3, 0xb4, 0xef, 0xe0, 0x38, 0x91,
-	0x27, 0x39, 0xd8, 0x3c, 0x0f, 0xf6, 0x09, 0x8e, 0x02, 0x2f, 0x46, 0xe2, 0x65, 0xce, 0xb8, 0x7b,
-	0x9e, 0x21, 0x24, 0x4f, 0xfd, 0x7c, 0x59, 0xd6, 0xaf, 0xd7, 0xc0, 0xd4, 0x63, 0xb5, 0x4c, 0xb8,
-	0x00, 0xaa, 0x09, 0xe2, 0x98, 0x4a, 0xd3, 0x68, 0x1a, 0xad, 0xba, 0x9b, 0xff, 0xc1, 0x7b, 0x60,
-	0x26, 0x20, 0x22, 0x89, 0xd0, 0x89, 0x47, 0x51, 0x8c, 0xcd, 0x8a, 0x46, 0xa7, 0xf3, 0xd8, 0x36,
-	0x8a, 0x31, 0x6c, 0x83, 0xdb, 0x01, 0xee, 0xa3, 0x34, 0x92, 0x5e, 0x84, 0x68, 0x98, 0xa2, 0x10,
-	0x7b, 0x3e, 0x0b, 0xb0, 0x39, 0xa9, 0xb9, 0xf3, 0x39, 0xb8, 0x95, 0x63, 0xeb, 0x2c, 0xc0, 0xf0,
-	0x53, 0x60, 0x8a, 0x34, 0x49, 0x18, 0x97, 0x38, 0x18, 0xcd, 0x12, 0xe6, 0xb5, 0xe6, 0x64, 0xab,
-	0xee, 0x2e, 0x9c, 0xe1, 0xc5, 0x44, 0x01, 0xef, 0x80, 0xba, 0x24, 0x31, 0xf6, 0x4e, 0x19, 0xc5,
-	0xe6, 0x94, 0xee, 0x50, 0x53, 0x81, 0x17, 0x8c, 0x62, 0xd8, 0x04, 0xd3, 0x01, 0x16, 0x3e, 0x27,
-	0x89, 0xda, 0x42, 0xb3, 0x9a, 0x8b, 0x1d, 0x86, 0xe0, 0x22, 0x00, 0xe8, 0x18, 0x49, 0xc4, 0xbd,
-	0x94, 0x13, 0xf3, 0xba, 0x26, 0xd4, 0xb3, 0xc8, 0x01, 0x27, 0x70, 0x09, 0xdc, 0xc0, 0x14, 0x1d,
-	0x46, 0xd8, 0x8b, 0x58, 0x18, 0x12, 0x1a, 0x9a, 0xb5, 0xa6, 0xd1, 0xaa, 0xb9, 0xb3, 0x59, 0x74,
-	0x2b, 0x0b, 0xc2, 0x2f, 0x01, 0x88, 0x91, 0xf4, 0x8f, 0xbc, 0x58, 0xad, 0xb3, 0xde, 0x34, 0x5a,
-	0x37, 0xda, 0x0f, 0xed, 0x37, 0x7b, 0xc4, 0xd6, 0x9b, 0x6c, 0xf7, 0x54, 0x4e, 0x8f, 0x05, 0xd8,
-	0xad, 0xc7, 0x83, 0x4f, 0xf8, 0x19, 0x30, 0xfd, 0x08, 0x09, 0x41, 0xfa, 0xc4, 0xd7, 0x27, 0xef,
-	0xc9, 0x23, 0x8e, 0xc5, 0x11, 0x8b, 0x02, 0x13, 0x34, 0x8d, 0x56, 0xc5, 0x7d, 0x77, 0x14, 0xdf,
-	0x1f, 0xc0, 0xd6, 0x33, 0x50, 0x3f, 0x2b, 0x09, 0x1b, 0x60, 0xa1, 0xf7, 0x78, 0x7f, 0x7d, 0xd3,
-	0xeb, 0xed, 0x74, 0x36, 0xbc, 0x83, 0xed, 0xbd, 0xdd, 0x8d, 0xf5, 0xee, 0x93, 0xee, 0x46, 0x67,
-	0x6e, 0x02, 0xde, 0x06, 0xb7, 0x0a, 0xd8, 0xe6, 0xf3, 0x35, 0xb7, 0xdb, 0x99, 0x33, 0xe0, 0x02,
-	0x80, 0x85, 0x70, 0x6f, 0xcb, 0xdb, 0xd9, 0xde, 0x7a, 0x3e, 0x57, 0xb1, 0x1e, 0x80, 0x9b, 0x4f,
-	0xb1, 0xd4, 0x9a, 0x5d, 0xfc, 0x75, 0x8a, 0xc5, 0x1b, 0xfd, 0x61, 0x11, 0x30, 0xbf, 0x87, 0x11,
-	0xf7, 0x8f, 0x34, 0x5b, 0x8c, 0xa1, 0xab, 0xd3, 0x4b, 0xd4, 0x49, 0x0b, 0x72, 0x9a, 0x79, 0x69,
-	0xca, 0xad, 0xa9, 0xc0, 0x1e, 0x39, 0xc5, 0xea, 0x6c, 0x34, 0x28, 0xd9, 0x4b, 0x4c, 0x73, 0xf7,
-	0x68, 0xfa, 0xbe, 0x0a, 0x58, 0x27, 0xe0, 0x9d, 0xd1, 0x56, 0x22, 0x61, 0x54, 0xa8, 0x0d, 0xac,
-	0xea, 0x51, 0x15, 0xa6, 0xd1, 0x9c, 0x6c, 0x4d, 0xb7, 0xef, 0x8d, 0x3d, 0x08, 0x37, 0x4f, 0x80,
-	0xcb, 0xe0, 0x26, 0xc5, 0xaf, 0xa4, 0x57, 0x68, 0x9b, 0x19, 0x7c, 0x56, 0x85, 0x77, 0xcf, 0x5a,
-	0x3f, 0x04, 0xb7, 0xf6, 0x39, 0x22, 0xf4, 0x4a, 0x5b, 0xd2, 0x05, 0x70, 0xe3, 0x95, 0xb2, 0xee,
-	0x55, 0xd8, 0x6a, 0x47, 0xb4, 0x18, 0xed, 0xc7, 0xac, 0x79, 0x4d, 0x07, 0x0e, 0x38, 0xb1, 0x02,
-	0x30, 0x3f, 0x52, 0x2a, 0x5f, 0xf1, 0x62, 0x31, 0x47, 0x97, 0xdb, 0x9c, 0x18, 0x66, 0xc1, 0x25,
-	0x30, 0x9b, 0xc1, 0x3e, 0xa3, 0x52, 0x75, 0x54, 0x65, 0x67, 0x36, 0x27, 0xdc, 0x19, 0x1d, 0x5e,
-	0xcf, 0xa2, 0x6b, 0xd7, 0xc1, 0x94, 0xfe, 0xb7, 0x5e, 0x03, 0xd8, 0x8d, 0xaf, 0x2c, 0x78, 0xf1,
-	0x82, 0xe0, 0xf2, 0xe6, 0x93, 0xe5, 0xcd, 0xbf, 0x05, 0xf3, 0x2e, 0x16, 0x92, 0x71, 0xfc, 0x16,
-	0xba, 0xb7, 0xff, 0xa9, 0x82, 0x6a, 0x66, 0x27, 0xf8, 0xbd, 0x01, 0x6a, 0x03, 0xd7, 0xc3, 0xd2,
-	0x61, 0x3e, 0x37, 0x1b, 0x8d, 0xf1, 0x86, 0xb3, 0x96, 0x7e, 0xf8, 0xeb, 0xef, 0x5f, 0x2a, 0x1f,
-	0xc0, 0x45, 0x75, 0xb1, 0xbc, 0xce, 0xd6, 0xf2, 0x45, 0xc2, 0xd9, 0x57, 0xd8, 0x97, 0xc2, 0x59,
-	0xf9, 0x2e, 0xbb, 0x6c, 0xe0, 0xef, 0x06, 0x98, 0x29, 0x7a, 0x1c, 0x3a, 0x65, 0xa5, 0x2f, 0x19,
-	0xbc, 0xc6, 0xa3, 0xab, 0x27, 0x64, 0x66, 0xb2, 0x3e, 0xd2, 0xd2, 0x96, 0xe1, 0x87, 0xa5, 0xd2,
-	0x56, 0x85, 0xce, 0x85, 0x3f, 0x1a, 0x00, 0x0c, 0x47, 0x01, 0x7e, 0x5c, 0xd6, 0xee, 0xc2, 0xc8,
-	0x34, 0x16, 0x07, 0xf4, 0xc2, 0x95, 0x67, 0xef, 0x0c, 0xae, 0x3c, 0xcb, 0xd6, 0x52, 0x5a, 0xd6,
-	0xfd, 0x72, 0x29, 0x52, 0xd5, 0x5d, 0x35, 0x56, 0xe0, 0x4f, 0x06, 0x98, 0x2e, 0xcc, 0x07, 0xb4,
-	0xcb, 0xd4, 0x5c, 0x9c, 0xc9, 0x71, 0x72, 0x1c, 0x2d, 0xe7, 0x81, 0x35, 0x66, 0x67, 0xb0, 0x2e,
-	0x3c, 0xd0, 0x53, 0x98, 0xa4, 0x72, 0x3d, 0x17, 0x47, 0xee, 0x7f, 0xd2, 0x43, 0xe2, 0x81, 0x9e,
-	0x9f, 0x0d, 0x30, 0x53, 0x1c, 0xae, 0x72, 0x3b, 0x5d, 0x32, 0x86, 0xe3, 0x14, 0x3d, 0xd2, 0x8a,
-	0x56, 0xac, 0xa5, 0x72, 0x45, 0x3c, 0xab, 0xbc, 0x6a, 0xac, 0xac, 0xfd, 0x66, 0x80, 0xf7, 0x7d,
-	0x16, 0x97, 0xe8, 0x58, 0x03, 0x5a, 0xc1, 0xae, 0x7a, 0xa0, 0xec, 0x1a, 0x2f, 0x3a, 0x39, 0x33,
-	0x64, 0xea, 0x99, 0x60, 0x33, 0x1e, 0x3a, 0x21, 0xa6, 0xfa, 0xf9, 0xe2, 0x64, 0x10, 0x4a, 0x88,
-	0xb8, 0xec, 0x01, 0xf7, 0xf9, 0xf0, 0xef, 0x5f, 0xc3, 0xf8, 0xa3, 0x52, 0xe9, 0x3c, 0xf9, 0xb3,
-	0xd2, 0x78, 0x9a, 0x95, 0x5b, 0xd7, 0x8d, 0x3b, 0xc3, 0xc6, 0xcf, 0xda, 0x87, 0x55, 0x5d, 0xf5,
-	0x93, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x49, 0x30, 0x4b, 0xa6, 0x15, 0x0a, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2/audio_config.pb.go b/googleapis/cloud/dialogflow/v2/audio_config.pb.go
index 1e086d585a..84be7a682b 100644
--- a/googleapis/cloud/dialogflow/v2/audio_config.pb.go
+++ b/googleapis/cloud/dialogflow/v2/audio_config.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/audio_config.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+package dialogflow
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Audio encoding of the audio content sent in the conversational query request.
 // Refer to the
@@ -73,6 +76,7 @@ var AudioEncoding_name = map[int32]string{
 	6: "AUDIO_ENCODING_OGG_OPUS",
 	7: "AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE",
 }
+
 var AudioEncoding_value = map[string]int32{
 	"AUDIO_ENCODING_UNSPECIFIED":            0,
 	"AUDIO_ENCODING_LINEAR_16":              1,
@@ -87,8 +91,9 @@ var AudioEncoding_value = map[string]int32{
 func (x AudioEncoding) String() string {
 	return proto.EnumName(AudioEncoding_name, int32(x))
 }
+
 func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{0}
+	return fileDescriptor_3ff9be2146363af6, []int{0}
 }
 
 // Variant of the specified [Speech model][google.cloud.dialogflow.v2.InputAudioConfig.model] to use.
@@ -139,6 +144,7 @@ var SpeechModelVariant_name = map[int32]string{
 	2: "USE_STANDARD",
 	3: "USE_ENHANCED",
 }
+
 var SpeechModelVariant_value = map[string]int32{
 	"SPEECH_MODEL_VARIANT_UNSPECIFIED": 0,
 	"USE_BEST_AVAILABLE":               1,
@@ -149,8 +155,9 @@ var SpeechModelVariant_value = map[string]int32{
 func (x SpeechModelVariant) String() string {
 	return proto.EnumName(SpeechModelVariant_name, int32(x))
 }
+
 func (SpeechModelVariant) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{1}
+	return fileDescriptor_3ff9be2146363af6, []int{1}
 }
 
 // Gender of the voice as described in
@@ -175,6 +182,7 @@ var SsmlVoiceGender_name = map[int32]string{
 	2: "SSML_VOICE_GENDER_FEMALE",
 	3: "SSML_VOICE_GENDER_NEUTRAL",
 }
+
 var SsmlVoiceGender_value = map[string]int32{
 	"SSML_VOICE_GENDER_UNSPECIFIED": 0,
 	"SSML_VOICE_GENDER_MALE":        1,
@@ -185,8 +193,9 @@ var SsmlVoiceGender_value = map[string]int32{
 func (x SsmlVoiceGender) String() string {
 	return proto.EnumName(SsmlVoiceGender_name, int32(x))
 }
+
 func (SsmlVoiceGender) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{2}
+	return fileDescriptor_3ff9be2146363af6, []int{2}
 }
 
 // Audio encoding of the output audio format in Text-To-Speech.
@@ -213,6 +222,7 @@ var OutputAudioEncoding_name = map[int32]string{
 	2: "OUTPUT_AUDIO_ENCODING_MP3",
 	3: "OUTPUT_AUDIO_ENCODING_OGG_OPUS",
 }
+
 var OutputAudioEncoding_value = map[string]int32{
 	"OUTPUT_AUDIO_ENCODING_UNSPECIFIED": 0,
 	"OUTPUT_AUDIO_ENCODING_LINEAR_16":   1,
@@ -223,8 +233,9 @@ var OutputAudioEncoding_value = map[string]int32{
 func (x OutputAudioEncoding) String() string {
 	return proto.EnumName(OutputAudioEncoding_name, int32(x))
 }
+
 func (OutputAudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{3}
+	return fileDescriptor_3ff9be2146363af6, []int{3}
 }
 
 // Instructs the speech recognizer how to process the audio content.
@@ -261,16 +272,17 @@ func (m *InputAudioConfig) Reset()         { *m = InputAudioConfig{} }
 func (m *InputAudioConfig) String() string { return proto.CompactTextString(m) }
 func (*InputAudioConfig) ProtoMessage()    {}
 func (*InputAudioConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{0}
+	return fileDescriptor_3ff9be2146363af6, []int{0}
 }
+
 func (m *InputAudioConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputAudioConfig.Unmarshal(m, b)
 }
 func (m *InputAudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputAudioConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputAudioConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputAudioConfig.Merge(dst, src)
+func (m *InputAudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputAudioConfig.Merge(m, src)
 }
 func (m *InputAudioConfig) XXX_Size() int {
 	return xxx_messageInfo_InputAudioConfig.Size(m)
@@ -336,16 +348,17 @@ func (m *VoiceSelectionParams) Reset()         { *m = VoiceSelectionParams{} }
 func (m *VoiceSelectionParams) String() string { return proto.CompactTextString(m) }
 func (*VoiceSelectionParams) ProtoMessage()    {}
 func (*VoiceSelectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{1}
+	return fileDescriptor_3ff9be2146363af6, []int{1}
 }
+
 func (m *VoiceSelectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VoiceSelectionParams.Unmarshal(m, b)
 }
 func (m *VoiceSelectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VoiceSelectionParams.Marshal(b, m, deterministic)
 }
-func (dst *VoiceSelectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VoiceSelectionParams.Merge(dst, src)
+func (m *VoiceSelectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoiceSelectionParams.Merge(m, src)
 }
 func (m *VoiceSelectionParams) XXX_Size() int {
 	return xxx_messageInfo_VoiceSelectionParams.Size(m)
@@ -405,16 +418,17 @@ func (m *SynthesizeSpeechConfig) Reset()         { *m = SynthesizeSpeechConfig{}
 func (m *SynthesizeSpeechConfig) String() string { return proto.CompactTextString(m) }
 func (*SynthesizeSpeechConfig) ProtoMessage()    {}
 func (*SynthesizeSpeechConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{2}
+	return fileDescriptor_3ff9be2146363af6, []int{2}
 }
+
 func (m *SynthesizeSpeechConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesizeSpeechConfig.Unmarshal(m, b)
 }
 func (m *SynthesizeSpeechConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesizeSpeechConfig.Marshal(b, m, deterministic)
 }
-func (dst *SynthesizeSpeechConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesizeSpeechConfig.Merge(dst, src)
+func (m *SynthesizeSpeechConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechConfig.Merge(m, src)
 }
 func (m *SynthesizeSpeechConfig) XXX_Size() int {
 	return xxx_messageInfo_SynthesizeSpeechConfig.Size(m)
@@ -481,16 +495,17 @@ func (m *OutputAudioConfig) Reset()         { *m = OutputAudioConfig{} }
 func (m *OutputAudioConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputAudioConfig) ProtoMessage()    {}
 func (*OutputAudioConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_af44fcb5715f52d7, []int{3}
+	return fileDescriptor_3ff9be2146363af6, []int{3}
 }
+
 func (m *OutputAudioConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputAudioConfig.Unmarshal(m, b)
 }
 func (m *OutputAudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputAudioConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputAudioConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputAudioConfig.Merge(dst, src)
+func (m *OutputAudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputAudioConfig.Merge(m, src)
 }
 func (m *OutputAudioConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputAudioConfig.Size(m)
@@ -523,21 +538,21 @@ func (m *OutputAudioConfig) GetSynthesizeSpeechConfig() *SynthesizeSpeechConfig
 }
 
 func init() {
-	proto.RegisterType((*InputAudioConfig)(nil), "google.cloud.dialogflow.v2.InputAudioConfig")
-	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.dialogflow.v2.VoiceSelectionParams")
-	proto.RegisterType((*SynthesizeSpeechConfig)(nil), "google.cloud.dialogflow.v2.SynthesizeSpeechConfig")
-	proto.RegisterType((*OutputAudioConfig)(nil), "google.cloud.dialogflow.v2.OutputAudioConfig")
 	proto.RegisterEnum("google.cloud.dialogflow.v2.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
 	proto.RegisterEnum("google.cloud.dialogflow.v2.SpeechModelVariant", SpeechModelVariant_name, SpeechModelVariant_value)
 	proto.RegisterEnum("google.cloud.dialogflow.v2.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
 	proto.RegisterEnum("google.cloud.dialogflow.v2.OutputAudioEncoding", OutputAudioEncoding_name, OutputAudioEncoding_value)
+	proto.RegisterType((*InputAudioConfig)(nil), "google.cloud.dialogflow.v2.InputAudioConfig")
+	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.dialogflow.v2.VoiceSelectionParams")
+	proto.RegisterType((*SynthesizeSpeechConfig)(nil), "google.cloud.dialogflow.v2.SynthesizeSpeechConfig")
+	proto.RegisterType((*OutputAudioConfig)(nil), "google.cloud.dialogflow.v2.OutputAudioConfig")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/audio_config.proto", fileDescriptor_audio_config_af44fcb5715f52d7)
+	proto.RegisterFile("google/cloud/dialogflow/v2/audio_config.proto", fileDescriptor_3ff9be2146363af6)
 }
 
-var fileDescriptor_audio_config_af44fcb5715f52d7 = []byte{
+var fileDescriptor_3ff9be2146363af6 = []byte{
 	// 898 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0xe2, 0xc6,
 	0x1b, 0xfe, 0xd9, 0x24, 0xfb, 0x53, 0xde, 0x90, 0xac, 0x77, 0x36, 0xcd, 0x3a, 0x69, 0x92, 0x92,
diff --git a/googleapis/cloud/dialogflow/v2/context.pb.go b/googleapis/cloud/dialogflow/v2/context.pb.go
index 6882491b3d..11d1665c2c 100644
--- a/googleapis/cloud/dialogflow/v2/context.pb.go
+++ b/googleapis/cloud/dialogflow/v2/context.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/context.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a context.
 type Context struct {
@@ -54,16 +54,17 @@ func (m *Context) Reset()         { *m = Context{} }
 func (m *Context) String() string { return proto.CompactTextString(m) }
 func (*Context) ProtoMessage()    {}
 func (*Context) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{0}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{0}
 }
+
 func (m *Context) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Context.Unmarshal(m, b)
 }
 func (m *Context) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Context.Marshal(b, m, deterministic)
 }
-func (dst *Context) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Context.Merge(dst, src)
+func (m *Context) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Context.Merge(m, src)
 }
 func (m *Context) XXX_Size() int {
 	return xxx_messageInfo_Context.Size(m)
@@ -114,16 +115,17 @@ func (m *ListContextsRequest) Reset()         { *m = ListContextsRequest{} }
 func (m *ListContextsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListContextsRequest) ProtoMessage()    {}
 func (*ListContextsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{1}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{1}
 }
+
 func (m *ListContextsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListContextsRequest.Unmarshal(m, b)
 }
 func (m *ListContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListContextsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListContextsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListContextsRequest.Merge(dst, src)
+func (m *ListContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsRequest.Merge(m, src)
 }
 func (m *ListContextsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListContextsRequest.Size(m)
@@ -172,16 +174,17 @@ func (m *ListContextsResponse) Reset()         { *m = ListContextsResponse{} }
 func (m *ListContextsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListContextsResponse) ProtoMessage()    {}
 func (*ListContextsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{2}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{2}
 }
+
 func (m *ListContextsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListContextsResponse.Unmarshal(m, b)
 }
 func (m *ListContextsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListContextsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListContextsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListContextsResponse.Merge(dst, src)
+func (m *ListContextsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsResponse.Merge(m, src)
 }
 func (m *ListContextsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListContextsResponse.Size(m)
@@ -220,16 +223,17 @@ func (m *GetContextRequest) Reset()         { *m = GetContextRequest{} }
 func (m *GetContextRequest) String() string { return proto.CompactTextString(m) }
 func (*GetContextRequest) ProtoMessage()    {}
 func (*GetContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{3}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{3}
 }
+
 func (m *GetContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetContextRequest.Unmarshal(m, b)
 }
 func (m *GetContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetContextRequest.Merge(dst, src)
+func (m *GetContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetContextRequest.Merge(m, src)
 }
 func (m *GetContextRequest) XXX_Size() int {
 	return xxx_messageInfo_GetContextRequest.Size(m)
@@ -263,16 +267,17 @@ func (m *CreateContextRequest) Reset()         { *m = CreateContextRequest{} }
 func (m *CreateContextRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateContextRequest) ProtoMessage()    {}
 func (*CreateContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{4}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{4}
 }
+
 func (m *CreateContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateContextRequest.Unmarshal(m, b)
 }
 func (m *CreateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateContextRequest.Merge(dst, src)
+func (m *CreateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateContextRequest.Merge(m, src)
 }
 func (m *CreateContextRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateContextRequest.Size(m)
@@ -312,16 +317,17 @@ func (m *UpdateContextRequest) Reset()         { *m = UpdateContextRequest{} }
 func (m *UpdateContextRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateContextRequest) ProtoMessage()    {}
 func (*UpdateContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{5}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{5}
 }
+
 func (m *UpdateContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateContextRequest.Unmarshal(m, b)
 }
 func (m *UpdateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateContextRequest.Merge(dst, src)
+func (m *UpdateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateContextRequest.Merge(m, src)
 }
 func (m *UpdateContextRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateContextRequest.Size(m)
@@ -360,16 +366,17 @@ func (m *DeleteContextRequest) Reset()         { *m = DeleteContextRequest{} }
 func (m *DeleteContextRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteContextRequest) ProtoMessage()    {}
 func (*DeleteContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{6}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{6}
 }
+
 func (m *DeleteContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteContextRequest.Unmarshal(m, b)
 }
 func (m *DeleteContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteContextRequest.Merge(dst, src)
+func (m *DeleteContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteContextRequest.Merge(m, src)
 }
 func (m *DeleteContextRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteContextRequest.Size(m)
@@ -401,16 +408,17 @@ func (m *DeleteAllContextsRequest) Reset()         { *m = DeleteAllContextsReque
 func (m *DeleteAllContextsRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAllContextsRequest) ProtoMessage()    {}
 func (*DeleteAllContextsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_d5871c2b8dccc66a, []int{7}
+	return fileDescriptor_e7e2e3bf8515c3b3, []int{7}
 }
+
 func (m *DeleteAllContextsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAllContextsRequest.Unmarshal(m, b)
 }
 func (m *DeleteAllContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAllContextsRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAllContextsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAllContextsRequest.Merge(dst, src)
+func (m *DeleteAllContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAllContextsRequest.Merge(m, src)
 }
 func (m *DeleteAllContextsRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAllContextsRequest.Size(m)
@@ -439,6 +447,60 @@ func init() {
 	proto.RegisterType((*DeleteAllContextsRequest)(nil), "google.cloud.dialogflow.v2.DeleteAllContextsRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/context.proto", fileDescriptor_e7e2e3bf8515c3b3)
+}
+
+var fileDescriptor_e7e2e3bf8515c3b3 = []byte{
+	// 728 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0x4f, 0x6f, 0xd3, 0x3e,
+	0x18, 0xc7, 0xe5, 0xee, 0xf7, 0xdb, 0x1f, 0x6f, 0x05, 0xcd, 0x54, 0xa3, 0x64, 0x03, 0x55, 0x41,
+	0x40, 0x55, 0x89, 0x18, 0x32, 0x24, 0x34, 0xc6, 0x84, 0x58, 0xcb, 0x26, 0x21, 0x90, 0xa6, 0x0e,
+	0x38, 0x70, 0xa9, 0xbc, 0xf6, 0x69, 0x14, 0x96, 0xc6, 0x21, 0x76, 0xc7, 0x18, 0x9a, 0x90, 0x78,
+	0x09, 0xc0, 0x6d, 0x9c, 0x38, 0x4e, 0x9c, 0x78, 0x2b, 0xbc, 0x05, 0xee, 0x5c, 0x39, 0xa2, 0x38,
+	0x4e, 0xff, 0xaf, 0xa4, 0xdc, 0x1a, 0xfb, 0x6b, 0x7f, 0x3f, 0x7e, 0xfc, 0x7d, 0x92, 0xe2, 0xa2,
+	0xc3, 0xb9, 0xe3, 0x01, 0xad, 0x7b, 0xbc, 0xdd, 0xa0, 0x0d, 0x97, 0x79, 0xdc, 0x69, 0x7a, 0xfc,
+	0x0d, 0x3d, 0xb0, 0x69, 0x9d, 0xfb, 0x12, 0x0e, 0xa5, 0x15, 0x84, 0x5c, 0x72, 0x62, 0xc4, 0x4a,
+	0x4b, 0x29, 0xad, 0xae, 0xd2, 0x3a, 0xb0, 0x8d, 0x15, 0xbd, 0x0b, 0x0b, 0x5c, 0xca, 0x7c, 0x9f,
+	0x4b, 0x26, 0x5d, 0xee, 0x8b, 0x78, 0xa5, 0x71, 0xa9, 0x67, 0x36, 0x04, 0xc1, 0xdb, 0x61, 0x1d,
+	0xf4, 0xd4, 0xb2, 0x9e, 0x52, 0x4f, 0x7b, 0xed, 0x26, 0x85, 0x56, 0x20, 0xdf, 0xea, 0xc9, 0xc2,
+	0xe0, 0x64, 0xd3, 0x05, 0xaf, 0x51, 0x6b, 0x31, 0xb1, 0xaf, 0x15, 0x2b, 0x83, 0x0a, 0x21, 0xc3,
+	0x76, 0x5d, 0x13, 0x9b, 0xc7, 0x78, 0xa6, 0x1c, 0x1f, 0x81, 0x10, 0xfc, 0x9f, 0xcf, 0x5a, 0x90,
+	0x47, 0x05, 0x54, 0x9c, 0xab, 0xaa, 0xdf, 0xe4, 0x1a, 0x3e, 0xe7, 0xb9, 0x4d, 0x10, 0x01, 0xf3,
+	0x6b, 0x75, 0xde, 0xf6, 0x65, 0x3e, 0x53, 0x40, 0xc5, 0xff, 0xab, 0xd9, 0x64, 0xb4, 0x1c, 0x0d,
+	0x92, 0xbb, 0x18, 0x07, 0x2c, 0x64, 0x2d, 0x90, 0x10, 0x8a, 0xfc, 0x54, 0x01, 0x15, 0xe7, 0xed,
+	0x8b, 0x96, 0x2e, 0x46, 0x62, 0x6c, 0xed, 0x2a, 0xe3, 0x6a, 0x8f, 0xd4, 0x74, 0xf1, 0x85, 0x27,
+	0xae, 0x90, 0x1a, 0x41, 0x54, 0xe1, 0x75, 0x1b, 0x84, 0x24, 0x4b, 0x78, 0x3a, 0x60, 0x21, 0xf8,
+	0x52, 0xc3, 0xe8, 0x27, 0xb2, 0x8c, 0xe7, 0x02, 0xe6, 0x40, 0x4d, 0xb8, 0x47, 0xa0, 0x49, 0x66,
+	0xa3, 0x81, 0x5d, 0xf7, 0x08, 0xc8, 0xe5, 0x08, 0xc2, 0x81, 0x9a, 0xe4, 0xfb, 0xe0, 0x2b, 0x88,
+	0xb9, 0xaa, 0x92, 0x3f, 0x8b, 0x06, 0xcc, 0xf7, 0x38, 0xd7, 0x6f, 0x25, 0x02, 0xee, 0x0b, 0x20,
+	0x0f, 0xf0, 0xac, 0xbe, 0x44, 0x91, 0x47, 0x85, 0xa9, 0xe2, 0xbc, 0x7d, 0xd5, 0x3a, 0xfb, 0x1a,
+	0x2d, 0xbd, 0xbe, 0xda, 0x59, 0x44, 0xae, 0xe3, 0xf3, 0x3e, 0x1c, 0xca, 0x5a, 0x8f, 0x79, 0x46,
+	0x99, 0x67, 0xa3, 0xe1, 0x9d, 0x0e, 0xc0, 0x0d, 0xbc, 0xb8, 0x0d, 0x89, 0x7f, 0x72, 0xd2, 0x11,
+	0x45, 0x37, 0x5b, 0x38, 0x57, 0x0e, 0x81, 0x49, 0x18, 0xd0, 0x9e, 0x55, 0x95, 0x0d, 0x3c, 0xa3,
+	0x61, 0x94, 0x71, 0xca, 0x03, 0x24, 0x6b, 0xcc, 0x8f, 0x08, 0xe7, 0x9e, 0x07, 0x8d, 0x61, 0xbf,
+	0x9e, 0x7d, 0xd1, 0xe4, 0xfb, 0x92, 0x75, 0x3c, 0xdf, 0x56, 0xdb, 0xaa, 0x34, 0x6a, 0x34, 0x63,
+	0x28, 0x15, 0x5b, 0x51, 0x60, 0x9f, 0x32, 0xb1, 0x5f, 0xc5, 0xb1, 0x3c, 0xfa, 0x6d, 0x96, 0x70,
+	0xae, 0x02, 0x1e, 0x0c, 0x31, 0x8d, 0xaa, 0x97, 0x8d, 0xf3, 0xb1, 0xf6, 0xa1, 0xe7, 0xa5, 0x4c,
+	0x92, 0xfd, 0x6b, 0x06, 0xcf, 0x26, 0x5a, 0xf2, 0x0d, 0xe1, 0x85, 0xde, 0x6c, 0x10, 0x3a, 0xee,
+	0xa0, 0x23, 0x02, 0x6b, 0xdc, 0x4a, 0xbf, 0x20, 0x8e, 0x9d, 0xb9, 0xf6, 0xe1, 0xc7, 0xcf, 0x4f,
+	0x99, 0x55, 0x72, 0x3b, 0x7a, 0x8b, 0xbc, 0x8b, 0xa9, 0x36, 0x82, 0x90, 0xbf, 0x82, 0xba, 0x14,
+	0xb4, 0x44, 0x99, 0x03, 0xbe, 0xa4, 0x02, 0x84, 0x88, 0xde, 0x12, 0xb4, 0x74, 0x4c, 0x3b, 0x81,
+	0x3b, 0x41, 0x18, 0x77, 0x93, 0x44, 0x6e, 0x8e, 0xf3, 0x1e, 0x4a, 0x9c, 0x91, 0xe6, 0x12, 0x07,
+	0xe8, 0xa2, 0x2a, 0x8f, 0x63, 0xeb, 0xa0, 0xd1, 0xd2, 0x31, 0x39, 0x45, 0x38, 0xdb, 0x17, 0x5f,
+	0x32, 0xb6, 0x38, 0xa3, 0x92, 0x9e, 0x8e, 0x71, 0x53, 0x31, 0xde, 0x37, 0x27, 0xaf, 0xe0, 0xbd,
+	0x4e, 0x46, 0xbf, 0x23, 0x9c, 0xed, 0xcb, 0xfe, 0x78, 0xd8, 0x51, 0x6d, 0x92, 0x0e, 0xf6, 0xb1,
+	0x82, 0xad, 0xd8, 0x6b, 0x0a, 0x36, 0xf9, 0x6a, 0x4c, 0x52, 0xd8, 0x2e, 0xf4, 0x67, 0x84, 0xb3,
+	0x7d, 0xcd, 0x31, 0x1e, 0x7a, 0x54, 0x1f, 0x19, 0x4b, 0x43, 0x7d, 0xf8, 0x28, 0xfa, 0xaa, 0x24,
+	0x17, 0x5f, 0xfa, 0x87, 0x8b, 0xff, 0x82, 0xf0, 0xe2, 0x50, 0x1f, 0x92, 0x3b, 0x7f, 0x47, 0x1b,
+	0x6e, 0xdb, 0x94, 0x78, 0x93, 0xdc, 0xf9, 0xe6, 0x09, 0xc2, 0x57, 0xea, 0xbc, 0x35, 0x06, 0x67,
+	0x73, 0x41, 0x63, 0xec, 0x44, 0xa6, 0x3b, 0xe8, 0x65, 0x45, 0x6b, 0x1d, 0xee, 0x31, 0xdf, 0xb1,
+	0x78, 0xe8, 0x50, 0x07, 0x7c, 0x85, 0x44, 0xe3, 0x29, 0x16, 0xb8, 0x62, 0xd4, 0xff, 0x82, 0xf5,
+	0xee, 0xd3, 0x6f, 0x84, 0xbe, 0x66, 0x32, 0x95, 0xad, 0xd3, 0x8c, 0xb1, 0x1d, 0x6f, 0x57, 0x56,
+	0xd6, 0x95, 0xae, 0xf5, 0x0b, 0x7b, 0x6f, 0x5a, 0xed, 0xba, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff,
+	0x82, 0x9d, 0xa3, 0xd9, 0x6c, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -691,57 +753,3 @@ var _Contexts_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2/context.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/context.proto", fileDescriptor_context_d5871c2b8dccc66a)
-}
-
-var fileDescriptor_context_d5871c2b8dccc66a = []byte{
-	// 728 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0x4f, 0x6f, 0xd3, 0x3e,
-	0x18, 0xc7, 0xe5, 0xee, 0xf7, 0xdb, 0x1f, 0x6f, 0x05, 0xcd, 0x54, 0xa3, 0x64, 0x03, 0x55, 0x41,
-	0x40, 0x55, 0x89, 0x18, 0x32, 0x24, 0x34, 0xc6, 0x84, 0x58, 0xcb, 0x26, 0x21, 0x90, 0xa6, 0x0e,
-	0x38, 0x70, 0xa9, 0xbc, 0xf6, 0x69, 0x14, 0x96, 0xc6, 0x21, 0x76, 0xc7, 0x18, 0x9a, 0x90, 0x78,
-	0x09, 0xc0, 0x6d, 0x9c, 0x38, 0x4e, 0x9c, 0x78, 0x2b, 0xbc, 0x05, 0xee, 0x5c, 0x39, 0xa2, 0x38,
-	0x4e, 0xff, 0xaf, 0xa4, 0xdc, 0x1a, 0xfb, 0x6b, 0x7f, 0x3f, 0x7e, 0xfc, 0x7d, 0x92, 0xe2, 0xa2,
-	0xc3, 0xb9, 0xe3, 0x01, 0xad, 0x7b, 0xbc, 0xdd, 0xa0, 0x0d, 0x97, 0x79, 0xdc, 0x69, 0x7a, 0xfc,
-	0x0d, 0x3d, 0xb0, 0x69, 0x9d, 0xfb, 0x12, 0x0e, 0xa5, 0x15, 0x84, 0x5c, 0x72, 0x62, 0xc4, 0x4a,
-	0x4b, 0x29, 0xad, 0xae, 0xd2, 0x3a, 0xb0, 0x8d, 0x15, 0xbd, 0x0b, 0x0b, 0x5c, 0xca, 0x7c, 0x9f,
-	0x4b, 0x26, 0x5d, 0xee, 0x8b, 0x78, 0xa5, 0x71, 0xa9, 0x67, 0x36, 0x04, 0xc1, 0xdb, 0x61, 0x1d,
-	0xf4, 0xd4, 0xb2, 0x9e, 0x52, 0x4f, 0x7b, 0xed, 0x26, 0x85, 0x56, 0x20, 0xdf, 0xea, 0xc9, 0xc2,
-	0xe0, 0x64, 0xd3, 0x05, 0xaf, 0x51, 0x6b, 0x31, 0xb1, 0xaf, 0x15, 0x2b, 0x83, 0x0a, 0x21, 0xc3,
-	0x76, 0x5d, 0x13, 0x9b, 0xc7, 0x78, 0xa6, 0x1c, 0x1f, 0x81, 0x10, 0xfc, 0x9f, 0xcf, 0x5a, 0x90,
-	0x47, 0x05, 0x54, 0x9c, 0xab, 0xaa, 0xdf, 0xe4, 0x1a, 0x3e, 0xe7, 0xb9, 0x4d, 0x10, 0x01, 0xf3,
-	0x6b, 0x75, 0xde, 0xf6, 0x65, 0x3e, 0x53, 0x40, 0xc5, 0xff, 0xab, 0xd9, 0x64, 0xb4, 0x1c, 0x0d,
-	0x92, 0xbb, 0x18, 0x07, 0x2c, 0x64, 0x2d, 0x90, 0x10, 0x8a, 0xfc, 0x54, 0x01, 0x15, 0xe7, 0xed,
-	0x8b, 0x96, 0x2e, 0x46, 0x62, 0x6c, 0xed, 0x2a, 0xe3, 0x6a, 0x8f, 0xd4, 0x74, 0xf1, 0x85, 0x27,
-	0xae, 0x90, 0x1a, 0x41, 0x54, 0xe1, 0x75, 0x1b, 0x84, 0x24, 0x4b, 0x78, 0x3a, 0x60, 0x21, 0xf8,
-	0x52, 0xc3, 0xe8, 0x27, 0xb2, 0x8c, 0xe7, 0x02, 0xe6, 0x40, 0x4d, 0xb8, 0x47, 0xa0, 0x49, 0x66,
-	0xa3, 0x81, 0x5d, 0xf7, 0x08, 0xc8, 0xe5, 0x08, 0xc2, 0x81, 0x9a, 0xe4, 0xfb, 0xe0, 0x2b, 0x88,
-	0xb9, 0xaa, 0x92, 0x3f, 0x8b, 0x06, 0xcc, 0xf7, 0x38, 0xd7, 0x6f, 0x25, 0x02, 0xee, 0x0b, 0x20,
-	0x0f, 0xf0, 0xac, 0xbe, 0x44, 0x91, 0x47, 0x85, 0xa9, 0xe2, 0xbc, 0x7d, 0xd5, 0x3a, 0xfb, 0x1a,
-	0x2d, 0xbd, 0xbe, 0xda, 0x59, 0x44, 0xae, 0xe3, 0xf3, 0x3e, 0x1c, 0xca, 0x5a, 0x8f, 0x79, 0x46,
-	0x99, 0x67, 0xa3, 0xe1, 0x9d, 0x0e, 0xc0, 0x0d, 0xbc, 0xb8, 0x0d, 0x89, 0x7f, 0x72, 0xd2, 0x11,
-	0x45, 0x37, 0x5b, 0x38, 0x57, 0x0e, 0x81, 0x49, 0x18, 0xd0, 0x9e, 0x55, 0x95, 0x0d, 0x3c, 0xa3,
-	0x61, 0x94, 0x71, 0xca, 0x03, 0x24, 0x6b, 0xcc, 0x8f, 0x08, 0xe7, 0x9e, 0x07, 0x8d, 0x61, 0xbf,
-	0x9e, 0x7d, 0xd1, 0xe4, 0xfb, 0x92, 0x75, 0x3c, 0xdf, 0x56, 0xdb, 0xaa, 0x34, 0x6a, 0x34, 0x63,
-	0x28, 0x15, 0x5b, 0x51, 0x60, 0x9f, 0x32, 0xb1, 0x5f, 0xc5, 0xb1, 0x3c, 0xfa, 0x6d, 0x96, 0x70,
-	0xae, 0x02, 0x1e, 0x0c, 0x31, 0x8d, 0xaa, 0x97, 0x8d, 0xf3, 0xb1, 0xf6, 0xa1, 0xe7, 0xa5, 0x4c,
-	0x92, 0xfd, 0x6b, 0x06, 0xcf, 0x26, 0x5a, 0xf2, 0x0d, 0xe1, 0x85, 0xde, 0x6c, 0x10, 0x3a, 0xee,
-	0xa0, 0x23, 0x02, 0x6b, 0xdc, 0x4a, 0xbf, 0x20, 0x8e, 0x9d, 0xb9, 0xf6, 0xe1, 0xc7, 0xcf, 0x4f,
-	0x99, 0x55, 0x72, 0x3b, 0x7a, 0x8b, 0xbc, 0x8b, 0xa9, 0x36, 0x82, 0x90, 0xbf, 0x82, 0xba, 0x14,
-	0xb4, 0x44, 0x99, 0x03, 0xbe, 0xa4, 0x02, 0x84, 0x88, 0xde, 0x12, 0xb4, 0x74, 0x4c, 0x3b, 0x81,
-	0x3b, 0x41, 0x18, 0x77, 0x93, 0x44, 0x6e, 0x8e, 0xf3, 0x1e, 0x4a, 0x9c, 0x91, 0xe6, 0x12, 0x07,
-	0xe8, 0xa2, 0x2a, 0x8f, 0x63, 0xeb, 0xa0, 0xd1, 0xd2, 0x31, 0x39, 0x45, 0x38, 0xdb, 0x17, 0x5f,
-	0x32, 0xb6, 0x38, 0xa3, 0x92, 0x9e, 0x8e, 0x71, 0x53, 0x31, 0xde, 0x37, 0x27, 0xaf, 0xe0, 0xbd,
-	0x4e, 0x46, 0xbf, 0x23, 0x9c, 0xed, 0xcb, 0xfe, 0x78, 0xd8, 0x51, 0x6d, 0x92, 0x0e, 0xf6, 0xb1,
-	0x82, 0xad, 0xd8, 0x6b, 0x0a, 0x36, 0xf9, 0x6a, 0x4c, 0x52, 0xd8, 0x2e, 0xf4, 0x67, 0x84, 0xb3,
-	0x7d, 0xcd, 0x31, 0x1e, 0x7a, 0x54, 0x1f, 0x19, 0x4b, 0x43, 0x7d, 0xf8, 0x28, 0xfa, 0xaa, 0x24,
-	0x17, 0x5f, 0xfa, 0x87, 0x8b, 0xff, 0x82, 0xf0, 0xe2, 0x50, 0x1f, 0x92, 0x3b, 0x7f, 0x47, 0x1b,
-	0x6e, 0xdb, 0x94, 0x78, 0x93, 0xdc, 0xf9, 0xe6, 0x09, 0xc2, 0x57, 0xea, 0xbc, 0x35, 0x06, 0x67,
-	0x73, 0x41, 0x63, 0xec, 0x44, 0xa6, 0x3b, 0xe8, 0x65, 0x45, 0x6b, 0x1d, 0xee, 0x31, 0xdf, 0xb1,
-	0x78, 0xe8, 0x50, 0x07, 0x7c, 0x85, 0x44, 0xe3, 0x29, 0x16, 0xb8, 0x62, 0xd4, 0xff, 0x82, 0xf5,
-	0xee, 0xd3, 0x6f, 0x84, 0xbe, 0x66, 0x32, 0x95, 0xad, 0xd3, 0x8c, 0xb1, 0x1d, 0x6f, 0x57, 0x56,
-	0xd6, 0x95, 0xae, 0xf5, 0x0b, 0x7b, 0x6f, 0x5a, 0xed, 0xba, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff,
-	0x82, 0x9d, 0xa3, 0xd9, 0x6c, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2/entity_type.pb.go b/googleapis/cloud/dialogflow/v2/entity_type.pb.go
index 24ccdb77eb..16d56cd199 100644
--- a/googleapis/cloud/dialogflow/v2/entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2/entity_type.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents kinds of entities.
 type EntityType_Kind int32
@@ -48,6 +48,7 @@ var EntityType_Kind_name = map[int32]string{
 	1: "KIND_MAP",
 	2: "KIND_LIST",
 }
+
 var EntityType_Kind_value = map[string]int32{
 	"KIND_UNSPECIFIED": 0,
 	"KIND_MAP":         1,
@@ -57,8 +58,9 @@ var EntityType_Kind_value = map[string]int32{
 func (x EntityType_Kind) String() string {
 	return proto.EnumName(EntityType_Kind_name, int32(x))
 }
+
 func (EntityType_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{0, 0}
+	return fileDescriptor_252de8d6c5f5c76d, []int{0, 0}
 }
 
 // Represents different entity type expansion modes. Automated expansion
@@ -78,6 +80,7 @@ var EntityType_AutoExpansionMode_name = map[int32]string{
 	0: "AUTO_EXPANSION_MODE_UNSPECIFIED",
 	1: "AUTO_EXPANSION_MODE_DEFAULT",
 }
+
 var EntityType_AutoExpansionMode_value = map[string]int32{
 	"AUTO_EXPANSION_MODE_UNSPECIFIED": 0,
 	"AUTO_EXPANSION_MODE_DEFAULT":     1,
@@ -86,8 +89,9 @@ var EntityType_AutoExpansionMode_value = map[string]int32{
 func (x EntityType_AutoExpansionMode) String() string {
 	return proto.EnumName(EntityType_AutoExpansionMode_name, int32(x))
 }
+
 func (EntityType_AutoExpansionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{0, 1}
+	return fileDescriptor_252de8d6c5f5c76d, []int{0, 1}
 }
 
 // Represents an entity type.
@@ -117,16 +121,17 @@ func (m *EntityType) Reset()         { *m = EntityType{} }
 func (m *EntityType) String() string { return proto.CompactTextString(m) }
 func (*EntityType) ProtoMessage()    {}
 func (*EntityType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{0}
+	return fileDescriptor_252de8d6c5f5c76d, []int{0}
 }
+
 func (m *EntityType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityType.Unmarshal(m, b)
 }
 func (m *EntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityType.Marshal(b, m, deterministic)
 }
-func (dst *EntityType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityType.Merge(dst, src)
+func (m *EntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType.Merge(m, src)
 }
 func (m *EntityType) XXX_Size() int {
 	return xxx_messageInfo_EntityType.Size(m)
@@ -204,16 +209,17 @@ func (m *EntityType_Entity) Reset()         { *m = EntityType_Entity{} }
 func (m *EntityType_Entity) String() string { return proto.CompactTextString(m) }
 func (*EntityType_Entity) ProtoMessage()    {}
 func (*EntityType_Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{0, 0}
+	return fileDescriptor_252de8d6c5f5c76d, []int{0, 0}
 }
+
 func (m *EntityType_Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityType_Entity.Unmarshal(m, b)
 }
 func (m *EntityType_Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityType_Entity.Marshal(b, m, deterministic)
 }
-func (dst *EntityType_Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityType_Entity.Merge(dst, src)
+func (m *EntityType_Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType_Entity.Merge(m, src)
 }
 func (m *EntityType_Entity) XXX_Size() int {
 	return xxx_messageInfo_EntityType_Entity.Size(m)
@@ -264,16 +270,17 @@ func (m *ListEntityTypesRequest) Reset()         { *m = ListEntityTypesRequest{}
 func (m *ListEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListEntityTypesRequest) ProtoMessage()    {}
 func (*ListEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{1}
+	return fileDescriptor_252de8d6c5f5c76d, []int{1}
 }
+
 func (m *ListEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *ListEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListEntityTypesRequest.Merge(dst, src)
+func (m *ListEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesRequest.Merge(m, src)
 }
 func (m *ListEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListEntityTypesRequest.Size(m)
@@ -329,16 +336,17 @@ func (m *ListEntityTypesResponse) Reset()         { *m = ListEntityTypesResponse
 func (m *ListEntityTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListEntityTypesResponse) ProtoMessage()    {}
 func (*ListEntityTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{2}
+	return fileDescriptor_252de8d6c5f5c76d, []int{2}
 }
+
 func (m *ListEntityTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListEntityTypesResponse.Unmarshal(m, b)
 }
 func (m *ListEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListEntityTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListEntityTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListEntityTypesResponse.Merge(dst, src)
+func (m *ListEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesResponse.Merge(m, src)
 }
 func (m *ListEntityTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListEntityTypesResponse.Size(m)
@@ -384,16 +392,17 @@ func (m *GetEntityTypeRequest) Reset()         { *m = GetEntityTypeRequest{} }
 func (m *GetEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*GetEntityTypeRequest) ProtoMessage()    {}
 func (*GetEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{3}
+	return fileDescriptor_252de8d6c5f5c76d, []int{3}
 }
+
 func (m *GetEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *GetEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetEntityTypeRequest.Merge(dst, src)
+func (m *GetEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetEntityTypeRequest.Merge(m, src)
 }
 func (m *GetEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_GetEntityTypeRequest.Size(m)
@@ -441,16 +450,17 @@ func (m *CreateEntityTypeRequest) Reset()         { *m = CreateEntityTypeRequest
 func (m *CreateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateEntityTypeRequest) ProtoMessage()    {}
 func (*CreateEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{4}
+	return fileDescriptor_252de8d6c5f5c76d, []int{4}
 }
+
 func (m *CreateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *CreateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateEntityTypeRequest.Merge(dst, src)
+func (m *CreateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateEntityTypeRequest.Merge(m, src)
 }
 func (m *CreateEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateEntityTypeRequest.Size(m)
@@ -504,16 +514,17 @@ func (m *UpdateEntityTypeRequest) Reset()         { *m = UpdateEntityTypeRequest
 func (m *UpdateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateEntityTypeRequest) ProtoMessage()    {}
 func (*UpdateEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{5}
+	return fileDescriptor_252de8d6c5f5c76d, []int{5}
 }
+
 func (m *UpdateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *UpdateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateEntityTypeRequest.Merge(dst, src)
+func (m *UpdateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateEntityTypeRequest.Merge(m, src)
 }
 func (m *UpdateEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateEntityTypeRequest.Size(m)
@@ -559,16 +570,17 @@ func (m *DeleteEntityTypeRequest) Reset()         { *m = DeleteEntityTypeRequest
 func (m *DeleteEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteEntityTypeRequest) ProtoMessage()    {}
 func (*DeleteEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{6}
+	return fileDescriptor_252de8d6c5f5c76d, []int{6}
 }
+
 func (m *DeleteEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *DeleteEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteEntityTypeRequest.Merge(dst, src)
+func (m *DeleteEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEntityTypeRequest.Merge(m, src)
 }
 func (m *DeleteEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteEntityTypeRequest.Size(m)
@@ -620,16 +632,17 @@ func (m *BatchUpdateEntityTypesRequest) Reset()         { *m = BatchUpdateEntity
 func (m *BatchUpdateEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateEntityTypesRequest) ProtoMessage()    {}
 func (*BatchUpdateEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{7}
+	return fileDescriptor_252de8d6c5f5c76d, []int{7}
 }
+
 func (m *BatchUpdateEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdateEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateEntityTypesRequest.Merge(dst, src)
+func (m *BatchUpdateEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesRequest.Merge(m, src)
 }
 func (m *BatchUpdateEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Size(m)
@@ -700,76 +713,14 @@ func (m *BatchUpdateEntityTypesRequest) GetUpdateMask() *field_mask.FieldMask {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchUpdateEntityTypesRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchUpdateEntityTypesRequest_OneofMarshaler, _BatchUpdateEntityTypesRequest_OneofUnmarshaler, _BatchUpdateEntityTypesRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchUpdateEntityTypesRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchUpdateEntityTypesRequest_EntityTypeBatchUri)(nil),
 		(*BatchUpdateEntityTypesRequest_EntityTypeBatchInline)(nil),
 	}
 }
 
-func _BatchUpdateEntityTypesRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchUpdateEntityTypesRequest)
-	// entity_type_batch
-	switch x := m.EntityTypeBatch.(type) {
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.EntityTypeBatchUri)
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchInline:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EntityTypeBatchInline); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchUpdateEntityTypesRequest.EntityTypeBatch has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchUpdateEntityTypesRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchUpdateEntityTypesRequest)
-	switch tag {
-	case 2: // entity_type_batch.entity_type_batch_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.EntityTypeBatch = &BatchUpdateEntityTypesRequest_EntityTypeBatchUri{x}
-		return true, err
-	case 3: // entity_type_batch.entity_type_batch_inline
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EntityTypeBatch)
-		err := b.DecodeMessage(msg)
-		m.EntityTypeBatch = &BatchUpdateEntityTypesRequest_EntityTypeBatchInline{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchUpdateEntityTypesRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchUpdateEntityTypesRequest)
-	// entity_type_batch
-	switch x := m.EntityTypeBatch.(type) {
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EntityTypeBatchUri)))
-		n += len(x.EntityTypeBatchUri)
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchInline:
-		s := proto.Size(x.EntityTypeBatchInline)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
 type BatchUpdateEntityTypesResponse struct {
 	// The collection of updated or created entity types.
@@ -783,16 +734,17 @@ func (m *BatchUpdateEntityTypesResponse) Reset()         { *m = BatchUpdateEntit
 func (m *BatchUpdateEntityTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateEntityTypesResponse) ProtoMessage()    {}
 func (*BatchUpdateEntityTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{8}
+	return fileDescriptor_252de8d6c5f5c76d, []int{8}
 }
+
 func (m *BatchUpdateEntityTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Unmarshal(m, b)
 }
 func (m *BatchUpdateEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateEntityTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateEntityTypesResponse.Merge(dst, src)
+func (m *BatchUpdateEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesResponse.Merge(m, src)
 }
 func (m *BatchUpdateEntityTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Size(m)
@@ -827,16 +779,17 @@ func (m *BatchDeleteEntityTypesRequest) Reset()         { *m = BatchDeleteEntity
 func (m *BatchDeleteEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeleteEntityTypesRequest) ProtoMessage()    {}
 func (*BatchDeleteEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{9}
+	return fileDescriptor_252de8d6c5f5c76d, []int{9}
 }
+
 func (m *BatchDeleteEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *BatchDeleteEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeleteEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeleteEntityTypesRequest.Merge(dst, src)
+func (m *BatchDeleteEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntityTypesRequest.Merge(m, src)
 }
 func (m *BatchDeleteEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Size(m)
@@ -884,16 +837,17 @@ func (m *BatchCreateEntitiesRequest) Reset()         { *m = BatchCreateEntitiesR
 func (m *BatchCreateEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateEntitiesRequest) ProtoMessage()    {}
 func (*BatchCreateEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{10}
+	return fileDescriptor_252de8d6c5f5c76d, []int{10}
 }
+
 func (m *BatchCreateEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateEntitiesRequest.Unmarshal(m, b)
 }
 func (m *BatchCreateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateEntitiesRequest.Merge(dst, src)
+func (m *BatchCreateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateEntitiesRequest.Merge(m, src)
 }
 func (m *BatchCreateEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateEntitiesRequest.Size(m)
@@ -950,16 +904,17 @@ func (m *BatchUpdateEntitiesRequest) Reset()         { *m = BatchUpdateEntitiesR
 func (m *BatchUpdateEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateEntitiesRequest) ProtoMessage()    {}
 func (*BatchUpdateEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{11}
+	return fileDescriptor_252de8d6c5f5c76d, []int{11}
 }
+
 func (m *BatchUpdateEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateEntitiesRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateEntitiesRequest.Merge(dst, src)
+func (m *BatchUpdateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntitiesRequest.Merge(m, src)
 }
 func (m *BatchUpdateEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateEntitiesRequest.Size(m)
@@ -1023,16 +978,17 @@ func (m *BatchDeleteEntitiesRequest) Reset()         { *m = BatchDeleteEntitiesR
 func (m *BatchDeleteEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeleteEntitiesRequest) ProtoMessage()    {}
 func (*BatchDeleteEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{12}
+	return fileDescriptor_252de8d6c5f5c76d, []int{12}
 }
+
 func (m *BatchDeleteEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeleteEntitiesRequest.Unmarshal(m, b)
 }
 func (m *BatchDeleteEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeleteEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeleteEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeleteEntitiesRequest.Merge(dst, src)
+func (m *BatchDeleteEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntitiesRequest.Merge(m, src)
 }
 func (m *BatchDeleteEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeleteEntitiesRequest.Size(m)
@@ -1077,16 +1033,17 @@ func (m *EntityTypeBatch) Reset()         { *m = EntityTypeBatch{} }
 func (m *EntityTypeBatch) String() string { return proto.CompactTextString(m) }
 func (*EntityTypeBatch) ProtoMessage()    {}
 func (*EntityTypeBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_d3df53e4da2ed9bd, []int{13}
+	return fileDescriptor_252de8d6c5f5c76d, []int{13}
 }
+
 func (m *EntityTypeBatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityTypeBatch.Unmarshal(m, b)
 }
 func (m *EntityTypeBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityTypeBatch.Marshal(b, m, deterministic)
 }
-func (dst *EntityTypeBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityTypeBatch.Merge(dst, src)
+func (m *EntityTypeBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityTypeBatch.Merge(m, src)
 }
 func (m *EntityTypeBatch) XXX_Size() int {
 	return xxx_messageInfo_EntityTypeBatch.Size(m)
@@ -1105,6 +1062,8 @@ func (m *EntityTypeBatch) GetEntityTypes() []*EntityType {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2.EntityType_Kind", EntityType_Kind_name, EntityType_Kind_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.EntityType_AutoExpansionMode", EntityType_AutoExpansionMode_name, EntityType_AutoExpansionMode_value)
 	proto.RegisterType((*EntityType)(nil), "google.cloud.dialogflow.v2.EntityType")
 	proto.RegisterType((*EntityType_Entity)(nil), "google.cloud.dialogflow.v2.EntityType.Entity")
 	proto.RegisterType((*ListEntityTypesRequest)(nil), "google.cloud.dialogflow.v2.ListEntityTypesRequest")
@@ -1120,8 +1079,92 @@ func init() {
 	proto.RegisterType((*BatchUpdateEntitiesRequest)(nil), "google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest")
 	proto.RegisterType((*BatchDeleteEntitiesRequest)(nil), "google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest")
 	proto.RegisterType((*EntityTypeBatch)(nil), "google.cloud.dialogflow.v2.EntityTypeBatch")
-	proto.RegisterEnum("google.cloud.dialogflow.v2.EntityType_Kind", EntityType_Kind_name, EntityType_Kind_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2.EntityType_AutoExpansionMode", EntityType_AutoExpansionMode_name, EntityType_AutoExpansionMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/entity_type.proto", fileDescriptor_252de8d6c5f5c76d)
+}
+
+var fileDescriptor_252de8d6c5f5c76d = []byte{
+	// 1243 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0x4d, 0x6f, 0x1b, 0x45,
+	0x18, 0xc7, 0x33, 0x8e, 0x13, 0x25, 0x8f, 0x93, 0xc6, 0x99, 0xa4, 0x89, 0xd9, 0x34, 0x6d, 0xd8,
+	0x48, 0x55, 0x48, 0xa9, 0x17, 0x1c, 0x15, 0xb5, 0xa9, 0x80, 0x26, 0xb1, 0x93, 0x9a, 0xbc, 0x59,
+	0x9b, 0xa4, 0x02, 0x84, 0xb4, 0xda, 0xd8, 0x13, 0x77, 0x89, 0x3d, 0xb3, 0xec, 0x4b, 0xa8, 0x8b,
+	0xca, 0x01, 0x8e, 0x70, 0x01, 0xae, 0x08, 0x24, 0xc4, 0x09, 0x09, 0x71, 0xe1, 0x82, 0xb8, 0x72,
+	0xe3, 0xc8, 0x27, 0x40, 0xe2, 0x43, 0x70, 0x44, 0x3b, 0xbb, 0x9b, 0x5d, 0xaf, 0xd7, 0xf6, 0x46,
+	0x84, 0x8a, 0x9b, 0xe7, 0xed, 0x79, 0x7e, 0xcf, 0xcb, 0xcc, 0x3f, 0x1b, 0x78, 0xb9, 0xce, 0x58,
+	0xbd, 0x41, 0xa4, 0x6a, 0x83, 0xd9, 0x35, 0xa9, 0xa6, 0xa9, 0x0d, 0x56, 0x3f, 0x69, 0xb0, 0x0f,
+	0xa5, 0xb3, 0x82, 0x44, 0xa8, 0xa5, 0x59, 0x2d, 0xc5, 0x6a, 0xe9, 0x24, 0xaf, 0x1b, 0xcc, 0x62,
+	0x58, 0x70, 0x77, 0xe7, 0xf9, 0xee, 0x7c, 0xb0, 0x3b, 0x7f, 0x56, 0x10, 0xae, 0x79, 0x96, 0x54,
+	0x5d, 0x93, 0x54, 0x4a, 0x99, 0xa5, 0x5a, 0x1a, 0xa3, 0xa6, 0x7b, 0x52, 0x78, 0x21, 0xb4, 0x6a,
+	0x10, 0x93, 0xd9, 0x46, 0xd5, 0x33, 0x2a, 0x2c, 0x7a, 0x4b, 0x0d, 0x46, 0xeb, 0x86, 0x4d, 0xa9,
+	0x46, 0xeb, 0x12, 0xd3, 0x89, 0xd1, 0x76, 0x7e, 0xce, 0xdb, 0xc4, 0x47, 0xc7, 0xf6, 0x89, 0x44,
+	0x9a, 0xba, 0xd5, 0xf2, 0x16, 0x17, 0xa2, 0x8b, 0x27, 0x1a, 0x69, 0xd4, 0x94, 0xa6, 0x6a, 0x9e,
+	0x7a, 0x3b, 0xae, 0x45, 0x77, 0x98, 0x96, 0x61, 0x57, 0x2d, 0x77, 0x55, 0xfc, 0x2c, 0x0d, 0x50,
+	0xe2, 0xc1, 0x1e, 0xb6, 0x74, 0x82, 0x31, 0xa4, 0xa9, 0xda, 0x24, 0x39, 0xb4, 0x80, 0x96, 0x46,
+	0x65, 0xfe, 0x1b, 0xbf, 0x08, 0x63, 0x35, 0xcd, 0xd4, 0x1b, 0x6a, 0x4b, 0xe1, 0x6b, 0x29, 0xbe,
+	0x96, 0xf1, 0xe6, 0xf6, 0x9c, 0x2d, 0x6f, 0x42, 0xfa, 0x54, 0xa3, 0xb5, 0xdc, 0xe0, 0x02, 0x5a,
+	0xba, 0x52, 0xb8, 0x95, 0xef, 0x9e, 0xab, 0x7c, 0xe0, 0x2c, 0xbf, 0xad, 0xd1, 0x9a, 0xcc, 0x0f,
+	0xe2, 0xc7, 0x30, 0xa5, 0xda, 0x16, 0x53, 0xc8, 0x13, 0x5d, 0xa5, 0xa6, 0xc6, 0xa8, 0xd2, 0x64,
+	0x35, 0x92, 0x4b, 0x73, 0x7b, 0x77, 0x13, 0xda, 0x5b, 0xb3, 0x2d, 0x56, 0xf2, 0x0d, 0xec, 0xb2,
+	0x1a, 0x91, 0x27, 0xd5, 0xe8, 0x14, 0x2e, 0xc3, 0x08, 0x2f, 0xae, 0x46, 0xcc, 0xdc, 0xf0, 0xc2,
+	0xe0, 0x52, 0xa6, 0x70, 0x3b, 0xa1, 0x79, 0xf7, 0xa7, 0x7c, 0x7e, 0x5c, 0x58, 0x85, 0x61, 0x77,
+	0x0e, 0x4f, 0xc3, 0xd0, 0x99, 0xda, 0xb0, 0xfd, 0xbc, 0xb9, 0x03, 0x2c, 0xc0, 0x88, 0xd9, 0xa2,
+	0x8c, 0xb6, 0x9a, 0x66, 0x2e, 0xb5, 0x30, 0xb8, 0x34, 0x2a, 0x9f, 0x8f, 0xc5, 0x7b, 0x90, 0x76,
+	0xc2, 0xc7, 0xd3, 0x90, 0xdd, 0x2e, 0xef, 0x15, 0x95, 0xa3, 0xbd, 0x83, 0x4a, 0x69, 0xa3, 0xbc,
+	0x59, 0x2e, 0x15, 0xb3, 0x03, 0x78, 0x0c, 0x46, 0xf8, 0xec, 0xee, 0x5a, 0x25, 0x8b, 0xf0, 0x38,
+	0x8c, 0xf2, 0xd1, 0x4e, 0xf9, 0xe0, 0x30, 0x9b, 0x12, 0xdf, 0x81, 0xc9, 0x8e, 0x48, 0xf1, 0x22,
+	0xdc, 0x58, 0x3b, 0x3a, 0xdc, 0x57, 0x4a, 0x6f, 0x57, 0xd6, 0xf6, 0x0e, 0xca, 0xfb, 0x7b, 0xca,
+	0xee, 0x7e, 0xb1, 0x14, 0x31, 0x7b, 0x03, 0xe6, 0xe2, 0x36, 0x15, 0x4b, 0x9b, 0x6b, 0x47, 0x3b,
+	0x87, 0x59, 0x24, 0x7e, 0x81, 0x60, 0x66, 0x47, 0x33, 0xad, 0x20, 0x6a, 0x53, 0x26, 0x1f, 0xd8,
+	0xc4, 0xb4, 0xf0, 0x0c, 0x0c, 0xeb, 0xaa, 0x41, 0xa8, 0xe5, 0xc5, 0xe8, 0x8d, 0xf0, 0x22, 0x8c,
+	0x37, 0x54, 0x5a, 0xb7, 0xd5, 0x3a, 0x51, 0xaa, 0x4e, 0xcd, 0xdc, 0xf6, 0x18, 0xf3, 0x27, 0x37,
+	0x1c, 0xba, 0x39, 0x18, 0xd5, 0x9d, 0x0d, 0xa6, 0xf6, 0x94, 0xf0, 0x26, 0x19, 0x92, 0x47, 0x9c,
+	0x89, 0x03, 0xed, 0x29, 0xc1, 0xf3, 0x00, 0x7c, 0xd1, 0x62, 0xa7, 0x84, 0xf2, 0x92, 0x8f, 0xca,
+	0x7c, 0xfb, 0xa1, 0x33, 0x21, 0x7e, 0x8e, 0x60, 0xb6, 0x83, 0xc9, 0xd4, 0x19, 0x35, 0x9d, 0x62,
+	0x8e, 0x85, 0x6e, 0xaa, 0x99, 0x43, 0xbc, 0xa0, 0x37, 0x93, 0x15, 0x54, 0xce, 0x90, 0xc0, 0x24,
+	0xbe, 0x09, 0x13, 0x94, 0x3c, 0xb1, 0x94, 0x10, 0x8a, 0x1b, 0xc9, 0xb8, 0x33, 0x5d, 0x39, 0xc7,
+	0xd9, 0x87, 0xe9, 0x2d, 0x12, 0x82, 0xf1, 0xf3, 0x13, 0x77, 0x73, 0x92, 0xe4, 0x46, 0xfc, 0x16,
+	0xc1, 0xec, 0x86, 0x41, 0x54, 0x8b, 0x74, 0x1a, 0xed, 0x96, 0xf4, 0x2d, 0xc8, 0x84, 0xe2, 0xe6,
+	0x66, 0x93, 0x87, 0x0d, 0x41, 0xd8, 0x9d, 0x84, 0x83, 0x31, 0x84, 0xbf, 0x21, 0x98, 0x3d, 0xd2,
+	0x6b, 0xb1, 0x84, 0x11, 0x12, 0x74, 0x79, 0x24, 0x71, 0x7d, 0x74, 0x1f, 0x32, 0x36, 0x07, 0xe1,
+	0x0f, 0x1c, 0x87, 0xcd, 0x14, 0x04, 0xdf, 0x9b, 0xff, 0xc2, 0xe5, 0x37, 0x9d, 0x37, 0x70, 0x57,
+	0x35, 0x4f, 0x65, 0x70, 0xb7, 0x3b, 0xbf, 0xc5, 0xdb, 0x30, 0x5b, 0x24, 0x0d, 0x12, 0x17, 0x45,
+	0x4c, 0xf1, 0xc4, 0xdf, 0x53, 0x30, 0xbf, 0xae, 0x5a, 0xd5, 0xc7, 0xd1, 0xd0, 0xfb, 0x5e, 0x89,
+	0x15, 0xb8, 0x1a, 0xca, 0x89, 0x72, 0xec, 0x18, 0x51, 0x6c, 0x43, 0x73, 0x43, 0x7a, 0x38, 0x20,
+	0xe3, 0x20, 0x6e, 0xd7, 0x83, 0xa1, 0xe1, 0x13, 0xc8, 0x75, 0x1e, 0xd2, 0x68, 0x43, 0xa3, 0xc4,
+	0x8b, 0x33, 0xe1, 0xb3, 0xca, 0x2d, 0x3e, 0x1c, 0x90, 0xaf, 0x46, 0x9c, 0x94, 0xb9, 0xad, 0xce,
+	0x3c, 0xa7, 0xfb, 0xe7, 0x79, 0xe8, 0x22, 0x79, 0x5e, 0x9f, 0x82, 0xc9, 0x8e, 0x48, 0xc4, 0x53,
+	0xb8, 0xde, 0x2d, 0x99, 0x97, 0x7e, 0x97, 0xc5, 0xaa, 0x57, 0xb9, 0x68, 0xb9, 0xfb, 0x56, 0x6e,
+	0xb9, 0x1d, 0xdd, 0xe9, 0x03, 0xff, 0xe9, 0x9e, 0x08, 0x1c, 0x38, 0x92, 0x67, 0x8a, 0xdf, 0x23,
+	0x10, 0xb8, 0x97, 0xd0, 0xe5, 0xd5, 0xfa, 0xbb, 0x08, 0xeb, 0x4f, 0xea, 0x5f, 0xe9, 0x4f, 0xb2,
+	0xcb, 0xfb, 0xa7, 0x8f, 0x19, 0xca, 0xfc, 0xff, 0x0f, 0x33, 0xda, 0x71, 0xe9, 0x0b, 0xdd, 0xec,
+	0x8f, 0xbd, 0x10, 0x43, 0xf5, 0xd6, 0x12, 0x29, 0x97, 0x57, 0x6c, 0x2e, 0xd7, 0x7e, 0xa1, 0xbd,
+	0x2e, 0x7c, 0xc4, 0xe7, 0x92, 0xe5, 0xf8, 0x3d, 0x98, 0x88, 0xdc, 0xbf, 0x4b, 0xec, 0xe6, 0xc2,
+	0xa7, 0x57, 0x20, 0x13, 0xea, 0x61, 0xfc, 0x23, 0x82, 0x89, 0x88, 0x20, 0xe2, 0x42, 0x2f, 0xc3,
+	0xf1, 0x8a, 0x2e, 0xac, 0x5c, 0xe8, 0x8c, 0x7b, 0x4b, 0xc5, 0x57, 0x3f, 0xf9, 0xe3, 0xaf, 0xaf,
+	0x52, 0xb7, 0xf0, 0x4b, 0xce, 0x5f, 0xc9, 0x1f, 0xb9, 0x99, 0x7c, 0x5d, 0x37, 0xd8, 0xfb, 0xa4,
+	0x6a, 0x99, 0xd2, 0xb2, 0xa4, 0xd6, 0x09, 0xb5, 0x9e, 0x49, 0x61, 0x65, 0xfd, 0x1a, 0xc1, 0x78,
+	0x9b, 0x64, 0xe2, 0x57, 0x7a, 0x79, 0x8e, 0x53, 0x57, 0x21, 0x61, 0xe2, 0x22, 0x78, 0xce, 0xfd,
+	0xed, 0x80, 0x0b, 0xb3, 0x49, 0xcb, 0xcf, 0xf0, 0x4f, 0x08, 0xb2, 0x51, 0xfd, 0xc5, 0x3d, 0x73,
+	0xd3, 0x45, 0xad, 0x13, 0x43, 0xbe, 0xc1, 0x21, 0xef, 0x8a, 0xc9, 0x73, 0xb8, 0x1a, 0x16, 0x59,
+	0xfc, 0x2b, 0x82, 0x6c, 0xf4, 0x1d, 0xed, 0x4d, 0xdc, 0x45, 0xbd, 0x13, 0x13, 0xbf, 0xc5, 0x89,
+	0x8b, 0x85, 0x3b, 0x9c, 0x38, 0xfc, 0x71, 0x94, 0x24, 0xc5, 0xed, 0xf4, 0x5f, 0x22, 0xc8, 0x46,
+	0x1f, 0xe6, 0xde, 0xf4, 0x5d, 0x54, 0x5b, 0x98, 0xe9, 0x78, 0x1e, 0x4a, 0xce, 0x97, 0x91, 0xdf,
+	0x04, 0xcb, 0x17, 0x68, 0x82, 0x9f, 0x11, 0xcc, 0xc4, 0xeb, 0x13, 0xbe, 0xd7, 0x0b, 0xad, 0xe7,
+	0x1f, 0x08, 0xc2, 0xbc, 0x7f, 0x34, 0xf4, 0x7d, 0x97, 0xdf, 0xf7, 0xbf, 0xef, 0xc4, 0x07, 0x9c,
+	0x73, 0x55, 0xbc, 0x93, 0xbc, 0x0f, 0x8e, 0x03, 0x7f, 0xab, 0x68, 0x39, 0xc0, 0xee, 0x50, 0xba,
+	0x04, 0xd8, 0xdd, 0xd4, 0xf1, 0xbf, 0xc2, 0x76, 0xfd, 0x39, 0xd8, 0xbf, 0x20, 0x98, 0x8a, 0x91,
+	0x4e, 0xfc, 0x5a, 0x5f, 0xe6, 0x58, 0xad, 0xed, 0x07, 0xbc, 0xcd, 0x81, 0x4b, 0xe2, 0x83, 0x5e,
+	0xc0, 0x91, 0x8e, 0x90, 0x7c, 0xf9, 0x72, 0xd9, 0x5d, 0xbf, 0x6d, 0xec, 0xed, 0x7a, 0x9a, 0x80,
+	0x3d, 0x56, 0x80, 0x9f, 0x03, 0x7b, 0xd0, 0x2e, 0xe7, 0xec, 0xed, 0x42, 0x99, 0x80, 0x3d, 0x56,
+	0x59, 0x9f, 0x03, 0xfb, 0x79, 0xcf, 0xac, 0x7f, 0x83, 0xe0, 0x7a, 0x95, 0x35, 0x7b, 0x90, 0xae,
+	0x87, 0x44, 0xb8, 0xe2, 0xbc, 0x08, 0x15, 0xf4, 0x6e, 0xd1, 0xdb, 0x5e, 0x67, 0x8e, 0x60, 0xe7,
+	0x99, 0x51, 0x97, 0xea, 0x84, 0xf2, 0xf7, 0x42, 0x72, 0x97, 0x54, 0x5d, 0x33, 0xe3, 0xfe, 0x05,
+	0x74, 0x3f, 0x18, 0xfd, 0x8d, 0xd0, 0x77, 0xa9, 0x54, 0x71, 0xf3, 0x87, 0x94, 0xb0, 0xe5, 0x9a,
+	0xdb, 0xe0, 0xde, 0x8b, 0x81, 0xf7, 0x47, 0x85, 0xe3, 0x61, 0x6e, 0x75, 0xe5, 0x9f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x3a, 0xb1, 0xdd, 0xd9, 0x57, 0x12, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1536,89 +1579,3 @@ var _EntityTypes_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2/entity_type.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/entity_type.proto", fileDescriptor_entity_type_d3df53e4da2ed9bd)
-}
-
-var fileDescriptor_entity_type_d3df53e4da2ed9bd = []byte{
-	// 1243 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0x4d, 0x6f, 0x1b, 0x45,
-	0x18, 0xc7, 0x33, 0x8e, 0x13, 0x25, 0x8f, 0x93, 0xc6, 0x99, 0xa4, 0x89, 0xd9, 0x34, 0x6d, 0xd8,
-	0x48, 0x55, 0x48, 0xa9, 0x17, 0x1c, 0x15, 0xb5, 0xa9, 0x80, 0x26, 0xb1, 0x93, 0x9a, 0xbc, 0x59,
-	0x9b, 0xa4, 0x02, 0x84, 0xb4, 0xda, 0xd8, 0x13, 0x77, 0x89, 0x3d, 0xb3, 0xec, 0x4b, 0xa8, 0x8b,
-	0xca, 0x01, 0x8e, 0x70, 0x01, 0xae, 0x08, 0x24, 0xc4, 0x09, 0x09, 0x71, 0xe1, 0x82, 0xb8, 0x72,
-	0xe3, 0xc8, 0x27, 0x40, 0xe2, 0x43, 0x70, 0x44, 0x3b, 0xbb, 0x9b, 0x5d, 0xaf, 0xd7, 0xf6, 0x46,
-	0x84, 0x8a, 0x9b, 0xe7, 0xed, 0x79, 0x7e, 0xcf, 0xcb, 0xcc, 0x3f, 0x1b, 0x78, 0xb9, 0xce, 0x58,
-	0xbd, 0x41, 0xa4, 0x6a, 0x83, 0xd9, 0x35, 0xa9, 0xa6, 0xa9, 0x0d, 0x56, 0x3f, 0x69, 0xb0, 0x0f,
-	0xa5, 0xb3, 0x82, 0x44, 0xa8, 0xa5, 0x59, 0x2d, 0xc5, 0x6a, 0xe9, 0x24, 0xaf, 0x1b, 0xcc, 0x62,
-	0x58, 0x70, 0x77, 0xe7, 0xf9, 0xee, 0x7c, 0xb0, 0x3b, 0x7f, 0x56, 0x10, 0xae, 0x79, 0x96, 0x54,
-	0x5d, 0x93, 0x54, 0x4a, 0x99, 0xa5, 0x5a, 0x1a, 0xa3, 0xa6, 0x7b, 0x52, 0x78, 0x21, 0xb4, 0x6a,
-	0x10, 0x93, 0xd9, 0x46, 0xd5, 0x33, 0x2a, 0x2c, 0x7a, 0x4b, 0x0d, 0x46, 0xeb, 0x86, 0x4d, 0xa9,
-	0x46, 0xeb, 0x12, 0xd3, 0x89, 0xd1, 0x76, 0x7e, 0xce, 0xdb, 0xc4, 0x47, 0xc7, 0xf6, 0x89, 0x44,
-	0x9a, 0xba, 0xd5, 0xf2, 0x16, 0x17, 0xa2, 0x8b, 0x27, 0x1a, 0x69, 0xd4, 0x94, 0xa6, 0x6a, 0x9e,
-	0x7a, 0x3b, 0xae, 0x45, 0x77, 0x98, 0x96, 0x61, 0x57, 0x2d, 0x77, 0x55, 0xfc, 0x2c, 0x0d, 0x50,
-	0xe2, 0xc1, 0x1e, 0xb6, 0x74, 0x82, 0x31, 0xa4, 0xa9, 0xda, 0x24, 0x39, 0xb4, 0x80, 0x96, 0x46,
-	0x65, 0xfe, 0x1b, 0xbf, 0x08, 0x63, 0x35, 0xcd, 0xd4, 0x1b, 0x6a, 0x4b, 0xe1, 0x6b, 0x29, 0xbe,
-	0x96, 0xf1, 0xe6, 0xf6, 0x9c, 0x2d, 0x6f, 0x42, 0xfa, 0x54, 0xa3, 0xb5, 0xdc, 0xe0, 0x02, 0x5a,
-	0xba, 0x52, 0xb8, 0x95, 0xef, 0x9e, 0xab, 0x7c, 0xe0, 0x2c, 0xbf, 0xad, 0xd1, 0x9a, 0xcc, 0x0f,
-	0xe2, 0xc7, 0x30, 0xa5, 0xda, 0x16, 0x53, 0xc8, 0x13, 0x5d, 0xa5, 0xa6, 0xc6, 0xa8, 0xd2, 0x64,
-	0x35, 0x92, 0x4b, 0x73, 0x7b, 0x77, 0x13, 0xda, 0x5b, 0xb3, 0x2d, 0x56, 0xf2, 0x0d, 0xec, 0xb2,
-	0x1a, 0x91, 0x27, 0xd5, 0xe8, 0x14, 0x2e, 0xc3, 0x08, 0x2f, 0xae, 0x46, 0xcc, 0xdc, 0xf0, 0xc2,
-	0xe0, 0x52, 0xa6, 0x70, 0x3b, 0xa1, 0x79, 0xf7, 0xa7, 0x7c, 0x7e, 0x5c, 0x58, 0x85, 0x61, 0x77,
-	0x0e, 0x4f, 0xc3, 0xd0, 0x99, 0xda, 0xb0, 0xfd, 0xbc, 0xb9, 0x03, 0x2c, 0xc0, 0x88, 0xd9, 0xa2,
-	0x8c, 0xb6, 0x9a, 0x66, 0x2e, 0xb5, 0x30, 0xb8, 0x34, 0x2a, 0x9f, 0x8f, 0xc5, 0x7b, 0x90, 0x76,
-	0xc2, 0xc7, 0xd3, 0x90, 0xdd, 0x2e, 0xef, 0x15, 0x95, 0xa3, 0xbd, 0x83, 0x4a, 0x69, 0xa3, 0xbc,
-	0x59, 0x2e, 0x15, 0xb3, 0x03, 0x78, 0x0c, 0x46, 0xf8, 0xec, 0xee, 0x5a, 0x25, 0x8b, 0xf0, 0x38,
-	0x8c, 0xf2, 0xd1, 0x4e, 0xf9, 0xe0, 0x30, 0x9b, 0x12, 0xdf, 0x81, 0xc9, 0x8e, 0x48, 0xf1, 0x22,
-	0xdc, 0x58, 0x3b, 0x3a, 0xdc, 0x57, 0x4a, 0x6f, 0x57, 0xd6, 0xf6, 0x0e, 0xca, 0xfb, 0x7b, 0xca,
-	0xee, 0x7e, 0xb1, 0x14, 0x31, 0x7b, 0x03, 0xe6, 0xe2, 0x36, 0x15, 0x4b, 0x9b, 0x6b, 0x47, 0x3b,
-	0x87, 0x59, 0x24, 0x7e, 0x81, 0x60, 0x66, 0x47, 0x33, 0xad, 0x20, 0x6a, 0x53, 0x26, 0x1f, 0xd8,
-	0xc4, 0xb4, 0xf0, 0x0c, 0x0c, 0xeb, 0xaa, 0x41, 0xa8, 0xe5, 0xc5, 0xe8, 0x8d, 0xf0, 0x22, 0x8c,
-	0x37, 0x54, 0x5a, 0xb7, 0xd5, 0x3a, 0x51, 0xaa, 0x4e, 0xcd, 0xdc, 0xf6, 0x18, 0xf3, 0x27, 0x37,
-	0x1c, 0xba, 0x39, 0x18, 0xd5, 0x9d, 0x0d, 0xa6, 0xf6, 0x94, 0xf0, 0x26, 0x19, 0x92, 0x47, 0x9c,
-	0x89, 0x03, 0xed, 0x29, 0xc1, 0xf3, 0x00, 0x7c, 0xd1, 0x62, 0xa7, 0x84, 0xf2, 0x92, 0x8f, 0xca,
-	0x7c, 0xfb, 0xa1, 0x33, 0x21, 0x7e, 0x8e, 0x60, 0xb6, 0x83, 0xc9, 0xd4, 0x19, 0x35, 0x9d, 0x62,
-	0x8e, 0x85, 0x6e, 0xaa, 0x99, 0x43, 0xbc, 0xa0, 0x37, 0x93, 0x15, 0x54, 0xce, 0x90, 0xc0, 0x24,
-	0xbe, 0x09, 0x13, 0x94, 0x3c, 0xb1, 0x94, 0x10, 0x8a, 0x1b, 0xc9, 0xb8, 0x33, 0x5d, 0x39, 0xc7,
-	0xd9, 0x87, 0xe9, 0x2d, 0x12, 0x82, 0xf1, 0xf3, 0x13, 0x77, 0x73, 0x92, 0xe4, 0x46, 0xfc, 0x16,
-	0xc1, 0xec, 0x86, 0x41, 0x54, 0x8b, 0x74, 0x1a, 0xed, 0x96, 0xf4, 0x2d, 0xc8, 0x84, 0xe2, 0xe6,
-	0x66, 0x93, 0x87, 0x0d, 0x41, 0xd8, 0x9d, 0x84, 0x83, 0x31, 0x84, 0xbf, 0x21, 0x98, 0x3d, 0xd2,
-	0x6b, 0xb1, 0x84, 0x11, 0x12, 0x74, 0x79, 0x24, 0x71, 0x7d, 0x74, 0x1f, 0x32, 0x36, 0x07, 0xe1,
-	0x0f, 0x1c, 0x87, 0xcd, 0x14, 0x04, 0xdf, 0x9b, 0xff, 0xc2, 0xe5, 0x37, 0x9d, 0x37, 0x70, 0x57,
-	0x35, 0x4f, 0x65, 0x70, 0xb7, 0x3b, 0xbf, 0xc5, 0xdb, 0x30, 0x5b, 0x24, 0x0d, 0x12, 0x17, 0x45,
-	0x4c, 0xf1, 0xc4, 0xdf, 0x53, 0x30, 0xbf, 0xae, 0x5a, 0xd5, 0xc7, 0xd1, 0xd0, 0xfb, 0x5e, 0x89,
-	0x15, 0xb8, 0x1a, 0xca, 0x89, 0x72, 0xec, 0x18, 0x51, 0x6c, 0x43, 0x73, 0x43, 0x7a, 0x38, 0x20,
-	0xe3, 0x20, 0x6e, 0xd7, 0x83, 0xa1, 0xe1, 0x13, 0xc8, 0x75, 0x1e, 0xd2, 0x68, 0x43, 0xa3, 0xc4,
-	0x8b, 0x33, 0xe1, 0xb3, 0xca, 0x2d, 0x3e, 0x1c, 0x90, 0xaf, 0x46, 0x9c, 0x94, 0xb9, 0xad, 0xce,
-	0x3c, 0xa7, 0xfb, 0xe7, 0x79, 0xe8, 0x22, 0x79, 0x5e, 0x9f, 0x82, 0xc9, 0x8e, 0x48, 0xc4, 0x53,
-	0xb8, 0xde, 0x2d, 0x99, 0x97, 0x7e, 0x97, 0xc5, 0xaa, 0x57, 0xb9, 0x68, 0xb9, 0xfb, 0x56, 0x6e,
-	0xb9, 0x1d, 0xdd, 0xe9, 0x03, 0xff, 0xe9, 0x9e, 0x08, 0x1c, 0x38, 0x92, 0x67, 0x8a, 0xdf, 0x23,
-	0x10, 0xb8, 0x97, 0xd0, 0xe5, 0xd5, 0xfa, 0xbb, 0x08, 0xeb, 0x4f, 0xea, 0x5f, 0xe9, 0x4f, 0xb2,
-	0xcb, 0xfb, 0xa7, 0x8f, 0x19, 0xca, 0xfc, 0xff, 0x0f, 0x33, 0xda, 0x71, 0xe9, 0x0b, 0xdd, 0xec,
-	0x8f, 0xbd, 0x10, 0x43, 0xf5, 0xd6, 0x12, 0x29, 0x97, 0x57, 0x6c, 0x2e, 0xd7, 0x7e, 0xa1, 0xbd,
-	0x2e, 0x7c, 0xc4, 0xe7, 0x92, 0xe5, 0xf8, 0x3d, 0x98, 0x88, 0xdc, 0xbf, 0x4b, 0xec, 0xe6, 0xc2,
-	0xa7, 0x57, 0x20, 0x13, 0xea, 0x61, 0xfc, 0x23, 0x82, 0x89, 0x88, 0x20, 0xe2, 0x42, 0x2f, 0xc3,
-	0xf1, 0x8a, 0x2e, 0xac, 0x5c, 0xe8, 0x8c, 0x7b, 0x4b, 0xc5, 0x57, 0x3f, 0xf9, 0xe3, 0xaf, 0xaf,
-	0x52, 0xb7, 0xf0, 0x4b, 0xce, 0x5f, 0xc9, 0x1f, 0xb9, 0x99, 0x7c, 0x5d, 0x37, 0xd8, 0xfb, 0xa4,
-	0x6a, 0x99, 0xd2, 0xb2, 0xa4, 0xd6, 0x09, 0xb5, 0x9e, 0x49, 0x61, 0x65, 0xfd, 0x1a, 0xc1, 0x78,
-	0x9b, 0x64, 0xe2, 0x57, 0x7a, 0x79, 0x8e, 0x53, 0x57, 0x21, 0x61, 0xe2, 0x22, 0x78, 0xce, 0xfd,
-	0xed, 0x80, 0x0b, 0xb3, 0x49, 0xcb, 0xcf, 0xf0, 0x4f, 0x08, 0xb2, 0x51, 0xfd, 0xc5, 0x3d, 0x73,
-	0xd3, 0x45, 0xad, 0x13, 0x43, 0xbe, 0xc1, 0x21, 0xef, 0x8a, 0xc9, 0x73, 0xb8, 0x1a, 0x16, 0x59,
-	0xfc, 0x2b, 0x82, 0x6c, 0xf4, 0x1d, 0xed, 0x4d, 0xdc, 0x45, 0xbd, 0x13, 0x13, 0xbf, 0xc5, 0x89,
-	0x8b, 0x85, 0x3b, 0x9c, 0x38, 0xfc, 0x71, 0x94, 0x24, 0xc5, 0xed, 0xf4, 0x5f, 0x22, 0xc8, 0x46,
-	0x1f, 0xe6, 0xde, 0xf4, 0x5d, 0x54, 0x5b, 0x98, 0xe9, 0x78, 0x1e, 0x4a, 0xce, 0x97, 0x91, 0xdf,
-	0x04, 0xcb, 0x17, 0x68, 0x82, 0x9f, 0x11, 0xcc, 0xc4, 0xeb, 0x13, 0xbe, 0xd7, 0x0b, 0xad, 0xe7,
-	0x1f, 0x08, 0xc2, 0xbc, 0x7f, 0x34, 0xf4, 0x7d, 0x97, 0xdf, 0xf7, 0xbf, 0xef, 0xc4, 0x07, 0x9c,
-	0x73, 0x55, 0xbc, 0x93, 0xbc, 0x0f, 0x8e, 0x03, 0x7f, 0xab, 0x68, 0x39, 0xc0, 0xee, 0x50, 0xba,
-	0x04, 0xd8, 0xdd, 0xd4, 0xf1, 0xbf, 0xc2, 0x76, 0xfd, 0x39, 0xd8, 0xbf, 0x20, 0x98, 0x8a, 0x91,
-	0x4e, 0xfc, 0x5a, 0x5f, 0xe6, 0x58, 0xad, 0xed, 0x07, 0xbc, 0xcd, 0x81, 0x4b, 0xe2, 0x83, 0x5e,
-	0xc0, 0x91, 0x8e, 0x90, 0x7c, 0xf9, 0x72, 0xd9, 0x5d, 0xbf, 0x6d, 0xec, 0xed, 0x7a, 0x9a, 0x80,
-	0x3d, 0x56, 0x80, 0x9f, 0x03, 0x7b, 0xd0, 0x2e, 0xe7, 0xec, 0xed, 0x42, 0x99, 0x80, 0x3d, 0x56,
-	0x59, 0x9f, 0x03, 0xfb, 0x79, 0xcf, 0xac, 0x7f, 0x83, 0xe0, 0x7a, 0x95, 0x35, 0x7b, 0x90, 0xae,
-	0x87, 0x44, 0xb8, 0xe2, 0xbc, 0x08, 0x15, 0xf4, 0x6e, 0xd1, 0xdb, 0x5e, 0x67, 0x8e, 0x60, 0xe7,
-	0x99, 0x51, 0x97, 0xea, 0x84, 0xf2, 0xf7, 0x42, 0x72, 0x97, 0x54, 0x5d, 0x33, 0xe3, 0xfe, 0x05,
-	0x74, 0x3f, 0x18, 0xfd, 0x8d, 0xd0, 0x77, 0xa9, 0x54, 0x71, 0xf3, 0x87, 0x94, 0xb0, 0xe5, 0x9a,
-	0xdb, 0xe0, 0xde, 0x8b, 0x81, 0xf7, 0x47, 0x85, 0xe3, 0x61, 0x6e, 0x75, 0xe5, 0x9f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x3a, 0xb1, 0xdd, 0xd9, 0x57, 0x12, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2/intent.pb.go b/googleapis/cloud/dialogflow/v2/intent.pb.go
index ecae9595e0..60d0f4ad74 100644
--- a/googleapis/cloud/dialogflow/v2/intent.pb.go
+++ b/googleapis/cloud/dialogflow/v2/intent.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/intent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the options for views of an intent.
 // An intent can be a sizable object. Therefore, we provide a resource view that
@@ -45,6 +45,7 @@ var IntentView_name = map[int32]string{
 	0: "INTENT_VIEW_UNSPECIFIED",
 	1: "INTENT_VIEW_FULL",
 }
+
 var IntentView_value = map[string]int32{
 	"INTENT_VIEW_UNSPECIFIED": 0,
 	"INTENT_VIEW_FULL":        1,
@@ -53,8 +54,9 @@ var IntentView_value = map[string]int32{
 func (x IntentView) String() string {
 	return proto.EnumName(IntentView_name, int32(x))
 }
+
 func (IntentView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0}
+	return fileDescriptor_6c20e31044d743bd, []int{0}
 }
 
 // Represents the different states that webhooks can be in.
@@ -75,6 +77,7 @@ var Intent_WebhookState_name = map[int32]string{
 	1: "WEBHOOK_STATE_ENABLED",
 	2: "WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING",
 }
+
 var Intent_WebhookState_value = map[string]int32{
 	"WEBHOOK_STATE_UNSPECIFIED":              0,
 	"WEBHOOK_STATE_ENABLED":                  1,
@@ -84,8 +87,9 @@ var Intent_WebhookState_value = map[string]int32{
 func (x Intent_WebhookState) String() string {
 	return proto.EnumName(Intent_WebhookState_name, int32(x))
 }
+
 func (Intent_WebhookState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 0}
 }
 
 // Represents different types of training phrases.
@@ -111,6 +115,7 @@ var Intent_TrainingPhrase_Type_name = map[int32]string{
 	1: "EXAMPLE",
 	2: "TEMPLATE",
 }
+
 var Intent_TrainingPhrase_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"EXAMPLE":          1,
@@ -120,8 +125,9 @@ var Intent_TrainingPhrase_Type_value = map[string]int32{
 func (x Intent_TrainingPhrase_Type) String() string {
 	return proto.EnumName(Intent_TrainingPhrase_Type_name, int32(x))
 }
+
 func (Intent_TrainingPhrase_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 0, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 0, 0}
 }
 
 // Represents different platforms that a rich message can be intended for.
@@ -219,6 +225,7 @@ var Intent_Message_Platform_name = map[int32]string{
 	7: "VIBER",
 	8: "ACTIONS_ON_GOOGLE",
 }
+
 var Intent_Message_Platform_value = map[string]int32{
 	"PLATFORM_UNSPECIFIED": 0,
 	"FACEBOOK":             1,
@@ -234,8 +241,9 @@ var Intent_Message_Platform_value = map[string]int32{
 func (x Intent_Message_Platform) String() string {
 	return proto.EnumName(Intent_Message_Platform_name, int32(x))
 }
+
 func (Intent_Message_Platform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 0}
 }
 
 // Represents an intent.
@@ -321,16 +329,17 @@ func (m *Intent) Reset()         { *m = Intent{} }
 func (m *Intent) String() string { return proto.CompactTextString(m) }
 func (*Intent) ProtoMessage()    {}
 func (*Intent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0}
+	return fileDescriptor_6c20e31044d743bd, []int{0}
 }
+
 func (m *Intent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent.Unmarshal(m, b)
 }
 func (m *Intent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent.Marshal(b, m, deterministic)
 }
-func (dst *Intent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent.Merge(dst, src)
+func (m *Intent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent.Merge(m, src)
 }
 func (m *Intent) XXX_Size() int {
 	return xxx_messageInfo_Intent.Size(m)
@@ -506,16 +515,17 @@ func (m *Intent_TrainingPhrase) Reset()         { *m = Intent_TrainingPhrase{} }
 func (m *Intent_TrainingPhrase) String() string { return proto.CompactTextString(m) }
 func (*Intent_TrainingPhrase) ProtoMessage()    {}
 func (*Intent_TrainingPhrase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 0}
 }
+
 func (m *Intent_TrainingPhrase) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_TrainingPhrase.Unmarshal(m, b)
 }
 func (m *Intent_TrainingPhrase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_TrainingPhrase.Marshal(b, m, deterministic)
 }
-func (dst *Intent_TrainingPhrase) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_TrainingPhrase.Merge(dst, src)
+func (m *Intent_TrainingPhrase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase.Merge(m, src)
 }
 func (m *Intent_TrainingPhrase) XXX_Size() int {
 	return xxx_messageInfo_Intent_TrainingPhrase.Size(m)
@@ -579,16 +589,17 @@ func (m *Intent_TrainingPhrase_Part) Reset()         { *m = Intent_TrainingPhras
 func (m *Intent_TrainingPhrase_Part) String() string { return proto.CompactTextString(m) }
 func (*Intent_TrainingPhrase_Part) ProtoMessage()    {}
 func (*Intent_TrainingPhrase_Part) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 0, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 0, 0}
 }
+
 func (m *Intent_TrainingPhrase_Part) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_TrainingPhrase_Part.Unmarshal(m, b)
 }
 func (m *Intent_TrainingPhrase_Part) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_TrainingPhrase_Part.Marshal(b, m, deterministic)
 }
-func (dst *Intent_TrainingPhrase_Part) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_TrainingPhrase_Part.Merge(dst, src)
+func (m *Intent_TrainingPhrase_Part) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase_Part.Merge(m, src)
 }
 func (m *Intent_TrainingPhrase_Part) XXX_Size() int {
 	return xxx_messageInfo_Intent_TrainingPhrase_Part.Size(m)
@@ -667,16 +678,17 @@ func (m *Intent_Parameter) Reset()         { *m = Intent_Parameter{} }
 func (m *Intent_Parameter) String() string { return proto.CompactTextString(m) }
 func (*Intent_Parameter) ProtoMessage()    {}
 func (*Intent_Parameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 1}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 1}
 }
+
 func (m *Intent_Parameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Parameter.Unmarshal(m, b)
 }
 func (m *Intent_Parameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Parameter.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Parameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Parameter.Merge(dst, src)
+func (m *Intent_Parameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Parameter.Merge(m, src)
 }
 func (m *Intent_Parameter) XXX_Size() int {
 	return xxx_messageInfo_Intent_Parameter.Size(m)
@@ -771,16 +783,17 @@ func (m *Intent_Message) Reset()         { *m = Intent_Message{} }
 func (m *Intent_Message) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message) ProtoMessage()    {}
 func (*Intent_Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2}
 }
+
 func (m *Intent_Message) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message.Unmarshal(m, b)
 }
 func (m *Intent_Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message.Merge(dst, src)
+func (m *Intent_Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message.Merge(m, src)
 }
 func (m *Intent_Message) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message.Size(m)
@@ -952,9 +965,9 @@ func (m *Intent_Message) GetPlatform() Intent_Message_Platform {
 	return Intent_Message_PLATFORM_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Intent_Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Intent_Message_OneofMarshaler, _Intent_Message_OneofUnmarshaler, _Intent_Message_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Intent_Message) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Intent_Message_Text_)(nil),
 		(*Intent_Message_Image_)(nil),
 		(*Intent_Message_QuickReplies_)(nil),
@@ -969,234 +982,6 @@ func (*Intent_Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _Intent_Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Intent_Message)
-	// message
-	switch x := m.Message.(type) {
-	case *Intent_Message_Text_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Text); err != nil {
-			return err
-		}
-	case *Intent_Message_Image_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Image); err != nil {
-			return err
-		}
-	case *Intent_Message_QuickReplies_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QuickReplies); err != nil {
-			return err
-		}
-	case *Intent_Message_Card_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Card); err != nil {
-			return err
-		}
-	case *Intent_Message_Payload:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Payload); err != nil {
-			return err
-		}
-	case *Intent_Message_SimpleResponses_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SimpleResponses); err != nil {
-			return err
-		}
-	case *Intent_Message_BasicCard_:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BasicCard); err != nil {
-			return err
-		}
-	case *Intent_Message_Suggestions_:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Suggestions); err != nil {
-			return err
-		}
-	case *Intent_Message_LinkOutSuggestion_:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LinkOutSuggestion); err != nil {
-			return err
-		}
-	case *Intent_Message_ListSelect_:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListSelect); err != nil {
-			return err
-		}
-	case *Intent_Message_CarouselSelect_:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CarouselSelect); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Intent_Message.Message has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Intent_Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Intent_Message)
-	switch tag {
-	case 1: // message.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Text)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Text_{msg}
-		return true, err
-	case 2: // message.image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Image)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Image_{msg}
-		return true, err
-	case 3: // message.quick_replies
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_QuickReplies)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_QuickReplies_{msg}
-		return true, err
-	case 4: // message.card
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Card)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Card_{msg}
-		return true, err
-	case 5: // message.payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.Struct)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Payload{msg}
-		return true, err
-	case 7: // message.simple_responses
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_SimpleResponses)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_SimpleResponses_{msg}
-		return true, err
-	case 8: // message.basic_card
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_BasicCard)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_BasicCard_{msg}
-		return true, err
-	case 9: // message.suggestions
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Suggestions)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Suggestions_{msg}
-		return true, err
-	case 10: // message.link_out_suggestion
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_LinkOutSuggestion)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_LinkOutSuggestion_{msg}
-		return true, err
-	case 11: // message.list_select
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_ListSelect)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_ListSelect_{msg}
-		return true, err
-	case 12: // message.carousel_select
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_CarouselSelect)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_CarouselSelect_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Intent_Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Intent_Message)
-	// message
-	switch x := m.Message.(type) {
-	case *Intent_Message_Text_:
-		s := proto.Size(x.Text)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Image_:
-		s := proto.Size(x.Image)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_QuickReplies_:
-		s := proto.Size(x.QuickReplies)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Card_:
-		s := proto.Size(x.Card)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Payload:
-		s := proto.Size(x.Payload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_SimpleResponses_:
-		s := proto.Size(x.SimpleResponses)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_BasicCard_:
-		s := proto.Size(x.BasicCard)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Suggestions_:
-		s := proto.Size(x.Suggestions)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_LinkOutSuggestion_:
-		s := proto.Size(x.LinkOutSuggestion)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_ListSelect_:
-		s := proto.Size(x.ListSelect)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_CarouselSelect_:
-		s := proto.Size(x.CarouselSelect)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The text response message.
 type Intent_Message_Text struct {
 	// Optional. The collection of the agent's responses.
@@ -1210,16 +995,17 @@ func (m *Intent_Message_Text) Reset()         { *m = Intent_Message_Text{} }
 func (m *Intent_Message_Text) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Text) ProtoMessage()    {}
 func (*Intent_Message_Text) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 0}
 }
+
 func (m *Intent_Message_Text) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Text.Unmarshal(m, b)
 }
 func (m *Intent_Message_Text) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Text.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Text) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Text.Merge(dst, src)
+func (m *Intent_Message_Text) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Text.Merge(m, src)
 }
 func (m *Intent_Message_Text) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Text.Size(m)
@@ -1253,16 +1039,17 @@ func (m *Intent_Message_Image) Reset()         { *m = Intent_Message_Image{} }
 func (m *Intent_Message_Image) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Image) ProtoMessage()    {}
 func (*Intent_Message_Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 1}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 1}
 }
+
 func (m *Intent_Message_Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Image.Unmarshal(m, b)
 }
 func (m *Intent_Message_Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Image.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Image.Merge(dst, src)
+func (m *Intent_Message_Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Image.Merge(m, src)
 }
 func (m *Intent_Message_Image) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Image.Size(m)
@@ -1302,16 +1089,17 @@ func (m *Intent_Message_QuickReplies) Reset()         { *m = Intent_Message_Quic
 func (m *Intent_Message_QuickReplies) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_QuickReplies) ProtoMessage()    {}
 func (*Intent_Message_QuickReplies) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 2}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 2}
 }
+
 func (m *Intent_Message_QuickReplies) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_QuickReplies.Unmarshal(m, b)
 }
 func (m *Intent_Message_QuickReplies) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_QuickReplies.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_QuickReplies) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_QuickReplies.Merge(dst, src)
+func (m *Intent_Message_QuickReplies) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_QuickReplies.Merge(m, src)
 }
 func (m *Intent_Message_QuickReplies) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_QuickReplies.Size(m)
@@ -1355,16 +1143,17 @@ func (m *Intent_Message_Card) Reset()         { *m = Intent_Message_Card{} }
 func (m *Intent_Message_Card) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Card) ProtoMessage()    {}
 func (*Intent_Message_Card) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 3}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 3}
 }
+
 func (m *Intent_Message_Card) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Card.Unmarshal(m, b)
 }
 func (m *Intent_Message_Card) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Card.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Card) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Card.Merge(dst, src)
+func (m *Intent_Message_Card) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card.Merge(m, src)
 }
 func (m *Intent_Message_Card) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Card.Size(m)
@@ -1419,16 +1208,17 @@ func (m *Intent_Message_Card_Button) Reset()         { *m = Intent_Message_Card_
 func (m *Intent_Message_Card_Button) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Card_Button) ProtoMessage()    {}
 func (*Intent_Message_Card_Button) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 3, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 3, 0}
 }
+
 func (m *Intent_Message_Card_Button) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Card_Button.Unmarshal(m, b)
 }
 func (m *Intent_Message_Card_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Card_Button.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Card_Button) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Card_Button.Merge(dst, src)
+func (m *Intent_Message_Card_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card_Button.Merge(m, src)
 }
 func (m *Intent_Message_Card_Button) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Card_Button.Size(m)
@@ -1473,16 +1263,17 @@ func (m *Intent_Message_SimpleResponse) Reset()         { *m = Intent_Message_Si
 func (m *Intent_Message_SimpleResponse) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SimpleResponse) ProtoMessage()    {}
 func (*Intent_Message_SimpleResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 4}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 4}
 }
+
 func (m *Intent_Message_SimpleResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_SimpleResponse.Unmarshal(m, b)
 }
 func (m *Intent_Message_SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_SimpleResponse.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_SimpleResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_SimpleResponse.Merge(dst, src)
+func (m *Intent_Message_SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponse.Merge(m, src)
 }
 func (m *Intent_Message_SimpleResponse) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_SimpleResponse.Size(m)
@@ -1530,16 +1321,17 @@ func (m *Intent_Message_SimpleResponses) Reset()         { *m = Intent_Message_S
 func (m *Intent_Message_SimpleResponses) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SimpleResponses) ProtoMessage()    {}
 func (*Intent_Message_SimpleResponses) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 5}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 5}
 }
+
 func (m *Intent_Message_SimpleResponses) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_SimpleResponses.Unmarshal(m, b)
 }
 func (m *Intent_Message_SimpleResponses) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_SimpleResponses.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_SimpleResponses) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_SimpleResponses.Merge(dst, src)
+func (m *Intent_Message_SimpleResponses) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponses.Merge(m, src)
 }
 func (m *Intent_Message_SimpleResponses) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_SimpleResponses.Size(m)
@@ -1578,16 +1370,17 @@ func (m *Intent_Message_BasicCard) Reset()         { *m = Intent_Message_BasicCa
 func (m *Intent_Message_BasicCard) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_BasicCard) ProtoMessage()    {}
 func (*Intent_Message_BasicCard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 6}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 6}
 }
+
 func (m *Intent_Message_BasicCard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_BasicCard.Unmarshal(m, b)
 }
 func (m *Intent_Message_BasicCard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_BasicCard.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_BasicCard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_BasicCard.Merge(dst, src)
+func (m *Intent_Message_BasicCard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard.Merge(m, src)
 }
 func (m *Intent_Message_BasicCard) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_BasicCard.Size(m)
@@ -1648,16 +1441,17 @@ func (m *Intent_Message_BasicCard_Button) Reset()         { *m = Intent_Message_
 func (m *Intent_Message_BasicCard_Button) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_BasicCard_Button) ProtoMessage()    {}
 func (*Intent_Message_BasicCard_Button) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 6, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 6, 0}
 }
+
 func (m *Intent_Message_BasicCard_Button) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button.Unmarshal(m, b)
 }
 func (m *Intent_Message_BasicCard_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_BasicCard_Button) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_BasicCard_Button.Merge(dst, src)
+func (m *Intent_Message_BasicCard_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button.Merge(m, src)
 }
 func (m *Intent_Message_BasicCard_Button) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button.Size(m)
@@ -1699,16 +1493,17 @@ func (m *Intent_Message_BasicCard_Button_OpenUriAction) String() string {
 }
 func (*Intent_Message_BasicCard_Button_OpenUriAction) ProtoMessage() {}
 func (*Intent_Message_BasicCard_Button_OpenUriAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 6, 0, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 6, 0, 0}
 }
+
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Unmarshal(m, b)
 }
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Merge(dst, src)
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Merge(m, src)
 }
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Size(m)
@@ -1740,16 +1535,17 @@ func (m *Intent_Message_Suggestion) Reset()         { *m = Intent_Message_Sugges
 func (m *Intent_Message_Suggestion) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Suggestion) ProtoMessage()    {}
 func (*Intent_Message_Suggestion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 7}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 7}
 }
+
 func (m *Intent_Message_Suggestion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Suggestion.Unmarshal(m, b)
 }
 func (m *Intent_Message_Suggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Suggestion.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Suggestion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Suggestion.Merge(dst, src)
+func (m *Intent_Message_Suggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestion.Merge(m, src)
 }
 func (m *Intent_Message_Suggestion) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Suggestion.Size(m)
@@ -1780,16 +1576,17 @@ func (m *Intent_Message_Suggestions) Reset()         { *m = Intent_Message_Sugge
 func (m *Intent_Message_Suggestions) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Suggestions) ProtoMessage()    {}
 func (*Intent_Message_Suggestions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 8}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 8}
 }
+
 func (m *Intent_Message_Suggestions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Suggestions.Unmarshal(m, b)
 }
 func (m *Intent_Message_Suggestions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Suggestions.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Suggestions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Suggestions.Merge(dst, src)
+func (m *Intent_Message_Suggestions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestions.Merge(m, src)
 }
 func (m *Intent_Message_Suggestions) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Suggestions.Size(m)
@@ -1824,16 +1621,17 @@ func (m *Intent_Message_LinkOutSuggestion) Reset()         { *m = Intent_Message
 func (m *Intent_Message_LinkOutSuggestion) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_LinkOutSuggestion) ProtoMessage()    {}
 func (*Intent_Message_LinkOutSuggestion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 9}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 9}
 }
+
 func (m *Intent_Message_LinkOutSuggestion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Unmarshal(m, b)
 }
 func (m *Intent_Message_LinkOutSuggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_LinkOutSuggestion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_LinkOutSuggestion.Merge(dst, src)
+func (m *Intent_Message_LinkOutSuggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_LinkOutSuggestion.Merge(m, src)
 }
 func (m *Intent_Message_LinkOutSuggestion) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Size(m)
@@ -1873,16 +1671,17 @@ func (m *Intent_Message_ListSelect) Reset()         { *m = Intent_Message_ListSe
 func (m *Intent_Message_ListSelect) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_ListSelect) ProtoMessage()    {}
 func (*Intent_Message_ListSelect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 10}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 10}
 }
+
 func (m *Intent_Message_ListSelect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_ListSelect.Unmarshal(m, b)
 }
 func (m *Intent_Message_ListSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_ListSelect.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_ListSelect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_ListSelect.Merge(dst, src)
+func (m *Intent_Message_ListSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect.Merge(m, src)
 }
 func (m *Intent_Message_ListSelect) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_ListSelect.Size(m)
@@ -1926,16 +1725,17 @@ func (m *Intent_Message_ListSelect_Item) Reset()         { *m = Intent_Message_L
 func (m *Intent_Message_ListSelect_Item) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_ListSelect_Item) ProtoMessage()    {}
 func (*Intent_Message_ListSelect_Item) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 10, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 10, 0}
 }
+
 func (m *Intent_Message_ListSelect_Item) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_ListSelect_Item.Unmarshal(m, b)
 }
 func (m *Intent_Message_ListSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_ListSelect_Item.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_ListSelect_Item) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_ListSelect_Item.Merge(dst, src)
+func (m *Intent_Message_ListSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect_Item.Merge(m, src)
 }
 func (m *Intent_Message_ListSelect_Item) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_ListSelect_Item.Size(m)
@@ -1987,16 +1787,17 @@ func (m *Intent_Message_CarouselSelect) Reset()         { *m = Intent_Message_Ca
 func (m *Intent_Message_CarouselSelect) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_CarouselSelect) ProtoMessage()    {}
 func (*Intent_Message_CarouselSelect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 11}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 11}
 }
+
 func (m *Intent_Message_CarouselSelect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_CarouselSelect.Unmarshal(m, b)
 }
 func (m *Intent_Message_CarouselSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_CarouselSelect.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_CarouselSelect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_CarouselSelect.Merge(dst, src)
+func (m *Intent_Message_CarouselSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect.Merge(m, src)
 }
 func (m *Intent_Message_CarouselSelect) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_CarouselSelect.Size(m)
@@ -2033,16 +1834,17 @@ func (m *Intent_Message_CarouselSelect_Item) Reset()         { *m = Intent_Messa
 func (m *Intent_Message_CarouselSelect_Item) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_CarouselSelect_Item) ProtoMessage()    {}
 func (*Intent_Message_CarouselSelect_Item) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 11, 0}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 11, 0}
 }
+
 func (m *Intent_Message_CarouselSelect_Item) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Unmarshal(m, b)
 }
 func (m *Intent_Message_CarouselSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_CarouselSelect_Item) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_CarouselSelect_Item.Merge(dst, src)
+func (m *Intent_Message_CarouselSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect_Item.Merge(m, src)
 }
 func (m *Intent_Message_CarouselSelect_Item) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Size(m)
@@ -2099,16 +1901,17 @@ func (m *Intent_Message_SelectItemInfo) Reset()         { *m = Intent_Message_Se
 func (m *Intent_Message_SelectItemInfo) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SelectItemInfo) ProtoMessage()    {}
 func (*Intent_Message_SelectItemInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 2, 12}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 2, 12}
 }
+
 func (m *Intent_Message_SelectItemInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_SelectItemInfo.Unmarshal(m, b)
 }
 func (m *Intent_Message_SelectItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_SelectItemInfo.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_SelectItemInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_SelectItemInfo.Merge(dst, src)
+func (m *Intent_Message_SelectItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SelectItemInfo.Merge(m, src)
 }
 func (m *Intent_Message_SelectItemInfo) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_SelectItemInfo.Size(m)
@@ -2150,16 +1953,17 @@ func (m *Intent_FollowupIntentInfo) Reset()         { *m = Intent_FollowupIntent
 func (m *Intent_FollowupIntentInfo) String() string { return proto.CompactTextString(m) }
 func (*Intent_FollowupIntentInfo) ProtoMessage()    {}
 func (*Intent_FollowupIntentInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{0, 3}
+	return fileDescriptor_6c20e31044d743bd, []int{0, 3}
 }
+
 func (m *Intent_FollowupIntentInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_FollowupIntentInfo.Unmarshal(m, b)
 }
 func (m *Intent_FollowupIntentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_FollowupIntentInfo.Marshal(b, m, deterministic)
 }
-func (dst *Intent_FollowupIntentInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_FollowupIntentInfo.Merge(dst, src)
+func (m *Intent_FollowupIntentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_FollowupIntentInfo.Merge(m, src)
 }
 func (m *Intent_FollowupIntentInfo) XXX_Size() int {
 	return xxx_messageInfo_Intent_FollowupIntentInfo.Size(m)
@@ -2212,16 +2016,17 @@ func (m *ListIntentsRequest) Reset()         { *m = ListIntentsRequest{} }
 func (m *ListIntentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListIntentsRequest) ProtoMessage()    {}
 func (*ListIntentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{1}
+	return fileDescriptor_6c20e31044d743bd, []int{1}
 }
+
 func (m *ListIntentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIntentsRequest.Unmarshal(m, b)
 }
 func (m *ListIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIntentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListIntentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIntentsRequest.Merge(dst, src)
+func (m *ListIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsRequest.Merge(m, src)
 }
 func (m *ListIntentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListIntentsRequest.Size(m)
@@ -2284,16 +2089,17 @@ func (m *ListIntentsResponse) Reset()         { *m = ListIntentsResponse{} }
 func (m *ListIntentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListIntentsResponse) ProtoMessage()    {}
 func (*ListIntentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{2}
+	return fileDescriptor_6c20e31044d743bd, []int{2}
 }
+
 func (m *ListIntentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIntentsResponse.Unmarshal(m, b)
 }
 func (m *ListIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIntentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListIntentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIntentsResponse.Merge(dst, src)
+func (m *ListIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsResponse.Merge(m, src)
 }
 func (m *ListIntentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListIntentsResponse.Size(m)
@@ -2341,16 +2147,17 @@ func (m *GetIntentRequest) Reset()         { *m = GetIntentRequest{} }
 func (m *GetIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIntentRequest) ProtoMessage()    {}
 func (*GetIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{3}
+	return fileDescriptor_6c20e31044d743bd, []int{3}
 }
+
 func (m *GetIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIntentRequest.Unmarshal(m, b)
 }
 func (m *GetIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIntentRequest.Merge(dst, src)
+func (m *GetIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIntentRequest.Merge(m, src)
 }
 func (m *GetIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIntentRequest.Size(m)
@@ -2407,16 +2214,17 @@ func (m *CreateIntentRequest) Reset()         { *m = CreateIntentRequest{} }
 func (m *CreateIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateIntentRequest) ProtoMessage()    {}
 func (*CreateIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{4}
+	return fileDescriptor_6c20e31044d743bd, []int{4}
 }
+
 func (m *CreateIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateIntentRequest.Unmarshal(m, b)
 }
 func (m *CreateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateIntentRequest.Merge(dst, src)
+func (m *CreateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIntentRequest.Merge(m, src)
 }
 func (m *CreateIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateIntentRequest.Size(m)
@@ -2479,16 +2287,17 @@ func (m *UpdateIntentRequest) Reset()         { *m = UpdateIntentRequest{} }
 func (m *UpdateIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateIntentRequest) ProtoMessage()    {}
 func (*UpdateIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{5}
+	return fileDescriptor_6c20e31044d743bd, []int{5}
 }
+
 func (m *UpdateIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateIntentRequest.Unmarshal(m, b)
 }
 func (m *UpdateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateIntentRequest.Merge(dst, src)
+func (m *UpdateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateIntentRequest.Merge(m, src)
 }
 func (m *UpdateIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateIntentRequest.Size(m)
@@ -2542,16 +2351,17 @@ func (m *DeleteIntentRequest) Reset()         { *m = DeleteIntentRequest{} }
 func (m *DeleteIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteIntentRequest) ProtoMessage()    {}
 func (*DeleteIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{6}
+	return fileDescriptor_6c20e31044d743bd, []int{6}
 }
+
 func (m *DeleteIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteIntentRequest.Unmarshal(m, b)
 }
 func (m *DeleteIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteIntentRequest.Merge(dst, src)
+func (m *DeleteIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIntentRequest.Merge(m, src)
 }
 func (m *DeleteIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteIntentRequest.Size(m)
@@ -2600,16 +2410,17 @@ func (m *BatchUpdateIntentsRequest) Reset()         { *m = BatchUpdateIntentsReq
 func (m *BatchUpdateIntentsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateIntentsRequest) ProtoMessage()    {}
 func (*BatchUpdateIntentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{7}
+	return fileDescriptor_6c20e31044d743bd, []int{7}
 }
+
 func (m *BatchUpdateIntentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateIntentsRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdateIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateIntentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateIntentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateIntentsRequest.Merge(dst, src)
+func (m *BatchUpdateIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsRequest.Merge(m, src)
 }
 func (m *BatchUpdateIntentsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateIntentsRequest.Size(m)
@@ -2685,76 +2496,14 @@ func (m *BatchUpdateIntentsRequest) GetIntentView() IntentView {
 	return IntentView_INTENT_VIEW_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchUpdateIntentsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchUpdateIntentsRequest_OneofMarshaler, _BatchUpdateIntentsRequest_OneofUnmarshaler, _BatchUpdateIntentsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchUpdateIntentsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchUpdateIntentsRequest_IntentBatchUri)(nil),
 		(*BatchUpdateIntentsRequest_IntentBatchInline)(nil),
 	}
 }
 
-func _BatchUpdateIntentsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchUpdateIntentsRequest)
-	// intent_batch
-	switch x := m.IntentBatch.(type) {
-	case *BatchUpdateIntentsRequest_IntentBatchUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.IntentBatchUri)
-	case *BatchUpdateIntentsRequest_IntentBatchInline:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.IntentBatchInline); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchUpdateIntentsRequest.IntentBatch has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchUpdateIntentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchUpdateIntentsRequest)
-	switch tag {
-	case 2: // intent_batch.intent_batch_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.IntentBatch = &BatchUpdateIntentsRequest_IntentBatchUri{x}
-		return true, err
-	case 3: // intent_batch.intent_batch_inline
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(IntentBatch)
-		err := b.DecodeMessage(msg)
-		m.IntentBatch = &BatchUpdateIntentsRequest_IntentBatchInline{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchUpdateIntentsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchUpdateIntentsRequest)
-	// intent_batch
-	switch x := m.IntentBatch.(type) {
-	case *BatchUpdateIntentsRequest_IntentBatchUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.IntentBatchUri)))
-		n += len(x.IntentBatchUri)
-	case *BatchUpdateIntentsRequest_IntentBatchInline:
-		s := proto.Size(x.IntentBatchInline)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
 type BatchUpdateIntentsResponse struct {
 	// The collection of updated or created intents.
@@ -2768,16 +2517,17 @@ func (m *BatchUpdateIntentsResponse) Reset()         { *m = BatchUpdateIntentsRe
 func (m *BatchUpdateIntentsResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateIntentsResponse) ProtoMessage()    {}
 func (*BatchUpdateIntentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{8}
+	return fileDescriptor_6c20e31044d743bd, []int{8}
 }
+
 func (m *BatchUpdateIntentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateIntentsResponse.Unmarshal(m, b)
 }
 func (m *BatchUpdateIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateIntentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateIntentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateIntentsResponse.Merge(dst, src)
+func (m *BatchUpdateIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsResponse.Merge(m, src)
 }
 func (m *BatchUpdateIntentsResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateIntentsResponse.Size(m)
@@ -2812,16 +2562,17 @@ func (m *BatchDeleteIntentsRequest) Reset()         { *m = BatchDeleteIntentsReq
 func (m *BatchDeleteIntentsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeleteIntentsRequest) ProtoMessage()    {}
 func (*BatchDeleteIntentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{9}
+	return fileDescriptor_6c20e31044d743bd, []int{9}
 }
+
 func (m *BatchDeleteIntentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeleteIntentsRequest.Unmarshal(m, b)
 }
 func (m *BatchDeleteIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeleteIntentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeleteIntentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeleteIntentsRequest.Merge(dst, src)
+func (m *BatchDeleteIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteIntentsRequest.Merge(m, src)
 }
 func (m *BatchDeleteIntentsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeleteIntentsRequest.Size(m)
@@ -2859,16 +2610,17 @@ func (m *IntentBatch) Reset()         { *m = IntentBatch{} }
 func (m *IntentBatch) String() string { return proto.CompactTextString(m) }
 func (*IntentBatch) ProtoMessage()    {}
 func (*IntentBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_79fab48477a8b612, []int{10}
+	return fileDescriptor_6c20e31044d743bd, []int{10}
 }
+
 func (m *IntentBatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IntentBatch.Unmarshal(m, b)
 }
 func (m *IntentBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IntentBatch.Marshal(b, m, deterministic)
 }
-func (dst *IntentBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IntentBatch.Merge(dst, src)
+func (m *IntentBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntentBatch.Merge(m, src)
 }
 func (m *IntentBatch) XXX_Size() int {
 	return xxx_messageInfo_IntentBatch.Size(m)
@@ -2887,6 +2639,10 @@ func (m *IntentBatch) GetIntents() []*Intent {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2.IntentView", IntentView_name, IntentView_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_WebhookState", Intent_WebhookState_name, Intent_WebhookState_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_TrainingPhrase_Type", Intent_TrainingPhrase_Type_name, Intent_TrainingPhrase_Type_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_Message_Platform", Intent_Message_Platform_name, Intent_Message_Platform_value)
 	proto.RegisterType((*Intent)(nil), "google.cloud.dialogflow.v2.Intent")
 	proto.RegisterType((*Intent_TrainingPhrase)(nil), "google.cloud.dialogflow.v2.Intent.TrainingPhrase")
 	proto.RegisterType((*Intent_TrainingPhrase_Part)(nil), "google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part")
@@ -2921,10 +2677,176 @@ func init() {
 	proto.RegisterType((*BatchUpdateIntentsResponse)(nil), "google.cloud.dialogflow.v2.BatchUpdateIntentsResponse")
 	proto.RegisterType((*BatchDeleteIntentsRequest)(nil), "google.cloud.dialogflow.v2.BatchDeleteIntentsRequest")
 	proto.RegisterType((*IntentBatch)(nil), "google.cloud.dialogflow.v2.IntentBatch")
-	proto.RegisterEnum("google.cloud.dialogflow.v2.IntentView", IntentView_name, IntentView_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_WebhookState", Intent_WebhookState_name, Intent_WebhookState_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_TrainingPhrase_Type", Intent_TrainingPhrase_Type_name, Intent_TrainingPhrase_Type_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_Message_Platform", Intent_Message_Platform_name, Intent_Message_Platform_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/intent.proto", fileDescriptor_6c20e31044d743bd)
+}
+
+var fileDescriptor_6c20e31044d743bd = []byte{
+	// 2583 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcb, 0x73, 0x23, 0x47,
+	0x19, 0xf7, 0xe8, 0x61, 0x4b, 0x9f, 0x64, 0x59, 0x6e, 0x6f, 0x36, 0xda, 0xc9, 0x03, 0x47, 0x21,
+	0x89, 0xe3, 0x4a, 0xa4, 0x44, 0x21, 0x09, 0xd9, 0x4d, 0x42, 0xf9, 0x21, 0xdb, 0xc2, 0xb2, 0x25,
+	0xc6, 0xf2, 0x6e, 0x92, 0xa2, 0x98, 0x1a, 0x6b, 0x5a, 0xda, 0xc1, 0xa3, 0x99, 0xd9, 0xe9, 0x9e,
+	0x75, 0x94, 0x54, 0x2e, 0x54, 0x01, 0x07, 0xb8, 0xc1, 0x29, 0x55, 0x29, 0x0a, 0x4e, 0x14, 0x67,
+	0x4e, 0x1c, 0xf8, 0x0b, 0xb8, 0x51, 0x3c, 0x0e, 0x5c, 0xa8, 0xe2, 0x5f, 0xa0, 0x8a, 0x03, 0x07,
+	0xaa, 0x1f, 0x23, 0x8d, 0x1e, 0x6b, 0x4b, 0xde, 0x85, 0x0b, 0x37, 0xf5, 0xf7, 0x7e, 0x74, 0xff,
+	0xbe, 0xee, 0xb1, 0xe1, 0x95, 0xae, 0xeb, 0x76, 0x6d, 0x5c, 0x6e, 0xdb, 0x6e, 0x60, 0x96, 0x4d,
+	0xcb, 0xb0, 0xdd, 0x6e, 0xc7, 0x76, 0x2f, 0xca, 0x0f, 0x2b, 0x65, 0xcb, 0xa1, 0xd8, 0xa1, 0x25,
+	0xcf, 0x77, 0xa9, 0x8b, 0x54, 0x21, 0x58, 0xe2, 0x82, 0xa5, 0xa1, 0x60, 0xe9, 0x61, 0x45, 0x7d,
+	0x56, 0x1a, 0x31, 0x3c, 0xab, 0x6c, 0x38, 0x8e, 0x4b, 0x0d, 0x6a, 0xb9, 0x0e, 0x11, 0x9a, 0xea,
+	0xad, 0x08, 0xd7, 0xc7, 0xc4, 0x0d, 0xfc, 0x36, 0x96, 0xac, 0x8d, 0x4b, 0xbc, 0xb7, 0x5d, 0x87,
+	0xe2, 0x4f, 0xa5, 0x7b, 0xf5, 0x45, 0x29, 0x69, 0xbb, 0x4e, 0xd7, 0x0f, 0x1c, 0xc7, 0x72, 0xba,
+	0x65, 0xd7, 0xc3, 0xfe, 0x88, 0xa7, 0xe7, 0xa5, 0x10, 0x5f, 0x9d, 0x05, 0x9d, 0xb2, 0x19, 0x08,
+	0x01, 0xc9, 0x7f, 0x66, 0x9c, 0x8f, 0x7b, 0x1e, 0xed, 0x4b, 0xe6, 0xfa, 0x38, 0xb3, 0x63, 0x61,
+	0xdb, 0xd4, 0x7b, 0x06, 0x39, 0x97, 0x12, 0xcf, 0x8e, 0x4b, 0x10, 0xea, 0x07, 0x6d, 0x19, 0x61,
+	0xf1, 0x6f, 0x1b, 0xb0, 0x58, 0xe3, 0x15, 0x43, 0x08, 0x12, 0x8e, 0xd1, 0xc3, 0x05, 0x65, 0x5d,
+	0xd9, 0x48, 0x6b, 0xfc, 0x37, 0x7a, 0x01, 0xb2, 0xa6, 0x45, 0x3c, 0xdb, 0xe8, 0xeb, 0x9c, 0x17,
+	0xe3, 0xbc, 0x8c, 0xa4, 0x1d, 0x33, 0x91, 0x16, 0x2c, 0x5f, 0xe0, 0xb3, 0xfb, 0xae, 0x7b, 0xae,
+	0x13, 0x6a, 0x50, 0x5c, 0x58, 0x5c, 0x57, 0x36, 0x72, 0x95, 0x72, 0xe9, 0xd1, 0xa5, 0x2f, 0x09,
+	0x8f, 0xa5, 0x7b, 0x42, 0xef, 0x84, 0xa9, 0x69, 0xd9, 0x8b, 0xc8, 0x0a, 0xa9, 0x90, 0xf2, 0x7c,
+	0xcb, 0xf5, 0x2d, 0xda, 0x2f, 0xc4, 0xd7, 0x95, 0x8d, 0xa4, 0x36, 0x58, 0xa3, 0xaf, 0x41, 0xc6,
+	0x22, 0x7a, 0xc7, 0xb0, 0xed, 0x33, 0xa3, 0x7d, 0x5e, 0x48, 0xac, 0x2b, 0x1b, 0x29, 0x0d, 0x2c,
+	0xb2, 0x27, 0x29, 0x4c, 0xa0, 0x67, 0xeb, 0xa6, 0x45, 0x8c, 0x33, 0x1b, 0x9b, 0x85, 0x35, 0x21,
+	0xd0, 0xb3, 0x77, 0x25, 0x05, 0x95, 0x60, 0xcd, 0x72, 0xbc, 0x80, 0xea, 0xb2, 0x5d, 0x3c, 0x39,
+	0x52, 0x58, 0x5a, 0x8f, 0x6f, 0xa4, 0xb5, 0x55, 0xce, 0xda, 0x11, 0x1c, 0x96, 0x22, 0x41, 0x37,
+	0x61, 0x11, 0x3f, 0xc4, 0x0e, 0x25, 0x85, 0x14, 0x17, 0x91, 0x2b, 0xf4, 0x5d, 0xc8, 0x53, 0xdf,
+	0xb0, 0x58, 0x5f, 0x75, 0xef, 0xbe, 0x6f, 0x10, 0x4c, 0x0a, 0xe9, 0xf5, 0xf8, 0x46, 0xa6, 0xf2,
+	0xe6, 0x0c, 0xe9, 0xb7, 0xa4, 0x6a, 0x93, 0x6b, 0x6a, 0x2b, 0x74, 0x64, 0xcd, 0xbd, 0x1a, 0x6d,
+	0xb6, 0x11, 0x0a, 0xc0, 0xcb, 0x2e, 0x57, 0xa8, 0x0e, 0x2b, 0x6e, 0x40, 0x23, 0xe1, 0x93, 0x42,
+	0x86, 0x3b, 0x7d, 0xf1, 0x32, 0xa7, 0x32, 0x21, 0x2d, 0x27, 0x74, 0xe5, 0x92, 0xa0, 0x97, 0x20,
+	0xe7, 0x63, 0x82, 0x23, 0xc6, 0xb2, 0xbc, 0x5e, 0xcb, 0x9c, 0x3a, 0x10, 0xab, 0x03, 0x78, 0x86,
+	0x6f, 0xf4, 0x30, 0xc5, 0x3e, 0x29, 0x2c, 0x73, 0x7f, 0xaf, 0xcd, 0x90, 0x64, 0x33, 0x54, 0xd2,
+	0x22, 0xfa, 0x68, 0x0f, 0x52, 0x3d, 0x4c, 0x88, 0xd1, 0xc5, 0xa4, 0x90, 0xe3, 0xb6, 0x36, 0x67,
+	0xb0, 0x75, 0x24, 0x54, 0xb4, 0x81, 0x2e, 0x7a, 0x00, 0xaa, 0x89, 0x3b, 0x46, 0x60, 0x53, 0xdd,
+	0xc7, 0xc4, 0x73, 0x1d, 0x82, 0x75, 0xcf, 0x36, 0x68, 0xc7, 0xf5, 0x7b, 0xa4, 0xb0, 0xb2, 0x1e,
+	0xdf, 0xc8, 0x55, 0xde, 0x9a, 0xdd, 0x72, 0xa9, 0x29, 0x75, 0xb5, 0x82, 0x34, 0xab, 0x49, 0xab,
+	0x21, 0x83, 0xa0, 0xf7, 0xe0, 0x96, 0xef, 0xba, 0x54, 0xef, 0xb8, 0xb6, 0xed, 0x5e, 0x04, 0x9e,
+	0x2e, 0x00, 0x47, 0x9c, 0x8f, 0x3c, 0x6f, 0xd4, 0x4d, 0x26, 0xb0, 0x27, 0xf9, 0xc2, 0x03, 0x3f,
+	0x2a, 0x1f, 0xc0, 0x33, 0x9e, 0xe1, 0x33, 0xe1, 0xa9, 0xca, 0xab, 0x5c, 0xb9, 0x20, 0x44, 0xa6,
+	0xa8, 0x77, 0xe1, 0xc6, 0xb8, 0x9e, 0xe5, 0x74, 0xdc, 0x02, 0xe2, 0x05, 0x7c, 0x7b, 0x86, 0x34,
+	0x47, 0x8d, 0xd6, 0x9c, 0x8e, 0xab, 0xa1, 0xce, 0x04, 0x4d, 0xfd, 0x2a, 0x0e, 0xb9, 0xd1, 0xcd,
+	0x39, 0x15, 0x1c, 0xbe, 0x0d, 0x09, 0xda, 0xf7, 0x04, 0x28, 0xe4, 0x2a, 0xef, 0xcc, 0xbd, 0xe3,
+	0x4b, 0xad, 0xbe, 0x87, 0x35, 0x6e, 0x03, 0xd5, 0x21, 0xe9, 0x19, 0x3e, 0x25, 0x85, 0x38, 0x4f,
+	0xe6, 0x1a, 0xc6, 0x9a, 0x86, 0x4f, 0x35, 0x61, 0x04, 0x6d, 0xc2, 0x2a, 0xb5, 0x7a, 0x98, 0xe8,
+	0x86, 0x69, 0x62, 0x53, 0x6f, 0xbb, 0x81, 0x43, 0x39, 0x4e, 0x24, 0xb5, 0x15, 0xce, 0xd8, 0x62,
+	0xf4, 0x1d, 0x46, 0x56, 0x29, 0x24, 0x98, 0x2a, 0xcb, 0x90, 0xed, 0xf4, 0x30, 0x43, 0xf6, 0x9b,
+	0x01, 0x09, 0x76, 0xa8, 0x45, 0xfb, 0xfa, 0x20, 0xd1, 0xb4, 0x06, 0x82, 0xc4, 0x82, 0x47, 0x37,
+	0x20, 0x69, 0xd8, 0x96, 0x41, 0x38, 0x46, 0xa5, 0x35, 0xb1, 0x60, 0xa8, 0x19, 0x10, 0xec, 0xeb,
+	0x26, 0xee, 0x58, 0x0e, 0x36, 0x25, 0x42, 0x65, 0x18, 0x6d, 0x57, 0x90, 0x8a, 0x77, 0x20, 0x21,
+	0x0d, 0xe4, 0x5b, 0x1f, 0x37, 0xab, 0xfa, 0xe9, 0xf1, 0x49, 0xb3, 0xba, 0x53, 0xdb, 0xab, 0x55,
+	0x77, 0xf3, 0x0b, 0x28, 0x03, 0x4b, 0xd5, 0x8f, 0xb6, 0x8e, 0x9a, 0xf5, 0x6a, 0x5e, 0x41, 0x79,
+	0x48, 0xb5, 0xaa, 0x47, 0xcd, 0xfa, 0x56, 0xab, 0x9a, 0x8f, 0xa9, 0xb1, 0x94, 0xa2, 0xfe, 0x38,
+	0x06, 0xe9, 0xc1, 0xb9, 0xba, 0x2e, 0x6e, 0xdf, 0x80, 0xe4, 0x43, 0xc3, 0x0e, 0x70, 0x18, 0x3a,
+	0x5f, 0xa0, 0x17, 0x61, 0x39, 0x3c, 0x50, 0x82, 0x9b, 0xe0, 0xdc, 0xac, 0x24, 0xde, 0xe5, 0x42,
+	0xef, 0x42, 0x21, 0x52, 0x16, 0x7d, 0xc4, 0x53, 0x92, 0xcb, 0x3f, 0x35, 0xac, 0xd1, 0x6e, 0xc4,
+	0xe7, 0xb3, 0x90, 0xee, 0x19, 0x8e, 0x69, 0x50, 0xd7, 0xef, 0xf3, 0x39, 0x91, 0xd2, 0x86, 0x04,
+	0x54, 0x80, 0x25, 0xcf, 0x77, 0x7b, 0x1e, 0x0d, 0x91, 0x38, 0x5c, 0xa2, 0xa7, 0x61, 0xc9, 0x22,
+	0xba, 0x6d, 0x11, 0x5a, 0x48, 0x71, 0xad, 0x45, 0x8b, 0xd4, 0x2d, 0x42, 0xd5, 0x5f, 0xdc, 0x82,
+	0x25, 0x79, 0x76, 0x51, 0x35, 0xd2, 0xc0, 0xcc, 0x4c, 0xf3, 0x27, 0x3c, 0xf5, 0x2d, 0xfc, 0x29,
+	0x3d, 0x58, 0x90, 0x3d, 0x3f, 0x80, 0xa4, 0xd5, 0x33, 0xba, 0xa2, 0x66, 0x99, 0xca, 0x1b, 0x73,
+	0xd8, 0xa9, 0x31, 0xbd, 0x83, 0x05, 0x4d, 0x18, 0x40, 0xdf, 0x83, 0xe5, 0x07, 0x81, 0xd5, 0x3e,
+	0xd7, 0x7d, 0xec, 0xd9, 0x16, 0x16, 0x9b, 0x24, 0x53, 0x79, 0x77, 0x0e, 0x8b, 0xdf, 0x61, 0xfa,
+	0x9a, 0x50, 0x3f, 0x58, 0xd0, 0xb2, 0x0f, 0x22, 0x6b, 0x96, 0x70, 0xdb, 0xf0, 0xc5, 0xf6, 0x9a,
+	0x2f, 0xe1, 0x1d, 0xc3, 0x37, 0x59, 0xc2, 0x4c, 0x1d, 0xbd, 0x05, 0x4b, 0x9e, 0xd1, 0xb7, 0x5d,
+	0xc3, 0xe4, 0xcd, 0xcb, 0x54, 0x9e, 0x0e, 0x2d, 0x85, 0x57, 0x86, 0xd2, 0x09, 0xbf, 0x32, 0x1c,
+	0x2c, 0x68, 0xa1, 0x24, 0xea, 0x42, 0x9e, 0x58, 0x3d, 0xcf, 0xc6, 0x03, 0xdc, 0x65, 0x4d, 0x63,
+	0xda, 0xb7, 0xe7, 0x88, 0xe3, 0x84, 0x9b, 0x08, 0x31, 0x96, 0x65, 0xb8, 0x42, 0x46, 0x49, 0xe8,
+	0x14, 0xe0, 0xcc, 0x20, 0x56, 0x5b, 0xe7, 0xa9, 0xa6, 0xb8, 0x8b, 0x6f, 0xcc, 0xe1, 0x62, 0x9b,
+	0x29, 0xcb, 0x7c, 0xd3, 0x67, 0xe1, 0x02, 0x7d, 0x02, 0x19, 0x12, 0x74, 0xbb, 0x98, 0xf0, 0x9b,
+	0x58, 0x21, 0xcd, 0xed, 0xbe, 0x33, 0x4f, 0xe8, 0x43, 0xed, 0x83, 0x05, 0x2d, 0x6a, 0x0c, 0x39,
+	0xb0, 0x66, 0x5b, 0xce, 0xb9, 0xee, 0x06, 0x54, 0x1f, 0xd2, 0xf9, 0x10, 0xcf, 0x54, 0xde, 0x9f,
+	0xc3, 0x47, 0xdd, 0x72, 0xce, 0x1b, 0x01, 0x1d, 0xba, 0x3a, 0x58, 0xd0, 0x56, 0xed, 0x71, 0x22,
+	0xfa, 0x08, 0x32, 0xec, 0x68, 0xe8, 0x04, 0xdb, 0xb8, 0x4d, 0x0b, 0x19, 0xee, 0xe7, 0xed, 0xb9,
+	0xfc, 0x10, 0x7a, 0xc2, 0x95, 0x0f, 0x16, 0x34, 0xb0, 0x07, 0x2b, 0x64, 0xc2, 0x4a, 0xdb, 0xf0,
+	0xdd, 0x80, 0x60, 0x3b, 0xb4, 0x9e, 0xe5, 0xd6, 0xdf, 0x9b, 0x6f, 0xb3, 0x71, 0x0b, 0x03, 0x0f,
+	0xb9, 0xf6, 0x08, 0x05, 0x35, 0x20, 0x15, 0xce, 0x6c, 0x79, 0x79, 0xbc, 0xd6, 0xc8, 0x1e, 0x18,
+	0x51, 0x55, 0x48, 0xb0, 0x23, 0x1d, 0x81, 0xf4, 0x78, 0x08, 0xe9, 0xea, 0x09, 0x24, 0xf9, 0x31,
+	0x45, 0xcf, 0x40, 0x9a, 0x1f, 0x53, 0x3d, 0xf0, 0x2d, 0x89, 0x9d, 0x29, 0x4e, 0x38, 0xf5, 0x2d,
+	0xf4, 0x3a, 0x20, 0xa3, 0xdd, 0xc6, 0x84, 0x58, 0x67, 0x96, 0xcd, 0x81, 0x8e, 0xd9, 0x11, 0x28,
+	0xba, 0x3a, 0xc2, 0x61, 0x8e, 0xd4, 0x1a, 0x64, 0xa3, 0x27, 0x95, 0x61, 0x2b, 0xb5, 0xa8, 0x1d,
+	0x62, 0xb2, 0x58, 0x30, 0x6c, 0x1d, 0xc5, 0x83, 0x18, 0x8f, 0x6b, 0xe4, 0x50, 0xab, 0x7f, 0x57,
+	0x20, 0xc1, 0x77, 0xe8, 0x74, 0x1b, 0x2a, 0xa4, 0x48, 0x70, 0x26, 0x18, 0x22, 0x9c, 0xc1, 0x7a,
+	0x34, 0xa3, 0xf8, 0x58, 0x46, 0x4d, 0x58, 0x3a, 0x0b, 0x28, 0x65, 0x9b, 0x3d, 0x31, 0xf3, 0x88,
+	0x8d, 0xe2, 0x45, 0x69, 0x9b, 0xab, 0x6b, 0xa1, 0x19, 0xf5, 0x9b, 0xb0, 0x28, 0x48, 0x53, 0x47,
+	0x27, 0xbb, 0xc0, 0xbb, 0x84, 0xf2, 0x1b, 0xba, 0x0c, 0x34, 0x5c, 0xab, 0x3d, 0xc8, 0x8d, 0x9e,
+	0x7c, 0xf4, 0x75, 0xc8, 0xf1, 0x7b, 0x38, 0x75, 0x75, 0xe2, 0x61, 0xdc, 0xbe, 0x2f, 0x6d, 0x65,
+	0x19, 0xb5, 0xe5, 0x9e, 0x70, 0x1a, 0xf3, 0x43, 0x48, 0xcf, 0x96, 0xf6, 0xf8, 0xef, 0xe8, 0xa4,
+	0xe3, 0x31, 0xc4, 0x47, 0x26, 0x1d, 0xef, 0xce, 0x05, 0xac, 0x8c, 0x01, 0x0d, 0x32, 0xa7, 0xc0,
+	0x97, 0xc2, 0xcb, 0xf2, 0xde, 0xb5, 0xe1, 0x6b, 0x02, 0xbb, 0xd4, 0xdf, 0xc5, 0x21, 0x3d, 0xc0,
+	0x9f, 0x6b, 0x34, 0xf4, 0x25, 0xc8, 0xb1, 0xfd, 0x6c, 0x50, 0x8a, 0xcd, 0x68, 0x76, 0xcb, 0x03,
+	0x2a, 0xdf, 0xe6, 0x7b, 0xe1, 0xc4, 0x4a, 0x5c, 0x6f, 0x62, 0x85, 0xf3, 0xea, 0x74, 0xb8, 0x45,
+	0x92, 0xbc, 0x16, 0x77, 0xae, 0x83, 0xb3, 0x13, 0xfb, 0xe4, 0xb7, 0xca, 0x60, 0xa3, 0x4c, 0x2f,
+	0xc1, 0x03, 0x58, 0x71, 0x3d, 0xec, 0xb0, 0x6d, 0xab, 0xcb, 0x07, 0x8f, 0x98, 0xbd, 0xb5, 0xc7,
+	0xf0, 0x5f, 0x6a, 0x78, 0xd8, 0x39, 0xf5, 0xad, 0x2d, 0x6e, 0x50, 0x5b, 0x76, 0xa3, 0x4b, 0xf5,
+	0x05, 0x58, 0x1e, 0xe1, 0xa3, 0x3c, 0xc4, 0x87, 0x38, 0xc0, 0x7e, 0xaa, 0x45, 0x80, 0x08, 0xc6,
+	0x4e, 0x8d, 0x5c, 0xed, 0x40, 0x26, 0x32, 0x07, 0xd0, 0xbd, 0xd1, 0xa1, 0xa2, 0xcc, 0x7c, 0x2f,
+	0x9f, 0x1c, 0x2a, 0x23, 0x13, 0x45, 0x6d, 0xc2, 0xea, 0xc4, 0x2c, 0x40, 0xaf, 0x42, 0xde, 0x64,
+	0x3f, 0x1d, 0xfe, 0xb1, 0x40, 0x8f, 0xdc, 0x01, 0x57, 0x22, 0x74, 0x7e, 0xef, 0x92, 0xd9, 0xc5,
+	0x86, 0xd9, 0xfd, 0x21, 0x06, 0x30, 0x84, 0xfd, 0x47, 0x34, 0xa6, 0x09, 0x49, 0x8b, 0xe2, 0x9e,
+	0x00, 0xaa, 0xf9, 0x26, 0xfb, 0xd0, 0x76, 0xa9, 0x46, 0x71, 0x4f, 0x13, 0x86, 0xd4, 0x3f, 0x29,
+	0x90, 0x60, 0x6b, 0x74, 0x04, 0x09, 0xfe, 0x76, 0x51, 0xe6, 0x1e, 0x27, 0xc2, 0x2a, 0x33, 0xc2,
+	0xdf, 0x2f, 0xdc, 0xcc, 0x30, 0xfe, 0x58, 0x34, 0xfe, 0x75, 0xc8, 0x98, 0x98, 0xb4, 0x7d, 0xcb,
+	0xe3, 0x9b, 0x2a, 0x84, 0x86, 0x21, 0xe9, 0x49, 0x1d, 0x1d, 0xf5, 0xf7, 0x31, 0xc8, 0x8d, 0xce,
+	0x39, 0xd4, 0x0a, 0x8b, 0x27, 0xb6, 0xc1, 0x87, 0xd7, 0x9e, 0x98, 0xff, 0x17, 0x05, 0xfc, 0x10,
+	0x72, 0xa3, 0x71, 0xb1, 0x3d, 0x7b, 0x8e, 0xfb, 0xe1, 0x89, 0x3c, 0xc7, 0x7d, 0x0e, 0x95, 0x7d,
+	0xc7, 0x75, 0xfa, 0xbd, 0x70, 0x74, 0x0e, 0xd6, 0xc5, 0x9f, 0x28, 0x90, 0x0a, 0x6f, 0x02, 0xa8,
+	0x00, 0x37, 0xd8, 0x73, 0x69, 0xaf, 0xa1, 0x1d, 0x8d, 0x3d, 0xac, 0xb2, 0x90, 0xda, 0xdb, 0xda,
+	0xa9, 0x6e, 0x37, 0x1a, 0x87, 0x79, 0x05, 0xa5, 0x21, 0x79, 0x52, 0xdf, 0xda, 0x39, 0xcc, 0xc7,
+	0x18, 0xa3, 0x55, 0xad, 0x57, 0xf7, 0xb5, 0xad, 0xa3, 0x7c, 0x1c, 0x2d, 0x41, 0xfc, 0xb0, 0x76,
+	0x98, 0x4f, 0x70, 0x89, 0xc3, 0x8f, 0x9b, 0xd5, 0x7c, 0x12, 0xa5, 0x20, 0x51, 0xaf, 0x1d, 0x57,
+	0xf3, 0x8b, 0x8c, 0x78, 0xb7, 0xb6, 0x5d, 0xd5, 0xf2, 0x4b, 0xe8, 0x29, 0x58, 0xdd, 0xda, 0x69,
+	0xd5, 0x1a, 0xc7, 0x27, 0x7a, 0xe3, 0x58, 0xdf, 0x6f, 0x34, 0xf6, 0xeb, 0xd5, 0x7c, 0x6a, 0x3b,
+	0x0d, 0x4b, 0xf2, 0x13, 0x85, 0xfa, 0x43, 0x05, 0xd0, 0xe4, 0xb3, 0x1b, 0xbd, 0x31, 0xf9, 0x96,
+	0x8f, 0x1c, 0xe0, 0xb1, 0x47, 0xf9, 0x2c, 0x1f, 0x0f, 0x62, 0x97, 0x7f, 0x3c, 0x28, 0x52, 0xc8,
+	0x46, 0x3f, 0xb7, 0xa1, 0xe7, 0xe0, 0xd6, 0xbd, 0xea, 0xf6, 0x41, 0xa3, 0x71, 0xa8, 0x9f, 0xb4,
+	0xb6, 0x5a, 0xe3, 0x2f, 0xd0, 0x5b, 0xf0, 0xd4, 0x28, 0xbb, 0x7a, 0xbc, 0xb5, 0x5d, 0xaf, 0xee,
+	0xe6, 0x15, 0xb4, 0x09, 0x2f, 0x4f, 0x65, 0xe9, 0x7b, 0x0d, 0x4d, 0x3f, 0xa9, 0x37, 0x5a, 0xfa,
+	0x5e, 0xad, 0x5e, 0xaf, 0x1d, 0xef, 0xe7, 0x63, 0xc5, 0x3f, 0x2b, 0x80, 0x18, 0x14, 0x88, 0x40,
+	0x88, 0x86, 0x1f, 0x04, 0x98, 0x50, 0x74, 0x13, 0x16, 0x45, 0xa0, 0x32, 0x5f, 0xb9, 0x62, 0x37,
+	0x24, 0xdb, 0x70, 0xba, 0x01, 0xbb, 0xc4, 0xb4, 0x5d, 0x33, 0xcc, 0x2a, 0x1b, 0x12, 0x77, 0x5c,
+	0x13, 0xa3, 0x7d, 0xc8, 0xc8, 0xc4, 0x1f, 0x5a, 0xf8, 0x82, 0x6f, 0xca, 0x5c, 0xe5, 0xe5, 0xab,
+	0x37, 0xde, 0x5d, 0x0b, 0x5f, 0x68, 0x60, 0x0d, 0x7e, 0xb3, 0xfb, 0x92, 0xc7, 0x3c, 0x11, 0xeb,
+	0x33, 0x2c, 0xbf, 0x0e, 0xa4, 0x18, 0xe1, 0xc4, 0xfa, 0x8c, 0xd5, 0x07, 0x38, 0x93, 0xba, 0xe7,
+	0xd8, 0x91, 0xaf, 0x5a, 0x2e, 0xde, 0x62, 0x84, 0xe2, 0xe7, 0xb0, 0x36, 0x92, 0x97, 0xbc, 0xc7,
+	0xbc, 0x0f, 0x4b, 0xc2, 0x41, 0x78, 0xec, 0x8b, 0x57, 0xc7, 0xa5, 0x85, 0x2a, 0xe8, 0x65, 0x58,
+	0x71, 0xd8, 0x2d, 0x28, 0xe2, 0x58, 0x14, 0x60, 0x99, 0x91, 0x9b, 0x03, 0xe7, 0x3f, 0x57, 0x20,
+	0xbf, 0x8f, 0xa5, 0xf3, 0xb0, 0xa6, 0xd3, 0x3e, 0x03, 0xfc, 0x4f, 0xeb, 0x59, 0xfc, 0x8b, 0x02,
+	0x6b, 0x3b, 0x3e, 0x36, 0x28, 0x1e, 0x8d, 0xec, 0x51, 0xdd, 0xbe, 0x0d, 0x8b, 0x42, 0x5b, 0x8e,
+	0xfb, 0x59, 0x6a, 0x25, 0x35, 0x26, 0x33, 0x8b, 0x5f, 0x9d, 0x59, 0xe2, 0xda, 0x99, 0xfd, 0x5b,
+	0x81, 0xb5, 0x53, 0xcf, 0x9c, 0xc8, 0x6c, 0x98, 0x81, 0xf2, 0xf8, 0x19, 0x4c, 0xeb, 0xcd, 0x1d,
+	0xc8, 0x04, 0xdc, 0x2f, 0xff, 0xa2, 0x2f, 0x3f, 0x20, 0xa8, 0x13, 0xef, 0xf3, 0x3d, 0x0b, 0xdb,
+	0xe6, 0x91, 0x41, 0xce, 0x35, 0x10, 0xe2, 0xec, 0xf7, 0x93, 0x4b, 0xff, 0x55, 0x58, 0xdb, 0xc5,
+	0x36, 0x1e, 0xcf, 0x7e, 0xca, 0x8e, 0x2b, 0xfe, 0x33, 0x06, 0xb7, 0xb6, 0x0d, 0xda, 0xbe, 0x1f,
+	0x2d, 0xd7, 0x95, 0xe7, 0x7e, 0x13, 0xf2, 0x32, 0xd2, 0x33, 0xa6, 0xab, 0x0f, 0x2e, 0x2b, 0xec,
+	0xb5, 0x28, 0x38, 0xc2, 0xa8, 0x6f, 0xa1, 0x8f, 0x61, 0x6d, 0x44, 0xd6, 0x72, 0x6c, 0xcb, 0xc1,
+	0xb2, 0x34, 0xaf, 0x5c, 0x9d, 0x1d, 0x37, 0xc4, 0x1e, 0xd2, 0x11, 0xbb, 0x35, 0x6e, 0x63, 0xb2,
+	0x25, 0x89, 0xab, 0x5b, 0x92, 0x7c, 0x9c, 0x96, 0x2c, 0x5e, 0xb7, 0x25, 0xdb, 0x39, 0xc8, 0x46,
+	0xab, 0x50, 0xfc, 0x04, 0xd4, 0x69, 0x65, 0x7f, 0x12, 0xb0, 0x54, 0x7c, 0x20, 0x5b, 0x1a, 0xdd,
+	0x03, 0x57, 0xb6, 0x34, 0xe2, 0x32, 0x36, 0xbf, 0xcb, 0x43, 0xc8, 0x44, 0xba, 0xf5, 0x78, 0xf1,
+	0x6f, 0x7e, 0x0b, 0xa0, 0x16, 0x45, 0xfd, 0xa7, 0x6b, 0xc7, 0xad, 0xea, 0x71, 0x4b, 0xbf, 0x5b,
+	0xab, 0xde, 0x1b, 0x1b, 0x7b, 0x37, 0x20, 0x1f, 0x65, 0xee, 0x9d, 0xd6, 0xeb, 0x79, 0xa5, 0xf2,
+	0xd7, 0x14, 0x2c, 0xc9, 0xb4, 0xd1, 0x57, 0x0a, 0x64, 0x22, 0xc8, 0x8f, 0x4a, 0x97, 0x45, 0x32,
+	0x39, 0xfa, 0xd4, 0xf2, 0xcc, 0xf2, 0xa2, 0x77, 0xc5, 0xd7, 0x7f, 0xf0, 0xc7, 0x7f, 0xfc, 0x2c,
+	0xf6, 0x0a, 0x7a, 0xa9, 0xfc, 0xb0, 0x52, 0xfe, 0x5c, 0x54, 0xf7, 0x03, 0xcf, 0x77, 0xbf, 0x8f,
+	0xdb, 0x94, 0x94, 0x37, 0xcb, 0x46, 0x17, 0x3b, 0xf4, 0x8b, 0x72, 0x38, 0x43, 0x7e, 0xaa, 0x40,
+	0x7a, 0x30, 0x1b, 0xd0, 0xa5, 0x7f, 0xa1, 0x19, 0x1f, 0x21, 0xea, 0x0c, 0x55, 0x1d, 0x0b, 0x87,
+	0x9d, 0xf9, 0x89, 0x60, 0xc2, 0x58, 0xca, 0x9b, 0x5f, 0xa0, 0x2f, 0x15, 0xc8, 0x46, 0x67, 0x02,
+	0xba, 0x34, 0xff, 0x29, 0xd3, 0x63, 0xa6, 0xa0, 0xde, 0xe6, 0x41, 0x95, 0x8b, 0xb3, 0xd5, 0xe8,
+	0x76, 0x08, 0xc1, 0xbf, 0x54, 0x20, 0x1b, 0x3d, 0x30, 0x97, 0x07, 0x37, 0x65, 0x00, 0xcc, 0x14,
+	0xdc, 0xfb, 0x3c, 0xb8, 0x77, 0x2a, 0xaf, 0xf1, 0xe0, 0xe4, 0x9f, 0xa7, 0xaf, 0x2a, 0xdc, 0x20,
+	0xc6, 0x1f, 0x29, 0x90, 0x8d, 0x1e, 0xbc, 0xcb, 0x63, 0x9c, 0x02, 0xd3, 0xea, 0xcd, 0x09, 0x6c,
+	0xaa, 0xf6, 0x3c, 0xda, 0x0f, 0x3b, 0xb9, 0x39, 0x63, 0x27, 0x7f, 0xad, 0x00, 0x9a, 0x84, 0x18,
+	0x74, 0xe9, 0xf3, 0xf6, 0x91, 0x93, 0x40, 0x7d, 0x2e, 0x54, 0x8b, 0xfc, 0x69, 0x9c, 0x3d, 0xd9,
+	0xc5, 0x5f, 0xbe, 0xc3, 0x9a, 0x15, 0xdf, 0x9c, 0xad, 0xa1, 0x67, 0x43, 0x3f, 0xb7, 0x95, 0xcd,
+	0x61, 0xa8, 0x23, 0x88, 0x35, 0x43, 0xa8, 0xd3, 0x10, 0xee, 0xbf, 0x11, 0xaa, 0xf0, 0x73, 0x5b,
+	0xd9, 0xdc, 0xfe, 0x52, 0x81, 0xe7, 0xdb, 0x6e, 0xef, 0x92, 0xc8, 0xb6, 0x25, 0x12, 0x36, 0x59,
+	0xf7, 0x9a, 0xca, 0x27, 0xbb, 0x52, 0xb4, 0xeb, 0xb2, 0xb1, 0x54, 0x72, 0xfd, 0x6e, 0xb9, 0x8b,
+	0x1d, 0xde, 0xdb, 0xb2, 0x60, 0x19, 0x9e, 0x45, 0xa6, 0xfd, 0x73, 0xc2, 0x9d, 0xe1, 0xea, 0x5f,
+	0x8a, 0xf2, 0xab, 0x58, 0x6c, 0x77, 0xef, 0x37, 0x31, 0x75, 0x5f, 0x98, 0xdb, 0xe1, 0x9e, 0x77,
+	0x87, 0x9e, 0xef, 0x56, 0xce, 0x16, 0xb9, 0xd5, 0xb7, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0xe0,
+	0xe1, 0x3b, 0xf8, 0x6f, 0x21, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3218,173 +3140,3 @@ var _Intents_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2/intent.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/intent.proto", fileDescriptor_intent_79fab48477a8b612)
-}
-
-var fileDescriptor_intent_79fab48477a8b612 = []byte{
-	// 2583 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcb, 0x73, 0x23, 0x47,
-	0x19, 0xf7, 0xe8, 0x61, 0x4b, 0x9f, 0x64, 0x59, 0x6e, 0x6f, 0x36, 0xda, 0xc9, 0x03, 0x47, 0x21,
-	0x89, 0xe3, 0x4a, 0xa4, 0x44, 0x21, 0x09, 0xd9, 0x4d, 0x42, 0xf9, 0x21, 0xdb, 0xc2, 0xb2, 0x25,
-	0xc6, 0xf2, 0x6e, 0x92, 0xa2, 0x98, 0x1a, 0x6b, 0x5a, 0xda, 0xc1, 0xa3, 0x99, 0xd9, 0xe9, 0x9e,
-	0x75, 0x94, 0x54, 0x2e, 0x54, 0x01, 0x07, 0xb8, 0xc1, 0x29, 0x55, 0x29, 0x0a, 0x4e, 0x14, 0x67,
-	0x4e, 0x1c, 0xf8, 0x0b, 0xb8, 0x51, 0x3c, 0x0e, 0x5c, 0xa8, 0xe2, 0x5f, 0xa0, 0x8a, 0x03, 0x07,
-	0xaa, 0x1f, 0x23, 0x8d, 0x1e, 0x6b, 0x4b, 0xde, 0x85, 0x0b, 0x37, 0xf5, 0xf7, 0x7e, 0x74, 0xff,
-	0xbe, 0xee, 0xb1, 0xe1, 0x95, 0xae, 0xeb, 0x76, 0x6d, 0x5c, 0x6e, 0xdb, 0x6e, 0x60, 0x96, 0x4d,
-	0xcb, 0xb0, 0xdd, 0x6e, 0xc7, 0x76, 0x2f, 0xca, 0x0f, 0x2b, 0x65, 0xcb, 0xa1, 0xd8, 0xa1, 0x25,
-	0xcf, 0x77, 0xa9, 0x8b, 0x54, 0x21, 0x58, 0xe2, 0x82, 0xa5, 0xa1, 0x60, 0xe9, 0x61, 0x45, 0x7d,
-	0x56, 0x1a, 0x31, 0x3c, 0xab, 0x6c, 0x38, 0x8e, 0x4b, 0x0d, 0x6a, 0xb9, 0x0e, 0x11, 0x9a, 0xea,
-	0xad, 0x08, 0xd7, 0xc7, 0xc4, 0x0d, 0xfc, 0x36, 0x96, 0xac, 0x8d, 0x4b, 0xbc, 0xb7, 0x5d, 0x87,
-	0xe2, 0x4f, 0xa5, 0x7b, 0xf5, 0x45, 0x29, 0x69, 0xbb, 0x4e, 0xd7, 0x0f, 0x1c, 0xc7, 0x72, 0xba,
-	0x65, 0xd7, 0xc3, 0xfe, 0x88, 0xa7, 0xe7, 0xa5, 0x10, 0x5f, 0x9d, 0x05, 0x9d, 0xb2, 0x19, 0x08,
-	0x01, 0xc9, 0x7f, 0x66, 0x9c, 0x8f, 0x7b, 0x1e, 0xed, 0x4b, 0xe6, 0xfa, 0x38, 0xb3, 0x63, 0x61,
-	0xdb, 0xd4, 0x7b, 0x06, 0x39, 0x97, 0x12, 0xcf, 0x8e, 0x4b, 0x10, 0xea, 0x07, 0x6d, 0x19, 0x61,
-	0xf1, 0x6f, 0x1b, 0xb0, 0x58, 0xe3, 0x15, 0x43, 0x08, 0x12, 0x8e, 0xd1, 0xc3, 0x05, 0x65, 0x5d,
-	0xd9, 0x48, 0x6b, 0xfc, 0x37, 0x7a, 0x01, 0xb2, 0xa6, 0x45, 0x3c, 0xdb, 0xe8, 0xeb, 0x9c, 0x17,
-	0xe3, 0xbc, 0x8c, 0xa4, 0x1d, 0x33, 0x91, 0x16, 0x2c, 0x5f, 0xe0, 0xb3, 0xfb, 0xae, 0x7b, 0xae,
-	0x13, 0x6a, 0x50, 0x5c, 0x58, 0x5c, 0x57, 0x36, 0x72, 0x95, 0x72, 0xe9, 0xd1, 0xa5, 0x2f, 0x09,
-	0x8f, 0xa5, 0x7b, 0x42, 0xef, 0x84, 0xa9, 0x69, 0xd9, 0x8b, 0xc8, 0x0a, 0xa9, 0x90, 0xf2, 0x7c,
-	0xcb, 0xf5, 0x2d, 0xda, 0x2f, 0xc4, 0xd7, 0x95, 0x8d, 0xa4, 0x36, 0x58, 0xa3, 0xaf, 0x41, 0xc6,
-	0x22, 0x7a, 0xc7, 0xb0, 0xed, 0x33, 0xa3, 0x7d, 0x5e, 0x48, 0xac, 0x2b, 0x1b, 0x29, 0x0d, 0x2c,
-	0xb2, 0x27, 0x29, 0x4c, 0xa0, 0x67, 0xeb, 0xa6, 0x45, 0x8c, 0x33, 0x1b, 0x9b, 0x85, 0x35, 0x21,
-	0xd0, 0xb3, 0x77, 0x25, 0x05, 0x95, 0x60, 0xcd, 0x72, 0xbc, 0x80, 0xea, 0xb2, 0x5d, 0x3c, 0x39,
-	0x52, 0x58, 0x5a, 0x8f, 0x6f, 0xa4, 0xb5, 0x55, 0xce, 0xda, 0x11, 0x1c, 0x96, 0x22, 0x41, 0x37,
-	0x61, 0x11, 0x3f, 0xc4, 0x0e, 0x25, 0x85, 0x14, 0x17, 0x91, 0x2b, 0xf4, 0x5d, 0xc8, 0x53, 0xdf,
-	0xb0, 0x58, 0x5f, 0x75, 0xef, 0xbe, 0x6f, 0x10, 0x4c, 0x0a, 0xe9, 0xf5, 0xf8, 0x46, 0xa6, 0xf2,
-	0xe6, 0x0c, 0xe9, 0xb7, 0xa4, 0x6a, 0x93, 0x6b, 0x6a, 0x2b, 0x74, 0x64, 0xcd, 0xbd, 0x1a, 0x6d,
-	0xb6, 0x11, 0x0a, 0xc0, 0xcb, 0x2e, 0x57, 0xa8, 0x0e, 0x2b, 0x6e, 0x40, 0x23, 0xe1, 0x93, 0x42,
-	0x86, 0x3b, 0x7d, 0xf1, 0x32, 0xa7, 0x32, 0x21, 0x2d, 0x27, 0x74, 0xe5, 0x92, 0xa0, 0x97, 0x20,
-	0xe7, 0x63, 0x82, 0x23, 0xc6, 0xb2, 0xbc, 0x5e, 0xcb, 0x9c, 0x3a, 0x10, 0xab, 0x03, 0x78, 0x86,
-	0x6f, 0xf4, 0x30, 0xc5, 0x3e, 0x29, 0x2c, 0x73, 0x7f, 0xaf, 0xcd, 0x90, 0x64, 0x33, 0x54, 0xd2,
-	0x22, 0xfa, 0x68, 0x0f, 0x52, 0x3d, 0x4c, 0x88, 0xd1, 0xc5, 0xa4, 0x90, 0xe3, 0xb6, 0x36, 0x67,
-	0xb0, 0x75, 0x24, 0x54, 0xb4, 0x81, 0x2e, 0x7a, 0x00, 0xaa, 0x89, 0x3b, 0x46, 0x60, 0x53, 0xdd,
-	0xc7, 0xc4, 0x73, 0x1d, 0x82, 0x75, 0xcf, 0x36, 0x68, 0xc7, 0xf5, 0x7b, 0xa4, 0xb0, 0xb2, 0x1e,
-	0xdf, 0xc8, 0x55, 0xde, 0x9a, 0xdd, 0x72, 0xa9, 0x29, 0x75, 0xb5, 0x82, 0x34, 0xab, 0x49, 0xab,
-	0x21, 0x83, 0xa0, 0xf7, 0xe0, 0x96, 0xef, 0xba, 0x54, 0xef, 0xb8, 0xb6, 0xed, 0x5e, 0x04, 0x9e,
-	0x2e, 0x00, 0x47, 0x9c, 0x8f, 0x3c, 0x6f, 0xd4, 0x4d, 0x26, 0xb0, 0x27, 0xf9, 0xc2, 0x03, 0x3f,
-	0x2a, 0x1f, 0xc0, 0x33, 0x9e, 0xe1, 0x33, 0xe1, 0xa9, 0xca, 0xab, 0x5c, 0xb9, 0x20, 0x44, 0xa6,
-	0xa8, 0x77, 0xe1, 0xc6, 0xb8, 0x9e, 0xe5, 0x74, 0xdc, 0x02, 0xe2, 0x05, 0x7c, 0x7b, 0x86, 0x34,
-	0x47, 0x8d, 0xd6, 0x9c, 0x8e, 0xab, 0xa1, 0xce, 0x04, 0x4d, 0xfd, 0x2a, 0x0e, 0xb9, 0xd1, 0xcd,
-	0x39, 0x15, 0x1c, 0xbe, 0x0d, 0x09, 0xda, 0xf7, 0x04, 0x28, 0xe4, 0x2a, 0xef, 0xcc, 0xbd, 0xe3,
-	0x4b, 0xad, 0xbe, 0x87, 0x35, 0x6e, 0x03, 0xd5, 0x21, 0xe9, 0x19, 0x3e, 0x25, 0x85, 0x38, 0x4f,
-	0xe6, 0x1a, 0xc6, 0x9a, 0x86, 0x4f, 0x35, 0x61, 0x04, 0x6d, 0xc2, 0x2a, 0xb5, 0x7a, 0x98, 0xe8,
-	0x86, 0x69, 0x62, 0x53, 0x6f, 0xbb, 0x81, 0x43, 0x39, 0x4e, 0x24, 0xb5, 0x15, 0xce, 0xd8, 0x62,
-	0xf4, 0x1d, 0x46, 0x56, 0x29, 0x24, 0x98, 0x2a, 0xcb, 0x90, 0xed, 0xf4, 0x30, 0x43, 0xf6, 0x9b,
-	0x01, 0x09, 0x76, 0xa8, 0x45, 0xfb, 0xfa, 0x20, 0xd1, 0xb4, 0x06, 0x82, 0xc4, 0x82, 0x47, 0x37,
-	0x20, 0x69, 0xd8, 0x96, 0x41, 0x38, 0x46, 0xa5, 0x35, 0xb1, 0x60, 0xa8, 0x19, 0x10, 0xec, 0xeb,
-	0x26, 0xee, 0x58, 0x0e, 0x36, 0x25, 0x42, 0x65, 0x18, 0x6d, 0x57, 0x90, 0x8a, 0x77, 0x20, 0x21,
-	0x0d, 0xe4, 0x5b, 0x1f, 0x37, 0xab, 0xfa, 0xe9, 0xf1, 0x49, 0xb3, 0xba, 0x53, 0xdb, 0xab, 0x55,
-	0x77, 0xf3, 0x0b, 0x28, 0x03, 0x4b, 0xd5, 0x8f, 0xb6, 0x8e, 0x9a, 0xf5, 0x6a, 0x5e, 0x41, 0x79,
-	0x48, 0xb5, 0xaa, 0x47, 0xcd, 0xfa, 0x56, 0xab, 0x9a, 0x8f, 0xa9, 0xb1, 0x94, 0xa2, 0xfe, 0x38,
-	0x06, 0xe9, 0xc1, 0xb9, 0xba, 0x2e, 0x6e, 0xdf, 0x80, 0xe4, 0x43, 0xc3, 0x0e, 0x70, 0x18, 0x3a,
-	0x5f, 0xa0, 0x17, 0x61, 0x39, 0x3c, 0x50, 0x82, 0x9b, 0xe0, 0xdc, 0xac, 0x24, 0xde, 0xe5, 0x42,
-	0xef, 0x42, 0x21, 0x52, 0x16, 0x7d, 0xc4, 0x53, 0x92, 0xcb, 0x3f, 0x35, 0xac, 0xd1, 0x6e, 0xc4,
-	0xe7, 0xb3, 0x90, 0xee, 0x19, 0x8e, 0x69, 0x50, 0xd7, 0xef, 0xf3, 0x39, 0x91, 0xd2, 0x86, 0x04,
-	0x54, 0x80, 0x25, 0xcf, 0x77, 0x7b, 0x1e, 0x0d, 0x91, 0x38, 0x5c, 0xa2, 0xa7, 0x61, 0xc9, 0x22,
-	0xba, 0x6d, 0x11, 0x5a, 0x48, 0x71, 0xad, 0x45, 0x8b, 0xd4, 0x2d, 0x42, 0xd5, 0x5f, 0xdc, 0x82,
-	0x25, 0x79, 0x76, 0x51, 0x35, 0xd2, 0xc0, 0xcc, 0x4c, 0xf3, 0x27, 0x3c, 0xf5, 0x2d, 0xfc, 0x29,
-	0x3d, 0x58, 0x90, 0x3d, 0x3f, 0x80, 0xa4, 0xd5, 0x33, 0xba, 0xa2, 0x66, 0x99, 0xca, 0x1b, 0x73,
-	0xd8, 0xa9, 0x31, 0xbd, 0x83, 0x05, 0x4d, 0x18, 0x40, 0xdf, 0x83, 0xe5, 0x07, 0x81, 0xd5, 0x3e,
-	0xd7, 0x7d, 0xec, 0xd9, 0x16, 0x16, 0x9b, 0x24, 0x53, 0x79, 0x77, 0x0e, 0x8b, 0xdf, 0x61, 0xfa,
-	0x9a, 0x50, 0x3f, 0x58, 0xd0, 0xb2, 0x0f, 0x22, 0x6b, 0x96, 0x70, 0xdb, 0xf0, 0xc5, 0xf6, 0x9a,
-	0x2f, 0xe1, 0x1d, 0xc3, 0x37, 0x59, 0xc2, 0x4c, 0x1d, 0xbd, 0x05, 0x4b, 0x9e, 0xd1, 0xb7, 0x5d,
-	0xc3, 0xe4, 0xcd, 0xcb, 0x54, 0x9e, 0x0e, 0x2d, 0x85, 0x57, 0x86, 0xd2, 0x09, 0xbf, 0x32, 0x1c,
-	0x2c, 0x68, 0xa1, 0x24, 0xea, 0x42, 0x9e, 0x58, 0x3d, 0xcf, 0xc6, 0x03, 0xdc, 0x65, 0x4d, 0x63,
-	0xda, 0xb7, 0xe7, 0x88, 0xe3, 0x84, 0x9b, 0x08, 0x31, 0x96, 0x65, 0xb8, 0x42, 0x46, 0x49, 0xe8,
-	0x14, 0xe0, 0xcc, 0x20, 0x56, 0x5b, 0xe7, 0xa9, 0xa6, 0xb8, 0x8b, 0x6f, 0xcc, 0xe1, 0x62, 0x9b,
-	0x29, 0xcb, 0x7c, 0xd3, 0x67, 0xe1, 0x02, 0x7d, 0x02, 0x19, 0x12, 0x74, 0xbb, 0x98, 0xf0, 0x9b,
-	0x58, 0x21, 0xcd, 0xed, 0xbe, 0x33, 0x4f, 0xe8, 0x43, 0xed, 0x83, 0x05, 0x2d, 0x6a, 0x0c, 0x39,
-	0xb0, 0x66, 0x5b, 0xce, 0xb9, 0xee, 0x06, 0x54, 0x1f, 0xd2, 0xf9, 0x10, 0xcf, 0x54, 0xde, 0x9f,
-	0xc3, 0x47, 0xdd, 0x72, 0xce, 0x1b, 0x01, 0x1d, 0xba, 0x3a, 0x58, 0xd0, 0x56, 0xed, 0x71, 0x22,
-	0xfa, 0x08, 0x32, 0xec, 0x68, 0xe8, 0x04, 0xdb, 0xb8, 0x4d, 0x0b, 0x19, 0xee, 0xe7, 0xed, 0xb9,
-	0xfc, 0x10, 0x7a, 0xc2, 0x95, 0x0f, 0x16, 0x34, 0xb0, 0x07, 0x2b, 0x64, 0xc2, 0x4a, 0xdb, 0xf0,
-	0xdd, 0x80, 0x60, 0x3b, 0xb4, 0x9e, 0xe5, 0xd6, 0xdf, 0x9b, 0x6f, 0xb3, 0x71, 0x0b, 0x03, 0x0f,
-	0xb9, 0xf6, 0x08, 0x05, 0x35, 0x20, 0x15, 0xce, 0x6c, 0x79, 0x79, 0xbc, 0xd6, 0xc8, 0x1e, 0x18,
-	0x51, 0x55, 0x48, 0xb0, 0x23, 0x1d, 0x81, 0xf4, 0x78, 0x08, 0xe9, 0xea, 0x09, 0x24, 0xf9, 0x31,
-	0x45, 0xcf, 0x40, 0x9a, 0x1f, 0x53, 0x3d, 0xf0, 0x2d, 0x89, 0x9d, 0x29, 0x4e, 0x38, 0xf5, 0x2d,
-	0xf4, 0x3a, 0x20, 0xa3, 0xdd, 0xc6, 0x84, 0x58, 0x67, 0x96, 0xcd, 0x81, 0x8e, 0xd9, 0x11, 0x28,
-	0xba, 0x3a, 0xc2, 0x61, 0x8e, 0xd4, 0x1a, 0x64, 0xa3, 0x27, 0x95, 0x61, 0x2b, 0xb5, 0xa8, 0x1d,
-	0x62, 0xb2, 0x58, 0x30, 0x6c, 0x1d, 0xc5, 0x83, 0x18, 0x8f, 0x6b, 0xe4, 0x50, 0xab, 0x7f, 0x57,
-	0x20, 0xc1, 0x77, 0xe8, 0x74, 0x1b, 0x2a, 0xa4, 0x48, 0x70, 0x26, 0x18, 0x22, 0x9c, 0xc1, 0x7a,
-	0x34, 0xa3, 0xf8, 0x58, 0x46, 0x4d, 0x58, 0x3a, 0x0b, 0x28, 0x65, 0x9b, 0x3d, 0x31, 0xf3, 0x88,
-	0x8d, 0xe2, 0x45, 0x69, 0x9b, 0xab, 0x6b, 0xa1, 0x19, 0xf5, 0x9b, 0xb0, 0x28, 0x48, 0x53, 0x47,
-	0x27, 0xbb, 0xc0, 0xbb, 0x84, 0xf2, 0x1b, 0xba, 0x0c, 0x34, 0x5c, 0xab, 0x3d, 0xc8, 0x8d, 0x9e,
-	0x7c, 0xf4, 0x75, 0xc8, 0xf1, 0x7b, 0x38, 0x75, 0x75, 0xe2, 0x61, 0xdc, 0xbe, 0x2f, 0x6d, 0x65,
-	0x19, 0xb5, 0xe5, 0x9e, 0x70, 0x1a, 0xf3, 0x43, 0x48, 0xcf, 0x96, 0xf6, 0xf8, 0xef, 0xe8, 0xa4,
-	0xe3, 0x31, 0xc4, 0x47, 0x26, 0x1d, 0xef, 0xce, 0x05, 0xac, 0x8c, 0x01, 0x0d, 0x32, 0xa7, 0xc0,
-	0x97, 0xc2, 0xcb, 0xf2, 0xde, 0xb5, 0xe1, 0x6b, 0x02, 0xbb, 0xd4, 0xdf, 0xc5, 0x21, 0x3d, 0xc0,
-	0x9f, 0x6b, 0x34, 0xf4, 0x25, 0xc8, 0xb1, 0xfd, 0x6c, 0x50, 0x8a, 0xcd, 0x68, 0x76, 0xcb, 0x03,
-	0x2a, 0xdf, 0xe6, 0x7b, 0xe1, 0xc4, 0x4a, 0x5c, 0x6f, 0x62, 0x85, 0xf3, 0xea, 0x74, 0xb8, 0x45,
-	0x92, 0xbc, 0x16, 0x77, 0xae, 0x83, 0xb3, 0x13, 0xfb, 0xe4, 0xb7, 0xca, 0x60, 0xa3, 0x4c, 0x2f,
-	0xc1, 0x03, 0x58, 0x71, 0x3d, 0xec, 0xb0, 0x6d, 0xab, 0xcb, 0x07, 0x8f, 0x98, 0xbd, 0xb5, 0xc7,
-	0xf0, 0x5f, 0x6a, 0x78, 0xd8, 0x39, 0xf5, 0xad, 0x2d, 0x6e, 0x50, 0x5b, 0x76, 0xa3, 0x4b, 0xf5,
-	0x05, 0x58, 0x1e, 0xe1, 0xa3, 0x3c, 0xc4, 0x87, 0x38, 0xc0, 0x7e, 0xaa, 0x45, 0x80, 0x08, 0xc6,
-	0x4e, 0x8d, 0x5c, 0xed, 0x40, 0x26, 0x32, 0x07, 0xd0, 0xbd, 0xd1, 0xa1, 0xa2, 0xcc, 0x7c, 0x2f,
-	0x9f, 0x1c, 0x2a, 0x23, 0x13, 0x45, 0x6d, 0xc2, 0xea, 0xc4, 0x2c, 0x40, 0xaf, 0x42, 0xde, 0x64,
-	0x3f, 0x1d, 0xfe, 0xb1, 0x40, 0x8f, 0xdc, 0x01, 0x57, 0x22, 0x74, 0x7e, 0xef, 0x92, 0xd9, 0xc5,
-	0x86, 0xd9, 0xfd, 0x21, 0x06, 0x30, 0x84, 0xfd, 0x47, 0x34, 0xa6, 0x09, 0x49, 0x8b, 0xe2, 0x9e,
-	0x00, 0xaa, 0xf9, 0x26, 0xfb, 0xd0, 0x76, 0xa9, 0x46, 0x71, 0x4f, 0x13, 0x86, 0xd4, 0x3f, 0x29,
-	0x90, 0x60, 0x6b, 0x74, 0x04, 0x09, 0xfe, 0x76, 0x51, 0xe6, 0x1e, 0x27, 0xc2, 0x2a, 0x33, 0xc2,
-	0xdf, 0x2f, 0xdc, 0xcc, 0x30, 0xfe, 0x58, 0x34, 0xfe, 0x75, 0xc8, 0x98, 0x98, 0xb4, 0x7d, 0xcb,
-	0xe3, 0x9b, 0x2a, 0x84, 0x86, 0x21, 0xe9, 0x49, 0x1d, 0x1d, 0xf5, 0xf7, 0x31, 0xc8, 0x8d, 0xce,
-	0x39, 0xd4, 0x0a, 0x8b, 0x27, 0xb6, 0xc1, 0x87, 0xd7, 0x9e, 0x98, 0xff, 0x17, 0x05, 0xfc, 0x10,
-	0x72, 0xa3, 0x71, 0xb1, 0x3d, 0x7b, 0x8e, 0xfb, 0xe1, 0x89, 0x3c, 0xc7, 0x7d, 0x0e, 0x95, 0x7d,
-	0xc7, 0x75, 0xfa, 0xbd, 0x70, 0x74, 0x0e, 0xd6, 0xc5, 0x9f, 0x28, 0x90, 0x0a, 0x6f, 0x02, 0xa8,
-	0x00, 0x37, 0xd8, 0x73, 0x69, 0xaf, 0xa1, 0x1d, 0x8d, 0x3d, 0xac, 0xb2, 0x90, 0xda, 0xdb, 0xda,
-	0xa9, 0x6e, 0x37, 0x1a, 0x87, 0x79, 0x05, 0xa5, 0x21, 0x79, 0x52, 0xdf, 0xda, 0x39, 0xcc, 0xc7,
-	0x18, 0xa3, 0x55, 0xad, 0x57, 0xf7, 0xb5, 0xad, 0xa3, 0x7c, 0x1c, 0x2d, 0x41, 0xfc, 0xb0, 0x76,
-	0x98, 0x4f, 0x70, 0x89, 0xc3, 0x8f, 0x9b, 0xd5, 0x7c, 0x12, 0xa5, 0x20, 0x51, 0xaf, 0x1d, 0x57,
-	0xf3, 0x8b, 0x8c, 0x78, 0xb7, 0xb6, 0x5d, 0xd5, 0xf2, 0x4b, 0xe8, 0x29, 0x58, 0xdd, 0xda, 0x69,
-	0xd5, 0x1a, 0xc7, 0x27, 0x7a, 0xe3, 0x58, 0xdf, 0x6f, 0x34, 0xf6, 0xeb, 0xd5, 0x7c, 0x6a, 0x3b,
-	0x0d, 0x4b, 0xf2, 0x13, 0x85, 0xfa, 0x43, 0x05, 0xd0, 0xe4, 0xb3, 0x1b, 0xbd, 0x31, 0xf9, 0x96,
-	0x8f, 0x1c, 0xe0, 0xb1, 0x47, 0xf9, 0x2c, 0x1f, 0x0f, 0x62, 0x97, 0x7f, 0x3c, 0x28, 0x52, 0xc8,
-	0x46, 0x3f, 0xb7, 0xa1, 0xe7, 0xe0, 0xd6, 0xbd, 0xea, 0xf6, 0x41, 0xa3, 0x71, 0xa8, 0x9f, 0xb4,
-	0xb6, 0x5a, 0xe3, 0x2f, 0xd0, 0x5b, 0xf0, 0xd4, 0x28, 0xbb, 0x7a, 0xbc, 0xb5, 0x5d, 0xaf, 0xee,
-	0xe6, 0x15, 0xb4, 0x09, 0x2f, 0x4f, 0x65, 0xe9, 0x7b, 0x0d, 0x4d, 0x3f, 0xa9, 0x37, 0x5a, 0xfa,
-	0x5e, 0xad, 0x5e, 0xaf, 0x1d, 0xef, 0xe7, 0x63, 0xc5, 0x3f, 0x2b, 0x80, 0x18, 0x14, 0x88, 0x40,
-	0x88, 0x86, 0x1f, 0x04, 0x98, 0x50, 0x74, 0x13, 0x16, 0x45, 0xa0, 0x32, 0x5f, 0xb9, 0x62, 0x37,
-	0x24, 0xdb, 0x70, 0xba, 0x01, 0xbb, 0xc4, 0xb4, 0x5d, 0x33, 0xcc, 0x2a, 0x1b, 0x12, 0x77, 0x5c,
-	0x13, 0xa3, 0x7d, 0xc8, 0xc8, 0xc4, 0x1f, 0x5a, 0xf8, 0x82, 0x6f, 0xca, 0x5c, 0xe5, 0xe5, 0xab,
-	0x37, 0xde, 0x5d, 0x0b, 0x5f, 0x68, 0x60, 0x0d, 0x7e, 0xb3, 0xfb, 0x92, 0xc7, 0x3c, 0x11, 0xeb,
-	0x33, 0x2c, 0xbf, 0x0e, 0xa4, 0x18, 0xe1, 0xc4, 0xfa, 0x8c, 0xd5, 0x07, 0x38, 0x93, 0xba, 0xe7,
-	0xd8, 0x91, 0xaf, 0x5a, 0x2e, 0xde, 0x62, 0x84, 0xe2, 0xe7, 0xb0, 0x36, 0x92, 0x97, 0xbc, 0xc7,
-	0xbc, 0x0f, 0x4b, 0xc2, 0x41, 0x78, 0xec, 0x8b, 0x57, 0xc7, 0xa5, 0x85, 0x2a, 0xe8, 0x65, 0x58,
-	0x71, 0xd8, 0x2d, 0x28, 0xe2, 0x58, 0x14, 0x60, 0x99, 0x91, 0x9b, 0x03, 0xe7, 0x3f, 0x57, 0x20,
-	0xbf, 0x8f, 0xa5, 0xf3, 0xb0, 0xa6, 0xd3, 0x3e, 0x03, 0xfc, 0x4f, 0xeb, 0x59, 0xfc, 0x8b, 0x02,
-	0x6b, 0x3b, 0x3e, 0x36, 0x28, 0x1e, 0x8d, 0xec, 0x51, 0xdd, 0xbe, 0x0d, 0x8b, 0x42, 0x5b, 0x8e,
-	0xfb, 0x59, 0x6a, 0x25, 0x35, 0x26, 0x33, 0x8b, 0x5f, 0x9d, 0x59, 0xe2, 0xda, 0x99, 0xfd, 0x5b,
-	0x81, 0xb5, 0x53, 0xcf, 0x9c, 0xc8, 0x6c, 0x98, 0x81, 0xf2, 0xf8, 0x19, 0x4c, 0xeb, 0xcd, 0x1d,
-	0xc8, 0x04, 0xdc, 0x2f, 0xff, 0xa2, 0x2f, 0x3f, 0x20, 0xa8, 0x13, 0xef, 0xf3, 0x3d, 0x0b, 0xdb,
-	0xe6, 0x91, 0x41, 0xce, 0x35, 0x10, 0xe2, 0xec, 0xf7, 0x93, 0x4b, 0xff, 0x55, 0x58, 0xdb, 0xc5,
-	0x36, 0x1e, 0xcf, 0x7e, 0xca, 0x8e, 0x2b, 0xfe, 0x33, 0x06, 0xb7, 0xb6, 0x0d, 0xda, 0xbe, 0x1f,
-	0x2d, 0xd7, 0x95, 0xe7, 0x7e, 0x13, 0xf2, 0x32, 0xd2, 0x33, 0xa6, 0xab, 0x0f, 0x2e, 0x2b, 0xec,
-	0xb5, 0x28, 0x38, 0xc2, 0xa8, 0x6f, 0xa1, 0x8f, 0x61, 0x6d, 0x44, 0xd6, 0x72, 0x6c, 0xcb, 0xc1,
-	0xb2, 0x34, 0xaf, 0x5c, 0x9d, 0x1d, 0x37, 0xc4, 0x1e, 0xd2, 0x11, 0xbb, 0x35, 0x6e, 0x63, 0xb2,
-	0x25, 0x89, 0xab, 0x5b, 0x92, 0x7c, 0x9c, 0x96, 0x2c, 0x5e, 0xb7, 0x25, 0xdb, 0x39, 0xc8, 0x46,
-	0xab, 0x50, 0xfc, 0x04, 0xd4, 0x69, 0x65, 0x7f, 0x12, 0xb0, 0x54, 0x7c, 0x20, 0x5b, 0x1a, 0xdd,
-	0x03, 0x57, 0xb6, 0x34, 0xe2, 0x32, 0x36, 0xbf, 0xcb, 0x43, 0xc8, 0x44, 0xba, 0xf5, 0x78, 0xf1,
-	0x6f, 0x7e, 0x0b, 0xa0, 0x16, 0x45, 0xfd, 0xa7, 0x6b, 0xc7, 0xad, 0xea, 0x71, 0x4b, 0xbf, 0x5b,
-	0xab, 0xde, 0x1b, 0x1b, 0x7b, 0x37, 0x20, 0x1f, 0x65, 0xee, 0x9d, 0xd6, 0xeb, 0x79, 0xa5, 0xf2,
-	0xd7, 0x14, 0x2c, 0xc9, 0xb4, 0xd1, 0x57, 0x0a, 0x64, 0x22, 0xc8, 0x8f, 0x4a, 0x97, 0x45, 0x32,
-	0x39, 0xfa, 0xd4, 0xf2, 0xcc, 0xf2, 0xa2, 0x77, 0xc5, 0xd7, 0x7f, 0xf0, 0xc7, 0x7f, 0xfc, 0x2c,
-	0xf6, 0x0a, 0x7a, 0xa9, 0xfc, 0xb0, 0x52, 0xfe, 0x5c, 0x54, 0xf7, 0x03, 0xcf, 0x77, 0xbf, 0x8f,
-	0xdb, 0x94, 0x94, 0x37, 0xcb, 0x46, 0x17, 0x3b, 0xf4, 0x8b, 0x72, 0x38, 0x43, 0x7e, 0xaa, 0x40,
-	0x7a, 0x30, 0x1b, 0xd0, 0xa5, 0x7f, 0xa1, 0x19, 0x1f, 0x21, 0xea, 0x0c, 0x55, 0x1d, 0x0b, 0x87,
-	0x9d, 0xf9, 0x89, 0x60, 0xc2, 0x58, 0xca, 0x9b, 0x5f, 0xa0, 0x2f, 0x15, 0xc8, 0x46, 0x67, 0x02,
-	0xba, 0x34, 0xff, 0x29, 0xd3, 0x63, 0xa6, 0xa0, 0xde, 0xe6, 0x41, 0x95, 0x8b, 0xb3, 0xd5, 0xe8,
-	0x76, 0x08, 0xc1, 0xbf, 0x54, 0x20, 0x1b, 0x3d, 0x30, 0x97, 0x07, 0x37, 0x65, 0x00, 0xcc, 0x14,
-	0xdc, 0xfb, 0x3c, 0xb8, 0x77, 0x2a, 0xaf, 0xf1, 0xe0, 0xe4, 0x9f, 0xa7, 0xaf, 0x2a, 0xdc, 0x20,
-	0xc6, 0x1f, 0x29, 0x90, 0x8d, 0x1e, 0xbc, 0xcb, 0x63, 0x9c, 0x02, 0xd3, 0xea, 0xcd, 0x09, 0x6c,
-	0xaa, 0xf6, 0x3c, 0xda, 0x0f, 0x3b, 0xb9, 0x39, 0x63, 0x27, 0x7f, 0xad, 0x00, 0x9a, 0x84, 0x18,
-	0x74, 0xe9, 0xf3, 0xf6, 0x91, 0x93, 0x40, 0x7d, 0x2e, 0x54, 0x8b, 0xfc, 0x69, 0x9c, 0x3d, 0xd9,
-	0xc5, 0x5f, 0xbe, 0xc3, 0x9a, 0x15, 0xdf, 0x9c, 0xad, 0xa1, 0x67, 0x43, 0x3f, 0xb7, 0x95, 0xcd,
-	0x61, 0xa8, 0x23, 0x88, 0x35, 0x43, 0xa8, 0xd3, 0x10, 0xee, 0xbf, 0x11, 0xaa, 0xf0, 0x73, 0x5b,
-	0xd9, 0xdc, 0xfe, 0x52, 0x81, 0xe7, 0xdb, 0x6e, 0xef, 0x92, 0xc8, 0xb6, 0x25, 0x12, 0x36, 0x59,
-	0xf7, 0x9a, 0xca, 0x27, 0xbb, 0x52, 0xb4, 0xeb, 0xb2, 0xb1, 0x54, 0x72, 0xfd, 0x6e, 0xb9, 0x8b,
-	0x1d, 0xde, 0xdb, 0xb2, 0x60, 0x19, 0x9e, 0x45, 0xa6, 0xfd, 0x73, 0xc2, 0x9d, 0xe1, 0xea, 0x5f,
-	0x8a, 0xf2, 0xab, 0x58, 0x6c, 0x77, 0xef, 0x37, 0x31, 0x75, 0x5f, 0x98, 0xdb, 0xe1, 0x9e, 0x77,
-	0x87, 0x9e, 0xef, 0x56, 0xce, 0x16, 0xb9, 0xd5, 0xb7, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0xe0,
-	0xe1, 0x3b, 0xf8, 0x6f, 0x21, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2/session.pb.go b/googleapis/cloud/dialogflow/v2/session.pb.go
index 89f21a4e45..33503940fd 100644
--- a/googleapis/cloud/dialogflow/v2/session.pb.go
+++ b/googleapis/cloud/dialogflow/v2/session.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/session.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Type of the response message.
 type StreamingRecognitionResult_MessageType int32
@@ -50,6 +50,7 @@ var StreamingRecognitionResult_MessageType_name = map[int32]string{
 	1: "TRANSCRIPT",
 	2: "END_OF_SINGLE_UTTERANCE",
 }
+
 var StreamingRecognitionResult_MessageType_value = map[string]int32{
 	"MESSAGE_TYPE_UNSPECIFIED": 0,
 	"TRANSCRIPT":               1,
@@ -59,8 +60,9 @@ var StreamingRecognitionResult_MessageType_value = map[string]int32{
 func (x StreamingRecognitionResult_MessageType) String() string {
 	return proto.EnumName(StreamingRecognitionResult_MessageType_name, int32(x))
 }
+
 func (StreamingRecognitionResult_MessageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{7, 0}
+	return fileDescriptor_2f8892c06d516e44, []int{7, 0}
 }
 
 // The request to detect user's intent.
@@ -99,16 +101,17 @@ func (m *DetectIntentRequest) Reset()         { *m = DetectIntentRequest{} }
 func (m *DetectIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*DetectIntentRequest) ProtoMessage()    {}
 func (*DetectIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{0}
+	return fileDescriptor_2f8892c06d516e44, []int{0}
 }
+
 func (m *DetectIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetectIntentRequest.Unmarshal(m, b)
 }
 func (m *DetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetectIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DetectIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetectIntentRequest.Merge(dst, src)
+func (m *DetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentRequest.Merge(m, src)
 }
 func (m *DetectIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_DetectIntentRequest.Size(m)
@@ -182,16 +185,17 @@ func (m *DetectIntentResponse) Reset()         { *m = DetectIntentResponse{} }
 func (m *DetectIntentResponse) String() string { return proto.CompactTextString(m) }
 func (*DetectIntentResponse) ProtoMessage()    {}
 func (*DetectIntentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{1}
+	return fileDescriptor_2f8892c06d516e44, []int{1}
 }
+
 func (m *DetectIntentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetectIntentResponse.Unmarshal(m, b)
 }
 func (m *DetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetectIntentResponse.Marshal(b, m, deterministic)
 }
-func (dst *DetectIntentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetectIntentResponse.Merge(dst, src)
+func (m *DetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentResponse.Merge(m, src)
 }
 func (m *DetectIntentResponse) XXX_Size() int {
 	return xxx_messageInfo_DetectIntentResponse.Size(m)
@@ -271,16 +275,17 @@ func (m *QueryParameters) Reset()         { *m = QueryParameters{} }
 func (m *QueryParameters) String() string { return proto.CompactTextString(m) }
 func (*QueryParameters) ProtoMessage()    {}
 func (*QueryParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{2}
+	return fileDescriptor_2f8892c06d516e44, []int{2}
 }
+
 func (m *QueryParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryParameters.Unmarshal(m, b)
 }
 func (m *QueryParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryParameters.Marshal(b, m, deterministic)
 }
-func (dst *QueryParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryParameters.Merge(dst, src)
+func (m *QueryParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryParameters.Merge(m, src)
 }
 func (m *QueryParameters) XXX_Size() int {
 	return xxx_messageInfo_QueryParameters.Size(m)
@@ -365,16 +370,17 @@ func (m *QueryInput) Reset()         { *m = QueryInput{} }
 func (m *QueryInput) String() string { return proto.CompactTextString(m) }
 func (*QueryInput) ProtoMessage()    {}
 func (*QueryInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{3}
+	return fileDescriptor_2f8892c06d516e44, []int{3}
 }
+
 func (m *QueryInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryInput.Unmarshal(m, b)
 }
 func (m *QueryInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryInput.Marshal(b, m, deterministic)
 }
-func (dst *QueryInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryInput.Merge(dst, src)
+func (m *QueryInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryInput.Merge(m, src)
 }
 func (m *QueryInput) XXX_Size() int {
 	return xxx_messageInfo_QueryInput.Size(m)
@@ -435,99 +441,15 @@ func (m *QueryInput) GetEvent() *EventInput {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*QueryInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _QueryInput_OneofMarshaler, _QueryInput_OneofUnmarshaler, _QueryInput_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*QueryInput) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*QueryInput_AudioConfig)(nil),
 		(*QueryInput_Text)(nil),
 		(*QueryInput_Event)(nil),
 	}
 }
 
-func _QueryInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*QueryInput)
-	// input
-	switch x := m.Input.(type) {
-	case *QueryInput_AudioConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioConfig); err != nil {
-			return err
-		}
-	case *QueryInput_Text:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Text); err != nil {
-			return err
-		}
-	case *QueryInput_Event:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Event); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("QueryInput.Input has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _QueryInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*QueryInput)
-	switch tag {
-	case 1: // input.audio_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InputAudioConfig)
-		err := b.DecodeMessage(msg)
-		m.Input = &QueryInput_AudioConfig{msg}
-		return true, err
-	case 2: // input.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &QueryInput_Text{msg}
-		return true, err
-	case 3: // input.event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EventInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &QueryInput_Event{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _QueryInput_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*QueryInput)
-	// input
-	switch x := m.Input.(type) {
-	case *QueryInput_AudioConfig:
-		s := proto.Size(x.AudioConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *QueryInput_Text:
-		s := proto.Size(x.Text)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *QueryInput_Event:
-		s := proto.Size(x.Event)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents the result of conversational query or event processing.
 type QueryResult struct {
 	// The original conversational query text:
@@ -604,16 +526,17 @@ func (m *QueryResult) Reset()         { *m = QueryResult{} }
 func (m *QueryResult) String() string { return proto.CompactTextString(m) }
 func (*QueryResult) ProtoMessage()    {}
 func (*QueryResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{4}
+	return fileDescriptor_2f8892c06d516e44, []int{4}
 }
+
 func (m *QueryResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryResult.Unmarshal(m, b)
 }
 func (m *QueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryResult.Marshal(b, m, deterministic)
 }
-func (dst *QueryResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryResult.Merge(dst, src)
+func (m *QueryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResult.Merge(m, src)
 }
 func (m *QueryResult) XXX_Size() int {
 	return xxx_messageInfo_QueryResult.Size(m)
@@ -785,16 +708,17 @@ func (m *StreamingDetectIntentRequest) Reset()         { *m = StreamingDetectInt
 func (m *StreamingDetectIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamingDetectIntentRequest) ProtoMessage()    {}
 func (*StreamingDetectIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{5}
+	return fileDescriptor_2f8892c06d516e44, []int{5}
 }
+
 func (m *StreamingDetectIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingDetectIntentRequest.Unmarshal(m, b)
 }
 func (m *StreamingDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingDetectIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamingDetectIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingDetectIntentRequest.Merge(dst, src)
+func (m *StreamingDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentRequest.Merge(m, src)
 }
 func (m *StreamingDetectIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamingDetectIntentRequest.Size(m)
@@ -884,16 +808,17 @@ func (m *StreamingDetectIntentResponse) Reset()         { *m = StreamingDetectIn
 func (m *StreamingDetectIntentResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamingDetectIntentResponse) ProtoMessage()    {}
 func (*StreamingDetectIntentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{6}
+	return fileDescriptor_2f8892c06d516e44, []int{6}
 }
+
 func (m *StreamingDetectIntentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingDetectIntentResponse.Unmarshal(m, b)
 }
 func (m *StreamingDetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingDetectIntentResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamingDetectIntentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingDetectIntentResponse.Merge(dst, src)
+func (m *StreamingDetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentResponse.Merge(m, src)
 }
 func (m *StreamingDetectIntentResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamingDetectIntentResponse.Size(m)
@@ -1007,16 +932,17 @@ func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognition
 func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognitionResult) ProtoMessage()    {}
 func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{7}
+	return fileDescriptor_2f8892c06d516e44, []int{7}
 }
+
 func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
 }
 func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+func (m *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(m, src)
 }
 func (m *StreamingRecognitionResult) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
@@ -1074,16 +1000,17 @@ func (m *TextInput) Reset()         { *m = TextInput{} }
 func (m *TextInput) String() string { return proto.CompactTextString(m) }
 func (*TextInput) ProtoMessage()    {}
 func (*TextInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{8}
+	return fileDescriptor_2f8892c06d516e44, []int{8}
 }
+
 func (m *TextInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextInput.Unmarshal(m, b)
 }
 func (m *TextInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextInput.Marshal(b, m, deterministic)
 }
-func (dst *TextInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextInput.Merge(dst, src)
+func (m *TextInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextInput.Merge(m, src)
 }
 func (m *TextInput) XXX_Size() int {
 	return xxx_messageInfo_TextInput.Size(m)
@@ -1132,16 +1059,17 @@ func (m *EventInput) Reset()         { *m = EventInput{} }
 func (m *EventInput) String() string { return proto.CompactTextString(m) }
 func (*EventInput) ProtoMessage()    {}
 func (*EventInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{9}
+	return fileDescriptor_2f8892c06d516e44, []int{9}
 }
+
 func (m *EventInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventInput.Unmarshal(m, b)
 }
 func (m *EventInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EventInput.Marshal(b, m, deterministic)
 }
-func (dst *EventInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventInput.Merge(dst, src)
+func (m *EventInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventInput.Merge(m, src)
 }
 func (m *EventInput) XXX_Size() int {
 	return xxx_messageInfo_EventInput.Size(m)
@@ -1188,16 +1116,17 @@ func (m *SentimentAnalysisRequestConfig) Reset()         { *m = SentimentAnalysi
 func (m *SentimentAnalysisRequestConfig) String() string { return proto.CompactTextString(m) }
 func (*SentimentAnalysisRequestConfig) ProtoMessage()    {}
 func (*SentimentAnalysisRequestConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{10}
+	return fileDescriptor_2f8892c06d516e44, []int{10}
 }
+
 func (m *SentimentAnalysisRequestConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SentimentAnalysisRequestConfig.Unmarshal(m, b)
 }
 func (m *SentimentAnalysisRequestConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SentimentAnalysisRequestConfig.Marshal(b, m, deterministic)
 }
-func (dst *SentimentAnalysisRequestConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SentimentAnalysisRequestConfig.Merge(dst, src)
+func (m *SentimentAnalysisRequestConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SentimentAnalysisRequestConfig.Merge(m, src)
 }
 func (m *SentimentAnalysisRequestConfig) XXX_Size() int {
 	return xxx_messageInfo_SentimentAnalysisRequestConfig.Size(m)
@@ -1229,16 +1158,17 @@ func (m *SentimentAnalysisResult) Reset()         { *m = SentimentAnalysisResult
 func (m *SentimentAnalysisResult) String() string { return proto.CompactTextString(m) }
 func (*SentimentAnalysisResult) ProtoMessage()    {}
 func (*SentimentAnalysisResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{11}
+	return fileDescriptor_2f8892c06d516e44, []int{11}
 }
+
 func (m *SentimentAnalysisResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SentimentAnalysisResult.Unmarshal(m, b)
 }
 func (m *SentimentAnalysisResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SentimentAnalysisResult.Marshal(b, m, deterministic)
 }
-func (dst *SentimentAnalysisResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SentimentAnalysisResult.Merge(dst, src)
+func (m *SentimentAnalysisResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SentimentAnalysisResult.Merge(m, src)
 }
 func (m *SentimentAnalysisResult) XXX_Size() int {
 	return xxx_messageInfo_SentimentAnalysisResult.Size(m)
@@ -1274,16 +1204,17 @@ func (m *Sentiment) Reset()         { *m = Sentiment{} }
 func (m *Sentiment) String() string { return proto.CompactTextString(m) }
 func (*Sentiment) ProtoMessage()    {}
 func (*Sentiment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_f34861f1b5aa3372, []int{12}
+	return fileDescriptor_2f8892c06d516e44, []int{12}
 }
+
 func (m *Sentiment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
 }
 func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
 }
-func (dst *Sentiment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentiment.Merge(dst, src)
+func (m *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(m, src)
 }
 func (m *Sentiment) XXX_Size() int {
 	return xxx_messageInfo_Sentiment.Size(m)
@@ -1309,6 +1240,7 @@ func (m *Sentiment) GetMagnitude() float32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2.StreamingRecognitionResult_MessageType", StreamingRecognitionResult_MessageType_name, StreamingRecognitionResult_MessageType_value)
 	proto.RegisterType((*DetectIntentRequest)(nil), "google.cloud.dialogflow.v2.DetectIntentRequest")
 	proto.RegisterType((*DetectIntentResponse)(nil), "google.cloud.dialogflow.v2.DetectIntentResponse")
 	proto.RegisterType((*QueryParameters)(nil), "google.cloud.dialogflow.v2.QueryParameters")
@@ -1322,7 +1254,113 @@ func init() {
 	proto.RegisterType((*SentimentAnalysisRequestConfig)(nil), "google.cloud.dialogflow.v2.SentimentAnalysisRequestConfig")
 	proto.RegisterType((*SentimentAnalysisResult)(nil), "google.cloud.dialogflow.v2.SentimentAnalysisResult")
 	proto.RegisterType((*Sentiment)(nil), "google.cloud.dialogflow.v2.Sentiment")
-	proto.RegisterEnum("google.cloud.dialogflow.v2.StreamingRecognitionResult_MessageType", StreamingRecognitionResult_MessageType_name, StreamingRecognitionResult_MessageType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/session.proto", fileDescriptor_2f8892c06d516e44)
+}
+
+var fileDescriptor_2f8892c06d516e44 = []byte{
+	// 1581 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4b, 0x73, 0x1b, 0xc7,
+	0x11, 0xe6, 0x82, 0x2f, 0xa0, 0x01, 0x91, 0xd4, 0x90, 0x09, 0xc1, 0x87, 0x18, 0x09, 0x2a, 0x45,
+	0x14, 0x13, 0x61, 0x15, 0x28, 0xa5, 0x44, 0x54, 0xe9, 0x41, 0x02, 0x20, 0x85, 0x14, 0x45, 0x41,
+	0x0b, 0x2a, 0x0f, 0x55, 0xa9, 0xb6, 0x56, 0x8b, 0xc1, 0x6a, 0x93, 0xc5, 0xcc, 0x72, 0x67, 0x96,
+	0x12, 0x95, 0x4a, 0x0e, 0xa9, 0xca, 0x1f, 0xb0, 0xcb, 0x27, 0xdf, 0x7c, 0xf4, 0xc9, 0x07, 0x1f,
+	0x7c, 0xf4, 0xd1, 0x77, 0x57, 0xf9, 0x17, 0xd8, 0x17, 0xff, 0x02, 0x1f, 0x7c, 0x70, 0xed, 0xcc,
+	0x2c, 0xb0, 0x24, 0x81, 0x25, 0xad, 0x92, 0x7d, 0xf0, 0x0d, 0xd3, 0xf3, 0x75, 0x4f, 0xef, 0x37,
+	0xdd, 0xdf, 0x74, 0x01, 0x56, 0x1d, 0x4a, 0x1d, 0x0f, 0xeb, 0xb6, 0x47, 0xc3, 0xb6, 0xde, 0x76,
+	0x2d, 0x8f, 0x3a, 0x1d, 0x8f, 0xbe, 0xd2, 0x0f, 0x2a, 0x3a, 0xc3, 0x8c, 0xb9, 0x94, 0x94, 0xfd,
+	0x80, 0x72, 0x8a, 0x16, 0x25, 0xb2, 0x2c, 0x90, 0xe5, 0x3e, 0xb2, 0x7c, 0x50, 0x59, 0x5c, 0x56,
+	0x51, 0x2c, 0xdf, 0xd5, 0x2d, 0x42, 0x28, 0xb7, 0xb8, 0x4b, 0x09, 0x93, 0x9e, 0x8b, 0x0b, 0x89,
+	0xdd, 0x00, 0x33, 0x1a, 0x06, 0x36, 0x56, 0x5b, 0xd7, 0x53, 0x8e, 0xb7, 0xc2, 0xb6, 0x4b, 0x4d,
+	0x9b, 0x92, 0x8e, 0xeb, 0x28, 0x78, 0x5a, 0xb6, 0x36, 0x25, 0x1c, 0xbf, 0xe6, 0x0a, 0x79, 0x35,
+	0x05, 0xe9, 0x12, 0x8e, 0x49, 0x0c, 0xfc, 0xe3, 0xe9, 0x04, 0x98, 0x98, 0x70, 0x97, 0x1f, 0x9a,
+	0xfc, 0xd0, 0x8f, 0xf3, 0x8e, 0x3f, 0x58, 0xac, 0x5e, 0x84, 0x1d, 0x9d, 0xf1, 0x20, 0xb4, 0xe3,
+	0x98, 0xf3, 0x6a, 0x37, 0xf0, 0x6d, 0x9d, 0x71, 0x8b, 0x87, 0x31, 0x13, 0x45, 0xb5, 0x11, 0x45,
+	0xd2, 0x3d, 0x8b, 0x7b, 0x44, 0x7d, 0x59, 0xe9, 0x8b, 0x0c, 0xcc, 0xd6, 0x30, 0xc7, 0x36, 0x6f,
+	0x88, 0xec, 0x0c, 0xbc, 0x1f, 0x62, 0xc6, 0x51, 0x11, 0x26, 0x55, 0x16, 0x45, 0xed, 0xa2, 0xb6,
+	0x9a, 0x33, 0xe2, 0x25, 0xda, 0x85, 0xc2, 0x7e, 0x88, 0x83, 0x43, 0xd3, 0xb7, 0x02, 0xab, 0xcb,
+	0x8a, 0x99, 0x8b, 0xda, 0x6a, 0xbe, 0xf2, 0xbb, 0xf2, 0xf0, 0x6b, 0x2a, 0x3f, 0x89, 0xf0, 0xcd,
+	0x08, 0x8e, 0x39, 0x0e, 0x98, 0x91, 0xdf, 0xef, 0x19, 0x18, 0xda, 0x06, 0xb9, 0x34, 0x5d, 0xe2,
+	0x87, 0xbc, 0x38, 0x2a, 0xc2, 0xfd, 0xf6, 0xd4, 0x70, 0x8d, 0x08, 0x6d, 0xc0, 0x7e, 0xef, 0x37,
+	0x7a, 0x0e, 0xb3, 0x34, 0xe4, 0x7e, 0xc8, 0xcd, 0xe4, 0x0d, 0x16, 0xc7, 0x44, 0xc0, 0xeb, 0x69,
+	0x01, 0x1f, 0x0b, 0xb7, 0x8d, 0xc8, 0xab, 0x2a, 0x9c, 0x8c, 0xf3, 0xf4, 0xb8, 0x09, 0xfd, 0x06,
+	0xf2, 0x22, 0x43, 0x19, 0xbd, 0x38, 0x7e, 0x51, 0x5b, 0x2d, 0x18, 0x20, 0x4c, 0x02, 0x56, 0xfa,
+	0x3c, 0x03, 0x73, 0x47, 0xa9, 0x64, 0x3e, 0x25, 0x0c, 0x47, 0x9e, 0x81, 0xfa, 0x6d, 0xba, 0x6d,
+	0xc5, 0x27, 0xc4, 0xa6, 0x46, 0x1b, 0xfd, 0x25, 0xa6, 0x34, 0xc0, 0x2c, 0xf4, 0xb8, 0xa2, 0xf4,
+	0xea, 0xa9, 0x1c, 0x18, 0x02, 0xae, 0xe8, 0x94, 0x0b, 0x74, 0x1b, 0xa6, 0x5e, 0xe1, 0x17, 0x2f,
+	0x29, 0xfd, 0x97, 0x29, 0x4b, 0x40, 0x31, 0x8a, 0xe2, 0x68, 0x81, 0x6f, 0x97, 0x5b, 0x62, 0xc7,
+	0x38, 0xa7, 0x90, 0x72, 0x89, 0x2e, 0x41, 0x21, 0x49, 0xa0, 0x60, 0xae, 0x60, 0xe4, 0x13, 0x54,
+	0x0c, 0xe3, 0x78, 0xe2, 0xdd, 0x70, 0x5c, 0xfa, 0x76, 0x14, 0xa6, 0x8f, 0x15, 0x0b, 0x5a, 0x82,
+	0x1c, 0x77, 0xbb, 0xd8, 0x7c, 0x43, 0x09, 0x56, 0xdc, 0x65, 0x23, 0xc3, 0x33, 0x4a, 0x30, 0xba,
+	0x05, 0x05, 0x07, 0x53, 0xd3, 0xa3, 0xb6, 0xe8, 0x7c, 0xc5, 0xdc, 0x6c, 0x9c, 0x88, 0xe8, 0x9c,
+	0x1d, 0x8b, 0xef, 0x10, 0xc7, 0xc8, 0x3b, 0x98, 0xee, 0x28, 0x1c, 0xba, 0x0f, 0x59, 0xd5, 0xb7,
+	0x11, 0x3f, 0xa3, 0xab, 0xf9, 0xca, 0xe5, 0xb4, 0xe4, 0xab, 0x12, 0x6b, 0xf4, 0x9c, 0xd0, 0x15,
+	0x98, 0x0a, 0x30, 0xc3, 0xdc, 0xec, 0x85, 0x89, 0xd8, 0xca, 0x1a, 0xe7, 0x84, 0xb5, 0x1a, 0xc3,
+	0x4c, 0x98, 0x1b, 0xd0, 0xcc, 0xac, 0x38, 0x2e, 0xce, 0x4c, 0x25, 0xac, 0x25, 0xfd, 0xea, 0xc2,
+	0x6d, 0xef, 0xd0, 0xc7, 0x06, 0x62, 0xc7, 0x4d, 0x0c, 0xfd, 0x01, 0x26, 0x7d, 0xeb, 0xd0, 0xa3,
+	0x56, 0x5b, 0x5d, 0xc2, 0x7c, 0x1c, 0x33, 0x96, 0x88, 0x72, 0x4b, 0x48, 0x84, 0x11, 0xe3, 0xd0,
+	0xff, 0x35, 0xb8, 0xc4, 0xa2, 0x6c, 0xba, 0x98, 0x70, 0xd3, 0x22, 0x96, 0x77, 0xc8, 0x5c, 0x66,
+	0x06, 0xb2, 0xf3, 0xe3, 0x2b, 0x05, 0x11, 0x6d, 0x3d, 0x3d, 0x43, 0x15, 0x64, 0x43, 0xc5, 0x50,
+	0xe2, 0xa1, 0xee, 0x77, 0x85, 0xa5, 0xee, 0x97, 0xbe, 0xd1, 0x00, 0xfa, 0xad, 0x8c, 0x9e, 0x40,
+	0xe1, 0x48, 0x4d, 0x69, 0x22, 0x81, 0xdf, 0xa7, 0x25, 0xd0, 0x20, 0x47, 0xeb, 0xe7, 0xe1, 0x88,
+	0x91, 0xb7, 0x12, 0x2d, 0x7b, 0x07, 0xc6, 0xa2, 0x6b, 0x50, 0x55, 0x71, 0x25, 0x2d, 0xd4, 0x1e,
+	0x7e, 0xcd, 0x45, 0xb8, 0x87, 0x23, 0x86, 0x70, 0x42, 0xf7, 0x60, 0x1c, 0x1f, 0x60, 0x72, 0x26,
+	0x45, 0xaa, 0x47, 0xc0, 0xd8, 0x5d, 0xba, 0x6d, 0x4e, 0xc2, 0xb8, 0x10, 0x87, 0xd2, 0x07, 0x93,
+	0x90, 0x4f, 0xb4, 0x2b, 0xba, 0x00, 0x52, 0xb5, 0x4c, 0x91, 0x9b, 0xac, 0xe8, 0x9c, 0xb0, 0x44,
+	0x49, 0xa0, 0xcb, 0x70, 0xce, 0xb3, 0x88, 0x13, 0x5a, 0x0e, 0x36, 0x6d, 0xda, 0xc6, 0xc5, 0x69,
+	0x81, 0x28, 0xc4, 0xc6, 0x2a, 0x6d, 0x63, 0xb4, 0x09, 0x17, 0x98, 0x8f, 0xb1, 0xfd, 0xd2, 0x0c,
+	0xb0, 0x4d, 0x1d, 0xe2, 0x46, 0x55, 0x2d, 0x99, 0x6b, 0x63, 0x62, 0x63, 0xf1, 0xc9, 0x19, 0x63,
+	0x49, 0x82, 0x8c, 0x3e, 0xa6, 0xda, 0x83, 0xa0, 0x5f, 0xc3, 0x84, 0x65, 0x8b, 0xae, 0x19, 0x15,
+	0x27, 0xa8, 0x15, 0xfa, 0x13, 0x80, 0xdf, 0x6b, 0x3f, 0x25, 0x9f, 0x43, 0xab, 0x2a, 0x01, 0x45,
+	0x77, 0x61, 0xc9, 0xf2, 0x3c, 0x51, 0x48, 0x6e, 0x80, 0xdb, 0xea, 0x81, 0x30, 0xfd, 0xa8, 0x25,
+	0x08, 0x17, 0x8a, 0x99, 0x35, 0x8a, 0x96, 0xe7, 0x19, 0x0a, 0x21, 0x5f, 0x80, 0xa6, 0xdc, 0x47,
+	0xd7, 0x60, 0xa6, 0x13, 0x7a, 0x1d, 0xd7, 0xf3, 0x44, 0x61, 0x0a, 0x76, 0x26, 0x44, 0x66, 0xd3,
+	0x09, 0xbb, 0xe0, 0xe8, 0x39, 0xcc, 0x25, 0xa1, 0x5d, 0xcc, 0x98, 0xe5, 0x60, 0x56, 0x9c, 0x14,
+	0x6d, 0xb5, 0x96, 0x5e, 0x33, 0xe2, 0x11, 0x7e, 0x24, 0x5d, 0x8c, 0xd9, 0x44, 0x1c, 0x65, 0x13,
+	0xcd, 0xdd, 0xd3, 0x50, 0x31, 0x35, 0x14, 0xb3, 0x22, 0x8f, 0x9e, 0x5e, 0x0a, 0x23, 0x7a, 0x00,
+	0xd3, 0x31, 0x2c, 0xee, 0xc1, 0x5c, 0x3a, 0x5b, 0x71, 0xd8, 0xa6, 0x6a, 0xc5, 0x1d, 0x98, 0x56,
+	0x72, 0xda, 0x93, 0x11, 0x38, 0xbb, 0x1a, 0x4d, 0x49, 0xdf, 0x9e, 0xd8, 0xac, 0xc3, 0x84, 0x1c,
+	0x31, 0x8a, 0x79, 0x91, 0x46, 0xe9, 0x74, 0x1e, 0x0c, 0xe5, 0x81, 0xee, 0xc1, 0x92, 0xfc, 0x65,
+	0xb6, 0xc5, 0x13, 0x76, 0xac, 0x9c, 0x0a, 0xa2, 0x9c, 0x16, 0x24, 0xa4, 0x16, 0x23, 0x12, 0xc5,
+	0xf4, 0x00, 0xa6, 0xdb, 0xae, 0xe5, 0x10, 0xca, 0xb8, 0x6b, 0x9b, 0x2e, 0xe9, 0xd0, 0xe2, 0xd4,
+	0x29, 0x5c, 0xf4, 0xf1, 0x0d, 0xd2, 0xa1, 0x88, 0xc2, 0xc2, 0x40, 0x55, 0x12, 0x2f, 0xe2, 0x79,
+	0x11, 0xeb, 0xe6, 0x8f, 0x54, 0x23, 0xf1, 0x3a, 0xce, 0xb3, 0xc1, 0x1b, 0xa5, 0xef, 0x33, 0xb0,
+	0xdc, 0xe2, 0x01, 0xb6, 0xba, 0x2e, 0x71, 0x7e, 0x21, 0x33, 0xd0, 0x35, 0x98, 0x61, 0x2e, 0x71,
+	0x3c, 0x6c, 0x86, 0x9c, 0xe3, 0xc0, 0x8a, 0xee, 0x4e, 0x3e, 0x4c, 0xd3, 0xd2, 0xfe, 0x34, 0x36,
+	0x0f, 0x7b, 0xca, 0xc7, 0x7f, 0x9a, 0x71, 0x69, 0xe2, 0xc4, 0xb8, 0xf4, 0xc9, 0x28, 0x5c, 0x18,
+	0x42, 0xff, 0x59, 0xe7, 0x26, 0x0c, 0x28, 0x29, 0x7f, 0x47, 0xa6, 0xa7, 0x5b, 0xa9, 0xb5, 0x12,
+	0x9f, 0x9b, 0x50, 0x46, 0x55, 0x2e, 0xe7, 0x83, 0xe3, 0xa6, 0x13, 0xe3, 0xd9, 0xe8, 0x3b, 0x1d,
+	0xcf, 0xc6, 0xde, 0x76, 0x3c, 0x1b, 0xff, 0xd9, 0xc7, 0xb3, 0xcf, 0x32, 0xb0, 0x38, 0x9c, 0x3a,
+	0x84, 0xa1, 0xa0, 0x94, 0x58, 0x4c, 0x39, 0xe2, 0xc2, 0xa6, 0x2a, 0x9b, 0x6f, 0x77, 0x11, 0xb1,
+	0x42, 0x8b, 0xc9, 0x27, 0xdf, 0xed, 0x2f, 0xd0, 0x0a, 0x00, 0x0f, 0x2c, 0xc2, 0xec, 0xc0, 0xf5,
+	0xe5, 0x6d, 0xe7, 0x8c, 0x84, 0x05, 0x2d, 0x40, 0xd6, 0x65, 0x66, 0xc7, 0x25, 0x96, 0x27, 0xae,
+	0x2a, 0x6b, 0x4c, 0xba, 0x6c, 0x2b, 0x5a, 0x46, 0xae, 0x09, 0x51, 0x1b, 0x13, 0xa2, 0x96, 0xb0,
+	0x94, 0xfe, 0x0e, 0xf9, 0xc4, 0xb1, 0x68, 0x19, 0x8a, 0x8f, 0xea, 0xad, 0xd6, 0xc6, 0x76, 0xdd,
+	0xdc, 0xfb, 0x47, 0xb3, 0x6e, 0x3e, 0xdd, 0x6d, 0x35, 0xeb, 0xd5, 0xc6, 0x56, 0xa3, 0x5e, 0x9b,
+	0x19, 0x41, 0x53, 0x00, 0x7b, 0xc6, 0xc6, 0x6e, 0xab, 0x6a, 0x34, 0x9a, 0x7b, 0x33, 0x1a, 0x5a,
+	0x82, 0xf9, 0xfa, 0x6e, 0xcd, 0x7c, 0xbc, 0x65, 0xb6, 0x1a, 0xbb, 0xdb, 0x3b, 0x75, 0xf3, 0xe9,
+	0xde, 0x5e, 0xdd, 0xd8, 0xd8, 0xad, 0xd6, 0x67, 0x32, 0xa5, 0x1a, 0xe4, 0x7a, 0x23, 0x06, 0x42,
+	0x6a, 0x2e, 0x91, 0x15, 0x2d, 0xc7, 0x8d, 0x13, 0xcf, 0x7e, 0xe6, 0xe4, 0xb3, 0x5f, 0xfa, 0x2f,
+	0x40, 0x7f, 0xd4, 0x88, 0xc2, 0x10, 0xab, 0x1b, 0x0f, 0xc5, 0xe2, 0xf7, 0xb1, 0xc7, 0x3b, 0x73,
+	0xf6, 0xc7, 0xfb, 0xc4, 0xf9, 0xa3, 0x03, 0xce, 0xb7, 0x60, 0x25, 0x7d, 0xe8, 0x43, 0xf7, 0x61,
+	0x59, 0x68, 0xf7, 0x1b, 0x6c, 0xf6, 0x87, 0x1c, 0xb3, 0x27, 0xc1, 0x22, 0xd7, 0xac, 0xb1, 0xa0,
+	0x30, 0x4f, 0xe2, 0xa9, 0xa7, 0x17, 0xb5, 0x14, 0xc0, 0xfc, 0x10, 0x25, 0x47, 0x7f, 0x83, 0xb9,
+	0xa1, 0x31, 0x4f, 0x19, 0xef, 0x7a, 0x21, 0x0d, 0xb4, 0x7f, 0xf2, 0xcc, 0xfb, 0x90, 0xeb, 0x2d,
+	0xd0, 0x1c, 0x8c, 0x33, 0x9b, 0x06, 0x92, 0xd6, 0x8c, 0x21, 0x17, 0x68, 0x19, 0x72, 0x5d, 0x2b,
+	0x2a, 0xd0, 0xb0, 0x1d, 0x0f, 0x57, 0x7d, 0x43, 0xe5, 0xab, 0x0c, 0x64, 0xd5, 0xbc, 0xce, 0xd0,
+	0xa7, 0x1a, 0x14, 0x92, 0x7a, 0x86, 0xf4, 0xb4, 0xcc, 0x06, 0x3c, 0x3c, 0x8b, 0x37, 0xce, 0xee,
+	0x20, 0xb5, 0xb0, 0xb4, 0xf1, 0xbf, 0x2f, 0xbf, 0x7e, 0x3f, 0x73, 0xa7, 0x74, 0x4b, 0x3f, 0xa8,
+	0xe8, 0xff, 0x56, 0xcf, 0xd4, 0x5d, 0x3f, 0xa0, 0xff, 0xc4, 0x36, 0x67, 0xfa, 0x9a, 0x6e, 0x39,
+	0x98, 0xf0, 0xf8, 0x8f, 0x05, 0xa6, 0xaf, 0xfd, 0x67, 0xbd, 0x9d, 0x88, 0xb3, 0xae, 0xad, 0xa1,
+	0xf7, 0x34, 0xf8, 0xd5, 0x40, 0x3d, 0x46, 0x7f, 0x3e, 0x53, 0x07, 0x0f, 0xfa, 0x90, 0xdb, 0x6f,
+	0xe1, 0xa9, 0xbe, 0x68, 0x64, 0x55, 0xbb, 0xa1, 0x6d, 0x7e, 0xa8, 0xc1, 0x8a, 0x4d, 0xbb, 0x29,
+	0x61, 0x36, 0x0b, 0x8a, 0xf8, 0x66, 0x54, 0xdc, 0x4d, 0xed, 0x59, 0x4d, 0x61, 0x1d, 0x1a, 0x95,
+	0x6e, 0x99, 0x06, 0x8e, 0xee, 0x60, 0x22, 0x4a, 0x5f, 0x97, 0x5b, 0x96, 0xef, 0xb2, 0x41, 0xff,
+	0xbb, 0xdc, 0xe9, 0xaf, 0xbe, 0xd3, 0xb4, 0x8f, 0x32, 0x99, 0xda, 0xd6, 0xc7, 0x99, 0xc5, 0x6d,
+	0x19, 0xae, 0x2a, 0x8e, 0xae, 0xf5, 0x8f, 0xfe, 0x6b, 0xe5, 0xc5, 0x84, 0x88, 0x7a, 0xf3, 0x87,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0xf5, 0x89, 0x0f, 0xcd, 0x12, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1476,110 +1514,3 @@ var _Sessions_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/cloud/dialogflow/v2/session.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/session.proto", fileDescriptor_session_f34861f1b5aa3372)
-}
-
-var fileDescriptor_session_f34861f1b5aa3372 = []byte{
-	// 1581 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4b, 0x73, 0x1b, 0xc7,
-	0x11, 0xe6, 0x82, 0x2f, 0xa0, 0x01, 0x91, 0xd4, 0x90, 0x09, 0xc1, 0x87, 0x18, 0x09, 0x2a, 0x45,
-	0x14, 0x13, 0x61, 0x15, 0x28, 0xa5, 0x44, 0x54, 0xe9, 0x41, 0x02, 0x20, 0x85, 0x14, 0x45, 0x41,
-	0x0b, 0x2a, 0x0f, 0x55, 0xa9, 0xb6, 0x56, 0x8b, 0xc1, 0x6a, 0x93, 0xc5, 0xcc, 0x72, 0x67, 0x96,
-	0x12, 0x95, 0x4a, 0x0e, 0xa9, 0xca, 0x1f, 0xb0, 0xcb, 0x27, 0xdf, 0x7c, 0xf4, 0xc9, 0x07, 0x1f,
-	0x7c, 0xf4, 0xd1, 0x77, 0x57, 0xf9, 0x17, 0xd8, 0x17, 0xff, 0x02, 0x1f, 0x7c, 0x70, 0xed, 0xcc,
-	0x2c, 0xb0, 0x24, 0x81, 0x25, 0xad, 0x92, 0x7d, 0xf0, 0x0d, 0xd3, 0xf3, 0x75, 0x4f, 0xef, 0x37,
-	0xdd, 0xdf, 0x74, 0x01, 0x56, 0x1d, 0x4a, 0x1d, 0x0f, 0xeb, 0xb6, 0x47, 0xc3, 0xb6, 0xde, 0x76,
-	0x2d, 0x8f, 0x3a, 0x1d, 0x8f, 0xbe, 0xd2, 0x0f, 0x2a, 0x3a, 0xc3, 0x8c, 0xb9, 0x94, 0x94, 0xfd,
-	0x80, 0x72, 0x8a, 0x16, 0x25, 0xb2, 0x2c, 0x90, 0xe5, 0x3e, 0xb2, 0x7c, 0x50, 0x59, 0x5c, 0x56,
-	0x51, 0x2c, 0xdf, 0xd5, 0x2d, 0x42, 0x28, 0xb7, 0xb8, 0x4b, 0x09, 0x93, 0x9e, 0x8b, 0x0b, 0x89,
-	0xdd, 0x00, 0x33, 0x1a, 0x06, 0x36, 0x56, 0x5b, 0xd7, 0x53, 0x8e, 0xb7, 0xc2, 0xb6, 0x4b, 0x4d,
-	0x9b, 0x92, 0x8e, 0xeb, 0x28, 0x78, 0x5a, 0xb6, 0x36, 0x25, 0x1c, 0xbf, 0xe6, 0x0a, 0x79, 0x35,
-	0x05, 0xe9, 0x12, 0x8e, 0x49, 0x0c, 0xfc, 0xe3, 0xe9, 0x04, 0x98, 0x98, 0x70, 0x97, 0x1f, 0x9a,
-	0xfc, 0xd0, 0x8f, 0xf3, 0x8e, 0x3f, 0x58, 0xac, 0x5e, 0x84, 0x1d, 0x9d, 0xf1, 0x20, 0xb4, 0xe3,
-	0x98, 0xf3, 0x6a, 0x37, 0xf0, 0x6d, 0x9d, 0x71, 0x8b, 0x87, 0x31, 0x13, 0x45, 0xb5, 0x11, 0x45,
-	0xd2, 0x3d, 0x8b, 0x7b, 0x44, 0x7d, 0x59, 0xe9, 0x8b, 0x0c, 0xcc, 0xd6, 0x30, 0xc7, 0x36, 0x6f,
-	0x88, 0xec, 0x0c, 0xbc, 0x1f, 0x62, 0xc6, 0x51, 0x11, 0x26, 0x55, 0x16, 0x45, 0xed, 0xa2, 0xb6,
-	0x9a, 0x33, 0xe2, 0x25, 0xda, 0x85, 0xc2, 0x7e, 0x88, 0x83, 0x43, 0xd3, 0xb7, 0x02, 0xab, 0xcb,
-	0x8a, 0x99, 0x8b, 0xda, 0x6a, 0xbe, 0xf2, 0xbb, 0xf2, 0xf0, 0x6b, 0x2a, 0x3f, 0x89, 0xf0, 0xcd,
-	0x08, 0x8e, 0x39, 0x0e, 0x98, 0x91, 0xdf, 0xef, 0x19, 0x18, 0xda, 0x06, 0xb9, 0x34, 0x5d, 0xe2,
-	0x87, 0xbc, 0x38, 0x2a, 0xc2, 0xfd, 0xf6, 0xd4, 0x70, 0x8d, 0x08, 0x6d, 0xc0, 0x7e, 0xef, 0x37,
-	0x7a, 0x0e, 0xb3, 0x34, 0xe4, 0x7e, 0xc8, 0xcd, 0xe4, 0x0d, 0x16, 0xc7, 0x44, 0xc0, 0xeb, 0x69,
-	0x01, 0x1f, 0x0b, 0xb7, 0x8d, 0xc8, 0xab, 0x2a, 0x9c, 0x8c, 0xf3, 0xf4, 0xb8, 0x09, 0xfd, 0x06,
-	0xf2, 0x22, 0x43, 0x19, 0xbd, 0x38, 0x7e, 0x51, 0x5b, 0x2d, 0x18, 0x20, 0x4c, 0x02, 0x56, 0xfa,
-	0x3c, 0x03, 0x73, 0x47, 0xa9, 0x64, 0x3e, 0x25, 0x0c, 0x47, 0x9e, 0x81, 0xfa, 0x6d, 0xba, 0x6d,
-	0xc5, 0x27, 0xc4, 0xa6, 0x46, 0x1b, 0xfd, 0x25, 0xa6, 0x34, 0xc0, 0x2c, 0xf4, 0xb8, 0xa2, 0xf4,
-	0xea, 0xa9, 0x1c, 0x18, 0x02, 0xae, 0xe8, 0x94, 0x0b, 0x74, 0x1b, 0xa6, 0x5e, 0xe1, 0x17, 0x2f,
-	0x29, 0xfd, 0x97, 0x29, 0x4b, 0x40, 0x31, 0x8a, 0xe2, 0x68, 0x81, 0x6f, 0x97, 0x5b, 0x62, 0xc7,
-	0x38, 0xa7, 0x90, 0x72, 0x89, 0x2e, 0x41, 0x21, 0x49, 0xa0, 0x60, 0xae, 0x60, 0xe4, 0x13, 0x54,
-	0x0c, 0xe3, 0x78, 0xe2, 0xdd, 0x70, 0x5c, 0xfa, 0x76, 0x14, 0xa6, 0x8f, 0x15, 0x0b, 0x5a, 0x82,
-	0x1c, 0x77, 0xbb, 0xd8, 0x7c, 0x43, 0x09, 0x56, 0xdc, 0x65, 0x23, 0xc3, 0x33, 0x4a, 0x30, 0xba,
-	0x05, 0x05, 0x07, 0x53, 0xd3, 0xa3, 0xb6, 0xe8, 0x7c, 0xc5, 0xdc, 0x6c, 0x9c, 0x88, 0xe8, 0x9c,
-	0x1d, 0x8b, 0xef, 0x10, 0xc7, 0xc8, 0x3b, 0x98, 0xee, 0x28, 0x1c, 0xba, 0x0f, 0x59, 0xd5, 0xb7,
-	0x11, 0x3f, 0xa3, 0xab, 0xf9, 0xca, 0xe5, 0xb4, 0xe4, 0xab, 0x12, 0x6b, 0xf4, 0x9c, 0xd0, 0x15,
-	0x98, 0x0a, 0x30, 0xc3, 0xdc, 0xec, 0x85, 0x89, 0xd8, 0xca, 0x1a, 0xe7, 0x84, 0xb5, 0x1a, 0xc3,
-	0x4c, 0x98, 0x1b, 0xd0, 0xcc, 0xac, 0x38, 0x2e, 0xce, 0x4c, 0x25, 0xac, 0x25, 0xfd, 0xea, 0xc2,
-	0x6d, 0xef, 0xd0, 0xc7, 0x06, 0x62, 0xc7, 0x4d, 0x0c, 0xfd, 0x01, 0x26, 0x7d, 0xeb, 0xd0, 0xa3,
-	0x56, 0x5b, 0x5d, 0xc2, 0x7c, 0x1c, 0x33, 0x96, 0x88, 0x72, 0x4b, 0x48, 0x84, 0x11, 0xe3, 0xd0,
-	0xff, 0x35, 0xb8, 0xc4, 0xa2, 0x6c, 0xba, 0x98, 0x70, 0xd3, 0x22, 0x96, 0x77, 0xc8, 0x5c, 0x66,
-	0x06, 0xb2, 0xf3, 0xe3, 0x2b, 0x05, 0x11, 0x6d, 0x3d, 0x3d, 0x43, 0x15, 0x64, 0x43, 0xc5, 0x50,
-	0xe2, 0xa1, 0xee, 0x77, 0x85, 0xa5, 0xee, 0x97, 0xbe, 0xd1, 0x00, 0xfa, 0xad, 0x8c, 0x9e, 0x40,
-	0xe1, 0x48, 0x4d, 0x69, 0x22, 0x81, 0xdf, 0xa7, 0x25, 0xd0, 0x20, 0x47, 0xeb, 0xe7, 0xe1, 0x88,
-	0x91, 0xb7, 0x12, 0x2d, 0x7b, 0x07, 0xc6, 0xa2, 0x6b, 0x50, 0x55, 0x71, 0x25, 0x2d, 0xd4, 0x1e,
-	0x7e, 0xcd, 0x45, 0xb8, 0x87, 0x23, 0x86, 0x70, 0x42, 0xf7, 0x60, 0x1c, 0x1f, 0x60, 0x72, 0x26,
-	0x45, 0xaa, 0x47, 0xc0, 0xd8, 0x5d, 0xba, 0x6d, 0x4e, 0xc2, 0xb8, 0x10, 0x87, 0xd2, 0x07, 0x93,
-	0x90, 0x4f, 0xb4, 0x2b, 0xba, 0x00, 0x52, 0xb5, 0x4c, 0x91, 0x9b, 0xac, 0xe8, 0x9c, 0xb0, 0x44,
-	0x49, 0xa0, 0xcb, 0x70, 0xce, 0xb3, 0x88, 0x13, 0x5a, 0x0e, 0x36, 0x6d, 0xda, 0xc6, 0xc5, 0x69,
-	0x81, 0x28, 0xc4, 0xc6, 0x2a, 0x6d, 0x63, 0xb4, 0x09, 0x17, 0x98, 0x8f, 0xb1, 0xfd, 0xd2, 0x0c,
-	0xb0, 0x4d, 0x1d, 0xe2, 0x46, 0x55, 0x2d, 0x99, 0x6b, 0x63, 0x62, 0x63, 0xf1, 0xc9, 0x19, 0x63,
-	0x49, 0x82, 0x8c, 0x3e, 0xa6, 0xda, 0x83, 0xa0, 0x5f, 0xc3, 0x84, 0x65, 0x8b, 0xae, 0x19, 0x15,
-	0x27, 0xa8, 0x15, 0xfa, 0x13, 0x80, 0xdf, 0x6b, 0x3f, 0x25, 0x9f, 0x43, 0xab, 0x2a, 0x01, 0x45,
-	0x77, 0x61, 0xc9, 0xf2, 0x3c, 0x51, 0x48, 0x6e, 0x80, 0xdb, 0xea, 0x81, 0x30, 0xfd, 0xa8, 0x25,
-	0x08, 0x17, 0x8a, 0x99, 0x35, 0x8a, 0x96, 0xe7, 0x19, 0x0a, 0x21, 0x5f, 0x80, 0xa6, 0xdc, 0x47,
-	0xd7, 0x60, 0xa6, 0x13, 0x7a, 0x1d, 0xd7, 0xf3, 0x44, 0x61, 0x0a, 0x76, 0x26, 0x44, 0x66, 0xd3,
-	0x09, 0xbb, 0xe0, 0xe8, 0x39, 0xcc, 0x25, 0xa1, 0x5d, 0xcc, 0x98, 0xe5, 0x60, 0x56, 0x9c, 0x14,
-	0x6d, 0xb5, 0x96, 0x5e, 0x33, 0xe2, 0x11, 0x7e, 0x24, 0x5d, 0x8c, 0xd9, 0x44, 0x1c, 0x65, 0x13,
-	0xcd, 0xdd, 0xd3, 0x50, 0x31, 0x35, 0x14, 0xb3, 0x22, 0x8f, 0x9e, 0x5e, 0x0a, 0x23, 0x7a, 0x00,
-	0xd3, 0x31, 0x2c, 0xee, 0xc1, 0x5c, 0x3a, 0x5b, 0x71, 0xd8, 0xa6, 0x6a, 0xc5, 0x1d, 0x98, 0x56,
-	0x72, 0xda, 0x93, 0x11, 0x38, 0xbb, 0x1a, 0x4d, 0x49, 0xdf, 0x9e, 0xd8, 0xac, 0xc3, 0x84, 0x1c,
-	0x31, 0x8a, 0x79, 0x91, 0x46, 0xe9, 0x74, 0x1e, 0x0c, 0xe5, 0x81, 0xee, 0xc1, 0x92, 0xfc, 0x65,
-	0xb6, 0xc5, 0x13, 0x76, 0xac, 0x9c, 0x0a, 0xa2, 0x9c, 0x16, 0x24, 0xa4, 0x16, 0x23, 0x12, 0xc5,
-	0xf4, 0x00, 0xa6, 0xdb, 0xae, 0xe5, 0x10, 0xca, 0xb8, 0x6b, 0x9b, 0x2e, 0xe9, 0xd0, 0xe2, 0xd4,
-	0x29, 0x5c, 0xf4, 0xf1, 0x0d, 0xd2, 0xa1, 0x88, 0xc2, 0xc2, 0x40, 0x55, 0x12, 0x2f, 0xe2, 0x79,
-	0x11, 0xeb, 0xe6, 0x8f, 0x54, 0x23, 0xf1, 0x3a, 0xce, 0xb3, 0xc1, 0x1b, 0xa5, 0xef, 0x33, 0xb0,
-	0xdc, 0xe2, 0x01, 0xb6, 0xba, 0x2e, 0x71, 0x7e, 0x21, 0x33, 0xd0, 0x35, 0x98, 0x61, 0x2e, 0x71,
-	0x3c, 0x6c, 0x86, 0x9c, 0xe3, 0xc0, 0x8a, 0xee, 0x4e, 0x3e, 0x4c, 0xd3, 0xd2, 0xfe, 0x34, 0x36,
-	0x0f, 0x7b, 0xca, 0xc7, 0x7f, 0x9a, 0x71, 0x69, 0xe2, 0xc4, 0xb8, 0xf4, 0xc9, 0x28, 0x5c, 0x18,
-	0x42, 0xff, 0x59, 0xe7, 0x26, 0x0c, 0x28, 0x29, 0x7f, 0x47, 0xa6, 0xa7, 0x5b, 0xa9, 0xb5, 0x12,
-	0x9f, 0x9b, 0x50, 0x46, 0x55, 0x2e, 0xe7, 0x83, 0xe3, 0xa6, 0x13, 0xe3, 0xd9, 0xe8, 0x3b, 0x1d,
-	0xcf, 0xc6, 0xde, 0x76, 0x3c, 0x1b, 0xff, 0xd9, 0xc7, 0xb3, 0xcf, 0x32, 0xb0, 0x38, 0x9c, 0x3a,
-	0x84, 0xa1, 0xa0, 0x94, 0x58, 0x4c, 0x39, 0xe2, 0xc2, 0xa6, 0x2a, 0x9b, 0x6f, 0x77, 0x11, 0xb1,
-	0x42, 0x8b, 0xc9, 0x27, 0xdf, 0xed, 0x2f, 0xd0, 0x0a, 0x00, 0x0f, 0x2c, 0xc2, 0xec, 0xc0, 0xf5,
-	0xe5, 0x6d, 0xe7, 0x8c, 0x84, 0x05, 0x2d, 0x40, 0xd6, 0x65, 0x66, 0xc7, 0x25, 0x96, 0x27, 0xae,
-	0x2a, 0x6b, 0x4c, 0xba, 0x6c, 0x2b, 0x5a, 0x46, 0xae, 0x09, 0x51, 0x1b, 0x13, 0xa2, 0x96, 0xb0,
-	0x94, 0xfe, 0x0e, 0xf9, 0xc4, 0xb1, 0x68, 0x19, 0x8a, 0x8f, 0xea, 0xad, 0xd6, 0xc6, 0x76, 0xdd,
-	0xdc, 0xfb, 0x47, 0xb3, 0x6e, 0x3e, 0xdd, 0x6d, 0x35, 0xeb, 0xd5, 0xc6, 0x56, 0xa3, 0x5e, 0x9b,
-	0x19, 0x41, 0x53, 0x00, 0x7b, 0xc6, 0xc6, 0x6e, 0xab, 0x6a, 0x34, 0x9a, 0x7b, 0x33, 0x1a, 0x5a,
-	0x82, 0xf9, 0xfa, 0x6e, 0xcd, 0x7c, 0xbc, 0x65, 0xb6, 0x1a, 0xbb, 0xdb, 0x3b, 0x75, 0xf3, 0xe9,
-	0xde, 0x5e, 0xdd, 0xd8, 0xd8, 0xad, 0xd6, 0x67, 0x32, 0xa5, 0x1a, 0xe4, 0x7a, 0x23, 0x06, 0x42,
-	0x6a, 0x2e, 0x91, 0x15, 0x2d, 0xc7, 0x8d, 0x13, 0xcf, 0x7e, 0xe6, 0xe4, 0xb3, 0x5f, 0xfa, 0x2f,
-	0x40, 0x7f, 0xd4, 0x88, 0xc2, 0x10, 0xab, 0x1b, 0x0f, 0xc5, 0xe2, 0xf7, 0xb1, 0xc7, 0x3b, 0x73,
-	0xf6, 0xc7, 0xfb, 0xc4, 0xf9, 0xa3, 0x03, 0xce, 0xb7, 0x60, 0x25, 0x7d, 0xe8, 0x43, 0xf7, 0x61,
-	0x59, 0x68, 0xf7, 0x1b, 0x6c, 0xf6, 0x87, 0x1c, 0xb3, 0x27, 0xc1, 0x22, 0xd7, 0xac, 0xb1, 0xa0,
-	0x30, 0x4f, 0xe2, 0xa9, 0xa7, 0x17, 0xb5, 0x14, 0xc0, 0xfc, 0x10, 0x25, 0x47, 0x7f, 0x83, 0xb9,
-	0xa1, 0x31, 0x4f, 0x19, 0xef, 0x7a, 0x21, 0x0d, 0xb4, 0x7f, 0xf2, 0xcc, 0xfb, 0x90, 0xeb, 0x2d,
-	0xd0, 0x1c, 0x8c, 0x33, 0x9b, 0x06, 0x92, 0xd6, 0x8c, 0x21, 0x17, 0x68, 0x19, 0x72, 0x5d, 0x2b,
-	0x2a, 0xd0, 0xb0, 0x1d, 0x0f, 0x57, 0x7d, 0x43, 0xe5, 0xab, 0x0c, 0x64, 0xd5, 0xbc, 0xce, 0xd0,
-	0xa7, 0x1a, 0x14, 0x92, 0x7a, 0x86, 0xf4, 0xb4, 0xcc, 0x06, 0x3c, 0x3c, 0x8b, 0x37, 0xce, 0xee,
-	0x20, 0xb5, 0xb0, 0xb4, 0xf1, 0xbf, 0x2f, 0xbf, 0x7e, 0x3f, 0x73, 0xa7, 0x74, 0x4b, 0x3f, 0xa8,
-	0xe8, 0xff, 0x56, 0xcf, 0xd4, 0x5d, 0x3f, 0xa0, 0xff, 0xc4, 0x36, 0x67, 0xfa, 0x9a, 0x6e, 0x39,
-	0x98, 0xf0, 0xf8, 0x8f, 0x05, 0xa6, 0xaf, 0xfd, 0x67, 0xbd, 0x9d, 0x88, 0xb3, 0xae, 0xad, 0xa1,
-	0xf7, 0x34, 0xf8, 0xd5, 0x40, 0x3d, 0x46, 0x7f, 0x3e, 0x53, 0x07, 0x0f, 0xfa, 0x90, 0xdb, 0x6f,
-	0xe1, 0xa9, 0xbe, 0x68, 0x64, 0x55, 0xbb, 0xa1, 0x6d, 0x7e, 0xa8, 0xc1, 0x8a, 0x4d, 0xbb, 0x29,
-	0x61, 0x36, 0x0b, 0x8a, 0xf8, 0x66, 0x54, 0xdc, 0x4d, 0xed, 0x59, 0x4d, 0x61, 0x1d, 0x1a, 0x95,
-	0x6e, 0x99, 0x06, 0x8e, 0xee, 0x60, 0x22, 0x4a, 0x5f, 0x97, 0x5b, 0x96, 0xef, 0xb2, 0x41, 0xff,
-	0xbb, 0xdc, 0xe9, 0xaf, 0xbe, 0xd3, 0xb4, 0x8f, 0x32, 0x99, 0xda, 0xd6, 0xc7, 0x99, 0xc5, 0x6d,
-	0x19, 0xae, 0x2a, 0x8e, 0xae, 0xf5, 0x8f, 0xfe, 0x6b, 0xe5, 0xc5, 0x84, 0x88, 0x7a, 0xf3, 0x87,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0xf5, 0x89, 0x0f, 0xcd, 0x12, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go b/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
index cdda5f6e95..e4b107cb3a 100644
--- a/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/session_entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The types of modifications for a session entity type.
 type SessionEntityType_EntityOverrideMode int32
@@ -52,6 +52,7 @@ var SessionEntityType_EntityOverrideMode_name = map[int32]string{
 	1: "ENTITY_OVERRIDE_MODE_OVERRIDE",
 	2: "ENTITY_OVERRIDE_MODE_SUPPLEMENT",
 }
+
 var SessionEntityType_EntityOverrideMode_value = map[string]int32{
 	"ENTITY_OVERRIDE_MODE_UNSPECIFIED": 0,
 	"ENTITY_OVERRIDE_MODE_OVERRIDE":    1,
@@ -61,8 +62,9 @@ var SessionEntityType_EntityOverrideMode_value = map[string]int32{
 func (x SessionEntityType_EntityOverrideMode) String() string {
 	return proto.EnumName(SessionEntityType_EntityOverrideMode_name, int32(x))
 }
+
 func (SessionEntityType_EntityOverrideMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{0, 0}
+	return fileDescriptor_841e168133818181, []int{0, 0}
 }
 
 // Represents a session entity type.
@@ -95,16 +97,17 @@ func (m *SessionEntityType) Reset()         { *m = SessionEntityType{} }
 func (m *SessionEntityType) String() string { return proto.CompactTextString(m) }
 func (*SessionEntityType) ProtoMessage()    {}
 func (*SessionEntityType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{0}
+	return fileDescriptor_841e168133818181, []int{0}
 }
+
 func (m *SessionEntityType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SessionEntityType.Unmarshal(m, b)
 }
 func (m *SessionEntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SessionEntityType.Marshal(b, m, deterministic)
 }
-func (dst *SessionEntityType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SessionEntityType.Merge(dst, src)
+func (m *SessionEntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SessionEntityType.Merge(m, src)
 }
 func (m *SessionEntityType) XXX_Size() int {
 	return xxx_messageInfo_SessionEntityType.Size(m)
@@ -155,16 +158,17 @@ func (m *ListSessionEntityTypesRequest) Reset()         { *m = ListSessionEntity
 func (m *ListSessionEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSessionEntityTypesRequest) ProtoMessage()    {}
 func (*ListSessionEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{1}
+	return fileDescriptor_841e168133818181, []int{1}
 }
+
 func (m *ListSessionEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSessionEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *ListSessionEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSessionEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSessionEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSessionEntityTypesRequest.Merge(dst, src)
+func (m *ListSessionEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesRequest.Merge(m, src)
 }
 func (m *ListSessionEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSessionEntityTypesRequest.Size(m)
@@ -213,16 +217,17 @@ func (m *ListSessionEntityTypesResponse) Reset()         { *m = ListSessionEntit
 func (m *ListSessionEntityTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSessionEntityTypesResponse) ProtoMessage()    {}
 func (*ListSessionEntityTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{2}
+	return fileDescriptor_841e168133818181, []int{2}
 }
+
 func (m *ListSessionEntityTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSessionEntityTypesResponse.Unmarshal(m, b)
 }
 func (m *ListSessionEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSessionEntityTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSessionEntityTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSessionEntityTypesResponse.Merge(dst, src)
+func (m *ListSessionEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesResponse.Merge(m, src)
 }
 func (m *ListSessionEntityTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSessionEntityTypesResponse.Size(m)
@@ -262,16 +267,17 @@ func (m *GetSessionEntityTypeRequest) Reset()         { *m = GetSessionEntityTyp
 func (m *GetSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSessionEntityTypeRequest) ProtoMessage()    {}
 func (*GetSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{3}
+	return fileDescriptor_841e168133818181, []int{3}
 }
+
 func (m *GetSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *GetSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSessionEntityTypeRequest.Merge(dst, src)
+func (m *GetSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *GetSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSessionEntityTypeRequest.Size(m)
@@ -305,16 +311,17 @@ func (m *CreateSessionEntityTypeRequest) Reset()         { *m = CreateSessionEnt
 func (m *CreateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSessionEntityTypeRequest) ProtoMessage()    {}
 func (*CreateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{4}
+	return fileDescriptor_841e168133818181, []int{4}
 }
+
 func (m *CreateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *CreateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSessionEntityTypeRequest.Merge(dst, src)
+func (m *CreateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *CreateSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSessionEntityTypeRequest.Size(m)
@@ -356,16 +363,17 @@ func (m *UpdateSessionEntityTypeRequest) Reset()         { *m = UpdateSessionEnt
 func (m *UpdateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSessionEntityTypeRequest) ProtoMessage()    {}
 func (*UpdateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{5}
+	return fileDescriptor_841e168133818181, []int{5}
 }
+
 func (m *UpdateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *UpdateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSessionEntityTypeRequest.Merge(dst, src)
+func (m *UpdateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *UpdateSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Size(m)
@@ -405,16 +413,17 @@ func (m *DeleteSessionEntityTypeRequest) Reset()         { *m = DeleteSessionEnt
 func (m *DeleteSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSessionEntityTypeRequest) ProtoMessage()    {}
 func (*DeleteSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_97b7b2145a2e309a, []int{6}
+	return fileDescriptor_841e168133818181, []int{6}
 }
+
 func (m *DeleteSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *DeleteSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSessionEntityTypeRequest.Merge(dst, src)
+func (m *DeleteSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *DeleteSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Size(m)
@@ -433,6 +442,7 @@ func (m *DeleteSessionEntityTypeRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2.SessionEntityType_EntityOverrideMode", SessionEntityType_EntityOverrideMode_name, SessionEntityType_EntityOverrideMode_value)
 	proto.RegisterType((*SessionEntityType)(nil), "google.cloud.dialogflow.v2.SessionEntityType")
 	proto.RegisterType((*ListSessionEntityTypesRequest)(nil), "google.cloud.dialogflow.v2.ListSessionEntityTypesRequest")
 	proto.RegisterType((*ListSessionEntityTypesResponse)(nil), "google.cloud.dialogflow.v2.ListSessionEntityTypesResponse")
@@ -440,7 +450,65 @@ func init() {
 	proto.RegisterType((*CreateSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest")
 	proto.RegisterType((*UpdateSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest")
 	proto.RegisterType((*DeleteSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest")
-	proto.RegisterEnum("google.cloud.dialogflow.v2.SessionEntityType_EntityOverrideMode", SessionEntityType_EntityOverrideMode_name, SessionEntityType_EntityOverrideMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/session_entity_type.proto", fileDescriptor_841e168133818181)
+}
+
+var fileDescriptor_841e168133818181 = []byte{
+	// 808 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcd, 0x4e, 0xdb, 0x58,
+	0x14, 0xc7, 0xe7, 0x9a, 0x19, 0x04, 0x17, 0xcd, 0x0c, 0xdc, 0x41, 0x21, 0x63, 0x86, 0x4c, 0xc6,
+	0x33, 0x1a, 0xa1, 0xa8, 0xb5, 0xd5, 0x14, 0xb5, 0x2a, 0xb4, 0x52, 0x05, 0x31, 0x34, 0x2a, 0x81,
+	0xd4, 0x09, 0x48, 0xad, 0x54, 0x59, 0x26, 0x39, 0x58, 0x2e, 0x89, 0xaf, 0xeb, 0xeb, 0xd0, 0x86,
+	0x8a, 0x0d, 0xaf, 0xd0, 0x45, 0xd5, 0x6d, 0xa5, 0x2e, 0xda, 0xbe, 0x02, 0xaf, 0xd0, 0x55, 0x17,
+	0x7d, 0x81, 0xee, 0x78, 0x81, 0x2e, 0x2b, 0x5f, 0x3b, 0x80, 0xb0, 0x7d, 0xab, 0xa0, 0xee, 0x7c,
+	0x3f, 0xce, 0x39, 0xbf, 0xff, 0xb9, 0xe7, 0x1c, 0x19, 0x2f, 0xd8, 0x94, 0xda, 0x1d, 0xd0, 0x5a,
+	0x1d, 0xda, 0x6b, 0x6b, 0x6d, 0xc7, 0xea, 0x50, 0x7b, 0xb7, 0x43, 0x9f, 0x69, 0xfb, 0x65, 0x8d,
+	0x01, 0x63, 0x0e, 0x75, 0x4d, 0x70, 0x03, 0x27, 0xe8, 0x9b, 0x41, 0xdf, 0x03, 0xd5, 0xf3, 0x69,
+	0x40, 0x89, 0x1c, 0x59, 0xa9, 0xdc, 0x4a, 0x3d, 0xb3, 0x52, 0xf7, 0xcb, 0xf2, 0x5f, 0xb1, 0x47,
+	0xcb, 0x73, 0x34, 0xcb, 0x75, 0x69, 0x60, 0x05, 0x0e, 0x75, 0x59, 0x64, 0x29, 0xff, 0x79, 0xee,
+	0xd4, 0x07, 0x46, 0x7b, 0x7e, 0x2b, 0x76, 0x2a, 0x5f, 0x11, 0xa0, 0x24, 0x10, 0xe4, 0xd9, 0xf8,
+	0x36, 0x5f, 0xed, 0xf4, 0x76, 0x35, 0xe8, 0x7a, 0x41, 0x3f, 0x3e, 0x2c, 0x5e, 0x3c, 0xdc, 0x75,
+	0xa0, 0xd3, 0x36, 0xbb, 0x16, 0xdb, 0x8b, 0x6e, 0x28, 0x27, 0x12, 0x9e, 0x6a, 0x44, 0xfa, 0x74,
+	0xee, 0xbb, 0xd9, 0xf7, 0x80, 0x10, 0xfc, 0xb3, 0x6b, 0x75, 0x21, 0x8f, 0x8a, 0x68, 0x7e, 0xdc,
+	0xe0, 0xdf, 0xc4, 0xc7, 0xd3, 0x71, 0x74, 0xba, 0x0f, 0xbe, 0xef, 0xb4, 0xc1, 0xec, 0xd2, 0x36,
+	0xe4, 0xa5, 0x22, 0x9a, 0xff, 0xad, 0x7c, 0x57, 0xcd, 0x4e, 0x85, 0x9a, 0x08, 0xa0, 0x46, 0x9f,
+	0x9b, 0xb1, 0xa3, 0x1a, 0x6d, 0x83, 0x41, 0x20, 0xb1, 0x47, 0xaa, 0x78, 0x8c, 0xef, 0x3a, 0xc0,
+	0xf2, 0x23, 0xc5, 0x91, 0xf9, 0x89, 0xf2, 0x55, 0x51, 0x9c, 0x44, 0x00, 0xe3, 0xd4, 0x5c, 0x39,
+	0x42, 0x98, 0x24, 0xa3, 0x92, 0xff, 0x70, 0x51, 0xdf, 0x68, 0x56, 0x9b, 0x0f, 0xcd, 0xcd, 0x6d,
+	0xdd, 0x30, 0xaa, 0x15, 0xdd, 0xac, 0x6d, 0x56, 0x74, 0x73, 0x6b, 0xa3, 0x51, 0xd7, 0x57, 0xaa,
+	0xab, 0x55, 0xbd, 0x32, 0xf9, 0x13, 0xf9, 0x07, 0xcf, 0xa5, 0xde, 0x1a, 0xac, 0x26, 0x11, 0xf9,
+	0x17, 0xff, 0x9d, 0x7a, 0xa5, 0xb1, 0x55, 0xaf, 0xaf, 0xeb, 0x35, 0x7d, 0xa3, 0x39, 0x29, 0x29,
+	0x0c, 0xcf, 0xad, 0x3b, 0x2c, 0x48, 0xe4, 0x83, 0x19, 0xf0, 0xb4, 0x07, 0x2c, 0x20, 0x39, 0x3c,
+	0xea, 0x59, 0x3e, 0xb8, 0x41, 0x9c, 0xfa, 0x78, 0x45, 0x66, 0xf1, 0xb8, 0x67, 0xd9, 0x60, 0x32,
+	0xe7, 0x20, 0xca, 0xf8, 0x2f, 0xc6, 0x58, 0xb8, 0xd1, 0x70, 0x0e, 0x80, 0xcc, 0x61, 0xcc, 0x0f,
+	0x03, 0xba, 0x07, 0x6e, 0x7e, 0x84, 0x1b, 0xf2, 0xeb, 0xcd, 0x70, 0x43, 0x79, 0x87, 0x70, 0x21,
+	0x2b, 0x2a, 0xf3, 0xa8, 0xcb, 0x80, 0x98, 0x78, 0x3a, 0xa5, 0xc8, 0x59, 0x1e, 0x7d, 0x3f, 0xe7,
+	0x09, 0xaf, 0x06, 0x61, 0x89, 0x40, 0xe4, 0x7f, 0xfc, 0xbb, 0x0b, 0xcf, 0x03, 0xf3, 0x1c, 0xa7,
+	0xc4, 0x39, 0x7f, 0x0d, 0xb7, 0xeb, 0xa7, 0xac, 0xd7, 0xf0, 0xec, 0x1a, 0x24, 0x49, 0x07, 0xe9,
+	0x49, 0xa9, 0x4b, 0xe5, 0x15, 0xc2, 0x85, 0x15, 0x1f, 0xac, 0x00, 0x32, 0xcd, 0xb2, 0xb2, 0xfa,
+	0x18, 0xff, 0x91, 0x22, 0x9b, 0x93, 0x0d, 0xad, 0x7a, 0x2a, 0xa1, 0x5a, 0x39, 0x46, 0xb8, 0xb0,
+	0xe5, 0xb5, 0x45, 0x64, 0x19, 0x04, 0xe8, 0xc7, 0x10, 0x90, 0x25, 0x3c, 0xd1, 0xe3, 0x00, 0xbc,
+	0xe5, 0x63, 0x61, 0xf2, 0xc0, 0xed, 0x60, 0x2a, 0xa8, 0xab, 0xe1, 0x54, 0xa8, 0x59, 0x6c, 0xcf,
+	0xc0, 0xd1, 0xf5, 0xf0, 0x5b, 0x59, 0xc0, 0x85, 0x0a, 0x74, 0x40, 0x40, 0x9f, 0xf2, 0x1c, 0xe5,
+	0xd7, 0x63, 0x98, 0x24, 0x2b, 0x8d, 0x7c, 0x44, 0x38, 0x97, 0x5e, 0x84, 0xe4, 0x96, 0x48, 0xa6,
+	0xb0, 0x5d, 0xe4, 0xc5, 0xcb, 0x98, 0x46, 0x35, 0xaf, 0xdc, 0x3e, 0xfa, 0xf4, 0xe5, 0xa5, 0x74,
+	0x83, 0x2c, 0x84, 0x73, 0xf5, 0x45, 0x54, 0x11, 0x77, 0x3c, 0x9f, 0x3e, 0x81, 0x56, 0xc0, 0xb4,
+	0x92, 0x66, 0xd9, 0xe0, 0x06, 0x83, 0xd9, 0xcf, 0xb4, 0xd2, 0x61, 0x3c, 0x7c, 0x23, 0xe8, 0x63,
+	0x84, 0xa7, 0xd3, 0x2a, 0x95, 0xdc, 0x14, 0x21, 0x09, 0x6a, 0x5b, 0x1e, 0xee, 0xb5, 0x2f, 0xe0,
+	0x87, 0xa9, 0x17, 0xc1, 0x9f, 0x67, 0xd7, 0x4a, 0x87, 0xe4, 0x33, 0xc2, 0x33, 0x19, 0x4d, 0x43,
+	0x84, 0x49, 0x15, 0x77, 0xda, 0xb0, 0x22, 0x1e, 0x70, 0x11, 0xf7, 0x95, 0x4b, 0xbd, 0xc1, 0x62,
+	0x5a, 0xeb, 0x90, 0x13, 0x84, 0x67, 0x32, 0x9a, 0x4e, 0xac, 0x4c, 0xdc, 0xa9, 0xc3, 0x2a, 0x03,
+	0xae, 0xcc, 0x2c, 0xdf, 0xe3, 0xca, 0xd2, 0xfe, 0x20, 0x86, 0x7c, 0xb2, 0x74, 0xb5, 0x1f, 0x10,
+	0x9e, 0xc9, 0x68, 0x52, 0xb1, 0x5a, 0x71, 0x67, 0xcb, 0xb9, 0xc4, 0x8c, 0xd0, 0xc3, 0xdf, 0x8a,
+	0x41, 0xd5, 0x95, 0x2e, 0x55, 0x75, 0xcb, 0x6f, 0x11, 0x2e, 0xb4, 0x68, 0x57, 0xc0, 0xb5, 0x9c,
+	0x4b, 0x20, 0xd5, 0x43, 0x82, 0x3a, 0x7a, 0x54, 0x89, 0xad, 0x6c, 0xda, 0xb1, 0x5c, 0x5b, 0xa5,
+	0xbe, 0xad, 0xd9, 0xe0, 0x72, 0x3e, 0x2d, 0x3a, 0xb2, 0x3c, 0x87, 0xa5, 0xfd, 0x35, 0x2d, 0x9d,
+	0xad, 0xbe, 0x22, 0xf4, 0x46, 0x92, 0x2a, 0xab, 0xef, 0x25, 0x79, 0x2d, 0x72, 0xb7, 0xc2, 0x21,
+	0x2a, 0x67, 0x10, 0xdb, 0xe5, 0x9d, 0x51, 0xee, 0xf5, 0xfa, 0xb7, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x7b, 0xde, 0xc9, 0xc2, 0x15, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -662,62 +730,3 @@ var _SessionEntityTypes_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2/session_entity_type.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/session_entity_type.proto", fileDescriptor_session_entity_type_97b7b2145a2e309a)
-}
-
-var fileDescriptor_session_entity_type_97b7b2145a2e309a = []byte{
-	// 808 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcd, 0x4e, 0xdb, 0x58,
-	0x14, 0xc7, 0xe7, 0x9a, 0x19, 0x04, 0x17, 0xcd, 0x0c, 0xdc, 0x41, 0x21, 0x63, 0x86, 0x4c, 0xc6,
-	0x33, 0x1a, 0xa1, 0xa8, 0xb5, 0xd5, 0x14, 0xb5, 0x2a, 0xb4, 0x52, 0x05, 0x31, 0x34, 0x2a, 0x81,
-	0xd4, 0x09, 0x48, 0xad, 0x54, 0x59, 0x26, 0x39, 0x58, 0x2e, 0x89, 0xaf, 0xeb, 0xeb, 0xd0, 0x86,
-	0x8a, 0x0d, 0xaf, 0xd0, 0x45, 0xd5, 0x6d, 0xa5, 0x2e, 0xda, 0xbe, 0x02, 0xaf, 0xd0, 0x55, 0x17,
-	0x7d, 0x81, 0xee, 0x78, 0x81, 0x2e, 0x2b, 0x5f, 0x3b, 0x80, 0xb0, 0x7d, 0xab, 0xa0, 0xee, 0x7c,
-	0x3f, 0xce, 0x39, 0xbf, 0xff, 0xb9, 0xe7, 0x1c, 0x19, 0x2f, 0xd8, 0x94, 0xda, 0x1d, 0xd0, 0x5a,
-	0x1d, 0xda, 0x6b, 0x6b, 0x6d, 0xc7, 0xea, 0x50, 0x7b, 0xb7, 0x43, 0x9f, 0x69, 0xfb, 0x65, 0x8d,
-	0x01, 0x63, 0x0e, 0x75, 0x4d, 0x70, 0x03, 0x27, 0xe8, 0x9b, 0x41, 0xdf, 0x03, 0xd5, 0xf3, 0x69,
-	0x40, 0x89, 0x1c, 0x59, 0xa9, 0xdc, 0x4a, 0x3d, 0xb3, 0x52, 0xf7, 0xcb, 0xf2, 0x5f, 0xb1, 0x47,
-	0xcb, 0x73, 0x34, 0xcb, 0x75, 0x69, 0x60, 0x05, 0x0e, 0x75, 0x59, 0x64, 0x29, 0xff, 0x79, 0xee,
-	0xd4, 0x07, 0x46, 0x7b, 0x7e, 0x2b, 0x76, 0x2a, 0x5f, 0x11, 0xa0, 0x24, 0x10, 0xe4, 0xd9, 0xf8,
-	0x36, 0x5f, 0xed, 0xf4, 0x76, 0x35, 0xe8, 0x7a, 0x41, 0x3f, 0x3e, 0x2c, 0x5e, 0x3c, 0xdc, 0x75,
-	0xa0, 0xd3, 0x36, 0xbb, 0x16, 0xdb, 0x8b, 0x6e, 0x28, 0x27, 0x12, 0x9e, 0x6a, 0x44, 0xfa, 0x74,
-	0xee, 0xbb, 0xd9, 0xf7, 0x80, 0x10, 0xfc, 0xb3, 0x6b, 0x75, 0x21, 0x8f, 0x8a, 0x68, 0x7e, 0xdc,
-	0xe0, 0xdf, 0xc4, 0xc7, 0xd3, 0x71, 0x74, 0xba, 0x0f, 0xbe, 0xef, 0xb4, 0xc1, 0xec, 0xd2, 0x36,
-	0xe4, 0xa5, 0x22, 0x9a, 0xff, 0xad, 0x7c, 0x57, 0xcd, 0x4e, 0x85, 0x9a, 0x08, 0xa0, 0x46, 0x9f,
-	0x9b, 0xb1, 0xa3, 0x1a, 0x6d, 0x83, 0x41, 0x20, 0xb1, 0x47, 0xaa, 0x78, 0x8c, 0xef, 0x3a, 0xc0,
-	0xf2, 0x23, 0xc5, 0x91, 0xf9, 0x89, 0xf2, 0x55, 0x51, 0x9c, 0x44, 0x00, 0xe3, 0xd4, 0x5c, 0x39,
-	0x42, 0x98, 0x24, 0xa3, 0x92, 0xff, 0x70, 0x51, 0xdf, 0x68, 0x56, 0x9b, 0x0f, 0xcd, 0xcd, 0x6d,
-	0xdd, 0x30, 0xaa, 0x15, 0xdd, 0xac, 0x6d, 0x56, 0x74, 0x73, 0x6b, 0xa3, 0x51, 0xd7, 0x57, 0xaa,
-	0xab, 0x55, 0xbd, 0x32, 0xf9, 0x13, 0xf9, 0x07, 0xcf, 0xa5, 0xde, 0x1a, 0xac, 0x26, 0x11, 0xf9,
-	0x17, 0xff, 0x9d, 0x7a, 0xa5, 0xb1, 0x55, 0xaf, 0xaf, 0xeb, 0x35, 0x7d, 0xa3, 0x39, 0x29, 0x29,
-	0x0c, 0xcf, 0xad, 0x3b, 0x2c, 0x48, 0xe4, 0x83, 0x19, 0xf0, 0xb4, 0x07, 0x2c, 0x20, 0x39, 0x3c,
-	0xea, 0x59, 0x3e, 0xb8, 0x41, 0x9c, 0xfa, 0x78, 0x45, 0x66, 0xf1, 0xb8, 0x67, 0xd9, 0x60, 0x32,
-	0xe7, 0x20, 0xca, 0xf8, 0x2f, 0xc6, 0x58, 0xb8, 0xd1, 0x70, 0x0e, 0x80, 0xcc, 0x61, 0xcc, 0x0f,
-	0x03, 0xba, 0x07, 0x6e, 0x7e, 0x84, 0x1b, 0xf2, 0xeb, 0xcd, 0x70, 0x43, 0x79, 0x87, 0x70, 0x21,
-	0x2b, 0x2a, 0xf3, 0xa8, 0xcb, 0x80, 0x98, 0x78, 0x3a, 0xa5, 0xc8, 0x59, 0x1e, 0x7d, 0x3f, 0xe7,
-	0x09, 0xaf, 0x06, 0x61, 0x89, 0x40, 0xe4, 0x7f, 0xfc, 0xbb, 0x0b, 0xcf, 0x03, 0xf3, 0x1c, 0xa7,
-	0xc4, 0x39, 0x7f, 0x0d, 0xb7, 0xeb, 0xa7, 0xac, 0xd7, 0xf0, 0xec, 0x1a, 0x24, 0x49, 0x07, 0xe9,
-	0x49, 0xa9, 0x4b, 0xe5, 0x15, 0xc2, 0x85, 0x15, 0x1f, 0xac, 0x00, 0x32, 0xcd, 0xb2, 0xb2, 0xfa,
-	0x18, 0xff, 0x91, 0x22, 0x9b, 0x93, 0x0d, 0xad, 0x7a, 0x2a, 0xa1, 0x5a, 0x39, 0x46, 0xb8, 0xb0,
-	0xe5, 0xb5, 0x45, 0x64, 0x19, 0x04, 0xe8, 0xc7, 0x10, 0x90, 0x25, 0x3c, 0xd1, 0xe3, 0x00, 0xbc,
-	0xe5, 0x63, 0x61, 0xf2, 0xc0, 0xed, 0x60, 0x2a, 0xa8, 0xab, 0xe1, 0x54, 0xa8, 0x59, 0x6c, 0xcf,
-	0xc0, 0xd1, 0xf5, 0xf0, 0x5b, 0x59, 0xc0, 0x85, 0x0a, 0x74, 0x40, 0x40, 0x9f, 0xf2, 0x1c, 0xe5,
-	0xd7, 0x63, 0x98, 0x24, 0x2b, 0x8d, 0x7c, 0x44, 0x38, 0x97, 0x5e, 0x84, 0xe4, 0x96, 0x48, 0xa6,
-	0xb0, 0x5d, 0xe4, 0xc5, 0xcb, 0x98, 0x46, 0x35, 0xaf, 0xdc, 0x3e, 0xfa, 0xf4, 0xe5, 0xa5, 0x74,
-	0x83, 0x2c, 0x84, 0x73, 0xf5, 0x45, 0x54, 0x11, 0x77, 0x3c, 0x9f, 0x3e, 0x81, 0x56, 0xc0, 0xb4,
-	0x92, 0x66, 0xd9, 0xe0, 0x06, 0x83, 0xd9, 0xcf, 0xb4, 0xd2, 0x61, 0x3c, 0x7c, 0x23, 0xe8, 0x63,
-	0x84, 0xa7, 0xd3, 0x2a, 0x95, 0xdc, 0x14, 0x21, 0x09, 0x6a, 0x5b, 0x1e, 0xee, 0xb5, 0x2f, 0xe0,
-	0x87, 0xa9, 0x17, 0xc1, 0x9f, 0x67, 0xd7, 0x4a, 0x87, 0xe4, 0x33, 0xc2, 0x33, 0x19, 0x4d, 0x43,
-	0x84, 0x49, 0x15, 0x77, 0xda, 0xb0, 0x22, 0x1e, 0x70, 0x11, 0xf7, 0x95, 0x4b, 0xbd, 0xc1, 0x62,
-	0x5a, 0xeb, 0x90, 0x13, 0x84, 0x67, 0x32, 0x9a, 0x4e, 0xac, 0x4c, 0xdc, 0xa9, 0xc3, 0x2a, 0x03,
-	0xae, 0xcc, 0x2c, 0xdf, 0xe3, 0xca, 0xd2, 0xfe, 0x20, 0x86, 0x7c, 0xb2, 0x74, 0xb5, 0x1f, 0x10,
-	0x9e, 0xc9, 0x68, 0x52, 0xb1, 0x5a, 0x71, 0x67, 0xcb, 0xb9, 0xc4, 0x8c, 0xd0, 0xc3, 0xdf, 0x8a,
-	0x41, 0xd5, 0x95, 0x2e, 0x55, 0x75, 0xcb, 0x6f, 0x11, 0x2e, 0xb4, 0x68, 0x57, 0xc0, 0xb5, 0x9c,
-	0x4b, 0x20, 0xd5, 0x43, 0x82, 0x3a, 0x7a, 0x54, 0x89, 0xad, 0x6c, 0xda, 0xb1, 0x5c, 0x5b, 0xa5,
-	0xbe, 0xad, 0xd9, 0xe0, 0x72, 0x3e, 0x2d, 0x3a, 0xb2, 0x3c, 0x87, 0xa5, 0xfd, 0x35, 0x2d, 0x9d,
-	0xad, 0xbe, 0x22, 0xf4, 0x46, 0x92, 0x2a, 0xab, 0xef, 0x25, 0x79, 0x2d, 0x72, 0xb7, 0xc2, 0x21,
-	0x2a, 0x67, 0x10, 0xdb, 0xe5, 0x9d, 0x51, 0xee, 0xf5, 0xfa, 0xb7, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x7b, 0xde, 0xc9, 0xc2, 0x15, 0x0a, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2/webhook.pb.go b/googleapis/cloud/dialogflow/v2/webhook.pb.go
index 50bd135590..dfeeb5a2c5 100644
--- a/googleapis/cloud/dialogflow/v2/webhook.pb.go
+++ b/googleapis/cloud/dialogflow/v2/webhook.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2/webhook.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+package dialogflow
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The request message for a webhook call.
 type WebhookRequest struct {
@@ -46,16 +49,17 @@ func (m *WebhookRequest) Reset()         { *m = WebhookRequest{} }
 func (m *WebhookRequest) String() string { return proto.CompactTextString(m) }
 func (*WebhookRequest) ProtoMessage()    {}
 func (*WebhookRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webhook_a595880048808234, []int{0}
+	return fileDescriptor_2ba880626f278d96, []int{0}
 }
+
 func (m *WebhookRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebhookRequest.Unmarshal(m, b)
 }
 func (m *WebhookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebhookRequest.Marshal(b, m, deterministic)
 }
-func (dst *WebhookRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebhookRequest.Merge(dst, src)
+func (m *WebhookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookRequest.Merge(m, src)
 }
 func (m *WebhookRequest) XXX_Size() int {
 	return xxx_messageInfo_WebhookRequest.Size(m)
@@ -143,16 +147,17 @@ func (m *WebhookResponse) Reset()         { *m = WebhookResponse{} }
 func (m *WebhookResponse) String() string { return proto.CompactTextString(m) }
 func (*WebhookResponse) ProtoMessage()    {}
 func (*WebhookResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webhook_a595880048808234, []int{1}
+	return fileDescriptor_2ba880626f278d96, []int{1}
 }
+
 func (m *WebhookResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebhookResponse.Unmarshal(m, b)
 }
 func (m *WebhookResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebhookResponse.Marshal(b, m, deterministic)
 }
-func (dst *WebhookResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebhookResponse.Merge(dst, src)
+func (m *WebhookResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookResponse.Merge(m, src)
 }
 func (m *WebhookResponse) XXX_Size() int {
 	return xxx_messageInfo_WebhookResponse.Size(m)
@@ -237,16 +242,17 @@ func (m *OriginalDetectIntentRequest) Reset()         { *m = OriginalDetectInten
 func (m *OriginalDetectIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*OriginalDetectIntentRequest) ProtoMessage()    {}
 func (*OriginalDetectIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webhook_a595880048808234, []int{2}
+	return fileDescriptor_2ba880626f278d96, []int{2}
 }
+
 func (m *OriginalDetectIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OriginalDetectIntentRequest.Unmarshal(m, b)
 }
 func (m *OriginalDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OriginalDetectIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *OriginalDetectIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OriginalDetectIntentRequest.Merge(dst, src)
+func (m *OriginalDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OriginalDetectIntentRequest.Merge(m, src)
 }
 func (m *OriginalDetectIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_OriginalDetectIntentRequest.Size(m)
@@ -285,10 +291,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2/webhook.proto", fileDescriptor_webhook_a595880048808234)
+	proto.RegisterFile("google/cloud/dialogflow/v2/webhook.proto", fileDescriptor_2ba880626f278d96)
 }
 
-var fileDescriptor_webhook_a595880048808234 = []byte{
+var fileDescriptor_2ba880626f278d96 = []byte{
 	// 553 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6f, 0xd3, 0x4c,
 	0x10, 0x86, 0x65, 0xe7, 0xfb, 0x12, 0x75, 0x53, 0x35, 0x68, 0xa9, 0xc0, 0x4a, 0x51, 0x89, 0x82,
diff --git a/googleapis/cloud/dialogflow/v2beta1/agent.pb.go b/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
index d62febbde6..7d917bc9c3 100644
--- a/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/agent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Match mode determines how intents are detected from user queries.
 type Agent_MatchMode int32
@@ -47,6 +47,7 @@ var Agent_MatchMode_name = map[int32]string{
 	1: "MATCH_MODE_HYBRID",
 	2: "MATCH_MODE_ML_ONLY",
 }
+
 var Agent_MatchMode_value = map[string]int32{
 	"MATCH_MODE_UNSPECIFIED": 0,
 	"MATCH_MODE_HYBRID":      1,
@@ -56,8 +57,9 @@ var Agent_MatchMode_value = map[string]int32{
 func (x Agent_MatchMode) String() string {
 	return proto.EnumName(Agent_MatchMode_name, int32(x))
 }
+
 func (Agent_MatchMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{0, 0}
+	return fileDescriptor_be44838675479699, []int{0, 0}
 }
 
 // Represents a conversational agent.
@@ -110,16 +112,17 @@ func (m *Agent) Reset()         { *m = Agent{} }
 func (m *Agent) String() string { return proto.CompactTextString(m) }
 func (*Agent) ProtoMessage()    {}
 func (*Agent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{0}
+	return fileDescriptor_be44838675479699, []int{0}
 }
+
 func (m *Agent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Agent.Unmarshal(m, b)
 }
 func (m *Agent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Agent.Marshal(b, m, deterministic)
 }
-func (dst *Agent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Agent.Merge(dst, src)
+func (m *Agent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Agent.Merge(m, src)
 }
 func (m *Agent) XXX_Size() int {
 	return xxx_messageInfo_Agent.Size(m)
@@ -214,16 +217,17 @@ func (m *GetAgentRequest) Reset()         { *m = GetAgentRequest{} }
 func (m *GetAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAgentRequest) ProtoMessage()    {}
 func (*GetAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{1}
+	return fileDescriptor_be44838675479699, []int{1}
 }
+
 func (m *GetAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAgentRequest.Unmarshal(m, b)
 }
 func (m *GetAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAgentRequest.Merge(dst, src)
+func (m *GetAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAgentRequest.Merge(m, src)
 }
 func (m *GetAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAgentRequest.Size(m)
@@ -260,16 +264,17 @@ func (m *SearchAgentsRequest) Reset()         { *m = SearchAgentsRequest{} }
 func (m *SearchAgentsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchAgentsRequest) ProtoMessage()    {}
 func (*SearchAgentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{2}
+	return fileDescriptor_be44838675479699, []int{2}
 }
+
 func (m *SearchAgentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAgentsRequest.Unmarshal(m, b)
 }
 func (m *SearchAgentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAgentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchAgentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAgentsRequest.Merge(dst, src)
+func (m *SearchAgentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsRequest.Merge(m, src)
 }
 func (m *SearchAgentsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchAgentsRequest.Size(m)
@@ -318,16 +323,17 @@ func (m *SearchAgentsResponse) Reset()         { *m = SearchAgentsResponse{} }
 func (m *SearchAgentsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchAgentsResponse) ProtoMessage()    {}
 func (*SearchAgentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{3}
+	return fileDescriptor_be44838675479699, []int{3}
 }
+
 func (m *SearchAgentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAgentsResponse.Unmarshal(m, b)
 }
 func (m *SearchAgentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAgentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchAgentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAgentsResponse.Merge(dst, src)
+func (m *SearchAgentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsResponse.Merge(m, src)
 }
 func (m *SearchAgentsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchAgentsResponse.Size(m)
@@ -366,16 +372,17 @@ func (m *TrainAgentRequest) Reset()         { *m = TrainAgentRequest{} }
 func (m *TrainAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*TrainAgentRequest) ProtoMessage()    {}
 func (*TrainAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{4}
+	return fileDescriptor_be44838675479699, []int{4}
 }
+
 func (m *TrainAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrainAgentRequest.Unmarshal(m, b)
 }
 func (m *TrainAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrainAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *TrainAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrainAgentRequest.Merge(dst, src)
+func (m *TrainAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainAgentRequest.Merge(m, src)
 }
 func (m *TrainAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_TrainAgentRequest.Size(m)
@@ -413,16 +420,17 @@ func (m *ExportAgentRequest) Reset()         { *m = ExportAgentRequest{} }
 func (m *ExportAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportAgentRequest) ProtoMessage()    {}
 func (*ExportAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{5}
+	return fileDescriptor_be44838675479699, []int{5}
 }
+
 func (m *ExportAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAgentRequest.Unmarshal(m, b)
 }
 func (m *ExportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAgentRequest.Merge(dst, src)
+func (m *ExportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentRequest.Merge(m, src)
 }
 func (m *ExportAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportAgentRequest.Size(m)
@@ -464,16 +472,17 @@ func (m *ExportAgentResponse) Reset()         { *m = ExportAgentResponse{} }
 func (m *ExportAgentResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportAgentResponse) ProtoMessage()    {}
 func (*ExportAgentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{6}
+	return fileDescriptor_be44838675479699, []int{6}
 }
+
 func (m *ExportAgentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportAgentResponse.Unmarshal(m, b)
 }
 func (m *ExportAgentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportAgentResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportAgentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportAgentResponse.Merge(dst, src)
+func (m *ExportAgentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentResponse.Merge(m, src)
 }
 func (m *ExportAgentResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportAgentResponse.Size(m)
@@ -521,72 +530,14 @@ func (m *ExportAgentResponse) GetAgentContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExportAgentResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExportAgentResponse_OneofMarshaler, _ExportAgentResponse_OneofUnmarshaler, _ExportAgentResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExportAgentResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExportAgentResponse_AgentUri)(nil),
 		(*ExportAgentResponse_AgentContent)(nil),
 	}
 }
 
-func _ExportAgentResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExportAgentResponse)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ExportAgentResponse_AgentUri:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AgentUri)
-	case *ExportAgentResponse_AgentContent:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AgentContent)
-	case nil:
-	default:
-		return fmt.Errorf("ExportAgentResponse.Agent has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExportAgentResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExportAgentResponse)
-	switch tag {
-	case 1: // agent.agent_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Agent = &ExportAgentResponse_AgentUri{x}
-		return true, err
-	case 2: // agent.agent_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Agent = &ExportAgentResponse_AgentContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExportAgentResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExportAgentResponse)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ExportAgentResponse_AgentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentUri)))
-		n += len(x.AgentUri)
-	case *ExportAgentResponse_AgentContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentContent)))
-		n += len(x.AgentContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request message for [Agents.ImportAgent][google.cloud.dialogflow.v2beta1.Agents.ImportAgent].
 type ImportAgentRequest struct {
 	// Required. The project that the agent to import is associated with.
@@ -607,16 +558,17 @@ func (m *ImportAgentRequest) Reset()         { *m = ImportAgentRequest{} }
 func (m *ImportAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportAgentRequest) ProtoMessage()    {}
 func (*ImportAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{7}
+	return fileDescriptor_be44838675479699, []int{7}
 }
+
 func (m *ImportAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportAgentRequest.Unmarshal(m, b)
 }
 func (m *ImportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportAgentRequest.Merge(dst, src)
+func (m *ImportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportAgentRequest.Merge(m, src)
 }
 func (m *ImportAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportAgentRequest.Size(m)
@@ -671,72 +623,14 @@ func (m *ImportAgentRequest) GetAgentContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImportAgentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImportAgentRequest_OneofMarshaler, _ImportAgentRequest_OneofUnmarshaler, _ImportAgentRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImportAgentRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImportAgentRequest_AgentUri)(nil),
 		(*ImportAgentRequest_AgentContent)(nil),
 	}
 }
 
-func _ImportAgentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImportAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ImportAgentRequest_AgentUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AgentUri)
-	case *ImportAgentRequest_AgentContent:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AgentContent)
-	case nil:
-	default:
-		return fmt.Errorf("ImportAgentRequest.Agent has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImportAgentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImportAgentRequest)
-	switch tag {
-	case 2: // agent.agent_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Agent = &ImportAgentRequest_AgentUri{x}
-		return true, err
-	case 3: // agent.agent_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Agent = &ImportAgentRequest_AgentContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImportAgentRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImportAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *ImportAgentRequest_AgentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentUri)))
-		n += len(x.AgentUri)
-	case *ImportAgentRequest_AgentContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentContent)))
-		n += len(x.AgentContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request message for [Agents.RestoreAgent][google.cloud.dialogflow.v2beta1.Agents.RestoreAgent].
 type RestoreAgentRequest struct {
 	// Required. The project that the agent to restore is associated with.
@@ -757,16 +651,17 @@ func (m *RestoreAgentRequest) Reset()         { *m = RestoreAgentRequest{} }
 func (m *RestoreAgentRequest) String() string { return proto.CompactTextString(m) }
 func (*RestoreAgentRequest) ProtoMessage()    {}
 func (*RestoreAgentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_agent_b87bd04ebcb8ded2, []int{8}
+	return fileDescriptor_be44838675479699, []int{8}
 }
+
 func (m *RestoreAgentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RestoreAgentRequest.Unmarshal(m, b)
 }
 func (m *RestoreAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RestoreAgentRequest.Marshal(b, m, deterministic)
 }
-func (dst *RestoreAgentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RestoreAgentRequest.Merge(dst, src)
+func (m *RestoreAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestoreAgentRequest.Merge(m, src)
 }
 func (m *RestoreAgentRequest) XXX_Size() int {
 	return xxx_messageInfo_RestoreAgentRequest.Size(m)
@@ -821,73 +716,16 @@ func (m *RestoreAgentRequest) GetAgentContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RestoreAgentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RestoreAgentRequest_OneofMarshaler, _RestoreAgentRequest_OneofUnmarshaler, _RestoreAgentRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RestoreAgentRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RestoreAgentRequest_AgentUri)(nil),
 		(*RestoreAgentRequest_AgentContent)(nil),
 	}
 }
 
-func _RestoreAgentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RestoreAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *RestoreAgentRequest_AgentUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AgentUri)
-	case *RestoreAgentRequest_AgentContent:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AgentContent)
-	case nil:
-	default:
-		return fmt.Errorf("RestoreAgentRequest.Agent has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RestoreAgentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RestoreAgentRequest)
-	switch tag {
-	case 2: // agent.agent_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Agent = &RestoreAgentRequest_AgentUri{x}
-		return true, err
-	case 3: // agent.agent_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Agent = &RestoreAgentRequest_AgentContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RestoreAgentRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RestoreAgentRequest)
-	// agent
-	switch x := m.Agent.(type) {
-	case *RestoreAgentRequest_AgentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentUri)))
-		n += len(x.AgentUri)
-	case *RestoreAgentRequest_AgentContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AgentContent)))
-		n += len(x.AgentContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Agent_MatchMode", Agent_MatchMode_name, Agent_MatchMode_value)
 	proto.RegisterType((*Agent)(nil), "google.cloud.dialogflow.v2beta1.Agent")
 	proto.RegisterType((*GetAgentRequest)(nil), "google.cloud.dialogflow.v2beta1.GetAgentRequest")
 	proto.RegisterType((*SearchAgentsRequest)(nil), "google.cloud.dialogflow.v2beta1.SearchAgentsRequest")
@@ -897,7 +735,76 @@ func init() {
 	proto.RegisterType((*ExportAgentResponse)(nil), "google.cloud.dialogflow.v2beta1.ExportAgentResponse")
 	proto.RegisterType((*ImportAgentRequest)(nil), "google.cloud.dialogflow.v2beta1.ImportAgentRequest")
 	proto.RegisterType((*RestoreAgentRequest)(nil), "google.cloud.dialogflow.v2beta1.RestoreAgentRequest")
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Agent_MatchMode", Agent_MatchMode_name, Agent_MatchMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/agent.proto", fileDescriptor_be44838675479699)
+}
+
+var fileDescriptor_be44838675479699 = []byte{
+	// 985 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xdd, 0x6e, 0xdc, 0x44,
+	0x14, 0x8e, 0x37, 0x4d, 0xb2, 0x7b, 0x92, 0xb4, 0xe9, 0x84, 0x06, 0xb3, 0x6d, 0xd4, 0xc5, 0xa5,
+	0xd5, 0x36, 0x11, 0x6b, 0xba, 0x69, 0x25, 0x08, 0x02, 0xa9, 0xf9, 0x69, 0xb3, 0x52, 0xfe, 0xe4,
+	0x24, 0x95, 0xda, 0x1b, 0x6b, 0x62, 0x4f, 0x9c, 0xa1, 0xf6, 0x8c, 0x99, 0x19, 0x97, 0x36, 0x05,
+	0x2e, 0x78, 0x02, 0x24, 0x90, 0x10, 0x5c, 0x72, 0x85, 0xb8, 0xe0, 0x8a, 0x37, 0xe1, 0x15, 0x78,
+	0x08, 0x2e, 0x91, 0xc7, 0xde, 0xac, 0x37, 0x69, 0x6b, 0x23, 0x21, 0xf5, 0xce, 0xfe, 0xbe, 0xef,
+	0x9c, 0xf3, 0xcd, 0xcc, 0x39, 0x9a, 0x81, 0xc5, 0x80, 0xf3, 0x20, 0x24, 0xb6, 0x17, 0xf2, 0xc4,
+	0xb7, 0x7d, 0x8a, 0x43, 0x1e, 0x1c, 0x85, 0xfc, 0x2b, 0xfb, 0x59, 0xf7, 0x90, 0x28, 0x7c, 0xc7,
+	0xc6, 0x01, 0x61, 0xaa, 0x13, 0x0b, 0xae, 0x38, 0xba, 0x9e, 0x89, 0x3b, 0x5a, 0xdc, 0x19, 0x88,
+	0x3b, 0xb9, 0xb8, 0x79, 0x2d, 0xcf, 0x86, 0x63, 0x6a, 0x63, 0xc6, 0xb8, 0xc2, 0x8a, 0x72, 0x26,
+	0xb3, 0xf0, 0xe6, 0x7b, 0x05, 0x56, 0x10, 0xc9, 0x13, 0xe1, 0x91, 0x9c, 0xba, 0x91, 0x53, 0x21,
+	0x67, 0x81, 0x48, 0x18, 0xa3, 0x2c, 0xb0, 0x79, 0x4c, 0xc4, 0x50, 0xfc, 0xd5, 0x5c, 0xa4, 0xff,
+	0x0e, 0x93, 0x23, 0x9b, 0x44, 0xb1, 0x7a, 0x91, 0x93, 0xad, 0xb3, 0xe4, 0x11, 0x25, 0xa1, 0xef,
+	0x46, 0x58, 0x3e, 0xcd, 0x15, 0xd7, 0xce, 0x2a, 0xa4, 0x12, 0x89, 0x97, 0xaf, 0xcd, 0xfa, 0xf9,
+	0x02, 0x8c, 0xdd, 0x4f, 0xd7, 0x8a, 0xe6, 0x60, 0x3c, 0xc6, 0x82, 0x30, 0x65, 0x1a, 0x2d, 0xa3,
+	0xdd, 0x70, 0xf2, 0x3f, 0xf4, 0x3e, 0x4c, 0xf9, 0x54, 0xc6, 0x21, 0x7e, 0xe1, 0x32, 0x1c, 0x11,
+	0xb3, 0xa6, 0xd9, 0xc9, 0x1c, 0xdb, 0xc6, 0x11, 0x41, 0x5d, 0xb8, 0xe2, 0x93, 0x23, 0x9c, 0x84,
+	0xca, 0x0d, 0x31, 0x0b, 0x12, 0x1c, 0x10, 0xd7, 0xe3, 0x3e, 0x31, 0x47, 0xb5, 0x76, 0x36, 0x27,
+	0x37, 0x73, 0x6e, 0x95, 0xfb, 0x04, 0x7d, 0x0c, 0xa6, 0x4c, 0xe2, 0x98, 0x0b, 0x45, 0xfc, 0xe1,
+	0x28, 0x69, 0x5e, 0x68, 0x8d, 0xb6, 0x1b, 0xce, 0xdc, 0x29, 0x5f, 0x0c, 0x94, 0xe8, 0x2a, 0x34,
+	0x14, 0x8d, 0x88, 0x7b, 0xc2, 0x19, 0x31, 0xc7, 0x74, 0x85, 0x7a, 0x0a, 0x3c, 0xe1, 0x8c, 0xa0,
+	0x16, 0x4c, 0xfa, 0x44, 0x7a, 0x82, 0xc6, 0xe9, 0x16, 0x9a, 0xe3, 0xb9, 0xd9, 0x01, 0x84, 0xe6,
+	0x01, 0xf0, 0x33, 0xac, 0xb0, 0x70, 0x13, 0x41, 0xcd, 0x09, 0x2d, 0x68, 0x64, 0xc8, 0x81, 0xa0,
+	0xe8, 0x26, 0x5c, 0x24, 0x0c, 0x1f, 0x86, 0xc4, 0x0d, 0x79, 0x10, 0x50, 0x16, 0x98, 0xf5, 0x96,
+	0xd1, 0xae, 0x3b, 0xd3, 0x19, 0xba, 0x99, 0x81, 0x68, 0x07, 0x20, 0xc2, 0xca, 0x3b, 0x76, 0xa3,
+	0x74, 0x9d, 0x8d, 0x96, 0xd1, 0xbe, 0xd8, 0xfd, 0xa8, 0x53, 0xd2, 0x28, 0x1d, 0xbd, 0xd3, 0x9d,
+	0xad, 0x34, 0x70, 0x8b, 0xfb, 0xc4, 0x69, 0x44, 0xfd, 0x4f, 0xf4, 0x09, 0x98, 0x5e, 0x88, 0xa5,
+	0xa4, 0x47, 0xd4, 0xd3, 0xc7, 0xef, 0xaa, 0x63, 0x41, 0xe4, 0x31, 0x0f, 0x7d, 0x13, 0x5a, 0x46,
+	0xbb, 0xe6, 0xbc, 0x3b, 0xcc, 0xef, 0xf7, 0x69, 0xeb, 0x11, 0x34, 0x4e, 0x53, 0xa2, 0x26, 0xcc,
+	0x6d, 0xdd, 0xdf, 0x5f, 0xdd, 0x70, 0xb7, 0x76, 0xd6, 0xd6, 0xdd, 0x83, 0xed, 0xbd, 0xdd, 0xf5,
+	0xd5, 0xde, 0x83, 0xde, 0xfa, 0xda, 0xcc, 0x08, 0xba, 0x02, 0x97, 0x0b, 0xdc, 0xc6, 0xe3, 0x15,
+	0xa7, 0xb7, 0x36, 0x63, 0xa0, 0x39, 0x40, 0x05, 0x78, 0x6b, 0xd3, 0xdd, 0xd9, 0xde, 0x7c, 0x3c,
+	0x53, 0xb3, 0x6e, 0xc3, 0xa5, 0x87, 0x44, 0x69, 0xcf, 0x0e, 0xf9, 0x32, 0x21, 0xf2, 0xb5, 0x4d,
+	0x62, 0x51, 0x98, 0xdd, 0x23, 0x58, 0x78, 0xc7, 0x5a, 0x2d, 0x4b, 0xe4, 0xe9, 0x11, 0xc6, 0xe9,
+	0x71, 0x4b, 0x7a, 0x92, 0x35, 0xd4, 0x98, 0x53, 0x4f, 0x81, 0x3d, 0x7a, 0x42, 0xd2, 0x03, 0xd2,
+	0xa4, 0xe2, 0x4f, 0x09, 0xcb, 0x5b, 0x48, 0xcb, 0xf7, 0x53, 0xc0, 0xfa, 0x16, 0xde, 0x19, 0x2e,
+	0x25, 0x63, 0xce, 0x24, 0x41, 0x9f, 0xc3, 0xb8, 0x1e, 0x5a, 0x69, 0x1a, 0xad, 0xd1, 0xf6, 0x64,
+	0xf7, 0x56, 0xb5, 0xd3, 0x70, 0xf2, 0x28, 0x74, 0x0b, 0x2e, 0x31, 0xf2, 0x5c, 0xb9, 0x85, 0xda,
+	0x59, 0xab, 0x4f, 0xa7, 0xf0, 0xee, 0x69, 0xfd, 0x45, 0xb8, 0xbc, 0x2f, 0x30, 0x65, 0x95, 0xf6,
+	0xa5, 0x07, 0x68, 0xfd, 0x79, 0xda, 0xc4, 0x55, 0xd4, 0xe9, 0xb6, 0x68, 0x33, 0xba, 0x33, 0xb3,
+	0xe2, 0x75, 0x0d, 0x1c, 0x08, 0x6a, 0xf9, 0x30, 0x3b, 0x94, 0x2a, 0x5f, 0xf6, 0x7c, 0x31, 0x46,
+	0xa7, 0xdb, 0x18, 0x19, 0x44, 0xa1, 0x9b, 0x30, 0x9d, 0xd1, 0x1e, 0x67, 0x2a, 0xad, 0x98, 0xa6,
+	0x9d, 0xda, 0x18, 0x71, 0xa6, 0x34, 0xbc, 0x9a, 0xa1, 0x2b, 0x13, 0x30, 0xa6, 0xff, 0xad, 0x97,
+	0x80, 0x7a, 0x51, 0x65, 0xc3, 0xf3, 0xe7, 0x0c, 0xbf, 0xb9, 0xf8, 0xe8, 0x9b, 0x8b, 0x7f, 0x0d,
+	0xb3, 0x0e, 0x91, 0x8a, 0x0b, 0xf2, 0x16, 0xaa, 0x77, 0xff, 0x9c, 0x80, 0xf1, 0xac, 0xa7, 0xd0,
+	0xf7, 0x06, 0xd4, 0xfb, 0xad, 0x8f, 0xca, 0xc7, 0xfa, 0xcc, 0x94, 0x34, 0x2b, 0xb6, 0x9e, 0xb5,
+	0xf0, 0xdd, 0x5f, 0x7f, 0xff, 0x50, 0xfb, 0x00, 0x59, 0xa7, 0xd7, 0xce, 0xcb, 0x6c, 0x69, 0x9f,
+	0xc5, 0x82, 0x7f, 0x41, 0x3c, 0x25, 0xed, 0x85, 0x6f, 0xb2, 0xab, 0x08, 0xfd, 0x61, 0xc0, 0x54,
+	0xb1, 0xef, 0xd1, 0xdd, 0xd2, 0x22, 0xaf, 0x98, 0xc8, 0xe6, 0xbd, 0xff, 0x18, 0x95, 0x75, 0x99,
+	0x75, 0x47, 0x3b, 0x5d, 0x44, 0xb7, 0xcb, 0x9d, 0x2e, 0x4b, 0x9d, 0x00, 0xfd, 0x68, 0x00, 0x0c,
+	0x06, 0x05, 0x75, 0x4b, 0x0b, 0x9f, 0x9b, 0xaa, 0xe6, 0x7c, 0x3f, 0xa6, 0x70, 0x3f, 0x76, 0x76,
+	0xfa, 0xf7, 0xa3, 0xb5, 0xa4, 0x4d, 0x7d, 0x68, 0xb5, 0x2b, 0x98, 0x52, 0x69, 0xf2, 0x65, 0x63,
+	0x01, 0xfd, 0x64, 0xc0, 0x64, 0x61, 0x8e, 0xd0, 0x52, 0xa9, 0xaf, 0xf3, 0x03, 0x5c, 0x66, 0xec,
+	0xae, 0x36, 0xd6, 0xb1, 0xaa, 0xec, 0x16, 0xd1, 0xd9, 0xfb, 0xce, 0x0a, 0xb3, 0x57, 0xc1, 0xd9,
+	0xf9, 0x49, 0xfd, 0x3f, 0x9d, 0xd1, 0xa8, 0xef, 0xec, 0x17, 0x03, 0xa6, 0x8a, 0x83, 0x59, 0xa1,
+	0xf7, 0x5e, 0x31, 0xc7, 0x65, 0xde, 0xee, 0x69, 0x6f, 0xb6, 0xb5, 0x50, 0xc1, 0x9b, 0xc8, 0xd2,
+	0x2f, 0x1b, 0x0b, 0x2b, 0xbf, 0x19, 0x70, 0xc3, 0xe3, 0x51, 0x99, 0xa3, 0x15, 0xd0, 0x5e, 0x76,
+	0xd3, 0x57, 0xcf, 0xae, 0xf1, 0xa4, 0x97, 0xcb, 0x03, 0x9e, 0xbe, 0x3d, 0x3a, 0x5c, 0x04, 0x76,
+	0x40, 0x98, 0x7e, 0x13, 0xd9, 0x19, 0x85, 0x63, 0x2a, 0x5f, 0xfb, 0x3e, 0xfc, 0x74, 0x00, 0xfd,
+	0x63, 0x18, 0xbf, 0xd6, 0x6a, 0x6b, 0x0f, 0x7e, 0xaf, 0x5d, 0x7f, 0x98, 0xe5, 0x5c, 0xd5, 0x16,
+	0xd6, 0x06, 0x16, 0x1e, 0x65, 0x41, 0x87, 0xe3, 0x3a, 0xff, 0xd2, 0xbf, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0xdd, 0x39, 0xa3, 0x5b, 0x7e, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1198,73 +1105,3 @@ var _Agents_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2beta1/agent.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/agent.proto", fileDescriptor_agent_b87bd04ebcb8ded2)
-}
-
-var fileDescriptor_agent_b87bd04ebcb8ded2 = []byte{
-	// 985 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xdd, 0x6e, 0xdc, 0x44,
-	0x14, 0x8e, 0x37, 0x4d, 0xb2, 0x7b, 0x92, 0xb4, 0xe9, 0x84, 0x06, 0xb3, 0x6d, 0xd4, 0xc5, 0xa5,
-	0xd5, 0x36, 0x11, 0x6b, 0xba, 0x69, 0x25, 0x08, 0x02, 0xa9, 0xf9, 0x69, 0xb3, 0x52, 0xfe, 0xe4,
-	0x24, 0x95, 0xda, 0x1b, 0x6b, 0x62, 0x4f, 0x9c, 0xa1, 0xf6, 0x8c, 0x99, 0x19, 0x97, 0x36, 0x05,
-	0x2e, 0x78, 0x02, 0x24, 0x90, 0x10, 0x5c, 0x72, 0x85, 0xb8, 0xe0, 0x8a, 0x37, 0xe1, 0x15, 0x78,
-	0x08, 0x2e, 0x91, 0xc7, 0xde, 0xac, 0x37, 0x69, 0x6b, 0x23, 0x21, 0xf5, 0xce, 0xfe, 0xbe, 0xef,
-	0x9c, 0xf3, 0xcd, 0xcc, 0x39, 0x9a, 0x81, 0xc5, 0x80, 0xf3, 0x20, 0x24, 0xb6, 0x17, 0xf2, 0xc4,
-	0xb7, 0x7d, 0x8a, 0x43, 0x1e, 0x1c, 0x85, 0xfc, 0x2b, 0xfb, 0x59, 0xf7, 0x90, 0x28, 0x7c, 0xc7,
-	0xc6, 0x01, 0x61, 0xaa, 0x13, 0x0b, 0xae, 0x38, 0xba, 0x9e, 0x89, 0x3b, 0x5a, 0xdc, 0x19, 0x88,
-	0x3b, 0xb9, 0xb8, 0x79, 0x2d, 0xcf, 0x86, 0x63, 0x6a, 0x63, 0xc6, 0xb8, 0xc2, 0x8a, 0x72, 0x26,
-	0xb3, 0xf0, 0xe6, 0x7b, 0x05, 0x56, 0x10, 0xc9, 0x13, 0xe1, 0x91, 0x9c, 0xba, 0x91, 0x53, 0x21,
-	0x67, 0x81, 0x48, 0x18, 0xa3, 0x2c, 0xb0, 0x79, 0x4c, 0xc4, 0x50, 0xfc, 0xd5, 0x5c, 0xa4, 0xff,
-	0x0e, 0x93, 0x23, 0x9b, 0x44, 0xb1, 0x7a, 0x91, 0x93, 0xad, 0xb3, 0xe4, 0x11, 0x25, 0xa1, 0xef,
-	0x46, 0x58, 0x3e, 0xcd, 0x15, 0xd7, 0xce, 0x2a, 0xa4, 0x12, 0x89, 0x97, 0xaf, 0xcd, 0xfa, 0xf9,
-	0x02, 0x8c, 0xdd, 0x4f, 0xd7, 0x8a, 0xe6, 0x60, 0x3c, 0xc6, 0x82, 0x30, 0x65, 0x1a, 0x2d, 0xa3,
-	0xdd, 0x70, 0xf2, 0x3f, 0xf4, 0x3e, 0x4c, 0xf9, 0x54, 0xc6, 0x21, 0x7e, 0xe1, 0x32, 0x1c, 0x11,
-	0xb3, 0xa6, 0xd9, 0xc9, 0x1c, 0xdb, 0xc6, 0x11, 0x41, 0x5d, 0xb8, 0xe2, 0x93, 0x23, 0x9c, 0x84,
-	0xca, 0x0d, 0x31, 0x0b, 0x12, 0x1c, 0x10, 0xd7, 0xe3, 0x3e, 0x31, 0x47, 0xb5, 0x76, 0x36, 0x27,
-	0x37, 0x73, 0x6e, 0x95, 0xfb, 0x04, 0x7d, 0x0c, 0xa6, 0x4c, 0xe2, 0x98, 0x0b, 0x45, 0xfc, 0xe1,
-	0x28, 0x69, 0x5e, 0x68, 0x8d, 0xb6, 0x1b, 0xce, 0xdc, 0x29, 0x5f, 0x0c, 0x94, 0xe8, 0x2a, 0x34,
-	0x14, 0x8d, 0x88, 0x7b, 0xc2, 0x19, 0x31, 0xc7, 0x74, 0x85, 0x7a, 0x0a, 0x3c, 0xe1, 0x8c, 0xa0,
-	0x16, 0x4c, 0xfa, 0x44, 0x7a, 0x82, 0xc6, 0xe9, 0x16, 0x9a, 0xe3, 0xb9, 0xd9, 0x01, 0x84, 0xe6,
-	0x01, 0xf0, 0x33, 0xac, 0xb0, 0x70, 0x13, 0x41, 0xcd, 0x09, 0x2d, 0x68, 0x64, 0xc8, 0x81, 0xa0,
-	0xe8, 0x26, 0x5c, 0x24, 0x0c, 0x1f, 0x86, 0xc4, 0x0d, 0x79, 0x10, 0x50, 0x16, 0x98, 0xf5, 0x96,
-	0xd1, 0xae, 0x3b, 0xd3, 0x19, 0xba, 0x99, 0x81, 0x68, 0x07, 0x20, 0xc2, 0xca, 0x3b, 0x76, 0xa3,
-	0x74, 0x9d, 0x8d, 0x96, 0xd1, 0xbe, 0xd8, 0xfd, 0xa8, 0x53, 0xd2, 0x28, 0x1d, 0xbd, 0xd3, 0x9d,
-	0xad, 0x34, 0x70, 0x8b, 0xfb, 0xc4, 0x69, 0x44, 0xfd, 0x4f, 0xf4, 0x09, 0x98, 0x5e, 0x88, 0xa5,
-	0xa4, 0x47, 0xd4, 0xd3, 0xc7, 0xef, 0xaa, 0x63, 0x41, 0xe4, 0x31, 0x0f, 0x7d, 0x13, 0x5a, 0x46,
-	0xbb, 0xe6, 0xbc, 0x3b, 0xcc, 0xef, 0xf7, 0x69, 0xeb, 0x11, 0x34, 0x4e, 0x53, 0xa2, 0x26, 0xcc,
-	0x6d, 0xdd, 0xdf, 0x5f, 0xdd, 0x70, 0xb7, 0x76, 0xd6, 0xd6, 0xdd, 0x83, 0xed, 0xbd, 0xdd, 0xf5,
-	0xd5, 0xde, 0x83, 0xde, 0xfa, 0xda, 0xcc, 0x08, 0xba, 0x02, 0x97, 0x0b, 0xdc, 0xc6, 0xe3, 0x15,
-	0xa7, 0xb7, 0x36, 0x63, 0xa0, 0x39, 0x40, 0x05, 0x78, 0x6b, 0xd3, 0xdd, 0xd9, 0xde, 0x7c, 0x3c,
-	0x53, 0xb3, 0x6e, 0xc3, 0xa5, 0x87, 0x44, 0x69, 0xcf, 0x0e, 0xf9, 0x32, 0x21, 0xf2, 0xb5, 0x4d,
-	0x62, 0x51, 0x98, 0xdd, 0x23, 0x58, 0x78, 0xc7, 0x5a, 0x2d, 0x4b, 0xe4, 0xe9, 0x11, 0xc6, 0xe9,
-	0x71, 0x4b, 0x7a, 0x92, 0x35, 0xd4, 0x98, 0x53, 0x4f, 0x81, 0x3d, 0x7a, 0x42, 0xd2, 0x03, 0xd2,
-	0xa4, 0xe2, 0x4f, 0x09, 0xcb, 0x5b, 0x48, 0xcb, 0xf7, 0x53, 0xc0, 0xfa, 0x16, 0xde, 0x19, 0x2e,
-	0x25, 0x63, 0xce, 0x24, 0x41, 0x9f, 0xc3, 0xb8, 0x1e, 0x5a, 0x69, 0x1a, 0xad, 0xd1, 0xf6, 0x64,
-	0xf7, 0x56, 0xb5, 0xd3, 0x70, 0xf2, 0x28, 0x74, 0x0b, 0x2e, 0x31, 0xf2, 0x5c, 0xb9, 0x85, 0xda,
-	0x59, 0xab, 0x4f, 0xa7, 0xf0, 0xee, 0x69, 0xfd, 0x45, 0xb8, 0xbc, 0x2f, 0x30, 0x65, 0x95, 0xf6,
-	0xa5, 0x07, 0x68, 0xfd, 0x79, 0xda, 0xc4, 0x55, 0xd4, 0xe9, 0xb6, 0x68, 0x33, 0xba, 0x33, 0xb3,
-	0xe2, 0x75, 0x0d, 0x1c, 0x08, 0x6a, 0xf9, 0x30, 0x3b, 0x94, 0x2a, 0x5f, 0xf6, 0x7c, 0x31, 0x46,
-	0xa7, 0xdb, 0x18, 0x19, 0x44, 0xa1, 0x9b, 0x30, 0x9d, 0xd1, 0x1e, 0x67, 0x2a, 0xad, 0x98, 0xa6,
-	0x9d, 0xda, 0x18, 0x71, 0xa6, 0x34, 0xbc, 0x9a, 0xa1, 0x2b, 0x13, 0x30, 0xa6, 0xff, 0xad, 0x97,
-	0x80, 0x7a, 0x51, 0x65, 0xc3, 0xf3, 0xe7, 0x0c, 0xbf, 0xb9, 0xf8, 0xe8, 0x9b, 0x8b, 0x7f, 0x0d,
-	0xb3, 0x0e, 0x91, 0x8a, 0x0b, 0xf2, 0x16, 0xaa, 0x77, 0xff, 0x9c, 0x80, 0xf1, 0xac, 0xa7, 0xd0,
-	0xf7, 0x06, 0xd4, 0xfb, 0xad, 0x8f, 0xca, 0xc7, 0xfa, 0xcc, 0x94, 0x34, 0x2b, 0xb6, 0x9e, 0xb5,
-	0xf0, 0xdd, 0x5f, 0x7f, 0xff, 0x50, 0xfb, 0x00, 0x59, 0xa7, 0xd7, 0xce, 0xcb, 0x6c, 0x69, 0x9f,
-	0xc5, 0x82, 0x7f, 0x41, 0x3c, 0x25, 0xed, 0x85, 0x6f, 0xb2, 0xab, 0x08, 0xfd, 0x61, 0xc0, 0x54,
-	0xb1, 0xef, 0xd1, 0xdd, 0xd2, 0x22, 0xaf, 0x98, 0xc8, 0xe6, 0xbd, 0xff, 0x18, 0x95, 0x75, 0x99,
-	0x75, 0x47, 0x3b, 0x5d, 0x44, 0xb7, 0xcb, 0x9d, 0x2e, 0x4b, 0x9d, 0x00, 0xfd, 0x68, 0x00, 0x0c,
-	0x06, 0x05, 0x75, 0x4b, 0x0b, 0x9f, 0x9b, 0xaa, 0xe6, 0x7c, 0x3f, 0xa6, 0x70, 0x3f, 0x76, 0x76,
-	0xfa, 0xf7, 0xa3, 0xb5, 0xa4, 0x4d, 0x7d, 0x68, 0xb5, 0x2b, 0x98, 0x52, 0x69, 0xf2, 0x65, 0x63,
-	0x01, 0xfd, 0x64, 0xc0, 0x64, 0x61, 0x8e, 0xd0, 0x52, 0xa9, 0xaf, 0xf3, 0x03, 0x5c, 0x66, 0xec,
-	0xae, 0x36, 0xd6, 0xb1, 0xaa, 0xec, 0x16, 0xd1, 0xd9, 0xfb, 0xce, 0x0a, 0xb3, 0x57, 0xc1, 0xd9,
-	0xf9, 0x49, 0xfd, 0x3f, 0x9d, 0xd1, 0xa8, 0xef, 0xec, 0x17, 0x03, 0xa6, 0x8a, 0x83, 0x59, 0xa1,
-	0xf7, 0x5e, 0x31, 0xc7, 0x65, 0xde, 0xee, 0x69, 0x6f, 0xb6, 0xb5, 0x50, 0xc1, 0x9b, 0xc8, 0xd2,
-	0x2f, 0x1b, 0x0b, 0x2b, 0xbf, 0x19, 0x70, 0xc3, 0xe3, 0x51, 0x99, 0xa3, 0x15, 0xd0, 0x5e, 0x76,
-	0xd3, 0x57, 0xcf, 0xae, 0xf1, 0xa4, 0x97, 0xcb, 0x03, 0x9e, 0xbe, 0x3d, 0x3a, 0x5c, 0x04, 0x76,
-	0x40, 0x98, 0x7e, 0x13, 0xd9, 0x19, 0x85, 0x63, 0x2a, 0x5f, 0xfb, 0x3e, 0xfc, 0x74, 0x00, 0xfd,
-	0x63, 0x18, 0xbf, 0xd6, 0x6a, 0x6b, 0x0f, 0x7e, 0xaf, 0x5d, 0x7f, 0x98, 0xe5, 0x5c, 0xd5, 0x16,
-	0xd6, 0x06, 0x16, 0x1e, 0x65, 0x41, 0x87, 0xe3, 0x3a, 0xff, 0xd2, 0xbf, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0xdd, 0x39, 0xa3, 0x5b, 0x7e, 0x0a, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go b/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
index 1e93ba1039..c187b74958 100644
--- a/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/audio_config.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
+package dialogflow
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Audio encoding of the audio content sent in the conversational query request.
 // Refer to the
@@ -73,6 +76,7 @@ var AudioEncoding_name = map[int32]string{
 	6: "AUDIO_ENCODING_OGG_OPUS",
 	7: "AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE",
 }
+
 var AudioEncoding_value = map[string]int32{
 	"AUDIO_ENCODING_UNSPECIFIED":            0,
 	"AUDIO_ENCODING_LINEAR_16":              1,
@@ -87,8 +91,9 @@ var AudioEncoding_value = map[string]int32{
 func (x AudioEncoding) String() string {
 	return proto.EnumName(AudioEncoding_name, int32(x))
 }
+
 func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{0}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{0}
 }
 
 // Variant of the specified [Speech model][google.cloud.dialogflow.v2beta1.InputAudioConfig.model] to use.
@@ -139,6 +144,7 @@ var SpeechModelVariant_name = map[int32]string{
 	2: "USE_STANDARD",
 	3: "USE_ENHANCED",
 }
+
 var SpeechModelVariant_value = map[string]int32{
 	"SPEECH_MODEL_VARIANT_UNSPECIFIED": 0,
 	"USE_BEST_AVAILABLE":               1,
@@ -149,8 +155,9 @@ var SpeechModelVariant_value = map[string]int32{
 func (x SpeechModelVariant) String() string {
 	return proto.EnumName(SpeechModelVariant_name, int32(x))
 }
+
 func (SpeechModelVariant) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{1}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{1}
 }
 
 // Gender of the voice as described in
@@ -175,6 +182,7 @@ var SsmlVoiceGender_name = map[int32]string{
 	2: "SSML_VOICE_GENDER_FEMALE",
 	3: "SSML_VOICE_GENDER_NEUTRAL",
 }
+
 var SsmlVoiceGender_value = map[string]int32{
 	"SSML_VOICE_GENDER_UNSPECIFIED": 0,
 	"SSML_VOICE_GENDER_MALE":        1,
@@ -185,8 +193,9 @@ var SsmlVoiceGender_value = map[string]int32{
 func (x SsmlVoiceGender) String() string {
 	return proto.EnumName(SsmlVoiceGender_name, int32(x))
 }
+
 func (SsmlVoiceGender) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{2}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{2}
 }
 
 // Audio encoding of the output audio format in Text-To-Speech.
@@ -213,6 +222,7 @@ var OutputAudioEncoding_name = map[int32]string{
 	2: "OUTPUT_AUDIO_ENCODING_MP3",
 	3: "OUTPUT_AUDIO_ENCODING_OGG_OPUS",
 }
+
 var OutputAudioEncoding_value = map[string]int32{
 	"OUTPUT_AUDIO_ENCODING_UNSPECIFIED": 0,
 	"OUTPUT_AUDIO_ENCODING_LINEAR_16":   1,
@@ -223,8 +233,9 @@ var OutputAudioEncoding_value = map[string]int32{
 func (x OutputAudioEncoding) String() string {
 	return proto.EnumName(OutputAudioEncoding_name, int32(x))
 }
+
 func (OutputAudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{3}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{3}
 }
 
 // Instructs the speech recognizer on how to process the audio content.
@@ -273,16 +284,17 @@ func (m *InputAudioConfig) Reset()         { *m = InputAudioConfig{} }
 func (m *InputAudioConfig) String() string { return proto.CompactTextString(m) }
 func (*InputAudioConfig) ProtoMessage()    {}
 func (*InputAudioConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{0}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{0}
 }
+
 func (m *InputAudioConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputAudioConfig.Unmarshal(m, b)
 }
 func (m *InputAudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputAudioConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputAudioConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputAudioConfig.Merge(dst, src)
+func (m *InputAudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputAudioConfig.Merge(m, src)
 }
 func (m *InputAudioConfig) XXX_Size() int {
 	return xxx_messageInfo_InputAudioConfig.Size(m)
@@ -355,16 +367,17 @@ func (m *VoiceSelectionParams) Reset()         { *m = VoiceSelectionParams{} }
 func (m *VoiceSelectionParams) String() string { return proto.CompactTextString(m) }
 func (*VoiceSelectionParams) ProtoMessage()    {}
 func (*VoiceSelectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{1}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{1}
 }
+
 func (m *VoiceSelectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VoiceSelectionParams.Unmarshal(m, b)
 }
 func (m *VoiceSelectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VoiceSelectionParams.Marshal(b, m, deterministic)
 }
-func (dst *VoiceSelectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VoiceSelectionParams.Merge(dst, src)
+func (m *VoiceSelectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoiceSelectionParams.Merge(m, src)
 }
 func (m *VoiceSelectionParams) XXX_Size() int {
 	return xxx_messageInfo_VoiceSelectionParams.Size(m)
@@ -424,16 +437,17 @@ func (m *SynthesizeSpeechConfig) Reset()         { *m = SynthesizeSpeechConfig{}
 func (m *SynthesizeSpeechConfig) String() string { return proto.CompactTextString(m) }
 func (*SynthesizeSpeechConfig) ProtoMessage()    {}
 func (*SynthesizeSpeechConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{2}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{2}
 }
+
 func (m *SynthesizeSpeechConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesizeSpeechConfig.Unmarshal(m, b)
 }
 func (m *SynthesizeSpeechConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesizeSpeechConfig.Marshal(b, m, deterministic)
 }
-func (dst *SynthesizeSpeechConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesizeSpeechConfig.Merge(dst, src)
+func (m *SynthesizeSpeechConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechConfig.Merge(m, src)
 }
 func (m *SynthesizeSpeechConfig) XXX_Size() int {
 	return xxx_messageInfo_SynthesizeSpeechConfig.Size(m)
@@ -500,16 +514,17 @@ func (m *OutputAudioConfig) Reset()         { *m = OutputAudioConfig{} }
 func (m *OutputAudioConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputAudioConfig) ProtoMessage()    {}
 func (*OutputAudioConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audio_config_e6cfe6aed50d3b5d, []int{3}
+	return fileDescriptor_80617ff5f6b0e1c6, []int{3}
 }
+
 func (m *OutputAudioConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputAudioConfig.Unmarshal(m, b)
 }
 func (m *OutputAudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputAudioConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputAudioConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputAudioConfig.Merge(dst, src)
+func (m *OutputAudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputAudioConfig.Merge(m, src)
 }
 func (m *OutputAudioConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputAudioConfig.Size(m)
@@ -542,21 +557,21 @@ func (m *OutputAudioConfig) GetSynthesizeSpeechConfig() *SynthesizeSpeechConfig
 }
 
 func init() {
-	proto.RegisterType((*InputAudioConfig)(nil), "google.cloud.dialogflow.v2beta1.InputAudioConfig")
-	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.dialogflow.v2beta1.VoiceSelectionParams")
-	proto.RegisterType((*SynthesizeSpeechConfig)(nil), "google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig")
-	proto.RegisterType((*OutputAudioConfig)(nil), "google.cloud.dialogflow.v2beta1.OutputAudioConfig")
 	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
 	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.SpeechModelVariant", SpeechModelVariant_name, SpeechModelVariant_value)
 	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
 	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.OutputAudioEncoding", OutputAudioEncoding_name, OutputAudioEncoding_value)
+	proto.RegisterType((*InputAudioConfig)(nil), "google.cloud.dialogflow.v2beta1.InputAudioConfig")
+	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.dialogflow.v2beta1.VoiceSelectionParams")
+	proto.RegisterType((*SynthesizeSpeechConfig)(nil), "google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig")
+	proto.RegisterType((*OutputAudioConfig)(nil), "google.cloud.dialogflow.v2beta1.OutputAudioConfig")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/audio_config.proto", fileDescriptor_audio_config_e6cfe6aed50d3b5d)
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/audio_config.proto", fileDescriptor_80617ff5f6b0e1c6)
 }
 
-var fileDescriptor_audio_config_e6cfe6aed50d3b5d = []byte{
+var fileDescriptor_80617ff5f6b0e1c6 = []byte{
 	// 920 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0xe3, 0x44,
 	0x14, 0xc7, 0x4e, 0xbb, 0xab, 0xbe, 0xa6, 0x5d, 0xef, 0x6c, 0xe9, 0xba, 0xa5, 0xdd, 0xa6, 0xed,
diff --git a/googleapis/cloud/dialogflow/v2beta1/context.pb.go b/googleapis/cloud/dialogflow/v2beta1/context.pb.go
index 0a4ad269f4..f9ebbada6c 100644
--- a/googleapis/cloud/dialogflow/v2beta1/context.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/context.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/context.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a context.
 type Context struct {
@@ -59,16 +59,17 @@ func (m *Context) Reset()         { *m = Context{} }
 func (m *Context) String() string { return proto.CompactTextString(m) }
 func (*Context) ProtoMessage()    {}
 func (*Context) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{0}
+	return fileDescriptor_ff2c900db64d4fc9, []int{0}
 }
+
 func (m *Context) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Context.Unmarshal(m, b)
 }
 func (m *Context) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Context.Marshal(b, m, deterministic)
 }
-func (dst *Context) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Context.Merge(dst, src)
+func (m *Context) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Context.Merge(m, src)
 }
 func (m *Context) XXX_Size() int {
 	return xxx_messageInfo_Context.Size(m)
@@ -123,16 +124,17 @@ func (m *ListContextsRequest) Reset()         { *m = ListContextsRequest{} }
 func (m *ListContextsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListContextsRequest) ProtoMessage()    {}
 func (*ListContextsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{1}
+	return fileDescriptor_ff2c900db64d4fc9, []int{1}
 }
+
 func (m *ListContextsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListContextsRequest.Unmarshal(m, b)
 }
 func (m *ListContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListContextsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListContextsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListContextsRequest.Merge(dst, src)
+func (m *ListContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsRequest.Merge(m, src)
 }
 func (m *ListContextsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListContextsRequest.Size(m)
@@ -181,16 +183,17 @@ func (m *ListContextsResponse) Reset()         { *m = ListContextsResponse{} }
 func (m *ListContextsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListContextsResponse) ProtoMessage()    {}
 func (*ListContextsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{2}
+	return fileDescriptor_ff2c900db64d4fc9, []int{2}
 }
+
 func (m *ListContextsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListContextsResponse.Unmarshal(m, b)
 }
 func (m *ListContextsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListContextsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListContextsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListContextsResponse.Merge(dst, src)
+func (m *ListContextsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsResponse.Merge(m, src)
 }
 func (m *ListContextsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListContextsResponse.Size(m)
@@ -233,16 +236,17 @@ func (m *GetContextRequest) Reset()         { *m = GetContextRequest{} }
 func (m *GetContextRequest) String() string { return proto.CompactTextString(m) }
 func (*GetContextRequest) ProtoMessage()    {}
 func (*GetContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{3}
+	return fileDescriptor_ff2c900db64d4fc9, []int{3}
 }
+
 func (m *GetContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetContextRequest.Unmarshal(m, b)
 }
 func (m *GetContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetContextRequest.Merge(dst, src)
+func (m *GetContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetContextRequest.Merge(m, src)
 }
 func (m *GetContextRequest) XXX_Size() int {
 	return xxx_messageInfo_GetContextRequest.Size(m)
@@ -280,16 +284,17 @@ func (m *CreateContextRequest) Reset()         { *m = CreateContextRequest{} }
 func (m *CreateContextRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateContextRequest) ProtoMessage()    {}
 func (*CreateContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{4}
+	return fileDescriptor_ff2c900db64d4fc9, []int{4}
 }
+
 func (m *CreateContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateContextRequest.Unmarshal(m, b)
 }
 func (m *CreateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateContextRequest.Merge(dst, src)
+func (m *CreateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateContextRequest.Merge(m, src)
 }
 func (m *CreateContextRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateContextRequest.Size(m)
@@ -329,16 +334,17 @@ func (m *UpdateContextRequest) Reset()         { *m = UpdateContextRequest{} }
 func (m *UpdateContextRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateContextRequest) ProtoMessage()    {}
 func (*UpdateContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{5}
+	return fileDescriptor_ff2c900db64d4fc9, []int{5}
 }
+
 func (m *UpdateContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateContextRequest.Unmarshal(m, b)
 }
 func (m *UpdateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateContextRequest.Merge(dst, src)
+func (m *UpdateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateContextRequest.Merge(m, src)
 }
 func (m *UpdateContextRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateContextRequest.Size(m)
@@ -381,16 +387,17 @@ func (m *DeleteContextRequest) Reset()         { *m = DeleteContextRequest{} }
 func (m *DeleteContextRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteContextRequest) ProtoMessage()    {}
 func (*DeleteContextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{6}
+	return fileDescriptor_ff2c900db64d4fc9, []int{6}
 }
+
 func (m *DeleteContextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteContextRequest.Unmarshal(m, b)
 }
 func (m *DeleteContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteContextRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteContextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteContextRequest.Merge(dst, src)
+func (m *DeleteContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteContextRequest.Merge(m, src)
 }
 func (m *DeleteContextRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteContextRequest.Size(m)
@@ -425,16 +432,17 @@ func (m *DeleteAllContextsRequest) Reset()         { *m = DeleteAllContextsReque
 func (m *DeleteAllContextsRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAllContextsRequest) ProtoMessage()    {}
 func (*DeleteAllContextsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_context_4c18307a7450af94, []int{7}
+	return fileDescriptor_ff2c900db64d4fc9, []int{7}
 }
+
 func (m *DeleteAllContextsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAllContextsRequest.Unmarshal(m, b)
 }
 func (m *DeleteAllContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAllContextsRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAllContextsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAllContextsRequest.Merge(dst, src)
+func (m *DeleteAllContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAllContextsRequest.Merge(m, src)
 }
 func (m *DeleteAllContextsRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAllContextsRequest.Size(m)
@@ -463,6 +471,66 @@ func init() {
 	proto.RegisterType((*DeleteAllContextsRequest)(nil), "google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/context.proto", fileDescriptor_ff2c900db64d4fc9)
+}
+
+var fileDescriptor_ff2c900db64d4fc9 = []byte{
+	// 817 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x6b, 0x1b, 0x47,
+	0x18, 0x66, 0xd6, 0xad, 0x3f, 0xc6, 0x56, 0x8b, 0xa7, 0xc2, 0x55, 0x65, 0x17, 0x8b, 0x2d, 0x6d,
+	0x85, 0xa0, 0xbb, 0x74, 0xfb, 0x45, 0x6b, 0x5a, 0xa8, 0xa5, 0xda, 0x14, 0x6a, 0x6a, 0xe4, 0xba,
+	0x14, 0x5f, 0xd4, 0xb1, 0xf4, 0x6a, 0xd9, 0x78, 0x35, 0xb3, 0xd9, 0x99, 0x75, 0x1c, 0x07, 0x5f,
+	0x42, 0x2e, 0xb9, 0x84, 0x40, 0x08, 0x39, 0xe4, 0x66, 0xc8, 0xc5, 0xb9, 0xe5, 0x6f, 0xe4, 0x98,
+	0xbf, 0x90, 0x3f, 0x90, 0x5b, 0x72, 0x08, 0x84, 0xdd, 0x9d, 0xd5, 0x4a, 0xd6, 0x3a, 0xd2, 0x1a,
+	0x9f, 0xb4, 0xfb, 0x7e, 0xcd, 0xf3, 0xbc, 0xf3, 0xbc, 0xaf, 0x16, 0x7f, 0x63, 0x73, 0x6e, 0xbb,
+	0x60, 0xb6, 0x5d, 0x1e, 0x74, 0xcc, 0x8e, 0x43, 0x5d, 0x6e, 0x77, 0x5d, 0x7e, 0xc3, 0x3c, 0xb4,
+	0xf6, 0x41, 0xd2, 0x6f, 0xcd, 0x36, 0x67, 0x12, 0x8e, 0xa4, 0xe1, 0xf9, 0x5c, 0x72, 0xb2, 0x1a,
+	0x87, 0x1b, 0x51, 0xb8, 0x91, 0x86, 0x1b, 0x2a, 0xbc, 0xbc, 0xa2, 0xea, 0x51, 0xcf, 0x31, 0x29,
+	0x63, 0x5c, 0x52, 0xe9, 0x70, 0x26, 0xe2, 0xf4, 0xf2, 0x67, 0x03, 0x5e, 0x1f, 0x04, 0x0f, 0xfc,
+	0x36, 0x28, 0xd7, 0xb2, 0x72, 0x45, 0x6f, 0xfb, 0x41, 0xd7, 0x84, 0x9e, 0x27, 0x6f, 0x2a, 0x67,
+	0xe5, 0xbc, 0xb3, 0xeb, 0x80, 0xdb, 0x69, 0xf5, 0xa8, 0x38, 0x50, 0x11, 0x2b, 0xe7, 0x23, 0x84,
+	0xf4, 0x83, 0xb6, 0x82, 0xad, 0x9f, 0xe0, 0x99, 0x7a, 0xcc, 0x83, 0x10, 0xfc, 0x01, 0xa3, 0x3d,
+	0x28, 0xa1, 0x0a, 0xaa, 0xce, 0x35, 0xa3, 0x67, 0xf2, 0x25, 0xfe, 0xc8, 0x75, 0xba, 0x20, 0x3c,
+	0xca, 0x5a, 0x6d, 0x1e, 0x30, 0x59, 0xd2, 0x2a, 0xa8, 0xfa, 0x61, 0xb3, 0x90, 0x58, 0xeb, 0xa1,
+	0x91, 0xfc, 0x84, 0xb1, 0x47, 0x7d, 0xda, 0x03, 0x09, 0xbe, 0x28, 0x4d, 0x55, 0x50, 0x75, 0xde,
+	0xfa, 0xd4, 0x50, 0x1d, 0x49, 0x0e, 0x36, 0x76, 0xa2, 0x83, 0x9b, 0x03, 0xa1, 0xba, 0x83, 0x3f,
+	0xf9, 0xcb, 0x11, 0x52, 0x41, 0x10, 0x4d, 0xb8, 0x1e, 0x80, 0x90, 0x64, 0x09, 0x4f, 0x7b, 0xd4,
+	0x07, 0x26, 0x15, 0x18, 0xf5, 0x46, 0x96, 0xf1, 0x9c, 0x47, 0x6d, 0x68, 0x09, 0xe7, 0x18, 0x14,
+	0x92, 0xd9, 0xd0, 0xb0, 0xe3, 0x1c, 0x03, 0xf9, 0x3c, 0x04, 0x61, 0x43, 0x4b, 0xf2, 0x03, 0x60,
+	0x11, 0x88, 0xb9, 0x66, 0x14, 0xfe, 0x4f, 0x68, 0xd0, 0xef, 0x20, 0x5c, 0x1c, 0x3e, 0x4b, 0x78,
+	0x9c, 0x09, 0x20, 0x0d, 0x3c, 0xab, 0xae, 0x52, 0x94, 0x50, 0x65, 0xaa, 0x3a, 0x6f, 0x55, 0x8d,
+	0x31, 0x97, 0x69, 0xa8, 0x22, 0xcd, 0x7e, 0x26, 0xf9, 0x0a, 0x7f, 0xcc, 0xe0, 0x48, 0xb6, 0x06,
+	0x20, 0x68, 0x11, 0x84, 0x42, 0x68, 0xde, 0xee, 0xc3, 0xf8, 0x1a, 0x2f, 0x6e, 0x42, 0x02, 0x22,
+	0xe1, 0x9b, 0xd1, 0x7a, 0xdd, 0xc7, 0xc5, 0xba, 0x0f, 0x54, 0xc2, 0xb9, 0xd8, 0x8b, 0x7a, 0xb3,
+	0x8e, 0x67, 0x14, 0x98, 0xe8, 0xe0, 0x3c, 0x2c, 0x92, 0x44, 0xfd, 0x11, 0xc2, 0xc5, 0x5d, 0xaf,
+	0x33, 0x7a, 0xe8, 0x40, 0x71, 0x74, 0xc9, 0xe2, 0x64, 0x0d, 0xcf, 0x07, 0x51, 0xed, 0x48, 0x9d,
+	0x0a, 0x64, 0x79, 0x44, 0x25, 0x1b, 0xa1, 0x80, 0xb7, 0xa8, 0x38, 0x68, 0xe2, 0x38, 0x3c, 0x7c,
+	0xd6, 0x6b, 0xb8, 0xd8, 0x00, 0x17, 0x46, 0x80, 0x65, 0x75, 0xce, 0xc2, 0xa5, 0x38, 0xf6, 0x77,
+	0xd7, 0x9d, 0x50, 0x59, 0xd6, 0xf3, 0x05, 0x3c, 0x9b, 0xc4, 0x92, 0x7b, 0x1a, 0x5e, 0x18, 0x94,
+	0x0a, 0xf9, 0x7e, 0x2c, 0xdb, 0x0c, 0x15, 0x97, 0x7f, 0xc8, 0x99, 0x15, 0xeb, 0x51, 0xbf, 0x8f,
+	0x6e, 0xbf, 0x78, 0xf9, 0x40, 0xbb, 0x8b, 0xc8, 0x8f, 0xfd, 0x5d, 0x73, 0x2b, 0x86, 0xf9, 0xab,
+	0xe7, 0xf3, 0x6b, 0xd0, 0x96, 0xc2, 0xac, 0x99, 0xd4, 0x06, 0x26, 0x4d, 0x01, 0x42, 0x84, 0x6b,
+	0xc4, 0xac, 0x9d, 0x24, 0x0b, 0x49, 0xec, 0xfd, 0x4d, 0xb6, 0xc6, 0x67, 0x02, 0x3b, 0x74, 0x7c,
+	0xce, 0x7a, 0xc0, 0x22, 0x63, 0x20, 0xc0, 0x0f, 0x7f, 0xb3, 0x0a, 0x92, 0xb7, 0x08, 0xe3, 0x54,
+	0xb5, 0xc4, 0x1a, 0x4b, 0x6c, 0x44, 0xe2, 0xe5, 0x89, 0x05, 0x93, 0xcd, 0x3f, 0xbc, 0xd8, 0xf7,
+	0xb1, 0xef, 0x63, 0x35, 0x6b, 0x27, 0xc3, 0xfc, 0xb3, 0x33, 0xc7, 0xb2, 0x1f, 0x2c, 0x48, 0x1e,
+	0x6a, 0xb8, 0x30, 0x34, 0x8c, 0x64, 0xfc, 0xdd, 0x66, 0x0d, 0x6f, 0x8e, 0x2e, 0x9c, 0xc6, 0x5d,
+	0x78, 0x8c, 0xf4, 0x4b, 0xaa, 0xe0, 0x97, 0x64, 0xf0, 0xf6, 0xfe, 0xd3, 0xaf, 0x56, 0x0e, 0xfd,
+	0xca, 0xe4, 0x89, 0x86, 0x0b, 0x43, 0xfb, 0x62, 0x82, 0xbe, 0x64, 0xed, 0x97, 0x1c, 0x7d, 0x79,
+	0x16, 0xf7, 0xe5, 0x29, 0xb2, 0x7e, 0x4b, 0x49, 0x25, 0x7f, 0xc5, 0x79, 0x54, 0x92, 0xf6, 0xe7,
+	0x7f, 0x6b, 0x77, 0xd2, 0x52, 0xb9, 0x64, 0x93, 0xf6, 0xe9, 0x15, 0xc2, 0x85, 0xa1, 0xf5, 0x35,
+	0x41, 0x9f, 0xb2, 0xd6, 0x5d, 0x79, 0x69, 0x64, 0x5d, 0xfe, 0x11, 0x7e, 0x0c, 0xa4, 0x33, 0x53,
+	0xbb, 0xf4, 0xcc, 0xd4, 0xae, 0x78, 0x66, 0xde, 0x20, 0xbc, 0x38, 0xb2, 0x86, 0xc9, 0xcf, 0x13,
+	0xf2, 0x1e, 0x5d, 0xdd, 0xf9, 0xb8, 0xe7, 0xdb, 0x97, 0xb5, 0xab, 0x1d, 0x90, 0xf5, 0x33, 0x84,
+	0xbf, 0x68, 0xf3, 0xde, 0x38, 0xae, 0xeb, 0x0b, 0x8a, 0xe3, 0x76, 0xc8, 0x68, 0x1b, 0xed, 0xfd,
+	0xa9, 0x12, 0x6c, 0xee, 0x52, 0x66, 0x1b, 0xdc, 0xb7, 0x4d, 0x1b, 0x58, 0xc4, 0xd7, 0x8c, 0x5d,
+	0xd4, 0x73, 0xc4, 0x85, 0x9f, 0xa4, 0x6b, 0xa9, 0xe9, 0x35, 0x42, 0xa7, 0x9a, 0xd6, 0xd8, 0x38,
+	0xd3, 0x56, 0x37, 0xe3, 0x9a, 0xf5, 0x08, 0x44, 0x23, 0x05, 0xf1, 0x6f, 0x9c, 0xb4, 0x3f, 0x1d,
+	0xd5, 0xff, 0xee, 0x5d, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x1c, 0x8a, 0x0f, 0xf1, 0x0a, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -715,63 +783,3 @@ var _Contexts_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2beta1/context.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/context.proto", fileDescriptor_context_4c18307a7450af94)
-}
-
-var fileDescriptor_context_4c18307a7450af94 = []byte{
-	// 817 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x6b, 0x1b, 0x47,
-	0x18, 0x66, 0xd6, 0xad, 0x3f, 0xc6, 0x56, 0x8b, 0xa7, 0xc2, 0x55, 0x65, 0x17, 0x8b, 0x2d, 0x6d,
-	0x85, 0xa0, 0xbb, 0x74, 0xfb, 0x45, 0x6b, 0x5a, 0xa8, 0xa5, 0xda, 0x14, 0x6a, 0x6a, 0xe4, 0xba,
-	0x14, 0x5f, 0xd4, 0xb1, 0xf4, 0x6a, 0xd9, 0x78, 0x35, 0xb3, 0xd9, 0x99, 0x75, 0x1c, 0x07, 0x5f,
-	0x42, 0x2e, 0xb9, 0x84, 0x40, 0x08, 0x39, 0xe4, 0x66, 0xc8, 0xc5, 0xb9, 0xe5, 0x6f, 0xe4, 0x98,
-	0xbf, 0x90, 0x3f, 0x90, 0x5b, 0x72, 0x08, 0x84, 0xdd, 0x9d, 0xd5, 0x4a, 0xd6, 0x3a, 0xd2, 0x1a,
-	0x9f, 0xb4, 0xfb, 0x7e, 0xcd, 0xf3, 0xbc, 0xf3, 0xbc, 0xaf, 0x16, 0x7f, 0x63, 0x73, 0x6e, 0xbb,
-	0x60, 0xb6, 0x5d, 0x1e, 0x74, 0xcc, 0x8e, 0x43, 0x5d, 0x6e, 0x77, 0x5d, 0x7e, 0xc3, 0x3c, 0xb4,
-	0xf6, 0x41, 0xd2, 0x6f, 0xcd, 0x36, 0x67, 0x12, 0x8e, 0xa4, 0xe1, 0xf9, 0x5c, 0x72, 0xb2, 0x1a,
-	0x87, 0x1b, 0x51, 0xb8, 0x91, 0x86, 0x1b, 0x2a, 0xbc, 0xbc, 0xa2, 0xea, 0x51, 0xcf, 0x31, 0x29,
-	0x63, 0x5c, 0x52, 0xe9, 0x70, 0x26, 0xe2, 0xf4, 0xf2, 0x67, 0x03, 0x5e, 0x1f, 0x04, 0x0f, 0xfc,
-	0x36, 0x28, 0xd7, 0xb2, 0x72, 0x45, 0x6f, 0xfb, 0x41, 0xd7, 0x84, 0x9e, 0x27, 0x6f, 0x2a, 0x67,
-	0xe5, 0xbc, 0xb3, 0xeb, 0x80, 0xdb, 0x69, 0xf5, 0xa8, 0x38, 0x50, 0x11, 0x2b, 0xe7, 0x23, 0x84,
-	0xf4, 0x83, 0xb6, 0x82, 0xad, 0x9f, 0xe0, 0x99, 0x7a, 0xcc, 0x83, 0x10, 0xfc, 0x01, 0xa3, 0x3d,
-	0x28, 0xa1, 0x0a, 0xaa, 0xce, 0x35, 0xa3, 0x67, 0xf2, 0x25, 0xfe, 0xc8, 0x75, 0xba, 0x20, 0x3c,
-	0xca, 0x5a, 0x6d, 0x1e, 0x30, 0x59, 0xd2, 0x2a, 0xa8, 0xfa, 0x61, 0xb3, 0x90, 0x58, 0xeb, 0xa1,
-	0x91, 0xfc, 0x84, 0xb1, 0x47, 0x7d, 0xda, 0x03, 0x09, 0xbe, 0x28, 0x4d, 0x55, 0x50, 0x75, 0xde,
-	0xfa, 0xd4, 0x50, 0x1d, 0x49, 0x0e, 0x36, 0x76, 0xa2, 0x83, 0x9b, 0x03, 0xa1, 0xba, 0x83, 0x3f,
-	0xf9, 0xcb, 0x11, 0x52, 0x41, 0x10, 0x4d, 0xb8, 0x1e, 0x80, 0x90, 0x64, 0x09, 0x4f, 0x7b, 0xd4,
-	0x07, 0x26, 0x15, 0x18, 0xf5, 0x46, 0x96, 0xf1, 0x9c, 0x47, 0x6d, 0x68, 0x09, 0xe7, 0x18, 0x14,
-	0x92, 0xd9, 0xd0, 0xb0, 0xe3, 0x1c, 0x03, 0xf9, 0x3c, 0x04, 0x61, 0x43, 0x4b, 0xf2, 0x03, 0x60,
-	0x11, 0x88, 0xb9, 0x66, 0x14, 0xfe, 0x4f, 0x68, 0xd0, 0xef, 0x20, 0x5c, 0x1c, 0x3e, 0x4b, 0x78,
-	0x9c, 0x09, 0x20, 0x0d, 0x3c, 0xab, 0xae, 0x52, 0x94, 0x50, 0x65, 0xaa, 0x3a, 0x6f, 0x55, 0x8d,
-	0x31, 0x97, 0x69, 0xa8, 0x22, 0xcd, 0x7e, 0x26, 0xf9, 0x0a, 0x7f, 0xcc, 0xe0, 0x48, 0xb6, 0x06,
-	0x20, 0x68, 0x11, 0x84, 0x42, 0x68, 0xde, 0xee, 0xc3, 0xf8, 0x1a, 0x2f, 0x6e, 0x42, 0x02, 0x22,
-	0xe1, 0x9b, 0xd1, 0x7a, 0xdd, 0xc7, 0xc5, 0xba, 0x0f, 0x54, 0xc2, 0xb9, 0xd8, 0x8b, 0x7a, 0xb3,
-	0x8e, 0x67, 0x14, 0x98, 0xe8, 0xe0, 0x3c, 0x2c, 0x92, 0x44, 0xfd, 0x11, 0xc2, 0xc5, 0x5d, 0xaf,
-	0x33, 0x7a, 0xe8, 0x40, 0x71, 0x74, 0xc9, 0xe2, 0x64, 0x0d, 0xcf, 0x07, 0x51, 0xed, 0x48, 0x9d,
-	0x0a, 0x64, 0x79, 0x44, 0x25, 0x1b, 0xa1, 0x80, 0xb7, 0xa8, 0x38, 0x68, 0xe2, 0x38, 0x3c, 0x7c,
-	0xd6, 0x6b, 0xb8, 0xd8, 0x00, 0x17, 0x46, 0x80, 0x65, 0x75, 0xce, 0xc2, 0xa5, 0x38, 0xf6, 0x77,
-	0xd7, 0x9d, 0x50, 0x59, 0xd6, 0xf3, 0x05, 0x3c, 0x9b, 0xc4, 0x92, 0x7b, 0x1a, 0x5e, 0x18, 0x94,
-	0x0a, 0xf9, 0x7e, 0x2c, 0xdb, 0x0c, 0x15, 0x97, 0x7f, 0xc8, 0x99, 0x15, 0xeb, 0x51, 0xbf, 0x8f,
-	0x6e, 0xbf, 0x78, 0xf9, 0x40, 0xbb, 0x8b, 0xc8, 0x8f, 0xfd, 0x5d, 0x73, 0x2b, 0x86, 0xf9, 0xab,
-	0xe7, 0xf3, 0x6b, 0xd0, 0x96, 0xc2, 0xac, 0x99, 0xd4, 0x06, 0x26, 0x4d, 0x01, 0x42, 0x84, 0x6b,
-	0xc4, 0xac, 0x9d, 0x24, 0x0b, 0x49, 0xec, 0xfd, 0x4d, 0xb6, 0xc6, 0x67, 0x02, 0x3b, 0x74, 0x7c,
-	0xce, 0x7a, 0xc0, 0x22, 0x63, 0x20, 0xc0, 0x0f, 0x7f, 0xb3, 0x0a, 0x92, 0xb7, 0x08, 0xe3, 0x54,
-	0xb5, 0xc4, 0x1a, 0x4b, 0x6c, 0x44, 0xe2, 0xe5, 0x89, 0x05, 0x93, 0xcd, 0x3f, 0xbc, 0xd8, 0xf7,
-	0xb1, 0xef, 0x63, 0x35, 0x6b, 0x27, 0xc3, 0xfc, 0xb3, 0x33, 0xc7, 0xb2, 0x1f, 0x2c, 0x48, 0x1e,
-	0x6a, 0xb8, 0x30, 0x34, 0x8c, 0x64, 0xfc, 0xdd, 0x66, 0x0d, 0x6f, 0x8e, 0x2e, 0x9c, 0xc6, 0x5d,
-	0x78, 0x8c, 0xf4, 0x4b, 0xaa, 0xe0, 0x97, 0x64, 0xf0, 0xf6, 0xfe, 0xd3, 0xaf, 0x56, 0x0e, 0xfd,
-	0xca, 0xe4, 0x89, 0x86, 0x0b, 0x43, 0xfb, 0x62, 0x82, 0xbe, 0x64, 0xed, 0x97, 0x1c, 0x7d, 0x79,
-	0x16, 0xf7, 0xe5, 0x29, 0xb2, 0x7e, 0x4b, 0x49, 0x25, 0x7f, 0xc5, 0x79, 0x54, 0x92, 0xf6, 0xe7,
-	0x7f, 0x6b, 0x77, 0xd2, 0x52, 0xb9, 0x64, 0x93, 0xf6, 0xe9, 0x15, 0xc2, 0x85, 0xa1, 0xf5, 0x35,
-	0x41, 0x9f, 0xb2, 0xd6, 0x5d, 0x79, 0x69, 0x64, 0x5d, 0xfe, 0x11, 0x7e, 0x0c, 0xa4, 0x33, 0x53,
-	0xbb, 0xf4, 0xcc, 0xd4, 0xae, 0x78, 0x66, 0xde, 0x20, 0xbc, 0x38, 0xb2, 0x86, 0xc9, 0xcf, 0x13,
-	0xf2, 0x1e, 0x5d, 0xdd, 0xf9, 0xb8, 0xe7, 0xdb, 0x97, 0xb5, 0xab, 0x1d, 0x90, 0xf5, 0x33, 0x84,
-	0xbf, 0x68, 0xf3, 0xde, 0x38, 0xae, 0xeb, 0x0b, 0x8a, 0xe3, 0x76, 0xc8, 0x68, 0x1b, 0xed, 0xfd,
-	0xa9, 0x12, 0x6c, 0xee, 0x52, 0x66, 0x1b, 0xdc, 0xb7, 0x4d, 0x1b, 0x58, 0xc4, 0xd7, 0x8c, 0x5d,
-	0xd4, 0x73, 0xc4, 0x85, 0x9f, 0xa4, 0x6b, 0xa9, 0xe9, 0x35, 0x42, 0xa7, 0x9a, 0xd6, 0xd8, 0x38,
-	0xd3, 0x56, 0x37, 0xe3, 0x9a, 0xf5, 0x08, 0x44, 0x23, 0x05, 0xf1, 0x6f, 0x9c, 0xb4, 0x3f, 0x1d,
-	0xd5, 0xff, 0xee, 0x5d, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x1c, 0x8a, 0x0f, 0xf1, 0x0a, 0x00,
-	0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/document.pb.go b/googleapis/cloud/dialogflow/v2beta1/document.pb.go
index 3000e66f4c..b953a91374 100644
--- a/googleapis/cloud/dialogflow/v2beta1/document.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/document.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/document.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The knowledge type of document content.
 type Document_KnowledgeType int32
@@ -52,6 +52,7 @@ var Document_KnowledgeType_name = map[int32]string{
 	1: "FAQ",
 	2: "EXTRACTIVE_QA",
 }
+
 var Document_KnowledgeType_value = map[string]int32{
 	"KNOWLEDGE_TYPE_UNSPECIFIED": 0,
 	"FAQ":                        1,
@@ -61,8 +62,9 @@ var Document_KnowledgeType_value = map[string]int32{
 func (x Document_KnowledgeType) String() string {
 	return proto.EnumName(Document_KnowledgeType_name, int32(x))
 }
+
 func (Document_KnowledgeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{0, 0}
+	return fileDescriptor_2d3494516d3ece6c, []int{0, 0}
 }
 
 // States of the operation.
@@ -85,6 +87,7 @@ var KnowledgeOperationMetadata_State_name = map[int32]string{
 	2: "RUNNING",
 	3: "DONE",
 }
+
 var KnowledgeOperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"PENDING":           1,
@@ -95,8 +98,9 @@ var KnowledgeOperationMetadata_State_value = map[string]int32{
 func (x KnowledgeOperationMetadata_State) String() string {
 	return proto.EnumName(KnowledgeOperationMetadata_State_name, int32(x))
 }
+
 func (KnowledgeOperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{7, 0}
+	return fileDescriptor_2d3494516d3ece6c, []int{7, 0}
 }
 
 // A document resource.
@@ -132,16 +136,17 @@ func (m *Document) Reset()         { *m = Document{} }
 func (m *Document) String() string { return proto.CompactTextString(m) }
 func (*Document) ProtoMessage()    {}
 func (*Document) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{0}
+	return fileDescriptor_2d3494516d3ece6c, []int{0}
 }
+
 func (m *Document) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Document.Unmarshal(m, b)
 }
 func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
 }
-func (dst *Document) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Document.Merge(dst, src)
+func (m *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(m, src)
 }
 func (m *Document) XXX_Size() int {
 	return xxx_messageInfo_Document.Size(m)
@@ -216,6 +221,7 @@ func (m *Document) GetContentUri() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (m *Document) GetContent() string {
 	if x, ok := m.GetSource().(*Document_Content); ok {
 		return x.Content
@@ -230,87 +236,15 @@ func (m *Document) GetRawContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Document) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Document_OneofMarshaler, _Document_OneofUnmarshaler, _Document_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Document) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Document_ContentUri)(nil),
 		(*Document_Content)(nil),
 		(*Document_RawContent)(nil),
 	}
 }
 
-func _Document_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_ContentUri:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ContentUri)
-	case *Document_Content:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Content)
-	case *Document_RawContent:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.RawContent)
-	case nil:
-	default:
-		return fmt.Errorf("Document.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Document_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Document)
-	switch tag {
-	case 5: // source.content_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_ContentUri{x}
-		return true, err
-	case 6: // source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_Content{x}
-		return true, err
-	case 9: // source.raw_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Source = &Document_RawContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Document_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_ContentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ContentUri)))
-		n += len(x.ContentUri)
-	case *Document_Content:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case *Document_RawContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RawContent)))
-		n += len(x.RawContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for [Documents.ListDocuments][google.cloud.dialogflow.v2beta1.Documents.ListDocuments].
 type ListDocumentsRequest struct {
 	// Required. The knowledge base to list all documents for.
@@ -330,16 +264,17 @@ func (m *ListDocumentsRequest) Reset()         { *m = ListDocumentsRequest{} }
 func (m *ListDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDocumentsRequest) ProtoMessage()    {}
 func (*ListDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{1}
+	return fileDescriptor_2d3494516d3ece6c, []int{1}
 }
+
 func (m *ListDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ListDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDocumentsRequest.Merge(dst, src)
+func (m *ListDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsRequest.Merge(m, src)
 }
 func (m *ListDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDocumentsRequest.Size(m)
@@ -387,16 +322,17 @@ func (m *ListDocumentsResponse) Reset()         { *m = ListDocumentsResponse{} }
 func (m *ListDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDocumentsResponse) ProtoMessage()    {}
 func (*ListDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{2}
+	return fileDescriptor_2d3494516d3ece6c, []int{2}
 }
+
 func (m *ListDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDocumentsResponse.Unmarshal(m, b)
 }
 func (m *ListDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDocumentsResponse.Merge(dst, src)
+func (m *ListDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsResponse.Merge(m, src)
 }
 func (m *ListDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDocumentsResponse.Size(m)
@@ -436,16 +372,17 @@ func (m *GetDocumentRequest) Reset()         { *m = GetDocumentRequest{} }
 func (m *GetDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDocumentRequest) ProtoMessage()    {}
 func (*GetDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{3}
+	return fileDescriptor_2d3494516d3ece6c, []int{3}
 }
+
 func (m *GetDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDocumentRequest.Unmarshal(m, b)
 }
 func (m *GetDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDocumentRequest.Merge(dst, src)
+func (m *GetDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDocumentRequest.Merge(m, src)
 }
 func (m *GetDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDocumentRequest.Size(m)
@@ -479,16 +416,17 @@ func (m *CreateDocumentRequest) Reset()         { *m = CreateDocumentRequest{} }
 func (m *CreateDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDocumentRequest) ProtoMessage()    {}
 func (*CreateDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{4}
+	return fileDescriptor_2d3494516d3ece6c, []int{4}
 }
+
 func (m *CreateDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDocumentRequest.Unmarshal(m, b)
 }
 func (m *CreateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDocumentRequest.Merge(dst, src)
+func (m *CreateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDocumentRequest.Merge(m, src)
 }
 func (m *CreateDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDocumentRequest.Size(m)
@@ -528,16 +466,17 @@ func (m *DeleteDocumentRequest) Reset()         { *m = DeleteDocumentRequest{} }
 func (m *DeleteDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDocumentRequest) ProtoMessage()    {}
 func (*DeleteDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{5}
+	return fileDescriptor_2d3494516d3ece6c, []int{5}
 }
+
 func (m *DeleteDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDocumentRequest.Unmarshal(m, b)
 }
 func (m *DeleteDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDocumentRequest.Merge(dst, src)
+func (m *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDocumentRequest.Merge(m, src)
 }
 func (m *DeleteDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDocumentRequest.Size(m)
@@ -572,16 +511,17 @@ func (m *UpdateDocumentRequest) Reset()         { *m = UpdateDocumentRequest{} }
 func (m *UpdateDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDocumentRequest) ProtoMessage()    {}
 func (*UpdateDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{6}
+	return fileDescriptor_2d3494516d3ece6c, []int{6}
 }
+
 func (m *UpdateDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDocumentRequest.Unmarshal(m, b)
 }
 func (m *UpdateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDocumentRequest.Merge(dst, src)
+func (m *UpdateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDocumentRequest.Merge(m, src)
 }
 func (m *UpdateDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDocumentRequest.Size(m)
@@ -619,16 +559,17 @@ func (m *KnowledgeOperationMetadata) Reset()         { *m = KnowledgeOperationMe
 func (m *KnowledgeOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*KnowledgeOperationMetadata) ProtoMessage()    {}
 func (*KnowledgeOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{7}
+	return fileDescriptor_2d3494516d3ece6c, []int{7}
 }
+
 func (m *KnowledgeOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KnowledgeOperationMetadata.Unmarshal(m, b)
 }
 func (m *KnowledgeOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KnowledgeOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *KnowledgeOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KnowledgeOperationMetadata.Merge(dst, src)
+func (m *KnowledgeOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeOperationMetadata.Merge(m, src)
 }
 func (m *KnowledgeOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_KnowledgeOperationMetadata.Size(m)
@@ -661,16 +602,17 @@ func (m *ReloadDocumentRequest) Reset()         { *m = ReloadDocumentRequest{} }
 func (m *ReloadDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*ReloadDocumentRequest) ProtoMessage()    {}
 func (*ReloadDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_b7905c72d2ee7910, []int{8}
+	return fileDescriptor_2d3494516d3ece6c, []int{8}
 }
+
 func (m *ReloadDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReloadDocumentRequest.Unmarshal(m, b)
 }
 func (m *ReloadDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReloadDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReloadDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReloadDocumentRequest.Merge(dst, src)
+func (m *ReloadDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReloadDocumentRequest.Merge(m, src)
 }
 func (m *ReloadDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_ReloadDocumentRequest.Size(m)
@@ -689,6 +631,8 @@ func (m *ReloadDocumentRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Document_KnowledgeType", Document_KnowledgeType_name, Document_KnowledgeType_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata_State", KnowledgeOperationMetadata_State_name, KnowledgeOperationMetadata_State_value)
 	proto.RegisterType((*Document)(nil), "google.cloud.dialogflow.v2beta1.Document")
 	proto.RegisterType((*ListDocumentsRequest)(nil), "google.cloud.dialogflow.v2beta1.ListDocumentsRequest")
 	proto.RegisterType((*ListDocumentsResponse)(nil), "google.cloud.dialogflow.v2beta1.ListDocumentsResponse")
@@ -698,8 +642,80 @@ func init() {
 	proto.RegisterType((*UpdateDocumentRequest)(nil), "google.cloud.dialogflow.v2beta1.UpdateDocumentRequest")
 	proto.RegisterType((*KnowledgeOperationMetadata)(nil), "google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata")
 	proto.RegisterType((*ReloadDocumentRequest)(nil), "google.cloud.dialogflow.v2beta1.ReloadDocumentRequest")
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Document_KnowledgeType", Document_KnowledgeType_name, Document_KnowledgeType_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata_State", KnowledgeOperationMetadata_State_name, KnowledgeOperationMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/document.proto", fileDescriptor_2d3494516d3ece6c)
+}
+
+var fileDescriptor_2d3494516d3ece6c = []byte{
+	// 1056 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4d, 0x6f, 0x1b, 0x45,
+	0x18, 0xce, 0x6c, 0xbe, 0x9c, 0xd7, 0x89, 0x9b, 0x8e, 0x08, 0x18, 0x97, 0xb6, 0xe9, 0x56, 0x42,
+	0xc1, 0x48, 0xbb, 0xc2, 0x15, 0x54, 0x4a, 0x55, 0x20, 0x8e, 0x9d, 0xd4, 0x4a, 0xeb, 0xb8, 0x1b,
+	0xa7, 0x85, 0x5c, 0x96, 0x89, 0x3d, 0x59, 0x6d, 0xb3, 0xde, 0x59, 0x76, 0xc6, 0x0d, 0x09, 0xaa,
+	0x04, 0x5c, 0xe0, 0x84, 0x84, 0x10, 0x27, 0x2e, 0x88, 0x0b, 0x12, 0xfc, 0x02, 0x7e, 0x07, 0x7f,
+	0x81, 0x13, 0x27, 0x8e, 0x5c, 0x10, 0x68, 0xf6, 0xcb, 0x1f, 0xdd, 0xc4, 0x4e, 0x72, 0xf3, 0xbc,
+	0x1f, 0xcf, 0x3e, 0xcf, 0xbc, 0x1f, 0x93, 0x80, 0x66, 0x31, 0x66, 0x39, 0x54, 0x6f, 0x39, 0xac,
+	0xdb, 0xd6, 0xdb, 0x36, 0x71, 0x98, 0x75, 0xe0, 0xb0, 0x23, 0xfd, 0x79, 0x69, 0x9f, 0x0a, 0xf2,
+	0x8e, 0xde, 0x66, 0xad, 0x6e, 0x87, 0xba, 0x42, 0xf3, 0x7c, 0x26, 0x18, 0xbe, 0x19, 0xc6, 0x6b,
+	0x41, 0xbc, 0xd6, 0x8b, 0xd7, 0xa2, 0xf8, 0xc2, 0x1b, 0x11, 0x20, 0xf1, 0x6c, 0x9d, 0xb8, 0x2e,
+	0x13, 0x44, 0xd8, 0xcc, 0xe5, 0x61, 0x7a, 0xe1, 0xf5, 0x3e, 0xaf, 0x4f, 0x39, 0xeb, 0xfa, 0x2d,
+	0x1a, 0xb9, 0x6e, 0x47, 0x2e, 0x87, 0xb9, 0x96, 0xdf, 0x75, 0x5d, 0xdb, 0xb5, 0x74, 0xe6, 0x51,
+	0x7f, 0x20, 0xff, 0x5a, 0x14, 0x14, 0x9c, 0xf6, 0xbb, 0x07, 0x3a, 0xed, 0x78, 0xe2, 0x38, 0x72,
+	0x2e, 0x0f, 0x3b, 0x0f, 0x6c, 0xea, 0xb4, 0xcd, 0x0e, 0xe1, 0x87, 0x51, 0xc4, 0x6b, 0x51, 0x84,
+	0xef, 0xb5, 0x74, 0x2e, 0x88, 0xe8, 0x46, 0xb8, 0xea, 0xbf, 0x0a, 0x64, 0x2a, 0x91, 0x52, 0x8c,
+	0x61, 0xca, 0x25, 0x1d, 0x9a, 0x47, 0xcb, 0x68, 0x65, 0xce, 0x08, 0x7e, 0xe3, 0x5b, 0x30, 0xdf,
+	0xb6, 0xb9, 0xe7, 0x90, 0x63, 0x33, 0xf0, 0x29, 0x81, 0x2f, 0x1b, 0xd9, 0xea, 0x32, 0xe4, 0x1a,
+	0xcc, 0x75, 0xec, 0x0e, 0x35, 0xc5, 0xb1, 0x47, 0xf3, 0x93, 0x81, 0x3f, 0x23, 0x0d, 0xcd, 0x63,
+	0x8f, 0xe2, 0x4f, 0xe0, 0xca, 0xa1, 0xcb, 0x8e, 0x1c, 0xda, 0xb6, 0xc2, 0x08, 0x9e, 0x9f, 0x5a,
+	0x9e, 0x5c, 0xc9, 0x95, 0xee, 0x6a, 0x23, 0x6e, 0x54, 0x8b, 0x79, 0x69, 0x5b, 0x31, 0x80, 0x44,
+	0x34, 0x72, 0x87, 0xfd, 0x47, 0x8e, 0x6f, 0x41, 0xb6, 0xc5, 0x5c, 0x41, 0x5d, 0x61, 0x76, 0x7d,
+	0x3b, 0x3f, 0x2d, 0x09, 0x3c, 0x98, 0x30, 0x20, 0x32, 0xee, 0xfa, 0x36, 0xbe, 0x01, 0xb3, 0xd1,
+	0x29, 0x3f, 0x23, 0xdd, 0x65, 0x25, 0x8f, 0x1e, 0x4c, 0x18, 0xb1, 0x51, 0x42, 0xf8, 0xe4, 0xc8,
+	0x8c, 0x63, 0xe6, 0x96, 0xd1, 0xca, 0xbc, 0x84, 0xf0, 0xc9, 0xd1, 0x7a, 0x68, 0x53, 0xb7, 0x60,
+	0x61, 0x80, 0x06, 0xbe, 0x01, 0x85, 0xad, 0xfa, 0xf6, 0xd3, 0x87, 0xd5, 0xca, 0x66, 0xd5, 0x6c,
+	0x7e, 0xdc, 0xa8, 0x9a, 0xbb, 0xf5, 0x9d, 0x46, 0x75, 0xbd, 0xb6, 0x51, 0xab, 0x56, 0x16, 0x27,
+	0xf0, 0x2c, 0x4c, 0x6e, 0xac, 0x3d, 0x5e, 0x44, 0xf8, 0x2a, 0x2c, 0x54, 0x3f, 0x6a, 0x1a, 0x6b,
+	0xeb, 0xcd, 0xda, 0x93, 0xaa, 0xf9, 0x78, 0x6d, 0x51, 0x29, 0x67, 0x60, 0x26, 0x6c, 0x01, 0xf5,
+	0x19, 0xbc, 0xf2, 0xd0, 0xe6, 0x22, 0x96, 0xca, 0x0d, 0xfa, 0x69, 0x97, 0x72, 0x81, 0x5f, 0x85,
+	0x19, 0x8f, 0xf8, 0x92, 0x4c, 0x58, 0x8c, 0xe8, 0x24, 0xef, 0xda, 0x23, 0x16, 0x35, 0xb9, 0x7d,
+	0x12, 0xd6, 0x62, 0xda, 0xc8, 0x48, 0xc3, 0x8e, 0x7d, 0x42, 0xf1, 0x75, 0x80, 0xc0, 0x29, 0xd8,
+	0x21, 0x75, 0xa3, 0x4a, 0x04, 0xe1, 0x4d, 0x69, 0x50, 0xbf, 0x41, 0xb0, 0x34, 0xf4, 0x31, 0xee,
+	0x31, 0x97, 0x53, 0xbc, 0x09, 0x73, 0x71, 0xbb, 0xf3, 0x3c, 0x5a, 0x9e, 0x5c, 0xc9, 0x96, 0xde,
+	0x1a, 0xbb, 0x3c, 0x46, 0x2f, 0x17, 0xbf, 0x09, 0x57, 0x5c, 0xfa, 0x99, 0x30, 0xfb, 0x68, 0x84,
+	0x0d, 0xb3, 0x20, 0xcd, 0x8d, 0x84, 0xca, 0x0a, 0xe0, 0x4d, 0x9a, 0x10, 0x89, 0x45, 0xa7, 0xf4,
+	0x9f, 0xfa, 0x1c, 0x96, 0xd6, 0x7d, 0x4a, 0x04, 0x1d, 0x0e, 0x3e, 0xed, 0x86, 0xaa, 0x90, 0x89,
+	0xf9, 0x04, 0xdf, 0x3e, 0x97, 0x94, 0x24, 0x55, 0x7d, 0x1b, 0x96, 0x2a, 0xd4, 0xa1, 0x2f, 0x7f,
+	0x37, 0x8d, 0xe4, 0x8f, 0x08, 0x96, 0x76, 0xbd, 0x76, 0x0a, 0xcb, 0x7e, 0x36, 0xe8, 0xc2, 0x6c,
+	0xf0, 0x3d, 0xc8, 0x76, 0x03, 0xfc, 0x60, 0xa8, 0x23, 0x5d, 0x85, 0x18, 0x29, 0x9e, 0x7b, 0x6d,
+	0x43, 0xce, 0xfd, 0x23, 0xc2, 0x0f, 0x0d, 0x08, 0xc3, 0xe5, 0x6f, 0xf5, 0x77, 0x04, 0x85, 0xa4,
+	0x77, 0xb7, 0xe3, 0xcd, 0xf2, 0x88, 0x0a, 0xd2, 0x26, 0x82, 0xe0, 0xa7, 0x30, 0x2d, 0x57, 0x42,
+	0xa8, 0x28, 0x57, 0x5a, 0x1b, 0xc9, 0xef, 0x74, 0x2c, 0x6d, 0x47, 0x02, 0x19, 0x21, 0x9e, 0x5a,
+	0x86, 0xe9, 0xe0, 0x8c, 0x97, 0xe0, 0xea, 0x4e, 0x73, 0xad, 0x39, 0x3c, 0x21, 0x59, 0x98, 0x6d,
+	0x54, 0xeb, 0x95, 0x5a, 0x7d, 0x73, 0x11, 0xc9, 0x83, 0xb1, 0x5b, 0xaf, 0xcb, 0x83, 0x82, 0x33,
+	0x30, 0x55, 0xd9, 0xae, 0x57, 0x17, 0x27, 0x65, 0x19, 0x0c, 0xea, 0x30, 0xd2, 0x1e, 0xa3, 0x0c,
+	0xa5, 0xaf, 0xe7, 0x61, 0x2e, 0x69, 0x6e, 0xfc, 0xa5, 0x02, 0x0b, 0x03, 0xed, 0x8e, 0xdf, 0x1d,
+	0x29, 0x2d, 0x6d, 0x16, 0x0b, 0xef, 0x9d, 0x37, 0x2d, 0x9c, 0x2a, 0xf5, 0x0b, 0xf4, 0xd5, 0x1f,
+	0x7f, 0x7e, 0xaf, 0x9c, 0xe0, 0xbb, 0xc9, 0xa3, 0xf2, 0x79, 0xd8, 0xa4, 0xf7, 0x3d, 0x9f, 0x3d,
+	0xa3, 0x2d, 0xc1, 0xf5, 0xa2, 0x9e, 0x6c, 0xb3, 0x32, 0xe1, 0x94, 0xeb, 0xc5, 0x17, 0xc9, 0xcb,
+	0xc3, 0xf7, 0x3e, 0xc0, 0xf7, 0xcf, 0x4a, 0x25, 0x16, 0x75, 0xc5, 0x59, 0x00, 0xf8, 0x6f, 0x04,
+	0xd9, 0xbe, 0x41, 0xc3, 0x77, 0x46, 0x4a, 0x79, 0x79, 0x2c, 0x0b, 0xe3, 0x77, 0x6c, 0xaa, 0x64,
+	0x59, 0x9a, 0xb3, 0x04, 0xf7, 0xe8, 0xea, 0xc5, 0x17, 0x83, 0x92, 0x87, 0x53, 0xd3, 0x05, 0x0f,
+	0x00, 0xe0, 0xff, 0x10, 0xe4, 0x06, 0x37, 0x06, 0x1e, 0x5d, 0xc0, 0xd4, 0x15, 0x53, 0xb8, 0x1e,
+	0xe7, 0xf5, 0x3d, 0xcd, 0x5a, 0xd2, 0xf4, 0xea, 0x0f, 0xa1, 0xd8, 0x6f, 0x91, 0x7a, 0xd1, 0x02,
+	0xaf, 0x26, 0x13, 0xbe, 0x57, 0x53, 0x2f, 0x57, 0xea, 0x1e, 0x14, 0xfe, 0x0b, 0x41, 0x6e, 0x70,
+	0x77, 0x8d, 0x71, 0x03, 0xa9, 0xcb, 0x6e, 0xd4, 0x0d, 0xc4, 0xe5, 0x2e, 0x5e, 0xbc, 0xdc, 0xc5,
+	0x4b, 0x96, 0xfb, 0x3b, 0x05, 0x72, 0x83, 0xab, 0x77, 0x0c, 0xb1, 0xa9, 0xbb, 0x7a, 0x94, 0xd8,
+	0x5f, 0x42, 0xb1, 0x3f, 0xa1, 0xd2, 0x87, 0x3d, 0xca, 0xc9, 0x5f, 0x89, 0xe7, 0x92, 0xdd, 0x57,
+	0x77, 0xa3, 0xb4, 0x31, 0x06, 0xda, 0x18, 0x37, 0xd1, 0xd7, 0x00, 0x72, 0x04, 0x06, 0xb7, 0xe6,
+	0x18, 0x77, 0x92, 0xba, 0x66, 0xc7, 0x1f, 0x81, 0xf7, 0x2f, 0xd8, 0x01, 0xab, 0x7e, 0xf0, 0xdd,
+	0x55, 0x54, 0xdc, 0xab, 0xa9, 0x95, 0x4b, 0xf5, 0x42, 0x0f, 0xaa, 0xfc, 0x1b, 0x82, 0xdb, 0x2d,
+	0xd6, 0x19, 0x25, 0xba, 0xbc, 0x10, 0xeb, 0x6d, 0xc8, 0x27, 0xb4, 0x81, 0xf6, 0x6a, 0x51, 0x86,
+	0xc5, 0x1c, 0xe2, 0x5a, 0x1a, 0xf3, 0x2d, 0xdd, 0xa2, 0x6e, 0xf0, 0xc0, 0xea, 0xa1, 0x8b, 0x78,
+	0x36, 0x3f, 0xf5, 0xbf, 0x86, 0x7b, 0x3d, 0xd3, 0x3f, 0x08, 0xfd, 0xac, 0x28, 0x95, 0x8d, 0x5f,
+	0x95, 0x9b, 0x9b, 0x21, 0xe6, 0x7a, 0xc0, 0xa2, 0xd2, 0x63, 0xf1, 0x24, 0x4c, 0xda, 0x9f, 0x09,
+	0xf0, 0xef, 0xfc, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x85, 0x95, 0xd5, 0xf8, 0x94, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -976,77 +992,3 @@ var _Documents_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2beta1/document.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/document.proto", fileDescriptor_document_b7905c72d2ee7910)
-}
-
-var fileDescriptor_document_b7905c72d2ee7910 = []byte{
-	// 1056 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4d, 0x6f, 0x1b, 0x45,
-	0x18, 0xce, 0x6c, 0xbe, 0x9c, 0xd7, 0x89, 0x9b, 0x8e, 0x08, 0x18, 0x97, 0xb6, 0xe9, 0x56, 0x42,
-	0xc1, 0x48, 0xbb, 0xc2, 0x15, 0x54, 0x4a, 0x55, 0x20, 0x8e, 0x9d, 0xd4, 0x4a, 0xeb, 0xb8, 0x1b,
-	0xa7, 0x85, 0x5c, 0x96, 0x89, 0x3d, 0x59, 0x6d, 0xb3, 0xde, 0x59, 0x76, 0xc6, 0x0d, 0x09, 0xaa,
-	0x04, 0x5c, 0xe0, 0x84, 0x84, 0x10, 0x27, 0x2e, 0x88, 0x0b, 0x12, 0xfc, 0x02, 0x7e, 0x07, 0x7f,
-	0x81, 0x13, 0x27, 0x8e, 0x5c, 0x10, 0x68, 0xf6, 0xcb, 0x1f, 0xdd, 0xc4, 0x4e, 0x72, 0xf3, 0xbc,
-	0x1f, 0xcf, 0x3e, 0xcf, 0xbc, 0x1f, 0x93, 0x80, 0x66, 0x31, 0x66, 0x39, 0x54, 0x6f, 0x39, 0xac,
-	0xdb, 0xd6, 0xdb, 0x36, 0x71, 0x98, 0x75, 0xe0, 0xb0, 0x23, 0xfd, 0x79, 0x69, 0x9f, 0x0a, 0xf2,
-	0x8e, 0xde, 0x66, 0xad, 0x6e, 0x87, 0xba, 0x42, 0xf3, 0x7c, 0x26, 0x18, 0xbe, 0x19, 0xc6, 0x6b,
-	0x41, 0xbc, 0xd6, 0x8b, 0xd7, 0xa2, 0xf8, 0xc2, 0x1b, 0x11, 0x20, 0xf1, 0x6c, 0x9d, 0xb8, 0x2e,
-	0x13, 0x44, 0xd8, 0xcc, 0xe5, 0x61, 0x7a, 0xe1, 0xf5, 0x3e, 0xaf, 0x4f, 0x39, 0xeb, 0xfa, 0x2d,
-	0x1a, 0xb9, 0x6e, 0x47, 0x2e, 0x87, 0xb9, 0x96, 0xdf, 0x75, 0x5d, 0xdb, 0xb5, 0x74, 0xe6, 0x51,
-	0x7f, 0x20, 0xff, 0x5a, 0x14, 0x14, 0x9c, 0xf6, 0xbb, 0x07, 0x3a, 0xed, 0x78, 0xe2, 0x38, 0x72,
-	0x2e, 0x0f, 0x3b, 0x0f, 0x6c, 0xea, 0xb4, 0xcd, 0x0e, 0xe1, 0x87, 0x51, 0xc4, 0x6b, 0x51, 0x84,
-	0xef, 0xb5, 0x74, 0x2e, 0x88, 0xe8, 0x46, 0xb8, 0xea, 0xbf, 0x0a, 0x64, 0x2a, 0x91, 0x52, 0x8c,
-	0x61, 0xca, 0x25, 0x1d, 0x9a, 0x47, 0xcb, 0x68, 0x65, 0xce, 0x08, 0x7e, 0xe3, 0x5b, 0x30, 0xdf,
-	0xb6, 0xb9, 0xe7, 0x90, 0x63, 0x33, 0xf0, 0x29, 0x81, 0x2f, 0x1b, 0xd9, 0xea, 0x32, 0xe4, 0x1a,
-	0xcc, 0x75, 0xec, 0x0e, 0x35, 0xc5, 0xb1, 0x47, 0xf3, 0x93, 0x81, 0x3f, 0x23, 0x0d, 0xcd, 0x63,
-	0x8f, 0xe2, 0x4f, 0xe0, 0xca, 0xa1, 0xcb, 0x8e, 0x1c, 0xda, 0xb6, 0xc2, 0x08, 0x9e, 0x9f, 0x5a,
-	0x9e, 0x5c, 0xc9, 0x95, 0xee, 0x6a, 0x23, 0x6e, 0x54, 0x8b, 0x79, 0x69, 0x5b, 0x31, 0x80, 0x44,
-	0x34, 0x72, 0x87, 0xfd, 0x47, 0x8e, 0x6f, 0x41, 0xb6, 0xc5, 0x5c, 0x41, 0x5d, 0x61, 0x76, 0x7d,
-	0x3b, 0x3f, 0x2d, 0x09, 0x3c, 0x98, 0x30, 0x20, 0x32, 0xee, 0xfa, 0x36, 0xbe, 0x01, 0xb3, 0xd1,
-	0x29, 0x3f, 0x23, 0xdd, 0x65, 0x25, 0x8f, 0x1e, 0x4c, 0x18, 0xb1, 0x51, 0x42, 0xf8, 0xe4, 0xc8,
-	0x8c, 0x63, 0xe6, 0x96, 0xd1, 0xca, 0xbc, 0x84, 0xf0, 0xc9, 0xd1, 0x7a, 0x68, 0x53, 0xb7, 0x60,
-	0x61, 0x80, 0x06, 0xbe, 0x01, 0x85, 0xad, 0xfa, 0xf6, 0xd3, 0x87, 0xd5, 0xca, 0x66, 0xd5, 0x6c,
-	0x7e, 0xdc, 0xa8, 0x9a, 0xbb, 0xf5, 0x9d, 0x46, 0x75, 0xbd, 0xb6, 0x51, 0xab, 0x56, 0x16, 0x27,
-	0xf0, 0x2c, 0x4c, 0x6e, 0xac, 0x3d, 0x5e, 0x44, 0xf8, 0x2a, 0x2c, 0x54, 0x3f, 0x6a, 0x1a, 0x6b,
-	0xeb, 0xcd, 0xda, 0x93, 0xaa, 0xf9, 0x78, 0x6d, 0x51, 0x29, 0x67, 0x60, 0x26, 0x6c, 0x01, 0xf5,
-	0x19, 0xbc, 0xf2, 0xd0, 0xe6, 0x22, 0x96, 0xca, 0x0d, 0xfa, 0x69, 0x97, 0x72, 0x81, 0x5f, 0x85,
-	0x19, 0x8f, 0xf8, 0x92, 0x4c, 0x58, 0x8c, 0xe8, 0x24, 0xef, 0xda, 0x23, 0x16, 0x35, 0xb9, 0x7d,
-	0x12, 0xd6, 0x62, 0xda, 0xc8, 0x48, 0xc3, 0x8e, 0x7d, 0x42, 0xf1, 0x75, 0x80, 0xc0, 0x29, 0xd8,
-	0x21, 0x75, 0xa3, 0x4a, 0x04, 0xe1, 0x4d, 0x69, 0x50, 0xbf, 0x41, 0xb0, 0x34, 0xf4, 0x31, 0xee,
-	0x31, 0x97, 0x53, 0xbc, 0x09, 0x73, 0x71, 0xbb, 0xf3, 0x3c, 0x5a, 0x9e, 0x5c, 0xc9, 0x96, 0xde,
-	0x1a, 0xbb, 0x3c, 0x46, 0x2f, 0x17, 0xbf, 0x09, 0x57, 0x5c, 0xfa, 0x99, 0x30, 0xfb, 0x68, 0x84,
-	0x0d, 0xb3, 0x20, 0xcd, 0x8d, 0x84, 0xca, 0x0a, 0xe0, 0x4d, 0x9a, 0x10, 0x89, 0x45, 0xa7, 0xf4,
-	0x9f, 0xfa, 0x1c, 0x96, 0xd6, 0x7d, 0x4a, 0x04, 0x1d, 0x0e, 0x3e, 0xed, 0x86, 0xaa, 0x90, 0x89,
-	0xf9, 0x04, 0xdf, 0x3e, 0x97, 0x94, 0x24, 0x55, 0x7d, 0x1b, 0x96, 0x2a, 0xd4, 0xa1, 0x2f, 0x7f,
-	0x37, 0x8d, 0xe4, 0x8f, 0x08, 0x96, 0x76, 0xbd, 0x76, 0x0a, 0xcb, 0x7e, 0x36, 0xe8, 0xc2, 0x6c,
-	0xf0, 0x3d, 0xc8, 0x76, 0x03, 0xfc, 0x60, 0xa8, 0x23, 0x5d, 0x85, 0x18, 0x29, 0x9e, 0x7b, 0x6d,
-	0x43, 0xce, 0xfd, 0x23, 0xc2, 0x0f, 0x0d, 0x08, 0xc3, 0xe5, 0x6f, 0xf5, 0x77, 0x04, 0x85, 0xa4,
-	0x77, 0xb7, 0xe3, 0xcd, 0xf2, 0x88, 0x0a, 0xd2, 0x26, 0x82, 0xe0, 0xa7, 0x30, 0x2d, 0x57, 0x42,
-	0xa8, 0x28, 0x57, 0x5a, 0x1b, 0xc9, 0xef, 0x74, 0x2c, 0x6d, 0x47, 0x02, 0x19, 0x21, 0x9e, 0x5a,
-	0x86, 0xe9, 0xe0, 0x8c, 0x97, 0xe0, 0xea, 0x4e, 0x73, 0xad, 0x39, 0x3c, 0x21, 0x59, 0x98, 0x6d,
-	0x54, 0xeb, 0x95, 0x5a, 0x7d, 0x73, 0x11, 0xc9, 0x83, 0xb1, 0x5b, 0xaf, 0xcb, 0x83, 0x82, 0x33,
-	0x30, 0x55, 0xd9, 0xae, 0x57, 0x17, 0x27, 0x65, 0x19, 0x0c, 0xea, 0x30, 0xd2, 0x1e, 0xa3, 0x0c,
-	0xa5, 0xaf, 0xe7, 0x61, 0x2e, 0x69, 0x6e, 0xfc, 0xa5, 0x02, 0x0b, 0x03, 0xed, 0x8e, 0xdf, 0x1d,
-	0x29, 0x2d, 0x6d, 0x16, 0x0b, 0xef, 0x9d, 0x37, 0x2d, 0x9c, 0x2a, 0xf5, 0x0b, 0xf4, 0xd5, 0x1f,
-	0x7f, 0x7e, 0xaf, 0x9c, 0xe0, 0xbb, 0xc9, 0xa3, 0xf2, 0x79, 0xd8, 0xa4, 0xf7, 0x3d, 0x9f, 0x3d,
-	0xa3, 0x2d, 0xc1, 0xf5, 0xa2, 0x9e, 0x6c, 0xb3, 0x32, 0xe1, 0x94, 0xeb, 0xc5, 0x17, 0xc9, 0xcb,
-	0xc3, 0xf7, 0x3e, 0xc0, 0xf7, 0xcf, 0x4a, 0x25, 0x16, 0x75, 0xc5, 0x59, 0x00, 0xf8, 0x6f, 0x04,
-	0xd9, 0xbe, 0x41, 0xc3, 0x77, 0x46, 0x4a, 0x79, 0x79, 0x2c, 0x0b, 0xe3, 0x77, 0x6c, 0xaa, 0x64,
-	0x59, 0x9a, 0xb3, 0x04, 0xf7, 0xe8, 0xea, 0xc5, 0x17, 0x83, 0x92, 0x87, 0x53, 0xd3, 0x05, 0x0f,
-	0x00, 0xe0, 0xff, 0x10, 0xe4, 0x06, 0x37, 0x06, 0x1e, 0x5d, 0xc0, 0xd4, 0x15, 0x53, 0xb8, 0x1e,
-	0xe7, 0xf5, 0x3d, 0xcd, 0x5a, 0xd2, 0xf4, 0xea, 0x0f, 0xa1, 0xd8, 0x6f, 0x91, 0x7a, 0xd1, 0x02,
-	0xaf, 0x26, 0x13, 0xbe, 0x57, 0x53, 0x2f, 0x57, 0xea, 0x1e, 0x14, 0xfe, 0x0b, 0x41, 0x6e, 0x70,
-	0x77, 0x8d, 0x71, 0x03, 0xa9, 0xcb, 0x6e, 0xd4, 0x0d, 0xc4, 0xe5, 0x2e, 0x5e, 0xbc, 0xdc, 0xc5,
-	0x4b, 0x96, 0xfb, 0x3b, 0x05, 0x72, 0x83, 0xab, 0x77, 0x0c, 0xb1, 0xa9, 0xbb, 0x7a, 0x94, 0xd8,
-	0x5f, 0x42, 0xb1, 0x3f, 0xa1, 0xd2, 0x87, 0x3d, 0xca, 0xc9, 0x5f, 0x89, 0xe7, 0x92, 0xdd, 0x57,
-	0x77, 0xa3, 0xb4, 0x31, 0x06, 0xda, 0x18, 0x37, 0xd1, 0xd7, 0x00, 0x72, 0x04, 0x06, 0xb7, 0xe6,
-	0x18, 0x77, 0x92, 0xba, 0x66, 0xc7, 0x1f, 0x81, 0xf7, 0x2f, 0xd8, 0x01, 0xab, 0x7e, 0xf0, 0xdd,
-	0x55, 0x54, 0xdc, 0xab, 0xa9, 0x95, 0x4b, 0xf5, 0x42, 0x0f, 0xaa, 0xfc, 0x1b, 0x82, 0xdb, 0x2d,
-	0xd6, 0x19, 0x25, 0xba, 0xbc, 0x10, 0xeb, 0x6d, 0xc8, 0x27, 0xb4, 0x81, 0xf6, 0x6a, 0x51, 0x86,
-	0xc5, 0x1c, 0xe2, 0x5a, 0x1a, 0xf3, 0x2d, 0xdd, 0xa2, 0x6e, 0xf0, 0xc0, 0xea, 0xa1, 0x8b, 0x78,
-	0x36, 0x3f, 0xf5, 0xbf, 0x86, 0x7b, 0x3d, 0xd3, 0x3f, 0x08, 0xfd, 0xac, 0x28, 0x95, 0x8d, 0x5f,
-	0x95, 0x9b, 0x9b, 0x21, 0xe6, 0x7a, 0xc0, 0xa2, 0xd2, 0x63, 0xf1, 0x24, 0x4c, 0xda, 0x9f, 0x09,
-	0xf0, 0xef, 0xfc, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x85, 0x95, 0xd5, 0xf8, 0x94, 0x0c, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go b/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
index 053742410b..330a7905e4 100644
--- a/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents kinds of entities.
 type EntityType_Kind int32
@@ -48,6 +48,7 @@ var EntityType_Kind_name = map[int32]string{
 	1: "KIND_MAP",
 	2: "KIND_LIST",
 }
+
 var EntityType_Kind_value = map[string]int32{
 	"KIND_UNSPECIFIED": 0,
 	"KIND_MAP":         1,
@@ -57,8 +58,9 @@ var EntityType_Kind_value = map[string]int32{
 func (x EntityType_Kind) String() string {
 	return proto.EnumName(EntityType_Kind_name, int32(x))
 }
+
 func (EntityType_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{0, 0}
+	return fileDescriptor_270276916589f9d5, []int{0, 0}
 }
 
 // Represents different entity type expansion modes. Automated expansion
@@ -78,6 +80,7 @@ var EntityType_AutoExpansionMode_name = map[int32]string{
 	0: "AUTO_EXPANSION_MODE_UNSPECIFIED",
 	1: "AUTO_EXPANSION_MODE_DEFAULT",
 }
+
 var EntityType_AutoExpansionMode_value = map[string]int32{
 	"AUTO_EXPANSION_MODE_UNSPECIFIED": 0,
 	"AUTO_EXPANSION_MODE_DEFAULT":     1,
@@ -86,8 +89,9 @@ var EntityType_AutoExpansionMode_value = map[string]int32{
 func (x EntityType_AutoExpansionMode) String() string {
 	return proto.EnumName(EntityType_AutoExpansionMode_name, int32(x))
 }
+
 func (EntityType_AutoExpansionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{0, 1}
+	return fileDescriptor_270276916589f9d5, []int{0, 1}
 }
 
 // Represents an entity type.
@@ -117,16 +121,17 @@ func (m *EntityType) Reset()         { *m = EntityType{} }
 func (m *EntityType) String() string { return proto.CompactTextString(m) }
 func (*EntityType) ProtoMessage()    {}
 func (*EntityType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{0}
+	return fileDescriptor_270276916589f9d5, []int{0}
 }
+
 func (m *EntityType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityType.Unmarshal(m, b)
 }
 func (m *EntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityType.Marshal(b, m, deterministic)
 }
-func (dst *EntityType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityType.Merge(dst, src)
+func (m *EntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType.Merge(m, src)
 }
 func (m *EntityType) XXX_Size() int {
 	return xxx_messageInfo_EntityType.Size(m)
@@ -204,16 +209,17 @@ func (m *EntityType_Entity) Reset()         { *m = EntityType_Entity{} }
 func (m *EntityType_Entity) String() string { return proto.CompactTextString(m) }
 func (*EntityType_Entity) ProtoMessage()    {}
 func (*EntityType_Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{0, 0}
+	return fileDescriptor_270276916589f9d5, []int{0, 0}
 }
+
 func (m *EntityType_Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityType_Entity.Unmarshal(m, b)
 }
 func (m *EntityType_Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityType_Entity.Marshal(b, m, deterministic)
 }
-func (dst *EntityType_Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityType_Entity.Merge(dst, src)
+func (m *EntityType_Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType_Entity.Merge(m, src)
 }
 func (m *EntityType_Entity) XXX_Size() int {
 	return xxx_messageInfo_EntityType_Entity.Size(m)
@@ -264,16 +270,17 @@ func (m *ListEntityTypesRequest) Reset()         { *m = ListEntityTypesRequest{}
 func (m *ListEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListEntityTypesRequest) ProtoMessage()    {}
 func (*ListEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{1}
+	return fileDescriptor_270276916589f9d5, []int{1}
 }
+
 func (m *ListEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *ListEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListEntityTypesRequest.Merge(dst, src)
+func (m *ListEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesRequest.Merge(m, src)
 }
 func (m *ListEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListEntityTypesRequest.Size(m)
@@ -329,16 +336,17 @@ func (m *ListEntityTypesResponse) Reset()         { *m = ListEntityTypesResponse
 func (m *ListEntityTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListEntityTypesResponse) ProtoMessage()    {}
 func (*ListEntityTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{2}
+	return fileDescriptor_270276916589f9d5, []int{2}
 }
+
 func (m *ListEntityTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListEntityTypesResponse.Unmarshal(m, b)
 }
 func (m *ListEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListEntityTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListEntityTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListEntityTypesResponse.Merge(dst, src)
+func (m *ListEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesResponse.Merge(m, src)
 }
 func (m *ListEntityTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListEntityTypesResponse.Size(m)
@@ -384,16 +392,17 @@ func (m *GetEntityTypeRequest) Reset()         { *m = GetEntityTypeRequest{} }
 func (m *GetEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*GetEntityTypeRequest) ProtoMessage()    {}
 func (*GetEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{3}
+	return fileDescriptor_270276916589f9d5, []int{3}
 }
+
 func (m *GetEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *GetEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetEntityTypeRequest.Merge(dst, src)
+func (m *GetEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetEntityTypeRequest.Merge(m, src)
 }
 func (m *GetEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_GetEntityTypeRequest.Size(m)
@@ -441,16 +450,17 @@ func (m *CreateEntityTypeRequest) Reset()         { *m = CreateEntityTypeRequest
 func (m *CreateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateEntityTypeRequest) ProtoMessage()    {}
 func (*CreateEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{4}
+	return fileDescriptor_270276916589f9d5, []int{4}
 }
+
 func (m *CreateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *CreateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateEntityTypeRequest.Merge(dst, src)
+func (m *CreateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateEntityTypeRequest.Merge(m, src)
 }
 func (m *CreateEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateEntityTypeRequest.Size(m)
@@ -504,16 +514,17 @@ func (m *UpdateEntityTypeRequest) Reset()         { *m = UpdateEntityTypeRequest
 func (m *UpdateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateEntityTypeRequest) ProtoMessage()    {}
 func (*UpdateEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{5}
+	return fileDescriptor_270276916589f9d5, []int{5}
 }
+
 func (m *UpdateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *UpdateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateEntityTypeRequest.Merge(dst, src)
+func (m *UpdateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateEntityTypeRequest.Merge(m, src)
 }
 func (m *UpdateEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateEntityTypeRequest.Size(m)
@@ -559,16 +570,17 @@ func (m *DeleteEntityTypeRequest) Reset()         { *m = DeleteEntityTypeRequest
 func (m *DeleteEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteEntityTypeRequest) ProtoMessage()    {}
 func (*DeleteEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{6}
+	return fileDescriptor_270276916589f9d5, []int{6}
 }
+
 func (m *DeleteEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *DeleteEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteEntityTypeRequest.Merge(dst, src)
+func (m *DeleteEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEntityTypeRequest.Merge(m, src)
 }
 func (m *DeleteEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteEntityTypeRequest.Size(m)
@@ -620,16 +632,17 @@ func (m *BatchUpdateEntityTypesRequest) Reset()         { *m = BatchUpdateEntity
 func (m *BatchUpdateEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateEntityTypesRequest) ProtoMessage()    {}
 func (*BatchUpdateEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{7}
+	return fileDescriptor_270276916589f9d5, []int{7}
 }
+
 func (m *BatchUpdateEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdateEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateEntityTypesRequest.Merge(dst, src)
+func (m *BatchUpdateEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesRequest.Merge(m, src)
 }
 func (m *BatchUpdateEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Size(m)
@@ -700,76 +713,14 @@ func (m *BatchUpdateEntityTypesRequest) GetUpdateMask() *field_mask.FieldMask {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchUpdateEntityTypesRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchUpdateEntityTypesRequest_OneofMarshaler, _BatchUpdateEntityTypesRequest_OneofUnmarshaler, _BatchUpdateEntityTypesRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchUpdateEntityTypesRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchUpdateEntityTypesRequest_EntityTypeBatchUri)(nil),
 		(*BatchUpdateEntityTypesRequest_EntityTypeBatchInline)(nil),
 	}
 }
 
-func _BatchUpdateEntityTypesRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchUpdateEntityTypesRequest)
-	// entity_type_batch
-	switch x := m.EntityTypeBatch.(type) {
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.EntityTypeBatchUri)
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchInline:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EntityTypeBatchInline); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchUpdateEntityTypesRequest.EntityTypeBatch has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchUpdateEntityTypesRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchUpdateEntityTypesRequest)
-	switch tag {
-	case 2: // entity_type_batch.entity_type_batch_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.EntityTypeBatch = &BatchUpdateEntityTypesRequest_EntityTypeBatchUri{x}
-		return true, err
-	case 3: // entity_type_batch.entity_type_batch_inline
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EntityTypeBatch)
-		err := b.DecodeMessage(msg)
-		m.EntityTypeBatch = &BatchUpdateEntityTypesRequest_EntityTypeBatchInline{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchUpdateEntityTypesRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchUpdateEntityTypesRequest)
-	// entity_type_batch
-	switch x := m.EntityTypeBatch.(type) {
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.EntityTypeBatchUri)))
-		n += len(x.EntityTypeBatchUri)
-	case *BatchUpdateEntityTypesRequest_EntityTypeBatchInline:
-		s := proto.Size(x.EntityTypeBatchInline)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchUpdateEntityTypes].
 type BatchUpdateEntityTypesResponse struct {
 	// The collection of updated or created entity types.
@@ -783,16 +734,17 @@ func (m *BatchUpdateEntityTypesResponse) Reset()         { *m = BatchUpdateEntit
 func (m *BatchUpdateEntityTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateEntityTypesResponse) ProtoMessage()    {}
 func (*BatchUpdateEntityTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{8}
+	return fileDescriptor_270276916589f9d5, []int{8}
 }
+
 func (m *BatchUpdateEntityTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Unmarshal(m, b)
 }
 func (m *BatchUpdateEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateEntityTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateEntityTypesResponse.Merge(dst, src)
+func (m *BatchUpdateEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesResponse.Merge(m, src)
 }
 func (m *BatchUpdateEntityTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Size(m)
@@ -827,16 +779,17 @@ func (m *BatchDeleteEntityTypesRequest) Reset()         { *m = BatchDeleteEntity
 func (m *BatchDeleteEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeleteEntityTypesRequest) ProtoMessage()    {}
 func (*BatchDeleteEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{9}
+	return fileDescriptor_270276916589f9d5, []int{9}
 }
+
 func (m *BatchDeleteEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *BatchDeleteEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeleteEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeleteEntityTypesRequest.Merge(dst, src)
+func (m *BatchDeleteEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntityTypesRequest.Merge(m, src)
 }
 func (m *BatchDeleteEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Size(m)
@@ -884,16 +837,17 @@ func (m *BatchCreateEntitiesRequest) Reset()         { *m = BatchCreateEntitiesR
 func (m *BatchCreateEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateEntitiesRequest) ProtoMessage()    {}
 func (*BatchCreateEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{10}
+	return fileDescriptor_270276916589f9d5, []int{10}
 }
+
 func (m *BatchCreateEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateEntitiesRequest.Unmarshal(m, b)
 }
 func (m *BatchCreateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateEntitiesRequest.Merge(dst, src)
+func (m *BatchCreateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateEntitiesRequest.Merge(m, src)
 }
 func (m *BatchCreateEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateEntitiesRequest.Size(m)
@@ -950,16 +904,17 @@ func (m *BatchUpdateEntitiesRequest) Reset()         { *m = BatchUpdateEntitiesR
 func (m *BatchUpdateEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateEntitiesRequest) ProtoMessage()    {}
 func (*BatchUpdateEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{11}
+	return fileDescriptor_270276916589f9d5, []int{11}
 }
+
 func (m *BatchUpdateEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateEntitiesRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateEntitiesRequest.Merge(dst, src)
+func (m *BatchUpdateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntitiesRequest.Merge(m, src)
 }
 func (m *BatchUpdateEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateEntitiesRequest.Size(m)
@@ -1023,16 +978,17 @@ func (m *BatchDeleteEntitiesRequest) Reset()         { *m = BatchDeleteEntitiesR
 func (m *BatchDeleteEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeleteEntitiesRequest) ProtoMessage()    {}
 func (*BatchDeleteEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{12}
+	return fileDescriptor_270276916589f9d5, []int{12}
 }
+
 func (m *BatchDeleteEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeleteEntitiesRequest.Unmarshal(m, b)
 }
 func (m *BatchDeleteEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeleteEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeleteEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeleteEntitiesRequest.Merge(dst, src)
+func (m *BatchDeleteEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntitiesRequest.Merge(m, src)
 }
 func (m *BatchDeleteEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeleteEntitiesRequest.Size(m)
@@ -1077,16 +1033,17 @@ func (m *EntityTypeBatch) Reset()         { *m = EntityTypeBatch{} }
 func (m *EntityTypeBatch) String() string { return proto.CompactTextString(m) }
 func (*EntityTypeBatch) ProtoMessage()    {}
 func (*EntityTypeBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_type_6dfa1fc30f052b5b, []int{13}
+	return fileDescriptor_270276916589f9d5, []int{13}
 }
+
 func (m *EntityTypeBatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityTypeBatch.Unmarshal(m, b)
 }
 func (m *EntityTypeBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityTypeBatch.Marshal(b, m, deterministic)
 }
-func (dst *EntityTypeBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityTypeBatch.Merge(dst, src)
+func (m *EntityTypeBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityTypeBatch.Merge(m, src)
 }
 func (m *EntityTypeBatch) XXX_Size() int {
 	return xxx_messageInfo_EntityTypeBatch.Size(m)
@@ -1105,6 +1062,8 @@ func (m *EntityTypeBatch) GetEntityTypes() []*EntityType {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.EntityType_Kind", EntityType_Kind_name, EntityType_Kind_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.EntityType_AutoExpansionMode", EntityType_AutoExpansionMode_name, EntityType_AutoExpansionMode_value)
 	proto.RegisterType((*EntityType)(nil), "google.cloud.dialogflow.v2beta1.EntityType")
 	proto.RegisterType((*EntityType_Entity)(nil), "google.cloud.dialogflow.v2beta1.EntityType.Entity")
 	proto.RegisterType((*ListEntityTypesRequest)(nil), "google.cloud.dialogflow.v2beta1.ListEntityTypesRequest")
@@ -1120,8 +1079,92 @@ func init() {
 	proto.RegisterType((*BatchUpdateEntitiesRequest)(nil), "google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest")
 	proto.RegisterType((*BatchDeleteEntitiesRequest)(nil), "google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest")
 	proto.RegisterType((*EntityTypeBatch)(nil), "google.cloud.dialogflow.v2beta1.EntityTypeBatch")
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.EntityType_Kind", EntityType_Kind_name, EntityType_Kind_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.EntityType_AutoExpansionMode", EntityType_AutoExpansionMode_name, EntityType_AutoExpansionMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/entity_type.proto", fileDescriptor_270276916589f9d5)
+}
+
+var fileDescriptor_270276916589f9d5 = []byte{
+	// 1246 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x6f, 0xe3, 0x44,
+	0x14, 0xdf, 0x49, 0xb3, 0x55, 0xfb, 0xd2, 0x6e, 0xd3, 0x69, 0xb7, 0x0d, 0xe9, 0x96, 0x16, 0x57,
+	0x42, 0x55, 0x11, 0xf1, 0x6e, 0x56, 0xfc, 0x6b, 0x55, 0x50, 0xdb, 0xa4, 0xbb, 0x61, 0xdb, 0x24,
+	0x72, 0xdb, 0x15, 0x70, 0xb1, 0xdc, 0x64, 0x1a, 0x4c, 0x93, 0x19, 0xe3, 0x3f, 0xcb, 0x66, 0xd1,
+	0x72, 0xe0, 0x1b, 0x20, 0x6e, 0x88, 0x13, 0xe2, 0x02, 0x88, 0x6f, 0x80, 0xb8, 0x70, 0x82, 0x13,
+	0x12, 0x5f, 0x01, 0xf1, 0x19, 0x90, 0xb8, 0x20, 0x8f, 0xed, 0xd8, 0x71, 0x1c, 0x6c, 0xc3, 0xee,
+	0x8a, 0x5b, 0xe6, 0xcf, 0x7b, 0xef, 0xf7, 0x7b, 0xef, 0xcd, 0xfc, 0xc6, 0x81, 0x5b, 0x1d, 0xc6,
+	0x3a, 0x5d, 0x22, 0xb6, 0xba, 0xcc, 0x6a, 0x8b, 0x6d, 0x55, 0xe9, 0xb2, 0xce, 0x45, 0x97, 0x7d,
+	0x24, 0x3e, 0x28, 0x9f, 0x13, 0x53, 0xb9, 0x25, 0x12, 0x6a, 0xaa, 0x66, 0x5f, 0x36, 0xfb, 0x1a,
+	0x29, 0x69, 0x3a, 0x33, 0x19, 0x5e, 0x73, 0x4c, 0x4a, 0xdc, 0xa4, 0xe4, 0x9b, 0x94, 0x5c, 0x93,
+	0xe2, 0x0d, 0xd7, 0xa7, 0xa2, 0xa9, 0xa2, 0x42, 0x29, 0x33, 0x15, 0x53, 0x65, 0xd4, 0x70, 0xcc,
+	0x8b, 0xcf, 0x05, 0x56, 0x75, 0x62, 0x30, 0x4b, 0x6f, 0xb9, 0x9e, 0x8b, 0x1b, 0xee, 0x52, 0x97,
+	0xd1, 0x8e, 0x6e, 0x51, 0xaa, 0xd2, 0x8e, 0xc8, 0x34, 0xa2, 0x0f, 0xd9, 0xaf, 0xb8, 0x9b, 0xf8,
+	0xe8, 0xdc, 0xba, 0x10, 0x49, 0x4f, 0x33, 0xfb, 0xee, 0xe2, 0x7a, 0x78, 0xf1, 0x42, 0x25, 0xdd,
+	0xb6, 0xdc, 0x53, 0x8c, 0x4b, 0x77, 0xc7, 0x8d, 0xf0, 0x0e, 0xc3, 0xd4, 0xad, 0x96, 0xe9, 0xac,
+	0x0a, 0x5f, 0x64, 0x01, 0xaa, 0x9c, 0xf1, 0x69, 0x5f, 0x23, 0x18, 0x43, 0x96, 0x2a, 0x3d, 0x52,
+	0x40, 0xeb, 0x68, 0x73, 0x5a, 0xe2, 0xbf, 0xf1, 0x0b, 0x30, 0xd3, 0x56, 0x0d, 0xad, 0xab, 0xf4,
+	0x65, 0xbe, 0x96, 0xe1, 0x6b, 0x39, 0x77, 0xae, 0x6e, 0x6f, 0xa9, 0x40, 0xf6, 0x52, 0xa5, 0xed,
+	0xc2, 0xc4, 0x3a, 0xda, 0xbc, 0x56, 0xbe, 0x59, 0x8a, 0x49, 0x58, 0xc9, 0x8f, 0x58, 0xba, 0xa7,
+	0xd2, 0xb6, 0xc4, 0xad, 0x71, 0x0f, 0x16, 0x14, 0xcb, 0x64, 0x32, 0x79, 0xa8, 0x29, 0xd4, 0x50,
+	0x19, 0x95, 0x7b, 0xac, 0x4d, 0x0a, 0x59, 0xee, 0x74, 0x37, 0x8d, 0xd3, 0x3d, 0xcb, 0x64, 0x55,
+	0xcf, 0xcb, 0x31, 0x6b, 0x13, 0x69, 0x5e, 0x09, 0x4f, 0xe1, 0x3a, 0x4c, 0xf1, 0x5a, 0xab, 0xc4,
+	0x28, 0x4c, 0xae, 0x4f, 0x6c, 0xe6, 0xca, 0xe5, 0x34, 0x31, 0x9c, 0x9f, 0xd2, 0xc0, 0x47, 0x71,
+	0x1b, 0x26, 0x9d, 0x39, 0xbc, 0x08, 0x57, 0x1f, 0x28, 0x5d, 0xcb, 0x4b, 0xa3, 0x33, 0xc0, 0x45,
+	0x98, 0x32, 0xfa, 0x94, 0xd1, 0x7e, 0xcf, 0x28, 0x64, 0xd6, 0x27, 0x36, 0xa7, 0xa5, 0xc1, 0x58,
+	0x78, 0x03, 0xb2, 0x76, 0x22, 0xf0, 0x22, 0xe4, 0xef, 0xd5, 0xea, 0x15, 0xf9, 0xac, 0x7e, 0xd2,
+	0xac, 0x1e, 0xd4, 0x0e, 0x6b, 0xd5, 0x4a, 0xfe, 0x0a, 0x9e, 0x81, 0x29, 0x3e, 0x7b, 0xbc, 0xd7,
+	0xcc, 0x23, 0x3c, 0x0b, 0xd3, 0x7c, 0x74, 0x54, 0x3b, 0x39, 0xcd, 0x67, 0x84, 0x77, 0x61, 0x7e,
+	0x84, 0x2e, 0xde, 0x80, 0xb5, 0xbd, 0xb3, 0xd3, 0x86, 0x5c, 0x7d, 0xa7, 0xb9, 0x57, 0x3f, 0xa9,
+	0x35, 0xea, 0xf2, 0x71, 0xa3, 0x52, 0x0d, 0xb9, 0x5d, 0x83, 0x95, 0xa8, 0x4d, 0x95, 0xea, 0xe1,
+	0xde, 0xd9, 0xd1, 0x69, 0x1e, 0x09, 0x9f, 0x21, 0x58, 0x3a, 0x52, 0x0d, 0xd3, 0x67, 0x6d, 0x48,
+	0xe4, 0x43, 0x8b, 0x18, 0x26, 0x5e, 0x82, 0x49, 0x4d, 0xd1, 0x09, 0x35, 0x5d, 0x8e, 0xee, 0x08,
+	0x6f, 0xc0, 0x6c, 0x57, 0xa1, 0x1d, 0x4b, 0xe9, 0x10, 0xb9, 0x65, 0x57, 0xcf, 0xe9, 0x96, 0x19,
+	0x6f, 0xf2, 0xc0, 0x46, 0xb7, 0x02, 0xd3, 0x9a, 0xbd, 0xc1, 0x50, 0x1f, 0x11, 0xde, 0x33, 0x57,
+	0xa5, 0x29, 0x7b, 0xe2, 0x44, 0x7d, 0x44, 0xf0, 0x2a, 0x00, 0x5f, 0x34, 0xd9, 0x25, 0xa1, 0xbc,
+	0xf8, 0xd3, 0x12, 0xdf, 0x7e, 0x6a, 0x4f, 0xd8, 0x98, 0x96, 0x47, 0x30, 0x19, 0x1a, 0xa3, 0x86,
+	0x5d, 0xd1, 0x99, 0xc0, 0xe9, 0x35, 0x0a, 0x88, 0x57, 0xf5, 0xa5, 0x14, 0x55, 0x95, 0x72, 0xc4,
+	0xf7, 0x8b, 0x5f, 0x84, 0x39, 0x4a, 0x1e, 0x9a, 0x72, 0x00, 0x8f, 0x43, 0x67, 0xd6, 0x9e, 0x6e,
+	0x0e, 0x30, 0x35, 0x60, 0xf1, 0x0e, 0x09, 0x20, 0xf2, 0x92, 0x14, 0x75, 0x9a, 0x92, 0x24, 0x48,
+	0xf8, 0x1a, 0xc1, 0xf2, 0x81, 0x4e, 0x14, 0x93, 0x8c, 0x3a, 0x1d, 0x97, 0xf9, 0x23, 0xc8, 0x05,
+	0xc8, 0x73, 0xb7, 0x29, 0xb9, 0x83, 0xcf, 0x7d, 0x14, 0xe6, 0x44, 0x04, 0xcc, 0x9f, 0x11, 0x2c,
+	0x9f, 0x69, 0xed, 0x48, 0x98, 0x21, 0x38, 0xe8, 0x09, 0xc3, 0x89, 0x6a, 0xab, 0x1d, 0xc8, 0x59,
+	0x1c, 0x0d, 0xbf, 0xfe, 0x38, 0xe2, 0x5c, 0xb9, 0xe8, 0x85, 0xf4, 0xee, 0xbf, 0xd2, 0xa1, 0x7d,
+	0x43, 0x1e, 0x2b, 0xc6, 0xa5, 0x04, 0xce, 0x76, 0xfb, 0xb7, 0xf0, 0x32, 0x2c, 0x57, 0x48, 0x97,
+	0x44, 0x51, 0x89, 0x28, 0xa3, 0xf0, 0x6b, 0x06, 0x56, 0xf7, 0x15, 0xb3, 0xf5, 0x7e, 0x98, 0x7f,
+	0xec, 0x09, 0xb9, 0x0d, 0xd7, 0x03, 0x89, 0x91, 0xcf, 0x6d, 0x27, 0xb2, 0xa5, 0xab, 0x0e, 0xa5,
+	0xbb, 0x57, 0x24, 0xec, 0xf3, 0x76, 0x22, 0xe8, 0x2a, 0xbe, 0x84, 0xc2, 0xa8, 0x91, 0x4a, 0xbb,
+	0x2a, 0x25, 0x2e, 0xcf, 0x34, 0x97, 0x2e, 0x77, 0x7b, 0xf7, 0x8a, 0x74, 0x3d, 0x14, 0xa9, 0xc6,
+	0x1d, 0x8e, 0x26, 0x3b, 0x1b, 0x9f, 0xec, 0xab, 0x69, 0x92, 0xbd, 0xbf, 0x00, 0xf3, 0x23, 0x74,
+	0x04, 0x0d, 0x9e, 0x1f, 0x97, 0xd1, 0xa7, 0x73, 0xbe, 0x85, 0x96, 0x5b, 0xc3, 0x70, 0xe1, 0x63,
+	0x6b, 0xb8, 0x35, 0x8c, 0xdf, 0xee, 0x08, 0xef, 0x4e, 0x9f, 0xf3, 0x03, 0xd8, 0xd2, 0x68, 0x08,
+	0xdf, 0x20, 0x28, 0xf2, 0x28, 0x81, 0x03, 0xad, 0xc6, 0x87, 0x08, 0xaa, 0x53, 0xe6, 0xbf, 0xab,
+	0x53, 0xb2, 0x03, 0xfd, 0x87, 0x87, 0x35, 0x50, 0x83, 0xff, 0x29, 0xd6, 0x70, 0x03, 0x66, 0x53,
+	0x9d, 0xf6, 0x4f, 0x5c, 0x9e, 0x81, 0xca, 0xab, 0x89, 0xc4, 0xcd, 0x2d, 0x3b, 0x57, 0x74, 0xaf,
+	0xe4, 0x6e, 0x53, 0xde, 0xe7, 0x73, 0xc9, 0x12, 0xad, 0xc0, 0x5c, 0xe8, 0x38, 0x3e, 0xe9, 0xe6,
+	0x2e, 0xff, 0x75, 0x0d, 0x72, 0x81, 0x96, 0xc6, 0x3f, 0x20, 0x98, 0x0b, 0x09, 0x27, 0x7e, 0x2d,
+	0xd6, 0x7b, 0xb4, 0xfc, 0x17, 0x5f, 0x4f, 0x6f, 0xe8, 0x9c, 0x61, 0xe1, 0xd5, 0x4f, 0x7f, 0xfb,
+	0xfd, 0xf3, 0xcc, 0x4d, 0x5c, 0x1a, 0x3c, 0xb8, 0x3f, 0x76, 0xb2, 0xbb, 0xab, 0xe9, 0xec, 0x03,
+	0xd2, 0x32, 0x0d, 0x71, 0x4b, 0x54, 0x3a, 0x84, 0x9a, 0x8f, 0xc5, 0xa0, 0x16, 0x7f, 0x87, 0x60,
+	0x76, 0x48, 0x64, 0xf1, 0x2b, 0xb1, 0x18, 0xa2, 0x44, 0xb9, 0x98, 0x26, 0xa3, 0x51, 0x68, 0xed,
+	0xc3, 0x3e, 0x82, 0x35, 0x08, 0x55, 0xdc, 0x7a, 0x8c, 0x7f, 0x44, 0x90, 0x0f, 0x0b, 0x38, 0x8e,
+	0x4f, 0xda, 0x18, 0xcd, 0x4f, 0x87, 0xf9, 0x80, 0x63, 0xde, 0x15, 0x52, 0x66, 0x78, 0x3b, 0xa8,
+	0xd7, 0xf8, 0x17, 0x04, 0xf9, 0xf0, 0x45, 0x9c, 0x80, 0xc0, 0x98, 0xd7, 0x40, 0x3a, 0x02, 0x0d,
+	0x4e, 0xa0, 0x56, 0xde, 0xf6, 0x09, 0x04, 0x3f, 0xca, 0x92, 0x14, 0x60, 0x98, 0xcc, 0x97, 0x08,
+	0xf2, 0xe1, 0x3b, 0x3e, 0x01, 0x99, 0x31, 0xef, 0x81, 0xe2, 0xd2, 0xc8, 0x25, 0x53, 0xb5, 0xbf,
+	0xc8, 0xbc, 0x66, 0xd9, 0xfa, 0x17, 0xcd, 0xb2, 0x14, 0xad, 0x7c, 0xf8, 0xcd, 0x58, 0x90, 0xff,
+	0xf8, 0x08, 0x29, 0xae, 0x7a, 0xf6, 0x81, 0x2f, 0xcc, 0x52, 0xc3, 0xfb, 0xc2, 0x14, 0xaa, 0x1c,
+	0xf1, 0x5b, 0xc2, 0x76, 0xca, 0x56, 0x39, 0xf7, 0x83, 0x6e, 0xa3, 0x2d, 0x9f, 0xc0, 0x88, 0x90,
+	0x26, 0x25, 0x30, 0x4e, 0x81, 0x9f, 0x2a, 0x01, 0x27, 0xa8, 0x4d, 0xe0, 0x27, 0x04, 0x0b, 0x11,
+	0x1a, 0x8d, 0x77, 0x92, 0xa1, 0x8f, 0x54, 0xf6, 0x38, 0xe8, 0x4d, 0x0e, 0xfd, 0x6d, 0xa1, 0x1a,
+	0x0b, 0x3d, 0xd4, 0x2f, 0xa2, 0xa7, 0x93, 0x0e, 0x0b, 0x27, 0xf8, 0x10, 0x8b, 0x61, 0xf5, 0x4e,
+	0xca, 0x22, 0x52, 0xf3, 0x9f, 0x15, 0x0b, 0xbf, 0x99, 0x06, 0x2c, 0x86, 0xb5, 0x39, 0x29, 0x8b,
+	0x48, 0x45, 0x7f, 0x56, 0x2c, 0x06, 0x1d, 0xb5, 0xff, 0x3d, 0x82, 0x8d, 0x16, 0xeb, 0xc5, 0x61,
+	0xde, 0x0f, 0x3c, 0x03, 0x9a, 0xf6, 0x6d, 0xd2, 0x44, 0xef, 0xd5, 0x5c, 0x9b, 0x0e, 0xb3, 0x9f,
+	0x0c, 0x25, 0xa6, 0x77, 0xc4, 0x0e, 0xa1, 0xfc, 0xae, 0x11, 0x9d, 0x25, 0x45, 0x53, 0x8d, 0xb1,
+	0x7f, 0x60, 0xed, 0xf8, 0x53, 0x7f, 0x22, 0xf4, 0x55, 0x26, 0x53, 0x39, 0xfc, 0x36, 0xb3, 0x76,
+	0xc7, 0xf1, 0x79, 0xc0, 0x71, 0x54, 0x7c, 0x1c, 0xf7, 0x1d, 0xa3, 0xf3, 0x49, 0xee, 0xff, 0xf6,
+	0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfb, 0xe2, 0x2e, 0xe6, 0x1f, 0x13, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1536,89 +1579,3 @@ var _EntityTypes_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2beta1/entity_type.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/entity_type.proto", fileDescriptor_entity_type_6dfa1fc30f052b5b)
-}
-
-var fileDescriptor_entity_type_6dfa1fc30f052b5b = []byte{
-	// 1246 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x6f, 0xe3, 0x44,
-	0x14, 0xdf, 0x49, 0xb3, 0x55, 0xfb, 0xd2, 0x6e, 0xd3, 0x69, 0xb7, 0x0d, 0xe9, 0x96, 0x16, 0x57,
-	0x42, 0x55, 0x11, 0xf1, 0x6e, 0x56, 0xfc, 0x6b, 0x55, 0x50, 0xdb, 0xa4, 0xbb, 0x61, 0xdb, 0x24,
-	0x72, 0xdb, 0x15, 0x70, 0xb1, 0xdc, 0x64, 0x1a, 0x4c, 0x93, 0x19, 0xe3, 0x3f, 0xcb, 0x66, 0xd1,
-	0x72, 0xe0, 0x1b, 0x20, 0x6e, 0x88, 0x13, 0xe2, 0x02, 0x88, 0x6f, 0x80, 0xb8, 0x70, 0x82, 0x13,
-	0x12, 0x5f, 0x01, 0xf1, 0x19, 0x90, 0xb8, 0x20, 0x8f, 0xed, 0xd8, 0x71, 0x1c, 0x6c, 0xc3, 0xee,
-	0x8a, 0x5b, 0xe6, 0xcf, 0x7b, 0xef, 0xf7, 0x7b, 0xef, 0xcd, 0xfc, 0xc6, 0x81, 0x5b, 0x1d, 0xc6,
-	0x3a, 0x5d, 0x22, 0xb6, 0xba, 0xcc, 0x6a, 0x8b, 0x6d, 0x55, 0xe9, 0xb2, 0xce, 0x45, 0x97, 0x7d,
-	0x24, 0x3e, 0x28, 0x9f, 0x13, 0x53, 0xb9, 0x25, 0x12, 0x6a, 0xaa, 0x66, 0x5f, 0x36, 0xfb, 0x1a,
-	0x29, 0x69, 0x3a, 0x33, 0x19, 0x5e, 0x73, 0x4c, 0x4a, 0xdc, 0xa4, 0xe4, 0x9b, 0x94, 0x5c, 0x93,
-	0xe2, 0x0d, 0xd7, 0xa7, 0xa2, 0xa9, 0xa2, 0x42, 0x29, 0x33, 0x15, 0x53, 0x65, 0xd4, 0x70, 0xcc,
-	0x8b, 0xcf, 0x05, 0x56, 0x75, 0x62, 0x30, 0x4b, 0x6f, 0xb9, 0x9e, 0x8b, 0x1b, 0xee, 0x52, 0x97,
-	0xd1, 0x8e, 0x6e, 0x51, 0xaa, 0xd2, 0x8e, 0xc8, 0x34, 0xa2, 0x0f, 0xd9, 0xaf, 0xb8, 0x9b, 0xf8,
-	0xe8, 0xdc, 0xba, 0x10, 0x49, 0x4f, 0x33, 0xfb, 0xee, 0xe2, 0x7a, 0x78, 0xf1, 0x42, 0x25, 0xdd,
-	0xb6, 0xdc, 0x53, 0x8c, 0x4b, 0x77, 0xc7, 0x8d, 0xf0, 0x0e, 0xc3, 0xd4, 0xad, 0x96, 0xe9, 0xac,
-	0x0a, 0x5f, 0x64, 0x01, 0xaa, 0x9c, 0xf1, 0x69, 0x5f, 0x23, 0x18, 0x43, 0x96, 0x2a, 0x3d, 0x52,
-	0x40, 0xeb, 0x68, 0x73, 0x5a, 0xe2, 0xbf, 0xf1, 0x0b, 0x30, 0xd3, 0x56, 0x0d, 0xad, 0xab, 0xf4,
-	0x65, 0xbe, 0x96, 0xe1, 0x6b, 0x39, 0x77, 0xae, 0x6e, 0x6f, 0xa9, 0x40, 0xf6, 0x52, 0xa5, 0xed,
-	0xc2, 0xc4, 0x3a, 0xda, 0xbc, 0x56, 0xbe, 0x59, 0x8a, 0x49, 0x58, 0xc9, 0x8f, 0x58, 0xba, 0xa7,
-	0xd2, 0xb6, 0xc4, 0xad, 0x71, 0x0f, 0x16, 0x14, 0xcb, 0x64, 0x32, 0x79, 0xa8, 0x29, 0xd4, 0x50,
-	0x19, 0x95, 0x7b, 0xac, 0x4d, 0x0a, 0x59, 0xee, 0x74, 0x37, 0x8d, 0xd3, 0x3d, 0xcb, 0x64, 0x55,
-	0xcf, 0xcb, 0x31, 0x6b, 0x13, 0x69, 0x5e, 0x09, 0x4f, 0xe1, 0x3a, 0x4c, 0xf1, 0x5a, 0xab, 0xc4,
-	0x28, 0x4c, 0xae, 0x4f, 0x6c, 0xe6, 0xca, 0xe5, 0x34, 0x31, 0x9c, 0x9f, 0xd2, 0xc0, 0x47, 0x71,
-	0x1b, 0x26, 0x9d, 0x39, 0xbc, 0x08, 0x57, 0x1f, 0x28, 0x5d, 0xcb, 0x4b, 0xa3, 0x33, 0xc0, 0x45,
-	0x98, 0x32, 0xfa, 0x94, 0xd1, 0x7e, 0xcf, 0x28, 0x64, 0xd6, 0x27, 0x36, 0xa7, 0xa5, 0xc1, 0x58,
-	0x78, 0x03, 0xb2, 0x76, 0x22, 0xf0, 0x22, 0xe4, 0xef, 0xd5, 0xea, 0x15, 0xf9, 0xac, 0x7e, 0xd2,
-	0xac, 0x1e, 0xd4, 0x0e, 0x6b, 0xd5, 0x4a, 0xfe, 0x0a, 0x9e, 0x81, 0x29, 0x3e, 0x7b, 0xbc, 0xd7,
-	0xcc, 0x23, 0x3c, 0x0b, 0xd3, 0x7c, 0x74, 0x54, 0x3b, 0x39, 0xcd, 0x67, 0x84, 0x77, 0x61, 0x7e,
-	0x84, 0x2e, 0xde, 0x80, 0xb5, 0xbd, 0xb3, 0xd3, 0x86, 0x5c, 0x7d, 0xa7, 0xb9, 0x57, 0x3f, 0xa9,
-	0x35, 0xea, 0xf2, 0x71, 0xa3, 0x52, 0x0d, 0xb9, 0x5d, 0x83, 0x95, 0xa8, 0x4d, 0x95, 0xea, 0xe1,
-	0xde, 0xd9, 0xd1, 0x69, 0x1e, 0x09, 0x9f, 0x21, 0x58, 0x3a, 0x52, 0x0d, 0xd3, 0x67, 0x6d, 0x48,
-	0xe4, 0x43, 0x8b, 0x18, 0x26, 0x5e, 0x82, 0x49, 0x4d, 0xd1, 0x09, 0x35, 0x5d, 0x8e, 0xee, 0x08,
-	0x6f, 0xc0, 0x6c, 0x57, 0xa1, 0x1d, 0x4b, 0xe9, 0x10, 0xb9, 0x65, 0x57, 0xcf, 0xe9, 0x96, 0x19,
-	0x6f, 0xf2, 0xc0, 0x46, 0xb7, 0x02, 0xd3, 0x9a, 0xbd, 0xc1, 0x50, 0x1f, 0x11, 0xde, 0x33, 0x57,
-	0xa5, 0x29, 0x7b, 0xe2, 0x44, 0x7d, 0x44, 0xf0, 0x2a, 0x00, 0x5f, 0x34, 0xd9, 0x25, 0xa1, 0xbc,
-	0xf8, 0xd3, 0x12, 0xdf, 0x7e, 0x6a, 0x4f, 0xd8, 0x98, 0x96, 0x47, 0x30, 0x19, 0x1a, 0xa3, 0x86,
-	0x5d, 0xd1, 0x99, 0xc0, 0xe9, 0x35, 0x0a, 0x88, 0x57, 0xf5, 0xa5, 0x14, 0x55, 0x95, 0x72, 0xc4,
-	0xf7, 0x8b, 0x5f, 0x84, 0x39, 0x4a, 0x1e, 0x9a, 0x72, 0x00, 0x8f, 0x43, 0x67, 0xd6, 0x9e, 0x6e,
-	0x0e, 0x30, 0x35, 0x60, 0xf1, 0x0e, 0x09, 0x20, 0xf2, 0x92, 0x14, 0x75, 0x9a, 0x92, 0x24, 0x48,
-	0xf8, 0x1a, 0xc1, 0xf2, 0x81, 0x4e, 0x14, 0x93, 0x8c, 0x3a, 0x1d, 0x97, 0xf9, 0x23, 0xc8, 0x05,
-	0xc8, 0x73, 0xb7, 0x29, 0xb9, 0x83, 0xcf, 0x7d, 0x14, 0xe6, 0x44, 0x04, 0xcc, 0x9f, 0x11, 0x2c,
-	0x9f, 0x69, 0xed, 0x48, 0x98, 0x21, 0x38, 0xe8, 0x09, 0xc3, 0x89, 0x6a, 0xab, 0x1d, 0xc8, 0x59,
-	0x1c, 0x0d, 0xbf, 0xfe, 0x38, 0xe2, 0x5c, 0xb9, 0xe8, 0x85, 0xf4, 0xee, 0xbf, 0xd2, 0xa1, 0x7d,
-	0x43, 0x1e, 0x2b, 0xc6, 0xa5, 0x04, 0xce, 0x76, 0xfb, 0xb7, 0xf0, 0x32, 0x2c, 0x57, 0x48, 0x97,
-	0x44, 0x51, 0x89, 0x28, 0xa3, 0xf0, 0x6b, 0x06, 0x56, 0xf7, 0x15, 0xb3, 0xf5, 0x7e, 0x98, 0x7f,
-	0xec, 0x09, 0xb9, 0x0d, 0xd7, 0x03, 0x89, 0x91, 0xcf, 0x6d, 0x27, 0xb2, 0xa5, 0xab, 0x0e, 0xa5,
-	0xbb, 0x57, 0x24, 0xec, 0xf3, 0x76, 0x22, 0xe8, 0x2a, 0xbe, 0x84, 0xc2, 0xa8, 0x91, 0x4a, 0xbb,
-	0x2a, 0x25, 0x2e, 0xcf, 0x34, 0x97, 0x2e, 0x77, 0x7b, 0xf7, 0x8a, 0x74, 0x3d, 0x14, 0xa9, 0xc6,
-	0x1d, 0x8e, 0x26, 0x3b, 0x1b, 0x9f, 0xec, 0xab, 0x69, 0x92, 0xbd, 0xbf, 0x00, 0xf3, 0x23, 0x74,
-	0x04, 0x0d, 0x9e, 0x1f, 0x97, 0xd1, 0xa7, 0x73, 0xbe, 0x85, 0x96, 0x5b, 0xc3, 0x70, 0xe1, 0x63,
-	0x6b, 0xb8, 0x35, 0x8c, 0xdf, 0xee, 0x08, 0xef, 0x4e, 0x9f, 0xf3, 0x03, 0xd8, 0xd2, 0x68, 0x08,
-	0xdf, 0x20, 0x28, 0xf2, 0x28, 0x81, 0x03, 0xad, 0xc6, 0x87, 0x08, 0xaa, 0x53, 0xe6, 0xbf, 0xab,
-	0x53, 0xb2, 0x03, 0xfd, 0x87, 0x87, 0x35, 0x50, 0x83, 0xff, 0x29, 0xd6, 0x70, 0x03, 0x66, 0x53,
-	0x9d, 0xf6, 0x4f, 0x5c, 0x9e, 0x81, 0xca, 0xab, 0x89, 0xc4, 0xcd, 0x2d, 0x3b, 0x57, 0x74, 0xaf,
-	0xe4, 0x6e, 0x53, 0xde, 0xe7, 0x73, 0xc9, 0x12, 0xad, 0xc0, 0x5c, 0xe8, 0x38, 0x3e, 0xe9, 0xe6,
-	0x2e, 0xff, 0x75, 0x0d, 0x72, 0x81, 0x96, 0xc6, 0x3f, 0x20, 0x98, 0x0b, 0x09, 0x27, 0x7e, 0x2d,
-	0xd6, 0x7b, 0xb4, 0xfc, 0x17, 0x5f, 0x4f, 0x6f, 0xe8, 0x9c, 0x61, 0xe1, 0xd5, 0x4f, 0x7f, 0xfb,
-	0xfd, 0xf3, 0xcc, 0x4d, 0x5c, 0x1a, 0x3c, 0xb8, 0x3f, 0x76, 0xb2, 0xbb, 0xab, 0xe9, 0xec, 0x03,
-	0xd2, 0x32, 0x0d, 0x71, 0x4b, 0x54, 0x3a, 0x84, 0x9a, 0x8f, 0xc5, 0xa0, 0x16, 0x7f, 0x87, 0x60,
-	0x76, 0x48, 0x64, 0xf1, 0x2b, 0xb1, 0x18, 0xa2, 0x44, 0xb9, 0x98, 0x26, 0xa3, 0x51, 0x68, 0xed,
-	0xc3, 0x3e, 0x82, 0x35, 0x08, 0x55, 0xdc, 0x7a, 0x8c, 0x7f, 0x44, 0x90, 0x0f, 0x0b, 0x38, 0x8e,
-	0x4f, 0xda, 0x18, 0xcd, 0x4f, 0x87, 0xf9, 0x80, 0x63, 0xde, 0x15, 0x52, 0x66, 0x78, 0x3b, 0xa8,
-	0xd7, 0xf8, 0x17, 0x04, 0xf9, 0xf0, 0x45, 0x9c, 0x80, 0xc0, 0x98, 0xd7, 0x40, 0x3a, 0x02, 0x0d,
-	0x4e, 0xa0, 0x56, 0xde, 0xf6, 0x09, 0x04, 0x3f, 0xca, 0x92, 0x14, 0x60, 0x98, 0xcc, 0x97, 0x08,
-	0xf2, 0xe1, 0x3b, 0x3e, 0x01, 0x99, 0x31, 0xef, 0x81, 0xe2, 0xd2, 0xc8, 0x25, 0x53, 0xb5, 0xbf,
-	0xc8, 0xbc, 0x66, 0xd9, 0xfa, 0x17, 0xcd, 0xb2, 0x14, 0xad, 0x7c, 0xf8, 0xcd, 0x58, 0x90, 0xff,
-	0xf8, 0x08, 0x29, 0xae, 0x7a, 0xf6, 0x81, 0x2f, 0xcc, 0x52, 0xc3, 0xfb, 0xc2, 0x14, 0xaa, 0x1c,
-	0xf1, 0x5b, 0xc2, 0x76, 0xca, 0x56, 0x39, 0xf7, 0x83, 0x6e, 0xa3, 0x2d, 0x9f, 0xc0, 0x88, 0x90,
-	0x26, 0x25, 0x30, 0x4e, 0x81, 0x9f, 0x2a, 0x01, 0x27, 0xa8, 0x4d, 0xe0, 0x27, 0x04, 0x0b, 0x11,
-	0x1a, 0x8d, 0x77, 0x92, 0xa1, 0x8f, 0x54, 0xf6, 0x38, 0xe8, 0x4d, 0x0e, 0xfd, 0x6d, 0xa1, 0x1a,
-	0x0b, 0x3d, 0xd4, 0x2f, 0xa2, 0xa7, 0x93, 0x0e, 0x0b, 0x27, 0xf8, 0x10, 0x8b, 0x61, 0xf5, 0x4e,
-	0xca, 0x22, 0x52, 0xf3, 0x9f, 0x15, 0x0b, 0xbf, 0x99, 0x06, 0x2c, 0x86, 0xb5, 0x39, 0x29, 0x8b,
-	0x48, 0x45, 0x7f, 0x56, 0x2c, 0x06, 0x1d, 0xb5, 0xff, 0x3d, 0x82, 0x8d, 0x16, 0xeb, 0xc5, 0x61,
-	0xde, 0x0f, 0x3c, 0x03, 0x9a, 0xf6, 0x6d, 0xd2, 0x44, 0xef, 0xd5, 0x5c, 0x9b, 0x0e, 0xb3, 0x9f,
-	0x0c, 0x25, 0xa6, 0x77, 0xc4, 0x0e, 0xa1, 0xfc, 0xae, 0x11, 0x9d, 0x25, 0x45, 0x53, 0x8d, 0xb1,
-	0x7f, 0x60, 0xed, 0xf8, 0x53, 0x7f, 0x22, 0xf4, 0x55, 0x26, 0x53, 0x39, 0xfc, 0x36, 0xb3, 0x76,
-	0xc7, 0xf1, 0x79, 0xc0, 0x71, 0x54, 0x7c, 0x1c, 0xf7, 0x1d, 0xa3, 0xf3, 0x49, 0xee, 0xff, 0xf6,
-	0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfb, 0xe2, 0x2e, 0xe6, 0x1f, 0x13, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/intent.pb.go b/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
index 46cb31a104..e54a2bfad6 100644
--- a/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/intent.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the options for views of an intent.
 // An intent can be a sizable object. Therefore, we provide a resource view that
@@ -45,6 +45,7 @@ var IntentView_name = map[int32]string{
 	0: "INTENT_VIEW_UNSPECIFIED",
 	1: "INTENT_VIEW_FULL",
 }
+
 var IntentView_value = map[string]int32{
 	"INTENT_VIEW_UNSPECIFIED": 0,
 	"INTENT_VIEW_FULL":        1,
@@ -53,8 +54,9 @@ var IntentView_value = map[string]int32{
 func (x IntentView) String() string {
 	return proto.EnumName(IntentView_name, int32(x))
 }
+
 func (IntentView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0}
 }
 
 // Represents the different states that webhooks can be in.
@@ -75,6 +77,7 @@ var Intent_WebhookState_name = map[int32]string{
 	1: "WEBHOOK_STATE_ENABLED",
 	2: "WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING",
 }
+
 var Intent_WebhookState_value = map[string]int32{
 	"WEBHOOK_STATE_UNSPECIFIED":              0,
 	"WEBHOOK_STATE_ENABLED":                  1,
@@ -84,8 +87,9 @@ var Intent_WebhookState_value = map[string]int32{
 func (x Intent_WebhookState) String() string {
 	return proto.EnumName(Intent_WebhookState_name, int32(x))
 }
+
 func (Intent_WebhookState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 0}
 }
 
 // Represents different types of training phrases.
@@ -111,6 +115,7 @@ var Intent_TrainingPhrase_Type_name = map[int32]string{
 	1: "EXAMPLE",
 	2: "TEMPLATE",
 }
+
 var Intent_TrainingPhrase_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"EXAMPLE":          1,
@@ -120,8 +125,9 @@ var Intent_TrainingPhrase_Type_value = map[string]int32{
 func (x Intent_TrainingPhrase_Type) String() string {
 	return proto.EnumName(Intent_TrainingPhrase_Type_name, int32(x))
 }
+
 func (Intent_TrainingPhrase_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 0, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 0, 0}
 }
 
 // Represents different platforms that a rich message can be intended for.
@@ -222,6 +228,7 @@ var Intent_Message_Platform_name = map[int32]string{
 	8:  "ACTIONS_ON_GOOGLE",
 	10: "TELEPHONY",
 }
+
 var Intent_Message_Platform_value = map[string]int32{
 	"PLATFORM_UNSPECIFIED": 0,
 	"FACEBOOK":             1,
@@ -238,8 +245,9 @@ var Intent_Message_Platform_value = map[string]int32{
 func (x Intent_Message_Platform) String() string {
 	return proto.EnumName(Intent_Message_Platform_name, int32(x))
 }
+
 func (Intent_Message_Platform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 0}
 }
 
 // Represents an intent.
@@ -341,16 +349,17 @@ func (m *Intent) Reset()         { *m = Intent{} }
 func (m *Intent) String() string { return proto.CompactTextString(m) }
 func (*Intent) ProtoMessage()    {}
 func (*Intent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0}
 }
+
 func (m *Intent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent.Unmarshal(m, b)
 }
 func (m *Intent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent.Marshal(b, m, deterministic)
 }
-func (dst *Intent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent.Merge(dst, src)
+func (m *Intent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent.Merge(m, src)
 }
 func (m *Intent) XXX_Size() int {
 	return xxx_messageInfo_Intent.Size(m)
@@ -541,16 +550,17 @@ func (m *Intent_TrainingPhrase) Reset()         { *m = Intent_TrainingPhrase{} }
 func (m *Intent_TrainingPhrase) String() string { return proto.CompactTextString(m) }
 func (*Intent_TrainingPhrase) ProtoMessage()    {}
 func (*Intent_TrainingPhrase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 0}
 }
+
 func (m *Intent_TrainingPhrase) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_TrainingPhrase.Unmarshal(m, b)
 }
 func (m *Intent_TrainingPhrase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_TrainingPhrase.Marshal(b, m, deterministic)
 }
-func (dst *Intent_TrainingPhrase) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_TrainingPhrase.Merge(dst, src)
+func (m *Intent_TrainingPhrase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase.Merge(m, src)
 }
 func (m *Intent_TrainingPhrase) XXX_Size() int {
 	return xxx_messageInfo_Intent_TrainingPhrase.Size(m)
@@ -614,16 +624,17 @@ func (m *Intent_TrainingPhrase_Part) Reset()         { *m = Intent_TrainingPhras
 func (m *Intent_TrainingPhrase_Part) String() string { return proto.CompactTextString(m) }
 func (*Intent_TrainingPhrase_Part) ProtoMessage()    {}
 func (*Intent_TrainingPhrase_Part) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 0, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 0, 0}
 }
+
 func (m *Intent_TrainingPhrase_Part) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_TrainingPhrase_Part.Unmarshal(m, b)
 }
 func (m *Intent_TrainingPhrase_Part) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_TrainingPhrase_Part.Marshal(b, m, deterministic)
 }
-func (dst *Intent_TrainingPhrase_Part) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_TrainingPhrase_Part.Merge(dst, src)
+func (m *Intent_TrainingPhrase_Part) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase_Part.Merge(m, src)
 }
 func (m *Intent_TrainingPhrase_Part) XXX_Size() int {
 	return xxx_messageInfo_Intent_TrainingPhrase_Part.Size(m)
@@ -702,16 +713,17 @@ func (m *Intent_Parameter) Reset()         { *m = Intent_Parameter{} }
 func (m *Intent_Parameter) String() string { return proto.CompactTextString(m) }
 func (*Intent_Parameter) ProtoMessage()    {}
 func (*Intent_Parameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 1}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 1}
 }
+
 func (m *Intent_Parameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Parameter.Unmarshal(m, b)
 }
 func (m *Intent_Parameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Parameter.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Parameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Parameter.Merge(dst, src)
+func (m *Intent_Parameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Parameter.Merge(m, src)
 }
 func (m *Intent_Parameter) XXX_Size() int {
 	return xxx_messageInfo_Intent_Parameter.Size(m)
@@ -809,16 +821,17 @@ func (m *Intent_Message) Reset()         { *m = Intent_Message{} }
 func (m *Intent_Message) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message) ProtoMessage()    {}
 func (*Intent_Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2}
 }
+
 func (m *Intent_Message) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message.Unmarshal(m, b)
 }
 func (m *Intent_Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message.Merge(dst, src)
+func (m *Intent_Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message.Merge(m, src)
 }
 func (m *Intent_Message) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message.Size(m)
@@ -1029,9 +1042,9 @@ func (m *Intent_Message) GetPlatform() Intent_Message_Platform {
 	return Intent_Message_PLATFORM_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Intent_Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Intent_Message_OneofMarshaler, _Intent_Message_OneofUnmarshaler, _Intent_Message_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Intent_Message) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Intent_Message_Text_)(nil),
 		(*Intent_Message_Image_)(nil),
 		(*Intent_Message_QuickReplies_)(nil),
@@ -1049,288 +1062,6 @@ func (*Intent_Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _Intent_Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Intent_Message)
-	// message
-	switch x := m.Message.(type) {
-	case *Intent_Message_Text_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Text); err != nil {
-			return err
-		}
-	case *Intent_Message_Image_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Image); err != nil {
-			return err
-		}
-	case *Intent_Message_QuickReplies_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.QuickReplies); err != nil {
-			return err
-		}
-	case *Intent_Message_Card_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Card); err != nil {
-			return err
-		}
-	case *Intent_Message_Payload:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Payload); err != nil {
-			return err
-		}
-	case *Intent_Message_SimpleResponses_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SimpleResponses); err != nil {
-			return err
-		}
-	case *Intent_Message_BasicCard_:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BasicCard); err != nil {
-			return err
-		}
-	case *Intent_Message_Suggestions_:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Suggestions); err != nil {
-			return err
-		}
-	case *Intent_Message_LinkOutSuggestion_:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LinkOutSuggestion); err != nil {
-			return err
-		}
-	case *Intent_Message_ListSelect_:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListSelect); err != nil {
-			return err
-		}
-	case *Intent_Message_CarouselSelect_:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CarouselSelect); err != nil {
-			return err
-		}
-	case *Intent_Message_TelephonyPlayAudio_:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TelephonyPlayAudio); err != nil {
-			return err
-		}
-	case *Intent_Message_TelephonySynthesizeSpeech_:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TelephonySynthesizeSpeech); err != nil {
-			return err
-		}
-	case *Intent_Message_TelephonyTransferCall_:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TelephonyTransferCall); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Intent_Message.Message has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Intent_Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Intent_Message)
-	switch tag {
-	case 1: // message.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Text)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Text_{msg}
-		return true, err
-	case 2: // message.image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Image)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Image_{msg}
-		return true, err
-	case 3: // message.quick_replies
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_QuickReplies)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_QuickReplies_{msg}
-		return true, err
-	case 4: // message.card
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Card)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Card_{msg}
-		return true, err
-	case 5: // message.payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.Struct)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Payload{msg}
-		return true, err
-	case 7: // message.simple_responses
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_SimpleResponses)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_SimpleResponses_{msg}
-		return true, err
-	case 8: // message.basic_card
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_BasicCard)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_BasicCard_{msg}
-		return true, err
-	case 9: // message.suggestions
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_Suggestions)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_Suggestions_{msg}
-		return true, err
-	case 10: // message.link_out_suggestion
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_LinkOutSuggestion)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_LinkOutSuggestion_{msg}
-		return true, err
-	case 11: // message.list_select
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_ListSelect)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_ListSelect_{msg}
-		return true, err
-	case 12: // message.carousel_select
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_CarouselSelect)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_CarouselSelect_{msg}
-		return true, err
-	case 13: // message.telephony_play_audio
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_TelephonyPlayAudio)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_TelephonyPlayAudio_{msg}
-		return true, err
-	case 14: // message.telephony_synthesize_speech
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_TelephonySynthesizeSpeech)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_TelephonySynthesizeSpeech_{msg}
-		return true, err
-	case 15: // message.telephony_transfer_call
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Intent_Message_TelephonyTransferCall)
-		err := b.DecodeMessage(msg)
-		m.Message = &Intent_Message_TelephonyTransferCall_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Intent_Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Intent_Message)
-	// message
-	switch x := m.Message.(type) {
-	case *Intent_Message_Text_:
-		s := proto.Size(x.Text)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Image_:
-		s := proto.Size(x.Image)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_QuickReplies_:
-		s := proto.Size(x.QuickReplies)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Card_:
-		s := proto.Size(x.Card)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Payload:
-		s := proto.Size(x.Payload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_SimpleResponses_:
-		s := proto.Size(x.SimpleResponses)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_BasicCard_:
-		s := proto.Size(x.BasicCard)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_Suggestions_:
-		s := proto.Size(x.Suggestions)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_LinkOutSuggestion_:
-		s := proto.Size(x.LinkOutSuggestion)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_ListSelect_:
-		s := proto.Size(x.ListSelect)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_CarouselSelect_:
-		s := proto.Size(x.CarouselSelect)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_TelephonyPlayAudio_:
-		s := proto.Size(x.TelephonyPlayAudio)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_TelephonySynthesizeSpeech_:
-		s := proto.Size(x.TelephonySynthesizeSpeech)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Intent_Message_TelephonyTransferCall_:
-		s := proto.Size(x.TelephonyTransferCall)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The text response message.
 type Intent_Message_Text struct {
 	// Optional. The collection of the agent's responses.
@@ -1344,16 +1075,17 @@ func (m *Intent_Message_Text) Reset()         { *m = Intent_Message_Text{} }
 func (m *Intent_Message_Text) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Text) ProtoMessage()    {}
 func (*Intent_Message_Text) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 0}
 }
+
 func (m *Intent_Message_Text) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Text.Unmarshal(m, b)
 }
 func (m *Intent_Message_Text) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Text.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Text) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Text.Merge(dst, src)
+func (m *Intent_Message_Text) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Text.Merge(m, src)
 }
 func (m *Intent_Message_Text) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Text.Size(m)
@@ -1387,16 +1119,17 @@ func (m *Intent_Message_Image) Reset()         { *m = Intent_Message_Image{} }
 func (m *Intent_Message_Image) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Image) ProtoMessage()    {}
 func (*Intent_Message_Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 1}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 1}
 }
+
 func (m *Intent_Message_Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Image.Unmarshal(m, b)
 }
 func (m *Intent_Message_Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Image.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Image.Merge(dst, src)
+func (m *Intent_Message_Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Image.Merge(m, src)
 }
 func (m *Intent_Message_Image) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Image.Size(m)
@@ -1436,16 +1169,17 @@ func (m *Intent_Message_QuickReplies) Reset()         { *m = Intent_Message_Quic
 func (m *Intent_Message_QuickReplies) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_QuickReplies) ProtoMessage()    {}
 func (*Intent_Message_QuickReplies) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 2}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 2}
 }
+
 func (m *Intent_Message_QuickReplies) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_QuickReplies.Unmarshal(m, b)
 }
 func (m *Intent_Message_QuickReplies) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_QuickReplies.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_QuickReplies) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_QuickReplies.Merge(dst, src)
+func (m *Intent_Message_QuickReplies) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_QuickReplies.Merge(m, src)
 }
 func (m *Intent_Message_QuickReplies) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_QuickReplies.Size(m)
@@ -1489,16 +1223,17 @@ func (m *Intent_Message_Card) Reset()         { *m = Intent_Message_Card{} }
 func (m *Intent_Message_Card) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Card) ProtoMessage()    {}
 func (*Intent_Message_Card) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 3}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 3}
 }
+
 func (m *Intent_Message_Card) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Card.Unmarshal(m, b)
 }
 func (m *Intent_Message_Card) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Card.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Card) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Card.Merge(dst, src)
+func (m *Intent_Message_Card) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card.Merge(m, src)
 }
 func (m *Intent_Message_Card) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Card.Size(m)
@@ -1553,16 +1288,17 @@ func (m *Intent_Message_Card_Button) Reset()         { *m = Intent_Message_Card_
 func (m *Intent_Message_Card_Button) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Card_Button) ProtoMessage()    {}
 func (*Intent_Message_Card_Button) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 3, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 3, 0}
 }
+
 func (m *Intent_Message_Card_Button) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Card_Button.Unmarshal(m, b)
 }
 func (m *Intent_Message_Card_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Card_Button.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Card_Button) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Card_Button.Merge(dst, src)
+func (m *Intent_Message_Card_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card_Button.Merge(m, src)
 }
 func (m *Intent_Message_Card_Button) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Card_Button.Size(m)
@@ -1607,16 +1343,17 @@ func (m *Intent_Message_SimpleResponse) Reset()         { *m = Intent_Message_Si
 func (m *Intent_Message_SimpleResponse) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SimpleResponse) ProtoMessage()    {}
 func (*Intent_Message_SimpleResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 4}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 4}
 }
+
 func (m *Intent_Message_SimpleResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_SimpleResponse.Unmarshal(m, b)
 }
 func (m *Intent_Message_SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_SimpleResponse.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_SimpleResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_SimpleResponse.Merge(dst, src)
+func (m *Intent_Message_SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponse.Merge(m, src)
 }
 func (m *Intent_Message_SimpleResponse) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_SimpleResponse.Size(m)
@@ -1664,16 +1401,17 @@ func (m *Intent_Message_SimpleResponses) Reset()         { *m = Intent_Message_S
 func (m *Intent_Message_SimpleResponses) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SimpleResponses) ProtoMessage()    {}
 func (*Intent_Message_SimpleResponses) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 5}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 5}
 }
+
 func (m *Intent_Message_SimpleResponses) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_SimpleResponses.Unmarshal(m, b)
 }
 func (m *Intent_Message_SimpleResponses) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_SimpleResponses.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_SimpleResponses) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_SimpleResponses.Merge(dst, src)
+func (m *Intent_Message_SimpleResponses) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponses.Merge(m, src)
 }
 func (m *Intent_Message_SimpleResponses) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_SimpleResponses.Size(m)
@@ -1712,16 +1450,17 @@ func (m *Intent_Message_BasicCard) Reset()         { *m = Intent_Message_BasicCa
 func (m *Intent_Message_BasicCard) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_BasicCard) ProtoMessage()    {}
 func (*Intent_Message_BasicCard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 6}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 6}
 }
+
 func (m *Intent_Message_BasicCard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_BasicCard.Unmarshal(m, b)
 }
 func (m *Intent_Message_BasicCard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_BasicCard.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_BasicCard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_BasicCard.Merge(dst, src)
+func (m *Intent_Message_BasicCard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard.Merge(m, src)
 }
 func (m *Intent_Message_BasicCard) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_BasicCard.Size(m)
@@ -1782,16 +1521,17 @@ func (m *Intent_Message_BasicCard_Button) Reset()         { *m = Intent_Message_
 func (m *Intent_Message_BasicCard_Button) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_BasicCard_Button) ProtoMessage()    {}
 func (*Intent_Message_BasicCard_Button) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 6, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 6, 0}
 }
+
 func (m *Intent_Message_BasicCard_Button) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button.Unmarshal(m, b)
 }
 func (m *Intent_Message_BasicCard_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_BasicCard_Button) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_BasicCard_Button.Merge(dst, src)
+func (m *Intent_Message_BasicCard_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button.Merge(m, src)
 }
 func (m *Intent_Message_BasicCard_Button) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button.Size(m)
@@ -1833,16 +1573,17 @@ func (m *Intent_Message_BasicCard_Button_OpenUriAction) String() string {
 }
 func (*Intent_Message_BasicCard_Button_OpenUriAction) ProtoMessage() {}
 func (*Intent_Message_BasicCard_Button_OpenUriAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 6, 0, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 6, 0, 0}
 }
+
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Unmarshal(m, b)
 }
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Merge(dst, src)
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Merge(m, src)
 }
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Size(m)
@@ -1874,16 +1615,17 @@ func (m *Intent_Message_Suggestion) Reset()         { *m = Intent_Message_Sugges
 func (m *Intent_Message_Suggestion) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Suggestion) ProtoMessage()    {}
 func (*Intent_Message_Suggestion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 7}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 7}
 }
+
 func (m *Intent_Message_Suggestion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Suggestion.Unmarshal(m, b)
 }
 func (m *Intent_Message_Suggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Suggestion.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Suggestion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Suggestion.Merge(dst, src)
+func (m *Intent_Message_Suggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestion.Merge(m, src)
 }
 func (m *Intent_Message_Suggestion) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Suggestion.Size(m)
@@ -1914,16 +1656,17 @@ func (m *Intent_Message_Suggestions) Reset()         { *m = Intent_Message_Sugge
 func (m *Intent_Message_Suggestions) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Suggestions) ProtoMessage()    {}
 func (*Intent_Message_Suggestions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 8}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 8}
 }
+
 func (m *Intent_Message_Suggestions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_Suggestions.Unmarshal(m, b)
 }
 func (m *Intent_Message_Suggestions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_Suggestions.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_Suggestions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_Suggestions.Merge(dst, src)
+func (m *Intent_Message_Suggestions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestions.Merge(m, src)
 }
 func (m *Intent_Message_Suggestions) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_Suggestions.Size(m)
@@ -1958,16 +1701,17 @@ func (m *Intent_Message_LinkOutSuggestion) Reset()         { *m = Intent_Message
 func (m *Intent_Message_LinkOutSuggestion) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_LinkOutSuggestion) ProtoMessage()    {}
 func (*Intent_Message_LinkOutSuggestion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 9}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 9}
 }
+
 func (m *Intent_Message_LinkOutSuggestion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Unmarshal(m, b)
 }
 func (m *Intent_Message_LinkOutSuggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_LinkOutSuggestion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_LinkOutSuggestion.Merge(dst, src)
+func (m *Intent_Message_LinkOutSuggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_LinkOutSuggestion.Merge(m, src)
 }
 func (m *Intent_Message_LinkOutSuggestion) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Size(m)
@@ -2007,16 +1751,17 @@ func (m *Intent_Message_ListSelect) Reset()         { *m = Intent_Message_ListSe
 func (m *Intent_Message_ListSelect) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_ListSelect) ProtoMessage()    {}
 func (*Intent_Message_ListSelect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 10}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 10}
 }
+
 func (m *Intent_Message_ListSelect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_ListSelect.Unmarshal(m, b)
 }
 func (m *Intent_Message_ListSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_ListSelect.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_ListSelect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_ListSelect.Merge(dst, src)
+func (m *Intent_Message_ListSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect.Merge(m, src)
 }
 func (m *Intent_Message_ListSelect) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_ListSelect.Size(m)
@@ -2060,16 +1805,17 @@ func (m *Intent_Message_ListSelect_Item) Reset()         { *m = Intent_Message_L
 func (m *Intent_Message_ListSelect_Item) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_ListSelect_Item) ProtoMessage()    {}
 func (*Intent_Message_ListSelect_Item) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 10, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 10, 0}
 }
+
 func (m *Intent_Message_ListSelect_Item) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_ListSelect_Item.Unmarshal(m, b)
 }
 func (m *Intent_Message_ListSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_ListSelect_Item.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_ListSelect_Item) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_ListSelect_Item.Merge(dst, src)
+func (m *Intent_Message_ListSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect_Item.Merge(m, src)
 }
 func (m *Intent_Message_ListSelect_Item) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_ListSelect_Item.Size(m)
@@ -2121,16 +1867,17 @@ func (m *Intent_Message_CarouselSelect) Reset()         { *m = Intent_Message_Ca
 func (m *Intent_Message_CarouselSelect) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_CarouselSelect) ProtoMessage()    {}
 func (*Intent_Message_CarouselSelect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 11}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 11}
 }
+
 func (m *Intent_Message_CarouselSelect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_CarouselSelect.Unmarshal(m, b)
 }
 func (m *Intent_Message_CarouselSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_CarouselSelect.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_CarouselSelect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_CarouselSelect.Merge(dst, src)
+func (m *Intent_Message_CarouselSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect.Merge(m, src)
 }
 func (m *Intent_Message_CarouselSelect) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_CarouselSelect.Size(m)
@@ -2167,16 +1914,17 @@ func (m *Intent_Message_CarouselSelect_Item) Reset()         { *m = Intent_Messa
 func (m *Intent_Message_CarouselSelect_Item) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_CarouselSelect_Item) ProtoMessage()    {}
 func (*Intent_Message_CarouselSelect_Item) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 11, 0}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 11, 0}
 }
+
 func (m *Intent_Message_CarouselSelect_Item) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Unmarshal(m, b)
 }
 func (m *Intent_Message_CarouselSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_CarouselSelect_Item) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_CarouselSelect_Item.Merge(dst, src)
+func (m *Intent_Message_CarouselSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect_Item.Merge(m, src)
 }
 func (m *Intent_Message_CarouselSelect_Item) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Size(m)
@@ -2233,16 +1981,17 @@ func (m *Intent_Message_SelectItemInfo) Reset()         { *m = Intent_Message_Se
 func (m *Intent_Message_SelectItemInfo) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SelectItemInfo) ProtoMessage()    {}
 func (*Intent_Message_SelectItemInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 12}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 12}
 }
+
 func (m *Intent_Message_SelectItemInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_SelectItemInfo.Unmarshal(m, b)
 }
 func (m *Intent_Message_SelectItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_SelectItemInfo.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_SelectItemInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_SelectItemInfo.Merge(dst, src)
+func (m *Intent_Message_SelectItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SelectItemInfo.Merge(m, src)
 }
 func (m *Intent_Message_SelectItemInfo) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_SelectItemInfo.Size(m)
@@ -2292,16 +2041,17 @@ func (m *Intent_Message_TelephonyPlayAudio) Reset()         { *m = Intent_Messag
 func (m *Intent_Message_TelephonyPlayAudio) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_TelephonyPlayAudio) ProtoMessage()    {}
 func (*Intent_Message_TelephonyPlayAudio) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 13}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 13}
 }
+
 func (m *Intent_Message_TelephonyPlayAudio) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Unmarshal(m, b)
 }
 func (m *Intent_Message_TelephonyPlayAudio) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_TelephonyPlayAudio) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Merge(dst, src)
+func (m *Intent_Message_TelephonyPlayAudio) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Merge(m, src)
 }
 func (m *Intent_Message_TelephonyPlayAudio) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Size(m)
@@ -2343,16 +2093,17 @@ func (m *Intent_Message_TelephonySynthesizeSpeech) Reset() {
 func (m *Intent_Message_TelephonySynthesizeSpeech) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_TelephonySynthesizeSpeech) ProtoMessage()    {}
 func (*Intent_Message_TelephonySynthesizeSpeech) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 14}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 14}
 }
+
 func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Unmarshal(m, b)
 }
 func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_TelephonySynthesizeSpeech) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Merge(dst, src)
+func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Merge(m, src)
 }
 func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Size(m)
@@ -2402,72 +2153,14 @@ func (m *Intent_Message_TelephonySynthesizeSpeech) GetSsml() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Intent_Message_TelephonySynthesizeSpeech) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Intent_Message_TelephonySynthesizeSpeech_OneofMarshaler, _Intent_Message_TelephonySynthesizeSpeech_OneofUnmarshaler, _Intent_Message_TelephonySynthesizeSpeech_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Intent_Message_TelephonySynthesizeSpeech) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Intent_Message_TelephonySynthesizeSpeech_Text)(nil),
 		(*Intent_Message_TelephonySynthesizeSpeech_Ssml)(nil),
 	}
 }
 
-func _Intent_Message_TelephonySynthesizeSpeech_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Intent_Message_TelephonySynthesizeSpeech)
-	// source
-	switch x := m.Source.(type) {
-	case *Intent_Message_TelephonySynthesizeSpeech_Text:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Text)
-	case *Intent_Message_TelephonySynthesizeSpeech_Ssml:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Ssml)
-	case nil:
-	default:
-		return fmt.Errorf("Intent_Message_TelephonySynthesizeSpeech.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Intent_Message_TelephonySynthesizeSpeech_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Intent_Message_TelephonySynthesizeSpeech)
-	switch tag {
-	case 1: // source.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Intent_Message_TelephonySynthesizeSpeech_Text{x}
-		return true, err
-	case 2: // source.ssml
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Intent_Message_TelephonySynthesizeSpeech_Ssml{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Intent_Message_TelephonySynthesizeSpeech_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Intent_Message_TelephonySynthesizeSpeech)
-	// source
-	switch x := m.Source.(type) {
-	case *Intent_Message_TelephonySynthesizeSpeech_Text:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Text)))
-		n += len(x.Text)
-	case *Intent_Message_TelephonySynthesizeSpeech_Ssml:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Ssml)))
-		n += len(x.Ssml)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Transfers the call in Telephony Gateway.
 type Intent_Message_TelephonyTransferCall struct {
 	// Required. The phone number to transfer the call to
@@ -2484,16 +2177,17 @@ func (m *Intent_Message_TelephonyTransferCall) Reset()         { *m = Intent_Mes
 func (m *Intent_Message_TelephonyTransferCall) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_TelephonyTransferCall) ProtoMessage()    {}
 func (*Intent_Message_TelephonyTransferCall) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 2, 15}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 2, 15}
 }
+
 func (m *Intent_Message_TelephonyTransferCall) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_Message_TelephonyTransferCall.Unmarshal(m, b)
 }
 func (m *Intent_Message_TelephonyTransferCall) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_Message_TelephonyTransferCall.Marshal(b, m, deterministic)
 }
-func (dst *Intent_Message_TelephonyTransferCall) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_Message_TelephonyTransferCall.Merge(dst, src)
+func (m *Intent_Message_TelephonyTransferCall) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_TelephonyTransferCall.Merge(m, src)
 }
 func (m *Intent_Message_TelephonyTransferCall) XXX_Size() int {
 	return xxx_messageInfo_Intent_Message_TelephonyTransferCall.Size(m)
@@ -2528,16 +2222,17 @@ func (m *Intent_FollowupIntentInfo) Reset()         { *m = Intent_FollowupIntent
 func (m *Intent_FollowupIntentInfo) String() string { return proto.CompactTextString(m) }
 func (*Intent_FollowupIntentInfo) ProtoMessage()    {}
 func (*Intent_FollowupIntentInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{0, 3}
+	return fileDescriptor_5bdb4dcc248bd417, []int{0, 3}
 }
+
 func (m *Intent_FollowupIntentInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Intent_FollowupIntentInfo.Unmarshal(m, b)
 }
 func (m *Intent_FollowupIntentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Intent_FollowupIntentInfo.Marshal(b, m, deterministic)
 }
-func (dst *Intent_FollowupIntentInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Intent_FollowupIntentInfo.Merge(dst, src)
+func (m *Intent_FollowupIntentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_FollowupIntentInfo.Merge(m, src)
 }
 func (m *Intent_FollowupIntentInfo) XXX_Size() int {
 	return xxx_messageInfo_Intent_FollowupIntentInfo.Size(m)
@@ -2590,16 +2285,17 @@ func (m *ListIntentsRequest) Reset()         { *m = ListIntentsRequest{} }
 func (m *ListIntentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListIntentsRequest) ProtoMessage()    {}
 func (*ListIntentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{1}
+	return fileDescriptor_5bdb4dcc248bd417, []int{1}
 }
+
 func (m *ListIntentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIntentsRequest.Unmarshal(m, b)
 }
 func (m *ListIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIntentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListIntentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIntentsRequest.Merge(dst, src)
+func (m *ListIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsRequest.Merge(m, src)
 }
 func (m *ListIntentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListIntentsRequest.Size(m)
@@ -2662,16 +2358,17 @@ func (m *ListIntentsResponse) Reset()         { *m = ListIntentsResponse{} }
 func (m *ListIntentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListIntentsResponse) ProtoMessage()    {}
 func (*ListIntentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{2}
+	return fileDescriptor_5bdb4dcc248bd417, []int{2}
 }
+
 func (m *ListIntentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIntentsResponse.Unmarshal(m, b)
 }
 func (m *ListIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIntentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListIntentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIntentsResponse.Merge(dst, src)
+func (m *ListIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsResponse.Merge(m, src)
 }
 func (m *ListIntentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListIntentsResponse.Size(m)
@@ -2719,16 +2416,17 @@ func (m *GetIntentRequest) Reset()         { *m = GetIntentRequest{} }
 func (m *GetIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIntentRequest) ProtoMessage()    {}
 func (*GetIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{3}
+	return fileDescriptor_5bdb4dcc248bd417, []int{3}
 }
+
 func (m *GetIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIntentRequest.Unmarshal(m, b)
 }
 func (m *GetIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIntentRequest.Merge(dst, src)
+func (m *GetIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIntentRequest.Merge(m, src)
 }
 func (m *GetIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIntentRequest.Size(m)
@@ -2785,16 +2483,17 @@ func (m *CreateIntentRequest) Reset()         { *m = CreateIntentRequest{} }
 func (m *CreateIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateIntentRequest) ProtoMessage()    {}
 func (*CreateIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{4}
+	return fileDescriptor_5bdb4dcc248bd417, []int{4}
 }
+
 func (m *CreateIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateIntentRequest.Unmarshal(m, b)
 }
 func (m *CreateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateIntentRequest.Merge(dst, src)
+func (m *CreateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIntentRequest.Merge(m, src)
 }
 func (m *CreateIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateIntentRequest.Size(m)
@@ -2857,16 +2556,17 @@ func (m *UpdateIntentRequest) Reset()         { *m = UpdateIntentRequest{} }
 func (m *UpdateIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateIntentRequest) ProtoMessage()    {}
 func (*UpdateIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{5}
+	return fileDescriptor_5bdb4dcc248bd417, []int{5}
 }
+
 func (m *UpdateIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateIntentRequest.Unmarshal(m, b)
 }
 func (m *UpdateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateIntentRequest.Merge(dst, src)
+func (m *UpdateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateIntentRequest.Merge(m, src)
 }
 func (m *UpdateIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateIntentRequest.Size(m)
@@ -2921,16 +2621,17 @@ func (m *DeleteIntentRequest) Reset()         { *m = DeleteIntentRequest{} }
 func (m *DeleteIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteIntentRequest) ProtoMessage()    {}
 func (*DeleteIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{6}
+	return fileDescriptor_5bdb4dcc248bd417, []int{6}
 }
+
 func (m *DeleteIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteIntentRequest.Unmarshal(m, b)
 }
 func (m *DeleteIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteIntentRequest.Merge(dst, src)
+func (m *DeleteIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIntentRequest.Merge(m, src)
 }
 func (m *DeleteIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteIntentRequest.Size(m)
@@ -2979,16 +2680,17 @@ func (m *BatchUpdateIntentsRequest) Reset()         { *m = BatchUpdateIntentsReq
 func (m *BatchUpdateIntentsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateIntentsRequest) ProtoMessage()    {}
 func (*BatchUpdateIntentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{7}
+	return fileDescriptor_5bdb4dcc248bd417, []int{7}
 }
+
 func (m *BatchUpdateIntentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateIntentsRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdateIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateIntentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateIntentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateIntentsRequest.Merge(dst, src)
+func (m *BatchUpdateIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsRequest.Merge(m, src)
 }
 func (m *BatchUpdateIntentsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateIntentsRequest.Size(m)
@@ -3064,76 +2766,14 @@ func (m *BatchUpdateIntentsRequest) GetIntentView() IntentView {
 	return IntentView_INTENT_VIEW_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchUpdateIntentsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchUpdateIntentsRequest_OneofMarshaler, _BatchUpdateIntentsRequest_OneofUnmarshaler, _BatchUpdateIntentsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchUpdateIntentsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchUpdateIntentsRequest_IntentBatchUri)(nil),
 		(*BatchUpdateIntentsRequest_IntentBatchInline)(nil),
 	}
 }
 
-func _BatchUpdateIntentsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchUpdateIntentsRequest)
-	// intent_batch
-	switch x := m.IntentBatch.(type) {
-	case *BatchUpdateIntentsRequest_IntentBatchUri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.IntentBatchUri)
-	case *BatchUpdateIntentsRequest_IntentBatchInline:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.IntentBatchInline); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchUpdateIntentsRequest.IntentBatch has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchUpdateIntentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchUpdateIntentsRequest)
-	switch tag {
-	case 2: // intent_batch.intent_batch_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.IntentBatch = &BatchUpdateIntentsRequest_IntentBatchUri{x}
-		return true, err
-	case 3: // intent_batch.intent_batch_inline
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(IntentBatch)
-		err := b.DecodeMessage(msg)
-		m.IntentBatch = &BatchUpdateIntentsRequest_IntentBatchInline{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchUpdateIntentsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchUpdateIntentsRequest)
-	// intent_batch
-	switch x := m.IntentBatch.(type) {
-	case *BatchUpdateIntentsRequest_IntentBatchUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.IntentBatchUri)))
-		n += len(x.IntentBatchUri)
-	case *BatchUpdateIntentsRequest_IntentBatchInline:
-		s := proto.Size(x.IntentBatchInline)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2beta1.Intents.BatchUpdateIntents].
 type BatchUpdateIntentsResponse struct {
 	// The collection of updated or created intents.
@@ -3147,16 +2787,17 @@ func (m *BatchUpdateIntentsResponse) Reset()         { *m = BatchUpdateIntentsRe
 func (m *BatchUpdateIntentsResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateIntentsResponse) ProtoMessage()    {}
 func (*BatchUpdateIntentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{8}
+	return fileDescriptor_5bdb4dcc248bd417, []int{8}
 }
+
 func (m *BatchUpdateIntentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateIntentsResponse.Unmarshal(m, b)
 }
 func (m *BatchUpdateIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateIntentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateIntentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateIntentsResponse.Merge(dst, src)
+func (m *BatchUpdateIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsResponse.Merge(m, src)
 }
 func (m *BatchUpdateIntentsResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateIntentsResponse.Size(m)
@@ -3191,16 +2832,17 @@ func (m *BatchDeleteIntentsRequest) Reset()         { *m = BatchDeleteIntentsReq
 func (m *BatchDeleteIntentsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeleteIntentsRequest) ProtoMessage()    {}
 func (*BatchDeleteIntentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{9}
+	return fileDescriptor_5bdb4dcc248bd417, []int{9}
 }
+
 func (m *BatchDeleteIntentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeleteIntentsRequest.Unmarshal(m, b)
 }
 func (m *BatchDeleteIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeleteIntentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeleteIntentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeleteIntentsRequest.Merge(dst, src)
+func (m *BatchDeleteIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteIntentsRequest.Merge(m, src)
 }
 func (m *BatchDeleteIntentsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeleteIntentsRequest.Size(m)
@@ -3238,16 +2880,17 @@ func (m *IntentBatch) Reset()         { *m = IntentBatch{} }
 func (m *IntentBatch) String() string { return proto.CompactTextString(m) }
 func (*IntentBatch) ProtoMessage()    {}
 func (*IntentBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_intent_2d72c44f592bb8da, []int{10}
+	return fileDescriptor_5bdb4dcc248bd417, []int{10}
 }
+
 func (m *IntentBatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IntentBatch.Unmarshal(m, b)
 }
 func (m *IntentBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IntentBatch.Marshal(b, m, deterministic)
 }
-func (dst *IntentBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IntentBatch.Merge(dst, src)
+func (m *IntentBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntentBatch.Merge(m, src)
 }
 func (m *IntentBatch) XXX_Size() int {
 	return xxx_messageInfo_IntentBatch.Size(m)
@@ -3266,6 +2909,10 @@ func (m *IntentBatch) GetIntents() []*Intent {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.IntentView", IntentView_name, IntentView_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Intent_WebhookState", Intent_WebhookState_name, Intent_WebhookState_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Intent_TrainingPhrase_Type", Intent_TrainingPhrase_Type_name, Intent_TrainingPhrase_Type_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Intent_Message_Platform", Intent_Message_Platform_name, Intent_Message_Platform_value)
 	proto.RegisterType((*Intent)(nil), "google.cloud.dialogflow.v2beta1.Intent")
 	proto.RegisterType((*Intent_TrainingPhrase)(nil), "google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase")
 	proto.RegisterType((*Intent_TrainingPhrase_Part)(nil), "google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part")
@@ -3303,10 +2950,191 @@ func init() {
 	proto.RegisterType((*BatchUpdateIntentsResponse)(nil), "google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse")
 	proto.RegisterType((*BatchDeleteIntentsRequest)(nil), "google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest")
 	proto.RegisterType((*IntentBatch)(nil), "google.cloud.dialogflow.v2beta1.IntentBatch")
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.IntentView", IntentView_name, IntentView_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Intent_WebhookState", Intent_WebhookState_name, Intent_WebhookState_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Intent_TrainingPhrase_Type", Intent_TrainingPhrase_Type_name, Intent_TrainingPhrase_Type_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Intent_Message_Platform", Intent_Message_Platform_name, Intent_Message_Platform_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/intent.proto", fileDescriptor_5bdb4dcc248bd417)
+}
+
+var fileDescriptor_5bdb4dcc248bd417 = []byte{
+	// 2831 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0x57,
+	0xb5, 0x77, 0xeb, 0xc3, 0x96, 0x8e, 0x64, 0x59, 0xbe, 0xf6, 0xcc, 0xf4, 0xf4, 0xe4, 0xc3, 0x51,
+	0x5e, 0x12, 0xc7, 0x2f, 0x91, 0xde, 0x38, 0x79, 0x79, 0xc9, 0xcc, 0x4b, 0x82, 0x64, 0xcb, 0x23,
+	0x61, 0xd9, 0xd2, 0xb4, 0xe5, 0x09, 0x93, 0x02, 0xba, 0x5a, 0xd2, 0xb5, 0xa6, 0x71, 0xab, 0xbb,
+	0xd3, 0xf7, 0xca, 0x13, 0x05, 0x52, 0x50, 0x54, 0x01, 0x0b, 0x36, 0x54, 0xb1, 0x02, 0x36, 0x14,
+	0x1b, 0x2a, 0x14, 0x0b, 0x2a, 0x3b, 0xfe, 0x04, 0x16, 0xac, 0x58, 0x66, 0x41, 0x51, 0x45, 0xb1,
+	0xe0, 0x2f, 0x60, 0x07, 0x75, 0x3f, 0x5a, 0x6a, 0x59, 0x1a, 0x2c, 0xd9, 0x03, 0x1b, 0x76, 0xba,
+	0xe7, 0x9c, 0xfb, 0x3b, 0x5f, 0xf7, 0x9e, 0x73, 0xfa, 0xda, 0xf0, 0x5a, 0xd7, 0x75, 0xbb, 0x36,
+	0x2e, 0xb4, 0x6d, 0xb7, 0xdf, 0x29, 0x74, 0x2c, 0xd3, 0x76, 0xbb, 0x27, 0xb6, 0xfb, 0xb8, 0x70,
+	0xb6, 0xdd, 0xc2, 0xd4, 0xbc, 0x5d, 0xb0, 0x1c, 0x8a, 0x1d, 0x9a, 0xf7, 0x7c, 0x97, 0xba, 0xe8,
+	0x79, 0x21, 0x9d, 0xe7, 0xd2, 0xf9, 0x91, 0x74, 0x5e, 0x4a, 0x6b, 0xcf, 0x48, 0x38, 0xd3, 0xb3,
+	0x0a, 0xa6, 0xe3, 0xb8, 0xd4, 0xa4, 0x96, 0xeb, 0x10, 0xb1, 0x5d, 0xbb, 0x19, 0xe2, 0xfa, 0x98,
+	0xb8, 0x7d, 0xbf, 0x8d, 0x25, 0xeb, 0xf5, 0x8b, 0xec, 0x68, 0xbb, 0x0e, 0xc5, 0x1f, 0x4b, 0x43,
+	0xb4, 0x17, 0xa5, 0xb8, 0xed, 0x3a, 0x5d, 0xbf, 0xef, 0x38, 0x96, 0xd3, 0x2d, 0xb8, 0x1e, 0xf6,
+	0xc7, 0xd4, 0x3d, 0x27, 0x85, 0xf8, 0xaa, 0xd5, 0x3f, 0x29, 0x74, 0xfa, 0x42, 0x40, 0xf2, 0x6f,
+	0x9d, 0xe7, 0xe3, 0x9e, 0x47, 0x07, 0x92, 0xb9, 0x71, 0x9e, 0x79, 0x62, 0x61, 0xbb, 0x63, 0xf4,
+	0x4c, 0x72, 0x2a, 0x25, 0x9e, 0x39, 0x2f, 0x41, 0xa8, 0xdf, 0x6f, 0x4b, 0x0b, 0x73, 0x3f, 0x2f,
+	0xc0, 0x62, 0x95, 0xc7, 0x0e, 0x21, 0x88, 0x39, 0x66, 0x0f, 0xab, 0xca, 0x86, 0xb2, 0x99, 0xd4,
+	0xf9, 0x6f, 0xf4, 0x02, 0xa4, 0x3b, 0x16, 0xf1, 0x6c, 0x73, 0x60, 0x70, 0x5e, 0x84, 0xf3, 0x52,
+	0x92, 0x76, 0xc8, 0x44, 0x1e, 0xc2, 0xf2, 0x63, 0xdc, 0x7a, 0xe4, 0xba, 0xa7, 0x06, 0xa1, 0x26,
+	0xc5, 0xea, 0xe2, 0x86, 0xb2, 0x99, 0xd9, 0x7e, 0x33, 0x7f, 0x41, 0x12, 0xf2, 0x42, 0x6d, 0xfe,
+	0x03, 0xb1, 0xf9, 0x88, 0xed, 0xd5, 0xd3, 0x8f, 0x43, 0x2b, 0xa4, 0x41, 0xc2, 0xf3, 0x2d, 0xd7,
+	0xb7, 0xe8, 0x40, 0x8d, 0x6e, 0x28, 0x9b, 0x71, 0x7d, 0xb8, 0x46, 0xcf, 0x43, 0xca, 0x22, 0xc6,
+	0x89, 0x69, 0xdb, 0x2d, 0xb3, 0x7d, 0xaa, 0xc6, 0x36, 0x94, 0xcd, 0x84, 0x0e, 0x16, 0xd9, 0x93,
+	0x14, 0xf4, 0x02, 0x40, 0xcf, 0x36, 0xb0, 0x63, 0xb6, 0x6c, 0xdc, 0x51, 0xe3, 0x8c, 0x5f, 0x8a,
+	0xa8, 0x8a, 0x9e, 0xec, 0xd9, 0x65, 0x41, 0x64, 0x18, 0x3d, 0xdb, 0xe8, 0x58, 0x44, 0xc8, 0xac,
+	0x09, 0x8c, 0x9e, 0xbd, 0x2b, 0x29, 0xe8, 0x15, 0x58, 0xc1, 0x4e, 0xc7, 0x60, 0x87, 0xcb, 0x37,
+	0xdb, 0x2c, 0x27, 0xea, 0x35, 0x2e, 0x94, 0xc1, 0x4e, 0xa7, 0x3a, 0xa2, 0xa2, 0x3c, 0xac, 0x59,
+	0x8e, 0xd7, 0xa7, 0x86, 0xcc, 0x3f, 0x8f, 0x16, 0x51, 0x97, 0x36, 0xa2, 0x9b, 0x49, 0x7d, 0x95,
+	0xb3, 0x76, 0x04, 0x87, 0xc5, 0x8c, 0xa0, 0xeb, 0xb0, 0x88, 0xcf, 0xb0, 0x43, 0x89, 0x9a, 0xe0,
+	0x22, 0x72, 0x85, 0x4c, 0xc8, 0x52, 0xdf, 0xb4, 0xd8, 0x41, 0x31, 0xbc, 0x47, 0xbe, 0x49, 0x30,
+	0x51, 0x93, 0x1b, 0xd1, 0xcd, 0xd4, 0xf6, 0x5b, 0xb3, 0xc6, 0xb3, 0x29, 0xf7, 0x37, 0xf8, 0x76,
+	0x7d, 0x85, 0x8e, 0xad, 0xb9, 0x6a, 0xe9, 0x0a, 0xf0, 0x64, 0xca, 0x15, 0xba, 0x0f, 0x2b, 0x6e,
+	0x9f, 0x86, 0x7c, 0x20, 0x6a, 0x8a, 0x6b, 0xde, 0xbc, 0x50, 0xb3, 0x74, 0x4d, 0xcf, 0x08, 0x00,
+	0xb9, 0x24, 0xe8, 0x25, 0xc8, 0xf8, 0x98, 0xe0, 0x10, 0x62, 0x9a, 0x47, 0x6f, 0x99, 0x53, 0x87,
+	0x62, 0xf7, 0x01, 0x3c, 0xd3, 0x37, 0x7b, 0x98, 0x62, 0x9f, 0xa8, 0xcb, 0x5c, 0xe9, 0xed, 0x59,
+	0xdd, 0x6d, 0x04, 0x3b, 0xf5, 0x10, 0x08, 0xda, 0x87, 0x44, 0x0f, 0x13, 0x62, 0x76, 0x31, 0x51,
+	0x33, 0x1c, 0xb0, 0x30, 0x2b, 0xe0, 0x81, 0xd8, 0xa7, 0x0f, 0x01, 0xd0, 0x19, 0x68, 0x1d, 0x7c,
+	0x62, 0xf6, 0x6d, 0x6a, 0xf8, 0x98, 0x78, 0xae, 0x43, 0xb0, 0xe1, 0xd9, 0x26, 0x3d, 0x71, 0xfd,
+	0x1e, 0x51, 0x57, 0x36, 0xa2, 0x9b, 0x99, 0xed, 0xb7, 0xe7, 0x84, 0xcf, 0x37, 0x24, 0x80, 0xae,
+	0x4a, 0x6c, 0x5d, 0x42, 0x07, 0x0c, 0x82, 0xde, 0x81, 0x9b, 0xbe, 0xeb, 0x52, 0xe3, 0xc4, 0xb5,
+	0x6d, 0xf7, 0x71, 0xdf, 0x33, 0x44, 0x91, 0x13, 0x37, 0x31, 0xcb, 0x93, 0x77, 0x9d, 0x09, 0xec,
+	0x49, 0xbe, 0xd0, 0xc0, 0x2f, 0xe5, 0xbb, 0x70, 0xcb, 0x33, 0x7d, 0x26, 0x3c, 0x75, 0xf3, 0x2a,
+	0xdf, 0xac, 0x0a, 0x91, 0x29, 0xdb, 0x6d, 0x58, 0x3f, 0xbf, 0xcf, 0x72, 0x4e, 0x5c, 0x15, 0xf1,
+	0x50, 0xde, 0x99, 0xd5, 0xd7, 0x71, 0xe4, 0xaa, 0x73, 0xe2, 0xea, 0xe8, 0x64, 0x82, 0xa6, 0xfd,
+	0x32, 0x0a, 0x99, 0xf1, 0x53, 0x3b, 0xb5, 0x16, 0xd5, 0x21, 0x46, 0x07, 0x9e, 0xa8, 0x41, 0x99,
+	0xed, 0xbb, 0x97, 0xbb, 0x0f, 0xf9, 0xe6, 0xc0, 0xc3, 0x3a, 0x07, 0x42, 0xf7, 0x21, 0xee, 0x99,
+	0x3e, 0x25, 0x6a, 0x94, 0xbb, 0x75, 0x59, 0xc4, 0x86, 0xe9, 0x53, 0x5d, 0x20, 0xa1, 0x2d, 0x58,
+	0xa5, 0x56, 0x0f, 0x13, 0xc3, 0xec, 0x74, 0x70, 0xc7, 0x68, 0xbb, 0x7d, 0x87, 0xf2, 0xda, 0x14,
+	0xd7, 0x57, 0x38, 0xa3, 0xc8, 0xe8, 0x3b, 0x8c, 0xac, 0x51, 0x88, 0xb1, 0xad, 0xcc, 0x57, 0x76,
+	0x0f, 0x02, 0x5f, 0xd9, 0x6f, 0x56, 0x99, 0xb0, 0x43, 0x2d, 0x3a, 0x30, 0x86, 0x2e, 0x27, 0x75,
+	0x10, 0x24, 0xe6, 0x01, 0x5a, 0x87, 0xb8, 0x69, 0x5b, 0x26, 0xe1, 0x75, 0x31, 0xa9, 0x8b, 0x05,
+	0x2b, 0xd7, 0x7d, 0x82, 0x7d, 0xa3, 0x83, 0x4f, 0x2c, 0x07, 0x77, 0x64, 0x55, 0x4c, 0x31, 0xda,
+	0xae, 0x20, 0xe5, 0xee, 0x42, 0x4c, 0x02, 0x64, 0x9b, 0x0f, 0x1b, 0x65, 0xe3, 0xf8, 0xf0, 0xa8,
+	0x51, 0xde, 0xa9, 0xee, 0x55, 0xcb, 0xbb, 0xd9, 0x05, 0x94, 0x82, 0xa5, 0xf2, 0x57, 0x8a, 0x07,
+	0x8d, 0x5a, 0x39, 0xab, 0xa0, 0x2c, 0x24, 0x9a, 0xe5, 0x83, 0x46, 0xad, 0xd8, 0x2c, 0x67, 0x23,
+	0x5a, 0x24, 0xa1, 0x68, 0x3f, 0x88, 0x40, 0x72, 0x78, 0xe1, 0x2e, 0xdb, 0x30, 0xd6, 0x21, 0x7e,
+	0x66, 0xda, 0x7d, 0x1c, 0x98, 0xce, 0x17, 0xe8, 0x45, 0x58, 0x0e, 0x2e, 0x99, 0xe0, 0xc6, 0x38,
+	0x37, 0x2d, 0x89, 0x0f, 0xb8, 0xd0, 0xff, 0x81, 0x1a, 0x0a, 0x8b, 0x31, 0xa6, 0x29, 0xce, 0xe5,
+	0xaf, 0x8d, 0x62, 0xb4, 0x1b, 0xd2, 0xf9, 0x0c, 0x24, 0x7b, 0xa6, 0xd3, 0x31, 0xa9, 0xeb, 0x0f,
+	0x78, 0x83, 0x4a, 0xe8, 0x23, 0x02, 0x52, 0x61, 0xc9, 0xf3, 0xdd, 0x9e, 0x47, 0x83, 0x8a, 0x1d,
+	0x2c, 0xd1, 0x0d, 0x58, 0xb2, 0x88, 0x61, 0x5b, 0x84, 0xaa, 0x09, 0xbe, 0x6b, 0xd1, 0x22, 0x35,
+	0x8b, 0x50, 0xed, 0xaf, 0xcf, 0xc1, 0x92, 0xbc, 0xca, 0xe8, 0xcb, 0xa1, 0x04, 0xa6, 0x66, 0x6f,
+	0x7c, 0x41, 0x25, 0x68, 0xe2, 0x8f, 0x69, 0x65, 0x41, 0x26, 0xfe, 0x00, 0xe2, 0x56, 0xcf, 0xec,
+	0x8a, 0xc0, 0xa5, 0xb6, 0xff, 0x77, 0x5e, 0xb0, 0x2a, 0xdb, 0x5c, 0x59, 0xd0, 0x05, 0x0a, 0x6a,
+	0xc3, 0xf2, 0x47, 0x7d, 0xab, 0x7d, 0x6a, 0xf8, 0xd8, 0xb3, 0x2d, 0x2c, 0x8e, 0x4b, 0x6a, 0xfb,
+	0xff, 0xe7, 0x85, 0xbd, 0xcf, 0x40, 0x74, 0x81, 0x51, 0x59, 0xd0, 0xd3, 0x1f, 0x85, 0xd6, 0xcc,
+	0xff, 0xb6, 0xe9, 0x8b, 0xd3, 0x76, 0x09, 0xff, 0x77, 0x4c, 0xbf, 0xc3, 0xfc, 0x67, 0x18, 0xe8,
+	0x0d, 0x58, 0xf2, 0xcc, 0x81, 0xed, 0x9a, 0xa2, 0x65, 0xa7, 0xb6, 0x6f, 0x04, 0x70, 0xc1, 0xfc,
+	0x92, 0x3f, 0xe2, 0xf3, 0x4b, 0x65, 0x41, 0x0f, 0x24, 0x91, 0x0d, 0x59, 0x62, 0xf5, 0x3c, 0x1b,
+	0x0f, 0xeb, 0x33, 0x4b, 0x24, 0xdb, 0xfd, 0xfe, 0xbc, 0xc6, 0x1c, 0x71, 0x9c, 0xa0, 0x16, 0x33,
+	0x5f, 0x57, 0xc8, 0x38, 0x09, 0x7d, 0x08, 0xd0, 0x32, 0x89, 0xd5, 0x36, 0xb8, 0xd3, 0x09, 0xae,
+	0xe7, 0x9d, 0x79, 0xf5, 0x94, 0x18, 0x82, 0xf4, 0x3c, 0xd9, 0x0a, 0x16, 0xc8, 0x80, 0x14, 0xe9,
+	0x77, 0xbb, 0x98, 0xf0, 0x01, 0x51, 0x4d, 0x72, 0xf0, 0xbb, 0x73, 0x3b, 0x31, 0x82, 0xa8, 0x2c,
+	0xe8, 0x61, 0x44, 0x44, 0x60, 0xcd, 0xb6, 0x9c, 0x53, 0xc3, 0xed, 0x53, 0x63, 0x44, 0xe7, 0xa3,
+	0x40, 0x6a, 0xbb, 0x38, 0xaf, 0xa2, 0x9a, 0xe5, 0x9c, 0xd6, 0xfb, 0x74, 0xa4, 0xaf, 0xb2, 0xa0,
+	0xaf, 0xda, 0xe7, 0x89, 0xe8, 0x6b, 0x90, 0x62, 0x57, 0xc8, 0x20, 0xd8, 0xc6, 0x6d, 0xaa, 0xa6,
+	0xb8, 0xb2, 0x3b, 0xf3, 0x2b, 0x23, 0xf4, 0x88, 0x23, 0x54, 0x16, 0x74, 0xb0, 0x87, 0x2b, 0x64,
+	0xc1, 0x4a, 0xdb, 0xf4, 0xdd, 0x3e, 0xc1, 0x76, 0xa0, 0x22, 0xcd, 0x55, 0xbc, 0x77, 0x89, 0xa3,
+	0xc8, 0x61, 0x86, 0x6a, 0x32, 0xed, 0x31, 0x0a, 0x3a, 0x83, 0x75, 0x8a, 0x6d, 0xec, 0x3d, 0x72,
+	0x9d, 0x81, 0xc1, 0x6b, 0x8f, 0xd9, 0xef, 0x58, 0xae, 0xba, 0xcc, 0xf5, 0x95, 0xe6, 0xbf, 0xfa,
+	0x12, 0xab, 0x61, 0x9b, 0x83, 0x22, 0x43, 0xaa, 0x2c, 0xe8, 0x88, 0x4e, 0x50, 0xd1, 0x0f, 0x15,
+	0xb8, 0x35, 0x52, 0x4c, 0x06, 0x0e, 0x7d, 0x84, 0x89, 0xf5, 0x09, 0x36, 0x88, 0x87, 0x71, 0xfb,
+	0x91, 0x9a, 0xe1, 0xfa, 0xab, 0x97, 0xd6, 0x7f, 0x34, 0x44, 0x3c, 0xe2, 0x80, 0x95, 0x05, 0xfd,
+	0x26, 0x7d, 0x12, 0x13, 0x7d, 0x1b, 0x6e, 0x8c, 0x8c, 0xa1, 0xbe, 0xe9, 0x90, 0x13, 0xec, 0x1b,
+	0x6d, 0xd3, 0xb6, 0xd5, 0x15, 0x6e, 0x48, 0xf9, 0xd2, 0x86, 0x34, 0x25, 0xda, 0x8e, 0x69, 0xdb,
+	0x95, 0x05, 0xfd, 0x1a, 0x9d, 0xc6, 0x40, 0x4d, 0x48, 0x04, 0x03, 0x98, 0xfc, 0xdc, 0xb8, 0xfc,
+	0xfc, 0x35, 0x44, 0xd2, 0x34, 0x88, 0xb1, 0x5a, 0x1c, 0x6a, 0xc8, 0xd1, 0xa0, 0x21, 0x6b, 0x47,
+	0x10, 0xe7, 0xa5, 0x15, 0xdd, 0x82, 0x24, 0x2f, 0xad, 0x46, 0xdf, 0xb7, 0x64, 0xe7, 0x4b, 0x70,
+	0xc2, 0xb1, 0x6f, 0xa1, 0xd7, 0x01, 0x99, 0xed, 0x36, 0x26, 0xc4, 0x6a, 0x59, 0x36, 0x6f, 0x53,
+	0x0c, 0x47, 0xf4, 0xc0, 0xd5, 0x31, 0x0e, 0x53, 0xa4, 0x55, 0x21, 0x1d, 0x2e, 0xac, 0xac, 0x33,
+	0x52, 0x8b, 0xda, 0x41, 0x47, 0x15, 0x0b, 0xd6, 0x19, 0xc7, 0x6b, 0x78, 0x84, 0xdb, 0x35, 0x56,
+	0x83, 0xb5, 0xbf, 0x28, 0x10, 0xe3, 0x15, 0x64, 0x3a, 0x86, 0x06, 0x09, 0xd2, 0x6f, 0x09, 0x86,
+	0x30, 0x67, 0xb8, 0x1e, 0xf7, 0x28, 0x7a, 0xce, 0xa3, 0x63, 0x58, 0x6a, 0xf5, 0x29, 0x65, 0xc5,
+	0x28, 0x36, 0xdf, 0x94, 0x14, 0x2e, 0xef, 0xf9, 0x12, 0xc7, 0xd0, 0x03, 0x2c, 0xed, 0x6d, 0x58,
+	0x14, 0xa4, 0xa9, 0xd3, 0x0f, 0xfb, 0xee, 0x73, 0x09, 0xe5, 0x1f, 0x76, 0xd2, 0xda, 0x60, 0xad,
+	0xf5, 0x20, 0x33, 0x5e, 0xa3, 0xd1, 0x7f, 0x41, 0x86, 0x7f, 0x72, 0x51, 0x37, 0xb8, 0x0d, 0x02,
+	0x2b, 0xcd, 0xa8, 0x4d, 0x57, 0x9e, 0x59, 0x04, 0x31, 0x42, 0x7a, 0xb6, 0xc4, 0xe3, 0xbf, 0xc3,
+	0xc3, 0x0a, 0xb7, 0x21, 0x3a, 0x36, 0xac, 0xf0, 0x14, 0x7d, 0x0b, 0x56, 0xce, 0xb5, 0x04, 0x64,
+	0x4d, 0xe9, 0x36, 0x0a, 0x8f, 0xcd, 0x7b, 0x57, 0xeb, 0x36, 0x13, 0xad, 0x46, 0xfb, 0x5d, 0x14,
+	0x92, 0xc3, 0x4e, 0x71, 0x89, 0xd4, 0xbe, 0x04, 0x19, 0x76, 0xb2, 0x4d, 0x4a, 0x71, 0x27, 0xec,
+	0xe2, 0xf2, 0x90, 0xca, 0x0f, 0xfc, 0x7e, 0x30, 0x74, 0xc4, 0xae, 0x30, 0x74, 0x04, 0x23, 0xc7,
+	0x87, 0xa3, 0x13, 0x13, 0xe7, 0x51, 0xf9, 0xd2, 0xa5, 0x7b, 0xe3, 0xc4, 0xb1, 0xf9, 0xad, 0x32,
+	0x3c, 0x37, 0xd3, 0x83, 0x71, 0x06, 0x2b, 0xae, 0x87, 0x1d, 0x76, 0x94, 0x0d, 0xf9, 0x95, 0x2b,
+	0x06, 0xa9, 0xc3, 0xab, 0x1a, 0x91, 0xaf, 0x7b, 0xd8, 0x39, 0xf6, 0xad, 0x22, 0x47, 0xd5, 0x97,
+	0xdd, 0xf0, 0x52, 0x7b, 0x01, 0x96, 0xc7, 0xf8, 0x28, 0x0b, 0xd1, 0x51, 0x81, 0x60, 0x3f, 0xb5,
+	0x1c, 0x40, 0xa8, 0x25, 0x4e, 0x35, 0x5f, 0x3b, 0x85, 0x54, 0xa8, 0x77, 0xa3, 0xaf, 0x8e, 0x4f,
+	0x03, 0xca, 0x7c, 0x5f, 0x5f, 0x93, 0xd3, 0xc0, 0xd8, 0x28, 0xa0, 0x35, 0x60, 0x75, 0xa2, 0x7f,
+	0xa3, 0x57, 0x21, 0xdb, 0x61, 0x3f, 0x1d, 0xfe, 0x02, 0x65, 0x84, 0xe6, 0xfb, 0x95, 0x10, 0x9d,
+	0xcf, 0xd4, 0xd2, 0xc5, 0xc8, 0xc8, 0xc5, 0x2f, 0x22, 0x00, 0xa3, 0x2e, 0xfd, 0x84, 0x14, 0x1d,
+	0x43, 0xdc, 0xa2, 0xb8, 0x27, 0xca, 0xd8, 0x25, 0x26, 0xb4, 0x91, 0x82, 0x7c, 0x95, 0xe2, 0x9e,
+	0x2e, 0xd0, 0xb4, 0x3f, 0x2a, 0x10, 0x63, 0x6b, 0xa4, 0x43, 0x8c, 0x7f, 0xab, 0x2a, 0x97, 0x1b,
+	0x01, 0x04, 0x34, 0x43, 0xe2, 0xdf, 0xab, 0x1c, 0x6b, 0xe4, 0x49, 0x24, 0xec, 0xc9, 0x06, 0xa4,
+	0x3a, 0x98, 0xb4, 0x7d, 0xcb, 0xe3, 0x07, 0x2d, 0xa8, 0x1e, 0x23, 0xd2, 0x53, 0xbd, 0x58, 0xda,
+	0xef, 0x23, 0x90, 0x19, 0x1f, 0x50, 0xd0, 0xc3, 0x20, 0x96, 0xe2, 0x68, 0xec, 0x5c, 0x6d, 0xde,
+	0xf9, 0x0f, 0x8b, 0xe7, 0x7b, 0x90, 0x19, 0x37, 0x8e, 0x9d, 0xe8, 0x53, 0x3c, 0x08, 0x2e, 0xed,
+	0x29, 0x1e, 0xf0, 0xe2, 0x3a, 0x70, 0x5c, 0x67, 0xd0, 0x0b, 0xda, 0xee, 0x70, 0xad, 0xdd, 0x06,
+	0x34, 0x39, 0xbf, 0xb1, 0x6e, 0xca, 0x47, 0xc2, 0xf0, 0x7c, 0xc0, 0x09, 0xc7, 0xbe, 0xa5, 0xdd,
+	0x87, 0x9b, 0x4f, 0x1c, 0xb9, 0xd0, 0x7a, 0xb8, 0x13, 0x0e, 0x3f, 0x08, 0xd7, 0xc3, 0x7d, 0x8b,
+	0x51, 0xd9, 0xaa, 0x94, 0x80, 0x45, 0xf1, 0x2e, 0xad, 0xdd, 0x81, 0x6b, 0x53, 0x87, 0x27, 0xd6,
+	0xdc, 0x18, 0x11, 0x1b, 0x4e, 0xbf, 0xd7, 0xc2, 0xbe, 0xb4, 0x25, 0xc5, 0x69, 0x87, 0x9c, 0x94,
+	0xfb, 0xa9, 0x02, 0x89, 0x60, 0x0e, 0x42, 0x2a, 0xac, 0xb3, 0x4f, 0xfd, 0xbd, 0xba, 0x7e, 0x70,
+	0xee, 0x51, 0x20, 0x0d, 0x89, 0xbd, 0xe2, 0x4e, 0xb9, 0x54, 0xaf, 0xef, 0x67, 0x15, 0x94, 0x84,
+	0xf8, 0x51, 0xad, 0xb8, 0xb3, 0x9f, 0x8d, 0x30, 0x46, 0xb3, 0x5c, 0x2b, 0xdf, 0xd3, 0x8b, 0x07,
+	0xd9, 0x28, 0x5a, 0x82, 0xe8, 0x7e, 0x75, 0x3f, 0x1b, 0xe3, 0x12, 0xfb, 0x0f, 0x1b, 0xe5, 0x6c,
+	0x1c, 0x25, 0x20, 0x56, 0xab, 0x1e, 0x96, 0xb3, 0x8b, 0x8c, 0xf8, 0xa0, 0x5a, 0x2a, 0xeb, 0xd9,
+	0x25, 0x74, 0x0d, 0x56, 0x8b, 0x3b, 0xcd, 0x6a, 0xfd, 0xf0, 0xc8, 0xa8, 0x1f, 0x1a, 0xf7, 0xea,
+	0xf5, 0x7b, 0xb5, 0x72, 0x36, 0x81, 0x96, 0x21, 0xc9, 0xd0, 0x1a, 0x95, 0xfa, 0xe1, 0xc3, 0x2c,
+	0x94, 0x92, 0xb0, 0x24, 0x5f, 0xe0, 0xb4, 0xef, 0x29, 0x80, 0x26, 0xdf, 0x92, 0xd0, 0xff, 0x4c,
+	0xbe, 0x52, 0x85, 0xea, 0xd5, 0xb9, 0x97, 0xa6, 0x59, 0x9e, 0xc5, 0x22, 0xff, 0xfc, 0x59, 0x2c,
+	0x47, 0x21, 0x1d, 0x7e, 0xad, 0x46, 0xcf, 0xc2, 0xcd, 0x0f, 0xca, 0xa5, 0x4a, 0xbd, 0xbe, 0x6f,
+	0x1c, 0x35, 0x8b, 0xcd, 0xf3, 0x8f, 0x29, 0x37, 0xe1, 0xda, 0x38, 0xbb, 0x7c, 0x58, 0x2c, 0xd5,
+	0xca, 0xbb, 0x59, 0x05, 0x6d, 0xc1, 0xcb, 0x53, 0x59, 0xc6, 0x5e, 0x5d, 0x37, 0x8e, 0x6a, 0xf5,
+	0xa6, 0xb1, 0x57, 0xad, 0xd5, 0xaa, 0x87, 0xf7, 0xb2, 0x91, 0xdc, 0x17, 0x0a, 0x20, 0x56, 0xf4,
+	0x84, 0x21, 0x44, 0xc7, 0x1f, 0xf5, 0x31, 0xa1, 0xe8, 0x3a, 0x2c, 0x0a, 0x43, 0xa5, 0xbf, 0x72,
+	0xc5, 0xc6, 0x45, 0xdb, 0x74, 0xba, 0x7d, 0x36, 0xd1, 0xb5, 0xdd, 0x4e, 0xe0, 0x55, 0x3a, 0x20,
+	0xee, 0xb8, 0x1d, 0x8c, 0x6a, 0x90, 0x92, 0x8e, 0x9f, 0x59, 0xf8, 0x31, 0xbf, 0x6a, 0x99, 0xed,
+	0xff, 0x9e, 0xf1, 0x3a, 0x3d, 0xb0, 0xf0, 0x63, 0x1d, 0xac, 0xe1, 0x6f, 0x76, 0xe6, 0x3d, 0xa6,
+	0x8e, 0x1d, 0x66, 0xf9, 0xda, 0x95, 0x60, 0x84, 0x23, 0xeb, 0x13, 0x16, 0x24, 0xe0, 0x4c, 0xea,
+	0x9e, 0x62, 0x47, 0xbe, 0xd2, 0x70, 0xf1, 0x26, 0x23, 0xe4, 0xbe, 0xa3, 0xc0, 0xda, 0x98, 0x77,
+	0x72, 0xaa, 0x2b, 0xc2, 0x92, 0xd0, 0x10, 0x14, 0xb7, 0x57, 0x66, 0xb4, 0x4e, 0x0f, 0xf6, 0xa1,
+	0x97, 0x61, 0xc5, 0x61, 0x83, 0x61, 0x48, 0xbd, 0x88, 0xc5, 0x32, 0x23, 0x37, 0x86, 0x26, 0xfc,
+	0x44, 0x81, 0xec, 0x3d, 0x2c, 0x2d, 0x08, 0xc2, 0x3b, 0xed, 0x71, 0xeb, 0xdf, 0x1f, 0xda, 0xdc,
+	0x9f, 0x14, 0x58, 0xdb, 0xf1, 0xb1, 0x49, 0xf1, 0xb8, 0x79, 0x4f, 0xca, 0xfe, 0xfb, 0xb0, 0x28,
+	0x76, 0xcb, 0xb9, 0x67, 0xe6, 0xa8, 0xc9, 0x6d, 0x93, 0x3e, 0x46, 0x2f, 0xf6, 0x31, 0x76, 0x35,
+	0x1f, 0xbf, 0x1f, 0x81, 0xb5, 0x63, 0xaf, 0x33, 0xe1, 0xe3, 0xc8, 0x17, 0xe5, 0x29, 0xf9, 0x32,
+	0x2d, 0x5f, 0x77, 0x21, 0xd5, 0xe7, 0xca, 0xf9, 0x1f, 0xcd, 0xe4, 0x03, 0x99, 0x36, 0xf1, 0xea,
+	0xb4, 0x67, 0x61, 0xbb, 0x73, 0x60, 0x92, 0x53, 0x1d, 0x84, 0x38, 0xfb, 0xfd, 0x94, 0x03, 0xf1,
+	0x2a, 0xac, 0xed, 0x62, 0x1b, 0x9f, 0x8f, 0xc3, 0x94, 0xa3, 0x98, 0xfb, 0x7b, 0x04, 0x6e, 0x96,
+	0x4c, 0xda, 0x7e, 0x14, 0x0e, 0xdc, 0x85, 0xb5, 0x61, 0x0b, 0xb2, 0xd2, 0xdc, 0x16, 0xdb, 0x6b,
+	0x0c, 0xe7, 0xb7, 0xca, 0x82, 0x9e, 0x11, 0x1c, 0x01, 0xea, 0x5b, 0xe8, 0xeb, 0xb0, 0x36, 0x26,
+	0x6b, 0x39, 0xb6, 0xe5, 0x60, 0x19, 0x9f, 0xd7, 0x66, 0x74, 0x91, 0xa3, 0x55, 0x16, 0xf4, 0xd5,
+	0x10, 0x78, 0x95, 0x03, 0x4d, 0x26, 0x27, 0x76, 0x71, 0x72, 0xe2, 0x57, 0x49, 0xce, 0xe2, 0x95,
+	0x92, 0x53, 0xca, 0x40, 0x3a, 0x1c, 0x8f, 0x9c, 0x01, 0xda, 0xb4, 0x04, 0x3c, 0xb5, 0xf2, 0x95,
+	0x3b, 0x93, 0x19, 0x0e, 0x1f, 0x89, 0x0b, 0x33, 0x1c, 0xd2, 0x1b, 0xb9, 0xa4, 0xde, 0x06, 0xa4,
+	0x42, 0xc9, 0x7b, 0x0a, 0x9e, 0x6c, 0xbd, 0x0f, 0x50, 0x0d, 0x77, 0x8b, 0x1b, 0xd5, 0xc3, 0x66,
+	0xf9, 0xb0, 0x69, 0x3c, 0xa8, 0x96, 0x3f, 0x38, 0xd7, 0x33, 0xd7, 0x21, 0x1b, 0x66, 0xee, 0x1d,
+	0xd7, 0x6a, 0x59, 0x65, 0xfb, 0xf3, 0x24, 0x2c, 0xc9, 0x00, 0xa0, 0x5f, 0x2b, 0x90, 0x0a, 0x35,
+	0x0c, 0xf4, 0xc6, 0x85, 0xe6, 0x4c, 0x36, 0x4f, 0xed, 0xcd, 0xf9, 0x36, 0x89, 0xa4, 0xe6, 0xb6,
+	0xbf, 0xfb, 0x87, 0x3f, 0xff, 0x38, 0xf2, 0x1a, 0xda, 0x1a, 0xfe, 0xb9, 0xff, 0x9b, 0x22, 0xec,
+	0xef, 0x7a, 0xbe, 0xfb, 0x0d, 0xdc, 0xa6, 0xa4, 0xb0, 0x55, 0x30, 0xbb, 0xd8, 0xa1, 0x9f, 0x16,
+	0x82, 0x26, 0xf4, 0x33, 0x05, 0x92, 0xc3, 0xe6, 0x82, 0x2e, 0xfe, 0xb3, 0xe6, 0xf9, 0x46, 0xa4,
+	0xcd, 0x1a, 0xee, 0x69, 0xd6, 0xb1, 0x52, 0x31, 0x61, 0x5b, 0x60, 0x5a, 0x61, 0xeb, 0x53, 0xf4,
+	0x99, 0x02, 0xe9, 0x70, 0x7b, 0x41, 0x17, 0x07, 0x66, 0x4a, 0x37, 0x9a, 0xdd, 0xc6, 0x3b, 0xdc,
+	0xc6, 0x37, 0x73, 0x73, 0x44, 0xf0, 0x4e, 0x50, 0xcd, 0x7f, 0xa3, 0x40, 0x3a, 0x7c, 0xd9, 0x66,
+	0xb0, 0x75, 0x4a, 0x57, 0x99, 0xdd, 0xd6, 0x22, 0xb7, 0xf5, 0xee, 0xf6, 0xed, 0x91, 0xad, 0xf2,
+	0xbf, 0x4c, 0x2e, 0x0a, 0xeb, 0xd0, 0xe4, 0x1f, 0x29, 0x90, 0x0e, 0x5f, 0xdf, 0x19, 0x4c, 0x9e,
+	0xd2, 0x00, 0xb4, 0xeb, 0x13, 0x05, 0xaf, 0xdc, 0xf3, 0xe8, 0x20, 0xc8, 0xf8, 0xd6, 0x3c, 0x19,
+	0xff, 0x5c, 0x01, 0x34, 0x59, 0xb7, 0xd0, 0xc5, 0xaf, 0x0a, 0x4f, 0xec, 0x36, 0xda, 0xb3, 0xc1,
+	0xde, 0xd0, 0xbf, 0xb9, 0xe4, 0xeb, 0xc1, 0xbf, 0xb9, 0x04, 0x71, 0xcc, 0xbd, 0x35, 0x47, 0xce,
+	0x5b, 0x23, 0x65, 0x77, 0x94, 0xad, 0x91, 0xd1, 0x63, 0xb5, 0x70, 0x56, 0xa3, 0xa7, 0x15, 0xd0,
+	0x7f, 0x99, 0xd1, 0x42, 0xd9, 0x1d, 0x65, 0xab, 0xf4, 0x99, 0x02, 0x2f, 0xb6, 0xdd, 0xde, 0x45,
+	0x36, 0x96, 0x64, 0xb5, 0x6d, 0xb0, 0xdc, 0x36, 0x94, 0x0f, 0xab, 0x52, 0xbe, 0xeb, 0xb2, 0x4e,
+	0x98, 0x77, 0xfd, 0x6e, 0xa1, 0x8b, 0x1d, 0x9e, 0xf9, 0x82, 0x60, 0x99, 0x9e, 0x45, 0x9e, 0xf8,
+	0x1f, 0x48, 0x77, 0x47, 0xa4, 0xbf, 0x29, 0xca, 0x2f, 0x22, 0x91, 0xdd, 0xbd, 0x5f, 0x45, 0x9e,
+	0xbf, 0x27, 0x30, 0x77, 0xb8, 0x0d, 0xbb, 0x23, 0x1b, 0x1e, 0x88, 0x4d, 0xad, 0x45, 0x8e, 0xff,
+	0xc6, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xda, 0x37, 0x44, 0x7c, 0x68, 0x25, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3600,188 +3428,3 @@ var _Intents_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2beta1/intent.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/intent.proto", fileDescriptor_intent_2d72c44f592bb8da)
-}
-
-var fileDescriptor_intent_2d72c44f592bb8da = []byte{
-	// 2831 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0x57,
-	0xb5, 0x77, 0xeb, 0xc3, 0x96, 0x8e, 0x64, 0x59, 0xbe, 0xf6, 0xcc, 0xf4, 0xf4, 0xe4, 0xc3, 0x51,
-	0x5e, 0x12, 0xc7, 0x2f, 0x91, 0xde, 0x38, 0x79, 0x79, 0xc9, 0xcc, 0x4b, 0x82, 0x64, 0xcb, 0x23,
-	0x61, 0xd9, 0xd2, 0xb4, 0xe5, 0x09, 0x93, 0x02, 0xba, 0x5a, 0xd2, 0xb5, 0xa6, 0x71, 0xab, 0xbb,
-	0xd3, 0xf7, 0xca, 0x13, 0x05, 0x52, 0x50, 0x54, 0x01, 0x0b, 0x36, 0x54, 0xb1, 0x02, 0x36, 0x14,
-	0x1b, 0x2a, 0x14, 0x0b, 0x2a, 0x3b, 0xfe, 0x04, 0x16, 0xac, 0x58, 0x66, 0x41, 0x51, 0x45, 0xb1,
-	0xe0, 0x2f, 0x60, 0x07, 0x75, 0x3f, 0x5a, 0x6a, 0x59, 0x1a, 0x2c, 0xd9, 0x03, 0x1b, 0x76, 0xba,
-	0xe7, 0x9c, 0xfb, 0x3b, 0x5f, 0xf7, 0x9e, 0x73, 0xfa, 0xda, 0xf0, 0x5a, 0xd7, 0x75, 0xbb, 0x36,
-	0x2e, 0xb4, 0x6d, 0xb7, 0xdf, 0x29, 0x74, 0x2c, 0xd3, 0x76, 0xbb, 0x27, 0xb6, 0xfb, 0xb8, 0x70,
-	0xb6, 0xdd, 0xc2, 0xd4, 0xbc, 0x5d, 0xb0, 0x1c, 0x8a, 0x1d, 0x9a, 0xf7, 0x7c, 0x97, 0xba, 0xe8,
-	0x79, 0x21, 0x9d, 0xe7, 0xd2, 0xf9, 0x91, 0x74, 0x5e, 0x4a, 0x6b, 0xcf, 0x48, 0x38, 0xd3, 0xb3,
-	0x0a, 0xa6, 0xe3, 0xb8, 0xd4, 0xa4, 0x96, 0xeb, 0x10, 0xb1, 0x5d, 0xbb, 0x19, 0xe2, 0xfa, 0x98,
-	0xb8, 0x7d, 0xbf, 0x8d, 0x25, 0xeb, 0xf5, 0x8b, 0xec, 0x68, 0xbb, 0x0e, 0xc5, 0x1f, 0x4b, 0x43,
-	0xb4, 0x17, 0xa5, 0xb8, 0xed, 0x3a, 0x5d, 0xbf, 0xef, 0x38, 0x96, 0xd3, 0x2d, 0xb8, 0x1e, 0xf6,
-	0xc7, 0xd4, 0x3d, 0x27, 0x85, 0xf8, 0xaa, 0xd5, 0x3f, 0x29, 0x74, 0xfa, 0x42, 0x40, 0xf2, 0x6f,
-	0x9d, 0xe7, 0xe3, 0x9e, 0x47, 0x07, 0x92, 0xb9, 0x71, 0x9e, 0x79, 0x62, 0x61, 0xbb, 0x63, 0xf4,
-	0x4c, 0x72, 0x2a, 0x25, 0x9e, 0x39, 0x2f, 0x41, 0xa8, 0xdf, 0x6f, 0x4b, 0x0b, 0x73, 0x3f, 0x2f,
-	0xc0, 0x62, 0x95, 0xc7, 0x0e, 0x21, 0x88, 0x39, 0x66, 0x0f, 0xab, 0xca, 0x86, 0xb2, 0x99, 0xd4,
-	0xf9, 0x6f, 0xf4, 0x02, 0xa4, 0x3b, 0x16, 0xf1, 0x6c, 0x73, 0x60, 0x70, 0x5e, 0x84, 0xf3, 0x52,
-	0x92, 0x76, 0xc8, 0x44, 0x1e, 0xc2, 0xf2, 0x63, 0xdc, 0x7a, 0xe4, 0xba, 0xa7, 0x06, 0xa1, 0x26,
-	0xc5, 0xea, 0xe2, 0x86, 0xb2, 0x99, 0xd9, 0x7e, 0x33, 0x7f, 0x41, 0x12, 0xf2, 0x42, 0x6d, 0xfe,
-	0x03, 0xb1, 0xf9, 0x88, 0xed, 0xd5, 0xd3, 0x8f, 0x43, 0x2b, 0xa4, 0x41, 0xc2, 0xf3, 0x2d, 0xd7,
-	0xb7, 0xe8, 0x40, 0x8d, 0x6e, 0x28, 0x9b, 0x71, 0x7d, 0xb8, 0x46, 0xcf, 0x43, 0xca, 0x22, 0xc6,
-	0x89, 0x69, 0xdb, 0x2d, 0xb3, 0x7d, 0xaa, 0xc6, 0x36, 0x94, 0xcd, 0x84, 0x0e, 0x16, 0xd9, 0x93,
-	0x14, 0xf4, 0x02, 0x40, 0xcf, 0x36, 0xb0, 0x63, 0xb6, 0x6c, 0xdc, 0x51, 0xe3, 0x8c, 0x5f, 0x8a,
-	0xa8, 0x8a, 0x9e, 0xec, 0xd9, 0x65, 0x41, 0x64, 0x18, 0x3d, 0xdb, 0xe8, 0x58, 0x44, 0xc8, 0xac,
-	0x09, 0x8c, 0x9e, 0xbd, 0x2b, 0x29, 0xe8, 0x15, 0x58, 0xc1, 0x4e, 0xc7, 0x60, 0x87, 0xcb, 0x37,
-	0xdb, 0x2c, 0x27, 0xea, 0x35, 0x2e, 0x94, 0xc1, 0x4e, 0xa7, 0x3a, 0xa2, 0xa2, 0x3c, 0xac, 0x59,
-	0x8e, 0xd7, 0xa7, 0x86, 0xcc, 0x3f, 0x8f, 0x16, 0x51, 0x97, 0x36, 0xa2, 0x9b, 0x49, 0x7d, 0x95,
-	0xb3, 0x76, 0x04, 0x87, 0xc5, 0x8c, 0xa0, 0xeb, 0xb0, 0x88, 0xcf, 0xb0, 0x43, 0x89, 0x9a, 0xe0,
-	0x22, 0x72, 0x85, 0x4c, 0xc8, 0x52, 0xdf, 0xb4, 0xd8, 0x41, 0x31, 0xbc, 0x47, 0xbe, 0x49, 0x30,
-	0x51, 0x93, 0x1b, 0xd1, 0xcd, 0xd4, 0xf6, 0x5b, 0xb3, 0xc6, 0xb3, 0x29, 0xf7, 0x37, 0xf8, 0x76,
-	0x7d, 0x85, 0x8e, 0xad, 0xb9, 0x6a, 0xe9, 0x0a, 0xf0, 0x64, 0xca, 0x15, 0xba, 0x0f, 0x2b, 0x6e,
-	0x9f, 0x86, 0x7c, 0x20, 0x6a, 0x8a, 0x6b, 0xde, 0xbc, 0x50, 0xb3, 0x74, 0x4d, 0xcf, 0x08, 0x00,
-	0xb9, 0x24, 0xe8, 0x25, 0xc8, 0xf8, 0x98, 0xe0, 0x10, 0x62, 0x9a, 0x47, 0x6f, 0x99, 0x53, 0x87,
-	0x62, 0xf7, 0x01, 0x3c, 0xd3, 0x37, 0x7b, 0x98, 0x62, 0x9f, 0xa8, 0xcb, 0x5c, 0xe9, 0xed, 0x59,
-	0xdd, 0x6d, 0x04, 0x3b, 0xf5, 0x10, 0x08, 0xda, 0x87, 0x44, 0x0f, 0x13, 0x62, 0x76, 0x31, 0x51,
-	0x33, 0x1c, 0xb0, 0x30, 0x2b, 0xe0, 0x81, 0xd8, 0xa7, 0x0f, 0x01, 0xd0, 0x19, 0x68, 0x1d, 0x7c,
-	0x62, 0xf6, 0x6d, 0x6a, 0xf8, 0x98, 0x78, 0xae, 0x43, 0xb0, 0xe1, 0xd9, 0x26, 0x3d, 0x71, 0xfd,
-	0x1e, 0x51, 0x57, 0x36, 0xa2, 0x9b, 0x99, 0xed, 0xb7, 0xe7, 0x84, 0xcf, 0x37, 0x24, 0x80, 0xae,
-	0x4a, 0x6c, 0x5d, 0x42, 0x07, 0x0c, 0x82, 0xde, 0x81, 0x9b, 0xbe, 0xeb, 0x52, 0xe3, 0xc4, 0xb5,
-	0x6d, 0xf7, 0x71, 0xdf, 0x33, 0x44, 0x91, 0x13, 0x37, 0x31, 0xcb, 0x93, 0x77, 0x9d, 0x09, 0xec,
-	0x49, 0xbe, 0xd0, 0xc0, 0x2f, 0xe5, 0xbb, 0x70, 0xcb, 0x33, 0x7d, 0x26, 0x3c, 0x75, 0xf3, 0x2a,
-	0xdf, 0xac, 0x0a, 0x91, 0x29, 0xdb, 0x6d, 0x58, 0x3f, 0xbf, 0xcf, 0x72, 0x4e, 0x5c, 0x15, 0xf1,
-	0x50, 0xde, 0x99, 0xd5, 0xd7, 0x71, 0xe4, 0xaa, 0x73, 0xe2, 0xea, 0xe8, 0x64, 0x82, 0xa6, 0xfd,
-	0x32, 0x0a, 0x99, 0xf1, 0x53, 0x3b, 0xb5, 0x16, 0xd5, 0x21, 0x46, 0x07, 0x9e, 0xa8, 0x41, 0x99,
-	0xed, 0xbb, 0x97, 0xbb, 0x0f, 0xf9, 0xe6, 0xc0, 0xc3, 0x3a, 0x07, 0x42, 0xf7, 0x21, 0xee, 0x99,
-	0x3e, 0x25, 0x6a, 0x94, 0xbb, 0x75, 0x59, 0xc4, 0x86, 0xe9, 0x53, 0x5d, 0x20, 0xa1, 0x2d, 0x58,
-	0xa5, 0x56, 0x0f, 0x13, 0xc3, 0xec, 0x74, 0x70, 0xc7, 0x68, 0xbb, 0x7d, 0x87, 0xf2, 0xda, 0x14,
-	0xd7, 0x57, 0x38, 0xa3, 0xc8, 0xe8, 0x3b, 0x8c, 0xac, 0x51, 0x88, 0xb1, 0xad, 0xcc, 0x57, 0x76,
-	0x0f, 0x02, 0x5f, 0xd9, 0x6f, 0x56, 0x99, 0xb0, 0x43, 0x2d, 0x3a, 0x30, 0x86, 0x2e, 0x27, 0x75,
-	0x10, 0x24, 0xe6, 0x01, 0x5a, 0x87, 0xb8, 0x69, 0x5b, 0x26, 0xe1, 0x75, 0x31, 0xa9, 0x8b, 0x05,
-	0x2b, 0xd7, 0x7d, 0x82, 0x7d, 0xa3, 0x83, 0x4f, 0x2c, 0x07, 0x77, 0x64, 0x55, 0x4c, 0x31, 0xda,
-	0xae, 0x20, 0xe5, 0xee, 0x42, 0x4c, 0x02, 0x64, 0x9b, 0x0f, 0x1b, 0x65, 0xe3, 0xf8, 0xf0, 0xa8,
-	0x51, 0xde, 0xa9, 0xee, 0x55, 0xcb, 0xbb, 0xd9, 0x05, 0x94, 0x82, 0xa5, 0xf2, 0x57, 0x8a, 0x07,
-	0x8d, 0x5a, 0x39, 0xab, 0xa0, 0x2c, 0x24, 0x9a, 0xe5, 0x83, 0x46, 0xad, 0xd8, 0x2c, 0x67, 0x23,
-	0x5a, 0x24, 0xa1, 0x68, 0x3f, 0x88, 0x40, 0x72, 0x78, 0xe1, 0x2e, 0xdb, 0x30, 0xd6, 0x21, 0x7e,
-	0x66, 0xda, 0x7d, 0x1c, 0x98, 0xce, 0x17, 0xe8, 0x45, 0x58, 0x0e, 0x2e, 0x99, 0xe0, 0xc6, 0x38,
-	0x37, 0x2d, 0x89, 0x0f, 0xb8, 0xd0, 0xff, 0x81, 0x1a, 0x0a, 0x8b, 0x31, 0xa6, 0x29, 0xce, 0xe5,
-	0xaf, 0x8d, 0x62, 0xb4, 0x1b, 0xd2, 0xf9, 0x0c, 0x24, 0x7b, 0xa6, 0xd3, 0x31, 0xa9, 0xeb, 0x0f,
-	0x78, 0x83, 0x4a, 0xe8, 0x23, 0x02, 0x52, 0x61, 0xc9, 0xf3, 0xdd, 0x9e, 0x47, 0x83, 0x8a, 0x1d,
-	0x2c, 0xd1, 0x0d, 0x58, 0xb2, 0x88, 0x61, 0x5b, 0x84, 0xaa, 0x09, 0xbe, 0x6b, 0xd1, 0x22, 0x35,
-	0x8b, 0x50, 0xed, 0xaf, 0xcf, 0xc1, 0x92, 0xbc, 0xca, 0xe8, 0xcb, 0xa1, 0x04, 0xa6, 0x66, 0x6f,
-	0x7c, 0x41, 0x25, 0x68, 0xe2, 0x8f, 0x69, 0x65, 0x41, 0x26, 0xfe, 0x00, 0xe2, 0x56, 0xcf, 0xec,
-	0x8a, 0xc0, 0xa5, 0xb6, 0xff, 0x77, 0x5e, 0xb0, 0x2a, 0xdb, 0x5c, 0x59, 0xd0, 0x05, 0x0a, 0x6a,
-	0xc3, 0xf2, 0x47, 0x7d, 0xab, 0x7d, 0x6a, 0xf8, 0xd8, 0xb3, 0x2d, 0x2c, 0x8e, 0x4b, 0x6a, 0xfb,
-	0xff, 0xe7, 0x85, 0xbd, 0xcf, 0x40, 0x74, 0x81, 0x51, 0x59, 0xd0, 0xd3, 0x1f, 0x85, 0xd6, 0xcc,
-	0xff, 0xb6, 0xe9, 0x8b, 0xd3, 0x76, 0x09, 0xff, 0x77, 0x4c, 0xbf, 0xc3, 0xfc, 0x67, 0x18, 0xe8,
-	0x0d, 0x58, 0xf2, 0xcc, 0x81, 0xed, 0x9a, 0xa2, 0x65, 0xa7, 0xb6, 0x6f, 0x04, 0x70, 0xc1, 0xfc,
-	0x92, 0x3f, 0xe2, 0xf3, 0x4b, 0x65, 0x41, 0x0f, 0x24, 0x91, 0x0d, 0x59, 0x62, 0xf5, 0x3c, 0x1b,
-	0x0f, 0xeb, 0x33, 0x4b, 0x24, 0xdb, 0xfd, 0xfe, 0xbc, 0xc6, 0x1c, 0x71, 0x9c, 0xa0, 0x16, 0x33,
-	0x5f, 0x57, 0xc8, 0x38, 0x09, 0x7d, 0x08, 0xd0, 0x32, 0x89, 0xd5, 0x36, 0xb8, 0xd3, 0x09, 0xae,
-	0xe7, 0x9d, 0x79, 0xf5, 0x94, 0x18, 0x82, 0xf4, 0x3c, 0xd9, 0x0a, 0x16, 0xc8, 0x80, 0x14, 0xe9,
-	0x77, 0xbb, 0x98, 0xf0, 0x01, 0x51, 0x4d, 0x72, 0xf0, 0xbb, 0x73, 0x3b, 0x31, 0x82, 0xa8, 0x2c,
-	0xe8, 0x61, 0x44, 0x44, 0x60, 0xcd, 0xb6, 0x9c, 0x53, 0xc3, 0xed, 0x53, 0x63, 0x44, 0xe7, 0xa3,
-	0x40, 0x6a, 0xbb, 0x38, 0xaf, 0xa2, 0x9a, 0xe5, 0x9c, 0xd6, 0xfb, 0x74, 0xa4, 0xaf, 0xb2, 0xa0,
-	0xaf, 0xda, 0xe7, 0x89, 0xe8, 0x6b, 0x90, 0x62, 0x57, 0xc8, 0x20, 0xd8, 0xc6, 0x6d, 0xaa, 0xa6,
-	0xb8, 0xb2, 0x3b, 0xf3, 0x2b, 0x23, 0xf4, 0x88, 0x23, 0x54, 0x16, 0x74, 0xb0, 0x87, 0x2b, 0x64,
-	0xc1, 0x4a, 0xdb, 0xf4, 0xdd, 0x3e, 0xc1, 0x76, 0xa0, 0x22, 0xcd, 0x55, 0xbc, 0x77, 0x89, 0xa3,
-	0xc8, 0x61, 0x86, 0x6a, 0x32, 0xed, 0x31, 0x0a, 0x3a, 0x83, 0x75, 0x8a, 0x6d, 0xec, 0x3d, 0x72,
-	0x9d, 0x81, 0xc1, 0x6b, 0x8f, 0xd9, 0xef, 0x58, 0xae, 0xba, 0xcc, 0xf5, 0x95, 0xe6, 0xbf, 0xfa,
-	0x12, 0xab, 0x61, 0x9b, 0x83, 0x22, 0x43, 0xaa, 0x2c, 0xe8, 0x88, 0x4e, 0x50, 0xd1, 0x0f, 0x15,
-	0xb8, 0x35, 0x52, 0x4c, 0x06, 0x0e, 0x7d, 0x84, 0x89, 0xf5, 0x09, 0x36, 0x88, 0x87, 0x71, 0xfb,
-	0x91, 0x9a, 0xe1, 0xfa, 0xab, 0x97, 0xd6, 0x7f, 0x34, 0x44, 0x3c, 0xe2, 0x80, 0x95, 0x05, 0xfd,
-	0x26, 0x7d, 0x12, 0x13, 0x7d, 0x1b, 0x6e, 0x8c, 0x8c, 0xa1, 0xbe, 0xe9, 0x90, 0x13, 0xec, 0x1b,
-	0x6d, 0xd3, 0xb6, 0xd5, 0x15, 0x6e, 0x48, 0xf9, 0xd2, 0x86, 0x34, 0x25, 0xda, 0x8e, 0x69, 0xdb,
-	0x95, 0x05, 0xfd, 0x1a, 0x9d, 0xc6, 0x40, 0x4d, 0x48, 0x04, 0x03, 0x98, 0xfc, 0xdc, 0xb8, 0xfc,
-	0xfc, 0x35, 0x44, 0xd2, 0x34, 0x88, 0xb1, 0x5a, 0x1c, 0x6a, 0xc8, 0xd1, 0xa0, 0x21, 0x6b, 0x47,
-	0x10, 0xe7, 0xa5, 0x15, 0xdd, 0x82, 0x24, 0x2f, 0xad, 0x46, 0xdf, 0xb7, 0x64, 0xe7, 0x4b, 0x70,
-	0xc2, 0xb1, 0x6f, 0xa1, 0xd7, 0x01, 0x99, 0xed, 0x36, 0x26, 0xc4, 0x6a, 0x59, 0x36, 0x6f, 0x53,
-	0x0c, 0x47, 0xf4, 0xc0, 0xd5, 0x31, 0x0e, 0x53, 0xa4, 0x55, 0x21, 0x1d, 0x2e, 0xac, 0xac, 0x33,
-	0x52, 0x8b, 0xda, 0x41, 0x47, 0x15, 0x0b, 0xd6, 0x19, 0xc7, 0x6b, 0x78, 0x84, 0xdb, 0x35, 0x56,
-	0x83, 0xb5, 0xbf, 0x28, 0x10, 0xe3, 0x15, 0x64, 0x3a, 0x86, 0x06, 0x09, 0xd2, 0x6f, 0x09, 0x86,
-	0x30, 0x67, 0xb8, 0x1e, 0xf7, 0x28, 0x7a, 0xce, 0xa3, 0x63, 0x58, 0x6a, 0xf5, 0x29, 0x65, 0xc5,
-	0x28, 0x36, 0xdf, 0x94, 0x14, 0x2e, 0xef, 0xf9, 0x12, 0xc7, 0xd0, 0x03, 0x2c, 0xed, 0x6d, 0x58,
-	0x14, 0xa4, 0xa9, 0xd3, 0x0f, 0xfb, 0xee, 0x73, 0x09, 0xe5, 0x1f, 0x76, 0xd2, 0xda, 0x60, 0xad,
-	0xf5, 0x20, 0x33, 0x5e, 0xa3, 0xd1, 0x7f, 0x41, 0x86, 0x7f, 0x72, 0x51, 0x37, 0xb8, 0x0d, 0x02,
-	0x2b, 0xcd, 0xa8, 0x4d, 0x57, 0x9e, 0x59, 0x04, 0x31, 0x42, 0x7a, 0xb6, 0xc4, 0xe3, 0xbf, 0xc3,
-	0xc3, 0x0a, 0xb7, 0x21, 0x3a, 0x36, 0xac, 0xf0, 0x14, 0x7d, 0x0b, 0x56, 0xce, 0xb5, 0x04, 0x64,
-	0x4d, 0xe9, 0x36, 0x0a, 0x8f, 0xcd, 0x7b, 0x57, 0xeb, 0x36, 0x13, 0xad, 0x46, 0xfb, 0x5d, 0x14,
-	0x92, 0xc3, 0x4e, 0x71, 0x89, 0xd4, 0xbe, 0x04, 0x19, 0x76, 0xb2, 0x4d, 0x4a, 0x71, 0x27, 0xec,
-	0xe2, 0xf2, 0x90, 0xca, 0x0f, 0xfc, 0x7e, 0x30, 0x74, 0xc4, 0xae, 0x30, 0x74, 0x04, 0x23, 0xc7,
-	0x87, 0xa3, 0x13, 0x13, 0xe7, 0x51, 0xf9, 0xd2, 0xa5, 0x7b, 0xe3, 0xc4, 0xb1, 0xf9, 0xad, 0x32,
-	0x3c, 0x37, 0xd3, 0x83, 0x71, 0x06, 0x2b, 0xae, 0x87, 0x1d, 0x76, 0x94, 0x0d, 0xf9, 0x95, 0x2b,
-	0x06, 0xa9, 0xc3, 0xab, 0x1a, 0x91, 0xaf, 0x7b, 0xd8, 0x39, 0xf6, 0xad, 0x22, 0x47, 0xd5, 0x97,
-	0xdd, 0xf0, 0x52, 0x7b, 0x01, 0x96, 0xc7, 0xf8, 0x28, 0x0b, 0xd1, 0x51, 0x81, 0x60, 0x3f, 0xb5,
-	0x1c, 0x40, 0xa8, 0x25, 0x4e, 0x35, 0x5f, 0x3b, 0x85, 0x54, 0xa8, 0x77, 0xa3, 0xaf, 0x8e, 0x4f,
-	0x03, 0xca, 0x7c, 0x5f, 0x5f, 0x93, 0xd3, 0xc0, 0xd8, 0x28, 0xa0, 0x35, 0x60, 0x75, 0xa2, 0x7f,
-	0xa3, 0x57, 0x21, 0xdb, 0x61, 0x3f, 0x1d, 0xfe, 0x02, 0x65, 0x84, 0xe6, 0xfb, 0x95, 0x10, 0x9d,
-	0xcf, 0xd4, 0xd2, 0xc5, 0xc8, 0xc8, 0xc5, 0x2f, 0x22, 0x00, 0xa3, 0x2e, 0xfd, 0x84, 0x14, 0x1d,
-	0x43, 0xdc, 0xa2, 0xb8, 0x27, 0xca, 0xd8, 0x25, 0x26, 0xb4, 0x91, 0x82, 0x7c, 0x95, 0xe2, 0x9e,
-	0x2e, 0xd0, 0xb4, 0x3f, 0x2a, 0x10, 0x63, 0x6b, 0xa4, 0x43, 0x8c, 0x7f, 0xab, 0x2a, 0x97, 0x1b,
-	0x01, 0x04, 0x34, 0x43, 0xe2, 0xdf, 0xab, 0x1c, 0x6b, 0xe4, 0x49, 0x24, 0xec, 0xc9, 0x06, 0xa4,
-	0x3a, 0x98, 0xb4, 0x7d, 0xcb, 0xe3, 0x07, 0x2d, 0xa8, 0x1e, 0x23, 0xd2, 0x53, 0xbd, 0x58, 0xda,
-	0xef, 0x23, 0x90, 0x19, 0x1f, 0x50, 0xd0, 0xc3, 0x20, 0x96, 0xe2, 0x68, 0xec, 0x5c, 0x6d, 0xde,
-	0xf9, 0x0f, 0x8b, 0xe7, 0x7b, 0x90, 0x19, 0x37, 0x8e, 0x9d, 0xe8, 0x53, 0x3c, 0x08, 0x2e, 0xed,
-	0x29, 0x1e, 0xf0, 0xe2, 0x3a, 0x70, 0x5c, 0x67, 0xd0, 0x0b, 0xda, 0xee, 0x70, 0xad, 0xdd, 0x06,
-	0x34, 0x39, 0xbf, 0xb1, 0x6e, 0xca, 0x47, 0xc2, 0xf0, 0x7c, 0xc0, 0x09, 0xc7, 0xbe, 0xa5, 0xdd,
-	0x87, 0x9b, 0x4f, 0x1c, 0xb9, 0xd0, 0x7a, 0xb8, 0x13, 0x0e, 0x3f, 0x08, 0xd7, 0xc3, 0x7d, 0x8b,
-	0x51, 0xd9, 0xaa, 0x94, 0x80, 0x45, 0xf1, 0x2e, 0xad, 0xdd, 0x81, 0x6b, 0x53, 0x87, 0x27, 0xd6,
-	0xdc, 0x18, 0x11, 0x1b, 0x4e, 0xbf, 0xd7, 0xc2, 0xbe, 0xb4, 0x25, 0xc5, 0x69, 0x87, 0x9c, 0x94,
-	0xfb, 0xa9, 0x02, 0x89, 0x60, 0x0e, 0x42, 0x2a, 0xac, 0xb3, 0x4f, 0xfd, 0xbd, 0xba, 0x7e, 0x70,
-	0xee, 0x51, 0x20, 0x0d, 0x89, 0xbd, 0xe2, 0x4e, 0xb9, 0x54, 0xaf, 0xef, 0x67, 0x15, 0x94, 0x84,
-	0xf8, 0x51, 0xad, 0xb8, 0xb3, 0x9f, 0x8d, 0x30, 0x46, 0xb3, 0x5c, 0x2b, 0xdf, 0xd3, 0x8b, 0x07,
-	0xd9, 0x28, 0x5a, 0x82, 0xe8, 0x7e, 0x75, 0x3f, 0x1b, 0xe3, 0x12, 0xfb, 0x0f, 0x1b, 0xe5, 0x6c,
-	0x1c, 0x25, 0x20, 0x56, 0xab, 0x1e, 0x96, 0xb3, 0x8b, 0x8c, 0xf8, 0xa0, 0x5a, 0x2a, 0xeb, 0xd9,
-	0x25, 0x74, 0x0d, 0x56, 0x8b, 0x3b, 0xcd, 0x6a, 0xfd, 0xf0, 0xc8, 0xa8, 0x1f, 0x1a, 0xf7, 0xea,
-	0xf5, 0x7b, 0xb5, 0x72, 0x36, 0x81, 0x96, 0x21, 0xc9, 0xd0, 0x1a, 0x95, 0xfa, 0xe1, 0xc3, 0x2c,
-	0x94, 0x92, 0xb0, 0x24, 0x5f, 0xe0, 0xb4, 0xef, 0x29, 0x80, 0x26, 0xdf, 0x92, 0xd0, 0xff, 0x4c,
-	0xbe, 0x52, 0x85, 0xea, 0xd5, 0xb9, 0x97, 0xa6, 0x59, 0x9e, 0xc5, 0x22, 0xff, 0xfc, 0x59, 0x2c,
-	0x47, 0x21, 0x1d, 0x7e, 0xad, 0x46, 0xcf, 0xc2, 0xcd, 0x0f, 0xca, 0xa5, 0x4a, 0xbd, 0xbe, 0x6f,
-	0x1c, 0x35, 0x8b, 0xcd, 0xf3, 0x8f, 0x29, 0x37, 0xe1, 0xda, 0x38, 0xbb, 0x7c, 0x58, 0x2c, 0xd5,
-	0xca, 0xbb, 0x59, 0x05, 0x6d, 0xc1, 0xcb, 0x53, 0x59, 0xc6, 0x5e, 0x5d, 0x37, 0x8e, 0x6a, 0xf5,
-	0xa6, 0xb1, 0x57, 0xad, 0xd5, 0xaa, 0x87, 0xf7, 0xb2, 0x91, 0xdc, 0x17, 0x0a, 0x20, 0x56, 0xf4,
-	0x84, 0x21, 0x44, 0xc7, 0x1f, 0xf5, 0x31, 0xa1, 0xe8, 0x3a, 0x2c, 0x0a, 0x43, 0xa5, 0xbf, 0x72,
-	0xc5, 0xc6, 0x45, 0xdb, 0x74, 0xba, 0x7d, 0x36, 0xd1, 0xb5, 0xdd, 0x4e, 0xe0, 0x55, 0x3a, 0x20,
-	0xee, 0xb8, 0x1d, 0x8c, 0x6a, 0x90, 0x92, 0x8e, 0x9f, 0x59, 0xf8, 0x31, 0xbf, 0x6a, 0x99, 0xed,
-	0xff, 0x9e, 0xf1, 0x3a, 0x3d, 0xb0, 0xf0, 0x63, 0x1d, 0xac, 0xe1, 0x6f, 0x76, 0xe6, 0x3d, 0xa6,
-	0x8e, 0x1d, 0x66, 0xf9, 0xda, 0x95, 0x60, 0x84, 0x23, 0xeb, 0x13, 0x16, 0x24, 0xe0, 0x4c, 0xea,
-	0x9e, 0x62, 0x47, 0xbe, 0xd2, 0x70, 0xf1, 0x26, 0x23, 0xe4, 0xbe, 0xa3, 0xc0, 0xda, 0x98, 0x77,
-	0x72, 0xaa, 0x2b, 0xc2, 0x92, 0xd0, 0x10, 0x14, 0xb7, 0x57, 0x66, 0xb4, 0x4e, 0x0f, 0xf6, 0xa1,
-	0x97, 0x61, 0xc5, 0x61, 0x83, 0x61, 0x48, 0xbd, 0x88, 0xc5, 0x32, 0x23, 0x37, 0x86, 0x26, 0xfc,
-	0x44, 0x81, 0xec, 0x3d, 0x2c, 0x2d, 0x08, 0xc2, 0x3b, 0xed, 0x71, 0xeb, 0xdf, 0x1f, 0xda, 0xdc,
-	0x9f, 0x14, 0x58, 0xdb, 0xf1, 0xb1, 0x49, 0xf1, 0xb8, 0x79, 0x4f, 0xca, 0xfe, 0xfb, 0xb0, 0x28,
-	0x76, 0xcb, 0xb9, 0x67, 0xe6, 0xa8, 0xc9, 0x6d, 0x93, 0x3e, 0x46, 0x2f, 0xf6, 0x31, 0x76, 0x35,
-	0x1f, 0xbf, 0x1f, 0x81, 0xb5, 0x63, 0xaf, 0x33, 0xe1, 0xe3, 0xc8, 0x17, 0xe5, 0x29, 0xf9, 0x32,
-	0x2d, 0x5f, 0x77, 0x21, 0xd5, 0xe7, 0xca, 0xf9, 0x1f, 0xcd, 0xe4, 0x03, 0x99, 0x36, 0xf1, 0xea,
-	0xb4, 0x67, 0x61, 0xbb, 0x73, 0x60, 0x92, 0x53, 0x1d, 0x84, 0x38, 0xfb, 0xfd, 0x94, 0x03, 0xf1,
-	0x2a, 0xac, 0xed, 0x62, 0x1b, 0x9f, 0x8f, 0xc3, 0x94, 0xa3, 0x98, 0xfb, 0x7b, 0x04, 0x6e, 0x96,
-	0x4c, 0xda, 0x7e, 0x14, 0x0e, 0xdc, 0x85, 0xb5, 0x61, 0x0b, 0xb2, 0xd2, 0xdc, 0x16, 0xdb, 0x6b,
-	0x0c, 0xe7, 0xb7, 0xca, 0x82, 0x9e, 0x11, 0x1c, 0x01, 0xea, 0x5b, 0xe8, 0xeb, 0xb0, 0x36, 0x26,
-	0x6b, 0x39, 0xb6, 0xe5, 0x60, 0x19, 0x9f, 0xd7, 0x66, 0x74, 0x91, 0xa3, 0x55, 0x16, 0xf4, 0xd5,
-	0x10, 0x78, 0x95, 0x03, 0x4d, 0x26, 0x27, 0x76, 0x71, 0x72, 0xe2, 0x57, 0x49, 0xce, 0xe2, 0x95,
-	0x92, 0x53, 0xca, 0x40, 0x3a, 0x1c, 0x8f, 0x9c, 0x01, 0xda, 0xb4, 0x04, 0x3c, 0xb5, 0xf2, 0x95,
-	0x3b, 0x93, 0x19, 0x0e, 0x1f, 0x89, 0x0b, 0x33, 0x1c, 0xd2, 0x1b, 0xb9, 0xa4, 0xde, 0x06, 0xa4,
-	0x42, 0xc9, 0x7b, 0x0a, 0x9e, 0x6c, 0xbd, 0x0f, 0x50, 0x0d, 0x77, 0x8b, 0x1b, 0xd5, 0xc3, 0x66,
-	0xf9, 0xb0, 0x69, 0x3c, 0xa8, 0x96, 0x3f, 0x38, 0xd7, 0x33, 0xd7, 0x21, 0x1b, 0x66, 0xee, 0x1d,
-	0xd7, 0x6a, 0x59, 0x65, 0xfb, 0xf3, 0x24, 0x2c, 0xc9, 0x00, 0xa0, 0x5f, 0x2b, 0x90, 0x0a, 0x35,
-	0x0c, 0xf4, 0xc6, 0x85, 0xe6, 0x4c, 0x36, 0x4f, 0xed, 0xcd, 0xf9, 0x36, 0x89, 0xa4, 0xe6, 0xb6,
-	0xbf, 0xfb, 0x87, 0x3f, 0xff, 0x38, 0xf2, 0x1a, 0xda, 0x1a, 0xfe, 0xb9, 0xff, 0x9b, 0x22, 0xec,
-	0xef, 0x7a, 0xbe, 0xfb, 0x0d, 0xdc, 0xa6, 0xa4, 0xb0, 0x55, 0x30, 0xbb, 0xd8, 0xa1, 0x9f, 0x16,
-	0x82, 0x26, 0xf4, 0x33, 0x05, 0x92, 0xc3, 0xe6, 0x82, 0x2e, 0xfe, 0xb3, 0xe6, 0xf9, 0x46, 0xa4,
-	0xcd, 0x1a, 0xee, 0x69, 0xd6, 0xb1, 0x52, 0x31, 0x61, 0x5b, 0x60, 0x5a, 0x61, 0xeb, 0x53, 0xf4,
-	0x99, 0x02, 0xe9, 0x70, 0x7b, 0x41, 0x17, 0x07, 0x66, 0x4a, 0x37, 0x9a, 0xdd, 0xc6, 0x3b, 0xdc,
-	0xc6, 0x37, 0x73, 0x73, 0x44, 0xf0, 0x4e, 0x50, 0xcd, 0x7f, 0xa3, 0x40, 0x3a, 0x7c, 0xd9, 0x66,
-	0xb0, 0x75, 0x4a, 0x57, 0x99, 0xdd, 0xd6, 0x22, 0xb7, 0xf5, 0xee, 0xf6, 0xed, 0x91, 0xad, 0xf2,
-	0xbf, 0x4c, 0x2e, 0x0a, 0xeb, 0xd0, 0xe4, 0x1f, 0x29, 0x90, 0x0e, 0x5f, 0xdf, 0x19, 0x4c, 0x9e,
-	0xd2, 0x00, 0xb4, 0xeb, 0x13, 0x05, 0xaf, 0xdc, 0xf3, 0xe8, 0x20, 0xc8, 0xf8, 0xd6, 0x3c, 0x19,
-	0xff, 0x5c, 0x01, 0x34, 0x59, 0xb7, 0xd0, 0xc5, 0xaf, 0x0a, 0x4f, 0xec, 0x36, 0xda, 0xb3, 0xc1,
-	0xde, 0xd0, 0xbf, 0xb9, 0xe4, 0xeb, 0xc1, 0xbf, 0xb9, 0x04, 0x71, 0xcc, 0xbd, 0x35, 0x47, 0xce,
-	0x5b, 0x23, 0x65, 0x77, 0x94, 0xad, 0x91, 0xd1, 0x63, 0xb5, 0x70, 0x56, 0xa3, 0xa7, 0x15, 0xd0,
-	0x7f, 0x99, 0xd1, 0x42, 0xd9, 0x1d, 0x65, 0xab, 0xf4, 0x99, 0x02, 0x2f, 0xb6, 0xdd, 0xde, 0x45,
-	0x36, 0x96, 0x64, 0xb5, 0x6d, 0xb0, 0xdc, 0x36, 0x94, 0x0f, 0xab, 0x52, 0xbe, 0xeb, 0xb2, 0x4e,
-	0x98, 0x77, 0xfd, 0x6e, 0xa1, 0x8b, 0x1d, 0x9e, 0xf9, 0x82, 0x60, 0x99, 0x9e, 0x45, 0x9e, 0xf8,
-	0x1f, 0x48, 0x77, 0x47, 0xa4, 0xbf, 0x29, 0xca, 0x2f, 0x22, 0x91, 0xdd, 0xbd, 0x5f, 0x45, 0x9e,
-	0xbf, 0x27, 0x30, 0x77, 0xb8, 0x0d, 0xbb, 0x23, 0x1b, 0x1e, 0x88, 0x4d, 0xad, 0x45, 0x8e, 0xff,
-	0xc6, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xda, 0x37, 0x44, 0x7c, 0x68, 0x25, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go b/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
index 2dd28c6d0a..2425f4ea56 100644
--- a/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/knowledge_base.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents knowledge base resource.
 //
@@ -47,16 +47,17 @@ func (m *KnowledgeBase) Reset()         { *m = KnowledgeBase{} }
 func (m *KnowledgeBase) String() string { return proto.CompactTextString(m) }
 func (*KnowledgeBase) ProtoMessage()    {}
 func (*KnowledgeBase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_knowledge_base_54c2aba98392ab6e, []int{0}
+	return fileDescriptor_9cdbbb049e0ce16a, []int{0}
 }
+
 func (m *KnowledgeBase) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KnowledgeBase.Unmarshal(m, b)
 }
 func (m *KnowledgeBase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KnowledgeBase.Marshal(b, m, deterministic)
 }
-func (dst *KnowledgeBase) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KnowledgeBase.Merge(dst, src)
+func (m *KnowledgeBase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeBase.Merge(m, src)
 }
 func (m *KnowledgeBase) XXX_Size() int {
 	return xxx_messageInfo_KnowledgeBase.Size(m)
@@ -100,16 +101,17 @@ func (m *ListKnowledgeBasesRequest) Reset()         { *m = ListKnowledgeBasesReq
 func (m *ListKnowledgeBasesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListKnowledgeBasesRequest) ProtoMessage()    {}
 func (*ListKnowledgeBasesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_knowledge_base_54c2aba98392ab6e, []int{1}
+	return fileDescriptor_9cdbbb049e0ce16a, []int{1}
 }
+
 func (m *ListKnowledgeBasesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListKnowledgeBasesRequest.Unmarshal(m, b)
 }
 func (m *ListKnowledgeBasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListKnowledgeBasesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListKnowledgeBasesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListKnowledgeBasesRequest.Merge(dst, src)
+func (m *ListKnowledgeBasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKnowledgeBasesRequest.Merge(m, src)
 }
 func (m *ListKnowledgeBasesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListKnowledgeBasesRequest.Size(m)
@@ -157,16 +159,17 @@ func (m *ListKnowledgeBasesResponse) Reset()         { *m = ListKnowledgeBasesRe
 func (m *ListKnowledgeBasesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListKnowledgeBasesResponse) ProtoMessage()    {}
 func (*ListKnowledgeBasesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_knowledge_base_54c2aba98392ab6e, []int{2}
+	return fileDescriptor_9cdbbb049e0ce16a, []int{2}
 }
+
 func (m *ListKnowledgeBasesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListKnowledgeBasesResponse.Unmarshal(m, b)
 }
 func (m *ListKnowledgeBasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListKnowledgeBasesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListKnowledgeBasesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListKnowledgeBasesResponse.Merge(dst, src)
+func (m *ListKnowledgeBasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKnowledgeBasesResponse.Merge(m, src)
 }
 func (m *ListKnowledgeBasesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListKnowledgeBasesResponse.Size(m)
@@ -205,16 +208,17 @@ func (m *GetKnowledgeBaseRequest) Reset()         { *m = GetKnowledgeBaseRequest
 func (m *GetKnowledgeBaseRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKnowledgeBaseRequest) ProtoMessage()    {}
 func (*GetKnowledgeBaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_knowledge_base_54c2aba98392ab6e, []int{3}
+	return fileDescriptor_9cdbbb049e0ce16a, []int{3}
 }
+
 func (m *GetKnowledgeBaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKnowledgeBaseRequest.Unmarshal(m, b)
 }
 func (m *GetKnowledgeBaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKnowledgeBaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKnowledgeBaseRequest.Merge(dst, src)
+func (m *GetKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKnowledgeBaseRequest.Merge(m, src)
 }
 func (m *GetKnowledgeBaseRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKnowledgeBaseRequest.Size(m)
@@ -248,16 +252,17 @@ func (m *CreateKnowledgeBaseRequest) Reset()         { *m = CreateKnowledgeBaseR
 func (m *CreateKnowledgeBaseRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateKnowledgeBaseRequest) ProtoMessage()    {}
 func (*CreateKnowledgeBaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_knowledge_base_54c2aba98392ab6e, []int{4}
+	return fileDescriptor_9cdbbb049e0ce16a, []int{4}
 }
+
 func (m *CreateKnowledgeBaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateKnowledgeBaseRequest.Unmarshal(m, b)
 }
 func (m *CreateKnowledgeBaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateKnowledgeBaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateKnowledgeBaseRequest.Merge(dst, src)
+func (m *CreateKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateKnowledgeBaseRequest.Merge(m, src)
 }
 func (m *CreateKnowledgeBaseRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateKnowledgeBaseRequest.Size(m)
@@ -299,16 +304,17 @@ func (m *DeleteKnowledgeBaseRequest) Reset()         { *m = DeleteKnowledgeBaseR
 func (m *DeleteKnowledgeBaseRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteKnowledgeBaseRequest) ProtoMessage()    {}
 func (*DeleteKnowledgeBaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_knowledge_base_54c2aba98392ab6e, []int{5}
+	return fileDescriptor_9cdbbb049e0ce16a, []int{5}
 }
+
 func (m *DeleteKnowledgeBaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteKnowledgeBaseRequest.Unmarshal(m, b)
 }
 func (m *DeleteKnowledgeBaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteKnowledgeBaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteKnowledgeBaseRequest.Merge(dst, src)
+func (m *DeleteKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteKnowledgeBaseRequest.Merge(m, src)
 }
 func (m *DeleteKnowledgeBaseRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteKnowledgeBaseRequest.Size(m)
@@ -350,16 +356,17 @@ func (m *UpdateKnowledgeBaseRequest) Reset()         { *m = UpdateKnowledgeBaseR
 func (m *UpdateKnowledgeBaseRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateKnowledgeBaseRequest) ProtoMessage()    {}
 func (*UpdateKnowledgeBaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_knowledge_base_54c2aba98392ab6e, []int{6}
+	return fileDescriptor_9cdbbb049e0ce16a, []int{6}
 }
+
 func (m *UpdateKnowledgeBaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateKnowledgeBaseRequest.Unmarshal(m, b)
 }
 func (m *UpdateKnowledgeBaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateKnowledgeBaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateKnowledgeBaseRequest.Merge(dst, src)
+func (m *UpdateKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateKnowledgeBaseRequest.Merge(m, src)
 }
 func (m *UpdateKnowledgeBaseRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateKnowledgeBaseRequest.Size(m)
@@ -394,6 +401,60 @@ func init() {
 	proto.RegisterType((*UpdateKnowledgeBaseRequest)(nil), "google.cloud.dialogflow.v2beta1.UpdateKnowledgeBaseRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/knowledge_base.proto", fileDescriptor_9cdbbb049e0ce16a)
+}
+
+var fileDescriptor_9cdbbb049e0ce16a = []byte{
+	// 736 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x4f, 0x13, 0x41,
+	0x14, 0xce, 0x14, 0x21, 0xf0, 0x10, 0x30, 0x83, 0x41, 0x58, 0x34, 0xe0, 0x9a, 0x18, 0x52, 0xe3,
+	0x6e, 0x28, 0x1e, 0x0c, 0xc4, 0xc4, 0x00, 0x96, 0x18, 0x7f, 0x84, 0x54, 0xd1, 0x84, 0x4b, 0x33,
+	0x6d, 0x5f, 0xd7, 0xb5, 0xdb, 0x9d, 0x75, 0x67, 0x2b, 0x82, 0xe1, 0xc2, 0x4d, 0x4d, 0xbc, 0x78,
+	0x36, 0x31, 0x5e, 0x4c, 0x8c, 0x07, 0xfe, 0x17, 0xfd, 0x13, 0x8c, 0xff, 0x82, 0x1e, 0xcd, 0xce,
+	0x6c, 0x29, 0xbb, 0xdd, 0xb5, 0x94, 0x78, 0xeb, 0xcc, 0x9b, 0xf7, 0xcd, 0xf7, 0xbd, 0xef, 0xbd,
+	0xe9, 0xc2, 0x0d, 0x8b, 0x73, 0xcb, 0x41, 0xb3, 0xea, 0xf0, 0x56, 0xcd, 0xac, 0xd9, 0xcc, 0xe1,
+	0x56, 0xdd, 0xe1, 0x3b, 0xe6, 0xcb, 0x42, 0x05, 0x03, 0xb6, 0x68, 0x36, 0x5c, 0xbe, 0xe3, 0x60,
+	0xcd, 0xc2, 0x72, 0x85, 0x09, 0x34, 0x3c, 0x9f, 0x07, 0x9c, 0xce, 0xa9, 0x2c, 0x43, 0x66, 0x19,
+	0x9d, 0x2c, 0x23, 0xca, 0xd2, 0x2e, 0x46, 0xb0, 0xcc, 0xb3, 0x4d, 0xe6, 0xba, 0x3c, 0x60, 0x81,
+	0xcd, 0x5d, 0xa1, 0xd2, 0xb5, 0x99, 0x63, 0x51, 0x1f, 0x05, 0x6f, 0xf9, 0xd5, 0x08, 0x59, 0x9b,
+	0x8d, 0x42, 0x72, 0x55, 0x69, 0xd5, 0x4d, 0x6c, 0x7a, 0xc1, 0x6e, 0x14, 0x9c, 0x4f, 0x06, 0xeb,
+	0x36, 0x3a, 0xb5, 0x72, 0x93, 0x89, 0x86, 0x3a, 0xa1, 0x17, 0x61, 0xec, 0x5e, 0x9b, 0xf0, 0x2a,
+	0x13, 0x48, 0x29, 0x9c, 0x71, 0x59, 0x13, 0xa7, 0xc9, 0x3c, 0x59, 0x18, 0x29, 0xc9, 0xdf, 0xf4,
+	0x32, 0x9c, 0xad, 0xd9, 0xc2, 0x73, 0xd8, 0x6e, 0x59, 0xc6, 0x72, 0x32, 0x36, 0x1a, 0xed, 0x3d,
+	0x64, 0x4d, 0xd4, 0x39, 0xcc, 0xdc, 0xb7, 0x45, 0x10, 0xc3, 0x12, 0x25, 0x7c, 0xd1, 0x42, 0x11,
+	0xd0, 0x29, 0x18, 0xf2, 0x98, 0x8f, 0x6e, 0x10, 0xa1, 0x46, 0x2b, 0x3a, 0x0b, 0x23, 0x1e, 0xb3,
+	0xb0, 0x2c, 0xec, 0x3d, 0x05, 0x3a, 0x58, 0x1a, 0x0e, 0x37, 0x1e, 0xd9, 0x7b, 0x48, 0x2f, 0x01,
+	0xc8, 0x60, 0xc0, 0x1b, 0xe8, 0x4e, 0x0f, 0xc8, 0x44, 0x79, 0xfc, 0x71, 0xb8, 0xa1, 0x7f, 0x24,
+	0xa0, 0xa5, 0xdd, 0x28, 0x3c, 0xee, 0x0a, 0xa4, 0x4f, 0x61, 0x22, 0x6e, 0x84, 0x98, 0x26, 0xf3,
+	0x03, 0x0b, 0xa3, 0x05, 0xc3, 0xe8, 0x61, 0x85, 0x11, 0x43, 0x2c, 0x8d, 0x37, 0x62, 0x17, 0xd0,
+	0xab, 0x30, 0xe1, 0xe2, 0xab, 0xa0, 0x7c, 0x8c, 0x9b, 0x2a, 0xc7, 0x58, 0xb8, 0xbd, 0x79, 0xc4,
+	0xef, 0x3a, 0x5c, 0xd8, 0xc0, 0x38, 0xbb, 0x76, 0x39, 0x52, 0x4a, 0xac, 0xbf, 0x23, 0xa0, 0xad,
+	0xf9, 0xc8, 0x02, 0x4c, 0x4d, 0xc9, 0xaa, 0xe0, 0x16, 0x8c, 0xc7, 0x65, 0x4a, 0x32, 0xfd, 0xab,
+	0x1c, 0x8b, 0xa9, 0xd4, 0x8b, 0xa0, 0xad, 0xa3, 0x83, 0x19, 0x64, 0xd2, 0x5a, 0xe4, 0x3c, 0x0c,
+	0xd6, 0xb9, 0x5f, 0x55, 0xf7, 0x0f, 0x97, 0xd4, 0x42, 0x3f, 0x24, 0xa0, 0x6d, 0x79, 0xb5, 0x2c,
+	0x55, 0xdd, 0xec, 0xc9, 0x7f, 0x60, 0x4f, 0x57, 0x60, 0xb4, 0x25, 0x2f, 0x95, 0x8d, 0x1e, 0x55,
+	0x44, 0x6b, 0x63, 0xb6, 0x67, 0xc1, 0x28, 0x86, 0xb3, 0xf0, 0x80, 0x89, 0x46, 0x09, 0xd4, 0xf1,
+	0xf0, 0x77, 0xe1, 0x2d, 0xc0, 0x78, 0xbc, 0xa7, 0xe8, 0x6f, 0x02, 0xb4, 0xbb, 0xd5, 0xe8, 0x72,
+	0x4f, 0x96, 0x99, 0x13, 0xa1, 0xad, 0x9c, 0x2a, 0x57, 0xf5, 0xb6, 0xfe, 0xec, 0xe0, 0xfb, 0xcf,
+	0x0f, 0xb9, 0x0a, 0xbd, 0x76, 0xf4, 0xe6, 0xbc, 0x56, 0xed, 0x70, 0xcb, 0xf3, 0xf9, 0x73, 0xac,
+	0x06, 0xc2, 0xcc, 0xef, 0x9b, 0xf1, 0xbe, 0xdd, 0x5e, 0xa2, 0x8b, 0xff, 0x38, 0x6e, 0x32, 0x0b,
+	0xdd, 0x20, 0x99, 0x44, 0x7f, 0x11, 0x38, 0x97, 0xec, 0x62, 0x7a, 0xb3, 0x27, 0xf7, 0x8c, 0xc6,
+	0xd7, 0xfa, 0xf4, 0x35, 0x4d, 0x68, 0xd8, 0x6c, 0xc7, 0x79, 0xc7, 0x09, 0x9b, 0xf9, 0xfd, 0xb8,
+	0xd0, 0xe4, 0x71, 0x29, 0xb3, 0x3b, 0x89, 0xbe, 0xcf, 0xc1, 0x64, 0xca, 0xf8, 0xd1, 0xde, 0x3e,
+	0x65, 0x0f, 0x6d, 0xdf, 0x72, 0xdf, 0x10, 0xa9, 0xf7, 0x80, 0xe8, 0xfd, 0x38, 0xbb, 0x9c, 0x98,
+	0xa1, 0xed, 0x35, 0xbd, 0x7f, 0xa7, 0x93, 0x20, 0xf4, 0x07, 0x81, 0xc9, 0x94, 0x27, 0xe0, 0x04,
+	0x05, 0xc9, 0x7e, 0x38, 0xb4, 0xa9, 0xae, 0x19, 0xbc, 0x13, 0xfe, 0x59, 0xb5, 0x7d, 0xce, 0xf7,
+	0xe7, 0x73, 0xfe, 0x14, 0x3e, 0x7f, 0xcb, 0xc1, 0x64, 0xca, 0x83, 0x74, 0x02, 0x59, 0xd9, 0xcf,
+	0x58, 0xdf, 0x3e, 0x7f, 0x51, 0x3e, 0x7f, 0x22, 0x85, 0xe5, 0x8e, 0x82, 0xc4, 0x67, 0x43, 0x4f,
+	0xfd, 0x5d, 0xb6, 0x97, 0x0a, 0xb7, 0x4f, 0x8c, 0x96, 0x51, 0x9e, 0x24, 0xe6, 0xea, 0x21, 0x81,
+	0x2b, 0x55, 0xde, 0xec, 0xa5, 0x6f, 0x95, 0xc6, 0x04, 0x6e, 0x86, 0xee, 0x6e, 0x92, 0xed, 0xbb,
+	0x51, 0x9a, 0xc5, 0x1d, 0xe6, 0x5a, 0x06, 0xf7, 0x2d, 0xd3, 0x42, 0x57, 0x7a, 0x6f, 0xaa, 0x10,
+	0xf3, 0x6c, 0x91, 0xf9, 0x25, 0xb5, 0xd2, 0xd9, 0xfa, 0x43, 0xc8, 0xe7, 0x5c, 0x6e, 0xbd, 0xf8,
+	0x35, 0x37, 0xb7, 0xa1, 0x30, 0xd7, 0x24, 0x95, 0xf5, 0x0e, 0x95, 0x27, 0x2a, 0xa9, 0x32, 0x24,
+	0xf1, 0x97, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xd8, 0x8c, 0xdc, 0xa8, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -607,57 +668,3 @@ var _KnowledgeBases_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2beta1/knowledge_base.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/knowledge_base.proto", fileDescriptor_knowledge_base_54c2aba98392ab6e)
-}
-
-var fileDescriptor_knowledge_base_54c2aba98392ab6e = []byte{
-	// 736 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x4f, 0x13, 0x41,
-	0x14, 0xce, 0x14, 0x21, 0xf0, 0x10, 0x30, 0x83, 0x41, 0x58, 0x34, 0xe0, 0x9a, 0x18, 0x52, 0xe3,
-	0x6e, 0x28, 0x1e, 0x0c, 0xc4, 0xc4, 0x00, 0x96, 0x18, 0x7f, 0x84, 0x54, 0xd1, 0x84, 0x4b, 0x33,
-	0x6d, 0x5f, 0xd7, 0xb5, 0xdb, 0x9d, 0x75, 0x67, 0x2b, 0x82, 0xe1, 0xc2, 0x4d, 0x4d, 0xbc, 0x78,
-	0x36, 0x31, 0x5e, 0x4c, 0x8c, 0x07, 0xfe, 0x17, 0xfd, 0x13, 0x8c, 0xff, 0x82, 0x1e, 0xcd, 0xce,
-	0x6c, 0x29, 0xbb, 0xdd, 0xb5, 0x94, 0x78, 0xeb, 0xcc, 0x9b, 0xf7, 0xcd, 0xf7, 0xbd, 0xef, 0xbd,
-	0xe9, 0xc2, 0x0d, 0x8b, 0x73, 0xcb, 0x41, 0xb3, 0xea, 0xf0, 0x56, 0xcd, 0xac, 0xd9, 0xcc, 0xe1,
-	0x56, 0xdd, 0xe1, 0x3b, 0xe6, 0xcb, 0x42, 0x05, 0x03, 0xb6, 0x68, 0x36, 0x5c, 0xbe, 0xe3, 0x60,
-	0xcd, 0xc2, 0x72, 0x85, 0x09, 0x34, 0x3c, 0x9f, 0x07, 0x9c, 0xce, 0xa9, 0x2c, 0x43, 0x66, 0x19,
-	0x9d, 0x2c, 0x23, 0xca, 0xd2, 0x2e, 0x46, 0xb0, 0xcc, 0xb3, 0x4d, 0xe6, 0xba, 0x3c, 0x60, 0x81,
-	0xcd, 0x5d, 0xa1, 0xd2, 0xb5, 0x99, 0x63, 0x51, 0x1f, 0x05, 0x6f, 0xf9, 0xd5, 0x08, 0x59, 0x9b,
-	0x8d, 0x42, 0x72, 0x55, 0x69, 0xd5, 0x4d, 0x6c, 0x7a, 0xc1, 0x6e, 0x14, 0x9c, 0x4f, 0x06, 0xeb,
-	0x36, 0x3a, 0xb5, 0x72, 0x93, 0x89, 0x86, 0x3a, 0xa1, 0x17, 0x61, 0xec, 0x5e, 0x9b, 0xf0, 0x2a,
-	0x13, 0x48, 0x29, 0x9c, 0x71, 0x59, 0x13, 0xa7, 0xc9, 0x3c, 0x59, 0x18, 0x29, 0xc9, 0xdf, 0xf4,
-	0x32, 0x9c, 0xad, 0xd9, 0xc2, 0x73, 0xd8, 0x6e, 0x59, 0xc6, 0x72, 0x32, 0x36, 0x1a, 0xed, 0x3d,
-	0x64, 0x4d, 0xd4, 0x39, 0xcc, 0xdc, 0xb7, 0x45, 0x10, 0xc3, 0x12, 0x25, 0x7c, 0xd1, 0x42, 0x11,
-	0xd0, 0x29, 0x18, 0xf2, 0x98, 0x8f, 0x6e, 0x10, 0xa1, 0x46, 0x2b, 0x3a, 0x0b, 0x23, 0x1e, 0xb3,
-	0xb0, 0x2c, 0xec, 0x3d, 0x05, 0x3a, 0x58, 0x1a, 0x0e, 0x37, 0x1e, 0xd9, 0x7b, 0x48, 0x2f, 0x01,
-	0xc8, 0x60, 0xc0, 0x1b, 0xe8, 0x4e, 0x0f, 0xc8, 0x44, 0x79, 0xfc, 0x71, 0xb8, 0xa1, 0x7f, 0x24,
-	0xa0, 0xa5, 0xdd, 0x28, 0x3c, 0xee, 0x0a, 0xa4, 0x4f, 0x61, 0x22, 0x6e, 0x84, 0x98, 0x26, 0xf3,
-	0x03, 0x0b, 0xa3, 0x05, 0xc3, 0xe8, 0x61, 0x85, 0x11, 0x43, 0x2c, 0x8d, 0x37, 0x62, 0x17, 0xd0,
-	0xab, 0x30, 0xe1, 0xe2, 0xab, 0xa0, 0x7c, 0x8c, 0x9b, 0x2a, 0xc7, 0x58, 0xb8, 0xbd, 0x79, 0xc4,
-	0xef, 0x3a, 0x5c, 0xd8, 0xc0, 0x38, 0xbb, 0x76, 0x39, 0x52, 0x4a, 0xac, 0xbf, 0x23, 0xa0, 0xad,
-	0xf9, 0xc8, 0x02, 0x4c, 0x4d, 0xc9, 0xaa, 0xe0, 0x16, 0x8c, 0xc7, 0x65, 0x4a, 0x32, 0xfd, 0xab,
-	0x1c, 0x8b, 0xa9, 0xd4, 0x8b, 0xa0, 0xad, 0xa3, 0x83, 0x19, 0x64, 0xd2, 0x5a, 0xe4, 0x3c, 0x0c,
-	0xd6, 0xb9, 0x5f, 0x55, 0xf7, 0x0f, 0x97, 0xd4, 0x42, 0x3f, 0x24, 0xa0, 0x6d, 0x79, 0xb5, 0x2c,
-	0x55, 0xdd, 0xec, 0xc9, 0x7f, 0x60, 0x4f, 0x57, 0x60, 0xb4, 0x25, 0x2f, 0x95, 0x8d, 0x1e, 0x55,
-	0x44, 0x6b, 0x63, 0xb6, 0x67, 0xc1, 0x28, 0x86, 0xb3, 0xf0, 0x80, 0x89, 0x46, 0x09, 0xd4, 0xf1,
-	0xf0, 0x77, 0xe1, 0x2d, 0xc0, 0x78, 0xbc, 0xa7, 0xe8, 0x6f, 0x02, 0xb4, 0xbb, 0xd5, 0xe8, 0x72,
-	0x4f, 0x96, 0x99, 0x13, 0xa1, 0xad, 0x9c, 0x2a, 0x57, 0xf5, 0xb6, 0xfe, 0xec, 0xe0, 0xfb, 0xcf,
-	0x0f, 0xb9, 0x0a, 0xbd, 0x76, 0xf4, 0xe6, 0xbc, 0x56, 0xed, 0x70, 0xcb, 0xf3, 0xf9, 0x73, 0xac,
-	0x06, 0xc2, 0xcc, 0xef, 0x9b, 0xf1, 0xbe, 0xdd, 0x5e, 0xa2, 0x8b, 0xff, 0x38, 0x6e, 0x32, 0x0b,
-	0xdd, 0x20, 0x99, 0x44, 0x7f, 0x11, 0x38, 0x97, 0xec, 0x62, 0x7a, 0xb3, 0x27, 0xf7, 0x8c, 0xc6,
-	0xd7, 0xfa, 0xf4, 0x35, 0x4d, 0x68, 0xd8, 0x6c, 0xc7, 0x79, 0xc7, 0x09, 0x9b, 0xf9, 0xfd, 0xb8,
-	0xd0, 0xe4, 0x71, 0x29, 0xb3, 0x3b, 0x89, 0xbe, 0xcf, 0xc1, 0x64, 0xca, 0xf8, 0xd1, 0xde, 0x3e,
-	0x65, 0x0f, 0x6d, 0xdf, 0x72, 0xdf, 0x10, 0xa9, 0xf7, 0x80, 0xe8, 0xfd, 0x38, 0xbb, 0x9c, 0x98,
-	0xa1, 0xed, 0x35, 0xbd, 0x7f, 0xa7, 0x93, 0x20, 0xf4, 0x07, 0x81, 0xc9, 0x94, 0x27, 0xe0, 0x04,
-	0x05, 0xc9, 0x7e, 0x38, 0xb4, 0xa9, 0xae, 0x19, 0xbc, 0x13, 0xfe, 0x59, 0xb5, 0x7d, 0xce, 0xf7,
-	0xe7, 0x73, 0xfe, 0x14, 0x3e, 0x7f, 0xcb, 0xc1, 0x64, 0xca, 0x83, 0x74, 0x02, 0x59, 0xd9, 0xcf,
-	0x58, 0xdf, 0x3e, 0x7f, 0x51, 0x3e, 0x7f, 0x22, 0x85, 0xe5, 0x8e, 0x82, 0xc4, 0x67, 0x43, 0x4f,
-	0xfd, 0x5d, 0xb6, 0x97, 0x0a, 0xb7, 0x4f, 0x8c, 0x96, 0x51, 0x9e, 0x24, 0xe6, 0xea, 0x21, 0x81,
-	0x2b, 0x55, 0xde, 0xec, 0xa5, 0x6f, 0x95, 0xc6, 0x04, 0x6e, 0x86, 0xee, 0x6e, 0x92, 0xed, 0xbb,
-	0x51, 0x9a, 0xc5, 0x1d, 0xe6, 0x5a, 0x06, 0xf7, 0x2d, 0xd3, 0x42, 0x57, 0x7a, 0x6f, 0xaa, 0x10,
-	0xf3, 0x6c, 0x91, 0xf9, 0x25, 0xb5, 0xd2, 0xd9, 0xfa, 0x43, 0xc8, 0xe7, 0x5c, 0x6e, 0xbd, 0xf8,
-	0x35, 0x37, 0xb7, 0xa1, 0x30, 0xd7, 0x24, 0x95, 0xf5, 0x0e, 0x95, 0x27, 0x2a, 0xa9, 0x32, 0x24,
-	0xf1, 0x97, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xd8, 0x8c, 0xdc, 0xa8, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/session.pb.go b/googleapis/cloud/dialogflow/v2beta1/session.pb.go
index ec74ff16df..cdfd512a63 100644
--- a/googleapis/cloud/dialogflow/v2beta1/session.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/session.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/session.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the system's confidence that this knowledge answer is a good
 // match for this conversational query.
@@ -48,6 +48,7 @@ var KnowledgeAnswers_Answer_MatchConfidenceLevel_name = map[int32]string{
 	2: "MEDIUM",
 	3: "HIGH",
 }
+
 var KnowledgeAnswers_Answer_MatchConfidenceLevel_value = map[string]int32{
 	"MATCH_CONFIDENCE_LEVEL_UNSPECIFIED": 0,
 	"LOW":                                1,
@@ -58,8 +59,9 @@ var KnowledgeAnswers_Answer_MatchConfidenceLevel_value = map[string]int32{
 func (x KnowledgeAnswers_Answer_MatchConfidenceLevel) String() string {
 	return proto.EnumName(KnowledgeAnswers_Answer_MatchConfidenceLevel_name, int32(x))
 }
+
 func (KnowledgeAnswers_Answer_MatchConfidenceLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{5, 0, 0}
+	return fileDescriptor_40a53f854d709740, []int{5, 0, 0}
 }
 
 // Type of the response message.
@@ -85,6 +87,7 @@ var StreamingRecognitionResult_MessageType_name = map[int32]string{
 	1: "TRANSCRIPT",
 	2: "END_OF_SINGLE_UTTERANCE",
 }
+
 var StreamingRecognitionResult_MessageType_value = map[string]int32{
 	"MESSAGE_TYPE_UNSPECIFIED": 0,
 	"TRANSCRIPT":               1,
@@ -94,8 +97,9 @@ var StreamingRecognitionResult_MessageType_value = map[string]int32{
 func (x StreamingRecognitionResult_MessageType) String() string {
 	return proto.EnumName(StreamingRecognitionResult_MessageType_name, int32(x))
 }
+
 func (StreamingRecognitionResult_MessageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{8, 0}
+	return fileDescriptor_40a53f854d709740, []int{8, 0}
 }
 
 // The request to detect user's intent.
@@ -138,16 +142,17 @@ func (m *DetectIntentRequest) Reset()         { *m = DetectIntentRequest{} }
 func (m *DetectIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*DetectIntentRequest) ProtoMessage()    {}
 func (*DetectIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{0}
+	return fileDescriptor_40a53f854d709740, []int{0}
 }
+
 func (m *DetectIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetectIntentRequest.Unmarshal(m, b)
 }
 func (m *DetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetectIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DetectIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetectIntentRequest.Merge(dst, src)
+func (m *DetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentRequest.Merge(m, src)
 }
 func (m *DetectIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_DetectIntentRequest.Size(m)
@@ -232,16 +237,17 @@ func (m *DetectIntentResponse) Reset()         { *m = DetectIntentResponse{} }
 func (m *DetectIntentResponse) String() string { return proto.CompactTextString(m) }
 func (*DetectIntentResponse) ProtoMessage()    {}
 func (*DetectIntentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{1}
+	return fileDescriptor_40a53f854d709740, []int{1}
 }
+
 func (m *DetectIntentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetectIntentResponse.Unmarshal(m, b)
 }
 func (m *DetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetectIntentResponse.Marshal(b, m, deterministic)
 }
-func (dst *DetectIntentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetectIntentResponse.Merge(dst, src)
+func (m *DetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentResponse.Merge(m, src)
 }
 func (m *DetectIntentResponse) XXX_Size() int {
 	return xxx_messageInfo_DetectIntentResponse.Size(m)
@@ -334,16 +340,17 @@ func (m *QueryParameters) Reset()         { *m = QueryParameters{} }
 func (m *QueryParameters) String() string { return proto.CompactTextString(m) }
 func (*QueryParameters) ProtoMessage()    {}
 func (*QueryParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{2}
+	return fileDescriptor_40a53f854d709740, []int{2}
 }
+
 func (m *QueryParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryParameters.Unmarshal(m, b)
 }
 func (m *QueryParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryParameters.Marshal(b, m, deterministic)
 }
-func (dst *QueryParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryParameters.Merge(dst, src)
+func (m *QueryParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryParameters.Merge(m, src)
 }
 func (m *QueryParameters) XXX_Size() int {
 	return xxx_messageInfo_QueryParameters.Size(m)
@@ -435,16 +442,17 @@ func (m *QueryInput) Reset()         { *m = QueryInput{} }
 func (m *QueryInput) String() string { return proto.CompactTextString(m) }
 func (*QueryInput) ProtoMessage()    {}
 func (*QueryInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{3}
+	return fileDescriptor_40a53f854d709740, []int{3}
 }
+
 func (m *QueryInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryInput.Unmarshal(m, b)
 }
 func (m *QueryInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryInput.Marshal(b, m, deterministic)
 }
-func (dst *QueryInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryInput.Merge(dst, src)
+func (m *QueryInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryInput.Merge(m, src)
 }
 func (m *QueryInput) XXX_Size() int {
 	return xxx_messageInfo_QueryInput.Size(m)
@@ -505,99 +513,15 @@ func (m *QueryInput) GetEvent() *EventInput {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*QueryInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _QueryInput_OneofMarshaler, _QueryInput_OneofUnmarshaler, _QueryInput_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*QueryInput) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*QueryInput_AudioConfig)(nil),
 		(*QueryInput_Text)(nil),
 		(*QueryInput_Event)(nil),
 	}
 }
 
-func _QueryInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*QueryInput)
-	// input
-	switch x := m.Input.(type) {
-	case *QueryInput_AudioConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AudioConfig); err != nil {
-			return err
-		}
-	case *QueryInput_Text:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Text); err != nil {
-			return err
-		}
-	case *QueryInput_Event:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Event); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("QueryInput.Input has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _QueryInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*QueryInput)
-	switch tag {
-	case 1: // input.audio_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InputAudioConfig)
-		err := b.DecodeMessage(msg)
-		m.Input = &QueryInput_AudioConfig{msg}
-		return true, err
-	case 2: // input.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TextInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &QueryInput_Text{msg}
-		return true, err
-	case 3: // input.event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EventInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &QueryInput_Event{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _QueryInput_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*QueryInput)
-	// input
-	switch x := m.Input.(type) {
-	case *QueryInput_AudioConfig:
-		s := proto.Size(x.AudioConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *QueryInput_Text:
-		s := proto.Size(x.Text)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *QueryInput_Event:
-		s := proto.Size(x.Event)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents the result of conversational query or event processing.
 type QueryResult struct {
 	// The original conversational query text:
@@ -677,16 +601,17 @@ func (m *QueryResult) Reset()         { *m = QueryResult{} }
 func (m *QueryResult) String() string { return proto.CompactTextString(m) }
 func (*QueryResult) ProtoMessage()    {}
 func (*QueryResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{4}
+	return fileDescriptor_40a53f854d709740, []int{4}
 }
+
 func (m *QueryResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryResult.Unmarshal(m, b)
 }
 func (m *QueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryResult.Marshal(b, m, deterministic)
 }
-func (dst *QueryResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryResult.Merge(dst, src)
+func (m *QueryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResult.Merge(m, src)
 }
 func (m *QueryResult) XXX_Size() int {
 	return xxx_messageInfo_QueryResult.Size(m)
@@ -822,16 +747,17 @@ func (m *KnowledgeAnswers) Reset()         { *m = KnowledgeAnswers{} }
 func (m *KnowledgeAnswers) String() string { return proto.CompactTextString(m) }
 func (*KnowledgeAnswers) ProtoMessage()    {}
 func (*KnowledgeAnswers) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{5}
+	return fileDescriptor_40a53f854d709740, []int{5}
 }
+
 func (m *KnowledgeAnswers) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KnowledgeAnswers.Unmarshal(m, b)
 }
 func (m *KnowledgeAnswers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KnowledgeAnswers.Marshal(b, m, deterministic)
 }
-func (dst *KnowledgeAnswers) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KnowledgeAnswers.Merge(dst, src)
+func (m *KnowledgeAnswers) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeAnswers.Merge(m, src)
 }
 func (m *KnowledgeAnswers) XXX_Size() int {
 	return xxx_messageInfo_KnowledgeAnswers.Size(m)
@@ -886,16 +812,17 @@ func (m *KnowledgeAnswers_Answer) Reset()         { *m = KnowledgeAnswers_Answer
 func (m *KnowledgeAnswers_Answer) String() string { return proto.CompactTextString(m) }
 func (*KnowledgeAnswers_Answer) ProtoMessage()    {}
 func (*KnowledgeAnswers_Answer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{5, 0}
+	return fileDescriptor_40a53f854d709740, []int{5, 0}
 }
+
 func (m *KnowledgeAnswers_Answer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KnowledgeAnswers_Answer.Unmarshal(m, b)
 }
 func (m *KnowledgeAnswers_Answer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KnowledgeAnswers_Answer.Marshal(b, m, deterministic)
 }
-func (dst *KnowledgeAnswers_Answer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KnowledgeAnswers_Answer.Merge(dst, src)
+func (m *KnowledgeAnswers_Answer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeAnswers_Answer.Merge(m, src)
 }
 func (m *KnowledgeAnswers_Answer) XXX_Size() int {
 	return xxx_messageInfo_KnowledgeAnswers_Answer.Size(m)
@@ -1003,16 +930,17 @@ func (m *StreamingDetectIntentRequest) Reset()         { *m = StreamingDetectInt
 func (m *StreamingDetectIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamingDetectIntentRequest) ProtoMessage()    {}
 func (*StreamingDetectIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{6}
+	return fileDescriptor_40a53f854d709740, []int{6}
 }
+
 func (m *StreamingDetectIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingDetectIntentRequest.Unmarshal(m, b)
 }
 func (m *StreamingDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingDetectIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamingDetectIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingDetectIntentRequest.Merge(dst, src)
+func (m *StreamingDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentRequest.Merge(m, src)
 }
 func (m *StreamingDetectIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamingDetectIntentRequest.Size(m)
@@ -1115,16 +1043,17 @@ func (m *StreamingDetectIntentResponse) Reset()         { *m = StreamingDetectIn
 func (m *StreamingDetectIntentResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamingDetectIntentResponse) ProtoMessage()    {}
 func (*StreamingDetectIntentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{7}
+	return fileDescriptor_40a53f854d709740, []int{7}
 }
+
 func (m *StreamingDetectIntentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingDetectIntentResponse.Unmarshal(m, b)
 }
 func (m *StreamingDetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingDetectIntentResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamingDetectIntentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingDetectIntentResponse.Merge(dst, src)
+func (m *StreamingDetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentResponse.Merge(m, src)
 }
 func (m *StreamingDetectIntentResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamingDetectIntentResponse.Size(m)
@@ -1245,16 +1174,17 @@ func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognition
 func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognitionResult) ProtoMessage()    {}
 func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{8}
+	return fileDescriptor_40a53f854d709740, []int{8}
 }
+
 func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
 }
 func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+func (m *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(m, src)
 }
 func (m *StreamingRecognitionResult) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
@@ -1312,16 +1242,17 @@ func (m *TextInput) Reset()         { *m = TextInput{} }
 func (m *TextInput) String() string { return proto.CompactTextString(m) }
 func (*TextInput) ProtoMessage()    {}
 func (*TextInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{9}
+	return fileDescriptor_40a53f854d709740, []int{9}
 }
+
 func (m *TextInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextInput.Unmarshal(m, b)
 }
 func (m *TextInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextInput.Marshal(b, m, deterministic)
 }
-func (dst *TextInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextInput.Merge(dst, src)
+func (m *TextInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextInput.Merge(m, src)
 }
 func (m *TextInput) XXX_Size() int {
 	return xxx_messageInfo_TextInput.Size(m)
@@ -1370,16 +1301,17 @@ func (m *EventInput) Reset()         { *m = EventInput{} }
 func (m *EventInput) String() string { return proto.CompactTextString(m) }
 func (*EventInput) ProtoMessage()    {}
 func (*EventInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{10}
+	return fileDescriptor_40a53f854d709740, []int{10}
 }
+
 func (m *EventInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventInput.Unmarshal(m, b)
 }
 func (m *EventInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EventInput.Marshal(b, m, deterministic)
 }
-func (dst *EventInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventInput.Merge(dst, src)
+func (m *EventInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventInput.Merge(m, src)
 }
 func (m *EventInput) XXX_Size() int {
 	return xxx_messageInfo_EventInput.Size(m)
@@ -1426,16 +1358,17 @@ func (m *SentimentAnalysisRequestConfig) Reset()         { *m = SentimentAnalysi
 func (m *SentimentAnalysisRequestConfig) String() string { return proto.CompactTextString(m) }
 func (*SentimentAnalysisRequestConfig) ProtoMessage()    {}
 func (*SentimentAnalysisRequestConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{11}
+	return fileDescriptor_40a53f854d709740, []int{11}
 }
+
 func (m *SentimentAnalysisRequestConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SentimentAnalysisRequestConfig.Unmarshal(m, b)
 }
 func (m *SentimentAnalysisRequestConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SentimentAnalysisRequestConfig.Marshal(b, m, deterministic)
 }
-func (dst *SentimentAnalysisRequestConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SentimentAnalysisRequestConfig.Merge(dst, src)
+func (m *SentimentAnalysisRequestConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SentimentAnalysisRequestConfig.Merge(m, src)
 }
 func (m *SentimentAnalysisRequestConfig) XXX_Size() int {
 	return xxx_messageInfo_SentimentAnalysisRequestConfig.Size(m)
@@ -1467,16 +1400,17 @@ func (m *SentimentAnalysisResult) Reset()         { *m = SentimentAnalysisResult
 func (m *SentimentAnalysisResult) String() string { return proto.CompactTextString(m) }
 func (*SentimentAnalysisResult) ProtoMessage()    {}
 func (*SentimentAnalysisResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{12}
+	return fileDescriptor_40a53f854d709740, []int{12}
 }
+
 func (m *SentimentAnalysisResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SentimentAnalysisResult.Unmarshal(m, b)
 }
 func (m *SentimentAnalysisResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SentimentAnalysisResult.Marshal(b, m, deterministic)
 }
-func (dst *SentimentAnalysisResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SentimentAnalysisResult.Merge(dst, src)
+func (m *SentimentAnalysisResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SentimentAnalysisResult.Merge(m, src)
 }
 func (m *SentimentAnalysisResult) XXX_Size() int {
 	return xxx_messageInfo_SentimentAnalysisResult.Size(m)
@@ -1512,16 +1446,17 @@ func (m *Sentiment) Reset()         { *m = Sentiment{} }
 func (m *Sentiment) String() string { return proto.CompactTextString(m) }
 func (*Sentiment) ProtoMessage()    {}
 func (*Sentiment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_b99a06fb068de54e, []int{13}
+	return fileDescriptor_40a53f854d709740, []int{13}
 }
+
 func (m *Sentiment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
 }
 func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
 }
-func (dst *Sentiment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentiment.Merge(dst, src)
+func (m *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(m, src)
 }
 func (m *Sentiment) XXX_Size() int {
 	return xxx_messageInfo_Sentiment.Size(m)
@@ -1547,6 +1482,8 @@ func (m *Sentiment) GetMagnitude() float32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.KnowledgeAnswers_Answer_MatchConfidenceLevel", KnowledgeAnswers_Answer_MatchConfidenceLevel_name, KnowledgeAnswers_Answer_MatchConfidenceLevel_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.StreamingRecognitionResult_MessageType", StreamingRecognitionResult_MessageType_name, StreamingRecognitionResult_MessageType_value)
 	proto.RegisterType((*DetectIntentRequest)(nil), "google.cloud.dialogflow.v2beta1.DetectIntentRequest")
 	proto.RegisterType((*DetectIntentResponse)(nil), "google.cloud.dialogflow.v2beta1.DetectIntentResponse")
 	proto.RegisterType((*QueryParameters)(nil), "google.cloud.dialogflow.v2beta1.QueryParameters")
@@ -1562,8 +1499,132 @@ func init() {
 	proto.RegisterType((*SentimentAnalysisRequestConfig)(nil), "google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig")
 	proto.RegisterType((*SentimentAnalysisResult)(nil), "google.cloud.dialogflow.v2beta1.SentimentAnalysisResult")
 	proto.RegisterType((*Sentiment)(nil), "google.cloud.dialogflow.v2beta1.Sentiment")
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.KnowledgeAnswers_Answer_MatchConfidenceLevel", KnowledgeAnswers_Answer_MatchConfidenceLevel_name, KnowledgeAnswers_Answer_MatchConfidenceLevel_value)
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.StreamingRecognitionResult_MessageType", StreamingRecognitionResult_MessageType_name, StreamingRecognitionResult_MessageType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/session.proto", fileDescriptor_40a53f854d709740)
+}
+
+var fileDescriptor_40a53f854d709740 = []byte{
+	// 1876 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcd, 0x73, 0x1b, 0x49,
+	0x15, 0xcf, 0x48, 0xfe, 0x90, 0x9f, 0x14, 0x5b, 0xe9, 0x98, 0x8d, 0xfc, 0x91, 0xc4, 0xab, 0x2d,
+	0xc0, 0x9b, 0x5d, 0xa4, 0xc4, 0x7c, 0xed, 0x6e, 0x2a, 0x9b, 0xd8, 0x92, 0x6c, 0xab, 0xf0, 0x57,
+	0x5a, 0x4e, 0x16, 0x52, 0xc0, 0x54, 0x7b, 0xd4, 0x9a, 0x4c, 0x32, 0xea, 0x96, 0xa7, 0x5b, 0xf6,
+	0x7a, 0x29, 0x38, 0xc0, 0x09, 0x38, 0x72, 0xa2, 0x8a, 0xa2, 0x28, 0x6e, 0x2c, 0x57, 0xae, 0xfc,
+	0x03, 0x5c, 0xa1, 0x8a, 0x7f, 0x80, 0x1b, 0x57, 0x0e, 0x1c, 0xa9, 0xfe, 0x18, 0x69, 0x22, 0xcb,
+	0x91, 0x12, 0x48, 0x51, 0xb5, 0x27, 0xa9, 0x5f, 0xbf, 0xf7, 0xeb, 0xd7, 0xaf, 0x5f, 0xff, 0xfa,
+	0xbd, 0x81, 0xaf, 0xf9, 0x9c, 0xfb, 0x21, 0x2d, 0x7b, 0x21, 0xef, 0x36, 0xcb, 0xcd, 0x80, 0x84,
+	0xdc, 0x6f, 0x85, 0xfc, 0xb4, 0x7c, 0xb2, 0x76, 0x44, 0x25, 0xb9, 0x53, 0x16, 0x54, 0x88, 0x80,
+	0xb3, 0x52, 0x27, 0xe2, 0x92, 0xa3, 0x9b, 0x46, 0xbd, 0xa4, 0xd5, 0x4b, 0x7d, 0xf5, 0x92, 0x55,
+	0x5f, 0x5c, 0xb6, 0x78, 0xa4, 0x13, 0x94, 0x09, 0x63, 0x5c, 0x12, 0x19, 0x70, 0x26, 0x8c, 0xf9,
+	0xe2, 0x42, 0x62, 0x36, 0xa2, 0x82, 0x77, 0x23, 0x8f, 0xda, 0xa9, 0xf7, 0x46, 0x39, 0x42, 0x7c,
+	0xca, 0xa4, 0x55, 0x5e, 0x1b, 0xa9, 0xdc, 0x6d, 0x06, 0xdc, 0xf5, 0x38, 0x6b, 0x05, 0xbe, 0xb5,
+	0x19, 0xb9, 0x53, 0x8f, 0x33, 0x49, 0x3f, 0x8d, 0x97, 0x78, 0x7f, 0x94, 0x7a, 0xc0, 0x64, 0xdf,
+	0xa1, 0x0f, 0xc7, 0x0c, 0xa3, 0x4b, 0x99, 0x0c, 0xe4, 0x99, 0x2b, 0xcf, 0x3a, 0xf1, 0xc6, 0xe3,
+	0x88, 0xe9, 0xd1, 0x51, 0xb7, 0x55, 0x16, 0x32, 0xea, 0x7a, 0x31, 0xf0, 0x35, 0x3b, 0x1b, 0x75,
+	0xbc, 0xb2, 0x90, 0x44, 0x76, 0xe3, 0x50, 0x16, 0xec, 0x84, 0x42, 0x2a, 0x87, 0x44, 0x86, 0xcc,
+	0x6e, 0xb4, 0xf8, 0xf7, 0x14, 0x5c, 0xad, 0x52, 0x49, 0x3d, 0x59, 0xd7, 0x2e, 0x62, 0x7a, 0xdc,
+	0xa5, 0x42, 0xa2, 0x02, 0x4c, 0x5b, 0x2f, 0x0a, 0xce, 0x8a, 0xb3, 0x3a, 0x83, 0xe3, 0x21, 0x6a,
+	0x40, 0xee, 0xb8, 0x4b, 0xa3, 0x33, 0xb7, 0x43, 0x22, 0xd2, 0x16, 0x85, 0xd4, 0x8a, 0xb3, 0x9a,
+	0x5d, 0xbb, 0x5d, 0x1a, 0x71, 0xd8, 0xa5, 0x87, 0xca, 0xe8, 0x40, 0xd9, 0x50, 0x49, 0x23, 0x81,
+	0xb3, 0xc7, 0x3d, 0x81, 0x40, 0x3b, 0x60, 0x86, 0x6e, 0xc0, 0x3a, 0x5d, 0x59, 0x48, 0x6b, 0xcc,
+	0xf7, 0xc6, 0xc3, 0xac, 0x2b, 0x13, 0x0c, 0xc7, 0xbd, 0xff, 0xe8, 0x08, 0xae, 0xf2, 0xae, 0xec,
+	0x74, 0xa5, 0x9b, 0x3c, 0xda, 0xc2, 0x84, 0x46, 0x5d, 0x1b, 0x89, 0xba, 0xaf, 0x6d, 0xd7, 0x95,
+	0x69, 0x45, 0x5b, 0xe2, 0x2b, 0x7c, 0x50, 0x84, 0x6e, 0x42, 0x56, 0xfb, 0x6a, 0x96, 0x28, 0x4c,
+	0xae, 0x38, 0xab, 0x39, 0x0c, 0x5a, 0xa4, 0xd5, 0x8a, 0x7f, 0x4a, 0xc3, 0xfc, 0x8b, 0x91, 0x15,
+	0x1d, 0xce, 0x04, 0x55, 0x96, 0x91, 0xfd, 0xef, 0x06, 0x4d, 0x1b, 0x5e, 0x88, 0x45, 0xf5, 0x26,
+	0xda, 0x8f, 0x23, 0x1c, 0x51, 0xd1, 0x0d, 0xa5, 0x8d, 0xf0, 0xfb, 0xe3, 0x45, 0x03, 0x6b, 0x1b,
+	0x1b, 0x5d, 0x33, 0x40, 0x4f, 0x61, 0x81, 0x84, 0x92, 0x46, 0x8c, 0xc8, 0xe0, 0x84, 0xba, 0x49,
+	0x70, 0x51, 0x98, 0x5c, 0x49, 0xbf, 0x32, 0xfa, 0xb5, 0x04, 0x5c, 0x42, 0x2e, 0xd0, 0x87, 0x30,
+	0x7b, 0x4a, 0x8f, 0x9e, 0x72, 0xfe, 0xdc, 0x35, 0x09, 0x68, 0x8f, 0x12, 0xc5, 0xf0, 0x51, 0xc7,
+	0x2b, 0x35, 0xf4, 0x0c, 0xbe, 0x6c, 0x35, 0xcd, 0x10, 0xbd, 0x0d, 0xb9, 0xe4, 0xa1, 0xe9, 0xd3,
+	0xca, 0xe1, 0x6c, 0x22, 0xf2, 0x17, 0x9d, 0xeb, 0xd4, 0xff, 0xf0, 0x5c, 0x8b, 0x7f, 0x9c, 0x80,
+	0xb9, 0x81, 0x54, 0x45, 0x4b, 0x30, 0x23, 0x83, 0x36, 0x75, 0x3f, 0xe3, 0x8c, 0xda, 0xf3, 0xca,
+	0x28, 0xc1, 0x13, 0xce, 0x28, 0xfa, 0x16, 0xe4, 0x7c, 0xca, 0xdd, 0x90, 0x7b, 0x9a, 0xbd, 0xec,
+	0x69, 0x5d, 0x8d, 0xbd, 0xd1, 0x97, 0x77, 0x87, 0xc8, 0x1d, 0xe6, 0xe3, 0xac, 0x4f, 0xf9, 0x8e,
+	0xd5, 0x43, 0x55, 0xc8, 0x58, 0x12, 0x51, 0x41, 0x52, 0x67, 0xb0, 0x3a, 0x72, 0x07, 0x15, 0x63,
+	0x80, 0x7b, 0x96, 0xe8, 0xcb, 0x30, 0x1b, 0x51, 0x41, 0xa5, 0xdb, 0xc3, 0x52, 0x71, 0xcb, 0xe0,
+	0xcb, 0x5a, 0x5a, 0x89, 0xd5, 0x9a, 0x30, 0x3f, 0x84, 0x54, 0xe2, 0xc3, 0x1f, 0x1d, 0xba, 0x86,
+	0x31, 0xae, 0x69, 0xdb, 0xc3, 0xb3, 0x0e, 0xc5, 0x48, 0x0c, 0x8a, 0x04, 0xba, 0x03, 0xd3, 0x1d,
+	0x72, 0x16, 0x72, 0xd2, 0xb4, 0x67, 0x72, 0x2d, 0x06, 0x8e, 0xf9, 0xaa, 0xd4, 0xd0, 0x7c, 0x85,
+	0x63, 0x3d, 0x74, 0x1b, 0xe6, 0x9f, 0x33, 0x7e, 0x1a, 0xd2, 0xa6, 0x4f, 0xdd, 0x23, 0x22, 0xa8,
+	0xcb, 0x48, 0x9b, 0x8a, 0x42, 0x6e, 0x25, 0xbd, 0x3a, 0x83, 0x51, 0x6f, 0x6e, 0x83, 0x08, 0xba,
+	0xa7, 0x66, 0xd0, 0x2f, 0x1c, 0x78, 0x5b, 0xa8, 0x4d, 0xb4, 0x29, 0x93, 0x2e, 0x61, 0x24, 0x3c,
+	0x13, 0x81, 0x70, 0x23, 0x43, 0x5c, 0x71, 0x4e, 0x80, 0x5e, 0xff, 0xfe, 0x18, 0x1b, 0xb3, 0x48,
+	0xeb, 0x16, 0xc8, 0x12, 0xa0, 0x4d, 0x90, 0x1b, 0xe2, 0xa5, 0xf3, 0xc5, 0x7f, 0x39, 0x00, 0x7d,
+	0x12, 0x42, 0x8f, 0x21, 0xf7, 0x42, 0x66, 0x3a, 0xda, 0x8b, 0x3b, 0x23, 0xbd, 0xa8, 0xb3, 0x17,
+	0xb3, 0x70, 0xfb, 0x12, 0xce, 0x92, 0x04, 0xd9, 0x3c, 0x80, 0x09, 0x75, 0x8e, 0x36, 0xb7, 0x6e,
+	0x8d, 0xc4, 0x3b, 0xa4, 0x9f, 0x4a, 0x8d, 0xb9, 0x7d, 0x09, 0x6b, 0x4b, 0x54, 0x81, 0x49, 0x7a,
+	0x42, 0xd9, 0xf8, 0xd4, 0x5a, 0x53, 0xda, 0x31, 0x86, 0xb1, 0xdd, 0x98, 0x86, 0x49, 0x4d, 0x70,
+	0xc5, 0x9f, 0x67, 0x20, 0x9b, 0xb8, 0xf7, 0xe8, 0x3a, 0x18, 0xfa, 0x75, 0xb5, 0x97, 0xe6, 0x86,
+	0xcc, 0x68, 0x89, 0xf2, 0x04, 0xbd, 0x03, 0x97, 0x43, 0xc2, 0xfc, 0x2e, 0xf1, 0xa9, 0xeb, 0xf1,
+	0x26, 0x2d, 0xcc, 0x69, 0x8d, 0x5c, 0x2c, 0xac, 0xf0, 0x26, 0x45, 0x1b, 0x70, 0x5d, 0x74, 0x28,
+	0xf5, 0x9e, 0xba, 0x11, 0xf5, 0xb8, 0xcf, 0x02, 0x75, 0x4b, 0x4c, 0x20, 0x9b, 0x94, 0x79, 0x54,
+	0x6f, 0x3e, 0x85, 0x97, 0x8c, 0x12, 0xee, 0xeb, 0x54, 0x7a, 0x2a, 0xe8, 0x2d, 0x98, 0x22, 0x9e,
+	0xbe, 0x85, 0x69, 0xbd, 0x82, 0x1d, 0xa1, 0x6f, 0x03, 0x74, 0x7a, 0xd7, 0xd9, 0xbe, 0x03, 0x17,
+	0xe6, 0x66, 0x42, 0x15, 0xdd, 0x83, 0x25, 0x12, 0x86, 0x3a, 0xb9, 0x82, 0x88, 0x36, 0xed, 0x9b,
+	0xe7, 0x76, 0xd4, 0xed, 0x62, 0x52, 0xb3, 0x7e, 0x06, 0x17, 0x48, 0x18, 0x62, 0xab, 0x61, 0xde,
+	0xb3, 0x03, 0x33, 0x8f, 0xde, 0x85, 0x7c, 0xab, 0x1b, 0xb6, 0x82, 0x30, 0xd4, 0xc9, 0xaa, 0xa3,
+	0x33, 0xa5, 0x3d, 0x9b, 0x4b, 0xc8, 0x75, 0x8c, 0x8e, 0x60, 0x3e, 0xa9, 0xda, 0xa6, 0x42, 0x10,
+	0x9f, 0x8a, 0xc2, 0xb4, 0xbe, 0xa1, 0xe5, 0x31, 0x52, 0x48, 0x57, 0x18, 0xbb, 0xc6, 0x0e, 0x5f,
+	0x4d, 0x80, 0x59, 0x99, 0x26, 0x8b, 0x1e, 0x3b, 0xeb, 0x72, 0xaa, 0x90, 0xd1, 0xce, 0xf4, 0x98,
+	0x58, 0x0b, 0xd1, 0x03, 0x98, 0x8b, 0xd5, 0xe2, 0xeb, 0x3c, 0xf3, 0xf2, 0x90, 0xc5, 0xb0, 0x07,
+	0xf6, 0x56, 0x3f, 0x84, 0x39, 0x4b, 0xd4, 0x3d, 0x5a, 0x82, 0x57, 0xa4, 0xb8, 0x59, 0x03, 0xd0,
+	0x63, 0xb0, 0xfb, 0x30, 0x65, 0x8a, 0xa8, 0x42, 0x56, 0xfb, 0xf2, 0xd5, 0x31, 0x23, 0x82, 0xad,
+	0x19, 0xfa, 0x18, 0x96, 0xcc, 0x3f, 0xb7, 0xa9, 0x5f, 0xe5, 0x81, 0xec, 0xca, 0xe9, 0xec, 0x5a,
+	0x30, 0x2a, 0xd5, 0x58, 0x23, 0x91, 0x5b, 0x0f, 0x60, 0xae, 0x19, 0x10, 0x9f, 0x71, 0x21, 0x03,
+	0xcf, 0x0d, 0x58, 0x8b, 0x17, 0x66, 0x47, 0x44, 0xa5, 0xaf, 0x5f, 0x67, 0x2d, 0x8e, 0x24, 0x2c,
+	0x0c, 0x25, 0x2e, 0xfd, 0xc8, 0x5f, 0xd1, 0x58, 0x1f, 0xbc, 0x0e, 0x61, 0x99, 0x27, 0x59, 0x0c,
+	0x9f, 0x40, 0x3f, 0x84, 0x2b, 0x7d, 0x86, 0x25, 0x4c, 0x9c, 0xaa, 0x2b, 0x80, 0xc6, 0x24, 0xa6,
+	0xef, 0xc4, 0x96, 0xeb, 0xc6, 0x10, 0xe7, 0x9f, 0x0f, 0x48, 0x8a, 0x7f, 0x4b, 0x43, 0x7e, 0x50,
+	0x0d, 0x61, 0x98, 0x8e, 0x97, 0x72, 0xf4, 0xc1, 0x7f, 0xf0, 0xca, 0x4b, 0x95, 0xcc, 0x2f, 0x8e,
+	0x81, 0x16, 0xff, 0x99, 0x82, 0x29, 0x23, 0x53, 0xf7, 0xdc, 0x26, 0xb0, 0xe1, 0x1a, 0x3b, 0x52,
+	0x35, 0x44, 0x8b, 0x1c, 0xbb, 0x9a, 0xa1, 0xe3, 0xb7, 0x78, 0x06, 0x67, 0x5b, 0xe4, 0xf8, 0xa1,
+	0x15, 0x69, 0x8a, 0xd0, 0x20, 0x3d, 0x8a, 0x30, 0x90, 0x3f, 0x73, 0xe0, 0xad, 0x36, 0x91, 0xde,
+	0xd3, 0x44, 0x52, 0xb8, 0x21, 0x3d, 0xa1, 0xa1, 0xe6, 0x8b, 0xd9, 0xb5, 0xdd, 0xd7, 0xdd, 0x41,
+	0x69, 0x57, 0xc1, 0xf6, 0x33, 0x69, 0x47, 0x81, 0xe2, 0xf9, 0xf6, 0x10, 0xa9, 0x22, 0x8c, 0x41,
+	0x27, 0x34, 0xc9, 0xa4, 0xf0, 0xdc, 0x80, 0x7e, 0xf1, 0x07, 0x30, 0x3f, 0x0c, 0x18, 0x7d, 0x05,
+	0x8a, 0xbb, 0xeb, 0x87, 0x95, 0x6d, 0xb7, 0xb2, 0xbf, 0xb7, 0x59, 0xaf, 0xd6, 0xf6, 0x2a, 0x35,
+	0x77, 0xa7, 0xf6, 0xb8, 0xb6, 0xe3, 0x3e, 0xda, 0x6b, 0x1c, 0xd4, 0x2a, 0xf5, 0xcd, 0x7a, 0xad,
+	0x9a, 0xbf, 0x84, 0xa6, 0x21, 0xbd, 0xb3, 0xff, 0x49, 0xde, 0x41, 0x00, 0x53, 0xbb, 0xb5, 0x6a,
+	0xfd, 0xd1, 0x6e, 0x3e, 0x85, 0x32, 0x30, 0xb1, 0x5d, 0xdf, 0xda, 0xce, 0xa7, 0x8b, 0xbf, 0x4c,
+	0xc3, 0x72, 0x43, 0x46, 0x94, 0xb4, 0x03, 0xe6, 0x7f, 0xe1, 0x3a, 0x84, 0x77, 0x21, 0x2f, 0x02,
+	0xe6, 0x87, 0xd4, 0xed, 0x4a, 0x49, 0x23, 0xa2, 0xe2, 0x6c, 0x0a, 0xa7, 0x39, 0x23, 0x7f, 0x14,
+	0x8b, 0x2f, 0x2a, 0x3a, 0x27, 0xdf, 0x60, 0x33, 0x31, 0x75, 0xae, 0x99, 0xf8, 0xc3, 0x04, 0x5c,
+	0xbf, 0xe0, 0x34, 0xc6, 0xed, 0x2a, 0x9e, 0x01, 0x4a, 0x3e, 0xac, 0x2f, 0xf4, 0x16, 0x77, 0x47,
+	0xd3, 0x4e, 0xbc, 0x78, 0xe2, 0xe1, 0xb5, 0xcc, 0x73, 0x25, 0x1a, 0x14, 0x9d, 0xeb, 0x60, 0xd2,
+	0x6f, 0xb4, 0x83, 0x99, 0x7e, 0xb3, 0x1d, 0xcc, 0xc4, 0xeb, 0x76, 0x30, 0x93, 0xff, 0x9f, 0x0e,
+	0xe6, 0xcf, 0x29, 0x58, 0xbc, 0xf8, 0xb8, 0xd0, 0x33, 0xc8, 0xd9, 0xe2, 0x42, 0xf7, 0x00, 0x3a,
+	0x53, 0x66, 0xd7, 0xb6, 0xfe, 0x8b, 0x0c, 0x88, 0x8b, 0x0e, 0xdd, 0x17, 0x64, 0xdb, 0xfd, 0x01,
+	0xba, 0x01, 0x20, 0x23, 0xc2, 0x84, 0x17, 0x05, 0x1d, 0x69, 0xd9, 0x38, 0x21, 0x41, 0x0b, 0x90,
+	0x09, 0x84, 0xdb, 0x0a, 0x18, 0x09, 0x75, 0x8e, 0x64, 0xf0, 0x74, 0x20, 0x36, 0xd5, 0x50, 0x99,
+	0x26, 0x38, 0x70, 0x42, 0x73, 0x60, 0x42, 0x52, 0xfc, 0x2e, 0x64, 0x13, 0xcb, 0xa2, 0x65, 0x28,
+	0xec, 0xd6, 0x1a, 0x8d, 0xf5, 0xad, 0x9a, 0x7b, 0xf8, 0xbd, 0x83, 0xda, 0x00, 0xd7, 0xcd, 0x02,
+	0x1c, 0xe2, 0xf5, 0xbd, 0x46, 0x05, 0xd7, 0x0f, 0x0e, 0xf3, 0x0e, 0x5a, 0x82, 0x6b, 0xb5, 0xbd,
+	0xaa, 0xbb, 0xbf, 0xe9, 0x36, 0xea, 0x7b, 0x5b, 0x3b, 0x35, 0xf7, 0xd1, 0xe1, 0x61, 0x0d, 0xaf,
+	0xef, 0x55, 0x6a, 0xf9, 0x54, 0xb1, 0x0a, 0x33, 0xbd, 0xfa, 0x19, 0x21, 0x5b, 0x79, 0x9b, 0xfb,
+	0x64, 0x6a, 0xe9, 0x73, 0xe5, 0x6c, 0xea, 0x7c, 0x39, 0x5b, 0xfc, 0x09, 0x40, 0xbf, 0x84, 0x56,
+	0x30, 0xaa, 0xaf, 0x89, 0x61, 0xd4, 0xff, 0x81, 0xa2, 0x34, 0x35, 0x7e, 0x51, 0x7a, 0x6e, 0xfd,
+	0xf4, 0x90, 0xf5, 0x09, 0xdc, 0x78, 0x79, 0x6f, 0x83, 0xee, 0xc3, 0xb2, 0x2e, 0x42, 0x3e, 0x8b,
+	0xef, 0x93, 0xda, 0x9c, 0xdb, 0x2b, 0x23, 0xb4, 0xaf, 0x19, 0xbc, 0x60, 0x75, 0x1e, 0xc6, 0xd5,
+	0x7c, 0x0f, 0xb5, 0x78, 0x0a, 0xd7, 0x2e, 0xa8, 0x46, 0xd0, 0xf7, 0x61, 0xfe, 0x42, 0xcc, 0x71,
+	0x1a, 0x98, 0x1e, 0x2e, 0x46, 0xc7, 0xe7, 0x17, 0xbe, 0x0f, 0x33, 0xbd, 0x01, 0x9a, 0x87, 0x49,
+	0xe1, 0xf1, 0xc8, 0xc4, 0x36, 0x85, 0xcd, 0x00, 0x2d, 0xc3, 0x4c, 0x9b, 0xa8, 0x2c, 0xed, 0x36,
+	0xe3, 0xce, 0xa1, 0x2f, 0x58, 0xfb, 0x4b, 0x1a, 0x32, 0xb6, 0xa5, 0x15, 0xe8, 0xb7, 0x29, 0xc8,
+	0x25, 0x29, 0x15, 0x7d, 0x63, 0xa4, 0x7b, 0x43, 0xde, 0xc3, 0xc5, 0x6f, 0xbe, 0xa2, 0x95, 0x21,
+	0xe6, 0xe2, 0xef, 0x9c, 0x9f, 0xfe, 0xf5, 0x1f, 0xbf, 0x4a, 0xfd, 0xda, 0x29, 0xde, 0xed, 0x7d,
+	0xff, 0xfb, 0x91, 0x7d, 0x49, 0xef, 0x75, 0x22, 0xfe, 0x8c, 0x7a, 0x52, 0x94, 0x6f, 0x99, 0x2f,
+	0x9a, 0xf1, 0x97, 0x41, 0x51, 0xbe, 0xf5, 0xe3, 0x8f, 0x9a, 0x09, 0xb8, 0x8f, 0x9c, 0x5b, 0x4f,
+	0x3e, 0x29, 0xe2, 0x31, 0x10, 0x28, 0x3b, 0x09, 0x22, 0xce, 0x54, 0xe8, 0x94, 0xb0, 0x2b, 0x68,
+	0xa4, 0x7e, 0x5f, 0x02, 0x8c, 0x7e, 0xe3, 0xc0, 0x97, 0x86, 0x3e, 0x3e, 0xe8, 0xde, 0xf8, 0xac,
+	0x31, 0x2c, 0x64, 0x1f, 0xbf, 0xae, 0xb9, 0x8d, 0xdd, 0xa5, 0x55, 0xe7, 0xb6, 0xb3, 0xf1, 0xb9,
+	0x03, 0xef, 0x78, 0xbc, 0x3d, 0x0a, 0x6b, 0x23, 0x67, 0x4f, 0xfc, 0x40, 0x5d, 0xad, 0x03, 0xe7,
+	0x49, 0xdd, 0x1a, 0xf8, 0x5c, 0x5d, 0x9c, 0x12, 0x8f, 0xfc, 0xb2, 0x4f, 0x99, 0xbe, 0x78, 0x65,
+	0x33, 0x45, 0x3a, 0x81, 0xb8, 0xf0, 0x2b, 0xed, 0xdd, 0xbe, 0xe8, 0xdf, 0x8e, 0xf3, 0xfb, 0x54,
+	0xaa, 0xba, 0xf9, 0x79, 0xea, 0xe6, 0x96, 0xc1, 0xac, 0x68, 0x27, 0xaa, 0x7d, 0x27, 0x1e, 0x1b,
+	0xa3, 0xa3, 0x29, 0x8d, 0xff, 0xf5, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x80, 0x80, 0x30,
+	0x4b, 0x17, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1717,129 +1778,3 @@ var _Sessions_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/cloud/dialogflow/v2beta1/session.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/session.proto", fileDescriptor_session_b99a06fb068de54e)
-}
-
-var fileDescriptor_session_b99a06fb068de54e = []byte{
-	// 1876 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcd, 0x73, 0x1b, 0x49,
-	0x15, 0xcf, 0x48, 0xfe, 0x90, 0x9f, 0x14, 0x5b, 0xe9, 0x98, 0x8d, 0xfc, 0x91, 0xc4, 0xab, 0x2d,
-	0xc0, 0x9b, 0x5d, 0xa4, 0xc4, 0x7c, 0xed, 0x6e, 0x2a, 0x9b, 0xd8, 0x92, 0x6c, 0xab, 0xf0, 0x57,
-	0x5a, 0x4e, 0x16, 0x52, 0xc0, 0x54, 0x7b, 0xd4, 0x9a, 0x4c, 0x32, 0xea, 0x96, 0xa7, 0x5b, 0xf6,
-	0x7a, 0x29, 0x38, 0xc0, 0x09, 0x38, 0x72, 0xa2, 0x8a, 0xa2, 0x28, 0x6e, 0x2c, 0x57, 0xae, 0xfc,
-	0x03, 0x5c, 0xa1, 0x8a, 0x7f, 0x80, 0x1b, 0x57, 0x0e, 0x1c, 0xa9, 0xfe, 0x18, 0x69, 0x22, 0xcb,
-	0x91, 0x12, 0x48, 0x51, 0xb5, 0x27, 0xa9, 0x5f, 0xbf, 0xf7, 0xeb, 0xd7, 0xaf, 0x5f, 0xff, 0xfa,
-	0xbd, 0x81, 0xaf, 0xf9, 0x9c, 0xfb, 0x21, 0x2d, 0x7b, 0x21, 0xef, 0x36, 0xcb, 0xcd, 0x80, 0x84,
-	0xdc, 0x6f, 0x85, 0xfc, 0xb4, 0x7c, 0xb2, 0x76, 0x44, 0x25, 0xb9, 0x53, 0x16, 0x54, 0x88, 0x80,
-	0xb3, 0x52, 0x27, 0xe2, 0x92, 0xa3, 0x9b, 0x46, 0xbd, 0xa4, 0xd5, 0x4b, 0x7d, 0xf5, 0x92, 0x55,
-	0x5f, 0x5c, 0xb6, 0x78, 0xa4, 0x13, 0x94, 0x09, 0x63, 0x5c, 0x12, 0x19, 0x70, 0x26, 0x8c, 0xf9,
-	0xe2, 0x42, 0x62, 0x36, 0xa2, 0x82, 0x77, 0x23, 0x8f, 0xda, 0xa9, 0xf7, 0x46, 0x39, 0x42, 0x7c,
-	0xca, 0xa4, 0x55, 0x5e, 0x1b, 0xa9, 0xdc, 0x6d, 0x06, 0xdc, 0xf5, 0x38, 0x6b, 0x05, 0xbe, 0xb5,
-	0x19, 0xb9, 0x53, 0x8f, 0x33, 0x49, 0x3f, 0x8d, 0x97, 0x78, 0x7f, 0x94, 0x7a, 0xc0, 0x64, 0xdf,
-	0xa1, 0x0f, 0xc7, 0x0c, 0xa3, 0x4b, 0x99, 0x0c, 0xe4, 0x99, 0x2b, 0xcf, 0x3a, 0xf1, 0xc6, 0xe3,
-	0x88, 0xe9, 0xd1, 0x51, 0xb7, 0x55, 0x16, 0x32, 0xea, 0x7a, 0x31, 0xf0, 0x35, 0x3b, 0x1b, 0x75,
-	0xbc, 0xb2, 0x90, 0x44, 0x76, 0xe3, 0x50, 0x16, 0xec, 0x84, 0x42, 0x2a, 0x87, 0x44, 0x86, 0xcc,
-	0x6e, 0xb4, 0xf8, 0xf7, 0x14, 0x5c, 0xad, 0x52, 0x49, 0x3d, 0x59, 0xd7, 0x2e, 0x62, 0x7a, 0xdc,
-	0xa5, 0x42, 0xa2, 0x02, 0x4c, 0x5b, 0x2f, 0x0a, 0xce, 0x8a, 0xb3, 0x3a, 0x83, 0xe3, 0x21, 0x6a,
-	0x40, 0xee, 0xb8, 0x4b, 0xa3, 0x33, 0xb7, 0x43, 0x22, 0xd2, 0x16, 0x85, 0xd4, 0x8a, 0xb3, 0x9a,
-	0x5d, 0xbb, 0x5d, 0x1a, 0x71, 0xd8, 0xa5, 0x87, 0xca, 0xe8, 0x40, 0xd9, 0x50, 0x49, 0x23, 0x81,
-	0xb3, 0xc7, 0x3d, 0x81, 0x40, 0x3b, 0x60, 0x86, 0x6e, 0xc0, 0x3a, 0x5d, 0x59, 0x48, 0x6b, 0xcc,
-	0xf7, 0xc6, 0xc3, 0xac, 0x2b, 0x13, 0x0c, 0xc7, 0xbd, 0xff, 0xe8, 0x08, 0xae, 0xf2, 0xae, 0xec,
-	0x74, 0xa5, 0x9b, 0x3c, 0xda, 0xc2, 0x84, 0x46, 0x5d, 0x1b, 0x89, 0xba, 0xaf, 0x6d, 0xd7, 0x95,
-	0x69, 0x45, 0x5b, 0xe2, 0x2b, 0x7c, 0x50, 0x84, 0x6e, 0x42, 0x56, 0xfb, 0x6a, 0x96, 0x28, 0x4c,
-	0xae, 0x38, 0xab, 0x39, 0x0c, 0x5a, 0xa4, 0xd5, 0x8a, 0x7f, 0x4a, 0xc3, 0xfc, 0x8b, 0x91, 0x15,
-	0x1d, 0xce, 0x04, 0x55, 0x96, 0x91, 0xfd, 0xef, 0x06, 0x4d, 0x1b, 0x5e, 0x88, 0x45, 0xf5, 0x26,
-	0xda, 0x8f, 0x23, 0x1c, 0x51, 0xd1, 0x0d, 0xa5, 0x8d, 0xf0, 0xfb, 0xe3, 0x45, 0x03, 0x6b, 0x1b,
-	0x1b, 0x5d, 0x33, 0x40, 0x4f, 0x61, 0x81, 0x84, 0x92, 0x46, 0x8c, 0xc8, 0xe0, 0x84, 0xba, 0x49,
-	0x70, 0x51, 0x98, 0x5c, 0x49, 0xbf, 0x32, 0xfa, 0xb5, 0x04, 0x5c, 0x42, 0x2e, 0xd0, 0x87, 0x30,
-	0x7b, 0x4a, 0x8f, 0x9e, 0x72, 0xfe, 0xdc, 0x35, 0x09, 0x68, 0x8f, 0x12, 0xc5, 0xf0, 0x51, 0xc7,
-	0x2b, 0x35, 0xf4, 0x0c, 0xbe, 0x6c, 0x35, 0xcd, 0x10, 0xbd, 0x0d, 0xb9, 0xe4, 0xa1, 0xe9, 0xd3,
-	0xca, 0xe1, 0x6c, 0x22, 0xf2, 0x17, 0x9d, 0xeb, 0xd4, 0xff, 0xf0, 0x5c, 0x8b, 0x7f, 0x9c, 0x80,
-	0xb9, 0x81, 0x54, 0x45, 0x4b, 0x30, 0x23, 0x83, 0x36, 0x75, 0x3f, 0xe3, 0x8c, 0xda, 0xf3, 0xca,
-	0x28, 0xc1, 0x13, 0xce, 0x28, 0xfa, 0x16, 0xe4, 0x7c, 0xca, 0xdd, 0x90, 0x7b, 0x9a, 0xbd, 0xec,
-	0x69, 0x5d, 0x8d, 0xbd, 0xd1, 0x97, 0x77, 0x87, 0xc8, 0x1d, 0xe6, 0xe3, 0xac, 0x4f, 0xf9, 0x8e,
-	0xd5, 0x43, 0x55, 0xc8, 0x58, 0x12, 0x51, 0x41, 0x52, 0x67, 0xb0, 0x3a, 0x72, 0x07, 0x15, 0x63,
-	0x80, 0x7b, 0x96, 0xe8, 0xcb, 0x30, 0x1b, 0x51, 0x41, 0xa5, 0xdb, 0xc3, 0x52, 0x71, 0xcb, 0xe0,
-	0xcb, 0x5a, 0x5a, 0x89, 0xd5, 0x9a, 0x30, 0x3f, 0x84, 0x54, 0xe2, 0xc3, 0x1f, 0x1d, 0xba, 0x86,
-	0x31, 0xae, 0x69, 0xdb, 0xc3, 0xb3, 0x0e, 0xc5, 0x48, 0x0c, 0x8a, 0x04, 0xba, 0x03, 0xd3, 0x1d,
-	0x72, 0x16, 0x72, 0xd2, 0xb4, 0x67, 0x72, 0x2d, 0x06, 0x8e, 0xf9, 0xaa, 0xd4, 0xd0, 0x7c, 0x85,
-	0x63, 0x3d, 0x74, 0x1b, 0xe6, 0x9f, 0x33, 0x7e, 0x1a, 0xd2, 0xa6, 0x4f, 0xdd, 0x23, 0x22, 0xa8,
-	0xcb, 0x48, 0x9b, 0x8a, 0x42, 0x6e, 0x25, 0xbd, 0x3a, 0x83, 0x51, 0x6f, 0x6e, 0x83, 0x08, 0xba,
-	0xa7, 0x66, 0xd0, 0x2f, 0x1c, 0x78, 0x5b, 0xa8, 0x4d, 0xb4, 0x29, 0x93, 0x2e, 0x61, 0x24, 0x3c,
-	0x13, 0x81, 0x70, 0x23, 0x43, 0x5c, 0x71, 0x4e, 0x80, 0x5e, 0xff, 0xfe, 0x18, 0x1b, 0xb3, 0x48,
-	0xeb, 0x16, 0xc8, 0x12, 0xa0, 0x4d, 0x90, 0x1b, 0xe2, 0xa5, 0xf3, 0xc5, 0x7f, 0x39, 0x00, 0x7d,
-	0x12, 0x42, 0x8f, 0x21, 0xf7, 0x42, 0x66, 0x3a, 0xda, 0x8b, 0x3b, 0x23, 0xbd, 0xa8, 0xb3, 0x17,
-	0xb3, 0x70, 0xfb, 0x12, 0xce, 0x92, 0x04, 0xd9, 0x3c, 0x80, 0x09, 0x75, 0x8e, 0x36, 0xb7, 0x6e,
-	0x8d, 0xc4, 0x3b, 0xa4, 0x9f, 0x4a, 0x8d, 0xb9, 0x7d, 0x09, 0x6b, 0x4b, 0x54, 0x81, 0x49, 0x7a,
-	0x42, 0xd9, 0xf8, 0xd4, 0x5a, 0x53, 0xda, 0x31, 0x86, 0xb1, 0xdd, 0x98, 0x86, 0x49, 0x4d, 0x70,
-	0xc5, 0x9f, 0x67, 0x20, 0x9b, 0xb8, 0xf7, 0xe8, 0x3a, 0x18, 0xfa, 0x75, 0xb5, 0x97, 0xe6, 0x86,
-	0xcc, 0x68, 0x89, 0xf2, 0x04, 0xbd, 0x03, 0x97, 0x43, 0xc2, 0xfc, 0x2e, 0xf1, 0xa9, 0xeb, 0xf1,
-	0x26, 0x2d, 0xcc, 0x69, 0x8d, 0x5c, 0x2c, 0xac, 0xf0, 0x26, 0x45, 0x1b, 0x70, 0x5d, 0x74, 0x28,
-	0xf5, 0x9e, 0xba, 0x11, 0xf5, 0xb8, 0xcf, 0x02, 0x75, 0x4b, 0x4c, 0x20, 0x9b, 0x94, 0x79, 0x54,
-	0x6f, 0x3e, 0x85, 0x97, 0x8c, 0x12, 0xee, 0xeb, 0x54, 0x7a, 0x2a, 0xe8, 0x2d, 0x98, 0x22, 0x9e,
-	0xbe, 0x85, 0x69, 0xbd, 0x82, 0x1d, 0xa1, 0x6f, 0x03, 0x74, 0x7a, 0xd7, 0xd9, 0xbe, 0x03, 0x17,
-	0xe6, 0x66, 0x42, 0x15, 0xdd, 0x83, 0x25, 0x12, 0x86, 0x3a, 0xb9, 0x82, 0x88, 0x36, 0xed, 0x9b,
-	0xe7, 0x76, 0xd4, 0xed, 0x62, 0x52, 0xb3, 0x7e, 0x06, 0x17, 0x48, 0x18, 0x62, 0xab, 0x61, 0xde,
-	0xb3, 0x03, 0x33, 0x8f, 0xde, 0x85, 0x7c, 0xab, 0x1b, 0xb6, 0x82, 0x30, 0xd4, 0xc9, 0xaa, 0xa3,
-	0x33, 0xa5, 0x3d, 0x9b, 0x4b, 0xc8, 0x75, 0x8c, 0x8e, 0x60, 0x3e, 0xa9, 0xda, 0xa6, 0x42, 0x10,
-	0x9f, 0x8a, 0xc2, 0xb4, 0xbe, 0xa1, 0xe5, 0x31, 0x52, 0x48, 0x57, 0x18, 0xbb, 0xc6, 0x0e, 0x5f,
-	0x4d, 0x80, 0x59, 0x99, 0x26, 0x8b, 0x1e, 0x3b, 0xeb, 0x72, 0xaa, 0x90, 0xd1, 0xce, 0xf4, 0x98,
-	0x58, 0x0b, 0xd1, 0x03, 0x98, 0x8b, 0xd5, 0xe2, 0xeb, 0x3c, 0xf3, 0xf2, 0x90, 0xc5, 0xb0, 0x07,
-	0xf6, 0x56, 0x3f, 0x84, 0x39, 0x4b, 0xd4, 0x3d, 0x5a, 0x82, 0x57, 0xa4, 0xb8, 0x59, 0x03, 0xd0,
-	0x63, 0xb0, 0xfb, 0x30, 0x65, 0x8a, 0xa8, 0x42, 0x56, 0xfb, 0xf2, 0xd5, 0x31, 0x23, 0x82, 0xad,
-	0x19, 0xfa, 0x18, 0x96, 0xcc, 0x3f, 0xb7, 0xa9, 0x5f, 0xe5, 0x81, 0xec, 0xca, 0xe9, 0xec, 0x5a,
-	0x30, 0x2a, 0xd5, 0x58, 0x23, 0x91, 0x5b, 0x0f, 0x60, 0xae, 0x19, 0x10, 0x9f, 0x71, 0x21, 0x03,
-	0xcf, 0x0d, 0x58, 0x8b, 0x17, 0x66, 0x47, 0x44, 0xa5, 0xaf, 0x5f, 0x67, 0x2d, 0x8e, 0x24, 0x2c,
-	0x0c, 0x25, 0x2e, 0xfd, 0xc8, 0x5f, 0xd1, 0x58, 0x1f, 0xbc, 0x0e, 0x61, 0x99, 0x27, 0x59, 0x0c,
-	0x9f, 0x40, 0x3f, 0x84, 0x2b, 0x7d, 0x86, 0x25, 0x4c, 0x9c, 0xaa, 0x2b, 0x80, 0xc6, 0x24, 0xa6,
-	0xef, 0xc4, 0x96, 0xeb, 0xc6, 0x10, 0xe7, 0x9f, 0x0f, 0x48, 0x8a, 0x7f, 0x4b, 0x43, 0x7e, 0x50,
-	0x0d, 0x61, 0x98, 0x8e, 0x97, 0x72, 0xf4, 0xc1, 0x7f, 0xf0, 0xca, 0x4b, 0x95, 0xcc, 0x2f, 0x8e,
-	0x81, 0x16, 0xff, 0x99, 0x82, 0x29, 0x23, 0x53, 0xf7, 0xdc, 0x26, 0xb0, 0xe1, 0x1a, 0x3b, 0x52,
-	0x35, 0x44, 0x8b, 0x1c, 0xbb, 0x9a, 0xa1, 0xe3, 0xb7, 0x78, 0x06, 0x67, 0x5b, 0xe4, 0xf8, 0xa1,
-	0x15, 0x69, 0x8a, 0xd0, 0x20, 0x3d, 0x8a, 0x30, 0x90, 0x3f, 0x73, 0xe0, 0xad, 0x36, 0x91, 0xde,
-	0xd3, 0x44, 0x52, 0xb8, 0x21, 0x3d, 0xa1, 0xa1, 0xe6, 0x8b, 0xd9, 0xb5, 0xdd, 0xd7, 0xdd, 0x41,
-	0x69, 0x57, 0xc1, 0xf6, 0x33, 0x69, 0x47, 0x81, 0xe2, 0xf9, 0xf6, 0x10, 0xa9, 0x22, 0x8c, 0x41,
-	0x27, 0x34, 0xc9, 0xa4, 0xf0, 0xdc, 0x80, 0x7e, 0xf1, 0x07, 0x30, 0x3f, 0x0c, 0x18, 0x7d, 0x05,
-	0x8a, 0xbb, 0xeb, 0x87, 0x95, 0x6d, 0xb7, 0xb2, 0xbf, 0xb7, 0x59, 0xaf, 0xd6, 0xf6, 0x2a, 0x35,
-	0x77, 0xa7, 0xf6, 0xb8, 0xb6, 0xe3, 0x3e, 0xda, 0x6b, 0x1c, 0xd4, 0x2a, 0xf5, 0xcd, 0x7a, 0xad,
-	0x9a, 0xbf, 0x84, 0xa6, 0x21, 0xbd, 0xb3, 0xff, 0x49, 0xde, 0x41, 0x00, 0x53, 0xbb, 0xb5, 0x6a,
-	0xfd, 0xd1, 0x6e, 0x3e, 0x85, 0x32, 0x30, 0xb1, 0x5d, 0xdf, 0xda, 0xce, 0xa7, 0x8b, 0xbf, 0x4c,
-	0xc3, 0x72, 0x43, 0x46, 0x94, 0xb4, 0x03, 0xe6, 0x7f, 0xe1, 0x3a, 0x84, 0x77, 0x21, 0x2f, 0x02,
-	0xe6, 0x87, 0xd4, 0xed, 0x4a, 0x49, 0x23, 0xa2, 0xe2, 0x6c, 0x0a, 0xa7, 0x39, 0x23, 0x7f, 0x14,
-	0x8b, 0x2f, 0x2a, 0x3a, 0x27, 0xdf, 0x60, 0x33, 0x31, 0x75, 0xae, 0x99, 0xf8, 0xc3, 0x04, 0x5c,
-	0xbf, 0xe0, 0x34, 0xc6, 0xed, 0x2a, 0x9e, 0x01, 0x4a, 0x3e, 0xac, 0x2f, 0xf4, 0x16, 0x77, 0x47,
-	0xd3, 0x4e, 0xbc, 0x78, 0xe2, 0xe1, 0xb5, 0xcc, 0x73, 0x25, 0x1a, 0x14, 0x9d, 0xeb, 0x60, 0xd2,
-	0x6f, 0xb4, 0x83, 0x99, 0x7e, 0xb3, 0x1d, 0xcc, 0xc4, 0xeb, 0x76, 0x30, 0x93, 0xff, 0x9f, 0x0e,
-	0xe6, 0xcf, 0x29, 0x58, 0xbc, 0xf8, 0xb8, 0xd0, 0x33, 0xc8, 0xd9, 0xe2, 0x42, 0xf7, 0x00, 0x3a,
-	0x53, 0x66, 0xd7, 0xb6, 0xfe, 0x8b, 0x0c, 0x88, 0x8b, 0x0e, 0xdd, 0x17, 0x64, 0xdb, 0xfd, 0x01,
-	0xba, 0x01, 0x20, 0x23, 0xc2, 0x84, 0x17, 0x05, 0x1d, 0x69, 0xd9, 0x38, 0x21, 0x41, 0x0b, 0x90,
-	0x09, 0x84, 0xdb, 0x0a, 0x18, 0x09, 0x75, 0x8e, 0x64, 0xf0, 0x74, 0x20, 0x36, 0xd5, 0x50, 0x99,
-	0x26, 0x38, 0x70, 0x42, 0x73, 0x60, 0x42, 0x52, 0xfc, 0x2e, 0x64, 0x13, 0xcb, 0xa2, 0x65, 0x28,
-	0xec, 0xd6, 0x1a, 0x8d, 0xf5, 0xad, 0x9a, 0x7b, 0xf8, 0xbd, 0x83, 0xda, 0x00, 0xd7, 0xcd, 0x02,
-	0x1c, 0xe2, 0xf5, 0xbd, 0x46, 0x05, 0xd7, 0x0f, 0x0e, 0xf3, 0x0e, 0x5a, 0x82, 0x6b, 0xb5, 0xbd,
-	0xaa, 0xbb, 0xbf, 0xe9, 0x36, 0xea, 0x7b, 0x5b, 0x3b, 0x35, 0xf7, 0xd1, 0xe1, 0x61, 0x0d, 0xaf,
-	0xef, 0x55, 0x6a, 0xf9, 0x54, 0xb1, 0x0a, 0x33, 0xbd, 0xfa, 0x19, 0x21, 0x5b, 0x79, 0x9b, 0xfb,
-	0x64, 0x6a, 0xe9, 0x73, 0xe5, 0x6c, 0xea, 0x7c, 0x39, 0x5b, 0xfc, 0x09, 0x40, 0xbf, 0x84, 0x56,
-	0x30, 0xaa, 0xaf, 0x89, 0x61, 0xd4, 0xff, 0x81, 0xa2, 0x34, 0x35, 0x7e, 0x51, 0x7a, 0x6e, 0xfd,
-	0xf4, 0x90, 0xf5, 0x09, 0xdc, 0x78, 0x79, 0x6f, 0x83, 0xee, 0xc3, 0xb2, 0x2e, 0x42, 0x3e, 0x8b,
-	0xef, 0x93, 0xda, 0x9c, 0xdb, 0x2b, 0x23, 0xb4, 0xaf, 0x19, 0xbc, 0x60, 0x75, 0x1e, 0xc6, 0xd5,
-	0x7c, 0x0f, 0xb5, 0x78, 0x0a, 0xd7, 0x2e, 0xa8, 0x46, 0xd0, 0xf7, 0x61, 0xfe, 0x42, 0xcc, 0x71,
-	0x1a, 0x98, 0x1e, 0x2e, 0x46, 0xc7, 0xe7, 0x17, 0xbe, 0x0f, 0x33, 0xbd, 0x01, 0x9a, 0x87, 0x49,
-	0xe1, 0xf1, 0xc8, 0xc4, 0x36, 0x85, 0xcd, 0x00, 0x2d, 0xc3, 0x4c, 0x9b, 0xa8, 0x2c, 0xed, 0x36,
-	0xe3, 0xce, 0xa1, 0x2f, 0x58, 0xfb, 0x4b, 0x1a, 0x32, 0xb6, 0xa5, 0x15, 0xe8, 0xb7, 0x29, 0xc8,
-	0x25, 0x29, 0x15, 0x7d, 0x63, 0xa4, 0x7b, 0x43, 0xde, 0xc3, 0xc5, 0x6f, 0xbe, 0xa2, 0x95, 0x21,
-	0xe6, 0xe2, 0xef, 0x9c, 0x9f, 0xfe, 0xf5, 0x1f, 0xbf, 0x4a, 0xfd, 0xda, 0x29, 0xde, 0xed, 0x7d,
-	0xff, 0xfb, 0x91, 0x7d, 0x49, 0xef, 0x75, 0x22, 0xfe, 0x8c, 0x7a, 0x52, 0x94, 0x6f, 0x99, 0x2f,
-	0x9a, 0xf1, 0x97, 0x41, 0x51, 0xbe, 0xf5, 0xe3, 0x8f, 0x9a, 0x09, 0xb8, 0x8f, 0x9c, 0x5b, 0x4f,
-	0x3e, 0x29, 0xe2, 0x31, 0x10, 0x28, 0x3b, 0x09, 0x22, 0xce, 0x54, 0xe8, 0x94, 0xb0, 0x2b, 0x68,
-	0xa4, 0x7e, 0x5f, 0x02, 0x8c, 0x7e, 0xe3, 0xc0, 0x97, 0x86, 0x3e, 0x3e, 0xe8, 0xde, 0xf8, 0xac,
-	0x31, 0x2c, 0x64, 0x1f, 0xbf, 0xae, 0xb9, 0x8d, 0xdd, 0xa5, 0x55, 0xe7, 0xb6, 0xb3, 0xf1, 0xb9,
-	0x03, 0xef, 0x78, 0xbc, 0x3d, 0x0a, 0x6b, 0x23, 0x67, 0x4f, 0xfc, 0x40, 0x5d, 0xad, 0x03, 0xe7,
-	0x49, 0xdd, 0x1a, 0xf8, 0x5c, 0x5d, 0x9c, 0x12, 0x8f, 0xfc, 0xb2, 0x4f, 0x99, 0xbe, 0x78, 0x65,
-	0x33, 0x45, 0x3a, 0x81, 0xb8, 0xf0, 0x2b, 0xed, 0xdd, 0xbe, 0xe8, 0xdf, 0x8e, 0xf3, 0xfb, 0x54,
-	0xaa, 0xba, 0xf9, 0x79, 0xea, 0xe6, 0x96, 0xc1, 0xac, 0x68, 0x27, 0xaa, 0x7d, 0x27, 0x1e, 0x1b,
-	0xa3, 0xa3, 0x29, 0x8d, 0xff, 0xf5, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x80, 0x80, 0x30,
-	0x4b, 0x17, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go b/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
index b8b1032882..25a3d9cf99 100644
--- a/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/session_entity_type.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dialogflow
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The types of modifications for a session entity type.
 type SessionEntityType_EntityOverrideMode int32
@@ -52,6 +52,7 @@ var SessionEntityType_EntityOverrideMode_name = map[int32]string{
 	1: "ENTITY_OVERRIDE_MODE_OVERRIDE",
 	2: "ENTITY_OVERRIDE_MODE_SUPPLEMENT",
 }
+
 var SessionEntityType_EntityOverrideMode_value = map[string]int32{
 	"ENTITY_OVERRIDE_MODE_UNSPECIFIED": 0,
 	"ENTITY_OVERRIDE_MODE_OVERRIDE":    1,
@@ -61,8 +62,9 @@ var SessionEntityType_EntityOverrideMode_value = map[string]int32{
 func (x SessionEntityType_EntityOverrideMode) String() string {
 	return proto.EnumName(SessionEntityType_EntityOverrideMode_name, int32(x))
 }
+
 func (SessionEntityType_EntityOverrideMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{0, 0}
+	return fileDescriptor_ea3dc39aca82329f, []int{0, 0}
 }
 
 // Represents a session entity type.
@@ -99,16 +101,17 @@ func (m *SessionEntityType) Reset()         { *m = SessionEntityType{} }
 func (m *SessionEntityType) String() string { return proto.CompactTextString(m) }
 func (*SessionEntityType) ProtoMessage()    {}
 func (*SessionEntityType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{0}
+	return fileDescriptor_ea3dc39aca82329f, []int{0}
 }
+
 func (m *SessionEntityType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SessionEntityType.Unmarshal(m, b)
 }
 func (m *SessionEntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SessionEntityType.Marshal(b, m, deterministic)
 }
-func (dst *SessionEntityType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SessionEntityType.Merge(dst, src)
+func (m *SessionEntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SessionEntityType.Merge(m, src)
 }
 func (m *SessionEntityType) XXX_Size() int {
 	return xxx_messageInfo_SessionEntityType.Size(m)
@@ -163,16 +166,17 @@ func (m *ListSessionEntityTypesRequest) Reset()         { *m = ListSessionEntity
 func (m *ListSessionEntityTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSessionEntityTypesRequest) ProtoMessage()    {}
 func (*ListSessionEntityTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{1}
+	return fileDescriptor_ea3dc39aca82329f, []int{1}
 }
+
 func (m *ListSessionEntityTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSessionEntityTypesRequest.Unmarshal(m, b)
 }
 func (m *ListSessionEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSessionEntityTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSessionEntityTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSessionEntityTypesRequest.Merge(dst, src)
+func (m *ListSessionEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesRequest.Merge(m, src)
 }
 func (m *ListSessionEntityTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSessionEntityTypesRequest.Size(m)
@@ -221,16 +225,17 @@ func (m *ListSessionEntityTypesResponse) Reset()         { *m = ListSessionEntit
 func (m *ListSessionEntityTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSessionEntityTypesResponse) ProtoMessage()    {}
 func (*ListSessionEntityTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{2}
+	return fileDescriptor_ea3dc39aca82329f, []int{2}
 }
+
 func (m *ListSessionEntityTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSessionEntityTypesResponse.Unmarshal(m, b)
 }
 func (m *ListSessionEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSessionEntityTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSessionEntityTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSessionEntityTypesResponse.Merge(dst, src)
+func (m *ListSessionEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesResponse.Merge(m, src)
 }
 func (m *ListSessionEntityTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSessionEntityTypesResponse.Size(m)
@@ -273,16 +278,17 @@ func (m *GetSessionEntityTypeRequest) Reset()         { *m = GetSessionEntityTyp
 func (m *GetSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSessionEntityTypeRequest) ProtoMessage()    {}
 func (*GetSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{3}
+	return fileDescriptor_ea3dc39aca82329f, []int{3}
 }
+
 func (m *GetSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *GetSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSessionEntityTypeRequest.Merge(dst, src)
+func (m *GetSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *GetSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSessionEntityTypeRequest.Size(m)
@@ -320,16 +326,17 @@ func (m *CreateSessionEntityTypeRequest) Reset()         { *m = CreateSessionEnt
 func (m *CreateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSessionEntityTypeRequest) ProtoMessage()    {}
 func (*CreateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{4}
+	return fileDescriptor_ea3dc39aca82329f, []int{4}
 }
+
 func (m *CreateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *CreateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSessionEntityTypeRequest.Merge(dst, src)
+func (m *CreateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *CreateSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSessionEntityTypeRequest.Size(m)
@@ -374,16 +381,17 @@ func (m *UpdateSessionEntityTypeRequest) Reset()         { *m = UpdateSessionEnt
 func (m *UpdateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSessionEntityTypeRequest) ProtoMessage()    {}
 func (*UpdateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{5}
+	return fileDescriptor_ea3dc39aca82329f, []int{5}
 }
+
 func (m *UpdateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *UpdateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSessionEntityTypeRequest.Merge(dst, src)
+func (m *UpdateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *UpdateSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Size(m)
@@ -426,16 +434,17 @@ func (m *DeleteSessionEntityTypeRequest) Reset()         { *m = DeleteSessionEnt
 func (m *DeleteSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSessionEntityTypeRequest) ProtoMessage()    {}
 func (*DeleteSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_session_entity_type_c408f12785d6eb00, []int{6}
+	return fileDescriptor_ea3dc39aca82329f, []int{6}
 }
+
 func (m *DeleteSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Unmarshal(m, b)
 }
 func (m *DeleteSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSessionEntityTypeRequest.Merge(dst, src)
+func (m *DeleteSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSessionEntityTypeRequest.Merge(m, src)
 }
 func (m *DeleteSessionEntityTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Size(m)
@@ -454,6 +463,7 @@ func (m *DeleteSessionEntityTypeRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.SessionEntityType_EntityOverrideMode", SessionEntityType_EntityOverrideMode_name, SessionEntityType_EntityOverrideMode_value)
 	proto.RegisterType((*SessionEntityType)(nil), "google.cloud.dialogflow.v2beta1.SessionEntityType")
 	proto.RegisterType((*ListSessionEntityTypesRequest)(nil), "google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest")
 	proto.RegisterType((*ListSessionEntityTypesResponse)(nil), "google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse")
@@ -461,7 +471,70 @@ func init() {
 	proto.RegisterType((*CreateSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest")
 	proto.RegisterType((*UpdateSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest")
 	proto.RegisterType((*DeleteSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest")
-	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.SessionEntityType_EntityOverrideMode", SessionEntityType_EntityOverrideMode_name, SessionEntityType_EntityOverrideMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/session_entity_type.proto", fileDescriptor_ea3dc39aca82329f)
+}
+
+var fileDescriptor_ea3dc39aca82329f = []byte{
+	// 882 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
+	0x14, 0x66, 0x5c, 0x58, 0xed, 0xce, 0xf2, 0xa3, 0x3b, 0x54, 0x69, 0x70, 0x69, 0x1a, 0xbc, 0x08,
+	0x55, 0x39, 0xd8, 0x6a, 0xe0, 0xb2, 0x2c, 0x3f, 0xa4, 0x6d, 0xdc, 0x55, 0xa4, 0x4d, 0x1a, 0x39,
+	0xe9, 0x4a, 0xf4, 0x62, 0x39, 0xf1, 0xab, 0x65, 0x9a, 0xcc, 0x18, 0xcf, 0xa4, 0x4b, 0x76, 0xb5,
+	0x97, 0xbd, 0x72, 0xe0, 0x80, 0xc4, 0x89, 0x0b, 0x1c, 0x39, 0x70, 0x40, 0x5c, 0xb8, 0xc1, 0x99,
+	0x13, 0xe2, 0x2f, 0x40, 0xe2, 0xc0, 0x3f, 0x80, 0x04, 0x37, 0xe4, 0xb1, 0xd3, 0x94, 0xfa, 0x57,
+	0x1b, 0x7a, 0x8a, 0x3d, 0x33, 0xef, 0xbd, 0xef, 0xfb, 0xfc, 0xde, 0x97, 0xc1, 0x77, 0x3c, 0xc6,
+	0xbc, 0x31, 0x18, 0xa3, 0x31, 0x9b, 0xba, 0x86, 0xeb, 0x3b, 0x63, 0xe6, 0x1d, 0x8d, 0xd9, 0x23,
+	0xe3, 0xa4, 0x39, 0x04, 0xe1, 0xec, 0x18, 0x1c, 0x38, 0xf7, 0x19, 0xb5, 0x81, 0x0a, 0x5f, 0xcc,
+	0x6c, 0x31, 0x0b, 0x40, 0x0f, 0x42, 0x26, 0x18, 0xd9, 0x8a, 0x43, 0x75, 0x19, 0xaa, 0x2f, 0x42,
+	0xf5, 0x24, 0x54, 0x7d, 0x3d, 0xc9, 0xed, 0x04, 0xbe, 0xe1, 0x50, 0xca, 0x84, 0x23, 0x7c, 0x46,
+	0x79, 0x1c, 0xae, 0xbe, 0x76, 0x66, 0x37, 0x04, 0xce, 0xa6, 0xe1, 0x28, 0xc9, 0xac, 0xee, 0x94,
+	0x81, 0x4a, 0x81, 0x51, 0x37, 0x92, 0x10, 0xf9, 0x36, 0x9c, 0x1e, 0x19, 0x30, 0x09, 0xc4, 0x2c,
+	0xd9, 0xac, 0x9f, 0xdf, 0x3c, 0xf2, 0x61, 0xec, 0xda, 0x13, 0x87, 0x1f, 0xc7, 0x27, 0xb4, 0xbf,
+	0x14, 0x7c, 0xab, 0x1f, 0x33, 0x35, 0x65, 0xee, 0xc1, 0x2c, 0x00, 0x42, 0xf0, 0xf3, 0xd4, 0x99,
+	0x40, 0x15, 0xd5, 0xd1, 0xf6, 0x0d, 0x4b, 0x3e, 0x93, 0x47, 0x78, 0x2d, 0xa9, 0xce, 0x4e, 0x20,
+	0x0c, 0x7d, 0x17, 0xec, 0x09, 0x73, 0xa1, 0xaa, 0xd4, 0xd1, 0xf6, 0xcb, 0x4d, 0x53, 0x2f, 0x11,
+	0x45, 0x4f, 0x55, 0xd1, 0xe3, 0xc7, 0xfd, 0x24, 0x5b, 0x87, 0xb9, 0x60, 0x11, 0x48, 0xad, 0x91,
+	0x2e, 0xbe, 0x2e, 0x57, 0x7d, 0xe0, 0xd5, 0x95, 0xfa, 0xca, 0xf6, 0xcd, 0x66, 0xb3, 0xb4, 0x58,
+	0xaa, 0x8a, 0x75, 0x9a, 0x43, 0x7b, 0x86, 0x30, 0x49, 0x97, 0x26, 0x6f, 0xe2, 0xba, 0xd9, 0x1d,
+	0xb4, 0x07, 0x1f, 0xd9, 0xfb, 0x0f, 0x4d, 0xcb, 0x6a, 0xb7, 0x4c, 0xbb, 0xb3, 0xdf, 0x32, 0xed,
+	0x83, 0x6e, 0xbf, 0x67, 0xee, 0xb6, 0xf7, 0xda, 0x66, 0x6b, 0xf5, 0x39, 0xf2, 0x06, 0xde, 0xcc,
+	0x3c, 0x35, 0x7f, 0x5b, 0x45, 0xe4, 0x36, 0xde, 0xca, 0x3c, 0xd2, 0x3f, 0xe8, 0xf5, 0x1e, 0x98,
+	0x1d, 0xb3, 0x3b, 0x58, 0x55, 0x34, 0x8e, 0x37, 0x1f, 0xf8, 0x5c, 0xa4, 0x44, 0xe1, 0x16, 0x7c,
+	0x32, 0x05, 0x2e, 0x48, 0x05, 0x5f, 0x0b, 0x9c, 0x10, 0xa8, 0x48, 0x3e, 0x42, 0xf2, 0x46, 0x36,
+	0xf0, 0x8d, 0xc0, 0xf1, 0xc0, 0xe6, 0xfe, 0xe3, 0x58, 0xfb, 0x17, 0xac, 0xeb, 0xd1, 0x42, 0xdf,
+	0x7f, 0x0c, 0x64, 0x13, 0x63, 0xb9, 0x29, 0xd8, 0x31, 0xd0, 0xea, 0x8a, 0x0c, 0x94, 0xc7, 0x07,
+	0xd1, 0x82, 0xf6, 0x1d, 0xc2, 0xb5, 0xbc, 0xaa, 0x3c, 0x60, 0x94, 0x03, 0x71, 0xf1, 0x5a, 0x46,
+	0xe3, 0xf3, 0x2a, 0xba, 0xa0, 0xf0, 0xa9, 0xd4, 0x16, 0xe1, 0xa9, 0x6a, 0xe4, 0x2d, 0xfc, 0x0a,
+	0x85, 0x4f, 0x85, 0x7d, 0x06, 0xac, 0x22, 0xc1, 0xbe, 0x14, 0x2d, 0xf7, 0x4e, 0x01, 0xef, 0xe0,
+	0x8d, 0xfb, 0x90, 0x86, 0x3b, 0xd7, 0x28, 0xa3, 0x4d, 0xb5, 0xaf, 0x10, 0xae, 0xed, 0x86, 0xe0,
+	0x08, 0xc8, 0x0d, 0xcb, 0x93, 0x76, 0x88, 0x5f, 0xcd, 0xe0, 0x2e, 0x91, 0x2d, 0x47, 0xfd, 0x56,
+	0x8a, 0xba, 0xf6, 0x33, 0xc2, 0xb5, 0x83, 0xc0, 0x2d, 0x82, 0x97, 0x03, 0x03, 0x5d, 0x21, 0x0c,
+	0x72, 0x17, 0xdf, 0x9c, 0x4a, 0x14, 0xd2, 0x0b, 0x12, 0x8a, 0xea, 0x3c, 0xf7, 0xdc, 0x2e, 0xf4,
+	0xbd, 0xc8, 0x2e, 0x3a, 0x0e, 0x3f, 0xb6, 0x70, 0x7c, 0x3c, 0x7a, 0xd6, 0xde, 0xc1, 0xb5, 0x16,
+	0x8c, 0xa1, 0x80, 0x42, 0xc6, 0x87, 0x69, 0xfe, 0xf2, 0x22, 0x26, 0xe9, 0xc6, 0x23, 0xdf, 0x2b,
+	0xb8, 0x92, 0xdd, 0x93, 0xe4, 0x83, 0x52, 0xae, 0x85, 0x23, 0xa4, 0x7e, 0xb8, 0x74, 0x7c, 0x3c,
+	0x0c, 0xda, 0x97, 0xe8, 0xd9, 0x6f, 0x7f, 0x7c, 0xa1, 0x7c, 0x8e, 0xc8, 0x9d, 0x53, 0x07, 0x7e,
+	0x12, 0x37, 0xcb, 0xfb, 0x41, 0xc8, 0x3e, 0x86, 0x91, 0xe0, 0x46, 0xc3, 0x70, 0x3c, 0xa0, 0x62,
+	0xfe, 0x7f, 0xc1, 0x8d, 0xc6, 0xd3, 0xc4, 0xa6, 0x65, 0xb2, 0x43, 0x8b, 0xf4, 0xca, 0x83, 0x81,
+	0x9e, 0xf8, 0x21, 0xa3, 0x13, 0xa0, 0x72, 0x71, 0xca, 0x21, 0x8c, 0x7e, 0x73, 0x72, 0x92, 0xaf,
+	0x15, 0xbc, 0x96, 0x35, 0x18, 0xe4, 0xbd, 0x52, 0xca, 0x05, 0xf3, 0xa4, 0x2e, 0xd1, 0x5c, 0xd9,
+	0x1a, 0x45, 0x1f, 0xbc, 0x48, 0xa1, 0xb3, 0x64, 0x8c, 0xc6, 0xd3, 0xff, 0x6a, 0x94, 0x1d, 0x5c,
+	0xaa, 0xd0, 0xb9, 0x9c, 0xe4, 0x57, 0x05, 0xaf, 0xe7, 0x18, 0x01, 0x29, 0xef, 0x8c, 0x62, 0x0b,
+	0x59, 0x4a, 0xa9, 0x9f, 0x62, 0xa5, 0x7e, 0x44, 0xda, 0xf2, 0xdd, 0xf4, 0x6e, 0x96, 0x35, 0x1c,
+	0x7a, 0xda, 0x95, 0xb7, 0x58, 0x66, 0x21, 0xf2, 0x8f, 0x82, 0xd7, 0x73, 0xdc, 0xeb, 0x02, 0x9a,
+	0x16, 0xfb, 0xde, 0x52, 0x9a, 0xfe, 0x19, 0x6b, 0xfa, 0x3b, 0x6a, 0x76, 0x16, 0x0a, 0x64, 0xdd,
+	0xdc, 0x2e, 0xd9, 0x91, 0xd9, 0x3a, 0x3f, 0x69, 0xba, 0xcb, 0x54, 0xb9, 0x6c, 0xeb, 0x66, 0x6b,
+	0xff, 0x99, 0x82, 0xd7, 0x73, 0x6c, 0xf7, 0x02, 0xda, 0x17, 0x1b, 0xb6, 0x5a, 0x49, 0x59, 0xbf,
+	0x19, 0x5d, 0x23, 0x17, 0xd3, 0xdd, 0xf8, 0x3f, 0xd3, 0xdd, 0xb8, 0xf2, 0xe9, 0xbe, 0xf7, 0x03,
+	0xc2, 0xb7, 0x47, 0x6c, 0x52, 0xc6, 0xfb, 0x5e, 0x25, 0x45, 0xb9, 0x17, 0x31, 0xec, 0xa1, 0xc3,
+	0x76, 0x12, 0xea, 0xb1, 0xb1, 0x43, 0x3d, 0x9d, 0x85, 0x9e, 0xe1, 0x01, 0x95, 0xfc, 0x8d, 0x78,
+	0xcb, 0x09, 0x7c, 0x9e, 0x7b, 0x15, 0xbf, 0xbb, 0x58, 0xfa, 0x1b, 0xa1, 0x6f, 0x14, 0xa5, 0xb5,
+	0xf7, 0xad, 0xb2, 0x75, 0x3f, 0xce, 0xb9, 0x2b, 0xe1, 0xb4, 0x16, 0x70, 0x1e, 0xc6, 0x41, 0xc3,
+	0x6b, 0x32, 0xff, 0xdb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x6d, 0x34, 0x40, 0x7e, 0x0c,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -683,67 +756,3 @@ var _SessionEntityTypes_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/dialogflow/v2beta1/session_entity_type.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/session_entity_type.proto", fileDescriptor_session_entity_type_c408f12785d6eb00)
-}
-
-var fileDescriptor_session_entity_type_c408f12785d6eb00 = []byte{
-	// 882 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
-	0x14, 0x66, 0x5c, 0x58, 0xed, 0xce, 0xf2, 0xa3, 0x3b, 0x54, 0x69, 0x70, 0x69, 0x1a, 0xbc, 0x08,
-	0x55, 0x39, 0xd8, 0x6a, 0xe0, 0xb2, 0x2c, 0x3f, 0xa4, 0x6d, 0xdc, 0x55, 0xa4, 0x4d, 0x1a, 0x39,
-	0xe9, 0x4a, 0xf4, 0x62, 0x39, 0xf1, 0xab, 0x65, 0x9a, 0xcc, 0x18, 0xcf, 0xa4, 0x4b, 0x76, 0xb5,
-	0x97, 0xbd, 0x72, 0xe0, 0x80, 0xc4, 0x89, 0x0b, 0x1c, 0x39, 0x70, 0x40, 0x5c, 0xb8, 0xc1, 0x99,
-	0x13, 0xe2, 0x2f, 0x40, 0xe2, 0xc0, 0x3f, 0x80, 0x04, 0x37, 0xe4, 0xb1, 0xd3, 0x94, 0xfa, 0x57,
-	0x1b, 0x7a, 0x8a, 0x3d, 0x33, 0xef, 0xbd, 0xef, 0xfb, 0xfc, 0xde, 0x97, 0xc1, 0x77, 0x3c, 0xc6,
-	0xbc, 0x31, 0x18, 0xa3, 0x31, 0x9b, 0xba, 0x86, 0xeb, 0x3b, 0x63, 0xe6, 0x1d, 0x8d, 0xd9, 0x23,
-	0xe3, 0xa4, 0x39, 0x04, 0xe1, 0xec, 0x18, 0x1c, 0x38, 0xf7, 0x19, 0xb5, 0x81, 0x0a, 0x5f, 0xcc,
-	0x6c, 0x31, 0x0b, 0x40, 0x0f, 0x42, 0x26, 0x18, 0xd9, 0x8a, 0x43, 0x75, 0x19, 0xaa, 0x2f, 0x42,
-	0xf5, 0x24, 0x54, 0x7d, 0x3d, 0xc9, 0xed, 0x04, 0xbe, 0xe1, 0x50, 0xca, 0x84, 0x23, 0x7c, 0x46,
-	0x79, 0x1c, 0xae, 0xbe, 0x76, 0x66, 0x37, 0x04, 0xce, 0xa6, 0xe1, 0x28, 0xc9, 0xac, 0xee, 0x94,
-	0x81, 0x4a, 0x81, 0x51, 0x37, 0x92, 0x10, 0xf9, 0x36, 0x9c, 0x1e, 0x19, 0x30, 0x09, 0xc4, 0x2c,
-	0xd9, 0xac, 0x9f, 0xdf, 0x3c, 0xf2, 0x61, 0xec, 0xda, 0x13, 0x87, 0x1f, 0xc7, 0x27, 0xb4, 0xbf,
-	0x14, 0x7c, 0xab, 0x1f, 0x33, 0x35, 0x65, 0xee, 0xc1, 0x2c, 0x00, 0x42, 0xf0, 0xf3, 0xd4, 0x99,
-	0x40, 0x15, 0xd5, 0xd1, 0xf6, 0x0d, 0x4b, 0x3e, 0x93, 0x47, 0x78, 0x2d, 0xa9, 0xce, 0x4e, 0x20,
-	0x0c, 0x7d, 0x17, 0xec, 0x09, 0x73, 0xa1, 0xaa, 0xd4, 0xd1, 0xf6, 0xcb, 0x4d, 0x53, 0x2f, 0x11,
-	0x45, 0x4f, 0x55, 0xd1, 0xe3, 0xc7, 0xfd, 0x24, 0x5b, 0x87, 0xb9, 0x60, 0x11, 0x48, 0xad, 0x91,
-	0x2e, 0xbe, 0x2e, 0x57, 0x7d, 0xe0, 0xd5, 0x95, 0xfa, 0xca, 0xf6, 0xcd, 0x66, 0xb3, 0xb4, 0x58,
-	0xaa, 0x8a, 0x75, 0x9a, 0x43, 0x7b, 0x86, 0x30, 0x49, 0x97, 0x26, 0x6f, 0xe2, 0xba, 0xd9, 0x1d,
-	0xb4, 0x07, 0x1f, 0xd9, 0xfb, 0x0f, 0x4d, 0xcb, 0x6a, 0xb7, 0x4c, 0xbb, 0xb3, 0xdf, 0x32, 0xed,
-	0x83, 0x6e, 0xbf, 0x67, 0xee, 0xb6, 0xf7, 0xda, 0x66, 0x6b, 0xf5, 0x39, 0xf2, 0x06, 0xde, 0xcc,
-	0x3c, 0x35, 0x7f, 0x5b, 0x45, 0xe4, 0x36, 0xde, 0xca, 0x3c, 0xd2, 0x3f, 0xe8, 0xf5, 0x1e, 0x98,
-	0x1d, 0xb3, 0x3b, 0x58, 0x55, 0x34, 0x8e, 0x37, 0x1f, 0xf8, 0x5c, 0xa4, 0x44, 0xe1, 0x16, 0x7c,
-	0x32, 0x05, 0x2e, 0x48, 0x05, 0x5f, 0x0b, 0x9c, 0x10, 0xa8, 0x48, 0x3e, 0x42, 0xf2, 0x46, 0x36,
-	0xf0, 0x8d, 0xc0, 0xf1, 0xc0, 0xe6, 0xfe, 0xe3, 0x58, 0xfb, 0x17, 0xac, 0xeb, 0xd1, 0x42, 0xdf,
-	0x7f, 0x0c, 0x64, 0x13, 0x63, 0xb9, 0x29, 0xd8, 0x31, 0xd0, 0xea, 0x8a, 0x0c, 0x94, 0xc7, 0x07,
-	0xd1, 0x82, 0xf6, 0x1d, 0xc2, 0xb5, 0xbc, 0xaa, 0x3c, 0x60, 0x94, 0x03, 0x71, 0xf1, 0x5a, 0x46,
-	0xe3, 0xf3, 0x2a, 0xba, 0xa0, 0xf0, 0xa9, 0xd4, 0x16, 0xe1, 0xa9, 0x6a, 0xe4, 0x2d, 0xfc, 0x0a,
-	0x85, 0x4f, 0x85, 0x7d, 0x06, 0xac, 0x22, 0xc1, 0xbe, 0x14, 0x2d, 0xf7, 0x4e, 0x01, 0xef, 0xe0,
-	0x8d, 0xfb, 0x90, 0x86, 0x3b, 0xd7, 0x28, 0xa3, 0x4d, 0xb5, 0xaf, 0x10, 0xae, 0xed, 0x86, 0xe0,
-	0x08, 0xc8, 0x0d, 0xcb, 0x93, 0x76, 0x88, 0x5f, 0xcd, 0xe0, 0x2e, 0x91, 0x2d, 0x47, 0xfd, 0x56,
-	0x8a, 0xba, 0xf6, 0x33, 0xc2, 0xb5, 0x83, 0xc0, 0x2d, 0x82, 0x97, 0x03, 0x03, 0x5d, 0x21, 0x0c,
-	0x72, 0x17, 0xdf, 0x9c, 0x4a, 0x14, 0xd2, 0x0b, 0x12, 0x8a, 0xea, 0x3c, 0xf7, 0xdc, 0x2e, 0xf4,
-	0xbd, 0xc8, 0x2e, 0x3a, 0x0e, 0x3f, 0xb6, 0x70, 0x7c, 0x3c, 0x7a, 0xd6, 0xde, 0xc1, 0xb5, 0x16,
-	0x8c, 0xa1, 0x80, 0x42, 0xc6, 0x87, 0x69, 0xfe, 0xf2, 0x22, 0x26, 0xe9, 0xc6, 0x23, 0xdf, 0x2b,
-	0xb8, 0x92, 0xdd, 0x93, 0xe4, 0x83, 0x52, 0xae, 0x85, 0x23, 0xa4, 0x7e, 0xb8, 0x74, 0x7c, 0x3c,
-	0x0c, 0xda, 0x97, 0xe8, 0xd9, 0x6f, 0x7f, 0x7c, 0xa1, 0x7c, 0x8e, 0xc8, 0x9d, 0x53, 0x07, 0x7e,
-	0x12, 0x37, 0xcb, 0xfb, 0x41, 0xc8, 0x3e, 0x86, 0x91, 0xe0, 0x46, 0xc3, 0x70, 0x3c, 0xa0, 0x62,
-	0xfe, 0x7f, 0xc1, 0x8d, 0xc6, 0xd3, 0xc4, 0xa6, 0x65, 0xb2, 0x43, 0x8b, 0xf4, 0xca, 0x83, 0x81,
-	0x9e, 0xf8, 0x21, 0xa3, 0x13, 0xa0, 0x72, 0x71, 0xca, 0x21, 0x8c, 0x7e, 0x73, 0x72, 0x92, 0xaf,
-	0x15, 0xbc, 0x96, 0x35, 0x18, 0xe4, 0xbd, 0x52, 0xca, 0x05, 0xf3, 0xa4, 0x2e, 0xd1, 0x5c, 0xd9,
-	0x1a, 0x45, 0x1f, 0xbc, 0x48, 0xa1, 0xb3, 0x64, 0x8c, 0xc6, 0xd3, 0xff, 0x6a, 0x94, 0x1d, 0x5c,
-	0xaa, 0xd0, 0xb9, 0x9c, 0xe4, 0x57, 0x05, 0xaf, 0xe7, 0x18, 0x01, 0x29, 0xef, 0x8c, 0x62, 0x0b,
-	0x59, 0x4a, 0xa9, 0x9f, 0x62, 0xa5, 0x7e, 0x44, 0xda, 0xf2, 0xdd, 0xf4, 0x6e, 0x96, 0x35, 0x1c,
-	0x7a, 0xda, 0x95, 0xb7, 0x58, 0x66, 0x21, 0xf2, 0x8f, 0x82, 0xd7, 0x73, 0xdc, 0xeb, 0x02, 0x9a,
-	0x16, 0xfb, 0xde, 0x52, 0x9a, 0xfe, 0x19, 0x6b, 0xfa, 0x3b, 0x6a, 0x76, 0x16, 0x0a, 0x64, 0xdd,
-	0xdc, 0x2e, 0xd9, 0x91, 0xd9, 0x3a, 0x3f, 0x69, 0xba, 0xcb, 0x54, 0xb9, 0x6c, 0xeb, 0x66, 0x6b,
-	0xff, 0x99, 0x82, 0xd7, 0x73, 0x6c, 0xf7, 0x02, 0xda, 0x17, 0x1b, 0xb6, 0x5a, 0x49, 0x59, 0xbf,
-	0x19, 0x5d, 0x23, 0x17, 0xd3, 0xdd, 0xf8, 0x3f, 0xd3, 0xdd, 0xb8, 0xf2, 0xe9, 0xbe, 0xf7, 0x03,
-	0xc2, 0xb7, 0x47, 0x6c, 0x52, 0xc6, 0xfb, 0x5e, 0x25, 0x45, 0xb9, 0x17, 0x31, 0xec, 0xa1, 0xc3,
-	0x76, 0x12, 0xea, 0xb1, 0xb1, 0x43, 0x3d, 0x9d, 0x85, 0x9e, 0xe1, 0x01, 0x95, 0xfc, 0x8d, 0x78,
-	0xcb, 0x09, 0x7c, 0x9e, 0x7b, 0x15, 0xbf, 0xbb, 0x58, 0xfa, 0x1b, 0xa1, 0x6f, 0x14, 0xa5, 0xb5,
-	0xf7, 0xad, 0xb2, 0x75, 0x3f, 0xce, 0xb9, 0x2b, 0xe1, 0xb4, 0x16, 0x70, 0x1e, 0xc6, 0x41, 0xc3,
-	0x6b, 0x32, 0xff, 0xdb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x6d, 0x34, 0x40, 0x7e, 0x0c,
-	0x00, 0x00,
-}
diff --git a/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go b/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
index d267de1b0c..1ceb23cc03 100644
--- a/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
+++ b/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/webhook.proto
 
-package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
+package dialogflow
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The request message for a webhook call.
 type WebhookRequest struct {
@@ -48,16 +51,17 @@ func (m *WebhookRequest) Reset()         { *m = WebhookRequest{} }
 func (m *WebhookRequest) String() string { return proto.CompactTextString(m) }
 func (*WebhookRequest) ProtoMessage()    {}
 func (*WebhookRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webhook_1f28c13c6ad471f2, []int{0}
+	return fileDescriptor_e44190e355d0ffbc, []int{0}
 }
+
 func (m *WebhookRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebhookRequest.Unmarshal(m, b)
 }
 func (m *WebhookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebhookRequest.Marshal(b, m, deterministic)
 }
-func (dst *WebhookRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebhookRequest.Merge(dst, src)
+func (m *WebhookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookRequest.Merge(m, src)
 }
 func (m *WebhookRequest) XXX_Size() int {
 	return xxx_messageInfo_WebhookRequest.Size(m)
@@ -156,16 +160,17 @@ func (m *WebhookResponse) Reset()         { *m = WebhookResponse{} }
 func (m *WebhookResponse) String() string { return proto.CompactTextString(m) }
 func (*WebhookResponse) ProtoMessage()    {}
 func (*WebhookResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webhook_1f28c13c6ad471f2, []int{1}
+	return fileDescriptor_e44190e355d0ffbc, []int{1}
 }
+
 func (m *WebhookResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebhookResponse.Unmarshal(m, b)
 }
 func (m *WebhookResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebhookResponse.Marshal(b, m, deterministic)
 }
-func (dst *WebhookResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebhookResponse.Merge(dst, src)
+func (m *WebhookResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookResponse.Merge(m, src)
 }
 func (m *WebhookResponse) XXX_Size() int {
 	return xxx_messageInfo_WebhookResponse.Size(m)
@@ -257,16 +262,17 @@ func (m *OriginalDetectIntentRequest) Reset()         { *m = OriginalDetectInten
 func (m *OriginalDetectIntentRequest) String() string { return proto.CompactTextString(m) }
 func (*OriginalDetectIntentRequest) ProtoMessage()    {}
 func (*OriginalDetectIntentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webhook_1f28c13c6ad471f2, []int{2}
+	return fileDescriptor_e44190e355d0ffbc, []int{2}
 }
+
 func (m *OriginalDetectIntentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OriginalDetectIntentRequest.Unmarshal(m, b)
 }
 func (m *OriginalDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OriginalDetectIntentRequest.Marshal(b, m, deterministic)
 }
-func (dst *OriginalDetectIntentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OriginalDetectIntentRequest.Merge(dst, src)
+func (m *OriginalDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OriginalDetectIntentRequest.Merge(m, src)
 }
 func (m *OriginalDetectIntentRequest) XXX_Size() int {
 	return xxx_messageInfo_OriginalDetectIntentRequest.Size(m)
@@ -305,10 +311,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/webhook.proto", fileDescriptor_webhook_1f28c13c6ad471f2)
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/webhook.proto", fileDescriptor_e44190e355d0ffbc)
 }
 
-var fileDescriptor_webhook_1f28c13c6ad471f2 = []byte{
+var fileDescriptor_e44190e355d0ffbc = []byte{
 	// 617 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4d, 0x6f, 0xd4, 0x30,
 	0x10, 0x55, 0x76, 0xa1, 0x1f, 0xde, 0xaa, 0x8b, 0x4c, 0x45, 0x43, 0x8b, 0xe8, 0xaa, 0x1c, 0x58,
diff --git a/googleapis/cloud/functions/v1beta2/functions.pb.go b/googleapis/cloud/functions/v1beta2/functions.pb.go
index 3bf78efb03..830f577cd9 100644
--- a/googleapis/cloud/functions/v1beta2/functions.pb.go
+++ b/googleapis/cloud/functions/v1beta2/functions.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/functions/v1beta2/functions.proto
 
-package functions // import "google.golang.org/genproto/googleapis/cloud/functions/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package functions
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes the current stage of a deployment.
 type CloudFunctionStatus int32
@@ -52,6 +52,7 @@ var CloudFunctionStatus_name = map[int32]string{
 	3: "DEPLOYING",
 	4: "DELETING",
 }
+
 var CloudFunctionStatus_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"READY":              1,
@@ -63,8 +64,9 @@ var CloudFunctionStatus_value = map[string]int32{
 func (x CloudFunctionStatus) String() string {
 	return proto.EnumName(CloudFunctionStatus_name, int32(x))
 }
+
 func (CloudFunctionStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{0}
+	return fileDescriptor_61af63f3568f8edb, []int{0}
 }
 
 // Describes a Cloud Function that contains user computation executed in
@@ -118,16 +120,17 @@ func (m *CloudFunction) Reset()         { *m = CloudFunction{} }
 func (m *CloudFunction) String() string { return proto.CompactTextString(m) }
 func (*CloudFunction) ProtoMessage()    {}
 func (*CloudFunction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{0}
+	return fileDescriptor_61af63f3568f8edb, []int{0}
 }
+
 func (m *CloudFunction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudFunction.Unmarshal(m, b)
 }
 func (m *CloudFunction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudFunction.Marshal(b, m, deterministic)
 }
-func (dst *CloudFunction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudFunction.Merge(dst, src)
+func (m *CloudFunction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudFunction.Merge(m, src)
 }
 func (m *CloudFunction) XXX_Size() int {
 	return xxx_messageInfo_CloudFunction.Size(m)
@@ -268,9 +271,9 @@ func (m *CloudFunction) GetUpdateTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CloudFunction) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CloudFunction_OneofMarshaler, _CloudFunction_OneofUnmarshaler, _CloudFunction_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CloudFunction) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CloudFunction_SourceArchiveUrl)(nil),
 		(*CloudFunction_SourceRepository)(nil),
 		(*CloudFunction_HttpsTrigger)(nil),
@@ -278,116 +281,6 @@ func (*CloudFunction) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 	}
 }
 
-func _CloudFunction_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CloudFunction)
-	// source_code
-	switch x := m.SourceCode.(type) {
-	case *CloudFunction_SourceArchiveUrl:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.SourceArchiveUrl)
-	case *CloudFunction_SourceRepository:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SourceRepository); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CloudFunction.SourceCode has unexpected type %T", x)
-	}
-	// trigger
-	switch x := m.Trigger.(type) {
-	case *CloudFunction_HttpsTrigger:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HttpsTrigger); err != nil {
-			return err
-		}
-	case *CloudFunction_EventTrigger:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EventTrigger); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CloudFunction.Trigger has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CloudFunction_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CloudFunction)
-	switch tag {
-	case 14: // source_code.source_archive_url
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.SourceCode = &CloudFunction_SourceArchiveUrl{x}
-		return true, err
-	case 3: // source_code.source_repository
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SourceRepository)
-		err := b.DecodeMessage(msg)
-		m.SourceCode = &CloudFunction_SourceRepository{msg}
-		return true, err
-	case 6: // trigger.https_trigger
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HTTPSTrigger)
-		err := b.DecodeMessage(msg)
-		m.Trigger = &CloudFunction_HttpsTrigger{msg}
-		return true, err
-	case 12: // trigger.event_trigger
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EventTrigger)
-		err := b.DecodeMessage(msg)
-		m.Trigger = &CloudFunction_EventTrigger{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CloudFunction_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CloudFunction)
-	// source_code
-	switch x := m.SourceCode.(type) {
-	case *CloudFunction_SourceArchiveUrl:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.SourceArchiveUrl)))
-		n += len(x.SourceArchiveUrl)
-	case *CloudFunction_SourceRepository:
-		s := proto.Size(x.SourceRepository)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// trigger
-	switch x := m.Trigger.(type) {
-	case *CloudFunction_HttpsTrigger:
-		s := proto.Size(x.HttpsTrigger)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CloudFunction_EventTrigger:
-		s := proto.Size(x.EventTrigger)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Describes HTTPSTrigger, could be used to connect web hooks to function.
 type HTTPSTrigger struct {
 	// Output only. The deployed url for the function.
@@ -401,16 +294,17 @@ func (m *HTTPSTrigger) Reset()         { *m = HTTPSTrigger{} }
 func (m *HTTPSTrigger) String() string { return proto.CompactTextString(m) }
 func (*HTTPSTrigger) ProtoMessage()    {}
 func (*HTTPSTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{1}
+	return fileDescriptor_61af63f3568f8edb, []int{1}
 }
+
 func (m *HTTPSTrigger) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HTTPSTrigger.Unmarshal(m, b)
 }
 func (m *HTTPSTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HTTPSTrigger.Marshal(b, m, deterministic)
 }
-func (dst *HTTPSTrigger) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HTTPSTrigger.Merge(dst, src)
+func (m *HTTPSTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HTTPSTrigger.Merge(m, src)
 }
 func (m *HTTPSTrigger) XXX_Size() int {
 	return xxx_messageInfo_HTTPSTrigger.Size(m)
@@ -457,16 +351,17 @@ func (m *EventTrigger) Reset()         { *m = EventTrigger{} }
 func (m *EventTrigger) String() string { return proto.CompactTextString(m) }
 func (*EventTrigger) ProtoMessage()    {}
 func (*EventTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{2}
+	return fileDescriptor_61af63f3568f8edb, []int{2}
 }
+
 func (m *EventTrigger) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventTrigger.Unmarshal(m, b)
 }
 func (m *EventTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EventTrigger.Marshal(b, m, deterministic)
 }
-func (dst *EventTrigger) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventTrigger.Merge(dst, src)
+func (m *EventTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventTrigger.Merge(m, src)
 }
 func (m *EventTrigger) XXX_Size() int {
 	return xxx_messageInfo_EventTrigger.Size(m)
@@ -525,16 +420,17 @@ func (m *SourceRepository) Reset()         { *m = SourceRepository{} }
 func (m *SourceRepository) String() string { return proto.CompactTextString(m) }
 func (*SourceRepository) ProtoMessage()    {}
 func (*SourceRepository) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{3}
+	return fileDescriptor_61af63f3568f8edb, []int{3}
 }
+
 func (m *SourceRepository) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceRepository.Unmarshal(m, b)
 }
 func (m *SourceRepository) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceRepository.Marshal(b, m, deterministic)
 }
-func (dst *SourceRepository) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceRepository.Merge(dst, src)
+func (m *SourceRepository) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceRepository.Merge(m, src)
 }
 func (m *SourceRepository) XXX_Size() int {
 	return xxx_messageInfo_SourceRepository.Size(m)
@@ -616,87 +512,15 @@ func (m *SourceRepository) GetDeployedRevision() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SourceRepository) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SourceRepository_OneofMarshaler, _SourceRepository_OneofUnmarshaler, _SourceRepository_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SourceRepository) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SourceRepository_Branch)(nil),
 		(*SourceRepository_Tag)(nil),
 		(*SourceRepository_Revision)(nil),
 	}
 }
 
-func _SourceRepository_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SourceRepository)
-	// version
-	switch x := m.Version.(type) {
-	case *SourceRepository_Branch:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Branch)
-	case *SourceRepository_Tag:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Tag)
-	case *SourceRepository_Revision:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Revision)
-	case nil:
-	default:
-		return fmt.Errorf("SourceRepository.Version has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SourceRepository_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SourceRepository)
-	switch tag {
-	case 3: // version.branch
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Version = &SourceRepository_Branch{x}
-		return true, err
-	case 4: // version.tag
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Version = &SourceRepository_Tag{x}
-		return true, err
-	case 5: // version.revision
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Version = &SourceRepository_Revision{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SourceRepository_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SourceRepository)
-	// version
-	switch x := m.Version.(type) {
-	case *SourceRepository_Branch:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Branch)))
-		n += len(x.Branch)
-	case *SourceRepository_Tag:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Tag)))
-		n += len(x.Tag)
-	case *SourceRepository_Revision:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Revision)))
-		n += len(x.Revision)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request for the `CreateFunction` method.
 type CreateFunctionRequest struct {
 	// The project and location in which the function should be created, specified
@@ -713,16 +537,17 @@ func (m *CreateFunctionRequest) Reset()         { *m = CreateFunctionRequest{} }
 func (m *CreateFunctionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateFunctionRequest) ProtoMessage()    {}
 func (*CreateFunctionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{4}
+	return fileDescriptor_61af63f3568f8edb, []int{4}
 }
+
 func (m *CreateFunctionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateFunctionRequest.Unmarshal(m, b)
 }
 func (m *CreateFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateFunctionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateFunctionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateFunctionRequest.Merge(dst, src)
+func (m *CreateFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateFunctionRequest.Merge(m, src)
 }
 func (m *CreateFunctionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateFunctionRequest.Size(m)
@@ -762,16 +587,17 @@ func (m *UpdateFunctionRequest) Reset()         { *m = UpdateFunctionRequest{} }
 func (m *UpdateFunctionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateFunctionRequest) ProtoMessage()    {}
 func (*UpdateFunctionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{5}
+	return fileDescriptor_61af63f3568f8edb, []int{5}
 }
+
 func (m *UpdateFunctionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateFunctionRequest.Unmarshal(m, b)
 }
 func (m *UpdateFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateFunctionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateFunctionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateFunctionRequest.Merge(dst, src)
+func (m *UpdateFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFunctionRequest.Merge(m, src)
 }
 func (m *UpdateFunctionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateFunctionRequest.Size(m)
@@ -809,16 +635,17 @@ func (m *GetFunctionRequest) Reset()         { *m = GetFunctionRequest{} }
 func (m *GetFunctionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFunctionRequest) ProtoMessage()    {}
 func (*GetFunctionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{6}
+	return fileDescriptor_61af63f3568f8edb, []int{6}
 }
+
 func (m *GetFunctionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFunctionRequest.Unmarshal(m, b)
 }
 func (m *GetFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFunctionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFunctionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFunctionRequest.Merge(dst, src)
+func (m *GetFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFunctionRequest.Merge(m, src)
 }
 func (m *GetFunctionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFunctionRequest.Size(m)
@@ -859,16 +686,17 @@ func (m *ListFunctionsRequest) Reset()         { *m = ListFunctionsRequest{} }
 func (m *ListFunctionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFunctionsRequest) ProtoMessage()    {}
 func (*ListFunctionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{7}
+	return fileDescriptor_61af63f3568f8edb, []int{7}
 }
+
 func (m *ListFunctionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFunctionsRequest.Unmarshal(m, b)
 }
 func (m *ListFunctionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFunctionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFunctionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFunctionsRequest.Merge(dst, src)
+func (m *ListFunctionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFunctionsRequest.Merge(m, src)
 }
 func (m *ListFunctionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFunctionsRequest.Size(m)
@@ -918,16 +746,17 @@ func (m *ListFunctionsResponse) Reset()         { *m = ListFunctionsResponse{} }
 func (m *ListFunctionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFunctionsResponse) ProtoMessage()    {}
 func (*ListFunctionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{8}
+	return fileDescriptor_61af63f3568f8edb, []int{8}
 }
+
 func (m *ListFunctionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFunctionsResponse.Unmarshal(m, b)
 }
 func (m *ListFunctionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFunctionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFunctionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFunctionsResponse.Merge(dst, src)
+func (m *ListFunctionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFunctionsResponse.Merge(m, src)
 }
 func (m *ListFunctionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFunctionsResponse.Size(m)
@@ -965,16 +794,17 @@ func (m *DeleteFunctionRequest) Reset()         { *m = DeleteFunctionRequest{} }
 func (m *DeleteFunctionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteFunctionRequest) ProtoMessage()    {}
 func (*DeleteFunctionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{9}
+	return fileDescriptor_61af63f3568f8edb, []int{9}
 }
+
 func (m *DeleteFunctionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteFunctionRequest.Unmarshal(m, b)
 }
 func (m *DeleteFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteFunctionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteFunctionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteFunctionRequest.Merge(dst, src)
+func (m *DeleteFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteFunctionRequest.Merge(m, src)
 }
 func (m *DeleteFunctionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteFunctionRequest.Size(m)
@@ -1007,16 +837,17 @@ func (m *CallFunctionRequest) Reset()         { *m = CallFunctionRequest{} }
 func (m *CallFunctionRequest) String() string { return proto.CompactTextString(m) }
 func (*CallFunctionRequest) ProtoMessage()    {}
 func (*CallFunctionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{10}
+	return fileDescriptor_61af63f3568f8edb, []int{10}
 }
+
 func (m *CallFunctionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallFunctionRequest.Unmarshal(m, b)
 }
 func (m *CallFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallFunctionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CallFunctionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallFunctionRequest.Merge(dst, src)
+func (m *CallFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallFunctionRequest.Merge(m, src)
 }
 func (m *CallFunctionRequest) XXX_Size() int {
 	return xxx_messageInfo_CallFunctionRequest.Size(m)
@@ -1060,16 +891,17 @@ func (m *CallFunctionResponse) Reset()         { *m = CallFunctionResponse{} }
 func (m *CallFunctionResponse) String() string { return proto.CompactTextString(m) }
 func (*CallFunctionResponse) ProtoMessage()    {}
 func (*CallFunctionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_functions_86e4424260a7e456, []int{11}
+	return fileDescriptor_61af63f3568f8edb, []int{11}
 }
+
 func (m *CallFunctionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallFunctionResponse.Unmarshal(m, b)
 }
 func (m *CallFunctionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallFunctionResponse.Marshal(b, m, deterministic)
 }
-func (dst *CallFunctionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallFunctionResponse.Merge(dst, src)
+func (m *CallFunctionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallFunctionResponse.Merge(m, src)
 }
 func (m *CallFunctionResponse) XXX_Size() int {
 	return xxx_messageInfo_CallFunctionResponse.Size(m)
@@ -1102,6 +934,7 @@ func (m *CallFunctionResponse) GetError() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.functions.v1beta2.CloudFunctionStatus", CloudFunctionStatus_name, CloudFunctionStatus_value)
 	proto.RegisterType((*CloudFunction)(nil), "google.cloud.functions.v1beta2.CloudFunction")
 	proto.RegisterType((*HTTPSTrigger)(nil), "google.cloud.functions.v1beta2.HTTPSTrigger")
 	proto.RegisterType((*EventTrigger)(nil), "google.cloud.functions.v1beta2.EventTrigger")
@@ -1114,7 +947,90 @@ func init() {
 	proto.RegisterType((*DeleteFunctionRequest)(nil), "google.cloud.functions.v1beta2.DeleteFunctionRequest")
 	proto.RegisterType((*CallFunctionRequest)(nil), "google.cloud.functions.v1beta2.CallFunctionRequest")
 	proto.RegisterType((*CallFunctionResponse)(nil), "google.cloud.functions.v1beta2.CallFunctionResponse")
-	proto.RegisterEnum("google.cloud.functions.v1beta2.CloudFunctionStatus", CloudFunctionStatus_name, CloudFunctionStatus_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/functions/v1beta2/functions.proto", fileDescriptor_61af63f3568f8edb)
+}
+
+var fileDescriptor_61af63f3568f8edb = []byte{
+	// 1216 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4d, 0x73, 0xdb, 0x44,
+	0x18, 0xae, 0xf2, 0xe1, 0xc6, 0xaf, 0x3f, 0xe2, 0x6e, 0x9b, 0x8e, 0x30, 0x2d, 0x0d, 0x62, 0x80,
+	0x90, 0x82, 0x0d, 0x6e, 0x80, 0x99, 0x7e, 0x30, 0x24, 0xb1, 0x93, 0x78, 0x9a, 0xb6, 0x1e, 0xd9,
+	0x39, 0x94, 0x8b, 0x66, 0x2d, 0x6f, 0x15, 0x81, 0xac, 0x15, 0xab, 0x95, 0xa7, 0x29, 0x53, 0x0e,
+	0xcc, 0x70, 0xe3, 0xc6, 0x3f, 0xe8, 0x99, 0xe1, 0x07, 0x30, 0xc3, 0x9d, 0x3b, 0x57, 0x86, 0x13,
+	0x3f, 0x84, 0xd9, 0xd5, 0x4a, 0x96, 0x93, 0x14, 0x25, 0x19, 0x6e, 0xda, 0xe7, 0xfd, 0x7a, 0x76,
+	0xdf, 0x67, 0x5f, 0xaf, 0xa1, 0xe1, 0x50, 0xea, 0x78, 0xa4, 0x69, 0x7b, 0x34, 0x1a, 0x35, 0x9f,
+	0x45, 0xbe, 0xcd, 0x5d, 0xea, 0x87, 0xcd, 0xc9, 0x27, 0x43, 0xc2, 0x71, 0x6b, 0x8a, 0x34, 0x02,
+	0x46, 0x39, 0x45, 0x6f, 0xc5, 0xfe, 0x0d, 0xe9, 0xdf, 0x98, 0x5a, 0x95, 0x7f, 0xfd, 0x86, 0xca,
+	0x87, 0x03, 0xb7, 0x89, 0x7d, 0x9f, 0x72, 0x9c, 0x89, 0xae, 0xaf, 0x64, 0xad, 0x11, 0x3f, 0x54,
+	0x70, 0x33, 0x87, 0x04, 0x0d, 0x08, 0x9b, 0xc9, 0xf3, 0x8e, 0x0a, 0xf0, 0xa8, 0xef, 0xb0, 0xc8,
+	0xf7, 0x5d, 0xdf, 0x39, 0xe9, 0xa4, 0xa8, 0x36, 0xe5, 0x6a, 0x18, 0x3d, 0x6b, 0x8e, 0xa2, 0xd8,
+	0x41, 0xd9, 0x6f, 0x1d, 0xb7, 0x73, 0x77, 0x4c, 0x42, 0x8e, 0xc7, 0x41, 0xec, 0x60, 0xfc, 0xb5,
+	0x08, 0x95, 0x6d, 0x41, 0x69, 0x47, 0x31, 0x42, 0x08, 0x16, 0x7c, 0x3c, 0x26, 0xba, 0xb6, 0xaa,
+	0xad, 0x15, 0x4d, 0xf9, 0x8d, 0x1a, 0x80, 0x42, 0x1a, 0x31, 0x9b, 0x58, 0x98, 0xd9, 0x87, 0xee,
+	0x84, 0x58, 0x11, 0xf3, 0xf4, 0xaa, 0xf0, 0xd8, 0xbb, 0x64, 0xd6, 0x62, 0xdb, 0x66, 0x6c, 0x3a,
+	0x60, 0x1e, 0xb2, 0xe0, 0x8a, 0xf2, 0x67, 0x24, 0xa0, 0xa1, 0xcb, 0x29, 0x3b, 0xd2, 0xe7, 0x57,
+	0xb5, 0xb5, 0x52, 0xeb, 0xe3, 0xc6, 0x7f, 0x9f, 0x6e, 0xa3, 0x2f, 0x03, 0xcd, 0x34, 0x6e, 0x5a,
+	0x60, 0x8a, 0xa1, 0x3e, 0x54, 0x0e, 0x39, 0x0f, 0x42, 0x8b, 0x33, 0xd7, 0x71, 0x08, 0xd3, 0x0b,
+	0x32, 0xf9, 0x87, 0x79, 0xc9, 0xf7, 0x06, 0x83, 0x5e, 0x7f, 0x10, 0xc7, 0xec, 0x69, 0x66, 0x59,
+	0x26, 0x51, 0x6b, 0x91, 0x94, 0x4c, 0x88, 0xcf, 0xd3, 0xa4, 0xe5, 0xb3, 0x25, 0xed, 0x88, 0xa0,
+	0x4c, 0x52, 0x92, 0x59, 0xa3, 0x87, 0x50, 0x08, 0x39, 0xe6, 0x51, 0xa8, 0x5f, 0x5e, 0xd5, 0xd6,
+	0xaa, 0xad, 0x3b, 0x79, 0xd9, 0x66, 0xba, 0xd1, 0x97, 0xa1, 0xa6, 0x4a, 0x81, 0x3e, 0x80, 0x9a,
+	0x87, 0x39, 0x09, 0xb9, 0x95, 0x2a, 0x41, 0x5f, 0x92, 0x7d, 0x5a, 0x8e, 0xf1, 0x27, 0x09, 0x8c,
+	0x6e, 0x41, 0x89, 0xf8, 0x9c, 0x1d, 0x59, 0x01, 0x75, 0x7d, 0xae, 0x17, 0xa5, 0x17, 0x48, 0xa8,
+	0x27, 0x10, 0x74, 0x07, 0x2e, 0x0b, 0x31, 0xd0, 0x88, 0xeb, 0x20, 0xf7, 0xf9, 0x46, 0xc2, 0x2c,
+	0x11, 0x4b, 0xa3, 0xad, 0xc4, 0x64, 0x26, 0x9e, 0xa8, 0x01, 0x57, 0xf1, 0x04, 0xbb, 0x1e, 0x1e,
+	0x7a, 0xc4, 0x1a, 0x93, 0x31, 0x65, 0x47, 0xd6, 0x78, 0xa8, 0x97, 0x56, 0xb5, 0xb5, 0x45, 0xf3,
+	0x4a, 0x6a, 0x7a, 0x24, 0x2d, 0x8f, 0x86, 0xe8, 0x7d, 0x58, 0x0e, 0x09, 0x9b, 0xb8, 0x42, 0x39,
+	0xb6, 0x4d, 0x23, 0x9f, 0xeb, 0x15, 0xc9, 0xa4, 0xaa, 0xe0, 0xcd, 0x18, 0x45, 0xf7, 0xa0, 0x14,
+	0x05, 0x23, 0xcc, 0x89, 0x25, 0x4a, 0xe9, 0xcb, 0x92, 0x51, 0xfd, 0x04, 0xa3, 0x41, 0x22, 0x5f,
+	0x13, 0x62, 0x77, 0x01, 0x6c, 0x55, 0xa0, 0xa4, 0xe4, 0x66, 0xd3, 0x11, 0xd9, 0x2a, 0xc2, 0x65,
+	0xd5, 0x41, 0x63, 0x15, 0xca, 0xd9, 0x96, 0xa3, 0x1a, 0xcc, 0x0b, 0xe5, 0xc6, 0xda, 0x16, 0x9f,
+	0x46, 0x17, 0xca, 0xd9, 0xfe, 0xa1, 0x9b, 0x00, 0x4a, 0x04, 0x47, 0x41, 0x72, 0x09, 0x8a, 0x71,
+	0x47, 0x8f, 0x02, 0x82, 0xea, 0xb0, 0xc4, 0x48, 0x5c, 0x4c, 0x9f, 0x93, 0xc6, 0x74, 0x6d, 0xfc,
+	0xad, 0x41, 0xed, 0xb8, 0x7a, 0xd1, 0xbb, 0x50, 0x9d, 0xde, 0x01, 0x6b, 0x5a, 0xbc, 0x32, 0x45,
+	0xc5, 0x8d, 0xb9, 0x95, 0x6e, 0x21, 0xc0, 0xfc, 0x50, 0xa5, 0x86, 0x18, 0xea, 0x61, 0x7e, 0x88,
+	0x74, 0x28, 0x0c, 0x19, 0xf6, 0xed, 0x43, 0x79, 0x8f, 0xc4, 0xb5, 0x53, 0x6b, 0x84, 0x60, 0x9e,
+	0x63, 0x47, 0x5f, 0x50, 0xb0, 0x58, 0xa0, 0x1b, 0x82, 0xe6, 0xc4, 0x0d, 0x85, 0x40, 0x16, 0x95,
+	0x21, 0x45, 0xd0, 0x6d, 0xb8, 0x32, 0x22, 0x81, 0x47, 0x8f, 0xc8, 0xc8, 0x4a, 0xdd, 0x0a, 0xb2,
+	0x64, 0x2d, 0x31, 0x98, 0x0a, 0x17, 0xa7, 0x39, 0x21, 0x4c, 0x7c, 0x1a, 0xdf, 0xc3, 0xca, 0x36,
+	0x23, 0x98, 0x93, 0x44, 0x9e, 0x26, 0xf9, 0x36, 0x22, 0x21, 0x17, 0xa7, 0xe2, 0x51, 0x3b, 0xd6,
+	0x63, 0xbc, 0xbd, 0x74, 0x8d, 0xba, 0xb0, 0x94, 0x88, 0x5c, 0x6e, 0xab, 0xd4, 0xfa, 0xe8, 0x5c,
+	0x57, 0xc0, 0x4c, 0xc3, 0x8d, 0x09, 0xac, 0x1c, 0xc8, 0xae, 0x1f, 0xaf, 0x7f, 0xda, 0xcc, 0xfa,
+	0x1f, 0xeb, 0xae, 0x01, 0xda, 0x25, 0xfc, 0x0c, 0x45, 0x0d, 0x1f, 0xae, 0xed, 0xbb, 0x61, 0xea,
+	0x1a, 0x9e, 0xe5, 0x80, 0xde, 0x84, 0x62, 0x80, 0x1d, 0x62, 0x85, 0xee, 0x8b, 0x58, 0x53, 0x8b,
+	0xe6, 0x92, 0x00, 0xfa, 0xee, 0x0b, 0x22, 0xe4, 0x28, 0x8d, 0x9c, 0x7e, 0x43, 0xfc, 0xb8, 0xf5,
+	0xa6, 0x74, 0x1f, 0x08, 0xc0, 0xf8, 0x49, 0x83, 0x95, 0x63, 0x05, 0xc3, 0x80, 0xfa, 0x21, 0x41,
+	0x0f, 0xa1, 0x98, 0x6e, 0x50, 0xd7, 0x56, 0xe7, 0xcf, 0xbf, 0xff, 0x69, 0x3c, 0x7a, 0x0f, 0x96,
+	0x7d, 0xf2, 0x9c, 0x5b, 0x19, 0x2a, 0xb1, 0x42, 0x2b, 0x02, 0xee, 0xa5, 0x74, 0x6e, 0xc3, 0x4a,
+	0x9b, 0x78, 0xe4, 0x4c, 0x0d, 0x32, 0x1e, 0xc0, 0xd5, 0x6d, 0xec, 0x79, 0x67, 0xe9, 0x25, 0x82,
+	0x85, 0x11, 0xe6, 0x58, 0x15, 0x95, 0xdf, 0x86, 0x03, 0xd7, 0x66, 0xc3, 0xd5, 0xc6, 0xdf, 0x86,
+	0x32, 0x79, 0x4e, 0xec, 0x48, 0x80, 0x96, 0x3b, 0x52, 0x79, 0x4a, 0x29, 0xd6, 0x1d, 0xa1, 0xeb,
+	0x50, 0x60, 0x24, 0x8c, 0x3c, 0xae, 0x12, 0xaa, 0x15, 0xba, 0x06, 0x8b, 0x84, 0x31, 0xca, 0xd4,
+	0x39, 0xc7, 0x8b, 0x75, 0x0c, 0x57, 0x4f, 0x99, 0xc9, 0xe8, 0x3a, 0xa0, 0xfe, 0x60, 0x73, 0x70,
+	0xd0, 0xb7, 0x0e, 0x1e, 0xf7, 0x7b, 0x9d, 0xed, 0xee, 0x4e, 0xb7, 0xd3, 0xae, 0x5d, 0x42, 0x45,
+	0x58, 0x34, 0x3b, 0x9b, 0xed, 0xa7, 0x35, 0x0d, 0x01, 0x14, 0x76, 0x36, 0xbb, 0xfb, 0x9d, 0x76,
+	0x6d, 0x0e, 0x55, 0xa0, 0xd8, 0xee, 0xf4, 0xf6, 0x9f, 0x3c, 0xed, 0x3e, 0xde, 0xad, 0xcd, 0xa3,
+	0x32, 0x2c, 0xb5, 0x3b, 0xfb, 0x9d, 0x81, 0x58, 0x2d, 0xb4, 0xfe, 0x58, 0x82, 0x95, 0x99, 0x1a,
+	0x61, 0x3f, 0x1e, 0x8f, 0xe8, 0x37, 0x0d, 0x2a, 0x33, 0x0d, 0x46, 0x1b, 0x79, 0x5d, 0x3c, 0x4d,
+	0x80, 0xf5, 0x4f, 0xcf, 0x19, 0x15, 0x1f, 0xa6, 0x71, 0xff, 0x87, 0x3f, 0xff, 0xf9, 0x79, 0xee,
+	0x33, 0xb4, 0x91, 0xbe, 0x53, 0xbe, 0x4b, 0x74, 0xfb, 0x20, 0x60, 0xf4, 0x6b, 0x62, 0xf3, 0xb0,
+	0xb9, 0xde, 0x4c, 0xb0, 0xb0, 0xb9, 0xfe, 0x72, 0xfa, 0xb6, 0x41, 0xbf, 0x68, 0x50, 0xca, 0x5c,
+	0x1c, 0xd4, 0xca, 0x23, 0x71, 0xf2, 0x96, 0xd5, 0xcf, 0x27, 0x5a, 0xe3, 0xae, 0x24, 0xbc, 0x81,
+	0x5a, 0x53, 0xc2, 0x42, 0x41, 0xaf, 0x21, 0x9b, 0x79, 0x87, 0xad, 0xbf, 0x44, 0xbf, 0x6a, 0x50,
+	0x9d, 0x9d, 0x6f, 0x28, 0xf7, 0xd8, 0x4e, 0x9d, 0x87, 0xf5, 0x9b, 0x49, 0x58, 0xe6, 0xf1, 0xd6,
+	0x48, 0x7f, 0x9b, 0x8d, 0x1d, 0x49, 0xf2, 0x4b, 0xe3, 0x42, 0xa7, 0x7a, 0x37, 0x9d, 0x4b, 0xe2,
+	0x7c, 0xab, 0xb3, 0x03, 0x31, 0x9f, 0xf0, 0xa9, 0x03, 0x34, 0x8f, 0x70, 0x5b, 0x12, 0xfe, 0xa2,
+	0x7e, 0x81, 0x53, 0xcd, 0xd0, 0x7d, 0xa5, 0x41, 0x75, 0x76, 0x3c, 0xe4, 0xd3, 0x3d, 0x75, 0x9c,
+	0xe4, 0xd1, 0x55, 0x22, 0x58, 0xbf, 0x88, 0x08, 0x7e, 0xd7, 0xa0, 0x9c, 0x9d, 0x2b, 0x28, 0xff,
+	0xc1, 0x76, 0x72, 0x88, 0xd5, 0x37, 0xce, 0x17, 0xa4, 0x6e, 0xdb, 0x96, 0xe4, 0x7d, 0xdf, 0xf8,
+	0xfc, 0x02, 0xc7, 0x6c, 0x63, 0xcf, 0xbb, 0xab, 0xad, 0x6f, 0xfd, 0xa8, 0x81, 0x61, 0xd3, 0x71,
+	0x4e, 0xfd, 0xad, 0x6a, 0x7a, 0xd7, 0x7b, 0xe2, 0x6d, 0xd5, 0xd3, 0xbe, 0xda, 0x55, 0x11, 0x0e,
+	0xf5, 0xb0, 0xef, 0x34, 0x28, 0x73, 0x9a, 0x0e, 0xf1, 0xe5, 0xcb, 0x4b, 0xfd, 0x77, 0xc1, 0x81,
+	0x1b, 0xbe, 0xee, 0xff, 0xcb, 0xbd, 0x14, 0x79, 0x35, 0x37, 0xbf, 0xbb, 0xbd, 0x33, 0x2c, 0xc8,
+	0xc8, 0x3b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x22, 0xa1, 0xda, 0x9f, 0x7d, 0x0d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1375,87 +1291,3 @@ var _CloudFunctionsService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/functions/v1beta2/functions.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/functions/v1beta2/functions.proto", fileDescriptor_functions_86e4424260a7e456)
-}
-
-var fileDescriptor_functions_86e4424260a7e456 = []byte{
-	// 1216 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4d, 0x73, 0xdb, 0x44,
-	0x18, 0xae, 0xf2, 0xe1, 0xc6, 0xaf, 0x3f, 0xe2, 0x6e, 0x9b, 0x8e, 0x30, 0x2d, 0x0d, 0x62, 0x80,
-	0x90, 0x82, 0x0d, 0x6e, 0x80, 0x99, 0x7e, 0x30, 0x24, 0xb1, 0x93, 0x78, 0x9a, 0xb6, 0x1e, 0xd9,
-	0x39, 0x94, 0x8b, 0x66, 0x2d, 0x6f, 0x15, 0x81, 0xac, 0x15, 0xab, 0x95, 0xa7, 0x29, 0x53, 0x0e,
-	0xcc, 0x70, 0xe3, 0xc6, 0x3f, 0xe8, 0x99, 0xe1, 0x07, 0x30, 0xc3, 0x9d, 0x3b, 0x57, 0x86, 0x13,
-	0x3f, 0x84, 0xd9, 0xd5, 0x4a, 0x96, 0x93, 0x14, 0x25, 0x19, 0x6e, 0xda, 0xe7, 0xfd, 0x7a, 0x76,
-	0xdf, 0x67, 0x5f, 0xaf, 0xa1, 0xe1, 0x50, 0xea, 0x78, 0xa4, 0x69, 0x7b, 0x34, 0x1a, 0x35, 0x9f,
-	0x45, 0xbe, 0xcd, 0x5d, 0xea, 0x87, 0xcd, 0xc9, 0x27, 0x43, 0xc2, 0x71, 0x6b, 0x8a, 0x34, 0x02,
-	0x46, 0x39, 0x45, 0x6f, 0xc5, 0xfe, 0x0d, 0xe9, 0xdf, 0x98, 0x5a, 0x95, 0x7f, 0xfd, 0x86, 0xca,
-	0x87, 0x03, 0xb7, 0x89, 0x7d, 0x9f, 0x72, 0x9c, 0x89, 0xae, 0xaf, 0x64, 0xad, 0x11, 0x3f, 0x54,
-	0x70, 0x33, 0x87, 0x04, 0x0d, 0x08, 0x9b, 0xc9, 0xf3, 0x8e, 0x0a, 0xf0, 0xa8, 0xef, 0xb0, 0xc8,
-	0xf7, 0x5d, 0xdf, 0x39, 0xe9, 0xa4, 0xa8, 0x36, 0xe5, 0x6a, 0x18, 0x3d, 0x6b, 0x8e, 0xa2, 0xd8,
-	0x41, 0xd9, 0x6f, 0x1d, 0xb7, 0x73, 0x77, 0x4c, 0x42, 0x8e, 0xc7, 0x41, 0xec, 0x60, 0xfc, 0xb5,
-	0x08, 0x95, 0x6d, 0x41, 0x69, 0x47, 0x31, 0x42, 0x08, 0x16, 0x7c, 0x3c, 0x26, 0xba, 0xb6, 0xaa,
-	0xad, 0x15, 0x4d, 0xf9, 0x8d, 0x1a, 0x80, 0x42, 0x1a, 0x31, 0x9b, 0x58, 0x98, 0xd9, 0x87, 0xee,
-	0x84, 0x58, 0x11, 0xf3, 0xf4, 0xaa, 0xf0, 0xd8, 0xbb, 0x64, 0xd6, 0x62, 0xdb, 0x66, 0x6c, 0x3a,
-	0x60, 0x1e, 0xb2, 0xe0, 0x8a, 0xf2, 0x67, 0x24, 0xa0, 0xa1, 0xcb, 0x29, 0x3b, 0xd2, 0xe7, 0x57,
-	0xb5, 0xb5, 0x52, 0xeb, 0xe3, 0xc6, 0x7f, 0x9f, 0x6e, 0xa3, 0x2f, 0x03, 0xcd, 0x34, 0x6e, 0x5a,
-	0x60, 0x8a, 0xa1, 0x3e, 0x54, 0x0e, 0x39, 0x0f, 0x42, 0x8b, 0x33, 0xd7, 0x71, 0x08, 0xd3, 0x0b,
-	0x32, 0xf9, 0x87, 0x79, 0xc9, 0xf7, 0x06, 0x83, 0x5e, 0x7f, 0x10, 0xc7, 0xec, 0x69, 0x66, 0x59,
-	0x26, 0x51, 0x6b, 0x91, 0x94, 0x4c, 0x88, 0xcf, 0xd3, 0xa4, 0xe5, 0xb3, 0x25, 0xed, 0x88, 0xa0,
-	0x4c, 0x52, 0x92, 0x59, 0xa3, 0x87, 0x50, 0x08, 0x39, 0xe6, 0x51, 0xa8, 0x5f, 0x5e, 0xd5, 0xd6,
-	0xaa, 0xad, 0x3b, 0x79, 0xd9, 0x66, 0xba, 0xd1, 0x97, 0xa1, 0xa6, 0x4a, 0x81, 0x3e, 0x80, 0x9a,
-	0x87, 0x39, 0x09, 0xb9, 0x95, 0x2a, 0x41, 0x5f, 0x92, 0x7d, 0x5a, 0x8e, 0xf1, 0x27, 0x09, 0x8c,
-	0x6e, 0x41, 0x89, 0xf8, 0x9c, 0x1d, 0x59, 0x01, 0x75, 0x7d, 0xae, 0x17, 0xa5, 0x17, 0x48, 0xa8,
-	0x27, 0x10, 0x74, 0x07, 0x2e, 0x0b, 0x31, 0xd0, 0x88, 0xeb, 0x20, 0xf7, 0xf9, 0x46, 0xc2, 0x2c,
-	0x11, 0x4b, 0xa3, 0xad, 0xc4, 0x64, 0x26, 0x9e, 0xa8, 0x01, 0x57, 0xf1, 0x04, 0xbb, 0x1e, 0x1e,
-	0x7a, 0xc4, 0x1a, 0x93, 0x31, 0x65, 0x47, 0xd6, 0x78, 0xa8, 0x97, 0x56, 0xb5, 0xb5, 0x45, 0xf3,
-	0x4a, 0x6a, 0x7a, 0x24, 0x2d, 0x8f, 0x86, 0xe8, 0x7d, 0x58, 0x0e, 0x09, 0x9b, 0xb8, 0x42, 0x39,
-	0xb6, 0x4d, 0x23, 0x9f, 0xeb, 0x15, 0xc9, 0xa4, 0xaa, 0xe0, 0xcd, 0x18, 0x45, 0xf7, 0xa0, 0x14,
-	0x05, 0x23, 0xcc, 0x89, 0x25, 0x4a, 0xe9, 0xcb, 0x92, 0x51, 0xfd, 0x04, 0xa3, 0x41, 0x22, 0x5f,
-	0x13, 0x62, 0x77, 0x01, 0x6c, 0x55, 0xa0, 0xa4, 0xe4, 0x66, 0xd3, 0x11, 0xd9, 0x2a, 0xc2, 0x65,
-	0xd5, 0x41, 0x63, 0x15, 0xca, 0xd9, 0x96, 0xa3, 0x1a, 0xcc, 0x0b, 0xe5, 0xc6, 0xda, 0x16, 0x9f,
-	0x46, 0x17, 0xca, 0xd9, 0xfe, 0xa1, 0x9b, 0x00, 0x4a, 0x04, 0x47, 0x41, 0x72, 0x09, 0x8a, 0x71,
-	0x47, 0x8f, 0x02, 0x82, 0xea, 0xb0, 0xc4, 0x48, 0x5c, 0x4c, 0x9f, 0x93, 0xc6, 0x74, 0x6d, 0xfc,
-	0xad, 0x41, 0xed, 0xb8, 0x7a, 0xd1, 0xbb, 0x50, 0x9d, 0xde, 0x01, 0x6b, 0x5a, 0xbc, 0x32, 0x45,
-	0xc5, 0x8d, 0xb9, 0x95, 0x6e, 0x21, 0xc0, 0xfc, 0x50, 0xa5, 0x86, 0x18, 0xea, 0x61, 0x7e, 0x88,
-	0x74, 0x28, 0x0c, 0x19, 0xf6, 0xed, 0x43, 0x79, 0x8f, 0xc4, 0xb5, 0x53, 0x6b, 0x84, 0x60, 0x9e,
-	0x63, 0x47, 0x5f, 0x50, 0xb0, 0x58, 0xa0, 0x1b, 0x82, 0xe6, 0xc4, 0x0d, 0x85, 0x40, 0x16, 0x95,
-	0x21, 0x45, 0xd0, 0x6d, 0xb8, 0x32, 0x22, 0x81, 0x47, 0x8f, 0xc8, 0xc8, 0x4a, 0xdd, 0x0a, 0xb2,
-	0x64, 0x2d, 0x31, 0x98, 0x0a, 0x17, 0xa7, 0x39, 0x21, 0x4c, 0x7c, 0x1a, 0xdf, 0xc3, 0xca, 0x36,
-	0x23, 0x98, 0x93, 0x44, 0x9e, 0x26, 0xf9, 0x36, 0x22, 0x21, 0x17, 0xa7, 0xe2, 0x51, 0x3b, 0xd6,
-	0x63, 0xbc, 0xbd, 0x74, 0x8d, 0xba, 0xb0, 0x94, 0x88, 0x5c, 0x6e, 0xab, 0xd4, 0xfa, 0xe8, 0x5c,
-	0x57, 0xc0, 0x4c, 0xc3, 0x8d, 0x09, 0xac, 0x1c, 0xc8, 0xae, 0x1f, 0xaf, 0x7f, 0xda, 0xcc, 0xfa,
-	0x1f, 0xeb, 0xae, 0x01, 0xda, 0x25, 0xfc, 0x0c, 0x45, 0x0d, 0x1f, 0xae, 0xed, 0xbb, 0x61, 0xea,
-	0x1a, 0x9e, 0xe5, 0x80, 0xde, 0x84, 0x62, 0x80, 0x1d, 0x62, 0x85, 0xee, 0x8b, 0x58, 0x53, 0x8b,
-	0xe6, 0x92, 0x00, 0xfa, 0xee, 0x0b, 0x22, 0xe4, 0x28, 0x8d, 0x9c, 0x7e, 0x43, 0xfc, 0xb8, 0xf5,
-	0xa6, 0x74, 0x1f, 0x08, 0xc0, 0xf8, 0x49, 0x83, 0x95, 0x63, 0x05, 0xc3, 0x80, 0xfa, 0x21, 0x41,
-	0x0f, 0xa1, 0x98, 0x6e, 0x50, 0xd7, 0x56, 0xe7, 0xcf, 0xbf, 0xff, 0x69, 0x3c, 0x7a, 0x0f, 0x96,
-	0x7d, 0xf2, 0x9c, 0x5b, 0x19, 0x2a, 0xb1, 0x42, 0x2b, 0x02, 0xee, 0xa5, 0x74, 0x6e, 0xc3, 0x4a,
-	0x9b, 0x78, 0xe4, 0x4c, 0x0d, 0x32, 0x1e, 0xc0, 0xd5, 0x6d, 0xec, 0x79, 0x67, 0xe9, 0x25, 0x82,
-	0x85, 0x11, 0xe6, 0x58, 0x15, 0x95, 0xdf, 0x86, 0x03, 0xd7, 0x66, 0xc3, 0xd5, 0xc6, 0xdf, 0x86,
-	0x32, 0x79, 0x4e, 0xec, 0x48, 0x80, 0x96, 0x3b, 0x52, 0x79, 0x4a, 0x29, 0xd6, 0x1d, 0xa1, 0xeb,
-	0x50, 0x60, 0x24, 0x8c, 0x3c, 0xae, 0x12, 0xaa, 0x15, 0xba, 0x06, 0x8b, 0x84, 0x31, 0xca, 0xd4,
-	0x39, 0xc7, 0x8b, 0x75, 0x0c, 0x57, 0x4f, 0x99, 0xc9, 0xe8, 0x3a, 0xa0, 0xfe, 0x60, 0x73, 0x70,
-	0xd0, 0xb7, 0x0e, 0x1e, 0xf7, 0x7b, 0x9d, 0xed, 0xee, 0x4e, 0xb7, 0xd3, 0xae, 0x5d, 0x42, 0x45,
-	0x58, 0x34, 0x3b, 0x9b, 0xed, 0xa7, 0x35, 0x0d, 0x01, 0x14, 0x76, 0x36, 0xbb, 0xfb, 0x9d, 0x76,
-	0x6d, 0x0e, 0x55, 0xa0, 0xd8, 0xee, 0xf4, 0xf6, 0x9f, 0x3c, 0xed, 0x3e, 0xde, 0xad, 0xcd, 0xa3,
-	0x32, 0x2c, 0xb5, 0x3b, 0xfb, 0x9d, 0x81, 0x58, 0x2d, 0xb4, 0xfe, 0x58, 0x82, 0x95, 0x99, 0x1a,
-	0x61, 0x3f, 0x1e, 0x8f, 0xe8, 0x37, 0x0d, 0x2a, 0x33, 0x0d, 0x46, 0x1b, 0x79, 0x5d, 0x3c, 0x4d,
-	0x80, 0xf5, 0x4f, 0xcf, 0x19, 0x15, 0x1f, 0xa6, 0x71, 0xff, 0x87, 0x3f, 0xff, 0xf9, 0x79, 0xee,
-	0x33, 0xb4, 0x91, 0xbe, 0x53, 0xbe, 0x4b, 0x74, 0xfb, 0x20, 0x60, 0xf4, 0x6b, 0x62, 0xf3, 0xb0,
-	0xb9, 0xde, 0x4c, 0xb0, 0xb0, 0xb9, 0xfe, 0x72, 0xfa, 0xb6, 0x41, 0xbf, 0x68, 0x50, 0xca, 0x5c,
-	0x1c, 0xd4, 0xca, 0x23, 0x71, 0xf2, 0x96, 0xd5, 0xcf, 0x27, 0x5a, 0xe3, 0xae, 0x24, 0xbc, 0x81,
-	0x5a, 0x53, 0xc2, 0x42, 0x41, 0xaf, 0x21, 0x9b, 0x79, 0x87, 0xad, 0xbf, 0x44, 0xbf, 0x6a, 0x50,
-	0x9d, 0x9d, 0x6f, 0x28, 0xf7, 0xd8, 0x4e, 0x9d, 0x87, 0xf5, 0x9b, 0x49, 0x58, 0xe6, 0xf1, 0xd6,
-	0x48, 0x7f, 0x9b, 0x8d, 0x1d, 0x49, 0xf2, 0x4b, 0xe3, 0x42, 0xa7, 0x7a, 0x37, 0x9d, 0x4b, 0xe2,
-	0x7c, 0xab, 0xb3, 0x03, 0x31, 0x9f, 0xf0, 0xa9, 0x03, 0x34, 0x8f, 0x70, 0x5b, 0x12, 0xfe, 0xa2,
-	0x7e, 0x81, 0x53, 0xcd, 0xd0, 0x7d, 0xa5, 0x41, 0x75, 0x76, 0x3c, 0xe4, 0xd3, 0x3d, 0x75, 0x9c,
-	0xe4, 0xd1, 0x55, 0x22, 0x58, 0xbf, 0x88, 0x08, 0x7e, 0xd7, 0xa0, 0x9c, 0x9d, 0x2b, 0x28, 0xff,
-	0xc1, 0x76, 0x72, 0x88, 0xd5, 0x37, 0xce, 0x17, 0xa4, 0x6e, 0xdb, 0x96, 0xe4, 0x7d, 0xdf, 0xf8,
-	0xfc, 0x02, 0xc7, 0x6c, 0x63, 0xcf, 0xbb, 0xab, 0xad, 0x6f, 0xfd, 0xa8, 0x81, 0x61, 0xd3, 0x71,
-	0x4e, 0xfd, 0xad, 0x6a, 0x7a, 0xd7, 0x7b, 0xe2, 0x6d, 0xd5, 0xd3, 0xbe, 0xda, 0x55, 0x11, 0x0e,
-	0xf5, 0xb0, 0xef, 0x34, 0x28, 0x73, 0x9a, 0x0e, 0xf1, 0xe5, 0xcb, 0x4b, 0xfd, 0x77, 0xc1, 0x81,
-	0x1b, 0xbe, 0xee, 0xff, 0xcb, 0xbd, 0x14, 0x79, 0x35, 0x37, 0xbf, 0xbb, 0xbd, 0x33, 0x2c, 0xc8,
-	0xc8, 0x3b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x22, 0xa1, 0xda, 0x9f, 0x7d, 0x0d, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/functions/v1beta2/operations.pb.go b/googleapis/cloud/functions/v1beta2/operations.pb.go
index 1a1d762a8a..c7abc15ca9 100644
--- a/googleapis/cloud/functions/v1beta2/operations.pb.go
+++ b/googleapis/cloud/functions/v1beta2/operations.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/functions/v1beta2/operations.proto
 
-package functions // import "google.golang.org/genproto/googleapis/cloud/functions/v1beta2"
+package functions
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A type of an operation.
 type OperationType int32
@@ -40,6 +43,7 @@ var OperationType_name = map[int32]string{
 	2: "UPDATE_FUNCTION",
 	3: "DELETE_FUNCTION",
 }
+
 var OperationType_value = map[string]int32{
 	"OPERATION_UNSPECIFIED": 0,
 	"CREATE_FUNCTION":       1,
@@ -50,8 +54,9 @@ var OperationType_value = map[string]int32{
 func (x OperationType) String() string {
 	return proto.EnumName(OperationType_name, int32(x))
 }
+
 func (OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operations_0d25ce4b01267ed0, []int{0}
+	return fileDescriptor_25e43fb62395b1f8, []int{0}
 }
 
 // Metadata describing an [Operation][google.longrunning.Operation]
@@ -72,16 +77,17 @@ func (m *OperationMetadataV1Beta2) Reset()         { *m = OperationMetadataV1Bet
 func (m *OperationMetadataV1Beta2) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadataV1Beta2) ProtoMessage()    {}
 func (*OperationMetadataV1Beta2) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_0d25ce4b01267ed0, []int{0}
+	return fileDescriptor_25e43fb62395b1f8, []int{0}
 }
+
 func (m *OperationMetadataV1Beta2) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadataV1Beta2.Unmarshal(m, b)
 }
 func (m *OperationMetadataV1Beta2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadataV1Beta2.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadataV1Beta2) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadataV1Beta2.Merge(dst, src)
+func (m *OperationMetadataV1Beta2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadataV1Beta2.Merge(m, src)
 }
 func (m *OperationMetadataV1Beta2) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadataV1Beta2.Size(m)
@@ -114,15 +120,15 @@ func (m *OperationMetadataV1Beta2) GetRequest() *any.Any {
 }
 
 func init() {
-	proto.RegisterType((*OperationMetadataV1Beta2)(nil), "google.cloud.functions.v1beta2.OperationMetadataV1Beta2")
 	proto.RegisterEnum("google.cloud.functions.v1beta2.OperationType", OperationType_name, OperationType_value)
+	proto.RegisterType((*OperationMetadataV1Beta2)(nil), "google.cloud.functions.v1beta2.OperationMetadataV1Beta2")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/functions/v1beta2/operations.proto", fileDescriptor_operations_0d25ce4b01267ed0)
+	proto.RegisterFile("google/cloud/functions/v1beta2/operations.proto", fileDescriptor_25e43fb62395b1f8)
 }
 
-var fileDescriptor_operations_0d25ce4b01267ed0 = []byte{
+var fileDescriptor_25e43fb62395b1f8 = []byte{
 	// 333 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x4f, 0x4f, 0xf2, 0x30,
 	0x1c, 0xc7, 0x9f, 0xc2, 0x13, 0x8c, 0x35, 0x2a, 0x99, 0x7f, 0x32, 0x88, 0x31, 0x84, 0x13, 0x31,
diff --git a/googleapis/cloud/iot/v1/device_manager.pb.go b/googleapis/cloud/iot/v1/device_manager.pb.go
index 4cd80d9d23..93269f7848 100644
--- a/googleapis/cloud/iot/v1/device_manager.pb.go
+++ b/googleapis/cloud/iot/v1/device_manager.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/iot/v1/device_manager.proto
 
-package iot // import "google.golang.org/genproto/googleapis/cloud/iot/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package iot
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -28,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request for `CreateDeviceRegistry`.
 type CreateDeviceRegistryRequest struct {
@@ -48,16 +48,17 @@ func (m *CreateDeviceRegistryRequest) Reset()         { *m = CreateDeviceRegistr
 func (m *CreateDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDeviceRegistryRequest) ProtoMessage()    {}
 func (*CreateDeviceRegistryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{0}
+	return fileDescriptor_9243c344ef472aff, []int{0}
 }
+
 func (m *CreateDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDeviceRegistryRequest.Unmarshal(m, b)
 }
 func (m *CreateDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDeviceRegistryRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDeviceRegistryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDeviceRegistryRequest.Merge(dst, src)
+func (m *CreateDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDeviceRegistryRequest.Merge(m, src)
 }
 func (m *CreateDeviceRegistryRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDeviceRegistryRequest.Size(m)
@@ -96,16 +97,17 @@ func (m *GetDeviceRegistryRequest) Reset()         { *m = GetDeviceRegistryReque
 func (m *GetDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDeviceRegistryRequest) ProtoMessage()    {}
 func (*GetDeviceRegistryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{1}
+	return fileDescriptor_9243c344ef472aff, []int{1}
 }
+
 func (m *GetDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDeviceRegistryRequest.Unmarshal(m, b)
 }
 func (m *GetDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDeviceRegistryRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDeviceRegistryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDeviceRegistryRequest.Merge(dst, src)
+func (m *GetDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDeviceRegistryRequest.Merge(m, src)
 }
 func (m *GetDeviceRegistryRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDeviceRegistryRequest.Size(m)
@@ -137,16 +139,17 @@ func (m *DeleteDeviceRegistryRequest) Reset()         { *m = DeleteDeviceRegistr
 func (m *DeleteDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDeviceRegistryRequest) ProtoMessage()    {}
 func (*DeleteDeviceRegistryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{2}
+	return fileDescriptor_9243c344ef472aff, []int{2}
 }
+
 func (m *DeleteDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDeviceRegistryRequest.Unmarshal(m, b)
 }
 func (m *DeleteDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDeviceRegistryRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDeviceRegistryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDeviceRegistryRequest.Merge(dst, src)
+func (m *DeleteDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDeviceRegistryRequest.Merge(m, src)
 }
 func (m *DeleteDeviceRegistryRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDeviceRegistryRequest.Size(m)
@@ -185,16 +188,17 @@ func (m *UpdateDeviceRegistryRequest) Reset()         { *m = UpdateDeviceRegistr
 func (m *UpdateDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDeviceRegistryRequest) ProtoMessage()    {}
 func (*UpdateDeviceRegistryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{3}
+	return fileDescriptor_9243c344ef472aff, []int{3}
 }
+
 func (m *UpdateDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDeviceRegistryRequest.Unmarshal(m, b)
 }
 func (m *UpdateDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDeviceRegistryRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDeviceRegistryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDeviceRegistryRequest.Merge(dst, src)
+func (m *UpdateDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDeviceRegistryRequest.Merge(m, src)
 }
 func (m *UpdateDeviceRegistryRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDeviceRegistryRequest.Size(m)
@@ -242,16 +246,17 @@ func (m *ListDeviceRegistriesRequest) Reset()         { *m = ListDeviceRegistrie
 func (m *ListDeviceRegistriesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceRegistriesRequest) ProtoMessage()    {}
 func (*ListDeviceRegistriesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{4}
+	return fileDescriptor_9243c344ef472aff, []int{4}
 }
+
 func (m *ListDeviceRegistriesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeviceRegistriesRequest.Unmarshal(m, b)
 }
 func (m *ListDeviceRegistriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeviceRegistriesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDeviceRegistriesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeviceRegistriesRequest.Merge(dst, src)
+func (m *ListDeviceRegistriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceRegistriesRequest.Merge(m, src)
 }
 func (m *ListDeviceRegistriesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDeviceRegistriesRequest.Size(m)
@@ -300,16 +305,17 @@ func (m *ListDeviceRegistriesResponse) Reset()         { *m = ListDeviceRegistri
 func (m *ListDeviceRegistriesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceRegistriesResponse) ProtoMessage()    {}
 func (*ListDeviceRegistriesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{5}
+	return fileDescriptor_9243c344ef472aff, []int{5}
 }
+
 func (m *ListDeviceRegistriesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeviceRegistriesResponse.Unmarshal(m, b)
 }
 func (m *ListDeviceRegistriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeviceRegistriesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDeviceRegistriesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeviceRegistriesResponse.Merge(dst, src)
+func (m *ListDeviceRegistriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceRegistriesResponse.Merge(m, src)
 }
 func (m *ListDeviceRegistriesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDeviceRegistriesResponse.Size(m)
@@ -353,16 +359,17 @@ func (m *CreateDeviceRequest) Reset()         { *m = CreateDeviceRequest{} }
 func (m *CreateDeviceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDeviceRequest) ProtoMessage()    {}
 func (*CreateDeviceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{6}
+	return fileDescriptor_9243c344ef472aff, []int{6}
 }
+
 func (m *CreateDeviceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDeviceRequest.Unmarshal(m, b)
 }
 func (m *CreateDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDeviceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDeviceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDeviceRequest.Merge(dst, src)
+func (m *CreateDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDeviceRequest.Merge(m, src)
 }
 func (m *CreateDeviceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDeviceRequest.Size(m)
@@ -405,16 +412,17 @@ func (m *GetDeviceRequest) Reset()         { *m = GetDeviceRequest{} }
 func (m *GetDeviceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDeviceRequest) ProtoMessage()    {}
 func (*GetDeviceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{7}
+	return fileDescriptor_9243c344ef472aff, []int{7}
 }
+
 func (m *GetDeviceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDeviceRequest.Unmarshal(m, b)
 }
 func (m *GetDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDeviceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDeviceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDeviceRequest.Merge(dst, src)
+func (m *GetDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDeviceRequest.Merge(m, src)
 }
 func (m *GetDeviceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDeviceRequest.Size(m)
@@ -460,16 +468,17 @@ func (m *UpdateDeviceRequest) Reset()         { *m = UpdateDeviceRequest{} }
 func (m *UpdateDeviceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDeviceRequest) ProtoMessage()    {}
 func (*UpdateDeviceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{8}
+	return fileDescriptor_9243c344ef472aff, []int{8}
 }
+
 func (m *UpdateDeviceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDeviceRequest.Unmarshal(m, b)
 }
 func (m *UpdateDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDeviceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDeviceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDeviceRequest.Merge(dst, src)
+func (m *UpdateDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDeviceRequest.Merge(m, src)
 }
 func (m *UpdateDeviceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDeviceRequest.Size(m)
@@ -509,16 +518,17 @@ func (m *DeleteDeviceRequest) Reset()         { *m = DeleteDeviceRequest{} }
 func (m *DeleteDeviceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDeviceRequest) ProtoMessage()    {}
 func (*DeleteDeviceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{9}
+	return fileDescriptor_9243c344ef472aff, []int{9}
 }
+
 func (m *DeleteDeviceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDeviceRequest.Unmarshal(m, b)
 }
 func (m *DeleteDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDeviceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDeviceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDeviceRequest.Merge(dst, src)
+func (m *DeleteDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDeviceRequest.Merge(m, src)
 }
 func (m *DeleteDeviceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDeviceRequest.Size(m)
@@ -571,16 +581,17 @@ func (m *ListDevicesRequest) Reset()         { *m = ListDevicesRequest{} }
 func (m *ListDevicesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDevicesRequest) ProtoMessage()    {}
 func (*ListDevicesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{10}
+	return fileDescriptor_9243c344ef472aff, []int{10}
 }
+
 func (m *ListDevicesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDevicesRequest.Unmarshal(m, b)
 }
 func (m *ListDevicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDevicesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDevicesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDevicesRequest.Merge(dst, src)
+func (m *ListDevicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDevicesRequest.Merge(m, src)
 }
 func (m *ListDevicesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDevicesRequest.Size(m)
@@ -659,16 +670,17 @@ func (m *GatewayListOptions) Reset()         { *m = GatewayListOptions{} }
 func (m *GatewayListOptions) String() string { return proto.CompactTextString(m) }
 func (*GatewayListOptions) ProtoMessage()    {}
 func (*GatewayListOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{11}
+	return fileDescriptor_9243c344ef472aff, []int{11}
 }
+
 func (m *GatewayListOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GatewayListOptions.Unmarshal(m, b)
 }
 func (m *GatewayListOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GatewayListOptions.Marshal(b, m, deterministic)
 }
-func (dst *GatewayListOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GatewayListOptions.Merge(dst, src)
+func (m *GatewayListOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GatewayListOptions.Merge(m, src)
 }
 func (m *GatewayListOptions) XXX_Size() int {
 	return xxx_messageInfo_GatewayListOptions.Size(m)
@@ -729,86 +741,15 @@ func (m *GatewayListOptions) GetAssociationsDeviceId() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GatewayListOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GatewayListOptions_OneofMarshaler, _GatewayListOptions_OneofUnmarshaler, _GatewayListOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GatewayListOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GatewayListOptions_GatewayType)(nil),
 		(*GatewayListOptions_AssociationsGatewayId)(nil),
 		(*GatewayListOptions_AssociationsDeviceId)(nil),
 	}
 }
 
-func _GatewayListOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GatewayListOptions)
-	// filter
-	switch x := m.Filter.(type) {
-	case *GatewayListOptions_GatewayType:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.GatewayType))
-	case *GatewayListOptions_AssociationsGatewayId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AssociationsGatewayId)
-	case *GatewayListOptions_AssociationsDeviceId:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AssociationsDeviceId)
-	case nil:
-	default:
-		return fmt.Errorf("GatewayListOptions.Filter has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GatewayListOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GatewayListOptions)
-	switch tag {
-	case 1: // filter.gateway_type
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Filter = &GatewayListOptions_GatewayType{GatewayType(x)}
-		return true, err
-	case 2: // filter.associations_gateway_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &GatewayListOptions_AssociationsGatewayId{x}
-		return true, err
-	case 3: // filter.associations_device_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &GatewayListOptions_AssociationsDeviceId{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GatewayListOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GatewayListOptions)
-	// filter
-	switch x := m.Filter.(type) {
-	case *GatewayListOptions_GatewayType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.GatewayType))
-	case *GatewayListOptions_AssociationsGatewayId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AssociationsGatewayId)))
-		n += len(x.AssociationsGatewayId)
-	case *GatewayListOptions_AssociationsDeviceId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AssociationsDeviceId)))
-		n += len(x.AssociationsDeviceId)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response for `ListDevices`.
 type ListDevicesResponse struct {
 	// The devices that match the request.
@@ -825,16 +766,17 @@ func (m *ListDevicesResponse) Reset()         { *m = ListDevicesResponse{} }
 func (m *ListDevicesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDevicesResponse) ProtoMessage()    {}
 func (*ListDevicesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{12}
+	return fileDescriptor_9243c344ef472aff, []int{12}
 }
+
 func (m *ListDevicesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDevicesResponse.Unmarshal(m, b)
 }
 func (m *ListDevicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDevicesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDevicesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDevicesResponse.Merge(dst, src)
+func (m *ListDevicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDevicesResponse.Merge(m, src)
 }
 func (m *ListDevicesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDevicesResponse.Size(m)
@@ -882,16 +824,17 @@ func (m *ModifyCloudToDeviceConfigRequest) Reset()         { *m = ModifyCloudToD
 func (m *ModifyCloudToDeviceConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*ModifyCloudToDeviceConfigRequest) ProtoMessage()    {}
 func (*ModifyCloudToDeviceConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{13}
+	return fileDescriptor_9243c344ef472aff, []int{13}
 }
+
 func (m *ModifyCloudToDeviceConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Unmarshal(m, b)
 }
 func (m *ModifyCloudToDeviceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *ModifyCloudToDeviceConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Merge(dst, src)
+func (m *ModifyCloudToDeviceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Merge(m, src)
 }
 func (m *ModifyCloudToDeviceConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Size(m)
@@ -942,16 +885,17 @@ func (m *ListDeviceConfigVersionsRequest) Reset()         { *m = ListDeviceConfi
 func (m *ListDeviceConfigVersionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceConfigVersionsRequest) ProtoMessage()    {}
 func (*ListDeviceConfigVersionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{14}
+	return fileDescriptor_9243c344ef472aff, []int{14}
 }
+
 func (m *ListDeviceConfigVersionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeviceConfigVersionsRequest.Unmarshal(m, b)
 }
 func (m *ListDeviceConfigVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeviceConfigVersionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDeviceConfigVersionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeviceConfigVersionsRequest.Merge(dst, src)
+func (m *ListDeviceConfigVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceConfigVersionsRequest.Merge(m, src)
 }
 func (m *ListDeviceConfigVersionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDeviceConfigVersionsRequest.Size(m)
@@ -990,16 +934,17 @@ func (m *ListDeviceConfigVersionsResponse) Reset()         { *m = ListDeviceConf
 func (m *ListDeviceConfigVersionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceConfigVersionsResponse) ProtoMessage()    {}
 func (*ListDeviceConfigVersionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{15}
+	return fileDescriptor_9243c344ef472aff, []int{15}
 }
+
 func (m *ListDeviceConfigVersionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeviceConfigVersionsResponse.Unmarshal(m, b)
 }
 func (m *ListDeviceConfigVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeviceConfigVersionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDeviceConfigVersionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeviceConfigVersionsResponse.Merge(dst, src)
+func (m *ListDeviceConfigVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceConfigVersionsResponse.Merge(m, src)
 }
 func (m *ListDeviceConfigVersionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDeviceConfigVersionsResponse.Size(m)
@@ -1036,16 +981,17 @@ func (m *ListDeviceStatesRequest) Reset()         { *m = ListDeviceStatesRequest
 func (m *ListDeviceStatesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceStatesRequest) ProtoMessage()    {}
 func (*ListDeviceStatesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{16}
+	return fileDescriptor_9243c344ef472aff, []int{16}
 }
+
 func (m *ListDeviceStatesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeviceStatesRequest.Unmarshal(m, b)
 }
 func (m *ListDeviceStatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeviceStatesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDeviceStatesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeviceStatesRequest.Merge(dst, src)
+func (m *ListDeviceStatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceStatesRequest.Merge(m, src)
 }
 func (m *ListDeviceStatesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDeviceStatesRequest.Size(m)
@@ -1084,16 +1030,17 @@ func (m *ListDeviceStatesResponse) Reset()         { *m = ListDeviceStatesRespon
 func (m *ListDeviceStatesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceStatesResponse) ProtoMessage()    {}
 func (*ListDeviceStatesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{17}
+	return fileDescriptor_9243c344ef472aff, []int{17}
 }
+
 func (m *ListDeviceStatesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeviceStatesResponse.Unmarshal(m, b)
 }
 func (m *ListDeviceStatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeviceStatesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDeviceStatesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeviceStatesResponse.Merge(dst, src)
+func (m *ListDeviceStatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceStatesResponse.Merge(m, src)
 }
 func (m *ListDeviceStatesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDeviceStatesResponse.Size(m)
@@ -1134,16 +1081,17 @@ func (m *SendCommandToDeviceRequest) Reset()         { *m = SendCommandToDeviceR
 func (m *SendCommandToDeviceRequest) String() string { return proto.CompactTextString(m) }
 func (*SendCommandToDeviceRequest) ProtoMessage()    {}
 func (*SendCommandToDeviceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{18}
+	return fileDescriptor_9243c344ef472aff, []int{18}
 }
+
 func (m *SendCommandToDeviceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendCommandToDeviceRequest.Unmarshal(m, b)
 }
 func (m *SendCommandToDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendCommandToDeviceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SendCommandToDeviceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendCommandToDeviceRequest.Merge(dst, src)
+func (m *SendCommandToDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SendCommandToDeviceRequest.Merge(m, src)
 }
 func (m *SendCommandToDeviceRequest) XXX_Size() int {
 	return xxx_messageInfo_SendCommandToDeviceRequest.Size(m)
@@ -1186,16 +1134,17 @@ func (m *SendCommandToDeviceResponse) Reset()         { *m = SendCommandToDevice
 func (m *SendCommandToDeviceResponse) String() string { return proto.CompactTextString(m) }
 func (*SendCommandToDeviceResponse) ProtoMessage()    {}
 func (*SendCommandToDeviceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{19}
+	return fileDescriptor_9243c344ef472aff, []int{19}
 }
+
 func (m *SendCommandToDeviceResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendCommandToDeviceResponse.Unmarshal(m, b)
 }
 func (m *SendCommandToDeviceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendCommandToDeviceResponse.Marshal(b, m, deterministic)
 }
-func (dst *SendCommandToDeviceResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendCommandToDeviceResponse.Merge(dst, src)
+func (m *SendCommandToDeviceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SendCommandToDeviceResponse.Merge(m, src)
 }
 func (m *SendCommandToDeviceResponse) XXX_Size() int {
 	return xxx_messageInfo_SendCommandToDeviceResponse.Size(m)
@@ -1227,16 +1176,17 @@ func (m *BindDeviceToGatewayRequest) Reset()         { *m = BindDeviceToGatewayR
 func (m *BindDeviceToGatewayRequest) String() string { return proto.CompactTextString(m) }
 func (*BindDeviceToGatewayRequest) ProtoMessage()    {}
 func (*BindDeviceToGatewayRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{20}
+	return fileDescriptor_9243c344ef472aff, []int{20}
 }
+
 func (m *BindDeviceToGatewayRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BindDeviceToGatewayRequest.Unmarshal(m, b)
 }
 func (m *BindDeviceToGatewayRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BindDeviceToGatewayRequest.Marshal(b, m, deterministic)
 }
-func (dst *BindDeviceToGatewayRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BindDeviceToGatewayRequest.Merge(dst, src)
+func (m *BindDeviceToGatewayRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BindDeviceToGatewayRequest.Merge(m, src)
 }
 func (m *BindDeviceToGatewayRequest) XXX_Size() int {
 	return xxx_messageInfo_BindDeviceToGatewayRequest.Size(m)
@@ -1279,16 +1229,17 @@ func (m *BindDeviceToGatewayResponse) Reset()         { *m = BindDeviceToGateway
 func (m *BindDeviceToGatewayResponse) String() string { return proto.CompactTextString(m) }
 func (*BindDeviceToGatewayResponse) ProtoMessage()    {}
 func (*BindDeviceToGatewayResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{21}
+	return fileDescriptor_9243c344ef472aff, []int{21}
 }
+
 func (m *BindDeviceToGatewayResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BindDeviceToGatewayResponse.Unmarshal(m, b)
 }
 func (m *BindDeviceToGatewayResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BindDeviceToGatewayResponse.Marshal(b, m, deterministic)
 }
-func (dst *BindDeviceToGatewayResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BindDeviceToGatewayResponse.Merge(dst, src)
+func (m *BindDeviceToGatewayResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BindDeviceToGatewayResponse.Merge(m, src)
 }
 func (m *BindDeviceToGatewayResponse) XXX_Size() int {
 	return xxx_messageInfo_BindDeviceToGatewayResponse.Size(m)
@@ -1320,16 +1271,17 @@ func (m *UnbindDeviceFromGatewayRequest) Reset()         { *m = UnbindDeviceFrom
 func (m *UnbindDeviceFromGatewayRequest) String() string { return proto.CompactTextString(m) }
 func (*UnbindDeviceFromGatewayRequest) ProtoMessage()    {}
 func (*UnbindDeviceFromGatewayRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{22}
+	return fileDescriptor_9243c344ef472aff, []int{22}
 }
+
 func (m *UnbindDeviceFromGatewayRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnbindDeviceFromGatewayRequest.Unmarshal(m, b)
 }
 func (m *UnbindDeviceFromGatewayRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UnbindDeviceFromGatewayRequest.Marshal(b, m, deterministic)
 }
-func (dst *UnbindDeviceFromGatewayRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UnbindDeviceFromGatewayRequest.Merge(dst, src)
+func (m *UnbindDeviceFromGatewayRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnbindDeviceFromGatewayRequest.Merge(m, src)
 }
 func (m *UnbindDeviceFromGatewayRequest) XXX_Size() int {
 	return xxx_messageInfo_UnbindDeviceFromGatewayRequest.Size(m)
@@ -1372,16 +1324,17 @@ func (m *UnbindDeviceFromGatewayResponse) Reset()         { *m = UnbindDeviceFro
 func (m *UnbindDeviceFromGatewayResponse) String() string { return proto.CompactTextString(m) }
 func (*UnbindDeviceFromGatewayResponse) ProtoMessage()    {}
 func (*UnbindDeviceFromGatewayResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_manager_d40b22b22b466eb0, []int{23}
+	return fileDescriptor_9243c344ef472aff, []int{23}
 }
+
 func (m *UnbindDeviceFromGatewayResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnbindDeviceFromGatewayResponse.Unmarshal(m, b)
 }
 func (m *UnbindDeviceFromGatewayResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UnbindDeviceFromGatewayResponse.Marshal(b, m, deterministic)
 }
-func (dst *UnbindDeviceFromGatewayResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UnbindDeviceFromGatewayResponse.Merge(dst, src)
+func (m *UnbindDeviceFromGatewayResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnbindDeviceFromGatewayResponse.Merge(m, src)
 }
 func (m *UnbindDeviceFromGatewayResponse) XXX_Size() int {
 	return xxx_messageInfo_UnbindDeviceFromGatewayResponse.Size(m)
@@ -1419,6 +1372,127 @@ func init() {
 	proto.RegisterType((*UnbindDeviceFromGatewayResponse)(nil), "google.cloud.iot.v1.UnbindDeviceFromGatewayResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/iot/v1/device_manager.proto", fileDescriptor_9243c344ef472aff)
+}
+
+var fileDescriptor_9243c344ef472aff = []byte{
+	// 1801 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4f, 0x6f, 0x1c, 0x49,
+	0x15, 0x4f, 0x8d, 0x83, 0xc9, 0x3c, 0x4f, 0x36, 0x49, 0xd9, 0x1b, 0x0f, 0x33, 0xf1, 0x7a, 0x52,
+	0x0b, 0xac, 0x77, 0xc4, 0x4e, 0xc7, 0xce, 0x26, 0x0a, 0x5e, 0xc1, 0xb2, 0xfe, 0xb3, 0x9e, 0x20,
+	0x7b, 0xf1, 0xb6, 0x9d, 0x05, 0xcc, 0x61, 0x68, 0x4f, 0x97, 0x5b, 0xbd, 0x99, 0xee, 0xea, 0xed,
+	0xaa, 0x31, 0x38, 0x28, 0x42, 0x22, 0x02, 0x4e, 0x5c, 0x12, 0x0e, 0x11, 0x12, 0xca, 0x05, 0x10,
+	0x07, 0xfe, 0x1c, 0x82, 0x10, 0xdc, 0x90, 0x90, 0xf8, 0x02, 0x1c, 0xf2, 0x05, 0x00, 0xf1, 0x11,
+	0x38, 0x70, 0x40, 0xdd, 0x55, 0x3d, 0x9e, 0xee, 0xe9, 0xee, 0xf9, 0x63, 0x94, 0xdb, 0x74, 0xd5,
+	0xab, 0xf7, 0x7e, 0xef, 0x57, 0xef, 0x57, 0xfd, 0xaa, 0x07, 0x96, 0x2c, 0xc6, 0xac, 0x0e, 0xd5,
+	0xda, 0x1d, 0xd6, 0x35, 0x35, 0x9b, 0x09, 0xed, 0x78, 0x59, 0x33, 0xe9, 0xb1, 0xdd, 0xa6, 0x2d,
+	0xc7, 0x70, 0x0d, 0x8b, 0xfa, 0x0d, 0xcf, 0x67, 0x82, 0xe1, 0x59, 0x69, 0xd9, 0x08, 0x2d, 0x1b,
+	0x36, 0x13, 0x8d, 0xe3, 0xe5, 0xca, 0x35, 0xb5, 0xdc, 0xf0, 0x6c, 0xcd, 0x70, 0x5d, 0x26, 0x0c,
+	0x61, 0x33, 0x97, 0xcb, 0x25, 0x95, 0xd7, 0xd3, 0x9c, 0xfb, 0x94, 0xb3, 0xae, 0xdf, 0xa6, 0x91,
+	0xd1, 0x6b, 0xca, 0xc8, 0x36, 0x9c, 0x60, 0xda, 0x36, 0x9c, 0x96, 0xc7, 0x3a, 0x76, 0xfb, 0x44,
+	0xcd, 0x57, 0xe2, 0xf3, 0xb1, 0xb9, 0x68, 0x6d, 0xf8, 0x74, 0xd8, 0x3d, 0xd2, 0xcc, 0xae, 0x1f,
+	0x22, 0x50, 0xf3, 0xd5, 0xe4, 0x3c, 0x75, 0x3c, 0x11, 0x2d, 0xae, 0x25, 0x27, 0x8f, 0x6c, 0xda,
+	0x31, 0x5b, 0x8e, 0xc1, 0xef, 0x2b, 0x8b, 0xc5, 0xa4, 0x85, 0xb0, 0x1d, 0xca, 0x85, 0xe1, 0x78,
+	0xca, 0x60, 0x5e, 0x19, 0xf8, 0x5e, 0x5b, 0xe3, 0xc2, 0x10, 0x5d, 0x95, 0x14, 0x79, 0x84, 0xa0,
+	0xba, 0xee, 0x53, 0x43, 0xd0, 0x8d, 0x90, 0x4b, 0x9d, 0x5a, 0x36, 0x17, 0xfe, 0x89, 0x4e, 0x3f,
+	0xe9, 0x52, 0x2e, 0xf0, 0x55, 0x98, 0xf6, 0x0c, 0x9f, 0xba, 0xa2, 0x8c, 0x6a, 0x68, 0xa9, 0xa8,
+	0xab, 0x27, 0xbc, 0x0d, 0x97, 0x14, 0xf9, 0xbe, 0x5a, 0x51, 0x2e, 0xd4, 0xd0, 0xd2, 0xcc, 0xca,
+	0xeb, 0x8d, 0x14, 0xfa, 0x1b, 0x09, 0xe7, 0xaf, 0x98, 0xb1, 0x67, 0xd2, 0x80, 0xf2, 0x16, 0x15,
+	0xe9, 0x08, 0x30, 0x9c, 0x77, 0x0d, 0x87, 0xaa, 0xf8, 0xe1, 0x6f, 0xb2, 0x0c, 0xd5, 0x0d, 0xda,
+	0xa1, 0x59, 0xa0, 0xd3, 0x96, 0xfc, 0x1a, 0x41, 0xf5, 0x9e, 0x67, 0x66, 0x26, 0x9a, 0x92, 0x10,
+	0x9a, 0x38, 0x21, 0xfc, 0x0e, 0xcc, 0x74, 0xc3, 0x60, 0xe1, 0x2e, 0x29, 0x6a, 0x2a, 0x91, 0xa7,
+	0x68, 0x9b, 0x1a, 0xef, 0x07, 0x1b, 0xb9, 0x63, 0xf0, 0xfb, 0x3a, 0x48, 0xf3, 0xe0, 0x37, 0xf9,
+	0x04, 0xaa, 0xdb, 0x36, 0x8f, 0xd3, 0x61, 0x53, 0x3e, 0x6c, 0x4b, 0xaa, 0x50, 0xf4, 0x0c, 0x8b,
+	0xb6, 0xb8, 0xfd, 0x80, 0x86, 0x11, 0x3f, 0xa5, 0x5f, 0x08, 0x06, 0xf6, 0xec, 0x07, 0x14, 0x2f,
+	0x00, 0x84, 0x93, 0x82, 0xdd, 0xa7, 0x6e, 0x79, 0x2a, 0x5c, 0x18, 0x9a, 0xef, 0x07, 0x03, 0xe4,
+	0x29, 0x82, 0x6b, 0xe9, 0x31, 0xb9, 0xc7, 0x5c, 0x4e, 0xf1, 0x2e, 0x5c, 0x89, 0xd3, 0x63, 0x53,
+	0x5e, 0x46, 0xb5, 0xa9, 0x51, 0x09, 0xba, 0x6c, 0x26, 0x3c, 0xe3, 0xcf, 0xc3, 0x25, 0x97, 0x7e,
+	0x57, 0xb4, 0xfa, 0x60, 0x15, 0x42, 0x58, 0x17, 0x83, 0xe1, 0xdd, 0x1e, 0xb4, 0x43, 0x98, 0x8d,
+	0x17, 0x68, 0x3e, 0x0b, 0x37, 0x61, 0x5a, 0x86, 0x52, 0xa4, 0x57, 0xf3, 0xd0, 0x29, 0x53, 0x62,
+	0xc0, 0xe5, 0xbe, 0xfa, 0xcb, 0x2c, 0x22, 0xfc, 0x45, 0x80, 0x53, 0xed, 0x8d, 0xb0, 0xab, 0xc5,
+	0xa3, 0xe8, 0x27, 0xf9, 0x31, 0x82, 0xd9, 0x78, 0xfd, 0xc9, 0x30, 0x93, 0xe0, 0x4d, 0x96, 0xd7,
+	0xd4, 0x58, 0xe5, 0xf5, 0x26, 0xcc, 0xc6, 0xc5, 0x93, 0x2d, 0x9a, 0xbf, 0x16, 0x00, 0x9f, 0x96,
+	0xc5, 0xd0, 0x0a, 0xfc, 0x2c, 0x28, 0x1d, 0xb4, 0xdc, 0xae, 0xd3, 0xb2, 0x4d, 0x5e, 0x2e, 0xd4,
+	0xa6, 0x96, 0xce, 0xeb, 0x25, 0x39, 0xfa, 0x41, 0xd7, 0xb9, 0x6b, 0xf2, 0xa0, 0x14, 0x95, 0x55,
+	0x60, 0x31, 0x55, 0x9b, 0x0a, 0x4a, 0x51, 0x8e, 0x04, 0xd3, 0x71, 0x8e, 0xcf, 0x8f, 0xc1, 0x31,
+	0xfe, 0x26, 0xcc, 0x59, 0x86, 0xa0, 0xdf, 0x31, 0x4e, 0x5a, 0x1d, 0x9b, 0x8b, 0x16, 0xf3, 0xc2,
+	0x43, 0xbe, 0x3c, 0x1d, 0x3a, 0x79, 0x23, 0x95, 0xd9, 0x2d, 0xb9, 0x20, 0xc8, 0xf2, 0x6b, 0xd2,
+	0x5c, 0xc7, 0xd6, 0xc0, 0x58, 0x5c, 0x5c, 0x66, 0xae, 0xb8, 0x68, 0x52, 0x5c, 0x2f, 0x10, 0xe0,
+	0xc1, 0x30, 0x78, 0x13, 0x4a, 0x11, 0x5a, 0x71, 0xe2, 0x49, 0xe2, 0x5f, 0x59, 0xa9, 0xe5, 0xa1,
+	0xdc, 0x3f, 0xf1, 0x68, 0xf3, 0x9c, 0x3e, 0x63, 0x9d, 0x3e, 0xe2, 0x3b, 0x30, 0x6f, 0x70, 0xce,
+	0xda, 0xb6, 0x7c, 0xa3, 0xb5, 0x22, 0x9f, 0xb6, 0x29, 0xf5, 0xd4, 0x3c, 0xa7, 0xbf, 0xda, 0x6f,
+	0xa0, 0x5c, 0xdd, 0x35, 0xf1, 0x6d, 0xb8, 0x1a, 0x5b, 0xd9, 0xdb, 0x15, 0x79, 0x3e, 0x34, 0xcf,
+	0xe9, 0x73, 0xfd, 0xf3, 0x1b, 0x6a, 0x8b, 0xd6, 0x2e, 0xc0, 0xf4, 0x91, 0xdd, 0x11, 0xd4, 0x27,
+	0x02, 0x66, 0x63, 0xe5, 0xa1, 0x0e, 0x8b, 0x5b, 0xf0, 0x69, 0xe9, 0x2b, 0x3a, 0x22, 0x72, 0x8b,
+	0x3a, 0xb2, 0x1d, 0xf9, 0x44, 0x78, 0x84, 0xa0, 0xb6, 0xc3, 0x4c, 0xfb, 0xe8, 0x64, 0x3d, 0x70,
+	0xb7, 0xcf, 0xa4, 0xa3, 0x75, 0xe6, 0x1e, 0xd9, 0x56, 0x9e, 0x7c, 0xeb, 0x70, 0xe5, 0x98, 0xfa,
+	0xdc, 0x66, 0x6e, 0x4b, 0xb0, 0x96, 0x94, 0x44, 0x18, 0x62, 0x4a, 0xbf, 0xa4, 0x26, 0xf6, 0x99,
+	0x14, 0x29, 0x5e, 0x84, 0x99, 0x43, 0xdb, 0x35, 0xfc, 0x93, 0x96, 0x69, 0x08, 0x23, 0x64, 0xa4,
+	0xa4, 0x83, 0x1c, 0xda, 0x30, 0x84, 0x41, 0xbe, 0x01, 0x8b, 0xa7, 0xb9, 0xcb, 0xd8, 0x1f, 0x49,
+	0x1f, 0x3c, 0x0f, 0xc3, 0x75, 0x28, 0x05, 0xe2, 0x50, 0xe1, 0xb8, 0x3a, 0xa8, 0x67, 0xdc, 0xae,
+	0x13, 0xad, 0x26, 0x1d, 0xa8, 0x65, 0x7b, 0x56, 0x14, 0x37, 0x7b, 0x52, 0x6b, 0x87, 0x06, 0x11,
+	0xd3, 0xd7, 0x73, 0x98, 0x56, 0x04, 0x5d, 0x34, 0xfb, 0x9e, 0x38, 0xd9, 0x86, 0xf9, 0xd3, 0x68,
+	0x7b, 0xc2, 0x10, 0x34, 0x17, 0xff, 0x02, 0x40, 0x80, 0x9f, 0x87, 0x86, 0x0a, 0x7d, 0xd1, 0xed,
+	0x3a, 0x72, 0x25, 0x31, 0xa0, 0x3c, 0xe8, 0x4d, 0x61, 0xde, 0x04, 0x15, 0x3a, 0x5a, 0x2d, 0x21,
+	0xd7, 0x72, 0x20, 0x87, 0x1e, 0xa2, 0xf3, 0x43, 0x85, 0x60, 0x50, 0xd9, 0xa3, 0xae, 0xb9, 0xce,
+	0x1c, 0xc7, 0x70, 0x7b, 0xbb, 0x9f, 0x87, 0x39, 0xb1, 0x97, 0x85, 0xe4, 0x5e, 0xe2, 0x6b, 0x50,
+	0xe4, 0xdd, 0xc3, 0x23, 0xd6, 0x31, 0xa9, 0x1f, 0xbd, 0x1c, 0x7b, 0x03, 0x64, 0x01, 0xaa, 0xa9,
+	0x01, 0x65, 0x5a, 0xc4, 0x83, 0xca, 0x9a, 0xed, 0x9a, 0x72, 0x74, 0x9f, 0x29, 0x7d, 0x0d, 0x3b,
+	0x2b, 0x17, 0x00, 0x92, 0x4a, 0xd5, 0x8b, 0x56, 0x4f, 0x9b, 0x55, 0x28, 0x26, 0xe4, 0xa8, 0x5f,
+	0x88, 0xce, 0xc8, 0x00, 0x50, 0x6a, 0x44, 0x05, 0x48, 0xc0, 0x6b, 0xf7, 0xdc, 0xc3, 0x9e, 0xc1,
+	0xfb, 0x3e, 0x73, 0x5e, 0x02, 0xa8, 0xeb, 0xb0, 0x98, 0x19, 0x55, 0x02, 0x5b, 0xf9, 0x27, 0x81,
+	0x8b, 0x72, 0x76, 0x47, 0x76, 0xec, 0xf8, 0x8f, 0x08, 0xe6, 0xd2, 0xda, 0x4f, 0x7c, 0x23, 0xb5,
+	0x28, 0x72, 0x3a, 0xd5, 0xca, 0x28, 0x6d, 0x08, 0xd9, 0xfa, 0xc1, 0xdf, 0xff, 0xf1, 0xa4, 0xf0,
+	0x1e, 0x69, 0x04, 0x1d, 0xfa, 0xf7, 0x64, 0xd6, 0x5f, 0xf2, 0x7c, 0xf6, 0x31, 0x6d, 0x0b, 0xae,
+	0xd5, 0xb5, 0x0e, 0x6b, 0xcb, 0xc3, 0x4e, 0xab, 0x3f, 0xd4, 0x4e, 0x3b, 0x9d, 0xd5, 0x64, 0x6f,
+	0x88, 0x9f, 0x21, 0xb8, 0x32, 0xd0, 0xb2, 0xe2, 0xb7, 0xd2, 0x0f, 0xef, 0x8c, 0xd6, 0x76, 0x34,
+	0xc8, 0xb7, 0x43, 0xc8, 0x37, 0xb0, 0x84, 0x1c, 0xd4, 0x73, 0x06, 0xe0, 0x3e, 0xbc, 0x5a, 0xfd,
+	0x21, 0xfe, 0x1b, 0x82, 0xb9, 0xb4, 0x86, 0x37, 0x83, 0xda, 0x9c, 0xde, 0x78, 0x34, 0x9c, 0x5f,
+	0x0f, 0x71, 0x7e, 0xb8, 0xf2, 0xe5, 0x10, 0x67, 0x82, 0xaf, 0xc6, 0xc8, 0xb8, 0x07, 0xa9, 0x7e,
+	0x8a, 0x60, 0x2e, 0xad, 0xdb, 0xcf, 0x48, 0x24, 0xe7, 0x62, 0x50, 0xb9, 0x3a, 0xd0, 0x47, 0x6c,
+	0x06, 0xf7, 0xac, 0x88, 0xe3, 0xfa, 0xb8, 0x1c, 0x3f, 0x47, 0x30, 0x97, 0xd6, 0x36, 0x67, 0x40,
+	0xcb, 0xe9, 0xea, 0x2b, 0xcb, 0x63, 0xac, 0x50, 0x3a, 0x8f, 0x57, 0xc6, 0xc8, 0xc5, 0x1c, 0xd4,
+	0x6e, 0xa9, 0x5f, 0x49, 0x78, 0x69, 0x04, 0xb1, 0x49, 0x94, 0x79, 0x2f, 0x72, 0xd2, 0x0c, 0xf1,
+	0xac, 0x91, 0x3b, 0xc3, 0xf1, 0xc4, 0x79, 0x54, 0xf7, 0x78, 0xbe, 0x1a, 0xf5, 0xb7, 0x2f, 0x10,
+	0x14, 0x7b, 0xaa, 0xc1, 0x9f, 0x1b, 0xa6, 0xaa, 0x11, 0xb0, 0xfd, 0x10, 0x85, 0xe0, 0xbe, 0x8f,
+	0xef, 0x8c, 0xb5, 0xc5, 0x11, 0x32, 0xad, 0xfe, 0xf0, 0x60, 0x1d, 0xbf, 0x37, 0xde, 0x5a, 0xcb,
+	0x67, 0x5d, 0x2f, 0xee, 0x04, 0xff, 0x17, 0x41, 0xa9, 0x5f, 0x6a, 0x19, 0xdc, 0xa7, 0xdc, 0x14,
+	0xf2, 0xf3, 0xfb, 0x85, 0xcc, 0xef, 0xe7, 0x68, 0xe5, 0xdd, 0x3e, 0xfd, 0x35, 0x26, 0xc8, 0x33,
+	0xda, 0x84, 0x03, 0x7d, 0xa5, 0x39, 0x91, 0xab, 0x94, 0xb4, 0x7b, 0x1b, 0xfb, 0x18, 0x41, 0xa9,
+	0x5f, 0xa0, 0x19, 0xe9, 0xa7, 0xdc, 0x4f, 0x32, 0xb5, 0xfb, 0x95, 0x30, 0xf1, 0xd5, 0xfa, 0xc4,
+	0x1b, 0x8b, 0xff, 0x8d, 0x60, 0xa6, 0xaf, 0x8d, 0xc5, 0x6f, 0x0c, 0x91, 0x62, 0x4f, 0xb3, 0x4b,
+	0xc3, 0x0d, 0x95, 0x54, 0x13, 0xe5, 0x37, 0x81, 0x36, 0x7a, 0xe5, 0x37, 0xfa, 0xda, 0xde, 0x4e,
+	0xf4, 0x9c, 0xe0, 0x3f, 0x15, 0xe0, 0x33, 0x99, 0xad, 0x33, 0xbe, 0x95, 0x9a, 0xcf, 0xb0, 0x56,
+	0xbb, 0x32, 0xbc, 0xe7, 0x24, 0x7f, 0x91, 0xf9, 0xff, 0x19, 0x11, 0x7d, 0xd2, 0x6d, 0x5a, 0x75,
+	0xb2, 0x70, 0xac, 0xa2, 0xfa, 0xc1, 0xb7, 0xc9, 0xb7, 0xce, 0x2c, 0xce, 0xdc, 0x08, 0xf8, 0x77,
+	0x85, 0xfe, 0xd6, 0x36, 0xde, 0x96, 0xe3, 0xb7, 0x87, 0x54, 0x42, 0xea, 0xfd, 0xa0, 0x72, 0x6b,
+	0xcc, 0x55, 0xaa, 0x98, 0x7a, 0x5a, 0xc7, 0x5b, 0x93, 0x92, 0xa9, 0xb5, 0x63, 0xae, 0x0f, 0x74,
+	0xbc, 0x7b, 0x66, 0xfa, 0x12, 0x3e, 0xf1, 0x8f, 0x0a, 0x70, 0x39, 0x79, 0x17, 0xc0, 0x5f, 0x18,
+	0x92, 0x72, 0xec, 0x02, 0x52, 0x79, 0x6b, 0x44, 0x6b, 0x45, 0xcc, 0x4f, 0x25, 0x31, 0x3f, 0x41,
+	0xf8, 0xdd, 0x89, 0x89, 0x91, 0x57, 0x93, 0x83, 0xaf, 0xe2, 0xe6, 0xd9, 0x09, 0x91, 0xbe, 0xf0,
+	0xbf, 0x10, 0x94, 0xf6, 0xa8, 0xb8, 0x6b, 0x38, 0xbb, 0xe1, 0x37, 0x61, 0x4c, 0xa2, 0xb4, 0x6c,
+	0xc3, 0x09, 0x12, 0xea, 0x9f, 0x8c, 0x52, 0x7f, 0x35, 0x61, 0x23, 0x67, 0xc9, 0xcf, 0x64, 0x8a,
+	0x4f, 0x10, 0x91, 0x29, 0x46, 0x1f, 0xa9, 0x47, 0xeb, 0xad, 0x78, 0x5f, 0xa0, 0x40, 0x35, 0x3b,
+	0xa4, 0x39, 0xb6, 0x97, 0xd3, 0x53, 0x25, 0xe9, 0x2e, 0x4c, 0x74, 0x2b, 0x2f, 0xd1, 0xad, 0x97,
+	0x95, 0xa8, 0xf5, 0xff, 0x4d, 0x34, 0xe1, 0x0e, 0x3f, 0x2e, 0x00, 0xde, 0xa7, 0x3c, 0x1c, 0xa4,
+	0xbe, 0x63, 0x73, 0x59, 0xf1, 0x4b, 0x89, 0x54, 0x06, 0x4d, 0xa2, 0xa4, 0xdf, 0x1c, 0xc1, 0x52,
+	0x15, 0xf5, 0xaf, 0x24, 0x11, 0xcf, 0x10, 0xd9, 0x9c, 0x80, 0x08, 0x31, 0xe0, 0x38, 0xa0, 0x63,
+	0x8f, 0x7c, 0x70, 0x16, 0x3a, 0x52, 0x9d, 0xe2, 0xdf, 0x17, 0x60, 0x36, 0xe5, 0x9e, 0x8c, 0xb5,
+	0x54, 0x11, 0x67, 0x5f, 0xe1, 0x2b, 0x37, 0x46, 0x5f, 0xa0, 0x38, 0xfa, 0x83, 0xe4, 0xe8, 0xb7,
+	0x88, 0x6c, 0x4f, 0xfc, 0x7a, 0xe1, 0x83, 0xfe, 0x03, 0xaa, 0x0e, 0xc8, 0xbd, 0xb3, 0xbf, 0x58,
+	0xd2, 0x7d, 0xe3, 0x67, 0x05, 0x98, 0x4d, 0xb9, 0xc8, 0x67, 0x30, 0x96, 0xfd, 0x91, 0x21, 0x83,
+	0xb1, 0xbc, 0x6f, 0x04, 0xbd, 0x77, 0x08, 0xd9, 0x18, 0xb7, 0x23, 0x59, 0x3d, 0x1c, 0xf4, 0x1b,
+	0x30, 0xa5, 0x93, 0x9d, 0x89, 0x1b, 0x94, 0x0c, 0x9f, 0xf8, 0x79, 0x01, 0xe6, 0x33, 0xbe, 0x2a,
+	0xe0, 0x9b, 0xe9, 0x9d, 0x73, 0xee, 0x97, 0x8f, 0xca, 0xdb, 0xe3, 0x2d, 0x52, 0x6c, 0xfd, 0x46,
+	0xb2, 0xf5, 0x4b, 0xa4, 0x8e, 0x91, 0x71, 0xd8, 0xea, 0xa6, 0xfb, 0x0e, 0x18, 0xfb, 0x88, 0x7c,
+	0x38, 0x39, 0x63, 0xd9, 0x7e, 0xd7, 0x3e, 0x86, 0xf9, 0x36, 0x73, 0xd2, 0x32, 0x5d, 0xc3, 0xb1,
+	0xef, 0x2f, 0xbb, 0x41, 0x2b, 0xbd, 0x8b, 0x0e, 0x6e, 0x2b, 0x53, 0x8b, 0x75, 0x0c, 0xd7, 0x6a,
+	0x30, 0xdf, 0xd2, 0x2c, 0xea, 0x86, 0x8d, 0xb6, 0x26, 0xa7, 0x0c, 0xcf, 0xe6, 0xb1, 0xbf, 0x47,
+	0xdf, 0xb1, 0x99, 0xf8, 0x0f, 0x42, 0x87, 0xd3, 0xa1, 0xd5, 0xcd, 0xff, 0x05, 0x00, 0x00, 0xff,
+	0xff, 0x7f, 0x49, 0x56, 0x46, 0xa0, 0x1d, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2164,124 +2238,3 @@ var _DeviceManager_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/iot/v1/device_manager.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/iot/v1/device_manager.proto", fileDescriptor_device_manager_d40b22b22b466eb0)
-}
-
-var fileDescriptor_device_manager_d40b22b22b466eb0 = []byte{
-	// 1801 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4f, 0x6f, 0x1c, 0x49,
-	0x15, 0x4f, 0x8d, 0x83, 0xc9, 0x3c, 0x4f, 0x36, 0x49, 0xd9, 0x1b, 0x0f, 0x33, 0xf1, 0x7a, 0x52,
-	0x0b, 0xac, 0x77, 0xc4, 0x4e, 0xc7, 0xce, 0x26, 0x0a, 0x5e, 0xc1, 0xb2, 0xfe, 0xb3, 0x9e, 0x20,
-	0x7b, 0xf1, 0xb6, 0x9d, 0x05, 0xcc, 0x61, 0x68, 0x4f, 0x97, 0x5b, 0xbd, 0x99, 0xee, 0xea, 0xed,
-	0xaa, 0x31, 0x38, 0x28, 0x42, 0x22, 0x02, 0x4e, 0x5c, 0x12, 0x0e, 0x11, 0x12, 0xca, 0x05, 0x10,
-	0x07, 0xfe, 0x1c, 0x82, 0x10, 0xdc, 0x90, 0x90, 0xf8, 0x02, 0x1c, 0xf2, 0x05, 0x00, 0xf1, 0x11,
-	0x38, 0x70, 0x40, 0xdd, 0x55, 0x3d, 0x9e, 0xee, 0xe9, 0xee, 0xf9, 0x63, 0x94, 0xdb, 0x74, 0xd5,
-	0xab, 0xf7, 0x7e, 0xef, 0x57, 0xef, 0x57, 0xfd, 0xaa, 0x07, 0x96, 0x2c, 0xc6, 0xac, 0x0e, 0xd5,
-	0xda, 0x1d, 0xd6, 0x35, 0x35, 0x9b, 0x09, 0xed, 0x78, 0x59, 0x33, 0xe9, 0xb1, 0xdd, 0xa6, 0x2d,
-	0xc7, 0x70, 0x0d, 0x8b, 0xfa, 0x0d, 0xcf, 0x67, 0x82, 0xe1, 0x59, 0x69, 0xd9, 0x08, 0x2d, 0x1b,
-	0x36, 0x13, 0x8d, 0xe3, 0xe5, 0xca, 0x35, 0xb5, 0xdc, 0xf0, 0x6c, 0xcd, 0x70, 0x5d, 0x26, 0x0c,
-	0x61, 0x33, 0x97, 0xcb, 0x25, 0x95, 0xd7, 0xd3, 0x9c, 0xfb, 0x94, 0xb3, 0xae, 0xdf, 0xa6, 0x91,
-	0xd1, 0x6b, 0xca, 0xc8, 0x36, 0x9c, 0x60, 0xda, 0x36, 0x9c, 0x96, 0xc7, 0x3a, 0x76, 0xfb, 0x44,
-	0xcd, 0x57, 0xe2, 0xf3, 0xb1, 0xb9, 0x68, 0x6d, 0xf8, 0x74, 0xd8, 0x3d, 0xd2, 0xcc, 0xae, 0x1f,
-	0x22, 0x50, 0xf3, 0xd5, 0xe4, 0x3c, 0x75, 0x3c, 0x11, 0x2d, 0xae, 0x25, 0x27, 0x8f, 0x6c, 0xda,
-	0x31, 0x5b, 0x8e, 0xc1, 0xef, 0x2b, 0x8b, 0xc5, 0xa4, 0x85, 0xb0, 0x1d, 0xca, 0x85, 0xe1, 0x78,
-	0xca, 0x60, 0x5e, 0x19, 0xf8, 0x5e, 0x5b, 0xe3, 0xc2, 0x10, 0x5d, 0x95, 0x14, 0x79, 0x84, 0xa0,
-	0xba, 0xee, 0x53, 0x43, 0xd0, 0x8d, 0x90, 0x4b, 0x9d, 0x5a, 0x36, 0x17, 0xfe, 0x89, 0x4e, 0x3f,
-	0xe9, 0x52, 0x2e, 0xf0, 0x55, 0x98, 0xf6, 0x0c, 0x9f, 0xba, 0xa2, 0x8c, 0x6a, 0x68, 0xa9, 0xa8,
-	0xab, 0x27, 0xbc, 0x0d, 0x97, 0x14, 0xf9, 0xbe, 0x5a, 0x51, 0x2e, 0xd4, 0xd0, 0xd2, 0xcc, 0xca,
-	0xeb, 0x8d, 0x14, 0xfa, 0x1b, 0x09, 0xe7, 0xaf, 0x98, 0xb1, 0x67, 0xd2, 0x80, 0xf2, 0x16, 0x15,
-	0xe9, 0x08, 0x30, 0x9c, 0x77, 0x0d, 0x87, 0xaa, 0xf8, 0xe1, 0x6f, 0xb2, 0x0c, 0xd5, 0x0d, 0xda,
-	0xa1, 0x59, 0xa0, 0xd3, 0x96, 0xfc, 0x1a, 0x41, 0xf5, 0x9e, 0x67, 0x66, 0x26, 0x9a, 0x92, 0x10,
-	0x9a, 0x38, 0x21, 0xfc, 0x0e, 0xcc, 0x74, 0xc3, 0x60, 0xe1, 0x2e, 0x29, 0x6a, 0x2a, 0x91, 0xa7,
-	0x68, 0x9b, 0x1a, 0xef, 0x07, 0x1b, 0xb9, 0x63, 0xf0, 0xfb, 0x3a, 0x48, 0xf3, 0xe0, 0x37, 0xf9,
-	0x04, 0xaa, 0xdb, 0x36, 0x8f, 0xd3, 0x61, 0x53, 0x3e, 0x6c, 0x4b, 0xaa, 0x50, 0xf4, 0x0c, 0x8b,
-	0xb6, 0xb8, 0xfd, 0x80, 0x86, 0x11, 0x3f, 0xa5, 0x5f, 0x08, 0x06, 0xf6, 0xec, 0x07, 0x14, 0x2f,
-	0x00, 0x84, 0x93, 0x82, 0xdd, 0xa7, 0x6e, 0x79, 0x2a, 0x5c, 0x18, 0x9a, 0xef, 0x07, 0x03, 0xe4,
-	0x29, 0x82, 0x6b, 0xe9, 0x31, 0xb9, 0xc7, 0x5c, 0x4e, 0xf1, 0x2e, 0x5c, 0x89, 0xd3, 0x63, 0x53,
-	0x5e, 0x46, 0xb5, 0xa9, 0x51, 0x09, 0xba, 0x6c, 0x26, 0x3c, 0xe3, 0xcf, 0xc3, 0x25, 0x97, 0x7e,
-	0x57, 0xb4, 0xfa, 0x60, 0x15, 0x42, 0x58, 0x17, 0x83, 0xe1, 0xdd, 0x1e, 0xb4, 0x43, 0x98, 0x8d,
-	0x17, 0x68, 0x3e, 0x0b, 0x37, 0x61, 0x5a, 0x86, 0x52, 0xa4, 0x57, 0xf3, 0xd0, 0x29, 0x53, 0x62,
-	0xc0, 0xe5, 0xbe, 0xfa, 0xcb, 0x2c, 0x22, 0xfc, 0x45, 0x80, 0x53, 0xed, 0x8d, 0xb0, 0xab, 0xc5,
-	0xa3, 0xe8, 0x27, 0xf9, 0x31, 0x82, 0xd9, 0x78, 0xfd, 0xc9, 0x30, 0x93, 0xe0, 0x4d, 0x96, 0xd7,
-	0xd4, 0x58, 0xe5, 0xf5, 0x26, 0xcc, 0xc6, 0xc5, 0x93, 0x2d, 0x9a, 0xbf, 0x16, 0x00, 0x9f, 0x96,
-	0xc5, 0xd0, 0x0a, 0xfc, 0x2c, 0x28, 0x1d, 0xb4, 0xdc, 0xae, 0xd3, 0xb2, 0x4d, 0x5e, 0x2e, 0xd4,
-	0xa6, 0x96, 0xce, 0xeb, 0x25, 0x39, 0xfa, 0x41, 0xd7, 0xb9, 0x6b, 0xf2, 0xa0, 0x14, 0x95, 0x55,
-	0x60, 0x31, 0x55, 0x9b, 0x0a, 0x4a, 0x51, 0x8e, 0x04, 0xd3, 0x71, 0x8e, 0xcf, 0x8f, 0xc1, 0x31,
-	0xfe, 0x26, 0xcc, 0x59, 0x86, 0xa0, 0xdf, 0x31, 0x4e, 0x5a, 0x1d, 0x9b, 0x8b, 0x16, 0xf3, 0xc2,
-	0x43, 0xbe, 0x3c, 0x1d, 0x3a, 0x79, 0x23, 0x95, 0xd9, 0x2d, 0xb9, 0x20, 0xc8, 0xf2, 0x6b, 0xd2,
-	0x5c, 0xc7, 0xd6, 0xc0, 0x58, 0x5c, 0x5c, 0x66, 0xae, 0xb8, 0x68, 0x52, 0x5c, 0x2f, 0x10, 0xe0,
-	0xc1, 0x30, 0x78, 0x13, 0x4a, 0x11, 0x5a, 0x71, 0xe2, 0x49, 0xe2, 0x5f, 0x59, 0xa9, 0xe5, 0xa1,
-	0xdc, 0x3f, 0xf1, 0x68, 0xf3, 0x9c, 0x3e, 0x63, 0x9d, 0x3e, 0xe2, 0x3b, 0x30, 0x6f, 0x70, 0xce,
-	0xda, 0xb6, 0x7c, 0xa3, 0xb5, 0x22, 0x9f, 0xb6, 0x29, 0xf5, 0xd4, 0x3c, 0xa7, 0xbf, 0xda, 0x6f,
-	0xa0, 0x5c, 0xdd, 0x35, 0xf1, 0x6d, 0xb8, 0x1a, 0x5b, 0xd9, 0xdb, 0x15, 0x79, 0x3e, 0x34, 0xcf,
-	0xe9, 0x73, 0xfd, 0xf3, 0x1b, 0x6a, 0x8b, 0xd6, 0x2e, 0xc0, 0xf4, 0x91, 0xdd, 0x11, 0xd4, 0x27,
-	0x02, 0x66, 0x63, 0xe5, 0xa1, 0x0e, 0x8b, 0x5b, 0xf0, 0x69, 0xe9, 0x2b, 0x3a, 0x22, 0x72, 0x8b,
-	0x3a, 0xb2, 0x1d, 0xf9, 0x44, 0x78, 0x84, 0xa0, 0xb6, 0xc3, 0x4c, 0xfb, 0xe8, 0x64, 0x3d, 0x70,
-	0xb7, 0xcf, 0xa4, 0xa3, 0x75, 0xe6, 0x1e, 0xd9, 0x56, 0x9e, 0x7c, 0xeb, 0x70, 0xe5, 0x98, 0xfa,
-	0xdc, 0x66, 0x6e, 0x4b, 0xb0, 0x96, 0x94, 0x44, 0x18, 0x62, 0x4a, 0xbf, 0xa4, 0x26, 0xf6, 0x99,
-	0x14, 0x29, 0x5e, 0x84, 0x99, 0x43, 0xdb, 0x35, 0xfc, 0x93, 0x96, 0x69, 0x08, 0x23, 0x64, 0xa4,
-	0xa4, 0x83, 0x1c, 0xda, 0x30, 0x84, 0x41, 0xbe, 0x01, 0x8b, 0xa7, 0xb9, 0xcb, 0xd8, 0x1f, 0x49,
-	0x1f, 0x3c, 0x0f, 0xc3, 0x75, 0x28, 0x05, 0xe2, 0x50, 0xe1, 0xb8, 0x3a, 0xa8, 0x67, 0xdc, 0xae,
-	0x13, 0xad, 0x26, 0x1d, 0xa8, 0x65, 0x7b, 0x56, 0x14, 0x37, 0x7b, 0x52, 0x6b, 0x87, 0x06, 0x11,
-	0xd3, 0xd7, 0x73, 0x98, 0x56, 0x04, 0x5d, 0x34, 0xfb, 0x9e, 0x38, 0xd9, 0x86, 0xf9, 0xd3, 0x68,
-	0x7b, 0xc2, 0x10, 0x34, 0x17, 0xff, 0x02, 0x40, 0x80, 0x9f, 0x87, 0x86, 0x0a, 0x7d, 0xd1, 0xed,
-	0x3a, 0x72, 0x25, 0x31, 0xa0, 0x3c, 0xe8, 0x4d, 0x61, 0xde, 0x04, 0x15, 0x3a, 0x5a, 0x2d, 0x21,
-	0xd7, 0x72, 0x20, 0x87, 0x1e, 0xa2, 0xf3, 0x43, 0x85, 0x60, 0x50, 0xd9, 0xa3, 0xae, 0xb9, 0xce,
-	0x1c, 0xc7, 0x70, 0x7b, 0xbb, 0x9f, 0x87, 0x39, 0xb1, 0x97, 0x85, 0xe4, 0x5e, 0xe2, 0x6b, 0x50,
-	0xe4, 0xdd, 0xc3, 0x23, 0xd6, 0x31, 0xa9, 0x1f, 0xbd, 0x1c, 0x7b, 0x03, 0x64, 0x01, 0xaa, 0xa9,
-	0x01, 0x65, 0x5a, 0xc4, 0x83, 0xca, 0x9a, 0xed, 0x9a, 0x72, 0x74, 0x9f, 0x29, 0x7d, 0x0d, 0x3b,
-	0x2b, 0x17, 0x00, 0x92, 0x4a, 0xd5, 0x8b, 0x56, 0x4f, 0x9b, 0x55, 0x28, 0x26, 0xe4, 0xa8, 0x5f,
-	0x88, 0xce, 0xc8, 0x00, 0x50, 0x6a, 0x44, 0x05, 0x48, 0xc0, 0x6b, 0xf7, 0xdc, 0xc3, 0x9e, 0xc1,
-	0xfb, 0x3e, 0x73, 0x5e, 0x02, 0xa8, 0xeb, 0xb0, 0x98, 0x19, 0x55, 0x02, 0x5b, 0xf9, 0x27, 0x81,
-	0x8b, 0x72, 0x76, 0x47, 0x76, 0xec, 0xf8, 0x8f, 0x08, 0xe6, 0xd2, 0xda, 0x4f, 0x7c, 0x23, 0xb5,
-	0x28, 0x72, 0x3a, 0xd5, 0xca, 0x28, 0x6d, 0x08, 0xd9, 0xfa, 0xc1, 0xdf, 0xff, 0xf1, 0xa4, 0xf0,
-	0x1e, 0x69, 0x04, 0x1d, 0xfa, 0xf7, 0x64, 0xd6, 0x5f, 0xf2, 0x7c, 0xf6, 0x31, 0x6d, 0x0b, 0xae,
-	0xd5, 0xb5, 0x0e, 0x6b, 0xcb, 0xc3, 0x4e, 0xab, 0x3f, 0xd4, 0x4e, 0x3b, 0x9d, 0xd5, 0x64, 0x6f,
-	0x88, 0x9f, 0x21, 0xb8, 0x32, 0xd0, 0xb2, 0xe2, 0xb7, 0xd2, 0x0f, 0xef, 0x8c, 0xd6, 0x76, 0x34,
-	0xc8, 0xb7, 0x43, 0xc8, 0x37, 0xb0, 0x84, 0x1c, 0xd4, 0x73, 0x06, 0xe0, 0x3e, 0xbc, 0x5a, 0xfd,
-	0x21, 0xfe, 0x1b, 0x82, 0xb9, 0xb4, 0x86, 0x37, 0x83, 0xda, 0x9c, 0xde, 0x78, 0x34, 0x9c, 0x5f,
-	0x0f, 0x71, 0x7e, 0xb8, 0xf2, 0xe5, 0x10, 0x67, 0x82, 0xaf, 0xc6, 0xc8, 0xb8, 0x07, 0xa9, 0x7e,
-	0x8a, 0x60, 0x2e, 0xad, 0xdb, 0xcf, 0x48, 0x24, 0xe7, 0x62, 0x50, 0xb9, 0x3a, 0xd0, 0x47, 0x6c,
-	0x06, 0xf7, 0xac, 0x88, 0xe3, 0xfa, 0xb8, 0x1c, 0x3f, 0x47, 0x30, 0x97, 0xd6, 0x36, 0x67, 0x40,
-	0xcb, 0xe9, 0xea, 0x2b, 0xcb, 0x63, 0xac, 0x50, 0x3a, 0x8f, 0x57, 0xc6, 0xc8, 0xc5, 0x1c, 0xd4,
-	0x6e, 0xa9, 0x5f, 0x49, 0x78, 0x69, 0x04, 0xb1, 0x49, 0x94, 0x79, 0x2f, 0x72, 0xd2, 0x0c, 0xf1,
-	0xac, 0x91, 0x3b, 0xc3, 0xf1, 0xc4, 0x79, 0x54, 0xf7, 0x78, 0xbe, 0x1a, 0xf5, 0xb7, 0x2f, 0x10,
-	0x14, 0x7b, 0xaa, 0xc1, 0x9f, 0x1b, 0xa6, 0xaa, 0x11, 0xb0, 0xfd, 0x10, 0x85, 0xe0, 0xbe, 0x8f,
-	0xef, 0x8c, 0xb5, 0xc5, 0x11, 0x32, 0xad, 0xfe, 0xf0, 0x60, 0x1d, 0xbf, 0x37, 0xde, 0x5a, 0xcb,
-	0x67, 0x5d, 0x2f, 0xee, 0x04, 0xff, 0x17, 0x41, 0xa9, 0x5f, 0x6a, 0x19, 0xdc, 0xa7, 0xdc, 0x14,
-	0xf2, 0xf3, 0xfb, 0x85, 0xcc, 0xef, 0xe7, 0x68, 0xe5, 0xdd, 0x3e, 0xfd, 0x35, 0x26, 0xc8, 0x33,
-	0xda, 0x84, 0x03, 0x7d, 0xa5, 0x39, 0x91, 0xab, 0x94, 0xb4, 0x7b, 0x1b, 0xfb, 0x18, 0x41, 0xa9,
-	0x5f, 0xa0, 0x19, 0xe9, 0xa7, 0xdc, 0x4f, 0x32, 0xb5, 0xfb, 0x95, 0x30, 0xf1, 0xd5, 0xfa, 0xc4,
-	0x1b, 0x8b, 0xff, 0x8d, 0x60, 0xa6, 0xaf, 0x8d, 0xc5, 0x6f, 0x0c, 0x91, 0x62, 0x4f, 0xb3, 0x4b,
-	0xc3, 0x0d, 0x95, 0x54, 0x13, 0xe5, 0x37, 0x81, 0x36, 0x7a, 0xe5, 0x37, 0xfa, 0xda, 0xde, 0x4e,
-	0xf4, 0x9c, 0xe0, 0x3f, 0x15, 0xe0, 0x33, 0x99, 0xad, 0x33, 0xbe, 0x95, 0x9a, 0xcf, 0xb0, 0x56,
-	0xbb, 0x32, 0xbc, 0xe7, 0x24, 0x7f, 0x91, 0xf9, 0xff, 0x19, 0x11, 0x7d, 0xd2, 0x6d, 0x5a, 0x75,
-	0xb2, 0x70, 0xac, 0xa2, 0xfa, 0xc1, 0xb7, 0xc9, 0xb7, 0xce, 0x2c, 0xce, 0xdc, 0x08, 0xf8, 0x77,
-	0x85, 0xfe, 0xd6, 0x36, 0xde, 0x96, 0xe3, 0xb7, 0x87, 0x54, 0x42, 0xea, 0xfd, 0xa0, 0x72, 0x6b,
-	0xcc, 0x55, 0xaa, 0x98, 0x7a, 0x5a, 0xc7, 0x5b, 0x93, 0x92, 0xa9, 0xb5, 0x63, 0xae, 0x0f, 0x74,
-	0xbc, 0x7b, 0x66, 0xfa, 0x12, 0x3e, 0xf1, 0x8f, 0x0a, 0x70, 0x39, 0x79, 0x17, 0xc0, 0x5f, 0x18,
-	0x92, 0x72, 0xec, 0x02, 0x52, 0x79, 0x6b, 0x44, 0x6b, 0x45, 0xcc, 0x4f, 0x25, 0x31, 0x3f, 0x41,
-	0xf8, 0xdd, 0x89, 0x89, 0x91, 0x57, 0x93, 0x83, 0xaf, 0xe2, 0xe6, 0xd9, 0x09, 0x91, 0xbe, 0xf0,
-	0xbf, 0x10, 0x94, 0xf6, 0xa8, 0xb8, 0x6b, 0x38, 0xbb, 0xe1, 0x37, 0x61, 0x4c, 0xa2, 0xb4, 0x6c,
-	0xc3, 0x09, 0x12, 0xea, 0x9f, 0x8c, 0x52, 0x7f, 0x35, 0x61, 0x23, 0x67, 0xc9, 0xcf, 0x64, 0x8a,
-	0x4f, 0x10, 0x91, 0x29, 0x46, 0x1f, 0xa9, 0x47, 0xeb, 0xad, 0x78, 0x5f, 0xa0, 0x40, 0x35, 0x3b,
-	0xa4, 0x39, 0xb6, 0x97, 0xd3, 0x53, 0x25, 0xe9, 0x2e, 0x4c, 0x74, 0x2b, 0x2f, 0xd1, 0xad, 0x97,
-	0x95, 0xa8, 0xf5, 0xff, 0x4d, 0x34, 0xe1, 0x0e, 0x3f, 0x2e, 0x00, 0xde, 0xa7, 0x3c, 0x1c, 0xa4,
-	0xbe, 0x63, 0x73, 0x59, 0xf1, 0x4b, 0x89, 0x54, 0x06, 0x4d, 0xa2, 0xa4, 0xdf, 0x1c, 0xc1, 0x52,
-	0x15, 0xf5, 0xaf, 0x24, 0x11, 0xcf, 0x10, 0xd9, 0x9c, 0x80, 0x08, 0x31, 0xe0, 0x38, 0xa0, 0x63,
-	0x8f, 0x7c, 0x70, 0x16, 0x3a, 0x52, 0x9d, 0xe2, 0xdf, 0x17, 0x60, 0x36, 0xe5, 0x9e, 0x8c, 0xb5,
-	0x54, 0x11, 0x67, 0x5f, 0xe1, 0x2b, 0x37, 0x46, 0x5f, 0xa0, 0x38, 0xfa, 0x83, 0xe4, 0xe8, 0xb7,
-	0x88, 0x6c, 0x4f, 0xfc, 0x7a, 0xe1, 0x83, 0xfe, 0x03, 0xaa, 0x0e, 0xc8, 0xbd, 0xb3, 0xbf, 0x58,
-	0xd2, 0x7d, 0xe3, 0x67, 0x05, 0x98, 0x4d, 0xb9, 0xc8, 0x67, 0x30, 0x96, 0xfd, 0x91, 0x21, 0x83,
-	0xb1, 0xbc, 0x6f, 0x04, 0xbd, 0x77, 0x08, 0xd9, 0x18, 0xb7, 0x23, 0x59, 0x3d, 0x1c, 0xf4, 0x1b,
-	0x30, 0xa5, 0x93, 0x9d, 0x89, 0x1b, 0x94, 0x0c, 0x9f, 0xf8, 0x79, 0x01, 0xe6, 0x33, 0xbe, 0x2a,
-	0xe0, 0x9b, 0xe9, 0x9d, 0x73, 0xee, 0x97, 0x8f, 0xca, 0xdb, 0xe3, 0x2d, 0x52, 0x6c, 0xfd, 0x46,
-	0xb2, 0xf5, 0x4b, 0xa4, 0x8e, 0x91, 0x71, 0xd8, 0xea, 0xa6, 0xfb, 0x0e, 0x18, 0xfb, 0x88, 0x7c,
-	0x38, 0x39, 0x63, 0xd9, 0x7e, 0xd7, 0x3e, 0x86, 0xf9, 0x36, 0x73, 0xd2, 0x32, 0x5d, 0xc3, 0xb1,
-	0xef, 0x2f, 0xbb, 0x41, 0x2b, 0xbd, 0x8b, 0x0e, 0x6e, 0x2b, 0x53, 0x8b, 0x75, 0x0c, 0xd7, 0x6a,
-	0x30, 0xdf, 0xd2, 0x2c, 0xea, 0x86, 0x8d, 0xb6, 0x26, 0xa7, 0x0c, 0xcf, 0xe6, 0xb1, 0xbf, 0x47,
-	0xdf, 0xb1, 0x99, 0xf8, 0x0f, 0x42, 0x87, 0xd3, 0xa1, 0xd5, 0xcd, 0xff, 0x05, 0x00, 0x00, 0xff,
-	0xff, 0x7f, 0x49, 0x56, 0x46, 0xa0, 0x1d, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/iot/v1/resources.pb.go b/googleapis/cloud/iot/v1/resources.pb.go
index 584e614f98..18e0d234bf 100644
--- a/googleapis/cloud/iot/v1/resources.pb.go
+++ b/googleapis/cloud/iot/v1/resources.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/iot/v1/resources.proto
 
-package iot // import "google.golang.org/genproto/googleapis/cloud/iot/v1"
+package iot
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates whether an MQTT connection is enabled or disabled. See the field
 // description for details.
@@ -39,6 +42,7 @@ var MqttState_name = map[int32]string{
 	1: "MQTT_ENABLED",
 	2: "MQTT_DISABLED",
 }
+
 var MqttState_value = map[string]int32{
 	"MQTT_STATE_UNSPECIFIED": 0,
 	"MQTT_ENABLED":           1,
@@ -48,8 +52,9 @@ var MqttState_value = map[string]int32{
 func (x MqttState) String() string {
 	return proto.EnumName(MqttState_name, int32(x))
 }
+
 func (MqttState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{0}
+	return fileDescriptor_b8dc5e858286fc66, []int{0}
 }
 
 // Indicates whether DeviceService (HTTP) is enabled or disabled for the
@@ -71,6 +76,7 @@ var HttpState_name = map[int32]string{
 	1: "HTTP_ENABLED",
 	2: "HTTP_DISABLED",
 }
+
 var HttpState_value = map[string]int32{
 	"HTTP_STATE_UNSPECIFIED": 0,
 	"HTTP_ENABLED":           1,
@@ -80,8 +86,9 @@ var HttpState_value = map[string]int32{
 func (x HttpState) String() string {
 	return proto.EnumName(HttpState_name, int32(x))
 }
+
 func (HttpState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{1}
+	return fileDescriptor_b8dc5e858286fc66, []int{1}
 }
 
 // **Beta Feature**
@@ -113,6 +120,7 @@ var LogLevel_name = map[int32]string{
 	30: "INFO",
 	40: "DEBUG",
 }
+
 var LogLevel_value = map[string]int32{
 	"LOG_LEVEL_UNSPECIFIED": 0,
 	"NONE":                  10,
@@ -124,8 +132,9 @@ var LogLevel_value = map[string]int32{
 func (x LogLevel) String() string {
 	return proto.EnumName(LogLevel_name, int32(x))
 }
+
 func (LogLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{2}
+	return fileDescriptor_b8dc5e858286fc66, []int{2}
 }
 
 // Gateway type.
@@ -145,6 +154,7 @@ var GatewayType_name = map[int32]string{
 	1: "GATEWAY",
 	2: "NON_GATEWAY",
 }
+
 var GatewayType_value = map[string]int32{
 	"GATEWAY_TYPE_UNSPECIFIED": 0,
 	"GATEWAY":                  1,
@@ -154,8 +164,9 @@ var GatewayType_value = map[string]int32{
 func (x GatewayType) String() string {
 	return proto.EnumName(GatewayType_name, int32(x))
 }
+
 func (GatewayType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{3}
+	return fileDescriptor_b8dc5e858286fc66, []int{3}
 }
 
 // The gateway authorization/authentication method. This setting determines how
@@ -184,6 +195,7 @@ var GatewayAuthMethod_name = map[int32]string{
 	2: "DEVICE_AUTH_TOKEN_ONLY",
 	3: "ASSOCIATION_AND_DEVICE_AUTH_TOKEN",
 }
+
 var GatewayAuthMethod_value = map[string]int32{
 	"GATEWAY_AUTH_METHOD_UNSPECIFIED":   0,
 	"ASSOCIATION_ONLY":                  1,
@@ -194,8 +206,9 @@ var GatewayAuthMethod_value = map[string]int32{
 func (x GatewayAuthMethod) String() string {
 	return proto.EnumName(GatewayAuthMethod_name, int32(x))
 }
+
 func (GatewayAuthMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{4}
+	return fileDescriptor_b8dc5e858286fc66, []int{4}
 }
 
 // The supported formats for the public key.
@@ -215,6 +228,7 @@ var PublicKeyCertificateFormat_name = map[int32]string{
 	0: "UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT",
 	1: "X509_CERTIFICATE_PEM",
 }
+
 var PublicKeyCertificateFormat_value = map[string]int32{
 	"UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT": 0,
 	"X509_CERTIFICATE_PEM":                      1,
@@ -223,8 +237,9 @@ var PublicKeyCertificateFormat_value = map[string]int32{
 func (x PublicKeyCertificateFormat) String() string {
 	return proto.EnumName(PublicKeyCertificateFormat_name, int32(x))
 }
+
 func (PublicKeyCertificateFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{5}
+	return fileDescriptor_b8dc5e858286fc66, []int{5}
 }
 
 // The supported formats for the public key.
@@ -262,6 +277,7 @@ var PublicKeyFormat_name = map[int32]string{
 	2: "ES256_PEM",
 	4: "ES256_X509_PEM",
 }
+
 var PublicKeyFormat_value = map[string]int32{
 	"UNSPECIFIED_PUBLIC_KEY_FORMAT": 0,
 	"RSA_PEM":                       3,
@@ -273,8 +289,9 @@ var PublicKeyFormat_value = map[string]int32{
 func (x PublicKeyFormat) String() string {
 	return proto.EnumName(PublicKeyFormat_name, int32(x))
 }
+
 func (PublicKeyFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{6}
+	return fileDescriptor_b8dc5e858286fc66, []int{6}
 }
 
 // The device resource.
@@ -371,16 +388,17 @@ func (m *Device) Reset()         { *m = Device{} }
 func (m *Device) String() string { return proto.CompactTextString(m) }
 func (*Device) ProtoMessage()    {}
 func (*Device) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{0}
+	return fileDescriptor_b8dc5e858286fc66, []int{0}
 }
+
 func (m *Device) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Device.Unmarshal(m, b)
 }
 func (m *Device) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Device.Marshal(b, m, deterministic)
 }
-func (dst *Device) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Device.Merge(dst, src)
+func (m *Device) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device.Merge(m, src)
 }
 func (m *Device) XXX_Size() int {
 	return xxx_messageInfo_Device.Size(m)
@@ -531,16 +549,17 @@ func (m *GatewayConfig) Reset()         { *m = GatewayConfig{} }
 func (m *GatewayConfig) String() string { return proto.CompactTextString(m) }
 func (*GatewayConfig) ProtoMessage()    {}
 func (*GatewayConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{1}
+	return fileDescriptor_b8dc5e858286fc66, []int{1}
 }
+
 func (m *GatewayConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GatewayConfig.Unmarshal(m, b)
 }
 func (m *GatewayConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GatewayConfig.Marshal(b, m, deterministic)
 }
-func (dst *GatewayConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GatewayConfig.Merge(dst, src)
+func (m *GatewayConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GatewayConfig.Merge(m, src)
 }
 func (m *GatewayConfig) XXX_Size() int {
 	return xxx_messageInfo_GatewayConfig.Size(m)
@@ -633,16 +652,17 @@ func (m *DeviceRegistry) Reset()         { *m = DeviceRegistry{} }
 func (m *DeviceRegistry) String() string { return proto.CompactTextString(m) }
 func (*DeviceRegistry) ProtoMessage()    {}
 func (*DeviceRegistry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{2}
+	return fileDescriptor_b8dc5e858286fc66, []int{2}
 }
+
 func (m *DeviceRegistry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceRegistry.Unmarshal(m, b)
 }
 func (m *DeviceRegistry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceRegistry.Marshal(b, m, deterministic)
 }
-func (dst *DeviceRegistry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceRegistry.Merge(dst, src)
+func (m *DeviceRegistry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceRegistry.Merge(m, src)
 }
 func (m *DeviceRegistry) XXX_Size() int {
 	return xxx_messageInfo_DeviceRegistry.Size(m)
@@ -723,16 +743,17 @@ func (m *MqttConfig) Reset()         { *m = MqttConfig{} }
 func (m *MqttConfig) String() string { return proto.CompactTextString(m) }
 func (*MqttConfig) ProtoMessage()    {}
 func (*MqttConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{3}
+	return fileDescriptor_b8dc5e858286fc66, []int{3}
 }
+
 func (m *MqttConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MqttConfig.Unmarshal(m, b)
 }
 func (m *MqttConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MqttConfig.Marshal(b, m, deterministic)
 }
-func (dst *MqttConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MqttConfig.Merge(dst, src)
+func (m *MqttConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MqttConfig.Merge(m, src)
 }
 func (m *MqttConfig) XXX_Size() int {
 	return xxx_messageInfo_MqttConfig.Size(m)
@@ -764,16 +785,17 @@ func (m *HttpConfig) Reset()         { *m = HttpConfig{} }
 func (m *HttpConfig) String() string { return proto.CompactTextString(m) }
 func (*HttpConfig) ProtoMessage()    {}
 func (*HttpConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{4}
+	return fileDescriptor_b8dc5e858286fc66, []int{4}
 }
+
 func (m *HttpConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpConfig.Unmarshal(m, b)
 }
 func (m *HttpConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpConfig.Marshal(b, m, deterministic)
 }
-func (dst *HttpConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpConfig.Merge(dst, src)
+func (m *HttpConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpConfig.Merge(m, src)
 }
 func (m *HttpConfig) XXX_Size() int {
 	return xxx_messageInfo_HttpConfig.Size(m)
@@ -810,16 +832,17 @@ func (m *EventNotificationConfig) Reset()         { *m = EventNotificationConfig
 func (m *EventNotificationConfig) String() string { return proto.CompactTextString(m) }
 func (*EventNotificationConfig) ProtoMessage()    {}
 func (*EventNotificationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{5}
+	return fileDescriptor_b8dc5e858286fc66, []int{5}
 }
+
 func (m *EventNotificationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventNotificationConfig.Unmarshal(m, b)
 }
 func (m *EventNotificationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EventNotificationConfig.Marshal(b, m, deterministic)
 }
-func (dst *EventNotificationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventNotificationConfig.Merge(dst, src)
+func (m *EventNotificationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventNotificationConfig.Merge(m, src)
 }
 func (m *EventNotificationConfig) XXX_Size() int {
 	return xxx_messageInfo_EventNotificationConfig.Size(m)
@@ -858,16 +881,17 @@ func (m *StateNotificationConfig) Reset()         { *m = StateNotificationConfig
 func (m *StateNotificationConfig) String() string { return proto.CompactTextString(m) }
 func (*StateNotificationConfig) ProtoMessage()    {}
 func (*StateNotificationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{6}
+	return fileDescriptor_b8dc5e858286fc66, []int{6}
 }
+
 func (m *StateNotificationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StateNotificationConfig.Unmarshal(m, b)
 }
 func (m *StateNotificationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StateNotificationConfig.Marshal(b, m, deterministic)
 }
-func (dst *StateNotificationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StateNotificationConfig.Merge(dst, src)
+func (m *StateNotificationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StateNotificationConfig.Merge(m, src)
 }
 func (m *StateNotificationConfig) XXX_Size() int {
 	return xxx_messageInfo_StateNotificationConfig.Size(m)
@@ -901,16 +925,17 @@ func (m *RegistryCredential) Reset()         { *m = RegistryCredential{} }
 func (m *RegistryCredential) String() string { return proto.CompactTextString(m) }
 func (*RegistryCredential) ProtoMessage()    {}
 func (*RegistryCredential) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{7}
+	return fileDescriptor_b8dc5e858286fc66, []int{7}
 }
+
 func (m *RegistryCredential) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegistryCredential.Unmarshal(m, b)
 }
 func (m *RegistryCredential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RegistryCredential.Marshal(b, m, deterministic)
 }
-func (dst *RegistryCredential) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RegistryCredential.Merge(dst, src)
+func (m *RegistryCredential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegistryCredential.Merge(m, src)
 }
 func (m *RegistryCredential) XXX_Size() int {
 	return xxx_messageInfo_RegistryCredential.Size(m)
@@ -945,61 +970,13 @@ func (m *RegistryCredential) GetPublicKeyCertificate() *PublicKeyCertificate {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RegistryCredential) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RegistryCredential_OneofMarshaler, _RegistryCredential_OneofUnmarshaler, _RegistryCredential_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RegistryCredential) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RegistryCredential_PublicKeyCertificate)(nil),
 	}
 }
 
-func _RegistryCredential_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RegistryCredential)
-	// credential
-	switch x := m.Credential.(type) {
-	case *RegistryCredential_PublicKeyCertificate:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PublicKeyCertificate); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RegistryCredential.Credential has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RegistryCredential_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RegistryCredential)
-	switch tag {
-	case 1: // credential.public_key_certificate
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PublicKeyCertificate)
-		err := b.DecodeMessage(msg)
-		m.Credential = &RegistryCredential_PublicKeyCertificate{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RegistryCredential_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RegistryCredential)
-	// credential
-	switch x := m.Credential.(type) {
-	case *RegistryCredential_PublicKeyCertificate:
-		s := proto.Size(x.PublicKeyCertificate)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Details of an X.509 certificate. For informational purposes only.
 type X509CertificateDetails struct {
 	// The entity that signed the certificate.
@@ -1023,16 +1000,17 @@ func (m *X509CertificateDetails) Reset()         { *m = X509CertificateDetails{}
 func (m *X509CertificateDetails) String() string { return proto.CompactTextString(m) }
 func (*X509CertificateDetails) ProtoMessage()    {}
 func (*X509CertificateDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{8}
+	return fileDescriptor_b8dc5e858286fc66, []int{8}
 }
+
 func (m *X509CertificateDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_X509CertificateDetails.Unmarshal(m, b)
 }
 func (m *X509CertificateDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_X509CertificateDetails.Marshal(b, m, deterministic)
 }
-func (dst *X509CertificateDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_X509CertificateDetails.Merge(dst, src)
+func (m *X509CertificateDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_X509CertificateDetails.Merge(m, src)
 }
 func (m *X509CertificateDetails) XXX_Size() int {
 	return xxx_messageInfo_X509CertificateDetails.Size(m)
@@ -1102,16 +1080,17 @@ func (m *PublicKeyCertificate) Reset()         { *m = PublicKeyCertificate{} }
 func (m *PublicKeyCertificate) String() string { return proto.CompactTextString(m) }
 func (*PublicKeyCertificate) ProtoMessage()    {}
 func (*PublicKeyCertificate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{9}
+	return fileDescriptor_b8dc5e858286fc66, []int{9}
 }
+
 func (m *PublicKeyCertificate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublicKeyCertificate.Unmarshal(m, b)
 }
 func (m *PublicKeyCertificate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublicKeyCertificate.Marshal(b, m, deterministic)
 }
-func (dst *PublicKeyCertificate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublicKeyCertificate.Merge(dst, src)
+func (m *PublicKeyCertificate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublicKeyCertificate.Merge(m, src)
 }
 func (m *PublicKeyCertificate) XXX_Size() int {
 	return xxx_messageInfo_PublicKeyCertificate.Size(m)
@@ -1163,16 +1142,17 @@ func (m *DeviceCredential) Reset()         { *m = DeviceCredential{} }
 func (m *DeviceCredential) String() string { return proto.CompactTextString(m) }
 func (*DeviceCredential) ProtoMessage()    {}
 func (*DeviceCredential) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{10}
+	return fileDescriptor_b8dc5e858286fc66, []int{10}
 }
+
 func (m *DeviceCredential) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceCredential.Unmarshal(m, b)
 }
 func (m *DeviceCredential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceCredential.Marshal(b, m, deterministic)
 }
-func (dst *DeviceCredential) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceCredential.Merge(dst, src)
+func (m *DeviceCredential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceCredential.Merge(m, src)
 }
 func (m *DeviceCredential) XXX_Size() int {
 	return xxx_messageInfo_DeviceCredential.Size(m)
@@ -1214,61 +1194,13 @@ func (m *DeviceCredential) GetExpirationTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DeviceCredential) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DeviceCredential_OneofMarshaler, _DeviceCredential_OneofUnmarshaler, _DeviceCredential_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DeviceCredential) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DeviceCredential_PublicKey)(nil),
 	}
 }
 
-func _DeviceCredential_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DeviceCredential)
-	// credential
-	switch x := m.Credential.(type) {
-	case *DeviceCredential_PublicKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PublicKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DeviceCredential.Credential has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DeviceCredential_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DeviceCredential)
-	switch tag {
-	case 2: // credential.public_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PublicKeyCredential)
-		err := b.DecodeMessage(msg)
-		m.Credential = &DeviceCredential_PublicKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DeviceCredential_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DeviceCredential)
-	// credential
-	switch x := m.Credential.(type) {
-	case *DeviceCredential_PublicKey:
-		s := proto.Size(x.PublicKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A public key format and data.
 type PublicKeyCredential struct {
 	// The format of the key.
@@ -1284,16 +1216,17 @@ func (m *PublicKeyCredential) Reset()         { *m = PublicKeyCredential{} }
 func (m *PublicKeyCredential) String() string { return proto.CompactTextString(m) }
 func (*PublicKeyCredential) ProtoMessage()    {}
 func (*PublicKeyCredential) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{11}
+	return fileDescriptor_b8dc5e858286fc66, []int{11}
 }
+
 func (m *PublicKeyCredential) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublicKeyCredential.Unmarshal(m, b)
 }
 func (m *PublicKeyCredential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublicKeyCredential.Marshal(b, m, deterministic)
 }
-func (dst *PublicKeyCredential) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublicKeyCredential.Merge(dst, src)
+func (m *PublicKeyCredential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublicKeyCredential.Merge(m, src)
 }
 func (m *PublicKeyCredential) XXX_Size() int {
 	return xxx_messageInfo_PublicKeyCredential.Size(m)
@@ -1349,16 +1282,17 @@ func (m *DeviceConfig) Reset()         { *m = DeviceConfig{} }
 func (m *DeviceConfig) String() string { return proto.CompactTextString(m) }
 func (*DeviceConfig) ProtoMessage()    {}
 func (*DeviceConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{12}
+	return fileDescriptor_b8dc5e858286fc66, []int{12}
 }
+
 func (m *DeviceConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceConfig.Unmarshal(m, b)
 }
 func (m *DeviceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceConfig.Marshal(b, m, deterministic)
 }
-func (dst *DeviceConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceConfig.Merge(dst, src)
+func (m *DeviceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceConfig.Merge(m, src)
 }
 func (m *DeviceConfig) XXX_Size() int {
 	return xxx_messageInfo_DeviceConfig.Size(m)
@@ -1413,16 +1347,17 @@ func (m *DeviceState) Reset()         { *m = DeviceState{} }
 func (m *DeviceState) String() string { return proto.CompactTextString(m) }
 func (*DeviceState) ProtoMessage()    {}
 func (*DeviceState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_84fa34c15d3e060d, []int{13}
+	return fileDescriptor_b8dc5e858286fc66, []int{13}
 }
+
 func (m *DeviceState) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceState.Unmarshal(m, b)
 }
 func (m *DeviceState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceState.Marshal(b, m, deterministic)
 }
-func (dst *DeviceState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceState.Merge(dst, src)
+func (m *DeviceState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceState.Merge(m, src)
 }
 func (m *DeviceState) XXX_Size() int {
 	return xxx_messageInfo_DeviceState.Size(m)
@@ -1448,6 +1383,13 @@ func (m *DeviceState) GetBinaryData() []byte {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.iot.v1.MqttState", MqttState_name, MqttState_value)
+	proto.RegisterEnum("google.cloud.iot.v1.HttpState", HttpState_name, HttpState_value)
+	proto.RegisterEnum("google.cloud.iot.v1.LogLevel", LogLevel_name, LogLevel_value)
+	proto.RegisterEnum("google.cloud.iot.v1.GatewayType", GatewayType_name, GatewayType_value)
+	proto.RegisterEnum("google.cloud.iot.v1.GatewayAuthMethod", GatewayAuthMethod_name, GatewayAuthMethod_value)
+	proto.RegisterEnum("google.cloud.iot.v1.PublicKeyCertificateFormat", PublicKeyCertificateFormat_name, PublicKeyCertificateFormat_value)
+	proto.RegisterEnum("google.cloud.iot.v1.PublicKeyFormat", PublicKeyFormat_name, PublicKeyFormat_value)
 	proto.RegisterType((*Device)(nil), "google.cloud.iot.v1.Device")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.iot.v1.Device.MetadataEntry")
 	proto.RegisterType((*GatewayConfig)(nil), "google.cloud.iot.v1.GatewayConfig")
@@ -1463,20 +1405,13 @@ func init() {
 	proto.RegisterType((*PublicKeyCredential)(nil), "google.cloud.iot.v1.PublicKeyCredential")
 	proto.RegisterType((*DeviceConfig)(nil), "google.cloud.iot.v1.DeviceConfig")
 	proto.RegisterType((*DeviceState)(nil), "google.cloud.iot.v1.DeviceState")
-	proto.RegisterEnum("google.cloud.iot.v1.MqttState", MqttState_name, MqttState_value)
-	proto.RegisterEnum("google.cloud.iot.v1.HttpState", HttpState_name, HttpState_value)
-	proto.RegisterEnum("google.cloud.iot.v1.LogLevel", LogLevel_name, LogLevel_value)
-	proto.RegisterEnum("google.cloud.iot.v1.GatewayType", GatewayType_name, GatewayType_value)
-	proto.RegisterEnum("google.cloud.iot.v1.GatewayAuthMethod", GatewayAuthMethod_name, GatewayAuthMethod_value)
-	proto.RegisterEnum("google.cloud.iot.v1.PublicKeyCertificateFormat", PublicKeyCertificateFormat_name, PublicKeyCertificateFormat_value)
-	proto.RegisterEnum("google.cloud.iot.v1.PublicKeyFormat", PublicKeyFormat_name, PublicKeyFormat_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/iot/v1/resources.proto", fileDescriptor_resources_84fa34c15d3e060d)
+	proto.RegisterFile("google/cloud/iot/v1/resources.proto", fileDescriptor_b8dc5e858286fc66)
 }
 
-var fileDescriptor_resources_84fa34c15d3e060d = []byte{
+var fileDescriptor_b8dc5e858286fc66 = []byte{
 	// 1672 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0xdd, 0x72, 0xdb, 0xc6,
 	0x15, 0x36, 0xa8, 0x1f, 0x8b, 0x07, 0x22, 0x05, 0xae, 0x64, 0x09, 0xe1, 0x24, 0xb1, 0xcc, 0x34,
diff --git a/googleapis/cloud/irm/v1alpha2/incidents.pb.go b/googleapis/cloud/irm/v1alpha2/incidents.pb.go
index 3a82faa47e..fb33b53989 100644
--- a/googleapis/cloud/irm/v1alpha2/incidents.pb.go
+++ b/googleapis/cloud/irm/v1alpha2/incidents.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/irm/v1alpha2/incidents.proto
 
-package irm // import "google.golang.org/genproto/googleapis/cloud/irm/v1alpha2"
+package irm
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/monitoring/v3"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/monitoring/v3"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes whether the alerting condition is still firing.
 type Signal_State int32
@@ -39,6 +42,7 @@ var Signal_State_name = map[int32]string{
 	1: "STATE_OPEN",
 	2: "STATE_CLOSED",
 }
+
 var Signal_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"STATE_OPEN":        1,
@@ -48,8 +52,9 @@ var Signal_State_value = map[string]int32{
 func (x Signal_State) String() string {
 	return proto.EnumName(Signal_State_name, int32(x))
 }
+
 func (Signal_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{1, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{1, 0}
 }
 
 // Specifies the escalation level of this incident, within the IRM protocol
@@ -68,6 +73,7 @@ var Incident_EscalationLevel_name = map[int32]string{
 	0: "ESCALATION_LEVEL_UNSPECIFIED",
 	1: "ESCALATION_LEVEL_ORGANIZATION",
 }
+
 var Incident_EscalationLevel_value = map[string]int32{
 	"ESCALATION_LEVEL_UNSPECIFIED":  0,
 	"ESCALATION_LEVEL_ORGANIZATION": 1,
@@ -76,8 +82,9 @@ var Incident_EscalationLevel_value = map[string]int32{
 func (x Incident_EscalationLevel) String() string {
 	return proto.EnumName(Incident_EscalationLevel_name, int32(x))
 }
+
 func (Incident_EscalationLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{5, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{5, 0}
 }
 
 // Severity of an incident.
@@ -106,6 +113,7 @@ var Incident_Severity_name = map[int32]string{
 	4: "SEVERITY_MINOR",
 	5: "SEVERITY_NEGLIGIBLE",
 }
+
 var Incident_Severity_value = map[string]int32{
 	"SEVERITY_UNSPECIFIED": 0,
 	"SEVERITY_HUGE":        1,
@@ -118,8 +126,9 @@ var Incident_Severity_value = map[string]int32{
 func (x Incident_Severity) String() string {
 	return proto.EnumName(Incident_Severity_name, int32(x))
 }
+
 func (Incident_Severity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{5, 1}
+	return fileDescriptor_7ed49c995593d5b8, []int{5, 1}
 }
 
 // Stage of an incident.
@@ -158,6 +167,7 @@ var Incident_Stage_name = map[int32]string{
 	5: "STAGE_DOCUMENTED",
 	6: "STAGE_DUPLICATE",
 }
+
 var Incident_Stage_value = map[string]int32{
 	"STAGE_UNSPECIFIED": 0,
 	"STAGE_DETECTED":    4,
@@ -171,8 +181,9 @@ var Incident_Stage_value = map[string]int32{
 func (x Incident_Stage) String() string {
 	return proto.EnumName(Incident_Stage_name, int32(x))
 }
+
 func (Incident_Stage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{5, 2}
+	return fileDescriptor_7ed49c995593d5b8, []int{5, 2}
 }
 
 // The type of channel/venue for incident communications.
@@ -192,6 +203,7 @@ var Incident_CommunicationVenue_ChannelType_name = map[int32]string{
 	1: "CHANNEL_TYPE_URI",
 	5: "CHANNEL_TYPE_SLACK",
 }
+
 var Incident_CommunicationVenue_ChannelType_value = map[string]int32{
 	"CHANNEL_TYPE_UNSPECIFIED": 0,
 	"CHANNEL_TYPE_URI":         1,
@@ -201,8 +213,9 @@ var Incident_CommunicationVenue_ChannelType_value = map[string]int32{
 func (x Incident_CommunicationVenue_ChannelType) String() string {
 	return proto.EnumName(Incident_CommunicationVenue_ChannelType_name, int32(x))
 }
+
 func (Incident_CommunicationVenue_ChannelType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{5, 0, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{5, 0, 0}
 }
 
 // List of possible roles.
@@ -243,6 +256,7 @@ var IncidentRole_Type_name = map[int32]string{
 	6: "TYPE_SECONDARY_ONCALL",
 	7: "TYPE_OTHER",
 }
+
 var IncidentRole_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":                           0,
 	"TYPE_INCIDENT_COMMANDER":                    1,
@@ -257,8 +271,9 @@ var IncidentRole_Type_value = map[string]int32{
 func (x IncidentRole_Type) String() string {
 	return proto.EnumName(IncidentRole_Type_name, int32(x))
 }
+
 func (IncidentRole_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{6, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{6, 0}
 }
 
 // Possible types of an artifact.
@@ -278,6 +293,7 @@ var Artifact_Type_name = map[int32]string{
 	1: "TYPE_URL",
 	4: "TYPE_JIRA_ISSUE",
 }
+
 var Artifact_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"TYPE_URL":         1,
@@ -287,8 +303,9 @@ var Artifact_Type_value = map[string]int32{
 func (x Artifact_Type) String() string {
 	return proto.EnumName(Artifact_Type_name, int32(x))
 }
+
 func (Artifact_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{8, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{8, 0}
 }
 
 // Types of changes that users can subscribe to in an incident.
@@ -320,6 +337,7 @@ var Subscription_EventType_name = map[int32]string{
 	5: "EVENT_TYPE_ANNOTATION_ADD",
 	6: "EVENT_TYPE_ANNOTATION_CHANGE",
 }
+
 var Subscription_EventType_value = map[string]int32{
 	"EVENT_TYPE_UNSPECIFIED":       0,
 	"EVENT_TYPE_TITLE_CHANGE":      1,
@@ -333,8 +351,9 @@ var Subscription_EventType_value = map[string]int32{
 func (x Subscription_EventType) String() string {
 	return proto.EnumName(Subscription_EventType_name, int32(x))
 }
+
 func (Subscription_EventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{10, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{10, 0}
 }
 
 // A user of the IRM app.
@@ -354,16 +373,17 @@ func (m *User) Reset()         { *m = User{} }
 func (m *User) String() string { return proto.CompactTextString(m) }
 func (*User) ProtoMessage()    {}
 func (*User) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{0}
+	return fileDescriptor_7ed49c995593d5b8, []int{0}
 }
+
 func (m *User) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_User.Unmarshal(m, b)
 }
 func (m *User) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_User.Marshal(b, m, deterministic)
 }
-func (dst *User) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_User.Merge(dst, src)
+func (m *User) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_User.Merge(m, src)
 }
 func (m *User) XXX_Size() int {
 	return xxx_messageInfo_User.Size(m)
@@ -411,72 +431,14 @@ func (m *User) GetEmail() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*User) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _User_OneofMarshaler, _User_OneofUnmarshaler, _User_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*User) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*User_UserId)(nil),
 		(*User_Email)(nil),
 	}
 }
 
-func _User_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*User)
-	// user
-	switch x := m.User.(type) {
-	case *User_UserId:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.UserId)
-	case *User_Email:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Email)
-	case nil:
-	default:
-		return fmt.Errorf("User.User has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _User_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*User)
-	switch tag {
-	case 1: // user.user_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.User = &User_UserId{x}
-		return true, err
-	case 2: // user.email
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.User = &User_Email{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _User_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*User)
-	// user
-	switch x := m.User.(type) {
-	case *User_UserId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.UserId)))
-		n += len(x.UserId)
-	case *User_Email:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Email)))
-		n += len(x.Email)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A signal is a message calling attention to a (potential) incident. An example
 // is a page based on a Stackdriver Alerting policy.
 type Signal struct {
@@ -525,16 +487,17 @@ func (m *Signal) Reset()         { *m = Signal{} }
 func (m *Signal) String() string { return proto.CompactTextString(m) }
 func (*Signal) ProtoMessage()    {}
 func (*Signal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{1}
+	return fileDescriptor_7ed49c995593d5b8, []int{1}
 }
+
 func (m *Signal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Signal.Unmarshal(m, b)
 }
 func (m *Signal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Signal.Marshal(b, m, deterministic)
 }
-func (dst *Signal) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Signal.Merge(dst, src)
+func (m *Signal) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Signal.Merge(m, src)
 }
 func (m *Signal) XXX_Size() int {
 	return xxx_messageInfo_Signal.Size(m)
@@ -647,16 +610,17 @@ func (m *Signal_SignalArtifact) Reset()         { *m = Signal_SignalArtifact{} }
 func (m *Signal_SignalArtifact) String() string { return proto.CompactTextString(m) }
 func (*Signal_SignalArtifact) ProtoMessage()    {}
 func (*Signal_SignalArtifact) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{1, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{1, 0}
 }
+
 func (m *Signal_SignalArtifact) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Signal_SignalArtifact.Unmarshal(m, b)
 }
 func (m *Signal_SignalArtifact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Signal_SignalArtifact.Marshal(b, m, deterministic)
 }
-func (dst *Signal_SignalArtifact) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Signal_SignalArtifact.Merge(dst, src)
+func (m *Signal_SignalArtifact) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Signal_SignalArtifact.Merge(m, src)
 }
 func (m *Signal_SignalArtifact) XXX_Size() int {
 	return xxx_messageInfo_Signal_SignalArtifact.Size(m)
@@ -698,57 +662,13 @@ func (m *Signal_SignalArtifact) GetUri() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Signal_SignalArtifact) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Signal_SignalArtifact_OneofMarshaler, _Signal_SignalArtifact_OneofUnmarshaler, _Signal_SignalArtifact_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Signal_SignalArtifact) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Signal_SignalArtifact_UserType)(nil),
 	}
 }
 
-func _Signal_SignalArtifact_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Signal_SignalArtifact)
-	// artifact_type
-	switch x := m.ArtifactType.(type) {
-	case *Signal_SignalArtifact_UserType:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.UserType)
-	case nil:
-	default:
-		return fmt.Errorf("Signal_SignalArtifact.ArtifactType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Signal_SignalArtifact_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Signal_SignalArtifact)
-	switch tag {
-	case 2: // artifact_type.user_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ArtifactType = &Signal_SignalArtifact_UserType{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Signal_SignalArtifact_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Signal_SignalArtifact)
-	// artifact_type
-	switch x := m.ArtifactType.(type) {
-	case *Signal_SignalArtifact_UserType:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.UserType)))
-		n += len(x.UserType)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A text annotation by a user.
 type Annotation struct {
 	// Resource name of the annotation, for example,
@@ -769,16 +689,17 @@ func (m *Annotation) Reset()         { *m = Annotation{} }
 func (m *Annotation) String() string { return proto.CompactTextString(m) }
 func (*Annotation) ProtoMessage()    {}
 func (*Annotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{2}
+	return fileDescriptor_7ed49c995593d5b8, []int{2}
 }
+
 func (m *Annotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Annotation.Unmarshal(m, b)
 }
 func (m *Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Annotation.Marshal(b, m, deterministic)
 }
-func (dst *Annotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Annotation.Merge(dst, src)
+func (m *Annotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Annotation.Merge(m, src)
 }
 func (m *Annotation) XXX_Size() int {
 	return xxx_messageInfo_Annotation.Size(m)
@@ -833,16 +754,17 @@ func (m *Tag) Reset()         { *m = Tag{} }
 func (m *Tag) String() string { return proto.CompactTextString(m) }
 func (*Tag) ProtoMessage()    {}
 func (*Tag) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{3}
+	return fileDescriptor_7ed49c995593d5b8, []int{3}
 }
+
 func (m *Tag) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Tag.Unmarshal(m, b)
 }
 func (m *Tag) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Tag.Marshal(b, m, deterministic)
 }
-func (dst *Tag) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Tag.Merge(dst, src)
+func (m *Tag) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Tag.Merge(m, src)
 }
 func (m *Tag) XXX_Size() int {
 	return xxx_messageInfo_Tag.Size(m)
@@ -888,16 +810,17 @@ func (m *Synopsis) Reset()         { *m = Synopsis{} }
 func (m *Synopsis) String() string { return proto.CompactTextString(m) }
 func (*Synopsis) ProtoMessage()    {}
 func (*Synopsis) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{4}
+	return fileDescriptor_7ed49c995593d5b8, []int{4}
 }
+
 func (m *Synopsis) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Synopsis.Unmarshal(m, b)
 }
 func (m *Synopsis) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Synopsis.Marshal(b, m, deterministic)
 }
-func (dst *Synopsis) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Synopsis.Merge(dst, src)
+func (m *Synopsis) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Synopsis.Merge(m, src)
 }
 func (m *Synopsis) XXX_Size() int {
 	return xxx_messageInfo_Synopsis.Size(m)
@@ -977,16 +900,17 @@ func (m *Incident) Reset()         { *m = Incident{} }
 func (m *Incident) String() string { return proto.CompactTextString(m) }
 func (*Incident) ProtoMessage()    {}
 func (*Incident) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{5}
+	return fileDescriptor_7ed49c995593d5b8, []int{5}
 }
+
 func (m *Incident) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Incident.Unmarshal(m, b)
 }
 func (m *Incident) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Incident.Marshal(b, m, deterministic)
 }
-func (dst *Incident) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Incident.Merge(dst, src)
+func (m *Incident) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Incident.Merge(m, src)
 }
 func (m *Incident) XXX_Size() int {
 	return xxx_messageInfo_Incident.Size(m)
@@ -1085,16 +1009,17 @@ func (m *Incident_CommunicationVenue) Reset()         { *m = Incident_Communicat
 func (m *Incident_CommunicationVenue) String() string { return proto.CompactTextString(m) }
 func (*Incident_CommunicationVenue) ProtoMessage()    {}
 func (*Incident_CommunicationVenue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{5, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{5, 0}
 }
+
 func (m *Incident_CommunicationVenue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Incident_CommunicationVenue.Unmarshal(m, b)
 }
 func (m *Incident_CommunicationVenue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Incident_CommunicationVenue.Marshal(b, m, deterministic)
 }
-func (dst *Incident_CommunicationVenue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Incident_CommunicationVenue.Merge(dst, src)
+func (m *Incident_CommunicationVenue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Incident_CommunicationVenue.Merge(m, src)
 }
 func (m *Incident_CommunicationVenue) XXX_Size() int {
 	return xxx_messageInfo_Incident_CommunicationVenue.Size(m)
@@ -1145,16 +1070,17 @@ func (m *IncidentRole) Reset()         { *m = IncidentRole{} }
 func (m *IncidentRole) String() string { return proto.CompactTextString(m) }
 func (*IncidentRole) ProtoMessage()    {}
 func (*IncidentRole) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{6}
+	return fileDescriptor_7ed49c995593d5b8, []int{6}
 }
+
 func (m *IncidentRole) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IncidentRole.Unmarshal(m, b)
 }
 func (m *IncidentRole) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IncidentRole.Marshal(b, m, deterministic)
 }
-func (dst *IncidentRole) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IncidentRole.Merge(dst, src)
+func (m *IncidentRole) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IncidentRole.Merge(m, src)
 }
 func (m *IncidentRole) XXX_Size() int {
 	return xxx_messageInfo_IncidentRole.Size(m)
@@ -1231,16 +1157,17 @@ func (m *IncidentRoleAssignment) Reset()         { *m = IncidentRoleAssignment{}
 func (m *IncidentRoleAssignment) String() string { return proto.CompactTextString(m) }
 func (*IncidentRoleAssignment) ProtoMessage()    {}
 func (*IncidentRoleAssignment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{7}
+	return fileDescriptor_7ed49c995593d5b8, []int{7}
 }
+
 func (m *IncidentRoleAssignment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IncidentRoleAssignment.Unmarshal(m, b)
 }
 func (m *IncidentRoleAssignment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IncidentRoleAssignment.Marshal(b, m, deterministic)
 }
-func (dst *IncidentRoleAssignment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IncidentRoleAssignment.Merge(dst, src)
+func (m *IncidentRoleAssignment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IncidentRoleAssignment.Merge(m, src)
 }
 func (m *IncidentRoleAssignment) XXX_Size() int {
 	return xxx_messageInfo_IncidentRoleAssignment.Size(m)
@@ -1310,16 +1237,17 @@ func (m *Artifact) Reset()         { *m = Artifact{} }
 func (m *Artifact) String() string { return proto.CompactTextString(m) }
 func (*Artifact) ProtoMessage()    {}
 func (*Artifact) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{8}
+	return fileDescriptor_7ed49c995593d5b8, []int{8}
 }
+
 func (m *Artifact) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Artifact.Unmarshal(m, b)
 }
 func (m *Artifact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Artifact.Marshal(b, m, deterministic)
 }
-func (dst *Artifact) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Artifact.Merge(dst, src)
+func (m *Artifact) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifact.Merge(m, src)
 }
 func (m *Artifact) XXX_Size() int {
 	return xxx_messageInfo_Artifact.Size(m)
@@ -1383,16 +1311,17 @@ func (m *CommunicationChannel) Reset()         { *m = CommunicationChannel{} }
 func (m *CommunicationChannel) String() string { return proto.CompactTextString(m) }
 func (*CommunicationChannel) ProtoMessage()    {}
 func (*CommunicationChannel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{9}
+	return fileDescriptor_7ed49c995593d5b8, []int{9}
 }
+
 func (m *CommunicationChannel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommunicationChannel.Unmarshal(m, b)
 }
 func (m *CommunicationChannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommunicationChannel.Marshal(b, m, deterministic)
 }
-func (dst *CommunicationChannel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommunicationChannel.Merge(dst, src)
+func (m *CommunicationChannel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommunicationChannel.Merge(m, src)
 }
 func (m *CommunicationChannel) XXX_Size() int {
 	return xxx_messageInfo_CommunicationChannel.Size(m)
@@ -1440,80 +1369,14 @@ func (m *CommunicationChannel) GetNotificationChannel() *CommunicationChannel_No
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CommunicationChannel) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CommunicationChannel_OneofMarshaler, _CommunicationChannel_OneofUnmarshaler, _CommunicationChannel_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CommunicationChannel) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CommunicationChannel_Email_)(nil),
 		(*CommunicationChannel_NotificationChannel_)(nil),
 	}
 }
 
-func _CommunicationChannel_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CommunicationChannel)
-	// endpoint
-	switch x := m.Endpoint.(type) {
-	case *CommunicationChannel_Email_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Email); err != nil {
-			return err
-		}
-	case *CommunicationChannel_NotificationChannel_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NotificationChannel); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CommunicationChannel.Endpoint has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CommunicationChannel_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CommunicationChannel)
-	switch tag {
-	case 1: // endpoint.email
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CommunicationChannel_Email)
-		err := b.DecodeMessage(msg)
-		m.Endpoint = &CommunicationChannel_Email_{msg}
-		return true, err
-	case 2: // endpoint.notification_channel
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CommunicationChannel_NotificationChannel)
-		err := b.DecodeMessage(msg)
-		m.Endpoint = &CommunicationChannel_NotificationChannel_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CommunicationChannel_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CommunicationChannel)
-	// endpoint
-	switch x := m.Endpoint.(type) {
-	case *CommunicationChannel_Email_:
-		s := proto.Size(x.Email)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CommunicationChannel_NotificationChannel_:
-		s := proto.Size(x.NotificationChannel)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A communication channel that delivers messages to an email address.
 type CommunicationChannel_Email struct {
 	// The email address, for example, "user@example.com".
@@ -1527,16 +1390,17 @@ func (m *CommunicationChannel_Email) Reset()         { *m = CommunicationChannel
 func (m *CommunicationChannel_Email) String() string { return proto.CompactTextString(m) }
 func (*CommunicationChannel_Email) ProtoMessage()    {}
 func (*CommunicationChannel_Email) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{9, 0}
+	return fileDescriptor_7ed49c995593d5b8, []int{9, 0}
 }
+
 func (m *CommunicationChannel_Email) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommunicationChannel_Email.Unmarshal(m, b)
 }
 func (m *CommunicationChannel_Email) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommunicationChannel_Email.Marshal(b, m, deterministic)
 }
-func (dst *CommunicationChannel_Email) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommunicationChannel_Email.Merge(dst, src)
+func (m *CommunicationChannel_Email) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommunicationChannel_Email.Merge(m, src)
 }
 func (m *CommunicationChannel_Email) XXX_Size() int {
 	return xxx_messageInfo_CommunicationChannel_Email.Size(m)
@@ -1570,16 +1434,17 @@ func (m *CommunicationChannel_NotificationChannel) Reset() {
 func (m *CommunicationChannel_NotificationChannel) String() string { return proto.CompactTextString(m) }
 func (*CommunicationChannel_NotificationChannel) ProtoMessage()    {}
 func (*CommunicationChannel_NotificationChannel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{9, 1}
+	return fileDescriptor_7ed49c995593d5b8, []int{9, 1}
 }
+
 func (m *CommunicationChannel_NotificationChannel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommunicationChannel_NotificationChannel.Unmarshal(m, b)
 }
 func (m *CommunicationChannel_NotificationChannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommunicationChannel_NotificationChannel.Marshal(b, m, deterministic)
 }
-func (dst *CommunicationChannel_NotificationChannel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommunicationChannel_NotificationChannel.Merge(dst, src)
+func (m *CommunicationChannel_NotificationChannel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommunicationChannel_NotificationChannel.Merge(m, src)
 }
 func (m *CommunicationChannel_NotificationChannel) XXX_Size() int {
 	return xxx_messageInfo_CommunicationChannel_NotificationChannel.Size(m)
@@ -1620,16 +1485,17 @@ func (m *Subscription) Reset()         { *m = Subscription{} }
 func (m *Subscription) String() string { return proto.CompactTextString(m) }
 func (*Subscription) ProtoMessage()    {}
 func (*Subscription) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_a3a68162641107b4, []int{10}
+	return fileDescriptor_7ed49c995593d5b8, []int{10}
 }
+
 func (m *Subscription) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Subscription.Unmarshal(m, b)
 }
 func (m *Subscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Subscription.Marshal(b, m, deterministic)
 }
-func (dst *Subscription) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Subscription.Merge(dst, src)
+func (m *Subscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Subscription.Merge(m, src)
 }
 func (m *Subscription) XXX_Size() int {
 	return xxx_messageInfo_Subscription.Size(m)
@@ -1669,6 +1535,14 @@ func (m *Subscription) GetEventTypes() []Subscription_EventType {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.Signal_State", Signal_State_name, Signal_State_value)
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_EscalationLevel", Incident_EscalationLevel_name, Incident_EscalationLevel_value)
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_Severity", Incident_Severity_name, Incident_Severity_value)
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_Stage", Incident_Stage_name, Incident_Stage_value)
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_CommunicationVenue_ChannelType", Incident_CommunicationVenue_ChannelType_name, Incident_CommunicationVenue_ChannelType_value)
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.IncidentRole_Type", IncidentRole_Type_name, IncidentRole_Type_value)
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.Artifact_Type", Artifact_Type_name, Artifact_Type_value)
+	proto.RegisterEnum("google.cloud.irm.v1alpha2.Subscription_EventType", Subscription_EventType_name, Subscription_EventType_value)
 	proto.RegisterType((*User)(nil), "google.cloud.irm.v1alpha2.User")
 	proto.RegisterType((*Signal)(nil), "google.cloud.irm.v1alpha2.Signal")
 	proto.RegisterType((*Signal_SignalArtifact)(nil), "google.cloud.irm.v1alpha2.Signal.SignalArtifact")
@@ -1684,21 +1558,13 @@ func init() {
 	proto.RegisterType((*CommunicationChannel_Email)(nil), "google.cloud.irm.v1alpha2.CommunicationChannel.Email")
 	proto.RegisterType((*CommunicationChannel_NotificationChannel)(nil), "google.cloud.irm.v1alpha2.CommunicationChannel.NotificationChannel")
 	proto.RegisterType((*Subscription)(nil), "google.cloud.irm.v1alpha2.Subscription")
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.Signal_State", Signal_State_name, Signal_State_value)
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_EscalationLevel", Incident_EscalationLevel_name, Incident_EscalationLevel_value)
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_Severity", Incident_Severity_name, Incident_Severity_value)
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_Stage", Incident_Stage_name, Incident_Stage_value)
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.Incident_CommunicationVenue_ChannelType", Incident_CommunicationVenue_ChannelType_name, Incident_CommunicationVenue_ChannelType_value)
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.IncidentRole_Type", IncidentRole_Type_name, IncidentRole_Type_value)
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.Artifact_Type", Artifact_Type_name, Artifact_Type_value)
-	proto.RegisterEnum("google.cloud.irm.v1alpha2.Subscription_EventType", Subscription_EventType_name, Subscription_EventType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/irm/v1alpha2/incidents.proto", fileDescriptor_incidents_a3a68162641107b4)
+	proto.RegisterFile("google/cloud/irm/v1alpha2/incidents.proto", fileDescriptor_7ed49c995593d5b8)
 }
 
-var fileDescriptor_incidents_a3a68162641107b4 = []byte{
+var fileDescriptor_7ed49c995593d5b8 = []byte{
 	// 1666 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4f, 0x6f, 0xdb, 0xc8,
 	0x15, 0x0f, 0xf5, 0xcf, 0xf2, 0x93, 0xd7, 0x66, 0xc6, 0xde, 0xac, 0xa2, 0x26, 0xbb, 0x0e, 0xf7,
diff --git a/googleapis/cloud/irm/v1alpha2/incidents_service.pb.go b/googleapis/cloud/irm/v1alpha2/incidents_service.pb.go
index efa456bd29..2532dda7d4 100644
--- a/googleapis/cloud/irm/v1alpha2/incidents_service.pb.go
+++ b/googleapis/cloud/irm/v1alpha2/incidents_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/irm/v1alpha2/incidents_service.proto
 
-package irm // import "google.golang.org/genproto/googleapis/cloud/irm/v1alpha2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package irm
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request for the CreateIncident method.
 type CreateIncidentRequest struct {
@@ -45,16 +45,17 @@ func (m *CreateIncidentRequest) Reset()         { *m = CreateIncidentRequest{} }
 func (m *CreateIncidentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateIncidentRequest) ProtoMessage()    {}
 func (*CreateIncidentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{0}
+	return fileDescriptor_701d4f44dccb3929, []int{0}
 }
+
 func (m *CreateIncidentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateIncidentRequest.Unmarshal(m, b)
 }
 func (m *CreateIncidentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateIncidentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateIncidentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateIncidentRequest.Merge(dst, src)
+func (m *CreateIncidentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIncidentRequest.Merge(m, src)
 }
 func (m *CreateIncidentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateIncidentRequest.Size(m)
@@ -93,16 +94,17 @@ func (m *GetIncidentRequest) Reset()         { *m = GetIncidentRequest{} }
 func (m *GetIncidentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIncidentRequest) ProtoMessage()    {}
 func (*GetIncidentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{1}
+	return fileDescriptor_701d4f44dccb3929, []int{1}
 }
+
 func (m *GetIncidentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIncidentRequest.Unmarshal(m, b)
 }
 func (m *GetIncidentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIncidentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIncidentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIncidentRequest.Merge(dst, src)
+func (m *GetIncidentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIncidentRequest.Merge(m, src)
 }
 func (m *GetIncidentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIncidentRequest.Size(m)
@@ -135,16 +137,17 @@ func (m *UpdateIncidentRequest) Reset()         { *m = UpdateIncidentRequest{} }
 func (m *UpdateIncidentRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateIncidentRequest) ProtoMessage()    {}
 func (*UpdateIncidentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{2}
+	return fileDescriptor_701d4f44dccb3929, []int{2}
 }
+
 func (m *UpdateIncidentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateIncidentRequest.Unmarshal(m, b)
 }
 func (m *UpdateIncidentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateIncidentRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateIncidentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateIncidentRequest.Merge(dst, src)
+func (m *UpdateIncidentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateIncidentRequest.Merge(m, src)
 }
 func (m *UpdateIncidentRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateIncidentRequest.Size(m)
@@ -187,16 +190,17 @@ func (m *SearchSimilarIncidentsRequest) Reset()         { *m = SearchSimilarInci
 func (m *SearchSimilarIncidentsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchSimilarIncidentsRequest) ProtoMessage()    {}
 func (*SearchSimilarIncidentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{3}
+	return fileDescriptor_701d4f44dccb3929, []int{3}
 }
+
 func (m *SearchSimilarIncidentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchSimilarIncidentsRequest.Unmarshal(m, b)
 }
 func (m *SearchSimilarIncidentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchSimilarIncidentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchSimilarIncidentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchSimilarIncidentsRequest.Merge(dst, src)
+func (m *SearchSimilarIncidentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchSimilarIncidentsRequest.Merge(m, src)
 }
 func (m *SearchSimilarIncidentsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchSimilarIncidentsRequest.Size(m)
@@ -243,16 +247,17 @@ func (m *SearchSimilarIncidentsResponse) Reset()         { *m = SearchSimilarInc
 func (m *SearchSimilarIncidentsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchSimilarIncidentsResponse) ProtoMessage()    {}
 func (*SearchSimilarIncidentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{4}
+	return fileDescriptor_701d4f44dccb3929, []int{4}
 }
+
 func (m *SearchSimilarIncidentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchSimilarIncidentsResponse.Unmarshal(m, b)
 }
 func (m *SearchSimilarIncidentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchSimilarIncidentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchSimilarIncidentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchSimilarIncidentsResponse.Merge(dst, src)
+func (m *SearchSimilarIncidentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchSimilarIncidentsResponse.Merge(m, src)
 }
 func (m *SearchSimilarIncidentsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchSimilarIncidentsResponse.Size(m)
@@ -292,16 +297,17 @@ func (m *SearchSimilarIncidentsResponse_Result) Reset()         { *m = SearchSim
 func (m *SearchSimilarIncidentsResponse_Result) String() string { return proto.CompactTextString(m) }
 func (*SearchSimilarIncidentsResponse_Result) ProtoMessage()    {}
 func (*SearchSimilarIncidentsResponse_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{4, 0}
+	return fileDescriptor_701d4f44dccb3929, []int{4, 0}
 }
+
 func (m *SearchSimilarIncidentsResponse_Result) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchSimilarIncidentsResponse_Result.Unmarshal(m, b)
 }
 func (m *SearchSimilarIncidentsResponse_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchSimilarIncidentsResponse_Result.Marshal(b, m, deterministic)
 }
-func (dst *SearchSimilarIncidentsResponse_Result) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchSimilarIncidentsResponse_Result.Merge(dst, src)
+func (m *SearchSimilarIncidentsResponse_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchSimilarIncidentsResponse_Result.Merge(m, src)
 }
 func (m *SearchSimilarIncidentsResponse_Result) XXX_Size() int {
 	return xxx_messageInfo_SearchSimilarIncidentsResponse_Result.Size(m)
@@ -335,16 +341,17 @@ func (m *CreateAnnotationRequest) Reset()         { *m = CreateAnnotationRequest
 func (m *CreateAnnotationRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAnnotationRequest) ProtoMessage()    {}
 func (*CreateAnnotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{5}
+	return fileDescriptor_701d4f44dccb3929, []int{5}
 }
+
 func (m *CreateAnnotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAnnotationRequest.Unmarshal(m, b)
 }
 func (m *CreateAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAnnotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAnnotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAnnotationRequest.Merge(dst, src)
+func (m *CreateAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAnnotationRequest.Merge(m, src)
 }
 func (m *CreateAnnotationRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAnnotationRequest.Size(m)
@@ -387,16 +394,17 @@ func (m *ListAnnotationsRequest) Reset()         { *m = ListAnnotationsRequest{}
 func (m *ListAnnotationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAnnotationsRequest) ProtoMessage()    {}
 func (*ListAnnotationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{6}
+	return fileDescriptor_701d4f44dccb3929, []int{6}
 }
+
 func (m *ListAnnotationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAnnotationsRequest.Unmarshal(m, b)
 }
 func (m *ListAnnotationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAnnotationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAnnotationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAnnotationsRequest.Merge(dst, src)
+func (m *ListAnnotationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAnnotationsRequest.Merge(m, src)
 }
 func (m *ListAnnotationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAnnotationsRequest.Size(m)
@@ -443,16 +451,17 @@ func (m *ListAnnotationsResponse) Reset()         { *m = ListAnnotationsResponse
 func (m *ListAnnotationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAnnotationsResponse) ProtoMessage()    {}
 func (*ListAnnotationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{7}
+	return fileDescriptor_701d4f44dccb3929, []int{7}
 }
+
 func (m *ListAnnotationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAnnotationsResponse.Unmarshal(m, b)
 }
 func (m *ListAnnotationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAnnotationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAnnotationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAnnotationsResponse.Merge(dst, src)
+func (m *ListAnnotationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAnnotationsResponse.Merge(m, src)
 }
 func (m *ListAnnotationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAnnotationsResponse.Size(m)
@@ -493,16 +502,17 @@ func (m *CreateTagRequest) Reset()         { *m = CreateTagRequest{} }
 func (m *CreateTagRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTagRequest) ProtoMessage()    {}
 func (*CreateTagRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{8}
+	return fileDescriptor_701d4f44dccb3929, []int{8}
 }
+
 func (m *CreateTagRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTagRequest.Unmarshal(m, b)
 }
 func (m *CreateTagRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTagRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTagRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTagRequest.Merge(dst, src)
+func (m *CreateTagRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTagRequest.Merge(m, src)
 }
 func (m *CreateTagRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTagRequest.Size(m)
@@ -540,16 +550,17 @@ func (m *DeleteTagRequest) Reset()         { *m = DeleteTagRequest{} }
 func (m *DeleteTagRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTagRequest) ProtoMessage()    {}
 func (*DeleteTagRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{9}
+	return fileDescriptor_701d4f44dccb3929, []int{9}
 }
+
 func (m *DeleteTagRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTagRequest.Unmarshal(m, b)
 }
 func (m *DeleteTagRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTagRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTagRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTagRequest.Merge(dst, src)
+func (m *DeleteTagRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTagRequest.Merge(m, src)
 }
 func (m *DeleteTagRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTagRequest.Size(m)
@@ -585,16 +596,17 @@ func (m *ListTagsRequest) Reset()         { *m = ListTagsRequest{} }
 func (m *ListTagsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTagsRequest) ProtoMessage()    {}
 func (*ListTagsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{10}
+	return fileDescriptor_701d4f44dccb3929, []int{10}
 }
+
 func (m *ListTagsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTagsRequest.Unmarshal(m, b)
 }
 func (m *ListTagsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTagsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTagsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTagsRequest.Merge(dst, src)
+func (m *ListTagsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTagsRequest.Merge(m, src)
 }
 func (m *ListTagsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTagsRequest.Size(m)
@@ -641,16 +653,17 @@ func (m *ListTagsResponse) Reset()         { *m = ListTagsResponse{} }
 func (m *ListTagsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTagsResponse) ProtoMessage()    {}
 func (*ListTagsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{11}
+	return fileDescriptor_701d4f44dccb3929, []int{11}
 }
+
 func (m *ListTagsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTagsResponse.Unmarshal(m, b)
 }
 func (m *ListTagsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTagsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTagsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTagsResponse.Merge(dst, src)
+func (m *ListTagsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTagsResponse.Merge(m, src)
 }
 func (m *ListTagsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTagsResponse.Size(m)
@@ -691,16 +704,17 @@ func (m *CreateSignalRequest) Reset()         { *m = CreateSignalRequest{} }
 func (m *CreateSignalRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSignalRequest) ProtoMessage()    {}
 func (*CreateSignalRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{12}
+	return fileDescriptor_701d4f44dccb3929, []int{12}
 }
+
 func (m *CreateSignalRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSignalRequest.Unmarshal(m, b)
 }
 func (m *CreateSignalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSignalRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSignalRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSignalRequest.Merge(dst, src)
+func (m *CreateSignalRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSignalRequest.Merge(m, src)
 }
 func (m *CreateSignalRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSignalRequest.Size(m)
@@ -747,16 +761,17 @@ func (m *SearchSignalsRequest) Reset()         { *m = SearchSignalsRequest{} }
 func (m *SearchSignalsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchSignalsRequest) ProtoMessage()    {}
 func (*SearchSignalsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{13}
+	return fileDescriptor_701d4f44dccb3929, []int{13}
 }
+
 func (m *SearchSignalsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchSignalsRequest.Unmarshal(m, b)
 }
 func (m *SearchSignalsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchSignalsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchSignalsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchSignalsRequest.Merge(dst, src)
+func (m *SearchSignalsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchSignalsRequest.Merge(m, src)
 }
 func (m *SearchSignalsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchSignalsRequest.Size(m)
@@ -810,16 +825,17 @@ func (m *SearchSignalsResponse) Reset()         { *m = SearchSignalsResponse{} }
 func (m *SearchSignalsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchSignalsResponse) ProtoMessage()    {}
 func (*SearchSignalsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{14}
+	return fileDescriptor_701d4f44dccb3929, []int{14}
 }
+
 func (m *SearchSignalsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchSignalsResponse.Unmarshal(m, b)
 }
 func (m *SearchSignalsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchSignalsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchSignalsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchSignalsResponse.Merge(dst, src)
+func (m *SearchSignalsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchSignalsResponse.Merge(m, src)
 }
 func (m *SearchSignalsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchSignalsResponse.Size(m)
@@ -858,16 +874,17 @@ func (m *GetSignalRequest) Reset()         { *m = GetSignalRequest{} }
 func (m *GetSignalRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSignalRequest) ProtoMessage()    {}
 func (*GetSignalRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{15}
+	return fileDescriptor_701d4f44dccb3929, []int{15}
 }
+
 func (m *GetSignalRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSignalRequest.Unmarshal(m, b)
 }
 func (m *GetSignalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSignalRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSignalRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSignalRequest.Merge(dst, src)
+func (m *GetSignalRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSignalRequest.Merge(m, src)
 }
 func (m *GetSignalRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSignalRequest.Size(m)
@@ -900,16 +917,17 @@ func (m *UpdateSignalRequest) Reset()         { *m = UpdateSignalRequest{} }
 func (m *UpdateSignalRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSignalRequest) ProtoMessage()    {}
 func (*UpdateSignalRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{16}
+	return fileDescriptor_701d4f44dccb3929, []int{16}
 }
+
 func (m *UpdateSignalRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSignalRequest.Unmarshal(m, b)
 }
 func (m *UpdateSignalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSignalRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSignalRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSignalRequest.Merge(dst, src)
+func (m *UpdateSignalRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSignalRequest.Merge(m, src)
 }
 func (m *UpdateSignalRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSignalRequest.Size(m)
@@ -1009,16 +1027,17 @@ func (m *SearchIncidentsRequest) Reset()         { *m = SearchIncidentsRequest{}
 func (m *SearchIncidentsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchIncidentsRequest) ProtoMessage()    {}
 func (*SearchIncidentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{17}
+	return fileDescriptor_701d4f44dccb3929, []int{17}
 }
+
 func (m *SearchIncidentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchIncidentsRequest.Unmarshal(m, b)
 }
 func (m *SearchIncidentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchIncidentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchIncidentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchIncidentsRequest.Merge(dst, src)
+func (m *SearchIncidentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchIncidentsRequest.Merge(m, src)
 }
 func (m *SearchIncidentsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchIncidentsRequest.Size(m)
@@ -1079,16 +1098,17 @@ func (m *SearchIncidentsResponse) Reset()         { *m = SearchIncidentsResponse
 func (m *SearchIncidentsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchIncidentsResponse) ProtoMessage()    {}
 func (*SearchIncidentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{18}
+	return fileDescriptor_701d4f44dccb3929, []int{18}
 }
+
 func (m *SearchIncidentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchIncidentsResponse.Unmarshal(m, b)
 }
 func (m *SearchIncidentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchIncidentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchIncidentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchIncidentsResponse.Merge(dst, src)
+func (m *SearchIncidentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchIncidentsResponse.Merge(m, src)
 }
 func (m *SearchIncidentsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchIncidentsResponse.Size(m)
@@ -1138,16 +1158,17 @@ func (m *EscalateIncidentRequest) Reset()         { *m = EscalateIncidentRequest
 func (m *EscalateIncidentRequest) String() string { return proto.CompactTextString(m) }
 func (*EscalateIncidentRequest) ProtoMessage()    {}
 func (*EscalateIncidentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{19}
+	return fileDescriptor_701d4f44dccb3929, []int{19}
 }
+
 func (m *EscalateIncidentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EscalateIncidentRequest.Unmarshal(m, b)
 }
 func (m *EscalateIncidentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EscalateIncidentRequest.Marshal(b, m, deterministic)
 }
-func (dst *EscalateIncidentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EscalateIncidentRequest.Merge(dst, src)
+func (m *EscalateIncidentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EscalateIncidentRequest.Merge(m, src)
 }
 func (m *EscalateIncidentRequest) XXX_Size() int {
 	return xxx_messageInfo_EscalateIncidentRequest.Size(m)
@@ -1221,16 +1242,17 @@ func (m *EscalateIncidentResponse) Reset()         { *m = EscalateIncidentRespon
 func (m *EscalateIncidentResponse) String() string { return proto.CompactTextString(m) }
 func (*EscalateIncidentResponse) ProtoMessage()    {}
 func (*EscalateIncidentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{20}
+	return fileDescriptor_701d4f44dccb3929, []int{20}
 }
+
 func (m *EscalateIncidentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EscalateIncidentResponse.Unmarshal(m, b)
 }
 func (m *EscalateIncidentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EscalateIncidentResponse.Marshal(b, m, deterministic)
 }
-func (dst *EscalateIncidentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EscalateIncidentResponse.Merge(dst, src)
+func (m *EscalateIncidentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EscalateIncidentResponse.Merge(m, src)
 }
 func (m *EscalateIncidentResponse) XXX_Size() int {
 	return xxx_messageInfo_EscalateIncidentResponse.Size(m)
@@ -1292,16 +1314,17 @@ func (m *CreateArtifactRequest) Reset()         { *m = CreateArtifactRequest{} }
 func (m *CreateArtifactRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateArtifactRequest) ProtoMessage()    {}
 func (*CreateArtifactRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{21}
+	return fileDescriptor_701d4f44dccb3929, []int{21}
 }
+
 func (m *CreateArtifactRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateArtifactRequest.Unmarshal(m, b)
 }
 func (m *CreateArtifactRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateArtifactRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateArtifactRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateArtifactRequest.Merge(dst, src)
+func (m *CreateArtifactRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateArtifactRequest.Merge(m, src)
 }
 func (m *CreateArtifactRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateArtifactRequest.Size(m)
@@ -1344,16 +1367,17 @@ func (m *ListArtifactsRequest) Reset()         { *m = ListArtifactsRequest{} }
 func (m *ListArtifactsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListArtifactsRequest) ProtoMessage()    {}
 func (*ListArtifactsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{22}
+	return fileDescriptor_701d4f44dccb3929, []int{22}
 }
+
 func (m *ListArtifactsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListArtifactsRequest.Unmarshal(m, b)
 }
 func (m *ListArtifactsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListArtifactsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListArtifactsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListArtifactsRequest.Merge(dst, src)
+func (m *ListArtifactsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListArtifactsRequest.Merge(m, src)
 }
 func (m *ListArtifactsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListArtifactsRequest.Size(m)
@@ -1400,16 +1424,17 @@ func (m *ListArtifactsResponse) Reset()         { *m = ListArtifactsResponse{} }
 func (m *ListArtifactsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListArtifactsResponse) ProtoMessage()    {}
 func (*ListArtifactsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{23}
+	return fileDescriptor_701d4f44dccb3929, []int{23}
 }
+
 func (m *ListArtifactsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListArtifactsResponse.Unmarshal(m, b)
 }
 func (m *ListArtifactsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListArtifactsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListArtifactsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListArtifactsResponse.Merge(dst, src)
+func (m *ListArtifactsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListArtifactsResponse.Merge(m, src)
 }
 func (m *ListArtifactsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListArtifactsResponse.Size(m)
@@ -1449,16 +1474,17 @@ func (m *UpdateArtifactRequest) Reset()         { *m = UpdateArtifactRequest{} }
 func (m *UpdateArtifactRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateArtifactRequest) ProtoMessage()    {}
 func (*UpdateArtifactRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{24}
+	return fileDescriptor_701d4f44dccb3929, []int{24}
 }
+
 func (m *UpdateArtifactRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateArtifactRequest.Unmarshal(m, b)
 }
 func (m *UpdateArtifactRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateArtifactRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateArtifactRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateArtifactRequest.Merge(dst, src)
+func (m *UpdateArtifactRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateArtifactRequest.Merge(m, src)
 }
 func (m *UpdateArtifactRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateArtifactRequest.Size(m)
@@ -1496,16 +1522,17 @@ func (m *DeleteArtifactRequest) Reset()         { *m = DeleteArtifactRequest{} }
 func (m *DeleteArtifactRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteArtifactRequest) ProtoMessage()    {}
 func (*DeleteArtifactRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{25}
+	return fileDescriptor_701d4f44dccb3929, []int{25}
 }
+
 func (m *DeleteArtifactRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteArtifactRequest.Unmarshal(m, b)
 }
 func (m *DeleteArtifactRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteArtifactRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteArtifactRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteArtifactRequest.Merge(dst, src)
+func (m *DeleteArtifactRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteArtifactRequest.Merge(m, src)
 }
 func (m *DeleteArtifactRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteArtifactRequest.Size(m)
@@ -1553,16 +1580,17 @@ func (m *SendShiftHandoffRequest) Reset()         { *m = SendShiftHandoffRequest
 func (m *SendShiftHandoffRequest) String() string { return proto.CompactTextString(m) }
 func (*SendShiftHandoffRequest) ProtoMessage()    {}
 func (*SendShiftHandoffRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{26}
+	return fileDescriptor_701d4f44dccb3929, []int{26}
 }
+
 func (m *SendShiftHandoffRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendShiftHandoffRequest.Unmarshal(m, b)
 }
 func (m *SendShiftHandoffRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendShiftHandoffRequest.Marshal(b, m, deterministic)
 }
-func (dst *SendShiftHandoffRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendShiftHandoffRequest.Merge(dst, src)
+func (m *SendShiftHandoffRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SendShiftHandoffRequest.Merge(m, src)
 }
 func (m *SendShiftHandoffRequest) XXX_Size() int {
 	return xxx_messageInfo_SendShiftHandoffRequest.Size(m)
@@ -1645,16 +1673,17 @@ func (m *SendShiftHandoffRequest_Incident) Reset()         { *m = SendShiftHando
 func (m *SendShiftHandoffRequest_Incident) String() string { return proto.CompactTextString(m) }
 func (*SendShiftHandoffRequest_Incident) ProtoMessage()    {}
 func (*SendShiftHandoffRequest_Incident) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{26, 0}
+	return fileDescriptor_701d4f44dccb3929, []int{26, 0}
 }
+
 func (m *SendShiftHandoffRequest_Incident) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendShiftHandoffRequest_Incident.Unmarshal(m, b)
 }
 func (m *SendShiftHandoffRequest_Incident) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendShiftHandoffRequest_Incident.Marshal(b, m, deterministic)
 }
-func (dst *SendShiftHandoffRequest_Incident) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendShiftHandoffRequest_Incident.Merge(dst, src)
+func (m *SendShiftHandoffRequest_Incident) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SendShiftHandoffRequest_Incident.Merge(m, src)
 }
 func (m *SendShiftHandoffRequest_Incident) XXX_Size() int {
 	return xxx_messageInfo_SendShiftHandoffRequest_Incident.Size(m)
@@ -1689,16 +1718,17 @@ func (m *SendShiftHandoffResponse) Reset()         { *m = SendShiftHandoffRespon
 func (m *SendShiftHandoffResponse) String() string { return proto.CompactTextString(m) }
 func (*SendShiftHandoffResponse) ProtoMessage()    {}
 func (*SendShiftHandoffResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{27}
+	return fileDescriptor_701d4f44dccb3929, []int{27}
 }
+
 func (m *SendShiftHandoffResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendShiftHandoffResponse.Unmarshal(m, b)
 }
 func (m *SendShiftHandoffResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendShiftHandoffResponse.Marshal(b, m, deterministic)
 }
-func (dst *SendShiftHandoffResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendShiftHandoffResponse.Merge(dst, src)
+func (m *SendShiftHandoffResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SendShiftHandoffResponse.Merge(m, src)
 }
 func (m *SendShiftHandoffResponse) XXX_Size() int {
 	return xxx_messageInfo_SendShiftHandoffResponse.Size(m)
@@ -1739,16 +1769,17 @@ func (m *CreateSubscriptionRequest) Reset()         { *m = CreateSubscriptionReq
 func (m *CreateSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSubscriptionRequest) ProtoMessage()    {}
 func (*CreateSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{28}
+	return fileDescriptor_701d4f44dccb3929, []int{28}
 }
+
 func (m *CreateSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *CreateSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSubscriptionRequest.Merge(dst, src)
+func (m *CreateSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSubscriptionRequest.Merge(m, src)
 }
 func (m *CreateSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSubscriptionRequest.Size(m)
@@ -1788,16 +1819,17 @@ func (m *UpdateSubscriptionRequest) Reset()         { *m = UpdateSubscriptionReq
 func (m *UpdateSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSubscriptionRequest) ProtoMessage()    {}
 func (*UpdateSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{29}
+	return fileDescriptor_701d4f44dccb3929, []int{29}
 }
+
 func (m *UpdateSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *UpdateSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSubscriptionRequest.Merge(dst, src)
+func (m *UpdateSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSubscriptionRequest.Merge(m, src)
 }
 func (m *UpdateSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSubscriptionRequest.Size(m)
@@ -1840,16 +1872,17 @@ func (m *ListSubscriptionsRequest) Reset()         { *m = ListSubscriptionsReque
 func (m *ListSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSubscriptionsRequest) ProtoMessage()    {}
 func (*ListSubscriptionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{30}
+	return fileDescriptor_701d4f44dccb3929, []int{30}
 }
+
 func (m *ListSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSubscriptionsRequest.Unmarshal(m, b)
 }
 func (m *ListSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSubscriptionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSubscriptionsRequest.Merge(dst, src)
+func (m *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsRequest.Merge(m, src)
 }
 func (m *ListSubscriptionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSubscriptionsRequest.Size(m)
@@ -1896,16 +1929,17 @@ func (m *ListSubscriptionsResponse) Reset()         { *m = ListSubscriptionsResp
 func (m *ListSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSubscriptionsResponse) ProtoMessage()    {}
 func (*ListSubscriptionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{31}
+	return fileDescriptor_701d4f44dccb3929, []int{31}
 }
+
 func (m *ListSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSubscriptionsResponse.Unmarshal(m, b)
 }
 func (m *ListSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSubscriptionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSubscriptionsResponse.Merge(dst, src)
+func (m *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsResponse.Merge(m, src)
 }
 func (m *ListSubscriptionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSubscriptionsResponse.Size(m)
@@ -1943,16 +1977,17 @@ func (m *DeleteSubscriptionRequest) Reset()         { *m = DeleteSubscriptionReq
 func (m *DeleteSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSubscriptionRequest) ProtoMessage()    {}
 func (*DeleteSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{32}
+	return fileDescriptor_701d4f44dccb3929, []int{32}
 }
+
 func (m *DeleteSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *DeleteSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSubscriptionRequest.Merge(dst, src)
+func (m *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSubscriptionRequest.Merge(m, src)
 }
 func (m *DeleteSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Size(m)
@@ -1986,16 +2021,17 @@ func (m *CreateIncidentRoleAssignmentRequest) Reset()         { *m = CreateIncid
 func (m *CreateIncidentRoleAssignmentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateIncidentRoleAssignmentRequest) ProtoMessage()    {}
 func (*CreateIncidentRoleAssignmentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{33}
+	return fileDescriptor_701d4f44dccb3929, []int{33}
 }
+
 func (m *CreateIncidentRoleAssignmentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateIncidentRoleAssignmentRequest.Unmarshal(m, b)
 }
 func (m *CreateIncidentRoleAssignmentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateIncidentRoleAssignmentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateIncidentRoleAssignmentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateIncidentRoleAssignmentRequest.Merge(dst, src)
+func (m *CreateIncidentRoleAssignmentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIncidentRoleAssignmentRequest.Merge(m, src)
 }
 func (m *CreateIncidentRoleAssignmentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateIncidentRoleAssignmentRequest.Size(m)
@@ -2033,16 +2069,17 @@ func (m *DeleteIncidentRoleAssignmentRequest) Reset()         { *m = DeleteIncid
 func (m *DeleteIncidentRoleAssignmentRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteIncidentRoleAssignmentRequest) ProtoMessage()    {}
 func (*DeleteIncidentRoleAssignmentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{34}
+	return fileDescriptor_701d4f44dccb3929, []int{34}
 }
+
 func (m *DeleteIncidentRoleAssignmentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteIncidentRoleAssignmentRequest.Unmarshal(m, b)
 }
 func (m *DeleteIncidentRoleAssignmentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteIncidentRoleAssignmentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteIncidentRoleAssignmentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteIncidentRoleAssignmentRequest.Merge(dst, src)
+func (m *DeleteIncidentRoleAssignmentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIncidentRoleAssignmentRequest.Merge(m, src)
 }
 func (m *DeleteIncidentRoleAssignmentRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteIncidentRoleAssignmentRequest.Size(m)
@@ -2078,16 +2115,17 @@ func (m *ListIncidentRoleAssignmentsRequest) Reset()         { *m = ListIncident
 func (m *ListIncidentRoleAssignmentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListIncidentRoleAssignmentsRequest) ProtoMessage()    {}
 func (*ListIncidentRoleAssignmentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{35}
+	return fileDescriptor_701d4f44dccb3929, []int{35}
 }
+
 func (m *ListIncidentRoleAssignmentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIncidentRoleAssignmentsRequest.Unmarshal(m, b)
 }
 func (m *ListIncidentRoleAssignmentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIncidentRoleAssignmentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListIncidentRoleAssignmentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIncidentRoleAssignmentsRequest.Merge(dst, src)
+func (m *ListIncidentRoleAssignmentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIncidentRoleAssignmentsRequest.Merge(m, src)
 }
 func (m *ListIncidentRoleAssignmentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListIncidentRoleAssignmentsRequest.Size(m)
@@ -2134,16 +2172,17 @@ func (m *ListIncidentRoleAssignmentsResponse) Reset()         { *m = ListInciden
 func (m *ListIncidentRoleAssignmentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListIncidentRoleAssignmentsResponse) ProtoMessage()    {}
 func (*ListIncidentRoleAssignmentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{36}
+	return fileDescriptor_701d4f44dccb3929, []int{36}
 }
+
 func (m *ListIncidentRoleAssignmentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIncidentRoleAssignmentsResponse.Unmarshal(m, b)
 }
 func (m *ListIncidentRoleAssignmentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIncidentRoleAssignmentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListIncidentRoleAssignmentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIncidentRoleAssignmentsResponse.Merge(dst, src)
+func (m *ListIncidentRoleAssignmentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIncidentRoleAssignmentsResponse.Merge(m, src)
 }
 func (m *ListIncidentRoleAssignmentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListIncidentRoleAssignmentsResponse.Size(m)
@@ -2183,16 +2222,17 @@ func (m *RequestIncidentRoleHandoverRequest) Reset()         { *m = RequestIncid
 func (m *RequestIncidentRoleHandoverRequest) String() string { return proto.CompactTextString(m) }
 func (*RequestIncidentRoleHandoverRequest) ProtoMessage()    {}
 func (*RequestIncidentRoleHandoverRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{37}
+	return fileDescriptor_701d4f44dccb3929, []int{37}
 }
+
 func (m *RequestIncidentRoleHandoverRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestIncidentRoleHandoverRequest.Unmarshal(m, b)
 }
 func (m *RequestIncidentRoleHandoverRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestIncidentRoleHandoverRequest.Marshal(b, m, deterministic)
 }
-func (dst *RequestIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestIncidentRoleHandoverRequest.Merge(dst, src)
+func (m *RequestIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestIncidentRoleHandoverRequest.Merge(m, src)
 }
 func (m *RequestIncidentRoleHandoverRequest) XXX_Size() int {
 	return xxx_messageInfo_RequestIncidentRoleHandoverRequest.Size(m)
@@ -2233,16 +2273,17 @@ func (m *ConfirmIncidentRoleHandoverRequest) Reset()         { *m = ConfirmIncid
 func (m *ConfirmIncidentRoleHandoverRequest) String() string { return proto.CompactTextString(m) }
 func (*ConfirmIncidentRoleHandoverRequest) ProtoMessage()    {}
 func (*ConfirmIncidentRoleHandoverRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{38}
+	return fileDescriptor_701d4f44dccb3929, []int{38}
 }
+
 func (m *ConfirmIncidentRoleHandoverRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfirmIncidentRoleHandoverRequest.Unmarshal(m, b)
 }
 func (m *ConfirmIncidentRoleHandoverRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfirmIncidentRoleHandoverRequest.Marshal(b, m, deterministic)
 }
-func (dst *ConfirmIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfirmIncidentRoleHandoverRequest.Merge(dst, src)
+func (m *ConfirmIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfirmIncidentRoleHandoverRequest.Merge(m, src)
 }
 func (m *ConfirmIncidentRoleHandoverRequest) XXX_Size() int {
 	return xxx_messageInfo_ConfirmIncidentRoleHandoverRequest.Size(m)
@@ -2283,16 +2324,17 @@ func (m *ForceIncidentRoleHandoverRequest) Reset()         { *m = ForceIncidentR
 func (m *ForceIncidentRoleHandoverRequest) String() string { return proto.CompactTextString(m) }
 func (*ForceIncidentRoleHandoverRequest) ProtoMessage()    {}
 func (*ForceIncidentRoleHandoverRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{39}
+	return fileDescriptor_701d4f44dccb3929, []int{39}
 }
+
 func (m *ForceIncidentRoleHandoverRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ForceIncidentRoleHandoverRequest.Unmarshal(m, b)
 }
 func (m *ForceIncidentRoleHandoverRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ForceIncidentRoleHandoverRequest.Marshal(b, m, deterministic)
 }
-func (dst *ForceIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ForceIncidentRoleHandoverRequest.Merge(dst, src)
+func (m *ForceIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ForceIncidentRoleHandoverRequest.Merge(m, src)
 }
 func (m *ForceIncidentRoleHandoverRequest) XXX_Size() int {
 	return xxx_messageInfo_ForceIncidentRoleHandoverRequest.Size(m)
@@ -2334,16 +2376,17 @@ func (m *CancelIncidentRoleHandoverRequest) Reset()         { *m = CancelInciden
 func (m *CancelIncidentRoleHandoverRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelIncidentRoleHandoverRequest) ProtoMessage()    {}
 func (*CancelIncidentRoleHandoverRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_incidents_service_6ca02351b7a08ec3, []int{40}
+	return fileDescriptor_701d4f44dccb3929, []int{40}
 }
+
 func (m *CancelIncidentRoleHandoverRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelIncidentRoleHandoverRequest.Unmarshal(m, b)
 }
 func (m *CancelIncidentRoleHandoverRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelIncidentRoleHandoverRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelIncidentRoleHandoverRequest.Merge(dst, src)
+func (m *CancelIncidentRoleHandoverRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelIncidentRoleHandoverRequest.Merge(m, src)
 }
 func (m *CancelIncidentRoleHandoverRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelIncidentRoleHandoverRequest.Size(m)
@@ -2414,6 +2457,159 @@ func init() {
 	proto.RegisterType((*CancelIncidentRoleHandoverRequest)(nil), "google.cloud.irm.v1alpha2.CancelIncidentRoleHandoverRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/irm/v1alpha2/incidents_service.proto", fileDescriptor_701d4f44dccb3929)
+}
+
+var fileDescriptor_701d4f44dccb3929 = []byte{
+	// 2309 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x6f, 0x1c, 0x49,
+	0x15, 0x57, 0xd9, 0xf1, 0xd7, 0xf3, 0x47, 0x4c, 0x6d, 0x6c, 0x8f, 0x3b, 0xd9, 0xac, 0x53, 0x56,
+	0x12, 0xaf, 0xb3, 0x99, 0x71, 0xc6, 0xc9, 0x06, 0x8f, 0x9d, 0x04, 0xc7, 0xc9, 0x3a, 0x11, 0x9b,
+	0x65, 0x35, 0xf6, 0x0a, 0x61, 0x21, 0x8d, 0x3a, 0xed, 0xf2, 0xb8, 0x37, 0x33, 0xdd, 0xbd, 0xdd,
+	0xed, 0x24, 0xce, 0x6e, 0x24, 0xb4, 0xe2, 0x80, 0x56, 0x70, 0x59, 0xb4, 0x02, 0x89, 0xc3, 0x4a,
+	0x20, 0x10, 0x1f, 0x12, 0x70, 0x03, 0x24, 0x24, 0x04, 0xff, 0x00, 0x07, 0x0e, 0x1c, 0x17, 0x21,
+	0xb8, 0x21, 0x71, 0xe5, 0x88, 0xba, 0xba, 0x7a, 0xba, 0xba, 0xa7, 0xa7, 0xba, 0x66, 0x8c, 0xc9,
+	0xde, 0x3c, 0xdd, 0xf5, 0xea, 0xfd, 0xde, 0xef, 0x7d, 0x54, 0xcd, 0x6f, 0x0c, 0x57, 0xea, 0xb6,
+	0x5d, 0x6f, 0xd0, 0x92, 0xd1, 0xb0, 0x0f, 0x76, 0x4b, 0xa6, 0xdb, 0x2c, 0x3d, 0xbe, 0xa2, 0x37,
+	0x9c, 0x7d, 0xbd, 0x5c, 0x32, 0x2d, 0xc3, 0xdc, 0xa5, 0x96, 0xef, 0xd5, 0x3c, 0xea, 0x3e, 0x36,
+	0x0d, 0x5a, 0x74, 0x5c, 0xdb, 0xb7, 0xf1, 0x6c, 0x68, 0x52, 0x64, 0x26, 0x45, 0xd3, 0x6d, 0x16,
+	0x23, 0x13, 0xed, 0x0c, 0xdf, 0x4d, 0x77, 0xcc, 0x92, 0x6e, 0x59, 0xb6, 0xaf, 0xfb, 0xa6, 0x6d,
+	0x79, 0xa1, 0xa1, 0xf6, 0xaa, 0x82, 0x2f, 0xbe, 0xf4, 0x34, 0x5f, 0xca, 0x3e, 0x3d, 0x3c, 0xd8,
+	0x2b, 0xd1, 0xa6, 0xe3, 0x1f, 0xf2, 0x97, 0x73, 0xe9, 0x97, 0x7b, 0x26, 0x6d, 0xec, 0xd6, 0x9a,
+	0xba, 0xf7, 0x88, 0xaf, 0x78, 0x25, 0xbd, 0xc2, 0x37, 0x9b, 0xd4, 0xf3, 0xf5, 0xa6, 0x13, 0x2e,
+	0x20, 0x0e, 0x4c, 0x6d, 0xb8, 0x54, 0xf7, 0xe9, 0x7d, 0xee, 0xb8, 0x4a, 0xdf, 0x3b, 0xa0, 0x9e,
+	0x8f, 0x6f, 0xc1, 0x70, 0x84, 0xa5, 0x80, 0xe6, 0xd0, 0xc2, 0x68, 0x79, 0xbe, 0xd8, 0x31, 0xde,
+	0x62, 0xcb, 0xba, 0x65, 0x84, 0xa7, 0x61, 0xd0, 0xd1, 0xdd, 0xc0, 0xbc, 0x6f, 0x0e, 0x2d, 0x8c,
+	0x54, 0xf9, 0x27, 0xb2, 0x00, 0x78, 0x93, 0xfa, 0x69, 0x77, 0x18, 0x4e, 0x58, 0x7a, 0x93, 0x32,
+	0x57, 0x23, 0x55, 0xf6, 0x37, 0xf9, 0x04, 0xc1, 0xd4, 0x3b, 0xce, 0xee, 0x71, 0x80, 0x5b, 0x85,
+	0xd1, 0x03, 0xb6, 0x33, 0x23, 0x8b, 0x21, 0x1c, 0x2d, 0x6b, 0xd1, 0x1e, 0x11, 0x5b, 0xc5, 0x37,
+	0x02, 0x3e, 0x1f, 0xe8, 0xde, 0xa3, 0x2a, 0x84, 0xcb, 0x83, 0xbf, 0x89, 0x0d, 0x2f, 0x6f, 0x51,
+	0xdd, 0x35, 0xf6, 0xb7, 0xcc, 0xa6, 0xd9, 0xd0, 0xdd, 0x68, 0x7f, 0x4f, 0x12, 0x0c, 0x3e, 0x0d,
+	0x23, 0x8e, 0x5e, 0xa7, 0x35, 0xcf, 0x7c, 0x46, 0x99, 0xbf, 0x81, 0xea, 0x70, 0xf0, 0x60, 0xcb,
+	0x7c, 0x46, 0xf1, 0xcb, 0x00, 0xec, 0xa5, 0x6f, 0x3f, 0xa2, 0x56, 0xa1, 0x9f, 0x99, 0xb1, 0xe5,
+	0xdb, 0xc1, 0x03, 0xf2, 0x6f, 0x04, 0x67, 0x3b, 0x79, 0xf4, 0x1c, 0xdb, 0xf2, 0x28, 0xde, 0x81,
+	0x21, 0x97, 0x7a, 0x07, 0x0d, 0xdf, 0x2b, 0xa0, 0xb9, 0xfe, 0x85, 0xd1, 0xf2, 0x97, 0x24, 0x84,
+	0xc8, 0xf7, 0x2a, 0x56, 0xd9, 0x46, 0xd5, 0x68, 0x43, 0x7c, 0x01, 0x4e, 0x5a, 0xf4, 0xa9, 0x5f,
+	0x13, 0x20, 0x86, 0x29, 0x1d, 0x0f, 0x1e, 0xbf, 0x1d, 0xc1, 0xd4, 0xee, 0xc3, 0x60, 0x68, 0x7a,
+	0xe4, 0xfc, 0x90, 0xa7, 0x30, 0x13, 0x96, 0xe5, 0x7a, 0xab, 0x79, 0x22, 0x72, 0xe3, 0xba, 0x42,
+	0x62, 0x5d, 0xe1, 0xbb, 0x00, 0x71, 0xa7, 0xf1, 0x8c, 0x9e, 0x97, 0x78, 0x15, 0x76, 0x16, 0x0c,
+	0x49, 0x03, 0xa6, 0xdf, 0x34, 0x3d, 0x3f, 0x7e, 0xeb, 0xe5, 0x39, 0x3e, 0x4a, 0x66, 0x3f, 0x42,
+	0x30, 0xd3, 0xe6, 0x8e, 0xa7, 0x74, 0x13, 0x46, 0x85, 0xd1, 0xc1, 0xd3, 0xaa, 0x18, 0x91, 0x68,
+	0xa9, 0x9a, 0x3f, 0xf2, 0x75, 0x98, 0x0c, 0x49, 0xdf, 0xd6, 0xeb, 0x79, 0x41, 0x2f, 0x41, 0xbf,
+	0xaf, 0xd7, 0x39, 0xcd, 0x67, 0x25, 0xa0, 0x82, 0xbd, 0x82, 0xa5, 0xe4, 0x02, 0x4c, 0xde, 0xa1,
+	0x0d, 0x9a, 0xd8, 0x3d, 0xab, 0xeb, 0x29, 0x9c, 0x0c, 0x18, 0xd9, 0xd6, 0xeb, 0xc7, 0xca, 0xbc,
+	0x05, 0x93, 0xb1, 0x1b, 0xce, 0x78, 0x19, 0x4e, 0xf8, 0x7a, 0x3d, 0xa2, 0x3a, 0x2f, 0x2a, 0xb6,
+	0x56, 0x99, 0xdc, 0x7d, 0x78, 0x29, 0x24, 0x77, 0xcb, 0xac, 0x5b, 0x7a, 0x23, 0x2f, 0xb4, 0x15,
+	0x18, 0xf4, 0xd8, 0x42, 0x4e, 0xf1, 0x39, 0x59, 0x3b, 0x87, 0x3b, 0x72, 0x03, 0xf2, 0x0d, 0x04,
+	0xa7, 0xa2, 0x0e, 0x0f, 0x1e, 0xe4, 0xd2, 0x78, 0x0a, 0x06, 0xde, 0x3b, 0xa0, 0xee, 0x21, 0x07,
+	0x1e, 0x7e, 0x48, 0x92, 0xdb, 0x2f, 0x25, 0xf7, 0x44, 0x9a, 0xdc, 0x0f, 0x60, 0x2a, 0x85, 0x80,
+	0x33, 0xbc, 0x0a, 0x43, 0x21, 0xca, 0x88, 0x64, 0x85, 0xb8, 0x22, 0x0b, 0x65, 0xaa, 0x2f, 0xc0,
+	0xe4, 0x26, 0xf5, 0x93, 0x3c, 0x67, 0x55, 0xda, 0x77, 0x10, 0xbc, 0x14, 0x9e, 0x2f, 0xc9, 0xb5,
+	0x31, 0xf7, 0xa8, 0x4b, 0xee, 0x8f, 0x76, 0xae, 0x7c, 0x8a, 0x60, 0x3a, 0xa4, 0xad, 0xed, 0x44,
+	0xf9, 0xbf, 0xa5, 0x2e, 0xb0, 0x0d, 0xee, 0x08, 0xb5, 0x67, 0xb6, 0x45, 0x0b, 0x03, 0xec, 0xed,
+	0x70, 0xf0, 0x60, 0xc7, 0xb6, 0x28, 0xf9, 0x26, 0x82, 0x99, 0x36, 0x84, 0x3c, 0xb5, 0xeb, 0x30,
+	0xd2, 0xba, 0xbc, 0xf0, 0xe4, 0x2a, 0x0d, 0xfd, 0xd8, 0x4a, 0x39, 0xc1, 0x3f, 0xe9, 0x87, 0x99,
+	0xbb, 0x9e, 0xa1, 0x37, 0x3e, 0x6f, 0x57, 0x03, 0xfc, 0x00, 0xc6, 0xbd, 0x83, 0x87, 0x9e, 0xe1,
+	0x9a, 0x4e, 0x38, 0xb5, 0xfb, 0x19, 0x11, 0x17, 0x65, 0x15, 0x24, 0xac, 0xaf, 0x26, 0xad, 0x5b,
+	0x03, 0xe9, 0x44, 0x17, 0x03, 0x69, 0x13, 0x06, 0x5c, 0xbb, 0x41, 0xbd, 0xc2, 0x00, 0x33, 0xba,
+	0xa2, 0x12, 0xbd, 0xdd, 0xa0, 0xeb, 0x5e, 0x50, 0xc2, 0xcd, 0xe0, 0x53, 0x68, 0x1f, 0x24, 0x54,
+	0x77, 0x7d, 0x73, 0x4f, 0x37, 0x7c, 0xaf, 0x30, 0x98, 0x9b, 0xd0, 0x75, 0xbe, 0xb6, 0x1a, 0x5b,
+	0x91, 0xbf, 0xf5, 0x41, 0xa1, 0x3d, 0x51, 0xbc, 0x60, 0x8e, 0x9c, 0xa9, 0x36, 0xb2, 0xfb, 0xfe,
+	0x27, 0x64, 0xf7, 0x77, 0x41, 0xf6, 0x8d, 0x88, 0xec, 0x13, 0xb9, 0xae, 0x45, 0xb2, 0x33, 0x29,
+	0x1e, 0xe8, 0x89, 0xe2, 0xd6, 0x05, 0xbe, 0xf5, 0x32, 0x67, 0x64, 0xdc, 0x82, 0xe1, 0xc8, 0x9a,
+	0x17, 0xb7, 0x92, 0xcb, 0x96, 0x11, 0x79, 0x17, 0x4e, 0xb1, 0x2b, 0x4b, 0x04, 0xe1, 0x38, 0x4f,
+	0xe9, 0x0f, 0x11, 0x4c, 0xa5, 0x9c, 0xc5, 0xe3, 0x26, 0xa6, 0x0e, 0xf5, 0x42, 0x9d, 0xf2, 0xb8,
+	0x89, 0xbf, 0x87, 0xa4, 0x39, 0x16, 0xb9, 0x44, 0x3d, 0x70, 0x79, 0xb4, 0xf3, 0xe2, 0x12, 0x4c,
+	0x85, 0x37, 0xaa, 0x34, 0xac, 0xac, 0xc3, 0xee, 0x5f, 0x7d, 0xc1, 0xe8, 0xb6, 0x76, 0xb7, 0xf6,
+	0xcd, 0x3d, 0xff, 0x9e, 0x6e, 0xed, 0xda, 0x7b, 0x7b, 0x79, 0x99, 0x3b, 0x0b, 0xe0, 0x52, 0xc3,
+	0x74, 0x4c, 0x36, 0xd3, 0x83, 0xee, 0x1a, 0xa9, 0x0a, 0x4f, 0xf0, 0x04, 0xf4, 0x19, 0x06, 0xeb,
+	0x97, 0x91, 0x6a, 0x9f, 0x61, 0xe0, 0x02, 0x0c, 0x79, 0x07, 0x0f, 0xdf, 0xa5, 0x86, 0xcf, 0xcf,
+	0x95, 0xe8, 0x23, 0x7e, 0x0d, 0xb0, 0x65, 0xfb, 0xd4, 0xab, 0x19, 0xb6, 0xe5, 0x53, 0xcb, 0xaf,
+	0xf9, 0x87, 0x4e, 0x74, 0xbc, 0x4c, 0xb2, 0x37, 0x1b, 0xe1, 0x8b, 0xed, 0x43, 0x87, 0xe2, 0x79,
+	0x18, 0x4f, 0xac, 0x2e, 0x0c, 0xb2, 0x85, 0x63, 0xe2, 0x42, 0xfc, 0x35, 0xf1, 0xbc, 0x19, 0x62,
+	0x05, 0xb0, 0x2a, 0xfd, 0xce, 0x93, 0x19, 0x7b, 0xe6, 0x39, 0x74, 0x0e, 0xc6, 0x1c, 0x97, 0x3e,
+	0x36, 0xe9, 0x93, 0x9a, 0x6d, 0x35, 0x0e, 0x0b, 0xc3, 0x73, 0x68, 0x61, 0xb8, 0x3a, 0xca, 0x9f,
+	0x7d, 0xc5, 0x6a, 0x1c, 0x6a, 0x67, 0x61, 0x38, 0xb2, 0xcc, 0xa4, 0xfb, 0xab, 0x50, 0x68, 0xf7,
+	0xc8, 0x4b, 0xf7, 0x1c, 0x8c, 0x25, 0x68, 0x08, 0xed, 0x46, 0x0d, 0x81, 0x81, 0x02, 0x0c, 0x45,
+	0xb1, 0x87, 0x25, 0x19, 0x7d, 0x0c, 0x6e, 0x77, 0xb3, 0xfc, 0x22, 0x29, 0xce, 0xb2, 0x9c, 0x4c,
+	0x7e, 0x19, 0xc6, 0xc4, 0x61, 0xc7, 0x0b, 0x4d, 0x79, 0x52, 0x26, 0x8c, 0xc9, 0x8f, 0x11, 0xcc,
+	0xf2, 0x7b, 0x53, 0x06, 0x84, 0xb4, 0x2b, 0x74, 0x04, 0x57, 0x47, 0xeb, 0x0f, 0x0b, 0x0a, 0xc1,
+	0xec, 0x10, 0xb7, 0x3f, 0xd6, 0x61, 0xf5, 0x31, 0x82, 0xd9, 0x0c, 0x87, 0x3c, 0xeb, 0x6d, 0xa7,
+	0x15, 0x3a, 0xd2, 0x69, 0xa5, 0x3a, 0xbc, 0x4a, 0x30, 0x1b, 0x0e, 0x89, 0xac, 0x5c, 0x65, 0x55,
+	0xee, 0xcf, 0x11, 0xcc, 0xa7, 0x24, 0xa1, 0xe4, 0xf5, 0x20, 0x87, 0xc1, 0x47, 0x50, 0x88, 0x3a,
+	0xa9, 0x16, 0x9c, 0x72, 0x35, 0xbd, 0x65, 0xca, 0xf3, 0xd7, 0xc3, 0x95, 0x64, 0xda, 0xcc, 0x7c,
+	0x4e, 0x56, 0x60, 0x3e, 0x8c, 0x4e, 0x8e, 0x35, 0x2b, 0xce, 0xa7, 0x40, 0x82, 0x64, 0x65, 0x1b,
+	0x1e, 0x6b, 0x9d, 0xfc, 0x1e, 0xc1, 0xbc, 0xd4, 0x35, 0xaf, 0x98, 0x26, 0xcc, 0x76, 0x62, 0x32,
+	0xaa, 0x9e, 0x1e, 0xa8, 0x9c, 0xc9, 0xa6, 0x52, 0xbd, 0xa2, 0x3e, 0x00, 0xc2, 0xd9, 0x11, 0x3d,
+	0xb0, 0x21, 0xf7, 0x98, 0xba, 0x32, 0x0d, 0xec, 0x36, 0x8c, 0x59, 0xf4, 0x09, 0x0f, 0x83, 0x52,
+	0x5e, 0x0e, 0xaf, 0x48, 0x62, 0x78, 0xc7, 0xa3, 0x6e, 0x75, 0xd4, 0xa2, 0x4f, 0xd6, 0xb9, 0x4d,
+	0xe0, 0x7d, 0xc3, 0xb6, 0xf6, 0x4c, 0xb7, 0xf9, 0x22, 0xbc, 0x3f, 0x83, 0xb9, 0x37, 0x6c, 0xd7,
+	0xa0, 0x2f, 0xc2, 0xf7, 0xfb, 0x70, 0x6e, 0x43, 0xb7, 0x0c, 0xda, 0x78, 0x01, 0xce, 0xcb, 0x3f,
+	0xbb, 0x0c, 0x27, 0x23, 0xbf, 0x5b, 0xa1, 0x0a, 0x8e, 0x7f, 0x88, 0x60, 0x22, 0x39, 0x29, 0xf0,
+	0x92, 0x64, 0xd3, 0x4c, 0x9d, 0x59, 0x53, 0xb9, 0xf3, 0x93, 0x95, 0x0f, 0xff, 0xf2, 0x8f, 0xef,
+	0xf6, 0x2d, 0x93, 0x8b, 0xb1, 0x50, 0xfe, 0x7e, 0xd8, 0x88, 0x37, 0x1c, 0xd7, 0x0e, 0x6e, 0x18,
+	0x5e, 0x69, 0xf1, 0x79, 0x2c, 0x9e, 0x57, 0xe2, 0x2f, 0x09, 0x1f, 0x23, 0x18, 0x15, 0xf4, 0x66,
+	0x7c, 0x59, 0xe2, 0xaf, 0x5d, 0x97, 0x56, 0x83, 0x57, 0x62, 0xf0, 0x5e, 0xc5, 0x22, 0xbc, 0x80,
+	0x79, 0x01, 0x5c, 0x8c, 0xad, 0xb4, 0xf8, 0x1c, 0xff, 0x1a, 0xc1, 0xc9, 0xd4, 0xf7, 0x68, 0x7c,
+	0x25, 0x57, 0xb0, 0x4d, 0xab, 0x02, 0x5a, 0xb9, 0x1b, 0x93, 0x70, 0xa8, 0x90, 0xd7, 0x19, 0xd6,
+	0x25, 0x5c, 0x54, 0xa5, 0xd2, 0x63, 0x1b, 0xe1, 0x5f, 0x20, 0x98, 0x48, 0x8a, 0xf1, 0xd2, 0x64,
+	0x67, 0xea, 0xf6, 0x6a, 0x6c, 0xde, 0x66, 0x08, 0xd7, 0xca, 0x4b, 0x02, 0xc2, 0x08, 0x4e, 0x51,
+	0x46, 0xab, 0x90, 0xf5, 0x6f, 0xf7, 0x45, 0x52, 0x4a, 0x5a, 0xe5, 0xc6, 0x5f, 0xec, 0x41, 0x18,
+	0x0f, 0xd1, 0xaf, 0xf4, 0x2c, 0xa9, 0x93, 0xe7, 0x2c, 0xa6, 0x27, 0xf8, 0x9a, 0x62, 0x85, 0x70,
+	0xd6, 0xf9, 0x7e, 0x3b, 0x37, 0xf1, 0x9a, 0xc4, 0x90, 0xeb, 0x63, 0x6d, 0x66, 0x71, 0xcc, 0xbf,
+	0x45, 0x91, 0xb4, 0x1b, 0x6b, 0xc4, 0xb8, 0x9c, 0xdb, 0xab, 0x6d, 0xe2, 0xbb, 0xa6, 0x26, 0x3f,
+	0x93, 0xfb, 0x2c, 0xdc, 0x0d, 0x72, 0x4d, 0x56, 0x64, 0x89, 0x80, 0xc5, 0x5f, 0xc9, 0x2a, 0x82,
+	0x1e, 0x8f, 0x7f, 0x83, 0x42, 0x3d, 0x58, 0x50, 0xc8, 0xa5, 0xad, 0x92, 0x2d, 0xde, 0x4b, 0x5b,
+	0xa5, 0x83, 0x00, 0x4f, 0x6e, 0xb0, 0x28, 0xae, 0xe3, 0xde, 0xa2, 0xc0, 0x9f, 0x20, 0x18, 0x69,
+	0xe9, 0xe9, 0xf8, 0x52, 0x2e, 0xdb, 0xb1, 0x2e, 0xae, 0xe5, 0x88, 0x0f, 0x64, 0x95, 0x21, 0xbb,
+	0x46, 0x8a, 0xea, 0xc8, 0x7c, 0xbd, 0xee, 0x55, 0xfa, 0x7d, 0xbd, 0x8e, 0xbf, 0x85, 0x60, 0xa4,
+	0xa5, 0xc4, 0x4b, 0x71, 0xa5, 0xf5, 0x7a, 0x6d, 0xba, 0xed, 0xe6, 0x7d, 0xb7, 0xe9, 0xf8, 0x87,
+	0xd1, 0x50, 0x59, 0x2c, 0xaa, 0x95, 0x37, 0x03, 0x13, 0xcc, 0xc1, 0x1f, 0x20, 0x18, 0x8e, 0x54,
+	0x78, 0xbc, 0x98, 0x93, 0x22, 0xe1, 0x17, 0x01, 0xed, 0x92, 0xd2, 0xda, 0x6e, 0x46, 0x5e, 0x3b,
+	0x5b, 0xf8, 0xfb, 0x08, 0xc6, 0x44, 0xcd, 0x1e, 0x17, 0x73, 0x73, 0x98, 0x10, 0x92, 0xb5, 0x7c,
+	0xe1, 0x98, 0x5c, 0x63, 0xd8, 0x4a, 0xe4, 0xbc, 0x7c, 0x1c, 0xf3, 0x16, 0xaf, 0x44, 0x3a, 0xf3,
+	0x4f, 0x11, 0x8c, 0x27, 0x14, 0x76, 0x5c, 0x52, 0x18, 0x4e, 0xe2, 0xaf, 0x01, 0xda, 0x92, 0xba,
+	0x01, 0xe7, 0xf1, 0x2a, 0xc3, 0x5a, 0xc4, 0xaf, 0xa9, 0x61, 0xe5, 0x07, 0xc7, 0x47, 0x08, 0x46,
+	0x5a, 0x72, 0xbc, 0xb4, 0xdc, 0xd2, 0xa2, 0xbd, 0x0a, 0x7f, 0x97, 0x19, 0xa6, 0x8b, 0xf8, 0xbc,
+	0xd2, 0x7c, 0xc4, 0x9f, 0x22, 0x18, 0x13, 0x25, 0x7f, 0x69, 0x4a, 0x33, 0x7e, 0x1b, 0x50, 0x81,
+	0xb4, 0xc6, 0x20, 0xbd, 0x5e, 0x16, 0x69, 0x0a, 0x21, 0x14, 0x25, 0x93, 0x3b, 0xca, 0xec, 0x1f,
+	0x11, 0x4c, 0xa6, 0x25, 0x53, 0xe9, 0xa8, 0xee, 0x20, 0x84, 0x6b, 0xcb, 0x5d, 0xd9, 0xf0, 0x14,
+	0xdf, 0x61, 0xd8, 0x6f, 0x92, 0x95, 0xae, 0xcf, 0x5e, 0xca, 0xb7, 0xac, 0xa0, 0x45, 0xfc, 0xcb,
+	0xd6, 0xc5, 0x30, 0x52, 0xa6, 0x14, 0x2e, 0x86, 0x29, 0x11, 0x4b, 0x53, 0x51, 0xd2, 0xc8, 0x5d,
+	0x86, 0xf7, 0x16, 0x59, 0xee, 0x62, 0x44, 0x47, 0xfa, 0x5f, 0x25, 0x96, 0xe1, 0x7e, 0x85, 0x60,
+	0x3c, 0x21, 0x33, 0x4a, 0xdb, 0x29, 0x4b, 0xfd, 0x94, 0xb6, 0x53, 0xa6, 0x82, 0x19, 0x0d, 0x71,
+	0xdc, 0x0b, 0xf6, 0xe0, 0x58, 0x9c, 0x48, 0x6a, 0x92, 0x0a, 0xd7, 0xb1, 0x9e, 0x28, 0x7e, 0x8b,
+	0xc1, 0xbc, 0x57, 0x16, 0x6f, 0x20, 0x11, 0x0e, 0x59, 0x49, 0xc4, 0x60, 0xd9, 0xd5, 0xac, 0xc5,
+	0xf5, 0xf7, 0x10, 0x4c, 0x24, 0x65, 0x4b, 0x29, 0xf2, 0x4c, 0x85, 0xb3, 0xe3, 0x41, 0xc4, 0x39,
+	0x5d, 0x5c, 0x56, 0x3c, 0x88, 0x44, 0x8c, 0x01, 0xa7, 0x93, 0x69, 0xd1, 0x0e, 0x97, 0xbb, 0xd7,
+	0x14, 0xa5, 0xad, 0xd7, 0x49, 0x15, 0x24, 0x15, 0x06, 0xfd, 0x2a, 0x29, 0xe5, 0x4c, 0x57, 0xc1,
+	0xb6, 0xe2, 0x51, 0x6b, 0x37, 0x68, 0xb8, 0x3f, 0x21, 0xc0, 0xed, 0xa2, 0x20, 0xbe, 0x9a, 0x7f,
+	0x5e, 0xb5, 0x8b, 0x42, 0x9a, 0xaa, 0x22, 0x45, 0x1e, 0x30, 0xc4, 0x9b, 0xe4, 0xba, 0x7a, 0x01,
+	0x27, 0x34, 0xac, 0x4a, 0x52, 0xeb, 0xfb, 0x33, 0x02, 0xdc, 0x2e, 0x2b, 0x4a, 0x83, 0xe8, 0xa8,
+	0x42, 0xaa, 0x07, 0xb1, 0xc3, 0x82, 0xd8, 0x2e, 0xdf, 0x11, 0xa7, 0xb5, 0xb0, 0x40, 0x5a, 0xe2,
+	0x89, 0x70, 0x82, 0x32, 0x4f, 0x46, 0xf4, 0x07, 0x04, 0x5f, 0x68, 0x13, 0x04, 0xf1, 0x72, 0xce,
+	0xa4, 0xc8, 0xd2, 0x2b, 0xb5, 0xab, 0xdd, 0x19, 0xf1, 0x9a, 0xba, 0xc5, 0x82, 0x5b, 0xc1, 0xbd,
+	0x66, 0x08, 0xff, 0x08, 0x01, 0x6e, 0x97, 0x0f, 0xa5, 0x39, 0xe9, 0xa8, 0x36, 0x76, 0x6c, 0x5a,
+	0x8e, 0x72, 0xf1, 0xba, 0x62, 0xd3, 0xa6, 0x59, 0xc7, 0x7f, 0x45, 0x70, 0x46, 0x26, 0x59, 0xe2,
+	0x9b, 0xea, 0xb2, 0x44, 0x96, 0x7e, 0xa8, 0x75, 0x2f, 0xb3, 0x65, 0x9e, 0xa4, 0x39, 0xd4, 0xbb,
+	0x49, 0x41, 0x2e, 0x68, 0xec, 0xdf, 0x21, 0x38, 0x23, 0x13, 0x38, 0xa5, 0x91, 0x29, 0x28, 0xa3,
+	0x1d, 0x73, 0xb2, 0xce, 0xe0, 0xaf, 0x2e, 0xae, 0x28, 0xe6, 0x24, 0x85, 0x3d, 0xc8, 0xca, 0x67,
+	0x08, 0x4e, 0x4b, 0x64, 0x4e, 0x7c, 0x23, 0xa7, 0xa4, 0xe5, 0xca, 0xac, 0x76, 0xb3, 0x57, 0x73,
+	0xde, 0x1b, 0x3c, 0x42, 0xdc, 0x7b, 0x82, 0xf0, 0x3f, 0x11, 0x9c, 0x96, 0x48, 0xa1, 0xd2, 0x08,
+	0xf3, 0x25, 0xd4, 0x5e, 0xaa, 0x6e, 0x9b, 0x05, 0xf5, 0x16, 0xb9, 0xdf, 0x73, 0xda, 0x2a, 0x6e,
+	0xe8, 0x3d, 0x02, 0x13, 0x54, 0x61, 0x10, 0xa7, 0x44, 0x74, 0x95, 0xc6, 0x99, 0x2f, 0xd6, 0xbe,
+	0xa0, 0x38, 0x8d, 0x10, 0x98, 0x18, 0xe7, 0x67, 0x08, 0x66, 0x3b, 0xca, 0xbb, 0x58, 0xf6, 0xeb,
+	0x62, 0x9e, 0x28, 0xdc, 0x4b, 0x8c, 0x55, 0x16, 0xe3, 0x9b, 0x64, 0xb3, 0xf7, 0x18, 0xf7, 0x02,
+	0x58, 0x62, 0x84, 0x7f, 0x47, 0xa0, 0x75, 0x16, 0x91, 0xf1, 0x9a, 0x2c, 0x91, 0x79, 0xda, 0x73,
+	0x2f, 0x31, 0x6e, 0xb1, 0x18, 0x1f, 0x90, 0x7b, 0x47, 0xc8, 0x23, 0xc3, 0x25, 0x04, 0x79, 0x7b,
+	0x1f, 0xe6, 0x0d, 0xbb, 0x19, 0x81, 0x09, 0x60, 0x44, 0xff, 0xb7, 0xdd, 0x82, 0xa3, 0x3b, 0xe6,
+	0xdb, 0x68, 0x67, 0x8d, 0x2f, 0xa9, 0xdb, 0x0d, 0xdd, 0xaa, 0x17, 0x6d, 0xb7, 0x5e, 0xaa, 0x53,
+	0x8b, 0x4d, 0xc2, 0x52, 0xf8, 0x4a, 0x77, 0x4c, 0x2f, 0xe3, 0xdf, 0xb4, 0x57, 0x4d, 0xb7, 0xf9,
+	0x1f, 0x84, 0x1e, 0x0e, 0xb2, 0xb5, 0xcb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xf4, 0xe1,
+	0x75, 0x3d, 0x2e, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -3585,156 +3781,3 @@ var _IncidentService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/irm/v1alpha2/incidents_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/irm/v1alpha2/incidents_service.proto", fileDescriptor_incidents_service_6ca02351b7a08ec3)
-}
-
-var fileDescriptor_incidents_service_6ca02351b7a08ec3 = []byte{
-	// 2309 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x6f, 0x1c, 0x49,
-	0x15, 0x57, 0xd9, 0xf1, 0xd7, 0xf3, 0x47, 0x4c, 0x6d, 0x6c, 0x8f, 0x3b, 0xd9, 0xac, 0x53, 0x56,
-	0x12, 0xaf, 0xb3, 0x99, 0x71, 0xc6, 0xc9, 0x06, 0x8f, 0x9d, 0x04, 0xc7, 0xc9, 0x3a, 0x11, 0x9b,
-	0x65, 0x35, 0xf6, 0x0a, 0x61, 0x21, 0x8d, 0x3a, 0xed, 0xf2, 0xb8, 0x37, 0x33, 0xdd, 0xbd, 0xdd,
-	0xed, 0x24, 0xce, 0x6e, 0x24, 0xb4, 0xe2, 0x80, 0x56, 0x70, 0x59, 0xb4, 0x02, 0x89, 0xc3, 0x4a,
-	0x20, 0x10, 0x1f, 0x12, 0x70, 0x03, 0x24, 0x24, 0x04, 0xff, 0x00, 0x07, 0x0e, 0x1c, 0x17, 0x21,
-	0xb8, 0x21, 0x71, 0xe5, 0x88, 0xba, 0xba, 0x7a, 0xba, 0xba, 0xa7, 0xa7, 0xba, 0x66, 0x8c, 0xc9,
-	0xde, 0x3c, 0xdd, 0xf5, 0xea, 0xfd, 0xde, 0xef, 0x7d, 0x54, 0xcd, 0x6f, 0x0c, 0x57, 0xea, 0xb6,
-	0x5d, 0x6f, 0xd0, 0x92, 0xd1, 0xb0, 0x0f, 0x76, 0x4b, 0xa6, 0xdb, 0x2c, 0x3d, 0xbe, 0xa2, 0x37,
-	0x9c, 0x7d, 0xbd, 0x5c, 0x32, 0x2d, 0xc3, 0xdc, 0xa5, 0x96, 0xef, 0xd5, 0x3c, 0xea, 0x3e, 0x36,
-	0x0d, 0x5a, 0x74, 0x5c, 0xdb, 0xb7, 0xf1, 0x6c, 0x68, 0x52, 0x64, 0x26, 0x45, 0xd3, 0x6d, 0x16,
-	0x23, 0x13, 0xed, 0x0c, 0xdf, 0x4d, 0x77, 0xcc, 0x92, 0x6e, 0x59, 0xb6, 0xaf, 0xfb, 0xa6, 0x6d,
-	0x79, 0xa1, 0xa1, 0xf6, 0xaa, 0x82, 0x2f, 0xbe, 0xf4, 0x34, 0x5f, 0xca, 0x3e, 0x3d, 0x3c, 0xd8,
-	0x2b, 0xd1, 0xa6, 0xe3, 0x1f, 0xf2, 0x97, 0x73, 0xe9, 0x97, 0x7b, 0x26, 0x6d, 0xec, 0xd6, 0x9a,
-	0xba, 0xf7, 0x88, 0xaf, 0x78, 0x25, 0xbd, 0xc2, 0x37, 0x9b, 0xd4, 0xf3, 0xf5, 0xa6, 0x13, 0x2e,
-	0x20, 0x0e, 0x4c, 0x6d, 0xb8, 0x54, 0xf7, 0xe9, 0x7d, 0xee, 0xb8, 0x4a, 0xdf, 0x3b, 0xa0, 0x9e,
-	0x8f, 0x6f, 0xc1, 0x70, 0x84, 0xa5, 0x80, 0xe6, 0xd0, 0xc2, 0x68, 0x79, 0xbe, 0xd8, 0x31, 0xde,
-	0x62, 0xcb, 0xba, 0x65, 0x84, 0xa7, 0x61, 0xd0, 0xd1, 0xdd, 0xc0, 0xbc, 0x6f, 0x0e, 0x2d, 0x8c,
-	0x54, 0xf9, 0x27, 0xb2, 0x00, 0x78, 0x93, 0xfa, 0x69, 0x77, 0x18, 0x4e, 0x58, 0x7a, 0x93, 0x32,
-	0x57, 0x23, 0x55, 0xf6, 0x37, 0xf9, 0x04, 0xc1, 0xd4, 0x3b, 0xce, 0xee, 0x71, 0x80, 0x5b, 0x85,
-	0xd1, 0x03, 0xb6, 0x33, 0x23, 0x8b, 0x21, 0x1c, 0x2d, 0x6b, 0xd1, 0x1e, 0x11, 0x5b, 0xc5, 0x37,
-	0x02, 0x3e, 0x1f, 0xe8, 0xde, 0xa3, 0x2a, 0x84, 0xcb, 0x83, 0xbf, 0x89, 0x0d, 0x2f, 0x6f, 0x51,
-	0xdd, 0x35, 0xf6, 0xb7, 0xcc, 0xa6, 0xd9, 0xd0, 0xdd, 0x68, 0x7f, 0x4f, 0x12, 0x0c, 0x3e, 0x0d,
-	0x23, 0x8e, 0x5e, 0xa7, 0x35, 0xcf, 0x7c, 0x46, 0x99, 0xbf, 0x81, 0xea, 0x70, 0xf0, 0x60, 0xcb,
-	0x7c, 0x46, 0xf1, 0xcb, 0x00, 0xec, 0xa5, 0x6f, 0x3f, 0xa2, 0x56, 0xa1, 0x9f, 0x99, 0xb1, 0xe5,
-	0xdb, 0xc1, 0x03, 0xf2, 0x6f, 0x04, 0x67, 0x3b, 0x79, 0xf4, 0x1c, 0xdb, 0xf2, 0x28, 0xde, 0x81,
-	0x21, 0x97, 0x7a, 0x07, 0x0d, 0xdf, 0x2b, 0xa0, 0xb9, 0xfe, 0x85, 0xd1, 0xf2, 0x97, 0x24, 0x84,
-	0xc8, 0xf7, 0x2a, 0x56, 0xd9, 0x46, 0xd5, 0x68, 0x43, 0x7c, 0x01, 0x4e, 0x5a, 0xf4, 0xa9, 0x5f,
-	0x13, 0x20, 0x86, 0x29, 0x1d, 0x0f, 0x1e, 0xbf, 0x1d, 0xc1, 0xd4, 0xee, 0xc3, 0x60, 0x68, 0x7a,
-	0xe4, 0xfc, 0x90, 0xa7, 0x30, 0x13, 0x96, 0xe5, 0x7a, 0xab, 0x79, 0x22, 0x72, 0xe3, 0xba, 0x42,
-	0x62, 0x5d, 0xe1, 0xbb, 0x00, 0x71, 0xa7, 0xf1, 0x8c, 0x9e, 0x97, 0x78, 0x15, 0x76, 0x16, 0x0c,
-	0x49, 0x03, 0xa6, 0xdf, 0x34, 0x3d, 0x3f, 0x7e, 0xeb, 0xe5, 0x39, 0x3e, 0x4a, 0x66, 0x3f, 0x42,
-	0x30, 0xd3, 0xe6, 0x8e, 0xa7, 0x74, 0x13, 0x46, 0x85, 0xd1, 0xc1, 0xd3, 0xaa, 0x18, 0x91, 0x68,
-	0xa9, 0x9a, 0x3f, 0xf2, 0x75, 0x98, 0x0c, 0x49, 0xdf, 0xd6, 0xeb, 0x79, 0x41, 0x2f, 0x41, 0xbf,
-	0xaf, 0xd7, 0x39, 0xcd, 0x67, 0x25, 0xa0, 0x82, 0xbd, 0x82, 0xa5, 0xe4, 0x02, 0x4c, 0xde, 0xa1,
-	0x0d, 0x9a, 0xd8, 0x3d, 0xab, 0xeb, 0x29, 0x9c, 0x0c, 0x18, 0xd9, 0xd6, 0xeb, 0xc7, 0xca, 0xbc,
-	0x05, 0x93, 0xb1, 0x1b, 0xce, 0x78, 0x19, 0x4e, 0xf8, 0x7a, 0x3d, 0xa2, 0x3a, 0x2f, 0x2a, 0xb6,
-	0x56, 0x99, 0xdc, 0x7d, 0x78, 0x29, 0x24, 0x77, 0xcb, 0xac, 0x5b, 0x7a, 0x23, 0x2f, 0xb4, 0x15,
-	0x18, 0xf4, 0xd8, 0x42, 0x4e, 0xf1, 0x39, 0x59, 0x3b, 0x87, 0x3b, 0x72, 0x03, 0xf2, 0x0d, 0x04,
-	0xa7, 0xa2, 0x0e, 0x0f, 0x1e, 0xe4, 0xd2, 0x78, 0x0a, 0x06, 0xde, 0x3b, 0xa0, 0xee, 0x21, 0x07,
-	0x1e, 0x7e, 0x48, 0x92, 0xdb, 0x2f, 0x25, 0xf7, 0x44, 0x9a, 0xdc, 0x0f, 0x60, 0x2a, 0x85, 0x80,
-	0x33, 0xbc, 0x0a, 0x43, 0x21, 0xca, 0x88, 0x64, 0x85, 0xb8, 0x22, 0x0b, 0x65, 0xaa, 0x2f, 0xc0,
-	0xe4, 0x26, 0xf5, 0x93, 0x3c, 0x67, 0x55, 0xda, 0x77, 0x10, 0xbc, 0x14, 0x9e, 0x2f, 0xc9, 0xb5,
-	0x31, 0xf7, 0xa8, 0x4b, 0xee, 0x8f, 0x76, 0xae, 0x7c, 0x8a, 0x60, 0x3a, 0xa4, 0xad, 0xed, 0x44,
-	0xf9, 0xbf, 0xa5, 0x2e, 0xb0, 0x0d, 0xee, 0x08, 0xb5, 0x67, 0xb6, 0x45, 0x0b, 0x03, 0xec, 0xed,
-	0x70, 0xf0, 0x60, 0xc7, 0xb6, 0x28, 0xf9, 0x26, 0x82, 0x99, 0x36, 0x84, 0x3c, 0xb5, 0xeb, 0x30,
-	0xd2, 0xba, 0xbc, 0xf0, 0xe4, 0x2a, 0x0d, 0xfd, 0xd8, 0x4a, 0x39, 0xc1, 0x3f, 0xe9, 0x87, 0x99,
-	0xbb, 0x9e, 0xa1, 0x37, 0x3e, 0x6f, 0x57, 0x03, 0xfc, 0x00, 0xc6, 0xbd, 0x83, 0x87, 0x9e, 0xe1,
-	0x9a, 0x4e, 0x38, 0xb5, 0xfb, 0x19, 0x11, 0x17, 0x65, 0x15, 0x24, 0xac, 0xaf, 0x26, 0xad, 0x5b,
-	0x03, 0xe9, 0x44, 0x17, 0x03, 0x69, 0x13, 0x06, 0x5c, 0xbb, 0x41, 0xbd, 0xc2, 0x00, 0x33, 0xba,
-	0xa2, 0x12, 0xbd, 0xdd, 0xa0, 0xeb, 0x5e, 0x50, 0xc2, 0xcd, 0xe0, 0x53, 0x68, 0x1f, 0x24, 0x54,
-	0x77, 0x7d, 0x73, 0x4f, 0x37, 0x7c, 0xaf, 0x30, 0x98, 0x9b, 0xd0, 0x75, 0xbe, 0xb6, 0x1a, 0x5b,
-	0x91, 0xbf, 0xf5, 0x41, 0xa1, 0x3d, 0x51, 0xbc, 0x60, 0x8e, 0x9c, 0xa9, 0x36, 0xb2, 0xfb, 0xfe,
-	0x27, 0x64, 0xf7, 0x77, 0x41, 0xf6, 0x8d, 0x88, 0xec, 0x13, 0xb9, 0xae, 0x45, 0xb2, 0x33, 0x29,
-	0x1e, 0xe8, 0x89, 0xe2, 0xd6, 0x05, 0xbe, 0xf5, 0x32, 0x67, 0x64, 0xdc, 0x82, 0xe1, 0xc8, 0x9a,
-	0x17, 0xb7, 0x92, 0xcb, 0x96, 0x11, 0x79, 0x17, 0x4e, 0xb1, 0x2b, 0x4b, 0x04, 0xe1, 0x38, 0x4f,
-	0xe9, 0x0f, 0x11, 0x4c, 0xa5, 0x9c, 0xc5, 0xe3, 0x26, 0xa6, 0x0e, 0xf5, 0x42, 0x9d, 0xf2, 0xb8,
-	0x89, 0xbf, 0x87, 0xa4, 0x39, 0x16, 0xb9, 0x44, 0x3d, 0x70, 0x79, 0xb4, 0xf3, 0xe2, 0x12, 0x4c,
-	0x85, 0x37, 0xaa, 0x34, 0xac, 0xac, 0xc3, 0xee, 0x5f, 0x7d, 0xc1, 0xe8, 0xb6, 0x76, 0xb7, 0xf6,
-	0xcd, 0x3d, 0xff, 0x9e, 0x6e, 0xed, 0xda, 0x7b, 0x7b, 0x79, 0x99, 0x3b, 0x0b, 0xe0, 0x52, 0xc3,
-	0x74, 0x4c, 0x36, 0xd3, 0x83, 0xee, 0x1a, 0xa9, 0x0a, 0x4f, 0xf0, 0x04, 0xf4, 0x19, 0x06, 0xeb,
-	0x97, 0x91, 0x6a, 0x9f, 0x61, 0xe0, 0x02, 0x0c, 0x79, 0x07, 0x0f, 0xdf, 0xa5, 0x86, 0xcf, 0xcf,
-	0x95, 0xe8, 0x23, 0x7e, 0x0d, 0xb0, 0x65, 0xfb, 0xd4, 0xab, 0x19, 0xb6, 0xe5, 0x53, 0xcb, 0xaf,
-	0xf9, 0x87, 0x4e, 0x74, 0xbc, 0x4c, 0xb2, 0x37, 0x1b, 0xe1, 0x8b, 0xed, 0x43, 0x87, 0xe2, 0x79,
-	0x18, 0x4f, 0xac, 0x2e, 0x0c, 0xb2, 0x85, 0x63, 0xe2, 0x42, 0xfc, 0x35, 0xf1, 0xbc, 0x19, 0x62,
-	0x05, 0xb0, 0x2a, 0xfd, 0xce, 0x93, 0x19, 0x7b, 0xe6, 0x39, 0x74, 0x0e, 0xc6, 0x1c, 0x97, 0x3e,
-	0x36, 0xe9, 0x93, 0x9a, 0x6d, 0x35, 0x0e, 0x0b, 0xc3, 0x73, 0x68, 0x61, 0xb8, 0x3a, 0xca, 0x9f,
-	0x7d, 0xc5, 0x6a, 0x1c, 0x6a, 0x67, 0x61, 0x38, 0xb2, 0xcc, 0xa4, 0xfb, 0xab, 0x50, 0x68, 0xf7,
-	0xc8, 0x4b, 0xf7, 0x1c, 0x8c, 0x25, 0x68, 0x08, 0xed, 0x46, 0x0d, 0x81, 0x81, 0x02, 0x0c, 0x45,
-	0xb1, 0x87, 0x25, 0x19, 0x7d, 0x0c, 0x6e, 0x77, 0xb3, 0xfc, 0x22, 0x29, 0xce, 0xb2, 0x9c, 0x4c,
-	0x7e, 0x19, 0xc6, 0xc4, 0x61, 0xc7, 0x0b, 0x4d, 0x79, 0x52, 0x26, 0x8c, 0xc9, 0x8f, 0x11, 0xcc,
-	0xf2, 0x7b, 0x53, 0x06, 0x84, 0xb4, 0x2b, 0x74, 0x04, 0x57, 0x47, 0xeb, 0x0f, 0x0b, 0x0a, 0xc1,
-	0xec, 0x10, 0xb7, 0x3f, 0xd6, 0x61, 0xf5, 0x31, 0x82, 0xd9, 0x0c, 0x87, 0x3c, 0xeb, 0x6d, 0xa7,
-	0x15, 0x3a, 0xd2, 0x69, 0xa5, 0x3a, 0xbc, 0x4a, 0x30, 0x1b, 0x0e, 0x89, 0xac, 0x5c, 0x65, 0x55,
-	0xee, 0xcf, 0x11, 0xcc, 0xa7, 0x24, 0xa1, 0xe4, 0xf5, 0x20, 0x87, 0xc1, 0x47, 0x50, 0x88, 0x3a,
-	0xa9, 0x16, 0x9c, 0x72, 0x35, 0xbd, 0x65, 0xca, 0xf3, 0xd7, 0xc3, 0x95, 0x64, 0xda, 0xcc, 0x7c,
-	0x4e, 0x56, 0x60, 0x3e, 0x8c, 0x4e, 0x8e, 0x35, 0x2b, 0xce, 0xa7, 0x40, 0x82, 0x64, 0x65, 0x1b,
-	0x1e, 0x6b, 0x9d, 0xfc, 0x1e, 0xc1, 0xbc, 0xd4, 0x35, 0xaf, 0x98, 0x26, 0xcc, 0x76, 0x62, 0x32,
-	0xaa, 0x9e, 0x1e, 0xa8, 0x9c, 0xc9, 0xa6, 0x52, 0xbd, 0xa2, 0x3e, 0x00, 0xc2, 0xd9, 0x11, 0x3d,
-	0xb0, 0x21, 0xf7, 0x98, 0xba, 0x32, 0x0d, 0xec, 0x36, 0x8c, 0x59, 0xf4, 0x09, 0x0f, 0x83, 0x52,
-	0x5e, 0x0e, 0xaf, 0x48, 0x62, 0x78, 0xc7, 0xa3, 0x6e, 0x75, 0xd4, 0xa2, 0x4f, 0xd6, 0xb9, 0x4d,
-	0xe0, 0x7d, 0xc3, 0xb6, 0xf6, 0x4c, 0xb7, 0xf9, 0x22, 0xbc, 0x3f, 0x83, 0xb9, 0x37, 0x6c, 0xd7,
-	0xa0, 0x2f, 0xc2, 0xf7, 0xfb, 0x70, 0x6e, 0x43, 0xb7, 0x0c, 0xda, 0x78, 0x01, 0xce, 0xcb, 0x3f,
-	0xbb, 0x0c, 0x27, 0x23, 0xbf, 0x5b, 0xa1, 0x0a, 0x8e, 0x7f, 0x88, 0x60, 0x22, 0x39, 0x29, 0xf0,
-	0x92, 0x64, 0xd3, 0x4c, 0x9d, 0x59, 0x53, 0xb9, 0xf3, 0x93, 0x95, 0x0f, 0xff, 0xf2, 0x8f, 0xef,
-	0xf6, 0x2d, 0x93, 0x8b, 0xb1, 0x50, 0xfe, 0x7e, 0xd8, 0x88, 0x37, 0x1c, 0xd7, 0x0e, 0x6e, 0x18,
-	0x5e, 0x69, 0xf1, 0x79, 0x2c, 0x9e, 0x57, 0xe2, 0x2f, 0x09, 0x1f, 0x23, 0x18, 0x15, 0xf4, 0x66,
-	0x7c, 0x59, 0xe2, 0xaf, 0x5d, 0x97, 0x56, 0x83, 0x57, 0x62, 0xf0, 0x5e, 0xc5, 0x22, 0xbc, 0x80,
-	0x79, 0x01, 0x5c, 0x8c, 0xad, 0xb4, 0xf8, 0x1c, 0xff, 0x1a, 0xc1, 0xc9, 0xd4, 0xf7, 0x68, 0x7c,
-	0x25, 0x57, 0xb0, 0x4d, 0xab, 0x02, 0x5a, 0xb9, 0x1b, 0x93, 0x70, 0xa8, 0x90, 0xd7, 0x19, 0xd6,
-	0x25, 0x5c, 0x54, 0xa5, 0xd2, 0x63, 0x1b, 0xe1, 0x5f, 0x20, 0x98, 0x48, 0x8a, 0xf1, 0xd2, 0x64,
-	0x67, 0xea, 0xf6, 0x6a, 0x6c, 0xde, 0x66, 0x08, 0xd7, 0xca, 0x4b, 0x02, 0xc2, 0x08, 0x4e, 0x51,
-	0x46, 0xab, 0x90, 0xf5, 0x6f, 0xf7, 0x45, 0x52, 0x4a, 0x5a, 0xe5, 0xc6, 0x5f, 0xec, 0x41, 0x18,
-	0x0f, 0xd1, 0xaf, 0xf4, 0x2c, 0xa9, 0x93, 0xe7, 0x2c, 0xa6, 0x27, 0xf8, 0x9a, 0x62, 0x85, 0x70,
-	0xd6, 0xf9, 0x7e, 0x3b, 0x37, 0xf1, 0x9a, 0xc4, 0x90, 0xeb, 0x63, 0x6d, 0x66, 0x71, 0xcc, 0xbf,
-	0x45, 0x91, 0xb4, 0x1b, 0x6b, 0xc4, 0xb8, 0x9c, 0xdb, 0xab, 0x6d, 0xe2, 0xbb, 0xa6, 0x26, 0x3f,
-	0x93, 0xfb, 0x2c, 0xdc, 0x0d, 0x72, 0x4d, 0x56, 0x64, 0x89, 0x80, 0xc5, 0x5f, 0xc9, 0x2a, 0x82,
-	0x1e, 0x8f, 0x7f, 0x83, 0x42, 0x3d, 0x58, 0x50, 0xc8, 0xa5, 0xad, 0x92, 0x2d, 0xde, 0x4b, 0x5b,
-	0xa5, 0x83, 0x00, 0x4f, 0x6e, 0xb0, 0x28, 0xae, 0xe3, 0xde, 0xa2, 0xc0, 0x9f, 0x20, 0x18, 0x69,
-	0xe9, 0xe9, 0xf8, 0x52, 0x2e, 0xdb, 0xb1, 0x2e, 0xae, 0xe5, 0x88, 0x0f, 0x64, 0x95, 0x21, 0xbb,
-	0x46, 0x8a, 0xea, 0xc8, 0x7c, 0xbd, 0xee, 0x55, 0xfa, 0x7d, 0xbd, 0x8e, 0xbf, 0x85, 0x60, 0xa4,
-	0xa5, 0xc4, 0x4b, 0x71, 0xa5, 0xf5, 0x7a, 0x6d, 0xba, 0xed, 0xe6, 0x7d, 0xb7, 0xe9, 0xf8, 0x87,
-	0xd1, 0x50, 0x59, 0x2c, 0xaa, 0x95, 0x37, 0x03, 0x13, 0xcc, 0xc1, 0x1f, 0x20, 0x18, 0x8e, 0x54,
-	0x78, 0xbc, 0x98, 0x93, 0x22, 0xe1, 0x17, 0x01, 0xed, 0x92, 0xd2, 0xda, 0x6e, 0x46, 0x5e, 0x3b,
-	0x5b, 0xf8, 0xfb, 0x08, 0xc6, 0x44, 0xcd, 0x1e, 0x17, 0x73, 0x73, 0x98, 0x10, 0x92, 0xb5, 0x7c,
-	0xe1, 0x98, 0x5c, 0x63, 0xd8, 0x4a, 0xe4, 0xbc, 0x7c, 0x1c, 0xf3, 0x16, 0xaf, 0x44, 0x3a, 0xf3,
-	0x4f, 0x11, 0x8c, 0x27, 0x14, 0x76, 0x5c, 0x52, 0x18, 0x4e, 0xe2, 0xaf, 0x01, 0xda, 0x92, 0xba,
-	0x01, 0xe7, 0xf1, 0x2a, 0xc3, 0x5a, 0xc4, 0xaf, 0xa9, 0x61, 0xe5, 0x07, 0xc7, 0x47, 0x08, 0x46,
-	0x5a, 0x72, 0xbc, 0xb4, 0xdc, 0xd2, 0xa2, 0xbd, 0x0a, 0x7f, 0x97, 0x19, 0xa6, 0x8b, 0xf8, 0xbc,
-	0xd2, 0x7c, 0xc4, 0x9f, 0x22, 0x18, 0x13, 0x25, 0x7f, 0x69, 0x4a, 0x33, 0x7e, 0x1b, 0x50, 0x81,
-	0xb4, 0xc6, 0x20, 0xbd, 0x5e, 0x16, 0x69, 0x0a, 0x21, 0x14, 0x25, 0x93, 0x3b, 0xca, 0xec, 0x1f,
-	0x11, 0x4c, 0xa6, 0x25, 0x53, 0xe9, 0xa8, 0xee, 0x20, 0x84, 0x6b, 0xcb, 0x5d, 0xd9, 0xf0, 0x14,
-	0xdf, 0x61, 0xd8, 0x6f, 0x92, 0x95, 0xae, 0xcf, 0x5e, 0xca, 0xb7, 0xac, 0xa0, 0x45, 0xfc, 0xcb,
-	0xd6, 0xc5, 0x30, 0x52, 0xa6, 0x14, 0x2e, 0x86, 0x29, 0x11, 0x4b, 0x53, 0x51, 0xd2, 0xc8, 0x5d,
-	0x86, 0xf7, 0x16, 0x59, 0xee, 0x62, 0x44, 0x47, 0xfa, 0x5f, 0x25, 0x96, 0xe1, 0x7e, 0x85, 0x60,
-	0x3c, 0x21, 0x33, 0x4a, 0xdb, 0x29, 0x4b, 0xfd, 0x94, 0xb6, 0x53, 0xa6, 0x82, 0x19, 0x0d, 0x71,
-	0xdc, 0x0b, 0xf6, 0xe0, 0x58, 0x9c, 0x48, 0x6a, 0x92, 0x0a, 0xd7, 0xb1, 0x9e, 0x28, 0x7e, 0x8b,
-	0xc1, 0xbc, 0x57, 0x16, 0x6f, 0x20, 0x11, 0x0e, 0x59, 0x49, 0xc4, 0x60, 0xd9, 0xd5, 0xac, 0xc5,
-	0xf5, 0xf7, 0x10, 0x4c, 0x24, 0x65, 0x4b, 0x29, 0xf2, 0x4c, 0x85, 0xb3, 0xe3, 0x41, 0xc4, 0x39,
-	0x5d, 0x5c, 0x56, 0x3c, 0x88, 0x44, 0x8c, 0x01, 0xa7, 0x93, 0x69, 0xd1, 0x0e, 0x97, 0xbb, 0xd7,
-	0x14, 0xa5, 0xad, 0xd7, 0x49, 0x15, 0x24, 0x15, 0x06, 0xfd, 0x2a, 0x29, 0xe5, 0x4c, 0x57, 0xc1,
-	0xb6, 0xe2, 0x51, 0x6b, 0x37, 0x68, 0xb8, 0x3f, 0x21, 0xc0, 0xed, 0xa2, 0x20, 0xbe, 0x9a, 0x7f,
-	0x5e, 0xb5, 0x8b, 0x42, 0x9a, 0xaa, 0x22, 0x45, 0x1e, 0x30, 0xc4, 0x9b, 0xe4, 0xba, 0x7a, 0x01,
-	0x27, 0x34, 0xac, 0x4a, 0x52, 0xeb, 0xfb, 0x33, 0x02, 0xdc, 0x2e, 0x2b, 0x4a, 0x83, 0xe8, 0xa8,
-	0x42, 0xaa, 0x07, 0xb1, 0xc3, 0x82, 0xd8, 0x2e, 0xdf, 0x11, 0xa7, 0xb5, 0xb0, 0x40, 0x5a, 0xe2,
-	0x89, 0x70, 0x82, 0x32, 0x4f, 0x46, 0xf4, 0x07, 0x04, 0x5f, 0x68, 0x13, 0x04, 0xf1, 0x72, 0xce,
-	0xa4, 0xc8, 0xd2, 0x2b, 0xb5, 0xab, 0xdd, 0x19, 0xf1, 0x9a, 0xba, 0xc5, 0x82, 0x5b, 0xc1, 0xbd,
-	0x66, 0x08, 0xff, 0x08, 0x01, 0x6e, 0x97, 0x0f, 0xa5, 0x39, 0xe9, 0xa8, 0x36, 0x76, 0x6c, 0x5a,
-	0x8e, 0x72, 0xf1, 0xba, 0x62, 0xd3, 0xa6, 0x59, 0xc7, 0x7f, 0x45, 0x70, 0x46, 0x26, 0x59, 0xe2,
-	0x9b, 0xea, 0xb2, 0x44, 0x96, 0x7e, 0xa8, 0x75, 0x2f, 0xb3, 0x65, 0x9e, 0xa4, 0x39, 0xd4, 0xbb,
-	0x49, 0x41, 0x2e, 0x68, 0xec, 0xdf, 0x21, 0x38, 0x23, 0x13, 0x38, 0xa5, 0x91, 0x29, 0x28, 0xa3,
-	0x1d, 0x73, 0xb2, 0xce, 0xe0, 0xaf, 0x2e, 0xae, 0x28, 0xe6, 0x24, 0x85, 0x3d, 0xc8, 0xca, 0x67,
-	0x08, 0x4e, 0x4b, 0x64, 0x4e, 0x7c, 0x23, 0xa7, 0xa4, 0xe5, 0xca, 0xac, 0x76, 0xb3, 0x57, 0x73,
-	0xde, 0x1b, 0x3c, 0x42, 0xdc, 0x7b, 0x82, 0xf0, 0x3f, 0x11, 0x9c, 0x96, 0x48, 0xa1, 0xd2, 0x08,
-	0xf3, 0x25, 0xd4, 0x5e, 0xaa, 0x6e, 0x9b, 0x05, 0xf5, 0x16, 0xb9, 0xdf, 0x73, 0xda, 0x2a, 0x6e,
-	0xe8, 0x3d, 0x02, 0x13, 0x54, 0x61, 0x10, 0xa7, 0x44, 0x74, 0x95, 0xc6, 0x99, 0x2f, 0xd6, 0xbe,
-	0xa0, 0x38, 0x8d, 0x10, 0x98, 0x18, 0xe7, 0x67, 0x08, 0x66, 0x3b, 0xca, 0xbb, 0x58, 0xf6, 0xeb,
-	0x62, 0x9e, 0x28, 0xdc, 0x4b, 0x8c, 0x55, 0x16, 0xe3, 0x9b, 0x64, 0xb3, 0xf7, 0x18, 0xf7, 0x02,
-	0x58, 0x62, 0x84, 0x7f, 0x47, 0xa0, 0x75, 0x16, 0x91, 0xf1, 0x9a, 0x2c, 0x91, 0x79, 0xda, 0x73,
-	0x2f, 0x31, 0x6e, 0xb1, 0x18, 0x1f, 0x90, 0x7b, 0x47, 0xc8, 0x23, 0xc3, 0x25, 0x04, 0x79, 0x7b,
-	0x1f, 0xe6, 0x0d, 0xbb, 0x19, 0x81, 0x09, 0x60, 0x44, 0xff, 0xb7, 0xdd, 0x82, 0xa3, 0x3b, 0xe6,
-	0xdb, 0x68, 0x67, 0x8d, 0x2f, 0xa9, 0xdb, 0x0d, 0xdd, 0xaa, 0x17, 0x6d, 0xb7, 0x5e, 0xaa, 0x53,
-	0x8b, 0x4d, 0xc2, 0x52, 0xf8, 0x4a, 0x77, 0x4c, 0x2f, 0xe3, 0xdf, 0xb4, 0x57, 0x4d, 0xb7, 0xf9,
-	0x1f, 0x84, 0x1e, 0x0e, 0xb2, 0xb5, 0xcb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xf4, 0xe1,
-	0x75, 0x3d, 0x2e, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/kms/v1/resources.pb.go b/googleapis/cloud/kms/v1/resources.pb.go
index c95381da23..257310b952 100644
--- a/googleapis/cloud/kms/v1/resources.pb.go
+++ b/googleapis/cloud/kms/v1/resources.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/kms/v1/resources.proto
 
-package kms // import "google.golang.org/genproto/googleapis/cloud/kms/v1"
+package kms
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // [ProtectionLevel][google.cloud.kms.v1.ProtectionLevel] specifies how
 // cryptographic operations are performed.
@@ -39,6 +42,7 @@ var ProtectionLevel_name = map[int32]string{
 	1: "SOFTWARE",
 	2: "HSM",
 }
+
 var ProtectionLevel_value = map[string]int32{
 	"PROTECTION_LEVEL_UNSPECIFIED": 0,
 	"SOFTWARE":                     1,
@@ -48,8 +52,9 @@ var ProtectionLevel_value = map[string]int32{
 func (x ProtectionLevel) String() string {
 	return proto.EnumName(ProtectionLevel_name, int32(x))
 }
+
 func (ProtectionLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{0}
+	return fileDescriptor_e40e1384d35a80c5, []int{0}
 }
 
 // [CryptoKeyPurpose][google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose]
@@ -85,6 +90,7 @@ var CryptoKey_CryptoKeyPurpose_name = map[int32]string{
 	5: "ASYMMETRIC_SIGN",
 	6: "ASYMMETRIC_DECRYPT",
 }
+
 var CryptoKey_CryptoKeyPurpose_value = map[string]int32{
 	"CRYPTO_KEY_PURPOSE_UNSPECIFIED": 0,
 	"ENCRYPT_DECRYPT":                1,
@@ -95,8 +101,9 @@ var CryptoKey_CryptoKeyPurpose_value = map[string]int32{
 func (x CryptoKey_CryptoKeyPurpose) String() string {
 	return proto.EnumName(CryptoKey_CryptoKeyPurpose_name, int32(x))
 }
+
 func (CryptoKey_CryptoKeyPurpose) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{1, 0}
+	return fileDescriptor_e40e1384d35a80c5, []int{1, 0}
 }
 
 // Attestion formats provided by the HSM.
@@ -117,6 +124,7 @@ var KeyOperationAttestation_AttestationFormat_name = map[int32]string{
 	3: "CAVIUM_V1_COMPRESSED",
 	4: "CAVIUM_V2_COMPRESSED",
 }
+
 var KeyOperationAttestation_AttestationFormat_value = map[string]int32{
 	"ATTESTATION_FORMAT_UNSPECIFIED": 0,
 	"CAVIUM_V1_COMPRESSED":           3,
@@ -126,8 +134,9 @@ var KeyOperationAttestation_AttestationFormat_value = map[string]int32{
 func (x KeyOperationAttestation_AttestationFormat) String() string {
 	return proto.EnumName(KeyOperationAttestation_AttestationFormat_name, int32(x))
 }
+
 func (KeyOperationAttestation_AttestationFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{3, 0}
+	return fileDescriptor_e40e1384d35a80c5, []int{3, 0}
 }
 
 // The algorithm of the
@@ -211,6 +220,7 @@ var CryptoKeyVersion_CryptoKeyVersionAlgorithm_name = map[int32]string{
 	12: "EC_SIGN_P256_SHA256",
 	13: "EC_SIGN_P384_SHA384",
 }
+
 var CryptoKeyVersion_CryptoKeyVersionAlgorithm_value = map[string]int32{
 	"CRYPTO_KEY_VERSION_ALGORITHM_UNSPECIFIED": 0,
 	"GOOGLE_SYMMETRIC_ENCRYPTION":              1,
@@ -230,8 +240,9 @@ var CryptoKeyVersion_CryptoKeyVersionAlgorithm_value = map[string]int32{
 func (x CryptoKeyVersion_CryptoKeyVersionAlgorithm) String() string {
 	return proto.EnumName(CryptoKeyVersion_CryptoKeyVersionAlgorithm_name, int32(x))
 }
+
 func (CryptoKeyVersion_CryptoKeyVersionAlgorithm) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{4, 0}
+	return fileDescriptor_e40e1384d35a80c5, []int{4, 0}
 }
 
 // The state of a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion],
@@ -274,6 +285,7 @@ var CryptoKeyVersion_CryptoKeyVersionState_name = map[int32]string{
 	3: "DESTROYED",
 	4: "DESTROY_SCHEDULED",
 }
+
 var CryptoKeyVersion_CryptoKeyVersionState_value = map[string]int32{
 	"CRYPTO_KEY_VERSION_STATE_UNSPECIFIED": 0,
 	"PENDING_GENERATION":                   5,
@@ -286,8 +298,9 @@ var CryptoKeyVersion_CryptoKeyVersionState_value = map[string]int32{
 func (x CryptoKeyVersion_CryptoKeyVersionState) String() string {
 	return proto.EnumName(CryptoKeyVersion_CryptoKeyVersionState_name, int32(x))
 }
+
 func (CryptoKeyVersion_CryptoKeyVersionState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{4, 1}
+	return fileDescriptor_e40e1384d35a80c5, []int{4, 1}
 }
 
 // A view for [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]s.
@@ -314,6 +327,7 @@ var CryptoKeyVersion_CryptoKeyVersionView_name = map[int32]string{
 	0: "CRYPTO_KEY_VERSION_VIEW_UNSPECIFIED",
 	1: "FULL",
 }
+
 var CryptoKeyVersion_CryptoKeyVersionView_value = map[string]int32{
 	"CRYPTO_KEY_VERSION_VIEW_UNSPECIFIED": 0,
 	"FULL":                                1,
@@ -322,8 +336,9 @@ var CryptoKeyVersion_CryptoKeyVersionView_value = map[string]int32{
 func (x CryptoKeyVersion_CryptoKeyVersionView) String() string {
 	return proto.EnumName(CryptoKeyVersion_CryptoKeyVersionView_name, int32(x))
 }
+
 func (CryptoKeyVersion_CryptoKeyVersionView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{4, 2}
+	return fileDescriptor_e40e1384d35a80c5, []int{4, 2}
 }
 
 // A [KeyRing][google.cloud.kms.v1.KeyRing] is a toplevel logical grouping of
@@ -345,16 +360,17 @@ func (m *KeyRing) Reset()         { *m = KeyRing{} }
 func (m *KeyRing) String() string { return proto.CompactTextString(m) }
 func (*KeyRing) ProtoMessage()    {}
 func (*KeyRing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{0}
+	return fileDescriptor_e40e1384d35a80c5, []int{0}
 }
+
 func (m *KeyRing) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeyRing.Unmarshal(m, b)
 }
 func (m *KeyRing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeyRing.Marshal(b, m, deterministic)
 }
-func (dst *KeyRing) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeyRing.Merge(dst, src)
+func (m *KeyRing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyRing.Merge(m, src)
 }
 func (m *KeyRing) XXX_Size() int {
 	return xxx_messageInfo_KeyRing.Size(m)
@@ -450,16 +466,17 @@ func (m *CryptoKey) Reset()         { *m = CryptoKey{} }
 func (m *CryptoKey) String() string { return proto.CompactTextString(m) }
 func (*CryptoKey) ProtoMessage()    {}
 func (*CryptoKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{1}
+	return fileDescriptor_e40e1384d35a80c5, []int{1}
 }
+
 func (m *CryptoKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CryptoKey.Unmarshal(m, b)
 }
 func (m *CryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CryptoKey.Marshal(b, m, deterministic)
 }
-func (dst *CryptoKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CryptoKey.Merge(dst, src)
+func (m *CryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoKey.Merge(m, src)
 }
 func (m *CryptoKey) XXX_Size() int {
 	return xxx_messageInfo_CryptoKey.Size(m)
@@ -543,61 +560,13 @@ func (m *CryptoKey) GetLabels() map[string]string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CryptoKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CryptoKey_OneofMarshaler, _CryptoKey_OneofUnmarshaler, _CryptoKey_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CryptoKey) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CryptoKey_RotationPeriod)(nil),
 	}
 }
 
-func _CryptoKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CryptoKey)
-	// rotation_schedule
-	switch x := m.RotationSchedule.(type) {
-	case *CryptoKey_RotationPeriod:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RotationPeriod); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CryptoKey.RotationSchedule has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CryptoKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CryptoKey)
-	switch tag {
-	case 8: // rotation_schedule.rotation_period
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.RotationSchedule = &CryptoKey_RotationPeriod{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CryptoKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CryptoKey)
-	// rotation_schedule
-	switch x := m.RotationSchedule.(type) {
-	case *CryptoKey_RotationPeriod:
-		s := proto.Size(x.RotationPeriod)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A [CryptoKeyVersionTemplate][google.cloud.kms.v1.CryptoKeyVersionTemplate]
 // specifies the properties to use when creating a new
 // [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion], either manually
@@ -630,16 +599,17 @@ func (m *CryptoKeyVersionTemplate) Reset()         { *m = CryptoKeyVersionTempla
 func (m *CryptoKeyVersionTemplate) String() string { return proto.CompactTextString(m) }
 func (*CryptoKeyVersionTemplate) ProtoMessage()    {}
 func (*CryptoKeyVersionTemplate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{2}
+	return fileDescriptor_e40e1384d35a80c5, []int{2}
 }
+
 func (m *CryptoKeyVersionTemplate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CryptoKeyVersionTemplate.Unmarshal(m, b)
 }
 func (m *CryptoKeyVersionTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CryptoKeyVersionTemplate.Marshal(b, m, deterministic)
 }
-func (dst *CryptoKeyVersionTemplate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CryptoKeyVersionTemplate.Merge(dst, src)
+func (m *CryptoKeyVersionTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoKeyVersionTemplate.Merge(m, src)
 }
 func (m *CryptoKeyVersionTemplate) XXX_Size() int {
 	return xxx_messageInfo_CryptoKeyVersionTemplate.Size(m)
@@ -680,16 +650,17 @@ func (m *KeyOperationAttestation) Reset()         { *m = KeyOperationAttestation
 func (m *KeyOperationAttestation) String() string { return proto.CompactTextString(m) }
 func (*KeyOperationAttestation) ProtoMessage()    {}
 func (*KeyOperationAttestation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{3}
+	return fileDescriptor_e40e1384d35a80c5, []int{3}
 }
+
 func (m *KeyOperationAttestation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeyOperationAttestation.Unmarshal(m, b)
 }
 func (m *KeyOperationAttestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeyOperationAttestation.Marshal(b, m, deterministic)
 }
-func (dst *KeyOperationAttestation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeyOperationAttestation.Merge(dst, src)
+func (m *KeyOperationAttestation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyOperationAttestation.Merge(m, src)
 }
 func (m *KeyOperationAttestation) XXX_Size() int {
 	return xxx_messageInfo_KeyOperationAttestation.Size(m)
@@ -775,16 +746,17 @@ func (m *CryptoKeyVersion) Reset()         { *m = CryptoKeyVersion{} }
 func (m *CryptoKeyVersion) String() string { return proto.CompactTextString(m) }
 func (*CryptoKeyVersion) ProtoMessage()    {}
 func (*CryptoKeyVersion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{4}
+	return fileDescriptor_e40e1384d35a80c5, []int{4}
 }
+
 func (m *CryptoKeyVersion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CryptoKeyVersion.Unmarshal(m, b)
 }
 func (m *CryptoKeyVersion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CryptoKeyVersion.Marshal(b, m, deterministic)
 }
-func (dst *CryptoKeyVersion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CryptoKeyVersion.Merge(dst, src)
+func (m *CryptoKeyVersion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoKeyVersion.Merge(m, src)
 }
 func (m *CryptoKeyVersion) XXX_Size() int {
 	return xxx_messageInfo_CryptoKeyVersion.Size(m)
@@ -881,16 +853,17 @@ func (m *PublicKey) Reset()         { *m = PublicKey{} }
 func (m *PublicKey) String() string { return proto.CompactTextString(m) }
 func (*PublicKey) ProtoMessage()    {}
 func (*PublicKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_0e872c1c601eedcd, []int{5}
+	return fileDescriptor_e40e1384d35a80c5, []int{5}
 }
+
 func (m *PublicKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublicKey.Unmarshal(m, b)
 }
 func (m *PublicKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublicKey.Marshal(b, m, deterministic)
 }
-func (dst *PublicKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublicKey.Merge(dst, src)
+func (m *PublicKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublicKey.Merge(m, src)
 }
 func (m *PublicKey) XXX_Size() int {
 	return xxx_messageInfo_PublicKey.Size(m)
@@ -916,6 +889,12 @@ func (m *PublicKey) GetAlgorithm() CryptoKeyVersion_CryptoKeyVersionAlgorithm {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.kms.v1.ProtectionLevel", ProtectionLevel_name, ProtectionLevel_value)
+	proto.RegisterEnum("google.cloud.kms.v1.CryptoKey_CryptoKeyPurpose", CryptoKey_CryptoKeyPurpose_name, CryptoKey_CryptoKeyPurpose_value)
+	proto.RegisterEnum("google.cloud.kms.v1.KeyOperationAttestation_AttestationFormat", KeyOperationAttestation_AttestationFormat_name, KeyOperationAttestation_AttestationFormat_value)
+	proto.RegisterEnum("google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionAlgorithm", CryptoKeyVersion_CryptoKeyVersionAlgorithm_name, CryptoKeyVersion_CryptoKeyVersionAlgorithm_value)
+	proto.RegisterEnum("google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionState", CryptoKeyVersion_CryptoKeyVersionState_name, CryptoKeyVersion_CryptoKeyVersionState_value)
+	proto.RegisterEnum("google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionView", CryptoKeyVersion_CryptoKeyVersionView_name, CryptoKeyVersion_CryptoKeyVersionView_value)
 	proto.RegisterType((*KeyRing)(nil), "google.cloud.kms.v1.KeyRing")
 	proto.RegisterType((*CryptoKey)(nil), "google.cloud.kms.v1.CryptoKey")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.kms.v1.CryptoKey.LabelsEntry")
@@ -923,19 +902,13 @@ func init() {
 	proto.RegisterType((*KeyOperationAttestation)(nil), "google.cloud.kms.v1.KeyOperationAttestation")
 	proto.RegisterType((*CryptoKeyVersion)(nil), "google.cloud.kms.v1.CryptoKeyVersion")
 	proto.RegisterType((*PublicKey)(nil), "google.cloud.kms.v1.PublicKey")
-	proto.RegisterEnum("google.cloud.kms.v1.ProtectionLevel", ProtectionLevel_name, ProtectionLevel_value)
-	proto.RegisterEnum("google.cloud.kms.v1.CryptoKey_CryptoKeyPurpose", CryptoKey_CryptoKeyPurpose_name, CryptoKey_CryptoKeyPurpose_value)
-	proto.RegisterEnum("google.cloud.kms.v1.KeyOperationAttestation_AttestationFormat", KeyOperationAttestation_AttestationFormat_name, KeyOperationAttestation_AttestationFormat_value)
-	proto.RegisterEnum("google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionAlgorithm", CryptoKeyVersion_CryptoKeyVersionAlgorithm_name, CryptoKeyVersion_CryptoKeyVersionAlgorithm_value)
-	proto.RegisterEnum("google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionState", CryptoKeyVersion_CryptoKeyVersionState_name, CryptoKeyVersion_CryptoKeyVersionState_value)
-	proto.RegisterEnum("google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionView", CryptoKeyVersion_CryptoKeyVersionView_name, CryptoKeyVersion_CryptoKeyVersionView_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/kms/v1/resources.proto", fileDescriptor_resources_0e872c1c601eedcd)
+	proto.RegisterFile("google/cloud/kms/v1/resources.proto", fileDescriptor_e40e1384d35a80c5)
 }
 
-var fileDescriptor_resources_0e872c1c601eedcd = []byte{
+var fileDescriptor_e40e1384d35a80c5 = []byte{
 	// 1203 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5d, 0x6e, 0xdb, 0x46,
 	0x17, 0x0d, 0x25, 0xcb, 0xb2, 0xae, 0x9c, 0x98, 0x1e, 0xe7, 0x47, 0xf1, 0x17, 0x24, 0x86, 0x92,
diff --git a/googleapis/cloud/kms/v1/service.pb.go b/googleapis/cloud/kms/v1/service.pb.go
index 2e6a843e1b..bd84a67fab 100644
--- a/googleapis/cloud/kms/v1/service.pb.go
+++ b/googleapis/cloud/kms/v1/service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/kms/v1/service.proto
 
-package kms // import "google.golang.org/genproto/googleapis/cloud/kms/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package kms
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [KeyManagementService.ListKeyRings][google.cloud.kms.v1.KeyManagementService.ListKeyRings].
@@ -53,16 +53,17 @@ func (m *ListKeyRingsRequest) Reset()         { *m = ListKeyRingsRequest{} }
 func (m *ListKeyRingsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListKeyRingsRequest) ProtoMessage()    {}
 func (*ListKeyRingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{0}
+	return fileDescriptor_723aeaeb61739a25, []int{0}
 }
+
 func (m *ListKeyRingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListKeyRingsRequest.Unmarshal(m, b)
 }
 func (m *ListKeyRingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListKeyRingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListKeyRingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListKeyRingsRequest.Merge(dst, src)
+func (m *ListKeyRingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKeyRingsRequest.Merge(m, src)
 }
 func (m *ListKeyRingsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListKeyRingsRequest.Size(m)
@@ -122,16 +123,17 @@ func (m *ListCryptoKeysRequest) Reset()         { *m = ListCryptoKeysRequest{} }
 func (m *ListCryptoKeysRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCryptoKeysRequest) ProtoMessage()    {}
 func (*ListCryptoKeysRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{1}
+	return fileDescriptor_723aeaeb61739a25, []int{1}
 }
+
 func (m *ListCryptoKeysRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCryptoKeysRequest.Unmarshal(m, b)
 }
 func (m *ListCryptoKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCryptoKeysRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCryptoKeysRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCryptoKeysRequest.Merge(dst, src)
+func (m *ListCryptoKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeysRequest.Merge(m, src)
 }
 func (m *ListCryptoKeysRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCryptoKeysRequest.Size(m)
@@ -199,16 +201,17 @@ func (m *ListCryptoKeyVersionsRequest) Reset()         { *m = ListCryptoKeyVersi
 func (m *ListCryptoKeyVersionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCryptoKeyVersionsRequest) ProtoMessage()    {}
 func (*ListCryptoKeyVersionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{2}
+	return fileDescriptor_723aeaeb61739a25, []int{2}
 }
+
 func (m *ListCryptoKeyVersionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCryptoKeyVersionsRequest.Unmarshal(m, b)
 }
 func (m *ListCryptoKeyVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCryptoKeyVersionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCryptoKeyVersionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCryptoKeyVersionsRequest.Merge(dst, src)
+func (m *ListCryptoKeyVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeyVersionsRequest.Merge(m, src)
 }
 func (m *ListCryptoKeyVersionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCryptoKeyVersionsRequest.Size(m)
@@ -268,16 +271,17 @@ func (m *ListKeyRingsResponse) Reset()         { *m = ListKeyRingsResponse{} }
 func (m *ListKeyRingsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListKeyRingsResponse) ProtoMessage()    {}
 func (*ListKeyRingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{3}
+	return fileDescriptor_723aeaeb61739a25, []int{3}
 }
+
 func (m *ListKeyRingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListKeyRingsResponse.Unmarshal(m, b)
 }
 func (m *ListKeyRingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListKeyRingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListKeyRingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListKeyRingsResponse.Merge(dst, src)
+func (m *ListKeyRingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKeyRingsResponse.Merge(m, src)
 }
 func (m *ListKeyRingsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListKeyRingsResponse.Size(m)
@@ -330,16 +334,17 @@ func (m *ListCryptoKeysResponse) Reset()         { *m = ListCryptoKeysResponse{}
 func (m *ListCryptoKeysResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCryptoKeysResponse) ProtoMessage()    {}
 func (*ListCryptoKeysResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{4}
+	return fileDescriptor_723aeaeb61739a25, []int{4}
 }
+
 func (m *ListCryptoKeysResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCryptoKeysResponse.Unmarshal(m, b)
 }
 func (m *ListCryptoKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCryptoKeysResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCryptoKeysResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCryptoKeysResponse.Merge(dst, src)
+func (m *ListCryptoKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeysResponse.Merge(m, src)
 }
 func (m *ListCryptoKeysResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCryptoKeysResponse.Size(m)
@@ -393,16 +398,17 @@ func (m *ListCryptoKeyVersionsResponse) Reset()         { *m = ListCryptoKeyVers
 func (m *ListCryptoKeyVersionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCryptoKeyVersionsResponse) ProtoMessage()    {}
 func (*ListCryptoKeyVersionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{5}
+	return fileDescriptor_723aeaeb61739a25, []int{5}
 }
+
 func (m *ListCryptoKeyVersionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCryptoKeyVersionsResponse.Unmarshal(m, b)
 }
 func (m *ListCryptoKeyVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCryptoKeyVersionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCryptoKeyVersionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCryptoKeyVersionsResponse.Merge(dst, src)
+func (m *ListCryptoKeyVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeyVersionsResponse.Merge(m, src)
 }
 func (m *ListCryptoKeyVersionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCryptoKeyVersionsResponse.Size(m)
@@ -449,16 +455,17 @@ func (m *GetKeyRingRequest) Reset()         { *m = GetKeyRingRequest{} }
 func (m *GetKeyRingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetKeyRingRequest) ProtoMessage()    {}
 func (*GetKeyRingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{6}
+	return fileDescriptor_723aeaeb61739a25, []int{6}
 }
+
 func (m *GetKeyRingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetKeyRingRequest.Unmarshal(m, b)
 }
 func (m *GetKeyRingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetKeyRingRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetKeyRingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetKeyRingRequest.Merge(dst, src)
+func (m *GetKeyRingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeyRingRequest.Merge(m, src)
 }
 func (m *GetKeyRingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetKeyRingRequest.Size(m)
@@ -491,16 +498,17 @@ func (m *GetCryptoKeyRequest) Reset()         { *m = GetCryptoKeyRequest{} }
 func (m *GetCryptoKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCryptoKeyRequest) ProtoMessage()    {}
 func (*GetCryptoKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{7}
+	return fileDescriptor_723aeaeb61739a25, []int{7}
 }
+
 func (m *GetCryptoKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCryptoKeyRequest.Unmarshal(m, b)
 }
 func (m *GetCryptoKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCryptoKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCryptoKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCryptoKeyRequest.Merge(dst, src)
+func (m *GetCryptoKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCryptoKeyRequest.Merge(m, src)
 }
 func (m *GetCryptoKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCryptoKeyRequest.Size(m)
@@ -533,16 +541,17 @@ func (m *GetCryptoKeyVersionRequest) Reset()         { *m = GetCryptoKeyVersionR
 func (m *GetCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCryptoKeyVersionRequest) ProtoMessage()    {}
 func (*GetCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{8}
+	return fileDescriptor_723aeaeb61739a25, []int{8}
 }
+
 func (m *GetCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCryptoKeyVersionRequest.Unmarshal(m, b)
 }
 func (m *GetCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCryptoKeyVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCryptoKeyVersionRequest.Merge(dst, src)
+func (m *GetCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCryptoKeyVersionRequest.Merge(m, src)
 }
 func (m *GetCryptoKeyVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCryptoKeyVersionRequest.Size(m)
@@ -575,16 +584,17 @@ func (m *GetPublicKeyRequest) Reset()         { *m = GetPublicKeyRequest{} }
 func (m *GetPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetPublicKeyRequest) ProtoMessage()    {}
 func (*GetPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{9}
+	return fileDescriptor_723aeaeb61739a25, []int{9}
 }
+
 func (m *GetPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *GetPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetPublicKeyRequest.Merge(dst, src)
+func (m *GetPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPublicKeyRequest.Merge(m, src)
 }
 func (m *GetPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetPublicKeyRequest.Size(m)
@@ -623,16 +633,17 @@ func (m *CreateKeyRingRequest) Reset()         { *m = CreateKeyRingRequest{} }
 func (m *CreateKeyRingRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateKeyRingRequest) ProtoMessage()    {}
 func (*CreateKeyRingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{10}
+	return fileDescriptor_723aeaeb61739a25, []int{10}
 }
+
 func (m *CreateKeyRingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateKeyRingRequest.Unmarshal(m, b)
 }
 func (m *CreateKeyRingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateKeyRingRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateKeyRingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateKeyRingRequest.Merge(dst, src)
+func (m *CreateKeyRingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateKeyRingRequest.Merge(m, src)
 }
 func (m *CreateKeyRingRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateKeyRingRequest.Size(m)
@@ -684,16 +695,17 @@ func (m *CreateCryptoKeyRequest) Reset()         { *m = CreateCryptoKeyRequest{}
 func (m *CreateCryptoKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateCryptoKeyRequest) ProtoMessage()    {}
 func (*CreateCryptoKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{11}
+	return fileDescriptor_723aeaeb61739a25, []int{11}
 }
+
 func (m *CreateCryptoKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCryptoKeyRequest.Unmarshal(m, b)
 }
 func (m *CreateCryptoKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCryptoKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateCryptoKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCryptoKeyRequest.Merge(dst, src)
+func (m *CreateCryptoKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCryptoKeyRequest.Merge(m, src)
 }
 func (m *CreateCryptoKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateCryptoKeyRequest.Size(m)
@@ -744,16 +756,17 @@ func (m *CreateCryptoKeyVersionRequest) Reset()         { *m = CreateCryptoKeyVe
 func (m *CreateCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateCryptoKeyVersionRequest) ProtoMessage()    {}
 func (*CreateCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{12}
+	return fileDescriptor_723aeaeb61739a25, []int{12}
 }
+
 func (m *CreateCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCryptoKeyVersionRequest.Unmarshal(m, b)
 }
 func (m *CreateCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCryptoKeyVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCryptoKeyVersionRequest.Merge(dst, src)
+func (m *CreateCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCryptoKeyVersionRequest.Merge(m, src)
 }
 func (m *CreateCryptoKeyVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateCryptoKeyVersionRequest.Size(m)
@@ -794,16 +807,17 @@ func (m *UpdateCryptoKeyRequest) Reset()         { *m = UpdateCryptoKeyRequest{}
 func (m *UpdateCryptoKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateCryptoKeyRequest) ProtoMessage()    {}
 func (*UpdateCryptoKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{13}
+	return fileDescriptor_723aeaeb61739a25, []int{13}
 }
+
 func (m *UpdateCryptoKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateCryptoKeyRequest.Unmarshal(m, b)
 }
 func (m *UpdateCryptoKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateCryptoKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateCryptoKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateCryptoKeyRequest.Merge(dst, src)
+func (m *UpdateCryptoKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCryptoKeyRequest.Merge(m, src)
 }
 func (m *UpdateCryptoKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateCryptoKeyRequest.Size(m)
@@ -845,16 +859,17 @@ func (m *UpdateCryptoKeyVersionRequest) Reset()         { *m = UpdateCryptoKeyVe
 func (m *UpdateCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateCryptoKeyVersionRequest) ProtoMessage()    {}
 func (*UpdateCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{14}
+	return fileDescriptor_723aeaeb61739a25, []int{14}
 }
+
 func (m *UpdateCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateCryptoKeyVersionRequest.Unmarshal(m, b)
 }
 func (m *UpdateCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateCryptoKeyVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateCryptoKeyVersionRequest.Merge(dst, src)
+func (m *UpdateCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCryptoKeyVersionRequest.Merge(m, src)
 }
 func (m *UpdateCryptoKeyVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateCryptoKeyVersionRequest.Size(m)
@@ -921,16 +936,17 @@ func (m *EncryptRequest) Reset()         { *m = EncryptRequest{} }
 func (m *EncryptRequest) String() string { return proto.CompactTextString(m) }
 func (*EncryptRequest) ProtoMessage()    {}
 func (*EncryptRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{15}
+	return fileDescriptor_723aeaeb61739a25, []int{15}
 }
+
 func (m *EncryptRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EncryptRequest.Unmarshal(m, b)
 }
 func (m *EncryptRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EncryptRequest.Marshal(b, m, deterministic)
 }
-func (dst *EncryptRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EncryptRequest.Merge(dst, src)
+func (m *EncryptRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EncryptRequest.Merge(m, src)
 }
 func (m *EncryptRequest) XXX_Size() int {
 	return xxx_messageInfo_EncryptRequest.Size(m)
@@ -984,16 +1000,17 @@ func (m *DecryptRequest) Reset()         { *m = DecryptRequest{} }
 func (m *DecryptRequest) String() string { return proto.CompactTextString(m) }
 func (*DecryptRequest) ProtoMessage()    {}
 func (*DecryptRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{16}
+	return fileDescriptor_723aeaeb61739a25, []int{16}
 }
+
 func (m *DecryptRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DecryptRequest.Unmarshal(m, b)
 }
 func (m *DecryptRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DecryptRequest.Marshal(b, m, deterministic)
 }
-func (dst *DecryptRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DecryptRequest.Merge(dst, src)
+func (m *DecryptRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DecryptRequest.Merge(m, src)
 }
 func (m *DecryptRequest) XXX_Size() int {
 	return xxx_messageInfo_DecryptRequest.Size(m)
@@ -1045,16 +1062,17 @@ func (m *AsymmetricSignRequest) Reset()         { *m = AsymmetricSignRequest{} }
 func (m *AsymmetricSignRequest) String() string { return proto.CompactTextString(m) }
 func (*AsymmetricSignRequest) ProtoMessage()    {}
 func (*AsymmetricSignRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{17}
+	return fileDescriptor_723aeaeb61739a25, []int{17}
 }
+
 func (m *AsymmetricSignRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsymmetricSignRequest.Unmarshal(m, b)
 }
 func (m *AsymmetricSignRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsymmetricSignRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsymmetricSignRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsymmetricSignRequest.Merge(dst, src)
+func (m *AsymmetricSignRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsymmetricSignRequest.Merge(m, src)
 }
 func (m *AsymmetricSignRequest) XXX_Size() int {
 	return xxx_messageInfo_AsymmetricSignRequest.Size(m)
@@ -1099,16 +1117,17 @@ func (m *AsymmetricDecryptRequest) Reset()         { *m = AsymmetricDecryptReque
 func (m *AsymmetricDecryptRequest) String() string { return proto.CompactTextString(m) }
 func (*AsymmetricDecryptRequest) ProtoMessage()    {}
 func (*AsymmetricDecryptRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{18}
+	return fileDescriptor_723aeaeb61739a25, []int{18}
 }
+
 func (m *AsymmetricDecryptRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsymmetricDecryptRequest.Unmarshal(m, b)
 }
 func (m *AsymmetricDecryptRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsymmetricDecryptRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsymmetricDecryptRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsymmetricDecryptRequest.Merge(dst, src)
+func (m *AsymmetricDecryptRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsymmetricDecryptRequest.Merge(m, src)
 }
 func (m *AsymmetricDecryptRequest) XXX_Size() int {
 	return xxx_messageInfo_AsymmetricDecryptRequest.Size(m)
@@ -1148,16 +1167,17 @@ func (m *DecryptResponse) Reset()         { *m = DecryptResponse{} }
 func (m *DecryptResponse) String() string { return proto.CompactTextString(m) }
 func (*DecryptResponse) ProtoMessage()    {}
 func (*DecryptResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{19}
+	return fileDescriptor_723aeaeb61739a25, []int{19}
 }
+
 func (m *DecryptResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DecryptResponse.Unmarshal(m, b)
 }
 func (m *DecryptResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DecryptResponse.Marshal(b, m, deterministic)
 }
-func (dst *DecryptResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DecryptResponse.Merge(dst, src)
+func (m *DecryptResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DecryptResponse.Merge(m, src)
 }
 func (m *DecryptResponse) XXX_Size() int {
 	return xxx_messageInfo_DecryptResponse.Size(m)
@@ -1193,16 +1213,17 @@ func (m *EncryptResponse) Reset()         { *m = EncryptResponse{} }
 func (m *EncryptResponse) String() string { return proto.CompactTextString(m) }
 func (*EncryptResponse) ProtoMessage()    {}
 func (*EncryptResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{20}
+	return fileDescriptor_723aeaeb61739a25, []int{20}
 }
+
 func (m *EncryptResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EncryptResponse.Unmarshal(m, b)
 }
 func (m *EncryptResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EncryptResponse.Marshal(b, m, deterministic)
 }
-func (dst *EncryptResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EncryptResponse.Merge(dst, src)
+func (m *EncryptResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EncryptResponse.Merge(m, src)
 }
 func (m *EncryptResponse) XXX_Size() int {
 	return xxx_messageInfo_EncryptResponse.Size(m)
@@ -1241,16 +1262,17 @@ func (m *AsymmetricSignResponse) Reset()         { *m = AsymmetricSignResponse{}
 func (m *AsymmetricSignResponse) String() string { return proto.CompactTextString(m) }
 func (*AsymmetricSignResponse) ProtoMessage()    {}
 func (*AsymmetricSignResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{21}
+	return fileDescriptor_723aeaeb61739a25, []int{21}
 }
+
 func (m *AsymmetricSignResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsymmetricSignResponse.Unmarshal(m, b)
 }
 func (m *AsymmetricSignResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsymmetricSignResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsymmetricSignResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsymmetricSignResponse.Merge(dst, src)
+func (m *AsymmetricSignResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsymmetricSignResponse.Merge(m, src)
 }
 func (m *AsymmetricSignResponse) XXX_Size() int {
 	return xxx_messageInfo_AsymmetricSignResponse.Size(m)
@@ -1282,16 +1304,17 @@ func (m *AsymmetricDecryptResponse) Reset()         { *m = AsymmetricDecryptResp
 func (m *AsymmetricDecryptResponse) String() string { return proto.CompactTextString(m) }
 func (*AsymmetricDecryptResponse) ProtoMessage()    {}
 func (*AsymmetricDecryptResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{22}
+	return fileDescriptor_723aeaeb61739a25, []int{22}
 }
+
 func (m *AsymmetricDecryptResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsymmetricDecryptResponse.Unmarshal(m, b)
 }
 func (m *AsymmetricDecryptResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsymmetricDecryptResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsymmetricDecryptResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsymmetricDecryptResponse.Merge(dst, src)
+func (m *AsymmetricDecryptResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsymmetricDecryptResponse.Merge(m, src)
 }
 func (m *AsymmetricDecryptResponse) XXX_Size() int {
 	return xxx_messageInfo_AsymmetricDecryptResponse.Size(m)
@@ -1327,16 +1350,17 @@ func (m *UpdateCryptoKeyPrimaryVersionRequest) Reset()         { *m = UpdateCryp
 func (m *UpdateCryptoKeyPrimaryVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateCryptoKeyPrimaryVersionRequest) ProtoMessage()    {}
 func (*UpdateCryptoKeyPrimaryVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{23}
+	return fileDescriptor_723aeaeb61739a25, []int{23}
 }
+
 func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Unmarshal(m, b)
 }
 func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateCryptoKeyPrimaryVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Merge(dst, src)
+func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Merge(m, src)
 }
 func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Size(m)
@@ -1376,16 +1400,17 @@ func (m *DestroyCryptoKeyVersionRequest) Reset()         { *m = DestroyCryptoKey
 func (m *DestroyCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*DestroyCryptoKeyVersionRequest) ProtoMessage()    {}
 func (*DestroyCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{24}
+	return fileDescriptor_723aeaeb61739a25, []int{24}
 }
+
 func (m *DestroyCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DestroyCryptoKeyVersionRequest.Unmarshal(m, b)
 }
 func (m *DestroyCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DestroyCryptoKeyVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DestroyCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DestroyCryptoKeyVersionRequest.Merge(dst, src)
+func (m *DestroyCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DestroyCryptoKeyVersionRequest.Merge(m, src)
 }
 func (m *DestroyCryptoKeyVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_DestroyCryptoKeyVersionRequest.Size(m)
@@ -1418,16 +1443,17 @@ func (m *RestoreCryptoKeyVersionRequest) Reset()         { *m = RestoreCryptoKey
 func (m *RestoreCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*RestoreCryptoKeyVersionRequest) ProtoMessage()    {}
 func (*RestoreCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{25}
+	return fileDescriptor_723aeaeb61739a25, []int{25}
 }
+
 func (m *RestoreCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RestoreCryptoKeyVersionRequest.Unmarshal(m, b)
 }
 func (m *RestoreCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RestoreCryptoKeyVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *RestoreCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RestoreCryptoKeyVersionRequest.Merge(dst, src)
+func (m *RestoreCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestoreCryptoKeyVersionRequest.Merge(m, src)
 }
 func (m *RestoreCryptoKeyVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_RestoreCryptoKeyVersionRequest.Size(m)
@@ -1463,16 +1489,17 @@ func (m *Digest) Reset()         { *m = Digest{} }
 func (m *Digest) String() string { return proto.CompactTextString(m) }
 func (*Digest) ProtoMessage()    {}
 func (*Digest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{26}
+	return fileDescriptor_723aeaeb61739a25, []int{26}
 }
+
 func (m *Digest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Digest.Unmarshal(m, b)
 }
 func (m *Digest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Digest.Marshal(b, m, deterministic)
 }
-func (dst *Digest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Digest.Merge(dst, src)
+func (m *Digest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Digest.Merge(m, src)
 }
 func (m *Digest) XXX_Size() int {
 	return xxx_messageInfo_Digest.Size(m)
@@ -1533,87 +1560,15 @@ func (m *Digest) GetSha512() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Digest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Digest_OneofMarshaler, _Digest_OneofUnmarshaler, _Digest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Digest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Digest_Sha256)(nil),
 		(*Digest_Sha384)(nil),
 		(*Digest_Sha512)(nil),
 	}
 }
 
-func _Digest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Digest)
-	// digest
-	switch x := m.Digest.(type) {
-	case *Digest_Sha256:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Sha256)
-	case *Digest_Sha384:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Sha384)
-	case *Digest_Sha512:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Sha512)
-	case nil:
-	default:
-		return fmt.Errorf("Digest.Digest has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Digest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Digest)
-	switch tag {
-	case 1: // digest.sha256
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Digest = &Digest_Sha256{x}
-		return true, err
-	case 2: // digest.sha384
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Digest = &Digest_Sha384{x}
-		return true, err
-	case 3: // digest.sha512
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Digest = &Digest_Sha512{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Digest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Digest)
-	// digest
-	switch x := m.Digest.(type) {
-	case *Digest_Sha256:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Sha256)))
-		n += len(x.Sha256)
-	case *Digest_Sha384:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Sha384)))
-		n += len(x.Sha384)
-	case *Digest_Sha512:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Sha512)))
-		n += len(x.Sha512)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Cloud KMS metadata for the given
 // [google.cloud.location.Location][google.cloud.location.Location].
 type LocationMetadata struct {
@@ -1631,16 +1586,17 @@ func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
 func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LocationMetadata) ProtoMessage()    {}
 func (*LocationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_cf5bcaac2fc87f37, []int{27}
+	return fileDescriptor_723aeaeb61739a25, []int{27}
 }
+
 func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
 }
 func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+func (m *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(m, src)
 }
 func (m *LocationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LocationMetadata.Size(m)
@@ -1689,6 +1645,117 @@ func init() {
 	proto.RegisterType((*LocationMetadata)(nil), "google.cloud.kms.v1.LocationMetadata")
 }
 
+func init() { proto.RegisterFile("google/cloud/kms/v1/service.proto", fileDescriptor_723aeaeb61739a25) }
+
+var fileDescriptor_723aeaeb61739a25 = []byte{
+	// 1666 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x73, 0x1b, 0xc5,
+	0x12, 0x7f, 0x63, 0xe7, 0x39, 0x76, 0xfb, 0x2b, 0x19, 0x27, 0x8e, 0x9f, 0x62, 0xbb, 0xfc, 0x26,
+	0x79, 0x79, 0x8e, 0x03, 0x12, 0x92, 0x9d, 0x0f, 0x2b, 0x15, 0x28, 0x3b, 0x4e, 0x4c, 0xca, 0x71,
+	0x70, 0xad, 0xb1, 0x21, 0x29, 0x53, 0xf2, 0x58, 0x3b, 0x91, 0x37, 0xd2, 0xee, 0x8a, 0xdd, 0x95,
+	0x12, 0x05, 0x72, 0xe1, 0x00, 0x39, 0xe4, 0x16, 0x0e, 0xa1, 0xb8, 0x50, 0x70, 0xa3, 0xe0, 0xc0,
+	0x0d, 0x0e, 0x5c, 0x28, 0x4e, 0xa9, 0xe2, 0x02, 0x95, 0xe2, 0x96, 0x13, 0xff, 0x00, 0x37, 0x8e,
+	0xd4, 0xce, 0xce, 0xae, 0xb4, 0xab, 0x5d, 0x7d, 0x45, 0x29, 0x6e, 0xde, 0x99, 0x9e, 0x9e, 0xdf,
+	0xaf, 0xfb, 0x37, 0x33, 0xdd, 0x32, 0xfc, 0x37, 0xa7, 0xeb, 0xb9, 0x02, 0x4b, 0x64, 0x0b, 0x7a,
+	0x49, 0x4e, 0xe4, 0x55, 0x33, 0x51, 0x4e, 0x26, 0x4c, 0x66, 0x94, 0x95, 0x2c, 0x8b, 0x17, 0x0d,
+	0xdd, 0xd2, 0xf1, 0x98, 0x63, 0x12, 0xe7, 0x26, 0xf1, 0xbc, 0x6a, 0xc6, 0xcb, 0xc9, 0xd8, 0xa4,
+	0x58, 0x47, 0x8b, 0x4a, 0x82, 0x6a, 0x9a, 0x6e, 0x51, 0x4b, 0xd1, 0x35, 0xd3, 0x59, 0x12, 0x3b,
+	0x11, 0xe6, 0xd5, 0x60, 0xa6, 0x5e, 0x32, 0xb2, 0xcc, 0x35, 0x9a, 0x11, 0x46, 0xfc, 0x6b, 0xaf,
+	0x74, 0x3b, 0x71, 0x5b, 0x61, 0x05, 0x39, 0xa3, 0x52, 0x33, 0x2f, 0x2c, 0x26, 0x83, 0x16, 0xa6,
+	0x65, 0x94, 0xb2, 0x96, 0x98, 0x9d, 0x0e, 0xce, 0xde, 0x35, 0x68, 0xb1, 0xc8, 0x0c, 0xe1, 0x9f,
+	0x28, 0x30, 0x76, 0x5d, 0x31, 0xad, 0x35, 0x56, 0x91, 0x14, 0x2d, 0x67, 0x4a, 0xec, 0xfd, 0x12,
+	0x33, 0x2d, 0x3c, 0x0e, 0x7d, 0x45, 0x6a, 0x30, 0xcd, 0x9a, 0x40, 0x33, 0x68, 0x76, 0x40, 0x12,
+	0x5f, 0xf8, 0x38, 0x0c, 0x14, 0x69, 0x8e, 0x65, 0x4c, 0xe5, 0x3e, 0x9b, 0xe8, 0x99, 0x41, 0xb3,
+	0xff, 0x96, 0xfa, 0xed, 0x81, 0x4d, 0xe5, 0x3e, 0xc3, 0x53, 0x00, 0x7c, 0xd2, 0xd2, 0xf3, 0x4c,
+	0x9b, 0xe8, 0xe5, 0x0b, 0xb9, 0xf9, 0xdb, 0xf6, 0x00, 0x79, 0x8a, 0xe0, 0xa8, 0xbd, 0xd7, 0x65,
+	0xa3, 0x52, 0xb4, 0xf4, 0x35, 0x56, 0x79, 0x99, 0xbb, 0xe1, 0xf7, 0x60, 0xa8, 0xcc, 0x0c, 0x53,
+	0xd1, 0xb5, 0x4c, 0x59, 0x61, 0x77, 0x27, 0x0e, 0xcc, 0xa0, 0xd9, 0x91, 0x54, 0x3a, 0x1e, 0x92,
+	0xa7, 0xb8, 0x87, 0x68, 0xdb, 0x59, 0x51, 0x37, 0xb0, 0xad, 0xb0, 0xbb, 0xd2, 0x60, 0xb9, 0xfa,
+	0x41, 0x7e, 0x42, 0x30, 0xe9, 0x23, 0x23, 0x2c, 0x5f, 0x2a, 0xa7, 0x1b, 0x70, 0xa0, 0x4b, 0x5c,
+	0xb8, 0x1f, 0xf2, 0x04, 0xc1, 0x11, 0x7f, 0xf6, 0xcd, 0xa2, 0xae, 0x99, 0x0c, 0x2f, 0xc2, 0x40,
+	0x9e, 0x55, 0x32, 0x86, 0x3d, 0x38, 0x81, 0x66, 0x7a, 0x67, 0x07, 0x53, 0x93, 0xa1, 0xbb, 0x89,
+	0x95, 0x52, 0x7f, 0x5e, 0xb8, 0xc0, 0xa7, 0x60, 0x54, 0x63, 0xf7, 0xac, 0x4c, 0x0d, 0x8f, 0x1e,
+	0xce, 0x63, 0xd8, 0x1e, 0xde, 0xf0, 0xb8, 0x4c, 0x01, 0x58, 0xba, 0x45, 0x0b, 0x4e, 0x20, 0x7a,
+	0x79, 0x20, 0x06, 0xf8, 0x88, 0x1d, 0x09, 0xf2, 0x05, 0x82, 0xf1, 0xa0, 0x58, 0x04, 0xb8, 0x37,
+	0x60, 0x30, 0xcb, 0x47, 0x33, 0x79, 0x56, 0x71, 0xe1, 0x4d, 0x37, 0x0e, 0x86, 0x04, 0x59, 0xcf,
+	0x51, 0xb7, 0x20, 0xfe, 0x88, 0x60, 0x2a, 0x42, 0x02, 0x02, 0xe9, 0x16, 0x8c, 0x55, 0x91, 0x66,
+	0x84, 0x7c, 0x5c, 0xc4, 0xff, 0x6b, 0x29, 0x7d, 0xd2, 0xe1, 0x6c, 0xd0, 0x7d, 0xb7, 0xf0, 0xff,
+	0x1f, 0x0e, 0xaf, 0x32, 0x37, 0xf7, 0xae, 0x6c, 0x31, 0x1c, 0xd0, 0xa8, 0xca, 0x84, 0x68, 0xf9,
+	0xdf, 0xe4, 0x34, 0x8c, 0xad, 0xb2, 0x2a, 0xcd, 0x46, 0xa6, 0xaf, 0x41, 0xac, 0xd6, 0xd4, 0x25,
+	0xd1, 0xd4, 0xf9, 0x46, 0x69, 0xaf, 0xa0, 0x64, 0x9b, 0x38, 0xff, 0x04, 0xc1, 0x91, 0xcb, 0x06,
+	0xa3, 0x16, 0x0b, 0x80, 0x8e, 0x3a, 0x6b, 0xd3, 0x30, 0xe8, 0xca, 0x38, 0xa3, 0xc8, 0x22, 0x48,
+	0x03, 0x42, 0xaa, 0xd7, 0x64, 0x7c, 0x1e, 0xfa, 0xdd, 0x79, 0x1e, 0x9e, 0x66, 0x2a, 0x3f, 0x28,
+	0x96, 0x92, 0xc7, 0x08, 0xc6, 0x1d, 0x24, 0x75, 0x51, 0x89, 0xc2, 0x42, 0x60, 0xb8, 0x46, 0x0b,
+	0x1e, 0x9a, 0x41, 0x2f, 0xbd, 0xd7, 0x64, 0x7c, 0x09, 0xa0, 0x6a, 0x23, 0x10, 0x35, 0x13, 0xf6,
+	0x80, 0xe7, 0x80, 0x3c, 0x42, 0x30, 0x15, 0x40, 0x15, 0x48, 0x40, 0x14, 0xb8, 0x4d, 0xc0, 0xf5,
+	0x42, 0xe5, 0x08, 0x5b, 0xd6, 0xe9, 0xa1, 0xa0, 0x4e, 0xc9, 0xa7, 0x08, 0xc6, 0xb7, 0x8a, 0x72,
+	0x58, 0x90, 0xfc, 0x44, 0x51, 0x9b, 0x44, 0xf1, 0x45, 0x18, 0x2c, 0x71, 0xc7, 0xfc, 0x1d, 0x14,
+	0x38, 0x63, 0xee, 0x7a, 0xf7, 0xa9, 0x8b, 0x5f, 0xb5, 0x9f, 0xca, 0x75, 0x6a, 0xe6, 0x25, 0x70,
+	0xcc, 0xed, 0xbf, 0xc9, 0x77, 0x08, 0xa6, 0x02, 0xb0, 0x02, 0x51, 0x0a, 0x8f, 0x06, 0x7a, 0xa1,
+	0x68, 0xbc, 0x18, 0xe6, 0x8f, 0x11, 0x8c, 0x5c, 0xd1, 0xb8, 0xcf, 0x06, 0x07, 0x04, 0x4f, 0xc2,
+	0x40, 0xb1, 0x40, 0x15, 0xcd, 0x62, 0xf7, 0x2c, 0xbe, 0xc3, 0x90, 0x54, 0x1d, 0xc0, 0xcb, 0x30,
+	0x45, 0x65, 0x59, 0xb1, 0x4b, 0x10, 0x5a, 0xc8, 0xd0, 0x92, 0xb5, 0xcf, 0x34, 0x4b, 0xc9, 0x52,
+	0x8b, 0xc9, 0x19, 0x99, 0x5a, 0x94, 0x0b, 0x6e, 0x48, 0x3a, 0x5e, 0x35, 0x5a, 0xaa, 0xb5, 0x59,
+	0xa1, 0x16, 0x25, 0x0f, 0x11, 0x8c, 0xac, 0xb0, 0xa6, 0x40, 0xa6, 0x01, 0xb2, 0x4a, 0x71, 0x9f,
+	0x19, 0x35, 0x48, 0x6a, 0x46, 0xba, 0x02, 0x65, 0x17, 0x8e, 0x2e, 0x99, 0x15, 0x55, 0x65, 0x96,
+	0xa1, 0x64, 0x37, 0x95, 0x5c, 0xa3, 0x5b, 0x06, 0xcf, 0x43, 0x9f, 0xac, 0xe4, 0x98, 0x69, 0x89,
+	0x53, 0x75, 0x3c, 0x34, 0x8d, 0x2b, 0xdc, 0x44, 0x12, 0xa6, 0xe4, 0x06, 0x4c, 0x54, 0x77, 0x68,
+	0x9b, 0x75, 0x6f, 0x90, 0x35, 0x49, 0xc0, 0xa8, 0xe7, 0x45, 0xbc, 0x10, 0xbe, 0x8c, 0xa1, 0x40,
+	0xc6, 0xc8, 0x15, 0x18, 0xf5, 0xb2, 0x2e, 0x16, 0x74, 0x10, 0x6d, 0x72, 0x0e, 0xc6, 0x83, 0x91,
+	0xaa, 0x6e, 0x6f, 0x2a, 0x39, 0x8d, 0x5a, 0x25, 0x83, 0xb9, 0xdb, 0x7b, 0x03, 0x64, 0x11, 0xfe,
+	0x13, 0xc2, 0xbf, 0x25, 0xe4, 0x2a, 0x9c, 0x0c, 0x9c, 0xb1, 0x0d, 0x43, 0x51, 0xa9, 0xd1, 0xc2,
+	0x8b, 0x80, 0x93, 0x70, 0xb4, 0xfe, 0xf8, 0x55, 0x6f, 0x4c, 0x1c, 0x3c, 0x5a, 0xd7, 0x64, 0xb2,
+	0x00, 0xd3, 0x2b, 0xcc, 0xb4, 0x0c, 0xbd, 0xd2, 0xce, 0xd3, 0xb3, 0x00, 0xd3, 0x12, 0x33, 0x2d,
+	0xdd, 0x60, 0xed, 0xac, 0xda, 0x85, 0x3e, 0x47, 0x27, 0x78, 0x02, 0xfa, 0xcc, 0x7d, 0x9a, 0x3a,
+	0x7b, 0xce, 0xe1, 0xff, 0xe6, 0xbf, 0x24, 0xf1, 0x2d, 0x66, 0xe6, 0x2f, 0x2c, 0x38, 0xd9, 0x10,
+	0x33, 0xf3, 0x17, 0x16, 0xc4, 0xcc, 0xd9, 0x64, 0xca, 0xd1, 0x87, 0x98, 0x39, 0x9b, 0x4c, 0x2d,
+	0xf7, 0xbb, 0x12, 0x25, 0xe7, 0xe1, 0xd0, 0x75, 0x3d, 0xcb, 0x7b, 0x85, 0x75, 0x66, 0x51, 0xfb,
+	0x40, 0xe0, 0x13, 0x30, 0xbc, 0x6f, 0xaa, 0x19, 0x5a, 0xa6, 0x4a, 0x81, 0xee, 0x15, 0x1c, 0x48,
+	0xfd, 0xd2, 0xd0, 0xbe, 0xa9, 0x2e, 0xb9, 0x63, 0xa9, 0x5f, 0x26, 0xe1, 0xc8, 0x1a, 0xab, 0xac,
+	0x53, 0x8d, 0xe6, 0x98, 0xca, 0x34, 0x6b, 0xd3, 0xe9, 0x51, 0xf0, 0x67, 0x08, 0x86, 0x6a, 0x0b,
+	0x3d, 0x3c, 0x1b, 0xaa, 0xff, 0x90, 0x4e, 0x20, 0x76, 0xba, 0x05, 0x4b, 0x47, 0x12, 0x64, 0xe1,
+	0xa3, 0xdf, 0xfe, 0x78, 0xdc, 0x13, 0xc7, 0xaf, 0xd8, 0x8d, 0xcc, 0x07, 0xce, 0xd3, 0x72, 0xa9,
+	0x68, 0xe8, 0x77, 0x58, 0xd6, 0x32, 0x13, 0x73, 0x89, 0x82, 0x20, 0x65, 0x26, 0xe6, 0x1e, 0x24,
+	0xbc, 0x82, 0xf1, 0x1b, 0x04, 0x23, 0xfe, 0x4a, 0x0f, 0xcf, 0x45, 0xee, 0x59, 0xd7, 0x3b, 0xc4,
+	0xce, 0xb4, 0x64, 0x2b, 0x10, 0x2e, 0x71, 0x84, 0x17, 0xf1, 0x62, 0x73, 0x84, 0x1e, 0x40, 0x1b,
+	0x6c, 0x4d, 0xf1, 0xf8, 0x2c, 0xd8, 0xc5, 0x78, 0x65, 0x59, 0xb2, 0x39, 0x92, 0x40, 0x93, 0x10,
+	0x4b, 0xb5, 0xb3, 0x44, 0x70, 0xd8, 0xe2, 0x1c, 0xde, 0xc2, 0xeb, 0x6d, 0x71, 0xa8, 0xa1, 0xe0,
+	0x23, 0xe4, 0xa1, 0x7f, 0x88, 0x00, 0xaa, 0xe5, 0x20, 0x3e, 0x15, 0x8a, 0xac, 0xae, 0x5e, 0x8c,
+	0x35, 0x2c, 0x98, 0x02, 0x8a, 0xb0, 0x8f, 0x4f, 0x0b, 0xd1, 0xc6, 0x9f, 0x23, 0x18, 0xaa, 0xad,
+	0x22, 0x23, 0xd4, 0x1a, 0x52, 0x93, 0xc6, 0x9a, 0x14, 0x11, 0x01, 0x01, 0xb4, 0x06, 0xc8, 0x1f,
+	0x3a, 0xfc, 0x33, 0xf2, 0x97, 0xc3, 0xee, 0x03, 0x9f, 0x68, 0x0a, 0xd2, 0x7f, 0xb9, 0xc4, 0x5a,
+	0x2b, 0x25, 0x02, 0xf9, 0xee, 0x00, 0x72, 0x7d, 0xb2, 0x6d, 0x1a, 0x3f, 0x38, 0x41, 0xf6, 0x0a,
+	0xef, 0xe8, 0x20, 0x07, 0x6b, 0xf3, 0x88, 0x20, 0x7b, 0x66, 0x24, 0xc3, 0x11, 0xdf, 0xc4, 0xef,
+	0x74, 0x15, 0x71, 0xa2, 0xe8, 0x41, 0x7d, 0x82, 0x60, 0xd8, 0xd7, 0x08, 0xe0, 0xd3, 0x11, 0xb1,
+	0xac, 0x6f, 0x16, 0x9a, 0x28, 0xf6, 0x75, 0x8e, 0xfd, 0x02, 0x69, 0xeb, 0x0e, 0x4b, 0x7b, 0x6d,
+	0x04, 0xfe, 0x16, 0xc1, 0x68, 0xa0, 0x06, 0xc7, 0x67, 0x1a, 0x80, 0x6b, 0x5b, 0xc1, 0xeb, 0x1c,
+	0xe0, 0x2a, 0xe9, 0xfc, 0x0a, 0x4b, 0xd7, 0xd4, 0xde, 0xf8, 0x79, 0x7d, 0x27, 0xe3, 0x0a, 0x3a,
+	0xd5, 0x0a, 0xec, 0xce, 0x34, 0xad, 0x70, 0x12, 0x59, 0xd2, 0xdd, 0x3b, 0x2c, 0x1d, 0x52, 0xb6,
+	0xe3, 0xef, 0x11, 0x8c, 0x06, 0x4a, 0x91, 0x88, 0x84, 0x84, 0xf7, 0x2a, 0x4d, 0x13, 0xf2, 0x2e,
+	0xe7, 0x22, 0xa5, 0x56, 0x38, 0x97, 0x2a, 0x82, 0x78, 0x27, 0xb7, 0x8b, 0x2f, 0x37, 0x7f, 0xd6,
+	0x37, 0x50, 0x8d, 0x73, 0xd3, 0xb0, 0xad, 0x69, 0x35, 0x37, 0x1f, 0x72, 0x3e, 0xe5, 0xd4, 0x6e,
+	0x80, 0x8f, 0x1b, 0xd1, 0x78, 0xb7, 0x0e, 0x74, 0x68, 0xba, 0xbe, 0x42, 0x70, 0x50, 0xd4, 0xbc,
+	0xf8, 0x44, 0x28, 0x60, 0x7f, 0x1f, 0x14, 0x3b, 0xd9, 0xd8, 0x48, 0x3c, 0x9a, 0xee, 0xa9, 0x59,
+	0xee, 0xf4, 0x4a, 0x9a, 0x7b, 0x90, 0x66, 0x8e, 0xcf, 0x34, 0x9a, 0xc3, 0x5f, 0x22, 0x38, 0x28,
+	0x0a, 0xe2, 0x08, 0x94, 0xfe, 0x76, 0x21, 0x02, 0x65, 0xa0, 0xa6, 0x26, 0xd7, 0x39, 0xca, 0xab,
+	0x64, 0xa9, 0xe3, 0xd7, 0x29, 0x2d, 0x33, 0x0f, 0xe4, 0xaf, 0x08, 0x46, 0xfc, 0x75, 0x7f, 0x44,
+	0x61, 0x15, 0xda, 0x46, 0x45, 0x14, 0x56, 0xe1, 0x8d, 0x04, 0xc9, 0x71, 0xe4, 0x94, 0xec, 0x74,
+	0xf5, 0xca, 0x4f, 0x53, 0xdf, 0x6e, 0x36, 0xa9, 0xe7, 0x08, 0x0e, 0xd7, 0x35, 0x25, 0xf8, 0xd5,
+	0x26, 0x58, 0x03, 0xd9, 0x88, 0xb7, 0x6a, 0x2e, 0xd8, 0xdd, 0xe1, 0xec, 0x64, 0x92, 0x79, 0x59,
+	0xec, 0x56, 0xaa, 0x59, 0x7b, 0x56, 0xff, 0xf3, 0x84, 0xbf, 0x75, 0xc2, 0x8b, 0xad, 0x9c, 0xfd,
+	0xd0, 0x76, 0xab, 0xe9, 0x5d, 0x76, 0x93, 0x13, 0xdd, 0x24, 0x37, 0x3a, 0x17, 0xa0, 0xf3, 0xab,
+	0x85, 0x7f, 0x7b, 0x9b, 0xd7, 0xef, 0x08, 0x8e, 0x45, 0xf4, 0x68, 0x78, 0x3e, 0xe2, 0x74, 0x34,
+	0xea, 0xe8, 0x5a, 0xbd, 0xce, 0x76, 0x39, 0xa5, 0x5b, 0x64, 0xab, 0xbb, 0xb9, 0x93, 0x1d, 0x70,
+	0x2e, 0xb3, 0x88, 0x3e, 0x32, 0x82, 0x59, 0xe3, 0xae, 0xf3, 0x1f, 0x66, 0x66, 0x38, 0xe0, 0xd2,
+	0x68, 0x6e, 0xf9, 0x11, 0x82, 0x63, 0x59, 0x5d, 0x0d, 0x83, 0xb3, 0xdc, 0xbf, 0xa6, 0x9a, 0x1b,
+	0x86, 0x6e, 0xe9, 0x1b, 0xe8, 0xd6, 0x39, 0x61, 0x90, 0xd3, 0x0b, 0x54, 0xcb, 0xc5, 0x75, 0x23,
+	0x97, 0xc8, 0x31, 0x8d, 0xff, 0xa6, 0x95, 0x70, 0xa6, 0x68, 0x51, 0x31, 0x7d, 0xff, 0xe8, 0xba,
+	0x98, 0x57, 0xcd, 0xbf, 0x10, 0xfa, 0xba, 0x67, 0x6c, 0xd5, 0x59, 0x7b, 0x99, 0x3b, 0x5f, 0x53,
+	0xcd, 0xf8, 0x76, 0xf2, 0xa9, 0x3b, 0xba, 0xc3, 0x47, 0x77, 0xd6, 0x54, 0x73, 0x67, 0x3b, 0xb9,
+	0xd7, 0xc7, 0x3d, 0xce, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xac, 0x72, 0x95, 0x44, 0x8f, 0x1b,
+	0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2538,116 +2605,3 @@ var _KeyManagementService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/kms/v1/service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/kms/v1/service.proto", fileDescriptor_service_cf5bcaac2fc87f37)
-}
-
-var fileDescriptor_service_cf5bcaac2fc87f37 = []byte{
-	// 1666 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x73, 0x1b, 0xc5,
-	0x12, 0x7f, 0x63, 0xe7, 0x39, 0x76, 0xfb, 0x2b, 0x19, 0x27, 0x8e, 0x9f, 0x62, 0xbb, 0xfc, 0x26,
-	0x79, 0x79, 0x8e, 0x03, 0x12, 0x92, 0x9d, 0x0f, 0x2b, 0x15, 0x28, 0x3b, 0x4e, 0x4c, 0xca, 0x71,
-	0x70, 0xad, 0xb1, 0x21, 0x29, 0x53, 0xf2, 0x58, 0x3b, 0x91, 0x37, 0xd2, 0xee, 0x8a, 0xdd, 0x95,
-	0x12, 0x05, 0x72, 0xe1, 0x00, 0x39, 0xe4, 0x16, 0x0e, 0xa1, 0xb8, 0x50, 0x70, 0xa3, 0xe0, 0xc0,
-	0x0d, 0x0e, 0x5c, 0x28, 0x4e, 0xa9, 0xe2, 0x02, 0x95, 0xe2, 0x96, 0x13, 0xff, 0x00, 0x37, 0x8e,
-	0xd4, 0xce, 0xce, 0xae, 0xb4, 0xab, 0x5d, 0x7d, 0x45, 0x29, 0x6e, 0xde, 0x99, 0x9e, 0x9e, 0xdf,
-	0xaf, 0xfb, 0x37, 0x33, 0xdd, 0x32, 0xfc, 0x37, 0xa7, 0xeb, 0xb9, 0x02, 0x4b, 0x64, 0x0b, 0x7a,
-	0x49, 0x4e, 0xe4, 0x55, 0x33, 0x51, 0x4e, 0x26, 0x4c, 0x66, 0x94, 0x95, 0x2c, 0x8b, 0x17, 0x0d,
-	0xdd, 0xd2, 0xf1, 0x98, 0x63, 0x12, 0xe7, 0x26, 0xf1, 0xbc, 0x6a, 0xc6, 0xcb, 0xc9, 0xd8, 0xa4,
-	0x58, 0x47, 0x8b, 0x4a, 0x82, 0x6a, 0x9a, 0x6e, 0x51, 0x4b, 0xd1, 0x35, 0xd3, 0x59, 0x12, 0x3b,
-	0x11, 0xe6, 0xd5, 0x60, 0xa6, 0x5e, 0x32, 0xb2, 0xcc, 0x35, 0x9a, 0x11, 0x46, 0xfc, 0x6b, 0xaf,
-	0x74, 0x3b, 0x71, 0x5b, 0x61, 0x05, 0x39, 0xa3, 0x52, 0x33, 0x2f, 0x2c, 0x26, 0x83, 0x16, 0xa6,
-	0x65, 0x94, 0xb2, 0x96, 0x98, 0x9d, 0x0e, 0xce, 0xde, 0x35, 0x68, 0xb1, 0xc8, 0x0c, 0xe1, 0x9f,
-	0x28, 0x30, 0x76, 0x5d, 0x31, 0xad, 0x35, 0x56, 0x91, 0x14, 0x2d, 0x67, 0x4a, 0xec, 0xfd, 0x12,
-	0x33, 0x2d, 0x3c, 0x0e, 0x7d, 0x45, 0x6a, 0x30, 0xcd, 0x9a, 0x40, 0x33, 0x68, 0x76, 0x40, 0x12,
-	0x5f, 0xf8, 0x38, 0x0c, 0x14, 0x69, 0x8e, 0x65, 0x4c, 0xe5, 0x3e, 0x9b, 0xe8, 0x99, 0x41, 0xb3,
-	0xff, 0x96, 0xfa, 0xed, 0x81, 0x4d, 0xe5, 0x3e, 0xc3, 0x53, 0x00, 0x7c, 0xd2, 0xd2, 0xf3, 0x4c,
-	0x9b, 0xe8, 0xe5, 0x0b, 0xb9, 0xf9, 0xdb, 0xf6, 0x00, 0x79, 0x8a, 0xe0, 0xa8, 0xbd, 0xd7, 0x65,
-	0xa3, 0x52, 0xb4, 0xf4, 0x35, 0x56, 0x79, 0x99, 0xbb, 0xe1, 0xf7, 0x60, 0xa8, 0xcc, 0x0c, 0x53,
-	0xd1, 0xb5, 0x4c, 0x59, 0x61, 0x77, 0x27, 0x0e, 0xcc, 0xa0, 0xd9, 0x91, 0x54, 0x3a, 0x1e, 0x92,
-	0xa7, 0xb8, 0x87, 0x68, 0xdb, 0x59, 0x51, 0x37, 0xb0, 0xad, 0xb0, 0xbb, 0xd2, 0x60, 0xb9, 0xfa,
-	0x41, 0x7e, 0x42, 0x30, 0xe9, 0x23, 0x23, 0x2c, 0x5f, 0x2a, 0xa7, 0x1b, 0x70, 0xa0, 0x4b, 0x5c,
-	0xb8, 0x1f, 0xf2, 0x04, 0xc1, 0x11, 0x7f, 0xf6, 0xcd, 0xa2, 0xae, 0x99, 0x0c, 0x2f, 0xc2, 0x40,
-	0x9e, 0x55, 0x32, 0x86, 0x3d, 0x38, 0x81, 0x66, 0x7a, 0x67, 0x07, 0x53, 0x93, 0xa1, 0xbb, 0x89,
-	0x95, 0x52, 0x7f, 0x5e, 0xb8, 0xc0, 0xa7, 0x60, 0x54, 0x63, 0xf7, 0xac, 0x4c, 0x0d, 0x8f, 0x1e,
-	0xce, 0x63, 0xd8, 0x1e, 0xde, 0xf0, 0xb8, 0x4c, 0x01, 0x58, 0xba, 0x45, 0x0b, 0x4e, 0x20, 0x7a,
-	0x79, 0x20, 0x06, 0xf8, 0x88, 0x1d, 0x09, 0xf2, 0x05, 0x82, 0xf1, 0xa0, 0x58, 0x04, 0xb8, 0x37,
-	0x60, 0x30, 0xcb, 0x47, 0x33, 0x79, 0x56, 0x71, 0xe1, 0x4d, 0x37, 0x0e, 0x86, 0x04, 0x59, 0xcf,
-	0x51, 0xb7, 0x20, 0xfe, 0x88, 0x60, 0x2a, 0x42, 0x02, 0x02, 0xe9, 0x16, 0x8c, 0x55, 0x91, 0x66,
-	0x84, 0x7c, 0x5c, 0xc4, 0xff, 0x6b, 0x29, 0x7d, 0xd2, 0xe1, 0x6c, 0xd0, 0x7d, 0xb7, 0xf0, 0xff,
-	0x1f, 0x0e, 0xaf, 0x32, 0x37, 0xf7, 0xae, 0x6c, 0x31, 0x1c, 0xd0, 0xa8, 0xca, 0x84, 0x68, 0xf9,
-	0xdf, 0xe4, 0x34, 0x8c, 0xad, 0xb2, 0x2a, 0xcd, 0x46, 0xa6, 0xaf, 0x41, 0xac, 0xd6, 0xd4, 0x25,
-	0xd1, 0xd4, 0xf9, 0x46, 0x69, 0xaf, 0xa0, 0x64, 0x9b, 0x38, 0xff, 0x04, 0xc1, 0x91, 0xcb, 0x06,
-	0xa3, 0x16, 0x0b, 0x80, 0x8e, 0x3a, 0x6b, 0xd3, 0x30, 0xe8, 0xca, 0x38, 0xa3, 0xc8, 0x22, 0x48,
-	0x03, 0x42, 0xaa, 0xd7, 0x64, 0x7c, 0x1e, 0xfa, 0xdd, 0x79, 0x1e, 0x9e, 0x66, 0x2a, 0x3f, 0x28,
-	0x96, 0x92, 0xc7, 0x08, 0xc6, 0x1d, 0x24, 0x75, 0x51, 0x89, 0xc2, 0x42, 0x60, 0xb8, 0x46, 0x0b,
-	0x1e, 0x9a, 0x41, 0x2f, 0xbd, 0xd7, 0x64, 0x7c, 0x09, 0xa0, 0x6a, 0x23, 0x10, 0x35, 0x13, 0xf6,
-	0x80, 0xe7, 0x80, 0x3c, 0x42, 0x30, 0x15, 0x40, 0x15, 0x48, 0x40, 0x14, 0xb8, 0x4d, 0xc0, 0xf5,
-	0x42, 0xe5, 0x08, 0x5b, 0xd6, 0xe9, 0xa1, 0xa0, 0x4e, 0xc9, 0xa7, 0x08, 0xc6, 0xb7, 0x8a, 0x72,
-	0x58, 0x90, 0xfc, 0x44, 0x51, 0x9b, 0x44, 0xf1, 0x45, 0x18, 0x2c, 0x71, 0xc7, 0xfc, 0x1d, 0x14,
-	0x38, 0x63, 0xee, 0x7a, 0xf7, 0xa9, 0x8b, 0x5f, 0xb5, 0x9f, 0xca, 0x75, 0x6a, 0xe6, 0x25, 0x70,
-	0xcc, 0xed, 0xbf, 0xc9, 0x77, 0x08, 0xa6, 0x02, 0xb0, 0x02, 0x51, 0x0a, 0x8f, 0x06, 0x7a, 0xa1,
-	0x68, 0xbc, 0x18, 0xe6, 0x8f, 0x11, 0x8c, 0x5c, 0xd1, 0xb8, 0xcf, 0x06, 0x07, 0x04, 0x4f, 0xc2,
-	0x40, 0xb1, 0x40, 0x15, 0xcd, 0x62, 0xf7, 0x2c, 0xbe, 0xc3, 0x90, 0x54, 0x1d, 0xc0, 0xcb, 0x30,
-	0x45, 0x65, 0x59, 0xb1, 0x4b, 0x10, 0x5a, 0xc8, 0xd0, 0x92, 0xb5, 0xcf, 0x34, 0x4b, 0xc9, 0x52,
-	0x8b, 0xc9, 0x19, 0x99, 0x5a, 0x94, 0x0b, 0x6e, 0x48, 0x3a, 0x5e, 0x35, 0x5a, 0xaa, 0xb5, 0x59,
-	0xa1, 0x16, 0x25, 0x0f, 0x11, 0x8c, 0xac, 0xb0, 0xa6, 0x40, 0xa6, 0x01, 0xb2, 0x4a, 0x71, 0x9f,
-	0x19, 0x35, 0x48, 0x6a, 0x46, 0xba, 0x02, 0x65, 0x17, 0x8e, 0x2e, 0x99, 0x15, 0x55, 0x65, 0x96,
-	0xa1, 0x64, 0x37, 0x95, 0x5c, 0xa3, 0x5b, 0x06, 0xcf, 0x43, 0x9f, 0xac, 0xe4, 0x98, 0x69, 0x89,
-	0x53, 0x75, 0x3c, 0x34, 0x8d, 0x2b, 0xdc, 0x44, 0x12, 0xa6, 0xe4, 0x06, 0x4c, 0x54, 0x77, 0x68,
-	0x9b, 0x75, 0x6f, 0x90, 0x35, 0x49, 0xc0, 0xa8, 0xe7, 0x45, 0xbc, 0x10, 0xbe, 0x8c, 0xa1, 0x40,
-	0xc6, 0xc8, 0x15, 0x18, 0xf5, 0xb2, 0x2e, 0x16, 0x74, 0x10, 0x6d, 0x72, 0x0e, 0xc6, 0x83, 0x91,
-	0xaa, 0x6e, 0x6f, 0x2a, 0x39, 0x8d, 0x5a, 0x25, 0x83, 0xb9, 0xdb, 0x7b, 0x03, 0x64, 0x11, 0xfe,
-	0x13, 0xc2, 0xbf, 0x25, 0xe4, 0x2a, 0x9c, 0x0c, 0x9c, 0xb1, 0x0d, 0x43, 0x51, 0xa9, 0xd1, 0xc2,
-	0x8b, 0x80, 0x93, 0x70, 0xb4, 0xfe, 0xf8, 0x55, 0x6f, 0x4c, 0x1c, 0x3c, 0x5a, 0xd7, 0x64, 0xb2,
-	0x00, 0xd3, 0x2b, 0xcc, 0xb4, 0x0c, 0xbd, 0xd2, 0xce, 0xd3, 0xb3, 0x00, 0xd3, 0x12, 0x33, 0x2d,
-	0xdd, 0x60, 0xed, 0xac, 0xda, 0x85, 0x3e, 0x47, 0x27, 0x78, 0x02, 0xfa, 0xcc, 0x7d, 0x9a, 0x3a,
-	0x7b, 0xce, 0xe1, 0xff, 0xe6, 0xbf, 0x24, 0xf1, 0x2d, 0x66, 0xe6, 0x2f, 0x2c, 0x38, 0xd9, 0x10,
-	0x33, 0xf3, 0x17, 0x16, 0xc4, 0xcc, 0xd9, 0x64, 0xca, 0xd1, 0x87, 0x98, 0x39, 0x9b, 0x4c, 0x2d,
-	0xf7, 0xbb, 0x12, 0x25, 0xe7, 0xe1, 0xd0, 0x75, 0x3d, 0xcb, 0x7b, 0x85, 0x75, 0x66, 0x51, 0xfb,
-	0x40, 0xe0, 0x13, 0x30, 0xbc, 0x6f, 0xaa, 0x19, 0x5a, 0xa6, 0x4a, 0x81, 0xee, 0x15, 0x1c, 0x48,
-	0xfd, 0xd2, 0xd0, 0xbe, 0xa9, 0x2e, 0xb9, 0x63, 0xa9, 0x5f, 0x26, 0xe1, 0xc8, 0x1a, 0xab, 0xac,
-	0x53, 0x8d, 0xe6, 0x98, 0xca, 0x34, 0x6b, 0xd3, 0xe9, 0x51, 0xf0, 0x67, 0x08, 0x86, 0x6a, 0x0b,
-	0x3d, 0x3c, 0x1b, 0xaa, 0xff, 0x90, 0x4e, 0x20, 0x76, 0xba, 0x05, 0x4b, 0x47, 0x12, 0x64, 0xe1,
-	0xa3, 0xdf, 0xfe, 0x78, 0xdc, 0x13, 0xc7, 0xaf, 0xd8, 0x8d, 0xcc, 0x07, 0xce, 0xd3, 0x72, 0xa9,
-	0x68, 0xe8, 0x77, 0x58, 0xd6, 0x32, 0x13, 0x73, 0x89, 0x82, 0x20, 0x65, 0x26, 0xe6, 0x1e, 0x24,
-	0xbc, 0x82, 0xf1, 0x1b, 0x04, 0x23, 0xfe, 0x4a, 0x0f, 0xcf, 0x45, 0xee, 0x59, 0xd7, 0x3b, 0xc4,
-	0xce, 0xb4, 0x64, 0x2b, 0x10, 0x2e, 0x71, 0x84, 0x17, 0xf1, 0x62, 0x73, 0x84, 0x1e, 0x40, 0x1b,
-	0x6c, 0x4d, 0xf1, 0xf8, 0x2c, 0xd8, 0xc5, 0x78, 0x65, 0x59, 0xb2, 0x39, 0x92, 0x40, 0x93, 0x10,
-	0x4b, 0xb5, 0xb3, 0x44, 0x70, 0xd8, 0xe2, 0x1c, 0xde, 0xc2, 0xeb, 0x6d, 0x71, 0xa8, 0xa1, 0xe0,
-	0x23, 0xe4, 0xa1, 0x7f, 0x88, 0x00, 0xaa, 0xe5, 0x20, 0x3e, 0x15, 0x8a, 0xac, 0xae, 0x5e, 0x8c,
-	0x35, 0x2c, 0x98, 0x02, 0x8a, 0xb0, 0x8f, 0x4f, 0x0b, 0xd1, 0xc6, 0x9f, 0x23, 0x18, 0xaa, 0xad,
-	0x22, 0x23, 0xd4, 0x1a, 0x52, 0x93, 0xc6, 0x9a, 0x14, 0x11, 0x01, 0x01, 0xb4, 0x06, 0xc8, 0x1f,
-	0x3a, 0xfc, 0x33, 0xf2, 0x97, 0xc3, 0xee, 0x03, 0x9f, 0x68, 0x0a, 0xd2, 0x7f, 0xb9, 0xc4, 0x5a,
-	0x2b, 0x25, 0x02, 0xf9, 0xee, 0x00, 0x72, 0x7d, 0xb2, 0x6d, 0x1a, 0x3f, 0x38, 0x41, 0xf6, 0x0a,
-	0xef, 0xe8, 0x20, 0x07, 0x6b, 0xf3, 0x88, 0x20, 0x7b, 0x66, 0x24, 0xc3, 0x11, 0xdf, 0xc4, 0xef,
-	0x74, 0x15, 0x71, 0xa2, 0xe8, 0x41, 0x7d, 0x82, 0x60, 0xd8, 0xd7, 0x08, 0xe0, 0xd3, 0x11, 0xb1,
-	0xac, 0x6f, 0x16, 0x9a, 0x28, 0xf6, 0x75, 0x8e, 0xfd, 0x02, 0x69, 0xeb, 0x0e, 0x4b, 0x7b, 0x6d,
-	0x04, 0xfe, 0x16, 0xc1, 0x68, 0xa0, 0x06, 0xc7, 0x67, 0x1a, 0x80, 0x6b, 0x5b, 0xc1, 0xeb, 0x1c,
-	0xe0, 0x2a, 0xe9, 0xfc, 0x0a, 0x4b, 0xd7, 0xd4, 0xde, 0xf8, 0x79, 0x7d, 0x27, 0xe3, 0x0a, 0x3a,
-	0xd5, 0x0a, 0xec, 0xce, 0x34, 0xad, 0x70, 0x12, 0x59, 0xd2, 0xdd, 0x3b, 0x2c, 0x1d, 0x52, 0xb6,
-	0xe3, 0xef, 0x11, 0x8c, 0x06, 0x4a, 0x91, 0x88, 0x84, 0x84, 0xf7, 0x2a, 0x4d, 0x13, 0xf2, 0x2e,
-	0xe7, 0x22, 0xa5, 0x56, 0x38, 0x97, 0x2a, 0x82, 0x78, 0x27, 0xb7, 0x8b, 0x2f, 0x37, 0x7f, 0xd6,
-	0x37, 0x50, 0x8d, 0x73, 0xd3, 0xb0, 0xad, 0x69, 0x35, 0x37, 0x1f, 0x72, 0x3e, 0xe5, 0xd4, 0x6e,
-	0x80, 0x8f, 0x1b, 0xd1, 0x78, 0xb7, 0x0e, 0x74, 0x68, 0xba, 0xbe, 0x42, 0x70, 0x50, 0xd4, 0xbc,
-	0xf8, 0x44, 0x28, 0x60, 0x7f, 0x1f, 0x14, 0x3b, 0xd9, 0xd8, 0x48, 0x3c, 0x9a, 0xee, 0xa9, 0x59,
-	0xee, 0xf4, 0x4a, 0x9a, 0x7b, 0x90, 0x66, 0x8e, 0xcf, 0x34, 0x9a, 0xc3, 0x5f, 0x22, 0x38, 0x28,
-	0x0a, 0xe2, 0x08, 0x94, 0xfe, 0x76, 0x21, 0x02, 0x65, 0xa0, 0xa6, 0x26, 0xd7, 0x39, 0xca, 0xab,
-	0x64, 0xa9, 0xe3, 0xd7, 0x29, 0x2d, 0x33, 0x0f, 0xe4, 0xaf, 0x08, 0x46, 0xfc, 0x75, 0x7f, 0x44,
-	0x61, 0x15, 0xda, 0x46, 0x45, 0x14, 0x56, 0xe1, 0x8d, 0x04, 0xc9, 0x71, 0xe4, 0x94, 0xec, 0x74,
-	0xf5, 0xca, 0x4f, 0x53, 0xdf, 0x6e, 0x36, 0xa9, 0xe7, 0x08, 0x0e, 0xd7, 0x35, 0x25, 0xf8, 0xd5,
-	0x26, 0x58, 0x03, 0xd9, 0x88, 0xb7, 0x6a, 0x2e, 0xd8, 0xdd, 0xe1, 0xec, 0x64, 0x92, 0x79, 0x59,
-	0xec, 0x56, 0xaa, 0x59, 0x7b, 0x56, 0xff, 0xf3, 0x84, 0xbf, 0x75, 0xc2, 0x8b, 0xad, 0x9c, 0xfd,
-	0xd0, 0x76, 0xab, 0xe9, 0x5d, 0x76, 0x93, 0x13, 0xdd, 0x24, 0x37, 0x3a, 0x17, 0xa0, 0xf3, 0xab,
-	0x85, 0x7f, 0x7b, 0x9b, 0xd7, 0xef, 0x08, 0x8e, 0x45, 0xf4, 0x68, 0x78, 0x3e, 0xe2, 0x74, 0x34,
-	0xea, 0xe8, 0x5a, 0xbd, 0xce, 0x76, 0x39, 0xa5, 0x5b, 0x64, 0xab, 0xbb, 0xb9, 0x93, 0x1d, 0x70,
-	0x2e, 0xb3, 0x88, 0x3e, 0x32, 0x82, 0x59, 0xe3, 0xae, 0xf3, 0x1f, 0x66, 0x66, 0x38, 0xe0, 0xd2,
-	0x68, 0x6e, 0xf9, 0x11, 0x82, 0x63, 0x59, 0x5d, 0x0d, 0x83, 0xb3, 0xdc, 0xbf, 0xa6, 0x9a, 0x1b,
-	0x86, 0x6e, 0xe9, 0x1b, 0xe8, 0xd6, 0x39, 0x61, 0x90, 0xd3, 0x0b, 0x54, 0xcb, 0xc5, 0x75, 0x23,
-	0x97, 0xc8, 0x31, 0x8d, 0xff, 0xa6, 0x95, 0x70, 0xa6, 0x68, 0x51, 0x31, 0x7d, 0xff, 0xe8, 0xba,
-	0x98, 0x57, 0xcd, 0xbf, 0x10, 0xfa, 0xba, 0x67, 0x6c, 0xd5, 0x59, 0x7b, 0x99, 0x3b, 0x5f, 0x53,
-	0xcd, 0xf8, 0x76, 0xf2, 0xa9, 0x3b, 0xba, 0xc3, 0x47, 0x77, 0xd6, 0x54, 0x73, 0x67, 0x3b, 0xb9,
-	0xd7, 0xc7, 0x3d, 0xce, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xac, 0x72, 0x95, 0x44, 0x8f, 0x1b,
-	0x00, 0x00,
-}
diff --git a/googleapis/cloud/language/v1/language_service.pb.go b/googleapis/cloud/language/v1/language_service.pb.go
index c4135e599b..8457cf2e4b 100644
--- a/googleapis/cloud/language/v1/language_service.pb.go
+++ b/googleapis/cloud/language/v1/language_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1/language_service.proto
 
-package language // import "google.golang.org/genproto/googleapis/cloud/language/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package language
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the text encoding that the caller uses to process the output.
 // Providing an `EncodingType` is recommended because the API provides the
@@ -55,6 +55,7 @@ var EncodingType_name = map[int32]string{
 	2: "UTF16",
 	3: "UTF32",
 }
+
 var EncodingType_value = map[string]int32{
 	"NONE":  0,
 	"UTF8":  1,
@@ -65,8 +66,9 @@ var EncodingType_value = map[string]int32{
 func (x EncodingType) String() string {
 	return proto.EnumName(EncodingType_name, int32(x))
 }
+
 func (EncodingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{0}
+	return fileDescriptor_dd647168a36bd604, []int{0}
 }
 
 // The document types enum.
@@ -86,6 +88,7 @@ var Document_Type_name = map[int32]string{
 	1: "PLAIN_TEXT",
 	2: "HTML",
 }
+
 var Document_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"PLAIN_TEXT":       1,
@@ -95,8 +98,9 @@ var Document_Type_value = map[string]int32{
 func (x Document_Type) String() string {
 	return proto.EnumName(Document_Type_name, int32(x))
 }
+
 func (Document_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{0, 0}
+	return fileDescriptor_dd647168a36bd604, []int{0, 0}
 }
 
 // The type of the entity. For most entity types, the associated metadata is a
@@ -174,6 +178,7 @@ var Entity_Type_name = map[int32]string{
 	12: "NUMBER",
 	13: "PRICE",
 }
+
 var Entity_Type_value = map[string]int32{
 	"UNKNOWN":       0,
 	"PERSON":        1,
@@ -193,8 +198,9 @@ var Entity_Type_value = map[string]int32{
 func (x Entity_Type) String() string {
 	return proto.EnumName(Entity_Type_name, int32(x))
 }
+
 func (Entity_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{2, 0}
+	return fileDescriptor_dd647168a36bd604, []int{2, 0}
 }
 
 // The part of speech tags enum.
@@ -247,6 +253,7 @@ var PartOfSpeech_Tag_name = map[int32]string{
 	12: "X",
 	13: "AFFIX",
 }
+
 var PartOfSpeech_Tag_value = map[string]int32{
 	"UNKNOWN": 0,
 	"ADJ":     1,
@@ -267,8 +274,9 @@ var PartOfSpeech_Tag_value = map[string]int32{
 func (x PartOfSpeech_Tag) String() string {
 	return proto.EnumName(PartOfSpeech_Tag_name, int32(x))
 }
+
 func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 0}
+	return fileDescriptor_dd647168a36bd604, []int{5, 0}
 }
 
 // The characteristic of a verb that expresses time flow during an event.
@@ -291,6 +299,7 @@ var PartOfSpeech_Aspect_name = map[int32]string{
 	2: "IMPERFECTIVE",
 	3: "PROGRESSIVE",
 }
+
 var PartOfSpeech_Aspect_value = map[string]int32{
 	"ASPECT_UNKNOWN": 0,
 	"PERFECTIVE":     1,
@@ -301,8 +310,9 @@ var PartOfSpeech_Aspect_value = map[string]int32{
 func (x PartOfSpeech_Aspect) String() string {
 	return proto.EnumName(PartOfSpeech_Aspect_name, int32(x))
 }
+
 func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 1}
+	return fileDescriptor_dd647168a36bd604, []int{5, 1}
 }
 
 // The grammatical function performed by a noun or pronoun in a phrase,
@@ -360,6 +370,7 @@ var PartOfSpeech_Case_name = map[int32]string{
 	13: "RELATIVE_CASE",
 	14: "VOCATIVE",
 }
+
 var PartOfSpeech_Case_value = map[string]int32{
 	"CASE_UNKNOWN":   0,
 	"ACCUSATIVE":     1,
@@ -381,8 +392,9 @@ var PartOfSpeech_Case_value = map[string]int32{
 func (x PartOfSpeech_Case) String() string {
 	return proto.EnumName(PartOfSpeech_Case_name, int32(x))
 }
+
 func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 2}
+	return fileDescriptor_dd647168a36bd604, []int{5, 2}
 }
 
 // Depending on the language, Form can be categorizing different forms of
@@ -432,6 +444,7 @@ var PartOfSpeech_Form_name = map[int32]string{
 	10: "ORDER",
 	11: "SPECIFIC",
 }
+
 var PartOfSpeech_Form_value = map[string]int32{
 	"FORM_UNKNOWN":   0,
 	"ADNOMIAL":       1,
@@ -450,8 +463,9 @@ var PartOfSpeech_Form_value = map[string]int32{
 func (x PartOfSpeech_Form) String() string {
 	return proto.EnumName(PartOfSpeech_Form_name, int32(x))
 }
+
 func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 3}
+	return fileDescriptor_dd647168a36bd604, []int{5, 3}
 }
 
 // Gender classes of nouns reflected in the behaviour of associated words.
@@ -474,6 +488,7 @@ var PartOfSpeech_Gender_name = map[int32]string{
 	2: "MASCULINE",
 	3: "NEUTER",
 }
+
 var PartOfSpeech_Gender_value = map[string]int32{
 	"GENDER_UNKNOWN": 0,
 	"FEMININE":       1,
@@ -484,8 +499,9 @@ var PartOfSpeech_Gender_value = map[string]int32{
 func (x PartOfSpeech_Gender) String() string {
 	return proto.EnumName(PartOfSpeech_Gender_name, int32(x))
 }
+
 func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 4}
+	return fileDescriptor_dd647168a36bd604, []int{5, 4}
 }
 
 // The grammatical feature of verbs, used for showing modality and attitude.
@@ -517,6 +533,7 @@ var PartOfSpeech_Mood_name = map[int32]string{
 	5: "JUSSIVE",
 	6: "SUBJUNCTIVE",
 }
+
 var PartOfSpeech_Mood_value = map[string]int32{
 	"MOOD_UNKNOWN":     0,
 	"CONDITIONAL_MOOD": 1,
@@ -530,8 +547,9 @@ var PartOfSpeech_Mood_value = map[string]int32{
 func (x PartOfSpeech_Mood) String() string {
 	return proto.EnumName(PartOfSpeech_Mood_name, int32(x))
 }
+
 func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 5}
+	return fileDescriptor_dd647168a36bd604, []int{5, 5}
 }
 
 // Count distinctions.
@@ -554,6 +572,7 @@ var PartOfSpeech_Number_name = map[int32]string{
 	2: "PLURAL",
 	3: "DUAL",
 }
+
 var PartOfSpeech_Number_value = map[string]int32{
 	"NUMBER_UNKNOWN": 0,
 	"SINGULAR":       1,
@@ -564,8 +583,9 @@ var PartOfSpeech_Number_value = map[string]int32{
 func (x PartOfSpeech_Number) String() string {
 	return proto.EnumName(PartOfSpeech_Number_name, int32(x))
 }
+
 func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 6}
+	return fileDescriptor_dd647168a36bd604, []int{5, 6}
 }
 
 // The distinction between the speaker, second person, third person, etc.
@@ -591,6 +611,7 @@ var PartOfSpeech_Person_name = map[int32]string{
 	3: "THIRD",
 	4: "REFLEXIVE_PERSON",
 }
+
 var PartOfSpeech_Person_value = map[string]int32{
 	"PERSON_UNKNOWN":   0,
 	"FIRST":            1,
@@ -602,8 +623,9 @@ var PartOfSpeech_Person_value = map[string]int32{
 func (x PartOfSpeech_Person) String() string {
 	return proto.EnumName(PartOfSpeech_Person_name, int32(x))
 }
+
 func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 7}
+	return fileDescriptor_dd647168a36bd604, []int{5, 7}
 }
 
 // This category shows if the token is part of a proper name.
@@ -623,6 +645,7 @@ var PartOfSpeech_Proper_name = map[int32]string{
 	1: "PROPER",
 	2: "NOT_PROPER",
 }
+
 var PartOfSpeech_Proper_value = map[string]int32{
 	"PROPER_UNKNOWN": 0,
 	"PROPER":         1,
@@ -632,8 +655,9 @@ var PartOfSpeech_Proper_value = map[string]int32{
 func (x PartOfSpeech_Proper) String() string {
 	return proto.EnumName(PartOfSpeech_Proper_name, int32(x))
 }
+
 func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 8}
+	return fileDescriptor_dd647168a36bd604, []int{5, 8}
 }
 
 // Reciprocal features of a pronoun.
@@ -654,6 +678,7 @@ var PartOfSpeech_Reciprocity_name = map[int32]string{
 	1: "RECIPROCAL",
 	2: "NON_RECIPROCAL",
 }
+
 var PartOfSpeech_Reciprocity_value = map[string]int32{
 	"RECIPROCITY_UNKNOWN": 0,
 	"RECIPROCAL":          1,
@@ -663,8 +688,9 @@ var PartOfSpeech_Reciprocity_value = map[string]int32{
 func (x PartOfSpeech_Reciprocity) String() string {
 	return proto.EnumName(PartOfSpeech_Reciprocity_name, int32(x))
 }
+
 func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 9}
+	return fileDescriptor_dd647168a36bd604, []int{5, 9}
 }
 
 // Time reference.
@@ -696,6 +722,7 @@ var PartOfSpeech_Tense_name = map[int32]string{
 	5: "IMPERFECT",
 	6: "PLUPERFECT",
 }
+
 var PartOfSpeech_Tense_value = map[string]int32{
 	"TENSE_UNKNOWN":     0,
 	"CONDITIONAL_TENSE": 1,
@@ -709,8 +736,9 @@ var PartOfSpeech_Tense_value = map[string]int32{
 func (x PartOfSpeech_Tense) String() string {
 	return proto.EnumName(PartOfSpeech_Tense_name, int32(x))
 }
+
 func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 10}
+	return fileDescriptor_dd647168a36bd604, []int{5, 10}
 }
 
 // The relationship between the action that a verb expresses and the
@@ -734,6 +762,7 @@ var PartOfSpeech_Voice_name = map[int32]string{
 	2: "CAUSATIVE",
 	3: "PASSIVE",
 }
+
 var PartOfSpeech_Voice_value = map[string]int32{
 	"VOICE_UNKNOWN": 0,
 	"ACTIVE":        1,
@@ -744,8 +773,9 @@ var PartOfSpeech_Voice_value = map[string]int32{
 func (x PartOfSpeech_Voice) String() string {
 	return proto.EnumName(PartOfSpeech_Voice_name, int32(x))
 }
+
 func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5, 11}
+	return fileDescriptor_dd647168a36bd604, []int{5, 11}
 }
 
 // The parse label enum for the token.
@@ -1005,6 +1035,7 @@ var DependencyEdge_Label_name = map[int32]string{
 	81: "MES",
 	82: "NCOMP",
 }
+
 var DependencyEdge_Label_value = map[string]int32{
 	"UNKNOWN":      0,
 	"ABBREV":       1,
@@ -1094,8 +1125,9 @@ var DependencyEdge_Label_value = map[string]int32{
 func (x DependencyEdge_Label) String() string {
 	return proto.EnumName(DependencyEdge_Label_name, int32(x))
 }
+
 func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{6, 0}
+	return fileDescriptor_dd647168a36bd604, []int{6, 0}
 }
 
 // The supported types of mentions.
@@ -1115,6 +1147,7 @@ var EntityMention_Type_name = map[int32]string{
 	1: "PROPER",
 	2: "COMMON",
 }
+
 var EntityMention_Type_value = map[string]int32{
 	"TYPE_UNKNOWN": 0,
 	"PROPER":       1,
@@ -1124,8 +1157,9 @@ var EntityMention_Type_value = map[string]int32{
 func (x EntityMention_Type) String() string {
 	return proto.EnumName(EntityMention_Type_name, int32(x))
 }
+
 func (EntityMention_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{7, 0}
+	return fileDescriptor_dd647168a36bd604, []int{7, 0}
 }
 
 // ################################################################ #
@@ -1160,16 +1194,17 @@ func (m *Document) Reset()         { *m = Document{} }
 func (m *Document) String() string { return proto.CompactTextString(m) }
 func (*Document) ProtoMessage()    {}
 func (*Document) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{0}
+	return fileDescriptor_dd647168a36bd604, []int{0}
 }
+
 func (m *Document) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Document.Unmarshal(m, b)
 }
 func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
 }
-func (dst *Document) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Document.Merge(dst, src)
+func (m *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(m, src)
 }
 func (m *Document) XXX_Size() int {
 	return xxx_messageInfo_Document.Size(m)
@@ -1231,72 +1266,14 @@ func (m *Document) GetLanguage() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Document) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Document_OneofMarshaler, _Document_OneofUnmarshaler, _Document_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Document) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Document_Content)(nil),
 		(*Document_GcsContentUri)(nil),
 	}
 }
 
-func _Document_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_Content:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Content)
-	case *Document_GcsContentUri:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.GcsContentUri)
-	case nil:
-	default:
-		return fmt.Errorf("Document.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Document_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Document)
-	switch tag {
-	case 2: // source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_Content{x}
-		return true, err
-	case 3: // source.gcs_content_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_GcsContentUri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Document_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_Content:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case *Document_GcsContentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.GcsContentUri)))
-		n += len(x.GcsContentUri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a sentence in the input document.
 type Sentence struct {
 	// The sentence text.
@@ -1314,16 +1291,17 @@ func (m *Sentence) Reset()         { *m = Sentence{} }
 func (m *Sentence) String() string { return proto.CompactTextString(m) }
 func (*Sentence) ProtoMessage()    {}
 func (*Sentence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{1}
+	return fileDescriptor_dd647168a36bd604, []int{1}
 }
+
 func (m *Sentence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentence.Unmarshal(m, b)
 }
 func (m *Sentence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentence.Marshal(b, m, deterministic)
 }
-func (dst *Sentence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentence.Merge(dst, src)
+func (m *Sentence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentence.Merge(m, src)
 }
 func (m *Sentence) XXX_Size() int {
 	return xxx_messageInfo_Sentence.Size(m)
@@ -1386,16 +1364,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{2}
+	return fileDescriptor_dd647168a36bd604, []int{2}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -1467,16 +1446,17 @@ func (m *Token) Reset()         { *m = Token{} }
 func (m *Token) String() string { return proto.CompactTextString(m) }
 func (*Token) ProtoMessage()    {}
 func (*Token) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{3}
+	return fileDescriptor_dd647168a36bd604, []int{3}
 }
+
 func (m *Token) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Token.Unmarshal(m, b)
 }
 func (m *Token) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Token.Marshal(b, m, deterministic)
 }
-func (dst *Token) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Token.Merge(dst, src)
+func (m *Token) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Token.Merge(m, src)
 }
 func (m *Token) XXX_Size() int {
 	return xxx_messageInfo_Token.Size(m)
@@ -1534,16 +1514,17 @@ func (m *Sentiment) Reset()         { *m = Sentiment{} }
 func (m *Sentiment) String() string { return proto.CompactTextString(m) }
 func (*Sentiment) ProtoMessage()    {}
 func (*Sentiment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{4}
+	return fileDescriptor_dd647168a36bd604, []int{4}
 }
+
 func (m *Sentiment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
 }
 func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
 }
-func (dst *Sentiment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentiment.Merge(dst, src)
+func (m *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(m, src)
 }
 func (m *Sentiment) XXX_Size() int {
 	return xxx_messageInfo_Sentiment.Size(m)
@@ -1605,16 +1586,17 @@ func (m *PartOfSpeech) Reset()         { *m = PartOfSpeech{} }
 func (m *PartOfSpeech) String() string { return proto.CompactTextString(m) }
 func (*PartOfSpeech) ProtoMessage()    {}
 func (*PartOfSpeech) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{5}
+	return fileDescriptor_dd647168a36bd604, []int{5}
 }
+
 func (m *PartOfSpeech) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartOfSpeech.Unmarshal(m, b)
 }
 func (m *PartOfSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartOfSpeech.Marshal(b, m, deterministic)
 }
-func (dst *PartOfSpeech) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartOfSpeech.Merge(dst, src)
+func (m *PartOfSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartOfSpeech.Merge(m, src)
 }
 func (m *PartOfSpeech) XXX_Size() int {
 	return xxx_messageInfo_PartOfSpeech.Size(m)
@@ -1730,16 +1712,17 @@ func (m *DependencyEdge) Reset()         { *m = DependencyEdge{} }
 func (m *DependencyEdge) String() string { return proto.CompactTextString(m) }
 func (*DependencyEdge) ProtoMessage()    {}
 func (*DependencyEdge) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{6}
+	return fileDescriptor_dd647168a36bd604, []int{6}
 }
+
 func (m *DependencyEdge) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DependencyEdge.Unmarshal(m, b)
 }
 func (m *DependencyEdge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DependencyEdge.Marshal(b, m, deterministic)
 }
-func (dst *DependencyEdge) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DependencyEdge.Merge(dst, src)
+func (m *DependencyEdge) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DependencyEdge.Merge(m, src)
 }
 func (m *DependencyEdge) XXX_Size() int {
 	return xxx_messageInfo_DependencyEdge.Size(m)
@@ -1785,16 +1768,17 @@ func (m *EntityMention) Reset()         { *m = EntityMention{} }
 func (m *EntityMention) String() string { return proto.CompactTextString(m) }
 func (*EntityMention) ProtoMessage()    {}
 func (*EntityMention) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{7}
+	return fileDescriptor_dd647168a36bd604, []int{7}
 }
+
 func (m *EntityMention) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityMention.Unmarshal(m, b)
 }
 func (m *EntityMention) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityMention.Marshal(b, m, deterministic)
 }
-func (dst *EntityMention) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityMention.Merge(dst, src)
+func (m *EntityMention) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityMention.Merge(m, src)
 }
 func (m *EntityMention) XXX_Size() int {
 	return xxx_messageInfo_EntityMention.Size(m)
@@ -1842,16 +1826,17 @@ func (m *TextSpan) Reset()         { *m = TextSpan{} }
 func (m *TextSpan) String() string { return proto.CompactTextString(m) }
 func (*TextSpan) ProtoMessage()    {}
 func (*TextSpan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{8}
+	return fileDescriptor_dd647168a36bd604, []int{8}
 }
+
 func (m *TextSpan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSpan.Unmarshal(m, b)
 }
 func (m *TextSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSpan.Marshal(b, m, deterministic)
 }
-func (dst *TextSpan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSpan.Merge(dst, src)
+func (m *TextSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSpan.Merge(m, src)
 }
 func (m *TextSpan) XXX_Size() int {
 	return xxx_messageInfo_TextSpan.Size(m)
@@ -1893,16 +1878,17 @@ func (m *ClassificationCategory) Reset()         { *m = ClassificationCategory{}
 func (m *ClassificationCategory) String() string { return proto.CompactTextString(m) }
 func (*ClassificationCategory) ProtoMessage()    {}
 func (*ClassificationCategory) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{9}
+	return fileDescriptor_dd647168a36bd604, []int{9}
 }
+
 func (m *ClassificationCategory) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassificationCategory.Unmarshal(m, b)
 }
 func (m *ClassificationCategory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassificationCategory.Marshal(b, m, deterministic)
 }
-func (dst *ClassificationCategory) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassificationCategory.Merge(dst, src)
+func (m *ClassificationCategory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationCategory.Merge(m, src)
 }
 func (m *ClassificationCategory) XXX_Size() int {
 	return xxx_messageInfo_ClassificationCategory.Size(m)
@@ -1942,16 +1928,17 @@ func (m *AnalyzeSentimentRequest) Reset()         { *m = AnalyzeSentimentRequest
 func (m *AnalyzeSentimentRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSentimentRequest) ProtoMessage()    {}
 func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{10}
+	return fileDescriptor_dd647168a36bd604, []int{10}
 }
+
 func (m *AnalyzeSentimentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeSentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSentimentRequest.Merge(dst, src)
+func (m *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentRequest.Merge(m, src)
 }
 func (m *AnalyzeSentimentRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Size(m)
@@ -1995,16 +1982,17 @@ func (m *AnalyzeSentimentResponse) Reset()         { *m = AnalyzeSentimentRespon
 func (m *AnalyzeSentimentResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSentimentResponse) ProtoMessage()    {}
 func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{11}
+	return fileDescriptor_dd647168a36bd604, []int{11}
 }
+
 func (m *AnalyzeSentimentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeSentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSentimentResponse.Merge(dst, src)
+func (m *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentResponse.Merge(m, src)
 }
 func (m *AnalyzeSentimentResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Size(m)
@@ -2051,16 +2039,17 @@ func (m *AnalyzeEntitySentimentRequest) Reset()         { *m = AnalyzeEntitySent
 func (m *AnalyzeEntitySentimentRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitySentimentRequest) ProtoMessage()    {}
 func (*AnalyzeEntitySentimentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{12}
+	return fileDescriptor_dd647168a36bd604, []int{12}
 }
+
 func (m *AnalyzeEntitySentimentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitySentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitySentimentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitySentimentRequest.Merge(dst, src)
+func (m *AnalyzeEntitySentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentRequest.Merge(m, src)
 }
 func (m *AnalyzeEntitySentimentRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Size(m)
@@ -2102,16 +2091,17 @@ func (m *AnalyzeEntitySentimentResponse) Reset()         { *m = AnalyzeEntitySen
 func (m *AnalyzeEntitySentimentResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitySentimentResponse) ProtoMessage()    {}
 func (*AnalyzeEntitySentimentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{13}
+	return fileDescriptor_dd647168a36bd604, []int{13}
 }
+
 func (m *AnalyzeEntitySentimentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitySentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitySentimentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitySentimentResponse.Merge(dst, src)
+func (m *AnalyzeEntitySentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentResponse.Merge(m, src)
 }
 func (m *AnalyzeEntitySentimentResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Size(m)
@@ -2151,16 +2141,17 @@ func (m *AnalyzeEntitiesRequest) Reset()         { *m = AnalyzeEntitiesRequest{}
 func (m *AnalyzeEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitiesRequest) ProtoMessage()    {}
 func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{14}
+	return fileDescriptor_dd647168a36bd604, []int{14}
 }
+
 func (m *AnalyzeEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(dst, src)
+func (m *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(m, src)
 }
 func (m *AnalyzeEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Size(m)
@@ -2202,16 +2193,17 @@ func (m *AnalyzeEntitiesResponse) Reset()         { *m = AnalyzeEntitiesResponse
 func (m *AnalyzeEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitiesResponse) ProtoMessage()    {}
 func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{15}
+	return fileDescriptor_dd647168a36bd604, []int{15}
 }
+
 func (m *AnalyzeEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(dst, src)
+func (m *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(m, src)
 }
 func (m *AnalyzeEntitiesResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Size(m)
@@ -2251,16 +2243,17 @@ func (m *AnalyzeSyntaxRequest) Reset()         { *m = AnalyzeSyntaxRequest{} }
 func (m *AnalyzeSyntaxRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSyntaxRequest) ProtoMessage()    {}
 func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{16}
+	return fileDescriptor_dd647168a36bd604, []int{16}
 }
+
 func (m *AnalyzeSyntaxRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeSyntaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(dst, src)
+func (m *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(m, src)
 }
 func (m *AnalyzeSyntaxRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Size(m)
@@ -2304,16 +2297,17 @@ func (m *AnalyzeSyntaxResponse) Reset()         { *m = AnalyzeSyntaxResponse{} }
 func (m *AnalyzeSyntaxResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSyntaxResponse) ProtoMessage()    {}
 func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{17}
+	return fileDescriptor_dd647168a36bd604, []int{17}
 }
+
 func (m *AnalyzeSyntaxResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeSyntaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(dst, src)
+func (m *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(m, src)
 }
 func (m *AnalyzeSyntaxResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Size(m)
@@ -2358,16 +2352,17 @@ func (m *ClassifyTextRequest) Reset()         { *m = ClassifyTextRequest{} }
 func (m *ClassifyTextRequest) String() string { return proto.CompactTextString(m) }
 func (*ClassifyTextRequest) ProtoMessage()    {}
 func (*ClassifyTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{18}
+	return fileDescriptor_dd647168a36bd604, []int{18}
 }
+
 func (m *ClassifyTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassifyTextRequest.Unmarshal(m, b)
 }
 func (m *ClassifyTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassifyTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *ClassifyTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassifyTextRequest.Merge(dst, src)
+func (m *ClassifyTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextRequest.Merge(m, src)
 }
 func (m *ClassifyTextRequest) XXX_Size() int {
 	return xxx_messageInfo_ClassifyTextRequest.Size(m)
@@ -2398,16 +2393,17 @@ func (m *ClassifyTextResponse) Reset()         { *m = ClassifyTextResponse{} }
 func (m *ClassifyTextResponse) String() string { return proto.CompactTextString(m) }
 func (*ClassifyTextResponse) ProtoMessage()    {}
 func (*ClassifyTextResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{19}
+	return fileDescriptor_dd647168a36bd604, []int{19}
 }
+
 func (m *ClassifyTextResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassifyTextResponse.Unmarshal(m, b)
 }
 func (m *ClassifyTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassifyTextResponse.Marshal(b, m, deterministic)
 }
-func (dst *ClassifyTextResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassifyTextResponse.Merge(dst, src)
+func (m *ClassifyTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextResponse.Merge(m, src)
 }
 func (m *ClassifyTextResponse) XXX_Size() int {
 	return xxx_messageInfo_ClassifyTextResponse.Size(m)
@@ -2443,16 +2439,17 @@ func (m *AnnotateTextRequest) Reset()         { *m = AnnotateTextRequest{} }
 func (m *AnnotateTextRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest) ProtoMessage()    {}
 func (*AnnotateTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{20}
+	return fileDescriptor_dd647168a36bd604, []int{20}
 }
+
 func (m *AnnotateTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextRequest.Unmarshal(m, b)
 }
 func (m *AnnotateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextRequest.Merge(dst, src)
+func (m *AnnotateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest.Merge(m, src)
 }
 func (m *AnnotateTextRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextRequest.Size(m)
@@ -2506,16 +2503,17 @@ func (m *AnnotateTextRequest_Features) Reset()         { *m = AnnotateTextReques
 func (m *AnnotateTextRequest_Features) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest_Features) ProtoMessage()    {}
 func (*AnnotateTextRequest_Features) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{20, 0}
+	return fileDescriptor_dd647168a36bd604, []int{20, 0}
 }
+
 func (m *AnnotateTextRequest_Features) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Unmarshal(m, b)
 }
 func (m *AnnotateTextRequest_Features) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextRequest_Features.Merge(dst, src)
+func (m *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest_Features.Merge(m, src)
 }
 func (m *AnnotateTextRequest_Features) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Size(m)
@@ -2592,16 +2590,17 @@ func (m *AnnotateTextResponse) Reset()         { *m = AnnotateTextResponse{} }
 func (m *AnnotateTextResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextResponse) ProtoMessage()    {}
 func (*AnnotateTextResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_5dd1bad015472f8e, []int{21}
+	return fileDescriptor_dd647168a36bd604, []int{21}
 }
+
 func (m *AnnotateTextResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextResponse.Unmarshal(m, b)
 }
 func (m *AnnotateTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextResponse.Merge(dst, src)
+func (m *AnnotateTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextResponse.Merge(m, src)
 }
 func (m *AnnotateTextResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextResponse.Size(m)
@@ -2655,6 +2654,23 @@ func (m *AnnotateTextResponse) GetCategories() []*ClassificationCategory {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.language.v1.EncodingType", EncodingType_name, EncodingType_value)
+	proto.RegisterEnum("google.cloud.language.v1.Document_Type", Document_Type_name, Document_Type_value)
+	proto.RegisterEnum("google.cloud.language.v1.Entity_Type", Entity_Type_name, Entity_Type_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Tag", PartOfSpeech_Tag_name, PartOfSpeech_Tag_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Aspect", PartOfSpeech_Aspect_name, PartOfSpeech_Aspect_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Case", PartOfSpeech_Case_name, PartOfSpeech_Case_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Form", PartOfSpeech_Form_name, PartOfSpeech_Form_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Gender", PartOfSpeech_Gender_name, PartOfSpeech_Gender_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Mood", PartOfSpeech_Mood_name, PartOfSpeech_Mood_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Number", PartOfSpeech_Number_name, PartOfSpeech_Number_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Person", PartOfSpeech_Person_name, PartOfSpeech_Person_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Proper", PartOfSpeech_Proper_name, PartOfSpeech_Proper_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Reciprocity", PartOfSpeech_Reciprocity_name, PartOfSpeech_Reciprocity_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Tense", PartOfSpeech_Tense_name, PartOfSpeech_Tense_value)
+	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Voice", PartOfSpeech_Voice_name, PartOfSpeech_Voice_value)
+	proto.RegisterEnum("google.cloud.language.v1.DependencyEdge_Label", DependencyEdge_Label_name, DependencyEdge_Label_value)
+	proto.RegisterEnum("google.cloud.language.v1.EntityMention_Type", EntityMention_Type_name, EntityMention_Type_value)
 	proto.RegisterType((*Document)(nil), "google.cloud.language.v1.Document")
 	proto.RegisterType((*Sentence)(nil), "google.cloud.language.v1.Sentence")
 	proto.RegisterType((*Entity)(nil), "google.cloud.language.v1.Entity")
@@ -2679,23 +2695,210 @@ func init() {
 	proto.RegisterType((*AnnotateTextRequest)(nil), "google.cloud.language.v1.AnnotateTextRequest")
 	proto.RegisterType((*AnnotateTextRequest_Features)(nil), "google.cloud.language.v1.AnnotateTextRequest.Features")
 	proto.RegisterType((*AnnotateTextResponse)(nil), "google.cloud.language.v1.AnnotateTextResponse")
-	proto.RegisterEnum("google.cloud.language.v1.EncodingType", EncodingType_name, EncodingType_value)
-	proto.RegisterEnum("google.cloud.language.v1.Document_Type", Document_Type_name, Document_Type_value)
-	proto.RegisterEnum("google.cloud.language.v1.Entity_Type", Entity_Type_name, Entity_Type_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Tag", PartOfSpeech_Tag_name, PartOfSpeech_Tag_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Aspect", PartOfSpeech_Aspect_name, PartOfSpeech_Aspect_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Case", PartOfSpeech_Case_name, PartOfSpeech_Case_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Form", PartOfSpeech_Form_name, PartOfSpeech_Form_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Gender", PartOfSpeech_Gender_name, PartOfSpeech_Gender_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Mood", PartOfSpeech_Mood_name, PartOfSpeech_Mood_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Number", PartOfSpeech_Number_name, PartOfSpeech_Number_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Person", PartOfSpeech_Person_name, PartOfSpeech_Person_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Proper", PartOfSpeech_Proper_name, PartOfSpeech_Proper_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Reciprocity", PartOfSpeech_Reciprocity_name, PartOfSpeech_Reciprocity_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Tense", PartOfSpeech_Tense_name, PartOfSpeech_Tense_value)
-	proto.RegisterEnum("google.cloud.language.v1.PartOfSpeech_Voice", PartOfSpeech_Voice_name, PartOfSpeech_Voice_value)
-	proto.RegisterEnum("google.cloud.language.v1.DependencyEdge_Label", DependencyEdge_Label_name, DependencyEdge_Label_value)
-	proto.RegisterEnum("google.cloud.language.v1.EntityMention_Type", EntityMention_Type_name, EntityMention_Type_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/language/v1/language_service.proto", fileDescriptor_dd647168a36bd604)
+}
+
+var fileDescriptor_dd647168a36bd604 = []byte{
+	// 3123 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3a, 0xcb, 0x8f, 0xdb, 0xc6,
+	0xdd, 0xa6, 0x5e, 0x2b, 0x8d, 0x76, 0xd7, 0x63, 0xda, 0xb1, 0xf5, 0x29, 0x8e, 0xed, 0xd0, 0x79,
+	0x38, 0x8e, 0xad, 0xb5, 0x37, 0xdf, 0xe7, 0x38, 0xb6, 0xbf, 0x2f, 0xe6, 0x92, 0x23, 0x2d, 0xd7,
+	0x14, 0x49, 0x0f, 0x49, 0x79, 0xe3, 0x0f, 0x85, 0x40, 0x4b, 0x5c, 0x59, 0xc8, 0x2e, 0xa9, 0x8a,
+	0x5c, 0xc7, 0x9b, 0x4b, 0x81, 0x02, 0x3d, 0xf6, 0x50, 0xf4, 0x0f, 0xe8, 0xb5, 0x2f, 0xf4, 0x71,
+	0x2c, 0xd0, 0x43, 0x0f, 0x3d, 0x14, 0x41, 0x4f, 0xed, 0x2d, 0xa7, 0x1c, 0x7a, 0xeb, 0xbd, 0x68,
+	0x81, 0xb6, 0x28, 0x7e, 0x33, 0xa4, 0x44, 0xad, 0x77, 0x6d, 0xad, 0x9b, 0xa2, 0xe9, 0x6d, 0xe6,
+	0xc7, 0xdf, 0x7b, 0x7e, 0xaf, 0x19, 0x09, 0xad, 0x0c, 0xc2, 0x70, 0xb0, 0xed, 0xaf, 0xf4, 0xb6,
+	0xc3, 0xdd, 0xfe, 0xca, 0xb6, 0x17, 0x0c, 0x76, 0xbd, 0x81, 0xbf, 0xf2, 0xe4, 0xfa, 0x64, 0xdd,
+	0x8d, 0xfc, 0xf1, 0x93, 0x61, 0xcf, 0x6f, 0x8c, 0xc6, 0x61, 0x1c, 0x8a, 0x35, 0x4e, 0xd0, 0x60,
+	0x04, 0x8d, 0x14, 0xa9, 0xf1, 0xe4, 0x7a, 0xfd, 0x6c, 0xc2, 0xca, 0x1b, 0x0d, 0x57, 0xbc, 0x20,
+	0x08, 0x63, 0x2f, 0x1e, 0x86, 0x41, 0xc4, 0xe9, 0xea, 0x67, 0x32, 0x5f, 0x7b, 0xdb, 0x43, 0x3f,
+	0x88, 0x93, 0x0f, 0xe7, 0x33, 0x1f, 0xb6, 0x86, 0xfe, 0x76, 0xbf, 0xfb, 0xc8, 0x7f, 0xec, 0x3d,
+	0x19, 0x86, 0x63, 0x8e, 0x20, 0xfd, 0x51, 0x40, 0x65, 0x35, 0xec, 0xed, 0xee, 0xf8, 0x41, 0x2c,
+	0xde, 0x46, 0x85, 0x78, 0x6f, 0xe4, 0xd7, 0x84, 0x0b, 0xc2, 0xa5, 0xe5, 0xd5, 0xb7, 0x1b, 0x87,
+	0x69, 0xd3, 0x48, 0x29, 0x1a, 0xce, 0xde, 0xc8, 0xa7, 0x8c, 0x48, 0xac, 0xa3, 0x85, 0x5e, 0x18,
+	0xc4, 0x7e, 0x10, 0xd7, 0x72, 0x17, 0x84, 0x4b, 0x95, 0xf5, 0x63, 0x34, 0x05, 0x88, 0x97, 0xd0,
+	0xf1, 0x41, 0x2f, 0xea, 0x26, 0xdb, 0xee, 0xee, 0x78, 0x58, 0xcb, 0x27, 0x38, 0x4b, 0x83, 0x5e,
+	0xa4, 0x70, 0xb8, 0x3b, 0x1e, 0x8a, 0x75, 0x54, 0x4e, 0x05, 0xd5, 0x0a, 0x80, 0x42, 0x27, 0x7b,
+	0xe9, 0x06, 0x2a, 0x80, 0x3c, 0xf1, 0x14, 0xc2, 0xce, 0x47, 0x16, 0xe9, 0xba, 0x86, 0x6d, 0x11,
+	0x45, 0x6b, 0x6a, 0x44, 0xc5, 0xc7, 0xc4, 0x65, 0x84, 0x2c, 0x5d, 0xd6, 0x8c, 0xae, 0x43, 0x36,
+	0x1d, 0x2c, 0x88, 0x65, 0x54, 0x58, 0x77, 0xda, 0x3a, 0xce, 0xad, 0x95, 0x51, 0x29, 0x0a, 0x77,
+	0xc7, 0x3d, 0x5f, 0xfa, 0x96, 0x80, 0xca, 0xb6, 0x0f, 0xc2, 0x7a, 0xbe, 0x78, 0x03, 0x15, 0x62,
+	0xff, 0x69, 0xcc, 0xac, 0xad, 0xae, 0x4a, 0x87, 0x5b, 0xeb, 0xf8, 0x4f, 0x63, 0x7b, 0xe4, 0x05,
+	0x94, 0xe1, 0x8b, 0x32, 0xaa, 0x44, 0x7e, 0x10, 0x0f, 0x77, 0x52, 0x53, 0xab, 0xab, 0x17, 0x0f,
+	0x27, 0xb6, 0x53, 0x54, 0x3a, 0xa5, 0x92, 0x7e, 0x55, 0x40, 0x25, 0x12, 0xc4, 0xc3, 0x78, 0x4f,
+	0x14, 0x51, 0x21, 0xf0, 0x76, 0xb8, 0xcf, 0x2b, 0x94, 0xad, 0xc5, 0x0f, 0x92, 0x73, 0xc8, 0xb1,
+	0x73, 0x78, 0xf3, 0x70, 0xe6, 0x9c, 0x47, 0xf6, 0x14, 0x36, 0x50, 0x79, 0xc7, 0x8f, 0xbd, 0xbe,
+	0x17, 0x7b, 0xb5, 0xfc, 0x85, 0xfc, 0xa5, 0xea, 0x6a, 0xe3, 0x85, 0xe4, 0xed, 0x84, 0x80, 0x04,
+	0xf1, 0x78, 0x8f, 0x4e, 0xe8, 0xe1, 0x2c, 0x22, 0x0f, 0xa2, 0xa9, 0xc7, 0xcf, 0x22, 0x47, 0x27,
+	0x7b, 0x51, 0x01, 0x39, 0x01, 0x8b, 0xc1, 0x5a, 0x91, 0xc9, 0x79, 0xfb, 0x45, 0x72, 0xda, 0x1c,
+	0x9f, 0x4e, 0x08, 0x67, 0x3d, 0x59, 0x7a, 0x19, 0x4f, 0xd6, 0x6f, 0xa3, 0xa5, 0x19, 0xf5, 0x45,
+	0x8c, 0xf2, 0x1f, 0xfb, 0x7b, 0x89, 0x3b, 0x61, 0x29, 0x9e, 0x42, 0xc5, 0x27, 0xde, 0xf6, 0x2e,
+	0x77, 0x67, 0x85, 0xf2, 0xcd, 0xad, 0xdc, 0x4d, 0x41, 0xfa, 0x85, 0x90, 0x44, 0x54, 0x15, 0x2d,
+	0xb8, 0xc6, 0x3d, 0xc3, 0x7c, 0x60, 0xe0, 0x63, 0x22, 0x42, 0x25, 0x8b, 0x50, 0xdb, 0x34, 0xb0,
+	0x20, 0x2e, 0xa2, 0xb2, 0x6e, 0x2a, 0xb2, 0xa3, 0x99, 0x06, 0xce, 0x89, 0x18, 0x2d, 0x9a, 0xb4,
+	0x25, 0x1b, 0xda, 0x43, 0x0e, 0xc9, 0x8b, 0x15, 0x54, 0x24, 0x1d, 0x62, 0x38, 0xb8, 0x20, 0x1e,
+	0x47, 0xd5, 0x07, 0x26, 0xbd, 0xd7, 0x35, 0x9b, 0x5d, 0x99, 0x3a, 0xb8, 0x28, 0x9e, 0x40, 0x4b,
+	0x8a, 0x69, 0xd8, 0x6e, 0x9b, 0xd0, 0x6e, 0xcb, 0x34, 0x55, 0x5c, 0x02, 0x74, 0xd3, 0x59, 0x27,
+	0x14, 0x2f, 0x00, 0x2f, 0x6b, 0xdd, 0x34, 0x48, 0xd7, 0x70, 0xdb, 0x6b, 0x84, 0xe2, 0x0a, 0x28,
+	0x21, 0xab, 0x2a, 0x25, 0xb6, 0x8d, 0x11, 0x44, 0xaf, 0x2a, 0x3b, 0x04, 0x57, 0x41, 0x9d, 0x04,
+	0x65, 0x11, 0xe8, 0x2d, 0xaa, 0x29, 0x04, 0x2f, 0x49, 0x7f, 0x12, 0x50, 0xd1, 0x09, 0x3f, 0xf6,
+	0x83, 0x97, 0x8e, 0x63, 0x1d, 0x2d, 0x8f, 0xbc, 0x71, 0xdc, 0x0d, 0xb7, 0xba, 0xd1, 0xc8, 0xf7,
+	0x7b, 0x8f, 0x93, 0x60, 0x7e, 0xeb, 0x70, 0x0e, 0x96, 0x37, 0x8e, 0xcd, 0x2d, 0x9b, 0x61, 0xd3,
+	0xc5, 0x51, 0x66, 0x27, 0xde, 0x47, 0xc7, 0xfb, 0xfe, 0xc8, 0x0f, 0xfa, 0x7e, 0xd0, 0xdb, 0xeb,
+	0xfa, 0xfd, 0x81, 0xcf, 0x52, 0xbc, 0xba, 0x7a, 0xe9, 0x39, 0x65, 0x64, 0x42, 0x40, 0xfa, 0x03,
+	0x9f, 0x2e, 0xf7, 0x67, 0xf6, 0x70, 0x70, 0xdb, 0xfe, 0xce, 0x8e, 0x97, 0x14, 0x02, 0xbe, 0x91,
+	0x3e, 0x44, 0x95, 0x49, 0x24, 0x88, 0x67, 0x51, 0x65, 0xc7, 0x1b, 0x04, 0xc3, 0x78, 0xb7, 0xcf,
+	0xcf, 0x37, 0x47, 0xa7, 0x00, 0x60, 0x10, 0xf5, 0xc2, 0x31, 0xd7, 0x24, 0x47, 0xf9, 0x46, 0xfa,
+	0x1b, 0xb8, 0x3e, 0xab, 0xfa, 0x1d, 0x94, 0x8f, 0xbd, 0x41, 0x52, 0xf5, 0x2e, 0xcf, 0x67, 0x7d,
+	0xc3, 0xf1, 0x06, 0x14, 0xc8, 0x44, 0x82, 0x4a, 0x5e, 0x34, 0xf2, 0x7b, 0x71, 0x92, 0xae, 0x57,
+	0xe7, 0x64, 0x20, 0x33, 0x22, 0x9a, 0x10, 0x8b, 0x1f, 0xa2, 0x42, 0xcf, 0x8b, 0xb8, 0xaa, 0xcb,
+	0xab, 0xef, 0xce, 0xc9, 0x44, 0xf1, 0x22, 0x9f, 0x32, 0x42, 0x60, 0xb0, 0x15, 0x8e, 0x77, 0x98,
+	0xb3, 0xe6, 0x67, 0xd0, 0x0c, 0xc7, 0x3b, 0x94, 0x11, 0x82, 0x21, 0x03, 0x70, 0xff, 0xb8, 0x56,
+	0x3c, 0x92, 0x21, 0x2d, 0x46, 0x44, 0x13, 0x62, 0xd0, 0x63, 0x27, 0x0c, 0xfb, 0x2c, 0x9f, 0xe7,
+	0xd7, 0xa3, 0x1d, 0x86, 0x7d, 0xca, 0x08, 0x41, 0x8f, 0x60, 0x77, 0xe7, 0x91, 0x3f, 0xae, 0x2d,
+	0x1c, 0x49, 0x0f, 0x83, 0x11, 0xd1, 0x84, 0x18, 0xd8, 0x8c, 0xfc, 0x71, 0x14, 0x06, 0xb5, 0xf2,
+	0x91, 0xd8, 0x58, 0x8c, 0x88, 0x26, 0xc4, 0x8c, 0xcd, 0x38, 0x1c, 0xf9, 0xe3, 0x5a, 0xe5, 0x68,
+	0x6c, 0x18, 0x11, 0x4d, 0x88, 0x45, 0x07, 0x55, 0xc7, 0x7e, 0x6f, 0x38, 0x1a, 0x87, 0xbd, 0x61,
+	0xbc, 0x57, 0x43, 0x8c, 0xd7, 0xea, 0x9c, 0xbc, 0xe8, 0x94, 0x92, 0x66, 0xd9, 0x88, 0x6b, 0xa8,
+	0x18, 0xfb, 0x41, 0xe4, 0xd7, 0xaa, 0x8c, 0xdf, 0x95, 0x79, 0x63, 0x17, 0x68, 0x28, 0x27, 0x05,
+	0x1e, 0x4f, 0xc2, 0x61, 0xcf, 0xaf, 0x2d, 0x1e, 0x89, 0x47, 0x07, 0x68, 0x28, 0x27, 0x95, 0xbe,
+	0x2d, 0xa0, 0xbc, 0xe3, 0x0d, 0x66, 0xeb, 0xe8, 0x02, 0xca, 0xcb, 0xea, 0x06, 0x16, 0xf8, 0xc2,
+	0xc2, 0x39, 0xbe, 0xe8, 0xe0, 0x3c, 0x54, 0x37, 0xc5, 0x34, 0x36, 0x70, 0x01, 0x40, 0x2a, 0x81,
+	0x6a, 0x59, 0x46, 0x05, 0xc3, 0x74, 0x0d, 0x5c, 0x02, 0x90, 0xe1, 0xb6, 0xf1, 0x02, 0x80, 0x2c,
+	0x6a, 0x1a, 0xb8, 0x0c, 0x20, 0x8b, 0x3a, 0xb8, 0xc2, 0x0a, 0xa0, 0x6b, 0x28, 0x0e, 0xaf, 0x90,
+	0x1d, 0x42, 0xd7, 0x70, 0x55, 0x2c, 0x22, 0x61, 0x93, 0x17, 0x47, 0xb9, 0xd9, 0xd4, 0x36, 0xf1,
+	0x92, 0x64, 0xa2, 0x12, 0x4f, 0x2f, 0x51, 0x44, 0xcb, 0x32, 0x4c, 0x09, 0x4e, 0x77, 0xaa, 0x18,
+	0x4c, 0x0a, 0x84, 0x36, 0x89, 0xe2, 0x68, 0x1d, 0x82, 0x05, 0x28, 0xc5, 0x5a, 0x3b, 0x03, 0xc9,
+	0x41, 0x2d, 0xb7, 0xa8, 0xd9, 0x82, 0x5a, 0x0c, 0x80, 0xbc, 0xf4, 0x67, 0x01, 0x15, 0x20, 0xd7,
+	0x00, 0x57, 0x91, 0x6d, 0x32, 0xcb, 0x4d, 0x56, 0x14, 0xd7, 0x96, 0x13, 0x6e, 0x4b, 0xa8, 0x22,
+	0xab, 0xa0, 0x99, 0x26, 0xeb, 0x38, 0xc7, 0xbb, 0x40, 0xdb, 0xd2, 0x49, 0x9b, 0x18, 0x0c, 0x23,
+	0x0f, 0x15, 0x5d, 0xe5, 0xd8, 0x05, 0x68, 0x30, 0x2d, 0x62, 0x68, 0x6c, 0x57, 0x64, 0x9a, 0x18,
+	0xb6, 0x43, 0x5d, 0x40, 0x96, 0x75, 0x5c, 0x9a, 0x36, 0xa0, 0x0e, 0xc1, 0x0b, 0x20, 0xcb, 0x30,
+	0xdb, 0x9a, 0xc1, 0xf7, 0x65, 0xf0, 0xb7, 0xb9, 0xa6, 0x6b, 0xf7, 0x5d, 0x82, 0x2b, 0x20, 0xd8,
+	0x92, 0xa9, 0xc3, 0x79, 0x21, 0x10, 0x6c, 0x51, 0x62, 0x99, 0xb6, 0x06, 0xbd, 0x4a, 0xd6, 0x71,
+	0x15, 0x9c, 0x41, 0x49, 0x53, 0x27, 0x9b, 0x5a, 0x87, 0x74, 0xc1, 0x0c, 0xbc, 0x08, 0x68, 0x94,
+	0xe8, 0x8c, 0x21, 0x07, 0x2d, 0x81, 0xcc, 0x4e, 0x2a, 0x73, 0x59, 0xfa, 0xa9, 0x80, 0x0a, 0x50,
+	0x25, 0x40, 0xb9, 0xa6, 0x49, 0xdb, 0x19, 0xd3, 0x17, 0x51, 0x59, 0x56, 0x41, 0x21, 0x59, 0x4f,
+	0x0c, 0x77, 0x37, 0x35, 0x5d, 0x93, 0xe9, 0x47, 0x38, 0x07, 0xc2, 0x32, 0x86, 0x3f, 0x24, 0x14,
+	0xe7, 0x19, 0x0b, 0xcd, 0x90, 0xf5, 0x2e, 0x31, 0x54, 0xcd, 0x68, 0xe1, 0x02, 0xf8, 0xa2, 0x45,
+	0xa8, 0x6b, 0xa8, 0xb8, 0x08, 0x6b, 0x4a, 0x64, 0x5d, 0xb3, 0xb9, 0xdd, 0x1a, 0x4d, 0x76, 0x0b,
+	0x70, 0xb4, 0xf6, 0xba, 0x49, 0x1d, 0x5c, 0x86, 0x63, 0xd7, 0x4d, 0xa3, 0xc5, 0x63, 0xc1, 0xa4,
+	0x2a, 0xa1, 0x18, 0x01, 0x76, 0x32, 0x0a, 0x2a, 0xb8, 0x2a, 0x11, 0x54, 0xe2, 0x35, 0x09, 0x74,
+	0x68, 0x11, 0x43, 0x25, 0x74, 0x56, 0xe9, 0x26, 0x69, 0x6b, 0x86, 0x66, 0x24, 0xa7, 0xd5, 0x96,
+	0x6d, 0xc5, 0xd5, 0x61, 0x9b, 0x63, 0xcd, 0x96, 0xb8, 0x0e, 0x28, 0x2b, 0x7d, 0x03, 0x15, 0xa0,
+	0x2a, 0x81, 0xd2, 0x6d, 0xd3, 0x54, 0x33, 0x2c, 0x4e, 0x21, 0xac, 0x98, 0x86, 0x9a, 0x38, 0xb6,
+	0x0b, 0x5f, 0xb1, 0x00, 0x87, 0xc3, 0xc2, 0x48, 0x4e, 0x82, 0x08, 0xf6, 0x86, 0xaa, 0x25, 0x8e,
+	0xcc, 0x83, 0xa7, 0x35, 0xc3, 0x21, 0x94, 0x9a, 0xad, 0xf4, 0xf4, 0xab, 0x68, 0x61, 0xc3, 0xe5,
+	0x31, 0x56, 0x84, 0xa0, 0xb3, 0xdd, 0xb5, 0x0d, 0x08, 0x6f, 0x00, 0x94, 0xa4, 0xbb, 0xa8, 0xc4,
+	0x6b, 0x1a, 0xd8, 0xc1, 0x67, 0x80, 0x59, 0x3b, 0x6c, 0xcd, 0x68, 0xb9, 0xba, 0x4c, 0xb1, 0xc0,
+	0x86, 0x16, 0xdd, 0xa5, 0x2c, 0xe4, 0x60, 0x76, 0x70, 0x65, 0x1d, 0xe7, 0x25, 0x07, 0x95, 0x78,
+	0x39, 0x03, 0x0e, 0x7c, 0xa8, 0xc9, 0x70, 0xa8, 0xa0, 0x62, 0x53, 0xa3, 0xb6, 0xc3, 0xc9, 0x6d,
+	0x02, 0x36, 0xe1, 0x1c, 0x80, 0x9d, 0x75, 0x8d, 0xaa, 0x38, 0x0f, 0x86, 0x4e, 0x03, 0x26, 0x19,
+	0x8a, 0x0a, 0xd2, 0x4d, 0x54, 0xe2, 0xd5, 0x8d, 0x71, 0xa5, 0xa6, 0x35, 0xa3, 0x17, 0x68, 0xc2,
+	0x60, 0xdc, 0x25, 0x86, 0xe9, 0x74, 0x93, 0x7d, 0x4e, 0xda, 0x40, 0xd5, 0x4c, 0x2d, 0x13, 0xcf,
+	0xa0, 0x93, 0x94, 0x28, 0x9a, 0x45, 0x4d, 0x45, 0x73, 0x3e, 0x9a, 0xcd, 0xa9, 0xf4, 0x03, 0x0b,
+	0x2d, 0xb0, 0xdf, 0x34, 0xba, 0x19, 0x58, 0x4e, 0x8a, 0x50, 0x91, 0xd5, 0x31, 0xf0, 0xab, 0x43,
+	0x8c, 0x99, 0x9c, 0x7c, 0x05, 0x9d, 0xc8, 0x1e, 0x10, 0xfb, 0xcc, 0xad, 0x6c, 0xba, 0x8e, 0x4b,
+	0x09, 0x77, 0x92, 0x25, 0xdb, 0x0e, 0xce, 0xc3, 0x21, 0x58, 0x94, 0xd8, 0x7c, 0x8a, 0x5b, 0x42,
+	0x95, 0x49, 0x2d, 0xc0, 0x45, 0x7e, 0xa9, 0x70, 0xd3, 0x7d, 0x49, 0x5a, 0x43, 0x45, 0x56, 0xf8,
+	0x40, 0x68, 0xc7, 0xd4, 0x14, 0x32, 0x6b, 0xb8, 0xac, 0x4c, 0x8b, 0x80, 0x22, 0xa7, 0x35, 0x21,
+	0xc7, 0x44, 0xc8, 0x69, 0x2d, 0xf9, 0x71, 0x19, 0x2d, 0xcf, 0x4e, 0x3e, 0xe2, 0x25, 0x84, 0x1f,
+	0xfb, 0x5e, 0xbf, 0x1b, 0xc3, 0x40, 0xd7, 0x1d, 0x06, 0x7d, 0xff, 0x29, 0x1b, 0x47, 0x8a, 0x74,
+	0x19, 0xe0, 0x6c, 0xce, 0xd3, 0x00, 0x2a, 0xaa, 0xa8, 0xb8, 0xed, 0x3d, 0xf2, 0xb7, 0x93, 0x61,
+	0xa3, 0x31, 0xef, 0x70, 0xd5, 0xd0, 0x81, 0x8a, 0x72, 0x62, 0xe9, 0x07, 0x0b, 0xa8, 0xc8, 0x00,
+	0xcf, 0x4c, 0xbe, 0xf2, 0xda, 0x1a, 0x25, 0x1d, 0x2c, 0xb0, 0x6a, 0x0a, 0xf9, 0xcb, 0x03, 0x42,
+	0x56, 0x3b, 0x8a, 0xce, 0x4b, 0x97, 0xac, 0x76, 0xda, 0xa6, 0x8a, 0x0b, 0xe0, 0x41, 0x19, 0x56,
+	0x45, 0x86, 0x60, 0x59, 0x26, 0xe4, 0x2d, 0x00, 0x1d, 0x07, 0x06, 0x5c, 0x28, 0xf6, 0xee, 0x26,
+	0x2f, 0x52, 0xb2, 0xbb, 0x09, 0xf6, 0xe3, 0x8a, 0x58, 0x42, 0x39, 0x45, 0xc1, 0x08, 0x48, 0x14,
+	0xc6, 0xbe, 0x3a, 0x69, 0x06, 0xac, 0x82, 0x2b, 0x90, 0x02, 0x78, 0x89, 0x39, 0x10, 0x96, 0x8c,
+	0x6c, 0x99, 0xb7, 0x09, 0x0b, 0x1f, 0x4f, 0xfb, 0x05, 0x06, 0x04, 0x55, 0xb3, 0x15, 0xd3, 0xa5,
+	0x36, 0xc1, 0x27, 0x58, 0xcc, 0x9b, 0x6b, 0x1b, 0x58, 0x84, 0x15, 0xd9, 0xb4, 0x74, 0x7c, 0x92,
+	0xd5, 0x56, 0x93, 0xd8, 0x0f, 0x34, 0x67, 0x1d, 0x9f, 0x02, 0xb8, 0x06, 0x18, 0xaf, 0xc0, 0xaa,
+	0x2d, 0xd3, 0x7b, 0xf8, 0x34, 0x70, 0x6b, 0x3f, 0x20, 0xf8, 0x0c, 0x5f, 0x74, 0x70, 0x8d, 0x35,
+	0x1f, 0xd2, 0xc2, 0xff, 0x05, 0x8a, 0x1a, 0x06, 0xae, 0x03, 0x13, 0xc3, 0x4a, 0x6c, 0x7e, 0x15,
+	0x34, 0x34, 0x98, 0x86, 0x67, 0x41, 0x01, 0x63, 0xa2, 0xe1, 0x6b, 0x69, 0xd7, 0x3a, 0x97, 0x99,
+	0xd7, 0xcf, 0x43, 0x67, 0xb2, 0xf0, 0x85, 0xa4, 0x32, 0xcb, 0x8e, 0xbc, 0xa9, 0xd9, 0xf8, 0x75,
+	0x1e, 0x0d, 0xd4, 0x01, 0x8e, 0x12, 0xeb, 0x68, 0xcc, 0x11, 0x17, 0x59, 0x48, 0x82, 0x86, 0x6f,
+	0xf0, 0x95, 0x6d, 0xe3, 0x37, 0x19, 0xae, 0x69, 0x3b, 0xa0, 0xd3, 0x5b, 0x49, 0xa4, 0x32, 0xec,
+	0xb7, 0x27, 0x1b, 0x63, 0x03, 0x5f, 0xe2, 0x49, 0x47, 0xc0, 0x33, 0xef, 0xf0, 0xb6, 0x49, 0x9a,
+	0xf8, 0x72, 0xb2, 0xb2, 0xf0, 0xbb, 0xfc, 0xe2, 0x60, 0x1a, 0x3a, 0xbe, 0x92, 0xf6, 0xd2, 0xab,
+	0x60, 0xa1, 0x65, 0xe3, 0x06, 0x58, 0x78, 0xdf, 0x95, 0x0d, 0xa6, 0xcf, 0x0a, 0x60, 0x52, 0x05,
+	0x96, 0xd7, 0xe0, 0x03, 0x5b, 0x52, 0xa2, 0xe3, 0xeb, 0xec, 0x83, 0x4a, 0x4d, 0x0b, 0xaf, 0x02,
+	0x0b, 0x10, 0xf0, 0x1e, 0xe8, 0x40, 0x49, 0xdb, 0x90, 0x0d, 0x07, 0xff, 0x37, 0x4f, 0x5a, 0xb0,
+	0xd3, 0x50, 0xdd, 0x36, 0xfe, 0x1f, 0x90, 0x4e, 0x4d, 0xd3, 0xc1, 0x37, 0x60, 0x65, 0x83, 0x73,
+	0xde, 0x67, 0x2b, 0xb7, 0xd9, 0xc4, 0x37, 0x61, 0xc5, 0x24, 0x7e, 0xc0, 0xea, 0x8d, 0x69, 0x69,
+	0x0a, 0xbe, 0xc5, 0x7a, 0x3a, 0x00, 0x6f, 0xcf, 0xf4, 0xa0, 0x3b, 0x80, 0xb2, 0xc9, 0xcc, 0xfe,
+	0x5f, 0x56, 0xa9, 0x5c, 0xd6, 0xe6, 0xff, 0x8f, 0x51, 0x6a, 0x8e, 0x4e, 0xf0, 0x87, 0xbc, 0x15,
+	0x75, 0xac, 0x75, 0xa0, 0xbe, 0x9b, 0x84, 0x1c, 0x64, 0x20, 0x96, 0x59, 0x74, 0xba, 0x9b, 0x9d,
+	0x0e, 0x5e, 0x83, 0xa5, 0xca, 0xa4, 0x2a, 0x80, 0xd2, 0x34, 0x29, 0xd1, 0x5a, 0x06, 0x56, 0xc1,
+	0x15, 0xf7, 0x1e, 0x60, 0xc2, 0x9a, 0x8b, 0x66, 0x3b, 0xb8, 0xc9, 0xc7, 0x91, 0xb6, 0x82, 0x5b,
+	0x2c, 0x00, 0xcc, 0x36, 0x8f, 0xcb, 0x75, 0x68, 0x06, 0xe9, 0x8e, 0x1d, 0xbc, 0xc6, 0x30, 0xdd,
+	0xb6, 0x82, 0x37, 0xc0, 0x2d, 0x8a, 0x69, 0xe1, 0x7b, 0xe0, 0x09, 0x55, 0xb3, 0x59, 0xdf, 0x26,
+	0x2a, 0xd6, 0x59, 0x2a, 0xd8, 0x16, 0x6e, 0x03, 0x6e, 0x0b, 0xc4, 0x1b, 0x6c, 0x05, 0x67, 0x6d,
+	0x82, 0x41, 0x9a, 0xd1, 0x04, 0xa8, 0xc5, 0xc2, 0x90, 0xd8, 0xf8, 0x3e, 0x8b, 0x33, 0x66, 0x30,
+	0x95, 0xfe, 0x2e, 0xa0, 0xa5, 0x99, 0x0b, 0xf4, 0x4b, 0x5f, 0xf8, 0xee, 0xce, 0x3c, 0x2b, 0x5c,
+	0x99, 0xf3, 0xbe, 0x9e, 0x7d, 0x5d, 0x98, 0xb9, 0xb0, 0xe7, 0x5f, 0xea, 0xe9, 0xe3, 0x5a, 0x72,
+	0xe5, 0xc6, 0x68, 0x31, 0x79, 0xc4, 0x39, 0xa8, 0x71, 0x20, 0x54, 0x52, 0xcc, 0x76, 0x1b, 0x6e,
+	0xdd, 0x52, 0x0b, 0x95, 0x53, 0x43, 0xc4, 0xda, 0xf4, 0x91, 0x89, 0xdf, 0xf0, 0x27, 0x4f, 0x4c,
+	0xaf, 0xa3, 0xc5, 0x47, 0xfe, 0x60, 0x18, 0x74, 0xc3, 0xad, 0xad, 0xc8, 0xe7, 0x97, 0xb1, 0x22,
+	0xad, 0x32, 0x98, 0xc9, 0x40, 0x92, 0x8e, 0x4e, 0x2b, 0xdb, 0x5e, 0x14, 0x0d, 0xb7, 0x86, 0x3d,
+	0xf6, 0x7c, 0xa6, 0x78, 0xb1, 0x3f, 0x08, 0xc7, 0x07, 0x3f, 0xc2, 0x9c, 0x43, 0xa8, 0x17, 0x06,
+	0x5b, 0xc3, 0x3e, 0x7b, 0xff, 0xe0, 0x77, 0xcb, 0x0c, 0x44, 0xfa, 0x91, 0x80, 0xce, 0xc8, 0x81,
+	0xb7, 0xbd, 0xf7, 0xa9, 0x3f, 0x35, 0xd4, 0xff, 0xfa, 0xae, 0x1f, 0xc5, 0xa2, 0x82, 0xca, 0xfd,
+	0xe4, 0x89, 0xec, 0xc5, 0xa7, 0x94, 0x3e, 0xa6, 0xad, 0xe5, 0xbf, 0x90, 0x73, 0x74, 0x42, 0x28,
+	0xde, 0x43, 0x4b, 0x7e, 0xd0, 0x0b, 0xfb, 0xc3, 0x60, 0xd0, 0xcd, 0x9c, 0xdb, 0x5b, 0xcf, 0x3b,
+	0x37, 0x8e, 0xce, 0x4e, 0x6c, 0xd1, 0xcf, 0xec, 0xa4, 0xdf, 0x0a, 0xa8, 0xf6, 0xac, 0xb6, 0xd1,
+	0x28, 0x84, 0x0e, 0x4a, 0x91, 0x98, 0x4a, 0xed, 0x4e, 0xcf, 0x57, 0x98, 0xff, 0x7c, 0x4f, 0xa4,
+	0xe4, 0xd3, 0x9b, 0x79, 0xf6, 0x21, 0x2f, 0x37, 0xfb, 0x90, 0x27, 0xde, 0xe5, 0x61, 0x04, 0x6e,
+	0x8c, 0x92, 0x57, 0x2a, 0xe9, 0xf9, 0x62, 0x00, 0x95, 0x4e, 0x89, 0xa4, 0x9f, 0x0b, 0xe8, 0xb5,
+	0xc4, 0x1c, 0x1e, 0xac, 0xff, 0x01, 0x47, 0xf0, 0x29, 0x3a, 0x77, 0x98, 0xca, 0xc9, 0x39, 0xdc,
+	0x41, 0x65, 0x80, 0xc5, 0x43, 0x3f, 0xaa, 0x09, 0xcc, 0x2d, 0x17, 0x5e, 0x94, 0xa4, 0x74, 0x42,
+	0xf1, 0x3c, 0x8f, 0x4b, 0x3f, 0x14, 0xd0, 0xe9, 0xac, 0xf0, 0xa1, 0x1f, 0x7d, 0x75, 0x1d, 0x15,
+	0x4d, 0x12, 0x6b, 0xaa, 0xeb, 0xbf, 0xdc, 0x43, 0xdf, 0x17, 0xd0, 0xa9, 0x34, 0x41, 0xf6, 0x82,
+	0xd8, 0x7b, 0xfa, 0xd5, 0xf5, 0xcf, 0x4f, 0x04, 0xf4, 0xca, 0x3e, 0x55, 0x13, 0xf7, 0xcc, 0x24,
+	0x96, 0xf0, 0x12, 0x89, 0x25, 0xbe, 0x8f, 0x4a, 0x6c, 0x08, 0x8d, 0x6a, 0x39, 0x46, 0x7e, 0xfe,
+	0x39, 0xdd, 0x05, 0xf0, 0x68, 0x82, 0x3e, 0xe3, 0xdb, 0xfc, 0x3e, 0xdf, 0x3e, 0x44, 0x27, 0x93,
+	0xc2, 0xbb, 0x07, 0x95, 0xfc, 0xcb, 0xf4, 0xac, 0xf4, 0x18, 0x9d, 0x9a, 0xe5, 0x9d, 0xb8, 0xc2,
+	0x42, 0xa8, 0xc7, 0xcb, 0xfb, 0x34, 0x56, 0xae, 0x1d, 0xce, 0xfe, 0xe0, 0xc6, 0x40, 0x33, 0x3c,
+	0xa4, 0xbf, 0xe6, 0xd1, 0x49, 0x99, 0xff, 0xf4, 0xe2, 0x7f, 0xd9, 0x66, 0x88, 0x0f, 0x50, 0x79,
+	0xcb, 0xf7, 0xe2, 0xdd, 0xb1, 0x1f, 0x25, 0xcf, 0xb0, 0x37, 0x0e, 0x67, 0x72, 0x80, 0x16, 0x8d,
+	0x66, 0x42, 0x9d, 0x30, 0x4e, 0x99, 0x3d, 0x1b, 0x79, 0xf9, 0x97, 0x8f, 0xbc, 0xfa, 0x5f, 0x04,
+	0x54, 0x4e, 0x05, 0x89, 0x6f, 0xa2, 0x65, 0xff, 0x69, 0x3c, 0xf6, 0x7a, 0x71, 0x37, 0x62, 0x61,
+	0xc8, 0xac, 0x2f, 0xd3, 0xa5, 0x04, 0xca, 0x63, 0x53, 0x7c, 0x07, 0xe1, 0x14, 0x6d, 0x92, 0xba,
+	0x39, 0x86, 0x78, 0x3c, 0x81, 0xa7, 0x59, 0x2e, 0xde, 0x41, 0xf5, 0x14, 0xf5, 0x80, 0x7e, 0x94,
+	0x67, 0x44, 0xb5, 0x04, 0x43, 0x7d, 0xa6, 0xe3, 0xdc, 0x44, 0xb5, 0x19, 0x41, 0x7b, 0x19, 0xda,
+	0x02, 0xa3, 0x3d, 0x9d, 0x15, 0x38, 0xad, 0xbf, 0xe2, 0x45, 0xb4, 0xd4, 0x4b, 0x62, 0xa8, 0xcb,
+	0x26, 0xab, 0x12, 0x43, 0x5f, 0xec, 0x65, 0x02, 0x4b, 0xfa, 0x4e, 0x1e, 0x0a, 0x44, 0xd6, 0xf1,
+	0xff, 0xfe, 0xa4, 0xcb, 0x96, 0xc3, 0xfc, 0x91, 0xcb, 0xe1, 0xc1, 0x6d, 0xbf, 0xf0, 0xa5, 0xb5,
+	0xfd, 0xe2, 0xbe, 0xb6, 0x3f, 0x9b, 0x92, 0xa5, 0x7f, 0x3e, 0x25, 0x2f, 0xdf, 0x44, 0x8b, 0xd9,
+	0x68, 0xe5, 0x53, 0xbb, 0x41, 0xf0, 0x31, 0x58, 0xb9, 0x4e, 0xf3, 0x26, 0xbf, 0xc8, 0xba, 0x4e,
+	0xf3, 0xfa, 0x0d, 0x7e, 0x91, 0x75, 0x9d, 0xe6, 0x7b, 0xab, 0x38, 0xbf, 0xfa, 0x33, 0x84, 0x8e,
+	0xeb, 0x89, 0x30, 0x9b, 0xff, 0x06, 0x2b, 0xfe, 0x46, 0x40, 0x78, 0xff, 0x8c, 0x24, 0x5e, 0x7f,
+	0x5e, 0x1a, 0x1e, 0x38, 0xfd, 0xd5, 0x57, 0x8f, 0x42, 0xc2, 0x83, 0x48, 0x6a, 0x7f, 0x2e, 0x9f,
+	0x4e, 0xbd, 0x79, 0x65, 0x26, 0x61, 0x3f, 0x97, 0x27, 0x55, 0xe2, 0x9b, 0xbf, 0xff, 0xc3, 0x77,
+	0x73, 0x17, 0xa5, 0x73, 0x2b, 0x4f, 0xae, 0xaf, 0xa4, 0xb0, 0xe8, 0x96, 0xb7, 0x8f, 0xe7, 0x2d,
+	0xe1, 0xb2, 0xf8, 0x6b, 0x01, 0x1d, 0xdf, 0xd7, 0x43, 0xc5, 0x6b, 0x2f, 0x54, 0x6b, 0xdf, 0x68,
+	0x50, 0xbf, 0x7e, 0x04, 0x8a, 0xc4, 0x0e, 0x7d, 0x6e, 0x3b, 0x24, 0xe9, 0xb5, 0x03, 0xed, 0x48,
+	0x59, 0x82, 0x19, 0x5f, 0xec, 0x1b, 0x5b, 0x32, 0x39, 0xfb, 0xfe, 0x7c, 0xba, 0x3d, 0x33, 0x18,
+	0xd6, 0x6f, 0x1e, 0x9d, 0x30, 0xb1, 0xcd, 0x9e, 0xdb, 0xb6, 0x77, 0xa4, 0x37, 0x0e, 0xb7, 0x6d,
+	0x6f, 0xe6, 0xa4, 0x7e, 0x29, 0xa0, 0xa5, 0x99, 0x66, 0x2e, 0x36, 0x5e, 0x1c, 0x3e, 0xd9, 0x01,
+	0xa5, 0xbe, 0x32, 0x37, 0x7e, 0x62, 0xc7, 0xc6, 0xdc, 0x76, 0x5c, 0x90, 0x5e, 0x3d, 0x38, 0xd6,
+	0x18, 0x43, 0x50, 0xff, 0x7b, 0x02, 0x5a, 0xcc, 0xf6, 0x5f, 0xf1, 0xea, 0x0b, 0x13, 0x3a, 0x3b,
+	0x03, 0xd4, 0x1b, 0xf3, 0xa2, 0x27, 0xba, 0x5f, 0xdb, 0xaf, 0xe2, 0x79, 0xa9, 0x3e, 0xab, 0x62,
+	0xb6, 0x68, 0x83, 0x86, 0x9f, 0x09, 0x68, 0x31, 0x5b, 0xb7, 0x9f, 0xa7, 0xe1, 0x01, 0x8d, 0xb5,
+	0xde, 0x98, 0x17, 0x3d, 0xd1, 0xf0, 0xff, 0x3f, 0x97, 0xcf, 0x4f, 0xbc, 0x9b, 0xb6, 0xe1, 0xfd,
+	0x6e, 0x3e, 0xf1, 0x0c, 0xc6, 0xc1, 0xc6, 0x78, 0x19, 0x09, 0xb7, 0x84, 0xcb, 0xf5, 0x4f, 0x3f,
+	0x93, 0xcf, 0x4c, 0x34, 0xe0, 0x7a, 0x79, 0xa3, 0x61, 0xd4, 0xe8, 0x85, 0x3b, 0xbf, 0x93, 0xbf,
+	0xf6, 0x38, 0x8e, 0x47, 0xd1, 0xad, 0x95, 0x95, 0x4f, 0x3e, 0xf9, 0x64, 0xdf, 0xc7, 0x15, 0x6f,
+	0x37, 0x7e, 0xcc, 0xff, 0x87, 0x72, 0x35, 0xa5, 0xbf, 0x32, 0x1f, 0xfa, 0x68, 0xdb, 0x8b, 0xb7,
+	0xc2, 0xf1, 0xce, 0xda, 0x53, 0x74, 0xb6, 0x17, 0xee, 0x1c, 0xea, 0x8d, 0xb5, 0x53, 0xfb, 0xea,
+	0xa9, 0x35, 0x0e, 0xe3, 0xd0, 0x12, 0x1e, 0xde, 0x4d, 0x28, 0x06, 0x21, 0x60, 0x37, 0xc2, 0xf1,
+	0x60, 0x65, 0xe0, 0x07, 0xec, 0xef, 0x27, 0x2b, 0x53, 0xb1, 0xcf, 0xfe, 0x49, 0xe6, 0x76, 0xba,
+	0x7e, 0x54, 0x62, 0xc8, 0xef, 0xfd, 0x23, 0x00, 0x00, 0xff, 0xff, 0x11, 0x69, 0x57, 0x10, 0x50,
+	0x23, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2958,207 +3161,3 @@ var _LanguageService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/language/v1/language_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/language/v1/language_service.proto", fileDescriptor_language_service_5dd1bad015472f8e)
-}
-
-var fileDescriptor_language_service_5dd1bad015472f8e = []byte{
-	// 3123 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3a, 0xcb, 0x8f, 0xdb, 0xc6,
-	0xdd, 0xa6, 0x5e, 0x2b, 0x8d, 0x76, 0xd7, 0x63, 0xda, 0xb1, 0xf5, 0x29, 0x8e, 0xed, 0xd0, 0x79,
-	0x38, 0x8e, 0xad, 0xb5, 0x37, 0xdf, 0xe7, 0x38, 0xb6, 0xbf, 0x2f, 0xe6, 0x92, 0x23, 0x2d, 0xd7,
-	0x14, 0x49, 0x0f, 0x49, 0x79, 0xe3, 0x0f, 0x85, 0x40, 0x4b, 0x5c, 0x59, 0xc8, 0x2e, 0xa9, 0x8a,
-	0x5c, 0xc7, 0x9b, 0x4b, 0x81, 0x02, 0x3d, 0xf6, 0x50, 0xf4, 0x0f, 0xe8, 0xb5, 0x2f, 0xf4, 0x71,
-	0x2c, 0xd0, 0x43, 0x0f, 0x3d, 0x14, 0x41, 0x4f, 0xed, 0x2d, 0xa7, 0x1c, 0x7a, 0xeb, 0xbd, 0x68,
-	0x81, 0xb6, 0x28, 0x7e, 0x33, 0xa4, 0x44, 0xad, 0x77, 0x6d, 0xad, 0x9b, 0xa2, 0xe9, 0x6d, 0xe6,
-	0xc7, 0xdf, 0x7b, 0x7e, 0xaf, 0x19, 0x09, 0xad, 0x0c, 0xc2, 0x70, 0xb0, 0xed, 0xaf, 0xf4, 0xb6,
-	0xc3, 0xdd, 0xfe, 0xca, 0xb6, 0x17, 0x0c, 0x76, 0xbd, 0x81, 0xbf, 0xf2, 0xe4, 0xfa, 0x64, 0xdd,
-	0x8d, 0xfc, 0xf1, 0x93, 0x61, 0xcf, 0x6f, 0x8c, 0xc6, 0x61, 0x1c, 0x8a, 0x35, 0x4e, 0xd0, 0x60,
-	0x04, 0x8d, 0x14, 0xa9, 0xf1, 0xe4, 0x7a, 0xfd, 0x6c, 0xc2, 0xca, 0x1b, 0x0d, 0x57, 0xbc, 0x20,
-	0x08, 0x63, 0x2f, 0x1e, 0x86, 0x41, 0xc4, 0xe9, 0xea, 0x67, 0x32, 0x5f, 0x7b, 0xdb, 0x43, 0x3f,
-	0x88, 0x93, 0x0f, 0xe7, 0x33, 0x1f, 0xb6, 0x86, 0xfe, 0x76, 0xbf, 0xfb, 0xc8, 0x7f, 0xec, 0x3d,
-	0x19, 0x86, 0x63, 0x8e, 0x20, 0xfd, 0x51, 0x40, 0x65, 0x35, 0xec, 0xed, 0xee, 0xf8, 0x41, 0x2c,
-	0xde, 0x46, 0x85, 0x78, 0x6f, 0xe4, 0xd7, 0x84, 0x0b, 0xc2, 0xa5, 0xe5, 0xd5, 0xb7, 0x1b, 0x87,
-	0x69, 0xd3, 0x48, 0x29, 0x1a, 0xce, 0xde, 0xc8, 0xa7, 0x8c, 0x48, 0xac, 0xa3, 0x85, 0x5e, 0x18,
-	0xc4, 0x7e, 0x10, 0xd7, 0x72, 0x17, 0x84, 0x4b, 0x95, 0xf5, 0x63, 0x34, 0x05, 0x88, 0x97, 0xd0,
-	0xf1, 0x41, 0x2f, 0xea, 0x26, 0xdb, 0xee, 0xee, 0x78, 0x58, 0xcb, 0x27, 0x38, 0x4b, 0x83, 0x5e,
-	0xa4, 0x70, 0xb8, 0x3b, 0x1e, 0x8a, 0x75, 0x54, 0x4e, 0x05, 0xd5, 0x0a, 0x80, 0x42, 0x27, 0x7b,
-	0xe9, 0x06, 0x2a, 0x80, 0x3c, 0xf1, 0x14, 0xc2, 0xce, 0x47, 0x16, 0xe9, 0xba, 0x86, 0x6d, 0x11,
-	0x45, 0x6b, 0x6a, 0x44, 0xc5, 0xc7, 0xc4, 0x65, 0x84, 0x2c, 0x5d, 0xd6, 0x8c, 0xae, 0x43, 0x36,
-	0x1d, 0x2c, 0x88, 0x65, 0x54, 0x58, 0x77, 0xda, 0x3a, 0xce, 0xad, 0x95, 0x51, 0x29, 0x0a, 0x77,
-	0xc7, 0x3d, 0x5f, 0xfa, 0x96, 0x80, 0xca, 0xb6, 0x0f, 0xc2, 0x7a, 0xbe, 0x78, 0x03, 0x15, 0x62,
-	0xff, 0x69, 0xcc, 0xac, 0xad, 0xae, 0x4a, 0x87, 0x5b, 0xeb, 0xf8, 0x4f, 0x63, 0x7b, 0xe4, 0x05,
-	0x94, 0xe1, 0x8b, 0x32, 0xaa, 0x44, 0x7e, 0x10, 0x0f, 0x77, 0x52, 0x53, 0xab, 0xab, 0x17, 0x0f,
-	0x27, 0xb6, 0x53, 0x54, 0x3a, 0xa5, 0x92, 0x7e, 0x55, 0x40, 0x25, 0x12, 0xc4, 0xc3, 0x78, 0x4f,
-	0x14, 0x51, 0x21, 0xf0, 0x76, 0xb8, 0xcf, 0x2b, 0x94, 0xad, 0xc5, 0x0f, 0x92, 0x73, 0xc8, 0xb1,
-	0x73, 0x78, 0xf3, 0x70, 0xe6, 0x9c, 0x47, 0xf6, 0x14, 0x36, 0x50, 0x79, 0xc7, 0x8f, 0xbd, 0xbe,
-	0x17, 0x7b, 0xb5, 0xfc, 0x85, 0xfc, 0xa5, 0xea, 0x6a, 0xe3, 0x85, 0xe4, 0xed, 0x84, 0x80, 0x04,
-	0xf1, 0x78, 0x8f, 0x4e, 0xe8, 0xe1, 0x2c, 0x22, 0x0f, 0xa2, 0xa9, 0xc7, 0xcf, 0x22, 0x47, 0x27,
-	0x7b, 0x51, 0x01, 0x39, 0x01, 0x8b, 0xc1, 0x5a, 0x91, 0xc9, 0x79, 0xfb, 0x45, 0x72, 0xda, 0x1c,
-	0x9f, 0x4e, 0x08, 0x67, 0x3d, 0x59, 0x7a, 0x19, 0x4f, 0xd6, 0x6f, 0xa3, 0xa5, 0x19, 0xf5, 0x45,
-	0x8c, 0xf2, 0x1f, 0xfb, 0x7b, 0x89, 0x3b, 0x61, 0x29, 0x9e, 0x42, 0xc5, 0x27, 0xde, 0xf6, 0x2e,
-	0x77, 0x67, 0x85, 0xf2, 0xcd, 0xad, 0xdc, 0x4d, 0x41, 0xfa, 0x85, 0x90, 0x44, 0x54, 0x15, 0x2d,
-	0xb8, 0xc6, 0x3d, 0xc3, 0x7c, 0x60, 0xe0, 0x63, 0x22, 0x42, 0x25, 0x8b, 0x50, 0xdb, 0x34, 0xb0,
-	0x20, 0x2e, 0xa2, 0xb2, 0x6e, 0x2a, 0xb2, 0xa3, 0x99, 0x06, 0xce, 0x89, 0x18, 0x2d, 0x9a, 0xb4,
-	0x25, 0x1b, 0xda, 0x43, 0x0e, 0xc9, 0x8b, 0x15, 0x54, 0x24, 0x1d, 0x62, 0x38, 0xb8, 0x20, 0x1e,
-	0x47, 0xd5, 0x07, 0x26, 0xbd, 0xd7, 0x35, 0x9b, 0x5d, 0x99, 0x3a, 0xb8, 0x28, 0x9e, 0x40, 0x4b,
-	0x8a, 0x69, 0xd8, 0x6e, 0x9b, 0xd0, 0x6e, 0xcb, 0x34, 0x55, 0x5c, 0x02, 0x74, 0xd3, 0x59, 0x27,
-	0x14, 0x2f, 0x00, 0x2f, 0x6b, 0xdd, 0x34, 0x48, 0xd7, 0x70, 0xdb, 0x6b, 0x84, 0xe2, 0x0a, 0x28,
-	0x21, 0xab, 0x2a, 0x25, 0xb6, 0x8d, 0x11, 0x44, 0xaf, 0x2a, 0x3b, 0x04, 0x57, 0x41, 0x9d, 0x04,
-	0x65, 0x11, 0xe8, 0x2d, 0xaa, 0x29, 0x04, 0x2f, 0x49, 0x7f, 0x12, 0x50, 0xd1, 0x09, 0x3f, 0xf6,
-	0x83, 0x97, 0x8e, 0x63, 0x1d, 0x2d, 0x8f, 0xbc, 0x71, 0xdc, 0x0d, 0xb7, 0xba, 0xd1, 0xc8, 0xf7,
-	0x7b, 0x8f, 0x93, 0x60, 0x7e, 0xeb, 0x70, 0x0e, 0x96, 0x37, 0x8e, 0xcd, 0x2d, 0x9b, 0x61, 0xd3,
-	0xc5, 0x51, 0x66, 0x27, 0xde, 0x47, 0xc7, 0xfb, 0xfe, 0xc8, 0x0f, 0xfa, 0x7e, 0xd0, 0xdb, 0xeb,
-	0xfa, 0xfd, 0x81, 0xcf, 0x52, 0xbc, 0xba, 0x7a, 0xe9, 0x39, 0x65, 0x64, 0x42, 0x40, 0xfa, 0x03,
-	0x9f, 0x2e, 0xf7, 0x67, 0xf6, 0x70, 0x70, 0xdb, 0xfe, 0xce, 0x8e, 0x97, 0x14, 0x02, 0xbe, 0x91,
-	0x3e, 0x44, 0x95, 0x49, 0x24, 0x88, 0x67, 0x51, 0x65, 0xc7, 0x1b, 0x04, 0xc3, 0x78, 0xb7, 0xcf,
-	0xcf, 0x37, 0x47, 0xa7, 0x00, 0x60, 0x10, 0xf5, 0xc2, 0x31, 0xd7, 0x24, 0x47, 0xf9, 0x46, 0xfa,
-	0x1b, 0xb8, 0x3e, 0xab, 0xfa, 0x1d, 0x94, 0x8f, 0xbd, 0x41, 0x52, 0xf5, 0x2e, 0xcf, 0x67, 0x7d,
-	0xc3, 0xf1, 0x06, 0x14, 0xc8, 0x44, 0x82, 0x4a, 0x5e, 0x34, 0xf2, 0x7b, 0x71, 0x92, 0xae, 0x57,
-	0xe7, 0x64, 0x20, 0x33, 0x22, 0x9a, 0x10, 0x8b, 0x1f, 0xa2, 0x42, 0xcf, 0x8b, 0xb8, 0xaa, 0xcb,
-	0xab, 0xef, 0xce, 0xc9, 0x44, 0xf1, 0x22, 0x9f, 0x32, 0x42, 0x60, 0xb0, 0x15, 0x8e, 0x77, 0x98,
-	0xb3, 0xe6, 0x67, 0xd0, 0x0c, 0xc7, 0x3b, 0x94, 0x11, 0x82, 0x21, 0x03, 0x70, 0xff, 0xb8, 0x56,
-	0x3c, 0x92, 0x21, 0x2d, 0x46, 0x44, 0x13, 0x62, 0xd0, 0x63, 0x27, 0x0c, 0xfb, 0x2c, 0x9f, 0xe7,
-	0xd7, 0xa3, 0x1d, 0x86, 0x7d, 0xca, 0x08, 0x41, 0x8f, 0x60, 0x77, 0xe7, 0x91, 0x3f, 0xae, 0x2d,
-	0x1c, 0x49, 0x0f, 0x83, 0x11, 0xd1, 0x84, 0x18, 0xd8, 0x8c, 0xfc, 0x71, 0x14, 0x06, 0xb5, 0xf2,
-	0x91, 0xd8, 0x58, 0x8c, 0x88, 0x26, 0xc4, 0x8c, 0xcd, 0x38, 0x1c, 0xf9, 0xe3, 0x5a, 0xe5, 0x68,
-	0x6c, 0x18, 0x11, 0x4d, 0x88, 0x45, 0x07, 0x55, 0xc7, 0x7e, 0x6f, 0x38, 0x1a, 0x87, 0xbd, 0x61,
-	0xbc, 0x57, 0x43, 0x8c, 0xd7, 0xea, 0x9c, 0xbc, 0xe8, 0x94, 0x92, 0x66, 0xd9, 0x88, 0x6b, 0xa8,
-	0x18, 0xfb, 0x41, 0xe4, 0xd7, 0xaa, 0x8c, 0xdf, 0x95, 0x79, 0x63, 0x17, 0x68, 0x28, 0x27, 0x05,
-	0x1e, 0x4f, 0xc2, 0x61, 0xcf, 0xaf, 0x2d, 0x1e, 0x89, 0x47, 0x07, 0x68, 0x28, 0x27, 0x95, 0xbe,
-	0x2d, 0xa0, 0xbc, 0xe3, 0x0d, 0x66, 0xeb, 0xe8, 0x02, 0xca, 0xcb, 0xea, 0x06, 0x16, 0xf8, 0xc2,
-	0xc2, 0x39, 0xbe, 0xe8, 0xe0, 0x3c, 0x54, 0x37, 0xc5, 0x34, 0x36, 0x70, 0x01, 0x40, 0x2a, 0x81,
-	0x6a, 0x59, 0x46, 0x05, 0xc3, 0x74, 0x0d, 0x5c, 0x02, 0x90, 0xe1, 0xb6, 0xf1, 0x02, 0x80, 0x2c,
-	0x6a, 0x1a, 0xb8, 0x0c, 0x20, 0x8b, 0x3a, 0xb8, 0xc2, 0x0a, 0xa0, 0x6b, 0x28, 0x0e, 0xaf, 0x90,
-	0x1d, 0x42, 0xd7, 0x70, 0x55, 0x2c, 0x22, 0x61, 0x93, 0x17, 0x47, 0xb9, 0xd9, 0xd4, 0x36, 0xf1,
-	0x92, 0x64, 0xa2, 0x12, 0x4f, 0x2f, 0x51, 0x44, 0xcb, 0x32, 0x4c, 0x09, 0x4e, 0x77, 0xaa, 0x18,
-	0x4c, 0x0a, 0x84, 0x36, 0x89, 0xe2, 0x68, 0x1d, 0x82, 0x05, 0x28, 0xc5, 0x5a, 0x3b, 0x03, 0xc9,
-	0x41, 0x2d, 0xb7, 0xa8, 0xd9, 0x82, 0x5a, 0x0c, 0x80, 0xbc, 0xf4, 0x67, 0x01, 0x15, 0x20, 0xd7,
-	0x00, 0x57, 0x91, 0x6d, 0x32, 0xcb, 0x4d, 0x56, 0x14, 0xd7, 0x96, 0x13, 0x6e, 0x4b, 0xa8, 0x22,
-	0xab, 0xa0, 0x99, 0x26, 0xeb, 0x38, 0xc7, 0xbb, 0x40, 0xdb, 0xd2, 0x49, 0x9b, 0x18, 0x0c, 0x23,
-	0x0f, 0x15, 0x5d, 0xe5, 0xd8, 0x05, 0x68, 0x30, 0x2d, 0x62, 0x68, 0x6c, 0x57, 0x64, 0x9a, 0x18,
-	0xb6, 0x43, 0x5d, 0x40, 0x96, 0x75, 0x5c, 0x9a, 0x36, 0xa0, 0x0e, 0xc1, 0x0b, 0x20, 0xcb, 0x30,
-	0xdb, 0x9a, 0xc1, 0xf7, 0x65, 0xf0, 0xb7, 0xb9, 0xa6, 0x6b, 0xf7, 0x5d, 0x82, 0x2b, 0x20, 0xd8,
-	0x92, 0xa9, 0xc3, 0x79, 0x21, 0x10, 0x6c, 0x51, 0x62, 0x99, 0xb6, 0x06, 0xbd, 0x4a, 0xd6, 0x71,
-	0x15, 0x9c, 0x41, 0x49, 0x53, 0x27, 0x9b, 0x5a, 0x87, 0x74, 0xc1, 0x0c, 0xbc, 0x08, 0x68, 0x94,
-	0xe8, 0x8c, 0x21, 0x07, 0x2d, 0x81, 0xcc, 0x4e, 0x2a, 0x73, 0x59, 0xfa, 0xa9, 0x80, 0x0a, 0x50,
-	0x25, 0x40, 0xb9, 0xa6, 0x49, 0xdb, 0x19, 0xd3, 0x17, 0x51, 0x59, 0x56, 0x41, 0x21, 0x59, 0x4f,
-	0x0c, 0x77, 0x37, 0x35, 0x5d, 0x93, 0xe9, 0x47, 0x38, 0x07, 0xc2, 0x32, 0x86, 0x3f, 0x24, 0x14,
-	0xe7, 0x19, 0x0b, 0xcd, 0x90, 0xf5, 0x2e, 0x31, 0x54, 0xcd, 0x68, 0xe1, 0x02, 0xf8, 0xa2, 0x45,
-	0xa8, 0x6b, 0xa8, 0xb8, 0x08, 0x6b, 0x4a, 0x64, 0x5d, 0xb3, 0xb9, 0xdd, 0x1a, 0x4d, 0x76, 0x0b,
-	0x70, 0xb4, 0xf6, 0xba, 0x49, 0x1d, 0x5c, 0x86, 0x63, 0xd7, 0x4d, 0xa3, 0xc5, 0x63, 0xc1, 0xa4,
-	0x2a, 0xa1, 0x18, 0x01, 0x76, 0x32, 0x0a, 0x2a, 0xb8, 0x2a, 0x11, 0x54, 0xe2, 0x35, 0x09, 0x74,
-	0x68, 0x11, 0x43, 0x25, 0x74, 0x56, 0xe9, 0x26, 0x69, 0x6b, 0x86, 0x66, 0x24, 0xa7, 0xd5, 0x96,
-	0x6d, 0xc5, 0xd5, 0x61, 0x9b, 0x63, 0xcd, 0x96, 0xb8, 0x0e, 0x28, 0x2b, 0x7d, 0x03, 0x15, 0xa0,
-	0x2a, 0x81, 0xd2, 0x6d, 0xd3, 0x54, 0x33, 0x2c, 0x4e, 0x21, 0xac, 0x98, 0x86, 0x9a, 0x38, 0xb6,
-	0x0b, 0x5f, 0xb1, 0x00, 0x87, 0xc3, 0xc2, 0x48, 0x4e, 0x82, 0x08, 0xf6, 0x86, 0xaa, 0x25, 0x8e,
-	0xcc, 0x83, 0xa7, 0x35, 0xc3, 0x21, 0x94, 0x9a, 0xad, 0xf4, 0xf4, 0xab, 0x68, 0x61, 0xc3, 0xe5,
-	0x31, 0x56, 0x84, 0xa0, 0xb3, 0xdd, 0xb5, 0x0d, 0x08, 0x6f, 0x00, 0x94, 0xa4, 0xbb, 0xa8, 0xc4,
-	0x6b, 0x1a, 0xd8, 0xc1, 0x67, 0x80, 0x59, 0x3b, 0x6c, 0xcd, 0x68, 0xb9, 0xba, 0x4c, 0xb1, 0xc0,
-	0x86, 0x16, 0xdd, 0xa5, 0x2c, 0xe4, 0x60, 0x76, 0x70, 0x65, 0x1d, 0xe7, 0x25, 0x07, 0x95, 0x78,
-	0x39, 0x03, 0x0e, 0x7c, 0xa8, 0xc9, 0x70, 0xa8, 0xa0, 0x62, 0x53, 0xa3, 0xb6, 0xc3, 0xc9, 0x6d,
-	0x02, 0x36, 0xe1, 0x1c, 0x80, 0x9d, 0x75, 0x8d, 0xaa, 0x38, 0x0f, 0x86, 0x4e, 0x03, 0x26, 0x19,
-	0x8a, 0x0a, 0xd2, 0x4d, 0x54, 0xe2, 0xd5, 0x8d, 0x71, 0xa5, 0xa6, 0x35, 0xa3, 0x17, 0x68, 0xc2,
-	0x60, 0xdc, 0x25, 0x86, 0xe9, 0x74, 0x93, 0x7d, 0x4e, 0xda, 0x40, 0xd5, 0x4c, 0x2d, 0x13, 0xcf,
-	0xa0, 0x93, 0x94, 0x28, 0x9a, 0x45, 0x4d, 0x45, 0x73, 0x3e, 0x9a, 0xcd, 0xa9, 0xf4, 0x03, 0x0b,
-	0x2d, 0xb0, 0xdf, 0x34, 0xba, 0x19, 0x58, 0x4e, 0x8a, 0x50, 0x91, 0xd5, 0x31, 0xf0, 0xab, 0x43,
-	0x8c, 0x99, 0x9c, 0x7c, 0x05, 0x9d, 0xc8, 0x1e, 0x10, 0xfb, 0xcc, 0xad, 0x6c, 0xba, 0x8e, 0x4b,
-	0x09, 0x77, 0x92, 0x25, 0xdb, 0x0e, 0xce, 0xc3, 0x21, 0x58, 0x94, 0xd8, 0x7c, 0x8a, 0x5b, 0x42,
-	0x95, 0x49, 0x2d, 0xc0, 0x45, 0x7e, 0xa9, 0x70, 0xd3, 0x7d, 0x49, 0x5a, 0x43, 0x45, 0x56, 0xf8,
-	0x40, 0x68, 0xc7, 0xd4, 0x14, 0x32, 0x6b, 0xb8, 0xac, 0x4c, 0x8b, 0x80, 0x22, 0xa7, 0x35, 0x21,
-	0xc7, 0x44, 0xc8, 0x69, 0x2d, 0xf9, 0x71, 0x19, 0x2d, 0xcf, 0x4e, 0x3e, 0xe2, 0x25, 0x84, 0x1f,
-	0xfb, 0x5e, 0xbf, 0x1b, 0xc3, 0x40, 0xd7, 0x1d, 0x06, 0x7d, 0xff, 0x29, 0x1b, 0x47, 0x8a, 0x74,
-	0x19, 0xe0, 0x6c, 0xce, 0xd3, 0x00, 0x2a, 0xaa, 0xa8, 0xb8, 0xed, 0x3d, 0xf2, 0xb7, 0x93, 0x61,
-	0xa3, 0x31, 0xef, 0x70, 0xd5, 0xd0, 0x81, 0x8a, 0x72, 0x62, 0xe9, 0x07, 0x0b, 0xa8, 0xc8, 0x00,
-	0xcf, 0x4c, 0xbe, 0xf2, 0xda, 0x1a, 0x25, 0x1d, 0x2c, 0xb0, 0x6a, 0x0a, 0xf9, 0xcb, 0x03, 0x42,
-	0x56, 0x3b, 0x8a, 0xce, 0x4b, 0x97, 0xac, 0x76, 0xda, 0xa6, 0x8a, 0x0b, 0xe0, 0x41, 0x19, 0x56,
-	0x45, 0x86, 0x60, 0x59, 0x26, 0xe4, 0x2d, 0x00, 0x1d, 0x07, 0x06, 0x5c, 0x28, 0xf6, 0xee, 0x26,
-	0x2f, 0x52, 0xb2, 0xbb, 0x09, 0xf6, 0xe3, 0x8a, 0x58, 0x42, 0x39, 0x45, 0xc1, 0x08, 0x48, 0x14,
-	0xc6, 0xbe, 0x3a, 0x69, 0x06, 0xac, 0x82, 0x2b, 0x90, 0x02, 0x78, 0x89, 0x39, 0x10, 0x96, 0x8c,
-	0x6c, 0x99, 0xb7, 0x09, 0x0b, 0x1f, 0x4f, 0xfb, 0x05, 0x06, 0x04, 0x55, 0xb3, 0x15, 0xd3, 0xa5,
-	0x36, 0xc1, 0x27, 0x58, 0xcc, 0x9b, 0x6b, 0x1b, 0x58, 0x84, 0x15, 0xd9, 0xb4, 0x74, 0x7c, 0x92,
-	0xd5, 0x56, 0x93, 0xd8, 0x0f, 0x34, 0x67, 0x1d, 0x9f, 0x02, 0xb8, 0x06, 0x18, 0xaf, 0xc0, 0xaa,
-	0x2d, 0xd3, 0x7b, 0xf8, 0x34, 0x70, 0x6b, 0x3f, 0x20, 0xf8, 0x0c, 0x5f, 0x74, 0x70, 0x8d, 0x35,
-	0x1f, 0xd2, 0xc2, 0xff, 0x05, 0x8a, 0x1a, 0x06, 0xae, 0x03, 0x13, 0xc3, 0x4a, 0x6c, 0x7e, 0x15,
-	0x34, 0x34, 0x98, 0x86, 0x67, 0x41, 0x01, 0x63, 0xa2, 0xe1, 0x6b, 0x69, 0xd7, 0x3a, 0x97, 0x99,
-	0xd7, 0xcf, 0x43, 0x67, 0xb2, 0xf0, 0x85, 0xa4, 0x32, 0xcb, 0x8e, 0xbc, 0xa9, 0xd9, 0xf8, 0x75,
-	0x1e, 0x0d, 0xd4, 0x01, 0x8e, 0x12, 0xeb, 0x68, 0xcc, 0x11, 0x17, 0x59, 0x48, 0x82, 0x86, 0x6f,
-	0xf0, 0x95, 0x6d, 0xe3, 0x37, 0x19, 0xae, 0x69, 0x3b, 0xa0, 0xd3, 0x5b, 0x49, 0xa4, 0x32, 0xec,
-	0xb7, 0x27, 0x1b, 0x63, 0x03, 0x5f, 0xe2, 0x49, 0x47, 0xc0, 0x33, 0xef, 0xf0, 0xb6, 0x49, 0x9a,
-	0xf8, 0x72, 0xb2, 0xb2, 0xf0, 0xbb, 0xfc, 0xe2, 0x60, 0x1a, 0x3a, 0xbe, 0x92, 0xf6, 0xd2, 0xab,
-	0x60, 0xa1, 0x65, 0xe3, 0x06, 0x58, 0x78, 0xdf, 0x95, 0x0d, 0xa6, 0xcf, 0x0a, 0x60, 0x52, 0x05,
-	0x96, 0xd7, 0xe0, 0x03, 0x5b, 0x52, 0xa2, 0xe3, 0xeb, 0xec, 0x83, 0x4a, 0x4d, 0x0b, 0xaf, 0x02,
-	0x0b, 0x10, 0xf0, 0x1e, 0xe8, 0x40, 0x49, 0xdb, 0x90, 0x0d, 0x07, 0xff, 0x37, 0x4f, 0x5a, 0xb0,
-	0xd3, 0x50, 0xdd, 0x36, 0xfe, 0x1f, 0x90, 0x4e, 0x4d, 0xd3, 0xc1, 0x37, 0x60, 0x65, 0x83, 0x73,
-	0xde, 0x67, 0x2b, 0xb7, 0xd9, 0xc4, 0x37, 0x61, 0xc5, 0x24, 0x7e, 0xc0, 0xea, 0x8d, 0x69, 0x69,
-	0x0a, 0xbe, 0xc5, 0x7a, 0x3a, 0x00, 0x6f, 0xcf, 0xf4, 0xa0, 0x3b, 0x80, 0xb2, 0xc9, 0xcc, 0xfe,
-	0x5f, 0x56, 0xa9, 0x5c, 0xd6, 0xe6, 0xff, 0x8f, 0x51, 0x6a, 0x8e, 0x4e, 0xf0, 0x87, 0xbc, 0x15,
-	0x75, 0xac, 0x75, 0xa0, 0xbe, 0x9b, 0x84, 0x1c, 0x64, 0x20, 0x96, 0x59, 0x74, 0xba, 0x9b, 0x9d,
-	0x0e, 0x5e, 0x83, 0xa5, 0xca, 0xa4, 0x2a, 0x80, 0xd2, 0x34, 0x29, 0xd1, 0x5a, 0x06, 0x56, 0xc1,
-	0x15, 0xf7, 0x1e, 0x60, 0xc2, 0x9a, 0x8b, 0x66, 0x3b, 0xb8, 0xc9, 0xc7, 0x91, 0xb6, 0x82, 0x5b,
-	0x2c, 0x00, 0xcc, 0x36, 0x8f, 0xcb, 0x75, 0x68, 0x06, 0xe9, 0x8e, 0x1d, 0xbc, 0xc6, 0x30, 0xdd,
-	0xb6, 0x82, 0x37, 0xc0, 0x2d, 0x8a, 0x69, 0xe1, 0x7b, 0xe0, 0x09, 0x55, 0xb3, 0x59, 0xdf, 0x26,
-	0x2a, 0xd6, 0x59, 0x2a, 0xd8, 0x16, 0x6e, 0x03, 0x6e, 0x0b, 0xc4, 0x1b, 0x6c, 0x05, 0x67, 0x6d,
-	0x82, 0x41, 0x9a, 0xd1, 0x04, 0xa8, 0xc5, 0xc2, 0x90, 0xd8, 0xf8, 0x3e, 0x8b, 0x33, 0x66, 0x30,
-	0x95, 0xfe, 0x2e, 0xa0, 0xa5, 0x99, 0x0b, 0xf4, 0x4b, 0x5f, 0xf8, 0xee, 0xce, 0x3c, 0x2b, 0x5c,
-	0x99, 0xf3, 0xbe, 0x9e, 0x7d, 0x5d, 0x98, 0xb9, 0xb0, 0xe7, 0x5f, 0xea, 0xe9, 0xe3, 0x5a, 0x72,
-	0xe5, 0xc6, 0x68, 0x31, 0x79, 0xc4, 0x39, 0xa8, 0x71, 0x20, 0x54, 0x52, 0xcc, 0x76, 0x1b, 0x6e,
-	0xdd, 0x52, 0x0b, 0x95, 0x53, 0x43, 0xc4, 0xda, 0xf4, 0x91, 0x89, 0xdf, 0xf0, 0x27, 0x4f, 0x4c,
-	0xaf, 0xa3, 0xc5, 0x47, 0xfe, 0x60, 0x18, 0x74, 0xc3, 0xad, 0xad, 0xc8, 0xe7, 0x97, 0xb1, 0x22,
-	0xad, 0x32, 0x98, 0xc9, 0x40, 0x92, 0x8e, 0x4e, 0x2b, 0xdb, 0x5e, 0x14, 0x0d, 0xb7, 0x86, 0x3d,
-	0xf6, 0x7c, 0xa6, 0x78, 0xb1, 0x3f, 0x08, 0xc7, 0x07, 0x3f, 0xc2, 0x9c, 0x43, 0xa8, 0x17, 0x06,
-	0x5b, 0xc3, 0x3e, 0x7b, 0xff, 0xe0, 0x77, 0xcb, 0x0c, 0x44, 0xfa, 0x91, 0x80, 0xce, 0xc8, 0x81,
-	0xb7, 0xbd, 0xf7, 0xa9, 0x3f, 0x35, 0xd4, 0xff, 0xfa, 0xae, 0x1f, 0xc5, 0xa2, 0x82, 0xca, 0xfd,
-	0xe4, 0x89, 0xec, 0xc5, 0xa7, 0x94, 0x3e, 0xa6, 0xad, 0xe5, 0xbf, 0x90, 0x73, 0x74, 0x42, 0x28,
-	0xde, 0x43, 0x4b, 0x7e, 0xd0, 0x0b, 0xfb, 0xc3, 0x60, 0xd0, 0xcd, 0x9c, 0xdb, 0x5b, 0xcf, 0x3b,
-	0x37, 0x8e, 0xce, 0x4e, 0x6c, 0xd1, 0xcf, 0xec, 0xa4, 0xdf, 0x0a, 0xa8, 0xf6, 0xac, 0xb6, 0xd1,
-	0x28, 0x84, 0x0e, 0x4a, 0x91, 0x98, 0x4a, 0xed, 0x4e, 0xcf, 0x57, 0x98, 0xff, 0x7c, 0x4f, 0xa4,
-	0xe4, 0xd3, 0x9b, 0x79, 0xf6, 0x21, 0x2f, 0x37, 0xfb, 0x90, 0x27, 0xde, 0xe5, 0x61, 0x04, 0x6e,
-	0x8c, 0x92, 0x57, 0x2a, 0xe9, 0xf9, 0x62, 0x00, 0x95, 0x4e, 0x89, 0xa4, 0x9f, 0x0b, 0xe8, 0xb5,
-	0xc4, 0x1c, 0x1e, 0xac, 0xff, 0x01, 0x47, 0xf0, 0x29, 0x3a, 0x77, 0x98, 0xca, 0xc9, 0x39, 0xdc,
-	0x41, 0x65, 0x80, 0xc5, 0x43, 0x3f, 0xaa, 0x09, 0xcc, 0x2d, 0x17, 0x5e, 0x94, 0xa4, 0x74, 0x42,
-	0xf1, 0x3c, 0x8f, 0x4b, 0x3f, 0x14, 0xd0, 0xe9, 0xac, 0xf0, 0xa1, 0x1f, 0x7d, 0x75, 0x1d, 0x15,
-	0x4d, 0x12, 0x6b, 0xaa, 0xeb, 0xbf, 0xdc, 0x43, 0xdf, 0x17, 0xd0, 0xa9, 0x34, 0x41, 0xf6, 0x82,
-	0xd8, 0x7b, 0xfa, 0xd5, 0xf5, 0xcf, 0x4f, 0x04, 0xf4, 0xca, 0x3e, 0x55, 0x13, 0xf7, 0xcc, 0x24,
-	0x96, 0xf0, 0x12, 0x89, 0x25, 0xbe, 0x8f, 0x4a, 0x6c, 0x08, 0x8d, 0x6a, 0x39, 0x46, 0x7e, 0xfe,
-	0x39, 0xdd, 0x05, 0xf0, 0x68, 0x82, 0x3e, 0xe3, 0xdb, 0xfc, 0x3e, 0xdf, 0x3e, 0x44, 0x27, 0x93,
-	0xc2, 0xbb, 0x07, 0x95, 0xfc, 0xcb, 0xf4, 0xac, 0xf4, 0x18, 0x9d, 0x9a, 0xe5, 0x9d, 0xb8, 0xc2,
-	0x42, 0xa8, 0xc7, 0xcb, 0xfb, 0x34, 0x56, 0xae, 0x1d, 0xce, 0xfe, 0xe0, 0xc6, 0x40, 0x33, 0x3c,
-	0xa4, 0xbf, 0xe6, 0xd1, 0x49, 0x99, 0xff, 0xf4, 0xe2, 0x7f, 0xd9, 0x66, 0x88, 0x0f, 0x50, 0x79,
-	0xcb, 0xf7, 0xe2, 0xdd, 0xb1, 0x1f, 0x25, 0xcf, 0xb0, 0x37, 0x0e, 0x67, 0x72, 0x80, 0x16, 0x8d,
-	0x66, 0x42, 0x9d, 0x30, 0x4e, 0x99, 0x3d, 0x1b, 0x79, 0xf9, 0x97, 0x8f, 0xbc, 0xfa, 0x5f, 0x04,
-	0x54, 0x4e, 0x05, 0x89, 0x6f, 0xa2, 0x65, 0xff, 0x69, 0x3c, 0xf6, 0x7a, 0x71, 0x37, 0x62, 0x61,
-	0xc8, 0xac, 0x2f, 0xd3, 0xa5, 0x04, 0xca, 0x63, 0x53, 0x7c, 0x07, 0xe1, 0x14, 0x6d, 0x92, 0xba,
-	0x39, 0x86, 0x78, 0x3c, 0x81, 0xa7, 0x59, 0x2e, 0xde, 0x41, 0xf5, 0x14, 0xf5, 0x80, 0x7e, 0x94,
-	0x67, 0x44, 0xb5, 0x04, 0x43, 0x7d, 0xa6, 0xe3, 0xdc, 0x44, 0xb5, 0x19, 0x41, 0x7b, 0x19, 0xda,
-	0x02, 0xa3, 0x3d, 0x9d, 0x15, 0x38, 0xad, 0xbf, 0xe2, 0x45, 0xb4, 0xd4, 0x4b, 0x62, 0xa8, 0xcb,
-	0x26, 0xab, 0x12, 0x43, 0x5f, 0xec, 0x65, 0x02, 0x4b, 0xfa, 0x4e, 0x1e, 0x0a, 0x44, 0xd6, 0xf1,
-	0xff, 0xfe, 0xa4, 0xcb, 0x96, 0xc3, 0xfc, 0x91, 0xcb, 0xe1, 0xc1, 0x6d, 0xbf, 0xf0, 0xa5, 0xb5,
-	0xfd, 0xe2, 0xbe, 0xb6, 0x3f, 0x9b, 0x92, 0xa5, 0x7f, 0x3e, 0x25, 0x2f, 0xdf, 0x44, 0x8b, 0xd9,
-	0x68, 0xe5, 0x53, 0xbb, 0x41, 0xf0, 0x31, 0x58, 0xb9, 0x4e, 0xf3, 0x26, 0xbf, 0xc8, 0xba, 0x4e,
-	0xf3, 0xfa, 0x0d, 0x7e, 0x91, 0x75, 0x9d, 0xe6, 0x7b, 0xab, 0x38, 0xbf, 0xfa, 0x33, 0x84, 0x8e,
-	0xeb, 0x89, 0x30, 0x9b, 0xff, 0x06, 0x2b, 0xfe, 0x46, 0x40, 0x78, 0xff, 0x8c, 0x24, 0x5e, 0x7f,
-	0x5e, 0x1a, 0x1e, 0x38, 0xfd, 0xd5, 0x57, 0x8f, 0x42, 0xc2, 0x83, 0x48, 0x6a, 0x7f, 0x2e, 0x9f,
-	0x4e, 0xbd, 0x79, 0x65, 0x26, 0x61, 0x3f, 0x97, 0x27, 0x55, 0xe2, 0x9b, 0xbf, 0xff, 0xc3, 0x77,
-	0x73, 0x17, 0xa5, 0x73, 0x2b, 0x4f, 0xae, 0xaf, 0xa4, 0xb0, 0xe8, 0x96, 0xb7, 0x8f, 0xe7, 0x2d,
-	0xe1, 0xb2, 0xf8, 0x6b, 0x01, 0x1d, 0xdf, 0xd7, 0x43, 0xc5, 0x6b, 0x2f, 0x54, 0x6b, 0xdf, 0x68,
-	0x50, 0xbf, 0x7e, 0x04, 0x8a, 0xc4, 0x0e, 0x7d, 0x6e, 0x3b, 0x24, 0xe9, 0xb5, 0x03, 0xed, 0x48,
-	0x59, 0x82, 0x19, 0x5f, 0xec, 0x1b, 0x5b, 0x32, 0x39, 0xfb, 0xfe, 0x7c, 0xba, 0x3d, 0x33, 0x18,
-	0xd6, 0x6f, 0x1e, 0x9d, 0x30, 0xb1, 0xcd, 0x9e, 0xdb, 0xb6, 0x77, 0xa4, 0x37, 0x0e, 0xb7, 0x6d,
-	0x6f, 0xe6, 0xa4, 0x7e, 0x29, 0xa0, 0xa5, 0x99, 0x66, 0x2e, 0x36, 0x5e, 0x1c, 0x3e, 0xd9, 0x01,
-	0xa5, 0xbe, 0x32, 0x37, 0x7e, 0x62, 0xc7, 0xc6, 0xdc, 0x76, 0x5c, 0x90, 0x5e, 0x3d, 0x38, 0xd6,
-	0x18, 0x43, 0x50, 0xff, 0x7b, 0x02, 0x5a, 0xcc, 0xf6, 0x5f, 0xf1, 0xea, 0x0b, 0x13, 0x3a, 0x3b,
-	0x03, 0xd4, 0x1b, 0xf3, 0xa2, 0x27, 0xba, 0x5f, 0xdb, 0xaf, 0xe2, 0x79, 0xa9, 0x3e, 0xab, 0x62,
-	0xb6, 0x68, 0x83, 0x86, 0x9f, 0x09, 0x68, 0x31, 0x5b, 0xb7, 0x9f, 0xa7, 0xe1, 0x01, 0x8d, 0xb5,
-	0xde, 0x98, 0x17, 0x3d, 0xd1, 0xf0, 0xff, 0x3f, 0x97, 0xcf, 0x4f, 0xbc, 0x9b, 0xb6, 0xe1, 0xfd,
-	0x6e, 0x3e, 0xf1, 0x0c, 0xc6, 0xc1, 0xc6, 0x78, 0x19, 0x09, 0xb7, 0x84, 0xcb, 0xf5, 0x4f, 0x3f,
-	0x93, 0xcf, 0x4c, 0x34, 0xe0, 0x7a, 0x79, 0xa3, 0x61, 0xd4, 0xe8, 0x85, 0x3b, 0xbf, 0x93, 0xbf,
-	0xf6, 0x38, 0x8e, 0x47, 0xd1, 0xad, 0x95, 0x95, 0x4f, 0x3e, 0xf9, 0x64, 0xdf, 0xc7, 0x15, 0x6f,
-	0x37, 0x7e, 0xcc, 0xff, 0x87, 0x72, 0x35, 0xa5, 0xbf, 0x32, 0x1f, 0xfa, 0x68, 0xdb, 0x8b, 0xb7,
-	0xc2, 0xf1, 0xce, 0xda, 0x53, 0x74, 0xb6, 0x17, 0xee, 0x1c, 0xea, 0x8d, 0xb5, 0x53, 0xfb, 0xea,
-	0xa9, 0x35, 0x0e, 0xe3, 0xd0, 0x12, 0x1e, 0xde, 0x4d, 0x28, 0x06, 0x21, 0x60, 0x37, 0xc2, 0xf1,
-	0x60, 0x65, 0xe0, 0x07, 0xec, 0xef, 0x27, 0x2b, 0x53, 0xb1, 0xcf, 0xfe, 0x49, 0xe6, 0x76, 0xba,
-	0x7e, 0x54, 0x62, 0xc8, 0xef, 0xfd, 0x23, 0x00, 0x00, 0xff, 0xff, 0x11, 0x69, 0x57, 0x10, 0x50,
-	0x23, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/language/v1beta1/language_service.pb.go b/googleapis/cloud/language/v1beta1/language_service.pb.go
index 602e135d83..30a24fea9d 100644
--- a/googleapis/cloud/language/v1beta1/language_service.pb.go
+++ b/googleapis/cloud/language/v1beta1/language_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1beta1/language_service.proto
 
-package language // import "google.golang.org/genproto/googleapis/cloud/language/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package language
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the text encoding that the caller uses to process the output.
 // Providing an `EncodingType` is recommended because the API provides the
@@ -55,6 +55,7 @@ var EncodingType_name = map[int32]string{
 	2: "UTF16",
 	3: "UTF32",
 }
+
 var EncodingType_value = map[string]int32{
 	"NONE":  0,
 	"UTF8":  1,
@@ -65,8 +66,9 @@ var EncodingType_value = map[string]int32{
 func (x EncodingType) String() string {
 	return proto.EnumName(EncodingType_name, int32(x))
 }
+
 func (EncodingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{0}
+	return fileDescriptor_1ca1a8b57f399672, []int{0}
 }
 
 // The document types enum.
@@ -86,6 +88,7 @@ var Document_Type_name = map[int32]string{
 	1: "PLAIN_TEXT",
 	2: "HTML",
 }
+
 var Document_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"PLAIN_TEXT":       1,
@@ -95,8 +98,9 @@ var Document_Type_value = map[string]int32{
 func (x Document_Type) String() string {
 	return proto.EnumName(Document_Type_name, int32(x))
 }
+
 func (Document_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{0, 0}
+	return fileDescriptor_1ca1a8b57f399672, []int{0, 0}
 }
 
 // The type of the entity.
@@ -131,6 +135,7 @@ var Entity_Type_name = map[int32]string{
 	6: "CONSUMER_GOOD",
 	7: "OTHER",
 }
+
 var Entity_Type_value = map[string]int32{
 	"UNKNOWN":       0,
 	"PERSON":        1,
@@ -145,8 +150,9 @@ var Entity_Type_value = map[string]int32{
 func (x Entity_Type) String() string {
 	return proto.EnumName(Entity_Type_name, int32(x))
 }
+
 func (Entity_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{2, 0}
+	return fileDescriptor_1ca1a8b57f399672, []int{2, 0}
 }
 
 // The part of speech tags enum.
@@ -199,6 +205,7 @@ var PartOfSpeech_Tag_name = map[int32]string{
 	12: "X",
 	13: "AFFIX",
 }
+
 var PartOfSpeech_Tag_value = map[string]int32{
 	"UNKNOWN": 0,
 	"ADJ":     1,
@@ -219,8 +226,9 @@ var PartOfSpeech_Tag_value = map[string]int32{
 func (x PartOfSpeech_Tag) String() string {
 	return proto.EnumName(PartOfSpeech_Tag_name, int32(x))
 }
+
 func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 0}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 0}
 }
 
 // The characteristic of a verb that expresses time flow during an event.
@@ -243,6 +251,7 @@ var PartOfSpeech_Aspect_name = map[int32]string{
 	2: "IMPERFECTIVE",
 	3: "PROGRESSIVE",
 }
+
 var PartOfSpeech_Aspect_value = map[string]int32{
 	"ASPECT_UNKNOWN": 0,
 	"PERFECTIVE":     1,
@@ -253,8 +262,9 @@ var PartOfSpeech_Aspect_value = map[string]int32{
 func (x PartOfSpeech_Aspect) String() string {
 	return proto.EnumName(PartOfSpeech_Aspect_name, int32(x))
 }
+
 func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 1}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 1}
 }
 
 // The grammatical function performed by a noun or pronoun in a phrase,
@@ -312,6 +322,7 @@ var PartOfSpeech_Case_name = map[int32]string{
 	13: "RELATIVE_CASE",
 	14: "VOCATIVE",
 }
+
 var PartOfSpeech_Case_value = map[string]int32{
 	"CASE_UNKNOWN":   0,
 	"ACCUSATIVE":     1,
@@ -333,8 +344,9 @@ var PartOfSpeech_Case_value = map[string]int32{
 func (x PartOfSpeech_Case) String() string {
 	return proto.EnumName(PartOfSpeech_Case_name, int32(x))
 }
+
 func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 2}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 2}
 }
 
 // Depending on the language, Form can be categorizing different forms of
@@ -384,6 +396,7 @@ var PartOfSpeech_Form_name = map[int32]string{
 	10: "ORDER",
 	11: "SPECIFIC",
 }
+
 var PartOfSpeech_Form_value = map[string]int32{
 	"FORM_UNKNOWN":   0,
 	"ADNOMIAL":       1,
@@ -402,8 +415,9 @@ var PartOfSpeech_Form_value = map[string]int32{
 func (x PartOfSpeech_Form) String() string {
 	return proto.EnumName(PartOfSpeech_Form_name, int32(x))
 }
+
 func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 3}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 3}
 }
 
 // Gender classes of nouns reflected in the behaviour of associated words.
@@ -426,6 +440,7 @@ var PartOfSpeech_Gender_name = map[int32]string{
 	2: "MASCULINE",
 	3: "NEUTER",
 }
+
 var PartOfSpeech_Gender_value = map[string]int32{
 	"GENDER_UNKNOWN": 0,
 	"FEMININE":       1,
@@ -436,8 +451,9 @@ var PartOfSpeech_Gender_value = map[string]int32{
 func (x PartOfSpeech_Gender) String() string {
 	return proto.EnumName(PartOfSpeech_Gender_name, int32(x))
 }
+
 func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 4}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 4}
 }
 
 // The grammatical feature of verbs, used for showing modality and attitude.
@@ -469,6 +485,7 @@ var PartOfSpeech_Mood_name = map[int32]string{
 	5: "JUSSIVE",
 	6: "SUBJUNCTIVE",
 }
+
 var PartOfSpeech_Mood_value = map[string]int32{
 	"MOOD_UNKNOWN":     0,
 	"CONDITIONAL_MOOD": 1,
@@ -482,8 +499,9 @@ var PartOfSpeech_Mood_value = map[string]int32{
 func (x PartOfSpeech_Mood) String() string {
 	return proto.EnumName(PartOfSpeech_Mood_name, int32(x))
 }
+
 func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 5}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 5}
 }
 
 // Count distinctions.
@@ -506,6 +524,7 @@ var PartOfSpeech_Number_name = map[int32]string{
 	2: "PLURAL",
 	3: "DUAL",
 }
+
 var PartOfSpeech_Number_value = map[string]int32{
 	"NUMBER_UNKNOWN": 0,
 	"SINGULAR":       1,
@@ -516,8 +535,9 @@ var PartOfSpeech_Number_value = map[string]int32{
 func (x PartOfSpeech_Number) String() string {
 	return proto.EnumName(PartOfSpeech_Number_name, int32(x))
 }
+
 func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 6}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 6}
 }
 
 // The distinction between the speaker, second person, third person, etc.
@@ -543,6 +563,7 @@ var PartOfSpeech_Person_name = map[int32]string{
 	3: "THIRD",
 	4: "REFLEXIVE_PERSON",
 }
+
 var PartOfSpeech_Person_value = map[string]int32{
 	"PERSON_UNKNOWN":   0,
 	"FIRST":            1,
@@ -554,8 +575,9 @@ var PartOfSpeech_Person_value = map[string]int32{
 func (x PartOfSpeech_Person) String() string {
 	return proto.EnumName(PartOfSpeech_Person_name, int32(x))
 }
+
 func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 7}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 7}
 }
 
 // This category shows if the token is part of a proper name.
@@ -575,6 +597,7 @@ var PartOfSpeech_Proper_name = map[int32]string{
 	1: "PROPER",
 	2: "NOT_PROPER",
 }
+
 var PartOfSpeech_Proper_value = map[string]int32{
 	"PROPER_UNKNOWN": 0,
 	"PROPER":         1,
@@ -584,8 +607,9 @@ var PartOfSpeech_Proper_value = map[string]int32{
 func (x PartOfSpeech_Proper) String() string {
 	return proto.EnumName(PartOfSpeech_Proper_name, int32(x))
 }
+
 func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 8}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 8}
 }
 
 // Reciprocal features of a pronoun.
@@ -606,6 +630,7 @@ var PartOfSpeech_Reciprocity_name = map[int32]string{
 	1: "RECIPROCAL",
 	2: "NON_RECIPROCAL",
 }
+
 var PartOfSpeech_Reciprocity_value = map[string]int32{
 	"RECIPROCITY_UNKNOWN": 0,
 	"RECIPROCAL":          1,
@@ -615,8 +640,9 @@ var PartOfSpeech_Reciprocity_value = map[string]int32{
 func (x PartOfSpeech_Reciprocity) String() string {
 	return proto.EnumName(PartOfSpeech_Reciprocity_name, int32(x))
 }
+
 func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 9}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 9}
 }
 
 // Time reference.
@@ -648,6 +674,7 @@ var PartOfSpeech_Tense_name = map[int32]string{
 	5: "IMPERFECT",
 	6: "PLUPERFECT",
 }
+
 var PartOfSpeech_Tense_value = map[string]int32{
 	"TENSE_UNKNOWN":     0,
 	"CONDITIONAL_TENSE": 1,
@@ -661,8 +688,9 @@ var PartOfSpeech_Tense_value = map[string]int32{
 func (x PartOfSpeech_Tense) String() string {
 	return proto.EnumName(PartOfSpeech_Tense_name, int32(x))
 }
+
 func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 10}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 10}
 }
 
 // The relationship between the action that a verb expresses and the
@@ -686,6 +714,7 @@ var PartOfSpeech_Voice_name = map[int32]string{
 	2: "CAUSATIVE",
 	3: "PASSIVE",
 }
+
 var PartOfSpeech_Voice_value = map[string]int32{
 	"VOICE_UNKNOWN": 0,
 	"ACTIVE":        1,
@@ -696,8 +725,9 @@ var PartOfSpeech_Voice_value = map[string]int32{
 func (x PartOfSpeech_Voice) String() string {
 	return proto.EnumName(PartOfSpeech_Voice_name, int32(x))
 }
+
 func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5, 11}
+	return fileDescriptor_1ca1a8b57f399672, []int{5, 11}
 }
 
 // The parse label enum for the token.
@@ -939,6 +969,7 @@ var DependencyEdge_Label_name = map[int32]string{
 	75: "COP",
 	76: "DISLOCATED",
 }
+
 var DependencyEdge_Label_value = map[string]int32{
 	"UNKNOWN":      0,
 	"ABBREV":       1,
@@ -1022,8 +1053,9 @@ var DependencyEdge_Label_value = map[string]int32{
 func (x DependencyEdge_Label) String() string {
 	return proto.EnumName(DependencyEdge_Label_name, int32(x))
 }
+
 func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{6, 0}
+	return fileDescriptor_1ca1a8b57f399672, []int{6, 0}
 }
 
 // The supported types of mentions.
@@ -1043,6 +1075,7 @@ var EntityMention_Type_name = map[int32]string{
 	1: "PROPER",
 	2: "COMMON",
 }
+
 var EntityMention_Type_value = map[string]int32{
 	"TYPE_UNKNOWN": 0,
 	"PROPER":       1,
@@ -1052,8 +1085,9 @@ var EntityMention_Type_value = map[string]int32{
 func (x EntityMention_Type) String() string {
 	return proto.EnumName(EntityMention_Type_name, int32(x))
 }
+
 func (EntityMention_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{7, 0}
+	return fileDescriptor_1ca1a8b57f399672, []int{7, 0}
 }
 
 // ################################################################ #
@@ -1088,16 +1122,17 @@ func (m *Document) Reset()         { *m = Document{} }
 func (m *Document) String() string { return proto.CompactTextString(m) }
 func (*Document) ProtoMessage()    {}
 func (*Document) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{0}
+	return fileDescriptor_1ca1a8b57f399672, []int{0}
 }
+
 func (m *Document) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Document.Unmarshal(m, b)
 }
 func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
 }
-func (dst *Document) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Document.Merge(dst, src)
+func (m *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(m, src)
 }
 func (m *Document) XXX_Size() int {
 	return xxx_messageInfo_Document.Size(m)
@@ -1159,72 +1194,14 @@ func (m *Document) GetLanguage() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Document) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Document_OneofMarshaler, _Document_OneofUnmarshaler, _Document_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Document) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Document_Content)(nil),
 		(*Document_GcsContentUri)(nil),
 	}
 }
 
-func _Document_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_Content:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Content)
-	case *Document_GcsContentUri:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.GcsContentUri)
-	case nil:
-	default:
-		return fmt.Errorf("Document.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Document_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Document)
-	switch tag {
-	case 2: // source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_Content{x}
-		return true, err
-	case 3: // source.gcs_content_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_GcsContentUri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Document_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_Content:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case *Document_GcsContentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.GcsContentUri)))
-		n += len(x.GcsContentUri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a sentence in the input document.
 type Sentence struct {
 	// The sentence text.
@@ -1242,16 +1219,17 @@ func (m *Sentence) Reset()         { *m = Sentence{} }
 func (m *Sentence) String() string { return proto.CompactTextString(m) }
 func (*Sentence) ProtoMessage()    {}
 func (*Sentence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{1}
+	return fileDescriptor_1ca1a8b57f399672, []int{1}
 }
+
 func (m *Sentence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentence.Unmarshal(m, b)
 }
 func (m *Sentence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentence.Marshal(b, m, deterministic)
 }
-func (dst *Sentence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentence.Merge(dst, src)
+func (m *Sentence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentence.Merge(m, src)
 }
 func (m *Sentence) XXX_Size() int {
 	return xxx_messageInfo_Sentence.Size(m)
@@ -1308,16 +1286,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{2}
+	return fileDescriptor_1ca1a8b57f399672, []int{2}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -1382,16 +1361,17 @@ func (m *Token) Reset()         { *m = Token{} }
 func (m *Token) String() string { return proto.CompactTextString(m) }
 func (*Token) ProtoMessage()    {}
 func (*Token) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{3}
+	return fileDescriptor_1ca1a8b57f399672, []int{3}
 }
+
 func (m *Token) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Token.Unmarshal(m, b)
 }
 func (m *Token) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Token.Marshal(b, m, deterministic)
 }
-func (dst *Token) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Token.Merge(dst, src)
+func (m *Token) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Token.Merge(m, src)
 }
 func (m *Token) XXX_Size() int {
 	return xxx_messageInfo_Token.Size(m)
@@ -1453,16 +1433,17 @@ func (m *Sentiment) Reset()         { *m = Sentiment{} }
 func (m *Sentiment) String() string { return proto.CompactTextString(m) }
 func (*Sentiment) ProtoMessage()    {}
 func (*Sentiment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{4}
+	return fileDescriptor_1ca1a8b57f399672, []int{4}
 }
+
 func (m *Sentiment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
 }
 func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
 }
-func (dst *Sentiment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentiment.Merge(dst, src)
+func (m *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(m, src)
 }
 func (m *Sentiment) XXX_Size() int {
 	return xxx_messageInfo_Sentiment.Size(m)
@@ -1529,16 +1510,17 @@ func (m *PartOfSpeech) Reset()         { *m = PartOfSpeech{} }
 func (m *PartOfSpeech) String() string { return proto.CompactTextString(m) }
 func (*PartOfSpeech) ProtoMessage()    {}
 func (*PartOfSpeech) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{5}
+	return fileDescriptor_1ca1a8b57f399672, []int{5}
 }
+
 func (m *PartOfSpeech) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartOfSpeech.Unmarshal(m, b)
 }
 func (m *PartOfSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartOfSpeech.Marshal(b, m, deterministic)
 }
-func (dst *PartOfSpeech) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartOfSpeech.Merge(dst, src)
+func (m *PartOfSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartOfSpeech.Merge(m, src)
 }
 func (m *PartOfSpeech) XXX_Size() int {
 	return xxx_messageInfo_PartOfSpeech.Size(m)
@@ -1652,16 +1634,17 @@ func (m *DependencyEdge) Reset()         { *m = DependencyEdge{} }
 func (m *DependencyEdge) String() string { return proto.CompactTextString(m) }
 func (*DependencyEdge) ProtoMessage()    {}
 func (*DependencyEdge) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{6}
+	return fileDescriptor_1ca1a8b57f399672, []int{6}
 }
+
 func (m *DependencyEdge) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DependencyEdge.Unmarshal(m, b)
 }
 func (m *DependencyEdge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DependencyEdge.Marshal(b, m, deterministic)
 }
-func (dst *DependencyEdge) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DependencyEdge.Merge(dst, src)
+func (m *DependencyEdge) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DependencyEdge.Merge(m, src)
 }
 func (m *DependencyEdge) XXX_Size() int {
 	return xxx_messageInfo_DependencyEdge.Size(m)
@@ -1702,16 +1685,17 @@ func (m *EntityMention) Reset()         { *m = EntityMention{} }
 func (m *EntityMention) String() string { return proto.CompactTextString(m) }
 func (*EntityMention) ProtoMessage()    {}
 func (*EntityMention) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{7}
+	return fileDescriptor_1ca1a8b57f399672, []int{7}
 }
+
 func (m *EntityMention) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityMention.Unmarshal(m, b)
 }
 func (m *EntityMention) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityMention.Marshal(b, m, deterministic)
 }
-func (dst *EntityMention) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityMention.Merge(dst, src)
+func (m *EntityMention) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityMention.Merge(m, src)
 }
 func (m *EntityMention) XXX_Size() int {
 	return xxx_messageInfo_EntityMention.Size(m)
@@ -1754,16 +1738,17 @@ func (m *TextSpan) Reset()         { *m = TextSpan{} }
 func (m *TextSpan) String() string { return proto.CompactTextString(m) }
 func (*TextSpan) ProtoMessage()    {}
 func (*TextSpan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{8}
+	return fileDescriptor_1ca1a8b57f399672, []int{8}
 }
+
 func (m *TextSpan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSpan.Unmarshal(m, b)
 }
 func (m *TextSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSpan.Marshal(b, m, deterministic)
 }
-func (dst *TextSpan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSpan.Merge(dst, src)
+func (m *TextSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSpan.Merge(m, src)
 }
 func (m *TextSpan) XXX_Size() int {
 	return xxx_messageInfo_TextSpan.Size(m)
@@ -1804,16 +1789,17 @@ func (m *AnalyzeSentimentRequest) Reset()         { *m = AnalyzeSentimentRequest
 func (m *AnalyzeSentimentRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSentimentRequest) ProtoMessage()    {}
 func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{9}
+	return fileDescriptor_1ca1a8b57f399672, []int{9}
 }
+
 func (m *AnalyzeSentimentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeSentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSentimentRequest.Merge(dst, src)
+func (m *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentRequest.Merge(m, src)
 }
 func (m *AnalyzeSentimentRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Size(m)
@@ -1858,16 +1844,17 @@ func (m *AnalyzeSentimentResponse) Reset()         { *m = AnalyzeSentimentRespon
 func (m *AnalyzeSentimentResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSentimentResponse) ProtoMessage()    {}
 func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{10}
+	return fileDescriptor_1ca1a8b57f399672, []int{10}
 }
+
 func (m *AnalyzeSentimentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeSentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSentimentResponse.Merge(dst, src)
+func (m *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentResponse.Merge(m, src)
 }
 func (m *AnalyzeSentimentResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Size(m)
@@ -1914,16 +1901,17 @@ func (m *AnalyzeEntitiesRequest) Reset()         { *m = AnalyzeEntitiesRequest{}
 func (m *AnalyzeEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitiesRequest) ProtoMessage()    {}
 func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{11}
+	return fileDescriptor_1ca1a8b57f399672, []int{11}
 }
+
 func (m *AnalyzeEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(dst, src)
+func (m *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(m, src)
 }
 func (m *AnalyzeEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Size(m)
@@ -1966,16 +1954,17 @@ func (m *AnalyzeEntitiesResponse) Reset()         { *m = AnalyzeEntitiesResponse
 func (m *AnalyzeEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitiesResponse) ProtoMessage()    {}
 func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{12}
+	return fileDescriptor_1ca1a8b57f399672, []int{12}
 }
+
 func (m *AnalyzeEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(dst, src)
+func (m *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(m, src)
 }
 func (m *AnalyzeEntitiesResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Size(m)
@@ -2015,16 +2004,17 @@ func (m *AnalyzeSyntaxRequest) Reset()         { *m = AnalyzeSyntaxRequest{} }
 func (m *AnalyzeSyntaxRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSyntaxRequest) ProtoMessage()    {}
 func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{13}
+	return fileDescriptor_1ca1a8b57f399672, []int{13}
 }
+
 func (m *AnalyzeSyntaxRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeSyntaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(dst, src)
+func (m *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(m, src)
 }
 func (m *AnalyzeSyntaxRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Size(m)
@@ -2069,16 +2059,17 @@ func (m *AnalyzeSyntaxResponse) Reset()         { *m = AnalyzeSyntaxResponse{} }
 func (m *AnalyzeSyntaxResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSyntaxResponse) ProtoMessage()    {}
 func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{14}
+	return fileDescriptor_1ca1a8b57f399672, []int{14}
 }
+
 func (m *AnalyzeSyntaxResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeSyntaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(dst, src)
+func (m *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(m, src)
 }
 func (m *AnalyzeSyntaxResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Size(m)
@@ -2128,16 +2119,17 @@ func (m *AnnotateTextRequest) Reset()         { *m = AnnotateTextRequest{} }
 func (m *AnnotateTextRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest) ProtoMessage()    {}
 func (*AnnotateTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{15}
+	return fileDescriptor_1ca1a8b57f399672, []int{15}
 }
+
 func (m *AnnotateTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextRequest.Unmarshal(m, b)
 }
 func (m *AnnotateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextRequest.Merge(dst, src)
+func (m *AnnotateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest.Merge(m, src)
 }
 func (m *AnnotateTextRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextRequest.Size(m)
@@ -2187,16 +2179,17 @@ func (m *AnnotateTextRequest_Features) Reset()         { *m = AnnotateTextReques
 func (m *AnnotateTextRequest_Features) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest_Features) ProtoMessage()    {}
 func (*AnnotateTextRequest_Features) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{15, 0}
+	return fileDescriptor_1ca1a8b57f399672, []int{15, 0}
 }
+
 func (m *AnnotateTextRequest_Features) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Unmarshal(m, b)
 }
 func (m *AnnotateTextRequest_Features) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextRequest_Features.Merge(dst, src)
+func (m *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest_Features.Merge(m, src)
 }
 func (m *AnnotateTextRequest_Features) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Size(m)
@@ -2258,16 +2251,17 @@ func (m *AnnotateTextResponse) Reset()         { *m = AnnotateTextResponse{} }
 func (m *AnnotateTextResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextResponse) ProtoMessage()    {}
 func (*AnnotateTextResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_a20715f4ac30e6a8, []int{16}
+	return fileDescriptor_1ca1a8b57f399672, []int{16}
 }
+
 func (m *AnnotateTextResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextResponse.Unmarshal(m, b)
 }
 func (m *AnnotateTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextResponse.Merge(dst, src)
+func (m *AnnotateTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextResponse.Merge(m, src)
 }
 func (m *AnnotateTextResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextResponse.Size(m)
@@ -2314,6 +2308,23 @@ func (m *AnnotateTextResponse) GetLanguage() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.language.v1beta1.EncodingType", EncodingType_name, EncodingType_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.Document_Type", Document_Type_name, Document_Type_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.Entity_Type", Entity_Type_name, Entity_Type_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Tag", PartOfSpeech_Tag_name, PartOfSpeech_Tag_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Aspect", PartOfSpeech_Aspect_name, PartOfSpeech_Aspect_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Case", PartOfSpeech_Case_name, PartOfSpeech_Case_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Form", PartOfSpeech_Form_name, PartOfSpeech_Form_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Gender", PartOfSpeech_Gender_name, PartOfSpeech_Gender_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Mood", PartOfSpeech_Mood_name, PartOfSpeech_Mood_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Number", PartOfSpeech_Number_name, PartOfSpeech_Number_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Person", PartOfSpeech_Person_name, PartOfSpeech_Person_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Proper", PartOfSpeech_Proper_name, PartOfSpeech_Proper_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Reciprocity", PartOfSpeech_Reciprocity_name, PartOfSpeech_Reciprocity_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Tense", PartOfSpeech_Tense_name, PartOfSpeech_Tense_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Voice", PartOfSpeech_Voice_name, PartOfSpeech_Voice_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.DependencyEdge_Label", DependencyEdge_Label_name, DependencyEdge_Label_value)
+	proto.RegisterEnum("google.cloud.language.v1beta1.EntityMention_Type", EntityMention_Type_name, EntityMention_Type_value)
 	proto.RegisterType((*Document)(nil), "google.cloud.language.v1beta1.Document")
 	proto.RegisterType((*Sentence)(nil), "google.cloud.language.v1beta1.Sentence")
 	proto.RegisterType((*Entity)(nil), "google.cloud.language.v1beta1.Entity")
@@ -2333,23 +2344,187 @@ func init() {
 	proto.RegisterType((*AnnotateTextRequest)(nil), "google.cloud.language.v1beta1.AnnotateTextRequest")
 	proto.RegisterType((*AnnotateTextRequest_Features)(nil), "google.cloud.language.v1beta1.AnnotateTextRequest.Features")
 	proto.RegisterType((*AnnotateTextResponse)(nil), "google.cloud.language.v1beta1.AnnotateTextResponse")
-	proto.RegisterEnum("google.cloud.language.v1beta1.EncodingType", EncodingType_name, EncodingType_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.Document_Type", Document_Type_name, Document_Type_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.Entity_Type", Entity_Type_name, Entity_Type_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Tag", PartOfSpeech_Tag_name, PartOfSpeech_Tag_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Aspect", PartOfSpeech_Aspect_name, PartOfSpeech_Aspect_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Case", PartOfSpeech_Case_name, PartOfSpeech_Case_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Form", PartOfSpeech_Form_name, PartOfSpeech_Form_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Gender", PartOfSpeech_Gender_name, PartOfSpeech_Gender_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Mood", PartOfSpeech_Mood_name, PartOfSpeech_Mood_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Number", PartOfSpeech_Number_name, PartOfSpeech_Number_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Person", PartOfSpeech_Person_name, PartOfSpeech_Person_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Proper", PartOfSpeech_Proper_name, PartOfSpeech_Proper_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Reciprocity", PartOfSpeech_Reciprocity_name, PartOfSpeech_Reciprocity_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Tense", PartOfSpeech_Tense_name, PartOfSpeech_Tense_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.PartOfSpeech_Voice", PartOfSpeech_Voice_name, PartOfSpeech_Voice_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.DependencyEdge_Label", DependencyEdge_Label_name, DependencyEdge_Label_value)
-	proto.RegisterEnum("google.cloud.language.v1beta1.EntityMention_Type", EntityMention_Type_name, EntityMention_Type_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/language/v1beta1/language_service.proto", fileDescriptor_1ca1a8b57f399672)
+}
+
+var fileDescriptor_1ca1a8b57f399672 = []byte{
+	// 2755 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4f, 0x73, 0xdb, 0xc6,
+	0x15, 0x37, 0xf8, 0x4f, 0xe4, 0x92, 0x92, 0xd6, 0x88, 0x93, 0xb0, 0x6a, 0xd2, 0x38, 0x48, 0x5c,
+	0x2b, 0x76, 0x42, 0xc5, 0x52, 0xe2, 0xb8, 0x76, 0x9a, 0x06, 0x02, 0x96, 0x14, 0x64, 0x10, 0x40,
+	0x16, 0x00, 0x25, 0xa7, 0x07, 0x0e, 0x4c, 0xae, 0x19, 0x4e, 0x24, 0x80, 0x25, 0x21, 0x8f, 0xd5,
+	0x4b, 0x67, 0x32, 0xd3, 0x63, 0xa7, 0x87, 0xde, 0x7a, 0x6c, 0x0f, 0x3d, 0x75, 0xd2, 0x99, 0x5e,
+	0xda, 0x0f, 0xd0, 0x43, 0xa7, 0xc7, 0xcc, 0xf4, 0x13, 0xf4, 0xd8, 0x43, 0x0f, 0x3d, 0xf4, 0xd8,
+	0x79, 0xbb, 0x0b, 0xfe, 0x51, 0x1c, 0x4b, 0x4c, 0x72, 0xc8, 0x6d, 0xf7, 0xf1, 0xfd, 0x7e, 0xef,
+	0xed, 0xdb, 0xb7, 0xef, 0x2d, 0x96, 0xe8, 0x9d, 0x41, 0x92, 0x0c, 0x8e, 0xd8, 0x56, 0xef, 0x28,
+	0x39, 0xe9, 0x6f, 0x1d, 0x45, 0xf1, 0xe0, 0x24, 0x1a, 0xb0, 0xad, 0xc7, 0xb7, 0x1e, 0xb2, 0x34,
+	0xba, 0x35, 0x15, 0x74, 0x27, 0x6c, 0xfc, 0x78, 0xd8, 0x63, 0x8d, 0xd1, 0x38, 0x49, 0x13, 0xf5,
+	0x65, 0x81, 0x6a, 0x70, 0x54, 0x23, 0x53, 0x6a, 0x48, 0xd4, 0xc6, 0x4b, 0x92, 0x34, 0x1a, 0x0d,
+	0xb7, 0xa2, 0x38, 0x4e, 0xd2, 0x28, 0x1d, 0x26, 0xf1, 0x44, 0x80, 0xb5, 0xff, 0x28, 0xa8, 0x6c,
+	0x26, 0xbd, 0x93, 0x63, 0x16, 0xa7, 0xea, 0x87, 0xa8, 0x90, 0x9e, 0x8e, 0x58, 0x5d, 0xb9, 0xaa,
+	0x6c, 0xae, 0x6d, 0xbf, 0xd9, 0x78, 0x26, 0x71, 0x23, 0x83, 0x35, 0x82, 0xd3, 0x11, 0xa3, 0x1c,
+	0xa9, 0x6e, 0xa0, 0x95, 0x5e, 0x12, 0xa7, 0x2c, 0x4e, 0xeb, 0xb9, 0xab, 0xca, 0x66, 0x65, 0xef,
+	0x12, 0xcd, 0x04, 0xea, 0x26, 0x5a, 0x1f, 0xf4, 0x26, 0x5d, 0x39, 0xed, 0x9e, 0x8c, 0x87, 0xf5,
+	0xbc, 0xd4, 0x59, 0x1d, 0xf4, 0x26, 0x86, 0x90, 0x87, 0xe3, 0xa1, 0xba, 0x81, 0xca, 0x99, 0xb5,
+	0x7a, 0x01, 0x54, 0xe8, 0x74, 0xae, 0xdd, 0x46, 0x05, 0xb0, 0xa7, 0x5e, 0x41, 0x38, 0x78, 0xe0,
+	0x91, 0x6e, 0xe8, 0xf8, 0x1e, 0x31, 0xac, 0xa6, 0x45, 0x4c, 0x7c, 0x49, 0x5d, 0x43, 0xc8, 0xb3,
+	0x75, 0xcb, 0xe9, 0x06, 0xe4, 0x30, 0xc0, 0x8a, 0x5a, 0x46, 0x85, 0xbd, 0xa0, 0x6d, 0xe3, 0xdc,
+	0x6e, 0x19, 0x95, 0x26, 0xc9, 0xc9, 0xb8, 0xc7, 0xb4, 0x5f, 0x2b, 0xa8, 0xec, 0x33, 0x30, 0xd6,
+	0x63, 0xea, 0x3d, 0x54, 0x48, 0xd9, 0x93, 0x94, 0x2f, 0xb9, 0xba, 0x7d, 0xfd, 0x9c, 0x25, 0x07,
+	0xec, 0x49, 0xea, 0x8f, 0xa2, 0x98, 0x72, 0x90, 0xda, 0x44, 0x95, 0x09, 0x8b, 0xd3, 0xe1, 0x71,
+	0xb6, 0xde, 0xea, 0xf6, 0xe6, 0x39, 0x0c, 0x7e, 0xa6, 0x4f, 0x67, 0x50, 0xed, 0x1f, 0x79, 0x54,
+	0x22, 0x71, 0x3a, 0x4c, 0x4f, 0x55, 0x15, 0x15, 0xe2, 0xe8, 0x58, 0x6c, 0x41, 0x85, 0xf2, 0xb1,
+	0xfa, 0x81, 0xdc, 0x96, 0x1c, 0xdf, 0x96, 0x1b, 0xe7, 0x58, 0x10, 0x44, 0xf3, 0x9b, 0xe2, 0xa2,
+	0xf2, 0x31, 0x4b, 0xa3, 0x7e, 0x94, 0x46, 0xf5, 0xfc, 0xd5, 0xfc, 0x66, 0x75, 0x7b, 0xe7, 0x62,
+	0x1c, 0x6d, 0x89, 0x22, 0x71, 0x3a, 0x3e, 0xa5, 0x53, 0x12, 0xd8, 0x9f, 0x49, 0x74, 0x34, 0x84,
+	0x00, 0xf2, 0xfd, 0xc9, 0xd1, 0xe9, 0x5c, 0xdd, 0x03, 0x63, 0x31, 0x4f, 0xb1, 0x7a, 0x91, 0x1b,
+	0x7b, 0xf3, 0x42, 0xc6, 0xda, 0x02, 0x44, 0xa7, 0xe8, 0x8d, 0x7b, 0x68, 0x75, 0xc1, 0x01, 0x15,
+	0xa3, 0xfc, 0xa7, 0xec, 0x54, 0x86, 0x06, 0x86, 0xea, 0x15, 0x54, 0x7c, 0x1c, 0x1d, 0x9d, 0x88,
+	0xd0, 0x54, 0xa8, 0x98, 0xdc, 0xcd, 0xdd, 0x51, 0xb4, 0x53, 0x99, 0x26, 0x55, 0xb4, 0x12, 0x3a,
+	0xf7, 0x1d, 0xf7, 0xc0, 0xc1, 0x97, 0x54, 0x84, 0x4a, 0x1e, 0xa1, 0xbe, 0xeb, 0x60, 0x45, 0xad,
+	0xa1, 0xb2, 0xed, 0x1a, 0x7a, 0x60, 0xb9, 0x0e, 0xce, 0xa9, 0x18, 0xd5, 0x5c, 0xda, 0xd2, 0x1d,
+	0xeb, 0x63, 0x21, 0xc9, 0xab, 0x15, 0x54, 0x24, 0x1d, 0xe2, 0x04, 0xb8, 0xa0, 0xae, 0xa3, 0xea,
+	0x81, 0x4b, 0xef, 0x77, 0xdd, 0x66, 0x57, 0xa7, 0x01, 0x2e, 0xaa, 0x97, 0xd1, 0xaa, 0xe1, 0x3a,
+	0x7e, 0xd8, 0x26, 0xb4, 0xdb, 0x72, 0x5d, 0x13, 0x97, 0x40, 0xdd, 0x0d, 0xf6, 0x08, 0xc5, 0x2b,
+	0xda, 0x2f, 0x73, 0xa8, 0x18, 0x24, 0x9f, 0xb2, 0xf8, 0x9b, 0x25, 0xd7, 0x47, 0x68, 0x6d, 0x14,
+	0x8d, 0xd3, 0x6e, 0xf2, 0xa8, 0x3b, 0x19, 0x31, 0xd6, 0xfb, 0x44, 0x66, 0xd8, 0xcd, 0x73, 0x68,
+	0xbc, 0x68, 0x9c, 0xba, 0x8f, 0x7c, 0x0e, 0xa1, 0xb5, 0xd1, 0xdc, 0x4c, 0xed, 0xa0, 0xf5, 0x3e,
+	0x1b, 0xb1, 0xb8, 0xcf, 0xe2, 0xde, 0x69, 0x97, 0xf5, 0x07, 0x8c, 0x9f, 0xc0, 0xea, 0xf6, 0x5b,
+	0xe7, 0x1d, 0xf5, 0x29, 0x8a, 0xf4, 0x07, 0x8c, 0xae, 0xf5, 0x17, 0xe6, 0xb0, 0x0d, 0x47, 0xec,
+	0xf8, 0x38, 0x92, 0x87, 0x55, 0x4c, 0xb4, 0x9f, 0xa2, 0xca, 0x34, 0xdb, 0x21, 0x65, 0x46, 0xc9,
+	0x51, 0x34, 0x1e, 0xa6, 0x62, 0x03, 0x73, 0x74, 0x3a, 0x57, 0x5f, 0x42, 0x95, 0xe3, 0x68, 0x10,
+	0x0f, 0xd3, 0x93, 0xbe, 0xd8, 0xc9, 0x1c, 0x9d, 0x09, 0x80, 0x7c, 0xd2, 0x4b, 0xc6, 0xc2, 0xd5,
+	0x1c, 0x15, 0x13, 0xed, 0xaf, 0x97, 0x51, 0x6d, 0x7e, 0xa5, 0xaa, 0x8e, 0xf2, 0x69, 0x34, 0x90,
+	0xa5, 0x6b, 0x6b, 0x89, 0x18, 0x35, 0x82, 0x68, 0x40, 0x01, 0xab, 0xee, 0xa3, 0x52, 0x34, 0x19,
+	0xb1, 0x5e, 0x2a, 0x4f, 0xda, 0xf6, 0x32, 0x2c, 0x3a, 0x47, 0x52, 0xc9, 0xa0, 0x9a, 0xa8, 0xd0,
+	0x8b, 0x26, 0xc2, 0xe9, 0xb5, 0xed, 0xb7, 0x97, 0x61, 0x32, 0xa2, 0x09, 0xa3, 0x1c, 0x0d, 0x2c,
+	0x8f, 0x92, 0xf1, 0x31, 0x8f, 0xeb, 0x92, 0x2c, 0xcd, 0x64, 0x7c, 0x4c, 0x39, 0x1a, 0xd6, 0x35,
+	0x80, 0xed, 0x1a, 0xd7, 0x8b, 0xcb, 0xaf, 0xab, 0xc5, 0x91, 0x54, 0x32, 0x80, 0x47, 0xc7, 0x49,
+	0xd2, 0xaf, 0x97, 0x96, 0xf7, 0xa8, 0x9d, 0x24, 0x7d, 0xca, 0xd1, 0xe0, 0x51, 0x7c, 0x72, 0xfc,
+	0x90, 0x8d, 0xeb, 0x2b, 0xcb, 0x7b, 0xe4, 0x70, 0x24, 0x95, 0x0c, 0xc0, 0x35, 0x62, 0xe3, 0x49,
+	0x12, 0xd7, 0xcb, 0xcb, 0x73, 0x79, 0x1c, 0x49, 0x25, 0x03, 0xe7, 0x1a, 0x27, 0x23, 0x36, 0xae,
+	0x57, 0xbe, 0x06, 0x17, 0x47, 0x52, 0xc9, 0xa0, 0x3e, 0x40, 0xd5, 0x31, 0xeb, 0x0d, 0x47, 0xe3,
+	0xa4, 0x07, 0x49, 0x8f, 0x38, 0xe1, 0x7b, 0xcb, 0x10, 0xd2, 0x19, 0x9c, 0xce, 0x73, 0xa9, 0x2d,
+	0x54, 0x4c, 0x59, 0x3c, 0x61, 0xf5, 0x2a, 0x27, 0xbd, 0xb5, 0x54, 0xb6, 0x03, 0x90, 0x0a, 0x3c,
+	0x10, 0x3d, 0x4e, 0x86, 0x3d, 0x56, 0xaf, 0x2d, 0x4f, 0xd4, 0x01, 0x20, 0x15, 0x78, 0xed, 0x57,
+	0x0a, 0xca, 0x07, 0xd1, 0x60, 0xb1, 0xdc, 0xae, 0xa0, 0xbc, 0x6e, 0xee, 0x63, 0x45, 0x0c, 0x3c,
+	0x9c, 0x13, 0x83, 0x0e, 0xce, 0x43, 0x5f, 0x36, 0x5c, 0x67, 0x1f, 0x17, 0x40, 0x64, 0x12, 0x28,
+	0xaa, 0x65, 0x54, 0x70, 0xdc, 0xd0, 0xc1, 0x25, 0x10, 0x39, 0x61, 0x1b, 0xaf, 0x80, 0xc8, 0xa3,
+	0xae, 0x83, 0xcb, 0x20, 0xf2, 0x68, 0x80, 0x2b, 0x50, 0x67, 0xbd, 0xd0, 0x31, 0x02, 0x8c, 0xe0,
+	0xd7, 0x0e, 0xa1, 0xbb, 0xb8, 0xaa, 0x16, 0x91, 0x72, 0x88, 0x6b, 0xf0, 0x9b, 0xde, 0x6c, 0x5a,
+	0x87, 0x78, 0x55, 0x73, 0x51, 0x49, 0x1c, 0x48, 0x55, 0x45, 0x6b, 0x3a, 0xdc, 0x10, 0x82, 0xee,
+	0xcc, 0x31, 0xb8, 0x25, 0x10, 0xda, 0x24, 0x46, 0x60, 0x75, 0x08, 0x56, 0xa0, 0xfa, 0x5b, 0xed,
+	0x39, 0x49, 0x0e, 0x4a, 0xbe, 0x47, 0xdd, 0x16, 0x25, 0xbe, 0x0f, 0x82, 0xbc, 0xf6, 0x3f, 0x05,
+	0x15, 0xe0, 0x60, 0x82, 0xae, 0xa1, 0xfb, 0x64, 0x91, 0x4d, 0x37, 0x8c, 0xd0, 0xd7, 0x25, 0xdb,
+	0x2a, 0xaa, 0xe8, 0x26, 0x78, 0x66, 0xe9, 0x36, 0xce, 0x89, 0x66, 0xd1, 0xf6, 0x6c, 0xd2, 0x26,
+	0x0e, 0xd7, 0xc8, 0x43, 0x1f, 0x32, 0x85, 0x76, 0x01, 0xfa, 0x50, 0x8b, 0x38, 0x16, 0x9f, 0x15,
+	0xb9, 0x27, 0x8e, 0x1f, 0xd0, 0x10, 0x94, 0x75, 0x1b, 0x97, 0x66, 0x7d, 0xaa, 0x43, 0xf0, 0x0a,
+	0xd8, 0x72, 0xdc, 0xb6, 0xe5, 0x88, 0x79, 0x19, 0xe2, 0xed, 0xee, 0xda, 0xd6, 0x47, 0x21, 0xc1,
+	0x15, 0x30, 0xec, 0xe9, 0x34, 0x10, 0x5c, 0x08, 0x0c, 0x7b, 0x94, 0x78, 0xae, 0x6f, 0x41, 0x4b,
+	0xd3, 0x6d, 0x5c, 0x85, 0x60, 0x50, 0xd2, 0xb4, 0xc9, 0xa1, 0xd5, 0x21, 0x5d, 0x58, 0x06, 0xae,
+	0x81, 0x1a, 0x25, 0x36, 0x27, 0x14, 0xa2, 0x55, 0xb0, 0xd9, 0xc9, 0x6c, 0xae, 0x69, 0x9f, 0x2b,
+	0xa8, 0x00, 0xd5, 0x04, 0x9c, 0x6b, 0xba, 0xb4, 0x3d, 0xb7, 0xf4, 0x1a, 0x2a, 0xeb, 0x26, 0x38,
+	0xa4, 0xdb, 0x72, 0xe1, 0xe1, 0xa1, 0x65, 0x5b, 0x3a, 0x7d, 0x80, 0x73, 0x60, 0x6c, 0x6e, 0xe1,
+	0x1f, 0x13, 0x8a, 0xf3, 0x9c, 0xc2, 0x72, 0x74, 0xbb, 0x4b, 0x1c, 0xd3, 0x72, 0x5a, 0xb8, 0x00,
+	0xb1, 0x68, 0x11, 0x1a, 0x3a, 0x26, 0x2e, 0xc2, 0x98, 0x12, 0xdd, 0xb6, 0x7c, 0xb1, 0x6e, 0x8b,
+	0xca, 0xd9, 0x0a, 0x6c, 0xad, 0xbf, 0xe7, 0xd2, 0x00, 0x97, 0x61, 0xdb, 0x6d, 0xd7, 0x69, 0x89,
+	0x5c, 0x70, 0xa9, 0x49, 0x28, 0x46, 0xa0, 0x2d, 0xaf, 0x81, 0x06, 0xae, 0x6a, 0x04, 0x95, 0x44,
+	0xd9, 0x02, 0x1f, 0x5a, 0xc4, 0x31, 0x09, 0x5d, 0x74, 0xba, 0x49, 0xda, 0x96, 0x63, 0x39, 0x72,
+	0xb7, 0xda, 0xba, 0x6f, 0x84, 0x36, 0x4c, 0x73, 0xe0, 0x82, 0x43, 0xc2, 0x00, 0x9c, 0xd5, 0x7e,
+	0x81, 0x0a, 0x50, 0xb3, 0xc0, 0xe9, 0xb6, 0xeb, 0x9a, 0x73, 0x14, 0x57, 0x10, 0x36, 0x5c, 0xc7,
+	0x94, 0x81, 0xed, 0xc2, 0xaf, 0x58, 0x81, 0xcd, 0xe1, 0x69, 0xa4, 0xcb, 0x24, 0x82, 0xb9, 0x63,
+	0x5a, 0x32, 0x90, 0x79, 0x88, 0xb4, 0xe5, 0x04, 0x84, 0x52, 0xb7, 0x95, 0xed, 0x7e, 0x15, 0xad,
+	0xec, 0x87, 0x22, 0xc7, 0x8a, 0x90, 0x74, 0x7e, 0xb8, 0xbb, 0x0f, 0xe9, 0x0d, 0x82, 0x92, 0xf6,
+	0x21, 0x2a, 0x89, 0x62, 0x07, 0xeb, 0x70, 0xc2, 0xf6, 0xee, 0xd9, 0x75, 0xf8, 0x96, 0xd3, 0x0a,
+	0x6d, 0x9d, 0x62, 0x85, 0xdf, 0x6d, 0xec, 0x90, 0xf2, 0x94, 0x2b, 0xa3, 0x82, 0x19, 0xea, 0x36,
+	0xce, 0x6b, 0x01, 0x2a, 0x89, 0x12, 0x07, 0x0c, 0xe2, 0xee, 0x33, 0xc7, 0x50, 0x41, 0xc5, 0xa6,
+	0x45, 0xfd, 0x40, 0xc0, 0x7d, 0x02, 0x6b, 0xc2, 0x39, 0x10, 0x07, 0x7b, 0x16, 0x35, 0x71, 0x1e,
+	0x16, 0x3a, 0x4b, 0x18, 0x79, 0x77, 0x2a, 0x68, 0x77, 0x50, 0x49, 0x14, 0x3b, 0xce, 0x4a, 0x5d,
+	0x6f, 0xc1, 0x2f, 0xf0, 0x84, 0xcb, 0x44, 0x48, 0x1c, 0x37, 0xe8, 0xca, 0x79, 0x4e, 0xdb, 0x47,
+	0xd5, 0xb9, 0xaa, 0xa6, 0xbe, 0x88, 0x9e, 0xa3, 0xc4, 0xb0, 0x3c, 0xea, 0x1a, 0x56, 0xf0, 0x60,
+	0xf1, 0x4c, 0x65, 0x3f, 0xf0, 0xd4, 0x82, 0xf5, 0xbb, 0x4e, 0x77, 0x4e, 0x96, 0xd3, 0x26, 0xa8,
+	0xc8, 0x8b, 0x19, 0xc4, 0x35, 0x20, 0xce, 0xc2, 0x99, 0x7c, 0x1e, 0x5d, 0x9e, 0xdf, 0x20, 0xfe,
+	0xb3, 0x58, 0x65, 0x33, 0x0c, 0x42, 0x4a, 0x44, 0x90, 0x3c, 0xdd, 0x0f, 0x70, 0x1e, 0x36, 0xc1,
+	0xa3, 0xc4, 0x17, 0x97, 0xbd, 0x55, 0x54, 0x99, 0xd6, 0x02, 0x5c, 0x14, 0x1f, 0x14, 0x61, 0x36,
+	0x2f, 0x69, 0xbb, 0xa8, 0xc8, 0x0b, 0x1f, 0x18, 0xed, 0xb8, 0x96, 0x41, 0x16, 0x17, 0xae, 0x1b,
+	0xb3, 0x22, 0x60, 0xe8, 0x59, 0x4d, 0xc8, 0x71, 0x13, 0x7a, 0x56, 0x4b, 0xfe, 0xbb, 0x82, 0xd6,
+	0x16, 0x6f, 0x54, 0xea, 0x26, 0xc2, 0x9f, 0xb0, 0xa8, 0xdf, 0x4d, 0xe1, 0xde, 0xd8, 0x1d, 0xc6,
+	0x7d, 0xf6, 0x84, 0x5f, 0x65, 0x8a, 0x74, 0x0d, 0xe4, 0xfc, 0x3a, 0x69, 0x81, 0x54, 0xb5, 0x50,
+	0xf1, 0x28, 0x7a, 0xc8, 0x8e, 0xe4, 0x1d, 0x65, 0x67, 0xa9, 0x9b, 0x5b, 0xc3, 0x06, 0x28, 0x15,
+	0x0c, 0xda, 0xbf, 0x4b, 0xa8, 0xc8, 0x05, 0x5f, 0xba, 0x25, 0xeb, 0xbb, 0xbb, 0x94, 0x74, 0xb0,
+	0xc2, 0x4b, 0x2a, 0x1c, 0x62, 0x91, 0x15, 0xba, 0xd9, 0x31, 0x6c, 0x51, 0xbf, 0x74, 0xb3, 0xd3,
+	0x76, 0x4d, 0x5c, 0x80, 0x30, 0xea, 0x30, 0x2a, 0x72, 0x05, 0xcf, 0x73, 0xe1, 0xf0, 0x82, 0x30,
+	0x08, 0x28, 0x5e, 0xe1, 0x15, 0x3f, 0x3c, 0x14, 0x95, 0x4a, 0x0f, 0x0f, 0x21, 0x08, 0xb8, 0xa2,
+	0x96, 0x50, 0xce, 0x30, 0x30, 0x02, 0x88, 0xc1, 0xe9, 0xab, 0xd3, 0x8e, 0xc0, 0xcb, 0xb8, 0x01,
+	0xe7, 0x00, 0xaf, 0xf2, 0x28, 0xc2, 0x90, 0xc3, 0xd6, 0x44, 0xaf, 0xf0, 0xf0, 0x7a, 0xd6, 0x34,
+	0x30, 0x28, 0x98, 0x96, 0x6f, 0xb8, 0x21, 0xf5, 0x09, 0xbe, 0xcc, 0x13, 0xdf, 0xdd, 0xdd, 0xc7,
+	0x2a, 0x8c, 0xc8, 0xa1, 0x67, 0xe3, 0xe7, 0x78, 0x81, 0x75, 0x89, 0x7f, 0x60, 0x05, 0x7b, 0xf8,
+	0x0a, 0xc8, 0x2d, 0xd0, 0x78, 0x1e, 0x46, 0x6d, 0x9d, 0xde, 0xc7, 0x2f, 0x00, 0x5b, 0xfb, 0x80,
+	0xe0, 0x17, 0xc5, 0xa0, 0x83, 0xeb, 0xbc, 0x03, 0x91, 0x16, 0xfe, 0x1e, 0x38, 0xea, 0x38, 0x78,
+	0x03, 0x48, 0x1c, 0x4f, 0xae, 0xf9, 0xfb, 0xe0, 0xa1, 0xc3, 0x3d, 0x7c, 0x09, 0x1c, 0x70, 0xa6,
+	0x1e, 0xbe, 0x9c, 0xb5, 0xae, 0x1f, 0xf0, 0x3a, 0xc2, 0x0f, 0x2c, 0x7e, 0x05, 0xda, 0x93, 0x87,
+	0xaf, 0xca, 0xf2, 0xac, 0x07, 0xfa, 0xa1, 0xe5, 0xe3, 0x57, 0x45, 0x4a, 0xd0, 0x00, 0x18, 0x35,
+	0xde, 0xd6, 0x78, 0x20, 0x5e, 0xe3, 0x79, 0x09, 0x1e, 0xbe, 0x2e, 0x46, 0xbe, 0x8f, 0xaf, 0x71,
+	0x5d, 0xd7, 0x0f, 0xc0, 0xa7, 0x1f, 0xca, 0x74, 0xe5, 0xda, 0xd7, 0xa7, 0x13, 0x67, 0x1f, 0x6f,
+	0x8a, 0x93, 0x47, 0x20, 0x32, 0x6f, 0x88, 0xde, 0x49, 0x9a, 0xf8, 0x86, 0x1c, 0x79, 0xf8, 0x26,
+	0xb7, 0x42, 0x5d, 0xc7, 0xc6, 0x6f, 0x66, 0x0d, 0xf5, 0x2d, 0x58, 0xa1, 0xe7, 0xe3, 0x06, 0xac,
+	0xf0, 0xa3, 0x50, 0x77, 0xb8, 0x3f, 0x5b, 0xa0, 0x49, 0x0d, 0x18, 0xbe, 0x0d, 0x3f, 0xf0, 0x21,
+	0x25, 0x36, 0xbe, 0xc5, 0x7f, 0x30, 0xa9, 0xeb, 0xe1, 0x6d, 0xa0, 0x00, 0x03, 0x3b, 0xe0, 0x03,
+	0x25, 0x6d, 0x47, 0x77, 0x02, 0xfc, 0x8e, 0x38, 0xb9, 0xb0, 0x4e, 0xc7, 0x0c, 0xdb, 0xf8, 0x5d,
+	0xb0, 0x4e, 0x5d, 0x37, 0xc0, 0xb7, 0x61, 0xe4, 0x43, 0x70, 0xde, 0xe3, 0xa3, 0xb0, 0xd9, 0xc4,
+	0x77, 0x60, 0xc4, 0x2d, 0xfe, 0x88, 0x17, 0x1d, 0xd7, 0xb3, 0x0c, 0x7c, 0x97, 0x37, 0x76, 0x10,
+	0xde, 0x5b, 0x68, 0x44, 0xef, 0x83, 0xca, 0x21, 0x5f, 0xf6, 0x8f, 0x79, 0xb9, 0x0a, 0x79, 0xaf,
+	0xff, 0x80, 0x23, 0xad, 0xc0, 0x26, 0xf8, 0x27, 0xa2, 0x1f, 0x75, 0xbc, 0x3d, 0x40, 0x7f, 0x28,
+	0x53, 0x0e, 0x8e, 0x21, 0xd6, 0x79, 0x76, 0x86, 0x87, 0x9d, 0x0e, 0xde, 0x85, 0xa1, 0xc9, 0xad,
+	0x1a, 0xa0, 0xd2, 0x74, 0x29, 0xb1, 0x5a, 0x0e, 0x36, 0x21, 0x14, 0xf7, 0x0f, 0x30, 0xe1, 0x1d,
+	0xc6, 0xf2, 0x03, 0xdc, 0x14, 0x77, 0x92, 0xb6, 0x81, 0x5b, 0x3c, 0x01, 0xdc, 0xb6, 0xc8, 0xcb,
+	0x3d, 0xe8, 0x08, 0xd9, 0x8c, 0x6f, 0xbc, 0xc5, 0x35, 0xc3, 0xb6, 0x81, 0xf7, 0x21, 0x2c, 0x86,
+	0xeb, 0xe1, 0xfb, 0x10, 0x09, 0xd3, 0xf2, 0x79, 0xf3, 0x26, 0x26, 0xb6, 0xb5, 0xbf, 0x29, 0x68,
+	0x75, 0xe1, 0x5b, 0xf7, 0x9b, 0x7d, 0x1f, 0x92, 0x85, 0x57, 0x81, 0x5b, 0xcb, 0x7c, 0x64, 0xcf,
+	0x3d, 0x0e, 0x68, 0x6f, 0xcb, 0x0f, 0x65, 0x8c, 0x6a, 0xf2, 0x3d, 0xe5, 0x69, 0x75, 0x1c, 0xa1,
+	0x92, 0xe1, 0xb6, 0xdb, 0xf0, 0xad, 0xac, 0xb5, 0x50, 0x39, 0x73, 0x45, 0xad, 0xcf, 0xde, 0x7b,
+	0xc4, 0x67, 0xf9, 0xf4, 0xb5, 0xe7, 0x55, 0x54, 0x7b, 0xc8, 0x06, 0xc3, 0xb8, 0x9b, 0x3c, 0x7a,
+	0x34, 0x61, 0xe2, 0x93, 0xaa, 0x48, 0xab, 0x5c, 0xe6, 0x72, 0x91, 0xf6, 0x27, 0x05, 0xbd, 0xa8,
+	0xc7, 0xd1, 0xd1, 0xe9, 0xcf, 0xd9, 0xec, 0x59, 0x84, 0xfd, 0xec, 0x84, 0x4d, 0x52, 0xd5, 0x40,
+	0xe5, 0xbe, 0x7c, 0x5f, 0xba, 0x60, 0x78, 0xb2, 0xe7, 0x28, 0x3a, 0x05, 0xaa, 0x1e, 0x5a, 0x65,
+	0x71, 0x2f, 0xe9, 0x0f, 0xe3, 0x41, 0x77, 0x2e, 0x56, 0x37, 0xcf, 0x8d, 0x95, 0xc0, 0xf0, 0x28,
+	0xd5, 0xd8, 0xdc, 0x4c, 0xfb, 0xa7, 0x82, 0xea, 0x5f, 0x76, 0x79, 0x32, 0x4a, 0xa0, 0x0f, 0x1d,
+	0x20, 0x35, 0x33, 0xdd, 0x9d, 0xbd, 0x0b, 0x29, 0x4b, 0xbe, 0x0b, 0x5d, 0xce, 0x38, 0x16, 0x3e,
+	0x9e, 0xa7, 0xef, 0x61, 0xb9, 0xc5, 0xf7, 0x30, 0x95, 0x88, 0x37, 0x28, 0x16, 0xf7, 0xd8, 0x44,
+	0xbe, 0xee, 0x5c, 0xbf, 0x80, 0x2d, 0xd0, 0xa7, 0x33, 0x24, 0x5c, 0xf2, 0x5e, 0x90, 0x0b, 0xe3,
+	0xa9, 0x32, 0x64, 0x93, 0xef, 0xf8, 0x56, 0x3c, 0x99, 0x26, 0xcf, 0xcc, 0x61, 0xb9, 0x11, 0x3a,
+	0x2a, 0x33, 0x29, 0xab, 0x2b, 0x3c, 0x24, 0xd7, 0x2e, 0x74, 0x3c, 0xe8, 0x14, 0xf6, 0xac, 0x90,
+	0x6b, 0x7f, 0x54, 0xd0, 0x95, 0x2c, 0x09, 0x4e, 0xe3, 0x34, 0x7a, 0xf2, 0x1d, 0x8f, 0xd4, 0x5f,
+	0x14, 0xf4, 0xfc, 0x19, 0x7f, 0x65, 0xa0, 0x16, 0x92, 0x47, 0xf9, 0xba, 0xc9, 0xa3, 0xbe, 0x8f,
+	0x4a, 0xfc, 0xe2, 0x32, 0xa9, 0xe7, 0x38, 0xc7, 0xeb, 0xe7, 0x55, 0x32, 0x50, 0xa6, 0x12, 0xb3,
+	0x10, 0xea, 0xfc, 0x99, 0x50, 0xff, 0x2e, 0x8f, 0x9e, 0xd3, 0xc5, 0xa3, 0x35, 0x83, 0xa2, 0xf3,
+	0xad, 0x46, 0xfa, 0x00, 0x95, 0x1f, 0xb1, 0x28, 0x3d, 0x19, 0xb3, 0x89, 0x7c, 0x5b, 0xbb, 0x77,
+	0x0e, 0xc9, 0x53, 0x5c, 0x69, 0x34, 0x25, 0x05, 0x9d, 0x92, 0x7d, 0x79, 0x0b, 0xf3, 0xdf, 0x70,
+	0x0b, 0x37, 0x7e, 0xab, 0xa0, 0x72, 0x66, 0x48, 0xbd, 0x86, 0xd6, 0xd8, 0x93, 0x74, 0x1c, 0xf5,
+	0xd2, 0xee, 0x84, 0xef, 0x27, 0x0f, 0x41, 0x99, 0xae, 0x4a, 0xa9, 0xd8, 0x64, 0xf5, 0x0d, 0x84,
+	0x33, 0xb5, 0xe9, 0x69, 0xc8, 0x71, 0xc5, 0x75, 0x29, 0xcf, 0x0e, 0x8e, 0xfa, 0x3e, 0xda, 0xc8,
+	0x54, 0x9f, 0x52, 0xc1, 0xf2, 0x1c, 0x54, 0x97, 0x1a, 0xe6, 0xd9, 0xf2, 0xa4, 0x7d, 0x91, 0x83,
+	0xf3, 0x30, 0x1f, 0x99, 0xef, 0x52, 0x7a, 0xcd, 0x17, 0x83, 0xfc, 0xd7, 0x2b, 0x06, 0x4f, 0x2f,
+	0xec, 0x85, 0x6f, 0xb7, 0xb0, 0x17, 0x17, 0x53, 0xff, 0xc6, 0x1d, 0x54, 0x9b, 0x4f, 0x08, 0x71,
+	0x17, 0x71, 0x08, 0xbe, 0x04, 0xa3, 0x30, 0x68, 0xde, 0x11, 0xd7, 0xf3, 0x30, 0x68, 0xde, 0xba,
+	0x2d, 0xae, 0xe7, 0x61, 0xd0, 0xdc, 0xd9, 0xc6, 0xf9, 0xed, 0xbf, 0x17, 0xd1, 0xba, 0x2d, 0x69,
+	0x7c, 0xf1, 0x57, 0x91, 0xfa, 0x67, 0x05, 0xe1, 0xb3, 0x8d, 0x4b, 0xbd, 0x7d, 0x6e, 0xba, 0x3f,
+	0xb5, 0x39, 0x6f, 0xbc, 0xb7, 0x34, 0x4e, 0x24, 0x84, 0xd6, 0xf8, 0xec, 0x8b, 0x7f, 0xfd, 0x26,
+	0xb7, 0xa9, 0xbd, 0x36, 0xfd, 0x4f, 0x2b, 0x8b, 0xc9, 0xe4, 0x6e, 0x74, 0x06, 0x74, 0x57, 0xb9,
+	0xa1, 0x7e, 0xae, 0xa0, 0xf5, 0x33, 0x45, 0x5e, 0x7d, 0xf7, 0x62, 0xc6, 0xcf, 0x74, 0xb1, 0x8d,
+	0xdb, 0xcb, 0xc2, 0xa4, 0xcb, 0x6f, 0x71, 0x97, 0xaf, 0x6b, 0xda, 0x57, 0xbb, 0x9c, 0x61, 0xc0,
+	0xe3, 0x3f, 0x28, 0x68, 0x75, 0xa1, 0xd6, 0xaa, 0x3b, 0x17, 0x0c, 0xd6, 0x7c, 0x27, 0xd9, 0x78,
+	0x67, 0x39, 0x90, 0xf4, 0xf5, 0x26, 0xf7, 0xf5, 0x9a, 0x76, 0xf5, 0x19, 0xe1, 0xe5, 0x08, 0xf0,
+	0xf4, 0xf7, 0x0a, 0xaa, 0xcd, 0x9f, 0x5a, 0x75, 0x7b, 0xf9, 0xe2, 0xb7, 0xb1, 0xb3, 0x14, 0x46,
+	0xba, 0x79, 0x83, 0xbb, 0xf9, 0xba, 0xf6, 0xca, 0x53, 0xdd, 0x9c, 0x01, 0xee, 0x2a, 0x37, 0x76,
+	0x3f, 0x53, 0xd0, 0xab, 0xbd, 0xe4, 0xf8, 0xd9, 0x66, 0x76, 0xaf, 0x9c, 0x49, 0x77, 0x6f, 0x9c,
+	0xa4, 0x89, 0xa7, 0x7c, 0x4c, 0x24, 0x6c, 0x90, 0x00, 0xa4, 0x91, 0x8c, 0x07, 0x5b, 0x03, 0x16,
+	0xf3, 0x7f, 0x3e, 0xb7, 0xc4, 0x4f, 0xd1, 0x68, 0x38, 0xf9, 0x8a, 0xff, 0x5b, 0xef, 0x65, 0x82,
+	0x87, 0x25, 0x8e, 0xd8, 0xf9, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xf6, 0xe5, 0xb1, 0xa0,
+	0x1d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2540,184 +2715,3 @@ var _LanguageService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/language/v1beta1/language_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/language/v1beta1/language_service.proto", fileDescriptor_language_service_a20715f4ac30e6a8)
-}
-
-var fileDescriptor_language_service_a20715f4ac30e6a8 = []byte{
-	// 2755 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4f, 0x73, 0xdb, 0xc6,
-	0x15, 0x37, 0xf8, 0x4f, 0xe4, 0x92, 0x92, 0xd6, 0x88, 0x93, 0xb0, 0x6a, 0xd2, 0x38, 0x48, 0x5c,
-	0x2b, 0x76, 0x42, 0xc5, 0x52, 0xe2, 0xb8, 0x76, 0x9a, 0x06, 0x02, 0x96, 0x14, 0x64, 0x10, 0x40,
-	0x16, 0x00, 0x25, 0xa7, 0x07, 0x0e, 0x4c, 0xae, 0x19, 0x4e, 0x24, 0x80, 0x25, 0x21, 0x8f, 0xd5,
-	0x4b, 0x67, 0x32, 0xd3, 0x63, 0xa7, 0x87, 0xde, 0x7a, 0x6c, 0x0f, 0x3d, 0x75, 0xd2, 0x99, 0x5e,
-	0xda, 0x0f, 0xd0, 0x43, 0xa7, 0xc7, 0xcc, 0xf4, 0x13, 0xf4, 0xd8, 0x43, 0x0f, 0x3d, 0xf4, 0xd8,
-	0x79, 0xbb, 0x0b, 0xfe, 0x51, 0x1c, 0x4b, 0x4c, 0x72, 0xc8, 0x6d, 0xf7, 0xf1, 0xfd, 0x7e, 0xef,
-	0xed, 0xdb, 0xb7, 0xef, 0x2d, 0x96, 0xe8, 0x9d, 0x41, 0x92, 0x0c, 0x8e, 0xd8, 0x56, 0xef, 0x28,
-	0x39, 0xe9, 0x6f, 0x1d, 0x45, 0xf1, 0xe0, 0x24, 0x1a, 0xb0, 0xad, 0xc7, 0xb7, 0x1e, 0xb2, 0x34,
-	0xba, 0x35, 0x15, 0x74, 0x27, 0x6c, 0xfc, 0x78, 0xd8, 0x63, 0x8d, 0xd1, 0x38, 0x49, 0x13, 0xf5,
-	0x65, 0x81, 0x6a, 0x70, 0x54, 0x23, 0x53, 0x6a, 0x48, 0xd4, 0xc6, 0x4b, 0x92, 0x34, 0x1a, 0x0d,
-	0xb7, 0xa2, 0x38, 0x4e, 0xd2, 0x28, 0x1d, 0x26, 0xf1, 0x44, 0x80, 0xb5, 0xff, 0x28, 0xa8, 0x6c,
-	0x26, 0xbd, 0x93, 0x63, 0x16, 0xa7, 0xea, 0x87, 0xa8, 0x90, 0x9e, 0x8e, 0x58, 0x5d, 0xb9, 0xaa,
-	0x6c, 0xae, 0x6d, 0xbf, 0xd9, 0x78, 0x26, 0x71, 0x23, 0x83, 0x35, 0x82, 0xd3, 0x11, 0xa3, 0x1c,
-	0xa9, 0x6e, 0xa0, 0x95, 0x5e, 0x12, 0xa7, 0x2c, 0x4e, 0xeb, 0xb9, 0xab, 0xca, 0x66, 0x65, 0xef,
-	0x12, 0xcd, 0x04, 0xea, 0x26, 0x5a, 0x1f, 0xf4, 0x26, 0x5d, 0x39, 0xed, 0x9e, 0x8c, 0x87, 0xf5,
-	0xbc, 0xd4, 0x59, 0x1d, 0xf4, 0x26, 0x86, 0x90, 0x87, 0xe3, 0xa1, 0xba, 0x81, 0xca, 0x99, 0xb5,
-	0x7a, 0x01, 0x54, 0xe8, 0x74, 0xae, 0xdd, 0x46, 0x05, 0xb0, 0xa7, 0x5e, 0x41, 0x38, 0x78, 0xe0,
-	0x91, 0x6e, 0xe8, 0xf8, 0x1e, 0x31, 0xac, 0xa6, 0x45, 0x4c, 0x7c, 0x49, 0x5d, 0x43, 0xc8, 0xb3,
-	0x75, 0xcb, 0xe9, 0x06, 0xe4, 0x30, 0xc0, 0x8a, 0x5a, 0x46, 0x85, 0xbd, 0xa0, 0x6d, 0xe3, 0xdc,
-	0x6e, 0x19, 0x95, 0x26, 0xc9, 0xc9, 0xb8, 0xc7, 0xb4, 0x5f, 0x2b, 0xa8, 0xec, 0x33, 0x30, 0xd6,
-	0x63, 0xea, 0x3d, 0x54, 0x48, 0xd9, 0x93, 0x94, 0x2f, 0xb9, 0xba, 0x7d, 0xfd, 0x9c, 0x25, 0x07,
-	0xec, 0x49, 0xea, 0x8f, 0xa2, 0x98, 0x72, 0x90, 0xda, 0x44, 0x95, 0x09, 0x8b, 0xd3, 0xe1, 0x71,
-	0xb6, 0xde, 0xea, 0xf6, 0xe6, 0x39, 0x0c, 0x7e, 0xa6, 0x4f, 0x67, 0x50, 0xed, 0x1f, 0x79, 0x54,
-	0x22, 0x71, 0x3a, 0x4c, 0x4f, 0x55, 0x15, 0x15, 0xe2, 0xe8, 0x58, 0x6c, 0x41, 0x85, 0xf2, 0xb1,
-	0xfa, 0x81, 0xdc, 0x96, 0x1c, 0xdf, 0x96, 0x1b, 0xe7, 0x58, 0x10, 0x44, 0xf3, 0x9b, 0xe2, 0xa2,
-	0xf2, 0x31, 0x4b, 0xa3, 0x7e, 0x94, 0x46, 0xf5, 0xfc, 0xd5, 0xfc, 0x66, 0x75, 0x7b, 0xe7, 0x62,
-	0x1c, 0x6d, 0x89, 0x22, 0x71, 0x3a, 0x3e, 0xa5, 0x53, 0x12, 0xd8, 0x9f, 0x49, 0x74, 0x34, 0x84,
-	0x00, 0xf2, 0xfd, 0xc9, 0xd1, 0xe9, 0x5c, 0xdd, 0x03, 0x63, 0x31, 0x4f, 0xb1, 0x7a, 0x91, 0x1b,
-	0x7b, 0xf3, 0x42, 0xc6, 0xda, 0x02, 0x44, 0xa7, 0xe8, 0x8d, 0x7b, 0x68, 0x75, 0xc1, 0x01, 0x15,
-	0xa3, 0xfc, 0xa7, 0xec, 0x54, 0x86, 0x06, 0x86, 0xea, 0x15, 0x54, 0x7c, 0x1c, 0x1d, 0x9d, 0x88,
-	0xd0, 0x54, 0xa8, 0x98, 0xdc, 0xcd, 0xdd, 0x51, 0xb4, 0x53, 0x99, 0x26, 0x55, 0xb4, 0x12, 0x3a,
-	0xf7, 0x1d, 0xf7, 0xc0, 0xc1, 0x97, 0x54, 0x84, 0x4a, 0x1e, 0xa1, 0xbe, 0xeb, 0x60, 0x45, 0xad,
-	0xa1, 0xb2, 0xed, 0x1a, 0x7a, 0x60, 0xb9, 0x0e, 0xce, 0xa9, 0x18, 0xd5, 0x5c, 0xda, 0xd2, 0x1d,
-	0xeb, 0x63, 0x21, 0xc9, 0xab, 0x15, 0x54, 0x24, 0x1d, 0xe2, 0x04, 0xb8, 0xa0, 0xae, 0xa3, 0xea,
-	0x81, 0x4b, 0xef, 0x77, 0xdd, 0x66, 0x57, 0xa7, 0x01, 0x2e, 0xaa, 0x97, 0xd1, 0xaa, 0xe1, 0x3a,
-	0x7e, 0xd8, 0x26, 0xb4, 0xdb, 0x72, 0x5d, 0x13, 0x97, 0x40, 0xdd, 0x0d, 0xf6, 0x08, 0xc5, 0x2b,
-	0xda, 0x2f, 0x73, 0xa8, 0x18, 0x24, 0x9f, 0xb2, 0xf8, 0x9b, 0x25, 0xd7, 0x47, 0x68, 0x6d, 0x14,
-	0x8d, 0xd3, 0x6e, 0xf2, 0xa8, 0x3b, 0x19, 0x31, 0xd6, 0xfb, 0x44, 0x66, 0xd8, 0xcd, 0x73, 0x68,
-	0xbc, 0x68, 0x9c, 0xba, 0x8f, 0x7c, 0x0e, 0xa1, 0xb5, 0xd1, 0xdc, 0x4c, 0xed, 0xa0, 0xf5, 0x3e,
-	0x1b, 0xb1, 0xb8, 0xcf, 0xe2, 0xde, 0x69, 0x97, 0xf5, 0x07, 0x8c, 0x9f, 0xc0, 0xea, 0xf6, 0x5b,
-	0xe7, 0x1d, 0xf5, 0x29, 0x8a, 0xf4, 0x07, 0x8c, 0xae, 0xf5, 0x17, 0xe6, 0xb0, 0x0d, 0x47, 0xec,
-	0xf8, 0x38, 0x92, 0x87, 0x55, 0x4c, 0xb4, 0x9f, 0xa2, 0xca, 0x34, 0xdb, 0x21, 0x65, 0x46, 0xc9,
-	0x51, 0x34, 0x1e, 0xa6, 0x62, 0x03, 0x73, 0x74, 0x3a, 0x57, 0x5f, 0x42, 0x95, 0xe3, 0x68, 0x10,
-	0x0f, 0xd3, 0x93, 0xbe, 0xd8, 0xc9, 0x1c, 0x9d, 0x09, 0x80, 0x7c, 0xd2, 0x4b, 0xc6, 0xc2, 0xd5,
-	0x1c, 0x15, 0x13, 0xed, 0xaf, 0x97, 0x51, 0x6d, 0x7e, 0xa5, 0xaa, 0x8e, 0xf2, 0x69, 0x34, 0x90,
-	0xa5, 0x6b, 0x6b, 0x89, 0x18, 0x35, 0x82, 0x68, 0x40, 0x01, 0xab, 0xee, 0xa3, 0x52, 0x34, 0x19,
-	0xb1, 0x5e, 0x2a, 0x4f, 0xda, 0xf6, 0x32, 0x2c, 0x3a, 0x47, 0x52, 0xc9, 0xa0, 0x9a, 0xa8, 0xd0,
-	0x8b, 0x26, 0xc2, 0xe9, 0xb5, 0xed, 0xb7, 0x97, 0x61, 0x32, 0xa2, 0x09, 0xa3, 0x1c, 0x0d, 0x2c,
-	0x8f, 0x92, 0xf1, 0x31, 0x8f, 0xeb, 0x92, 0x2c, 0xcd, 0x64, 0x7c, 0x4c, 0x39, 0x1a, 0xd6, 0x35,
-	0x80, 0xed, 0x1a, 0xd7, 0x8b, 0xcb, 0xaf, 0xab, 0xc5, 0x91, 0x54, 0x32, 0x80, 0x47, 0xc7, 0x49,
-	0xd2, 0xaf, 0x97, 0x96, 0xf7, 0xa8, 0x9d, 0x24, 0x7d, 0xca, 0xd1, 0xe0, 0x51, 0x7c, 0x72, 0xfc,
-	0x90, 0x8d, 0xeb, 0x2b, 0xcb, 0x7b, 0xe4, 0x70, 0x24, 0x95, 0x0c, 0xc0, 0x35, 0x62, 0xe3, 0x49,
-	0x12, 0xd7, 0xcb, 0xcb, 0x73, 0x79, 0x1c, 0x49, 0x25, 0x03, 0xe7, 0x1a, 0x27, 0x23, 0x36, 0xae,
-	0x57, 0xbe, 0x06, 0x17, 0x47, 0x52, 0xc9, 0xa0, 0x3e, 0x40, 0xd5, 0x31, 0xeb, 0x0d, 0x47, 0xe3,
-	0xa4, 0x07, 0x49, 0x8f, 0x38, 0xe1, 0x7b, 0xcb, 0x10, 0xd2, 0x19, 0x9c, 0xce, 0x73, 0xa9, 0x2d,
-	0x54, 0x4c, 0x59, 0x3c, 0x61, 0xf5, 0x2a, 0x27, 0xbd, 0xb5, 0x54, 0xb6, 0x03, 0x90, 0x0a, 0x3c,
-	0x10, 0x3d, 0x4e, 0x86, 0x3d, 0x56, 0xaf, 0x2d, 0x4f, 0xd4, 0x01, 0x20, 0x15, 0x78, 0xed, 0x57,
-	0x0a, 0xca, 0x07, 0xd1, 0x60, 0xb1, 0xdc, 0xae, 0xa0, 0xbc, 0x6e, 0xee, 0x63, 0x45, 0x0c, 0x3c,
-	0x9c, 0x13, 0x83, 0x0e, 0xce, 0x43, 0x5f, 0x36, 0x5c, 0x67, 0x1f, 0x17, 0x40, 0x64, 0x12, 0x28,
-	0xaa, 0x65, 0x54, 0x70, 0xdc, 0xd0, 0xc1, 0x25, 0x10, 0x39, 0x61, 0x1b, 0xaf, 0x80, 0xc8, 0xa3,
-	0xae, 0x83, 0xcb, 0x20, 0xf2, 0x68, 0x80, 0x2b, 0x50, 0x67, 0xbd, 0xd0, 0x31, 0x02, 0x8c, 0xe0,
-	0xd7, 0x0e, 0xa1, 0xbb, 0xb8, 0xaa, 0x16, 0x91, 0x72, 0x88, 0x6b, 0xf0, 0x9b, 0xde, 0x6c, 0x5a,
-	0x87, 0x78, 0x55, 0x73, 0x51, 0x49, 0x1c, 0x48, 0x55, 0x45, 0x6b, 0x3a, 0xdc, 0x10, 0x82, 0xee,
-	0xcc, 0x31, 0xb8, 0x25, 0x10, 0xda, 0x24, 0x46, 0x60, 0x75, 0x08, 0x56, 0xa0, 0xfa, 0x5b, 0xed,
-	0x39, 0x49, 0x0e, 0x4a, 0xbe, 0x47, 0xdd, 0x16, 0x25, 0xbe, 0x0f, 0x82, 0xbc, 0xf6, 0x3f, 0x05,
-	0x15, 0xe0, 0x60, 0x82, 0xae, 0xa1, 0xfb, 0x64, 0x91, 0x4d, 0x37, 0x8c, 0xd0, 0xd7, 0x25, 0xdb,
-	0x2a, 0xaa, 0xe8, 0x26, 0x78, 0x66, 0xe9, 0x36, 0xce, 0x89, 0x66, 0xd1, 0xf6, 0x6c, 0xd2, 0x26,
-	0x0e, 0xd7, 0xc8, 0x43, 0x1f, 0x32, 0x85, 0x76, 0x01, 0xfa, 0x50, 0x8b, 0x38, 0x16, 0x9f, 0x15,
-	0xb9, 0x27, 0x8e, 0x1f, 0xd0, 0x10, 0x94, 0x75, 0x1b, 0x97, 0x66, 0x7d, 0xaa, 0x43, 0xf0, 0x0a,
-	0xd8, 0x72, 0xdc, 0xb6, 0xe5, 0x88, 0x79, 0x19, 0xe2, 0xed, 0xee, 0xda, 0xd6, 0x47, 0x21, 0xc1,
-	0x15, 0x30, 0xec, 0xe9, 0x34, 0x10, 0x5c, 0x08, 0x0c, 0x7b, 0x94, 0x78, 0xae, 0x6f, 0x41, 0x4b,
-	0xd3, 0x6d, 0x5c, 0x85, 0x60, 0x50, 0xd2, 0xb4, 0xc9, 0xa1, 0xd5, 0x21, 0x5d, 0x58, 0x06, 0xae,
-	0x81, 0x1a, 0x25, 0x36, 0x27, 0x14, 0xa2, 0x55, 0xb0, 0xd9, 0xc9, 0x6c, 0xae, 0x69, 0x9f, 0x2b,
-	0xa8, 0x00, 0xd5, 0x04, 0x9c, 0x6b, 0xba, 0xb4, 0x3d, 0xb7, 0xf4, 0x1a, 0x2a, 0xeb, 0x26, 0x38,
-	0xa4, 0xdb, 0x72, 0xe1, 0xe1, 0xa1, 0x65, 0x5b, 0x3a, 0x7d, 0x80, 0x73, 0x60, 0x6c, 0x6e, 0xe1,
-	0x1f, 0x13, 0x8a, 0xf3, 0x9c, 0xc2, 0x72, 0x74, 0xbb, 0x4b, 0x1c, 0xd3, 0x72, 0x5a, 0xb8, 0x00,
-	0xb1, 0x68, 0x11, 0x1a, 0x3a, 0x26, 0x2e, 0xc2, 0x98, 0x12, 0xdd, 0xb6, 0x7c, 0xb1, 0x6e, 0x8b,
-	0xca, 0xd9, 0x0a, 0x6c, 0xad, 0xbf, 0xe7, 0xd2, 0x00, 0x97, 0x61, 0xdb, 0x6d, 0xd7, 0x69, 0x89,
-	0x5c, 0x70, 0xa9, 0x49, 0x28, 0x46, 0xa0, 0x2d, 0xaf, 0x81, 0x06, 0xae, 0x6a, 0x04, 0x95, 0x44,
-	0xd9, 0x02, 0x1f, 0x5a, 0xc4, 0x31, 0x09, 0x5d, 0x74, 0xba, 0x49, 0xda, 0x96, 0x63, 0x39, 0x72,
-	0xb7, 0xda, 0xba, 0x6f, 0x84, 0x36, 0x4c, 0x73, 0xe0, 0x82, 0x43, 0xc2, 0x00, 0x9c, 0xd5, 0x7e,
-	0x81, 0x0a, 0x50, 0xb3, 0xc0, 0xe9, 0xb6, 0xeb, 0x9a, 0x73, 0x14, 0x57, 0x10, 0x36, 0x5c, 0xc7,
-	0x94, 0x81, 0xed, 0xc2, 0xaf, 0x58, 0x81, 0xcd, 0xe1, 0x69, 0xa4, 0xcb, 0x24, 0x82, 0xb9, 0x63,
-	0x5a, 0x32, 0x90, 0x79, 0x88, 0xb4, 0xe5, 0x04, 0x84, 0x52, 0xb7, 0x95, 0xed, 0x7e, 0x15, 0xad,
-	0xec, 0x87, 0x22, 0xc7, 0x8a, 0x90, 0x74, 0x7e, 0xb8, 0xbb, 0x0f, 0xe9, 0x0d, 0x82, 0x92, 0xf6,
-	0x21, 0x2a, 0x89, 0x62, 0x07, 0xeb, 0x70, 0xc2, 0xf6, 0xee, 0xd9, 0x75, 0xf8, 0x96, 0xd3, 0x0a,
-	0x6d, 0x9d, 0x62, 0x85, 0xdf, 0x6d, 0xec, 0x90, 0xf2, 0x94, 0x2b, 0xa3, 0x82, 0x19, 0xea, 0x36,
-	0xce, 0x6b, 0x01, 0x2a, 0x89, 0x12, 0x07, 0x0c, 0xe2, 0xee, 0x33, 0xc7, 0x50, 0x41, 0xc5, 0xa6,
-	0x45, 0xfd, 0x40, 0xc0, 0x7d, 0x02, 0x6b, 0xc2, 0x39, 0x10, 0x07, 0x7b, 0x16, 0x35, 0x71, 0x1e,
-	0x16, 0x3a, 0x4b, 0x18, 0x79, 0x77, 0x2a, 0x68, 0x77, 0x50, 0x49, 0x14, 0x3b, 0xce, 0x4a, 0x5d,
-	0x6f, 0xc1, 0x2f, 0xf0, 0x84, 0xcb, 0x44, 0x48, 0x1c, 0x37, 0xe8, 0xca, 0x79, 0x4e, 0xdb, 0x47,
-	0xd5, 0xb9, 0xaa, 0xa6, 0xbe, 0x88, 0x9e, 0xa3, 0xc4, 0xb0, 0x3c, 0xea, 0x1a, 0x56, 0xf0, 0x60,
-	0xf1, 0x4c, 0x65, 0x3f, 0xf0, 0xd4, 0x82, 0xf5, 0xbb, 0x4e, 0x77, 0x4e, 0x96, 0xd3, 0x26, 0xa8,
-	0xc8, 0x8b, 0x19, 0xc4, 0x35, 0x20, 0xce, 0xc2, 0x99, 0x7c, 0x1e, 0x5d, 0x9e, 0xdf, 0x20, 0xfe,
-	0xb3, 0x58, 0x65, 0x33, 0x0c, 0x42, 0x4a, 0x44, 0x90, 0x3c, 0xdd, 0x0f, 0x70, 0x1e, 0x36, 0xc1,
-	0xa3, 0xc4, 0x17, 0x97, 0xbd, 0x55, 0x54, 0x99, 0xd6, 0x02, 0x5c, 0x14, 0x1f, 0x14, 0x61, 0x36,
-	0x2f, 0x69, 0xbb, 0xa8, 0xc8, 0x0b, 0x1f, 0x18, 0xed, 0xb8, 0x96, 0x41, 0x16, 0x17, 0xae, 0x1b,
-	0xb3, 0x22, 0x60, 0xe8, 0x59, 0x4d, 0xc8, 0x71, 0x13, 0x7a, 0x56, 0x4b, 0xfe, 0xbb, 0x82, 0xd6,
-	0x16, 0x6f, 0x54, 0xea, 0x26, 0xc2, 0x9f, 0xb0, 0xa8, 0xdf, 0x4d, 0xe1, 0xde, 0xd8, 0x1d, 0xc6,
-	0x7d, 0xf6, 0x84, 0x5f, 0x65, 0x8a, 0x74, 0x0d, 0xe4, 0xfc, 0x3a, 0x69, 0x81, 0x54, 0xb5, 0x50,
-	0xf1, 0x28, 0x7a, 0xc8, 0x8e, 0xe4, 0x1d, 0x65, 0x67, 0xa9, 0x9b, 0x5b, 0xc3, 0x06, 0x28, 0x15,
-	0x0c, 0xda, 0xbf, 0x4b, 0xa8, 0xc8, 0x05, 0x5f, 0xba, 0x25, 0xeb, 0xbb, 0xbb, 0x94, 0x74, 0xb0,
-	0xc2, 0x4b, 0x2a, 0x1c, 0x62, 0x91, 0x15, 0xba, 0xd9, 0x31, 0x6c, 0x51, 0xbf, 0x74, 0xb3, 0xd3,
-	0x76, 0x4d, 0x5c, 0x80, 0x30, 0xea, 0x30, 0x2a, 0x72, 0x05, 0xcf, 0x73, 0xe1, 0xf0, 0x82, 0x30,
-	0x08, 0x28, 0x5e, 0xe1, 0x15, 0x3f, 0x3c, 0x14, 0x95, 0x4a, 0x0f, 0x0f, 0x21, 0x08, 0xb8, 0xa2,
-	0x96, 0x50, 0xce, 0x30, 0x30, 0x02, 0x88, 0xc1, 0xe9, 0xab, 0xd3, 0x8e, 0xc0, 0xcb, 0xb8, 0x01,
-	0xe7, 0x00, 0xaf, 0xf2, 0x28, 0xc2, 0x90, 0xc3, 0xd6, 0x44, 0xaf, 0xf0, 0xf0, 0x7a, 0xd6, 0x34,
-	0x30, 0x28, 0x98, 0x96, 0x6f, 0xb8, 0x21, 0xf5, 0x09, 0xbe, 0xcc, 0x13, 0xdf, 0xdd, 0xdd, 0xc7,
-	0x2a, 0x8c, 0xc8, 0xa1, 0x67, 0xe3, 0xe7, 0x78, 0x81, 0x75, 0x89, 0x7f, 0x60, 0x05, 0x7b, 0xf8,
-	0x0a, 0xc8, 0x2d, 0xd0, 0x78, 0x1e, 0x46, 0x6d, 0x9d, 0xde, 0xc7, 0x2f, 0x00, 0x5b, 0xfb, 0x80,
-	0xe0, 0x17, 0xc5, 0xa0, 0x83, 0xeb, 0xbc, 0x03, 0x91, 0x16, 0xfe, 0x1e, 0x38, 0xea, 0x38, 0x78,
-	0x03, 0x48, 0x1c, 0x4f, 0xae, 0xf9, 0xfb, 0xe0, 0xa1, 0xc3, 0x3d, 0x7c, 0x09, 0x1c, 0x70, 0xa6,
-	0x1e, 0xbe, 0x9c, 0xb5, 0xae, 0x1f, 0xf0, 0x3a, 0xc2, 0x0f, 0x2c, 0x7e, 0x05, 0xda, 0x93, 0x87,
-	0xaf, 0xca, 0xf2, 0xac, 0x07, 0xfa, 0xa1, 0xe5, 0xe3, 0x57, 0x45, 0x4a, 0xd0, 0x00, 0x18, 0x35,
-	0xde, 0xd6, 0x78, 0x20, 0x5e, 0xe3, 0x79, 0x09, 0x1e, 0xbe, 0x2e, 0x46, 0xbe, 0x8f, 0xaf, 0x71,
-	0x5d, 0xd7, 0x0f, 0xc0, 0xa7, 0x1f, 0xca, 0x74, 0xe5, 0xda, 0xd7, 0xa7, 0x13, 0x67, 0x1f, 0x6f,
-	0x8a, 0x93, 0x47, 0x20, 0x32, 0x6f, 0x88, 0xde, 0x49, 0x9a, 0xf8, 0x86, 0x1c, 0x79, 0xf8, 0x26,
-	0xb7, 0x42, 0x5d, 0xc7, 0xc6, 0x6f, 0x66, 0x0d, 0xf5, 0x2d, 0x58, 0xa1, 0xe7, 0xe3, 0x06, 0xac,
-	0xf0, 0xa3, 0x50, 0x77, 0xb8, 0x3f, 0x5b, 0xa0, 0x49, 0x0d, 0x18, 0xbe, 0x0d, 0x3f, 0xf0, 0x21,
-	0x25, 0x36, 0xbe, 0xc5, 0x7f, 0x30, 0xa9, 0xeb, 0xe1, 0x6d, 0xa0, 0x00, 0x03, 0x3b, 0xe0, 0x03,
-	0x25, 0x6d, 0x47, 0x77, 0x02, 0xfc, 0x8e, 0x38, 0xb9, 0xb0, 0x4e, 0xc7, 0x0c, 0xdb, 0xf8, 0x5d,
-	0xb0, 0x4e, 0x5d, 0x37, 0xc0, 0xb7, 0x61, 0xe4, 0x43, 0x70, 0xde, 0xe3, 0xa3, 0xb0, 0xd9, 0xc4,
-	0x77, 0x60, 0xc4, 0x2d, 0xfe, 0x88, 0x17, 0x1d, 0xd7, 0xb3, 0x0c, 0x7c, 0x97, 0x37, 0x76, 0x10,
-	0xde, 0x5b, 0x68, 0x44, 0xef, 0x83, 0xca, 0x21, 0x5f, 0xf6, 0x8f, 0x79, 0xb9, 0x0a, 0x79, 0xaf,
-	0xff, 0x80, 0x23, 0xad, 0xc0, 0x26, 0xf8, 0x27, 0xa2, 0x1f, 0x75, 0xbc, 0x3d, 0x40, 0x7f, 0x28,
-	0x53, 0x0e, 0x8e, 0x21, 0xd6, 0x79, 0x76, 0x86, 0x87, 0x9d, 0x0e, 0xde, 0x85, 0xa1, 0xc9, 0xad,
-	0x1a, 0xa0, 0xd2, 0x74, 0x29, 0xb1, 0x5a, 0x0e, 0x36, 0x21, 0x14, 0xf7, 0x0f, 0x30, 0xe1, 0x1d,
-	0xc6, 0xf2, 0x03, 0xdc, 0x14, 0x77, 0x92, 0xb6, 0x81, 0x5b, 0x3c, 0x01, 0xdc, 0xb6, 0xc8, 0xcb,
-	0x3d, 0xe8, 0x08, 0xd9, 0x8c, 0x6f, 0xbc, 0xc5, 0x35, 0xc3, 0xb6, 0x81, 0xf7, 0x21, 0x2c, 0x86,
-	0xeb, 0xe1, 0xfb, 0x10, 0x09, 0xd3, 0xf2, 0x79, 0xf3, 0x26, 0x26, 0xb6, 0xb5, 0xbf, 0x29, 0x68,
-	0x75, 0xe1, 0x5b, 0xf7, 0x9b, 0x7d, 0x1f, 0x92, 0x85, 0x57, 0x81, 0x5b, 0xcb, 0x7c, 0x64, 0xcf,
-	0x3d, 0x0e, 0x68, 0x6f, 0xcb, 0x0f, 0x65, 0x8c, 0x6a, 0xf2, 0x3d, 0xe5, 0x69, 0x75, 0x1c, 0xa1,
-	0x92, 0xe1, 0xb6, 0xdb, 0xf0, 0xad, 0xac, 0xb5, 0x50, 0x39, 0x73, 0x45, 0xad, 0xcf, 0xde, 0x7b,
-	0xc4, 0x67, 0xf9, 0xf4, 0xb5, 0xe7, 0x55, 0x54, 0x7b, 0xc8, 0x06, 0xc3, 0xb8, 0x9b, 0x3c, 0x7a,
-	0x34, 0x61, 0xe2, 0x93, 0xaa, 0x48, 0xab, 0x5c, 0xe6, 0x72, 0x91, 0xf6, 0x27, 0x05, 0xbd, 0xa8,
-	0xc7, 0xd1, 0xd1, 0xe9, 0xcf, 0xd9, 0xec, 0x59, 0x84, 0xfd, 0xec, 0x84, 0x4d, 0x52, 0xd5, 0x40,
-	0xe5, 0xbe, 0x7c, 0x5f, 0xba, 0x60, 0x78, 0xb2, 0xe7, 0x28, 0x3a, 0x05, 0xaa, 0x1e, 0x5a, 0x65,
-	0x71, 0x2f, 0xe9, 0x0f, 0xe3, 0x41, 0x77, 0x2e, 0x56, 0x37, 0xcf, 0x8d, 0x95, 0xc0, 0xf0, 0x28,
-	0xd5, 0xd8, 0xdc, 0x4c, 0xfb, 0xa7, 0x82, 0xea, 0x5f, 0x76, 0x79, 0x32, 0x4a, 0xa0, 0x0f, 0x1d,
-	0x20, 0x35, 0x33, 0xdd, 0x9d, 0xbd, 0x0b, 0x29, 0x4b, 0xbe, 0x0b, 0x5d, 0xce, 0x38, 0x16, 0x3e,
-	0x9e, 0xa7, 0xef, 0x61, 0xb9, 0xc5, 0xf7, 0x30, 0x95, 0x88, 0x37, 0x28, 0x16, 0xf7, 0xd8, 0x44,
-	0xbe, 0xee, 0x5c, 0xbf, 0x80, 0x2d, 0xd0, 0xa7, 0x33, 0x24, 0x5c, 0xf2, 0x5e, 0x90, 0x0b, 0xe3,
-	0xa9, 0x32, 0x64, 0x93, 0xef, 0xf8, 0x56, 0x3c, 0x99, 0x26, 0xcf, 0xcc, 0x61, 0xb9, 0x11, 0x3a,
-	0x2a, 0x33, 0x29, 0xab, 0x2b, 0x3c, 0x24, 0xd7, 0x2e, 0x74, 0x3c, 0xe8, 0x14, 0xf6, 0xac, 0x90,
-	0x6b, 0x7f, 0x54, 0xd0, 0x95, 0x2c, 0x09, 0x4e, 0xe3, 0x34, 0x7a, 0xf2, 0x1d, 0x8f, 0xd4, 0x5f,
-	0x14, 0xf4, 0xfc, 0x19, 0x7f, 0x65, 0xa0, 0x16, 0x92, 0x47, 0xf9, 0xba, 0xc9, 0xa3, 0xbe, 0x8f,
-	0x4a, 0xfc, 0xe2, 0x32, 0xa9, 0xe7, 0x38, 0xc7, 0xeb, 0xe7, 0x55, 0x32, 0x50, 0xa6, 0x12, 0xb3,
-	0x10, 0xea, 0xfc, 0x99, 0x50, 0xff, 0x2e, 0x8f, 0x9e, 0xd3, 0xc5, 0xa3, 0x35, 0x83, 0xa2, 0xf3,
-	0xad, 0x46, 0xfa, 0x00, 0x95, 0x1f, 0xb1, 0x28, 0x3d, 0x19, 0xb3, 0x89, 0x7c, 0x5b, 0xbb, 0x77,
-	0x0e, 0xc9, 0x53, 0x5c, 0x69, 0x34, 0x25, 0x05, 0x9d, 0x92, 0x7d, 0x79, 0x0b, 0xf3, 0xdf, 0x70,
-	0x0b, 0x37, 0x7e, 0xab, 0xa0, 0x72, 0x66, 0x48, 0xbd, 0x86, 0xd6, 0xd8, 0x93, 0x74, 0x1c, 0xf5,
-	0xd2, 0xee, 0x84, 0xef, 0x27, 0x0f, 0x41, 0x99, 0xae, 0x4a, 0xa9, 0xd8, 0x64, 0xf5, 0x0d, 0x84,
-	0x33, 0xb5, 0xe9, 0x69, 0xc8, 0x71, 0xc5, 0x75, 0x29, 0xcf, 0x0e, 0x8e, 0xfa, 0x3e, 0xda, 0xc8,
-	0x54, 0x9f, 0x52, 0xc1, 0xf2, 0x1c, 0x54, 0x97, 0x1a, 0xe6, 0xd9, 0xf2, 0xa4, 0x7d, 0x91, 0x83,
-	0xf3, 0x30, 0x1f, 0x99, 0xef, 0x52, 0x7a, 0xcd, 0x17, 0x83, 0xfc, 0xd7, 0x2b, 0x06, 0x4f, 0x2f,
-	0xec, 0x85, 0x6f, 0xb7, 0xb0, 0x17, 0x17, 0x53, 0xff, 0xc6, 0x1d, 0x54, 0x9b, 0x4f, 0x08, 0x71,
-	0x17, 0x71, 0x08, 0xbe, 0x04, 0xa3, 0x30, 0x68, 0xde, 0x11, 0xd7, 0xf3, 0x30, 0x68, 0xde, 0xba,
-	0x2d, 0xae, 0xe7, 0x61, 0xd0, 0xdc, 0xd9, 0xc6, 0xf9, 0xed, 0xbf, 0x17, 0xd1, 0xba, 0x2d, 0x69,
-	0x7c, 0xf1, 0x57, 0x91, 0xfa, 0x67, 0x05, 0xe1, 0xb3, 0x8d, 0x4b, 0xbd, 0x7d, 0x6e, 0xba, 0x3f,
-	0xb5, 0x39, 0x6f, 0xbc, 0xb7, 0x34, 0x4e, 0x24, 0x84, 0xd6, 0xf8, 0xec, 0x8b, 0x7f, 0xfd, 0x26,
-	0xb7, 0xa9, 0xbd, 0x36, 0xfd, 0x4f, 0x2b, 0x8b, 0xc9, 0xe4, 0x6e, 0x74, 0x06, 0x74, 0x57, 0xb9,
-	0xa1, 0x7e, 0xae, 0xa0, 0xf5, 0x33, 0x45, 0x5e, 0x7d, 0xf7, 0x62, 0xc6, 0xcf, 0x74, 0xb1, 0x8d,
-	0xdb, 0xcb, 0xc2, 0xa4, 0xcb, 0x6f, 0x71, 0x97, 0xaf, 0x6b, 0xda, 0x57, 0xbb, 0x9c, 0x61, 0xc0,
-	0xe3, 0x3f, 0x28, 0x68, 0x75, 0xa1, 0xd6, 0xaa, 0x3b, 0x17, 0x0c, 0xd6, 0x7c, 0x27, 0xd9, 0x78,
-	0x67, 0x39, 0x90, 0xf4, 0xf5, 0x26, 0xf7, 0xf5, 0x9a, 0x76, 0xf5, 0x19, 0xe1, 0xe5, 0x08, 0xf0,
-	0xf4, 0xf7, 0x0a, 0xaa, 0xcd, 0x9f, 0x5a, 0x75, 0x7b, 0xf9, 0xe2, 0xb7, 0xb1, 0xb3, 0x14, 0x46,
-	0xba, 0x79, 0x83, 0xbb, 0xf9, 0xba, 0xf6, 0xca, 0x53, 0xdd, 0x9c, 0x01, 0xee, 0x2a, 0x37, 0x76,
-	0x3f, 0x53, 0xd0, 0xab, 0xbd, 0xe4, 0xf8, 0xd9, 0x66, 0x76, 0xaf, 0x9c, 0x49, 0x77, 0x6f, 0x9c,
-	0xa4, 0x89, 0xa7, 0x7c, 0x4c, 0x24, 0x6c, 0x90, 0x00, 0xa4, 0x91, 0x8c, 0x07, 0x5b, 0x03, 0x16,
-	0xf3, 0x7f, 0x3e, 0xb7, 0xc4, 0x4f, 0xd1, 0x68, 0x38, 0xf9, 0x8a, 0xff, 0x5b, 0xef, 0x65, 0x82,
-	0x87, 0x25, 0x8e, 0xd8, 0xf9, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xf6, 0xe5, 0xb1, 0xa0,
-	0x1d, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/language/v1beta2/language_service.pb.go b/googleapis/cloud/language/v1beta2/language_service.pb.go
index c5d921993e..f65bc5f4af 100644
--- a/googleapis/cloud/language/v1beta2/language_service.pb.go
+++ b/googleapis/cloud/language/v1beta2/language_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1beta2/language_service.proto
 
-package language // import "google.golang.org/genproto/googleapis/cloud/language/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
+package language
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the text encoding that the caller uses to process the output.
 // Providing an `EncodingType` is recommended because the API provides the
@@ -58,6 +58,7 @@ var EncodingType_name = map[int32]string{
 	2: "UTF16",
 	3: "UTF32",
 }
+
 var EncodingType_value = map[string]int32{
 	"NONE":  0,
 	"UTF8":  1,
@@ -68,8 +69,9 @@ var EncodingType_value = map[string]int32{
 func (x EncodingType) String() string {
 	return proto.EnumName(EncodingType_name, int32(x))
 }
+
 func (EncodingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{0}
+	return fileDescriptor_640cb15898844b6f, []int{0}
 }
 
 // The document types enum.
@@ -89,6 +91,7 @@ var Document_Type_name = map[int32]string{
 	1: "PLAIN_TEXT",
 	2: "HTML",
 }
+
 var Document_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"PLAIN_TEXT":       1,
@@ -98,8 +101,9 @@ var Document_Type_value = map[string]int32{
 func (x Document_Type) String() string {
 	return proto.EnumName(Document_Type_name, int32(x))
 }
+
 func (Document_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{0, 0}
+	return fileDescriptor_640cb15898844b6f, []int{0, 0}
 }
 
 // The type of the entity.
@@ -134,6 +138,7 @@ var Entity_Type_name = map[int32]string{
 	6: "CONSUMER_GOOD",
 	7: "OTHER",
 }
+
 var Entity_Type_value = map[string]int32{
 	"UNKNOWN":       0,
 	"PERSON":        1,
@@ -148,8 +153,9 @@ var Entity_Type_value = map[string]int32{
 func (x Entity_Type) String() string {
 	return proto.EnumName(Entity_Type_name, int32(x))
 }
+
 func (Entity_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{2, 0}
+	return fileDescriptor_640cb15898844b6f, []int{2, 0}
 }
 
 // The part of speech tags enum.
@@ -202,6 +208,7 @@ var PartOfSpeech_Tag_name = map[int32]string{
 	12: "X",
 	13: "AFFIX",
 }
+
 var PartOfSpeech_Tag_value = map[string]int32{
 	"UNKNOWN": 0,
 	"ADJ":     1,
@@ -222,8 +229,9 @@ var PartOfSpeech_Tag_value = map[string]int32{
 func (x PartOfSpeech_Tag) String() string {
 	return proto.EnumName(PartOfSpeech_Tag_name, int32(x))
 }
+
 func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 0}
+	return fileDescriptor_640cb15898844b6f, []int{5, 0}
 }
 
 // The characteristic of a verb that expresses time flow during an event.
@@ -246,6 +254,7 @@ var PartOfSpeech_Aspect_name = map[int32]string{
 	2: "IMPERFECTIVE",
 	3: "PROGRESSIVE",
 }
+
 var PartOfSpeech_Aspect_value = map[string]int32{
 	"ASPECT_UNKNOWN": 0,
 	"PERFECTIVE":     1,
@@ -256,8 +265,9 @@ var PartOfSpeech_Aspect_value = map[string]int32{
 func (x PartOfSpeech_Aspect) String() string {
 	return proto.EnumName(PartOfSpeech_Aspect_name, int32(x))
 }
+
 func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 1}
+	return fileDescriptor_640cb15898844b6f, []int{5, 1}
 }
 
 // The grammatical function performed by a noun or pronoun in a phrase,
@@ -315,6 +325,7 @@ var PartOfSpeech_Case_name = map[int32]string{
 	13: "RELATIVE_CASE",
 	14: "VOCATIVE",
 }
+
 var PartOfSpeech_Case_value = map[string]int32{
 	"CASE_UNKNOWN":   0,
 	"ACCUSATIVE":     1,
@@ -336,8 +347,9 @@ var PartOfSpeech_Case_value = map[string]int32{
 func (x PartOfSpeech_Case) String() string {
 	return proto.EnumName(PartOfSpeech_Case_name, int32(x))
 }
+
 func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 2}
+	return fileDescriptor_640cb15898844b6f, []int{5, 2}
 }
 
 // Depending on the language, Form can be categorizing different forms of
@@ -387,6 +399,7 @@ var PartOfSpeech_Form_name = map[int32]string{
 	10: "ORDER",
 	11: "SPECIFIC",
 }
+
 var PartOfSpeech_Form_value = map[string]int32{
 	"FORM_UNKNOWN":   0,
 	"ADNOMIAL":       1,
@@ -405,8 +418,9 @@ var PartOfSpeech_Form_value = map[string]int32{
 func (x PartOfSpeech_Form) String() string {
 	return proto.EnumName(PartOfSpeech_Form_name, int32(x))
 }
+
 func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 3}
+	return fileDescriptor_640cb15898844b6f, []int{5, 3}
 }
 
 // Gender classes of nouns reflected in the behaviour of associated words.
@@ -429,6 +443,7 @@ var PartOfSpeech_Gender_name = map[int32]string{
 	2: "MASCULINE",
 	3: "NEUTER",
 }
+
 var PartOfSpeech_Gender_value = map[string]int32{
 	"GENDER_UNKNOWN": 0,
 	"FEMININE":       1,
@@ -439,8 +454,9 @@ var PartOfSpeech_Gender_value = map[string]int32{
 func (x PartOfSpeech_Gender) String() string {
 	return proto.EnumName(PartOfSpeech_Gender_name, int32(x))
 }
+
 func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 4}
+	return fileDescriptor_640cb15898844b6f, []int{5, 4}
 }
 
 // The grammatical feature of verbs, used for showing modality and attitude.
@@ -472,6 +488,7 @@ var PartOfSpeech_Mood_name = map[int32]string{
 	5: "JUSSIVE",
 	6: "SUBJUNCTIVE",
 }
+
 var PartOfSpeech_Mood_value = map[string]int32{
 	"MOOD_UNKNOWN":     0,
 	"CONDITIONAL_MOOD": 1,
@@ -485,8 +502,9 @@ var PartOfSpeech_Mood_value = map[string]int32{
 func (x PartOfSpeech_Mood) String() string {
 	return proto.EnumName(PartOfSpeech_Mood_name, int32(x))
 }
+
 func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 5}
+	return fileDescriptor_640cb15898844b6f, []int{5, 5}
 }
 
 // Count distinctions.
@@ -509,6 +527,7 @@ var PartOfSpeech_Number_name = map[int32]string{
 	2: "PLURAL",
 	3: "DUAL",
 }
+
 var PartOfSpeech_Number_value = map[string]int32{
 	"NUMBER_UNKNOWN": 0,
 	"SINGULAR":       1,
@@ -519,8 +538,9 @@ var PartOfSpeech_Number_value = map[string]int32{
 func (x PartOfSpeech_Number) String() string {
 	return proto.EnumName(PartOfSpeech_Number_name, int32(x))
 }
+
 func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 6}
+	return fileDescriptor_640cb15898844b6f, []int{5, 6}
 }
 
 // The distinction between the speaker, second person, third person, etc.
@@ -546,6 +566,7 @@ var PartOfSpeech_Person_name = map[int32]string{
 	3: "THIRD",
 	4: "REFLEXIVE_PERSON",
 }
+
 var PartOfSpeech_Person_value = map[string]int32{
 	"PERSON_UNKNOWN":   0,
 	"FIRST":            1,
@@ -557,8 +578,9 @@ var PartOfSpeech_Person_value = map[string]int32{
 func (x PartOfSpeech_Person) String() string {
 	return proto.EnumName(PartOfSpeech_Person_name, int32(x))
 }
+
 func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 7}
+	return fileDescriptor_640cb15898844b6f, []int{5, 7}
 }
 
 // This category shows if the token is part of a proper name.
@@ -578,6 +600,7 @@ var PartOfSpeech_Proper_name = map[int32]string{
 	1: "PROPER",
 	2: "NOT_PROPER",
 }
+
 var PartOfSpeech_Proper_value = map[string]int32{
 	"PROPER_UNKNOWN": 0,
 	"PROPER":         1,
@@ -587,8 +610,9 @@ var PartOfSpeech_Proper_value = map[string]int32{
 func (x PartOfSpeech_Proper) String() string {
 	return proto.EnumName(PartOfSpeech_Proper_name, int32(x))
 }
+
 func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 8}
+	return fileDescriptor_640cb15898844b6f, []int{5, 8}
 }
 
 // Reciprocal features of a pronoun.
@@ -609,6 +633,7 @@ var PartOfSpeech_Reciprocity_name = map[int32]string{
 	1: "RECIPROCAL",
 	2: "NON_RECIPROCAL",
 }
+
 var PartOfSpeech_Reciprocity_value = map[string]int32{
 	"RECIPROCITY_UNKNOWN": 0,
 	"RECIPROCAL":          1,
@@ -618,8 +643,9 @@ var PartOfSpeech_Reciprocity_value = map[string]int32{
 func (x PartOfSpeech_Reciprocity) String() string {
 	return proto.EnumName(PartOfSpeech_Reciprocity_name, int32(x))
 }
+
 func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 9}
+	return fileDescriptor_640cb15898844b6f, []int{5, 9}
 }
 
 // Time reference.
@@ -651,6 +677,7 @@ var PartOfSpeech_Tense_name = map[int32]string{
 	5: "IMPERFECT",
 	6: "PLUPERFECT",
 }
+
 var PartOfSpeech_Tense_value = map[string]int32{
 	"TENSE_UNKNOWN":     0,
 	"CONDITIONAL_TENSE": 1,
@@ -664,8 +691,9 @@ var PartOfSpeech_Tense_value = map[string]int32{
 func (x PartOfSpeech_Tense) String() string {
 	return proto.EnumName(PartOfSpeech_Tense_name, int32(x))
 }
+
 func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 10}
+	return fileDescriptor_640cb15898844b6f, []int{5, 10}
 }
 
 // The relationship between the action that a verb expresses and the
@@ -689,6 +717,7 @@ var PartOfSpeech_Voice_name = map[int32]string{
 	2: "CAUSATIVE",
 	3: "PASSIVE",
 }
+
 var PartOfSpeech_Voice_value = map[string]int32{
 	"VOICE_UNKNOWN": 0,
 	"ACTIVE":        1,
@@ -699,8 +728,9 @@ var PartOfSpeech_Voice_value = map[string]int32{
 func (x PartOfSpeech_Voice) String() string {
 	return proto.EnumName(PartOfSpeech_Voice_name, int32(x))
 }
+
 func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5, 11}
+	return fileDescriptor_640cb15898844b6f, []int{5, 11}
 }
 
 // The parse label enum for the token.
@@ -960,6 +990,7 @@ var DependencyEdge_Label_name = map[int32]string{
 	81: "MES",
 	82: "NCOMP",
 }
+
 var DependencyEdge_Label_value = map[string]int32{
 	"UNKNOWN":      0,
 	"ABBREV":       1,
@@ -1049,8 +1080,9 @@ var DependencyEdge_Label_value = map[string]int32{
 func (x DependencyEdge_Label) String() string {
 	return proto.EnumName(DependencyEdge_Label_name, int32(x))
 }
+
 func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{6, 0}
+	return fileDescriptor_640cb15898844b6f, []int{6, 0}
 }
 
 // The supported types of mentions.
@@ -1070,6 +1102,7 @@ var EntityMention_Type_name = map[int32]string{
 	1: "PROPER",
 	2: "COMMON",
 }
+
 var EntityMention_Type_value = map[string]int32{
 	"TYPE_UNKNOWN": 0,
 	"PROPER":       1,
@@ -1079,8 +1112,9 @@ var EntityMention_Type_value = map[string]int32{
 func (x EntityMention_Type) String() string {
 	return proto.EnumName(EntityMention_Type_name, int32(x))
 }
+
 func (EntityMention_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{7, 0}
+	return fileDescriptor_640cb15898844b6f, []int{7, 0}
 }
 
 // ################################################################ #
@@ -1115,16 +1149,17 @@ func (m *Document) Reset()         { *m = Document{} }
 func (m *Document) String() string { return proto.CompactTextString(m) }
 func (*Document) ProtoMessage()    {}
 func (*Document) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{0}
+	return fileDescriptor_640cb15898844b6f, []int{0}
 }
+
 func (m *Document) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Document.Unmarshal(m, b)
 }
 func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
 }
-func (dst *Document) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Document.Merge(dst, src)
+func (m *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(m, src)
 }
 func (m *Document) XXX_Size() int {
 	return xxx_messageInfo_Document.Size(m)
@@ -1186,72 +1221,14 @@ func (m *Document) GetLanguage() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Document) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Document_OneofMarshaler, _Document_OneofUnmarshaler, _Document_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Document) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Document_Content)(nil),
 		(*Document_GcsContentUri)(nil),
 	}
 }
 
-func _Document_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_Content:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Content)
-	case *Document_GcsContentUri:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.GcsContentUri)
-	case nil:
-	default:
-		return fmt.Errorf("Document.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Document_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Document)
-	switch tag {
-	case 2: // source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_Content{x}
-		return true, err
-	case 3: // source.gcs_content_uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &Document_GcsContentUri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Document_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Document)
-	// source
-	switch x := m.Source.(type) {
-	case *Document_Content:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case *Document_GcsContentUri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.GcsContentUri)))
-		n += len(x.GcsContentUri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a sentence in the input document.
 type Sentence struct {
 	// The sentence text.
@@ -1269,16 +1246,17 @@ func (m *Sentence) Reset()         { *m = Sentence{} }
 func (m *Sentence) String() string { return proto.CompactTextString(m) }
 func (*Sentence) ProtoMessage()    {}
 func (*Sentence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{1}
+	return fileDescriptor_640cb15898844b6f, []int{1}
 }
+
 func (m *Sentence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentence.Unmarshal(m, b)
 }
 func (m *Sentence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentence.Marshal(b, m, deterministic)
 }
-func (dst *Sentence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentence.Merge(dst, src)
+func (m *Sentence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentence.Merge(m, src)
 }
 func (m *Sentence) XXX_Size() int {
 	return xxx_messageInfo_Sentence.Size(m)
@@ -1340,16 +1318,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{2}
+	return fileDescriptor_640cb15898844b6f, []int{2}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -1421,16 +1400,17 @@ func (m *Token) Reset()         { *m = Token{} }
 func (m *Token) String() string { return proto.CompactTextString(m) }
 func (*Token) ProtoMessage()    {}
 func (*Token) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{3}
+	return fileDescriptor_640cb15898844b6f, []int{3}
 }
+
 func (m *Token) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Token.Unmarshal(m, b)
 }
 func (m *Token) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Token.Marshal(b, m, deterministic)
 }
-func (dst *Token) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Token.Merge(dst, src)
+func (m *Token) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Token.Merge(m, src)
 }
 func (m *Token) XXX_Size() int {
 	return xxx_messageInfo_Token.Size(m)
@@ -1488,16 +1468,17 @@ func (m *Sentiment) Reset()         { *m = Sentiment{} }
 func (m *Sentiment) String() string { return proto.CompactTextString(m) }
 func (*Sentiment) ProtoMessage()    {}
 func (*Sentiment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{4}
+	return fileDescriptor_640cb15898844b6f, []int{4}
 }
+
 func (m *Sentiment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
 }
 func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
 }
-func (dst *Sentiment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Sentiment.Merge(dst, src)
+func (m *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(m, src)
 }
 func (m *Sentiment) XXX_Size() int {
 	return xxx_messageInfo_Sentiment.Size(m)
@@ -1557,16 +1538,17 @@ func (m *PartOfSpeech) Reset()         { *m = PartOfSpeech{} }
 func (m *PartOfSpeech) String() string { return proto.CompactTextString(m) }
 func (*PartOfSpeech) ProtoMessage()    {}
 func (*PartOfSpeech) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{5}
+	return fileDescriptor_640cb15898844b6f, []int{5}
 }
+
 func (m *PartOfSpeech) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartOfSpeech.Unmarshal(m, b)
 }
 func (m *PartOfSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartOfSpeech.Marshal(b, m, deterministic)
 }
-func (dst *PartOfSpeech) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartOfSpeech.Merge(dst, src)
+func (m *PartOfSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartOfSpeech.Merge(m, src)
 }
 func (m *PartOfSpeech) XXX_Size() int {
 	return xxx_messageInfo_PartOfSpeech.Size(m)
@@ -1680,16 +1662,17 @@ func (m *DependencyEdge) Reset()         { *m = DependencyEdge{} }
 func (m *DependencyEdge) String() string { return proto.CompactTextString(m) }
 func (*DependencyEdge) ProtoMessage()    {}
 func (*DependencyEdge) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{6}
+	return fileDescriptor_640cb15898844b6f, []int{6}
 }
+
 func (m *DependencyEdge) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DependencyEdge.Unmarshal(m, b)
 }
 func (m *DependencyEdge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DependencyEdge.Marshal(b, m, deterministic)
 }
-func (dst *DependencyEdge) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DependencyEdge.Merge(dst, src)
+func (m *DependencyEdge) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DependencyEdge.Merge(m, src)
 }
 func (m *DependencyEdge) XXX_Size() int {
 	return xxx_messageInfo_DependencyEdge.Size(m)
@@ -1735,16 +1718,17 @@ func (m *EntityMention) Reset()         { *m = EntityMention{} }
 func (m *EntityMention) String() string { return proto.CompactTextString(m) }
 func (*EntityMention) ProtoMessage()    {}
 func (*EntityMention) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{7}
+	return fileDescriptor_640cb15898844b6f, []int{7}
 }
+
 func (m *EntityMention) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityMention.Unmarshal(m, b)
 }
 func (m *EntityMention) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityMention.Marshal(b, m, deterministic)
 }
-func (dst *EntityMention) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityMention.Merge(dst, src)
+func (m *EntityMention) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityMention.Merge(m, src)
 }
 func (m *EntityMention) XXX_Size() int {
 	return xxx_messageInfo_EntityMention.Size(m)
@@ -1794,16 +1778,17 @@ func (m *TextSpan) Reset()         { *m = TextSpan{} }
 func (m *TextSpan) String() string { return proto.CompactTextString(m) }
 func (*TextSpan) ProtoMessage()    {}
 func (*TextSpan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{8}
+	return fileDescriptor_640cb15898844b6f, []int{8}
 }
+
 func (m *TextSpan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSpan.Unmarshal(m, b)
 }
 func (m *TextSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSpan.Marshal(b, m, deterministic)
 }
-func (dst *TextSpan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSpan.Merge(dst, src)
+func (m *TextSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSpan.Merge(m, src)
 }
 func (m *TextSpan) XXX_Size() int {
 	return xxx_messageInfo_TextSpan.Size(m)
@@ -1844,16 +1829,17 @@ func (m *ClassificationCategory) Reset()         { *m = ClassificationCategory{}
 func (m *ClassificationCategory) String() string { return proto.CompactTextString(m) }
 func (*ClassificationCategory) ProtoMessage()    {}
 func (*ClassificationCategory) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{9}
+	return fileDescriptor_640cb15898844b6f, []int{9}
 }
+
 func (m *ClassificationCategory) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassificationCategory.Unmarshal(m, b)
 }
 func (m *ClassificationCategory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassificationCategory.Marshal(b, m, deterministic)
 }
-func (dst *ClassificationCategory) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassificationCategory.Merge(dst, src)
+func (m *ClassificationCategory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationCategory.Merge(m, src)
 }
 func (m *ClassificationCategory) XXX_Size() int {
 	return xxx_messageInfo_ClassificationCategory.Size(m)
@@ -1894,16 +1880,17 @@ func (m *AnalyzeSentimentRequest) Reset()         { *m = AnalyzeSentimentRequest
 func (m *AnalyzeSentimentRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSentimentRequest) ProtoMessage()    {}
 func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{10}
+	return fileDescriptor_640cb15898844b6f, []int{10}
 }
+
 func (m *AnalyzeSentimentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeSentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSentimentRequest.Merge(dst, src)
+func (m *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentRequest.Merge(m, src)
 }
 func (m *AnalyzeSentimentRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSentimentRequest.Size(m)
@@ -1948,16 +1935,17 @@ func (m *AnalyzeSentimentResponse) Reset()         { *m = AnalyzeSentimentRespon
 func (m *AnalyzeSentimentResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSentimentResponse) ProtoMessage()    {}
 func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{11}
+	return fileDescriptor_640cb15898844b6f, []int{11}
 }
+
 func (m *AnalyzeSentimentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeSentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSentimentResponse.Merge(dst, src)
+func (m *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentResponse.Merge(m, src)
 }
 func (m *AnalyzeSentimentResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSentimentResponse.Size(m)
@@ -2004,16 +1992,17 @@ func (m *AnalyzeEntitySentimentRequest) Reset()         { *m = AnalyzeEntitySent
 func (m *AnalyzeEntitySentimentRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitySentimentRequest) ProtoMessage()    {}
 func (*AnalyzeEntitySentimentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{12}
+	return fileDescriptor_640cb15898844b6f, []int{12}
 }
+
 func (m *AnalyzeEntitySentimentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitySentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitySentimentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitySentimentRequest.Merge(dst, src)
+func (m *AnalyzeEntitySentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentRequest.Merge(m, src)
 }
 func (m *AnalyzeEntitySentimentRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Size(m)
@@ -2056,16 +2045,17 @@ func (m *AnalyzeEntitySentimentResponse) Reset()         { *m = AnalyzeEntitySen
 func (m *AnalyzeEntitySentimentResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitySentimentResponse) ProtoMessage()    {}
 func (*AnalyzeEntitySentimentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{13}
+	return fileDescriptor_640cb15898844b6f, []int{13}
 }
+
 func (m *AnalyzeEntitySentimentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitySentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitySentimentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitySentimentResponse.Merge(dst, src)
+func (m *AnalyzeEntitySentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentResponse.Merge(m, src)
 }
 func (m *AnalyzeEntitySentimentResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Size(m)
@@ -2105,16 +2095,17 @@ func (m *AnalyzeEntitiesRequest) Reset()         { *m = AnalyzeEntitiesRequest{}
 func (m *AnalyzeEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitiesRequest) ProtoMessage()    {}
 func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{14}
+	return fileDescriptor_640cb15898844b6f, []int{14}
 }
+
 func (m *AnalyzeEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(dst, src)
+func (m *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(m, src)
 }
 func (m *AnalyzeEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitiesRequest.Size(m)
@@ -2157,16 +2148,17 @@ func (m *AnalyzeEntitiesResponse) Reset()         { *m = AnalyzeEntitiesResponse
 func (m *AnalyzeEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeEntitiesResponse) ProtoMessage()    {}
 func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{15}
+	return fileDescriptor_640cb15898844b6f, []int{15}
 }
+
 func (m *AnalyzeEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(dst, src)
+func (m *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(m, src)
 }
 func (m *AnalyzeEntitiesResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeEntitiesResponse.Size(m)
@@ -2206,16 +2198,17 @@ func (m *AnalyzeSyntaxRequest) Reset()         { *m = AnalyzeSyntaxRequest{} }
 func (m *AnalyzeSyntaxRequest) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSyntaxRequest) ProtoMessage()    {}
 func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{16}
+	return fileDescriptor_640cb15898844b6f, []int{16}
 }
+
 func (m *AnalyzeSyntaxRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Unmarshal(m, b)
 }
 func (m *AnalyzeSyntaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(dst, src)
+func (m *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(m, src)
 }
 func (m *AnalyzeSyntaxRequest) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSyntaxRequest.Size(m)
@@ -2260,16 +2253,17 @@ func (m *AnalyzeSyntaxResponse) Reset()         { *m = AnalyzeSyntaxResponse{} }
 func (m *AnalyzeSyntaxResponse) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeSyntaxResponse) ProtoMessage()    {}
 func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{17}
+	return fileDescriptor_640cb15898844b6f, []int{17}
 }
+
 func (m *AnalyzeSyntaxResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Unmarshal(m, b)
 }
 func (m *AnalyzeSyntaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(dst, src)
+func (m *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(m, src)
 }
 func (m *AnalyzeSyntaxResponse) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeSyntaxResponse.Size(m)
@@ -2314,16 +2308,17 @@ func (m *ClassifyTextRequest) Reset()         { *m = ClassifyTextRequest{} }
 func (m *ClassifyTextRequest) String() string { return proto.CompactTextString(m) }
 func (*ClassifyTextRequest) ProtoMessage()    {}
 func (*ClassifyTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{18}
+	return fileDescriptor_640cb15898844b6f, []int{18}
 }
+
 func (m *ClassifyTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassifyTextRequest.Unmarshal(m, b)
 }
 func (m *ClassifyTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassifyTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *ClassifyTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassifyTextRequest.Merge(dst, src)
+func (m *ClassifyTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextRequest.Merge(m, src)
 }
 func (m *ClassifyTextRequest) XXX_Size() int {
 	return xxx_messageInfo_ClassifyTextRequest.Size(m)
@@ -2354,16 +2349,17 @@ func (m *ClassifyTextResponse) Reset()         { *m = ClassifyTextResponse{} }
 func (m *ClassifyTextResponse) String() string { return proto.CompactTextString(m) }
 func (*ClassifyTextResponse) ProtoMessage()    {}
 func (*ClassifyTextResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{19}
+	return fileDescriptor_640cb15898844b6f, []int{19}
 }
+
 func (m *ClassifyTextResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClassifyTextResponse.Unmarshal(m, b)
 }
 func (m *ClassifyTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClassifyTextResponse.Marshal(b, m, deterministic)
 }
-func (dst *ClassifyTextResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClassifyTextResponse.Merge(dst, src)
+func (m *ClassifyTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextResponse.Merge(m, src)
 }
 func (m *ClassifyTextResponse) XXX_Size() int {
 	return xxx_messageInfo_ClassifyTextResponse.Size(m)
@@ -2399,16 +2395,17 @@ func (m *AnnotateTextRequest) Reset()         { *m = AnnotateTextRequest{} }
 func (m *AnnotateTextRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest) ProtoMessage()    {}
 func (*AnnotateTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{20}
+	return fileDescriptor_640cb15898844b6f, []int{20}
 }
+
 func (m *AnnotateTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextRequest.Unmarshal(m, b)
 }
 func (m *AnnotateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextRequest.Merge(dst, src)
+func (m *AnnotateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest.Merge(m, src)
 }
 func (m *AnnotateTextRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextRequest.Size(m)
@@ -2462,16 +2459,17 @@ func (m *AnnotateTextRequest_Features) Reset()         { *m = AnnotateTextReques
 func (m *AnnotateTextRequest_Features) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest_Features) ProtoMessage()    {}
 func (*AnnotateTextRequest_Features) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{20, 0}
+	return fileDescriptor_640cb15898844b6f, []int{20, 0}
 }
+
 func (m *AnnotateTextRequest_Features) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Unmarshal(m, b)
 }
 func (m *AnnotateTextRequest_Features) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextRequest_Features.Merge(dst, src)
+func (m *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest_Features.Merge(m, src)
 }
 func (m *AnnotateTextRequest_Features) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextRequest_Features.Size(m)
@@ -2549,16 +2547,17 @@ func (m *AnnotateTextResponse) Reset()         { *m = AnnotateTextResponse{} }
 func (m *AnnotateTextResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextResponse) ProtoMessage()    {}
 func (*AnnotateTextResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_language_service_7b74fe2bae56761e, []int{21}
+	return fileDescriptor_640cb15898844b6f, []int{21}
 }
+
 func (m *AnnotateTextResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateTextResponse.Unmarshal(m, b)
 }
 func (m *AnnotateTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateTextResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateTextResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateTextResponse.Merge(dst, src)
+func (m *AnnotateTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextResponse.Merge(m, src)
 }
 func (m *AnnotateTextResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateTextResponse.Size(m)
@@ -2612,6 +2611,23 @@ func (m *AnnotateTextResponse) GetCategories() []*ClassificationCategory {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.language.v1beta2.EncodingType", EncodingType_name, EncodingType_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.Document_Type", Document_Type_name, Document_Type_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.Entity_Type", Entity_Type_name, Entity_Type_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Tag", PartOfSpeech_Tag_name, PartOfSpeech_Tag_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Aspect", PartOfSpeech_Aspect_name, PartOfSpeech_Aspect_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Case", PartOfSpeech_Case_name, PartOfSpeech_Case_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Form", PartOfSpeech_Form_name, PartOfSpeech_Form_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Gender", PartOfSpeech_Gender_name, PartOfSpeech_Gender_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Mood", PartOfSpeech_Mood_name, PartOfSpeech_Mood_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Number", PartOfSpeech_Number_name, PartOfSpeech_Number_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Person", PartOfSpeech_Person_name, PartOfSpeech_Person_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Proper", PartOfSpeech_Proper_name, PartOfSpeech_Proper_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Reciprocity", PartOfSpeech_Reciprocity_name, PartOfSpeech_Reciprocity_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Tense", PartOfSpeech_Tense_name, PartOfSpeech_Tense_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Voice", PartOfSpeech_Voice_name, PartOfSpeech_Voice_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.DependencyEdge_Label", DependencyEdge_Label_name, DependencyEdge_Label_value)
+	proto.RegisterEnum("google.cloud.language.v1beta2.EntityMention_Type", EntityMention_Type_name, EntityMention_Type_value)
 	proto.RegisterType((*Document)(nil), "google.cloud.language.v1beta2.Document")
 	proto.RegisterType((*Sentence)(nil), "google.cloud.language.v1beta2.Sentence")
 	proto.RegisterType((*Entity)(nil), "google.cloud.language.v1beta2.Entity")
@@ -2636,23 +2652,203 @@ func init() {
 	proto.RegisterType((*AnnotateTextRequest)(nil), "google.cloud.language.v1beta2.AnnotateTextRequest")
 	proto.RegisterType((*AnnotateTextRequest_Features)(nil), "google.cloud.language.v1beta2.AnnotateTextRequest.Features")
 	proto.RegisterType((*AnnotateTextResponse)(nil), "google.cloud.language.v1beta2.AnnotateTextResponse")
-	proto.RegisterEnum("google.cloud.language.v1beta2.EncodingType", EncodingType_name, EncodingType_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.Document_Type", Document_Type_name, Document_Type_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.Entity_Type", Entity_Type_name, Entity_Type_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Tag", PartOfSpeech_Tag_name, PartOfSpeech_Tag_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Aspect", PartOfSpeech_Aspect_name, PartOfSpeech_Aspect_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Case", PartOfSpeech_Case_name, PartOfSpeech_Case_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Form", PartOfSpeech_Form_name, PartOfSpeech_Form_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Gender", PartOfSpeech_Gender_name, PartOfSpeech_Gender_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Mood", PartOfSpeech_Mood_name, PartOfSpeech_Mood_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Number", PartOfSpeech_Number_name, PartOfSpeech_Number_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Person", PartOfSpeech_Person_name, PartOfSpeech_Person_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Proper", PartOfSpeech_Proper_name, PartOfSpeech_Proper_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Reciprocity", PartOfSpeech_Reciprocity_name, PartOfSpeech_Reciprocity_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Tense", PartOfSpeech_Tense_name, PartOfSpeech_Tense_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.PartOfSpeech_Voice", PartOfSpeech_Voice_name, PartOfSpeech_Voice_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.DependencyEdge_Label", DependencyEdge_Label_name, DependencyEdge_Label_value)
-	proto.RegisterEnum("google.cloud.language.v1beta2.EntityMention_Type", EntityMention_Type_name, EntityMention_Type_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/language/v1beta2/language_service.proto", fileDescriptor_640cb15898844b6f)
+}
+
+var fileDescriptor_640cb15898844b6f = []byte{
+	// 3019 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3a, 0x4b, 0x73, 0xdb, 0xc6,
+	0xfd, 0x06, 0x5f, 0xa2, 0x96, 0x92, 0xbc, 0x86, 0x1d, 0x9b, 0x7f, 0xfd, 0xf3, 0x70, 0xe0, 0xb8,
+	0x56, 0xec, 0x44, 0x8a, 0x25, 0xc7, 0x71, 0x6d, 0xe7, 0x01, 0x01, 0x4b, 0x0a, 0x32, 0x09, 0xc0,
+	0x0b, 0x80, 0x92, 0x7d, 0xe1, 0xc0, 0x24, 0xc4, 0x70, 0x22, 0x02, 0x2c, 0x01, 0x79, 0xac, 0x5e,
+	0x32, 0xcd, 0x4c, 0x8f, 0x99, 0x1e, 0xf2, 0x11, 0x7a, 0xe8, 0xb4, 0x33, 0x9d, 0xb4, 0xd3, 0x99,
+	0x4e, 0x7b, 0xe8, 0x27, 0xe8, 0xb1, 0x33, 0xfd, 0x04, 0xfd, 0x00, 0x3d, 0xb6, 0xb7, 0xce, 0x6f,
+	0x77, 0x41, 0x82, 0xb2, 0x62, 0x89, 0x8e, 0xa7, 0x93, 0xde, 0x76, 0x7f, 0xf8, 0xbd, 0x9f, 0xbb,
+	0x4b, 0xa2, 0x5b, 0xbd, 0x28, 0xea, 0xed, 0x07, 0x6b, 0x9d, 0xfd, 0xe8, 0xa0, 0xbb, 0xb6, 0xef,
+	0x87, 0xbd, 0x03, 0xbf, 0x17, 0xac, 0x3d, 0xbd, 0xf9, 0x24, 0x48, 0xfc, 0xf5, 0x31, 0xa0, 0x1d,
+	0x07, 0xa3, 0xa7, 0xfd, 0x4e, 0xb0, 0x3a, 0x1c, 0x45, 0x49, 0x24, 0xbf, 0xc1, 0xa9, 0x56, 0x19,
+	0xd5, 0x6a, 0x8a, 0xb4, 0x2a, 0xa8, 0x96, 0x5f, 0x17, 0x4c, 0xfd, 0x61, 0x7f, 0xcd, 0x0f, 0xc3,
+	0x28, 0xf1, 0x93, 0x7e, 0x14, 0xc6, 0x9c, 0x78, 0xf9, 0x8a, 0xf8, 0xba, 0x1f, 0x85, 0xbd, 0xd1,
+	0x41, 0x18, 0xf6, 0xc3, 0xde, 0x5a, 0x34, 0x0c, 0x46, 0x53, 0x48, 0x6f, 0x09, 0x24, 0xb6, 0x7b,
+	0x72, 0xb0, 0xb7, 0x96, 0xf4, 0x07, 0x41, 0x9c, 0xf8, 0x83, 0xa1, 0x40, 0xb8, 0x24, 0x10, 0x46,
+	0xc3, 0xce, 0x5a, 0x9c, 0xf8, 0xc9, 0x81, 0xa0, 0x54, 0xfe, 0x29, 0xa1, 0xb2, 0x1e, 0x75, 0x0e,
+	0x06, 0x41, 0x98, 0xc8, 0x9f, 0xa1, 0x42, 0x72, 0x38, 0x0c, 0xaa, 0xd2, 0x65, 0x69, 0x65, 0x69,
+	0xfd, 0xbd, 0xd5, 0x17, 0xea, 0xbd, 0x9a, 0x92, 0xad, 0xba, 0x87, 0xc3, 0x80, 0x32, 0x4a, 0x79,
+	0x19, 0xcd, 0x75, 0xa2, 0x30, 0x09, 0xc2, 0xa4, 0x9a, 0xbb, 0x2c, 0xad, 0xcc, 0x6f, 0x9d, 0xa1,
+	0x29, 0x40, 0x5e, 0x41, 0x67, 0x7b, 0x9d, 0xb8, 0x2d, 0xb6, 0xed, 0x83, 0x51, 0xbf, 0x9a, 0x17,
+	0x38, 0x8b, 0xbd, 0x4e, 0xac, 0x71, 0xb8, 0x37, 0xea, 0xcb, 0xcb, 0xa8, 0x9c, 0x4a, 0xab, 0x16,
+	0x00, 0x85, 0x8e, 0xf7, 0xca, 0x6d, 0x54, 0x00, 0x79, 0xf2, 0x05, 0x84, 0xdd, 0x47, 0x36, 0x69,
+	0x7b, 0xa6, 0x63, 0x13, 0xcd, 0xa8, 0x19, 0x44, 0xc7, 0x67, 0xe4, 0x25, 0x84, 0xec, 0x86, 0x6a,
+	0x98, 0x6d, 0x97, 0xec, 0xba, 0x58, 0x92, 0xcb, 0xa8, 0xb0, 0xe5, 0x36, 0x1b, 0x38, 0xb7, 0x59,
+	0x46, 0xa5, 0x38, 0x3a, 0x18, 0x75, 0x02, 0xe5, 0x17, 0x12, 0x2a, 0x3b, 0x01, 0x08, 0xeb, 0x04,
+	0xf2, 0x3d, 0x54, 0x48, 0x82, 0x67, 0x09, 0x33, 0xb9, 0xb2, 0x7e, 0xed, 0x04, 0x93, 0xdd, 0xe0,
+	0x59, 0xe2, 0x0c, 0xfd, 0x90, 0x32, 0x22, 0xb9, 0x86, 0xe6, 0xe3, 0x20, 0x04, 0x5f, 0x0b, 0x7b,
+	0x2b, 0xeb, 0x2b, 0x27, 0x70, 0x70, 0x52, 0x7c, 0x3a, 0x21, 0x55, 0xbe, 0x29, 0xa0, 0x12, 0x09,
+	0x93, 0x7e, 0x72, 0x28, 0xcb, 0xa8, 0x10, 0xfa, 0x03, 0x1e, 0x82, 0x79, 0xca, 0xd6, 0xf2, 0x27,
+	0x22, 0x2c, 0x39, 0x16, 0x96, 0xeb, 0x27, 0x48, 0xe0, 0x8c, 0xb2, 0x41, 0xb1, 0x50, 0x79, 0x10,
+	0x24, 0x7e, 0xd7, 0x4f, 0xfc, 0x6a, 0xfe, 0x72, 0x7e, 0xa5, 0xb2, 0xbe, 0x71, 0x3a, 0x1e, 0x4d,
+	0x41, 0x45, 0xc2, 0x64, 0x74, 0x48, 0xc7, 0x4c, 0x20, 0x3e, 0xb1, 0xbf, 0xdf, 0x07, 0x07, 0xb2,
+	0xf8, 0xe4, 0xe8, 0x78, 0x2f, 0x6f, 0x81, 0xb0, 0x90, 0x25, 0x67, 0xb5, 0xc8, 0x84, 0xbd, 0x77,
+	0x2a, 0x61, 0x4d, 0x4e, 0x44, 0xc7, 0xd4, 0xd3, 0xde, 0x2d, 0xbd, 0xb4, 0x77, 0x97, 0xef, 0xa1,
+	0xc5, 0x29, 0x43, 0x64, 0x8c, 0xf2, 0x5f, 0x04, 0x87, 0xc2, 0xc5, 0xb0, 0x94, 0x2f, 0xa0, 0xe2,
+	0x53, 0x7f, 0xff, 0x80, 0xbb, 0x78, 0x9e, 0xf2, 0xcd, 0xdd, 0xdc, 0x1d, 0x49, 0x39, 0x14, 0xe9,
+	0x56, 0x41, 0x73, 0x9e, 0xf9, 0xc0, 0xb4, 0x76, 0x4c, 0x7c, 0x46, 0x46, 0xa8, 0x64, 0x13, 0xea,
+	0x58, 0x26, 0x96, 0xe4, 0x05, 0x54, 0x6e, 0x58, 0x9a, 0xea, 0x1a, 0x96, 0x89, 0x73, 0x32, 0x46,
+	0x0b, 0x16, 0xad, 0xab, 0xa6, 0xf1, 0x98, 0x43, 0xf2, 0xf2, 0x3c, 0x2a, 0x92, 0x16, 0x31, 0x5d,
+	0x5c, 0x90, 0xcf, 0xa2, 0xca, 0x8e, 0x45, 0x1f, 0xb4, 0xad, 0x5a, 0x5b, 0xa5, 0x2e, 0x2e, 0xca,
+	0xe7, 0xd0, 0xa2, 0x66, 0x99, 0x8e, 0xd7, 0x24, 0xb4, 0x5d, 0xb7, 0x2c, 0x1d, 0x97, 0x00, 0xdd,
+	0x72, 0xb7, 0x08, 0xc5, 0x73, 0xca, 0xcf, 0x73, 0xa8, 0xe8, 0x46, 0x5f, 0x04, 0xe1, 0xf7, 0x4b,
+	0xd2, 0x87, 0x68, 0x69, 0xe8, 0x8f, 0x92, 0x76, 0xb4, 0xd7, 0x8e, 0x87, 0x41, 0xd0, 0xf9, 0x5c,
+	0x64, 0xea, 0x8d, 0x13, 0xd8, 0xd8, 0xfe, 0x28, 0xb1, 0xf6, 0x1c, 0x46, 0x42, 0x17, 0x86, 0x99,
+	0x9d, 0xdc, 0x42, 0x67, 0xbb, 0xc1, 0x30, 0x08, 0xbb, 0x41, 0xd8, 0x39, 0x6c, 0x07, 0xdd, 0x5e,
+	0xc0, 0x2a, 0xb9, 0xb2, 0xfe, 0xfe, 0x49, 0x2d, 0x63, 0x4c, 0x45, 0xba, 0xbd, 0x80, 0x2e, 0x75,
+	0xa7, 0xf6, 0x10, 0x86, 0xfd, 0x60, 0x30, 0xf0, 0x45, 0xd1, 0xf3, 0x8d, 0xf2, 0x29, 0x9a, 0x1f,
+	0xc7, 0x55, 0x7e, 0x1d, 0xcd, 0x0f, 0xfc, 0x5e, 0xd8, 0x4f, 0x0e, 0xba, 0x3c, 0x5a, 0x39, 0x3a,
+	0x01, 0x00, 0x83, 0xb8, 0x13, 0x8d, 0xb8, 0x3a, 0x39, 0xca, 0x37, 0xca, 0x9f, 0xcf, 0xa1, 0x85,
+	0xac, 0x35, 0xb2, 0x8a, 0xf2, 0x89, 0xdf, 0x13, 0x6d, 0x6e, 0x6d, 0x06, 0x3f, 0xac, 0xba, 0x7e,
+	0x8f, 0x02, 0xad, 0xbc, 0x8d, 0x4a, 0x7e, 0x3c, 0x0c, 0x3a, 0x89, 0xa8, 0xca, 0xf5, 0x59, 0xb8,
+	0xa8, 0x8c, 0x92, 0x0a, 0x0e, 0xb2, 0x8e, 0x0a, 0x1d, 0x3f, 0xe6, 0x4a, 0x2f, 0xad, 0x7f, 0x30,
+	0x0b, 0x27, 0xcd, 0x8f, 0x03, 0xca, 0xa8, 0x81, 0xcb, 0x5e, 0x34, 0x1a, 0x30, 0xdf, 0xcd, 0xc8,
+	0xa5, 0x16, 0x8d, 0x06, 0x94, 0x51, 0x83, 0x5d, 0x3d, 0x08, 0xc9, 0xa8, 0x5a, 0x9c, 0xdd, 0xae,
+	0x3a, 0xa3, 0xa4, 0x82, 0x03, 0x68, 0x34, 0x88, 0xa2, 0x2e, 0xab, 0xdd, 0x19, 0x35, 0x6a, 0x46,
+	0x51, 0x97, 0x32, 0x6a, 0xd0, 0x28, 0x3c, 0x18, 0x3c, 0x09, 0x46, 0xd5, 0xb9, 0xd9, 0x35, 0x32,
+	0x19, 0x25, 0x15, 0x1c, 0x80, 0xd7, 0x30, 0x18, 0xc5, 0x51, 0x58, 0x2d, 0xcf, 0xce, 0xcb, 0x66,
+	0x94, 0x54, 0x70, 0x60, 0xbc, 0x46, 0x30, 0x89, 0xab, 0xf3, 0x2f, 0xc1, 0x8b, 0x51, 0x52, 0xc1,
+	0x41, 0x7e, 0x84, 0x2a, 0xa3, 0xa0, 0xd3, 0x1f, 0x8e, 0xa2, 0x4e, 0x3f, 0x39, 0xac, 0x22, 0xc6,
+	0xf0, 0xa3, 0x59, 0x18, 0xd2, 0x09, 0x39, 0xcd, 0xf2, 0x92, 0xeb, 0xa8, 0x98, 0x04, 0x61, 0x1c,
+	0x54, 0x2b, 0x8c, 0xe9, 0xcd, 0x99, 0xb2, 0x1d, 0x08, 0x29, 0xa7, 0x07, 0x46, 0x4f, 0xa3, 0x7e,
+	0x27, 0xa8, 0x2e, 0xcc, 0xce, 0xa8, 0x05, 0x84, 0x94, 0xd3, 0x2b, 0x5f, 0x4b, 0x28, 0xef, 0xfa,
+	0xbd, 0xe9, 0x96, 0x3a, 0x87, 0xf2, 0xaa, 0xbe, 0x8d, 0x25, 0xbe, 0xb0, 0x71, 0x8e, 0x2f, 0x5a,
+	0x38, 0x0f, 0x33, 0x5c, 0xb3, 0xcc, 0x6d, 0x5c, 0x00, 0x90, 0x4e, 0xa0, 0x71, 0x96, 0x51, 0xc1,
+	0xb4, 0x3c, 0x13, 0x97, 0x00, 0x64, 0x7a, 0x4d, 0x3c, 0x07, 0x20, 0x9b, 0x5a, 0x26, 0x2e, 0x03,
+	0xc8, 0xa6, 0x2e, 0x9e, 0x87, 0x5e, 0x6a, 0x7b, 0xa6, 0xe6, 0x62, 0x04, 0x5f, 0x5b, 0x84, 0x6e,
+	0xe2, 0x8a, 0x5c, 0x44, 0xd2, 0x2e, 0x5e, 0x80, 0x6f, 0x6a, 0xad, 0x66, 0xec, 0xe2, 0x45, 0xc5,
+	0x42, 0x25, 0x5e, 0x90, 0xb2, 0x8c, 0x96, 0x54, 0x38, 0x4d, 0xb8, 0xed, 0x89, 0x62, 0x70, 0xa2,
+	0x20, 0xb4, 0x46, 0x34, 0xd7, 0x68, 0x11, 0x2c, 0x41, 0x87, 0x37, 0x9a, 0x19, 0x48, 0x0e, 0xda,
+	0xba, 0x4d, 0xad, 0x3a, 0x25, 0x8e, 0x03, 0x80, 0xbc, 0xf2, 0x2f, 0x09, 0x15, 0xa0, 0x30, 0x01,
+	0x57, 0x53, 0x1d, 0x32, 0xcd, 0x4d, 0xd5, 0x34, 0xcf, 0x51, 0x05, 0xb7, 0x45, 0x34, 0xaf, 0xea,
+	0xa0, 0x99, 0xa1, 0x36, 0x70, 0x8e, 0x0f, 0x84, 0xa6, 0xdd, 0x20, 0x4d, 0x62, 0x32, 0x8c, 0x3c,
+	0xcc, 0x1a, 0x9d, 0x63, 0x17, 0x60, 0xd6, 0xd4, 0x89, 0x69, 0xb0, 0x5d, 0x91, 0x69, 0x62, 0x3a,
+	0x2e, 0xf5, 0x00, 0x59, 0x6d, 0xe0, 0xd2, 0x64, 0x16, 0xb5, 0x08, 0x9e, 0x03, 0x59, 0xa6, 0xd5,
+	0x34, 0x4c, 0xbe, 0x2f, 0x83, 0xbf, 0xad, 0xcd, 0x86, 0xf1, 0xd0, 0x23, 0x78, 0x1e, 0x04, 0xdb,
+	0x2a, 0x75, 0x39, 0x2f, 0x04, 0x82, 0x6d, 0x4a, 0x6c, 0xcb, 0x31, 0x60, 0x6c, 0xa9, 0x0d, 0x5c,
+	0x01, 0x67, 0x50, 0x52, 0x6b, 0x90, 0x5d, 0xa3, 0x45, 0xda, 0x60, 0x06, 0x5e, 0x00, 0x34, 0x4a,
+	0x1a, 0x8c, 0x21, 0x07, 0x2d, 0x82, 0xcc, 0x56, 0x2a, 0x73, 0x49, 0xf9, 0x56, 0x42, 0x05, 0xe8,
+	0x26, 0xa0, 0x5c, 0xcd, 0xa2, 0xcd, 0x8c, 0xe9, 0x0b, 0xa8, 0xac, 0xea, 0xa0, 0x90, 0xda, 0x10,
+	0x86, 0x7b, 0xbb, 0x46, 0xc3, 0x50, 0xe9, 0x23, 0x9c, 0x03, 0x61, 0x19, 0xc3, 0x1f, 0x13, 0x8a,
+	0xf3, 0x8c, 0x85, 0x61, 0xaa, 0x8d, 0x36, 0x31, 0x75, 0xc3, 0xac, 0xe3, 0x02, 0xf8, 0xa2, 0x4e,
+	0xa8, 0x67, 0xea, 0xb8, 0x08, 0x6b, 0x4a, 0xd4, 0x86, 0xe1, 0x70, 0xbb, 0x0d, 0x2a, 0x76, 0x73,
+	0x10, 0x5a, 0x67, 0xcb, 0xa2, 0x2e, 0x2e, 0x43, 0xd8, 0x1b, 0x96, 0x59, 0xe7, 0xb9, 0x60, 0x51,
+	0x9d, 0x50, 0x8c, 0x00, 0x5b, 0x1c, 0x19, 0x35, 0x5c, 0x51, 0x08, 0x2a, 0xf1, 0xb6, 0x05, 0x3a,
+	0xd4, 0x89, 0xa9, 0x13, 0x3a, 0xad, 0x74, 0x8d, 0x34, 0x0d, 0xd3, 0x30, 0x45, 0xb4, 0x9a, 0xaa,
+	0xa3, 0x79, 0x0d, 0xd8, 0xe6, 0x40, 0x05, 0x93, 0x78, 0x2e, 0x28, 0xab, 0x7c, 0x89, 0x0a, 0xd0,
+	0xb3, 0x40, 0xe9, 0xa6, 0x65, 0xe9, 0x19, 0x16, 0x17, 0x10, 0xd6, 0x2c, 0x53, 0x17, 0x8e, 0x6d,
+	0xc3, 0x57, 0x2c, 0x41, 0x70, 0x58, 0x1a, 0xa9, 0x22, 0x89, 0x60, 0x6f, 0xea, 0x86, 0x70, 0x64,
+	0x1e, 0x3c, 0x6d, 0x98, 0x2e, 0xa1, 0xd4, 0xaa, 0xa7, 0xd1, 0xaf, 0xa0, 0xb9, 0x6d, 0x8f, 0xe7,
+	0x58, 0x11, 0x92, 0xce, 0xf1, 0x36, 0xb7, 0x21, 0xbd, 0x01, 0x50, 0x52, 0x3e, 0x43, 0x25, 0xde,
+	0xec, 0xc0, 0x0e, 0xd3, 0x6b, 0x6e, 0x1e, 0xb5, 0xc3, 0x31, 0xcc, 0xba, 0xd7, 0x50, 0x29, 0x96,
+	0xd8, 0xf9, 0xa5, 0xe1, 0x51, 0x96, 0x72, 0x65, 0x54, 0xd0, 0x3d, 0xb5, 0x81, 0xf3, 0x8a, 0x8b,
+	0x4a, 0xbc, 0xc5, 0x01, 0x07, 0x7e, 0xbe, 0xc9, 0x70, 0x98, 0x47, 0xc5, 0x9a, 0x41, 0x1d, 0x97,
+	0x93, 0x3b, 0x04, 0x6c, 0xc2, 0x39, 0x00, 0xbb, 0x5b, 0x06, 0xd5, 0x71, 0x1e, 0x0c, 0x9d, 0x24,
+	0x8c, 0x38, 0x1f, 0x15, 0x94, 0x3b, 0xa8, 0xc4, 0x9b, 0x1d, 0xe3, 0x4a, 0x2d, 0x7b, 0x4a, 0x2f,
+	0xd0, 0x84, 0xc1, 0xb8, 0x4b, 0x4c, 0xcb, 0x6d, 0x8b, 0x7d, 0x4e, 0xd9, 0x46, 0x95, 0x4c, 0x57,
+	0x93, 0x2f, 0xa1, 0xf3, 0x94, 0x68, 0x86, 0x4d, 0x2d, 0xcd, 0x70, 0x1f, 0x4d, 0xd7, 0x54, 0xfa,
+	0x81, 0xa5, 0x16, 0xd8, 0x6f, 0x99, 0xed, 0x0c, 0x2c, 0xa7, 0xc4, 0xa8, 0xc8, 0x9a, 0x19, 0xf8,
+	0xd5, 0x25, 0xe6, 0x54, 0x4d, 0xbe, 0x86, 0xce, 0x65, 0x03, 0xc4, 0x3e, 0x73, 0x2b, 0x6b, 0x9e,
+	0xeb, 0x51, 0xc2, 0x9d, 0x64, 0xab, 0x8e, 0x8b, 0xf3, 0x10, 0x04, 0x9b, 0x12, 0x87, 0x1f, 0xe8,
+	0x16, 0xd1, 0xfc, 0xb8, 0x17, 0xe0, 0x22, 0xbf, 0x7c, 0x78, 0xe9, 0xbe, 0xa4, 0x6c, 0xa2, 0x22,
+	0x6b, 0x7c, 0x20, 0xb4, 0x65, 0x19, 0x1a, 0x99, 0x36, 0x5c, 0xd5, 0x26, 0x4d, 0x40, 0x53, 0xd3,
+	0x9e, 0x90, 0x63, 0x22, 0xd4, 0xb4, 0x97, 0xfc, 0xbe, 0x8c, 0x96, 0xa6, 0x4f, 0x4d, 0xf2, 0x0a,
+	0xc2, 0x9f, 0x07, 0x7e, 0xb7, 0x9d, 0xc0, 0xd9, 0xb0, 0xdd, 0x0f, 0xbb, 0xc1, 0x33, 0x76, 0x94,
+	0x29, 0xd2, 0x25, 0x80, 0xb3, 0x23, 0xa3, 0x01, 0x50, 0xd9, 0x40, 0xc5, 0x7d, 0xff, 0x49, 0xb0,
+	0x2f, 0xce, 0x28, 0x1b, 0x33, 0x9d, 0xce, 0x56, 0x1b, 0x40, 0x4a, 0x39, 0x07, 0xe5, 0xd7, 0x73,
+	0xa8, 0xc8, 0x00, 0xcf, 0x9d, 0x84, 0xd5, 0xcd, 0x4d, 0x4a, 0x5a, 0x58, 0x62, 0x2d, 0x15, 0x8a,
+	0x98, 0x67, 0x85, 0xaa, 0xb7, 0xb4, 0x06, 0xef, 0x5f, 0xaa, 0xde, 0x6a, 0x5a, 0x3a, 0x2e, 0x80,
+	0x1b, 0x55, 0x58, 0x15, 0x19, 0x82, 0x6d, 0x5b, 0x50, 0xbc, 0x00, 0x74, 0x5d, 0x8a, 0xe7, 0x58,
+	0xc7, 0xf7, 0x76, 0x79, 0xa7, 0x52, 0xbd, 0x5d, 0x70, 0x02, 0x9e, 0x97, 0x4b, 0x28, 0xa7, 0x69,
+	0x18, 0x01, 0x89, 0xc6, 0xd8, 0x57, 0xc6, 0x13, 0x81, 0xb5, 0x71, 0x0d, 0xea, 0x00, 0x2f, 0x32,
+	0x2f, 0xc2, 0x92, 0x91, 0x2d, 0xf1, 0x59, 0x61, 0xe3, 0xb3, 0xe9, 0xd0, 0xc0, 0x80, 0xa0, 0x1b,
+	0x8e, 0x66, 0x79, 0xd4, 0x21, 0xf8, 0x1c, 0x4b, 0x7c, 0x6b, 0x73, 0x1b, 0xcb, 0xb0, 0x22, 0xbb,
+	0x76, 0x03, 0x9f, 0x67, 0x0d, 0xd6, 0x22, 0xce, 0x8e, 0xe1, 0x6e, 0xe1, 0x0b, 0x00, 0x37, 0x00,
+	0xe3, 0x35, 0x58, 0x35, 0x55, 0xfa, 0x00, 0x5f, 0x04, 0x6e, 0xcd, 0x1d, 0x82, 0x2f, 0xf1, 0x45,
+	0x0b, 0x57, 0xd9, 0x04, 0x22, 0x75, 0xfc, 0x7f, 0xa0, 0xa8, 0x69, 0xe2, 0x65, 0x60, 0x62, 0xda,
+	0xc2, 0xe6, 0xff, 0x07, 0x0d, 0x4d, 0xa6, 0xe1, 0xeb, 0xa0, 0x80, 0x39, 0xd6, 0xf0, 0x8d, 0x74,
+	0x74, 0xbd, 0xc9, 0xfa, 0x08, 0x2b, 0x58, 0xfc, 0x16, 0x8c, 0x27, 0x1b, 0x5f, 0x16, 0xed, 0x59,
+	0x75, 0xd5, 0x5d, 0xc3, 0xc1, 0x6f, 0xf3, 0x94, 0xa0, 0x2e, 0x70, 0x54, 0xd8, 0x58, 0x63, 0x8e,
+	0xb8, 0xc2, 0xf2, 0x12, 0x34, 0x7c, 0x87, 0xaf, 0x1c, 0x07, 0x5f, 0x65, 0xb8, 0x96, 0xe3, 0x82,
+	0x4e, 0x3f, 0x12, 0xe9, 0xca, 0xb0, 0xaf, 0x8d, 0x37, 0xe6, 0x36, 0x5e, 0xe1, 0x95, 0x47, 0xc0,
+	0x33, 0xef, 0xf2, 0xd9, 0x49, 0x6a, 0xf8, 0xba, 0x58, 0xd9, 0xf8, 0x06, 0x93, 0x42, 0x2d, 0xb3,
+	0x81, 0xdf, 0x4b, 0x07, 0xea, 0xfb, 0x60, 0xa1, 0xed, 0xe0, 0x55, 0xb0, 0xf0, 0xa1, 0xa7, 0x9a,
+	0x4c, 0x9f, 0x35, 0xc0, 0xa4, 0x1a, 0x2c, 0x3f, 0x80, 0x0f, 0x6c, 0x49, 0x49, 0x03, 0xdf, 0x64,
+	0x1f, 0x74, 0x6a, 0xd9, 0x78, 0x1d, 0x58, 0x80, 0x80, 0x0d, 0xd0, 0x81, 0x92, 0xa6, 0xa9, 0x9a,
+	0x2e, 0xbe, 0xc5, 0x2b, 0x17, 0xec, 0x34, 0x75, 0xaf, 0x89, 0x3f, 0x04, 0xe9, 0xd4, 0xb2, 0x5c,
+	0x7c, 0x1b, 0x56, 0x0e, 0x38, 0xe7, 0x23, 0xb6, 0xf2, 0x6a, 0x35, 0x7c, 0x07, 0x56, 0x4c, 0xe2,
+	0x8f, 0x59, 0xd3, 0xb1, 0x6c, 0x43, 0xc3, 0x77, 0xd9, 0x60, 0x07, 0xe0, 0xbd, 0xa9, 0x41, 0x74,
+	0x1f, 0x50, 0x76, 0x99, 0xd9, 0x1f, 0xb3, 0x76, 0xe5, 0xb1, 0x59, 0xff, 0x09, 0xa3, 0x34, 0xdc,
+	0x06, 0xc1, 0x9f, 0xf2, 0x79, 0xd4, 0xb2, 0xb7, 0x80, 0xfa, 0x33, 0x91, 0x72, 0x50, 0x86, 0x58,
+	0x65, 0xd9, 0xe9, 0xed, 0xb6, 0x5a, 0x78, 0x13, 0x96, 0x3a, 0x93, 0xaa, 0x01, 0x4a, 0xcd, 0xa2,
+	0xc4, 0xa8, 0x9b, 0x58, 0x07, 0x57, 0x3c, 0xd8, 0xc1, 0x84, 0x4d, 0x18, 0xc3, 0x71, 0x71, 0x8d,
+	0x9f, 0x49, 0x9a, 0x1a, 0xae, 0xb3, 0x04, 0xb0, 0x9a, 0x3c, 0x2f, 0xb7, 0x60, 0x22, 0xa4, 0x3b,
+	0x16, 0x78, 0x83, 0x61, 0x7a, 0x4d, 0x0d, 0x6f, 0x83, 0x5b, 0x34, 0xcb, 0xc6, 0x0f, 0xc0, 0x13,
+	0xba, 0xe1, 0xb0, 0xe1, 0x4d, 0x74, 0xdc, 0x60, 0xa5, 0xe0, 0xd8, 0xb8, 0x09, 0xb8, 0x75, 0x10,
+	0x6f, 0xb2, 0x15, 0xc4, 0xda, 0x02, 0x83, 0x0c, 0xb3, 0x06, 0x50, 0x9b, 0xa5, 0x21, 0x71, 0xf0,
+	0x43, 0x96, 0x67, 0xcc, 0x60, 0xaa, 0x7c, 0x9d, 0x43, 0x8b, 0x53, 0x97, 0xea, 0xef, 0x77, 0x81,
+	0x24, 0x53, 0xcf, 0x0f, 0x37, 0x67, 0xb9, 0xcd, 0x67, 0x5f, 0x21, 0xa6, 0xae, 0xf3, 0xf9, 0x97,
+	0x7f, 0x2c, 0xf9, 0x40, 0xdc, 0xc8, 0x31, 0x5a, 0x10, 0x0f, 0x40, 0xc7, 0x0d, 0x13, 0x84, 0x4a,
+	0x9a, 0xd5, 0x6c, 0xc2, 0xa5, 0x5c, 0xa9, 0xa3, 0x72, 0x6a, 0x92, 0x5c, 0x9d, 0x3c, 0x50, 0xf1,
+	0xfb, 0xff, 0xf8, 0x79, 0xea, 0x6d, 0xb4, 0xf0, 0x24, 0xe8, 0xf5, 0xc3, 0x76, 0xb4, 0xb7, 0x17,
+	0x07, 0xfc, 0x5e, 0x57, 0xa4, 0x15, 0x06, 0xb3, 0x18, 0x48, 0x69, 0xa0, 0x8b, 0xda, 0xbe, 0x1f,
+	0xc7, 0xfd, 0xbd, 0x7e, 0x87, 0xbd, 0xbf, 0x69, 0x7e, 0x12, 0xf4, 0xa2, 0xd1, 0xf1, 0xcf, 0x36,
+	0x6f, 0x22, 0xd4, 0x89, 0xc2, 0xbd, 0x7e, 0x97, 0xbd, 0x93, 0xf0, 0xbb, 0x6a, 0x06, 0xa2, 0xfc,
+	0x4e, 0x42, 0x97, 0xd4, 0xd0, 0xdf, 0x3f, 0xfc, 0x69, 0x30, 0x31, 0x34, 0xf8, 0xc9, 0x41, 0x10,
+	0x27, 0xb2, 0x86, 0xca, 0x5d, 0xf1, 0xbc, 0x76, 0xca, 0xa0, 0xa5, 0xaf, 0x71, 0x74, 0x4c, 0x28,
+	0xdb, 0x68, 0x31, 0x08, 0x3b, 0x51, 0xb7, 0x1f, 0xf6, 0xda, 0x99, 0x08, 0xde, 0x38, 0x31, 0x82,
+	0x9c, 0x86, 0xc5, 0x6e, 0x21, 0xc8, 0xec, 0x94, 0xbf, 0x4b, 0xa8, 0xfa, 0xbc, 0xca, 0xf1, 0x30,
+	0x82, 0xd1, 0xba, 0x83, 0xe4, 0x54, 0x74, 0x7b, 0x12, 0x69, 0x69, 0xc6, 0x48, 0x9f, 0x4b, 0x79,
+	0x4c, 0xee, 0xfc, 0xd9, 0xe7, 0xc0, 0xdc, 0xf4, 0x73, 0xa0, 0x4c, 0x78, 0x56, 0x81, 0x43, 0x63,
+	0xf1, 0xb8, 0x75, 0xed, 0x14, 0xb2, 0x00, 0x9f, 0x4e, 0x28, 0x95, 0x3f, 0x4a, 0xe8, 0x0d, 0x61,
+	0x18, 0x4f, 0xe0, 0xff, 0x95, 0x88, 0x7c, 0x89, 0xde, 0xfc, 0x2e, 0xbd, 0x45, 0x58, 0x54, 0x54,
+	0x06, 0x58, 0xd2, 0x0f, 0xe2, 0xaa, 0xc4, 0x1c, 0x74, 0xf5, 0x54, 0x25, 0x4c, 0xc7, 0x64, 0x2f,
+	0x0a, 0x00, 0x9c, 0xf8, 0x2f, 0x66, 0x35, 0xe8, 0x07, 0xf1, 0x0f, 0xdc, 0x65, 0xcf, 0xc6, 0x65,
+	0x37, 0x51, 0xf8, 0xbf, 0xe3, 0xab, 0xdf, 0x4a, 0xe8, 0x42, 0x5a, 0x3e, 0x87, 0x61, 0xe2, 0x3f,
+	0xfb, 0x81, 0x7b, 0xea, 0x4f, 0x12, 0x7a, 0xed, 0x88, 0xbe, 0xc2, 0x51, 0x53, 0x65, 0x27, 0xbd,
+	0x6c, 0xd9, 0xc9, 0xf7, 0x51, 0x89, 0x9d, 0x62, 0xe3, 0x6a, 0x8e, 0xf1, 0x78, 0xe7, 0xa4, 0xc9,
+	0x04, 0xc8, 0x54, 0xd0, 0x4c, 0xb9, 0x3a, 0x7f, 0xc4, 0xd5, 0x8f, 0xd1, 0x79, 0xd1, 0xaa, 0x0f,
+	0xa1, 0xf7, 0xbf, 0x4a, 0x47, 0x2b, 0x03, 0x74, 0x61, 0x9a, 0xb7, 0x70, 0x8a, 0x87, 0x50, 0x87,
+	0x0f, 0x84, 0x49, 0xfe, 0x7c, 0x78, 0x02, 0xfb, 0xe3, 0xe7, 0x09, 0xcd, 0x30, 0x52, 0x7e, 0x56,
+	0x40, 0xe7, 0x55, 0xfe, 0xbb, 0x50, 0xf0, 0xaa, 0x6d, 0x91, 0x77, 0x50, 0x79, 0x2f, 0xf0, 0x93,
+	0x83, 0x51, 0x10, 0x8b, 0x77, 0xe1, 0x7b, 0x27, 0x30, 0x39, 0x46, 0x95, 0xd5, 0x9a, 0x60, 0x41,
+	0xc7, 0xcc, 0x9e, 0xcf, 0xc6, 0xfc, 0xf7, 0xcc, 0xc6, 0xe5, 0x7f, 0x4b, 0xa8, 0x9c, 0x0a, 0x92,
+	0xaf, 0xa2, 0xa5, 0xe0, 0x59, 0x32, 0xf2, 0x3b, 0x49, 0x3b, 0x66, 0xa9, 0xc9, 0x5c, 0x50, 0xa6,
+	0x8b, 0x02, 0xca, 0xf3, 0x55, 0x7e, 0x17, 0xe1, 0x14, 0x6d, 0x5c, 0xd8, 0x39, 0x86, 0x78, 0x56,
+	0xc0, 0xd3, 0x1e, 0x20, 0xdf, 0x47, 0xcb, 0x29, 0xea, 0x31, 0x63, 0x2c, 0xcf, 0x88, 0xaa, 0x02,
+	0x43, 0x7f, 0x6e, 0x46, 0xdd, 0x41, 0xd5, 0x29, 0x41, 0x87, 0x19, 0xda, 0x02, 0xa3, 0xbd, 0x98,
+	0x15, 0x38, 0xe9, 0xd3, 0xf2, 0x15, 0xb4, 0xd8, 0x11, 0xd9, 0xd4, 0x66, 0x87, 0xb4, 0x12, 0x43,
+	0x5f, 0xe8, 0x64, 0x52, 0x4c, 0xf9, 0x4d, 0x1e, 0x3a, 0x47, 0xd6, 0xf1, 0x3f, 0xa4, 0x42, 0xcc,
+	0xb6, 0xcd, 0xfc, 0xcb, 0xb5, 0xcd, 0xe3, 0x0f, 0x0f, 0x85, 0x57, 0x7b, 0x78, 0x28, 0x1e, 0x39,
+	0x3c, 0x4c, 0x17, 0x6c, 0xe9, 0x15, 0x15, 0xec, 0xf5, 0x3b, 0x68, 0x21, 0x9b, 0xc6, 0xfc, 0x66,
+	0x60, 0x12, 0x7c, 0x06, 0x56, 0x9e, 0x5b, 0xbb, 0xc3, 0x2f, 0xcb, 0x9e, 0x5b, 0xbb, 0x79, 0x9b,
+	0x5f, 0x96, 0x3d, 0xb7, 0xb6, 0xb1, 0x8e, 0xf3, 0xeb, 0x7f, 0x29, 0xa3, 0xb3, 0x0d, 0x21, 0xd1,
+	0xe1, 0xbf, 0x21, 0xcb, 0x7f, 0x90, 0x10, 0x3e, 0x7a, 0xe6, 0x92, 0x6f, 0x9f, 0x58, 0xa4, 0xc7,
+	0x9e, 0x2b, 0x97, 0x3f, 0x9a, 0x99, 0x8e, 0xe7, 0x99, 0xb2, 0xfa, 0xd5, 0xdf, 0xfe, 0xf1, 0x4d,
+	0x6e, 0x45, 0xb9, 0x32, 0xfe, 0xb1, 0x3b, 0x75, 0x75, 0x7c, 0xd7, 0x3f, 0x42, 0x74, 0x57, 0xba,
+	0x2e, 0x7f, 0x2b, 0xa1, 0xb3, 0x47, 0xa6, 0xac, 0xfc, 0xe1, 0xe9, 0x84, 0x1f, 0x39, 0x46, 0x2c,
+	0xdf, 0x9e, 0x95, 0x4c, 0xa8, 0xfc, 0x3e, 0x53, 0xf9, 0x9a, 0xa2, 0x7c, 0xb7, 0xca, 0x29, 0x0d,
+	0x68, 0xfc, 0xd7, 0x23, 0x07, 0x99, 0x4c, 0x89, 0xde, 0x9f, 0x41, 0x83, 0xe7, 0x4e, 0x8e, 0xcb,
+	0x1f, 0xbf, 0x24, 0xb5, 0x30, 0xe3, 0x16, 0x33, 0x63, 0x55, 0x79, 0xf7, 0x04, 0x33, 0x0e, 0xa7,
+	0xfc, 0xff, 0x2b, 0x09, 0x2d, 0x4e, 0x8d, 0x6e, 0x79, 0xe3, 0x94, 0xa1, 0xcf, 0x1e, 0x4c, 0x96,
+	0x6f, 0xcd, 0x46, 0x24, 0x54, 0xbe, 0xc1, 0x54, 0xbe, 0xaa, 0x5c, 0x7e, 0x41, 0xb2, 0x30, 0x0a,
+	0xd0, 0xf4, 0x97, 0x12, 0x5a, 0xc8, 0x8e, 0x53, 0x79, 0xfd, 0x74, 0x15, 0x98, 0x9d, 0xeb, 0xcb,
+	0x1b, 0x33, 0xd1, 0x08, 0x35, 0xaf, 0x33, 0x35, 0xdf, 0x51, 0xde, 0x3a, 0x46, 0xcd, 0x6c, 0xf7,
+	0x4d, 0xb5, 0xcc, 0x36, 0xe0, 0x13, 0xb5, 0x3c, 0x66, 0x4c, 0x2e, 0x6f, 0xcc, 0x44, 0x73, 0x0a,
+	0x2d, 0xfd, 0x0c, 0xc1, 0x5d, 0xe9, 0xfa, 0xe6, 0x57, 0x12, 0x7a, 0xbb, 0x13, 0x0d, 0x5e, 0x2c,
+	0x66, 0xf3, 0xc2, 0x91, 0x16, 0x63, 0x8f, 0xa2, 0x24, 0xb2, 0xa5, 0xc7, 0x44, 0x90, 0xf5, 0x22,
+	0x20, 0x59, 0x8d, 0x46, 0xbd, 0xb5, 0x5e, 0x10, 0xb2, 0xff, 0x89, 0xac, 0xf1, 0x4f, 0xfe, 0xb0,
+	0x1f, 0x7f, 0xc7, 0x9f, 0x5f, 0xee, 0xa5, 0x80, 0x27, 0x25, 0x46, 0xb1, 0xf1, 0x9f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xcc, 0x93, 0x36, 0x44, 0x2d, 0x23, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2919,200 +3115,3 @@ var _LanguageService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/language/v1beta2/language_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/language/v1beta2/language_service.proto", fileDescriptor_language_service_7b74fe2bae56761e)
-}
-
-var fileDescriptor_language_service_7b74fe2bae56761e = []byte{
-	// 3019 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3a, 0x4b, 0x73, 0xdb, 0xc6,
-	0xfd, 0x06, 0x5f, 0xa2, 0x96, 0x92, 0xbc, 0x86, 0x1d, 0x9b, 0x7f, 0xfd, 0xf3, 0x70, 0xe0, 0xb8,
-	0x56, 0xec, 0x44, 0x8a, 0x25, 0xc7, 0x71, 0x6d, 0xe7, 0x01, 0x01, 0x4b, 0x0a, 0x32, 0x09, 0xc0,
-	0x0b, 0x80, 0x92, 0x7d, 0xe1, 0xc0, 0x24, 0xc4, 0x70, 0x22, 0x02, 0x2c, 0x01, 0x79, 0xac, 0x5e,
-	0x32, 0xcd, 0x4c, 0x8f, 0x99, 0x1e, 0xf2, 0x11, 0x7a, 0xe8, 0xb4, 0x33, 0x9d, 0xb4, 0xd3, 0x99,
-	0x4e, 0x7b, 0xe8, 0x27, 0xe8, 0xb1, 0x33, 0xfd, 0x04, 0xfd, 0x00, 0x3d, 0xb6, 0xb7, 0xce, 0x6f,
-	0x77, 0x41, 0x82, 0xb2, 0x62, 0x89, 0x8e, 0xa7, 0x93, 0xde, 0x76, 0x7f, 0xf8, 0xbd, 0x9f, 0xbb,
-	0x4b, 0xa2, 0x5b, 0xbd, 0x28, 0xea, 0xed, 0x07, 0x6b, 0x9d, 0xfd, 0xe8, 0xa0, 0xbb, 0xb6, 0xef,
-	0x87, 0xbd, 0x03, 0xbf, 0x17, 0xac, 0x3d, 0xbd, 0xf9, 0x24, 0x48, 0xfc, 0xf5, 0x31, 0xa0, 0x1d,
-	0x07, 0xa3, 0xa7, 0xfd, 0x4e, 0xb0, 0x3a, 0x1c, 0x45, 0x49, 0x24, 0xbf, 0xc1, 0xa9, 0x56, 0x19,
-	0xd5, 0x6a, 0x8a, 0xb4, 0x2a, 0xa8, 0x96, 0x5f, 0x17, 0x4c, 0xfd, 0x61, 0x7f, 0xcd, 0x0f, 0xc3,
-	0x28, 0xf1, 0x93, 0x7e, 0x14, 0xc6, 0x9c, 0x78, 0xf9, 0x8a, 0xf8, 0xba, 0x1f, 0x85, 0xbd, 0xd1,
-	0x41, 0x18, 0xf6, 0xc3, 0xde, 0x5a, 0x34, 0x0c, 0x46, 0x53, 0x48, 0x6f, 0x09, 0x24, 0xb6, 0x7b,
-	0x72, 0xb0, 0xb7, 0x96, 0xf4, 0x07, 0x41, 0x9c, 0xf8, 0x83, 0xa1, 0x40, 0xb8, 0x24, 0x10, 0x46,
-	0xc3, 0xce, 0x5a, 0x9c, 0xf8, 0xc9, 0x81, 0xa0, 0x54, 0xfe, 0x29, 0xa1, 0xb2, 0x1e, 0x75, 0x0e,
-	0x06, 0x41, 0x98, 0xc8, 0x9f, 0xa1, 0x42, 0x72, 0x38, 0x0c, 0xaa, 0xd2, 0x65, 0x69, 0x65, 0x69,
-	0xfd, 0xbd, 0xd5, 0x17, 0xea, 0xbd, 0x9a, 0x92, 0xad, 0xba, 0x87, 0xc3, 0x80, 0x32, 0x4a, 0x79,
-	0x19, 0xcd, 0x75, 0xa2, 0x30, 0x09, 0xc2, 0xa4, 0x9a, 0xbb, 0x2c, 0xad, 0xcc, 0x6f, 0x9d, 0xa1,
-	0x29, 0x40, 0x5e, 0x41, 0x67, 0x7b, 0x9d, 0xb8, 0x2d, 0xb6, 0xed, 0x83, 0x51, 0xbf, 0x9a, 0x17,
-	0x38, 0x8b, 0xbd, 0x4e, 0xac, 0x71, 0xb8, 0x37, 0xea, 0xcb, 0xcb, 0xa8, 0x9c, 0x4a, 0xab, 0x16,
-	0x00, 0x85, 0x8e, 0xf7, 0xca, 0x6d, 0x54, 0x00, 0x79, 0xf2, 0x05, 0x84, 0xdd, 0x47, 0x36, 0x69,
-	0x7b, 0xa6, 0x63, 0x13, 0xcd, 0xa8, 0x19, 0x44, 0xc7, 0x67, 0xe4, 0x25, 0x84, 0xec, 0x86, 0x6a,
-	0x98, 0x6d, 0x97, 0xec, 0xba, 0x58, 0x92, 0xcb, 0xa8, 0xb0, 0xe5, 0x36, 0x1b, 0x38, 0xb7, 0x59,
-	0x46, 0xa5, 0x38, 0x3a, 0x18, 0x75, 0x02, 0xe5, 0x17, 0x12, 0x2a, 0x3b, 0x01, 0x08, 0xeb, 0x04,
-	0xf2, 0x3d, 0x54, 0x48, 0x82, 0x67, 0x09, 0x33, 0xb9, 0xb2, 0x7e, 0xed, 0x04, 0x93, 0xdd, 0xe0,
-	0x59, 0xe2, 0x0c, 0xfd, 0x90, 0x32, 0x22, 0xb9, 0x86, 0xe6, 0xe3, 0x20, 0x04, 0x5f, 0x0b, 0x7b,
-	0x2b, 0xeb, 0x2b, 0x27, 0x70, 0x70, 0x52, 0x7c, 0x3a, 0x21, 0x55, 0xbe, 0x29, 0xa0, 0x12, 0x09,
-	0x93, 0x7e, 0x72, 0x28, 0xcb, 0xa8, 0x10, 0xfa, 0x03, 0x1e, 0x82, 0x79, 0xca, 0xd6, 0xf2, 0x27,
-	0x22, 0x2c, 0x39, 0x16, 0x96, 0xeb, 0x27, 0x48, 0xe0, 0x8c, 0xb2, 0x41, 0xb1, 0x50, 0x79, 0x10,
-	0x24, 0x7e, 0xd7, 0x4f, 0xfc, 0x6a, 0xfe, 0x72, 0x7e, 0xa5, 0xb2, 0xbe, 0x71, 0x3a, 0x1e, 0x4d,
-	0x41, 0x45, 0xc2, 0x64, 0x74, 0x48, 0xc7, 0x4c, 0x20, 0x3e, 0xb1, 0xbf, 0xdf, 0x07, 0x07, 0xb2,
-	0xf8, 0xe4, 0xe8, 0x78, 0x2f, 0x6f, 0x81, 0xb0, 0x90, 0x25, 0x67, 0xb5, 0xc8, 0x84, 0xbd, 0x77,
-	0x2a, 0x61, 0x4d, 0x4e, 0x44, 0xc7, 0xd4, 0xd3, 0xde, 0x2d, 0xbd, 0xb4, 0x77, 0x97, 0xef, 0xa1,
-	0xc5, 0x29, 0x43, 0x64, 0x8c, 0xf2, 0x5f, 0x04, 0x87, 0xc2, 0xc5, 0xb0, 0x94, 0x2f, 0xa0, 0xe2,
-	0x53, 0x7f, 0xff, 0x80, 0xbb, 0x78, 0x9e, 0xf2, 0xcd, 0xdd, 0xdc, 0x1d, 0x49, 0x39, 0x14, 0xe9,
-	0x56, 0x41, 0x73, 0x9e, 0xf9, 0xc0, 0xb4, 0x76, 0x4c, 0x7c, 0x46, 0x46, 0xa8, 0x64, 0x13, 0xea,
-	0x58, 0x26, 0x96, 0xe4, 0x05, 0x54, 0x6e, 0x58, 0x9a, 0xea, 0x1a, 0x96, 0x89, 0x73, 0x32, 0x46,
-	0x0b, 0x16, 0xad, 0xab, 0xa6, 0xf1, 0x98, 0x43, 0xf2, 0xf2, 0x3c, 0x2a, 0x92, 0x16, 0x31, 0x5d,
-	0x5c, 0x90, 0xcf, 0xa2, 0xca, 0x8e, 0x45, 0x1f, 0xb4, 0xad, 0x5a, 0x5b, 0xa5, 0x2e, 0x2e, 0xca,
-	0xe7, 0xd0, 0xa2, 0x66, 0x99, 0x8e, 0xd7, 0x24, 0xb4, 0x5d, 0xb7, 0x2c, 0x1d, 0x97, 0x00, 0xdd,
-	0x72, 0xb7, 0x08, 0xc5, 0x73, 0xca, 0xcf, 0x73, 0xa8, 0xe8, 0x46, 0x5f, 0x04, 0xe1, 0xf7, 0x4b,
-	0xd2, 0x87, 0x68, 0x69, 0xe8, 0x8f, 0x92, 0x76, 0xb4, 0xd7, 0x8e, 0x87, 0x41, 0xd0, 0xf9, 0x5c,
-	0x64, 0xea, 0x8d, 0x13, 0xd8, 0xd8, 0xfe, 0x28, 0xb1, 0xf6, 0x1c, 0x46, 0x42, 0x17, 0x86, 0x99,
-	0x9d, 0xdc, 0x42, 0x67, 0xbb, 0xc1, 0x30, 0x08, 0xbb, 0x41, 0xd8, 0x39, 0x6c, 0x07, 0xdd, 0x5e,
-	0xc0, 0x2a, 0xb9, 0xb2, 0xfe, 0xfe, 0x49, 0x2d, 0x63, 0x4c, 0x45, 0xba, 0xbd, 0x80, 0x2e, 0x75,
-	0xa7, 0xf6, 0x10, 0x86, 0xfd, 0x60, 0x30, 0xf0, 0x45, 0xd1, 0xf3, 0x8d, 0xf2, 0x29, 0x9a, 0x1f,
-	0xc7, 0x55, 0x7e, 0x1d, 0xcd, 0x0f, 0xfc, 0x5e, 0xd8, 0x4f, 0x0e, 0xba, 0x3c, 0x5a, 0x39, 0x3a,
-	0x01, 0x00, 0x83, 0xb8, 0x13, 0x8d, 0xb8, 0x3a, 0x39, 0xca, 0x37, 0xca, 0x9f, 0xcf, 0xa1, 0x85,
-	0xac, 0x35, 0xb2, 0x8a, 0xf2, 0x89, 0xdf, 0x13, 0x6d, 0x6e, 0x6d, 0x06, 0x3f, 0xac, 0xba, 0x7e,
-	0x8f, 0x02, 0xad, 0xbc, 0x8d, 0x4a, 0x7e, 0x3c, 0x0c, 0x3a, 0x89, 0xa8, 0xca, 0xf5, 0x59, 0xb8,
-	0xa8, 0x8c, 0x92, 0x0a, 0x0e, 0xb2, 0x8e, 0x0a, 0x1d, 0x3f, 0xe6, 0x4a, 0x2f, 0xad, 0x7f, 0x30,
-	0x0b, 0x27, 0xcd, 0x8f, 0x03, 0xca, 0xa8, 0x81, 0xcb, 0x5e, 0x34, 0x1a, 0x30, 0xdf, 0xcd, 0xc8,
-	0xa5, 0x16, 0x8d, 0x06, 0x94, 0x51, 0x83, 0x5d, 0x3d, 0x08, 0xc9, 0xa8, 0x5a, 0x9c, 0xdd, 0xae,
-	0x3a, 0xa3, 0xa4, 0x82, 0x03, 0x68, 0x34, 0x88, 0xa2, 0x2e, 0xab, 0xdd, 0x19, 0x35, 0x6a, 0x46,
-	0x51, 0x97, 0x32, 0x6a, 0xd0, 0x28, 0x3c, 0x18, 0x3c, 0x09, 0x46, 0xd5, 0xb9, 0xd9, 0x35, 0x32,
-	0x19, 0x25, 0x15, 0x1c, 0x80, 0xd7, 0x30, 0x18, 0xc5, 0x51, 0x58, 0x2d, 0xcf, 0xce, 0xcb, 0x66,
-	0x94, 0x54, 0x70, 0x60, 0xbc, 0x46, 0x30, 0x89, 0xab, 0xf3, 0x2f, 0xc1, 0x8b, 0x51, 0x52, 0xc1,
-	0x41, 0x7e, 0x84, 0x2a, 0xa3, 0xa0, 0xd3, 0x1f, 0x8e, 0xa2, 0x4e, 0x3f, 0x39, 0xac, 0x22, 0xc6,
-	0xf0, 0xa3, 0x59, 0x18, 0xd2, 0x09, 0x39, 0xcd, 0xf2, 0x92, 0xeb, 0xa8, 0x98, 0x04, 0x61, 0x1c,
-	0x54, 0x2b, 0x8c, 0xe9, 0xcd, 0x99, 0xb2, 0x1d, 0x08, 0x29, 0xa7, 0x07, 0x46, 0x4f, 0xa3, 0x7e,
-	0x27, 0xa8, 0x2e, 0xcc, 0xce, 0xa8, 0x05, 0x84, 0x94, 0xd3, 0x2b, 0x5f, 0x4b, 0x28, 0xef, 0xfa,
-	0xbd, 0xe9, 0x96, 0x3a, 0x87, 0xf2, 0xaa, 0xbe, 0x8d, 0x25, 0xbe, 0xb0, 0x71, 0x8e, 0x2f, 0x5a,
-	0x38, 0x0f, 0x33, 0x5c, 0xb3, 0xcc, 0x6d, 0x5c, 0x00, 0x90, 0x4e, 0xa0, 0x71, 0x96, 0x51, 0xc1,
-	0xb4, 0x3c, 0x13, 0x97, 0x00, 0x64, 0x7a, 0x4d, 0x3c, 0x07, 0x20, 0x9b, 0x5a, 0x26, 0x2e, 0x03,
-	0xc8, 0xa6, 0x2e, 0x9e, 0x87, 0x5e, 0x6a, 0x7b, 0xa6, 0xe6, 0x62, 0x04, 0x5f, 0x5b, 0x84, 0x6e,
-	0xe2, 0x8a, 0x5c, 0x44, 0xd2, 0x2e, 0x5e, 0x80, 0x6f, 0x6a, 0xad, 0x66, 0xec, 0xe2, 0x45, 0xc5,
-	0x42, 0x25, 0x5e, 0x90, 0xb2, 0x8c, 0x96, 0x54, 0x38, 0x4d, 0xb8, 0xed, 0x89, 0x62, 0x70, 0xa2,
-	0x20, 0xb4, 0x46, 0x34, 0xd7, 0x68, 0x11, 0x2c, 0x41, 0x87, 0x37, 0x9a, 0x19, 0x48, 0x0e, 0xda,
-	0xba, 0x4d, 0xad, 0x3a, 0x25, 0x8e, 0x03, 0x80, 0xbc, 0xf2, 0x2f, 0x09, 0x15, 0xa0, 0x30, 0x01,
-	0x57, 0x53, 0x1d, 0x32, 0xcd, 0x4d, 0xd5, 0x34, 0xcf, 0x51, 0x05, 0xb7, 0x45, 0x34, 0xaf, 0xea,
-	0xa0, 0x99, 0xa1, 0x36, 0x70, 0x8e, 0x0f, 0x84, 0xa6, 0xdd, 0x20, 0x4d, 0x62, 0x32, 0x8c, 0x3c,
-	0xcc, 0x1a, 0x9d, 0x63, 0x17, 0x60, 0xd6, 0xd4, 0x89, 0x69, 0xb0, 0x5d, 0x91, 0x69, 0x62, 0x3a,
-	0x2e, 0xf5, 0x00, 0x59, 0x6d, 0xe0, 0xd2, 0x64, 0x16, 0xb5, 0x08, 0x9e, 0x03, 0x59, 0xa6, 0xd5,
-	0x34, 0x4c, 0xbe, 0x2f, 0x83, 0xbf, 0xad, 0xcd, 0x86, 0xf1, 0xd0, 0x23, 0x78, 0x1e, 0x04, 0xdb,
-	0x2a, 0x75, 0x39, 0x2f, 0x04, 0x82, 0x6d, 0x4a, 0x6c, 0xcb, 0x31, 0x60, 0x6c, 0xa9, 0x0d, 0x5c,
-	0x01, 0x67, 0x50, 0x52, 0x6b, 0x90, 0x5d, 0xa3, 0x45, 0xda, 0x60, 0x06, 0x5e, 0x00, 0x34, 0x4a,
-	0x1a, 0x8c, 0x21, 0x07, 0x2d, 0x82, 0xcc, 0x56, 0x2a, 0x73, 0x49, 0xf9, 0x56, 0x42, 0x05, 0xe8,
-	0x26, 0xa0, 0x5c, 0xcd, 0xa2, 0xcd, 0x8c, 0xe9, 0x0b, 0xa8, 0xac, 0xea, 0xa0, 0x90, 0xda, 0x10,
-	0x86, 0x7b, 0xbb, 0x46, 0xc3, 0x50, 0xe9, 0x23, 0x9c, 0x03, 0x61, 0x19, 0xc3, 0x1f, 0x13, 0x8a,
-	0xf3, 0x8c, 0x85, 0x61, 0xaa, 0x8d, 0x36, 0x31, 0x75, 0xc3, 0xac, 0xe3, 0x02, 0xf8, 0xa2, 0x4e,
-	0xa8, 0x67, 0xea, 0xb8, 0x08, 0x6b, 0x4a, 0xd4, 0x86, 0xe1, 0x70, 0xbb, 0x0d, 0x2a, 0x76, 0x73,
-	0x10, 0x5a, 0x67, 0xcb, 0xa2, 0x2e, 0x2e, 0x43, 0xd8, 0x1b, 0x96, 0x59, 0xe7, 0xb9, 0x60, 0x51,
-	0x9d, 0x50, 0x8c, 0x00, 0x5b, 0x1c, 0x19, 0x35, 0x5c, 0x51, 0x08, 0x2a, 0xf1, 0xb6, 0x05, 0x3a,
-	0xd4, 0x89, 0xa9, 0x13, 0x3a, 0xad, 0x74, 0x8d, 0x34, 0x0d, 0xd3, 0x30, 0x45, 0xb4, 0x9a, 0xaa,
-	0xa3, 0x79, 0x0d, 0xd8, 0xe6, 0x40, 0x05, 0x93, 0x78, 0x2e, 0x28, 0xab, 0x7c, 0x89, 0x0a, 0xd0,
-	0xb3, 0x40, 0xe9, 0xa6, 0x65, 0xe9, 0x19, 0x16, 0x17, 0x10, 0xd6, 0x2c, 0x53, 0x17, 0x8e, 0x6d,
-	0xc3, 0x57, 0x2c, 0x41, 0x70, 0x58, 0x1a, 0xa9, 0x22, 0x89, 0x60, 0x6f, 0xea, 0x86, 0x70, 0x64,
-	0x1e, 0x3c, 0x6d, 0x98, 0x2e, 0xa1, 0xd4, 0xaa, 0xa7, 0xd1, 0xaf, 0xa0, 0xb9, 0x6d, 0x8f, 0xe7,
-	0x58, 0x11, 0x92, 0xce, 0xf1, 0x36, 0xb7, 0x21, 0xbd, 0x01, 0x50, 0x52, 0x3e, 0x43, 0x25, 0xde,
-	0xec, 0xc0, 0x0e, 0xd3, 0x6b, 0x6e, 0x1e, 0xb5, 0xc3, 0x31, 0xcc, 0xba, 0xd7, 0x50, 0x29, 0x96,
-	0xd8, 0xf9, 0xa5, 0xe1, 0x51, 0x96, 0x72, 0x65, 0x54, 0xd0, 0x3d, 0xb5, 0x81, 0xf3, 0x8a, 0x8b,
-	0x4a, 0xbc, 0xc5, 0x01, 0x07, 0x7e, 0xbe, 0xc9, 0x70, 0x98, 0x47, 0xc5, 0x9a, 0x41, 0x1d, 0x97,
-	0x93, 0x3b, 0x04, 0x6c, 0xc2, 0x39, 0x00, 0xbb, 0x5b, 0x06, 0xd5, 0x71, 0x1e, 0x0c, 0x9d, 0x24,
-	0x8c, 0x38, 0x1f, 0x15, 0x94, 0x3b, 0xa8, 0xc4, 0x9b, 0x1d, 0xe3, 0x4a, 0x2d, 0x7b, 0x4a, 0x2f,
-	0xd0, 0x84, 0xc1, 0xb8, 0x4b, 0x4c, 0xcb, 0x6d, 0x8b, 0x7d, 0x4e, 0xd9, 0x46, 0x95, 0x4c, 0x57,
-	0x93, 0x2f, 0xa1, 0xf3, 0x94, 0x68, 0x86, 0x4d, 0x2d, 0xcd, 0x70, 0x1f, 0x4d, 0xd7, 0x54, 0xfa,
-	0x81, 0xa5, 0x16, 0xd8, 0x6f, 0x99, 0xed, 0x0c, 0x2c, 0xa7, 0xc4, 0xa8, 0xc8, 0x9a, 0x19, 0xf8,
-	0xd5, 0x25, 0xe6, 0x54, 0x4d, 0xbe, 0x86, 0xce, 0x65, 0x03, 0xc4, 0x3e, 0x73, 0x2b, 0x6b, 0x9e,
-	0xeb, 0x51, 0xc2, 0x9d, 0x64, 0xab, 0x8e, 0x8b, 0xf3, 0x10, 0x04, 0x9b, 0x12, 0x87, 0x1f, 0xe8,
-	0x16, 0xd1, 0xfc, 0xb8, 0x17, 0xe0, 0x22, 0xbf, 0x7c, 0x78, 0xe9, 0xbe, 0xa4, 0x6c, 0xa2, 0x22,
-	0x6b, 0x7c, 0x20, 0xb4, 0x65, 0x19, 0x1a, 0x99, 0x36, 0x5c, 0xd5, 0x26, 0x4d, 0x40, 0x53, 0xd3,
-	0x9e, 0x90, 0x63, 0x22, 0xd4, 0xb4, 0x97, 0xfc, 0xbe, 0x8c, 0x96, 0xa6, 0x4f, 0x4d, 0xf2, 0x0a,
-	0xc2, 0x9f, 0x07, 0x7e, 0xb7, 0x9d, 0xc0, 0xd9, 0xb0, 0xdd, 0x0f, 0xbb, 0xc1, 0x33, 0x76, 0x94,
-	0x29, 0xd2, 0x25, 0x80, 0xb3, 0x23, 0xa3, 0x01, 0x50, 0xd9, 0x40, 0xc5, 0x7d, 0xff, 0x49, 0xb0,
-	0x2f, 0xce, 0x28, 0x1b, 0x33, 0x9d, 0xce, 0x56, 0x1b, 0x40, 0x4a, 0x39, 0x07, 0xe5, 0xd7, 0x73,
-	0xa8, 0xc8, 0x00, 0xcf, 0x9d, 0x84, 0xd5, 0xcd, 0x4d, 0x4a, 0x5a, 0x58, 0x62, 0x2d, 0x15, 0x8a,
-	0x98, 0x67, 0x85, 0xaa, 0xb7, 0xb4, 0x06, 0xef, 0x5f, 0xaa, 0xde, 0x6a, 0x5a, 0x3a, 0x2e, 0x80,
-	0x1b, 0x55, 0x58, 0x15, 0x19, 0x82, 0x6d, 0x5b, 0x50, 0xbc, 0x00, 0x74, 0x5d, 0x8a, 0xe7, 0x58,
-	0xc7, 0xf7, 0x76, 0x79, 0xa7, 0x52, 0xbd, 0x5d, 0x70, 0x02, 0x9e, 0x97, 0x4b, 0x28, 0xa7, 0x69,
-	0x18, 0x01, 0x89, 0xc6, 0xd8, 0x57, 0xc6, 0x13, 0x81, 0xb5, 0x71, 0x0d, 0xea, 0x00, 0x2f, 0x32,
-	0x2f, 0xc2, 0x92, 0x91, 0x2d, 0xf1, 0x59, 0x61, 0xe3, 0xb3, 0xe9, 0xd0, 0xc0, 0x80, 0xa0, 0x1b,
-	0x8e, 0x66, 0x79, 0xd4, 0x21, 0xf8, 0x1c, 0x4b, 0x7c, 0x6b, 0x73, 0x1b, 0xcb, 0xb0, 0x22, 0xbb,
-	0x76, 0x03, 0x9f, 0x67, 0x0d, 0xd6, 0x22, 0xce, 0x8e, 0xe1, 0x6e, 0xe1, 0x0b, 0x00, 0x37, 0x00,
-	0xe3, 0x35, 0x58, 0x35, 0x55, 0xfa, 0x00, 0x5f, 0x04, 0x6e, 0xcd, 0x1d, 0x82, 0x2f, 0xf1, 0x45,
-	0x0b, 0x57, 0xd9, 0x04, 0x22, 0x75, 0xfc, 0x7f, 0xa0, 0xa8, 0x69, 0xe2, 0x65, 0x60, 0x62, 0xda,
-	0xc2, 0xe6, 0xff, 0x07, 0x0d, 0x4d, 0xa6, 0xe1, 0xeb, 0xa0, 0x80, 0x39, 0xd6, 0xf0, 0x8d, 0x74,
-	0x74, 0xbd, 0xc9, 0xfa, 0x08, 0x2b, 0x58, 0xfc, 0x16, 0x8c, 0x27, 0x1b, 0x5f, 0x16, 0xed, 0x59,
-	0x75, 0xd5, 0x5d, 0xc3, 0xc1, 0x6f, 0xf3, 0x94, 0xa0, 0x2e, 0x70, 0x54, 0xd8, 0x58, 0x63, 0x8e,
-	0xb8, 0xc2, 0xf2, 0x12, 0x34, 0x7c, 0x87, 0xaf, 0x1c, 0x07, 0x5f, 0x65, 0xb8, 0x96, 0xe3, 0x82,
-	0x4e, 0x3f, 0x12, 0xe9, 0xca, 0xb0, 0xaf, 0x8d, 0x37, 0xe6, 0x36, 0x5e, 0xe1, 0x95, 0x47, 0xc0,
-	0x33, 0xef, 0xf2, 0xd9, 0x49, 0x6a, 0xf8, 0xba, 0x58, 0xd9, 0xf8, 0x06, 0x93, 0x42, 0x2d, 0xb3,
-	0x81, 0xdf, 0x4b, 0x07, 0xea, 0xfb, 0x60, 0xa1, 0xed, 0xe0, 0x55, 0xb0, 0xf0, 0xa1, 0xa7, 0x9a,
-	0x4c, 0x9f, 0x35, 0xc0, 0xa4, 0x1a, 0x2c, 0x3f, 0x80, 0x0f, 0x6c, 0x49, 0x49, 0x03, 0xdf, 0x64,
-	0x1f, 0x74, 0x6a, 0xd9, 0x78, 0x1d, 0x58, 0x80, 0x80, 0x0d, 0xd0, 0x81, 0x92, 0xa6, 0xa9, 0x9a,
-	0x2e, 0xbe, 0xc5, 0x2b, 0x17, 0xec, 0x34, 0x75, 0xaf, 0x89, 0x3f, 0x04, 0xe9, 0xd4, 0xb2, 0x5c,
-	0x7c, 0x1b, 0x56, 0x0e, 0x38, 0xe7, 0x23, 0xb6, 0xf2, 0x6a, 0x35, 0x7c, 0x07, 0x56, 0x4c, 0xe2,
-	0x8f, 0x59, 0xd3, 0xb1, 0x6c, 0x43, 0xc3, 0x77, 0xd9, 0x60, 0x07, 0xe0, 0xbd, 0xa9, 0x41, 0x74,
-	0x1f, 0x50, 0x76, 0x99, 0xd9, 0x1f, 0xb3, 0x76, 0xe5, 0xb1, 0x59, 0xff, 0x09, 0xa3, 0x34, 0xdc,
-	0x06, 0xc1, 0x9f, 0xf2, 0x79, 0xd4, 0xb2, 0xb7, 0x80, 0xfa, 0x33, 0x91, 0x72, 0x50, 0x86, 0x58,
-	0x65, 0xd9, 0xe9, 0xed, 0xb6, 0x5a, 0x78, 0x13, 0x96, 0x3a, 0x93, 0xaa, 0x01, 0x4a, 0xcd, 0xa2,
-	0xc4, 0xa8, 0x9b, 0x58, 0x07, 0x57, 0x3c, 0xd8, 0xc1, 0x84, 0x4d, 0x18, 0xc3, 0x71, 0x71, 0x8d,
-	0x9f, 0x49, 0x9a, 0x1a, 0xae, 0xb3, 0x04, 0xb0, 0x9a, 0x3c, 0x2f, 0xb7, 0x60, 0x22, 0xa4, 0x3b,
-	0x16, 0x78, 0x83, 0x61, 0x7a, 0x4d, 0x0d, 0x6f, 0x83, 0x5b, 0x34, 0xcb, 0xc6, 0x0f, 0xc0, 0x13,
-	0xba, 0xe1, 0xb0, 0xe1, 0x4d, 0x74, 0xdc, 0x60, 0xa5, 0xe0, 0xd8, 0xb8, 0x09, 0xb8, 0x75, 0x10,
-	0x6f, 0xb2, 0x15, 0xc4, 0xda, 0x02, 0x83, 0x0c, 0xb3, 0x06, 0x50, 0x9b, 0xa5, 0x21, 0x71, 0xf0,
-	0x43, 0x96, 0x67, 0xcc, 0x60, 0xaa, 0x7c, 0x9d, 0x43, 0x8b, 0x53, 0x97, 0xea, 0xef, 0x77, 0x81,
-	0x24, 0x53, 0xcf, 0x0f, 0x37, 0x67, 0xb9, 0xcd, 0x67, 0x5f, 0x21, 0xa6, 0xae, 0xf3, 0xf9, 0x97,
-	0x7f, 0x2c, 0xf9, 0x40, 0xdc, 0xc8, 0x31, 0x5a, 0x10, 0x0f, 0x40, 0xc7, 0x0d, 0x13, 0x84, 0x4a,
-	0x9a, 0xd5, 0x6c, 0xc2, 0xa5, 0x5c, 0xa9, 0xa3, 0x72, 0x6a, 0x92, 0x5c, 0x9d, 0x3c, 0x50, 0xf1,
-	0xfb, 0xff, 0xf8, 0x79, 0xea, 0x6d, 0xb4, 0xf0, 0x24, 0xe8, 0xf5, 0xc3, 0x76, 0xb4, 0xb7, 0x17,
-	0x07, 0xfc, 0x5e, 0x57, 0xa4, 0x15, 0x06, 0xb3, 0x18, 0x48, 0x69, 0xa0, 0x8b, 0xda, 0xbe, 0x1f,
-	0xc7, 0xfd, 0xbd, 0x7e, 0x87, 0xbd, 0xbf, 0x69, 0x7e, 0x12, 0xf4, 0xa2, 0xd1, 0xf1, 0xcf, 0x36,
-	0x6f, 0x22, 0xd4, 0x89, 0xc2, 0xbd, 0x7e, 0x97, 0xbd, 0x93, 0xf0, 0xbb, 0x6a, 0x06, 0xa2, 0xfc,
-	0x4e, 0x42, 0x97, 0xd4, 0xd0, 0xdf, 0x3f, 0xfc, 0x69, 0x30, 0x31, 0x34, 0xf8, 0xc9, 0x41, 0x10,
-	0x27, 0xb2, 0x86, 0xca, 0x5d, 0xf1, 0xbc, 0x76, 0xca, 0xa0, 0xa5, 0xaf, 0x71, 0x74, 0x4c, 0x28,
-	0xdb, 0x68, 0x31, 0x08, 0x3b, 0x51, 0xb7, 0x1f, 0xf6, 0xda, 0x99, 0x08, 0xde, 0x38, 0x31, 0x82,
-	0x9c, 0x86, 0xc5, 0x6e, 0x21, 0xc8, 0xec, 0x94, 0xbf, 0x4b, 0xa8, 0xfa, 0xbc, 0xca, 0xf1, 0x30,
-	0x82, 0xd1, 0xba, 0x83, 0xe4, 0x54, 0x74, 0x7b, 0x12, 0x69, 0x69, 0xc6, 0x48, 0x9f, 0x4b, 0x79,
-	0x4c, 0xee, 0xfc, 0xd9, 0xe7, 0xc0, 0xdc, 0xf4, 0x73, 0xa0, 0x4c, 0x78, 0x56, 0x81, 0x43, 0x63,
-	0xf1, 0xb8, 0x75, 0xed, 0x14, 0xb2, 0x00, 0x9f, 0x4e, 0x28, 0x95, 0x3f, 0x4a, 0xe8, 0x0d, 0x61,
-	0x18, 0x4f, 0xe0, 0xff, 0x95, 0x88, 0x7c, 0x89, 0xde, 0xfc, 0x2e, 0xbd, 0x45, 0x58, 0x54, 0x54,
-	0x06, 0x58, 0xd2, 0x0f, 0xe2, 0xaa, 0xc4, 0x1c, 0x74, 0xf5, 0x54, 0x25, 0x4c, 0xc7, 0x64, 0x2f,
-	0x0a, 0x00, 0x9c, 0xf8, 0x2f, 0x66, 0x35, 0xe8, 0x07, 0xf1, 0x0f, 0xdc, 0x65, 0xcf, 0xc6, 0x65,
-	0x37, 0x51, 0xf8, 0xbf, 0xe3, 0xab, 0xdf, 0x4a, 0xe8, 0x42, 0x5a, 0x3e, 0x87, 0x61, 0xe2, 0x3f,
-	0xfb, 0x81, 0x7b, 0xea, 0x4f, 0x12, 0x7a, 0xed, 0x88, 0xbe, 0xc2, 0x51, 0x53, 0x65, 0x27, 0xbd,
-	0x6c, 0xd9, 0xc9, 0xf7, 0x51, 0x89, 0x9d, 0x62, 0xe3, 0x6a, 0x8e, 0xf1, 0x78, 0xe7, 0xa4, 0xc9,
-	0x04, 0xc8, 0x54, 0xd0, 0x4c, 0xb9, 0x3a, 0x7f, 0xc4, 0xd5, 0x8f, 0xd1, 0x79, 0xd1, 0xaa, 0x0f,
-	0xa1, 0xf7, 0xbf, 0x4a, 0x47, 0x2b, 0x03, 0x74, 0x61, 0x9a, 0xb7, 0x70, 0x8a, 0x87, 0x50, 0x87,
-	0x0f, 0x84, 0x49, 0xfe, 0x7c, 0x78, 0x02, 0xfb, 0xe3, 0xe7, 0x09, 0xcd, 0x30, 0x52, 0x7e, 0x56,
-	0x40, 0xe7, 0x55, 0xfe, 0xbb, 0x50, 0xf0, 0xaa, 0x6d, 0x91, 0x77, 0x50, 0x79, 0x2f, 0xf0, 0x93,
-	0x83, 0x51, 0x10, 0x8b, 0x77, 0xe1, 0x7b, 0x27, 0x30, 0x39, 0x46, 0x95, 0xd5, 0x9a, 0x60, 0x41,
-	0xc7, 0xcc, 0x9e, 0xcf, 0xc6, 0xfc, 0xf7, 0xcc, 0xc6, 0xe5, 0x7f, 0x4b, 0xa8, 0x9c, 0x0a, 0x92,
-	0xaf, 0xa2, 0xa5, 0xe0, 0x59, 0x32, 0xf2, 0x3b, 0x49, 0x3b, 0x66, 0xa9, 0xc9, 0x5c, 0x50, 0xa6,
-	0x8b, 0x02, 0xca, 0xf3, 0x55, 0x7e, 0x17, 0xe1, 0x14, 0x6d, 0x5c, 0xd8, 0x39, 0x86, 0x78, 0x56,
-	0xc0, 0xd3, 0x1e, 0x20, 0xdf, 0x47, 0xcb, 0x29, 0xea, 0x31, 0x63, 0x2c, 0xcf, 0x88, 0xaa, 0x02,
-	0x43, 0x7f, 0x6e, 0x46, 0xdd, 0x41, 0xd5, 0x29, 0x41, 0x87, 0x19, 0xda, 0x02, 0xa3, 0xbd, 0x98,
-	0x15, 0x38, 0xe9, 0xd3, 0xf2, 0x15, 0xb4, 0xd8, 0x11, 0xd9, 0xd4, 0x66, 0x87, 0xb4, 0x12, 0x43,
-	0x5f, 0xe8, 0x64, 0x52, 0x4c, 0xf9, 0x4d, 0x1e, 0x3a, 0x47, 0xd6, 0xf1, 0x3f, 0xa4, 0x42, 0xcc,
-	0xb6, 0xcd, 0xfc, 0xcb, 0xb5, 0xcd, 0xe3, 0x0f, 0x0f, 0x85, 0x57, 0x7b, 0x78, 0x28, 0x1e, 0x39,
-	0x3c, 0x4c, 0x17, 0x6c, 0xe9, 0x15, 0x15, 0xec, 0xf5, 0x3b, 0x68, 0x21, 0x9b, 0xc6, 0xfc, 0x66,
-	0x60, 0x12, 0x7c, 0x06, 0x56, 0x9e, 0x5b, 0xbb, 0xc3, 0x2f, 0xcb, 0x9e, 0x5b, 0xbb, 0x79, 0x9b,
-	0x5f, 0x96, 0x3d, 0xb7, 0xb6, 0xb1, 0x8e, 0xf3, 0xeb, 0x7f, 0x29, 0xa3, 0xb3, 0x0d, 0x21, 0xd1,
-	0xe1, 0xbf, 0x21, 0xcb, 0x7f, 0x90, 0x10, 0x3e, 0x7a, 0xe6, 0x92, 0x6f, 0x9f, 0x58, 0xa4, 0xc7,
-	0x9e, 0x2b, 0x97, 0x3f, 0x9a, 0x99, 0x8e, 0xe7, 0x99, 0xb2, 0xfa, 0xd5, 0xdf, 0xfe, 0xf1, 0x4d,
-	0x6e, 0x45, 0xb9, 0x32, 0xfe, 0xb1, 0x3b, 0x75, 0x75, 0x7c, 0xd7, 0x3f, 0x42, 0x74, 0x57, 0xba,
-	0x2e, 0x7f, 0x2b, 0xa1, 0xb3, 0x47, 0xa6, 0xac, 0xfc, 0xe1, 0xe9, 0x84, 0x1f, 0x39, 0x46, 0x2c,
-	0xdf, 0x9e, 0x95, 0x4c, 0xa8, 0xfc, 0x3e, 0x53, 0xf9, 0x9a, 0xa2, 0x7c, 0xb7, 0xca, 0x29, 0x0d,
-	0x68, 0xfc, 0xd7, 0x23, 0x07, 0x99, 0x4c, 0x89, 0xde, 0x9f, 0x41, 0x83, 0xe7, 0x4e, 0x8e, 0xcb,
-	0x1f, 0xbf, 0x24, 0xb5, 0x30, 0xe3, 0x16, 0x33, 0x63, 0x55, 0x79, 0xf7, 0x04, 0x33, 0x0e, 0xa7,
-	0xfc, 0xff, 0x2b, 0x09, 0x2d, 0x4e, 0x8d, 0x6e, 0x79, 0xe3, 0x94, 0xa1, 0xcf, 0x1e, 0x4c, 0x96,
-	0x6f, 0xcd, 0x46, 0x24, 0x54, 0xbe, 0xc1, 0x54, 0xbe, 0xaa, 0x5c, 0x7e, 0x41, 0xb2, 0x30, 0x0a,
-	0xd0, 0xf4, 0x97, 0x12, 0x5a, 0xc8, 0x8e, 0x53, 0x79, 0xfd, 0x74, 0x15, 0x98, 0x9d, 0xeb, 0xcb,
-	0x1b, 0x33, 0xd1, 0x08, 0x35, 0xaf, 0x33, 0x35, 0xdf, 0x51, 0xde, 0x3a, 0x46, 0xcd, 0x6c, 0xf7,
-	0x4d, 0xb5, 0xcc, 0x36, 0xe0, 0x13, 0xb5, 0x3c, 0x66, 0x4c, 0x2e, 0x6f, 0xcc, 0x44, 0x73, 0x0a,
-	0x2d, 0xfd, 0x0c, 0xc1, 0x5d, 0xe9, 0xfa, 0xe6, 0x57, 0x12, 0x7a, 0xbb, 0x13, 0x0d, 0x5e, 0x2c,
-	0x66, 0xf3, 0xc2, 0x91, 0x16, 0x63, 0x8f, 0xa2, 0x24, 0xb2, 0xa5, 0xc7, 0x44, 0x90, 0xf5, 0x22,
-	0x20, 0x59, 0x8d, 0x46, 0xbd, 0xb5, 0x5e, 0x10, 0xb2, 0xff, 0x89, 0xac, 0xf1, 0x4f, 0xfe, 0xb0,
-	0x1f, 0x7f, 0xc7, 0x9f, 0x5f, 0xee, 0xa5, 0x80, 0x27, 0x25, 0x46, 0xb1, 0xf1, 0x9f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xcc, 0x93, 0x36, 0x44, 0x2d, 0x23, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/location/locations.pb.go b/googleapis/cloud/location/locations.pb.go
index 826f57f3e6..4c97c544bc 100644
--- a/googleapis/cloud/location/locations.pb.go
+++ b/googleapis/cloud/location/locations.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/location/locations.proto
 
-package location // import "google.golang.org/genproto/googleapis/cloud/location"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package location
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The request message for
 // [Locations.ListLocations][google.cloud.location.Locations.ListLocations].
@@ -45,16 +45,17 @@ func (m *ListLocationsRequest) Reset()         { *m = ListLocationsRequest{} }
 func (m *ListLocationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListLocationsRequest) ProtoMessage()    {}
 func (*ListLocationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_locations_88684e037ed7e8be, []int{0}
+	return fileDescriptor_3903434ffd69ff4c, []int{0}
 }
+
 func (m *ListLocationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLocationsRequest.Unmarshal(m, b)
 }
 func (m *ListLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLocationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListLocationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLocationsRequest.Merge(dst, src)
+func (m *ListLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLocationsRequest.Merge(m, src)
 }
 func (m *ListLocationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListLocationsRequest.Size(m)
@@ -109,16 +110,17 @@ func (m *ListLocationsResponse) Reset()         { *m = ListLocationsResponse{} }
 func (m *ListLocationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListLocationsResponse) ProtoMessage()    {}
 func (*ListLocationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_locations_88684e037ed7e8be, []int{1}
+	return fileDescriptor_3903434ffd69ff4c, []int{1}
 }
+
 func (m *ListLocationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLocationsResponse.Unmarshal(m, b)
 }
 func (m *ListLocationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLocationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListLocationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLocationsResponse.Merge(dst, src)
+func (m *ListLocationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLocationsResponse.Merge(m, src)
 }
 func (m *ListLocationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListLocationsResponse.Size(m)
@@ -157,16 +159,17 @@ func (m *GetLocationRequest) Reset()         { *m = GetLocationRequest{} }
 func (m *GetLocationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLocationRequest) ProtoMessage()    {}
 func (*GetLocationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_locations_88684e037ed7e8be, []int{2}
+	return fileDescriptor_3903434ffd69ff4c, []int{2}
 }
+
 func (m *GetLocationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLocationRequest.Unmarshal(m, b)
 }
 func (m *GetLocationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLocationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLocationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLocationRequest.Merge(dst, src)
+func (m *GetLocationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLocationRequest.Merge(m, src)
 }
 func (m *GetLocationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLocationRequest.Size(m)
@@ -210,16 +213,17 @@ func (m *Location) Reset()         { *m = Location{} }
 func (m *Location) String() string { return proto.CompactTextString(m) }
 func (*Location) ProtoMessage()    {}
 func (*Location) Descriptor() ([]byte, []int) {
-	return fileDescriptor_locations_88684e037ed7e8be, []int{3}
+	return fileDescriptor_3903434ffd69ff4c, []int{3}
 }
+
 func (m *Location) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Location.Unmarshal(m, b)
 }
 func (m *Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Location.Marshal(b, m, deterministic)
 }
-func (dst *Location) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Location.Merge(dst, src)
+func (m *Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Location.Merge(m, src)
 }
 func (m *Location) XXX_Size() int {
 	return xxx_messageInfo_Location.Size(m)
@@ -273,6 +277,47 @@ func init() {
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.location.Location.LabelsEntry")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/location/locations.proto", fileDescriptor_3903434ffd69ff4c)
+}
+
+var fileDescriptor_3903434ffd69ff4c = []byte{
+	// 527 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xd6, 0x3a, 0x4d, 0x94, 0x8c, 0x29, 0xa0, 0x55, 0x8a, 0xdc, 0x00, 0x4a, 0x62, 0x04, 0xa4,
+	0x05, 0x79, 0x21, 0x5c, 0xf8, 0x51, 0x0e, 0x14, 0x21, 0x84, 0x14, 0xa1, 0xc8, 0x70, 0xe2, 0x12,
+	0x6d, 0xe2, 0xad, 0x65, 0xea, 0xec, 0x1a, 0xef, 0xa6, 0xc2, 0x45, 0xed, 0x01, 0xf1, 0x06, 0xe5,
+	0x21, 0x78, 0x1f, 0x5e, 0x81, 0x87, 0xe0, 0x88, 0xbc, 0xfe, 0x49, 0x28, 0x2e, 0xe5, 0xb6, 0x3b,
+	0xf3, 0x7d, 0xf3, 0xcd, 0xb7, 0x33, 0x36, 0xdc, 0xf6, 0x85, 0xf0, 0x43, 0x46, 0xe6, 0xa1, 0x58,
+	0x7a, 0x24, 0x14, 0x73, 0xaa, 0x02, 0xc1, 0xcb, 0x83, 0x74, 0xa2, 0x58, 0x28, 0x81, 0xb7, 0x32,
+	0x98, 0xa3, 0x61, 0x4e, 0x91, 0xed, 0xdc, 0xc8, 0xd9, 0x34, 0x0a, 0x08, 0xe5, 0x5c, 0xa8, 0x75,
+	0x52, 0x67, 0x3b, 0xcf, 0xea, 0xdb, 0x6c, 0xb9, 0x4f, 0x28, 0x4f, 0xb2, 0x94, 0x7d, 0x02, 0xed,
+	0x71, 0x20, 0xd5, 0xb8, 0x90, 0x71, 0xd9, 0xc7, 0x25, 0x93, 0x0a, 0x63, 0xd8, 0xe0, 0x74, 0xc1,
+	0x2c, 0xd4, 0x43, 0x83, 0x96, 0xab, 0xcf, 0xf8, 0x1a, 0x34, 0xf6, 0x83, 0x50, 0xb1, 0xd8, 0x32,
+	0x74, 0x34, 0xbf, 0xe1, 0xeb, 0xd0, 0x8a, 0xa8, 0xcf, 0xa6, 0x32, 0x38, 0x62, 0x56, 0xad, 0x87,
+	0x06, 0x75, 0xb7, 0x99, 0x06, 0xde, 0x06, 0x47, 0x0c, 0xdf, 0x04, 0xd0, 0x49, 0x25, 0x0e, 0x18,
+	0xb7, 0x36, 0x34, 0x51, 0xc3, 0xdf, 0xa5, 0x01, 0xfb, 0x04, 0xb6, 0xce, 0xe8, 0xcb, 0x48, 0x70,
+	0xc9, 0xf0, 0x08, 0x5a, 0xa5, 0x77, 0x0b, 0xf5, 0x6a, 0x03, 0x73, 0xd8, 0x75, 0x2a, 0xcd, 0x3b,
+	0x05, 0xd9, 0x5d, 0x31, 0xf0, 0x1d, 0xb8, 0xc2, 0xd9, 0x27, 0x35, 0x5d, 0xd3, 0xce, 0x9a, 0xde,
+	0x4c, 0xc3, 0x93, 0x52, 0x7f, 0x00, 0xf8, 0x15, 0x2b, 0xe5, 0xff, 0xe1, 0xde, 0xfe, 0x66, 0x40,
+	0xb3, 0xc0, 0x55, 0x3e, 0x4f, 0x17, 0xcc, 0x42, 0x7f, 0x1a, 0x78, 0xb9, 0x55, 0x28, 0x42, 0xaf,
+	0x3d, 0xdc, 0x87, 0x4b, 0x5e, 0x20, 0xa3, 0x90, 0x26, 0x53, 0x4d, 0xae, 0x6b, 0x84, 0x99, 0xc7,
+	0xde, 0xa4, 0x35, 0x5e, 0x40, 0x23, 0xa4, 0x33, 0x16, 0x4a, 0xcb, 0xd0, 0x96, 0xef, 0x5d, 0x60,
+	0xd9, 0x19, 0x6b, 0xf4, 0x4b, 0xae, 0xe2, 0xc4, 0xcd, 0xa9, 0xf8, 0x01, 0x34, 0x17, 0x4c, 0x51,
+	0x8f, 0x2a, 0xaa, 0xc7, 0x61, 0x0e, 0xdb, 0x45, 0x99, 0x62, 0x03, 0x9c, 0xe7, 0x3c, 0x71, 0x4b,
+	0x54, 0xe7, 0x09, 0x98, 0x6b, 0x85, 0xf0, 0x55, 0xa8, 0x1d, 0xb0, 0x24, 0x37, 0x97, 0x1e, 0x71,
+	0x1b, 0xea, 0x87, 0x34, 0x5c, 0xb2, 0xfc, 0x11, 0xb3, 0xcb, 0x53, 0xe3, 0x31, 0x1a, 0x7e, 0x37,
+	0xa0, 0x55, 0x4e, 0x0f, 0x9f, 0x22, 0xd8, 0xfc, 0x63, 0x9e, 0xf8, 0x5c, 0x07, 0x15, 0x5b, 0xd7,
+	0xb9, 0xff, 0x7f, 0xe0, 0x6c, 0x45, 0xec, 0xbb, 0x5f, 0x7e, 0xfc, 0x3c, 0x35, 0xfa, 0xb8, 0x4b,
+	0x0e, 0x1f, 0x92, 0xcf, 0xe9, 0x93, 0x8e, 0xa2, 0x58, 0x7c, 0x60, 0x73, 0x25, 0xc9, 0xee, 0xf1,
+	0xea, 0xd3, 0xc1, 0x5f, 0x11, 0x98, 0x6b, 0x53, 0xc6, 0x3b, 0xe7, 0xc8, 0xfc, 0xbd, 0x09, 0x9d,
+	0x8b, 0x76, 0xce, 0xde, 0xd1, 0x4d, 0xdc, 0xc2, 0xfd, 0xaa, 0x26, 0x56, 0x3d, 0x90, 0xdd, 0xe3,
+	0x3d, 0x01, 0xdb, 0x73, 0xb1, 0xa8, 0x2e, 0xb8, 0x77, 0xb9, 0xf4, 0x37, 0x49, 0x67, 0x34, 0x41,
+	0xef, 0x47, 0x39, 0xd0, 0x17, 0x21, 0xe5, 0xbe, 0x23, 0x62, 0x9f, 0xf8, 0x8c, 0xeb, 0x09, 0x92,
+	0x2c, 0x45, 0xa3, 0x40, 0x9e, 0xf9, 0x61, 0x3c, 0x2b, 0x0e, 0xbf, 0x10, 0x9a, 0x35, 0x34, 0xf8,
+	0xd1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x27, 0xd7, 0x9e, 0x57, 0x5c, 0x04, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -381,44 +426,3 @@ var _Locations_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/location/locations.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/location/locations.proto", fileDescriptor_locations_88684e037ed7e8be)
-}
-
-var fileDescriptor_locations_88684e037ed7e8be = []byte{
-	// 527 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xd6, 0x3a, 0x4d, 0x94, 0x8c, 0x29, 0xa0, 0x55, 0x8a, 0xdc, 0x00, 0x4a, 0x62, 0x04, 0xa4,
-	0x05, 0x79, 0x21, 0x5c, 0xf8, 0x51, 0x0e, 0x14, 0x21, 0x84, 0x14, 0xa1, 0xc8, 0x70, 0xe2, 0x12,
-	0x6d, 0xe2, 0xad, 0x65, 0xea, 0xec, 0x1a, 0xef, 0xa6, 0xc2, 0x45, 0xed, 0x01, 0xf1, 0x06, 0xe5,
-	0x21, 0x78, 0x1f, 0x5e, 0x81, 0x87, 0xe0, 0x88, 0xbc, 0xfe, 0x49, 0x28, 0x2e, 0xe5, 0xb6, 0x3b,
-	0xf3, 0x7d, 0xf3, 0xcd, 0xb7, 0x33, 0x36, 0xdc, 0xf6, 0x85, 0xf0, 0x43, 0x46, 0xe6, 0xa1, 0x58,
-	0x7a, 0x24, 0x14, 0x73, 0xaa, 0x02, 0xc1, 0xcb, 0x83, 0x74, 0xa2, 0x58, 0x28, 0x81, 0xb7, 0x32,
-	0x98, 0xa3, 0x61, 0x4e, 0x91, 0xed, 0xdc, 0xc8, 0xd9, 0x34, 0x0a, 0x08, 0xe5, 0x5c, 0xa8, 0x75,
-	0x52, 0x67, 0x3b, 0xcf, 0xea, 0xdb, 0x6c, 0xb9, 0x4f, 0x28, 0x4f, 0xb2, 0x94, 0x7d, 0x02, 0xed,
-	0x71, 0x20, 0xd5, 0xb8, 0x90, 0x71, 0xd9, 0xc7, 0x25, 0x93, 0x0a, 0x63, 0xd8, 0xe0, 0x74, 0xc1,
-	0x2c, 0xd4, 0x43, 0x83, 0x96, 0xab, 0xcf, 0xf8, 0x1a, 0x34, 0xf6, 0x83, 0x50, 0xb1, 0xd8, 0x32,
-	0x74, 0x34, 0xbf, 0xe1, 0xeb, 0xd0, 0x8a, 0xa8, 0xcf, 0xa6, 0x32, 0x38, 0x62, 0x56, 0xad, 0x87,
-	0x06, 0x75, 0xb7, 0x99, 0x06, 0xde, 0x06, 0x47, 0x0c, 0xdf, 0x04, 0xd0, 0x49, 0x25, 0x0e, 0x18,
-	0xb7, 0x36, 0x34, 0x51, 0xc3, 0xdf, 0xa5, 0x01, 0xfb, 0x04, 0xb6, 0xce, 0xe8, 0xcb, 0x48, 0x70,
-	0xc9, 0xf0, 0x08, 0x5a, 0xa5, 0x77, 0x0b, 0xf5, 0x6a, 0x03, 0x73, 0xd8, 0x75, 0x2a, 0xcd, 0x3b,
-	0x05, 0xd9, 0x5d, 0x31, 0xf0, 0x1d, 0xb8, 0xc2, 0xd9, 0x27, 0x35, 0x5d, 0xd3, 0xce, 0x9a, 0xde,
-	0x4c, 0xc3, 0x93, 0x52, 0x7f, 0x00, 0xf8, 0x15, 0x2b, 0xe5, 0xff, 0xe1, 0xde, 0xfe, 0x66, 0x40,
-	0xb3, 0xc0, 0x55, 0x3e, 0x4f, 0x17, 0xcc, 0x42, 0x7f, 0x1a, 0x78, 0xb9, 0x55, 0x28, 0x42, 0xaf,
-	0x3d, 0xdc, 0x87, 0x4b, 0x5e, 0x20, 0xa3, 0x90, 0x26, 0x53, 0x4d, 0xae, 0x6b, 0x84, 0x99, 0xc7,
-	0xde, 0xa4, 0x35, 0x5e, 0x40, 0x23, 0xa4, 0x33, 0x16, 0x4a, 0xcb, 0xd0, 0x96, 0xef, 0x5d, 0x60,
-	0xd9, 0x19, 0x6b, 0xf4, 0x4b, 0xae, 0xe2, 0xc4, 0xcd, 0xa9, 0xf8, 0x01, 0x34, 0x17, 0x4c, 0x51,
-	0x8f, 0x2a, 0xaa, 0xc7, 0x61, 0x0e, 0xdb, 0x45, 0x99, 0x62, 0x03, 0x9c, 0xe7, 0x3c, 0x71, 0x4b,
-	0x54, 0xe7, 0x09, 0x98, 0x6b, 0x85, 0xf0, 0x55, 0xa8, 0x1d, 0xb0, 0x24, 0x37, 0x97, 0x1e, 0x71,
-	0x1b, 0xea, 0x87, 0x34, 0x5c, 0xb2, 0xfc, 0x11, 0xb3, 0xcb, 0x53, 0xe3, 0x31, 0x1a, 0x7e, 0x37,
-	0xa0, 0x55, 0x4e, 0x0f, 0x9f, 0x22, 0xd8, 0xfc, 0x63, 0x9e, 0xf8, 0x5c, 0x07, 0x15, 0x5b, 0xd7,
-	0xb9, 0xff, 0x7f, 0xe0, 0x6c, 0x45, 0xec, 0xbb, 0x5f, 0x7e, 0xfc, 0x3c, 0x35, 0xfa, 0xb8, 0x4b,
-	0x0e, 0x1f, 0x92, 0xcf, 0xe9, 0x93, 0x8e, 0xa2, 0x58, 0x7c, 0x60, 0x73, 0x25, 0xc9, 0xee, 0xf1,
-	0xea, 0xd3, 0xc1, 0x5f, 0x11, 0x98, 0x6b, 0x53, 0xc6, 0x3b, 0xe7, 0xc8, 0xfc, 0xbd, 0x09, 0x9d,
-	0x8b, 0x76, 0xce, 0xde, 0xd1, 0x4d, 0xdc, 0xc2, 0xfd, 0xaa, 0x26, 0x56, 0x3d, 0x90, 0xdd, 0xe3,
-	0x3d, 0x01, 0xdb, 0x73, 0xb1, 0xa8, 0x2e, 0xb8, 0x77, 0xb9, 0xf4, 0x37, 0x49, 0x67, 0x34, 0x41,
-	0xef, 0x47, 0x39, 0xd0, 0x17, 0x21, 0xe5, 0xbe, 0x23, 0x62, 0x9f, 0xf8, 0x8c, 0xeb, 0x09, 0x92,
-	0x2c, 0x45, 0xa3, 0x40, 0x9e, 0xf9, 0x61, 0x3c, 0x2b, 0x0e, 0xbf, 0x10, 0x9a, 0x35, 0x34, 0xf8,
-	0xd1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x27, 0xd7, 0x9e, 0x57, 0x5c, 0x04, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/ml/v1/job_service.pb.go b/googleapis/cloud/ml/v1/job_service.pb.go
index ea6ff8dfa5..66407c7cce 100644
--- a/googleapis/cloud/ml/v1/job_service.pb.go
+++ b/googleapis/cloud/ml/v1/job_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/job_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
+package ml
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A scale tier is an abstract representation of the resources Cloud ML
 // will allocate to a training job. When selecting a scale tier for your
@@ -83,6 +83,7 @@ var TrainingInput_ScaleTier_name = map[int32]string{
 	6: "BASIC_GPU",
 	5: "CUSTOM",
 }
+
 var TrainingInput_ScaleTier_value = map[string]int32{
 	"BASIC":      0,
 	"STANDARD_1": 1,
@@ -94,8 +95,9 @@ var TrainingInput_ScaleTier_value = map[string]int32{
 func (x TrainingInput_ScaleTier) String() string {
 	return proto.EnumName(TrainingInput_ScaleTier_name, int32(x))
 }
+
 func (TrainingInput_ScaleTier) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{0, 0}
+	return fileDescriptor_a9e7ba15cb43988d, []int{0, 0}
 }
 
 // The available types of optimization goals.
@@ -115,6 +117,7 @@ var HyperparameterSpec_GoalType_name = map[int32]string{
 	1: "MAXIMIZE",
 	2: "MINIMIZE",
 }
+
 var HyperparameterSpec_GoalType_value = map[string]int32{
 	"GOAL_TYPE_UNSPECIFIED": 0,
 	"MAXIMIZE":              1,
@@ -124,8 +127,9 @@ var HyperparameterSpec_GoalType_value = map[string]int32{
 func (x HyperparameterSpec_GoalType) String() string {
 	return proto.EnumName(HyperparameterSpec_GoalType_name, int32(x))
 }
+
 func (HyperparameterSpec_GoalType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{1, 0}
+	return fileDescriptor_a9e7ba15cb43988d, []int{1, 0}
 }
 
 // The type of the parameter.
@@ -155,6 +159,7 @@ var ParameterSpec_ParameterType_name = map[int32]string{
 	3: "CATEGORICAL",
 	4: "DISCRETE",
 }
+
 var ParameterSpec_ParameterType_value = map[string]int32{
 	"PARAMETER_TYPE_UNSPECIFIED": 0,
 	"DOUBLE":                     1,
@@ -166,8 +171,9 @@ var ParameterSpec_ParameterType_value = map[string]int32{
 func (x ParameterSpec_ParameterType) String() string {
 	return proto.EnumName(ParameterSpec_ParameterType_name, int32(x))
 }
+
 func (ParameterSpec_ParameterType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{2, 0}
+	return fileDescriptor_a9e7ba15cb43988d, []int{2, 0}
 }
 
 // The type of scaling that should be applied to this parameter.
@@ -194,6 +200,7 @@ var ParameterSpec_ScaleType_name = map[int32]string{
 	2: "UNIT_LOG_SCALE",
 	3: "UNIT_REVERSE_LOG_SCALE",
 }
+
 var ParameterSpec_ScaleType_value = map[string]int32{
 	"NONE":                   0,
 	"UNIT_LINEAR_SCALE":      1,
@@ -204,8 +211,9 @@ var ParameterSpec_ScaleType_value = map[string]int32{
 func (x ParameterSpec_ScaleType) String() string {
 	return proto.EnumName(ParameterSpec_ScaleType_name, int32(x))
 }
+
 func (ParameterSpec_ScaleType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{2, 1}
+	return fileDescriptor_a9e7ba15cb43988d, []int{2, 1}
 }
 
 // The format used to separate data instances in the source files.
@@ -229,6 +237,7 @@ var PredictionInput_DataFormat_name = map[int32]string{
 	2: "TF_RECORD",
 	3: "TF_RECORD_GZIP",
 }
+
 var PredictionInput_DataFormat_value = map[string]int32{
 	"DATA_FORMAT_UNSPECIFIED": 0,
 	"TEXT":                    1,
@@ -239,8 +248,9 @@ var PredictionInput_DataFormat_value = map[string]int32{
 func (x PredictionInput_DataFormat) String() string {
 	return proto.EnumName(PredictionInput_DataFormat_name, int32(x))
 }
+
 func (PredictionInput_DataFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{5, 0}
+	return fileDescriptor_a9e7ba15cb43988d, []int{5, 0}
 }
 
 // Describes the job state.
@@ -278,6 +288,7 @@ var Job_State_name = map[int32]string{
 	6: "CANCELLING",
 	7: "CANCELLED",
 }
+
 var Job_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"QUEUED":            1,
@@ -292,8 +303,9 @@ var Job_State_value = map[string]int32{
 func (x Job_State) String() string {
 	return proto.EnumName(Job_State_name, int32(x))
 }
+
 func (Job_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{7, 0}
+	return fileDescriptor_a9e7ba15cb43988d, []int{7, 0}
 }
 
 // Represents input parameters for a training job.
@@ -410,16 +422,17 @@ func (m *TrainingInput) Reset()         { *m = TrainingInput{} }
 func (m *TrainingInput) String() string { return proto.CompactTextString(m) }
 func (*TrainingInput) ProtoMessage()    {}
 func (*TrainingInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{0}
+	return fileDescriptor_a9e7ba15cb43988d, []int{0}
 }
+
 func (m *TrainingInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrainingInput.Unmarshal(m, b)
 }
 func (m *TrainingInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrainingInput.Marshal(b, m, deterministic)
 }
-func (dst *TrainingInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrainingInput.Merge(dst, src)
+func (m *TrainingInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainingInput.Merge(m, src)
 }
 func (m *TrainingInput) XXX_Size() int {
 	return xxx_messageInfo_TrainingInput.Size(m)
@@ -561,16 +574,17 @@ func (m *HyperparameterSpec) Reset()         { *m = HyperparameterSpec{} }
 func (m *HyperparameterSpec) String() string { return proto.CompactTextString(m) }
 func (*HyperparameterSpec) ProtoMessage()    {}
 func (*HyperparameterSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{1}
+	return fileDescriptor_a9e7ba15cb43988d, []int{1}
 }
+
 func (m *HyperparameterSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HyperparameterSpec.Unmarshal(m, b)
 }
 func (m *HyperparameterSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HyperparameterSpec.Marshal(b, m, deterministic)
 }
-func (dst *HyperparameterSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HyperparameterSpec.Merge(dst, src)
+func (m *HyperparameterSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HyperparameterSpec.Merge(m, src)
 }
 func (m *HyperparameterSpec) XXX_Size() int {
 	return xxx_messageInfo_HyperparameterSpec.Size(m)
@@ -653,16 +667,17 @@ func (m *ParameterSpec) Reset()         { *m = ParameterSpec{} }
 func (m *ParameterSpec) String() string { return proto.CompactTextString(m) }
 func (*ParameterSpec) ProtoMessage()    {}
 func (*ParameterSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{2}
+	return fileDescriptor_a9e7ba15cb43988d, []int{2}
 }
+
 func (m *ParameterSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParameterSpec.Unmarshal(m, b)
 }
 func (m *ParameterSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ParameterSpec.Marshal(b, m, deterministic)
 }
-func (dst *ParameterSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ParameterSpec.Merge(dst, src)
+func (m *ParameterSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParameterSpec.Merge(m, src)
 }
 func (m *ParameterSpec) XXX_Size() int {
 	return xxx_messageInfo_ParameterSpec.Size(m)
@@ -744,16 +759,17 @@ func (m *HyperparameterOutput) Reset()         { *m = HyperparameterOutput{} }
 func (m *HyperparameterOutput) String() string { return proto.CompactTextString(m) }
 func (*HyperparameterOutput) ProtoMessage()    {}
 func (*HyperparameterOutput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{3}
+	return fileDescriptor_a9e7ba15cb43988d, []int{3}
 }
+
 func (m *HyperparameterOutput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HyperparameterOutput.Unmarshal(m, b)
 }
 func (m *HyperparameterOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HyperparameterOutput.Marshal(b, m, deterministic)
 }
-func (dst *HyperparameterOutput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HyperparameterOutput.Merge(dst, src)
+func (m *HyperparameterOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HyperparameterOutput.Merge(m, src)
 }
 func (m *HyperparameterOutput) XXX_Size() int {
 	return xxx_messageInfo_HyperparameterOutput.Size(m)
@@ -809,16 +825,17 @@ func (m *HyperparameterOutput_HyperparameterMetric) Reset() {
 func (m *HyperparameterOutput_HyperparameterMetric) String() string { return proto.CompactTextString(m) }
 func (*HyperparameterOutput_HyperparameterMetric) ProtoMessage()    {}
 func (*HyperparameterOutput_HyperparameterMetric) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{3, 0}
+	return fileDescriptor_a9e7ba15cb43988d, []int{3, 0}
 }
+
 func (m *HyperparameterOutput_HyperparameterMetric) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Unmarshal(m, b)
 }
 func (m *HyperparameterOutput_HyperparameterMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Marshal(b, m, deterministic)
 }
-func (dst *HyperparameterOutput_HyperparameterMetric) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Merge(dst, src)
+func (m *HyperparameterOutput_HyperparameterMetric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Merge(m, src)
 }
 func (m *HyperparameterOutput_HyperparameterMetric) XXX_Size() int {
 	return xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Size(m)
@@ -864,16 +881,17 @@ func (m *TrainingOutput) Reset()         { *m = TrainingOutput{} }
 func (m *TrainingOutput) String() string { return proto.CompactTextString(m) }
 func (*TrainingOutput) ProtoMessage()    {}
 func (*TrainingOutput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{4}
+	return fileDescriptor_a9e7ba15cb43988d, []int{4}
 }
+
 func (m *TrainingOutput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrainingOutput.Unmarshal(m, b)
 }
 func (m *TrainingOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrainingOutput.Marshal(b, m, deterministic)
 }
-func (dst *TrainingOutput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrainingOutput.Merge(dst, src)
+func (m *TrainingOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainingOutput.Merge(m, src)
 }
 func (m *TrainingOutput) XXX_Size() int {
 	return xxx_messageInfo_TrainingOutput.Size(m)
@@ -948,16 +966,17 @@ func (m *PredictionInput) Reset()         { *m = PredictionInput{} }
 func (m *PredictionInput) String() string { return proto.CompactTextString(m) }
 func (*PredictionInput) ProtoMessage()    {}
 func (*PredictionInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{5}
+	return fileDescriptor_a9e7ba15cb43988d, []int{5}
 }
+
 func (m *PredictionInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PredictionInput.Unmarshal(m, b)
 }
 func (m *PredictionInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PredictionInput.Marshal(b, m, deterministic)
 }
-func (dst *PredictionInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PredictionInput.Merge(dst, src)
+func (m *PredictionInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictionInput.Merge(m, src)
 }
 func (m *PredictionInput) XXX_Size() int {
 	return xxx_messageInfo_PredictionInput.Size(m)
@@ -1060,87 +1079,15 @@ func (m *PredictionInput) GetRuntimeVersion() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PredictionInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PredictionInput_OneofMarshaler, _PredictionInput_OneofUnmarshaler, _PredictionInput_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PredictionInput) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PredictionInput_ModelName)(nil),
 		(*PredictionInput_VersionName)(nil),
 		(*PredictionInput_Uri)(nil),
 	}
 }
 
-func _PredictionInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PredictionInput)
-	// model_version
-	switch x := m.ModelVersion.(type) {
-	case *PredictionInput_ModelName:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ModelName)
-	case *PredictionInput_VersionName:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.VersionName)
-	case *PredictionInput_Uri:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uri)
-	case nil:
-	default:
-		return fmt.Errorf("PredictionInput.ModelVersion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PredictionInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PredictionInput)
-	switch tag {
-	case 1: // model_version.model_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ModelVersion = &PredictionInput_ModelName{x}
-		return true, err
-	case 2: // model_version.version_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ModelVersion = &PredictionInput_VersionName{x}
-		return true, err
-	case 9: // model_version.uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ModelVersion = &PredictionInput_Uri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PredictionInput_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PredictionInput)
-	// model_version
-	switch x := m.ModelVersion.(type) {
-	case *PredictionInput_ModelName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ModelName)))
-		n += len(x.ModelName)
-	case *PredictionInput_VersionName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.VersionName)))
-		n += len(x.VersionName)
-	case *PredictionInput_Uri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uri)))
-		n += len(x.Uri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents results of a prediction job.
 type PredictionOutput struct {
 	// The output Google Cloud Storage location provided at the job creation time.
@@ -1160,16 +1107,17 @@ func (m *PredictionOutput) Reset()         { *m = PredictionOutput{} }
 func (m *PredictionOutput) String() string { return proto.CompactTextString(m) }
 func (*PredictionOutput) ProtoMessage()    {}
 func (*PredictionOutput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{6}
+	return fileDescriptor_a9e7ba15cb43988d, []int{6}
 }
+
 func (m *PredictionOutput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PredictionOutput.Unmarshal(m, b)
 }
 func (m *PredictionOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PredictionOutput.Marshal(b, m, deterministic)
 }
-func (dst *PredictionOutput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PredictionOutput.Merge(dst, src)
+func (m *PredictionOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictionOutput.Merge(m, src)
 }
 func (m *PredictionOutput) XXX_Size() int {
 	return xxx_messageInfo_PredictionOutput.Size(m)
@@ -1243,16 +1191,17 @@ func (m *Job) Reset()         { *m = Job{} }
 func (m *Job) String() string { return proto.CompactTextString(m) }
 func (*Job) ProtoMessage()    {}
 func (*Job) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{7}
+	return fileDescriptor_a9e7ba15cb43988d, []int{7}
 }
+
 func (m *Job) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job.Unmarshal(m, b)
 }
 func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
 }
-func (dst *Job) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job.Merge(dst, src)
+func (m *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(m, src)
 }
 func (m *Job) XXX_Size() int {
 	return xxx_messageInfo_Job.Size(m)
@@ -1379,9 +1328,9 @@ func (m *Job) GetPredictionOutput() *PredictionOutput {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Job_OneofMarshaler, _Job_OneofUnmarshaler, _Job_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Job) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Job_TrainingInput)(nil),
 		(*Job_PredictionInput)(nil),
 		(*Job_TrainingOutput)(nil),
@@ -1389,120 +1338,6 @@ func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, fu
 	}
 }
 
-func _Job_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Job)
-	// input
-	switch x := m.Input.(type) {
-	case *Job_TrainingInput:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TrainingInput); err != nil {
-			return err
-		}
-	case *Job_PredictionInput:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PredictionInput); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.Input has unexpected type %T", x)
-	}
-	// output
-	switch x := m.Output.(type) {
-	case *Job_TrainingOutput:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TrainingOutput); err != nil {
-			return err
-		}
-	case *Job_PredictionOutput:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PredictionOutput); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.Output has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Job_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Job)
-	switch tag {
-	case 2: // input.training_input
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TrainingInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &Job_TrainingInput{msg}
-		return true, err
-	case 3: // input.prediction_input
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PredictionInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &Job_PredictionInput{msg}
-		return true, err
-	case 9: // output.training_output
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TrainingOutput)
-		err := b.DecodeMessage(msg)
-		m.Output = &Job_TrainingOutput{msg}
-		return true, err
-	case 10: // output.prediction_output
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PredictionOutput)
-		err := b.DecodeMessage(msg)
-		m.Output = &Job_PredictionOutput{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Job_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Job)
-	// input
-	switch x := m.Input.(type) {
-	case *Job_TrainingInput:
-		s := proto.Size(x.TrainingInput)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PredictionInput:
-		s := proto.Size(x.PredictionInput)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// output
-	switch x := m.Output.(type) {
-	case *Job_TrainingOutput:
-		s := proto.Size(x.TrainingOutput)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PredictionOutput:
-		s := proto.Size(x.PredictionOutput)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for the CreateJob method.
 type CreateJobRequest struct {
 	// Required. The project name.
@@ -1520,16 +1355,17 @@ func (m *CreateJobRequest) Reset()         { *m = CreateJobRequest{} }
 func (m *CreateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateJobRequest) ProtoMessage()    {}
 func (*CreateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{8}
+	return fileDescriptor_a9e7ba15cb43988d, []int{8}
 }
+
 func (m *CreateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateJobRequest.Unmarshal(m, b)
 }
 func (m *CreateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateJobRequest.Merge(dst, src)
+func (m *CreateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateJobRequest.Merge(m, src)
 }
 func (m *CreateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateJobRequest.Size(m)
@@ -1582,16 +1418,17 @@ func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
 func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListJobsRequest) ProtoMessage()    {}
 func (*ListJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{9}
+	return fileDescriptor_a9e7ba15cb43988d, []int{9}
 }
+
 func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
 }
 func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+func (m *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(m, src)
 }
 func (m *ListJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListJobsRequest.Size(m)
@@ -1646,16 +1483,17 @@ func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
 func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListJobsResponse) ProtoMessage()    {}
 func (*ListJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{10}
+	return fileDescriptor_a9e7ba15cb43988d, []int{10}
 }
+
 func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
 }
 func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+func (m *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(m, src)
 }
 func (m *ListJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListJobsResponse.Size(m)
@@ -1695,16 +1533,17 @@ func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
 func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetJobRequest) ProtoMessage()    {}
 func (*GetJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{11}
+	return fileDescriptor_a9e7ba15cb43988d, []int{11}
 }
+
 func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
 }
 func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+func (m *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(m, src)
 }
 func (m *GetJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetJobRequest.Size(m)
@@ -1737,16 +1576,17 @@ func (m *CancelJobRequest) Reset()         { *m = CancelJobRequest{} }
 func (m *CancelJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelJobRequest) ProtoMessage()    {}
 func (*CancelJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_96b7f358a19eb3fe, []int{12}
+	return fileDescriptor_a9e7ba15cb43988d, []int{12}
 }
+
 func (m *CancelJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelJobRequest.Unmarshal(m, b)
 }
 func (m *CancelJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelJobRequest.Merge(dst, src)
+func (m *CancelJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelJobRequest.Merge(m, src)
 }
 func (m *CancelJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelJobRequest.Size(m)
@@ -1765,6 +1605,12 @@ func (m *CancelJobRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.ml.v1.TrainingInput_ScaleTier", TrainingInput_ScaleTier_name, TrainingInput_ScaleTier_value)
+	proto.RegisterEnum("google.cloud.ml.v1.HyperparameterSpec_GoalType", HyperparameterSpec_GoalType_name, HyperparameterSpec_GoalType_value)
+	proto.RegisterEnum("google.cloud.ml.v1.ParameterSpec_ParameterType", ParameterSpec_ParameterType_name, ParameterSpec_ParameterType_value)
+	proto.RegisterEnum("google.cloud.ml.v1.ParameterSpec_ScaleType", ParameterSpec_ScaleType_name, ParameterSpec_ScaleType_value)
+	proto.RegisterEnum("google.cloud.ml.v1.PredictionInput_DataFormat", PredictionInput_DataFormat_name, PredictionInput_DataFormat_value)
+	proto.RegisterEnum("google.cloud.ml.v1.Job_State", Job_State_name, Job_State_value)
 	proto.RegisterType((*TrainingInput)(nil), "google.cloud.ml.v1.TrainingInput")
 	proto.RegisterType((*HyperparameterSpec)(nil), "google.cloud.ml.v1.HyperparameterSpec")
 	proto.RegisterType((*ParameterSpec)(nil), "google.cloud.ml.v1.ParameterSpec")
@@ -1780,12 +1626,144 @@ func init() {
 	proto.RegisterType((*ListJobsResponse)(nil), "google.cloud.ml.v1.ListJobsResponse")
 	proto.RegisterType((*GetJobRequest)(nil), "google.cloud.ml.v1.GetJobRequest")
 	proto.RegisterType((*CancelJobRequest)(nil), "google.cloud.ml.v1.CancelJobRequest")
-	proto.RegisterEnum("google.cloud.ml.v1.TrainingInput_ScaleTier", TrainingInput_ScaleTier_name, TrainingInput_ScaleTier_value)
-	proto.RegisterEnum("google.cloud.ml.v1.HyperparameterSpec_GoalType", HyperparameterSpec_GoalType_name, HyperparameterSpec_GoalType_value)
-	proto.RegisterEnum("google.cloud.ml.v1.ParameterSpec_ParameterType", ParameterSpec_ParameterType_name, ParameterSpec_ParameterType_value)
-	proto.RegisterEnum("google.cloud.ml.v1.ParameterSpec_ScaleType", ParameterSpec_ScaleType_name, ParameterSpec_ScaleType_value)
-	proto.RegisterEnum("google.cloud.ml.v1.PredictionInput_DataFormat", PredictionInput_DataFormat_name, PredictionInput_DataFormat_value)
-	proto.RegisterEnum("google.cloud.ml.v1.Job_State", Job_State_name, Job_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/job_service.proto", fileDescriptor_a9e7ba15cb43988d)
+}
+
+var fileDescriptor_a9e7ba15cb43988d = []byte{
+	// 2070 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdb, 0x6e, 0x1b, 0xc9,
+	0x11, 0x15, 0xaf, 0x22, 0x8b, 0x12, 0x39, 0x6e, 0x5b, 0x36, 0x4d, 0xdb, 0x6b, 0x79, 0xe4, 0x38,
+	0xb2, 0x17, 0x21, 0x21, 0xed, 0x06, 0xc8, 0x7a, 0xb1, 0x48, 0x28, 0x72, 0x2c, 0x51, 0x10, 0x29,
+	0xa6, 0x39, 0x74, 0x36, 0x46, 0x90, 0x49, 0x93, 0x6c, 0xd3, 0x23, 0xcf, 0x2d, 0x33, 0x4d, 0x45,
+	0xda, 0x85, 0x81, 0x20, 0x08, 0xf2, 0x03, 0x79, 0x0f, 0xf2, 0x4d, 0xc9, 0x1f, 0x04, 0x01, 0xf2,
+	0x01, 0x79, 0x0e, 0x10, 0xf4, 0x85, 0xc3, 0x8b, 0x28, 0xd9, 0x48, 0xde, 0xd8, 0xa7, 0x4e, 0x55,
+	0x75, 0x57, 0x55, 0x57, 0xd7, 0x10, 0x9e, 0x8e, 0x7d, 0x7f, 0xec, 0xd0, 0xda, 0xd0, 0xf1, 0x27,
+	0xa3, 0x9a, 0xeb, 0xd4, 0xce, 0xf7, 0x6a, 0x67, 0xfe, 0xc0, 0x8a, 0x68, 0x78, 0x6e, 0x0f, 0x69,
+	0x35, 0x08, 0x7d, 0xe6, 0x23, 0x24, 0x59, 0x55, 0xc1, 0xaa, 0xba, 0x4e, 0xf5, 0x7c, 0xaf, 0xf2,
+	0x50, 0x69, 0x92, 0xc0, 0xae, 0x11, 0xcf, 0xf3, 0x19, 0x61, 0xb6, 0xef, 0x45, 0x52, 0xa3, 0xb2,
+	0x35, 0x2f, 0x9d, 0xb0, 0x77, 0x0a, 0x7e, 0xa0, 0x60, 0xb1, 0x1a, 0x4c, 0xde, 0xd6, 0xa8, 0x1b,
+	0xb0, 0x4b, 0x25, 0x7c, 0xbc, 0x2c, 0x64, 0xb6, 0x4b, 0x23, 0x46, 0xdc, 0x40, 0x12, 0xf4, 0x3f,
+	0x66, 0x60, 0xd3, 0x0c, 0x89, 0xed, 0xd9, 0xde, 0xb8, 0xe5, 0x05, 0x13, 0x86, 0x8e, 0x01, 0xa2,
+	0x21, 0x71, 0xa8, 0xc5, 0x6c, 0x1a, 0x96, 0x13, 0xdb, 0x89, 0xdd, 0xe2, 0xfe, 0xe7, 0xd5, 0xab,
+	0xbb, 0xad, 0x2e, 0xa8, 0x55, 0x7b, 0x5c, 0xc7, 0xb4, 0x69, 0x88, 0xf3, 0xd1, 0xf4, 0x27, 0x7a,
+	0x0c, 0x05, 0x97, 0x44, 0x8c, 0x86, 0x16, 0xbb, 0x0c, 0x68, 0x39, 0xb9, 0x9d, 0xd8, 0xcd, 0x63,
+	0x90, 0x90, 0x79, 0x19, 0x50, 0x4e, 0xf8, 0x9d, 0x1f, 0xbe, 0x9f, 0x12, 0x52, 0x92, 0x20, 0x21,
+	0x41, 0xd8, 0x87, 0xad, 0x80, 0x84, 0xc4, 0xa5, 0xdc, 0x08, 0x8f, 0xe0, 0x94, 0x9a, 0x16, 0xd4,
+	0xdb, 0xb1, 0xb0, 0x27, 0x64, 0x42, 0xe7, 0x09, 0x6c, 0x28, 0xa3, 0x43, 0x7f, 0xe2, 0xb1, 0x72,
+	0x66, 0x3b, 0xb1, 0x9b, 0xc2, 0xca, 0x51, 0x83, 0x43, 0xe8, 0x4b, 0xb8, 0x7b, 0xc5, 0xac, 0x24,
+	0x67, 0x05, 0xf9, 0xce, 0x92, 0x5d, 0xa9, 0xf5, 0x04, 0x36, 0x02, 0x32, 0x7c, 0x4f, 0xc6, 0xd4,
+	0x9a, 0x84, 0x76, 0x54, 0x5e, 0xdf, 0x4e, 0xed, 0xe6, 0x71, 0x41, 0x61, 0xfd, 0xd0, 0x8e, 0xd0,
+	0x0e, 0x6c, 0x06, 0x97, 0xec, 0x9d, 0xef, 0x59, 0xae, 0x3f, 0x9a, 0x38, 0xb4, 0x9c, 0x13, 0xfb,
+	0xdc, 0x90, 0x60, 0x5b, 0x60, 0x08, 0x41, 0x9a, 0x84, 0xe3, 0xa8, 0x0c, 0x42, 0x5f, 0xfc, 0x46,
+	0x5d, 0x28, 0xbd, 0xbb, 0x0c, 0x68, 0x18, 0x3b, 0x8e, 0xca, 0x1b, 0xdb, 0x89, 0xdd, 0xc2, 0xfe,
+	0xb3, 0x55, 0xb1, 0x3f, 0x5a, 0xa0, 0xf6, 0x02, 0x3a, 0xc4, 0xcb, 0xea, 0xe8, 0x2e, 0x64, 0x43,
+	0x3a, 0xb6, 0x7d, 0xaf, 0x5c, 0x14, 0x7b, 0x50, 0x2b, 0x74, 0x0f, 0xd6, 0x79, 0x39, 0x8e, 0xec,
+	0xb0, 0xac, 0x49, 0xc1, 0x99, 0x3f, 0x68, 0xda, 0x21, 0xfa, 0x21, 0x94, 0xc2, 0x89, 0xc7, 0x2b,
+	0xc4, 0x3a, 0xa7, 0x61, 0xc4, 0x35, 0x4b, 0x82, 0x50, 0x54, 0xf0, 0x6b, 0x89, 0xea, 0x5d, 0xc8,
+	0xc7, 0xe9, 0x46, 0x79, 0xc8, 0x1c, 0xd4, 0x7b, 0xad, 0x86, 0xb6, 0x86, 0x8a, 0x00, 0x3d, 0xb3,
+	0xde, 0x69, 0xd6, 0x71, 0xd3, 0xda, 0xd3, 0x12, 0x68, 0x13, 0xf2, 0x5d, 0x6c, 0xb4, 0x5b, 0xfd,
+	0xb6, 0xb5, 0xa7, 0xa5, 0xf8, 0x52, 0x30, 0xad, 0xc3, 0x6e, 0x5f, 0xcb, 0x22, 0x80, 0x6c, 0xa3,
+	0xdf, 0x33, 0x4f, 0xdb, 0x5a, 0x46, 0xff, 0x47, 0x12, 0xd0, 0xd5, 0x33, 0xa1, 0x06, 0xa4, 0xc7,
+	0x3e, 0x71, 0x54, 0x15, 0xd6, 0x3e, 0x2d, 0x12, 0xd5, 0x43, 0x9f, 0x38, 0xbc, 0x10, 0xb0, 0x50,
+	0x46, 0x5f, 0x41, 0x56, 0xc8, 0xa3, 0x72, 0x72, 0x3b, 0xb5, 0x5b, 0xd8, 0x7f, 0xb2, 0xca, 0x4c,
+	0x77, 0x21, 0x96, 0x4a, 0x01, 0x3d, 0x02, 0x70, 0xc9, 0x85, 0xc5, 0x42, 0x9b, 0x38, 0x91, 0xa8,
+	0xce, 0x0c, 0xce, 0xbb, 0xe4, 0xc2, 0x14, 0x00, 0xaa, 0xc2, 0x6d, 0x2e, 0xe6, 0x64, 0xc7, 0xa1,
+	0xce, 0x94, 0x97, 0x16, 0xbc, 0x5b, 0x2e, 0xb9, 0xe8, 0x2a, 0x89, 0xe2, 0xbf, 0x84, 0xfb, 0x8b,
+	0x49, 0xb2, 0x5c, 0xca, 0x42, 0x7b, 0x68, 0x31, 0x32, 0x16, 0x55, 0x9a, 0xc7, 0xf7, 0x16, 0x09,
+	0x6d, 0x21, 0x37, 0xc9, 0x58, 0xaf, 0x43, 0x6e, 0x7a, 0x2e, 0x74, 0x1f, 0xb6, 0x0e, 0x4f, 0xeb,
+	0x27, 0x96, 0xf9, 0xcb, 0xae, 0x61, 0xf5, 0x3b, 0xbd, 0xae, 0xd1, 0x68, 0xbd, 0x6a, 0x19, 0x4d,
+	0x6d, 0x0d, 0x6d, 0x40, 0xae, 0x5d, 0xff, 0xb6, 0xd5, 0x6e, 0xbd, 0x31, 0xb4, 0x84, 0x58, 0xb5,
+	0x3a, 0x72, 0x95, 0xd4, 0xff, 0x9a, 0x86, 0xcd, 0x85, 0x73, 0xa2, 0x1f, 0x40, 0x71, 0xb6, 0x17,
+	0x8f, 0xb8, 0x54, 0x44, 0x3a, 0x8f, 0x37, 0x63, 0xb4, 0x43, 0x5c, 0xca, 0xd3, 0x10, 0xdf, 0xb9,
+	0x6b, 0xd2, 0xb0, 0x60, 0x77, 0xb6, 0x92, 0x69, 0xe0, 0xca, 0xe8, 0x01, 0xe4, 0x5d, 0xdb, 0xb3,
+	0xce, 0x89, 0x33, 0x91, 0x9d, 0x20, 0x81, 0x73, 0xae, 0xed, 0xbd, 0xe6, 0x6b, 0x21, 0x24, 0x17,
+	0x4a, 0x98, 0x52, 0x42, 0x72, 0x21, 0x85, 0x3f, 0x02, 0x34, 0x24, 0x8c, 0x8e, 0xfd, 0xd0, 0x1e,
+	0x12, 0x47, 0x92, 0xa2, 0x72, 0x46, 0x5c, 0x9e, 0x5b, 0x73, 0x12, 0xc1, 0x8e, 0x78, 0x19, 0x8f,
+	0xec, 0x68, 0x18, 0x52, 0x46, 0xa7, 0xdc, 0xec, 0x76, 0x6a, 0x37, 0x81, 0x8b, 0x53, 0x58, 0x11,
+	0x67, 0x9d, 0x8e, 0x1f, 0x6e, 0xfd, 0xfa, 0x4e, 0xb7, 0x78, 0x38, 0x59, 0xfa, 0xfc, 0x60, 0xaa,
+	0xd3, 0x5d, 0x06, 0x54, 0x1f, 0xcf, 0x85, 0x56, 0xe4, 0xe8, 0x33, 0xa8, 0x74, 0xeb, 0xb8, 0xde,
+	0x36, 0x4c, 0x03, 0xaf, 0x4a, 0x14, 0x40, 0xb6, 0x79, 0xda, 0x3f, 0x38, 0xe1, 0x69, 0x2a, 0xc0,
+	0x7a, 0xab, 0x63, 0x1a, 0x87, 0x06, 0xd6, 0x92, 0xa8, 0x04, 0x85, 0x46, 0xdd, 0x34, 0x0e, 0x4f,
+	0x71, 0xab, 0x51, 0x3f, 0xd1, 0x52, 0x3c, 0x89, 0xcd, 0x56, 0xaf, 0x81, 0x0d, 0xd3, 0xd0, 0xd2,
+	0xfa, 0xaf, 0xa6, 0x77, 0x8f, 0x3b, 0xc9, 0x41, 0xba, 0x73, 0xda, 0x31, 0xb4, 0x35, 0xb4, 0x05,
+	0xb7, 0xfa, 0x9d, 0x96, 0x69, 0x9d, 0xb4, 0x3a, 0x46, 0x1d, 0x5b, 0xbd, 0x46, 0x5d, 0x58, 0x46,
+	0x50, 0x94, 0xf0, 0xe9, 0xa1, 0xc2, 0x92, 0xa8, 0x02, 0x77, 0x05, 0x86, 0x8d, 0xd7, 0x06, 0xee,
+	0x19, 0x73, 0xb2, 0x94, 0xfe, 0xa7, 0x34, 0xdc, 0x59, 0xbc, 0x51, 0xa7, 0x13, 0xc6, 0x5f, 0x85,
+	0xfb, 0x90, 0x13, 0xd5, 0x6d, 0xd9, 0x23, 0x55, 0x23, 0xeb, 0x62, 0xdd, 0x1a, 0xa1, 0xf1, 0xd5,
+	0xce, 0x25, 0x2f, 0xda, 0x37, 0x1f, 0xbf, 0xaf, 0xd2, 0xfa, 0x12, 0x18, 0x19, 0x1e, 0x0b, 0x2f,
+	0xaf, 0x36, 0xb4, 0xdf, 0xc0, 0xc6, 0x5b, 0xdb, 0x23, 0x8e, 0xba, 0x35, 0xa2, 0x4e, 0xfe, 0x77,
+	0x2f, 0xf2, 0x6a, 0xe1, 0x82, 0x30, 0x29, 0x17, 0xe8, 0xd7, 0x50, 0x20, 0xce, 0xd4, 0x3e, 0xbf,
+	0xc8, 0xa9, 0xff, 0xdf, 0x01, 0x10, 0x47, 0x99, 0x8f, 0x2a, 0xa3, 0xe5, 0xe8, 0x2a, 0xbf, 0x3b,
+	0xb0, 0xc9, 0xd4, 0x6b, 0x6a, 0x45, 0x8c, 0x06, 0x22, 0xc4, 0x29, 0xbc, 0x31, 0x05, 0x7b, 0x8c,
+	0x06, 0xbc, 0xae, 0xfd, 0xc1, 0x19, 0x1d, 0x32, 0xfb, 0x9c, 0x2e, 0x5c, 0xa3, 0x62, 0x0c, 0x8b,
+	0xc2, 0xae, 0x1c, 0x2c, 0x7b, 0x91, 0x01, 0x45, 0x1a, 0xa4, 0xde, 0xd3, 0x4b, 0x95, 0x3e, 0xfe,
+	0x13, 0xdd, 0x81, 0xcc, 0xcc, 0x50, 0x1e, 0xcb, 0xc5, 0xcb, 0xe4, 0x4f, 0x12, 0xfa, 0xbf, 0x13,
+	0x50, 0x9c, 0x3e, 0xf0, 0xaa, 0x04, 0xf6, 0x61, 0x6b, 0xe8, 0xbb, 0x81, 0x43, 0x19, 0x1d, 0xc9,
+	0x56, 0xa7, 0x9e, 0x4c, 0xb9, 0xd9, 0xdb, 0xb1, 0x50, 0x74, 0x3b, 0xf9, 0x62, 0xfe, 0x0c, 0xb2,
+	0xaa, 0x29, 0xca, 0x92, 0xd8, 0xfd, 0xd4, 0x58, 0x62, 0xa5, 0x87, 0x5e, 0xc0, 0xad, 0xa1, 0xef,
+	0x45, 0x13, 0x97, 0x8e, 0x2c, 0xd7, 0xb1, 0x26, 0x9e, 0xcd, 0x22, 0xd5, 0x21, 0x4a, 0x53, 0x41,
+	0xdb, 0xe9, 0x73, 0x18, 0xfd, 0x14, 0x1e, 0xda, 0x91, 0xb5, 0xd4, 0x62, 0xd9, 0x44, 0x84, 0xf5,
+	0xcc, 0x1f, 0x88, 0xfe, 0x95, 0xc3, 0xf7, 0xed, 0x68, 0xd1, 0xa3, 0x29, 0x18, 0xc7, 0xfe, 0x40,
+	0xff, 0x5b, 0x0a, 0x4a, 0xdd, 0x90, 0x8e, 0xec, 0x21, 0x1f, 0xbc, 0xe4, 0x3c, 0xf4, 0x18, 0xc0,
+	0xf5, 0x47, 0xd4, 0x99, 0xeb, 0x8f, 0x47, 0x6b, 0x38, 0x2f, 0x30, 0xd1, 0x1d, 0x77, 0x60, 0x43,
+	0x3d, 0x97, 0x92, 0x92, 0x54, 0x94, 0x82, 0x42, 0x05, 0x09, 0x41, 0x6a, 0x12, 0xda, 0xe5, 0xbc,
+	0x92, 0xf1, 0x05, 0x3a, 0x85, 0xc2, 0x88, 0x30, 0x62, 0xbd, 0xf5, 0x43, 0x97, 0x30, 0x71, 0xa8,
+	0xe2, 0x7e, 0x75, 0x65, 0x03, 0x5a, 0xdc, 0x53, 0xb5, 0x49, 0x18, 0x79, 0x25, 0xb4, 0x30, 0x8c,
+	0xe2, 0xdf, 0x7c, 0x9a, 0xb2, 0xb9, 0xdc, 0x0a, 0x08, 0x7b, 0x27, 0xcb, 0x37, 0x8f, 0x41, 0x40,
+	0x5d, 0x8e, 0x70, 0x82, 0x2f, 0xc2, 0x2b, 0x18, 0xea, 0xc9, 0x01, 0x09, 0x71, 0x06, 0xda, 0x05,
+	0x8d, 0xf7, 0xe1, 0x85, 0xf1, 0x49, 0x4e, 0x44, 0x45, 0x97, 0x5c, 0xfc, 0x62, 0x6e, 0x82, 0x9a,
+	0x4d, 0x17, 0xeb, 0x0b, 0xd3, 0xc5, 0x8a, 0x21, 0x22, 0xb7, 0x72, 0x88, 0x78, 0x0d, 0x30, 0x3b,
+	0x06, 0x7a, 0x00, 0xf7, 0x9a, 0x75, 0xb3, 0x6e, 0xbd, 0x3a, 0xc5, 0xed, 0xba, 0xb9, 0xd4, 0x2b,
+	0x73, 0x90, 0x36, 0x8d, 0x6f, 0x4d, 0x39, 0x51, 0x98, 0xaf, 0x2c, 0x6c, 0x34, 0x4e, 0x71, 0x53,
+	0x4b, 0xf2, 0xf6, 0x16, 0x2f, 0xad, 0xc3, 0x37, 0xad, 0xae, 0x96, 0x3a, 0x28, 0xc1, 0xa6, 0xcc,
+	0x97, 0x72, 0xaf, 0xff, 0x25, 0x01, 0xda, 0x2c, 0x80, 0xaa, 0x98, 0x97, 0x22, 0x91, 0xb8, 0x12,
+	0x89, 0xe7, 0xa0, 0x05, 0xb1, 0x92, 0x8a, 0x44, 0x52, 0x44, 0xa2, 0x34, 0xc3, 0x65, 0x28, 0x1e,
+	0x43, 0x81, 0x86, 0xa1, 0x3f, 0x8d, 0x57, 0x4a, 0xb0, 0x40, 0x40, 0x92, 0xf0, 0x08, 0xc0, 0xf3,
+	0x47, 0xd4, 0x7a, 0xe7, 0x4f, 0x42, 0x39, 0x1e, 0x24, 0x70, 0x9e, 0x23, 0x47, 0x1c, 0xd0, 0xff,
+	0x93, 0x81, 0xd4, 0xb1, 0x3f, 0x40, 0x5b, 0xc0, 0x27, 0xb1, 0x59, 0x87, 0xcd, 0x9c, 0xf9, 0x83,
+	0xd6, 0x08, 0x1d, 0x43, 0x31, 0x6e, 0x0e, 0x22, 0x97, 0x62, 0x1f, 0xd7, 0xcc, 0x31, 0x0b, 0x43,
+	0xf9, 0xd1, 0x1a, 0x8e, 0xfb, 0x8a, 0x2c, 0xe6, 0xee, 0xc2, 0xa9, 0xa4, 0x35, 0xd9, 0x46, 0x77,
+	0x3e, 0xa1, 0xee, 0x8e, 0xd6, 0xe6, 0x0f, 0x2f, 0x2d, 0x7e, 0x0d, 0x85, 0x61, 0x48, 0x09, 0xe3,
+	0xdf, 0x0b, 0xae, 0x1c, 0x11, 0x0a, 0xfb, 0x95, 0xa9, 0xb1, 0xe9, 0x77, 0x47, 0xd5, 0x9c, 0x7e,
+	0x77, 0x60, 0x90, 0x74, 0x0e, 0xa0, 0xaf, 0x00, 0x22, 0x46, 0x42, 0x26, 0x75, 0x33, 0x1f, 0xd5,
+	0xcd, 0x0b, 0xb6, 0x50, 0xfd, 0x31, 0xe4, 0xa8, 0x37, 0x92, 0x8a, 0xd9, 0x8f, 0x2a, 0xae, 0x53,
+	0x6f, 0x24, 0xd4, 0xbe, 0x80, 0x4c, 0xc4, 0x08, 0x9b, 0x3e, 0xf7, 0x8f, 0x56, 0x9d, 0xfa, 0xd8,
+	0x1f, 0x54, 0x7b, 0x9c, 0x84, 0x25, 0x97, 0xb7, 0x67, 0x99, 0x60, 0x97, 0x46, 0x11, 0x19, 0xc7,
+	0x43, 0xbd, 0x00, 0xdb, 0x12, 0x43, 0x6d, 0x28, 0xc5, 0x69, 0x92, 0x75, 0x24, 0x6e, 0x7b, 0x61,
+	0x5f, 0xbf, 0x29, 0x4f, 0xb2, 0x1c, 0x8f, 0x12, 0x38, 0xce, 0xb1, 0x2a, 0xd0, 0x1e, 0xdc, 0x9a,
+	0xcb, 0x94, 0x32, 0x08, 0xc2, 0xe0, 0xd3, 0x9b, 0x53, 0x15, 0x9b, 0x9c, 0x4b, 0xb5, 0xc4, 0xf4,
+	0xdf, 0x27, 0x20, 0x23, 0x4e, 0xc6, 0xe7, 0x85, 0x9e, 0x59, 0x37, 0x57, 0x4c, 0x25, 0x3f, 0xef,
+	0x1b, 0x7d, 0xa3, 0x19, 0x4f, 0xef, 0xdd, 0x3a, 0x6e, 0x75, 0x0e, 0xb5, 0x24, 0x1f, 0x52, 0x70,
+	0xbf, 0xd3, 0xe1, 0x0b, 0x31, 0xca, 0xf7, 0xfa, 0x8d, 0x86, 0x61, 0x34, 0x8d, 0xa6, 0x96, 0xe6,
+	0x6a, 0xaf, 0xea, 0xad, 0x13, 0xa3, 0xa9, 0x65, 0xf8, 0x47, 0x40, 0xa3, 0xde, 0x69, 0x18, 0x27,
+	0x27, 0x9c, 0x9a, 0xe5, 0x54, 0xb5, 0x36, 0x9a, 0xda, 0xfa, 0xc1, 0x3a, 0x64, 0x44, 0xd9, 0x1d,
+	0xe4, 0x20, 0x2b, 0x4f, 0xa5, 0xf7, 0x41, 0x6b, 0x88, 0x9a, 0x38, 0xf6, 0x07, 0x98, 0xfe, 0x76,
+	0x42, 0x23, 0xd1, 0x5e, 0x02, 0x12, 0x52, 0xf5, 0xba, 0xe4, 0xb1, 0x5a, 0xa1, 0xe7, 0x90, 0xe2,
+	0x9d, 0x5c, 0xde, 0x80, 0x7b, 0xd7, 0x64, 0x0f, 0x73, 0x8e, 0xfe, 0x01, 0x4a, 0x27, 0x76, 0xc4,
+	0x8e, 0xfd, 0x41, 0xf4, 0x31, 0xab, 0x77, 0x21, 0xfb, 0xd6, 0x76, 0x18, 0x0d, 0xd5, 0x43, 0xa8,
+	0x56, 0xfc, 0xe2, 0x06, 0xfc, 0x6b, 0x8f, 0xf9, 0xef, 0xa9, 0xa7, 0x3e, 0x39, 0xf3, 0x1c, 0x31,
+	0x39, 0xc0, 0xa7, 0x56, 0x21, 0x8e, 0xec, 0xef, 0x64, 0xf5, 0x66, 0x70, 0x8e, 0x03, 0x3d, 0xfb,
+	0x3b, 0x3e, 0x11, 0x6a, 0x33, 0xf7, 0x51, 0xe0, 0x7b, 0x11, 0x45, 0x9f, 0x43, 0xfa, 0xcc, 0x1f,
+	0x44, 0xe5, 0x84, 0x78, 0x0c, 0xaf, 0xdd, 0xbe, 0x20, 0xa1, 0x67, 0x50, 0xf2, 0xe8, 0x05, 0x6f,
+	0x50, 0xf1, 0x0e, 0xe4, 0xee, 0x36, 0x39, 0xdc, 0x9d, 0xee, 0x42, 0xdf, 0x81, 0xcd, 0x43, 0xca,
+	0xe6, 0x62, 0x87, 0x20, 0x3d, 0x37, 0xcb, 0x8b, 0xdf, 0xfa, 0x33, 0xd0, 0x1a, 0xc4, 0x1b, 0x52,
+	0xe7, 0x66, 0xde, 0xfe, 0xbf, 0x52, 0x00, 0xc7, 0xfe, 0xa0, 0x27, 0xff, 0xab, 0x40, 0x13, 0xc8,
+	0xc7, 0xa9, 0x41, 0x2b, 0xeb, 0x6e, 0x39, 0x73, 0x95, 0xeb, 0x4e, 0xa5, 0x3f, 0xff, 0xc3, 0xdf,
+	0xff, 0xf9, 0xe7, 0xe4, 0x8e, 0xfe, 0xb0, 0x76, 0xbe, 0x57, 0xfb, 0x5e, 0x46, 0xfe, 0x9b, 0x20,
+	0xf4, 0xf9, 0xec, 0x12, 0xd5, 0x5e, 0x7c, 0xa8, 0xf1, 0x53, 0xbf, 0xe4, 0xa9, 0x43, 0xdf, 0x43,
+	0x6e, 0x1a, 0x3b, 0xb4, 0xb2, 0x31, 0x2d, 0x25, 0xb6, 0xf2, 0xf4, 0x66, 0x92, 0x0c, 0xbf, 0xfe,
+	0x54, 0xec, 0xe0, 0x33, 0x74, 0xe3, 0x0e, 0xd0, 0x19, 0x64, 0x65, 0x3c, 0xd1, 0xca, 0x0e, 0xbb,
+	0x10, 0xeb, 0xeb, 0x4f, 0xbb, 0xe8, 0x8b, 0xc7, 0x76, 0xce, 0x93, 0x70, 0x54, 0x7b, 0xf1, 0x01,
+	0x5d, 0x42, 0x3e, 0x4e, 0xcb, 0x35, 0xf1, 0x5d, 0xca, 0x5a, 0xe5, 0xee, 0x95, 0x36, 0x67, 0xb8,
+	0x01, 0xbb, 0xd4, 0xab, 0xc2, 0xe1, 0xae, 0xbe, 0x73, 0x93, 0xc3, 0x97, 0x43, 0x61, 0xee, 0x65,
+	0xe2, 0xc5, 0x01, 0x85, 0xca, 0xd0, 0x77, 0xaf, 0xb8, 0x24, 0x81, 0x5d, 0x3d, 0xdf, 0x3b, 0x28,
+	0xcd, 0x8a, 0xa0, 0xcb, 0xfd, 0x74, 0x13, 0x6f, 0xbe, 0x54, 0xd4, 0xb1, 0xef, 0x10, 0x6f, 0x5c,
+	0xf5, 0xc3, 0x71, 0x6d, 0x4c, 0x3d, 0xb1, 0x8b, 0x9a, 0x14, 0x91, 0xc0, 0x8e, 0xe6, 0xff, 0xf6,
+	0xfa, 0xda, 0x75, 0x06, 0x59, 0x41, 0xf8, 0xe2, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x7b,
+	0x72, 0xd5, 0x16, 0x13, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1966,141 +1944,3 @@ var _JobService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/ml/v1/job_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/ml/v1/job_service.proto", fileDescriptor_job_service_96b7f358a19eb3fe)
-}
-
-var fileDescriptor_job_service_96b7f358a19eb3fe = []byte{
-	// 2070 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdb, 0x6e, 0x1b, 0xc9,
-	0x11, 0x15, 0xaf, 0x22, 0x8b, 0x12, 0x39, 0x6e, 0x5b, 0x36, 0x4d, 0xdb, 0x6b, 0x79, 0xe4, 0x38,
-	0xb2, 0x17, 0x21, 0x21, 0xed, 0x06, 0xc8, 0x7a, 0xb1, 0x48, 0x28, 0x72, 0x2c, 0x51, 0x10, 0x29,
-	0xa6, 0x39, 0x74, 0x36, 0x46, 0x90, 0x49, 0x93, 0x6c, 0xd3, 0x23, 0xcf, 0x2d, 0x33, 0x4d, 0x45,
-	0xda, 0x85, 0x81, 0x20, 0x08, 0xf2, 0x03, 0x79, 0x0f, 0xf2, 0x4d, 0xc9, 0x1f, 0x04, 0x01, 0xf2,
-	0x01, 0x79, 0x0e, 0x10, 0xf4, 0x85, 0xc3, 0x8b, 0x28, 0xd9, 0x48, 0xde, 0xd8, 0xa7, 0x4e, 0x55,
-	0x75, 0x57, 0x55, 0x57, 0xd7, 0x10, 0x9e, 0x8e, 0x7d, 0x7f, 0xec, 0xd0, 0xda, 0xd0, 0xf1, 0x27,
-	0xa3, 0x9a, 0xeb, 0xd4, 0xce, 0xf7, 0x6a, 0x67, 0xfe, 0xc0, 0x8a, 0x68, 0x78, 0x6e, 0x0f, 0x69,
-	0x35, 0x08, 0x7d, 0xe6, 0x23, 0x24, 0x59, 0x55, 0xc1, 0xaa, 0xba, 0x4e, 0xf5, 0x7c, 0xaf, 0xf2,
-	0x50, 0x69, 0x92, 0xc0, 0xae, 0x11, 0xcf, 0xf3, 0x19, 0x61, 0xb6, 0xef, 0x45, 0x52, 0xa3, 0xb2,
-	0x35, 0x2f, 0x9d, 0xb0, 0x77, 0x0a, 0x7e, 0xa0, 0x60, 0xb1, 0x1a, 0x4c, 0xde, 0xd6, 0xa8, 0x1b,
-	0xb0, 0x4b, 0x25, 0x7c, 0xbc, 0x2c, 0x64, 0xb6, 0x4b, 0x23, 0x46, 0xdc, 0x40, 0x12, 0xf4, 0x3f,
-	0x66, 0x60, 0xd3, 0x0c, 0x89, 0xed, 0xd9, 0xde, 0xb8, 0xe5, 0x05, 0x13, 0x86, 0x8e, 0x01, 0xa2,
-	0x21, 0x71, 0xa8, 0xc5, 0x6c, 0x1a, 0x96, 0x13, 0xdb, 0x89, 0xdd, 0xe2, 0xfe, 0xe7, 0xd5, 0xab,
-	0xbb, 0xad, 0x2e, 0xa8, 0x55, 0x7b, 0x5c, 0xc7, 0xb4, 0x69, 0x88, 0xf3, 0xd1, 0xf4, 0x27, 0x7a,
-	0x0c, 0x05, 0x97, 0x44, 0x8c, 0x86, 0x16, 0xbb, 0x0c, 0x68, 0x39, 0xb9, 0x9d, 0xd8, 0xcd, 0x63,
-	0x90, 0x90, 0x79, 0x19, 0x50, 0x4e, 0xf8, 0x9d, 0x1f, 0xbe, 0x9f, 0x12, 0x52, 0x92, 0x20, 0x21,
-	0x41, 0xd8, 0x87, 0xad, 0x80, 0x84, 0xc4, 0xa5, 0xdc, 0x08, 0x8f, 0xe0, 0x94, 0x9a, 0x16, 0xd4,
-	0xdb, 0xb1, 0xb0, 0x27, 0x64, 0x42, 0xe7, 0x09, 0x6c, 0x28, 0xa3, 0x43, 0x7f, 0xe2, 0xb1, 0x72,
-	0x66, 0x3b, 0xb1, 0x9b, 0xc2, 0xca, 0x51, 0x83, 0x43, 0xe8, 0x4b, 0xb8, 0x7b, 0xc5, 0xac, 0x24,
-	0x67, 0x05, 0xf9, 0xce, 0x92, 0x5d, 0xa9, 0xf5, 0x04, 0x36, 0x02, 0x32, 0x7c, 0x4f, 0xc6, 0xd4,
-	0x9a, 0x84, 0x76, 0x54, 0x5e, 0xdf, 0x4e, 0xed, 0xe6, 0x71, 0x41, 0x61, 0xfd, 0xd0, 0x8e, 0xd0,
-	0x0e, 0x6c, 0x06, 0x97, 0xec, 0x9d, 0xef, 0x59, 0xae, 0x3f, 0x9a, 0x38, 0xb4, 0x9c, 0x13, 0xfb,
-	0xdc, 0x90, 0x60, 0x5b, 0x60, 0x08, 0x41, 0x9a, 0x84, 0xe3, 0xa8, 0x0c, 0x42, 0x5f, 0xfc, 0x46,
-	0x5d, 0x28, 0xbd, 0xbb, 0x0c, 0x68, 0x18, 0x3b, 0x8e, 0xca, 0x1b, 0xdb, 0x89, 0xdd, 0xc2, 0xfe,
-	0xb3, 0x55, 0xb1, 0x3f, 0x5a, 0xa0, 0xf6, 0x02, 0x3a, 0xc4, 0xcb, 0xea, 0xe8, 0x2e, 0x64, 0x43,
-	0x3a, 0xb6, 0x7d, 0xaf, 0x5c, 0x14, 0x7b, 0x50, 0x2b, 0x74, 0x0f, 0xd6, 0x79, 0x39, 0x8e, 0xec,
-	0xb0, 0xac, 0x49, 0xc1, 0x99, 0x3f, 0x68, 0xda, 0x21, 0xfa, 0x21, 0x94, 0xc2, 0x89, 0xc7, 0x2b,
-	0xc4, 0x3a, 0xa7, 0x61, 0xc4, 0x35, 0x4b, 0x82, 0x50, 0x54, 0xf0, 0x6b, 0x89, 0xea, 0x5d, 0xc8,
-	0xc7, 0xe9, 0x46, 0x79, 0xc8, 0x1c, 0xd4, 0x7b, 0xad, 0x86, 0xb6, 0x86, 0x8a, 0x00, 0x3d, 0xb3,
-	0xde, 0x69, 0xd6, 0x71, 0xd3, 0xda, 0xd3, 0x12, 0x68, 0x13, 0xf2, 0x5d, 0x6c, 0xb4, 0x5b, 0xfd,
-	0xb6, 0xb5, 0xa7, 0xa5, 0xf8, 0x52, 0x30, 0xad, 0xc3, 0x6e, 0x5f, 0xcb, 0x22, 0x80, 0x6c, 0xa3,
-	0xdf, 0x33, 0x4f, 0xdb, 0x5a, 0x46, 0xff, 0x47, 0x12, 0xd0, 0xd5, 0x33, 0xa1, 0x06, 0xa4, 0xc7,
-	0x3e, 0x71, 0x54, 0x15, 0xd6, 0x3e, 0x2d, 0x12, 0xd5, 0x43, 0x9f, 0x38, 0xbc, 0x10, 0xb0, 0x50,
-	0x46, 0x5f, 0x41, 0x56, 0xc8, 0xa3, 0x72, 0x72, 0x3b, 0xb5, 0x5b, 0xd8, 0x7f, 0xb2, 0xca, 0x4c,
-	0x77, 0x21, 0x96, 0x4a, 0x01, 0x3d, 0x02, 0x70, 0xc9, 0x85, 0xc5, 0x42, 0x9b, 0x38, 0x91, 0xa8,
-	0xce, 0x0c, 0xce, 0xbb, 0xe4, 0xc2, 0x14, 0x00, 0xaa, 0xc2, 0x6d, 0x2e, 0xe6, 0x64, 0xc7, 0xa1,
-	0xce, 0x94, 0x97, 0x16, 0xbc, 0x5b, 0x2e, 0xb9, 0xe8, 0x2a, 0x89, 0xe2, 0xbf, 0x84, 0xfb, 0x8b,
-	0x49, 0xb2, 0x5c, 0xca, 0x42, 0x7b, 0x68, 0x31, 0x32, 0x16, 0x55, 0x9a, 0xc7, 0xf7, 0x16, 0x09,
-	0x6d, 0x21, 0x37, 0xc9, 0x58, 0xaf, 0x43, 0x6e, 0x7a, 0x2e, 0x74, 0x1f, 0xb6, 0x0e, 0x4f, 0xeb,
-	0x27, 0x96, 0xf9, 0xcb, 0xae, 0x61, 0xf5, 0x3b, 0xbd, 0xae, 0xd1, 0x68, 0xbd, 0x6a, 0x19, 0x4d,
-	0x6d, 0x0d, 0x6d, 0x40, 0xae, 0x5d, 0xff, 0xb6, 0xd5, 0x6e, 0xbd, 0x31, 0xb4, 0x84, 0x58, 0xb5,
-	0x3a, 0x72, 0x95, 0xd4, 0xff, 0x9a, 0x86, 0xcd, 0x85, 0x73, 0xa2, 0x1f, 0x40, 0x71, 0xb6, 0x17,
-	0x8f, 0xb8, 0x54, 0x44, 0x3a, 0x8f, 0x37, 0x63, 0xb4, 0x43, 0x5c, 0xca, 0xd3, 0x10, 0xdf, 0xb9,
-	0x6b, 0xd2, 0xb0, 0x60, 0x77, 0xb6, 0x92, 0x69, 0xe0, 0xca, 0xe8, 0x01, 0xe4, 0x5d, 0xdb, 0xb3,
-	0xce, 0x89, 0x33, 0x91, 0x9d, 0x20, 0x81, 0x73, 0xae, 0xed, 0xbd, 0xe6, 0x6b, 0x21, 0x24, 0x17,
-	0x4a, 0x98, 0x52, 0x42, 0x72, 0x21, 0x85, 0x3f, 0x02, 0x34, 0x24, 0x8c, 0x8e, 0xfd, 0xd0, 0x1e,
-	0x12, 0x47, 0x92, 0xa2, 0x72, 0x46, 0x5c, 0x9e, 0x5b, 0x73, 0x12, 0xc1, 0x8e, 0x78, 0x19, 0x8f,
-	0xec, 0x68, 0x18, 0x52, 0x46, 0xa7, 0xdc, 0xec, 0x76, 0x6a, 0x37, 0x81, 0x8b, 0x53, 0x58, 0x11,
-	0x67, 0x9d, 0x8e, 0x1f, 0x6e, 0xfd, 0xfa, 0x4e, 0xb7, 0x78, 0x38, 0x59, 0xfa, 0xfc, 0x60, 0xaa,
-	0xd3, 0x5d, 0x06, 0x54, 0x1f, 0xcf, 0x85, 0x56, 0xe4, 0xe8, 0x33, 0xa8, 0x74, 0xeb, 0xb8, 0xde,
-	0x36, 0x4c, 0x03, 0xaf, 0x4a, 0x14, 0x40, 0xb6, 0x79, 0xda, 0x3f, 0x38, 0xe1, 0x69, 0x2a, 0xc0,
-	0x7a, 0xab, 0x63, 0x1a, 0x87, 0x06, 0xd6, 0x92, 0xa8, 0x04, 0x85, 0x46, 0xdd, 0x34, 0x0e, 0x4f,
-	0x71, 0xab, 0x51, 0x3f, 0xd1, 0x52, 0x3c, 0x89, 0xcd, 0x56, 0xaf, 0x81, 0x0d, 0xd3, 0xd0, 0xd2,
-	0xfa, 0xaf, 0xa6, 0x77, 0x8f, 0x3b, 0xc9, 0x41, 0xba, 0x73, 0xda, 0x31, 0xb4, 0x35, 0xb4, 0x05,
-	0xb7, 0xfa, 0x9d, 0x96, 0x69, 0x9d, 0xb4, 0x3a, 0x46, 0x1d, 0x5b, 0xbd, 0x46, 0x5d, 0x58, 0x46,
-	0x50, 0x94, 0xf0, 0xe9, 0xa1, 0xc2, 0x92, 0xa8, 0x02, 0x77, 0x05, 0x86, 0x8d, 0xd7, 0x06, 0xee,
-	0x19, 0x73, 0xb2, 0x94, 0xfe, 0xa7, 0x34, 0xdc, 0x59, 0xbc, 0x51, 0xa7, 0x13, 0xc6, 0x5f, 0x85,
-	0xfb, 0x90, 0x13, 0xd5, 0x6d, 0xd9, 0x23, 0x55, 0x23, 0xeb, 0x62, 0xdd, 0x1a, 0xa1, 0xf1, 0xd5,
-	0xce, 0x25, 0x2f, 0xda, 0x37, 0x1f, 0xbf, 0xaf, 0xd2, 0xfa, 0x12, 0x18, 0x19, 0x1e, 0x0b, 0x2f,
-	0xaf, 0x36, 0xb4, 0xdf, 0xc0, 0xc6, 0x5b, 0xdb, 0x23, 0x8e, 0xba, 0x35, 0xa2, 0x4e, 0xfe, 0x77,
-	0x2f, 0xf2, 0x6a, 0xe1, 0x82, 0x30, 0x29, 0x17, 0xe8, 0xd7, 0x50, 0x20, 0xce, 0xd4, 0x3e, 0xbf,
-	0xc8, 0xa9, 0xff, 0xdf, 0x01, 0x10, 0x47, 0x99, 0x8f, 0x2a, 0xa3, 0xe5, 0xe8, 0x2a, 0xbf, 0x3b,
-	0xb0, 0xc9, 0xd4, 0x6b, 0x6a, 0x45, 0x8c, 0x06, 0x22, 0xc4, 0x29, 0xbc, 0x31, 0x05, 0x7b, 0x8c,
-	0x06, 0xbc, 0xae, 0xfd, 0xc1, 0x19, 0x1d, 0x32, 0xfb, 0x9c, 0x2e, 0x5c, 0xa3, 0x62, 0x0c, 0x8b,
-	0xc2, 0xae, 0x1c, 0x2c, 0x7b, 0x91, 0x01, 0x45, 0x1a, 0xa4, 0xde, 0xd3, 0x4b, 0x95, 0x3e, 0xfe,
-	0x13, 0xdd, 0x81, 0xcc, 0xcc, 0x50, 0x1e, 0xcb, 0xc5, 0xcb, 0xe4, 0x4f, 0x12, 0xfa, 0xbf, 0x13,
-	0x50, 0x9c, 0x3e, 0xf0, 0xaa, 0x04, 0xf6, 0x61, 0x6b, 0xe8, 0xbb, 0x81, 0x43, 0x19, 0x1d, 0xc9,
-	0x56, 0xa7, 0x9e, 0x4c, 0xb9, 0xd9, 0xdb, 0xb1, 0x50, 0x74, 0x3b, 0xf9, 0x62, 0xfe, 0x0c, 0xb2,
-	0xaa, 0x29, 0xca, 0x92, 0xd8, 0xfd, 0xd4, 0x58, 0x62, 0xa5, 0x87, 0x5e, 0xc0, 0xad, 0xa1, 0xef,
-	0x45, 0x13, 0x97, 0x8e, 0x2c, 0xd7, 0xb1, 0x26, 0x9e, 0xcd, 0x22, 0xd5, 0x21, 0x4a, 0x53, 0x41,
-	0xdb, 0xe9, 0x73, 0x18, 0xfd, 0x14, 0x1e, 0xda, 0x91, 0xb5, 0xd4, 0x62, 0xd9, 0x44, 0x84, 0xf5,
-	0xcc, 0x1f, 0x88, 0xfe, 0x95, 0xc3, 0xf7, 0xed, 0x68, 0xd1, 0xa3, 0x29, 0x18, 0xc7, 0xfe, 0x40,
-	0xff, 0x5b, 0x0a, 0x4a, 0xdd, 0x90, 0x8e, 0xec, 0x21, 0x1f, 0xbc, 0xe4, 0x3c, 0xf4, 0x18, 0xc0,
-	0xf5, 0x47, 0xd4, 0x99, 0xeb, 0x8f, 0x47, 0x6b, 0x38, 0x2f, 0x30, 0xd1, 0x1d, 0x77, 0x60, 0x43,
-	0x3d, 0x97, 0x92, 0x92, 0x54, 0x94, 0x82, 0x42, 0x05, 0x09, 0x41, 0x6a, 0x12, 0xda, 0xe5, 0xbc,
-	0x92, 0xf1, 0x05, 0x3a, 0x85, 0xc2, 0x88, 0x30, 0x62, 0xbd, 0xf5, 0x43, 0x97, 0x30, 0x71, 0xa8,
-	0xe2, 0x7e, 0x75, 0x65, 0x03, 0x5a, 0xdc, 0x53, 0xb5, 0x49, 0x18, 0x79, 0x25, 0xb4, 0x30, 0x8c,
-	0xe2, 0xdf, 0x7c, 0x9a, 0xb2, 0xb9, 0xdc, 0x0a, 0x08, 0x7b, 0x27, 0xcb, 0x37, 0x8f, 0x41, 0x40,
-	0x5d, 0x8e, 0x70, 0x82, 0x2f, 0xc2, 0x2b, 0x18, 0xea, 0xc9, 0x01, 0x09, 0x71, 0x06, 0xda, 0x05,
-	0x8d, 0xf7, 0xe1, 0x85, 0xf1, 0x49, 0x4e, 0x44, 0x45, 0x97, 0x5c, 0xfc, 0x62, 0x6e, 0x82, 0x9a,
-	0x4d, 0x17, 0xeb, 0x0b, 0xd3, 0xc5, 0x8a, 0x21, 0x22, 0xb7, 0x72, 0x88, 0x78, 0x0d, 0x30, 0x3b,
-	0x06, 0x7a, 0x00, 0xf7, 0x9a, 0x75, 0xb3, 0x6e, 0xbd, 0x3a, 0xc5, 0xed, 0xba, 0xb9, 0xd4, 0x2b,
-	0x73, 0x90, 0x36, 0x8d, 0x6f, 0x4d, 0x39, 0x51, 0x98, 0xaf, 0x2c, 0x6c, 0x34, 0x4e, 0x71, 0x53,
-	0x4b, 0xf2, 0xf6, 0x16, 0x2f, 0xad, 0xc3, 0x37, 0xad, 0xae, 0x96, 0x3a, 0x28, 0xc1, 0xa6, 0xcc,
-	0x97, 0x72, 0xaf, 0xff, 0x25, 0x01, 0xda, 0x2c, 0x80, 0xaa, 0x98, 0x97, 0x22, 0x91, 0xb8, 0x12,
-	0x89, 0xe7, 0xa0, 0x05, 0xb1, 0x92, 0x8a, 0x44, 0x52, 0x44, 0xa2, 0x34, 0xc3, 0x65, 0x28, 0x1e,
-	0x43, 0x81, 0x86, 0xa1, 0x3f, 0x8d, 0x57, 0x4a, 0xb0, 0x40, 0x40, 0x92, 0xf0, 0x08, 0xc0, 0xf3,
-	0x47, 0xd4, 0x7a, 0xe7, 0x4f, 0x42, 0x39, 0x1e, 0x24, 0x70, 0x9e, 0x23, 0x47, 0x1c, 0xd0, 0xff,
-	0x93, 0x81, 0xd4, 0xb1, 0x3f, 0x40, 0x5b, 0xc0, 0x27, 0xb1, 0x59, 0x87, 0xcd, 0x9c, 0xf9, 0x83,
-	0xd6, 0x08, 0x1d, 0x43, 0x31, 0x6e, 0x0e, 0x22, 0x97, 0x62, 0x1f, 0xd7, 0xcc, 0x31, 0x0b, 0x43,
-	0xf9, 0xd1, 0x1a, 0x8e, 0xfb, 0x8a, 0x2c, 0xe6, 0xee, 0xc2, 0xa9, 0xa4, 0x35, 0xd9, 0x46, 0x77,
-	0x3e, 0xa1, 0xee, 0x8e, 0xd6, 0xe6, 0x0f, 0x2f, 0x2d, 0x7e, 0x0d, 0x85, 0x61, 0x48, 0x09, 0xe3,
-	0xdf, 0x0b, 0xae, 0x1c, 0x11, 0x0a, 0xfb, 0x95, 0xa9, 0xb1, 0xe9, 0x77, 0x47, 0xd5, 0x9c, 0x7e,
-	0x77, 0x60, 0x90, 0x74, 0x0e, 0xa0, 0xaf, 0x00, 0x22, 0x46, 0x42, 0x26, 0x75, 0x33, 0x1f, 0xd5,
-	0xcd, 0x0b, 0xb6, 0x50, 0xfd, 0x31, 0xe4, 0xa8, 0x37, 0x92, 0x8a, 0xd9, 0x8f, 0x2a, 0xae, 0x53,
-	0x6f, 0x24, 0xd4, 0xbe, 0x80, 0x4c, 0xc4, 0x08, 0x9b, 0x3e, 0xf7, 0x8f, 0x56, 0x9d, 0xfa, 0xd8,
-	0x1f, 0x54, 0x7b, 0x9c, 0x84, 0x25, 0x97, 0xb7, 0x67, 0x99, 0x60, 0x97, 0x46, 0x11, 0x19, 0xc7,
-	0x43, 0xbd, 0x00, 0xdb, 0x12, 0x43, 0x6d, 0x28, 0xc5, 0x69, 0x92, 0x75, 0x24, 0x6e, 0x7b, 0x61,
-	0x5f, 0xbf, 0x29, 0x4f, 0xb2, 0x1c, 0x8f, 0x12, 0x38, 0xce, 0xb1, 0x2a, 0xd0, 0x1e, 0xdc, 0x9a,
-	0xcb, 0x94, 0x32, 0x08, 0xc2, 0xe0, 0xd3, 0x9b, 0x53, 0x15, 0x9b, 0x9c, 0x4b, 0xb5, 0xc4, 0xf4,
-	0xdf, 0x27, 0x20, 0x23, 0x4e, 0xc6, 0xe7, 0x85, 0x9e, 0x59, 0x37, 0x57, 0x4c, 0x25, 0x3f, 0xef,
-	0x1b, 0x7d, 0xa3, 0x19, 0x4f, 0xef, 0xdd, 0x3a, 0x6e, 0x75, 0x0e, 0xb5, 0x24, 0x1f, 0x52, 0x70,
-	0xbf, 0xd3, 0xe1, 0x0b, 0x31, 0xca, 0xf7, 0xfa, 0x8d, 0x86, 0x61, 0x34, 0x8d, 0xa6, 0x96, 0xe6,
-	0x6a, 0xaf, 0xea, 0xad, 0x13, 0xa3, 0xa9, 0x65, 0xf8, 0x47, 0x40, 0xa3, 0xde, 0x69, 0x18, 0x27,
-	0x27, 0x9c, 0x9a, 0xe5, 0x54, 0xb5, 0x36, 0x9a, 0xda, 0xfa, 0xc1, 0x3a, 0x64, 0x44, 0xd9, 0x1d,
-	0xe4, 0x20, 0x2b, 0x4f, 0xa5, 0xf7, 0x41, 0x6b, 0x88, 0x9a, 0x38, 0xf6, 0x07, 0x98, 0xfe, 0x76,
-	0x42, 0x23, 0xd1, 0x5e, 0x02, 0x12, 0x52, 0xf5, 0xba, 0xe4, 0xb1, 0x5a, 0xa1, 0xe7, 0x90, 0xe2,
-	0x9d, 0x5c, 0xde, 0x80, 0x7b, 0xd7, 0x64, 0x0f, 0x73, 0x8e, 0xfe, 0x01, 0x4a, 0x27, 0x76, 0xc4,
-	0x8e, 0xfd, 0x41, 0xf4, 0x31, 0xab, 0x77, 0x21, 0xfb, 0xd6, 0x76, 0x18, 0x0d, 0xd5, 0x43, 0xa8,
-	0x56, 0xfc, 0xe2, 0x06, 0xfc, 0x6b, 0x8f, 0xf9, 0xef, 0xa9, 0xa7, 0x3e, 0x39, 0xf3, 0x1c, 0x31,
-	0x39, 0xc0, 0xa7, 0x56, 0x21, 0x8e, 0xec, 0xef, 0x64, 0xf5, 0x66, 0x70, 0x8e, 0x03, 0x3d, 0xfb,
-	0x3b, 0x3e, 0x11, 0x6a, 0x33, 0xf7, 0x51, 0xe0, 0x7b, 0x11, 0x45, 0x9f, 0x43, 0xfa, 0xcc, 0x1f,
-	0x44, 0xe5, 0x84, 0x78, 0x0c, 0xaf, 0xdd, 0xbe, 0x20, 0xa1, 0x67, 0x50, 0xf2, 0xe8, 0x05, 0x6f,
-	0x50, 0xf1, 0x0e, 0xe4, 0xee, 0x36, 0x39, 0xdc, 0x9d, 0xee, 0x42, 0xdf, 0x81, 0xcd, 0x43, 0xca,
-	0xe6, 0x62, 0x87, 0x20, 0x3d, 0x37, 0xcb, 0x8b, 0xdf, 0xfa, 0x33, 0xd0, 0x1a, 0xc4, 0x1b, 0x52,
-	0xe7, 0x66, 0xde, 0xfe, 0xbf, 0x52, 0x00, 0xc7, 0xfe, 0xa0, 0x27, 0xff, 0xab, 0x40, 0x13, 0xc8,
-	0xc7, 0xa9, 0x41, 0x2b, 0xeb, 0x6e, 0x39, 0x73, 0x95, 0xeb, 0x4e, 0xa5, 0x3f, 0xff, 0xc3, 0xdf,
-	0xff, 0xf9, 0xe7, 0xe4, 0x8e, 0xfe, 0xb0, 0x76, 0xbe, 0x57, 0xfb, 0x5e, 0x46, 0xfe, 0x9b, 0x20,
-	0xf4, 0xf9, 0xec, 0x12, 0xd5, 0x5e, 0x7c, 0xa8, 0xf1, 0x53, 0xbf, 0xe4, 0xa9, 0x43, 0xdf, 0x43,
-	0x6e, 0x1a, 0x3b, 0xb4, 0xb2, 0x31, 0x2d, 0x25, 0xb6, 0xf2, 0xf4, 0x66, 0x92, 0x0c, 0xbf, 0xfe,
-	0x54, 0xec, 0xe0, 0x33, 0x74, 0xe3, 0x0e, 0xd0, 0x19, 0x64, 0x65, 0x3c, 0xd1, 0xca, 0x0e, 0xbb,
-	0x10, 0xeb, 0xeb, 0x4f, 0xbb, 0xe8, 0x8b, 0xc7, 0x76, 0xce, 0x93, 0x70, 0x54, 0x7b, 0xf1, 0x01,
-	0x5d, 0x42, 0x3e, 0x4e, 0xcb, 0x35, 0xf1, 0x5d, 0xca, 0x5a, 0xe5, 0xee, 0x95, 0x36, 0x67, 0xb8,
-	0x01, 0xbb, 0xd4, 0xab, 0xc2, 0xe1, 0xae, 0xbe, 0x73, 0x93, 0xc3, 0x97, 0x43, 0x61, 0xee, 0x65,
-	0xe2, 0xc5, 0x01, 0x85, 0xca, 0xd0, 0x77, 0xaf, 0xb8, 0x24, 0x81, 0x5d, 0x3d, 0xdf, 0x3b, 0x28,
-	0xcd, 0x8a, 0xa0, 0xcb, 0xfd, 0x74, 0x13, 0x6f, 0xbe, 0x54, 0xd4, 0xb1, 0xef, 0x10, 0x6f, 0x5c,
-	0xf5, 0xc3, 0x71, 0x6d, 0x4c, 0x3d, 0xb1, 0x8b, 0x9a, 0x14, 0x91, 0xc0, 0x8e, 0xe6, 0xff, 0xf6,
-	0xfa, 0xda, 0x75, 0x06, 0x59, 0x41, 0xf8, 0xe2, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x7b,
-	0x72, 0xd5, 0x16, 0x13, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/ml/v1/model_service.pb.go b/googleapis/cloud/ml/v1/model_service.pb.go
index 18dc81e159..6f08312d24 100644
--- a/googleapis/cloud/ml/v1/model_service.pb.go
+++ b/googleapis/cloud/ml/v1/model_service.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/model_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package ml
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/serviceconfig"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a machine learning solution.
 //
@@ -61,16 +61,17 @@ func (m *Model) Reset()         { *m = Model{} }
 func (m *Model) String() string { return proto.CompactTextString(m) }
 func (*Model) ProtoMessage()    {}
 func (*Model) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{0}
+	return fileDescriptor_39edc295a31e1620, []int{0}
 }
+
 func (m *Model) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Model.Unmarshal(m, b)
 }
 func (m *Model) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Model.Marshal(b, m, deterministic)
 }
-func (dst *Model) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Model.Merge(dst, src)
+func (m *Model) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model.Merge(m, src)
 }
 func (m *Model) XXX_Size() int {
 	return xxx_messageInfo_Model.Size(m)
@@ -169,16 +170,17 @@ func (m *Version) Reset()         { *m = Version{} }
 func (m *Version) String() string { return proto.CompactTextString(m) }
 func (*Version) ProtoMessage()    {}
 func (*Version) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{1}
+	return fileDescriptor_39edc295a31e1620, []int{1}
 }
+
 func (m *Version) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Version.Unmarshal(m, b)
 }
 func (m *Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Version.Marshal(b, m, deterministic)
 }
-func (dst *Version) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Version.Merge(dst, src)
+func (m *Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Version.Merge(m, src)
 }
 func (m *Version) XXX_Size() int {
 	return xxx_messageInfo_Version.Size(m)
@@ -261,16 +263,17 @@ func (m *ManualScaling) Reset()         { *m = ManualScaling{} }
 func (m *ManualScaling) String() string { return proto.CompactTextString(m) }
 func (*ManualScaling) ProtoMessage()    {}
 func (*ManualScaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{2}
+	return fileDescriptor_39edc295a31e1620, []int{2}
 }
+
 func (m *ManualScaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ManualScaling.Unmarshal(m, b)
 }
 func (m *ManualScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ManualScaling.Marshal(b, m, deterministic)
 }
-func (dst *ManualScaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ManualScaling.Merge(dst, src)
+func (m *ManualScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManualScaling.Merge(m, src)
 }
 func (m *ManualScaling) XXX_Size() int {
 	return xxx_messageInfo_ManualScaling.Size(m)
@@ -305,16 +308,17 @@ func (m *CreateModelRequest) Reset()         { *m = CreateModelRequest{} }
 func (m *CreateModelRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateModelRequest) ProtoMessage()    {}
 func (*CreateModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{3}
+	return fileDescriptor_39edc295a31e1620, []int{3}
 }
+
 func (m *CreateModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateModelRequest.Unmarshal(m, b)
 }
 func (m *CreateModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateModelRequest.Merge(dst, src)
+func (m *CreateModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateModelRequest.Merge(m, src)
 }
 func (m *CreateModelRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateModelRequest.Size(m)
@@ -365,16 +369,17 @@ func (m *ListModelsRequest) Reset()         { *m = ListModelsRequest{} }
 func (m *ListModelsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListModelsRequest) ProtoMessage()    {}
 func (*ListModelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{4}
+	return fileDescriptor_39edc295a31e1620, []int{4}
 }
+
 func (m *ListModelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelsRequest.Unmarshal(m, b)
 }
 func (m *ListModelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListModelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelsRequest.Merge(dst, src)
+func (m *ListModelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsRequest.Merge(m, src)
 }
 func (m *ListModelsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListModelsRequest.Size(m)
@@ -422,16 +427,17 @@ func (m *ListModelsResponse) Reset()         { *m = ListModelsResponse{} }
 func (m *ListModelsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListModelsResponse) ProtoMessage()    {}
 func (*ListModelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{5}
+	return fileDescriptor_39edc295a31e1620, []int{5}
 }
+
 func (m *ListModelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListModelsResponse.Unmarshal(m, b)
 }
 func (m *ListModelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListModelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListModelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListModelsResponse.Merge(dst, src)
+func (m *ListModelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsResponse.Merge(m, src)
 }
 func (m *ListModelsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListModelsResponse.Size(m)
@@ -471,16 +477,17 @@ func (m *GetModelRequest) Reset()         { *m = GetModelRequest{} }
 func (m *GetModelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetModelRequest) ProtoMessage()    {}
 func (*GetModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{6}
+	return fileDescriptor_39edc295a31e1620, []int{6}
 }
+
 func (m *GetModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetModelRequest.Unmarshal(m, b)
 }
 func (m *GetModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetModelRequest.Merge(dst, src)
+func (m *GetModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetModelRequest.Merge(m, src)
 }
 func (m *GetModelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetModelRequest.Size(m)
@@ -513,16 +520,17 @@ func (m *DeleteModelRequest) Reset()         { *m = DeleteModelRequest{} }
 func (m *DeleteModelRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteModelRequest) ProtoMessage()    {}
 func (*DeleteModelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{7}
+	return fileDescriptor_39edc295a31e1620, []int{7}
 }
+
 func (m *DeleteModelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteModelRequest.Unmarshal(m, b)
 }
 func (m *DeleteModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteModelRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteModelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteModelRequest.Merge(dst, src)
+func (m *DeleteModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteModelRequest.Merge(m, src)
 }
 func (m *DeleteModelRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteModelRequest.Size(m)
@@ -557,16 +565,17 @@ func (m *CreateVersionRequest) Reset()         { *m = CreateVersionRequest{} }
 func (m *CreateVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateVersionRequest) ProtoMessage()    {}
 func (*CreateVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{8}
+	return fileDescriptor_39edc295a31e1620, []int{8}
 }
+
 func (m *CreateVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateVersionRequest.Unmarshal(m, b)
 }
 func (m *CreateVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateVersionRequest.Merge(dst, src)
+func (m *CreateVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVersionRequest.Merge(m, src)
 }
 func (m *CreateVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateVersionRequest.Size(m)
@@ -617,16 +626,17 @@ func (m *ListVersionsRequest) Reset()         { *m = ListVersionsRequest{} }
 func (m *ListVersionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListVersionsRequest) ProtoMessage()    {}
 func (*ListVersionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{9}
+	return fileDescriptor_39edc295a31e1620, []int{9}
 }
+
 func (m *ListVersionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVersionsRequest.Unmarshal(m, b)
 }
 func (m *ListVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVersionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListVersionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVersionsRequest.Merge(dst, src)
+func (m *ListVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsRequest.Merge(m, src)
 }
 func (m *ListVersionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListVersionsRequest.Size(m)
@@ -674,16 +684,17 @@ func (m *ListVersionsResponse) Reset()         { *m = ListVersionsResponse{} }
 func (m *ListVersionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListVersionsResponse) ProtoMessage()    {}
 func (*ListVersionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{10}
+	return fileDescriptor_39edc295a31e1620, []int{10}
 }
+
 func (m *ListVersionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVersionsResponse.Unmarshal(m, b)
 }
 func (m *ListVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVersionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListVersionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVersionsResponse.Merge(dst, src)
+func (m *ListVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsResponse.Merge(m, src)
 }
 func (m *ListVersionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListVersionsResponse.Size(m)
@@ -723,16 +734,17 @@ func (m *GetVersionRequest) Reset()         { *m = GetVersionRequest{} }
 func (m *GetVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVersionRequest) ProtoMessage()    {}
 func (*GetVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{11}
+	return fileDescriptor_39edc295a31e1620, []int{11}
 }
+
 func (m *GetVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVersionRequest.Unmarshal(m, b)
 }
 func (m *GetVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVersionRequest.Merge(dst, src)
+func (m *GetVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVersionRequest.Merge(m, src)
 }
 func (m *GetVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVersionRequest.Size(m)
@@ -767,16 +779,17 @@ func (m *DeleteVersionRequest) Reset()         { *m = DeleteVersionRequest{} }
 func (m *DeleteVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteVersionRequest) ProtoMessage()    {}
 func (*DeleteVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{12}
+	return fileDescriptor_39edc295a31e1620, []int{12}
 }
+
 func (m *DeleteVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteVersionRequest.Unmarshal(m, b)
 }
 func (m *DeleteVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteVersionRequest.Merge(dst, src)
+func (m *DeleteVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVersionRequest.Merge(m, src)
 }
 func (m *DeleteVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteVersionRequest.Size(m)
@@ -811,16 +824,17 @@ func (m *SetDefaultVersionRequest) Reset()         { *m = SetDefaultVersionReque
 func (m *SetDefaultVersionRequest) String() string { return proto.CompactTextString(m) }
 func (*SetDefaultVersionRequest) ProtoMessage()    {}
 func (*SetDefaultVersionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_model_service_277271e04d8db06a, []int{13}
+	return fileDescriptor_39edc295a31e1620, []int{13}
 }
+
 func (m *SetDefaultVersionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetDefaultVersionRequest.Unmarshal(m, b)
 }
 func (m *SetDefaultVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetDefaultVersionRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetDefaultVersionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetDefaultVersionRequest.Merge(dst, src)
+func (m *SetDefaultVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetDefaultVersionRequest.Merge(m, src)
 }
 func (m *SetDefaultVersionRequest) XXX_Size() int {
 	return xxx_messageInfo_SetDefaultVersionRequest.Size(m)
@@ -855,6 +869,77 @@ func init() {
 	proto.RegisterType((*SetDefaultVersionRequest)(nil), "google.cloud.ml.v1.SetDefaultVersionRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/model_service.proto", fileDescriptor_39edc295a31e1620)
+}
+
+var fileDescriptor_39edc295a31e1620 = []byte{
+	// 996 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
+	0x14, 0x96, 0xdb, 0xa6, 0x4d, 0x5e, 0x36, 0xad, 0x3a, 0x14, 0xc8, 0x66, 0x29, 0x04, 0xaf, 0xda,
+	0x86, 0x00, 0xb6, 0x52, 0x8a, 0x10, 0x59, 0x01, 0xd2, 0x52, 0x69, 0x39, 0xec, 0x8a, 0xca, 0xdd,
+	0xe5, 0x80, 0x84, 0x2c, 0x6f, 0x32, 0x6b, 0x06, 0xec, 0x19, 0xe3, 0x19, 0x07, 0x58, 0x58, 0x21,
+	0xc1, 0x91, 0x23, 0xdc, 0xf9, 0xa3, 0x38, 0x71, 0xe7, 0xc6, 0x99, 0x3b, 0x9a, 0x1f, 0x4e, 0xed,
+	0xc4, 0x89, 0x0b, 0x12, 0x37, 0xcf, 0x9b, 0xef, 0xcd, 0xfb, 0xe6, 0x7d, 0xef, 0xbd, 0x31, 0x1c,
+	0x87, 0x8c, 0x85, 0x11, 0x76, 0x27, 0x11, 0xcb, 0xa6, 0x6e, 0x1c, 0xb9, 0xb3, 0x91, 0x1b, 0xb3,
+	0x29, 0x8e, 0x7c, 0x8e, 0xd3, 0x19, 0x99, 0x60, 0x27, 0x49, 0x99, 0x60, 0x08, 0x69, 0x9c, 0xa3,
+	0x70, 0x4e, 0x1c, 0x39, 0xb3, 0x51, 0xef, 0x25, 0xe3, 0x1b, 0x24, 0xc4, 0x0d, 0x28, 0x65, 0x22,
+	0x10, 0x84, 0x51, 0xae, 0x3d, 0x7a, 0xcf, 0x17, 0x77, 0x33, 0xf1, 0xb9, 0x31, 0xdf, 0x36, 0xe6,
+	0x88, 0xd1, 0x30, 0xcd, 0x28, 0x25, 0x34, 0x74, 0x59, 0x82, 0xd3, 0x92, 0xef, 0x2b, 0x06, 0xa4,
+	0x56, 0x8f, 0xb3, 0x27, 0xae, 0x20, 0x31, 0xe6, 0x22, 0x88, 0x13, 0x0d, 0xb0, 0xff, 0xb0, 0xa0,
+	0xf1, 0x40, 0xd2, 0x44, 0x08, 0xb6, 0x68, 0x10, 0xe3, 0xae, 0xd5, 0xb7, 0x06, 0x2d, 0x4f, 0x7d,
+	0xa3, 0x3e, 0xb4, 0xa7, 0x98, 0x4f, 0x52, 0x92, 0xc8, 0x43, 0xbb, 0x1b, 0x6a, 0xab, 0x68, 0x42,
+	0xe7, 0xb0, 0x37, 0xc5, 0x4f, 0x82, 0x2c, 0x12, 0xfe, 0x0c, 0xa7, 0x5c, 0xa2, 0x36, 0xfb, 0xd6,
+	0xa0, 0x7d, 0x7a, 0xcb, 0x59, 0xbe, 0xa8, 0xf3, 0x89, 0x86, 0x78, 0xbb, 0xc6, 0xc7, 0xac, 0x51,
+	0x17, 0x76, 0x52, 0x1c, 0x4a, 0xde, 0xdd, 0xad, 0xfe, 0xe6, 0xa0, 0xe5, 0xe5, 0x4b, 0x34, 0x86,
+	0x9b, 0x8c, 0x46, 0x84, 0x62, 0x3f, 0x49, 0xf1, 0x94, 0x4c, 0x64, 0x50, 0x3f, 0x62, 0x61, 0x48,
+	0x68, 0xd8, 0x6d, 0xf4, 0xad, 0x41, 0xd3, 0x7b, 0x51, 0x03, 0x2e, 0xe6, 0xfb, 0xf7, 0xf5, 0xb6,
+	0xfd, 0xf7, 0x06, 0xec, 0xe4, 0x11, 0xfe, 0xdb, 0xed, 0x0e, 0x01, 0x08, 0xf7, 0x0d, 0x59, 0x75,
+	0xb1, 0xa6, 0xd7, 0x22, 0xfc, 0x5c, 0x1b, 0xd0, 0x11, 0xec, 0x4e, 0x71, 0x12, 0xb1, 0x6f, 0x63,
+	0x4c, 0x85, 0x9f, 0xa5, 0xa4, 0xbb, 0xa5, 0xce, 0xe8, 0x5c, 0x59, 0x1f, 0xa5, 0x04, 0xdd, 0x81,
+	0xf6, 0x24, 0xc5, 0x81, 0xc0, 0xbe, 0xcc, 0xbe, 0x62, 0xdd, 0x3e, 0xed, 0xe5, 0xf9, 0xc9, 0xa5,
+	0x71, 0x1e, 0xe6, 0xd2, 0x78, 0xa0, 0xe1, 0xd2, 0x80, 0xde, 0x87, 0x4e, 0x14, 0x70, 0xe1, 0x67,
+	0xdc, 0xb8, 0x6f, 0xd7, 0xba, 0xb7, 0xa5, 0xc3, 0x23, 0xae, 0xfd, 0x4f, 0x60, 0x2f, 0xcd, 0xa8,
+	0xf4, 0x9c, 0x0b, 0xd4, 0x54, 0x24, 0x77, 0x8d, 0x39, 0xcf, 0xd0, 0x47, 0xb0, 0x1b, 0x07, 0x34,
+	0x0b, 0x22, 0x9f, 0x4f, 0x82, 0x48, 0xa6, 0xb7, 0xa5, 0x22, 0xbd, 0x5a, 0x25, 0xe4, 0x03, 0x85,
+	0xbc, 0xd4, 0x40, 0xaf, 0x13, 0x17, 0x97, 0xf6, 0x11, 0x74, 0x4a, 0xfb, 0xe8, 0x00, 0x1a, 0x94,
+	0x4d, 0x31, 0x57, 0xd9, 0x6f, 0x78, 0x7a, 0x61, 0x7f, 0x06, 0xe8, 0x43, 0x75, 0x4f, 0x55, 0x7f,
+	0x1e, 0xfe, 0x2a, 0xc3, 0x5c, 0xa0, 0x17, 0x60, 0x3b, 0x09, 0x52, 0x4c, 0x85, 0x91, 0xca, 0xac,
+	0x90, 0x0b, 0x0d, 0xd5, 0x4e, 0x4a, 0xa6, 0xf6, 0xe9, 0xcd, 0x4a, 0x56, 0xea, 0x20, 0x8d, 0xb3,
+	0x43, 0xd8, 0xbf, 0x4f, 0xb8, 0x50, 0x36, 0x5e, 0x77, 0xfa, 0x21, 0x40, 0x12, 0x84, 0xd8, 0x17,
+	0xec, 0x4b, 0x4c, 0x8d, 0x8a, 0x2d, 0x69, 0x79, 0x28, 0x0d, 0xe8, 0x16, 0xa8, 0x85, 0xcf, 0xc9,
+	0x53, 0xad, 0x5f, 0xc3, 0x6b, 0x4a, 0xc3, 0x25, 0x79, 0x8a, 0x6d, 0x06, 0xa8, 0x18, 0x88, 0x27,
+	0x8c, 0x72, 0x8c, 0x46, 0xb0, 0xad, 0x78, 0xc8, 0x4b, 0x6f, 0xae, 0x27, 0x6c, 0x80, 0xe8, 0x18,
+	0xf6, 0x28, 0xfe, 0x46, 0xf8, 0x05, 0x26, 0xba, 0x26, 0x3b, 0xd2, 0x7c, 0x91, 0xb3, 0xb1, 0x8f,
+	0x60, 0xef, 0x1e, 0x16, 0xa5, 0xac, 0x55, 0x94, 0xb7, 0x3d, 0x00, 0x74, 0x8e, 0x23, 0xbc, 0x90,
+	0xdf, 0x2a, 0x24, 0x86, 0x03, 0xad, 0x44, 0xde, 0x9f, 0x35, 0xd9, 0x7a, 0x1b, 0x76, 0xf2, 0x5a,
+	0xda, 0xa8, 0x6f, 0xf6, 0x1c, 0x6b, 0x13, 0x78, 0x4e, 0x26, 0xca, 0xd8, 0xff, 0x57, 0x4d, 0xbe,
+	0x86, 0x83, 0x72, 0x28, 0xa3, 0xca, 0x3b, 0xd0, 0x34, 0x6c, 0x72, 0x5d, 0xd6, 0x52, 0x9f, 0x83,
+	0xaf, 0xad, 0xcd, 0x09, 0xec, 0xdf, 0xc3, 0x62, 0x21, 0x8f, 0x55, 0x39, 0x1f, 0xc2, 0x81, 0x56,
+	0xe7, 0x1a, 0x58, 0x07, 0xba, 0x97, 0x58, 0x9c, 0x97, 0x66, 0xe6, 0x1a, 0xfc, 0xe9, 0x5f, 0x2d,
+	0xb8, 0xa1, 0x44, 0xbf, 0xd4, 0x4f, 0x0f, 0xfa, 0x01, 0xda, 0x85, 0x56, 0x43, 0xc7, 0x55, 0x77,
+	0x5e, 0xee, 0xc5, 0xde, 0xea, 0x9a, 0xb5, 0xdf, 0xfc, 0xf1, 0xf7, 0x3f, 0x7f, 0xd9, 0x38, 0xb1,
+	0x5f, 0x96, 0xef, 0xdc, 0x77, 0x5a, 0xb1, 0xf7, 0x92, 0x94, 0x7d, 0x81, 0x27, 0x82, 0xbb, 0xc3,
+	0x67, 0xfa, 0xed, 0xe3, 0x63, 0xdd, 0x8c, 0xe8, 0x27, 0x0b, 0xe0, 0xaa, 0x49, 0xd0, 0x51, 0xd5,
+	0xc1, 0x4b, 0xdd, 0xda, 0x3b, 0xae, 0x83, 0x69, 0x55, 0xed, 0x63, 0x45, 0xa6, 0x8f, 0x6a, 0xc8,
+	0xa0, 0x14, 0x9a, 0x79, 0xe3, 0xa0, 0xdb, 0x55, 0x67, 0x2f, 0xb4, 0xd5, 0xba, 0x04, 0x94, 0x63,
+	0xca, 0xb4, 0x17, 0x22, 0x9a, 0x80, 0xee, 0xf0, 0x19, 0xfa, 0x1e, 0xda, 0x85, 0x2e, 0xac, 0x4e,
+	0xfd, 0x72, 0x9b, 0xf6, 0x0e, 0x73, 0x5c, 0xe1, 0x79, 0x77, 0x3e, 0xce, 0x9f, 0xf7, 0x3c, 0xfa,
+	0xb0, 0x2e, 0xfa, 0xaf, 0x16, 0x74, 0x4a, 0xad, 0x8d, 0x06, 0xab, 0xb5, 0x2f, 0x57, 0x56, 0x1d,
+	0x85, 0xb1, 0xa2, 0x70, 0x66, 0xbf, 0x56, 0x9d, 0xf4, 0x2b, 0x12, 0x6e, 0xde, 0x44, 0xe3, 0x7c,
+	0x12, 0x48, 0x5a, 0x37, 0x8a, 0xfd, 0x89, 0x4e, 0x56, 0x29, 0xbd, 0x30, 0x2c, 0x7a, 0x83, 0x7a,
+	0xa0, 0x29, 0x8a, 0x91, 0xe2, 0xf7, 0x3a, 0xba, 0x3e, 0x3f, 0x55, 0xa5, 0x57, 0xdd, 0x5b, 0x5d,
+	0xa5, 0x4b, 0xdd, 0xdd, 0x5b, 0x37, 0x41, 0x16, 0x58, 0xac, 0x12, 0x6a, 0x4e, 0x41, 0x6a, 0xf6,
+	0xb3, 0x05, 0x9d, 0xd2, 0x68, 0xa8, 0xd6, 0xac, 0x6a, 0x7a, 0xd4, 0x69, 0x66, 0xd8, 0x0c, 0xff,
+	0x05, 0x9b, 0xdf, 0x2c, 0xd8, 0x5f, 0x1a, 0x3e, 0xe8, 0x8d, 0x2a, 0x46, 0xab, 0x66, 0xd4, 0xfa,
+	0x0c, 0x7d, 0xa0, 0x38, 0xbd, 0x6b, 0x9f, 0x5d, 0x9b, 0xd3, 0x98, 0xcf, 0x03, 0x8d, 0xad, 0xe1,
+	0xdd, 0x10, 0x7a, 0x13, 0x16, 0x2f, 0x85, 0x08, 0x12, 0xe2, 0xcc, 0x46, 0x77, 0xf7, 0x8b, 0x83,
+	0xf0, 0x42, 0xfe, 0x2c, 0x5d, 0x58, 0x9f, 0x9e, 0x19, 0x70, 0xc8, 0xa2, 0x80, 0x86, 0x0e, 0x4b,
+	0x43, 0x37, 0xc4, 0x54, 0xfd, 0x4a, 0xb9, 0x7a, 0x2b, 0x48, 0x08, 0x2f, 0xfe, 0xcb, 0xdf, 0x89,
+	0xa3, 0xc7, 0xdb, 0x0a, 0xf0, 0xd6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x07, 0x42, 0xf7,
+	0xeb, 0x0b, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1292,74 +1377,3 @@ var _ModelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/ml/v1/model_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/ml/v1/model_service.proto", fileDescriptor_model_service_277271e04d8db06a)
-}
-
-var fileDescriptor_model_service_277271e04d8db06a = []byte{
-	// 996 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
-	0x14, 0x96, 0xdb, 0xa6, 0x4d, 0x5e, 0x36, 0xad, 0x3a, 0x14, 0xc8, 0x66, 0x29, 0x04, 0xaf, 0xda,
-	0x86, 0x00, 0xb6, 0x52, 0x8a, 0x10, 0x59, 0x01, 0xd2, 0x52, 0x69, 0x39, 0xec, 0x8a, 0xca, 0xdd,
-	0xe5, 0x80, 0x84, 0x2c, 0x6f, 0x32, 0x6b, 0x06, 0xec, 0x19, 0xe3, 0x19, 0x07, 0x58, 0x58, 0x21,
-	0xc1, 0x91, 0x23, 0xdc, 0xf9, 0xa3, 0x38, 0x71, 0xe7, 0xc6, 0x99, 0x3b, 0x9a, 0x1f, 0x4e, 0xed,
-	0xc4, 0x89, 0x0b, 0x12, 0x37, 0xcf, 0x9b, 0xef, 0xcd, 0xfb, 0xe6, 0x7d, 0xef, 0xbd, 0x31, 0x1c,
-	0x87, 0x8c, 0x85, 0x11, 0x76, 0x27, 0x11, 0xcb, 0xa6, 0x6e, 0x1c, 0xb9, 0xb3, 0x91, 0x1b, 0xb3,
-	0x29, 0x8e, 0x7c, 0x8e, 0xd3, 0x19, 0x99, 0x60, 0x27, 0x49, 0x99, 0x60, 0x08, 0x69, 0x9c, 0xa3,
-	0x70, 0x4e, 0x1c, 0x39, 0xb3, 0x51, 0xef, 0x25, 0xe3, 0x1b, 0x24, 0xc4, 0x0d, 0x28, 0x65, 0x22,
-	0x10, 0x84, 0x51, 0xae, 0x3d, 0x7a, 0xcf, 0x17, 0x77, 0x33, 0xf1, 0xb9, 0x31, 0xdf, 0x36, 0xe6,
-	0x88, 0xd1, 0x30, 0xcd, 0x28, 0x25, 0x34, 0x74, 0x59, 0x82, 0xd3, 0x92, 0xef, 0x2b, 0x06, 0xa4,
-	0x56, 0x8f, 0xb3, 0x27, 0xae, 0x20, 0x31, 0xe6, 0x22, 0x88, 0x13, 0x0d, 0xb0, 0xff, 0xb0, 0xa0,
-	0xf1, 0x40, 0xd2, 0x44, 0x08, 0xb6, 0x68, 0x10, 0xe3, 0xae, 0xd5, 0xb7, 0x06, 0x2d, 0x4f, 0x7d,
-	0xa3, 0x3e, 0xb4, 0xa7, 0x98, 0x4f, 0x52, 0x92, 0xc8, 0x43, 0xbb, 0x1b, 0x6a, 0xab, 0x68, 0x42,
-	0xe7, 0xb0, 0x37, 0xc5, 0x4f, 0x82, 0x2c, 0x12, 0xfe, 0x0c, 0xa7, 0x5c, 0xa2, 0x36, 0xfb, 0xd6,
-	0xa0, 0x7d, 0x7a, 0xcb, 0x59, 0xbe, 0xa8, 0xf3, 0x89, 0x86, 0x78, 0xbb, 0xc6, 0xc7, 0xac, 0x51,
-	0x17, 0x76, 0x52, 0x1c, 0x4a, 0xde, 0xdd, 0xad, 0xfe, 0xe6, 0xa0, 0xe5, 0xe5, 0x4b, 0x34, 0x86,
-	0x9b, 0x8c, 0x46, 0x84, 0x62, 0x3f, 0x49, 0xf1, 0x94, 0x4c, 0x64, 0x50, 0x3f, 0x62, 0x61, 0x48,
-	0x68, 0xd8, 0x6d, 0xf4, 0xad, 0x41, 0xd3, 0x7b, 0x51, 0x03, 0x2e, 0xe6, 0xfb, 0xf7, 0xf5, 0xb6,
-	0xfd, 0xf7, 0x06, 0xec, 0xe4, 0x11, 0xfe, 0xdb, 0xed, 0x0e, 0x01, 0x08, 0xf7, 0x0d, 0x59, 0x75,
-	0xb1, 0xa6, 0xd7, 0x22, 0xfc, 0x5c, 0x1b, 0xd0, 0x11, 0xec, 0x4e, 0x71, 0x12, 0xb1, 0x6f, 0x63,
-	0x4c, 0x85, 0x9f, 0xa5, 0xa4, 0xbb, 0xa5, 0xce, 0xe8, 0x5c, 0x59, 0x1f, 0xa5, 0x04, 0xdd, 0x81,
-	0xf6, 0x24, 0xc5, 0x81, 0xc0, 0xbe, 0xcc, 0xbe, 0x62, 0xdd, 0x3e, 0xed, 0xe5, 0xf9, 0xc9, 0xa5,
-	0x71, 0x1e, 0xe6, 0xd2, 0x78, 0xa0, 0xe1, 0xd2, 0x80, 0xde, 0x87, 0x4e, 0x14, 0x70, 0xe1, 0x67,
-	0xdc, 0xb8, 0x6f, 0xd7, 0xba, 0xb7, 0xa5, 0xc3, 0x23, 0xae, 0xfd, 0x4f, 0x60, 0x2f, 0xcd, 0xa8,
-	0xf4, 0x9c, 0x0b, 0xd4, 0x54, 0x24, 0x77, 0x8d, 0x39, 0xcf, 0xd0, 0x47, 0xb0, 0x1b, 0x07, 0x34,
-	0x0b, 0x22, 0x9f, 0x4f, 0x82, 0x48, 0xa6, 0xb7, 0xa5, 0x22, 0xbd, 0x5a, 0x25, 0xe4, 0x03, 0x85,
-	0xbc, 0xd4, 0x40, 0xaf, 0x13, 0x17, 0x97, 0xf6, 0x11, 0x74, 0x4a, 0xfb, 0xe8, 0x00, 0x1a, 0x94,
-	0x4d, 0x31, 0x57, 0xd9, 0x6f, 0x78, 0x7a, 0x61, 0x7f, 0x06, 0xe8, 0x43, 0x75, 0x4f, 0x55, 0x7f,
-	0x1e, 0xfe, 0x2a, 0xc3, 0x5c, 0xa0, 0x17, 0x60, 0x3b, 0x09, 0x52, 0x4c, 0x85, 0x91, 0xca, 0xac,
-	0x90, 0x0b, 0x0d, 0xd5, 0x4e, 0x4a, 0xa6, 0xf6, 0xe9, 0xcd, 0x4a, 0x56, 0xea, 0x20, 0x8d, 0xb3,
-	0x43, 0xd8, 0xbf, 0x4f, 0xb8, 0x50, 0x36, 0x5e, 0x77, 0xfa, 0x21, 0x40, 0x12, 0x84, 0xd8, 0x17,
-	0xec, 0x4b, 0x4c, 0x8d, 0x8a, 0x2d, 0x69, 0x79, 0x28, 0x0d, 0xe8, 0x16, 0xa8, 0x85, 0xcf, 0xc9,
-	0x53, 0xad, 0x5f, 0xc3, 0x6b, 0x4a, 0xc3, 0x25, 0x79, 0x8a, 0x6d, 0x06, 0xa8, 0x18, 0x88, 0x27,
-	0x8c, 0x72, 0x8c, 0x46, 0xb0, 0xad, 0x78, 0xc8, 0x4b, 0x6f, 0xae, 0x27, 0x6c, 0x80, 0xe8, 0x18,
-	0xf6, 0x28, 0xfe, 0x46, 0xf8, 0x05, 0x26, 0xba, 0x26, 0x3b, 0xd2, 0x7c, 0x91, 0xb3, 0xb1, 0x8f,
-	0x60, 0xef, 0x1e, 0x16, 0xa5, 0xac, 0x55, 0x94, 0xb7, 0x3d, 0x00, 0x74, 0x8e, 0x23, 0xbc, 0x90,
-	0xdf, 0x2a, 0x24, 0x86, 0x03, 0xad, 0x44, 0xde, 0x9f, 0x35, 0xd9, 0x7a, 0x1b, 0x76, 0xf2, 0x5a,
-	0xda, 0xa8, 0x6f, 0xf6, 0x1c, 0x6b, 0x13, 0x78, 0x4e, 0x26, 0xca, 0xd8, 0xff, 0x57, 0x4d, 0xbe,
-	0x86, 0x83, 0x72, 0x28, 0xa3, 0xca, 0x3b, 0xd0, 0x34, 0x6c, 0x72, 0x5d, 0xd6, 0x52, 0x9f, 0x83,
-	0xaf, 0xad, 0xcd, 0x09, 0xec, 0xdf, 0xc3, 0x62, 0x21, 0x8f, 0x55, 0x39, 0x1f, 0xc2, 0x81, 0x56,
-	0xe7, 0x1a, 0x58, 0x07, 0xba, 0x97, 0x58, 0x9c, 0x97, 0x66, 0xe6, 0x1a, 0xfc, 0xe9, 0x5f, 0x2d,
-	0xb8, 0xa1, 0x44, 0xbf, 0xd4, 0x4f, 0x0f, 0xfa, 0x01, 0xda, 0x85, 0x56, 0x43, 0xc7, 0x55, 0x77,
-	0x5e, 0xee, 0xc5, 0xde, 0xea, 0x9a, 0xb5, 0xdf, 0xfc, 0xf1, 0xf7, 0x3f, 0x7f, 0xd9, 0x38, 0xb1,
-	0x5f, 0x96, 0xef, 0xdc, 0x77, 0x5a, 0xb1, 0xf7, 0x92, 0x94, 0x7d, 0x81, 0x27, 0x82, 0xbb, 0xc3,
-	0x67, 0xfa, 0xed, 0xe3, 0x63, 0xdd, 0x8c, 0xe8, 0x27, 0x0b, 0xe0, 0xaa, 0x49, 0xd0, 0x51, 0xd5,
-	0xc1, 0x4b, 0xdd, 0xda, 0x3b, 0xae, 0x83, 0x69, 0x55, 0xed, 0x63, 0x45, 0xa6, 0x8f, 0x6a, 0xc8,
-	0xa0, 0x14, 0x9a, 0x79, 0xe3, 0xa0, 0xdb, 0x55, 0x67, 0x2f, 0xb4, 0xd5, 0xba, 0x04, 0x94, 0x63,
-	0xca, 0xb4, 0x17, 0x22, 0x9a, 0x80, 0xee, 0xf0, 0x19, 0xfa, 0x1e, 0xda, 0x85, 0x2e, 0xac, 0x4e,
-	0xfd, 0x72, 0x9b, 0xf6, 0x0e, 0x73, 0x5c, 0xe1, 0x79, 0x77, 0x3e, 0xce, 0x9f, 0xf7, 0x3c, 0xfa,
-	0xb0, 0x2e, 0xfa, 0xaf, 0x16, 0x74, 0x4a, 0xad, 0x8d, 0x06, 0xab, 0xb5, 0x2f, 0x57, 0x56, 0x1d,
-	0x85, 0xb1, 0xa2, 0x70, 0x66, 0xbf, 0x56, 0x9d, 0xf4, 0x2b, 0x12, 0x6e, 0xde, 0x44, 0xe3, 0x7c,
-	0x12, 0x48, 0x5a, 0x37, 0x8a, 0xfd, 0x89, 0x4e, 0x56, 0x29, 0xbd, 0x30, 0x2c, 0x7a, 0x83, 0x7a,
-	0xa0, 0x29, 0x8a, 0x91, 0xe2, 0xf7, 0x3a, 0xba, 0x3e, 0x3f, 0x55, 0xa5, 0x57, 0xdd, 0x5b, 0x5d,
-	0xa5, 0x4b, 0xdd, 0xdd, 0x5b, 0x37, 0x41, 0x16, 0x58, 0xac, 0x12, 0x6a, 0x4e, 0x41, 0x6a, 0xf6,
-	0xb3, 0x05, 0x9d, 0xd2, 0x68, 0xa8, 0xd6, 0xac, 0x6a, 0x7a, 0xd4, 0x69, 0x66, 0xd8, 0x0c, 0xff,
-	0x05, 0x9b, 0xdf, 0x2c, 0xd8, 0x5f, 0x1a, 0x3e, 0xe8, 0x8d, 0x2a, 0x46, 0xab, 0x66, 0xd4, 0xfa,
-	0x0c, 0x7d, 0xa0, 0x38, 0xbd, 0x6b, 0x9f, 0x5d, 0x9b, 0xd3, 0x98, 0xcf, 0x03, 0x8d, 0xad, 0xe1,
-	0xdd, 0x10, 0x7a, 0x13, 0x16, 0x2f, 0x85, 0x08, 0x12, 0xe2, 0xcc, 0x46, 0x77, 0xf7, 0x8b, 0x83,
-	0xf0, 0x42, 0xfe, 0x2c, 0x5d, 0x58, 0x9f, 0x9e, 0x19, 0x70, 0xc8, 0xa2, 0x80, 0x86, 0x0e, 0x4b,
-	0x43, 0x37, 0xc4, 0x54, 0xfd, 0x4a, 0xb9, 0x7a, 0x2b, 0x48, 0x08, 0x2f, 0xfe, 0xcb, 0xdf, 0x89,
-	0xa3, 0xc7, 0xdb, 0x0a, 0xf0, 0xd6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x07, 0x42, 0xf7,
-	0xeb, 0x0b, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/ml/v1/operation_metadata.pb.go b/googleapis/cloud/ml/v1/operation_metadata.pb.go
index 50a910bddb..56e47ea3fc 100644
--- a/googleapis/cloud/ml/v1/operation_metadata.pb.go
+++ b/googleapis/cloud/ml/v1/operation_metadata.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/operation_metadata.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
+package ml
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The operation type.
 type OperationMetadata_OperationType int32
@@ -40,6 +43,7 @@ var OperationMetadata_OperationType_name = map[int32]string{
 	2: "DELETE_VERSION",
 	3: "DELETE_MODEL",
 }
+
 var OperationMetadata_OperationType_value = map[string]int32{
 	"OPERATION_TYPE_UNSPECIFIED": 0,
 	"CREATE_VERSION":             1,
@@ -50,8 +54,9 @@ var OperationMetadata_OperationType_value = map[string]int32{
 func (x OperationMetadata_OperationType) String() string {
 	return proto.EnumName(OperationMetadata_OperationType_name, int32(x))
 }
+
 func (OperationMetadata_OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operation_metadata_c111b6986797fe5f, []int{0, 0}
+	return fileDescriptor_6a63a989e77eed3e, []int{0, 0}
 }
 
 // Represents the metadata of the long-running operation.
@@ -79,16 +84,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_metadata_c111b6986797fe5f, []int{0}
+	return fileDescriptor_6a63a989e77eed3e, []int{0}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -149,15 +155,15 @@ func (m *OperationMetadata) GetVersion() *Version {
 }
 
 func init() {
-	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.ml.v1.OperationMetadata")
 	proto.RegisterEnum("google.cloud.ml.v1.OperationMetadata_OperationType", OperationMetadata_OperationType_name, OperationMetadata_OperationType_value)
+	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.ml.v1.OperationMetadata")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/ml/v1/operation_metadata.proto", fileDescriptor_operation_metadata_c111b6986797fe5f)
+	proto.RegisterFile("google/cloud/ml/v1/operation_metadata.proto", fileDescriptor_6a63a989e77eed3e)
 }
 
-var fileDescriptor_operation_metadata_c111b6986797fe5f = []byte{
+var fileDescriptor_6a63a989e77eed3e = []byte{
 	// 454 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x5f, 0x6b, 0xdb, 0x30,
 	0x14, 0xc5, 0xe7, 0xb6, 0x6b, 0x1a, 0x75, 0x0d, 0x99, 0x1e, 0xb6, 0xcc, 0xfb, 0x17, 0xfa, 0x30,
diff --git a/googleapis/cloud/ml/v1/prediction_service.pb.go b/googleapis/cloud/ml/v1/prediction_service.pb.go
index 94e40b7f6f..13b160a87d 100644
--- a/googleapis/cloud/ml/v1/prediction_service.pb.go
+++ b/googleapis/cloud/ml/v1/prediction_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/prediction_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import httpbody "google.golang.org/genproto/googleapis/api/httpbody"
+package ml
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	httpbody "google.golang.org/genproto/googleapis/api/httpbody"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request for predictions to be issued against a trained model.
 //
@@ -228,16 +228,17 @@ func (m *PredictRequest) Reset()         { *m = PredictRequest{} }
 func (m *PredictRequest) String() string { return proto.CompactTextString(m) }
 func (*PredictRequest) ProtoMessage()    {}
 func (*PredictRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_prediction_service_be09b6bf3a730006, []int{0}
+	return fileDescriptor_ca7339bffd66a462, []int{0}
 }
+
 func (m *PredictRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PredictRequest.Unmarshal(m, b)
 }
 func (m *PredictRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PredictRequest.Marshal(b, m, deterministic)
 }
-func (dst *PredictRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PredictRequest.Merge(dst, src)
+func (m *PredictRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictRequest.Merge(m, src)
 }
 func (m *PredictRequest) XXX_Size() int {
 	return xxx_messageInfo_PredictRequest.Size(m)
@@ -266,6 +267,34 @@ func init() {
 	proto.RegisterType((*PredictRequest)(nil), "google.cloud.ml.v1.PredictRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/prediction_service.proto", fileDescriptor_ca7339bffd66a462)
+}
+
+var fileDescriptor_ca7339bffd66a462 = []byte{
+	// 308 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0x4f, 0x4b, 0xfb, 0x30,
+	0x18, 0xa6, 0xe3, 0xc7, 0x4f, 0x17, 0xc1, 0x43, 0x10, 0x9d, 0x45, 0x64, 0xd4, 0xcb, 0x9c, 0x90,
+	0xd0, 0xe9, 0x69, 0xe2, 0x65, 0x27, 0x6f, 0x96, 0x79, 0x10, 0xbc, 0x8c, 0xac, 0x0d, 0x59, 0x24,
+	0xcd, 0x1b, 0xdb, 0xac, 0x30, 0xc4, 0x8b, 0x37, 0xcf, 0x7e, 0x34, 0xbf, 0x82, 0x1f, 0x44, 0xd2,
+	0x04, 0x99, 0xd4, 0xdb, 0x4b, 0xde, 0xe7, 0x79, 0x9f, 0x3f, 0x41, 0x17, 0x02, 0x40, 0x28, 0x4e,
+	0x73, 0x05, 0xeb, 0x82, 0x96, 0x8a, 0x36, 0x29, 0x35, 0x15, 0x2f, 0x64, 0x6e, 0x25, 0xe8, 0x45,
+	0xcd, 0xab, 0x46, 0xe6, 0x9c, 0x98, 0x0a, 0x2c, 0x60, 0xec, 0xc1, 0xa4, 0x05, 0x93, 0x52, 0x91,
+	0x26, 0x8d, 0x4f, 0xc2, 0x01, 0x66, 0x24, 0x65, 0x5a, 0x83, 0x65, 0x8e, 0x58, 0x7b, 0x46, 0x7c,
+	0xbc, 0xb5, 0x5d, 0x59, 0x6b, 0x96, 0x50, 0x6c, 0xfc, 0x2a, 0x79, 0x40, 0xfb, 0x99, 0x17, 0x9a,
+	0xf3, 0xe7, 0x35, 0xaf, 0x2d, 0xc6, 0xe8, 0x9f, 0x66, 0x25, 0x1f, 0x44, 0xc3, 0x68, 0xd4, 0x9f,
+	0xb7, 0x33, 0x4e, 0x51, 0xdf, 0xf1, 0x16, 0x8e, 0x38, 0xe8, 0x0d, 0xa3, 0xd1, 0xde, 0xe4, 0x80,
+	0x04, 0x1b, 0xcc, 0x48, 0x72, 0x6b, 0xad, 0x99, 0x41, 0xb1, 0x99, 0xef, 0xae, 0xc2, 0x34, 0x79,
+	0x8f, 0xd0, 0xd1, 0x9d, 0x56, 0x52, 0xf3, 0xec, 0x27, 0xc8, 0xbd, 0xcf, 0x81, 0x35, 0xda, 0x09,
+	0x8f, 0x38, 0x21, 0xdd, 0x34, 0xe4, 0xb7, 0xa3, 0xf8, 0x4f, 0xa9, 0xe4, 0xfc, 0xed, 0xf3, 0xeb,
+	0xa3, 0x77, 0x96, 0x9c, 0xba, 0xb2, 0x5e, 0x9c, 0xcd, 0x1b, 0x53, 0xc1, 0x13, 0xcf, 0x6d, 0x4d,
+	0xc7, 0xe3, 0xd7, 0x69, 0xe8, 0x6f, 0x1a, 0x8d, 0x67, 0x0a, 0xc5, 0x39, 0x94, 0x1d, 0x25, 0x77,
+	0xae, 0x49, 0x67, 0x87, 0x1d, 0x83, 0x99, 0xab, 0x26, 0x8b, 0x1e, 0xaf, 0x02, 0x43, 0x80, 0x62,
+	0x5a, 0x10, 0xa8, 0x04, 0x15, 0x5c, 0xb7, 0xc5, 0x51, 0xbf, 0x62, 0x46, 0xd6, 0xdb, 0xbf, 0x76,
+	0x5d, 0xaa, 0xe5, 0xff, 0x16, 0x70, 0xf9, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x81, 0x8e, 0x25, 0xca,
+	0xd5, 0x01, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -343,31 +372,3 @@ var _OnlinePredictionService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/ml/v1/prediction_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/ml/v1/prediction_service.proto", fileDescriptor_prediction_service_be09b6bf3a730006)
-}
-
-var fileDescriptor_prediction_service_be09b6bf3a730006 = []byte{
-	// 308 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0x4f, 0x4b, 0xfb, 0x30,
-	0x18, 0xa6, 0xe3, 0xc7, 0x4f, 0x17, 0xc1, 0x43, 0x10, 0x9d, 0x45, 0x64, 0xd4, 0xcb, 0x9c, 0x90,
-	0xd0, 0xe9, 0x69, 0xe2, 0x65, 0x27, 0x6f, 0x96, 0x79, 0x10, 0xbc, 0x8c, 0xac, 0x0d, 0x59, 0x24,
-	0xcd, 0x1b, 0xdb, 0xac, 0x30, 0xc4, 0x8b, 0x37, 0xcf, 0x7e, 0x34, 0xbf, 0x82, 0x1f, 0x44, 0xd2,
-	0x04, 0x99, 0xd4, 0xdb, 0x4b, 0xde, 0xe7, 0x79, 0x9f, 0x3f, 0x41, 0x17, 0x02, 0x40, 0x28, 0x4e,
-	0x73, 0x05, 0xeb, 0x82, 0x96, 0x8a, 0x36, 0x29, 0x35, 0x15, 0x2f, 0x64, 0x6e, 0x25, 0xe8, 0x45,
-	0xcd, 0xab, 0x46, 0xe6, 0x9c, 0x98, 0x0a, 0x2c, 0x60, 0xec, 0xc1, 0xa4, 0x05, 0x93, 0x52, 0x91,
-	0x26, 0x8d, 0x4f, 0xc2, 0x01, 0x66, 0x24, 0x65, 0x5a, 0x83, 0x65, 0x8e, 0x58, 0x7b, 0x46, 0x7c,
-	0xbc, 0xb5, 0x5d, 0x59, 0x6b, 0x96, 0x50, 0x6c, 0xfc, 0x2a, 0x79, 0x40, 0xfb, 0x99, 0x17, 0x9a,
-	0xf3, 0xe7, 0x35, 0xaf, 0x2d, 0xc6, 0xe8, 0x9f, 0x66, 0x25, 0x1f, 0x44, 0xc3, 0x68, 0xd4, 0x9f,
-	0xb7, 0x33, 0x4e, 0x51, 0xdf, 0xf1, 0x16, 0x8e, 0x38, 0xe8, 0x0d, 0xa3, 0xd1, 0xde, 0xe4, 0x80,
-	0x04, 0x1b, 0xcc, 0x48, 0x72, 0x6b, 0xad, 0x99, 0x41, 0xb1, 0x99, 0xef, 0xae, 0xc2, 0x34, 0x79,
-	0x8f, 0xd0, 0xd1, 0x9d, 0x56, 0x52, 0xf3, 0xec, 0x27, 0xc8, 0xbd, 0xcf, 0x81, 0x35, 0xda, 0x09,
-	0x8f, 0x38, 0x21, 0xdd, 0x34, 0xe4, 0xb7, 0xa3, 0xf8, 0x4f, 0xa9, 0xe4, 0xfc, 0xed, 0xf3, 0xeb,
-	0xa3, 0x77, 0x96, 0x9c, 0xba, 0xb2, 0x5e, 0x9c, 0xcd, 0x1b, 0x53, 0xc1, 0x13, 0xcf, 0x6d, 0x4d,
-	0xc7, 0xe3, 0xd7, 0x69, 0xe8, 0x6f, 0x1a, 0x8d, 0x67, 0x0a, 0xc5, 0x39, 0x94, 0x1d, 0x25, 0x77,
-	0xae, 0x49, 0x67, 0x87, 0x1d, 0x83, 0x99, 0xab, 0x26, 0x8b, 0x1e, 0xaf, 0x02, 0x43, 0x80, 0x62,
-	0x5a, 0x10, 0xa8, 0x04, 0x15, 0x5c, 0xb7, 0xc5, 0x51, 0xbf, 0x62, 0x46, 0xd6, 0xdb, 0xbf, 0x76,
-	0x5d, 0xaa, 0xe5, 0xff, 0x16, 0x70, 0xf9, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x81, 0x8e, 0x25, 0xca,
-	0xd5, 0x01, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/ml/v1/project_service.pb.go b/googleapis/cloud/ml/v1/project_service.pb.go
index f517fa49bb..cac4cb813f 100644
--- a/googleapis/cloud/ml/v1/project_service.pb.go
+++ b/googleapis/cloud/ml/v1/project_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/project_service.proto
 
-package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package ml
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Requests service account information associated with a project.
 type GetConfigRequest struct {
@@ -39,16 +39,17 @@ func (m *GetConfigRequest) Reset()         { *m = GetConfigRequest{} }
 func (m *GetConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetConfigRequest) ProtoMessage()    {}
 func (*GetConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_project_service_81d7c159e503bebf, []int{0}
+	return fileDescriptor_9d9ea4142d12cde4, []int{0}
 }
+
 func (m *GetConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConfigRequest.Unmarshal(m, b)
 }
 func (m *GetConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetConfigRequest.Merge(dst, src)
+func (m *GetConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigRequest.Merge(m, src)
 }
 func (m *GetConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetConfigRequest.Size(m)
@@ -81,16 +82,17 @@ func (m *GetConfigResponse) Reset()         { *m = GetConfigResponse{} }
 func (m *GetConfigResponse) String() string { return proto.CompactTextString(m) }
 func (*GetConfigResponse) ProtoMessage()    {}
 func (*GetConfigResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_project_service_81d7c159e503bebf, []int{1}
+	return fileDescriptor_9d9ea4142d12cde4, []int{1}
 }
+
 func (m *GetConfigResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConfigResponse.Unmarshal(m, b)
 }
 func (m *GetConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetConfigResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetConfigResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetConfigResponse.Merge(dst, src)
+func (m *GetConfigResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigResponse.Merge(m, src)
 }
 func (m *GetConfigResponse) XXX_Size() int {
 	return xxx_messageInfo_GetConfigResponse.Size(m)
@@ -120,6 +122,34 @@ func init() {
 	proto.RegisterType((*GetConfigResponse)(nil), "google.cloud.ml.v1.GetConfigResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/project_service.proto", fileDescriptor_9d9ea4142d12cde4)
+}
+
+var fileDescriptor_9d9ea4142d12cde4 = []byte{
+	// 319 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xbf, 0x4a, 0x43, 0x31,
+	0x14, 0xc6, 0xb9, 0x55, 0x84, 0x66, 0xf0, 0x4f, 0x44, 0x2c, 0x45, 0xb0, 0x16, 0xb5, 0xc5, 0x21,
+	0xa1, 0x2a, 0x0e, 0x8a, 0x83, 0x75, 0x70, 0x12, 0x4a, 0xdd, 0x5c, 0x4a, 0xbc, 0x1e, 0x43, 0x24,
+	0xc9, 0x89, 0x37, 0xe9, 0x5d, 0xc4, 0x41, 0x5f, 0xc1, 0xdd, 0x97, 0xf2, 0x15, 0x7c, 0x10, 0xe9,
+	0x4d, 0x94, 0xda, 0x0e, 0x6e, 0x87, 0x73, 0x7e, 0x5f, 0xf2, 0x7d, 0xe7, 0x90, 0xae, 0x44, 0x94,
+	0x1a, 0x78, 0xae, 0x71, 0x7c, 0xcf, 0x8d, 0xe6, 0x65, 0x8f, 0xbb, 0x02, 0x1f, 0x21, 0x0f, 0x23,
+	0x0f, 0x45, 0xa9, 0x72, 0x60, 0xae, 0xc0, 0x80, 0x94, 0x46, 0x92, 0x55, 0x24, 0x33, 0x9a, 0x95,
+	0xbd, 0xe6, 0x56, 0x52, 0x0b, 0xa7, 0xb8, 0xb0, 0x16, 0x83, 0x08, 0x0a, 0xad, 0x8f, 0x8a, 0xf6,
+	0x3e, 0x59, 0xbd, 0x82, 0x70, 0x89, 0xf6, 0x41, 0xc9, 0x21, 0x3c, 0x8d, 0xc1, 0x07, 0x4a, 0xc9,
+	0xa2, 0x15, 0x06, 0x1a, 0x59, 0x2b, 0xeb, 0xd6, 0x87, 0x55, 0xdd, 0x0e, 0x64, 0x6d, 0x8a, 0xf3,
+	0x0e, 0xad, 0x07, 0xda, 0x21, 0x2b, 0xe9, 0xff, 0x91, 0xc8, 0x73, 0x1c, 0xdb, 0x90, 0x34, 0xcb,
+	0xa9, 0x7d, 0x11, 0xbb, 0xf4, 0x84, 0x6c, 0xce, 0x80, 0xa3, 0x14, 0xa0, 0x51, 0x6b, 0x65, 0xdd,
+	0x85, 0xe1, 0xc6, 0x5f, 0xc1, 0x20, 0x0e, 0x0f, 0x3f, 0x32, 0xd2, 0x48, 0xf5, 0xb5, 0xb0, 0x42,
+	0x82, 0x01, 0x1b, 0x6e, 0x22, 0x4a, 0x5f, 0x33, 0x52, 0xff, 0xf5, 0x44, 0x77, 0xd9, 0x7c, 0x76,
+	0x36, 0x1b, 0xad, 0xb9, 0xf7, 0x0f, 0x15, 0x83, 0xb5, 0x3b, 0x6f, 0x9f, 0x5f, 0xef, 0xb5, 0x1d,
+	0xba, 0x3d, 0x59, 0xf5, 0xf3, 0x64, 0x01, 0xe7, 0xc9, 0xaf, 0xe7, 0x07, 0x2f, 0xa7, 0xf2, 0x47,
+	0xd0, 0x57, 0xa4, 0x99, 0xa3, 0x99, 0x7b, 0x54, 0x38, 0xc5, 0xca, 0x5e, 0x7f, 0x3d, 0x79, 0x4f,
+	0x8e, 0x07, 0x93, 0x8d, 0x0f, 0xb2, 0xdb, 0xe3, 0x84, 0x4b, 0xd4, 0xc2, 0x4a, 0x86, 0x85, 0xe4,
+	0x12, 0x6c, 0x75, 0x0f, 0x1e, 0x47, 0xc2, 0x29, 0x3f, 0x7d, 0xee, 0x33, 0xa3, 0xef, 0x96, 0x2a,
+	0xe0, 0xe8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xa5, 0x43, 0x33, 0x0e, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -199,31 +229,3 @@ var _ProjectManagementService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/ml/v1/project_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/ml/v1/project_service.proto", fileDescriptor_project_service_81d7c159e503bebf)
-}
-
-var fileDescriptor_project_service_81d7c159e503bebf = []byte{
-	// 319 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xbf, 0x4a, 0x43, 0x31,
-	0x14, 0xc6, 0xb9, 0x55, 0x84, 0x66, 0xf0, 0x4f, 0x44, 0x2c, 0x45, 0xb0, 0x16, 0xb5, 0xc5, 0x21,
-	0xa1, 0x2a, 0x0e, 0x8a, 0x83, 0x75, 0x70, 0x12, 0x4a, 0xdd, 0x5c, 0x4a, 0xbc, 0x1e, 0x43, 0x24,
-	0xc9, 0x89, 0x37, 0xe9, 0x5d, 0xc4, 0x41, 0x5f, 0xc1, 0xdd, 0x97, 0xf2, 0x15, 0x7c, 0x10, 0xe9,
-	0x4d, 0x94, 0xda, 0x0e, 0x6e, 0x87, 0x73, 0x7e, 0x5f, 0xf2, 0x7d, 0xe7, 0x90, 0xae, 0x44, 0x94,
-	0x1a, 0x78, 0xae, 0x71, 0x7c, 0xcf, 0x8d, 0xe6, 0x65, 0x8f, 0xbb, 0x02, 0x1f, 0x21, 0x0f, 0x23,
-	0x0f, 0x45, 0xa9, 0x72, 0x60, 0xae, 0xc0, 0x80, 0x94, 0x46, 0x92, 0x55, 0x24, 0x33, 0x9a, 0x95,
-	0xbd, 0xe6, 0x56, 0x52, 0x0b, 0xa7, 0xb8, 0xb0, 0x16, 0x83, 0x08, 0x0a, 0xad, 0x8f, 0x8a, 0xf6,
-	0x3e, 0x59, 0xbd, 0x82, 0x70, 0x89, 0xf6, 0x41, 0xc9, 0x21, 0x3c, 0x8d, 0xc1, 0x07, 0x4a, 0xc9,
-	0xa2, 0x15, 0x06, 0x1a, 0x59, 0x2b, 0xeb, 0xd6, 0x87, 0x55, 0xdd, 0x0e, 0x64, 0x6d, 0x8a, 0xf3,
-	0x0e, 0xad, 0x07, 0xda, 0x21, 0x2b, 0xe9, 0xff, 0x91, 0xc8, 0x73, 0x1c, 0xdb, 0x90, 0x34, 0xcb,
-	0xa9, 0x7d, 0x11, 0xbb, 0xf4, 0x84, 0x6c, 0xce, 0x80, 0xa3, 0x14, 0xa0, 0x51, 0x6b, 0x65, 0xdd,
-	0x85, 0xe1, 0xc6, 0x5f, 0xc1, 0x20, 0x0e, 0x0f, 0x3f, 0x32, 0xd2, 0x48, 0xf5, 0xb5, 0xb0, 0x42,
-	0x82, 0x01, 0x1b, 0x6e, 0x22, 0x4a, 0x5f, 0x33, 0x52, 0xff, 0xf5, 0x44, 0x77, 0xd9, 0x7c, 0x76,
-	0x36, 0x1b, 0xad, 0xb9, 0xf7, 0x0f, 0x15, 0x83, 0xb5, 0x3b, 0x6f, 0x9f, 0x5f, 0xef, 0xb5, 0x1d,
-	0xba, 0x3d, 0x59, 0xf5, 0xf3, 0x64, 0x01, 0xe7, 0xc9, 0xaf, 0xe7, 0x07, 0x2f, 0xa7, 0xf2, 0x47,
-	0xd0, 0x57, 0xa4, 0x99, 0xa3, 0x99, 0x7b, 0x54, 0x38, 0xc5, 0xca, 0x5e, 0x7f, 0x3d, 0x79, 0x4f,
-	0x8e, 0x07, 0x93, 0x8d, 0x0f, 0xb2, 0xdb, 0xe3, 0x84, 0x4b, 0xd4, 0xc2, 0x4a, 0x86, 0x85, 0xe4,
-	0x12, 0x6c, 0x75, 0x0f, 0x1e, 0x47, 0xc2, 0x29, 0x3f, 0x7d, 0xee, 0x33, 0xa3, 0xef, 0x96, 0x2a,
-	0xe0, 0xe8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xa5, 0x43, 0x33, 0x0e, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/oslogin/common/common.pb.go b/googleapis/cloud/oslogin/common/common.pb.go
index fad4444bb0..3762be2c69 100644
--- a/googleapis/cloud/oslogin/common/common.pb.go
+++ b/googleapis/cloud/oslogin/common/common.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/common/common.proto
 
-package common // import "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The POSIX account information associated with a Google account.
 type PosixAccount struct {
@@ -49,16 +52,17 @@ func (m *PosixAccount) Reset()         { *m = PosixAccount{} }
 func (m *PosixAccount) String() string { return proto.CompactTextString(m) }
 func (*PosixAccount) ProtoMessage()    {}
 func (*PosixAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_085b2e433f956f98, []int{0}
+	return fileDescriptor_7fa58776520b3f24, []int{0}
 }
+
 func (m *PosixAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PosixAccount.Unmarshal(m, b)
 }
 func (m *PosixAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PosixAccount.Marshal(b, m, deterministic)
 }
-func (dst *PosixAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PosixAccount.Merge(dst, src)
+func (m *PosixAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PosixAccount.Merge(m, src)
 }
 func (m *PosixAccount) XXX_Size() int {
 	return xxx_messageInfo_PosixAccount.Size(m)
@@ -151,16 +155,17 @@ func (m *SshPublicKey) Reset()         { *m = SshPublicKey{} }
 func (m *SshPublicKey) String() string { return proto.CompactTextString(m) }
 func (*SshPublicKey) ProtoMessage()    {}
 func (*SshPublicKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_085b2e433f956f98, []int{1}
+	return fileDescriptor_7fa58776520b3f24, []int{1}
 }
+
 func (m *SshPublicKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SshPublicKey.Unmarshal(m, b)
 }
 func (m *SshPublicKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SshPublicKey.Marshal(b, m, deterministic)
 }
-func (dst *SshPublicKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SshPublicKey.Merge(dst, src)
+func (m *SshPublicKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SshPublicKey.Merge(m, src)
 }
 func (m *SshPublicKey) XXX_Size() int {
 	return xxx_messageInfo_SshPublicKey.Size(m)
@@ -198,10 +203,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/oslogin/common/common.proto", fileDescriptor_common_085b2e433f956f98)
+	proto.RegisterFile("google/cloud/oslogin/common/common.proto", fileDescriptor_7fa58776520b3f24)
 }
 
-var fileDescriptor_common_085b2e433f956f98 = []byte{
+var fileDescriptor_7fa58776520b3f24 = []byte{
 	// 406 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x6b, 0x14, 0x31,
 	0x14, 0xc7, 0x99, 0xae, 0x6d, 0x77, 0xe2, 0x2a, 0x12, 0x7a, 0x08, 0x5d, 0xc5, 0xa5, 0x20, 0xec,
diff --git a/googleapis/cloud/oslogin/v1/oslogin.pb.go b/googleapis/cloud/oslogin/v1/oslogin.pb.go
index 326c7b0f65..f1e0585e4c 100644
--- a/googleapis/cloud/oslogin/v1/oslogin.pb.go
+++ b/googleapis/cloud/oslogin/v1/oslogin.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1/oslogin.proto
 
-package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package oslogin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The user profile information used for logging in to a virtual machine on
 // Google Compute Engine.
@@ -48,16 +48,17 @@ func (m *LoginProfile) Reset()         { *m = LoginProfile{} }
 func (m *LoginProfile) String() string { return proto.CompactTextString(m) }
 func (*LoginProfile) ProtoMessage()    {}
 func (*LoginProfile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{0}
+	return fileDescriptor_4485a75683c132f1, []int{0}
 }
+
 func (m *LoginProfile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LoginProfile.Unmarshal(m, b)
 }
 func (m *LoginProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LoginProfile.Marshal(b, m, deterministic)
 }
-func (dst *LoginProfile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LoginProfile.Merge(dst, src)
+func (m *LoginProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoginProfile.Merge(m, src)
 }
 func (m *LoginProfile) XXX_Size() int {
 	return xxx_messageInfo_LoginProfile.Size(m)
@@ -111,16 +112,17 @@ func (m *DeletePosixAccountRequest) Reset()         { *m = DeletePosixAccountReq
 func (m *DeletePosixAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*DeletePosixAccountRequest) ProtoMessage()    {}
 func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{1}
+	return fileDescriptor_4485a75683c132f1, []int{1}
 }
+
 func (m *DeletePosixAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeletePosixAccountRequest.Unmarshal(m, b)
 }
 func (m *DeletePosixAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeletePosixAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeletePosixAccountRequest.Merge(dst, src)
+func (m *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePosixAccountRequest.Merge(m, src)
 }
 func (m *DeletePosixAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_DeletePosixAccountRequest.Size(m)
@@ -153,16 +155,17 @@ func (m *DeleteSshPublicKeyRequest) Reset()         { *m = DeleteSshPublicKeyReq
 func (m *DeleteSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSshPublicKeyRequest) ProtoMessage()    {}
 func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{2}
+	return fileDescriptor_4485a75683c132f1, []int{2}
 }
+
 func (m *DeleteSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *DeleteSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(dst, src)
+func (m *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(m, src)
 }
 func (m *DeleteSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Size(m)
@@ -193,16 +196,17 @@ func (m *GetLoginProfileRequest) Reset()         { *m = GetLoginProfileRequest{}
 func (m *GetLoginProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLoginProfileRequest) ProtoMessage()    {}
 func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{3}
+	return fileDescriptor_4485a75683c132f1, []int{3}
 }
+
 func (m *GetLoginProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLoginProfileRequest.Unmarshal(m, b)
 }
 func (m *GetLoginProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLoginProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLoginProfileRequest.Merge(dst, src)
+func (m *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLoginProfileRequest.Merge(m, src)
 }
 func (m *GetLoginProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLoginProfileRequest.Size(m)
@@ -235,16 +239,17 @@ func (m *GetSshPublicKeyRequest) Reset()         { *m = GetSshPublicKeyRequest{}
 func (m *GetSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSshPublicKeyRequest) ProtoMessage()    {}
 func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{4}
+	return fileDescriptor_4485a75683c132f1, []int{4}
 }
+
 func (m *GetSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *GetSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSshPublicKeyRequest.Merge(dst, src)
+func (m *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSshPublicKeyRequest.Merge(m, src)
 }
 func (m *GetSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Size(m)
@@ -279,16 +284,17 @@ func (m *ImportSshPublicKeyRequest) Reset()         { *m = ImportSshPublicKeyReq
 func (m *ImportSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportSshPublicKeyRequest) ProtoMessage()    {}
 func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{5}
+	return fileDescriptor_4485a75683c132f1, []int{5}
 }
+
 func (m *ImportSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *ImportSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(dst, src)
+func (m *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(m, src)
 }
 func (m *ImportSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Size(m)
@@ -333,16 +339,17 @@ func (m *ImportSshPublicKeyResponse) Reset()         { *m = ImportSshPublicKeyRe
 func (m *ImportSshPublicKeyResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportSshPublicKeyResponse) ProtoMessage()    {}
 func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{6}
+	return fileDescriptor_4485a75683c132f1, []int{6}
 }
+
 func (m *ImportSshPublicKeyResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Unmarshal(m, b)
 }
 func (m *ImportSshPublicKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(dst, src)
+func (m *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(m, src)
 }
 func (m *ImportSshPublicKeyResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Size(m)
@@ -379,16 +386,17 @@ func (m *UpdateSshPublicKeyRequest) Reset()         { *m = UpdateSshPublicKeyReq
 func (m *UpdateSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSshPublicKeyRequest) ProtoMessage()    {}
 func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_470b09e56a6f2815, []int{7}
+	return fileDescriptor_4485a75683c132f1, []int{7}
 }
+
 func (m *UpdateSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *UpdateSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(dst, src)
+func (m *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(m, src)
 }
 func (m *UpdateSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Size(m)
@@ -432,6 +440,63 @@ func init() {
 	proto.RegisterType((*UpdateSshPublicKeyRequest)(nil), "google.cloud.oslogin.v1.UpdateSshPublicKeyRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/oslogin/v1/oslogin.proto", fileDescriptor_4485a75683c132f1)
+}
+
+var fileDescriptor_4485a75683c132f1 = []byte{
+	// 774 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0x96, 0x93, 0x52, 0xe8, 0x26, 0x6d, 0xd1, 0x1e, 0xda, 0xd4, 0x6d, 0xd5, 0x60, 0x51, 0x35,
+	0x44, 0xc8, 0x56, 0x52, 0x0e, 0x25, 0x15, 0x54, 0x14, 0x4a, 0x55, 0x7e, 0xd4, 0x28, 0x15, 0x3d,
+	0xa0, 0x4a, 0xc1, 0x75, 0xb6, 0xae, 0x89, 0xed, 0x5d, 0xbc, 0x76, 0x44, 0x84, 0x7a, 0xe1, 0xc2,
+	0x85, 0x13, 0x9c, 0x38, 0x22, 0x6e, 0x5c, 0x78, 0x02, 0x78, 0x00, 0x24, 0x4e, 0x3c, 0x01, 0x12,
+	0x0f, 0x82, 0xbc, 0x5e, 0xb7, 0x4e, 0x6c, 0xa7, 0xae, 0xc4, 0x29, 0xbb, 0x9e, 0xf9, 0x66, 0xbf,
+	0xfd, 0x76, 0xbe, 0x51, 0xc0, 0xb2, 0x8e, 0xb1, 0x6e, 0x22, 0x45, 0x33, 0xb1, 0xd7, 0x51, 0x30,
+	0x35, 0xb1, 0x6e, 0xd8, 0x4a, 0xaf, 0x16, 0x2e, 0x65, 0xe2, 0x60, 0x17, 0xc3, 0xd9, 0x20, 0x4d,
+	0x66, 0x69, 0x72, 0x18, 0xeb, 0xd5, 0xc4, 0x05, 0x8e, 0x57, 0x89, 0xa1, 0xa8, 0xb6, 0x8d, 0x5d,
+	0xd5, 0x35, 0xb0, 0x4d, 0x03, 0x98, 0x58, 0x49, 0xac, 0xae, 0x61, 0xcb, 0xc2, 0xe1, 0x0f, 0xcf,
+	0x9c, 0xe7, 0x99, 0x6c, 0x77, 0xe8, 0x1d, 0x29, 0xc8, 0x22, 0x6e, 0x9f, 0x07, 0xcb, 0xc3, 0xc1,
+	0x23, 0x03, 0x99, 0x9d, 0xb6, 0xa5, 0xd2, 0x6e, 0x90, 0x21, 0xfd, 0xc9, 0x81, 0xe2, 0x13, 0xbf,
+	0x78, 0xd3, 0xc1, 0x47, 0x86, 0x89, 0x20, 0x04, 0x63, 0xb6, 0x6a, 0xa1, 0x92, 0x50, 0x16, 0x2a,
+	0x13, 0x2d, 0xb6, 0x86, 0x4d, 0x30, 0x45, 0x30, 0x35, 0x5e, 0xb7, 0x55, 0x4d, 0xc3, 0x9e, 0xed,
+	0xd2, 0x52, 0xae, 0x9c, 0xaf, 0x14, 0xea, 0x37, 0xe4, 0xc4, 0xdb, 0x71, 0x7e, 0x4d, 0x1f, 0x72,
+	0x2f, 0x40, 0xb4, 0x26, 0x49, 0x64, 0x47, 0xe1, 0x0b, 0x30, 0x4d, 0xe9, 0x71, 0x9b, 0x78, 0x87,
+	0xa6, 0xa1, 0xb5, 0xbb, 0xa8, 0x4f, 0x4b, 0x79, 0x56, 0x72, 0x4d, 0x4e, 0x11, 0x4c, 0x8e, 0xb2,
+	0x94, 0xf7, 0xe8, 0x71, 0x93, 0x61, 0x1f, 0xa3, 0x3e, 0xdd, 0xb2, 0x5d, 0xa7, 0xdf, 0x9a, 0xa4,
+	0xd1, 0x6f, 0x70, 0x01, 0x4c, 0x50, 0x8f, 0x12, 0x64, 0x77, 0x50, 0xa7, 0x34, 0x56, 0x16, 0x2a,
+	0x57, 0x5a, 0x67, 0x1f, 0xc4, 0x2e, 0x80, 0xf1, 0x12, 0xf0, 0x2a, 0xc8, 0x77, 0x51, 0x9f, 0x5f,
+	0xdd, 0x5f, 0xc2, 0x0d, 0x70, 0xa9, 0xa7, 0x9a, 0x1e, 0x2a, 0xe5, 0xca, 0xc2, 0xb9, 0x17, 0x8e,
+	0x56, 0x6c, 0x05, 0xb8, 0x46, 0x6e, 0x4d, 0x90, 0x14, 0x30, 0xf7, 0x00, 0x99, 0xc8, 0x45, 0x03,
+	0x8a, 0xa0, 0x57, 0x1e, 0xa2, 0x6e, 0x92, 0xde, 0x67, 0x80, 0x81, 0x8a, 0x23, 0x00, 0x37, 0xc1,
+	0xcc, 0x36, 0x72, 0xa3, 0x0a, 0x9d, 0x9f, 0x9d, 0xb5, 0xf6, 0x17, 0x01, 0xcc, 0xed, 0x58, 0x04,
+	0x3b, 0x89, 0x88, 0x19, 0x30, 0x4e, 0x54, 0x07, 0xd9, 0x2e, 0xc7, 0xf0, 0x1d, 0xdc, 0x05, 0x53,
+	0x83, 0x0f, 0x7c, 0x71, 0x05, 0x8b, 0xd1, 0x07, 0x85, 0x8b, 0x00, 0x10, 0x07, 0xbf, 0x44, 0x9a,
+	0xdb, 0x36, 0x3a, 0xa5, 0x3c, 0x3b, 0x6c, 0x82, 0x7f, 0xd9, 0xe9, 0x48, 0xc7, 0x40, 0x4c, 0x22,
+	0x49, 0x09, 0xb6, 0x29, 0x82, 0x8f, 0xc0, 0x24, 0x3b, 0xa7, 0x4d, 0x02, 0x75, 0x18, 0xd9, 0x42,
+	0x7d, 0x39, 0x53, 0xb3, 0xb5, 0x8a, 0x66, 0x64, 0x27, 0x7d, 0x17, 0xc0, 0xdc, 0x33, 0xd2, 0x51,
+	0x33, 0xbf, 0xce, 0xff, 0xd7, 0x62, 0x1d, 0x14, 0x3c, 0xc6, 0x80, 0x39, 0x99, 0x89, 0x51, 0xa8,
+	0x8b, 0x61, 0xb5, 0xd0, 0xec, 0xf2, 0x43, 0xdf, 0xec, 0x4f, 0x55, 0xda, 0x6d, 0x81, 0x20, 0xdd,
+	0x5f, 0xd7, 0x7f, 0x5d, 0x06, 0x53, 0xbb, 0x94, 0x5d, 0x70, 0x0f, 0x39, 0x3d, 0x43, 0x43, 0xf0,
+	0x9d, 0x00, 0x60, 0xbc, 0x43, 0x61, 0x3d, 0x55, 0x9e, 0xd4, 0x76, 0x16, 0x67, 0x62, 0x2c, 0xb6,
+	0xfc, 0x79, 0x24, 0x2d, 0xbf, 0xfd, 0xfd, 0xf7, 0x63, 0x6e, 0xa9, 0xba, 0xe8, 0x8f, 0xc8, 0x37,
+	0xbe, 0x2c, 0x77, 0x3c, 0x8a, 0x1c, 0xaa, 0x54, 0x15, 0xfe, 0x88, 0x54, 0xa9, 0x9e, 0xc0, 0xf7,
+	0xa7, 0x4c, 0xa2, 0xd7, 0x3f, 0x97, 0x49, 0xc2, 0x4b, 0xa4, 0x32, 0xa9, 0x32, 0x26, 0xd7, 0xab,
+	0x52, 0x9c, 0xc9, 0xc0, 0x04, 0xf1, 0xe9, 0x7c, 0x10, 0xc0, 0xf4, 0x90, 0xb1, 0xa0, 0x92, 0xca,
+	0x25, 0xd9, 0x82, 0x62, 0xb6, 0x2e, 0x93, 0x56, 0x18, 0xaf, 0x6b, 0x70, 0x29, 0xc6, 0xeb, 0x44,
+	0x89, 0x36, 0x20, 0xfc, 0x14, 0x90, 0x1a, 0x10, 0x68, 0x24, 0xa9, 0x24, 0x75, 0xb2, 0xf7, 0x5e,
+	0x28, 0x18, 0xcc, 0x22, 0xd8, 0x0f, 0x01, 0xc0, 0xb8, 0x0f, 0x47, 0xbc, 0x5f, 0xea, 0x64, 0x11,
+	0x57, 0x2f, 0x84, 0x09, 0x8c, 0x2e, 0x6d, 0x30, 0xae, 0xb7, 0xa5, 0x15, 0xc6, 0x35, 0x98, 0x45,
+	0xa7, 0x32, 0x36, 0x8c, 0x18, 0xb0, 0x31, 0xe4, 0x4c, 0xf8, 0x4d, 0x00, 0x30, 0xee, 0xee, 0x11,
+	0x17, 0x48, 0x1d, 0x05, 0x17, 0x91, 0xb8, 0xc1, 0x68, 0xdf, 0xaa, 0x67, 0x90, 0x78, 0x98, 0xf1,
+	0xe6, 0x67, 0x01, 0xcc, 0x6b, 0xd8, 0x4a, 0x23, 0xb8, 0x59, 0xe4, 0x66, 0x6f, 0xfa, 0x36, 0x68,
+	0x0a, 0xcf, 0xef, 0xf2, 0x44, 0x1d, 0x9b, 0xaa, 0xad, 0xcb, 0xd8, 0xd1, 0x15, 0x1d, 0xd9, 0xcc,
+	0x24, 0x4a, 0x10, 0x52, 0x89, 0x41, 0x63, 0xff, 0x6b, 0xd6, 0xf9, 0xf2, 0x6b, 0x6e, 0x76, 0x3b,
+	0x28, 0x70, 0x9f, 0x9d, 0xc4, 0xab, 0xcb, 0xfb, 0xb5, 0x9f, 0x61, 0xe4, 0x80, 0x45, 0x0e, 0x78,
+	0xe4, 0x60, 0xbf, 0x76, 0x38, 0xce, 0xca, 0xaf, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x79,
+	0x9f, 0xd6, 0x35, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -688,60 +753,3 @@ var _OsLoginService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/oslogin/v1/oslogin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/oslogin/v1/oslogin.proto", fileDescriptor_oslogin_470b09e56a6f2815)
-}
-
-var fileDescriptor_oslogin_470b09e56a6f2815 = []byte{
-	// 774 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0x96, 0x93, 0x52, 0xe8, 0x26, 0x6d, 0xd1, 0x1e, 0xda, 0xd4, 0x6d, 0xd5, 0x60, 0x51, 0x35,
-	0x44, 0xc8, 0x56, 0x52, 0x0e, 0x25, 0x15, 0x54, 0x14, 0x4a, 0x55, 0x7e, 0xd4, 0x28, 0x15, 0x3d,
-	0xa0, 0x4a, 0xc1, 0x75, 0xb6, 0xae, 0x89, 0xed, 0x5d, 0xbc, 0x76, 0x44, 0x84, 0x7a, 0xe1, 0xc2,
-	0x85, 0x13, 0x9c, 0x38, 0x22, 0x6e, 0x5c, 0x78, 0x02, 0x78, 0x00, 0x24, 0x4e, 0x3c, 0x01, 0x12,
-	0x0f, 0x82, 0xbc, 0x5e, 0xb7, 0x4e, 0x6c, 0xa7, 0xae, 0xc4, 0x29, 0xbb, 0x9e, 0xf9, 0x66, 0xbf,
-	0xfd, 0x76, 0xbe, 0x51, 0xc0, 0xb2, 0x8e, 0xb1, 0x6e, 0x22, 0x45, 0x33, 0xb1, 0xd7, 0x51, 0x30,
-	0x35, 0xb1, 0x6e, 0xd8, 0x4a, 0xaf, 0x16, 0x2e, 0x65, 0xe2, 0x60, 0x17, 0xc3, 0xd9, 0x20, 0x4d,
-	0x66, 0x69, 0x72, 0x18, 0xeb, 0xd5, 0xc4, 0x05, 0x8e, 0x57, 0x89, 0xa1, 0xa8, 0xb6, 0x8d, 0x5d,
-	0xd5, 0x35, 0xb0, 0x4d, 0x03, 0x98, 0x58, 0x49, 0xac, 0xae, 0x61, 0xcb, 0xc2, 0xe1, 0x0f, 0xcf,
-	0x9c, 0xe7, 0x99, 0x6c, 0x77, 0xe8, 0x1d, 0x29, 0xc8, 0x22, 0x6e, 0x9f, 0x07, 0xcb, 0xc3, 0xc1,
-	0x23, 0x03, 0x99, 0x9d, 0xb6, 0xa5, 0xd2, 0x6e, 0x90, 0x21, 0xfd, 0xc9, 0x81, 0xe2, 0x13, 0xbf,
-	0x78, 0xd3, 0xc1, 0x47, 0x86, 0x89, 0x20, 0x04, 0x63, 0xb6, 0x6a, 0xa1, 0x92, 0x50, 0x16, 0x2a,
-	0x13, 0x2d, 0xb6, 0x86, 0x4d, 0x30, 0x45, 0x30, 0x35, 0x5e, 0xb7, 0x55, 0x4d, 0xc3, 0x9e, 0xed,
-	0xd2, 0x52, 0xae, 0x9c, 0xaf, 0x14, 0xea, 0x37, 0xe4, 0xc4, 0xdb, 0x71, 0x7e, 0x4d, 0x1f, 0x72,
-	0x2f, 0x40, 0xb4, 0x26, 0x49, 0x64, 0x47, 0xe1, 0x0b, 0x30, 0x4d, 0xe9, 0x71, 0x9b, 0x78, 0x87,
-	0xa6, 0xa1, 0xb5, 0xbb, 0xa8, 0x4f, 0x4b, 0x79, 0x56, 0x72, 0x4d, 0x4e, 0x11, 0x4c, 0x8e, 0xb2,
-	0x94, 0xf7, 0xe8, 0x71, 0x93, 0x61, 0x1f, 0xa3, 0x3e, 0xdd, 0xb2, 0x5d, 0xa7, 0xdf, 0x9a, 0xa4,
-	0xd1, 0x6f, 0x70, 0x01, 0x4c, 0x50, 0x8f, 0x12, 0x64, 0x77, 0x50, 0xa7, 0x34, 0x56, 0x16, 0x2a,
-	0x57, 0x5a, 0x67, 0x1f, 0xc4, 0x2e, 0x80, 0xf1, 0x12, 0xf0, 0x2a, 0xc8, 0x77, 0x51, 0x9f, 0x5f,
-	0xdd, 0x5f, 0xc2, 0x0d, 0x70, 0xa9, 0xa7, 0x9a, 0x1e, 0x2a, 0xe5, 0xca, 0xc2, 0xb9, 0x17, 0x8e,
-	0x56, 0x6c, 0x05, 0xb8, 0x46, 0x6e, 0x4d, 0x90, 0x14, 0x30, 0xf7, 0x00, 0x99, 0xc8, 0x45, 0x03,
-	0x8a, 0xa0, 0x57, 0x1e, 0xa2, 0x6e, 0x92, 0xde, 0x67, 0x80, 0x81, 0x8a, 0x23, 0x00, 0x37, 0xc1,
-	0xcc, 0x36, 0x72, 0xa3, 0x0a, 0x9d, 0x9f, 0x9d, 0xb5, 0xf6, 0x17, 0x01, 0xcc, 0xed, 0x58, 0x04,
-	0x3b, 0x89, 0x88, 0x19, 0x30, 0x4e, 0x54, 0x07, 0xd9, 0x2e, 0xc7, 0xf0, 0x1d, 0xdc, 0x05, 0x53,
-	0x83, 0x0f, 0x7c, 0x71, 0x05, 0x8b, 0xd1, 0x07, 0x85, 0x8b, 0x00, 0x10, 0x07, 0xbf, 0x44, 0x9a,
-	0xdb, 0x36, 0x3a, 0xa5, 0x3c, 0x3b, 0x6c, 0x82, 0x7f, 0xd9, 0xe9, 0x48, 0xc7, 0x40, 0x4c, 0x22,
-	0x49, 0x09, 0xb6, 0x29, 0x82, 0x8f, 0xc0, 0x24, 0x3b, 0xa7, 0x4d, 0x02, 0x75, 0x18, 0xd9, 0x42,
-	0x7d, 0x39, 0x53, 0xb3, 0xb5, 0x8a, 0x66, 0x64, 0x27, 0x7d, 0x17, 0xc0, 0xdc, 0x33, 0xd2, 0x51,
-	0x33, 0xbf, 0xce, 0xff, 0xd7, 0x62, 0x1d, 0x14, 0x3c, 0xc6, 0x80, 0x39, 0x99, 0x89, 0x51, 0xa8,
-	0x8b, 0x61, 0xb5, 0xd0, 0xec, 0xf2, 0x43, 0xdf, 0xec, 0x4f, 0x55, 0xda, 0x6d, 0x81, 0x20, 0xdd,
-	0x5f, 0xd7, 0x7f, 0x5d, 0x06, 0x53, 0xbb, 0x94, 0x5d, 0x70, 0x0f, 0x39, 0x3d, 0x43, 0x43, 0xf0,
-	0x9d, 0x00, 0x60, 0xbc, 0x43, 0x61, 0x3d, 0x55, 0x9e, 0xd4, 0x76, 0x16, 0x67, 0x62, 0x2c, 0xb6,
-	0xfc, 0x79, 0x24, 0x2d, 0xbf, 0xfd, 0xfd, 0xf7, 0x63, 0x6e, 0xa9, 0xba, 0xe8, 0x8f, 0xc8, 0x37,
-	0xbe, 0x2c, 0x77, 0x3c, 0x8a, 0x1c, 0xaa, 0x54, 0x15, 0xfe, 0x88, 0x54, 0xa9, 0x9e, 0xc0, 0xf7,
-	0xa7, 0x4c, 0xa2, 0xd7, 0x3f, 0x97, 0x49, 0xc2, 0x4b, 0xa4, 0x32, 0xa9, 0x32, 0x26, 0xd7, 0xab,
-	0x52, 0x9c, 0xc9, 0xc0, 0x04, 0xf1, 0xe9, 0x7c, 0x10, 0xc0, 0xf4, 0x90, 0xb1, 0xa0, 0x92, 0xca,
-	0x25, 0xd9, 0x82, 0x62, 0xb6, 0x2e, 0x93, 0x56, 0x18, 0xaf, 0x6b, 0x70, 0x29, 0xc6, 0xeb, 0x44,
-	0x89, 0x36, 0x20, 0xfc, 0x14, 0x90, 0x1a, 0x10, 0x68, 0x24, 0xa9, 0x24, 0x75, 0xb2, 0xf7, 0x5e,
-	0x28, 0x18, 0xcc, 0x22, 0xd8, 0x0f, 0x01, 0xc0, 0xb8, 0x0f, 0x47, 0xbc, 0x5f, 0xea, 0x64, 0x11,
-	0x57, 0x2f, 0x84, 0x09, 0x8c, 0x2e, 0x6d, 0x30, 0xae, 0xb7, 0xa5, 0x15, 0xc6, 0x35, 0x98, 0x45,
-	0xa7, 0x32, 0x36, 0x8c, 0x18, 0xb0, 0x31, 0xe4, 0x4c, 0xf8, 0x4d, 0x00, 0x30, 0xee, 0xee, 0x11,
-	0x17, 0x48, 0x1d, 0x05, 0x17, 0x91, 0xb8, 0xc1, 0x68, 0xdf, 0xaa, 0x67, 0x90, 0x78, 0x98, 0xf1,
-	0xe6, 0x67, 0x01, 0xcc, 0x6b, 0xd8, 0x4a, 0x23, 0xb8, 0x59, 0xe4, 0x66, 0x6f, 0xfa, 0x36, 0x68,
-	0x0a, 0xcf, 0xef, 0xf2, 0x44, 0x1d, 0x9b, 0xaa, 0xad, 0xcb, 0xd8, 0xd1, 0x15, 0x1d, 0xd9, 0xcc,
-	0x24, 0x4a, 0x10, 0x52, 0x89, 0x41, 0x63, 0xff, 0x6b, 0xd6, 0xf9, 0xf2, 0x6b, 0x6e, 0x76, 0x3b,
-	0x28, 0x70, 0x9f, 0x9d, 0xc4, 0xab, 0xcb, 0xfb, 0xb5, 0x9f, 0x61, 0xe4, 0x80, 0x45, 0x0e, 0x78,
-	0xe4, 0x60, 0xbf, 0x76, 0x38, 0xce, 0xca, 0xaf, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x79,
-	0x9f, 0xd6, 0x35, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go b/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
index 7a29571b76..9f7df0def5 100644
--- a/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
+++ b/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1alpha/oslogin.proto
 
-package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1alpha"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package oslogin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The user profile information used for logging in to a virtual machine on
 // Google Compute Engine.
@@ -47,16 +47,17 @@ func (m *LoginProfile) Reset()         { *m = LoginProfile{} }
 func (m *LoginProfile) String() string { return proto.CompactTextString(m) }
 func (*LoginProfile) ProtoMessage()    {}
 func (*LoginProfile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{0}
+	return fileDescriptor_9929680849ee8c07, []int{0}
 }
+
 func (m *LoginProfile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LoginProfile.Unmarshal(m, b)
 }
 func (m *LoginProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LoginProfile.Marshal(b, m, deterministic)
 }
-func (dst *LoginProfile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LoginProfile.Merge(dst, src)
+func (m *LoginProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoginProfile.Merge(m, src)
 }
 func (m *LoginProfile) XXX_Size() int {
 	return xxx_messageInfo_LoginProfile.Size(m)
@@ -110,16 +111,17 @@ func (m *DeletePosixAccountRequest) Reset()         { *m = DeletePosixAccountReq
 func (m *DeletePosixAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*DeletePosixAccountRequest) ProtoMessage()    {}
 func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{1}
+	return fileDescriptor_9929680849ee8c07, []int{1}
 }
+
 func (m *DeletePosixAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeletePosixAccountRequest.Unmarshal(m, b)
 }
 func (m *DeletePosixAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeletePosixAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeletePosixAccountRequest.Merge(dst, src)
+func (m *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePosixAccountRequest.Merge(m, src)
 }
 func (m *DeletePosixAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_DeletePosixAccountRequest.Size(m)
@@ -152,16 +154,17 @@ func (m *DeleteSshPublicKeyRequest) Reset()         { *m = DeleteSshPublicKeyReq
 func (m *DeleteSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSshPublicKeyRequest) ProtoMessage()    {}
 func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{2}
+	return fileDescriptor_9929680849ee8c07, []int{2}
 }
+
 func (m *DeleteSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *DeleteSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(dst, src)
+func (m *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(m, src)
 }
 func (m *DeleteSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Size(m)
@@ -192,16 +195,17 @@ func (m *GetLoginProfileRequest) Reset()         { *m = GetLoginProfileRequest{}
 func (m *GetLoginProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLoginProfileRequest) ProtoMessage()    {}
 func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{3}
+	return fileDescriptor_9929680849ee8c07, []int{3}
 }
+
 func (m *GetLoginProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLoginProfileRequest.Unmarshal(m, b)
 }
 func (m *GetLoginProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLoginProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLoginProfileRequest.Merge(dst, src)
+func (m *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLoginProfileRequest.Merge(m, src)
 }
 func (m *GetLoginProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLoginProfileRequest.Size(m)
@@ -234,16 +238,17 @@ func (m *GetSshPublicKeyRequest) Reset()         { *m = GetSshPublicKeyRequest{}
 func (m *GetSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSshPublicKeyRequest) ProtoMessage()    {}
 func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{4}
+	return fileDescriptor_9929680849ee8c07, []int{4}
 }
+
 func (m *GetSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *GetSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSshPublicKeyRequest.Merge(dst, src)
+func (m *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSshPublicKeyRequest.Merge(m, src)
 }
 func (m *GetSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Size(m)
@@ -278,16 +283,17 @@ func (m *ImportSshPublicKeyRequest) Reset()         { *m = ImportSshPublicKeyReq
 func (m *ImportSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportSshPublicKeyRequest) ProtoMessage()    {}
 func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{5}
+	return fileDescriptor_9929680849ee8c07, []int{5}
 }
+
 func (m *ImportSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *ImportSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(dst, src)
+func (m *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(m, src)
 }
 func (m *ImportSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Size(m)
@@ -332,16 +338,17 @@ func (m *ImportSshPublicKeyResponse) Reset()         { *m = ImportSshPublicKeyRe
 func (m *ImportSshPublicKeyResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportSshPublicKeyResponse) ProtoMessage()    {}
 func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{6}
+	return fileDescriptor_9929680849ee8c07, []int{6}
 }
+
 func (m *ImportSshPublicKeyResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Unmarshal(m, b)
 }
 func (m *ImportSshPublicKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(dst, src)
+func (m *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(m, src)
 }
 func (m *ImportSshPublicKeyResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Size(m)
@@ -378,16 +385,17 @@ func (m *UpdateSshPublicKeyRequest) Reset()         { *m = UpdateSshPublicKeyReq
 func (m *UpdateSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSshPublicKeyRequest) ProtoMessage()    {}
 func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_16f0f854d7b09dcc, []int{7}
+	return fileDescriptor_9929680849ee8c07, []int{7}
 }
+
 func (m *UpdateSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *UpdateSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(dst, src)
+func (m *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(m, src)
 }
 func (m *UpdateSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Size(m)
@@ -431,6 +439,63 @@ func init() {
 	proto.RegisterType((*UpdateSshPublicKeyRequest)(nil), "google.cloud.oslogin.v1alpha.UpdateSshPublicKeyRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/oslogin/v1alpha/oslogin.proto", fileDescriptor_9929680849ee8c07)
+}
+
+var fileDescriptor_9929680849ee8c07 = []byte{
+	// 779 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6a, 0xdb, 0x4a,
+	0x14, 0x46, 0x76, 0x6e, 0x48, 0xc6, 0x4e, 0x72, 0x99, 0x45, 0x70, 0x74, 0x73, 0xc1, 0x88, 0xd0,
+	0x3a, 0x26, 0x68, 0x88, 0x5b, 0x68, 0x9a, 0x90, 0x86, 0xfc, 0x35, 0x84, 0xb6, 0xc4, 0x38, 0x34,
+	0x8b, 0x12, 0x30, 0x13, 0x79, 0xa2, 0xa8, 0x96, 0x34, 0x53, 0x8d, 0x14, 0x6a, 0x4a, 0x36, 0x7d,
+	0x83, 0x12, 0xe8, 0xbe, 0x64, 0xd7, 0x7d, 0x17, 0x5d, 0xf4, 0x05, 0x0a, 0x5d, 0xf5, 0x15, 0x4a,
+	0x9f, 0xa3, 0x68, 0x34, 0x4a, 0x64, 0x5b, 0xb6, 0x65, 0xe8, 0xca, 0x3a, 0x73, 0xfe, 0xbe, 0xf3,
+	0x9d, 0x1f, 0x0c, 0xaa, 0x26, 0xa5, 0xa6, 0x4d, 0x90, 0x61, 0xd3, 0xa0, 0x85, 0x28, 0xb7, 0xa9,
+	0x69, 0xb9, 0xe8, 0x72, 0x15, 0xdb, 0xec, 0x02, 0xc7, 0xb2, 0xce, 0x3c, 0xea, 0x53, 0xb8, 0x18,
+	0xd9, 0xea, 0xc2, 0x56, 0x8f, 0x75, 0xd2, 0x56, 0x95, 0x5a, 0x84, 0x99, 0x85, 0xb0, 0xeb, 0x52,
+	0x1f, 0xfb, 0x16, 0x75, 0x79, 0xe4, 0xab, 0x56, 0x52, 0xf3, 0x18, 0xd4, 0x71, 0x68, 0xfc, 0x23,
+	0x2d, 0xff, 0x93, 0x96, 0x42, 0x3a, 0x0b, 0xce, 0x11, 0x71, 0x98, 0xdf, 0x91, 0xca, 0x72, 0xaf,
+	0xf2, 0xdc, 0x22, 0x76, 0xab, 0xe9, 0x60, 0xde, 0x8e, 0x2c, 0xb4, 0xdf, 0x39, 0x50, 0x7c, 0x1e,
+	0x06, 0xaf, 0x7b, 0xf4, 0xdc, 0xb2, 0x09, 0x84, 0x60, 0xc2, 0xc5, 0x0e, 0x29, 0x29, 0x65, 0xa5,
+	0x32, 0xdd, 0x10, 0xdf, 0xb0, 0x0e, 0x66, 0x19, 0xe5, 0xd6, 0xdb, 0x26, 0x36, 0x0c, 0x1a, 0xb8,
+	0x3e, 0x2f, 0xe5, 0xca, 0xf9, 0x4a, 0xa1, 0xb6, 0xac, 0xa7, 0x96, 0x28, 0xf1, 0xd5, 0x43, 0x97,
+	0xed, 0xc8, 0xa3, 0x31, 0xc3, 0x12, 0x12, 0x87, 0x04, 0xcc, 0x71, 0x7e, 0xd1, 0x64, 0xc1, 0x99,
+	0x6d, 0x19, 0xcd, 0x36, 0xe9, 0xf0, 0x52, 0x5e, 0x84, 0xdc, 0xd4, 0x87, 0xb1, 0xa6, 0x27, 0xa1,
+	0xea, 0xc7, 0xfc, 0xa2, 0x2e, 0x02, 0x3c, 0x23, 0x1d, 0xbe, 0xef, 0xfa, 0x5e, 0xa7, 0x31, 0xc3,
+	0x93, 0x6f, 0x70, 0x11, 0x4c, 0xf3, 0x80, 0x33, 0xe2, 0xb6, 0x48, 0xab, 0x34, 0x51, 0x56, 0x2a,
+	0x53, 0x8d, 0xbb, 0x07, 0xb5, 0x0d, 0x60, 0x7f, 0x08, 0xf8, 0x2f, 0xc8, 0xb7, 0x49, 0x47, 0xd6,
+	0x1f, 0x7e, 0xc2, 0x2d, 0xf0, 0xcf, 0x25, 0xb6, 0x03, 0x52, 0xca, 0x95, 0x95, 0x91, 0x55, 0x27,
+	0x23, 0x36, 0x22, 0xbf, 0xf5, 0xdc, 0x9a, 0xa2, 0x21, 0xb0, 0xb0, 0x47, 0x6c, 0xe2, 0x93, 0x2e,
+	0x5a, 0xc8, 0x9b, 0x80, 0x70, 0x3f, 0x8d, 0xf4, 0x3b, 0x87, 0xae, 0x88, 0x43, 0x1c, 0x56, 0xc0,
+	0xfc, 0x01, 0xf1, 0x93, 0x0c, 0x8d, 0xb6, 0xce, 0x1a, 0xfb, 0x46, 0x01, 0x0b, 0x87, 0x0e, 0xa3,
+	0x5e, 0xaa, 0xc7, 0x3c, 0x98, 0x64, 0xd8, 0x23, 0xae, 0x2f, 0x7d, 0xa4, 0x04, 0x8f, 0xc0, 0x6c,
+	0x77, 0x97, 0xc7, 0x67, 0xb0, 0x98, 0x6c, 0x28, 0xfc, 0x1f, 0x00, 0xe6, 0xd1, 0xd7, 0xc4, 0xf0,
+	0x9b, 0x56, 0xab, 0x94, 0x17, 0xc9, 0xa6, 0xe5, 0xcb, 0x61, 0x4b, 0x73, 0x80, 0x9a, 0x06, 0x92,
+	0x33, 0xea, 0x72, 0x02, 0x8f, 0xc0, 0x8c, 0xc8, 0xd3, 0x64, 0x11, 0x3b, 0x02, 0x6c, 0xa1, 0x56,
+	0xcd, 0x3e, 0x71, 0x8d, 0xa2, 0x9d, 0x90, 0xb4, 0x6f, 0x0a, 0x58, 0x78, 0xc9, 0x5a, 0x38, 0x73,
+	0x8b, 0xfe, 0x3e, 0x21, 0x1b, 0xa0, 0x10, 0x08, 0x04, 0x62, 0xa7, 0x05, 0x23, 0x85, 0x9a, 0x1a,
+	0x47, 0x8b, 0xd7, 0x5e, 0x7f, 0x1a, 0xae, 0xfd, 0x0b, 0xcc, 0xdb, 0x0d, 0x10, 0x99, 0x87, 0xdf,
+	0xb5, 0xeb, 0x29, 0x30, 0x7b, 0xc4, 0x45, 0x81, 0xc7, 0xc4, 0xbb, 0xb4, 0x0c, 0x02, 0x3f, 0x28,
+	0x00, 0xf6, 0x8f, 0x29, 0x7c, 0x34, 0x9c, 0xa3, 0x81, 0x83, 0xad, 0xce, 0xf7, 0x41, 0xd9, 0x0f,
+	0xcf, 0x93, 0x56, 0x7d, 0xff, 0xf3, 0xd7, 0x75, 0x6e, 0xa9, 0xaa, 0xdd, 0xde, 0xce, 0x77, 0x21,
+	0x41, 0x9b, 0x01, 0x27, 0x1e, 0x47, 0x55, 0x24, 0x7b, 0xca, 0x51, 0xf5, 0x0a, 0x7e, 0xbc, 0xc5,
+	0x94, 0x24, 0x22, 0x1b, 0xa6, 0x94, 0xc6, 0x0c, 0xc4, 0x84, 0x04, 0xa6, 0xe5, 0xea, 0xfd, 0x01,
+	0x98, 0xba, 0x4e, 0x4b, 0x08, 0xec, 0x93, 0x02, 0xe6, 0x7a, 0x36, 0x0e, 0x3e, 0x1c, 0x8e, 0x2a,
+	0x7d, 0x41, 0xd5, 0x31, 0x66, 0x50, 0x5b, 0x11, 0x30, 0xef, 0xc1, 0xa5, 0x74, 0x98, 0x57, 0x28,
+	0x39, 0xa3, 0xf0, 0x26, 0xc2, 0xd8, 0xc5, 0xdc, 0x68, 0x8c, 0x69, 0xb4, 0x65, 0x9f, 0xd1, 0x98,
+	0x49, 0x98, 0x99, 0xc9, 0x1f, 0x0a, 0x80, 0xfd, 0x9b, 0x3b, 0xaa, 0xc5, 0x03, 0x0f, 0x92, 0xba,
+	0x36, 0xbe, 0x63, 0x74, 0x24, 0xb4, 0x3d, 0x01, 0xfd, 0x89, 0xb6, 0x72, 0x07, 0x3d, 0x3a, 0x66,
+	0xb7, 0xfc, 0xae, 0x5b, 0x7d, 0xde, 0xeb, 0x3d, 0x5b, 0x0d, 0xbf, 0x2a, 0x00, 0xf6, 0x5f, 0x86,
+	0x51, 0xf5, 0x0c, 0xbc, 0x25, 0xe3, 0x70, 0xbf, 0x25, 0x0a, 0x78, 0x5c, 0xcb, 0xca, 0x7d, 0x2f,
+	0xf6, 0x9d, 0x2f, 0x0a, 0x28, 0x1b, 0xd4, 0x19, 0x0a, 0x75, 0xa7, 0x28, 0xef, 0x46, 0x3d, 0x5c,
+	0xa1, 0xba, 0xf2, 0x6a, 0x57, 0x5a, 0x9b, 0xd4, 0xc6, 0xae, 0xa9, 0x53, 0xcf, 0x44, 0x26, 0x71,
+	0xc5, 0x82, 0xa1, 0x48, 0x85, 0x99, 0xc5, 0xd3, 0xff, 0x36, 0x6d, 0x48, 0xf9, 0x73, 0x6e, 0xf1,
+	0x20, 0x8a, 0xb2, 0x2b, 0x72, 0xca, 0x14, 0xfa, 0xc9, 0xea, 0x76, 0x68, 0xf6, 0x3d, 0x56, 0x9f,
+	0x0a, 0xf5, 0xa9, 0x54, 0x9f, 0x9e, 0x44, 0x51, 0xce, 0x26, 0x45, 0xb6, 0x07, 0x7f, 0x02, 0x00,
+	0x00, 0xff, 0xff, 0xf8, 0xf2, 0xe5, 0x19, 0xa3, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -687,60 +752,3 @@ var _OsLoginService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/oslogin/v1alpha/oslogin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/oslogin/v1alpha/oslogin.proto", fileDescriptor_oslogin_16f0f854d7b09dcc)
-}
-
-var fileDescriptor_oslogin_16f0f854d7b09dcc = []byte{
-	// 779 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6a, 0xdb, 0x4a,
-	0x14, 0x46, 0x76, 0x6e, 0x48, 0xc6, 0x4e, 0x72, 0x99, 0x45, 0x70, 0x74, 0x73, 0xc1, 0x88, 0xd0,
-	0x3a, 0x26, 0x68, 0x88, 0x5b, 0x68, 0x9a, 0x90, 0x86, 0xfc, 0x35, 0x84, 0xb6, 0xc4, 0x38, 0x34,
-	0x8b, 0x12, 0x30, 0x13, 0x79, 0xa2, 0xa8, 0x96, 0x34, 0x53, 0x8d, 0x14, 0x6a, 0x4a, 0x36, 0x7d,
-	0x83, 0x12, 0xe8, 0xbe, 0x64, 0xd7, 0x7d, 0x17, 0x5d, 0xf4, 0x05, 0x0a, 0x5d, 0xf5, 0x15, 0x4a,
-	0x9f, 0xa3, 0x68, 0x34, 0x4a, 0x64, 0x5b, 0xb6, 0x65, 0xe8, 0xca, 0x3a, 0x73, 0xfe, 0xbe, 0xf3,
-	0x9d, 0x1f, 0x0c, 0xaa, 0x26, 0xa5, 0xa6, 0x4d, 0x90, 0x61, 0xd3, 0xa0, 0x85, 0x28, 0xb7, 0xa9,
-	0x69, 0xb9, 0xe8, 0x72, 0x15, 0xdb, 0xec, 0x02, 0xc7, 0xb2, 0xce, 0x3c, 0xea, 0x53, 0xb8, 0x18,
-	0xd9, 0xea, 0xc2, 0x56, 0x8f, 0x75, 0xd2, 0x56, 0x95, 0x5a, 0x84, 0x99, 0x85, 0xb0, 0xeb, 0x52,
-	0x1f, 0xfb, 0x16, 0x75, 0x79, 0xe4, 0xab, 0x56, 0x52, 0xf3, 0x18, 0xd4, 0x71, 0x68, 0xfc, 0x23,
-	0x2d, 0xff, 0x93, 0x96, 0x42, 0x3a, 0x0b, 0xce, 0x11, 0x71, 0x98, 0xdf, 0x91, 0xca, 0x72, 0xaf,
-	0xf2, 0xdc, 0x22, 0x76, 0xab, 0xe9, 0x60, 0xde, 0x8e, 0x2c, 0xb4, 0xdf, 0x39, 0x50, 0x7c, 0x1e,
-	0x06, 0xaf, 0x7b, 0xf4, 0xdc, 0xb2, 0x09, 0x84, 0x60, 0xc2, 0xc5, 0x0e, 0x29, 0x29, 0x65, 0xa5,
-	0x32, 0xdd, 0x10, 0xdf, 0xb0, 0x0e, 0x66, 0x19, 0xe5, 0xd6, 0xdb, 0x26, 0x36, 0x0c, 0x1a, 0xb8,
-	0x3e, 0x2f, 0xe5, 0xca, 0xf9, 0x4a, 0xa1, 0xb6, 0xac, 0xa7, 0x96, 0x28, 0xf1, 0xd5, 0x43, 0x97,
-	0xed, 0xc8, 0xa3, 0x31, 0xc3, 0x12, 0x12, 0x87, 0x04, 0xcc, 0x71, 0x7e, 0xd1, 0x64, 0xc1, 0x99,
-	0x6d, 0x19, 0xcd, 0x36, 0xe9, 0xf0, 0x52, 0x5e, 0x84, 0xdc, 0xd4, 0x87, 0xb1, 0xa6, 0x27, 0xa1,
-	0xea, 0xc7, 0xfc, 0xa2, 0x2e, 0x02, 0x3c, 0x23, 0x1d, 0xbe, 0xef, 0xfa, 0x5e, 0xa7, 0x31, 0xc3,
-	0x93, 0x6f, 0x70, 0x11, 0x4c, 0xf3, 0x80, 0x33, 0xe2, 0xb6, 0x48, 0xab, 0x34, 0x51, 0x56, 0x2a,
-	0x53, 0x8d, 0xbb, 0x07, 0xb5, 0x0d, 0x60, 0x7f, 0x08, 0xf8, 0x2f, 0xc8, 0xb7, 0x49, 0x47, 0xd6,
-	0x1f, 0x7e, 0xc2, 0x2d, 0xf0, 0xcf, 0x25, 0xb6, 0x03, 0x52, 0xca, 0x95, 0x95, 0x91, 0x55, 0x27,
-	0x23, 0x36, 0x22, 0xbf, 0xf5, 0xdc, 0x9a, 0xa2, 0x21, 0xb0, 0xb0, 0x47, 0x6c, 0xe2, 0x93, 0x2e,
-	0x5a, 0xc8, 0x9b, 0x80, 0x70, 0x3f, 0x8d, 0xf4, 0x3b, 0x87, 0xae, 0x88, 0x43, 0x1c, 0x56, 0xc0,
-	0xfc, 0x01, 0xf1, 0x93, 0x0c, 0x8d, 0xb6, 0xce, 0x1a, 0xfb, 0x46, 0x01, 0x0b, 0x87, 0x0e, 0xa3,
-	0x5e, 0xaa, 0xc7, 0x3c, 0x98, 0x64, 0xd8, 0x23, 0xae, 0x2f, 0x7d, 0xa4, 0x04, 0x8f, 0xc0, 0x6c,
-	0x77, 0x97, 0xc7, 0x67, 0xb0, 0x98, 0x6c, 0x28, 0xfc, 0x1f, 0x00, 0xe6, 0xd1, 0xd7, 0xc4, 0xf0,
-	0x9b, 0x56, 0xab, 0x94, 0x17, 0xc9, 0xa6, 0xe5, 0xcb, 0x61, 0x4b, 0x73, 0x80, 0x9a, 0x06, 0x92,
-	0x33, 0xea, 0x72, 0x02, 0x8f, 0xc0, 0x8c, 0xc8, 0xd3, 0x64, 0x11, 0x3b, 0x02, 0x6c, 0xa1, 0x56,
-	0xcd, 0x3e, 0x71, 0x8d, 0xa2, 0x9d, 0x90, 0xb4, 0x6f, 0x0a, 0x58, 0x78, 0xc9, 0x5a, 0x38, 0x73,
-	0x8b, 0xfe, 0x3e, 0x21, 0x1b, 0xa0, 0x10, 0x08, 0x04, 0x62, 0xa7, 0x05, 0x23, 0x85, 0x9a, 0x1a,
-	0x47, 0x8b, 0xd7, 0x5e, 0x7f, 0x1a, 0xae, 0xfd, 0x0b, 0xcc, 0xdb, 0x0d, 0x10, 0x99, 0x87, 0xdf,
-	0xb5, 0xeb, 0x29, 0x30, 0x7b, 0xc4, 0x45, 0x81, 0xc7, 0xc4, 0xbb, 0xb4, 0x0c, 0x02, 0x3f, 0x28,
-	0x00, 0xf6, 0x8f, 0x29, 0x7c, 0x34, 0x9c, 0xa3, 0x81, 0x83, 0xad, 0xce, 0xf7, 0x41, 0xd9, 0x0f,
-	0xcf, 0x93, 0x56, 0x7d, 0xff, 0xf3, 0xd7, 0x75, 0x6e, 0xa9, 0xaa, 0xdd, 0xde, 0xce, 0x77, 0x21,
-	0x41, 0x9b, 0x01, 0x27, 0x1e, 0x47, 0x55, 0x24, 0x7b, 0xca, 0x51, 0xf5, 0x0a, 0x7e, 0xbc, 0xc5,
-	0x94, 0x24, 0x22, 0x1b, 0xa6, 0x94, 0xc6, 0x0c, 0xc4, 0x84, 0x04, 0xa6, 0xe5, 0xea, 0xfd, 0x01,
-	0x98, 0xba, 0x4e, 0x4b, 0x08, 0xec, 0x93, 0x02, 0xe6, 0x7a, 0x36, 0x0e, 0x3e, 0x1c, 0x8e, 0x2a,
-	0x7d, 0x41, 0xd5, 0x31, 0x66, 0x50, 0x5b, 0x11, 0x30, 0xef, 0xc1, 0xa5, 0x74, 0x98, 0x57, 0x28,
-	0x39, 0xa3, 0xf0, 0x26, 0xc2, 0xd8, 0xc5, 0xdc, 0x68, 0x8c, 0x69, 0xb4, 0x65, 0x9f, 0xd1, 0x98,
-	0x49, 0x98, 0x99, 0xc9, 0x1f, 0x0a, 0x80, 0xfd, 0x9b, 0x3b, 0xaa, 0xc5, 0x03, 0x0f, 0x92, 0xba,
-	0x36, 0xbe, 0x63, 0x74, 0x24, 0xb4, 0x3d, 0x01, 0xfd, 0x89, 0xb6, 0x72, 0x07, 0x3d, 0x3a, 0x66,
-	0xb7, 0xfc, 0xae, 0x5b, 0x7d, 0xde, 0xeb, 0x3d, 0x5b, 0x0d, 0xbf, 0x2a, 0x00, 0xf6, 0x5f, 0x86,
-	0x51, 0xf5, 0x0c, 0xbc, 0x25, 0xe3, 0x70, 0xbf, 0x25, 0x0a, 0x78, 0x5c, 0xcb, 0xca, 0x7d, 0x2f,
-	0xf6, 0x9d, 0x2f, 0x0a, 0x28, 0x1b, 0xd4, 0x19, 0x0a, 0x75, 0xa7, 0x28, 0xef, 0x46, 0x3d, 0x5c,
-	0xa1, 0xba, 0xf2, 0x6a, 0x57, 0x5a, 0x9b, 0xd4, 0xc6, 0xae, 0xa9, 0x53, 0xcf, 0x44, 0x26, 0x71,
-	0xc5, 0x82, 0xa1, 0x48, 0x85, 0x99, 0xc5, 0xd3, 0xff, 0x36, 0x6d, 0x48, 0xf9, 0x73, 0x6e, 0xf1,
-	0x20, 0x8a, 0xb2, 0x2b, 0x72, 0xca, 0x14, 0xfa, 0xc9, 0xea, 0x76, 0x68, 0xf6, 0x3d, 0x56, 0x9f,
-	0x0a, 0xf5, 0xa9, 0x54, 0x9f, 0x9e, 0x44, 0x51, 0xce, 0x26, 0x45, 0xb6, 0x07, 0x7f, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0xf8, 0xf2, 0xe5, 0x19, 0xa3, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/oslogin/v1beta/oslogin.pb.go b/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
index 25b296cfc7..62446be1d2 100644
--- a/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
+++ b/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1beta/oslogin.proto
 
-package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1beta"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package oslogin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The user profile information used for logging in to a virtual machine on
 // Google Compute Engine.
@@ -48,16 +48,17 @@ func (m *LoginProfile) Reset()         { *m = LoginProfile{} }
 func (m *LoginProfile) String() string { return proto.CompactTextString(m) }
 func (*LoginProfile) ProtoMessage()    {}
 func (*LoginProfile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{0}
+	return fileDescriptor_c51261020b887e3b, []int{0}
 }
+
 func (m *LoginProfile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LoginProfile.Unmarshal(m, b)
 }
 func (m *LoginProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LoginProfile.Marshal(b, m, deterministic)
 }
-func (dst *LoginProfile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LoginProfile.Merge(dst, src)
+func (m *LoginProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoginProfile.Merge(m, src)
 }
 func (m *LoginProfile) XXX_Size() int {
 	return xxx_messageInfo_LoginProfile.Size(m)
@@ -111,16 +112,17 @@ func (m *DeletePosixAccountRequest) Reset()         { *m = DeletePosixAccountReq
 func (m *DeletePosixAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*DeletePosixAccountRequest) ProtoMessage()    {}
 func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{1}
+	return fileDescriptor_c51261020b887e3b, []int{1}
 }
+
 func (m *DeletePosixAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeletePosixAccountRequest.Unmarshal(m, b)
 }
 func (m *DeletePosixAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeletePosixAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeletePosixAccountRequest.Merge(dst, src)
+func (m *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePosixAccountRequest.Merge(m, src)
 }
 func (m *DeletePosixAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_DeletePosixAccountRequest.Size(m)
@@ -153,16 +155,17 @@ func (m *DeleteSshPublicKeyRequest) Reset()         { *m = DeleteSshPublicKeyReq
 func (m *DeleteSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSshPublicKeyRequest) ProtoMessage()    {}
 func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{2}
+	return fileDescriptor_c51261020b887e3b, []int{2}
 }
+
 func (m *DeleteSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *DeleteSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(dst, src)
+func (m *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(m, src)
 }
 func (m *DeleteSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSshPublicKeyRequest.Size(m)
@@ -193,16 +196,17 @@ func (m *GetLoginProfileRequest) Reset()         { *m = GetLoginProfileRequest{}
 func (m *GetLoginProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLoginProfileRequest) ProtoMessage()    {}
 func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{3}
+	return fileDescriptor_c51261020b887e3b, []int{3}
 }
+
 func (m *GetLoginProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLoginProfileRequest.Unmarshal(m, b)
 }
 func (m *GetLoginProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLoginProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLoginProfileRequest.Merge(dst, src)
+func (m *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLoginProfileRequest.Merge(m, src)
 }
 func (m *GetLoginProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLoginProfileRequest.Size(m)
@@ -235,16 +239,17 @@ func (m *GetSshPublicKeyRequest) Reset()         { *m = GetSshPublicKeyRequest{}
 func (m *GetSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSshPublicKeyRequest) ProtoMessage()    {}
 func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{4}
+	return fileDescriptor_c51261020b887e3b, []int{4}
 }
+
 func (m *GetSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *GetSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSshPublicKeyRequest.Merge(dst, src)
+func (m *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSshPublicKeyRequest.Merge(m, src)
 }
 func (m *GetSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSshPublicKeyRequest.Size(m)
@@ -279,16 +284,17 @@ func (m *ImportSshPublicKeyRequest) Reset()         { *m = ImportSshPublicKeyReq
 func (m *ImportSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportSshPublicKeyRequest) ProtoMessage()    {}
 func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{5}
+	return fileDescriptor_c51261020b887e3b, []int{5}
 }
+
 func (m *ImportSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *ImportSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(dst, src)
+func (m *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(m, src)
 }
 func (m *ImportSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportSshPublicKeyRequest.Size(m)
@@ -333,16 +339,17 @@ func (m *ImportSshPublicKeyResponse) Reset()         { *m = ImportSshPublicKeyRe
 func (m *ImportSshPublicKeyResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportSshPublicKeyResponse) ProtoMessage()    {}
 func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{6}
+	return fileDescriptor_c51261020b887e3b, []int{6}
 }
+
 func (m *ImportSshPublicKeyResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Unmarshal(m, b)
 }
 func (m *ImportSshPublicKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(dst, src)
+func (m *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(m, src)
 }
 func (m *ImportSshPublicKeyResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportSshPublicKeyResponse.Size(m)
@@ -379,16 +386,17 @@ func (m *UpdateSshPublicKeyRequest) Reset()         { *m = UpdateSshPublicKeyReq
 func (m *UpdateSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSshPublicKeyRequest) ProtoMessage()    {}
 func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_oslogin_e03b1f0aa7c54cba, []int{7}
+	return fileDescriptor_c51261020b887e3b, []int{7}
 }
+
 func (m *UpdateSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Unmarshal(m, b)
 }
 func (m *UpdateSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(dst, src)
+func (m *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(m, src)
 }
 func (m *UpdateSshPublicKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSshPublicKeyRequest.Size(m)
@@ -432,6 +440,63 @@ func init() {
 	proto.RegisterType((*UpdateSshPublicKeyRequest)(nil), "google.cloud.oslogin.v1beta.UpdateSshPublicKeyRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/oslogin/v1beta/oslogin.proto", fileDescriptor_c51261020b887e3b)
+}
+
+var fileDescriptor_c51261020b887e3b = []byte{
+	// 780 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4f, 0x4f, 0x13, 0x4f,
+	0x18, 0xc7, 0xb3, 0x2d, 0x3f, 0x02, 0x43, 0x81, 0x5f, 0xe6, 0x40, 0xca, 0x82, 0xb1, 0x2e, 0xd1,
+	0x94, 0x62, 0x76, 0x43, 0x49, 0x94, 0x80, 0x68, 0x2c, 0x22, 0x21, 0xfe, 0xa1, 0x29, 0x91, 0x83,
+	0x21, 0x69, 0xa6, 0xbb, 0xc3, 0xb2, 0x76, 0x77, 0x67, 0xdc, 0xd9, 0x25, 0x36, 0x86, 0x8b, 0x89,
+	0x67, 0x0f, 0x7a, 0x36, 0x31, 0xde, 0xbc, 0x79, 0xf2, 0xe4, 0x1b, 0xe0, 0xea, 0x5b, 0xd0, 0xf7,
+	0x61, 0x76, 0x76, 0x16, 0xb6, 0xed, 0xb6, 0x5d, 0x12, 0x4f, 0xdd, 0x99, 0xe7, 0xdf, 0x67, 0xbe,
+	0x33, 0xcf, 0x93, 0x82, 0x65, 0x93, 0x10, 0xd3, 0xc6, 0x9a, 0x6e, 0x93, 0xc0, 0xd0, 0x08, 0xb3,
+	0x89, 0x69, 0xb9, 0xda, 0xe9, 0x6a, 0x0b, 0xfb, 0x28, 0x5e, 0xaa, 0xd4, 0x23, 0x3e, 0x81, 0x0b,
+	0x91, 0xab, 0xca, 0x5d, 0xd5, 0xd8, 0x16, 0xb9, 0xca, 0x8b, 0x22, 0x0f, 0xa2, 0x96, 0x86, 0x5c,
+	0x97, 0xf8, 0xc8, 0xb7, 0x88, 0xcb, 0xa2, 0x50, 0xb9, 0x9c, 0x5a, 0x45, 0x27, 0x8e, 0x43, 0xe2,
+	0x1f, 0xe1, 0x29, 0x8a, 0x68, 0x7c, 0xd5, 0x0a, 0x8e, 0x35, 0xec, 0x50, 0xbf, 0x23, 0x8c, 0xa5,
+	0x5e, 0xe3, 0xb1, 0x85, 0x6d, 0xa3, 0xe9, 0x20, 0xd6, 0x8e, 0x3c, 0x94, 0x3f, 0x39, 0x50, 0x78,
+	0x1a, 0x26, 0xaf, 0x7b, 0xe4, 0xd8, 0xb2, 0x31, 0x84, 0x60, 0xcc, 0x45, 0x0e, 0x2e, 0x4a, 0x25,
+	0xa9, 0x3c, 0xd9, 0xe0, 0xdf, 0xb0, 0x0e, 0x66, 0x28, 0x61, 0xd6, 0x9b, 0x26, 0xd2, 0x75, 0x12,
+	0xb8, 0x3e, 0x2b, 0xe6, 0x4a, 0xf9, 0xf2, 0x54, 0x75, 0x59, 0x4d, 0x3d, 0xa1, 0xe0, 0xab, 0x87,
+	0x21, 0x0f, 0xa3, 0x88, 0xc6, 0x34, 0x4d, 0xac, 0x18, 0x34, 0xc0, 0x2c, 0x63, 0x27, 0x4d, 0x1a,
+	0xb4, 0x6c, 0x4b, 0x6f, 0xb6, 0x71, 0x87, 0x15, 0xf3, 0x3c, 0xe5, 0x3d, 0x75, 0x88, 0x68, 0x6a,
+	0x92, 0x54, 0x3d, 0x60, 0x27, 0x75, 0x1e, 0xff, 0x04, 0x77, 0xd8, 0x8e, 0xeb, 0x7b, 0x9d, 0xc6,
+	0x34, 0x4b, 0xee, 0xc1, 0x45, 0x30, 0xc9, 0x02, 0x46, 0xb1, 0x6b, 0x60, 0xa3, 0x38, 0x56, 0x92,
+	0xca, 0x13, 0x8d, 0xcb, 0x0d, 0xb9, 0x0d, 0x60, 0x7f, 0x0a, 0xf8, 0x3f, 0xc8, 0xb7, 0x71, 0x47,
+	0x1c, 0x3f, 0xfc, 0x84, 0x0f, 0xc0, 0x7f, 0xa7, 0xc8, 0x0e, 0x70, 0x31, 0x57, 0x92, 0x46, 0x1e,
+	0x3a, 0x99, 0xb1, 0x11, 0xc5, 0x6d, 0xe4, 0xd6, 0x25, 0x45, 0x03, 0xf3, 0x8f, 0xb0, 0x8d, 0x7d,
+	0xdc, 0xa5, 0x0a, 0x7e, 0x1d, 0x60, 0xe6, 0xa7, 0x69, 0x7e, 0x19, 0xd0, 0x95, 0x71, 0x48, 0xc0,
+	0x6d, 0x30, 0xb7, 0x8b, 0xfd, 0xa4, 0x42, 0xa3, 0xbd, 0xb3, 0xe6, 0xfe, 0x2a, 0x81, 0xf9, 0x3d,
+	0x87, 0x12, 0x2f, 0x35, 0x62, 0x0e, 0x8c, 0x53, 0xe4, 0x61, 0xd7, 0x17, 0x31, 0x62, 0x05, 0xf7,
+	0xc1, 0x4c, 0xf7, 0x25, 0x5f, 0x5d, 0xc1, 0x42, 0xf2, 0x42, 0xe1, 0x35, 0x00, 0xa8, 0x47, 0x5e,
+	0x61, 0xdd, 0x6f, 0x5a, 0x46, 0x31, 0xcf, 0x8b, 0x4d, 0x8a, 0x9d, 0x3d, 0x43, 0xb1, 0x81, 0x9c,
+	0x06, 0xc9, 0x28, 0x71, 0x19, 0x86, 0xcf, 0xc1, 0x34, 0xaf, 0xd3, 0xa4, 0x91, 0x3a, 0x1c, 0x76,
+	0x20, 0x4c, 0xca, 0x83, 0x6b, 0x14, 0xec, 0xc4, 0x4a, 0xf9, 0x29, 0x81, 0xf9, 0x17, 0xd4, 0x40,
+	0x99, 0x6f, 0xe8, 0xdf, 0xeb, 0xb1, 0x09, 0xa6, 0x02, 0x4e, 0xc0, 0x3b, 0x9a, 0x0b, 0x32, 0x55,
+	0x95, 0xe3, 0x6c, 0x71, 0xd3, 0xab, 0x8f, 0xc3, 0xa6, 0x7f, 0x86, 0x58, 0xbb, 0x01, 0x22, 0xf7,
+	0xf0, 0xbb, 0xfa, 0x7e, 0x02, 0xcc, 0xec, 0x33, 0x7e, 0xc0, 0x03, 0xec, 0x9d, 0x5a, 0x3a, 0x86,
+	0x1f, 0x24, 0x00, 0xfb, 0x5f, 0x29, 0xbc, 0x33, 0x54, 0xa2, 0x81, 0xcf, 0x5a, 0x9e, 0xeb, 0x23,
+	0xd9, 0x09, 0x67, 0x93, 0xb2, 0xfc, 0xee, 0xd7, 0xef, 0x8f, 0xb9, 0xa5, 0xca, 0x8d, 0x78, 0x6c,
+	0xbe, 0x0d, 0xe5, 0xd9, 0x0a, 0x18, 0xf6, 0x98, 0x56, 0xd1, 0xc4, 0x85, 0x32, 0xad, 0x72, 0x06,
+	0x3f, 0x5d, 0x10, 0x25, 0x65, 0xc8, 0x44, 0x94, 0x72, 0x2b, 0x03, 0x89, 0x54, 0x4e, 0x54, 0xae,
+	0xdc, 0x4a, 0x27, 0xea, 0x9a, 0x2a, 0x21, 0xd6, 0x67, 0x09, 0xcc, 0xf6, 0x34, 0x1b, 0x5c, 0x1b,
+	0xca, 0x94, 0xde, 0x9a, 0x72, 0xf6, 0xd7, 0xa7, 0xac, 0x70, 0xc6, 0x9b, 0x70, 0x29, 0x95, 0xf1,
+	0x4c, 0x4b, 0x3e, 0x4e, 0xf8, 0x25, 0x02, 0xec, 0x12, 0x6d, 0x24, 0x60, 0x9a, 0x62, 0xd9, 0xdf,
+	0x66, 0x2c, 0x22, 0xcc, 0x2a, 0xe2, 0xb9, 0x04, 0x60, 0x7f, 0xbf, 0x8e, 0xb8, 0xdb, 0x81, 0x53,
+	0x48, 0xbe, 0x7b, 0xe5, 0xb8, 0x68, 0x30, 0x28, 0xdb, 0x9c, 0x7b, 0x4b, 0x59, 0xb9, 0xe0, 0x8e,
+	0xe6, 0xd7, 0x85, 0xb4, 0x1b, 0x56, 0x5f, 0xf0, 0x46, 0x4f, 0x27, 0xc3, 0x1f, 0x12, 0x80, 0xfd,
+	0xd3, 0x60, 0xc4, 0x61, 0x06, 0x8e, 0x8f, 0xab, 0xc8, 0x7e, 0x9f, 0xe3, 0xaf, 0x57, 0x33, 0xca,
+	0xde, 0x4b, 0x5e, 0xfb, 0x2e, 0x81, 0xeb, 0x3a, 0x71, 0x86, 0x81, 0xd6, 0x0a, 0x62, 0x50, 0xd4,
+	0xc3, 0xb6, 0xa9, 0x4b, 0x2f, 0x6b, 0xc2, 0xd9, 0x24, 0x36, 0x72, 0x4d, 0x95, 0x78, 0xa6, 0x66,
+	0x62, 0x97, 0x37, 0x95, 0x16, 0x99, 0x10, 0xb5, 0x58, 0xea, 0x7f, 0xa4, 0x4d, 0xb1, 0xfc, 0x96,
+	0x5b, 0xd8, 0x8d, 0x92, 0x6c, 0xf3, 0x8a, 0xa2, 0x82, 0x7a, 0xb8, 0x5a, 0xc3, 0x3e, 0x3a, 0x8f,
+	0xad, 0x47, 0xdc, 0x7a, 0x24, 0xac, 0x47, 0x87, 0x3c, 0x47, 0x6b, 0x9c, 0x97, 0x5a, 0xfb, 0x1b,
+	0x00, 0x00, 0xff, 0xff, 0xc7, 0x96, 0xd9, 0xc2, 0x8d, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -688,60 +753,3 @@ var _OsLoginService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/oslogin/v1beta/oslogin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/oslogin/v1beta/oslogin.proto", fileDescriptor_oslogin_e03b1f0aa7c54cba)
-}
-
-var fileDescriptor_oslogin_e03b1f0aa7c54cba = []byte{
-	// 780 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4f, 0x4f, 0x13, 0x4f,
-	0x18, 0xc7, 0xb3, 0x2d, 0x3f, 0x02, 0x43, 0x81, 0x5f, 0xe6, 0x40, 0xca, 0x82, 0xb1, 0x2e, 0xd1,
-	0x94, 0x62, 0x76, 0x43, 0x49, 0x94, 0x80, 0x68, 0x2c, 0x22, 0x21, 0xfe, 0xa1, 0x29, 0x91, 0x83,
-	0x21, 0x69, 0xa6, 0xbb, 0xc3, 0xb2, 0x76, 0x77, 0x67, 0xdc, 0xd9, 0x25, 0x36, 0x86, 0x8b, 0x89,
-	0x67, 0x0f, 0x7a, 0x36, 0x31, 0xde, 0xbc, 0x79, 0xf2, 0xe4, 0x1b, 0xe0, 0xea, 0x5b, 0xd0, 0xf7,
-	0x61, 0x76, 0x76, 0x16, 0xb6, 0xed, 0xb6, 0x5d, 0x12, 0x4f, 0xdd, 0x99, 0xe7, 0xdf, 0x67, 0xbe,
-	0x33, 0xcf, 0x93, 0x82, 0x65, 0x93, 0x10, 0xd3, 0xc6, 0x9a, 0x6e, 0x93, 0xc0, 0xd0, 0x08, 0xb3,
-	0x89, 0x69, 0xb9, 0xda, 0xe9, 0x6a, 0x0b, 0xfb, 0x28, 0x5e, 0xaa, 0xd4, 0x23, 0x3e, 0x81, 0x0b,
-	0x91, 0xab, 0xca, 0x5d, 0xd5, 0xd8, 0x16, 0xb9, 0xca, 0x8b, 0x22, 0x0f, 0xa2, 0x96, 0x86, 0x5c,
-	0x97, 0xf8, 0xc8, 0xb7, 0x88, 0xcb, 0xa2, 0x50, 0xb9, 0x9c, 0x5a, 0x45, 0x27, 0x8e, 0x43, 0xe2,
-	0x1f, 0xe1, 0x29, 0x8a, 0x68, 0x7c, 0xd5, 0x0a, 0x8e, 0x35, 0xec, 0x50, 0xbf, 0x23, 0x8c, 0xa5,
-	0x5e, 0xe3, 0xb1, 0x85, 0x6d, 0xa3, 0xe9, 0x20, 0xd6, 0x8e, 0x3c, 0x94, 0x3f, 0x39, 0x50, 0x78,
-	0x1a, 0x26, 0xaf, 0x7b, 0xe4, 0xd8, 0xb2, 0x31, 0x84, 0x60, 0xcc, 0x45, 0x0e, 0x2e, 0x4a, 0x25,
-	0xa9, 0x3c, 0xd9, 0xe0, 0xdf, 0xb0, 0x0e, 0x66, 0x28, 0x61, 0xd6, 0x9b, 0x26, 0xd2, 0x75, 0x12,
-	0xb8, 0x3e, 0x2b, 0xe6, 0x4a, 0xf9, 0xf2, 0x54, 0x75, 0x59, 0x4d, 0x3d, 0xa1, 0xe0, 0xab, 0x87,
-	0x21, 0x0f, 0xa3, 0x88, 0xc6, 0x34, 0x4d, 0xac, 0x18, 0x34, 0xc0, 0x2c, 0x63, 0x27, 0x4d, 0x1a,
-	0xb4, 0x6c, 0x4b, 0x6f, 0xb6, 0x71, 0x87, 0x15, 0xf3, 0x3c, 0xe5, 0x3d, 0x75, 0x88, 0x68, 0x6a,
-	0x92, 0x54, 0x3d, 0x60, 0x27, 0x75, 0x1e, 0xff, 0x04, 0x77, 0xd8, 0x8e, 0xeb, 0x7b, 0x9d, 0xc6,
-	0x34, 0x4b, 0xee, 0xc1, 0x45, 0x30, 0xc9, 0x02, 0x46, 0xb1, 0x6b, 0x60, 0xa3, 0x38, 0x56, 0x92,
-	0xca, 0x13, 0x8d, 0xcb, 0x0d, 0xb9, 0x0d, 0x60, 0x7f, 0x0a, 0xf8, 0x3f, 0xc8, 0xb7, 0x71, 0x47,
-	0x1c, 0x3f, 0xfc, 0x84, 0x0f, 0xc0, 0x7f, 0xa7, 0xc8, 0x0e, 0x70, 0x31, 0x57, 0x92, 0x46, 0x1e,
-	0x3a, 0x99, 0xb1, 0x11, 0xc5, 0x6d, 0xe4, 0xd6, 0x25, 0x45, 0x03, 0xf3, 0x8f, 0xb0, 0x8d, 0x7d,
-	0xdc, 0xa5, 0x0a, 0x7e, 0x1d, 0x60, 0xe6, 0xa7, 0x69, 0x7e, 0x19, 0xd0, 0x95, 0x71, 0x48, 0xc0,
-	0x6d, 0x30, 0xb7, 0x8b, 0xfd, 0xa4, 0x42, 0xa3, 0xbd, 0xb3, 0xe6, 0xfe, 0x2a, 0x81, 0xf9, 0x3d,
-	0x87, 0x12, 0x2f, 0x35, 0x62, 0x0e, 0x8c, 0x53, 0xe4, 0x61, 0xd7, 0x17, 0x31, 0x62, 0x05, 0xf7,
-	0xc1, 0x4c, 0xf7, 0x25, 0x5f, 0x5d, 0xc1, 0x42, 0xf2, 0x42, 0xe1, 0x35, 0x00, 0xa8, 0x47, 0x5e,
-	0x61, 0xdd, 0x6f, 0x5a, 0x46, 0x31, 0xcf, 0x8b, 0x4d, 0x8a, 0x9d, 0x3d, 0x43, 0xb1, 0x81, 0x9c,
-	0x06, 0xc9, 0x28, 0x71, 0x19, 0x86, 0xcf, 0xc1, 0x34, 0xaf, 0xd3, 0xa4, 0x91, 0x3a, 0x1c, 0x76,
-	0x20, 0x4c, 0xca, 0x83, 0x6b, 0x14, 0xec, 0xc4, 0x4a, 0xf9, 0x29, 0x81, 0xf9, 0x17, 0xd4, 0x40,
-	0x99, 0x6f, 0xe8, 0xdf, 0xeb, 0xb1, 0x09, 0xa6, 0x02, 0x4e, 0xc0, 0x3b, 0x9a, 0x0b, 0x32, 0x55,
-	0x95, 0xe3, 0x6c, 0x71, 0xd3, 0xab, 0x8f, 0xc3, 0xa6, 0x7f, 0x86, 0x58, 0xbb, 0x01, 0x22, 0xf7,
-	0xf0, 0xbb, 0xfa, 0x7e, 0x02, 0xcc, 0xec, 0x33, 0x7e, 0xc0, 0x03, 0xec, 0x9d, 0x5a, 0x3a, 0x86,
-	0x1f, 0x24, 0x00, 0xfb, 0x5f, 0x29, 0xbc, 0x33, 0x54, 0xa2, 0x81, 0xcf, 0x5a, 0x9e, 0xeb, 0x23,
-	0xd9, 0x09, 0x67, 0x93, 0xb2, 0xfc, 0xee, 0xd7, 0xef, 0x8f, 0xb9, 0xa5, 0xca, 0x8d, 0x78, 0x6c,
-	0xbe, 0x0d, 0xe5, 0xd9, 0x0a, 0x18, 0xf6, 0x98, 0x56, 0xd1, 0xc4, 0x85, 0x32, 0xad, 0x72, 0x06,
-	0x3f, 0x5d, 0x10, 0x25, 0x65, 0xc8, 0x44, 0x94, 0x72, 0x2b, 0x03, 0x89, 0x54, 0x4e, 0x54, 0xae,
-	0xdc, 0x4a, 0x27, 0xea, 0x9a, 0x2a, 0x21, 0xd6, 0x67, 0x09, 0xcc, 0xf6, 0x34, 0x1b, 0x5c, 0x1b,
-	0xca, 0x94, 0xde, 0x9a, 0x72, 0xf6, 0xd7, 0xa7, 0xac, 0x70, 0xc6, 0x9b, 0x70, 0x29, 0x95, 0xf1,
-	0x4c, 0x4b, 0x3e, 0x4e, 0xf8, 0x25, 0x02, 0xec, 0x12, 0x6d, 0x24, 0x60, 0x9a, 0x62, 0xd9, 0xdf,
-	0x66, 0x2c, 0x22, 0xcc, 0x2a, 0xe2, 0xb9, 0x04, 0x60, 0x7f, 0xbf, 0x8e, 0xb8, 0xdb, 0x81, 0x53,
-	0x48, 0xbe, 0x7b, 0xe5, 0xb8, 0x68, 0x30, 0x28, 0xdb, 0x9c, 0x7b, 0x4b, 0x59, 0xb9, 0xe0, 0x8e,
-	0xe6, 0xd7, 0x85, 0xb4, 0x1b, 0x56, 0x5f, 0xf0, 0x46, 0x4f, 0x27, 0xc3, 0x1f, 0x12, 0x80, 0xfd,
-	0xd3, 0x60, 0xc4, 0x61, 0x06, 0x8e, 0x8f, 0xab, 0xc8, 0x7e, 0x9f, 0xe3, 0xaf, 0x57, 0x33, 0xca,
-	0xde, 0x4b, 0x5e, 0xfb, 0x2e, 0x81, 0xeb, 0x3a, 0x71, 0x86, 0x81, 0xd6, 0x0a, 0x62, 0x50, 0xd4,
-	0xc3, 0xb6, 0xa9, 0x4b, 0x2f, 0x6b, 0xc2, 0xd9, 0x24, 0x36, 0x72, 0x4d, 0x95, 0x78, 0xa6, 0x66,
-	0x62, 0x97, 0x37, 0x95, 0x16, 0x99, 0x10, 0xb5, 0x58, 0xea, 0x7f, 0xa4, 0x4d, 0xb1, 0xfc, 0x96,
-	0x5b, 0xd8, 0x8d, 0x92, 0x6c, 0xf3, 0x8a, 0xa2, 0x82, 0x7a, 0xb8, 0x5a, 0xc3, 0x3e, 0x3a, 0x8f,
-	0xad, 0x47, 0xdc, 0x7a, 0x24, 0xac, 0x47, 0x87, 0x3c, 0x47, 0x6b, 0x9c, 0x97, 0x5a, 0xfb, 0x1b,
-	0x00, 0x00, 0xff, 0xff, 0xc7, 0x96, 0xd9, 0xc2, 0x8d, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/phishingprotection/v1beta1/phishingprotection.pb.go b/googleapis/cloud/phishingprotection/v1beta1/phishingprotection.pb.go
index 3009348aa4..bf10df3ce0 100644
--- a/googleapis/cloud/phishingprotection/v1beta1/phishingprotection.pb.go
+++ b/googleapis/cloud/phishingprotection/v1beta1/phishingprotection.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/phishingprotection/v1beta1/phishingprotection.proto
 
-package phishingprotection // import "google.golang.org/genproto/googleapis/cloud/phishingprotection/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package phishingprotection
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The ReportPhishing request message.
 type ReportPhishingRequest struct {
@@ -40,16 +40,17 @@ func (m *ReportPhishingRequest) Reset()         { *m = ReportPhishingRequest{} }
 func (m *ReportPhishingRequest) String() string { return proto.CompactTextString(m) }
 func (*ReportPhishingRequest) ProtoMessage()    {}
 func (*ReportPhishingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_phishingprotection_3f3199ea7ffa4ad5, []int{0}
+	return fileDescriptor_fa2769de3b7011f5, []int{0}
 }
+
 func (m *ReportPhishingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportPhishingRequest.Unmarshal(m, b)
 }
 func (m *ReportPhishingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportPhishingRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReportPhishingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportPhishingRequest.Merge(dst, src)
+func (m *ReportPhishingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportPhishingRequest.Merge(m, src)
 }
 func (m *ReportPhishingRequest) XXX_Size() int {
 	return xxx_messageInfo_ReportPhishingRequest.Size(m)
@@ -85,16 +86,17 @@ func (m *ReportPhishingResponse) Reset()         { *m = ReportPhishingResponse{}
 func (m *ReportPhishingResponse) String() string { return proto.CompactTextString(m) }
 func (*ReportPhishingResponse) ProtoMessage()    {}
 func (*ReportPhishingResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_phishingprotection_3f3199ea7ffa4ad5, []int{1}
+	return fileDescriptor_fa2769de3b7011f5, []int{1}
 }
+
 func (m *ReportPhishingResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportPhishingResponse.Unmarshal(m, b)
 }
 func (m *ReportPhishingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportPhishingResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReportPhishingResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportPhishingResponse.Merge(dst, src)
+func (m *ReportPhishingResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportPhishingResponse.Merge(m, src)
 }
 func (m *ReportPhishingResponse) XXX_Size() int {
 	return xxx_messageInfo_ReportPhishingResponse.Size(m)
@@ -110,6 +112,36 @@ func init() {
 	proto.RegisterType((*ReportPhishingResponse)(nil), "google.cloud.phishingprotection.v1beta1.ReportPhishingResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/phishingprotection/v1beta1/phishingprotection.proto", fileDescriptor_fa2769de3b7011f5)
+}
+
+var fileDescriptor_fa2769de3b7011f5 = []byte{
+	// 345 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xc9, 0x2f, 0x4d, 0xd1, 0x2f, 0xc8, 0xc8, 0x2c, 0xce, 0xc8, 0xcc,
+	0x4b, 0x2f, 0x28, 0xca, 0x2f, 0x49, 0x4d, 0x2e, 0xc9, 0xcc, 0xcf, 0xd3, 0x2f, 0x33, 0x4c, 0x4a,
+	0x2d, 0x49, 0x34, 0xc4, 0x22, 0xa5, 0x07, 0x62, 0xe6, 0x0b, 0xa9, 0x43, 0x4c, 0xd0, 0x03, 0x9b,
+	0xa0, 0x87, 0x45, 0x19, 0xd4, 0x04, 0x29, 0x19, 0xa8, 0x55, 0x89, 0x05, 0x99, 0xfa, 0x89, 0x79,
+	0x79, 0xf9, 0x25, 0x89, 0x20, 0xe9, 0x62, 0x88, 0x31, 0x4a, 0x8e, 0x5c, 0xa2, 0x41, 0xa9, 0x05,
+	0xf9, 0x45, 0x25, 0x01, 0x50, 0x13, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0xc4, 0xb8,
+	0xd8, 0x0a, 0x12, 0x8b, 0x52, 0xf3, 0x4a, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xa0, 0x3c,
+	0x21, 0x01, 0x2e, 0xe6, 0xd2, 0xa2, 0x4c, 0x09, 0x26, 0xb0, 0x20, 0x88, 0xa9, 0x24, 0xc1, 0x25,
+	0x86, 0x6e, 0x44, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0xd1, 0x7b, 0x46, 0x2e, 0x05, 0x98, 0x60,
+	0x00, 0xdc, 0x65, 0xc1, 0xa9, 0x45, 0x65, 0x99, 0xc9, 0xa9, 0x61, 0x86, 0x4e, 0x20, 0xf7, 0x09,
+	0x9d, 0x62, 0xe4, 0xe2, 0x43, 0xd5, 0x2f, 0x64, 0xa7, 0x47, 0xa4, 0xe7, 0xf4, 0xb0, 0xba, 0x5d,
+	0xca, 0x9e, 0x6c, 0xfd, 0x10, 0x87, 0x2b, 0x99, 0x37, 0x5d, 0x7e, 0x32, 0x99, 0xc9, 0x50, 0x49,
+	0x07, 0x1e, 0x0f, 0xd5, 0x10, 0xef, 0xdb, 0x16, 0x14, 0xe5, 0x67, 0xa5, 0x26, 0x97, 0x14, 0xeb,
+	0x6b, 0xd5, 0xc2, 0xe3, 0xc6, 0xaa, 0x08, 0x6c, 0x8a, 0x15, 0xa3, 0x96, 0xd3, 0x0f, 0x46, 0x2e,
+	0xd5, 0xe4, 0xfc, 0x5c, 0x98, 0xfd, 0xb8, 0x6d, 0x76, 0x12, 0xc7, 0x0c, 0x18, 0x10, 0x2b, 0x3f,
+	0x80, 0x31, 0x2a, 0x12, 0xaa, 0x3b, 0x3d, 0x3f, 0x27, 0x31, 0x2f, 0x5d, 0x2f, 0xbf, 0x28, 0x5d,
+	0x3f, 0x3d, 0x35, 0x0f, 0x1c, 0x5f, 0xfa, 0x10, 0xa9, 0xc4, 0x82, 0xcc, 0x62, 0x82, 0x69, 0xc7,
+	0x1a, 0x53, 0x6a, 0x11, 0x13, 0x8b, 0xbb, 0x73, 0x40, 0xc0, 0x2a, 0x26, 0x75, 0x77, 0x88, 0x15,
+	0xce, 0xe0, 0x00, 0xc2, 0x74, 0x8a, 0x1e, 0x34, 0x76, 0x4e, 0xc1, 0x54, 0xc6, 0x80, 0x55, 0xc6,
+	0x60, 0xaa, 0x8c, 0x09, 0x83, 0xd8, 0x96, 0xc4, 0x06, 0x76, 0xa0, 0x31, 0x20, 0x00, 0x00, 0xff,
+	0xff, 0xf7, 0x8f, 0x06, 0xd9, 0xdb, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -193,33 +225,3 @@ var _PhishingProtectionServiceV1Beta1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/phishingprotection/v1beta1/phishingprotection.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/phishingprotection/v1beta1/phishingprotection.proto", fileDescriptor_phishingprotection_3f3199ea7ffa4ad5)
-}
-
-var fileDescriptor_phishingprotection_3f3199ea7ffa4ad5 = []byte{
-	// 345 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xc9, 0x2f, 0x4d, 0xd1, 0x2f, 0xc8, 0xc8, 0x2c, 0xce, 0xc8, 0xcc,
-	0x4b, 0x2f, 0x28, 0xca, 0x2f, 0x49, 0x4d, 0x2e, 0xc9, 0xcc, 0xcf, 0xd3, 0x2f, 0x33, 0x4c, 0x4a,
-	0x2d, 0x49, 0x34, 0xc4, 0x22, 0xa5, 0x07, 0x62, 0xe6, 0x0b, 0xa9, 0x43, 0x4c, 0xd0, 0x03, 0x9b,
-	0xa0, 0x87, 0x45, 0x19, 0xd4, 0x04, 0x29, 0x19, 0xa8, 0x55, 0x89, 0x05, 0x99, 0xfa, 0x89, 0x79,
-	0x79, 0xf9, 0x25, 0x89, 0x20, 0xe9, 0x62, 0x88, 0x31, 0x4a, 0x8e, 0x5c, 0xa2, 0x41, 0xa9, 0x05,
-	0xf9, 0x45, 0x25, 0x01, 0x50, 0x13, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0xc4, 0xb8,
-	0xd8, 0x0a, 0x12, 0x8b, 0x52, 0xf3, 0x4a, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xa0, 0x3c,
-	0x21, 0x01, 0x2e, 0xe6, 0xd2, 0xa2, 0x4c, 0x09, 0x26, 0xb0, 0x20, 0x88, 0xa9, 0x24, 0xc1, 0x25,
-	0x86, 0x6e, 0x44, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0xd1, 0x7b, 0x46, 0x2e, 0x05, 0x98, 0x60,
-	0x00, 0xdc, 0x65, 0xc1, 0xa9, 0x45, 0x65, 0x99, 0xc9, 0xa9, 0x61, 0x86, 0x4e, 0x20, 0xf7, 0x09,
-	0x9d, 0x62, 0xe4, 0xe2, 0x43, 0xd5, 0x2f, 0x64, 0xa7, 0x47, 0xa4, 0xe7, 0xf4, 0xb0, 0xba, 0x5d,
-	0xca, 0x9e, 0x6c, 0xfd, 0x10, 0x87, 0x2b, 0x99, 0x37, 0x5d, 0x7e, 0x32, 0x99, 0xc9, 0x50, 0x49,
-	0x07, 0x1e, 0x0f, 0xd5, 0x10, 0xef, 0xdb, 0x16, 0x14, 0xe5, 0x67, 0xa5, 0x26, 0x97, 0x14, 0xeb,
-	0x6b, 0xd5, 0xc2, 0xe3, 0xc6, 0xaa, 0x08, 0x6c, 0x8a, 0x15, 0xa3, 0x96, 0xd3, 0x0f, 0x46, 0x2e,
-	0xd5, 0xe4, 0xfc, 0x5c, 0x98, 0xfd, 0xb8, 0x6d, 0x76, 0x12, 0xc7, 0x0c, 0x18, 0x10, 0x2b, 0x3f,
-	0x80, 0x31, 0x2a, 0x12, 0xaa, 0x3b, 0x3d, 0x3f, 0x27, 0x31, 0x2f, 0x5d, 0x2f, 0xbf, 0x28, 0x5d,
-	0x3f, 0x3d, 0x35, 0x0f, 0x1c, 0x5f, 0xfa, 0x10, 0xa9, 0xc4, 0x82, 0xcc, 0x62, 0x82, 0x69, 0xc7,
-	0x1a, 0x53, 0x6a, 0x11, 0x13, 0x8b, 0xbb, 0x73, 0x40, 0xc0, 0x2a, 0x26, 0x75, 0x77, 0x88, 0x15,
-	0xce, 0xe0, 0x00, 0xc2, 0x74, 0x8a, 0x1e, 0x34, 0x76, 0x4e, 0xc1, 0x54, 0xc6, 0x80, 0x55, 0xc6,
-	0x60, 0xaa, 0x8c, 0x09, 0x83, 0xd8, 0x96, 0xc4, 0x06, 0x76, 0xa0, 0x31, 0x20, 0x00, 0x00, 0xff,
-	0xff, 0xf7, 0x8f, 0x06, 0xd9, 0xdb, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.pb.go b/googleapis/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.pb.go
index a7fa485db5..893929a273 100644
--- a/googleapis/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.pb.go
+++ b/googleapis/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.proto
 
-package recaptchaenterprise // import "google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package recaptchaenterprise
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum that reprensents the types of annotations.
 type AnnotateAssessmentRequest_Annotation int32
@@ -42,6 +42,7 @@ var AnnotateAssessmentRequest_Annotation_name = map[int32]string{
 	1: "LEGITIMATE",
 	2: "FRAUDULENT",
 }
+
 var AnnotateAssessmentRequest_Annotation_value = map[string]int32{
 	"ANNOTATION_UNSPECIFIED": 0,
 	"LEGITIMATE":             1,
@@ -51,8 +52,9 @@ var AnnotateAssessmentRequest_Annotation_value = map[string]int32{
 func (x AnnotateAssessmentRequest_Annotation) String() string {
 	return proto.EnumName(AnnotateAssessmentRequest_Annotation_name, int32(x))
 }
+
 func (AnnotateAssessmentRequest_Annotation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{1, 0}
+	return fileDescriptor_72b3da91aae1398d, []int{1, 0}
 }
 
 // LINT.IfChange(classification_reason)
@@ -81,6 +83,7 @@ var Assessment_ClassificationReason_name = map[int32]string{
 	4: "UNEXPECTED_USAGE_PATTERNS",
 	5: "PROVISIONAL_RISK_ANALYSIS",
 }
+
 var Assessment_ClassificationReason_value = map[string]int32{
 	"CLASSIFICATION_REASON_UNSPECIFIED": 0,
 	"AUTOMATION":                        1,
@@ -92,8 +95,9 @@ var Assessment_ClassificationReason_value = map[string]int32{
 func (x Assessment_ClassificationReason) String() string {
 	return proto.EnumName(Assessment_ClassificationReason_name, int32(x))
 }
+
 func (Assessment_ClassificationReason) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{3, 0}
+	return fileDescriptor_72b3da91aae1398d, []int{3, 0}
 }
 
 // Enum that represents the types of invalid token reasons.
@@ -128,6 +132,7 @@ var TokenProperties_InvalidReason_name = map[int32]string{
 	5: "SITE_MISMATCH",
 	6: "MISSING",
 }
+
 var TokenProperties_InvalidReason_value = map[string]int32{
 	"INVALID_REASON_UNSPECIFIED": 0,
 	"UNKNOWN_INVALID_REASON":     1,
@@ -141,8 +146,9 @@ var TokenProperties_InvalidReason_value = map[string]int32{
 func (x TokenProperties_InvalidReason) String() string {
 	return proto.EnumName(TokenProperties_InvalidReason_name, int32(x))
 }
+
 func (TokenProperties_InvalidReason) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{5, 0}
+	return fileDescriptor_72b3da91aae1398d, []int{5, 0}
 }
 
 // The create assessment request message.
@@ -161,16 +167,17 @@ func (m *CreateAssessmentRequest) Reset()         { *m = CreateAssessmentRequest
 func (m *CreateAssessmentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAssessmentRequest) ProtoMessage()    {}
 func (*CreateAssessmentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{0}
+	return fileDescriptor_72b3da91aae1398d, []int{0}
 }
+
 func (m *CreateAssessmentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAssessmentRequest.Unmarshal(m, b)
 }
 func (m *CreateAssessmentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAssessmentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAssessmentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAssessmentRequest.Merge(dst, src)
+func (m *CreateAssessmentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAssessmentRequest.Merge(m, src)
 }
 func (m *CreateAssessmentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAssessmentRequest.Size(m)
@@ -211,16 +218,17 @@ func (m *AnnotateAssessmentRequest) Reset()         { *m = AnnotateAssessmentReq
 func (m *AnnotateAssessmentRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateAssessmentRequest) ProtoMessage()    {}
 func (*AnnotateAssessmentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{1}
+	return fileDescriptor_72b3da91aae1398d, []int{1}
 }
+
 func (m *AnnotateAssessmentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateAssessmentRequest.Unmarshal(m, b)
 }
 func (m *AnnotateAssessmentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateAssessmentRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateAssessmentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateAssessmentRequest.Merge(dst, src)
+func (m *AnnotateAssessmentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateAssessmentRequest.Merge(m, src)
 }
 func (m *AnnotateAssessmentRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateAssessmentRequest.Size(m)
@@ -256,16 +264,17 @@ func (m *AnnotateAssessmentResponse) Reset()         { *m = AnnotateAssessmentRe
 func (m *AnnotateAssessmentResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateAssessmentResponse) ProtoMessage()    {}
 func (*AnnotateAssessmentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{2}
+	return fileDescriptor_72b3da91aae1398d, []int{2}
 }
+
 func (m *AnnotateAssessmentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateAssessmentResponse.Unmarshal(m, b)
 }
 func (m *AnnotateAssessmentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateAssessmentResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateAssessmentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateAssessmentResponse.Merge(dst, src)
+func (m *AnnotateAssessmentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateAssessmentResponse.Merge(m, src)
 }
 func (m *AnnotateAssessmentResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateAssessmentResponse.Size(m)
@@ -300,16 +309,17 @@ func (m *Assessment) Reset()         { *m = Assessment{} }
 func (m *Assessment) String() string { return proto.CompactTextString(m) }
 func (*Assessment) ProtoMessage()    {}
 func (*Assessment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{3}
+	return fileDescriptor_72b3da91aae1398d, []int{3}
 }
+
 func (m *Assessment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Assessment.Unmarshal(m, b)
 }
 func (m *Assessment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Assessment.Marshal(b, m, deterministic)
 }
-func (dst *Assessment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Assessment.Merge(dst, src)
+func (m *Assessment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Assessment.Merge(m, src)
 }
 func (m *Assessment) XXX_Size() int {
 	return xxx_messageInfo_Assessment.Size(m)
@@ -371,16 +381,17 @@ func (m *Event) Reset()         { *m = Event{} }
 func (m *Event) String() string { return proto.CompactTextString(m) }
 func (*Event) ProtoMessage()    {}
 func (*Event) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{4}
+	return fileDescriptor_72b3da91aae1398d, []int{4}
 }
+
 func (m *Event) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Event.Unmarshal(m, b)
 }
 func (m *Event) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Event.Marshal(b, m, deterministic)
 }
-func (dst *Event) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Event.Merge(dst, src)
+func (m *Event) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Event.Merge(m, src)
 }
 func (m *Event) XXX_Size() int {
 	return xxx_messageInfo_Event.Size(m)
@@ -425,16 +436,17 @@ func (m *TokenProperties) Reset()         { *m = TokenProperties{} }
 func (m *TokenProperties) String() string { return proto.CompactTextString(m) }
 func (*TokenProperties) ProtoMessage()    {}
 func (*TokenProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_recaptchaenterprise_7acd4e5481c3d535, []int{5}
+	return fileDescriptor_72b3da91aae1398d, []int{5}
 }
+
 func (m *TokenProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TokenProperties.Unmarshal(m, b)
 }
 func (m *TokenProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TokenProperties.Marshal(b, m, deterministic)
 }
-func (dst *TokenProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TokenProperties.Merge(dst, src)
+func (m *TokenProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TokenProperties.Merge(m, src)
 }
 func (m *TokenProperties) XXX_Size() int {
 	return xxx_messageInfo_TokenProperties.Size(m)
@@ -481,15 +493,83 @@ func (m *TokenProperties) GetAction() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.recaptchaenterprise.v1beta1.AnnotateAssessmentRequest_Annotation", AnnotateAssessmentRequest_Annotation_name, AnnotateAssessmentRequest_Annotation_value)
+	proto.RegisterEnum("google.cloud.recaptchaenterprise.v1beta1.Assessment_ClassificationReason", Assessment_ClassificationReason_name, Assessment_ClassificationReason_value)
+	proto.RegisterEnum("google.cloud.recaptchaenterprise.v1beta1.TokenProperties_InvalidReason", TokenProperties_InvalidReason_name, TokenProperties_InvalidReason_value)
 	proto.RegisterType((*CreateAssessmentRequest)(nil), "google.cloud.recaptchaenterprise.v1beta1.CreateAssessmentRequest")
 	proto.RegisterType((*AnnotateAssessmentRequest)(nil), "google.cloud.recaptchaenterprise.v1beta1.AnnotateAssessmentRequest")
 	proto.RegisterType((*AnnotateAssessmentResponse)(nil), "google.cloud.recaptchaenterprise.v1beta1.AnnotateAssessmentResponse")
 	proto.RegisterType((*Assessment)(nil), "google.cloud.recaptchaenterprise.v1beta1.Assessment")
 	proto.RegisterType((*Event)(nil), "google.cloud.recaptchaenterprise.v1beta1.Event")
 	proto.RegisterType((*TokenProperties)(nil), "google.cloud.recaptchaenterprise.v1beta1.TokenProperties")
-	proto.RegisterEnum("google.cloud.recaptchaenterprise.v1beta1.AnnotateAssessmentRequest_Annotation", AnnotateAssessmentRequest_Annotation_name, AnnotateAssessmentRequest_Annotation_value)
-	proto.RegisterEnum("google.cloud.recaptchaenterprise.v1beta1.Assessment_ClassificationReason", Assessment_ClassificationReason_name, Assessment_ClassificationReason_value)
-	proto.RegisterEnum("google.cloud.recaptchaenterprise.v1beta1.TokenProperties_InvalidReason", TokenProperties_InvalidReason_name, TokenProperties_InvalidReason_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.proto", fileDescriptor_72b3da91aae1398d)
+}
+
+var fileDescriptor_72b3da91aae1398d = []byte{
+	// 945 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6f, 0xe3, 0x44,
+	0x14, 0xc7, 0xf9, 0xe8, 0xc7, 0xab, 0xda, 0x35, 0xa3, 0xd5, 0x92, 0x46, 0x0b, 0x74, 0x2d, 0x81,
+	0xa2, 0x1e, 0x6c, 0xb5, 0x20, 0x04, 0x5d, 0x38, 0xb8, 0xce, 0x34, 0x3b, 0x6a, 0xe2, 0x44, 0x63,
+	0xa7, 0x2c, 0x50, 0xc9, 0x72, 0xdd, 0xd9, 0xac, 0xd9, 0xc4, 0x36, 0x1e, 0xb7, 0xd2, 0x0a, 0xed,
+	0x85, 0x0b, 0x67, 0xc4, 0x95, 0x13, 0x17, 0x24, 0xfe, 0x13, 0xb8, 0x70, 0xe0, 0xcc, 0x8d, 0x0b,
+	0x57, 0xfe, 0x00, 0x84, 0x3c, 0x63, 0x27, 0xe9, 0xe2, 0x85, 0x52, 0xb8, 0xe5, 0xcd, 0x7b, 0xf3,
+	0x7b, 0x1f, 0xbf, 0x37, 0x3f, 0x07, 0x0e, 0x27, 0x71, 0x3c, 0x99, 0x32, 0x23, 0x98, 0xc6, 0x17,
+	0xe7, 0x46, 0xca, 0x02, 0x3f, 0xc9, 0x82, 0xc7, 0x3e, 0x8b, 0x32, 0x96, 0x26, 0x69, 0xc8, 0x99,
+	0x71, 0xb9, 0x77, 0xc6, 0x32, 0x7f, 0xaf, 0xca, 0xa7, 0x27, 0x69, 0x9c, 0xc5, 0xa8, 0x23, 0x31,
+	0x74, 0x81, 0xa1, 0x57, 0xc5, 0x15, 0x18, 0xed, 0xbb, 0x45, 0x36, 0x3f, 0x09, 0x0d, 0x3f, 0x8a,
+	0xe2, 0xcc, 0xcf, 0xc2, 0x38, 0xe2, 0x12, 0xa7, 0xfd, 0x7a, 0xe1, 0x15, 0xd6, 0xd9, 0xc5, 0x23,
+	0x23, 0x0b, 0x67, 0x8c, 0x67, 0xfe, 0x2c, 0x91, 0x01, 0xda, 0x97, 0x0a, 0xbc, 0x62, 0xa5, 0xcc,
+	0xcf, 0x98, 0xc9, 0x39, 0xe3, 0x7c, 0xc6, 0xa2, 0x8c, 0xb2, 0xcf, 0x2e, 0x18, 0xcf, 0xd0, 0x1d,
+	0x58, 0x49, 0xfc, 0x94, 0x45, 0x59, 0x4b, 0xd9, 0x51, 0x3a, 0xeb, 0xb4, 0xb0, 0x90, 0x0b, 0xe0,
+	0xcf, 0x83, 0x5b, 0xb5, 0x1d, 0xa5, 0xb3, 0xb1, 0xff, 0xb6, 0x7e, 0xdd, 0x8a, 0xf5, 0xa5, 0x44,
+	0x4b, 0x38, 0xda, 0x6f, 0x0a, 0x6c, 0x9b, 0xb2, 0x81, 0x8a, 0x5a, 0x10, 0x34, 0x22, 0x7f, 0xc6,
+	0x8a, 0x4a, 0xc4, 0x6f, 0x14, 0x01, 0x2c, 0x3a, 0x16, 0x75, 0x6c, 0xed, 0xdb, 0xff, 0xa2, 0x8e,
+	0x17, 0x25, 0x2b, 0x3d, 0x61, 0x1c, 0xd1, 0xa5, 0x0c, 0xda, 0x03, 0x80, 0x85, 0x07, 0xb5, 0xe1,
+	0x8e, 0x69, 0xdb, 0x43, 0xd7, 0x74, 0xc9, 0xd0, 0xf6, 0xc6, 0xb6, 0x33, 0xc2, 0x16, 0x39, 0x22,
+	0xb8, 0xab, 0xbe, 0x84, 0xb6, 0x00, 0xfa, 0xb8, 0x47, 0x5c, 0x32, 0x30, 0x5d, 0xac, 0x2a, 0xb9,
+	0x7d, 0x44, 0xcd, 0x71, 0x77, 0xdc, 0xc7, 0xb6, 0xab, 0xd6, 0xb4, 0xbb, 0xd0, 0xae, 0xca, 0xce,
+	0x93, 0x38, 0xe2, 0x4c, 0xfb, 0xbd, 0x0e, 0xb0, 0x38, 0xae, 0x6c, 0x1d, 0x43, 0x93, 0x5d, 0x2e,
+	0xa6, 0x6f, 0x5c, 0xbf, 0x6b, 0x9c, 0x5f, 0xa3, 0xf2, 0x36, 0xba, 0x0d, 0x4d, 0x1e, 0xc4, 0x29,
+	0x6b, 0xd5, 0x77, 0x94, 0x4e, 0x8d, 0x4a, 0x03, 0x9d, 0x83, 0x9a, 0xc5, 0x4f, 0x58, 0xe4, 0x25,
+	0x69, 0x9c, 0xb0, 0x34, 0x0b, 0x19, 0x6f, 0x35, 0x44, 0x9e, 0xf7, 0xae, 0x9f, 0xc7, 0xcd, 0x11,
+	0x46, 0x73, 0x00, 0x7a, 0x2b, 0xbb, 0x7a, 0x80, 0x02, 0x58, 0x4d, 0x99, 0xcf, 0xe3, 0x88, 0xb7,
+	0x9a, 0x3b, 0xf5, 0xce, 0xd6, 0x3e, 0xb9, 0xc9, 0x0a, 0xe9, 0xd6, 0xd4, 0xe7, 0x3c, 0x7c, 0x14,
+	0x06, 0x92, 0x2f, 0x81, 0x48, 0x4b, 0x64, 0xed, 0x3b, 0x05, 0x6e, 0x57, 0x45, 0xa0, 0x37, 0xe0,
+	0x9e, 0xd5, 0x37, 0x1d, 0x87, 0x1c, 0x11, 0x4b, 0x32, 0x48, 0xb1, 0xe9, 0x54, 0x11, 0x69, 0x8e,
+	0xdd, 0xe1, 0x40, 0x84, 0xa8, 0x4a, 0x4e, 0xfa, 0xd8, 0xc6, 0x0f, 0x47, 0xd8, 0x72, 0x71, 0xd7,
+	0xc3, 0xf6, 0x09, 0xa1, 0x43, 0x7b, 0x20, 0x48, 0x45, 0xaf, 0xc2, 0xf6, 0x92, 0x6f, 0xec, 0x98,
+	0x3d, 0xec, 0x8d, 0x4c, 0xd7, 0xc5, 0xd4, 0x76, 0xd4, 0x46, 0xee, 0x1e, 0xd1, 0xe1, 0x09, 0x71,
+	0xc8, 0xd0, 0x36, 0xfb, 0x1e, 0x25, 0xce, 0xb1, 0x67, 0xda, 0x66, 0xff, 0x23, 0x87, 0x38, 0x6a,
+	0x53, 0x7b, 0x17, 0x9a, 0xb8, 0xe4, 0x44, 0x8c, 0xaa, 0xe0, 0x5b, 0x1a, 0x68, 0x1b, 0xd6, 0x78,
+	0x98, 0x31, 0xef, 0x09, 0x7b, 0x2a, 0x38, 0x5f, 0xa7, 0xab, 0xb9, 0x7d, 0xcc, 0x9e, 0x6a, 0xdf,
+	0xd4, 0xe1, 0xd6, 0x73, 0xd3, 0xce, 0x41, 0x2e, 0xfd, 0x69, 0x78, 0x2e, 0x40, 0xd6, 0xa8, 0x34,
+	0x50, 0x04, 0x5b, 0x61, 0x24, 0x7e, 0x7a, 0x72, 0x40, 0xc5, 0xa3, 0xe9, 0xdd, 0x98, 0x56, 0x9d,
+	0x48, 0xbc, 0x62, 0xee, 0x9b, 0xe1, 0xb2, 0x89, 0xee, 0xc3, 0x46, 0x20, 0xb4, 0xc5, 0xcb, 0x65,
+	0x47, 0x2c, 0xd9, 0xc6, 0x7e, 0xbb, 0x4c, 0x56, 0x6a, 0x92, 0xee, 0x96, 0x9a, 0x44, 0x41, 0x86,
+	0xe7, 0x07, 0xa8, 0x0d, 0x6b, 0x8f, 0x63, 0x9e, 0x89, 0xd5, 0x6f, 0x88, 0x8e, 0xe7, 0x76, 0xae,
+	0x4c, 0x7e, 0x20, 0x5e, 0x7d, 0x53, 0x2a, 0x93, 0xb4, 0xb4, 0xaf, 0x14, 0xd8, 0xbc, 0x52, 0x11,
+	0x7a, 0x0d, 0xda, 0xc4, 0x3e, 0x31, 0xfb, 0xa4, 0x5b, 0x4d, 0xb0, 0x20, 0xf4, 0xd8, 0x1e, 0x7e,
+	0x68, 0x7b, 0x57, 0xe3, 0x54, 0x05, 0x6d, 0xc2, 0xfa, 0xc0, 0xec, 0x1f, 0x0d, 0xe9, 0x00, 0x77,
+	0xd5, 0x1a, 0xda, 0x80, 0x55, 0xfc, 0x70, 0x44, 0x28, 0xee, 0xaa, 0x75, 0xb4, 0x06, 0x8d, 0xee,
+	0x78, 0x84, 0xd5, 0x06, 0x7a, 0x19, 0x36, 0x1d, 0xe2, 0x62, 0x6f, 0x40, 0x9c, 0x81, 0xe9, 0x5a,
+	0x0f, 0xd4, 0x66, 0x1e, 0x39, 0x20, 0x8e, 0x43, 0xec, 0x9e, 0xba, 0xb2, 0xff, 0x53, 0x1d, 0xee,
+	0xd1, 0x72, 0xa2, 0x78, 0x3e, 0x51, 0x87, 0xa5, 0x97, 0x61, 0xc0, 0x4e, 0xf6, 0x0e, 0xf3, 0xb9,
+	0xa2, 0x1f, 0x14, 0x50, 0x9f, 0xd7, 0x61, 0x64, 0x5e, 0x9f, 0x97, 0x17, 0x68, 0x78, 0xfb, 0x46,
+	0xba, 0xac, 0xbd, 0xff, 0xc5, 0xcf, 0xbf, 0x7e, 0x5d, 0x7b, 0x47, 0xeb, 0xcc, 0x3f, 0x55, 0x9f,
+	0x4b, 0xed, 0xff, 0x20, 0x49, 0xe3, 0x4f, 0x59, 0x90, 0x71, 0x63, 0xf7, 0x99, 0xb1, 0x10, 0x6f,
+	0x7e, 0xb0, 0xa4, 0xe4, 0xe8, 0x17, 0x05, 0xd0, 0x5f, 0xe5, 0x0d, 0x59, 0xff, 0x83, 0x34, 0xb7,
+	0xbb, 0xff, 0x0d, 0xa4, 0x50, 0xd8, 0xb2, 0xbf, 0xbd, 0x45, 0x7f, 0xf9, 0x5e, 0x2d, 0x75, 0xb7,
+	0xdc, 0x9c, 0xb1, 0xfb, 0xec, 0xa0, 0xf8, 0x0c, 0xb0, 0x03, 0x65, 0xf7, 0xf0, 0x0f, 0x05, 0xde,
+	0x0c, 0xe2, 0x59, 0x59, 0xc9, 0xdf, 0xd4, 0x70, 0xd8, 0xaa, 0x60, 0x7e, 0x94, 0xef, 0xfd, 0x48,
+	0xf9, 0xf8, 0x93, 0xe2, 0xfe, 0x24, 0x9e, 0xfa, 0xd1, 0x44, 0x8f, 0xd3, 0x89, 0x31, 0x61, 0x91,
+	0x78, 0x15, 0x86, 0x74, 0xf9, 0x49, 0xc8, 0xff, 0xf9, 0x6f, 0xc4, 0xfd, 0x0a, 0xdf, 0xb7, 0xb5,
+	0x46, 0xcf, 0xa2, 0xf8, 0xfb, 0x5a, 0xa7, 0x27, 0x93, 0x58, 0x62, 0x5c, 0x15, 0xd5, 0xe8, 0xc5,
+	0x06, 0xfe, 0x58, 0x86, 0x9e, 0x8a, 0xd0, 0xd3, 0x8a, 0xd0, 0xd3, 0x13, 0x99, 0xf0, 0x6c, 0x45,
+	0x14, 0xf9, 0xd6, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x13, 0x3b, 0x55, 0xea, 0x08, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -602,71 +682,3 @@ var _RecaptchaEnterpriseServiceV1Beta1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/recaptchaenterprise/v1beta1/recaptchaenterprise.proto", fileDescriptor_recaptchaenterprise_7acd4e5481c3d535)
-}
-
-var fileDescriptor_recaptchaenterprise_7acd4e5481c3d535 = []byte{
-	// 945 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6f, 0xe3, 0x44,
-	0x14, 0xc7, 0xf9, 0xe8, 0xc7, 0xab, 0xda, 0x35, 0xa3, 0xd5, 0x92, 0x46, 0x0b, 0x74, 0x2d, 0x81,
-	0xa2, 0x1e, 0x6c, 0xb5, 0x20, 0x04, 0x5d, 0x38, 0xb8, 0xce, 0x34, 0x3b, 0x6a, 0xe2, 0x44, 0x63,
-	0xa7, 0x2c, 0x50, 0xc9, 0x72, 0xdd, 0xd9, 0xac, 0xd9, 0xc4, 0x36, 0x1e, 0xb7, 0xd2, 0x0a, 0xed,
-	0x85, 0x0b, 0x67, 0xc4, 0x95, 0x13, 0x17, 0x24, 0xfe, 0x13, 0xb8, 0x70, 0xe0, 0xcc, 0x8d, 0x0b,
-	0x57, 0xfe, 0x00, 0x84, 0x3c, 0x63, 0x27, 0xe9, 0xe2, 0x85, 0x52, 0xb8, 0xe5, 0xcd, 0x7b, 0xf3,
-	0x7b, 0x1f, 0xbf, 0x37, 0x3f, 0x07, 0x0e, 0x27, 0x71, 0x3c, 0x99, 0x32, 0x23, 0x98, 0xc6, 0x17,
-	0xe7, 0x46, 0xca, 0x02, 0x3f, 0xc9, 0x82, 0xc7, 0x3e, 0x8b, 0x32, 0x96, 0x26, 0x69, 0xc8, 0x99,
-	0x71, 0xb9, 0x77, 0xc6, 0x32, 0x7f, 0xaf, 0xca, 0xa7, 0x27, 0x69, 0x9c, 0xc5, 0xa8, 0x23, 0x31,
-	0x74, 0x81, 0xa1, 0x57, 0xc5, 0x15, 0x18, 0xed, 0xbb, 0x45, 0x36, 0x3f, 0x09, 0x0d, 0x3f, 0x8a,
-	0xe2, 0xcc, 0xcf, 0xc2, 0x38, 0xe2, 0x12, 0xa7, 0xfd, 0x7a, 0xe1, 0x15, 0xd6, 0xd9, 0xc5, 0x23,
-	0x23, 0x0b, 0x67, 0x8c, 0x67, 0xfe, 0x2c, 0x91, 0x01, 0xda, 0x97, 0x0a, 0xbc, 0x62, 0xa5, 0xcc,
-	0xcf, 0x98, 0xc9, 0x39, 0xe3, 0x7c, 0xc6, 0xa2, 0x8c, 0xb2, 0xcf, 0x2e, 0x18, 0xcf, 0xd0, 0x1d,
-	0x58, 0x49, 0xfc, 0x94, 0x45, 0x59, 0x4b, 0xd9, 0x51, 0x3a, 0xeb, 0xb4, 0xb0, 0x90, 0x0b, 0xe0,
-	0xcf, 0x83, 0x5b, 0xb5, 0x1d, 0xa5, 0xb3, 0xb1, 0xff, 0xb6, 0x7e, 0xdd, 0x8a, 0xf5, 0xa5, 0x44,
-	0x4b, 0x38, 0xda, 0x6f, 0x0a, 0x6c, 0x9b, 0xb2, 0x81, 0x8a, 0x5a, 0x10, 0x34, 0x22, 0x7f, 0xc6,
-	0x8a, 0x4a, 0xc4, 0x6f, 0x14, 0x01, 0x2c, 0x3a, 0x16, 0x75, 0x6c, 0xed, 0xdb, 0xff, 0xa2, 0x8e,
-	0x17, 0x25, 0x2b, 0x3d, 0x61, 0x1c, 0xd1, 0xa5, 0x0c, 0xda, 0x03, 0x80, 0x85, 0x07, 0xb5, 0xe1,
-	0x8e, 0x69, 0xdb, 0x43, 0xd7, 0x74, 0xc9, 0xd0, 0xf6, 0xc6, 0xb6, 0x33, 0xc2, 0x16, 0x39, 0x22,
-	0xb8, 0xab, 0xbe, 0x84, 0xb6, 0x00, 0xfa, 0xb8, 0x47, 0x5c, 0x32, 0x30, 0x5d, 0xac, 0x2a, 0xb9,
-	0x7d, 0x44, 0xcd, 0x71, 0x77, 0xdc, 0xc7, 0xb6, 0xab, 0xd6, 0xb4, 0xbb, 0xd0, 0xae, 0xca, 0xce,
-	0x93, 0x38, 0xe2, 0x4c, 0xfb, 0xbd, 0x0e, 0xb0, 0x38, 0xae, 0x6c, 0x1d, 0x43, 0x93, 0x5d, 0x2e,
-	0xa6, 0x6f, 0x5c, 0xbf, 0x6b, 0x9c, 0x5f, 0xa3, 0xf2, 0x36, 0xba, 0x0d, 0x4d, 0x1e, 0xc4, 0x29,
-	0x6b, 0xd5, 0x77, 0x94, 0x4e, 0x8d, 0x4a, 0x03, 0x9d, 0x83, 0x9a, 0xc5, 0x4f, 0x58, 0xe4, 0x25,
-	0x69, 0x9c, 0xb0, 0x34, 0x0b, 0x19, 0x6f, 0x35, 0x44, 0x9e, 0xf7, 0xae, 0x9f, 0xc7, 0xcd, 0x11,
-	0x46, 0x73, 0x00, 0x7a, 0x2b, 0xbb, 0x7a, 0x80, 0x02, 0x58, 0x4d, 0x99, 0xcf, 0xe3, 0x88, 0xb7,
-	0x9a, 0x3b, 0xf5, 0xce, 0xd6, 0x3e, 0xb9, 0xc9, 0x0a, 0xe9, 0xd6, 0xd4, 0xe7, 0x3c, 0x7c, 0x14,
-	0x06, 0x92, 0x2f, 0x81, 0x48, 0x4b, 0x64, 0xed, 0x3b, 0x05, 0x6e, 0x57, 0x45, 0xa0, 0x37, 0xe0,
-	0x9e, 0xd5, 0x37, 0x1d, 0x87, 0x1c, 0x11, 0x4b, 0x32, 0x48, 0xb1, 0xe9, 0x54, 0x11, 0x69, 0x8e,
-	0xdd, 0xe1, 0x40, 0x84, 0xa8, 0x4a, 0x4e, 0xfa, 0xd8, 0xc6, 0x0f, 0x47, 0xd8, 0x72, 0x71, 0xd7,
-	0xc3, 0xf6, 0x09, 0xa1, 0x43, 0x7b, 0x20, 0x48, 0x45, 0xaf, 0xc2, 0xf6, 0x92, 0x6f, 0xec, 0x98,
-	0x3d, 0xec, 0x8d, 0x4c, 0xd7, 0xc5, 0xd4, 0x76, 0xd4, 0x46, 0xee, 0x1e, 0xd1, 0xe1, 0x09, 0x71,
-	0xc8, 0xd0, 0x36, 0xfb, 0x1e, 0x25, 0xce, 0xb1, 0x67, 0xda, 0x66, 0xff, 0x23, 0x87, 0x38, 0x6a,
-	0x53, 0x7b, 0x17, 0x9a, 0xb8, 0xe4, 0x44, 0x8c, 0xaa, 0xe0, 0x5b, 0x1a, 0x68, 0x1b, 0xd6, 0x78,
-	0x98, 0x31, 0xef, 0x09, 0x7b, 0x2a, 0x38, 0x5f, 0xa7, 0xab, 0xb9, 0x7d, 0xcc, 0x9e, 0x6a, 0xdf,
-	0xd4, 0xe1, 0xd6, 0x73, 0xd3, 0xce, 0x41, 0x2e, 0xfd, 0x69, 0x78, 0x2e, 0x40, 0xd6, 0xa8, 0x34,
-	0x50, 0x04, 0x5b, 0x61, 0x24, 0x7e, 0x7a, 0x72, 0x40, 0xc5, 0xa3, 0xe9, 0xdd, 0x98, 0x56, 0x9d,
-	0x48, 0xbc, 0x62, 0xee, 0x9b, 0xe1, 0xb2, 0x89, 0xee, 0xc3, 0x46, 0x20, 0xb4, 0xc5, 0xcb, 0x65,
-	0x47, 0x2c, 0xd9, 0xc6, 0x7e, 0xbb, 0x4c, 0x56, 0x6a, 0x92, 0xee, 0x96, 0x9a, 0x44, 0x41, 0x86,
-	0xe7, 0x07, 0xa8, 0x0d, 0x6b, 0x8f, 0x63, 0x9e, 0x89, 0xd5, 0x6f, 0x88, 0x8e, 0xe7, 0x76, 0xae,
-	0x4c, 0x7e, 0x20, 0x5e, 0x7d, 0x53, 0x2a, 0x93, 0xb4, 0xb4, 0xaf, 0x14, 0xd8, 0xbc, 0x52, 0x11,
-	0x7a, 0x0d, 0xda, 0xc4, 0x3e, 0x31, 0xfb, 0xa4, 0x5b, 0x4d, 0xb0, 0x20, 0xf4, 0xd8, 0x1e, 0x7e,
-	0x68, 0x7b, 0x57, 0xe3, 0x54, 0x05, 0x6d, 0xc2, 0xfa, 0xc0, 0xec, 0x1f, 0x0d, 0xe9, 0x00, 0x77,
-	0xd5, 0x1a, 0xda, 0x80, 0x55, 0xfc, 0x70, 0x44, 0x28, 0xee, 0xaa, 0x75, 0xb4, 0x06, 0x8d, 0xee,
-	0x78, 0x84, 0xd5, 0x06, 0x7a, 0x19, 0x36, 0x1d, 0xe2, 0x62, 0x6f, 0x40, 0x9c, 0x81, 0xe9, 0x5a,
-	0x0f, 0xd4, 0x66, 0x1e, 0x39, 0x20, 0x8e, 0x43, 0xec, 0x9e, 0xba, 0xb2, 0xff, 0x53, 0x1d, 0xee,
-	0xd1, 0x72, 0xa2, 0x78, 0x3e, 0x51, 0x87, 0xa5, 0x97, 0x61, 0xc0, 0x4e, 0xf6, 0x0e, 0xf3, 0xb9,
-	0xa2, 0x1f, 0x14, 0x50, 0x9f, 0xd7, 0x61, 0x64, 0x5e, 0x9f, 0x97, 0x17, 0x68, 0x78, 0xfb, 0x46,
-	0xba, 0xac, 0xbd, 0xff, 0xc5, 0xcf, 0xbf, 0x7e, 0x5d, 0x7b, 0x47, 0xeb, 0xcc, 0x3f, 0x55, 0x9f,
-	0x4b, 0xed, 0xff, 0x20, 0x49, 0xe3, 0x4f, 0x59, 0x90, 0x71, 0x63, 0xf7, 0x99, 0xb1, 0x10, 0x6f,
-	0x7e, 0xb0, 0xa4, 0xe4, 0xe8, 0x17, 0x05, 0xd0, 0x5f, 0xe5, 0x0d, 0x59, 0xff, 0x83, 0x34, 0xb7,
-	0xbb, 0xff, 0x0d, 0xa4, 0x50, 0xd8, 0xb2, 0xbf, 0xbd, 0x45, 0x7f, 0xf9, 0x5e, 0x2d, 0x75, 0xb7,
-	0xdc, 0x9c, 0xb1, 0xfb, 0xec, 0xa0, 0xf8, 0x0c, 0xb0, 0x03, 0x65, 0xf7, 0xf0, 0x0f, 0x05, 0xde,
-	0x0c, 0xe2, 0x59, 0x59, 0xc9, 0xdf, 0xd4, 0x70, 0xd8, 0xaa, 0x60, 0x7e, 0x94, 0xef, 0xfd, 0x48,
-	0xf9, 0xf8, 0x93, 0xe2, 0xfe, 0x24, 0x9e, 0xfa, 0xd1, 0x44, 0x8f, 0xd3, 0x89, 0x31, 0x61, 0x91,
-	0x78, 0x15, 0x86, 0x74, 0xf9, 0x49, 0xc8, 0xff, 0xf9, 0x6f, 0xc4, 0xfd, 0x0a, 0xdf, 0xb7, 0xb5,
-	0x46, 0xcf, 0xa2, 0xf8, 0xfb, 0x5a, 0xa7, 0x27, 0x93, 0x58, 0x62, 0x5c, 0x15, 0xd5, 0xe8, 0xc5,
-	0x06, 0xfe, 0x58, 0x86, 0x9e, 0x8a, 0xd0, 0xd3, 0x8a, 0xd0, 0xd3, 0x13, 0x99, 0xf0, 0x6c, 0x45,
-	0x14, 0xf9, 0xd6, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x13, 0x3b, 0x55, 0xea, 0x08, 0x00,
-	0x00,
-}
diff --git a/googleapis/cloud/redis/v1/cloud_redis.pb.go b/googleapis/cloud/redis/v1/cloud_redis.pb.go
index 20979654d3..ad9db5d8ed 100644
--- a/googleapis/cloud/redis/v1/cloud_redis.pb.go
+++ b/googleapis/cloud/redis/v1/cloud_redis.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/redis/v1/cloud_redis.proto
 
-package redis // import "google.golang.org/genproto/googleapis/cloud/redis/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package redis
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the different states of a Redis instance.
 type Instance_State int32
@@ -61,6 +61,7 @@ var Instance_State_name = map[int32]string{
 	6: "MAINTENANCE",
 	9: "FAILING_OVER",
 }
+
 var Instance_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          1,
@@ -75,8 +76,9 @@ var Instance_State_value = map[string]int32{
 func (x Instance_State) String() string {
 	return proto.EnumName(Instance_State_name, int32(x))
 }
+
 func (Instance_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{0, 0}
+	return fileDescriptor_a99cb3206a9deca4, []int{0, 0}
 }
 
 // Available service tiers to choose from
@@ -96,6 +98,7 @@ var Instance_Tier_name = map[int32]string{
 	1: "BASIC",
 	3: "STANDARD_HA",
 }
+
 var Instance_Tier_value = map[string]int32{
 	"TIER_UNSPECIFIED": 0,
 	"BASIC":            1,
@@ -105,8 +108,9 @@ var Instance_Tier_value = map[string]int32{
 func (x Instance_Tier) String() string {
 	return proto.EnumName(Instance_Tier_name, int32(x))
 }
+
 func (Instance_Tier) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{0, 1}
+	return fileDescriptor_a99cb3206a9deca4, []int{0, 1}
 }
 
 type FailoverInstanceRequest_DataProtectionMode int32
@@ -127,6 +131,7 @@ var FailoverInstanceRequest_DataProtectionMode_name = map[int32]string{
 	1: "LIMITED_DATA_LOSS",
 	2: "FORCE_DATA_LOSS",
 }
+
 var FailoverInstanceRequest_DataProtectionMode_value = map[string]int32{
 	"DATA_PROTECTION_MODE_UNSPECIFIED": 0,
 	"LIMITED_DATA_LOSS":                1,
@@ -136,8 +141,9 @@ var FailoverInstanceRequest_DataProtectionMode_value = map[string]int32{
 func (x FailoverInstanceRequest_DataProtectionMode) String() string {
 	return proto.EnumName(FailoverInstanceRequest_DataProtectionMode_name, int32(x))
 }
+
 func (FailoverInstanceRequest_DataProtectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{7, 0}
+	return fileDescriptor_a99cb3206a9deca4, []int{7, 0}
 }
 
 // A Google Cloud Redis instance.
@@ -219,16 +225,17 @@ func (m *Instance) Reset()         { *m = Instance{} }
 func (m *Instance) String() string { return proto.CompactTextString(m) }
 func (*Instance) ProtoMessage()    {}
 func (*Instance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{0}
+	return fileDescriptor_a99cb3206a9deca4, []int{0}
 }
+
 func (m *Instance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instance.Unmarshal(m, b)
 }
 func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
 }
-func (dst *Instance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instance.Merge(dst, src)
+func (m *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(m, src)
 }
 func (m *Instance) XXX_Size() int {
 	return xxx_messageInfo_Instance.Size(m)
@@ -384,16 +391,17 @@ func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
 func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesRequest) ProtoMessage()    {}
 func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{1}
+	return fileDescriptor_a99cb3206a9deca4, []int{1}
 }
+
 func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
 }
 func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+func (m *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(m, src)
 }
 func (m *ListInstancesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesRequest.Size(m)
@@ -452,16 +460,17 @@ func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
 func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesResponse) ProtoMessage()    {}
 func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{2}
+	return fileDescriptor_a99cb3206a9deca4, []int{2}
 }
+
 func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
 }
 func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+func (m *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(m, src)
 }
 func (m *ListInstancesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesResponse.Size(m)
@@ -508,16 +517,17 @@ func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
 func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInstanceRequest) ProtoMessage()    {}
 func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{3}
+	return fileDescriptor_a99cb3206a9deca4, []int{3}
 }
+
 func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
 }
 func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+func (m *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(m, src)
 }
 func (m *GetInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInstanceRequest.Size(m)
@@ -561,16 +571,17 @@ func (m *CreateInstanceRequest) Reset()         { *m = CreateInstanceRequest{} }
 func (m *CreateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateInstanceRequest) ProtoMessage()    {}
 func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{4}
+	return fileDescriptor_a99cb3206a9deca4, []int{4}
 }
+
 func (m *CreateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstanceRequest.Unmarshal(m, b)
 }
 func (m *CreateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstanceRequest.Merge(dst, src)
+func (m *CreateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceRequest.Merge(m, src)
 }
 func (m *CreateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateInstanceRequest.Size(m)
@@ -625,16 +636,17 @@ func (m *UpdateInstanceRequest) Reset()         { *m = UpdateInstanceRequest{} }
 func (m *UpdateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateInstanceRequest) ProtoMessage()    {}
 func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{5}
+	return fileDescriptor_a99cb3206a9deca4, []int{5}
 }
+
 func (m *UpdateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateInstanceRequest.Unmarshal(m, b)
 }
 func (m *UpdateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateInstanceRequest.Merge(dst, src)
+func (m *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceRequest.Merge(m, src)
 }
 func (m *UpdateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateInstanceRequest.Size(m)
@@ -674,16 +686,17 @@ func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
 func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteInstanceRequest) ProtoMessage()    {}
 func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{6}
+	return fileDescriptor_a99cb3206a9deca4, []int{6}
 }
+
 func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
 }
 func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+func (m *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(m, src)
 }
 func (m *DeleteInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
@@ -719,16 +732,17 @@ func (m *FailoverInstanceRequest) Reset()         { *m = FailoverInstanceRequest
 func (m *FailoverInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*FailoverInstanceRequest) ProtoMessage()    {}
 func (*FailoverInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{7}
+	return fileDescriptor_a99cb3206a9deca4, []int{7}
 }
+
 func (m *FailoverInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FailoverInstanceRequest.Unmarshal(m, b)
 }
 func (m *FailoverInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FailoverInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *FailoverInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FailoverInstanceRequest.Merge(dst, src)
+func (m *FailoverInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FailoverInstanceRequest.Merge(m, src)
 }
 func (m *FailoverInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_FailoverInstanceRequest.Size(m)
@@ -778,16 +792,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{8}
+	return fileDescriptor_a99cb3206a9deca4, []int{8}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -866,16 +881,17 @@ func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
 func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LocationMetadata) ProtoMessage()    {}
 func (*LocationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{9}
+	return fileDescriptor_a99cb3206a9deca4, []int{9}
 }
+
 func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
 }
 func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+func (m *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(m, src)
 }
 func (m *LocationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LocationMetadata.Size(m)
@@ -905,16 +921,17 @@ func (m *ZoneMetadata) Reset()         { *m = ZoneMetadata{} }
 func (m *ZoneMetadata) String() string { return proto.CompactTextString(m) }
 func (*ZoneMetadata) ProtoMessage()    {}
 func (*ZoneMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_0cf6a76cde0d103b, []int{10}
+	return fileDescriptor_a99cb3206a9deca4, []int{10}
 }
+
 func (m *ZoneMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ZoneMetadata.Unmarshal(m, b)
 }
 func (m *ZoneMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ZoneMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ZoneMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ZoneMetadata.Merge(dst, src)
+func (m *ZoneMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ZoneMetadata.Merge(m, src)
 }
 func (m *ZoneMetadata) XXX_Size() int {
 	return xxx_messageInfo_ZoneMetadata.Size(m)
@@ -926,6 +943,9 @@ func (m *ZoneMetadata) XXX_DiscardUnknown() {
 var xxx_messageInfo_ZoneMetadata proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("google.cloud.redis.v1.Instance_State", Instance_State_name, Instance_State_value)
+	proto.RegisterEnum("google.cloud.redis.v1.Instance_Tier", Instance_Tier_name, Instance_Tier_value)
+	proto.RegisterEnum("google.cloud.redis.v1.FailoverInstanceRequest_DataProtectionMode", FailoverInstanceRequest_DataProtectionMode_name, FailoverInstanceRequest_DataProtectionMode_value)
 	proto.RegisterType((*Instance)(nil), "google.cloud.redis.v1.Instance")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.redis.v1.Instance.LabelsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.redis.v1.Instance.RedisConfigsEntry")
@@ -940,9 +960,108 @@ func init() {
 	proto.RegisterType((*LocationMetadata)(nil), "google.cloud.redis.v1.LocationMetadata")
 	proto.RegisterMapType((map[string]*ZoneMetadata)(nil), "google.cloud.redis.v1.LocationMetadata.AvailableZonesEntry")
 	proto.RegisterType((*ZoneMetadata)(nil), "google.cloud.redis.v1.ZoneMetadata")
-	proto.RegisterEnum("google.cloud.redis.v1.Instance_State", Instance_State_name, Instance_State_value)
-	proto.RegisterEnum("google.cloud.redis.v1.Instance_Tier", Instance_Tier_name, Instance_Tier_value)
-	proto.RegisterEnum("google.cloud.redis.v1.FailoverInstanceRequest_DataProtectionMode", FailoverInstanceRequest_DataProtectionMode_name, FailoverInstanceRequest_DataProtectionMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/redis/v1/cloud_redis.proto", fileDescriptor_a99cb3206a9deca4)
+}
+
+var fileDescriptor_a99cb3206a9deca4 = []byte{
+	// 1500 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xc1, 0x6e, 0xdb, 0x46,
+	0x13, 0xfe, 0x29, 0x5b, 0x8e, 0x35, 0x92, 0x65, 0x7a, 0x63, 0x25, 0x8c, 0xfe, 0x06, 0x56, 0x99,
+	0xa4, 0x75, 0x9c, 0x46, 0x82, 0x5d, 0x24, 0x48, 0x6c, 0x04, 0x01, 0x2d, 0xd1, 0x0e, 0x01, 0x5b,
+	0x36, 0x28, 0xc5, 0x40, 0x73, 0x21, 0xd6, 0xe2, 0x5a, 0x61, 0x4c, 0x91, 0x2c, 0xb9, 0x52, 0x6b,
+	0x17, 0xb9, 0x14, 0xe8, 0xa5, 0x40, 0x81, 0x16, 0xed, 0xb9, 0x68, 0x81, 0x00, 0x7d, 0x99, 0xa2,
+	0x97, 0xbe, 0x40, 0x0f, 0x7d, 0x90, 0x62, 0x77, 0x49, 0x5b, 0x92, 0x25, 0xc8, 0xba, 0xed, 0x7c,
+	0x33, 0xc3, 0xfd, 0x34, 0xb3, 0xfb, 0xcd, 0x0a, 0x3e, 0x6d, 0xfb, 0x7e, 0xdb, 0x25, 0x95, 0x96,
+	0xeb, 0x77, 0xed, 0x4a, 0x48, 0x6c, 0x27, 0xaa, 0xf4, 0xd6, 0x85, 0x69, 0x71, 0xb3, 0x1c, 0x84,
+	0x3e, 0xf5, 0x51, 0x41, 0x04, 0x96, 0xb9, 0xa7, 0x2c, 0x3c, 0xbd, 0xf5, 0xe2, 0x47, 0x71, 0x3e,
+	0x0e, 0x9c, 0x0a, 0xf6, 0x3c, 0x9f, 0x62, 0xea, 0xf8, 0x5e, 0x9c, 0x54, 0xbc, 0xd3, 0xe7, 0x0d,
+	0x49, 0xe4, 0x77, 0xc3, 0x16, 0x89, 0x5d, 0xf7, 0x62, 0x97, 0xeb, 0x7b, 0xed, 0xb0, 0xeb, 0x79,
+	0x8e, 0xd7, 0xae, 0xf8, 0x01, 0x09, 0x07, 0xf2, 0x4b, 0x71, 0x10, 0xb7, 0x8e, 0xbb, 0x27, 0x95,
+	0x13, 0x87, 0xb8, 0xb6, 0xd5, 0xc1, 0xd1, 0x69, 0x1c, 0xb1, 0x32, 0x1c, 0x41, 0x9d, 0x0e, 0x89,
+	0x28, 0xee, 0x04, 0x22, 0x40, 0xfd, 0x6b, 0x1e, 0xe6, 0x0d, 0x2f, 0xa2, 0xd8, 0x6b, 0x11, 0x84,
+	0x60, 0xd6, 0xc3, 0x1d, 0xa2, 0x48, 0x25, 0x69, 0x35, 0x63, 0xf2, 0x35, 0xfa, 0x18, 0x72, 0xb6,
+	0x13, 0x05, 0x2e, 0x3e, 0xb3, 0xb8, 0x2f, 0xc5, 0x7d, 0xd9, 0x18, 0xab, 0xb3, 0x90, 0x2a, 0xcc,
+	0xb9, 0xf8, 0x98, 0xb8, 0x91, 0x32, 0x53, 0x9a, 0x59, 0xcd, 0x6e, 0x3c, 0x2a, 0x8f, 0x2c, 0x46,
+	0x39, 0xd9, 0xa7, 0xbc, 0xc7, 0xa3, 0x75, 0x8f, 0x86, 0x67, 0x66, 0x9c, 0x8a, 0x56, 0x20, 0xeb,
+	0xfa, 0x2d, 0xfe, 0xf3, 0x2c, 0xc7, 0x56, 0x66, 0xf9, 0x36, 0x90, 0x40, 0x86, 0x8d, 0x9e, 0xc2,
+	0x6d, 0xec, 0x52, 0x12, 0x7a, 0x98, 0x3a, 0x3d, 0x62, 0xf5, 0x07, 0xa7, 0x79, 0x70, 0xa1, 0xcf,
+	0xbd, 0x77, 0x99, 0x77, 0x0f, 0x16, 0x38, 0x03, 0xab, 0x47, 0xc2, 0xc8, 0xf1, 0x3d, 0xe5, 0x06,
+	0x8f, 0xce, 0x71, 0xf0, 0x48, 0x60, 0x68, 0x0d, 0x96, 0x42, 0x12, 0x91, 0xb0, 0x47, 0x6c, 0xcb,
+	0x09, 0xac, 0x10, 0x7b, 0x6d, 0xa2, 0x64, 0x78, 0xe0, 0x62, 0xe2, 0x30, 0x02, 0x93, 0xc1, 0xac,
+	0x4a, 0x6f, 0xfd, 0x88, 0x2a, 0x20, 0xaa, 0xc4, 0xd6, 0x0c, 0x0b, 0xfc, 0x90, 0x2a, 0xd9, 0x92,
+	0xb4, 0x9a, 0x36, 0xf9, 0x1a, 0x95, 0xe1, 0x66, 0xab, 0x1b, 0x86, 0xc4, 0xa3, 0x03, 0x64, 0x73,
+	0x3c, 0x6d, 0x29, 0x76, 0xf5, 0x11, 0xdd, 0x82, 0x6c, 0x2b, 0x24, 0x98, 0x12, 0x8b, 0x35, 0x49,
+	0x59, 0x28, 0x49, 0xab, 0xd9, 0x8d, 0x62, 0x52, 0xcb, 0xa4, 0x83, 0xe5, 0x66, 0xd2, 0x41, 0x13,
+	0x44, 0x38, 0x03, 0xd0, 0x16, 0xa4, 0x23, 0x8a, 0x29, 0x51, 0xf2, 0x25, 0x69, 0x35, 0xbf, 0xf1,
+	0x60, 0x52, 0x0b, 0x1a, 0x2c, 0xd8, 0x14, 0x39, 0xe8, 0x01, 0xe4, 0xd9, 0xa2, 0x1b, 0x59, 0x1d,
+	0x12, 0x45, 0xb8, 0x4d, 0x94, 0x45, 0x4e, 0x72, 0x41, 0xa0, 0xfb, 0x02, 0x44, 0x47, 0x49, 0x25,
+	0x5b, 0xbe, 0x77, 0xe2, 0xb4, 0x23, 0x45, 0xe6, 0xed, 0x5e, 0x9f, 0xb4, 0x97, 0xc9, 0x90, 0xaa,
+	0xc8, 0x11, 0x4d, 0x17, 0xc5, 0x8f, 0x21, 0xf4, 0x0c, 0x66, 0xa9, 0x43, 0x42, 0x65, 0x89, 0x53,
+	0xbf, 0x3f, 0xe9, 0x73, 0x4d, 0x87, 0x84, 0x26, 0xcf, 0x40, 0xf7, 0x21, 0xdf, 0x21, 0x1d, 0x3f,
+	0x3c, 0xb3, 0x22, 0xe7, 0x9c, 0x58, 0xed, 0x63, 0x05, 0xf1, 0x06, 0xe4, 0x04, 0xda, 0x70, 0xce,
+	0xc9, 0xee, 0x31, 0x7a, 0x0c, 0x08, 0x77, 0xe9, 0x5b, 0x3f, 0x74, 0xce, 0x89, 0x6d, 0x79, 0x84,
+	0x7e, 0xe5, 0x87, 0xa7, 0xca, 0xb2, 0xe8, 0xc3, 0xa5, 0xa7, 0x2e, 0x1c, 0xc5, 0xe7, 0x90, 0xed,
+	0x3b, 0xa0, 0x48, 0x86, 0x99, 0x53, 0x72, 0x16, 0xdf, 0x09, 0xb6, 0x44, 0xcb, 0x90, 0xee, 0x61,
+	0xb7, 0x9b, 0xdc, 0x05, 0x61, 0x6c, 0xa6, 0x9e, 0x49, 0xc5, 0x97, 0xb0, 0x74, 0xe5, 0xc7, 0x4e,
+	0xf3, 0x01, 0xf5, 0x3b, 0x09, 0xd2, 0xbc, 0x35, 0xa8, 0x00, 0x4b, 0x8d, 0xa6, 0xd6, 0xd4, 0xad,
+	0xd7, 0xf5, 0xc6, 0xa1, 0x5e, 0x35, 0x76, 0x0c, 0xbd, 0x26, 0xff, 0x0f, 0xe5, 0x60, 0xbe, 0x6a,
+	0xea, 0x5a, 0xd3, 0xa8, 0xef, 0xca, 0x12, 0xca, 0x40, 0xda, 0xd4, 0xb5, 0xda, 0x17, 0x72, 0x8a,
+	0x39, 0x5e, 0x1f, 0xd6, 0x84, 0x63, 0x86, 0x59, 0x35, 0x7d, 0x4f, 0xe7, 0xd6, 0x2c, 0x5a, 0x80,
+	0x8c, 0xa9, 0x1f, 0x6a, 0x86, 0xc9, 0xcc, 0x34, 0x5a, 0x84, 0xec, 0xbe, 0x66, 0xd4, 0x9b, 0x7a,
+	0x5d, 0xab, 0x57, 0x75, 0x79, 0x0e, 0xc9, 0x90, 0xdb, 0xd1, 0x8c, 0x3d, 0xa3, 0xbe, 0x6b, 0x1d,
+	0x1c, 0xe9, 0xa6, 0x9c, 0x51, 0x9f, 0xc1, 0x2c, 0x2b, 0x33, 0x5a, 0x06, 0xb9, 0x69, 0xe8, 0xe6,
+	0x10, 0x89, 0x0c, 0xa4, 0xb7, 0xb5, 0x86, 0x51, 0x95, 0x25, 0xf6, 0xad, 0x46, 0x53, 0xab, 0xd7,
+	0x34, 0xb3, 0x66, 0xbd, 0xd2, 0xe4, 0x19, 0xf5, 0x1d, 0x2c, 0xef, 0x39, 0x11, 0x4d, 0xba, 0x15,
+	0x99, 0xe4, 0xcb, 0x2e, 0x89, 0x28, 0xba, 0x05, 0x73, 0x01, 0x66, 0x27, 0x3e, 0x2e, 0x44, 0x6c,
+	0xa1, 0xff, 0x43, 0x26, 0xc0, 0x6d, 0xc2, 0x1b, 0xc8, 0xeb, 0x91, 0x36, 0xe7, 0x19, 0xc0, 0x7a,
+	0x87, 0xee, 0x02, 0x70, 0x27, 0xf5, 0x4f, 0x89, 0xa7, 0xcc, 0xf0, 0x44, 0x1e, 0xde, 0x64, 0x80,
+	0xfa, 0x9b, 0x04, 0x85, 0xa1, 0xcd, 0xa2, 0xc0, 0xf7, 0x22, 0x82, 0x5e, 0x40, 0xc6, 0x49, 0x40,
+	0x45, 0xe2, 0xc7, 0x74, 0x65, 0xc2, 0xb9, 0x32, 0x2f, 0x33, 0xd0, 0x27, 0xb0, 0xe8, 0x91, 0xaf,
+	0xa9, 0xd5, 0xb7, 0xb9, 0x68, 0xd5, 0x02, 0x83, 0x0f, 0x13, 0x02, 0xa8, 0x04, 0xd9, 0xae, 0x17,
+	0x12, 0xdc, 0x7a, 0x8b, 0x8f, 0x5d, 0xc2, 0xe5, 0x2f, 0x63, 0xf6, 0x43, 0xea, 0x2a, 0xa0, 0x5d,
+	0x72, 0x41, 0x30, 0x29, 0xc6, 0x08, 0xa1, 0x55, 0x7f, 0x90, 0xa0, 0x50, 0xe5, 0x17, 0x7a, 0x38,
+	0x7a, 0x5c, 0xe9, 0x56, 0x20, 0x9b, 0x50, 0x66, 0xc2, 0x22, 0x18, 0x42, 0x02, 0x71, 0x45, 0x99,
+	0x4f, 0x2c, 0x5e, 0xbc, 0x6b, 0x14, 0xe1, 0x22, 0x41, 0xfd, 0x49, 0x82, 0xc2, 0xeb, 0xc0, 0x1e,
+	0xc1, 0x67, 0x0b, 0xb2, 0x5d, 0xee, 0xe0, 0x93, 0x86, 0x93, 0x1a, 0x25, 0x54, 0x3b, 0x6c, 0x18,
+	0xed, 0xe3, 0xe8, 0xd4, 0x04, 0x11, 0xce, 0xd6, 0x03, 0x9c, 0x52, 0xd3, 0x72, 0x7a, 0x04, 0x85,
+	0x1a, 0x71, 0xc9, 0x55, 0x4a, 0xa3, 0x0a, 0xfa, 0x7d, 0x0a, 0x6e, 0xef, 0x60, 0xc7, 0xf5, 0x7b,
+	0x24, 0xbc, 0x46, 0x3c, 0x8a, 0x60, 0xd9, 0xc6, 0x14, 0x5b, 0xec, 0x07, 0x90, 0x16, 0x97, 0xeb,
+	0x8e, 0x6f, 0x0b, 0x96, 0xf9, 0x0d, 0x6d, 0x0c, 0xcb, 0x31, 0x3b, 0x94, 0x6b, 0x98, 0xe2, 0xc3,
+	0x8b, 0x2f, 0xed, 0xfb, 0x36, 0x31, 0x91, 0x7d, 0x05, 0x53, 0x4f, 0x00, 0x5d, 0x8d, 0x44, 0xf7,
+	0xa1, 0x54, 0xd3, 0x9a, 0x9a, 0x75, 0x68, 0x1e, 0x34, 0xf5, 0x6a, 0xd3, 0x38, 0xa8, 0x5b, 0xfb,
+	0x07, 0xb5, 0x61, 0x2d, 0x28, 0xc0, 0xd2, 0x9e, 0xb1, 0x6f, 0x34, 0xf5, 0x9a, 0xc5, 0xa3, 0xf7,
+	0x0e, 0x1a, 0x0d, 0x59, 0x42, 0x37, 0x61, 0x71, 0xe7, 0xc0, 0xac, 0xea, 0x7d, 0x60, 0x4a, 0xfd,
+	0x90, 0x82, 0xa5, 0x83, 0xe4, 0xfd, 0xb0, 0x4f, 0x28, 0x66, 0x5c, 0x86, 0x47, 0x8e, 0x34, 0xd5,
+	0xc8, 0x79, 0x02, 0xf3, 0xc4, 0xb3, 0x45, 0x66, 0x6a, 0x62, 0xe6, 0x0d, 0xe2, 0xd9, 0x3c, 0xed,
+	0x16, 0xcc, 0x51, 0x1c, 0xb6, 0x09, 0x8d, 0xef, 0x73, 0x6c, 0xb1, 0x96, 0xf4, 0x48, 0x78, 0x1c,
+	0x4f, 0x7e, 0xbe, 0x66, 0xb3, 0x3b, 0x1e, 0x4c, 0x36, 0xa1, 0xd8, 0x71, 0xe3, 0x49, 0x9f, 0x13,
+	0x60, 0x8d, 0x63, 0xe8, 0x21, 0xc8, 0x2d, 0x56, 0x79, 0xd7, 0x0a, 0x45, 0xed, 0x89, 0xad, 0xcc,
+	0x95, 0xa4, 0xd5, 0x79, 0x73, 0x51, 0xe0, 0x66, 0x02, 0xb3, 0x1b, 0x83, 0x03, 0x67, 0xe8, 0x25,
+	0x00, 0x38, 0x70, 0xe2, 0x77, 0x80, 0xfa, 0x8f, 0x04, 0x72, 0x32, 0x92, 0x2f, 0xaa, 0x64, 0xc3,
+	0x22, 0xee, 0x61, 0xc7, 0x65, 0x17, 0xda, 0x3a, 0xf7, 0xbd, 0x0b, 0x49, 0xd9, 0x1a, 0x73, 0x26,
+	0x86, 0xbf, 0x50, 0xd6, 0x92, 0xf4, 0x37, 0x2c, 0x5b, 0xcc, 0xc0, 0x3c, 0x1e, 0x00, 0x8b, 0x27,
+	0x70, 0x73, 0x44, 0xd8, 0x88, 0xe9, 0xf1, 0xbc, 0x7f, 0x7a, 0x64, 0x37, 0xee, 0x8d, 0x21, 0xc1,
+	0xbe, 0x91, 0x10, 0xe8, 0x1f, 0x31, 0x79, 0xc8, 0xf5, 0xbb, 0x36, 0xfe, 0xbc, 0x01, 0x50, 0x65,
+	0xa9, 0x7c, 0x72, 0xa1, 0xdf, 0x25, 0x58, 0x18, 0xd0, 0x54, 0x34, 0xee, 0x39, 0x37, 0x4a, 0xe6,
+	0x8b, 0x9f, 0x5d, 0x2f, 0x58, 0xc8, 0xb4, 0xfa, 0xe4, 0xdb, 0xbf, 0xff, 0xfd, 0x39, 0x55, 0x41,
+	0x8f, 0xd9, 0xa3, 0xfa, 0x1b, 0x21, 0x6b, 0x2f, 0x82, 0xd0, 0x7f, 0x47, 0x5a, 0x34, 0xaa, 0xac,
+	0x55, 0x92, 0x77, 0x53, 0x54, 0x59, 0x7b, 0x5f, 0xb9, 0x94, 0xe7, 0x1f, 0x25, 0xc8, 0xf6, 0xa9,
+	0x2a, 0x7a, 0x38, 0x66, 0xd3, 0xab, 0xca, 0x5b, 0x9c, 0x24, 0x36, 0x43, 0x94, 0x98, 0x30, 0x8c,
+	0x21, 0x74, 0xc9, 0xa7, 0xb2, 0xf6, 0x1e, 0xfd, 0x2a, 0x41, 0x7e, 0x50, 0xbd, 0xd1, 0xb8, 0x52,
+	0x8c, 0x14, 0xf9, 0xe2, 0xdd, 0x24, 0xba, 0xef, 0xc5, 0x5f, 0xbe, 0xb8, 0xb1, 0xea, 0x4b, 0x4e,
+	0xeb, 0xb9, 0x3a, 0x5d, 0xa5, 0x36, 0x2f, 0xa4, 0x13, 0xfd, 0x21, 0x41, 0x7e, 0x50, 0xce, 0xc7,
+	0x12, 0x1c, 0xa9, 0xfa, 0x93, 0x08, 0xbe, 0xe2, 0x04, 0xb7, 0x37, 0x9e, 0x72, 0x82, 0xc9, 0xb6,
+	0xe5, 0xeb, 0x16, 0xb0, 0x8f, 0xe9, 0x07, 0x09, 0xe4, 0x61, 0x55, 0x45, 0xe5, 0xe9, 0xe4, 0x77,
+	0x12, 0x5b, 0x8d, 0xb3, 0xdd, 0x52, 0x9f, 0x4e, 0xd5, 0xe5, 0xcd, 0x93, 0x78, 0xb7, 0x4d, 0x69,
+	0x0d, 0xfd, 0x22, 0x41, 0x7e, 0x70, 0x18, 0x8d, 0x2d, 0xe8, 0xc8, 0x99, 0x35, 0x89, 0x62, 0x7c,
+	0x10, 0xd7, 0xa6, 0x3b, 0x88, 0xdb, 0x11, 0xdc, 0x69, 0xf9, 0x9d, 0xd1, 0x44, 0xb6, 0x95, 0xcb,
+	0x8b, 0xde, 0x20, 0x61, 0xcf, 0x69, 0x91, 0xa3, 0x75, 0x36, 0x7a, 0xfc, 0x43, 0xe9, 0xcd, 0x66,
+	0x9c, 0xd2, 0xf6, 0x5d, 0xec, 0xb5, 0xcb, 0x7e, 0xd8, 0xae, 0xb4, 0x89, 0xc7, 0x95, 0xbc, 0x22,
+	0x5c, 0x38, 0x70, 0xa2, 0xa1, 0x7f, 0xc2, 0x5b, 0x7c, 0x71, 0x3c, 0xc7, 0xc3, 0x3e, 0xff, 0x2f,
+	0x00, 0x00, 0xff, 0xff, 0xd9, 0x50, 0x6a, 0xff, 0x2f, 0x0f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1241,105 +1360,3 @@ var _CloudRedis_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/redis/v1/cloud_redis.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/redis/v1/cloud_redis.proto", fileDescriptor_cloud_redis_0cf6a76cde0d103b)
-}
-
-var fileDescriptor_cloud_redis_0cf6a76cde0d103b = []byte{
-	// 1500 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xc1, 0x6e, 0xdb, 0x46,
-	0x13, 0xfe, 0x29, 0x5b, 0x8e, 0x35, 0x92, 0x65, 0x7a, 0x63, 0x25, 0x8c, 0xfe, 0x06, 0x56, 0x99,
-	0xa4, 0x75, 0x9c, 0x46, 0x82, 0x5d, 0x24, 0x48, 0x6c, 0x04, 0x01, 0x2d, 0xd1, 0x0e, 0x01, 0x5b,
-	0x36, 0x28, 0xc5, 0x40, 0x73, 0x21, 0xd6, 0xe2, 0x5a, 0x61, 0x4c, 0x91, 0x2c, 0xb9, 0x52, 0x6b,
-	0x17, 0xb9, 0x14, 0xe8, 0xa5, 0x40, 0x81, 0x16, 0xed, 0xb9, 0x68, 0x81, 0x00, 0x7d, 0x99, 0xa2,
-	0x97, 0xbe, 0x40, 0x0f, 0x7d, 0x90, 0x62, 0x77, 0x49, 0x5b, 0x92, 0x25, 0xc8, 0xba, 0xed, 0x7c,
-	0x33, 0xc3, 0xfd, 0x34, 0xb3, 0xfb, 0xcd, 0x0a, 0x3e, 0x6d, 0xfb, 0x7e, 0xdb, 0x25, 0x95, 0x96,
-	0xeb, 0x77, 0xed, 0x4a, 0x48, 0x6c, 0x27, 0xaa, 0xf4, 0xd6, 0x85, 0x69, 0x71, 0xb3, 0x1c, 0x84,
-	0x3e, 0xf5, 0x51, 0x41, 0x04, 0x96, 0xb9, 0xa7, 0x2c, 0x3c, 0xbd, 0xf5, 0xe2, 0x47, 0x71, 0x3e,
-	0x0e, 0x9c, 0x0a, 0xf6, 0x3c, 0x9f, 0x62, 0xea, 0xf8, 0x5e, 0x9c, 0x54, 0xbc, 0xd3, 0xe7, 0x0d,
-	0x49, 0xe4, 0x77, 0xc3, 0x16, 0x89, 0x5d, 0xf7, 0x62, 0x97, 0xeb, 0x7b, 0xed, 0xb0, 0xeb, 0x79,
-	0x8e, 0xd7, 0xae, 0xf8, 0x01, 0x09, 0x07, 0xf2, 0x4b, 0x71, 0x10, 0xb7, 0x8e, 0xbb, 0x27, 0x95,
-	0x13, 0x87, 0xb8, 0xb6, 0xd5, 0xc1, 0xd1, 0x69, 0x1c, 0xb1, 0x32, 0x1c, 0x41, 0x9d, 0x0e, 0x89,
-	0x28, 0xee, 0x04, 0x22, 0x40, 0xfd, 0x6b, 0x1e, 0xe6, 0x0d, 0x2f, 0xa2, 0xd8, 0x6b, 0x11, 0x84,
-	0x60, 0xd6, 0xc3, 0x1d, 0xa2, 0x48, 0x25, 0x69, 0x35, 0x63, 0xf2, 0x35, 0xfa, 0x18, 0x72, 0xb6,
-	0x13, 0x05, 0x2e, 0x3e, 0xb3, 0xb8, 0x2f, 0xc5, 0x7d, 0xd9, 0x18, 0xab, 0xb3, 0x90, 0x2a, 0xcc,
-	0xb9, 0xf8, 0x98, 0xb8, 0x91, 0x32, 0x53, 0x9a, 0x59, 0xcd, 0x6e, 0x3c, 0x2a, 0x8f, 0x2c, 0x46,
-	0x39, 0xd9, 0xa7, 0xbc, 0xc7, 0xa3, 0x75, 0x8f, 0x86, 0x67, 0x66, 0x9c, 0x8a, 0x56, 0x20, 0xeb,
-	0xfa, 0x2d, 0xfe, 0xf3, 0x2c, 0xc7, 0x56, 0x66, 0xf9, 0x36, 0x90, 0x40, 0x86, 0x8d, 0x9e, 0xc2,
-	0x6d, 0xec, 0x52, 0x12, 0x7a, 0x98, 0x3a, 0x3d, 0x62, 0xf5, 0x07, 0xa7, 0x79, 0x70, 0xa1, 0xcf,
-	0xbd, 0x77, 0x99, 0x77, 0x0f, 0x16, 0x38, 0x03, 0xab, 0x47, 0xc2, 0xc8, 0xf1, 0x3d, 0xe5, 0x06,
-	0x8f, 0xce, 0x71, 0xf0, 0x48, 0x60, 0x68, 0x0d, 0x96, 0x42, 0x12, 0x91, 0xb0, 0x47, 0x6c, 0xcb,
-	0x09, 0xac, 0x10, 0x7b, 0x6d, 0xa2, 0x64, 0x78, 0xe0, 0x62, 0xe2, 0x30, 0x02, 0x93, 0xc1, 0xac,
-	0x4a, 0x6f, 0xfd, 0x88, 0x2a, 0x20, 0xaa, 0xc4, 0xd6, 0x0c, 0x0b, 0xfc, 0x90, 0x2a, 0xd9, 0x92,
-	0xb4, 0x9a, 0x36, 0xf9, 0x1a, 0x95, 0xe1, 0x66, 0xab, 0x1b, 0x86, 0xc4, 0xa3, 0x03, 0x64, 0x73,
-	0x3c, 0x6d, 0x29, 0x76, 0xf5, 0x11, 0xdd, 0x82, 0x6c, 0x2b, 0x24, 0x98, 0x12, 0x8b, 0x35, 0x49,
-	0x59, 0x28, 0x49, 0xab, 0xd9, 0x8d, 0x62, 0x52, 0xcb, 0xa4, 0x83, 0xe5, 0x66, 0xd2, 0x41, 0x13,
-	0x44, 0x38, 0x03, 0xd0, 0x16, 0xa4, 0x23, 0x8a, 0x29, 0x51, 0xf2, 0x25, 0x69, 0x35, 0xbf, 0xf1,
-	0x60, 0x52, 0x0b, 0x1a, 0x2c, 0xd8, 0x14, 0x39, 0xe8, 0x01, 0xe4, 0xd9, 0xa2, 0x1b, 0x59, 0x1d,
-	0x12, 0x45, 0xb8, 0x4d, 0x94, 0x45, 0x4e, 0x72, 0x41, 0xa0, 0xfb, 0x02, 0x44, 0x47, 0x49, 0x25,
-	0x5b, 0xbe, 0x77, 0xe2, 0xb4, 0x23, 0x45, 0xe6, 0xed, 0x5e, 0x9f, 0xb4, 0x97, 0xc9, 0x90, 0xaa,
-	0xc8, 0x11, 0x4d, 0x17, 0xc5, 0x8f, 0x21, 0xf4, 0x0c, 0x66, 0xa9, 0x43, 0x42, 0x65, 0x89, 0x53,
-	0xbf, 0x3f, 0xe9, 0x73, 0x4d, 0x87, 0x84, 0x26, 0xcf, 0x40, 0xf7, 0x21, 0xdf, 0x21, 0x1d, 0x3f,
-	0x3c, 0xb3, 0x22, 0xe7, 0x9c, 0x58, 0xed, 0x63, 0x05, 0xf1, 0x06, 0xe4, 0x04, 0xda, 0x70, 0xce,
-	0xc9, 0xee, 0x31, 0x7a, 0x0c, 0x08, 0x77, 0xe9, 0x5b, 0x3f, 0x74, 0xce, 0x89, 0x6d, 0x79, 0x84,
-	0x7e, 0xe5, 0x87, 0xa7, 0xca, 0xb2, 0xe8, 0xc3, 0xa5, 0xa7, 0x2e, 0x1c, 0xc5, 0xe7, 0x90, 0xed,
-	0x3b, 0xa0, 0x48, 0x86, 0x99, 0x53, 0x72, 0x16, 0xdf, 0x09, 0xb6, 0x44, 0xcb, 0x90, 0xee, 0x61,
-	0xb7, 0x9b, 0xdc, 0x05, 0x61, 0x6c, 0xa6, 0x9e, 0x49, 0xc5, 0x97, 0xb0, 0x74, 0xe5, 0xc7, 0x4e,
-	0xf3, 0x01, 0xf5, 0x3b, 0x09, 0xd2, 0xbc, 0x35, 0xa8, 0x00, 0x4b, 0x8d, 0xa6, 0xd6, 0xd4, 0xad,
-	0xd7, 0xf5, 0xc6, 0xa1, 0x5e, 0x35, 0x76, 0x0c, 0xbd, 0x26, 0xff, 0x0f, 0xe5, 0x60, 0xbe, 0x6a,
-	0xea, 0x5a, 0xd3, 0xa8, 0xef, 0xca, 0x12, 0xca, 0x40, 0xda, 0xd4, 0xb5, 0xda, 0x17, 0x72, 0x8a,
-	0x39, 0x5e, 0x1f, 0xd6, 0x84, 0x63, 0x86, 0x59, 0x35, 0x7d, 0x4f, 0xe7, 0xd6, 0x2c, 0x5a, 0x80,
-	0x8c, 0xa9, 0x1f, 0x6a, 0x86, 0xc9, 0xcc, 0x34, 0x5a, 0x84, 0xec, 0xbe, 0x66, 0xd4, 0x9b, 0x7a,
-	0x5d, 0xab, 0x57, 0x75, 0x79, 0x0e, 0xc9, 0x90, 0xdb, 0xd1, 0x8c, 0x3d, 0xa3, 0xbe, 0x6b, 0x1d,
-	0x1c, 0xe9, 0xa6, 0x9c, 0x51, 0x9f, 0xc1, 0x2c, 0x2b, 0x33, 0x5a, 0x06, 0xb9, 0x69, 0xe8, 0xe6,
-	0x10, 0x89, 0x0c, 0xa4, 0xb7, 0xb5, 0x86, 0x51, 0x95, 0x25, 0xf6, 0xad, 0x46, 0x53, 0xab, 0xd7,
-	0x34, 0xb3, 0x66, 0xbd, 0xd2, 0xe4, 0x19, 0xf5, 0x1d, 0x2c, 0xef, 0x39, 0x11, 0x4d, 0xba, 0x15,
-	0x99, 0xe4, 0xcb, 0x2e, 0x89, 0x28, 0xba, 0x05, 0x73, 0x01, 0x66, 0x27, 0x3e, 0x2e, 0x44, 0x6c,
-	0xa1, 0xff, 0x43, 0x26, 0xc0, 0x6d, 0xc2, 0x1b, 0xc8, 0xeb, 0x91, 0x36, 0xe7, 0x19, 0xc0, 0x7a,
-	0x87, 0xee, 0x02, 0x70, 0x27, 0xf5, 0x4f, 0x89, 0xa7, 0xcc, 0xf0, 0x44, 0x1e, 0xde, 0x64, 0x80,
-	0xfa, 0x9b, 0x04, 0x85, 0xa1, 0xcd, 0xa2, 0xc0, 0xf7, 0x22, 0x82, 0x5e, 0x40, 0xc6, 0x49, 0x40,
-	0x45, 0xe2, 0xc7, 0x74, 0x65, 0xc2, 0xb9, 0x32, 0x2f, 0x33, 0xd0, 0x27, 0xb0, 0xe8, 0x91, 0xaf,
-	0xa9, 0xd5, 0xb7, 0xb9, 0x68, 0xd5, 0x02, 0x83, 0x0f, 0x13, 0x02, 0xa8, 0x04, 0xd9, 0xae, 0x17,
-	0x12, 0xdc, 0x7a, 0x8b, 0x8f, 0x5d, 0xc2, 0xe5, 0x2f, 0x63, 0xf6, 0x43, 0xea, 0x2a, 0xa0, 0x5d,
-	0x72, 0x41, 0x30, 0x29, 0xc6, 0x08, 0xa1, 0x55, 0x7f, 0x90, 0xa0, 0x50, 0xe5, 0x17, 0x7a, 0x38,
-	0x7a, 0x5c, 0xe9, 0x56, 0x20, 0x9b, 0x50, 0x66, 0xc2, 0x22, 0x18, 0x42, 0x02, 0x71, 0x45, 0x99,
-	0x4f, 0x2c, 0x5e, 0xbc, 0x6b, 0x14, 0xe1, 0x22, 0x41, 0xfd, 0x49, 0x82, 0xc2, 0xeb, 0xc0, 0x1e,
-	0xc1, 0x67, 0x0b, 0xb2, 0x5d, 0xee, 0xe0, 0x93, 0x86, 0x93, 0x1a, 0x25, 0x54, 0x3b, 0x6c, 0x18,
-	0xed, 0xe3, 0xe8, 0xd4, 0x04, 0x11, 0xce, 0xd6, 0x03, 0x9c, 0x52, 0xd3, 0x72, 0x7a, 0x04, 0x85,
-	0x1a, 0x71, 0xc9, 0x55, 0x4a, 0xa3, 0x0a, 0xfa, 0x7d, 0x0a, 0x6e, 0xef, 0x60, 0xc7, 0xf5, 0x7b,
-	0x24, 0xbc, 0x46, 0x3c, 0x8a, 0x60, 0xd9, 0xc6, 0x14, 0x5b, 0xec, 0x07, 0x90, 0x16, 0x97, 0xeb,
-	0x8e, 0x6f, 0x0b, 0x96, 0xf9, 0x0d, 0x6d, 0x0c, 0xcb, 0x31, 0x3b, 0x94, 0x6b, 0x98, 0xe2, 0xc3,
-	0x8b, 0x2f, 0xed, 0xfb, 0x36, 0x31, 0x91, 0x7d, 0x05, 0x53, 0x4f, 0x00, 0x5d, 0x8d, 0x44, 0xf7,
-	0xa1, 0x54, 0xd3, 0x9a, 0x9a, 0x75, 0x68, 0x1e, 0x34, 0xf5, 0x6a, 0xd3, 0x38, 0xa8, 0x5b, 0xfb,
-	0x07, 0xb5, 0x61, 0x2d, 0x28, 0xc0, 0xd2, 0x9e, 0xb1, 0x6f, 0x34, 0xf5, 0x9a, 0xc5, 0xa3, 0xf7,
-	0x0e, 0x1a, 0x0d, 0x59, 0x42, 0x37, 0x61, 0x71, 0xe7, 0xc0, 0xac, 0xea, 0x7d, 0x60, 0x4a, 0xfd,
-	0x90, 0x82, 0xa5, 0x83, 0xe4, 0xfd, 0xb0, 0x4f, 0x28, 0x66, 0x5c, 0x86, 0x47, 0x8e, 0x34, 0xd5,
-	0xc8, 0x79, 0x02, 0xf3, 0xc4, 0xb3, 0x45, 0x66, 0x6a, 0x62, 0xe6, 0x0d, 0xe2, 0xd9, 0x3c, 0xed,
-	0x16, 0xcc, 0x51, 0x1c, 0xb6, 0x09, 0x8d, 0xef, 0x73, 0x6c, 0xb1, 0x96, 0xf4, 0x48, 0x78, 0x1c,
-	0x4f, 0x7e, 0xbe, 0x66, 0xb3, 0x3b, 0x1e, 0x4c, 0x36, 0xa1, 0xd8, 0x71, 0xe3, 0x49, 0x9f, 0x13,
-	0x60, 0x8d, 0x63, 0xe8, 0x21, 0xc8, 0x2d, 0x56, 0x79, 0xd7, 0x0a, 0x45, 0xed, 0x89, 0xad, 0xcc,
-	0x95, 0xa4, 0xd5, 0x79, 0x73, 0x51, 0xe0, 0x66, 0x02, 0xb3, 0x1b, 0x83, 0x03, 0x67, 0xe8, 0x25,
-	0x00, 0x38, 0x70, 0xe2, 0x77, 0x80, 0xfa, 0x8f, 0x04, 0x72, 0x32, 0x92, 0x2f, 0xaa, 0x64, 0xc3,
-	0x22, 0xee, 0x61, 0xc7, 0x65, 0x17, 0xda, 0x3a, 0xf7, 0xbd, 0x0b, 0x49, 0xd9, 0x1a, 0x73, 0x26,
-	0x86, 0xbf, 0x50, 0xd6, 0x92, 0xf4, 0x37, 0x2c, 0x5b, 0xcc, 0xc0, 0x3c, 0x1e, 0x00, 0x8b, 0x27,
-	0x70, 0x73, 0x44, 0xd8, 0x88, 0xe9, 0xf1, 0xbc, 0x7f, 0x7a, 0x64, 0x37, 0xee, 0x8d, 0x21, 0xc1,
-	0xbe, 0x91, 0x10, 0xe8, 0x1f, 0x31, 0x79, 0xc8, 0xf5, 0xbb, 0x36, 0xfe, 0xbc, 0x01, 0x50, 0x65,
-	0xa9, 0x7c, 0x72, 0xa1, 0xdf, 0x25, 0x58, 0x18, 0xd0, 0x54, 0x34, 0xee, 0x39, 0x37, 0x4a, 0xe6,
-	0x8b, 0x9f, 0x5d, 0x2f, 0x58, 0xc8, 0xb4, 0xfa, 0xe4, 0xdb, 0xbf, 0xff, 0xfd, 0x39, 0x55, 0x41,
-	0x8f, 0xd9, 0xa3, 0xfa, 0x1b, 0x21, 0x6b, 0x2f, 0x82, 0xd0, 0x7f, 0x47, 0x5a, 0x34, 0xaa, 0xac,
-	0x55, 0x92, 0x77, 0x53, 0x54, 0x59, 0x7b, 0x5f, 0xb9, 0x94, 0xe7, 0x1f, 0x25, 0xc8, 0xf6, 0xa9,
-	0x2a, 0x7a, 0x38, 0x66, 0xd3, 0xab, 0xca, 0x5b, 0x9c, 0x24, 0x36, 0x43, 0x94, 0x98, 0x30, 0x8c,
-	0x21, 0x74, 0xc9, 0xa7, 0xb2, 0xf6, 0x1e, 0xfd, 0x2a, 0x41, 0x7e, 0x50, 0xbd, 0xd1, 0xb8, 0x52,
-	0x8c, 0x14, 0xf9, 0xe2, 0xdd, 0x24, 0xba, 0xef, 0xc5, 0x5f, 0xbe, 0xb8, 0xb1, 0xea, 0x4b, 0x4e,
-	0xeb, 0xb9, 0x3a, 0x5d, 0xa5, 0x36, 0x2f, 0xa4, 0x13, 0xfd, 0x21, 0x41, 0x7e, 0x50, 0xce, 0xc7,
-	0x12, 0x1c, 0xa9, 0xfa, 0x93, 0x08, 0xbe, 0xe2, 0x04, 0xb7, 0x37, 0x9e, 0x72, 0x82, 0xc9, 0xb6,
-	0xe5, 0xeb, 0x16, 0xb0, 0x8f, 0xe9, 0x07, 0x09, 0xe4, 0x61, 0x55, 0x45, 0xe5, 0xe9, 0xe4, 0x77,
-	0x12, 0x5b, 0x8d, 0xb3, 0xdd, 0x52, 0x9f, 0x4e, 0xd5, 0xe5, 0xcd, 0x93, 0x78, 0xb7, 0x4d, 0x69,
-	0x0d, 0xfd, 0x22, 0x41, 0x7e, 0x70, 0x18, 0x8d, 0x2d, 0xe8, 0xc8, 0x99, 0x35, 0x89, 0x62, 0x7c,
-	0x10, 0xd7, 0xa6, 0x3b, 0x88, 0xdb, 0x11, 0xdc, 0x69, 0xf9, 0x9d, 0xd1, 0x44, 0xb6, 0x95, 0xcb,
-	0x8b, 0xde, 0x20, 0x61, 0xcf, 0x69, 0x91, 0xa3, 0x75, 0x36, 0x7a, 0xfc, 0x43, 0xe9, 0xcd, 0x66,
-	0x9c, 0xd2, 0xf6, 0x5d, 0xec, 0xb5, 0xcb, 0x7e, 0xd8, 0xae, 0xb4, 0x89, 0xc7, 0x95, 0xbc, 0x22,
-	0x5c, 0x38, 0x70, 0xa2, 0xa1, 0x7f, 0xc2, 0x5b, 0x7c, 0x71, 0x3c, 0xc7, 0xc3, 0x3e, 0xff, 0x2f,
-	0x00, 0x00, 0xff, 0xff, 0xd9, 0x50, 0x6a, 0xff, 0x2f, 0x0f, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go b/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
index 57a94841e1..2d821451b2 100644
--- a/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
+++ b/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/redis/v1beta1/cloud_redis.proto
 
-package redis // import "google.golang.org/genproto/googleapis/cloud/redis/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package redis
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents the different states of a Redis instance.
 type Instance_State int32
@@ -64,6 +64,7 @@ var Instance_State_name = map[int32]string{
 	8:  "IMPORTING",
 	10: "FAILING_OVER",
 }
+
 var Instance_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          1,
@@ -79,8 +80,9 @@ var Instance_State_value = map[string]int32{
 func (x Instance_State) String() string {
 	return proto.EnumName(Instance_State_name, int32(x))
 }
+
 func (Instance_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{0, 0}
+	return fileDescriptor_522f9b2de914b9c5, []int{0, 0}
 }
 
 // Available service tiers to choose from
@@ -100,6 +102,7 @@ var Instance_Tier_name = map[int32]string{
 	1: "BASIC",
 	3: "STANDARD_HA",
 }
+
 var Instance_Tier_value = map[string]int32{
 	"TIER_UNSPECIFIED": 0,
 	"BASIC":            1,
@@ -109,8 +112,9 @@ var Instance_Tier_value = map[string]int32{
 func (x Instance_Tier) String() string {
 	return proto.EnumName(Instance_Tier_name, int32(x))
 }
+
 func (Instance_Tier) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{0, 1}
+	return fileDescriptor_522f9b2de914b9c5, []int{0, 1}
 }
 
 type FailoverInstanceRequest_DataProtectionMode int32
@@ -131,6 +135,7 @@ var FailoverInstanceRequest_DataProtectionMode_name = map[int32]string{
 	1: "LIMITED_DATA_LOSS",
 	2: "FORCE_DATA_LOSS",
 }
+
 var FailoverInstanceRequest_DataProtectionMode_value = map[string]int32{
 	"DATA_PROTECTION_MODE_UNSPECIFIED": 0,
 	"LIMITED_DATA_LOSS":                1,
@@ -140,8 +145,9 @@ var FailoverInstanceRequest_DataProtectionMode_value = map[string]int32{
 func (x FailoverInstanceRequest_DataProtectionMode) String() string {
 	return proto.EnumName(FailoverInstanceRequest_DataProtectionMode_name, int32(x))
 }
+
 func (FailoverInstanceRequest_DataProtectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{7, 0}
+	return fileDescriptor_522f9b2de914b9c5, []int{7, 0}
 }
 
 // A Google Cloud Redis instance.
@@ -234,16 +240,17 @@ func (m *Instance) Reset()         { *m = Instance{} }
 func (m *Instance) String() string { return proto.CompactTextString(m) }
 func (*Instance) ProtoMessage()    {}
 func (*Instance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{0}
+	return fileDescriptor_522f9b2de914b9c5, []int{0}
 }
+
 func (m *Instance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instance.Unmarshal(m, b)
 }
 func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
 }
-func (dst *Instance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instance.Merge(dst, src)
+func (m *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(m, src)
 }
 func (m *Instance) XXX_Size() int {
 	return xxx_messageInfo_Instance.Size(m)
@@ -400,16 +407,17 @@ func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
 func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesRequest) ProtoMessage()    {}
 func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{1}
+	return fileDescriptor_522f9b2de914b9c5, []int{1}
 }
+
 func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
 }
 func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+func (m *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(m, src)
 }
 func (m *ListInstancesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesRequest.Size(m)
@@ -469,16 +477,17 @@ func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
 func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesResponse) ProtoMessage()    {}
 func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{2}
+	return fileDescriptor_522f9b2de914b9c5, []int{2}
 }
+
 func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
 }
 func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+func (m *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(m, src)
 }
 func (m *ListInstancesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesResponse.Size(m)
@@ -525,16 +534,17 @@ func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
 func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInstanceRequest) ProtoMessage()    {}
 func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{3}
+	return fileDescriptor_522f9b2de914b9c5, []int{3}
 }
+
 func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
 }
 func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+func (m *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(m, src)
 }
 func (m *GetInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInstanceRequest.Size(m)
@@ -579,16 +589,17 @@ func (m *CreateInstanceRequest) Reset()         { *m = CreateInstanceRequest{} }
 func (m *CreateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateInstanceRequest) ProtoMessage()    {}
 func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{4}
+	return fileDescriptor_522f9b2de914b9c5, []int{4}
 }
+
 func (m *CreateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstanceRequest.Unmarshal(m, b)
 }
 func (m *CreateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstanceRequest.Merge(dst, src)
+func (m *CreateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceRequest.Merge(m, src)
 }
 func (m *CreateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateInstanceRequest.Size(m)
@@ -644,16 +655,17 @@ func (m *UpdateInstanceRequest) Reset()         { *m = UpdateInstanceRequest{} }
 func (m *UpdateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateInstanceRequest) ProtoMessage()    {}
 func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{5}
+	return fileDescriptor_522f9b2de914b9c5, []int{5}
 }
+
 func (m *UpdateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateInstanceRequest.Unmarshal(m, b)
 }
 func (m *UpdateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateInstanceRequest.Merge(dst, src)
+func (m *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceRequest.Merge(m, src)
 }
 func (m *UpdateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateInstanceRequest.Size(m)
@@ -694,16 +706,17 @@ func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
 func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteInstanceRequest) ProtoMessage()    {}
 func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{6}
+	return fileDescriptor_522f9b2de914b9c5, []int{6}
 }
+
 func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
 }
 func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+func (m *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(m, src)
 }
 func (m *DeleteInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
@@ -740,16 +753,17 @@ func (m *FailoverInstanceRequest) Reset()         { *m = FailoverInstanceRequest
 func (m *FailoverInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*FailoverInstanceRequest) ProtoMessage()    {}
 func (*FailoverInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{7}
+	return fileDescriptor_522f9b2de914b9c5, []int{7}
 }
+
 func (m *FailoverInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FailoverInstanceRequest.Unmarshal(m, b)
 }
 func (m *FailoverInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FailoverInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *FailoverInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FailoverInstanceRequest.Merge(dst, src)
+func (m *FailoverInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FailoverInstanceRequest.Merge(m, src)
 }
 func (m *FailoverInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_FailoverInstanceRequest.Size(m)
@@ -793,16 +807,17 @@ func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
 func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LocationMetadata) ProtoMessage()    {}
 func (*LocationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{8}
+	return fileDescriptor_522f9b2de914b9c5, []int{8}
 }
+
 func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
 }
 func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+func (m *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(m, src)
 }
 func (m *LocationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LocationMetadata.Size(m)
@@ -832,16 +847,17 @@ func (m *ZoneMetadata) Reset()         { *m = ZoneMetadata{} }
 func (m *ZoneMetadata) String() string { return proto.CompactTextString(m) }
 func (*ZoneMetadata) ProtoMessage()    {}
 func (*ZoneMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_redis_ec9ebde39ed154fe, []int{9}
+	return fileDescriptor_522f9b2de914b9c5, []int{9}
 }
+
 func (m *ZoneMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ZoneMetadata.Unmarshal(m, b)
 }
 func (m *ZoneMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ZoneMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ZoneMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ZoneMetadata.Merge(dst, src)
+func (m *ZoneMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ZoneMetadata.Merge(m, src)
 }
 func (m *ZoneMetadata) XXX_Size() int {
 	return xxx_messageInfo_ZoneMetadata.Size(m)
@@ -853,6 +869,9 @@ func (m *ZoneMetadata) XXX_DiscardUnknown() {
 var xxx_messageInfo_ZoneMetadata proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("google.cloud.redis.v1beta1.Instance_State", Instance_State_name, Instance_State_value)
+	proto.RegisterEnum("google.cloud.redis.v1beta1.Instance_Tier", Instance_Tier_name, Instance_Tier_value)
+	proto.RegisterEnum("google.cloud.redis.v1beta1.FailoverInstanceRequest_DataProtectionMode", FailoverInstanceRequest_DataProtectionMode_name, FailoverInstanceRequest_DataProtectionMode_value)
 	proto.RegisterType((*Instance)(nil), "google.cloud.redis.v1beta1.Instance")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.redis.v1beta1.Instance.LabelsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.redis.v1beta1.Instance.RedisConfigsEntry")
@@ -866,9 +885,103 @@ func init() {
 	proto.RegisterType((*LocationMetadata)(nil), "google.cloud.redis.v1beta1.LocationMetadata")
 	proto.RegisterMapType((map[string]*ZoneMetadata)(nil), "google.cloud.redis.v1beta1.LocationMetadata.AvailableZonesEntry")
 	proto.RegisterType((*ZoneMetadata)(nil), "google.cloud.redis.v1beta1.ZoneMetadata")
-	proto.RegisterEnum("google.cloud.redis.v1beta1.Instance_State", Instance_State_name, Instance_State_value)
-	proto.RegisterEnum("google.cloud.redis.v1beta1.Instance_Tier", Instance_Tier_name, Instance_Tier_value)
-	proto.RegisterEnum("google.cloud.redis.v1beta1.FailoverInstanceRequest_DataProtectionMode", FailoverInstanceRequest_DataProtectionMode_name, FailoverInstanceRequest_DataProtectionMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/redis/v1beta1/cloud_redis.proto", fileDescriptor_522f9b2de914b9c5)
+}
+
+var fileDescriptor_522f9b2de914b9c5 = []byte{
+	// 1417 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x6f, 0x6f, 0xdb, 0x44,
+	0x18, 0xc7, 0x6d, 0x53, 0x9a, 0x27, 0x6d, 0xea, 0xde, 0x5a, 0x66, 0x02, 0x63, 0xc1, 0x1b, 0xa8,
+	0x14, 0x70, 0x58, 0x86, 0xa6, 0xd1, 0x6a, 0x5b, 0xdd, 0xc4, 0xed, 0x2c, 0x35, 0x7f, 0xe4, 0x64,
+	0x93, 0x18, 0x2f, 0xac, 0x6b, 0x7c, 0xcd, 0xbc, 0x3a, 0x3e, 0x63, 0x3b, 0x61, 0x2d, 0x9a, 0x90,
+	0xf8, 0x02, 0x48, 0x03, 0xf1, 0x12, 0x5e, 0x21, 0xf1, 0x0a, 0xc1, 0x67, 0xe1, 0x2b, 0xf0, 0x8a,
+	0x77, 0x7c, 0x03, 0x74, 0x67, 0xbb, 0x75, 0xd2, 0x34, 0xcb, 0xfa, 0xee, 0xee, 0xf7, 0xfc, 0x9e,
+	0xbb, 0x9f, 0x9f, 0xe7, 0xee, 0x67, 0x1b, 0x3e, 0xe9, 0x52, 0xda, 0x75, 0x48, 0xa9, 0xe3, 0xd0,
+	0xbe, 0x55, 0xf2, 0x89, 0x65, 0x07, 0xa5, 0xc1, 0xad, 0x03, 0x12, 0xe2, 0x5b, 0x11, 0x66, 0x72,
+	0x4c, 0xf1, 0x7c, 0x1a, 0x52, 0x54, 0x88, 0xd8, 0x0a, 0x8f, 0x28, 0x51, 0x24, 0x66, 0x17, 0xde,
+	0x8d, 0x57, 0xc2, 0x9e, 0x5d, 0xc2, 0xae, 0x4b, 0x43, 0x1c, 0xda, 0xd4, 0x8d, 0x33, 0x0b, 0x6f,
+	0xa7, 0xa2, 0x3e, 0x09, 0x68, 0xdf, 0xef, 0x90, 0x38, 0x74, 0x23, 0x0e, 0x39, 0xd4, 0xed, 0xfa,
+	0x7d, 0xd7, 0xb5, 0xdd, 0x6e, 0x89, 0x7a, 0xc4, 0x1f, 0xca, 0x2f, 0xc6, 0x24, 0x3e, 0x3b, 0xe8,
+	0x1f, 0x96, 0x0e, 0x6d, 0xe2, 0x58, 0x66, 0x0f, 0x07, 0x47, 0x31, 0xe3, 0xfa, 0x28, 0x23, 0xb4,
+	0x7b, 0x24, 0x08, 0x71, 0xcf, 0x8b, 0x08, 0xf2, 0x7f, 0x0b, 0xb0, 0xa0, 0xbb, 0x41, 0x88, 0xdd,
+	0x0e, 0x41, 0x08, 0xe6, 0x5c, 0xdc, 0x23, 0x92, 0x50, 0x14, 0xd6, 0xb3, 0x06, 0x1f, 0xa3, 0xf7,
+	0x61, 0xd1, 0xb2, 0x03, 0xcf, 0xc1, 0xc7, 0x26, 0x8f, 0xcd, 0xf0, 0x58, 0x2e, 0xc6, 0xea, 0x8c,
+	0xf2, 0x10, 0xe6, 0x1d, 0x7c, 0x40, 0x9c, 0x40, 0x9a, 0x2d, 0xce, 0xae, 0xe7, 0xca, 0x9f, 0x29,
+	0x17, 0x57, 0x44, 0x49, 0x36, 0x53, 0xf6, 0x79, 0x8a, 0xe6, 0x86, 0xfe, 0xb1, 0x11, 0xe7, 0xa3,
+	0xeb, 0x90, 0x73, 0x68, 0x87, 0x3f, 0xa3, 0x69, 0x5b, 0xd2, 0x1c, 0xdf, 0x0b, 0x12, 0x48, 0xb7,
+	0xd0, 0x1d, 0xb8, 0x8a, 0x9d, 0x90, 0xf8, 0x2e, 0x0e, 0xed, 0x01, 0x31, 0xd3, 0xe4, 0x0c, 0x27,
+	0xaf, 0xa5, 0xc2, 0xfb, 0x67, 0x79, 0x37, 0x60, 0x89, 0xcb, 0x30, 0x07, 0xc4, 0x0f, 0x6c, 0xea,
+	0x4a, 0x6f, 0x72, 0xf6, 0x22, 0x07, 0x1f, 0x47, 0x18, 0xda, 0x80, 0x15, 0x9f, 0x04, 0xc4, 0x1f,
+	0x10, 0xcb, 0xb4, 0x3d, 0xd3, 0xc7, 0x6e, 0x97, 0x48, 0x59, 0x4e, 0x5c, 0x4e, 0x02, 0xba, 0x67,
+	0x30, 0x98, 0x95, 0xea, 0x29, 0x0d, 0x42, 0x09, 0xa2, 0x52, 0xb1, 0x31, 0xc3, 0x3c, 0xea, 0x87,
+	0x52, 0xae, 0x28, 0xac, 0x67, 0x0c, 0x3e, 0x46, 0x0a, 0x5c, 0xe9, 0xf4, 0x7d, 0x9f, 0xb8, 0xe1,
+	0x90, 0xd8, 0x45, 0x9e, 0xb6, 0x12, 0x87, 0x52, 0x42, 0xb7, 0x20, 0xd7, 0xf1, 0x09, 0x0e, 0x89,
+	0xc9, 0x3a, 0x25, 0x2d, 0x15, 0x85, 0xf5, 0x5c, 0xb9, 0x90, 0x14, 0x34, 0x69, 0xa3, 0xd2, 0x4e,
+	0xda, 0x68, 0x40, 0x44, 0x67, 0x00, 0xda, 0x86, 0x4c, 0x10, 0xe2, 0x90, 0x48, 0xf9, 0xa2, 0xb0,
+	0x9e, 0x2f, 0x6f, 0x4c, 0xd5, 0x87, 0x16, 0xcb, 0x30, 0xa2, 0x44, 0xf4, 0x01, 0xe4, 0xd9, 0xa0,
+	0x1f, 0x98, 0x3d, 0x12, 0x04, 0xb8, 0x4b, 0xa4, 0x65, 0xae, 0x74, 0x29, 0x42, 0x6b, 0x11, 0x88,
+	0xbe, 0x4a, 0xca, 0xd9, 0xa1, 0xee, 0xa1, 0xdd, 0x0d, 0x24, 0x91, 0x37, 0xfe, 0xce, 0x54, 0x1b,
+	0x1a, 0x0c, 0xae, 0x44, 0x89, 0x51, 0xfb, 0xa3, 0x36, 0xc4, 0x10, 0xba, 0x07, 0x73, 0xa1, 0x4d,
+	0x7c, 0x69, 0x85, 0x3f, 0xc4, 0x47, 0x53, 0xad, 0xd9, 0xb6, 0x89, 0x6f, 0xf0, 0x34, 0x74, 0x13,
+	0xf2, 0x3d, 0xd2, 0xa3, 0xfe, 0xb1, 0x19, 0xd8, 0x27, 0xc4, 0xec, 0x1e, 0x48, 0x88, 0xf7, 0x63,
+	0x31, 0x42, 0x5b, 0xf6, 0x09, 0xd9, 0x3b, 0x40, 0x9f, 0x02, 0xc2, 0xfd, 0xf0, 0x29, 0xf5, 0xed,
+	0x13, 0x62, 0x99, 0x2e, 0x09, 0xbf, 0xa1, 0xfe, 0x91, 0xb4, 0x1a, 0xb5, 0xe5, 0x2c, 0x52, 0x8f,
+	0x02, 0x85, 0x2f, 0x20, 0x97, 0x3a, 0xaf, 0x48, 0x84, 0xd9, 0x23, 0x72, 0x1c, 0xdf, 0x13, 0x36,
+	0x44, 0xab, 0x90, 0x19, 0x60, 0xa7, 0x9f, 0xdc, 0x8f, 0x68, 0xb2, 0x39, 0x73, 0x57, 0x28, 0x3c,
+	0x80, 0x95, 0x73, 0x4f, 0xfc, 0x3a, 0x0b, 0xc8, 0x3f, 0x09, 0x90, 0xe1, 0x4d, 0x42, 0x6b, 0xb0,
+	0xd2, 0x6a, 0xab, 0x6d, 0xcd, 0x7c, 0x54, 0x6f, 0x35, 0xb5, 0x8a, 0xbe, 0xab, 0x6b, 0x55, 0xf1,
+	0x0d, 0xb4, 0x08, 0x0b, 0x15, 0x43, 0x53, 0xdb, 0x7a, 0x7d, 0x4f, 0x14, 0x50, 0x16, 0x32, 0x86,
+	0xa6, 0x56, 0xbf, 0x14, 0x67, 0x58, 0xe0, 0x51, 0xb3, 0x1a, 0x05, 0x66, 0xd9, 0xac, 0xaa, 0xed,
+	0x6b, 0x7c, 0x36, 0x87, 0x96, 0x20, 0x6b, 0x68, 0x4d, 0x55, 0x37, 0xd8, 0x34, 0x83, 0x96, 0x21,
+	0x57, 0x53, 0xf5, 0x7a, 0x5b, 0xab, 0xab, 0xf5, 0x8a, 0x26, 0xce, 0xb3, 0xb8, 0x5e, 0x6b, 0x36,
+	0x0c, 0x4e, 0x5f, 0x40, 0x22, 0x2c, 0xee, 0xaa, 0xfa, 0xbe, 0x5e, 0xdf, 0x33, 0x1b, 0x8f, 0x35,
+	0x43, 0x04, 0xf9, 0x2e, 0xcc, 0xb1, 0xaa, 0xa3, 0x55, 0x10, 0xdb, 0xba, 0x66, 0x8c, 0x68, 0xca,
+	0x42, 0x66, 0x47, 0x6d, 0xe9, 0x15, 0x51, 0x60, 0x4b, 0xb7, 0xda, 0x6a, 0xbd, 0xaa, 0x1a, 0x55,
+	0xf3, 0xa1, 0x2a, 0xce, 0xca, 0xcf, 0x60, 0x75, 0xdf, 0x0e, 0xc2, 0xa4, 0x79, 0x81, 0x41, 0xbe,
+	0xee, 0x93, 0x20, 0x44, 0x6f, 0xc1, 0xbc, 0x87, 0xd9, 0x7d, 0x88, 0xeb, 0x12, 0xcf, 0xd0, 0x3b,
+	0x90, 0xf5, 0x70, 0x97, 0xf0, 0x7e, 0xf2, 0xf2, 0x64, 0x8c, 0x05, 0x06, 0xb0, 0x56, 0xa2, 0x6b,
+	0x00, 0x3c, 0x18, 0xd2, 0x23, 0xe2, 0x4a, 0xb3, 0x3c, 0x91, 0xd3, 0xdb, 0x0c, 0x90, 0x7f, 0x13,
+	0x60, 0x6d, 0x64, 0xb3, 0xc0, 0xa3, 0x6e, 0x40, 0xd0, 0x0e, 0x64, 0xed, 0x04, 0x94, 0x04, 0x7e,
+	0x7e, 0x6f, 0x4e, 0x73, 0xd6, 0x8c, 0xb3, 0x34, 0xf4, 0x21, 0x2c, 0xbb, 0xe4, 0x79, 0x68, 0xa6,
+	0x14, 0x44, 0xed, 0x5b, 0x62, 0x70, 0x33, 0x51, 0x81, 0x8a, 0x90, 0xeb, 0xbb, 0x3e, 0xc1, 0x9d,
+	0xa7, 0xf8, 0xc0, 0x21, 0xdc, 0x26, 0xb3, 0x46, 0x1a, 0x92, 0xd7, 0x01, 0xed, 0x91, 0x53, 0x95,
+	0x49, 0x45, 0xc6, 0x18, 0xb2, 0xfc, 0x52, 0x80, 0xb5, 0x0a, 0xbf, 0xf3, 0xa3, 0xec, 0x8b, 0xea,
+	0x77, 0x1d, 0x72, 0x89, 0x64, 0xe6, 0x3d, 0x91, 0x42, 0x48, 0x20, 0xdd, 0x42, 0xdb, 0xb0, 0x90,
+	0xcc, 0x78, 0x05, 0xa7, 0xad, 0xc4, 0x69, 0x96, 0xfc, 0xb3, 0x00, 0x6b, 0x8f, 0x3c, 0x6b, 0x8c,
+	0xa8, 0x2d, 0xc8, 0xf5, 0x79, 0x80, 0xbf, 0x96, 0xb8, 0xb2, 0x71, 0x86, 0xb6, 0xcb, 0xde, 0x5c,
+	0x35, 0x1c, 0x1c, 0x19, 0x10, 0xd1, 0xd9, 0x78, 0x48, 0xd8, 0xcc, 0xa5, 0x84, 0x7d, 0x0c, 0x6b,
+	0x55, 0xe2, 0x90, 0xf3, 0xba, 0xc6, 0x95, 0xf6, 0x87, 0x19, 0xb8, 0xba, 0x8b, 0x6d, 0x87, 0x0e,
+	0x88, 0x3f, 0x05, 0x1f, 0x3d, 0x87, 0x55, 0x0b, 0x87, 0xd8, 0x64, 0x4f, 0x41, 0x3a, 0xdc, 0xdb,
+	0x7b, 0xd4, 0x8a, 0xa4, 0xe6, 0xcb, 0xbb, 0x93, 0xa4, 0x5e, 0xb0, 0x8d, 0x52, 0xc5, 0x21, 0x6e,
+	0x9e, 0x2e, 0x57, 0xa3, 0x16, 0x31, 0x90, 0x75, 0x0e, 0x93, 0x0f, 0x01, 0x9d, 0x67, 0xa2, 0x9b,
+	0x50, 0xac, 0xaa, 0x6d, 0xd5, 0x6c, 0x1a, 0x8d, 0xb6, 0x56, 0x69, 0xeb, 0x8d, 0xba, 0x59, 0x6b,
+	0x54, 0x47, 0xed, 0x62, 0x0d, 0x56, 0xf6, 0xf5, 0x9a, 0xde, 0xd6, 0xaa, 0x26, 0x67, 0xef, 0x37,
+	0x5a, 0x2d, 0x51, 0x40, 0x57, 0x60, 0x79, 0xb7, 0x61, 0x54, 0xb4, 0x14, 0x38, 0x23, 0xff, 0x2b,
+	0x80, 0x98, 0xbc, 0x9d, 0x6a, 0x24, 0xc4, 0x4c, 0x0a, 0xb2, 0x61, 0x19, 0x0f, 0xb0, 0xed, 0xb0,
+	0x83, 0x6b, 0x9e, 0x50, 0xf7, 0xf4, 0xfe, 0x6c, 0x4f, 0x7a, 0xe2, 0xd1, 0x65, 0x14, 0x35, 0x59,
+	0xe3, 0x09, 0x5b, 0x22, 0x7a, 0x13, 0xe4, 0xf1, 0x10, 0x58, 0x38, 0x82, 0x2b, 0x63, 0x68, 0x63,
+	0xec, 0xf3, 0x7e, 0xda, 0x3e, 0x73, 0xe5, 0xf5, 0x49, 0x4a, 0xd8, 0x42, 0x89, 0x8a, 0xb4, 0xd1,
+	0xe6, 0x61, 0x31, 0x1d, 0x2a, 0xbf, 0x5c, 0x00, 0xa8, 0xb0, 0x7c, 0xee, 0xdf, 0xe8, 0x4f, 0x01,
+	0x96, 0x86, 0xac, 0x04, 0x4d, 0xfc, 0xd0, 0x19, 0x67, 0x71, 0x85, 0x5b, 0xaf, 0x91, 0x11, 0xf9,
+	0x94, 0xbc, 0xf9, 0xfd, 0xdf, 0xff, 0xfc, 0x38, 0xf3, 0x39, 0x2a, 0x9f, 0x7e, 0x82, 0x7e, 0x1b,
+	0xdd, 0xeb, 0x7b, 0x9e, 0x4f, 0x9f, 0x91, 0x4e, 0x18, 0x94, 0x36, 0x4a, 0xc9, 0xb7, 0x45, 0x50,
+	0xda, 0x78, 0x51, 0x3a, 0xf3, 0xa7, 0x5f, 0x05, 0xc8, 0xa5, 0x6c, 0x05, 0x29, 0x93, 0xb6, 0x3f,
+	0xef, 0x3f, 0x85, 0xa9, 0x6e, 0xdb, 0x38, 0x85, 0xec, 0x7a, 0x5c, 0xa0, 0xef, 0x4c, 0x5e, 0x69,
+	0xe3, 0x05, 0xfa, 0x5d, 0x80, 0xfc, 0xb0, 0x9b, 0xa1, 0x89, 0x35, 0x1a, 0xeb, 0x7c, 0x85, 0x6b,
+	0x49, 0x4a, 0xea, 0x73, 0x59, 0x69, 0x24, 0x9f, 0xcb, 0x72, 0x95, 0x0b, 0xbc, 0x2f, 0x5f, 0xa2,
+	0x84, 0x9b, 0xa7, 0x56, 0x82, 0xfe, 0x12, 0x20, 0x3f, 0xec, 0x71, 0x93, 0xa5, 0x8e, 0xf5, 0xc3,
+	0x57, 0x49, 0xad, 0x71, 0xa9, 0x7b, 0xe5, 0xad, 0x33, 0xa9, 0x89, 0x00, 0x65, 0xda, 0xa2, 0xa6,
+	0x34, 0xff, 0x21, 0x80, 0x38, 0x6a, 0x35, 0xe8, 0xf6, 0x25, 0x8c, 0xe9, 0x55, 0xba, 0x77, 0xb9,
+	0xee, 0x6d, 0x79, 0xeb, 0xf5, 0xcf, 0xc0, 0xe6, 0x61, 0xbc, 0xe5, 0xa6, 0xb0, 0x81, 0x7e, 0x11,
+	0x20, 0x3f, 0x6c, 0xd8, 0x93, 0x8b, 0x3c, 0xd6, 0xdc, 0x5f, 0x25, 0x36, 0x3e, 0xb0, 0x1b, 0x97,
+	0x38, 0xb0, 0x3b, 0xdf, 0xc1, 0x7b, 0x1d, 0xda, 0x9b, 0x20, 0x69, 0xa7, 0x70, 0xe6, 0x19, 0x2d,
+	0xe2, 0x0f, 0xec, 0x0e, 0xd9, 0x21, 0x91, 0x55, 0xd3, 0xa6, 0xf0, 0xe4, 0x41, 0x9c, 0xd9, 0xa5,
+	0x0e, 0x76, 0xbb, 0x0a, 0xf5, 0xbb, 0xa5, 0x2e, 0x71, 0xf9, 0x7b, 0xb0, 0x14, 0x85, 0xb0, 0x67,
+	0x07, 0xe3, 0x7e, 0x3d, 0xb7, 0xf8, 0xec, 0x60, 0x9e, 0x73, 0x6f, 0xff, 0x1f, 0x00, 0x00, 0xff,
+	0xff, 0xfd, 0x6d, 0xa4, 0x8f, 0xa5, 0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1167,100 +1280,3 @@ var _CloudRedis_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/redis/v1beta1/cloud_redis.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/redis/v1beta1/cloud_redis.proto", fileDescriptor_cloud_redis_ec9ebde39ed154fe)
-}
-
-var fileDescriptor_cloud_redis_ec9ebde39ed154fe = []byte{
-	// 1417 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x6f, 0x6f, 0xdb, 0x44,
-	0x18, 0xc7, 0x6d, 0x53, 0x9a, 0x27, 0x6d, 0xea, 0xde, 0x5a, 0x66, 0x02, 0x63, 0xc1, 0x1b, 0xa8,
-	0x14, 0x70, 0x58, 0x86, 0xa6, 0xd1, 0x6a, 0x5b, 0xdd, 0xc4, 0xed, 0x2c, 0x35, 0x7f, 0xe4, 0x64,
-	0x93, 0x18, 0x2f, 0xac, 0x6b, 0x7c, 0xcd, 0xbc, 0x3a, 0x3e, 0x63, 0x3b, 0x61, 0x2d, 0x9a, 0x90,
-	0xf8, 0x02, 0x48, 0x03, 0xf1, 0x12, 0x5e, 0x21, 0xf1, 0x0a, 0xc1, 0x67, 0xe1, 0x2b, 0xf0, 0x8a,
-	0x77, 0x7c, 0x03, 0x74, 0x67, 0xbb, 0x75, 0xd2, 0x34, 0xcb, 0xfa, 0xee, 0xee, 0xf7, 0xfc, 0x9e,
-	0xbb, 0x9f, 0x9f, 0xe7, 0xee, 0x67, 0x1b, 0x3e, 0xe9, 0x52, 0xda, 0x75, 0x48, 0xa9, 0xe3, 0xd0,
-	0xbe, 0x55, 0xf2, 0x89, 0x65, 0x07, 0xa5, 0xc1, 0xad, 0x03, 0x12, 0xe2, 0x5b, 0x11, 0x66, 0x72,
-	0x4c, 0xf1, 0x7c, 0x1a, 0x52, 0x54, 0x88, 0xd8, 0x0a, 0x8f, 0x28, 0x51, 0x24, 0x66, 0x17, 0xde,
-	0x8d, 0x57, 0xc2, 0x9e, 0x5d, 0xc2, 0xae, 0x4b, 0x43, 0x1c, 0xda, 0xd4, 0x8d, 0x33, 0x0b, 0x6f,
-	0xa7, 0xa2, 0x3e, 0x09, 0x68, 0xdf, 0xef, 0x90, 0x38, 0x74, 0x23, 0x0e, 0x39, 0xd4, 0xed, 0xfa,
-	0x7d, 0xd7, 0xb5, 0xdd, 0x6e, 0x89, 0x7a, 0xc4, 0x1f, 0xca, 0x2f, 0xc6, 0x24, 0x3e, 0x3b, 0xe8,
-	0x1f, 0x96, 0x0e, 0x6d, 0xe2, 0x58, 0x66, 0x0f, 0x07, 0x47, 0x31, 0xe3, 0xfa, 0x28, 0x23, 0xb4,
-	0x7b, 0x24, 0x08, 0x71, 0xcf, 0x8b, 0x08, 0xf2, 0x7f, 0x0b, 0xb0, 0xa0, 0xbb, 0x41, 0x88, 0xdd,
-	0x0e, 0x41, 0x08, 0xe6, 0x5c, 0xdc, 0x23, 0x92, 0x50, 0x14, 0xd6, 0xb3, 0x06, 0x1f, 0xa3, 0xf7,
-	0x61, 0xd1, 0xb2, 0x03, 0xcf, 0xc1, 0xc7, 0x26, 0x8f, 0xcd, 0xf0, 0x58, 0x2e, 0xc6, 0xea, 0x8c,
-	0xf2, 0x10, 0xe6, 0x1d, 0x7c, 0x40, 0x9c, 0x40, 0x9a, 0x2d, 0xce, 0xae, 0xe7, 0xca, 0x9f, 0x29,
-	0x17, 0x57, 0x44, 0x49, 0x36, 0x53, 0xf6, 0x79, 0x8a, 0xe6, 0x86, 0xfe, 0xb1, 0x11, 0xe7, 0xa3,
-	0xeb, 0x90, 0x73, 0x68, 0x87, 0x3f, 0xa3, 0x69, 0x5b, 0xd2, 0x1c, 0xdf, 0x0b, 0x12, 0x48, 0xb7,
-	0xd0, 0x1d, 0xb8, 0x8a, 0x9d, 0x90, 0xf8, 0x2e, 0x0e, 0xed, 0x01, 0x31, 0xd3, 0xe4, 0x0c, 0x27,
-	0xaf, 0xa5, 0xc2, 0xfb, 0x67, 0x79, 0x37, 0x60, 0x89, 0xcb, 0x30, 0x07, 0xc4, 0x0f, 0x6c, 0xea,
-	0x4a, 0x6f, 0x72, 0xf6, 0x22, 0x07, 0x1f, 0x47, 0x18, 0xda, 0x80, 0x15, 0x9f, 0x04, 0xc4, 0x1f,
-	0x10, 0xcb, 0xb4, 0x3d, 0xd3, 0xc7, 0x6e, 0x97, 0x48, 0x59, 0x4e, 0x5c, 0x4e, 0x02, 0xba, 0x67,
-	0x30, 0x98, 0x95, 0xea, 0x29, 0x0d, 0x42, 0x09, 0xa2, 0x52, 0xb1, 0x31, 0xc3, 0x3c, 0xea, 0x87,
-	0x52, 0xae, 0x28, 0xac, 0x67, 0x0c, 0x3e, 0x46, 0x0a, 0x5c, 0xe9, 0xf4, 0x7d, 0x9f, 0xb8, 0xe1,
-	0x90, 0xd8, 0x45, 0x9e, 0xb6, 0x12, 0x87, 0x52, 0x42, 0xb7, 0x20, 0xd7, 0xf1, 0x09, 0x0e, 0x89,
-	0xc9, 0x3a, 0x25, 0x2d, 0x15, 0x85, 0xf5, 0x5c, 0xb9, 0x90, 0x14, 0x34, 0x69, 0xa3, 0xd2, 0x4e,
-	0xda, 0x68, 0x40, 0x44, 0x67, 0x00, 0xda, 0x86, 0x4c, 0x10, 0xe2, 0x90, 0x48, 0xf9, 0xa2, 0xb0,
-	0x9e, 0x2f, 0x6f, 0x4c, 0xd5, 0x87, 0x16, 0xcb, 0x30, 0xa2, 0x44, 0xf4, 0x01, 0xe4, 0xd9, 0xa0,
-	0x1f, 0x98, 0x3d, 0x12, 0x04, 0xb8, 0x4b, 0xa4, 0x65, 0xae, 0x74, 0x29, 0x42, 0x6b, 0x11, 0x88,
-	0xbe, 0x4a, 0xca, 0xd9, 0xa1, 0xee, 0xa1, 0xdd, 0x0d, 0x24, 0x91, 0x37, 0xfe, 0xce, 0x54, 0x1b,
-	0x1a, 0x0c, 0xae, 0x44, 0x89, 0x51, 0xfb, 0xa3, 0x36, 0xc4, 0x10, 0xba, 0x07, 0x73, 0xa1, 0x4d,
-	0x7c, 0x69, 0x85, 0x3f, 0xc4, 0x47, 0x53, 0xad, 0xd9, 0xb6, 0x89, 0x6f, 0xf0, 0x34, 0x74, 0x13,
-	0xf2, 0x3d, 0xd2, 0xa3, 0xfe, 0xb1, 0x19, 0xd8, 0x27, 0xc4, 0xec, 0x1e, 0x48, 0x88, 0xf7, 0x63,
-	0x31, 0x42, 0x5b, 0xf6, 0x09, 0xd9, 0x3b, 0x40, 0x9f, 0x02, 0xc2, 0xfd, 0xf0, 0x29, 0xf5, 0xed,
-	0x13, 0x62, 0x99, 0x2e, 0x09, 0xbf, 0xa1, 0xfe, 0x91, 0xb4, 0x1a, 0xb5, 0xe5, 0x2c, 0x52, 0x8f,
-	0x02, 0x85, 0x2f, 0x20, 0x97, 0x3a, 0xaf, 0x48, 0x84, 0xd9, 0x23, 0x72, 0x1c, 0xdf, 0x13, 0x36,
-	0x44, 0xab, 0x90, 0x19, 0x60, 0xa7, 0x9f, 0xdc, 0x8f, 0x68, 0xb2, 0x39, 0x73, 0x57, 0x28, 0x3c,
-	0x80, 0x95, 0x73, 0x4f, 0xfc, 0x3a, 0x0b, 0xc8, 0x3f, 0x09, 0x90, 0xe1, 0x4d, 0x42, 0x6b, 0xb0,
-	0xd2, 0x6a, 0xab, 0x6d, 0xcd, 0x7c, 0x54, 0x6f, 0x35, 0xb5, 0x8a, 0xbe, 0xab, 0x6b, 0x55, 0xf1,
-	0x0d, 0xb4, 0x08, 0x0b, 0x15, 0x43, 0x53, 0xdb, 0x7a, 0x7d, 0x4f, 0x14, 0x50, 0x16, 0x32, 0x86,
-	0xa6, 0x56, 0xbf, 0x14, 0x67, 0x58, 0xe0, 0x51, 0xb3, 0x1a, 0x05, 0x66, 0xd9, 0xac, 0xaa, 0xed,
-	0x6b, 0x7c, 0x36, 0x87, 0x96, 0x20, 0x6b, 0x68, 0x4d, 0x55, 0x37, 0xd8, 0x34, 0x83, 0x96, 0x21,
-	0x57, 0x53, 0xf5, 0x7a, 0x5b, 0xab, 0xab, 0xf5, 0x8a, 0x26, 0xce, 0xb3, 0xb8, 0x5e, 0x6b, 0x36,
-	0x0c, 0x4e, 0x5f, 0x40, 0x22, 0x2c, 0xee, 0xaa, 0xfa, 0xbe, 0x5e, 0xdf, 0x33, 0x1b, 0x8f, 0x35,
-	0x43, 0x04, 0xf9, 0x2e, 0xcc, 0xb1, 0xaa, 0xa3, 0x55, 0x10, 0xdb, 0xba, 0x66, 0x8c, 0x68, 0xca,
-	0x42, 0x66, 0x47, 0x6d, 0xe9, 0x15, 0x51, 0x60, 0x4b, 0xb7, 0xda, 0x6a, 0xbd, 0xaa, 0x1a, 0x55,
-	0xf3, 0xa1, 0x2a, 0xce, 0xca, 0xcf, 0x60, 0x75, 0xdf, 0x0e, 0xc2, 0xa4, 0x79, 0x81, 0x41, 0xbe,
-	0xee, 0x93, 0x20, 0x44, 0x6f, 0xc1, 0xbc, 0x87, 0xd9, 0x7d, 0x88, 0xeb, 0x12, 0xcf, 0xd0, 0x3b,
-	0x90, 0xf5, 0x70, 0x97, 0xf0, 0x7e, 0xf2, 0xf2, 0x64, 0x8c, 0x05, 0x06, 0xb0, 0x56, 0xa2, 0x6b,
-	0x00, 0x3c, 0x18, 0xd2, 0x23, 0xe2, 0x4a, 0xb3, 0x3c, 0x91, 0xd3, 0xdb, 0x0c, 0x90, 0x7f, 0x13,
-	0x60, 0x6d, 0x64, 0xb3, 0xc0, 0xa3, 0x6e, 0x40, 0xd0, 0x0e, 0x64, 0xed, 0x04, 0x94, 0x04, 0x7e,
-	0x7e, 0x6f, 0x4e, 0x73, 0xd6, 0x8c, 0xb3, 0x34, 0xf4, 0x21, 0x2c, 0xbb, 0xe4, 0x79, 0x68, 0xa6,
-	0x14, 0x44, 0xed, 0x5b, 0x62, 0x70, 0x33, 0x51, 0x81, 0x8a, 0x90, 0xeb, 0xbb, 0x3e, 0xc1, 0x9d,
-	0xa7, 0xf8, 0xc0, 0x21, 0xdc, 0x26, 0xb3, 0x46, 0x1a, 0x92, 0xd7, 0x01, 0xed, 0x91, 0x53, 0x95,
-	0x49, 0x45, 0xc6, 0x18, 0xb2, 0xfc, 0x52, 0x80, 0xb5, 0x0a, 0xbf, 0xf3, 0xa3, 0xec, 0x8b, 0xea,
-	0x77, 0x1d, 0x72, 0x89, 0x64, 0xe6, 0x3d, 0x91, 0x42, 0x48, 0x20, 0xdd, 0x42, 0xdb, 0xb0, 0x90,
-	0xcc, 0x78, 0x05, 0xa7, 0xad, 0xc4, 0x69, 0x96, 0xfc, 0xb3, 0x00, 0x6b, 0x8f, 0x3c, 0x6b, 0x8c,
-	0xa8, 0x2d, 0xc8, 0xf5, 0x79, 0x80, 0xbf, 0x96, 0xb8, 0xb2, 0x71, 0x86, 0xb6, 0xcb, 0xde, 0x5c,
-	0x35, 0x1c, 0x1c, 0x19, 0x10, 0xd1, 0xd9, 0x78, 0x48, 0xd8, 0xcc, 0xa5, 0x84, 0x7d, 0x0c, 0x6b,
-	0x55, 0xe2, 0x90, 0xf3, 0xba, 0xc6, 0x95, 0xf6, 0x87, 0x19, 0xb8, 0xba, 0x8b, 0x6d, 0x87, 0x0e,
-	0x88, 0x3f, 0x05, 0x1f, 0x3d, 0x87, 0x55, 0x0b, 0x87, 0xd8, 0x64, 0x4f, 0x41, 0x3a, 0xdc, 0xdb,
-	0x7b, 0xd4, 0x8a, 0xa4, 0xe6, 0xcb, 0xbb, 0x93, 0xa4, 0x5e, 0xb0, 0x8d, 0x52, 0xc5, 0x21, 0x6e,
-	0x9e, 0x2e, 0x57, 0xa3, 0x16, 0x31, 0x90, 0x75, 0x0e, 0x93, 0x0f, 0x01, 0x9d, 0x67, 0xa2, 0x9b,
-	0x50, 0xac, 0xaa, 0x6d, 0xd5, 0x6c, 0x1a, 0x8d, 0xb6, 0x56, 0x69, 0xeb, 0x8d, 0xba, 0x59, 0x6b,
-	0x54, 0x47, 0xed, 0x62, 0x0d, 0x56, 0xf6, 0xf5, 0x9a, 0xde, 0xd6, 0xaa, 0x26, 0x67, 0xef, 0x37,
-	0x5a, 0x2d, 0x51, 0x40, 0x57, 0x60, 0x79, 0xb7, 0x61, 0x54, 0xb4, 0x14, 0x38, 0x23, 0xff, 0x2b,
-	0x80, 0x98, 0xbc, 0x9d, 0x6a, 0x24, 0xc4, 0x4c, 0x0a, 0xb2, 0x61, 0x19, 0x0f, 0xb0, 0xed, 0xb0,
-	0x83, 0x6b, 0x9e, 0x50, 0xf7, 0xf4, 0xfe, 0x6c, 0x4f, 0x7a, 0xe2, 0xd1, 0x65, 0x14, 0x35, 0x59,
-	0xe3, 0x09, 0x5b, 0x22, 0x7a, 0x13, 0xe4, 0xf1, 0x10, 0x58, 0x38, 0x82, 0x2b, 0x63, 0x68, 0x63,
-	0xec, 0xf3, 0x7e, 0xda, 0x3e, 0x73, 0xe5, 0xf5, 0x49, 0x4a, 0xd8, 0x42, 0x89, 0x8a, 0xb4, 0xd1,
-	0xe6, 0x61, 0x31, 0x1d, 0x2a, 0xbf, 0x5c, 0x00, 0xa8, 0xb0, 0x7c, 0xee, 0xdf, 0xe8, 0x4f, 0x01,
-	0x96, 0x86, 0xac, 0x04, 0x4d, 0xfc, 0xd0, 0x19, 0x67, 0x71, 0x85, 0x5b, 0xaf, 0x91, 0x11, 0xf9,
-	0x94, 0xbc, 0xf9, 0xfd, 0xdf, 0xff, 0xfc, 0x38, 0xf3, 0x39, 0x2a, 0x9f, 0x7e, 0x82, 0x7e, 0x1b,
-	0xdd, 0xeb, 0x7b, 0x9e, 0x4f, 0x9f, 0x91, 0x4e, 0x18, 0x94, 0x36, 0x4a, 0xc9, 0xb7, 0x45, 0x50,
-	0xda, 0x78, 0x51, 0x3a, 0xf3, 0xa7, 0x5f, 0x05, 0xc8, 0xa5, 0x6c, 0x05, 0x29, 0x93, 0xb6, 0x3f,
-	0xef, 0x3f, 0x85, 0xa9, 0x6e, 0xdb, 0x38, 0x85, 0xec, 0x7a, 0x5c, 0xa0, 0xef, 0x4c, 0x5e, 0x69,
-	0xe3, 0x05, 0xfa, 0x5d, 0x80, 0xfc, 0xb0, 0x9b, 0xa1, 0x89, 0x35, 0x1a, 0xeb, 0x7c, 0x85, 0x6b,
-	0x49, 0x4a, 0xea, 0x73, 0x59, 0x69, 0x24, 0x9f, 0xcb, 0x72, 0x95, 0x0b, 0xbc, 0x2f, 0x5f, 0xa2,
-	0x84, 0x9b, 0xa7, 0x56, 0x82, 0xfe, 0x12, 0x20, 0x3f, 0xec, 0x71, 0x93, 0xa5, 0x8e, 0xf5, 0xc3,
-	0x57, 0x49, 0xad, 0x71, 0xa9, 0x7b, 0xe5, 0xad, 0x33, 0xa9, 0x89, 0x00, 0x65, 0xda, 0xa2, 0xa6,
-	0x34, 0xff, 0x21, 0x80, 0x38, 0x6a, 0x35, 0xe8, 0xf6, 0x25, 0x8c, 0xe9, 0x55, 0xba, 0x77, 0xb9,
-	0xee, 0x6d, 0x79, 0xeb, 0xf5, 0xcf, 0xc0, 0xe6, 0x61, 0xbc, 0xe5, 0xa6, 0xb0, 0x81, 0x7e, 0x11,
-	0x20, 0x3f, 0x6c, 0xd8, 0x93, 0x8b, 0x3c, 0xd6, 0xdc, 0x5f, 0x25, 0x36, 0x3e, 0xb0, 0x1b, 0x97,
-	0x38, 0xb0, 0x3b, 0xdf, 0xc1, 0x7b, 0x1d, 0xda, 0x9b, 0x20, 0x69, 0xa7, 0x70, 0xe6, 0x19, 0x2d,
-	0xe2, 0x0f, 0xec, 0x0e, 0xd9, 0x21, 0x91, 0x55, 0xd3, 0xa6, 0xf0, 0xe4, 0x41, 0x9c, 0xd9, 0xa5,
-	0x0e, 0x76, 0xbb, 0x0a, 0xf5, 0xbb, 0xa5, 0x2e, 0x71, 0xf9, 0x7b, 0xb0, 0x14, 0x85, 0xb0, 0x67,
-	0x07, 0xe3, 0x7e, 0x3d, 0xb7, 0xf8, 0xec, 0x60, 0x9e, 0x73, 0x6f, 0xff, 0x1f, 0x00, 0x00, 0xff,
-	0xff, 0xfd, 0x6d, 0xa4, 0x8f, 0xa5, 0x0e, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/resourcemanager/v2/folders.pb.go b/googleapis/cloud/resourcemanager/v2/folders.pb.go
index 86078e3245..af8d80979f 100644
--- a/googleapis/cloud/resourcemanager/v2/folders.pb.go
+++ b/googleapis/cloud/resourcemanager/v2/folders.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/resourcemanager/v2/folders.proto
 
-package resourcemanager // import "google.golang.org/genproto/googleapis/cloud/resourcemanager/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package resourcemanager
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Folder lifecycle states.
 type Folder_LifecycleState int32
@@ -45,6 +45,7 @@ var Folder_LifecycleState_name = map[int32]string{
 	1: "ACTIVE",
 	2: "DELETE_REQUESTED",
 }
+
 var Folder_LifecycleState_value = map[string]int32{
 	"LIFECYCLE_STATE_UNSPECIFIED": 0,
 	"ACTIVE":                      1,
@@ -54,8 +55,9 @@ var Folder_LifecycleState_value = map[string]int32{
 func (x Folder_LifecycleState) String() string {
 	return proto.EnumName(Folder_LifecycleState_name, int32(x))
 }
+
 func (Folder_LifecycleState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{0, 0}
+	return fileDescriptor_fe78511a4713776e, []int{0, 0}
 }
 
 // The type of operation that failed.
@@ -75,6 +77,7 @@ var FolderOperation_OperationType_name = map[int32]string{
 	1: "CREATE",
 	2: "MOVE",
 }
+
 var FolderOperation_OperationType_value = map[string]int32{
 	"OPERATION_TYPE_UNSPECIFIED": 0,
 	"CREATE":                     1,
@@ -84,8 +87,9 @@ var FolderOperation_OperationType_value = map[string]int32{
 func (x FolderOperation_OperationType) String() string {
 	return proto.EnumName(FolderOperation_OperationType_name, int32(x))
 }
+
 func (FolderOperation_OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{11, 0}
+	return fileDescriptor_fe78511a4713776e, []int{11, 0}
 }
 
 // A Folder in an Organization's resource hierarchy, used to
@@ -122,16 +126,17 @@ func (m *Folder) Reset()         { *m = Folder{} }
 func (m *Folder) String() string { return proto.CompactTextString(m) }
 func (*Folder) ProtoMessage()    {}
 func (*Folder) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{0}
+	return fileDescriptor_fe78511a4713776e, []int{0}
 }
+
 func (m *Folder) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Folder.Unmarshal(m, b)
 }
 func (m *Folder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Folder.Marshal(b, m, deterministic)
 }
-func (dst *Folder) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Folder.Merge(dst, src)
+func (m *Folder) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Folder.Merge(m, src)
 }
 func (m *Folder) XXX_Size() int {
 	return xxx_messageInfo_Folder.Size(m)
@@ -211,16 +216,17 @@ func (m *ListFoldersRequest) Reset()         { *m = ListFoldersRequest{} }
 func (m *ListFoldersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFoldersRequest) ProtoMessage()    {}
 func (*ListFoldersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{1}
+	return fileDescriptor_fe78511a4713776e, []int{1}
 }
+
 func (m *ListFoldersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFoldersRequest.Unmarshal(m, b)
 }
 func (m *ListFoldersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFoldersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFoldersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFoldersRequest.Merge(dst, src)
+func (m *ListFoldersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFoldersRequest.Merge(m, src)
 }
 func (m *ListFoldersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFoldersRequest.Size(m)
@@ -277,16 +283,17 @@ func (m *ListFoldersResponse) Reset()         { *m = ListFoldersResponse{} }
 func (m *ListFoldersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFoldersResponse) ProtoMessage()    {}
 func (*ListFoldersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{2}
+	return fileDescriptor_fe78511a4713776e, []int{2}
 }
+
 func (m *ListFoldersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFoldersResponse.Unmarshal(m, b)
 }
 func (m *ListFoldersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFoldersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFoldersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFoldersResponse.Merge(dst, src)
+func (m *ListFoldersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFoldersResponse.Merge(m, src)
 }
 func (m *ListFoldersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFoldersResponse.Size(m)
@@ -346,16 +353,17 @@ func (m *SearchFoldersRequest) Reset()         { *m = SearchFoldersRequest{} }
 func (m *SearchFoldersRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchFoldersRequest) ProtoMessage()    {}
 func (*SearchFoldersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{3}
+	return fileDescriptor_fe78511a4713776e, []int{3}
 }
+
 func (m *SearchFoldersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchFoldersRequest.Unmarshal(m, b)
 }
 func (m *SearchFoldersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchFoldersRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchFoldersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchFoldersRequest.Merge(dst, src)
+func (m *SearchFoldersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchFoldersRequest.Merge(m, src)
 }
 func (m *SearchFoldersRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchFoldersRequest.Size(m)
@@ -405,16 +413,17 @@ func (m *SearchFoldersResponse) Reset()         { *m = SearchFoldersResponse{} }
 func (m *SearchFoldersResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchFoldersResponse) ProtoMessage()    {}
 func (*SearchFoldersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{4}
+	return fileDescriptor_fe78511a4713776e, []int{4}
 }
+
 func (m *SearchFoldersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchFoldersResponse.Unmarshal(m, b)
 }
 func (m *SearchFoldersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchFoldersResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchFoldersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchFoldersResponse.Merge(dst, src)
+func (m *SearchFoldersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchFoldersResponse.Merge(m, src)
 }
 func (m *SearchFoldersResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchFoldersResponse.Size(m)
@@ -453,16 +462,17 @@ func (m *GetFolderRequest) Reset()         { *m = GetFolderRequest{} }
 func (m *GetFolderRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFolderRequest) ProtoMessage()    {}
 func (*GetFolderRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{5}
+	return fileDescriptor_fe78511a4713776e, []int{5}
 }
+
 func (m *GetFolderRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFolderRequest.Unmarshal(m, b)
 }
 func (m *GetFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFolderRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFolderRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFolderRequest.Merge(dst, src)
+func (m *GetFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFolderRequest.Merge(m, src)
 }
 func (m *GetFolderRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFolderRequest.Size(m)
@@ -497,16 +507,17 @@ func (m *CreateFolderRequest) Reset()         { *m = CreateFolderRequest{} }
 func (m *CreateFolderRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateFolderRequest) ProtoMessage()    {}
 func (*CreateFolderRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{6}
+	return fileDescriptor_fe78511a4713776e, []int{6}
 }
+
 func (m *CreateFolderRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateFolderRequest.Unmarshal(m, b)
 }
 func (m *CreateFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateFolderRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateFolderRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateFolderRequest.Merge(dst, src)
+func (m *CreateFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateFolderRequest.Merge(m, src)
 }
 func (m *CreateFolderRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateFolderRequest.Size(m)
@@ -549,16 +560,17 @@ func (m *MoveFolderRequest) Reset()         { *m = MoveFolderRequest{} }
 func (m *MoveFolderRequest) String() string { return proto.CompactTextString(m) }
 func (*MoveFolderRequest) ProtoMessage()    {}
 func (*MoveFolderRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{7}
+	return fileDescriptor_fe78511a4713776e, []int{7}
 }
+
 func (m *MoveFolderRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MoveFolderRequest.Unmarshal(m, b)
 }
 func (m *MoveFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MoveFolderRequest.Marshal(b, m, deterministic)
 }
-func (dst *MoveFolderRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MoveFolderRequest.Merge(dst, src)
+func (m *MoveFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MoveFolderRequest.Merge(m, src)
 }
 func (m *MoveFolderRequest) XXX_Size() int {
 	return xxx_messageInfo_MoveFolderRequest.Size(m)
@@ -601,16 +613,17 @@ func (m *UpdateFolderRequest) Reset()         { *m = UpdateFolderRequest{} }
 func (m *UpdateFolderRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateFolderRequest) ProtoMessage()    {}
 func (*UpdateFolderRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{8}
+	return fileDescriptor_fe78511a4713776e, []int{8}
 }
+
 func (m *UpdateFolderRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateFolderRequest.Unmarshal(m, b)
 }
 func (m *UpdateFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateFolderRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateFolderRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateFolderRequest.Merge(dst, src)
+func (m *UpdateFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFolderRequest.Merge(m, src)
 }
 func (m *UpdateFolderRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateFolderRequest.Size(m)
@@ -652,16 +665,17 @@ func (m *DeleteFolderRequest) Reset()         { *m = DeleteFolderRequest{} }
 func (m *DeleteFolderRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteFolderRequest) ProtoMessage()    {}
 func (*DeleteFolderRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{9}
+	return fileDescriptor_fe78511a4713776e, []int{9}
 }
+
 func (m *DeleteFolderRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteFolderRequest.Unmarshal(m, b)
 }
 func (m *DeleteFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteFolderRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteFolderRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteFolderRequest.Merge(dst, src)
+func (m *DeleteFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteFolderRequest.Merge(m, src)
 }
 func (m *DeleteFolderRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteFolderRequest.Size(m)
@@ -700,16 +714,17 @@ func (m *UndeleteFolderRequest) Reset()         { *m = UndeleteFolderRequest{} }
 func (m *UndeleteFolderRequest) String() string { return proto.CompactTextString(m) }
 func (*UndeleteFolderRequest) ProtoMessage()    {}
 func (*UndeleteFolderRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{10}
+	return fileDescriptor_fe78511a4713776e, []int{10}
 }
+
 func (m *UndeleteFolderRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeleteFolderRequest.Unmarshal(m, b)
 }
 func (m *UndeleteFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeleteFolderRequest.Marshal(b, m, deterministic)
 }
-func (dst *UndeleteFolderRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeleteFolderRequest.Merge(dst, src)
+func (m *UndeleteFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteFolderRequest.Merge(m, src)
 }
 func (m *UndeleteFolderRequest) XXX_Size() int {
 	return xxx_messageInfo_UndeleteFolderRequest.Size(m)
@@ -748,16 +763,17 @@ func (m *FolderOperation) Reset()         { *m = FolderOperation{} }
 func (m *FolderOperation) String() string { return proto.CompactTextString(m) }
 func (*FolderOperation) ProtoMessage()    {}
 func (*FolderOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_folders_5147156560d8dbeb, []int{11}
+	return fileDescriptor_fe78511a4713776e, []int{11}
 }
+
 func (m *FolderOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FolderOperation.Unmarshal(m, b)
 }
 func (m *FolderOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FolderOperation.Marshal(b, m, deterministic)
 }
-func (dst *FolderOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FolderOperation.Merge(dst, src)
+func (m *FolderOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FolderOperation.Merge(m, src)
 }
 func (m *FolderOperation) XXX_Size() int {
 	return xxx_messageInfo_FolderOperation.Size(m)
@@ -797,6 +813,8 @@ func (m *FolderOperation) GetDestinationParent() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.resourcemanager.v2.Folder_LifecycleState", Folder_LifecycleState_name, Folder_LifecycleState_value)
+	proto.RegisterEnum("google.cloud.resourcemanager.v2.FolderOperation_OperationType", FolderOperation_OperationType_name, FolderOperation_OperationType_value)
 	proto.RegisterType((*Folder)(nil), "google.cloud.resourcemanager.v2.Folder")
 	proto.RegisterType((*ListFoldersRequest)(nil), "google.cloud.resourcemanager.v2.ListFoldersRequest")
 	proto.RegisterType((*ListFoldersResponse)(nil), "google.cloud.resourcemanager.v2.ListFoldersResponse")
@@ -809,8 +827,92 @@ func init() {
 	proto.RegisterType((*DeleteFolderRequest)(nil), "google.cloud.resourcemanager.v2.DeleteFolderRequest")
 	proto.RegisterType((*UndeleteFolderRequest)(nil), "google.cloud.resourcemanager.v2.UndeleteFolderRequest")
 	proto.RegisterType((*FolderOperation)(nil), "google.cloud.resourcemanager.v2.FolderOperation")
-	proto.RegisterEnum("google.cloud.resourcemanager.v2.Folder_LifecycleState", Folder_LifecycleState_name, Folder_LifecycleState_value)
-	proto.RegisterEnum("google.cloud.resourcemanager.v2.FolderOperation_OperationType", FolderOperation_OperationType_name, FolderOperation_OperationType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/resourcemanager/v2/folders.proto", fileDescriptor_fe78511a4713776e)
+}
+
+var fileDescriptor_fe78511a4713776e = []byte{
+	// 1235 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0xdb, 0xd4,
+	0x1b, 0xff, 0x9f, 0xac, 0xcb, 0xba, 0x27, 0x2f, 0xcd, 0x4e, 0xdb, 0xfd, 0x4b, 0xba, 0xbe, 0x70,
+	0xca, 0x46, 0xd6, 0x6a, 0xce, 0x9a, 0x41, 0x2f, 0x3a, 0x01, 0xea, 0x52, 0xb7, 0x8a, 0xd4, 0x97,
+	0xe0, 0xb8, 0x95, 0x86, 0x2a, 0x59, 0x5e, 0x72, 0x9a, 0x5a, 0x75, 0x6c, 0xcf, 0x76, 0x02, 0xd9,
+	0x84, 0x34, 0x4d, 0x9a, 0xb8, 0x98, 0xb8, 0xda, 0x1d, 0x88, 0x0b, 0x6e, 0xb9, 0x45, 0xe2, 0x3b,
+	0xc0, 0x2d, 0x5f, 0x81, 0x0f, 0x82, 0x7c, 0x7c, 0x9c, 0xda, 0x4e, 0x3a, 0xa7, 0x08, 0x71, 0x55,
+	0xfb, 0x79, 0xfd, 0x3d, 0x6f, 0xbf, 0x3a, 0xf0, 0xa0, 0x6d, 0x9a, 0x6d, 0x9d, 0x96, 0x9b, 0xba,
+	0xd9, 0x6d, 0x95, 0x6d, 0xea, 0x98, 0x5d, 0xbb, 0x49, 0x3b, 0xaa, 0xa1, 0xb6, 0xa9, 0x5d, 0xee,
+	0x55, 0xca, 0xa7, 0xa6, 0xde, 0xa2, 0xb6, 0x23, 0x58, 0xb6, 0xe9, 0x9a, 0x78, 0xc9, 0x37, 0x17,
+	0x98, 0xb9, 0x10, 0x33, 0x17, 0x7a, 0x95, 0xe2, 0x1d, 0x1e, 0x4f, 0xb5, 0xb4, 0xb2, 0x6a, 0x18,
+	0xa6, 0xab, 0xba, 0x9a, 0x69, 0x70, 0xf7, 0xe2, 0x22, 0xd7, 0x6a, 0x6a, 0xa7, 0xdc, 0x5b, 0xf7,
+	0xfe, 0x28, 0x96, 0xa9, 0x6b, 0xcd, 0x3e, 0xd7, 0x17, 0xa3, 0xfa, 0x88, 0x6e, 0x85, 0xeb, 0x74,
+	0xd3, 0x68, 0xdb, 0x5d, 0xc3, 0xd0, 0x8c, 0x76, 0xd9, 0xb4, 0xa8, 0x1d, 0x49, 0xb0, 0xcc, 0x8d,
+	0xd8, 0xdb, 0xb3, 0xee, 0x69, 0xf9, 0x54, 0xa3, 0x7a, 0x4b, 0xe9, 0xa8, 0xce, 0x39, 0xb7, 0x58,
+	0x8a, 0x5b, 0xb8, 0x5a, 0x87, 0x3a, 0xae, 0xda, 0xb1, 0x7c, 0x03, 0xf2, 0xdd, 0x35, 0x48, 0xef,
+	0xb0, 0xa2, 0x31, 0x86, 0x09, 0x43, 0xed, 0xd0, 0x39, 0xb4, 0x8c, 0x4a, 0x37, 0x25, 0xf6, 0x8c,
+	0x6f, 0x43, 0xda, 0x52, 0x6d, 0x6a, 0xb8, 0x73, 0x29, 0x26, 0xe5, 0x6f, 0xf8, 0x43, 0xc8, 0xb6,
+	0x34, 0xc7, 0xd2, 0xd5, 0xbe, 0xc2, 0x7c, 0xae, 0x31, 0x6d, 0x86, 0xcb, 0x0e, 0x3c, 0x57, 0x05,
+	0xa6, 0x74, 0xed, 0x94, 0x36, 0xfb, 0x4d, 0x9d, 0x2a, 0x8e, 0xab, 0xba, 0x74, 0x6e, 0x62, 0x19,
+	0x95, 0xf2, 0x95, 0x0d, 0x21, 0xa1, 0xad, 0x82, 0x0f, 0x48, 0xd8, 0x0b, 0xdc, 0x1b, 0x9e, 0xb7,
+	0x94, 0xd7, 0x23, 0xef, 0xf8, 0x31, 0x64, 0x9a, 0x36, 0x55, 0x5d, 0xaa, 0x78, 0x45, 0xcd, 0x5d,
+	0x5f, 0x46, 0xa5, 0x4c, 0xa5, 0x18, 0x04, 0x0f, 0x2a, 0x16, 0xe4, 0xa0, 0x62, 0x09, 0x7c, 0x73,
+	0x4f, 0xe0, 0x39, 0x77, 0xad, 0xd6, 0xc0, 0x39, 0x9d, 0xec, 0xec, 0x9b, 0x7b, 0x02, 0xd2, 0x80,
+	0x7c, 0x14, 0x1b, 0x5e, 0x82, 0xf9, 0xbd, 0xda, 0x8e, 0x58, 0x7d, 0x5a, 0xdd, 0x13, 0x95, 0x86,
+	0xbc, 0x25, 0x8b, 0xca, 0xd1, 0x41, 0xa3, 0x2e, 0x56, 0x6b, 0x3b, 0x35, 0x71, 0xbb, 0xf0, 0x3f,
+	0x0c, 0x90, 0xde, 0xaa, 0xca, 0xb5, 0x63, 0xb1, 0x80, 0xf0, 0x0c, 0x14, 0xb6, 0xc5, 0x3d, 0x51,
+	0x16, 0x15, 0x49, 0xfc, 0xf2, 0x48, 0x6c, 0xc8, 0xe2, 0x76, 0x21, 0x45, 0xde, 0x22, 0xc0, 0x7b,
+	0x9a, 0xe3, 0xfa, 0xc5, 0x3b, 0x12, 0x7d, 0xde, 0xa5, 0x8e, 0x1b, 0x9a, 0x00, 0x8a, 0x4c, 0x60,
+	0x1e, 0x6e, 0x5a, 0x6a, 0x9b, 0x2a, 0x8e, 0xf6, 0x82, 0xb2, 0xe1, 0x5c, 0x97, 0x26, 0x3d, 0x41,
+	0x43, 0x7b, 0x41, 0xf1, 0x02, 0x00, 0x53, 0xba, 0xe6, 0x39, 0x35, 0xf8, 0x70, 0x98, 0xb9, 0xec,
+	0x09, 0xbc, 0xe9, 0x39, 0x67, 0xe6, 0xd7, 0x4a, 0x8b, 0xea, 0xd4, 0xa5, 0x2d, 0x36, 0x97, 0x49,
+	0x29, 0xe3, 0xc9, 0xb6, 0x7d, 0x11, 0x79, 0x85, 0x60, 0x3a, 0x82, 0xc6, 0xb1, 0x4c, 0xc3, 0xa1,
+	0x78, 0x0b, 0x6e, 0xf0, 0x1b, 0x99, 0x43, 0xcb, 0xd7, 0x4a, 0x99, 0xca, 0xc7, 0x63, 0x4e, 0x53,
+	0x0a, 0xfc, 0xf0, 0x3d, 0x98, 0x32, 0xe8, 0x37, 0xae, 0x12, 0x42, 0xe8, 0x2f, 0x57, 0xce, 0x13,
+	0xd7, 0x03, 0x94, 0xe4, 0x0c, 0x66, 0x1a, 0x54, 0xb5, 0x9b, 0x67, 0xb1, 0x8e, 0x44, 0x2a, 0x47,
+	0xef, 0xad, 0x3c, 0x15, 0xaf, 0x7c, 0x06, 0xae, 0x3f, 0xef, 0x52, 0xbb, 0xcf, 0x7b, 0xe2, 0xbf,
+	0x90, 0xd7, 0x08, 0x66, 0x63, 0xa9, 0xfe, 0xfb, 0x72, 0xef, 0x41, 0x61, 0x97, 0xf2, 0x7e, 0x07,
+	0xa5, 0x8e, 0x38, 0x49, 0x62, 0xc0, 0x74, 0x95, 0xed, 0x71, 0xd4, 0xf4, 0xb2, 0x3d, 0xf9, 0x02,
+	0xd2, 0x3e, 0x12, 0x96, 0xf5, 0x0a, 0x05, 0x70, 0x37, 0x72, 0x0c, 0xb7, 0xf6, 0xcd, 0x1e, 0x4d,
+	0x04, 0x86, 0x1f, 0x00, 0x6e, 0x51, 0xc7, 0xd5, 0x0c, 0xc6, 0x51, 0x4a, 0x84, 0x37, 0x6e, 0x85,
+	0x34, 0x75, 0xa6, 0x20, 0xef, 0x10, 0x4c, 0x1f, 0xb1, 0x9b, 0x8a, 0x86, 0xbe, 0x00, 0x8c, 0xfe,
+	0x11, 0xe0, 0xd0, 0x69, 0x7b, 0x44, 0xc8, 0xcb, 0x1e, 0x3e, 0xed, 0x1d, 0x8f, 0x2b, 0xf7, 0x55,
+	0xe7, 0x3c, 0x38, 0x6d, 0xef, 0x99, 0xc8, 0x30, 0xed, 0x9f, 0x40, 0x72, 0xbd, 0xf7, 0xa1, 0x60,
+	0xd3, 0x66, 0xd7, 0x76, 0xb4, 0x1e, 0xe5, 0xa7, 0xc4, 0x92, 0x4d, 0x4a, 0x53, 0x03, 0xb9, 0x1f,
+	0x8b, 0xac, 0xc1, 0xec, 0x91, 0xd1, 0x1a, 0x2f, 0x2e, 0xf9, 0x2d, 0x05, 0x53, 0xbe, 0xd5, 0x61,
+	0x40, 0xf8, 0x43, 0x7c, 0x8b, 0x86, 0xf9, 0x96, 0x42, 0x7e, 0xf0, 0x0f, 0x42, 0x71, 0xfb, 0x96,
+	0x0f, 0x26, 0x5f, 0xf9, 0x7c, 0xcc, 0xfe, 0x0d, 0x92, 0x09, 0x83, 0x27, 0xb9, 0x6f, 0x51, 0x29,
+	0x67, 0x86, 0x5f, 0xf1, 0x0a, 0xe4, 0xfc, 0x00, 0xc1, 0x80, 0xfd, 0x4b, 0xca, 0xfa, 0x42, 0x7f,
+	0xb6, 0x97, 0xac, 0xc2, 0xc4, 0x65, 0xab, 0x20, 0x42, 0x2e, 0x92, 0x13, 0x2f, 0x42, 0xf1, 0xb0,
+	0x2e, 0x4a, 0x5b, 0x72, 0xed, 0xf0, 0x40, 0x91, 0x9f, 0xd6, 0x47, 0xb0, 0x69, 0x55, 0x12, 0xb7,
+	0x64, 0x8f, 0x4d, 0x27, 0x61, 0x62, 0xff, 0xf0, 0x58, 0x2c, 0xa4, 0x2a, 0xbf, 0x66, 0xe1, 0x06,
+	0x3f, 0x60, 0xfc, 0x3d, 0x82, 0x4c, 0x88, 0xbf, 0xf0, 0xa3, 0xc4, 0x2e, 0x0c, 0x73, 0x6f, 0xf1,
+	0x93, 0xab, 0x39, 0xf9, 0x9c, 0x41, 0xa6, 0x5f, 0xff, 0xf9, 0xd7, 0xbb, 0x54, 0x0e, 0x67, 0x42,
+	0x1f, 0x14, 0xf8, 0x27, 0x04, 0xb9, 0x08, 0xc5, 0xe0, 0x4f, 0x13, 0x83, 0x8f, 0x62, 0xbf, 0xe2,
+	0xc6, 0x55, 0xdd, 0x38, 0xaa, 0x05, 0x86, 0xea, 0xff, 0x04, 0x87, 0x50, 0x6d, 0x3a, 0xcc, 0x74,
+	0x13, 0xad, 0xe2, 0x37, 0x08, 0x6e, 0x0e, 0xe8, 0x07, 0xaf, 0x27, 0x26, 0x89, 0x53, 0x55, 0x71,
+	0xdc, 0x33, 0x25, 0x77, 0x18, 0x90, 0xdb, 0x78, 0xc6, 0x03, 0xf2, 0xd2, 0xdb, 0xe6, 0xcf, 0x38,
+	0x9c, 0xf2, 0xea, 0xb7, 0xf8, 0x15, 0x82, 0x6c, 0x98, 0xde, 0x70, 0xf2, 0x0c, 0x46, 0xb0, 0x61,
+	0x71, 0x21, 0xf0, 0x0a, 0x7d, 0x3f, 0x5d, 0xec, 0x35, 0x99, 0x67, 0x18, 0x66, 0x49, 0x78, 0x44,
+	0x9b, 0x01, 0x7f, 0xfc, 0x80, 0x20, 0x1b, 0x26, 0xa6, 0x31, 0x20, 0x8c, 0xe0, 0xb1, 0xf1, 0x1b,
+	0xb2, 0xc6, 0xc0, 0xdc, 0xad, 0xcc, 0xb3, 0x86, 0xf8, 0x20, 0x84, 0x58, 0x5f, 0x06, 0xe0, 0xde,
+	0x20, 0x80, 0x0b, 0x3a, 0xc6, 0x95, 0xc4, 0x24, 0x43, 0xdc, 0x9d, 0xd4, 0x9b, 0x8f, 0x18, 0x9c,
+	0x45, 0xf2, 0xc1, 0xa8, 0xf9, 0x6c, 0x76, 0xcc, 0x1e, 0xf5, 0xf6, 0xe5, 0x2d, 0x82, 0x6c, 0x98,
+	0x28, 0xc7, 0x68, 0xd2, 0x08, 0x5e, 0xbd, 0xf2, 0xd6, 0xac, 0x8e, 0xde, 0x9a, 0x1f, 0x11, 0xe4,
+	0xa3, 0x04, 0x8b, 0x93, 0xef, 0x64, 0x24, 0x23, 0x8f, 0x8f, 0xa8, 0xc4, 0x10, 0x11, 0xb2, 0x30,
+	0xb2, 0x4f, 0x5d, 0x1e, 0xdc, 0xeb, 0xd5, 0x4b, 0xc8, 0xee, 0x52, 0xb7, 0xa6, 0x76, 0xea, 0xec,
+	0x0b, 0x1f, 0x93, 0x20, 0x85, 0xa6, 0x76, 0x84, 0xde, 0xba, 0x10, 0x56, 0x06, 0x30, 0x66, 0x63,
+	0x36, 0xbe, 0x96, 0x3c, 0x64, 0x49, 0x57, 0xc9, 0x5d, 0x96, 0x34, 0x00, 0x17, 0x4e, 0xdc, 0x0e,
+	0x05, 0xe3, 0xc9, 0x1b, 0xef, 0x4b, 0xde, 0xf8, 0x37, 0x93, 0x3b, 0xb1, 0xe4, 0x3f, 0x23, 0xc0,
+	0x32, 0x75, 0x98, 0x90, 0xda, 0x1d, 0xcd, 0x71, 0xbc, 0x5f, 0x2f, 0xb8, 0x14, 0x8b, 0x3f, 0x6c,
+	0x12, 0x20, 0xb9, 0x3f, 0x86, 0x25, 0x27, 0xb8, 0x0d, 0x86, 0xee, 0x21, 0x59, 0xbb, 0x14, 0x9d,
+	0x3b, 0xe4, 0xbc, 0x89, 0x56, 0x9f, 0xfc, 0x8e, 0x60, 0xa5, 0x69, 0x76, 0x92, 0xc6, 0xfe, 0x24,
+	0xcb, 0x19, 0xb5, 0xee, 0x7d, 0x40, 0xd4, 0xd1, 0x57, 0x07, 0xdc, 0xa1, 0x6d, 0xea, 0xaa, 0xd1,
+	0x16, 0x4c, 0xbb, 0x5d, 0x6e, 0x53, 0x83, 0x7d, 0x5e, 0x94, 0x7d, 0x95, 0x6a, 0x69, 0xce, 0xa5,
+	0x3f, 0x35, 0x1f, 0xc7, 0x44, 0xbf, 0xa4, 0x96, 0x76, 0xfd, 0x80, 0x55, 0x86, 0x40, 0xe2, 0xea,
+	0x7d, 0x8e, 0xe0, 0xb8, 0xf2, 0x47, 0x60, 0x71, 0xc2, 0x2c, 0x4e, 0x62, 0x16, 0x27, 0xc7, 0x95,
+	0x67, 0x69, 0x96, 0xfe, 0xd1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xda, 0x9b, 0x45, 0x8f, 0xe8,
+	0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1422,89 +1524,3 @@ var _Folders_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/resourcemanager/v2/folders.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/resourcemanager/v2/folders.proto", fileDescriptor_folders_5147156560d8dbeb)
-}
-
-var fileDescriptor_folders_5147156560d8dbeb = []byte{
-	// 1235 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0xdb, 0xd4,
-	0x1b, 0xff, 0x9f, 0xac, 0xcb, 0xba, 0x27, 0x2f, 0xcd, 0x4e, 0xdb, 0xfd, 0x4b, 0xba, 0xbe, 0x70,
-	0xca, 0x46, 0xd6, 0x6a, 0xce, 0x9a, 0x41, 0x2f, 0x3a, 0x01, 0xea, 0x52, 0xb7, 0x8a, 0xd4, 0x97,
-	0xe0, 0xb8, 0x95, 0x86, 0x2a, 0x59, 0x5e, 0x72, 0x9a, 0x5a, 0x75, 0x6c, 0xcf, 0x76, 0x02, 0xd9,
-	0x84, 0x34, 0x4d, 0x9a, 0xb8, 0x98, 0xb8, 0xda, 0x1d, 0x88, 0x0b, 0x6e, 0xb9, 0x45, 0xe2, 0x3b,
-	0xc0, 0x2d, 0x5f, 0x81, 0x0f, 0x82, 0x7c, 0x7c, 0x9c, 0xda, 0x4e, 0x3a, 0xa7, 0x08, 0x71, 0x55,
-	0xfb, 0x79, 0xfd, 0x3d, 0x6f, 0xbf, 0x3a, 0xf0, 0xa0, 0x6d, 0x9a, 0x6d, 0x9d, 0x96, 0x9b, 0xba,
-	0xd9, 0x6d, 0x95, 0x6d, 0xea, 0x98, 0x5d, 0xbb, 0x49, 0x3b, 0xaa, 0xa1, 0xb6, 0xa9, 0x5d, 0xee,
-	0x55, 0xca, 0xa7, 0xa6, 0xde, 0xa2, 0xb6, 0x23, 0x58, 0xb6, 0xe9, 0x9a, 0x78, 0xc9, 0x37, 0x17,
-	0x98, 0xb9, 0x10, 0x33, 0x17, 0x7a, 0x95, 0xe2, 0x1d, 0x1e, 0x4f, 0xb5, 0xb4, 0xb2, 0x6a, 0x18,
-	0xa6, 0xab, 0xba, 0x9a, 0x69, 0x70, 0xf7, 0xe2, 0x22, 0xd7, 0x6a, 0x6a, 0xa7, 0xdc, 0x5b, 0xf7,
-	0xfe, 0x28, 0x96, 0xa9, 0x6b, 0xcd, 0x3e, 0xd7, 0x17, 0xa3, 0xfa, 0x88, 0x6e, 0x85, 0xeb, 0x74,
-	0xd3, 0x68, 0xdb, 0x5d, 0xc3, 0xd0, 0x8c, 0x76, 0xd9, 0xb4, 0xa8, 0x1d, 0x49, 0xb0, 0xcc, 0x8d,
-	0xd8, 0xdb, 0xb3, 0xee, 0x69, 0xf9, 0x54, 0xa3, 0x7a, 0x4b, 0xe9, 0xa8, 0xce, 0x39, 0xb7, 0x58,
-	0x8a, 0x5b, 0xb8, 0x5a, 0x87, 0x3a, 0xae, 0xda, 0xb1, 0x7c, 0x03, 0xf2, 0xdd, 0x35, 0x48, 0xef,
-	0xb0, 0xa2, 0x31, 0x86, 0x09, 0x43, 0xed, 0xd0, 0x39, 0xb4, 0x8c, 0x4a, 0x37, 0x25, 0xf6, 0x8c,
-	0x6f, 0x43, 0xda, 0x52, 0x6d, 0x6a, 0xb8, 0x73, 0x29, 0x26, 0xe5, 0x6f, 0xf8, 0x43, 0xc8, 0xb6,
-	0x34, 0xc7, 0xd2, 0xd5, 0xbe, 0xc2, 0x7c, 0xae, 0x31, 0x6d, 0x86, 0xcb, 0x0e, 0x3c, 0x57, 0x05,
-	0xa6, 0x74, 0xed, 0x94, 0x36, 0xfb, 0x4d, 0x9d, 0x2a, 0x8e, 0xab, 0xba, 0x74, 0x6e, 0x62, 0x19,
-	0x95, 0xf2, 0x95, 0x0d, 0x21, 0xa1, 0xad, 0x82, 0x0f, 0x48, 0xd8, 0x0b, 0xdc, 0x1b, 0x9e, 0xb7,
-	0x94, 0xd7, 0x23, 0xef, 0xf8, 0x31, 0x64, 0x9a, 0x36, 0x55, 0x5d, 0xaa, 0x78, 0x45, 0xcd, 0x5d,
-	0x5f, 0x46, 0xa5, 0x4c, 0xa5, 0x18, 0x04, 0x0f, 0x2a, 0x16, 0xe4, 0xa0, 0x62, 0x09, 0x7c, 0x73,
-	0x4f, 0xe0, 0x39, 0x77, 0xad, 0xd6, 0xc0, 0x39, 0x9d, 0xec, 0xec, 0x9b, 0x7b, 0x02, 0xd2, 0x80,
-	0x7c, 0x14, 0x1b, 0x5e, 0x82, 0xf9, 0xbd, 0xda, 0x8e, 0x58, 0x7d, 0x5a, 0xdd, 0x13, 0x95, 0x86,
-	0xbc, 0x25, 0x8b, 0xca, 0xd1, 0x41, 0xa3, 0x2e, 0x56, 0x6b, 0x3b, 0x35, 0x71, 0xbb, 0xf0, 0x3f,
-	0x0c, 0x90, 0xde, 0xaa, 0xca, 0xb5, 0x63, 0xb1, 0x80, 0xf0, 0x0c, 0x14, 0xb6, 0xc5, 0x3d, 0x51,
-	0x16, 0x15, 0x49, 0xfc, 0xf2, 0x48, 0x6c, 0xc8, 0xe2, 0x76, 0x21, 0x45, 0xde, 0x22, 0xc0, 0x7b,
-	0x9a, 0xe3, 0xfa, 0xc5, 0x3b, 0x12, 0x7d, 0xde, 0xa5, 0x8e, 0x1b, 0x9a, 0x00, 0x8a, 0x4c, 0x60,
-	0x1e, 0x6e, 0x5a, 0x6a, 0x9b, 0x2a, 0x8e, 0xf6, 0x82, 0xb2, 0xe1, 0x5c, 0x97, 0x26, 0x3d, 0x41,
-	0x43, 0x7b, 0x41, 0xf1, 0x02, 0x00, 0x53, 0xba, 0xe6, 0x39, 0x35, 0xf8, 0x70, 0x98, 0xb9, 0xec,
-	0x09, 0xbc, 0xe9, 0x39, 0x67, 0xe6, 0xd7, 0x4a, 0x8b, 0xea, 0xd4, 0xa5, 0x2d, 0x36, 0x97, 0x49,
-	0x29, 0xe3, 0xc9, 0xb6, 0x7d, 0x11, 0x79, 0x85, 0x60, 0x3a, 0x82, 0xc6, 0xb1, 0x4c, 0xc3, 0xa1,
-	0x78, 0x0b, 0x6e, 0xf0, 0x1b, 0x99, 0x43, 0xcb, 0xd7, 0x4a, 0x99, 0xca, 0xc7, 0x63, 0x4e, 0x53,
-	0x0a, 0xfc, 0xf0, 0x3d, 0x98, 0x32, 0xe8, 0x37, 0xae, 0x12, 0x42, 0xe8, 0x2f, 0x57, 0xce, 0x13,
-	0xd7, 0x03, 0x94, 0xe4, 0x0c, 0x66, 0x1a, 0x54, 0xb5, 0x9b, 0x67, 0xb1, 0x8e, 0x44, 0x2a, 0x47,
-	0xef, 0xad, 0x3c, 0x15, 0xaf, 0x7c, 0x06, 0xae, 0x3f, 0xef, 0x52, 0xbb, 0xcf, 0x7b, 0xe2, 0xbf,
-	0x90, 0xd7, 0x08, 0x66, 0x63, 0xa9, 0xfe, 0xfb, 0x72, 0xef, 0x41, 0x61, 0x97, 0xf2, 0x7e, 0x07,
-	0xa5, 0x8e, 0x38, 0x49, 0x62, 0xc0, 0x74, 0x95, 0xed, 0x71, 0xd4, 0xf4, 0xb2, 0x3d, 0xf9, 0x02,
-	0xd2, 0x3e, 0x12, 0x96, 0xf5, 0x0a, 0x05, 0x70, 0x37, 0x72, 0x0c, 0xb7, 0xf6, 0xcd, 0x1e, 0x4d,
-	0x04, 0x86, 0x1f, 0x00, 0x6e, 0x51, 0xc7, 0xd5, 0x0c, 0xc6, 0x51, 0x4a, 0x84, 0x37, 0x6e, 0x85,
-	0x34, 0x75, 0xa6, 0x20, 0xef, 0x10, 0x4c, 0x1f, 0xb1, 0x9b, 0x8a, 0x86, 0xbe, 0x00, 0x8c, 0xfe,
-	0x11, 0xe0, 0xd0, 0x69, 0x7b, 0x44, 0xc8, 0xcb, 0x1e, 0x3e, 0xed, 0x1d, 0x8f, 0x2b, 0xf7, 0x55,
-	0xe7, 0x3c, 0x38, 0x6d, 0xef, 0x99, 0xc8, 0x30, 0xed, 0x9f, 0x40, 0x72, 0xbd, 0xf7, 0xa1, 0x60,
-	0xd3, 0x66, 0xd7, 0x76, 0xb4, 0x1e, 0xe5, 0xa7, 0xc4, 0x92, 0x4d, 0x4a, 0x53, 0x03, 0xb9, 0x1f,
-	0x8b, 0xac, 0xc1, 0xec, 0x91, 0xd1, 0x1a, 0x2f, 0x2e, 0xf9, 0x2d, 0x05, 0x53, 0xbe, 0xd5, 0x61,
-	0x40, 0xf8, 0x43, 0x7c, 0x8b, 0x86, 0xf9, 0x96, 0x42, 0x7e, 0xf0, 0x0f, 0x42, 0x71, 0xfb, 0x96,
-	0x0f, 0x26, 0x5f, 0xf9, 0x7c, 0xcc, 0xfe, 0x0d, 0x92, 0x09, 0x83, 0x27, 0xb9, 0x6f, 0x51, 0x29,
-	0x67, 0x86, 0x5f, 0xf1, 0x0a, 0xe4, 0xfc, 0x00, 0xc1, 0x80, 0xfd, 0x4b, 0xca, 0xfa, 0x42, 0x7f,
-	0xb6, 0x97, 0xac, 0xc2, 0xc4, 0x65, 0xab, 0x20, 0x42, 0x2e, 0x92, 0x13, 0x2f, 0x42, 0xf1, 0xb0,
-	0x2e, 0x4a, 0x5b, 0x72, 0xed, 0xf0, 0x40, 0x91, 0x9f, 0xd6, 0x47, 0xb0, 0x69, 0x55, 0x12, 0xb7,
-	0x64, 0x8f, 0x4d, 0x27, 0x61, 0x62, 0xff, 0xf0, 0x58, 0x2c, 0xa4, 0x2a, 0xbf, 0x66, 0xe1, 0x06,
-	0x3f, 0x60, 0xfc, 0x3d, 0x82, 0x4c, 0x88, 0xbf, 0xf0, 0xa3, 0xc4, 0x2e, 0x0c, 0x73, 0x6f, 0xf1,
-	0x93, 0xab, 0x39, 0xf9, 0x9c, 0x41, 0xa6, 0x5f, 0xff, 0xf9, 0xd7, 0xbb, 0x54, 0x0e, 0x67, 0x42,
-	0x1f, 0x14, 0xf8, 0x27, 0x04, 0xb9, 0x08, 0xc5, 0xe0, 0x4f, 0x13, 0x83, 0x8f, 0x62, 0xbf, 0xe2,
-	0xc6, 0x55, 0xdd, 0x38, 0xaa, 0x05, 0x86, 0xea, 0xff, 0x04, 0x87, 0x50, 0x6d, 0x3a, 0xcc, 0x74,
-	0x13, 0xad, 0xe2, 0x37, 0x08, 0x6e, 0x0e, 0xe8, 0x07, 0xaf, 0x27, 0x26, 0x89, 0x53, 0x55, 0x71,
-	0xdc, 0x33, 0x25, 0x77, 0x18, 0x90, 0xdb, 0x78, 0xc6, 0x03, 0xf2, 0xd2, 0xdb, 0xe6, 0xcf, 0x38,
-	0x9c, 0xf2, 0xea, 0xb7, 0xf8, 0x15, 0x82, 0x6c, 0x98, 0xde, 0x70, 0xf2, 0x0c, 0x46, 0xb0, 0x61,
-	0x71, 0x21, 0xf0, 0x0a, 0x7d, 0x3f, 0x5d, 0xec, 0x35, 0x99, 0x67, 0x18, 0x66, 0x49, 0x78, 0x44,
-	0x9b, 0x01, 0x7f, 0xfc, 0x80, 0x20, 0x1b, 0x26, 0xa6, 0x31, 0x20, 0x8c, 0xe0, 0xb1, 0xf1, 0x1b,
-	0xb2, 0xc6, 0xc0, 0xdc, 0xad, 0xcc, 0xb3, 0x86, 0xf8, 0x20, 0x84, 0x58, 0x5f, 0x06, 0xe0, 0xde,
-	0x20, 0x80, 0x0b, 0x3a, 0xc6, 0x95, 0xc4, 0x24, 0x43, 0xdc, 0x9d, 0xd4, 0x9b, 0x8f, 0x18, 0x9c,
-	0x45, 0xf2, 0xc1, 0xa8, 0xf9, 0x6c, 0x76, 0xcc, 0x1e, 0xf5, 0xf6, 0xe5, 0x2d, 0x82, 0x6c, 0x98,
-	0x28, 0xc7, 0x68, 0xd2, 0x08, 0x5e, 0xbd, 0xf2, 0xd6, 0xac, 0x8e, 0xde, 0x9a, 0x1f, 0x11, 0xe4,
-	0xa3, 0x04, 0x8b, 0x93, 0xef, 0x64, 0x24, 0x23, 0x8f, 0x8f, 0xa8, 0xc4, 0x10, 0x11, 0xb2, 0x30,
-	0xb2, 0x4f, 0x5d, 0x1e, 0xdc, 0xeb, 0xd5, 0x4b, 0xc8, 0xee, 0x52, 0xb7, 0xa6, 0x76, 0xea, 0xec,
-	0x0b, 0x1f, 0x93, 0x20, 0x85, 0xa6, 0x76, 0x84, 0xde, 0xba, 0x10, 0x56, 0x06, 0x30, 0x66, 0x63,
-	0x36, 0xbe, 0x96, 0x3c, 0x64, 0x49, 0x57, 0xc9, 0x5d, 0x96, 0x34, 0x00, 0x17, 0x4e, 0xdc, 0x0e,
-	0x05, 0xe3, 0xc9, 0x1b, 0xef, 0x4b, 0xde, 0xf8, 0x37, 0x93, 0x3b, 0xb1, 0xe4, 0x3f, 0x23, 0xc0,
-	0x32, 0x75, 0x98, 0x90, 0xda, 0x1d, 0xcd, 0x71, 0xbc, 0x5f, 0x2f, 0xb8, 0x14, 0x8b, 0x3f, 0x6c,
-	0x12, 0x20, 0xb9, 0x3f, 0x86, 0x25, 0x27, 0xb8, 0x0d, 0x86, 0xee, 0x21, 0x59, 0xbb, 0x14, 0x9d,
-	0x3b, 0xe4, 0xbc, 0x89, 0x56, 0x9f, 0xfc, 0x8e, 0x60, 0xa5, 0x69, 0x76, 0x92, 0xc6, 0xfe, 0x24,
-	0xcb, 0x19, 0xb5, 0xee, 0x7d, 0x40, 0xd4, 0xd1, 0x57, 0x07, 0xdc, 0xa1, 0x6d, 0xea, 0xaa, 0xd1,
-	0x16, 0x4c, 0xbb, 0x5d, 0x6e, 0x53, 0x83, 0x7d, 0x5e, 0x94, 0x7d, 0x95, 0x6a, 0x69, 0xce, 0xa5,
-	0x3f, 0x35, 0x1f, 0xc7, 0x44, 0xbf, 0xa4, 0x96, 0x76, 0xfd, 0x80, 0x55, 0x86, 0x40, 0xe2, 0xea,
-	0x7d, 0x8e, 0xe0, 0xb8, 0xf2, 0x47, 0x60, 0x71, 0xc2, 0x2c, 0x4e, 0x62, 0x16, 0x27, 0xc7, 0x95,
-	0x67, 0x69, 0x96, 0xfe, 0xd1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xda, 0x9b, 0x45, 0x8f, 0xe8,
-	0x0e, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go b/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
index 774d008639..737b1d881a 100644
--- a/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
+++ b/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/runtimeconfig/v1beta1/resources.proto
 
-package runtimeconfig // import "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
+package runtimeconfig
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The `VariableState` describes the last known state of the variable and is
 // used during a `variables().watch` call to distinguish the state of the
@@ -41,6 +44,7 @@ var VariableState_name = map[int32]string{
 	1: "UPDATED",
 	2: "DELETED",
 }
+
 var VariableState_value = map[string]int32{
 	"VARIABLE_STATE_UNSPECIFIED": 0,
 	"UPDATED":                    1,
@@ -50,8 +54,9 @@ var VariableState_value = map[string]int32{
 func (x VariableState) String() string {
 	return proto.EnumName(VariableState_name, int32(x))
 }
+
 func (VariableState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_6ae4fdb8583f1f59, []int{0}
+	return fileDescriptor_7913f3704a8d250c, []int{0}
 }
 
 // A RuntimeConfig resource is the primary resource in the Cloud RuntimeConfig
@@ -81,16 +86,17 @@ func (m *RuntimeConfig) Reset()         { *m = RuntimeConfig{} }
 func (m *RuntimeConfig) String() string { return proto.CompactTextString(m) }
 func (*RuntimeConfig) ProtoMessage()    {}
 func (*RuntimeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_6ae4fdb8583f1f59, []int{0}
+	return fileDescriptor_7913f3704a8d250c, []int{0}
 }
+
 func (m *RuntimeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RuntimeConfig.Unmarshal(m, b)
 }
 func (m *RuntimeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RuntimeConfig.Marshal(b, m, deterministic)
 }
-func (dst *RuntimeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RuntimeConfig.Merge(dst, src)
+func (m *RuntimeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RuntimeConfig.Merge(m, src)
 }
 func (m *RuntimeConfig) XXX_Size() int {
 	return xxx_messageInfo_RuntimeConfig.Size(m)
@@ -161,16 +167,17 @@ func (m *Variable) Reset()         { *m = Variable{} }
 func (m *Variable) String() string { return proto.CompactTextString(m) }
 func (*Variable) ProtoMessage()    {}
 func (*Variable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_6ae4fdb8583f1f59, []int{1}
+	return fileDescriptor_7913f3704a8d250c, []int{1}
 }
+
 func (m *Variable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Variable.Unmarshal(m, b)
 }
 func (m *Variable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Variable.Marshal(b, m, deterministic)
 }
-func (dst *Variable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Variable.Merge(dst, src)
+func (m *Variable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Variable.Merge(m, src)
 }
 func (m *Variable) XXX_Size() int {
 	return xxx_messageInfo_Variable.Size(m)
@@ -239,72 +246,14 @@ func (m *Variable) GetState() VariableState {
 	return VariableState_VARIABLE_STATE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Variable) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Variable_OneofMarshaler, _Variable_OneofUnmarshaler, _Variable_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Variable) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Variable_Value)(nil),
 		(*Variable_Text)(nil),
 	}
 }
 
-func _Variable_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Variable)
-	// contents
-	switch x := m.Contents.(type) {
-	case *Variable_Value:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Value)
-	case *Variable_Text:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Text)
-	case nil:
-	default:
-		return fmt.Errorf("Variable.Contents has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Variable_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Variable)
-	switch tag {
-	case 2: // contents.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Contents = &Variable_Value{x}
-		return true, err
-	case 5: // contents.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Contents = &Variable_Text{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Variable_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Variable)
-	// contents
-	switch x := m.Contents.(type) {
-	case *Variable_Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Value)))
-		n += len(x.Value)
-	case *Variable_Text:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Text)))
-		n += len(x.Text)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The condition that a Waiter resource is waiting for.
 type EndCondition struct {
 	// The condition oneof holds the available condition types for this
@@ -322,16 +271,17 @@ func (m *EndCondition) Reset()         { *m = EndCondition{} }
 func (m *EndCondition) String() string { return proto.CompactTextString(m) }
 func (*EndCondition) ProtoMessage()    {}
 func (*EndCondition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_6ae4fdb8583f1f59, []int{2}
+	return fileDescriptor_7913f3704a8d250c, []int{2}
 }
+
 func (m *EndCondition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EndCondition.Unmarshal(m, b)
 }
 func (m *EndCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EndCondition.Marshal(b, m, deterministic)
 }
-func (dst *EndCondition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EndCondition.Merge(dst, src)
+func (m *EndCondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EndCondition.Merge(m, src)
 }
 func (m *EndCondition) XXX_Size() int {
 	return xxx_messageInfo_EndCondition.Size(m)
@@ -366,61 +316,13 @@ func (m *EndCondition) GetCardinality() *EndCondition_Cardinality {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*EndCondition) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _EndCondition_OneofMarshaler, _EndCondition_OneofUnmarshaler, _EndCondition_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*EndCondition) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*EndCondition_Cardinality_)(nil),
 	}
 }
 
-func _EndCondition_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*EndCondition)
-	// condition
-	switch x := m.Condition.(type) {
-	case *EndCondition_Cardinality_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Cardinality); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("EndCondition.Condition has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _EndCondition_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*EndCondition)
-	switch tag {
-	case 1: // condition.cardinality
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(EndCondition_Cardinality)
-		err := b.DecodeMessage(msg)
-		m.Condition = &EndCondition_Cardinality_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _EndCondition_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*EndCondition)
-	// condition
-	switch x := m.Condition.(type) {
-	case *EndCondition_Cardinality_:
-		s := proto.Size(x.Cardinality)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Cardinality condition for the Waiter resource. A cardinality condition is
 // met when the number of variables under a specified path prefix reaches a
 // predefined number. For example, if you set a Cardinality condition where
@@ -450,16 +352,17 @@ func (m *EndCondition_Cardinality) Reset()         { *m = EndCondition_Cardinali
 func (m *EndCondition_Cardinality) String() string { return proto.CompactTextString(m) }
 func (*EndCondition_Cardinality) ProtoMessage()    {}
 func (*EndCondition_Cardinality) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_6ae4fdb8583f1f59, []int{2, 0}
+	return fileDescriptor_7913f3704a8d250c, []int{2, 0}
 }
+
 func (m *EndCondition_Cardinality) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EndCondition_Cardinality.Unmarshal(m, b)
 }
 func (m *EndCondition_Cardinality) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EndCondition_Cardinality.Marshal(b, m, deterministic)
 }
-func (dst *EndCondition_Cardinality) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EndCondition_Cardinality.Merge(dst, src)
+func (m *EndCondition_Cardinality) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EndCondition_Cardinality.Merge(m, src)
 }
 func (m *EndCondition_Cardinality) XXX_Size() int {
 	return xxx_messageInfo_EndCondition_Cardinality.Size(m)
@@ -550,16 +453,17 @@ func (m *Waiter) Reset()         { *m = Waiter{} }
 func (m *Waiter) String() string { return proto.CompactTextString(m) }
 func (*Waiter) ProtoMessage()    {}
 func (*Waiter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_6ae4fdb8583f1f59, []int{3}
+	return fileDescriptor_7913f3704a8d250c, []int{3}
 }
+
 func (m *Waiter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Waiter.Unmarshal(m, b)
 }
 func (m *Waiter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Waiter.Marshal(b, m, deterministic)
 }
-func (dst *Waiter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Waiter.Merge(dst, src)
+func (m *Waiter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Waiter.Merge(m, src)
 }
 func (m *Waiter) XXX_Size() int {
 	return xxx_messageInfo_Waiter.Size(m)
@@ -620,19 +524,19 @@ func (m *Waiter) GetError() *status.Status {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.runtimeconfig.v1beta1.VariableState", VariableState_name, VariableState_value)
 	proto.RegisterType((*RuntimeConfig)(nil), "google.cloud.runtimeconfig.v1beta1.RuntimeConfig")
 	proto.RegisterType((*Variable)(nil), "google.cloud.runtimeconfig.v1beta1.Variable")
 	proto.RegisterType((*EndCondition)(nil), "google.cloud.runtimeconfig.v1beta1.EndCondition")
 	proto.RegisterType((*EndCondition_Cardinality)(nil), "google.cloud.runtimeconfig.v1beta1.EndCondition.Cardinality")
 	proto.RegisterType((*Waiter)(nil), "google.cloud.runtimeconfig.v1beta1.Waiter")
-	proto.RegisterEnum("google.cloud.runtimeconfig.v1beta1.VariableState", VariableState_name, VariableState_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/resources.proto", fileDescriptor_resources_6ae4fdb8583f1f59)
+	proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/resources.proto", fileDescriptor_7913f3704a8d250c)
 }
 
-var fileDescriptor_resources_6ae4fdb8583f1f59 = []byte{
+var fileDescriptor_7913f3704a8d250c = []byte{
 	// 628 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0xc7, 0x9b, 0xd2, 0x8f, 0xed, 0x64, 0x43, 0x93, 0x85, 0x46, 0xa8, 0xd0, 0xa8, 0x7a, 0x81,
diff --git a/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go b/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
index f7c238c552..34a96db909 100644
--- a/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
+++ b/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto
 
-package runtimeconfig // import "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package runtimeconfig
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request for the `ListConfigs()` method.
 type ListConfigsRequest struct {
@@ -48,16 +48,17 @@ func (m *ListConfigsRequest) Reset()         { *m = ListConfigsRequest{} }
 func (m *ListConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListConfigsRequest) ProtoMessage()    {}
 func (*ListConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{0}
+	return fileDescriptor_a3e972e4a9f12181, []int{0}
 }
+
 func (m *ListConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListConfigsRequest.Merge(dst, src)
+func (m *ListConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigsRequest.Merge(m, src)
 }
 func (m *ListConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListConfigsRequest.Size(m)
@@ -110,16 +111,17 @@ func (m *ListConfigsResponse) Reset()         { *m = ListConfigsResponse{} }
 func (m *ListConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListConfigsResponse) ProtoMessage()    {}
 func (*ListConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{1}
+	return fileDescriptor_a3e972e4a9f12181, []int{1}
 }
+
 func (m *ListConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListConfigsResponse.Merge(dst, src)
+func (m *ListConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigsResponse.Merge(m, src)
 }
 func (m *ListConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListConfigsResponse.Size(m)
@@ -159,16 +161,17 @@ func (m *GetConfigRequest) Reset()         { *m = GetConfigRequest{} }
 func (m *GetConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetConfigRequest) ProtoMessage()    {}
 func (*GetConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{2}
+	return fileDescriptor_a3e972e4a9f12181, []int{2}
 }
+
 func (m *GetConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConfigRequest.Unmarshal(m, b)
 }
 func (m *GetConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetConfigRequest.Merge(dst, src)
+func (m *GetConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigRequest.Merge(m, src)
 }
 func (m *GetConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetConfigRequest.Size(m)
@@ -214,16 +217,17 @@ func (m *CreateConfigRequest) Reset()         { *m = CreateConfigRequest{} }
 func (m *CreateConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateConfigRequest) ProtoMessage()    {}
 func (*CreateConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{3}
+	return fileDescriptor_a3e972e4a9f12181, []int{3}
 }
+
 func (m *CreateConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateConfigRequest.Unmarshal(m, b)
 }
 func (m *CreateConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateConfigRequest.Merge(dst, src)
+func (m *CreateConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateConfigRequest.Merge(m, src)
 }
 func (m *CreateConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateConfigRequest.Size(m)
@@ -272,16 +276,17 @@ func (m *UpdateConfigRequest) Reset()         { *m = UpdateConfigRequest{} }
 func (m *UpdateConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateConfigRequest) ProtoMessage()    {}
 func (*UpdateConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{4}
+	return fileDescriptor_a3e972e4a9f12181, []int{4}
 }
+
 func (m *UpdateConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateConfigRequest.Unmarshal(m, b)
 }
 func (m *UpdateConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateConfigRequest.Merge(dst, src)
+func (m *UpdateConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateConfigRequest.Merge(m, src)
 }
 func (m *UpdateConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateConfigRequest.Size(m)
@@ -321,16 +326,17 @@ func (m *DeleteConfigRequest) Reset()         { *m = DeleteConfigRequest{} }
 func (m *DeleteConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteConfigRequest) ProtoMessage()    {}
 func (*DeleteConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{5}
+	return fileDescriptor_a3e972e4a9f12181, []int{5}
 }
+
 func (m *DeleteConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteConfigRequest.Unmarshal(m, b)
 }
 func (m *DeleteConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteConfigRequest.Merge(dst, src)
+func (m *DeleteConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteConfigRequest.Merge(m, src)
 }
 func (m *DeleteConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteConfigRequest.Size(m)
@@ -379,16 +385,17 @@ func (m *ListVariablesRequest) Reset()         { *m = ListVariablesRequest{} }
 func (m *ListVariablesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListVariablesRequest) ProtoMessage()    {}
 func (*ListVariablesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{6}
+	return fileDescriptor_a3e972e4a9f12181, []int{6}
 }
+
 func (m *ListVariablesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVariablesRequest.Unmarshal(m, b)
 }
 func (m *ListVariablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVariablesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListVariablesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVariablesRequest.Merge(dst, src)
+func (m *ListVariablesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVariablesRequest.Merge(m, src)
 }
 func (m *ListVariablesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListVariablesRequest.Size(m)
@@ -454,16 +461,17 @@ func (m *ListVariablesResponse) Reset()         { *m = ListVariablesResponse{} }
 func (m *ListVariablesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListVariablesResponse) ProtoMessage()    {}
 func (*ListVariablesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{7}
+	return fileDescriptor_a3e972e4a9f12181, []int{7}
 }
+
 func (m *ListVariablesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVariablesResponse.Unmarshal(m, b)
 }
 func (m *ListVariablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVariablesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListVariablesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVariablesResponse.Merge(dst, src)
+func (m *ListVariablesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVariablesResponse.Merge(m, src)
 }
 func (m *ListVariablesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListVariablesResponse.Size(m)
@@ -510,16 +518,17 @@ func (m *WatchVariableRequest) Reset()         { *m = WatchVariableRequest{} }
 func (m *WatchVariableRequest) String() string { return proto.CompactTextString(m) }
 func (*WatchVariableRequest) ProtoMessage()    {}
 func (*WatchVariableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{8}
+	return fileDescriptor_a3e972e4a9f12181, []int{8}
 }
+
 func (m *WatchVariableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WatchVariableRequest.Unmarshal(m, b)
 }
 func (m *WatchVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WatchVariableRequest.Marshal(b, m, deterministic)
 }
-func (dst *WatchVariableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WatchVariableRequest.Merge(dst, src)
+func (m *WatchVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WatchVariableRequest.Merge(m, src)
 }
 func (m *WatchVariableRequest) XXX_Size() int {
 	return xxx_messageInfo_WatchVariableRequest.Size(m)
@@ -559,16 +568,17 @@ func (m *GetVariableRequest) Reset()         { *m = GetVariableRequest{} }
 func (m *GetVariableRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVariableRequest) ProtoMessage()    {}
 func (*GetVariableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{9}
+	return fileDescriptor_a3e972e4a9f12181, []int{9}
 }
+
 func (m *GetVariableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVariableRequest.Unmarshal(m, b)
 }
 func (m *GetVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVariableRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVariableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVariableRequest.Merge(dst, src)
+func (m *GetVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVariableRequest.Merge(m, src)
 }
 func (m *GetVariableRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVariableRequest.Size(m)
@@ -615,16 +625,17 @@ func (m *CreateVariableRequest) Reset()         { *m = CreateVariableRequest{} }
 func (m *CreateVariableRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateVariableRequest) ProtoMessage()    {}
 func (*CreateVariableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{10}
+	return fileDescriptor_a3e972e4a9f12181, []int{10}
 }
+
 func (m *CreateVariableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateVariableRequest.Unmarshal(m, b)
 }
 func (m *CreateVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateVariableRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateVariableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateVariableRequest.Merge(dst, src)
+func (m *CreateVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVariableRequest.Merge(m, src)
 }
 func (m *CreateVariableRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateVariableRequest.Size(m)
@@ -673,16 +684,17 @@ func (m *UpdateVariableRequest) Reset()         { *m = UpdateVariableRequest{} }
 func (m *UpdateVariableRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateVariableRequest) ProtoMessage()    {}
 func (*UpdateVariableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{11}
+	return fileDescriptor_a3e972e4a9f12181, []int{11}
 }
+
 func (m *UpdateVariableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateVariableRequest.Unmarshal(m, b)
 }
 func (m *UpdateVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateVariableRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateVariableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateVariableRequest.Merge(dst, src)
+func (m *UpdateVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVariableRequest.Merge(m, src)
 }
 func (m *UpdateVariableRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateVariableRequest.Size(m)
@@ -725,16 +737,17 @@ func (m *DeleteVariableRequest) Reset()         { *m = DeleteVariableRequest{} }
 func (m *DeleteVariableRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteVariableRequest) ProtoMessage()    {}
 func (*DeleteVariableRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{12}
+	return fileDescriptor_a3e972e4a9f12181, []int{12}
 }
+
 func (m *DeleteVariableRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteVariableRequest.Unmarshal(m, b)
 }
 func (m *DeleteVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteVariableRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteVariableRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteVariableRequest.Merge(dst, src)
+func (m *DeleteVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVariableRequest.Merge(m, src)
 }
 func (m *DeleteVariableRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteVariableRequest.Size(m)
@@ -781,16 +794,17 @@ func (m *ListWaitersRequest) Reset()         { *m = ListWaitersRequest{} }
 func (m *ListWaitersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListWaitersRequest) ProtoMessage()    {}
 func (*ListWaitersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{13}
+	return fileDescriptor_a3e972e4a9f12181, []int{13}
 }
+
 func (m *ListWaitersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListWaitersRequest.Unmarshal(m, b)
 }
 func (m *ListWaitersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListWaitersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListWaitersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListWaitersRequest.Merge(dst, src)
+func (m *ListWaitersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWaitersRequest.Merge(m, src)
 }
 func (m *ListWaitersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListWaitersRequest.Size(m)
@@ -842,16 +856,17 @@ func (m *ListWaitersResponse) Reset()         { *m = ListWaitersResponse{} }
 func (m *ListWaitersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListWaitersResponse) ProtoMessage()    {}
 func (*ListWaitersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{14}
+	return fileDescriptor_a3e972e4a9f12181, []int{14}
 }
+
 func (m *ListWaitersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListWaitersResponse.Unmarshal(m, b)
 }
 func (m *ListWaitersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListWaitersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListWaitersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListWaitersResponse.Merge(dst, src)
+func (m *ListWaitersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWaitersResponse.Merge(m, src)
 }
 func (m *ListWaitersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListWaitersResponse.Size(m)
@@ -892,16 +907,17 @@ func (m *GetWaiterRequest) Reset()         { *m = GetWaiterRequest{} }
 func (m *GetWaiterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetWaiterRequest) ProtoMessage()    {}
 func (*GetWaiterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{15}
+	return fileDescriptor_a3e972e4a9f12181, []int{15}
 }
+
 func (m *GetWaiterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetWaiterRequest.Unmarshal(m, b)
 }
 func (m *GetWaiterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetWaiterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetWaiterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetWaiterRequest.Merge(dst, src)
+func (m *GetWaiterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetWaiterRequest.Merge(m, src)
 }
 func (m *GetWaiterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetWaiterRequest.Size(m)
@@ -948,16 +964,17 @@ func (m *CreateWaiterRequest) Reset()         { *m = CreateWaiterRequest{} }
 func (m *CreateWaiterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateWaiterRequest) ProtoMessage()    {}
 func (*CreateWaiterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{16}
+	return fileDescriptor_a3e972e4a9f12181, []int{16}
 }
+
 func (m *CreateWaiterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateWaiterRequest.Unmarshal(m, b)
 }
 func (m *CreateWaiterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateWaiterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateWaiterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateWaiterRequest.Merge(dst, src)
+func (m *CreateWaiterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateWaiterRequest.Merge(m, src)
 }
 func (m *CreateWaiterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateWaiterRequest.Size(m)
@@ -1004,16 +1021,17 @@ func (m *DeleteWaiterRequest) Reset()         { *m = DeleteWaiterRequest{} }
 func (m *DeleteWaiterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteWaiterRequest) ProtoMessage()    {}
 func (*DeleteWaiterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_runtimeconfig_eced5b419d927b84, []int{17}
+	return fileDescriptor_a3e972e4a9f12181, []int{17}
 }
+
 func (m *DeleteWaiterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteWaiterRequest.Unmarshal(m, b)
 }
 func (m *DeleteWaiterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteWaiterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteWaiterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteWaiterRequest.Merge(dst, src)
+func (m *DeleteWaiterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteWaiterRequest.Merge(m, src)
 }
 func (m *DeleteWaiterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteWaiterRequest.Size(m)
@@ -1052,6 +1070,87 @@ func init() {
 	proto.RegisterType((*DeleteWaiterRequest)(nil), "google.cloud.runtimeconfig.v1beta1.DeleteWaiterRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto", fileDescriptor_a3e972e4a9f12181)
+}
+
+var fileDescriptor_a3e972e4a9f12181 = []byte{
+	// 1158 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0x4b, 0x6f, 0xdd, 0x44,
+	0x14, 0xc7, 0x35, 0x49, 0x9b, 0xe6, 0x9e, 0x3c, 0x40, 0x93, 0x87, 0x22, 0xb7, 0x15, 0x91, 0x8b,
+	0xa2, 0x70, 0x55, 0xd9, 0x4d, 0x5a, 0xa5, 0x49, 0xa0, 0x2c, 0x92, 0xa2, 0x10, 0x1e, 0x6a, 0x65,
+	0x42, 0x2a, 0xa1, 0x48, 0xd1, 0xe4, 0x66, 0xe2, 0x18, 0x6e, 0xc6, 0xc6, 0x1e, 0x27, 0x50, 0x94,
+	0x0d, 0xec, 0x40, 0x48, 0x48, 0x2c, 0xca, 0x8a, 0x05, 0x12, 0x20, 0x21, 0x84, 0x58, 0xb1, 0x41,
+	0x74, 0xc7, 0x86, 0x2d, 0x12, 0x9f, 0x80, 0x0f, 0x82, 0x3c, 0x0f, 0x5f, 0xfb, 0xe6, 0x3e, 0xc6,
+	0x21, 0xdd, 0x25, 0xe3, 0xf3, 0xf8, 0xcd, 0x99, 0x33, 0xf3, 0x3f, 0xba, 0xb0, 0xe4, 0x87, 0xa1,
+	0xdf, 0xa4, 0x6e, 0xa3, 0x19, 0xa6, 0xfb, 0x6e, 0x9c, 0x32, 0x1e, 0x1c, 0xd1, 0x46, 0xc8, 0x0e,
+	0x02, 0xdf, 0x3d, 0x5e, 0xd8, 0xa3, 0x9c, 0x2c, 0x94, 0x57, 0x9d, 0x28, 0x0e, 0x79, 0x88, 0x6d,
+	0xe9, 0xe7, 0x08, 0x3f, 0xa7, 0x6c, 0xa1, 0xfc, 0xac, 0x6b, 0x2a, 0x36, 0x89, 0x02, 0x97, 0x30,
+	0x16, 0x72, 0xc2, 0x83, 0x90, 0x25, 0x32, 0x82, 0xb5, 0x68, 0x92, 0x99, 0x26, 0x61, 0x1a, 0x37,
+	0xa8, 0xf6, 0xb9, 0xa1, 0x7c, 0x9a, 0x21, 0xf3, 0xe3, 0x94, 0xb1, 0x80, 0xf9, 0x6e, 0x18, 0xd1,
+	0xb8, 0x14, 0xf8, 0xaa, 0x32, 0x12, 0xff, 0xed, 0xa5, 0x07, 0x2e, 0x3d, 0x8a, 0xf8, 0xc7, 0xea,
+	0xe3, 0x0b, 0xed, 0x1f, 0xb3, 0xac, 0x09, 0x27, 0x47, 0x91, 0x34, 0xb0, 0x0f, 0x01, 0xbf, 0x15,
+	0x24, 0x7c, 0x5d, 0x80, 0x24, 0x1e, 0xfd, 0x30, 0xa5, 0x09, 0xc7, 0xd3, 0x30, 0x14, 0x91, 0x98,
+	0x32, 0x3e, 0x83, 0x66, 0xd1, 0x7c, 0xcd, 0x53, 0xff, 0xe1, 0xab, 0x50, 0x8b, 0x88, 0x4f, 0x77,
+	0x93, 0xe0, 0x31, 0x9d, 0x19, 0x98, 0x45, 0xf3, 0x97, 0xbd, 0xe1, 0x6c, 0xe1, 0x9d, 0xe0, 0x31,
+	0xc5, 0xd7, 0x01, 0xc4, 0x47, 0x1e, 0x7e, 0x40, 0xd9, 0xcc, 0xa0, 0x70, 0x14, 0xe6, 0x5b, 0xd9,
+	0x82, 0xfd, 0x39, 0x82, 0x89, 0x52, 0xaa, 0x24, 0x0a, 0x59, 0x42, 0xf1, 0x9b, 0x70, 0x45, 0x96,
+	0x21, 0x99, 0x41, 0xb3, 0x83, 0xf3, 0x23, 0x8b, 0x0b, 0x4e, 0xff, 0x62, 0x3b, 0x9e, 0x5c, 0x95,
+	0xc1, 0x3c, 0x1d, 0x01, 0xcf, 0xc1, 0x73, 0x8c, 0x7e, 0xc4, 0x77, 0x0b, 0x20, 0x03, 0x02, 0x64,
+	0x2c, 0x5b, 0x7e, 0x98, 0xc3, 0xcc, 0xc1, 0xf3, 0x1b, 0x54, 0xa1, 0xe8, 0x4d, 0x63, 0xb8, 0xc4,
+	0xc8, 0x11, 0x55, 0x0e, 0xe2, 0x6f, 0xfb, 0x09, 0x82, 0x89, 0xf5, 0x98, 0x12, 0x4e, 0xcb, 0xb6,
+	0xdd, 0x0a, 0xb4, 0x09, 0x43, 0x12, 0x45, 0x44, 0x39, 0xd7, 0x5e, 0x54, 0x80, 0xac, 0x9c, 0xb1,
+	0xcc, 0xb6, 0x1b, 0xec, 0xeb, 0x72, 0xaa, 0x95, 0xcd, 0x7d, 0x9b, 0xc3, 0xc4, 0xbb, 0xd1, 0xfe,
+	0x19, 0x30, 0xbd, 0x09, 0xd4, 0xda, 0xc4, 0x05, 0x42, 0xd9, 0x2f, 0xc1, 0xc4, 0x7d, 0xda, 0xa4,
+	0x06, 0x59, 0xed, 0x1f, 0x11, 0x4c, 0x66, 0xe7, 0xbd, 0x4d, 0xe2, 0x80, 0xec, 0x35, 0x69, 0xdf,
+	0xe6, 0x9a, 0x86, 0xa1, 0x83, 0xa0, 0xc9, 0x69, 0xac, 0x4e, 0x40, 0xfd, 0x57, 0x6e, 0xba, 0xc1,
+	0x9e, 0x4d, 0x77, 0xa9, 0xad, 0xe9, 0xf0, 0x0d, 0x18, 0x8b, 0x29, 0x4f, 0x63, 0xb6, 0x7b, 0x4c,
+	0x9a, 0x29, 0x4d, 0x66, 0x2e, 0xcf, 0xa2, 0xf9, 0x61, 0x6f, 0x54, 0x2e, 0x6e, 0x8b, 0x35, 0xfb,
+	0x0b, 0x04, 0x53, 0x6d, 0xa4, 0xaa, 0x37, 0xdf, 0x80, 0xda, 0xb1, 0x5e, 0x54, 0xdd, 0x79, 0xd3,
+	0xa4, 0x78, 0x3a, 0x92, 0xd7, 0x72, 0x37, 0x6e, 0x4d, 0x0a, 0x93, 0x8f, 0x08, 0x6f, 0x1c, 0xe6,
+	0x31, 0x7a, 0x9c, 0xec, 0x0a, 0x00, 0xa3, 0x27, 0x34, 0xde, 0xe5, 0x87, 0x44, 0xee, 0x7e, 0x64,
+	0xd1, 0xd2, 0x80, 0xfa, 0xce, 0x3b, 0x5b, 0xfa, 0xce, 0x7b, 0x35, 0x61, 0xbd, 0x75, 0x48, 0x98,
+	0x3d, 0x0f, 0x78, 0x83, 0x72, 0x83, 0x24, 0xf6, 0x37, 0x08, 0xa6, 0xe4, 0x1d, 0x68, 0xb7, 0xee,
+	0x76, 0x92, 0xaf, 0xc3, 0xb0, 0xde, 0xb7, 0x6a, 0xb9, 0x6a, 0x55, 0xcb, 0xbd, 0xfb, 0x5d, 0x82,
+	0x14, 0xa6, 0xe4, 0x25, 0x30, 0x29, 0xd6, 0x85, 0x51, 0xd9, 0x9b, 0x30, 0x25, 0x6f, 0x81, 0x49,
+	0xda, 0x6b, 0x50, 0x8b, 0x69, 0x23, 0x8d, 0x93, 0xe0, 0x58, 0xe6, 0x1d, 0xf6, 0x5a, 0x0b, 0xfa,
+	0xfd, 0x7d, 0x44, 0x02, 0x4e, 0xe3, 0x67, 0xfa, 0xfe, 0x7e, 0xa6, 0xde, 0xdf, 0x3c, 0x95, 0xea,
+	0xf1, 0xfb, 0x70, 0xe5, 0x44, 0x2e, 0xa9, 0x0e, 0xaf, 0x9b, 0x54, 0x45, 0x46, 0xf1, 0xb4, 0x6b,
+	0xc5, 0x87, 0x57, 0x79, 0xf7, 0x68, 0xba, 0xaf, 0xf2, 0x87, 0xb7, 0x6c, 0xdb, 0xad, 0x32, 0x6b,
+	0x30, 0x24, 0x51, 0xd4, 0xd1, 0x56, 0xd9, 0x84, 0xf2, 0xec, 0xd7, 0x6c, 0xf9, 0xdb, 0xd7, 0x97,
+	0x7e, 0xf1, 0x9f, 0x49, 0x98, 0x2c, 0x3d, 0xa0, 0x6f, 0x13, 0x46, 0x7c, 0x1a, 0xe3, 0x9f, 0x11,
+	0x8c, 0x14, 0x44, 0x10, 0x2f, 0x99, 0x60, 0x9e, 0x15, 0x68, 0xeb, 0x6e, 0x65, 0x3f, 0x79, 0xda,
+	0xf6, 0xcd, 0x4f, 0xff, 0xfe, 0xf7, 0xeb, 0x81, 0x39, 0xfc, 0x62, 0x3e, 0x74, 0x7c, 0x22, 0x2b,
+	0x78, 0x2f, 0x8a, 0xc3, 0xf7, 0x69, 0x83, 0x27, 0x6e, 0xfd, 0xd4, 0xd5, 0x72, 0xfa, 0x1d, 0x82,
+	0x5a, 0xae, 0x93, 0xf8, 0x8e, 0x49, 0xd2, 0x76, 0x59, 0xb5, 0xaa, 0xab, 0x4d, 0x27, 0xc8, 0xac,
+	0xac, 0x05, 0x44, 0x4d, 0xe8, 0xd6, 0x4f, 0xf1, 0xaf, 0x08, 0x46, 0x8b, 0x1a, 0x8d, 0x8d, 0x8a,
+	0xd3, 0x41, 0xd5, 0xcf, 0x83, 0x7a, 0x47, 0xa0, 0x3a, 0xb6, 0x51, 0x3d, 0x57, 0xb5, 0xb6, 0x67,
+	0xc8, 0x45, 0xf5, 0x36, 0x43, 0xee, 0xa0, 0xf7, 0xff, 0x03, 0xd9, 0x32, 0xaa, 0x6e, 0x8e, 0xfc,
+	0x25, 0x82, 0xd1, 0xa2, 0xf4, 0x9b, 0x21, 0x77, 0x18, 0x16, 0xac, 0xe9, 0x33, 0x02, 0xf5, 0x5a,
+	0x36, 0xb1, 0xea, 0x53, 0xaf, 0x9b, 0x9d, 0xfa, 0x53, 0x04, 0x63, 0x25, 0xd1, 0xc6, 0xcb, 0xa6,
+	0x77, 0xa2, 0x7d, 0x22, 0xb1, 0x56, 0xce, 0xe1, 0xa9, 0xee, 0xd3, 0xb2, 0x80, 0x5e, 0xc4, 0xb7,
+	0x7a, 0x9c, 0x7f, 0x01, 0xdb, 0x6d, 0xcd, 0x03, 0xbf, 0x20, 0x18, 0x29, 0x28, 0xb0, 0xd9, 0x53,
+	0x70, 0x56, 0xb2, 0xad, 0x4a, 0x22, 0x66, 0xaf, 0x08, 0xde, 0xdb, 0x78, 0xc1, 0xa0, 0xc8, 0x2d,
+	0x58, 0xb7, 0x5e, 0x3f, 0xc5, 0xbf, 0x23, 0x18, 0x2b, 0x4d, 0x26, 0x66, 0x15, 0xef, 0x34, 0xcc,
+	0x54, 0x84, 0x5e, 0x13, 0xd0, 0xaf, 0xd8, 0x77, 0x2b, 0x43, 0xaf, 0x9e, 0x64, 0xd9, 0x57, 0x51,
+	0x1d, 0xff, 0x81, 0x60, 0xbc, 0x3c, 0xc5, 0xe0, 0x15, 0xf3, 0x77, 0xe2, 0x62, 0xf8, 0x2b, 0x37,
+	0xc9, 0x6a, 0x6b, 0x12, 0x7a, 0x8a, 0x60, 0xbc, 0x3c, 0xeb, 0x98, 0xf1, 0x77, 0x9c, 0x8f, 0x2a,
+	0xf2, 0xaf, 0x0b, 0xfe, 0x7b, 0x56, 0xf5, 0xa6, 0x29, 0x6c, 0xe0, 0x5b, 0x04, 0xe3, 0xe5, 0xa9,
+	0xc9, 0x6c, 0x03, 0x1d, 0x27, 0xad, 0xae, 0x8f, 0x88, 0xea, 0xef, 0xfa, 0x39, 0xfa, 0xfb, 0x37,
+	0xa5, 0xcd, 0x6a, 0x40, 0x32, 0xd7, 0xe6, 0xf2, 0xf0, 0x66, 0xae, 0xcd, 0x6d, 0x93, 0x98, 0xbd,
+	0x24, 0xd8, 0x6f, 0x61, 0xc7, 0xb0, 0x4d, 0xf4, 0xec, 0xf5, 0xbd, 0x54, 0x69, 0x19, 0xce, 0x58,
+	0xa5, 0x4b, 0x53, 0x8c, 0x55, 0x61, 0x5e, 0xea, 0xc4, 0xd9, 0xbd, 0xc6, 0x0a, 0x32, 0x7b, 0xb2,
+	0x7f, 0xc8, 0x85, 0x5a, 0xa1, 0x56, 0x10, 0xea, 0x32, 0xed, 0x75, 0xed, 0x58, 0xf8, 0x65, 0xc4,
+	0x79, 0xa0, 0x7f, 0x19, 0xb1, 0x5f, 0x15, 0x80, 0xcb, 0x76, 0xc5, 0x42, 0xae, 0xea, 0x41, 0xf0,
+	0x49, 0xae, 0x75, 0x55, 0x40, 0x3b, 0x0c, 0x87, 0x5d, 0xdb, 0x54, 0x95, 0xb0, 0x5e, 0xb1, 0x84,
+	0x6b, 0x7f, 0x22, 0x98, 0x6b, 0x84, 0x47, 0x06, 0x38, 0x0f, 0xd1, 0x7b, 0x0f, 0x94, 0x95, 0x1f,
+	0x36, 0x09, 0xf3, 0x9d, 0x30, 0xf6, 0x5d, 0x9f, 0x32, 0x41, 0xe2, 0xca, 0x4f, 0x24, 0x0a, 0x92,
+	0x5e, 0xbf, 0x48, 0xbd, 0x5c, 0x5a, 0xfd, 0x69, 0xc0, 0xde, 0x90, 0x11, 0xd7, 0x45, 0xde, 0xd2,
+	0x58, 0xe1, 0x6c, 0x2f, 0xac, 0x65, 0x2e, 0x7f, 0x69, 0xa3, 0x1d, 0x61, 0xb4, 0x53, 0x32, 0xda,
+	0xd9, 0x96, 0x71, 0xf7, 0x86, 0x04, 0xc5, 0xed, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x36,
+	0x17, 0x5a, 0x90, 0x13, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1681,84 +1780,3 @@ var _RuntimeConfigManager_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto", fileDescriptor_runtimeconfig_eced5b419d927b84)
-}
-
-var fileDescriptor_runtimeconfig_eced5b419d927b84 = []byte{
-	// 1158 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0x4b, 0x6f, 0xdd, 0x44,
-	0x14, 0xc7, 0x35, 0x49, 0x9b, 0xe6, 0x9e, 0x3c, 0x40, 0x93, 0x87, 0x22, 0xb7, 0x15, 0x91, 0x8b,
-	0xa2, 0x70, 0x55, 0xd9, 0x4d, 0x5a, 0xa5, 0x49, 0xa0, 0x2c, 0x92, 0xa2, 0x10, 0x1e, 0x6a, 0x65,
-	0x42, 0x2a, 0xa1, 0x48, 0xd1, 0xe4, 0x66, 0xe2, 0x18, 0x6e, 0xc6, 0xc6, 0x1e, 0x27, 0x50, 0x94,
-	0x0d, 0xec, 0x40, 0x48, 0x48, 0x2c, 0xca, 0x8a, 0x05, 0x12, 0x20, 0x21, 0x84, 0x58, 0xb1, 0x41,
-	0x74, 0xc7, 0x86, 0x2d, 0x12, 0x9f, 0x80, 0x0f, 0x82, 0x3c, 0x0f, 0x5f, 0xfb, 0xe6, 0x3e, 0xc6,
-	0x21, 0xdd, 0x25, 0xe3, 0xf3, 0xf8, 0xcd, 0x99, 0x33, 0xf3, 0x3f, 0xba, 0xb0, 0xe4, 0x87, 0xa1,
-	0xdf, 0xa4, 0x6e, 0xa3, 0x19, 0xa6, 0xfb, 0x6e, 0x9c, 0x32, 0x1e, 0x1c, 0xd1, 0x46, 0xc8, 0x0e,
-	0x02, 0xdf, 0x3d, 0x5e, 0xd8, 0xa3, 0x9c, 0x2c, 0x94, 0x57, 0x9d, 0x28, 0x0e, 0x79, 0x88, 0x6d,
-	0xe9, 0xe7, 0x08, 0x3f, 0xa7, 0x6c, 0xa1, 0xfc, 0xac, 0x6b, 0x2a, 0x36, 0x89, 0x02, 0x97, 0x30,
-	0x16, 0x72, 0xc2, 0x83, 0x90, 0x25, 0x32, 0x82, 0xb5, 0x68, 0x92, 0x99, 0x26, 0x61, 0x1a, 0x37,
-	0xa8, 0xf6, 0xb9, 0xa1, 0x7c, 0x9a, 0x21, 0xf3, 0xe3, 0x94, 0xb1, 0x80, 0xf9, 0x6e, 0x18, 0xd1,
-	0xb8, 0x14, 0xf8, 0xaa, 0x32, 0x12, 0xff, 0xed, 0xa5, 0x07, 0x2e, 0x3d, 0x8a, 0xf8, 0xc7, 0xea,
-	0xe3, 0x0b, 0xed, 0x1f, 0xb3, 0xac, 0x09, 0x27, 0x47, 0x91, 0x34, 0xb0, 0x0f, 0x01, 0xbf, 0x15,
-	0x24, 0x7c, 0x5d, 0x80, 0x24, 0x1e, 0xfd, 0x30, 0xa5, 0x09, 0xc7, 0xd3, 0x30, 0x14, 0x91, 0x98,
-	0x32, 0x3e, 0x83, 0x66, 0xd1, 0x7c, 0xcd, 0x53, 0xff, 0xe1, 0xab, 0x50, 0x8b, 0x88, 0x4f, 0x77,
-	0x93, 0xe0, 0x31, 0x9d, 0x19, 0x98, 0x45, 0xf3, 0x97, 0xbd, 0xe1, 0x6c, 0xe1, 0x9d, 0xe0, 0x31,
-	0xc5, 0xd7, 0x01, 0xc4, 0x47, 0x1e, 0x7e, 0x40, 0xd9, 0xcc, 0xa0, 0x70, 0x14, 0xe6, 0x5b, 0xd9,
-	0x82, 0xfd, 0x39, 0x82, 0x89, 0x52, 0xaa, 0x24, 0x0a, 0x59, 0x42, 0xf1, 0x9b, 0x70, 0x45, 0x96,
-	0x21, 0x99, 0x41, 0xb3, 0x83, 0xf3, 0x23, 0x8b, 0x0b, 0x4e, 0xff, 0x62, 0x3b, 0x9e, 0x5c, 0x95,
-	0xc1, 0x3c, 0x1d, 0x01, 0xcf, 0xc1, 0x73, 0x8c, 0x7e, 0xc4, 0x77, 0x0b, 0x20, 0x03, 0x02, 0x64,
-	0x2c, 0x5b, 0x7e, 0x98, 0xc3, 0xcc, 0xc1, 0xf3, 0x1b, 0x54, 0xa1, 0xe8, 0x4d, 0x63, 0xb8, 0xc4,
-	0xc8, 0x11, 0x55, 0x0e, 0xe2, 0x6f, 0xfb, 0x09, 0x82, 0x89, 0xf5, 0x98, 0x12, 0x4e, 0xcb, 0xb6,
-	0xdd, 0x0a, 0xb4, 0x09, 0x43, 0x12, 0x45, 0x44, 0x39, 0xd7, 0x5e, 0x54, 0x80, 0xac, 0x9c, 0xb1,
-	0xcc, 0xb6, 0x1b, 0xec, 0xeb, 0x72, 0xaa, 0x95, 0xcd, 0x7d, 0x9b, 0xc3, 0xc4, 0xbb, 0xd1, 0xfe,
-	0x19, 0x30, 0xbd, 0x09, 0xd4, 0xda, 0xc4, 0x05, 0x42, 0xd9, 0x2f, 0xc1, 0xc4, 0x7d, 0xda, 0xa4,
-	0x06, 0x59, 0xed, 0x1f, 0x11, 0x4c, 0x66, 0xe7, 0xbd, 0x4d, 0xe2, 0x80, 0xec, 0x35, 0x69, 0xdf,
-	0xe6, 0x9a, 0x86, 0xa1, 0x83, 0xa0, 0xc9, 0x69, 0xac, 0x4e, 0x40, 0xfd, 0x57, 0x6e, 0xba, 0xc1,
-	0x9e, 0x4d, 0x77, 0xa9, 0xad, 0xe9, 0xf0, 0x0d, 0x18, 0x8b, 0x29, 0x4f, 0x63, 0xb6, 0x7b, 0x4c,
-	0x9a, 0x29, 0x4d, 0x66, 0x2e, 0xcf, 0xa2, 0xf9, 0x61, 0x6f, 0x54, 0x2e, 0x6e, 0x8b, 0x35, 0xfb,
-	0x0b, 0x04, 0x53, 0x6d, 0xa4, 0xaa, 0x37, 0xdf, 0x80, 0xda, 0xb1, 0x5e, 0x54, 0xdd, 0x79, 0xd3,
-	0xa4, 0x78, 0x3a, 0x92, 0xd7, 0x72, 0x37, 0x6e, 0x4d, 0x0a, 0x93, 0x8f, 0x08, 0x6f, 0x1c, 0xe6,
-	0x31, 0x7a, 0x9c, 0xec, 0x0a, 0x00, 0xa3, 0x27, 0x34, 0xde, 0xe5, 0x87, 0x44, 0xee, 0x7e, 0x64,
-	0xd1, 0xd2, 0x80, 0xfa, 0xce, 0x3b, 0x5b, 0xfa, 0xce, 0x7b, 0x35, 0x61, 0xbd, 0x75, 0x48, 0x98,
-	0x3d, 0x0f, 0x78, 0x83, 0x72, 0x83, 0x24, 0xf6, 0x37, 0x08, 0xa6, 0xe4, 0x1d, 0x68, 0xb7, 0xee,
-	0x76, 0x92, 0xaf, 0xc3, 0xb0, 0xde, 0xb7, 0x6a, 0xb9, 0x6a, 0x55, 0xcb, 0xbd, 0xfb, 0x5d, 0x82,
-	0x14, 0xa6, 0xe4, 0x25, 0x30, 0x29, 0xd6, 0x85, 0x51, 0xd9, 0x9b, 0x30, 0x25, 0x6f, 0x81, 0x49,
-	0xda, 0x6b, 0x50, 0x8b, 0x69, 0x23, 0x8d, 0x93, 0xe0, 0x58, 0xe6, 0x1d, 0xf6, 0x5a, 0x0b, 0xfa,
-	0xfd, 0x7d, 0x44, 0x02, 0x4e, 0xe3, 0x67, 0xfa, 0xfe, 0x7e, 0xa6, 0xde, 0xdf, 0x3c, 0x95, 0xea,
-	0xf1, 0xfb, 0x70, 0xe5, 0x44, 0x2e, 0xa9, 0x0e, 0xaf, 0x9b, 0x54, 0x45, 0x46, 0xf1, 0xb4, 0x6b,
-	0xc5, 0x87, 0x57, 0x79, 0xf7, 0x68, 0xba, 0xaf, 0xf2, 0x87, 0xb7, 0x6c, 0xdb, 0xad, 0x32, 0x6b,
-	0x30, 0x24, 0x51, 0xd4, 0xd1, 0x56, 0xd9, 0x84, 0xf2, 0xec, 0xd7, 0x6c, 0xf9, 0xdb, 0xd7, 0x97,
-	0x7e, 0xf1, 0x9f, 0x49, 0x98, 0x2c, 0x3d, 0xa0, 0x6f, 0x13, 0x46, 0x7c, 0x1a, 0xe3, 0x9f, 0x11,
-	0x8c, 0x14, 0x44, 0x10, 0x2f, 0x99, 0x60, 0x9e, 0x15, 0x68, 0xeb, 0x6e, 0x65, 0x3f, 0x79, 0xda,
-	0xf6, 0xcd, 0x4f, 0xff, 0xfe, 0xf7, 0xeb, 0x81, 0x39, 0xfc, 0x62, 0x3e, 0x74, 0x7c, 0x22, 0x2b,
-	0x78, 0x2f, 0x8a, 0xc3, 0xf7, 0x69, 0x83, 0x27, 0x6e, 0xfd, 0xd4, 0xd5, 0x72, 0xfa, 0x1d, 0x82,
-	0x5a, 0xae, 0x93, 0xf8, 0x8e, 0x49, 0xd2, 0x76, 0x59, 0xb5, 0xaa, 0xab, 0x4d, 0x27, 0xc8, 0xac,
-	0xac, 0x05, 0x44, 0x4d, 0xe8, 0xd6, 0x4f, 0xf1, 0xaf, 0x08, 0x46, 0x8b, 0x1a, 0x8d, 0x8d, 0x8a,
-	0xd3, 0x41, 0xd5, 0xcf, 0x83, 0x7a, 0x47, 0xa0, 0x3a, 0xb6, 0x51, 0x3d, 0x57, 0xb5, 0xb6, 0x67,
-	0xc8, 0x45, 0xf5, 0x36, 0x43, 0xee, 0xa0, 0xf7, 0xff, 0x03, 0xd9, 0x32, 0xaa, 0x6e, 0x8e, 0xfc,
-	0x25, 0x82, 0xd1, 0xa2, 0xf4, 0x9b, 0x21, 0x77, 0x18, 0x16, 0xac, 0xe9, 0x33, 0x02, 0xf5, 0x5a,
-	0x36, 0xb1, 0xea, 0x53, 0xaf, 0x9b, 0x9d, 0xfa, 0x53, 0x04, 0x63, 0x25, 0xd1, 0xc6, 0xcb, 0xa6,
-	0x77, 0xa2, 0x7d, 0x22, 0xb1, 0x56, 0xce, 0xe1, 0xa9, 0xee, 0xd3, 0xb2, 0x80, 0x5e, 0xc4, 0xb7,
-	0x7a, 0x9c, 0x7f, 0x01, 0xdb, 0x6d, 0xcd, 0x03, 0xbf, 0x20, 0x18, 0x29, 0x28, 0xb0, 0xd9, 0x53,
-	0x70, 0x56, 0xb2, 0xad, 0x4a, 0x22, 0x66, 0xaf, 0x08, 0xde, 0xdb, 0x78, 0xc1, 0xa0, 0xc8, 0x2d,
-	0x58, 0xb7, 0x5e, 0x3f, 0xc5, 0xbf, 0x23, 0x18, 0x2b, 0x4d, 0x26, 0x66, 0x15, 0xef, 0x34, 0xcc,
-	0x54, 0x84, 0x5e, 0x13, 0xd0, 0xaf, 0xd8, 0x77, 0x2b, 0x43, 0xaf, 0x9e, 0x64, 0xd9, 0x57, 0x51,
-	0x1d, 0xff, 0x81, 0x60, 0xbc, 0x3c, 0xc5, 0xe0, 0x15, 0xf3, 0x77, 0xe2, 0x62, 0xf8, 0x2b, 0x37,
-	0xc9, 0x6a, 0x6b, 0x12, 0x7a, 0x8a, 0x60, 0xbc, 0x3c, 0xeb, 0x98, 0xf1, 0x77, 0x9c, 0x8f, 0x2a,
-	0xf2, 0xaf, 0x0b, 0xfe, 0x7b, 0x56, 0xf5, 0xa6, 0x29, 0x6c, 0xe0, 0x5b, 0x04, 0xe3, 0xe5, 0xa9,
-	0xc9, 0x6c, 0x03, 0x1d, 0x27, 0xad, 0xae, 0x8f, 0x88, 0xea, 0xef, 0xfa, 0x39, 0xfa, 0xfb, 0x37,
-	0xa5, 0xcd, 0x6a, 0x40, 0x32, 0xd7, 0xe6, 0xf2, 0xf0, 0x66, 0xae, 0xcd, 0x6d, 0x93, 0x98, 0xbd,
-	0x24, 0xd8, 0x6f, 0x61, 0xc7, 0xb0, 0x4d, 0xf4, 0xec, 0xf5, 0xbd, 0x54, 0x69, 0x19, 0xce, 0x58,
-	0xa5, 0x4b, 0x53, 0x8c, 0x55, 0x61, 0x5e, 0xea, 0xc4, 0xd9, 0xbd, 0xc6, 0x0a, 0x32, 0x7b, 0xb2,
-	0x7f, 0xc8, 0x85, 0x5a, 0xa1, 0x56, 0x10, 0xea, 0x32, 0xed, 0x75, 0xed, 0x58, 0xf8, 0x65, 0xc4,
-	0x79, 0xa0, 0x7f, 0x19, 0xb1, 0x5f, 0x15, 0x80, 0xcb, 0x76, 0xc5, 0x42, 0xae, 0xea, 0x41, 0xf0,
-	0x49, 0xae, 0x75, 0x55, 0x40, 0x3b, 0x0c, 0x87, 0x5d, 0xdb, 0x54, 0x95, 0xb0, 0x5e, 0xb1, 0x84,
-	0x6b, 0x7f, 0x22, 0x98, 0x6b, 0x84, 0x47, 0x06, 0x38, 0x0f, 0xd1, 0x7b, 0x0f, 0x94, 0x95, 0x1f,
-	0x36, 0x09, 0xf3, 0x9d, 0x30, 0xf6, 0x5d, 0x9f, 0x32, 0x41, 0xe2, 0xca, 0x4f, 0x24, 0x0a, 0x92,
-	0x5e, 0xbf, 0x48, 0xbd, 0x5c, 0x5a, 0xfd, 0x69, 0xc0, 0xde, 0x90, 0x11, 0xd7, 0x45, 0xde, 0xd2,
-	0x58, 0xe1, 0x6c, 0x2f, 0xac, 0x65, 0x2e, 0x7f, 0x69, 0xa3, 0x1d, 0x61, 0xb4, 0x53, 0x32, 0xda,
-	0xd9, 0x96, 0x71, 0xf7, 0x86, 0x04, 0xc5, 0xed, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x36,
-	0x17, 0x5a, 0x90, 0x13, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/scheduler/v1/cloudscheduler.pb.go b/googleapis/cloud/scheduler/v1/cloudscheduler.pb.go
index 81b7f87fdd..54729d8217 100644
--- a/googleapis/cloud/scheduler/v1/cloudscheduler.pb.go
+++ b/googleapis/cloud/scheduler/v1/cloudscheduler.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/scheduler/v1/cloudscheduler.proto
 
-package scheduler // import "google.golang.org/genproto/googleapis/cloud/scheduler/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package scheduler
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for listing jobs using [ListJobs][google.cloud.scheduler.v1.CloudScheduler.ListJobs].
 type ListJobsRequest struct {
@@ -57,16 +57,17 @@ func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
 func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListJobsRequest) ProtoMessage()    {}
 func (*ListJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{0}
+	return fileDescriptor_329fd147d63dc799, []int{0}
 }
+
 func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
 }
 func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+func (m *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(m, src)
 }
 func (m *ListJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListJobsRequest.Size(m)
@@ -119,16 +120,17 @@ func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
 func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListJobsResponse) ProtoMessage()    {}
 func (*ListJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{1}
+	return fileDescriptor_329fd147d63dc799, []int{1}
 }
+
 func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
 }
 func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+func (m *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(m, src)
 }
 func (m *ListJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListJobsResponse.Size(m)
@@ -169,16 +171,17 @@ func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
 func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetJobRequest) ProtoMessage()    {}
 func (*GetJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{2}
+	return fileDescriptor_329fd147d63dc799, []int{2}
 }
+
 func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
 }
 func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+func (m *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(m, src)
 }
 func (m *GetJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetJobRequest.Size(m)
@@ -220,16 +223,17 @@ func (m *CreateJobRequest) Reset()         { *m = CreateJobRequest{} }
 func (m *CreateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateJobRequest) ProtoMessage()    {}
 func (*CreateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{3}
+	return fileDescriptor_329fd147d63dc799, []int{3}
 }
+
 func (m *CreateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateJobRequest.Unmarshal(m, b)
 }
 func (m *CreateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateJobRequest.Merge(dst, src)
+func (m *CreateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateJobRequest.Merge(m, src)
 }
 func (m *CreateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateJobRequest.Size(m)
@@ -274,16 +278,17 @@ func (m *UpdateJobRequest) Reset()         { *m = UpdateJobRequest{} }
 func (m *UpdateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateJobRequest) ProtoMessage()    {}
 func (*UpdateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{4}
+	return fileDescriptor_329fd147d63dc799, []int{4}
 }
+
 func (m *UpdateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateJobRequest.Unmarshal(m, b)
 }
 func (m *UpdateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateJobRequest.Merge(dst, src)
+func (m *UpdateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobRequest.Merge(m, src)
 }
 func (m *UpdateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateJobRequest.Size(m)
@@ -325,16 +330,17 @@ func (m *DeleteJobRequest) Reset()         { *m = DeleteJobRequest{} }
 func (m *DeleteJobRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteJobRequest) ProtoMessage()    {}
 func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{5}
+	return fileDescriptor_329fd147d63dc799, []int{5}
 }
+
 func (m *DeleteJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteJobRequest.Unmarshal(m, b)
 }
 func (m *DeleteJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteJobRequest.Merge(dst, src)
+func (m *DeleteJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobRequest.Merge(m, src)
 }
 func (m *DeleteJobRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteJobRequest.Size(m)
@@ -368,16 +374,17 @@ func (m *PauseJobRequest) Reset()         { *m = PauseJobRequest{} }
 func (m *PauseJobRequest) String() string { return proto.CompactTextString(m) }
 func (*PauseJobRequest) ProtoMessage()    {}
 func (*PauseJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{6}
+	return fileDescriptor_329fd147d63dc799, []int{6}
 }
+
 func (m *PauseJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PauseJobRequest.Unmarshal(m, b)
 }
 func (m *PauseJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PauseJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *PauseJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PauseJobRequest.Merge(dst, src)
+func (m *PauseJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseJobRequest.Merge(m, src)
 }
 func (m *PauseJobRequest) XXX_Size() int {
 	return xxx_messageInfo_PauseJobRequest.Size(m)
@@ -411,16 +418,17 @@ func (m *ResumeJobRequest) Reset()         { *m = ResumeJobRequest{} }
 func (m *ResumeJobRequest) String() string { return proto.CompactTextString(m) }
 func (*ResumeJobRequest) ProtoMessage()    {}
 func (*ResumeJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{7}
+	return fileDescriptor_329fd147d63dc799, []int{7}
 }
+
 func (m *ResumeJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResumeJobRequest.Unmarshal(m, b)
 }
 func (m *ResumeJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResumeJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *ResumeJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResumeJobRequest.Merge(dst, src)
+func (m *ResumeJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeJobRequest.Merge(m, src)
 }
 func (m *ResumeJobRequest) XXX_Size() int {
 	return xxx_messageInfo_ResumeJobRequest.Size(m)
@@ -455,16 +463,17 @@ func (m *RunJobRequest) Reset()         { *m = RunJobRequest{} }
 func (m *RunJobRequest) String() string { return proto.CompactTextString(m) }
 func (*RunJobRequest) ProtoMessage()    {}
 func (*RunJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_0488ab591dd1e45d, []int{8}
+	return fileDescriptor_329fd147d63dc799, []int{8}
 }
+
 func (m *RunJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunJobRequest.Unmarshal(m, b)
 }
 func (m *RunJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunJobRequest.Merge(dst, src)
+func (m *RunJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunJobRequest.Merge(m, src)
 }
 func (m *RunJobRequest) XXX_Size() int {
 	return xxx_messageInfo_RunJobRequest.Size(m)
@@ -494,6 +503,59 @@ func init() {
 	proto.RegisterType((*RunJobRequest)(nil), "google.cloud.scheduler.v1.RunJobRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/scheduler/v1/cloudscheduler.proto", fileDescriptor_329fd147d63dc799)
+}
+
+var fileDescriptor_329fd147d63dc799 = []byte{
+	// 719 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xcb, 0x4e, 0xdb, 0x4c,
+	0x14, 0xc7, 0x35, 0x5c, 0x22, 0x7c, 0x10, 0x10, 0xcd, 0x02, 0x85, 0xf0, 0xf1, 0x29, 0x32, 0x2a,
+	0x8a, 0x5c, 0xe4, 0x81, 0xd0, 0xaa, 0x6a, 0x50, 0x37, 0x5c, 0xda, 0x0a, 0x51, 0x29, 0x32, 0x65,
+	0x53, 0x55, 0x42, 0x4e, 0x32, 0xb8, 0x0e, 0x8e, 0xc7, 0xf5, 0xd8, 0xa8, 0xa5, 0x62, 0x01, 0xea,
+	0xae, 0x8b, 0xaa, 0xa2, 0xbc, 0x40, 0x5f, 0xa9, 0xaf, 0xd0, 0x07, 0xa9, 0x66, 0x7c, 0x81, 0xb8,
+	0xc4, 0xf6, 0x2e, 0x9e, 0xf3, 0x9f, 0x39, 0xbf, 0x39, 0xe7, 0x7f, 0x26, 0xa0, 0x5b, 0x8c, 0x59,
+	0x0e, 0x25, 0x3d, 0x87, 0x85, 0x7d, 0xc2, 0x7b, 0x1f, 0x68, 0x3f, 0x74, 0xa8, 0x4f, 0xce, 0x37,
+	0xa3, 0xa5, 0x74, 0x45, 0xf7, 0x7c, 0x16, 0x30, 0xbc, 0x14, 0xe9, 0x75, 0x19, 0xd4, 0xef, 0xa2,
+	0xe7, 0x9b, 0xf5, 0xff, 0xe2, 0xa3, 0x4c, 0xcf, 0x26, 0xa6, 0xeb, 0xb2, 0xc0, 0x0c, 0x6c, 0xe6,
+	0xf2, 0x68, 0x63, 0x7d, 0xe9, 0x5e, 0xd4, 0xa7, 0x9c, 0x85, 0x7e, 0x8f, 0xc6, 0xa1, 0xd5, 0xf1,
+	0x0c, 0x03, 0xd6, 0x8d, 0x45, 0xcb, 0xb1, 0x48, 0x7e, 0x75, 0xc3, 0x53, 0x42, 0x87, 0x5e, 0xf0,
+	0x39, 0x0e, 0x36, 0xb2, 0xc1, 0x53, 0x9b, 0x3a, 0xfd, 0x93, 0xa1, 0xc9, 0xcf, 0x22, 0x85, 0x4a,
+	0x61, 0xe1, 0xd0, 0xe6, 0xc1, 0x01, 0xeb, 0x72, 0x83, 0x7e, 0x0c, 0x29, 0x0f, 0xf0, 0x22, 0x54,
+	0x3c, 0xd3, 0xa7, 0x6e, 0x50, 0x43, 0x0d, 0xd4, 0x54, 0x8c, 0xf8, 0x0b, 0x2f, 0x83, 0xe2, 0x99,
+	0x16, 0x3d, 0xe1, 0xf6, 0x05, 0xad, 0x4d, 0x37, 0x50, 0x73, 0xda, 0x98, 0x11, 0x0b, 0x47, 0xf6,
+	0x05, 0xc5, 0x2b, 0x00, 0x32, 0x18, 0xb0, 0x33, 0xea, 0xd6, 0x2a, 0x72, 0xa3, 0x94, 0xbf, 0x15,
+	0x0b, 0xaa, 0x0b, 0xd5, 0xbb, 0x34, 0xdc, 0x63, 0x2e, 0xa7, 0xb8, 0x05, 0x53, 0x03, 0xd6, 0xe5,
+	0x35, 0xd4, 0x98, 0x6c, 0xce, 0xb6, 0xfe, 0xd7, 0xc7, 0x56, 0x50, 0x3f, 0x60, 0x5d, 0x43, 0x6a,
+	0xf1, 0x1a, 0x2c, 0xb8, 0xf4, 0x53, 0x70, 0x72, 0x2f, 0xd7, 0x84, 0xcc, 0x35, 0x27, 0x96, 0x3b,
+	0x69, 0xbe, 0x55, 0x98, 0x7b, 0x45, 0x45, 0xba, 0xe4, 0x52, 0x18, 0xa6, 0x5c, 0x73, 0x48, 0xe3,
+	0x2b, 0xc9, 0xdf, 0xea, 0x7b, 0xa8, 0xee, 0xfa, 0xd4, 0x0c, 0xe8, 0x3d, 0xdd, 0xb8, 0xcb, 0x6f,
+	0xc0, 0xe4, 0x80, 0x75, 0x65, 0xb2, 0x62, 0x56, 0x21, 0x55, 0xaf, 0x10, 0x54, 0x8f, 0xbd, 0xfe,
+	0xe8, 0xf1, 0xf1, 0x31, 0xa8, 0xf4, 0x31, 0x78, 0x1b, 0x66, 0x43, 0x79, 0x8a, 0xec, 0x5a, 0x0c,
+	0x50, 0x4f, 0x76, 0x26, 0x8d, 0xd5, 0x5f, 0x8a, 0xc6, 0xbe, 0x31, 0xf9, 0x99, 0x01, 0x91, 0x5c,
+	0xfc, 0x56, 0xd7, 0xa0, 0xba, 0x47, 0x1d, 0x3a, 0x82, 0xf0, 0x50, 0x25, 0x1e, 0xc1, 0x42, 0xc7,
+	0x0c, 0x79, 0x91, 0x6c, 0x0d, 0xaa, 0x06, 0xe5, 0xe1, 0xb0, 0x48, 0xb7, 0x0a, 0x73, 0x46, 0xe8,
+	0xe6, 0x8b, 0x5a, 0xb7, 0x0a, 0xcc, 0xef, 0x8a, 0x8b, 0x1f, 0x25, 0xf7, 0xc6, 0xb7, 0x08, 0x66,
+	0x12, 0x9b, 0x60, 0x2d, 0xa7, 0x3a, 0x19, 0xcb, 0xd6, 0x1f, 0x97, 0xd2, 0x46, 0xbe, 0x53, 0x37,
+	0xae, 0x7f, 0xff, 0xb9, 0x99, 0xd0, 0x70, 0x53, 0x0c, 0xd2, 0x97, 0xa8, 0xbf, 0x2f, 0x3c, 0x9f,
+	0x0d, 0x68, 0x2f, 0xe0, 0x44, 0x23, 0x0e, 0xeb, 0x45, 0x13, 0x4a, 0xb4, 0x4b, 0x22, 0x5d, 0xf7,
+	0x15, 0x41, 0x25, 0xb2, 0x13, 0x6e, 0xe6, 0x64, 0x1a, 0x71, 0x5c, 0xbd, 0xa0, 0xbb, 0x19, 0x0c,
+	0x51, 0x92, 0x31, 0x10, 0x92, 0x81, 0x68, 0x97, 0xf8, 0x3b, 0x02, 0x25, 0x35, 0x2c, 0xce, 0xbb,
+	0x73, 0xd6, 0xd6, 0x85, 0x30, 0x4f, 0x25, 0x0c, 0x51, 0x4b, 0xd7, 0xa4, 0x2d, 0xcd, 0x79, 0x83,
+	0x40, 0x49, 0x3d, 0x9e, 0x4b, 0x94, 0x9d, 0x84, 0x42, 0xa2, 0xe7, 0x92, 0x68, 0xab, 0xb5, 0x2e,
+	0x89, 0xc4, 0x7b, 0x57, 0xa2, 0x44, 0x11, 0xd5, 0x35, 0x02, 0x25, 0xb5, 0x7d, 0x2e, 0x55, 0x76,
+	0x38, 0xea, 0x8b, 0xff, 0x0c, 0xd6, 0xbe, 0x78, 0x4e, 0x93, 0x66, 0x69, 0xe5, 0x9b, 0xf5, 0x03,
+	0xc1, 0x4c, 0x32, 0x53, 0xb9, 0x5e, 0xce, 0x0c, 0x5e, 0xd9, 0xc2, 0xa8, 0x7a, 0x59, 0x94, 0xb6,
+	0x27, 0x32, 0xb4, 0x91, 0x86, 0x7f, 0x22, 0x50, 0xd2, 0x01, 0xce, 0x2d, 0x4c, 0x76, 0xcc, 0x0b,
+	0xa9, 0xda, 0x92, 0xea, 0x89, 0x4a, 0x4a, 0x53, 0xf9, 0x32, 0x85, 0xc0, 0xfa, 0x86, 0xa0, 0x12,
+	0xbd, 0x17, 0xb9, 0xe3, 0x35, 0xf2, 0xa4, 0x14, 0x02, 0x3d, 0x93, 0x40, 0x9b, 0xea, 0x7a, 0x79,
+	0xa0, 0xd0, 0x6d, 0x23, 0x6d, 0xe7, 0x0a, 0xc1, 0x4a, 0x8f, 0x0d, 0xc7, 0x1f, 0xbf, 0x33, 0x9f,
+	0xbe, 0x58, 0x1d, 0xe1, 0x92, 0x0e, 0x7a, 0xb7, 0x13, 0x8b, 0x2d, 0xe6, 0x98, 0xae, 0xa5, 0x33,
+	0xdf, 0x22, 0x16, 0x75, 0xa5, 0x87, 0x48, 0x14, 0x32, 0x3d, 0x9b, 0x3f, 0xf0, 0x47, 0xbe, 0x9d,
+	0x7e, 0xfc, 0x9a, 0x50, 0x8e, 0x76, 0x5f, 0xef, 0xef, 0x1d, 0x1f, 0xee, 0x1b, 0xdd, 0x8a, 0xdc,
+	0xba, 0xf5, 0x37, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x36, 0xc7, 0x33, 0x86, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -856,56 +918,3 @@ var _CloudScheduler_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/scheduler/v1/cloudscheduler.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/scheduler/v1/cloudscheduler.proto", fileDescriptor_cloudscheduler_0488ab591dd1e45d)
-}
-
-var fileDescriptor_cloudscheduler_0488ab591dd1e45d = []byte{
-	// 719 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xcb, 0x4e, 0xdb, 0x4c,
-	0x14, 0xc7, 0x35, 0x5c, 0x22, 0x7c, 0x10, 0x10, 0xcd, 0x02, 0x85, 0xf0, 0xf1, 0x29, 0x32, 0x2a,
-	0x8a, 0x5c, 0xe4, 0x81, 0xd0, 0xaa, 0x6a, 0x50, 0x37, 0x5c, 0xda, 0x0a, 0x51, 0x29, 0x32, 0x65,
-	0x53, 0x55, 0x42, 0x4e, 0x32, 0xb8, 0x0e, 0x8e, 0xc7, 0xf5, 0xd8, 0xa8, 0xa5, 0x62, 0x01, 0xea,
-	0xae, 0x8b, 0xaa, 0xa2, 0xbc, 0x40, 0x5f, 0xa9, 0xaf, 0xd0, 0x07, 0xa9, 0x66, 0x7c, 0x81, 0xb8,
-	0xc4, 0xf6, 0x2e, 0x9e, 0xf3, 0x9f, 0x39, 0xbf, 0x39, 0xe7, 0x7f, 0x26, 0xa0, 0x5b, 0x8c, 0x59,
-	0x0e, 0x25, 0x3d, 0x87, 0x85, 0x7d, 0xc2, 0x7b, 0x1f, 0x68, 0x3f, 0x74, 0xa8, 0x4f, 0xce, 0x37,
-	0xa3, 0xa5, 0x74, 0x45, 0xf7, 0x7c, 0x16, 0x30, 0xbc, 0x14, 0xe9, 0x75, 0x19, 0xd4, 0xef, 0xa2,
-	0xe7, 0x9b, 0xf5, 0xff, 0xe2, 0xa3, 0x4c, 0xcf, 0x26, 0xa6, 0xeb, 0xb2, 0xc0, 0x0c, 0x6c, 0xe6,
-	0xf2, 0x68, 0x63, 0x7d, 0xe9, 0x5e, 0xd4, 0xa7, 0x9c, 0x85, 0x7e, 0x8f, 0xc6, 0xa1, 0xd5, 0xf1,
-	0x0c, 0x03, 0xd6, 0x8d, 0x45, 0xcb, 0xb1, 0x48, 0x7e, 0x75, 0xc3, 0x53, 0x42, 0x87, 0x5e, 0xf0,
-	0x39, 0x0e, 0x36, 0xb2, 0xc1, 0x53, 0x9b, 0x3a, 0xfd, 0x93, 0xa1, 0xc9, 0xcf, 0x22, 0x85, 0x4a,
-	0x61, 0xe1, 0xd0, 0xe6, 0xc1, 0x01, 0xeb, 0x72, 0x83, 0x7e, 0x0c, 0x29, 0x0f, 0xf0, 0x22, 0x54,
-	0x3c, 0xd3, 0xa7, 0x6e, 0x50, 0x43, 0x0d, 0xd4, 0x54, 0x8c, 0xf8, 0x0b, 0x2f, 0x83, 0xe2, 0x99,
-	0x16, 0x3d, 0xe1, 0xf6, 0x05, 0xad, 0x4d, 0x37, 0x50, 0x73, 0xda, 0x98, 0x11, 0x0b, 0x47, 0xf6,
-	0x05, 0xc5, 0x2b, 0x00, 0x32, 0x18, 0xb0, 0x33, 0xea, 0xd6, 0x2a, 0x72, 0xa3, 0x94, 0xbf, 0x15,
-	0x0b, 0xaa, 0x0b, 0xd5, 0xbb, 0x34, 0xdc, 0x63, 0x2e, 0xa7, 0xb8, 0x05, 0x53, 0x03, 0xd6, 0xe5,
-	0x35, 0xd4, 0x98, 0x6c, 0xce, 0xb6, 0xfe, 0xd7, 0xc7, 0x56, 0x50, 0x3f, 0x60, 0x5d, 0x43, 0x6a,
-	0xf1, 0x1a, 0x2c, 0xb8, 0xf4, 0x53, 0x70, 0x72, 0x2f, 0xd7, 0x84, 0xcc, 0x35, 0x27, 0x96, 0x3b,
-	0x69, 0xbe, 0x55, 0x98, 0x7b, 0x45, 0x45, 0xba, 0xe4, 0x52, 0x18, 0xa6, 0x5c, 0x73, 0x48, 0xe3,
-	0x2b, 0xc9, 0xdf, 0xea, 0x7b, 0xa8, 0xee, 0xfa, 0xd4, 0x0c, 0xe8, 0x3d, 0xdd, 0xb8, 0xcb, 0x6f,
-	0xc0, 0xe4, 0x80, 0x75, 0x65, 0xb2, 0x62, 0x56, 0x21, 0x55, 0xaf, 0x10, 0x54, 0x8f, 0xbd, 0xfe,
-	0xe8, 0xf1, 0xf1, 0x31, 0xa8, 0xf4, 0x31, 0x78, 0x1b, 0x66, 0x43, 0x79, 0x8a, 0xec, 0x5a, 0x0c,
-	0x50, 0x4f, 0x76, 0x26, 0x8d, 0xd5, 0x5f, 0x8a, 0xc6, 0xbe, 0x31, 0xf9, 0x99, 0x01, 0x91, 0x5c,
-	0xfc, 0x56, 0xd7, 0xa0, 0xba, 0x47, 0x1d, 0x3a, 0x82, 0xf0, 0x50, 0x25, 0x1e, 0xc1, 0x42, 0xc7,
-	0x0c, 0x79, 0x91, 0x6c, 0x0d, 0xaa, 0x06, 0xe5, 0xe1, 0xb0, 0x48, 0xb7, 0x0a, 0x73, 0x46, 0xe8,
-	0xe6, 0x8b, 0x5a, 0xb7, 0x0a, 0xcc, 0xef, 0x8a, 0x8b, 0x1f, 0x25, 0xf7, 0xc6, 0xb7, 0x08, 0x66,
-	0x12, 0x9b, 0x60, 0x2d, 0xa7, 0x3a, 0x19, 0xcb, 0xd6, 0x1f, 0x97, 0xd2, 0x46, 0xbe, 0x53, 0x37,
-	0xae, 0x7f, 0xff, 0xb9, 0x99, 0xd0, 0x70, 0x53, 0x0c, 0xd2, 0x97, 0xa8, 0xbf, 0x2f, 0x3c, 0x9f,
-	0x0d, 0x68, 0x2f, 0xe0, 0x44, 0x23, 0x0e, 0xeb, 0x45, 0x13, 0x4a, 0xb4, 0x4b, 0x22, 0x5d, 0xf7,
-	0x15, 0x41, 0x25, 0xb2, 0x13, 0x6e, 0xe6, 0x64, 0x1a, 0x71, 0x5c, 0xbd, 0xa0, 0xbb, 0x19, 0x0c,
-	0x51, 0x92, 0x31, 0x10, 0x92, 0x81, 0x68, 0x97, 0xf8, 0x3b, 0x02, 0x25, 0x35, 0x2c, 0xce, 0xbb,
-	0x73, 0xd6, 0xd6, 0x85, 0x30, 0x4f, 0x25, 0x0c, 0x51, 0x4b, 0xd7, 0xa4, 0x2d, 0xcd, 0x79, 0x83,
-	0x40, 0x49, 0x3d, 0x9e, 0x4b, 0x94, 0x9d, 0x84, 0x42, 0xa2, 0xe7, 0x92, 0x68, 0xab, 0xb5, 0x2e,
-	0x89, 0xc4, 0x7b, 0x57, 0xa2, 0x44, 0x11, 0xd5, 0x35, 0x02, 0x25, 0xb5, 0x7d, 0x2e, 0x55, 0x76,
-	0x38, 0xea, 0x8b, 0xff, 0x0c, 0xd6, 0xbe, 0x78, 0x4e, 0x93, 0x66, 0x69, 0xe5, 0x9b, 0xf5, 0x03,
-	0xc1, 0x4c, 0x32, 0x53, 0xb9, 0x5e, 0xce, 0x0c, 0x5e, 0xd9, 0xc2, 0xa8, 0x7a, 0x59, 0x94, 0xb6,
-	0x27, 0x32, 0xb4, 0x91, 0x86, 0x7f, 0x22, 0x50, 0xd2, 0x01, 0xce, 0x2d, 0x4c, 0x76, 0xcc, 0x0b,
-	0xa9, 0xda, 0x92, 0xea, 0x89, 0x4a, 0x4a, 0x53, 0xf9, 0x32, 0x85, 0xc0, 0xfa, 0x86, 0xa0, 0x12,
-	0xbd, 0x17, 0xb9, 0xe3, 0x35, 0xf2, 0xa4, 0x14, 0x02, 0x3d, 0x93, 0x40, 0x9b, 0xea, 0x7a, 0x79,
-	0xa0, 0xd0, 0x6d, 0x23, 0x6d, 0xe7, 0x0a, 0xc1, 0x4a, 0x8f, 0x0d, 0xc7, 0x1f, 0xbf, 0x33, 0x9f,
-	0xbe, 0x58, 0x1d, 0xe1, 0x92, 0x0e, 0x7a, 0xb7, 0x13, 0x8b, 0x2d, 0xe6, 0x98, 0xae, 0xa5, 0x33,
-	0xdf, 0x22, 0x16, 0x75, 0xa5, 0x87, 0x48, 0x14, 0x32, 0x3d, 0x9b, 0x3f, 0xf0, 0x47, 0xbe, 0x9d,
-	0x7e, 0xfc, 0x9a, 0x50, 0x8e, 0x76, 0x5f, 0xef, 0xef, 0x1d, 0x1f, 0xee, 0x1b, 0xdd, 0x8a, 0xdc,
-	0xba, 0xf5, 0x37, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x36, 0xc7, 0x33, 0x86, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/scheduler/v1/job.pb.go b/googleapis/cloud/scheduler/v1/job.pb.go
index 43ef3dd625..11130bf32c 100644
--- a/googleapis/cloud/scheduler/v1/job.pb.go
+++ b/googleapis/cloud/scheduler/v1/job.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/scheduler/v1/job.proto
 
-package scheduler // import "google.golang.org/genproto/googleapis/cloud/scheduler/v1"
+package scheduler
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // State of the job.
 type Job_State int32
@@ -50,6 +53,7 @@ var Job_State_name = map[int32]string{
 	3: "DISABLED",
 	4: "UPDATE_FAILED",
 }
+
 var Job_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"ENABLED":           1,
@@ -61,8 +65,9 @@ var Job_State_value = map[string]int32{
 func (x Job_State) String() string {
 	return proto.EnumName(Job_State_name, int32(x))
 }
+
 func (Job_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_61d7bc76ec491cf9, []int{0, 0}
+	return fileDescriptor_a71942b5342d2a6f, []int{0, 0}
 }
 
 // Configuration for a job.
@@ -169,16 +174,17 @@ func (m *Job) Reset()         { *m = Job{} }
 func (m *Job) String() string { return proto.CompactTextString(m) }
 func (*Job) ProtoMessage()    {}
 func (*Job) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_61d7bc76ec491cf9, []int{0}
+	return fileDescriptor_a71942b5342d2a6f, []int{0}
 }
+
 func (m *Job) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job.Unmarshal(m, b)
 }
 func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
 }
-func (dst *Job) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job.Merge(dst, src)
+func (m *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(m, src)
 }
 func (m *Job) XXX_Size() int {
 	return xxx_messageInfo_Job.Size(m)
@@ -316,99 +322,15 @@ func (m *Job) GetAttemptDeadline() *duration.Duration {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Job_OneofMarshaler, _Job_OneofUnmarshaler, _Job_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Job) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Job_PubsubTarget)(nil),
 		(*Job_AppEngineHttpTarget)(nil),
 		(*Job_HttpTarget)(nil),
 	}
 }
 
-func _Job_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Job)
-	// target
-	switch x := m.Target.(type) {
-	case *Job_PubsubTarget:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PubsubTarget); err != nil {
-			return err
-		}
-	case *Job_AppEngineHttpTarget:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngineHttpTarget); err != nil {
-			return err
-		}
-	case *Job_HttpTarget:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HttpTarget); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Job_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Job)
-	switch tag {
-	case 4: // target.pubsub_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PubsubTarget)
-		err := b.DecodeMessage(msg)
-		m.Target = &Job_PubsubTarget{msg}
-		return true, err
-	case 5: // target.app_engine_http_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppEngineHttpTarget)
-		err := b.DecodeMessage(msg)
-		m.Target = &Job_AppEngineHttpTarget{msg}
-		return true, err
-	case 6: // target.http_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HttpTarget)
-		err := b.DecodeMessage(msg)
-		m.Target = &Job_HttpTarget{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Job_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Job)
-	// target
-	switch x := m.Target.(type) {
-	case *Job_PubsubTarget:
-		s := proto.Size(x.PubsubTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_AppEngineHttpTarget:
-		s := proto.Size(x.AppEngineHttpTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_HttpTarget:
-		s := proto.Size(x.HttpTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Settings that determine the retry behavior.
 //
 // By default, if a job does not complete successfully (meaning that
@@ -479,16 +401,17 @@ func (m *RetryConfig) Reset()         { *m = RetryConfig{} }
 func (m *RetryConfig) String() string { return proto.CompactTextString(m) }
 func (*RetryConfig) ProtoMessage()    {}
 func (*RetryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_61d7bc76ec491cf9, []int{1}
+	return fileDescriptor_a71942b5342d2a6f, []int{1}
 }
+
 func (m *RetryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryConfig.Unmarshal(m, b)
 }
 func (m *RetryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryConfig.Marshal(b, m, deterministic)
 }
-func (dst *RetryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryConfig.Merge(dst, src)
+func (m *RetryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryConfig.Merge(m, src)
 }
 func (m *RetryConfig) XXX_Size() int {
 	return xxx_messageInfo_RetryConfig.Size(m)
@@ -535,16 +458,16 @@ func (m *RetryConfig) GetMaxDoublings() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.scheduler.v1.Job_State", Job_State_name, Job_State_value)
 	proto.RegisterType((*Job)(nil), "google.cloud.scheduler.v1.Job")
 	proto.RegisterType((*RetryConfig)(nil), "google.cloud.scheduler.v1.RetryConfig")
-	proto.RegisterEnum("google.cloud.scheduler.v1.Job_State", Job_State_name, Job_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/scheduler/v1/job.proto", fileDescriptor_job_61d7bc76ec491cf9)
+	proto.RegisterFile("google/cloud/scheduler/v1/job.proto", fileDescriptor_a71942b5342d2a6f)
 }
 
-var fileDescriptor_job_61d7bc76ec491cf9 = []byte{
+var fileDescriptor_a71942b5342d2a6f = []byte{
 	// 725 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x5f, 0x4f, 0xdb, 0x3c,
 	0x14, 0xc6, 0x29, 0xb4, 0xa5, 0x9c, 0xb4, 0xd0, 0x9a, 0x3f, 0x6f, 0xe8, 0xbb, 0x8d, 0x0a, 0x36,
diff --git a/googleapis/cloud/scheduler/v1/target.pb.go b/googleapis/cloud/scheduler/v1/target.pb.go
index 77e3ce6953..bf9154d254 100644
--- a/googleapis/cloud/scheduler/v1/target.pb.go
+++ b/googleapis/cloud/scheduler/v1/target.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/scheduler/v1/target.proto
 
-package scheduler // import "google.golang.org/genproto/googleapis/cloud/scheduler/v1"
+package scheduler
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The HTTP method used to execute the job.
 type HttpMethod int32
@@ -52,6 +55,7 @@ var HttpMethod_name = map[int32]string{
 	6: "PATCH",
 	7: "OPTIONS",
 }
+
 var HttpMethod_value = map[string]int32{
 	"HTTP_METHOD_UNSPECIFIED": 0,
 	"POST":                    1,
@@ -66,8 +70,9 @@ var HttpMethod_value = map[string]int32{
 func (x HttpMethod) String() string {
 	return proto.EnumName(HttpMethod_name, int32(x))
 }
+
 func (HttpMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_21f966c3f7a2a854, []int{0}
+	return fileDescriptor_695eb74e082a5bc1, []int{0}
 }
 
 // Http target. The job will be pushed to the job handler by means of
@@ -126,16 +131,17 @@ func (m *HttpTarget) Reset()         { *m = HttpTarget{} }
 func (m *HttpTarget) String() string { return proto.CompactTextString(m) }
 func (*HttpTarget) ProtoMessage()    {}
 func (*HttpTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_21f966c3f7a2a854, []int{0}
+	return fileDescriptor_695eb74e082a5bc1, []int{0}
 }
+
 func (m *HttpTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpTarget.Unmarshal(m, b)
 }
 func (m *HttpTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpTarget.Marshal(b, m, deterministic)
 }
-func (dst *HttpTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpTarget.Merge(dst, src)
+func (m *HttpTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpTarget.Merge(m, src)
 }
 func (m *HttpTarget) XXX_Size() int {
 	return xxx_messageInfo_HttpTarget.Size(m)
@@ -211,80 +217,14 @@ func (m *HttpTarget) GetOidcToken() *OidcToken {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HttpTarget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HttpTarget_OneofMarshaler, _HttpTarget_OneofUnmarshaler, _HttpTarget_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HttpTarget) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HttpTarget_OauthToken)(nil),
 		(*HttpTarget_OidcToken)(nil),
 	}
 }
 
-func _HttpTarget_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HttpTarget)
-	// authorization_header
-	switch x := m.AuthorizationHeader.(type) {
-	case *HttpTarget_OauthToken:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OauthToken); err != nil {
-			return err
-		}
-	case *HttpTarget_OidcToken:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OidcToken); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("HttpTarget.AuthorizationHeader has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HttpTarget_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HttpTarget)
-	switch tag {
-	case 5: // authorization_header.oauth_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(OAuthToken)
-		err := b.DecodeMessage(msg)
-		m.AuthorizationHeader = &HttpTarget_OauthToken{msg}
-		return true, err
-	case 6: // authorization_header.oidc_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(OidcToken)
-		err := b.DecodeMessage(msg)
-		m.AuthorizationHeader = &HttpTarget_OidcToken{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HttpTarget_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HttpTarget)
-	// authorization_header
-	switch x := m.AuthorizationHeader.(type) {
-	case *HttpTarget_OauthToken:
-		s := proto.Size(x.OauthToken)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *HttpTarget_OidcToken:
-		s := proto.Size(x.OidcToken)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // App Engine target. The job will be pushed to a job handler by means
 // of an HTTP request via an [http_method][google.cloud.scheduler.v1.AppEngineHttpTarget.http_method] such
 // as HTTP POST, HTTP GET, etc. The job is acknowledged by means of an
@@ -355,16 +295,17 @@ func (m *AppEngineHttpTarget) Reset()         { *m = AppEngineHttpTarget{} }
 func (m *AppEngineHttpTarget) String() string { return proto.CompactTextString(m) }
 func (*AppEngineHttpTarget) ProtoMessage()    {}
 func (*AppEngineHttpTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_21f966c3f7a2a854, []int{1}
+	return fileDescriptor_695eb74e082a5bc1, []int{1}
 }
+
 func (m *AppEngineHttpTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineHttpTarget.Unmarshal(m, b)
 }
 func (m *AppEngineHttpTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineHttpTarget.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineHttpTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineHttpTarget.Merge(dst, src)
+func (m *AppEngineHttpTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpTarget.Merge(m, src)
 }
 func (m *AppEngineHttpTarget) XXX_Size() int {
 	return xxx_messageInfo_AppEngineHttpTarget.Size(m)
@@ -442,16 +383,17 @@ func (m *PubsubTarget) Reset()         { *m = PubsubTarget{} }
 func (m *PubsubTarget) String() string { return proto.CompactTextString(m) }
 func (*PubsubTarget) ProtoMessage()    {}
 func (*PubsubTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_21f966c3f7a2a854, []int{2}
+	return fileDescriptor_695eb74e082a5bc1, []int{2}
 }
+
 func (m *PubsubTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PubsubTarget.Unmarshal(m, b)
 }
 func (m *PubsubTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PubsubTarget.Marshal(b, m, deterministic)
 }
-func (dst *PubsubTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PubsubTarget.Merge(dst, src)
+func (m *PubsubTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PubsubTarget.Merge(m, src)
 }
 func (m *PubsubTarget) XXX_Size() int {
 	return xxx_messageInfo_PubsubTarget.Size(m)
@@ -587,16 +529,17 @@ func (m *AppEngineRouting) Reset()         { *m = AppEngineRouting{} }
 func (m *AppEngineRouting) String() string { return proto.CompactTextString(m) }
 func (*AppEngineRouting) ProtoMessage()    {}
 func (*AppEngineRouting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_21f966c3f7a2a854, []int{3}
+	return fileDescriptor_695eb74e082a5bc1, []int{3}
 }
+
 func (m *AppEngineRouting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineRouting.Unmarshal(m, b)
 }
 func (m *AppEngineRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineRouting.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineRouting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineRouting.Merge(dst, src)
+func (m *AppEngineRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineRouting.Merge(m, src)
 }
 func (m *AppEngineRouting) XXX_Size() int {
 	return xxx_messageInfo_AppEngineRouting.Size(m)
@@ -658,16 +601,17 @@ func (m *OAuthToken) Reset()         { *m = OAuthToken{} }
 func (m *OAuthToken) String() string { return proto.CompactTextString(m) }
 func (*OAuthToken) ProtoMessage()    {}
 func (*OAuthToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_21f966c3f7a2a854, []int{4}
+	return fileDescriptor_695eb74e082a5bc1, []int{4}
 }
+
 func (m *OAuthToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OAuthToken.Unmarshal(m, b)
 }
 func (m *OAuthToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OAuthToken.Marshal(b, m, deterministic)
 }
-func (dst *OAuthToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OAuthToken.Merge(dst, src)
+func (m *OAuthToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OAuthToken.Merge(m, src)
 }
 func (m *OAuthToken) XXX_Size() int {
 	return xxx_messageInfo_OAuthToken.Size(m)
@@ -715,16 +659,17 @@ func (m *OidcToken) Reset()         { *m = OidcToken{} }
 func (m *OidcToken) String() string { return proto.CompactTextString(m) }
 func (*OidcToken) ProtoMessage()    {}
 func (*OidcToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_21f966c3f7a2a854, []int{5}
+	return fileDescriptor_695eb74e082a5bc1, []int{5}
 }
+
 func (m *OidcToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OidcToken.Unmarshal(m, b)
 }
 func (m *OidcToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OidcToken.Marshal(b, m, deterministic)
 }
-func (dst *OidcToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OidcToken.Merge(dst, src)
+func (m *OidcToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OidcToken.Merge(m, src)
 }
 func (m *OidcToken) XXX_Size() int {
 	return xxx_messageInfo_OidcToken.Size(m)
@@ -750,6 +695,7 @@ func (m *OidcToken) GetAudience() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.scheduler.v1.HttpMethod", HttpMethod_name, HttpMethod_value)
 	proto.RegisterType((*HttpTarget)(nil), "google.cloud.scheduler.v1.HttpTarget")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.scheduler.v1.HttpTarget.HeadersEntry")
 	proto.RegisterType((*AppEngineHttpTarget)(nil), "google.cloud.scheduler.v1.AppEngineHttpTarget")
@@ -759,14 +705,13 @@ func init() {
 	proto.RegisterType((*AppEngineRouting)(nil), "google.cloud.scheduler.v1.AppEngineRouting")
 	proto.RegisterType((*OAuthToken)(nil), "google.cloud.scheduler.v1.OAuthToken")
 	proto.RegisterType((*OidcToken)(nil), "google.cloud.scheduler.v1.OidcToken")
-	proto.RegisterEnum("google.cloud.scheduler.v1.HttpMethod", HttpMethod_name, HttpMethod_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/scheduler/v1/target.proto", fileDescriptor_target_21f966c3f7a2a854)
+	proto.RegisterFile("google/cloud/scheduler/v1/target.proto", fileDescriptor_695eb74e082a5bc1)
 }
 
-var fileDescriptor_target_21f966c3f7a2a854 = []byte{
+var fileDescriptor_695eb74e082a5bc1 = []byte{
 	// 750 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xdd, 0x6e, 0xeb, 0x44,
 	0x10, 0x3e, 0xae, 0xf3, 0xd3, 0x8c, 0x23, 0xb0, 0xf6, 0x1c, 0x20, 0x04, 0x8e, 0x14, 0x22, 0x40,
diff --git a/googleapis/cloud/scheduler/v1beta1/cloudscheduler.pb.go b/googleapis/cloud/scheduler/v1beta1/cloudscheduler.pb.go
index 8ee5ef97e4..5091139acf 100644
--- a/googleapis/cloud/scheduler/v1beta1/cloudscheduler.pb.go
+++ b/googleapis/cloud/scheduler/v1beta1/cloudscheduler.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/scheduler/v1beta1/cloudscheduler.proto
 
-package scheduler // import "google.golang.org/genproto/googleapis/cloud/scheduler/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package scheduler
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for listing jobs using [ListJobs][google.cloud.scheduler.v1beta1.CloudScheduler.ListJobs].
 type ListJobsRequest struct {
@@ -57,16 +57,17 @@ func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
 func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListJobsRequest) ProtoMessage()    {}
 func (*ListJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{0}
+	return fileDescriptor_ab8778b9dae54836, []int{0}
 }
+
 func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
 }
 func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+func (m *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(m, src)
 }
 func (m *ListJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListJobsRequest.Size(m)
@@ -119,16 +120,17 @@ func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
 func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListJobsResponse) ProtoMessage()    {}
 func (*ListJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{1}
+	return fileDescriptor_ab8778b9dae54836, []int{1}
 }
+
 func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
 }
 func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+func (m *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(m, src)
 }
 func (m *ListJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListJobsResponse.Size(m)
@@ -169,16 +171,17 @@ func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
 func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetJobRequest) ProtoMessage()    {}
 func (*GetJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{2}
+	return fileDescriptor_ab8778b9dae54836, []int{2}
 }
+
 func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
 }
 func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+func (m *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(m, src)
 }
 func (m *GetJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetJobRequest.Size(m)
@@ -220,16 +223,17 @@ func (m *CreateJobRequest) Reset()         { *m = CreateJobRequest{} }
 func (m *CreateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateJobRequest) ProtoMessage()    {}
 func (*CreateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{3}
+	return fileDescriptor_ab8778b9dae54836, []int{3}
 }
+
 func (m *CreateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateJobRequest.Unmarshal(m, b)
 }
 func (m *CreateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateJobRequest.Merge(dst, src)
+func (m *CreateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateJobRequest.Merge(m, src)
 }
 func (m *CreateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateJobRequest.Size(m)
@@ -274,16 +278,17 @@ func (m *UpdateJobRequest) Reset()         { *m = UpdateJobRequest{} }
 func (m *UpdateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateJobRequest) ProtoMessage()    {}
 func (*UpdateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{4}
+	return fileDescriptor_ab8778b9dae54836, []int{4}
 }
+
 func (m *UpdateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateJobRequest.Unmarshal(m, b)
 }
 func (m *UpdateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateJobRequest.Merge(dst, src)
+func (m *UpdateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobRequest.Merge(m, src)
 }
 func (m *UpdateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateJobRequest.Size(m)
@@ -325,16 +330,17 @@ func (m *DeleteJobRequest) Reset()         { *m = DeleteJobRequest{} }
 func (m *DeleteJobRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteJobRequest) ProtoMessage()    {}
 func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{5}
+	return fileDescriptor_ab8778b9dae54836, []int{5}
 }
+
 func (m *DeleteJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteJobRequest.Unmarshal(m, b)
 }
 func (m *DeleteJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteJobRequest.Merge(dst, src)
+func (m *DeleteJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobRequest.Merge(m, src)
 }
 func (m *DeleteJobRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteJobRequest.Size(m)
@@ -368,16 +374,17 @@ func (m *PauseJobRequest) Reset()         { *m = PauseJobRequest{} }
 func (m *PauseJobRequest) String() string { return proto.CompactTextString(m) }
 func (*PauseJobRequest) ProtoMessage()    {}
 func (*PauseJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{6}
+	return fileDescriptor_ab8778b9dae54836, []int{6}
 }
+
 func (m *PauseJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PauseJobRequest.Unmarshal(m, b)
 }
 func (m *PauseJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PauseJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *PauseJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PauseJobRequest.Merge(dst, src)
+func (m *PauseJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseJobRequest.Merge(m, src)
 }
 func (m *PauseJobRequest) XXX_Size() int {
 	return xxx_messageInfo_PauseJobRequest.Size(m)
@@ -411,16 +418,17 @@ func (m *ResumeJobRequest) Reset()         { *m = ResumeJobRequest{} }
 func (m *ResumeJobRequest) String() string { return proto.CompactTextString(m) }
 func (*ResumeJobRequest) ProtoMessage()    {}
 func (*ResumeJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{7}
+	return fileDescriptor_ab8778b9dae54836, []int{7}
 }
+
 func (m *ResumeJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResumeJobRequest.Unmarshal(m, b)
 }
 func (m *ResumeJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResumeJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *ResumeJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResumeJobRequest.Merge(dst, src)
+func (m *ResumeJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeJobRequest.Merge(m, src)
 }
 func (m *ResumeJobRequest) XXX_Size() int {
 	return xxx_messageInfo_ResumeJobRequest.Size(m)
@@ -455,16 +463,17 @@ func (m *RunJobRequest) Reset()         { *m = RunJobRequest{} }
 func (m *RunJobRequest) String() string { return proto.CompactTextString(m) }
 func (*RunJobRequest) ProtoMessage()    {}
 func (*RunJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudscheduler_9fba0107986f2580, []int{8}
+	return fileDescriptor_ab8778b9dae54836, []int{8}
 }
+
 func (m *RunJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunJobRequest.Unmarshal(m, b)
 }
 func (m *RunJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunJobRequest.Merge(dst, src)
+func (m *RunJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunJobRequest.Merge(m, src)
 }
 func (m *RunJobRequest) XXX_Size() int {
 	return xxx_messageInfo_RunJobRequest.Size(m)
@@ -494,6 +503,60 @@ func init() {
 	proto.RegisterType((*RunJobRequest)(nil), "google.cloud.scheduler.v1beta1.RunJobRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/scheduler/v1beta1/cloudscheduler.proto", fileDescriptor_ab8778b9dae54836)
+}
+
+var fileDescriptor_ab8778b9dae54836 = []byte{
+	// 731 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x96, 0x4b, 0x4f, 0xdb, 0x4a,
+	0x14, 0xc7, 0x35, 0x3c, 0x22, 0x72, 0x10, 0x10, 0xcd, 0x02, 0xe5, 0x86, 0x7b, 0xaf, 0x22, 0xa3,
+	0x8b, 0xa2, 0x48, 0x64, 0x6e, 0x78, 0xf4, 0x11, 0xfa, 0x90, 0x78, 0x94, 0x0a, 0x51, 0x29, 0x32,
+	0x65, 0xd3, 0x0d, 0x1a, 0x27, 0x83, 0xeb, 0xe0, 0x78, 0x5c, 0x8f, 0x5d, 0xb5, 0x54, 0x6c, 0xba,
+	0xa8, 0x2a, 0xb5, 0x3b, 0x76, 0x5d, 0x54, 0x15, 0xed, 0x37, 0xea, 0x57, 0xe8, 0x07, 0xa9, 0x66,
+	0xfc, 0x80, 0xb8, 0x80, 0xed, 0x5d, 0x3c, 0xe7, 0x9c, 0x39, 0xbf, 0x39, 0xe7, 0xfc, 0x8f, 0x02,
+	0xab, 0x26, 0xe7, 0xa6, 0xcd, 0x48, 0xcf, 0xe6, 0x41, 0x9f, 0x88, 0xde, 0x4b, 0xd6, 0x0f, 0x6c,
+	0xe6, 0x91, 0xd7, 0x6d, 0x83, 0xf9, 0xb4, 0x1d, 0x9e, 0x27, 0xc7, 0x2d, 0xd7, 0xe3, 0x3e, 0xc7,
+	0xff, 0x86, 0x41, 0x2d, 0x65, 0x6c, 0x5d, 0x5a, 0xa3, 0xa0, 0xda, 0xdf, 0xd1, 0xa5, 0xd4, 0xb5,
+	0x08, 0x75, 0x1c, 0xee, 0x53, 0xdf, 0xe2, 0x8e, 0x08, 0xa3, 0x6b, 0x7f, 0x5d, 0xb1, 0x7a, 0x4c,
+	0xf0, 0xc0, 0xeb, 0xb1, 0xc8, 0xd4, 0xc8, 0xa0, 0x19, 0x70, 0x23, 0xf2, 0x5c, 0x88, 0x3c, 0xd5,
+	0x97, 0x11, 0x1c, 0x13, 0x36, 0x74, 0xfd, 0xb7, 0x91, 0xb1, 0x9e, 0x36, 0x1e, 0x5b, 0xcc, 0xee,
+	0x1f, 0x0d, 0xa9, 0x38, 0x09, 0x3d, 0x34, 0x06, 0x73, 0xfb, 0x96, 0xf0, 0xf7, 0xb8, 0x21, 0x74,
+	0xf6, 0x2a, 0x60, 0xc2, 0xc7, 0xf3, 0x50, 0x72, 0xa9, 0xc7, 0x1c, 0xbf, 0x8a, 0xea, 0xa8, 0x51,
+	0xd6, 0xa3, 0x2f, 0xbc, 0x00, 0x65, 0x97, 0x9a, 0xec, 0x48, 0x58, 0xa7, 0xac, 0x3a, 0x59, 0x47,
+	0x8d, 0x49, 0x7d, 0x4a, 0x1e, 0x1c, 0x58, 0xa7, 0x0c, 0xff, 0x03, 0xa0, 0x8c, 0x3e, 0x3f, 0x61,
+	0x4e, 0xb5, 0xa4, 0x02, 0x95, 0xfb, 0x73, 0x79, 0xa0, 0x09, 0xa8, 0x5c, 0xa6, 0x11, 0x2e, 0x77,
+	0x04, 0xc3, 0x77, 0x61, 0x62, 0xc0, 0x0d, 0x51, 0x45, 0xf5, 0xf1, 0xc6, 0xf4, 0xca, 0x62, 0xeb,
+	0xf6, 0x5a, 0xb6, 0xf6, 0xb8, 0xa1, 0xab, 0x00, 0xbc, 0x04, 0x73, 0x0e, 0x7b, 0xe3, 0x1f, 0x5d,
+	0x49, 0x38, 0xa6, 0x12, 0xce, 0xc8, 0xe3, 0x6e, 0x92, 0x74, 0x11, 0x66, 0x76, 0x99, 0xcc, 0x19,
+	0xbf, 0x0c, 0xc3, 0x84, 0x43, 0x87, 0x2c, 0x7a, 0x97, 0xfa, 0xad, 0x51, 0xa8, 0x6c, 0x79, 0x8c,
+	0xfa, 0xec, 0x8a, 0xdf, 0x4d, 0x15, 0x58, 0x87, 0xf1, 0x01, 0x37, 0x54, 0xb2, 0x9c, 0xc0, 0xd2,
+	0x5f, 0xfb, 0x80, 0xa0, 0x72, 0xe8, 0xf6, 0x47, 0x73, 0x44, 0x77, 0xa1, 0x62, 0x77, 0xe1, 0x0d,
+	0x98, 0x0e, 0xd4, 0x55, 0xaa, 0x89, 0x11, 0x4a, 0x2d, 0x0e, 0x8f, 0xfb, 0xdc, 0x7a, 0x22, 0xfb,
+	0xfc, 0x8c, 0x8a, 0x13, 0x1d, 0x42, 0x77, 0xf9, 0x5b, 0x5b, 0x82, 0xca, 0x36, 0xb3, 0xd9, 0x08,
+	0xc7, 0x75, 0x35, 0xf9, 0x0f, 0xe6, 0xba, 0x34, 0x10, 0x59, 0x6e, 0x4b, 0x50, 0xd1, 0x99, 0x08,
+	0x86, 0x59, 0x7e, 0x8b, 0x30, 0xa3, 0x07, 0xce, 0xed, 0x4e, 0x2b, 0x1f, 0x01, 0x66, 0xb7, 0xe4,
+	0xeb, 0x0f, 0xe2, 0xc7, 0xe3, 0x1f, 0x08, 0xa6, 0xe2, 0xa9, 0xc1, 0x24, 0xab, 0x44, 0xa9, 0x31,
+	0xae, 0xfd, 0x9f, 0x3f, 0x20, 0x1c, 0x48, 0x6d, 0xfd, 0xfd, 0xcf, 0x5f, 0xe7, 0x63, 0x04, 0x2f,
+	0x27, 0x32, 0x7b, 0x17, 0x36, 0xfe, 0xa1, 0xeb, 0xf1, 0x01, 0xeb, 0xf9, 0x82, 0x34, 0x89, 0xcd,
+	0x7b, 0xa1, 0x88, 0x49, 0xf3, 0x8c, 0xa8, 0x71, 0x3c, 0x47, 0x50, 0x0a, 0xe7, 0x0c, 0x2f, 0x67,
+	0xe5, 0x1c, 0x99, 0xc7, 0x5a, 0x9e, 0xb6, 0x5f, 0x47, 0x25, 0x0b, 0x76, 0x03, 0x93, 0x42, 0x22,
+	0xcd, 0x33, 0xfc, 0x15, 0x41, 0x39, 0x19, 0x6c, 0x9c, 0x59, 0x8c, 0xb4, 0x06, 0xf2, 0xb1, 0x75,
+	0x14, 0xdb, 0x9a, 0x56, 0xac, 0x62, 0x1d, 0x35, 0xc9, 0x17, 0x08, 0xca, 0x89, 0x2a, 0xb2, 0x01,
+	0xd3, 0x02, 0xca, 0x07, 0xf8, 0x48, 0x01, 0xde, 0x5b, 0x69, 0x5f, 0x02, 0xca, 0xd5, 0x99, 0xa3,
+	0x80, 0x21, 0xe4, 0x67, 0x04, 0xe5, 0x44, 0x32, 0xd9, 0x90, 0x69, 0x75, 0xd5, 0xe6, 0xff, 0x50,
+	0xe6, 0x8e, 0x5c, 0xcf, 0x71, 0x53, 0x9b, 0x05, 0x9b, 0xfa, 0x0d, 0xc1, 0x54, 0xac, 0xcc, 0x6c,
+	0x45, 0xa4, 0x34, 0x5c, 0xa8, 0x62, 0xda, 0x6a, 0x21, 0xb2, 0x8e, 0x2b, 0x73, 0x75, 0x50, 0x13,
+	0x7f, 0x47, 0x50, 0x4e, 0xb6, 0x42, 0x76, 0xc5, 0xd2, 0x0b, 0x24, 0x1f, 0xe4, 0x63, 0x05, 0x79,
+	0x5f, 0x5b, 0x2b, 0x06, 0xe9, 0xa9, 0x64, 0x92, 0xf2, 0x0b, 0x82, 0x52, 0xb8, 0x93, 0xb2, 0x35,
+	0x3b, 0xb2, 0xbb, 0xf2, 0xf1, 0x3d, 0x50, 0x7c, 0x77, 0xb4, 0x76, 0x41, 0xbe, 0xc0, 0xe9, 0xa0,
+	0xe6, 0xe6, 0x27, 0x04, 0x5a, 0x8f, 0x0f, 0x33, 0x12, 0x6d, 0xce, 0x26, 0x9b, 0xb2, 0x2b, 0x87,
+	0xab, 0x8b, 0x5e, 0xec, 0x46, 0x11, 0x26, 0xb7, 0xa9, 0x63, 0xb6, 0xb8, 0x67, 0x12, 0x93, 0x39,
+	0x6a, 0xf4, 0x48, 0x68, 0xa2, 0xae, 0x25, 0x6e, 0xfa, 0x53, 0xb1, 0x91, 0x9c, 0x5c, 0x8c, 0x95,
+	0x0f, 0xb6, 0x9e, 0xee, 0x6c, 0x1f, 0xee, 0xef, 0xe8, 0x46, 0x49, 0xc5, 0xaf, 0xfe, 0x0e, 0x00,
+	0x00, 0xff, 0xff, 0x42, 0xed, 0xf2, 0xae, 0x21, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -856,57 +919,3 @@ var _CloudScheduler_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/scheduler/v1beta1/cloudscheduler.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/scheduler/v1beta1/cloudscheduler.proto", fileDescriptor_cloudscheduler_9fba0107986f2580)
-}
-
-var fileDescriptor_cloudscheduler_9fba0107986f2580 = []byte{
-	// 731 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x96, 0x4b, 0x4f, 0xdb, 0x4a,
-	0x14, 0xc7, 0x35, 0x3c, 0x22, 0x72, 0x10, 0x10, 0xcd, 0x02, 0xe5, 0x86, 0x7b, 0xaf, 0x22, 0xa3,
-	0x8b, 0xa2, 0x48, 0x64, 0x6e, 0x78, 0xf4, 0x11, 0xfa, 0x90, 0x78, 0x94, 0x0a, 0x51, 0x29, 0x32,
-	0x65, 0xd3, 0x0d, 0x1a, 0x27, 0x83, 0xeb, 0xe0, 0x78, 0x5c, 0x8f, 0x5d, 0xb5, 0x54, 0x6c, 0xba,
-	0xa8, 0x2a, 0xb5, 0x3b, 0x76, 0x5d, 0x54, 0x15, 0xed, 0x37, 0xea, 0x57, 0xe8, 0x07, 0xa9, 0x66,
-	0xfc, 0x80, 0xb8, 0x80, 0xed, 0x5d, 0x3c, 0xe7, 0x9c, 0x39, 0xbf, 0x39, 0xe7, 0xfc, 0x8f, 0x02,
-	0xab, 0x26, 0xe7, 0xa6, 0xcd, 0x48, 0xcf, 0xe6, 0x41, 0x9f, 0x88, 0xde, 0x4b, 0xd6, 0x0f, 0x6c,
-	0xe6, 0x91, 0xd7, 0x6d, 0x83, 0xf9, 0xb4, 0x1d, 0x9e, 0x27, 0xc7, 0x2d, 0xd7, 0xe3, 0x3e, 0xc7,
-	0xff, 0x86, 0x41, 0x2d, 0x65, 0x6c, 0x5d, 0x5a, 0xa3, 0xa0, 0xda, 0xdf, 0xd1, 0xa5, 0xd4, 0xb5,
-	0x08, 0x75, 0x1c, 0xee, 0x53, 0xdf, 0xe2, 0x8e, 0x08, 0xa3, 0x6b, 0x7f, 0x5d, 0xb1, 0x7a, 0x4c,
-	0xf0, 0xc0, 0xeb, 0xb1, 0xc8, 0xd4, 0xc8, 0xa0, 0x19, 0x70, 0x23, 0xf2, 0x5c, 0x88, 0x3c, 0xd5,
-	0x97, 0x11, 0x1c, 0x13, 0x36, 0x74, 0xfd, 0xb7, 0x91, 0xb1, 0x9e, 0x36, 0x1e, 0x5b, 0xcc, 0xee,
-	0x1f, 0x0d, 0xa9, 0x38, 0x09, 0x3d, 0x34, 0x06, 0x73, 0xfb, 0x96, 0xf0, 0xf7, 0xb8, 0x21, 0x74,
-	0xf6, 0x2a, 0x60, 0xc2, 0xc7, 0xf3, 0x50, 0x72, 0xa9, 0xc7, 0x1c, 0xbf, 0x8a, 0xea, 0xa8, 0x51,
-	0xd6, 0xa3, 0x2f, 0xbc, 0x00, 0x65, 0x97, 0x9a, 0xec, 0x48, 0x58, 0xa7, 0xac, 0x3a, 0x59, 0x47,
-	0x8d, 0x49, 0x7d, 0x4a, 0x1e, 0x1c, 0x58, 0xa7, 0x0c, 0xff, 0x03, 0xa0, 0x8c, 0x3e, 0x3f, 0x61,
-	0x4e, 0xb5, 0xa4, 0x02, 0x95, 0xfb, 0x73, 0x79, 0xa0, 0x09, 0xa8, 0x5c, 0xa6, 0x11, 0x2e, 0x77,
-	0x04, 0xc3, 0x77, 0x61, 0x62, 0xc0, 0x0d, 0x51, 0x45, 0xf5, 0xf1, 0xc6, 0xf4, 0xca, 0x62, 0xeb,
-	0xf6, 0x5a, 0xb6, 0xf6, 0xb8, 0xa1, 0xab, 0x00, 0xbc, 0x04, 0x73, 0x0e, 0x7b, 0xe3, 0x1f, 0x5d,
-	0x49, 0x38, 0xa6, 0x12, 0xce, 0xc8, 0xe3, 0x6e, 0x92, 0x74, 0x11, 0x66, 0x76, 0x99, 0xcc, 0x19,
-	0xbf, 0x0c, 0xc3, 0x84, 0x43, 0x87, 0x2c, 0x7a, 0x97, 0xfa, 0xad, 0x51, 0xa8, 0x6c, 0x79, 0x8c,
-	0xfa, 0xec, 0x8a, 0xdf, 0x4d, 0x15, 0x58, 0x87, 0xf1, 0x01, 0x37, 0x54, 0xb2, 0x9c, 0xc0, 0xd2,
-	0x5f, 0xfb, 0x80, 0xa0, 0x72, 0xe8, 0xf6, 0x47, 0x73, 0x44, 0x77, 0xa1, 0x62, 0x77, 0xe1, 0x0d,
-	0x98, 0x0e, 0xd4, 0x55, 0xaa, 0x89, 0x11, 0x4a, 0x2d, 0x0e, 0x8f, 0xfb, 0xdc, 0x7a, 0x22, 0xfb,
-	0xfc, 0x8c, 0x8a, 0x13, 0x1d, 0x42, 0x77, 0xf9, 0x5b, 0x5b, 0x82, 0xca, 0x36, 0xb3, 0xd9, 0x08,
-	0xc7, 0x75, 0x35, 0xf9, 0x0f, 0xe6, 0xba, 0x34, 0x10, 0x59, 0x6e, 0x4b, 0x50, 0xd1, 0x99, 0x08,
-	0x86, 0x59, 0x7e, 0x8b, 0x30, 0xa3, 0x07, 0xce, 0xed, 0x4e, 0x2b, 0x1f, 0x01, 0x66, 0xb7, 0xe4,
-	0xeb, 0x0f, 0xe2, 0xc7, 0xe3, 0x1f, 0x08, 0xa6, 0xe2, 0xa9, 0xc1, 0x24, 0xab, 0x44, 0xa9, 0x31,
-	0xae, 0xfd, 0x9f, 0x3f, 0x20, 0x1c, 0x48, 0x6d, 0xfd, 0xfd, 0xcf, 0x5f, 0xe7, 0x63, 0x04, 0x2f,
-	0x27, 0x32, 0x7b, 0x17, 0x36, 0xfe, 0xa1, 0xeb, 0xf1, 0x01, 0xeb, 0xf9, 0x82, 0x34, 0x89, 0xcd,
-	0x7b, 0xa1, 0x88, 0x49, 0xf3, 0x8c, 0xa8, 0x71, 0x3c, 0x47, 0x50, 0x0a, 0xe7, 0x0c, 0x2f, 0x67,
-	0xe5, 0x1c, 0x99, 0xc7, 0x5a, 0x9e, 0xb6, 0x5f, 0x47, 0x25, 0x0b, 0x76, 0x03, 0x93, 0x42, 0x22,
-	0xcd, 0x33, 0xfc, 0x15, 0x41, 0x39, 0x19, 0x6c, 0x9c, 0x59, 0x8c, 0xb4, 0x06, 0xf2, 0xb1, 0x75,
-	0x14, 0xdb, 0x9a, 0x56, 0xac, 0x62, 0x1d, 0x35, 0xc9, 0x17, 0x08, 0xca, 0x89, 0x2a, 0xb2, 0x01,
-	0xd3, 0x02, 0xca, 0x07, 0xf8, 0x48, 0x01, 0xde, 0x5b, 0x69, 0x5f, 0x02, 0xca, 0xd5, 0x99, 0xa3,
-	0x80, 0x21, 0xe4, 0x67, 0x04, 0xe5, 0x44, 0x32, 0xd9, 0x90, 0x69, 0x75, 0xd5, 0xe6, 0xff, 0x50,
-	0xe6, 0x8e, 0x5c, 0xcf, 0x71, 0x53, 0x9b, 0x05, 0x9b, 0xfa, 0x0d, 0xc1, 0x54, 0xac, 0xcc, 0x6c,
-	0x45, 0xa4, 0x34, 0x5c, 0xa8, 0x62, 0xda, 0x6a, 0x21, 0xb2, 0x8e, 0x2b, 0x73, 0x75, 0x50, 0x13,
-	0x7f, 0x47, 0x50, 0x4e, 0xb6, 0x42, 0x76, 0xc5, 0xd2, 0x0b, 0x24, 0x1f, 0xe4, 0x63, 0x05, 0x79,
-	0x5f, 0x5b, 0x2b, 0x06, 0xe9, 0xa9, 0x64, 0x92, 0xf2, 0x0b, 0x82, 0x52, 0xb8, 0x93, 0xb2, 0x35,
-	0x3b, 0xb2, 0xbb, 0xf2, 0xf1, 0x3d, 0x50, 0x7c, 0x77, 0xb4, 0x76, 0x41, 0xbe, 0xc0, 0xe9, 0xa0,
-	0xe6, 0xe6, 0x27, 0x04, 0x5a, 0x8f, 0x0f, 0x33, 0x12, 0x6d, 0xce, 0x26, 0x9b, 0xb2, 0x2b, 0x87,
-	0xab, 0x8b, 0x5e, 0xec, 0x46, 0x11, 0x26, 0xb7, 0xa9, 0x63, 0xb6, 0xb8, 0x67, 0x12, 0x93, 0x39,
-	0x6a, 0xf4, 0x48, 0x68, 0xa2, 0xae, 0x25, 0x6e, 0xfa, 0x53, 0xb1, 0x91, 0x9c, 0x5c, 0x8c, 0x95,
-	0x0f, 0xb6, 0x9e, 0xee, 0x6c, 0x1f, 0xee, 0xef, 0xe8, 0x46, 0x49, 0xc5, 0xaf, 0xfe, 0x0e, 0x00,
-	0x00, 0xff, 0xff, 0x42, 0xed, 0xf2, 0xae, 0x21, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/scheduler/v1beta1/job.pb.go b/googleapis/cloud/scheduler/v1beta1/job.pb.go
index c6cee09db7..b5ef735e20 100644
--- a/googleapis/cloud/scheduler/v1beta1/job.pb.go
+++ b/googleapis/cloud/scheduler/v1beta1/job.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/scheduler/v1beta1/job.proto
 
-package scheduler // import "google.golang.org/genproto/googleapis/cloud/scheduler/v1beta1"
+package scheduler
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // State of the job.
 type Job_State int32
@@ -50,6 +53,7 @@ var Job_State_name = map[int32]string{
 	3: "DISABLED",
 	4: "UPDATE_FAILED",
 }
+
 var Job_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"ENABLED":           1,
@@ -61,8 +65,9 @@ var Job_State_value = map[string]int32{
 func (x Job_State) String() string {
 	return proto.EnumName(Job_State_name, int32(x))
 }
+
 func (Job_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_4dcb53c8b6d297f5, []int{0, 0}
+	return fileDescriptor_0cfee8289e3d589c, []int{0, 0}
 }
 
 // Configuration for a job.
@@ -171,16 +176,17 @@ func (m *Job) Reset()         { *m = Job{} }
 func (m *Job) String() string { return proto.CompactTextString(m) }
 func (*Job) ProtoMessage()    {}
 func (*Job) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_4dcb53c8b6d297f5, []int{0}
+	return fileDescriptor_0cfee8289e3d589c, []int{0}
 }
+
 func (m *Job) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job.Unmarshal(m, b)
 }
 func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
 }
-func (dst *Job) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job.Merge(dst, src)
+func (m *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(m, src)
 }
 func (m *Job) XXX_Size() int {
 	return xxx_messageInfo_Job.Size(m)
@@ -318,99 +324,15 @@ func (m *Job) GetAttemptDeadline() *duration.Duration {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Job_OneofMarshaler, _Job_OneofUnmarshaler, _Job_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Job) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Job_PubsubTarget)(nil),
 		(*Job_AppEngineHttpTarget)(nil),
 		(*Job_HttpTarget)(nil),
 	}
 }
 
-func _Job_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Job)
-	// target
-	switch x := m.Target.(type) {
-	case *Job_PubsubTarget:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PubsubTarget); err != nil {
-			return err
-		}
-	case *Job_AppEngineHttpTarget:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngineHttpTarget); err != nil {
-			return err
-		}
-	case *Job_HttpTarget:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HttpTarget); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Job_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Job)
-	switch tag {
-	case 4: // target.pubsub_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PubsubTarget)
-		err := b.DecodeMessage(msg)
-		m.Target = &Job_PubsubTarget{msg}
-		return true, err
-	case 5: // target.app_engine_http_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppEngineHttpTarget)
-		err := b.DecodeMessage(msg)
-		m.Target = &Job_AppEngineHttpTarget{msg}
-		return true, err
-	case 6: // target.http_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HttpTarget)
-		err := b.DecodeMessage(msg)
-		m.Target = &Job_HttpTarget{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Job_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Job)
-	// target
-	switch x := m.Target.(type) {
-	case *Job_PubsubTarget:
-		s := proto.Size(x.PubsubTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_AppEngineHttpTarget:
-		s := proto.Size(x.AppEngineHttpTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_HttpTarget:
-		s := proto.Size(x.HttpTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Settings that determine the retry behavior.
 //
 // By default, if a job does not complete successfully (meaning that
@@ -481,16 +403,17 @@ func (m *RetryConfig) Reset()         { *m = RetryConfig{} }
 func (m *RetryConfig) String() string { return proto.CompactTextString(m) }
 func (*RetryConfig) ProtoMessage()    {}
 func (*RetryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_4dcb53c8b6d297f5, []int{1}
+	return fileDescriptor_0cfee8289e3d589c, []int{1}
 }
+
 func (m *RetryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryConfig.Unmarshal(m, b)
 }
 func (m *RetryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryConfig.Marshal(b, m, deterministic)
 }
-func (dst *RetryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryConfig.Merge(dst, src)
+func (m *RetryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryConfig.Merge(m, src)
 }
 func (m *RetryConfig) XXX_Size() int {
 	return xxx_messageInfo_RetryConfig.Size(m)
@@ -537,16 +460,16 @@ func (m *RetryConfig) GetMaxDoublings() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.scheduler.v1beta1.Job_State", Job_State_name, Job_State_value)
 	proto.RegisterType((*Job)(nil), "google.cloud.scheduler.v1beta1.Job")
 	proto.RegisterType((*RetryConfig)(nil), "google.cloud.scheduler.v1beta1.RetryConfig")
-	proto.RegisterEnum("google.cloud.scheduler.v1beta1.Job_State", Job_State_name, Job_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/scheduler/v1beta1/job.proto", fileDescriptor_job_4dcb53c8b6d297f5)
+	proto.RegisterFile("google/cloud/scheduler/v1beta1/job.proto", fileDescriptor_0cfee8289e3d589c)
 }
 
-var fileDescriptor_job_4dcb53c8b6d297f5 = []byte{
+var fileDescriptor_0cfee8289e3d589c = []byte{
 	// 728 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x4f, 0x4f, 0xeb, 0x46,
 	0x14, 0xc5, 0x09, 0x24, 0x21, 0x5c, 0x27, 0x90, 0x0c, 0x7f, 0x6a, 0xd2, 0xaa, 0x44, 0xe9, 0x26,
diff --git a/googleapis/cloud/scheduler/v1beta1/target.pb.go b/googleapis/cloud/scheduler/v1beta1/target.pb.go
index 23bb3e24e5..14e4a347e4 100644
--- a/googleapis/cloud/scheduler/v1beta1/target.pb.go
+++ b/googleapis/cloud/scheduler/v1beta1/target.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/scheduler/v1beta1/target.proto
 
-package scheduler // import "google.golang.org/genproto/googleapis/cloud/scheduler/v1beta1"
+package scheduler
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The HTTP method used to execute the job.
 type HttpMethod int32
@@ -52,6 +55,7 @@ var HttpMethod_name = map[int32]string{
 	6: "PATCH",
 	7: "OPTIONS",
 }
+
 var HttpMethod_value = map[string]int32{
 	"HTTP_METHOD_UNSPECIFIED": 0,
 	"POST":                    1,
@@ -66,8 +70,9 @@ var HttpMethod_value = map[string]int32{
 func (x HttpMethod) String() string {
 	return proto.EnumName(HttpMethod_name, int32(x))
 }
+
 func (HttpMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_d943b6e907724d6e, []int{0}
+	return fileDescriptor_30cd09e73d799915, []int{0}
 }
 
 // Http target. The job will be pushed to the job handler by means of
@@ -126,16 +131,17 @@ func (m *HttpTarget) Reset()         { *m = HttpTarget{} }
 func (m *HttpTarget) String() string { return proto.CompactTextString(m) }
 func (*HttpTarget) ProtoMessage()    {}
 func (*HttpTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_d943b6e907724d6e, []int{0}
+	return fileDescriptor_30cd09e73d799915, []int{0}
 }
+
 func (m *HttpTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpTarget.Unmarshal(m, b)
 }
 func (m *HttpTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpTarget.Marshal(b, m, deterministic)
 }
-func (dst *HttpTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpTarget.Merge(dst, src)
+func (m *HttpTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpTarget.Merge(m, src)
 }
 func (m *HttpTarget) XXX_Size() int {
 	return xxx_messageInfo_HttpTarget.Size(m)
@@ -211,80 +217,14 @@ func (m *HttpTarget) GetOidcToken() *OidcToken {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HttpTarget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HttpTarget_OneofMarshaler, _HttpTarget_OneofUnmarshaler, _HttpTarget_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HttpTarget) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HttpTarget_OauthToken)(nil),
 		(*HttpTarget_OidcToken)(nil),
 	}
 }
 
-func _HttpTarget_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HttpTarget)
-	// authorization_header
-	switch x := m.AuthorizationHeader.(type) {
-	case *HttpTarget_OauthToken:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OauthToken); err != nil {
-			return err
-		}
-	case *HttpTarget_OidcToken:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OidcToken); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("HttpTarget.AuthorizationHeader has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HttpTarget_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HttpTarget)
-	switch tag {
-	case 5: // authorization_header.oauth_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(OAuthToken)
-		err := b.DecodeMessage(msg)
-		m.AuthorizationHeader = &HttpTarget_OauthToken{msg}
-		return true, err
-	case 6: // authorization_header.oidc_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(OidcToken)
-		err := b.DecodeMessage(msg)
-		m.AuthorizationHeader = &HttpTarget_OidcToken{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HttpTarget_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HttpTarget)
-	// authorization_header
-	switch x := m.AuthorizationHeader.(type) {
-	case *HttpTarget_OauthToken:
-		s := proto.Size(x.OauthToken)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *HttpTarget_OidcToken:
-		s := proto.Size(x.OidcToken)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // App Engine target. The job will be pushed to a job handler by means
 // of an HTTP request via an [http_method][google.cloud.scheduler.v1beta1.AppEngineHttpTarget.http_method] such
 // as HTTP POST, HTTP GET, etc. The job is acknowledged by means of an
@@ -355,16 +295,17 @@ func (m *AppEngineHttpTarget) Reset()         { *m = AppEngineHttpTarget{} }
 func (m *AppEngineHttpTarget) String() string { return proto.CompactTextString(m) }
 func (*AppEngineHttpTarget) ProtoMessage()    {}
 func (*AppEngineHttpTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_d943b6e907724d6e, []int{1}
+	return fileDescriptor_30cd09e73d799915, []int{1}
 }
+
 func (m *AppEngineHttpTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineHttpTarget.Unmarshal(m, b)
 }
 func (m *AppEngineHttpTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineHttpTarget.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineHttpTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineHttpTarget.Merge(dst, src)
+func (m *AppEngineHttpTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpTarget.Merge(m, src)
 }
 func (m *AppEngineHttpTarget) XXX_Size() int {
 	return xxx_messageInfo_AppEngineHttpTarget.Size(m)
@@ -442,16 +383,17 @@ func (m *PubsubTarget) Reset()         { *m = PubsubTarget{} }
 func (m *PubsubTarget) String() string { return proto.CompactTextString(m) }
 func (*PubsubTarget) ProtoMessage()    {}
 func (*PubsubTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_d943b6e907724d6e, []int{2}
+	return fileDescriptor_30cd09e73d799915, []int{2}
 }
+
 func (m *PubsubTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PubsubTarget.Unmarshal(m, b)
 }
 func (m *PubsubTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PubsubTarget.Marshal(b, m, deterministic)
 }
-func (dst *PubsubTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PubsubTarget.Merge(dst, src)
+func (m *PubsubTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PubsubTarget.Merge(m, src)
 }
 func (m *PubsubTarget) XXX_Size() int {
 	return xxx_messageInfo_PubsubTarget.Size(m)
@@ -587,16 +529,17 @@ func (m *AppEngineRouting) Reset()         { *m = AppEngineRouting{} }
 func (m *AppEngineRouting) String() string { return proto.CompactTextString(m) }
 func (*AppEngineRouting) ProtoMessage()    {}
 func (*AppEngineRouting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_d943b6e907724d6e, []int{3}
+	return fileDescriptor_30cd09e73d799915, []int{3}
 }
+
 func (m *AppEngineRouting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineRouting.Unmarshal(m, b)
 }
 func (m *AppEngineRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineRouting.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineRouting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineRouting.Merge(dst, src)
+func (m *AppEngineRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineRouting.Merge(m, src)
 }
 func (m *AppEngineRouting) XXX_Size() int {
 	return xxx_messageInfo_AppEngineRouting.Size(m)
@@ -658,16 +601,17 @@ func (m *OAuthToken) Reset()         { *m = OAuthToken{} }
 func (m *OAuthToken) String() string { return proto.CompactTextString(m) }
 func (*OAuthToken) ProtoMessage()    {}
 func (*OAuthToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_d943b6e907724d6e, []int{4}
+	return fileDescriptor_30cd09e73d799915, []int{4}
 }
+
 func (m *OAuthToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OAuthToken.Unmarshal(m, b)
 }
 func (m *OAuthToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OAuthToken.Marshal(b, m, deterministic)
 }
-func (dst *OAuthToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OAuthToken.Merge(dst, src)
+func (m *OAuthToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OAuthToken.Merge(m, src)
 }
 func (m *OAuthToken) XXX_Size() int {
 	return xxx_messageInfo_OAuthToken.Size(m)
@@ -715,16 +659,17 @@ func (m *OidcToken) Reset()         { *m = OidcToken{} }
 func (m *OidcToken) String() string { return proto.CompactTextString(m) }
 func (*OidcToken) ProtoMessage()    {}
 func (*OidcToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_d943b6e907724d6e, []int{5}
+	return fileDescriptor_30cd09e73d799915, []int{5}
 }
+
 func (m *OidcToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OidcToken.Unmarshal(m, b)
 }
 func (m *OidcToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OidcToken.Marshal(b, m, deterministic)
 }
-func (dst *OidcToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OidcToken.Merge(dst, src)
+func (m *OidcToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OidcToken.Merge(m, src)
 }
 func (m *OidcToken) XXX_Size() int {
 	return xxx_messageInfo_OidcToken.Size(m)
@@ -750,6 +695,7 @@ func (m *OidcToken) GetAudience() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.scheduler.v1beta1.HttpMethod", HttpMethod_name, HttpMethod_value)
 	proto.RegisterType((*HttpTarget)(nil), "google.cloud.scheduler.v1beta1.HttpTarget")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.scheduler.v1beta1.HttpTarget.HeadersEntry")
 	proto.RegisterType((*AppEngineHttpTarget)(nil), "google.cloud.scheduler.v1beta1.AppEngineHttpTarget")
@@ -759,14 +705,13 @@ func init() {
 	proto.RegisterType((*AppEngineRouting)(nil), "google.cloud.scheduler.v1beta1.AppEngineRouting")
 	proto.RegisterType((*OAuthToken)(nil), "google.cloud.scheduler.v1beta1.OAuthToken")
 	proto.RegisterType((*OidcToken)(nil), "google.cloud.scheduler.v1beta1.OidcToken")
-	proto.RegisterEnum("google.cloud.scheduler.v1beta1.HttpMethod", HttpMethod_name, HttpMethod_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/scheduler/v1beta1/target.proto", fileDescriptor_target_d943b6e907724d6e)
+	proto.RegisterFile("google/cloud/scheduler/v1beta1/target.proto", fileDescriptor_30cd09e73d799915)
 }
 
-var fileDescriptor_target_d943b6e907724d6e = []byte{
+var fileDescriptor_30cd09e73d799915 = []byte{
 	// 754 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xdb, 0x6e, 0xf3, 0x44,
 	0x10, 0xae, 0xeb, 0x1c, 0x9a, 0x71, 0x04, 0xd6, 0xb6, 0x40, 0x08, 0x07, 0x85, 0x5c, 0x85, 0x22,
diff --git a/googleapis/cloud/securitycenter/v1/asset.pb.go b/googleapis/cloud/securitycenter/v1/asset.pb.go
index 8ac7976aaf..0470174d32 100644
--- a/googleapis/cloud/securitycenter/v1/asset.pb.go
+++ b/googleapis/cloud/securitycenter/v1/asset.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1/asset.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Cloud Security Command Center's (Cloud SCC) representation of a Google Cloud
 // Platform (GCP) resource.
@@ -60,16 +63,17 @@ func (m *Asset) Reset()         { *m = Asset{} }
 func (m *Asset) String() string { return proto.CompactTextString(m) }
 func (*Asset) ProtoMessage()    {}
 func (*Asset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_450623263cfcc7ba, []int{0}
+	return fileDescriptor_8afac45fcf79e390, []int{0}
 }
+
 func (m *Asset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset.Unmarshal(m, b)
 }
 func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset.Marshal(b, m, deterministic)
 }
-func (dst *Asset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset.Merge(dst, src)
+func (m *Asset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset.Merge(m, src)
 }
 func (m *Asset) XXX_Size() int {
 	return xxx_messageInfo_Asset.Size(m)
@@ -158,16 +162,17 @@ func (m *Asset_SecurityCenterProperties) Reset()         { *m = Asset_SecurityCe
 func (m *Asset_SecurityCenterProperties) String() string { return proto.CompactTextString(m) }
 func (*Asset_SecurityCenterProperties) ProtoMessage()    {}
 func (*Asset_SecurityCenterProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_450623263cfcc7ba, []int{0, 0}
+	return fileDescriptor_8afac45fcf79e390, []int{0, 0}
 }
+
 func (m *Asset_SecurityCenterProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset_SecurityCenterProperties.Unmarshal(m, b)
 }
 func (m *Asset_SecurityCenterProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset_SecurityCenterProperties.Marshal(b, m, deterministic)
 }
-func (dst *Asset_SecurityCenterProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset_SecurityCenterProperties.Merge(dst, src)
+func (m *Asset_SecurityCenterProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset_SecurityCenterProperties.Merge(m, src)
 }
 func (m *Asset_SecurityCenterProperties) XXX_Size() int {
 	return xxx_messageInfo_Asset_SecurityCenterProperties.Size(m)
@@ -230,16 +235,17 @@ func (m *Asset_IamPolicy) Reset()         { *m = Asset_IamPolicy{} }
 func (m *Asset_IamPolicy) String() string { return proto.CompactTextString(m) }
 func (*Asset_IamPolicy) ProtoMessage()    {}
 func (*Asset_IamPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_450623263cfcc7ba, []int{0, 1}
+	return fileDescriptor_8afac45fcf79e390, []int{0, 1}
 }
+
 func (m *Asset_IamPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset_IamPolicy.Unmarshal(m, b)
 }
 func (m *Asset_IamPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset_IamPolicy.Marshal(b, m, deterministic)
 }
-func (dst *Asset_IamPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset_IamPolicy.Merge(dst, src)
+func (m *Asset_IamPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset_IamPolicy.Merge(m, src)
 }
 func (m *Asset_IamPolicy) XXX_Size() int {
 	return xxx_messageInfo_Asset_IamPolicy.Size(m)
@@ -265,10 +271,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1/asset.proto", fileDescriptor_asset_450623263cfcc7ba)
+	proto.RegisterFile("google/cloud/securitycenter/v1/asset.proto", fileDescriptor_8afac45fcf79e390)
 }
 
-var fileDescriptor_asset_450623263cfcc7ba = []byte{
+var fileDescriptor_8afac45fcf79e390 = []byte{
 	// 581 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
 	0x14, 0x95, 0x93, 0xe6, 0xeb, 0x97, 0x1b, 0xfa, 0xa3, 0x41, 0x02, 0xcb, 0x42, 0x6d, 0x28, 0x0b,
diff --git a/googleapis/cloud/securitycenter/v1/finding.pb.go b/googleapis/cloud/securitycenter/v1/finding.pb.go
index a742337598..daa96ccaed 100644
--- a/googleapis/cloud/securitycenter/v1/finding.pb.go
+++ b/googleapis/cloud/securitycenter/v1/finding.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1/finding.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The state of the finding.
 type Finding_State int32
@@ -39,6 +42,7 @@ var Finding_State_name = map[int32]string{
 	1: "ACTIVE",
 	2: "INACTIVE",
 }
+
 var Finding_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"ACTIVE":            1,
@@ -48,8 +52,9 @@ var Finding_State_value = map[string]int32{
 func (x Finding_State) String() string {
 	return proto.EnumName(Finding_State_name, int32(x))
 }
+
 func (Finding_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_finding_12e0037571a78005, []int{0, 0}
+	return fileDescriptor_b75f23af5a63668d, []int{0, 0}
 }
 
 // Cloud Security Command Center (Cloud SCC) finding.
@@ -109,16 +114,17 @@ func (m *Finding) Reset()         { *m = Finding{} }
 func (m *Finding) String() string { return proto.CompactTextString(m) }
 func (*Finding) ProtoMessage()    {}
 func (*Finding) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_12e0037571a78005, []int{0}
+	return fileDescriptor_b75f23af5a63668d, []int{0}
 }
+
 func (m *Finding) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Finding.Unmarshal(m, b)
 }
 func (m *Finding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Finding.Marshal(b, m, deterministic)
 }
-func (dst *Finding) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Finding.Merge(dst, src)
+func (m *Finding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Finding.Merge(m, src)
 }
 func (m *Finding) XXX_Size() int {
 	return xxx_messageInfo_Finding.Size(m)
@@ -200,16 +206,16 @@ func (m *Finding) GetCreateTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.securitycenter.v1.Finding_State", Finding_State_name, Finding_State_value)
 	proto.RegisterType((*Finding)(nil), "google.cloud.securitycenter.v1.Finding")
 	proto.RegisterMapType((map[string]*_struct.Value)(nil), "google.cloud.securitycenter.v1.Finding.SourcePropertiesEntry")
-	proto.RegisterEnum("google.cloud.securitycenter.v1.Finding_State", Finding_State_name, Finding_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1/finding.proto", fileDescriptor_finding_12e0037571a78005)
+	proto.RegisterFile("google/cloud/securitycenter/v1/finding.proto", fileDescriptor_b75f23af5a63668d)
 }
 
-var fileDescriptor_finding_12e0037571a78005 = []byte{
+var fileDescriptor_b75f23af5a63668d = []byte{
 	// 555 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6e, 0xda, 0x40,
 	0x10, 0xc6, 0x6b, 0x08, 0x04, 0x06, 0x12, 0x91, 0x95, 0x12, 0x59, 0xa8, 0x4a, 0x09, 0xbd, 0x70,
diff --git a/googleapis/cloud/securitycenter/v1/organization_settings.pb.go b/googleapis/cloud/securitycenter/v1/organization_settings.pb.go
index daaee04882..bf84eafa55 100644
--- a/googleapis/cloud/securitycenter/v1/organization_settings.pb.go
+++ b/googleapis/cloud/securitycenter/v1/organization_settings.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1/organization_settings.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The mode of inclusion when running Asset Discovery.
 // Asset discovery can be limited by explicitly identifying projects to be
@@ -46,6 +49,7 @@ var OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name = map[int32]str
 	1: "INCLUDE_ONLY",
 	2: "EXCLUDE",
 }
+
 var OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value = map[string]int32{
 	"INCLUSION_MODE_UNSPECIFIED": 0,
 	"INCLUDE_ONLY":               1,
@@ -55,8 +59,9 @@ var OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value = map[string]i
 func (x OrganizationSettings_AssetDiscoveryConfig_InclusionMode) String() string {
 	return proto.EnumName(OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name, int32(x))
 }
+
 func (OrganizationSettings_AssetDiscoveryConfig_InclusionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_organization_settings_f518d42165f0c7c2, []int{0, 0, 0}
+	return fileDescriptor_9f5c7b1e9f2f4088, []int{0, 0, 0}
 }
 
 // User specified settings that are attached to the Cloud Security Command
@@ -83,16 +88,17 @@ func (m *OrganizationSettings) Reset()         { *m = OrganizationSettings{} }
 func (m *OrganizationSettings) String() string { return proto.CompactTextString(m) }
 func (*OrganizationSettings) ProtoMessage()    {}
 func (*OrganizationSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_organization_settings_f518d42165f0c7c2, []int{0}
+	return fileDescriptor_9f5c7b1e9f2f4088, []int{0}
 }
+
 func (m *OrganizationSettings) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OrganizationSettings.Unmarshal(m, b)
 }
 func (m *OrganizationSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OrganizationSettings.Marshal(b, m, deterministic)
 }
-func (dst *OrganizationSettings) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OrganizationSettings.Merge(dst, src)
+func (m *OrganizationSettings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrganizationSettings.Merge(m, src)
 }
 func (m *OrganizationSettings) XXX_Size() int {
 	return xxx_messageInfo_OrganizationSettings.Size(m)
@@ -141,16 +147,17 @@ func (m *OrganizationSettings_AssetDiscoveryConfig) Reset() {
 func (m *OrganizationSettings_AssetDiscoveryConfig) String() string { return proto.CompactTextString(m) }
 func (*OrganizationSettings_AssetDiscoveryConfig) ProtoMessage()    {}
 func (*OrganizationSettings_AssetDiscoveryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_organization_settings_f518d42165f0c7c2, []int{0, 0}
+	return fileDescriptor_9f5c7b1e9f2f4088, []int{0, 0}
 }
+
 func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Unmarshal(m, b)
 }
 func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Marshal(b, m, deterministic)
 }
-func (dst *OrganizationSettings_AssetDiscoveryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Merge(dst, src)
+func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Merge(m, src)
 }
 func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Size() int {
 	return xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Size(m)
@@ -176,16 +183,16 @@ func (m *OrganizationSettings_AssetDiscoveryConfig) GetInclusionMode() Organizat
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.securitycenter.v1.OrganizationSettings_AssetDiscoveryConfig_InclusionMode", OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name, OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value)
 	proto.RegisterType((*OrganizationSettings)(nil), "google.cloud.securitycenter.v1.OrganizationSettings")
 	proto.RegisterType((*OrganizationSettings_AssetDiscoveryConfig)(nil), "google.cloud.securitycenter.v1.OrganizationSettings.AssetDiscoveryConfig")
-	proto.RegisterEnum("google.cloud.securitycenter.v1.OrganizationSettings_AssetDiscoveryConfig_InclusionMode", OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name, OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1/organization_settings.proto", fileDescriptor_organization_settings_f518d42165f0c7c2)
+	proto.RegisterFile("google/cloud/securitycenter/v1/organization_settings.proto", fileDescriptor_9f5c7b1e9f2f4088)
 }
 
-var fileDescriptor_organization_settings_f518d42165f0c7c2 = []byte{
+var fileDescriptor_9f5c7b1e9f2f4088 = []byte{
 	// 454 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xdf, 0x6e, 0xd3, 0x30,
 	0x14, 0xc6, 0x49, 0xda, 0x8d, 0xce, 0x65, 0x53, 0x64, 0x55, 0x53, 0x55, 0xa1, 0x52, 0x7a, 0xd5,
diff --git a/googleapis/cloud/securitycenter/v1/run_asset_discovery_response.pb.go b/googleapis/cloud/securitycenter/v1/run_asset_discovery_response.pb.go
index 978bf2c571..ce2d5d83a4 100644
--- a/googleapis/cloud/securitycenter/v1/run_asset_discovery_response.pb.go
+++ b/googleapis/cloud/securitycenter/v1/run_asset_discovery_response.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1/run_asset_discovery_response.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The state of an asset discovery run.
 type RunAssetDiscoveryResponse_State int32
@@ -42,6 +45,7 @@ var RunAssetDiscoveryResponse_State_name = map[int32]string{
 	2: "SUPERSEDED",
 	3: "TERMINATED",
 }
+
 var RunAssetDiscoveryResponse_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"COMPLETED":         1,
@@ -52,8 +56,9 @@ var RunAssetDiscoveryResponse_State_value = map[string]int32{
 func (x RunAssetDiscoveryResponse_State) String() string {
 	return proto.EnumName(RunAssetDiscoveryResponse_State_name, int32(x))
 }
+
 func (RunAssetDiscoveryResponse_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_run_asset_discovery_response_3522292b1e727515, []int{0, 0}
+	return fileDescriptor_421ea6ed240ae1f7, []int{0, 0}
 }
 
 // Response of asset discovery run
@@ -71,16 +76,17 @@ func (m *RunAssetDiscoveryResponse) Reset()         { *m = RunAssetDiscoveryResp
 func (m *RunAssetDiscoveryResponse) String() string { return proto.CompactTextString(m) }
 func (*RunAssetDiscoveryResponse) ProtoMessage()    {}
 func (*RunAssetDiscoveryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_run_asset_discovery_response_3522292b1e727515, []int{0}
+	return fileDescriptor_421ea6ed240ae1f7, []int{0}
 }
+
 func (m *RunAssetDiscoveryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunAssetDiscoveryResponse.Unmarshal(m, b)
 }
 func (m *RunAssetDiscoveryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunAssetDiscoveryResponse.Marshal(b, m, deterministic)
 }
-func (dst *RunAssetDiscoveryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunAssetDiscoveryResponse.Merge(dst, src)
+func (m *RunAssetDiscoveryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunAssetDiscoveryResponse.Merge(m, src)
 }
 func (m *RunAssetDiscoveryResponse) XXX_Size() int {
 	return xxx_messageInfo_RunAssetDiscoveryResponse.Size(m)
@@ -106,15 +112,15 @@ func (m *RunAssetDiscoveryResponse) GetDuration() *duration.Duration {
 }
 
 func init() {
-	proto.RegisterType((*RunAssetDiscoveryResponse)(nil), "google.cloud.securitycenter.v1.RunAssetDiscoveryResponse")
 	proto.RegisterEnum("google.cloud.securitycenter.v1.RunAssetDiscoveryResponse_State", RunAssetDiscoveryResponse_State_name, RunAssetDiscoveryResponse_State_value)
+	proto.RegisterType((*RunAssetDiscoveryResponse)(nil), "google.cloud.securitycenter.v1.RunAssetDiscoveryResponse")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1/run_asset_discovery_response.proto", fileDescriptor_run_asset_discovery_response_3522292b1e727515)
+	proto.RegisterFile("google/cloud/securitycenter/v1/run_asset_discovery_response.proto", fileDescriptor_421ea6ed240ae1f7)
 }
 
-var fileDescriptor_run_asset_discovery_response_3522292b1e727515 = []byte{
+var fileDescriptor_421ea6ed240ae1f7 = []byte{
 	// 377 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xd1, 0xaa, 0xda, 0x30,
 	0x18, 0xc7, 0xd7, 0x0e, 0xc7, 0x96, 0x31, 0x71, 0x85, 0x81, 0xca, 0x70, 0xce, 0x2b, 0xaf, 0x12,
diff --git a/googleapis/cloud/securitycenter/v1/security_marks.pb.go b/googleapis/cloud/securitycenter/v1/security_marks.pb.go
index ca6ff316fb..fd3c146289 100644
--- a/googleapis/cloud/securitycenter/v1/security_marks.pb.go
+++ b/googleapis/cloud/securitycenter/v1/security_marks.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1/security_marks.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // User specified security marks that are attached to the parent Cloud Security
 // Command Center (Cloud SCC) resource. Security marks are scoped within a Cloud
@@ -47,16 +50,17 @@ func (m *SecurityMarks) Reset()         { *m = SecurityMarks{} }
 func (m *SecurityMarks) String() string { return proto.CompactTextString(m) }
 func (*SecurityMarks) ProtoMessage()    {}
 func (*SecurityMarks) Descriptor() ([]byte, []int) {
-	return fileDescriptor_security_marks_00c042d4d9bf7f29, []int{0}
+	return fileDescriptor_3bf2c7597a92919b, []int{0}
 }
+
 func (m *SecurityMarks) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SecurityMarks.Unmarshal(m, b)
 }
 func (m *SecurityMarks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SecurityMarks.Marshal(b, m, deterministic)
 }
-func (dst *SecurityMarks) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SecurityMarks.Merge(dst, src)
+func (m *SecurityMarks) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SecurityMarks.Merge(m, src)
 }
 func (m *SecurityMarks) XXX_Size() int {
 	return xxx_messageInfo_SecurityMarks.Size(m)
@@ -87,10 +91,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1/security_marks.proto", fileDescriptor_security_marks_00c042d4d9bf7f29)
+	proto.RegisterFile("google/cloud/securitycenter/v1/security_marks.proto", fileDescriptor_3bf2c7597a92919b)
 }
 
-var fileDescriptor_security_marks_00c042d4d9bf7f29 = []byte{
+var fileDescriptor_3bf2c7597a92919b = []byte{
 	// 295 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4e, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xc9, 0x2f, 0x4d, 0xd1, 0x2f, 0x4e, 0x4d, 0x2e, 0x2d, 0xca, 0x2c,
diff --git a/googleapis/cloud/securitycenter/v1/securitycenter_service.pb.go b/googleapis/cloud/securitycenter/v1/securitycenter_service.pb.go
index 9d6b21b538..e4c8cf271c 100644
--- a/googleapis/cloud/securitycenter/v1/securitycenter_service.pb.go
+++ b/googleapis/cloud/securitycenter/v1/securitycenter_service.pb.go
@@ -1,22 +1,22 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package securitycenter
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -29,7 +29,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The change in state of the asset.
 //
@@ -56,6 +56,7 @@ var ListAssetsResponse_ListAssetsResult_StateChange_name = map[int32]string{
 	2: "REMOVED",
 	3: "ACTIVE",
 }
+
 var ListAssetsResponse_ListAssetsResult_StateChange_value = map[string]int32{
 	"UNUSED":  0,
 	"ADDED":   1,
@@ -66,8 +67,9 @@ var ListAssetsResponse_ListAssetsResult_StateChange_value = map[string]int32{
 func (x ListAssetsResponse_ListAssetsResult_StateChange) String() string {
 	return proto.EnumName(ListAssetsResponse_ListAssetsResult_StateChange_name, int32(x))
 }
+
 func (ListAssetsResponse_ListAssetsResult_StateChange) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{12, 0, 0}
+	return fileDescriptor_dd84f222a6a48f30, []int{12, 0, 0}
 }
 
 // The change in state of the finding.
@@ -103,6 +105,7 @@ var ListFindingsResponse_ListFindingsResult_StateChange_name = map[int32]string{
 	3: "ADDED",
 	4: "REMOVED",
 }
+
 var ListFindingsResponse_ListFindingsResult_StateChange_value = map[string]int32{
 	"UNUSED":    0,
 	"CHANGED":   1,
@@ -114,8 +117,9 @@ var ListFindingsResponse_ListFindingsResult_StateChange_value = map[string]int32
 func (x ListFindingsResponse_ListFindingsResult_StateChange) String() string {
 	return proto.EnumName(ListFindingsResponse_ListFindingsResult_StateChange_name, int32(x))
 }
+
 func (ListFindingsResponse_ListFindingsResult_StateChange) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{14, 0, 0}
+	return fileDescriptor_dd84f222a6a48f30, []int{14, 0, 0}
 }
 
 // Request message for creating a finding.
@@ -139,16 +143,17 @@ func (m *CreateFindingRequest) Reset()         { *m = CreateFindingRequest{} }
 func (m *CreateFindingRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateFindingRequest) ProtoMessage()    {}
 func (*CreateFindingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{0}
+	return fileDescriptor_dd84f222a6a48f30, []int{0}
 }
+
 func (m *CreateFindingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateFindingRequest.Unmarshal(m, b)
 }
 func (m *CreateFindingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateFindingRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateFindingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateFindingRequest.Merge(dst, src)
+func (m *CreateFindingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateFindingRequest.Merge(m, src)
 }
 func (m *CreateFindingRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateFindingRequest.Size(m)
@@ -197,16 +202,17 @@ func (m *CreateSourceRequest) Reset()         { *m = CreateSourceRequest{} }
 func (m *CreateSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSourceRequest) ProtoMessage()    {}
 func (*CreateSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{1}
+	return fileDescriptor_dd84f222a6a48f30, []int{1}
 }
+
 func (m *CreateSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSourceRequest.Unmarshal(m, b)
 }
 func (m *CreateSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSourceRequest.Merge(dst, src)
+func (m *CreateSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSourceRequest.Merge(m, src)
 }
 func (m *CreateSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSourceRequest.Size(m)
@@ -245,16 +251,17 @@ func (m *GetOrganizationSettingsRequest) Reset()         { *m = GetOrganizationS
 func (m *GetOrganizationSettingsRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOrganizationSettingsRequest) ProtoMessage()    {}
 func (*GetOrganizationSettingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{2}
+	return fileDescriptor_dd84f222a6a48f30, []int{2}
 }
+
 func (m *GetOrganizationSettingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOrganizationSettingsRequest.Unmarshal(m, b)
 }
 func (m *GetOrganizationSettingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOrganizationSettingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOrganizationSettingsRequest.Merge(dst, src)
+func (m *GetOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOrganizationSettingsRequest.Merge(m, src)
 }
 func (m *GetOrganizationSettingsRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOrganizationSettingsRequest.Size(m)
@@ -286,16 +293,17 @@ func (m *GetSourceRequest) Reset()         { *m = GetSourceRequest{} }
 func (m *GetSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSourceRequest) ProtoMessage()    {}
 func (*GetSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{3}
+	return fileDescriptor_dd84f222a6a48f30, []int{3}
 }
+
 func (m *GetSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSourceRequest.Unmarshal(m, b)
 }
 func (m *GetSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSourceRequest.Merge(dst, src)
+func (m *GetSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSourceRequest.Merge(m, src)
 }
 func (m *GetSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSourceRequest.Size(m)
@@ -423,16 +431,17 @@ func (m *GroupAssetsRequest) Reset()         { *m = GroupAssetsRequest{} }
 func (m *GroupAssetsRequest) String() string { return proto.CompactTextString(m) }
 func (*GroupAssetsRequest) ProtoMessage()    {}
 func (*GroupAssetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{4}
+	return fileDescriptor_dd84f222a6a48f30, []int{4}
 }
+
 func (m *GroupAssetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupAssetsRequest.Unmarshal(m, b)
 }
 func (m *GroupAssetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupAssetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GroupAssetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupAssetsRequest.Merge(dst, src)
+func (m *GroupAssetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupAssetsRequest.Merge(m, src)
 }
 func (m *GroupAssetsRequest) XXX_Size() int {
 	return xxx_messageInfo_GroupAssetsRequest.Size(m)
@@ -514,16 +523,17 @@ func (m *GroupAssetsResponse) Reset()         { *m = GroupAssetsResponse{} }
 func (m *GroupAssetsResponse) String() string { return proto.CompactTextString(m) }
 func (*GroupAssetsResponse) ProtoMessage()    {}
 func (*GroupAssetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{5}
+	return fileDescriptor_dd84f222a6a48f30, []int{5}
 }
+
 func (m *GroupAssetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupAssetsResponse.Unmarshal(m, b)
 }
 func (m *GroupAssetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupAssetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *GroupAssetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupAssetsResponse.Merge(dst, src)
+func (m *GroupAssetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupAssetsResponse.Merge(m, src)
 }
 func (m *GroupAssetsResponse) XXX_Size() int {
 	return xxx_messageInfo_GroupAssetsResponse.Size(m)
@@ -669,16 +679,17 @@ func (m *GroupFindingsRequest) Reset()         { *m = GroupFindingsRequest{} }
 func (m *GroupFindingsRequest) String() string { return proto.CompactTextString(m) }
 func (*GroupFindingsRequest) ProtoMessage()    {}
 func (*GroupFindingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{6}
+	return fileDescriptor_dd84f222a6a48f30, []int{6}
 }
+
 func (m *GroupFindingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupFindingsRequest.Unmarshal(m, b)
 }
 func (m *GroupFindingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupFindingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GroupFindingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupFindingsRequest.Merge(dst, src)
+func (m *GroupFindingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupFindingsRequest.Merge(m, src)
 }
 func (m *GroupFindingsRequest) XXX_Size() int {
 	return xxx_messageInfo_GroupFindingsRequest.Size(m)
@@ -760,16 +771,17 @@ func (m *GroupFindingsResponse) Reset()         { *m = GroupFindingsResponse{} }
 func (m *GroupFindingsResponse) String() string { return proto.CompactTextString(m) }
 func (*GroupFindingsResponse) ProtoMessage()    {}
 func (*GroupFindingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{7}
+	return fileDescriptor_dd84f222a6a48f30, []int{7}
 }
+
 func (m *GroupFindingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupFindingsResponse.Unmarshal(m, b)
 }
 func (m *GroupFindingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupFindingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *GroupFindingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupFindingsResponse.Merge(dst, src)
+func (m *GroupFindingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupFindingsResponse.Merge(m, src)
 }
 func (m *GroupFindingsResponse) XXX_Size() int {
 	return xxx_messageInfo_GroupFindingsResponse.Size(m)
@@ -823,16 +835,17 @@ func (m *GroupResult) Reset()         { *m = GroupResult{} }
 func (m *GroupResult) String() string { return proto.CompactTextString(m) }
 func (*GroupResult) ProtoMessage()    {}
 func (*GroupResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{8}
+	return fileDescriptor_dd84f222a6a48f30, []int{8}
 }
+
 func (m *GroupResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupResult.Unmarshal(m, b)
 }
 func (m *GroupResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupResult.Marshal(b, m, deterministic)
 }
-func (dst *GroupResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupResult.Merge(dst, src)
+func (m *GroupResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupResult.Merge(m, src)
 }
 func (m *GroupResult) XXX_Size() int {
 	return xxx_messageInfo_GroupResult.Size(m)
@@ -878,16 +891,17 @@ func (m *ListSourcesRequest) Reset()         { *m = ListSourcesRequest{} }
 func (m *ListSourcesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSourcesRequest) ProtoMessage()    {}
 func (*ListSourcesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{9}
+	return fileDescriptor_dd84f222a6a48f30, []int{9}
 }
+
 func (m *ListSourcesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSourcesRequest.Unmarshal(m, b)
 }
 func (m *ListSourcesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSourcesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSourcesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSourcesRequest.Merge(dst, src)
+func (m *ListSourcesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSourcesRequest.Merge(m, src)
 }
 func (m *ListSourcesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSourcesRequest.Size(m)
@@ -935,16 +949,17 @@ func (m *ListSourcesResponse) Reset()         { *m = ListSourcesResponse{} }
 func (m *ListSourcesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSourcesResponse) ProtoMessage()    {}
 func (*ListSourcesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{10}
+	return fileDescriptor_dd84f222a6a48f30, []int{10}
 }
+
 func (m *ListSourcesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSourcesResponse.Unmarshal(m, b)
 }
 func (m *ListSourcesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSourcesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSourcesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSourcesResponse.Merge(dst, src)
+func (m *ListSourcesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSourcesResponse.Merge(m, src)
 }
 func (m *ListSourcesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSourcesResponse.Size(m)
@@ -1085,16 +1100,17 @@ func (m *ListAssetsRequest) Reset()         { *m = ListAssetsRequest{} }
 func (m *ListAssetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAssetsRequest) ProtoMessage()    {}
 func (*ListAssetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{11}
+	return fileDescriptor_dd84f222a6a48f30, []int{11}
 }
+
 func (m *ListAssetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAssetsRequest.Unmarshal(m, b)
 }
 func (m *ListAssetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAssetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAssetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAssetsRequest.Merge(dst, src)
+func (m *ListAssetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAssetsRequest.Merge(m, src)
 }
 func (m *ListAssetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAssetsRequest.Size(m)
@@ -1181,16 +1197,17 @@ func (m *ListAssetsResponse) Reset()         { *m = ListAssetsResponse{} }
 func (m *ListAssetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAssetsResponse) ProtoMessage()    {}
 func (*ListAssetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{12}
+	return fileDescriptor_dd84f222a6a48f30, []int{12}
 }
+
 func (m *ListAssetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAssetsResponse.Unmarshal(m, b)
 }
 func (m *ListAssetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAssetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAssetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAssetsResponse.Merge(dst, src)
+func (m *ListAssetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAssetsResponse.Merge(m, src)
 }
 func (m *ListAssetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAssetsResponse.Size(m)
@@ -1244,16 +1261,17 @@ func (m *ListAssetsResponse_ListAssetsResult) Reset()         { *m = ListAssetsR
 func (m *ListAssetsResponse_ListAssetsResult) String() string { return proto.CompactTextString(m) }
 func (*ListAssetsResponse_ListAssetsResult) ProtoMessage()    {}
 func (*ListAssetsResponse_ListAssetsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{12, 0}
+	return fileDescriptor_dd84f222a6a48f30, []int{12, 0}
 }
+
 func (m *ListAssetsResponse_ListAssetsResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Unmarshal(m, b)
 }
 func (m *ListAssetsResponse_ListAssetsResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Marshal(b, m, deterministic)
 }
-func (dst *ListAssetsResponse_ListAssetsResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Merge(dst, src)
+func (m *ListAssetsResponse_ListAssetsResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Merge(m, src)
 }
 func (m *ListAssetsResponse_ListAssetsResult) XXX_Size() int {
 	return xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Size(m)
@@ -1392,16 +1410,17 @@ func (m *ListFindingsRequest) Reset()         { *m = ListFindingsRequest{} }
 func (m *ListFindingsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsRequest) ProtoMessage()    {}
 func (*ListFindingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{13}
+	return fileDescriptor_dd84f222a6a48f30, []int{13}
 }
+
 func (m *ListFindingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsRequest.Unmarshal(m, b)
 }
 func (m *ListFindingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsRequest.Merge(dst, src)
+func (m *ListFindingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsRequest.Merge(m, src)
 }
 func (m *ListFindingsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsRequest.Size(m)
@@ -1488,16 +1507,17 @@ func (m *ListFindingsResponse) Reset()         { *m = ListFindingsResponse{} }
 func (m *ListFindingsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsResponse) ProtoMessage()    {}
 func (*ListFindingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{14}
+	return fileDescriptor_dd84f222a6a48f30, []int{14}
 }
+
 func (m *ListFindingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsResponse.Unmarshal(m, b)
 }
 func (m *ListFindingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsResponse.Merge(dst, src)
+func (m *ListFindingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsResponse.Merge(m, src)
 }
 func (m *ListFindingsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsResponse.Size(m)
@@ -1553,16 +1573,17 @@ func (m *ListFindingsResponse_ListFindingsResult) Reset() {
 func (m *ListFindingsResponse_ListFindingsResult) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsResponse_ListFindingsResult) ProtoMessage()    {}
 func (*ListFindingsResponse_ListFindingsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{14, 0}
+	return fileDescriptor_dd84f222a6a48f30, []int{14, 0}
 }
+
 func (m *ListFindingsResponse_ListFindingsResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsResponse_ListFindingsResult.Unmarshal(m, b)
 }
 func (m *ListFindingsResponse_ListFindingsResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsResponse_ListFindingsResult.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsResponse_ListFindingsResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsResponse_ListFindingsResult.Merge(dst, src)
+func (m *ListFindingsResponse_ListFindingsResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsResponse_ListFindingsResult.Merge(m, src)
 }
 func (m *ListFindingsResponse_ListFindingsResult) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsResponse_ListFindingsResult.Size(m)
@@ -1607,16 +1628,17 @@ func (m *SetFindingStateRequest) Reset()         { *m = SetFindingStateRequest{}
 func (m *SetFindingStateRequest) String() string { return proto.CompactTextString(m) }
 func (*SetFindingStateRequest) ProtoMessage()    {}
 func (*SetFindingStateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{15}
+	return fileDescriptor_dd84f222a6a48f30, []int{15}
 }
+
 func (m *SetFindingStateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetFindingStateRequest.Unmarshal(m, b)
 }
 func (m *SetFindingStateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetFindingStateRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetFindingStateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetFindingStateRequest.Merge(dst, src)
+func (m *SetFindingStateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetFindingStateRequest.Merge(m, src)
 }
 func (m *SetFindingStateRequest) XXX_Size() int {
 	return xxx_messageInfo_SetFindingStateRequest.Size(m)
@@ -1662,16 +1684,17 @@ func (m *RunAssetDiscoveryRequest) Reset()         { *m = RunAssetDiscoveryReque
 func (m *RunAssetDiscoveryRequest) String() string { return proto.CompactTextString(m) }
 func (*RunAssetDiscoveryRequest) ProtoMessage()    {}
 func (*RunAssetDiscoveryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{16}
+	return fileDescriptor_dd84f222a6a48f30, []int{16}
 }
+
 func (m *RunAssetDiscoveryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunAssetDiscoveryRequest.Unmarshal(m, b)
 }
 func (m *RunAssetDiscoveryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunAssetDiscoveryRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunAssetDiscoveryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunAssetDiscoveryRequest.Merge(dst, src)
+func (m *RunAssetDiscoveryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunAssetDiscoveryRequest.Merge(m, src)
 }
 func (m *RunAssetDiscoveryRequest) XXX_Size() int {
 	return xxx_messageInfo_RunAssetDiscoveryRequest.Size(m)
@@ -1715,16 +1738,17 @@ func (m *UpdateFindingRequest) Reset()         { *m = UpdateFindingRequest{} }
 func (m *UpdateFindingRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateFindingRequest) ProtoMessage()    {}
 func (*UpdateFindingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{17}
+	return fileDescriptor_dd84f222a6a48f30, []int{17}
 }
+
 func (m *UpdateFindingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateFindingRequest.Unmarshal(m, b)
 }
 func (m *UpdateFindingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateFindingRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateFindingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateFindingRequest.Merge(dst, src)
+func (m *UpdateFindingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFindingRequest.Merge(m, src)
 }
 func (m *UpdateFindingRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateFindingRequest.Size(m)
@@ -1766,16 +1790,17 @@ func (m *UpdateOrganizationSettingsRequest) Reset()         { *m = UpdateOrganiz
 func (m *UpdateOrganizationSettingsRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateOrganizationSettingsRequest) ProtoMessage()    {}
 func (*UpdateOrganizationSettingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{18}
+	return fileDescriptor_dd84f222a6a48f30, []int{18}
 }
+
 func (m *UpdateOrganizationSettingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateOrganizationSettingsRequest.Unmarshal(m, b)
 }
 func (m *UpdateOrganizationSettingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateOrganizationSettingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateOrganizationSettingsRequest.Merge(dst, src)
+func (m *UpdateOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateOrganizationSettingsRequest.Merge(m, src)
 }
 func (m *UpdateOrganizationSettingsRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateOrganizationSettingsRequest.Size(m)
@@ -1817,16 +1842,17 @@ func (m *UpdateSourceRequest) Reset()         { *m = UpdateSourceRequest{} }
 func (m *UpdateSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSourceRequest) ProtoMessage()    {}
 func (*UpdateSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{19}
+	return fileDescriptor_dd84f222a6a48f30, []int{19}
 }
+
 func (m *UpdateSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSourceRequest.Unmarshal(m, b)
 }
 func (m *UpdateSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSourceRequest.Merge(dst, src)
+func (m *UpdateSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSourceRequest.Merge(m, src)
 }
 func (m *UpdateSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSourceRequest.Size(m)
@@ -1874,16 +1900,17 @@ func (m *UpdateSecurityMarksRequest) Reset()         { *m = UpdateSecurityMarksR
 func (m *UpdateSecurityMarksRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSecurityMarksRequest) ProtoMessage()    {}
 func (*UpdateSecurityMarksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_0a41679950f5c36f, []int{20}
+	return fileDescriptor_dd84f222a6a48f30, []int{20}
 }
+
 func (m *UpdateSecurityMarksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSecurityMarksRequest.Unmarshal(m, b)
 }
 func (m *UpdateSecurityMarksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSecurityMarksRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSecurityMarksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSecurityMarksRequest.Merge(dst, src)
+func (m *UpdateSecurityMarksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSecurityMarksRequest.Merge(m, src)
 }
 func (m *UpdateSecurityMarksRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSecurityMarksRequest.Size(m)
@@ -1916,6 +1943,8 @@ func (m *UpdateSecurityMarksRequest) GetStartTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.securitycenter.v1.ListAssetsResponse_ListAssetsResult_StateChange", ListAssetsResponse_ListAssetsResult_StateChange_name, ListAssetsResponse_ListAssetsResult_StateChange_value)
+	proto.RegisterEnum("google.cloud.securitycenter.v1.ListFindingsResponse_ListFindingsResult_StateChange", ListFindingsResponse_ListFindingsResult_StateChange_name, ListFindingsResponse_ListFindingsResult_StateChange_value)
 	proto.RegisterType((*CreateFindingRequest)(nil), "google.cloud.securitycenter.v1.CreateFindingRequest")
 	proto.RegisterType((*CreateSourceRequest)(nil), "google.cloud.securitycenter.v1.CreateSourceRequest")
 	proto.RegisterType((*GetOrganizationSettingsRequest)(nil), "google.cloud.securitycenter.v1.GetOrganizationSettingsRequest")
@@ -1940,8 +1969,139 @@ func init() {
 	proto.RegisterType((*UpdateOrganizationSettingsRequest)(nil), "google.cloud.securitycenter.v1.UpdateOrganizationSettingsRequest")
 	proto.RegisterType((*UpdateSourceRequest)(nil), "google.cloud.securitycenter.v1.UpdateSourceRequest")
 	proto.RegisterType((*UpdateSecurityMarksRequest)(nil), "google.cloud.securitycenter.v1.UpdateSecurityMarksRequest")
-	proto.RegisterEnum("google.cloud.securitycenter.v1.ListAssetsResponse_ListAssetsResult_StateChange", ListAssetsResponse_ListAssetsResult_StateChange_name, ListAssetsResponse_ListAssetsResult_StateChange_value)
-	proto.RegisterEnum("google.cloud.securitycenter.v1.ListFindingsResponse_ListFindingsResult_StateChange", ListFindingsResponse_ListFindingsResult_StateChange_name, ListFindingsResponse_ListFindingsResult_StateChange_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/securitycenter/v1/securitycenter_service.proto", fileDescriptor_dd84f222a6a48f30)
+}
+
+var fileDescriptor_dd84f222a6a48f30 = []byte{
+	// 1987 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x1b, 0xc7,
+	0x15, 0xef, 0xac, 0x3e, 0xf9, 0x68, 0xd9, 0xf4, 0x48, 0x76, 0x99, 0x4d, 0xec, 0x2a, 0x9b, 0xc4,
+	0x55, 0x6c, 0x97, 0x8c, 0x28, 0xbb, 0x76, 0x57, 0x70, 0x60, 0x99, 0x92, 0x15, 0x17, 0xfe, 0x02,
+	0x29, 0xe9, 0x90, 0x1a, 0x21, 0xd6, 0xe4, 0x98, 0x59, 0x88, 0xdc, 0x65, 0x77, 0x86, 0x42, 0xe5,
+	0xc0, 0x28, 0x90, 0x6b, 0x81, 0x22, 0x68, 0x80, 0x1e, 0x8b, 0xb4, 0xe8, 0xa1, 0x2d, 0x72, 0x68,
+	0x83, 0x02, 0x6d, 0x81, 0xa2, 0xe7, 0xa2, 0x3d, 0xf6, 0x50, 0x20, 0xe8, 0xb1, 0xa7, 0xa0, 0xe8,
+	0x3f, 0xd0, 0x4b, 0x31, 0x5f, 0xd4, 0xee, 0x72, 0xc5, 0x5d, 0x5a, 0x0a, 0x0c, 0x14, 0xbd, 0x71,
+	0x66, 0xde, 0x7b, 0xf3, 0x7b, 0x6f, 0xde, 0x7b, 0xf3, 0xde, 0x2c, 0x61, 0xb5, 0xed, 0xfb, 0xed,
+	0x0e, 0x29, 0x37, 0x3b, 0x7e, 0xbf, 0x55, 0xa6, 0xa4, 0xd9, 0x0f, 0x5c, 0xb6, 0xdf, 0x24, 0x1e,
+	0x23, 0x41, 0x79, 0x6f, 0x39, 0x36, 0xd3, 0xa0, 0x24, 0xd8, 0x73, 0x9b, 0xa4, 0xd4, 0x0b, 0x7c,
+	0xe6, 0xe3, 0xf3, 0x92, 0xb9, 0x24, 0x98, 0x4b, 0x51, 0xd2, 0xd2, 0xde, 0xb2, 0xf9, 0x8a, 0x12,
+	0xee, 0xf4, 0xdc, 0xb2, 0xe3, 0x79, 0x3e, 0x73, 0x98, 0xeb, 0x7b, 0x54, 0x72, 0x9b, 0x17, 0x53,
+	0xb6, 0x76, 0x28, 0x25, 0x4c, 0xd1, 0x5e, 0x4e, 0xa1, 0x7d, 0xe2, 0x7a, 0x2d, 0xd7, 0x6b, 0x2b,
+	0x6a, 0x3b, 0x85, 0xda, 0x0f, 0xda, 0x8e, 0xe7, 0x3e, 0x15, 0x68, 0x1a, 0x94, 0x30, 0xe6, 0x7a,
+	0x6d, 0x8d, 0x6a, 0x25, 0xa3, 0x41, 0x1a, 0x5d, 0x27, 0xd8, 0xd5, 0x4c, 0x97, 0xd2, 0x98, 0xfc,
+	0x7e, 0xa0, 0xad, 0x66, 0x2a, 0xab, 0x95, 0x5d, 0xa7, 0xcb, 0xd7, 0x5c, 0xa7, 0xdb, 0xe8, 0xf9,
+	0x1d, 0xb7, 0xb9, 0xaf, 0xd6, 0xcd, 0xe8, 0x7a, 0x64, 0xed, 0x35, 0xb5, 0xd6, 0xf1, 0xbd, 0x76,
+	0xd0, 0xf7, 0x3c, 0xd7, 0x6b, 0x97, 0xfd, 0x1e, 0x09, 0x22, 0x86, 0xd5, 0x1b, 0x88, 0xd1, 0xe3,
+	0xfe, 0x93, 0x72, 0xab, 0x2f, 0x09, 0xd4, 0xfa, 0xcb, 0xf1, 0x75, 0xd2, 0xed, 0x31, 0xbd, 0xc3,
+	0x62, 0x7c, 0xf1, 0x89, 0x4b, 0x3a, 0xad, 0x46, 0xd7, 0xa1, 0xbb, 0x8a, 0xe2, 0x95, 0x38, 0x05,
+	0x65, 0x41, 0xbf, 0xa9, 0x4f, 0xea, 0x6b, 0xf1, 0x55, 0xe6, 0x76, 0x09, 0x65, 0x4e, 0xb7, 0x27,
+	0x09, 0xac, 0x8f, 0x10, 0x2c, 0x54, 0x03, 0xe2, 0x30, 0x72, 0x5b, 0x1e, 0x5a, 0x8d, 0x7c, 0xb7,
+	0x4f, 0x28, 0xc3, 0x67, 0x61, 0xba, 0xe7, 0x04, 0xc4, 0x63, 0x45, 0xb4, 0x88, 0x96, 0x72, 0x35,
+	0x35, 0xc2, 0xe7, 0x00, 0xd4, 0xf1, 0x36, 0xdc, 0x56, 0xd1, 0x10, 0x6b, 0x39, 0x35, 0x73, 0xa7,
+	0x85, 0xd7, 0x60, 0x46, 0x0d, 0x8a, 0x13, 0x8b, 0x68, 0x29, 0x5f, 0xf9, 0x7a, 0x69, 0xb4, 0x5b,
+	0x96, 0xf4, 0xbe, 0x9a, 0xcf, 0xea, 0xc2, 0xbc, 0x44, 0x54, 0x17, 0xe7, 0x94, 0x06, 0xe8, 0x6d,
+	0x98, 0x96, 0x07, 0x2a, 0xc0, 0xe4, 0x2b, 0x17, 0xd2, 0x36, 0x54, 0x62, 0x15, 0x97, 0x75, 0x05,
+	0xce, 0x6f, 0x12, 0xf6, 0x20, 0xe4, 0x84, 0x75, 0xe5, 0x83, 0x7a, 0x67, 0x0c, 0x93, 0x9e, 0xd3,
+	0x25, 0x6a, 0x5f, 0xf1, 0xdb, 0xba, 0x00, 0x85, 0x4d, 0xc2, 0xa2, 0x08, 0x93, 0xe8, 0x3e, 0x31,
+	0x00, 0x6f, 0x06, 0x7e, 0xbf, 0xb7, 0xc6, 0xe3, 0x87, 0xa6, 0x29, 0x73, 0x16, 0xa6, 0x9f, 0xb8,
+	0x1d, 0x46, 0x02, 0x65, 0x59, 0x35, 0xc2, 0x2f, 0xc1, 0x6c, 0x9b, 0x4b, 0x69, 0x3c, 0xde, 0x17,
+	0x76, 0xcd, 0xd5, 0x66, 0xc4, 0xf8, 0xd6, 0x3e, 0x5e, 0x87, 0x42, 0xd3, 0xef, 0x72, 0xfe, 0x86,
+	0xf6, 0xac, 0xe2, 0xa4, 0xb0, 0xc4, 0x4b, 0xda, 0x12, 0xfa, 0xf4, 0x4b, 0xeb, 0x8a, 0xa0, 0x76,
+	0x4a, 0xb1, 0xe8, 0x09, 0x7c, 0x0d, 0x72, 0x01, 0x71, 0x5a, 0x0d, 0xee, 0x1f, 0xc5, 0x29, 0xc1,
+	0x6e, 0x0e, 0xb1, 0x6f, 0x69, 0xe7, 0xa9, 0xcd, 0x72, 0x62, 0x3e, 0xe4, 0xfe, 0xd0, 0x73, 0xda,
+	0xa4, 0xc1, 0xfc, 0x5d, 0xe2, 0x15, 0x67, 0xa4, 0x3f, 0xf0, 0x99, 0x2d, 0x3e, 0x81, 0x5f, 0x06,
+	0x31, 0x68, 0x50, 0xf7, 0x29, 0x29, 0xce, 0x2e, 0xa2, 0xa5, 0xa9, 0xda, 0x2c, 0x9f, 0xa8, 0xbb,
+	0x4f, 0xc9, 0xb7, 0x27, 0x67, 0xa7, 0x0b, 0x33, 0xd6, 0xbf, 0x10, 0xcc, 0x47, 0x4c, 0x44, 0x7b,
+	0xbe, 0x47, 0x09, 0xde, 0x86, 0x82, 0xd6, 0xb9, 0x11, 0x10, 0xda, 0xef, 0x30, 0x5a, 0x44, 0x8b,
+	0x13, 0x4b, 0xf9, 0xca, 0xa5, 0xb4, 0x23, 0x16, 0xe2, 0x6a, 0x82, 0xa7, 0x76, 0x52, 0x19, 0x4a,
+	0x0e, 0x69, 0x54, 0x53, 0x63, 0x0c, 0x4d, 0x2f, 0xc0, 0x29, 0x8f, 0x7c, 0x8f, 0x35, 0x42, 0xea,
+	0xca, 0xa3, 0x98, 0xe3, 0xd3, 0x0f, 0x07, 0x2a, 0x9f, 0x03, 0x60, 0x3e, 0x73, 0x3a, 0x52, 0xe7,
+	0x49, 0xa1, 0x73, 0x4e, 0xcc, 0x70, 0xa5, 0xad, 0x9f, 0x19, 0xb0, 0x20, 0xf0, 0x29, 0xc7, 0xff,
+	0x32, 0x7c, 0x22, 0xa2, 0xe3, 0xe4, 0x18, 0x3a, 0x26, 0x39, 0xd3, 0xd4, 0xd8, 0xce, 0x74, 0x74,
+	0x9f, 0xf8, 0x37, 0x82, 0x33, 0x31, 0x23, 0xfd, 0x6f, 0x7b, 0xc5, 0xdf, 0x11, 0xe4, 0x43, 0xf8,
+	0xf0, 0x77, 0x00, 0x7a, 0x01, 0xbf, 0x4b, 0x98, 0x4b, 0xb4, 0x82, 0xab, 0x63, 0x28, 0x58, 0x7a,
+	0x38, 0xe0, 0xde, 0xf0, 0x58, 0xb0, 0x5f, 0x0b, 0x89, 0xc3, 0x0b, 0x30, 0xd5, 0xf4, 0xfb, 0x1e,
+	0x13, 0x8a, 0x4e, 0xd4, 0xe4, 0xc0, 0xdc, 0x86, 0x53, 0x31, 0x26, 0x5c, 0x80, 0x89, 0x5d, 0xb2,
+	0xaf, 0xfc, 0x91, 0xff, 0xc4, 0x97, 0x61, 0x6a, 0xcf, 0xe9, 0xf4, 0xb5, 0x8d, 0xce, 0x0e, 0xd9,
+	0x68, 0x87, 0xaf, 0xd6, 0x24, 0x91, 0x6d, 0x5c, 0x47, 0xd6, 0xfb, 0x80, 0xef, 0xba, 0x54, 0xa5,
+	0x4a, 0x9a, 0xe1, 0x7a, 0x09, 0x59, 0xd2, 0x18, 0xe9, 0x3a, 0x33, 0x51, 0xd7, 0xb1, 0xbe, 0x0f,
+	0xf3, 0x91, 0x9d, 0x94, 0xc7, 0xdc, 0x84, 0x19, 0x99, 0xea, 0xb5, 0x1d, 0xb3, 0xde, 0x10, 0x9a,
+	0x2d, 0xe9, 0x8c, 0x8d, 0x84, 0x33, 0xb6, 0x3e, 0x37, 0xe0, 0x34, 0x47, 0x70, 0xe4, 0x5c, 0xef,
+	0x07, 0x2d, 0x12, 0x84, 0xe2, 0x5a, 0x8c, 0x5f, 0x7c, 0x5c, 0x7f, 0x8b, 0xdf, 0xfd, 0xba, 0xfe,
+	0x10, 0xe6, 0x4f, 0xda, 0xff, 0x36, 0x27, 0xb9, 0xe7, 0xd0, 0x5d, 0x5e, 0x17, 0xa8, 0x9f, 0xb1,
+	0x73, 0x9d, 0x1d, 0x79, 0xae, 0xb9, 0xc4, 0x94, 0xf0, 0xc3, 0x49, 0xe9, 0x48, 0xb1, 0x5b, 0x82,
+	0xc2, 0x7c, 0xc7, 0xa5, 0xac, 0x21, 0xea, 0x53, 0x1a, 0x4b, 0x09, 0xd5, 0xb4, 0x93, 0x1e, 0x16,
+	0x18, 0x9d, 0xe2, 0xa9, 0xe2, 0x74, 0x27, 0x36, 0xf3, 0xc2, 0xb3, 0x85, 0xf9, 0xa1, 0x01, 0x85,
+	0x38, 0x4e, 0xbc, 0x0a, 0x53, 0xc2, 0x08, 0xc2, 0xcd, 0xf2, 0x95, 0x37, 0xd2, 0x74, 0x17, 0xcc,
+	0x35, 0xc9, 0x83, 0x03, 0x38, 0x41, 0x99, 0xc3, 0x48, 0xa3, 0xf9, 0xbe, 0xe3, 0xb5, 0xa5, 0x52,
+	0x27, 0x2b, 0x0f, 0x8e, 0xc1, 0x7e, 0xa5, 0x3a, 0x97, 0x5b, 0x15, 0x62, 0x6b, 0x79, 0x7a, 0x30,
+	0xb0, 0x6e, 0x40, 0x3e, 0xb4, 0x86, 0x01, 0xa6, 0xb7, 0xef, 0x6f, 0xd7, 0x37, 0xd6, 0x0b, 0x5f,
+	0xc1, 0x39, 0x98, 0x5a, 0x5b, 0x5f, 0xdf, 0x58, 0x2f, 0x20, 0x9c, 0x87, 0x99, 0xda, 0xc6, 0xbd,
+	0x07, 0x3b, 0x1b, 0xeb, 0x05, 0x83, 0xd3, 0xac, 0x55, 0xb7, 0xee, 0xec, 0x6c, 0x14, 0x26, 0xac,
+	0x7f, 0x18, 0x32, 0xde, 0x8f, 0xe1, 0x1e, 0xfd, 0x7f, 0xbc, 0x0d, 0xc7, 0xdb, 0x6f, 0x27, 0x61,
+	0x21, 0x6a, 0x5e, 0x15, 0x71, 0x1f, 0xc0, 0x19, 0x11, 0x71, 0xaa, 0x5e, 0x8f, 0xc7, 0xdc, 0x66,
+	0x16, 0x9f, 0x89, 0x0b, 0x8d, 0x4f, 0xf2, 0xb8, 0x13, 0x71, 0x1d, 0x9d, 0x7b, 0xf1, 0x91, 0xf7,
+	0x13, 0x43, 0x66, 0xa1, 0x28, 0xae, 0x70, 0xdb, 0x83, 0x9e, 0xaf, 0xed, 0xc1, 0x7b, 0x89, 0x11,
+	0x58, 0x3f, 0x26, 0x6b, 0x1e, 0x1e, 0x85, 0xf7, 0x0e, 0x8f, 0xc2, 0x3c, 0xcc, 0x54, 0xdf, 0x59,
+	0xbb, 0xbf, 0x29, 0xe2, 0x70, 0x0e, 0x72, 0xdb, 0xf7, 0xf5, 0xd0, 0x38, 0x88, 0xd0, 0x89, 0x70,
+	0x84, 0x4e, 0x5a, 0x9f, 0x22, 0x38, 0x5b, 0x27, 0x7a, 0x77, 0x21, 0x79, 0x44, 0x7f, 0x84, 0xab,
+	0x30, 0x25, 0xc0, 0x28, 0x75, 0xbf, 0x91, 0xd1, 0x6c, 0x52, 0x9d, 0x9a, 0xe4, 0xe5, 0x71, 0x42,
+	0x99, 0x13, 0x30, 0xe9, 0x15, 0x13, 0xa9, 0x5e, 0x91, 0x13, 0xd4, 0x7c, 0x6c, 0x55, 0xa0, 0x58,
+	0xeb, 0x7b, 0x22, 0x5f, 0xad, 0xbb, 0xb4, 0xe9, 0xef, 0x91, 0x60, 0x3f, 0x25, 0x91, 0x58, 0x3f,
+	0x46, 0xb0, 0xb0, 0xdd, 0x6b, 0x0d, 0xf7, 0xcc, 0xc7, 0xe0, 0x05, 0xab, 0x90, 0xef, 0x0b, 0xd1,
+	0x32, 0xe6, 0x8d, 0xd4, 0x98, 0x07, 0x49, 0xce, 0x7f, 0x5b, 0x7f, 0x45, 0xf0, 0xaa, 0x04, 0x36,
+	0xaa, 0x9d, 0x75, 0xe1, 0x4c, 0xe2, 0x93, 0x8b, 0xc2, 0x7c, 0x25, 0x0d, 0x73, 0xa2, 0xec, 0x05,
+	0x3f, 0x61, 0xf6, 0x68, 0xda, 0xfc, 0x08, 0xc1, 0xbc, 0xd4, 0x26, 0xda, 0x66, 0x1f, 0x34, 0xfc,
+	0xe8, 0x79, 0x1a, 0xfe, 0xa3, 0x81, 0xfa, 0x02, 0x81, 0xa9, 0x40, 0xa9, 0x7d, 0xee, 0x39, 0xc1,
+	0xee, 0xc0, 0xb6, 0x5b, 0x70, 0x32, 0xfa, 0x24, 0xa5, 0x30, 0xa6, 0xfa, 0x75, 0x54, 0xda, 0x1c,
+	0x0d, 0x0f, 0x8f, 0x84, 0xf8, 0x08, 0xc1, 0x51, 0xf9, 0xc8, 0x84, 0x93, 0x1a, 0x58, 0x55, 0x40,
+	0xc5, 0x3f, 0x45, 0x70, 0x22, 0xfc, 0x3a, 0x83, 0x57, 0xd2, 0x34, 0x4b, 0x78, 0xcb, 0x31, 0x33,
+	0x1e, 0x99, 0x75, 0xe5, 0xc3, 0xbf, 0xfd, 0xf3, 0x63, 0xa3, 0x64, 0xbd, 0x5e, 0xde, 0x5b, 0x2e,
+	0x7f, 0x20, 0xc3, 0xef, 0x46, 0xd8, 0xd3, 0x68, 0xf9, 0xe2, 0x33, 0xf5, 0x9e, 0x47, 0x6d, 0x7d,
+	0xc0, 0xbf, 0x46, 0x30, 0x17, 0x79, 0xd3, 0xc2, 0x57, 0xb2, 0x81, 0x8c, 0x86, 0xb3, 0x99, 0x35,
+	0x7a, 0xad, 0x9b, 0x02, 0xa6, 0x6d, 0x95, 0x47, 0xc0, 0xd4, 0x28, 0x39, 0x60, 0x7d, 0x73, 0xda,
+	0x83, 0xb0, 0xff, 0x01, 0x82, 0x13, 0x9b, 0x84, 0xdd, 0x71, 0xba, 0x0f, 0xc5, 0x03, 0x23, 0xb6,
+	0xf4, 0xde, 0xae, 0xd3, 0x15, 0xad, 0x5d, 0x68, 0x51, 0xe3, 0x3b, 0x13, 0xa3, 0x91, 0xab, 0x03,
+	0x34, 0x57, 0x05, 0x9a, 0x80, 0xc8, 0x8d, 0x47, 0xe0, 0xb1, 0xdb, 0x21, 0xe1, 0x36, 0xba, 0x88,
+	0xff, 0x8c, 0xe0, 0xab, 0x87, 0xbc, 0x89, 0xe1, 0xb7, 0x53, 0x9b, 0xd0, 0x91, 0x8f, 0x69, 0xe6,
+	0x73, 0xa5, 0x17, 0xeb, 0x9a, 0xd0, 0x69, 0x19, 0x4b, 0x0b, 0xf3, 0x9b, 0x63, 0x48, 0x9f, 0xa4,
+	0x04, 0xf4, 0x0c, 0x7f, 0x8c, 0x20, 0x37, 0x78, 0xa8, 0xc3, 0x6f, 0x65, 0x00, 0xff, 0x7c, 0x9e,
+	0x7a, 0x59, 0x00, 0xbc, 0x80, 0x5f, 0x3f, 0x1c, 0xe0, 0x81, 0xc1, 0xf1, 0xa7, 0xba, 0xdb, 0x97,
+	0x85, 0x32, 0xae, 0x64, 0xea, 0xec, 0x23, 0x6d, 0xa5, 0xb9, 0x32, 0x16, 0x8f, 0x2c, 0x0c, 0x06,
+	0x01, 0xf5, 0xe6, 0xc8, 0x80, 0x92, 0xbd, 0x94, 0x2d, 0x9e, 0x48, 0xb8, 0x3f, 0xfc, 0x09, 0xc1,
+	0x5c, 0xe4, 0x35, 0x26, 0x3d, 0xa0, 0x92, 0x5e, 0xb8, 0xcc, 0xab, 0x63, 0x72, 0x29, 0xd0, 0x51,
+	0x87, 0x1e, 0x23, 0xbc, 0x06, 0x0a, 0x7c, 0x82, 0x00, 0x0e, 0xfa, 0x12, 0xbc, 0x3c, 0x4e, 0x5b,
+	0x23, 0xa1, 0x57, 0xc6, 0xef, 0x84, 0xac, 0x4b, 0x02, 0xf7, 0x1b, 0xf8, 0xb5, 0x0c, 0xc6, 0xc6,
+	0x9f, 0x21, 0x38, 0x11, 0x2e, 0xdb, 0xd2, 0x13, 0x6b, 0x42, 0xef, 0x93, 0x1e, 0x5d, 0x49, 0xe5,
+	0x62, 0x2c, 0xba, 0xb2, 0x1b, 0x18, 0xff, 0x1c, 0x41, 0x3e, 0xf4, 0xe4, 0x82, 0x33, 0x59, 0x29,
+	0xfa, 0x12, 0x64, 0xae, 0x8c, 0xc5, 0xa3, 0x10, 0x47, 0xc3, 0x2d, 0xe5, 0x62, 0xc0, 0xbf, 0x44,
+	0x70, 0x7a, 0xa8, 0xca, 0xc3, 0xd7, 0xd3, 0x36, 0x3e, 0xac, 0x30, 0x34, 0xcf, 0x69, 0xce, 0xd0,
+	0x87, 0x9f, 0xd2, 0x03, 0xfd, 0xe1, 0xc7, 0x5a, 0x15, 0xe0, 0xae, 0x5a, 0x6f, 0x65, 0x09, 0xb2,
+	0xa0, 0xef, 0x0d, 0xe4, 0x73, 0x57, 0xfd, 0x1d, 0x82, 0x53, 0xb1, 0xfa, 0x19, 0x7f, 0x33, 0xbd,
+	0x7a, 0x48, 0x2a, 0xb8, 0xb3, 0x5f, 0x60, 0x55, 0x81, 0xf8, 0x86, 0x75, 0x3d, 0x43, 0xf6, 0x1a,
+	0x9c, 0x3e, 0xbf, 0x39, 0x28, 0x61, 0x62, 0x47, 0x8e, 0x9c, 0xdf, 0x61, 0xf5, 0x51, 0x77, 0x58,
+	0xfd, 0xcb, 0xbc, 0xc3, 0x68, 0xec, 0x0e, 0xfb, 0x0d, 0x02, 0xbc, 0x45, 0xa8, 0x98, 0x24, 0x41,
+	0xd7, 0xa5, 0x94, 0xf3, 0xe0, 0xa5, 0xd8, 0x7e, 0xc3, 0x24, 0x1a, 0xd9, 0x9b, 0x19, 0x28, 0x95,
+	0x37, 0xde, 0x16, 0x68, 0x6f, 0x5a, 0xab, 0x99, 0xd1, 0xb2, 0x21, 0x61, 0x1c, 0xf3, 0xef, 0x11,
+	0xcc, 0x45, 0x1a, 0x8b, 0xf4, 0x3c, 0x9b, 0xd4, 0x87, 0x64, 0x3f, 0xf7, 0x77, 0x04, 0xf0, 0x5b,
+	0x95, 0x6b, 0x02, 0xb8, 0xfe, 0x6c, 0x3b, 0xc6, 0xf9, 0x0f, 0x0a, 0x98, 0xff, 0x0c, 0xea, 0xe2,
+	0xc4, 0xaa, 0x61, 0x2d, 0x9b, 0x1e, 0xc7, 0x5f, 0x38, 0xb4, 0x84, 0x86, 0xef, 0x55, 0x36, 0x84,
+	0x86, 0xc9, 0x9f, 0x9a, 0xb3, 0x97, 0x13, 0x76, 0x72, 0xe7, 0x84, 0x7f, 0x81, 0xe0, 0x44, 0xb8,
+	0x55, 0x49, 0x4f, 0xde, 0x09, 0x8d, 0x4d, 0xe6, 0x5a, 0x43, 0xe5, 0x97, 0xca, 0x25, 0xa1, 0x93,
+	0xfa, 0x9a, 0x9d, 0x52, 0x72, 0x0c, 0x8a, 0xe3, 0x3f, 0x1a, 0x83, 0xae, 0x2a, 0xd2, 0x63, 0xd8,
+	0x19, 0x11, 0x27, 0x74, 0x3d, 0xe6, 0x78, 0xdd, 0x8d, 0xf5, 0x07, 0x24, 0x14, 0xf8, 0x0c, 0x55,
+	0x6e, 0x4a, 0x0d, 0xa2, 0x1f, 0xf1, 0x13, 0x35, 0x91, 0xd9, 0x92, 0xab, 0x14, 0x16, 0xf5, 0xcc,
+	0x8e, 0xb5, 0x5b, 0xef, 0xbe, 0x57, 0xb9, 0x9b, 0x59, 0x66, 0x92, 0x4b, 0xa7, 0xc8, 0xbf, 0xf5,
+	0x39, 0x02, 0xab, 0xe9, 0x77, 0x53, 0x14, 0x7e, 0x88, 0xde, 0xbd, 0xab, 0x28, 0xda, 0x7e, 0xc7,
+	0xf1, 0xda, 0x25, 0x3f, 0x68, 0x97, 0xdb, 0xc4, 0x13, 0xfd, 0x56, 0x59, 0x2e, 0x39, 0x3d, 0x97,
+	0x1e, 0xf6, 0x1f, 0x85, 0xd5, 0xe8, 0xcc, 0xaf, 0x8c, 0xf3, 0x9b, 0x52, 0x5c, 0x55, 0x6c, 0x18,
+	0x6d, 0xca, 0x4a, 0x3b, 0xcb, 0x7f, 0xd1, 0x04, 0x8f, 0x04, 0xc1, 0xa3, 0x28, 0xc1, 0xa3, 0x9d,
+	0xe5, 0x2f, 0x8c, 0x57, 0x25, 0x81, 0x6d, 0x0b, 0x0a, 0xdb, 0x8e, 0x92, 0xd8, 0xf6, 0xce, 0xf2,
+	0xe3, 0x69, 0x01, 0x6f, 0xe5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x95, 0xc1, 0xf5, 0xe5, 0x87,
+	0x22, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2642,136 +2802,3 @@ var _SecurityCenter_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/securitycenter/v1/securitycenter_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1/securitycenter_service.proto", fileDescriptor_securitycenter_service_0a41679950f5c36f)
-}
-
-var fileDescriptor_securitycenter_service_0a41679950f5c36f = []byte{
-	// 1987 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x1b, 0xc7,
-	0x15, 0xef, 0xac, 0x3e, 0xf9, 0x68, 0xd9, 0xf4, 0x48, 0x76, 0x99, 0x4d, 0xec, 0x2a, 0x9b, 0xc4,
-	0x55, 0x6c, 0x97, 0x8c, 0x28, 0xbb, 0x76, 0x57, 0x70, 0x60, 0x99, 0x92, 0x15, 0x17, 0xfe, 0x02,
-	0x29, 0xe9, 0x90, 0x1a, 0x21, 0xd6, 0xe4, 0x98, 0x59, 0x88, 0xdc, 0x65, 0x77, 0x86, 0x42, 0xe5,
-	0xc0, 0x28, 0x90, 0x6b, 0x81, 0x22, 0x68, 0x80, 0x1e, 0x8b, 0xb4, 0xe8, 0xa1, 0x2d, 0x72, 0x68,
-	0x83, 0x02, 0x6d, 0x81, 0xa2, 0xe7, 0xa2, 0x3d, 0xf6, 0x50, 0x20, 0xe8, 0xb1, 0xa7, 0xa0, 0xe8,
-	0x3f, 0xd0, 0x4b, 0x31, 0x5f, 0xd4, 0xee, 0x72, 0xc5, 0x5d, 0x5a, 0x0a, 0x0c, 0x14, 0xbd, 0x71,
-	0x66, 0xde, 0x7b, 0xf3, 0x7b, 0x6f, 0xde, 0x7b, 0xf3, 0xde, 0x2c, 0x61, 0xb5, 0xed, 0xfb, 0xed,
-	0x0e, 0x29, 0x37, 0x3b, 0x7e, 0xbf, 0x55, 0xa6, 0xa4, 0xd9, 0x0f, 0x5c, 0xb6, 0xdf, 0x24, 0x1e,
-	0x23, 0x41, 0x79, 0x6f, 0x39, 0x36, 0xd3, 0xa0, 0x24, 0xd8, 0x73, 0x9b, 0xa4, 0xd4, 0x0b, 0x7c,
-	0xe6, 0xe3, 0xf3, 0x92, 0xb9, 0x24, 0x98, 0x4b, 0x51, 0xd2, 0xd2, 0xde, 0xb2, 0xf9, 0x8a, 0x12,
-	0xee, 0xf4, 0xdc, 0xb2, 0xe3, 0x79, 0x3e, 0x73, 0x98, 0xeb, 0x7b, 0x54, 0x72, 0x9b, 0x17, 0x53,
-	0xb6, 0x76, 0x28, 0x25, 0x4c, 0xd1, 0x5e, 0x4e, 0xa1, 0x7d, 0xe2, 0x7a, 0x2d, 0xd7, 0x6b, 0x2b,
-	0x6a, 0x3b, 0x85, 0xda, 0x0f, 0xda, 0x8e, 0xe7, 0x3e, 0x15, 0x68, 0x1a, 0x94, 0x30, 0xe6, 0x7a,
-	0x6d, 0x8d, 0x6a, 0x25, 0xa3, 0x41, 0x1a, 0x5d, 0x27, 0xd8, 0xd5, 0x4c, 0x97, 0xd2, 0x98, 0xfc,
-	0x7e, 0xa0, 0xad, 0x66, 0x2a, 0xab, 0x95, 0x5d, 0xa7, 0xcb, 0xd7, 0x5c, 0xa7, 0xdb, 0xe8, 0xf9,
-	0x1d, 0xb7, 0xb9, 0xaf, 0xd6, 0xcd, 0xe8, 0x7a, 0x64, 0xed, 0x35, 0xb5, 0xd6, 0xf1, 0xbd, 0x76,
-	0xd0, 0xf7, 0x3c, 0xd7, 0x6b, 0x97, 0xfd, 0x1e, 0x09, 0x22, 0x86, 0xd5, 0x1b, 0x88, 0xd1, 0xe3,
-	0xfe, 0x93, 0x72, 0xab, 0x2f, 0x09, 0xd4, 0xfa, 0xcb, 0xf1, 0x75, 0xd2, 0xed, 0x31, 0xbd, 0xc3,
-	0x62, 0x7c, 0xf1, 0x89, 0x4b, 0x3a, 0xad, 0x46, 0xd7, 0xa1, 0xbb, 0x8a, 0xe2, 0x95, 0x38, 0x05,
-	0x65, 0x41, 0xbf, 0xa9, 0x4f, 0xea, 0x6b, 0xf1, 0x55, 0xe6, 0x76, 0x09, 0x65, 0x4e, 0xb7, 0x27,
-	0x09, 0xac, 0x8f, 0x10, 0x2c, 0x54, 0x03, 0xe2, 0x30, 0x72, 0x5b, 0x1e, 0x5a, 0x8d, 0x7c, 0xb7,
-	0x4f, 0x28, 0xc3, 0x67, 0x61, 0xba, 0xe7, 0x04, 0xc4, 0x63, 0x45, 0xb4, 0x88, 0x96, 0x72, 0x35,
-	0x35, 0xc2, 0xe7, 0x00, 0xd4, 0xf1, 0x36, 0xdc, 0x56, 0xd1, 0x10, 0x6b, 0x39, 0x35, 0x73, 0xa7,
-	0x85, 0xd7, 0x60, 0x46, 0x0d, 0x8a, 0x13, 0x8b, 0x68, 0x29, 0x5f, 0xf9, 0x7a, 0x69, 0xb4, 0x5b,
-	0x96, 0xf4, 0xbe, 0x9a, 0xcf, 0xea, 0xc2, 0xbc, 0x44, 0x54, 0x17, 0xe7, 0x94, 0x06, 0xe8, 0x6d,
-	0x98, 0x96, 0x07, 0x2a, 0xc0, 0xe4, 0x2b, 0x17, 0xd2, 0x36, 0x54, 0x62, 0x15, 0x97, 0x75, 0x05,
-	0xce, 0x6f, 0x12, 0xf6, 0x20, 0xe4, 0x84, 0x75, 0xe5, 0x83, 0x7a, 0x67, 0x0c, 0x93, 0x9e, 0xd3,
-	0x25, 0x6a, 0x5f, 0xf1, 0xdb, 0xba, 0x00, 0x85, 0x4d, 0xc2, 0xa2, 0x08, 0x93, 0xe8, 0x3e, 0x31,
-	0x00, 0x6f, 0x06, 0x7e, 0xbf, 0xb7, 0xc6, 0xe3, 0x87, 0xa6, 0x29, 0x73, 0x16, 0xa6, 0x9f, 0xb8,
-	0x1d, 0x46, 0x02, 0x65, 0x59, 0x35, 0xc2, 0x2f, 0xc1, 0x6c, 0x9b, 0x4b, 0x69, 0x3c, 0xde, 0x17,
-	0x76, 0xcd, 0xd5, 0x66, 0xc4, 0xf8, 0xd6, 0x3e, 0x5e, 0x87, 0x42, 0xd3, 0xef, 0x72, 0xfe, 0x86,
-	0xf6, 0xac, 0xe2, 0xa4, 0xb0, 0xc4, 0x4b, 0xda, 0x12, 0xfa, 0xf4, 0x4b, 0xeb, 0x8a, 0xa0, 0x76,
-	0x4a, 0xb1, 0xe8, 0x09, 0x7c, 0x0d, 0x72, 0x01, 0x71, 0x5a, 0x0d, 0xee, 0x1f, 0xc5, 0x29, 0xc1,
-	0x6e, 0x0e, 0xb1, 0x6f, 0x69, 0xe7, 0xa9, 0xcd, 0x72, 0x62, 0x3e, 0xe4, 0xfe, 0xd0, 0x73, 0xda,
-	0xa4, 0xc1, 0xfc, 0x5d, 0xe2, 0x15, 0x67, 0xa4, 0x3f, 0xf0, 0x99, 0x2d, 0x3e, 0x81, 0x5f, 0x06,
-	0x31, 0x68, 0x50, 0xf7, 0x29, 0x29, 0xce, 0x2e, 0xa2, 0xa5, 0xa9, 0xda, 0x2c, 0x9f, 0xa8, 0xbb,
-	0x4f, 0xc9, 0xb7, 0x27, 0x67, 0xa7, 0x0b, 0x33, 0xd6, 0xbf, 0x10, 0xcc, 0x47, 0x4c, 0x44, 0x7b,
-	0xbe, 0x47, 0x09, 0xde, 0x86, 0x82, 0xd6, 0xb9, 0x11, 0x10, 0xda, 0xef, 0x30, 0x5a, 0x44, 0x8b,
-	0x13, 0x4b, 0xf9, 0xca, 0xa5, 0xb4, 0x23, 0x16, 0xe2, 0x6a, 0x82, 0xa7, 0x76, 0x52, 0x19, 0x4a,
-	0x0e, 0x69, 0x54, 0x53, 0x63, 0x0c, 0x4d, 0x2f, 0xc0, 0x29, 0x8f, 0x7c, 0x8f, 0x35, 0x42, 0xea,
-	0xca, 0xa3, 0x98, 0xe3, 0xd3, 0x0f, 0x07, 0x2a, 0x9f, 0x03, 0x60, 0x3e, 0x73, 0x3a, 0x52, 0xe7,
-	0x49, 0xa1, 0x73, 0x4e, 0xcc, 0x70, 0xa5, 0xad, 0x9f, 0x19, 0xb0, 0x20, 0xf0, 0x29, 0xc7, 0xff,
-	0x32, 0x7c, 0x22, 0xa2, 0xe3, 0xe4, 0x18, 0x3a, 0x26, 0x39, 0xd3, 0xd4, 0xd8, 0xce, 0x74, 0x74,
-	0x9f, 0xf8, 0x37, 0x82, 0x33, 0x31, 0x23, 0xfd, 0x6f, 0x7b, 0xc5, 0xdf, 0x11, 0xe4, 0x43, 0xf8,
-	0xf0, 0x77, 0x00, 0x7a, 0x01, 0xbf, 0x4b, 0x98, 0x4b, 0xb4, 0x82, 0xab, 0x63, 0x28, 0x58, 0x7a,
-	0x38, 0xe0, 0xde, 0xf0, 0x58, 0xb0, 0x5f, 0x0b, 0x89, 0xc3, 0x0b, 0x30, 0xd5, 0xf4, 0xfb, 0x1e,
-	0x13, 0x8a, 0x4e, 0xd4, 0xe4, 0xc0, 0xdc, 0x86, 0x53, 0x31, 0x26, 0x5c, 0x80, 0x89, 0x5d, 0xb2,
-	0xaf, 0xfc, 0x91, 0xff, 0xc4, 0x97, 0x61, 0x6a, 0xcf, 0xe9, 0xf4, 0xb5, 0x8d, 0xce, 0x0e, 0xd9,
-	0x68, 0x87, 0xaf, 0xd6, 0x24, 0x91, 0x6d, 0x5c, 0x47, 0xd6, 0xfb, 0x80, 0xef, 0xba, 0x54, 0xa5,
-	0x4a, 0x9a, 0xe1, 0x7a, 0x09, 0x59, 0xd2, 0x18, 0xe9, 0x3a, 0x33, 0x51, 0xd7, 0xb1, 0xbe, 0x0f,
-	0xf3, 0x91, 0x9d, 0x94, 0xc7, 0xdc, 0x84, 0x19, 0x99, 0xea, 0xb5, 0x1d, 0xb3, 0xde, 0x10, 0x9a,
-	0x2d, 0xe9, 0x8c, 0x8d, 0x84, 0x33, 0xb6, 0x3e, 0x37, 0xe0, 0x34, 0x47, 0x70, 0xe4, 0x5c, 0xef,
-	0x07, 0x2d, 0x12, 0x84, 0xe2, 0x5a, 0x8c, 0x5f, 0x7c, 0x5c, 0x7f, 0x8b, 0xdf, 0xfd, 0xba, 0xfe,
-	0x10, 0xe6, 0x4f, 0xda, 0xff, 0x36, 0x27, 0xb9, 0xe7, 0xd0, 0x5d, 0x5e, 0x17, 0xa8, 0x9f, 0xb1,
-	0x73, 0x9d, 0x1d, 0x79, 0xae, 0xb9, 0xc4, 0x94, 0xf0, 0xc3, 0x49, 0xe9, 0x48, 0xb1, 0x5b, 0x82,
-	0xc2, 0x7c, 0xc7, 0xa5, 0xac, 0x21, 0xea, 0x53, 0x1a, 0x4b, 0x09, 0xd5, 0xb4, 0x93, 0x1e, 0x16,
-	0x18, 0x9d, 0xe2, 0xa9, 0xe2, 0x74, 0x27, 0x36, 0xf3, 0xc2, 0xb3, 0x85, 0xf9, 0xa1, 0x01, 0x85,
-	0x38, 0x4e, 0xbc, 0x0a, 0x53, 0xc2, 0x08, 0xc2, 0xcd, 0xf2, 0x95, 0x37, 0xd2, 0x74, 0x17, 0xcc,
-	0x35, 0xc9, 0x83, 0x03, 0x38, 0x41, 0x99, 0xc3, 0x48, 0xa3, 0xf9, 0xbe, 0xe3, 0xb5, 0xa5, 0x52,
-	0x27, 0x2b, 0x0f, 0x8e, 0xc1, 0x7e, 0xa5, 0x3a, 0x97, 0x5b, 0x15, 0x62, 0x6b, 0x79, 0x7a, 0x30,
-	0xb0, 0x6e, 0x40, 0x3e, 0xb4, 0x86, 0x01, 0xa6, 0xb7, 0xef, 0x6f, 0xd7, 0x37, 0xd6, 0x0b, 0x5f,
-	0xc1, 0x39, 0x98, 0x5a, 0x5b, 0x5f, 0xdf, 0x58, 0x2f, 0x20, 0x9c, 0x87, 0x99, 0xda, 0xc6, 0xbd,
-	0x07, 0x3b, 0x1b, 0xeb, 0x05, 0x83, 0xd3, 0xac, 0x55, 0xb7, 0xee, 0xec, 0x6c, 0x14, 0x26, 0xac,
-	0x7f, 0x18, 0x32, 0xde, 0x8f, 0xe1, 0x1e, 0xfd, 0x7f, 0xbc, 0x0d, 0xc7, 0xdb, 0x6f, 0x27, 0x61,
-	0x21, 0x6a, 0x5e, 0x15, 0x71, 0x1f, 0xc0, 0x19, 0x11, 0x71, 0xaa, 0x5e, 0x8f, 0xc7, 0xdc, 0x66,
-	0x16, 0x9f, 0x89, 0x0b, 0x8d, 0x4f, 0xf2, 0xb8, 0x13, 0x71, 0x1d, 0x9d, 0x7b, 0xf1, 0x91, 0xf7,
-	0x13, 0x43, 0x66, 0xa1, 0x28, 0xae, 0x70, 0xdb, 0x83, 0x9e, 0xaf, 0xed, 0xc1, 0x7b, 0x89, 0x11,
-	0x58, 0x3f, 0x26, 0x6b, 0x1e, 0x1e, 0x85, 0xf7, 0x0e, 0x8f, 0xc2, 0x3c, 0xcc, 0x54, 0xdf, 0x59,
-	0xbb, 0xbf, 0x29, 0xe2, 0x70, 0x0e, 0x72, 0xdb, 0xf7, 0xf5, 0xd0, 0x38, 0x88, 0xd0, 0x89, 0x70,
-	0x84, 0x4e, 0x5a, 0x9f, 0x22, 0x38, 0x5b, 0x27, 0x7a, 0x77, 0x21, 0x79, 0x44, 0x7f, 0x84, 0xab,
-	0x30, 0x25, 0xc0, 0x28, 0x75, 0xbf, 0x91, 0xd1, 0x6c, 0x52, 0x9d, 0x9a, 0xe4, 0xe5, 0x71, 0x42,
-	0x99, 0x13, 0x30, 0xe9, 0x15, 0x13, 0xa9, 0x5e, 0x91, 0x13, 0xd4, 0x7c, 0x6c, 0x55, 0xa0, 0x58,
-	0xeb, 0x7b, 0x22, 0x5f, 0xad, 0xbb, 0xb4, 0xe9, 0xef, 0x91, 0x60, 0x3f, 0x25, 0x91, 0x58, 0x3f,
-	0x46, 0xb0, 0xb0, 0xdd, 0x6b, 0x0d, 0xf7, 0xcc, 0xc7, 0xe0, 0x05, 0xab, 0x90, 0xef, 0x0b, 0xd1,
-	0x32, 0xe6, 0x8d, 0xd4, 0x98, 0x07, 0x49, 0xce, 0x7f, 0x5b, 0x7f, 0x45, 0xf0, 0xaa, 0x04, 0x36,
-	0xaa, 0x9d, 0x75, 0xe1, 0x4c, 0xe2, 0x93, 0x8b, 0xc2, 0x7c, 0x25, 0x0d, 0x73, 0xa2, 0xec, 0x05,
-	0x3f, 0x61, 0xf6, 0x68, 0xda, 0xfc, 0x08, 0xc1, 0xbc, 0xd4, 0x26, 0xda, 0x66, 0x1f, 0x34, 0xfc,
-	0xe8, 0x79, 0x1a, 0xfe, 0xa3, 0x81, 0xfa, 0x02, 0x81, 0xa9, 0x40, 0xa9, 0x7d, 0xee, 0x39, 0xc1,
-	0xee, 0xc0, 0xb6, 0x5b, 0x70, 0x32, 0xfa, 0x24, 0xa5, 0x30, 0xa6, 0xfa, 0x75, 0x54, 0xda, 0x1c,
-	0x0d, 0x0f, 0x8f, 0x84, 0xf8, 0x08, 0xc1, 0x51, 0xf9, 0xc8, 0x84, 0x93, 0x1a, 0x58, 0x55, 0x40,
-	0xc5, 0x3f, 0x45, 0x70, 0x22, 0xfc, 0x3a, 0x83, 0x57, 0xd2, 0x34, 0x4b, 0x78, 0xcb, 0x31, 0x33,
-	0x1e, 0x99, 0x75, 0xe5, 0xc3, 0xbf, 0xfd, 0xf3, 0x63, 0xa3, 0x64, 0xbd, 0x5e, 0xde, 0x5b, 0x2e,
-	0x7f, 0x20, 0xc3, 0xef, 0x46, 0xd8, 0xd3, 0x68, 0xf9, 0xe2, 0x33, 0xf5, 0x9e, 0x47, 0x6d, 0x7d,
-	0xc0, 0xbf, 0x46, 0x30, 0x17, 0x79, 0xd3, 0xc2, 0x57, 0xb2, 0x81, 0x8c, 0x86, 0xb3, 0x99, 0x35,
-	0x7a, 0xad, 0x9b, 0x02, 0xa6, 0x6d, 0x95, 0x47, 0xc0, 0xd4, 0x28, 0x39, 0x60, 0x7d, 0x73, 0xda,
-	0x83, 0xb0, 0xff, 0x01, 0x82, 0x13, 0x9b, 0x84, 0xdd, 0x71, 0xba, 0x0f, 0xc5, 0x03, 0x23, 0xb6,
-	0xf4, 0xde, 0xae, 0xd3, 0x15, 0xad, 0x5d, 0x68, 0x51, 0xe3, 0x3b, 0x13, 0xa3, 0x91, 0xab, 0x03,
-	0x34, 0x57, 0x05, 0x9a, 0x80, 0xc8, 0x8d, 0x47, 0xe0, 0xb1, 0xdb, 0x21, 0xe1, 0x36, 0xba, 0x88,
-	0xff, 0x8c, 0xe0, 0xab, 0x87, 0xbc, 0x89, 0xe1, 0xb7, 0x53, 0x9b, 0xd0, 0x91, 0x8f, 0x69, 0xe6,
-	0x73, 0xa5, 0x17, 0xeb, 0x9a, 0xd0, 0x69, 0x19, 0x4b, 0x0b, 0xf3, 0x9b, 0x63, 0x48, 0x9f, 0xa4,
-	0x04, 0xf4, 0x0c, 0x7f, 0x8c, 0x20, 0x37, 0x78, 0xa8, 0xc3, 0x6f, 0x65, 0x00, 0xff, 0x7c, 0x9e,
-	0x7a, 0x59, 0x00, 0xbc, 0x80, 0x5f, 0x3f, 0x1c, 0xe0, 0x81, 0xc1, 0xf1, 0xa7, 0xba, 0xdb, 0x97,
-	0x85, 0x32, 0xae, 0x64, 0xea, 0xec, 0x23, 0x6d, 0xa5, 0xb9, 0x32, 0x16, 0x8f, 0x2c, 0x0c, 0x06,
-	0x01, 0xf5, 0xe6, 0xc8, 0x80, 0x92, 0xbd, 0x94, 0x2d, 0x9e, 0x48, 0xb8, 0x3f, 0xfc, 0x09, 0xc1,
-	0x5c, 0xe4, 0x35, 0x26, 0x3d, 0xa0, 0x92, 0x5e, 0xb8, 0xcc, 0xab, 0x63, 0x72, 0x29, 0xd0, 0x51,
-	0x87, 0x1e, 0x23, 0xbc, 0x06, 0x0a, 0x7c, 0x82, 0x00, 0x0e, 0xfa, 0x12, 0xbc, 0x3c, 0x4e, 0x5b,
-	0x23, 0xa1, 0x57, 0xc6, 0xef, 0x84, 0xac, 0x4b, 0x02, 0xf7, 0x1b, 0xf8, 0xb5, 0x0c, 0xc6, 0xc6,
-	0x9f, 0x21, 0x38, 0x11, 0x2e, 0xdb, 0xd2, 0x13, 0x6b, 0x42, 0xef, 0x93, 0x1e, 0x5d, 0x49, 0xe5,
-	0x62, 0x2c, 0xba, 0xb2, 0x1b, 0x18, 0xff, 0x1c, 0x41, 0x3e, 0xf4, 0xe4, 0x82, 0x33, 0x59, 0x29,
-	0xfa, 0x12, 0x64, 0xae, 0x8c, 0xc5, 0xa3, 0x10, 0x47, 0xc3, 0x2d, 0xe5, 0x62, 0xc0, 0xbf, 0x44,
-	0x70, 0x7a, 0xa8, 0xca, 0xc3, 0xd7, 0xd3, 0x36, 0x3e, 0xac, 0x30, 0x34, 0xcf, 0x69, 0xce, 0xd0,
-	0x87, 0x9f, 0xd2, 0x03, 0xfd, 0xe1, 0xc7, 0x5a, 0x15, 0xe0, 0xae, 0x5a, 0x6f, 0x65, 0x09, 0xb2,
-	0xa0, 0xef, 0x0d, 0xe4, 0x73, 0x57, 0xfd, 0x1d, 0x82, 0x53, 0xb1, 0xfa, 0x19, 0x7f, 0x33, 0xbd,
-	0x7a, 0x48, 0x2a, 0xb8, 0xb3, 0x5f, 0x60, 0x55, 0x81, 0xf8, 0x86, 0x75, 0x3d, 0x43, 0xf6, 0x1a,
-	0x9c, 0x3e, 0xbf, 0x39, 0x28, 0x61, 0x62, 0x47, 0x8e, 0x9c, 0xdf, 0x61, 0xf5, 0x51, 0x77, 0x58,
-	0xfd, 0xcb, 0xbc, 0xc3, 0x68, 0xec, 0x0e, 0xfb, 0x0d, 0x02, 0xbc, 0x45, 0xa8, 0x98, 0x24, 0x41,
-	0xd7, 0xa5, 0x94, 0xf3, 0xe0, 0xa5, 0xd8, 0x7e, 0xc3, 0x24, 0x1a, 0xd9, 0x9b, 0x19, 0x28, 0x95,
-	0x37, 0xde, 0x16, 0x68, 0x6f, 0x5a, 0xab, 0x99, 0xd1, 0xb2, 0x21, 0x61, 0x1c, 0xf3, 0xef, 0x11,
-	0xcc, 0x45, 0x1a, 0x8b, 0xf4, 0x3c, 0x9b, 0xd4, 0x87, 0x64, 0x3f, 0xf7, 0x77, 0x04, 0xf0, 0x5b,
-	0x95, 0x6b, 0x02, 0xb8, 0xfe, 0x6c, 0x3b, 0xc6, 0xf9, 0x0f, 0x0a, 0x98, 0xff, 0x0c, 0xea, 0xe2,
-	0xc4, 0xaa, 0x61, 0x2d, 0x9b, 0x1e, 0xc7, 0x5f, 0x38, 0xb4, 0x84, 0x86, 0xef, 0x55, 0x36, 0x84,
-	0x86, 0xc9, 0x9f, 0x9a, 0xb3, 0x97, 0x13, 0x76, 0x72, 0xe7, 0x84, 0x7f, 0x81, 0xe0, 0x44, 0xb8,
-	0x55, 0x49, 0x4f, 0xde, 0x09, 0x8d, 0x4d, 0xe6, 0x5a, 0x43, 0xe5, 0x97, 0xca, 0x25, 0xa1, 0x93,
-	0xfa, 0x9a, 0x9d, 0x52, 0x72, 0x0c, 0x8a, 0xe3, 0x3f, 0x1a, 0x83, 0xae, 0x2a, 0xd2, 0x63, 0xd8,
-	0x19, 0x11, 0x27, 0x74, 0x3d, 0xe6, 0x78, 0xdd, 0x8d, 0xf5, 0x07, 0x24, 0x14, 0xf8, 0x0c, 0x55,
-	0x6e, 0x4a, 0x0d, 0xa2, 0x1f, 0xf1, 0x13, 0x35, 0x91, 0xd9, 0x92, 0xab, 0x14, 0x16, 0xf5, 0xcc,
-	0x8e, 0xb5, 0x5b, 0xef, 0xbe, 0x57, 0xb9, 0x9b, 0x59, 0x66, 0x92, 0x4b, 0xa7, 0xc8, 0xbf, 0xf5,
-	0x39, 0x02, 0xab, 0xe9, 0x77, 0x53, 0x14, 0x7e, 0x88, 0xde, 0xbd, 0xab, 0x28, 0xda, 0x7e, 0xc7,
-	0xf1, 0xda, 0x25, 0x3f, 0x68, 0x97, 0xdb, 0xc4, 0x13, 0xfd, 0x56, 0x59, 0x2e, 0x39, 0x3d, 0x97,
-	0x1e, 0xf6, 0x1f, 0x85, 0xd5, 0xe8, 0xcc, 0xaf, 0x8c, 0xf3, 0x9b, 0x52, 0x5c, 0x55, 0x6c, 0x18,
-	0x6d, 0xca, 0x4a, 0x3b, 0xcb, 0x7f, 0xd1, 0x04, 0x8f, 0x04, 0xc1, 0xa3, 0x28, 0xc1, 0xa3, 0x9d,
-	0xe5, 0x2f, 0x8c, 0x57, 0x25, 0x81, 0x6d, 0x0b, 0x0a, 0xdb, 0x8e, 0x92, 0xd8, 0xf6, 0xce, 0xf2,
-	0xe3, 0x69, 0x01, 0x6f, 0xe5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x95, 0xc1, 0xf5, 0xe5, 0x87,
-	0x22, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/securitycenter/v1/source.pb.go b/googleapis/cloud/securitycenter/v1/source.pb.go
index d3fc08351a..d3c9a65a53 100644
--- a/googleapis/cloud/securitycenter/v1/source.pb.go
+++ b/googleapis/cloud/securitycenter/v1/source.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1/source.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Cloud Security Command Center's (Cloud SCC) finding source. A finding source
 // is an entity or a mechanism that can produce a finding. A source is like a
@@ -53,16 +56,17 @@ func (m *Source) Reset()         { *m = Source{} }
 func (m *Source) String() string { return proto.CompactTextString(m) }
 func (*Source) ProtoMessage()    {}
 func (*Source) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_9f533006806efa3c, []int{0}
+	return fileDescriptor_43f5cbeb6a51b224, []int{0}
 }
+
 func (m *Source) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Source.Unmarshal(m, b)
 }
 func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
 }
-func (dst *Source) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Source.Merge(dst, src)
+func (m *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(m, src)
 }
 func (m *Source) XXX_Size() int {
 	return xxx_messageInfo_Source.Size(m)
@@ -99,10 +103,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1/source.proto", fileDescriptor_source_9f533006806efa3c)
+	proto.RegisterFile("google/cloud/securitycenter/v1/source.proto", fileDescriptor_43f5cbeb6a51b224)
 }
 
-var fileDescriptor_source_9f533006806efa3c = []byte{
+var fileDescriptor_43f5cbeb6a51b224 = []byte{
 	// 272 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xd0, 0x41, 0x4a, 0xf4, 0x30,
 	0x14, 0x07, 0x70, 0xda, 0xaf, 0xdf, 0xa0, 0x19, 0x17, 0xd2, 0xd5, 0x20, 0x32, 0xcc, 0xcc, 0x4a,
diff --git a/googleapis/cloud/securitycenter/v1beta1/asset.pb.go b/googleapis/cloud/securitycenter/v1beta1/asset.pb.go
index ca28810c85..d2f575ebde 100644
--- a/googleapis/cloud/securitycenter/v1beta1/asset.pb.go
+++ b/googleapis/cloud/securitycenter/v1beta1/asset.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1beta1/asset.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Cloud Security Command Center's (Cloud SCC) representation of a Google Cloud
 // Platform (GCP) resource.
@@ -56,16 +59,17 @@ func (m *Asset) Reset()         { *m = Asset{} }
 func (m *Asset) String() string { return proto.CompactTextString(m) }
 func (*Asset) ProtoMessage()    {}
 func (*Asset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_96fa06a748c89784, []int{0}
+	return fileDescriptor_51f3b31ca795196d, []int{0}
 }
+
 func (m *Asset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset.Unmarshal(m, b)
 }
 func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset.Marshal(b, m, deterministic)
 }
-func (dst *Asset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset.Merge(dst, src)
+func (m *Asset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset.Merge(m, src)
 }
 func (m *Asset) XXX_Size() int {
 	return xxx_messageInfo_Asset.Size(m)
@@ -147,16 +151,17 @@ func (m *Asset_SecurityCenterProperties) Reset()         { *m = Asset_SecurityCe
 func (m *Asset_SecurityCenterProperties) String() string { return proto.CompactTextString(m) }
 func (*Asset_SecurityCenterProperties) ProtoMessage()    {}
 func (*Asset_SecurityCenterProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_asset_96fa06a748c89784, []int{0, 0}
+	return fileDescriptor_51f3b31ca795196d, []int{0, 0}
 }
+
 func (m *Asset_SecurityCenterProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Asset_SecurityCenterProperties.Unmarshal(m, b)
 }
 func (m *Asset_SecurityCenterProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Asset_SecurityCenterProperties.Marshal(b, m, deterministic)
 }
-func (dst *Asset_SecurityCenterProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Asset_SecurityCenterProperties.Merge(dst, src)
+func (m *Asset_SecurityCenterProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset_SecurityCenterProperties.Merge(m, src)
 }
 func (m *Asset_SecurityCenterProperties) XXX_Size() int {
 	return xxx_messageInfo_Asset_SecurityCenterProperties.Size(m)
@@ -209,10 +214,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1beta1/asset.proto", fileDescriptor_asset_96fa06a748c89784)
+	proto.RegisterFile("google/cloud/securitycenter/v1beta1/asset.proto", fileDescriptor_51f3b31ca795196d)
 }
 
-var fileDescriptor_asset_96fa06a748c89784 = []byte{
+var fileDescriptor_51f3b31ca795196d = []byte{
 	// 490 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5d, 0x6b, 0xd4, 0x40,
 	0x14, 0x25, 0xdd, 0x6e, 0xb5, 0x77, 0xed, 0x07, 0x23, 0xe8, 0x10, 0x04, 0x17, 0xfb, 0xd0, 0x15,
diff --git a/googleapis/cloud/securitycenter/v1beta1/finding.pb.go b/googleapis/cloud/securitycenter/v1beta1/finding.pb.go
index dad444c421..6c341f07b0 100644
--- a/googleapis/cloud/securitycenter/v1beta1/finding.pb.go
+++ b/googleapis/cloud/securitycenter/v1beta1/finding.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1beta1/finding.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The state of the finding.
 type Finding_State int32
@@ -39,6 +42,7 @@ var Finding_State_name = map[int32]string{
 	1: "ACTIVE",
 	2: "INACTIVE",
 }
+
 var Finding_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"ACTIVE":            1,
@@ -48,8 +52,9 @@ var Finding_State_value = map[string]int32{
 func (x Finding_State) String() string {
 	return proto.EnumName(Finding_State_name, int32(x))
 }
+
 func (Finding_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_finding_136f8b994030e0de, []int{0, 0}
+	return fileDescriptor_da6ee7073afacba3, []int{0, 0}
 }
 
 // Cloud Security Command Center (Cloud SCC) finding.
@@ -109,16 +114,17 @@ func (m *Finding) Reset()         { *m = Finding{} }
 func (m *Finding) String() string { return proto.CompactTextString(m) }
 func (*Finding) ProtoMessage()    {}
 func (*Finding) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_136f8b994030e0de, []int{0}
+	return fileDescriptor_da6ee7073afacba3, []int{0}
 }
+
 func (m *Finding) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Finding.Unmarshal(m, b)
 }
 func (m *Finding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Finding.Marshal(b, m, deterministic)
 }
-func (dst *Finding) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Finding.Merge(dst, src)
+func (m *Finding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Finding.Merge(m, src)
 }
 func (m *Finding) XXX_Size() int {
 	return xxx_messageInfo_Finding.Size(m)
@@ -200,16 +206,16 @@ func (m *Finding) GetCreateTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.securitycenter.v1beta1.Finding_State", Finding_State_name, Finding_State_value)
 	proto.RegisterType((*Finding)(nil), "google.cloud.securitycenter.v1beta1.Finding")
 	proto.RegisterMapType((map[string]*_struct.Value)(nil), "google.cloud.securitycenter.v1beta1.Finding.SourcePropertiesEntry")
-	proto.RegisterEnum("google.cloud.securitycenter.v1beta1.Finding_State", Finding_State_name, Finding_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1beta1/finding.proto", fileDescriptor_finding_136f8b994030e0de)
+	proto.RegisterFile("google/cloud/securitycenter/v1beta1/finding.proto", fileDescriptor_da6ee7073afacba3)
 }
 
-var fileDescriptor_finding_136f8b994030e0de = []byte{
+var fileDescriptor_da6ee7073afacba3 = []byte{
 	// 510 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x41, 0x6f, 0xda, 0x30,
 	0x14, 0xc7, 0x17, 0x28, 0x14, 0x1e, 0xb4, 0xa2, 0x96, 0x5a, 0x45, 0x68, 0xd2, 0x58, 0x7b, 0x18,
diff --git a/googleapis/cloud/securitycenter/v1beta1/organization_settings.pb.go b/googleapis/cloud/securitycenter/v1beta1/organization_settings.pb.go
index abbf72b0ea..5b88ffc52b 100644
--- a/googleapis/cloud/securitycenter/v1beta1/organization_settings.pb.go
+++ b/googleapis/cloud/securitycenter/v1beta1/organization_settings.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1beta1/organization_settings.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The mode of inclusion when running Asset Discovery.
 // Asset discovery can be limited by explicitly identifying projects to be
@@ -46,6 +49,7 @@ var OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name = map[int32]str
 	1: "INCLUDE_ONLY",
 	2: "EXCLUDE",
 }
+
 var OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value = map[string]int32{
 	"INCLUSION_MODE_UNSPECIFIED": 0,
 	"INCLUDE_ONLY":               1,
@@ -55,8 +59,9 @@ var OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value = map[string]i
 func (x OrganizationSettings_AssetDiscoveryConfig_InclusionMode) String() string {
 	return proto.EnumName(OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name, int32(x))
 }
+
 func (OrganizationSettings_AssetDiscoveryConfig_InclusionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_organization_settings_8916391f4b80a5cd, []int{0, 0, 0}
+	return fileDescriptor_a0c752c1a47d41ec, []int{0, 0, 0}
 }
 
 // User specified settings that are attached to the Cloud Security Command
@@ -83,16 +88,17 @@ func (m *OrganizationSettings) Reset()         { *m = OrganizationSettings{} }
 func (m *OrganizationSettings) String() string { return proto.CompactTextString(m) }
 func (*OrganizationSettings) ProtoMessage()    {}
 func (*OrganizationSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_organization_settings_8916391f4b80a5cd, []int{0}
+	return fileDescriptor_a0c752c1a47d41ec, []int{0}
 }
+
 func (m *OrganizationSettings) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OrganizationSettings.Unmarshal(m, b)
 }
 func (m *OrganizationSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OrganizationSettings.Marshal(b, m, deterministic)
 }
-func (dst *OrganizationSettings) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OrganizationSettings.Merge(dst, src)
+func (m *OrganizationSettings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrganizationSettings.Merge(m, src)
 }
 func (m *OrganizationSettings) XXX_Size() int {
 	return xxx_messageInfo_OrganizationSettings.Size(m)
@@ -141,16 +147,17 @@ func (m *OrganizationSettings_AssetDiscoveryConfig) Reset() {
 func (m *OrganizationSettings_AssetDiscoveryConfig) String() string { return proto.CompactTextString(m) }
 func (*OrganizationSettings_AssetDiscoveryConfig) ProtoMessage()    {}
 func (*OrganizationSettings_AssetDiscoveryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_organization_settings_8916391f4b80a5cd, []int{0, 0}
+	return fileDescriptor_a0c752c1a47d41ec, []int{0, 0}
 }
+
 func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Unmarshal(m, b)
 }
 func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Marshal(b, m, deterministic)
 }
-func (dst *OrganizationSettings_AssetDiscoveryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Merge(dst, src)
+func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Merge(m, src)
 }
 func (m *OrganizationSettings_AssetDiscoveryConfig) XXX_Size() int {
 	return xxx_messageInfo_OrganizationSettings_AssetDiscoveryConfig.Size(m)
@@ -176,16 +183,16 @@ func (m *OrganizationSettings_AssetDiscoveryConfig) GetInclusionMode() Organizat
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.securitycenter.v1beta1.OrganizationSettings_AssetDiscoveryConfig_InclusionMode", OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name, OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value)
 	proto.RegisterType((*OrganizationSettings)(nil), "google.cloud.securitycenter.v1beta1.OrganizationSettings")
 	proto.RegisterType((*OrganizationSettings_AssetDiscoveryConfig)(nil), "google.cloud.securitycenter.v1beta1.OrganizationSettings.AssetDiscoveryConfig")
-	proto.RegisterEnum("google.cloud.securitycenter.v1beta1.OrganizationSettings_AssetDiscoveryConfig_InclusionMode", OrganizationSettings_AssetDiscoveryConfig_InclusionMode_name, OrganizationSettings_AssetDiscoveryConfig_InclusionMode_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1beta1/organization_settings.proto", fileDescriptor_organization_settings_8916391f4b80a5cd)
+	proto.RegisterFile("google/cloud/securitycenter/v1beta1/organization_settings.proto", fileDescriptor_a0c752c1a47d41ec)
 }
 
-var fileDescriptor_organization_settings_8916391f4b80a5cd = []byte{
+var fileDescriptor_a0c752c1a47d41ec = []byte{
 	// 399 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xc1, 0x6b, 0x14, 0x31,
 	0x14, 0xc6, 0xcd, 0xae, 0xa8, 0xcd, 0xda, 0xb2, 0x84, 0xa1, 0x0c, 0x8b, 0xe8, 0x50, 0x0f, 0xce,
diff --git a/googleapis/cloud/securitycenter/v1beta1/security_marks.pb.go b/googleapis/cloud/securitycenter/v1beta1/security_marks.pb.go
index df41303431..34ddd11478 100644
--- a/googleapis/cloud/securitycenter/v1beta1/security_marks.pb.go
+++ b/googleapis/cloud/securitycenter/v1beta1/security_marks.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1beta1/security_marks.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // User specified security marks that are attached to the parent Cloud Security
 // Command Center (Cloud SCC) resource. Security marks are scoped within a Cloud
@@ -46,16 +49,17 @@ func (m *SecurityMarks) Reset()         { *m = SecurityMarks{} }
 func (m *SecurityMarks) String() string { return proto.CompactTextString(m) }
 func (*SecurityMarks) ProtoMessage()    {}
 func (*SecurityMarks) Descriptor() ([]byte, []int) {
-	return fileDescriptor_security_marks_89566b31649909af, []int{0}
+	return fileDescriptor_09d3e42c3896af25, []int{0}
 }
+
 func (m *SecurityMarks) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SecurityMarks.Unmarshal(m, b)
 }
 func (m *SecurityMarks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SecurityMarks.Marshal(b, m, deterministic)
 }
-func (dst *SecurityMarks) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SecurityMarks.Merge(dst, src)
+func (m *SecurityMarks) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SecurityMarks.Merge(m, src)
 }
 func (m *SecurityMarks) XXX_Size() int {
 	return xxx_messageInfo_SecurityMarks.Size(m)
@@ -86,10 +90,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1beta1/security_marks.proto", fileDescriptor_security_marks_89566b31649909af)
+	proto.RegisterFile("google/cloud/securitycenter/v1beta1/security_marks.proto", fileDescriptor_09d3e42c3896af25)
 }
 
-var fileDescriptor_security_marks_89566b31649909af = []byte{
+var fileDescriptor_09d3e42c3896af25 = []byte{
 	// 252 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x41, 0x4b, 0xc3, 0x30,
 	0x14, 0xc7, 0x49, 0xe7, 0x04, 0x9f, 0x08, 0x12, 0x3c, 0x94, 0xe1, 0x61, 0xe8, 0xc1, 0x9d, 0x12,
diff --git a/googleapis/cloud/securitycenter/v1beta1/securitycenter_service.pb.go b/googleapis/cloud/securitycenter/v1beta1/securitycenter_service.pb.go
index f61e9d6dae..33809b50c7 100644
--- a/googleapis/cloud/securitycenter/v1beta1/securitycenter_service.pb.go
+++ b/googleapis/cloud/securitycenter/v1beta1/securitycenter_service.pb.go
@@ -1,22 +1,22 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1beta1/securitycenter_service.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package securitycenter
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -29,7 +29,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // State of the asset.
 //
@@ -59,6 +59,7 @@ var ListAssetsResponse_ListAssetsResult_State_name = map[int32]string{
 	3: "REMOVED",
 	4: "ACTIVE",
 }
+
 var ListAssetsResponse_ListAssetsResult_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"UNUSED":            1,
@@ -70,8 +71,9 @@ var ListAssetsResponse_ListAssetsResult_State_value = map[string]int32{
 func (x ListAssetsResponse_ListAssetsResult_State) String() string {
 	return proto.EnumName(ListAssetsResponse_ListAssetsResult_State_name, int32(x))
 }
+
 func (ListAssetsResponse_ListAssetsResult_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{12, 0, 0}
+	return fileDescriptor_718836fd7840efb6, []int{12, 0, 0}
 }
 
 // Request message for creating a finding.
@@ -95,16 +97,17 @@ func (m *CreateFindingRequest) Reset()         { *m = CreateFindingRequest{} }
 func (m *CreateFindingRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateFindingRequest) ProtoMessage()    {}
 func (*CreateFindingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{0}
+	return fileDescriptor_718836fd7840efb6, []int{0}
 }
+
 func (m *CreateFindingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateFindingRequest.Unmarshal(m, b)
 }
 func (m *CreateFindingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateFindingRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateFindingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateFindingRequest.Merge(dst, src)
+func (m *CreateFindingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateFindingRequest.Merge(m, src)
 }
 func (m *CreateFindingRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateFindingRequest.Size(m)
@@ -153,16 +156,17 @@ func (m *CreateSourceRequest) Reset()         { *m = CreateSourceRequest{} }
 func (m *CreateSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSourceRequest) ProtoMessage()    {}
 func (*CreateSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{1}
+	return fileDescriptor_718836fd7840efb6, []int{1}
 }
+
 func (m *CreateSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSourceRequest.Unmarshal(m, b)
 }
 func (m *CreateSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSourceRequest.Merge(dst, src)
+func (m *CreateSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSourceRequest.Merge(m, src)
 }
 func (m *CreateSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSourceRequest.Size(m)
@@ -201,16 +205,17 @@ func (m *GetOrganizationSettingsRequest) Reset()         { *m = GetOrganizationS
 func (m *GetOrganizationSettingsRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOrganizationSettingsRequest) ProtoMessage()    {}
 func (*GetOrganizationSettingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{2}
+	return fileDescriptor_718836fd7840efb6, []int{2}
 }
+
 func (m *GetOrganizationSettingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOrganizationSettingsRequest.Unmarshal(m, b)
 }
 func (m *GetOrganizationSettingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOrganizationSettingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOrganizationSettingsRequest.Merge(dst, src)
+func (m *GetOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOrganizationSettingsRequest.Merge(m, src)
 }
 func (m *GetOrganizationSettingsRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOrganizationSettingsRequest.Size(m)
@@ -242,16 +247,17 @@ func (m *GetSourceRequest) Reset()         { *m = GetSourceRequest{} }
 func (m *GetSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSourceRequest) ProtoMessage()    {}
 func (*GetSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{3}
+	return fileDescriptor_718836fd7840efb6, []int{3}
 }
+
 func (m *GetSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSourceRequest.Unmarshal(m, b)
 }
 func (m *GetSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSourceRequest.Merge(dst, src)
+func (m *GetSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSourceRequest.Merge(m, src)
 }
 func (m *GetSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSourceRequest.Size(m)
@@ -360,16 +366,17 @@ func (m *GroupAssetsRequest) Reset()         { *m = GroupAssetsRequest{} }
 func (m *GroupAssetsRequest) String() string { return proto.CompactTextString(m) }
 func (*GroupAssetsRequest) ProtoMessage()    {}
 func (*GroupAssetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{4}
+	return fileDescriptor_718836fd7840efb6, []int{4}
 }
+
 func (m *GroupAssetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupAssetsRequest.Unmarshal(m, b)
 }
 func (m *GroupAssetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupAssetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GroupAssetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupAssetsRequest.Merge(dst, src)
+func (m *GroupAssetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupAssetsRequest.Merge(m, src)
 }
 func (m *GroupAssetsRequest) XXX_Size() int {
 	return xxx_messageInfo_GroupAssetsRequest.Size(m)
@@ -449,16 +456,17 @@ func (m *GroupAssetsResponse) Reset()         { *m = GroupAssetsResponse{} }
 func (m *GroupAssetsResponse) String() string { return proto.CompactTextString(m) }
 func (*GroupAssetsResponse) ProtoMessage()    {}
 func (*GroupAssetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{5}
+	return fileDescriptor_718836fd7840efb6, []int{5}
 }
+
 func (m *GroupAssetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupAssetsResponse.Unmarshal(m, b)
 }
 func (m *GroupAssetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupAssetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *GroupAssetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupAssetsResponse.Merge(dst, src)
+func (m *GroupAssetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupAssetsResponse.Merge(m, src)
 }
 func (m *GroupAssetsResponse) XXX_Size() int {
 	return xxx_messageInfo_GroupAssetsResponse.Size(m)
@@ -556,16 +564,17 @@ func (m *GroupFindingsRequest) Reset()         { *m = GroupFindingsRequest{} }
 func (m *GroupFindingsRequest) String() string { return proto.CompactTextString(m) }
 func (*GroupFindingsRequest) ProtoMessage()    {}
 func (*GroupFindingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{6}
+	return fileDescriptor_718836fd7840efb6, []int{6}
 }
+
 func (m *GroupFindingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupFindingsRequest.Unmarshal(m, b)
 }
 func (m *GroupFindingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupFindingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *GroupFindingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupFindingsRequest.Merge(dst, src)
+func (m *GroupFindingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupFindingsRequest.Merge(m, src)
 }
 func (m *GroupFindingsRequest) XXX_Size() int {
 	return xxx_messageInfo_GroupFindingsRequest.Size(m)
@@ -638,16 +647,17 @@ func (m *GroupFindingsResponse) Reset()         { *m = GroupFindingsResponse{} }
 func (m *GroupFindingsResponse) String() string { return proto.CompactTextString(m) }
 func (*GroupFindingsResponse) ProtoMessage()    {}
 func (*GroupFindingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{7}
+	return fileDescriptor_718836fd7840efb6, []int{7}
 }
+
 func (m *GroupFindingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupFindingsResponse.Unmarshal(m, b)
 }
 func (m *GroupFindingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupFindingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *GroupFindingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupFindingsResponse.Merge(dst, src)
+func (m *GroupFindingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupFindingsResponse.Merge(m, src)
 }
 func (m *GroupFindingsResponse) XXX_Size() int {
 	return xxx_messageInfo_GroupFindingsResponse.Size(m)
@@ -694,16 +704,17 @@ func (m *GroupResult) Reset()         { *m = GroupResult{} }
 func (m *GroupResult) String() string { return proto.CompactTextString(m) }
 func (*GroupResult) ProtoMessage()    {}
 func (*GroupResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{8}
+	return fileDescriptor_718836fd7840efb6, []int{8}
 }
+
 func (m *GroupResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupResult.Unmarshal(m, b)
 }
 func (m *GroupResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GroupResult.Marshal(b, m, deterministic)
 }
-func (dst *GroupResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GroupResult.Merge(dst, src)
+func (m *GroupResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupResult.Merge(m, src)
 }
 func (m *GroupResult) XXX_Size() int {
 	return xxx_messageInfo_GroupResult.Size(m)
@@ -749,16 +760,17 @@ func (m *ListSourcesRequest) Reset()         { *m = ListSourcesRequest{} }
 func (m *ListSourcesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSourcesRequest) ProtoMessage()    {}
 func (*ListSourcesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{9}
+	return fileDescriptor_718836fd7840efb6, []int{9}
 }
+
 func (m *ListSourcesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSourcesRequest.Unmarshal(m, b)
 }
 func (m *ListSourcesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSourcesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSourcesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSourcesRequest.Merge(dst, src)
+func (m *ListSourcesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSourcesRequest.Merge(m, src)
 }
 func (m *ListSourcesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSourcesRequest.Size(m)
@@ -806,16 +818,17 @@ func (m *ListSourcesResponse) Reset()         { *m = ListSourcesResponse{} }
 func (m *ListSourcesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSourcesResponse) ProtoMessage()    {}
 func (*ListSourcesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{10}
+	return fileDescriptor_718836fd7840efb6, []int{10}
 }
+
 func (m *ListSourcesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSourcesResponse.Unmarshal(m, b)
 }
 func (m *ListSourcesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSourcesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSourcesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSourcesResponse.Merge(dst, src)
+func (m *ListSourcesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSourcesResponse.Merge(m, src)
 }
 func (m *ListSourcesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSourcesResponse.Size(m)
@@ -933,16 +946,17 @@ func (m *ListAssetsRequest) Reset()         { *m = ListAssetsRequest{} }
 func (m *ListAssetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAssetsRequest) ProtoMessage()    {}
 func (*ListAssetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{11}
+	return fileDescriptor_718836fd7840efb6, []int{11}
 }
+
 func (m *ListAssetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAssetsRequest.Unmarshal(m, b)
 }
 func (m *ListAssetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAssetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAssetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAssetsRequest.Merge(dst, src)
+func (m *ListAssetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAssetsRequest.Merge(m, src)
 }
 func (m *ListAssetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAssetsRequest.Size(m)
@@ -1029,16 +1043,17 @@ func (m *ListAssetsResponse) Reset()         { *m = ListAssetsResponse{} }
 func (m *ListAssetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAssetsResponse) ProtoMessage()    {}
 func (*ListAssetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{12}
+	return fileDescriptor_718836fd7840efb6, []int{12}
 }
+
 func (m *ListAssetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAssetsResponse.Unmarshal(m, b)
 }
 func (m *ListAssetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAssetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAssetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAssetsResponse.Merge(dst, src)
+func (m *ListAssetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAssetsResponse.Merge(m, src)
 }
 func (m *ListAssetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAssetsResponse.Size(m)
@@ -1092,16 +1107,17 @@ func (m *ListAssetsResponse_ListAssetsResult) Reset()         { *m = ListAssetsR
 func (m *ListAssetsResponse_ListAssetsResult) String() string { return proto.CompactTextString(m) }
 func (*ListAssetsResponse_ListAssetsResult) ProtoMessage()    {}
 func (*ListAssetsResponse_ListAssetsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{12, 0}
+	return fileDescriptor_718836fd7840efb6, []int{12, 0}
 }
+
 func (m *ListAssetsResponse_ListAssetsResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Unmarshal(m, b)
 }
 func (m *ListAssetsResponse_ListAssetsResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Marshal(b, m, deterministic)
 }
-func (dst *ListAssetsResponse_ListAssetsResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Merge(dst, src)
+func (m *ListAssetsResponse_ListAssetsResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Merge(m, src)
 }
 func (m *ListAssetsResponse_ListAssetsResult) XXX_Size() int {
 	return xxx_messageInfo_ListAssetsResponse_ListAssetsResult.Size(m)
@@ -1194,16 +1210,17 @@ func (m *ListFindingsRequest) Reset()         { *m = ListFindingsRequest{} }
 func (m *ListFindingsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsRequest) ProtoMessage()    {}
 func (*ListFindingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{13}
+	return fileDescriptor_718836fd7840efb6, []int{13}
 }
+
 func (m *ListFindingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsRequest.Unmarshal(m, b)
 }
 func (m *ListFindingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsRequest.Merge(dst, src)
+func (m *ListFindingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsRequest.Merge(m, src)
 }
 func (m *ListFindingsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsRequest.Size(m)
@@ -1283,16 +1300,17 @@ func (m *ListFindingsResponse) Reset()         { *m = ListFindingsResponse{} }
 func (m *ListFindingsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsResponse) ProtoMessage()    {}
 func (*ListFindingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{14}
+	return fileDescriptor_718836fd7840efb6, []int{14}
 }
+
 func (m *ListFindingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsResponse.Unmarshal(m, b)
 }
 func (m *ListFindingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsResponse.Merge(dst, src)
+func (m *ListFindingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsResponse.Merge(m, src)
 }
 func (m *ListFindingsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsResponse.Size(m)
@@ -1351,16 +1369,17 @@ func (m *SetFindingStateRequest) Reset()         { *m = SetFindingStateRequest{}
 func (m *SetFindingStateRequest) String() string { return proto.CompactTextString(m) }
 func (*SetFindingStateRequest) ProtoMessage()    {}
 func (*SetFindingStateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{15}
+	return fileDescriptor_718836fd7840efb6, []int{15}
 }
+
 func (m *SetFindingStateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetFindingStateRequest.Unmarshal(m, b)
 }
 func (m *SetFindingStateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetFindingStateRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetFindingStateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetFindingStateRequest.Merge(dst, src)
+func (m *SetFindingStateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetFindingStateRequest.Merge(m, src)
 }
 func (m *SetFindingStateRequest) XXX_Size() int {
 	return xxx_messageInfo_SetFindingStateRequest.Size(m)
@@ -1406,16 +1425,17 @@ func (m *RunAssetDiscoveryRequest) Reset()         { *m = RunAssetDiscoveryReque
 func (m *RunAssetDiscoveryRequest) String() string { return proto.CompactTextString(m) }
 func (*RunAssetDiscoveryRequest) ProtoMessage()    {}
 func (*RunAssetDiscoveryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{16}
+	return fileDescriptor_718836fd7840efb6, []int{16}
 }
+
 func (m *RunAssetDiscoveryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunAssetDiscoveryRequest.Unmarshal(m, b)
 }
 func (m *RunAssetDiscoveryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunAssetDiscoveryRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunAssetDiscoveryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunAssetDiscoveryRequest.Merge(dst, src)
+func (m *RunAssetDiscoveryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunAssetDiscoveryRequest.Merge(m, src)
 }
 func (m *RunAssetDiscoveryRequest) XXX_Size() int {
 	return xxx_messageInfo_RunAssetDiscoveryRequest.Size(m)
@@ -1454,16 +1474,17 @@ func (m *UpdateFindingRequest) Reset()         { *m = UpdateFindingRequest{} }
 func (m *UpdateFindingRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateFindingRequest) ProtoMessage()    {}
 func (*UpdateFindingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{17}
+	return fileDescriptor_718836fd7840efb6, []int{17}
 }
+
 func (m *UpdateFindingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateFindingRequest.Unmarshal(m, b)
 }
 func (m *UpdateFindingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateFindingRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateFindingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateFindingRequest.Merge(dst, src)
+func (m *UpdateFindingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFindingRequest.Merge(m, src)
 }
 func (m *UpdateFindingRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateFindingRequest.Size(m)
@@ -1503,16 +1524,17 @@ func (m *UpdateOrganizationSettingsRequest) Reset()         { *m = UpdateOrganiz
 func (m *UpdateOrganizationSettingsRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateOrganizationSettingsRequest) ProtoMessage()    {}
 func (*UpdateOrganizationSettingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{18}
+	return fileDescriptor_718836fd7840efb6, []int{18}
 }
+
 func (m *UpdateOrganizationSettingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateOrganizationSettingsRequest.Unmarshal(m, b)
 }
 func (m *UpdateOrganizationSettingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateOrganizationSettingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateOrganizationSettingsRequest.Merge(dst, src)
+func (m *UpdateOrganizationSettingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateOrganizationSettingsRequest.Merge(m, src)
 }
 func (m *UpdateOrganizationSettingsRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateOrganizationSettingsRequest.Size(m)
@@ -1552,16 +1574,17 @@ func (m *UpdateSourceRequest) Reset()         { *m = UpdateSourceRequest{} }
 func (m *UpdateSourceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSourceRequest) ProtoMessage()    {}
 func (*UpdateSourceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{19}
+	return fileDescriptor_718836fd7840efb6, []int{19}
 }
+
 func (m *UpdateSourceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSourceRequest.Unmarshal(m, b)
 }
 func (m *UpdateSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSourceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSourceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSourceRequest.Merge(dst, src)
+func (m *UpdateSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSourceRequest.Merge(m, src)
 }
 func (m *UpdateSourceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSourceRequest.Size(m)
@@ -1603,16 +1626,17 @@ func (m *UpdateSecurityMarksRequest) Reset()         { *m = UpdateSecurityMarksR
 func (m *UpdateSecurityMarksRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSecurityMarksRequest) ProtoMessage()    {}
 func (*UpdateSecurityMarksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_securitycenter_service_32527bc15746ec09, []int{20}
+	return fileDescriptor_718836fd7840efb6, []int{20}
 }
+
 func (m *UpdateSecurityMarksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSecurityMarksRequest.Unmarshal(m, b)
 }
 func (m *UpdateSecurityMarksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSecurityMarksRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSecurityMarksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSecurityMarksRequest.Merge(dst, src)
+func (m *UpdateSecurityMarksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSecurityMarksRequest.Merge(m, src)
 }
 func (m *UpdateSecurityMarksRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSecurityMarksRequest.Size(m)
@@ -1645,6 +1669,7 @@ func (m *UpdateSecurityMarksRequest) GetStartTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.securitycenter.v1beta1.ListAssetsResponse_ListAssetsResult_State", ListAssetsResponse_ListAssetsResult_State_name, ListAssetsResponse_ListAssetsResult_State_value)
 	proto.RegisterType((*CreateFindingRequest)(nil), "google.cloud.securitycenter.v1beta1.CreateFindingRequest")
 	proto.RegisterType((*CreateSourceRequest)(nil), "google.cloud.securitycenter.v1beta1.CreateSourceRequest")
 	proto.RegisterType((*GetOrganizationSettingsRequest)(nil), "google.cloud.securitycenter.v1beta1.GetOrganizationSettingsRequest")
@@ -1668,7 +1693,133 @@ func init() {
 	proto.RegisterType((*UpdateOrganizationSettingsRequest)(nil), "google.cloud.securitycenter.v1beta1.UpdateOrganizationSettingsRequest")
 	proto.RegisterType((*UpdateSourceRequest)(nil), "google.cloud.securitycenter.v1beta1.UpdateSourceRequest")
 	proto.RegisterType((*UpdateSecurityMarksRequest)(nil), "google.cloud.securitycenter.v1beta1.UpdateSecurityMarksRequest")
-	proto.RegisterEnum("google.cloud.securitycenter.v1beta1.ListAssetsResponse_ListAssetsResult_State", ListAssetsResponse_ListAssetsResult_State_name, ListAssetsResponse_ListAssetsResult_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/securitycenter/v1beta1/securitycenter_service.proto", fileDescriptor_718836fd7840efb6)
+}
+
+var fileDescriptor_718836fd7840efb6 = []byte{
+	// 1902 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xdb, 0x6f, 0x1b, 0x59,
+	0x19, 0xe7, 0x38, 0x71, 0x12, 0x7f, 0x6e, 0x5a, 0xf7, 0x24, 0x2d, 0xde, 0xd9, 0xee, 0x12, 0x06,
+	0x69, 0x49, 0xbb, 0x2b, 0xbb, 0xf1, 0x5e, 0x9a, 0xba, 0x5b, 0x35, 0x6d, 0xec, 0x5c, 0x80, 0xa4,
+	0x59, 0x3b, 0xa9, 0x44, 0x5f, 0xcc, 0xc4, 0x3e, 0x31, 0xa3, 0xd8, 0x33, 0x66, 0xce, 0x71, 0xb4,
+	0x29, 0x2a, 0x42, 0x88, 0xa7, 0x7d, 0x5a, 0x09, 0x21, 0x24, 0xf6, 0x8d, 0x7f, 0x00, 0x10, 0x12,
+	0x3c, 0x80, 0x84, 0x10, 0x12, 0x3c, 0x21, 0xad, 0xa0, 0x82, 0x17, 0x1e, 0x78, 0xe0, 0x9d, 0x7f,
+	0x01, 0x9d, 0x9b, 0x33, 0x33, 0x9e, 0xda, 0x33, 0x71, 0x23, 0x24, 0x9e, 0xe2, 0x73, 0xf9, 0xce,
+	0xf9, 0xfd, 0xbe, 0xcb, 0x39, 0xdf, 0x77, 0x26, 0xb0, 0xd6, 0x76, 0xdd, 0x76, 0x87, 0x14, 0x9b,
+	0x1d, 0xb7, 0xdf, 0x2a, 0x52, 0xd2, 0xec, 0x7b, 0x36, 0x3b, 0x6d, 0x12, 0x87, 0x11, 0xaf, 0x78,
+	0xb2, 0x72, 0x48, 0x98, 0xb5, 0x12, 0xea, 0x6e, 0x50, 0xe2, 0x9d, 0xd8, 0x4d, 0x52, 0xe8, 0x79,
+	0x2e, 0x73, 0xf1, 0x57, 0xe4, 0x0a, 0x05, 0xb1, 0x42, 0x21, 0x38, 0xb5, 0xa0, 0x56, 0x30, 0x6e,
+	0xa8, 0x6d, 0xac, 0x9e, 0x5d, 0xb4, 0x1c, 0xc7, 0x65, 0x16, 0xb3, 0x5d, 0x87, 0xca, 0x25, 0x8c,
+	0x62, 0x1c, 0x10, 0x16, 0xa5, 0x84, 0x29, 0x81, 0x95, 0x38, 0x02, 0x47, 0xb6, 0xd3, 0xb2, 0x9d,
+	0xb6, 0x12, 0x79, 0x10, 0x47, 0xc4, 0xf5, 0xda, 0x96, 0x63, 0x3f, 0x13, 0xe0, 0x1a, 0x94, 0x30,
+	0x66, 0x3b, 0x6d, 0x0d, 0x72, 0x35, 0x89, 0xa6, 0x1a, 0x5d, 0xcb, 0x3b, 0xd6, 0x92, 0xb7, 0x63,
+	0x49, 0xba, 0x7d, 0x4f, 0xeb, 0xd4, 0x78, 0x53, 0x49, 0xd8, 0x56, 0xb7, 0x78, 0xb2, 0xc2, 0xff,
+	0x34, 0x7a, 0x6e, 0xc7, 0x6e, 0x9e, 0xaa, 0x71, 0x23, 0x38, 0x1e, 0x18, 0x53, 0xf6, 0x28, 0x76,
+	0x5c, 0xa7, 0xed, 0xf5, 0x1d, 0xc7, 0x76, 0xda, 0x45, 0xb7, 0x47, 0xbc, 0x80, 0xc6, 0xf5, 0x06,
+	0xa2, 0x75, 0xd8, 0x3f, 0x2a, 0xb6, 0xfa, 0x72, 0x82, 0x1a, 0x7f, 0x3d, 0x3c, 0x4e, 0xba, 0x3d,
+	0xa6, 0x77, 0x58, 0x0a, 0x0f, 0x1e, 0xd9, 0xa4, 0xd3, 0x6a, 0x74, 0x2d, 0x7a, 0xac, 0x66, 0xdc,
+	0x08, 0xcf, 0xa0, 0xcc, 0xeb, 0x37, 0xb5, 0xf5, 0xbe, 0x14, 0x1e, 0x65, 0x76, 0x97, 0x50, 0x66,
+	0x75, 0x7b, 0x72, 0x82, 0xf9, 0x63, 0x04, 0x8b, 0xeb, 0x1e, 0xb1, 0x18, 0xd9, 0x90, 0x36, 0xac,
+	0x91, 0xef, 0xf4, 0x09, 0x65, 0xf8, 0x3a, 0xcc, 0xf4, 0x2c, 0x8f, 0x38, 0x2c, 0x8f, 0x96, 0xd0,
+	0x72, 0xa6, 0xa6, 0x5a, 0xf8, 0x0d, 0x00, 0x65, 0xed, 0x86, 0xdd, 0xca, 0xa7, 0xc4, 0x58, 0x46,
+	0xf5, 0x6c, 0xb7, 0xf0, 0x06, 0xcc, 0xaa, 0x46, 0x7e, 0x6a, 0x09, 0x2d, 0x67, 0x4b, 0xef, 0x14,
+	0x62, 0x38, 0x6d, 0x41, 0x6f, 0xae, 0x85, 0x4d, 0x0f, 0x16, 0x24, 0xac, 0xba, 0x30, 0xd6, 0x38,
+	0x54, 0xeb, 0x30, 0x23, 0xad, 0x2a, 0x10, 0x65, 0x4b, 0x6f, 0xc7, 0xda, 0x55, 0xad, 0xad, 0x44,
+	0xcd, 0xf7, 0xe0, 0xcd, 0x4d, 0xc2, 0x1e, 0xfb, 0x1c, 0xb3, 0xae, 0xfc, 0x52, 0x6f, 0x8f, 0x61,
+	0xda, 0xb1, 0xba, 0x44, 0x6d, 0x2e, 0x7e, 0x9b, 0x6f, 0x41, 0x6e, 0x93, 0xb0, 0x20, 0xcc, 0xa8,
+	0x79, 0x3f, 0x4d, 0x01, 0xde, 0xf4, 0xdc, 0x7e, 0xef, 0x21, 0x8f, 0x2e, 0x3a, 0x8e, 0xd1, 0x75,
+	0x98, 0x39, 0xb2, 0x3b, 0x8c, 0x78, 0x4a, 0xc7, 0xaa, 0x85, 0x5f, 0x83, 0xb9, 0x36, 0x5f, 0xa5,
+	0x71, 0x78, 0x2a, 0x34, 0x9c, 0xa9, 0xcd, 0x8a, 0xf6, 0xa3, 0x53, 0x5c, 0x81, 0x5c, 0xd3, 0xed,
+	0x72, 0xf9, 0x86, 0xf6, 0xb1, 0xfc, 0xb4, 0x50, 0xc7, 0x6b, 0x5a, 0x1d, 0xda, 0x0f, 0x0a, 0x15,
+	0x35, 0xa1, 0x76, 0x45, 0x89, 0xe8, 0x0e, 0x7c, 0x07, 0x32, 0x1e, 0xb1, 0x5a, 0x0d, 0xee, 0x29,
+	0xf9, 0xb4, 0x10, 0x37, 0x86, 0xc4, 0xf7, 0xb5, 0x1b, 0xd5, 0xe6, 0xf8, 0x64, 0xde, 0xe4, 0x9e,
+	0xd1, 0xb3, 0xda, 0xa4, 0xc1, 0xdc, 0x63, 0xe2, 0xe4, 0x67, 0xa5, 0x67, 0xf0, 0x9e, 0x7d, 0xde,
+	0x81, 0x5f, 0x07, 0xd1, 0x68, 0x50, 0xfb, 0x19, 0xc9, 0xcf, 0x2d, 0xa1, 0xe5, 0x74, 0x6d, 0x8e,
+	0x77, 0xd4, 0xed, 0x67, 0xc4, 0xfc, 0x2b, 0x82, 0x85, 0x80, 0x72, 0x68, 0xcf, 0x75, 0x28, 0xc1,
+	0x4f, 0x21, 0xa7, 0xd9, 0x36, 0x3c, 0x42, 0xfb, 0x1d, 0x46, 0xf3, 0x68, 0x69, 0x6a, 0x39, 0x5b,
+	0xba, 0x1d, 0xcb, 0xc2, 0x62, 0xcd, 0x9a, 0x10, 0xac, 0x5d, 0x56, 0x7a, 0x92, 0x4d, 0x1a, 0x24,
+	0x9a, 0x4a, 0x40, 0xf4, 0x2d, 0xb8, 0xe2, 0x90, 0x8f, 0x59, 0xc3, 0xc7, 0x56, 0x5a, 0x62, 0x9e,
+	0x77, 0xef, 0x69, 0xc6, 0xe6, 0xdf, 0x11, 0x2c, 0x0a, 0x00, 0xca, 0xbb, 0x2f, 0xc2, 0xe6, 0x01,
+	0x12, 0xd3, 0xe7, 0xb6, 0x56, 0x7a, 0xa4, 0xb5, 0x66, 0x42, 0xd6, 0x7a, 0x81, 0xe0, 0x5a, 0x88,
+	0xd8, 0xff, 0x83, 0xbd, 0xfe, 0x89, 0x20, 0xeb, 0x03, 0x80, 0xbf, 0x05, 0xd0, 0xf3, 0xf8, 0x79,
+	0xce, 0x6c, 0xa2, 0x69, 0xac, 0x25, 0xa5, 0x51, 0xd8, 0x1b, 0x2c, 0x51, 0x75, 0x98, 0x77, 0x5a,
+	0xf3, 0xad, 0x89, 0x17, 0x21, 0xdd, 0x74, 0xfb, 0x0e, 0x13, 0x74, 0xa6, 0x6a, 0xb2, 0x61, 0x1c,
+	0xc0, 0x95, 0x90, 0x10, 0xce, 0xc1, 0xd4, 0x31, 0x39, 0x55, 0xee, 0xc2, 0x7f, 0xe2, 0x77, 0x20,
+	0x7d, 0x62, 0x75, 0xfa, 0x5a, 0x13, 0xd7, 0x87, 0x34, 0xf1, 0x84, 0x8f, 0xd6, 0xe4, 0xa4, 0x72,
+	0x6a, 0x15, 0x99, 0xdf, 0x06, 0xfc, 0x0d, 0x9b, 0xaa, 0x93, 0x8a, 0xc6, 0x38, 0xe7, 0x7d, 0xfa,
+	0x4a, 0x8d, 0xf4, 0x8f, 0xd9, 0x90, 0x7f, 0xfc, 0x10, 0xc1, 0x42, 0x60, 0x2b, 0xe5, 0x1d, 0x55,
+	0x98, 0x95, 0x47, 0xad, 0xd6, 0x66, 0xa2, 0x63, 0x5a, 0xcb, 0x46, 0xd9, 0x33, 0x15, 0x65, 0xcf,
+	0x17, 0x29, 0xb8, 0xca, 0x61, 0x4c, 0x7c, 0xe0, 0xba, 0x5e, 0x8b, 0x78, 0xbe, 0xe0, 0x13, 0xed,
+	0x49, 0x82, 0x2f, 0xea, 0xa4, 0x4e, 0x27, 0x3e, 0xa9, 0xef, 0xf2, 0xab, 0x58, 0xa7, 0x03, 0xc2,
+	0x08, 0x51, 0xfb, 0x6f, 0xf0, 0x29, 0x3b, 0x16, 0x3d, 0xe6, 0xd7, 0xb4, 0xfa, 0x19, 0xb2, 0xee,
+	0xdc, 0x48, 0xeb, 0x66, 0x42, 0xd6, 0xfd, 0x6c, 0x5a, 0x3a, 0x52, 0xe8, 0xa8, 0xfe, 0x18, 0x16,
+	0x3a, 0x36, 0x65, 0x0d, 0x91, 0x3c, 0xd2, 0x50, 0xf4, 0x6f, 0xc5, 0x32, 0xf4, 0xf0, 0xaa, 0xc1,
+	0x2e, 0x7e, 0x2a, 0x5c, 0xed, 0x84, 0x7a, 0x2e, 0xfe, 0x60, 0xe0, 0xda, 0x62, 0x2e, 0xb3, 0x3a,
+	0x52, 0x1f, 0xd3, 0x42, 0x1f, 0x19, 0xd1, 0xc3, 0x15, 0x62, 0x7c, 0x92, 0x82, 0x5c, 0x18, 0x27,
+	0x5e, 0x83, 0xb4, 0xd0, 0x84, 0xf0, 0xb2, 0x6c, 0xe9, 0x56, 0x2c, 0x05, 0x88, 0x15, 0x6a, 0x52,
+	0x10, 0xb7, 0x20, 0x4d, 0x99, 0xc5, 0x24, 0xa5, 0xcb, 0xa5, 0xdd, 0x57, 0xa5, 0xc2, 0x42, 0x9d,
+	0xaf, 0x5a, 0x93, 0x8b, 0x9b, 0xbb, 0x90, 0x16, 0x6d, 0x7c, 0x0d, 0xae, 0xd6, 0xf7, 0x1f, 0xee,
+	0x57, 0x1b, 0x07, 0xbb, 0xf5, 0xbd, 0xea, 0xfa, 0xf6, 0xc6, 0x76, 0xb5, 0x92, 0xfb, 0x02, 0x06,
+	0x98, 0x39, 0xd8, 0x3d, 0xa8, 0x57, 0x2b, 0x39, 0x84, 0x33, 0x90, 0x7e, 0x58, 0xa9, 0x54, 0x2b,
+	0xb9, 0x14, 0xce, 0xc2, 0x6c, 0xad, 0xba, 0xf3, 0xf8, 0x49, 0xb5, 0x92, 0x9b, 0xe2, 0x73, 0x1e,
+	0xae, 0xef, 0x6f, 0x3f, 0xa9, 0xe6, 0xa6, 0xcd, 0x4f, 0x53, 0x32, 0xf6, 0x5f, 0xc1, 0x9d, 0xf7,
+	0xca, 0xc3, 0x2e, 0x18, 0x30, 0xe9, 0xf3, 0x07, 0xcc, 0x4c, 0xa2, 0xe3, 0xf0, 0x5f, 0x08, 0x16,
+	0x83, 0x2a, 0x51, 0x21, 0xb3, 0x05, 0x73, 0x2a, 0xdf, 0xd5, 0x71, 0x92, 0x2c, 0x5b, 0x1e, 0x48,
+	0xff, 0xaf, 0x43, 0xc0, 0xfc, 0x25, 0x82, 0xeb, 0x75, 0xa2, 0x19, 0x4a, 0x07, 0x7b, 0x79, 0x2e,
+	0x8c, 0xb7, 0x82, 0xae, 0x5d, 0x4a, 0xc2, 0x3a, 0xe0, 0xbe, 0xdc, 0xa4, 0x94, 0x59, 0x1e, 0x93,
+	0xcc, 0xa7, 0xc6, 0x32, 0xcf, 0x88, 0xd9, 0xbc, 0x6d, 0x96, 0x20, 0x5f, 0xeb, 0x3b, 0x22, 0x32,
+	0x2a, 0x36, 0x6d, 0xba, 0x27, 0xc4, 0x3b, 0x1d, 0xe3, 0xad, 0xe6, 0x67, 0x08, 0x16, 0x0f, 0x7a,
+	0xad, 0xe1, 0x72, 0xc9, 0x57, 0xf7, 0xa0, 0x09, 0xea, 0x1e, 0x7c, 0x0f, 0xb2, 0x7d, 0xb1, 0xbe,
+	0xf4, 0xd1, 0xd4, 0x58, 0x1f, 0x05, 0x39, 0x9d, 0xff, 0x36, 0x3f, 0x47, 0xf0, 0x65, 0x89, 0x6e,
+	0x54, 0x11, 0xe3, 0xc0, 0xb5, 0xc8, 0xe2, 0x5b, 0x01, 0xbf, 0x1b, 0x0b, 0x78, 0xe4, 0x06, 0x8b,
+	0x6e, 0x44, 0xef, 0x64, 0x94, 0x7e, 0x82, 0x60, 0x41, 0x52, 0x0a, 0x56, 0x58, 0x67, 0x05, 0x1f,
+	0x3a, 0x77, 0xc1, 0x37, 0x19, 0xb2, 0xff, 0x20, 0x30, 0x14, 0x32, 0xb5, 0xd9, 0x8e, 0xe5, 0x1d,
+	0x0f, 0xb4, 0xfc, 0x4d, 0xb8, 0x1c, 0x7c, 0xa1, 0x50, 0x40, 0xe3, 0xf9, 0x7a, 0x70, 0xc9, 0x79,
+	0xea, 0x6f, 0x4e, 0x04, 0x7b, 0x82, 0x80, 0x29, 0x7d, 0xff, 0x06, 0x5c, 0xd6, 0xc0, 0xd6, 0x05,
+	0x5e, 0xfc, 0x0b, 0x04, 0x97, 0xfc, 0x75, 0x3a, 0x5e, 0x8d, 0x45, 0x2f, 0xa2, 0xb4, 0x37, 0x92,
+	0x58, 0xd0, 0xbc, 0xfb, 0x83, 0xbf, 0xfd, 0xfb, 0x47, 0xa9, 0x77, 0xcd, 0x9b, 0x83, 0x47, 0x9d,
+	0xef, 0xca, 0x08, 0xbd, 0xef, 0x77, 0x41, 0x5a, 0xbc, 0xf5, 0x5c, 0xbd, 0xf6, 0xd0, 0xb2, 0x36,
+	0xfa, 0xef, 0x11, 0xcc, 0x07, 0x5e, 0x3c, 0xf0, 0xdd, 0x04, 0x98, 0x83, 0x61, 0x6f, 0x24, 0x8a,
+	0x72, 0xb3, 0x2a, 0x50, 0x3f, 0x30, 0xdf, 0x1b, 0x87, 0x5a, 0x83, 0xe6, 0xf8, 0xf5, 0x19, 0x5f,
+	0x1e, 0x9c, 0x11, 0x9f, 0x22, 0xb8, 0xb4, 0x49, 0xd8, 0xb6, 0xd5, 0xdd, 0x13, 0xaf, 0x51, 0xd8,
+	0xd4, 0x28, 0x6c, 0xab, 0x5b, 0x38, 0x59, 0x29, 0xf8, 0x07, 0x35, 0xd2, 0x6b, 0xa1, 0x39, 0x72,
+	0x74, 0x00, 0xa9, 0x7c, 0x06, 0xc9, 0x23, 0x72, 0xf7, 0x11, 0xa0, 0xca, 0x6d, 0xdf, 0x0e, 0x65,
+	0x74, 0x0b, 0xff, 0x03, 0xc1, 0x17, 0x5f, 0xf2, 0x76, 0x82, 0xd7, 0xe3, 0x95, 0x4c, 0x23, 0x5f,
+	0x5e, 0x8c, 0xf3, 0x9f, 0x4a, 0xe6, 0x87, 0x82, 0xe2, 0x07, 0xd8, 0xa7, 0x75, 0x7e, 0x09, 0x0d,
+	0xd1, 0x8b, 0x3a, 0xbc, 0x9e, 0xe3, 0x9f, 0x21, 0xc8, 0x0c, 0xde, 0x77, 0xf0, 0xfb, 0x71, 0xb9,
+	0x4c, 0xe0, 0xdb, 0x2b, 0x02, 0xef, 0xdb, 0xf8, 0xe6, 0x18, 0xbc, 0x67, 0xe6, 0xc0, 0xbf, 0xd5,
+	0x95, 0xab, 0xcc, 0xf3, 0xf0, 0x9d, 0xf8, 0x55, 0x6a, 0xa0, 0x38, 0x32, 0x56, 0x93, 0x0b, 0xca,
+	0x5c, 0x66, 0x10, 0x91, 0x85, 0xf1, 0x11, 0x29, 0x2b, 0x84, 0xb2, 0x28, 0xef, 0xb9, 0xf3, 0xfc,
+	0x05, 0xc1, 0x7c, 0xe0, 0x39, 0x21, 0x66, 0x44, 0x46, 0xbd, 0xad, 0x18, 0xe5, 0xf3, 0x88, 0x2a,
+	0x0e, 0x11, 0xc1, 0x90, 0x20, 0x3e, 0x07, 0x7c, 0x7e, 0x8e, 0x00, 0xce, 0x92, 0x6e, 0xfc, 0x41,
+	0xe2, 0xc4, 0x5d, 0x32, 0xb9, 0x73, 0xce, 0x84, 0xdf, 0xbc, 0x2d, 0x68, 0xdc, 0xc2, 0xcb, 0x71,
+	0x4d, 0x81, 0xff, 0x80, 0xe0, 0x92, 0x3f, 0x43, 0x8d, 0x79, 0x8c, 0x47, 0xe4, 0xf9, 0x31, 0x03,
+	0x35, 0x2a, 0x1d, 0x8e, 0x0a, 0xd4, 0xf8, 0xea, 0xc7, 0xbf, 0x42, 0x90, 0xf5, 0x3d, 0x3a, 0xe0,
+	0xf8, 0xea, 0x0b, 0xbe, 0x88, 0x18, 0xab, 0xc9, 0x05, 0x15, 0x81, 0x88, 0xc8, 0x1d, 0x73, 0x2b,
+	0x71, 0xd4, 0x57, 0x87, 0xb2, 0x50, 0x7c, 0x3f, 0x16, 0x84, 0x97, 0x65, 0xaf, 0xc6, 0x1b, 0x5a,
+	0xdc, 0xf7, 0x61, 0xa2, 0xf0, 0x58, 0x7f, 0x98, 0x30, 0xd7, 0x04, 0xcc, 0xb2, 0xf9, 0x7e, 0xec,
+	0x50, 0xf5, 0xfa, 0xce, 0x60, 0x13, 0xee, 0xe1, 0x7f, 0x42, 0x70, 0x25, 0x94, 0xee, 0xe3, 0x7b,
+	0x31, 0x13, 0x9b, 0xa8, 0x22, 0x21, 0xe1, 0x3d, 0xba, 0x25, 0x08, 0x3c, 0x32, 0xef, 0xc7, 0x3d,
+	0x21, 0x07, 0x5e, 0xc2, 0xef, 0x2e, 0x4a, 0x98, 0xd8, 0x9b, 0x13, 0xe1, 0x57, 0x69, 0x7d, 0xd4,
+	0x55, 0x5a, 0xbf, 0xf0, 0xab, 0x94, 0x86, 0xae, 0xd2, 0x5f, 0x23, 0xc0, 0xfb, 0x84, 0x8a, 0x4e,
+	0xe2, 0x75, 0x6d, 0x4a, 0xb9, 0x0c, 0x5e, 0x0e, 0x6d, 0x3a, 0x3c, 0x45, 0xc3, 0xbb, 0x19, 0x63,
+	0xa6, 0x72, 0xd8, 0xaf, 0x0b, 0xc8, 0x55, 0x73, 0x2d, 0x19, 0x64, 0x36, 0xb4, 0x22, 0x07, 0xfe,
+	0x67, 0x04, 0xf3, 0x81, 0xda, 0x28, 0xe6, 0x31, 0x1e, 0x55, 0x4f, 0x25, 0x74, 0x88, 0x1d, 0xc1,
+	0x63, 0xb3, 0xf4, 0xe1, 0x19, 0x0f, 0xfd, 0x49, 0x32, 0x81, 0x63, 0x0c, 0x12, 0xac, 0x4f, 0x52,
+	0x3a, 0xb5, 0x8f, 0x4c, 0x68, 0x36, 0x12, 0xd0, 0xba, 0xa0, 0x9c, 0xc6, 0x16, 0x84, 0x9b, 0xa5,
+	0xaf, 0x9d, 0x11, 0x8e, 0xfe, 0xa0, 0x1a, 0x3f, 0xd3, 0x29, 0x47, 0x57, 0x85, 0xf8, 0x37, 0x08,
+	0x2e, 0xf9, 0x2b, 0xb0, 0x98, 0x77, 0x43, 0x44, 0xd1, 0x96, 0x2c, 0x0d, 0x52, 0xa7, 0x54, 0xe9,
+	0xf6, 0x19, 0x45, 0xf5, 0xe1, 0x76, 0x4c, 0x36, 0x34, 0xc8, 0xf4, 0x3f, 0x4f, 0x0d, 0x6a, 0xc7,
+	0x40, 0xfd, 0xf4, 0x20, 0x09, 0x81, 0x88, 0xda, 0xce, 0x38, 0x47, 0x0d, 0x67, 0xfe, 0x11, 0x09,
+	0x3e, 0xbf, 0x43, 0xa5, 0xaa, 0x8f, 0x50, 0xf0, 0x1b, 0x76, 0x24, 0x31, 0x79, 0x04, 0x73, 0x86,
+	0xfe, 0xf5, 0x9e, 0x97, 0x43, 0xe5, 0xe5, 0xd3, 0x66, 0xe9, 0xa3, 0x64, 0x0b, 0x47, 0x05, 0xc1,
+	0x98, 0x4d, 0x1e, 0x7d, 0x0f, 0xbe, 0xda, 0x74, 0xbb, 0x71, 0xe8, 0xef, 0xa1, 0xa7, 0x1f, 0xa9,
+	0x69, 0x6d, 0xb7, 0x63, 0x39, 0xed, 0x82, 0xeb, 0xb5, 0x8b, 0x6d, 0xe2, 0x88, 0x1a, 0x53, 0xfd,
+	0x1b, 0x82, 0xd5, 0xb3, 0xe9, 0xc8, 0x6f, 0xf5, 0xf7, 0x82, 0xdd, 0x87, 0x33, 0x42, 0xfa, 0xdd,
+	0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x70, 0x64, 0x0e, 0x6a, 0x4c, 0x21, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2369,130 +2520,3 @@ var _SecurityCenter_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/securitycenter/v1beta1/securitycenter_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1beta1/securitycenter_service.proto", fileDescriptor_securitycenter_service_32527bc15746ec09)
-}
-
-var fileDescriptor_securitycenter_service_32527bc15746ec09 = []byte{
-	// 1902 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xdb, 0x6f, 0x1b, 0x59,
-	0x19, 0xe7, 0x38, 0x71, 0x12, 0x7f, 0x6e, 0x5a, 0xf7, 0x24, 0x2d, 0xde, 0xd9, 0xee, 0x12, 0x06,
-	0x69, 0x49, 0xbb, 0x2b, 0xbb, 0xf1, 0x5e, 0x9a, 0xba, 0x5b, 0x35, 0x6d, 0xec, 0x5c, 0x80, 0xa4,
-	0x59, 0x3b, 0xa9, 0x44, 0x5f, 0xcc, 0xc4, 0x3e, 0x31, 0xa3, 0xd8, 0x33, 0x66, 0xce, 0x71, 0xb4,
-	0x29, 0x2a, 0x42, 0x88, 0xa7, 0x7d, 0x5a, 0x09, 0x21, 0x24, 0xf6, 0x8d, 0x7f, 0x00, 0x10, 0x12,
-	0x3c, 0x80, 0x84, 0x10, 0x12, 0x3c, 0x21, 0xad, 0xa0, 0x82, 0x17, 0x1e, 0x78, 0xe0, 0x9d, 0x7f,
-	0x01, 0x9d, 0x9b, 0x33, 0x33, 0x9e, 0xda, 0x33, 0x71, 0x23, 0x24, 0x9e, 0xe2, 0x73, 0xf9, 0xce,
-	0xf9, 0xfd, 0xbe, 0xcb, 0x39, 0xdf, 0x77, 0x26, 0xb0, 0xd6, 0x76, 0xdd, 0x76, 0x87, 0x14, 0x9b,
-	0x1d, 0xb7, 0xdf, 0x2a, 0x52, 0xd2, 0xec, 0x7b, 0x36, 0x3b, 0x6d, 0x12, 0x87, 0x11, 0xaf, 0x78,
-	0xb2, 0x72, 0x48, 0x98, 0xb5, 0x12, 0xea, 0x6e, 0x50, 0xe2, 0x9d, 0xd8, 0x4d, 0x52, 0xe8, 0x79,
-	0x2e, 0x73, 0xf1, 0x57, 0xe4, 0x0a, 0x05, 0xb1, 0x42, 0x21, 0x38, 0xb5, 0xa0, 0x56, 0x30, 0x6e,
-	0xa8, 0x6d, 0xac, 0x9e, 0x5d, 0xb4, 0x1c, 0xc7, 0x65, 0x16, 0xb3, 0x5d, 0x87, 0xca, 0x25, 0x8c,
-	0x62, 0x1c, 0x10, 0x16, 0xa5, 0x84, 0x29, 0x81, 0x95, 0x38, 0x02, 0x47, 0xb6, 0xd3, 0xb2, 0x9d,
-	0xb6, 0x12, 0x79, 0x10, 0x47, 0xc4, 0xf5, 0xda, 0x96, 0x63, 0x3f, 0x13, 0xe0, 0x1a, 0x94, 0x30,
-	0x66, 0x3b, 0x6d, 0x0d, 0x72, 0x35, 0x89, 0xa6, 0x1a, 0x5d, 0xcb, 0x3b, 0xd6, 0x92, 0xb7, 0x63,
-	0x49, 0xba, 0x7d, 0x4f, 0xeb, 0xd4, 0x78, 0x53, 0x49, 0xd8, 0x56, 0xb7, 0x78, 0xb2, 0xc2, 0xff,
-	0x34, 0x7a, 0x6e, 0xc7, 0x6e, 0x9e, 0xaa, 0x71, 0x23, 0x38, 0x1e, 0x18, 0x53, 0xf6, 0x28, 0x76,
-	0x5c, 0xa7, 0xed, 0xf5, 0x1d, 0xc7, 0x76, 0xda, 0x45, 0xb7, 0x47, 0xbc, 0x80, 0xc6, 0xf5, 0x06,
-	0xa2, 0x75, 0xd8, 0x3f, 0x2a, 0xb6, 0xfa, 0x72, 0x82, 0x1a, 0x7f, 0x3d, 0x3c, 0x4e, 0xba, 0x3d,
-	0xa6, 0x77, 0x58, 0x0a, 0x0f, 0x1e, 0xd9, 0xa4, 0xd3, 0x6a, 0x74, 0x2d, 0x7a, 0xac, 0x66, 0xdc,
-	0x08, 0xcf, 0xa0, 0xcc, 0xeb, 0x37, 0xb5, 0xf5, 0xbe, 0x14, 0x1e, 0x65, 0x76, 0x97, 0x50, 0x66,
-	0x75, 0x7b, 0x72, 0x82, 0xf9, 0x63, 0x04, 0x8b, 0xeb, 0x1e, 0xb1, 0x18, 0xd9, 0x90, 0x36, 0xac,
-	0x91, 0xef, 0xf4, 0x09, 0x65, 0xf8, 0x3a, 0xcc, 0xf4, 0x2c, 0x8f, 0x38, 0x2c, 0x8f, 0x96, 0xd0,
-	0x72, 0xa6, 0xa6, 0x5a, 0xf8, 0x0d, 0x00, 0x65, 0xed, 0x86, 0xdd, 0xca, 0xa7, 0xc4, 0x58, 0x46,
-	0xf5, 0x6c, 0xb7, 0xf0, 0x06, 0xcc, 0xaa, 0x46, 0x7e, 0x6a, 0x09, 0x2d, 0x67, 0x4b, 0xef, 0x14,
-	0x62, 0x38, 0x6d, 0x41, 0x6f, 0xae, 0x85, 0x4d, 0x0f, 0x16, 0x24, 0xac, 0xba, 0x30, 0xd6, 0x38,
-	0x54, 0xeb, 0x30, 0x23, 0xad, 0x2a, 0x10, 0x65, 0x4b, 0x6f, 0xc7, 0xda, 0x55, 0xad, 0xad, 0x44,
-	0xcd, 0xf7, 0xe0, 0xcd, 0x4d, 0xc2, 0x1e, 0xfb, 0x1c, 0xb3, 0xae, 0xfc, 0x52, 0x6f, 0x8f, 0x61,
-	0xda, 0xb1, 0xba, 0x44, 0x6d, 0x2e, 0x7e, 0x9b, 0x6f, 0x41, 0x6e, 0x93, 0xb0, 0x20, 0xcc, 0xa8,
-	0x79, 0x3f, 0x4d, 0x01, 0xde, 0xf4, 0xdc, 0x7e, 0xef, 0x21, 0x8f, 0x2e, 0x3a, 0x8e, 0xd1, 0x75,
-	0x98, 0x39, 0xb2, 0x3b, 0x8c, 0x78, 0x4a, 0xc7, 0xaa, 0x85, 0x5f, 0x83, 0xb9, 0x36, 0x5f, 0xa5,
-	0x71, 0x78, 0x2a, 0x34, 0x9c, 0xa9, 0xcd, 0x8a, 0xf6, 0xa3, 0x53, 0x5c, 0x81, 0x5c, 0xd3, 0xed,
-	0x72, 0xf9, 0x86, 0xf6, 0xb1, 0xfc, 0xb4, 0x50, 0xc7, 0x6b, 0x5a, 0x1d, 0xda, 0x0f, 0x0a, 0x15,
-	0x35, 0xa1, 0x76, 0x45, 0x89, 0xe8, 0x0e, 0x7c, 0x07, 0x32, 0x1e, 0xb1, 0x5a, 0x0d, 0xee, 0x29,
-	0xf9, 0xb4, 0x10, 0x37, 0x86, 0xc4, 0xf7, 0xb5, 0x1b, 0xd5, 0xe6, 0xf8, 0x64, 0xde, 0xe4, 0x9e,
-	0xd1, 0xb3, 0xda, 0xa4, 0xc1, 0xdc, 0x63, 0xe2, 0xe4, 0x67, 0xa5, 0x67, 0xf0, 0x9e, 0x7d, 0xde,
-	0x81, 0x5f, 0x07, 0xd1, 0x68, 0x50, 0xfb, 0x19, 0xc9, 0xcf, 0x2d, 0xa1, 0xe5, 0x74, 0x6d, 0x8e,
-	0x77, 0xd4, 0xed, 0x67, 0xc4, 0xfc, 0x2b, 0x82, 0x85, 0x80, 0x72, 0x68, 0xcf, 0x75, 0x28, 0xc1,
-	0x4f, 0x21, 0xa7, 0xd9, 0x36, 0x3c, 0x42, 0xfb, 0x1d, 0x46, 0xf3, 0x68, 0x69, 0x6a, 0x39, 0x5b,
-	0xba, 0x1d, 0xcb, 0xc2, 0x62, 0xcd, 0x9a, 0x10, 0xac, 0x5d, 0x56, 0x7a, 0x92, 0x4d, 0x1a, 0x24,
-	0x9a, 0x4a, 0x40, 0xf4, 0x2d, 0xb8, 0xe2, 0x90, 0x8f, 0x59, 0xc3, 0xc7, 0x56, 0x5a, 0x62, 0x9e,
-	0x77, 0xef, 0x69, 0xc6, 0xe6, 0xdf, 0x11, 0x2c, 0x0a, 0x00, 0xca, 0xbb, 0x2f, 0xc2, 0xe6, 0x01,
-	0x12, 0xd3, 0xe7, 0xb6, 0x56, 0x7a, 0xa4, 0xb5, 0x66, 0x42, 0xd6, 0x7a, 0x81, 0xe0, 0x5a, 0x88,
-	0xd8, 0xff, 0x83, 0xbd, 0xfe, 0x89, 0x20, 0xeb, 0x03, 0x80, 0xbf, 0x05, 0xd0, 0xf3, 0xf8, 0x79,
-	0xce, 0x6c, 0xa2, 0x69, 0xac, 0x25, 0xa5, 0x51, 0xd8, 0x1b, 0x2c, 0x51, 0x75, 0x98, 0x77, 0x5a,
-	0xf3, 0xad, 0x89, 0x17, 0x21, 0xdd, 0x74, 0xfb, 0x0e, 0x13, 0x74, 0xa6, 0x6a, 0xb2, 0x61, 0x1c,
-	0xc0, 0x95, 0x90, 0x10, 0xce, 0xc1, 0xd4, 0x31, 0x39, 0x55, 0xee, 0xc2, 0x7f, 0xe2, 0x77, 0x20,
-	0x7d, 0x62, 0x75, 0xfa, 0x5a, 0x13, 0xd7, 0x87, 0x34, 0xf1, 0x84, 0x8f, 0xd6, 0xe4, 0xa4, 0x72,
-	0x6a, 0x15, 0x99, 0xdf, 0x06, 0xfc, 0x0d, 0x9b, 0xaa, 0x93, 0x8a, 0xc6, 0x38, 0xe7, 0x7d, 0xfa,
-	0x4a, 0x8d, 0xf4, 0x8f, 0xd9, 0x90, 0x7f, 0xfc, 0x10, 0xc1, 0x42, 0x60, 0x2b, 0xe5, 0x1d, 0x55,
-	0x98, 0x95, 0x47, 0xad, 0xd6, 0x66, 0xa2, 0x63, 0x5a, 0xcb, 0x46, 0xd9, 0x33, 0x15, 0x65, 0xcf,
-	0x17, 0x29, 0xb8, 0xca, 0x61, 0x4c, 0x7c, 0xe0, 0xba, 0x5e, 0x8b, 0x78, 0xbe, 0xe0, 0x13, 0xed,
-	0x49, 0x82, 0x2f, 0xea, 0xa4, 0x4e, 0x27, 0x3e, 0xa9, 0xef, 0xf2, 0xab, 0x58, 0xa7, 0x03, 0xc2,
-	0x08, 0x51, 0xfb, 0x6f, 0xf0, 0x29, 0x3b, 0x16, 0x3d, 0xe6, 0xd7, 0xb4, 0xfa, 0x19, 0xb2, 0xee,
-	0xdc, 0x48, 0xeb, 0x66, 0x42, 0xd6, 0xfd, 0x6c, 0x5a, 0x3a, 0x52, 0xe8, 0xa8, 0xfe, 0x18, 0x16,
-	0x3a, 0x36, 0x65, 0x0d, 0x91, 0x3c, 0xd2, 0x50, 0xf4, 0x6f, 0xc5, 0x32, 0xf4, 0xf0, 0xaa, 0xc1,
-	0x2e, 0x7e, 0x2a, 0x5c, 0xed, 0x84, 0x7a, 0x2e, 0xfe, 0x60, 0xe0, 0xda, 0x62, 0x2e, 0xb3, 0x3a,
-	0x52, 0x1f, 0xd3, 0x42, 0x1f, 0x19, 0xd1, 0xc3, 0x15, 0x62, 0x7c, 0x92, 0x82, 0x5c, 0x18, 0x27,
-	0x5e, 0x83, 0xb4, 0xd0, 0x84, 0xf0, 0xb2, 0x6c, 0xe9, 0x56, 0x2c, 0x05, 0x88, 0x15, 0x6a, 0x52,
-	0x10, 0xb7, 0x20, 0x4d, 0x99, 0xc5, 0x24, 0xa5, 0xcb, 0xa5, 0xdd, 0x57, 0xa5, 0xc2, 0x42, 0x9d,
-	0xaf, 0x5a, 0x93, 0x8b, 0x9b, 0xbb, 0x90, 0x16, 0x6d, 0x7c, 0x0d, 0xae, 0xd6, 0xf7, 0x1f, 0xee,
-	0x57, 0x1b, 0x07, 0xbb, 0xf5, 0xbd, 0xea, 0xfa, 0xf6, 0xc6, 0x76, 0xb5, 0x92, 0xfb, 0x02, 0x06,
-	0x98, 0x39, 0xd8, 0x3d, 0xa8, 0x57, 0x2b, 0x39, 0x84, 0x33, 0x90, 0x7e, 0x58, 0xa9, 0x54, 0x2b,
-	0xb9, 0x14, 0xce, 0xc2, 0x6c, 0xad, 0xba, 0xf3, 0xf8, 0x49, 0xb5, 0x92, 0x9b, 0xe2, 0x73, 0x1e,
-	0xae, 0xef, 0x6f, 0x3f, 0xa9, 0xe6, 0xa6, 0xcd, 0x4f, 0x53, 0x32, 0xf6, 0x5f, 0xc1, 0x9d, 0xf7,
-	0xca, 0xc3, 0x2e, 0x18, 0x30, 0xe9, 0xf3, 0x07, 0xcc, 0x4c, 0xa2, 0xe3, 0xf0, 0x5f, 0x08, 0x16,
-	0x83, 0x2a, 0x51, 0x21, 0xb3, 0x05, 0x73, 0x2a, 0xdf, 0xd5, 0x71, 0x92, 0x2c, 0x5b, 0x1e, 0x48,
-	0xff, 0xaf, 0x43, 0xc0, 0xfc, 0x25, 0x82, 0xeb, 0x75, 0xa2, 0x19, 0x4a, 0x07, 0x7b, 0x79, 0x2e,
-	0x8c, 0xb7, 0x82, 0xae, 0x5d, 0x4a, 0xc2, 0x3a, 0xe0, 0xbe, 0xdc, 0xa4, 0x94, 0x59, 0x1e, 0x93,
-	0xcc, 0xa7, 0xc6, 0x32, 0xcf, 0x88, 0xd9, 0xbc, 0x6d, 0x96, 0x20, 0x5f, 0xeb, 0x3b, 0x22, 0x32,
-	0x2a, 0x36, 0x6d, 0xba, 0x27, 0xc4, 0x3b, 0x1d, 0xe3, 0xad, 0xe6, 0x67, 0x08, 0x16, 0x0f, 0x7a,
-	0xad, 0xe1, 0x72, 0xc9, 0x57, 0xf7, 0xa0, 0x09, 0xea, 0x1e, 0x7c, 0x0f, 0xb2, 0x7d, 0xb1, 0xbe,
-	0xf4, 0xd1, 0xd4, 0x58, 0x1f, 0x05, 0x39, 0x9d, 0xff, 0x36, 0x3f, 0x47, 0xf0, 0x65, 0x89, 0x6e,
-	0x54, 0x11, 0xe3, 0xc0, 0xb5, 0xc8, 0xe2, 0x5b, 0x01, 0xbf, 0x1b, 0x0b, 0x78, 0xe4, 0x06, 0x8b,
-	0x6e, 0x44, 0xef, 0x64, 0x94, 0x7e, 0x82, 0x60, 0x41, 0x52, 0x0a, 0x56, 0x58, 0x67, 0x05, 0x1f,
-	0x3a, 0x77, 0xc1, 0x37, 0x19, 0xb2, 0xff, 0x20, 0x30, 0x14, 0x32, 0xb5, 0xd9, 0x8e, 0xe5, 0x1d,
-	0x0f, 0xb4, 0xfc, 0x4d, 0xb8, 0x1c, 0x7c, 0xa1, 0x50, 0x40, 0xe3, 0xf9, 0x7a, 0x70, 0xc9, 0x79,
-	0xea, 0x6f, 0x4e, 0x04, 0x7b, 0x82, 0x80, 0x29, 0x7d, 0xff, 0x06, 0x5c, 0xd6, 0xc0, 0xd6, 0x05,
-	0x5e, 0xfc, 0x0b, 0x04, 0x97, 0xfc, 0x75, 0x3a, 0x5e, 0x8d, 0x45, 0x2f, 0xa2, 0xb4, 0x37, 0x92,
-	0x58, 0xd0, 0xbc, 0xfb, 0x83, 0xbf, 0xfd, 0xfb, 0x47, 0xa9, 0x77, 0xcd, 0x9b, 0x83, 0x47, 0x9d,
-	0xef, 0xca, 0x08, 0xbd, 0xef, 0x77, 0x41, 0x5a, 0xbc, 0xf5, 0x5c, 0xbd, 0xf6, 0xd0, 0xb2, 0x36,
-	0xfa, 0xef, 0x11, 0xcc, 0x07, 0x5e, 0x3c, 0xf0, 0xdd, 0x04, 0x98, 0x83, 0x61, 0x6f, 0x24, 0x8a,
-	0x72, 0xb3, 0x2a, 0x50, 0x3f, 0x30, 0xdf, 0x1b, 0x87, 0x5a, 0x83, 0xe6, 0xf8, 0xf5, 0x19, 0x5f,
-	0x1e, 0x9c, 0x11, 0x9f, 0x22, 0xb8, 0xb4, 0x49, 0xd8, 0xb6, 0xd5, 0xdd, 0x13, 0xaf, 0x51, 0xd8,
-	0xd4, 0x28, 0x6c, 0xab, 0x5b, 0x38, 0x59, 0x29, 0xf8, 0x07, 0x35, 0xd2, 0x6b, 0xa1, 0x39, 0x72,
-	0x74, 0x00, 0xa9, 0x7c, 0x06, 0xc9, 0x23, 0x72, 0xf7, 0x11, 0xa0, 0xca, 0x6d, 0xdf, 0x0e, 0x65,
-	0x74, 0x0b, 0xff, 0x03, 0xc1, 0x17, 0x5f, 0xf2, 0x76, 0x82, 0xd7, 0xe3, 0x95, 0x4c, 0x23, 0x5f,
-	0x5e, 0x8c, 0xf3, 0x9f, 0x4a, 0xe6, 0x87, 0x82, 0xe2, 0x07, 0xd8, 0xa7, 0x75, 0x7e, 0x09, 0x0d,
-	0xd1, 0x8b, 0x3a, 0xbc, 0x9e, 0xe3, 0x9f, 0x21, 0xc8, 0x0c, 0xde, 0x77, 0xf0, 0xfb, 0x71, 0xb9,
-	0x4c, 0xe0, 0xdb, 0x2b, 0x02, 0xef, 0xdb, 0xf8, 0xe6, 0x18, 0xbc, 0x67, 0xe6, 0xc0, 0xbf, 0xd5,
-	0x95, 0xab, 0xcc, 0xf3, 0xf0, 0x9d, 0xf8, 0x55, 0x6a, 0xa0, 0x38, 0x32, 0x56, 0x93, 0x0b, 0xca,
-	0x5c, 0x66, 0x10, 0x91, 0x85, 0xf1, 0x11, 0x29, 0x2b, 0x84, 0xb2, 0x28, 0xef, 0xb9, 0xf3, 0xfc,
-	0x05, 0xc1, 0x7c, 0xe0, 0x39, 0x21, 0x66, 0x44, 0x46, 0xbd, 0xad, 0x18, 0xe5, 0xf3, 0x88, 0x2a,
-	0x0e, 0x11, 0xc1, 0x90, 0x20, 0x3e, 0x07, 0x7c, 0x7e, 0x8e, 0x00, 0xce, 0x92, 0x6e, 0xfc, 0x41,
-	0xe2, 0xc4, 0x5d, 0x32, 0xb9, 0x73, 0xce, 0x84, 0xdf, 0xbc, 0x2d, 0x68, 0xdc, 0xc2, 0xcb, 0x71,
-	0x4d, 0x81, 0xff, 0x80, 0xe0, 0x92, 0x3f, 0x43, 0x8d, 0x79, 0x8c, 0x47, 0xe4, 0xf9, 0x31, 0x03,
-	0x35, 0x2a, 0x1d, 0x8e, 0x0a, 0xd4, 0xf8, 0xea, 0xc7, 0xbf, 0x42, 0x90, 0xf5, 0x3d, 0x3a, 0xe0,
-	0xf8, 0xea, 0x0b, 0xbe, 0x88, 0x18, 0xab, 0xc9, 0x05, 0x15, 0x81, 0x88, 0xc8, 0x1d, 0x73, 0x2b,
-	0x71, 0xd4, 0x57, 0x87, 0xb2, 0x50, 0x7c, 0x3f, 0x16, 0x84, 0x97, 0x65, 0xaf, 0xc6, 0x1b, 0x5a,
-	0xdc, 0xf7, 0x61, 0xa2, 0xf0, 0x58, 0x7f, 0x98, 0x30, 0xd7, 0x04, 0xcc, 0xb2, 0xf9, 0x7e, 0xec,
-	0x50, 0xf5, 0xfa, 0xce, 0x60, 0x13, 0xee, 0xe1, 0x7f, 0x42, 0x70, 0x25, 0x94, 0xee, 0xe3, 0x7b,
-	0x31, 0x13, 0x9b, 0xa8, 0x22, 0x21, 0xe1, 0x3d, 0xba, 0x25, 0x08, 0x3c, 0x32, 0xef, 0xc7, 0x3d,
-	0x21, 0x07, 0x5e, 0xc2, 0xef, 0x2e, 0x4a, 0x98, 0xd8, 0x9b, 0x13, 0xe1, 0x57, 0x69, 0x7d, 0xd4,
-	0x55, 0x5a, 0xbf, 0xf0, 0xab, 0x94, 0x86, 0xae, 0xd2, 0x5f, 0x23, 0xc0, 0xfb, 0x84, 0x8a, 0x4e,
-	0xe2, 0x75, 0x6d, 0x4a, 0xb9, 0x0c, 0x5e, 0x0e, 0x6d, 0x3a, 0x3c, 0x45, 0xc3, 0xbb, 0x19, 0x63,
-	0xa6, 0x72, 0xd8, 0xaf, 0x0b, 0xc8, 0x55, 0x73, 0x2d, 0x19, 0x64, 0x36, 0xb4, 0x22, 0x07, 0xfe,
-	0x67, 0x04, 0xf3, 0x81, 0xda, 0x28, 0xe6, 0x31, 0x1e, 0x55, 0x4f, 0x25, 0x74, 0x88, 0x1d, 0xc1,
-	0x63, 0xb3, 0xf4, 0xe1, 0x19, 0x0f, 0xfd, 0x49, 0x32, 0x81, 0x63, 0x0c, 0x12, 0xac, 0x4f, 0x52,
-	0x3a, 0xb5, 0x8f, 0x4c, 0x68, 0x36, 0x12, 0xd0, 0xba, 0xa0, 0x9c, 0xc6, 0x16, 0x84, 0x9b, 0xa5,
-	0xaf, 0x9d, 0x11, 0x8e, 0xfe, 0xa0, 0x1a, 0x3f, 0xd3, 0x29, 0x47, 0x57, 0x85, 0xf8, 0x37, 0x08,
-	0x2e, 0xf9, 0x2b, 0xb0, 0x98, 0x77, 0x43, 0x44, 0xd1, 0x96, 0x2c, 0x0d, 0x52, 0xa7, 0x54, 0xe9,
-	0xf6, 0x19, 0x45, 0xf5, 0xe1, 0x76, 0x4c, 0x36, 0x34, 0xc8, 0xf4, 0x3f, 0x4f, 0x0d, 0x6a, 0xc7,
-	0x40, 0xfd, 0xf4, 0x20, 0x09, 0x81, 0x88, 0xda, 0xce, 0x38, 0x47, 0x0d, 0x67, 0xfe, 0x11, 0x09,
-	0x3e, 0xbf, 0x43, 0xa5, 0xaa, 0x8f, 0x50, 0xf0, 0x1b, 0x76, 0x24, 0x31, 0x79, 0x04, 0x73, 0x86,
-	0xfe, 0xf5, 0x9e, 0x97, 0x43, 0xe5, 0xe5, 0xd3, 0x66, 0xe9, 0xa3, 0x64, 0x0b, 0x47, 0x05, 0xc1,
-	0x98, 0x4d, 0x1e, 0x7d, 0x0f, 0xbe, 0xda, 0x74, 0xbb, 0x71, 0xe8, 0xef, 0xa1, 0xa7, 0x1f, 0xa9,
-	0x69, 0x6d, 0xb7, 0x63, 0x39, 0xed, 0x82, 0xeb, 0xb5, 0x8b, 0x6d, 0xe2, 0x88, 0x1a, 0x53, 0xfd,
-	0x1b, 0x82, 0xd5, 0xb3, 0xe9, 0xc8, 0x6f, 0xf5, 0xf7, 0x82, 0xdd, 0x87, 0x33, 0x42, 0xfa, 0xdd,
-	0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x70, 0x64, 0x0e, 0x6a, 0x4c, 0x21, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/securitycenter/v1beta1/source.pb.go b/googleapis/cloud/securitycenter/v1beta1/source.pb.go
index 267147e038..cf4f811ee2 100644
--- a/googleapis/cloud/securitycenter/v1beta1/source.pb.go
+++ b/googleapis/cloud/securitycenter/v1beta1/source.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/securitycenter/v1beta1/source.proto
 
-package securitycenter // import "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
+package securitycenter
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Cloud Security Command Center's (Cloud SCC) finding source. A finding source
 // is an entity or a mechanism that can produce a finding. A source is like a
@@ -53,16 +56,17 @@ func (m *Source) Reset()         { *m = Source{} }
 func (m *Source) String() string { return proto.CompactTextString(m) }
 func (*Source) ProtoMessage()    {}
 func (*Source) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_8609a031d711b388, []int{0}
+	return fileDescriptor_bf622434a85d65bb, []int{0}
 }
+
 func (m *Source) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Source.Unmarshal(m, b)
 }
 func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
 }
-func (dst *Source) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Source.Merge(dst, src)
+func (m *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(m, src)
 }
 func (m *Source) XXX_Size() int {
 	return xxx_messageInfo_Source.Size(m)
@@ -99,10 +103,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/securitycenter/v1beta1/source.proto", fileDescriptor_source_8609a031d711b388)
+	proto.RegisterFile("google/cloud/securitycenter/v1beta1/source.proto", fileDescriptor_bf622434a85d65bb)
 }
 
-var fileDescriptor_source_8609a031d711b388 = []byte{
+var fileDescriptor_bf622434a85d65bb = []byte{
 	// 217 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x3f, 0x4b, 0xc5, 0x30,
 	0x14, 0xc5, 0xa9, 0x4a, 0xc1, 0xd4, 0x29, 0x53, 0x11, 0x87, 0xaa, 0x83, 0x4e, 0x89, 0xc5, 0xd1,
diff --git a/googleapis/cloud/speech/v1/cloud_speech.pb.go b/googleapis/cloud/speech/v1/cloud_speech.pb.go
index 2ecdd1b146..d662ceac98 100644
--- a/googleapis/cloud/speech/v1/cloud_speech.pb.go
+++ b/googleapis/cloud/speech/v1/cloud_speech.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/speech/v1/cloud_speech.proto
 
-package speech // import "google.golang.org/genproto/googleapis/cloud/speech/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package speech
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -28,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The encoding of the audio data sent in the request.
 //
@@ -101,6 +101,7 @@ var RecognitionConfig_AudioEncoding_name = map[int32]string{
 	6: "OGG_OPUS",
 	7: "SPEEX_WITH_HEADER_BYTE",
 }
+
 var RecognitionConfig_AudioEncoding_value = map[string]int32{
 	"ENCODING_UNSPECIFIED":   0,
 	"LINEAR16":               1,
@@ -115,8 +116,9 @@ var RecognitionConfig_AudioEncoding_value = map[string]int32{
 func (x RecognitionConfig_AudioEncoding) String() string {
 	return proto.EnumName(RecognitionConfig_AudioEncoding_name, int32(x))
 }
+
 func (RecognitionConfig_AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{4, 0}
+	return fileDescriptor_06c282b85cb237e9, []int{4, 0}
 }
 
 // Indicates the type of speech event.
@@ -139,6 +141,7 @@ var StreamingRecognizeResponse_SpeechEventType_name = map[int32]string{
 	0: "SPEECH_EVENT_UNSPECIFIED",
 	1: "END_OF_SINGLE_UTTERANCE",
 }
+
 var StreamingRecognizeResponse_SpeechEventType_value = map[string]int32{
 	"SPEECH_EVENT_UNSPECIFIED": 0,
 	"END_OF_SINGLE_UTTERANCE":  1,
@@ -147,8 +150,9 @@ var StreamingRecognizeResponse_SpeechEventType_value = map[string]int32{
 func (x StreamingRecognizeResponse_SpeechEventType) String() string {
 	return proto.EnumName(StreamingRecognizeResponse_SpeechEventType_name, int32(x))
 }
+
 func (StreamingRecognizeResponse_SpeechEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{10, 0}
+	return fileDescriptor_06c282b85cb237e9, []int{10, 0}
 }
 
 // The top-level message sent by the client for the `Recognize` method.
@@ -167,16 +171,17 @@ func (m *RecognizeRequest) Reset()         { *m = RecognizeRequest{} }
 func (m *RecognizeRequest) String() string { return proto.CompactTextString(m) }
 func (*RecognizeRequest) ProtoMessage()    {}
 func (*RecognizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{0}
+	return fileDescriptor_06c282b85cb237e9, []int{0}
 }
+
 func (m *RecognizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognizeRequest.Unmarshal(m, b)
 }
 func (m *RecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *RecognizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognizeRequest.Merge(dst, src)
+func (m *RecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeRequest.Merge(m, src)
 }
 func (m *RecognizeRequest) XXX_Size() int {
 	return xxx_messageInfo_RecognizeRequest.Size(m)
@@ -218,16 +223,17 @@ func (m *LongRunningRecognizeRequest) Reset()         { *m = LongRunningRecogniz
 func (m *LongRunningRecognizeRequest) String() string { return proto.CompactTextString(m) }
 func (*LongRunningRecognizeRequest) ProtoMessage()    {}
 func (*LongRunningRecognizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{1}
+	return fileDescriptor_06c282b85cb237e9, []int{1}
 }
+
 func (m *LongRunningRecognizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LongRunningRecognizeRequest.Unmarshal(m, b)
 }
 func (m *LongRunningRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LongRunningRecognizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *LongRunningRecognizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LongRunningRecognizeRequest.Merge(dst, src)
+func (m *LongRunningRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeRequest.Merge(m, src)
 }
 func (m *LongRunningRecognizeRequest) XXX_Size() int {
 	return xxx_messageInfo_LongRunningRecognizeRequest.Size(m)
@@ -273,16 +279,17 @@ func (m *StreamingRecognizeRequest) Reset()         { *m = StreamingRecognizeReq
 func (m *StreamingRecognizeRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognizeRequest) ProtoMessage()    {}
 func (*StreamingRecognizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{2}
+	return fileDescriptor_06c282b85cb237e9, []int{2}
 }
+
 func (m *StreamingRecognizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognizeRequest.Unmarshal(m, b)
 }
 func (m *StreamingRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognizeRequest.Merge(dst, src)
+func (m *StreamingRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeRequest.Merge(m, src)
 }
 func (m *StreamingRecognizeRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognizeRequest.Size(m)
@@ -330,76 +337,14 @@ func (m *StreamingRecognizeRequest) GetAudioContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StreamingRecognizeRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StreamingRecognizeRequest_OneofMarshaler, _StreamingRecognizeRequest_OneofUnmarshaler, _StreamingRecognizeRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StreamingRecognizeRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StreamingRecognizeRequest_StreamingConfig)(nil),
 		(*StreamingRecognizeRequest_AudioContent)(nil),
 	}
 }
 
-func _StreamingRecognizeRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StreamingRecognizeRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingRecognizeRequest_StreamingConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StreamingConfig); err != nil {
-			return err
-		}
-	case *StreamingRecognizeRequest_AudioContent:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AudioContent)
-	case nil:
-	default:
-		return fmt.Errorf("StreamingRecognizeRequest.StreamingRequest has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StreamingRecognizeRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StreamingRecognizeRequest)
-	switch tag {
-	case 1: // streaming_request.streaming_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingRecognitionConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingRequest = &StreamingRecognizeRequest_StreamingConfig{msg}
-		return true, err
-	case 2: // streaming_request.audio_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StreamingRequest = &StreamingRecognizeRequest_AudioContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StreamingRecognizeRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StreamingRecognizeRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingRecognizeRequest_StreamingConfig:
-		s := proto.Size(x.StreamingConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StreamingRecognizeRequest_AudioContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AudioContent)))
-		n += len(x.AudioContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Provides information to the recognizer that specifies how to process the
 // request.
 type StreamingRecognitionConfig struct {
@@ -432,16 +377,17 @@ func (m *StreamingRecognitionConfig) Reset()         { *m = StreamingRecognition
 func (m *StreamingRecognitionConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognitionConfig) ProtoMessage()    {}
 func (*StreamingRecognitionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{3}
+	return fileDescriptor_06c282b85cb237e9, []int{3}
 }
+
 func (m *StreamingRecognitionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognitionConfig.Unmarshal(m, b)
 }
 func (m *StreamingRecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognitionConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognitionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognitionConfig.Merge(dst, src)
+func (m *StreamingRecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionConfig.Merge(m, src)
 }
 func (m *StreamingRecognitionConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognitionConfig.Size(m)
@@ -600,16 +546,17 @@ func (m *RecognitionConfig) Reset()         { *m = RecognitionConfig{} }
 func (m *RecognitionConfig) String() string { return proto.CompactTextString(m) }
 func (*RecognitionConfig) ProtoMessage()    {}
 func (*RecognitionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{4}
+	return fileDescriptor_06c282b85cb237e9, []int{4}
 }
+
 func (m *RecognitionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognitionConfig.Unmarshal(m, b)
 }
 func (m *RecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognitionConfig.Marshal(b, m, deterministic)
 }
-func (dst *RecognitionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognitionConfig.Merge(dst, src)
+func (m *RecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionConfig.Merge(m, src)
 }
 func (m *RecognitionConfig) XXX_Size() int {
 	return xxx_messageInfo_RecognitionConfig.Size(m)
@@ -723,16 +670,17 @@ func (m *SpeechContext) Reset()         { *m = SpeechContext{} }
 func (m *SpeechContext) String() string { return proto.CompactTextString(m) }
 func (*SpeechContext) ProtoMessage()    {}
 func (*SpeechContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{5}
+	return fileDescriptor_06c282b85cb237e9, []int{5}
 }
+
 func (m *SpeechContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechContext.Unmarshal(m, b)
 }
 func (m *SpeechContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechContext.Marshal(b, m, deterministic)
 }
-func (dst *SpeechContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechContext.Merge(dst, src)
+func (m *SpeechContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechContext.Merge(m, src)
 }
 func (m *SpeechContext) XXX_Size() int {
 	return xxx_messageInfo_SpeechContext.Size(m)
@@ -771,16 +719,17 @@ func (m *RecognitionAudio) Reset()         { *m = RecognitionAudio{} }
 func (m *RecognitionAudio) String() string { return proto.CompactTextString(m) }
 func (*RecognitionAudio) ProtoMessage()    {}
 func (*RecognitionAudio) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{6}
+	return fileDescriptor_06c282b85cb237e9, []int{6}
 }
+
 func (m *RecognitionAudio) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognitionAudio.Unmarshal(m, b)
 }
 func (m *RecognitionAudio) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognitionAudio.Marshal(b, m, deterministic)
 }
-func (dst *RecognitionAudio) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognitionAudio.Merge(dst, src)
+func (m *RecognitionAudio) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionAudio.Merge(m, src)
 }
 func (m *RecognitionAudio) XXX_Size() int {
 	return xxx_messageInfo_RecognitionAudio.Size(m)
@@ -828,72 +777,14 @@ func (m *RecognitionAudio) GetUri() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecognitionAudio) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecognitionAudio_OneofMarshaler, _RecognitionAudio_OneofUnmarshaler, _RecognitionAudio_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RecognitionAudio) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RecognitionAudio_Content)(nil),
 		(*RecognitionAudio_Uri)(nil),
 	}
 }
 
-func _RecognitionAudio_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecognitionAudio)
-	// audio_source
-	switch x := m.AudioSource.(type) {
-	case *RecognitionAudio_Content:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Content)
-	case *RecognitionAudio_Uri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uri)
-	case nil:
-	default:
-		return fmt.Errorf("RecognitionAudio.AudioSource has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecognitionAudio_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecognitionAudio)
-	switch tag {
-	case 1: // audio_source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.AudioSource = &RecognitionAudio_Content{x}
-		return true, err
-	case 2: // audio_source.uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.AudioSource = &RecognitionAudio_Uri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecognitionAudio_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecognitionAudio)
-	// audio_source
-	switch x := m.AudioSource.(type) {
-	case *RecognitionAudio_Content:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case *RecognitionAudio_Uri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uri)))
-		n += len(x.Uri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The only message returned to the client by the `Recognize` method. It
 // contains the result as zero or more sequential `SpeechRecognitionResult`
 // messages.
@@ -910,16 +801,17 @@ func (m *RecognizeResponse) Reset()         { *m = RecognizeResponse{} }
 func (m *RecognizeResponse) String() string { return proto.CompactTextString(m) }
 func (*RecognizeResponse) ProtoMessage()    {}
 func (*RecognizeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{7}
+	return fileDescriptor_06c282b85cb237e9, []int{7}
 }
+
 func (m *RecognizeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognizeResponse.Unmarshal(m, b)
 }
 func (m *RecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognizeResponse.Marshal(b, m, deterministic)
 }
-func (dst *RecognizeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognizeResponse.Merge(dst, src)
+func (m *RecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeResponse.Merge(m, src)
 }
 func (m *RecognizeResponse) XXX_Size() int {
 	return xxx_messageInfo_RecognizeResponse.Size(m)
@@ -955,16 +847,17 @@ func (m *LongRunningRecognizeResponse) Reset()         { *m = LongRunningRecogni
 func (m *LongRunningRecognizeResponse) String() string { return proto.CompactTextString(m) }
 func (*LongRunningRecognizeResponse) ProtoMessage()    {}
 func (*LongRunningRecognizeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{8}
+	return fileDescriptor_06c282b85cb237e9, []int{8}
 }
+
 func (m *LongRunningRecognizeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LongRunningRecognizeResponse.Unmarshal(m, b)
 }
 func (m *LongRunningRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LongRunningRecognizeResponse.Marshal(b, m, deterministic)
 }
-func (dst *LongRunningRecognizeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LongRunningRecognizeResponse.Merge(dst, src)
+func (m *LongRunningRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeResponse.Merge(m, src)
 }
 func (m *LongRunningRecognizeResponse) XXX_Size() int {
 	return xxx_messageInfo_LongRunningRecognizeResponse.Size(m)
@@ -1002,16 +895,17 @@ func (m *LongRunningRecognizeMetadata) Reset()         { *m = LongRunningRecogni
 func (m *LongRunningRecognizeMetadata) String() string { return proto.CompactTextString(m) }
 func (*LongRunningRecognizeMetadata) ProtoMessage()    {}
 func (*LongRunningRecognizeMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{9}
+	return fileDescriptor_06c282b85cb237e9, []int{9}
 }
+
 func (m *LongRunningRecognizeMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LongRunningRecognizeMetadata.Unmarshal(m, b)
 }
 func (m *LongRunningRecognizeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LongRunningRecognizeMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LongRunningRecognizeMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LongRunningRecognizeMetadata.Merge(dst, src)
+func (m *LongRunningRecognizeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeMetadata.Merge(m, src)
 }
 func (m *LongRunningRecognizeMetadata) XXX_Size() int {
 	return xxx_messageInfo_LongRunningRecognizeMetadata.Size(m)
@@ -1112,16 +1006,17 @@ func (m *StreamingRecognizeResponse) Reset()         { *m = StreamingRecognizeRe
 func (m *StreamingRecognizeResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognizeResponse) ProtoMessage()    {}
 func (*StreamingRecognizeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{10}
+	return fileDescriptor_06c282b85cb237e9, []int{10}
 }
+
 func (m *StreamingRecognizeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognizeResponse.Unmarshal(m, b)
 }
 func (m *StreamingRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognizeResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognizeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognizeResponse.Merge(dst, src)
+func (m *StreamingRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeResponse.Merge(m, src)
 }
 func (m *StreamingRecognizeResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognizeResponse.Size(m)
@@ -1186,16 +1081,17 @@ func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognition
 func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognitionResult) ProtoMessage()    {}
 func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{11}
+	return fileDescriptor_06c282b85cb237e9, []int{11}
 }
+
 func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
 }
 func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+func (m *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(m, src)
 }
 func (m *StreamingRecognitionResult) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
@@ -1254,16 +1150,17 @@ func (m *SpeechRecognitionResult) Reset()         { *m = SpeechRecognitionResult
 func (m *SpeechRecognitionResult) String() string { return proto.CompactTextString(m) }
 func (*SpeechRecognitionResult) ProtoMessage()    {}
 func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{12}
+	return fileDescriptor_06c282b85cb237e9, []int{12}
 }
+
 func (m *SpeechRecognitionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechRecognitionResult.Unmarshal(m, b)
 }
 func (m *SpeechRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechRecognitionResult.Marshal(b, m, deterministic)
 }
-func (dst *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechRecognitionResult.Merge(dst, src)
+func (m *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionResult.Merge(m, src)
 }
 func (m *SpeechRecognitionResult) XXX_Size() int {
 	return xxx_messageInfo_SpeechRecognitionResult.Size(m)
@@ -1313,16 +1210,17 @@ func (m *SpeechRecognitionAlternative) Reset()         { *m = SpeechRecognitionA
 func (m *SpeechRecognitionAlternative) String() string { return proto.CompactTextString(m) }
 func (*SpeechRecognitionAlternative) ProtoMessage()    {}
 func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{13}
+	return fileDescriptor_06c282b85cb237e9, []int{13}
 }
+
 func (m *SpeechRecognitionAlternative) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Unmarshal(m, b)
 }
 func (m *SpeechRecognitionAlternative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Marshal(b, m, deterministic)
 }
-func (dst *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechRecognitionAlternative.Merge(dst, src)
+func (m *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionAlternative.Merge(m, src)
 }
 func (m *SpeechRecognitionAlternative) XXX_Size() int {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Size(m)
@@ -1381,16 +1279,17 @@ func (m *WordInfo) Reset()         { *m = WordInfo{} }
 func (m *WordInfo) String() string { return proto.CompactTextString(m) }
 func (*WordInfo) ProtoMessage()    {}
 func (*WordInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_10c398bf6dc739ce, []int{14}
+	return fileDescriptor_06c282b85cb237e9, []int{14}
 }
+
 func (m *WordInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WordInfo.Unmarshal(m, b)
 }
 func (m *WordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WordInfo.Marshal(b, m, deterministic)
 }
-func (dst *WordInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WordInfo.Merge(dst, src)
+func (m *WordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WordInfo.Merge(m, src)
 }
 func (m *WordInfo) XXX_Size() int {
 	return xxx_messageInfo_WordInfo.Size(m)
@@ -1423,6 +1322,8 @@ func (m *WordInfo) GetWord() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.speech.v1.RecognitionConfig_AudioEncoding", RecognitionConfig_AudioEncoding_name, RecognitionConfig_AudioEncoding_value)
+	proto.RegisterEnum("google.cloud.speech.v1.StreamingRecognizeResponse_SpeechEventType", StreamingRecognizeResponse_SpeechEventType_name, StreamingRecognizeResponse_SpeechEventType_value)
 	proto.RegisterType((*RecognizeRequest)(nil), "google.cloud.speech.v1.RecognizeRequest")
 	proto.RegisterType((*LongRunningRecognizeRequest)(nil), "google.cloud.speech.v1.LongRunningRecognizeRequest")
 	proto.RegisterType((*StreamingRecognizeRequest)(nil), "google.cloud.speech.v1.StreamingRecognizeRequest")
@@ -1438,8 +1339,107 @@ func init() {
 	proto.RegisterType((*SpeechRecognitionResult)(nil), "google.cloud.speech.v1.SpeechRecognitionResult")
 	proto.RegisterType((*SpeechRecognitionAlternative)(nil), "google.cloud.speech.v1.SpeechRecognitionAlternative")
 	proto.RegisterType((*WordInfo)(nil), "google.cloud.speech.v1.WordInfo")
-	proto.RegisterEnum("google.cloud.speech.v1.RecognitionConfig_AudioEncoding", RecognitionConfig_AudioEncoding_name, RecognitionConfig_AudioEncoding_value)
-	proto.RegisterEnum("google.cloud.speech.v1.StreamingRecognizeResponse_SpeechEventType", StreamingRecognizeResponse_SpeechEventType_name, StreamingRecognizeResponse_SpeechEventType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/speech/v1/cloud_speech.proto", fileDescriptor_06c282b85cb237e9)
+}
+
+var fileDescriptor_06c282b85cb237e9 = []byte{
+	// 1479 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x53, 0x1b, 0xc9,
+	0x15, 0x67, 0x24, 0x84, 0xe0, 0xf1, 0x4f, 0xb4, 0x89, 0x3d, 0xc8, 0xc4, 0x90, 0x71, 0x5c, 0x06,
+	0x1f, 0xa4, 0x80, 0x5d, 0x76, 0xe2, 0xa4, 0x52, 0x11, 0x62, 0x00, 0x55, 0x81, 0x50, 0xb5, 0x44,
+	0x70, 0x72, 0xc8, 0x54, 0x33, 0x6a, 0x0d, 0x53, 0x25, 0xf5, 0x4c, 0xa6, 0x7b, 0x88, 0xf1, 0xcd,
+	0xb9, 0xa6, 0x2a, 0x97, 0x24, 0x3e, 0xe7, 0x96, 0xca, 0x79, 0x2f, 0xfb, 0x19, 0xf6, 0xb4, 0xb5,
+	0xfb, 0x15, 0xf6, 0x43, 0xec, 0x71, 0xab, 0xbb, 0x67, 0x84, 0x24, 0x10, 0xc6, 0x55, 0xde, 0xaa,
+	0xbd, 0xa9, 0xdf, 0xfb, 0xbd, 0x37, 0xbf, 0x7e, 0xdd, 0xef, 0xf7, 0x5a, 0xb0, 0xe9, 0x05, 0x81,
+	0xd7, 0xa5, 0x65, 0xb7, 0x1b, 0xc4, 0xed, 0x32, 0x0f, 0x29, 0x75, 0xcf, 0xcb, 0x17, 0x5b, 0x7a,
+	0xed, 0xe8, 0x75, 0x29, 0x8c, 0x02, 0x11, 0xa0, 0xfb, 0x1a, 0x5a, 0x52, 0xae, 0x52, 0xe2, 0xba,
+	0xd8, 0x2a, 0xae, 0x26, 0x29, 0x48, 0xe8, 0x97, 0x09, 0x63, 0x81, 0x20, 0xc2, 0x0f, 0x18, 0xd7,
+	0x51, 0xc5, 0xc7, 0x89, 0xb7, 0x1b, 0x30, 0x2f, 0x8a, 0x19, 0xf3, 0x99, 0x57, 0x0e, 0x42, 0x1a,
+	0x0d, 0x81, 0x56, 0x12, 0x90, 0x5a, 0x9d, 0xc5, 0x9d, 0x32, 0x61, 0x97, 0x89, 0xeb, 0xd1, 0xa8,
+	0xab, 0x1d, 0xeb, 0xd8, 0xc4, 0xff, 0x70, 0xd4, 0x4f, 0x7b, 0xa1, 0x48, 0x83, 0xd7, 0x46, 0x9d,
+	0xc2, 0xef, 0x51, 0x2e, 0x48, 0x2f, 0x4c, 0x00, 0x0f, 0x12, 0x40, 0x14, 0xba, 0x65, 0x2e, 0x88,
+	0x88, 0x13, 0x46, 0xd6, 0x7f, 0x0c, 0x28, 0x60, 0xea, 0x06, 0x1e, 0xf3, 0xdf, 0x51, 0x4c, 0xff,
+	0x1a, 0x53, 0x2e, 0x50, 0x05, 0xa6, 0xdc, 0x80, 0x75, 0x7c, 0xcf, 0x34, 0xd6, 0x8d, 0x8d, 0xd9,
+	0xed, 0xcd, 0xd2, 0xcd, 0x25, 0x29, 0x25, 0x91, 0x92, 0x66, 0x55, 0x05, 0xe0, 0x24, 0x10, 0xfd,
+	0x1e, 0x72, 0x24, 0x6e, 0xfb, 0x81, 0x99, 0x51, 0x19, 0x36, 0xee, 0x90, 0xa1, 0x22, 0xf1, 0x58,
+	0x87, 0x59, 0xff, 0x35, 0xe0, 0xe1, 0x61, 0xc0, 0x3c, 0xac, 0x4b, 0xf9, 0x53, 0xa4, 0xf8, 0xa5,
+	0x01, 0x2b, 0x4d, 0x11, 0x51, 0xd2, 0xbb, 0x89, 0xa0, 0x03, 0x05, 0x9e, 0x3a, 0x9d, 0x21, 0xaa,
+	0xdb, 0xe3, 0x3e, 0x34, 0x9a, 0xec, 0x8a, 0xf3, 0xc1, 0x04, 0x5e, 0xec, 0x67, 0xd3, 0x26, 0xf4,
+	0x04, 0xe6, 0x15, 0x0f, 0x99, 0x5c, 0x50, 0x26, 0xd4, 0x36, 0xe6, 0x0e, 0x26, 0xf0, 0x9c, 0x32,
+	0x57, 0xb5, 0x75, 0xe7, 0x1e, 0x2c, 0x5d, 0xf1, 0x88, 0x34, 0x39, 0xeb, 0x0b, 0x03, 0x8a, 0xe3,
+	0xbf, 0xf6, 0x39, 0x8a, 0xbb, 0x09, 0x05, 0xee, 0x33, 0xaf, 0x4b, 0x9d, 0x58, 0x08, 0x1a, 0x11,
+	0xe6, 0x52, 0x45, 0x70, 0x1a, 0x2f, 0x6a, 0xfb, 0x49, 0x6a, 0x46, 0x4f, 0x61, 0xd1, 0x67, 0x82,
+	0x46, 0x7e, 0xcf, 0x89, 0x28, 0x8f, 0xbb, 0x82, 0x9b, 0x59, 0x85, 0x5c, 0x48, 0xcc, 0x58, 0x5b,
+	0xad, 0xff, 0x4d, 0xc1, 0xd2, 0x75, 0xb2, 0x4d, 0x98, 0xa6, 0xcc, 0x0d, 0xda, 0x3e, 0xd3, 0x74,
+	0x17, 0xb6, 0x5f, 0xdd, 0x99, 0x6e, 0x49, 0x1d, 0xa8, 0x9d, 0x84, 0xe3, 0x7e, 0x22, 0xf4, 0x0c,
+	0x96, 0x38, 0xe9, 0x85, 0x5d, 0xea, 0x44, 0x44, 0x50, 0xe7, 0x9c, 0x46, 0xe2, 0x9d, 0xe2, 0x9f,
+	0xc3, 0x8b, 0xda, 0x81, 0x89, 0xa0, 0x07, 0xd2, 0x8c, 0x4a, 0x70, 0x2f, 0x39, 0x88, 0x73, 0xc2,
+	0x18, 0xed, 0x3a, 0x6e, 0x10, 0x33, 0x61, 0xe6, 0x15, 0x7a, 0x49, 0x1f, 0x86, 0xf6, 0x54, 0xa5,
+	0x03, 0xb5, 0xe0, 0x29, 0x65, 0xe4, 0xac, 0x4b, 0x1d, 0x4e, 0x43, 0xa2, 0xf2, 0x47, 0x57, 0xc4,
+	0x9c, 0x90, 0x46, 0x69, 0x26, 0x73, 0x4e, 0xd5, 0xe1, 0xb1, 0x86, 0x37, 0x13, 0xf4, 0xc0, 0x2e,
+	0x1a, 0x34, 0x4a, 0x52, 0xa3, 0xc7, 0x30, 0xdf, 0x25, 0xcc, 0x8b, 0x89, 0x47, 0x1d, 0x37, 0x68,
+	0x53, 0x55, 0xc3, 0x19, 0x3c, 0x97, 0x1a, 0xab, 0x41, 0x9b, 0xca, 0x53, 0xe9, 0x91, 0xb7, 0x0e,
+	0xe9, 0x0a, 0x1a, 0x31, 0x22, 0xfc, 0x0b, 0xca, 0xcd, 0x49, 0xbd, 0xab, 0x1e, 0x79, 0x5b, 0x19,
+	0x30, 0x4b, 0x68, 0x18, 0x05, 0x1d, 0xc2, 0x7c, 0x71, 0xe9, 0x74, 0x7c, 0xe9, 0x32, 0x73, 0xfa,
+	0x00, 0xfb, 0xf6, 0x3d, 0x65, 0x46, 0x75, 0x58, 0xd4, 0x35, 0xd6, 0x57, 0xf1, 0xad, 0xe0, 0xe6,
+	0xd4, 0x7a, 0x76, 0x63, 0x76, 0xfb, 0xc9, 0xd8, 0x9b, 0xae, 0x7e, 0x55, 0x35, 0x1a, 0x2f, 0xf0,
+	0xc1, 0x25, 0x47, 0xaf, 0xc0, 0x4c, 0x0a, 0xf4, 0xb7, 0x20, 0x6a, 0x3b, 0x52, 0xcb, 0x9c, 0xa0,
+	0xd3, 0xe1, 0x54, 0x70, 0x73, 0x5a, 0x51, 0xf8, 0x99, 0xf6, 0x9f, 0x06, 0x51, 0xbb, 0xe5, 0xf7,
+	0xe8, 0xb1, 0x76, 0xa2, 0x3f, 0xc0, 0x6a, 0x12, 0x48, 0x62, 0x11, 0xf4, 0x88, 0xf0, 0x5d, 0x27,
+	0x8c, 0x99, 0x2b, 0x62, 0xa5, 0xa4, 0xe6, 0xac, 0x0a, 0x2e, 0x6a, 0x4c, 0x25, 0x85, 0x34, 0xae,
+	0x10, 0x68, 0x19, 0x72, 0xbd, 0xa0, 0x4d, 0xbb, 0xe6, 0xbc, 0xaa, 0x9e, 0x5e, 0xa0, 0x5f, 0xc0,
+	0x5c, 0xcc, 0xa9, 0x43, 0xd9, 0xb9, 0xbc, 0xb0, 0x6d, 0x73, 0x41, 0xe5, 0x99, 0x8d, 0x39, 0xb5,
+	0x13, 0x93, 0xf5, 0x0f, 0x03, 0xe6, 0x87, 0x2e, 0x13, 0x32, 0x61, 0xd9, 0xae, 0x57, 0x8f, 0x77,
+	0x6b, 0xf5, 0x7d, 0xe7, 0xa4, 0xde, 0x6c, 0xd8, 0xd5, 0xda, 0x5e, 0xcd, 0xde, 0x2d, 0x4c, 0xa0,
+	0x39, 0x98, 0x3e, 0xac, 0xd5, 0xed, 0x0a, 0xde, 0x7a, 0x59, 0x30, 0xd0, 0x34, 0x4c, 0xee, 0x1d,
+	0x56, 0xaa, 0x85, 0x0c, 0x9a, 0x81, 0xdc, 0xd1, 0xc9, 0x61, 0xe5, 0xb4, 0x90, 0x45, 0x79, 0xc8,
+	0x56, 0x8e, 0x70, 0x61, 0x12, 0x01, 0x4c, 0x55, 0x8e, 0xb0, 0x73, 0xba, 0x53, 0xc8, 0xc9, 0xb8,
+	0xe3, 0xfd, 0x7d, 0xe7, 0xb8, 0x71, 0xd2, 0x2c, 0x4c, 0xa1, 0x22, 0xdc, 0x6f, 0x36, 0x6c, 0xfb,
+	0x8d, 0x73, 0x5a, 0x6b, 0x1d, 0x38, 0x07, 0x76, 0x65, 0xd7, 0xc6, 0xce, 0xce, 0x9f, 0x5a, 0x76,
+	0x21, 0x6f, 0x6d, 0xc2, 0xfc, 0x50, 0x89, 0x91, 0x09, 0xf9, 0xf0, 0x3c, 0x22, 0x9c, 0x72, 0xd3,
+	0x58, 0xcf, 0x6e, 0xcc, 0xe0, 0x74, 0x69, 0xe1, 0xbe, 0xfe, 0xf7, 0x05, 0x0e, 0x15, 0x21, 0x9f,
+	0x8a, 0x8a, 0x91, 0x88, 0x4a, 0x6a, 0x40, 0x08, 0xb2, 0x71, 0xe4, 0xab, 0x5e, 0x98, 0x39, 0x98,
+	0xc0, 0x72, 0xb1, 0xb3, 0x00, 0x5a, 0x73, 0x1c, 0x1e, 0xc4, 0x91, 0x4b, 0xad, 0xbf, 0xf4, 0xfb,
+	0x54, 0xea, 0x21, 0x0f, 0x03, 0xc6, 0x29, 0xaa, 0x41, 0x3e, 0x6d, 0xef, 0x8c, 0xba, 0x1d, 0xe5,
+	0xdb, 0x6f, 0xc7, 0x00, 0x2b, 0x2d, 0x00, 0x38, 0x8d, 0xb7, 0x7c, 0x58, 0xbd, 0x79, 0x36, 0x7c,
+	0xfe, 0x4f, 0x7d, 0x65, 0xdc, 0xfc, 0xad, 0x23, 0x2a, 0x48, 0x9b, 0x08, 0x92, 0xf4, 0x89, 0x17,
+	0x51, 0xce, 0x65, 0xeb, 0xba, 0x69, 0xd1, 0x72, 0xaa, 0x4f, 0x94, 0xbd, 0xa1, 0xcd, 0xe8, 0x37,
+	0x00, 0x5c, 0x90, 0x48, 0xa8, 0x1b, 0x9d, 0x4c, 0x9d, 0x62, 0xca, 0x2c, 0x1d, 0xdd, 0xa5, 0x56,
+	0x3a, 0xba, 0xf1, 0x8c, 0x42, 0xcb, 0x35, 0xda, 0x85, 0x42, 0x97, 0x70, 0xe1, 0xc4, 0x61, 0x5b,
+	0xea, 0x85, 0x4a, 0x90, 0xfd, 0x68, 0x82, 0x05, 0x19, 0x73, 0xa2, 0x42, 0xa4, 0xd1, 0xfa, 0x26,
+	0x73, 0x5d, 0xf6, 0x07, 0xca, 0xb6, 0x01, 0x39, 0x1a, 0x45, 0x41, 0x94, 0xa8, 0x3e, 0x4a, 0x33,
+	0x47, 0xa1, 0x5b, 0x6a, 0xaa, 0x47, 0x03, 0xd6, 0x00, 0x74, 0x38, 0x5a, 0xe0, 0x4f, 0x9a, 0x69,
+	0x23, 0x35, 0x46, 0x0c, 0x96, 0x12, 0xfd, 0xa0, 0x17, 0x94, 0x09, 0x47, 0x5c, 0x86, 0x54, 0xc9,
+	0xd2, 0xc2, 0xf6, 0xce, 0x5d, 0xf3, 0x5e, 0x6d, 0x23, 0x39, 0x53, 0x5b, 0xa6, 0x6a, 0x5d, 0x86,
+	0x14, 0x27, 0xe2, 0xd4, 0x37, 0x58, 0x87, 0xb0, 0x38, 0x82, 0x41, 0xab, 0x60, 0xca, 0x66, 0xaa,
+	0x1e, 0x38, 0xf6, 0x1f, 0xed, 0x7a, 0x6b, 0xa4, 0x61, 0x1f, 0xc2, 0x03, 0xbb, 0xbe, 0xeb, 0x1c,
+	0xef, 0x39, 0xcd, 0x5a, 0x7d, 0xff, 0xd0, 0x76, 0x4e, 0x5a, 0x2d, 0x1b, 0x57, 0xea, 0x55, 0xbb,
+	0x60, 0x58, 0x5f, 0x8f, 0x99, 0xa5, 0x7a, 0x97, 0xe8, 0x0d, 0xcc, 0x0d, 0xc9, 0xad, 0xa1, 0xea,
+	0xf5, 0xe2, 0xce, 0x17, 0x72, 0x40, 0x94, 0xf1, 0x50, 0x26, 0xb4, 0x02, 0xd3, 0x3e, 0x77, 0x3a,
+	0x3e, 0x23, 0xdd, 0x64, 0xb4, 0xe6, 0x7d, 0xbe, 0x27, 0x97, 0x68, 0x15, 0xe4, 0xdd, 0x39, 0xf3,
+	0xbb, 0xbe, 0xb8, 0x54, 0xf7, 0x24, 0x83, 0xaf, 0x0c, 0x68, 0x0d, 0x66, 0xd3, 0x51, 0x25, 0x88,
+	0xa7, 0x54, 0x3d, 0x87, 0x21, 0x31, 0xb5, 0x88, 0x67, 0xfd, 0xdb, 0x80, 0x07, 0x63, 0x3a, 0xe3,
+	0x47, 0xdc, 0xcf, 0x08, 0xad, 0xcc, 0x35, 0x5a, 0x1f, 0x0c, 0x58, 0xbd, 0x2d, 0x1f, 0x7a, 0x04,
+	0x20, 0x22, 0xc2, 0xb8, 0x1b, 0xf9, 0xa1, 0xee, 0xc2, 0x19, 0x3c, 0x60, 0x91, 0x7e, 0xf5, 0x3c,
+	0x69, 0xd3, 0xf4, 0x39, 0x92, 0xc1, 0x03, 0x16, 0xf4, 0x12, 0x72, 0x72, 0xe2, 0xc8, 0xf7, 0x87,
+	0xdc, 0xd4, 0xfa, 0xb8, 0x4d, 0xc9, 0xb9, 0x53, 0x63, 0x9d, 0x00, 0x6b, 0xb8, 0xf5, 0x4f, 0x03,
+	0xa6, 0x53, 0x1b, 0xfa, 0xf5, 0x50, 0x97, 0xeb, 0x56, 0x5a, 0xb9, 0xd6, 0xa4, 0xbb, 0xc9, 0xeb,
+	0x7e, 0xb0, 0xc9, 0x5f, 0xc8, 0x97, 0x4c, 0x7b, 0x50, 0x1d, 0x6e, 0x89, 0xcb, 0x53, 0xa6, 0x66,
+	0x1f, 0x42, 0x30, 0x29, 0x59, 0x24, 0xf3, 0x5e, 0xfd, 0xde, 0xfe, 0x7f, 0x16, 0xa6, 0x74, 0xa5,
+	0xd0, 0x7b, 0x03, 0x66, 0xfa, 0x3d, 0x82, 0x3e, 0xf6, 0xc8, 0xed, 0xbf, 0x5f, 0x8b, 0x9b, 0x77,
+	0x40, 0xea, 0x86, 0xb3, 0xd6, 0xfe, 0xfe, 0xed, 0x77, 0xff, 0xca, 0xac, 0x58, 0xcb, 0xf2, 0x0f,
+	0x95, 0x06, 0xbe, 0x8e, 0x52, 0xd4, 0x6b, 0xe3, 0x19, 0xfa, 0x60, 0xc0, 0xf2, 0x4d, 0x22, 0x8a,
+	0x9e, 0x8f, 0xfb, 0xc8, 0x2d, 0x4f, 0xff, 0xe2, 0xcf, 0xd3, 0xa0, 0x81, 0xbf, 0x5a, 0xa5, 0xe3,
+	0xf4, 0xaf, 0x96, 0xf5, 0x4c, 0xb1, 0xf9, 0xa5, 0xb5, 0x36, 0xc0, 0x66, 0x00, 0x39, 0x44, 0xec,
+	0xbd, 0x01, 0xe8, 0xba, 0x92, 0xa0, 0xad, 0x4f, 0x51, 0x1d, 0x4d, 0x6a, 0xfb, 0xd3, 0x85, 0xca,
+	0x9a, 0xd8, 0x30, 0x7e, 0x65, 0xec, 0x74, 0xa1, 0xe8, 0x06, 0xbd, 0x31, 0xe1, 0x3b, 0xb3, 0xfa,
+	0x18, 0x1b, 0xf2, 0xfc, 0x1b, 0xc6, 0x9f, 0x7f, 0x97, 0xc0, 0xbc, 0x40, 0xbe, 0xeb, 0x4a, 0x41,
+	0xe4, 0x95, 0x3d, 0xca, 0xd4, 0xed, 0x28, 0x6b, 0x17, 0x09, 0x7d, 0x3e, 0xfa, 0x2f, 0xf7, 0xb7,
+	0xfa, 0xd7, 0xf7, 0x86, 0x71, 0x36, 0xa5, 0xb0, 0xcf, 0x7f, 0x08, 0x00, 0x00, 0xff, 0xff, 0x37,
+	0x96, 0x14, 0x87, 0x10, 0x0f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1628,104 +1628,3 @@ var _Speech_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/cloud/speech/v1/cloud_speech.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/speech/v1/cloud_speech.proto", fileDescriptor_cloud_speech_10c398bf6dc739ce)
-}
-
-var fileDescriptor_cloud_speech_10c398bf6dc739ce = []byte{
-	// 1479 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x53, 0x1b, 0xc9,
-	0x15, 0x67, 0x24, 0x84, 0xe0, 0xf1, 0x4f, 0xb4, 0x89, 0x3d, 0xc8, 0xc4, 0x90, 0x71, 0x5c, 0x06,
-	0x1f, 0xa4, 0x80, 0x5d, 0x76, 0xe2, 0xa4, 0x52, 0x11, 0x62, 0x00, 0x55, 0x81, 0x50, 0xb5, 0x44,
-	0x70, 0x72, 0xc8, 0x54, 0x33, 0x6a, 0x0d, 0x53, 0x25, 0xf5, 0x4c, 0xa6, 0x7b, 0x88, 0xf1, 0xcd,
-	0xb9, 0xa6, 0x2a, 0x97, 0x24, 0x3e, 0xe7, 0x96, 0xca, 0x79, 0x2f, 0xfb, 0x19, 0xf6, 0xb4, 0xb5,
-	0xfb, 0x15, 0xf6, 0x43, 0xec, 0x71, 0xab, 0xbb, 0x67, 0x84, 0x24, 0x10, 0xc6, 0x55, 0xde, 0xaa,
-	0xbd, 0xa9, 0xdf, 0xfb, 0xbd, 0x37, 0xbf, 0x7e, 0xdd, 0xef, 0xf7, 0x5a, 0xb0, 0xe9, 0x05, 0x81,
-	0xd7, 0xa5, 0x65, 0xb7, 0x1b, 0xc4, 0xed, 0x32, 0x0f, 0x29, 0x75, 0xcf, 0xcb, 0x17, 0x5b, 0x7a,
-	0xed, 0xe8, 0x75, 0x29, 0x8c, 0x02, 0x11, 0xa0, 0xfb, 0x1a, 0x5a, 0x52, 0xae, 0x52, 0xe2, 0xba,
-	0xd8, 0x2a, 0xae, 0x26, 0x29, 0x48, 0xe8, 0x97, 0x09, 0x63, 0x81, 0x20, 0xc2, 0x0f, 0x18, 0xd7,
-	0x51, 0xc5, 0xc7, 0x89, 0xb7, 0x1b, 0x30, 0x2f, 0x8a, 0x19, 0xf3, 0x99, 0x57, 0x0e, 0x42, 0x1a,
-	0x0d, 0x81, 0x56, 0x12, 0x90, 0x5a, 0x9d, 0xc5, 0x9d, 0x32, 0x61, 0x97, 0x89, 0xeb, 0xd1, 0xa8,
-	0xab, 0x1d, 0xeb, 0xd8, 0xc4, 0xff, 0x70, 0xd4, 0x4f, 0x7b, 0xa1, 0x48, 0x83, 0xd7, 0x46, 0x9d,
-	0xc2, 0xef, 0x51, 0x2e, 0x48, 0x2f, 0x4c, 0x00, 0x0f, 0x12, 0x40, 0x14, 0xba, 0x65, 0x2e, 0x88,
-	0x88, 0x13, 0x46, 0xd6, 0x7f, 0x0c, 0x28, 0x60, 0xea, 0x06, 0x1e, 0xf3, 0xdf, 0x51, 0x4c, 0xff,
-	0x1a, 0x53, 0x2e, 0x50, 0x05, 0xa6, 0xdc, 0x80, 0x75, 0x7c, 0xcf, 0x34, 0xd6, 0x8d, 0x8d, 0xd9,
-	0xed, 0xcd, 0xd2, 0xcd, 0x25, 0x29, 0x25, 0x91, 0x92, 0x66, 0x55, 0x05, 0xe0, 0x24, 0x10, 0xfd,
-	0x1e, 0x72, 0x24, 0x6e, 0xfb, 0x81, 0x99, 0x51, 0x19, 0x36, 0xee, 0x90, 0xa1, 0x22, 0xf1, 0x58,
-	0x87, 0x59, 0xff, 0x35, 0xe0, 0xe1, 0x61, 0xc0, 0x3c, 0xac, 0x4b, 0xf9, 0x53, 0xa4, 0xf8, 0xa5,
-	0x01, 0x2b, 0x4d, 0x11, 0x51, 0xd2, 0xbb, 0x89, 0xa0, 0x03, 0x05, 0x9e, 0x3a, 0x9d, 0x21, 0xaa,
-	0xdb, 0xe3, 0x3e, 0x34, 0x9a, 0xec, 0x8a, 0xf3, 0xc1, 0x04, 0x5e, 0xec, 0x67, 0xd3, 0x26, 0xf4,
-	0x04, 0xe6, 0x15, 0x0f, 0x99, 0x5c, 0x50, 0x26, 0xd4, 0x36, 0xe6, 0x0e, 0x26, 0xf0, 0x9c, 0x32,
-	0x57, 0xb5, 0x75, 0xe7, 0x1e, 0x2c, 0x5d, 0xf1, 0x88, 0x34, 0x39, 0xeb, 0x0b, 0x03, 0x8a, 0xe3,
-	0xbf, 0xf6, 0x39, 0x8a, 0xbb, 0x09, 0x05, 0xee, 0x33, 0xaf, 0x4b, 0x9d, 0x58, 0x08, 0x1a, 0x11,
-	0xe6, 0x52, 0x45, 0x70, 0x1a, 0x2f, 0x6a, 0xfb, 0x49, 0x6a, 0x46, 0x4f, 0x61, 0xd1, 0x67, 0x82,
-	0x46, 0x7e, 0xcf, 0x89, 0x28, 0x8f, 0xbb, 0x82, 0x9b, 0x59, 0x85, 0x5c, 0x48, 0xcc, 0x58, 0x5b,
-	0xad, 0xff, 0x4d, 0xc1, 0xd2, 0x75, 0xb2, 0x4d, 0x98, 0xa6, 0xcc, 0x0d, 0xda, 0x3e, 0xd3, 0x74,
-	0x17, 0xb6, 0x5f, 0xdd, 0x99, 0x6e, 0x49, 0x1d, 0xa8, 0x9d, 0x84, 0xe3, 0x7e, 0x22, 0xf4, 0x0c,
-	0x96, 0x38, 0xe9, 0x85, 0x5d, 0xea, 0x44, 0x44, 0x50, 0xe7, 0x9c, 0x46, 0xe2, 0x9d, 0xe2, 0x9f,
-	0xc3, 0x8b, 0xda, 0x81, 0x89, 0xa0, 0x07, 0xd2, 0x8c, 0x4a, 0x70, 0x2f, 0x39, 0x88, 0x73, 0xc2,
-	0x18, 0xed, 0x3a, 0x6e, 0x10, 0x33, 0x61, 0xe6, 0x15, 0x7a, 0x49, 0x1f, 0x86, 0xf6, 0x54, 0xa5,
-	0x03, 0xb5, 0xe0, 0x29, 0x65, 0xe4, 0xac, 0x4b, 0x1d, 0x4e, 0x43, 0xa2, 0xf2, 0x47, 0x57, 0xc4,
-	0x9c, 0x90, 0x46, 0x69, 0x26, 0x73, 0x4e, 0xd5, 0xe1, 0xb1, 0x86, 0x37, 0x13, 0xf4, 0xc0, 0x2e,
-	0x1a, 0x34, 0x4a, 0x52, 0xa3, 0xc7, 0x30, 0xdf, 0x25, 0xcc, 0x8b, 0x89, 0x47, 0x1d, 0x37, 0x68,
-	0x53, 0x55, 0xc3, 0x19, 0x3c, 0x97, 0x1a, 0xab, 0x41, 0x9b, 0xca, 0x53, 0xe9, 0x91, 0xb7, 0x0e,
-	0xe9, 0x0a, 0x1a, 0x31, 0x22, 0xfc, 0x0b, 0xca, 0xcd, 0x49, 0xbd, 0xab, 0x1e, 0x79, 0x5b, 0x19,
-	0x30, 0x4b, 0x68, 0x18, 0x05, 0x1d, 0xc2, 0x7c, 0x71, 0xe9, 0x74, 0x7c, 0xe9, 0x32, 0x73, 0xfa,
-	0x00, 0xfb, 0xf6, 0x3d, 0x65, 0x46, 0x75, 0x58, 0xd4, 0x35, 0xd6, 0x57, 0xf1, 0xad, 0xe0, 0xe6,
-	0xd4, 0x7a, 0x76, 0x63, 0x76, 0xfb, 0xc9, 0xd8, 0x9b, 0xae, 0x7e, 0x55, 0x35, 0x1a, 0x2f, 0xf0,
-	0xc1, 0x25, 0x47, 0xaf, 0xc0, 0x4c, 0x0a, 0xf4, 0xb7, 0x20, 0x6a, 0x3b, 0x52, 0xcb, 0x9c, 0xa0,
-	0xd3, 0xe1, 0x54, 0x70, 0x73, 0x5a, 0x51, 0xf8, 0x99, 0xf6, 0x9f, 0x06, 0x51, 0xbb, 0xe5, 0xf7,
-	0xe8, 0xb1, 0x76, 0xa2, 0x3f, 0xc0, 0x6a, 0x12, 0x48, 0x62, 0x11, 0xf4, 0x88, 0xf0, 0x5d, 0x27,
-	0x8c, 0x99, 0x2b, 0x62, 0xa5, 0xa4, 0xe6, 0xac, 0x0a, 0x2e, 0x6a, 0x4c, 0x25, 0x85, 0x34, 0xae,
-	0x10, 0x68, 0x19, 0x72, 0xbd, 0xa0, 0x4d, 0xbb, 0xe6, 0xbc, 0xaa, 0x9e, 0x5e, 0xa0, 0x5f, 0xc0,
-	0x5c, 0xcc, 0xa9, 0x43, 0xd9, 0xb9, 0xbc, 0xb0, 0x6d, 0x73, 0x41, 0xe5, 0x99, 0x8d, 0x39, 0xb5,
-	0x13, 0x93, 0xf5, 0x0f, 0x03, 0xe6, 0x87, 0x2e, 0x13, 0x32, 0x61, 0xd9, 0xae, 0x57, 0x8f, 0x77,
-	0x6b, 0xf5, 0x7d, 0xe7, 0xa4, 0xde, 0x6c, 0xd8, 0xd5, 0xda, 0x5e, 0xcd, 0xde, 0x2d, 0x4c, 0xa0,
-	0x39, 0x98, 0x3e, 0xac, 0xd5, 0xed, 0x0a, 0xde, 0x7a, 0x59, 0x30, 0xd0, 0x34, 0x4c, 0xee, 0x1d,
-	0x56, 0xaa, 0x85, 0x0c, 0x9a, 0x81, 0xdc, 0xd1, 0xc9, 0x61, 0xe5, 0xb4, 0x90, 0x45, 0x79, 0xc8,
-	0x56, 0x8e, 0x70, 0x61, 0x12, 0x01, 0x4c, 0x55, 0x8e, 0xb0, 0x73, 0xba, 0x53, 0xc8, 0xc9, 0xb8,
-	0xe3, 0xfd, 0x7d, 0xe7, 0xb8, 0x71, 0xd2, 0x2c, 0x4c, 0xa1, 0x22, 0xdc, 0x6f, 0x36, 0x6c, 0xfb,
-	0x8d, 0x73, 0x5a, 0x6b, 0x1d, 0x38, 0x07, 0x76, 0x65, 0xd7, 0xc6, 0xce, 0xce, 0x9f, 0x5a, 0x76,
-	0x21, 0x6f, 0x6d, 0xc2, 0xfc, 0x50, 0x89, 0x91, 0x09, 0xf9, 0xf0, 0x3c, 0x22, 0x9c, 0x72, 0xd3,
-	0x58, 0xcf, 0x6e, 0xcc, 0xe0, 0x74, 0x69, 0xe1, 0xbe, 0xfe, 0xf7, 0x05, 0x0e, 0x15, 0x21, 0x9f,
-	0x8a, 0x8a, 0x91, 0x88, 0x4a, 0x6a, 0x40, 0x08, 0xb2, 0x71, 0xe4, 0xab, 0x5e, 0x98, 0x39, 0x98,
-	0xc0, 0x72, 0xb1, 0xb3, 0x00, 0x5a, 0x73, 0x1c, 0x1e, 0xc4, 0x91, 0x4b, 0xad, 0xbf, 0xf4, 0xfb,
-	0x54, 0xea, 0x21, 0x0f, 0x03, 0xc6, 0x29, 0xaa, 0x41, 0x3e, 0x6d, 0xef, 0x8c, 0xba, 0x1d, 0xe5,
-	0xdb, 0x6f, 0xc7, 0x00, 0x2b, 0x2d, 0x00, 0x38, 0x8d, 0xb7, 0x7c, 0x58, 0xbd, 0x79, 0x36, 0x7c,
-	0xfe, 0x4f, 0x7d, 0x65, 0xdc, 0xfc, 0xad, 0x23, 0x2a, 0x48, 0x9b, 0x08, 0x92, 0xf4, 0x89, 0x17,
-	0x51, 0xce, 0x65, 0xeb, 0xba, 0x69, 0xd1, 0x72, 0xaa, 0x4f, 0x94, 0xbd, 0xa1, 0xcd, 0xe8, 0x37,
-	0x00, 0x5c, 0x90, 0x48, 0xa8, 0x1b, 0x9d, 0x4c, 0x9d, 0x62, 0xca, 0x2c, 0x1d, 0xdd, 0xa5, 0x56,
-	0x3a, 0xba, 0xf1, 0x8c, 0x42, 0xcb, 0x35, 0xda, 0x85, 0x42, 0x97, 0x70, 0xe1, 0xc4, 0x61, 0x5b,
-	0xea, 0x85, 0x4a, 0x90, 0xfd, 0x68, 0x82, 0x05, 0x19, 0x73, 0xa2, 0x42, 0xa4, 0xd1, 0xfa, 0x26,
-	0x73, 0x5d, 0xf6, 0x07, 0xca, 0xb6, 0x01, 0x39, 0x1a, 0x45, 0x41, 0x94, 0xa8, 0x3e, 0x4a, 0x33,
-	0x47, 0xa1, 0x5b, 0x6a, 0xaa, 0x47, 0x03, 0xd6, 0x00, 0x74, 0x38, 0x5a, 0xe0, 0x4f, 0x9a, 0x69,
-	0x23, 0x35, 0x46, 0x0c, 0x96, 0x12, 0xfd, 0xa0, 0x17, 0x94, 0x09, 0x47, 0x5c, 0x86, 0x54, 0xc9,
-	0xd2, 0xc2, 0xf6, 0xce, 0x5d, 0xf3, 0x5e, 0x6d, 0x23, 0x39, 0x53, 0x5b, 0xa6, 0x6a, 0x5d, 0x86,
-	0x14, 0x27, 0xe2, 0xd4, 0x37, 0x58, 0x87, 0xb0, 0x38, 0x82, 0x41, 0xab, 0x60, 0xca, 0x66, 0xaa,
-	0x1e, 0x38, 0xf6, 0x1f, 0xed, 0x7a, 0x6b, 0xa4, 0x61, 0x1f, 0xc2, 0x03, 0xbb, 0xbe, 0xeb, 0x1c,
-	0xef, 0x39, 0xcd, 0x5a, 0x7d, 0xff, 0xd0, 0x76, 0x4e, 0x5a, 0x2d, 0x1b, 0x57, 0xea, 0x55, 0xbb,
-	0x60, 0x58, 0x5f, 0x8f, 0x99, 0xa5, 0x7a, 0x97, 0xe8, 0x0d, 0xcc, 0x0d, 0xc9, 0xad, 0xa1, 0xea,
-	0xf5, 0xe2, 0xce, 0x17, 0x72, 0x40, 0x94, 0xf1, 0x50, 0x26, 0xb4, 0x02, 0xd3, 0x3e, 0x77, 0x3a,
-	0x3e, 0x23, 0xdd, 0x64, 0xb4, 0xe6, 0x7d, 0xbe, 0x27, 0x97, 0x68, 0x15, 0xe4, 0xdd, 0x39, 0xf3,
-	0xbb, 0xbe, 0xb8, 0x54, 0xf7, 0x24, 0x83, 0xaf, 0x0c, 0x68, 0x0d, 0x66, 0xd3, 0x51, 0x25, 0x88,
-	0xa7, 0x54, 0x3d, 0x87, 0x21, 0x31, 0xb5, 0x88, 0x67, 0xfd, 0xdb, 0x80, 0x07, 0x63, 0x3a, 0xe3,
-	0x47, 0xdc, 0xcf, 0x08, 0xad, 0xcc, 0x35, 0x5a, 0x1f, 0x0c, 0x58, 0xbd, 0x2d, 0x1f, 0x7a, 0x04,
-	0x20, 0x22, 0xc2, 0xb8, 0x1b, 0xf9, 0xa1, 0xee, 0xc2, 0x19, 0x3c, 0x60, 0x91, 0x7e, 0xf5, 0x3c,
-	0x69, 0xd3, 0xf4, 0x39, 0x92, 0xc1, 0x03, 0x16, 0xf4, 0x12, 0x72, 0x72, 0xe2, 0xc8, 0xf7, 0x87,
-	0xdc, 0xd4, 0xfa, 0xb8, 0x4d, 0xc9, 0xb9, 0x53, 0x63, 0x9d, 0x00, 0x6b, 0xb8, 0xf5, 0x4f, 0x03,
-	0xa6, 0x53, 0x1b, 0xfa, 0xf5, 0x50, 0x97, 0xeb, 0x56, 0x5a, 0xb9, 0xd6, 0xa4, 0xbb, 0xc9, 0xeb,
-	0x7e, 0xb0, 0xc9, 0x5f, 0xc8, 0x97, 0x4c, 0x7b, 0x50, 0x1d, 0x6e, 0x89, 0xcb, 0x53, 0xa6, 0x66,
-	0x1f, 0x42, 0x30, 0x29, 0x59, 0x24, 0xf3, 0x5e, 0xfd, 0xde, 0xfe, 0x7f, 0x16, 0xa6, 0x74, 0xa5,
-	0xd0, 0x7b, 0x03, 0x66, 0xfa, 0x3d, 0x82, 0x3e, 0xf6, 0xc8, 0xed, 0xbf, 0x5f, 0x8b, 0x9b, 0x77,
-	0x40, 0xea, 0x86, 0xb3, 0xd6, 0xfe, 0xfe, 0xed, 0x77, 0xff, 0xca, 0xac, 0x58, 0xcb, 0xf2, 0x0f,
-	0x95, 0x06, 0xbe, 0x8e, 0x52, 0xd4, 0x6b, 0xe3, 0x19, 0xfa, 0x60, 0xc0, 0xf2, 0x4d, 0x22, 0x8a,
-	0x9e, 0x8f, 0xfb, 0xc8, 0x2d, 0x4f, 0xff, 0xe2, 0xcf, 0xd3, 0xa0, 0x81, 0xbf, 0x5a, 0xa5, 0xe3,
-	0xf4, 0xaf, 0x96, 0xf5, 0x4c, 0xb1, 0xf9, 0xa5, 0xb5, 0x36, 0xc0, 0x66, 0x00, 0x39, 0x44, 0xec,
-	0xbd, 0x01, 0xe8, 0xba, 0x92, 0xa0, 0xad, 0x4f, 0x51, 0x1d, 0x4d, 0x6a, 0xfb, 0xd3, 0x85, 0xca,
-	0x9a, 0xd8, 0x30, 0x7e, 0x65, 0xec, 0x74, 0xa1, 0xe8, 0x06, 0xbd, 0x31, 0xe1, 0x3b, 0xb3, 0xfa,
-	0x18, 0x1b, 0xf2, 0xfc, 0x1b, 0xc6, 0x9f, 0x7f, 0x97, 0xc0, 0xbc, 0x40, 0xbe, 0xeb, 0x4a, 0x41,
-	0xe4, 0x95, 0x3d, 0xca, 0xd4, 0xed, 0x28, 0x6b, 0x17, 0x09, 0x7d, 0x3e, 0xfa, 0x2f, 0xf7, 0xb7,
-	0xfa, 0xd7, 0xf7, 0x86, 0x71, 0x36, 0xa5, 0xb0, 0xcf, 0x7f, 0x08, 0x00, 0x00, 0xff, 0xff, 0x37,
-	0x96, 0x14, 0x87, 0x10, 0x0f, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go b/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
index 3b7bd607e3..0c75db78d8 100644
--- a/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
+++ b/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/speech/v1p1beta1/cloud_speech.proto
 
-package speech // import "google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package speech
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -28,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The encoding of the audio data sent in the request.
 //
@@ -101,6 +101,7 @@ var RecognitionConfig_AudioEncoding_name = map[int32]string{
 	6: "OGG_OPUS",
 	7: "SPEEX_WITH_HEADER_BYTE",
 }
+
 var RecognitionConfig_AudioEncoding_value = map[string]int32{
 	"ENCODING_UNSPECIFIED":   0,
 	"LINEAR16":               1,
@@ -115,8 +116,9 @@ var RecognitionConfig_AudioEncoding_value = map[string]int32{
 func (x RecognitionConfig_AudioEncoding) String() string {
 	return proto.EnumName(RecognitionConfig_AudioEncoding_name, int32(x))
 }
+
 func (RecognitionConfig_AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{4, 0}
+	return fileDescriptor_6adcab595cc29495, []int{4, 0}
 }
 
 // Use case categories that the audio recognition request can be described
@@ -162,6 +164,7 @@ var RecognitionMetadata_InteractionType_name = map[int32]string{
 	7: "VOICE_COMMAND",
 	8: "DICTATION",
 }
+
 var RecognitionMetadata_InteractionType_value = map[string]int32{
 	"INTERACTION_TYPE_UNSPECIFIED": 0,
 	"DISCUSSION":                   1,
@@ -177,8 +180,9 @@ var RecognitionMetadata_InteractionType_value = map[string]int32{
 func (x RecognitionMetadata_InteractionType) String() string {
 	return proto.EnumName(RecognitionMetadata_InteractionType_name, int32(x))
 }
+
 func (RecognitionMetadata_InteractionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{5, 0}
+	return fileDescriptor_6adcab595cc29495, []int{5, 0}
 }
 
 // Enumerates the types of capture settings describing an audio file.
@@ -203,6 +207,7 @@ var RecognitionMetadata_MicrophoneDistance_name = map[int32]string{
 	2: "MIDFIELD",
 	3: "FARFIELD",
 }
+
 var RecognitionMetadata_MicrophoneDistance_value = map[string]int32{
 	"MICROPHONE_DISTANCE_UNSPECIFIED": 0,
 	"NEARFIELD":                       1,
@@ -213,8 +218,9 @@ var RecognitionMetadata_MicrophoneDistance_value = map[string]int32{
 func (x RecognitionMetadata_MicrophoneDistance) String() string {
 	return proto.EnumName(RecognitionMetadata_MicrophoneDistance_name, int32(x))
 }
+
 func (RecognitionMetadata_MicrophoneDistance) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{5, 1}
+	return fileDescriptor_6adcab595cc29495, []int{5, 1}
 }
 
 // The original media the speech was recorded on.
@@ -234,6 +240,7 @@ var RecognitionMetadata_OriginalMediaType_name = map[int32]string{
 	1: "AUDIO",
 	2: "VIDEO",
 }
+
 var RecognitionMetadata_OriginalMediaType_value = map[string]int32{
 	"ORIGINAL_MEDIA_TYPE_UNSPECIFIED": 0,
 	"AUDIO":                           1,
@@ -243,8 +250,9 @@ var RecognitionMetadata_OriginalMediaType_value = map[string]int32{
 func (x RecognitionMetadata_OriginalMediaType) String() string {
 	return proto.EnumName(RecognitionMetadata_OriginalMediaType_name, int32(x))
 }
+
 func (RecognitionMetadata_OriginalMediaType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{5, 2}
+	return fileDescriptor_6adcab595cc29495, []int{5, 2}
 }
 
 // The type of device the speech was recorded with.
@@ -276,6 +284,7 @@ var RecognitionMetadata_RecordingDeviceType_name = map[int32]string{
 	5: "OTHER_OUTDOOR_DEVICE",
 	6: "OTHER_INDOOR_DEVICE",
 }
+
 var RecognitionMetadata_RecordingDeviceType_value = map[string]int32{
 	"RECORDING_DEVICE_TYPE_UNSPECIFIED": 0,
 	"SMARTPHONE":                        1,
@@ -289,8 +298,9 @@ var RecognitionMetadata_RecordingDeviceType_value = map[string]int32{
 func (x RecognitionMetadata_RecordingDeviceType) String() string {
 	return proto.EnumName(RecognitionMetadata_RecordingDeviceType_name, int32(x))
 }
+
 func (RecognitionMetadata_RecordingDeviceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{5, 3}
+	return fileDescriptor_6adcab595cc29495, []int{5, 3}
 }
 
 // Indicates the type of speech event.
@@ -313,6 +323,7 @@ var StreamingRecognizeResponse_SpeechEventType_name = map[int32]string{
 	0: "SPEECH_EVENT_UNSPECIFIED",
 	1: "END_OF_SINGLE_UTTERANCE",
 }
+
 var StreamingRecognizeResponse_SpeechEventType_value = map[string]int32{
 	"SPEECH_EVENT_UNSPECIFIED": 0,
 	"END_OF_SINGLE_UTTERANCE":  1,
@@ -321,8 +332,9 @@ var StreamingRecognizeResponse_SpeechEventType_value = map[string]int32{
 func (x StreamingRecognizeResponse_SpeechEventType) String() string {
 	return proto.EnumName(StreamingRecognizeResponse_SpeechEventType_name, int32(x))
 }
+
 func (StreamingRecognizeResponse_SpeechEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{11, 0}
+	return fileDescriptor_6adcab595cc29495, []int{11, 0}
 }
 
 // The top-level message sent by the client for the `Recognize` method.
@@ -341,16 +353,17 @@ func (m *RecognizeRequest) Reset()         { *m = RecognizeRequest{} }
 func (m *RecognizeRequest) String() string { return proto.CompactTextString(m) }
 func (*RecognizeRequest) ProtoMessage()    {}
 func (*RecognizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{0}
+	return fileDescriptor_6adcab595cc29495, []int{0}
 }
+
 func (m *RecognizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognizeRequest.Unmarshal(m, b)
 }
 func (m *RecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *RecognizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognizeRequest.Merge(dst, src)
+func (m *RecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeRequest.Merge(m, src)
 }
 func (m *RecognizeRequest) XXX_Size() int {
 	return xxx_messageInfo_RecognizeRequest.Size(m)
@@ -392,16 +405,17 @@ func (m *LongRunningRecognizeRequest) Reset()         { *m = LongRunningRecogniz
 func (m *LongRunningRecognizeRequest) String() string { return proto.CompactTextString(m) }
 func (*LongRunningRecognizeRequest) ProtoMessage()    {}
 func (*LongRunningRecognizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{1}
+	return fileDescriptor_6adcab595cc29495, []int{1}
 }
+
 func (m *LongRunningRecognizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LongRunningRecognizeRequest.Unmarshal(m, b)
 }
 func (m *LongRunningRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LongRunningRecognizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *LongRunningRecognizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LongRunningRecognizeRequest.Merge(dst, src)
+func (m *LongRunningRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeRequest.Merge(m, src)
 }
 func (m *LongRunningRecognizeRequest) XXX_Size() int {
 	return xxx_messageInfo_LongRunningRecognizeRequest.Size(m)
@@ -447,16 +461,17 @@ func (m *StreamingRecognizeRequest) Reset()         { *m = StreamingRecognizeReq
 func (m *StreamingRecognizeRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognizeRequest) ProtoMessage()    {}
 func (*StreamingRecognizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{2}
+	return fileDescriptor_6adcab595cc29495, []int{2}
 }
+
 func (m *StreamingRecognizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognizeRequest.Unmarshal(m, b)
 }
 func (m *StreamingRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognizeRequest.Merge(dst, src)
+func (m *StreamingRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeRequest.Merge(m, src)
 }
 func (m *StreamingRecognizeRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognizeRequest.Size(m)
@@ -504,76 +519,14 @@ func (m *StreamingRecognizeRequest) GetAudioContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StreamingRecognizeRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StreamingRecognizeRequest_OneofMarshaler, _StreamingRecognizeRequest_OneofUnmarshaler, _StreamingRecognizeRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StreamingRecognizeRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StreamingRecognizeRequest_StreamingConfig)(nil),
 		(*StreamingRecognizeRequest_AudioContent)(nil),
 	}
 }
 
-func _StreamingRecognizeRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StreamingRecognizeRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingRecognizeRequest_StreamingConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StreamingConfig); err != nil {
-			return err
-		}
-	case *StreamingRecognizeRequest_AudioContent:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AudioContent)
-	case nil:
-	default:
-		return fmt.Errorf("StreamingRecognizeRequest.StreamingRequest has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StreamingRecognizeRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StreamingRecognizeRequest)
-	switch tag {
-	case 1: // streaming_request.streaming_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingRecognitionConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingRequest = &StreamingRecognizeRequest_StreamingConfig{msg}
-		return true, err
-	case 2: // streaming_request.audio_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StreamingRequest = &StreamingRecognizeRequest_AudioContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StreamingRecognizeRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StreamingRecognizeRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingRecognizeRequest_StreamingConfig:
-		s := proto.Size(x.StreamingConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StreamingRecognizeRequest_AudioContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AudioContent)))
-		n += len(x.AudioContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Provides information to the recognizer that specifies how to process the
 // request.
 type StreamingRecognitionConfig struct {
@@ -606,16 +559,17 @@ func (m *StreamingRecognitionConfig) Reset()         { *m = StreamingRecognition
 func (m *StreamingRecognitionConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognitionConfig) ProtoMessage()    {}
 func (*StreamingRecognitionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{3}
+	return fileDescriptor_6adcab595cc29495, []int{3}
 }
+
 func (m *StreamingRecognitionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognitionConfig.Unmarshal(m, b)
 }
 func (m *StreamingRecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognitionConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognitionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognitionConfig.Merge(dst, src)
+func (m *StreamingRecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionConfig.Merge(m, src)
 }
 func (m *StreamingRecognitionConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognitionConfig.Size(m)
@@ -809,16 +763,17 @@ func (m *RecognitionConfig) Reset()         { *m = RecognitionConfig{} }
 func (m *RecognitionConfig) String() string { return proto.CompactTextString(m) }
 func (*RecognitionConfig) ProtoMessage()    {}
 func (*RecognitionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{4}
+	return fileDescriptor_6adcab595cc29495, []int{4}
 }
+
 func (m *RecognitionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognitionConfig.Unmarshal(m, b)
 }
 func (m *RecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognitionConfig.Marshal(b, m, deterministic)
 }
-func (dst *RecognitionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognitionConfig.Merge(dst, src)
+func (m *RecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionConfig.Merge(m, src)
 }
 func (m *RecognitionConfig) XXX_Size() int {
 	return xxx_messageInfo_RecognitionConfig.Size(m)
@@ -987,16 +942,17 @@ func (m *RecognitionMetadata) Reset()         { *m = RecognitionMetadata{} }
 func (m *RecognitionMetadata) String() string { return proto.CompactTextString(m) }
 func (*RecognitionMetadata) ProtoMessage()    {}
 func (*RecognitionMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{5}
+	return fileDescriptor_6adcab595cc29495, []int{5}
 }
+
 func (m *RecognitionMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognitionMetadata.Unmarshal(m, b)
 }
 func (m *RecognitionMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognitionMetadata.Marshal(b, m, deterministic)
 }
-func (dst *RecognitionMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognitionMetadata.Merge(dst, src)
+func (m *RecognitionMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionMetadata.Merge(m, src)
 }
 func (m *RecognitionMetadata) XXX_Size() int {
 	return xxx_messageInfo_RecognitionMetadata.Size(m)
@@ -1089,16 +1045,17 @@ func (m *SpeechContext) Reset()         { *m = SpeechContext{} }
 func (m *SpeechContext) String() string { return proto.CompactTextString(m) }
 func (*SpeechContext) ProtoMessage()    {}
 func (*SpeechContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{6}
+	return fileDescriptor_6adcab595cc29495, []int{6}
 }
+
 func (m *SpeechContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechContext.Unmarshal(m, b)
 }
 func (m *SpeechContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechContext.Marshal(b, m, deterministic)
 }
-func (dst *SpeechContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechContext.Merge(dst, src)
+func (m *SpeechContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechContext.Merge(m, src)
 }
 func (m *SpeechContext) XXX_Size() int {
 	return xxx_messageInfo_SpeechContext.Size(m)
@@ -1137,16 +1094,17 @@ func (m *RecognitionAudio) Reset()         { *m = RecognitionAudio{} }
 func (m *RecognitionAudio) String() string { return proto.CompactTextString(m) }
 func (*RecognitionAudio) ProtoMessage()    {}
 func (*RecognitionAudio) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{7}
+	return fileDescriptor_6adcab595cc29495, []int{7}
 }
+
 func (m *RecognitionAudio) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognitionAudio.Unmarshal(m, b)
 }
 func (m *RecognitionAudio) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognitionAudio.Marshal(b, m, deterministic)
 }
-func (dst *RecognitionAudio) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognitionAudio.Merge(dst, src)
+func (m *RecognitionAudio) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionAudio.Merge(m, src)
 }
 func (m *RecognitionAudio) XXX_Size() int {
 	return xxx_messageInfo_RecognitionAudio.Size(m)
@@ -1194,72 +1152,14 @@ func (m *RecognitionAudio) GetUri() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecognitionAudio) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecognitionAudio_OneofMarshaler, _RecognitionAudio_OneofUnmarshaler, _RecognitionAudio_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RecognitionAudio) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RecognitionAudio_Content)(nil),
 		(*RecognitionAudio_Uri)(nil),
 	}
 }
 
-func _RecognitionAudio_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecognitionAudio)
-	// audio_source
-	switch x := m.AudioSource.(type) {
-	case *RecognitionAudio_Content:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Content)
-	case *RecognitionAudio_Uri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uri)
-	case nil:
-	default:
-		return fmt.Errorf("RecognitionAudio.AudioSource has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecognitionAudio_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecognitionAudio)
-	switch tag {
-	case 1: // audio_source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.AudioSource = &RecognitionAudio_Content{x}
-		return true, err
-	case 2: // audio_source.uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.AudioSource = &RecognitionAudio_Uri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecognitionAudio_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecognitionAudio)
-	// audio_source
-	switch x := m.AudioSource.(type) {
-	case *RecognitionAudio_Content:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case *RecognitionAudio_Uri:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uri)))
-		n += len(x.Uri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The only message returned to the client by the `Recognize` method. It
 // contains the result as zero or more sequential `SpeechRecognitionResult`
 // messages.
@@ -1276,16 +1176,17 @@ func (m *RecognizeResponse) Reset()         { *m = RecognizeResponse{} }
 func (m *RecognizeResponse) String() string { return proto.CompactTextString(m) }
 func (*RecognizeResponse) ProtoMessage()    {}
 func (*RecognizeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{8}
+	return fileDescriptor_6adcab595cc29495, []int{8}
 }
+
 func (m *RecognizeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecognizeResponse.Unmarshal(m, b)
 }
 func (m *RecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecognizeResponse.Marshal(b, m, deterministic)
 }
-func (dst *RecognizeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecognizeResponse.Merge(dst, src)
+func (m *RecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeResponse.Merge(m, src)
 }
 func (m *RecognizeResponse) XXX_Size() int {
 	return xxx_messageInfo_RecognizeResponse.Size(m)
@@ -1321,16 +1222,17 @@ func (m *LongRunningRecognizeResponse) Reset()         { *m = LongRunningRecogni
 func (m *LongRunningRecognizeResponse) String() string { return proto.CompactTextString(m) }
 func (*LongRunningRecognizeResponse) ProtoMessage()    {}
 func (*LongRunningRecognizeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{9}
+	return fileDescriptor_6adcab595cc29495, []int{9}
 }
+
 func (m *LongRunningRecognizeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LongRunningRecognizeResponse.Unmarshal(m, b)
 }
 func (m *LongRunningRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LongRunningRecognizeResponse.Marshal(b, m, deterministic)
 }
-func (dst *LongRunningRecognizeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LongRunningRecognizeResponse.Merge(dst, src)
+func (m *LongRunningRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeResponse.Merge(m, src)
 }
 func (m *LongRunningRecognizeResponse) XXX_Size() int {
 	return xxx_messageInfo_LongRunningRecognizeResponse.Size(m)
@@ -1368,16 +1270,17 @@ func (m *LongRunningRecognizeMetadata) Reset()         { *m = LongRunningRecogni
 func (m *LongRunningRecognizeMetadata) String() string { return proto.CompactTextString(m) }
 func (*LongRunningRecognizeMetadata) ProtoMessage()    {}
 func (*LongRunningRecognizeMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{10}
+	return fileDescriptor_6adcab595cc29495, []int{10}
 }
+
 func (m *LongRunningRecognizeMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LongRunningRecognizeMetadata.Unmarshal(m, b)
 }
 func (m *LongRunningRecognizeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LongRunningRecognizeMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LongRunningRecognizeMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LongRunningRecognizeMetadata.Merge(dst, src)
+func (m *LongRunningRecognizeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeMetadata.Merge(m, src)
 }
 func (m *LongRunningRecognizeMetadata) XXX_Size() int {
 	return xxx_messageInfo_LongRunningRecognizeMetadata.Size(m)
@@ -1478,16 +1381,17 @@ func (m *StreamingRecognizeResponse) Reset()         { *m = StreamingRecognizeRe
 func (m *StreamingRecognizeResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognizeResponse) ProtoMessage()    {}
 func (*StreamingRecognizeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{11}
+	return fileDescriptor_6adcab595cc29495, []int{11}
 }
+
 func (m *StreamingRecognizeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognizeResponse.Unmarshal(m, b)
 }
 func (m *StreamingRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognizeResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognizeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognizeResponse.Merge(dst, src)
+func (m *StreamingRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeResponse.Merge(m, src)
 }
 func (m *StreamingRecognizeResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognizeResponse.Size(m)
@@ -1560,16 +1464,17 @@ func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognition
 func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
 func (*StreamingRecognitionResult) ProtoMessage()    {}
 func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{12}
+	return fileDescriptor_6adcab595cc29495, []int{12}
 }
+
 func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
 }
 func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
 }
-func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+func (m *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(m, src)
 }
 func (m *StreamingRecognitionResult) XXX_Size() int {
 	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
@@ -1647,16 +1552,17 @@ func (m *SpeechRecognitionResult) Reset()         { *m = SpeechRecognitionResult
 func (m *SpeechRecognitionResult) String() string { return proto.CompactTextString(m) }
 func (*SpeechRecognitionResult) ProtoMessage()    {}
 func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{13}
+	return fileDescriptor_6adcab595cc29495, []int{13}
 }
+
 func (m *SpeechRecognitionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechRecognitionResult.Unmarshal(m, b)
 }
 func (m *SpeechRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechRecognitionResult.Marshal(b, m, deterministic)
 }
-func (dst *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechRecognitionResult.Merge(dst, src)
+func (m *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionResult.Merge(m, src)
 }
 func (m *SpeechRecognitionResult) XXX_Size() int {
 	return xxx_messageInfo_SpeechRecognitionResult.Size(m)
@@ -1713,16 +1619,17 @@ func (m *SpeechRecognitionAlternative) Reset()         { *m = SpeechRecognitionA
 func (m *SpeechRecognitionAlternative) String() string { return proto.CompactTextString(m) }
 func (*SpeechRecognitionAlternative) ProtoMessage()    {}
 func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{14}
+	return fileDescriptor_6adcab595cc29495, []int{14}
 }
+
 func (m *SpeechRecognitionAlternative) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Unmarshal(m, b)
 }
 func (m *SpeechRecognitionAlternative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Marshal(b, m, deterministic)
 }
-func (dst *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechRecognitionAlternative.Merge(dst, src)
+func (m *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionAlternative.Merge(m, src)
 }
 func (m *SpeechRecognitionAlternative) XXX_Size() int {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Size(m)
@@ -1795,16 +1702,17 @@ func (m *WordInfo) Reset()         { *m = WordInfo{} }
 func (m *WordInfo) String() string { return proto.CompactTextString(m) }
 func (*WordInfo) ProtoMessage()    {}
 func (*WordInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_speech_71c4a621c1d5e720, []int{15}
+	return fileDescriptor_6adcab595cc29495, []int{15}
 }
+
 func (m *WordInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WordInfo.Unmarshal(m, b)
 }
 func (m *WordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WordInfo.Marshal(b, m, deterministic)
 }
-func (dst *WordInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WordInfo.Merge(dst, src)
+func (m *WordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WordInfo.Merge(m, src)
 }
 func (m *WordInfo) XXX_Size() int {
 	return xxx_messageInfo_WordInfo.Size(m)
@@ -1851,6 +1759,12 @@ func (m *WordInfo) GetSpeakerTag() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionConfig_AudioEncoding", RecognitionConfig_AudioEncoding_name, RecognitionConfig_AudioEncoding_value)
+	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_InteractionType", RecognitionMetadata_InteractionType_name, RecognitionMetadata_InteractionType_value)
+	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_MicrophoneDistance", RecognitionMetadata_MicrophoneDistance_name, RecognitionMetadata_MicrophoneDistance_value)
+	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_OriginalMediaType", RecognitionMetadata_OriginalMediaType_name, RecognitionMetadata_OriginalMediaType_value)
+	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_RecordingDeviceType", RecognitionMetadata_RecordingDeviceType_name, RecognitionMetadata_RecordingDeviceType_value)
+	proto.RegisterEnum("google.cloud.speech.v1p1beta1.StreamingRecognizeResponse_SpeechEventType", StreamingRecognizeResponse_SpeechEventType_name, StreamingRecognizeResponse_SpeechEventType_value)
 	proto.RegisterType((*RecognizeRequest)(nil), "google.cloud.speech.v1p1beta1.RecognizeRequest")
 	proto.RegisterType((*LongRunningRecognizeRequest)(nil), "google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest")
 	proto.RegisterType((*StreamingRecognizeRequest)(nil), "google.cloud.speech.v1p1beta1.StreamingRecognizeRequest")
@@ -1867,12 +1781,151 @@ func init() {
 	proto.RegisterType((*SpeechRecognitionResult)(nil), "google.cloud.speech.v1p1beta1.SpeechRecognitionResult")
 	proto.RegisterType((*SpeechRecognitionAlternative)(nil), "google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative")
 	proto.RegisterType((*WordInfo)(nil), "google.cloud.speech.v1p1beta1.WordInfo")
-	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionConfig_AudioEncoding", RecognitionConfig_AudioEncoding_name, RecognitionConfig_AudioEncoding_value)
-	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_InteractionType", RecognitionMetadata_InteractionType_name, RecognitionMetadata_InteractionType_value)
-	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_MicrophoneDistance", RecognitionMetadata_MicrophoneDistance_name, RecognitionMetadata_MicrophoneDistance_value)
-	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_OriginalMediaType", RecognitionMetadata_OriginalMediaType_name, RecognitionMetadata_OriginalMediaType_value)
-	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_RecordingDeviceType", RecognitionMetadata_RecordingDeviceType_name, RecognitionMetadata_RecordingDeviceType_value)
-	proto.RegisterEnum("google.cloud.speech.v1p1beta1.StreamingRecognizeResponse_SpeechEventType", StreamingRecognizeResponse_SpeechEventType_name, StreamingRecognizeResponse_SpeechEventType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/speech/v1p1beta1/cloud_speech.proto", fileDescriptor_6adcab595cc29495)
+}
+
+var fileDescriptor_6adcab595cc29495 = []byte{
+	// 2178 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xbf, 0x73, 0xdb, 0xc8,
+	0xf5, 0x37, 0x48, 0x51, 0x12, 0x9f, 0x7e, 0x41, 0x2b, 0xdf, 0x89, 0x96, 0x75, 0x67, 0x1b, 0x9e,
+	0x3b, 0xfb, 0xee, 0x7b, 0x43, 0xd9, 0xfa, 0xde, 0x5c, 0xce, 0xbe, 0xe4, 0x26, 0x14, 0x00, 0x99,
+	0x98, 0x21, 0x09, 0xce, 0x92, 0xb2, 0xe3, 0x6b, 0x76, 0x56, 0xc4, 0x92, 0xc2, 0x84, 0x04, 0x10,
+	0x60, 0xe1, 0x58, 0x2e, 0xd3, 0xa6, 0x48, 0x91, 0x99, 0x74, 0xa9, 0x72, 0x75, 0xfe, 0x80, 0x34,
+	0x97, 0x26, 0x4d, 0x9a, 0x14, 0xe9, 0x52, 0xa5, 0xc8, 0x7f, 0x90, 0x26, 0x33, 0x69, 0x32, 0xbb,
+	0x0b, 0x50, 0x10, 0x29, 0x5b, 0xb6, 0x26, 0x37, 0x93, 0x0e, 0xfb, 0x79, 0x3f, 0xf6, 0xbd, 0xb7,
+	0x6f, 0xdf, 0xbe, 0x07, 0x78, 0x30, 0x0a, 0xc3, 0xd1, 0x98, 0xed, 0x0d, 0xc6, 0x61, 0xea, 0xed,
+	0x25, 0x11, 0x63, 0x83, 0x93, 0xbd, 0x17, 0x0f, 0xa3, 0x87, 0xc7, 0x8c, 0xd3, 0x87, 0x0a, 0x26,
+	0x0a, 0xae, 0x47, 0x71, 0xc8, 0x43, 0xf4, 0x81, 0x92, 0xa8, 0x4b, 0x52, 0x3d, 0x23, 0x4d, 0x25,
+	0x76, 0x76, 0x33, 0x85, 0x34, 0xf2, 0xf7, 0x68, 0x10, 0x84, 0x9c, 0x72, 0x3f, 0x0c, 0x12, 0x25,
+	0xbc, 0x73, 0x37, 0xa3, 0x8e, 0xc3, 0x60, 0x14, 0xa7, 0x41, 0xe0, 0x07, 0xa3, 0xbd, 0x30, 0x62,
+	0xf1, 0x39, 0xa6, 0x1b, 0x19, 0x93, 0x5c, 0x1d, 0xa7, 0xc3, 0x3d, 0x1a, 0x9c, 0x66, 0xa4, 0x0f,
+	0x67, 0x49, 0x5e, 0xaa, 0x64, 0x33, 0xfa, 0xcd, 0x59, 0x3a, 0x9b, 0x44, 0x3c, 0x17, 0xbe, 0x35,
+	0x4b, 0xe4, 0xfe, 0x84, 0x25, 0x9c, 0x4e, 0xa2, 0x8c, 0x61, 0x3b, 0x63, 0x88, 0xa3, 0xc1, 0x5e,
+	0xc2, 0x29, 0x4f, 0x33, 0x8b, 0x8c, 0xdf, 0x69, 0xa0, 0x63, 0x36, 0x08, 0x47, 0x81, 0xff, 0x8a,
+	0x61, 0xf6, 0xb3, 0x94, 0x25, 0x1c, 0x35, 0x61, 0x71, 0x10, 0x06, 0x43, 0x7f, 0x54, 0xd3, 0x6e,
+	0x6b, 0xf7, 0x57, 0xf6, 0x1f, 0xd4, 0xdf, 0x18, 0x99, 0x7a, 0xa6, 0x40, 0x58, 0x6b, 0x4a, 0x39,
+	0x9c, 0xc9, 0x23, 0x1b, 0x2a, 0x34, 0xf5, 0xfc, 0xb0, 0x56, 0x92, 0x8a, 0xf6, 0xde, 0x5e, 0x51,
+	0x43, 0x88, 0x61, 0x25, 0x6d, 0xfc, 0x5e, 0x83, 0x9b, 0xad, 0x30, 0x18, 0x61, 0x15, 0xd8, 0xff,
+	0x7d, 0x83, 0xbf, 0xd3, 0xe0, 0x46, 0x8f, 0xc7, 0x8c, 0x4e, 0x2e, 0x32, 0x77, 0x08, 0x7a, 0x92,
+	0x13, 0xc9, 0x39, 0xc3, 0x1f, 0x5d, 0xb2, 0xdf, 0xac, 0xce, 0x33, 0x0f, 0x9a, 0xd7, 0xf0, 0xc6,
+	0x54, 0xa9, 0x82, 0xd0, 0x47, 0xb0, 0x26, 0xcd, 0x11, 0x7b, 0x70, 0x16, 0x70, 0xe9, 0xd4, 0x6a,
+	0xf3, 0x1a, 0x5e, 0x95, 0xb0, 0xa9, 0xd0, 0x83, 0x2d, 0xd8, 0x3c, 0x33, 0x27, 0x56, 0x36, 0x1a,
+	0x7f, 0xd0, 0x60, 0xe7, 0xf5, 0xbb, 0xfd, 0x17, 0x23, 0xfe, 0x09, 0xe8, 0x89, 0x1f, 0x8c, 0xc6,
+	0x8c, 0xa4, 0x9c, 0xb3, 0x98, 0x06, 0x03, 0x26, 0xed, 0x5c, 0xc6, 0x1b, 0x0a, 0x3f, 0xca, 0x61,
+	0x74, 0x0f, 0x36, 0xfc, 0x80, 0xb3, 0xd8, 0x9f, 0x90, 0x98, 0x25, 0xe9, 0x98, 0x27, 0xb5, 0xb2,
+	0xe4, 0x5c, 0xcf, 0x60, 0xac, 0x50, 0xe3, 0x9f, 0xcb, 0xb0, 0x39, 0x6f, 0xf3, 0x37, 0xb0, 0xcc,
+	0x82, 0x41, 0xe8, 0xf9, 0x81, 0xb2, 0x7a, 0x7d, 0xff, 0xeb, 0x77, 0xb5, 0xba, 0x2e, 0x4f, 0xd9,
+	0xce, 0xb4, 0xe0, 0xa9, 0x3e, 0xf4, 0x29, 0x6c, 0x26, 0x74, 0x12, 0x8d, 0x19, 0x89, 0x29, 0x67,
+	0xe4, 0x84, 0xc5, 0xfc, 0x95, 0x74, 0xa3, 0x82, 0x37, 0x14, 0x01, 0x53, 0xce, 0x9a, 0x02, 0x46,
+	0x75, 0xd8, 0xca, 0x8e, 0xe5, 0x84, 0x06, 0x01, 0x1b, 0x93, 0x41, 0x98, 0x06, 0xbc, 0xb6, 0x24,
+	0xb9, 0x37, 0xd5, 0xd1, 0x28, 0x8a, 0x29, 0x08, 0xa8, 0x0f, 0xf7, 0x58, 0x40, 0x8f, 0xc7, 0x8c,
+	0x24, 0x2c, 0xa2, 0x52, 0x7f, 0x7c, 0x66, 0x18, 0x89, 0x58, 0x9c, 0x6b, 0xaa, 0xad, 0xca, 0x70,
+	0xdc, 0x55, 0xec, 0xbd, 0x8c, 0xbb, 0xe0, 0x45, 0x97, 0xc5, 0x99, 0x6a, 0x74, 0x17, 0xd6, 0xc6,
+	0x34, 0x18, 0xa5, 0x74, 0xc4, 0xc8, 0x20, 0xf4, 0x98, 0x0c, 0x65, 0x15, 0xaf, 0xe6, 0xa0, 0x19,
+	0x7a, 0x0c, 0xfd, 0x10, 0x76, 0xe8, 0x98, 0xb3, 0x38, 0xa0, 0xdc, 0x7f, 0xc1, 0xc8, 0x39, 0x81,
+	0xa4, 0x86, 0x6e, 0x97, 0xef, 0x57, 0x71, 0xad, 0xc0, 0xd1, 0x2a, 0x08, 0x27, 0xe2, 0x68, 0x27,
+	0xf4, 0x25, 0x29, 0xd0, 0x93, 0xda, 0x82, 0x8a, 0xc9, 0x84, 0xbe, 0x6c, 0x14, 0x60, 0xc1, 0x1a,
+	0xc5, 0xe1, 0x90, 0x06, 0x3e, 0x3f, 0x25, 0x43, 0x5f, 0x90, 0x6a, 0x15, 0x95, 0x05, 0x53, 0xfc,
+	0x50, 0xc2, 0xe8, 0x08, 0x36, 0xd4, 0x41, 0xa9, 0xb4, 0x7e, 0xc9, 0x93, 0xda, 0xe2, 0xed, 0xf2,
+	0xfd, 0x95, 0xfd, 0xcf, 0x2e, 0xbb, 0x3c, 0x12, 0x30, 0x95, 0x10, 0x5e, 0x4f, 0x8a, 0xcb, 0x04,
+	0xfd, 0x00, 0x6a, 0x59, 0x94, 0x7f, 0x1e, 0xc6, 0x1e, 0x11, 0x15, 0x94, 0x84, 0xc3, 0x61, 0xc2,
+	0x78, 0x52, 0x5b, 0x96, 0x96, 0xbc, 0xa7, 0xe8, 0xcf, 0xc2, 0xd8, 0xeb, 0xfb, 0x13, 0xe6, 0x2a,
+	0x22, 0xfa, 0x1c, 0xde, 0x2f, 0x0a, 0xca, 0xb4, 0xf6, 0x98, 0x48, 0xe3, 0x0d, 0x29, 0x76, 0xfd,
+	0x4c, 0xcc, 0x9c, 0xd2, 0xd0, 0x8f, 0x61, 0x37, 0x93, 0xa2, 0x29, 0x0f, 0x27, 0x94, 0xfb, 0x03,
+	0x12, 0xa5, 0xc1, 0x80, 0xa7, 0xb2, 0xea, 0xd7, 0x56, 0xa4, 0xec, 0x8e, 0xe2, 0x69, 0xe4, 0x2c,
+	0xdd, 0x33, 0x0e, 0x71, 0x36, 0x79, 0x5a, 0x44, 0x8c, 0xfe, 0x94, 0xc5, 0xc4, 0xf3, 0x69, 0xec,
+	0xbf, 0x52, 0xf2, 0xba, 0x94, 0xcf, 0x5c, 0xea, 0x29, 0x06, 0xeb, 0x8c, 0x8e, 0x1e, 0xc3, 0x8d,
+	0x02, 0xfb, 0x54, 0x85, 0x4a, 0xc5, 0x4d, 0x79, 0x48, 0xdb, 0x05, 0x86, 0x4c, 0x83, 0x4a, 0xc8,
+	0x0e, 0x2c, 0x4f, 0x18, 0xa7, 0x1e, 0xe5, 0xb4, 0x56, 0x95, 0xd7, 0x7f, 0xff, 0xed, 0x2f, 0x52,
+	0x3b, 0x93, 0xc4, 0x53, 0x1d, 0xe8, 0x3a, 0x54, 0x26, 0xa1, 0xc7, 0xc6, 0xb5, 0x35, 0x99, 0x82,
+	0x6a, 0x81, 0xee, 0xc0, 0x6a, 0x9a, 0x30, 0xc2, 0x82, 0x13, 0x71, 0xf9, 0xbd, 0xda, 0xba, 0xf4,
+	0x68, 0x25, 0x4d, 0x98, 0x9d, 0x41, 0xc6, 0x2f, 0x35, 0x58, 0x3b, 0x77, 0x23, 0x51, 0x0d, 0xae,
+	0xdb, 0x1d, 0xd3, 0xb5, 0x9c, 0xce, 0x13, 0x72, 0xd4, 0xe9, 0x75, 0x6d, 0xd3, 0x39, 0x74, 0x6c,
+	0x4b, 0xbf, 0x86, 0x56, 0x61, 0xb9, 0xe5, 0x74, 0xec, 0x06, 0x7e, 0xf8, 0x85, 0xae, 0xa1, 0x65,
+	0x58, 0x38, 0x6c, 0x35, 0x4c, 0xbd, 0x84, 0xaa, 0x50, 0x69, 0x1f, 0xb5, 0x1a, 0xcf, 0xf4, 0x32,
+	0x5a, 0x82, 0x72, 0xa3, 0x8d, 0xf5, 0x05, 0x04, 0xb0, 0xd8, 0x68, 0x63, 0xf2, 0xec, 0x40, 0xaf,
+	0x08, 0x39, 0xf7, 0xc9, 0x13, 0xe2, 0x76, 0x8f, 0x7a, 0xfa, 0x22, 0xda, 0x81, 0xf7, 0x7b, 0x5d,
+	0xdb, 0xfe, 0x09, 0x79, 0xe6, 0xf4, 0x9b, 0xa4, 0x69, 0x37, 0x2c, 0x1b, 0x93, 0x83, 0xe7, 0x7d,
+	0x5b, 0x5f, 0x32, 0xfe, 0x5d, 0x85, 0xad, 0x0b, 0x1c, 0x45, 0x13, 0xd0, 0x65, 0x7d, 0xa2, 0x03,
+	0x19, 0x6a, 0x7e, 0x1a, 0xb1, 0xac, 0xfe, 0x1c, 0xbc, 0x7b, 0xd8, 0xea, 0xce, 0x99, 0xaa, 0xfe,
+	0x69, 0xc4, 0xf0, 0x86, 0x7f, 0x1e, 0x40, 0x5f, 0xc3, 0xae, 0x1f, 0x78, 0x69, 0xc2, 0xe3, 0x53,
+	0x12, 0x50, 0x7f, 0x90, 0xc8, 0xdb, 0x4a, 0xc2, 0x21, 0x51, 0x2f, 0x9b, 0xb8, 0xe7, 0x6b, 0xb8,
+	0x96, 0xf3, 0x74, 0x04, 0x8b, 0xb8, 0xaf, 0xee, 0x50, 0x86, 0x12, 0xbd, 0x80, 0xad, 0x89, 0x3f,
+	0x88, 0xc3, 0xe8, 0x24, 0x0c, 0x18, 0xf1, 0xfc, 0x84, 0xcb, 0x9a, 0xbc, 0x20, 0x2d, 0xb6, 0xaf,
+	0x60, 0x71, 0x7b, 0xaa, 0xcd, 0xca, 0x94, 0x61, 0x34, 0x99, 0xc3, 0x10, 0x87, 0xad, 0x30, 0xf6,
+	0x47, 0x7e, 0x40, 0xc7, 0x64, 0xc2, 0x3c, 0x9f, 0xaa, 0x48, 0x55, 0xe4, 0xbe, 0xd6, 0x15, 0xf6,
+	0x75, 0x33, 0x6d, 0x6d, 0xa1, 0x4c, 0xc6, 0x6a, 0x33, 0x9c, 0x85, 0xd0, 0x2b, 0x78, 0x4f, 0x14,
+	0xd3, 0x58, 0x64, 0x0f, 0xf1, 0xd8, 0x0b, 0x7f, 0xc0, 0xd4, 0xbe, 0x8b, 0x72, 0xdf, 0xc3, 0x2b,
+	0xec, 0x8b, 0x73, 0x7d, 0x96, 0x54, 0x27, 0x77, 0xde, 0x8a, 0xe7, 0x41, 0xb4, 0x7f, 0xc1, 0xde,
+	0x01, 0x9d, 0x30, 0xf9, 0x14, 0x54, 0xe7, 0x64, 0x3a, 0x74, 0xc2, 0xd0, 0x67, 0x80, 0xce, 0xa2,
+	0x24, 0x6a, 0x94, 0x34, 0x76, 0x59, 0x0a, 0xe8, 0x53, 0xf7, 0xfc, 0x89, 0xda, 0xe1, 0x2e, 0xac,
+	0x85, 0xc7, 0xc3, 0x34, 0x19, 0x50, 0xce, 0x3c, 0xe2, 0x7b, 0xf2, 0xba, 0x96, 0xf1, 0xea, 0x19,
+	0xe8, 0x78, 0xe8, 0x16, 0xac, 0xa8, 0xf7, 0x88, 0x87, 0x91, 0x3f, 0xa8, 0x81, 0xd4, 0x05, 0x12,
+	0xea, 0x0b, 0xc4, 0xf8, 0x93, 0x06, 0x1b, 0x33, 0x69, 0x87, 0x6e, 0xc3, 0xae, 0xd3, 0xe9, 0xdb,
+	0xb8, 0x61, 0xf6, 0x1d, 0xb7, 0x43, 0xfa, 0xcf, 0xbb, 0xf6, 0xcc, 0x85, 0x5b, 0x07, 0xb0, 0x9c,
+	0x9e, 0x79, 0xd4, 0xeb, 0x39, 0x6e, 0x47, 0xd7, 0x90, 0x0e, 0xab, 0x5d, 0x6c, 0xf7, 0xec, 0x4e,
+	0xbf, 0x21, 0x44, 0xf4, 0x92, 0xe0, 0xe8, 0x36, 0xdd, 0x8e, 0x4d, 0xcc, 0x46, 0xab, 0xa5, 0x97,
+	0xd1, 0x1a, 0x54, 0x9f, 0xba, 0x8e, 0x69, 0xb7, 0x1b, 0x4e, 0x4b, 0x5f, 0x40, 0x37, 0x61, 0xbb,
+	0x8b, 0xdd, 0x43, 0x5b, 0x2a, 0x68, 0xb4, 0x5a, 0xcf, 0x49, 0x17, 0xbb, 0xd6, 0x91, 0x69, 0x5b,
+	0x7a, 0x45, 0x68, 0x93, 0xbc, 0xa4, 0x67, 0x37, 0xb0, 0xd9, 0xd4, 0x17, 0xd1, 0x26, 0xac, 0x29,
+	0xc4, 0x74, 0xdb, 0xed, 0x46, 0xc7, 0xd2, 0x97, 0x84, 0x42, 0xcb, 0x31, 0xb3, 0xfd, 0x96, 0x0d,
+	0x0f, 0xd0, 0x7c, 0x2e, 0xa2, 0xbb, 0x70, 0xab, 0xed, 0x98, 0xd8, 0x55, 0xa6, 0x58, 0x4e, 0xaf,
+	0xdf, 0xe8, 0x98, 0xb3, 0xce, 0xac, 0x41, 0x55, 0xd4, 0x8e, 0x43, 0xc7, 0x6e, 0x59, 0xba, 0x26,
+	0x8a, 0x42, 0xdb, 0xb1, 0xd4, 0xaa, 0x24, 0x56, 0x87, 0x39, 0xad, 0x6c, 0x74, 0x60, 0x73, 0x2e,
+	0xf3, 0xc4, 0x26, 0x2e, 0x76, 0x9e, 0x38, 0x9d, 0x46, 0x8b, 0xb4, 0x6d, 0xcb, 0x69, 0x5c, 0x14,
+	0xb1, 0x2a, 0x54, 0x1a, 0x47, 0x96, 0xe3, 0xea, 0x9a, 0xf8, 0x7c, 0xea, 0x58, 0xb6, 0xab, 0x97,
+	0x8c, 0x6f, 0x35, 0x55, 0x56, 0x66, 0xb3, 0xe7, 0x23, 0xb8, 0x83, 0x6d, 0xd3, 0xc5, 0xb2, 0xd6,
+	0x59, 0xf6, 0x53, 0xe1, 0xfa, 0xc5, 0xc7, 0xd0, 0x6b, 0x37, 0x70, 0x5f, 0xba, 0xa7, 0x6b, 0x68,
+	0x11, 0x4a, 0x5d, 0xb3, 0x18, 0x7c, 0x51, 0x15, 0xf5, 0x32, 0x5a, 0x81, 0xa5, 0xa7, 0x76, 0xd3,
+	0x31, 0x5b, 0xb6, 0xbe, 0x20, 0xca, 0xa8, 0xdb, 0x6f, 0xda, 0x98, 0xb8, 0x47, 0x7d, 0xcb, 0x75,
+	0x71, 0xa6, 0x5f, 0xaf, 0xa0, 0x6d, 0xd8, 0x52, 0x14, 0xa7, 0x53, 0x24, 0x2c, 0x1a, 0x9f, 0xc0,
+	0xda, 0xb9, 0x07, 0x16, 0xd5, 0x60, 0x29, 0x3a, 0x89, 0x69, 0xc2, 0x92, 0x9a, 0x26, 0x1b, 0x85,
+	0x7c, 0x69, 0xe0, 0xe9, 0xcc, 0x31, 0x6d, 0x9c, 0xd1, 0x0e, 0x2c, 0xe5, 0x5d, 0xaa, 0x96, 0x75,
+	0xa9, 0x39, 0x80, 0x10, 0x94, 0xd3, 0xd8, 0x97, 0xed, 0x54, 0xb5, 0x79, 0x0d, 0x8b, 0xc5, 0xc1,
+	0x3a, 0xa8, 0x26, 0x96, 0x24, 0x61, 0x1a, 0x0f, 0x98, 0xc1, 0xa6, 0x1d, 0x9f, 0xe8, 0xb3, 0x93,
+	0x28, 0x0c, 0x12, 0x86, 0xba, 0xb0, 0x94, 0x37, 0x8a, 0x25, 0xd9, 0x22, 0x7c, 0xf1, 0x56, 0x2d,
+	0x42, 0xc1, 0x38, 0xd5, 0x51, 0xe2, 0x5c, 0x8d, 0x11, 0xc1, 0xee, 0xc5, 0x83, 0xc8, 0xf7, 0xb6,
+	0xe3, 0x9f, 0xb5, 0x8b, 0xb7, 0x9c, 0x3e, 0x2f, 0xaa, 0x75, 0x1a, 0xc5, 0x2c, 0x49, 0x44, 0x2f,
+	0x38, 0xc8, 0x43, 0x58, 0x91, 0xad, 0x93, 0xc4, 0xbb, 0x0a, 0x46, 0x8f, 0x00, 0x12, 0x4e, 0x63,
+	0x2e, 0xbb, 0x9b, 0x6c, 0xc4, 0xd9, 0xc9, 0x0d, 0xcc, 0x87, 0xc7, 0x7a, 0x3f, 0x1f, 0x1e, 0x71,
+	0x55, 0x72, 0x8b, 0x35, 0xb2, 0x40, 0x1f, 0xd3, 0x84, 0x93, 0x34, 0xf2, 0x44, 0x03, 0x2a, 0x15,
+	0x94, 0x2f, 0x55, 0xb0, 0x2e, 0x64, 0x8e, 0xa4, 0x88, 0x00, 0x8d, 0xbf, 0x97, 0xe6, 0xa7, 0x8a,
+	0x42, 0xf4, 0xee, 0x43, 0x85, 0xc5, 0x71, 0x18, 0x67, 0x43, 0x05, 0xca, 0x35, 0xc7, 0xd1, 0xa0,
+	0xde, 0x93, 0x63, 0x2b, 0x56, 0x0c, 0xa8, 0x37, 0x1b, 0xe7, 0xab, 0x4c, 0x4e, 0x33, 0xa1, 0x46,
+	0x29, 0x6c, 0x66, 0x9d, 0x25, 0x7b, 0xc1, 0x02, 0xae, 0x4a, 0xab, 0x7a, 0xf7, 0x9c, 0x77, 0x54,
+	0x7f, 0xe6, 0x54, 0x76, 0xc2, 0xb6, 0xd0, 0xa8, 0x1e, 0xec, 0xe4, 0x3c, 0x60, 0xb4, 0x60, 0x63,
+	0x86, 0x07, 0xed, 0x42, 0x4d, 0xb4, 0x19, 0x66, 0x93, 0xd8, 0x4f, 0xed, 0x4e, 0x7f, 0xe6, 0x4a,
+	0xdf, 0x84, 0x6d, 0xbb, 0x63, 0x11, 0xf7, 0x90, 0xf4, 0x9c, 0xce, 0x93, 0x96, 0x4d, 0x8e, 0xfa,
+	0xa2, 0x12, 0x77, 0x4c, 0x5b, 0xd7, 0x8c, 0xef, 0x4a, 0x17, 0x0f, 0x6e, 0xca, 0x59, 0x44, 0x60,
+	0xf5, 0x5c, 0x3f, 0xae, 0xc9, 0xe8, 0x7d, 0xf5, 0xae, 0x59, 0x5a, 0x68, 0xde, 0xf1, 0x39, 0x85,
+	0xe8, 0x06, 0x2c, 0xfb, 0x09, 0x19, 0x8a, 0xf2, 0x97, 0xcd, 0x71, 0x4b, 0x7e, 0x72, 0x28, 0x96,
+	0x68, 0x17, 0x44, 0x42, 0x1d, 0xfb, 0x63, 0x9f, 0x9f, 0xca, 0xe4, 0x29, 0xe1, 0x33, 0x00, 0x35,
+	0x60, 0x43, 0x1d, 0x04, 0x61, 0x81, 0xea, 0xbf, 0x65, 0xec, 0x57, 0xf6, 0x6f, 0xcc, 0x25, 0x98,
+	0x95, 0xfd, 0x1b, 0xc1, 0x6b, 0x4a, 0xc2, 0x0e, 0x64, 0x47, 0x2e, 0x5e, 0xb2, 0x7c, 0xa6, 0xe2,
+	0x74, 0x24, 0x5b, 0x87, 0x0a, 0x86, 0x0c, 0xea, 0xd3, 0xd1, 0xfc, 0xd0, 0xb3, 0x38, 0x3f, 0xf4,
+	0x18, 0x7f, 0xd4, 0x60, 0xfb, 0x35, 0xd7, 0xf2, 0xfb, 0x0f, 0xdf, 0x8c, 0x0b, 0xa5, 0xcb, 0x5d,
+	0xa8, 0x5c, 0xe0, 0xc2, 0x6f, 0x35, 0xd8, 0x7d, 0xd3, 0xa6, 0xe8, 0x43, 0x00, 0x1e, 0xd3, 0x20,
+	0x19, 0xc4, 0x7e, 0xa4, 0xca, 0x45, 0x15, 0x17, 0x10, 0x41, 0x2f, 0x0c, 0x32, 0x25, 0x79, 0x56,
+	0x05, 0x04, 0xfd, 0x08, 0x2a, 0x62, 0xda, 0x11, 0x03, 0xb8, 0x08, 0xc0, 0xbd, 0x4b, 0x02, 0x20,
+	0x86, 0x1f, 0x27, 0x18, 0x86, 0x58, 0x49, 0x19, 0x7f, 0xd1, 0x60, 0x39, 0xc7, 0xd0, 0x97, 0xe7,
+	0xaa, 0x92, 0x76, 0xd9, 0x99, 0x17, 0x8a, 0xd2, 0xe7, 0x62, 0xa2, 0xf7, 0x8a, 0xd5, 0xec, 0x0d,
+	0x72, 0x4b, 0x2c, 0xcb, 0x12, 0x04, 0x0b, 0xc2, 0x8a, 0x6c, 0xe0, 0x95, 0xdf, 0x33, 0xfe, 0x2e,
+	0xcc, 0xf9, 0x7b, 0x0b, 0x56, 0xf2, 0x11, 0xa9, 0x90, 0x59, 0x19, 0xd4, 0xa7, 0xa3, 0xfd, 0xbf,
+	0x95, 0x61, 0x51, 0x45, 0x1c, 0xfd, 0x46, 0x83, 0xea, 0xb4, 0x0c, 0xa0, 0xb7, 0xfc, 0x85, 0x34,
+	0xfd, 0x3b, 0xb4, 0xf3, 0xe0, 0xed, 0x05, 0x54, 0x85, 0x31, 0x3e, 0xfe, 0xc5, 0x5f, 0xff, 0xf1,
+	0xeb, 0xd2, 0x6d, 0xe3, 0x66, 0xe1, 0xff, 0xa6, 0x12, 0x7b, 0x1c, 0xe7, 0xcc, 0x8f, 0xb5, 0x4f,
+	0xd1, 0xb7, 0x1a, 0x5c, 0xbf, 0xe8, 0x29, 0x41, 0x8f, 0x2f, 0xd9, 0xf2, 0x0d, 0xff, 0xde, 0x76,
+	0x3e, 0xc8, 0x65, 0x0b, 0x7f, 0x3e, 0xeb, 0x6e, 0xfe, 0xe7, 0xd3, 0x78, 0x28, 0x6d, 0xfb, 0x3f,
+	0xe3, 0xe3, 0x79, 0xdb, 0x0a, 0x02, 0xe7, 0xcc, 0xfc, 0x95, 0x06, 0x68, 0xbe, 0x9e, 0xa2, 0x2f,
+	0xaf, 0x50, 0x82, 0x95, 0x89, 0x8f, 0xae, 0x5c, 0xbc, 0x8d, 0x6b, 0xf7, 0xb5, 0x07, 0xda, 0xc1,
+	0x2b, 0xb8, 0x33, 0x08, 0x27, 0x6f, 0xd6, 0x72, 0xb0, 0xa2, 0x8e, 0xbf, 0x2b, 0x12, 0xaf, 0xab,
+	0x7d, 0x63, 0x66, 0xdc, 0xa3, 0x50, 0xdc, 0xcc, 0x7a, 0x18, 0x8f, 0xf6, 0x46, 0x2c, 0x90, 0x69,
+	0xb9, 0xa7, 0x48, 0x34, 0xf2, 0x93, 0xd7, 0xfc, 0x9e, 0xfe, 0x4a, 0x01, 0xff, 0xd2, 0xb4, 0xe3,
+	0x45, 0x29, 0xf2, 0xff, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x29, 0xdf, 0xd7, 0xd0, 0x16,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2061,148 +2114,3 @@ var _Speech_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/cloud/speech/v1p1beta1/cloud_speech.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/speech/v1p1beta1/cloud_speech.proto", fileDescriptor_cloud_speech_71c4a621c1d5e720)
-}
-
-var fileDescriptor_cloud_speech_71c4a621c1d5e720 = []byte{
-	// 2178 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xbf, 0x73, 0xdb, 0xc8,
-	0xf5, 0x37, 0x48, 0x51, 0x12, 0x9f, 0x7e, 0x41, 0x2b, 0xdf, 0x89, 0x96, 0x75, 0x67, 0x1b, 0x9e,
-	0x3b, 0xfb, 0xee, 0x7b, 0x43, 0xd9, 0xfa, 0xde, 0x5c, 0xce, 0xbe, 0xe4, 0x26, 0x14, 0x00, 0x99,
-	0x98, 0x21, 0x09, 0xce, 0x92, 0xb2, 0xe3, 0x6b, 0x76, 0x56, 0xc4, 0x92, 0xc2, 0x84, 0x04, 0x10,
-	0x60, 0xe1, 0x58, 0x2e, 0xd3, 0xa6, 0x48, 0x91, 0x99, 0x74, 0xa9, 0x72, 0x75, 0xfe, 0x80, 0x34,
-	0x97, 0x26, 0x4d, 0x9a, 0x14, 0xe9, 0x52, 0xa5, 0xc8, 0x7f, 0x90, 0x26, 0x33, 0x69, 0x32, 0xbb,
-	0x0b, 0x50, 0x10, 0x29, 0x5b, 0xb6, 0x26, 0x37, 0x93, 0x0e, 0xfb, 0x79, 0x3f, 0xf6, 0xbd, 0xb7,
-	0x6f, 0xdf, 0xbe, 0x07, 0x78, 0x30, 0x0a, 0xc3, 0xd1, 0x98, 0xed, 0x0d, 0xc6, 0x61, 0xea, 0xed,
-	0x25, 0x11, 0x63, 0x83, 0x93, 0xbd, 0x17, 0x0f, 0xa3, 0x87, 0xc7, 0x8c, 0xd3, 0x87, 0x0a, 0x26,
-	0x0a, 0xae, 0x47, 0x71, 0xc8, 0x43, 0xf4, 0x81, 0x92, 0xa8, 0x4b, 0x52, 0x3d, 0x23, 0x4d, 0x25,
-	0x76, 0x76, 0x33, 0x85, 0x34, 0xf2, 0xf7, 0x68, 0x10, 0x84, 0x9c, 0x72, 0x3f, 0x0c, 0x12, 0x25,
-	0xbc, 0x73, 0x37, 0xa3, 0x8e, 0xc3, 0x60, 0x14, 0xa7, 0x41, 0xe0, 0x07, 0xa3, 0xbd, 0x30, 0x62,
-	0xf1, 0x39, 0xa6, 0x1b, 0x19, 0x93, 0x5c, 0x1d, 0xa7, 0xc3, 0x3d, 0x1a, 0x9c, 0x66, 0xa4, 0x0f,
-	0x67, 0x49, 0x5e, 0xaa, 0x64, 0x33, 0xfa, 0xcd, 0x59, 0x3a, 0x9b, 0x44, 0x3c, 0x17, 0xbe, 0x35,
-	0x4b, 0xe4, 0xfe, 0x84, 0x25, 0x9c, 0x4e, 0xa2, 0x8c, 0x61, 0x3b, 0x63, 0x88, 0xa3, 0xc1, 0x5e,
-	0xc2, 0x29, 0x4f, 0x33, 0x8b, 0x8c, 0xdf, 0x69, 0xa0, 0x63, 0x36, 0x08, 0x47, 0x81, 0xff, 0x8a,
-	0x61, 0xf6, 0xb3, 0x94, 0x25, 0x1c, 0x35, 0x61, 0x71, 0x10, 0x06, 0x43, 0x7f, 0x54, 0xd3, 0x6e,
-	0x6b, 0xf7, 0x57, 0xf6, 0x1f, 0xd4, 0xdf, 0x18, 0x99, 0x7a, 0xa6, 0x40, 0x58, 0x6b, 0x4a, 0x39,
-	0x9c, 0xc9, 0x23, 0x1b, 0x2a, 0x34, 0xf5, 0xfc, 0xb0, 0x56, 0x92, 0x8a, 0xf6, 0xde, 0x5e, 0x51,
-	0x43, 0x88, 0x61, 0x25, 0x6d, 0xfc, 0x5e, 0x83, 0x9b, 0xad, 0x30, 0x18, 0x61, 0x15, 0xd8, 0xff,
-	0x7d, 0x83, 0xbf, 0xd3, 0xe0, 0x46, 0x8f, 0xc7, 0x8c, 0x4e, 0x2e, 0x32, 0x77, 0x08, 0x7a, 0x92,
-	0x13, 0xc9, 0x39, 0xc3, 0x1f, 0x5d, 0xb2, 0xdf, 0xac, 0xce, 0x33, 0x0f, 0x9a, 0xd7, 0xf0, 0xc6,
-	0x54, 0xa9, 0x82, 0xd0, 0x47, 0xb0, 0x26, 0xcd, 0x11, 0x7b, 0x70, 0x16, 0x70, 0xe9, 0xd4, 0x6a,
-	0xf3, 0x1a, 0x5e, 0x95, 0xb0, 0xa9, 0xd0, 0x83, 0x2d, 0xd8, 0x3c, 0x33, 0x27, 0x56, 0x36, 0x1a,
-	0x7f, 0xd0, 0x60, 0xe7, 0xf5, 0xbb, 0xfd, 0x17, 0x23, 0xfe, 0x09, 0xe8, 0x89, 0x1f, 0x8c, 0xc6,
-	0x8c, 0xa4, 0x9c, 0xb3, 0x98, 0x06, 0x03, 0x26, 0xed, 0x5c, 0xc6, 0x1b, 0x0a, 0x3f, 0xca, 0x61,
-	0x74, 0x0f, 0x36, 0xfc, 0x80, 0xb3, 0xd8, 0x9f, 0x90, 0x98, 0x25, 0xe9, 0x98, 0x27, 0xb5, 0xb2,
-	0xe4, 0x5c, 0xcf, 0x60, 0xac, 0x50, 0xe3, 0x9f, 0xcb, 0xb0, 0x39, 0x6f, 0xf3, 0x37, 0xb0, 0xcc,
-	0x82, 0x41, 0xe8, 0xf9, 0x81, 0xb2, 0x7a, 0x7d, 0xff, 0xeb, 0x77, 0xb5, 0xba, 0x2e, 0x4f, 0xd9,
-	0xce, 0xb4, 0xe0, 0xa9, 0x3e, 0xf4, 0x29, 0x6c, 0x26, 0x74, 0x12, 0x8d, 0x19, 0x89, 0x29, 0x67,
-	0xe4, 0x84, 0xc5, 0xfc, 0x95, 0x74, 0xa3, 0x82, 0x37, 0x14, 0x01, 0x53, 0xce, 0x9a, 0x02, 0x46,
-	0x75, 0xd8, 0xca, 0x8e, 0xe5, 0x84, 0x06, 0x01, 0x1b, 0x93, 0x41, 0x98, 0x06, 0xbc, 0xb6, 0x24,
-	0xb9, 0x37, 0xd5, 0xd1, 0x28, 0x8a, 0x29, 0x08, 0xa8, 0x0f, 0xf7, 0x58, 0x40, 0x8f, 0xc7, 0x8c,
-	0x24, 0x2c, 0xa2, 0x52, 0x7f, 0x7c, 0x66, 0x18, 0x89, 0x58, 0x9c, 0x6b, 0xaa, 0xad, 0xca, 0x70,
-	0xdc, 0x55, 0xec, 0xbd, 0x8c, 0xbb, 0xe0, 0x45, 0x97, 0xc5, 0x99, 0x6a, 0x74, 0x17, 0xd6, 0xc6,
-	0x34, 0x18, 0xa5, 0x74, 0xc4, 0xc8, 0x20, 0xf4, 0x98, 0x0c, 0x65, 0x15, 0xaf, 0xe6, 0xa0, 0x19,
-	0x7a, 0x0c, 0xfd, 0x10, 0x76, 0xe8, 0x98, 0xb3, 0x38, 0xa0, 0xdc, 0x7f, 0xc1, 0xc8, 0x39, 0x81,
-	0xa4, 0x86, 0x6e, 0x97, 0xef, 0x57, 0x71, 0xad, 0xc0, 0xd1, 0x2a, 0x08, 0x27, 0xe2, 0x68, 0x27,
-	0xf4, 0x25, 0x29, 0xd0, 0x93, 0xda, 0x82, 0x8a, 0xc9, 0x84, 0xbe, 0x6c, 0x14, 0x60, 0xc1, 0x1a,
-	0xc5, 0xe1, 0x90, 0x06, 0x3e, 0x3f, 0x25, 0x43, 0x5f, 0x90, 0x6a, 0x15, 0x95, 0x05, 0x53, 0xfc,
-	0x50, 0xc2, 0xe8, 0x08, 0x36, 0xd4, 0x41, 0xa9, 0xb4, 0x7e, 0xc9, 0x93, 0xda, 0xe2, 0xed, 0xf2,
-	0xfd, 0x95, 0xfd, 0xcf, 0x2e, 0xbb, 0x3c, 0x12, 0x30, 0x95, 0x10, 0x5e, 0x4f, 0x8a, 0xcb, 0x04,
-	0xfd, 0x00, 0x6a, 0x59, 0x94, 0x7f, 0x1e, 0xc6, 0x1e, 0x11, 0x15, 0x94, 0x84, 0xc3, 0x61, 0xc2,
-	0x78, 0x52, 0x5b, 0x96, 0x96, 0xbc, 0xa7, 0xe8, 0xcf, 0xc2, 0xd8, 0xeb, 0xfb, 0x13, 0xe6, 0x2a,
-	0x22, 0xfa, 0x1c, 0xde, 0x2f, 0x0a, 0xca, 0xb4, 0xf6, 0x98, 0x48, 0xe3, 0x0d, 0x29, 0x76, 0xfd,
-	0x4c, 0xcc, 0x9c, 0xd2, 0xd0, 0x8f, 0x61, 0x37, 0x93, 0xa2, 0x29, 0x0f, 0x27, 0x94, 0xfb, 0x03,
-	0x12, 0xa5, 0xc1, 0x80, 0xa7, 0xb2, 0xea, 0xd7, 0x56, 0xa4, 0xec, 0x8e, 0xe2, 0x69, 0xe4, 0x2c,
-	0xdd, 0x33, 0x0e, 0x71, 0x36, 0x79, 0x5a, 0x44, 0x8c, 0xfe, 0x94, 0xc5, 0xc4, 0xf3, 0x69, 0xec,
-	0xbf, 0x52, 0xf2, 0xba, 0x94, 0xcf, 0x5c, 0xea, 0x29, 0x06, 0xeb, 0x8c, 0x8e, 0x1e, 0xc3, 0x8d,
-	0x02, 0xfb, 0x54, 0x85, 0x4a, 0xc5, 0x4d, 0x79, 0x48, 0xdb, 0x05, 0x86, 0x4c, 0x83, 0x4a, 0xc8,
-	0x0e, 0x2c, 0x4f, 0x18, 0xa7, 0x1e, 0xe5, 0xb4, 0x56, 0x95, 0xd7, 0x7f, 0xff, 0xed, 0x2f, 0x52,
-	0x3b, 0x93, 0xc4, 0x53, 0x1d, 0xe8, 0x3a, 0x54, 0x26, 0xa1, 0xc7, 0xc6, 0xb5, 0x35, 0x99, 0x82,
-	0x6a, 0x81, 0xee, 0xc0, 0x6a, 0x9a, 0x30, 0xc2, 0x82, 0x13, 0x71, 0xf9, 0xbd, 0xda, 0xba, 0xf4,
-	0x68, 0x25, 0x4d, 0x98, 0x9d, 0x41, 0xc6, 0x2f, 0x35, 0x58, 0x3b, 0x77, 0x23, 0x51, 0x0d, 0xae,
-	0xdb, 0x1d, 0xd3, 0xb5, 0x9c, 0xce, 0x13, 0x72, 0xd4, 0xe9, 0x75, 0x6d, 0xd3, 0x39, 0x74, 0x6c,
-	0x4b, 0xbf, 0x86, 0x56, 0x61, 0xb9, 0xe5, 0x74, 0xec, 0x06, 0x7e, 0xf8, 0x85, 0xae, 0xa1, 0x65,
-	0x58, 0x38, 0x6c, 0x35, 0x4c, 0xbd, 0x84, 0xaa, 0x50, 0x69, 0x1f, 0xb5, 0x1a, 0xcf, 0xf4, 0x32,
-	0x5a, 0x82, 0x72, 0xa3, 0x8d, 0xf5, 0x05, 0x04, 0xb0, 0xd8, 0x68, 0x63, 0xf2, 0xec, 0x40, 0xaf,
-	0x08, 0x39, 0xf7, 0xc9, 0x13, 0xe2, 0x76, 0x8f, 0x7a, 0xfa, 0x22, 0xda, 0x81, 0xf7, 0x7b, 0x5d,
-	0xdb, 0xfe, 0x09, 0x79, 0xe6, 0xf4, 0x9b, 0xa4, 0x69, 0x37, 0x2c, 0x1b, 0x93, 0x83, 0xe7, 0x7d,
-	0x5b, 0x5f, 0x32, 0xfe, 0x5d, 0x85, 0xad, 0x0b, 0x1c, 0x45, 0x13, 0xd0, 0x65, 0x7d, 0xa2, 0x03,
-	0x19, 0x6a, 0x7e, 0x1a, 0xb1, 0xac, 0xfe, 0x1c, 0xbc, 0x7b, 0xd8, 0xea, 0xce, 0x99, 0xaa, 0xfe,
-	0x69, 0xc4, 0xf0, 0x86, 0x7f, 0x1e, 0x40, 0x5f, 0xc3, 0xae, 0x1f, 0x78, 0x69, 0xc2, 0xe3, 0x53,
-	0x12, 0x50, 0x7f, 0x90, 0xc8, 0xdb, 0x4a, 0xc2, 0x21, 0x51, 0x2f, 0x9b, 0xb8, 0xe7, 0x6b, 0xb8,
-	0x96, 0xf3, 0x74, 0x04, 0x8b, 0xb8, 0xaf, 0xee, 0x50, 0x86, 0x12, 0xbd, 0x80, 0xad, 0x89, 0x3f,
-	0x88, 0xc3, 0xe8, 0x24, 0x0c, 0x18, 0xf1, 0xfc, 0x84, 0xcb, 0x9a, 0xbc, 0x20, 0x2d, 0xb6, 0xaf,
-	0x60, 0x71, 0x7b, 0xaa, 0xcd, 0xca, 0x94, 0x61, 0x34, 0x99, 0xc3, 0x10, 0x87, 0xad, 0x30, 0xf6,
-	0x47, 0x7e, 0x40, 0xc7, 0x64, 0xc2, 0x3c, 0x9f, 0xaa, 0x48, 0x55, 0xe4, 0xbe, 0xd6, 0x15, 0xf6,
-	0x75, 0x33, 0x6d, 0x6d, 0xa1, 0x4c, 0xc6, 0x6a, 0x33, 0x9c, 0x85, 0xd0, 0x2b, 0x78, 0x4f, 0x14,
-	0xd3, 0x58, 0x64, 0x0f, 0xf1, 0xd8, 0x0b, 0x7f, 0xc0, 0xd4, 0xbe, 0x8b, 0x72, 0xdf, 0xc3, 0x2b,
-	0xec, 0x8b, 0x73, 0x7d, 0x96, 0x54, 0x27, 0x77, 0xde, 0x8a, 0xe7, 0x41, 0xb4, 0x7f, 0xc1, 0xde,
-	0x01, 0x9d, 0x30, 0xf9, 0x14, 0x54, 0xe7, 0x64, 0x3a, 0x74, 0xc2, 0xd0, 0x67, 0x80, 0xce, 0xa2,
-	0x24, 0x6a, 0x94, 0x34, 0x76, 0x59, 0x0a, 0xe8, 0x53, 0xf7, 0xfc, 0x89, 0xda, 0xe1, 0x2e, 0xac,
-	0x85, 0xc7, 0xc3, 0x34, 0x19, 0x50, 0xce, 0x3c, 0xe2, 0x7b, 0xf2, 0xba, 0x96, 0xf1, 0xea, 0x19,
-	0xe8, 0x78, 0xe8, 0x16, 0xac, 0xa8, 0xf7, 0x88, 0x87, 0x91, 0x3f, 0xa8, 0x81, 0xd4, 0x05, 0x12,
-	0xea, 0x0b, 0xc4, 0xf8, 0x93, 0x06, 0x1b, 0x33, 0x69, 0x87, 0x6e, 0xc3, 0xae, 0xd3, 0xe9, 0xdb,
-	0xb8, 0x61, 0xf6, 0x1d, 0xb7, 0x43, 0xfa, 0xcf, 0xbb, 0xf6, 0xcc, 0x85, 0x5b, 0x07, 0xb0, 0x9c,
-	0x9e, 0x79, 0xd4, 0xeb, 0x39, 0x6e, 0x47, 0xd7, 0x90, 0x0e, 0xab, 0x5d, 0x6c, 0xf7, 0xec, 0x4e,
-	0xbf, 0x21, 0x44, 0xf4, 0x92, 0xe0, 0xe8, 0x36, 0xdd, 0x8e, 0x4d, 0xcc, 0x46, 0xab, 0xa5, 0x97,
-	0xd1, 0x1a, 0x54, 0x9f, 0xba, 0x8e, 0x69, 0xb7, 0x1b, 0x4e, 0x4b, 0x5f, 0x40, 0x37, 0x61, 0xbb,
-	0x8b, 0xdd, 0x43, 0x5b, 0x2a, 0x68, 0xb4, 0x5a, 0xcf, 0x49, 0x17, 0xbb, 0xd6, 0x91, 0x69, 0x5b,
-	0x7a, 0x45, 0x68, 0x93, 0xbc, 0xa4, 0x67, 0x37, 0xb0, 0xd9, 0xd4, 0x17, 0xd1, 0x26, 0xac, 0x29,
-	0xc4, 0x74, 0xdb, 0xed, 0x46, 0xc7, 0xd2, 0x97, 0x84, 0x42, 0xcb, 0x31, 0xb3, 0xfd, 0x96, 0x0d,
-	0x0f, 0xd0, 0x7c, 0x2e, 0xa2, 0xbb, 0x70, 0xab, 0xed, 0x98, 0xd8, 0x55, 0xa6, 0x58, 0x4e, 0xaf,
-	0xdf, 0xe8, 0x98, 0xb3, 0xce, 0xac, 0x41, 0x55, 0xd4, 0x8e, 0x43, 0xc7, 0x6e, 0x59, 0xba, 0x26,
-	0x8a, 0x42, 0xdb, 0xb1, 0xd4, 0xaa, 0x24, 0x56, 0x87, 0x39, 0xad, 0x6c, 0x74, 0x60, 0x73, 0x2e,
-	0xf3, 0xc4, 0x26, 0x2e, 0x76, 0x9e, 0x38, 0x9d, 0x46, 0x8b, 0xb4, 0x6d, 0xcb, 0x69, 0x5c, 0x14,
-	0xb1, 0x2a, 0x54, 0x1a, 0x47, 0x96, 0xe3, 0xea, 0x9a, 0xf8, 0x7c, 0xea, 0x58, 0xb6, 0xab, 0x97,
-	0x8c, 0x6f, 0x35, 0x55, 0x56, 0x66, 0xb3, 0xe7, 0x23, 0xb8, 0x83, 0x6d, 0xd3, 0xc5, 0xb2, 0xd6,
-	0x59, 0xf6, 0x53, 0xe1, 0xfa, 0xc5, 0xc7, 0xd0, 0x6b, 0x37, 0x70, 0x5f, 0xba, 0xa7, 0x6b, 0x68,
-	0x11, 0x4a, 0x5d, 0xb3, 0x18, 0x7c, 0x51, 0x15, 0xf5, 0x32, 0x5a, 0x81, 0xa5, 0xa7, 0x76, 0xd3,
-	0x31, 0x5b, 0xb6, 0xbe, 0x20, 0xca, 0xa8, 0xdb, 0x6f, 0xda, 0x98, 0xb8, 0x47, 0x7d, 0xcb, 0x75,
-	0x71, 0xa6, 0x5f, 0xaf, 0xa0, 0x6d, 0xd8, 0x52, 0x14, 0xa7, 0x53, 0x24, 0x2c, 0x1a, 0x9f, 0xc0,
-	0xda, 0xb9, 0x07, 0x16, 0xd5, 0x60, 0x29, 0x3a, 0x89, 0x69, 0xc2, 0x92, 0x9a, 0x26, 0x1b, 0x85,
-	0x7c, 0x69, 0xe0, 0xe9, 0xcc, 0x31, 0x6d, 0x9c, 0xd1, 0x0e, 0x2c, 0xe5, 0x5d, 0xaa, 0x96, 0x75,
-	0xa9, 0x39, 0x80, 0x10, 0x94, 0xd3, 0xd8, 0x97, 0xed, 0x54, 0xb5, 0x79, 0x0d, 0x8b, 0xc5, 0xc1,
-	0x3a, 0xa8, 0x26, 0x96, 0x24, 0x61, 0x1a, 0x0f, 0x98, 0xc1, 0xa6, 0x1d, 0x9f, 0xe8, 0xb3, 0x93,
-	0x28, 0x0c, 0x12, 0x86, 0xba, 0xb0, 0x94, 0x37, 0x8a, 0x25, 0xd9, 0x22, 0x7c, 0xf1, 0x56, 0x2d,
-	0x42, 0xc1, 0x38, 0xd5, 0x51, 0xe2, 0x5c, 0x8d, 0x11, 0xc1, 0xee, 0xc5, 0x83, 0xc8, 0xf7, 0xb6,
-	0xe3, 0x9f, 0xb5, 0x8b, 0xb7, 0x9c, 0x3e, 0x2f, 0xaa, 0x75, 0x1a, 0xc5, 0x2c, 0x49, 0x44, 0x2f,
-	0x38, 0xc8, 0x43, 0x58, 0x91, 0xad, 0x93, 0xc4, 0xbb, 0x0a, 0x46, 0x8f, 0x00, 0x12, 0x4e, 0x63,
-	0x2e, 0xbb, 0x9b, 0x6c, 0xc4, 0xd9, 0xc9, 0x0d, 0xcc, 0x87, 0xc7, 0x7a, 0x3f, 0x1f, 0x1e, 0x71,
-	0x55, 0x72, 0x8b, 0x35, 0xb2, 0x40, 0x1f, 0xd3, 0x84, 0x93, 0x34, 0xf2, 0x44, 0x03, 0x2a, 0x15,
-	0x94, 0x2f, 0x55, 0xb0, 0x2e, 0x64, 0x8e, 0xa4, 0x88, 0x00, 0x8d, 0xbf, 0x97, 0xe6, 0xa7, 0x8a,
-	0x42, 0xf4, 0xee, 0x43, 0x85, 0xc5, 0x71, 0x18, 0x67, 0x43, 0x05, 0xca, 0x35, 0xc7, 0xd1, 0xa0,
-	0xde, 0x93, 0x63, 0x2b, 0x56, 0x0c, 0xa8, 0x37, 0x1b, 0xe7, 0xab, 0x4c, 0x4e, 0x33, 0xa1, 0x46,
-	0x29, 0x6c, 0x66, 0x9d, 0x25, 0x7b, 0xc1, 0x02, 0xae, 0x4a, 0xab, 0x7a, 0xf7, 0x9c, 0x77, 0x54,
-	0x7f, 0xe6, 0x54, 0x76, 0xc2, 0xb6, 0xd0, 0xa8, 0x1e, 0xec, 0xe4, 0x3c, 0x60, 0xb4, 0x60, 0x63,
-	0x86, 0x07, 0xed, 0x42, 0x4d, 0xb4, 0x19, 0x66, 0x93, 0xd8, 0x4f, 0xed, 0x4e, 0x7f, 0xe6, 0x4a,
-	0xdf, 0x84, 0x6d, 0xbb, 0x63, 0x11, 0xf7, 0x90, 0xf4, 0x9c, 0xce, 0x93, 0x96, 0x4d, 0x8e, 0xfa,
-	0xa2, 0x12, 0x77, 0x4c, 0x5b, 0xd7, 0x8c, 0xef, 0x4a, 0x17, 0x0f, 0x6e, 0xca, 0x59, 0x44, 0x60,
-	0xf5, 0x5c, 0x3f, 0xae, 0xc9, 0xe8, 0x7d, 0xf5, 0xae, 0x59, 0x5a, 0x68, 0xde, 0xf1, 0x39, 0x85,
-	0xe8, 0x06, 0x2c, 0xfb, 0x09, 0x19, 0x8a, 0xf2, 0x97, 0xcd, 0x71, 0x4b, 0x7e, 0x72, 0x28, 0x96,
-	0x68, 0x17, 0x44, 0x42, 0x1d, 0xfb, 0x63, 0x9f, 0x9f, 0xca, 0xe4, 0x29, 0xe1, 0x33, 0x00, 0x35,
-	0x60, 0x43, 0x1d, 0x04, 0x61, 0x81, 0xea, 0xbf, 0x65, 0xec, 0x57, 0xf6, 0x6f, 0xcc, 0x25, 0x98,
-	0x95, 0xfd, 0x1b, 0xc1, 0x6b, 0x4a, 0xc2, 0x0e, 0x64, 0x47, 0x2e, 0x5e, 0xb2, 0x7c, 0xa6, 0xe2,
-	0x74, 0x24, 0x5b, 0x87, 0x0a, 0x86, 0x0c, 0xea, 0xd3, 0xd1, 0xfc, 0xd0, 0xb3, 0x38, 0x3f, 0xf4,
-	0x18, 0x7f, 0xd4, 0x60, 0xfb, 0x35, 0xd7, 0xf2, 0xfb, 0x0f, 0xdf, 0x8c, 0x0b, 0xa5, 0xcb, 0x5d,
-	0xa8, 0x5c, 0xe0, 0xc2, 0x6f, 0x35, 0xd8, 0x7d, 0xd3, 0xa6, 0xe8, 0x43, 0x00, 0x1e, 0xd3, 0x20,
-	0x19, 0xc4, 0x7e, 0xa4, 0xca, 0x45, 0x15, 0x17, 0x10, 0x41, 0x2f, 0x0c, 0x32, 0x25, 0x79, 0x56,
-	0x05, 0x04, 0xfd, 0x08, 0x2a, 0x62, 0xda, 0x11, 0x03, 0xb8, 0x08, 0xc0, 0xbd, 0x4b, 0x02, 0x20,
-	0x86, 0x1f, 0x27, 0x18, 0x86, 0x58, 0x49, 0x19, 0x7f, 0xd1, 0x60, 0x39, 0xc7, 0xd0, 0x97, 0xe7,
-	0xaa, 0x92, 0x76, 0xd9, 0x99, 0x17, 0x8a, 0xd2, 0xe7, 0x62, 0xa2, 0xf7, 0x8a, 0xd5, 0xec, 0x0d,
-	0x72, 0x4b, 0x2c, 0xcb, 0x12, 0x04, 0x0b, 0xc2, 0x8a, 0x6c, 0xe0, 0x95, 0xdf, 0x33, 0xfe, 0x2e,
-	0xcc, 0xf9, 0x7b, 0x0b, 0x56, 0xf2, 0x11, 0xa9, 0x90, 0x59, 0x19, 0xd4, 0xa7, 0xa3, 0xfd, 0xbf,
-	0x95, 0x61, 0x51, 0x45, 0x1c, 0xfd, 0x46, 0x83, 0xea, 0xb4, 0x0c, 0xa0, 0xb7, 0xfc, 0x85, 0x34,
-	0xfd, 0x3b, 0xb4, 0xf3, 0xe0, 0xed, 0x05, 0x54, 0x85, 0x31, 0x3e, 0xfe, 0xc5, 0x5f, 0xff, 0xf1,
-	0xeb, 0xd2, 0x6d, 0xe3, 0x66, 0xe1, 0xff, 0xa6, 0x12, 0x7b, 0x1c, 0xe7, 0xcc, 0x8f, 0xb5, 0x4f,
-	0xd1, 0xb7, 0x1a, 0x5c, 0xbf, 0xe8, 0x29, 0x41, 0x8f, 0x2f, 0xd9, 0xf2, 0x0d, 0xff, 0xde, 0x76,
-	0x3e, 0xc8, 0x65, 0x0b, 0x7f, 0x3e, 0xeb, 0x6e, 0xfe, 0xe7, 0xd3, 0x78, 0x28, 0x6d, 0xfb, 0x3f,
-	0xe3, 0xe3, 0x79, 0xdb, 0x0a, 0x02, 0xe7, 0xcc, 0xfc, 0x95, 0x06, 0x68, 0xbe, 0x9e, 0xa2, 0x2f,
-	0xaf, 0x50, 0x82, 0x95, 0x89, 0x8f, 0xae, 0x5c, 0xbc, 0x8d, 0x6b, 0xf7, 0xb5, 0x07, 0xda, 0xc1,
-	0x2b, 0xb8, 0x33, 0x08, 0x27, 0x6f, 0xd6, 0x72, 0xb0, 0xa2, 0x8e, 0xbf, 0x2b, 0x12, 0xaf, 0xab,
-	0x7d, 0x63, 0x66, 0xdc, 0xa3, 0x50, 0xdc, 0xcc, 0x7a, 0x18, 0x8f, 0xf6, 0x46, 0x2c, 0x90, 0x69,
-	0xb9, 0xa7, 0x48, 0x34, 0xf2, 0x93, 0xd7, 0xfc, 0x9e, 0xfe, 0x4a, 0x01, 0xff, 0xd2, 0xb4, 0xe3,
-	0x45, 0x29, 0xf2, 0xff, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x29, 0xdf, 0xd7, 0xd0, 0x16,
-	0x00, 0x00,
-}
diff --git a/googleapis/cloud/support/common/common.pb.go b/googleapis/cloud/support/common/common.pb.go
index f658f34794..ea000d1fed 100644
--- a/googleapis/cloud/support/common/common.pb.go
+++ b/googleapis/cloud/support/common/common.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/support/common.proto
 
-package common // import "google.golang.org/genproto/googleapis/cloud/support/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The current state of this SupportAccount.
 type SupportAccount_State int32
@@ -40,6 +43,7 @@ var SupportAccount_State_name = map[int32]string{
 	2: "PENDING",
 	3: "PENDING_DELETION",
 }
+
 var SupportAccount_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"ACTIVE":            1,
@@ -50,8 +54,9 @@ var SupportAccount_State_value = map[string]int32{
 func (x SupportAccount_State) String() string {
 	return proto.EnumName(SupportAccount_State_name, int32(x))
 }
+
 func (SupportAccount_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{0, 0}
+	return fileDescriptor_f71dd4106e21c931, []int{0, 0}
 }
 
 // Pricing model applicable to this support account.
@@ -72,6 +77,7 @@ var SupportAccount_PricingModel_name = map[int32]string{
 	1: "PACKAGES",
 	2: "USER_ROLES",
 }
+
 var SupportAccount_PricingModel_value = map[string]int32{
 	"PRICING_MODEL_UNKNOWN": 0,
 	"PACKAGES":              1,
@@ -81,8 +87,9 @@ var SupportAccount_PricingModel_value = map[string]int32{
 func (x SupportAccount_PricingModel) String() string {
 	return proto.EnumName(SupportAccount_PricingModel_name, int32(x))
 }
+
 func (SupportAccount_PricingModel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{0, 1}
+	return fileDescriptor_f71dd4106e21c931, []int{0, 1}
 }
 
 // The case priority with P0 being the most urgent and P4 the least.
@@ -114,6 +121,7 @@ var Case_Priority_name = map[int32]string{
 	4: "P3",
 	5: "P4",
 }
+
 var Case_Priority_value = map[string]int32{
 	"PRIORITY_UNSPECIFIED": 0,
 	"P0":                   1,
@@ -126,8 +134,9 @@ var Case_Priority_value = map[string]int32{
 func (x Case_Priority) String() string {
 	return proto.EnumName(Case_Priority_name, int32(x))
 }
+
 func (Case_Priority) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{1, 0}
+	return fileDescriptor_f71dd4106e21c931, []int{1, 0}
 }
 
 // The state of a case.
@@ -165,6 +174,7 @@ var Case_State_name = map[int32]string{
 	7: "SOLUTION_OFFERED",
 	8: "CLOSED",
 }
+
 var Case_State_value = map[string]int32{
 	"STATE_UNSPECIFIED":             0,
 	"NEW":                           1,
@@ -180,8 +190,9 @@ var Case_State_value = map[string]int32{
 func (x Case_State) String() string {
 	return proto.EnumName(Case_State_name, int32(x))
 }
+
 func (Case_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{1, 1}
+	return fileDescriptor_f71dd4106e21c931, []int{1, 1}
 }
 
 // The status of a customer issue.
@@ -210,6 +221,7 @@ var CustomerIssue_IssueState_name = map[int32]string{
 	4: "WONT_FIX",
 	5: "VERIFIED",
 }
+
 var CustomerIssue_IssueState_value = map[string]int32{
 	"ISSUE_STATE_UNSPECIFIED": 0,
 	"OPEN":                    1,
@@ -222,8 +234,9 @@ var CustomerIssue_IssueState_value = map[string]int32{
 func (x CustomerIssue_IssueState) String() string {
 	return proto.EnumName(CustomerIssue_IssueState_name, int32(x))
 }
+
 func (CustomerIssue_IssueState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{2, 0}
+	return fileDescriptor_f71dd4106e21c931, []int{2, 0}
 }
 
 // A role which determines the support resources and features a user might
@@ -250,6 +263,7 @@ var SupportRole_Role_name = map[int32]string{
 	3: "OPERATION",
 	4: "SITE_RELIABILITY",
 }
+
 var SupportRole_Role_value = map[string]int32{
 	"ROLE_UNSPECIFIED": 0,
 	"BASIC":            1,
@@ -261,8 +275,9 @@ var SupportRole_Role_value = map[string]int32{
 func (x SupportRole_Role) String() string {
 	return proto.EnumName(SupportRole_Role_name, int32(x))
 }
+
 func (SupportRole_Role) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{3, 0}
+	return fileDescriptor_f71dd4106e21c931, []int{3, 0}
 }
 
 // A Google Cloud Platform account that identifies support eligibility for a
@@ -301,16 +316,17 @@ func (m *SupportAccount) Reset()         { *m = SupportAccount{} }
 func (m *SupportAccount) String() string { return proto.CompactTextString(m) }
 func (*SupportAccount) ProtoMessage()    {}
 func (*SupportAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{0}
+	return fileDescriptor_f71dd4106e21c931, []int{0}
 }
+
 func (m *SupportAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SupportAccount.Unmarshal(m, b)
 }
 func (m *SupportAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SupportAccount.Marshal(b, m, deterministic)
 }
-func (dst *SupportAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SupportAccount.Merge(dst, src)
+func (m *SupportAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SupportAccount.Merge(m, src)
 }
 func (m *SupportAccount) XXX_Size() int {
 	return xxx_messageInfo_SupportAccount.Size(m)
@@ -432,16 +448,17 @@ func (m *Case) Reset()         { *m = Case{} }
 func (m *Case) String() string { return proto.CompactTextString(m) }
 func (*Case) ProtoMessage()    {}
 func (*Case) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{1}
+	return fileDescriptor_f71dd4106e21c931, []int{1}
 }
+
 func (m *Case) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Case.Unmarshal(m, b)
 }
 func (m *Case) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Case.Marshal(b, m, deterministic)
 }
-func (dst *Case) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Case.Merge(dst, src)
+func (m *Case) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Case.Merge(m, src)
 }
 func (m *Case) XXX_Size() int {
 	return xxx_messageInfo_Case.Size(m)
@@ -585,16 +602,17 @@ func (m *CustomerIssue) Reset()         { *m = CustomerIssue{} }
 func (m *CustomerIssue) String() string { return proto.CompactTextString(m) }
 func (*CustomerIssue) ProtoMessage()    {}
 func (*CustomerIssue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{2}
+	return fileDescriptor_f71dd4106e21c931, []int{2}
 }
+
 func (m *CustomerIssue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomerIssue.Unmarshal(m, b)
 }
 func (m *CustomerIssue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomerIssue.Marshal(b, m, deterministic)
 }
-func (dst *CustomerIssue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomerIssue.Merge(dst, src)
+func (m *CustomerIssue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerIssue.Merge(m, src)
 }
 func (m *CustomerIssue) XXX_Size() int {
 	return xxx_messageInfo_CustomerIssue.Size(m)
@@ -656,16 +674,17 @@ func (m *SupportRole) Reset()         { *m = SupportRole{} }
 func (m *SupportRole) String() string { return proto.CompactTextString(m) }
 func (*SupportRole) ProtoMessage()    {}
 func (*SupportRole) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{3}
+	return fileDescriptor_f71dd4106e21c931, []int{3}
 }
+
 func (m *SupportRole) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SupportRole.Unmarshal(m, b)
 }
 func (m *SupportRole) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SupportRole.Marshal(b, m, deterministic)
 }
-func (dst *SupportRole) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SupportRole.Merge(dst, src)
+func (m *SupportRole) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SupportRole.Merge(m, src)
 }
 func (m *SupportRole) XXX_Size() int {
 	return xxx_messageInfo_SupportRole.Size(m)
@@ -713,16 +732,17 @@ func (m *Comment) Reset()         { *m = Comment{} }
 func (m *Comment) String() string { return proto.CompactTextString(m) }
 func (*Comment) ProtoMessage()    {}
 func (*Comment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{4}
+	return fileDescriptor_f71dd4106e21c931, []int{4}
 }
+
 func (m *Comment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Comment.Unmarshal(m, b)
 }
 func (m *Comment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Comment.Marshal(b, m, deterministic)
 }
-func (dst *Comment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Comment.Merge(dst, src)
+func (m *Comment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Comment.Merge(m, src)
 }
 func (m *Comment) XXX_Size() int {
 	return xxx_messageInfo_Comment.Size(m)
@@ -777,16 +797,17 @@ func (m *IssueTaxonomy) Reset()         { *m = IssueTaxonomy{} }
 func (m *IssueTaxonomy) String() string { return proto.CompactTextString(m) }
 func (*IssueTaxonomy) ProtoMessage()    {}
 func (*IssueTaxonomy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{5}
+	return fileDescriptor_f71dd4106e21c931, []int{5}
 }
+
 func (m *IssueTaxonomy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssueTaxonomy.Unmarshal(m, b)
 }
 func (m *IssueTaxonomy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssueTaxonomy.Marshal(b, m, deterministic)
 }
-func (dst *IssueTaxonomy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssueTaxonomy.Merge(dst, src)
+func (m *IssueTaxonomy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssueTaxonomy.Merge(m, src)
 }
 func (m *IssueTaxonomy) XXX_Size() int {
 	return xxx_messageInfo_IssueTaxonomy.Size(m)
@@ -830,16 +851,17 @@ func (m *IssueTaxonomy_Component) Reset()         { *m = IssueTaxonomy_Component
 func (m *IssueTaxonomy_Component) String() string { return proto.CompactTextString(m) }
 func (*IssueTaxonomy_Component) ProtoMessage()    {}
 func (*IssueTaxonomy_Component) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{5, 0}
+	return fileDescriptor_f71dd4106e21c931, []int{5, 0}
 }
+
 func (m *IssueTaxonomy_Component) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssueTaxonomy_Component.Unmarshal(m, b)
 }
 func (m *IssueTaxonomy_Component) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssueTaxonomy_Component.Marshal(b, m, deterministic)
 }
-func (dst *IssueTaxonomy_Component) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssueTaxonomy_Component.Merge(dst, src)
+func (m *IssueTaxonomy_Component) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssueTaxonomy_Component.Merge(m, src)
 }
 func (m *IssueTaxonomy_Component) XXX_Size() int {
 	return xxx_messageInfo_IssueTaxonomy_Component.Size(m)
@@ -894,16 +916,17 @@ func (m *IssueTaxonomy_Category) Reset()         { *m = IssueTaxonomy_Category{}
 func (m *IssueTaxonomy_Category) String() string { return proto.CompactTextString(m) }
 func (*IssueTaxonomy_Category) ProtoMessage()    {}
 func (*IssueTaxonomy_Category) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_2a1414d9284edc87, []int{5, 1}
+	return fileDescriptor_f71dd4106e21c931, []int{5, 1}
 }
+
 func (m *IssueTaxonomy_Category) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssueTaxonomy_Category.Unmarshal(m, b)
 }
 func (m *IssueTaxonomy_Category) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssueTaxonomy_Category.Marshal(b, m, deterministic)
 }
-func (dst *IssueTaxonomy_Category) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssueTaxonomy_Category.Merge(dst, src)
+func (m *IssueTaxonomy_Category) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssueTaxonomy_Category.Merge(m, src)
 }
 func (m *IssueTaxonomy_Category) XXX_Size() int {
 	return xxx_messageInfo_IssueTaxonomy_Category.Size(m)
@@ -929,6 +952,12 @@ func (m *IssueTaxonomy_Category) GetComponents() map[string]*IssueTaxonomy_Compo
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.support.common.SupportAccount_State", SupportAccount_State_name, SupportAccount_State_value)
+	proto.RegisterEnum("google.cloud.support.common.SupportAccount_PricingModel", SupportAccount_PricingModel_name, SupportAccount_PricingModel_value)
+	proto.RegisterEnum("google.cloud.support.common.Case_Priority", Case_Priority_name, Case_Priority_value)
+	proto.RegisterEnum("google.cloud.support.common.Case_State", Case_State_name, Case_State_value)
+	proto.RegisterEnum("google.cloud.support.common.CustomerIssue_IssueState", CustomerIssue_IssueState_name, CustomerIssue_IssueState_value)
+	proto.RegisterEnum("google.cloud.support.common.SupportRole_Role", SupportRole_Role_name, SupportRole_Role_value)
 	proto.RegisterType((*SupportAccount)(nil), "google.cloud.support.common.SupportAccount")
 	proto.RegisterType((*Case)(nil), "google.cloud.support.common.Case")
 	proto.RegisterType((*CustomerIssue)(nil), "google.cloud.support.common.CustomerIssue")
@@ -939,19 +968,11 @@ func init() {
 	proto.RegisterType((*IssueTaxonomy_Component)(nil), "google.cloud.support.common.IssueTaxonomy.Component")
 	proto.RegisterType((*IssueTaxonomy_Category)(nil), "google.cloud.support.common.IssueTaxonomy.Category")
 	proto.RegisterMapType((map[string]*IssueTaxonomy_Component)(nil), "google.cloud.support.common.IssueTaxonomy.Category.ComponentsEntry")
-	proto.RegisterEnum("google.cloud.support.common.SupportAccount_State", SupportAccount_State_name, SupportAccount_State_value)
-	proto.RegisterEnum("google.cloud.support.common.SupportAccount_PricingModel", SupportAccount_PricingModel_name, SupportAccount_PricingModel_value)
-	proto.RegisterEnum("google.cloud.support.common.Case_Priority", Case_Priority_name, Case_Priority_value)
-	proto.RegisterEnum("google.cloud.support.common.Case_State", Case_State_name, Case_State_value)
-	proto.RegisterEnum("google.cloud.support.common.CustomerIssue_IssueState", CustomerIssue_IssueState_name, CustomerIssue_IssueState_value)
-	proto.RegisterEnum("google.cloud.support.common.SupportRole_Role", SupportRole_Role_name, SupportRole_Role_value)
 }
 
-func init() {
-	proto.RegisterFile("google/cloud/support/common.proto", fileDescriptor_common_2a1414d9284edc87)
-}
+func init() { proto.RegisterFile("google/cloud/support/common.proto", fileDescriptor_f71dd4106e21c931) }
 
-var fileDescriptor_common_2a1414d9284edc87 = []byte{
+var fileDescriptor_f71dd4106e21c931 = []byte{
 	// 1336 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x61, 0x6e, 0xdb, 0xc6,
 	0x12, 0x0e, 0x29, 0xc9, 0x92, 0x46, 0x96, 0xbd, 0x59, 0x38, 0x79, 0x8c, 0x92, 0xbc, 0x38, 0x7a,
diff --git a/googleapis/cloud/support/v1alpha1/cloud_support.pb.go b/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
index 34782d796f..5723bf8a16 100644
--- a/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
+++ b/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/support/v1alpha1/cloud_support.proto
 
-package support // import "google.golang.org/genproto/googleapis/cloud/support/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import common "google.golang.org/genproto/googleapis/cloud/support/common"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package support
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	common "google.golang.org/genproto/googleapis/cloud/support/common"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The request message for `GetSupportAccount`.
 type GetSupportAccountRequest struct {
@@ -41,16 +41,17 @@ func (m *GetSupportAccountRequest) Reset()         { *m = GetSupportAccountReque
 func (m *GetSupportAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSupportAccountRequest) ProtoMessage()    {}
 func (*GetSupportAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{0}
+	return fileDescriptor_aca49aad65ebbfb0, []int{0}
 }
+
 func (m *GetSupportAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSupportAccountRequest.Unmarshal(m, b)
 }
 func (m *GetSupportAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSupportAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSupportAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSupportAccountRequest.Merge(dst, src)
+func (m *GetSupportAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSupportAccountRequest.Merge(m, src)
 }
 func (m *GetSupportAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSupportAccountRequest.Size(m)
@@ -89,16 +90,17 @@ func (m *ListSupportAccountsRequest) Reset()         { *m = ListSupportAccountsR
 func (m *ListSupportAccountsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSupportAccountsRequest) ProtoMessage()    {}
 func (*ListSupportAccountsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{1}
+	return fileDescriptor_aca49aad65ebbfb0, []int{1}
 }
+
 func (m *ListSupportAccountsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSupportAccountsRequest.Unmarshal(m, b)
 }
 func (m *ListSupportAccountsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSupportAccountsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSupportAccountsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSupportAccountsRequest.Merge(dst, src)
+func (m *ListSupportAccountsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSupportAccountsRequest.Merge(m, src)
 }
 func (m *ListSupportAccountsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSupportAccountsRequest.Size(m)
@@ -147,16 +149,17 @@ func (m *ListSupportAccountsResponse) Reset()         { *m = ListSupportAccounts
 func (m *ListSupportAccountsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSupportAccountsResponse) ProtoMessage()    {}
 func (*ListSupportAccountsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{2}
+	return fileDescriptor_aca49aad65ebbfb0, []int{2}
 }
+
 func (m *ListSupportAccountsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSupportAccountsResponse.Unmarshal(m, b)
 }
 func (m *ListSupportAccountsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSupportAccountsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSupportAccountsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSupportAccountsResponse.Merge(dst, src)
+func (m *ListSupportAccountsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSupportAccountsResponse.Merge(m, src)
 }
 func (m *ListSupportAccountsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSupportAccountsResponse.Size(m)
@@ -195,16 +198,17 @@ func (m *GetCaseRequest) Reset()         { *m = GetCaseRequest{} }
 func (m *GetCaseRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCaseRequest) ProtoMessage()    {}
 func (*GetCaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{3}
+	return fileDescriptor_aca49aad65ebbfb0, []int{3}
 }
+
 func (m *GetCaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCaseRequest.Unmarshal(m, b)
 }
 func (m *GetCaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCaseRequest.Merge(dst, src)
+func (m *GetCaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCaseRequest.Merge(m, src)
 }
 func (m *GetCaseRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCaseRequest.Size(m)
@@ -244,16 +248,17 @@ func (m *ListCasesRequest) Reset()         { *m = ListCasesRequest{} }
 func (m *ListCasesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCasesRequest) ProtoMessage()    {}
 func (*ListCasesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{4}
+	return fileDescriptor_aca49aad65ebbfb0, []int{4}
 }
+
 func (m *ListCasesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCasesRequest.Unmarshal(m, b)
 }
 func (m *ListCasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCasesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCasesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCasesRequest.Merge(dst, src)
+func (m *ListCasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCasesRequest.Merge(m, src)
 }
 func (m *ListCasesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCasesRequest.Size(m)
@@ -309,16 +314,17 @@ func (m *ListCasesResponse) Reset()         { *m = ListCasesResponse{} }
 func (m *ListCasesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCasesResponse) ProtoMessage()    {}
 func (*ListCasesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{5}
+	return fileDescriptor_aca49aad65ebbfb0, []int{5}
 }
+
 func (m *ListCasesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCasesResponse.Unmarshal(m, b)
 }
 func (m *ListCasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCasesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCasesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCasesResponse.Merge(dst, src)
+func (m *ListCasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCasesResponse.Merge(m, src)
 }
 func (m *ListCasesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCasesResponse.Size(m)
@@ -356,16 +362,17 @@ func (m *ListCommentsRequest) Reset()         { *m = ListCommentsRequest{} }
 func (m *ListCommentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCommentsRequest) ProtoMessage()    {}
 func (*ListCommentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{6}
+	return fileDescriptor_aca49aad65ebbfb0, []int{6}
 }
+
 func (m *ListCommentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCommentsRequest.Unmarshal(m, b)
 }
 func (m *ListCommentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCommentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCommentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCommentsRequest.Merge(dst, src)
+func (m *ListCommentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCommentsRequest.Merge(m, src)
 }
 func (m *ListCommentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCommentsRequest.Size(m)
@@ -396,16 +403,17 @@ func (m *ListCommentsResponse) Reset()         { *m = ListCommentsResponse{} }
 func (m *ListCommentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCommentsResponse) ProtoMessage()    {}
 func (*ListCommentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{7}
+	return fileDescriptor_aca49aad65ebbfb0, []int{7}
 }
+
 func (m *ListCommentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCommentsResponse.Unmarshal(m, b)
 }
 func (m *ListCommentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCommentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCommentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCommentsResponse.Merge(dst, src)
+func (m *ListCommentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCommentsResponse.Merge(m, src)
 }
 func (m *ListCommentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCommentsResponse.Size(m)
@@ -438,16 +446,17 @@ func (m *CreateCaseRequest) Reset()         { *m = CreateCaseRequest{} }
 func (m *CreateCaseRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateCaseRequest) ProtoMessage()    {}
 func (*CreateCaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{8}
+	return fileDescriptor_aca49aad65ebbfb0, []int{8}
 }
+
 func (m *CreateCaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCaseRequest.Unmarshal(m, b)
 }
 func (m *CreateCaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateCaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCaseRequest.Merge(dst, src)
+func (m *CreateCaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCaseRequest.Merge(m, src)
 }
 func (m *CreateCaseRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateCaseRequest.Size(m)
@@ -488,16 +497,17 @@ func (m *UpdateCaseRequest) Reset()         { *m = UpdateCaseRequest{} }
 func (m *UpdateCaseRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateCaseRequest) ProtoMessage()    {}
 func (*UpdateCaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{9}
+	return fileDescriptor_aca49aad65ebbfb0, []int{9}
 }
+
 func (m *UpdateCaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateCaseRequest.Unmarshal(m, b)
 }
 func (m *UpdateCaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateCaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateCaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateCaseRequest.Merge(dst, src)
+func (m *UpdateCaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCaseRequest.Merge(m, src)
 }
 func (m *UpdateCaseRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateCaseRequest.Size(m)
@@ -537,16 +547,17 @@ func (m *CreateCommentRequest) Reset()         { *m = CreateCommentRequest{} }
 func (m *CreateCommentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateCommentRequest) ProtoMessage()    {}
 func (*CreateCommentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{10}
+	return fileDescriptor_aca49aad65ebbfb0, []int{10}
 }
+
 func (m *CreateCommentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCommentRequest.Unmarshal(m, b)
 }
 func (m *CreateCommentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCommentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateCommentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCommentRequest.Merge(dst, src)
+func (m *CreateCommentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCommentRequest.Merge(m, src)
 }
 func (m *CreateCommentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateCommentRequest.Size(m)
@@ -582,16 +593,17 @@ func (m *GetIssueTaxonomyRequest) Reset()         { *m = GetIssueTaxonomyRequest
 func (m *GetIssueTaxonomyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIssueTaxonomyRequest) ProtoMessage()    {}
 func (*GetIssueTaxonomyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_support_255f2e0c522c4db6, []int{11}
+	return fileDescriptor_aca49aad65ebbfb0, []int{11}
 }
+
 func (m *GetIssueTaxonomyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIssueTaxonomyRequest.Unmarshal(m, b)
 }
 func (m *GetIssueTaxonomyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIssueTaxonomyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIssueTaxonomyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIssueTaxonomyRequest.Merge(dst, src)
+func (m *GetIssueTaxonomyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIssueTaxonomyRequest.Merge(m, src)
 }
 func (m *GetIssueTaxonomyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIssueTaxonomyRequest.Size(m)
@@ -617,6 +629,68 @@ func init() {
 	proto.RegisterType((*GetIssueTaxonomyRequest)(nil), "google.cloud.support.v1alpha1.GetIssueTaxonomyRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/support/v1alpha1/cloud_support.proto", fileDescriptor_aca49aad65ebbfb0)
+}
+
+var fileDescriptor_aca49aad65ebbfb0 = []byte{
+	// 863 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x41, 0x4f, 0x33, 0x45,
+	0x18, 0xce, 0xb4, 0xc8, 0x07, 0x2f, 0xdf, 0xa7, 0x5f, 0x47, 0x82, 0x65, 0x0b, 0x49, 0x3b, 0x21,
+	0xa6, 0x56, 0xdd, 0x85, 0x36, 0x88, 0x96, 0x40, 0x14, 0x88, 0x8d, 0x89, 0x26, 0xa4, 0x60, 0x62,
+	0xbc, 0x34, 0x43, 0x19, 0xd6, 0x95, 0xee, 0xce, 0xda, 0x99, 0x1a, 0x40, 0xbd, 0x78, 0xf1, 0xa6,
+	0x07, 0x6f, 0x7a, 0xe1, 0xe2, 0x59, 0x0f, 0xfe, 0x13, 0xff, 0x82, 0xfe, 0x0f, 0xb3, 0xb3, 0xb3,
+	0xed, 0x76, 0x69, 0x77, 0x17, 0x6e, 0xdd, 0x77, 0xde, 0xe7, 0x7d, 0x9f, 0x79, 0xe6, 0x9d, 0x67,
+	0x0a, 0x3b, 0x36, 0xe7, 0xf6, 0x80, 0x59, 0xfd, 0x01, 0x1f, 0x5d, 0x5a, 0x62, 0xe4, 0xfb, 0x7c,
+	0x28, 0xad, 0x6f, 0x77, 0xe8, 0xc0, 0xff, 0x8a, 0xee, 0x84, 0xe1, 0x9e, 0x0e, 0x9b, 0xfe, 0x90,
+	0x4b, 0x8e, 0x37, 0x43, 0x88, 0xa9, 0xd6, 0xcc, 0x68, 0x2d, 0x82, 0x18, 0x1b, 0xba, 0x22, 0xf5,
+	0x1d, 0x8b, 0x7a, 0x1e, 0x97, 0x54, 0x3a, 0xdc, 0x13, 0x21, 0xd8, 0xa8, 0xcd, 0xec, 0xd7, 0xe7,
+	0xae, 0xcb, 0x3d, 0x9d, 0x52, 0xd1, 0x29, 0xea, 0xeb, 0x62, 0x74, 0x65, 0x31, 0xd7, 0x97, 0xb7,
+	0x7a, 0xb1, 0x9a, 0x5c, 0xbc, 0x72, 0xd8, 0xe0, 0xb2, 0xe7, 0x52, 0x71, 0x1d, 0x66, 0x10, 0x13,
+	0xca, 0x1d, 0x26, 0xcf, 0xc2, 0xca, 0x1f, 0xf5, 0xfb, 0x7c, 0xe4, 0xc9, 0x2e, 0xfb, 0x66, 0xc4,
+	0x84, 0xc4, 0x18, 0x16, 0x3c, 0xea, 0xb2, 0x32, 0xaa, 0xa2, 0xfa, 0x72, 0x57, 0xfd, 0x26, 0x3e,
+	0x18, 0x9f, 0x3a, 0x22, 0x01, 0x10, 0x11, 0x62, 0x0d, 0x16, 0xaf, 0x9c, 0x81, 0x64, 0x43, 0x8d,
+	0xd1, 0x5f, 0xb8, 0x02, 0xcb, 0x3e, 0xb5, 0x59, 0x4f, 0x38, 0x77, 0xac, 0x5c, 0xa8, 0xa2, 0x7a,
+	0xb1, 0xbb, 0x14, 0x04, 0xce, 0x9c, 0x3b, 0x86, 0x37, 0x01, 0xd4, 0xa2, 0xe4, 0xd7, 0xcc, 0x2b,
+	0x17, 0x15, 0x50, 0xa5, 0x9f, 0x07, 0x01, 0xf2, 0x33, 0x82, 0xca, 0xcc, 0x96, 0xc2, 0xe7, 0x9e,
+	0x60, 0xb8, 0x03, 0x4b, 0x54, 0xc7, 0xca, 0xa8, 0x5a, 0xac, 0xaf, 0x34, 0xdf, 0x36, 0x67, 0x6a,
+	0xae, 0x65, 0x4b, 0xec, 0x75, 0x0c, 0xc6, 0x6f, 0xc2, 0x6b, 0x1e, 0xbb, 0x91, 0xbd, 0x18, 0x99,
+	0x82, 0x22, 0xf3, 0x22, 0x08, 0x9f, 0x8e, 0x09, 0x6d, 0xc1, 0xab, 0x1d, 0x26, 0x8f, 0xa9, 0x60,
+	0x69, 0x42, 0xdd, 0xc1, 0xcb, 0x80, 0x75, 0x90, 0x26, 0x52, 0xf2, 0x62, 0x92, 0x15, 0xe6, 0x4b,
+	0x56, 0x4c, 0x95, 0x6c, 0x21, 0x29, 0x99, 0x84, 0x52, 0xac, 0xb7, 0xd6, 0x69, 0x0f, 0x5e, 0xe9,
+	0x07, 0x01, 0x2d, 0x52, 0x2d, 0x55, 0x24, 0xb5, 0xbb, 0x30, 0x3f, 0xb7, 0x2e, 0x6f, 0xc1, 0xeb,
+	0xaa, 0x2b, 0x77, 0x5d, 0x16, 0x9b, 0x89, 0x59, 0xe2, 0x7c, 0x01, 0xab, 0xd3, 0xa9, 0x9a, 0xe3,
+	0x87, 0xb0, 0xd4, 0xd7, 0x31, 0x4d, 0x73, 0x2b, 0x9d, 0x66, 0x98, 0xdc, 0x1d, 0xa3, 0xc8, 0x05,
+	0x94, 0x8e, 0x87, 0x8c, 0x4a, 0x16, 0x3f, 0x9f, 0x35, 0x58, 0xf4, 0xe9, 0x90, 0x79, 0x32, 0x1a,
+	0xcb, 0xf0, 0x0b, 0xef, 0xc2, 0x42, 0xb0, 0x45, 0xb5, 0x9d, 0x5c, 0x8a, 0xa8, 0x74, 0xf2, 0x13,
+	0x82, 0xd2, 0xe7, 0xfe, 0x65, 0xa2, 0x49, 0x54, 0x0c, 0x3d, 0xaa, 0x18, 0xde, 0x87, 0x95, 0x91,
+	0xaa, 0xa5, 0x6e, 0xa5, 0xa6, 0x62, 0x44, 0xe8, 0xe8, 0xe2, 0x9a, 0x1f, 0x07, 0x17, 0xf7, 0x33,
+	0x2a, 0xae, 0xbb, 0x10, 0xa6, 0x07, 0xbf, 0xc9, 0xd7, 0xb0, 0xaa, 0x77, 0xab, 0x85, 0x48, 0x19,
+	0xb4, 0x43, 0x78, 0xa6, 0x55, 0xd2, 0x4d, 0xf2, 0x49, 0x1b, 0x81, 0xc8, 0x3a, 0xbc, 0xd1, 0x61,
+	0xf2, 0x13, 0x21, 0x46, 0xec, 0x9c, 0xde, 0x70, 0x8f, 0xbb, 0xb7, 0xba, 0x5d, 0xf3, 0xbf, 0x15,
+	0x78, 0x7e, 0x1c, 0x14, 0xd1, 0x77, 0x0b, 0xff, 0x81, 0xa0, 0xf4, 0xc0, 0x56, 0xf0, 0x9e, 0x99,
+	0xea, 0x85, 0xe6, 0x3c, 0x23, 0x32, 0x1e, 0x73, 0xa1, 0x49, 0xe3, 0xc7, 0x7f, 0xfe, 0xfd, 0xb5,
+	0xb0, 0x85, 0xc9, 0xc4, 0x97, 0xbf, 0x0b, 0x04, 0x38, 0x10, 0xd3, 0x06, 0x62, 0x35, 0x7e, 0xc0,
+	0x7f, 0xa2, 0x70, 0x66, 0x13, 0xde, 0x82, 0x3f, 0xc8, 0x60, 0x3a, 0xdf, 0x02, 0x8d, 0xf6, 0x53,
+	0xa0, 0xe1, 0xf8, 0x93, 0x9a, 0xa2, 0x5e, 0xc1, 0xeb, 0x13, 0xea, 0x09, 0xd2, 0xf8, 0x17, 0x04,
+	0xcf, 0xb4, 0xfb, 0xe0, 0x77, 0xb3, 0xf5, 0x8c, 0x0d, 0xa8, 0x91, 0x3d, 0x92, 0xa4, 0xa9, 0x08,
+	0xbc, 0x83, 0x1b, 0x99, 0xda, 0x59, 0xca, 0x1b, 0x02, 0x0d, 0xef, 0x11, 0x2c, 0x8f, 0xdd, 0x06,
+	0x5b, 0x39, 0xb6, 0x1f, 0xf7, 0x44, 0x63, 0x3b, 0x3f, 0x40, 0xab, 0xb4, 0xad, 0x48, 0x36, 0x70,
+	0x3d, 0xfb, 0x80, 0x43, 0x96, 0xf8, 0x6f, 0x04, 0xcf, 0xe3, 0x7e, 0x83, 0x9b, 0x79, 0x9a, 0x4e,
+	0xfb, 0x98, 0xd1, 0x7a, 0x14, 0x46, 0x73, 0xdd, 0x57, 0x5c, 0x77, 0x71, 0x2b, 0xbf, 0xa0, 0x56,
+	0xe4, 0x65, 0xf8, 0x77, 0x04, 0x30, 0x31, 0x33, 0x9c, 0xa5, 0xd4, 0x03, 0xdf, 0xcb, 0x73, 0xe2,
+	0xef, 0x2b, 0x82, 0x4d, 0x12, 0x3f, 0xf1, 0xd0, 0x1d, 0xe7, 0xca, 0xd9, 0x0e, 0x8d, 0xeb, 0x1e,
+	0x01, 0x4c, 0x5c, 0x30, 0x93, 0xdd, 0x03, 0xc3, 0xcc, 0xc3, 0xee, 0x40, 0xb1, 0xdb, 0x6b, 0x5a,
+	0x31, 0x76, 0x41, 0x73, 0x33, 0x43, 0x43, 0x4d, 0xf1, 0x2f, 0x04, 0x2f, 0xa6, 0xfc, 0x11, 0xb7,
+	0xf2, 0x69, 0x38, 0xe5, 0xa6, 0x46, 0x2e, 0xa3, 0x24, 0x27, 0x8a, 0xeb, 0x21, 0x79, 0xca, 0x51,
+	0xb7, 0x23, 0x97, 0xc5, 0xbf, 0x21, 0x78, 0x99, 0xb4, 0x59, 0xfc, 0x5e, 0xf6, 0x45, 0x9f, 0xe5,
+	0xcb, 0x46, 0x23, 0x95, 0xf8, 0x14, 0x84, 0x10, 0x45, 0x7f, 0x03, 0x1b, 0x63, 0xfa, 0x6d, 0x3b,
+	0x51, 0xf6, 0xe8, 0x7b, 0xa8, 0xf5, 0xb9, 0x9b, 0x4e, 0xe6, 0xa8, 0x14, 0x7f, 0x09, 0x4e, 0x83,
+	0xf7, 0xeb, 0xcb, 0x13, 0x8d, 0xb0, 0xf9, 0x80, 0x7a, 0xb6, 0xc9, 0x87, 0xb6, 0x65, 0x33, 0x4f,
+	0xbd, 0x6d, 0x56, 0xb8, 0x44, 0x7d, 0x47, 0xcc, 0xf9, 0x57, 0xbd, 0xaf, 0x03, 0x17, 0x8b, 0x0a,
+	0xd0, 0xfa, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xad, 0xe1, 0xf2, 0x57, 0x85, 0x0b, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -988,65 +1062,3 @@ var _CloudSupport_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/support/v1alpha1/cloud_support.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/support/v1alpha1/cloud_support.proto", fileDescriptor_cloud_support_255f2e0c522c4db6)
-}
-
-var fileDescriptor_cloud_support_255f2e0c522c4db6 = []byte{
-	// 863 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x41, 0x4f, 0x33, 0x45,
-	0x18, 0xce, 0xb4, 0xc8, 0x07, 0x2f, 0xdf, 0xa7, 0x5f, 0x47, 0x82, 0x65, 0x0b, 0x49, 0x3b, 0x21,
-	0xa6, 0x56, 0xdd, 0x85, 0x36, 0x88, 0x96, 0x40, 0x14, 0x88, 0x8d, 0x89, 0x26, 0xa4, 0x60, 0x62,
-	0xbc, 0x34, 0x43, 0x19, 0xd6, 0x95, 0xee, 0xce, 0xda, 0x99, 0x1a, 0x40, 0xbd, 0x78, 0xf1, 0xa6,
-	0x07, 0x6f, 0x7a, 0xe1, 0xe2, 0x59, 0x0f, 0xfe, 0x13, 0xff, 0x82, 0xfe, 0x0f, 0xb3, 0xb3, 0xb3,
-	0xed, 0x76, 0x69, 0x77, 0x17, 0x6e, 0xdd, 0x77, 0xde, 0xe7, 0x7d, 0x9f, 0x79, 0xe6, 0x9d, 0x67,
-	0x0a, 0x3b, 0x36, 0xe7, 0xf6, 0x80, 0x59, 0xfd, 0x01, 0x1f, 0x5d, 0x5a, 0x62, 0xe4, 0xfb, 0x7c,
-	0x28, 0xad, 0x6f, 0x77, 0xe8, 0xc0, 0xff, 0x8a, 0xee, 0x84, 0xe1, 0x9e, 0x0e, 0x9b, 0xfe, 0x90,
-	0x4b, 0x8e, 0x37, 0x43, 0x88, 0xa9, 0xd6, 0xcc, 0x68, 0x2d, 0x82, 0x18, 0x1b, 0xba, 0x22, 0xf5,
-	0x1d, 0x8b, 0x7a, 0x1e, 0x97, 0x54, 0x3a, 0xdc, 0x13, 0x21, 0xd8, 0xa8, 0xcd, 0xec, 0xd7, 0xe7,
-	0xae, 0xcb, 0x3d, 0x9d, 0x52, 0xd1, 0x29, 0xea, 0xeb, 0x62, 0x74, 0x65, 0x31, 0xd7, 0x97, 0xb7,
-	0x7a, 0xb1, 0x9a, 0x5c, 0xbc, 0x72, 0xd8, 0xe0, 0xb2, 0xe7, 0x52, 0x71, 0x1d, 0x66, 0x10, 0x13,
-	0xca, 0x1d, 0x26, 0xcf, 0xc2, 0xca, 0x1f, 0xf5, 0xfb, 0x7c, 0xe4, 0xc9, 0x2e, 0xfb, 0x66, 0xc4,
-	0x84, 0xc4, 0x18, 0x16, 0x3c, 0xea, 0xb2, 0x32, 0xaa, 0xa2, 0xfa, 0x72, 0x57, 0xfd, 0x26, 0x3e,
-	0x18, 0x9f, 0x3a, 0x22, 0x01, 0x10, 0x11, 0x62, 0x0d, 0x16, 0xaf, 0x9c, 0x81, 0x64, 0x43, 0x8d,
-	0xd1, 0x5f, 0xb8, 0x02, 0xcb, 0x3e, 0xb5, 0x59, 0x4f, 0x38, 0x77, 0xac, 0x5c, 0xa8, 0xa2, 0x7a,
-	0xb1, 0xbb, 0x14, 0x04, 0xce, 0x9c, 0x3b, 0x86, 0x37, 0x01, 0xd4, 0xa2, 0xe4, 0xd7, 0xcc, 0x2b,
-	0x17, 0x15, 0x50, 0xa5, 0x9f, 0x07, 0x01, 0xf2, 0x33, 0x82, 0xca, 0xcc, 0x96, 0xc2, 0xe7, 0x9e,
-	0x60, 0xb8, 0x03, 0x4b, 0x54, 0xc7, 0xca, 0xa8, 0x5a, 0xac, 0xaf, 0x34, 0xdf, 0x36, 0x67, 0x6a,
-	0xae, 0x65, 0x4b, 0xec, 0x75, 0x0c, 0xc6, 0x6f, 0xc2, 0x6b, 0x1e, 0xbb, 0x91, 0xbd, 0x18, 0x99,
-	0x82, 0x22, 0xf3, 0x22, 0x08, 0x9f, 0x8e, 0x09, 0x6d, 0xc1, 0xab, 0x1d, 0x26, 0x8f, 0xa9, 0x60,
-	0x69, 0x42, 0xdd, 0xc1, 0xcb, 0x80, 0x75, 0x90, 0x26, 0x52, 0xf2, 0x62, 0x92, 0x15, 0xe6, 0x4b,
-	0x56, 0x4c, 0x95, 0x6c, 0x21, 0x29, 0x99, 0x84, 0x52, 0xac, 0xb7, 0xd6, 0x69, 0x0f, 0x5e, 0xe9,
-	0x07, 0x01, 0x2d, 0x52, 0x2d, 0x55, 0x24, 0xb5, 0xbb, 0x30, 0x3f, 0xb7, 0x2e, 0x6f, 0xc1, 0xeb,
-	0xaa, 0x2b, 0x77, 0x5d, 0x16, 0x9b, 0x89, 0x59, 0xe2, 0x7c, 0x01, 0xab, 0xd3, 0xa9, 0x9a, 0xe3,
-	0x87, 0xb0, 0xd4, 0xd7, 0x31, 0x4d, 0x73, 0x2b, 0x9d, 0x66, 0x98, 0xdc, 0x1d, 0xa3, 0xc8, 0x05,
-	0x94, 0x8e, 0x87, 0x8c, 0x4a, 0x16, 0x3f, 0x9f, 0x35, 0x58, 0xf4, 0xe9, 0x90, 0x79, 0x32, 0x1a,
-	0xcb, 0xf0, 0x0b, 0xef, 0xc2, 0x42, 0xb0, 0x45, 0xb5, 0x9d, 0x5c, 0x8a, 0xa8, 0x74, 0xf2, 0x13,
-	0x82, 0xd2, 0xe7, 0xfe, 0x65, 0xa2, 0x49, 0x54, 0x0c, 0x3d, 0xaa, 0x18, 0xde, 0x87, 0x95, 0x91,
-	0xaa, 0xa5, 0x6e, 0xa5, 0xa6, 0x62, 0x44, 0xe8, 0xe8, 0xe2, 0x9a, 0x1f, 0x07, 0x17, 0xf7, 0x33,
-	0x2a, 0xae, 0xbb, 0x10, 0xa6, 0x07, 0xbf, 0xc9, 0xd7, 0xb0, 0xaa, 0x77, 0xab, 0x85, 0x48, 0x19,
-	0xb4, 0x43, 0x78, 0xa6, 0x55, 0xd2, 0x4d, 0xf2, 0x49, 0x1b, 0x81, 0xc8, 0x3a, 0xbc, 0xd1, 0x61,
-	0xf2, 0x13, 0x21, 0x46, 0xec, 0x9c, 0xde, 0x70, 0x8f, 0xbb, 0xb7, 0xba, 0x5d, 0xf3, 0xbf, 0x15,
-	0x78, 0x7e, 0x1c, 0x14, 0xd1, 0x77, 0x0b, 0xff, 0x81, 0xa0, 0xf4, 0xc0, 0x56, 0xf0, 0x9e, 0x99,
-	0xea, 0x85, 0xe6, 0x3c, 0x23, 0x32, 0x1e, 0x73, 0xa1, 0x49, 0xe3, 0xc7, 0x7f, 0xfe, 0xfd, 0xb5,
-	0xb0, 0x85, 0xc9, 0xc4, 0x97, 0xbf, 0x0b, 0x04, 0x38, 0x10, 0xd3, 0x06, 0x62, 0x35, 0x7e, 0xc0,
-	0x7f, 0xa2, 0x70, 0x66, 0x13, 0xde, 0x82, 0x3f, 0xc8, 0x60, 0x3a, 0xdf, 0x02, 0x8d, 0xf6, 0x53,
-	0xa0, 0xe1, 0xf8, 0x93, 0x9a, 0xa2, 0x5e, 0xc1, 0xeb, 0x13, 0xea, 0x09, 0xd2, 0xf8, 0x17, 0x04,
-	0xcf, 0xb4, 0xfb, 0xe0, 0x77, 0xb3, 0xf5, 0x8c, 0x0d, 0xa8, 0x91, 0x3d, 0x92, 0xa4, 0xa9, 0x08,
-	0xbc, 0x83, 0x1b, 0x99, 0xda, 0x59, 0xca, 0x1b, 0x02, 0x0d, 0xef, 0x11, 0x2c, 0x8f, 0xdd, 0x06,
-	0x5b, 0x39, 0xb6, 0x1f, 0xf7, 0x44, 0x63, 0x3b, 0x3f, 0x40, 0xab, 0xb4, 0xad, 0x48, 0x36, 0x70,
-	0x3d, 0xfb, 0x80, 0x43, 0x96, 0xf8, 0x6f, 0x04, 0xcf, 0xe3, 0x7e, 0x83, 0x9b, 0x79, 0x9a, 0x4e,
-	0xfb, 0x98, 0xd1, 0x7a, 0x14, 0x46, 0x73, 0xdd, 0x57, 0x5c, 0x77, 0x71, 0x2b, 0xbf, 0xa0, 0x56,
-	0xe4, 0x65, 0xf8, 0x77, 0x04, 0x30, 0x31, 0x33, 0x9c, 0xa5, 0xd4, 0x03, 0xdf, 0xcb, 0x73, 0xe2,
-	0xef, 0x2b, 0x82, 0x4d, 0x12, 0x3f, 0xf1, 0xd0, 0x1d, 0xe7, 0xca, 0xd9, 0x0e, 0x8d, 0xeb, 0x1e,
-	0x01, 0x4c, 0x5c, 0x30, 0x93, 0xdd, 0x03, 0xc3, 0xcc, 0xc3, 0xee, 0x40, 0xb1, 0xdb, 0x6b, 0x5a,
-	0x31, 0x76, 0x41, 0x73, 0x33, 0x43, 0x43, 0x4d, 0xf1, 0x2f, 0x04, 0x2f, 0xa6, 0xfc, 0x11, 0xb7,
-	0xf2, 0x69, 0x38, 0xe5, 0xa6, 0x46, 0x2e, 0xa3, 0x24, 0x27, 0x8a, 0xeb, 0x21, 0x79, 0xca, 0x51,
-	0xb7, 0x23, 0x97, 0xc5, 0xbf, 0x21, 0x78, 0x99, 0xb4, 0x59, 0xfc, 0x5e, 0xf6, 0x45, 0x9f, 0xe5,
-	0xcb, 0x46, 0x23, 0x95, 0xf8, 0x14, 0x84, 0x10, 0x45, 0x7f, 0x03, 0x1b, 0x63, 0xfa, 0x6d, 0x3b,
-	0x51, 0xf6, 0xe8, 0x7b, 0xa8, 0xf5, 0xb9, 0x9b, 0x4e, 0xe6, 0xa8, 0x14, 0x7f, 0x09, 0x4e, 0x83,
-	0xf7, 0xeb, 0xcb, 0x13, 0x8d, 0xb0, 0xf9, 0x80, 0x7a, 0xb6, 0xc9, 0x87, 0xb6, 0x65, 0x33, 0x4f,
-	0xbd, 0x6d, 0x56, 0xb8, 0x44, 0x7d, 0x47, 0xcc, 0xf9, 0x57, 0xbd, 0xaf, 0x03, 0x17, 0x8b, 0x0a,
-	0xd0, 0xfa, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xad, 0xe1, 0xf2, 0x57, 0x85, 0x0b, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/talent/v4beta1/application.pb.go b/googleapis/cloud/talent/v4beta1/application.pb.go
index c4cf4e3e59..f6c9f911aa 100644
--- a/googleapis/cloud/talent/v4beta1/application.pb.go
+++ b/googleapis/cloud/talent/v4beta1/application.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/application.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+package talent
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import date "google.golang.org/genproto/googleapis/type/date"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	date "google.golang.org/genproto/googleapis/type/date"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum that represents the application status.
 type Application_ApplicationState int32
@@ -51,6 +54,7 @@ var Application_ApplicationState_name = map[int32]string{
 	4: "COMPLETED",
 	5: "CLOSED",
 }
+
 var Application_ApplicationState_value = map[string]int32{
 	"APPLICATION_STATE_UNSPECIFIED": 0,
 	"IN_PROGRESS":                   1,
@@ -63,8 +67,9 @@ var Application_ApplicationState_value = map[string]int32{
 func (x Application_ApplicationState) String() string {
 	return proto.EnumName(Application_ApplicationState_name, int32(x))
 }
+
 func (Application_ApplicationState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_application_dbba57710742dc0d, []int{0, 0}
+	return fileDescriptor_17aa3b44422c8555, []int{0, 0}
 }
 
 // The stage of the application.
@@ -104,6 +109,7 @@ var Application_ApplicationStage_name = map[int32]string{
 	6: "OFFER_ACCEPTED",
 	7: "STARTED",
 }
+
 var Application_ApplicationStage_value = map[string]int32{
 	"APPLICATION_STAGE_UNSPECIFIED": 0,
 	"NEW":                           1,
@@ -118,8 +124,9 @@ var Application_ApplicationStage_value = map[string]int32{
 func (x Application_ApplicationStage) String() string {
 	return proto.EnumName(Application_ApplicationStage_name, int32(x))
 }
+
 func (Application_ApplicationStage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_application_dbba57710742dc0d, []int{0, 1}
+	return fileDescriptor_17aa3b44422c8555, []int{0, 1}
 }
 
 // Resource that represents a job application record of a candidate.
@@ -223,16 +230,17 @@ func (m *Application) Reset()         { *m = Application{} }
 func (m *Application) String() string { return proto.CompactTextString(m) }
 func (*Application) ProtoMessage()    {}
 func (*Application) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_dbba57710742dc0d, []int{0}
+	return fileDescriptor_17aa3b44422c8555, []int{0}
 }
+
 func (m *Application) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Application.Unmarshal(m, b)
 }
 func (m *Application) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Application.Marshal(b, m, deterministic)
 }
-func (dst *Application) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Application.Merge(dst, src)
+func (m *Application) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Application.Merge(m, src)
 }
 func (m *Application) XXX_Size() int {
 	return xxx_messageInfo_Application.Size(m)
@@ -356,16 +364,16 @@ func (m *Application) GetJobTitleSnippet() string {
 }
 
 func init() {
-	proto.RegisterType((*Application)(nil), "google.cloud.talent.v4beta1.Application")
 	proto.RegisterEnum("google.cloud.talent.v4beta1.Application_ApplicationState", Application_ApplicationState_name, Application_ApplicationState_value)
 	proto.RegisterEnum("google.cloud.talent.v4beta1.Application_ApplicationStage", Application_ApplicationStage_name, Application_ApplicationStage_value)
+	proto.RegisterType((*Application)(nil), "google.cloud.talent.v4beta1.Application")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/application.proto", fileDescriptor_application_dbba57710742dc0d)
+	proto.RegisterFile("google/cloud/talent/v4beta1/application.proto", fileDescriptor_17aa3b44422c8555)
 }
 
-var fileDescriptor_application_dbba57710742dc0d = []byte{
+var fileDescriptor_17aa3b44422c8555 = []byte{
 	// 764 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0xc7, 0x71, 0xd3, 0x36, 0xdd, 0x31, 0xdd, 0xba, 0x03, 0xad, 0x86, 0xb2, 0x4b, 0x42, 0xf9,
diff --git a/googleapis/cloud/talent/v4beta1/application_service.pb.go b/googleapis/cloud/talent/v4beta1/application_service.pb.go
index c0845d0a57..f037ed2d9b 100644
--- a/googleapis/cloud/talent/v4beta1/application_service.pb.go
+++ b/googleapis/cloud/talent/v4beta1/application_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/application_service.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package talent
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The Request of the CreateApplication method.
 type CreateApplicationRequest struct {
@@ -49,16 +49,17 @@ func (m *CreateApplicationRequest) Reset()         { *m = CreateApplicationReque
 func (m *CreateApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateApplicationRequest) ProtoMessage()    {}
 func (*CreateApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_service_ffccd846cf58538c, []int{0}
+	return fileDescriptor_5d34b1b7148314cc, []int{0}
 }
+
 func (m *CreateApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateApplicationRequest.Unmarshal(m, b)
 }
 func (m *CreateApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateApplicationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateApplicationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateApplicationRequest.Merge(dst, src)
+func (m *CreateApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateApplicationRequest.Merge(m, src)
 }
 func (m *CreateApplicationRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateApplicationRequest.Size(m)
@@ -103,16 +104,17 @@ func (m *GetApplicationRequest) Reset()         { *m = GetApplicationRequest{} }
 func (m *GetApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetApplicationRequest) ProtoMessage()    {}
 func (*GetApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_service_ffccd846cf58538c, []int{1}
+	return fileDescriptor_5d34b1b7148314cc, []int{1}
 }
+
 func (m *GetApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetApplicationRequest.Unmarshal(m, b)
 }
 func (m *GetApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetApplicationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetApplicationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetApplicationRequest.Merge(dst, src)
+func (m *GetApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetApplicationRequest.Merge(m, src)
 }
 func (m *GetApplicationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetApplicationRequest.Size(m)
@@ -154,16 +156,17 @@ func (m *UpdateApplicationRequest) Reset()         { *m = UpdateApplicationReque
 func (m *UpdateApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateApplicationRequest) ProtoMessage()    {}
 func (*UpdateApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_service_ffccd846cf58538c, []int{2}
+	return fileDescriptor_5d34b1b7148314cc, []int{2}
 }
+
 func (m *UpdateApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateApplicationRequest.Unmarshal(m, b)
 }
 func (m *UpdateApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateApplicationRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateApplicationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateApplicationRequest.Merge(dst, src)
+func (m *UpdateApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateApplicationRequest.Merge(m, src)
 }
 func (m *UpdateApplicationRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateApplicationRequest.Size(m)
@@ -208,16 +211,17 @@ func (m *DeleteApplicationRequest) Reset()         { *m = DeleteApplicationReque
 func (m *DeleteApplicationRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteApplicationRequest) ProtoMessage()    {}
 func (*DeleteApplicationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_service_ffccd846cf58538c, []int{3}
+	return fileDescriptor_5d34b1b7148314cc, []int{3}
 }
+
 func (m *DeleteApplicationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteApplicationRequest.Unmarshal(m, b)
 }
 func (m *DeleteApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteApplicationRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteApplicationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteApplicationRequest.Merge(dst, src)
+func (m *DeleteApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteApplicationRequest.Merge(m, src)
 }
 func (m *DeleteApplicationRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteApplicationRequest.Size(m)
@@ -263,16 +267,17 @@ func (m *ListApplicationsRequest) Reset()         { *m = ListApplicationsRequest
 func (m *ListApplicationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListApplicationsRequest) ProtoMessage()    {}
 func (*ListApplicationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_service_ffccd846cf58538c, []int{4}
+	return fileDescriptor_5d34b1b7148314cc, []int{4}
 }
+
 func (m *ListApplicationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListApplicationsRequest.Unmarshal(m, b)
 }
 func (m *ListApplicationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListApplicationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListApplicationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListApplicationsRequest.Merge(dst, src)
+func (m *ListApplicationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListApplicationsRequest.Merge(m, src)
 }
 func (m *ListApplicationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListApplicationsRequest.Size(m)
@@ -324,16 +329,17 @@ func (m *ListApplicationsResponse) Reset()         { *m = ListApplicationsRespon
 func (m *ListApplicationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListApplicationsResponse) ProtoMessage()    {}
 func (*ListApplicationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_application_service_ffccd846cf58538c, []int{5}
+	return fileDescriptor_5d34b1b7148314cc, []int{5}
 }
+
 func (m *ListApplicationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListApplicationsResponse.Unmarshal(m, b)
 }
 func (m *ListApplicationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListApplicationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListApplicationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListApplicationsResponse.Merge(dst, src)
+func (m *ListApplicationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListApplicationsResponse.Merge(m, src)
 }
 func (m *ListApplicationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListApplicationsResponse.Size(m)
@@ -374,6 +380,56 @@ func init() {
 	proto.RegisterType((*ListApplicationsResponse)(nil), "google.cloud.talent.v4beta1.ListApplicationsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/talent/v4beta1/application_service.proto", fileDescriptor_5d34b1b7148314cc)
+}
+
+var fileDescriptor_5d34b1b7148314cc = []byte{
+	// 665 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x4f, 0xd4, 0x40,
+	0x18, 0xc6, 0x33, 0xa0, 0x08, 0xef, 0xfa, 0x8f, 0x49, 0x84, 0x66, 0xd1, 0xb8, 0xe9, 0xc1, 0x6c,
+	0xd6, 0xd0, 0x89, 0x2b, 0x5c, 0x24, 0x1a, 0x01, 0xc5, 0x40, 0x20, 0x92, 0x05, 0x2e, 0x5e, 0x36,
+	0xc3, 0xee, 0x4b, 0x53, 0x69, 0x3b, 0xb5, 0x33, 0x4b, 0x14, 0x83, 0x07, 0x13, 0x3f, 0x81, 0xdf,
+	0x40, 0x6f, 0x7e, 0x00, 0xaf, 0x1e, 0x3d, 0x78, 0xd4, 0x9b, 0x57, 0x3f, 0x88, 0xe9, 0xb4, 0xbb,
+	0x14, 0xda, 0xed, 0xb2, 0x70, 0xeb, 0x4c, 0xe7, 0x99, 0xf7, 0x37, 0xcf, 0xf4, 0x79, 0x0b, 0xf3,
+	0xb6, 0x10, 0xb6, 0x8b, 0xac, 0xe5, 0x8a, 0x4e, 0x9b, 0x29, 0xee, 0xa2, 0xaf, 0xd8, 0xc1, 0xdc,
+	0x2e, 0x2a, 0xfe, 0x80, 0xf1, 0x20, 0x70, 0x9d, 0x16, 0x57, 0x8e, 0xf0, 0x9b, 0x12, 0xc3, 0x03,
+	0xa7, 0x85, 0x56, 0x10, 0x0a, 0x25, 0xe8, 0x4c, 0x2c, 0xb3, 0xb4, 0xcc, 0x8a, 0x65, 0x56, 0x22,
+	0x2b, 0xdf, 0x4e, 0xf6, 0xe4, 0x81, 0xc3, 0xb8, 0xef, 0x0b, 0xa5, 0x77, 0x90, 0xb1, 0xb4, 0x3c,
+	0x7b, 0xc6, 0x8a, 0xc9, 0xf2, 0x6a, 0xd1, 0xf2, 0x96, 0xf0, 0xbc, 0xde, 0xca, 0x84, 0x89, 0xe9,
+	0xd1, 0x6e, 0x67, 0x8f, 0xa1, 0x17, 0xa8, 0x77, 0xc9, 0xcb, 0xca, 0xe9, 0x97, 0x7b, 0x0e, 0xba,
+	0xed, 0xa6, 0xc7, 0xe5, 0x7e, 0xbc, 0xc2, 0xfc, 0x00, 0xc6, 0x72, 0x88, 0x5c, 0xe1, 0xe2, 0x31,
+	0x43, 0x03, 0xdf, 0x74, 0x50, 0x2a, 0x3a, 0x05, 0x63, 0x01, 0x0f, 0xd1, 0x57, 0x06, 0xa9, 0x90,
+	0xea, 0x44, 0x23, 0x19, 0xd1, 0x35, 0x28, 0xa5, 0x88, 0x8d, 0x91, 0x0a, 0xa9, 0x96, 0xea, 0x55,
+	0xab, 0xc0, 0x1c, 0x2b, 0xbd, 0x7b, 0x5a, 0x6c, 0xde, 0x87, 0x5b, 0x2f, 0x50, 0xe5, 0x14, 0xa7,
+	0x70, 0xc9, 0xe7, 0x1e, 0x26, 0xa5, 0xf5, 0xb3, 0xf9, 0x95, 0x80, 0xb1, 0x13, 0xb4, 0xf3, 0x69,
+	0x4f, 0x51, 0x91, 0x0b, 0x50, 0xd1, 0x05, 0x28, 0x75, 0x74, 0x1d, 0x6d, 0x55, 0x72, 0xc2, 0x72,
+	0x77, 0xaf, 0xae, 0x9b, 0xd6, 0x4a, 0xe4, 0xe6, 0x06, 0x97, 0xfb, 0x0d, 0x88, 0x97, 0x47, 0xcf,
+	0xa6, 0x05, 0xc6, 0x33, 0x74, 0x31, 0x17, 0x32, 0xef, 0x54, 0x1e, 0x4c, 0xaf, 0x3b, 0x32, 0xed,
+	0x81, 0x1c, 0x74, 0x03, 0x77, 0x00, 0x02, 0x6e, 0x63, 0x53, 0x89, 0x7d, 0x8c, 0x2f, 0x60, 0xa2,
+	0x31, 0x11, 0xcd, 0x6c, 0x47, 0x13, 0x74, 0x06, 0xf4, 0xa0, 0x29, 0x9d, 0x43, 0x34, 0x46, 0x2b,
+	0xa4, 0x7a, 0xb9, 0x31, 0x1e, 0x4d, 0x6c, 0x39, 0x87, 0x68, 0xfe, 0x25, 0x60, 0x64, 0xeb, 0xc9,
+	0x40, 0xf8, 0x12, 0xe9, 0x3a, 0x5c, 0x4d, 0xf9, 0x20, 0x0d, 0x52, 0x19, 0x1d, 0xca, 0xc5, 0x13,
+	0x6a, 0x7a, 0x0f, 0x6e, 0xf8, 0xf8, 0x56, 0x35, 0x33, 0xac, 0xd7, 0xa2, 0xe9, 0xcd, 0x1e, 0xef,
+	0x2a, 0x8c, 0x7b, 0xa8, 0x78, 0x9b, 0x2b, 0xae, 0x71, 0x4b, 0xf5, 0xd9, 0xc2, 0x8a, 0x5d, 0xdc,
+	0x8d, 0x44, 0xd4, 0xe8, 0xc9, 0xeb, 0x7f, 0xae, 0x00, 0x4d, 0x01, 0x6d, 0xc5, 0xf9, 0xa5, 0x3f,
+	0x08, 0x4c, 0x66, 0xbe, 0x73, 0x3a, 0x5f, 0x58, 0xa5, 0x5f, 0x2e, 0xca, 0x67, 0xb6, 0xc3, 0x5c,
+	0xfd, 0xf8, 0xfb, 0xdf, 0xe7, 0x91, 0x65, 0xf3, 0x49, 0x2f, 0xbb, 0xef, 0xe3, 0x1b, 0x7c, 0x1c,
+	0x84, 0xe2, 0x35, 0xb6, 0x94, 0x64, 0x35, 0xa6, 0xd0, 0xe7, 0xbe, 0x7e, 0x0a, 0x42, 0xb1, 0xe7,
+	0xb8, 0x28, 0x59, 0xed, 0x28, 0xdd, 0x13, 0xe4, 0x23, 0x52, 0xa3, 0xdf, 0x09, 0x5c, 0x3f, 0x99,
+	0x14, 0x5a, 0x2f, 0xe4, 0xc8, 0x8d, 0xd5, 0x10, 0xec, 0x2b, 0x9a, 0xfd, 0x29, 0x4d, 0xb1, 0x47,
+	0x9f, 0xeb, 0x20, 0xf2, 0x13, 0xe0, 0xac, 0x76, 0x44, 0x7f, 0x11, 0x98, 0xcc, 0x84, 0x76, 0x80,
+	0xf5, 0xfd, 0x42, 0x3e, 0x04, 0xfe, 0x8e, 0xc6, 0x7f, 0x59, 0x5f, 0x3b, 0xc6, 0x4f, 0xb7, 0xd9,
+	0xf3, 0x1c, 0x25, 0xba, 0x86, 0x6f, 0x04, 0x26, 0x33, 0xe9, 0x1e, 0x70, 0x9a, 0x7e, 0xdd, 0xa0,
+	0x3c, 0x95, 0xe9, 0x28, 0xcf, 0xa3, 0xe6, 0xdd, 0xb5, 0xbe, 0x76, 0x51, 0xeb, 0x7f, 0x12, 0xb8,
+	0x79, 0x3a, 0xea, 0x74, 0xae, 0x90, 0xb5, 0x4f, 0x27, 0x2a, 0xcf, 0x0f, 0xa9, 0x8a, 0x03, 0x9a,
+	0xf7, 0x11, 0x9d, 0x27, 0x00, 0x4b, 0x9f, 0x08, 0xdc, 0x6d, 0x09, 0xaf, 0x08, 0x62, 0x69, 0x3a,
+	0x9b, 0xfb, 0xcd, 0xc8, 0xd7, 0x4d, 0xf2, 0x6a, 0x31, 0xd1, 0xd9, 0xc2, 0xe5, 0xbe, 0x6d, 0x89,
+	0xd0, 0x66, 0x36, 0xfa, 0xda, 0x75, 0x16, 0xbf, 0xe2, 0x81, 0x23, 0x73, 0xff, 0xb6, 0x0b, 0xf1,
+	0xf0, 0xcb, 0xc8, 0xe8, 0xf2, 0xf6, 0xd6, 0xee, 0x98, 0xd6, 0x3c, 0xfc, 0x1f, 0x00, 0x00, 0xff,
+	0xff, 0x39, 0x45, 0xae, 0x62, 0x41, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -587,53 +643,3 @@ var _ApplicationService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/talent/v4beta1/application_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/application_service.proto", fileDescriptor_application_service_ffccd846cf58538c)
-}
-
-var fileDescriptor_application_service_ffccd846cf58538c = []byte{
-	// 665 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x4f, 0xd4, 0x40,
-	0x18, 0xc6, 0x33, 0xa0, 0x08, 0xef, 0xfa, 0x8f, 0x49, 0x84, 0x66, 0xd1, 0xb8, 0xe9, 0xc1, 0x6c,
-	0xd6, 0xd0, 0x89, 0x2b, 0x5c, 0x24, 0x1a, 0x01, 0xc5, 0x40, 0x20, 0x92, 0x05, 0x2e, 0x5e, 0x36,
-	0xc3, 0xee, 0x4b, 0x53, 0x69, 0x3b, 0xb5, 0x33, 0x4b, 0x14, 0x83, 0x07, 0x13, 0x3f, 0x81, 0xdf,
-	0x40, 0x6f, 0x7e, 0x00, 0xaf, 0x1e, 0x3d, 0x78, 0xd4, 0x9b, 0x57, 0x3f, 0x88, 0xe9, 0xb4, 0xbb,
-	0x14, 0xda, 0xed, 0xb2, 0x70, 0xeb, 0x4c, 0xe7, 0x99, 0xf7, 0x37, 0xcf, 0xf4, 0x79, 0x0b, 0xf3,
-	0xb6, 0x10, 0xb6, 0x8b, 0xac, 0xe5, 0x8a, 0x4e, 0x9b, 0x29, 0xee, 0xa2, 0xaf, 0xd8, 0xc1, 0xdc,
-	0x2e, 0x2a, 0xfe, 0x80, 0xf1, 0x20, 0x70, 0x9d, 0x16, 0x57, 0x8e, 0xf0, 0x9b, 0x12, 0xc3, 0x03,
-	0xa7, 0x85, 0x56, 0x10, 0x0a, 0x25, 0xe8, 0x4c, 0x2c, 0xb3, 0xb4, 0xcc, 0x8a, 0x65, 0x56, 0x22,
-	0x2b, 0xdf, 0x4e, 0xf6, 0xe4, 0x81, 0xc3, 0xb8, 0xef, 0x0b, 0xa5, 0x77, 0x90, 0xb1, 0xb4, 0x3c,
-	0x7b, 0xc6, 0x8a, 0xc9, 0xf2, 0x6a, 0xd1, 0xf2, 0x96, 0xf0, 0xbc, 0xde, 0xca, 0x84, 0x89, 0xe9,
-	0xd1, 0x6e, 0x67, 0x8f, 0xa1, 0x17, 0xa8, 0x77, 0xc9, 0xcb, 0xca, 0xe9, 0x97, 0x7b, 0x0e, 0xba,
-	0xed, 0xa6, 0xc7, 0xe5, 0x7e, 0xbc, 0xc2, 0xfc, 0x00, 0xc6, 0x72, 0x88, 0x5c, 0xe1, 0xe2, 0x31,
-	0x43, 0x03, 0xdf, 0x74, 0x50, 0x2a, 0x3a, 0x05, 0x63, 0x01, 0x0f, 0xd1, 0x57, 0x06, 0xa9, 0x90,
-	0xea, 0x44, 0x23, 0x19, 0xd1, 0x35, 0x28, 0xa5, 0x88, 0x8d, 0x91, 0x0a, 0xa9, 0x96, 0xea, 0x55,
-	0xab, 0xc0, 0x1c, 0x2b, 0xbd, 0x7b, 0x5a, 0x6c, 0xde, 0x87, 0x5b, 0x2f, 0x50, 0xe5, 0x14, 0xa7,
-	0x70, 0xc9, 0xe7, 0x1e, 0x26, 0xa5, 0xf5, 0xb3, 0xf9, 0x95, 0x80, 0xb1, 0x13, 0xb4, 0xf3, 0x69,
-	0x4f, 0x51, 0x91, 0x0b, 0x50, 0xd1, 0x05, 0x28, 0x75, 0x74, 0x1d, 0x6d, 0x55, 0x72, 0xc2, 0x72,
-	0x77, 0xaf, 0xae, 0x9b, 0xd6, 0x4a, 0xe4, 0xe6, 0x06, 0x97, 0xfb, 0x0d, 0x88, 0x97, 0x47, 0xcf,
-	0xa6, 0x05, 0xc6, 0x33, 0x74, 0x31, 0x17, 0x32, 0xef, 0x54, 0x1e, 0x4c, 0xaf, 0x3b, 0x32, 0xed,
-	0x81, 0x1c, 0x74, 0x03, 0x77, 0x00, 0x02, 0x6e, 0x63, 0x53, 0x89, 0x7d, 0x8c, 0x2f, 0x60, 0xa2,
-	0x31, 0x11, 0xcd, 0x6c, 0x47, 0x13, 0x74, 0x06, 0xf4, 0xa0, 0x29, 0x9d, 0x43, 0x34, 0x46, 0x2b,
-	0xa4, 0x7a, 0xb9, 0x31, 0x1e, 0x4d, 0x6c, 0x39, 0x87, 0x68, 0xfe, 0x25, 0x60, 0x64, 0xeb, 0xc9,
-	0x40, 0xf8, 0x12, 0xe9, 0x3a, 0x5c, 0x4d, 0xf9, 0x20, 0x0d, 0x52, 0x19, 0x1d, 0xca, 0xc5, 0x13,
-	0x6a, 0x7a, 0x0f, 0x6e, 0xf8, 0xf8, 0x56, 0x35, 0x33, 0xac, 0xd7, 0xa2, 0xe9, 0xcd, 0x1e, 0xef,
-	0x2a, 0x8c, 0x7b, 0xa8, 0x78, 0x9b, 0x2b, 0xae, 0x71, 0x4b, 0xf5, 0xd9, 0xc2, 0x8a, 0x5d, 0xdc,
-	0x8d, 0x44, 0xd4, 0xe8, 0xc9, 0xeb, 0x7f, 0xae, 0x00, 0x4d, 0x01, 0x6d, 0xc5, 0xf9, 0xa5, 0x3f,
-	0x08, 0x4c, 0x66, 0xbe, 0x73, 0x3a, 0x5f, 0x58, 0xa5, 0x5f, 0x2e, 0xca, 0x67, 0xb6, 0xc3, 0x5c,
-	0xfd, 0xf8, 0xfb, 0xdf, 0xe7, 0x91, 0x65, 0xf3, 0x49, 0x2f, 0xbb, 0xef, 0xe3, 0x1b, 0x7c, 0x1c,
-	0x84, 0xe2, 0x35, 0xb6, 0x94, 0x64, 0x35, 0xa6, 0xd0, 0xe7, 0xbe, 0x7e, 0x0a, 0x42, 0xb1, 0xe7,
-	0xb8, 0x28, 0x59, 0xed, 0x28, 0xdd, 0x13, 0xe4, 0x23, 0x52, 0xa3, 0xdf, 0x09, 0x5c, 0x3f, 0x99,
-	0x14, 0x5a, 0x2f, 0xe4, 0xc8, 0x8d, 0xd5, 0x10, 0xec, 0x2b, 0x9a, 0xfd, 0x29, 0x4d, 0xb1, 0x47,
-	0x9f, 0xeb, 0x20, 0xf2, 0x13, 0xe0, 0xac, 0x76, 0x44, 0x7f, 0x11, 0x98, 0xcc, 0x84, 0x76, 0x80,
-	0xf5, 0xfd, 0x42, 0x3e, 0x04, 0xfe, 0x8e, 0xc6, 0x7f, 0x59, 0x5f, 0x3b, 0xc6, 0x4f, 0xb7, 0xd9,
-	0xf3, 0x1c, 0x25, 0xba, 0x86, 0x6f, 0x04, 0x26, 0x33, 0xe9, 0x1e, 0x70, 0x9a, 0x7e, 0xdd, 0xa0,
-	0x3c, 0x95, 0xe9, 0x28, 0xcf, 0xa3, 0xe6, 0xdd, 0xb5, 0xbe, 0x76, 0x51, 0xeb, 0x7f, 0x12, 0xb8,
-	0x79, 0x3a, 0xea, 0x74, 0xae, 0x90, 0xb5, 0x4f, 0x27, 0x2a, 0xcf, 0x0f, 0xa9, 0x8a, 0x03, 0x9a,
-	0xf7, 0x11, 0x9d, 0x27, 0x00, 0x4b, 0x9f, 0x08, 0xdc, 0x6d, 0x09, 0xaf, 0x08, 0x62, 0x69, 0x3a,
-	0x9b, 0xfb, 0xcd, 0xc8, 0xd7, 0x4d, 0xf2, 0x6a, 0x31, 0xd1, 0xd9, 0xc2, 0xe5, 0xbe, 0x6d, 0x89,
-	0xd0, 0x66, 0x36, 0xfa, 0xda, 0x75, 0x16, 0xbf, 0xe2, 0x81, 0x23, 0x73, 0xff, 0xb6, 0x0b, 0xf1,
-	0xf0, 0xcb, 0xc8, 0xe8, 0xf2, 0xf6, 0xd6, 0xee, 0x98, 0xd6, 0x3c, 0xfc, 0x1f, 0x00, 0x00, 0xff,
-	0xff, 0x39, 0x45, 0xae, 0x62, 0x41, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/talent/v4beta1/batch.pb.go b/googleapis/cloud/talent/v4beta1/batch.pb.go
index cf173cdecc..5c354a59cd 100644
--- a/googleapis/cloud/talent/v4beta1/batch.pb.go
+++ b/googleapis/cloud/talent/v4beta1/batch.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/batch.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+package talent
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,13 +22,13 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/batch.proto", fileDescriptor_batch_7dbe1703aba922fd)
+	proto.RegisterFile("google/cloud/talent/v4beta1/batch.proto", fileDescriptor_b52f05e5c2b02efe)
 }
 
-var fileDescriptor_batch_7dbe1703aba922fd = []byte{
+var fileDescriptor_b52f05e5c2b02efe = []byte{
 	// 200 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xcf, 0xb1, 0x6a, 0xc3, 0x30,
 	0x10, 0x06, 0x60, 0xda, 0x42, 0x07, 0x8f, 0x5d, 0x0a, 0x6e, 0xc1, 0x53, 0xe9, 0xa6, 0xa3, 0xb4,
diff --git a/googleapis/cloud/talent/v4beta1/common.pb.go b/googleapis/cloud/talent/v4beta1/common.pb.go
index 3cb790c215..4602870b4a 100644
--- a/googleapis/cloud/talent/v4beta1/common.pb.go
+++ b/googleapis/cloud/talent/v4beta1/common.pb.go
@@ -1,19 +1,22 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/common.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import date "google.golang.org/genproto/googleapis/type/date"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
-import money "google.golang.org/genproto/googleapis/type/money"
-import postaladdress "google.golang.org/genproto/googleapis/type/postaladdress"
-import _ "google.golang.org/genproto/googleapis/type/timeofday"
+package talent
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	date "google.golang.org/genproto/googleapis/type/date"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	money "google.golang.org/genproto/googleapis/type/money"
+	postaladdress "google.golang.org/genproto/googleapis/type/postaladdress"
+	_ "google.golang.org/genproto/googleapis/type/timeofday"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -24,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An enum that represents the size of the company.
 type CompanySize int32
@@ -58,6 +61,7 @@ var CompanySize_name = map[int32]string{
 	6: "BIGGER",
 	7: "GIANT",
 }
+
 var CompanySize_value = map[string]int32{
 	"COMPANY_SIZE_UNSPECIFIED": 0,
 	"MINI":                     1,
@@ -72,8 +76,9 @@ var CompanySize_value = map[string]int32{
 func (x CompanySize) String() string {
 	return proto.EnumName(CompanySize_name, int32(x))
 }
+
 func (CompanySize) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{0}
+	return fileDescriptor_2884fcfab48f4cdd, []int{0}
 }
 
 // An enum that represents employee benefits included with the job.
@@ -126,6 +131,7 @@ var JobBenefit_name = map[int32]string{
 	10: "VACATION",
 	11: "VISION",
 }
+
 var JobBenefit_value = map[string]int32{
 	"JOB_BENEFIT_UNSPECIFIED": 0,
 	"CHILD_CARE":              1,
@@ -144,8 +150,9 @@ var JobBenefit_value = map[string]int32{
 func (x JobBenefit) String() string {
 	return proto.EnumName(JobBenefit_name, int32(x))
 }
+
 func (JobBenefit) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{1}
+	return fileDescriptor_2884fcfab48f4cdd, []int{1}
 }
 
 // Educational degree level defined in International Standard Classification
@@ -208,6 +215,7 @@ var DegreeType_name = map[int32]string{
 	7: "MASTERS_OR_EQUIVALENT",
 	8: "DOCTORAL_OR_EQUIVALENT",
 }
+
 var DegreeType_value = map[string]int32{
 	"DEGREE_TYPE_UNSPECIFIED":   0,
 	"PRIMARY_EDUCATION":         1,
@@ -223,8 +231,9 @@ var DegreeType_value = map[string]int32{
 func (x DegreeType) String() string {
 	return proto.EnumName(DegreeType_name, int32(x))
 }
+
 func (DegreeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{2}
+	return fileDescriptor_2884fcfab48f4cdd, []int{2}
 }
 
 // An enum that represents the employment type of a job.
@@ -281,6 +290,7 @@ var EmploymentType_name = map[int32]string{
 	9:  "FLY_IN_FLY_OUT",
 	10: "OTHER_EMPLOYMENT_TYPE",
 }
+
 var EmploymentType_value = map[string]int32{
 	"EMPLOYMENT_TYPE_UNSPECIFIED": 0,
 	"FULL_TIME":                   1,
@@ -298,8 +308,9 @@ var EmploymentType_value = map[string]int32{
 func (x EmploymentType) String() string {
 	return proto.EnumName(EmploymentType_name, int32(x))
 }
+
 func (EmploymentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{3}
+	return fileDescriptor_2884fcfab48f4cdd, []int{3}
 }
 
 // An enum that represents the required experience level required for the job.
@@ -330,6 +341,7 @@ var JobLevel_name = map[int32]string{
 	4: "DIRECTOR",
 	5: "EXECUTIVE",
 }
+
 var JobLevel_value = map[string]int32{
 	"JOB_LEVEL_UNSPECIFIED": 0,
 	"ENTRY_LEVEL":           1,
@@ -342,8 +354,9 @@ var JobLevel_value = map[string]int32{
 func (x JobLevel) String() string {
 	return proto.EnumName(JobLevel_name, int32(x))
 }
+
 func (JobLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{4}
+	return fileDescriptor_2884fcfab48f4cdd, []int{4}
 }
 
 // An enum that represents the categorization or primary focus of specific
@@ -450,6 +463,7 @@ var JobCategory_name = map[int32]string{
 	29: "SPORTS_FITNESS_AND_RECREATION",
 	30: "TRANSPORTATION_AND_LOGISTICS",
 }
+
 var JobCategory_value = map[string]int32{
 	"JOB_CATEGORY_UNSPECIFIED":            0,
 	"ACCOUNTING_AND_FINANCE":              1,
@@ -487,8 +501,9 @@ var JobCategory_value = map[string]int32{
 func (x JobCategory) String() string {
 	return proto.EnumName(JobCategory_name, int32(x))
 }
+
 func (JobCategory) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{5}
+	return fileDescriptor_2884fcfab48f4cdd, []int{5}
 }
 
 // An enum that represents the job posting region. In most cases, job postings
@@ -527,6 +542,7 @@ var PostingRegion_name = map[int32]string{
 	2: "NATION",
 	3: "TELECOMMUTE",
 }
+
 var PostingRegion_value = map[string]int32{
 	"POSTING_REGION_UNSPECIFIED": 0,
 	"ADMINISTRATIVE_AREA":        1,
@@ -537,8 +553,9 @@ var PostingRegion_value = map[string]int32{
 func (x PostingRegion) String() string {
 	return proto.EnumName(PostingRegion_name, int32(x))
 }
+
 func (PostingRegion) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{6}
+	return fileDescriptor_2884fcfab48f4cdd, []int{6}
 }
 
 // An enum that represents who has view access to the resource.
@@ -563,6 +580,7 @@ var Visibility_name = map[int32]string{
 	2: "SHARED_WITH_GOOGLE",
 	3: "SHARED_WITH_PUBLIC",
 }
+
 var Visibility_value = map[string]int32{
 	"VISIBILITY_UNSPECIFIED": 0,
 	"ACCOUNT_ONLY":           1,
@@ -573,8 +591,9 @@ var Visibility_value = map[string]int32{
 func (x Visibility) String() string {
 	return proto.EnumName(Visibility_name, int32(x))
 }
+
 func (Visibility) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{7}
+	return fileDescriptor_2884fcfab48f4cdd, []int{7}
 }
 
 // Enum that represents the usage of the contact information.
@@ -597,6 +616,7 @@ var ContactInfoUsage_name = map[int32]string{
 	2: "WORK",
 	3: "SCHOOL",
 }
+
 var ContactInfoUsage_value = map[string]int32{
 	"CONTACT_INFO_USAGE_UNSPECIFIED": 0,
 	"PERSONAL":                       1,
@@ -607,8 +627,9 @@ var ContactInfoUsage_value = map[string]int32{
 func (x ContactInfoUsage) String() string {
 	return proto.EnumName(ContactInfoUsage_name, int32(x))
 }
+
 func (ContactInfoUsage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{8}
+	return fileDescriptor_2884fcfab48f4cdd, []int{8}
 }
 
 // Input only.
@@ -633,6 +654,7 @@ var HtmlSanitization_name = map[int32]string{
 	1: "HTML_SANITIZATION_DISABLED",
 	2: "SIMPLE_FORMATTING_ONLY",
 }
+
 var HtmlSanitization_value = map[string]int32{
 	"HTML_SANITIZATION_UNSPECIFIED": 0,
 	"HTML_SANITIZATION_DISABLED":    1,
@@ -642,8 +664,9 @@ var HtmlSanitization_value = map[string]int32{
 func (x HtmlSanitization) String() string {
 	return proto.EnumName(HtmlSanitization_name, int32(x))
 }
+
 func (HtmlSanitization) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{9}
+	return fileDescriptor_2884fcfab48f4cdd, []int{9}
 }
 
 // Method for commute.
@@ -670,6 +693,7 @@ var CommuteMethod_name = map[int32]string{
 	3: "WALKING",
 	4: "CYCLING",
 }
+
 var CommuteMethod_value = map[string]int32{
 	"COMMUTE_METHOD_UNSPECIFIED": 0,
 	"DRIVING":                    1,
@@ -681,8 +705,9 @@ var CommuteMethod_value = map[string]int32{
 func (x CommuteMethod) String() string {
 	return proto.EnumName(CommuteMethod_name, int32(x))
 }
+
 func (CommuteMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{10}
+	return fileDescriptor_2884fcfab48f4cdd, []int{10}
 }
 
 // Enum that represents the skill proficiency level.
@@ -715,6 +740,7 @@ var SkillProficiencyLevel_name = map[int32]string{
 	4: "ADVANCED",
 	5: "EXPERT",
 }
+
 var SkillProficiencyLevel_value = map[string]int32{
 	"SKILL_PROFICIENCY_LEVEL_UNSPECIFIED": 0,
 	"FUNDAMENTAL_AWARENESS":               1,
@@ -727,8 +753,9 @@ var SkillProficiencyLevel_value = map[string]int32{
 func (x SkillProficiencyLevel) String() string {
 	return proto.EnumName(SkillProficiencyLevel_name, int32(x))
 }
+
 func (SkillProficiencyLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{11}
+	return fileDescriptor_2884fcfab48f4cdd, []int{11}
 }
 
 // The overall outcome /decision / result indicator.
@@ -759,6 +786,7 @@ var Outcome_name = map[int32]string{
 	3: "NEGATIVE",
 	4: "OUTCOME_NOT_AVAILABLE",
 }
+
 var Outcome_value = map[string]int32{
 	"OUTCOME_UNSPECIFIED":   0,
 	"POSITIVE":              1,
@@ -770,8 +798,9 @@ var Outcome_value = map[string]int32{
 func (x Outcome) String() string {
 	return proto.EnumName(Outcome_name, int32(x))
 }
+
 func (Outcome) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{12}
+	return fileDescriptor_2884fcfab48f4cdd, []int{12}
 }
 
 // An enum which represents the type of a location.
@@ -819,6 +848,7 @@ var Location_LocationType_name = map[int32]string{
 	9:  "NEIGHBORHOOD",
 	10: "STREET_ADDRESS",
 }
+
 var Location_LocationType_value = map[string]int32{
 	"LOCATION_TYPE_UNSPECIFIED": 0,
 	"COUNTRY":                   1,
@@ -836,8 +866,9 @@ var Location_LocationType_value = map[string]int32{
 func (x Location_LocationType) String() string {
 	return proto.EnumName(Location_LocationType_name, int32(x))
 }
+
 func (Location_LocationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{1, 0}
+	return fileDescriptor_2884fcfab48f4cdd, []int{1, 0}
 }
 
 // An enumeration describing an API access portal and exposure mechanism.
@@ -872,6 +903,7 @@ var DeviceInfo_DeviceType_name = map[int32]string{
 	5: "BOT",
 	6: "OTHER",
 }
+
 var DeviceInfo_DeviceType_value = map[string]int32{
 	"DEVICE_TYPE_UNSPECIFIED": 0,
 	"WEB":                     1,
@@ -885,8 +917,9 @@ var DeviceInfo_DeviceType_value = map[string]int32{
 func (x DeviceInfo_DeviceType) String() string {
 	return proto.EnumName(DeviceInfo_DeviceType_name, int32(x))
 }
+
 func (DeviceInfo_DeviceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{4, 0}
+	return fileDescriptor_2884fcfab48f4cdd, []int{4, 0}
 }
 
 // The type of compensation.
@@ -942,6 +975,7 @@ var CompensationInfo_CompensationType_name = map[int32]string{
 	7: "TIPS",
 	8: "OTHER_COMPENSATION_TYPE",
 }
+
 var CompensationInfo_CompensationType_value = map[string]int32{
 	"COMPENSATION_TYPE_UNSPECIFIED": 0,
 	"BASE":                          1,
@@ -957,8 +991,9 @@ var CompensationInfo_CompensationType_value = map[string]int32{
 func (x CompensationInfo_CompensationType) String() string {
 	return proto.EnumName(CompensationInfo_CompensationType_name, int32(x))
 }
+
 func (CompensationInfo_CompensationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{7, 0}
+	return fileDescriptor_2884fcfab48f4cdd, []int{7, 0}
 }
 
 // Pay frequency.
@@ -993,6 +1028,7 @@ var CompensationInfo_CompensationUnit_name = map[int32]string{
 	6: "ONE_TIME",
 	7: "OTHER_COMPENSATION_UNIT",
 }
+
 var CompensationInfo_CompensationUnit_value = map[string]int32{
 	"COMPENSATION_UNIT_UNSPECIFIED": 0,
 	"HOURLY":                        1,
@@ -1007,8 +1043,9 @@ var CompensationInfo_CompensationUnit_value = map[string]int32{
 func (x CompensationInfo_CompensationUnit) String() string {
 	return proto.EnumName(CompensationInfo_CompensationUnit_name, int32(x))
 }
+
 func (CompensationInfo_CompensationUnit) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{7, 1}
+	return fileDescriptor_2884fcfab48f4cdd, []int{7, 1}
 }
 
 // Message representing a period of time between two timestamps.
@@ -1026,16 +1063,17 @@ func (m *TimestampRange) Reset()         { *m = TimestampRange{} }
 func (m *TimestampRange) String() string { return proto.CompactTextString(m) }
 func (*TimestampRange) ProtoMessage()    {}
 func (*TimestampRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{0}
+	return fileDescriptor_2884fcfab48f4cdd, []int{0}
 }
+
 func (m *TimestampRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampRange.Unmarshal(m, b)
 }
 func (m *TimestampRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimestampRange.Marshal(b, m, deterministic)
 }
-func (dst *TimestampRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimestampRange.Merge(dst, src)
+func (m *TimestampRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampRange.Merge(m, src)
 }
 func (m *TimestampRange) XXX_Size() int {
 	return xxx_messageInfo_TimestampRange.Size(m)
@@ -1090,16 +1128,17 @@ func (m *Location) Reset()         { *m = Location{} }
 func (m *Location) String() string { return proto.CompactTextString(m) }
 func (*Location) ProtoMessage()    {}
 func (*Location) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{1}
+	return fileDescriptor_2884fcfab48f4cdd, []int{1}
 }
+
 func (m *Location) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Location.Unmarshal(m, b)
 }
 func (m *Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Location.Marshal(b, m, deterministic)
 }
-func (dst *Location) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Location.Merge(dst, src)
+func (m *Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Location.Merge(m, src)
 }
 func (m *Location) XXX_Size() int {
 	return xxx_messageInfo_Location.Size(m)
@@ -1207,16 +1246,17 @@ func (m *RequestMetadata) Reset()         { *m = RequestMetadata{} }
 func (m *RequestMetadata) String() string { return proto.CompactTextString(m) }
 func (*RequestMetadata) ProtoMessage()    {}
 func (*RequestMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{2}
+	return fileDescriptor_2884fcfab48f4cdd, []int{2}
 }
+
 func (m *RequestMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestMetadata.Unmarshal(m, b)
 }
 func (m *RequestMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestMetadata.Marshal(b, m, deterministic)
 }
-func (dst *RequestMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestMetadata.Merge(dst, src)
+func (m *RequestMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestMetadata.Merge(m, src)
 }
 func (m *RequestMetadata) XXX_Size() int {
 	return xxx_messageInfo_RequestMetadata.Size(m)
@@ -1277,16 +1317,17 @@ func (m *ResponseMetadata) Reset()         { *m = ResponseMetadata{} }
 func (m *ResponseMetadata) String() string { return proto.CompactTextString(m) }
 func (*ResponseMetadata) ProtoMessage()    {}
 func (*ResponseMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{3}
+	return fileDescriptor_2884fcfab48f4cdd, []int{3}
 }
+
 func (m *ResponseMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResponseMetadata.Unmarshal(m, b)
 }
 func (m *ResponseMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResponseMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ResponseMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResponseMetadata.Merge(dst, src)
+func (m *ResponseMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResponseMetadata.Merge(m, src)
 }
 func (m *ResponseMetadata) XXX_Size() int {
 	return xxx_messageInfo_ResponseMetadata.Size(m)
@@ -1326,16 +1367,17 @@ func (m *DeviceInfo) Reset()         { *m = DeviceInfo{} }
 func (m *DeviceInfo) String() string { return proto.CompactTextString(m) }
 func (*DeviceInfo) ProtoMessage()    {}
 func (*DeviceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{4}
+	return fileDescriptor_2884fcfab48f4cdd, []int{4}
 }
+
 func (m *DeviceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceInfo.Unmarshal(m, b)
 }
 func (m *DeviceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceInfo.Marshal(b, m, deterministic)
 }
-func (dst *DeviceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceInfo.Merge(dst, src)
+func (m *DeviceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceInfo.Merge(m, src)
 }
 func (m *DeviceInfo) XXX_Size() int {
 	return xxx_messageInfo_DeviceInfo.Size(m)
@@ -1398,16 +1440,17 @@ func (m *CustomAttribute) Reset()         { *m = CustomAttribute{} }
 func (m *CustomAttribute) String() string { return proto.CompactTextString(m) }
 func (*CustomAttribute) ProtoMessage()    {}
 func (*CustomAttribute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{5}
+	return fileDescriptor_2884fcfab48f4cdd, []int{5}
 }
+
 func (m *CustomAttribute) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomAttribute.Unmarshal(m, b)
 }
 func (m *CustomAttribute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomAttribute.Marshal(b, m, deterministic)
 }
-func (dst *CustomAttribute) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomAttribute.Merge(dst, src)
+func (m *CustomAttribute) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomAttribute.Merge(m, src)
 }
 func (m *CustomAttribute) XXX_Size() int {
 	return xxx_messageInfo_CustomAttribute.Size(m)
@@ -1462,16 +1505,17 @@ func (m *SpellingCorrection) Reset()         { *m = SpellingCorrection{} }
 func (m *SpellingCorrection) String() string { return proto.CompactTextString(m) }
 func (*SpellingCorrection) ProtoMessage()    {}
 func (*SpellingCorrection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{6}
+	return fileDescriptor_2884fcfab48f4cdd, []int{6}
 }
+
 func (m *SpellingCorrection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpellingCorrection.Unmarshal(m, b)
 }
 func (m *SpellingCorrection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpellingCorrection.Marshal(b, m, deterministic)
 }
-func (dst *SpellingCorrection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpellingCorrection.Merge(dst, src)
+func (m *SpellingCorrection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpellingCorrection.Merge(m, src)
 }
 func (m *SpellingCorrection) XXX_Size() int {
 	return xxx_messageInfo_SpellingCorrection.Size(m)
@@ -1534,16 +1578,17 @@ func (m *CompensationInfo) Reset()         { *m = CompensationInfo{} }
 func (m *CompensationInfo) String() string { return proto.CompactTextString(m) }
 func (*CompensationInfo) ProtoMessage()    {}
 func (*CompensationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{7}
+	return fileDescriptor_2884fcfab48f4cdd, []int{7}
 }
+
 func (m *CompensationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompensationInfo.Unmarshal(m, b)
 }
 func (m *CompensationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompensationInfo.Marshal(b, m, deterministic)
 }
-func (dst *CompensationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompensationInfo.Merge(dst, src)
+func (m *CompensationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompensationInfo.Merge(m, src)
 }
 func (m *CompensationInfo) XXX_Size() int {
 	return xxx_messageInfo_CompensationInfo.Size(m)
@@ -1630,16 +1675,17 @@ func (m *CompensationInfo_CompensationEntry) Reset()         { *m = Compensation
 func (m *CompensationInfo_CompensationEntry) String() string { return proto.CompactTextString(m) }
 func (*CompensationInfo_CompensationEntry) ProtoMessage()    {}
 func (*CompensationInfo_CompensationEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{7, 0}
+	return fileDescriptor_2884fcfab48f4cdd, []int{7, 0}
 }
+
 func (m *CompensationInfo_CompensationEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompensationInfo_CompensationEntry.Unmarshal(m, b)
 }
 func (m *CompensationInfo_CompensationEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompensationInfo_CompensationEntry.Marshal(b, m, deterministic)
 }
-func (dst *CompensationInfo_CompensationEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompensationInfo_CompensationEntry.Merge(dst, src)
+func (m *CompensationInfo_CompensationEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompensationInfo_CompensationEntry.Merge(m, src)
 }
 func (m *CompensationInfo_CompensationEntry) XXX_Size() int {
 	return xxx_messageInfo_CompensationInfo_CompensationEntry.Size(m)
@@ -1717,80 +1763,14 @@ func (m *CompensationInfo_CompensationEntry) GetExpectedUnitsPerYear() *wrappers
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CompensationInfo_CompensationEntry) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CompensationInfo_CompensationEntry_OneofMarshaler, _CompensationInfo_CompensationEntry_OneofUnmarshaler, _CompensationInfo_CompensationEntry_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CompensationInfo_CompensationEntry) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CompensationInfo_CompensationEntry_Amount)(nil),
 		(*CompensationInfo_CompensationEntry_Range)(nil),
 	}
 }
 
-func _CompensationInfo_CompensationEntry_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CompensationInfo_CompensationEntry)
-	// compensation_amount
-	switch x := m.CompensationAmount.(type) {
-	case *CompensationInfo_CompensationEntry_Amount:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Amount); err != nil {
-			return err
-		}
-	case *CompensationInfo_CompensationEntry_Range:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Range); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CompensationInfo_CompensationEntry.CompensationAmount has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CompensationInfo_CompensationEntry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CompensationInfo_CompensationEntry)
-	switch tag {
-	case 3: // compensation_amount.amount
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(money.Money)
-		err := b.DecodeMessage(msg)
-		m.CompensationAmount = &CompensationInfo_CompensationEntry_Amount{msg}
-		return true, err
-	case 4: // compensation_amount.range
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CompensationInfo_CompensationRange)
-		err := b.DecodeMessage(msg)
-		m.CompensationAmount = &CompensationInfo_CompensationEntry_Range{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CompensationInfo_CompensationEntry_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CompensationInfo_CompensationEntry)
-	// compensation_amount
-	switch x := m.CompensationAmount.(type) {
-	case *CompensationInfo_CompensationEntry_Amount:
-		s := proto.Size(x.Amount)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CompensationInfo_CompensationEntry_Range:
-		s := proto.Size(x.Range)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Compensation range.
 type CompensationInfo_CompensationRange struct {
 	// Optional.
@@ -1815,16 +1795,17 @@ func (m *CompensationInfo_CompensationRange) Reset()         { *m = Compensation
 func (m *CompensationInfo_CompensationRange) String() string { return proto.CompactTextString(m) }
 func (*CompensationInfo_CompensationRange) ProtoMessage()    {}
 func (*CompensationInfo_CompensationRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{7, 1}
+	return fileDescriptor_2884fcfab48f4cdd, []int{7, 1}
 }
+
 func (m *CompensationInfo_CompensationRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompensationInfo_CompensationRange.Unmarshal(m, b)
 }
 func (m *CompensationInfo_CompensationRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompensationInfo_CompensationRange.Marshal(b, m, deterministic)
 }
-func (dst *CompensationInfo_CompensationRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompensationInfo_CompensationRange.Merge(dst, src)
+func (m *CompensationInfo_CompensationRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompensationInfo_CompensationRange.Merge(m, src)
 }
 func (m *CompensationInfo_CompensationRange) XXX_Size() int {
 	return xxx_messageInfo_CompensationInfo_CompensationRange.Size(m)
@@ -1886,16 +1867,17 @@ func (m *Certification) Reset()         { *m = Certification{} }
 func (m *Certification) String() string { return proto.CompactTextString(m) }
 func (*Certification) ProtoMessage()    {}
 func (*Certification) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{8}
+	return fileDescriptor_2884fcfab48f4cdd, []int{8}
 }
+
 func (m *Certification) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Certification.Unmarshal(m, b)
 }
 func (m *Certification) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Certification.Marshal(b, m, deterministic)
 }
-func (dst *Certification) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Certification.Merge(dst, src)
+func (m *Certification) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Certification.Merge(m, src)
 }
 func (m *Certification) XXX_Size() int {
 	return xxx_messageInfo_Certification.Size(m)
@@ -1979,16 +1961,17 @@ func (m *Skill) Reset()         { *m = Skill{} }
 func (m *Skill) String() string { return proto.CompactTextString(m) }
 func (*Skill) ProtoMessage()    {}
 func (*Skill) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{9}
+	return fileDescriptor_2884fcfab48f4cdd, []int{9}
 }
+
 func (m *Skill) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Skill.Unmarshal(m, b)
 }
 func (m *Skill) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Skill.Marshal(b, m, deterministic)
 }
-func (dst *Skill) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Skill.Merge(dst, src)
+func (m *Skill) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Skill.Merge(m, src)
 }
 func (m *Skill) XXX_Size() int {
 	return xxx_messageInfo_Skill.Size(m)
@@ -2054,16 +2037,17 @@ func (m *Interview) Reset()         { *m = Interview{} }
 func (m *Interview) String() string { return proto.CompactTextString(m) }
 func (*Interview) ProtoMessage()    {}
 func (*Interview) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{10}
+	return fileDescriptor_2884fcfab48f4cdd, []int{10}
 }
+
 func (m *Interview) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Interview.Unmarshal(m, b)
 }
 func (m *Interview) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Interview.Marshal(b, m, deterministic)
 }
-func (dst *Interview) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Interview.Merge(dst, src)
+func (m *Interview) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Interview.Merge(m, src)
 }
 func (m *Interview) XXX_Size() int {
 	return xxx_messageInfo_Interview.Size(m)
@@ -2108,16 +2092,17 @@ func (m *Rating) Reset()         { *m = Rating{} }
 func (m *Rating) String() string { return proto.CompactTextString(m) }
 func (*Rating) ProtoMessage()    {}
 func (*Rating) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_fee8e853138cd909, []int{11}
+	return fileDescriptor_2884fcfab48f4cdd, []int{11}
 }
+
 func (m *Rating) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Rating.Unmarshal(m, b)
 }
 func (m *Rating) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Rating.Marshal(b, m, deterministic)
 }
-func (dst *Rating) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Rating.Merge(dst, src)
+func (m *Rating) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rating.Merge(m, src)
 }
 func (m *Rating) XXX_Size() int {
 	return xxx_messageInfo_Rating.Size(m)
@@ -2157,20 +2142,6 @@ func (m *Rating) GetInterval() float64 {
 }
 
 func init() {
-	proto.RegisterType((*TimestampRange)(nil), "google.cloud.talent.v4beta1.TimestampRange")
-	proto.RegisterType((*Location)(nil), "google.cloud.talent.v4beta1.Location")
-	proto.RegisterType((*RequestMetadata)(nil), "google.cloud.talent.v4beta1.RequestMetadata")
-	proto.RegisterType((*ResponseMetadata)(nil), "google.cloud.talent.v4beta1.ResponseMetadata")
-	proto.RegisterType((*DeviceInfo)(nil), "google.cloud.talent.v4beta1.DeviceInfo")
-	proto.RegisterType((*CustomAttribute)(nil), "google.cloud.talent.v4beta1.CustomAttribute")
-	proto.RegisterType((*SpellingCorrection)(nil), "google.cloud.talent.v4beta1.SpellingCorrection")
-	proto.RegisterType((*CompensationInfo)(nil), "google.cloud.talent.v4beta1.CompensationInfo")
-	proto.RegisterType((*CompensationInfo_CompensationEntry)(nil), "google.cloud.talent.v4beta1.CompensationInfo.CompensationEntry")
-	proto.RegisterType((*CompensationInfo_CompensationRange)(nil), "google.cloud.talent.v4beta1.CompensationInfo.CompensationRange")
-	proto.RegisterType((*Certification)(nil), "google.cloud.talent.v4beta1.Certification")
-	proto.RegisterType((*Skill)(nil), "google.cloud.talent.v4beta1.Skill")
-	proto.RegisterType((*Interview)(nil), "google.cloud.talent.v4beta1.Interview")
-	proto.RegisterType((*Rating)(nil), "google.cloud.talent.v4beta1.Rating")
 	proto.RegisterEnum("google.cloud.talent.v4beta1.CompanySize", CompanySize_name, CompanySize_value)
 	proto.RegisterEnum("google.cloud.talent.v4beta1.JobBenefit", JobBenefit_name, JobBenefit_value)
 	proto.RegisterEnum("google.cloud.talent.v4beta1.DegreeType", DegreeType_name, DegreeType_value)
@@ -2188,13 +2159,27 @@ func init() {
 	proto.RegisterEnum("google.cloud.talent.v4beta1.DeviceInfo_DeviceType", DeviceInfo_DeviceType_name, DeviceInfo_DeviceType_value)
 	proto.RegisterEnum("google.cloud.talent.v4beta1.CompensationInfo_CompensationType", CompensationInfo_CompensationType_name, CompensationInfo_CompensationType_value)
 	proto.RegisterEnum("google.cloud.talent.v4beta1.CompensationInfo_CompensationUnit", CompensationInfo_CompensationUnit_name, CompensationInfo_CompensationUnit_value)
+	proto.RegisterType((*TimestampRange)(nil), "google.cloud.talent.v4beta1.TimestampRange")
+	proto.RegisterType((*Location)(nil), "google.cloud.talent.v4beta1.Location")
+	proto.RegisterType((*RequestMetadata)(nil), "google.cloud.talent.v4beta1.RequestMetadata")
+	proto.RegisterType((*ResponseMetadata)(nil), "google.cloud.talent.v4beta1.ResponseMetadata")
+	proto.RegisterType((*DeviceInfo)(nil), "google.cloud.talent.v4beta1.DeviceInfo")
+	proto.RegisterType((*CustomAttribute)(nil), "google.cloud.talent.v4beta1.CustomAttribute")
+	proto.RegisterType((*SpellingCorrection)(nil), "google.cloud.talent.v4beta1.SpellingCorrection")
+	proto.RegisterType((*CompensationInfo)(nil), "google.cloud.talent.v4beta1.CompensationInfo")
+	proto.RegisterType((*CompensationInfo_CompensationEntry)(nil), "google.cloud.talent.v4beta1.CompensationInfo.CompensationEntry")
+	proto.RegisterType((*CompensationInfo_CompensationRange)(nil), "google.cloud.talent.v4beta1.CompensationInfo.CompensationRange")
+	proto.RegisterType((*Certification)(nil), "google.cloud.talent.v4beta1.Certification")
+	proto.RegisterType((*Skill)(nil), "google.cloud.talent.v4beta1.Skill")
+	proto.RegisterType((*Interview)(nil), "google.cloud.talent.v4beta1.Interview")
+	proto.RegisterType((*Rating)(nil), "google.cloud.talent.v4beta1.Rating")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/common.proto", fileDescriptor_common_fee8e853138cd909)
+	proto.RegisterFile("google/cloud/talent/v4beta1/common.proto", fileDescriptor_2884fcfab48f4cdd)
 }
 
-var fileDescriptor_common_fee8e853138cd909 = []byte{
+var fileDescriptor_2884fcfab48f4cdd = []byte{
 	// 3039 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0xcd, 0x6f, 0x23, 0x47,
 	0x76, 0x37, 0x45, 0x89, 0x14, 0x9f, 0xbe, 0x6a, 0x7a, 0x3c, 0x23, 0x59, 0xf3, 0x25, 0xd3, 0x1b,
diff --git a/googleapis/cloud/talent/v4beta1/company.pb.go b/googleapis/cloud/talent/v4beta1/company.pb.go
index 24f1b0b454..7e7e61a2fd 100644
--- a/googleapis/cloud/talent/v4beta1/company.pb.go
+++ b/googleapis/cloud/talent/v4beta1/company.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/company.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+package talent
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Company resource represents a company in the service. A company is the
 // entity that owns job postings, that is, the hiring entity responsible for
@@ -112,16 +115,17 @@ func (m *Company) Reset()         { *m = Company{} }
 func (m *Company) String() string { return proto.CompactTextString(m) }
 func (*Company) ProtoMessage()    {}
 func (*Company) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_b5be25b03cde4ac9, []int{0}
+	return fileDescriptor_bbff0b9f9d15156a, []int{0}
 }
+
 func (m *Company) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Company.Unmarshal(m, b)
 }
 func (m *Company) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Company.Marshal(b, m, deterministic)
 }
-func (dst *Company) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Company.Merge(dst, src)
+func (m *Company) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Company.Merge(m, src)
 }
 func (m *Company) XXX_Size() int {
 	return xxx_messageInfo_Company.Size(m)
@@ -237,16 +241,17 @@ func (m *Company_DerivedInfo) Reset()         { *m = Company_DerivedInfo{} }
 func (m *Company_DerivedInfo) String() string { return proto.CompactTextString(m) }
 func (*Company_DerivedInfo) ProtoMessage()    {}
 func (*Company_DerivedInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_b5be25b03cde4ac9, []int{0, 0}
+	return fileDescriptor_bbff0b9f9d15156a, []int{0, 0}
 }
+
 func (m *Company_DerivedInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Company_DerivedInfo.Unmarshal(m, b)
 }
 func (m *Company_DerivedInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Company_DerivedInfo.Marshal(b, m, deterministic)
 }
-func (dst *Company_DerivedInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Company_DerivedInfo.Merge(dst, src)
+func (m *Company_DerivedInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Company_DerivedInfo.Merge(m, src)
 }
 func (m *Company_DerivedInfo) XXX_Size() int {
 	return xxx_messageInfo_Company_DerivedInfo.Size(m)
@@ -270,10 +275,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/company.proto", fileDescriptor_company_b5be25b03cde4ac9)
+	proto.RegisterFile("google/cloud/talent/v4beta1/company.proto", fileDescriptor_bbff0b9f9d15156a)
 }
 
-var fileDescriptor_company_b5be25b03cde4ac9 = []byte{
+var fileDescriptor_bbff0b9f9d15156a = []byte{
 	// 526 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x4f, 0x6f, 0xd3, 0x30,
 	0x18, 0xc6, 0x95, 0xb5, 0x5b, 0x5b, 0xa7, 0x05, 0xc9, 0x0c, 0x29, 0x74, 0x93, 0x56, 0xfe, 0x2a,
diff --git a/googleapis/cloud/talent/v4beta1/company_service.pb.go b/googleapis/cloud/talent/v4beta1/company_service.pb.go
index e67cdf3d68..1d75d3c8b3 100644
--- a/googleapis/cloud/talent/v4beta1/company_service.pb.go
+++ b/googleapis/cloud/talent/v4beta1/company_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/company_service.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package talent
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The Request of the CreateCompany method.
 type CreateCompanyRequest struct {
@@ -51,16 +51,17 @@ func (m *CreateCompanyRequest) Reset()         { *m = CreateCompanyRequest{} }
 func (m *CreateCompanyRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateCompanyRequest) ProtoMessage()    {}
 func (*CreateCompanyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_service_29fd10eb96c7a7f1, []int{0}
+	return fileDescriptor_1c499e6cf60b8944, []int{0}
 }
+
 func (m *CreateCompanyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCompanyRequest.Unmarshal(m, b)
 }
 func (m *CreateCompanyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCompanyRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateCompanyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCompanyRequest.Merge(dst, src)
+func (m *CreateCompanyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCompanyRequest.Merge(m, src)
 }
 func (m *CreateCompanyRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateCompanyRequest.Size(m)
@@ -107,16 +108,17 @@ func (m *GetCompanyRequest) Reset()         { *m = GetCompanyRequest{} }
 func (m *GetCompanyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCompanyRequest) ProtoMessage()    {}
 func (*GetCompanyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_service_29fd10eb96c7a7f1, []int{1}
+	return fileDescriptor_1c499e6cf60b8944, []int{1}
 }
+
 func (m *GetCompanyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCompanyRequest.Unmarshal(m, b)
 }
 func (m *GetCompanyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCompanyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCompanyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCompanyRequest.Merge(dst, src)
+func (m *GetCompanyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCompanyRequest.Merge(m, src)
 }
 func (m *GetCompanyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCompanyRequest.Size(m)
@@ -158,16 +160,17 @@ func (m *UpdateCompanyRequest) Reset()         { *m = UpdateCompanyRequest{} }
 func (m *UpdateCompanyRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateCompanyRequest) ProtoMessage()    {}
 func (*UpdateCompanyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_service_29fd10eb96c7a7f1, []int{2}
+	return fileDescriptor_1c499e6cf60b8944, []int{2}
 }
+
 func (m *UpdateCompanyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateCompanyRequest.Unmarshal(m, b)
 }
 func (m *UpdateCompanyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateCompanyRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateCompanyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateCompanyRequest.Merge(dst, src)
+func (m *UpdateCompanyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCompanyRequest.Merge(m, src)
 }
 func (m *UpdateCompanyRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateCompanyRequest.Size(m)
@@ -214,16 +217,17 @@ func (m *DeleteCompanyRequest) Reset()         { *m = DeleteCompanyRequest{} }
 func (m *DeleteCompanyRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteCompanyRequest) ProtoMessage()    {}
 func (*DeleteCompanyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_service_29fd10eb96c7a7f1, []int{3}
+	return fileDescriptor_1c499e6cf60b8944, []int{3}
 }
+
 func (m *DeleteCompanyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteCompanyRequest.Unmarshal(m, b)
 }
 func (m *DeleteCompanyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteCompanyRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteCompanyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteCompanyRequest.Merge(dst, src)
+func (m *DeleteCompanyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteCompanyRequest.Merge(m, src)
 }
 func (m *DeleteCompanyRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteCompanyRequest.Size(m)
@@ -280,16 +284,17 @@ func (m *ListCompaniesRequest) Reset()         { *m = ListCompaniesRequest{} }
 func (m *ListCompaniesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCompaniesRequest) ProtoMessage()    {}
 func (*ListCompaniesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_service_29fd10eb96c7a7f1, []int{4}
+	return fileDescriptor_1c499e6cf60b8944, []int{4}
 }
+
 func (m *ListCompaniesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCompaniesRequest.Unmarshal(m, b)
 }
 func (m *ListCompaniesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCompaniesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCompaniesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCompaniesRequest.Merge(dst, src)
+func (m *ListCompaniesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCompaniesRequest.Merge(m, src)
 }
 func (m *ListCompaniesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCompaniesRequest.Size(m)
@@ -348,16 +353,17 @@ func (m *ListCompaniesResponse) Reset()         { *m = ListCompaniesResponse{} }
 func (m *ListCompaniesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCompaniesResponse) ProtoMessage()    {}
 func (*ListCompaniesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_company_service_29fd10eb96c7a7f1, []int{5}
+	return fileDescriptor_1c499e6cf60b8944, []int{5}
 }
+
 func (m *ListCompaniesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCompaniesResponse.Unmarshal(m, b)
 }
 func (m *ListCompaniesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCompaniesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCompaniesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCompaniesResponse.Merge(dst, src)
+func (m *ListCompaniesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCompaniesResponse.Merge(m, src)
 }
 func (m *ListCompaniesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCompaniesResponse.Size(m)
@@ -398,6 +404,59 @@ func init() {
 	proto.RegisterType((*ListCompaniesResponse)(nil), "google.cloud.talent.v4beta1.ListCompaniesResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/talent/v4beta1/company_service.proto", fileDescriptor_1c499e6cf60b8944)
+}
+
+var fileDescriptor_1c499e6cf60b8944 = []byte{
+	// 720 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x6f, 0xd3, 0x4a,
+	0x10, 0xd7, 0xb6, 0x7d, 0x7d, 0xc9, 0x56, 0x79, 0x55, 0xf7, 0xe5, 0x55, 0x51, 0xfa, 0x10, 0x91,
+	0x85, 0x4a, 0x08, 0xc2, 0xa6, 0x29, 0x07, 0x44, 0x05, 0x12, 0x2d, 0x7f, 0x04, 0xa2, 0xa2, 0x72,
+	0xcb, 0xa5, 0x42, 0xb2, 0xd6, 0xc9, 0xd4, 0xb8, 0x8d, 0x77, 0x5d, 0xef, 0xa6, 0x2a, 0x45, 0x3d,
+	0xc0, 0x57, 0xa8, 0xc4, 0x07, 0xe0, 0x1b, 0xf0, 0x05, 0x38, 0x72, 0xe4, 0x00, 0x37, 0x8e, 0x88,
+	0x0f, 0x82, 0x6c, 0xaf, 0x93, 0x3a, 0x31, 0x8e, 0xe9, 0xcd, 0x3b, 0x3b, 0xbf, 0x99, 0xdf, 0x6f,
+	0x66, 0x67, 0x8c, 0x57, 0x1c, 0xce, 0x9d, 0x1e, 0x18, 0x9d, 0x1e, 0xef, 0x77, 0x0d, 0x49, 0x7b,
+	0xc0, 0xa4, 0x71, 0x74, 0xcb, 0x06, 0x49, 0x57, 0x8c, 0x0e, 0xf7, 0x7c, 0xca, 0x5e, 0x5b, 0x02,
+	0x82, 0x23, 0xb7, 0x03, 0xba, 0x1f, 0x70, 0xc9, 0xc9, 0x52, 0x0c, 0xd1, 0x23, 0x88, 0x1e, 0x43,
+	0x74, 0x05, 0xa9, 0xff, 0xaf, 0xe2, 0x51, 0xdf, 0x35, 0x28, 0x63, 0x5c, 0x52, 0xe9, 0x72, 0x26,
+	0x62, 0x68, 0xbd, 0x39, 0x21, 0x9b, 0xc7, 0x99, 0xf2, 0xbc, 0x56, 0x80, 0x97, 0x72, 0x55, 0x7c,
+	0x8c, 0xe8, 0x64, 0xf7, 0xf7, 0x0c, 0xf0, 0x7c, 0x99, 0x5c, 0x36, 0x46, 0x2f, 0xf7, 0x5c, 0xe8,
+	0x75, 0x2d, 0x8f, 0x8a, 0x83, 0xd8, 0x43, 0x63, 0xb8, 0xba, 0x11, 0x00, 0x95, 0xb0, 0x11, 0x47,
+	0x35, 0xe1, 0xb0, 0x0f, 0x42, 0x92, 0x45, 0x3c, 0xeb, 0xd3, 0x00, 0x98, 0xac, 0xa1, 0x06, 0x6a,
+	0x96, 0x4d, 0x75, 0x22, 0xf7, 0xf0, 0xdf, 0x2a, 0x7f, 0x6d, 0xaa, 0x81, 0x9a, 0x73, 0xed, 0x2b,
+	0x7a, 0x4e, 0x41, 0xf4, 0x24, 0x6a, 0x02, 0xd2, 0xae, 0xe2, 0x85, 0xc7, 0x20, 0x47, 0x92, 0x11,
+	0x3c, 0xc3, 0xa8, 0x07, 0x2a, 0x55, 0xf4, 0xad, 0x9d, 0x21, 0x5c, 0x7d, 0xe1, 0x77, 0xc7, 0x99,
+	0x9d, 0x63, 0x80, 0x2e, 0xc0, 0x80, 0xac, 0xe1, 0xb9, 0x7e, 0x14, 0x37, 0x2a, 0x83, 0x52, 0x51,
+	0x4f, 0x62, 0x24, 0x95, 0xd2, 0x1f, 0x85, 0x95, 0xda, 0xa4, 0xe2, 0xc0, 0xc4, 0xb1, 0x7b, 0xf8,
+	0xad, 0xb5, 0x70, 0xf5, 0x01, 0xf4, 0x60, 0x8c, 0x54, 0x96, 0x82, 0xf7, 0x08, 0x57, 0x9f, 0xb9,
+	0x42, 0x89, 0x75, 0x41, 0x4c, 0xaa, 0xed, 0x25, 0x8c, 0x7d, 0xea, 0x80, 0x25, 0xf9, 0x01, 0xb0,
+	0x88, 0x58, 0xd9, 0x2c, 0x87, 0x96, 0x9d, 0xd0, 0x40, 0x96, 0x70, 0x74, 0xb0, 0x84, 0x7b, 0x02,
+	0xb5, 0xe9, 0x06, 0x6a, 0xfe, 0x65, 0x96, 0x42, 0xc3, 0xb6, 0x7b, 0x02, 0xa4, 0x85, 0x17, 0x02,
+	0x38, 0xec, 0xbb, 0x01, 0x58, 0xdc, 0x07, 0x66, 0xed, 0x73, 0x5b, 0xd4, 0x66, 0x1a, 0xa8, 0x59,
+	0x32, 0xe7, 0xd5, 0xc5, 0x73, 0x1f, 0xd8, 0x53, 0x6e, 0x0b, 0xed, 0x0b, 0xc2, 0xff, 0x8d, 0x10,
+	0x13, 0x3e, 0x67, 0x02, 0xc8, 0x3a, 0x2e, 0x77, 0x12, 0x63, 0x0d, 0x35, 0xa6, 0x0b, 0x57, 0x77,
+	0x08, 0x23, 0xcb, 0x78, 0x9e, 0xc1, 0xb1, 0xb4, 0xc6, 0xa4, 0x54, 0x42, 0xf3, 0xd6, 0x40, 0xce,
+	0x13, 0x5c, 0xf2, 0x40, 0xd2, 0x2e, 0x95, 0x34, 0x52, 0x33, 0xd7, 0xbe, 0x91, 0x9b, 0x2a, 0x21,
+	0xb9, 0xa9, 0x40, 0xe6, 0x00, 0xde, 0xfe, 0x58, 0xc2, 0xff, 0x28, 0x26, 0xdb, 0xf1, 0xb0, 0x92,
+	0xaf, 0x08, 0x57, 0x52, 0x0f, 0x9b, 0xac, 0xe4, 0x0b, 0xc9, 0x18, 0x82, 0x7a, 0x21, 0xed, 0xda,
+	0xab, 0x77, 0xdf, 0x7e, 0x9e, 0x4d, 0xd9, 0xda, 0xcd, 0xc1, 0x84, 0xbe, 0x89, 0x1b, 0x7a, 0xd7,
+	0x0f, 0xf8, 0x3e, 0x74, 0xa4, 0x30, 0x5a, 0x86, 0x04, 0x46, 0x59, 0xf8, 0x75, 0x6a, 0x0c, 0x4a,
+	0x75, 0x07, 0xb5, 0x76, 0xaf, 0x6b, 0xcb, 0x39, 0xb0, 0xb4, 0x33, 0xf9, 0x8c, 0x30, 0x1e, 0x4e,
+	0x0f, 0xd1, 0x73, 0xe9, 0x8d, 0x8d, 0x59, 0x41, 0x39, 0x76, 0x24, 0xe7, 0x25, 0x39, 0x27, 0x27,
+	0x7c, 0xce, 0x99, 0x62, 0x86, 0xf4, 0x8c, 0xd6, 0xe9, 0x6e, 0x93, 0x2c, 0xff, 0x1e, 0x73, 0xde,
+	0x93, 0xfc, 0x40, 0xb8, 0x92, 0x1a, 0xee, 0x09, 0xdd, 0xc9, 0x5a, 0x04, 0x05, 0xe5, 0x1c, 0x47,
+	0x72, 0x82, 0xf6, 0xed, 0x21, 0xb5, 0x64, 0x81, 0x16, 0x93, 0x15, 0x76, 0x69, 0xb5, 0xad, 0x4f,
+	0x86, 0x8f, 0x80, 0xc8, 0x27, 0x84, 0x2b, 0xa9, 0x65, 0x31, 0x41, 0x64, 0xd6, 0x62, 0xa9, 0x2f,
+	0x8e, 0x2d, 0xa6, 0x87, 0xe1, 0x7e, 0x4f, 0xba, 0xd4, 0xba, 0x40, 0x97, 0x5a, 0x45, 0xbb, 0xf4,
+	0x1d, 0xe1, 0x4a, 0x6a, 0x4f, 0x4c, 0x10, 0x90, 0xb5, 0xec, 0xea, 0xed, 0x3f, 0x81, 0xc4, 0x13,
+	0x9e, 0xf5, 0x04, 0x8b, 0x4d, 0x54, 0xfa, 0x09, 0xe6, 0x8d, 0xd3, 0xfa, 0x5b, 0x84, 0x2f, 0x77,
+	0xb8, 0x97, 0xc7, 0x6e, 0xfd, 0xdf, 0xf4, 0x52, 0xd9, 0x0a, 0x5b, 0xb0, 0x85, 0x76, 0xef, 0x2b,
+	0x8c, 0xc3, 0x7b, 0x94, 0x39, 0x3a, 0x0f, 0x1c, 0xc3, 0x01, 0x16, 0x35, 0xc8, 0x88, 0xaf, 0xa8,
+	0xef, 0x8a, 0xcc, 0x9f, 0xf7, 0x5a, 0x7c, 0xfc, 0x30, 0x35, 0xbd, 0xb1, 0xb3, 0x6d, 0xcf, 0x46,
+	0x98, 0xd5, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x8c, 0xa4, 0x83, 0x87, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -613,56 +672,3 @@ var _CompanyService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/talent/v4beta1/company_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/company_service.proto", fileDescriptor_company_service_29fd10eb96c7a7f1)
-}
-
-var fileDescriptor_company_service_29fd10eb96c7a7f1 = []byte{
-	// 720 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x6f, 0xd3, 0x4a,
-	0x10, 0xd7, 0xb6, 0x7d, 0x7d, 0xc9, 0x56, 0x79, 0x55, 0xf7, 0xe5, 0x55, 0x51, 0xfa, 0x10, 0x91,
-	0x85, 0x4a, 0x08, 0xc2, 0xa6, 0x29, 0x07, 0x44, 0x05, 0x12, 0x2d, 0x7f, 0x04, 0xa2, 0xa2, 0x72,
-	0xcb, 0xa5, 0x42, 0xb2, 0xd6, 0xc9, 0xd4, 0xb8, 0x8d, 0x77, 0x5d, 0xef, 0xa6, 0x2a, 0x45, 0x3d,
-	0xc0, 0x57, 0xa8, 0xc4, 0x07, 0xe0, 0x1b, 0xf0, 0x05, 0x38, 0x72, 0xe4, 0x00, 0x37, 0x8e, 0x88,
-	0x0f, 0x82, 0x6c, 0xaf, 0x93, 0x3a, 0x31, 0x8e, 0xe9, 0xcd, 0x3b, 0x3b, 0xbf, 0x99, 0xdf, 0x6f,
-	0x66, 0x67, 0x8c, 0x57, 0x1c, 0xce, 0x9d, 0x1e, 0x18, 0x9d, 0x1e, 0xef, 0x77, 0x0d, 0x49, 0x7b,
-	0xc0, 0xa4, 0x71, 0x74, 0xcb, 0x06, 0x49, 0x57, 0x8c, 0x0e, 0xf7, 0x7c, 0xca, 0x5e, 0x5b, 0x02,
-	0x82, 0x23, 0xb7, 0x03, 0xba, 0x1f, 0x70, 0xc9, 0xc9, 0x52, 0x0c, 0xd1, 0x23, 0x88, 0x1e, 0x43,
-	0x74, 0x05, 0xa9, 0xff, 0xaf, 0xe2, 0x51, 0xdf, 0x35, 0x28, 0x63, 0x5c, 0x52, 0xe9, 0x72, 0x26,
-	0x62, 0x68, 0xbd, 0x39, 0x21, 0x9b, 0xc7, 0x99, 0xf2, 0xbc, 0x56, 0x80, 0x97, 0x72, 0x55, 0x7c,
-	0x8c, 0xe8, 0x64, 0xf7, 0xf7, 0x0c, 0xf0, 0x7c, 0x99, 0x5c, 0x36, 0x46, 0x2f, 0xf7, 0x5c, 0xe8,
-	0x75, 0x2d, 0x8f, 0x8a, 0x83, 0xd8, 0x43, 0x63, 0xb8, 0xba, 0x11, 0x00, 0x95, 0xb0, 0x11, 0x47,
-	0x35, 0xe1, 0xb0, 0x0f, 0x42, 0x92, 0x45, 0x3c, 0xeb, 0xd3, 0x00, 0x98, 0xac, 0xa1, 0x06, 0x6a,
-	0x96, 0x4d, 0x75, 0x22, 0xf7, 0xf0, 0xdf, 0x2a, 0x7f, 0x6d, 0xaa, 0x81, 0x9a, 0x73, 0xed, 0x2b,
-	0x7a, 0x4e, 0x41, 0xf4, 0x24, 0x6a, 0x02, 0xd2, 0xae, 0xe2, 0x85, 0xc7, 0x20, 0x47, 0x92, 0x11,
-	0x3c, 0xc3, 0xa8, 0x07, 0x2a, 0x55, 0xf4, 0xad, 0x9d, 0x21, 0x5c, 0x7d, 0xe1, 0x77, 0xc7, 0x99,
-	0x9d, 0x63, 0x80, 0x2e, 0xc0, 0x80, 0xac, 0xe1, 0xb9, 0x7e, 0x14, 0x37, 0x2a, 0x83, 0x52, 0x51,
-	0x4f, 0x62, 0x24, 0x95, 0xd2, 0x1f, 0x85, 0x95, 0xda, 0xa4, 0xe2, 0xc0, 0xc4, 0xb1, 0x7b, 0xf8,
-	0xad, 0xb5, 0x70, 0xf5, 0x01, 0xf4, 0x60, 0x8c, 0x54, 0x96, 0x82, 0xf7, 0x08, 0x57, 0x9f, 0xb9,
-	0x42, 0x89, 0x75, 0x41, 0x4c, 0xaa, 0xed, 0x25, 0x8c, 0x7d, 0xea, 0x80, 0x25, 0xf9, 0x01, 0xb0,
-	0x88, 0x58, 0xd9, 0x2c, 0x87, 0x96, 0x9d, 0xd0, 0x40, 0x96, 0x70, 0x74, 0xb0, 0x84, 0x7b, 0x02,
-	0xb5, 0xe9, 0x06, 0x6a, 0xfe, 0x65, 0x96, 0x42, 0xc3, 0xb6, 0x7b, 0x02, 0xa4, 0x85, 0x17, 0x02,
-	0x38, 0xec, 0xbb, 0x01, 0x58, 0xdc, 0x07, 0x66, 0xed, 0x73, 0x5b, 0xd4, 0x66, 0x1a, 0xa8, 0x59,
-	0x32, 0xe7, 0xd5, 0xc5, 0x73, 0x1f, 0xd8, 0x53, 0x6e, 0x0b, 0xed, 0x0b, 0xc2, 0xff, 0x8d, 0x10,
-	0x13, 0x3e, 0x67, 0x02, 0xc8, 0x3a, 0x2e, 0x77, 0x12, 0x63, 0x0d, 0x35, 0xa6, 0x0b, 0x57, 0x77,
-	0x08, 0x23, 0xcb, 0x78, 0x9e, 0xc1, 0xb1, 0xb4, 0xc6, 0xa4, 0x54, 0x42, 0xf3, 0xd6, 0x40, 0xce,
-	0x13, 0x5c, 0xf2, 0x40, 0xd2, 0x2e, 0x95, 0x34, 0x52, 0x33, 0xd7, 0xbe, 0x91, 0x9b, 0x2a, 0x21,
-	0xb9, 0xa9, 0x40, 0xe6, 0x00, 0xde, 0xfe, 0x58, 0xc2, 0xff, 0x28, 0x26, 0xdb, 0xf1, 0xb0, 0x92,
-	0xaf, 0x08, 0x57, 0x52, 0x0f, 0x9b, 0xac, 0xe4, 0x0b, 0xc9, 0x18, 0x82, 0x7a, 0x21, 0xed, 0xda,
-	0xab, 0x77, 0xdf, 0x7e, 0x9e, 0x4d, 0xd9, 0xda, 0xcd, 0xc1, 0x84, 0xbe, 0x89, 0x1b, 0x7a, 0xd7,
-	0x0f, 0xf8, 0x3e, 0x74, 0xa4, 0x30, 0x5a, 0x86, 0x04, 0x46, 0x59, 0xf8, 0x75, 0x6a, 0x0c, 0x4a,
-	0x75, 0x07, 0xb5, 0x76, 0xaf, 0x6b, 0xcb, 0x39, 0xb0, 0xb4, 0x33, 0xf9, 0x8c, 0x30, 0x1e, 0x4e,
-	0x0f, 0xd1, 0x73, 0xe9, 0x8d, 0x8d, 0x59, 0x41, 0x39, 0x76, 0x24, 0xe7, 0x25, 0x39, 0x27, 0x27,
-	0x7c, 0xce, 0x99, 0x62, 0x86, 0xf4, 0x8c, 0xd6, 0xe9, 0x6e, 0x93, 0x2c, 0xff, 0x1e, 0x73, 0xde,
-	0x93, 0xfc, 0x40, 0xb8, 0x92, 0x1a, 0xee, 0x09, 0xdd, 0xc9, 0x5a, 0x04, 0x05, 0xe5, 0x1c, 0x47,
-	0x72, 0x82, 0xf6, 0xed, 0x21, 0xb5, 0x64, 0x81, 0x16, 0x93, 0x15, 0x76, 0x69, 0xb5, 0xad, 0x4f,
-	0x86, 0x8f, 0x80, 0xc8, 0x27, 0x84, 0x2b, 0xa9, 0x65, 0x31, 0x41, 0x64, 0xd6, 0x62, 0xa9, 0x2f,
-	0x8e, 0x2d, 0xa6, 0x87, 0xe1, 0x7e, 0x4f, 0xba, 0xd4, 0xba, 0x40, 0x97, 0x5a, 0x45, 0xbb, 0xf4,
-	0x1d, 0xe1, 0x4a, 0x6a, 0x4f, 0x4c, 0x10, 0x90, 0xb5, 0xec, 0xea, 0xed, 0x3f, 0x81, 0xc4, 0x13,
-	0x9e, 0xf5, 0x04, 0x8b, 0x4d, 0x54, 0xfa, 0x09, 0xe6, 0x8d, 0xd3, 0xfa, 0x5b, 0x84, 0x2f, 0x77,
-	0xb8, 0x97, 0xc7, 0x6e, 0xfd, 0xdf, 0xf4, 0x52, 0xd9, 0x0a, 0x5b, 0xb0, 0x85, 0x76, 0xef, 0x2b,
-	0x8c, 0xc3, 0x7b, 0x94, 0x39, 0x3a, 0x0f, 0x1c, 0xc3, 0x01, 0x16, 0x35, 0xc8, 0x88, 0xaf, 0xa8,
-	0xef, 0x8a, 0xcc, 0x9f, 0xf7, 0x5a, 0x7c, 0xfc, 0x30, 0x35, 0xbd, 0xb1, 0xb3, 0x6d, 0xcf, 0x46,
-	0x98, 0xd5, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x8c, 0xa4, 0x83, 0x87, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/talent/v4beta1/completion_service.pb.go b/googleapis/cloud/talent/v4beta1/completion_service.pb.go
index b2024dfca4..2e2d5b531d 100644
--- a/googleapis/cloud/talent/v4beta1/completion_service.pb.go
+++ b/googleapis/cloud/talent/v4beta1/completion_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/completion_service.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package talent
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum to specify the scope of completion.
 type CompleteQueryRequest_CompletionScope int32
@@ -42,6 +42,7 @@ var CompleteQueryRequest_CompletionScope_name = map[int32]string{
 	1: "TENANT",
 	2: "PUBLIC",
 }
+
 var CompleteQueryRequest_CompletionScope_value = map[string]int32{
 	"COMPLETION_SCOPE_UNSPECIFIED": 0,
 	"TENANT":                       1,
@@ -51,8 +52,9 @@ var CompleteQueryRequest_CompletionScope_value = map[string]int32{
 func (x CompleteQueryRequest_CompletionScope) String() string {
 	return proto.EnumName(CompleteQueryRequest_CompletionScope_name, int32(x))
 }
+
 func (CompleteQueryRequest_CompletionScope) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_completion_service_14ea22e15a1c2a15, []int{0, 0}
+	return fileDescriptor_a6e2d15ed940916e, []int{0, 0}
 }
 
 // Enum to specify auto-completion topics.
@@ -75,6 +77,7 @@ var CompleteQueryRequest_CompletionType_name = map[int32]string{
 	2: "COMPANY_NAME",
 	3: "COMBINED",
 }
+
 var CompleteQueryRequest_CompletionType_value = map[string]int32{
 	"COMPLETION_TYPE_UNSPECIFIED": 0,
 	"JOB_TITLE":                   1,
@@ -85,8 +88,9 @@ var CompleteQueryRequest_CompletionType_value = map[string]int32{
 func (x CompleteQueryRequest_CompletionType) String() string {
 	return proto.EnumName(CompleteQueryRequest_CompletionType_name, int32(x))
 }
+
 func (CompleteQueryRequest_CompletionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_completion_service_14ea22e15a1c2a15, []int{0, 1}
+	return fileDescriptor_a6e2d15ed940916e, []int{0, 1}
 }
 
 // Input only.
@@ -163,16 +167,17 @@ func (m *CompleteQueryRequest) Reset()         { *m = CompleteQueryRequest{} }
 func (m *CompleteQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*CompleteQueryRequest) ProtoMessage()    {}
 func (*CompleteQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_completion_service_14ea22e15a1c2a15, []int{0}
+	return fileDescriptor_a6e2d15ed940916e, []int{0}
 }
+
 func (m *CompleteQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompleteQueryRequest.Unmarshal(m, b)
 }
 func (m *CompleteQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompleteQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *CompleteQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompleteQueryRequest.Merge(dst, src)
+func (m *CompleteQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteQueryRequest.Merge(m, src)
 }
 func (m *CompleteQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_CompleteQueryRequest.Size(m)
@@ -250,16 +255,17 @@ func (m *CompleteQueryResponse) Reset()         { *m = CompleteQueryResponse{} }
 func (m *CompleteQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*CompleteQueryResponse) ProtoMessage()    {}
 func (*CompleteQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_completion_service_14ea22e15a1c2a15, []int{1}
+	return fileDescriptor_a6e2d15ed940916e, []int{1}
 }
+
 func (m *CompleteQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompleteQueryResponse.Unmarshal(m, b)
 }
 func (m *CompleteQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompleteQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *CompleteQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompleteQueryResponse.Merge(dst, src)
+func (m *CompleteQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteQueryResponse.Merge(m, src)
 }
 func (m *CompleteQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_CompleteQueryResponse.Size(m)
@@ -305,16 +311,17 @@ func (m *CompleteQueryResponse_CompletionResult) Reset() {
 func (m *CompleteQueryResponse_CompletionResult) String() string { return proto.CompactTextString(m) }
 func (*CompleteQueryResponse_CompletionResult) ProtoMessage()    {}
 func (*CompleteQueryResponse_CompletionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_completion_service_14ea22e15a1c2a15, []int{1, 0}
+	return fileDescriptor_a6e2d15ed940916e, []int{1, 0}
 }
+
 func (m *CompleteQueryResponse_CompletionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompleteQueryResponse_CompletionResult.Unmarshal(m, b)
 }
 func (m *CompleteQueryResponse_CompletionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompleteQueryResponse_CompletionResult.Marshal(b, m, deterministic)
 }
-func (dst *CompleteQueryResponse_CompletionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompleteQueryResponse_CompletionResult.Merge(dst, src)
+func (m *CompleteQueryResponse_CompletionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteQueryResponse_CompletionResult.Merge(m, src)
 }
 func (m *CompleteQueryResponse_CompletionResult) XXX_Size() int {
 	return xxx_messageInfo_CompleteQueryResponse_CompletionResult.Size(m)
@@ -347,11 +354,60 @@ func (m *CompleteQueryResponse_CompletionResult) GetImageUri() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.talent.v4beta1.CompleteQueryRequest_CompletionScope", CompleteQueryRequest_CompletionScope_name, CompleteQueryRequest_CompletionScope_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.CompleteQueryRequest_CompletionType", CompleteQueryRequest_CompletionType_name, CompleteQueryRequest_CompletionType_value)
 	proto.RegisterType((*CompleteQueryRequest)(nil), "google.cloud.talent.v4beta1.CompleteQueryRequest")
 	proto.RegisterType((*CompleteQueryResponse)(nil), "google.cloud.talent.v4beta1.CompleteQueryResponse")
 	proto.RegisterType((*CompleteQueryResponse_CompletionResult)(nil), "google.cloud.talent.v4beta1.CompleteQueryResponse.CompletionResult")
-	proto.RegisterEnum("google.cloud.talent.v4beta1.CompleteQueryRequest_CompletionScope", CompleteQueryRequest_CompletionScope_name, CompleteQueryRequest_CompletionScope_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.CompleteQueryRequest_CompletionType", CompleteQueryRequest_CompletionType_name, CompleteQueryRequest_CompletionType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/talent/v4beta1/completion_service.proto", fileDescriptor_a6e2d15ed940916e)
+}
+
+var fileDescriptor_a6e2d15ed940916e = []byte{
+	// 652 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x6f, 0x6b, 0xd3, 0x5e,
+	0x14, 0xc7, 0x7f, 0x49, 0xd7, 0xae, 0x3d, 0xfb, 0xf3, 0x8b, 0x97, 0x39, 0x42, 0x37, 0x5c, 0x29,
+	0x0c, 0x8b, 0x60, 0xc2, 0xea, 0x1e, 0x29, 0x82, 0x6d, 0x16, 0x21, 0xba, 0xa6, 0x35, 0xcd, 0x90,
+	0xed, 0x49, 0x77, 0x97, 0x5d, 0x42, 0xa4, 0xcd, 0xcd, 0x72, 0x6f, 0x06, 0x9d, 0x08, 0x22, 0xbe,
+	0x03, 0xdf, 0x81, 0xe0, 0x2b, 0xf2, 0x89, 0x2f, 0x40, 0xf0, 0x5d, 0x88, 0xdc, 0x24, 0xdd, 0xba,
+	0x3a, 0x2a, 0x43, 0x9f, 0xe5, 0x7c, 0x73, 0xbe, 0x9f, 0x73, 0x73, 0x72, 0xee, 0x81, 0x5d, 0x9f,
+	0x52, 0x7f, 0x48, 0x74, 0x6f, 0x48, 0x93, 0x53, 0x9d, 0xe3, 0x21, 0x09, 0xb9, 0x7e, 0xbe, 0x7b,
+	0x42, 0x38, 0xde, 0xd1, 0x3d, 0x3a, 0x8a, 0x86, 0x84, 0x07, 0x34, 0x1c, 0x30, 0x12, 0x9f, 0x07,
+	0x1e, 0xd1, 0xa2, 0x98, 0x72, 0x8a, 0x36, 0x32, 0x97, 0x96, 0xba, 0xb4, 0xcc, 0xa5, 0xe5, 0xae,
+	0xea, 0x66, 0x8e, 0xc4, 0x51, 0xa0, 0xe3, 0x30, 0xa4, 0x1c, 0x0b, 0x02, 0xcb, 0xac, 0xd5, 0xc6,
+	0x1f, 0x0a, 0x8e, 0x68, 0x98, 0x65, 0xd6, 0xdf, 0x2f, 0xc0, 0x9a, 0x91, 0x9d, 0x80, 0xbc, 0x4a,
+	0x48, 0x3c, 0x76, 0xc8, 0x59, 0x42, 0x18, 0x47, 0xeb, 0x50, 0x8a, 0x70, 0x4c, 0x42, 0xae, 0x4a,
+	0x35, 0xa9, 0x51, 0x71, 0xf2, 0x08, 0xad, 0x41, 0xf1, 0x4c, 0xe4, 0xa9, 0x72, 0x2a, 0x67, 0x01,
+	0xda, 0x86, 0xd5, 0x21, 0x0e, 0xfd, 0x04, 0xfb, 0x64, 0xe0, 0xd1, 0x53, 0xc2, 0xd4, 0x42, 0xad,
+	0xd0, 0xa8, 0x38, 0x2b, 0x13, 0xd5, 0x10, 0x22, 0xda, 0x80, 0x4a, 0x24, 0x52, 0x58, 0x70, 0x41,
+	0xd4, 0x85, 0x9a, 0xd4, 0x28, 0x3a, 0x65, 0x21, 0xf4, 0x83, 0x0b, 0x82, 0x54, 0x58, 0x14, 0xbd,
+	0xc0, 0xe1, 0x58, 0x2d, 0xa6, 0xec, 0x49, 0x88, 0x5e, 0x43, 0x91, 0x79, 0x34, 0x22, 0x6a, 0xa9,
+	0x26, 0x35, 0x56, 0x9b, 0x2d, 0x6d, 0x4e, 0x67, 0xb4, 0x9b, 0xbe, 0x66, 0x22, 0x06, 0x34, 0xec,
+	0x0b, 0x90, 0x93, 0xf1, 0x90, 0x0b, 0x0b, 0x7c, 0x1c, 0x11, 0x75, 0x31, 0xe5, 0x3e, 0xfb, 0x1b,
+	0xae, 0x3b, 0x8e, 0x88, 0x93, 0xd2, 0xea, 0x2f, 0xe1, 0xff, 0x99, 0x7a, 0xa8, 0x06, 0x9b, 0x46,
+	0xb7, 0xd3, 0xdb, 0x37, 0x5d, 0xab, 0x6b, 0x0f, 0xfa, 0x46, 0xb7, 0x67, 0x0e, 0x0e, 0xec, 0x7e,
+	0xcf, 0x34, 0xac, 0xe7, 0x96, 0xb9, 0xa7, 0xfc, 0x87, 0x00, 0x4a, 0xae, 0x69, 0xb7, 0x6c, 0x57,
+	0x91, 0xc4, 0x73, 0xef, 0xa0, 0xbd, 0x6f, 0x19, 0x8a, 0x5c, 0x3f, 0x86, 0xd5, 0xeb, 0x45, 0xd0,
+	0x16, 0x6c, 0x4c, 0xb1, 0xdc, 0xc3, 0xdf, 0x50, 0x2b, 0x50, 0x79, 0xd1, 0x6d, 0x0f, 0x5c, 0xcb,
+	0xdd, 0x37, 0x15, 0x09, 0x29, 0xb0, 0x2c, 0xf2, 0x5b, 0xf6, 0xe1, 0xc0, 0x6e, 0x75, 0x4c, 0x45,
+	0x46, 0xcb, 0x50, 0x36, 0xba, 0x9d, 0xb6, 0x65, 0x9b, 0x7b, 0x4a, 0xa1, 0xfe, 0x53, 0x86, 0xbb,
+	0x33, 0x1f, 0xc7, 0x22, 0x1a, 0x32, 0x82, 0x62, 0x40, 0x53, 0xd3, 0x19, 0x13, 0x96, 0x0c, 0x39,
+	0x53, 0xa5, 0x5a, 0xa1, 0xb1, 0xd4, 0x34, 0x6e, 0xd3, 0xac, 0x8c, 0x37, 0xd5, 0x2d, 0x27, 0x65,
+	0x39, 0x77, 0xbc, 0x19, 0x85, 0x21, 0x0b, 0xca, 0x23, 0xc2, 0xf1, 0x29, 0xe6, 0x38, 0x1d, 0xb1,
+	0xa5, 0xe6, 0xc3, 0xb9, 0x95, 0x26, 0xf0, 0x4e, 0x6e, 0x72, 0x2e, 0xed, 0xd5, 0x2f, 0x12, 0x28,
+	0xb3, 0x25, 0xd1, 0x3d, 0x00, 0x96, 0xf8, 0x3e, 0x61, 0x42, 0xcb, 0x67, 0x7b, 0x4a, 0xb9, 0x1c,
+	0x09, 0xf9, 0x5f, 0x8e, 0x84, 0x18, 0xfc, 0x60, 0x24, 0x26, 0x3f, 0x89, 0x03, 0xb5, 0x90, 0x16,
+	0x2d, 0xa7, 0xc2, 0x41, 0x1c, 0x34, 0x7f, 0x48, 0x00, 0x57, 0x2e, 0xf4, 0x4d, 0x82, 0x95, 0x6b,
+	0x64, 0xb4, 0x73, 0xeb, 0x53, 0x54, 0x9b, 0xb7, 0xff, 0x3d, 0xf5, 0xe3, 0x0f, 0x5f, 0xbf, 0x7f,
+	0x92, 0x8f, 0x90, 0x7e, 0xb9, 0x2a, 0xde, 0x66, 0x97, 0xfe, 0x69, 0x14, 0xd3, 0x37, 0xc4, 0xe3,
+	0x4c, 0x7f, 0xa0, 0x73, 0x12, 0xe2, 0x50, 0x3c, 0xbd, 0x7b, 0x9c, 0xff, 0x3c, 0x72, 0x74, 0x1f,
+	0x6d, 0xcf, 0xb1, 0x5c, 0x25, 0xb6, 0x3f, 0x4a, 0xb0, 0xe5, 0xd1, 0xd1, 0xbc, 0xb3, 0xb5, 0xd7,
+	0xa7, 0xee, 0x4e, 0xb6, 0x0f, 0x7b, 0x62, 0x53, 0xf5, 0xa4, 0xa3, 0x56, 0x6e, 0xf3, 0xa9, 0xd8,
+	0x2a, 0x1a, 0x8d, 0x7d, 0xdd, 0x27, 0x61, 0xba, 0xc7, 0xf4, 0xec, 0x15, 0x8e, 0x02, 0x76, 0xe3,
+	0xd2, 0x7b, 0x92, 0x85, 0x9f, 0xe5, 0x82, 0xe1, 0xf6, 0x4f, 0x4a, 0xa9, 0xe7, 0xd1, 0xaf, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x6c, 0xb9, 0x64, 0x84, 0x98, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -429,52 +485,3 @@ var _Completion_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/talent/v4beta1/completion_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/completion_service.proto", fileDescriptor_completion_service_14ea22e15a1c2a15)
-}
-
-var fileDescriptor_completion_service_14ea22e15a1c2a15 = []byte{
-	// 652 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x6f, 0x6b, 0xd3, 0x5e,
-	0x14, 0xc7, 0x7f, 0x49, 0xd7, 0xae, 0x3d, 0xfb, 0xf3, 0x8b, 0x97, 0x39, 0x42, 0x37, 0x5c, 0x29,
-	0x0c, 0x8b, 0x60, 0xc2, 0xea, 0x1e, 0x29, 0x82, 0x6d, 0x16, 0x21, 0xba, 0xa6, 0x35, 0xcd, 0x90,
-	0xed, 0x49, 0x77, 0x97, 0x5d, 0x42, 0xa4, 0xcd, 0xcd, 0x72, 0x6f, 0x06, 0x9d, 0x08, 0x22, 0xbe,
-	0x03, 0xdf, 0x81, 0xe0, 0x2b, 0xf2, 0x89, 0x2f, 0x40, 0xf0, 0x5d, 0x88, 0xdc, 0x24, 0xdd, 0xba,
-	0x3a, 0x2a, 0x43, 0x9f, 0xe5, 0x7c, 0x73, 0xbe, 0x9f, 0x73, 0x73, 0x72, 0xee, 0x81, 0x5d, 0x9f,
-	0x52, 0x7f, 0x48, 0x74, 0x6f, 0x48, 0x93, 0x53, 0x9d, 0xe3, 0x21, 0x09, 0xb9, 0x7e, 0xbe, 0x7b,
-	0x42, 0x38, 0xde, 0xd1, 0x3d, 0x3a, 0x8a, 0x86, 0x84, 0x07, 0x34, 0x1c, 0x30, 0x12, 0x9f, 0x07,
-	0x1e, 0xd1, 0xa2, 0x98, 0x72, 0x8a, 0x36, 0x32, 0x97, 0x96, 0xba, 0xb4, 0xcc, 0xa5, 0xe5, 0xae,
-	0xea, 0x66, 0x8e, 0xc4, 0x51, 0xa0, 0xe3, 0x30, 0xa4, 0x1c, 0x0b, 0x02, 0xcb, 0xac, 0xd5, 0xc6,
-	0x1f, 0x0a, 0x8e, 0x68, 0x98, 0x65, 0xd6, 0xdf, 0x2f, 0xc0, 0x9a, 0x91, 0x9d, 0x80, 0xbc, 0x4a,
-	0x48, 0x3c, 0x76, 0xc8, 0x59, 0x42, 0x18, 0x47, 0xeb, 0x50, 0x8a, 0x70, 0x4c, 0x42, 0xae, 0x4a,
-	0x35, 0xa9, 0x51, 0x71, 0xf2, 0x08, 0xad, 0x41, 0xf1, 0x4c, 0xe4, 0xa9, 0x72, 0x2a, 0x67, 0x01,
-	0xda, 0x86, 0xd5, 0x21, 0x0e, 0xfd, 0x04, 0xfb, 0x64, 0xe0, 0xd1, 0x53, 0xc2, 0xd4, 0x42, 0xad,
-	0xd0, 0xa8, 0x38, 0x2b, 0x13, 0xd5, 0x10, 0x22, 0xda, 0x80, 0x4a, 0x24, 0x52, 0x58, 0x70, 0x41,
-	0xd4, 0x85, 0x9a, 0xd4, 0x28, 0x3a, 0x65, 0x21, 0xf4, 0x83, 0x0b, 0x82, 0x54, 0x58, 0x14, 0xbd,
-	0xc0, 0xe1, 0x58, 0x2d, 0xa6, 0xec, 0x49, 0x88, 0x5e, 0x43, 0x91, 0x79, 0x34, 0x22, 0x6a, 0xa9,
-	0x26, 0x35, 0x56, 0x9b, 0x2d, 0x6d, 0x4e, 0x67, 0xb4, 0x9b, 0xbe, 0x66, 0x22, 0x06, 0x34, 0xec,
-	0x0b, 0x90, 0x93, 0xf1, 0x90, 0x0b, 0x0b, 0x7c, 0x1c, 0x11, 0x75, 0x31, 0xe5, 0x3e, 0xfb, 0x1b,
-	0xae, 0x3b, 0x8e, 0x88, 0x93, 0xd2, 0xea, 0x2f, 0xe1, 0xff, 0x99, 0x7a, 0xa8, 0x06, 0x9b, 0x46,
-	0xb7, 0xd3, 0xdb, 0x37, 0x5d, 0xab, 0x6b, 0x0f, 0xfa, 0x46, 0xb7, 0x67, 0x0e, 0x0e, 0xec, 0x7e,
-	0xcf, 0x34, 0xac, 0xe7, 0x96, 0xb9, 0xa7, 0xfc, 0x87, 0x00, 0x4a, 0xae, 0x69, 0xb7, 0x6c, 0x57,
-	0x91, 0xc4, 0x73, 0xef, 0xa0, 0xbd, 0x6f, 0x19, 0x8a, 0x5c, 0x3f, 0x86, 0xd5, 0xeb, 0x45, 0xd0,
-	0x16, 0x6c, 0x4c, 0xb1, 0xdc, 0xc3, 0xdf, 0x50, 0x2b, 0x50, 0x79, 0xd1, 0x6d, 0x0f, 0x5c, 0xcb,
-	0xdd, 0x37, 0x15, 0x09, 0x29, 0xb0, 0x2c, 0xf2, 0x5b, 0xf6, 0xe1, 0xc0, 0x6e, 0x75, 0x4c, 0x45,
-	0x46, 0xcb, 0x50, 0x36, 0xba, 0x9d, 0xb6, 0x65, 0x9b, 0x7b, 0x4a, 0xa1, 0xfe, 0x53, 0x86, 0xbb,
-	0x33, 0x1f, 0xc7, 0x22, 0x1a, 0x32, 0x82, 0x62, 0x40, 0x53, 0xd3, 0x19, 0x13, 0x96, 0x0c, 0x39,
-	0x53, 0xa5, 0x5a, 0xa1, 0xb1, 0xd4, 0x34, 0x6e, 0xd3, 0xac, 0x8c, 0x37, 0xd5, 0x2d, 0x27, 0x65,
-	0x39, 0x77, 0xbc, 0x19, 0x85, 0x21, 0x0b, 0xca, 0x23, 0xc2, 0xf1, 0x29, 0xe6, 0x38, 0x1d, 0xb1,
-	0xa5, 0xe6, 0xc3, 0xb9, 0x95, 0x26, 0xf0, 0x4e, 0x6e, 0x72, 0x2e, 0xed, 0xd5, 0x2f, 0x12, 0x28,
-	0xb3, 0x25, 0xd1, 0x3d, 0x00, 0x96, 0xf8, 0x3e, 0x61, 0x42, 0xcb, 0x67, 0x7b, 0x4a, 0xb9, 0x1c,
-	0x09, 0xf9, 0x5f, 0x8e, 0x84, 0x18, 0xfc, 0x60, 0x24, 0x26, 0x3f, 0x89, 0x03, 0xb5, 0x90, 0x16,
-	0x2d, 0xa7, 0xc2, 0x41, 0x1c, 0x34, 0x7f, 0x48, 0x00, 0x57, 0x2e, 0xf4, 0x4d, 0x82, 0x95, 0x6b,
-	0x64, 0xb4, 0x73, 0xeb, 0x53, 0x54, 0x9b, 0xb7, 0xff, 0x3d, 0xf5, 0xe3, 0x0f, 0x5f, 0xbf, 0x7f,
-	0x92, 0x8f, 0x90, 0x7e, 0xb9, 0x2a, 0xde, 0x66, 0x97, 0xfe, 0x69, 0x14, 0xd3, 0x37, 0xc4, 0xe3,
-	0x4c, 0x7f, 0xa0, 0x73, 0x12, 0xe2, 0x50, 0x3c, 0xbd, 0x7b, 0x9c, 0xff, 0x3c, 0x72, 0x74, 0x1f,
-	0x6d, 0xcf, 0xb1, 0x5c, 0x25, 0xb6, 0x3f, 0x4a, 0xb0, 0xe5, 0xd1, 0xd1, 0xbc, 0xb3, 0xb5, 0xd7,
-	0xa7, 0xee, 0x4e, 0xb6, 0x0f, 0x7b, 0x62, 0x53, 0xf5, 0xa4, 0xa3, 0x56, 0x6e, 0xf3, 0xa9, 0xd8,
-	0x2a, 0x1a, 0x8d, 0x7d, 0xdd, 0x27, 0x61, 0xba, 0xc7, 0xf4, 0xec, 0x15, 0x8e, 0x02, 0x76, 0xe3,
-	0xd2, 0x7b, 0x92, 0x85, 0x9f, 0xe5, 0x82, 0xe1, 0xf6, 0x4f, 0x4a, 0xa9, 0xe7, 0xd1, 0xaf, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x6c, 0xb9, 0x64, 0x84, 0x98, 0x05, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/talent/v4beta1/event.pb.go b/googleapis/cloud/talent/v4beta1/event.pb.go
index 1f611c4e7b..5d163b0d7e 100644
--- a/googleapis/cloud/talent/v4beta1/event.pb.go
+++ b/googleapis/cloud/talent/v4beta1/event.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/event.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+package talent
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An enumeration of an event attributed to the behavior of the end user,
 // such as a job seeker.
@@ -123,6 +126,7 @@ var JobEvent_JobEventType_name = map[int32]string{
 	15: "INTERVIEW_GRANTED",
 	16: "NOT_INTERESTED",
 }
+
 var JobEvent_JobEventType_value = map[string]int32{
 	"JOB_EVENT_TYPE_UNSPECIFIED":       0,
 	"IMPRESSION":                       1,
@@ -146,8 +150,9 @@ var JobEvent_JobEventType_value = map[string]int32{
 func (x JobEvent_JobEventType) String() string {
 	return proto.EnumName(JobEvent_JobEventType_name, int32(x))
 }
+
 func (JobEvent_JobEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_event_89811e87550a0ace, []int{1, 0}
+	return fileDescriptor_e736440ac47f3d40, []int{1, 0}
 }
 
 // The enum represents types of client events for a candidate profile.
@@ -170,6 +175,7 @@ var ProfileEvent_ProfileEventType_name = map[int32]string{
 	2: "VIEW",
 	3: "BOOKMARK",
 }
+
 var ProfileEvent_ProfileEventType_value = map[string]int32{
 	"PROFILE_EVENT_TYPE_UNSPECIFIED": 0,
 	"IMPRESSION":                     1,
@@ -180,8 +186,9 @@ var ProfileEvent_ProfileEventType_value = map[string]int32{
 func (x ProfileEvent_ProfileEventType) String() string {
 	return proto.EnumName(ProfileEvent_ProfileEventType_name, int32(x))
 }
+
 func (ProfileEvent_ProfileEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_event_89811e87550a0ace, []int{2, 0}
+	return fileDescriptor_e736440ac47f3d40, []int{2, 0}
 }
 
 // An event issued when an end user interacts with the application that
@@ -225,16 +232,17 @@ func (m *ClientEvent) Reset()         { *m = ClientEvent{} }
 func (m *ClientEvent) String() string { return proto.CompactTextString(m) }
 func (*ClientEvent) ProtoMessage()    {}
 func (*ClientEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_event_89811e87550a0ace, []int{0}
+	return fileDescriptor_e736440ac47f3d40, []int{0}
 }
+
 func (m *ClientEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientEvent.Unmarshal(m, b)
 }
 func (m *ClientEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientEvent.Marshal(b, m, deterministic)
 }
-func (dst *ClientEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientEvent.Merge(dst, src)
+func (m *ClientEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientEvent.Merge(m, src)
 }
 func (m *ClientEvent) XXX_Size() int {
 	return xxx_messageInfo_ClientEvent.Size(m)
@@ -310,80 +318,14 @@ func (m *ClientEvent) GetEventNotes() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ClientEvent) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ClientEvent_OneofMarshaler, _ClientEvent_OneofUnmarshaler, _ClientEvent_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ClientEvent) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ClientEvent_JobEvent)(nil),
 		(*ClientEvent_ProfileEvent)(nil),
 	}
 }
 
-func _ClientEvent_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ClientEvent)
-	// event
-	switch x := m.Event.(type) {
-	case *ClientEvent_JobEvent:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobEvent); err != nil {
-			return err
-		}
-	case *ClientEvent_ProfileEvent:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProfileEvent); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ClientEvent.Event has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ClientEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ClientEvent)
-	switch tag {
-	case 5: // event.job_event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(JobEvent)
-		err := b.DecodeMessage(msg)
-		m.Event = &ClientEvent_JobEvent{msg}
-		return true, err
-	case 6: // event.profile_event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProfileEvent)
-		err := b.DecodeMessage(msg)
-		m.Event = &ClientEvent_ProfileEvent{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ClientEvent_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ClientEvent)
-	// event
-	switch x := m.Event.(type) {
-	case *ClientEvent_JobEvent:
-		s := proto.Size(x.JobEvent)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ClientEvent_ProfileEvent:
-		s := proto.Size(x.ProfileEvent)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An event issued when a job seeker interacts with the application that
 // implements Cloud Talent Solution.
 type JobEvent struct {
@@ -408,16 +350,17 @@ func (m *JobEvent) Reset()         { *m = JobEvent{} }
 func (m *JobEvent) String() string { return proto.CompactTextString(m) }
 func (*JobEvent) ProtoMessage()    {}
 func (*JobEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_event_89811e87550a0ace, []int{1}
+	return fileDescriptor_e736440ac47f3d40, []int{1}
 }
+
 func (m *JobEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobEvent.Unmarshal(m, b)
 }
 func (m *JobEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobEvent.Marshal(b, m, deterministic)
 }
-func (dst *JobEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobEvent.Merge(dst, src)
+func (m *JobEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobEvent.Merge(m, src)
 }
 func (m *JobEvent) XXX_Size() int {
 	return xxx_messageInfo_JobEvent.Size(m)
@@ -470,16 +413,17 @@ func (m *ProfileEvent) Reset()         { *m = ProfileEvent{} }
 func (m *ProfileEvent) String() string { return proto.CompactTextString(m) }
 func (*ProfileEvent) ProtoMessage()    {}
 func (*ProfileEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_event_89811e87550a0ace, []int{2}
+	return fileDescriptor_e736440ac47f3d40, []int{2}
 }
+
 func (m *ProfileEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProfileEvent.Unmarshal(m, b)
 }
 func (m *ProfileEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProfileEvent.Marshal(b, m, deterministic)
 }
-func (dst *ProfileEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProfileEvent.Merge(dst, src)
+func (m *ProfileEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProfileEvent.Merge(m, src)
 }
 func (m *ProfileEvent) XXX_Size() int {
 	return xxx_messageInfo_ProfileEvent.Size(m)
@@ -512,18 +456,18 @@ func (m *ProfileEvent) GetJobs() []string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.talent.v4beta1.JobEvent_JobEventType", JobEvent_JobEventType_name, JobEvent_JobEventType_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.ProfileEvent_ProfileEventType", ProfileEvent_ProfileEventType_name, ProfileEvent_ProfileEventType_value)
 	proto.RegisterType((*ClientEvent)(nil), "google.cloud.talent.v4beta1.ClientEvent")
 	proto.RegisterType((*JobEvent)(nil), "google.cloud.talent.v4beta1.JobEvent")
 	proto.RegisterType((*ProfileEvent)(nil), "google.cloud.talent.v4beta1.ProfileEvent")
-	proto.RegisterEnum("google.cloud.talent.v4beta1.JobEvent_JobEventType", JobEvent_JobEventType_name, JobEvent_JobEventType_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.ProfileEvent_ProfileEventType", ProfileEvent_ProfileEventType_name, ProfileEvent_ProfileEventType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/event.proto", fileDescriptor_event_89811e87550a0ace)
+	proto.RegisterFile("google/cloud/talent/v4beta1/event.proto", fileDescriptor_e736440ac47f3d40)
 }
 
-var fileDescriptor_event_89811e87550a0ace = []byte{
+var fileDescriptor_e736440ac47f3d40 = []byte{
 	// 682 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xd3, 0x4c,
 	0x10, 0x6d, 0xfe, 0x93, 0x49, 0x9a, 0x6f, 0xbb, 0xfa, 0x40, 0x21, 0xf4, 0x27, 0x44, 0x20, 0xca,
diff --git a/googleapis/cloud/talent/v4beta1/event_service.pb.go b/googleapis/cloud/talent/v4beta1/event_service.pb.go
index 1c2b62b4cd..c90586b4c3 100644
--- a/googleapis/cloud/talent/v4beta1/event_service.pb.go
+++ b/googleapis/cloud/talent/v4beta1/event_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/event_service.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package talent
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The report event request.
 type CreateClientEventRequest struct {
@@ -50,16 +50,17 @@ func (m *CreateClientEventRequest) Reset()         { *m = CreateClientEventReque
 func (m *CreateClientEventRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClientEventRequest) ProtoMessage()    {}
 func (*CreateClientEventRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_event_service_e4985594ba4916cb, []int{0}
+	return fileDescriptor_fe732bea1e1e1bea, []int{0}
 }
+
 func (m *CreateClientEventRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClientEventRequest.Unmarshal(m, b)
 }
 func (m *CreateClientEventRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClientEventRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClientEventRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClientEventRequest.Merge(dst, src)
+func (m *CreateClientEventRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClientEventRequest.Merge(m, src)
 }
 func (m *CreateClientEventRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClientEventRequest.Size(m)
@@ -88,6 +89,35 @@ func init() {
 	proto.RegisterType((*CreateClientEventRequest)(nil), "google.cloud.talent.v4beta1.CreateClientEventRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/talent/v4beta1/event_service.proto", fileDescriptor_fe732bea1e1e1bea)
+}
+
+var fileDescriptor_fe732bea1e1e1bea = []byte{
+	// 327 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x4e, 0x3a, 0x41,
+	0x10, 0xc6, 0xb3, 0xfc, 0x13, 0x92, 0xff, 0x42, 0xc3, 0x15, 0x86, 0xa0, 0x89, 0xe4, 0x1a, 0x91,
+	0x62, 0x37, 0x82, 0x36, 0x1a, 0x0b, 0x21, 0x56, 0x36, 0x04, 0xac, 0x68, 0xc8, 0x72, 0x4e, 0xce,
+	0x33, 0xe7, 0xec, 0xb9, 0x3b, 0xd0, 0x18, 0x43, 0xe2, 0x2b, 0xf8, 0x06, 0xbe, 0x92, 0xaf, 0xc0,
+	0x2b, 0xd8, 0x1b, 0x76, 0x2f, 0x7a, 0x09, 0x7a, 0xda, 0xcd, 0xe4, 0xe6, 0xf7, 0xdd, 0xf7, 0xcd,
+	0x2c, 0x97, 0xb1, 0xd6, 0x71, 0x0a, 0x32, 0x4a, 0xf5, 0xe2, 0x46, 0x92, 0x4a, 0x01, 0x49, 0x2e,
+	0x8f, 0xe7, 0x40, 0xea, 0x48, 0xc2, 0x12, 0x90, 0x66, 0x16, 0xcc, 0x32, 0x89, 0x40, 0x64, 0x46,
+	0x93, 0x0e, 0x76, 0x3d, 0x20, 0x1c, 0x20, 0x3c, 0x20, 0x72, 0xa0, 0xb5, 0x97, 0xab, 0xa9, 0x2c,
+	0x91, 0x0a, 0x51, 0x93, 0xa2, 0x44, 0xa3, 0xf5, 0x68, 0xeb, 0xe0, 0xd7, 0x7f, 0xf9, 0xc1, 0x70,
+	0xc5, 0x9b, 0x43, 0x03, 0x8a, 0x60, 0x98, 0x26, 0x80, 0x74, 0xb9, 0xf9, 0x34, 0x86, 0x87, 0x05,
+	0x58, 0x0a, 0x76, 0x78, 0x35, 0x53, 0x06, 0x90, 0x9a, 0xac, 0xcd, 0x3a, 0xff, 0xc7, 0x79, 0x17,
+	0x5c, 0xf1, 0x7a, 0xe4, 0xa6, 0x67, 0x4e, 0xa9, 0x59, 0x69, 0xb3, 0x4e, 0xad, 0xd7, 0x11, 0x25,
+	0x76, 0x45, 0x51, 0xbe, 0x16, 0x7d, 0x35, 0xbd, 0x77, 0xc6, 0xeb, 0xae, 0x9a, 0xf8, 0xec, 0xc1,
+	0x9a, 0xf1, 0xc6, 0x96, 0xa5, 0xe0, 0xa4, 0x5c, 0xfd, 0x87, 0x08, 0xad, 0x3f, 0x9b, 0x0a, 0xf1,
+	0xf9, 0x6d, 0xfd, 0x52, 0xb9, 0x0d, 0xfb, 0x9f, 0x6b, 0x7a, 0xf4, 0x71, 0xcf, 0x33, 0xa3, 0xef,
+	0x20, 0x22, 0x2b, 0xbb, 0x92, 0x00, 0x15, 0x6e, 0xaa, 0x27, 0x59, 0xc8, 0x60, 0x4f, 0x59, 0x77,
+	0x2a, 0xc2, 0xc3, 0x12, 0x72, 0x6b, 0x7e, 0xb0, 0xe2, 0xfb, 0x91, 0xbe, 0x2f, 0xb3, 0x37, 0x68,
+	0x14, 0xf7, 0x32, 0xda, 0x9c, 0x6b, 0xc4, 0xa6, 0x17, 0x39, 0x11, 0xeb, 0x54, 0x61, 0x2c, 0xb4,
+	0x89, 0x65, 0x0c, 0xe8, 0x8e, 0x99, 0x3f, 0x30, 0x95, 0x25, 0xf6, 0xdb, 0xc3, 0x9f, 0xf9, 0xf6,
+	0xb5, 0xf2, 0x6f, 0x78, 0x3d, 0x99, 0x57, 0x1d, 0xd3, 0xff, 0x08, 0x00, 0x00, 0xff, 0xff, 0xb3,
+	0x27, 0x4c, 0x92, 0x97, 0x02, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -173,32 +203,3 @@ var _EventService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/talent/v4beta1/event_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/event_service.proto", fileDescriptor_event_service_e4985594ba4916cb)
-}
-
-var fileDescriptor_event_service_e4985594ba4916cb = []byte{
-	// 327 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x4e, 0x3a, 0x41,
-	0x10, 0xc6, 0xb3, 0xfc, 0x13, 0x92, 0xff, 0x42, 0xc3, 0x15, 0x86, 0xa0, 0x89, 0xe4, 0x1a, 0x91,
-	0x62, 0x37, 0x82, 0x36, 0x1a, 0x0b, 0x21, 0x56, 0x36, 0x04, 0xac, 0x68, 0xc8, 0x72, 0x4e, 0xce,
-	0x33, 0xe7, 0xec, 0xb9, 0x3b, 0xd0, 0x18, 0x43, 0xe2, 0x2b, 0xf8, 0x06, 0xbe, 0x92, 0xaf, 0xc0,
-	0x2b, 0xd8, 0x1b, 0x76, 0x2f, 0x7a, 0x09, 0x7a, 0xda, 0xcd, 0xe4, 0xe6, 0xf7, 0xdd, 0xf7, 0xcd,
-	0x2c, 0x97, 0xb1, 0xd6, 0x71, 0x0a, 0x32, 0x4a, 0xf5, 0xe2, 0x46, 0x92, 0x4a, 0x01, 0x49, 0x2e,
-	0x8f, 0xe7, 0x40, 0xea, 0x48, 0xc2, 0x12, 0x90, 0x66, 0x16, 0xcc, 0x32, 0x89, 0x40, 0x64, 0x46,
-	0x93, 0x0e, 0x76, 0x3d, 0x20, 0x1c, 0x20, 0x3c, 0x20, 0x72, 0xa0, 0xb5, 0x97, 0xab, 0xa9, 0x2c,
-	0x91, 0x0a, 0x51, 0x93, 0xa2, 0x44, 0xa3, 0xf5, 0x68, 0xeb, 0xe0, 0xd7, 0x7f, 0xf9, 0xc1, 0x70,
-	0xc5, 0x9b, 0x43, 0x03, 0x8a, 0x60, 0x98, 0x26, 0x80, 0x74, 0xb9, 0xf9, 0x34, 0x86, 0x87, 0x05,
-	0x58, 0x0a, 0x76, 0x78, 0x35, 0x53, 0x06, 0x90, 0x9a, 0xac, 0xcd, 0x3a, 0xff, 0xc7, 0x79, 0x17,
-	0x5c, 0xf1, 0x7a, 0xe4, 0xa6, 0x67, 0x4e, 0xa9, 0x59, 0x69, 0xb3, 0x4e, 0xad, 0xd7, 0x11, 0x25,
-	0x76, 0x45, 0x51, 0xbe, 0x16, 0x7d, 0x35, 0xbd, 0x77, 0xc6, 0xeb, 0xae, 0x9a, 0xf8, 0xec, 0xc1,
-	0x9a, 0xf1, 0xc6, 0x96, 0xa5, 0xe0, 0xa4, 0x5c, 0xfd, 0x87, 0x08, 0xad, 0x3f, 0x9b, 0x0a, 0xf1,
-	0xf9, 0x6d, 0xfd, 0x52, 0xb9, 0x0d, 0xfb, 0x9f, 0x6b, 0x7a, 0xf4, 0x71, 0xcf, 0x33, 0xa3, 0xef,
-	0x20, 0x22, 0x2b, 0xbb, 0x92, 0x00, 0x15, 0x6e, 0xaa, 0x27, 0x59, 0xc8, 0x60, 0x4f, 0x59, 0x77,
-	0x2a, 0xc2, 0xc3, 0x12, 0x72, 0x6b, 0x7e, 0xb0, 0xe2, 0xfb, 0x91, 0xbe, 0x2f, 0xb3, 0x37, 0x68,
-	0x14, 0xf7, 0x32, 0xda, 0x9c, 0x6b, 0xc4, 0xa6, 0x17, 0x39, 0x11, 0xeb, 0x54, 0x61, 0x2c, 0xb4,
-	0x89, 0x65, 0x0c, 0xe8, 0x8e, 0x99, 0x3f, 0x30, 0x95, 0x25, 0xf6, 0xdb, 0xc3, 0x9f, 0xf9, 0xf6,
-	0xb5, 0xf2, 0x6f, 0x78, 0x3d, 0x99, 0x57, 0x1d, 0xd3, 0xff, 0x08, 0x00, 0x00, 0xff, 0xff, 0xb3,
-	0x27, 0x4c, 0x92, 0x97, 0x02, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/talent/v4beta1/filters.pb.go b/googleapis/cloud/talent/v4beta1/filters.pb.go
index bae016d1a8..a6b7210674 100644
--- a/googleapis/cloud/talent/v4beta1/filters.pb.go
+++ b/googleapis/cloud/talent/v4beta1/filters.pb.go
@@ -1,18 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/filters.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import date "google.golang.org/genproto/googleapis/type/date"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
-import timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+package talent
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	date "google.golang.org/genproto/googleapis/type/date"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -23,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specify whether including telecommute jobs.
 type LocationFilter_TelecommutePreference int32
@@ -42,6 +45,7 @@ var LocationFilter_TelecommutePreference_name = map[int32]string{
 	1: "TELECOMMUTE_EXCLUDED",
 	2: "TELECOMMUTE_ALLOWED",
 }
+
 var LocationFilter_TelecommutePreference_value = map[string]int32{
 	"TELECOMMUTE_PREFERENCE_UNSPECIFIED": 0,
 	"TELECOMMUTE_EXCLUDED":               1,
@@ -51,8 +55,9 @@ var LocationFilter_TelecommutePreference_value = map[string]int32{
 func (x LocationFilter_TelecommutePreference) String() string {
 	return proto.EnumName(LocationFilter_TelecommutePreference_name, int32(x))
 }
+
 func (LocationFilter_TelecommutePreference) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{2, 0}
+	return fileDescriptor_89d33ae01ee514a8, []int{2, 0}
 }
 
 // Specify the type of filtering.
@@ -94,6 +99,7 @@ var CompensationFilter_FilterType_name = map[int32]string{
 	3: "ANNUALIZED_BASE_AMOUNT",
 	4: "ANNUALIZED_TOTAL_AMOUNT",
 }
+
 var CompensationFilter_FilterType_value = map[string]int32{
 	"FILTER_TYPE_UNSPECIFIED": 0,
 	"UNIT_ONLY":               1,
@@ -105,8 +111,9 @@ var CompensationFilter_FilterType_value = map[string]int32{
 func (x CompensationFilter_FilterType) String() string {
 	return proto.EnumName(CompensationFilter_FilterType_name, int32(x))
 }
+
 func (CompensationFilter_FilterType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{3, 0}
+	return fileDescriptor_89d33ae01ee514a8, []int{3, 0}
 }
 
 // The traffic density to use when calculating commute time.
@@ -126,6 +133,7 @@ var CommuteFilter_RoadTraffic_name = map[int32]string{
 	1: "TRAFFIC_FREE",
 	2: "BUSY_HOUR",
 }
+
 var CommuteFilter_RoadTraffic_value = map[string]int32{
 	"ROAD_TRAFFIC_UNSPECIFIED": 0,
 	"TRAFFIC_FREE":             1,
@@ -135,8 +143,9 @@ var CommuteFilter_RoadTraffic_value = map[string]int32{
 func (x CommuteFilter_RoadTraffic) String() string {
 	return proto.EnumName(CommuteFilter_RoadTraffic_name, int32(x))
 }
+
 func (CommuteFilter_RoadTraffic) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{4, 0}
+	return fileDescriptor_89d33ae01ee514a8, []int{4, 0}
 }
 
 // Enum indicating which set of [Profile.employment_records][google.cloud.talent.v4beta1.Profile.employment_records] to search
@@ -161,6 +170,7 @@ var EmployerFilter_EmployerFilterMode_name = map[int32]string{
 	2: "CURRENT_EMPLOYMENT_RECORDS_ONLY",
 	3: "PAST_EMPLOYMENT_RECORDS_ONLY",
 }
+
 var EmployerFilter_EmployerFilterMode_value = map[string]int32{
 	"EMPLOYER_FILTER_MODE_UNSPECIFIED": 0,
 	"ALL_EMPLOYMENT_RECORDS":           1,
@@ -171,8 +181,9 @@ var EmployerFilter_EmployerFilterMode_value = map[string]int32{
 func (x EmployerFilter_EmployerFilterMode) String() string {
 	return proto.EnumName(EmployerFilter_EmployerFilterMode_name, int32(x))
 }
+
 func (EmployerFilter_EmployerFilterMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{7, 0}
+	return fileDescriptor_89d33ae01ee514a8, []int{7, 0}
 }
 
 // Time fields can be used in TimeFilter.
@@ -192,6 +203,7 @@ var TimeFilter_TimeField_name = map[int32]string{
 	1: "CREATE_TIME",
 	2: "UPDATE_TIME",
 }
+
 var TimeFilter_TimeField_value = map[string]int32{
 	"TIME_FIELD_UNSPECIFIED": 0,
 	"CREATE_TIME":            1,
@@ -201,8 +213,9 @@ var TimeFilter_TimeField_value = map[string]int32{
 func (x TimeFilter_TimeField) String() string {
 	return proto.EnumName(TimeFilter_TimeField_name, int32(x))
 }
+
 func (TimeFilter_TimeField) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{13, 0}
+	return fileDescriptor_89d33ae01ee514a8, []int{13, 0}
 }
 
 // Input only.
@@ -369,16 +382,17 @@ func (m *JobQuery) Reset()         { *m = JobQuery{} }
 func (m *JobQuery) String() string { return proto.CompactTextString(m) }
 func (*JobQuery) ProtoMessage()    {}
 func (*JobQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{0}
+	return fileDescriptor_89d33ae01ee514a8, []int{0}
 }
+
 func (m *JobQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobQuery.Unmarshal(m, b)
 }
 func (m *JobQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobQuery.Marshal(b, m, deterministic)
 }
-func (dst *JobQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobQuery.Merge(dst, src)
+func (m *JobQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobQuery.Merge(m, src)
 }
 func (m *JobQuery) XXX_Size() int {
 	return xxx_messageInfo_JobQuery.Size(m)
@@ -634,16 +648,17 @@ func (m *ProfileQuery) Reset()         { *m = ProfileQuery{} }
 func (m *ProfileQuery) String() string { return proto.CompactTextString(m) }
 func (*ProfileQuery) ProtoMessage()    {}
 func (*ProfileQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{1}
+	return fileDescriptor_89d33ae01ee514a8, []int{1}
 }
+
 func (m *ProfileQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProfileQuery.Unmarshal(m, b)
 }
 func (m *ProfileQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProfileQuery.Marshal(b, m, deterministic)
 }
-func (dst *ProfileQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProfileQuery.Merge(dst, src)
+func (m *ProfileQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProfileQuery.Merge(m, src)
 }
 func (m *ProfileQuery) XXX_Size() int {
 	return xxx_messageInfo_ProfileQuery.Size(m)
@@ -813,16 +828,17 @@ func (m *LocationFilter) Reset()         { *m = LocationFilter{} }
 func (m *LocationFilter) String() string { return proto.CompactTextString(m) }
 func (*LocationFilter) ProtoMessage()    {}
 func (*LocationFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{2}
+	return fileDescriptor_89d33ae01ee514a8, []int{2}
 }
+
 func (m *LocationFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationFilter.Unmarshal(m, b)
 }
 func (m *LocationFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationFilter.Marshal(b, m, deterministic)
 }
-func (dst *LocationFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationFilter.Merge(dst, src)
+func (m *LocationFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationFilter.Merge(m, src)
 }
 func (m *LocationFilter) XXX_Size() int {
 	return xxx_messageInfo_LocationFilter.Size(m)
@@ -905,16 +921,17 @@ func (m *CompensationFilter) Reset()         { *m = CompensationFilter{} }
 func (m *CompensationFilter) String() string { return proto.CompactTextString(m) }
 func (*CompensationFilter) ProtoMessage()    {}
 func (*CompensationFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{3}
+	return fileDescriptor_89d33ae01ee514a8, []int{3}
 }
+
 func (m *CompensationFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompensationFilter.Unmarshal(m, b)
 }
 func (m *CompensationFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompensationFilter.Marshal(b, m, deterministic)
 }
-func (dst *CompensationFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompensationFilter.Merge(dst, src)
+func (m *CompensationFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompensationFilter.Merge(m, src)
 }
 func (m *CompensationFilter) XXX_Size() int {
 	return xxx_messageInfo_CompensationFilter.Size(m)
@@ -995,16 +1012,17 @@ func (m *CommuteFilter) Reset()         { *m = CommuteFilter{} }
 func (m *CommuteFilter) String() string { return proto.CompactTextString(m) }
 func (*CommuteFilter) ProtoMessage()    {}
 func (*CommuteFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{4}
+	return fileDescriptor_89d33ae01ee514a8, []int{4}
 }
+
 func (m *CommuteFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommuteFilter.Unmarshal(m, b)
 }
 func (m *CommuteFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommuteFilter.Marshal(b, m, deterministic)
 }
-func (dst *CommuteFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommuteFilter.Merge(dst, src)
+func (m *CommuteFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommuteFilter.Merge(m, src)
 }
 func (m *CommuteFilter) XXX_Size() int {
 	return xxx_messageInfo_CommuteFilter.Size(m)
@@ -1080,75 +1098,14 @@ func (m *CommuteFilter) GetDepartureTime() *timeofday.TimeOfDay {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CommuteFilter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CommuteFilter_OneofMarshaler, _CommuteFilter_OneofUnmarshaler, _CommuteFilter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CommuteFilter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CommuteFilter_RoadTraffic_)(nil),
 		(*CommuteFilter_DepartureTime)(nil),
 	}
 }
 
-func _CommuteFilter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CommuteFilter)
-	// traffic_option
-	switch x := m.TrafficOption.(type) {
-	case *CommuteFilter_RoadTraffic_:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RoadTraffic))
-	case *CommuteFilter_DepartureTime:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DepartureTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CommuteFilter.TrafficOption has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CommuteFilter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CommuteFilter)
-	switch tag {
-	case 5: // traffic_option.road_traffic
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TrafficOption = &CommuteFilter_RoadTraffic_{CommuteFilter_RoadTraffic(x)}
-		return true, err
-	case 6: // traffic_option.departure_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timeofday.TimeOfDay)
-		err := b.DecodeMessage(msg)
-		m.TrafficOption = &CommuteFilter_DepartureTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CommuteFilter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CommuteFilter)
-	// traffic_option
-	switch x := m.TrafficOption.(type) {
-	case *CommuteFilter_RoadTraffic_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.RoadTraffic))
-	case *CommuteFilter_DepartureTime:
-		s := proto.Size(x.DepartureTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Input only.
 //
 // Job title of the search.
@@ -1171,16 +1128,17 @@ func (m *JobTitleFilter) Reset()         { *m = JobTitleFilter{} }
 func (m *JobTitleFilter) String() string { return proto.CompactTextString(m) }
 func (*JobTitleFilter) ProtoMessage()    {}
 func (*JobTitleFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{5}
+	return fileDescriptor_89d33ae01ee514a8, []int{5}
 }
+
 func (m *JobTitleFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobTitleFilter.Unmarshal(m, b)
 }
 func (m *JobTitleFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobTitleFilter.Marshal(b, m, deterministic)
 }
-func (dst *JobTitleFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobTitleFilter.Merge(dst, src)
+func (m *JobTitleFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobTitleFilter.Merge(m, src)
 }
 func (m *JobTitleFilter) XXX_Size() int {
 	return xxx_messageInfo_JobTitleFilter.Size(m)
@@ -1227,16 +1185,17 @@ func (m *SkillFilter) Reset()         { *m = SkillFilter{} }
 func (m *SkillFilter) String() string { return proto.CompactTextString(m) }
 func (*SkillFilter) ProtoMessage()    {}
 func (*SkillFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{6}
+	return fileDescriptor_89d33ae01ee514a8, []int{6}
 }
+
 func (m *SkillFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SkillFilter.Unmarshal(m, b)
 }
 func (m *SkillFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SkillFilter.Marshal(b, m, deterministic)
 }
-func (dst *SkillFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SkillFilter.Merge(dst, src)
+func (m *SkillFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SkillFilter.Merge(m, src)
 }
 func (m *SkillFilter) XXX_Size() int {
 	return xxx_messageInfo_SkillFilter.Size(m)
@@ -1289,16 +1248,17 @@ func (m *EmployerFilter) Reset()         { *m = EmployerFilter{} }
 func (m *EmployerFilter) String() string { return proto.CompactTextString(m) }
 func (*EmployerFilter) ProtoMessage()    {}
 func (*EmployerFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{7}
+	return fileDescriptor_89d33ae01ee514a8, []int{7}
 }
+
 func (m *EmployerFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EmployerFilter.Unmarshal(m, b)
 }
 func (m *EmployerFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EmployerFilter.Marshal(b, m, deterministic)
 }
-func (dst *EmployerFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EmployerFilter.Merge(dst, src)
+func (m *EmployerFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EmployerFilter.Merge(m, src)
 }
 func (m *EmployerFilter) XXX_Size() int {
 	return xxx_messageInfo_EmployerFilter.Size(m)
@@ -1364,16 +1324,17 @@ func (m *EducationFilter) Reset()         { *m = EducationFilter{} }
 func (m *EducationFilter) String() string { return proto.CompactTextString(m) }
 func (*EducationFilter) ProtoMessage()    {}
 func (*EducationFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{8}
+	return fileDescriptor_89d33ae01ee514a8, []int{8}
 }
+
 func (m *EducationFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EducationFilter.Unmarshal(m, b)
 }
 func (m *EducationFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EducationFilter.Marshal(b, m, deterministic)
 }
-func (dst *EducationFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EducationFilter.Merge(dst, src)
+func (m *EducationFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EducationFilter.Merge(m, src)
 }
 func (m *EducationFilter) XXX_Size() int {
 	return xxx_messageInfo_EducationFilter.Size(m)
@@ -1436,16 +1397,17 @@ func (m *WorkExperienceFilter) Reset()         { *m = WorkExperienceFilter{} }
 func (m *WorkExperienceFilter) String() string { return proto.CompactTextString(m) }
 func (*WorkExperienceFilter) ProtoMessage()    {}
 func (*WorkExperienceFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{9}
+	return fileDescriptor_89d33ae01ee514a8, []int{9}
 }
+
 func (m *WorkExperienceFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkExperienceFilter.Unmarshal(m, b)
 }
 func (m *WorkExperienceFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkExperienceFilter.Marshal(b, m, deterministic)
 }
-func (dst *WorkExperienceFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkExperienceFilter.Merge(dst, src)
+func (m *WorkExperienceFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkExperienceFilter.Merge(m, src)
 }
 func (m *WorkExperienceFilter) XXX_Size() int {
 	return xxx_messageInfo_WorkExperienceFilter.Size(m)
@@ -1497,16 +1459,17 @@ func (m *ApplicationDateFilter) Reset()         { *m = ApplicationDateFilter{} }
 func (m *ApplicationDateFilter) String() string { return proto.CompactTextString(m) }
 func (*ApplicationDateFilter) ProtoMessage()    {}
 func (*ApplicationDateFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{10}
+	return fileDescriptor_89d33ae01ee514a8, []int{10}
 }
+
 func (m *ApplicationDateFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplicationDateFilter.Unmarshal(m, b)
 }
 func (m *ApplicationDateFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplicationDateFilter.Marshal(b, m, deterministic)
 }
-func (dst *ApplicationDateFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplicationDateFilter.Merge(dst, src)
+func (m *ApplicationDateFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplicationDateFilter.Merge(m, src)
 }
 func (m *ApplicationDateFilter) XXX_Size() int {
 	return xxx_messageInfo_ApplicationDateFilter.Size(m)
@@ -1555,16 +1518,17 @@ func (m *ApplicationOutcomeNotesFilter) Reset()         { *m = ApplicationOutcom
 func (m *ApplicationOutcomeNotesFilter) String() string { return proto.CompactTextString(m) }
 func (*ApplicationOutcomeNotesFilter) ProtoMessage()    {}
 func (*ApplicationOutcomeNotesFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{11}
+	return fileDescriptor_89d33ae01ee514a8, []int{11}
 }
+
 func (m *ApplicationOutcomeNotesFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplicationOutcomeNotesFilter.Unmarshal(m, b)
 }
 func (m *ApplicationOutcomeNotesFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplicationOutcomeNotesFilter.Marshal(b, m, deterministic)
 }
-func (dst *ApplicationOutcomeNotesFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplicationOutcomeNotesFilter.Merge(dst, src)
+func (m *ApplicationOutcomeNotesFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplicationOutcomeNotesFilter.Merge(m, src)
 }
 func (m *ApplicationOutcomeNotesFilter) XXX_Size() int {
 	return xxx_messageInfo_ApplicationOutcomeNotesFilter.Size(m)
@@ -1617,16 +1581,17 @@ func (m *ApplicationJobFilter) Reset()         { *m = ApplicationJobFilter{} }
 func (m *ApplicationJobFilter) String() string { return proto.CompactTextString(m) }
 func (*ApplicationJobFilter) ProtoMessage()    {}
 func (*ApplicationJobFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{12}
+	return fileDescriptor_89d33ae01ee514a8, []int{12}
 }
+
 func (m *ApplicationJobFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplicationJobFilter.Unmarshal(m, b)
 }
 func (m *ApplicationJobFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ApplicationJobFilter.Marshal(b, m, deterministic)
 }
-func (dst *ApplicationJobFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplicationJobFilter.Merge(dst, src)
+func (m *ApplicationJobFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApplicationJobFilter.Merge(m, src)
 }
 func (m *ApplicationJobFilter) XXX_Size() int {
 	return xxx_messageInfo_ApplicationJobFilter.Size(m)
@@ -1689,16 +1654,17 @@ func (m *TimeFilter) Reset()         { *m = TimeFilter{} }
 func (m *TimeFilter) String() string { return proto.CompactTextString(m) }
 func (*TimeFilter) ProtoMessage()    {}
 func (*TimeFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_filters_4fe13b05da0a66b7, []int{13}
+	return fileDescriptor_89d33ae01ee514a8, []int{13}
 }
+
 func (m *TimeFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeFilter.Unmarshal(m, b)
 }
 func (m *TimeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeFilter.Marshal(b, m, deterministic)
 }
-func (dst *TimeFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeFilter.Merge(dst, src)
+func (m *TimeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeFilter.Merge(m, src)
 }
 func (m *TimeFilter) XXX_Size() int {
 	return xxx_messageInfo_TimeFilter.Size(m)
@@ -1731,6 +1697,11 @@ func (m *TimeFilter) GetTimeField() TimeFilter_TimeField {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.talent.v4beta1.LocationFilter_TelecommutePreference", LocationFilter_TelecommutePreference_name, LocationFilter_TelecommutePreference_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.CompensationFilter_FilterType", CompensationFilter_FilterType_name, CompensationFilter_FilterType_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.CommuteFilter_RoadTraffic", CommuteFilter_RoadTraffic_name, CommuteFilter_RoadTraffic_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.EmployerFilter_EmployerFilterMode", EmployerFilter_EmployerFilterMode_name, EmployerFilter_EmployerFilterMode_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.TimeFilter_TimeField", TimeFilter_TimeField_name, TimeFilter_TimeField_value)
 	proto.RegisterType((*JobQuery)(nil), "google.cloud.talent.v4beta1.JobQuery")
 	proto.RegisterType((*ProfileQuery)(nil), "google.cloud.talent.v4beta1.ProfileQuery")
 	proto.RegisterType((*LocationFilter)(nil), "google.cloud.talent.v4beta1.LocationFilter")
@@ -1745,18 +1716,13 @@ func init() {
 	proto.RegisterType((*ApplicationOutcomeNotesFilter)(nil), "google.cloud.talent.v4beta1.ApplicationOutcomeNotesFilter")
 	proto.RegisterType((*ApplicationJobFilter)(nil), "google.cloud.talent.v4beta1.ApplicationJobFilter")
 	proto.RegisterType((*TimeFilter)(nil), "google.cloud.talent.v4beta1.TimeFilter")
-	proto.RegisterEnum("google.cloud.talent.v4beta1.LocationFilter_TelecommutePreference", LocationFilter_TelecommutePreference_name, LocationFilter_TelecommutePreference_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.CompensationFilter_FilterType", CompensationFilter_FilterType_name, CompensationFilter_FilterType_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.CommuteFilter_RoadTraffic", CommuteFilter_RoadTraffic_name, CommuteFilter_RoadTraffic_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.EmployerFilter_EmployerFilterMode", EmployerFilter_EmployerFilterMode_name, EmployerFilter_EmployerFilterMode_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.TimeFilter_TimeField", TimeFilter_TimeField_name, TimeFilter_TimeField_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/filters.proto", fileDescriptor_filters_4fe13b05da0a66b7)
+	proto.RegisterFile("google/cloud/talent/v4beta1/filters.proto", fileDescriptor_89d33ae01ee514a8)
 }
 
-var fileDescriptor_filters_4fe13b05da0a66b7 = []byte{
+var fileDescriptor_89d33ae01ee514a8 = []byte{
 	// 1993 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x5b, 0x73, 0x23, 0x47,
 	0x15, 0x5e, 0x49, 0x5e, 0xaf, 0x75, 0x74, 0xb1, 0xb6, 0x7d, 0x53, 0xbc, 0x4b, 0xd6, 0x28, 0x09,
diff --git a/googleapis/cloud/talent/v4beta1/histogram.pb.go b/googleapis/cloud/talent/v4beta1/histogram.pb.go
index 2f73c16703..e15787f616 100644
--- a/googleapis/cloud/talent/v4beta1/histogram.pb.go
+++ b/googleapis/cloud/talent/v4beta1/histogram.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/histogram.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+package talent
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Input Only.
 //
@@ -39,16 +42,17 @@ func (m *HistogramQuery) Reset()         { *m = HistogramQuery{} }
 func (m *HistogramQuery) String() string { return proto.CompactTextString(m) }
 func (*HistogramQuery) ProtoMessage()    {}
 func (*HistogramQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_histogram_6fd84e257fb563ef, []int{0}
+	return fileDescriptor_faf41faeec04126e, []int{0}
 }
+
 func (m *HistogramQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HistogramQuery.Unmarshal(m, b)
 }
 func (m *HistogramQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HistogramQuery.Marshal(b, m, deterministic)
 }
-func (dst *HistogramQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HistogramQuery.Merge(dst, src)
+func (m *HistogramQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HistogramQuery.Merge(m, src)
 }
 func (m *HistogramQuery) XXX_Size() int {
 	return xxx_messageInfo_HistogramQuery.Size(m)
@@ -91,16 +95,17 @@ func (m *HistogramQueryResult) Reset()         { *m = HistogramQueryResult{} }
 func (m *HistogramQueryResult) String() string { return proto.CompactTextString(m) }
 func (*HistogramQueryResult) ProtoMessage()    {}
 func (*HistogramQueryResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_histogram_6fd84e257fb563ef, []int{1}
+	return fileDescriptor_faf41faeec04126e, []int{1}
 }
+
 func (m *HistogramQueryResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HistogramQueryResult.Unmarshal(m, b)
 }
 func (m *HistogramQueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HistogramQueryResult.Marshal(b, m, deterministic)
 }
-func (dst *HistogramQueryResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HistogramQueryResult.Merge(dst, src)
+func (m *HistogramQueryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HistogramQueryResult.Merge(m, src)
 }
 func (m *HistogramQueryResult) XXX_Size() int {
 	return xxx_messageInfo_HistogramQueryResult.Size(m)
@@ -132,10 +137,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/histogram.proto", fileDescriptor_histogram_6fd84e257fb563ef)
+	proto.RegisterFile("google/cloud/talent/v4beta1/histogram.proto", fileDescriptor_faf41faeec04126e)
 }
 
-var fileDescriptor_histogram_6fd84e257fb563ef = []byte{
+var fileDescriptor_faf41faeec04126e = []byte{
 	// 301 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4e, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xc9, 0x2f, 0x4d, 0xd1, 0x2f, 0x49, 0xcc, 0x49, 0xcd, 0x2b, 0xd1,
diff --git a/googleapis/cloud/talent/v4beta1/job.pb.go b/googleapis/cloud/talent/v4beta1/job.pb.go
index c2c9e45ed9..f1863d0b1c 100644
--- a/googleapis/cloud/talent/v4beta1/job.pb.go
+++ b/googleapis/cloud/talent/v4beta1/job.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/job.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+package talent
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/postaladdress"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/postaladdress"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Job resource represents a job posting (also referred to as a "job listing"
 // or "job requisition"). A job belongs to a [Company][google.cloud.talent.v4beta1.Company], which is the hiring
@@ -288,16 +291,17 @@ func (m *Job) Reset()         { *m = Job{} }
 func (m *Job) String() string { return proto.CompactTextString(m) }
 func (*Job) ProtoMessage()    {}
 func (*Job) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_1bcb1f20b417ba30, []int{0}
+	return fileDescriptor_c717d27462774c27, []int{0}
 }
+
 func (m *Job) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job.Unmarshal(m, b)
 }
 func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
 }
-func (dst *Job) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job.Merge(dst, src)
+func (m *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(m, src)
 }
 func (m *Job) XXX_Size() int {
 	return xxx_messageInfo_Job.Size(m)
@@ -553,16 +557,17 @@ func (m *Job_ApplicationInfo) Reset()         { *m = Job_ApplicationInfo{} }
 func (m *Job_ApplicationInfo) String() string { return proto.CompactTextString(m) }
 func (*Job_ApplicationInfo) ProtoMessage()    {}
 func (*Job_ApplicationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_1bcb1f20b417ba30, []int{0, 0}
+	return fileDescriptor_c717d27462774c27, []int{0, 0}
 }
+
 func (m *Job_ApplicationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job_ApplicationInfo.Unmarshal(m, b)
 }
 func (m *Job_ApplicationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job_ApplicationInfo.Marshal(b, m, deterministic)
 }
-func (dst *Job_ApplicationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job_ApplicationInfo.Merge(dst, src)
+func (m *Job_ApplicationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job_ApplicationInfo.Merge(m, src)
 }
 func (m *Job_ApplicationInfo) XXX_Size() int {
 	return xxx_messageInfo_Job_ApplicationInfo.Size(m)
@@ -614,16 +619,17 @@ func (m *Job_DerivedInfo) Reset()         { *m = Job_DerivedInfo{} }
 func (m *Job_DerivedInfo) String() string { return proto.CompactTextString(m) }
 func (*Job_DerivedInfo) ProtoMessage()    {}
 func (*Job_DerivedInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_1bcb1f20b417ba30, []int{0, 1}
+	return fileDescriptor_c717d27462774c27, []int{0, 1}
 }
+
 func (m *Job_DerivedInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job_DerivedInfo.Unmarshal(m, b)
 }
 func (m *Job_DerivedInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job_DerivedInfo.Marshal(b, m, deterministic)
 }
-func (dst *Job_DerivedInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job_DerivedInfo.Merge(dst, src)
+func (m *Job_DerivedInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job_DerivedInfo.Merge(m, src)
 }
 func (m *Job_DerivedInfo) XXX_Size() int {
 	return xxx_messageInfo_Job_DerivedInfo.Size(m)
@@ -681,16 +687,17 @@ func (m *Job_ProcessingOptions) Reset()         { *m = Job_ProcessingOptions{} }
 func (m *Job_ProcessingOptions) String() string { return proto.CompactTextString(m) }
 func (*Job_ProcessingOptions) ProtoMessage()    {}
 func (*Job_ProcessingOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_1bcb1f20b417ba30, []int{0, 2}
+	return fileDescriptor_c717d27462774c27, []int{0, 2}
 }
+
 func (m *Job_ProcessingOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Job_ProcessingOptions.Unmarshal(m, b)
 }
 func (m *Job_ProcessingOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Job_ProcessingOptions.Marshal(b, m, deterministic)
 }
-func (dst *Job_ProcessingOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Job_ProcessingOptions.Merge(dst, src)
+func (m *Job_ProcessingOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job_ProcessingOptions.Merge(m, src)
 }
 func (m *Job_ProcessingOptions) XXX_Size() int {
 	return xxx_messageInfo_Job_ProcessingOptions.Size(m)
@@ -724,10 +731,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/job.proto", fileDescriptor_job_1bcb1f20b417ba30)
+	proto.RegisterFile("google/cloud/talent/v4beta1/job.proto", fileDescriptor_c717d27462774c27)
 }
 
-var fileDescriptor_job_1bcb1f20b417ba30 = []byte{
+var fileDescriptor_c717d27462774c27 = []byte{
 	// 1102 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xd1, 0x72, 0x1b, 0x35,
 	0x17, 0x1e, 0xc7, 0x4d, 0x1b, 0xcb, 0x89, 0x63, 0xab, 0x69, 0x7f, 0xfd, 0x6e, 0x48, 0x0d, 0x4c,
diff --git a/googleapis/cloud/talent/v4beta1/job_service.pb.go b/googleapis/cloud/talent/v4beta1/job_service.pb.go
index 6f5cefd169..cded8d1f38 100644
--- a/googleapis/cloud/talent/v4beta1/job_service.pb.go
+++ b/googleapis/cloud/talent/v4beta1/job_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/job_service.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package talent
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An enum that specifies the job attributes that are returned in the
 // [MatchingJob.Job][] in [SearchJobsResponse][google.cloud.talent.v4beta1.SearchJobsResponse] or [Job][google.cloud.talent.v4beta1.Job] objects in
@@ -59,6 +59,7 @@ var JobView_name = map[int32]string{
 	3: "JOB_VIEW_SMALL",
 	4: "JOB_VIEW_FULL",
 }
+
 var JobView_value = map[string]int32{
 	"JOB_VIEW_UNSPECIFIED": 0,
 	"JOB_VIEW_ID_ONLY":     1,
@@ -70,8 +71,9 @@ var JobView_value = map[string]int32{
 func (x JobView) String() string {
 	return proto.EnumName(JobView_name, int32(x))
 }
+
 func (JobView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{0}
+	return fileDescriptor_0dfa8e10f7799e35, []int{0}
 }
 
 // A string-represented enumeration of the job search mode. The service
@@ -97,6 +99,7 @@ var SearchJobsRequest_SearchMode_name = map[int32]string{
 	1: "JOB_SEARCH",
 	2: "FEATURED_JOB_SEARCH",
 }
+
 var SearchJobsRequest_SearchMode_value = map[string]int32{
 	"SEARCH_MODE_UNSPECIFIED": 0,
 	"JOB_SEARCH":              1,
@@ -106,8 +109,9 @@ var SearchJobsRequest_SearchMode_value = map[string]int32{
 func (x SearchJobsRequest_SearchMode) String() string {
 	return proto.EnumName(SearchJobsRequest_SearchMode_name, int32(x))
 }
+
 func (SearchJobsRequest_SearchMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{7, 0}
+	return fileDescriptor_0dfa8e10f7799e35, []int{7, 0}
 }
 
 // Controls whether highly similar jobs are returned next to each other in
@@ -136,6 +140,7 @@ var SearchJobsRequest_DiversificationLevel_name = map[int32]string{
 	1: "DISABLED",
 	2: "SIMPLE",
 }
+
 var SearchJobsRequest_DiversificationLevel_value = map[string]int32{
 	"DIVERSIFICATION_LEVEL_UNSPECIFIED": 0,
 	"DISABLED":                          1,
@@ -145,8 +150,9 @@ var SearchJobsRequest_DiversificationLevel_value = map[string]int32{
 func (x SearchJobsRequest_DiversificationLevel) String() string {
 	return proto.EnumName(SearchJobsRequest_DiversificationLevel_name, int32(x))
 }
+
 func (SearchJobsRequest_DiversificationLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{7, 1}
+	return fileDescriptor_0dfa8e10f7799e35, []int{7, 1}
 }
 
 // The importance level for [CustomRankingInfo.ranking_expression][google.cloud.talent.v4beta1.SearchJobsRequest.CustomRankingInfo.ranking_expression].
@@ -190,6 +196,7 @@ var SearchJobsRequest_CustomRankingInfo_ImportanceLevel_name = map[int32]string{
 	5: "HIGH",
 	6: "EXTREME",
 }
+
 var SearchJobsRequest_CustomRankingInfo_ImportanceLevel_value = map[string]int32{
 	"IMPORTANCE_LEVEL_UNSPECIFIED": 0,
 	"NONE":                         1,
@@ -203,8 +210,9 @@ var SearchJobsRequest_CustomRankingInfo_ImportanceLevel_value = map[string]int32
 func (x SearchJobsRequest_CustomRankingInfo_ImportanceLevel) String() string {
 	return proto.EnumName(SearchJobsRequest_CustomRankingInfo_ImportanceLevel_name, int32(x))
 }
+
 func (SearchJobsRequest_CustomRankingInfo_ImportanceLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{7, 0, 0}
+	return fileDescriptor_0dfa8e10f7799e35, []int{7, 0, 0}
 }
 
 // Input only.
@@ -234,16 +242,17 @@ func (m *CreateJobRequest) Reset()         { *m = CreateJobRequest{} }
 func (m *CreateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateJobRequest) ProtoMessage()    {}
 func (*CreateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{0}
+	return fileDescriptor_0dfa8e10f7799e35, []int{0}
 }
+
 func (m *CreateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateJobRequest.Unmarshal(m, b)
 }
 func (m *CreateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateJobRequest.Merge(dst, src)
+func (m *CreateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateJobRequest.Merge(m, src)
 }
 func (m *CreateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateJobRequest.Size(m)
@@ -292,16 +301,17 @@ func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
 func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetJobRequest) ProtoMessage()    {}
 func (*GetJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{1}
+	return fileDescriptor_0dfa8e10f7799e35, []int{1}
 }
+
 func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
 }
 func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+func (m *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(m, src)
 }
 func (m *GetJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetJobRequest.Size(m)
@@ -345,16 +355,17 @@ func (m *UpdateJobRequest) Reset()         { *m = UpdateJobRequest{} }
 func (m *UpdateJobRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateJobRequest) ProtoMessage()    {}
 func (*UpdateJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{2}
+	return fileDescriptor_0dfa8e10f7799e35, []int{2}
 }
+
 func (m *UpdateJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateJobRequest.Unmarshal(m, b)
 }
 func (m *UpdateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateJobRequest.Merge(dst, src)
+func (m *UpdateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobRequest.Merge(m, src)
 }
 func (m *UpdateJobRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateJobRequest.Size(m)
@@ -403,16 +414,17 @@ func (m *DeleteJobRequest) Reset()         { *m = DeleteJobRequest{} }
 func (m *DeleteJobRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteJobRequest) ProtoMessage()    {}
 func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{3}
+	return fileDescriptor_0dfa8e10f7799e35, []int{3}
 }
+
 func (m *DeleteJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteJobRequest.Unmarshal(m, b)
 }
 func (m *DeleteJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteJobRequest.Merge(dst, src)
+func (m *DeleteJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobRequest.Merge(m, src)
 }
 func (m *DeleteJobRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteJobRequest.Size(m)
@@ -467,16 +479,17 @@ func (m *BatchDeleteJobsRequest) Reset()         { *m = BatchDeleteJobsRequest{}
 func (m *BatchDeleteJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeleteJobsRequest) ProtoMessage()    {}
 func (*BatchDeleteJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{4}
+	return fileDescriptor_0dfa8e10f7799e35, []int{4}
 }
+
 func (m *BatchDeleteJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeleteJobsRequest.Unmarshal(m, b)
 }
 func (m *BatchDeleteJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeleteJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeleteJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeleteJobsRequest.Merge(dst, src)
+func (m *BatchDeleteJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteJobsRequest.Merge(m, src)
 }
 func (m *BatchDeleteJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeleteJobsRequest.Size(m)
@@ -564,16 +577,17 @@ func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
 func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListJobsRequest) ProtoMessage()    {}
 func (*ListJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{5}
+	return fileDescriptor_0dfa8e10f7799e35, []int{5}
 }
+
 func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
 }
 func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+func (m *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(m, src)
 }
 func (m *ListJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListJobsRequest.Size(m)
@@ -642,16 +656,17 @@ func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
 func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListJobsResponse) ProtoMessage()    {}
 func (*ListJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{6}
+	return fileDescriptor_0dfa8e10f7799e35, []int{6}
 }
+
 func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
 }
 func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+func (m *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(m, src)
 }
 func (m *ListJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListJobsResponse.Size(m)
@@ -951,16 +966,17 @@ func (m *SearchJobsRequest) Reset()         { *m = SearchJobsRequest{} }
 func (m *SearchJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchJobsRequest) ProtoMessage()    {}
 func (*SearchJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{7}
+	return fileDescriptor_0dfa8e10f7799e35, []int{7}
 }
+
 func (m *SearchJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchJobsRequest.Unmarshal(m, b)
 }
 func (m *SearchJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchJobsRequest.Merge(dst, src)
+func (m *SearchJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchJobsRequest.Merge(m, src)
 }
 func (m *SearchJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchJobsRequest.Size(m)
@@ -1115,16 +1131,17 @@ func (m *SearchJobsRequest_CustomRankingInfo) Reset()         { *m = SearchJobsR
 func (m *SearchJobsRequest_CustomRankingInfo) String() string { return proto.CompactTextString(m) }
 func (*SearchJobsRequest_CustomRankingInfo) ProtoMessage()    {}
 func (*SearchJobsRequest_CustomRankingInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{7, 0}
+	return fileDescriptor_0dfa8e10f7799e35, []int{7, 0}
 }
+
 func (m *SearchJobsRequest_CustomRankingInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchJobsRequest_CustomRankingInfo.Unmarshal(m, b)
 }
 func (m *SearchJobsRequest_CustomRankingInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchJobsRequest_CustomRankingInfo.Marshal(b, m, deterministic)
 }
-func (dst *SearchJobsRequest_CustomRankingInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchJobsRequest_CustomRankingInfo.Merge(dst, src)
+func (m *SearchJobsRequest_CustomRankingInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchJobsRequest_CustomRankingInfo.Merge(m, src)
 }
 func (m *SearchJobsRequest_CustomRankingInfo) XXX_Size() int {
 	return xxx_messageInfo_SearchJobsRequest_CustomRankingInfo.Size(m)
@@ -1196,16 +1213,17 @@ func (m *SearchJobsResponse) Reset()         { *m = SearchJobsResponse{} }
 func (m *SearchJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchJobsResponse) ProtoMessage()    {}
 func (*SearchJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{8}
+	return fileDescriptor_0dfa8e10f7799e35, []int{8}
 }
+
 func (m *SearchJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchJobsResponse.Unmarshal(m, b)
 }
 func (m *SearchJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchJobsResponse.Merge(dst, src)
+func (m *SearchJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchJobsResponse.Merge(m, src)
 }
 func (m *SearchJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchJobsResponse.Size(m)
@@ -1309,16 +1327,17 @@ func (m *SearchJobsResponse_MatchingJob) Reset()         { *m = SearchJobsRespon
 func (m *SearchJobsResponse_MatchingJob) String() string { return proto.CompactTextString(m) }
 func (*SearchJobsResponse_MatchingJob) ProtoMessage()    {}
 func (*SearchJobsResponse_MatchingJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{8, 0}
+	return fileDescriptor_0dfa8e10f7799e35, []int{8, 0}
 }
+
 func (m *SearchJobsResponse_MatchingJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchJobsResponse_MatchingJob.Unmarshal(m, b)
 }
 func (m *SearchJobsResponse_MatchingJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchJobsResponse_MatchingJob.Marshal(b, m, deterministic)
 }
-func (dst *SearchJobsResponse_MatchingJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchJobsResponse_MatchingJob.Merge(dst, src)
+func (m *SearchJobsResponse_MatchingJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchJobsResponse_MatchingJob.Merge(m, src)
 }
 func (m *SearchJobsResponse_MatchingJob) XXX_Size() int {
 	return xxx_messageInfo_SearchJobsResponse_MatchingJob.Size(m)
@@ -1384,16 +1403,17 @@ func (m *SearchJobsResponse_CommuteInfo) Reset()         { *m = SearchJobsRespon
 func (m *SearchJobsResponse_CommuteInfo) String() string { return proto.CompactTextString(m) }
 func (*SearchJobsResponse_CommuteInfo) ProtoMessage()    {}
 func (*SearchJobsResponse_CommuteInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_job_service_461eee9b2ad19a52, []int{8, 1}
+	return fileDescriptor_0dfa8e10f7799e35, []int{8, 1}
 }
+
 func (m *SearchJobsResponse_CommuteInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchJobsResponse_CommuteInfo.Unmarshal(m, b)
 }
 func (m *SearchJobsResponse_CommuteInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchJobsResponse_CommuteInfo.Marshal(b, m, deterministic)
 }
-func (dst *SearchJobsResponse_CommuteInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchJobsResponse_CommuteInfo.Merge(dst, src)
+func (m *SearchJobsResponse_CommuteInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchJobsResponse_CommuteInfo.Merge(m, src)
 }
 func (m *SearchJobsResponse_CommuteInfo) XXX_Size() int {
 	return xxx_messageInfo_SearchJobsResponse_CommuteInfo.Size(m)
@@ -1419,6 +1439,10 @@ func (m *SearchJobsResponse_CommuteInfo) GetTravelDuration() *duration.Duration
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.talent.v4beta1.JobView", JobView_name, JobView_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.SearchJobsRequest_SearchMode", SearchJobsRequest_SearchMode_name, SearchJobsRequest_SearchMode_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.SearchJobsRequest_DiversificationLevel", SearchJobsRequest_DiversificationLevel_name, SearchJobsRequest_DiversificationLevel_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.SearchJobsRequest_CustomRankingInfo_ImportanceLevel", SearchJobsRequest_CustomRankingInfo_ImportanceLevel_name, SearchJobsRequest_CustomRankingInfo_ImportanceLevel_value)
 	proto.RegisterType((*CreateJobRequest)(nil), "google.cloud.talent.v4beta1.CreateJobRequest")
 	proto.RegisterType((*GetJobRequest)(nil), "google.cloud.talent.v4beta1.GetJobRequest")
 	proto.RegisterType((*UpdateJobRequest)(nil), "google.cloud.talent.v4beta1.UpdateJobRequest")
@@ -1431,10 +1455,131 @@ func init() {
 	proto.RegisterType((*SearchJobsResponse)(nil), "google.cloud.talent.v4beta1.SearchJobsResponse")
 	proto.RegisterType((*SearchJobsResponse_MatchingJob)(nil), "google.cloud.talent.v4beta1.SearchJobsResponse.MatchingJob")
 	proto.RegisterType((*SearchJobsResponse_CommuteInfo)(nil), "google.cloud.talent.v4beta1.SearchJobsResponse.CommuteInfo")
-	proto.RegisterEnum("google.cloud.talent.v4beta1.JobView", JobView_name, JobView_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.SearchJobsRequest_SearchMode", SearchJobsRequest_SearchMode_name, SearchJobsRequest_SearchMode_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.SearchJobsRequest_DiversificationLevel", SearchJobsRequest_DiversificationLevel_name, SearchJobsRequest_DiversificationLevel_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.SearchJobsRequest_CustomRankingInfo_ImportanceLevel", SearchJobsRequest_CustomRankingInfo_ImportanceLevel_name, SearchJobsRequest_CustomRankingInfo_ImportanceLevel_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/talent/v4beta1/job_service.proto", fileDescriptor_0dfa8e10f7799e35)
+}
+
+var fileDescriptor_0dfa8e10f7799e35 = []byte{
+	// 1861 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x73, 0x1b, 0xc7,
+	0x11, 0xce, 0x82, 0x2f, 0xa0, 0x41, 0x12, 0xcb, 0x11, 0x2d, 0xc1, 0xa0, 0x13, 0x53, 0xab, 0x48,
+	0xc5, 0x40, 0x21, 0x60, 0xc3, 0x4e, 0xa5, 0x62, 0x95, 0x2b, 0xc1, 0x63, 0x69, 0xae, 0x02, 0x90,
+	0xc8, 0x02, 0x94, 0x14, 0x1e, 0xb4, 0x5e, 0x00, 0x03, 0x70, 0xc9, 0xc5, 0xce, 0x7a, 0x77, 0x40,
+	0x89, 0x76, 0x74, 0x49, 0x7e, 0x42, 0x8e, 0xa9, 0xf2, 0x21, 0xe7, 0x1c, 0x72, 0xc8, 0x2d, 0xa9,
+	0x54, 0xa5, 0x2a, 0xf7, 0x1c, 0x7c, 0xcc, 0x2d, 0x95, 0x7f, 0x90, 0x3f, 0x90, 0x9a, 0xd9, 0xd9,
+	0xc5, 0x43, 0x10, 0x1e, 0x56, 0xf9, 0xb6, 0xd3, 0xfd, 0x75, 0x4f, 0x77, 0x4f, 0x4f, 0xf7, 0xf4,
+	0xc2, 0x61, 0x8f, 0x90, 0x9e, 0x8d, 0xf3, 0x6d, 0x9b, 0x0c, 0x3a, 0x79, 0x6a, 0xda, 0xd8, 0xa1,
+	0xf9, 0xeb, 0x8f, 0x5b, 0x98, 0x9a, 0x1f, 0xe6, 0x2f, 0x49, 0xcb, 0xf0, 0xb1, 0x77, 0x6d, 0xb5,
+	0x71, 0xce, 0xf5, 0x08, 0x25, 0x68, 0x2f, 0x80, 0xe7, 0x38, 0x3c, 0x17, 0xc0, 0x73, 0x02, 0x9e,
+	0x79, 0x4f, 0xe8, 0x32, 0x5d, 0x2b, 0x6f, 0x3a, 0x0e, 0xa1, 0x26, 0xb5, 0x88, 0xe3, 0x07, 0xa2,
+	0x99, 0x83, 0x59, 0x3b, 0xb5, 0x49, 0xbf, 0x4f, 0x1c, 0x81, 0xfc, 0xd1, 0x2c, 0x64, 0xd7, 0xb2,
+	0x29, 0xf6, 0x42, 0xa5, 0x0f, 0x67, 0x41, 0x2f, 0x2c, 0x9f, 0x92, 0x9e, 0x67, 0xf6, 0x05, 0xf8,
+	0xfe, 0x1c, 0x5f, 0x05, 0xec, 0x9e, 0x80, 0xd9, 0xc4, 0xe9, 0x79, 0x03, 0xc7, 0xb1, 0x9c, 0x5e,
+	0x9e, 0xb8, 0xd8, 0x1b, 0xf3, 0xe6, 0x07, 0x02, 0xc4, 0x57, 0xad, 0x41, 0x37, 0xdf, 0x19, 0x04,
+	0x00, 0xc1, 0xdf, 0x9b, 0xe4, 0xe3, 0xbe, 0x4b, 0x6f, 0x04, 0x73, 0x7f, 0x92, 0xd9, 0xb5, 0xb0,
+	0xdd, 0x31, 0xfa, 0xa6, 0x7f, 0x15, 0x20, 0x94, 0xe7, 0x20, 0x97, 0x3d, 0x6c, 0x52, 0xfc, 0x98,
+	0xb4, 0x74, 0xfc, 0xc5, 0x00, 0xfb, 0x14, 0xdd, 0x86, 0x75, 0xd7, 0xf4, 0xb0, 0x43, 0xd3, 0xd2,
+	0xbe, 0x74, 0x90, 0xd0, 0xc5, 0x0a, 0x15, 0x60, 0xe5, 0x92, 0xb4, 0xd2, 0xb1, 0x7d, 0xe9, 0x20,
+	0x59, 0xd8, 0xcf, 0xcd, 0x38, 0xa1, 0x1c, 0xd3, 0xc6, 0xc0, 0xca, 0x3d, 0xd8, 0xfa, 0x0c, 0xd3,
+	0x11, 0xe5, 0x08, 0x56, 0x1d, 0xb3, 0x8f, 0x85, 0x6a, 0xfe, 0xad, 0xfc, 0x4e, 0x02, 0xf9, 0xcc,
+	0xed, 0x8c, 0x5b, 0x21, 0x76, 0x93, 0x96, 0xd8, 0x0d, 0x3d, 0x82, 0xe4, 0x80, 0xeb, 0xe1, 0x2e,
+	0x0a, 0x4b, 0x33, 0xa1, 0x6c, 0x18, 0x85, 0xdc, 0x11, 0x8b, 0x42, 0xcd, 0xf4, 0xaf, 0x74, 0x08,
+	0xe0, 0xec, 0x5b, 0x79, 0x00, 0x72, 0x05, 0xdb, 0x78, 0xcc, 0x88, 0x69, 0xd6, 0x1e, 0xc3, 0xed,
+	0x92, 0x49, 0xdb, 0x17, 0x11, 0xd8, 0x9f, 0x17, 0xb8, 0xdb, 0xb0, 0x1e, 0x64, 0x13, 0xb7, 0x28,
+	0xa1, 0x8b, 0x95, 0xf2, 0x77, 0x09, 0x52, 0x55, 0xcb, 0xa7, 0x6f, 0xa1, 0x03, 0x7d, 0x1f, 0xc0,
+	0x35, 0x7b, 0xd8, 0xa0, 0xe4, 0x0a, 0x3b, 0xe9, 0x15, 0xce, 0x4b, 0x30, 0x4a, 0x93, 0x11, 0xd0,
+	0x1e, 0xf0, 0x85, 0xe1, 0x5b, 0x5f, 0xe2, 0xf4, 0xea, 0xbe, 0x74, 0xb0, 0xa6, 0xc7, 0x19, 0xa1,
+	0x61, 0x7d, 0x89, 0xd1, 0xcf, 0x21, 0xce, 0x6e, 0xde, 0xb5, 0x85, 0x5f, 0xa4, 0xd7, 0xf6, 0xa5,
+	0x83, 0xed, 0xc2, 0x0f, 0xe7, 0xc5, 0xf9, 0x89, 0x85, 0x5f, 0xe8, 0x1b, 0x97, 0xc1, 0x87, 0xf2,
+	0x57, 0x09, 0xe4, 0xa1, 0x03, 0xbe, 0x4b, 0x1c, 0x1f, 0xa3, 0x8f, 0x61, 0xf5, 0x92, 0xb4, 0xfc,
+	0xb4, 0xb4, 0xbf, 0xb2, 0xd0, 0xc9, 0x71, 0x34, 0x7a, 0x00, 0x29, 0x07, 0xbf, 0xa4, 0xc6, 0x88,
+	0x33, 0x81, 0xa3, 0x5b, 0x8c, 0x5c, 0x8f, 0x1c, 0xd2, 0x20, 0xde, 0xc7, 0xd4, 0xec, 0x98, 0xd4,
+	0xe4, 0xde, 0x26, 0x0b, 0x87, 0x33, 0x77, 0x08, 0xcd, 0xaa, 0x09, 0x21, 0x3d, 0x12, 0x57, 0xbe,
+	0x4e, 0xc2, 0x4e, 0x03, 0x9b, 0x5e, 0xfb, 0x62, 0x91, 0x03, 0x38, 0x87, 0xa4, 0xcf, 0xc1, 0x46,
+	0x9f, 0x74, 0x30, 0x37, 0x6e, 0xbb, 0xf0, 0xb3, 0x99, 0x7b, 0xbf, 0xa6, 0x5c, 0x50, 0x6a, 0xa4,
+	0x83, 0x75, 0xf0, 0xa3, 0x6f, 0xf4, 0x14, 0x64, 0x2f, 0x40, 0x18, 0x13, 0xce, 0xfd, 0x78, 0x8e,
+	0x73, 0x5c, 0x28, 0xf2, 0x2d, 0xe5, 0x8d, 0x13, 0x50, 0x09, 0x12, 0xec, 0x84, 0xbf, 0x18, 0x60,
+	0xef, 0x86, 0x1f, 0x7f, 0xb2, 0x70, 0x7f, 0xde, 0x81, 0xfc, 0x8a, 0x81, 0x75, 0x96, 0x19, 0xfc,
+	0x0b, 0x3d, 0x84, 0x1d, 0xec, 0x98, 0x2d, 0x1b, 0x1b, 0x2d, 0x8f, 0x98, 0x1d, 0xcc, 0xea, 0x14,
+	0x4f, 0x97, 0xb8, 0x2e, 0x07, 0x8c, 0x52, 0x44, 0x47, 0x9f, 0xc2, 0x1e, 0xb3, 0xc1, 0xf2, 0xb0,
+	0xe1, 0x7a, 0xb8, 0x6d, 0xf9, 0xd8, 0xf0, 0xb0, 0x3f, 0xb0, 0x69, 0x90, 0x81, 0xeb, 0x5c, 0x2c,
+	0x2d, 0x20, 0xf5, 0x00, 0xa1, 0x73, 0x00, 0xcf, 0xc8, 0x67, 0xb0, 0x13, 0x15, 0x53, 0x6e, 0xb5,
+	0x85, 0xfd, 0xf4, 0x06, 0x4f, 0xa4, 0x87, 0x33, 0xed, 0x3e, 0x0e, 0xa5, 0x02, 0xeb, 0xe5, 0x8b,
+	0xd1, 0xb5, 0x85, 0xfd, 0xb1, 0x5c, 0x8f, 0x7f, 0x8b, 0x5c, 0x67, 0x79, 0x41, 0xba, 0x5d, 0x1f,
+	0xd3, 0x74, 0x82, 0x5f, 0x23, 0xb1, 0x1a, 0xbf, 0x61, 0x30, 0x71, 0xc3, 0xc6, 0x6f, 0x67, 0x72,
+	0xf2, 0x76, 0xbe, 0x0b, 0x71, 0xe2, 0x75, 0xb0, 0x67, 0xb4, 0x6e, 0xd2, 0x9b, 0x9c, 0xb9, 0xc1,
+	0xd7, 0xa5, 0x1b, 0xf4, 0x12, 0xde, 0xe9, 0x58, 0xd7, 0xd8, 0xf3, 0xad, 0xae, 0xd5, 0xe6, 0x05,
+	0xdf, 0xb0, 0xf1, 0x35, 0xb6, 0xd3, 0x5b, 0xdc, 0xf8, 0xf2, 0x92, 0x89, 0x57, 0x19, 0xd7, 0x55,
+	0x65, 0xaa, 0xf4, 0xdd, 0xce, 0x14, 0x2a, 0x72, 0xe1, 0x56, 0x7b, 0xe0, 0x53, 0xd2, 0x37, 0x3c,
+	0xd3, 0xb9, 0xb2, 0x9c, 0x9e, 0x61, 0x39, 0x5d, 0x92, 0xde, 0xe6, 0xd9, 0xf3, 0x8b, 0x25, 0xf7,
+	0x2d, 0x73, 0x4d, 0x7a, 0xa0, 0x48, 0x73, 0xba, 0x44, 0xdf, 0x69, 0x4f, 0x92, 0x50, 0x81, 0xf9,
+	0xea, 0xf3, 0x14, 0xbb, 0xc2, 0x37, 0x2f, 0x88, 0xc7, 0x5a, 0x14, 0x6d, 0x5f, 0xa4, 0x65, 0x9e,
+	0x2e, 0xb7, 0x04, 0xf3, 0x97, 0x01, 0xaf, 0xc6, 0x58, 0x99, 0xbf, 0xc4, 0x60, 0xe7, 0x35, 0xe5,
+	0xe8, 0x2b, 0x90, 0xad, 0xbe, 0x4b, 0x3c, 0x6a, 0x3a, 0x6d, 0x2c, 0x02, 0x26, 0xf1, 0x80, 0xd5,
+	0xdf, 0xd6, 0xf0, 0x9c, 0x16, 0x29, 0x0e, 0xa2, 0x97, 0xb2, 0xc6, 0x09, 0xe8, 0x10, 0x50, 0x18,
+	0x31, 0xfc, 0xd2, 0xf5, 0xb0, 0xef, 0x5b, 0x24, 0xac, 0x62, 0x3b, 0x82, 0xa3, 0x46, 0x0c, 0xc5,
+	0x87, 0xd4, 0x84, 0x4a, 0xb4, 0x0f, 0xef, 0x69, 0xb5, 0xfa, 0xa9, 0xde, 0x2c, 0x9e, 0x94, 0x55,
+	0xa3, 0xaa, 0x3e, 0x51, 0xab, 0xc6, 0xd9, 0x49, 0xa3, 0xae, 0x96, 0xb5, 0x23, 0x4d, 0xad, 0xc8,
+	0xdf, 0x43, 0x71, 0x58, 0x3d, 0x39, 0x3d, 0x51, 0x65, 0x09, 0x6d, 0xc0, 0x4a, 0xf5, 0xf4, 0xa9,
+	0x1c, 0x63, 0xa4, 0x9a, 0x56, 0xad, 0xc8, 0x2b, 0x08, 0x60, 0xbd, 0xa6, 0x56, 0xb4, 0xb3, 0x9a,
+	0xbc, 0xca, 0xa8, 0xc7, 0xda, 0x67, 0xc7, 0xf2, 0x1a, 0x4a, 0xc2, 0x86, 0xfa, 0xac, 0xa9, 0xab,
+	0x35, 0x55, 0x5e, 0x57, 0x74, 0x80, 0x61, 0x0d, 0x42, 0x7b, 0x70, 0xa7, 0xa1, 0x16, 0xf5, 0xf2,
+	0xb1, 0x51, 0x3b, 0xad, 0xa8, 0x13, 0x5b, 0x6d, 0x03, 0x3c, 0x3e, 0x2d, 0x19, 0x01, 0x40, 0x96,
+	0xd0, 0x1d, 0xb8, 0x75, 0xa4, 0x16, 0x9b, 0x67, 0xba, 0x5a, 0x31, 0x46, 0x18, 0x31, 0xe5, 0x29,
+	0xec, 0x4e, 0x4b, 0x2f, 0x74, 0x1f, 0xee, 0x56, 0xb4, 0x27, 0xaa, 0xde, 0xd0, 0x8e, 0xb4, 0x72,
+	0xb1, 0xa9, 0x9d, 0x9e, 0x4c, 0x75, 0x69, 0x13, 0xe2, 0x15, 0xad, 0x51, 0x2c, 0x55, 0xd5, 0x8a,
+	0x2c, 0x31, 0x1f, 0x1a, 0x5a, 0xad, 0x5e, 0x55, 0xe5, 0x98, 0xf2, 0xaf, 0x38, 0xa0, 0xd1, 0x93,
+	0x11, 0x0d, 0xe6, 0x73, 0xd8, 0xe2, 0xe9, 0xc1, 0x02, 0x3d, 0xd2, 0x69, 0x1e, 0x2d, 0x7c, 0xc2,
+	0x81, 0x9e, 0x5c, 0x4d, 0x28, 0x61, 0x4d, 0x68, 0xb3, 0x3f, 0x5c, 0xf8, 0xc8, 0x82, 0x3b, 0xe3,
+	0x65, 0xe8, 0x46, 0x54, 0x31, 0x3f, 0x1d, 0xe3, 0x7b, 0x7d, 0xb8, 0x4c, 0x31, 0xe2, 0x92, 0xfa,
+	0x3b, 0x17, 0x53, 0xa8, 0x53, 0xfb, 0xde, 0xca, 0xb4, 0xbe, 0x57, 0x07, 0xd9, 0x26, 0xa2, 0x10,
+	0x88, 0xa7, 0x69, 0x7a, 0x95, 0xdb, 0x32, 0xbb, 0xa0, 0x57, 0x85, 0x90, 0x9e, 0x0a, 0xc5, 0x8f,
+	0x02, 0x69, 0xf4, 0x01, 0xec, 0x62, 0x9f, 0x5a, 0x7d, 0x93, 0xe2, 0x8e, 0x41, 0x09, 0x35, 0xed,
+	0xa0, 0x86, 0xad, 0xf1, 0x1a, 0x86, 0x22, 0x5e, 0x93, 0xb1, 0xc2, 0x6a, 0x36, 0x82, 0x5b, 0xe7,
+	0xb8, 0x04, 0x8d, 0xd8, 0xa3, 0xad, 0x79, 0xe3, 0xad, 0x5a, 0x33, 0x7a, 0x04, 0x19, 0xd1, 0x6c,
+	0x70, 0x47, 0x1c, 0x00, 0x3b, 0x69, 0xa3, 0x4d, 0x06, 0x0e, 0xe5, 0xf5, 0x7b, 0x4d, 0xbf, 0x13,
+	0x21, 0x78, 0x40, 0xd9, 0xc1, 0x95, 0x19, 0x1b, 0x9d, 0x83, 0xec, 0xbb, 0xd8, 0xb6, 0x8d, 0x36,
+	0xf1, 0x3c, 0xdc, 0x66, 0x3e, 0xf3, 0x9a, 0x9d, 0x2c, 0xe4, 0x67, 0xa7, 0x08, 0x13, 0xb2, 0x9c,
+	0x5e, 0x39, 0x12, 0xd3, 0x53, 0x5c, 0xd1, 0x90, 0x90, 0xf9, 0x3a, 0x06, 0xc9, 0x91, 0xbc, 0xf9,
+	0x56, 0xaf, 0xd4, 0xf7, 0x21, 0xc9, 0x07, 0x9e, 0x41, 0xbf, 0x6f, 0x7a, 0x37, 0xa2, 0x40, 0xc0,
+	0x25, 0x69, 0x35, 0x02, 0x0a, 0xca, 0xc2, 0x0e, 0x03, 0x50, 0x8b, 0xda, 0xd8, 0xf0, 0x1d, 0xcb,
+	0x75, 0x31, 0x15, 0x59, 0x91, 0xba, 0x24, 0xad, 0x26, 0xa3, 0x37, 0x02, 0x32, 0xca, 0xc1, 0x2d,
+	0xf1, 0x2c, 0xa1, 0x2c, 0x8d, 0x42, 0xf4, 0x6a, 0x50, 0x75, 0x02, 0x56, 0x13, 0xbf, 0xa4, 0x21,
+	0xfe, 0x39, 0x6c, 0xb2, 0x19, 0x68, 0x40, 0x71, 0x50, 0xd6, 0xd7, 0xb8, 0xe5, 0x4b, 0xdf, 0x9d,
+	0x72, 0xa0, 0x83, 0x57, 0xf4, 0x64, 0x7b, 0xb8, 0xc8, 0xfc, 0x41, 0x82, 0xe4, 0x08, 0x13, 0x1d,
+	0xc3, 0x26, 0xf3, 0x25, 0x4c, 0x3e, 0x11, 0xa9, 0x05, 0x73, 0x96, 0xc5, 0x29, 0x5c, 0xa0, 0x12,
+	0xa4, 0xa8, 0x67, 0x5e, 0x63, 0xdb, 0x08, 0x47, 0x20, 0xf1, 0xc0, 0x7f, 0xf7, 0xb5, 0x07, 0x7e,
+	0x45, 0x00, 0xf4, 0xed, 0x40, 0x22, 0x5c, 0x67, 0xaf, 0x61, 0x43, 0x34, 0x76, 0x94, 0x86, 0x5d,
+	0x56, 0xc5, 0x9e, 0x68, 0xea, 0xd3, 0x89, 0x82, 0xb4, 0x0b, 0x72, 0xc4, 0xd1, 0x2a, 0xc6, 0xe9,
+	0x49, 0xf5, 0xd7, 0xb2, 0x34, 0x46, 0xad, 0x69, 0x27, 0x5a, 0xad, 0x58, 0x95, 0x63, 0x08, 0xc1,
+	0x76, 0x44, 0x6d, 0xd4, 0x8a, 0xd5, 0xaa, 0xbc, 0x82, 0x76, 0x60, 0x2b, 0xa2, 0x1d, 0x9d, 0x55,
+	0xab, 0xf2, 0x6a, 0xe1, 0x3f, 0x9b, 0x00, 0x8f, 0x49, 0xab, 0x11, 0xcc, 0xb8, 0xe8, 0x6f, 0x12,
+	0x24, 0xa2, 0xb1, 0x0b, 0xcd, 0xbe, 0x25, 0x93, 0xe3, 0x59, 0x66, 0x6e, 0x96, 0x29, 0xcf, 0x7f,
+	0xfb, 0xcd, 0x7f, 0x7f, 0x1f, 0x7b, 0xa6, 0x3c, 0x8c, 0x86, 0xce, 0xaf, 0x82, 0x47, 0xec, 0xa7,
+	0xae, 0x47, 0x2e, 0x71, 0x9b, 0xfa, 0xf9, 0x6c, 0x9e, 0x62, 0xc7, 0x74, 0xd8, 0xd7, 0x2b, 0x36,
+	0x92, 0xfa, 0x9f, 0x48, 0xd9, 0xf3, 0x07, 0xca, 0xdd, 0x19, 0x12, 0x11, 0x0e, 0xfd, 0x59, 0x82,
+	0xf5, 0x60, 0xaa, 0x43, 0xd9, 0x99, 0xc6, 0x8c, 0x8d, 0x7e, 0x0b, 0x18, 0xfe, 0x8c, 0x1b, 0xae,
+	0xa3, 0x11, 0xc3, 0xd9, 0xc8, 0x35, 0xd5, 0x6c, 0x6e, 0x4d, 0x3e, 0xfb, 0xea, 0xfc, 0x1e, 0xba,
+	0xfb, 0x66, 0xb8, 0x00, 0xa1, 0x7f, 0x4a, 0x90, 0x88, 0x46, 0xcc, 0x39, 0x11, 0x9f, 0x1c, 0x45,
+	0x17, 0x30, 0xbc, 0xcb, 0x0d, 0xff, 0xbc, 0x90, 0x1f, 0x5a, 0xc2, 0xe6, 0xfc, 0xb9, 0xc6, 0xb3,
+	0xa8, 0x67, 0x0b, 0xf7, 0x67, 0x4b, 0x0d, 0xb1, 0xe8, 0x4f, 0x12, 0x24, 0xa2, 0xb9, 0x73, 0x8e,
+	0x1b, 0x93, 0xc3, 0x6c, 0xe6, 0xf6, 0x6b, 0xf7, 0x44, 0xed, 0xbb, 0xf4, 0x26, 0x8c, 0x7a, 0x76,
+	0xb9, 0xa8, 0x67, 0x17, 0x88, 0xfa, 0x3f, 0x24, 0x88, 0x87, 0xf3, 0x21, 0x9a, 0x3d, 0xca, 0x4c,
+	0xcc, 0xc1, 0x99, 0xc3, 0x05, 0xd1, 0x41, 0x3d, 0x9a, 0x96, 0x39, 0x73, 0x53, 0x7e, 0x3c, 0x73,
+	0xde, 0x90, 0xef, 0xe8, 0x1b, 0x09, 0x52, 0x13, 0xf3, 0x3e, 0xfa, 0x68, 0xa6, 0x71, 0xd3, 0xff,
+	0x0e, 0xbc, 0x31, 0xfc, 0x3e, 0x37, 0xbd, 0xaf, 0xfc, 0x74, 0x99, 0xdb, 0xda, 0x1a, 0xee, 0xc1,
+	0x72, 0x28, 0xaf, 0x1c, 0xce, 0xbf, 0xb9, 0x23, 0x32, 0xe8, 0xdf, 0x52, 0xf8, 0x10, 0xe4, 0x0e,
+	0xe5, 0x96, 0x7b, 0x1d, 0x67, 0xf2, 0x4b, 0xf6, 0x0b, 0xc5, 0xe6, 0x4e, 0x76, 0x95, 0xc2, 0x32,
+	0x4e, 0x06, 0xdd, 0x8b, 0xf9, 0x77, 0xa8, 0x1c, 0xcc, 0xf7, 0x2f, 0x82, 0xa3, 0xff, 0x49, 0xa3,
+	0x0f, 0xc7, 0x23, 0xe2, 0x15, 0x6d, 0xec, 0xd1, 0xef, 0xde, 0xcb, 0xdf, 0x70, 0x2f, 0xaf, 0x95,
+	0x4f, 0x96, 0xf7, 0x32, 0x34, 0x92, 0x79, 0xfb, 0x13, 0xe5, 0x83, 0x45, 0xbd, 0x1d, 0x11, 0x2b,
+	0xbd, 0x82, 0xf7, 0xdb, 0xa4, 0x3f, 0xcb, 0xe6, 0x52, 0x6a, 0xd8, 0x84, 0xea, 0x2c, 0x0b, 0xeb,
+	0xd2, 0x79, 0x51, 0xe0, 0x7b, 0xc4, 0x36, 0x9d, 0x5e, 0x8e, 0x78, 0xbd, 0x7c, 0x0f, 0x3b, 0x3c,
+	0x47, 0xf3, 0x01, 0xcb, 0x74, 0x2d, 0x7f, 0xea, 0xbf, 0xcc, 0x47, 0xc1, 0xf2, 0x8f, 0xb1, 0x95,
+	0x72, 0xb3, 0xd1, 0x5a, 0xe7, 0x32, 0x1f, 0xfd, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xe3, 0x18,
+	0x53, 0xea, 0x15, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1801,128 +1946,3 @@ var _JobService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/talent/v4beta1/job_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/job_service.proto", fileDescriptor_job_service_461eee9b2ad19a52)
-}
-
-var fileDescriptor_job_service_461eee9b2ad19a52 = []byte{
-	// 1861 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x73, 0x1b, 0xc7,
-	0x11, 0xce, 0x82, 0x2f, 0xa0, 0x41, 0x12, 0xcb, 0x11, 0x2d, 0xc1, 0xa0, 0x13, 0x53, 0xab, 0x48,
-	0xc5, 0x40, 0x21, 0x60, 0xc3, 0x4e, 0xa5, 0x62, 0x95, 0x2b, 0xc1, 0x63, 0x69, 0xae, 0x02, 0x90,
-	0xc8, 0x02, 0x94, 0x14, 0x1e, 0xb4, 0x5e, 0x00, 0x03, 0x70, 0xc9, 0xc5, 0xce, 0x7a, 0x77, 0x40,
-	0x89, 0x76, 0x74, 0x49, 0x7e, 0x42, 0x8e, 0xa9, 0xf2, 0x21, 0xe7, 0x1c, 0x72, 0xc8, 0x2d, 0xa9,
-	0x54, 0xa5, 0x2a, 0xf7, 0x1c, 0x7c, 0xcc, 0x2d, 0x95, 0x7f, 0x90, 0x3f, 0x90, 0x9a, 0xd9, 0xd9,
-	0xc5, 0x43, 0x10, 0x1e, 0x56, 0xf9, 0xb6, 0xd3, 0xfd, 0x75, 0x4f, 0x77, 0x4f, 0x4f, 0xf7, 0xf4,
-	0xc2, 0x61, 0x8f, 0x90, 0x9e, 0x8d, 0xf3, 0x6d, 0x9b, 0x0c, 0x3a, 0x79, 0x6a, 0xda, 0xd8, 0xa1,
-	0xf9, 0xeb, 0x8f, 0x5b, 0x98, 0x9a, 0x1f, 0xe6, 0x2f, 0x49, 0xcb, 0xf0, 0xb1, 0x77, 0x6d, 0xb5,
-	0x71, 0xce, 0xf5, 0x08, 0x25, 0x68, 0x2f, 0x80, 0xe7, 0x38, 0x3c, 0x17, 0xc0, 0x73, 0x02, 0x9e,
-	0x79, 0x4f, 0xe8, 0x32, 0x5d, 0x2b, 0x6f, 0x3a, 0x0e, 0xa1, 0x26, 0xb5, 0x88, 0xe3, 0x07, 0xa2,
-	0x99, 0x83, 0x59, 0x3b, 0xb5, 0x49, 0xbf, 0x4f, 0x1c, 0x81, 0xfc, 0xd1, 0x2c, 0x64, 0xd7, 0xb2,
-	0x29, 0xf6, 0x42, 0xa5, 0x0f, 0x67, 0x41, 0x2f, 0x2c, 0x9f, 0x92, 0x9e, 0x67, 0xf6, 0x05, 0xf8,
-	0xfe, 0x1c, 0x5f, 0x05, 0xec, 0x9e, 0x80, 0xd9, 0xc4, 0xe9, 0x79, 0x03, 0xc7, 0xb1, 0x9c, 0x5e,
-	0x9e, 0xb8, 0xd8, 0x1b, 0xf3, 0xe6, 0x07, 0x02, 0xc4, 0x57, 0xad, 0x41, 0x37, 0xdf, 0x19, 0x04,
-	0x00, 0xc1, 0xdf, 0x9b, 0xe4, 0xe3, 0xbe, 0x4b, 0x6f, 0x04, 0x73, 0x7f, 0x92, 0xd9, 0xb5, 0xb0,
-	0xdd, 0x31, 0xfa, 0xa6, 0x7f, 0x15, 0x20, 0x94, 0xe7, 0x20, 0x97, 0x3d, 0x6c, 0x52, 0xfc, 0x98,
-	0xb4, 0x74, 0xfc, 0xc5, 0x00, 0xfb, 0x14, 0xdd, 0x86, 0x75, 0xd7, 0xf4, 0xb0, 0x43, 0xd3, 0xd2,
-	0xbe, 0x74, 0x90, 0xd0, 0xc5, 0x0a, 0x15, 0x60, 0xe5, 0x92, 0xb4, 0xd2, 0xb1, 0x7d, 0xe9, 0x20,
-	0x59, 0xd8, 0xcf, 0xcd, 0x38, 0xa1, 0x1c, 0xd3, 0xc6, 0xc0, 0xca, 0x3d, 0xd8, 0xfa, 0x0c, 0xd3,
-	0x11, 0xe5, 0x08, 0x56, 0x1d, 0xb3, 0x8f, 0x85, 0x6a, 0xfe, 0xad, 0xfc, 0x4e, 0x02, 0xf9, 0xcc,
-	0xed, 0x8c, 0x5b, 0x21, 0x76, 0x93, 0x96, 0xd8, 0x0d, 0x3d, 0x82, 0xe4, 0x80, 0xeb, 0xe1, 0x2e,
-	0x0a, 0x4b, 0x33, 0xa1, 0x6c, 0x18, 0x85, 0xdc, 0x11, 0x8b, 0x42, 0xcd, 0xf4, 0xaf, 0x74, 0x08,
-	0xe0, 0xec, 0x5b, 0x79, 0x00, 0x72, 0x05, 0xdb, 0x78, 0xcc, 0x88, 0x69, 0xd6, 0x1e, 0xc3, 0xed,
-	0x92, 0x49, 0xdb, 0x17, 0x11, 0xd8, 0x9f, 0x17, 0xb8, 0xdb, 0xb0, 0x1e, 0x64, 0x13, 0xb7, 0x28,
-	0xa1, 0x8b, 0x95, 0xf2, 0x77, 0x09, 0x52, 0x55, 0xcb, 0xa7, 0x6f, 0xa1, 0x03, 0x7d, 0x1f, 0xc0,
-	0x35, 0x7b, 0xd8, 0xa0, 0xe4, 0x0a, 0x3b, 0xe9, 0x15, 0xce, 0x4b, 0x30, 0x4a, 0x93, 0x11, 0xd0,
-	0x1e, 0xf0, 0x85, 0xe1, 0x5b, 0x5f, 0xe2, 0xf4, 0xea, 0xbe, 0x74, 0xb0, 0xa6, 0xc7, 0x19, 0xa1,
-	0x61, 0x7d, 0x89, 0xd1, 0xcf, 0x21, 0xce, 0x6e, 0xde, 0xb5, 0x85, 0x5f, 0xa4, 0xd7, 0xf6, 0xa5,
-	0x83, 0xed, 0xc2, 0x0f, 0xe7, 0xc5, 0xf9, 0x89, 0x85, 0x5f, 0xe8, 0x1b, 0x97, 0xc1, 0x87, 0xf2,
-	0x57, 0x09, 0xe4, 0xa1, 0x03, 0xbe, 0x4b, 0x1c, 0x1f, 0xa3, 0x8f, 0x61, 0xf5, 0x92, 0xb4, 0xfc,
-	0xb4, 0xb4, 0xbf, 0xb2, 0xd0, 0xc9, 0x71, 0x34, 0x7a, 0x00, 0x29, 0x07, 0xbf, 0xa4, 0xc6, 0x88,
-	0x33, 0x81, 0xa3, 0x5b, 0x8c, 0x5c, 0x8f, 0x1c, 0xd2, 0x20, 0xde, 0xc7, 0xd4, 0xec, 0x98, 0xd4,
-	0xe4, 0xde, 0x26, 0x0b, 0x87, 0x33, 0x77, 0x08, 0xcd, 0xaa, 0x09, 0x21, 0x3d, 0x12, 0x57, 0xbe,
-	0x4e, 0xc2, 0x4e, 0x03, 0x9b, 0x5e, 0xfb, 0x62, 0x91, 0x03, 0x38, 0x87, 0xa4, 0xcf, 0xc1, 0x46,
-	0x9f, 0x74, 0x30, 0x37, 0x6e, 0xbb, 0xf0, 0xb3, 0x99, 0x7b, 0xbf, 0xa6, 0x5c, 0x50, 0x6a, 0xa4,
-	0x83, 0x75, 0xf0, 0xa3, 0x6f, 0xf4, 0x14, 0x64, 0x2f, 0x40, 0x18, 0x13, 0xce, 0xfd, 0x78, 0x8e,
-	0x73, 0x5c, 0x28, 0xf2, 0x2d, 0xe5, 0x8d, 0x13, 0x50, 0x09, 0x12, 0xec, 0x84, 0xbf, 0x18, 0x60,
-	0xef, 0x86, 0x1f, 0x7f, 0xb2, 0x70, 0x7f, 0xde, 0x81, 0xfc, 0x8a, 0x81, 0x75, 0x96, 0x19, 0xfc,
-	0x0b, 0x3d, 0x84, 0x1d, 0xec, 0x98, 0x2d, 0x1b, 0x1b, 0x2d, 0x8f, 0x98, 0x1d, 0xcc, 0xea, 0x14,
-	0x4f, 0x97, 0xb8, 0x2e, 0x07, 0x8c, 0x52, 0x44, 0x47, 0x9f, 0xc2, 0x1e, 0xb3, 0xc1, 0xf2, 0xb0,
-	0xe1, 0x7a, 0xb8, 0x6d, 0xf9, 0xd8, 0xf0, 0xb0, 0x3f, 0xb0, 0x69, 0x90, 0x81, 0xeb, 0x5c, 0x2c,
-	0x2d, 0x20, 0xf5, 0x00, 0xa1, 0x73, 0x00, 0xcf, 0xc8, 0x67, 0xb0, 0x13, 0x15, 0x53, 0x6e, 0xb5,
-	0x85, 0xfd, 0xf4, 0x06, 0x4f, 0xa4, 0x87, 0x33, 0xed, 0x3e, 0x0e, 0xa5, 0x02, 0xeb, 0xe5, 0x8b,
-	0xd1, 0xb5, 0x85, 0xfd, 0xb1, 0x5c, 0x8f, 0x7f, 0x8b, 0x5c, 0x67, 0x79, 0x41, 0xba, 0x5d, 0x1f,
-	0xd3, 0x74, 0x82, 0x5f, 0x23, 0xb1, 0x1a, 0xbf, 0x61, 0x30, 0x71, 0xc3, 0xc6, 0x6f, 0x67, 0x72,
-	0xf2, 0x76, 0xbe, 0x0b, 0x71, 0xe2, 0x75, 0xb0, 0x67, 0xb4, 0x6e, 0xd2, 0x9b, 0x9c, 0xb9, 0xc1,
-	0xd7, 0xa5, 0x1b, 0xf4, 0x12, 0xde, 0xe9, 0x58, 0xd7, 0xd8, 0xf3, 0xad, 0xae, 0xd5, 0xe6, 0x05,
-	0xdf, 0xb0, 0xf1, 0x35, 0xb6, 0xd3, 0x5b, 0xdc, 0xf8, 0xf2, 0x92, 0x89, 0x57, 0x19, 0xd7, 0x55,
-	0x65, 0xaa, 0xf4, 0xdd, 0xce, 0x14, 0x2a, 0x72, 0xe1, 0x56, 0x7b, 0xe0, 0x53, 0xd2, 0x37, 0x3c,
-	0xd3, 0xb9, 0xb2, 0x9c, 0x9e, 0x61, 0x39, 0x5d, 0x92, 0xde, 0xe6, 0xd9, 0xf3, 0x8b, 0x25, 0xf7,
-	0x2d, 0x73, 0x4d, 0x7a, 0xa0, 0x48, 0x73, 0xba, 0x44, 0xdf, 0x69, 0x4f, 0x92, 0x50, 0x81, 0xf9,
-	0xea, 0xf3, 0x14, 0xbb, 0xc2, 0x37, 0x2f, 0x88, 0xc7, 0x5a, 0x14, 0x6d, 0x5f, 0xa4, 0x65, 0x9e,
-	0x2e, 0xb7, 0x04, 0xf3, 0x97, 0x01, 0xaf, 0xc6, 0x58, 0x99, 0xbf, 0xc4, 0x60, 0xe7, 0x35, 0xe5,
-	0xe8, 0x2b, 0x90, 0xad, 0xbe, 0x4b, 0x3c, 0x6a, 0x3a, 0x6d, 0x2c, 0x02, 0x26, 0xf1, 0x80, 0xd5,
-	0xdf, 0xd6, 0xf0, 0x9c, 0x16, 0x29, 0x0e, 0xa2, 0x97, 0xb2, 0xc6, 0x09, 0xe8, 0x10, 0x50, 0x18,
-	0x31, 0xfc, 0xd2, 0xf5, 0xb0, 0xef, 0x5b, 0x24, 0xac, 0x62, 0x3b, 0x82, 0xa3, 0x46, 0x0c, 0xc5,
-	0x87, 0xd4, 0x84, 0x4a, 0xb4, 0x0f, 0xef, 0x69, 0xb5, 0xfa, 0xa9, 0xde, 0x2c, 0x9e, 0x94, 0x55,
-	0xa3, 0xaa, 0x3e, 0x51, 0xab, 0xc6, 0xd9, 0x49, 0xa3, 0xae, 0x96, 0xb5, 0x23, 0x4d, 0xad, 0xc8,
-	0xdf, 0x43, 0x71, 0x58, 0x3d, 0x39, 0x3d, 0x51, 0x65, 0x09, 0x6d, 0xc0, 0x4a, 0xf5, 0xf4, 0xa9,
-	0x1c, 0x63, 0xa4, 0x9a, 0x56, 0xad, 0xc8, 0x2b, 0x08, 0x60, 0xbd, 0xa6, 0x56, 0xb4, 0xb3, 0x9a,
-	0xbc, 0xca, 0xa8, 0xc7, 0xda, 0x67, 0xc7, 0xf2, 0x1a, 0x4a, 0xc2, 0x86, 0xfa, 0xac, 0xa9, 0xab,
-	0x35, 0x55, 0x5e, 0x57, 0x74, 0x80, 0x61, 0x0d, 0x42, 0x7b, 0x70, 0xa7, 0xa1, 0x16, 0xf5, 0xf2,
-	0xb1, 0x51, 0x3b, 0xad, 0xa8, 0x13, 0x5b, 0x6d, 0x03, 0x3c, 0x3e, 0x2d, 0x19, 0x01, 0x40, 0x96,
-	0xd0, 0x1d, 0xb8, 0x75, 0xa4, 0x16, 0x9b, 0x67, 0xba, 0x5a, 0x31, 0x46, 0x18, 0x31, 0xe5, 0x29,
-	0xec, 0x4e, 0x4b, 0x2f, 0x74, 0x1f, 0xee, 0x56, 0xb4, 0x27, 0xaa, 0xde, 0xd0, 0x8e, 0xb4, 0x72,
-	0xb1, 0xa9, 0x9d, 0x9e, 0x4c, 0x75, 0x69, 0x13, 0xe2, 0x15, 0xad, 0x51, 0x2c, 0x55, 0xd5, 0x8a,
-	0x2c, 0x31, 0x1f, 0x1a, 0x5a, 0xad, 0x5e, 0x55, 0xe5, 0x98, 0xf2, 0xaf, 0x38, 0xa0, 0xd1, 0x93,
-	0x11, 0x0d, 0xe6, 0x73, 0xd8, 0xe2, 0xe9, 0xc1, 0x02, 0x3d, 0xd2, 0x69, 0x1e, 0x2d, 0x7c, 0xc2,
-	0x81, 0x9e, 0x5c, 0x4d, 0x28, 0x61, 0x4d, 0x68, 0xb3, 0x3f, 0x5c, 0xf8, 0xc8, 0x82, 0x3b, 0xe3,
-	0x65, 0xe8, 0x46, 0x54, 0x31, 0x3f, 0x1d, 0xe3, 0x7b, 0x7d, 0xb8, 0x4c, 0x31, 0xe2, 0x92, 0xfa,
-	0x3b, 0x17, 0x53, 0xa8, 0x53, 0xfb, 0xde, 0xca, 0xb4, 0xbe, 0x57, 0x07, 0xd9, 0x26, 0xa2, 0x10,
-	0x88, 0xa7, 0x69, 0x7a, 0x95, 0xdb, 0x32, 0xbb, 0xa0, 0x57, 0x85, 0x90, 0x9e, 0x0a, 0xc5, 0x8f,
-	0x02, 0x69, 0xf4, 0x01, 0xec, 0x62, 0x9f, 0x5a, 0x7d, 0x93, 0xe2, 0x8e, 0x41, 0x09, 0x35, 0xed,
-	0xa0, 0x86, 0xad, 0xf1, 0x1a, 0x86, 0x22, 0x5e, 0x93, 0xb1, 0xc2, 0x6a, 0x36, 0x82, 0x5b, 0xe7,
-	0xb8, 0x04, 0x8d, 0xd8, 0xa3, 0xad, 0x79, 0xe3, 0xad, 0x5a, 0x33, 0x7a, 0x04, 0x19, 0xd1, 0x6c,
-	0x70, 0x47, 0x1c, 0x00, 0x3b, 0x69, 0xa3, 0x4d, 0x06, 0x0e, 0xe5, 0xf5, 0x7b, 0x4d, 0xbf, 0x13,
-	0x21, 0x78, 0x40, 0xd9, 0xc1, 0x95, 0x19, 0x1b, 0x9d, 0x83, 0xec, 0xbb, 0xd8, 0xb6, 0x8d, 0x36,
-	0xf1, 0x3c, 0xdc, 0x66, 0x3e, 0xf3, 0x9a, 0x9d, 0x2c, 0xe4, 0x67, 0xa7, 0x08, 0x13, 0xb2, 0x9c,
-	0x5e, 0x39, 0x12, 0xd3, 0x53, 0x5c, 0xd1, 0x90, 0x90, 0xf9, 0x3a, 0x06, 0xc9, 0x91, 0xbc, 0xf9,
-	0x56, 0xaf, 0xd4, 0xf7, 0x21, 0xc9, 0x07, 0x9e, 0x41, 0xbf, 0x6f, 0x7a, 0x37, 0xa2, 0x40, 0xc0,
-	0x25, 0x69, 0x35, 0x02, 0x0a, 0xca, 0xc2, 0x0e, 0x03, 0x50, 0x8b, 0xda, 0xd8, 0xf0, 0x1d, 0xcb,
-	0x75, 0x31, 0x15, 0x59, 0x91, 0xba, 0x24, 0xad, 0x26, 0xa3, 0x37, 0x02, 0x32, 0xca, 0xc1, 0x2d,
-	0xf1, 0x2c, 0xa1, 0x2c, 0x8d, 0x42, 0xf4, 0x6a, 0x50, 0x75, 0x02, 0x56, 0x13, 0xbf, 0xa4, 0x21,
-	0xfe, 0x39, 0x6c, 0xb2, 0x19, 0x68, 0x40, 0x71, 0x50, 0xd6, 0xd7, 0xb8, 0xe5, 0x4b, 0xdf, 0x9d,
-	0x72, 0xa0, 0x83, 0x57, 0xf4, 0x64, 0x7b, 0xb8, 0xc8, 0xfc, 0x41, 0x82, 0xe4, 0x08, 0x13, 0x1d,
-	0xc3, 0x26, 0xf3, 0x25, 0x4c, 0x3e, 0x11, 0xa9, 0x05, 0x73, 0x96, 0xc5, 0x29, 0x5c, 0xa0, 0x12,
-	0xa4, 0xa8, 0x67, 0x5e, 0x63, 0xdb, 0x08, 0x47, 0x20, 0xf1, 0xc0, 0x7f, 0xf7, 0xb5, 0x07, 0x7e,
-	0x45, 0x00, 0xf4, 0xed, 0x40, 0x22, 0x5c, 0x67, 0xaf, 0x61, 0x43, 0x34, 0x76, 0x94, 0x86, 0x5d,
-	0x56, 0xc5, 0x9e, 0x68, 0xea, 0xd3, 0x89, 0x82, 0xb4, 0x0b, 0x72, 0xc4, 0xd1, 0x2a, 0xc6, 0xe9,
-	0x49, 0xf5, 0xd7, 0xb2, 0x34, 0x46, 0xad, 0x69, 0x27, 0x5a, 0xad, 0x58, 0x95, 0x63, 0x08, 0xc1,
-	0x76, 0x44, 0x6d, 0xd4, 0x8a, 0xd5, 0xaa, 0xbc, 0x82, 0x76, 0x60, 0x2b, 0xa2, 0x1d, 0x9d, 0x55,
-	0xab, 0xf2, 0x6a, 0xe1, 0x3f, 0x9b, 0x00, 0x8f, 0x49, 0xab, 0x11, 0xcc, 0xb8, 0xe8, 0x6f, 0x12,
-	0x24, 0xa2, 0xb1, 0x0b, 0xcd, 0xbe, 0x25, 0x93, 0xe3, 0x59, 0x66, 0x6e, 0x96, 0x29, 0xcf, 0x7f,
-	0xfb, 0xcd, 0x7f, 0x7f, 0x1f, 0x7b, 0xa6, 0x3c, 0x8c, 0x86, 0xce, 0xaf, 0x82, 0x47, 0xec, 0xa7,
-	0xae, 0x47, 0x2e, 0x71, 0x9b, 0xfa, 0xf9, 0x6c, 0x9e, 0x62, 0xc7, 0x74, 0xd8, 0xd7, 0x2b, 0x36,
-	0x92, 0xfa, 0x9f, 0x48, 0xd9, 0xf3, 0x07, 0xca, 0xdd, 0x19, 0x12, 0x11, 0x0e, 0xfd, 0x59, 0x82,
-	0xf5, 0x60, 0xaa, 0x43, 0xd9, 0x99, 0xc6, 0x8c, 0x8d, 0x7e, 0x0b, 0x18, 0xfe, 0x8c, 0x1b, 0xae,
-	0xa3, 0x11, 0xc3, 0xd9, 0xc8, 0x35, 0xd5, 0x6c, 0x6e, 0x4d, 0x3e, 0xfb, 0xea, 0xfc, 0x1e, 0xba,
-	0xfb, 0x66, 0xb8, 0x00, 0xa1, 0x7f, 0x4a, 0x90, 0x88, 0x46, 0xcc, 0x39, 0x11, 0x9f, 0x1c, 0x45,
-	0x17, 0x30, 0xbc, 0xcb, 0x0d, 0xff, 0xbc, 0x90, 0x1f, 0x5a, 0xc2, 0xe6, 0xfc, 0xb9, 0xc6, 0xb3,
-	0xa8, 0x67, 0x0b, 0xf7, 0x67, 0x4b, 0x0d, 0xb1, 0xe8, 0x4f, 0x12, 0x24, 0xa2, 0xb9, 0x73, 0x8e,
-	0x1b, 0x93, 0xc3, 0x6c, 0xe6, 0xf6, 0x6b, 0xf7, 0x44, 0xed, 0xbb, 0xf4, 0x26, 0x8c, 0x7a, 0x76,
-	0xb9, 0xa8, 0x67, 0x17, 0x88, 0xfa, 0x3f, 0x24, 0x88, 0x87, 0xf3, 0x21, 0x9a, 0x3d, 0xca, 0x4c,
-	0xcc, 0xc1, 0x99, 0xc3, 0x05, 0xd1, 0x41, 0x3d, 0x9a, 0x96, 0x39, 0x73, 0x53, 0x7e, 0x3c, 0x73,
-	0xde, 0x90, 0xef, 0xe8, 0x1b, 0x09, 0x52, 0x13, 0xf3, 0x3e, 0xfa, 0x68, 0xa6, 0x71, 0xd3, 0xff,
-	0x0e, 0xbc, 0x31, 0xfc, 0x3e, 0x37, 0xbd, 0xaf, 0xfc, 0x74, 0x99, 0xdb, 0xda, 0x1a, 0xee, 0xc1,
-	0x72, 0x28, 0xaf, 0x1c, 0xce, 0xbf, 0xb9, 0x23, 0x32, 0xe8, 0xdf, 0x52, 0xf8, 0x10, 0xe4, 0x0e,
-	0xe5, 0x96, 0x7b, 0x1d, 0x67, 0xf2, 0x4b, 0xf6, 0x0b, 0xc5, 0xe6, 0x4e, 0x76, 0x95, 0xc2, 0x32,
-	0x4e, 0x06, 0xdd, 0x8b, 0xf9, 0x77, 0xa8, 0x1c, 0xcc, 0xf7, 0x2f, 0x82, 0xa3, 0xff, 0x49, 0xa3,
-	0x0f, 0xc7, 0x23, 0xe2, 0x15, 0x6d, 0xec, 0xd1, 0xef, 0xde, 0xcb, 0xdf, 0x70, 0x2f, 0xaf, 0x95,
-	0x4f, 0x96, 0xf7, 0x32, 0x34, 0x92, 0x79, 0xfb, 0x13, 0xe5, 0x83, 0x45, 0xbd, 0x1d, 0x11, 0x2b,
-	0xbd, 0x82, 0xf7, 0xdb, 0xa4, 0x3f, 0xcb, 0xe6, 0x52, 0x6a, 0xd8, 0x84, 0xea, 0x2c, 0x0b, 0xeb,
-	0xd2, 0x79, 0x51, 0xe0, 0x7b, 0xc4, 0x36, 0x9d, 0x5e, 0x8e, 0x78, 0xbd, 0x7c, 0x0f, 0x3b, 0x3c,
-	0x47, 0xf3, 0x01, 0xcb, 0x74, 0x2d, 0x7f, 0xea, 0xbf, 0xcc, 0x47, 0xc1, 0xf2, 0x8f, 0xb1, 0x95,
-	0x72, 0xb3, 0xd1, 0x5a, 0xe7, 0x32, 0x1f, 0xfd, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xe3, 0x18,
-	0x53, 0xea, 0x15, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/talent/v4beta1/profile.pb.go b/googleapis/cloud/talent/v4beta1/profile.pb.go
index e1de286d6e..ad7b4fa357 100644
--- a/googleapis/cloud/talent/v4beta1/profile.pb.go
+++ b/googleapis/cloud/talent/v4beta1/profile.pb.go
@@ -1,18 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/profile.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import date "google.golang.org/genproto/googleapis/type/date"
-import postaladdress "google.golang.org/genproto/googleapis/type/postaladdress"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package talent
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	date "google.golang.org/genproto/googleapis/type/date"
+	postaladdress "google.golang.org/genproto/googleapis/type/postaladdress"
+	_ "google.golang.org/genproto/protobuf/field_mask"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -23,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The format of a structured resume.
 type Resume_ResumeType int32
@@ -44,6 +47,7 @@ var Resume_ResumeType_name = map[int32]string{
 	1: "HRXML",
 	2: "OTHER_RESUME_TYPE",
 }
+
 var Resume_ResumeType_value = map[string]int32{
 	"RESUME_TYPE_UNSPECIFIED": 0,
 	"HRXML":                   1,
@@ -53,8 +57,9 @@ var Resume_ResumeType_value = map[string]int32{
 func (x Resume_ResumeType) String() string {
 	return proto.EnumName(Resume_ResumeType_name, int32(x))
 }
+
 func (Resume_ResumeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{1, 0}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{1, 0}
 }
 
 // Enum that represents the type of the telephone.
@@ -101,6 +106,7 @@ var Phone_PhoneType_name = map[int32]string{
 	8: "VOIP",
 	9: "MOBILE_OR_LANDLINE",
 }
+
 var Phone_PhoneType_value = map[string]int32{
 	"PHONE_TYPE_UNSPECIFIED": 0,
 	"LANDLINE":               1,
@@ -117,8 +123,9 @@ var Phone_PhoneType_value = map[string]int32{
 func (x Phone_PhoneType) String() string {
 	return proto.EnumName(Phone_PhoneType_name, int32(x))
 }
+
 func (Phone_PhoneType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{5, 0}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{5, 0}
 }
 
 // A resource that represents the profile for a job candidate (also referred to
@@ -301,16 +308,17 @@ func (m *Profile) Reset()         { *m = Profile{} }
 func (m *Profile) String() string { return proto.CompactTextString(m) }
 func (*Profile) ProtoMessage()    {}
 func (*Profile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{0}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{0}
 }
+
 func (m *Profile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Profile.Unmarshal(m, b)
 }
 func (m *Profile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Profile.Marshal(b, m, deterministic)
 }
-func (dst *Profile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Profile.Merge(dst, src)
+func (m *Profile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Profile.Merge(m, src)
 }
 func (m *Profile) XXX_Size() int {
 	return xxx_messageInfo_Profile.Size(m)
@@ -537,16 +545,17 @@ func (m *Resume) Reset()         { *m = Resume{} }
 func (m *Resume) String() string { return proto.CompactTextString(m) }
 func (*Resume) ProtoMessage()    {}
 func (*Resume) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{1}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{1}
 }
+
 func (m *Resume) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resume.Unmarshal(m, b)
 }
 func (m *Resume) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Resume.Marshal(b, m, deterministic)
 }
-func (dst *Resume) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resume.Merge(dst, src)
+func (m *Resume) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resume.Merge(m, src)
 }
 func (m *Resume) XXX_Size() int {
 	return xxx_messageInfo_Resume.Size(m)
@@ -596,16 +605,17 @@ func (m *PersonName) Reset()         { *m = PersonName{} }
 func (m *PersonName) String() string { return proto.CompactTextString(m) }
 func (*PersonName) ProtoMessage()    {}
 func (*PersonName) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{2}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{2}
 }
+
 func (m *PersonName) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PersonName.Unmarshal(m, b)
 }
 func (m *PersonName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PersonName.Marshal(b, m, deterministic)
 }
-func (dst *PersonName) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PersonName.Merge(dst, src)
+func (m *PersonName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PersonName.Merge(m, src)
 }
 func (m *PersonName) XXX_Size() int {
 	return xxx_messageInfo_PersonName.Size(m)
@@ -660,76 +670,14 @@ func (m *PersonName) GetPreferredName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PersonName) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PersonName_OneofMarshaler, _PersonName_OneofUnmarshaler, _PersonName_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PersonName) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PersonName_FormattedName)(nil),
 		(*PersonName_StructuredName)(nil),
 	}
 }
 
-func _PersonName_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PersonName)
-	// person_name
-	switch x := m.PersonName.(type) {
-	case *PersonName_FormattedName:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.FormattedName)
-	case *PersonName_StructuredName:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredName); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PersonName.PersonName has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PersonName_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PersonName)
-	switch tag {
-	case 1: // person_name.formatted_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PersonName = &PersonName_FormattedName{x}
-		return true, err
-	case 2: // person_name.structured_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PersonName_PersonStructuredName)
-		err := b.DecodeMessage(msg)
-		m.PersonName = &PersonName_StructuredName{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PersonName_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PersonName)
-	// person_name
-	switch x := m.PersonName.(type) {
-	case *PersonName_FormattedName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.FormattedName)))
-		n += len(x.FormattedName)
-	case *PersonName_StructuredName:
-		s := proto.Size(x.StructuredName)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Resource that represents a person's structured name.
 type PersonName_PersonStructuredName struct {
 	// Optional.
@@ -783,16 +731,17 @@ func (m *PersonName_PersonStructuredName) Reset()         { *m = PersonName_Pers
 func (m *PersonName_PersonStructuredName) String() string { return proto.CompactTextString(m) }
 func (*PersonName_PersonStructuredName) ProtoMessage()    {}
 func (*PersonName_PersonStructuredName) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{2, 0}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{2, 0}
 }
+
 func (m *PersonName_PersonStructuredName) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PersonName_PersonStructuredName.Unmarshal(m, b)
 }
 func (m *PersonName_PersonStructuredName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PersonName_PersonStructuredName.Marshal(b, m, deterministic)
 }
-func (dst *PersonName_PersonStructuredName) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PersonName_PersonStructuredName.Merge(dst, src)
+func (m *PersonName_PersonStructuredName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PersonName_PersonStructuredName.Merge(m, src)
 }
 func (m *PersonName_PersonStructuredName) XXX_Size() int {
 	return xxx_messageInfo_PersonName_PersonStructuredName.Size(m)
@@ -871,16 +820,17 @@ func (m *Address) Reset()         { *m = Address{} }
 func (m *Address) String() string { return proto.CompactTextString(m) }
 func (*Address) ProtoMessage()    {}
 func (*Address) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{3}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{3}
 }
+
 func (m *Address) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Address.Unmarshal(m, b)
 }
 func (m *Address) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Address.Marshal(b, m, deterministic)
 }
-func (dst *Address) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Address.Merge(dst, src)
+func (m *Address) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Address.Merge(m, src)
 }
 func (m *Address) XXX_Size() int {
 	return xxx_messageInfo_Address.Size(m)
@@ -942,76 +892,14 @@ func (m *Address) GetCurrent() *wrappers.BoolValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Address) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Address_OneofMarshaler, _Address_OneofUnmarshaler, _Address_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Address) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Address_UnstructuredAddress)(nil),
 		(*Address_StructuredAddress)(nil),
 	}
 }
 
-func _Address_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Address)
-	// address
-	switch x := m.Address.(type) {
-	case *Address_UnstructuredAddress:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.UnstructuredAddress)
-	case *Address_StructuredAddress:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredAddress); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Address.Address has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Address_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Address)
-	switch tag {
-	case 2: // address.unstructured_address
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Address = &Address_UnstructuredAddress{x}
-		return true, err
-	case 3: // address.structured_address
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(postaladdress.PostalAddress)
-		err := b.DecodeMessage(msg)
-		m.Address = &Address_StructuredAddress{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Address_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Address)
-	// address
-	switch x := m.Address.(type) {
-	case *Address_UnstructuredAddress:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.UnstructuredAddress)))
-		n += len(x.UnstructuredAddress)
-	case *Address_StructuredAddress:
-		s := proto.Size(x.StructuredAddress)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Resource that represents a person's email address.
 type Email struct {
 	// Optional.
@@ -1033,16 +921,17 @@ func (m *Email) Reset()         { *m = Email{} }
 func (m *Email) String() string { return proto.CompactTextString(m) }
 func (*Email) ProtoMessage()    {}
 func (*Email) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{4}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{4}
 }
+
 func (m *Email) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Email.Unmarshal(m, b)
 }
 func (m *Email) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Email.Marshal(b, m, deterministic)
 }
-func (dst *Email) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Email.Merge(dst, src)
+func (m *Email) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Email.Merge(m, src)
 }
 func (m *Email) XXX_Size() int {
 	return xxx_messageInfo_Email.Size(m)
@@ -1103,16 +992,17 @@ func (m *Phone) Reset()         { *m = Phone{} }
 func (m *Phone) String() string { return proto.CompactTextString(m) }
 func (*Phone) ProtoMessage()    {}
 func (*Phone) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{5}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{5}
 }
+
 func (m *Phone) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Phone.Unmarshal(m, b)
 }
 func (m *Phone) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Phone.Marshal(b, m, deterministic)
 }
-func (dst *Phone) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Phone.Merge(dst, src)
+func (m *Phone) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Phone.Merge(m, src)
 }
 func (m *Phone) XXX_Size() int {
 	return xxx_messageInfo_Phone.Size(m)
@@ -1168,16 +1058,17 @@ func (m *PersonalUri) Reset()         { *m = PersonalUri{} }
 func (m *PersonalUri) String() string { return proto.CompactTextString(m) }
 func (*PersonalUri) ProtoMessage()    {}
 func (*PersonalUri) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{6}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{6}
 }
+
 func (m *PersonalUri) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PersonalUri.Unmarshal(m, b)
 }
 func (m *PersonalUri) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PersonalUri.Marshal(b, m, deterministic)
 }
-func (dst *PersonalUri) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PersonalUri.Merge(dst, src)
+func (m *PersonalUri) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PersonalUri.Merge(m, src)
 }
 func (m *PersonalUri) XXX_Size() int {
 	return xxx_messageInfo_PersonalUri.Size(m)
@@ -1225,16 +1116,17 @@ func (m *AdditionalContactInfo) Reset()         { *m = AdditionalContactInfo{} }
 func (m *AdditionalContactInfo) String() string { return proto.CompactTextString(m) }
 func (*AdditionalContactInfo) ProtoMessage()    {}
 func (*AdditionalContactInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{7}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{7}
 }
+
 func (m *AdditionalContactInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdditionalContactInfo.Unmarshal(m, b)
 }
 func (m *AdditionalContactInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdditionalContactInfo.Marshal(b, m, deterministic)
 }
-func (dst *AdditionalContactInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdditionalContactInfo.Merge(dst, src)
+func (m *AdditionalContactInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdditionalContactInfo.Merge(m, src)
 }
 func (m *AdditionalContactInfo) XXX_Size() int {
 	return xxx_messageInfo_AdditionalContactInfo.Size(m)
@@ -1343,16 +1235,17 @@ func (m *EmploymentRecord) Reset()         { *m = EmploymentRecord{} }
 func (m *EmploymentRecord) String() string { return proto.CompactTextString(m) }
 func (*EmploymentRecord) ProtoMessage()    {}
 func (*EmploymentRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{8}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{8}
 }
+
 func (m *EmploymentRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EmploymentRecord.Unmarshal(m, b)
 }
 func (m *EmploymentRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EmploymentRecord.Marshal(b, m, deterministic)
 }
-func (dst *EmploymentRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EmploymentRecord.Merge(dst, src)
+func (m *EmploymentRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EmploymentRecord.Merge(m, src)
 }
 func (m *EmploymentRecord) XXX_Size() int {
 	return xxx_messageInfo_EmploymentRecord.Size(m)
@@ -1514,16 +1407,17 @@ func (m *EducationRecord) Reset()         { *m = EducationRecord{} }
 func (m *EducationRecord) String() string { return proto.CompactTextString(m) }
 func (*EducationRecord) ProtoMessage()    {}
 func (*EducationRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{9}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{9}
 }
+
 func (m *EducationRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EducationRecord.Unmarshal(m, b)
 }
 func (m *EducationRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EducationRecord.Marshal(b, m, deterministic)
 }
-func (dst *EducationRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EducationRecord.Merge(dst, src)
+func (m *EducationRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EducationRecord.Merge(m, src)
 }
 func (m *EducationRecord) XXX_Size() int {
 	return xxx_messageInfo_EducationRecord.Size(m)
@@ -1634,76 +1528,14 @@ func (m *EducationRecord) GetDegreeSnippet() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*EducationRecord) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _EducationRecord_OneofMarshaler, _EducationRecord_OneofUnmarshaler, _EducationRecord_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*EducationRecord) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*EducationRecord_DegreeDescription)(nil),
 		(*EducationRecord_StructuredDegree)(nil),
 	}
 }
 
-func _EducationRecord_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*EducationRecord)
-	// degree
-	switch x := m.Degree.(type) {
-	case *EducationRecord_DegreeDescription:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.DegreeDescription)
-	case *EducationRecord_StructuredDegree:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredDegree); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("EducationRecord.Degree has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _EducationRecord_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*EducationRecord)
-	switch tag {
-	case 6: // degree.degree_description
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Degree = &EducationRecord_DegreeDescription{x}
-		return true, err
-	case 7: // degree.structured_degree
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Degree)
-		err := b.DecodeMessage(msg)
-		m.Degree = &EducationRecord_StructuredDegree{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _EducationRecord_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*EducationRecord)
-	// degree
-	switch x := m.Degree.(type) {
-	case *EducationRecord_DegreeDescription:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.DegreeDescription)))
-		n += len(x.DegreeDescription)
-	case *EducationRecord_StructuredDegree:
-		s := proto.Size(x.StructuredDegree)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Resource that represents a degree pursuing or acquired by a candidate.
 type Degree struct {
 	// Optional.
@@ -1735,16 +1567,17 @@ func (m *Degree) Reset()         { *m = Degree{} }
 func (m *Degree) String() string { return proto.CompactTextString(m) }
 func (*Degree) ProtoMessage()    {}
 func (*Degree) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{10}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{10}
 }
+
 func (m *Degree) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Degree.Unmarshal(m, b)
 }
 func (m *Degree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Degree.Marshal(b, m, deterministic)
 }
-func (dst *Degree) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Degree.Merge(dst, src)
+func (m *Degree) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Degree.Merge(m, src)
 }
 func (m *Degree) XXX_Size() int {
 	return xxx_messageInfo_Degree.Size(m)
@@ -1837,16 +1670,17 @@ func (m *Activity) Reset()         { *m = Activity{} }
 func (m *Activity) String() string { return proto.CompactTextString(m) }
 func (*Activity) ProtoMessage()    {}
 func (*Activity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{11}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{11}
 }
+
 func (m *Activity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Activity.Unmarshal(m, b)
 }
 func (m *Activity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Activity.Marshal(b, m, deterministic)
 }
-func (dst *Activity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Activity.Merge(dst, src)
+func (m *Activity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Activity.Merge(m, src)
 }
 func (m *Activity) XXX_Size() int {
 	return xxx_messageInfo_Activity.Size(m)
@@ -1990,16 +1824,17 @@ func (m *Publication) Reset()         { *m = Publication{} }
 func (m *Publication) String() string { return proto.CompactTextString(m) }
 func (*Publication) ProtoMessage()    {}
 func (*Publication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{12}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{12}
 }
+
 func (m *Publication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Publication.Unmarshal(m, b)
 }
 func (m *Publication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Publication.Marshal(b, m, deterministic)
 }
-func (dst *Publication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Publication.Merge(dst, src)
+func (m *Publication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Publication.Merge(m, src)
 }
 func (m *Publication) XXX_Size() int {
 	return xxx_messageInfo_Publication.Size(m)
@@ -2132,16 +1967,17 @@ func (m *Patent) Reset()         { *m = Patent{} }
 func (m *Patent) String() string { return proto.CompactTextString(m) }
 func (*Patent) ProtoMessage()    {}
 func (*Patent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_1ba3c938ea40ebf9, []int{13}
+	return fileDescriptor_f0277fc1d2fabb3b, []int{13}
 }
+
 func (m *Patent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Patent.Unmarshal(m, b)
 }
 func (m *Patent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Patent.Marshal(b, m, deterministic)
 }
-func (dst *Patent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Patent.Merge(dst, src)
+func (m *Patent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Patent.Merge(m, src)
 }
 func (m *Patent) XXX_Size() int {
 	return xxx_messageInfo_Patent.Size(m)
@@ -2216,6 +2052,8 @@ func (m *Patent) GetSkillsUsed() []*Skill {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.talent.v4beta1.Resume_ResumeType", Resume_ResumeType_name, Resume_ResumeType_value)
+	proto.RegisterEnum("google.cloud.talent.v4beta1.Phone_PhoneType", Phone_PhoneType_name, Phone_PhoneType_value)
 	proto.RegisterType((*Profile)(nil), "google.cloud.talent.v4beta1.Profile")
 	proto.RegisterMapType((map[string]*CustomAttribute)(nil), "google.cloud.talent.v4beta1.Profile.CustomAttributesEntry")
 	proto.RegisterType((*Resume)(nil), "google.cloud.talent.v4beta1.Resume")
@@ -2232,15 +2070,13 @@ func init() {
 	proto.RegisterType((*Activity)(nil), "google.cloud.talent.v4beta1.Activity")
 	proto.RegisterType((*Publication)(nil), "google.cloud.talent.v4beta1.Publication")
 	proto.RegisterType((*Patent)(nil), "google.cloud.talent.v4beta1.Patent")
-	proto.RegisterEnum("google.cloud.talent.v4beta1.Resume_ResumeType", Resume_ResumeType_name, Resume_ResumeType_value)
-	proto.RegisterEnum("google.cloud.talent.v4beta1.Phone_PhoneType", Phone_PhoneType_name, Phone_PhoneType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/profile.proto", fileDescriptor_profile_1ba3c938ea40ebf9)
+	proto.RegisterFile("google/cloud/talent/v4beta1/profile.proto", fileDescriptor_f0277fc1d2fabb3b)
 }
 
-var fileDescriptor_profile_1ba3c938ea40ebf9 = []byte{
+var fileDescriptor_f0277fc1d2fabb3b = []byte{
 	// 2288 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x72, 0x1b, 0xb9,
 	0xf1, 0x17, 0x49, 0x89, 0x1f, 0xcd, 0x0f, 0x91, 0xb0, 0x25, 0xcf, 0x5f, 0xf6, 0xfe, 0xad, 0xe5,
diff --git a/googleapis/cloud/talent/v4beta1/profile_service.pb.go b/googleapis/cloud/talent/v4beta1/profile_service.pb.go
index 5689f40f12..b2e653270a 100644
--- a/googleapis/cloud/talent/v4beta1/profile_service.pb.go
+++ b/googleapis/cloud/talent/v4beta1/profile_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/profile_service.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package talent
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // List profiles request.
 type ListProfilesRequest struct {
@@ -66,16 +66,17 @@ func (m *ListProfilesRequest) Reset()         { *m = ListProfilesRequest{} }
 func (m *ListProfilesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProfilesRequest) ProtoMessage()    {}
 func (*ListProfilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{0}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{0}
 }
+
 func (m *ListProfilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProfilesRequest.Unmarshal(m, b)
 }
 func (m *ListProfilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProfilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProfilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProfilesRequest.Merge(dst, src)
+func (m *ListProfilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProfilesRequest.Merge(m, src)
 }
 func (m *ListProfilesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProfilesRequest.Size(m)
@@ -130,16 +131,17 @@ func (m *ListProfilesResponse) Reset()         { *m = ListProfilesResponse{} }
 func (m *ListProfilesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProfilesResponse) ProtoMessage()    {}
 func (*ListProfilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{1}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{1}
 }
+
 func (m *ListProfilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProfilesResponse.Unmarshal(m, b)
 }
 func (m *ListProfilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProfilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProfilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProfilesResponse.Merge(dst, src)
+func (m *ListProfilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProfilesResponse.Merge(m, src)
 }
 func (m *ListProfilesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProfilesResponse.Size(m)
@@ -186,16 +188,17 @@ func (m *CreateProfileRequest) Reset()         { *m = CreateProfileRequest{} }
 func (m *CreateProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProfileRequest) ProtoMessage()    {}
 func (*CreateProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{2}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{2}
 }
+
 func (m *CreateProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProfileRequest.Unmarshal(m, b)
 }
 func (m *CreateProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProfileRequest.Merge(dst, src)
+func (m *CreateProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProfileRequest.Merge(m, src)
 }
 func (m *CreateProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProfileRequest.Size(m)
@@ -239,16 +242,17 @@ func (m *GetProfileRequest) Reset()         { *m = GetProfileRequest{} }
 func (m *GetProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProfileRequest) ProtoMessage()    {}
 func (*GetProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{3}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{3}
 }
+
 func (m *GetProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProfileRequest.Unmarshal(m, b)
 }
 func (m *GetProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProfileRequest.Merge(dst, src)
+func (m *GetProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProfileRequest.Merge(m, src)
 }
 func (m *GetProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProfileRequest.Size(m)
@@ -313,16 +317,17 @@ func (m *UpdateProfileRequest) Reset()         { *m = UpdateProfileRequest{} }
 func (m *UpdateProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProfileRequest) ProtoMessage()    {}
 func (*UpdateProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{4}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{4}
 }
+
 func (m *UpdateProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProfileRequest.Unmarshal(m, b)
 }
 func (m *UpdateProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProfileRequest.Merge(dst, src)
+func (m *UpdateProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProfileRequest.Merge(m, src)
 }
 func (m *UpdateProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProfileRequest.Size(m)
@@ -366,16 +371,17 @@ func (m *DeleteProfileRequest) Reset()         { *m = DeleteProfileRequest{} }
 func (m *DeleteProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteProfileRequest) ProtoMessage()    {}
 func (*DeleteProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{5}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{5}
 }
+
 func (m *DeleteProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteProfileRequest.Unmarshal(m, b)
 }
 func (m *DeleteProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteProfileRequest.Merge(dst, src)
+func (m *DeleteProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProfileRequest.Merge(m, src)
 }
 func (m *DeleteProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteProfileRequest.Size(m)
@@ -562,16 +568,17 @@ func (m *SearchProfilesRequest) Reset()         { *m = SearchProfilesRequest{} }
 func (m *SearchProfilesRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchProfilesRequest) ProtoMessage()    {}
 func (*SearchProfilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{6}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{6}
 }
+
 func (m *SearchProfilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchProfilesRequest.Unmarshal(m, b)
 }
 func (m *SearchProfilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchProfilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchProfilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchProfilesRequest.Merge(dst, src)
+func (m *SearchProfilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchProfilesRequest.Merge(m, src)
 }
 func (m *SearchProfilesRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchProfilesRequest.Size(m)
@@ -680,16 +687,17 @@ func (m *SearchProfilesResponse) Reset()         { *m = SearchProfilesResponse{}
 func (m *SearchProfilesResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchProfilesResponse) ProtoMessage()    {}
 func (*SearchProfilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{7}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{7}
 }
+
 func (m *SearchProfilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchProfilesResponse.Unmarshal(m, b)
 }
 func (m *SearchProfilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchProfilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchProfilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchProfilesResponse.Merge(dst, src)
+func (m *SearchProfilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchProfilesResponse.Merge(m, src)
 }
 func (m *SearchProfilesResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchProfilesResponse.Size(m)
@@ -771,16 +779,17 @@ func (m *SummarizedProfile) Reset()         { *m = SummarizedProfile{} }
 func (m *SummarizedProfile) String() string { return proto.CompactTextString(m) }
 func (*SummarizedProfile) ProtoMessage()    {}
 func (*SummarizedProfile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profile_service_7ea8377f2d7ce92e, []int{8}
+	return fileDescriptor_d2b7b5f4d4d7ea55, []int{8}
 }
+
 func (m *SummarizedProfile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SummarizedProfile.Unmarshal(m, b)
 }
 func (m *SummarizedProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SummarizedProfile.Marshal(b, m, deterministic)
 }
-func (dst *SummarizedProfile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SummarizedProfile.Merge(dst, src)
+func (m *SummarizedProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SummarizedProfile.Merge(m, src)
 }
 func (m *SummarizedProfile) XXX_Size() int {
 	return xxx_messageInfo_SummarizedProfile.Size(m)
@@ -817,6 +826,81 @@ func init() {
 	proto.RegisterType((*SummarizedProfile)(nil), "google.cloud.talent.v4beta1.SummarizedProfile")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/talent/v4beta1/profile_service.proto", fileDescriptor_d2b7b5f4d4d7ea55)
+}
+
+var fileDescriptor_d2b7b5f4d4d7ea55 = []byte{
+	// 1059 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x6e, 0x1b, 0xc5,
+	0x17, 0xd6, 0xe6, 0xaf, 0x73, 0xd2, 0x34, 0xc9, 0x24, 0xcd, 0x6f, 0x7f, 0x2e, 0x08, 0x6b, 0x85,
+	0xc0, 0x75, 0xe9, 0x6e, 0xe3, 0x56, 0x0a, 0x4a, 0xa1, 0x82, 0x84, 0xbf, 0x12, 0x45, 0x61, 0x1d,
+	0x04, 0xea, 0xcd, 0x6a, 0x62, 0x1f, 0x3b, 0x4b, 0x76, 0x77, 0xb6, 0x33, 0xe3, 0x08, 0x07, 0x55,
+	0xa2, 0xbc, 0x42, 0xc4, 0x15, 0x77, 0x15, 0x97, 0xdc, 0xf1, 0x28, 0xbc, 0x02, 0x3c, 0x07, 0x68,
+	0x66, 0xc7, 0xdb, 0xd8, 0x5e, 0x6d, 0x6c, 0xc4, 0xdd, 0xce, 0x9c, 0xf3, 0x9d, 0xf3, 0xcd, 0x37,
+	0x67, 0xce, 0x59, 0xd8, 0xed, 0x31, 0xd6, 0x8b, 0xd0, 0x6b, 0x47, 0xac, 0xdf, 0xf1, 0x24, 0x8d,
+	0x30, 0x91, 0xde, 0xf9, 0xc3, 0x13, 0x94, 0x74, 0xd7, 0x4b, 0x39, 0xeb, 0x86, 0x11, 0x06, 0x02,
+	0xf9, 0x79, 0xd8, 0x46, 0x37, 0xe5, 0x4c, 0x32, 0x72, 0x3b, 0x83, 0xb8, 0x1a, 0xe2, 0x66, 0x10,
+	0xd7, 0x40, 0xaa, 0xaf, 0x99, 0x78, 0x34, 0x0d, 0x3d, 0x9a, 0x24, 0x4c, 0x52, 0x19, 0xb2, 0x44,
+	0x64, 0xd0, 0x6a, 0xbd, 0x2c, 0x5b, 0x9b, 0xc5, 0x31, 0x4b, 0x8c, 0xe7, 0x9d, 0x32, 0xcf, 0x6e,
+	0x18, 0x49, 0xe4, 0xc3, 0xa0, 0x77, 0xcb, 0x5c, 0x4f, 0x43, 0x21, 0x59, 0x8f, 0xd3, 0x78, 0x9a,
+	0xb8, 0xe6, 0xbc, 0xc6, 0xd5, 0x9c, 0xd3, 0xd3, 0xab, 0x93, 0x7e, 0xd7, 0xc3, 0x38, 0x95, 0x03,
+	0x63, 0xac, 0x8d, 0x1b, 0xbb, 0x21, 0x46, 0x9d, 0x20, 0xa6, 0xe2, 0x2c, 0xf3, 0x70, 0x5e, 0x5a,
+	0xb0, 0xf5, 0x45, 0x28, 0xe4, 0x51, 0x16, 0x54, 0xf8, 0xf8, 0xac, 0x8f, 0x42, 0x92, 0x1d, 0x58,
+	0x4a, 0x29, 0xc7, 0x44, 0xda, 0x56, 0xcd, 0xaa, 0xaf, 0xf8, 0x66, 0x45, 0x5e, 0x07, 0x48, 0x69,
+	0x0f, 0x03, 0xc9, 0xce, 0x30, 0xb1, 0xe7, 0xb4, 0x6d, 0x45, 0xed, 0x1c, 0xab, 0x0d, 0x72, 0x1b,
+	0xf4, 0x22, 0x10, 0xe1, 0x05, 0xda, 0xf3, 0x35, 0xab, 0xbe, 0xe8, 0x57, 0xd4, 0x46, 0x2b, 0xbc,
+	0x40, 0xb2, 0x07, 0x2b, 0x1c, 0x69, 0x96, 0xde, 0x5e, 0xa8, 0x59, 0xf5, 0xd5, 0x66, 0xd5, 0x35,
+	0xd7, 0x34, 0x64, 0xe8, 0x7e, 0xa2, 0x18, 0x3e, 0xa1, 0xe2, 0xcc, 0xaf, 0x28, 0x67, 0xf5, 0xe5,
+	0xfc, 0x68, 0xc1, 0xf6, 0x28, 0x49, 0x91, 0xb2, 0x44, 0x20, 0xf9, 0x00, 0x2a, 0x46, 0x0d, 0x61,
+	0x5b, 0xb5, 0xf9, 0xfa, 0x6a, 0xf3, 0x4d, 0xb7, 0xe4, 0xde, 0x5d, 0x13, 0xc0, 0xcf, 0x51, 0xe4,
+	0x2d, 0x58, 0x4f, 0xf0, 0x7b, 0x19, 0x4c, 0x1c, 0x6a, 0x4d, 0x6d, 0x1f, 0x0d, 0x0f, 0xe6, 0x24,
+	0xb0, 0x7d, 0xc8, 0x91, 0x4a, 0x1c, 0x86, 0xb8, 0x46, 0xa7, 0xc7, 0xb0, 0x6c, 0x72, 0xe8, 0x78,
+	0xd3, 0x12, 0x1b, 0x82, 0x9c, 0xb7, 0x61, 0xf3, 0x53, 0x94, 0x63, 0xc9, 0x08, 0x2c, 0x24, 0x34,
+	0x46, 0x93, 0x4a, 0x7f, 0x3b, 0x97, 0x16, 0x6c, 0x7f, 0x9d, 0x76, 0x26, 0x99, 0x5d, 0x61, 0x60,
+	0xfd, 0x0b, 0x06, 0xe4, 0x11, 0xac, 0xf6, 0x75, 0xdc, 0xec, 0xbe, 0xe6, 0xae, 0xbd, 0x2f, 0xc8,
+	0xdc, 0xf5, 0x8d, 0x35, 0x60, 0xfb, 0x23, 0x8c, 0x70, 0x82, 0x54, 0xd1, 0x09, 0x5e, 0x2c, 0xc0,
+	0xad, 0x16, 0x52, 0xde, 0x3e, 0x9d, 0xb6, 0x08, 0xbf, 0x81, 0x0d, 0x9e, 0xb9, 0x04, 0x31, 0x4a,
+	0xda, 0xa1, 0x92, 0x1a, 0x7e, 0xef, 0x94, 0x9e, 0xd1, 0xc4, 0x7d, 0x62, 0x30, 0xfe, 0x3a, 0x1f,
+	0xdd, 0x20, 0x5f, 0xc2, 0xda, 0xb0, 0x9b, 0x3c, 0xeb, 0x23, 0x1f, 0xe8, 0x12, 0x5e, 0x6d, 0xde,
+	0x99, 0x46, 0xb9, 0xaf, 0x14, 0xc0, 0xbf, 0x91, 0x5e, 0x59, 0x8d, 0x3e, 0x87, 0x85, 0xb1, 0xe7,
+	0x30, 0xfa, 0x94, 0x16, 0xc7, 0x9f, 0xd2, 0x0e, 0x2c, 0xb1, 0x6e, 0x57, 0xa0, 0xb4, 0x97, 0x34,
+	0xd0, 0xac, 0x88, 0x0b, 0x5b, 0x9d, 0x50, 0xd0, 0x13, 0xd5, 0xf1, 0x52, 0x8c, 0xa2, 0xa0, 0x7d,
+	0x8a, 0xed, 0x33, 0x7b, 0xb9, 0x66, 0xd5, 0x2b, 0xfe, 0xa6, 0x31, 0xb5, 0x94, 0xe5, 0x50, 0x19,
+	0xc8, 0xff, 0xa1, 0xc2, 0x78, 0x07, 0x79, 0x70, 0x32, 0xb0, 0x2b, 0x3a, 0xc9, 0xb2, 0x5e, 0x1f,
+	0x0c, 0x54, 0xa8, 0x36, 0x15, 0xaa, 0x73, 0x26, 0x22, 0x94, 0xe1, 0x39, 0x06, 0x82, 0x71, 0x69,
+	0xaf, 0x64, 0xa1, 0x94, 0xa9, 0x35, 0xb4, 0xb4, 0x18, 0x97, 0xe4, 0x5b, 0xd8, 0xcc, 0x3b, 0x95,
+	0x16, 0x28, 0x44, 0x61, 0x83, 0x7e, 0x77, 0x77, 0x4b, 0x25, 0xfa, 0x6c, 0x88, 0xca, 0x44, 0xda,
+	0x38, 0xbd, 0xba, 0x0e, 0x51, 0x38, 0x7f, 0xcd, 0xc3, 0xce, 0x78, 0x0d, 0x98, 0x37, 0x7e, 0x1f,
+	0xb6, 0x51, 0xc8, 0x30, 0xa6, 0x12, 0x3b, 0x81, 0x64, 0x92, 0x46, 0x99, 0x9c, 0xaa, 0x24, 0xe6,
+	0x7d, 0x92, 0xdb, 0x8e, 0x95, 0x49, 0x0b, 0xfb, 0x14, 0x36, 0x8c, 0x32, 0x8c, 0x73, 0x6c, 0xab,
+	0xd6, 0x6e, 0xca, 0xc3, 0x2b, 0x65, 0xa9, 0x45, 0x0b, 0x93, 0xde, 0x61, 0x0e, 0xf3, 0xd7, 0x75,
+	0xa0, 0x57, 0x1b, 0xe4, 0x73, 0xa8, 0xe4, 0x25, 0x97, 0x15, 0xc7, 0xbd, 0x6b, 0x4a, 0x2e, 0x3b,
+	0x46, 0x5e, 0x73, 0x39, 0xbc, 0xa8, 0xf5, 0x2c, 0x14, 0xb4, 0x1e, 0x12, 0xc2, 0xff, 0x46, 0x55,
+	0x1f, 0x04, 0x1c, 0x45, 0x3f, 0x92, 0xc2, 0x5e, 0xd4, 0xda, 0xef, 0xce, 0xa2, 0xbd, 0x46, 0xfa,
+	0xb7, 0x4e, 0x0b, 0x76, 0x05, 0x09, 0x60, 0x4b, 0xf4, 0xe3, 0x98, 0xf2, 0xf0, 0x02, 0x3b, 0x41,
+	0xde, 0x5a, 0x97, 0x74, 0x1a, 0xb7, 0x5c, 0xbc, 0x1c, 0x37, 0x7c, 0xf2, 0x44, 0x8c, 0x6f, 0x09,
+	0xe7, 0x67, 0x0b, 0x36, 0x27, 0x3c, 0xff, 0x83, 0x36, 0xfe, 0x18, 0x96, 0xb3, 0x6c, 0x83, 0xd9,
+	0xda, 0xad, 0x01, 0x35, 0xff, 0x5e, 0x86, 0x9b, 0x66, 0xb3, 0x95, 0xfd, 0x46, 0x90, 0xdf, 0x2c,
+	0xb8, 0x71, 0x75, 0xe8, 0x90, 0xfb, 0xa5, 0x21, 0x0b, 0x86, 0x68, 0x75, 0x77, 0x06, 0x44, 0x56,
+	0x26, 0xce, 0xde, 0x4f, 0x7f, 0xfc, 0x79, 0x39, 0xb7, 0x4b, 0xbc, 0x7c, 0xdc, 0xff, 0x90, 0x35,
+	0xbd, 0xf7, 0x53, 0xce, 0xbe, 0xc3, 0xb6, 0x14, 0x5e, 0xc3, 0x93, 0x98, 0xd0, 0x44, 0x7d, 0x3d,
+	0xf7, 0x72, 0x05, 0x7e, 0xb5, 0x60, 0x6d, 0x64, 0x42, 0x91, 0xf2, 0xec, 0x45, 0xd3, 0xac, 0x3a,
+	0x95, 0x6a, 0xce, 0xbe, 0xe6, 0xf8, 0xd0, 0x99, 0x95, 0xe3, 0xbe, 0xd5, 0x20, 0xbf, 0x58, 0x00,
+	0xaf, 0x06, 0x1b, 0x29, 0xaf, 0xa9, 0x89, 0x09, 0x38, 0x25, 0xc1, 0x02, 0x11, 0xd5, 0xa4, 0x29,
+	0xa4, 0x97, 0xb3, 0xf3, 0x1a, 0xcf, 0xd5, 0x9d, 0xaf, 0x8d, 0x0c, 0xd3, 0x6b, 0x44, 0x2c, 0x1a,
+	0xbc, 0x53, 0x72, 0x3c, 0xd0, 0x1c, 0xdf, 0x6b, 0xee, 0x5d, 0x11, 0xd1, 0xfc, 0xd8, 0x4d, 0xc5,
+	0x55, 0x89, 0x79, 0x69, 0xc1, 0xda, 0xc8, 0x98, 0xbd, 0x86, 0x6e, 0xd1, 0x48, 0xae, 0xee, 0x4c,
+	0x8c, 0xf4, 0x8f, 0xd5, 0x1f, 0xe4, 0x50, 0xc4, 0xc6, 0xcc, 0x22, 0xfe, 0x6e, 0xc1, 0xcd, 0xd1,
+	0x5e, 0x4e, 0x9a, 0xe5, 0xad, 0xa3, 0x68, 0xf8, 0x57, 0x1f, 0xcc, 0x84, 0x31, 0xcf, 0xe7, 0x5d,
+	0x4d, 0xba, 0xe9, 0xdc, 0x9b, 0xae, 0x34, 0xf7, 0x85, 0x0e, 0xb3, 0x6f, 0x35, 0x0e, 0x5e, 0x58,
+	0xf0, 0x46, 0x9b, 0xc5, 0x65, 0x49, 0x0f, 0xb6, 0x46, 0x5b, 0xc4, 0x91, 0x12, 0xec, 0xc8, 0x7a,
+	0xfa, 0xa1, 0xc1, 0xf4, 0x58, 0x44, 0x93, 0x9e, 0xcb, 0x78, 0xcf, 0xeb, 0x61, 0xa2, 0xe5, 0xf4,
+	0x32, 0x13, 0x4d, 0x43, 0x51, 0xf8, 0x33, 0xff, 0x28, 0x5b, 0xbe, 0x9c, 0x9b, 0x3f, 0x3c, 0x6e,
+	0x9d, 0x2c, 0x69, 0xcc, 0x83, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x81, 0xa9, 0x37, 0xfb, 0xef,
+	0x0c, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1079,78 +1163,3 @@ var _ProfileService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/talent/v4beta1/profile_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/profile_service.proto", fileDescriptor_profile_service_7ea8377f2d7ce92e)
-}
-
-var fileDescriptor_profile_service_7ea8377f2d7ce92e = []byte{
-	// 1059 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x6e, 0x1b, 0xc5,
-	0x17, 0xd6, 0xe6, 0xaf, 0x73, 0xd2, 0x34, 0xc9, 0x24, 0xcd, 0x6f, 0x7f, 0x2e, 0x08, 0x6b, 0x85,
-	0xc0, 0x75, 0xe9, 0x6e, 0xe3, 0x56, 0x0a, 0x4a, 0xa1, 0x82, 0x84, 0xbf, 0x12, 0x45, 0x61, 0x1d,
-	0x04, 0xea, 0xcd, 0x6a, 0x62, 0x1f, 0x3b, 0x4b, 0x76, 0x77, 0xb6, 0x33, 0xe3, 0x08, 0x07, 0x55,
-	0xa2, 0xbc, 0x42, 0xc4, 0x15, 0x77, 0x15, 0x97, 0xdc, 0xf1, 0x28, 0xbc, 0x02, 0x3c, 0x07, 0x68,
-	0x66, 0xc7, 0xdb, 0xd8, 0x5e, 0x6d, 0x6c, 0xc4, 0xdd, 0xce, 0x9c, 0xf3, 0x9d, 0xf3, 0xcd, 0x37,
-	0x67, 0xce, 0x59, 0xd8, 0xed, 0x31, 0xd6, 0x8b, 0xd0, 0x6b, 0x47, 0xac, 0xdf, 0xf1, 0x24, 0x8d,
-	0x30, 0x91, 0xde, 0xf9, 0xc3, 0x13, 0x94, 0x74, 0xd7, 0x4b, 0x39, 0xeb, 0x86, 0x11, 0x06, 0x02,
-	0xf9, 0x79, 0xd8, 0x46, 0x37, 0xe5, 0x4c, 0x32, 0x72, 0x3b, 0x83, 0xb8, 0x1a, 0xe2, 0x66, 0x10,
-	0xd7, 0x40, 0xaa, 0xaf, 0x99, 0x78, 0x34, 0x0d, 0x3d, 0x9a, 0x24, 0x4c, 0x52, 0x19, 0xb2, 0x44,
-	0x64, 0xd0, 0x6a, 0xbd, 0x2c, 0x5b, 0x9b, 0xc5, 0x31, 0x4b, 0x8c, 0xe7, 0x9d, 0x32, 0xcf, 0x6e,
-	0x18, 0x49, 0xe4, 0xc3, 0xa0, 0x77, 0xcb, 0x5c, 0x4f, 0x43, 0x21, 0x59, 0x8f, 0xd3, 0x78, 0x9a,
-	0xb8, 0xe6, 0xbc, 0xc6, 0xd5, 0x9c, 0xd3, 0xd3, 0xab, 0x93, 0x7e, 0xd7, 0xc3, 0x38, 0x95, 0x03,
-	0x63, 0xac, 0x8d, 0x1b, 0xbb, 0x21, 0x46, 0x9d, 0x20, 0xa6, 0xe2, 0x2c, 0xf3, 0x70, 0x5e, 0x5a,
-	0xb0, 0xf5, 0x45, 0x28, 0xe4, 0x51, 0x16, 0x54, 0xf8, 0xf8, 0xac, 0x8f, 0x42, 0x92, 0x1d, 0x58,
-	0x4a, 0x29, 0xc7, 0x44, 0xda, 0x56, 0xcd, 0xaa, 0xaf, 0xf8, 0x66, 0x45, 0x5e, 0x07, 0x48, 0x69,
-	0x0f, 0x03, 0xc9, 0xce, 0x30, 0xb1, 0xe7, 0xb4, 0x6d, 0x45, 0xed, 0x1c, 0xab, 0x0d, 0x72, 0x1b,
-	0xf4, 0x22, 0x10, 0xe1, 0x05, 0xda, 0xf3, 0x35, 0xab, 0xbe, 0xe8, 0x57, 0xd4, 0x46, 0x2b, 0xbc,
-	0x40, 0xb2, 0x07, 0x2b, 0x1c, 0x69, 0x96, 0xde, 0x5e, 0xa8, 0x59, 0xf5, 0xd5, 0x66, 0xd5, 0x35,
-	0xd7, 0x34, 0x64, 0xe8, 0x7e, 0xa2, 0x18, 0x3e, 0xa1, 0xe2, 0xcc, 0xaf, 0x28, 0x67, 0xf5, 0xe5,
-	0xfc, 0x68, 0xc1, 0xf6, 0x28, 0x49, 0x91, 0xb2, 0x44, 0x20, 0xf9, 0x00, 0x2a, 0x46, 0x0d, 0x61,
-	0x5b, 0xb5, 0xf9, 0xfa, 0x6a, 0xf3, 0x4d, 0xb7, 0xe4, 0xde, 0x5d, 0x13, 0xc0, 0xcf, 0x51, 0xe4,
-	0x2d, 0x58, 0x4f, 0xf0, 0x7b, 0x19, 0x4c, 0x1c, 0x6a, 0x4d, 0x6d, 0x1f, 0x0d, 0x0f, 0xe6, 0x24,
-	0xb0, 0x7d, 0xc8, 0x91, 0x4a, 0x1c, 0x86, 0xb8, 0x46, 0xa7, 0xc7, 0xb0, 0x6c, 0x72, 0xe8, 0x78,
-	0xd3, 0x12, 0x1b, 0x82, 0x9c, 0xb7, 0x61, 0xf3, 0x53, 0x94, 0x63, 0xc9, 0x08, 0x2c, 0x24, 0x34,
-	0x46, 0x93, 0x4a, 0x7f, 0x3b, 0x97, 0x16, 0x6c, 0x7f, 0x9d, 0x76, 0x26, 0x99, 0x5d, 0x61, 0x60,
-	0xfd, 0x0b, 0x06, 0xe4, 0x11, 0xac, 0xf6, 0x75, 0xdc, 0xec, 0xbe, 0xe6, 0xae, 0xbd, 0x2f, 0xc8,
-	0xdc, 0xf5, 0x8d, 0x35, 0x60, 0xfb, 0x23, 0x8c, 0x70, 0x82, 0x54, 0xd1, 0x09, 0x5e, 0x2c, 0xc0,
-	0xad, 0x16, 0x52, 0xde, 0x3e, 0x9d, 0xb6, 0x08, 0xbf, 0x81, 0x0d, 0x9e, 0xb9, 0x04, 0x31, 0x4a,
-	0xda, 0xa1, 0x92, 0x1a, 0x7e, 0xef, 0x94, 0x9e, 0xd1, 0xc4, 0x7d, 0x62, 0x30, 0xfe, 0x3a, 0x1f,
-	0xdd, 0x20, 0x5f, 0xc2, 0xda, 0xb0, 0x9b, 0x3c, 0xeb, 0x23, 0x1f, 0xe8, 0x12, 0x5e, 0x6d, 0xde,
-	0x99, 0x46, 0xb9, 0xaf, 0x14, 0xc0, 0xbf, 0x91, 0x5e, 0x59, 0x8d, 0x3e, 0x87, 0x85, 0xb1, 0xe7,
-	0x30, 0xfa, 0x94, 0x16, 0xc7, 0x9f, 0xd2, 0x0e, 0x2c, 0xb1, 0x6e, 0x57, 0xa0, 0xb4, 0x97, 0x34,
-	0xd0, 0xac, 0x88, 0x0b, 0x5b, 0x9d, 0x50, 0xd0, 0x13, 0xd5, 0xf1, 0x52, 0x8c, 0xa2, 0xa0, 0x7d,
-	0x8a, 0xed, 0x33, 0x7b, 0xb9, 0x66, 0xd5, 0x2b, 0xfe, 0xa6, 0x31, 0xb5, 0x94, 0xe5, 0x50, 0x19,
-	0xc8, 0xff, 0xa1, 0xc2, 0x78, 0x07, 0x79, 0x70, 0x32, 0xb0, 0x2b, 0x3a, 0xc9, 0xb2, 0x5e, 0x1f,
-	0x0c, 0x54, 0xa8, 0x36, 0x15, 0xaa, 0x73, 0x26, 0x22, 0x94, 0xe1, 0x39, 0x06, 0x82, 0x71, 0x69,
-	0xaf, 0x64, 0xa1, 0x94, 0xa9, 0x35, 0xb4, 0xb4, 0x18, 0x97, 0xe4, 0x5b, 0xd8, 0xcc, 0x3b, 0x95,
-	0x16, 0x28, 0x44, 0x61, 0x83, 0x7e, 0x77, 0x77, 0x4b, 0x25, 0xfa, 0x6c, 0x88, 0xca, 0x44, 0xda,
-	0x38, 0xbd, 0xba, 0x0e, 0x51, 0x38, 0x7f, 0xcd, 0xc3, 0xce, 0x78, 0x0d, 0x98, 0x37, 0x7e, 0x1f,
-	0xb6, 0x51, 0xc8, 0x30, 0xa6, 0x12, 0x3b, 0x81, 0x64, 0x92, 0x46, 0x99, 0x9c, 0xaa, 0x24, 0xe6,
-	0x7d, 0x92, 0xdb, 0x8e, 0x95, 0x49, 0x0b, 0xfb, 0x14, 0x36, 0x8c, 0x32, 0x8c, 0x73, 0x6c, 0xab,
-	0xd6, 0x6e, 0xca, 0xc3, 0x2b, 0x65, 0xa9, 0x45, 0x0b, 0x93, 0xde, 0x61, 0x0e, 0xf3, 0xd7, 0x75,
-	0xa0, 0x57, 0x1b, 0xe4, 0x73, 0xa8, 0xe4, 0x25, 0x97, 0x15, 0xc7, 0xbd, 0x6b, 0x4a, 0x2e, 0x3b,
-	0x46, 0x5e, 0x73, 0x39, 0xbc, 0xa8, 0xf5, 0x2c, 0x14, 0xb4, 0x1e, 0x12, 0xc2, 0xff, 0x46, 0x55,
-	0x1f, 0x04, 0x1c, 0x45, 0x3f, 0x92, 0xc2, 0x5e, 0xd4, 0xda, 0xef, 0xce, 0xa2, 0xbd, 0x46, 0xfa,
-	0xb7, 0x4e, 0x0b, 0x76, 0x05, 0x09, 0x60, 0x4b, 0xf4, 0xe3, 0x98, 0xf2, 0xf0, 0x02, 0x3b, 0x41,
-	0xde, 0x5a, 0x97, 0x74, 0x1a, 0xb7, 0x5c, 0xbc, 0x1c, 0x37, 0x7c, 0xf2, 0x44, 0x8c, 0x6f, 0x09,
-	0xe7, 0x67, 0x0b, 0x36, 0x27, 0x3c, 0xff, 0x83, 0x36, 0xfe, 0x18, 0x96, 0xb3, 0x6c, 0x83, 0xd9,
-	0xda, 0xad, 0x01, 0x35, 0xff, 0x5e, 0x86, 0x9b, 0x66, 0xb3, 0x95, 0xfd, 0x46, 0x90, 0xdf, 0x2c,
-	0xb8, 0x71, 0x75, 0xe8, 0x90, 0xfb, 0xa5, 0x21, 0x0b, 0x86, 0x68, 0x75, 0x77, 0x06, 0x44, 0x56,
-	0x26, 0xce, 0xde, 0x4f, 0x7f, 0xfc, 0x79, 0x39, 0xb7, 0x4b, 0xbc, 0x7c, 0xdc, 0xff, 0x90, 0x35,
-	0xbd, 0xf7, 0x53, 0xce, 0xbe, 0xc3, 0xb6, 0x14, 0x5e, 0xc3, 0x93, 0x98, 0xd0, 0x44, 0x7d, 0x3d,
-	0xf7, 0x72, 0x05, 0x7e, 0xb5, 0x60, 0x6d, 0x64, 0x42, 0x91, 0xf2, 0xec, 0x45, 0xd3, 0xac, 0x3a,
-	0x95, 0x6a, 0xce, 0xbe, 0xe6, 0xf8, 0xd0, 0x99, 0x95, 0xe3, 0xbe, 0xd5, 0x20, 0xbf, 0x58, 0x00,
-	0xaf, 0x06, 0x1b, 0x29, 0xaf, 0xa9, 0x89, 0x09, 0x38, 0x25, 0xc1, 0x02, 0x11, 0xd5, 0xa4, 0x29,
-	0xa4, 0x97, 0xb3, 0xf3, 0x1a, 0xcf, 0xd5, 0x9d, 0xaf, 0x8d, 0x0c, 0xd3, 0x6b, 0x44, 0x2c, 0x1a,
-	0xbc, 0x53, 0x72, 0x3c, 0xd0, 0x1c, 0xdf, 0x6b, 0xee, 0x5d, 0x11, 0xd1, 0xfc, 0xd8, 0x4d, 0xc5,
-	0x55, 0x89, 0x79, 0x69, 0xc1, 0xda, 0xc8, 0x98, 0xbd, 0x86, 0x6e, 0xd1, 0x48, 0xae, 0xee, 0x4c,
-	0x8c, 0xf4, 0x8f, 0xd5, 0x1f, 0xe4, 0x50, 0xc4, 0xc6, 0xcc, 0x22, 0xfe, 0x6e, 0xc1, 0xcd, 0xd1,
-	0x5e, 0x4e, 0x9a, 0xe5, 0xad, 0xa3, 0x68, 0xf8, 0x57, 0x1f, 0xcc, 0x84, 0x31, 0xcf, 0xe7, 0x5d,
-	0x4d, 0xba, 0xe9, 0xdc, 0x9b, 0xae, 0x34, 0xf7, 0x85, 0x0e, 0xb3, 0x6f, 0x35, 0x0e, 0x5e, 0x58,
-	0xf0, 0x46, 0x9b, 0xc5, 0x65, 0x49, 0x0f, 0xb6, 0x46, 0x5b, 0xc4, 0x91, 0x12, 0xec, 0xc8, 0x7a,
-	0xfa, 0xa1, 0xc1, 0xf4, 0x58, 0x44, 0x93, 0x9e, 0xcb, 0x78, 0xcf, 0xeb, 0x61, 0xa2, 0xe5, 0xf4,
-	0x32, 0x13, 0x4d, 0x43, 0x51, 0xf8, 0x33, 0xff, 0x28, 0x5b, 0xbe, 0x9c, 0x9b, 0x3f, 0x3c, 0x6e,
-	0x9d, 0x2c, 0x69, 0xcc, 0x83, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x81, 0xa9, 0x37, 0xfb, 0xef,
-	0x0c, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/talent/v4beta1/tenant.pb.go b/googleapis/cloud/talent/v4beta1/tenant.pb.go
index 643d02492d..61cd95620b 100644
--- a/googleapis/cloud/talent/v4beta1/tenant.pb.go
+++ b/googleapis/cloud/talent/v4beta1/tenant.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/tenant.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+package talent
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum that represents how user data owned by the tenant is used.
 type Tenant_DataUsageType int32
@@ -38,6 +41,7 @@ var Tenant_DataUsageType_name = map[int32]string{
 	1: "AGGREGATED",
 	2: "ISOLATED",
 }
+
 var Tenant_DataUsageType_value = map[string]int32{
 	"DATA_USAGE_TYPE_UNSPECIFIED": 0,
 	"AGGREGATED":                  1,
@@ -47,8 +51,9 @@ var Tenant_DataUsageType_value = map[string]int32{
 func (x Tenant_DataUsageType) String() string {
 	return proto.EnumName(Tenant_DataUsageType_name, int32(x))
 }
+
 func (Tenant_DataUsageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_6085026e17b3c245, []int{0, 0}
+	return fileDescriptor_4b0da31c41aea5f3, []int{0, 0}
 }
 
 // A Tenant resource represents a tenant in the service. A tenant is a group or
@@ -95,16 +100,17 @@ func (m *Tenant) Reset()         { *m = Tenant{} }
 func (m *Tenant) String() string { return proto.CompactTextString(m) }
 func (*Tenant) ProtoMessage()    {}
 func (*Tenant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_6085026e17b3c245, []int{0}
+	return fileDescriptor_4b0da31c41aea5f3, []int{0}
 }
+
 func (m *Tenant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Tenant.Unmarshal(m, b)
 }
 func (m *Tenant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Tenant.Marshal(b, m, deterministic)
 }
-func (dst *Tenant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Tenant.Merge(dst, src)
+func (m *Tenant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Tenant.Merge(m, src)
 }
 func (m *Tenant) XXX_Size() int {
 	return xxx_messageInfo_Tenant.Size(m)
@@ -144,15 +150,15 @@ func (m *Tenant) GetKeywordSearchableProfileCustomAttributes() []string {
 }
 
 func init() {
-	proto.RegisterType((*Tenant)(nil), "google.cloud.talent.v4beta1.Tenant")
 	proto.RegisterEnum("google.cloud.talent.v4beta1.Tenant_DataUsageType", Tenant_DataUsageType_name, Tenant_DataUsageType_value)
+	proto.RegisterType((*Tenant)(nil), "google.cloud.talent.v4beta1.Tenant")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/tenant.proto", fileDescriptor_tenant_6085026e17b3c245)
+	proto.RegisterFile("google/cloud/talent/v4beta1/tenant.proto", fileDescriptor_4b0da31c41aea5f3)
 }
 
-var fileDescriptor_tenant_6085026e17b3c245 = []byte{
+var fileDescriptor_4b0da31c41aea5f3 = []byte{
 	// 386 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0x80, 0x71, 0x52, 0x55, 0x64, 0x81, 0xaa, 0x5a, 0x2e, 0x51, 0x8b, 0x94, 0xa8, 0x27, 0x1f,
diff --git a/googleapis/cloud/talent/v4beta1/tenant_service.pb.go b/googleapis/cloud/talent/v4beta1/tenant_service.pb.go
index 0f56aed647..4df13be106 100644
--- a/googleapis/cloud/talent/v4beta1/tenant_service.pb.go
+++ b/googleapis/cloud/talent/v4beta1/tenant_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/talent/v4beta1/tenant_service.proto
 
-package talent // import "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package talent
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The Request of the CreateTenant method.
 type CreateTenantRequest struct {
@@ -48,16 +48,17 @@ func (m *CreateTenantRequest) Reset()         { *m = CreateTenantRequest{} }
 func (m *CreateTenantRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTenantRequest) ProtoMessage()    {}
 func (*CreateTenantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_service_b3e8de717c6e6008, []int{0}
+	return fileDescriptor_2df49c13fa187082, []int{0}
 }
+
 func (m *CreateTenantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTenantRequest.Unmarshal(m, b)
 }
 func (m *CreateTenantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTenantRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTenantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTenantRequest.Merge(dst, src)
+func (m *CreateTenantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTenantRequest.Merge(m, src)
 }
 func (m *CreateTenantRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTenantRequest.Size(m)
@@ -100,16 +101,17 @@ func (m *GetTenantRequest) Reset()         { *m = GetTenantRequest{} }
 func (m *GetTenantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTenantRequest) ProtoMessage()    {}
 func (*GetTenantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_service_b3e8de717c6e6008, []int{1}
+	return fileDescriptor_2df49c13fa187082, []int{1}
 }
+
 func (m *GetTenantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTenantRequest.Unmarshal(m, b)
 }
 func (m *GetTenantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTenantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTenantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTenantRequest.Merge(dst, src)
+func (m *GetTenantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTenantRequest.Merge(m, src)
 }
 func (m *GetTenantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTenantRequest.Size(m)
@@ -151,16 +153,17 @@ func (m *UpdateTenantRequest) Reset()         { *m = UpdateTenantRequest{} }
 func (m *UpdateTenantRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateTenantRequest) ProtoMessage()    {}
 func (*UpdateTenantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_service_b3e8de717c6e6008, []int{2}
+	return fileDescriptor_2df49c13fa187082, []int{2}
 }
+
 func (m *UpdateTenantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateTenantRequest.Unmarshal(m, b)
 }
 func (m *UpdateTenantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateTenantRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateTenantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateTenantRequest.Merge(dst, src)
+func (m *UpdateTenantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTenantRequest.Merge(m, src)
 }
 func (m *UpdateTenantRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateTenantRequest.Size(m)
@@ -203,16 +206,17 @@ func (m *DeleteTenantRequest) Reset()         { *m = DeleteTenantRequest{} }
 func (m *DeleteTenantRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTenantRequest) ProtoMessage()    {}
 func (*DeleteTenantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_service_b3e8de717c6e6008, []int{3}
+	return fileDescriptor_2df49c13fa187082, []int{3}
 }
+
 func (m *DeleteTenantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTenantRequest.Unmarshal(m, b)
 }
 func (m *DeleteTenantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTenantRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTenantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTenantRequest.Merge(dst, src)
+func (m *DeleteTenantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTenantRequest.Merge(m, src)
 }
 func (m *DeleteTenantRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTenantRequest.Size(m)
@@ -257,16 +261,17 @@ func (m *ListTenantsRequest) Reset()         { *m = ListTenantsRequest{} }
 func (m *ListTenantsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTenantsRequest) ProtoMessage()    {}
 func (*ListTenantsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_service_b3e8de717c6e6008, []int{4}
+	return fileDescriptor_2df49c13fa187082, []int{4}
 }
+
 func (m *ListTenantsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTenantsRequest.Unmarshal(m, b)
 }
 func (m *ListTenantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTenantsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTenantsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTenantsRequest.Merge(dst, src)
+func (m *ListTenantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTenantsRequest.Merge(m, src)
 }
 func (m *ListTenantsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTenantsRequest.Size(m)
@@ -318,16 +323,17 @@ func (m *ListTenantsResponse) Reset()         { *m = ListTenantsResponse{} }
 func (m *ListTenantsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTenantsResponse) ProtoMessage()    {}
 func (*ListTenantsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tenant_service_b3e8de717c6e6008, []int{5}
+	return fileDescriptor_2df49c13fa187082, []int{5}
 }
+
 func (m *ListTenantsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTenantsResponse.Unmarshal(m, b)
 }
 func (m *ListTenantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTenantsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTenantsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTenantsResponse.Merge(dst, src)
+func (m *ListTenantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTenantsResponse.Merge(m, src)
 }
 func (m *ListTenantsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTenantsResponse.Size(m)
@@ -368,6 +374,55 @@ func init() {
 	proto.RegisterType((*ListTenantsResponse)(nil), "google.cloud.talent.v4beta1.ListTenantsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/talent/v4beta1/tenant_service.proto", fileDescriptor_2df49c13fa187082)
+}
+
+var fileDescriptor_2df49c13fa187082 = []byte{
+	// 641 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x95, 0x4f, 0x4f, 0x13, 0x41,
+	0x18, 0xc6, 0x33, 0xa0, 0x95, 0xbe, 0x85, 0x68, 0xa6, 0x09, 0x69, 0x8a, 0xc6, 0x66, 0x35, 0xa4,
+	0x54, 0xdd, 0xa9, 0xd5, 0x78, 0x90, 0x70, 0x10, 0xfc, 0x13, 0x13, 0x49, 0x48, 0xc1, 0x8b, 0x97,
+	0x66, 0x68, 0x5f, 0xd6, 0x85, 0xee, 0xcc, 0xda, 0x99, 0x12, 0xc5, 0x90, 0x18, 0x0e, 0xde, 0x8c,
+	0x07, 0x13, 0x6f, 0x7a, 0xf0, 0xcb, 0xf8, 0x01, 0xfc, 0x0a, 0x7e, 0x10, 0xb3, 0x33, 0xd3, 0x52,
+	0x68, 0xd9, 0xae, 0xb7, 0xce, 0xec, 0x3c, 0xef, 0xfb, 0x9b, 0x67, 0xdf, 0x67, 0x0b, 0xf5, 0x40,
+	0xca, 0xa0, 0x8b, 0xac, 0xdd, 0x95, 0xfd, 0x0e, 0xd3, 0xbc, 0x8b, 0x42, 0xb3, 0xc3, 0x87, 0xbb,
+	0xa8, 0xf9, 0x7d, 0xa6, 0x51, 0x70, 0xa1, 0x5b, 0x0a, 0x7b, 0x87, 0x61, 0x1b, 0xfd, 0xb8, 0x27,
+	0xb5, 0xa4, 0x4b, 0x56, 0xe1, 0x1b, 0x85, 0x6f, 0x15, 0xbe, 0x53, 0x94, 0xaf, 0xbb, 0x72, 0x3c,
+	0x0e, 0x19, 0x17, 0x42, 0x6a, 0xae, 0x43, 0x29, 0x94, 0x95, 0x96, 0xab, 0x69, 0xcd, 0xda, 0x32,
+	0x8a, 0xa4, 0xc8, 0x72, 0xd2, 0x62, 0xb9, 0x93, 0x0e, 0x87, 0x99, 0xd5, 0x6e, 0x7f, 0x8f, 0x61,
+	0x14, 0xeb, 0x0f, 0xee, 0x61, 0xe5, 0xfc, 0xc3, 0xbd, 0x10, 0xbb, 0x9d, 0x56, 0xc4, 0xd5, 0x81,
+	0x3d, 0xe1, 0xed, 0x43, 0x71, 0xa3, 0x87, 0x5c, 0xe3, 0x8e, 0x29, 0xda, 0xc4, 0x77, 0x7d, 0x54,
+	0x9a, 0x2e, 0x42, 0x2e, 0xe6, 0x3d, 0x14, 0xba, 0x44, 0x2a, 0xa4, 0x9a, 0x6f, 0xba, 0x15, 0x5d,
+	0x85, 0x9c, 0xed, 0x5e, 0x9a, 0xa9, 0x90, 0x6a, 0xa1, 0x71, 0xcb, 0x4f, 0x71, 0xc3, 0x77, 0x35,
+	0x9d, 0xc4, 0x5b, 0x86, 0x6b, 0x2f, 0x50, 0x9f, 0x6d, 0x44, 0xe1, 0x92, 0xe0, 0x11, 0xba, 0x36,
+	0xe6, 0xb7, 0xf7, 0x95, 0x40, 0xf1, 0x75, 0xdc, 0x19, 0x83, 0x3a, 0x6d, 0x4e, 0xfe, 0xbb, 0x39,
+	0x5d, 0x85, 0x42, 0xdf, 0xd4, 0x34, 0xb7, 0x77, 0xf8, 0xe5, 0x41, 0x85, 0x81, 0x41, 0xfe, 0xf3,
+	0xc4, 0xa0, 0x4d, 0xae, 0x0e, 0x9a, 0x60, 0x8f, 0x27, 0xbf, 0xbd, 0x15, 0x28, 0x3e, 0xc5, 0x2e,
+	0x9e, 0x07, 0x9a, 0x04, 0xff, 0x16, 0xe8, 0xab, 0x50, 0xb9, 0x5b, 0xaa, 0x69, 0x7e, 0xde, 0x00,
+	0x88, 0x79, 0x80, 0x2d, 0x2d, 0x0f, 0x50, 0x18, 0xa8, 0x7c, 0x33, 0x9f, 0xec, 0xec, 0x24, 0x1b,
+	0x74, 0x09, 0xcc, 0xa2, 0xa5, 0xc2, 0x23, 0x2c, 0xcd, 0x56, 0x48, 0xf5, 0x72, 0x73, 0x2e, 0xd9,
+	0xd8, 0x0e, 0x8f, 0xd0, 0xfb, 0x4d, 0xa0, 0x78, 0xa6, 0x95, 0x8a, 0xa5, 0x50, 0x48, 0xd7, 0xe0,
+	0x8a, 0xbd, 0xb3, 0x2a, 0x91, 0xca, 0x6c, 0x56, 0x9f, 0x06, 0x1a, 0xba, 0x0c, 0x57, 0x05, 0xbe,
+	0xd7, 0xad, 0x31, 0xae, 0x85, 0x64, 0x7b, 0x6b, 0xc8, 0xf6, 0x12, 0xe6, 0x22, 0xd4, 0xbc, 0xc3,
+	0x35, 0x37, 0x68, 0x85, 0xc6, 0xbd, 0xd4, 0x3e, 0x03, 0xbe, 0x4d, 0x27, 0x6a, 0x0e, 0xe5, 0x8d,
+	0x93, 0x1c, 0x2c, 0x58, 0x8c, 0x6d, 0x1b, 0x35, 0xfa, 0x9d, 0xc0, 0xfc, 0xe8, 0x5c, 0xd2, 0x7a,
+	0x6a, 0xed, 0x09, 0x23, 0x5c, 0xce, 0x72, 0x6b, 0x8f, 0x9d, 0xfc, 0xf9, 0xfb, 0x6d, 0x66, 0xc5,
+	0xbb, 0x3d, 0x0c, 0xd7, 0x47, 0xfb, 0x66, 0xd6, 0xe2, 0x9e, 0xdc, 0xc7, 0xb6, 0x56, 0xac, 0x76,
+	0xec, 0x02, 0xa7, 0x1e, 0x93, 0x1a, 0xfd, 0x42, 0x20, 0x3f, 0x1c, 0x62, 0x9a, 0x7e, 0xe3, 0xf3,
+	0xc3, 0x9e, 0x0d, 0xe9, 0xae, 0x41, 0x5a, 0xa6, 0x23, 0x48, 0xc9, 0x60, 0x8d, 0x00, 0x0d, 0x78,
+	0x58, 0xed, 0x98, 0xfe, 0x20, 0x30, 0x3f, 0x9a, 0x95, 0x29, 0x46, 0x4d, 0x88, 0x55, 0x36, 0xaa,
+	0x47, 0x86, 0xaa, 0xde, 0xb8, 0x73, 0x4a, 0xe5, 0x3e, 0x43, 0x17, 0xc3, 0x25, 0x7e, 0x7d, 0x26,
+	0x30, 0x3f, 0x1a, 0x9d, 0x29, 0x7c, 0x13, 0x52, 0x56, 0x5e, 0x1c, 0x0b, 0xe9, 0xb3, 0xe4, 0x13,
+	0x37, 0x30, 0xaa, 0x96, 0xcd, 0xa8, 0x9f, 0x04, 0x0a, 0x23, 0x69, 0xa1, 0x2c, 0x95, 0x63, 0x3c,
+	0xc2, 0xe5, 0x7a, 0x76, 0x81, 0x1d, 0xf4, 0x49, 0x6f, 0xf2, 0xe2, 0xe1, 0x5a, 0xff, 0x44, 0xe0,
+	0x66, 0x5b, 0x46, 0x69, 0x5d, 0xd6, 0xe9, 0x99, 0x94, 0x6c, 0x25, 0x7e, 0x6c, 0x91, 0x37, 0x4f,
+	0x9c, 0x24, 0x90, 0x5d, 0x2e, 0x02, 0x5f, 0xf6, 0x02, 0x16, 0xa0, 0x30, 0x6e, 0x31, 0xfb, 0x88,
+	0xc7, 0xa1, 0x9a, 0xf8, 0x5f, 0xb2, 0x6a, 0x97, 0xbf, 0x66, 0x66, 0x37, 0x76, 0xb6, 0x77, 0x73,
+	0x46, 0xf3, 0xe0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x45, 0x0b, 0xcb, 0x15, 0x07, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -581,52 +636,3 @@ var _TenantService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/talent/v4beta1/tenant_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/talent/v4beta1/tenant_service.proto", fileDescriptor_tenant_service_b3e8de717c6e6008)
-}
-
-var fileDescriptor_tenant_service_b3e8de717c6e6008 = []byte{
-	// 641 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x95, 0x4f, 0x4f, 0x13, 0x41,
-	0x18, 0xc6, 0x33, 0xa0, 0x95, 0xbe, 0x85, 0x68, 0xa6, 0x09, 0x69, 0x8a, 0xc6, 0x66, 0x35, 0xa4,
-	0x54, 0xdd, 0xa9, 0xd5, 0x78, 0x90, 0x70, 0x10, 0xfc, 0x13, 0x13, 0x49, 0x48, 0xc1, 0x8b, 0x97,
-	0x66, 0x68, 0x5f, 0xd6, 0x85, 0xee, 0xcc, 0xda, 0x99, 0x12, 0xc5, 0x90, 0x18, 0x0e, 0xde, 0x8c,
-	0x07, 0x13, 0x6f, 0x7a, 0xf0, 0xcb, 0xf8, 0x01, 0xfc, 0x0a, 0x7e, 0x10, 0xb3, 0x33, 0xd3, 0x52,
-	0x68, 0xd9, 0xae, 0xb7, 0xce, 0xec, 0x3c, 0xef, 0xfb, 0x9b, 0x67, 0xdf, 0x67, 0x0b, 0xf5, 0x40,
-	0xca, 0xa0, 0x8b, 0xac, 0xdd, 0x95, 0xfd, 0x0e, 0xd3, 0xbc, 0x8b, 0x42, 0xb3, 0xc3, 0x87, 0xbb,
-	0xa8, 0xf9, 0x7d, 0xa6, 0x51, 0x70, 0xa1, 0x5b, 0x0a, 0x7b, 0x87, 0x61, 0x1b, 0xfd, 0xb8, 0x27,
-	0xb5, 0xa4, 0x4b, 0x56, 0xe1, 0x1b, 0x85, 0x6f, 0x15, 0xbe, 0x53, 0x94, 0xaf, 0xbb, 0x72, 0x3c,
-	0x0e, 0x19, 0x17, 0x42, 0x6a, 0xae, 0x43, 0x29, 0x94, 0x95, 0x96, 0xab, 0x69, 0xcd, 0xda, 0x32,
-	0x8a, 0xa4, 0xc8, 0x72, 0xd2, 0x62, 0xb9, 0x93, 0x0e, 0x87, 0x99, 0xd5, 0x6e, 0x7f, 0x8f, 0x61,
-	0x14, 0xeb, 0x0f, 0xee, 0x61, 0xe5, 0xfc, 0xc3, 0xbd, 0x10, 0xbb, 0x9d, 0x56, 0xc4, 0xd5, 0x81,
-	0x3d, 0xe1, 0xed, 0x43, 0x71, 0xa3, 0x87, 0x5c, 0xe3, 0x8e, 0x29, 0xda, 0xc4, 0x77, 0x7d, 0x54,
-	0x9a, 0x2e, 0x42, 0x2e, 0xe6, 0x3d, 0x14, 0xba, 0x44, 0x2a, 0xa4, 0x9a, 0x6f, 0xba, 0x15, 0x5d,
-	0x85, 0x9c, 0xed, 0x5e, 0x9a, 0xa9, 0x90, 0x6a, 0xa1, 0x71, 0xcb, 0x4f, 0x71, 0xc3, 0x77, 0x35,
-	0x9d, 0xc4, 0x5b, 0x86, 0x6b, 0x2f, 0x50, 0x9f, 0x6d, 0x44, 0xe1, 0x92, 0xe0, 0x11, 0xba, 0x36,
-	0xe6, 0xb7, 0xf7, 0x95, 0x40, 0xf1, 0x75, 0xdc, 0x19, 0x83, 0x3a, 0x6d, 0x4e, 0xfe, 0xbb, 0x39,
-	0x5d, 0x85, 0x42, 0xdf, 0xd4, 0x34, 0xb7, 0x77, 0xf8, 0xe5, 0x41, 0x85, 0x81, 0x41, 0xfe, 0xf3,
-	0xc4, 0xa0, 0x4d, 0xae, 0x0e, 0x9a, 0x60, 0x8f, 0x27, 0xbf, 0xbd, 0x15, 0x28, 0x3e, 0xc5, 0x2e,
-	0x9e, 0x07, 0x9a, 0x04, 0xff, 0x16, 0xe8, 0xab, 0x50, 0xb9, 0x5b, 0xaa, 0x69, 0x7e, 0xde, 0x00,
-	0x88, 0x79, 0x80, 0x2d, 0x2d, 0x0f, 0x50, 0x18, 0xa8, 0x7c, 0x33, 0x9f, 0xec, 0xec, 0x24, 0x1b,
-	0x74, 0x09, 0xcc, 0xa2, 0xa5, 0xc2, 0x23, 0x2c, 0xcd, 0x56, 0x48, 0xf5, 0x72, 0x73, 0x2e, 0xd9,
-	0xd8, 0x0e, 0x8f, 0xd0, 0xfb, 0x4d, 0xa0, 0x78, 0xa6, 0x95, 0x8a, 0xa5, 0x50, 0x48, 0xd7, 0xe0,
-	0x8a, 0xbd, 0xb3, 0x2a, 0x91, 0xca, 0x6c, 0x56, 0x9f, 0x06, 0x1a, 0xba, 0x0c, 0x57, 0x05, 0xbe,
-	0xd7, 0xad, 0x31, 0xae, 0x85, 0x64, 0x7b, 0x6b, 0xc8, 0xf6, 0x12, 0xe6, 0x22, 0xd4, 0xbc, 0xc3,
-	0x35, 0x37, 0x68, 0x85, 0xc6, 0xbd, 0xd4, 0x3e, 0x03, 0xbe, 0x4d, 0x27, 0x6a, 0x0e, 0xe5, 0x8d,
-	0x93, 0x1c, 0x2c, 0x58, 0x8c, 0x6d, 0x1b, 0x35, 0xfa, 0x9d, 0xc0, 0xfc, 0xe8, 0x5c, 0xd2, 0x7a,
-	0x6a, 0xed, 0x09, 0x23, 0x5c, 0xce, 0x72, 0x6b, 0x8f, 0x9d, 0xfc, 0xf9, 0xfb, 0x6d, 0x66, 0xc5,
-	0xbb, 0x3d, 0x0c, 0xd7, 0x47, 0xfb, 0x66, 0xd6, 0xe2, 0x9e, 0xdc, 0xc7, 0xb6, 0x56, 0xac, 0x76,
-	0xec, 0x02, 0xa7, 0x1e, 0x93, 0x1a, 0xfd, 0x42, 0x20, 0x3f, 0x1c, 0x62, 0x9a, 0x7e, 0xe3, 0xf3,
-	0xc3, 0x9e, 0x0d, 0xe9, 0xae, 0x41, 0x5a, 0xa6, 0x23, 0x48, 0xc9, 0x60, 0x8d, 0x00, 0x0d, 0x78,
-	0x58, 0xed, 0x98, 0xfe, 0x20, 0x30, 0x3f, 0x9a, 0x95, 0x29, 0x46, 0x4d, 0x88, 0x55, 0x36, 0xaa,
-	0x47, 0x86, 0xaa, 0xde, 0xb8, 0x73, 0x4a, 0xe5, 0x3e, 0x43, 0x17, 0xc3, 0x25, 0x7e, 0x7d, 0x26,
-	0x30, 0x3f, 0x1a, 0x9d, 0x29, 0x7c, 0x13, 0x52, 0x56, 0x5e, 0x1c, 0x0b, 0xe9, 0xb3, 0xe4, 0x13,
-	0x37, 0x30, 0xaa, 0x96, 0xcd, 0xa8, 0x9f, 0x04, 0x0a, 0x23, 0x69, 0xa1, 0x2c, 0x95, 0x63, 0x3c,
-	0xc2, 0xe5, 0x7a, 0x76, 0x81, 0x1d, 0xf4, 0x49, 0x6f, 0xf2, 0xe2, 0xe1, 0x5a, 0xff, 0x44, 0xe0,
-	0x66, 0x5b, 0x46, 0x69, 0x5d, 0xd6, 0xe9, 0x99, 0x94, 0x6c, 0x25, 0x7e, 0x6c, 0x91, 0x37, 0x4f,
-	0x9c, 0x24, 0x90, 0x5d, 0x2e, 0x02, 0x5f, 0xf6, 0x02, 0x16, 0xa0, 0x30, 0x6e, 0x31, 0xfb, 0x88,
-	0xc7, 0xa1, 0x9a, 0xf8, 0x5f, 0xb2, 0x6a, 0x97, 0xbf, 0x66, 0x66, 0x37, 0x76, 0xb6, 0x77, 0x73,
-	0x46, 0xf3, 0xe0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x45, 0x0b, 0xcb, 0x15, 0x07, 0x00,
-	0x00,
-}
diff --git a/googleapis/cloud/tasks/v2/cloudtasks.pb.go b/googleapis/cloud/tasks/v2/cloudtasks.pb.go
index 088e85fc11..3a7e45db7c 100644
--- a/googleapis/cloud/tasks/v2/cloudtasks.pb.go
+++ b/googleapis/cloud/tasks/v2/cloudtasks.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2/cloudtasks.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import _ "google.golang.org/genproto/googleapis/rpc/code"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package tasks
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	_ "google.golang.org/genproto/googleapis/rpc/code"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ListQueues][google.cloud.tasks.v2.CloudTasks.ListQueues].
 type ListQueuesRequest struct {
@@ -72,16 +72,17 @@ func (m *ListQueuesRequest) Reset()         { *m = ListQueuesRequest{} }
 func (m *ListQueuesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListQueuesRequest) ProtoMessage()    {}
 func (*ListQueuesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{0}
+	return fileDescriptor_8af203ae11a305f5, []int{0}
 }
+
 func (m *ListQueuesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListQueuesRequest.Unmarshal(m, b)
 }
 func (m *ListQueuesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListQueuesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListQueuesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListQueuesRequest.Merge(dst, src)
+func (m *ListQueuesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesRequest.Merge(m, src)
 }
 func (m *ListQueuesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListQueuesRequest.Size(m)
@@ -143,16 +144,17 @@ func (m *ListQueuesResponse) Reset()         { *m = ListQueuesResponse{} }
 func (m *ListQueuesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListQueuesResponse) ProtoMessage()    {}
 func (*ListQueuesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{1}
+	return fileDescriptor_8af203ae11a305f5, []int{1}
 }
+
 func (m *ListQueuesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListQueuesResponse.Unmarshal(m, b)
 }
 func (m *ListQueuesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListQueuesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListQueuesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListQueuesResponse.Merge(dst, src)
+func (m *ListQueuesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesResponse.Merge(m, src)
 }
 func (m *ListQueuesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListQueuesResponse.Size(m)
@@ -193,16 +195,17 @@ func (m *GetQueueRequest) Reset()         { *m = GetQueueRequest{} }
 func (m *GetQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*GetQueueRequest) ProtoMessage()    {}
 func (*GetQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{2}
+	return fileDescriptor_8af203ae11a305f5, []int{2}
 }
+
 func (m *GetQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetQueueRequest.Unmarshal(m, b)
 }
 func (m *GetQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetQueueRequest.Merge(dst, src)
+func (m *GetQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetQueueRequest.Merge(m, src)
 }
 func (m *GetQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_GetQueueRequest.Size(m)
@@ -246,16 +249,17 @@ func (m *CreateQueueRequest) Reset()         { *m = CreateQueueRequest{} }
 func (m *CreateQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateQueueRequest) ProtoMessage()    {}
 func (*CreateQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{3}
+	return fileDescriptor_8af203ae11a305f5, []int{3}
 }
+
 func (m *CreateQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateQueueRequest.Unmarshal(m, b)
 }
 func (m *CreateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateQueueRequest.Merge(dst, src)
+func (m *CreateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateQueueRequest.Merge(m, src)
 }
 func (m *CreateQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateQueueRequest.Size(m)
@@ -305,16 +309,17 @@ func (m *UpdateQueueRequest) Reset()         { *m = UpdateQueueRequest{} }
 func (m *UpdateQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateQueueRequest) ProtoMessage()    {}
 func (*UpdateQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{4}
+	return fileDescriptor_8af203ae11a305f5, []int{4}
 }
+
 func (m *UpdateQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateQueueRequest.Unmarshal(m, b)
 }
 func (m *UpdateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateQueueRequest.Merge(dst, src)
+func (m *UpdateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateQueueRequest.Merge(m, src)
 }
 func (m *UpdateQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateQueueRequest.Size(m)
@@ -355,16 +360,17 @@ func (m *DeleteQueueRequest) Reset()         { *m = DeleteQueueRequest{} }
 func (m *DeleteQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteQueueRequest) ProtoMessage()    {}
 func (*DeleteQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{5}
+	return fileDescriptor_8af203ae11a305f5, []int{5}
 }
+
 func (m *DeleteQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteQueueRequest.Unmarshal(m, b)
 }
 func (m *DeleteQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteQueueRequest.Merge(dst, src)
+func (m *DeleteQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteQueueRequest.Merge(m, src)
 }
 func (m *DeleteQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteQueueRequest.Size(m)
@@ -398,16 +404,17 @@ func (m *PurgeQueueRequest) Reset()         { *m = PurgeQueueRequest{} }
 func (m *PurgeQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*PurgeQueueRequest) ProtoMessage()    {}
 func (*PurgeQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{6}
+	return fileDescriptor_8af203ae11a305f5, []int{6}
 }
+
 func (m *PurgeQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PurgeQueueRequest.Unmarshal(m, b)
 }
 func (m *PurgeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PurgeQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *PurgeQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PurgeQueueRequest.Merge(dst, src)
+func (m *PurgeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PurgeQueueRequest.Merge(m, src)
 }
 func (m *PurgeQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_PurgeQueueRequest.Size(m)
@@ -441,16 +448,17 @@ func (m *PauseQueueRequest) Reset()         { *m = PauseQueueRequest{} }
 func (m *PauseQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*PauseQueueRequest) ProtoMessage()    {}
 func (*PauseQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{7}
+	return fileDescriptor_8af203ae11a305f5, []int{7}
 }
+
 func (m *PauseQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PauseQueueRequest.Unmarshal(m, b)
 }
 func (m *PauseQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PauseQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *PauseQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PauseQueueRequest.Merge(dst, src)
+func (m *PauseQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseQueueRequest.Merge(m, src)
 }
 func (m *PauseQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_PauseQueueRequest.Size(m)
@@ -484,16 +492,17 @@ func (m *ResumeQueueRequest) Reset()         { *m = ResumeQueueRequest{} }
 func (m *ResumeQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*ResumeQueueRequest) ProtoMessage()    {}
 func (*ResumeQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{8}
+	return fileDescriptor_8af203ae11a305f5, []int{8}
 }
+
 func (m *ResumeQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResumeQueueRequest.Unmarshal(m, b)
 }
 func (m *ResumeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResumeQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *ResumeQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResumeQueueRequest.Merge(dst, src)
+func (m *ResumeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeQueueRequest.Merge(m, src)
 }
 func (m *ResumeQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_ResumeQueueRequest.Size(m)
@@ -558,16 +567,17 @@ func (m *ListTasksRequest) Reset()         { *m = ListTasksRequest{} }
 func (m *ListTasksRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTasksRequest) ProtoMessage()    {}
 func (*ListTasksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{9}
+	return fileDescriptor_8af203ae11a305f5, []int{9}
 }
+
 func (m *ListTasksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTasksRequest.Unmarshal(m, b)
 }
 func (m *ListTasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTasksRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTasksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTasksRequest.Merge(dst, src)
+func (m *ListTasksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksRequest.Merge(m, src)
 }
 func (m *ListTasksRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTasksRequest.Size(m)
@@ -627,16 +637,17 @@ func (m *ListTasksResponse) Reset()         { *m = ListTasksResponse{} }
 func (m *ListTasksResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTasksResponse) ProtoMessage()    {}
 func (*ListTasksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{10}
+	return fileDescriptor_8af203ae11a305f5, []int{10}
 }
+
 func (m *ListTasksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTasksResponse.Unmarshal(m, b)
 }
 func (m *ListTasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTasksResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTasksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTasksResponse.Merge(dst, src)
+func (m *ListTasksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksResponse.Merge(m, src)
 }
 func (m *ListTasksResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTasksResponse.Size(m)
@@ -690,16 +701,17 @@ func (m *GetTaskRequest) Reset()         { *m = GetTaskRequest{} }
 func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTaskRequest) ProtoMessage()    {}
 func (*GetTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{11}
+	return fileDescriptor_8af203ae11a305f5, []int{11}
 }
+
 func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b)
 }
 func (m *GetTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTaskRequest.Merge(dst, src)
+func (m *GetTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTaskRequest.Merge(m, src)
 }
 func (m *GetTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTaskRequest.Size(m)
@@ -791,16 +803,17 @@ func (m *CreateTaskRequest) Reset()         { *m = CreateTaskRequest{} }
 func (m *CreateTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTaskRequest) ProtoMessage()    {}
 func (*CreateTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{12}
+	return fileDescriptor_8af203ae11a305f5, []int{12}
 }
+
 func (m *CreateTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTaskRequest.Unmarshal(m, b)
 }
 func (m *CreateTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTaskRequest.Merge(dst, src)
+func (m *CreateTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTaskRequest.Merge(m, src)
 }
 func (m *CreateTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTaskRequest.Size(m)
@@ -849,16 +862,17 @@ func (m *DeleteTaskRequest) Reset()         { *m = DeleteTaskRequest{} }
 func (m *DeleteTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTaskRequest) ProtoMessage()    {}
 func (*DeleteTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{13}
+	return fileDescriptor_8af203ae11a305f5, []int{13}
 }
+
 func (m *DeleteTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTaskRequest.Unmarshal(m, b)
 }
 func (m *DeleteTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTaskRequest.Merge(dst, src)
+func (m *DeleteTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTaskRequest.Merge(m, src)
 }
 func (m *DeleteTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTaskRequest.Size(m)
@@ -906,16 +920,17 @@ func (m *RunTaskRequest) Reset()         { *m = RunTaskRequest{} }
 func (m *RunTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*RunTaskRequest) ProtoMessage()    {}
 func (*RunTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_7027f62ef3ad9740, []int{14}
+	return fileDescriptor_8af203ae11a305f5, []int{14}
 }
+
 func (m *RunTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunTaskRequest.Unmarshal(m, b)
 }
 func (m *RunTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunTaskRequest.Merge(dst, src)
+func (m *RunTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunTaskRequest.Merge(m, src)
 }
 func (m *RunTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_RunTaskRequest.Size(m)
@@ -958,6 +973,83 @@ func init() {
 	proto.RegisterType((*RunTaskRequest)(nil), "google.cloud.tasks.v2.RunTaskRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/tasks/v2/cloudtasks.proto", fileDescriptor_8af203ae11a305f5)
+}
+
+var fileDescriptor_8af203ae11a305f5 = []byte{
+	// 1096 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0x4b, 0x8f, 0xdb, 0x54,
+	0x14, 0xc7, 0x75, 0xe7, 0xd5, 0xce, 0x49, 0xdb, 0x61, 0xae, 0xd4, 0x2a, 0xcd, 0x14, 0x14, 0x2c,
+	0x75, 0x26, 0x58, 0xc8, 0xee, 0xb8, 0xa5, 0xa8, 0x09, 0x15, 0x4c, 0x4b, 0x67, 0x84, 0x28, 0x52,
+	0x70, 0x06, 0x16, 0x6c, 0x82, 0x9b, 0xb9, 0x63, 0x99, 0xc4, 0x8f, 0xfa, 0xda, 0x29, 0x14, 0x8d,
+	0x90, 0x50, 0x59, 0xc0, 0x8a, 0xa7, 0x90, 0x58, 0xc2, 0x9a, 0x35, 0x1f, 0x84, 0x0f, 0xc0, 0x86,
+	0x0f, 0x82, 0xee, 0xc3, 0x63, 0x8f, 0x3d, 0xb6, 0x93, 0x81, 0xb2, 0x4a, 0x7c, 0xcf, 0xff, 0xde,
+	0xf3, 0xf3, 0xb9, 0x27, 0xe7, 0x9c, 0xc0, 0xa6, 0xed, 0xfb, 0xf6, 0x84, 0xe8, 0xa3, 0x89, 0x1f,
+	0x1f, 0xe8, 0x91, 0x45, 0xc7, 0x54, 0x9f, 0x1a, 0xe2, 0x91, 0x3f, 0x69, 0x41, 0xe8, 0x47, 0x3e,
+	0xbe, 0x2c, 0x74, 0x1a, 0x37, 0x68, 0xc2, 0x32, 0x35, 0x5a, 0xd7, 0xe4, 0x76, 0x2b, 0x70, 0x74,
+	0xcb, 0xf3, 0xfc, 0xc8, 0x8a, 0x1c, 0xdf, 0x93, 0x9b, 0x5a, 0x57, 0x33, 0xd6, 0x90, 0x50, 0x3f,
+	0x0e, 0x47, 0x44, 0x9a, 0x36, 0xa4, 0x89, 0x3f, 0x3d, 0x8a, 0x0f, 0x75, 0xe2, 0x06, 0xd1, 0x67,
+	0xd2, 0xd8, 0xce, 0x1b, 0x0f, 0x1d, 0x32, 0x39, 0x18, 0xba, 0x16, 0x1d, 0xe7, 0x14, 0x39, 0xec,
+	0x28, 0x55, 0xbc, 0x7c, 0xba, 0xe2, 0x71, 0x4c, 0xe2, 0x84, 0xe1, 0x25, 0x29, 0x71, 0x2c, 0x57,
+	0x9f, 0x6e, 0xb3, 0x8f, 0x61, 0xe0, 0x4f, 0x9c, 0x51, 0x82, 0xd1, 0x3a, 0x69, 0x3f, 0x61, 0x93,
+	0xf1, 0xd0, 0xc3, 0x60, 0xa4, 0x8f, 0xfc, 0x03, 0x79, 0xa4, 0xf2, 0x05, 0xac, 0x3f, 0x74, 0x68,
+	0xf4, 0x3e, 0xf3, 0x42, 0x4d, 0xf2, 0x38, 0x26, 0x34, 0xc2, 0x57, 0x60, 0x25, 0xb0, 0x42, 0xe2,
+	0x45, 0x4d, 0xd4, 0x46, 0x9d, 0x55, 0x53, 0x3e, 0xb1, 0xf5, 0x43, 0x67, 0x12, 0x91, 0xb0, 0xb9,
+	0x20, 0xd6, 0xc5, 0x13, 0xde, 0x80, 0xd5, 0xc0, 0xb2, 0xc9, 0x90, 0x3a, 0x4f, 0x49, 0x73, 0xb1,
+	0x8d, 0x3a, 0xcb, 0xe6, 0x79, 0xb6, 0x30, 0x70, 0x9e, 0x12, 0xfc, 0x22, 0x00, 0x37, 0x46, 0xfe,
+	0x98, 0x78, 0xcd, 0x25, 0xbe, 0x91, 0xcb, 0xf7, 0xd9, 0x82, 0x12, 0x02, 0xce, 0x02, 0xd0, 0xc0,
+	0xf7, 0x28, 0xc1, 0xb7, 0x60, 0x85, 0xbf, 0x38, 0x6d, 0xa2, 0xf6, 0x62, 0xa7, 0x61, 0x5c, 0xd3,
+	0x4e, 0xbd, 0x4e, 0x8d, 0x6f, 0x33, 0xa5, 0x16, 0x6f, 0xc2, 0x9a, 0x47, 0x3e, 0x8d, 0x86, 0x19,
+	0x7f, 0x02, 0xf4, 0x22, 0x5b, 0xee, 0x1f, 0xfb, 0xbc, 0x0e, 0x6b, 0x7b, 0x44, 0xb8, 0x4c, 0x5e,
+	0x19, 0xc3, 0x92, 0x67, 0xb9, 0x44, 0xbe, 0x30, 0xff, 0xae, 0x7c, 0x0c, 0xf8, 0x7e, 0x48, 0xac,
+	0x88, 0x9c, 0x50, 0x96, 0x05, 0xc7, 0x80, 0x65, 0x8e, 0xc1, 0x5d, 0xd6, 0x11, 0x0b, 0xa9, 0xf2,
+	0x15, 0x02, 0xfc, 0x41, 0x70, 0x90, 0x77, 0x71, 0x7c, 0x14, 0x9a, 0xf9, 0x28, 0xdc, 0x83, 0x46,
+	0xcc, 0x4f, 0xe2, 0x59, 0x27, 0x21, 0x5a, 0xc9, 0xce, 0x24, 0x31, 0xb5, 0x5d, 0x96, 0x98, 0xef,
+	0x59, 0x74, 0x6c, 0x82, 0x90, 0xb3, 0xef, 0x4a, 0x07, 0xf0, 0xdb, 0x64, 0x42, 0x72, 0x18, 0xa7,
+	0xc5, 0x64, 0x0b, 0xd6, 0xfb, 0x71, 0x68, 0xcf, 0x26, 0xb4, 0x62, 0x5a, 0x2f, 0xec, 0x00, 0x36,
+	0x09, 0x8d, 0xdd, 0x7a, 0xe5, 0xef, 0x08, 0x5e, 0x60, 0xb9, 0xb2, 0xcf, 0x02, 0x50, 0x77, 0x1d,
+	0x0f, 0xe0, 0x62, 0x28, 0xb3, 0x69, 0x38, 0x75, 0xc8, 0x13, 0x1e, 0x91, 0x4b, 0x46, 0xbb, 0x24,
+	0x96, 0xec, 0x4c, 0xed, 0x43, 0x87, 0x3c, 0x31, 0x2f, 0x24, 0xdb, 0xd8, 0xd3, 0xbf, 0x4a, 0x6d,
+	0x4f, 0xfc, 0xb6, 0x24, 0xae, 0xcc, 0xec, 0x6d, 0x58, 0xe6, 0x4e, 0x65, 0x62, 0x6f, 0x54, 0xf0,
+	0x98, 0x42, 0x39, 0x73, 0x5a, 0x8f, 0xe1, 0xd2, 0x1e, 0xe1, 0xee, 0x2a, 0xa2, 0xf8, 0x1f, 0x05,
+	0x46, 0xf9, 0x0d, 0xc1, 0xba, 0xf8, 0x75, 0x64, 0x1d, 0x96, 0xdd, 0x86, 0x0e, 0x4b, 0x51, 0x9a,
+	0x96, 0x95, 0x2f, 0xcd, 0x85, 0x45, 0xca, 0xc5, 0x33, 0x51, 0x6e, 0xc1, 0xba, 0x48, 0xec, 0x9a,
+	0xa8, 0xb0, 0xd8, 0x99, 0xb1, 0xf7, 0xff, 0xc4, 0xce, 0xf8, 0x0b, 0x03, 0xdc, 0x67, 0x52, 0x9e,
+	0x1a, 0xf8, 0x27, 0x04, 0x90, 0xd6, 0x40, 0xdc, 0x29, 0x39, 0xad, 0x50, 0xa7, 0x5b, 0xaf, 0xcc,
+	0xa0, 0x14, 0x6e, 0x15, 0xe3, 0xcb, 0x3f, 0xff, 0xfe, 0x61, 0xe1, 0x55, 0xac, 0xb2, 0x9e, 0xf2,
+	0xb9, 0xb8, 0x95, 0xbb, 0x41, 0xe8, 0x7f, 0x42, 0x46, 0x11, 0xd5, 0x55, 0x7d, 0xe2, 0x8f, 0x44,
+	0x27, 0xd4, 0xd5, 0x23, 0x5d, 0x96, 0xd3, 0x67, 0x08, 0xce, 0x27, 0x75, 0x12, 0x6f, 0x96, 0xf8,
+	0xca, 0x15, 0xd2, 0x56, 0x65, 0xb1, 0xca, 0x61, 0xb0, 0x98, 0x96, 0x40, 0x48, 0x06, 0x5d, 0x3d,
+	0xc2, 0xdf, 0x21, 0x68, 0x64, 0xea, 0x30, 0x2e, 0x7b, 0xeb, 0x62, 0xad, 0xae, 0x81, 0xb9, 0xc3,
+	0x61, 0x6e, 0x2a, 0x73, 0xc4, 0xa4, 0x2b, 0xab, 0xed, 0xcf, 0x08, 0x1a, 0x99, 0xc2, 0x5d, 0xca,
+	0x54, 0x2c, 0xee, 0x35, 0x4c, 0x6f, 0x72, 0xa6, 0x3b, 0xc6, 0x0d, 0xce, 0x24, 0x9a, 0xff, 0x4c,
+	0x61, 0x4a, 0xc8, 0x9e, 0x21, 0x68, 0x64, 0x6a, 0x79, 0x29, 0x59, 0xb1, 0xde, 0xb7, 0xae, 0x14,
+	0xba, 0xc5, 0x03, 0x36, 0xe3, 0x24, 0x97, 0xa6, 0xce, 0x79, 0x69, 0x90, 0x36, 0x8a, 0xd2, 0x9c,
+	0x2e, 0xf4, 0x92, 0x9a, 0xf0, 0xf4, 0x38, 0xca, 0x6b, 0xca, 0x8d, 0xd9, 0x51, 0xba, 0x01, 0xf3,
+	0xd1, 0x45, 0xaa, 0x60, 0x3a, 0xee, 0x49, 0xe5, 0x4c, 0xf9, 0xb6, 0xf5, 0x3c, 0x98, 0x98, 0x0f,
+	0xc6, 0xf4, 0x23, 0x82, 0x46, 0xa6, 0xfd, 0x95, 0x5e, 0x57, 0xb1, 0x45, 0xd6, 0x50, 0xbd, 0xc1,
+	0xa9, 0x6e, 0x2b, 0xdb, 0x73, 0x50, 0x85, 0xdc, 0x89, 0x0c, 0xd5, 0x85, 0x3d, 0x12, 0xbd, 0x63,
+	0xb9, 0x7d, 0x3e, 0x44, 0x62, 0x25, 0x71, 0xe6, 0x58, 0xae, 0x36, 0xdd, 0xd6, 0xb2, 0xc6, 0x04,
+	0xe8, 0x72, 0x4e, 0x23, 0xac, 0xca, 0x2e, 0x27, 0x79, 0x4b, 0xe9, 0x71, 0x92, 0x64, 0xac, 0xae,
+	0xa7, 0xb1, 0x33, 0x2e, 0x12, 0xa6, 0x41, 0x15, 0xd3, 0xe0, 0xf9, 0x33, 0xd1, 0x1c, 0xd3, 0x1f,
+	0x08, 0xf0, 0x3e, 0xa1, 0x7c, 0x91, 0x84, 0xae, 0x43, 0x29, 0xdb, 0x92, 0xa6, 0x96, 0xf4, 0x5a,
+	0x94, 0x14, 0x4a, 0x78, 0x85, 0x52, 0x96, 0xf0, 0x87, 0x9c, 0x79, 0x57, 0xd9, 0x99, 0x93, 0x39,
+	0x2a, 0x1c, 0xc9, 0xc8, 0x7f, 0x41, 0xb0, 0x7a, 0x3c, 0x9d, 0xe0, 0xad, 0x8a, 0x4e, 0x92, 0x1d,
+	0xb7, 0x5a, 0x9d, 0x7a, 0xa1, 0xc4, 0xed, 0x72, 0xdc, 0x5b, 0xd8, 0xa8, 0xaf, 0xae, 0x29, 0xac,
+	0xf8, 0xdf, 0x83, 0xbf, 0x46, 0x70, 0x4e, 0x8e, 0x32, 0xf8, 0x7a, 0x79, 0xe3, 0xc9, 0xb4, 0xeb,
+	0x56, 0xd5, 0x4c, 0x91, 0x63, 0x99, 0xe5, 0xc7, 0x20, 0xff, 0x80, 0xa9, 0x47, 0xf8, 0x7b, 0x04,
+	0x90, 0x0e, 0x3a, 0xa5, 0x55, 0xa3, 0x30, 0x0b, 0x55, 0x13, 0xdd, 0xe5, 0x44, 0xaf, 0x2b, 0x67,
+	0x88, 0x0e, 0xbb, 0xbd, 0x6f, 0x10, 0x40, 0x3a, 0xd8, 0x94, 0x42, 0x15, 0x66, 0x9f, 0xd2, 0x1a,
+	0x2f, 0x23, 0xa4, 0x9e, 0x25, 0x42, 0xdf, 0x22, 0x38, 0x27, 0x87, 0xa7, 0xd2, 0xdb, 0x3a, 0x39,
+	0x5c, 0x55, 0xc7, 0x66, 0x87, 0xb3, 0xf4, 0x94, 0xdb, 0xf3, 0xb3, 0x74, 0xc3, 0xd8, 0xeb, 0x22,
+	0xf5, 0x5e, 0x08, 0x57, 0x47, 0xbe, 0x7b, 0xba, 0x93, 0x7b, 0x6b, 0xe9, 0xec, 0xd5, 0x67, 0x51,
+	0xe8, 0xa3, 0x8f, 0xba, 0x52, 0x69, 0xfb, 0x13, 0xcb, 0xb3, 0x35, 0x3f, 0xb4, 0x75, 0x9b, 0x78,
+	0x3c, 0x46, 0xba, 0x30, 0x59, 0x81, 0x43, 0x73, 0xff, 0xcd, 0x7b, 0xfc, 0xcb, 0xaf, 0x0b, 0xcb,
+	0xfb, 0x3b, 0x83, 0x77, 0x07, 0x8f, 0x56, 0xb8, 0xfc, 0xe6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0xa7, 0xfa, 0xc3, 0xfb, 0xa2, 0x10, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1800,80 +1892,3 @@ var _CloudTasks_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/tasks/v2/cloudtasks.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/tasks/v2/cloudtasks.proto", fileDescriptor_cloudtasks_7027f62ef3ad9740)
-}
-
-var fileDescriptor_cloudtasks_7027f62ef3ad9740 = []byte{
-	// 1096 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0x4b, 0x8f, 0xdb, 0x54,
-	0x14, 0xc7, 0x75, 0xe7, 0xd5, 0xce, 0x49, 0xdb, 0x61, 0xae, 0xd4, 0x2a, 0xcd, 0x14, 0x14, 0x2c,
-	0x75, 0x26, 0x58, 0xc8, 0xee, 0xb8, 0xa5, 0xa8, 0x09, 0x15, 0x4c, 0x4b, 0x67, 0x84, 0x28, 0x52,
-	0x70, 0x06, 0x16, 0x6c, 0x82, 0x9b, 0xb9, 0x63, 0x99, 0xc4, 0x8f, 0xfa, 0xda, 0x29, 0x14, 0x8d,
-	0x90, 0x50, 0x59, 0xc0, 0x8a, 0xa7, 0x90, 0x58, 0xc2, 0x9a, 0x35, 0x1f, 0x84, 0x0f, 0xc0, 0x86,
-	0x0f, 0x82, 0xee, 0xc3, 0x63, 0x8f, 0x3d, 0xb6, 0x93, 0x81, 0xb2, 0x4a, 0x7c, 0xcf, 0xff, 0xde,
-	0xf3, 0xf3, 0xb9, 0x27, 0xe7, 0x9c, 0xc0, 0xa6, 0xed, 0xfb, 0xf6, 0x84, 0xe8, 0xa3, 0x89, 0x1f,
-	0x1f, 0xe8, 0x91, 0x45, 0xc7, 0x54, 0x9f, 0x1a, 0xe2, 0x91, 0x3f, 0x69, 0x41, 0xe8, 0x47, 0x3e,
-	0xbe, 0x2c, 0x74, 0x1a, 0x37, 0x68, 0xc2, 0x32, 0x35, 0x5a, 0xd7, 0xe4, 0x76, 0x2b, 0x70, 0x74,
-	0xcb, 0xf3, 0xfc, 0xc8, 0x8a, 0x1c, 0xdf, 0x93, 0x9b, 0x5a, 0x57, 0x33, 0xd6, 0x90, 0x50, 0x3f,
-	0x0e, 0x47, 0x44, 0x9a, 0x36, 0xa4, 0x89, 0x3f, 0x3d, 0x8a, 0x0f, 0x75, 0xe2, 0x06, 0xd1, 0x67,
-	0xd2, 0xd8, 0xce, 0x1b, 0x0f, 0x1d, 0x32, 0x39, 0x18, 0xba, 0x16, 0x1d, 0xe7, 0x14, 0x39, 0xec,
-	0x28, 0x55, 0xbc, 0x7c, 0xba, 0xe2, 0x71, 0x4c, 0xe2, 0x84, 0xe1, 0x25, 0x29, 0x71, 0x2c, 0x57,
-	0x9f, 0x6e, 0xb3, 0x8f, 0x61, 0xe0, 0x4f, 0x9c, 0x51, 0x82, 0xd1, 0x3a, 0x69, 0x3f, 0x61, 0x93,
-	0xf1, 0xd0, 0xc3, 0x60, 0xa4, 0x8f, 0xfc, 0x03, 0x79, 0xa4, 0xf2, 0x05, 0xac, 0x3f, 0x74, 0x68,
-	0xf4, 0x3e, 0xf3, 0x42, 0x4d, 0xf2, 0x38, 0x26, 0x34, 0xc2, 0x57, 0x60, 0x25, 0xb0, 0x42, 0xe2,
-	0x45, 0x4d, 0xd4, 0x46, 0x9d, 0x55, 0x53, 0x3e, 0xb1, 0xf5, 0x43, 0x67, 0x12, 0x91, 0xb0, 0xb9,
-	0x20, 0xd6, 0xc5, 0x13, 0xde, 0x80, 0xd5, 0xc0, 0xb2, 0xc9, 0x90, 0x3a, 0x4f, 0x49, 0x73, 0xb1,
-	0x8d, 0x3a, 0xcb, 0xe6, 0x79, 0xb6, 0x30, 0x70, 0x9e, 0x12, 0xfc, 0x22, 0x00, 0x37, 0x46, 0xfe,
-	0x98, 0x78, 0xcd, 0x25, 0xbe, 0x91, 0xcb, 0xf7, 0xd9, 0x82, 0x12, 0x02, 0xce, 0x02, 0xd0, 0xc0,
-	0xf7, 0x28, 0xc1, 0xb7, 0x60, 0x85, 0xbf, 0x38, 0x6d, 0xa2, 0xf6, 0x62, 0xa7, 0x61, 0x5c, 0xd3,
-	0x4e, 0xbd, 0x4e, 0x8d, 0x6f, 0x33, 0xa5, 0x16, 0x6f, 0xc2, 0x9a, 0x47, 0x3e, 0x8d, 0x86, 0x19,
-	0x7f, 0x02, 0xf4, 0x22, 0x5b, 0xee, 0x1f, 0xfb, 0xbc, 0x0e, 0x6b, 0x7b, 0x44, 0xb8, 0x4c, 0x5e,
-	0x19, 0xc3, 0x92, 0x67, 0xb9, 0x44, 0xbe, 0x30, 0xff, 0xae, 0x7c, 0x0c, 0xf8, 0x7e, 0x48, 0xac,
-	0x88, 0x9c, 0x50, 0x96, 0x05, 0xc7, 0x80, 0x65, 0x8e, 0xc1, 0x5d, 0xd6, 0x11, 0x0b, 0xa9, 0xf2,
-	0x15, 0x02, 0xfc, 0x41, 0x70, 0x90, 0x77, 0x71, 0x7c, 0x14, 0x9a, 0xf9, 0x28, 0xdc, 0x83, 0x46,
-	0xcc, 0x4f, 0xe2, 0x59, 0x27, 0x21, 0x5a, 0xc9, 0xce, 0x24, 0x31, 0xb5, 0x5d, 0x96, 0x98, 0xef,
-	0x59, 0x74, 0x6c, 0x82, 0x90, 0xb3, 0xef, 0x4a, 0x07, 0xf0, 0xdb, 0x64, 0x42, 0x72, 0x18, 0xa7,
-	0xc5, 0x64, 0x0b, 0xd6, 0xfb, 0x71, 0x68, 0xcf, 0x26, 0xb4, 0x62, 0x5a, 0x2f, 0xec, 0x00, 0x36,
-	0x09, 0x8d, 0xdd, 0x7a, 0xe5, 0xef, 0x08, 0x5e, 0x60, 0xb9, 0xb2, 0xcf, 0x02, 0x50, 0x77, 0x1d,
-	0x0f, 0xe0, 0x62, 0x28, 0xb3, 0x69, 0x38, 0x75, 0xc8, 0x13, 0x1e, 0x91, 0x4b, 0x46, 0xbb, 0x24,
-	0x96, 0xec, 0x4c, 0xed, 0x43, 0x87, 0x3c, 0x31, 0x2f, 0x24, 0xdb, 0xd8, 0xd3, 0xbf, 0x4a, 0x6d,
-	0x4f, 0xfc, 0xb6, 0x24, 0xae, 0xcc, 0xec, 0x6d, 0x58, 0xe6, 0x4e, 0x65, 0x62, 0x6f, 0x54, 0xf0,
-	0x98, 0x42, 0x39, 0x73, 0x5a, 0x8f, 0xe1, 0xd2, 0x1e, 0xe1, 0xee, 0x2a, 0xa2, 0xf8, 0x1f, 0x05,
-	0x46, 0xf9, 0x0d, 0xc1, 0xba, 0xf8, 0x75, 0x64, 0x1d, 0x96, 0xdd, 0x86, 0x0e, 0x4b, 0x51, 0x9a,
-	0x96, 0x95, 0x2f, 0xcd, 0x85, 0x45, 0xca, 0xc5, 0x33, 0x51, 0x6e, 0xc1, 0xba, 0x48, 0xec, 0x9a,
-	0xa8, 0xb0, 0xd8, 0x99, 0xb1, 0xf7, 0xff, 0xc4, 0xce, 0xf8, 0x0b, 0x03, 0xdc, 0x67, 0x52, 0x9e,
-	0x1a, 0xf8, 0x27, 0x04, 0x90, 0xd6, 0x40, 0xdc, 0x29, 0x39, 0xad, 0x50, 0xa7, 0x5b, 0xaf, 0xcc,
-	0xa0, 0x14, 0x6e, 0x15, 0xe3, 0xcb, 0x3f, 0xff, 0xfe, 0x61, 0xe1, 0x55, 0xac, 0xb2, 0x9e, 0xf2,
-	0xb9, 0xb8, 0x95, 0xbb, 0x41, 0xe8, 0x7f, 0x42, 0x46, 0x11, 0xd5, 0x55, 0x7d, 0xe2, 0x8f, 0x44,
-	0x27, 0xd4, 0xd5, 0x23, 0x5d, 0x96, 0xd3, 0x67, 0x08, 0xce, 0x27, 0x75, 0x12, 0x6f, 0x96, 0xf8,
-	0xca, 0x15, 0xd2, 0x56, 0x65, 0xb1, 0xca, 0x61, 0xb0, 0x98, 0x96, 0x40, 0x48, 0x06, 0x5d, 0x3d,
-	0xc2, 0xdf, 0x21, 0x68, 0x64, 0xea, 0x30, 0x2e, 0x7b, 0xeb, 0x62, 0xad, 0xae, 0x81, 0xb9, 0xc3,
-	0x61, 0x6e, 0x2a, 0x73, 0xc4, 0xa4, 0x2b, 0xab, 0xed, 0xcf, 0x08, 0x1a, 0x99, 0xc2, 0x5d, 0xca,
-	0x54, 0x2c, 0xee, 0x35, 0x4c, 0x6f, 0x72, 0xa6, 0x3b, 0xc6, 0x0d, 0xce, 0x24, 0x9a, 0xff, 0x4c,
-	0x61, 0x4a, 0xc8, 0x9e, 0x21, 0x68, 0x64, 0x6a, 0x79, 0x29, 0x59, 0xb1, 0xde, 0xb7, 0xae, 0x14,
-	0xba, 0xc5, 0x03, 0x36, 0xe3, 0x24, 0x97, 0xa6, 0xce, 0x79, 0x69, 0x90, 0x36, 0x8a, 0xd2, 0x9c,
-	0x2e, 0xf4, 0x92, 0x9a, 0xf0, 0xf4, 0x38, 0xca, 0x6b, 0xca, 0x8d, 0xd9, 0x51, 0xba, 0x01, 0xf3,
-	0xd1, 0x45, 0xaa, 0x60, 0x3a, 0xee, 0x49, 0xe5, 0x4c, 0xf9, 0xb6, 0xf5, 0x3c, 0x98, 0x98, 0x0f,
-	0xc6, 0xf4, 0x23, 0x82, 0x46, 0xa6, 0xfd, 0x95, 0x5e, 0x57, 0xb1, 0x45, 0xd6, 0x50, 0xbd, 0xc1,
-	0xa9, 0x6e, 0x2b, 0xdb, 0x73, 0x50, 0x85, 0xdc, 0x89, 0x0c, 0xd5, 0x85, 0x3d, 0x12, 0xbd, 0x63,
-	0xb9, 0x7d, 0x3e, 0x44, 0x62, 0x25, 0x71, 0xe6, 0x58, 0xae, 0x36, 0xdd, 0xd6, 0xb2, 0xc6, 0x04,
-	0xe8, 0x72, 0x4e, 0x23, 0xac, 0xca, 0x2e, 0x27, 0x79, 0x4b, 0xe9, 0x71, 0x92, 0x64, 0xac, 0xae,
-	0xa7, 0xb1, 0x33, 0x2e, 0x12, 0xa6, 0x41, 0x15, 0xd3, 0xe0, 0xf9, 0x33, 0xd1, 0x1c, 0xd3, 0x1f,
-	0x08, 0xf0, 0x3e, 0xa1, 0x7c, 0x91, 0x84, 0xae, 0x43, 0x29, 0xdb, 0x92, 0xa6, 0x96, 0xf4, 0x5a,
-	0x94, 0x14, 0x4a, 0x78, 0x85, 0x52, 0x96, 0xf0, 0x87, 0x9c, 0x79, 0x57, 0xd9, 0x99, 0x93, 0x39,
-	0x2a, 0x1c, 0xc9, 0xc8, 0x7f, 0x41, 0xb0, 0x7a, 0x3c, 0x9d, 0xe0, 0xad, 0x8a, 0x4e, 0x92, 0x1d,
-	0xb7, 0x5a, 0x9d, 0x7a, 0xa1, 0xc4, 0xed, 0x72, 0xdc, 0x5b, 0xd8, 0xa8, 0xaf, 0xae, 0x29, 0xac,
-	0xf8, 0xdf, 0x83, 0xbf, 0x46, 0x70, 0x4e, 0x8e, 0x32, 0xf8, 0x7a, 0x79, 0xe3, 0xc9, 0xb4, 0xeb,
-	0x56, 0xd5, 0x4c, 0x91, 0x63, 0x99, 0xe5, 0xc7, 0x20, 0xff, 0x80, 0xa9, 0x47, 0xf8, 0x7b, 0x04,
-	0x90, 0x0e, 0x3a, 0xa5, 0x55, 0xa3, 0x30, 0x0b, 0x55, 0x13, 0xdd, 0xe5, 0x44, 0xaf, 0x2b, 0x67,
-	0x88, 0x0e, 0xbb, 0xbd, 0x6f, 0x10, 0x40, 0x3a, 0xd8, 0x94, 0x42, 0x15, 0x66, 0x9f, 0xd2, 0x1a,
-	0x2f, 0x23, 0xa4, 0x9e, 0x25, 0x42, 0xdf, 0x22, 0x38, 0x27, 0x87, 0xa7, 0xd2, 0xdb, 0x3a, 0x39,
-	0x5c, 0x55, 0xc7, 0x66, 0x87, 0xb3, 0xf4, 0x94, 0xdb, 0xf3, 0xb3, 0x74, 0xc3, 0xd8, 0xeb, 0x22,
-	0xf5, 0x5e, 0x08, 0x57, 0x47, 0xbe, 0x7b, 0xba, 0x93, 0x7b, 0x6b, 0xe9, 0xec, 0xd5, 0x67, 0x51,
-	0xe8, 0xa3, 0x8f, 0xba, 0x52, 0x69, 0xfb, 0x13, 0xcb, 0xb3, 0x35, 0x3f, 0xb4, 0x75, 0x9b, 0x78,
-	0x3c, 0x46, 0xba, 0x30, 0x59, 0x81, 0x43, 0x73, 0xff, 0xcd, 0x7b, 0xfc, 0xcb, 0xaf, 0x0b, 0xcb,
-	0xfb, 0x3b, 0x83, 0x77, 0x07, 0x8f, 0x56, 0xb8, 0xfc, 0xe6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0xa7, 0xfa, 0xc3, 0xfb, 0xa2, 0x10, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/tasks/v2/queue.pb.go b/googleapis/cloud/tasks/v2/queue.pb.go
index 72c1c34adc..6b2144101f 100644
--- a/googleapis/cloud/tasks/v2/queue.pb.go
+++ b/googleapis/cloud/tasks/v2/queue.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2/queue.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // State of the queue.
 type Queue_State int32
@@ -63,6 +66,7 @@ var Queue_State_name = map[int32]string{
 	2: "PAUSED",
 	3: "DISABLED",
 }
+
 var Queue_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"RUNNING":           1,
@@ -73,8 +77,9 @@ var Queue_State_value = map[string]int32{
 func (x Queue_State) String() string {
 	return proto.EnumName(Queue_State_name, int32(x))
 }
+
 func (Queue_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a02b454f63d79936, []int{0, 0}
+	return fileDescriptor_a4a1833e2495b95c, []int{0, 0}
 }
 
 // A queue is a container of related tasks. Queues are configured to manage
@@ -176,16 +181,17 @@ func (m *Queue) Reset()         { *m = Queue{} }
 func (m *Queue) String() string { return proto.CompactTextString(m) }
 func (*Queue) ProtoMessage()    {}
 func (*Queue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a02b454f63d79936, []int{0}
+	return fileDescriptor_a4a1833e2495b95c, []int{0}
 }
+
 func (m *Queue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Queue.Unmarshal(m, b)
 }
 func (m *Queue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Queue.Marshal(b, m, deterministic)
 }
-func (dst *Queue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Queue.Merge(dst, src)
+func (m *Queue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Queue.Merge(m, src)
 }
 func (m *Queue) XXX_Size() int {
 	return xxx_messageInfo_Queue.Size(m)
@@ -318,16 +324,17 @@ func (m *RateLimits) Reset()         { *m = RateLimits{} }
 func (m *RateLimits) String() string { return proto.CompactTextString(m) }
 func (*RateLimits) ProtoMessage()    {}
 func (*RateLimits) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a02b454f63d79936, []int{1}
+	return fileDescriptor_a4a1833e2495b95c, []int{1}
 }
+
 func (m *RateLimits) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RateLimits.Unmarshal(m, b)
 }
 func (m *RateLimits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RateLimits.Marshal(b, m, deterministic)
 }
-func (dst *RateLimits) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RateLimits.Merge(dst, src)
+func (m *RateLimits) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RateLimits.Merge(m, src)
 }
 func (m *RateLimits) XXX_Size() int {
 	return xxx_messageInfo_RateLimits.Size(m)
@@ -465,16 +472,17 @@ func (m *RetryConfig) Reset()         { *m = RetryConfig{} }
 func (m *RetryConfig) String() string { return proto.CompactTextString(m) }
 func (*RetryConfig) ProtoMessage()    {}
 func (*RetryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a02b454f63d79936, []int{2}
+	return fileDescriptor_a4a1833e2495b95c, []int{2}
 }
+
 func (m *RetryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryConfig.Unmarshal(m, b)
 }
 func (m *RetryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryConfig.Marshal(b, m, deterministic)
 }
-func (dst *RetryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryConfig.Merge(dst, src)
+func (m *RetryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryConfig.Merge(m, src)
 }
 func (m *RetryConfig) XXX_Size() int {
 	return xxx_messageInfo_RetryConfig.Size(m)
@@ -521,17 +529,15 @@ func (m *RetryConfig) GetMaxDoublings() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2.Queue_State", Queue_State_name, Queue_State_value)
 	proto.RegisterType((*Queue)(nil), "google.cloud.tasks.v2.Queue")
 	proto.RegisterType((*RateLimits)(nil), "google.cloud.tasks.v2.RateLimits")
 	proto.RegisterType((*RetryConfig)(nil), "google.cloud.tasks.v2.RetryConfig")
-	proto.RegisterEnum("google.cloud.tasks.v2.Queue_State", Queue_State_name, Queue_State_value)
 }
 
-func init() {
-	proto.RegisterFile("google/cloud/tasks/v2/queue.proto", fileDescriptor_queue_a02b454f63d79936)
-}
+func init() { proto.RegisterFile("google/cloud/tasks/v2/queue.proto", fileDescriptor_a4a1833e2495b95c) }
 
-var fileDescriptor_queue_a02b454f63d79936 = []byte{
+var fileDescriptor_a4a1833e2495b95c = []byte{
 	// 643 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xd1, 0x4e, 0xdc, 0x3a,
 	0x10, 0x86, 0x4f, 0x80, 0x70, 0x0e, 0x13, 0x0e, 0xda, 0x63, 0x89, 0xd3, 0xec, 0xb6, 0x6a, 0x61,
diff --git a/googleapis/cloud/tasks/v2/target.pb.go b/googleapis/cloud/tasks/v2/target.pb.go
index 332905499e..ab81a840e6 100644
--- a/googleapis/cloud/tasks/v2/target.pb.go
+++ b/googleapis/cloud/tasks/v2/target.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2/target.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The HTTP method used to deliver the task.
 type HttpMethod int32
@@ -51,6 +54,7 @@ var HttpMethod_name = map[int32]string{
 	6: "PATCH",
 	7: "OPTIONS",
 }
+
 var HttpMethod_value = map[string]int32{
 	"HTTP_METHOD_UNSPECIFIED": 0,
 	"POST":                    1,
@@ -65,8 +69,9 @@ var HttpMethod_value = map[string]int32{
 func (x HttpMethod) String() string {
 	return proto.EnumName(HttpMethod_name, int32(x))
 }
+
 func (HttpMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_83a965c577901646, []int{0}
+	return fileDescriptor_9ccba55e885aeacf, []int{0}
 }
 
 // App Engine HTTP request.
@@ -213,16 +218,17 @@ func (m *AppEngineHttpRequest) Reset()         { *m = AppEngineHttpRequest{} }
 func (m *AppEngineHttpRequest) String() string { return proto.CompactTextString(m) }
 func (*AppEngineHttpRequest) ProtoMessage()    {}
 func (*AppEngineHttpRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_83a965c577901646, []int{0}
+	return fileDescriptor_9ccba55e885aeacf, []int{0}
 }
+
 func (m *AppEngineHttpRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineHttpRequest.Unmarshal(m, b)
 }
 func (m *AppEngineHttpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineHttpRequest.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineHttpRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineHttpRequest.Merge(dst, src)
+func (m *AppEngineHttpRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpRequest.Merge(m, src)
 }
 func (m *AppEngineHttpRequest) XXX_Size() int {
 	return xxx_messageInfo_AppEngineHttpRequest.Size(m)
@@ -352,16 +358,17 @@ func (m *AppEngineRouting) Reset()         { *m = AppEngineRouting{} }
 func (m *AppEngineRouting) String() string { return proto.CompactTextString(m) }
 func (*AppEngineRouting) ProtoMessage()    {}
 func (*AppEngineRouting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_83a965c577901646, []int{1}
+	return fileDescriptor_9ccba55e885aeacf, []int{1}
 }
+
 func (m *AppEngineRouting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineRouting.Unmarshal(m, b)
 }
 func (m *AppEngineRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineRouting.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineRouting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineRouting.Merge(dst, src)
+func (m *AppEngineRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineRouting.Merge(m, src)
 }
 func (m *AppEngineRouting) XXX_Size() int {
 	return xxx_messageInfo_AppEngineRouting.Size(m)
@@ -401,17 +408,15 @@ func (m *AppEngineRouting) GetHost() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2.HttpMethod", HttpMethod_name, HttpMethod_value)
 	proto.RegisterType((*AppEngineHttpRequest)(nil), "google.cloud.tasks.v2.AppEngineHttpRequest")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.tasks.v2.AppEngineHttpRequest.HeadersEntry")
 	proto.RegisterType((*AppEngineRouting)(nil), "google.cloud.tasks.v2.AppEngineRouting")
-	proto.RegisterEnum("google.cloud.tasks.v2.HttpMethod", HttpMethod_name, HttpMethod_value)
 }
 
-func init() {
-	proto.RegisterFile("google/cloud/tasks/v2/target.proto", fileDescriptor_target_83a965c577901646)
-}
+func init() { proto.RegisterFile("google/cloud/tasks/v2/target.proto", fileDescriptor_9ccba55e885aeacf) }
 
-var fileDescriptor_target_83a965c577901646 = []byte{
+var fileDescriptor_9ccba55e885aeacf = []byte{
 	// 490 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xcf, 0x6f, 0xda, 0x30,
 	0x18, 0x5d, 0xf8, 0x51, 0xca, 0x17, 0x34, 0x59, 0x56, 0xa7, 0x65, 0x6c, 0x07, 0xca, 0x65, 0x68,
diff --git a/googleapis/cloud/tasks/v2/task.pb.go b/googleapis/cloud/tasks/v2/task.pb.go
index a0a7926725..1b2bf8734b 100644
--- a/googleapis/cloud/tasks/v2/task.pb.go
+++ b/googleapis/cloud/tasks/v2/task.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2/task.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The view specifies a subset of [Task][google.cloud.tasks.v2.Task] data.
 //
@@ -56,6 +59,7 @@ var Task_View_name = map[int32]string{
 	1: "BASIC",
 	2: "FULL",
 }
+
 var Task_View_value = map[string]int32{
 	"VIEW_UNSPECIFIED": 0,
 	"BASIC":            1,
@@ -65,8 +69,9 @@ var Task_View_value = map[string]int32{
 func (x Task_View) String() string {
 	return proto.EnumName(Task_View_name, int32(x))
 }
+
 func (Task_View) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_task_798b1eb2476e0fcb, []int{0, 0}
+	return fileDescriptor_5d55198283613840, []int{0, 0}
 }
 
 // A unit of scheduled work.
@@ -163,16 +168,17 @@ func (m *Task) Reset()         { *m = Task{} }
 func (m *Task) String() string { return proto.CompactTextString(m) }
 func (*Task) ProtoMessage()    {}
 func (*Task) Descriptor() ([]byte, []int) {
-	return fileDescriptor_task_798b1eb2476e0fcb, []int{0}
+	return fileDescriptor_5d55198283613840, []int{0}
 }
+
 func (m *Task) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Task.Unmarshal(m, b)
 }
 func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Task.Marshal(b, m, deterministic)
 }
-func (dst *Task) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Task.Merge(dst, src)
+func (m *Task) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Task.Merge(m, src)
 }
 func (m *Task) XXX_Size() int {
 	return xxx_messageInfo_Task.Size(m)
@@ -270,61 +276,13 @@ func (m *Task) GetView() Task_View {
 	return Task_VIEW_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Task) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Task_OneofMarshaler, _Task_OneofUnmarshaler, _Task_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Task) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Task_AppEngineHttpRequest)(nil),
 	}
 }
 
-func _Task_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Task)
-	// message_type
-	switch x := m.MessageType.(type) {
-	case *Task_AppEngineHttpRequest:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngineHttpRequest); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Task.MessageType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Task_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Task)
-	switch tag {
-	case 2: // message_type.app_engine_http_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppEngineHttpRequest)
-		err := b.DecodeMessage(msg)
-		m.MessageType = &Task_AppEngineHttpRequest{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Task_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Task)
-	// message_type
-	switch x := m.MessageType.(type) {
-	case *Task_AppEngineHttpRequest:
-		s := proto.Size(x.AppEngineHttpRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The status of a task attempt.
 type Attempt struct {
 	// Output only. The time that this attempt was scheduled.
@@ -353,16 +311,17 @@ func (m *Attempt) Reset()         { *m = Attempt{} }
 func (m *Attempt) String() string { return proto.CompactTextString(m) }
 func (*Attempt) ProtoMessage()    {}
 func (*Attempt) Descriptor() ([]byte, []int) {
-	return fileDescriptor_task_798b1eb2476e0fcb, []int{1}
+	return fileDescriptor_5d55198283613840, []int{1}
 }
+
 func (m *Attempt) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Attempt.Unmarshal(m, b)
 }
 func (m *Attempt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Attempt.Marshal(b, m, deterministic)
 }
-func (dst *Attempt) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Attempt.Merge(dst, src)
+func (m *Attempt) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Attempt.Merge(m, src)
 }
 func (m *Attempt) XXX_Size() int {
 	return xxx_messageInfo_Attempt.Size(m)
@@ -402,16 +361,14 @@ func (m *Attempt) GetResponseStatus() *status.Status {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2.Task_View", Task_View_name, Task_View_value)
 	proto.RegisterType((*Task)(nil), "google.cloud.tasks.v2.Task")
 	proto.RegisterType((*Attempt)(nil), "google.cloud.tasks.v2.Attempt")
-	proto.RegisterEnum("google.cloud.tasks.v2.Task_View", Task_View_name, Task_View_value)
 }
 
-func init() {
-	proto.RegisterFile("google/cloud/tasks/v2/task.proto", fileDescriptor_task_798b1eb2476e0fcb)
-}
+func init() { proto.RegisterFile("google/cloud/tasks/v2/task.proto", fileDescriptor_5d55198283613840) }
 
-var fileDescriptor_task_798b1eb2476e0fcb = []byte{
+var fileDescriptor_5d55198283613840 = []byte{
 	// 579 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x51, 0x6b, 0xdb, 0x30,
 	0x10, 0xc7, 0xeb, 0xcc, 0x69, 0x1b, 0x25, 0xed, 0x32, 0xd1, 0x51, 0xb7, 0x8c, 0xce, 0x04, 0x06,
diff --git a/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go b/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
index 4518ecc033..42b35f30d1 100644
--- a/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/cloudtasks.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import _ "google.golang.org/genproto/googleapis/rpc/code"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package tasks
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	_ "google.golang.org/genproto/googleapis/rpc/code"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -28,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for
 // [ListQueues][google.cloud.tasks.v2beta2.CloudTasks.ListQueues].
@@ -77,16 +77,17 @@ func (m *ListQueuesRequest) Reset()         { *m = ListQueuesRequest{} }
 func (m *ListQueuesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListQueuesRequest) ProtoMessage()    {}
 func (*ListQueuesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{0}
+	return fileDescriptor_f19d568d0a105212, []int{0}
 }
+
 func (m *ListQueuesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListQueuesRequest.Unmarshal(m, b)
 }
 func (m *ListQueuesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListQueuesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListQueuesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListQueuesRequest.Merge(dst, src)
+func (m *ListQueuesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesRequest.Merge(m, src)
 }
 func (m *ListQueuesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListQueuesRequest.Size(m)
@@ -150,16 +151,17 @@ func (m *ListQueuesResponse) Reset()         { *m = ListQueuesResponse{} }
 func (m *ListQueuesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListQueuesResponse) ProtoMessage()    {}
 func (*ListQueuesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{1}
+	return fileDescriptor_f19d568d0a105212, []int{1}
 }
+
 func (m *ListQueuesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListQueuesResponse.Unmarshal(m, b)
 }
 func (m *ListQueuesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListQueuesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListQueuesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListQueuesResponse.Merge(dst, src)
+func (m *ListQueuesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesResponse.Merge(m, src)
 }
 func (m *ListQueuesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListQueuesResponse.Size(m)
@@ -201,16 +203,17 @@ func (m *GetQueueRequest) Reset()         { *m = GetQueueRequest{} }
 func (m *GetQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*GetQueueRequest) ProtoMessage()    {}
 func (*GetQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{2}
+	return fileDescriptor_f19d568d0a105212, []int{2}
 }
+
 func (m *GetQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetQueueRequest.Unmarshal(m, b)
 }
 func (m *GetQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetQueueRequest.Merge(dst, src)
+func (m *GetQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetQueueRequest.Merge(m, src)
 }
 func (m *GetQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_GetQueueRequest.Size(m)
@@ -256,16 +259,17 @@ func (m *CreateQueueRequest) Reset()         { *m = CreateQueueRequest{} }
 func (m *CreateQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateQueueRequest) ProtoMessage()    {}
 func (*CreateQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{3}
+	return fileDescriptor_f19d568d0a105212, []int{3}
 }
+
 func (m *CreateQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateQueueRequest.Unmarshal(m, b)
 }
 func (m *CreateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateQueueRequest.Merge(dst, src)
+func (m *CreateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateQueueRequest.Merge(m, src)
 }
 func (m *CreateQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateQueueRequest.Size(m)
@@ -318,16 +322,17 @@ func (m *UpdateQueueRequest) Reset()         { *m = UpdateQueueRequest{} }
 func (m *UpdateQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateQueueRequest) ProtoMessage()    {}
 func (*UpdateQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{4}
+	return fileDescriptor_f19d568d0a105212, []int{4}
 }
+
 func (m *UpdateQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateQueueRequest.Unmarshal(m, b)
 }
 func (m *UpdateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateQueueRequest.Merge(dst, src)
+func (m *UpdateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateQueueRequest.Merge(m, src)
 }
 func (m *UpdateQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateQueueRequest.Size(m)
@@ -369,16 +374,17 @@ func (m *DeleteQueueRequest) Reset()         { *m = DeleteQueueRequest{} }
 func (m *DeleteQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteQueueRequest) ProtoMessage()    {}
 func (*DeleteQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{5}
+	return fileDescriptor_f19d568d0a105212, []int{5}
 }
+
 func (m *DeleteQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteQueueRequest.Unmarshal(m, b)
 }
 func (m *DeleteQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteQueueRequest.Merge(dst, src)
+func (m *DeleteQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteQueueRequest.Merge(m, src)
 }
 func (m *DeleteQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteQueueRequest.Size(m)
@@ -413,16 +419,17 @@ func (m *PurgeQueueRequest) Reset()         { *m = PurgeQueueRequest{} }
 func (m *PurgeQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*PurgeQueueRequest) ProtoMessage()    {}
 func (*PurgeQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{6}
+	return fileDescriptor_f19d568d0a105212, []int{6}
 }
+
 func (m *PurgeQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PurgeQueueRequest.Unmarshal(m, b)
 }
 func (m *PurgeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PurgeQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *PurgeQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PurgeQueueRequest.Merge(dst, src)
+func (m *PurgeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PurgeQueueRequest.Merge(m, src)
 }
 func (m *PurgeQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_PurgeQueueRequest.Size(m)
@@ -457,16 +464,17 @@ func (m *PauseQueueRequest) Reset()         { *m = PauseQueueRequest{} }
 func (m *PauseQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*PauseQueueRequest) ProtoMessage()    {}
 func (*PauseQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{7}
+	return fileDescriptor_f19d568d0a105212, []int{7}
 }
+
 func (m *PauseQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PauseQueueRequest.Unmarshal(m, b)
 }
 func (m *PauseQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PauseQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *PauseQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PauseQueueRequest.Merge(dst, src)
+func (m *PauseQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseQueueRequest.Merge(m, src)
 }
 func (m *PauseQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_PauseQueueRequest.Size(m)
@@ -501,16 +509,17 @@ func (m *ResumeQueueRequest) Reset()         { *m = ResumeQueueRequest{} }
 func (m *ResumeQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*ResumeQueueRequest) ProtoMessage()    {}
 func (*ResumeQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{8}
+	return fileDescriptor_f19d568d0a105212, []int{8}
 }
+
 func (m *ResumeQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResumeQueueRequest.Unmarshal(m, b)
 }
 func (m *ResumeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResumeQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *ResumeQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResumeQueueRequest.Merge(dst, src)
+func (m *ResumeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeQueueRequest.Merge(m, src)
 }
 func (m *ResumeQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_ResumeQueueRequest.Size(m)
@@ -577,16 +586,17 @@ func (m *ListTasksRequest) Reset()         { *m = ListTasksRequest{} }
 func (m *ListTasksRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTasksRequest) ProtoMessage()    {}
 func (*ListTasksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{9}
+	return fileDescriptor_f19d568d0a105212, []int{9}
 }
+
 func (m *ListTasksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTasksRequest.Unmarshal(m, b)
 }
 func (m *ListTasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTasksRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTasksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTasksRequest.Merge(dst, src)
+func (m *ListTasksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksRequest.Merge(m, src)
 }
 func (m *ListTasksRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTasksRequest.Size(m)
@@ -648,16 +658,17 @@ func (m *ListTasksResponse) Reset()         { *m = ListTasksResponse{} }
 func (m *ListTasksResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTasksResponse) ProtoMessage()    {}
 func (*ListTasksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{10}
+	return fileDescriptor_f19d568d0a105212, []int{10}
 }
+
 func (m *ListTasksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTasksResponse.Unmarshal(m, b)
 }
 func (m *ListTasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTasksResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTasksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTasksResponse.Merge(dst, src)
+func (m *ListTasksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksResponse.Merge(m, src)
 }
 func (m *ListTasksResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTasksResponse.Size(m)
@@ -713,16 +724,17 @@ func (m *GetTaskRequest) Reset()         { *m = GetTaskRequest{} }
 func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTaskRequest) ProtoMessage()    {}
 func (*GetTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{11}
+	return fileDescriptor_f19d568d0a105212, []int{11}
 }
+
 func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b)
 }
 func (m *GetTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTaskRequest.Merge(dst, src)
+func (m *GetTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTaskRequest.Merge(m, src)
 }
 func (m *GetTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTaskRequest.Size(m)
@@ -816,16 +828,17 @@ func (m *CreateTaskRequest) Reset()         { *m = CreateTaskRequest{} }
 func (m *CreateTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTaskRequest) ProtoMessage()    {}
 func (*CreateTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{12}
+	return fileDescriptor_f19d568d0a105212, []int{12}
 }
+
 func (m *CreateTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTaskRequest.Unmarshal(m, b)
 }
 func (m *CreateTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTaskRequest.Merge(dst, src)
+func (m *CreateTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTaskRequest.Merge(m, src)
 }
 func (m *CreateTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTaskRequest.Size(m)
@@ -874,16 +887,17 @@ func (m *DeleteTaskRequest) Reset()         { *m = DeleteTaskRequest{} }
 func (m *DeleteTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTaskRequest) ProtoMessage()    {}
 func (*DeleteTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{13}
+	return fileDescriptor_f19d568d0a105212, []int{13}
 }
+
 func (m *DeleteTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTaskRequest.Unmarshal(m, b)
 }
 func (m *DeleteTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTaskRequest.Merge(dst, src)
+func (m *DeleteTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTaskRequest.Merge(m, src)
 }
 func (m *DeleteTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTaskRequest.Size(m)
@@ -983,16 +997,17 @@ func (m *LeaseTasksRequest) Reset()         { *m = LeaseTasksRequest{} }
 func (m *LeaseTasksRequest) String() string { return proto.CompactTextString(m) }
 func (*LeaseTasksRequest) ProtoMessage()    {}
 func (*LeaseTasksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{14}
+	return fileDescriptor_f19d568d0a105212, []int{14}
 }
+
 func (m *LeaseTasksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LeaseTasksRequest.Unmarshal(m, b)
 }
 func (m *LeaseTasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LeaseTasksRequest.Marshal(b, m, deterministic)
 }
-func (dst *LeaseTasksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LeaseTasksRequest.Merge(dst, src)
+func (m *LeaseTasksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LeaseTasksRequest.Merge(m, src)
 }
 func (m *LeaseTasksRequest) XXX_Size() int {
 	return xxx_messageInfo_LeaseTasksRequest.Size(m)
@@ -1052,16 +1067,17 @@ func (m *LeaseTasksResponse) Reset()         { *m = LeaseTasksResponse{} }
 func (m *LeaseTasksResponse) String() string { return proto.CompactTextString(m) }
 func (*LeaseTasksResponse) ProtoMessage()    {}
 func (*LeaseTasksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{15}
+	return fileDescriptor_f19d568d0a105212, []int{15}
 }
+
 func (m *LeaseTasksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LeaseTasksResponse.Unmarshal(m, b)
 }
 func (m *LeaseTasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LeaseTasksResponse.Marshal(b, m, deterministic)
 }
-func (dst *LeaseTasksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LeaseTasksResponse.Merge(dst, src)
+func (m *LeaseTasksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LeaseTasksResponse.Merge(m, src)
 }
 func (m *LeaseTasksResponse) XXX_Size() int {
 	return xxx_messageInfo_LeaseTasksResponse.Size(m)
@@ -1104,16 +1120,17 @@ func (m *AcknowledgeTaskRequest) Reset()         { *m = AcknowledgeTaskRequest{}
 func (m *AcknowledgeTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*AcknowledgeTaskRequest) ProtoMessage()    {}
 func (*AcknowledgeTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{16}
+	return fileDescriptor_f19d568d0a105212, []int{16}
 }
+
 func (m *AcknowledgeTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcknowledgeTaskRequest.Unmarshal(m, b)
 }
 func (m *AcknowledgeTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcknowledgeTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *AcknowledgeTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcknowledgeTaskRequest.Merge(dst, src)
+func (m *AcknowledgeTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcknowledgeTaskRequest.Merge(m, src)
 }
 func (m *AcknowledgeTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_AcknowledgeTaskRequest.Size(m)
@@ -1185,16 +1202,17 @@ func (m *RenewLeaseRequest) Reset()         { *m = RenewLeaseRequest{} }
 func (m *RenewLeaseRequest) String() string { return proto.CompactTextString(m) }
 func (*RenewLeaseRequest) ProtoMessage()    {}
 func (*RenewLeaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{17}
+	return fileDescriptor_f19d568d0a105212, []int{17}
 }
+
 func (m *RenewLeaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RenewLeaseRequest.Unmarshal(m, b)
 }
 func (m *RenewLeaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RenewLeaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *RenewLeaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RenewLeaseRequest.Merge(dst, src)
+func (m *RenewLeaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RenewLeaseRequest.Merge(m, src)
 }
 func (m *RenewLeaseRequest) XXX_Size() int {
 	return xxx_messageInfo_RenewLeaseRequest.Size(m)
@@ -1272,16 +1290,17 @@ func (m *CancelLeaseRequest) Reset()         { *m = CancelLeaseRequest{} }
 func (m *CancelLeaseRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelLeaseRequest) ProtoMessage()    {}
 func (*CancelLeaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{18}
+	return fileDescriptor_f19d568d0a105212, []int{18}
 }
+
 func (m *CancelLeaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelLeaseRequest.Unmarshal(m, b)
 }
 func (m *CancelLeaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelLeaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelLeaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelLeaseRequest.Merge(dst, src)
+func (m *CancelLeaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelLeaseRequest.Merge(m, src)
 }
 func (m *CancelLeaseRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelLeaseRequest.Size(m)
@@ -1344,16 +1363,17 @@ func (m *RunTaskRequest) Reset()         { *m = RunTaskRequest{} }
 func (m *RunTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*RunTaskRequest) ProtoMessage()    {}
 func (*RunTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_a80c09c0b658f30d, []int{19}
+	return fileDescriptor_f19d568d0a105212, []int{19}
 }
+
 func (m *RunTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunTaskRequest.Unmarshal(m, b)
 }
 func (m *RunTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunTaskRequest.Merge(dst, src)
+func (m *RunTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunTaskRequest.Merge(m, src)
 }
 func (m *RunTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_RunTaskRequest.Size(m)
@@ -1401,6 +1421,101 @@ func init() {
 	proto.RegisterType((*RunTaskRequest)(nil), "google.cloud.tasks.v2beta2.RunTaskRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/tasks/v2beta2/cloudtasks.proto", fileDescriptor_f19d568d0a105212)
+}
+
+var fileDescriptor_f19d568d0a105212 = []byte{
+	// 1382 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xdf, 0x6f, 0x14, 0x55,
+	0x14, 0xc7, 0x73, 0x4b, 0x17, 0xe8, 0x59, 0xda, 0xba, 0x37, 0x81, 0x94, 0x45, 0xb1, 0xde, 0x04,
+	0x58, 0x17, 0xd9, 0x09, 0xab, 0x80, 0x6c, 0x05, 0x4a, 0x0b, 0x14, 0x05, 0x4c, 0x99, 0x56, 0x1f,
+	0x7c, 0xd9, 0x0c, 0xb3, 0x97, 0x75, 0xec, 0xfc, 0x62, 0x7e, 0xb4, 0x15, 0x6d, 0x4c, 0x7c, 0xf4,
+	0xc1, 0x17, 0x8c, 0xf1, 0xcd, 0x9f, 0x31, 0x31, 0x91, 0x98, 0x98, 0xf0, 0xe6, 0x7f, 0xe1, 0xbf,
+	0xe0, 0xb3, 0xf1, 0xc9, 0x67, 0x73, 0x7f, 0xcc, 0xce, 0x74, 0xa6, 0x3b, 0x33, 0x5d, 0x28, 0xf1,
+	0xa9, 0x9d, 0x7b, 0xcf, 0xbd, 0xe7, 0x73, 0xcf, 0x3d, 0xf7, 0xde, 0xef, 0x59, 0x38, 0xdd, 0x77,
+	0x9c, 0xbe, 0x49, 0x15, 0xdd, 0x74, 0xc2, 0x9e, 0x12, 0x68, 0xfe, 0x9a, 0xaf, 0xac, 0xb7, 0xef,
+	0xd1, 0x40, 0x6b, 0x8b, 0x36, 0xde, 0xd4, 0x72, 0x3d, 0x27, 0x70, 0x70, 0x5d, 0x18, 0xb7, 0x78,
+	0x47, 0x4b, 0xf4, 0x48, 0xe3, 0xfa, 0x8b, 0x72, 0x22, 0xcd, 0x35, 0x14, 0xcd, 0xb6, 0x9d, 0x40,
+	0x0b, 0x0c, 0xc7, 0x96, 0x23, 0xeb, 0x27, 0x73, 0xdc, 0x3c, 0x08, 0x69, 0x48, 0xa5, 0xdd, 0x89,
+	0x1c, 0x3b, 0xf6, 0x25, 0xcd, 0x8e, 0x4b, 0x33, 0x43, 0xb3, 0x94, 0xf5, 0xb3, 0xec, 0x4f, 0xd7,
+	0x75, 0x4c, 0x43, 0xff, 0x58, 0xf6, 0xd7, 0xb7, 0xf7, 0x6f, 0xeb, 0x8b, 0xc6, 0xf2, 0xaf, 0x7b,
+	0xe1, 0x7d, 0xa5, 0x17, 0x7a, 0x9c, 0x55, 0xf6, 0x1f, 0x4b, 0xf7, 0x53, 0xcb, 0x0d, 0xa2, 0xc1,
+	0xb3, 0xe9, 0xce, 0xfb, 0x06, 0x35, 0x7b, 0x5d, 0x2b, 0x46, 0x7b, 0x39, 0x6d, 0x11, 0x18, 0x16,
+	0xf5, 0x03, 0xcd, 0x72, 0xa5, 0xc1, 0x61, 0x69, 0xe0, 0xb9, 0xba, 0xa2, 0x3b, 0x3d, 0xb9, 0x72,
+	0xf2, 0x19, 0xd4, 0x6e, 0x1b, 0x7e, 0x70, 0x97, 0x05, 0xc3, 0x57, 0xe9, 0x83, 0x90, 0xfa, 0x01,
+	0x3e, 0x02, 0xfb, 0x5d, 0xcd, 0xa3, 0x76, 0x30, 0x83, 0x66, 0x51, 0x63, 0x42, 0x95, 0x5f, 0xac,
+	0xfd, 0xbe, 0x61, 0x06, 0xd4, 0x9b, 0x19, 0x13, 0xed, 0xe2, 0x0b, 0x1f, 0x83, 0x09, 0x57, 0xeb,
+	0xd3, 0xae, 0x6f, 0x3c, 0xa4, 0x33, 0xfb, 0x66, 0x51, 0xa3, 0xa2, 0x1e, 0x64, 0x0d, 0x2b, 0xc6,
+	0x43, 0x8a, 0x5f, 0x02, 0xe0, 0x9d, 0x81, 0xb3, 0x46, 0xed, 0x99, 0x71, 0x3e, 0x90, 0x9b, 0xaf,
+	0xb2, 0x06, 0xb2, 0x01, 0x38, 0x09, 0xe0, 0xbb, 0x8e, 0xed, 0x53, 0x7c, 0x11, 0xf6, 0xf3, 0xfd,
+	0xf1, 0x67, 0xd0, 0xec, 0xbe, 0x46, 0xb5, 0xfd, 0x4a, 0x6b, 0x78, 0x0e, 0xb4, 0xf8, 0x58, 0x55,
+	0x0e, 0xc0, 0x27, 0x61, 0xda, 0xa6, 0x9b, 0x41, 0x37, 0xe1, 0x54, 0xd0, 0x4e, 0xb2, 0xe6, 0xe5,
+	0x81, 0xe3, 0x13, 0x30, 0xbd, 0x44, 0x85, 0xdf, 0x68, 0xdd, 0x18, 0xc6, 0x6d, 0xcd, 0xa2, 0x72,
+	0xd5, 0xfc, 0x7f, 0x42, 0x01, 0x2f, 0x7a, 0x54, 0x0b, 0xe8, 0x36, 0xcb, 0x61, 0x11, 0xba, 0x00,
+	0x15, 0x8e, 0xc1, 0x5d, 0x96, 0xc2, 0x16, 0xf6, 0xe4, 0x0b, 0x04, 0xf8, 0x3d, 0xb7, 0x97, 0xf6,
+	0x33, 0x98, 0x0f, 0xed, 0x6e, 0x3e, 0x3c, 0x07, 0xd5, 0x90, 0x4f, 0xc7, 0x93, 0x44, 0xe2, 0xd4,
+	0xa3, 0xe1, 0x51, 0x96, 0xb4, 0x6e, 0xb0, 0x3c, 0xba, 0xa3, 0xf9, 0x6b, 0x2a, 0x08, 0x73, 0xf6,
+	0x3f, 0x69, 0x00, 0xbe, 0x46, 0x4d, 0x9a, 0x62, 0xd9, 0x29, 0x3a, 0xa7, 0xa0, 0xb6, 0x1c, 0x7a,
+	0xfd, 0x72, 0x86, 0x5a, 0xe8, 0x17, 0x1b, 0x36, 0x00, 0xab, 0xd4, 0x0f, 0xad, 0x62, 0xcb, 0xdf,
+	0x11, 0xbc, 0xc0, 0x52, 0x67, 0x95, 0x45, 0xa1, 0x68, 0x63, 0xde, 0x81, 0x49, 0x4f, 0x26, 0x57,
+	0x77, 0xdd, 0xa0, 0x1b, 0x3c, 0x22, 0x53, 0xed, 0x13, 0x79, 0x01, 0x65, 0x13, 0xb7, 0xde, 0x37,
+	0xe8, 0x86, 0x7a, 0x28, 0x1a, 0xcb, 0xbe, 0xb6, 0xa7, 0xfb, 0x78, 0x6e, 0xba, 0x57, 0xd2, 0xe9,
+	0xee, 0x8b, 0xf3, 0x26, 0x99, 0x65, 0xb6, 0x9f, 0x87, 0x0a, 0xf7, 0x2c, 0x93, 0x7d, 0xb6, 0x08,
+	0x4a, 0x15, 0xe6, 0xa5, 0x53, 0xdd, 0x85, 0xa9, 0x25, 0xca, 0x7d, 0xe6, 0xc4, 0xf3, 0x59, 0x86,
+	0x88, 0x3c, 0x46, 0x50, 0x13, 0xc7, 0x26, 0xe9, 0x75, 0xd8, 0xe6, 0xbc, 0x01, 0xe3, 0x41, 0x9c,
+	0xa5, 0xc5, 0xcb, 0xe7, 0xd6, 0x59, 0xde, 0x7d, 0xa3, 0xf3, 0x9e, 0x82, 0x9a, 0xc8, 0xf8, 0x82,
+	0x20, 0x91, 0xbf, 0x11, 0xd4, 0x6e, 0x53, 0xcd, 0xa7, 0xa5, 0xb2, 0xee, 0x18, 0x4c, 0x58, 0xda,
+	0x66, 0x57, 0x6c, 0xee, 0x98, 0xc8, 0x14, 0x4b, 0xdb, 0xe4, 0x63, 0xf1, 0x3c, 0x4c, 0x99, 0x6c,
+	0xa6, 0x6e, 0xf4, 0x12, 0xf0, 0x05, 0x54, 0xdb, 0x47, 0x33, 0xa7, 0xf4, 0x9a, 0x34, 0x50, 0x27,
+	0xf9, 0x80, 0xe8, 0x33, 0x1b, 0x81, 0xf1, 0xd1, 0x93, 0x3a, 0xbe, 0xdb, 0x2b, 0xc9, 0xbb, 0x9d,
+	0xdc, 0x06, 0x9c, 0x5c, 0xef, 0xd3, 0x65, 0x2c, 0xb1, 0xe0, 0xc8, 0x55, 0x7d, 0xcd, 0x76, 0x36,
+	0x4c, 0xda, 0xeb, 0x17, 0x05, 0x1b, 0x5f, 0x81, 0x49, 0x5f, 0xff, 0x90, 0xf6, 0x42, 0x93, 0x76,
+	0xd9, 0x7b, 0x36, 0xf4, 0x1a, 0x5b, 0x8d, 0x1e, 0x3b, 0xf5, 0x50, 0x34, 0x80, 0x35, 0x91, 0x7f,
+	0x11, 0xd4, 0x54, 0x6a, 0xd3, 0x0d, 0xbe, 0x84, 0xbd, 0x74, 0xf5, 0xff, 0xda, 0x4d, 0xf2, 0x04,
+	0x01, 0x5e, 0xd4, 0x6c, 0x9d, 0x9a, 0x7b, 0xbf, 0xf2, 0x67, 0x79, 0x0e, 0x5d, 0x98, 0x52, 0x43,
+	0xfb, 0x39, 0xde, 0x54, 0xed, 0x7f, 0x8e, 0x02, 0x2c, 0x32, 0x7b, 0x71, 0x28, 0x7f, 0x42, 0x00,
+	0xb1, 0x1e, 0xc1, 0x67, 0xf2, 0xa6, 0xcc, 0x08, 0xa7, 0x7a, 0xab, 0xac, 0xb9, 0x00, 0x20, 0x17,
+	0x3e, 0xff, 0xf3, 0xaf, 0x47, 0x63, 0x67, 0xb1, 0x32, 0x50, 0x9b, 0x9f, 0x88, 0x9b, 0xe3, 0x92,
+	0xeb, 0x39, 0x1f, 0x51, 0x3d, 0xf0, 0x95, 0xa6, 0x62, 0x3a, 0xba, 0x10, 0xb5, 0x4a, 0x73, 0x4b,
+	0x91, 0x22, 0xe7, 0x11, 0x82, 0x83, 0x91, 0x7a, 0xc1, 0xa7, 0xf3, 0xbc, 0xa6, 0x34, 0x4e, 0xbd,
+	0x58, 0x42, 0xec, 0x44, 0xc5, 0xc2, 0x3e, 0x84, 0x49, 0x22, 0x29, 0xcd, 0x2d, 0xfc, 0x1d, 0x82,
+	0x6a, 0x42, 0x2c, 0xe1, 0xdc, 0x70, 0x64, 0x55, 0x55, 0x19, 0xb6, 0xcb, 0x9c, 0xed, 0x4d, 0xb2,
+	0xdb, 0x88, 0x75, 0xa4, 0x2e, 0xfa, 0x19, 0x41, 0x35, 0xa1, 0xb3, 0xf2, 0x11, 0xb3, 0x82, 0xac,
+	0x0c, 0xe2, 0x35, 0x8e, 0x78, 0xb9, 0x7d, 0x2e, 0x46, 0x14, 0xb5, 0x46, 0xa9, 0x20, 0x46, 0xa0,
+	0x5f, 0x22, 0xa8, 0x26, 0x44, 0x58, 0x3e, 0x68, 0x56, 0xad, 0xd5, 0x8f, 0x64, 0xce, 0xef, 0x75,
+	0x56, 0x50, 0x44, 0x9b, 0xdb, 0x1c, 0x65, 0x73, 0x21, 0xd6, 0x7a, 0xf9, 0x27, 0x23, 0xa3, 0x09,
+	0xcb, 0xc4, 0x6d, 0x9e, 0x93, 0x75, 0xc8, 0xb9, 0x5d, 0x92, 0x75, 0x5c, 0xe6, 0xad, 0x83, 0x9a,
+	0x02, 0x71, 0xa0, 0x32, 0x0b, 0x10, 0xd3, 0x6a, 0x74, 0x6f, 0x11, 0x99, 0x37, 0x86, 0xf8, 0x23,
+	0x82, 0x6a, 0x42, 0xdf, 0xe6, 0x6f, 0x6b, 0x56, 0x08, 0x97, 0x81, 0xbc, 0xca, 0x21, 0xe7, 0xc8,
+	0xf9, 0xdd, 0x42, 0x7a, 0xdc, 0x1d, 0xa3, 0xfc, 0x1a, 0xc1, 0xa1, 0x25, 0x1a, 0xbc, 0xad, 0x59,
+	0xcb, 0xbc, 0x86, 0xc5, 0x24, 0x72, 0x6b, 0x68, 0x56, 0x6b, 0xfd, 0x6c, 0x2b, 0xd9, 0x19, 0xa1,
+	0x1d, 0x4e, 0xd9, 0x88, 0x5e, 0x72, 0x8b, 0xe3, 0x5c, 0x27, 0xf3, 0x31, 0x8e, 0x47, 0x7d, 0x27,
+	0xf4, 0xf4, 0x12, 0x48, 0xfd, 0x84, 0x9f, 0x08, 0x6c, 0x25, 0x0f, 0x6c, 0xe5, 0x39, 0x81, 0xf9,
+	0x29, 0xb0, 0x3f, 0x10, 0xe0, 0x55, 0xea, 0xf3, 0x46, 0xea, 0x59, 0x86, 0xef, 0xb3, 0x21, 0xb8,
+	0x91, 0x72, 0x9d, 0x35, 0x89, 0x20, 0x5f, 0x2d, 0x61, 0x29, 0x5f, 0x8d, 0xbb, 0x1c, 0xfc, 0x16,
+	0xb9, 0x31, 0x0a, 0x78, 0x90, 0x99, 0x97, 0xe1, 0xff, 0x82, 0x60, 0x62, 0x50, 0x97, 0xe0, 0xd7,
+	0x8a, 0x9e, 0xb1, 0xa4, 0xf8, 0xad, 0x9f, 0x29, 0x69, 0x2d, 0xe9, 0xaf, 0x70, 0xfa, 0x8b, 0xf8,
+	0x42, 0xc9, 0x1b, 0x3c, 0x66, 0x17, 0x3f, 0xcc, 0xe0, 0x6f, 0x10, 0x1c, 0x90, 0xe5, 0x0c, 0x6e,
+	0x16, 0x3c, 0x7d, 0x09, 0x25, 0x51, 0x2f, 0x14, 0xa9, 0x3b, 0xa1, 0x95, 0x39, 0x39, 0xf2, 0x07,
+	0xa3, 0xe6, 0x16, 0xfe, 0x1e, 0x01, 0xc4, 0x65, 0x4f, 0xfe, 0x05, 0x94, 0x29, 0x8f, 0x4a, 0x00,
+	0x2e, 0x70, 0xc0, 0xb7, 0xc8, 0xa8, 0xb1, 0x63, 0x5b, 0xfd, 0x15, 0x02, 0x88, 0x6b, 0x9d, 0x7c,
+	0xc6, 0x4c, 0x4d, 0x34, 0xf4, 0x59, 0x91, 0xa1, 0x6b, 0x8e, 0x1c, 0xba, 0x27, 0x4c, 0x78, 0x0d,
+	0x0a, 0x8d, 0x02, 0xe1, 0x95, 0x2e, 0xc0, 0x0a, 0x84, 0x57, 0xa6, 0x7e, 0x21, 0x37, 0x39, 0xee,
+	0x02, 0xb9, 0x34, 0x6a, 0x20, 0xb9, 0x74, 0x67, 0xe1, 0x7c, 0x8c, 0x60, 0x3a, 0x55, 0xd2, 0xe0,
+	0x76, 0x1e, 0xcd, 0xce, 0xf5, 0xcf, 0xd0, 0xc0, 0xbe, 0xcb, 0x49, 0x6f, 0x92, 0xc5, 0x11, 0x03,
+	0xdb, 0xd1, 0x62, 0x7f, 0x8c, 0xf7, 0x57, 0x04, 0x10, 0x97, 0x44, 0xf9, 0x71, 0xce, 0x94, 0x4e,
+	0x25, 0x52, 0xf4, 0x0e, 0xe7, 0x5d, 0x22, 0x0b, 0xa3, 0xf2, 0x7a, 0x03, 0xa7, 0x0c, 0xf7, 0x37,
+	0x26, 0x29, 0xe3, 0x42, 0xa6, 0x40, 0x52, 0x66, 0x2a, 0x9e, 0x12, 0xc0, 0x4f, 0x1d, 0x60, 0x3d,
+	0xf6, 0xca, 0x88, 0xbf, 0x45, 0x70, 0x40, 0xd6, 0x30, 0xf9, 0xd7, 0xd3, 0xf6, 0x42, 0xa7, 0x04,
+	0xe9, 0x0d, 0x4e, 0x3a, 0x4f, 0xe6, 0x46, 0x0e, 0x6d, 0x68, 0x77, 0x50, 0x73, 0xe1, 0x53, 0x38,
+	0xae, 0x3b, 0x56, 0x8e, 0xbb, 0x85, 0xe9, 0xb8, 0x22, 0x5a, 0x66, 0xe9, 0xb8, 0x8c, 0x3e, 0xb8,
+	0x22, 0xcd, 0xfb, 0x8e, 0xa9, 0xd9, 0xfd, 0x96, 0xe3, 0xf5, 0x95, 0x3e, 0xb5, 0x79, 0xb2, 0x2a,
+	0xa2, 0x4b, 0x73, 0x0d, 0x7f, 0xa7, 0x5f, 0xd0, 0xe7, 0xf8, 0xd7, 0x0f, 0x63, 0x95, 0xd5, 0xab,
+	0x2b, 0xb7, 0x56, 0xee, 0xed, 0xe7, 0x63, 0x5e, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x01, 0x6f,
+	0x4f, 0xe1, 0x03, 0x18, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2507,98 +2622,3 @@ var _CloudTasks_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/tasks/v2beta2/cloudtasks.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta2/cloudtasks.proto", fileDescriptor_cloudtasks_a80c09c0b658f30d)
-}
-
-var fileDescriptor_cloudtasks_a80c09c0b658f30d = []byte{
-	// 1382 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xdf, 0x6f, 0x14, 0x55,
-	0x14, 0xc7, 0x73, 0x4b, 0x17, 0xe8, 0x59, 0xda, 0xba, 0x37, 0x81, 0x94, 0x45, 0xb1, 0xde, 0x04,
-	0x58, 0x17, 0xd9, 0x09, 0xab, 0x80, 0x6c, 0x05, 0x4a, 0x0b, 0x14, 0x05, 0x4c, 0x99, 0x56, 0x1f,
-	0x7c, 0xd9, 0x0c, 0xb3, 0x97, 0x75, 0xec, 0xfc, 0x62, 0x7e, 0xb4, 0x15, 0x6d, 0x4c, 0x7c, 0xf4,
-	0xc1, 0x17, 0x8c, 0xf1, 0xcd, 0x9f, 0x31, 0x31, 0x91, 0x98, 0x98, 0xf0, 0xe6, 0x7f, 0xe1, 0xbf,
-	0xe0, 0xb3, 0xf1, 0xc9, 0x67, 0x73, 0x7f, 0xcc, 0xce, 0x74, 0xa6, 0x3b, 0x33, 0x5d, 0x28, 0xf1,
-	0xa9, 0x9d, 0x7b, 0xcf, 0xbd, 0xe7, 0x73, 0xcf, 0x3d, 0xf7, 0xde, 0xef, 0x59, 0x38, 0xdd, 0x77,
-	0x9c, 0xbe, 0x49, 0x15, 0xdd, 0x74, 0xc2, 0x9e, 0x12, 0x68, 0xfe, 0x9a, 0xaf, 0xac, 0xb7, 0xef,
-	0xd1, 0x40, 0x6b, 0x8b, 0x36, 0xde, 0xd4, 0x72, 0x3d, 0x27, 0x70, 0x70, 0x5d, 0x18, 0xb7, 0x78,
-	0x47, 0x4b, 0xf4, 0x48, 0xe3, 0xfa, 0x8b, 0x72, 0x22, 0xcd, 0x35, 0x14, 0xcd, 0xb6, 0x9d, 0x40,
-	0x0b, 0x0c, 0xc7, 0x96, 0x23, 0xeb, 0x27, 0x73, 0xdc, 0x3c, 0x08, 0x69, 0x48, 0xa5, 0xdd, 0x89,
-	0x1c, 0x3b, 0xf6, 0x25, 0xcd, 0x8e, 0x4b, 0x33, 0x43, 0xb3, 0x94, 0xf5, 0xb3, 0xec, 0x4f, 0xd7,
-	0x75, 0x4c, 0x43, 0xff, 0x58, 0xf6, 0xd7, 0xb7, 0xf7, 0x6f, 0xeb, 0x8b, 0xc6, 0xf2, 0xaf, 0x7b,
-	0xe1, 0x7d, 0xa5, 0x17, 0x7a, 0x9c, 0x55, 0xf6, 0x1f, 0x4b, 0xf7, 0x53, 0xcb, 0x0d, 0xa2, 0xc1,
-	0xb3, 0xe9, 0xce, 0xfb, 0x06, 0x35, 0x7b, 0x5d, 0x2b, 0x46, 0x7b, 0x39, 0x6d, 0x11, 0x18, 0x16,
-	0xf5, 0x03, 0xcd, 0x72, 0xa5, 0xc1, 0x61, 0x69, 0xe0, 0xb9, 0xba, 0xa2, 0x3b, 0x3d, 0xb9, 0x72,
-	0xf2, 0x19, 0xd4, 0x6e, 0x1b, 0x7e, 0x70, 0x97, 0x05, 0xc3, 0x57, 0xe9, 0x83, 0x90, 0xfa, 0x01,
-	0x3e, 0x02, 0xfb, 0x5d, 0xcd, 0xa3, 0x76, 0x30, 0x83, 0x66, 0x51, 0x63, 0x42, 0x95, 0x5f, 0xac,
-	0xfd, 0xbe, 0x61, 0x06, 0xd4, 0x9b, 0x19, 0x13, 0xed, 0xe2, 0x0b, 0x1f, 0x83, 0x09, 0x57, 0xeb,
-	0xd3, 0xae, 0x6f, 0x3c, 0xa4, 0x33, 0xfb, 0x66, 0x51, 0xa3, 0xa2, 0x1e, 0x64, 0x0d, 0x2b, 0xc6,
-	0x43, 0x8a, 0x5f, 0x02, 0xe0, 0x9d, 0x81, 0xb3, 0x46, 0xed, 0x99, 0x71, 0x3e, 0x90, 0x9b, 0xaf,
-	0xb2, 0x06, 0xb2, 0x01, 0x38, 0x09, 0xe0, 0xbb, 0x8e, 0xed, 0x53, 0x7c, 0x11, 0xf6, 0xf3, 0xfd,
-	0xf1, 0x67, 0xd0, 0xec, 0xbe, 0x46, 0xb5, 0xfd, 0x4a, 0x6b, 0x78, 0x0e, 0xb4, 0xf8, 0x58, 0x55,
-	0x0e, 0xc0, 0x27, 0x61, 0xda, 0xa6, 0x9b, 0x41, 0x37, 0xe1, 0x54, 0xd0, 0x4e, 0xb2, 0xe6, 0xe5,
-	0x81, 0xe3, 0x13, 0x30, 0xbd, 0x44, 0x85, 0xdf, 0x68, 0xdd, 0x18, 0xc6, 0x6d, 0xcd, 0xa2, 0x72,
-	0xd5, 0xfc, 0x7f, 0x42, 0x01, 0x2f, 0x7a, 0x54, 0x0b, 0xe8, 0x36, 0xcb, 0x61, 0x11, 0xba, 0x00,
-	0x15, 0x8e, 0xc1, 0x5d, 0x96, 0xc2, 0x16, 0xf6, 0xe4, 0x0b, 0x04, 0xf8, 0x3d, 0xb7, 0x97, 0xf6,
-	0x33, 0x98, 0x0f, 0xed, 0x6e, 0x3e, 0x3c, 0x07, 0xd5, 0x90, 0x4f, 0xc7, 0x93, 0x44, 0xe2, 0xd4,
-	0xa3, 0xe1, 0x51, 0x96, 0xb4, 0x6e, 0xb0, 0x3c, 0xba, 0xa3, 0xf9, 0x6b, 0x2a, 0x08, 0x73, 0xf6,
-	0x3f, 0x69, 0x00, 0xbe, 0x46, 0x4d, 0x9a, 0x62, 0xd9, 0x29, 0x3a, 0xa7, 0xa0, 0xb6, 0x1c, 0x7a,
-	0xfd, 0x72, 0x86, 0x5a, 0xe8, 0x17, 0x1b, 0x36, 0x00, 0xab, 0xd4, 0x0f, 0xad, 0x62, 0xcb, 0xdf,
-	0x11, 0xbc, 0xc0, 0x52, 0x67, 0x95, 0x45, 0xa1, 0x68, 0x63, 0xde, 0x81, 0x49, 0x4f, 0x26, 0x57,
-	0x77, 0xdd, 0xa0, 0x1b, 0x3c, 0x22, 0x53, 0xed, 0x13, 0x79, 0x01, 0x65, 0x13, 0xb7, 0xde, 0x37,
-	0xe8, 0x86, 0x7a, 0x28, 0x1a, 0xcb, 0xbe, 0xb6, 0xa7, 0xfb, 0x78, 0x6e, 0xba, 0x57, 0xd2, 0xe9,
-	0xee, 0x8b, 0xf3, 0x26, 0x99, 0x65, 0xb6, 0x9f, 0x87, 0x0a, 0xf7, 0x2c, 0x93, 0x7d, 0xb6, 0x08,
-	0x4a, 0x15, 0xe6, 0xa5, 0x53, 0xdd, 0x85, 0xa9, 0x25, 0xca, 0x7d, 0xe6, 0xc4, 0xf3, 0x59, 0x86,
-	0x88, 0x3c, 0x46, 0x50, 0x13, 0xc7, 0x26, 0xe9, 0x75, 0xd8, 0xe6, 0xbc, 0x01, 0xe3, 0x41, 0x9c,
-	0xa5, 0xc5, 0xcb, 0xe7, 0xd6, 0x59, 0xde, 0x7d, 0xa3, 0xf3, 0x9e, 0x82, 0x9a, 0xc8, 0xf8, 0x82,
-	0x20, 0x91, 0xbf, 0x11, 0xd4, 0x6e, 0x53, 0xcd, 0xa7, 0xa5, 0xb2, 0xee, 0x18, 0x4c, 0x58, 0xda,
-	0x66, 0x57, 0x6c, 0xee, 0x98, 0xc8, 0x14, 0x4b, 0xdb, 0xe4, 0x63, 0xf1, 0x3c, 0x4c, 0x99, 0x6c,
-	0xa6, 0x6e, 0xf4, 0x12, 0xf0, 0x05, 0x54, 0xdb, 0x47, 0x33, 0xa7, 0xf4, 0x9a, 0x34, 0x50, 0x27,
-	0xf9, 0x80, 0xe8, 0x33, 0x1b, 0x81, 0xf1, 0xd1, 0x93, 0x3a, 0xbe, 0xdb, 0x2b, 0xc9, 0xbb, 0x9d,
-	0xdc, 0x06, 0x9c, 0x5c, 0xef, 0xd3, 0x65, 0x2c, 0xb1, 0xe0, 0xc8, 0x55, 0x7d, 0xcd, 0x76, 0x36,
-	0x4c, 0xda, 0xeb, 0x17, 0x05, 0x1b, 0x5f, 0x81, 0x49, 0x5f, 0xff, 0x90, 0xf6, 0x42, 0x93, 0x76,
-	0xd9, 0x7b, 0x36, 0xf4, 0x1a, 0x5b, 0x8d, 0x1e, 0x3b, 0xf5, 0x50, 0x34, 0x80, 0x35, 0x91, 0x7f,
-	0x11, 0xd4, 0x54, 0x6a, 0xd3, 0x0d, 0xbe, 0x84, 0xbd, 0x74, 0xf5, 0xff, 0xda, 0x4d, 0xf2, 0x04,
-	0x01, 0x5e, 0xd4, 0x6c, 0x9d, 0x9a, 0x7b, 0xbf, 0xf2, 0x67, 0x79, 0x0e, 0x5d, 0x98, 0x52, 0x43,
-	0xfb, 0x39, 0xde, 0x54, 0xed, 0x7f, 0x8e, 0x02, 0x2c, 0x32, 0x7b, 0x71, 0x28, 0x7f, 0x42, 0x00,
-	0xb1, 0x1e, 0xc1, 0x67, 0xf2, 0xa6, 0xcc, 0x08, 0xa7, 0x7a, 0xab, 0xac, 0xb9, 0x00, 0x20, 0x17,
-	0x3e, 0xff, 0xf3, 0xaf, 0x47, 0x63, 0x67, 0xb1, 0x32, 0x50, 0x9b, 0x9f, 0x88, 0x9b, 0xe3, 0x92,
-	0xeb, 0x39, 0x1f, 0x51, 0x3d, 0xf0, 0x95, 0xa6, 0x62, 0x3a, 0xba, 0x10, 0xb5, 0x4a, 0x73, 0x4b,
-	0x91, 0x22, 0xe7, 0x11, 0x82, 0x83, 0x91, 0x7a, 0xc1, 0xa7, 0xf3, 0xbc, 0xa6, 0x34, 0x4e, 0xbd,
-	0x58, 0x42, 0xec, 0x44, 0xc5, 0xc2, 0x3e, 0x84, 0x49, 0x22, 0x29, 0xcd, 0x2d, 0xfc, 0x1d, 0x82,
-	0x6a, 0x42, 0x2c, 0xe1, 0xdc, 0x70, 0x64, 0x55, 0x55, 0x19, 0xb6, 0xcb, 0x9c, 0xed, 0x4d, 0xb2,
-	0xdb, 0x88, 0x75, 0xa4, 0x2e, 0xfa, 0x19, 0x41, 0x35, 0xa1, 0xb3, 0xf2, 0x11, 0xb3, 0x82, 0xac,
-	0x0c, 0xe2, 0x35, 0x8e, 0x78, 0xb9, 0x7d, 0x2e, 0x46, 0x14, 0xb5, 0x46, 0xa9, 0x20, 0x46, 0xa0,
-	0x5f, 0x22, 0xa8, 0x26, 0x44, 0x58, 0x3e, 0x68, 0x56, 0xad, 0xd5, 0x8f, 0x64, 0xce, 0xef, 0x75,
-	0x56, 0x50, 0x44, 0x9b, 0xdb, 0x1c, 0x65, 0x73, 0x21, 0xd6, 0x7a, 0xf9, 0x27, 0x23, 0xa3, 0x09,
-	0xcb, 0xc4, 0x6d, 0x9e, 0x93, 0x75, 0xc8, 0xb9, 0x5d, 0x92, 0x75, 0x5c, 0xe6, 0xad, 0x83, 0x9a,
-	0x02, 0x71, 0xa0, 0x32, 0x0b, 0x10, 0xd3, 0x6a, 0x74, 0x6f, 0x11, 0x99, 0x37, 0x86, 0xf8, 0x23,
-	0x82, 0x6a, 0x42, 0xdf, 0xe6, 0x6f, 0x6b, 0x56, 0x08, 0x97, 0x81, 0xbc, 0xca, 0x21, 0xe7, 0xc8,
-	0xf9, 0xdd, 0x42, 0x7a, 0xdc, 0x1d, 0xa3, 0xfc, 0x1a, 0xc1, 0xa1, 0x25, 0x1a, 0xbc, 0xad, 0x59,
-	0xcb, 0xbc, 0x86, 0xc5, 0x24, 0x72, 0x6b, 0x68, 0x56, 0x6b, 0xfd, 0x6c, 0x2b, 0xd9, 0x19, 0xa1,
-	0x1d, 0x4e, 0xd9, 0x88, 0x5e, 0x72, 0x8b, 0xe3, 0x5c, 0x27, 0xf3, 0x31, 0x8e, 0x47, 0x7d, 0x27,
-	0xf4, 0xf4, 0x12, 0x48, 0xfd, 0x84, 0x9f, 0x08, 0x6c, 0x25, 0x0f, 0x6c, 0xe5, 0x39, 0x81, 0xf9,
-	0x29, 0xb0, 0x3f, 0x10, 0xe0, 0x55, 0xea, 0xf3, 0x46, 0xea, 0x59, 0x86, 0xef, 0xb3, 0x21, 0xb8,
-	0x91, 0x72, 0x9d, 0x35, 0x89, 0x20, 0x5f, 0x2d, 0x61, 0x29, 0x5f, 0x8d, 0xbb, 0x1c, 0xfc, 0x16,
-	0xb9, 0x31, 0x0a, 0x78, 0x90, 0x99, 0x97, 0xe1, 0xff, 0x82, 0x60, 0x62, 0x50, 0x97, 0xe0, 0xd7,
-	0x8a, 0x9e, 0xb1, 0xa4, 0xf8, 0xad, 0x9f, 0x29, 0x69, 0x2d, 0xe9, 0xaf, 0x70, 0xfa, 0x8b, 0xf8,
-	0x42, 0xc9, 0x1b, 0x3c, 0x66, 0x17, 0x3f, 0xcc, 0xe0, 0x6f, 0x10, 0x1c, 0x90, 0xe5, 0x0c, 0x6e,
-	0x16, 0x3c, 0x7d, 0x09, 0x25, 0x51, 0x2f, 0x14, 0xa9, 0x3b, 0xa1, 0x95, 0x39, 0x39, 0xf2, 0x07,
-	0xa3, 0xe6, 0x16, 0xfe, 0x1e, 0x01, 0xc4, 0x65, 0x4f, 0xfe, 0x05, 0x94, 0x29, 0x8f, 0x4a, 0x00,
-	0x2e, 0x70, 0xc0, 0xb7, 0xc8, 0xa8, 0xb1, 0x63, 0x5b, 0xfd, 0x15, 0x02, 0x88, 0x6b, 0x9d, 0x7c,
-	0xc6, 0x4c, 0x4d, 0x34, 0xf4, 0x59, 0x91, 0xa1, 0x6b, 0x8e, 0x1c, 0xba, 0x27, 0x4c, 0x78, 0x0d,
-	0x0a, 0x8d, 0x02, 0xe1, 0x95, 0x2e, 0xc0, 0x0a, 0x84, 0x57, 0xa6, 0x7e, 0x21, 0x37, 0x39, 0xee,
-	0x02, 0xb9, 0x34, 0x6a, 0x20, 0xb9, 0x74, 0x67, 0xe1, 0x7c, 0x8c, 0x60, 0x3a, 0x55, 0xd2, 0xe0,
-	0x76, 0x1e, 0xcd, 0xce, 0xf5, 0xcf, 0xd0, 0xc0, 0xbe, 0xcb, 0x49, 0x6f, 0x92, 0xc5, 0x11, 0x03,
-	0xdb, 0xd1, 0x62, 0x7f, 0x8c, 0xf7, 0x57, 0x04, 0x10, 0x97, 0x44, 0xf9, 0x71, 0xce, 0x94, 0x4e,
-	0x25, 0x52, 0xf4, 0x0e, 0xe7, 0x5d, 0x22, 0x0b, 0xa3, 0xf2, 0x7a, 0x03, 0xa7, 0x0c, 0xf7, 0x37,
-	0x26, 0x29, 0xe3, 0x42, 0xa6, 0x40, 0x52, 0x66, 0x2a, 0x9e, 0x12, 0xc0, 0x4f, 0x1d, 0x60, 0x3d,
-	0xf6, 0xca, 0x88, 0xbf, 0x45, 0x70, 0x40, 0xd6, 0x30, 0xf9, 0xd7, 0xd3, 0xf6, 0x42, 0xa7, 0x04,
-	0xe9, 0x0d, 0x4e, 0x3a, 0x4f, 0xe6, 0x46, 0x0e, 0x6d, 0x68, 0x77, 0x50, 0x73, 0xe1, 0x53, 0x38,
-	0xae, 0x3b, 0x56, 0x8e, 0xbb, 0x85, 0xe9, 0xb8, 0x22, 0x5a, 0x66, 0xe9, 0xb8, 0x8c, 0x3e, 0xb8,
-	0x22, 0xcd, 0xfb, 0x8e, 0xa9, 0xd9, 0xfd, 0x96, 0xe3, 0xf5, 0x95, 0x3e, 0xb5, 0x79, 0xb2, 0x2a,
-	0xa2, 0x4b, 0x73, 0x0d, 0x7f, 0xa7, 0x5f, 0xd0, 0xe7, 0xf8, 0xd7, 0x0f, 0x63, 0x95, 0xd5, 0xab,
-	0x2b, 0xb7, 0x56, 0xee, 0xed, 0xe7, 0x63, 0x5e, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x01, 0x6f,
-	0x4f, 0xe1, 0x03, 0x18, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/tasks/v2beta2/queue.pb.go b/googleapis/cloud/tasks/v2beta2/queue.pb.go
index 9419a262c2..4f94ceedc7 100644
--- a/googleapis/cloud/tasks/v2beta2/queue.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/queue.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/queue.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // State of the queue.
 type Queue_State int32
@@ -67,6 +70,7 @@ var Queue_State_name = map[int32]string{
 	2: "PAUSED",
 	3: "DISABLED",
 }
+
 var Queue_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"RUNNING":           1,
@@ -77,8 +81,9 @@ var Queue_State_value = map[string]int32{
 func (x Queue_State) String() string {
 	return proto.EnumName(Queue_State_name, int32(x))
 }
+
 func (Queue_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a4c8471e5288c61a, []int{0, 0}
+	return fileDescriptor_b86070a8ff200176, []int{0, 0}
 }
 
 // A queue is a container of related tasks. Queues are configured to manage
@@ -180,16 +185,17 @@ func (m *Queue) Reset()         { *m = Queue{} }
 func (m *Queue) String() string { return proto.CompactTextString(m) }
 func (*Queue) ProtoMessage()    {}
 func (*Queue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a4c8471e5288c61a, []int{0}
+	return fileDescriptor_b86070a8ff200176, []int{0}
 }
+
 func (m *Queue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Queue.Unmarshal(m, b)
 }
 func (m *Queue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Queue.Marshal(b, m, deterministic)
 }
-func (dst *Queue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Queue.Merge(dst, src)
+func (m *Queue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Queue.Merge(m, src)
 }
 func (m *Queue) XXX_Size() int {
 	return xxx_messageInfo_Queue.Size(m)
@@ -272,80 +278,14 @@ func (m *Queue) GetPurgeTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Queue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Queue_OneofMarshaler, _Queue_OneofUnmarshaler, _Queue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Queue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Queue_AppEngineHttpTarget)(nil),
 		(*Queue_PullTarget)(nil),
 	}
 }
 
-func _Queue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Queue)
-	// target_type
-	switch x := m.TargetType.(type) {
-	case *Queue_AppEngineHttpTarget:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngineHttpTarget); err != nil {
-			return err
-		}
-	case *Queue_PullTarget:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PullTarget); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Queue.TargetType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Queue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Queue)
-	switch tag {
-	case 3: // target_type.app_engine_http_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppEngineHttpTarget)
-		err := b.DecodeMessage(msg)
-		m.TargetType = &Queue_AppEngineHttpTarget{msg}
-		return true, err
-	case 4: // target_type.pull_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PullTarget)
-		err := b.DecodeMessage(msg)
-		m.TargetType = &Queue_PullTarget{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Queue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Queue)
-	// target_type
-	switch x := m.TargetType.(type) {
-	case *Queue_AppEngineHttpTarget:
-		s := proto.Size(x.AppEngineHttpTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Queue_PullTarget:
-		s := proto.Size(x.PullTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Rate limits.
 //
 // This message determines the maximum rate that tasks can be dispatched by a
@@ -439,16 +379,17 @@ func (m *RateLimits) Reset()         { *m = RateLimits{} }
 func (m *RateLimits) String() string { return proto.CompactTextString(m) }
 func (*RateLimits) ProtoMessage()    {}
 func (*RateLimits) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a4c8471e5288c61a, []int{1}
+	return fileDescriptor_b86070a8ff200176, []int{1}
 }
+
 func (m *RateLimits) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RateLimits.Unmarshal(m, b)
 }
 func (m *RateLimits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RateLimits.Marshal(b, m, deterministic)
 }
-func (dst *RateLimits) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RateLimits.Merge(dst, src)
+func (m *RateLimits) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RateLimits.Merge(m, src)
 }
 func (m *RateLimits) XXX_Size() int {
 	return xxx_messageInfo_RateLimits.Size(m)
@@ -604,16 +545,17 @@ func (m *RetryConfig) Reset()         { *m = RetryConfig{} }
 func (m *RetryConfig) String() string { return proto.CompactTextString(m) }
 func (*RetryConfig) ProtoMessage()    {}
 func (*RetryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_a4c8471e5288c61a, []int{2}
+	return fileDescriptor_b86070a8ff200176, []int{2}
 }
+
 func (m *RetryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryConfig.Unmarshal(m, b)
 }
 func (m *RetryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryConfig.Marshal(b, m, deterministic)
 }
-func (dst *RetryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryConfig.Merge(dst, src)
+func (m *RetryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryConfig.Merge(m, src)
 }
 func (m *RetryConfig) XXX_Size() int {
 	return xxx_messageInfo_RetryConfig.Size(m)
@@ -689,86 +631,26 @@ func (m *RetryConfig) GetMaxDoublings() int32 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RetryConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RetryConfig_OneofMarshaler, _RetryConfig_OneofUnmarshaler, _RetryConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RetryConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RetryConfig_MaxAttempts)(nil),
 		(*RetryConfig_UnlimitedAttempts)(nil),
 	}
 }
 
-func _RetryConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RetryConfig)
-	// num_attempts
-	switch x := m.NumAttempts.(type) {
-	case *RetryConfig_MaxAttempts:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.MaxAttempts))
-	case *RetryConfig_UnlimitedAttempts:
-		t := uint64(0)
-		if x.UnlimitedAttempts {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("RetryConfig.NumAttempts has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RetryConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RetryConfig)
-	switch tag {
-	case 1: // num_attempts.max_attempts
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.NumAttempts = &RetryConfig_MaxAttempts{int32(x)}
-		return true, err
-	case 2: // num_attempts.unlimited_attempts
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.NumAttempts = &RetryConfig_UnlimitedAttempts{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RetryConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RetryConfig)
-	// num_attempts
-	switch x := m.NumAttempts.(type) {
-	case *RetryConfig_MaxAttempts:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.MaxAttempts))
-	case *RetryConfig_UnlimitedAttempts:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2beta2.Queue_State", Queue_State_name, Queue_State_value)
 	proto.RegisterType((*Queue)(nil), "google.cloud.tasks.v2beta2.Queue")
 	proto.RegisterType((*RateLimits)(nil), "google.cloud.tasks.v2beta2.RateLimits")
 	proto.RegisterType((*RetryConfig)(nil), "google.cloud.tasks.v2beta2.RetryConfig")
-	proto.RegisterEnum("google.cloud.tasks.v2beta2.Queue_State", Queue_State_name, Queue_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta2/queue.proto", fileDescriptor_queue_a4c8471e5288c61a)
+	proto.RegisterFile("google/cloud/tasks/v2beta2/queue.proto", fileDescriptor_b86070a8ff200176)
 }
 
-var fileDescriptor_queue_a4c8471e5288c61a = []byte{
+var fileDescriptor_b86070a8ff200176 = []byte{
 	// 702 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcb, 0x6e, 0xdb, 0x3a,
 	0x10, 0x86, 0xad, 0x24, 0xca, 0x65, 0xe4, 0x04, 0x0e, 0xcf, 0x05, 0x3e, 0x3e, 0x45, 0x62, 0x38,
diff --git a/googleapis/cloud/tasks/v2beta2/target.pb.go b/googleapis/cloud/tasks/v2beta2/target.pb.go
index 26ed26d59e..65e1aeecaf 100644
--- a/googleapis/cloud/tasks/v2beta2/target.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/target.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/target.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The HTTP method used to execute the task.
 type HttpMethod int32
@@ -46,6 +49,7 @@ var HttpMethod_name = map[int32]string{
 	4: "PUT",
 	5: "DELETE",
 }
+
 var HttpMethod_value = map[string]int32{
 	"HTTP_METHOD_UNSPECIFIED": 0,
 	"POST":                    1,
@@ -58,8 +62,9 @@ var HttpMethod_value = map[string]int32{
 func (x HttpMethod) String() string {
 	return proto.EnumName(HttpMethod_name, int32(x))
 }
+
 func (HttpMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_94aeace9d01cd65d, []int{0}
+	return fileDescriptor_ad20693261d55153, []int{0}
 }
 
 // Pull target.
@@ -73,16 +78,17 @@ func (m *PullTarget) Reset()         { *m = PullTarget{} }
 func (m *PullTarget) String() string { return proto.CompactTextString(m) }
 func (*PullTarget) ProtoMessage()    {}
 func (*PullTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_94aeace9d01cd65d, []int{0}
+	return fileDescriptor_ad20693261d55153, []int{0}
 }
+
 func (m *PullTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullTarget.Unmarshal(m, b)
 }
 func (m *PullTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PullTarget.Marshal(b, m, deterministic)
 }
-func (dst *PullTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PullTarget.Merge(dst, src)
+func (m *PullTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullTarget.Merge(m, src)
 }
 func (m *PullTarget) XXX_Size() int {
 	return xxx_messageInfo_PullTarget.Size(m)
@@ -132,16 +138,17 @@ func (m *PullMessage) Reset()         { *m = PullMessage{} }
 func (m *PullMessage) String() string { return proto.CompactTextString(m) }
 func (*PullMessage) ProtoMessage()    {}
 func (*PullMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_94aeace9d01cd65d, []int{1}
+	return fileDescriptor_ad20693261d55153, []int{1}
 }
+
 func (m *PullMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullMessage.Unmarshal(m, b)
 }
 func (m *PullMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PullMessage.Marshal(b, m, deterministic)
 }
-func (dst *PullMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PullMessage.Merge(dst, src)
+func (m *PullMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullMessage.Merge(m, src)
 }
 func (m *PullMessage) XXX_Size() int {
 	return xxx_messageInfo_PullMessage.Size(m)
@@ -202,16 +209,17 @@ func (m *AppEngineHttpTarget) Reset()         { *m = AppEngineHttpTarget{} }
 func (m *AppEngineHttpTarget) String() string { return proto.CompactTextString(m) }
 func (*AppEngineHttpTarget) ProtoMessage()    {}
 func (*AppEngineHttpTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_94aeace9d01cd65d, []int{2}
+	return fileDescriptor_ad20693261d55153, []int{2}
 }
+
 func (m *AppEngineHttpTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineHttpTarget.Unmarshal(m, b)
 }
 func (m *AppEngineHttpTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineHttpTarget.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineHttpTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineHttpTarget.Merge(dst, src)
+func (m *AppEngineHttpTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpTarget.Merge(m, src)
 }
 func (m *AppEngineHttpTarget) XXX_Size() int {
 	return xxx_messageInfo_AppEngineHttpTarget.Size(m)
@@ -368,16 +376,17 @@ func (m *AppEngineHttpRequest) Reset()         { *m = AppEngineHttpRequest{} }
 func (m *AppEngineHttpRequest) String() string { return proto.CompactTextString(m) }
 func (*AppEngineHttpRequest) ProtoMessage()    {}
 func (*AppEngineHttpRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_94aeace9d01cd65d, []int{3}
+	return fileDescriptor_ad20693261d55153, []int{3}
 }
+
 func (m *AppEngineHttpRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineHttpRequest.Unmarshal(m, b)
 }
 func (m *AppEngineHttpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineHttpRequest.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineHttpRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineHttpRequest.Merge(dst, src)
+func (m *AppEngineHttpRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpRequest.Merge(m, src)
 }
 func (m *AppEngineHttpRequest) XXX_Size() int {
 	return xxx_messageInfo_AppEngineHttpRequest.Size(m)
@@ -563,16 +572,17 @@ func (m *AppEngineRouting) Reset()         { *m = AppEngineRouting{} }
 func (m *AppEngineRouting) String() string { return proto.CompactTextString(m) }
 func (*AppEngineRouting) ProtoMessage()    {}
 func (*AppEngineRouting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_94aeace9d01cd65d, []int{4}
+	return fileDescriptor_ad20693261d55153, []int{4}
 }
+
 func (m *AppEngineRouting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineRouting.Unmarshal(m, b)
 }
 func (m *AppEngineRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineRouting.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineRouting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineRouting.Merge(dst, src)
+func (m *AppEngineRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineRouting.Merge(m, src)
 }
 func (m *AppEngineRouting) XXX_Size() int {
 	return xxx_messageInfo_AppEngineRouting.Size(m)
@@ -612,20 +622,20 @@ func (m *AppEngineRouting) GetHost() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2beta2.HttpMethod", HttpMethod_name, HttpMethod_value)
 	proto.RegisterType((*PullTarget)(nil), "google.cloud.tasks.v2beta2.PullTarget")
 	proto.RegisterType((*PullMessage)(nil), "google.cloud.tasks.v2beta2.PullMessage")
 	proto.RegisterType((*AppEngineHttpTarget)(nil), "google.cloud.tasks.v2beta2.AppEngineHttpTarget")
 	proto.RegisterType((*AppEngineHttpRequest)(nil), "google.cloud.tasks.v2beta2.AppEngineHttpRequest")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.tasks.v2beta2.AppEngineHttpRequest.HeadersEntry")
 	proto.RegisterType((*AppEngineRouting)(nil), "google.cloud.tasks.v2beta2.AppEngineRouting")
-	proto.RegisterEnum("google.cloud.tasks.v2beta2.HttpMethod", HttpMethod_name, HttpMethod_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta2/target.proto", fileDescriptor_target_94aeace9d01cd65d)
+	proto.RegisterFile("google/cloud/tasks/v2beta2/target.proto", fileDescriptor_ad20693261d55153)
 }
 
-var fileDescriptor_target_94aeace9d01cd65d = []byte{
+var fileDescriptor_ad20693261d55153 = []byte{
 	// 557 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x6f, 0xd3, 0x4c,
 	0x10, 0xfd, 0x5c, 0xa7, 0xbf, 0xc6, 0xd1, 0x27, 0x6b, 0xa9, 0x84, 0x95, 0xa2, 0xaa, 0xe4, 0x00,
diff --git a/googleapis/cloud/tasks/v2beta2/task.pb.go b/googleapis/cloud/tasks/v2beta2/task.pb.go
index 626c8612b1..93ba2d554e 100644
--- a/googleapis/cloud/tasks/v2beta2/task.pb.go
+++ b/googleapis/cloud/tasks/v2beta2/task.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta2/task.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The view specifies a subset of [Task][google.cloud.tasks.v2beta2.Task]
 // data.
@@ -60,6 +63,7 @@ var Task_View_name = map[int32]string{
 	1: "BASIC",
 	2: "FULL",
 }
+
 var Task_View_value = map[string]int32{
 	"VIEW_UNSPECIFIED": 0,
 	"BASIC":            1,
@@ -69,8 +73,9 @@ var Task_View_value = map[string]int32{
 func (x Task_View) String() string {
 	return proto.EnumName(Task_View_name, int32(x))
 }
+
 func (Task_View) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_task_bf54980d4c1d27a8, []int{0, 0}
+	return fileDescriptor_3fffa1a9946502fd, []int{0, 0}
 }
 
 // A unit of scheduled work.
@@ -136,16 +141,17 @@ func (m *Task) Reset()         { *m = Task{} }
 func (m *Task) String() string { return proto.CompactTextString(m) }
 func (*Task) ProtoMessage()    {}
 func (*Task) Descriptor() ([]byte, []int) {
-	return fileDescriptor_task_bf54980d4c1d27a8, []int{0}
+	return fileDescriptor_3fffa1a9946502fd, []int{0}
 }
+
 func (m *Task) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Task.Unmarshal(m, b)
 }
 func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Task.Marshal(b, m, deterministic)
 }
-func (dst *Task) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Task.Merge(dst, src)
+func (m *Task) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Task.Merge(m, src)
 }
 func (m *Task) XXX_Size() int {
 	return xxx_messageInfo_Task.Size(m)
@@ -228,80 +234,14 @@ func (m *Task) GetView() Task_View {
 	return Task_VIEW_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Task) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Task_OneofMarshaler, _Task_OneofUnmarshaler, _Task_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Task) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Task_AppEngineHttpRequest)(nil),
 		(*Task_PullMessage)(nil),
 	}
 }
 
-func _Task_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Task)
-	// payload_type
-	switch x := m.PayloadType.(type) {
-	case *Task_AppEngineHttpRequest:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngineHttpRequest); err != nil {
-			return err
-		}
-	case *Task_PullMessage:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PullMessage); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Task.PayloadType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Task_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Task)
-	switch tag {
-	case 3: // payload_type.app_engine_http_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppEngineHttpRequest)
-		err := b.DecodeMessage(msg)
-		m.PayloadType = &Task_AppEngineHttpRequest{msg}
-		return true, err
-	case 4: // payload_type.pull_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PullMessage)
-		err := b.DecodeMessage(msg)
-		m.PayloadType = &Task_PullMessage{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Task_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Task)
-	// payload_type
-	switch x := m.PayloadType.(type) {
-	case *Task_AppEngineHttpRequest:
-		s := proto.Size(x.AppEngineHttpRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Task_PullMessage:
-		s := proto.Size(x.PullMessage)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Status of the task.
 type TaskStatus struct {
 	// Output only. The number of attempts dispatched.
@@ -339,16 +279,17 @@ func (m *TaskStatus) Reset()         { *m = TaskStatus{} }
 func (m *TaskStatus) String() string { return proto.CompactTextString(m) }
 func (*TaskStatus) ProtoMessage()    {}
 func (*TaskStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_task_bf54980d4c1d27a8, []int{1}
+	return fileDescriptor_3fffa1a9946502fd, []int{1}
 }
+
 func (m *TaskStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TaskStatus.Unmarshal(m, b)
 }
 func (m *TaskStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TaskStatus.Marshal(b, m, deterministic)
 }
-func (dst *TaskStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TaskStatus.Merge(dst, src)
+func (m *TaskStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TaskStatus.Merge(m, src)
 }
 func (m *TaskStatus) XXX_Size() int {
 	return xxx_messageInfo_TaskStatus.Size(m)
@@ -415,16 +356,17 @@ func (m *AttemptStatus) Reset()         { *m = AttemptStatus{} }
 func (m *AttemptStatus) String() string { return proto.CompactTextString(m) }
 func (*AttemptStatus) ProtoMessage()    {}
 func (*AttemptStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_task_bf54980d4c1d27a8, []int{2}
+	return fileDescriptor_3fffa1a9946502fd, []int{2}
 }
+
 func (m *AttemptStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttemptStatus.Unmarshal(m, b)
 }
 func (m *AttemptStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttemptStatus.Marshal(b, m, deterministic)
 }
-func (dst *AttemptStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttemptStatus.Merge(dst, src)
+func (m *AttemptStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttemptStatus.Merge(m, src)
 }
 func (m *AttemptStatus) XXX_Size() int {
 	return xxx_messageInfo_AttemptStatus.Size(m)
@@ -464,17 +406,17 @@ func (m *AttemptStatus) GetResponseStatus() *status.Status {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2beta2.Task_View", Task_View_name, Task_View_value)
 	proto.RegisterType((*Task)(nil), "google.cloud.tasks.v2beta2.Task")
 	proto.RegisterType((*TaskStatus)(nil), "google.cloud.tasks.v2beta2.TaskStatus")
 	proto.RegisterType((*AttemptStatus)(nil), "google.cloud.tasks.v2beta2.AttemptStatus")
-	proto.RegisterEnum("google.cloud.tasks.v2beta2.Task_View", Task_View_name, Task_View_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta2/task.proto", fileDescriptor_task_bf54980d4c1d27a8)
+	proto.RegisterFile("google/cloud/tasks/v2beta2/task.proto", fileDescriptor_3fffa1a9946502fd)
 }
 
-var fileDescriptor_task_bf54980d4c1d27a8 = []byte{
+var fileDescriptor_3fffa1a9946502fd = []byte{
 	// 601 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x5f, 0x6f, 0xda, 0x3c,
 	0x14, 0xc6, 0x1b, 0x9a, 0xf6, 0x2d, 0xe6, 0xcf, 0xcb, 0x3c, 0xb4, 0x46, 0x68, 0xda, 0x10, 0x52,
diff --git a/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go b/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go
index 1ecae9b05b..4ece35f93b 100644
--- a/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/cloudtasks.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/cloudtasks.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import _ "google.golang.org/genproto/googleapis/rpc/code"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package tasks
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	_ "google.golang.org/genproto/googleapis/rpc/code"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for [ListQueues][google.cloud.tasks.v2beta3.CloudTasks.ListQueues].
 type ListQueuesRequest struct {
@@ -72,16 +72,17 @@ func (m *ListQueuesRequest) Reset()         { *m = ListQueuesRequest{} }
 func (m *ListQueuesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListQueuesRequest) ProtoMessage()    {}
 func (*ListQueuesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{0}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{0}
 }
+
 func (m *ListQueuesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListQueuesRequest.Unmarshal(m, b)
 }
 func (m *ListQueuesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListQueuesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListQueuesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListQueuesRequest.Merge(dst, src)
+func (m *ListQueuesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesRequest.Merge(m, src)
 }
 func (m *ListQueuesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListQueuesRequest.Size(m)
@@ -143,16 +144,17 @@ func (m *ListQueuesResponse) Reset()         { *m = ListQueuesResponse{} }
 func (m *ListQueuesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListQueuesResponse) ProtoMessage()    {}
 func (*ListQueuesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{1}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{1}
 }
+
 func (m *ListQueuesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListQueuesResponse.Unmarshal(m, b)
 }
 func (m *ListQueuesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListQueuesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListQueuesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListQueuesResponse.Merge(dst, src)
+func (m *ListQueuesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesResponse.Merge(m, src)
 }
 func (m *ListQueuesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListQueuesResponse.Size(m)
@@ -193,16 +195,17 @@ func (m *GetQueueRequest) Reset()         { *m = GetQueueRequest{} }
 func (m *GetQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*GetQueueRequest) ProtoMessage()    {}
 func (*GetQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{2}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{2}
 }
+
 func (m *GetQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetQueueRequest.Unmarshal(m, b)
 }
 func (m *GetQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetQueueRequest.Merge(dst, src)
+func (m *GetQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetQueueRequest.Merge(m, src)
 }
 func (m *GetQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_GetQueueRequest.Size(m)
@@ -246,16 +249,17 @@ func (m *CreateQueueRequest) Reset()         { *m = CreateQueueRequest{} }
 func (m *CreateQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateQueueRequest) ProtoMessage()    {}
 func (*CreateQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{3}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{3}
 }
+
 func (m *CreateQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateQueueRequest.Unmarshal(m, b)
 }
 func (m *CreateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateQueueRequest.Merge(dst, src)
+func (m *CreateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateQueueRequest.Merge(m, src)
 }
 func (m *CreateQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateQueueRequest.Size(m)
@@ -305,16 +309,17 @@ func (m *UpdateQueueRequest) Reset()         { *m = UpdateQueueRequest{} }
 func (m *UpdateQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateQueueRequest) ProtoMessage()    {}
 func (*UpdateQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{4}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{4}
 }
+
 func (m *UpdateQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateQueueRequest.Unmarshal(m, b)
 }
 func (m *UpdateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateQueueRequest.Merge(dst, src)
+func (m *UpdateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateQueueRequest.Merge(m, src)
 }
 func (m *UpdateQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateQueueRequest.Size(m)
@@ -355,16 +360,17 @@ func (m *DeleteQueueRequest) Reset()         { *m = DeleteQueueRequest{} }
 func (m *DeleteQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteQueueRequest) ProtoMessage()    {}
 func (*DeleteQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{5}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{5}
 }
+
 func (m *DeleteQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteQueueRequest.Unmarshal(m, b)
 }
 func (m *DeleteQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteQueueRequest.Merge(dst, src)
+func (m *DeleteQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteQueueRequest.Merge(m, src)
 }
 func (m *DeleteQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteQueueRequest.Size(m)
@@ -398,16 +404,17 @@ func (m *PurgeQueueRequest) Reset()         { *m = PurgeQueueRequest{} }
 func (m *PurgeQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*PurgeQueueRequest) ProtoMessage()    {}
 func (*PurgeQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{6}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{6}
 }
+
 func (m *PurgeQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PurgeQueueRequest.Unmarshal(m, b)
 }
 func (m *PurgeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PurgeQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *PurgeQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PurgeQueueRequest.Merge(dst, src)
+func (m *PurgeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PurgeQueueRequest.Merge(m, src)
 }
 func (m *PurgeQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_PurgeQueueRequest.Size(m)
@@ -441,16 +448,17 @@ func (m *PauseQueueRequest) Reset()         { *m = PauseQueueRequest{} }
 func (m *PauseQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*PauseQueueRequest) ProtoMessage()    {}
 func (*PauseQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{7}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{7}
 }
+
 func (m *PauseQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PauseQueueRequest.Unmarshal(m, b)
 }
 func (m *PauseQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PauseQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *PauseQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PauseQueueRequest.Merge(dst, src)
+func (m *PauseQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseQueueRequest.Merge(m, src)
 }
 func (m *PauseQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_PauseQueueRequest.Size(m)
@@ -484,16 +492,17 @@ func (m *ResumeQueueRequest) Reset()         { *m = ResumeQueueRequest{} }
 func (m *ResumeQueueRequest) String() string { return proto.CompactTextString(m) }
 func (*ResumeQueueRequest) ProtoMessage()    {}
 func (*ResumeQueueRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{8}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{8}
 }
+
 func (m *ResumeQueueRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResumeQueueRequest.Unmarshal(m, b)
 }
 func (m *ResumeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResumeQueueRequest.Marshal(b, m, deterministic)
 }
-func (dst *ResumeQueueRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResumeQueueRequest.Merge(dst, src)
+func (m *ResumeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeQueueRequest.Merge(m, src)
 }
 func (m *ResumeQueueRequest) XXX_Size() int {
 	return xxx_messageInfo_ResumeQueueRequest.Size(m)
@@ -558,16 +567,17 @@ func (m *ListTasksRequest) Reset()         { *m = ListTasksRequest{} }
 func (m *ListTasksRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTasksRequest) ProtoMessage()    {}
 func (*ListTasksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{9}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{9}
 }
+
 func (m *ListTasksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTasksRequest.Unmarshal(m, b)
 }
 func (m *ListTasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTasksRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTasksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTasksRequest.Merge(dst, src)
+func (m *ListTasksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksRequest.Merge(m, src)
 }
 func (m *ListTasksRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTasksRequest.Size(m)
@@ -627,16 +637,17 @@ func (m *ListTasksResponse) Reset()         { *m = ListTasksResponse{} }
 func (m *ListTasksResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTasksResponse) ProtoMessage()    {}
 func (*ListTasksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{10}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{10}
 }
+
 func (m *ListTasksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTasksResponse.Unmarshal(m, b)
 }
 func (m *ListTasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTasksResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTasksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTasksResponse.Merge(dst, src)
+func (m *ListTasksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksResponse.Merge(m, src)
 }
 func (m *ListTasksResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTasksResponse.Size(m)
@@ -690,16 +701,17 @@ func (m *GetTaskRequest) Reset()         { *m = GetTaskRequest{} }
 func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTaskRequest) ProtoMessage()    {}
 func (*GetTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{11}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{11}
 }
+
 func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b)
 }
 func (m *GetTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTaskRequest.Merge(dst, src)
+func (m *GetTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTaskRequest.Merge(m, src)
 }
 func (m *GetTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTaskRequest.Size(m)
@@ -791,16 +803,17 @@ func (m *CreateTaskRequest) Reset()         { *m = CreateTaskRequest{} }
 func (m *CreateTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTaskRequest) ProtoMessage()    {}
 func (*CreateTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{12}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{12}
 }
+
 func (m *CreateTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTaskRequest.Unmarshal(m, b)
 }
 func (m *CreateTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTaskRequest.Merge(dst, src)
+func (m *CreateTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTaskRequest.Merge(m, src)
 }
 func (m *CreateTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTaskRequest.Size(m)
@@ -849,16 +862,17 @@ func (m *DeleteTaskRequest) Reset()         { *m = DeleteTaskRequest{} }
 func (m *DeleteTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTaskRequest) ProtoMessage()    {}
 func (*DeleteTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{13}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{13}
 }
+
 func (m *DeleteTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTaskRequest.Unmarshal(m, b)
 }
 func (m *DeleteTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTaskRequest.Merge(dst, src)
+func (m *DeleteTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTaskRequest.Merge(m, src)
 }
 func (m *DeleteTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTaskRequest.Size(m)
@@ -906,16 +920,17 @@ func (m *RunTaskRequest) Reset()         { *m = RunTaskRequest{} }
 func (m *RunTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*RunTaskRequest) ProtoMessage()    {}
 func (*RunTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudtasks_6396912137772a30, []int{14}
+	return fileDescriptor_774b6c8e7fbe6f6d, []int{14}
 }
+
 func (m *RunTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunTaskRequest.Unmarshal(m, b)
 }
 func (m *RunTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunTaskRequest.Merge(dst, src)
+func (m *RunTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunTaskRequest.Merge(m, src)
 }
 func (m *RunTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_RunTaskRequest.Size(m)
@@ -958,6 +973,84 @@ func init() {
 	proto.RegisterType((*RunTaskRequest)(nil), "google.cloud.tasks.v2beta3.RunTaskRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/tasks/v2beta3/cloudtasks.proto", fileDescriptor_774b6c8e7fbe6f6d)
+}
+
+var fileDescriptor_774b6c8e7fbe6f6d = []byte{
+	// 1113 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0x5d, 0x6f, 0xdc, 0x44,
+	0x17, 0xc7, 0x35, 0x79, 0x6b, 0x73, 0xb6, 0x6d, 0x9e, 0x8c, 0x9e, 0x56, 0x8b, 0x0b, 0xd5, 0x62,
+	0x29, 0xed, 0xb2, 0xa5, 0xb6, 0xb2, 0xa5, 0x0d, 0xdd, 0x40, 0x9b, 0xa6, 0x6d, 0x22, 0x08, 0x48,
+	0xdb, 0xdd, 0xc0, 0x05, 0x37, 0x2b, 0x67, 0x33, 0xb1, 0x4c, 0xd6, 0x2f, 0xf5, 0x8c, 0x13, 0x28,
+	0x44, 0x48, 0x5c, 0x72, 0xc1, 0x4d, 0x11, 0xe2, 0x8e, 0x57, 0x81, 0xb8, 0xe0, 0x86, 0x6b, 0xbe,
+	0x05, 0x5f, 0x81, 0x0f, 0x82, 0xe6, 0xc5, 0x6b, 0x67, 0x9d, 0xb5, 0x9d, 0x05, 0x7a, 0x95, 0xf5,
+	0x9c, 0xff, 0xcc, 0xf9, 0xcd, 0x99, 0xe3, 0x39, 0xc7, 0x81, 0xeb, 0xb6, 0xef, 0xdb, 0x03, 0x62,
+	0xf6, 0x07, 0x7e, 0xb4, 0x6b, 0x32, 0x8b, 0xee, 0x53, 0xf3, 0xa0, 0xb9, 0x43, 0x98, 0x75, 0x53,
+	0x8e, 0x89, 0x21, 0x23, 0x08, 0x7d, 0xe6, 0x63, 0x4d, 0x8a, 0x0d, 0x61, 0x30, 0xa4, 0x45, 0x89,
+	0xb5, 0x17, 0xd5, 0x42, 0x56, 0xe0, 0x98, 0x96, 0xe7, 0xf9, 0xcc, 0x62, 0x8e, 0xef, 0xa9, 0x99,
+	0xda, 0x0b, 0x29, 0x6b, 0x48, 0xa8, 0x1f, 0x85, 0x7d, 0xa2, 0x4c, 0x97, 0x95, 0x49, 0x3c, 0xed,
+	0x44, 0x7b, 0x26, 0x71, 0x03, 0xf6, 0xb1, 0x32, 0xd6, 0x46, 0x8d, 0x7b, 0x0e, 0x19, 0xec, 0xf6,
+	0x5c, 0x8b, 0xee, 0x2b, 0xc5, 0x52, 0xce, 0x06, 0x58, 0x22, 0xbb, 0x9a, 0x23, 0x7b, 0x12, 0x91,
+	0x28, 0xa6, 0xb9, 0xa2, 0x74, 0x8e, 0xe5, 0x9a, 0x07, 0xcb, 0xfc, 0x4f, 0x2f, 0xf0, 0x07, 0x4e,
+	0x3f, 0x06, 0xd2, 0x8e, 0xdb, 0x8f, 0xd9, 0x2e, 0x2a, 0x5b, 0x18, 0xf4, 0xcd, 0xbe, 0xbf, 0xab,
+	0x96, 0xd4, 0x3f, 0x83, 0xc5, 0x77, 0x1c, 0xca, 0x1e, 0x73, 0x2f, 0xb4, 0x43, 0x9e, 0x44, 0x84,
+	0x32, 0x7c, 0x09, 0xe6, 0x02, 0x2b, 0x24, 0x1e, 0xab, 0xa2, 0x1a, 0xaa, 0xcf, 0x77, 0xd4, 0x13,
+	0x1f, 0xdf, 0x73, 0x06, 0x8c, 0x84, 0xd5, 0x29, 0x39, 0x2e, 0x9f, 0xf0, 0x65, 0x98, 0x0f, 0x2c,
+	0x9b, 0xf4, 0xa8, 0xf3, 0x94, 0x54, 0xa7, 0x6b, 0xa8, 0x3e, 0xdb, 0x39, 0xcb, 0x07, 0xba, 0xce,
+	0x53, 0x82, 0x5f, 0x02, 0x10, 0x46, 0xe6, 0xef, 0x13, 0xaf, 0x3a, 0x23, 0x26, 0x0a, 0xf9, 0x36,
+	0x1f, 0xd0, 0x0f, 0x01, 0xa7, 0x01, 0x68, 0xe0, 0x7b, 0x94, 0xe0, 0x3b, 0x30, 0x27, 0x36, 0x4e,
+	0xab, 0xa8, 0x36, 0x5d, 0xaf, 0x34, 0x5f, 0x36, 0xc6, 0x9f, 0xae, 0x21, 0xe6, 0x76, 0xd4, 0x04,
+	0x7c, 0x15, 0x16, 0x3c, 0xf2, 0x11, 0xeb, 0xa5, 0x9c, 0x4a, 0xda, 0xf3, 0x7c, 0xb8, 0x3d, 0x74,
+	0xbc, 0x04, 0x0b, 0x9b, 0x44, 0xfa, 0x8d, 0xf7, 0x8d, 0x61, 0xc6, 0xb3, 0x5c, 0xa2, 0x76, 0x2d,
+	0x7e, 0xeb, 0x04, 0xf0, 0x83, 0x90, 0x58, 0x8c, 0x1c, 0x53, 0x8e, 0x8b, 0xd0, 0x0a, 0xcc, 0x0a,
+	0x0c, 0xe1, 0xb2, 0x14, 0xb6, 0xd4, 0xeb, 0x5f, 0x20, 0xc0, 0xef, 0x05, 0xbb, 0xa3, 0x7e, 0x86,
+	0xeb, 0xa1, 0xd3, 0xad, 0x87, 0x57, 0xa1, 0x12, 0x89, 0xe5, 0x44, 0x3a, 0x2a, 0x1c, 0x2d, 0x9e,
+	0x1e, 0x67, 0xac, 0xb1, 0xc1, 0x33, 0xf6, 0x5d, 0x8b, 0xee, 0x77, 0x40, 0xca, 0xf9, 0x6f, 0xbd,
+	0x0e, 0xf8, 0x21, 0x19, 0x90, 0x11, 0x96, 0x93, 0xa2, 0x73, 0x0d, 0x16, 0xdb, 0x51, 0x68, 0x97,
+	0x13, 0x5a, 0x11, 0x2d, 0x16, 0xd6, 0x01, 0x77, 0x08, 0x8d, 0xdc, 0x62, 0xe5, 0xef, 0x08, 0xfe,
+	0xc7, 0x53, 0x67, 0x9b, 0x47, 0xa1, 0xe8, 0x60, 0xde, 0x86, 0xf3, 0xa1, 0x4a, 0xae, 0xde, 0x81,
+	0x43, 0x0e, 0x45, 0x44, 0x2e, 0x34, 0x97, 0xf2, 0x02, 0xca, 0x17, 0x36, 0xde, 0x77, 0xc8, 0x61,
+	0xe7, 0x5c, 0x3c, 0x97, 0x3f, 0xfd, 0xa3, 0x74, 0xa7, 0xf2, 0x7d, 0x53, 0xcc, 0x2a, 0xdb, 0x6f,
+	0xc3, 0xac, 0xf0, 0xac, 0x92, 0xbd, 0x56, 0x04, 0xd5, 0x91, 0xf2, 0xd2, 0xa9, 0x1e, 0xc0, 0x85,
+	0x4d, 0x22, 0x7c, 0xe6, 0xc4, 0xf3, 0xdf, 0x0c, 0x91, 0xfe, 0x1b, 0x82, 0x45, 0xf9, 0xda, 0xa4,
+	0xbd, 0x8e, 0x3b, 0x9c, 0xd7, 0x60, 0x86, 0x25, 0x59, 0x5a, 0xbc, 0x7d, 0xa1, 0xce, 0xf2, 0x4e,
+	0x4f, 0xce, 0x7b, 0x0d, 0x16, 0x65, 0xc6, 0x17, 0x04, 0x89, 0x87, 0xb2, 0x13, 0x79, 0xcf, 0x31,
+	0x94, 0xcd, 0x5f, 0xfe, 0x0f, 0xf0, 0x80, 0xeb, 0x45, 0xce, 0xe0, 0x9f, 0x10, 0x40, 0x72, 0x61,
+	0xe2, 0x1b, 0x79, 0x4b, 0x66, 0x6e, 0x76, 0xcd, 0x28, 0x2b, 0x97, 0x00, 0xfa, 0xca, 0xe7, 0x7f,
+	0xfe, 0xf5, 0x6c, 0x6a, 0x19, 0x9b, 0xc3, 0x7a, 0xf4, 0x89, 0x3c, 0xb3, 0x37, 0x83, 0xd0, 0xff,
+	0x90, 0xf4, 0x19, 0x35, 0x1b, 0xe6, 0xc0, 0xef, 0xcb, 0x7a, 0x6a, 0x36, 0x8e, 0x4c, 0x75, 0x0b,
+	0x3f, 0x43, 0x70, 0x36, 0xbe, 0x5e, 0xf1, 0xf5, 0x3c, 0xaf, 0x23, 0x97, 0xb0, 0x56, 0x7c, 0xc7,
+	0x9d, 0x44, 0xc5, 0xc3, 0x3e, 0x86, 0x49, 0x21, 0x99, 0x8d, 0x23, 0xfc, 0x1d, 0x82, 0x4a, 0xea,
+	0x36, 0xc7, 0xb9, 0xe1, 0xc8, 0x5e, 0xfb, 0x65, 0xd8, 0xee, 0x0a, 0xb6, 0xd7, 0xf5, 0xd3, 0x46,
+	0xac, 0xa5, 0x2e, 0xee, 0x9f, 0x11, 0x54, 0x52, 0x85, 0x20, 0x1f, 0x31, 0x5b, 0x31, 0xca, 0x20,
+	0x3e, 0x14, 0x88, 0x77, 0x9b, 0xb7, 0x12, 0x44, 0xd9, 0x65, 0x94, 0x0a, 0x62, 0x0c, 0xfa, 0x25,
+	0x82, 0x4a, 0xaa, 0x4a, 0xe4, 0x83, 0x66, 0xcb, 0x89, 0x76, 0x29, 0x53, 0x8c, 0x1e, 0xf1, 0xde,
+	0x2a, 0x3e, 0xdc, 0xc6, 0x24, 0x87, 0x0b, 0x49, 0x31, 0xca, 0x7f, 0x33, 0x32, 0x45, 0xab, 0x4c,
+	0xdc, 0xd6, 0x04, 0x59, 0x4b, 0xbf, 0x75, 0x4a, 0xb2, 0x56, 0xc0, 0xbd, 0xb5, 0x50, 0x43, 0x22,
+	0x0e, 0xcb, 0x60, 0x01, 0xe2, 0x68, 0xb9, 0xfc, 0x6f, 0x11, 0xb9, 0x37, 0x8e, 0xf8, 0x23, 0x82,
+	0x4a, 0xaa, 0x00, 0xe7, 0x1f, 0x6b, 0xb6, 0x52, 0x97, 0x81, 0xbc, 0x2f, 0x20, 0x57, 0xf5, 0xdb,
+	0xa7, 0x85, 0x0c, 0x85, 0x3b, 0x4e, 0xf9, 0x35, 0x82, 0x73, 0x9b, 0x84, 0xbd, 0x65, 0xb9, 0x6d,
+	0xd1, 0xe4, 0x62, 0x3d, 0x76, 0xeb, 0x58, 0xae, 0x71, 0xb0, 0x6c, 0xa4, 0x8d, 0x31, 0xda, 0xc5,
+	0x11, 0x8d, 0xb4, 0xea, 0x5b, 0x02, 0xe7, 0x91, 0xbe, 0x96, 0xe0, 0xc4, 0x5f, 0x01, 0xc5, 0x48,
+	0x76, 0xca, 0x4f, 0x0c, 0xd6, 0xcd, 0x03, 0xeb, 0x3e, 0x27, 0x30, 0x3a, 0x02, 0xf6, 0x07, 0x02,
+	0xbc, 0x4d, 0xa8, 0x18, 0x24, 0xa1, 0xeb, 0x50, 0xca, 0xa7, 0xe0, 0xfa, 0x88, 0xeb, 0xac, 0x24,
+	0x86, 0x7c, 0xa5, 0x84, 0x52, 0x55, 0x8d, 0xc7, 0x02, 0x7c, 0x4b, 0xdf, 0x98, 0x04, 0x9c, 0x65,
+	0xd6, 0xe5, 0xf8, 0xbf, 0x22, 0x98, 0x1f, 0x36, 0x4e, 0xf8, 0xd5, 0xa2, 0x32, 0x96, 0xee, 0x09,
+	0xb5, 0x1b, 0x25, 0xd5, 0x8a, 0xfe, 0x9e, 0xa0, 0xbf, 0x83, 0x57, 0x4a, 0xde, 0xe0, 0x09, 0xbb,
+	0xfc, 0x74, 0xc3, 0xdf, 0x20, 0x38, 0xa3, 0xfa, 0x2d, 0xdc, 0x28, 0x28, 0x7d, 0xa9, 0x4e, 0x42,
+	0x2b, 0x6c, 0x7c, 0x4e, 0x42, 0x2b, 0xf3, 0xe6, 0xa8, 0x4f, 0xca, 0xc6, 0x11, 0xfe, 0x1e, 0x01,
+	0x24, 0x7d, 0x59, 0xfe, 0x05, 0x94, 0xe9, 0xdf, 0x4a, 0x00, 0xae, 0x0b, 0xc0, 0x37, 0xf4, 0x49,
+	0x63, 0xc7, 0x8f, 0xfa, 0x2b, 0x04, 0x90, 0x34, 0x63, 0xf9, 0x8c, 0x99, 0xa6, 0x6d, 0x6c, 0x59,
+	0x51, 0xa1, 0x6b, 0x4c, 0x1c, 0xba, 0x6f, 0x11, 0x9c, 0x51, 0xad, 0x5f, 0xfe, 0xa9, 0x1e, 0xef,
+	0x0f, 0x4b, 0x04, 0x6d, 0x43, 0xa0, 0xad, 0xe9, 0xab, 0x13, 0xa2, 0xb5, 0xc2, 0xc8, 0x6b, 0xa1,
+	0xc6, 0xfa, 0xa7, 0x70, 0xa5, 0xef, 0xbb, 0x39, 0xee, 0xd6, 0x17, 0x92, 0x46, 0xb2, 0xcd, 0xc3,
+	0xd3, 0x46, 0x1f, 0xdc, 0x53, 0x72, 0xdb, 0x1f, 0x58, 0x9e, 0x6d, 0xf8, 0xa1, 0x6d, 0xda, 0xc4,
+	0x13, 0xc1, 0x33, 0xa5, 0xc9, 0x0a, 0x1c, 0x7a, 0xd2, 0xbf, 0x26, 0x56, 0xc5, 0xd3, 0x0f, 0x53,
+	0xb3, 0xdb, 0xf7, 0xbb, 0x5b, 0xdd, 0x9d, 0x39, 0x31, 0xe7, 0xe6, 0xdf, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x34, 0x8b, 0xca, 0x54, 0xb5, 0x11, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1800,81 +1893,3 @@ var _CloudTasks_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/tasks/v2beta3/cloudtasks.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta3/cloudtasks.proto", fileDescriptor_cloudtasks_6396912137772a30)
-}
-
-var fileDescriptor_cloudtasks_6396912137772a30 = []byte{
-	// 1113 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0x5d, 0x6f, 0xdc, 0x44,
-	0x17, 0xc7, 0x35, 0x79, 0x6b, 0x73, 0xb6, 0x6d, 0x9e, 0x8c, 0x9e, 0x56, 0x8b, 0x0b, 0xd5, 0x62,
-	0x29, 0xed, 0xb2, 0xa5, 0xb6, 0xb2, 0xa5, 0x0d, 0xdd, 0x40, 0x9b, 0xa6, 0x6d, 0x22, 0x08, 0x48,
-	0xdb, 0xdd, 0xc0, 0x05, 0x37, 0x2b, 0x67, 0x33, 0xb1, 0x4c, 0xd6, 0x2f, 0xf5, 0x8c, 0x13, 0x28,
-	0x44, 0x48, 0x5c, 0x72, 0xc1, 0x4d, 0x11, 0xe2, 0x8e, 0x57, 0x81, 0xb8, 0xe0, 0x86, 0x6b, 0xbe,
-	0x05, 0x5f, 0x81, 0x0f, 0x82, 0xe6, 0xc5, 0x6b, 0x67, 0x9d, 0xb5, 0x9d, 0x05, 0x7a, 0x95, 0xf5,
-	0x9c, 0xff, 0xcc, 0xf9, 0xcd, 0x99, 0xe3, 0x39, 0xc7, 0x81, 0xeb, 0xb6, 0xef, 0xdb, 0x03, 0x62,
-	0xf6, 0x07, 0x7e, 0xb4, 0x6b, 0x32, 0x8b, 0xee, 0x53, 0xf3, 0xa0, 0xb9, 0x43, 0x98, 0x75, 0x53,
-	0x8e, 0x89, 0x21, 0x23, 0x08, 0x7d, 0xe6, 0x63, 0x4d, 0x8a, 0x0d, 0x61, 0x30, 0xa4, 0x45, 0x89,
-	0xb5, 0x17, 0xd5, 0x42, 0x56, 0xe0, 0x98, 0x96, 0xe7, 0xf9, 0xcc, 0x62, 0x8e, 0xef, 0xa9, 0x99,
-	0xda, 0x0b, 0x29, 0x6b, 0x48, 0xa8, 0x1f, 0x85, 0x7d, 0xa2, 0x4c, 0x97, 0x95, 0x49, 0x3c, 0xed,
-	0x44, 0x7b, 0x26, 0x71, 0x03, 0xf6, 0xb1, 0x32, 0xd6, 0x46, 0x8d, 0x7b, 0x0e, 0x19, 0xec, 0xf6,
-	0x5c, 0x8b, 0xee, 0x2b, 0xc5, 0x52, 0xce, 0x06, 0x58, 0x22, 0xbb, 0x9a, 0x23, 0x7b, 0x12, 0x91,
-	0x28, 0xa6, 0xb9, 0xa2, 0x74, 0x8e, 0xe5, 0x9a, 0x07, 0xcb, 0xfc, 0x4f, 0x2f, 0xf0, 0x07, 0x4e,
-	0x3f, 0x06, 0xd2, 0x8e, 0xdb, 0x8f, 0xd9, 0x2e, 0x2a, 0x5b, 0x18, 0xf4, 0xcd, 0xbe, 0xbf, 0xab,
-	0x96, 0xd4, 0x3f, 0x83, 0xc5, 0x77, 0x1c, 0xca, 0x1e, 0x73, 0x2f, 0xb4, 0x43, 0x9e, 0x44, 0x84,
-	0x32, 0x7c, 0x09, 0xe6, 0x02, 0x2b, 0x24, 0x1e, 0xab, 0xa2, 0x1a, 0xaa, 0xcf, 0x77, 0xd4, 0x13,
-	0x1f, 0xdf, 0x73, 0x06, 0x8c, 0x84, 0xd5, 0x29, 0x39, 0x2e, 0x9f, 0xf0, 0x65, 0x98, 0x0f, 0x2c,
-	0x9b, 0xf4, 0xa8, 0xf3, 0x94, 0x54, 0xa7, 0x6b, 0xa8, 0x3e, 0xdb, 0x39, 0xcb, 0x07, 0xba, 0xce,
-	0x53, 0x82, 0x5f, 0x02, 0x10, 0x46, 0xe6, 0xef, 0x13, 0xaf, 0x3a, 0x23, 0x26, 0x0a, 0xf9, 0x36,
-	0x1f, 0xd0, 0x0f, 0x01, 0xa7, 0x01, 0x68, 0xe0, 0x7b, 0x94, 0xe0, 0x3b, 0x30, 0x27, 0x36, 0x4e,
-	0xab, 0xa8, 0x36, 0x5d, 0xaf, 0x34, 0x5f, 0x36, 0xc6, 0x9f, 0xae, 0x21, 0xe6, 0x76, 0xd4, 0x04,
-	0x7c, 0x15, 0x16, 0x3c, 0xf2, 0x11, 0xeb, 0xa5, 0x9c, 0x4a, 0xda, 0xf3, 0x7c, 0xb8, 0x3d, 0x74,
-	0xbc, 0x04, 0x0b, 0x9b, 0x44, 0xfa, 0x8d, 0xf7, 0x8d, 0x61, 0xc6, 0xb3, 0x5c, 0xa2, 0x76, 0x2d,
-	0x7e, 0xeb, 0x04, 0xf0, 0x83, 0x90, 0x58, 0x8c, 0x1c, 0x53, 0x8e, 0x8b, 0xd0, 0x0a, 0xcc, 0x0a,
-	0x0c, 0xe1, 0xb2, 0x14, 0xb6, 0xd4, 0xeb, 0x5f, 0x20, 0xc0, 0xef, 0x05, 0xbb, 0xa3, 0x7e, 0x86,
-	0xeb, 0xa1, 0xd3, 0xad, 0x87, 0x57, 0xa1, 0x12, 0x89, 0xe5, 0x44, 0x3a, 0x2a, 0x1c, 0x2d, 0x9e,
-	0x1e, 0x67, 0xac, 0xb1, 0xc1, 0x33, 0xf6, 0x5d, 0x8b, 0xee, 0x77, 0x40, 0xca, 0xf9, 0x6f, 0xbd,
-	0x0e, 0xf8, 0x21, 0x19, 0x90, 0x11, 0x96, 0x93, 0xa2, 0x73, 0x0d, 0x16, 0xdb, 0x51, 0x68, 0x97,
-	0x13, 0x5a, 0x11, 0x2d, 0x16, 0xd6, 0x01, 0x77, 0x08, 0x8d, 0xdc, 0x62, 0xe5, 0xef, 0x08, 0xfe,
-	0xc7, 0x53, 0x67, 0x9b, 0x47, 0xa1, 0xe8, 0x60, 0xde, 0x86, 0xf3, 0xa1, 0x4a, 0xae, 0xde, 0x81,
-	0x43, 0x0e, 0x45, 0x44, 0x2e, 0x34, 0x97, 0xf2, 0x02, 0xca, 0x17, 0x36, 0xde, 0x77, 0xc8, 0x61,
-	0xe7, 0x5c, 0x3c, 0x97, 0x3f, 0xfd, 0xa3, 0x74, 0xa7, 0xf2, 0x7d, 0x53, 0xcc, 0x2a, 0xdb, 0x6f,
-	0xc3, 0xac, 0xf0, 0xac, 0x92, 0xbd, 0x56, 0x04, 0xd5, 0x91, 0xf2, 0xd2, 0xa9, 0x1e, 0xc0, 0x85,
-	0x4d, 0x22, 0x7c, 0xe6, 0xc4, 0xf3, 0xdf, 0x0c, 0x91, 0xfe, 0x1b, 0x82, 0x45, 0xf9, 0xda, 0xa4,
-	0xbd, 0x8e, 0x3b, 0x9c, 0xd7, 0x60, 0x86, 0x25, 0x59, 0x5a, 0xbc, 0x7d, 0xa1, 0xce, 0xf2, 0x4e,
-	0x4f, 0xce, 0x7b, 0x0d, 0x16, 0x65, 0xc6, 0x17, 0x04, 0x89, 0x87, 0xb2, 0x13, 0x79, 0xcf, 0x31,
-	0x94, 0xcd, 0x5f, 0xfe, 0x0f, 0xf0, 0x80, 0xeb, 0x45, 0xce, 0xe0, 0x9f, 0x10, 0x40, 0x72, 0x61,
-	0xe2, 0x1b, 0x79, 0x4b, 0x66, 0x6e, 0x76, 0xcd, 0x28, 0x2b, 0x97, 0x00, 0xfa, 0xca, 0xe7, 0x7f,
-	0xfe, 0xf5, 0x6c, 0x6a, 0x19, 0x9b, 0xc3, 0x7a, 0xf4, 0x89, 0x3c, 0xb3, 0x37, 0x83, 0xd0, 0xff,
-	0x90, 0xf4, 0x19, 0x35, 0x1b, 0xe6, 0xc0, 0xef, 0xcb, 0x7a, 0x6a, 0x36, 0x8e, 0x4c, 0x75, 0x0b,
-	0x3f, 0x43, 0x70, 0x36, 0xbe, 0x5e, 0xf1, 0xf5, 0x3c, 0xaf, 0x23, 0x97, 0xb0, 0x56, 0x7c, 0xc7,
-	0x9d, 0x44, 0xc5, 0xc3, 0x3e, 0x86, 0x49, 0x21, 0x99, 0x8d, 0x23, 0xfc, 0x1d, 0x82, 0x4a, 0xea,
-	0x36, 0xc7, 0xb9, 0xe1, 0xc8, 0x5e, 0xfb, 0x65, 0xd8, 0xee, 0x0a, 0xb6, 0xd7, 0xf5, 0xd3, 0x46,
-	0xac, 0xa5, 0x2e, 0xee, 0x9f, 0x11, 0x54, 0x52, 0x85, 0x20, 0x1f, 0x31, 0x5b, 0x31, 0xca, 0x20,
-	0x3e, 0x14, 0x88, 0x77, 0x9b, 0xb7, 0x12, 0x44, 0xd9, 0x65, 0x94, 0x0a, 0x62, 0x0c, 0xfa, 0x25,
-	0x82, 0x4a, 0xaa, 0x4a, 0xe4, 0x83, 0x66, 0xcb, 0x89, 0x76, 0x29, 0x53, 0x8c, 0x1e, 0xf1, 0xde,
-	0x2a, 0x3e, 0xdc, 0xc6, 0x24, 0x87, 0x0b, 0x49, 0x31, 0xca, 0x7f, 0x33, 0x32, 0x45, 0xab, 0x4c,
-	0xdc, 0xd6, 0x04, 0x59, 0x4b, 0xbf, 0x75, 0x4a, 0xb2, 0x56, 0xc0, 0xbd, 0xb5, 0x50, 0x43, 0x22,
-	0x0e, 0xcb, 0x60, 0x01, 0xe2, 0x68, 0xb9, 0xfc, 0x6f, 0x11, 0xb9, 0x37, 0x8e, 0xf8, 0x23, 0x82,
-	0x4a, 0xaa, 0x00, 0xe7, 0x1f, 0x6b, 0xb6, 0x52, 0x97, 0x81, 0xbc, 0x2f, 0x20, 0x57, 0xf5, 0xdb,
-	0xa7, 0x85, 0x0c, 0x85, 0x3b, 0x4e, 0xf9, 0x35, 0x82, 0x73, 0x9b, 0x84, 0xbd, 0x65, 0xb9, 0x6d,
-	0xd1, 0xe4, 0x62, 0x3d, 0x76, 0xeb, 0x58, 0xae, 0x71, 0xb0, 0x6c, 0xa4, 0x8d, 0x31, 0xda, 0xc5,
-	0x11, 0x8d, 0xb4, 0xea, 0x5b, 0x02, 0xe7, 0x91, 0xbe, 0x96, 0xe0, 0xc4, 0x5f, 0x01, 0xc5, 0x48,
-	0x76, 0xca, 0x4f, 0x0c, 0xd6, 0xcd, 0x03, 0xeb, 0x3e, 0x27, 0x30, 0x3a, 0x02, 0xf6, 0x07, 0x02,
-	0xbc, 0x4d, 0xa8, 0x18, 0x24, 0xa1, 0xeb, 0x50, 0xca, 0xa7, 0xe0, 0xfa, 0x88, 0xeb, 0xac, 0x24,
-	0x86, 0x7c, 0xa5, 0x84, 0x52, 0x55, 0x8d, 0xc7, 0x02, 0x7c, 0x4b, 0xdf, 0x98, 0x04, 0x9c, 0x65,
-	0xd6, 0xe5, 0xf8, 0xbf, 0x22, 0x98, 0x1f, 0x36, 0x4e, 0xf8, 0xd5, 0xa2, 0x32, 0x96, 0xee, 0x09,
-	0xb5, 0x1b, 0x25, 0xd5, 0x8a, 0xfe, 0x9e, 0xa0, 0xbf, 0x83, 0x57, 0x4a, 0xde, 0xe0, 0x09, 0xbb,
-	0xfc, 0x74, 0xc3, 0xdf, 0x20, 0x38, 0xa3, 0xfa, 0x2d, 0xdc, 0x28, 0x28, 0x7d, 0xa9, 0x4e, 0x42,
-	0x2b, 0x6c, 0x7c, 0x4e, 0x42, 0x2b, 0xf3, 0xe6, 0xa8, 0x4f, 0xca, 0xc6, 0x11, 0xfe, 0x1e, 0x01,
-	0x24, 0x7d, 0x59, 0xfe, 0x05, 0x94, 0xe9, 0xdf, 0x4a, 0x00, 0xae, 0x0b, 0xc0, 0x37, 0xf4, 0x49,
-	0x63, 0xc7, 0x8f, 0xfa, 0x2b, 0x04, 0x90, 0x34, 0x63, 0xf9, 0x8c, 0x99, 0xa6, 0x6d, 0x6c, 0x59,
-	0x51, 0xa1, 0x6b, 0x4c, 0x1c, 0xba, 0x6f, 0x11, 0x9c, 0x51, 0xad, 0x5f, 0xfe, 0xa9, 0x1e, 0xef,
-	0x0f, 0x4b, 0x04, 0x6d, 0x43, 0xa0, 0xad, 0xe9, 0xab, 0x13, 0xa2, 0xb5, 0xc2, 0xc8, 0x6b, 0xa1,
-	0xc6, 0xfa, 0xa7, 0x70, 0xa5, 0xef, 0xbb, 0x39, 0xee, 0xd6, 0x17, 0x92, 0x46, 0xb2, 0xcd, 0xc3,
-	0xd3, 0x46, 0x1f, 0xdc, 0x53, 0x72, 0xdb, 0x1f, 0x58, 0x9e, 0x6d, 0xf8, 0xa1, 0x6d, 0xda, 0xc4,
-	0x13, 0xc1, 0x33, 0xa5, 0xc9, 0x0a, 0x1c, 0x7a, 0xd2, 0xbf, 0x26, 0x56, 0xc5, 0xd3, 0x0f, 0x53,
-	0xb3, 0xdb, 0xf7, 0xbb, 0x5b, 0xdd, 0x9d, 0x39, 0x31, 0xe7, 0xe6, 0xdf, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0x34, 0x8b, 0xca, 0x54, 0xb5, 0x11, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/tasks/v2beta3/queue.pb.go b/googleapis/cloud/tasks/v2beta3/queue.pb.go
index 25c2a47d97..6f70ccd9ce 100644
--- a/googleapis/cloud/tasks/v2beta3/queue.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/queue.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/queue.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // State of the queue.
 type Queue_State int32
@@ -63,6 +66,7 @@ var Queue_State_name = map[int32]string{
 	2: "PAUSED",
 	3: "DISABLED",
 }
+
 var Queue_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"RUNNING":           1,
@@ -73,8 +77,9 @@ var Queue_State_value = map[string]int32{
 func (x Queue_State) String() string {
 	return proto.EnumName(Queue_State_name, int32(x))
 }
+
 func (Queue_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_queue_728c565dd0b3b59c, []int{0, 0}
+	return fileDescriptor_36e1ae9449bd88db, []int{0, 0}
 }
 
 // A queue is a container of related tasks. Queues are configured to manage
@@ -174,16 +179,17 @@ func (m *Queue) Reset()         { *m = Queue{} }
 func (m *Queue) String() string { return proto.CompactTextString(m) }
 func (*Queue) ProtoMessage()    {}
 func (*Queue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_728c565dd0b3b59c, []int{0}
+	return fileDescriptor_36e1ae9449bd88db, []int{0}
 }
+
 func (m *Queue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Queue.Unmarshal(m, b)
 }
 func (m *Queue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Queue.Marshal(b, m, deterministic)
 }
-func (dst *Queue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Queue.Merge(dst, src)
+func (m *Queue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Queue.Merge(m, src)
 }
 func (m *Queue) XXX_Size() int {
 	return xxx_messageInfo_Queue.Size(m)
@@ -260,61 +266,13 @@ func (m *Queue) GetLogSamplingRatio() float64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Queue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Queue_OneofMarshaler, _Queue_OneofUnmarshaler, _Queue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Queue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Queue_AppEngineHttpQueue)(nil),
 	}
 }
 
-func _Queue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Queue)
-	// queue_type
-	switch x := m.QueueType.(type) {
-	case *Queue_AppEngineHttpQueue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngineHttpQueue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Queue.QueueType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Queue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Queue)
-	switch tag {
-	case 3: // queue_type.app_engine_http_queue
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppEngineHttpQueue)
-		err := b.DecodeMessage(msg)
-		m.QueueType = &Queue_AppEngineHttpQueue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Queue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Queue)
-	// queue_type
-	switch x := m.QueueType.(type) {
-	case *Queue_AppEngineHttpQueue:
-		s := proto.Size(x.AppEngineHttpQueue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Rate limits.
 //
 // This message determines the maximum rate that tasks can be dispatched by a
@@ -395,16 +353,17 @@ func (m *RateLimits) Reset()         { *m = RateLimits{} }
 func (m *RateLimits) String() string { return proto.CompactTextString(m) }
 func (*RateLimits) ProtoMessage()    {}
 func (*RateLimits) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_728c565dd0b3b59c, []int{1}
+	return fileDescriptor_36e1ae9449bd88db, []int{1}
 }
+
 func (m *RateLimits) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RateLimits.Unmarshal(m, b)
 }
 func (m *RateLimits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RateLimits.Marshal(b, m, deterministic)
 }
-func (dst *RateLimits) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RateLimits.Merge(dst, src)
+func (m *RateLimits) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RateLimits.Merge(m, src)
 }
 func (m *RateLimits) XXX_Size() int {
 	return xxx_messageInfo_RateLimits.Size(m)
@@ -542,16 +501,17 @@ func (m *RetryConfig) Reset()         { *m = RetryConfig{} }
 func (m *RetryConfig) String() string { return proto.CompactTextString(m) }
 func (*RetryConfig) ProtoMessage()    {}
 func (*RetryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_queue_728c565dd0b3b59c, []int{2}
+	return fileDescriptor_36e1ae9449bd88db, []int{2}
 }
+
 func (m *RetryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryConfig.Unmarshal(m, b)
 }
 func (m *RetryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryConfig.Marshal(b, m, deterministic)
 }
-func (dst *RetryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryConfig.Merge(dst, src)
+func (m *RetryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryConfig.Merge(m, src)
 }
 func (m *RetryConfig) XXX_Size() int {
 	return xxx_messageInfo_RetryConfig.Size(m)
@@ -598,17 +558,17 @@ func (m *RetryConfig) GetMaxDoublings() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2beta3.Queue_State", Queue_State_name, Queue_State_value)
 	proto.RegisterType((*Queue)(nil), "google.cloud.tasks.v2beta3.Queue")
 	proto.RegisterType((*RateLimits)(nil), "google.cloud.tasks.v2beta3.RateLimits")
 	proto.RegisterType((*RetryConfig)(nil), "google.cloud.tasks.v2beta3.RetryConfig")
-	proto.RegisterEnum("google.cloud.tasks.v2beta3.Queue_State", Queue_State_name, Queue_State_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta3/queue.proto", fileDescriptor_queue_728c565dd0b3b59c)
+	proto.RegisterFile("google/cloud/tasks/v2beta3/queue.proto", fileDescriptor_36e1ae9449bd88db)
 }
 
-var fileDescriptor_queue_728c565dd0b3b59c = []byte{
+var fileDescriptor_36e1ae9449bd88db = []byte{
 	// 683 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x51, 0x4f, 0xdb, 0x30,
 	0x10, 0xc7, 0x09, 0xb4, 0x30, 0x2e, 0x1d, 0xea, 0x2c, 0xb1, 0x85, 0x6a, 0x62, 0x5d, 0x37, 0x41,
diff --git a/googleapis/cloud/tasks/v2beta3/target.pb.go b/googleapis/cloud/tasks/v2beta3/target.pb.go
index c9a10a74f9..b7b77079e6 100644
--- a/googleapis/cloud/tasks/v2beta3/target.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/target.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/target.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The HTTP method used to execute the task.
 type HttpMethod int32
@@ -51,6 +54,7 @@ var HttpMethod_name = map[int32]string{
 	6: "PATCH",
 	7: "OPTIONS",
 }
+
 var HttpMethod_value = map[string]int32{
 	"HTTP_METHOD_UNSPECIFIED": 0,
 	"POST":                    1,
@@ -65,8 +69,9 @@ var HttpMethod_value = map[string]int32{
 func (x HttpMethod) String() string {
 	return proto.EnumName(HttpMethod_name, int32(x))
 }
+
 func (HttpMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_6c51f433dca06861, []int{0}
+	return fileDescriptor_595de6119aed6d9e, []int{0}
 }
 
 // HTTP request.
@@ -167,16 +172,17 @@ func (m *HttpRequest) Reset()         { *m = HttpRequest{} }
 func (m *HttpRequest) String() string { return proto.CompactTextString(m) }
 func (*HttpRequest) ProtoMessage()    {}
 func (*HttpRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_6c51f433dca06861, []int{0}
+	return fileDescriptor_595de6119aed6d9e, []int{0}
 }
+
 func (m *HttpRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpRequest.Unmarshal(m, b)
 }
 func (m *HttpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpRequest.Marshal(b, m, deterministic)
 }
-func (dst *HttpRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpRequest.Merge(dst, src)
+func (m *HttpRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpRequest.Merge(m, src)
 }
 func (m *HttpRequest) XXX_Size() int {
 	return xxx_messageInfo_HttpRequest.Size(m)
@@ -252,80 +258,14 @@ func (m *HttpRequest) GetOidcToken() *OidcToken {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*HttpRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _HttpRequest_OneofMarshaler, _HttpRequest_OneofUnmarshaler, _HttpRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HttpRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*HttpRequest_OauthToken)(nil),
 		(*HttpRequest_OidcToken)(nil),
 	}
 }
 
-func _HttpRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*HttpRequest)
-	// authorization_header
-	switch x := m.AuthorizationHeader.(type) {
-	case *HttpRequest_OauthToken:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OauthToken); err != nil {
-			return err
-		}
-	case *HttpRequest_OidcToken:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OidcToken); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("HttpRequest.AuthorizationHeader has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _HttpRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*HttpRequest)
-	switch tag {
-	case 5: // authorization_header.oauth_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(OAuthToken)
-		err := b.DecodeMessage(msg)
-		m.AuthorizationHeader = &HttpRequest_OauthToken{msg}
-		return true, err
-	case 6: // authorization_header.oidc_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(OidcToken)
-		err := b.DecodeMessage(msg)
-		m.AuthorizationHeader = &HttpRequest_OidcToken{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _HttpRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*HttpRequest)
-	// authorization_header
-	switch x := m.AuthorizationHeader.(type) {
-	case *HttpRequest_OauthToken:
-		s := proto.Size(x.OauthToken)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *HttpRequest_OidcToken:
-		s := proto.Size(x.OidcToken)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // App Engine HTTP queue.
 //
 // The task will be delivered to the App Engine application hostname
@@ -356,16 +296,17 @@ func (m *AppEngineHttpQueue) Reset()         { *m = AppEngineHttpQueue{} }
 func (m *AppEngineHttpQueue) String() string { return proto.CompactTextString(m) }
 func (*AppEngineHttpQueue) ProtoMessage()    {}
 func (*AppEngineHttpQueue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_6c51f433dca06861, []int{1}
+	return fileDescriptor_595de6119aed6d9e, []int{1}
 }
+
 func (m *AppEngineHttpQueue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineHttpQueue.Unmarshal(m, b)
 }
 func (m *AppEngineHttpQueue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineHttpQueue.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineHttpQueue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineHttpQueue.Merge(dst, src)
+func (m *AppEngineHttpQueue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpQueue.Merge(m, src)
 }
 func (m *AppEngineHttpQueue) XXX_Size() int {
 	return xxx_messageInfo_AppEngineHttpQueue.Size(m)
@@ -527,16 +468,17 @@ func (m *AppEngineHttpRequest) Reset()         { *m = AppEngineHttpRequest{} }
 func (m *AppEngineHttpRequest) String() string { return proto.CompactTextString(m) }
 func (*AppEngineHttpRequest) ProtoMessage()    {}
 func (*AppEngineHttpRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_6c51f433dca06861, []int{2}
+	return fileDescriptor_595de6119aed6d9e, []int{2}
 }
+
 func (m *AppEngineHttpRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineHttpRequest.Unmarshal(m, b)
 }
 func (m *AppEngineHttpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineHttpRequest.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineHttpRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineHttpRequest.Merge(dst, src)
+func (m *AppEngineHttpRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpRequest.Merge(m, src)
 }
 func (m *AppEngineHttpRequest) XXX_Size() int {
 	return xxx_messageInfo_AppEngineHttpRequest.Size(m)
@@ -666,16 +608,17 @@ func (m *AppEngineRouting) Reset()         { *m = AppEngineRouting{} }
 func (m *AppEngineRouting) String() string { return proto.CompactTextString(m) }
 func (*AppEngineRouting) ProtoMessage()    {}
 func (*AppEngineRouting) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_6c51f433dca06861, []int{3}
+	return fileDescriptor_595de6119aed6d9e, []int{3}
 }
+
 func (m *AppEngineRouting) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AppEngineRouting.Unmarshal(m, b)
 }
 func (m *AppEngineRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AppEngineRouting.Marshal(b, m, deterministic)
 }
-func (dst *AppEngineRouting) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AppEngineRouting.Merge(dst, src)
+func (m *AppEngineRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineRouting.Merge(m, src)
 }
 func (m *AppEngineRouting) XXX_Size() int {
 	return xxx_messageInfo_AppEngineRouting.Size(m)
@@ -738,16 +681,17 @@ func (m *OAuthToken) Reset()         { *m = OAuthToken{} }
 func (m *OAuthToken) String() string { return proto.CompactTextString(m) }
 func (*OAuthToken) ProtoMessage()    {}
 func (*OAuthToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_6c51f433dca06861, []int{4}
+	return fileDescriptor_595de6119aed6d9e, []int{4}
 }
+
 func (m *OAuthToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OAuthToken.Unmarshal(m, b)
 }
 func (m *OAuthToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OAuthToken.Marshal(b, m, deterministic)
 }
-func (dst *OAuthToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OAuthToken.Merge(dst, src)
+func (m *OAuthToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OAuthToken.Merge(m, src)
 }
 func (m *OAuthToken) XXX_Size() int {
 	return xxx_messageInfo_OAuthToken.Size(m)
@@ -796,16 +740,17 @@ func (m *OidcToken) Reset()         { *m = OidcToken{} }
 func (m *OidcToken) String() string { return proto.CompactTextString(m) }
 func (*OidcToken) ProtoMessage()    {}
 func (*OidcToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_6c51f433dca06861, []int{5}
+	return fileDescriptor_595de6119aed6d9e, []int{5}
 }
+
 func (m *OidcToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OidcToken.Unmarshal(m, b)
 }
 func (m *OidcToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OidcToken.Marshal(b, m, deterministic)
 }
-func (dst *OidcToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OidcToken.Merge(dst, src)
+func (m *OidcToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OidcToken.Merge(m, src)
 }
 func (m *OidcToken) XXX_Size() int {
 	return xxx_messageInfo_OidcToken.Size(m)
@@ -831,6 +776,7 @@ func (m *OidcToken) GetAudience() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2beta3.HttpMethod", HttpMethod_name, HttpMethod_value)
 	proto.RegisterType((*HttpRequest)(nil), "google.cloud.tasks.v2beta3.HttpRequest")
 	proto.RegisterMapType((map[string]string)(nil), "google.cloud.tasks.v2beta3.HttpRequest.HeadersEntry")
 	proto.RegisterType((*AppEngineHttpQueue)(nil), "google.cloud.tasks.v2beta3.AppEngineHttpQueue")
@@ -839,14 +785,13 @@ func init() {
 	proto.RegisterType((*AppEngineRouting)(nil), "google.cloud.tasks.v2beta3.AppEngineRouting")
 	proto.RegisterType((*OAuthToken)(nil), "google.cloud.tasks.v2beta3.OAuthToken")
 	proto.RegisterType((*OidcToken)(nil), "google.cloud.tasks.v2beta3.OidcToken")
-	proto.RegisterEnum("google.cloud.tasks.v2beta3.HttpMethod", HttpMethod_name, HttpMethod_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta3/target.proto", fileDescriptor_target_6c51f433dca06861)
+	proto.RegisterFile("google/cloud/tasks/v2beta3/target.proto", fileDescriptor_595de6119aed6d9e)
 }
 
-var fileDescriptor_target_6c51f433dca06861 = []byte{
+var fileDescriptor_595de6119aed6d9e = []byte{
 	// 707 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xdf, 0x6f, 0xd3, 0x3a,
 	0x14, 0x5e, 0x96, 0xfe, 0x58, 0x4f, 0xa6, 0xab, 0xc8, 0x77, 0xf7, 0xde, 0xa8, 0xbb, 0x42, 0xa5,
diff --git a/googleapis/cloud/tasks/v2beta3/task.pb.go b/googleapis/cloud/tasks/v2beta3/task.pb.go
index b153f61ec4..154655759e 100644
--- a/googleapis/cloud/tasks/v2beta3/task.pb.go
+++ b/googleapis/cloud/tasks/v2beta3/task.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/tasks/v2beta3/task.proto
 
-package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
+package tasks
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The view specifies a subset of [Task][google.cloud.tasks.v2beta3.Task] data.
 //
@@ -56,6 +59,7 @@ var Task_View_name = map[int32]string{
 	1: "BASIC",
 	2: "FULL",
 }
+
 var Task_View_value = map[string]int32{
 	"VIEW_UNSPECIFIED": 0,
 	"BASIC":            1,
@@ -65,8 +69,9 @@ var Task_View_value = map[string]int32{
 func (x Task_View) String() string {
 	return proto.EnumName(Task_View_name, int32(x))
 }
+
 func (Task_View) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_task_9659896bd52bfaac, []int{0, 0}
+	return fileDescriptor_ef2a735969aa09d5, []int{0, 0}
 }
 
 // A unit of scheduled work.
@@ -166,16 +171,17 @@ func (m *Task) Reset()         { *m = Task{} }
 func (m *Task) String() string { return proto.CompactTextString(m) }
 func (*Task) ProtoMessage()    {}
 func (*Task) Descriptor() ([]byte, []int) {
-	return fileDescriptor_task_9659896bd52bfaac, []int{0}
+	return fileDescriptor_ef2a735969aa09d5, []int{0}
 }
+
 func (m *Task) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Task.Unmarshal(m, b)
 }
 func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Task.Marshal(b, m, deterministic)
 }
-func (dst *Task) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Task.Merge(dst, src)
+func (m *Task) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Task.Merge(m, src)
 }
 func (m *Task) XXX_Size() int {
 	return xxx_messageInfo_Task.Size(m)
@@ -286,80 +292,14 @@ func (m *Task) GetView() Task_View {
 	return Task_VIEW_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Task) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Task_OneofMarshaler, _Task_OneofUnmarshaler, _Task_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Task) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Task_AppEngineHttpRequest)(nil),
 		(*Task_HttpRequest)(nil),
 	}
 }
 
-func _Task_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Task)
-	// payload_type
-	switch x := m.PayloadType.(type) {
-	case *Task_AppEngineHttpRequest:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppEngineHttpRequest); err != nil {
-			return err
-		}
-	case *Task_HttpRequest:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HttpRequest); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Task.PayloadType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Task_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Task)
-	switch tag {
-	case 3: // payload_type.app_engine_http_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AppEngineHttpRequest)
-		err := b.DecodeMessage(msg)
-		m.PayloadType = &Task_AppEngineHttpRequest{msg}
-		return true, err
-	case 11: // payload_type.http_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HttpRequest)
-		err := b.DecodeMessage(msg)
-		m.PayloadType = &Task_HttpRequest{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Task_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Task)
-	// payload_type
-	switch x := m.PayloadType.(type) {
-	case *Task_AppEngineHttpRequest:
-		s := proto.Size(x.AppEngineHttpRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Task_HttpRequest:
-		s := proto.Size(x.HttpRequest)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The status of a task attempt.
 type Attempt struct {
 	// Output only. The time that this attempt was scheduled.
@@ -388,16 +328,17 @@ func (m *Attempt) Reset()         { *m = Attempt{} }
 func (m *Attempt) String() string { return proto.CompactTextString(m) }
 func (*Attempt) ProtoMessage()    {}
 func (*Attempt) Descriptor() ([]byte, []int) {
-	return fileDescriptor_task_9659896bd52bfaac, []int{1}
+	return fileDescriptor_ef2a735969aa09d5, []int{1}
 }
+
 func (m *Attempt) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Attempt.Unmarshal(m, b)
 }
 func (m *Attempt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Attempt.Marshal(b, m, deterministic)
 }
-func (dst *Attempt) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Attempt.Merge(dst, src)
+func (m *Attempt) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Attempt.Merge(m, src)
 }
 func (m *Attempt) XXX_Size() int {
 	return xxx_messageInfo_Attempt.Size(m)
@@ -437,16 +378,16 @@ func (m *Attempt) GetResponseStatus() *status.Status {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.tasks.v2beta3.Task_View", Task_View_name, Task_View_value)
 	proto.RegisterType((*Task)(nil), "google.cloud.tasks.v2beta3.Task")
 	proto.RegisterType((*Attempt)(nil), "google.cloud.tasks.v2beta3.Attempt")
-	proto.RegisterEnum("google.cloud.tasks.v2beta3.Task_View", Task_View_name, Task_View_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/tasks/v2beta3/task.proto", fileDescriptor_task_9659896bd52bfaac)
+	proto.RegisterFile("google/cloud/tasks/v2beta3/task.proto", fileDescriptor_ef2a735969aa09d5)
 }
 
-var fileDescriptor_task_9659896bd52bfaac = []byte{
+var fileDescriptor_ef2a735969aa09d5 = []byte{
 	// 599 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x5f, 0x4f, 0xdb, 0x3c,
 	0x14, 0xc6, 0x09, 0xa4, 0x40, 0xdd, 0xc0, 0xdb, 0xd7, 0x42, 0x22, 0x54, 0x13, 0xab, 0x98, 0x10,
diff --git a/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go b/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
index 6674c81827..bd8d2a5fce 100644
--- a/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
+++ b/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/texttospeech/v1/cloud_tts.proto
 
-package texttospeech // import "google.golang.org/genproto/googleapis/cloud/texttospeech/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package texttospeech
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Gender of the voice as described in
 // [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
@@ -49,6 +49,7 @@ var SsmlVoiceGender_name = map[int32]string{
 	2: "FEMALE",
 	3: "NEUTRAL",
 }
+
 var SsmlVoiceGender_value = map[string]int32{
 	"SSML_VOICE_GENDER_UNSPECIFIED": 0,
 	"MALE":                          1,
@@ -59,8 +60,9 @@ var SsmlVoiceGender_value = map[string]int32{
 func (x SsmlVoiceGender) String() string {
 	return proto.EnumName(SsmlVoiceGender_name, int32(x))
 }
+
 func (SsmlVoiceGender) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{0}
+	return fileDescriptor_b86cfe431745e140, []int{0}
 }
 
 // Configuration to set up audio encoder. The encoding determines the output
@@ -88,6 +90,7 @@ var AudioEncoding_name = map[int32]string{
 	2: "MP3",
 	3: "OGG_OPUS",
 }
+
 var AudioEncoding_value = map[string]int32{
 	"AUDIO_ENCODING_UNSPECIFIED": 0,
 	"LINEAR16":                   1,
@@ -98,8 +101,9 @@ var AudioEncoding_value = map[string]int32{
 func (x AudioEncoding) String() string {
 	return proto.EnumName(AudioEncoding_name, int32(x))
 }
+
 func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{1}
+	return fileDescriptor_b86cfe431745e140, []int{1}
 }
 
 // The top-level message sent by the client for the `ListVoices` method.
@@ -122,16 +126,17 @@ func (m *ListVoicesRequest) Reset()         { *m = ListVoicesRequest{} }
 func (m *ListVoicesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListVoicesRequest) ProtoMessage()    {}
 func (*ListVoicesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{0}
+	return fileDescriptor_b86cfe431745e140, []int{0}
 }
+
 func (m *ListVoicesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVoicesRequest.Unmarshal(m, b)
 }
 func (m *ListVoicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVoicesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListVoicesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVoicesRequest.Merge(dst, src)
+func (m *ListVoicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesRequest.Merge(m, src)
 }
 func (m *ListVoicesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListVoicesRequest.Size(m)
@@ -162,16 +167,17 @@ func (m *ListVoicesResponse) Reset()         { *m = ListVoicesResponse{} }
 func (m *ListVoicesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListVoicesResponse) ProtoMessage()    {}
 func (*ListVoicesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{1}
+	return fileDescriptor_b86cfe431745e140, []int{1}
 }
+
 func (m *ListVoicesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVoicesResponse.Unmarshal(m, b)
 }
 func (m *ListVoicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVoicesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListVoicesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVoicesResponse.Merge(dst, src)
+func (m *ListVoicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesResponse.Merge(m, src)
 }
 func (m *ListVoicesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListVoicesResponse.Size(m)
@@ -210,16 +216,17 @@ func (m *Voice) Reset()         { *m = Voice{} }
 func (m *Voice) String() string { return proto.CompactTextString(m) }
 func (*Voice) ProtoMessage()    {}
 func (*Voice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{2}
+	return fileDescriptor_b86cfe431745e140, []int{2}
 }
+
 func (m *Voice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Voice.Unmarshal(m, b)
 }
 func (m *Voice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Voice.Marshal(b, m, deterministic)
 }
-func (dst *Voice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Voice.Merge(dst, src)
+func (m *Voice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Voice.Merge(m, src)
 }
 func (m *Voice) XXX_Size() int {
 	return xxx_messageInfo_Voice.Size(m)
@@ -275,16 +282,17 @@ func (m *SynthesizeSpeechRequest) Reset()         { *m = SynthesizeSpeechRequest
 func (m *SynthesizeSpeechRequest) String() string { return proto.CompactTextString(m) }
 func (*SynthesizeSpeechRequest) ProtoMessage()    {}
 func (*SynthesizeSpeechRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{3}
+	return fileDescriptor_b86cfe431745e140, []int{3}
 }
+
 func (m *SynthesizeSpeechRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesizeSpeechRequest.Unmarshal(m, b)
 }
 func (m *SynthesizeSpeechRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesizeSpeechRequest.Marshal(b, m, deterministic)
 }
-func (dst *SynthesizeSpeechRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesizeSpeechRequest.Merge(dst, src)
+func (m *SynthesizeSpeechRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechRequest.Merge(m, src)
 }
 func (m *SynthesizeSpeechRequest) XXX_Size() int {
 	return xxx_messageInfo_SynthesizeSpeechRequest.Size(m)
@@ -336,16 +344,17 @@ func (m *SynthesisInput) Reset()         { *m = SynthesisInput{} }
 func (m *SynthesisInput) String() string { return proto.CompactTextString(m) }
 func (*SynthesisInput) ProtoMessage()    {}
 func (*SynthesisInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{4}
+	return fileDescriptor_b86cfe431745e140, []int{4}
 }
+
 func (m *SynthesisInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesisInput.Unmarshal(m, b)
 }
 func (m *SynthesisInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesisInput.Marshal(b, m, deterministic)
 }
-func (dst *SynthesisInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesisInput.Merge(dst, src)
+func (m *SynthesisInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesisInput.Merge(m, src)
 }
 func (m *SynthesisInput) XXX_Size() int {
 	return xxx_messageInfo_SynthesisInput.Size(m)
@@ -393,72 +402,14 @@ func (m *SynthesisInput) GetSsml() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SynthesisInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SynthesisInput_OneofMarshaler, _SynthesisInput_OneofUnmarshaler, _SynthesisInput_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SynthesisInput) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SynthesisInput_Text)(nil),
 		(*SynthesisInput_Ssml)(nil),
 	}
 }
 
-func _SynthesisInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SynthesisInput)
-	// input_source
-	switch x := m.InputSource.(type) {
-	case *SynthesisInput_Text:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Text)
-	case *SynthesisInput_Ssml:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Ssml)
-	case nil:
-	default:
-		return fmt.Errorf("SynthesisInput.InputSource has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SynthesisInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SynthesisInput)
-	switch tag {
-	case 1: // input_source.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.InputSource = &SynthesisInput_Text{x}
-		return true, err
-	case 2: // input_source.ssml
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.InputSource = &SynthesisInput_Ssml{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SynthesisInput_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SynthesisInput)
-	// input_source
-	switch x := m.InputSource.(type) {
-	case *SynthesisInput_Text:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Text)))
-		n += len(x.Text)
-	case *SynthesisInput_Ssml:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Ssml)))
-		n += len(x.Ssml)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Description of which voice to use for a synthesis request.
 type VoiceSelectionParams struct {
 	// The language (and optionally also the region) of the voice expressed as a
@@ -491,16 +442,17 @@ func (m *VoiceSelectionParams) Reset()         { *m = VoiceSelectionParams{} }
 func (m *VoiceSelectionParams) String() string { return proto.CompactTextString(m) }
 func (*VoiceSelectionParams) ProtoMessage()    {}
 func (*VoiceSelectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{5}
+	return fileDescriptor_b86cfe431745e140, []int{5}
 }
+
 func (m *VoiceSelectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VoiceSelectionParams.Unmarshal(m, b)
 }
 func (m *VoiceSelectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VoiceSelectionParams.Marshal(b, m, deterministic)
 }
-func (dst *VoiceSelectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VoiceSelectionParams.Merge(dst, src)
+func (m *VoiceSelectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoiceSelectionParams.Merge(m, src)
 }
 func (m *VoiceSelectionParams) XXX_Size() int {
 	return xxx_messageInfo_VoiceSelectionParams.Size(m)
@@ -579,16 +531,17 @@ func (m *AudioConfig) Reset()         { *m = AudioConfig{} }
 func (m *AudioConfig) String() string { return proto.CompactTextString(m) }
 func (*AudioConfig) ProtoMessage()    {}
 func (*AudioConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{6}
+	return fileDescriptor_b86cfe431745e140, []int{6}
 }
+
 func (m *AudioConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioConfig.Unmarshal(m, b)
 }
 func (m *AudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioConfig.Marshal(b, m, deterministic)
 }
-func (dst *AudioConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioConfig.Merge(dst, src)
+func (m *AudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioConfig.Merge(m, src)
 }
 func (m *AudioConfig) XXX_Size() int {
 	return xxx_messageInfo_AudioConfig.Size(m)
@@ -657,16 +610,17 @@ func (m *SynthesizeSpeechResponse) Reset()         { *m = SynthesizeSpeechRespon
 func (m *SynthesizeSpeechResponse) String() string { return proto.CompactTextString(m) }
 func (*SynthesizeSpeechResponse) ProtoMessage()    {}
 func (*SynthesizeSpeechResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_aab68875a18aec90, []int{7}
+	return fileDescriptor_b86cfe431745e140, []int{7}
 }
+
 func (m *SynthesizeSpeechResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesizeSpeechResponse.Unmarshal(m, b)
 }
 func (m *SynthesizeSpeechResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesizeSpeechResponse.Marshal(b, m, deterministic)
 }
-func (dst *SynthesizeSpeechResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesizeSpeechResponse.Merge(dst, src)
+func (m *SynthesizeSpeechResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechResponse.Merge(m, src)
 }
 func (m *SynthesizeSpeechResponse) XXX_Size() int {
 	return xxx_messageInfo_SynthesizeSpeechResponse.Size(m)
@@ -685,6 +639,8 @@ func (m *SynthesizeSpeechResponse) GetAudioContent() []byte {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.texttospeech.v1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
+	proto.RegisterEnum("google.cloud.texttospeech.v1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
 	proto.RegisterType((*ListVoicesRequest)(nil), "google.cloud.texttospeech.v1.ListVoicesRequest")
 	proto.RegisterType((*ListVoicesResponse)(nil), "google.cloud.texttospeech.v1.ListVoicesResponse")
 	proto.RegisterType((*Voice)(nil), "google.cloud.texttospeech.v1.Voice")
@@ -693,8 +649,71 @@ func init() {
 	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.texttospeech.v1.VoiceSelectionParams")
 	proto.RegisterType((*AudioConfig)(nil), "google.cloud.texttospeech.v1.AudioConfig")
 	proto.RegisterType((*SynthesizeSpeechResponse)(nil), "google.cloud.texttospeech.v1.SynthesizeSpeechResponse")
-	proto.RegisterEnum("google.cloud.texttospeech.v1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
-	proto.RegisterEnum("google.cloud.texttospeech.v1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/texttospeech/v1/cloud_tts.proto", fileDescriptor_b86cfe431745e140)
+}
+
+var fileDescriptor_b86cfe431745e140 = []byte{
+	// 897 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0xee, 0xd8, 0x71, 0xda, 0x3e, 0xaf, 0x5d, 0x67, 0x88, 0xc0, 0x44, 0xa5, 0x32, 0x1b, 0x90,
+	0x42, 0x08, 0x36, 0x76, 0x45, 0x05, 0xed, 0x01, 0x39, 0xf6, 0xd6, 0xb1, 0xe4, 0xd8, 0x66, 0x9c,
+	0x04, 0x09, 0x45, 0x5a, 0x4d, 0xd6, 0x93, 0xcd, 0x8a, 0xf5, 0xcc, 0xe2, 0x19, 0x47, 0xa5, 0x47,
+	0xf8, 0x09, 0x5c, 0x91, 0x10, 0x57, 0x7e, 0x01, 0x67, 0x8e, 0x48, 0x9c, 0xf8, 0x0b, 0xfc, 0x05,
+	0x24, 0x8e, 0x68, 0x66, 0xd6, 0xad, 0x93, 0x54, 0xc6, 0x5c, 0x7a, 0xdb, 0x79, 0x6f, 0xbe, 0x37,
+	0xdf, 0xfb, 0xf6, 0x9b, 0x37, 0xb0, 0x17, 0x0a, 0x11, 0xc6, 0xac, 0x16, 0xc4, 0x62, 0x36, 0xae,
+	0x29, 0xf6, 0x4c, 0x29, 0x21, 0x13, 0xc6, 0x82, 0x8b, 0xda, 0x65, 0xdd, 0x46, 0x7d, 0xa5, 0x64,
+	0x35, 0x99, 0x0a, 0x25, 0xf0, 0x7d, 0xbb, 0xbb, 0x6a, 0xe2, 0xd5, 0xc5, 0xdd, 0xd5, 0xcb, 0xfa,
+	0x56, 0x9a, 0xad, 0xd1, 0x24, 0xaa, 0x51, 0xce, 0x85, 0xa2, 0x2a, 0x12, 0x3c, 0xc5, 0xba, 0x9f,
+	0xc2, 0x46, 0x2f, 0x92, 0xea, 0x44, 0x44, 0x01, 0x93, 0x84, 0x7d, 0x33, 0x63, 0x52, 0xe1, 0x6d,
+	0x28, 0xc4, 0x94, 0x87, 0x33, 0x1a, 0x32, 0x3f, 0x10, 0x63, 0x56, 0x46, 0x15, 0xb4, 0x73, 0x97,
+	0x38, 0xf3, 0x60, 0x4b, 0x8c, 0x99, 0xfb, 0x05, 0xe0, 0x45, 0xa4, 0x4c, 0x04, 0x97, 0x0c, 0x3f,
+	0x81, 0xf5, 0x4b, 0x13, 0x29, 0xa3, 0x4a, 0x76, 0x27, 0xdf, 0xd8, 0xae, 0x2e, 0x23, 0x57, 0x35,
+	0x68, 0x92, 0x42, 0xdc, 0x3f, 0x10, 0xe4, 0x4c, 0x04, 0xbf, 0x0f, 0xc5, 0x2b, 0x0c, 0x6c, 0xb9,
+	0xbb, 0xa4, 0xb0, 0x48, 0x41, 0x62, 0x0c, 0x6b, 0x9c, 0x4e, 0x58, 0x39, 0x63, 0xf8, 0x99, 0x6f,
+	0xdc, 0x87, 0xbc, 0x94, 0x93, 0xd8, 0x0f, 0x19, 0x1f, 0xb3, 0x69, 0x39, 0x5b, 0x41, 0x3b, 0xc5,
+	0xc6, 0x47, 0xcb, 0x69, 0x8c, 0xe4, 0x24, 0x36, 0x07, 0x77, 0x0c, 0x88, 0x80, 0xae, 0x60, 0xbf,
+	0xf1, 0x67, 0xf0, 0x36, 0xa7, 0x6a, 0x36, 0xa5, 0xb1, 0x2f, 0xe9, 0x24, 0x89, 0x99, 0x3f, 0xa5,
+	0x8a, 0xf9, 0x17, 0x6c, 0xaa, 0x9e, 0x97, 0xd7, 0x2a, 0x68, 0x27, 0x47, 0xde, 0x4c, 0x37, 0x8c,
+	0x4c, 0x9e, 0x50, 0xc5, 0x0e, 0x74, 0xd6, 0xfd, 0x1b, 0xc1, 0x5b, 0xa3, 0x6f, 0xb9, 0xba, 0x60,
+	0x32, 0x7a, 0xce, 0x46, 0xe6, 0xb8, 0xb9, 0xc6, 0xfb, 0x90, 0x8b, 0x78, 0x32, 0x53, 0x46, 0xdb,
+	0x7c, 0x63, 0xef, 0x3f, 0x08, 0xa6, 0x55, 0x64, 0x57, 0x63, 0x88, 0x85, 0xe2, 0x03, 0xc8, 0x19,
+	0xe5, 0x4c, 0xff, 0xf9, 0x46, 0x63, 0x05, 0xad, 0x47, 0x2c, 0x66, 0x81, 0x36, 0xc0, 0x90, 0x4e,
+	0xe9, 0x44, 0x12, 0x5b, 0x00, 0xf7, 0xc0, 0xa1, 0xb3, 0x71, 0x24, 0xfc, 0x40, 0xf0, 0xf3, 0x28,
+	0x34, 0xaa, 0xe5, 0x1b, 0x1f, 0x2c, 0x2f, 0xd8, 0xd4, 0x88, 0x96, 0x01, 0x90, 0x3c, 0x7d, 0xb9,
+	0x70, 0x7b, 0x50, 0xbc, 0x4a, 0x18, 0x6f, 0xc2, 0x9a, 0x46, 0x5b, 0x23, 0x1d, 0xdc, 0x22, 0x66,
+	0xa5, 0xa3, 0x5a, 0x68, 0xfb, 0xfb, 0x74, 0x54, 0xaf, 0xf6, 0x8b, 0xe0, 0x98, 0xf6, 0x7c, 0x29,
+	0x66, 0xd3, 0x80, 0xb9, 0x3f, 0x21, 0xd8, 0x7c, 0x15, 0xf7, 0x95, 0x6c, 0xfa, 0x3a, 0x2c, 0xe2,
+	0xfe, 0x98, 0x81, 0xfc, 0x82, 0x18, 0x98, 0x40, 0xd1, 0xaa, 0xc9, 0x78, 0x20, 0xc6, 0x11, 0x0f,
+	0x0d, 0xb3, 0x62, 0xe3, 0xc3, 0x15, 0xf4, 0xf4, 0x52, 0x08, 0x29, 0xd0, 0xc5, 0xa5, 0x6e, 0x56,
+	0x26, 0x8c, 0x7e, 0x1d, 0xf1, 0xd0, 0x18, 0xd0, 0x34, 0x84, 0x88, 0x33, 0x0f, 0x6a, 0xd7, 0xe1,
+	0x4d, 0xc8, 0x25, 0x91, 0x0a, 0x2e, 0x4c, 0x4b, 0x88, 0xd8, 0x05, 0x7e, 0x0f, 0x8a, 0x97, 0x22,
+	0x9e, 0x4d, 0x98, 0x1f, 0xd2, 0x88, 0xfb, 0xe3, 0x33, 0x63, 0x5b, 0x44, 0x1c, 0x1b, 0xed, 0xd0,
+	0x88, 0xb7, 0xcf, 0xf0, 0x2e, 0x6c, 0xdc, 0xf4, 0x77, 0xce, 0xf8, 0xfb, 0x9e, 0xbc, 0x6a, 0x6c,
+	0xbc, 0x07, 0x98, 0x9d, 0x9f, 0xb3, 0x40, 0x49, 0x3f, 0x99, 0x8a, 0xf3, 0x28, 0x66, 0x7e, 0x34,
+	0x2e, 0xaf, 0x9b, 0x2b, 0x5a, 0x4a, 0x33, 0x43, 0x9b, 0xe8, 0x8e, 0xdd, 0xcf, 0xa1, 0x7c, 0xf3,
+	0x16, 0xa4, 0xf3, 0x62, 0x1b, 0x0a, 0x2f, 0x8c, 0xa7, 0x18, 0xb7, 0x0e, 0x71, 0x88, 0x33, 0xb7,
+	0x93, 0x8e, 0xed, 0x7e, 0x09, 0xf7, 0xae, 0xc9, 0x8f, 0xdf, 0x85, 0x77, 0x46, 0xa3, 0xc3, 0x9e,
+	0x7f, 0x32, 0xe8, 0xb6, 0x3c, 0xbf, 0xe3, 0xf5, 0xdb, 0x1e, 0xf1, 0x8f, 0xfb, 0xa3, 0xa1, 0xd7,
+	0xea, 0x3e, 0xed, 0x7a, 0xed, 0xd2, 0x2d, 0x7c, 0x07, 0xd6, 0x0e, 0x9b, 0x3d, 0xaf, 0x84, 0x30,
+	0xc0, 0xfa, 0x53, 0xcf, 0x7c, 0x67, 0x70, 0x1e, 0x6e, 0xf7, 0xbd, 0xe3, 0x23, 0xd2, 0xec, 0x95,
+	0xb2, 0xbb, 0x47, 0x50, 0xb8, 0x22, 0x3a, 0x7e, 0x00, 0x5b, 0xcd, 0xe3, 0x76, 0x77, 0xe0, 0x7b,
+	0xfd, 0xd6, 0xa0, 0xdd, 0xed, 0x77, 0xae, 0xd5, 0x74, 0xe0, 0x4e, 0xaf, 0xdb, 0xf7, 0x9a, 0xa4,
+	0xfe, 0xa8, 0x84, 0xf0, 0x6d, 0xc8, 0x1e, 0x0e, 0x1f, 0x96, 0x32, 0x3a, 0x3c, 0xe8, 0x74, 0xfc,
+	0xc1, 0xf0, 0x78, 0x54, 0xca, 0x36, 0x7e, 0xcd, 0x80, 0x73, 0xc4, 0x9e, 0xa9, 0x23, 0x61, 0x9b,
+	0xc5, 0xdf, 0x23, 0x80, 0x97, 0xb3, 0x12, 0xd7, 0x96, 0xdb, 0xe0, 0xc6, 0x3c, 0xde, 0xfa, 0x78,
+	0x75, 0x80, 0x95, 0xd5, 0xc5, 0xdf, 0xfd, 0xf9, 0xd7, 0x0f, 0x19, 0x07, 0x83, 0x7e, 0x2f, 0xec,
+	0x74, 0xc5, 0x3f, 0x23, 0x28, 0x5d, 0xff, 0x0f, 0xf8, 0x93, 0xd5, 0xe6, 0xce, 0xb5, 0xe9, 0xb5,
+	0xf5, 0xe8, 0xff, 0xc2, 0x52, 0x5e, 0x0f, 0x0c, 0xaf, 0xb2, 0xfb, 0x86, 0xe6, 0xa5, 0x51, 0x8f,
+	0xe5, 0x8b, 0xad, 0x8f, 0xd1, 0xee, 0xfe, 0x6f, 0x08, 0x2a, 0x81, 0x98, 0x2c, 0xad, 0xbe, 0xbf,
+	0xb1, 0x28, 0xee, 0x50, 0x3f, 0x63, 0x43, 0xf4, 0xd5, 0x41, 0x0a, 0x09, 0x85, 0xbe, 0xfe, 0x55,
+	0x31, 0x0d, 0x6b, 0x21, 0xe3, 0xe6, 0x91, 0xab, 0xd9, 0x14, 0x4d, 0x22, 0xf9, 0xea, 0x17, 0xf5,
+	0xc9, 0xe2, 0xfa, 0x1f, 0x84, 0x7e, 0xc9, 0xdc, 0xef, 0xd8, 0x6a, 0x2d, 0x43, 0x60, 0xf1, 0xbc,
+	0xea, 0x49, 0xfd, 0xf7, 0x79, 0xfa, 0xd4, 0xa4, 0x4f, 0x17, 0xd3, 0xa7, 0x27, 0xf5, 0xb3, 0x75,
+	0x73, 0xea, 0xc3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x05, 0xf0, 0x24, 0x64, 0xc6, 0x07, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -807,68 +826,3 @@ var _TextToSpeech_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/texttospeech/v1/cloud_tts.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/texttospeech/v1/cloud_tts.proto", fileDescriptor_cloud_tts_aab68875a18aec90)
-}
-
-var fileDescriptor_cloud_tts_aab68875a18aec90 = []byte{
-	// 897 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x41, 0x6f, 0x1b, 0x45,
-	0x14, 0xee, 0xd8, 0x71, 0xda, 0x3e, 0xaf, 0x5d, 0x67, 0x88, 0xc0, 0x44, 0xa5, 0x32, 0x1b, 0x90,
-	0x42, 0x08, 0x36, 0x76, 0x45, 0x05, 0xed, 0x01, 0x39, 0xf6, 0xd6, 0xb1, 0xe4, 0xd8, 0x66, 0x9c,
-	0x04, 0x09, 0x45, 0x5a, 0x4d, 0xd6, 0x93, 0xcd, 0x8a, 0xf5, 0xcc, 0xe2, 0x19, 0x47, 0xa5, 0x47,
-	0xf8, 0x09, 0x5c, 0x91, 0x10, 0x57, 0x7e, 0x01, 0x67, 0x8e, 0x48, 0x9c, 0xf8, 0x0b, 0xfc, 0x05,
-	0x24, 0x8e, 0x68, 0x66, 0xd6, 0xad, 0x93, 0x54, 0xc6, 0x5c, 0x7a, 0xdb, 0x79, 0x6f, 0xbe, 0x37,
-	0xdf, 0xfb, 0xf6, 0x9b, 0x37, 0xb0, 0x17, 0x0a, 0x11, 0xc6, 0xac, 0x16, 0xc4, 0x62, 0x36, 0xae,
-	0x29, 0xf6, 0x4c, 0x29, 0x21, 0x13, 0xc6, 0x82, 0x8b, 0xda, 0x65, 0xdd, 0x46, 0x7d, 0xa5, 0x64,
-	0x35, 0x99, 0x0a, 0x25, 0xf0, 0x7d, 0xbb, 0xbb, 0x6a, 0xe2, 0xd5, 0xc5, 0xdd, 0xd5, 0xcb, 0xfa,
-	0x56, 0x9a, 0xad, 0xd1, 0x24, 0xaa, 0x51, 0xce, 0x85, 0xa2, 0x2a, 0x12, 0x3c, 0xc5, 0xba, 0x9f,
-	0xc2, 0x46, 0x2f, 0x92, 0xea, 0x44, 0x44, 0x01, 0x93, 0x84, 0x7d, 0x33, 0x63, 0x52, 0xe1, 0x6d,
-	0x28, 0xc4, 0x94, 0x87, 0x33, 0x1a, 0x32, 0x3f, 0x10, 0x63, 0x56, 0x46, 0x15, 0xb4, 0x73, 0x97,
-	0x38, 0xf3, 0x60, 0x4b, 0x8c, 0x99, 0xfb, 0x05, 0xe0, 0x45, 0xa4, 0x4c, 0x04, 0x97, 0x0c, 0x3f,
-	0x81, 0xf5, 0x4b, 0x13, 0x29, 0xa3, 0x4a, 0x76, 0x27, 0xdf, 0xd8, 0xae, 0x2e, 0x23, 0x57, 0x35,
-	0x68, 0x92, 0x42, 0xdc, 0x3f, 0x10, 0xe4, 0x4c, 0x04, 0xbf, 0x0f, 0xc5, 0x2b, 0x0c, 0x6c, 0xb9,
-	0xbb, 0xa4, 0xb0, 0x48, 0x41, 0x62, 0x0c, 0x6b, 0x9c, 0x4e, 0x58, 0x39, 0x63, 0xf8, 0x99, 0x6f,
-	0xdc, 0x87, 0xbc, 0x94, 0x93, 0xd8, 0x0f, 0x19, 0x1f, 0xb3, 0x69, 0x39, 0x5b, 0x41, 0x3b, 0xc5,
-	0xc6, 0x47, 0xcb, 0x69, 0x8c, 0xe4, 0x24, 0x36, 0x07, 0x77, 0x0c, 0x88, 0x80, 0xae, 0x60, 0xbf,
-	0xf1, 0x67, 0xf0, 0x36, 0xa7, 0x6a, 0x36, 0xa5, 0xb1, 0x2f, 0xe9, 0x24, 0x89, 0x99, 0x3f, 0xa5,
-	0x8a, 0xf9, 0x17, 0x6c, 0xaa, 0x9e, 0x97, 0xd7, 0x2a, 0x68, 0x27, 0x47, 0xde, 0x4c, 0x37, 0x8c,
-	0x4c, 0x9e, 0x50, 0xc5, 0x0e, 0x74, 0xd6, 0xfd, 0x1b, 0xc1, 0x5b, 0xa3, 0x6f, 0xb9, 0xba, 0x60,
-	0x32, 0x7a, 0xce, 0x46, 0xe6, 0xb8, 0xb9, 0xc6, 0xfb, 0x90, 0x8b, 0x78, 0x32, 0x53, 0x46, 0xdb,
-	0x7c, 0x63, 0xef, 0x3f, 0x08, 0xa6, 0x55, 0x64, 0x57, 0x63, 0x88, 0x85, 0xe2, 0x03, 0xc8, 0x19,
-	0xe5, 0x4c, 0xff, 0xf9, 0x46, 0x63, 0x05, 0xad, 0x47, 0x2c, 0x66, 0x81, 0x36, 0xc0, 0x90, 0x4e,
-	0xe9, 0x44, 0x12, 0x5b, 0x00, 0xf7, 0xc0, 0xa1, 0xb3, 0x71, 0x24, 0xfc, 0x40, 0xf0, 0xf3, 0x28,
-	0x34, 0xaa, 0xe5, 0x1b, 0x1f, 0x2c, 0x2f, 0xd8, 0xd4, 0x88, 0x96, 0x01, 0x90, 0x3c, 0x7d, 0xb9,
-	0x70, 0x7b, 0x50, 0xbc, 0x4a, 0x18, 0x6f, 0xc2, 0x9a, 0x46, 0x5b, 0x23, 0x1d, 0xdc, 0x22, 0x66,
-	0xa5, 0xa3, 0x5a, 0x68, 0xfb, 0xfb, 0x74, 0x54, 0xaf, 0xf6, 0x8b, 0xe0, 0x98, 0xf6, 0x7c, 0x29,
-	0x66, 0xd3, 0x80, 0xb9, 0x3f, 0x21, 0xd8, 0x7c, 0x15, 0xf7, 0x95, 0x6c, 0xfa, 0x3a, 0x2c, 0xe2,
-	0xfe, 0x98, 0x81, 0xfc, 0x82, 0x18, 0x98, 0x40, 0xd1, 0xaa, 0xc9, 0x78, 0x20, 0xc6, 0x11, 0x0f,
-	0x0d, 0xb3, 0x62, 0xe3, 0xc3, 0x15, 0xf4, 0xf4, 0x52, 0x08, 0x29, 0xd0, 0xc5, 0xa5, 0x6e, 0x56,
-	0x26, 0x8c, 0x7e, 0x1d, 0xf1, 0xd0, 0x18, 0xd0, 0x34, 0x84, 0x88, 0x33, 0x0f, 0x6a, 0xd7, 0xe1,
-	0x4d, 0xc8, 0x25, 0x91, 0x0a, 0x2e, 0x4c, 0x4b, 0x88, 0xd8, 0x05, 0x7e, 0x0f, 0x8a, 0x97, 0x22,
-	0x9e, 0x4d, 0x98, 0x1f, 0xd2, 0x88, 0xfb, 0xe3, 0x33, 0x63, 0x5b, 0x44, 0x1c, 0x1b, 0xed, 0xd0,
-	0x88, 0xb7, 0xcf, 0xf0, 0x2e, 0x6c, 0xdc, 0xf4, 0x77, 0xce, 0xf8, 0xfb, 0x9e, 0xbc, 0x6a, 0x6c,
-	0xbc, 0x07, 0x98, 0x9d, 0x9f, 0xb3, 0x40, 0x49, 0x3f, 0x99, 0x8a, 0xf3, 0x28, 0x66, 0x7e, 0x34,
-	0x2e, 0xaf, 0x9b, 0x2b, 0x5a, 0x4a, 0x33, 0x43, 0x9b, 0xe8, 0x8e, 0xdd, 0xcf, 0xa1, 0x7c, 0xf3,
-	0x16, 0xa4, 0xf3, 0x62, 0x1b, 0x0a, 0x2f, 0x8c, 0xa7, 0x18, 0xb7, 0x0e, 0x71, 0x88, 0x33, 0xb7,
-	0x93, 0x8e, 0xed, 0x7e, 0x09, 0xf7, 0xae, 0xc9, 0x8f, 0xdf, 0x85, 0x77, 0x46, 0xa3, 0xc3, 0x9e,
-	0x7f, 0x32, 0xe8, 0xb6, 0x3c, 0xbf, 0xe3, 0xf5, 0xdb, 0x1e, 0xf1, 0x8f, 0xfb, 0xa3, 0xa1, 0xd7,
-	0xea, 0x3e, 0xed, 0x7a, 0xed, 0xd2, 0x2d, 0x7c, 0x07, 0xd6, 0x0e, 0x9b, 0x3d, 0xaf, 0x84, 0x30,
-	0xc0, 0xfa, 0x53, 0xcf, 0x7c, 0x67, 0x70, 0x1e, 0x6e, 0xf7, 0xbd, 0xe3, 0x23, 0xd2, 0xec, 0x95,
-	0xb2, 0xbb, 0x47, 0x50, 0xb8, 0x22, 0x3a, 0x7e, 0x00, 0x5b, 0xcd, 0xe3, 0x76, 0x77, 0xe0, 0x7b,
-	0xfd, 0xd6, 0xa0, 0xdd, 0xed, 0x77, 0xae, 0xd5, 0x74, 0xe0, 0x4e, 0xaf, 0xdb, 0xf7, 0x9a, 0xa4,
-	0xfe, 0xa8, 0x84, 0xf0, 0x6d, 0xc8, 0x1e, 0x0e, 0x1f, 0x96, 0x32, 0x3a, 0x3c, 0xe8, 0x74, 0xfc,
-	0xc1, 0xf0, 0x78, 0x54, 0xca, 0x36, 0x7e, 0xcd, 0x80, 0x73, 0xc4, 0x9e, 0xa9, 0x23, 0x61, 0x9b,
-	0xc5, 0xdf, 0x23, 0x80, 0x97, 0xb3, 0x12, 0xd7, 0x96, 0xdb, 0xe0, 0xc6, 0x3c, 0xde, 0xfa, 0x78,
-	0x75, 0x80, 0x95, 0xd5, 0xc5, 0xdf, 0xfd, 0xf9, 0xd7, 0x0f, 0x19, 0x07, 0x83, 0x7e, 0x2f, 0xec,
-	0x74, 0xc5, 0x3f, 0x23, 0x28, 0x5d, 0xff, 0x0f, 0xf8, 0x93, 0xd5, 0xe6, 0xce, 0xb5, 0xe9, 0xb5,
-	0xf5, 0xe8, 0xff, 0xc2, 0x52, 0x5e, 0x0f, 0x0c, 0xaf, 0xb2, 0xfb, 0x86, 0xe6, 0xa5, 0x51, 0x8f,
-	0xe5, 0x8b, 0xad, 0x8f, 0xd1, 0xee, 0xfe, 0x6f, 0x08, 0x2a, 0x81, 0x98, 0x2c, 0xad, 0xbe, 0xbf,
-	0xb1, 0x28, 0xee, 0x50, 0x3f, 0x63, 0x43, 0xf4, 0xd5, 0x41, 0x0a, 0x09, 0x85, 0xbe, 0xfe, 0x55,
-	0x31, 0x0d, 0x6b, 0x21, 0xe3, 0xe6, 0x91, 0xab, 0xd9, 0x14, 0x4d, 0x22, 0xf9, 0xea, 0x17, 0xf5,
-	0xc9, 0xe2, 0xfa, 0x1f, 0x84, 0x7e, 0xc9, 0xdc, 0xef, 0xd8, 0x6a, 0x2d, 0x43, 0x60, 0xf1, 0xbc,
-	0xea, 0x49, 0xfd, 0xf7, 0x79, 0xfa, 0xd4, 0xa4, 0x4f, 0x17, 0xd3, 0xa7, 0x27, 0xf5, 0xb3, 0x75,
-	0x73, 0xea, 0xc3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x05, 0xf0, 0x24, 0x64, 0xc6, 0x07, 0x00,
-	0x00,
-}
diff --git a/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go b/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
index 98d30dfd26..a0a04220a5 100644
--- a/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
+++ b/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/texttospeech/v1beta1/cloud_tts.proto
 
-package texttospeech // import "google.golang.org/genproto/googleapis/cloud/texttospeech/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package texttospeech
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Gender of the voice as described in
 // [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
@@ -49,6 +49,7 @@ var SsmlVoiceGender_name = map[int32]string{
 	2: "FEMALE",
 	3: "NEUTRAL",
 }
+
 var SsmlVoiceGender_value = map[string]int32{
 	"SSML_VOICE_GENDER_UNSPECIFIED": 0,
 	"MALE":                          1,
@@ -59,8 +60,9 @@ var SsmlVoiceGender_value = map[string]int32{
 func (x SsmlVoiceGender) String() string {
 	return proto.EnumName(SsmlVoiceGender_name, int32(x))
 }
+
 func (SsmlVoiceGender) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{0}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{0}
 }
 
 // Configuration to set up audio encoder. The encoding determines the output
@@ -88,6 +90,7 @@ var AudioEncoding_name = map[int32]string{
 	2: "MP3",
 	3: "OGG_OPUS",
 }
+
 var AudioEncoding_value = map[string]int32{
 	"AUDIO_ENCODING_UNSPECIFIED": 0,
 	"LINEAR16":                   1,
@@ -98,8 +101,9 @@ var AudioEncoding_value = map[string]int32{
 func (x AudioEncoding) String() string {
 	return proto.EnumName(AudioEncoding_name, int32(x))
 }
+
 func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{1}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{1}
 }
 
 // The top-level message sent by the client for the `ListVoices` method.
@@ -122,16 +126,17 @@ func (m *ListVoicesRequest) Reset()         { *m = ListVoicesRequest{} }
 func (m *ListVoicesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListVoicesRequest) ProtoMessage()    {}
 func (*ListVoicesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{0}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{0}
 }
+
 func (m *ListVoicesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVoicesRequest.Unmarshal(m, b)
 }
 func (m *ListVoicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVoicesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListVoicesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVoicesRequest.Merge(dst, src)
+func (m *ListVoicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesRequest.Merge(m, src)
 }
 func (m *ListVoicesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListVoicesRequest.Size(m)
@@ -162,16 +167,17 @@ func (m *ListVoicesResponse) Reset()         { *m = ListVoicesResponse{} }
 func (m *ListVoicesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListVoicesResponse) ProtoMessage()    {}
 func (*ListVoicesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{1}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{1}
 }
+
 func (m *ListVoicesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListVoicesResponse.Unmarshal(m, b)
 }
 func (m *ListVoicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListVoicesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListVoicesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListVoicesResponse.Merge(dst, src)
+func (m *ListVoicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesResponse.Merge(m, src)
 }
 func (m *ListVoicesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListVoicesResponse.Size(m)
@@ -210,16 +216,17 @@ func (m *Voice) Reset()         { *m = Voice{} }
 func (m *Voice) String() string { return proto.CompactTextString(m) }
 func (*Voice) ProtoMessage()    {}
 func (*Voice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{2}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{2}
 }
+
 func (m *Voice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Voice.Unmarshal(m, b)
 }
 func (m *Voice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Voice.Marshal(b, m, deterministic)
 }
-func (dst *Voice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Voice.Merge(dst, src)
+func (m *Voice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Voice.Merge(m, src)
 }
 func (m *Voice) XXX_Size() int {
 	return xxx_messageInfo_Voice.Size(m)
@@ -275,16 +282,17 @@ func (m *SynthesizeSpeechRequest) Reset()         { *m = SynthesizeSpeechRequest
 func (m *SynthesizeSpeechRequest) String() string { return proto.CompactTextString(m) }
 func (*SynthesizeSpeechRequest) ProtoMessage()    {}
 func (*SynthesizeSpeechRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{3}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{3}
 }
+
 func (m *SynthesizeSpeechRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesizeSpeechRequest.Unmarshal(m, b)
 }
 func (m *SynthesizeSpeechRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesizeSpeechRequest.Marshal(b, m, deterministic)
 }
-func (dst *SynthesizeSpeechRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesizeSpeechRequest.Merge(dst, src)
+func (m *SynthesizeSpeechRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechRequest.Merge(m, src)
 }
 func (m *SynthesizeSpeechRequest) XXX_Size() int {
 	return xxx_messageInfo_SynthesizeSpeechRequest.Size(m)
@@ -336,16 +344,17 @@ func (m *SynthesisInput) Reset()         { *m = SynthesisInput{} }
 func (m *SynthesisInput) String() string { return proto.CompactTextString(m) }
 func (*SynthesisInput) ProtoMessage()    {}
 func (*SynthesisInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{4}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{4}
 }
+
 func (m *SynthesisInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesisInput.Unmarshal(m, b)
 }
 func (m *SynthesisInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesisInput.Marshal(b, m, deterministic)
 }
-func (dst *SynthesisInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesisInput.Merge(dst, src)
+func (m *SynthesisInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesisInput.Merge(m, src)
 }
 func (m *SynthesisInput) XXX_Size() int {
 	return xxx_messageInfo_SynthesisInput.Size(m)
@@ -393,72 +402,14 @@ func (m *SynthesisInput) GetSsml() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SynthesisInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SynthesisInput_OneofMarshaler, _SynthesisInput_OneofUnmarshaler, _SynthesisInput_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SynthesisInput) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SynthesisInput_Text)(nil),
 		(*SynthesisInput_Ssml)(nil),
 	}
 }
 
-func _SynthesisInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SynthesisInput)
-	// input_source
-	switch x := m.InputSource.(type) {
-	case *SynthesisInput_Text:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Text)
-	case *SynthesisInput_Ssml:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Ssml)
-	case nil:
-	default:
-		return fmt.Errorf("SynthesisInput.InputSource has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SynthesisInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SynthesisInput)
-	switch tag {
-	case 1: // input_source.text
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.InputSource = &SynthesisInput_Text{x}
-		return true, err
-	case 2: // input_source.ssml
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.InputSource = &SynthesisInput_Ssml{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SynthesisInput_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SynthesisInput)
-	// input_source
-	switch x := m.InputSource.(type) {
-	case *SynthesisInput_Text:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Text)))
-		n += len(x.Text)
-	case *SynthesisInput_Ssml:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Ssml)))
-		n += len(x.Ssml)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Description of which voice to use for a synthesis request.
 type VoiceSelectionParams struct {
 	// The language (and optionally also the region) of the voice expressed as a
@@ -491,16 +442,17 @@ func (m *VoiceSelectionParams) Reset()         { *m = VoiceSelectionParams{} }
 func (m *VoiceSelectionParams) String() string { return proto.CompactTextString(m) }
 func (*VoiceSelectionParams) ProtoMessage()    {}
 func (*VoiceSelectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{5}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{5}
 }
+
 func (m *VoiceSelectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VoiceSelectionParams.Unmarshal(m, b)
 }
 func (m *VoiceSelectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VoiceSelectionParams.Marshal(b, m, deterministic)
 }
-func (dst *VoiceSelectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VoiceSelectionParams.Merge(dst, src)
+func (m *VoiceSelectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoiceSelectionParams.Merge(m, src)
 }
 func (m *VoiceSelectionParams) XXX_Size() int {
 	return xxx_messageInfo_VoiceSelectionParams.Size(m)
@@ -574,16 +526,17 @@ func (m *AudioConfig) Reset()         { *m = AudioConfig{} }
 func (m *AudioConfig) String() string { return proto.CompactTextString(m) }
 func (*AudioConfig) ProtoMessage()    {}
 func (*AudioConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{6}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{6}
 }
+
 func (m *AudioConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AudioConfig.Unmarshal(m, b)
 }
 func (m *AudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AudioConfig.Marshal(b, m, deterministic)
 }
-func (dst *AudioConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AudioConfig.Merge(dst, src)
+func (m *AudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioConfig.Merge(m, src)
 }
 func (m *AudioConfig) XXX_Size() int {
 	return xxx_messageInfo_AudioConfig.Size(m)
@@ -652,16 +605,17 @@ func (m *SynthesizeSpeechResponse) Reset()         { *m = SynthesizeSpeechRespon
 func (m *SynthesizeSpeechResponse) String() string { return proto.CompactTextString(m) }
 func (*SynthesizeSpeechResponse) ProtoMessage()    {}
 func (*SynthesizeSpeechResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloud_tts_3ab83d835c3b5bf2, []int{7}
+	return fileDescriptor_dfc2f1f47f5721c8, []int{7}
 }
+
 func (m *SynthesizeSpeechResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SynthesizeSpeechResponse.Unmarshal(m, b)
 }
 func (m *SynthesizeSpeechResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SynthesizeSpeechResponse.Marshal(b, m, deterministic)
 }
-func (dst *SynthesizeSpeechResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SynthesizeSpeechResponse.Merge(dst, src)
+func (m *SynthesizeSpeechResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechResponse.Merge(m, src)
 }
 func (m *SynthesizeSpeechResponse) XXX_Size() int {
 	return xxx_messageInfo_SynthesizeSpeechResponse.Size(m)
@@ -680,6 +634,8 @@ func (m *SynthesizeSpeechResponse) GetAudioContent() []byte {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.texttospeech.v1beta1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
+	proto.RegisterEnum("google.cloud.texttospeech.v1beta1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
 	proto.RegisterType((*ListVoicesRequest)(nil), "google.cloud.texttospeech.v1beta1.ListVoicesRequest")
 	proto.RegisterType((*ListVoicesResponse)(nil), "google.cloud.texttospeech.v1beta1.ListVoicesResponse")
 	proto.RegisterType((*Voice)(nil), "google.cloud.texttospeech.v1beta1.Voice")
@@ -688,8 +644,69 @@ func init() {
 	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.texttospeech.v1beta1.VoiceSelectionParams")
 	proto.RegisterType((*AudioConfig)(nil), "google.cloud.texttospeech.v1beta1.AudioConfig")
 	proto.RegisterType((*SynthesizeSpeechResponse)(nil), "google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse")
-	proto.RegisterEnum("google.cloud.texttospeech.v1beta1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
-	proto.RegisterEnum("google.cloud.texttospeech.v1beta1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/texttospeech/v1beta1/cloud_tts.proto", fileDescriptor_dfc2f1f47f5721c8)
+}
+
+var fileDescriptor_dfc2f1f47f5721c8 = []byte{
+	// 875 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xdd, 0x6e, 0x1b, 0x45,
+	0x14, 0xee, 0xd8, 0x71, 0xda, 0x1e, 0xaf, 0x1d, 0x67, 0x14, 0x51, 0x13, 0x51, 0x94, 0x6e, 0xa8,
+	0x64, 0x45, 0xc8, 0xc6, 0x2e, 0xbf, 0xe9, 0x05, 0x38, 0xf6, 0xd6, 0xb5, 0xe4, 0x3f, 0x66, 0x93,
+	0x54, 0xe2, 0x66, 0x35, 0xd9, 0x9d, 0x6c, 0x56, 0xac, 0x67, 0x96, 0x9d, 0x71, 0x54, 0x7a, 0x89,
+	0xb8, 0xe6, 0x02, 0x9e, 0x00, 0x89, 0x07, 0xe0, 0x59, 0x40, 0xe2, 0x09, 0x78, 0x08, 0x2e, 0xd1,
+	0xce, 0x6c, 0x52, 0x27, 0x41, 0xd4, 0xe1, 0x82, 0xbb, 0x99, 0x73, 0xf6, 0x3b, 0xf3, 0x9d, 0x6f,
+	0xbe, 0x3d, 0x03, 0xed, 0x50, 0x88, 0x30, 0x66, 0x2d, 0x3f, 0x16, 0x8b, 0xa0, 0xa5, 0xd8, 0x4b,
+	0xa5, 0x84, 0x4c, 0x18, 0xf3, 0xcf, 0x5a, 0xe7, 0xed, 0x13, 0xa6, 0x68, 0xdb, 0xa4, 0x3c, 0xa5,
+	0x64, 0x33, 0x49, 0x85, 0x12, 0xf8, 0x91, 0x81, 0x34, 0x75, 0xbc, 0xb9, 0x0c, 0x69, 0xe6, 0x90,
+	0xed, 0x77, 0xf2, 0xaa, 0x34, 0x89, 0x5a, 0x94, 0x73, 0xa1, 0xa8, 0x8a, 0x04, 0xcf, 0x0b, 0xd8,
+	0x9f, 0xc2, 0xe6, 0x28, 0x92, 0xea, 0x58, 0x44, 0x3e, 0x93, 0x84, 0x7d, 0xb3, 0x60, 0x52, 0xe1,
+	0x5d, 0xa8, 0xc4, 0x94, 0x87, 0x0b, 0x1a, 0x32, 0xcf, 0x17, 0x01, 0xab, 0xa3, 0x1d, 0xd4, 0xb8,
+	0x4f, 0xac, 0x8b, 0x60, 0x4f, 0x04, 0xcc, 0x3e, 0x06, 0xbc, 0x8c, 0x94, 0x89, 0xe0, 0x92, 0xe1,
+	0x2f, 0x60, 0xfd, 0x5c, 0x47, 0xea, 0x68, 0xa7, 0xd8, 0x28, 0x77, 0x1a, 0xcd, 0x37, 0x32, 0x6c,
+	0xea, 0x12, 0x24, 0xc7, 0xd9, 0xbf, 0x21, 0x28, 0xe9, 0x08, 0x7e, 0x0c, 0xd5, 0x2b, 0x34, 0x4c,
+	0xcd, 0xfb, 0xa4, 0xb2, 0xcc, 0x43, 0x62, 0x0c, 0x6b, 0x9c, 0xce, 0x59, 0xbd, 0xa0, 0x49, 0xea,
+	0x35, 0x76, 0xa1, 0x2c, 0xe5, 0x3c, 0xf6, 0x42, 0xc6, 0x03, 0x96, 0xd6, 0x8b, 0x3b, 0xa8, 0x51,
+	0xed, 0x74, 0x56, 0xe0, 0xe2, 0xca, 0x79, 0xac, 0x4f, 0x1f, 0x68, 0x24, 0x81, 0xac, 0x8c, 0x59,
+	0xe3, 0xcf, 0xe0, 0x6d, 0x4e, 0xd5, 0x22, 0xa5, 0xb1, 0x27, 0xe9, 0x3c, 0x89, 0x99, 0x97, 0x52,
+	0xc5, 0xbc, 0x33, 0x96, 0xaa, 0x57, 0xf5, 0xb5, 0x1d, 0xd4, 0x28, 0x91, 0xb7, 0xf2, 0x0f, 0x5c,
+	0x9d, 0x27, 0x54, 0xb1, 0xe7, 0x59, 0xd6, 0xfe, 0xbe, 0x00, 0x0f, 0xdc, 0x6f, 0xb9, 0x3a, 0x63,
+	0x32, 0x7a, 0xc5, 0x5c, 0x7d, 0xe6, 0x85, 0xda, 0x03, 0x28, 0x45, 0x3c, 0x59, 0x28, 0xad, 0x72,
+	0xb9, 0xd3, 0x5e, 0x85, 0x65, 0x5e, 0x4a, 0x0e, 0x33, 0x20, 0x31, 0x78, 0x3c, 0x86, 0x92, 0xd6,
+	0x50, 0x2b, 0x51, 0xee, 0x7c, 0xb2, 0xaa, 0xf4, 0x2e, 0x8b, 0x99, 0x9f, 0x99, 0x62, 0x46, 0x53,
+	0x3a, 0x97, 0xc4, 0x54, 0xc1, 0x5f, 0x82, 0x45, 0x17, 0x41, 0x24, 0x3c, 0x5f, 0xf0, 0xd3, 0x28,
+	0xd4, 0x22, 0x96, 0x3b, 0xcd, 0x15, 0xaa, 0x76, 0x33, 0x58, 0x4f, 0xa3, 0x48, 0x99, 0xbe, 0xde,
+	0xd8, 0x23, 0xa8, 0x5e, 0xa5, 0x8e, 0xb7, 0x60, 0x2d, 0x2b, 0x61, 0x1c, 0xf6, 0xfc, 0x0e, 0xd1,
+	0xbb, 0x2c, 0x9a, 0xe9, 0x6e, 0xae, 0x34, 0x8b, 0x66, 0xbb, 0x83, 0x2a, 0x58, 0xba, 0x51, 0x4f,
+	0x8a, 0x45, 0xea, 0x33, 0xfb, 0x17, 0x04, 0x5b, 0xff, 0xd4, 0xc0, 0x4a, 0xfe, 0xfd, 0xdf, 0x6c,
+	0x63, 0xff, 0x5c, 0x80, 0xf2, 0x92, 0x22, 0xf8, 0x05, 0x54, 0x8d, 0xae, 0x8c, 0xfb, 0x22, 0x88,
+	0x78, 0xa8, 0xe9, 0x55, 0x3b, 0x1f, 0xac, 0xaa, 0xac, 0x93, 0xe3, 0x48, 0x85, 0x2e, 0x6f, 0xb3,
+	0xb6, 0x65, 0xc2, 0xe8, 0xd7, 0x11, 0x0f, 0xb5, 0x33, 0x75, 0x6b, 0x88, 0x58, 0x17, 0xc1, 0xcc,
+	0x8e, 0x78, 0x0b, 0x4a, 0x49, 0xa4, 0xfc, 0x33, 0xdd, 0x1c, 0x22, 0x66, 0x83, 0xdf, 0x83, 0xea,
+	0xb9, 0x88, 0x17, 0x73, 0xe6, 0x85, 0x34, 0xe2, 0x5e, 0x70, 0xa2, 0xfd, 0x8c, 0x88, 0x65, 0xa2,
+	0x03, 0x1a, 0xf1, 0xfe, 0x09, 0xde, 0x83, 0xcd, 0x9b, 0xc6, 0x2f, 0x69, 0xe3, 0x6f, 0xc8, 0xab,
+	0x8e, 0xc7, 0xef, 0x03, 0x66, 0xa7, 0xa7, 0xcc, 0x57, 0xd2, 0x4b, 0x52, 0x71, 0x1a, 0xc5, 0xcc,
+	0x8b, 0x82, 0xfa, 0xba, 0xfe, 0x81, 0x6b, 0x79, 0x66, 0x66, 0x12, 0xc3, 0xc0, 0xfe, 0x1c, 0xea,
+	0x37, 0x7f, 0x8f, 0x7c, 0xa4, 0xec, 0x42, 0xe5, 0xd2, 0x87, 0x8a, 0x71, 0xe3, 0x15, 0x8b, 0x58,
+	0x17, 0xc6, 0xca, 0x62, 0x7b, 0x2f, 0x60, 0xe3, 0xda, 0x1d, 0xe0, 0x47, 0xf0, 0xd0, 0x75, 0xc7,
+	0x23, 0xef, 0x78, 0x3a, 0xec, 0x39, 0xde, 0xc0, 0x99, 0xf4, 0x1d, 0xe2, 0x1d, 0x4d, 0xdc, 0x99,
+	0xd3, 0x1b, 0x3e, 0x1b, 0x3a, 0xfd, 0xda, 0x1d, 0x7c, 0x0f, 0xd6, 0xc6, 0xdd, 0x91, 0x53, 0x43,
+	0x18, 0x60, 0xfd, 0x99, 0xa3, 0xd7, 0x05, 0x5c, 0x86, 0xbb, 0x13, 0xe7, 0xe8, 0x90, 0x74, 0x47,
+	0xb5, 0xe2, 0xde, 0x21, 0x54, 0xae, 0x88, 0x8e, 0xdf, 0x85, 0xed, 0xee, 0x51, 0x7f, 0x38, 0xf5,
+	0x9c, 0x49, 0x6f, 0xda, 0x1f, 0x4e, 0x06, 0xd7, 0x6a, 0x5a, 0x70, 0x6f, 0x34, 0x9c, 0x38, 0x5d,
+	0xd2, 0xfe, 0xb8, 0x86, 0xf0, 0x5d, 0x28, 0x8e, 0x67, 0x4f, 0x6a, 0x85, 0x2c, 0x3c, 0x1d, 0x0c,
+	0xbc, 0xe9, 0xec, 0xc8, 0xad, 0x15, 0x3b, 0x7f, 0x14, 0xc0, 0x3a, 0x64, 0x2f, 0xd5, 0xa1, 0x30,
+	0xcd, 0xe2, 0x1f, 0x11, 0xc0, 0xeb, 0x71, 0x8a, 0x3f, 0x5c, 0xc1, 0x0b, 0x37, 0xe6, 0xf6, 0xf6,
+	0x47, 0xb7, 0x44, 0x19, 0x81, 0xed, 0x07, 0xdf, 0xfd, 0xfe, 0xe7, 0x4f, 0x85, 0x4d, 0xbc, 0x71,
+	0xf9, 0xcc, 0x98, 0x51, 0x8c, 0x7f, 0x45, 0x50, 0xbb, 0x7e, 0x2d, 0x78, 0xff, 0x16, 0xf3, 0xe9,
+	0xda, 0xa8, 0xdb, 0x7e, 0xfa, 0x9f, 0xb0, 0x39, 0xcd, 0x5d, 0x4d, 0xf3, 0xa1, 0x5d, 0xbf, 0xa4,
+	0x99, 0xe1, 0xf7, 0xe5, 0xe5, 0xf7, 0xfb, 0x68, 0xef, 0xe0, 0x07, 0x04, 0x8f, 0x7d, 0x31, 0x7f,
+	0xf3, 0x39, 0x07, 0x9b, 0xcb, 0xfa, 0xcf, 0xb2, 0xc7, 0x70, 0x86, 0xbe, 0x1a, 0xe7, 0xb8, 0x50,
+	0x64, 0xb3, 0xa2, 0x29, 0xd2, 0xb0, 0x15, 0x32, 0xae, 0x9f, 0xca, 0x96, 0x49, 0xd1, 0x24, 0x92,
+	0xff, 0xf2, 0x42, 0x3f, 0x5d, 0x0e, 0xfe, 0x85, 0xd0, 0xc9, 0xba, 0x06, 0x3f, 0xf9, 0x3b, 0x00,
+	0x00, 0xff, 0xff, 0x26, 0x28, 0xff, 0x42, 0xdd, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -804,66 +821,3 @@ var _TextToSpeech_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/texttospeech/v1beta1/cloud_tts.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/texttospeech/v1beta1/cloud_tts.proto", fileDescriptor_cloud_tts_3ab83d835c3b5bf2)
-}
-
-var fileDescriptor_cloud_tts_3ab83d835c3b5bf2 = []byte{
-	// 875 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xdd, 0x6e, 0x1b, 0x45,
-	0x14, 0xee, 0xd8, 0x71, 0xda, 0x1e, 0xaf, 0x1d, 0x67, 0x14, 0x51, 0x13, 0x51, 0x94, 0x6e, 0xa8,
-	0x64, 0x45, 0xc8, 0xc6, 0x2e, 0xbf, 0xe9, 0x05, 0x38, 0xf6, 0xd6, 0xb5, 0xe4, 0x3f, 0x66, 0x93,
-	0x54, 0xe2, 0x66, 0x35, 0xd9, 0x9d, 0x6c, 0x56, 0xac, 0x67, 0x96, 0x9d, 0x71, 0x54, 0x7a, 0x89,
-	0xb8, 0xe6, 0x02, 0x9e, 0x00, 0x89, 0x07, 0xe0, 0x59, 0x40, 0xe2, 0x09, 0x78, 0x08, 0x2e, 0xd1,
-	0xce, 0x6c, 0x52, 0x27, 0x41, 0xd4, 0xe1, 0x82, 0xbb, 0x99, 0x73, 0xf6, 0x3b, 0xf3, 0x9d, 0x6f,
-	0xbe, 0x3d, 0x03, 0xed, 0x50, 0x88, 0x30, 0x66, 0x2d, 0x3f, 0x16, 0x8b, 0xa0, 0xa5, 0xd8, 0x4b,
-	0xa5, 0x84, 0x4c, 0x18, 0xf3, 0xcf, 0x5a, 0xe7, 0xed, 0x13, 0xa6, 0x68, 0xdb, 0xa4, 0x3c, 0xa5,
-	0x64, 0x33, 0x49, 0x85, 0x12, 0xf8, 0x91, 0x81, 0x34, 0x75, 0xbc, 0xb9, 0x0c, 0x69, 0xe6, 0x90,
-	0xed, 0x77, 0xf2, 0xaa, 0x34, 0x89, 0x5a, 0x94, 0x73, 0xa1, 0xa8, 0x8a, 0x04, 0xcf, 0x0b, 0xd8,
-	0x9f, 0xc2, 0xe6, 0x28, 0x92, 0xea, 0x58, 0x44, 0x3e, 0x93, 0x84, 0x7d, 0xb3, 0x60, 0x52, 0xe1,
-	0x5d, 0xa8, 0xc4, 0x94, 0x87, 0x0b, 0x1a, 0x32, 0xcf, 0x17, 0x01, 0xab, 0xa3, 0x1d, 0xd4, 0xb8,
-	0x4f, 0xac, 0x8b, 0x60, 0x4f, 0x04, 0xcc, 0x3e, 0x06, 0xbc, 0x8c, 0x94, 0x89, 0xe0, 0x92, 0xe1,
-	0x2f, 0x60, 0xfd, 0x5c, 0x47, 0xea, 0x68, 0xa7, 0xd8, 0x28, 0x77, 0x1a, 0xcd, 0x37, 0x32, 0x6c,
-	0xea, 0x12, 0x24, 0xc7, 0xd9, 0xbf, 0x21, 0x28, 0xe9, 0x08, 0x7e, 0x0c, 0xd5, 0x2b, 0x34, 0x4c,
-	0xcd, 0xfb, 0xa4, 0xb2, 0xcc, 0x43, 0x62, 0x0c, 0x6b, 0x9c, 0xce, 0x59, 0xbd, 0xa0, 0x49, 0xea,
-	0x35, 0x76, 0xa1, 0x2c, 0xe5, 0x3c, 0xf6, 0x42, 0xc6, 0x03, 0x96, 0xd6, 0x8b, 0x3b, 0xa8, 0x51,
-	0xed, 0x74, 0x56, 0xe0, 0xe2, 0xca, 0x79, 0xac, 0x4f, 0x1f, 0x68, 0x24, 0x81, 0xac, 0x8c, 0x59,
-	0xe3, 0xcf, 0xe0, 0x6d, 0x4e, 0xd5, 0x22, 0xa5, 0xb1, 0x27, 0xe9, 0x3c, 0x89, 0x99, 0x97, 0x52,
-	0xc5, 0xbc, 0x33, 0x96, 0xaa, 0x57, 0xf5, 0xb5, 0x1d, 0xd4, 0x28, 0x91, 0xb7, 0xf2, 0x0f, 0x5c,
-	0x9d, 0x27, 0x54, 0xb1, 0xe7, 0x59, 0xd6, 0xfe, 0xbe, 0x00, 0x0f, 0xdc, 0x6f, 0xb9, 0x3a, 0x63,
-	0x32, 0x7a, 0xc5, 0x5c, 0x7d, 0xe6, 0x85, 0xda, 0x03, 0x28, 0x45, 0x3c, 0x59, 0x28, 0xad, 0x72,
-	0xb9, 0xd3, 0x5e, 0x85, 0x65, 0x5e, 0x4a, 0x0e, 0x33, 0x20, 0x31, 0x78, 0x3c, 0x86, 0x92, 0xd6,
-	0x50, 0x2b, 0x51, 0xee, 0x7c, 0xb2, 0xaa, 0xf4, 0x2e, 0x8b, 0x99, 0x9f, 0x99, 0x62, 0x46, 0x53,
-	0x3a, 0x97, 0xc4, 0x54, 0xc1, 0x5f, 0x82, 0x45, 0x17, 0x41, 0x24, 0x3c, 0x5f, 0xf0, 0xd3, 0x28,
-	0xd4, 0x22, 0x96, 0x3b, 0xcd, 0x15, 0xaa, 0x76, 0x33, 0x58, 0x4f, 0xa3, 0x48, 0x99, 0xbe, 0xde,
-	0xd8, 0x23, 0xa8, 0x5e, 0xa5, 0x8e, 0xb7, 0x60, 0x2d, 0x2b, 0x61, 0x1c, 0xf6, 0xfc, 0x0e, 0xd1,
-	0xbb, 0x2c, 0x9a, 0xe9, 0x6e, 0xae, 0x34, 0x8b, 0x66, 0xbb, 0x83, 0x2a, 0x58, 0xba, 0x51, 0x4f,
-	0x8a, 0x45, 0xea, 0x33, 0xfb, 0x17, 0x04, 0x5b, 0xff, 0xd4, 0xc0, 0x4a, 0xfe, 0xfd, 0xdf, 0x6c,
-	0x63, 0xff, 0x5c, 0x80, 0xf2, 0x92, 0x22, 0xf8, 0x05, 0x54, 0x8d, 0xae, 0x8c, 0xfb, 0x22, 0x88,
-	0x78, 0xa8, 0xe9, 0x55, 0x3b, 0x1f, 0xac, 0xaa, 0xac, 0x93, 0xe3, 0x48, 0x85, 0x2e, 0x6f, 0xb3,
-	0xb6, 0x65, 0xc2, 0xe8, 0xd7, 0x11, 0x0f, 0xb5, 0x33, 0x75, 0x6b, 0x88, 0x58, 0x17, 0xc1, 0xcc,
-	0x8e, 0x78, 0x0b, 0x4a, 0x49, 0xa4, 0xfc, 0x33, 0xdd, 0x1c, 0x22, 0x66, 0x83, 0xdf, 0x83, 0xea,
-	0xb9, 0x88, 0x17, 0x73, 0xe6, 0x85, 0x34, 0xe2, 0x5e, 0x70, 0xa2, 0xfd, 0x8c, 0x88, 0x65, 0xa2,
-	0x03, 0x1a, 0xf1, 0xfe, 0x09, 0xde, 0x83, 0xcd, 0x9b, 0xc6, 0x2f, 0x69, 0xe3, 0x6f, 0xc8, 0xab,
-	0x8e, 0xc7, 0xef, 0x03, 0x66, 0xa7, 0xa7, 0xcc, 0x57, 0xd2, 0x4b, 0x52, 0x71, 0x1a, 0xc5, 0xcc,
-	0x8b, 0x82, 0xfa, 0xba, 0xfe, 0x81, 0x6b, 0x79, 0x66, 0x66, 0x12, 0xc3, 0xc0, 0xfe, 0x1c, 0xea,
-	0x37, 0x7f, 0x8f, 0x7c, 0xa4, 0xec, 0x42, 0xe5, 0xd2, 0x87, 0x8a, 0x71, 0xe3, 0x15, 0x8b, 0x58,
-	0x17, 0xc6, 0xca, 0x62, 0x7b, 0x2f, 0x60, 0xe3, 0xda, 0x1d, 0xe0, 0x47, 0xf0, 0xd0, 0x75, 0xc7,
-	0x23, 0xef, 0x78, 0x3a, 0xec, 0x39, 0xde, 0xc0, 0x99, 0xf4, 0x1d, 0xe2, 0x1d, 0x4d, 0xdc, 0x99,
-	0xd3, 0x1b, 0x3e, 0x1b, 0x3a, 0xfd, 0xda, 0x1d, 0x7c, 0x0f, 0xd6, 0xc6, 0xdd, 0x91, 0x53, 0x43,
-	0x18, 0x60, 0xfd, 0x99, 0xa3, 0xd7, 0x05, 0x5c, 0x86, 0xbb, 0x13, 0xe7, 0xe8, 0x90, 0x74, 0x47,
-	0xb5, 0xe2, 0xde, 0x21, 0x54, 0xae, 0x88, 0x8e, 0xdf, 0x85, 0xed, 0xee, 0x51, 0x7f, 0x38, 0xf5,
-	0x9c, 0x49, 0x6f, 0xda, 0x1f, 0x4e, 0x06, 0xd7, 0x6a, 0x5a, 0x70, 0x6f, 0x34, 0x9c, 0x38, 0x5d,
-	0xd2, 0xfe, 0xb8, 0x86, 0xf0, 0x5d, 0x28, 0x8e, 0x67, 0x4f, 0x6a, 0x85, 0x2c, 0x3c, 0x1d, 0x0c,
-	0xbc, 0xe9, 0xec, 0xc8, 0xad, 0x15, 0x3b, 0x7f, 0x14, 0xc0, 0x3a, 0x64, 0x2f, 0xd5, 0xa1, 0x30,
-	0xcd, 0xe2, 0x1f, 0x11, 0xc0, 0xeb, 0x71, 0x8a, 0x3f, 0x5c, 0xc1, 0x0b, 0x37, 0xe6, 0xf6, 0xf6,
-	0x47, 0xb7, 0x44, 0x19, 0x81, 0xed, 0x07, 0xdf, 0xfd, 0xfe, 0xe7, 0x4f, 0x85, 0x4d, 0xbc, 0x71,
-	0xf9, 0xcc, 0x98, 0x51, 0x8c, 0x7f, 0x45, 0x50, 0xbb, 0x7e, 0x2d, 0x78, 0xff, 0x16, 0xf3, 0xe9,
-	0xda, 0xa8, 0xdb, 0x7e, 0xfa, 0x9f, 0xb0, 0x39, 0xcd, 0x5d, 0x4d, 0xf3, 0xa1, 0x5d, 0xbf, 0xa4,
-	0x99, 0xe1, 0xf7, 0xe5, 0xe5, 0xf7, 0xfb, 0x68, 0xef, 0xe0, 0x07, 0x04, 0x8f, 0x7d, 0x31, 0x7f,
-	0xf3, 0x39, 0x07, 0x9b, 0xcb, 0xfa, 0xcf, 0xb2, 0xc7, 0x70, 0x86, 0xbe, 0x1a, 0xe7, 0xb8, 0x50,
-	0x64, 0xb3, 0xa2, 0x29, 0xd2, 0xb0, 0x15, 0x32, 0xae, 0x9f, 0xca, 0x96, 0x49, 0xd1, 0x24, 0x92,
-	0xff, 0xf2, 0x42, 0x3f, 0x5d, 0x0e, 0xfe, 0x85, 0xd0, 0xc9, 0xba, 0x06, 0x3f, 0xf9, 0x3b, 0x00,
-	0x00, 0xff, 0xff, 0x26, 0x28, 0xff, 0x42, 0xdd, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/translate/v3beta1/translation_service.pb.go b/googleapis/cloud/translate/v3beta1/translation_service.pb.go
index f23cb3aa04..5cab3e811b 100644
--- a/googleapis/cloud/translate/v3beta1/translation_service.pb.go
+++ b/googleapis/cloud/translate/v3beta1/translation_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/translate/v3beta1/translation_service.proto
 
-package translate // import "google.golang.org/genproto/googleapis/cloud/translate/v3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package translate
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // State of the job.
 type BatchTranslateMetadata_State int32
@@ -56,6 +56,7 @@ var BatchTranslateMetadata_State_name = map[int32]string{
 	4: "CANCELLING",
 	5: "CANCELLED",
 }
+
 var BatchTranslateMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"RUNNING":           1,
@@ -68,8 +69,9 @@ var BatchTranslateMetadata_State_value = map[string]int32{
 func (x BatchTranslateMetadata_State) String() string {
 	return proto.EnumName(BatchTranslateMetadata_State_name, int32(x))
 }
+
 func (BatchTranslateMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{15, 0}
+	return fileDescriptor_56145e4302ec702e, []int{15, 0}
 }
 
 // Enumerates the possible states that the creation request can be in.
@@ -99,6 +101,7 @@ var CreateGlossaryMetadata_State_name = map[int32]string{
 	4: "CANCELLING",
 	5: "CANCELLED",
 }
+
 var CreateGlossaryMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"RUNNING":           1,
@@ -111,8 +114,9 @@ var CreateGlossaryMetadata_State_value = map[string]int32{
 func (x CreateGlossaryMetadata_State) String() string {
 	return proto.EnumName(CreateGlossaryMetadata_State_name, int32(x))
 }
+
 func (CreateGlossaryMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{24, 0}
+	return fileDescriptor_56145e4302ec702e, []int{24, 0}
 }
 
 // Enumerates the possible states that the creation request can be in.
@@ -142,6 +146,7 @@ var DeleteGlossaryMetadata_State_name = map[int32]string{
 	4: "CANCELLING",
 	5: "CANCELLED",
 }
+
 var DeleteGlossaryMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"RUNNING":           1,
@@ -154,8 +159,9 @@ var DeleteGlossaryMetadata_State_value = map[string]int32{
 func (x DeleteGlossaryMetadata_State) String() string {
 	return proto.EnumName(DeleteGlossaryMetadata_State_name, int32(x))
 }
+
 func (DeleteGlossaryMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{25, 0}
+	return fileDescriptor_56145e4302ec702e, []int{25, 0}
 }
 
 // Configures which glossary should be used for a specific target language,
@@ -176,16 +182,17 @@ func (m *TranslateTextGlossaryConfig) Reset()         { *m = TranslateTextGlossa
 func (m *TranslateTextGlossaryConfig) String() string { return proto.CompactTextString(m) }
 func (*TranslateTextGlossaryConfig) ProtoMessage()    {}
 func (*TranslateTextGlossaryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{0}
+	return fileDescriptor_56145e4302ec702e, []int{0}
 }
+
 func (m *TranslateTextGlossaryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TranslateTextGlossaryConfig.Unmarshal(m, b)
 }
 func (m *TranslateTextGlossaryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TranslateTextGlossaryConfig.Marshal(b, m, deterministic)
 }
-func (dst *TranslateTextGlossaryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TranslateTextGlossaryConfig.Merge(dst, src)
+func (m *TranslateTextGlossaryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslateTextGlossaryConfig.Merge(m, src)
 }
 func (m *TranslateTextGlossaryConfig) XXX_Size() int {
 	return xxx_messageInfo_TranslateTextGlossaryConfig.Size(m)
@@ -262,16 +269,17 @@ func (m *TranslateTextRequest) Reset()         { *m = TranslateTextRequest{} }
 func (m *TranslateTextRequest) String() string { return proto.CompactTextString(m) }
 func (*TranslateTextRequest) ProtoMessage()    {}
 func (*TranslateTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{1}
+	return fileDescriptor_56145e4302ec702e, []int{1}
 }
+
 func (m *TranslateTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TranslateTextRequest.Unmarshal(m, b)
 }
 func (m *TranslateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TranslateTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *TranslateTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TranslateTextRequest.Merge(dst, src)
+func (m *TranslateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslateTextRequest.Merge(m, src)
 }
 func (m *TranslateTextRequest) XXX_Size() int {
 	return xxx_messageInfo_TranslateTextRequest.Size(m)
@@ -349,16 +357,17 @@ func (m *TranslateTextResponse) Reset()         { *m = TranslateTextResponse{} }
 func (m *TranslateTextResponse) String() string { return proto.CompactTextString(m) }
 func (*TranslateTextResponse) ProtoMessage()    {}
 func (*TranslateTextResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{2}
+	return fileDescriptor_56145e4302ec702e, []int{2}
 }
+
 func (m *TranslateTextResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TranslateTextResponse.Unmarshal(m, b)
 }
 func (m *TranslateTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TranslateTextResponse.Marshal(b, m, deterministic)
 }
-func (dst *TranslateTextResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TranslateTextResponse.Merge(dst, src)
+func (m *TranslateTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslateTextResponse.Merge(m, src)
 }
 func (m *TranslateTextResponse) XXX_Size() int {
 	return xxx_messageInfo_TranslateTextResponse.Size(m)
@@ -406,16 +415,17 @@ func (m *Translation) Reset()         { *m = Translation{} }
 func (m *Translation) String() string { return proto.CompactTextString(m) }
 func (*Translation) ProtoMessage()    {}
 func (*Translation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{3}
+	return fileDescriptor_56145e4302ec702e, []int{3}
 }
+
 func (m *Translation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Translation.Unmarshal(m, b)
 }
 func (m *Translation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Translation.Marshal(b, m, deterministic)
 }
-func (dst *Translation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Translation.Merge(dst, src)
+func (m *Translation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Translation.Merge(m, src)
 }
 func (m *Translation) XXX_Size() int {
 	return xxx_messageInfo_Translation.Size(m)
@@ -484,16 +494,17 @@ func (m *DetectLanguageRequest) Reset()         { *m = DetectLanguageRequest{} }
 func (m *DetectLanguageRequest) String() string { return proto.CompactTextString(m) }
 func (*DetectLanguageRequest) ProtoMessage()    {}
 func (*DetectLanguageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{4}
+	return fileDescriptor_56145e4302ec702e, []int{4}
 }
+
 func (m *DetectLanguageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetectLanguageRequest.Unmarshal(m, b)
 }
 func (m *DetectLanguageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetectLanguageRequest.Marshal(b, m, deterministic)
 }
-func (dst *DetectLanguageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetectLanguageRequest.Merge(dst, src)
+func (m *DetectLanguageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectLanguageRequest.Merge(m, src)
 }
 func (m *DetectLanguageRequest) XXX_Size() int {
 	return xxx_messageInfo_DetectLanguageRequest.Size(m)
@@ -549,57 +560,13 @@ func (m *DetectLanguageRequest) GetMimeType() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DetectLanguageRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DetectLanguageRequest_OneofMarshaler, _DetectLanguageRequest_OneofUnmarshaler, _DetectLanguageRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DetectLanguageRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DetectLanguageRequest_Content)(nil),
 	}
 }
 
-func _DetectLanguageRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DetectLanguageRequest)
-	// source
-	switch x := m.Source.(type) {
-	case *DetectLanguageRequest_Content:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Content)
-	case nil:
-	default:
-		return fmt.Errorf("DetectLanguageRequest.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DetectLanguageRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DetectLanguageRequest)
-	switch tag {
-	case 1: // source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Source = &DetectLanguageRequest_Content{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DetectLanguageRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DetectLanguageRequest)
-	// source
-	switch x := m.Source.(type) {
-	case *DetectLanguageRequest_Content:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response message for language detection.
 type DetectedLanguage struct {
 	// The BCP-47 language code of source content in the request, detected
@@ -616,16 +583,17 @@ func (m *DetectedLanguage) Reset()         { *m = DetectedLanguage{} }
 func (m *DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*DetectedLanguage) ProtoMessage()    {}
 func (*DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{5}
+	return fileDescriptor_56145e4302ec702e, []int{5}
 }
+
 func (m *DetectedLanguage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetectedLanguage.Unmarshal(m, b)
 }
 func (m *DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetectedLanguage.Marshal(b, m, deterministic)
 }
-func (dst *DetectedLanguage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetectedLanguage.Merge(dst, src)
+func (m *DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectedLanguage.Merge(m, src)
 }
 func (m *DetectedLanguage) XXX_Size() int {
 	return xxx_messageInfo_DetectedLanguage.Size(m)
@@ -664,16 +632,17 @@ func (m *DetectLanguageResponse) Reset()         { *m = DetectLanguageResponse{}
 func (m *DetectLanguageResponse) String() string { return proto.CompactTextString(m) }
 func (*DetectLanguageResponse) ProtoMessage()    {}
 func (*DetectLanguageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{6}
+	return fileDescriptor_56145e4302ec702e, []int{6}
 }
+
 func (m *DetectLanguageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DetectLanguageResponse.Unmarshal(m, b)
 }
 func (m *DetectLanguageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DetectLanguageResponse.Marshal(b, m, deterministic)
 }
-func (dst *DetectLanguageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetectLanguageResponse.Merge(dst, src)
+func (m *DetectLanguageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectLanguageResponse.Merge(m, src)
 }
 func (m *DetectLanguageResponse) XXX_Size() int {
 	return xxx_messageInfo_DetectLanguageResponse.Size(m)
@@ -723,16 +692,17 @@ func (m *GetSupportedLanguagesRequest) Reset()         { *m = GetSupportedLangua
 func (m *GetSupportedLanguagesRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSupportedLanguagesRequest) ProtoMessage()    {}
 func (*GetSupportedLanguagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{7}
+	return fileDescriptor_56145e4302ec702e, []int{7}
 }
+
 func (m *GetSupportedLanguagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSupportedLanguagesRequest.Unmarshal(m, b)
 }
 func (m *GetSupportedLanguagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSupportedLanguagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSupportedLanguagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSupportedLanguagesRequest.Merge(dst, src)
+func (m *GetSupportedLanguagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSupportedLanguagesRequest.Merge(m, src)
 }
 func (m *GetSupportedLanguagesRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSupportedLanguagesRequest.Size(m)
@@ -778,16 +748,17 @@ func (m *SupportedLanguages) Reset()         { *m = SupportedLanguages{} }
 func (m *SupportedLanguages) String() string { return proto.CompactTextString(m) }
 func (*SupportedLanguages) ProtoMessage()    {}
 func (*SupportedLanguages) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{8}
+	return fileDescriptor_56145e4302ec702e, []int{8}
 }
+
 func (m *SupportedLanguages) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SupportedLanguages.Unmarshal(m, b)
 }
 func (m *SupportedLanguages) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SupportedLanguages.Marshal(b, m, deterministic)
 }
-func (dst *SupportedLanguages) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SupportedLanguages.Merge(dst, src)
+func (m *SupportedLanguages) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SupportedLanguages.Merge(m, src)
 }
 func (m *SupportedLanguages) XXX_Size() int {
 	return xxx_messageInfo_SupportedLanguages.Size(m)
@@ -829,16 +800,17 @@ func (m *SupportedLanguage) Reset()         { *m = SupportedLanguage{} }
 func (m *SupportedLanguage) String() string { return proto.CompactTextString(m) }
 func (*SupportedLanguage) ProtoMessage()    {}
 func (*SupportedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{9}
+	return fileDescriptor_56145e4302ec702e, []int{9}
 }
+
 func (m *SupportedLanguage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SupportedLanguage.Unmarshal(m, b)
 }
 func (m *SupportedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SupportedLanguage.Marshal(b, m, deterministic)
 }
-func (dst *SupportedLanguage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SupportedLanguage.Merge(dst, src)
+func (m *SupportedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SupportedLanguage.Merge(m, src)
 }
 func (m *SupportedLanguage) XXX_Size() int {
 	return xxx_messageInfo_SupportedLanguage.Size(m)
@@ -890,16 +862,17 @@ func (m *GcsSource) Reset()         { *m = GcsSource{} }
 func (m *GcsSource) String() string { return proto.CompactTextString(m) }
 func (*GcsSource) ProtoMessage()    {}
 func (*GcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{10}
+	return fileDescriptor_56145e4302ec702e, []int{10}
 }
+
 func (m *GcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
 }
 func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
 }
-func (dst *GcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsSource.Merge(dst, src)
+func (m *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(m, src)
 }
 func (m *GcsSource) XXX_Size() int {
 	return xxx_messageInfo_GcsSource.Size(m)
@@ -938,16 +911,17 @@ func (m *InputConfig) Reset()         { *m = InputConfig{} }
 func (m *InputConfig) String() string { return proto.CompactTextString(m) }
 func (*InputConfig) ProtoMessage()    {}
 func (*InputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{11}
+	return fileDescriptor_56145e4302ec702e, []int{11}
 }
+
 func (m *InputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
 }
 func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputConfig.Merge(dst, src)
+func (m *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(m, src)
 }
 func (m *InputConfig) XXX_Size() int {
 	return xxx_messageInfo_InputConfig.Size(m)
@@ -989,61 +963,13 @@ func (m *InputConfig) GetGcsSource() *GcsSource {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*InputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _InputConfig_OneofMarshaler, _InputConfig_OneofUnmarshaler, _InputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*InputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*InputConfig_GcsSource)(nil),
 	}
 }
 
-func _InputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*InputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *InputConfig_GcsSource:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("InputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _InputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*InputConfig)
-	switch tag {
-	case 2: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &InputConfig_GcsSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _InputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*InputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *InputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The GCS location for the output content
 type GcsDestination struct {
 	// Required. There must be no files under 'output_uri_prefix'.
@@ -1058,16 +984,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{12}
+	return fileDescriptor_56145e4302ec702e, []int{12}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -1101,16 +1028,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{13}
+	return fileDescriptor_56145e4302ec702e, []int{13}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -1145,61 +1073,13 @@ func (m *OutputConfig) GetGcsDestination() *GcsDestination {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputConfig_OneofMarshaler, _OutputConfig_OneofUnmarshaler, _OutputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OutputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OutputConfig_GcsDestination)(nil),
 	}
 }
 
-func _OutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDestination); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputConfig.Destination has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputConfig)
-	switch tag {
-	case 1: // destination.gcs_destination
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsDestination)
-		err := b.DecodeMessage(msg)
-		m.Destination = &OutputConfig_GcsDestination{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputConfig)
-	// destination
-	switch x := m.Destination.(type) {
-	case *OutputConfig_GcsDestination:
-		s := proto.Size(x.GcsDestination)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The batch translation request.
 type BatchTranslateTextRequest struct {
 	// Optional. Only used when making regionalized call.
@@ -1248,16 +1128,17 @@ func (m *BatchTranslateTextRequest) Reset()         { *m = BatchTranslateTextReq
 func (m *BatchTranslateTextRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchTranslateTextRequest) ProtoMessage()    {}
 func (*BatchTranslateTextRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{14}
+	return fileDescriptor_56145e4302ec702e, []int{14}
 }
+
 func (m *BatchTranslateTextRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchTranslateTextRequest.Unmarshal(m, b)
 }
 func (m *BatchTranslateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchTranslateTextRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchTranslateTextRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchTranslateTextRequest.Merge(dst, src)
+func (m *BatchTranslateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchTranslateTextRequest.Merge(m, src)
 }
 func (m *BatchTranslateTextRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchTranslateTextRequest.Size(m)
@@ -1341,16 +1222,17 @@ func (m *BatchTranslateMetadata) Reset()         { *m = BatchTranslateMetadata{}
 func (m *BatchTranslateMetadata) String() string { return proto.CompactTextString(m) }
 func (*BatchTranslateMetadata) ProtoMessage()    {}
 func (*BatchTranslateMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{15}
+	return fileDescriptor_56145e4302ec702e, []int{15}
 }
+
 func (m *BatchTranslateMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchTranslateMetadata.Unmarshal(m, b)
 }
 func (m *BatchTranslateMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchTranslateMetadata.Marshal(b, m, deterministic)
 }
-func (dst *BatchTranslateMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchTranslateMetadata.Merge(dst, src)
+func (m *BatchTranslateMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchTranslateMetadata.Merge(m, src)
 }
 func (m *BatchTranslateMetadata) XXX_Size() int {
 	return xxx_messageInfo_BatchTranslateMetadata.Size(m)
@@ -1419,16 +1301,17 @@ func (m *BatchTranslateResponse) Reset()         { *m = BatchTranslateResponse{}
 func (m *BatchTranslateResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchTranslateResponse) ProtoMessage()    {}
 func (*BatchTranslateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{16}
+	return fileDescriptor_56145e4302ec702e, []int{16}
 }
+
 func (m *BatchTranslateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchTranslateResponse.Unmarshal(m, b)
 }
 func (m *BatchTranslateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchTranslateResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchTranslateResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchTranslateResponse.Merge(dst, src)
+func (m *BatchTranslateResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchTranslateResponse.Merge(m, src)
 }
 func (m *BatchTranslateResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchTranslateResponse.Size(m)
@@ -1490,16 +1373,17 @@ func (m *GlossaryInputConfig) Reset()         { *m = GlossaryInputConfig{} }
 func (m *GlossaryInputConfig) String() string { return proto.CompactTextString(m) }
 func (*GlossaryInputConfig) ProtoMessage()    {}
 func (*GlossaryInputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{17}
+	return fileDescriptor_56145e4302ec702e, []int{17}
 }
+
 func (m *GlossaryInputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GlossaryInputConfig.Unmarshal(m, b)
 }
 func (m *GlossaryInputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GlossaryInputConfig.Marshal(b, m, deterministic)
 }
-func (dst *GlossaryInputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GlossaryInputConfig.Merge(dst, src)
+func (m *GlossaryInputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GlossaryInputConfig.Merge(m, src)
 }
 func (m *GlossaryInputConfig) XXX_Size() int {
 	return xxx_messageInfo_GlossaryInputConfig.Size(m)
@@ -1534,61 +1418,13 @@ func (m *GlossaryInputConfig) GetGcsSource() *GcsSource {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GlossaryInputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GlossaryInputConfig_OneofMarshaler, _GlossaryInputConfig_OneofUnmarshaler, _GlossaryInputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GlossaryInputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GlossaryInputConfig_GcsSource)(nil),
 	}
 }
 
-func _GlossaryInputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GlossaryInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *GlossaryInputConfig_GcsSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GlossaryInputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GlossaryInputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GlossaryInputConfig)
-	switch tag {
-	case 1: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &GlossaryInputConfig_GcsSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GlossaryInputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GlossaryInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *GlossaryInputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a glossary built from user provided data.
 type Glossary struct {
 	// Required. The resource name of the glossary. Glossary names have the form
@@ -1618,16 +1454,17 @@ func (m *Glossary) Reset()         { *m = Glossary{} }
 func (m *Glossary) String() string { return proto.CompactTextString(m) }
 func (*Glossary) ProtoMessage()    {}
 func (*Glossary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{18}
+	return fileDescriptor_56145e4302ec702e, []int{18}
 }
+
 func (m *Glossary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Glossary.Unmarshal(m, b)
 }
 func (m *Glossary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Glossary.Marshal(b, m, deterministic)
 }
-func (dst *Glossary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Glossary.Merge(dst, src)
+func (m *Glossary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Glossary.Merge(m, src)
 }
 func (m *Glossary) XXX_Size() int {
 	return xxx_messageInfo_Glossary.Size(m)
@@ -1710,80 +1547,14 @@ func (m *Glossary) GetEndTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Glossary) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Glossary_OneofMarshaler, _Glossary_OneofUnmarshaler, _Glossary_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Glossary) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Glossary_LanguagePair)(nil),
 		(*Glossary_LanguageCodesSet_)(nil),
 	}
 }
 
-func _Glossary_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Glossary)
-	// languages
-	switch x := m.Languages.(type) {
-	case *Glossary_LanguagePair:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LanguagePair); err != nil {
-			return err
-		}
-	case *Glossary_LanguageCodesSet_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LanguageCodesSet); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Glossary.Languages has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Glossary_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Glossary)
-	switch tag {
-	case 3: // languages.language_pair
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Glossary_LanguageCodePair)
-		err := b.DecodeMessage(msg)
-		m.Languages = &Glossary_LanguagePair{msg}
-		return true, err
-	case 4: // languages.language_codes_set
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Glossary_LanguageCodesSet)
-		err := b.DecodeMessage(msg)
-		m.Languages = &Glossary_LanguageCodesSet_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Glossary_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Glossary)
-	// languages
-	switch x := m.Languages.(type) {
-	case *Glossary_LanguagePair:
-		s := proto.Size(x.LanguagePair)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Glossary_LanguageCodesSet_:
-		s := proto.Size(x.LanguageCodesSet)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Used with UNIDIRECTIONAL.
 type Glossary_LanguageCodePair struct {
 	// Required. The BCP-47 language code of the input text, for example,
@@ -1801,16 +1572,17 @@ func (m *Glossary_LanguageCodePair) Reset()         { *m = Glossary_LanguageCode
 func (m *Glossary_LanguageCodePair) String() string { return proto.CompactTextString(m) }
 func (*Glossary_LanguageCodePair) ProtoMessage()    {}
 func (*Glossary_LanguageCodePair) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{18, 0}
+	return fileDescriptor_56145e4302ec702e, []int{18, 0}
 }
+
 func (m *Glossary_LanguageCodePair) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Glossary_LanguageCodePair.Unmarshal(m, b)
 }
 func (m *Glossary_LanguageCodePair) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Glossary_LanguageCodePair.Marshal(b, m, deterministic)
 }
-func (dst *Glossary_LanguageCodePair) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Glossary_LanguageCodePair.Merge(dst, src)
+func (m *Glossary_LanguageCodePair) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Glossary_LanguageCodePair.Merge(m, src)
 }
 func (m *Glossary_LanguageCodePair) XXX_Size() int {
 	return xxx_messageInfo_Glossary_LanguageCodePair.Size(m)
@@ -1850,16 +1622,17 @@ func (m *Glossary_LanguageCodesSet) Reset()         { *m = Glossary_LanguageCode
 func (m *Glossary_LanguageCodesSet) String() string { return proto.CompactTextString(m) }
 func (*Glossary_LanguageCodesSet) ProtoMessage()    {}
 func (*Glossary_LanguageCodesSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{18, 1}
+	return fileDescriptor_56145e4302ec702e, []int{18, 1}
 }
+
 func (m *Glossary_LanguageCodesSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Glossary_LanguageCodesSet.Unmarshal(m, b)
 }
 func (m *Glossary_LanguageCodesSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Glossary_LanguageCodesSet.Marshal(b, m, deterministic)
 }
-func (dst *Glossary_LanguageCodesSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Glossary_LanguageCodesSet.Merge(dst, src)
+func (m *Glossary_LanguageCodesSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Glossary_LanguageCodesSet.Merge(m, src)
 }
 func (m *Glossary_LanguageCodesSet) XXX_Size() int {
 	return xxx_messageInfo_Glossary_LanguageCodesSet.Size(m)
@@ -1892,16 +1665,17 @@ func (m *CreateGlossaryRequest) Reset()         { *m = CreateGlossaryRequest{} }
 func (m *CreateGlossaryRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateGlossaryRequest) ProtoMessage()    {}
 func (*CreateGlossaryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{19}
+	return fileDescriptor_56145e4302ec702e, []int{19}
 }
+
 func (m *CreateGlossaryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateGlossaryRequest.Unmarshal(m, b)
 }
 func (m *CreateGlossaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateGlossaryRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateGlossaryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateGlossaryRequest.Merge(dst, src)
+func (m *CreateGlossaryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateGlossaryRequest.Merge(m, src)
 }
 func (m *CreateGlossaryRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateGlossaryRequest.Size(m)
@@ -1939,16 +1713,17 @@ func (m *GetGlossaryRequest) Reset()         { *m = GetGlossaryRequest{} }
 func (m *GetGlossaryRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGlossaryRequest) ProtoMessage()    {}
 func (*GetGlossaryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{20}
+	return fileDescriptor_56145e4302ec702e, []int{20}
 }
+
 func (m *GetGlossaryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGlossaryRequest.Unmarshal(m, b)
 }
 func (m *GetGlossaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGlossaryRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGlossaryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGlossaryRequest.Merge(dst, src)
+func (m *GetGlossaryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGlossaryRequest.Merge(m, src)
 }
 func (m *GetGlossaryRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGlossaryRequest.Size(m)
@@ -1979,16 +1754,17 @@ func (m *DeleteGlossaryRequest) Reset()         { *m = DeleteGlossaryRequest{} }
 func (m *DeleteGlossaryRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteGlossaryRequest) ProtoMessage()    {}
 func (*DeleteGlossaryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{21}
+	return fileDescriptor_56145e4302ec702e, []int{21}
 }
+
 func (m *DeleteGlossaryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteGlossaryRequest.Unmarshal(m, b)
 }
 func (m *DeleteGlossaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteGlossaryRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteGlossaryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteGlossaryRequest.Merge(dst, src)
+func (m *DeleteGlossaryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteGlossaryRequest.Merge(m, src)
 }
 func (m *DeleteGlossaryRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteGlossaryRequest.Size(m)
@@ -2031,16 +1807,17 @@ func (m *ListGlossariesRequest) Reset()         { *m = ListGlossariesRequest{} }
 func (m *ListGlossariesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListGlossariesRequest) ProtoMessage()    {}
 func (*ListGlossariesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{22}
+	return fileDescriptor_56145e4302ec702e, []int{22}
 }
+
 func (m *ListGlossariesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGlossariesRequest.Unmarshal(m, b)
 }
 func (m *ListGlossariesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGlossariesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListGlossariesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGlossariesRequest.Merge(dst, src)
+func (m *ListGlossariesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGlossariesRequest.Merge(m, src)
 }
 func (m *ListGlossariesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListGlossariesRequest.Size(m)
@@ -2096,16 +1873,17 @@ func (m *ListGlossariesResponse) Reset()         { *m = ListGlossariesResponse{}
 func (m *ListGlossariesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListGlossariesResponse) ProtoMessage()    {}
 func (*ListGlossariesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{23}
+	return fileDescriptor_56145e4302ec702e, []int{23}
 }
+
 func (m *ListGlossariesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGlossariesResponse.Unmarshal(m, b)
 }
 func (m *ListGlossariesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGlossariesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListGlossariesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGlossariesResponse.Merge(dst, src)
+func (m *ListGlossariesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGlossariesResponse.Merge(m, src)
 }
 func (m *ListGlossariesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListGlossariesResponse.Size(m)
@@ -2148,16 +1926,17 @@ func (m *CreateGlossaryMetadata) Reset()         { *m = CreateGlossaryMetadata{}
 func (m *CreateGlossaryMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateGlossaryMetadata) ProtoMessage()    {}
 func (*CreateGlossaryMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{24}
+	return fileDescriptor_56145e4302ec702e, []int{24}
 }
+
 func (m *CreateGlossaryMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateGlossaryMetadata.Unmarshal(m, b)
 }
 func (m *CreateGlossaryMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateGlossaryMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateGlossaryMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateGlossaryMetadata.Merge(dst, src)
+func (m *CreateGlossaryMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateGlossaryMetadata.Merge(m, src)
 }
 func (m *CreateGlossaryMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateGlossaryMetadata.Size(m)
@@ -2207,16 +1986,17 @@ func (m *DeleteGlossaryMetadata) Reset()         { *m = DeleteGlossaryMetadata{}
 func (m *DeleteGlossaryMetadata) String() string { return proto.CompactTextString(m) }
 func (*DeleteGlossaryMetadata) ProtoMessage()    {}
 func (*DeleteGlossaryMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{25}
+	return fileDescriptor_56145e4302ec702e, []int{25}
 }
+
 func (m *DeleteGlossaryMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteGlossaryMetadata.Unmarshal(m, b)
 }
 func (m *DeleteGlossaryMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteGlossaryMetadata.Marshal(b, m, deterministic)
 }
-func (dst *DeleteGlossaryMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteGlossaryMetadata.Merge(dst, src)
+func (m *DeleteGlossaryMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteGlossaryMetadata.Merge(m, src)
 }
 func (m *DeleteGlossaryMetadata) XXX_Size() int {
 	return xxx_messageInfo_DeleteGlossaryMetadata.Size(m)
@@ -2267,16 +2047,17 @@ func (m *DeleteGlossaryResponse) Reset()         { *m = DeleteGlossaryResponse{}
 func (m *DeleteGlossaryResponse) String() string { return proto.CompactTextString(m) }
 func (*DeleteGlossaryResponse) ProtoMessage()    {}
 func (*DeleteGlossaryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_translation_service_7ab926c836a43926, []int{26}
+	return fileDescriptor_56145e4302ec702e, []int{26}
 }
+
 func (m *DeleteGlossaryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteGlossaryResponse.Unmarshal(m, b)
 }
 func (m *DeleteGlossaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteGlossaryResponse.Marshal(b, m, deterministic)
 }
-func (dst *DeleteGlossaryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteGlossaryResponse.Merge(dst, src)
+func (m *DeleteGlossaryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteGlossaryResponse.Merge(m, src)
 }
 func (m *DeleteGlossaryResponse) XXX_Size() int {
 	return xxx_messageInfo_DeleteGlossaryResponse.Size(m)
@@ -2309,6 +2090,9 @@ func (m *DeleteGlossaryResponse) GetEndTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.translation.v3beta1.BatchTranslateMetadata_State", BatchTranslateMetadata_State_name, BatchTranslateMetadata_State_value)
+	proto.RegisterEnum("google.cloud.translation.v3beta1.CreateGlossaryMetadata_State", CreateGlossaryMetadata_State_name, CreateGlossaryMetadata_State_value)
+	proto.RegisterEnum("google.cloud.translation.v3beta1.DeleteGlossaryMetadata_State", DeleteGlossaryMetadata_State_name, DeleteGlossaryMetadata_State_value)
 	proto.RegisterType((*TranslateTextGlossaryConfig)(nil), "google.cloud.translation.v3beta1.TranslateTextGlossaryConfig")
 	proto.RegisterType((*TranslateTextRequest)(nil), "google.cloud.translation.v3beta1.TranslateTextRequest")
 	proto.RegisterType((*TranslateTextResponse)(nil), "google.cloud.translation.v3beta1.TranslateTextResponse")
@@ -2340,9 +2124,139 @@ func init() {
 	proto.RegisterType((*CreateGlossaryMetadata)(nil), "google.cloud.translation.v3beta1.CreateGlossaryMetadata")
 	proto.RegisterType((*DeleteGlossaryMetadata)(nil), "google.cloud.translation.v3beta1.DeleteGlossaryMetadata")
 	proto.RegisterType((*DeleteGlossaryResponse)(nil), "google.cloud.translation.v3beta1.DeleteGlossaryResponse")
-	proto.RegisterEnum("google.cloud.translation.v3beta1.BatchTranslateMetadata_State", BatchTranslateMetadata_State_name, BatchTranslateMetadata_State_value)
-	proto.RegisterEnum("google.cloud.translation.v3beta1.CreateGlossaryMetadata_State", CreateGlossaryMetadata_State_name, CreateGlossaryMetadata_State_value)
-	proto.RegisterEnum("google.cloud.translation.v3beta1.DeleteGlossaryMetadata_State", DeleteGlossaryMetadata_State_name, DeleteGlossaryMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/translate/v3beta1/translation_service.proto", fileDescriptor_56145e4302ec702e)
+}
+
+var fileDescriptor_56145e4302ec702e = []byte{
+	// 1986 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x73, 0x23, 0x47,
+	0xf5, 0xf7, 0x48, 0x96, 0x2d, 0x3d, 0x59, 0xb2, 0xb6, 0xd7, 0xf2, 0x57, 0x5f, 0x6d, 0x7e, 0x38,
+	0x93, 0x0a, 0x18, 0x6f, 0x21, 0x05, 0x79, 0x37, 0xbb, 0x91, 0xb3, 0xc0, 0x5a, 0xd6, 0xca, 0x06,
+	0xc7, 0x71, 0x46, 0x72, 0xa0, 0xc2, 0x56, 0xa9, 0xc6, 0xa3, 0xf6, 0x64, 0xb2, 0xd2, 0xcc, 0x30,
+	0xdd, 0x5a, 0xd6, 0x0b, 0xa9, 0x4a, 0x85, 0x0b, 0x07, 0x6e, 0x9c, 0xb8, 0x00, 0x17, 0xa8, 0x82,
+	0xa2, 0x8a, 0x2b, 0x47, 0xaa, 0x38, 0x50, 0xe1, 0xc0, 0x01, 0xfe, 0x05, 0x4e, 0xb9, 0x71, 0xe3,
+	0x48, 0x4d, 0x77, 0x8f, 0xd4, 0x33, 0x1a, 0xaf, 0xc6, 0xde, 0xa4, 0x0a, 0x6e, 0xea, 0xd7, 0xef,
+	0xbd, 0x7e, 0xef, 0xf3, 0x5e, 0xbf, 0xf7, 0xa6, 0x05, 0x77, 0x4d, 0xc7, 0x31, 0x87, 0xb8, 0x6e,
+	0x0c, 0x9d, 0xf1, 0xa0, 0x4e, 0x3d, 0xdd, 0x26, 0x43, 0x9d, 0xe2, 0xfa, 0xe3, 0xed, 0x53, 0x4c,
+	0xf5, 0xaf, 0x4d, 0x28, 0x96, 0x63, 0xf7, 0x09, 0xf6, 0x1e, 0x5b, 0x06, 0xae, 0xb9, 0x9e, 0x43,
+	0x1d, 0xb4, 0xc1, 0x25, 0x6b, 0x4c, 0xb2, 0x26, 0xf1, 0xd5, 0x84, 0x6c, 0xf5, 0x05, 0xa1, 0x5b,
+	0x77, 0xad, 0xba, 0x6e, 0xdb, 0x0e, 0x65, 0xdb, 0x84, 0xcb, 0x57, 0x5f, 0x15, 0xbb, 0x43, 0xc7,
+	0x36, 0xbd, 0xb1, 0x6d, 0x5b, 0xb6, 0x59, 0x77, 0x5c, 0xec, 0x85, 0x98, 0x5e, 0x16, 0x4c, 0x6c,
+	0x75, 0x3a, 0x3e, 0xab, 0x53, 0x6b, 0x84, 0x09, 0xd5, 0x47, 0x2e, 0x67, 0x50, 0xdf, 0x87, 0x1b,
+	0xbd, 0xc0, 0xe8, 0x1e, 0x7e, 0x42, 0x3b, 0x43, 0x87, 0x10, 0xdd, 0x3b, 0x6f, 0x39, 0xf6, 0x99,
+	0x65, 0xa2, 0x2a, 0x64, 0x4d, 0x41, 0xa9, 0x28, 0x1b, 0xca, 0x66, 0x4e, 0x9b, 0xac, 0xd1, 0xcb,
+	0x90, 0xb7, 0x4c, 0xdb, 0xf1, 0x70, 0xdf, 0xd0, 0x09, 0xae, 0xa4, 0x36, 0x94, 0xcd, 0xac, 0x06,
+	0x9c, 0xd4, 0xd2, 0x09, 0x56, 0x3f, 0x4d, 0xc1, 0x5a, 0x48, 0xb9, 0x86, 0xbf, 0x3f, 0xc6, 0x84,
+	0xfa, 0x5a, 0x0d, 0xc7, 0xa6, 0xd8, 0xa6, 0xa4, 0xa2, 0x6c, 0xa4, 0x7d, 0xad, 0xc1, 0x1a, 0xdd,
+	0x80, 0xdc, 0xc8, 0x1a, 0xe1, 0x3e, 0x3d, 0x77, 0x71, 0x25, 0xcd, 0x8f, 0xf4, 0x09, 0xbd, 0x73,
+	0x17, 0xa3, 0xd7, 0x61, 0x8d, 0x38, 0x63, 0xcf, 0xc0, 0xfd, 0xa1, 0x6e, 0x9b, 0x63, 0xdd, 0xc4,
+	0x7d, 0xc3, 0x19, 0xe0, 0xca, 0x22, 0xe3, 0x43, 0x7c, 0xef, 0x50, 0x6c, 0xb5, 0x9c, 0x01, 0x93,
+	0xa0, 0xba, 0x67, 0x62, 0x1a, 0x91, 0xc8, 0x70, 0x09, 0xbe, 0x17, 0x92, 0x58, 0x87, 0x25, 0x57,
+	0xf7, 0xb0, 0x4d, 0x2b, 0x59, 0xc6, 0x23, 0x56, 0x68, 0x0d, 0x32, 0x23, 0x67, 0x80, 0x87, 0x95,
+	0x25, 0x46, 0xe6, 0x0b, 0x74, 0x06, 0xab, 0x01, 0x20, 0x7d, 0x83, 0x61, 0x56, 0x59, 0xde, 0x50,
+	0x36, 0xf3, 0x8d, 0x7b, 0xb5, 0x79, 0xf1, 0xad, 0x3d, 0x03, 0x78, 0xad, 0x68, 0x86, 0xd6, 0xea,
+	0xdf, 0x14, 0x28, 0x47, 0xb0, 0x24, 0xae, 0x63, 0x13, 0x8c, 0xde, 0x85, 0x15, 0x49, 0x39, 0x07,
+	0x34, 0xdf, 0xf8, 0x6a, 0xf2, 0xe3, 0x2d, 0xc7, 0xd6, 0x42, 0x2a, 0xd0, 0x29, 0x94, 0x27, 0x4e,
+	0x85, 0x74, 0xa7, 0xaf, 0xa2, 0x7b, 0x2d, 0xd0, 0x25, 0x11, 0x89, 0xfa, 0x99, 0x02, 0x79, 0x89,
+	0x80, 0xbe, 0x0c, 0xab, 0x93, 0xdb, 0x33, 0xe8, 0x53, 0xfc, 0x84, 0x8a, 0x84, 0x2b, 0x4e, 0xc9,
+	0xbe, 0xdf, 0xd3, 0x38, 0xa4, 0xe4, 0x38, 0xdc, 0x82, 0xf5, 0x01, 0xa6, 0xd8, 0xf0, 0x85, 0xe3,
+	0x72, 0x63, 0x2d, 0xd8, 0x0d, 0xc5, 0x3a, 0x26, 0x7a, 0xe9, 0x2f, 0x22, 0x7a, 0x3f, 0x51, 0xa0,
+	0xbc, 0xc7, 0x0c, 0x08, 0x8e, 0x0f, 0xae, 0xc2, 0x34, 0xdb, 0x32, 0xf1, 0xd9, 0xb6, 0x28, 0x7b,
+	0x59, 0x85, 0x65, 0x71, 0x51, 0x38, 0x38, 0xfb, 0x0b, 0x5a, 0x40, 0x78, 0xe6, 0xc5, 0xd9, 0xcd,
+	0xc2, 0x12, 0xbf, 0x1c, 0xea, 0x77, 0xa0, 0xb4, 0x17, 0x81, 0x02, 0xbd, 0x0a, 0x85, 0x30, 0x66,
+	0x1c, 0xf9, 0x95, 0xa1, 0x8c, 0xd5, 0x4b, 0x00, 0x0c, 0xa2, 0x01, 0xb6, 0x0d, 0x7e, 0xdb, 0x53,
+	0x9a, 0x44, 0x51, 0x3f, 0x84, 0xf5, 0xa8, 0x8b, 0x22, 0x43, 0x8f, 0x21, 0x17, 0x68, 0x0a, 0xd2,
+	0xb3, 0x31, 0x1f, 0xdf, 0xa8, 0x95, 0xda, 0x54, 0x89, 0xfa, 0xb1, 0x02, 0x2f, 0x74, 0x30, 0xed,
+	0x8e, 0x5d, 0xd7, 0xf1, 0x24, 0x1e, 0x32, 0x0b, 0x6b, 0x3a, 0x04, 0x6b, 0x03, 0xca, 0x03, 0x8b,
+	0xb8, 0x43, 0xfd, 0xbc, 0x1f, 0xe7, 0xf1, 0x75, 0xb1, 0x19, 0x4a, 0x92, 0xd8, 0x84, 0x53, 0x4d,
+	0x40, 0xb3, 0xc7, 0xa3, 0x77, 0x67, 0x5d, 0xdd, 0x9e, 0xef, 0xea, 0x8c, 0x22, 0xd9, 0xd7, 0xdf,
+	0x2a, 0x70, 0x6d, 0x86, 0x21, 0x59, 0xc8, 0x5e, 0x81, 0x95, 0xc0, 0x5b, 0x5b, 0x1f, 0x61, 0xe1,
+	0x40, 0x5e, 0xd0, 0x8e, 0xf4, 0x11, 0x46, 0xaf, 0x41, 0x91, 0x70, 0xe5, 0x7d, 0x9e, 0x20, 0x0c,
+	0xb0, 0xac, 0x56, 0x10, 0xd4, 0x2e, 0x23, 0xca, 0x6c, 0xbc, 0x64, 0xb2, 0xbc, 0x9c, 0xb2, 0xf5,
+	0x18, 0x51, 0xdd, 0x84, 0x5c, 0xc7, 0x20, 0x42, 0xe6, 0x06, 0xe4, 0x2c, 0xdb, 0x1d, 0xd3, 0xfe,
+	0xd8, 0xb3, 0x82, 0xe6, 0xc1, 0x08, 0x27, 0x9e, 0xa5, 0x7e, 0xa2, 0x40, 0xfe, 0xc0, 0x5f, 0x88,
+	0x46, 0x13, 0xca, 0x5e, 0x25, 0x52, 0xf6, 0x0f, 0x01, 0x4c, 0x83, 0x04, 0x06, 0xa6, 0xd8, 0x0d,
+	0xbd, 0x39, 0x1f, 0xd6, 0x89, 0x29, 0xfb, 0x0b, 0x5a, 0xce, 0x0c, 0x16, 0xd2, 0x5d, 0x78, 0x0b,
+	0x8a, 0x1d, 0x83, 0xec, 0x61, 0x42, 0x2d, 0x9b, 0x57, 0xa1, 0x2d, 0xb8, 0xe6, 0x8c, 0xa9, 0x30,
+	0xba, 0xef, 0x7a, 0xf8, 0xcc, 0x7a, 0x22, 0xcc, 0x59, 0xe5, 0x1b, 0x27, 0x9e, 0x75, 0xcc, 0xc8,
+	0xea, 0x53, 0x58, 0x79, 0x87, 0x91, 0x84, 0x0b, 0xdf, 0x83, 0x55, 0xdf, 0xca, 0xc1, 0x54, 0x1d,
+	0x93, 0xcc, 0x37, 0x5e, 0x4f, 0x64, 0xaa, 0x64, 0xc6, 0xfe, 0x82, 0x56, 0x34, 0x43, 0x94, 0xdd,
+	0x02, 0xe4, 0x25, 0xc5, 0xea, 0xa7, 0x19, 0xf8, 0xff, 0x5d, 0x9d, 0x1a, 0x1f, 0xc4, 0xf6, 0xd7,
+	0x69, 0xf6, 0x2b, 0xa1, 0xec, 0xbf, 0xa8, 0x7d, 0xa6, 0x2e, 0x6c, 0x9f, 0x0d, 0x28, 0xc7, 0xb5,
+	0x4f, 0xde, 0x09, 0x72, 0xda, 0xf5, 0xd9, 0xfe, 0x49, 0x50, 0x1f, 0x96, 0xd8, 0x15, 0x21, 0x95,
+	0x45, 0x76, 0x01, 0x3a, 0xf3, 0xdd, 0xbf, 0xd0, 0x95, 0xda, 0xdb, 0x4c, 0x53, 0xdb, 0xa6, 0xde,
+	0xb9, 0x26, 0xd4, 0x22, 0x0d, 0x0a, 0x3c, 0xb1, 0x78, 0xc9, 0x26, 0x95, 0x4c, 0xd2, 0xb6, 0x24,
+	0x65, 0x9c, 0xb6, 0x62, 0x4d, 0x17, 0x04, 0x75, 0xa1, 0x20, 0x02, 0x2f, 0xfa, 0xc0, 0x12, 0x0b,
+	0x5d, 0x6d, 0xbe, 0x4e, 0x39, 0x07, 0xb4, 0x15, 0x47, 0xce, 0x88, 0x47, 0x00, 0xa2, 0x11, 0x58,
+	0x98, 0x54, 0x96, 0x99, 0x95, 0xdf, 0x7e, 0x1e, 0x34, 0x3a, 0x13, 0x6d, 0x1c, 0x11, 0x49, 0x7d,
+	0xf5, 0x4d, 0xc8, 0x4b, 0x60, 0xa1, 0x12, 0xa4, 0x1f, 0xe1, 0x60, 0x68, 0xf3, 0x7f, 0xfa, 0x75,
+	0xec, 0xb1, 0x3e, 0x1c, 0x07, 0xe1, 0xe6, 0x8b, 0x66, 0xea, 0xae, 0x52, 0xfd, 0x11, 0xac, 0x46,
+	0x34, 0xc7, 0x88, 0x77, 0x65, 0xf1, 0xe7, 0xee, 0x90, 0xd3, 0xd3, 0xd5, 0x5f, 0xa6, 0x61, 0x3d,
+	0xec, 0xf2, 0xdb, 0x98, 0xea, 0x03, 0x9d, 0xea, 0xa8, 0x07, 0x19, 0x42, 0x75, 0xca, 0x2b, 0x42,
+	0xb1, 0xf1, 0xf5, 0xcb, 0x62, 0x17, 0x28, 0xaa, 0x75, 0x7d, 0x2d, 0x1a, 0x57, 0x86, 0xb6, 0xa1,
+	0x2c, 0x8d, 0x1a, 0xc6, 0x07, 0xba, 0xa7, 0x1b, 0x14, 0x7b, 0x84, 0x79, 0x96, 0xd6, 0xd6, 0xa6,
+	0x9b, 0xad, 0xc9, 0x1e, 0xba, 0x09, 0xd7, 0xce, 0x74, 0x6b, 0x18, 0x16, 0x48, 0x33, 0x81, 0x12,
+	0xdf, 0x90, 0x98, 0xbf, 0x02, 0x25, 0xea, 0x50, 0x7d, 0x28, 0xf3, 0x2e, 0x32, 0xde, 0x55, 0x46,
+	0x97, 0x58, 0x77, 0x20, 0x4f, 0xc6, 0xa7, 0x23, 0x8b, 0xf6, 0xfd, 0xd1, 0x9c, 0x4d, 0x01, 0xf9,
+	0x46, 0x35, 0x70, 0x34, 0x98, 0xdb, 0x6b, 0xbd, 0x60, 0x6e, 0xd7, 0x80, 0xb3, 0xfb, 0x04, 0x15,
+	0x43, 0x86, 0x79, 0x86, 0xca, 0x70, 0xad, 0xdb, 0xbb, 0xdf, 0x6b, 0xf7, 0x4f, 0x8e, 0xba, 0xc7,
+	0xed, 0xd6, 0xc1, 0x83, 0x83, 0xf6, 0x5e, 0x69, 0x01, 0xe5, 0x61, 0x59, 0x3b, 0x39, 0x3a, 0x3a,
+	0x38, 0xea, 0x94, 0x14, 0x54, 0x80, 0x5c, 0xf7, 0xa4, 0xd5, 0x6a, 0xb7, 0xf7, 0xda, 0x7b, 0xa5,
+	0x14, 0x02, 0x58, 0x7a, 0x70, 0xff, 0xe0, 0xb0, 0xbd, 0x57, 0x4a, 0xa3, 0x22, 0x40, 0xeb, 0xfe,
+	0x51, 0xab, 0x7d, 0x78, 0xe8, 0xb3, 0x2e, 0xfa, 0xac, 0x62, 0xdd, 0xde, 0x2b, 0x65, 0xd4, 0x9f,
+	0xa7, 0xa2, 0x11, 0x9a, 0xf4, 0xf6, 0x38, 0x4f, 0x95, 0x78, 0x4f, 0xbf, 0x78, 0xd8, 0x23, 0x58,
+	0x2e, 0x5e, 0x06, 0x4b, 0x74, 0x1b, 0xb2, 0xd8, 0x1e, 0x24, 0x8d, 0xc2, 0x32, 0xb6, 0x07, 0x2c,
+	0x04, 0x23, 0xb8, 0x1e, 0xa4, 0xb6, 0xdc, 0xcf, 0xc2, 0x2d, 0x4b, 0xf9, 0xdc, 0x5a, 0xd6, 0x2f,
+	0x32, 0x90, 0x0d, 0xce, 0x43, 0x08, 0x16, 0x59, 0x5f, 0xe7, 0xb7, 0x94, 0xfd, 0x46, 0xa7, 0xd2,
+	0x60, 0xe0, 0xea, 0x96, 0x27, 0x06, 0xda, 0x9d, 0x04, 0x67, 0x0b, 0xb5, 0x35, 0xb9, 0x9c, 0x1f,
+	0xeb, 0x96, 0xb7, 0xbf, 0x30, 0x9d, 0x2b, 0xfc, 0x35, 0x7a, 0x04, 0x28, 0xdc, 0x0e, 0xfa, 0x44,
+	0x4c, 0x04, 0x57, 0x3f, 0x88, 0x74, 0x31, 0xdd, 0x5f, 0xd0, 0x4a, 0xc3, 0x08, 0x0d, 0x7d, 0x17,
+	0x56, 0xe4, 0x6a, 0x2f, 0x62, 0x73, 0x3b, 0xf9, 0x31, 0x72, 0xd1, 0xcf, 0x4b, 0x45, 0xdf, 0xff,
+	0x80, 0xc5, 0x7e, 0xb1, 0xeb, 0x1b, 0xce, 0xd8, 0xa6, 0xac, 0xe2, 0x67, 0x34, 0x60, 0xa4, 0x96,
+	0x4f, 0x89, 0xe6, 0xd3, 0xf2, 0x95, 0xf3, 0x29, 0x9b, 0x38, 0x9f, 0xaa, 0x8f, 0xa1, 0x14, 0xc5,
+	0xff, 0xc2, 0xbe, 0xad, 0x5c, 0xfa, 0xb3, 0x37, 0x75, 0xd1, 0x67, 0x6f, 0xf5, 0xcd, 0xf0, 0xb9,
+	0x0c, 0xfa, 0xd7, 0xa0, 0x18, 0x69, 0xfb, 0xfc, 0x6b, 0xbd, 0x10, 0x0a, 0xd2, 0x6e, 0x5e, 0x1a,
+	0x7a, 0xd5, 0x1f, 0x40, 0xb9, 0xe5, 0x61, 0x9d, 0xe2, 0x00, 0xfe, 0x79, 0x43, 0xc9, 0x03, 0xe9,
+	0x89, 0x81, 0xb7, 0x96, 0xad, 0xe4, 0xb1, 0x9d, 0x3e, 0x47, 0xa8, 0x9b, 0x80, 0x3a, 0x98, 0x46,
+	0x4f, 0x8d, 0xb9, 0x22, 0xea, 0x4d, 0xff, 0x63, 0x6c, 0x88, 0x67, 0x4d, 0x8c, 0x63, 0xfe, 0xb1,
+	0x02, 0xe5, 0x43, 0x8b, 0xd0, 0x69, 0x83, 0x9c, 0xe7, 0xd0, 0x0d, 0xc8, 0xb9, 0x3e, 0x62, 0xc4,
+	0x7a, 0xca, 0x01, 0xcf, 0x68, 0x59, 0x9f, 0xd0, 0xb5, 0x9e, 0x62, 0xf4, 0x22, 0x00, 0xdb, 0xa4,
+	0xce, 0x23, 0x6c, 0x8b, 0x8f, 0x13, 0xc6, 0xde, 0xf3, 0x09, 0xbe, 0xce, 0x33, 0x6b, 0x48, 0xb1,
+	0x27, 0xbe, 0xfb, 0xc4, 0x4a, 0xfd, 0xa9, 0x02, 0xeb, 0x51, 0x2b, 0x44, 0x05, 0xfe, 0x56, 0x68,
+	0xc8, 0xe0, 0xdf, 0x1c, 0x97, 0x41, 0x50, 0x92, 0x46, 0x5f, 0x82, 0x55, 0x1b, 0x3f, 0xa1, 0x7d,
+	0xc9, 0x44, 0x9e, 0x31, 0x05, 0x9f, 0x7c, 0x1c, 0x98, 0xa9, 0xfe, 0x26, 0x05, 0xeb, 0xe1, 0x28,
+	0x4f, 0x5a, 0x76, 0x5c, 0x4d, 0x9a, 0xb4, 0xf1, 0x54, 0xd2, 0x36, 0x1e, 0xaf, 0x3c, 0xdc, 0xc6,
+	0x23, 0xb7, 0x33, 0xfd, 0xdf, 0xd8, 0x39, 0x7d, 0xa0, 0xc2, 0xb9, 0xf6, 0x39, 0x03, 0x15, 0xaf,
+	0xfc, 0x7f, 0x0f, 0xa8, 0x5f, 0x29, 0x51, 0xa0, 0x26, 0x09, 0x1e, 0x07, 0x54, 0xc4, 0xa5, 0xd4,
+	0x95, 0x2b, 0x73, 0x3a, 0x71, 0x65, 0x6e, 0x7c, 0xbc, 0x02, 0x48, 0x7a, 0xb1, 0xea, 0xf2, 0xd7,
+	0x5c, 0xf4, 0x67, 0x05, 0x0a, 0xa1, 0x49, 0x17, 0xbd, 0x71, 0xc9, 0xd1, 0x58, 0x14, 0x94, 0xea,
+	0x9d, 0x4b, 0xcb, 0x71, 0x84, 0xd4, 0xfb, 0x9f, 0xfc, 0xe3, 0x9f, 0x3f, 0x4b, 0xed, 0xa8, 0x6f,
+	0x4c, 0x9e, 0x9d, 0x7f, 0xc8, 0x6b, 0xd1, 0x3d, 0xd7, 0x73, 0x3e, 0xc4, 0x06, 0x25, 0xf5, 0xad,
+	0xfa, 0xd0, 0x31, 0xf8, 0xd3, 0x5b, 0x7d, 0xeb, 0xa3, 0x26, 0x95, 0xf5, 0x34, 0x95, 0x2d, 0xf4,
+	0x17, 0x05, 0x8a, 0xe1, 0xe7, 0x1b, 0x74, 0x27, 0xe9, 0x1b, 0x4d, 0xe4, 0x4d, 0xab, 0x7a, 0xf7,
+	0xf2, 0x82, 0xc2, 0x91, 0x5d, 0xe6, 0xc8, 0x5b, 0xea, 0x9d, 0xc4, 0x8e, 0x0c, 0x42, 0x8a, 0x7c,
+	0x4f, 0xfe, 0xae, 0x40, 0x39, 0xf6, 0x6d, 0x08, 0x25, 0xb8, 0x4e, 0xcf, 0x7a, 0x54, 0xaa, 0xde,
+	0xba, 0xc2, 0x4b, 0x0e, 0x51, 0x5b, 0xcc, 0xa7, 0x7b, 0x68, 0x27, 0xa9, 0x4f, 0x75, 0x32, 0x6b,
+	0xfa, 0x1f, 0x15, 0x40, 0xb3, 0x9f, 0x85, 0x68, 0xe7, 0x39, 0x3e, 0x26, 0xab, 0x2f, 0x06, 0xc2,
+	0xd2, 0x3f, 0x08, 0xb5, 0x77, 0x82, 0x7f, 0x10, 0xd4, 0x07, 0xcc, 0xee, 0x6f, 0xaa, 0x89, 0xed,
+	0x6e, 0x9e, 0xce, 0x1c, 0xe5, 0xc7, 0xe3, 0x0f, 0x0a, 0x14, 0xc3, 0xe5, 0x3c, 0x49, 0x66, 0xc5,
+	0xce, 0x10, 0xf3, 0x4c, 0x6e, 0x33, 0x93, 0xbf, 0xa1, 0x6e, 0x27, 0x86, 0x7a, 0xda, 0xfb, 0x9a,
+	0xd3, 0x3f, 0x36, 0xfe, 0xa4, 0x40, 0x31, 0xdc, 0x6c, 0x93, 0x58, 0x1c, 0x3b, 0x24, 0x24, 0xb9,
+	0x0b, 0xf1, 0x7d, 0x5d, 0xdd, 0x61, 0xce, 0xdc, 0x46, 0x57, 0x71, 0x06, 0xfd, 0x5e, 0x81, 0xbc,
+	0x34, 0x0d, 0xa1, 0x5b, 0x89, 0x52, 0x3f, 0x0a, 0xf7, 0x25, 0xc6, 0x88, 0x38, 0x73, 0xfd, 0x4a,
+	0x7d, 0x81, 0xb1, 0x92, 0xad, 0xf5, 0xad, 0x8f, 0xd0, 0xaf, 0x59, 0xf5, 0x91, 0xab, 0x7f, 0xb2,
+	0xea, 0x13, 0x33, 0xc4, 0xcd, 0xcb, 0x11, 0x61, 0xe7, 0xd6, 0x55, 0xec, 0xdc, 0xfd, 0x97, 0x02,
+	0xaa, 0xe1, 0x8c, 0xe2, 0x4d, 0xc3, 0x81, 0x61, 0xbb, 0xff, 0x37, 0xdb, 0x26, 0x8e, 0xfd, 0xc6,
+	0x72, 0xac, 0xbc, 0xdf, 0x11, 0xa2, 0xa6, 0xe3, 0x8f, 0xcc, 0x35, 0xc7, 0x33, 0xeb, 0x26, 0xb6,
+	0x59, 0xdb, 0xa9, 0xf3, 0x2d, 0xdd, 0xb5, 0xc8, 0x45, 0x7f, 0x27, 0xee, 0x4c, 0x28, 0xff, 0x56,
+	0x94, 0xdf, 0xa5, 0x5e, 0xea, 0x70, 0x65, 0x2d, 0x66, 0xc7, 0xe4, 0xe6, 0xd5, 0xde, 0xdb, 0xde,
+	0xf5, 0xb9, 0xff, 0x1a, 0x30, 0x3c, 0x64, 0x0c, 0x0f, 0x27, 0x0c, 0x0f, 0xdf, 0xe3, 0xea, 0x3e,
+	0x4b, 0xbd, 0xc2, 0x19, 0x9a, 0x4d, 0xc6, 0xd1, 0x6c, 0x4e, 0x58, 0x9a, 0x4d, 0xc1, 0x73, 0xba,
+	0xc4, 0x8c, 0xdb, 0xfe, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xe5, 0x9e, 0x13, 0xea, 0x1c,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2685,136 +2599,3 @@ var _TranslationService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/translate/v3beta1/translation_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/translate/v3beta1/translation_service.proto", fileDescriptor_translation_service_7ab926c836a43926)
-}
-
-var fileDescriptor_translation_service_7ab926c836a43926 = []byte{
-	// 1986 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x73, 0x23, 0x47,
-	0xf5, 0xf7, 0x48, 0x96, 0x2d, 0x3d, 0x59, 0xb2, 0xb6, 0xd7, 0xf2, 0x57, 0x5f, 0x6d, 0x7e, 0x38,
-	0x93, 0x0a, 0x18, 0x6f, 0x21, 0x05, 0x79, 0x37, 0xbb, 0x91, 0xb3, 0xc0, 0x5a, 0xd6, 0xca, 0x06,
-	0xc7, 0x71, 0x46, 0x72, 0xa0, 0xc2, 0x56, 0xa9, 0xc6, 0xa3, 0xf6, 0x64, 0xb2, 0xd2, 0xcc, 0x30,
-	0xdd, 0x5a, 0xd6, 0x0b, 0xa9, 0x4a, 0x85, 0x0b, 0x07, 0x6e, 0x9c, 0xb8, 0x00, 0x17, 0xa8, 0x82,
-	0xa2, 0x8a, 0x2b, 0x47, 0xaa, 0x38, 0x50, 0xe1, 0xc0, 0x01, 0xfe, 0x05, 0x4e, 0xb9, 0x71, 0xe3,
-	0x48, 0x4d, 0x77, 0x8f, 0xd4, 0x33, 0x1a, 0xaf, 0xc6, 0xde, 0xa4, 0x0a, 0x6e, 0xea, 0xd7, 0xef,
-	0xbd, 0x7e, 0xef, 0xf3, 0x5e, 0xbf, 0xf7, 0xa6, 0x05, 0x77, 0x4d, 0xc7, 0x31, 0x87, 0xb8, 0x6e,
-	0x0c, 0x9d, 0xf1, 0xa0, 0x4e, 0x3d, 0xdd, 0x26, 0x43, 0x9d, 0xe2, 0xfa, 0xe3, 0xed, 0x53, 0x4c,
-	0xf5, 0xaf, 0x4d, 0x28, 0x96, 0x63, 0xf7, 0x09, 0xf6, 0x1e, 0x5b, 0x06, 0xae, 0xb9, 0x9e, 0x43,
-	0x1d, 0xb4, 0xc1, 0x25, 0x6b, 0x4c, 0xb2, 0x26, 0xf1, 0xd5, 0x84, 0x6c, 0xf5, 0x05, 0xa1, 0x5b,
-	0x77, 0xad, 0xba, 0x6e, 0xdb, 0x0e, 0x65, 0xdb, 0x84, 0xcb, 0x57, 0x5f, 0x15, 0xbb, 0x43, 0xc7,
-	0x36, 0xbd, 0xb1, 0x6d, 0x5b, 0xb6, 0x59, 0x77, 0x5c, 0xec, 0x85, 0x98, 0x5e, 0x16, 0x4c, 0x6c,
-	0x75, 0x3a, 0x3e, 0xab, 0x53, 0x6b, 0x84, 0x09, 0xd5, 0x47, 0x2e, 0x67, 0x50, 0xdf, 0x87, 0x1b,
-	0xbd, 0xc0, 0xe8, 0x1e, 0x7e, 0x42, 0x3b, 0x43, 0x87, 0x10, 0xdd, 0x3b, 0x6f, 0x39, 0xf6, 0x99,
-	0x65, 0xa2, 0x2a, 0x64, 0x4d, 0x41, 0xa9, 0x28, 0x1b, 0xca, 0x66, 0x4e, 0x9b, 0xac, 0xd1, 0xcb,
-	0x90, 0xb7, 0x4c, 0xdb, 0xf1, 0x70, 0xdf, 0xd0, 0x09, 0xae, 0xa4, 0x36, 0x94, 0xcd, 0xac, 0x06,
-	0x9c, 0xd4, 0xd2, 0x09, 0x56, 0x3f, 0x4d, 0xc1, 0x5a, 0x48, 0xb9, 0x86, 0xbf, 0x3f, 0xc6, 0x84,
-	0xfa, 0x5a, 0x0d, 0xc7, 0xa6, 0xd8, 0xa6, 0xa4, 0xa2, 0x6c, 0xa4, 0x7d, 0xad, 0xc1, 0x1a, 0xdd,
-	0x80, 0xdc, 0xc8, 0x1a, 0xe1, 0x3e, 0x3d, 0x77, 0x71, 0x25, 0xcd, 0x8f, 0xf4, 0x09, 0xbd, 0x73,
-	0x17, 0xa3, 0xd7, 0x61, 0x8d, 0x38, 0x63, 0xcf, 0xc0, 0xfd, 0xa1, 0x6e, 0x9b, 0x63, 0xdd, 0xc4,
-	0x7d, 0xc3, 0x19, 0xe0, 0xca, 0x22, 0xe3, 0x43, 0x7c, 0xef, 0x50, 0x6c, 0xb5, 0x9c, 0x01, 0x93,
-	0xa0, 0xba, 0x67, 0x62, 0x1a, 0x91, 0xc8, 0x70, 0x09, 0xbe, 0x17, 0x92, 0x58, 0x87, 0x25, 0x57,
-	0xf7, 0xb0, 0x4d, 0x2b, 0x59, 0xc6, 0x23, 0x56, 0x68, 0x0d, 0x32, 0x23, 0x67, 0x80, 0x87, 0x95,
-	0x25, 0x46, 0xe6, 0x0b, 0x74, 0x06, 0xab, 0x01, 0x20, 0x7d, 0x83, 0x61, 0x56, 0x59, 0xde, 0x50,
-	0x36, 0xf3, 0x8d, 0x7b, 0xb5, 0x79, 0xf1, 0xad, 0x3d, 0x03, 0x78, 0xad, 0x68, 0x86, 0xd6, 0xea,
-	0xdf, 0x14, 0x28, 0x47, 0xb0, 0x24, 0xae, 0x63, 0x13, 0x8c, 0xde, 0x85, 0x15, 0x49, 0x39, 0x07,
-	0x34, 0xdf, 0xf8, 0x6a, 0xf2, 0xe3, 0x2d, 0xc7, 0xd6, 0x42, 0x2a, 0xd0, 0x29, 0x94, 0x27, 0x4e,
-	0x85, 0x74, 0xa7, 0xaf, 0xa2, 0x7b, 0x2d, 0xd0, 0x25, 0x11, 0x89, 0xfa, 0x99, 0x02, 0x79, 0x89,
-	0x80, 0xbe, 0x0c, 0xab, 0x93, 0xdb, 0x33, 0xe8, 0x53, 0xfc, 0x84, 0x8a, 0x84, 0x2b, 0x4e, 0xc9,
-	0xbe, 0xdf, 0xd3, 0x38, 0xa4, 0xe4, 0x38, 0xdc, 0x82, 0xf5, 0x01, 0xa6, 0xd8, 0xf0, 0x85, 0xe3,
-	0x72, 0x63, 0x2d, 0xd8, 0x0d, 0xc5, 0x3a, 0x26, 0x7a, 0xe9, 0x2f, 0x22, 0x7a, 0x3f, 0x51, 0xa0,
-	0xbc, 0xc7, 0x0c, 0x08, 0x8e, 0x0f, 0xae, 0xc2, 0x34, 0xdb, 0x32, 0xf1, 0xd9, 0xb6, 0x28, 0x7b,
-	0x59, 0x85, 0x65, 0x71, 0x51, 0x38, 0x38, 0xfb, 0x0b, 0x5a, 0x40, 0x78, 0xe6, 0xc5, 0xd9, 0xcd,
-	0xc2, 0x12, 0xbf, 0x1c, 0xea, 0x77, 0xa0, 0xb4, 0x17, 0x81, 0x02, 0xbd, 0x0a, 0x85, 0x30, 0x66,
-	0x1c, 0xf9, 0x95, 0xa1, 0x8c, 0xd5, 0x4b, 0x00, 0x0c, 0xa2, 0x01, 0xb6, 0x0d, 0x7e, 0xdb, 0x53,
-	0x9a, 0x44, 0x51, 0x3f, 0x84, 0xf5, 0xa8, 0x8b, 0x22, 0x43, 0x8f, 0x21, 0x17, 0x68, 0x0a, 0xd2,
-	0xb3, 0x31, 0x1f, 0xdf, 0xa8, 0x95, 0xda, 0x54, 0x89, 0xfa, 0xb1, 0x02, 0x2f, 0x74, 0x30, 0xed,
-	0x8e, 0x5d, 0xd7, 0xf1, 0x24, 0x1e, 0x32, 0x0b, 0x6b, 0x3a, 0x04, 0x6b, 0x03, 0xca, 0x03, 0x8b,
-	0xb8, 0x43, 0xfd, 0xbc, 0x1f, 0xe7, 0xf1, 0x75, 0xb1, 0x19, 0x4a, 0x92, 0xd8, 0x84, 0x53, 0x4d,
-	0x40, 0xb3, 0xc7, 0xa3, 0x77, 0x67, 0x5d, 0xdd, 0x9e, 0xef, 0xea, 0x8c, 0x22, 0xd9, 0xd7, 0xdf,
-	0x2a, 0x70, 0x6d, 0x86, 0x21, 0x59, 0xc8, 0x5e, 0x81, 0x95, 0xc0, 0x5b, 0x5b, 0x1f, 0x61, 0xe1,
-	0x40, 0x5e, 0xd0, 0x8e, 0xf4, 0x11, 0x46, 0xaf, 0x41, 0x91, 0x70, 0xe5, 0x7d, 0x9e, 0x20, 0x0c,
-	0xb0, 0xac, 0x56, 0x10, 0xd4, 0x2e, 0x23, 0xca, 0x6c, 0xbc, 0x64, 0xb2, 0xbc, 0x9c, 0xb2, 0xf5,
-	0x18, 0x51, 0xdd, 0x84, 0x5c, 0xc7, 0x20, 0x42, 0xe6, 0x06, 0xe4, 0x2c, 0xdb, 0x1d, 0xd3, 0xfe,
-	0xd8, 0xb3, 0x82, 0xe6, 0xc1, 0x08, 0x27, 0x9e, 0xa5, 0x7e, 0xa2, 0x40, 0xfe, 0xc0, 0x5f, 0x88,
-	0x46, 0x13, 0xca, 0x5e, 0x25, 0x52, 0xf6, 0x0f, 0x01, 0x4c, 0x83, 0x04, 0x06, 0xa6, 0xd8, 0x0d,
-	0xbd, 0x39, 0x1f, 0xd6, 0x89, 0x29, 0xfb, 0x0b, 0x5a, 0xce, 0x0c, 0x16, 0xd2, 0x5d, 0x78, 0x0b,
-	0x8a, 0x1d, 0x83, 0xec, 0x61, 0x42, 0x2d, 0x9b, 0x57, 0xa1, 0x2d, 0xb8, 0xe6, 0x8c, 0xa9, 0x30,
-	0xba, 0xef, 0x7a, 0xf8, 0xcc, 0x7a, 0x22, 0xcc, 0x59, 0xe5, 0x1b, 0x27, 0x9e, 0x75, 0xcc, 0xc8,
-	0xea, 0x53, 0x58, 0x79, 0x87, 0x91, 0x84, 0x0b, 0xdf, 0x83, 0x55, 0xdf, 0xca, 0xc1, 0x54, 0x1d,
-	0x93, 0xcc, 0x37, 0x5e, 0x4f, 0x64, 0xaa, 0x64, 0xc6, 0xfe, 0x82, 0x56, 0x34, 0x43, 0x94, 0xdd,
-	0x02, 0xe4, 0x25, 0xc5, 0xea, 0xa7, 0x19, 0xf8, 0xff, 0x5d, 0x9d, 0x1a, 0x1f, 0xc4, 0xf6, 0xd7,
-	0x69, 0xf6, 0x2b, 0xa1, 0xec, 0xbf, 0xa8, 0x7d, 0xa6, 0x2e, 0x6c, 0x9f, 0x0d, 0x28, 0xc7, 0xb5,
-	0x4f, 0xde, 0x09, 0x72, 0xda, 0xf5, 0xd9, 0xfe, 0x49, 0x50, 0x1f, 0x96, 0xd8, 0x15, 0x21, 0x95,
-	0x45, 0x76, 0x01, 0x3a, 0xf3, 0xdd, 0xbf, 0xd0, 0x95, 0xda, 0xdb, 0x4c, 0x53, 0xdb, 0xa6, 0xde,
-	0xb9, 0x26, 0xd4, 0x22, 0x0d, 0x0a, 0x3c, 0xb1, 0x78, 0xc9, 0x26, 0x95, 0x4c, 0xd2, 0xb6, 0x24,
-	0x65, 0x9c, 0xb6, 0x62, 0x4d, 0x17, 0x04, 0x75, 0xa1, 0x20, 0x02, 0x2f, 0xfa, 0xc0, 0x12, 0x0b,
-	0x5d, 0x6d, 0xbe, 0x4e, 0x39, 0x07, 0xb4, 0x15, 0x47, 0xce, 0x88, 0x47, 0x00, 0xa2, 0x11, 0x58,
-	0x98, 0x54, 0x96, 0x99, 0x95, 0xdf, 0x7e, 0x1e, 0x34, 0x3a, 0x13, 0x6d, 0x1c, 0x11, 0x49, 0x7d,
-	0xf5, 0x4d, 0xc8, 0x4b, 0x60, 0xa1, 0x12, 0xa4, 0x1f, 0xe1, 0x60, 0x68, 0xf3, 0x7f, 0xfa, 0x75,
-	0xec, 0xb1, 0x3e, 0x1c, 0x07, 0xe1, 0xe6, 0x8b, 0x66, 0xea, 0xae, 0x52, 0xfd, 0x11, 0xac, 0x46,
-	0x34, 0xc7, 0x88, 0x77, 0x65, 0xf1, 0xe7, 0xee, 0x90, 0xd3, 0xd3, 0xd5, 0x5f, 0xa6, 0x61, 0x3d,
-	0xec, 0xf2, 0xdb, 0x98, 0xea, 0x03, 0x9d, 0xea, 0xa8, 0x07, 0x19, 0x42, 0x75, 0xca, 0x2b, 0x42,
-	0xb1, 0xf1, 0xf5, 0xcb, 0x62, 0x17, 0x28, 0xaa, 0x75, 0x7d, 0x2d, 0x1a, 0x57, 0x86, 0xb6, 0xa1,
-	0x2c, 0x8d, 0x1a, 0xc6, 0x07, 0xba, 0xa7, 0x1b, 0x14, 0x7b, 0x84, 0x79, 0x96, 0xd6, 0xd6, 0xa6,
-	0x9b, 0xad, 0xc9, 0x1e, 0xba, 0x09, 0xd7, 0xce, 0x74, 0x6b, 0x18, 0x16, 0x48, 0x33, 0x81, 0x12,
-	0xdf, 0x90, 0x98, 0xbf, 0x02, 0x25, 0xea, 0x50, 0x7d, 0x28, 0xf3, 0x2e, 0x32, 0xde, 0x55, 0x46,
-	0x97, 0x58, 0x77, 0x20, 0x4f, 0xc6, 0xa7, 0x23, 0x8b, 0xf6, 0xfd, 0xd1, 0x9c, 0x4d, 0x01, 0xf9,
-	0x46, 0x35, 0x70, 0x34, 0x98, 0xdb, 0x6b, 0xbd, 0x60, 0x6e, 0xd7, 0x80, 0xb3, 0xfb, 0x04, 0x15,
-	0x43, 0x86, 0x79, 0x86, 0xca, 0x70, 0xad, 0xdb, 0xbb, 0xdf, 0x6b, 0xf7, 0x4f, 0x8e, 0xba, 0xc7,
-	0xed, 0xd6, 0xc1, 0x83, 0x83, 0xf6, 0x5e, 0x69, 0x01, 0xe5, 0x61, 0x59, 0x3b, 0x39, 0x3a, 0x3a,
-	0x38, 0xea, 0x94, 0x14, 0x54, 0x80, 0x5c, 0xf7, 0xa4, 0xd5, 0x6a, 0xb7, 0xf7, 0xda, 0x7b, 0xa5,
-	0x14, 0x02, 0x58, 0x7a, 0x70, 0xff, 0xe0, 0xb0, 0xbd, 0x57, 0x4a, 0xa3, 0x22, 0x40, 0xeb, 0xfe,
-	0x51, 0xab, 0x7d, 0x78, 0xe8, 0xb3, 0x2e, 0xfa, 0xac, 0x62, 0xdd, 0xde, 0x2b, 0x65, 0xd4, 0x9f,
-	0xa7, 0xa2, 0x11, 0x9a, 0xf4, 0xf6, 0x38, 0x4f, 0x95, 0x78, 0x4f, 0xbf, 0x78, 0xd8, 0x23, 0x58,
-	0x2e, 0x5e, 0x06, 0x4b, 0x74, 0x1b, 0xb2, 0xd8, 0x1e, 0x24, 0x8d, 0xc2, 0x32, 0xb6, 0x07, 0x2c,
-	0x04, 0x23, 0xb8, 0x1e, 0xa4, 0xb6, 0xdc, 0xcf, 0xc2, 0x2d, 0x4b, 0xf9, 0xdc, 0x5a, 0xd6, 0x2f,
-	0x32, 0x90, 0x0d, 0xce, 0x43, 0x08, 0x16, 0x59, 0x5f, 0xe7, 0xb7, 0x94, 0xfd, 0x46, 0xa7, 0xd2,
-	0x60, 0xe0, 0xea, 0x96, 0x27, 0x06, 0xda, 0x9d, 0x04, 0x67, 0x0b, 0xb5, 0x35, 0xb9, 0x9c, 0x1f,
-	0xeb, 0x96, 0xb7, 0xbf, 0x30, 0x9d, 0x2b, 0xfc, 0x35, 0x7a, 0x04, 0x28, 0xdc, 0x0e, 0xfa, 0x44,
-	0x4c, 0x04, 0x57, 0x3f, 0x88, 0x74, 0x31, 0xdd, 0x5f, 0xd0, 0x4a, 0xc3, 0x08, 0x0d, 0x7d, 0x17,
-	0x56, 0xe4, 0x6a, 0x2f, 0x62, 0x73, 0x3b, 0xf9, 0x31, 0x72, 0xd1, 0xcf, 0x4b, 0x45, 0xdf, 0xff,
-	0x80, 0xc5, 0x7e, 0xb1, 0xeb, 0x1b, 0xce, 0xd8, 0xa6, 0xac, 0xe2, 0x67, 0x34, 0x60, 0xa4, 0x96,
-	0x4f, 0x89, 0xe6, 0xd3, 0xf2, 0x95, 0xf3, 0x29, 0x9b, 0x38, 0x9f, 0xaa, 0x8f, 0xa1, 0x14, 0xc5,
-	0xff, 0xc2, 0xbe, 0xad, 0x5c, 0xfa, 0xb3, 0x37, 0x75, 0xd1, 0x67, 0x6f, 0xf5, 0xcd, 0xf0, 0xb9,
-	0x0c, 0xfa, 0xd7, 0xa0, 0x18, 0x69, 0xfb, 0xfc, 0x6b, 0xbd, 0x10, 0x0a, 0xd2, 0x6e, 0x5e, 0x1a,
-	0x7a, 0xd5, 0x1f, 0x40, 0xb9, 0xe5, 0x61, 0x9d, 0xe2, 0x00, 0xfe, 0x79, 0x43, 0xc9, 0x03, 0xe9,
-	0x89, 0x81, 0xb7, 0x96, 0xad, 0xe4, 0xb1, 0x9d, 0x3e, 0x47, 0xa8, 0x9b, 0x80, 0x3a, 0x98, 0x46,
-	0x4f, 0x8d, 0xb9, 0x22, 0xea, 0x4d, 0xff, 0x63, 0x6c, 0x88, 0x67, 0x4d, 0x8c, 0x63, 0xfe, 0xb1,
-	0x02, 0xe5, 0x43, 0x8b, 0xd0, 0x69, 0x83, 0x9c, 0xe7, 0xd0, 0x0d, 0xc8, 0xb9, 0x3e, 0x62, 0xc4,
-	0x7a, 0xca, 0x01, 0xcf, 0x68, 0x59, 0x9f, 0xd0, 0xb5, 0x9e, 0x62, 0xf4, 0x22, 0x00, 0xdb, 0xa4,
-	0xce, 0x23, 0x6c, 0x8b, 0x8f, 0x13, 0xc6, 0xde, 0xf3, 0x09, 0xbe, 0xce, 0x33, 0x6b, 0x48, 0xb1,
-	0x27, 0xbe, 0xfb, 0xc4, 0x4a, 0xfd, 0xa9, 0x02, 0xeb, 0x51, 0x2b, 0x44, 0x05, 0xfe, 0x56, 0x68,
-	0xc8, 0xe0, 0xdf, 0x1c, 0x97, 0x41, 0x50, 0x92, 0x46, 0x5f, 0x82, 0x55, 0x1b, 0x3f, 0xa1, 0x7d,
-	0xc9, 0x44, 0x9e, 0x31, 0x05, 0x9f, 0x7c, 0x1c, 0x98, 0xa9, 0xfe, 0x26, 0x05, 0xeb, 0xe1, 0x28,
-	0x4f, 0x5a, 0x76, 0x5c, 0x4d, 0x9a, 0xb4, 0xf1, 0x54, 0xd2, 0x36, 0x1e, 0xaf, 0x3c, 0xdc, 0xc6,
-	0x23, 0xb7, 0x33, 0xfd, 0xdf, 0xd8, 0x39, 0x7d, 0xa0, 0xc2, 0xb9, 0xf6, 0x39, 0x03, 0x15, 0xaf,
-	0xfc, 0x7f, 0x0f, 0xa8, 0x5f, 0x29, 0x51, 0xa0, 0x26, 0x09, 0x1e, 0x07, 0x54, 0xc4, 0xa5, 0xd4,
-	0x95, 0x2b, 0x73, 0x3a, 0x71, 0x65, 0x6e, 0x7c, 0xbc, 0x02, 0x48, 0x7a, 0xb1, 0xea, 0xf2, 0xd7,
-	0x5c, 0xf4, 0x67, 0x05, 0x0a, 0xa1, 0x49, 0x17, 0xbd, 0x71, 0xc9, 0xd1, 0x58, 0x14, 0x94, 0xea,
-	0x9d, 0x4b, 0xcb, 0x71, 0x84, 0xd4, 0xfb, 0x9f, 0xfc, 0xe3, 0x9f, 0x3f, 0x4b, 0xed, 0xa8, 0x6f,
-	0x4c, 0x9e, 0x9d, 0x7f, 0xc8, 0x6b, 0xd1, 0x3d, 0xd7, 0x73, 0x3e, 0xc4, 0x06, 0x25, 0xf5, 0xad,
-	0xfa, 0xd0, 0x31, 0xf8, 0xd3, 0x5b, 0x7d, 0xeb, 0xa3, 0x26, 0x95, 0xf5, 0x34, 0x95, 0x2d, 0xf4,
-	0x17, 0x05, 0x8a, 0xe1, 0xe7, 0x1b, 0x74, 0x27, 0xe9, 0x1b, 0x4d, 0xe4, 0x4d, 0xab, 0x7a, 0xf7,
-	0xf2, 0x82, 0xc2, 0x91, 0x5d, 0xe6, 0xc8, 0x5b, 0xea, 0x9d, 0xc4, 0x8e, 0x0c, 0x42, 0x8a, 0x7c,
-	0x4f, 0xfe, 0xae, 0x40, 0x39, 0xf6, 0x6d, 0x08, 0x25, 0xb8, 0x4e, 0xcf, 0x7a, 0x54, 0xaa, 0xde,
-	0xba, 0xc2, 0x4b, 0x0e, 0x51, 0x5b, 0xcc, 0xa7, 0x7b, 0x68, 0x27, 0xa9, 0x4f, 0x75, 0x32, 0x6b,
-	0xfa, 0x1f, 0x15, 0x40, 0xb3, 0x9f, 0x85, 0x68, 0xe7, 0x39, 0x3e, 0x26, 0xab, 0x2f, 0x06, 0xc2,
-	0xd2, 0x3f, 0x08, 0xb5, 0x77, 0x82, 0x7f, 0x10, 0xd4, 0x07, 0xcc, 0xee, 0x6f, 0xaa, 0x89, 0xed,
-	0x6e, 0x9e, 0xce, 0x1c, 0xe5, 0xc7, 0xe3, 0x0f, 0x0a, 0x14, 0xc3, 0xe5, 0x3c, 0x49, 0x66, 0xc5,
-	0xce, 0x10, 0xf3, 0x4c, 0x6e, 0x33, 0x93, 0xbf, 0xa1, 0x6e, 0x27, 0x86, 0x7a, 0xda, 0xfb, 0x9a,
-	0xd3, 0x3f, 0x36, 0xfe, 0xa4, 0x40, 0x31, 0xdc, 0x6c, 0x93, 0x58, 0x1c, 0x3b, 0x24, 0x24, 0xb9,
-	0x0b, 0xf1, 0x7d, 0x5d, 0xdd, 0x61, 0xce, 0xdc, 0x46, 0x57, 0x71, 0x06, 0xfd, 0x5e, 0x81, 0xbc,
-	0x34, 0x0d, 0xa1, 0x5b, 0x89, 0x52, 0x3f, 0x0a, 0xf7, 0x25, 0xc6, 0x88, 0x38, 0x73, 0xfd, 0x4a,
-	0x7d, 0x81, 0xb1, 0x92, 0xad, 0xf5, 0xad, 0x8f, 0xd0, 0xaf, 0x59, 0xf5, 0x91, 0xab, 0x7f, 0xb2,
-	0xea, 0x13, 0x33, 0xc4, 0xcd, 0xcb, 0x11, 0x61, 0xe7, 0xd6, 0x55, 0xec, 0xdc, 0xfd, 0x97, 0x02,
-	0xaa, 0xe1, 0x8c, 0xe2, 0x4d, 0xc3, 0x81, 0x61, 0xbb, 0xff, 0x37, 0xdb, 0x26, 0x8e, 0xfd, 0xc6,
-	0x72, 0xac, 0xbc, 0xdf, 0x11, 0xa2, 0xa6, 0xe3, 0x8f, 0xcc, 0x35, 0xc7, 0x33, 0xeb, 0x26, 0xb6,
-	0x59, 0xdb, 0xa9, 0xf3, 0x2d, 0xdd, 0xb5, 0xc8, 0x45, 0x7f, 0x27, 0xee, 0x4c, 0x28, 0xff, 0x56,
-	0x94, 0xdf, 0xa5, 0x5e, 0xea, 0x70, 0x65, 0x2d, 0x66, 0xc7, 0xe4, 0xe6, 0xd5, 0xde, 0xdb, 0xde,
-	0xf5, 0xb9, 0xff, 0x1a, 0x30, 0x3c, 0x64, 0x0c, 0x0f, 0x27, 0x0c, 0x0f, 0xdf, 0xe3, 0xea, 0x3e,
-	0x4b, 0xbd, 0xc2, 0x19, 0x9a, 0x4d, 0xc6, 0xd1, 0x6c, 0x4e, 0x58, 0x9a, 0x4d, 0xc1, 0x73, 0xba,
-	0xc4, 0x8c, 0xdb, 0xfe, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xe5, 0x9e, 0x13, 0xea, 0x1c,
-	0x00, 0x00,
-}
diff --git a/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
index 117b208ed8..1e33712dac 100644
--- a/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Video annotation feature.
 type Feature int32
@@ -60,6 +60,7 @@ var Feature_name = map[int32]string{
 	7: "TEXT_DETECTION",
 	9: "OBJECT_TRACKING",
 }
+
 var Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":        0,
 	"LABEL_DETECTION":            1,
@@ -74,8 +75,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
+
 func (Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{0}
+	return fileDescriptor_7638dbca9a7e63fa, []int{0}
 }
 
 // Label detection mode.
@@ -98,6 +100,7 @@ var LabelDetectionMode_name = map[int32]string{
 	2: "FRAME_MODE",
 	3: "SHOT_AND_FRAME_MODE",
 }
+
 var LabelDetectionMode_value = map[string]int32{
 	"LABEL_DETECTION_MODE_UNSPECIFIED": 0,
 	"SHOT_MODE":                        1,
@@ -108,8 +111,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
+
 func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{1}
+	return fileDescriptor_7638dbca9a7e63fa, []int{1}
 }
 
 // Bucketized representation of likelihood.
@@ -138,6 +142,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"LIKELIHOOD_UNSPECIFIED": 0,
 	"VERY_UNLIKELY":          1,
@@ -150,8 +155,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{2}
+	return fileDescriptor_7638dbca9a7e63fa, []int{2}
 }
 
 // Video annotation request.
@@ -195,16 +201,17 @@ func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
 func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoRequest) ProtoMessage()    {}
 func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{0}
+	return fileDescriptor_7638dbca9a7e63fa, []int{0}
 }
+
 func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
 }
 func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+func (m *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(m, src)
 }
 func (m *AnnotateVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
@@ -284,16 +291,17 @@ func (m *VideoContext) Reset()         { *m = VideoContext{} }
 func (m *VideoContext) String() string { return proto.CompactTextString(m) }
 func (*VideoContext) ProtoMessage()    {}
 func (*VideoContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{1}
+	return fileDescriptor_7638dbca9a7e63fa, []int{1}
 }
+
 func (m *VideoContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
 }
 func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
 }
-func (dst *VideoContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoContext.Merge(dst, src)
+func (m *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(m, src)
 }
 func (m *VideoContext) XXX_Size() int {
 	return xxx_messageInfo_VideoContext.Size(m)
@@ -376,16 +384,17 @@ func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
 func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*LabelDetectionConfig) ProtoMessage()    {}
 func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{2}
+	return fileDescriptor_7638dbca9a7e63fa, []int{2}
 }
+
 func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
 }
 func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+func (m *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(m, src)
 }
 func (m *LabelDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_LabelDetectionConfig.Size(m)
@@ -432,16 +441,17 @@ func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionCo
 func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ShotChangeDetectionConfig) ProtoMessage()    {}
 func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{3}
+	return fileDescriptor_7638dbca9a7e63fa, []int{3}
 }
+
 func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
 }
 func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+func (m *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(m, src)
 }
 func (m *ShotChangeDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
@@ -474,16 +484,17 @@ func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentD
 func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
 func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{4}
+	return fileDescriptor_7638dbca9a7e63fa, []int{4}
 }
+
 func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+func (m *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(m, src)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
@@ -518,16 +529,17 @@ func (m *FaceDetectionConfig) Reset()         { *m = FaceDetectionConfig{} }
 func (m *FaceDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*FaceDetectionConfig) ProtoMessage()    {}
 func (*FaceDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{5}
+	return fileDescriptor_7638dbca9a7e63fa, []int{5}
 }
+
 func (m *FaceDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceDetectionConfig.Unmarshal(m, b)
 }
 func (m *FaceDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *FaceDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceDetectionConfig.Merge(dst, src)
+func (m *FaceDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceDetectionConfig.Merge(m, src)
 }
 func (m *FaceDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_FaceDetectionConfig.Size(m)
@@ -569,16 +581,17 @@ func (m *TextDetectionConfig) Reset()         { *m = TextDetectionConfig{} }
 func (m *TextDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*TextDetectionConfig) ProtoMessage()    {}
 func (*TextDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{6}
+	return fileDescriptor_7638dbca9a7e63fa, []int{6}
 }
+
 func (m *TextDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextDetectionConfig.Unmarshal(m, b)
 }
 func (m *TextDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *TextDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextDetectionConfig.Merge(dst, src)
+func (m *TextDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextDetectionConfig.Merge(m, src)
 }
 func (m *TextDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_TextDetectionConfig.Size(m)
@@ -613,16 +626,17 @@ func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
 func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
 func (*VideoSegment) ProtoMessage()    {}
 func (*VideoSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{7}
+	return fileDescriptor_7638dbca9a7e63fa, []int{7}
 }
+
 func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
 }
 func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
 }
-func (dst *VideoSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoSegment.Merge(dst, src)
+func (m *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(m, src)
 }
 func (m *VideoSegment) XXX_Size() int {
 	return xxx_messageInfo_VideoSegment.Size(m)
@@ -662,16 +676,17 @@ func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
 func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
 func (*LabelSegment) ProtoMessage()    {}
 func (*LabelSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{8}
+	return fileDescriptor_7638dbca9a7e63fa, []int{8}
 }
+
 func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
 }
 func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
 }
-func (dst *LabelSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelSegment.Merge(dst, src)
+func (m *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(m, src)
 }
 func (m *LabelSegment) XXX_Size() int {
 	return xxx_messageInfo_LabelSegment.Size(m)
@@ -712,16 +727,17 @@ func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
 func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
 func (*LabelFrame) ProtoMessage()    {}
 func (*LabelFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{9}
+	return fileDescriptor_7638dbca9a7e63fa, []int{9}
 }
+
 func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
 }
 func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
 }
-func (dst *LabelFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelFrame.Merge(dst, src)
+func (m *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(m, src)
 }
 func (m *LabelFrame) XXX_Size() int {
 	return xxx_messageInfo_LabelFrame.Size(m)
@@ -765,16 +781,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{10}
+	return fileDescriptor_7638dbca9a7e63fa, []int{10}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -828,16 +845,17 @@ func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
 func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LabelAnnotation) ProtoMessage()    {}
 func (*LabelAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{11}
+	return fileDescriptor_7638dbca9a7e63fa, []int{11}
 }
+
 func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
 }
 func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+func (m *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(m, src)
 }
 func (m *LabelAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LabelAnnotation.Size(m)
@@ -892,16 +910,17 @@ func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
 func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentFrame) ProtoMessage()    {}
 func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{12}
+	return fileDescriptor_7638dbca9a7e63fa, []int{12}
 }
+
 func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
 }
 func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+func (m *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(m, src)
 }
 func (m *ExplicitContentFrame) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentFrame.Size(m)
@@ -941,16 +960,17 @@ func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnota
 func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentAnnotation) ProtoMessage()    {}
 func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{13}
+	return fileDescriptor_7638dbca9a7e63fa, []int{13}
 }
+
 func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
 }
 func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+func (m *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(m, src)
 }
 func (m *ExplicitContentAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
@@ -989,16 +1009,17 @@ func (m *NormalizedBoundingBox) Reset()         { *m = NormalizedBoundingBox{} }
 func (m *NormalizedBoundingBox) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingBox) ProtoMessage()    {}
 func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{14}
+	return fileDescriptor_7638dbca9a7e63fa, []int{14}
 }
+
 func (m *NormalizedBoundingBox) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingBox.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingBox.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingBox.Merge(dst, src)
+func (m *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingBox.Merge(m, src)
 }
 func (m *NormalizedBoundingBox) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingBox.Size(m)
@@ -1050,16 +1071,17 @@ func (m *FaceSegment) Reset()         { *m = FaceSegment{} }
 func (m *FaceSegment) String() string { return proto.CompactTextString(m) }
 func (*FaceSegment) ProtoMessage()    {}
 func (*FaceSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{15}
+	return fileDescriptor_7638dbca9a7e63fa, []int{15}
 }
+
 func (m *FaceSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceSegment.Unmarshal(m, b)
 }
 func (m *FaceSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceSegment.Marshal(b, m, deterministic)
 }
-func (dst *FaceSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceSegment.Merge(dst, src)
+func (m *FaceSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceSegment.Merge(m, src)
 }
 func (m *FaceSegment) XXX_Size() int {
 	return xxx_messageInfo_FaceSegment.Size(m)
@@ -1095,16 +1117,17 @@ func (m *FaceFrame) Reset()         { *m = FaceFrame{} }
 func (m *FaceFrame) String() string { return proto.CompactTextString(m) }
 func (*FaceFrame) ProtoMessage()    {}
 func (*FaceFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{16}
+	return fileDescriptor_7638dbca9a7e63fa, []int{16}
 }
+
 func (m *FaceFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceFrame.Unmarshal(m, b)
 }
 func (m *FaceFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceFrame.Marshal(b, m, deterministic)
 }
-func (dst *FaceFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceFrame.Merge(dst, src)
+func (m *FaceFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceFrame.Merge(m, src)
 }
 func (m *FaceFrame) XXX_Size() int {
 	return xxx_messageInfo_FaceFrame.Size(m)
@@ -1146,16 +1169,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{17}
+	return fileDescriptor_7638dbca9a7e63fa, []int{17}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -1227,16 +1251,17 @@ func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{}
 func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationResults) ProtoMessage()    {}
 func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{18}
+	return fileDescriptor_7638dbca9a7e63fa, []int{18}
 }
+
 func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
 }
 func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+func (m *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(m, src)
 }
 func (m *VideoAnnotationResults) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationResults.Size(m)
@@ -1339,16 +1364,17 @@ func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
 func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoResponse) ProtoMessage()    {}
 func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{19}
+	return fileDescriptor_7638dbca9a7e63fa, []int{19}
 }
+
 func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
 }
 func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+func (m *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(m, src)
 }
 func (m *AnnotateVideoResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
@@ -1387,16 +1413,17 @@ func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress
 func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationProgress) ProtoMessage()    {}
 func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{20}
+	return fileDescriptor_7638dbca9a7e63fa, []int{20}
 }
+
 func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
 }
 func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+func (m *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(m, src)
 }
 func (m *VideoAnnotationProgress) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
@@ -1450,16 +1477,17 @@ func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
 func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoProgress) ProtoMessage()    {}
 func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{21}
+	return fileDescriptor_7638dbca9a7e63fa, []int{21}
 }
+
 func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
 }
 func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+func (m *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(m, src)
 }
 func (m *AnnotateVideoProgress) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
@@ -1534,16 +1562,17 @@ func (m *SpeechTranscriptionConfig) Reset()         { *m = SpeechTranscriptionCo
 func (m *SpeechTranscriptionConfig) String() string { return proto.CompactTextString(m) }
 func (*SpeechTranscriptionConfig) ProtoMessage()    {}
 func (*SpeechTranscriptionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{22}
+	return fileDescriptor_7638dbca9a7e63fa, []int{22}
 }
+
 func (m *SpeechTranscriptionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechTranscriptionConfig.Unmarshal(m, b)
 }
 func (m *SpeechTranscriptionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechTranscriptionConfig.Marshal(b, m, deterministic)
 }
-func (dst *SpeechTranscriptionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechTranscriptionConfig.Merge(dst, src)
+func (m *SpeechTranscriptionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechTranscriptionConfig.Merge(m, src)
 }
 func (m *SpeechTranscriptionConfig) XXX_Size() int {
 	return xxx_messageInfo_SpeechTranscriptionConfig.Size(m)
@@ -1636,16 +1665,17 @@ func (m *SpeechContext) Reset()         { *m = SpeechContext{} }
 func (m *SpeechContext) String() string { return proto.CompactTextString(m) }
 func (*SpeechContext) ProtoMessage()    {}
 func (*SpeechContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{23}
+	return fileDescriptor_7638dbca9a7e63fa, []int{23}
 }
+
 func (m *SpeechContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechContext.Unmarshal(m, b)
 }
 func (m *SpeechContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechContext.Marshal(b, m, deterministic)
 }
-func (dst *SpeechContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechContext.Merge(dst, src)
+func (m *SpeechContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechContext.Merge(m, src)
 }
 func (m *SpeechContext) XXX_Size() int {
 	return xxx_messageInfo_SpeechContext.Size(m)
@@ -1684,16 +1714,17 @@ func (m *SpeechTranscription) Reset()         { *m = SpeechTranscription{} }
 func (m *SpeechTranscription) String() string { return proto.CompactTextString(m) }
 func (*SpeechTranscription) ProtoMessage()    {}
 func (*SpeechTranscription) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{24}
+	return fileDescriptor_7638dbca9a7e63fa, []int{24}
 }
+
 func (m *SpeechTranscription) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechTranscription.Unmarshal(m, b)
 }
 func (m *SpeechTranscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechTranscription.Marshal(b, m, deterministic)
 }
-func (dst *SpeechTranscription) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechTranscription.Merge(dst, src)
+func (m *SpeechTranscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechTranscription.Merge(m, src)
 }
 func (m *SpeechTranscription) XXX_Size() int {
 	return xxx_messageInfo_SpeechTranscription.Size(m)
@@ -1740,16 +1771,17 @@ func (m *SpeechRecognitionAlternative) Reset()         { *m = SpeechRecognitionA
 func (m *SpeechRecognitionAlternative) String() string { return proto.CompactTextString(m) }
 func (*SpeechRecognitionAlternative) ProtoMessage()    {}
 func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{25}
+	return fileDescriptor_7638dbca9a7e63fa, []int{25}
 }
+
 func (m *SpeechRecognitionAlternative) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Unmarshal(m, b)
 }
 func (m *SpeechRecognitionAlternative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Marshal(b, m, deterministic)
 }
-func (dst *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechRecognitionAlternative.Merge(dst, src)
+func (m *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionAlternative.Merge(m, src)
 }
 func (m *SpeechRecognitionAlternative) XXX_Size() int {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Size(m)
@@ -1818,16 +1850,17 @@ func (m *WordInfo) Reset()         { *m = WordInfo{} }
 func (m *WordInfo) String() string { return proto.CompactTextString(m) }
 func (*WordInfo) ProtoMessage()    {}
 func (*WordInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{26}
+	return fileDescriptor_7638dbca9a7e63fa, []int{26}
 }
+
 func (m *WordInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WordInfo.Unmarshal(m, b)
 }
 func (m *WordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WordInfo.Marshal(b, m, deterministic)
 }
-func (dst *WordInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WordInfo.Merge(dst, src)
+func (m *WordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WordInfo.Merge(m, src)
 }
 func (m *WordInfo) XXX_Size() int {
 	return xxx_messageInfo_WordInfo.Size(m)
@@ -1890,16 +1923,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{27}
+	return fileDescriptor_7638dbca9a7e63fa, []int{27}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -1953,16 +1987,17 @@ func (m *NormalizedBoundingPoly) Reset()         { *m = NormalizedBoundingPoly{}
 func (m *NormalizedBoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingPoly) ProtoMessage()    {}
 func (*NormalizedBoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{28}
+	return fileDescriptor_7638dbca9a7e63fa, []int{28}
 }
+
 func (m *NormalizedBoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingPoly.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingPoly.Merge(dst, src)
+func (m *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingPoly.Merge(m, src)
 }
 func (m *NormalizedBoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingPoly.Size(m)
@@ -1998,16 +2033,17 @@ func (m *TextSegment) Reset()         { *m = TextSegment{} }
 func (m *TextSegment) String() string { return proto.CompactTextString(m) }
 func (*TextSegment) ProtoMessage()    {}
 func (*TextSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{29}
+	return fileDescriptor_7638dbca9a7e63fa, []int{29}
 }
+
 func (m *TextSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSegment.Unmarshal(m, b)
 }
 func (m *TextSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSegment.Marshal(b, m, deterministic)
 }
-func (dst *TextSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSegment.Merge(dst, src)
+func (m *TextSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSegment.Merge(m, src)
 }
 func (m *TextSegment) XXX_Size() int {
 	return xxx_messageInfo_TextSegment.Size(m)
@@ -2056,16 +2092,17 @@ func (m *TextFrame) Reset()         { *m = TextFrame{} }
 func (m *TextFrame) String() string { return proto.CompactTextString(m) }
 func (*TextFrame) ProtoMessage()    {}
 func (*TextFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{30}
+	return fileDescriptor_7638dbca9a7e63fa, []int{30}
 }
+
 func (m *TextFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextFrame.Unmarshal(m, b)
 }
 func (m *TextFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextFrame.Marshal(b, m, deterministic)
 }
-func (dst *TextFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextFrame.Merge(dst, src)
+func (m *TextFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextFrame.Merge(m, src)
 }
 func (m *TextFrame) XXX_Size() int {
 	return xxx_messageInfo_TextFrame.Size(m)
@@ -2107,16 +2144,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{31}
+	return fileDescriptor_7638dbca9a7e63fa, []int{31}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -2157,16 +2195,17 @@ func (m *ObjectTrackingFrame) Reset()         { *m = ObjectTrackingFrame{} }
 func (m *ObjectTrackingFrame) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingFrame) ProtoMessage()    {}
 func (*ObjectTrackingFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{32}
+	return fileDescriptor_7638dbca9a7e63fa, []int{32}
 }
+
 func (m *ObjectTrackingFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingFrame.Unmarshal(m, b)
 }
 func (m *ObjectTrackingFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingFrame.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingFrame.Merge(dst, src)
+func (m *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingFrame.Merge(m, src)
 }
 func (m *ObjectTrackingFrame) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingFrame.Size(m)
@@ -2218,16 +2257,17 @@ func (m *ObjectTrackingAnnotation) Reset()         { *m = ObjectTrackingAnnotati
 func (m *ObjectTrackingAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingAnnotation) ProtoMessage()    {}
 func (*ObjectTrackingAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_c8b048fd49d4d016, []int{33}
+	return fileDescriptor_7638dbca9a7e63fa, []int{33}
 }
+
 func (m *ObjectTrackingAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Unmarshal(m, b)
 }
 func (m *ObjectTrackingAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingAnnotation.Merge(dst, src)
+func (m *ObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingAnnotation.Merge(m, src)
 }
 func (m *ObjectTrackingAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Size(m)
@@ -2296,76 +2336,18 @@ func (m *ObjectTrackingAnnotation) GetFrames() []*ObjectTrackingFrame {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ObjectTrackingAnnotation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ObjectTrackingAnnotation_OneofMarshaler, _ObjectTrackingAnnotation_OneofUnmarshaler, _ObjectTrackingAnnotation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ObjectTrackingAnnotation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ObjectTrackingAnnotation_Segment)(nil),
 		(*ObjectTrackingAnnotation_TrackId)(nil),
 	}
 }
 
-func _ObjectTrackingAnnotation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ObjectTrackingAnnotation)
-	// track_info
-	switch x := m.TrackInfo.(type) {
-	case *ObjectTrackingAnnotation_Segment:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Segment); err != nil {
-			return err
-		}
-	case *ObjectTrackingAnnotation_TrackId:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.TrackId))
-	case nil:
-	default:
-		return fmt.Errorf("ObjectTrackingAnnotation.TrackInfo has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ObjectTrackingAnnotation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ObjectTrackingAnnotation)
-	switch tag {
-	case 3: // track_info.segment
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoSegment)
-		err := b.DecodeMessage(msg)
-		m.TrackInfo = &ObjectTrackingAnnotation_Segment{msg}
-		return true, err
-	case 5: // track_info.track_id
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TrackInfo = &ObjectTrackingAnnotation_TrackId{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ObjectTrackingAnnotation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ObjectTrackingAnnotation)
-	// track_info
-	switch x := m.TrackInfo.(type) {
-	case *ObjectTrackingAnnotation_Segment:
-		s := proto.Size(x.Segment)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ObjectTrackingAnnotation_TrackId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.TrackId))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.videointelligence.v1.Feature", Feature_name, Feature_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1.Likelihood", Likelihood_name, Likelihood_value)
 	proto.RegisterType((*AnnotateVideoRequest)(nil), "google.cloud.videointelligence.v1.AnnotateVideoRequest")
 	proto.RegisterType((*VideoContext)(nil), "google.cloud.videointelligence.v1.VideoContext")
 	proto.RegisterType((*LabelDetectionConfig)(nil), "google.cloud.videointelligence.v1.LabelDetectionConfig")
@@ -2400,96 +2382,13 @@ func init() {
 	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.videointelligence.v1.TextAnnotation")
 	proto.RegisterType((*ObjectTrackingFrame)(nil), "google.cloud.videointelligence.v1.ObjectTrackingFrame")
 	proto.RegisterType((*ObjectTrackingAnnotation)(nil), "google.cloud.videointelligence.v1.ObjectTrackingAnnotation")
-	proto.RegisterEnum("google.cloud.videointelligence.v1.Feature", Feature_name, Feature_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1.Likelihood", Likelihood_name, Likelihood_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type VideoIntelligenceServiceClient interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-}
-
-type videoIntelligenceServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
-	return &videoIntelligenceServiceClient{cc}
-}
-
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
-	out := new(longrunning.Operation)
-	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
-type VideoIntelligenceServiceServer interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
-}
-
-func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
-	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
-}
-
-func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AnnotateVideoRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.videointelligence.v1.VideoIntelligenceService/AnnotateVideo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.videointelligence.v1.VideoIntelligenceService",
-	HandlerType: (*VideoIntelligenceServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "AnnotateVideo",
-			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/videointelligence/v1/video_intelligence.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1/video_intelligence.proto", fileDescriptor_video_intelligence_c8b048fd49d4d016)
+	proto.RegisterFile("google/cloud/videointelligence/v1/video_intelligence.proto", fileDescriptor_7638dbca9a7e63fa)
 }
 
-var fileDescriptor_video_intelligence_c8b048fd49d4d016 = []byte{
+var fileDescriptor_7638dbca9a7e63fa = []byte{
 	// 2462 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcb, 0x6f, 0x1b, 0xc9,
 	0xd1, 0xdf, 0x21, 0x45, 0x89, 0x2c, 0x52, 0x12, 0xdd, 0x7a, 0x51, 0xb2, 0x2d, 0xcb, 0xb3, 0xdf,
@@ -2646,3 +2545,83 @@ var fileDescriptor_video_intelligence_c8b048fd49d4d016 = []byte{
 	0x0c, 0x78, 0x5e, 0x73, 0x9e, 0xd7, 0x11, 0x9e, 0xd7, 0x47, 0x1b, 0xc7, 0x93, 0xdc, 0x8c, 0x8f,
 	0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x74, 0x61, 0x19, 0xe7, 0xf5, 0x1f, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type VideoIntelligenceServiceClient interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type videoIntelligenceServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
+	return &videoIntelligenceServiceClient{cc}
+}
+
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
+type VideoIntelligenceServiceServer interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
+}
+
+func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
+	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
+}
+
+func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AnnotateVideoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.videointelligence.v1.VideoIntelligenceService/AnnotateVideo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.videointelligence.v1.VideoIntelligenceService",
+	HandlerType: (*VideoIntelligenceServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "AnnotateVideo",
+			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/videointelligence/v1/video_intelligence.proto",
+}
diff --git a/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
index cb2a0a311e..827593c3b5 100644
--- a/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1beta1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Video annotation feature.
 type Feature int32
@@ -50,6 +50,7 @@ var Feature_name = map[int32]string{
 	3: "SHOT_CHANGE_DETECTION",
 	4: "SAFE_SEARCH_DETECTION",
 }
+
 var Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":   0,
 	"LABEL_DETECTION":       1,
@@ -61,8 +62,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
+
 func (Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{0}
+	return fileDescriptor_bda050609d2e9d85, []int{0}
 }
 
 // Label level (scope).
@@ -89,6 +91,7 @@ var LabelLevel_name = map[int32]string{
 	3: "SHOT_LEVEL",
 	4: "FRAME_LEVEL",
 }
+
 var LabelLevel_value = map[string]int32{
 	"LABEL_LEVEL_UNSPECIFIED": 0,
 	"VIDEO_LEVEL":             1,
@@ -100,8 +103,9 @@ var LabelLevel_value = map[string]int32{
 func (x LabelLevel) String() string {
 	return proto.EnumName(LabelLevel_name, int32(x))
 }
+
 func (LabelLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{1}
+	return fileDescriptor_bda050609d2e9d85, []int{1}
 }
 
 // Label detection mode.
@@ -124,6 +128,7 @@ var LabelDetectionMode_name = map[int32]string{
 	2: "FRAME_MODE",
 	3: "SHOT_AND_FRAME_MODE",
 }
+
 var LabelDetectionMode_value = map[string]int32{
 	"LABEL_DETECTION_MODE_UNSPECIFIED": 0,
 	"SHOT_MODE":                        1,
@@ -134,8 +139,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
+
 func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{2}
+	return fileDescriptor_bda050609d2e9d85, []int{2}
 }
 
 // Bucketized representation of likelihood.
@@ -164,6 +170,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"UNKNOWN":       0,
 	"VERY_UNLIKELY": 1,
@@ -176,8 +183,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{3}
+	return fileDescriptor_bda050609d2e9d85, []int{3}
 }
 
 // Video annotation request.
@@ -220,16 +228,17 @@ func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
 func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoRequest) ProtoMessage()    {}
 func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{0}
+	return fileDescriptor_bda050609d2e9d85, []int{0}
 }
+
 func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
 }
 func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+func (m *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(m, src)
 }
 func (m *AnnotateVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
@@ -316,16 +325,17 @@ func (m *VideoContext) Reset()         { *m = VideoContext{} }
 func (m *VideoContext) String() string { return proto.CompactTextString(m) }
 func (*VideoContext) ProtoMessage()    {}
 func (*VideoContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{1}
+	return fileDescriptor_bda050609d2e9d85, []int{1}
 }
+
 func (m *VideoContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
 }
 func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
 }
-func (dst *VideoContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoContext.Merge(dst, src)
+func (m *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(m, src)
 }
 func (m *VideoContext) XXX_Size() int {
 	return xxx_messageInfo_VideoContext.Size(m)
@@ -400,16 +410,17 @@ func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
 func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
 func (*VideoSegment) ProtoMessage()    {}
 func (*VideoSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{2}
+	return fileDescriptor_bda050609d2e9d85, []int{2}
 }
+
 func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
 }
 func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
 }
-func (dst *VideoSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoSegment.Merge(dst, src)
+func (m *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(m, src)
 }
 func (m *VideoSegment) XXX_Size() int {
 	return xxx_messageInfo_VideoSegment.Size(m)
@@ -454,16 +465,17 @@ func (m *LabelLocation) Reset()         { *m = LabelLocation{} }
 func (m *LabelLocation) String() string { return proto.CompactTextString(m) }
 func (*LabelLocation) ProtoMessage()    {}
 func (*LabelLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{3}
+	return fileDescriptor_bda050609d2e9d85, []int{3}
 }
+
 func (m *LabelLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelLocation.Unmarshal(m, b)
 }
 func (m *LabelLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelLocation.Marshal(b, m, deterministic)
 }
-func (dst *LabelLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelLocation.Merge(dst, src)
+func (m *LabelLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelLocation.Merge(m, src)
 }
 func (m *LabelLocation) XXX_Size() int {
 	return xxx_messageInfo_LabelLocation.Size(m)
@@ -512,16 +524,17 @@ func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
 func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LabelAnnotation) ProtoMessage()    {}
 func (*LabelAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{4}
+	return fileDescriptor_bda050609d2e9d85, []int{4}
 }
+
 func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
 }
 func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+func (m *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(m, src)
 }
 func (m *LabelAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LabelAnnotation.Size(m)
@@ -581,16 +594,17 @@ func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
 func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
 func (*SafeSearchAnnotation) ProtoMessage()    {}
 func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{5}
+	return fileDescriptor_bda050609d2e9d85, []int{5}
 }
+
 func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
 }
 func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+func (m *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(m, src)
 }
 func (m *SafeSearchAnnotation) XXX_Size() int {
 	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
@@ -662,16 +676,17 @@ func (m *BoundingBox) Reset()         { *m = BoundingBox{} }
 func (m *BoundingBox) String() string { return proto.CompactTextString(m) }
 func (*BoundingBox) ProtoMessage()    {}
 func (*BoundingBox) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{6}
+	return fileDescriptor_bda050609d2e9d85, []int{6}
 }
+
 func (m *BoundingBox) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingBox.Unmarshal(m, b)
 }
 func (m *BoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingBox.Marshal(b, m, deterministic)
 }
-func (dst *BoundingBox) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingBox.Merge(dst, src)
+func (m *BoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingBox.Merge(m, src)
 }
 func (m *BoundingBox) XXX_Size() int {
 	return xxx_messageInfo_BoundingBox.Size(m)
@@ -725,16 +740,17 @@ func (m *FaceLocation) Reset()         { *m = FaceLocation{} }
 func (m *FaceLocation) String() string { return proto.CompactTextString(m) }
 func (*FaceLocation) ProtoMessage()    {}
 func (*FaceLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{7}
+	return fileDescriptor_bda050609d2e9d85, []int{7}
 }
+
 func (m *FaceLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceLocation.Unmarshal(m, b)
 }
 func (m *FaceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceLocation.Marshal(b, m, deterministic)
 }
-func (dst *FaceLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceLocation.Merge(dst, src)
+func (m *FaceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceLocation.Merge(m, src)
 }
 func (m *FaceLocation) XXX_Size() int {
 	return xxx_messageInfo_FaceLocation.Size(m)
@@ -778,16 +794,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{8}
+	return fileDescriptor_bda050609d2e9d85, []int{8}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -844,16 +861,17 @@ func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{}
 func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationResults) ProtoMessage()    {}
 func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{9}
+	return fileDescriptor_bda050609d2e9d85, []int{9}
 }
+
 func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
 }
 func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+func (m *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(m, src)
 }
 func (m *VideoAnnotationResults) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationResults.Size(m)
@@ -921,16 +939,17 @@ func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
 func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoResponse) ProtoMessage()    {}
 func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{10}
+	return fileDescriptor_bda050609d2e9d85, []int{10}
 }
+
 func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
 }
 func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+func (m *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(m, src)
 }
 func (m *AnnotateVideoResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
@@ -969,16 +988,17 @@ func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress
 func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationProgress) ProtoMessage()    {}
 func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{11}
+	return fileDescriptor_bda050609d2e9d85, []int{11}
 }
+
 func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
 }
 func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+func (m *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(m, src)
 }
 func (m *VideoAnnotationProgress) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
@@ -1032,16 +1052,17 @@ func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
 func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoProgress) ProtoMessage()    {}
 func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_3999319c2d69fb16, []int{12}
+	return fileDescriptor_bda050609d2e9d85, []int{12}
 }
+
 func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
 }
 func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+func (m *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(m, src)
 }
 func (m *AnnotateVideoProgress) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
@@ -1060,6 +1081,10 @@ func (m *AnnotateVideoProgress) GetAnnotationProgress() []*VideoAnnotationProgre
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.Feature", Feature_name, Feature_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.LabelLevel", LabelLevel_name, LabelLevel_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.Likelihood", Likelihood_name, Likelihood_value)
 	proto.RegisterType((*AnnotateVideoRequest)(nil), "google.cloud.videointelligence.v1beta1.AnnotateVideoRequest")
 	proto.RegisterType((*VideoContext)(nil), "google.cloud.videointelligence.v1beta1.VideoContext")
 	proto.RegisterType((*VideoSegment)(nil), "google.cloud.videointelligence.v1beta1.VideoSegment")
@@ -1073,97 +1098,13 @@ func init() {
 	proto.RegisterType((*AnnotateVideoResponse)(nil), "google.cloud.videointelligence.v1beta1.AnnotateVideoResponse")
 	proto.RegisterType((*VideoAnnotationProgress)(nil), "google.cloud.videointelligence.v1beta1.VideoAnnotationProgress")
 	proto.RegisterType((*AnnotateVideoProgress)(nil), "google.cloud.videointelligence.v1beta1.AnnotateVideoProgress")
-	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.Feature", Feature_name, Feature_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.LabelLevel", LabelLevel_name, LabelLevel_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1beta1.Likelihood", Likelihood_name, Likelihood_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type VideoIntelligenceServiceClient interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-}
-
-type videoIntelligenceServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
-	return &videoIntelligenceServiceClient{cc}
-}
-
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
-	out := new(longrunning.Operation)
-	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
-type VideoIntelligenceServiceServer interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
-}
-
-func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
-	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
-}
-
-func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AnnotateVideoRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.videointelligence.v1beta1.VideoIntelligenceService/AnnotateVideo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.videointelligence.v1beta1.VideoIntelligenceService",
-	HandlerType: (*VideoIntelligenceServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "AnnotateVideo",
-			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/videointelligence/v1beta1/video_intelligence.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1beta1/video_intelligence.proto", fileDescriptor_video_intelligence_3999319c2d69fb16)
+	proto.RegisterFile("google/cloud/videointelligence/v1beta1/video_intelligence.proto", fileDescriptor_bda050609d2e9d85)
 }
 
-var fileDescriptor_video_intelligence_3999319c2d69fb16 = []byte{
+var fileDescriptor_bda050609d2e9d85 = []byte{
 	// 1520 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcb, 0x6f, 0x1b, 0xd5,
 	0x1a, 0xef, 0xf8, 0x91, 0xc4, 0x9f, 0x93, 0xd8, 0x39, 0x49, 0x1a, 0xdf, 0xb4, 0xb9, 0x8d, 0xdc,
@@ -1261,3 +1202,83 @@ var fileDescriptor_video_intelligence_3999319c2d69fb16 = []byte{
 	0xf5, 0x87, 0x48, 0xf0, 0x05, 0x17, 0x7c, 0x31, 0x25, 0xf8, 0xe2, 0x5c, 0xd8, 0xe8, 0x2e, 0x70,
 	0xaf, 0x1e, 0xfc, 0x11, 0x00, 0x00, 0xff, 0xff, 0xba, 0xc2, 0xb0, 0xa0, 0xd7, 0x10, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type VideoIntelligenceServiceClient interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type videoIntelligenceServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
+	return &videoIntelligenceServiceClient{cc}
+}
+
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
+type VideoIntelligenceServiceServer interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
+}
+
+func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
+	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
+}
+
+func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AnnotateVideoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.videointelligence.v1beta1.VideoIntelligenceService/AnnotateVideo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.videointelligence.v1beta1.VideoIntelligenceService",
+	HandlerType: (*VideoIntelligenceServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "AnnotateVideo",
+			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/videointelligence/v1beta1/video_intelligence.proto",
+}
diff --git a/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
index cf262513e1..a377633fb5 100644
--- a/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1beta2/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Video annotation feature.
 type Feature int32
@@ -51,6 +51,7 @@ var Feature_name = map[int32]string{
 	3: "EXPLICIT_CONTENT_DETECTION",
 	4: "FACE_DETECTION",
 }
+
 var Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":        0,
 	"LABEL_DETECTION":            1,
@@ -62,8 +63,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
+
 func (Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{0}
+	return fileDescriptor_84237f664d80452c, []int{0}
 }
 
 // Label detection mode.
@@ -86,6 +88,7 @@ var LabelDetectionMode_name = map[int32]string{
 	2: "FRAME_MODE",
 	3: "SHOT_AND_FRAME_MODE",
 }
+
 var LabelDetectionMode_value = map[string]int32{
 	"LABEL_DETECTION_MODE_UNSPECIFIED": 0,
 	"SHOT_MODE":                        1,
@@ -96,8 +99,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
+
 func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{1}
+	return fileDescriptor_84237f664d80452c, []int{1}
 }
 
 // Bucketized representation of likelihood.
@@ -126,6 +130,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"LIKELIHOOD_UNSPECIFIED": 0,
 	"VERY_UNLIKELY":          1,
@@ -138,8 +143,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{2}
+	return fileDescriptor_84237f664d80452c, []int{2}
 }
 
 // Video annotation request.
@@ -183,16 +189,17 @@ func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
 func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoRequest) ProtoMessage()    {}
 func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{0}
+	return fileDescriptor_84237f664d80452c, []int{0}
 }
+
 func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
 }
 func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+func (m *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(m, src)
 }
 func (m *AnnotateVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
@@ -268,16 +275,17 @@ func (m *VideoContext) Reset()         { *m = VideoContext{} }
 func (m *VideoContext) String() string { return proto.CompactTextString(m) }
 func (*VideoContext) ProtoMessage()    {}
 func (*VideoContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{1}
+	return fileDescriptor_84237f664d80452c, []int{1}
 }
+
 func (m *VideoContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
 }
 func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
 }
-func (dst *VideoContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoContext.Merge(dst, src)
+func (m *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(m, src)
 }
 func (m *VideoContext) XXX_Size() int {
 	return xxx_messageInfo_VideoContext.Size(m)
@@ -346,16 +354,17 @@ func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
 func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*LabelDetectionConfig) ProtoMessage()    {}
 func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{2}
+	return fileDescriptor_84237f664d80452c, []int{2}
 }
+
 func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
 }
 func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+func (m *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(m, src)
 }
 func (m *LabelDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_LabelDetectionConfig.Size(m)
@@ -402,16 +411,17 @@ func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionCo
 func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ShotChangeDetectionConfig) ProtoMessage()    {}
 func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{3}
+	return fileDescriptor_84237f664d80452c, []int{3}
 }
+
 func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
 }
 func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+func (m *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(m, src)
 }
 func (m *ShotChangeDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
@@ -444,16 +454,17 @@ func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentD
 func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
 func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{4}
+	return fileDescriptor_84237f664d80452c, []int{4}
 }
+
 func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+func (m *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(m, src)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
@@ -488,16 +499,17 @@ func (m *FaceDetectionConfig) Reset()         { *m = FaceDetectionConfig{} }
 func (m *FaceDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*FaceDetectionConfig) ProtoMessage()    {}
 func (*FaceDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{5}
+	return fileDescriptor_84237f664d80452c, []int{5}
 }
+
 func (m *FaceDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceDetectionConfig.Unmarshal(m, b)
 }
 func (m *FaceDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *FaceDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceDetectionConfig.Merge(dst, src)
+func (m *FaceDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceDetectionConfig.Merge(m, src)
 }
 func (m *FaceDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_FaceDetectionConfig.Size(m)
@@ -539,16 +551,17 @@ func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
 func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
 func (*VideoSegment) ProtoMessage()    {}
 func (*VideoSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{6}
+	return fileDescriptor_84237f664d80452c, []int{6}
 }
+
 func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
 }
 func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
 }
-func (dst *VideoSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoSegment.Merge(dst, src)
+func (m *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(m, src)
 }
 func (m *VideoSegment) XXX_Size() int {
 	return xxx_messageInfo_VideoSegment.Size(m)
@@ -588,16 +601,17 @@ func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
 func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
 func (*LabelSegment) ProtoMessage()    {}
 func (*LabelSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{7}
+	return fileDescriptor_84237f664d80452c, []int{7}
 }
+
 func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
 }
 func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
 }
-func (dst *LabelSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelSegment.Merge(dst, src)
+func (m *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(m, src)
 }
 func (m *LabelSegment) XXX_Size() int {
 	return xxx_messageInfo_LabelSegment.Size(m)
@@ -638,16 +652,17 @@ func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
 func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
 func (*LabelFrame) ProtoMessage()    {}
 func (*LabelFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{8}
+	return fileDescriptor_84237f664d80452c, []int{8}
 }
+
 func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
 }
 func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
 }
-func (dst *LabelFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelFrame.Merge(dst, src)
+func (m *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(m, src)
 }
 func (m *LabelFrame) XXX_Size() int {
 	return xxx_messageInfo_LabelFrame.Size(m)
@@ -691,16 +706,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{9}
+	return fileDescriptor_84237f664d80452c, []int{9}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -754,16 +770,17 @@ func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
 func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LabelAnnotation) ProtoMessage()    {}
 func (*LabelAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{10}
+	return fileDescriptor_84237f664d80452c, []int{10}
 }
+
 func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
 }
 func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+func (m *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(m, src)
 }
 func (m *LabelAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LabelAnnotation.Size(m)
@@ -818,16 +835,17 @@ func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
 func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentFrame) ProtoMessage()    {}
 func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{11}
+	return fileDescriptor_84237f664d80452c, []int{11}
 }
+
 func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
 }
 func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+func (m *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(m, src)
 }
 func (m *ExplicitContentFrame) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentFrame.Size(m)
@@ -867,16 +885,17 @@ func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnota
 func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentAnnotation) ProtoMessage()    {}
 func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{12}
+	return fileDescriptor_84237f664d80452c, []int{12}
 }
+
 func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
 }
 func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+func (m *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(m, src)
 }
 func (m *ExplicitContentAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
@@ -915,16 +934,17 @@ func (m *NormalizedBoundingBox) Reset()         { *m = NormalizedBoundingBox{} }
 func (m *NormalizedBoundingBox) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingBox) ProtoMessage()    {}
 func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{13}
+	return fileDescriptor_84237f664d80452c, []int{13}
 }
+
 func (m *NormalizedBoundingBox) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingBox.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingBox.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingBox.Merge(dst, src)
+func (m *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingBox.Merge(m, src)
 }
 func (m *NormalizedBoundingBox) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingBox.Size(m)
@@ -976,16 +996,17 @@ func (m *FaceSegment) Reset()         { *m = FaceSegment{} }
 func (m *FaceSegment) String() string { return proto.CompactTextString(m) }
 func (*FaceSegment) ProtoMessage()    {}
 func (*FaceSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{14}
+	return fileDescriptor_84237f664d80452c, []int{14}
 }
+
 func (m *FaceSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceSegment.Unmarshal(m, b)
 }
 func (m *FaceSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceSegment.Marshal(b, m, deterministic)
 }
-func (dst *FaceSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceSegment.Merge(dst, src)
+func (m *FaceSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceSegment.Merge(m, src)
 }
 func (m *FaceSegment) XXX_Size() int {
 	return xxx_messageInfo_FaceSegment.Size(m)
@@ -1021,16 +1042,17 @@ func (m *FaceFrame) Reset()         { *m = FaceFrame{} }
 func (m *FaceFrame) String() string { return proto.CompactTextString(m) }
 func (*FaceFrame) ProtoMessage()    {}
 func (*FaceFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{15}
+	return fileDescriptor_84237f664d80452c, []int{15}
 }
+
 func (m *FaceFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceFrame.Unmarshal(m, b)
 }
 func (m *FaceFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceFrame.Marshal(b, m, deterministic)
 }
-func (dst *FaceFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceFrame.Merge(dst, src)
+func (m *FaceFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceFrame.Merge(m, src)
 }
 func (m *FaceFrame) XXX_Size() int {
 	return xxx_messageInfo_FaceFrame.Size(m)
@@ -1072,16 +1094,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{16}
+	return fileDescriptor_84237f664d80452c, []int{16}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -1145,16 +1168,17 @@ func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{}
 func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationResults) ProtoMessage()    {}
 func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{17}
+	return fileDescriptor_84237f664d80452c, []int{17}
 }
+
 func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
 }
 func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+func (m *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(m, src)
 }
 func (m *VideoAnnotationResults) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationResults.Size(m)
@@ -1236,16 +1260,17 @@ func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
 func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoResponse) ProtoMessage()    {}
 func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{18}
+	return fileDescriptor_84237f664d80452c, []int{18}
 }
+
 func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
 }
 func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+func (m *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(m, src)
 }
 func (m *AnnotateVideoResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
@@ -1284,16 +1309,17 @@ func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress
 func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationProgress) ProtoMessage()    {}
 func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{19}
+	return fileDescriptor_84237f664d80452c, []int{19}
 }
+
 func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
 }
 func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+func (m *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(m, src)
 }
 func (m *VideoAnnotationProgress) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
@@ -1347,16 +1373,17 @@ func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
 func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoProgress) ProtoMessage()    {}
 func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_4625d60d88ccf591, []int{20}
+	return fileDescriptor_84237f664d80452c, []int{20}
 }
+
 func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
 }
 func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+func (m *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(m, src)
 }
 func (m *AnnotateVideoProgress) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
@@ -1375,6 +1402,9 @@ func (m *AnnotateVideoProgress) GetAnnotationProgress() []*VideoAnnotationProgre
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.videointelligence.v1beta2.Feature", Feature_name, Feature_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1beta2.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1beta2.Likelihood", Likelihood_name, Likelihood_value)
 	proto.RegisterType((*AnnotateVideoRequest)(nil), "google.cloud.videointelligence.v1beta2.AnnotateVideoRequest")
 	proto.RegisterType((*VideoContext)(nil), "google.cloud.videointelligence.v1beta2.VideoContext")
 	proto.RegisterType((*LabelDetectionConfig)(nil), "google.cloud.videointelligence.v1beta2.LabelDetectionConfig")
@@ -1396,96 +1426,13 @@ func init() {
 	proto.RegisterType((*AnnotateVideoResponse)(nil), "google.cloud.videointelligence.v1beta2.AnnotateVideoResponse")
 	proto.RegisterType((*VideoAnnotationProgress)(nil), "google.cloud.videointelligence.v1beta2.VideoAnnotationProgress")
 	proto.RegisterType((*AnnotateVideoProgress)(nil), "google.cloud.videointelligence.v1beta2.AnnotateVideoProgress")
-	proto.RegisterEnum("google.cloud.videointelligence.v1beta2.Feature", Feature_name, Feature_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1beta2.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1beta2.Likelihood", Likelihood_name, Likelihood_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type VideoIntelligenceServiceClient interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-}
-
-type videoIntelligenceServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
-	return &videoIntelligenceServiceClient{cc}
-}
-
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
-	out := new(longrunning.Operation)
-	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1beta2.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
-type VideoIntelligenceServiceServer interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
-}
-
-func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
-	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
-}
-
-func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AnnotateVideoRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.videointelligence.v1beta2.VideoIntelligenceService/AnnotateVideo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.videointelligence.v1beta2.VideoIntelligenceService",
-	HandlerType: (*VideoIntelligenceServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "AnnotateVideo",
-			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/videointelligence/v1beta2/video_intelligence.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1beta2/video_intelligence.proto", fileDescriptor_video_intelligence_4625d60d88ccf591)
+	proto.RegisterFile("google/cloud/videointelligence/v1beta2/video_intelligence.proto", fileDescriptor_84237f664d80452c)
 }
 
-var fileDescriptor_video_intelligence_4625d60d88ccf591 = []byte{
+var fileDescriptor_84237f664d80452c = []byte{
 	// 1718 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0xdb, 0xc8,
 	0x15, 0x2f, 0x25, 0xd9, 0xb1, 0x9e, 0xff, 0x48, 0x19, 0xcb, 0xb6, 0xec, 0x26, 0x5e, 0x97, 0x29,
@@ -1596,3 +1543,83 @@ var fileDescriptor_video_intelligence_4625d60d88ccf591 = []byte{
 	0x3e, 0xe7, 0x3a, 0x86, 0xeb, 0xcc, 0xaa, 0x8f, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x8a,
 	0xa0, 0x1c, 0x24, 0x15, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type VideoIntelligenceServiceClient interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type videoIntelligenceServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
+	return &videoIntelligenceServiceClient{cc}
+}
+
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1beta2.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
+type VideoIntelligenceServiceServer interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
+}
+
+func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
+	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
+}
+
+func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AnnotateVideoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.videointelligence.v1beta2.VideoIntelligenceService/AnnotateVideo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.videointelligence.v1beta2.VideoIntelligenceService",
+	HandlerType: (*VideoIntelligenceServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "AnnotateVideo",
+			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/videointelligence/v1beta2/video_intelligence.proto",
+}
diff --git a/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
index afbae073c3..6034058afb 100644
--- a/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1p1beta1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1p1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Video annotation feature.
 type Feature int32
@@ -51,6 +51,7 @@ var Feature_name = map[int32]string{
 	3: "EXPLICIT_CONTENT_DETECTION",
 	6: "SPEECH_TRANSCRIPTION",
 }
+
 var Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":        0,
 	"LABEL_DETECTION":            1,
@@ -62,8 +63,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
+
 func (Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{0}
+	return fileDescriptor_9e6ec0147460ac77, []int{0}
 }
 
 // Label detection mode.
@@ -86,6 +88,7 @@ var LabelDetectionMode_name = map[int32]string{
 	2: "FRAME_MODE",
 	3: "SHOT_AND_FRAME_MODE",
 }
+
 var LabelDetectionMode_value = map[string]int32{
 	"LABEL_DETECTION_MODE_UNSPECIFIED": 0,
 	"SHOT_MODE":                        1,
@@ -96,8 +99,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
+
 func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{1}
+	return fileDescriptor_9e6ec0147460ac77, []int{1}
 }
 
 // Bucketized representation of likelihood.
@@ -126,6 +130,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"LIKELIHOOD_UNSPECIFIED": 0,
 	"VERY_UNLIKELY":          1,
@@ -138,8 +143,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{2}
+	return fileDescriptor_9e6ec0147460ac77, []int{2}
 }
 
 // Video annotation request.
@@ -183,16 +189,17 @@ func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
 func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoRequest) ProtoMessage()    {}
 func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{0}
+	return fileDescriptor_9e6ec0147460ac77, []int{0}
 }
+
 func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
 }
 func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+func (m *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(m, src)
 }
 func (m *AnnotateVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
@@ -268,16 +275,17 @@ func (m *VideoContext) Reset()         { *m = VideoContext{} }
 func (m *VideoContext) String() string { return proto.CompactTextString(m) }
 func (*VideoContext) ProtoMessage()    {}
 func (*VideoContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{1}
+	return fileDescriptor_9e6ec0147460ac77, []int{1}
 }
+
 func (m *VideoContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
 }
 func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
 }
-func (dst *VideoContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoContext.Merge(dst, src)
+func (m *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(m, src)
 }
 func (m *VideoContext) XXX_Size() int {
 	return xxx_messageInfo_VideoContext.Size(m)
@@ -346,16 +354,17 @@ func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
 func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*LabelDetectionConfig) ProtoMessage()    {}
 func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{2}
+	return fileDescriptor_9e6ec0147460ac77, []int{2}
 }
+
 func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
 }
 func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+func (m *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(m, src)
 }
 func (m *LabelDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_LabelDetectionConfig.Size(m)
@@ -402,16 +411,17 @@ func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionCo
 func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ShotChangeDetectionConfig) ProtoMessage()    {}
 func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{3}
+	return fileDescriptor_9e6ec0147460ac77, []int{3}
 }
+
 func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
 }
 func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+func (m *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(m, src)
 }
 func (m *ShotChangeDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
@@ -444,16 +454,17 @@ func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentD
 func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
 func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{4}
+	return fileDescriptor_9e6ec0147460ac77, []int{4}
 }
+
 func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+func (m *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(m, src)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
@@ -488,16 +499,17 @@ func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
 func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
 func (*VideoSegment) ProtoMessage()    {}
 func (*VideoSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{5}
+	return fileDescriptor_9e6ec0147460ac77, []int{5}
 }
+
 func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
 }
 func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
 }
-func (dst *VideoSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoSegment.Merge(dst, src)
+func (m *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(m, src)
 }
 func (m *VideoSegment) XXX_Size() int {
 	return xxx_messageInfo_VideoSegment.Size(m)
@@ -537,16 +549,17 @@ func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
 func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
 func (*LabelSegment) ProtoMessage()    {}
 func (*LabelSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{6}
+	return fileDescriptor_9e6ec0147460ac77, []int{6}
 }
+
 func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
 }
 func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
 }
-func (dst *LabelSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelSegment.Merge(dst, src)
+func (m *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(m, src)
 }
 func (m *LabelSegment) XXX_Size() int {
 	return xxx_messageInfo_LabelSegment.Size(m)
@@ -587,16 +600,17 @@ func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
 func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
 func (*LabelFrame) ProtoMessage()    {}
 func (*LabelFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{7}
+	return fileDescriptor_9e6ec0147460ac77, []int{7}
 }
+
 func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
 }
 func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
 }
-func (dst *LabelFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelFrame.Merge(dst, src)
+func (m *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(m, src)
 }
 func (m *LabelFrame) XXX_Size() int {
 	return xxx_messageInfo_LabelFrame.Size(m)
@@ -640,16 +654,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{8}
+	return fileDescriptor_9e6ec0147460ac77, []int{8}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -703,16 +718,17 @@ func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
 func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LabelAnnotation) ProtoMessage()    {}
 func (*LabelAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{9}
+	return fileDescriptor_9e6ec0147460ac77, []int{9}
 }
+
 func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
 }
 func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+func (m *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(m, src)
 }
 func (m *LabelAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LabelAnnotation.Size(m)
@@ -767,16 +783,17 @@ func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
 func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentFrame) ProtoMessage()    {}
 func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{10}
+	return fileDescriptor_9e6ec0147460ac77, []int{10}
 }
+
 func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
 }
 func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+func (m *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(m, src)
 }
 func (m *ExplicitContentFrame) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentFrame.Size(m)
@@ -816,16 +833,17 @@ func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnota
 func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentAnnotation) ProtoMessage()    {}
 func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{11}
+	return fileDescriptor_9e6ec0147460ac77, []int{11}
 }
+
 func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
 }
 func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+func (m *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(m, src)
 }
 func (m *ExplicitContentAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
@@ -875,16 +893,17 @@ func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{}
 func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationResults) ProtoMessage()    {}
 func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{12}
+	return fileDescriptor_9e6ec0147460ac77, []int{12}
 }
+
 func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
 }
 func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+func (m *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(m, src)
 }
 func (m *VideoAnnotationResults) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationResults.Size(m)
@@ -966,16 +985,17 @@ func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
 func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoResponse) ProtoMessage()    {}
 func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{13}
+	return fileDescriptor_9e6ec0147460ac77, []int{13}
 }
+
 func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
 }
 func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+func (m *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(m, src)
 }
 func (m *AnnotateVideoResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
@@ -1014,16 +1034,17 @@ func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress
 func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationProgress) ProtoMessage()    {}
 func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{14}
+	return fileDescriptor_9e6ec0147460ac77, []int{14}
 }
+
 func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
 }
 func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+func (m *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(m, src)
 }
 func (m *VideoAnnotationProgress) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
@@ -1077,16 +1098,17 @@ func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
 func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoProgress) ProtoMessage()    {}
 func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{15}
+	return fileDescriptor_9e6ec0147460ac77, []int{15}
 }
+
 func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
 }
 func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+func (m *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(m, src)
 }
 func (m *AnnotateVideoProgress) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
@@ -1144,16 +1166,17 @@ func (m *SpeechTranscriptionConfig) Reset()         { *m = SpeechTranscriptionCo
 func (m *SpeechTranscriptionConfig) String() string { return proto.CompactTextString(m) }
 func (*SpeechTranscriptionConfig) ProtoMessage()    {}
 func (*SpeechTranscriptionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{16}
+	return fileDescriptor_9e6ec0147460ac77, []int{16}
 }
+
 func (m *SpeechTranscriptionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechTranscriptionConfig.Unmarshal(m, b)
 }
 func (m *SpeechTranscriptionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechTranscriptionConfig.Marshal(b, m, deterministic)
 }
-func (dst *SpeechTranscriptionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechTranscriptionConfig.Merge(dst, src)
+func (m *SpeechTranscriptionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechTranscriptionConfig.Merge(m, src)
 }
 func (m *SpeechTranscriptionConfig) XXX_Size() int {
 	return xxx_messageInfo_SpeechTranscriptionConfig.Size(m)
@@ -1225,16 +1248,17 @@ func (m *SpeechContext) Reset()         { *m = SpeechContext{} }
 func (m *SpeechContext) String() string { return proto.CompactTextString(m) }
 func (*SpeechContext) ProtoMessage()    {}
 func (*SpeechContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{17}
+	return fileDescriptor_9e6ec0147460ac77, []int{17}
 }
+
 func (m *SpeechContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechContext.Unmarshal(m, b)
 }
 func (m *SpeechContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechContext.Marshal(b, m, deterministic)
 }
-func (dst *SpeechContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechContext.Merge(dst, src)
+func (m *SpeechContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechContext.Merge(m, src)
 }
 func (m *SpeechContext) XXX_Size() int {
 	return xxx_messageInfo_SpeechContext.Size(m)
@@ -1268,16 +1292,17 @@ func (m *SpeechTranscription) Reset()         { *m = SpeechTranscription{} }
 func (m *SpeechTranscription) String() string { return proto.CompactTextString(m) }
 func (*SpeechTranscription) ProtoMessage()    {}
 func (*SpeechTranscription) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{18}
+	return fileDescriptor_9e6ec0147460ac77, []int{18}
 }
+
 func (m *SpeechTranscription) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechTranscription.Unmarshal(m, b)
 }
 func (m *SpeechTranscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechTranscription.Marshal(b, m, deterministic)
 }
-func (dst *SpeechTranscription) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechTranscription.Merge(dst, src)
+func (m *SpeechTranscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechTranscription.Merge(m, src)
 }
 func (m *SpeechTranscription) XXX_Size() int {
 	return xxx_messageInfo_SpeechTranscription.Size(m)
@@ -1317,16 +1342,17 @@ func (m *SpeechRecognitionAlternative) Reset()         { *m = SpeechRecognitionA
 func (m *SpeechRecognitionAlternative) String() string { return proto.CompactTextString(m) }
 func (*SpeechRecognitionAlternative) ProtoMessage()    {}
 func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{19}
+	return fileDescriptor_9e6ec0147460ac77, []int{19}
 }
+
 func (m *SpeechRecognitionAlternative) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Unmarshal(m, b)
 }
 func (m *SpeechRecognitionAlternative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Marshal(b, m, deterministic)
 }
-func (dst *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpeechRecognitionAlternative.Merge(dst, src)
+func (m *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionAlternative.Merge(m, src)
 }
 func (m *SpeechRecognitionAlternative) XXX_Size() int {
 	return xxx_messageInfo_SpeechRecognitionAlternative.Size(m)
@@ -1383,16 +1409,17 @@ func (m *WordInfo) Reset()         { *m = WordInfo{} }
 func (m *WordInfo) String() string { return proto.CompactTextString(m) }
 func (*WordInfo) ProtoMessage()    {}
 func (*WordInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_d0764d772f800fc8, []int{20}
+	return fileDescriptor_9e6ec0147460ac77, []int{20}
 }
+
 func (m *WordInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WordInfo.Unmarshal(m, b)
 }
 func (m *WordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WordInfo.Marshal(b, m, deterministic)
 }
-func (dst *WordInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WordInfo.Merge(dst, src)
+func (m *WordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WordInfo.Merge(m, src)
 }
 func (m *WordInfo) XXX_Size() int {
 	return xxx_messageInfo_WordInfo.Size(m)
@@ -1425,6 +1452,9 @@ func (m *WordInfo) GetWord() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.Feature", Feature_name, Feature_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.Likelihood", Likelihood_name, Likelihood_value)
 	proto.RegisterType((*AnnotateVideoRequest)(nil), "google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest")
 	proto.RegisterType((*VideoContext)(nil), "google.cloud.videointelligence.v1p1beta1.VideoContext")
 	proto.RegisterType((*LabelDetectionConfig)(nil), "google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig")
@@ -1446,96 +1476,13 @@ func init() {
 	proto.RegisterType((*SpeechTranscription)(nil), "google.cloud.videointelligence.v1p1beta1.SpeechTranscription")
 	proto.RegisterType((*SpeechRecognitionAlternative)(nil), "google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative")
 	proto.RegisterType((*WordInfo)(nil), "google.cloud.videointelligence.v1p1beta1.WordInfo")
-	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.Feature", Feature_name, Feature_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.Likelihood", Likelihood_name, Likelihood_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type VideoIntelligenceServiceClient interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-}
-
-type videoIntelligenceServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
-	return &videoIntelligenceServiceClient{cc}
-}
-
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
-	out := new(longrunning.Operation)
-	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
-type VideoIntelligenceServiceServer interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
-}
-
-func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
-	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
-}
-
-func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AnnotateVideoRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService/AnnotateVideo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService",
-	HandlerType: (*VideoIntelligenceServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "AnnotateVideo",
-			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/videointelligence/v1p1beta1/video_intelligence.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1p1beta1/video_intelligence.proto", fileDescriptor_video_intelligence_d0764d772f800fc8)
+	proto.RegisterFile("google/cloud/videointelligence/v1p1beta1/video_intelligence.proto", fileDescriptor_9e6ec0147460ac77)
 }
 
-var fileDescriptor_video_intelligence_d0764d772f800fc8 = []byte{
+var fileDescriptor_9e6ec0147460ac77 = []byte{
 	// 1807 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x6f, 0x23, 0x49,
 	0x15, 0xa7, 0xed, 0xc4, 0x89, 0x9f, 0x9d, 0xd8, 0x53, 0x71, 0x12, 0x27, 0x3b, 0x93, 0xc9, 0xf6,
@@ -1651,3 +1598,83 @@ var fileDescriptor_video_intelligence_d0764d772f800fc8 = []byte{
 	0x13, 0xd1, 0x97, 0x5c, 0xf4, 0xe5, 0x94, 0xe8, 0xcb, 0xd3, 0xc4, 0xce, 0x59, 0x8e, 0xfb, 0xf6,
 	0xad, 0x2f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x82, 0x99, 0xe4, 0x9b, 0x15, 0x16, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type VideoIntelligenceServiceClient interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type videoIntelligenceServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
+	return &videoIntelligenceServiceClient{cc}
+}
+
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
+type VideoIntelligenceServiceServer interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
+}
+
+func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
+	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
+}
+
+func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AnnotateVideoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService/AnnotateVideo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService",
+	HandlerType: (*VideoIntelligenceServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "AnnotateVideo",
+			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/videointelligence/v1p1beta1/video_intelligence.proto",
+}
diff --git a/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go
index baaf489f44..4817172825 100644
--- a/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1p2beta1/video_intelligence.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1p2beta1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1p2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Video annotation feature.
 type Feature int32
@@ -54,6 +54,7 @@ var Feature_name = map[int32]string{
 	7: "TEXT_DETECTION",
 	9: "OBJECT_TRACKING",
 }
+
 var Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":        0,
 	"LABEL_DETECTION":            1,
@@ -66,8 +67,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
+
 func (Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{0}
+	return fileDescriptor_890c5161889e04ed, []int{0}
 }
 
 // Label detection mode.
@@ -90,6 +92,7 @@ var LabelDetectionMode_name = map[int32]string{
 	2: "FRAME_MODE",
 	3: "SHOT_AND_FRAME_MODE",
 }
+
 var LabelDetectionMode_value = map[string]int32{
 	"LABEL_DETECTION_MODE_UNSPECIFIED": 0,
 	"SHOT_MODE":                        1,
@@ -100,8 +103,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
+
 func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{1}
+	return fileDescriptor_890c5161889e04ed, []int{1}
 }
 
 // Bucketized representation of likelihood.
@@ -130,6 +134,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"LIKELIHOOD_UNSPECIFIED": 0,
 	"VERY_UNLIKELY":          1,
@@ -142,8 +147,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{2}
+	return fileDescriptor_890c5161889e04ed, []int{2}
 }
 
 // Video annotation request.
@@ -187,16 +193,17 @@ func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
 func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoRequest) ProtoMessage()    {}
 func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{0}
+	return fileDescriptor_890c5161889e04ed, []int{0}
 }
+
 func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
 }
 func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+func (m *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(m, src)
 }
 func (m *AnnotateVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
@@ -272,16 +279,17 @@ func (m *VideoContext) Reset()         { *m = VideoContext{} }
 func (m *VideoContext) String() string { return proto.CompactTextString(m) }
 func (*VideoContext) ProtoMessage()    {}
 func (*VideoContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{1}
+	return fileDescriptor_890c5161889e04ed, []int{1}
 }
+
 func (m *VideoContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
 }
 func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
 }
-func (dst *VideoContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoContext.Merge(dst, src)
+func (m *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(m, src)
 }
 func (m *VideoContext) XXX_Size() int {
 	return xxx_messageInfo_VideoContext.Size(m)
@@ -350,16 +358,17 @@ func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
 func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*LabelDetectionConfig) ProtoMessage()    {}
 func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{2}
+	return fileDescriptor_890c5161889e04ed, []int{2}
 }
+
 func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
 }
 func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+func (m *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(m, src)
 }
 func (m *LabelDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_LabelDetectionConfig.Size(m)
@@ -406,16 +415,17 @@ func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionCo
 func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ShotChangeDetectionConfig) ProtoMessage()    {}
 func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{3}
+	return fileDescriptor_890c5161889e04ed, []int{3}
 }
+
 func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
 }
 func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+func (m *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(m, src)
 }
 func (m *ShotChangeDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
@@ -448,16 +458,17 @@ func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentD
 func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
 func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{4}
+	return fileDescriptor_890c5161889e04ed, []int{4}
 }
+
 func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+func (m *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(m, src)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
@@ -492,16 +503,17 @@ func (m *TextDetectionConfig) Reset()         { *m = TextDetectionConfig{} }
 func (m *TextDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*TextDetectionConfig) ProtoMessage()    {}
 func (*TextDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{5}
+	return fileDescriptor_890c5161889e04ed, []int{5}
 }
+
 func (m *TextDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextDetectionConfig.Unmarshal(m, b)
 }
 func (m *TextDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *TextDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextDetectionConfig.Merge(dst, src)
+func (m *TextDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextDetectionConfig.Merge(m, src)
 }
 func (m *TextDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_TextDetectionConfig.Size(m)
@@ -536,16 +548,17 @@ func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
 func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
 func (*VideoSegment) ProtoMessage()    {}
 func (*VideoSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{6}
+	return fileDescriptor_890c5161889e04ed, []int{6}
 }
+
 func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
 }
 func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
 }
-func (dst *VideoSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoSegment.Merge(dst, src)
+func (m *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(m, src)
 }
 func (m *VideoSegment) XXX_Size() int {
 	return xxx_messageInfo_VideoSegment.Size(m)
@@ -585,16 +598,17 @@ func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
 func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
 func (*LabelSegment) ProtoMessage()    {}
 func (*LabelSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{7}
+	return fileDescriptor_890c5161889e04ed, []int{7}
 }
+
 func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
 }
 func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
 }
-func (dst *LabelSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelSegment.Merge(dst, src)
+func (m *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(m, src)
 }
 func (m *LabelSegment) XXX_Size() int {
 	return xxx_messageInfo_LabelSegment.Size(m)
@@ -635,16 +649,17 @@ func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
 func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
 func (*LabelFrame) ProtoMessage()    {}
 func (*LabelFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{8}
+	return fileDescriptor_890c5161889e04ed, []int{8}
 }
+
 func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
 }
 func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
 }
-func (dst *LabelFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelFrame.Merge(dst, src)
+func (m *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(m, src)
 }
 func (m *LabelFrame) XXX_Size() int {
 	return xxx_messageInfo_LabelFrame.Size(m)
@@ -688,16 +703,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{9}
+	return fileDescriptor_890c5161889e04ed, []int{9}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -751,16 +767,17 @@ func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
 func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LabelAnnotation) ProtoMessage()    {}
 func (*LabelAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{10}
+	return fileDescriptor_890c5161889e04ed, []int{10}
 }
+
 func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
 }
 func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+func (m *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(m, src)
 }
 func (m *LabelAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LabelAnnotation.Size(m)
@@ -815,16 +832,17 @@ func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
 func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentFrame) ProtoMessage()    {}
 func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{11}
+	return fileDescriptor_890c5161889e04ed, []int{11}
 }
+
 func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
 }
 func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+func (m *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(m, src)
 }
 func (m *ExplicitContentFrame) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentFrame.Size(m)
@@ -864,16 +882,17 @@ func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnota
 func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentAnnotation) ProtoMessage()    {}
 func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{12}
+	return fileDescriptor_890c5161889e04ed, []int{12}
 }
+
 func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
 }
 func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+func (m *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(m, src)
 }
 func (m *ExplicitContentAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
@@ -912,16 +931,17 @@ func (m *NormalizedBoundingBox) Reset()         { *m = NormalizedBoundingBox{} }
 func (m *NormalizedBoundingBox) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingBox) ProtoMessage()    {}
 func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{13}
+	return fileDescriptor_890c5161889e04ed, []int{13}
 }
+
 func (m *NormalizedBoundingBox) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingBox.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingBox.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingBox.Merge(dst, src)
+func (m *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingBox.Merge(m, src)
 }
 func (m *NormalizedBoundingBox) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingBox.Size(m)
@@ -996,16 +1016,17 @@ func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{}
 func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationResults) ProtoMessage()    {}
 func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{14}
+	return fileDescriptor_890c5161889e04ed, []int{14}
 }
+
 func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
 }
 func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+func (m *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(m, src)
 }
 func (m *VideoAnnotationResults) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationResults.Size(m)
@@ -1094,16 +1115,17 @@ func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
 func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoResponse) ProtoMessage()    {}
 func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{15}
+	return fileDescriptor_890c5161889e04ed, []int{15}
 }
+
 func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
 }
 func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+func (m *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(m, src)
 }
 func (m *AnnotateVideoResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
@@ -1142,16 +1164,17 @@ func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress
 func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationProgress) ProtoMessage()    {}
 func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{16}
+	return fileDescriptor_890c5161889e04ed, []int{16}
 }
+
 func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
 }
 func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+func (m *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(m, src)
 }
 func (m *VideoAnnotationProgress) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
@@ -1205,16 +1228,17 @@ func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
 func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoProgress) ProtoMessage()    {}
 func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{17}
+	return fileDescriptor_890c5161889e04ed, []int{17}
 }
+
 func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
 }
 func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+func (m *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(m, src)
 }
 func (m *AnnotateVideoProgress) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
@@ -1249,16 +1273,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{18}
+	return fileDescriptor_890c5161889e04ed, []int{18}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -1312,16 +1337,17 @@ func (m *NormalizedBoundingPoly) Reset()         { *m = NormalizedBoundingPoly{}
 func (m *NormalizedBoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingPoly) ProtoMessage()    {}
 func (*NormalizedBoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{19}
+	return fileDescriptor_890c5161889e04ed, []int{19}
 }
+
 func (m *NormalizedBoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingPoly.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingPoly.Merge(dst, src)
+func (m *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingPoly.Merge(m, src)
 }
 func (m *NormalizedBoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingPoly.Size(m)
@@ -1357,16 +1383,17 @@ func (m *TextSegment) Reset()         { *m = TextSegment{} }
 func (m *TextSegment) String() string { return proto.CompactTextString(m) }
 func (*TextSegment) ProtoMessage()    {}
 func (*TextSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{20}
+	return fileDescriptor_890c5161889e04ed, []int{20}
 }
+
 func (m *TextSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSegment.Unmarshal(m, b)
 }
 func (m *TextSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSegment.Marshal(b, m, deterministic)
 }
-func (dst *TextSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSegment.Merge(dst, src)
+func (m *TextSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSegment.Merge(m, src)
 }
 func (m *TextSegment) XXX_Size() int {
 	return xxx_messageInfo_TextSegment.Size(m)
@@ -1415,16 +1442,17 @@ func (m *TextFrame) Reset()         { *m = TextFrame{} }
 func (m *TextFrame) String() string { return proto.CompactTextString(m) }
 func (*TextFrame) ProtoMessage()    {}
 func (*TextFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{21}
+	return fileDescriptor_890c5161889e04ed, []int{21}
 }
+
 func (m *TextFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextFrame.Unmarshal(m, b)
 }
 func (m *TextFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextFrame.Marshal(b, m, deterministic)
 }
-func (dst *TextFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextFrame.Merge(dst, src)
+func (m *TextFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextFrame.Merge(m, src)
 }
 func (m *TextFrame) XXX_Size() int {
 	return xxx_messageInfo_TextFrame.Size(m)
@@ -1466,16 +1494,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{22}
+	return fileDescriptor_890c5161889e04ed, []int{22}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -1516,16 +1545,17 @@ func (m *ObjectTrackingFrame) Reset()         { *m = ObjectTrackingFrame{} }
 func (m *ObjectTrackingFrame) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingFrame) ProtoMessage()    {}
 func (*ObjectTrackingFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{23}
+	return fileDescriptor_890c5161889e04ed, []int{23}
 }
+
 func (m *ObjectTrackingFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingFrame.Unmarshal(m, b)
 }
 func (m *ObjectTrackingFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingFrame.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingFrame.Merge(dst, src)
+func (m *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingFrame.Merge(m, src)
 }
 func (m *ObjectTrackingFrame) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingFrame.Size(m)
@@ -1569,16 +1599,17 @@ func (m *ObjectTrackingAnnotation) Reset()         { *m = ObjectTrackingAnnotati
 func (m *ObjectTrackingAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingAnnotation) ProtoMessage()    {}
 func (*ObjectTrackingAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_2747a56faf436e7b, []int{24}
+	return fileDescriptor_890c5161889e04ed, []int{24}
 }
+
 func (m *ObjectTrackingAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Unmarshal(m, b)
 }
 func (m *ObjectTrackingAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingAnnotation.Merge(dst, src)
+func (m *ObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingAnnotation.Merge(m, src)
 }
 func (m *ObjectTrackingAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Size(m)
@@ -1618,6 +1649,9 @@ func (m *ObjectTrackingAnnotation) GetSegment() *VideoSegment {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.videointelligence.v1p2beta1.Feature", Feature_name, Feature_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p2beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p2beta1.Likelihood", Likelihood_name, Likelihood_value)
 	proto.RegisterType((*AnnotateVideoRequest)(nil), "google.cloud.videointelligence.v1p2beta1.AnnotateVideoRequest")
 	proto.RegisterType((*VideoContext)(nil), "google.cloud.videointelligence.v1p2beta1.VideoContext")
 	proto.RegisterType((*LabelDetectionConfig)(nil), "google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig")
@@ -1643,96 +1677,13 @@ func init() {
 	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.videointelligence.v1p2beta1.TextAnnotation")
 	proto.RegisterType((*ObjectTrackingFrame)(nil), "google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame")
 	proto.RegisterType((*ObjectTrackingAnnotation)(nil), "google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation")
-	proto.RegisterEnum("google.cloud.videointelligence.v1p2beta1.Feature", Feature_name, Feature_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1p2beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1p2beta1.Likelihood", Likelihood_name, Likelihood_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type VideoIntelligenceServiceClient interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-}
-
-type videoIntelligenceServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
-	return &videoIntelligenceServiceClient{cc}
-}
-
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
-	out := new(longrunning.Operation)
-	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1p2beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
-type VideoIntelligenceServiceServer interface {
-	// Performs asynchronous video annotation. Progress and results can be
-	// retrieved through the `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
-	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
-}
-
-func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
-	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
-}
-
-func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AnnotateVideoRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.videointelligence.v1p2beta1.VideoIntelligenceService/AnnotateVideo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.videointelligence.v1p2beta1.VideoIntelligenceService",
-	HandlerType: (*VideoIntelligenceServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "AnnotateVideo",
-			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/videointelligence/v1p2beta1/video_intelligence.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1p2beta1/video_intelligence.proto", fileDescriptor_video_intelligence_2747a56faf436e7b)
+	proto.RegisterFile("google/cloud/videointelligence/v1p2beta1/video_intelligence.proto", fileDescriptor_890c5161889e04ed)
 }
 
-var fileDescriptor_video_intelligence_2747a56faf436e7b = []byte{
+var fileDescriptor_890c5161889e04ed = []byte{
 	// 1882 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcb, 0x6f, 0x23, 0x49,
 	0x19, 0xa7, 0xed, 0x24, 0x13, 0x7f, 0x79, 0x39, 0x95, 0x97, 0x13, 0x76, 0x32, 0xa1, 0x97, 0x95,
@@ -1853,3 +1804,83 @@ var fileDescriptor_video_intelligence_2747a56faf436e7b = []byte{
 	0x2f, 0x33, 0x5b, 0x5f, 0x9e, 0xc4, 0x72, 0x4e, 0xa7, 0xb8, 0x6e, 0xef, 0xfe, 0x2f, 0x00, 0x00,
 	0xff, 0xff, 0x28, 0x2e, 0x0c, 0x2f, 0x7a, 0x18, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type VideoIntelligenceServiceClient interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type videoIntelligenceServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
+	return &videoIntelligenceServiceClient{cc}
+}
+
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1p2beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
+type VideoIntelligenceServiceServer interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
+}
+
+func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
+	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
+}
+
+func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AnnotateVideoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.videointelligence.v1p2beta1.VideoIntelligenceService/AnnotateVideo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.videointelligence.v1p2beta1.VideoIntelligenceService",
+	HandlerType: (*VideoIntelligenceServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "AnnotateVideo",
+			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/videointelligence/v1p2beta1/video_intelligence.proto",
+}
diff --git a/googleapis/cloud/videointelligence/v1p3beta1/video_intelligence.pb.go b/googleapis/cloud/videointelligence/v1p3beta1/video_intelligence.pb.go
index 1f903b097d..05733a253f 100644
--- a/googleapis/cloud/videointelligence/v1p3beta1/video_intelligence.pb.go
+++ b/googleapis/cloud/videointelligence/v1p3beta1/video_intelligence.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1p3beta1/video_intelligence.proto
 
-package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package videointelligence
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Video annotation feature.
 type Feature int32
@@ -54,6 +54,7 @@ var Feature_name = map[int32]string{
 	7: "TEXT_DETECTION",
 	9: "OBJECT_TRACKING",
 }
+
 var Feature_value = map[string]int32{
 	"FEATURE_UNSPECIFIED":        0,
 	"LABEL_DETECTION":            1,
@@ -66,8 +67,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
+
 func (Feature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{0}
+	return fileDescriptor_06234ac6e4dad78c, []int{0}
 }
 
 // Label detection mode.
@@ -90,6 +92,7 @@ var LabelDetectionMode_name = map[int32]string{
 	2: "FRAME_MODE",
 	3: "SHOT_AND_FRAME_MODE",
 }
+
 var LabelDetectionMode_value = map[string]int32{
 	"LABEL_DETECTION_MODE_UNSPECIFIED": 0,
 	"SHOT_MODE":                        1,
@@ -100,8 +103,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
+
 func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{1}
+	return fileDescriptor_06234ac6e4dad78c, []int{1}
 }
 
 // Bucketized representation of likelihood.
@@ -130,6 +134,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"LIKELIHOOD_UNSPECIFIED": 0,
 	"VERY_UNLIKELY":          1,
@@ -142,8 +147,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{2}
+	return fileDescriptor_06234ac6e4dad78c, []int{2}
 }
 
 // Streaming video annotation feature.
@@ -169,6 +175,7 @@ var StreamingFeature_name = map[int32]string{
 	3: "STREAMING_EXPLICIT_CONTENT_DETECTION",
 	4: "STREAMING_OBJECT_TRACKING",
 }
+
 var StreamingFeature_value = map[string]int32{
 	"STREAMING_FEATURE_UNSPECIFIED":        0,
 	"STREAMING_LABEL_DETECTION":            1,
@@ -180,8 +187,9 @@ var StreamingFeature_value = map[string]int32{
 func (x StreamingFeature) String() string {
 	return proto.EnumName(StreamingFeature_name, int32(x))
 }
+
 func (StreamingFeature) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{3}
+	return fileDescriptor_06234ac6e4dad78c, []int{3}
 }
 
 // Video annotation request.
@@ -225,16 +233,17 @@ func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
 func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoRequest) ProtoMessage()    {}
 func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{0}
+	return fileDescriptor_06234ac6e4dad78c, []int{0}
 }
+
 func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
 }
 func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+func (m *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(m, src)
 }
 func (m *AnnotateVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
@@ -310,16 +319,17 @@ func (m *VideoContext) Reset()         { *m = VideoContext{} }
 func (m *VideoContext) String() string { return proto.CompactTextString(m) }
 func (*VideoContext) ProtoMessage()    {}
 func (*VideoContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{1}
+	return fileDescriptor_06234ac6e4dad78c, []int{1}
 }
+
 func (m *VideoContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
 }
 func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
 }
-func (dst *VideoContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoContext.Merge(dst, src)
+func (m *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(m, src)
 }
 func (m *VideoContext) XXX_Size() int {
 	return xxx_messageInfo_VideoContext.Size(m)
@@ -388,16 +398,17 @@ func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
 func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*LabelDetectionConfig) ProtoMessage()    {}
 func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{2}
+	return fileDescriptor_06234ac6e4dad78c, []int{2}
 }
+
 func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
 }
 func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+func (m *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(m, src)
 }
 func (m *LabelDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_LabelDetectionConfig.Size(m)
@@ -444,16 +455,17 @@ func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionCo
 func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ShotChangeDetectionConfig) ProtoMessage()    {}
 func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{3}
+	return fileDescriptor_06234ac6e4dad78c, []int{3}
 }
+
 func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
 }
 func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+func (m *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(m, src)
 }
 func (m *ShotChangeDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
@@ -486,16 +498,17 @@ func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentD
 func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
 func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{4}
+	return fileDescriptor_06234ac6e4dad78c, []int{4}
 }
+
 func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+func (m *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(m, src)
 }
 func (m *ExplicitContentDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
@@ -530,16 +543,17 @@ func (m *TextDetectionConfig) Reset()         { *m = TextDetectionConfig{} }
 func (m *TextDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*TextDetectionConfig) ProtoMessage()    {}
 func (*TextDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{5}
+	return fileDescriptor_06234ac6e4dad78c, []int{5}
 }
+
 func (m *TextDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextDetectionConfig.Unmarshal(m, b)
 }
 func (m *TextDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *TextDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextDetectionConfig.Merge(dst, src)
+func (m *TextDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextDetectionConfig.Merge(m, src)
 }
 func (m *TextDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_TextDetectionConfig.Size(m)
@@ -574,16 +588,17 @@ func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
 func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
 func (*VideoSegment) ProtoMessage()    {}
 func (*VideoSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{6}
+	return fileDescriptor_06234ac6e4dad78c, []int{6}
 }
+
 func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
 }
 func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
 }
-func (dst *VideoSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoSegment.Merge(dst, src)
+func (m *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(m, src)
 }
 func (m *VideoSegment) XXX_Size() int {
 	return xxx_messageInfo_VideoSegment.Size(m)
@@ -623,16 +638,17 @@ func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
 func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
 func (*LabelSegment) ProtoMessage()    {}
 func (*LabelSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{7}
+	return fileDescriptor_06234ac6e4dad78c, []int{7}
 }
+
 func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
 }
 func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
 }
-func (dst *LabelSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelSegment.Merge(dst, src)
+func (m *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(m, src)
 }
 func (m *LabelSegment) XXX_Size() int {
 	return xxx_messageInfo_LabelSegment.Size(m)
@@ -673,16 +689,17 @@ func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
 func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
 func (*LabelFrame) ProtoMessage()    {}
 func (*LabelFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{8}
+	return fileDescriptor_06234ac6e4dad78c, []int{8}
 }
+
 func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
 }
 func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
 }
-func (dst *LabelFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelFrame.Merge(dst, src)
+func (m *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(m, src)
 }
 func (m *LabelFrame) XXX_Size() int {
 	return xxx_messageInfo_LabelFrame.Size(m)
@@ -726,16 +743,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{9}
+	return fileDescriptor_06234ac6e4dad78c, []int{9}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -789,16 +807,17 @@ func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
 func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LabelAnnotation) ProtoMessage()    {}
 func (*LabelAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{10}
+	return fileDescriptor_06234ac6e4dad78c, []int{10}
 }
+
 func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
 }
 func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+func (m *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(m, src)
 }
 func (m *LabelAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LabelAnnotation.Size(m)
@@ -853,16 +872,17 @@ func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
 func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentFrame) ProtoMessage()    {}
 func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{11}
+	return fileDescriptor_06234ac6e4dad78c, []int{11}
 }
+
 func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
 }
 func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+func (m *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(m, src)
 }
 func (m *ExplicitContentFrame) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentFrame.Size(m)
@@ -902,16 +922,17 @@ func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnota
 func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ExplicitContentAnnotation) ProtoMessage()    {}
 func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{12}
+	return fileDescriptor_06234ac6e4dad78c, []int{12}
 }
+
 func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
 }
 func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+func (m *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(m, src)
 }
 func (m *ExplicitContentAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
@@ -950,16 +971,17 @@ func (m *NormalizedBoundingBox) Reset()         { *m = NormalizedBoundingBox{} }
 func (m *NormalizedBoundingBox) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingBox) ProtoMessage()    {}
 func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{13}
+	return fileDescriptor_06234ac6e4dad78c, []int{13}
 }
+
 func (m *NormalizedBoundingBox) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingBox.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingBox.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingBox.Merge(dst, src)
+func (m *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingBox.Merge(m, src)
 }
 func (m *NormalizedBoundingBox) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingBox.Size(m)
@@ -1034,16 +1056,17 @@ func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{}
 func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationResults) ProtoMessage()    {}
 func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{14}
+	return fileDescriptor_06234ac6e4dad78c, []int{14}
 }
+
 func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
 }
 func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+func (m *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(m, src)
 }
 func (m *VideoAnnotationResults) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationResults.Size(m)
@@ -1132,16 +1155,17 @@ func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
 func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoResponse) ProtoMessage()    {}
 func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{15}
+	return fileDescriptor_06234ac6e4dad78c, []int{15}
 }
+
 func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
 }
 func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+func (m *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(m, src)
 }
 func (m *AnnotateVideoResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
@@ -1180,16 +1204,17 @@ func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress
 func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
 func (*VideoAnnotationProgress) ProtoMessage()    {}
 func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{16}
+	return fileDescriptor_06234ac6e4dad78c, []int{16}
 }
+
 func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
 }
 func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
 }
-func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+func (m *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(m, src)
 }
 func (m *VideoAnnotationProgress) XXX_Size() int {
 	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
@@ -1243,16 +1268,17 @@ func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
 func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
 func (*AnnotateVideoProgress) ProtoMessage()    {}
 func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{17}
+	return fileDescriptor_06234ac6e4dad78c, []int{17}
 }
+
 func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
 }
 func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+func (m *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(m, src)
 }
 func (m *AnnotateVideoProgress) XXX_Size() int {
 	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
@@ -1287,16 +1313,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{18}
+	return fileDescriptor_06234ac6e4dad78c, []int{18}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -1350,16 +1377,17 @@ func (m *NormalizedBoundingPoly) Reset()         { *m = NormalizedBoundingPoly{}
 func (m *NormalizedBoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingPoly) ProtoMessage()    {}
 func (*NormalizedBoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{19}
+	return fileDescriptor_06234ac6e4dad78c, []int{19}
 }
+
 func (m *NormalizedBoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingPoly.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingPoly.Merge(dst, src)
+func (m *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingPoly.Merge(m, src)
 }
 func (m *NormalizedBoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingPoly.Size(m)
@@ -1395,16 +1423,17 @@ func (m *TextSegment) Reset()         { *m = TextSegment{} }
 func (m *TextSegment) String() string { return proto.CompactTextString(m) }
 func (*TextSegment) ProtoMessage()    {}
 func (*TextSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{20}
+	return fileDescriptor_06234ac6e4dad78c, []int{20}
 }
+
 func (m *TextSegment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextSegment.Unmarshal(m, b)
 }
 func (m *TextSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextSegment.Marshal(b, m, deterministic)
 }
-func (dst *TextSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextSegment.Merge(dst, src)
+func (m *TextSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSegment.Merge(m, src)
 }
 func (m *TextSegment) XXX_Size() int {
 	return xxx_messageInfo_TextSegment.Size(m)
@@ -1453,16 +1482,17 @@ func (m *TextFrame) Reset()         { *m = TextFrame{} }
 func (m *TextFrame) String() string { return proto.CompactTextString(m) }
 func (*TextFrame) ProtoMessage()    {}
 func (*TextFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{21}
+	return fileDescriptor_06234ac6e4dad78c, []int{21}
 }
+
 func (m *TextFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextFrame.Unmarshal(m, b)
 }
 func (m *TextFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextFrame.Marshal(b, m, deterministic)
 }
-func (dst *TextFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextFrame.Merge(dst, src)
+func (m *TextFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextFrame.Merge(m, src)
 }
 func (m *TextFrame) XXX_Size() int {
 	return xxx_messageInfo_TextFrame.Size(m)
@@ -1504,16 +1534,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{22}
+	return fileDescriptor_06234ac6e4dad78c, []int{22}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -1554,16 +1585,17 @@ func (m *ObjectTrackingFrame) Reset()         { *m = ObjectTrackingFrame{} }
 func (m *ObjectTrackingFrame) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingFrame) ProtoMessage()    {}
 func (*ObjectTrackingFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{23}
+	return fileDescriptor_06234ac6e4dad78c, []int{23}
 }
+
 func (m *ObjectTrackingFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingFrame.Unmarshal(m, b)
 }
 func (m *ObjectTrackingFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingFrame.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingFrame.Merge(dst, src)
+func (m *ObjectTrackingFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingFrame.Merge(m, src)
 }
 func (m *ObjectTrackingFrame) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingFrame.Size(m)
@@ -1615,16 +1647,17 @@ func (m *ObjectTrackingAnnotation) Reset()         { *m = ObjectTrackingAnnotati
 func (m *ObjectTrackingAnnotation) String() string { return proto.CompactTextString(m) }
 func (*ObjectTrackingAnnotation) ProtoMessage()    {}
 func (*ObjectTrackingAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{24}
+	return fileDescriptor_06234ac6e4dad78c, []int{24}
 }
+
 func (m *ObjectTrackingAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Unmarshal(m, b)
 }
 func (m *ObjectTrackingAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *ObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectTrackingAnnotation.Merge(dst, src)
+func (m *ObjectTrackingAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectTrackingAnnotation.Merge(m, src)
 }
 func (m *ObjectTrackingAnnotation) XXX_Size() int {
 	return xxx_messageInfo_ObjectTrackingAnnotation.Size(m)
@@ -1693,75 +1726,14 @@ func (m *ObjectTrackingAnnotation) GetTrackId() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ObjectTrackingAnnotation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ObjectTrackingAnnotation_OneofMarshaler, _ObjectTrackingAnnotation_OneofUnmarshaler, _ObjectTrackingAnnotation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ObjectTrackingAnnotation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ObjectTrackingAnnotation_Segment)(nil),
 		(*ObjectTrackingAnnotation_TrackId)(nil),
 	}
 }
 
-func _ObjectTrackingAnnotation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ObjectTrackingAnnotation)
-	// track_info
-	switch x := m.TrackInfo.(type) {
-	case *ObjectTrackingAnnotation_Segment:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Segment); err != nil {
-			return err
-		}
-	case *ObjectTrackingAnnotation_TrackId:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.TrackId))
-	case nil:
-	default:
-		return fmt.Errorf("ObjectTrackingAnnotation.TrackInfo has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ObjectTrackingAnnotation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ObjectTrackingAnnotation)
-	switch tag {
-	case 3: // track_info.segment
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VideoSegment)
-		err := b.DecodeMessage(msg)
-		m.TrackInfo = &ObjectTrackingAnnotation_Segment{msg}
-		return true, err
-	case 5: // track_info.track_id
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TrackInfo = &ObjectTrackingAnnotation_TrackId{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ObjectTrackingAnnotation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ObjectTrackingAnnotation)
-	// track_info
-	switch x := m.TrackInfo.(type) {
-	case *ObjectTrackingAnnotation_Segment:
-		s := proto.Size(x.Segment)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ObjectTrackingAnnotation_TrackId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.TrackId))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The top-level message sent by the client for the `StreamingAnnotateVideo`
 // method. Multiple `StreamingAnnotateVideoRequest` messages are sent.
 // The first message must only contain a `StreamingVideoConfig` message.
@@ -1783,16 +1755,17 @@ func (m *StreamingAnnotateVideoRequest) Reset()         { *m = StreamingAnnotate
 func (m *StreamingAnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamingAnnotateVideoRequest) ProtoMessage()    {}
 func (*StreamingAnnotateVideoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{25}
+	return fileDescriptor_06234ac6e4dad78c, []int{25}
 }
+
 func (m *StreamingAnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingAnnotateVideoRequest.Unmarshal(m, b)
 }
 func (m *StreamingAnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingAnnotateVideoRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamingAnnotateVideoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingAnnotateVideoRequest.Merge(dst, src)
+func (m *StreamingAnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingAnnotateVideoRequest.Merge(m, src)
 }
 func (m *StreamingAnnotateVideoRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamingAnnotateVideoRequest.Size(m)
@@ -1841,76 +1814,14 @@ func (m *StreamingAnnotateVideoRequest) GetInputContent() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StreamingAnnotateVideoRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StreamingAnnotateVideoRequest_OneofMarshaler, _StreamingAnnotateVideoRequest_OneofUnmarshaler, _StreamingAnnotateVideoRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StreamingAnnotateVideoRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StreamingAnnotateVideoRequest_VideoConfig)(nil),
 		(*StreamingAnnotateVideoRequest_InputContent)(nil),
 	}
 }
 
-func _StreamingAnnotateVideoRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StreamingAnnotateVideoRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingAnnotateVideoRequest_VideoConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VideoConfig); err != nil {
-			return err
-		}
-	case *StreamingAnnotateVideoRequest_InputContent:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.InputContent)
-	case nil:
-	default:
-		return fmt.Errorf("StreamingAnnotateVideoRequest.StreamingRequest has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StreamingAnnotateVideoRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StreamingAnnotateVideoRequest)
-	switch tag {
-	case 1: // streaming_request.video_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingVideoConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingRequest = &StreamingAnnotateVideoRequest_VideoConfig{msg}
-		return true, err
-	case 2: // streaming_request.input_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StreamingRequest = &StreamingAnnotateVideoRequest_InputContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StreamingAnnotateVideoRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StreamingAnnotateVideoRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingAnnotateVideoRequest_VideoConfig:
-		s := proto.Size(x.VideoConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StreamingAnnotateVideoRequest_InputContent:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.InputContent)))
-		n += len(x.InputContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // `StreamingAnnotateVideoResponse` is the only message returned to the client
 // by `StreamingAnnotateVideo`. A series of zero or more
 // `StreamingAnnotateVideoResponse` messages are streamed back to the client.
@@ -1934,16 +1845,17 @@ func (m *StreamingAnnotateVideoResponse) Reset()         { *m = StreamingAnnotat
 func (m *StreamingAnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamingAnnotateVideoResponse) ProtoMessage()    {}
 func (*StreamingAnnotateVideoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{26}
+	return fileDescriptor_06234ac6e4dad78c, []int{26}
 }
+
 func (m *StreamingAnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingAnnotateVideoResponse.Unmarshal(m, b)
 }
 func (m *StreamingAnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingAnnotateVideoResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamingAnnotateVideoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingAnnotateVideoResponse.Merge(dst, src)
+func (m *StreamingAnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingAnnotateVideoResponse.Merge(m, src)
 }
 func (m *StreamingAnnotateVideoResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamingAnnotateVideoResponse.Size(m)
@@ -1988,16 +1900,17 @@ func (m *StreamingExplicitContentDetectionConfig) Reset() {
 func (m *StreamingExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingExplicitContentDetectionConfig) ProtoMessage()    {}
 func (*StreamingExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{27}
+	return fileDescriptor_06234ac6e4dad78c, []int{27}
 }
+
 func (m *StreamingExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingExplicitContentDetectionConfig.Unmarshal(m, b)
 }
 func (m *StreamingExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingExplicitContentDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingExplicitContentDetectionConfig.Merge(dst, src)
+func (m *StreamingExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingExplicitContentDetectionConfig.Merge(m, src)
 }
 func (m *StreamingExplicitContentDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingExplicitContentDetectionConfig.Size(m)
@@ -2023,16 +1936,17 @@ func (m *StreamingLabelDetectionConfig) Reset()         { *m = StreamingLabelDet
 func (m *StreamingLabelDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingLabelDetectionConfig) ProtoMessage()    {}
 func (*StreamingLabelDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{28}
+	return fileDescriptor_06234ac6e4dad78c, []int{28}
 }
+
 func (m *StreamingLabelDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingLabelDetectionConfig.Unmarshal(m, b)
 }
 func (m *StreamingLabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingLabelDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingLabelDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingLabelDetectionConfig.Merge(dst, src)
+func (m *StreamingLabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingLabelDetectionConfig.Merge(m, src)
 }
 func (m *StreamingLabelDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingLabelDetectionConfig.Size(m)
@@ -2061,16 +1975,17 @@ func (m *StreamingObjectTrackingConfig) Reset()         { *m = StreamingObjectTr
 func (m *StreamingObjectTrackingConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingObjectTrackingConfig) ProtoMessage()    {}
 func (*StreamingObjectTrackingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{29}
+	return fileDescriptor_06234ac6e4dad78c, []int{29}
 }
+
 func (m *StreamingObjectTrackingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingObjectTrackingConfig.Unmarshal(m, b)
 }
 func (m *StreamingObjectTrackingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingObjectTrackingConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingObjectTrackingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingObjectTrackingConfig.Merge(dst, src)
+func (m *StreamingObjectTrackingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingObjectTrackingConfig.Merge(m, src)
 }
 func (m *StreamingObjectTrackingConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingObjectTrackingConfig.Size(m)
@@ -2092,16 +2007,17 @@ func (m *StreamingShotChangeDetectionConfig) Reset()         { *m = StreamingSho
 func (m *StreamingShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingShotChangeDetectionConfig) ProtoMessage()    {}
 func (*StreamingShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{30}
+	return fileDescriptor_06234ac6e4dad78c, []int{30}
 }
+
 func (m *StreamingShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingShotChangeDetectionConfig.Unmarshal(m, b)
 }
 func (m *StreamingShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingShotChangeDetectionConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingShotChangeDetectionConfig.Merge(dst, src)
+func (m *StreamingShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingShotChangeDetectionConfig.Merge(m, src)
 }
 func (m *StreamingShotChangeDetectionConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingShotChangeDetectionConfig.Size(m)
@@ -2136,16 +2052,17 @@ func (m *StreamingStorageConfig) Reset()         { *m = StreamingStorageConfig{}
 func (m *StreamingStorageConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingStorageConfig) ProtoMessage()    {}
 func (*StreamingStorageConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{31}
+	return fileDescriptor_06234ac6e4dad78c, []int{31}
 }
+
 func (m *StreamingStorageConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingStorageConfig.Unmarshal(m, b)
 }
 func (m *StreamingStorageConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingStorageConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingStorageConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingStorageConfig.Merge(dst, src)
+func (m *StreamingStorageConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingStorageConfig.Merge(m, src)
 }
 func (m *StreamingStorageConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingStorageConfig.Size(m)
@@ -2190,16 +2107,17 @@ func (m *StreamingVideoAnnotationResults) Reset()         { *m = StreamingVideoA
 func (m *StreamingVideoAnnotationResults) String() string { return proto.CompactTextString(m) }
 func (*StreamingVideoAnnotationResults) ProtoMessage()    {}
 func (*StreamingVideoAnnotationResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{32}
+	return fileDescriptor_06234ac6e4dad78c, []int{32}
 }
+
 func (m *StreamingVideoAnnotationResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingVideoAnnotationResults.Unmarshal(m, b)
 }
 func (m *StreamingVideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingVideoAnnotationResults.Marshal(b, m, deterministic)
 }
-func (dst *StreamingVideoAnnotationResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingVideoAnnotationResults.Merge(dst, src)
+func (m *StreamingVideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingVideoAnnotationResults.Merge(m, src)
 }
 func (m *StreamingVideoAnnotationResults) XXX_Size() int {
 	return xxx_messageInfo_StreamingVideoAnnotationResults.Size(m)
@@ -2262,16 +2180,17 @@ func (m *StreamingVideoConfig) Reset()         { *m = StreamingVideoConfig{} }
 func (m *StreamingVideoConfig) String() string { return proto.CompactTextString(m) }
 func (*StreamingVideoConfig) ProtoMessage()    {}
 func (*StreamingVideoConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_video_intelligence_26bfd7f2669c7d48, []int{33}
+	return fileDescriptor_06234ac6e4dad78c, []int{33}
 }
+
 func (m *StreamingVideoConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingVideoConfig.Unmarshal(m, b)
 }
 func (m *StreamingVideoConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingVideoConfig.Marshal(b, m, deterministic)
 }
-func (dst *StreamingVideoConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingVideoConfig.Merge(dst, src)
+func (m *StreamingVideoConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingVideoConfig.Merge(m, src)
 }
 func (m *StreamingVideoConfig) XXX_Size() int {
 	return xxx_messageInfo_StreamingVideoConfig.Size(m)
@@ -2359,9 +2278,9 @@ func (m *StreamingVideoConfig) GetStorageConfig() *StreamingStorageConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StreamingVideoConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StreamingVideoConfig_OneofMarshaler, _StreamingVideoConfig_OneofUnmarshaler, _StreamingVideoConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StreamingVideoConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StreamingVideoConfig_ShotChangeDetectionConfig)(nil),
 		(*StreamingVideoConfig_LabelDetectionConfig)(nil),
 		(*StreamingVideoConfig_ExplicitContentDetectionConfig)(nil),
@@ -2369,109 +2288,11 @@ func (*StreamingVideoConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.
 	}
 }
 
-func _StreamingVideoConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StreamingVideoConfig)
-	// streaming_config
-	switch x := m.StreamingConfig.(type) {
-	case *StreamingVideoConfig_ShotChangeDetectionConfig:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ShotChangeDetectionConfig); err != nil {
-			return err
-		}
-	case *StreamingVideoConfig_LabelDetectionConfig:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LabelDetectionConfig); err != nil {
-			return err
-		}
-	case *StreamingVideoConfig_ExplicitContentDetectionConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExplicitContentDetectionConfig); err != nil {
-			return err
-		}
-	case *StreamingVideoConfig_ObjectTrackingConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ObjectTrackingConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StreamingVideoConfig.StreamingConfig has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StreamingVideoConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StreamingVideoConfig)
-	switch tag {
-	case 2: // streaming_config.shot_change_detection_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingShotChangeDetectionConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingConfig = &StreamingVideoConfig_ShotChangeDetectionConfig{msg}
-		return true, err
-	case 3: // streaming_config.label_detection_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingLabelDetectionConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingConfig = &StreamingVideoConfig_LabelDetectionConfig{msg}
-		return true, err
-	case 4: // streaming_config.explicit_content_detection_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingExplicitContentDetectionConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingConfig = &StreamingVideoConfig_ExplicitContentDetectionConfig{msg}
-		return true, err
-	case 5: // streaming_config.object_tracking_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingObjectTrackingConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingConfig = &StreamingVideoConfig_ObjectTrackingConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StreamingVideoConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StreamingVideoConfig)
-	// streaming_config
-	switch x := m.StreamingConfig.(type) {
-	case *StreamingVideoConfig_ShotChangeDetectionConfig:
-		s := proto.Size(x.ShotChangeDetectionConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StreamingVideoConfig_LabelDetectionConfig:
-		s := proto.Size(x.LabelDetectionConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StreamingVideoConfig_ExplicitContentDetectionConfig:
-		s := proto.Size(x.ExplicitContentDetectionConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StreamingVideoConfig_ObjectTrackingConfig:
-		s := proto.Size(x.ObjectTrackingConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.Feature", Feature_name, Feature_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.StreamingFeature", StreamingFeature_name, StreamingFeature_value)
 	proto.RegisterType((*AnnotateVideoRequest)(nil), "google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest")
 	proto.RegisterType((*VideoContext)(nil), "google.cloud.videointelligence.v1p3beta1.VideoContext")
 	proto.RegisterType((*LabelDetectionConfig)(nil), "google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig")
@@ -2506,10 +2327,163 @@ func init() {
 	proto.RegisterType((*StreamingStorageConfig)(nil), "google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig")
 	proto.RegisterType((*StreamingVideoAnnotationResults)(nil), "google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResults")
 	proto.RegisterType((*StreamingVideoConfig)(nil), "google.cloud.videointelligence.v1p3beta1.StreamingVideoConfig")
-	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.Feature", Feature_name, Feature_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.cloud.videointelligence.v1p3beta1.StreamingFeature", StreamingFeature_name, StreamingFeature_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/videointelligence/v1p3beta1/video_intelligence.proto", fileDescriptor_06234ac6e4dad78c)
+}
+
+var fileDescriptor_06234ac6e4dad78c = []byte{
+	// 2371 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0xe3, 0xc6,
+	0xf5, 0x37, 0x25, 0xdb, 0x6b, 0x3d, 0xcb, 0xb6, 0x3c, 0xfe, 0x25, 0x3b, 0xf1, 0x8f, 0x70, 0xb3,
+	0xf8, 0x3a, 0xfb, 0x2d, 0xe4, 0xac, 0x37, 0x0d, 0x9a, 0xcd, 0x8f, 0x46, 0x92, 0xb5, 0x96, 0xba,
+	0xb6, 0xe5, 0xd0, 0xb2, 0x91, 0x6d, 0xb7, 0x20, 0x68, 0x6a, 0x44, 0xb3, 0x4b, 0x71, 0xb4, 0xe4,
+	0xc8, 0xb1, 0x7b, 0x49, 0x50, 0xf4, 0x50, 0xa0, 0x87, 0x1e, 0x82, 0x02, 0x05, 0x0a, 0xe4, 0x0f,
+	0xe8, 0xa5, 0x45, 0xaf, 0x3d, 0xb4, 0x28, 0x7a, 0x69, 0xd0, 0x5b, 0x91, 0x43, 0x8b, 0x1e, 0x7b,
+	0x28, 0xd0, 0xff, 0xa0, 0xa7, 0x82, 0x33, 0x43, 0x8a, 0x22, 0x25, 0xdb, 0x92, 0xb3, 0xe8, 0x4d,
+	0xf3, 0x66, 0xe6, 0xf3, 0x7e, 0xce, 0x7b, 0x6f, 0x86, 0x82, 0xbc, 0x41, 0x88, 0x61, 0xe1, 0x2d,
+	0xdd, 0x22, 0xed, 0xfa, 0xd6, 0xb9, 0x59, 0xc7, 0xc4, 0xb4, 0x29, 0xb6, 0x2c, 0xd3, 0xc0, 0xb6,
+	0x8e, 0xb7, 0xce, 0x1f, 0xb4, 0x1e, 0x9e, 0x62, 0xaa, 0x3d, 0xe0, 0x73, 0x6a, 0x78, 0x32, 0xd7,
+	0x72, 0x08, 0x25, 0x68, 0x93, 0x43, 0xe4, 0x18, 0x44, 0x2e, 0x06, 0x91, 0x0b, 0x20, 0x56, 0x5e,
+	0x15, 0xcc, 0xb4, 0x96, 0xb9, 0xa5, 0xd9, 0x36, 0xa1, 0x1a, 0x35, 0x89, 0xed, 0x72, 0x9c, 0x95,
+	0xbb, 0x62, 0xd6, 0x22, 0xb6, 0xe1, 0xb4, 0x6d, 0xdb, 0xb4, 0x8d, 0x2d, 0xd2, 0xc2, 0x4e, 0xd7,
+	0xa2, 0x35, 0xb1, 0x88, 0x8d, 0x4e, 0xdb, 0x8d, 0xad, 0x7a, 0x9b, 0x2f, 0x10, 0xf3, 0xeb, 0xd1,
+	0x79, 0x6a, 0x36, 0xb1, 0x4b, 0xb5, 0x66, 0x4b, 0x2c, 0x58, 0x12, 0x0b, 0x9c, 0x96, 0xbe, 0xe5,
+	0x52, 0x8d, 0xb6, 0x05, 0xb2, 0xfc, 0xa7, 0x04, 0xcc, 0xe7, 0xb9, 0x50, 0xf8, 0xc4, 0x53, 0x42,
+	0xc1, 0x2f, 0xda, 0xd8, 0xa5, 0xe8, 0x15, 0x48, 0x99, 0x76, 0xab, 0x4d, 0xd5, 0xb6, 0x63, 0x66,
+	0xa5, 0x0d, 0x69, 0x33, 0xa5, 0x4c, 0x30, 0xc2, 0xb1, 0x63, 0xa2, 0xbb, 0x30, 0xc5, 0x27, 0x75,
+	0x62, 0x53, 0x6c, 0xd3, 0xec, 0xf8, 0x86, 0xb4, 0x99, 0x56, 0xd2, 0x8c, 0x58, 0xe4, 0x34, 0xb4,
+	0x0f, 0x13, 0x0d, 0xac, 0xd1, 0xb6, 0x83, 0xdd, 0x6c, 0x62, 0x23, 0xb9, 0x39, 0xbd, 0xfd, 0x20,
+	0x77, 0x53, 0xa3, 0xe5, 0x1e, 0xf3, 0x9d, 0x4a, 0x00, 0x81, 0xbe, 0x07, 0x53, 0xdc, 0x19, 0x8c,
+	0xe7, 0x05, 0xcd, 0x26, 0x37, 0xa4, 0xcd, 0xc9, 0xed, 0xb7, 0x6f, 0x8e, 0xc9, 0xf4, 0x2b, 0xf2,
+	0xdd, 0x4a, 0xfa, 0x3c, 0x34, 0x42, 0xab, 0x00, 0xa4, 0x4d, 0x7d, 0x75, 0x47, 0x99, 0xba, 0x29,
+	0x4e, 0xf1, 0xf4, 0x5d, 0x87, 0x49, 0x8b, 0xe8, 0xcc, 0xe2, 0xaa, 0x59, 0xcf, 0x8e, 0xb1, 0x79,
+	0xf0, 0x49, 0x95, 0xba, 0xfc, 0xaf, 0x51, 0x48, 0x87, 0xe1, 0x91, 0x02, 0x13, 0x2e, 0x36, 0x9a,
+	0xd8, 0xa6, 0x6e, 0x56, 0xda, 0x48, 0x0e, 0x21, 0xe8, 0x11, 0xdf, 0xae, 0x04, 0x38, 0x88, 0xc2,
+	0xa2, 0xa5, 0x9d, 0x62, 0x4b, 0xad, 0x63, 0x8a, 0x75, 0x26, 0x8c, 0x4e, 0xec, 0x86, 0x69, 0x64,
+	0x13, 0xcc, 0x14, 0x1f, 0xdc, 0x9c, 0xc3, 0x9e, 0x87, 0xb3, 0xe3, 0xc3, 0x14, 0x19, 0x8a, 0x32,
+	0x6f, 0xf5, 0xa0, 0xa2, 0x1f, 0x4b, 0xf0, 0xaa, 0x7b, 0x46, 0xa8, 0xaa, 0x9f, 0x69, 0xb6, 0x81,
+	0xe3, 0xcc, 0xb9, 0x1f, 0x8a, 0x37, 0x67, 0x7e, 0x74, 0x46, 0x68, 0x91, 0x81, 0x45, 0x25, 0x58,
+	0x76, 0xfb, 0x4d, 0xa1, 0xcf, 0x25, 0x78, 0x0d, 0x5f, 0xb4, 0x2c, 0x53, 0x37, 0x83, 0xb0, 0x8b,
+	0xcb, 0x32, 0xca, 0x64, 0x29, 0xdf, 0x5c, 0x96, 0x92, 0x80, 0x14, 0x41, 0x1b, 0x15, 0x68, 0x0d,
+	0x5f, 0x39, 0x8f, 0x5e, 0xc0, 0x82, 0xe7, 0xee, 0xb8, 0x20, 0x13, 0x4c, 0x90, 0xf7, 0x6f, 0x2e,
+	0x48, 0x0d, 0x5f, 0xc4, 0xb8, 0xcf, 0xd1, 0x38, 0x51, 0xfe, 0xb3, 0x04, 0xf3, 0xbd, 0xdc, 0x87,
+	0x6c, 0x98, 0x8f, 0x86, 0x47, 0x93, 0xd4, 0x31, 0x3b, 0xbc, 0xd3, 0xdb, 0xef, 0x0d, 0x1b, 0x1c,
+	0xfb, 0xa4, 0x8e, 0x15, 0x64, 0xc5, 0x68, 0xe8, 0xff, 0x61, 0xd6, 0xe5, 0xb9, 0x4c, 0x73, 0x2e,
+	0x55, 0x5d, 0x6b, 0x62, 0x47, 0x63, 0x91, 0x38, 0xa1, 0x64, 0x3a, 0x13, 0x45, 0x46, 0x47, 0xf3,
+	0x30, 0xe6, 0x09, 0x63, 0xb1, 0x68, 0x49, 0x29, 0x7c, 0x20, 0x3f, 0x80, 0xe5, 0xbe, 0xc1, 0xd0,
+	0xd9, 0x22, 0x85, 0xb7, 0xbc, 0x0d, 0x6b, 0x57, 0xfb, 0xac, 0xcf, 0xbe, 0xf7, 0x60, 0xae, 0x87,
+	0x89, 0xd1, 0x3d, 0x98, 0xb6, 0x34, 0xdb, 0x68, 0x6b, 0x06, 0x56, 0xcf, 0x4c, 0xff, 0xb4, 0xa6,
+	0x94, 0x29, 0x9f, 0x5a, 0xf6, 0x88, 0xf2, 0x2f, 0x24, 0x71, 0xbe, 0xc5, 0xa9, 0x44, 0x25, 0xa6,
+	0xbc, 0x43, 0x55, 0x2f, 0xd3, 0xaa, 0xa4, 0xd1, 0x70, 0x31, 0x65, 0x0c, 0x27, 0xb7, 0x97, 0x7d,
+	0x4b, 0xfb, 0xd9, 0x38, 0xb7, 0x23, 0xb2, 0xb5, 0x32, 0xc3, 0xf6, 0xd4, 0xcc, 0x26, 0xae, 0xb2,
+	0x1d, 0x28, 0x0f, 0x33, 0xd8, 0xae, 0x77, 0x81, 0x24, 0xae, 0x03, 0x99, 0xc2, 0x76, 0xbd, 0x03,
+	0x21, 0x7f, 0x26, 0x41, 0x9a, 0x79, 0xcc, 0x17, 0xed, 0x10, 0xee, 0x88, 0x94, 0x21, 0x04, 0x1a,
+	0x36, 0xf3, 0xf8, 0x30, 0x68, 0x0d, 0x80, 0x85, 0x75, 0xdd, 0x5b, 0xcd, 0x04, 0x4c, 0x28, 0x21,
+	0x8a, 0x7c, 0x06, 0xc0, 0x24, 0x78, 0xec, 0x68, 0x4d, 0x8c, 0x1e, 0xc1, 0xe4, 0x40, 0x46, 0x01,
+	0xda, 0xb1, 0xc7, 0x75, 0x9c, 0x2c, 0x18, 0x2f, 0xd9, 0xd4, 0xa4, 0x97, 0x5e, 0x7d, 0xc2, 0xec,
+	0x97, 0x97, 0x90, 0x45, 0x7d, 0xe2, 0x84, 0x4a, 0x1d, 0x6d, 0xc0, 0x64, 0x1d, 0xbb, 0xba, 0x63,
+	0xb6, 0x3c, 0x0e, 0x0c, 0x27, 0xa5, 0x84, 0x49, 0x5e, 0x05, 0x0b, 0xfc, 0xae, 0x7b, 0xa7, 0x84,
+	0xc7, 0x65, 0xda, 0x27, 0x16, 0x49, 0x1d, 0xcb, 0xff, 0x48, 0xc0, 0x0c, 0x53, 0x2c, 0x1f, 0x94,
+	0x6d, 0x54, 0x86, 0x71, 0xce, 0x46, 0x28, 0xf6, 0xe6, 0x00, 0xb9, 0x86, 0xed, 0x53, 0xc4, 0x7e,
+	0xf4, 0x7d, 0x98, 0xd5, 0x35, 0x8a, 0x0d, 0xe2, 0x5c, 0xaa, 0x8c, 0x64, 0x8a, 0x42, 0x39, 0x0c,
+	0x68, 0xc6, 0x87, 0x2a, 0x09, 0xa4, 0xae, 0x0a, 0x94, 0x1c, 0xb4, 0x02, 0x85, 0x03, 0x2a, 0x54,
+	0x81, 0xf6, 0x60, 0xbc, 0xe1, 0xf9, 0xd8, 0xcd, 0x8e, 0x32, 0xc4, 0xb7, 0x06, 0x44, 0x64, 0x01,
+	0xa2, 0x08, 0x0c, 0xf9, 0xf7, 0x12, 0xcc, 0x47, 0xce, 0xf2, 0xed, 0x23, 0xe8, 0x39, 0x2c, 0xb6,
+	0x88, 0x63, 0x13, 0xc3, 0xd1, 0x5a, 0x67, 0x97, 0xaa, 0x65, 0x3e, 0xc7, 0x96, 0x79, 0x46, 0x48,
+	0x9d, 0x45, 0xc1, 0xf4, 0x40, 0x22, 0x07, 0x7b, 0x95, 0x85, 0x10, 0x66, 0x87, 0x2c, 0xbb, 0xb0,
+	0x1c, 0x51, 0x20, 0x14, 0x29, 0x27, 0x81, 0xb1, 0x78, 0x03, 0xf0, 0xc1, 0xd0, 0x55, 0xa9, 0xdb,
+	0x6c, 0xcf, 0x61, 0xe1, 0x80, 0x38, 0x4d, 0xcd, 0x32, 0x7f, 0x88, 0xeb, 0x05, 0xd2, 0xb6, 0xeb,
+	0xa6, 0x6d, 0x14, 0xc8, 0x05, 0x42, 0x30, 0x6a, 0xe1, 0x06, 0xb7, 0x57, 0x42, 0x61, 0xbf, 0x51,
+	0x06, 0x92, 0x94, 0xb4, 0xc4, 0x49, 0xf2, 0x7e, 0x7a, 0xe9, 0xd1, 0x31, 0x8d, 0x33, 0xde, 0x3f,
+	0x25, 0x14, 0x3e, 0x40, 0x8b, 0x30, 0x7e, 0x4a, 0x28, 0x25, 0x4d, 0x56, 0x42, 0x13, 0x8a, 0x18,
+	0xc9, 0xff, 0x1e, 0x87, 0x45, 0x96, 0x14, 0x3a, 0x8a, 0x29, 0xd8, 0x6d, 0x5b, 0xd4, 0xbd, 0xba,
+	0x43, 0x6c, 0xc3, 0xb2, 0x88, 0x1a, 0x95, 0x17, 0xa5, 0x50, 0xe7, 0x2b, 0x82, 0xfc, 0x9d, 0x01,
+	0x83, 0x27, 0x24, 0xc1, 0x92, 0xc0, 0x8e, 0xd0, 0x5d, 0x44, 0x60, 0x91, 0xf5, 0x2a, 0x71, 0x9e,
+	0xc9, 0xdb, 0xf2, 0x9c, 0xf7, 0x80, 0x63, 0x0c, 0x5f, 0xc0, 0x12, 0x73, 0x4b, 0x0f, 0x8e, 0xa3,
+	0xb7, 0xe5, 0xb8, 0xc0, 0x90, 0x63, 0x2c, 0x35, 0xc8, 0x30, 0x1d, 0xc3, 0xbc, 0xc6, 0x6f, 0xd5,
+	0x62, 0xce, 0x78, 0x78, 0x61, 0x16, 0x14, 0xe6, 0x82, 0x5e, 0xab, 0xc3, 0x26, 0x7b, 0x67, 0xd0,
+	0x4e, 0xaf, 0xef, 0xe1, 0x50, 0x90, 0x8f, 0x1f, 0x3a, 0x30, 0x3a, 0x64, 0x58, 0x33, 0x15, 0x56,
+	0x2c, 0xcd, 0x14, 0xfb, 0xd6, 0x60, 0x7d, 0x54, 0x88, 0xcf, 0x0c, 0xed, 0x1a, 0x7b, 0x0e, 0x43,
+	0xe4, 0xf4, 0x07, 0x58, 0xef, 0x66, 0x33, 0xcd, 0xd8, 0x14, 0x6e, 0xce, 0xa6, 0xca, 0x30, 0x6a,
+	0x8e, 0xa6, 0x3f, 0x37, 0x6d, 0x23, 0xc4, 0x70, 0x96, 0xa3, 0x87, 0x59, 0x6e, 0xc2, 0x18, 0x76,
+	0x1c, 0xe2, 0x64, 0x53, 0xcc, 0x7e, 0xc8, 0xe7, 0xe2, 0xb4, 0xf4, 0xdc, 0x11, 0xbb, 0x8c, 0x29,
+	0x7c, 0x81, 0xfc, 0x13, 0x09, 0x16, 0x22, 0xb7, 0x31, 0xb7, 0x45, 0x6c, 0x17, 0x23, 0x02, 0xa8,
+	0x23, 0xaf, 0xea, 0xf0, 0x23, 0x28, 0x12, 0xcb, 0x87, 0x03, 0xba, 0x3d, 0x76, 0x94, 0x95, 0x59,
+	0x2d, 0x4a, 0x92, 0xff, 0x26, 0xc1, 0x52, 0x64, 0xf5, 0xa1, 0x43, 0x0c, 0x07, 0xbb, 0xd7, 0x9c,
+	0xfc, 0x37, 0x20, 0xd3, 0x12, 0x0b, 0xd5, 0x16, 0x76, 0x74, 0xaf, 0x0f, 0xf1, 0xd2, 0xcf, 0x98,
+	0x32, 0xe3, 0xd3, 0x0f, 0x39, 0x19, 0xbd, 0x03, 0xd0, 0x69, 0xa2, 0xc4, 0x3d, 0x62, 0x25, 0x96,
+	0xe6, 0x6b, 0xfe, 0x5d, 0x56, 0x49, 0x05, 0xed, 0x13, 0x7a, 0x17, 0x26, 0xdb, 0xad, 0xba, 0x46,
+	0x31, 0xdf, 0x3b, 0x7a, 0xed, 0x5e, 0xe0, 0xcb, 0x3d, 0x82, 0xfc, 0xd3, 0xa8, 0x99, 0x03, 0xcd,
+	0x1c, 0x98, 0x0b, 0x99, 0xd9, 0x97, 0x57, 0xd8, 0x39, 0x3f, 0xb4, 0x9d, 0x7d, 0x7c, 0x25, 0xe4,
+	0x44, 0x9f, 0x26, 0xe7, 0x20, 0xd3, 0xc9, 0xe7, 0x27, 0xd8, 0xa1, 0xf8, 0x02, 0xa5, 0x41, 0xba,
+	0x10, 0x79, 0x5c, 0x62, 0xa3, 0x4b, 0x91, 0xc2, 0xa5, 0x4b, 0xb9, 0x05, 0x8b, 0xf1, 0xfc, 0x7f,
+	0x48, 0xac, 0x4b, 0x74, 0x02, 0x13, 0xe7, 0xd8, 0xa1, 0xa6, 0x1e, 0xd4, 0x9c, 0x47, 0x37, 0x17,
+	0x39, 0x2a, 0x83, 0x12, 0x60, 0xc9, 0x7f, 0x91, 0x60, 0xd2, 0x3b, 0x57, 0xff, 0xb3, 0x0e, 0x13,
+	0x3d, 0x09, 0x6a, 0x29, 0xcf, 0xe3, 0x0f, 0x07, 0x4b, 0x08, 0xdd, 0x05, 0xf4, 0x77, 0x12, 0xa4,
+	0x02, 0x2a, 0x72, 0x60, 0xde, 0x61, 0x91, 0x50, 0x57, 0x4f, 0x85, 0x31, 0xd5, 0x53, 0x72, 0x21,
+	0x34, 0xfb, 0x70, 0x18, 0x03, 0x86, 0x9d, 0xa2, 0x20, 0x81, 0x1e, 0xae, 0xd4, 0x91, 0x06, 0x27,
+	0x31, 0x40, 0x83, 0x23, 0x7f, 0x02, 0xd3, 0xdd, 0x39, 0xce, 0xab, 0xfb, 0xec, 0x41, 0x84, 0x9f,
+	0x44, 0xf6, 0x1b, 0x7d, 0x14, 0xea, 0xfe, 0x78, 0xb9, 0xfd, 0xe6, 0x60, 0x26, 0x8b, 0x35, 0x7f,
+	0xf2, 0x97, 0x12, 0xcc, 0x75, 0xa7, 0x3d, 0x6e, 0xc0, 0x4f, 0x60, 0xc9, 0x0e, 0x54, 0xef, 0x65,
+	0xc3, 0x6f, 0xdf, 0xc6, 0x86, 0x05, 0x72, 0xa1, 0x2c, 0xd8, 0x3d, 0xfb, 0x9d, 0xdb, 0x58, 0xf1,
+	0xef, 0x09, 0xc8, 0xf6, 0xcb, 0xe1, 0x5f, 0x63, 0x8f, 0xdf, 0x1d, 0xd7, 0xa3, 0xb1, 0xb8, 0x3e,
+	0x0e, 0xe2, 0x9a, 0x3b, 0xe9, 0xfd, 0x61, 0x2b, 0x50, 0x57, 0x84, 0x23, 0xa5, 0x73, 0x40, 0x93,
+	0xb7, 0x39, 0xa0, 0xe5, 0x91, 0xce, 0x11, 0x7d, 0x05, 0x26, 0xa8, 0xc7, 0xcc, 0x7f, 0x00, 0x4b,
+	0x7a, 0x93, 0x8c, 0x52, 0xa9, 0x17, 0xd2, 0x00, 0x62, 0xd2, 0x6e, 0x10, 0xf9, 0x0f, 0x12, 0xac,
+	0x1e, 0x51, 0x07, 0x6b, 0xcd, 0x8e, 0x5d, 0xbb, 0x5f, 0x17, 0x75, 0x48, 0x07, 0x8f, 0x79, 0x0d,
+	0xd3, 0x10, 0x76, 0x1e, 0xa0, 0x43, 0x0e, 0xe0, 0xfd, 0x57, 0xb7, 0x86, 0x69, 0x94, 0x47, 0x94,
+	0xc9, 0xf3, 0xce, 0x10, 0xdd, 0x8b, 0xbe, 0x52, 0x7a, 0x11, 0x92, 0x2e, 0x8f, 0x74, 0xbf, 0x53,
+	0x16, 0xe6, 0xbc, 0xab, 0xbc, 0x40, 0x53, 0x1d, 0x2e, 0xa0, 0xfc, 0x1f, 0x09, 0xd6, 0xfa, 0xa9,
+	0x20, 0x4a, 0x72, 0x50, 0xd6, 0xa5, 0x6b, 0xca, 0x3a, 0xba, 0xe8, 0x59, 0xbc, 0x79, 0xbc, 0x56,
+	0x86, 0xd5, 0xf9, 0x26, 0x55, 0x1c, 0xbd, 0x05, 0x8b, 0x71, 0xce, 0xac, 0x6c, 0xf3, 0xfb, 0xee,
+	0x7c, 0x6c, 0xcb, 0xb1, 0x63, 0xca, 0x6f, 0xc0, 0xff, 0x05, 0xbc, 0xae, 0x7e, 0x6c, 0x91, 0xf7,
+	0x42, 0x9e, 0xee, 0xf9, 0x2a, 0xd5, 0xf3, 0x95, 0x48, 0xea, 0xfd, 0x4a, 0x24, 0xaf, 0x87, 0xd0,
+	0xba, 0xe3, 0x5b, 0xb0, 0x7b, 0x1d, 0xe4, 0x60, 0x41, 0xdf, 0x97, 0x23, 0xf9, 0x37, 0x12, 0x2c,
+	0x76, 0x96, 0x51, 0xe2, 0xb0, 0x0b, 0x3d, 0x13, 0x67, 0x17, 0x36, 0xb0, 0xad, 0x9d, 0x5a, 0x58,
+	0x75, 0x39, 0x5d, 0x8d, 0xd9, 0x47, 0x48, 0xb7, 0xca, 0xd7, 0x89, 0xed, 0x51, 0x6b, 0xa3, 0x7d,
+	0xb8, 0x1b, 0xdb, 0x19, 0x60, 0xd6, 0x4d, 0x07, 0xeb, 0x94, 0x38, 0x97, 0xc2, 0xcc, 0x1b, 0x51,
+	0x33, 0x0b, 0xd4, 0x1d, 0x7f, 0x9d, 0xfc, 0x55, 0x12, 0xd6, 0xaf, 0xf1, 0x6f, 0xcf, 0xc6, 0x5f,
+	0xfa, 0x7a, 0x1b, 0xff, 0x06, 0xcc, 0xbe, 0x84, 0xeb, 0x5a, 0xc6, 0x8a, 0xde, 0x61, 0xfa, 0x5c,
+	0x30, 0x92, 0x2f, 0xf7, 0x82, 0xd1, 0xbb, 0xf7, 0x1f, 0x7d, 0x89, 0xbd, 0xbf, 0xfc, 0xc5, 0x38,
+	0xcc, 0xf7, 0xca, 0x55, 0xa8, 0x06, 0x77, 0xc4, 0xa7, 0x0d, 0xf1, 0x40, 0xfb, 0x68, 0x88, 0x44,
+	0xe0, 0x7f, 0x25, 0xf1, 0xa1, 0xd0, 0xcf, 0xae, 0x7b, 0xac, 0xe7, 0x49, 0x67, 0x6f, 0x08, 0x5e,
+	0x7d, 0x8f, 0x5b, 0x79, 0xe4, 0xaa, 0x77, 0xfb, 0x4f, 0xfb, 0x7e, 0xb4, 0xe0, 0xce, 0xde, 0x1d,
+	0x42, 0x94, 0x5e, 0x89, 0xa6, 0x3c, 0xd2, 0xe7, 0xfb, 0xc5, 0x17, 0x03, 0x7c, 0x38, 0xf8, 0x68,
+	0x08, 0x61, 0xae, 0x4e, 0x90, 0xe5, 0x91, 0x6b, 0xbf, 0x21, 0x7c, 0x0a, 0x8b, 0x22, 0x2a, 0xa9,
+	0x08, 0x29, 0x5f, 0xa8, 0xb1, 0xa1, 0x2d, 0xd4, 0x2b, 0x79, 0x7a, 0x16, 0x22, 0x3d, 0xe8, 0xc8,
+	0x80, 0x69, 0x3f, 0x71, 0x09, 0xc6, 0x6b, 0x83, 0xf6, 0xbe, 0xbd, 0xb3, 0xad, 0x32, 0xe5, 0x86,
+	0x87, 0x05, 0x04, 0x99, 0x4e, 0xa5, 0xe5, 0xac, 0xee, 0xff, 0x52, 0x82, 0x3b, 0x22, 0x8c, 0xd1,
+	0x12, 0xcc, 0x3d, 0x2e, 0xe5, 0x6b, 0xc7, 0x4a, 0x49, 0x3d, 0x3e, 0x38, 0x3a, 0x2c, 0x15, 0x2b,
+	0x8f, 0x2b, 0xa5, 0x9d, 0xcc, 0x08, 0x9a, 0x83, 0x99, 0xbd, 0x7c, 0xa1, 0xb4, 0xa7, 0xee, 0x94,
+	0x6a, 0xa5, 0x62, 0xad, 0x52, 0x3d, 0xc8, 0x48, 0x68, 0x19, 0x16, 0x8e, 0xca, 0xd5, 0x9a, 0x5a,
+	0x2c, 0xe7, 0x0f, 0x76, 0x4b, 0xa1, 0xa9, 0x04, 0x5a, 0x83, 0x95, 0xd2, 0xc7, 0x87, 0x7b, 0x95,
+	0x62, 0xa5, 0xa6, 0x16, 0xab, 0x07, 0xb5, 0xd2, 0x41, 0x2d, 0x34, 0x9f, 0x44, 0x08, 0xa6, 0x6b,
+	0xa5, 0x8f, 0xc3, 0xb4, 0x3b, 0x1e, 0x8f, 0x6a, 0xe1, 0x3b, 0xa5, 0x62, 0x4d, 0xad, 0x29, 0xf9,
+	0xe2, 0x93, 0xca, 0xc1, 0x6e, 0x26, 0x75, 0xdf, 0x01, 0x14, 0xff, 0x1a, 0x82, 0x5e, 0x87, 0x8d,
+	0x88, 0x38, 0xea, 0x7e, 0x75, 0x27, 0x2a, 0xf4, 0x14, 0xa4, 0x98, 0x7c, 0xde, 0x54, 0x46, 0x42,
+	0xd3, 0x00, 0x8f, 0x95, 0xfc, 0x7e, 0x89, 0x8f, 0x13, 0x9e, 0xb2, 0x6c, 0x3a, 0x7f, 0xb0, 0xa3,
+	0x86, 0x26, 0x92, 0xf7, 0x29, 0x40, 0xe7, 0x89, 0x11, 0xad, 0xc0, 0xe2, 0x5e, 0xe5, 0x49, 0x69,
+	0xaf, 0x52, 0xae, 0x56, 0x77, 0x22, 0x1c, 0x66, 0x61, 0xea, 0xa4, 0xa4, 0x3c, 0x55, 0x8f, 0x0f,
+	0xd8, 0x92, 0xa7, 0x19, 0x09, 0xa5, 0x61, 0x22, 0x18, 0x25, 0xbc, 0xd1, 0x61, 0xf5, 0xe8, 0xa8,
+	0x52, 0xd8, 0x2b, 0x65, 0x92, 0x08, 0x60, 0x5c, 0xcc, 0x8c, 0xa2, 0x19, 0x98, 0x64, 0x5b, 0x05,
+	0x61, 0xec, 0xfe, 0x1f, 0x25, 0xc8, 0x44, 0xf3, 0x0a, 0x7a, 0x0d, 0x56, 0x8f, 0x6a, 0x4a, 0x29,
+	0xbf, 0x5f, 0x39, 0xd8, 0x55, 0x7b, 0xbb, 0x66, 0x15, 0x96, 0x3b, 0x4b, 0xe2, 0x4e, 0xba, 0x0b,
+	0xeb, 0x9d, 0xe9, 0x7e, 0xee, 0xda, 0x84, 0xd7, 0x3b, 0x8b, 0xae, 0x74, 0x5c, 0x17, 0xb7, 0xa8,
+	0xbb, 0x46, 0xb7, 0x7f, 0x2b, 0x41, 0x96, 0x25, 0xd9, 0x4a, 0x28, 0x4c, 0x8f, 0xb0, 0x73, 0x6e,
+	0xea, 0x18, 0xfd, 0x5c, 0x82, 0xa9, 0xae, 0x4e, 0x0e, 0x0d, 0xd0, 0x6f, 0xf6, 0xea, 0x62, 0x57,
+	0x56, 0xfd, 0xfd, 0xa1, 0x8f, 0xf7, 0xb9, 0xaa, 0xff, 0xf1, 0x5e, 0xbe, 0xf7, 0xa3, 0xbf, 0xfe,
+	0xf3, 0xf3, 0xc4, 0xba, 0xbc, 0x12, 0xfd, 0x3f, 0x81, 0xfb, 0x48, 0xd4, 0x1f, 0xfc, 0x48, 0xba,
+	0xbf, 0xfd, 0x95, 0x04, 0xaf, 0x75, 0x97, 0x88, 0x5e, 0xd2, 0xff, 0x3a, 0xdc, 0xd3, 0x74, 0xab,
+	0x31, 0x4c, 0x82, 0xe8, 0xa9, 0x4f, 0xf9, 0xf6, 0x40, 0xbc, 0x37, 0xde, 0x94, 0xde, 0x94, 0x0a,
+	0x9f, 0x25, 0xe0, 0x1b, 0x3a, 0x69, 0xde, 0x18, 0xb3, 0xb0, 0xda, 0x4f, 0xf9, 0x43, 0xef, 0x2a,
+	0x77, 0x28, 0x7d, 0xf7, 0xa9, 0x80, 0x32, 0x88, 0xa5, 0xd9, 0x46, 0x8e, 0x38, 0xc6, 0x96, 0x81,
+	0x6d, 0x76, 0xd1, 0xdb, 0xe2, 0x53, 0x5a, 0xcb, 0x74, 0xaf, 0xff, 0x57, 0xc7, 0xbb, 0xb1, 0xb9,
+	0x5f, 0x25, 0x36, 0x77, 0x39, 0x76, 0x91, 0x89, 0x19, 0x93, 0x24, 0x77, 0xf2, 0xe0, 0xf0, 0x61,
+	0xc1, 0xdb, 0xfc, 0xa5, 0xbf, 0xf4, 0x19, 0x5b, 0xfa, 0x2c, 0xb6, 0xf4, 0xd9, 0x89, 0xcf, 0xe7,
+	0x74, 0x9c, 0xc9, 0xf6, 0xf0, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6b, 0xcb, 0x43, 0xd9, 0x70,
+	0x22, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2693,160 +2667,3 @@ var _StreamingVideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/cloud/videointelligence/v1p3beta1/video_intelligence.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1p3beta1/video_intelligence.proto", fileDescriptor_video_intelligence_26bfd7f2669c7d48)
-}
-
-var fileDescriptor_video_intelligence_26bfd7f2669c7d48 = []byte{
-	// 2371 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0xe3, 0xc6,
-	0xf5, 0x37, 0x25, 0xdb, 0x6b, 0x3d, 0xcb, 0xb6, 0x3c, 0xfe, 0x25, 0x3b, 0xf1, 0x8f, 0x70, 0xb3,
-	0xf8, 0x3a, 0xfb, 0x2d, 0xe4, 0xac, 0x37, 0x0d, 0x9a, 0xcd, 0x8f, 0x46, 0x92, 0xb5, 0x96, 0xba,
-	0xb6, 0xe5, 0xd0, 0xb2, 0x91, 0x6d, 0xb7, 0x20, 0x68, 0x6a, 0x44, 0xb3, 0x4b, 0x71, 0xb4, 0xe4,
-	0xc8, 0xb1, 0x7b, 0x49, 0x50, 0xf4, 0x50, 0xa0, 0x87, 0x1e, 0x82, 0x02, 0x05, 0x0a, 0xe4, 0x0f,
-	0xe8, 0xa5, 0x45, 0xaf, 0x3d, 0xb4, 0x28, 0x7a, 0x69, 0xd0, 0x5b, 0x91, 0x43, 0x8b, 0x1e, 0x7b,
-	0x28, 0xd0, 0xff, 0xa0, 0xa7, 0x82, 0x33, 0x43, 0x8a, 0x22, 0x25, 0xdb, 0x92, 0xb3, 0xe8, 0x4d,
-	0xf3, 0x66, 0xe6, 0xf3, 0x7e, 0xce, 0x7b, 0x6f, 0x86, 0x82, 0xbc, 0x41, 0x88, 0x61, 0xe1, 0x2d,
-	0xdd, 0x22, 0xed, 0xfa, 0xd6, 0xb9, 0x59, 0xc7, 0xc4, 0xb4, 0x29, 0xb6, 0x2c, 0xd3, 0xc0, 0xb6,
-	0x8e, 0xb7, 0xce, 0x1f, 0xb4, 0x1e, 0x9e, 0x62, 0xaa, 0x3d, 0xe0, 0x73, 0x6a, 0x78, 0x32, 0xd7,
-	0x72, 0x08, 0x25, 0x68, 0x93, 0x43, 0xe4, 0x18, 0x44, 0x2e, 0x06, 0x91, 0x0b, 0x20, 0x56, 0x5e,
-	0x15, 0xcc, 0xb4, 0x96, 0xb9, 0xa5, 0xd9, 0x36, 0xa1, 0x1a, 0x35, 0x89, 0xed, 0x72, 0x9c, 0x95,
-	0xbb, 0x62, 0xd6, 0x22, 0xb6, 0xe1, 0xb4, 0x6d, 0xdb, 0xb4, 0x8d, 0x2d, 0xd2, 0xc2, 0x4e, 0xd7,
-	0xa2, 0x35, 0xb1, 0x88, 0x8d, 0x4e, 0xdb, 0x8d, 0xad, 0x7a, 0x9b, 0x2f, 0x10, 0xf3, 0xeb, 0xd1,
-	0x79, 0x6a, 0x36, 0xb1, 0x4b, 0xb5, 0x66, 0x4b, 0x2c, 0x58, 0x12, 0x0b, 0x9c, 0x96, 0xbe, 0xe5,
-	0x52, 0x8d, 0xb6, 0x05, 0xb2, 0xfc, 0xa7, 0x04, 0xcc, 0xe7, 0xb9, 0x50, 0xf8, 0xc4, 0x53, 0x42,
-	0xc1, 0x2f, 0xda, 0xd8, 0xa5, 0xe8, 0x15, 0x48, 0x99, 0x76, 0xab, 0x4d, 0xd5, 0xb6, 0x63, 0x66,
-	0xa5, 0x0d, 0x69, 0x33, 0xa5, 0x4c, 0x30, 0xc2, 0xb1, 0x63, 0xa2, 0xbb, 0x30, 0xc5, 0x27, 0x75,
-	0x62, 0x53, 0x6c, 0xd3, 0xec, 0xf8, 0x86, 0xb4, 0x99, 0x56, 0xd2, 0x8c, 0x58, 0xe4, 0x34, 0xb4,
-	0x0f, 0x13, 0x0d, 0xac, 0xd1, 0xb6, 0x83, 0xdd, 0x6c, 0x62, 0x23, 0xb9, 0x39, 0xbd, 0xfd, 0x20,
-	0x77, 0x53, 0xa3, 0xe5, 0x1e, 0xf3, 0x9d, 0x4a, 0x00, 0x81, 0xbe, 0x07, 0x53, 0xdc, 0x19, 0x8c,
-	0xe7, 0x05, 0xcd, 0x26, 0x37, 0xa4, 0xcd, 0xc9, 0xed, 0xb7, 0x6f, 0x8e, 0xc9, 0xf4, 0x2b, 0xf2,
-	0xdd, 0x4a, 0xfa, 0x3c, 0x34, 0x42, 0xab, 0x00, 0xa4, 0x4d, 0x7d, 0x75, 0x47, 0x99, 0xba, 0x29,
-	0x4e, 0xf1, 0xf4, 0x5d, 0x87, 0x49, 0x8b, 0xe8, 0xcc, 0xe2, 0xaa, 0x59, 0xcf, 0x8e, 0xb1, 0x79,
-	0xf0, 0x49, 0x95, 0xba, 0xfc, 0xaf, 0x51, 0x48, 0x87, 0xe1, 0x91, 0x02, 0x13, 0x2e, 0x36, 0x9a,
-	0xd8, 0xa6, 0x6e, 0x56, 0xda, 0x48, 0x0e, 0x21, 0xe8, 0x11, 0xdf, 0xae, 0x04, 0x38, 0x88, 0xc2,
-	0xa2, 0xa5, 0x9d, 0x62, 0x4b, 0xad, 0x63, 0x8a, 0x75, 0x26, 0x8c, 0x4e, 0xec, 0x86, 0x69, 0x64,
-	0x13, 0xcc, 0x14, 0x1f, 0xdc, 0x9c, 0xc3, 0x9e, 0x87, 0xb3, 0xe3, 0xc3, 0x14, 0x19, 0x8a, 0x32,
-	0x6f, 0xf5, 0xa0, 0xa2, 0x1f, 0x4b, 0xf0, 0xaa, 0x7b, 0x46, 0xa8, 0xaa, 0x9f, 0x69, 0xb6, 0x81,
-	0xe3, 0xcc, 0xb9, 0x1f, 0x8a, 0x37, 0x67, 0x7e, 0x74, 0x46, 0x68, 0x91, 0x81, 0x45, 0x25, 0x58,
-	0x76, 0xfb, 0x4d, 0xa1, 0xcf, 0x25, 0x78, 0x0d, 0x5f, 0xb4, 0x2c, 0x53, 0x37, 0x83, 0xb0, 0x8b,
-	0xcb, 0x32, 0xca, 0x64, 0x29, 0xdf, 0x5c, 0x96, 0x92, 0x80, 0x14, 0x41, 0x1b, 0x15, 0x68, 0x0d,
-	0x5f, 0x39, 0x8f, 0x5e, 0xc0, 0x82, 0xe7, 0xee, 0xb8, 0x20, 0x13, 0x4c, 0x90, 0xf7, 0x6f, 0x2e,
-	0x48, 0x0d, 0x5f, 0xc4, 0xb8, 0xcf, 0xd1, 0x38, 0x51, 0xfe, 0xb3, 0x04, 0xf3, 0xbd, 0xdc, 0x87,
-	0x6c, 0x98, 0x8f, 0x86, 0x47, 0x93, 0xd4, 0x31, 0x3b, 0xbc, 0xd3, 0xdb, 0xef, 0x0d, 0x1b, 0x1c,
-	0xfb, 0xa4, 0x8e, 0x15, 0x64, 0xc5, 0x68, 0xe8, 0xff, 0x61, 0xd6, 0xe5, 0xb9, 0x4c, 0x73, 0x2e,
-	0x55, 0x5d, 0x6b, 0x62, 0x47, 0x63, 0x91, 0x38, 0xa1, 0x64, 0x3a, 0x13, 0x45, 0x46, 0x47, 0xf3,
-	0x30, 0xe6, 0x09, 0x63, 0xb1, 0x68, 0x49, 0x29, 0x7c, 0x20, 0x3f, 0x80, 0xe5, 0xbe, 0xc1, 0xd0,
-	0xd9, 0x22, 0x85, 0xb7, 0xbc, 0x0d, 0x6b, 0x57, 0xfb, 0xac, 0xcf, 0xbe, 0xf7, 0x60, 0xae, 0x87,
-	0x89, 0xd1, 0x3d, 0x98, 0xb6, 0x34, 0xdb, 0x68, 0x6b, 0x06, 0x56, 0xcf, 0x4c, 0xff, 0xb4, 0xa6,
-	0x94, 0x29, 0x9f, 0x5a, 0xf6, 0x88, 0xf2, 0x2f, 0x24, 0x71, 0xbe, 0xc5, 0xa9, 0x44, 0x25, 0xa6,
-	0xbc, 0x43, 0x55, 0x2f, 0xd3, 0xaa, 0xa4, 0xd1, 0x70, 0x31, 0x65, 0x0c, 0x27, 0xb7, 0x97, 0x7d,
-	0x4b, 0xfb, 0xd9, 0x38, 0xb7, 0x23, 0xb2, 0xb5, 0x32, 0xc3, 0xf6, 0xd4, 0xcc, 0x26, 0xae, 0xb2,
-	0x1d, 0x28, 0x0f, 0x33, 0xd8, 0xae, 0x77, 0x81, 0x24, 0xae, 0x03, 0x99, 0xc2, 0x76, 0xbd, 0x03,
-	0x21, 0x7f, 0x26, 0x41, 0x9a, 0x79, 0xcc, 0x17, 0xed, 0x10, 0xee, 0x88, 0x94, 0x21, 0x04, 0x1a,
-	0x36, 0xf3, 0xf8, 0x30, 0x68, 0x0d, 0x80, 0x85, 0x75, 0xdd, 0x5b, 0xcd, 0x04, 0x4c, 0x28, 0x21,
-	0x8a, 0x7c, 0x06, 0xc0, 0x24, 0x78, 0xec, 0x68, 0x4d, 0x8c, 0x1e, 0xc1, 0xe4, 0x40, 0x46, 0x01,
-	0xda, 0xb1, 0xc7, 0x75, 0x9c, 0x2c, 0x18, 0x2f, 0xd9, 0xd4, 0xa4, 0x97, 0x5e, 0x7d, 0xc2, 0xec,
-	0x97, 0x97, 0x90, 0x45, 0x7d, 0xe2, 0x84, 0x4a, 0x1d, 0x6d, 0xc0, 0x64, 0x1d, 0xbb, 0xba, 0x63,
-	0xb6, 0x3c, 0x0e, 0x0c, 0x27, 0xa5, 0x84, 0x49, 0x5e, 0x05, 0x0b, 0xfc, 0xae, 0x7b, 0xa7, 0x84,
-	0xc7, 0x65, 0xda, 0x27, 0x16, 0x49, 0x1d, 0xcb, 0xff, 0x48, 0xc0, 0x0c, 0x53, 0x2c, 0x1f, 0x94,
-	0x6d, 0x54, 0x86, 0x71, 0xce, 0x46, 0x28, 0xf6, 0xe6, 0x00, 0xb9, 0x86, 0xed, 0x53, 0xc4, 0x7e,
-	0xf4, 0x7d, 0x98, 0xd5, 0x35, 0x8a, 0x0d, 0xe2, 0x5c, 0xaa, 0x8c, 0x64, 0x8a, 0x42, 0x39, 0x0c,
-	0x68, 0xc6, 0x87, 0x2a, 0x09, 0xa4, 0xae, 0x0a, 0x94, 0x1c, 0xb4, 0x02, 0x85, 0x03, 0x2a, 0x54,
-	0x81, 0xf6, 0x60, 0xbc, 0xe1, 0xf9, 0xd8, 0xcd, 0x8e, 0x32, 0xc4, 0xb7, 0x06, 0x44, 0x64, 0x01,
-	0xa2, 0x08, 0x0c, 0xf9, 0xf7, 0x12, 0xcc, 0x47, 0xce, 0xf2, 0xed, 0x23, 0xe8, 0x39, 0x2c, 0xb6,
-	0x88, 0x63, 0x13, 0xc3, 0xd1, 0x5a, 0x67, 0x97, 0xaa, 0x65, 0x3e, 0xc7, 0x96, 0x79, 0x46, 0x48,
-	0x9d, 0x45, 0xc1, 0xf4, 0x40, 0x22, 0x07, 0x7b, 0x95, 0x85, 0x10, 0x66, 0x87, 0x2c, 0xbb, 0xb0,
-	0x1c, 0x51, 0x20, 0x14, 0x29, 0x27, 0x81, 0xb1, 0x78, 0x03, 0xf0, 0xc1, 0xd0, 0x55, 0xa9, 0xdb,
-	0x6c, 0xcf, 0x61, 0xe1, 0x80, 0x38, 0x4d, 0xcd, 0x32, 0x7f, 0x88, 0xeb, 0x05, 0xd2, 0xb6, 0xeb,
-	0xa6, 0x6d, 0x14, 0xc8, 0x05, 0x42, 0x30, 0x6a, 0xe1, 0x06, 0xb7, 0x57, 0x42, 0x61, 0xbf, 0x51,
-	0x06, 0x92, 0x94, 0xb4, 0xc4, 0x49, 0xf2, 0x7e, 0x7a, 0xe9, 0xd1, 0x31, 0x8d, 0x33, 0xde, 0x3f,
-	0x25, 0x14, 0x3e, 0x40, 0x8b, 0x30, 0x7e, 0x4a, 0x28, 0x25, 0x4d, 0x56, 0x42, 0x13, 0x8a, 0x18,
-	0xc9, 0xff, 0x1e, 0x87, 0x45, 0x96, 0x14, 0x3a, 0x8a, 0x29, 0xd8, 0x6d, 0x5b, 0xd4, 0xbd, 0xba,
-	0x43, 0x6c, 0xc3, 0xb2, 0x88, 0x1a, 0x95, 0x17, 0xa5, 0x50, 0xe7, 0x2b, 0x82, 0xfc, 0x9d, 0x01,
-	0x83, 0x27, 0x24, 0xc1, 0x92, 0xc0, 0x8e, 0xd0, 0x5d, 0x44, 0x60, 0x91, 0xf5, 0x2a, 0x71, 0x9e,
-	0xc9, 0xdb, 0xf2, 0x9c, 0xf7, 0x80, 0x63, 0x0c, 0x5f, 0xc0, 0x12, 0x73, 0x4b, 0x0f, 0x8e, 0xa3,
-	0xb7, 0xe5, 0xb8, 0xc0, 0x90, 0x63, 0x2c, 0x35, 0xc8, 0x30, 0x1d, 0xc3, 0xbc, 0xc6, 0x6f, 0xd5,
-	0x62, 0xce, 0x78, 0x78, 0x61, 0x16, 0x14, 0xe6, 0x82, 0x5e, 0xab, 0xc3, 0x26, 0x7b, 0x67, 0xd0,
-	0x4e, 0xaf, 0xef, 0xe1, 0x50, 0x90, 0x8f, 0x1f, 0x3a, 0x30, 0x3a, 0x64, 0x58, 0x33, 0x15, 0x56,
-	0x2c, 0xcd, 0x14, 0xfb, 0xd6, 0x60, 0x7d, 0x54, 0x88, 0xcf, 0x0c, 0xed, 0x1a, 0x7b, 0x0e, 0x43,
-	0xe4, 0xf4, 0x07, 0x58, 0xef, 0x66, 0x33, 0xcd, 0xd8, 0x14, 0x6e, 0xce, 0xa6, 0xca, 0x30, 0x6a,
-	0x8e, 0xa6, 0x3f, 0x37, 0x6d, 0x23, 0xc4, 0x70, 0x96, 0xa3, 0x87, 0x59, 0x6e, 0xc2, 0x18, 0x76,
-	0x1c, 0xe2, 0x64, 0x53, 0xcc, 0x7e, 0xc8, 0xe7, 0xe2, 0xb4, 0xf4, 0xdc, 0x11, 0xbb, 0x8c, 0x29,
-	0x7c, 0x81, 0xfc, 0x13, 0x09, 0x16, 0x22, 0xb7, 0x31, 0xb7, 0x45, 0x6c, 0x17, 0x23, 0x02, 0xa8,
-	0x23, 0xaf, 0xea, 0xf0, 0x23, 0x28, 0x12, 0xcb, 0x87, 0x03, 0xba, 0x3d, 0x76, 0x94, 0x95, 0x59,
-	0x2d, 0x4a, 0x92, 0xff, 0x26, 0xc1, 0x52, 0x64, 0xf5, 0xa1, 0x43, 0x0c, 0x07, 0xbb, 0xd7, 0x9c,
-	0xfc, 0x37, 0x20, 0xd3, 0x12, 0x0b, 0xd5, 0x16, 0x76, 0x74, 0xaf, 0x0f, 0xf1, 0xd2, 0xcf, 0x98,
-	0x32, 0xe3, 0xd3, 0x0f, 0x39, 0x19, 0xbd, 0x03, 0xd0, 0x69, 0xa2, 0xc4, 0x3d, 0x62, 0x25, 0x96,
-	0xe6, 0x6b, 0xfe, 0x5d, 0x56, 0x49, 0x05, 0xed, 0x13, 0x7a, 0x17, 0x26, 0xdb, 0xad, 0xba, 0x46,
-	0x31, 0xdf, 0x3b, 0x7a, 0xed, 0x5e, 0xe0, 0xcb, 0x3d, 0x82, 0xfc, 0xd3, 0xa8, 0x99, 0x03, 0xcd,
-	0x1c, 0x98, 0x0b, 0x99, 0xd9, 0x97, 0x57, 0xd8, 0x39, 0x3f, 0xb4, 0x9d, 0x7d, 0x7c, 0x25, 0xe4,
-	0x44, 0x9f, 0x26, 0xe7, 0x20, 0xd3, 0xc9, 0xe7, 0x27, 0xd8, 0xa1, 0xf8, 0x02, 0xa5, 0x41, 0xba,
-	0x10, 0x79, 0x5c, 0x62, 0xa3, 0x4b, 0x91, 0xc2, 0xa5, 0x4b, 0xb9, 0x05, 0x8b, 0xf1, 0xfc, 0x7f,
-	0x48, 0xac, 0x4b, 0x74, 0x02, 0x13, 0xe7, 0xd8, 0xa1, 0xa6, 0x1e, 0xd4, 0x9c, 0x47, 0x37, 0x17,
-	0x39, 0x2a, 0x83, 0x12, 0x60, 0xc9, 0x7f, 0x91, 0x60, 0xd2, 0x3b, 0x57, 0xff, 0xb3, 0x0e, 0x13,
-	0x3d, 0x09, 0x6a, 0x29, 0xcf, 0xe3, 0x0f, 0x07, 0x4b, 0x08, 0xdd, 0x05, 0xf4, 0x77, 0x12, 0xa4,
-	0x02, 0x2a, 0x72, 0x60, 0xde, 0x61, 0x91, 0x50, 0x57, 0x4f, 0x85, 0x31, 0xd5, 0x53, 0x72, 0x21,
-	0x34, 0xfb, 0x70, 0x18, 0x03, 0x86, 0x9d, 0xa2, 0x20, 0x81, 0x1e, 0xae, 0xd4, 0x91, 0x06, 0x27,
-	0x31, 0x40, 0x83, 0x23, 0x7f, 0x02, 0xd3, 0xdd, 0x39, 0xce, 0xab, 0xfb, 0xec, 0x41, 0x84, 0x9f,
-	0x44, 0xf6, 0x1b, 0x7d, 0x14, 0xea, 0xfe, 0x78, 0xb9, 0xfd, 0xe6, 0x60, 0x26, 0x8b, 0x35, 0x7f,
-	0xf2, 0x97, 0x12, 0xcc, 0x75, 0xa7, 0x3d, 0x6e, 0xc0, 0x4f, 0x60, 0xc9, 0x0e, 0x54, 0xef, 0x65,
-	0xc3, 0x6f, 0xdf, 0xc6, 0x86, 0x05, 0x72, 0xa1, 0x2c, 0xd8, 0x3d, 0xfb, 0x9d, 0xdb, 0x58, 0xf1,
-	0xef, 0x09, 0xc8, 0xf6, 0xcb, 0xe1, 0x5f, 0x63, 0x8f, 0xdf, 0x1d, 0xd7, 0xa3, 0xb1, 0xb8, 0x3e,
-	0x0e, 0xe2, 0x9a, 0x3b, 0xe9, 0xfd, 0x61, 0x2b, 0x50, 0x57, 0x84, 0x23, 0xa5, 0x73, 0x40, 0x93,
-	0xb7, 0x39, 0xa0, 0xe5, 0x91, 0xce, 0x11, 0x7d, 0x05, 0x26, 0xa8, 0xc7, 0xcc, 0x7f, 0x00, 0x4b,
-	0x7a, 0x93, 0x8c, 0x52, 0xa9, 0x17, 0xd2, 0x00, 0x62, 0xd2, 0x6e, 0x10, 0xf9, 0x0f, 0x12, 0xac,
-	0x1e, 0x51, 0x07, 0x6b, 0xcd, 0x8e, 0x5d, 0xbb, 0x5f, 0x17, 0x75, 0x48, 0x07, 0x8f, 0x79, 0x0d,
-	0xd3, 0x10, 0x76, 0x1e, 0xa0, 0x43, 0x0e, 0xe0, 0xfd, 0x57, 0xb7, 0x86, 0x69, 0x94, 0x47, 0x94,
-	0xc9, 0xf3, 0xce, 0x10, 0xdd, 0x8b, 0xbe, 0x52, 0x7a, 0x11, 0x92, 0x2e, 0x8f, 0x74, 0xbf, 0x53,
-	0x16, 0xe6, 0xbc, 0xab, 0xbc, 0x40, 0x53, 0x1d, 0x2e, 0xa0, 0xfc, 0x1f, 0x09, 0xd6, 0xfa, 0xa9,
-	0x20, 0x4a, 0x72, 0x50, 0xd6, 0xa5, 0x6b, 0xca, 0x3a, 0xba, 0xe8, 0x59, 0xbc, 0x79, 0xbc, 0x56,
-	0x86, 0xd5, 0xf9, 0x26, 0x55, 0x1c, 0xbd, 0x05, 0x8b, 0x71, 0xce, 0xac, 0x6c, 0xf3, 0xfb, 0xee,
-	0x7c, 0x6c, 0xcb, 0xb1, 0x63, 0xca, 0x6f, 0xc0, 0xff, 0x05, 0xbc, 0xae, 0x7e, 0x6c, 0x91, 0xf7,
-	0x42, 0x9e, 0xee, 0xf9, 0x2a, 0xd5, 0xf3, 0x95, 0x48, 0xea, 0xfd, 0x4a, 0x24, 0xaf, 0x87, 0xd0,
-	0xba, 0xe3, 0x5b, 0xb0, 0x7b, 0x1d, 0xe4, 0x60, 0x41, 0xdf, 0x97, 0x23, 0xf9, 0x37, 0x12, 0x2c,
-	0x76, 0x96, 0x51, 0xe2, 0xb0, 0x0b, 0x3d, 0x13, 0x67, 0x17, 0x36, 0xb0, 0xad, 0x9d, 0x5a, 0x58,
-	0x75, 0x39, 0x5d, 0x8d, 0xd9, 0x47, 0x48, 0xb7, 0xca, 0xd7, 0x89, 0xed, 0x51, 0x6b, 0xa3, 0x7d,
-	0xb8, 0x1b, 0xdb, 0x19, 0x60, 0xd6, 0x4d, 0x07, 0xeb, 0x94, 0x38, 0x97, 0xc2, 0xcc, 0x1b, 0x51,
-	0x33, 0x0b, 0xd4, 0x1d, 0x7f, 0x9d, 0xfc, 0x55, 0x12, 0xd6, 0xaf, 0xf1, 0x6f, 0xcf, 0xc6, 0x5f,
-	0xfa, 0x7a, 0x1b, 0xff, 0x06, 0xcc, 0xbe, 0x84, 0xeb, 0x5a, 0xc6, 0x8a, 0xde, 0x61, 0xfa, 0x5c,
-	0x30, 0x92, 0x2f, 0xf7, 0x82, 0xd1, 0xbb, 0xf7, 0x1f, 0x7d, 0x89, 0xbd, 0xbf, 0xfc, 0xc5, 0x38,
-	0xcc, 0xf7, 0xca, 0x55, 0xa8, 0x06, 0x77, 0xc4, 0xa7, 0x0d, 0xf1, 0x40, 0xfb, 0x68, 0x88, 0x44,
-	0xe0, 0x7f, 0x25, 0xf1, 0xa1, 0xd0, 0xcf, 0xae, 0x7b, 0xac, 0xe7, 0x49, 0x67, 0x6f, 0x08, 0x5e,
-	0x7d, 0x8f, 0x5b, 0x79, 0xe4, 0xaa, 0x77, 0xfb, 0x4f, 0xfb, 0x7e, 0xb4, 0xe0, 0xce, 0xde, 0x1d,
-	0x42, 0x94, 0x5e, 0x89, 0xa6, 0x3c, 0xd2, 0xe7, 0xfb, 0xc5, 0x17, 0x03, 0x7c, 0x38, 0xf8, 0x68,
-	0x08, 0x61, 0xae, 0x4e, 0x90, 0xe5, 0x91, 0x6b, 0xbf, 0x21, 0x7c, 0x0a, 0x8b, 0x22, 0x2a, 0xa9,
-	0x08, 0x29, 0x5f, 0xa8, 0xb1, 0xa1, 0x2d, 0xd4, 0x2b, 0x79, 0x7a, 0x16, 0x22, 0x3d, 0xe8, 0xc8,
-	0x80, 0x69, 0x3f, 0x71, 0x09, 0xc6, 0x6b, 0x83, 0xf6, 0xbe, 0xbd, 0xb3, 0xad, 0x32, 0xe5, 0x86,
-	0x87, 0x05, 0x04, 0x99, 0x4e, 0xa5, 0xe5, 0xac, 0xee, 0xff, 0x52, 0x82, 0x3b, 0x22, 0x8c, 0xd1,
-	0x12, 0xcc, 0x3d, 0x2e, 0xe5, 0x6b, 0xc7, 0x4a, 0x49, 0x3d, 0x3e, 0x38, 0x3a, 0x2c, 0x15, 0x2b,
-	0x8f, 0x2b, 0xa5, 0x9d, 0xcc, 0x08, 0x9a, 0x83, 0x99, 0xbd, 0x7c, 0xa1, 0xb4, 0xa7, 0xee, 0x94,
-	0x6a, 0xa5, 0x62, 0xad, 0x52, 0x3d, 0xc8, 0x48, 0x68, 0x19, 0x16, 0x8e, 0xca, 0xd5, 0x9a, 0x5a,
-	0x2c, 0xe7, 0x0f, 0x76, 0x4b, 0xa1, 0xa9, 0x04, 0x5a, 0x83, 0x95, 0xd2, 0xc7, 0x87, 0x7b, 0x95,
-	0x62, 0xa5, 0xa6, 0x16, 0xab, 0x07, 0xb5, 0xd2, 0x41, 0x2d, 0x34, 0x9f, 0x44, 0x08, 0xa6, 0x6b,
-	0xa5, 0x8f, 0xc3, 0xb4, 0x3b, 0x1e, 0x8f, 0x6a, 0xe1, 0x3b, 0xa5, 0x62, 0x4d, 0xad, 0x29, 0xf9,
-	0xe2, 0x93, 0xca, 0xc1, 0x6e, 0x26, 0x75, 0xdf, 0x01, 0x14, 0xff, 0x1a, 0x82, 0x5e, 0x87, 0x8d,
-	0x88, 0x38, 0xea, 0x7e, 0x75, 0x27, 0x2a, 0xf4, 0x14, 0xa4, 0x98, 0x7c, 0xde, 0x54, 0x46, 0x42,
-	0xd3, 0x00, 0x8f, 0x95, 0xfc, 0x7e, 0x89, 0x8f, 0x13, 0x9e, 0xb2, 0x6c, 0x3a, 0x7f, 0xb0, 0xa3,
-	0x86, 0x26, 0x92, 0xf7, 0x29, 0x40, 0xe7, 0x89, 0x11, 0xad, 0xc0, 0xe2, 0x5e, 0xe5, 0x49, 0x69,
-	0xaf, 0x52, 0xae, 0x56, 0x77, 0x22, 0x1c, 0x66, 0x61, 0xea, 0xa4, 0xa4, 0x3c, 0x55, 0x8f, 0x0f,
-	0xd8, 0x92, 0xa7, 0x19, 0x09, 0xa5, 0x61, 0x22, 0x18, 0x25, 0xbc, 0xd1, 0x61, 0xf5, 0xe8, 0xa8,
-	0x52, 0xd8, 0x2b, 0x65, 0x92, 0x08, 0x60, 0x5c, 0xcc, 0x8c, 0xa2, 0x19, 0x98, 0x64, 0x5b, 0x05,
-	0x61, 0xec, 0xfe, 0x1f, 0x25, 0xc8, 0x44, 0xf3, 0x0a, 0x7a, 0x0d, 0x56, 0x8f, 0x6a, 0x4a, 0x29,
-	0xbf, 0x5f, 0x39, 0xd8, 0x55, 0x7b, 0xbb, 0x66, 0x15, 0x96, 0x3b, 0x4b, 0xe2, 0x4e, 0xba, 0x0b,
-	0xeb, 0x9d, 0xe9, 0x7e, 0xee, 0xda, 0x84, 0xd7, 0x3b, 0x8b, 0xae, 0x74, 0x5c, 0x17, 0xb7, 0xa8,
-	0xbb, 0x46, 0xb7, 0x7f, 0x2b, 0x41, 0x96, 0x25, 0xd9, 0x4a, 0x28, 0x4c, 0x8f, 0xb0, 0x73, 0x6e,
-	0xea, 0x18, 0xfd, 0x5c, 0x82, 0xa9, 0xae, 0x4e, 0x0e, 0x0d, 0xd0, 0x6f, 0xf6, 0xea, 0x62, 0x57,
-	0x56, 0xfd, 0xfd, 0xa1, 0x8f, 0xf7, 0xb9, 0xaa, 0xff, 0xf1, 0x5e, 0xbe, 0xf7, 0xa3, 0xbf, 0xfe,
-	0xf3, 0xf3, 0xc4, 0xba, 0xbc, 0x12, 0xfd, 0x3f, 0x81, 0xfb, 0x48, 0xd4, 0x1f, 0xfc, 0x48, 0xba,
-	0xbf, 0xfd, 0x95, 0x04, 0xaf, 0x75, 0x97, 0x88, 0x5e, 0xd2, 0xff, 0x3a, 0xdc, 0xd3, 0x74, 0xab,
-	0x31, 0x4c, 0x82, 0xe8, 0xa9, 0x4f, 0xf9, 0xf6, 0x40, 0xbc, 0x37, 0xde, 0x94, 0xde, 0x94, 0x0a,
-	0x9f, 0x25, 0xe0, 0x1b, 0x3a, 0x69, 0xde, 0x18, 0xb3, 0xb0, 0xda, 0x4f, 0xf9, 0x43, 0xef, 0x2a,
-	0x77, 0x28, 0x7d, 0xf7, 0xa9, 0x80, 0x32, 0x88, 0xa5, 0xd9, 0x46, 0x8e, 0x38, 0xc6, 0x96, 0x81,
-	0x6d, 0x76, 0xd1, 0xdb, 0xe2, 0x53, 0x5a, 0xcb, 0x74, 0xaf, 0xff, 0x57, 0xc7, 0xbb, 0xb1, 0xb9,
-	0x5f, 0x25, 0x36, 0x77, 0x39, 0x76, 0x91, 0x89, 0x19, 0x93, 0x24, 0x77, 0xf2, 0xe0, 0xf0, 0x61,
-	0xc1, 0xdb, 0xfc, 0xa5, 0xbf, 0xf4, 0x19, 0x5b, 0xfa, 0x2c, 0xb6, 0xf4, 0xd9, 0x89, 0xcf, 0xe7,
-	0x74, 0x9c, 0xc9, 0xf6, 0xf0, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6b, 0xcb, 0x43, 0xd9, 0x70,
-	0x22, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/vision/v1/geometry.pb.go b/googleapis/cloud/vision/v1/geometry.pb.go
index 2c8383c970..527e8bd118 100644
--- a/googleapis/cloud/vision/v1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1/geometry.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A vertex represents a 2D point in the image.
 // NOTE: the vertex coordinates are in the same scale as the original image.
@@ -35,16 +38,17 @@ func (m *Vertex) Reset()         { *m = Vertex{} }
 func (m *Vertex) String() string { return proto.CompactTextString(m) }
 func (*Vertex) ProtoMessage()    {}
 func (*Vertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_e8a7714abee99ced, []int{0}
+	return fileDescriptor_ce1d1cf3c6845cfe, []int{0}
 }
+
 func (m *Vertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vertex.Unmarshal(m, b)
 }
 func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
 }
-func (dst *Vertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vertex.Merge(dst, src)
+func (m *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(m, src)
 }
 func (m *Vertex) XXX_Size() int {
 	return xxx_messageInfo_Vertex.Size(m)
@@ -86,16 +90,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_e8a7714abee99ced, []int{1}
+	return fileDescriptor_ce1d1cf3c6845cfe, []int{1}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -135,16 +140,17 @@ func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
 func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*BoundingPoly) ProtoMessage()    {}
 func (*BoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_e8a7714abee99ced, []int{2}
+	return fileDescriptor_ce1d1cf3c6845cfe, []int{2}
 }
+
 func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
 }
 func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+func (m *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(m, src)
 }
 func (m *BoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_BoundingPoly.Size(m)
@@ -188,16 +194,17 @@ func (m *Position) Reset()         { *m = Position{} }
 func (m *Position) String() string { return proto.CompactTextString(m) }
 func (*Position) ProtoMessage()    {}
 func (*Position) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_e8a7714abee99ced, []int{3}
+	return fileDescriptor_ce1d1cf3c6845cfe, []int{3}
 }
+
 func (m *Position) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Position.Unmarshal(m, b)
 }
 func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
 }
-func (dst *Position) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Position.Merge(dst, src)
+func (m *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(m, src)
 }
 func (m *Position) XXX_Size() int {
 	return xxx_messageInfo_Position.Size(m)
@@ -237,10 +244,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1/geometry.proto", fileDescriptor_geometry_e8a7714abee99ced)
+	proto.RegisterFile("google/cloud/vision/v1/geometry.proto", fileDescriptor_ce1d1cf3c6845cfe)
 }
 
-var fileDescriptor_geometry_e8a7714abee99ced = []byte{
+var fileDescriptor_ce1d1cf3c6845cfe = []byte{
 	// 300 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4b, 0xc3, 0x30,
 	0x14, 0xc6, 0x49, 0xa7, 0x63, 0xc4, 0x09, 0x52, 0x41, 0xca, 0x10, 0x19, 0x43, 0xa1, 0xa7, 0x84,
diff --git a/googleapis/cloud/vision/v1/image_annotator.pb.go b/googleapis/cloud/vision/v1/image_annotator.pb.go
index eaeb3c20d4..97806c46a1 100644
--- a/googleapis/cloud/vision/v1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1/image_annotator.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -28,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
@@ -57,6 +57,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"UNKNOWN":       0,
 	"VERY_UNLIKELY": 1,
@@ -69,8 +70,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{0}
+	return fileDescriptor_49e74116a4d6fd69, []int{0}
 }
 
 // Type of Google Cloud Vision API feature to be extracted.
@@ -125,6 +127,7 @@ var Feature_Type_name = map[int32]string{
 	12: "PRODUCT_SEARCH",
 	19: "OBJECT_LOCALIZATION",
 }
+
 var Feature_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":        0,
 	"FACE_DETECTION":          1,
@@ -144,8 +147,9 @@ var Feature_Type_value = map[string]int32{
 func (x Feature_Type) String() string {
 	return proto.EnumName(Feature_Type_name, int32(x))
 }
+
 func (Feature_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{0, 0}
+	return fileDescriptor_49e74116a4d6fd69, []int{0, 0}
 }
 
 // Face landmark (feature) type.
@@ -264,6 +268,7 @@ var FaceAnnotation_Landmark_Type_name = map[int32]string{
 	33: "CHIN_LEFT_GONION",
 	34: "CHIN_RIGHT_GONION",
 }
+
 var FaceAnnotation_Landmark_Type_value = map[string]int32{
 	"UNKNOWN_LANDMARK":             0,
 	"LEFT_EYE":                     1,
@@ -305,8 +310,9 @@ var FaceAnnotation_Landmark_Type_value = map[string]int32{
 func (x FaceAnnotation_Landmark_Type) String() string {
 	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
 }
+
 func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{3, 0, 0}
+	return fileDescriptor_49e74116a4d6fd69, []int{3, 0, 0}
 }
 
 // Batch operation states.
@@ -332,6 +338,7 @@ var OperationMetadata_State_name = map[int32]string{
 	3: "DONE",
 	4: "CANCELLED",
 }
+
 var OperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATED":           1,
@@ -343,8 +350,9 @@ var OperationMetadata_State_value = map[string]int32{
 func (x OperationMetadata_State) String() string {
 	return proto.EnumName(OperationMetadata_State_name, int32(x))
 }
+
 func (OperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{37, 0}
+	return fileDescriptor_49e74116a4d6fd69, []int{37, 0}
 }
 
 // The type of Google Cloud Vision API detection to perform, and the maximum
@@ -369,16 +377,17 @@ func (m *Feature) Reset()         { *m = Feature{} }
 func (m *Feature) String() string { return proto.CompactTextString(m) }
 func (*Feature) ProtoMessage()    {}
 func (*Feature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{0}
+	return fileDescriptor_49e74116a4d6fd69, []int{0}
 }
+
 func (m *Feature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feature.Unmarshal(m, b)
 }
 func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
 }
-func (dst *Feature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feature.Merge(dst, src)
+func (m *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(m, src)
 }
 func (m *Feature) XXX_Size() int {
 	return xxx_messageInfo_Feature.Size(m)
@@ -446,16 +455,17 @@ func (m *ImageSource) Reset()         { *m = ImageSource{} }
 func (m *ImageSource) String() string { return proto.CompactTextString(m) }
 func (*ImageSource) ProtoMessage()    {}
 func (*ImageSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{1}
+	return fileDescriptor_49e74116a4d6fd69, []int{1}
 }
+
 func (m *ImageSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
 }
 func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
 }
-func (dst *ImageSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageSource.Merge(dst, src)
+func (m *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(m, src)
 }
 func (m *ImageSource) XXX_Size() int {
 	return xxx_messageInfo_ImageSource.Size(m)
@@ -499,16 +509,17 @@ func (m *Image) Reset()         { *m = Image{} }
 func (m *Image) String() string { return proto.CompactTextString(m) }
 func (*Image) ProtoMessage()    {}
 func (*Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{2}
+	return fileDescriptor_49e74116a4d6fd69, []int{2}
 }
+
 func (m *Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Image.Unmarshal(m, b)
 }
 func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
 }
-func (dst *Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Image.Merge(dst, src)
+func (m *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(m, src)
 }
 func (m *Image) XXX_Size() int {
 	return xxx_messageInfo_Image.Size(m)
@@ -590,16 +601,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{3}
+	return fileDescriptor_49e74116a4d6fd69, []int{3}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -730,16 +742,17 @@ func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark
 func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation_Landmark) ProtoMessage()    {}
 func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{3, 0}
+	return fileDescriptor_49e74116a4d6fd69, []int{3, 0}
 }
+
 func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
 }
 func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+func (m *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(m, src)
 }
 func (m *FaceAnnotation_Landmark) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
@@ -777,16 +790,17 @@ func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
 func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
 func (*LocationInfo) ProtoMessage()    {}
 func (*LocationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{4}
+	return fileDescriptor_49e74116a4d6fd69, []int{4}
 }
+
 func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
 }
 func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
 }
-func (dst *LocationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationInfo.Merge(dst, src)
+func (m *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(m, src)
 }
 func (m *LocationInfo) XXX_Size() int {
 	return xxx_messageInfo_LocationInfo.Size(m)
@@ -821,16 +835,17 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{5}
+	return fileDescriptor_49e74116a4d6fd69, []int{5}
 }
+
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(dst, src)
+func (m *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(m, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -908,16 +923,17 @@ func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
 func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
 func (*EntityAnnotation) ProtoMessage()    {}
 func (*EntityAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{6}
+	return fileDescriptor_49e74116a4d6fd69, []int{6}
 }
+
 func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
 }
 func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+func (m *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(m, src)
 }
 func (m *EntityAnnotation) XXX_Size() int {
 	return xxx_messageInfo_EntityAnnotation.Size(m)
@@ -1015,16 +1031,17 @@ func (m *LocalizedObjectAnnotation) Reset()         { *m = LocalizedObjectAnnota
 func (m *LocalizedObjectAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LocalizedObjectAnnotation) ProtoMessage()    {}
 func (*LocalizedObjectAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{7}
+	return fileDescriptor_49e74116a4d6fd69, []int{7}
 }
+
 func (m *LocalizedObjectAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Unmarshal(m, b)
 }
 func (m *LocalizedObjectAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LocalizedObjectAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocalizedObjectAnnotation.Merge(dst, src)
+func (m *LocalizedObjectAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalizedObjectAnnotation.Merge(m, src)
 }
 func (m *LocalizedObjectAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Size(m)
@@ -1100,16 +1117,17 @@ func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
 func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
 func (*SafeSearchAnnotation) ProtoMessage()    {}
 func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{8}
+	return fileDescriptor_49e74116a4d6fd69, []int{8}
 }
+
 func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
 }
 func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+func (m *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(m, src)
 }
 func (m *SafeSearchAnnotation) XXX_Size() int {
 	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
@@ -1170,16 +1188,17 @@ func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
 func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
 func (*LatLongRect) ProtoMessage()    {}
 func (*LatLongRect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{9}
+	return fileDescriptor_49e74116a4d6fd69, []int{9}
 }
+
 func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
 }
 func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
 }
-func (dst *LatLongRect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LatLongRect.Merge(dst, src)
+func (m *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(m, src)
 }
 func (m *LatLongRect) XXX_Size() int {
 	return xxx_messageInfo_LatLongRect.Size(m)
@@ -1223,16 +1242,17 @@ func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
 func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
 func (*ColorInfo) ProtoMessage()    {}
 func (*ColorInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{10}
+	return fileDescriptor_49e74116a4d6fd69, []int{10}
 }
+
 func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
 }
 func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
 }
-func (dst *ColorInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColorInfo.Merge(dst, src)
+func (m *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(m, src)
 }
 func (m *ColorInfo) XXX_Size() int {
 	return xxx_messageInfo_ColorInfo.Size(m)
@@ -1277,16 +1297,17 @@ func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotati
 func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*DominantColorsAnnotation) ProtoMessage()    {}
 func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{11}
+	return fileDescriptor_49e74116a4d6fd69, []int{11}
 }
+
 func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
 }
 func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+func (m *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(m, src)
 }
 func (m *DominantColorsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
@@ -1317,16 +1338,17 @@ func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
 func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
 func (*ImageProperties) ProtoMessage()    {}
 func (*ImageProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{12}
+	return fileDescriptor_49e74116a4d6fd69, []int{12}
 }
+
 func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
 }
 func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
 }
-func (dst *ImageProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageProperties.Merge(dst, src)
+func (m *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(m, src)
 }
 func (m *ImageProperties) XXX_Size() int {
 	return xxx_messageInfo_ImageProperties.Size(m)
@@ -1363,16 +1385,17 @@ func (m *CropHint) Reset()         { *m = CropHint{} }
 func (m *CropHint) String() string { return proto.CompactTextString(m) }
 func (*CropHint) ProtoMessage()    {}
 func (*CropHint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{13}
+	return fileDescriptor_49e74116a4d6fd69, []int{13}
 }
+
 func (m *CropHint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHint.Unmarshal(m, b)
 }
 func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
 }
-func (dst *CropHint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHint.Merge(dst, src)
+func (m *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(m, src)
 }
 func (m *CropHint) XXX_Size() int {
 	return xxx_messageInfo_CropHint.Size(m)
@@ -1417,16 +1440,17 @@ func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
 func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*CropHintsAnnotation) ProtoMessage()    {}
 func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{14}
+	return fileDescriptor_49e74116a4d6fd69, []int{14}
 }
+
 func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
 }
 func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+func (m *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(m, src)
 }
 func (m *CropHintsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_CropHintsAnnotation.Size(m)
@@ -1462,16 +1486,17 @@ func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
 func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
 func (*CropHintsParams) ProtoMessage()    {}
 func (*CropHintsParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{15}
+	return fileDescriptor_49e74116a4d6fd69, []int{15}
 }
+
 func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
 }
 func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+func (m *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(m, src)
 }
 func (m *CropHintsParams) XXX_Size() int {
 	return xxx_messageInfo_CropHintsParams.Size(m)
@@ -1502,16 +1527,17 @@ func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
 func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
 func (*WebDetectionParams) ProtoMessage()    {}
 func (*WebDetectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{16}
+	return fileDescriptor_49e74116a4d6fd69, []int{16}
 }
+
 func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
 }
 func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
 }
-func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+func (m *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(m, src)
 }
 func (m *WebDetectionParams) XXX_Size() int {
 	return xxx_messageInfo_WebDetectionParams.Size(m)
@@ -1557,16 +1583,17 @@ func (m *ImageContext) Reset()         { *m = ImageContext{} }
 func (m *ImageContext) String() string { return proto.CompactTextString(m) }
 func (*ImageContext) ProtoMessage()    {}
 func (*ImageContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{17}
+	return fileDescriptor_49e74116a4d6fd69, []int{17}
 }
+
 func (m *ImageContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
 }
 func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageContext.Merge(dst, src)
+func (m *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(m, src)
 }
 func (m *ImageContext) XXX_Size() int {
 	return xxx_messageInfo_ImageContext.Size(m)
@@ -1630,16 +1657,17 @@ func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
 func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageRequest) ProtoMessage()    {}
 func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{18}
+	return fileDescriptor_49e74116a4d6fd69, []int{18}
 }
+
 func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
 }
 func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+func (m *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(m, src)
 }
 func (m *AnnotateImageRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageRequest.Size(m)
@@ -1688,16 +1716,17 @@ func (m *ImageAnnotationContext) Reset()         { *m = ImageAnnotationContext{}
 func (m *ImageAnnotationContext) String() string { return proto.CompactTextString(m) }
 func (*ImageAnnotationContext) ProtoMessage()    {}
 func (*ImageAnnotationContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{19}
+	return fileDescriptor_49e74116a4d6fd69, []int{19}
 }
+
 func (m *ImageAnnotationContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageAnnotationContext.Unmarshal(m, b)
 }
 func (m *ImageAnnotationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageAnnotationContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageAnnotationContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageAnnotationContext.Merge(dst, src)
+func (m *ImageAnnotationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAnnotationContext.Merge(m, src)
 }
 func (m *ImageAnnotationContext) XXX_Size() int {
 	return xxx_messageInfo_ImageAnnotationContext.Size(m)
@@ -1768,16 +1797,17 @@ func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
 func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageResponse) ProtoMessage()    {}
 func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{20}
+	return fileDescriptor_49e74116a4d6fd69, []int{20}
 }
+
 func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
 }
 func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+func (m *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(m, src)
 }
 func (m *AnnotateImageResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageResponse.Size(m)
@@ -1904,16 +1934,17 @@ func (m *AnnotateFileResponse) Reset()         { *m = AnnotateFileResponse{} }
 func (m *AnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateFileResponse) ProtoMessage()    {}
 func (*AnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{21}
+	return fileDescriptor_49e74116a4d6fd69, []int{21}
 }
+
 func (m *AnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateFileResponse.Merge(dst, src)
+func (m *AnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileResponse.Merge(m, src)
 }
 func (m *AnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateFileResponse.Size(m)
@@ -1958,16 +1989,17 @@ func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesR
 func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
 func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{22}
+	return fileDescriptor_49e74116a4d6fd69, []int{22}
 }
+
 func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+func (m *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(m, src)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
@@ -1998,16 +2030,17 @@ func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImages
 func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
 func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{23}
+	return fileDescriptor_49e74116a4d6fd69, []int{23}
 }
+
 func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+func (m *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(m, src)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
@@ -2057,16 +2090,17 @@ func (m *AnnotateFileRequest) Reset()         { *m = AnnotateFileRequest{} }
 func (m *AnnotateFileRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateFileRequest) ProtoMessage()    {}
 func (*AnnotateFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{24}
+	return fileDescriptor_49e74116a4d6fd69, []int{24}
 }
+
 func (m *AnnotateFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateFileRequest.Unmarshal(m, b)
 }
 func (m *AnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateFileRequest.Merge(dst, src)
+func (m *AnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileRequest.Merge(m, src)
 }
 func (m *AnnotateFileRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateFileRequest.Size(m)
@@ -2119,16 +2153,17 @@ func (m *BatchAnnotateFilesRequest) Reset()         { *m = BatchAnnotateFilesReq
 func (m *BatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateFilesRequest) ProtoMessage()    {}
 func (*BatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{25}
+	return fileDescriptor_49e74116a4d6fd69, []int{25}
 }
+
 func (m *BatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateFilesRequest.Unmarshal(m, b)
 }
 func (m *BatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateFilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateFilesRequest.Merge(dst, src)
+func (m *BatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateFilesRequest.Merge(m, src)
 }
 func (m *BatchAnnotateFilesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateFilesRequest.Size(m)
@@ -2160,16 +2195,17 @@ func (m *BatchAnnotateFilesResponse) Reset()         { *m = BatchAnnotateFilesRe
 func (m *BatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateFilesResponse) ProtoMessage()    {}
 func (*BatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{26}
+	return fileDescriptor_49e74116a4d6fd69, []int{26}
 }
+
 func (m *BatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateFilesResponse.Unmarshal(m, b)
 }
 func (m *BatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateFilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateFilesResponse.Merge(dst, src)
+func (m *BatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateFilesResponse.Merge(m, src)
 }
 func (m *BatchAnnotateFilesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateFilesResponse.Size(m)
@@ -2206,16 +2242,17 @@ func (m *AsyncAnnotateFileRequest) Reset()         { *m = AsyncAnnotateFileReque
 func (m *AsyncAnnotateFileRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileRequest) ProtoMessage()    {}
 func (*AsyncAnnotateFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{27}
+	return fileDescriptor_49e74116a4d6fd69, []int{27}
 }
+
 func (m *AsyncAnnotateFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(dst, src)
+func (m *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(m, src)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Size(m)
@@ -2267,16 +2304,17 @@ func (m *AsyncAnnotateFileResponse) Reset()         { *m = AsyncAnnotateFileResp
 func (m *AsyncAnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileResponse) ProtoMessage()    {}
 func (*AsyncAnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{28}
+	return fileDescriptor_49e74116a4d6fd69, []int{28}
 }
+
 func (m *AsyncAnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(dst, src)
+func (m *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(m, src)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Size(m)
@@ -2309,16 +2347,17 @@ func (m *AsyncBatchAnnotateImagesRequest) Reset()         { *m = AsyncBatchAnnot
 func (m *AsyncBatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateImagesRequest) ProtoMessage()    {}
 func (*AsyncBatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{29}
+	return fileDescriptor_49e74116a4d6fd69, []int{29}
 }
+
 func (m *AsyncBatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Merge(dst, src)
+func (m *AsyncBatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Size(m)
@@ -2356,16 +2395,17 @@ func (m *AsyncBatchAnnotateImagesResponse) Reset()         { *m = AsyncBatchAnno
 func (m *AsyncBatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateImagesResponse) ProtoMessage()    {}
 func (*AsyncBatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{30}
+	return fileDescriptor_49e74116a4d6fd69, []int{30}
 }
+
 func (m *AsyncBatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Merge(dst, src)
+func (m *AsyncBatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Size(m)
@@ -2397,16 +2437,17 @@ func (m *AsyncBatchAnnotateFilesRequest) Reset()         { *m = AsyncBatchAnnota
 func (m *AsyncBatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesRequest) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{31}
+	return fileDescriptor_49e74116a4d6fd69, []int{31}
 }
+
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Size(m)
@@ -2438,16 +2479,17 @@ func (m *AsyncBatchAnnotateFilesResponse) Reset()         { *m = AsyncBatchAnnot
 func (m *AsyncBatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesResponse) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{32}
+	return fileDescriptor_49e74116a4d6fd69, []int{32}
 }
+
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Size(m)
@@ -2488,16 +2530,17 @@ func (m *InputConfig) Reset()         { *m = InputConfig{} }
 func (m *InputConfig) String() string { return proto.CompactTextString(m) }
 func (*InputConfig) ProtoMessage()    {}
 func (*InputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{33}
+	return fileDescriptor_49e74116a4d6fd69, []int{33}
 }
+
 func (m *InputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
 }
 func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputConfig.Merge(dst, src)
+func (m *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(m, src)
 }
 func (m *InputConfig) XXX_Size() int {
 	return xxx_messageInfo_InputConfig.Size(m)
@@ -2554,16 +2597,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{34}
+	return fileDescriptor_49e74116a4d6fd69, []int{34}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -2602,16 +2646,17 @@ func (m *GcsSource) Reset()         { *m = GcsSource{} }
 func (m *GcsSource) String() string { return proto.CompactTextString(m) }
 func (*GcsSource) ProtoMessage()    {}
 func (*GcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{35}
+	return fileDescriptor_49e74116a4d6fd69, []int{35}
 }
+
 func (m *GcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
 }
 func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
 }
-func (dst *GcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsSource.Merge(dst, src)
+func (m *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(m, src)
 }
 func (m *GcsSource) XXX_Size() int {
 	return xxx_messageInfo_GcsSource.Size(m)
@@ -2663,16 +2708,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{36}
+	return fileDescriptor_49e74116a4d6fd69, []int{36}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -2707,16 +2753,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_faae31fa1d905783, []int{37}
+	return fileDescriptor_49e74116a4d6fd69, []int{37}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -2749,6 +2796,10 @@ func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.vision.v1.Feature_Type", Feature_Type_name, Feature_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
 	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1.Feature")
 	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1.ImageSource")
 	proto.RegisterType((*Image)(nil), "google.cloud.vision.v1.Image")
@@ -2788,10 +2839,217 @@ func init() {
 	proto.RegisterType((*GcsSource)(nil), "google.cloud.vision.v1.GcsSource")
 	proto.RegisterType((*GcsDestination)(nil), "google.cloud.vision.v1.GcsDestination")
 	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.vision.v1.OperationMetadata")
-	proto.RegisterEnum("google.cloud.vision.v1.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.cloud.vision.v1.Feature_Type", Feature_Type_name, Feature_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1/image_annotator.proto", fileDescriptor_49e74116a4d6fd69)
+}
+
+var fileDescriptor_49e74116a4d6fd69 = []byte{
+	// 3240 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x5f, 0x6f, 0x1b, 0x59,
+	0x15, 0x5f, 0xdb, 0x71, 0x62, 0x1f, 0x3b, 0xc9, 0xe4, 0x3a, 0x49, 0xdd, 0xb4, 0x69, 0xd3, 0x59,
+	0x96, 0x8d, 0xba, 0x25, 0xa1, 0xd9, 0xa5, 0x2c, 0xdb, 0x0a, 0xd6, 0x71, 0x26, 0x89, 0xb7, 0x8e,
+	0xed, 0xbd, 0x76, 0xda, 0xed, 0xb2, 0x62, 0x34, 0x19, 0x5f, 0xbb, 0xd3, 0x1d, 0xcf, 0x0c, 0x33,
+	0xe3, 0x36, 0x59, 0x24, 0x1e, 0x78, 0x40, 0xda, 0x57, 0x78, 0x02, 0x21, 0x84, 0x40, 0x82, 0x2f,
+	0x00, 0x3c, 0xf3, 0x86, 0x90, 0x78, 0x41, 0xfb, 0x15, 0x78, 0xe0, 0x23, 0x20, 0xf1, 0x82, 0xee,
+	0x9d, 0x3b, 0xe3, 0x3b, 0xfe, 0x57, 0xa7, 0xac, 0x10, 0x12, 0x4f, 0x9e, 0x7b, 0xfe, 0xfc, 0xee,
+	0x99, 0x73, 0xee, 0x39, 0xf7, 0xdc, 0x3b, 0x86, 0x3b, 0x5d, 0xdb, 0xee, 0x9a, 0x64, 0x57, 0x37,
+	0xed, 0x7e, 0x7b, 0xf7, 0xb9, 0xe1, 0x19, 0xb6, 0xb5, 0xfb, 0xfc, 0xee, 0xae, 0xd1, 0xd3, 0xba,
+	0x44, 0xd5, 0x2c, 0xcb, 0xf6, 0x35, 0xdf, 0x76, 0x77, 0x1c, 0xd7, 0xf6, 0x6d, 0xb4, 0x1e, 0x48,
+	0xef, 0x30, 0xe9, 0x9d, 0x40, 0x7a, 0xe7, 0xf9, 0xdd, 0x8d, 0xeb, 0x1c, 0x45, 0x73, 0x8c, 0x5d,
+	0xae, 0x63, 0xd8, 0x96, 0x17, 0x68, 0x6d, 0xbc, 0x31, 0x61, 0x8e, 0x2e, 0xb1, 0x7b, 0xc4, 0x77,
+	0x2f, 0xb8, 0xd8, 0x5b, 0x13, 0xc4, 0x1c, 0xd7, 0x6e, 0xf7, 0x75, 0x5f, 0xf5, 0x88, 0xe6, 0xea,
+	0x4f, 0xb9, 0xf0, 0x24, 0xbb, 0x7d, 0x72, 0xee, 0xab, 0x03, 0x13, 0xb8, 0xf4, 0xed, 0x09, 0xd2,
+	0x2f, 0xc8, 0x99, 0xda, 0x26, 0x3e, 0xd1, 0x05, 0xd9, 0xd7, 0xb9, 0xac, 0x69, 0x5b, 0x5d, 0xb7,
+	0x6f, 0x59, 0x86, 0xd5, 0xdd, 0xb5, 0x1d, 0xe2, 0xc6, 0x5e, 0x69, 0x8b, 0x0b, 0xb1, 0xd1, 0x59,
+	0xbf, 0xb3, 0xdb, 0x31, 0x88, 0xd9, 0x56, 0x7b, 0x9a, 0xf7, 0x29, 0x97, 0xb8, 0x39, 0x2c, 0xe1,
+	0x1b, 0x3d, 0xe2, 0xf9, 0x5a, 0xcf, 0xe1, 0x02, 0x57, 0xb8, 0x80, 0xeb, 0xe8, 0xbb, 0x9e, 0xaf,
+	0xf9, 0x7d, 0x6f, 0x88, 0xe1, 0x5f, 0x38, 0x64, 0x57, 0xb7, 0xcd, 0xd0, 0xfb, 0x1b, 0x45, 0x91,
+	0x61, 0x6a, 0xbe, 0x69, 0x75, 0x03, 0x8e, 0xfc, 0xab, 0x14, 0x2c, 0x1c, 0x12, 0xcd, 0xef, 0xbb,
+	0x04, 0xbd, 0x0b, 0x73, 0x54, 0xa0, 0x98, 0xd8, 0x4a, 0x6c, 0x2f, 0xed, 0x7d, 0x65, 0x67, 0x7c,
+	0xc8, 0x76, 0xb8, 0xf8, 0x4e, 0xeb, 0xc2, 0x21, 0x98, 0x69, 0xa0, 0x9b, 0x90, 0xeb, 0x69, 0xe7,
+	0xaa, 0x4b, 0xbc, 0xbe, 0xe9, 0x7b, 0xc5, 0xe4, 0x56, 0x62, 0x3b, 0x8d, 0xa1, 0xa7, 0x9d, 0xe3,
+	0x80, 0x82, 0x56, 0x21, 0xdd, 0xb3, 0xdb, 0xc4, 0x2c, 0xa6, 0xb6, 0x12, 0xdb, 0x59, 0x1c, 0x0c,
+	0xe4, 0xdf, 0x24, 0x61, 0x8e, 0xa2, 0xa0, 0x55, 0x90, 0x5a, 0x4f, 0x1a, 0x8a, 0x7a, 0x5a, 0x6b,
+	0x36, 0x94, 0x72, 0xe5, 0xb0, 0xa2, 0x1c, 0x48, 0xaf, 0x21, 0x04, 0x4b, 0x87, 0xa5, 0xb2, 0xa2,
+	0x1e, 0x28, 0x2d, 0xa5, 0xdc, 0xaa, 0xd4, 0x6b, 0x52, 0x02, 0xad, 0x03, 0xaa, 0x96, 0x6a, 0x07,
+	0x27, 0x25, 0xfc, 0x50, 0xa0, 0x27, 0xa9, 0x6c, 0xb5, 0x7e, 0x54, 0x17, 0x68, 0x29, 0x54, 0x80,
+	0xe5, 0x6a, 0x69, 0x5f, 0xa9, 0x0a, 0xc4, 0x39, 0x2a, 0xd8, 0x52, 0x3e, 0x6a, 0x09, 0xb4, 0x34,
+	0xba, 0x06, 0x57, 0x0e, 0xea, 0xe5, 0xd3, 0x13, 0xa5, 0xd6, 0x52, 0x87, 0x98, 0x39, 0x74, 0x15,
+	0xd6, 0x9a, 0xa5, 0x43, 0x45, 0x6d, 0x2a, 0x25, 0x5c, 0x3e, 0x16, 0x58, 0xf3, 0xd4, 0xec, 0xca,
+	0x49, 0xe9, 0x48, 0x51, 0x1b, 0xb8, 0xde, 0x50, 0x70, 0xab, 0xa2, 0x34, 0xa5, 0x05, 0xb4, 0x04,
+	0x50, 0xc6, 0xf5, 0x86, 0x7a, 0x5c, 0xa9, 0xb5, 0x9a, 0x52, 0x16, 0xad, 0xc0, 0xe2, 0x63, 0x65,
+	0x5f, 0x50, 0x04, 0x6a, 0x44, 0x03, 0xd7, 0x0f, 0x4e, 0xcb, 0x2d, 0x0e, 0x2b, 0xe5, 0xd1, 0x15,
+	0x28, 0xd4, 0xf7, 0x3f, 0x50, 0xca, 0x2d, 0xb5, 0x5a, 0x2f, 0x97, 0xaa, 0x95, 0x8f, 0x4b, 0x4c,
+	0xb8, 0x20, 0xd7, 0x20, 0x57, 0xa1, 0x39, 0xd5, 0xb4, 0xfb, 0xae, 0x4e, 0x90, 0x0c, 0x8b, 0x5d,
+	0xdd, 0x53, 0x83, 0x34, 0xeb, 0xbb, 0x06, 0x0b, 0x57, 0x16, 0xe7, 0xba, 0xba, 0xc7, 0xc4, 0x4e,
+	0x5d, 0x03, 0x5d, 0x83, 0xec, 0x80, 0x9f, 0x64, 0xfc, 0x8c, 0xc1, 0x99, 0xf2, 0xf7, 0x20, 0xcd,
+	0x04, 0x51, 0x11, 0x16, 0x74, 0xdb, 0xf2, 0x89, 0xe5, 0x33, 0x8c, 0x3c, 0x0e, 0x87, 0xe8, 0x3e,
+	0xcc, 0x7b, 0x6c, 0x36, 0xa6, 0x9c, 0xdb, 0x7b, 0x7d, 0xd2, 0x5a, 0x10, 0x0c, 0xc3, 0x5c, 0x45,
+	0xfe, 0xdb, 0x32, 0x2c, 0x1d, 0x6a, 0x3a, 0x29, 0x45, 0xb9, 0x84, 0x2a, 0xb0, 0x78, 0x66, 0xf7,
+	0xad, 0xb6, 0x61, 0x75, 0x55, 0xc7, 0x36, 0x2f, 0xd8, 0x7c, 0xb9, 0xc9, 0x4b, 0x6c, 0x9f, 0x0b,
+	0x37, 0x6c, 0xf3, 0x02, 0xe7, 0xcf, 0x84, 0x11, 0xaa, 0x81, 0xd4, 0x69, 0xab, 0x71, 0xb4, 0xe4,
+	0x25, 0xd0, 0x96, 0x3a, 0x6d, 0x71, 0x8c, 0x4e, 0x20, 0x6b, 0x6a, 0x56, 0xbb, 0xa7, 0xb9, 0x9f,
+	0x7a, 0xc5, 0xd4, 0x56, 0x6a, 0x3b, 0xb7, 0xb7, 0x3b, 0x71, 0xe5, 0xc7, 0xde, 0x6a, 0xa7, 0xca,
+	0xf5, 0xf0, 0x00, 0x01, 0x6d, 0x02, 0xb8, 0xb6, 0x69, 0xaa, 0x9a, 0xd5, 0x35, 0x49, 0x71, 0x6e,
+	0x2b, 0xb1, 0x9d, 0xc4, 0x59, 0x4a, 0x29, 0x51, 0x02, 0x0d, 0x8c, 0xa3, 0x59, 0x9c, 0x9b, 0x66,
+	0xdc, 0x8c, 0xa3, 0x59, 0x01, 0x73, 0x13, 0xc0, 0x37, 0x4c, 0x9f, 0x73, 0xe7, 0x03, 0x5d, 0x4a,
+	0x09, 0xd8, 0x77, 0x61, 0x35, 0xaa, 0x38, 0xaa, 0x6e, 0x5b, 0x1d, 0xa3, 0x4d, 0x2c, 0x9d, 0x14,
+	0x17, 0x98, 0x60, 0x21, 0xe2, 0x95, 0x23, 0x16, 0xfa, 0x06, 0xac, 0x87, 0xa6, 0x51, 0x67, 0x09,
+	0x4a, 0x19, 0xa6, 0xb4, 0x26, 0x70, 0x05, 0xb5, 0x0a, 0x2c, 0x3d, 0xb3, 0x2f, 0x54, 0xd3, 0xf8,
+	0x94, 0x98, 0xc6, 0x53, 0xdb, 0x6e, 0x17, 0xb3, 0xac, 0x24, 0xc8, 0x93, 0x1c, 0x53, 0x8d, 0x24,
+	0xf1, 0xe2, 0x33, 0xfb, 0x62, 0x30, 0x44, 0x75, 0x58, 0xf1, 0x6c, 0xd7, 0xb5, 0x5f, 0x88, 0x68,
+	0x30, 0x33, 0x9a, 0x14, 0x28, 0x0b, 0x80, 0x27, 0x20, 0x69, 0x56, 0x97, 0xb8, 0x22, 0x5e, 0x6e,
+	0x66, 0xbc, 0x65, 0xa6, 0x2b, 0xc0, 0x35, 0xa1, 0xe0, 0xf5, 0x5d, 0xc7, 0x35, 0x3c, 0x22, 0x22,
+	0xe6, 0x67, 0x46, 0x44, 0xa1, 0xba, 0x00, 0xfa, 0x09, 0x14, 0xfb, 0x56, 0x9b, 0xb8, 0x2a, 0x39,
+	0x77, 0x6c, 0x8f, 0xb4, 0x45, 0xe4, 0xc5, 0x99, 0x91, 0xd7, 0x19, 0x86, 0x12, 0x40, 0x08, 0xe8,
+	0x1f, 0x02, 0x3a, 0x33, 0xfb, 0xae, 0x1b, 0xc7, 0x5d, 0x9a, 0x19, 0x77, 0x85, 0x6b, 0xc7, 0xbd,
+	0xf0, 0x94, 0x68, 0xed, 0x17, 0x44, 0x8b, 0xf9, 0x75, 0x79, 0x76, 0x2f, 0x84, 0xea, 0x03, 0xda,
+	0xc6, 0x5f, 0x16, 0x20, 0x13, 0xa6, 0x08, 0x3a, 0xe6, 0x7b, 0x4b, 0x8a, 0x41, 0xbe, 0x73, 0xc9,
+	0x0c, 0x13, 0xf7, 0x9a, 0x07, 0x90, 0x71, 0x6c, 0xcf, 0xa0, 0x7c, 0x96, 0x5f, 0xb9, 0xbd, 0xad,
+	0x49, 0x68, 0x0d, 0x2e, 0x87, 0x23, 0x0d, 0xf9, 0xf7, 0xf3, 0x83, 0x2d, 0xe7, 0xb4, 0xf6, 0xb0,
+	0x56, 0x7f, 0x5c, 0x53, 0xc3, 0x0d, 0x45, 0x7a, 0x0d, 0xe5, 0x21, 0x53, 0x55, 0x0e, 0x5b, 0xaa,
+	0xf2, 0x44, 0x91, 0x12, 0x68, 0x11, 0xb2, 0xb8, 0x72, 0x74, 0x1c, 0x0c, 0x93, 0xa8, 0x08, 0xab,
+	0x8c, 0x59, 0x3f, 0x54, 0x43, 0xa1, 0x7d, 0x5c, 0x7f, 0x2c, 0xa5, 0xe8, 0x1e, 0x11, 0x08, 0x0e,
+	0xb3, 0xe6, 0x28, 0x2b, 0x54, 0x8a, 0xb0, 0x18, 0x2b, 0x8d, 0x36, 0x60, 0x3d, 0xd2, 0x8a, 0xf3,
+	0xe6, 0xa9, 0xda, 0x49, 0xe5, 0xa0, 0x51, 0xaf, 0xd4, 0x5a, 0xea, 0xbe, 0xd2, 0x7a, 0xac, 0x28,
+	0x35, 0xca, 0xa5, 0xfb, 0x4b, 0x1e, 0x32, 0xb5, 0x7a, 0x53, 0x51, 0x5b, 0x95, 0x86, 0x94, 0xa1,
+	0x36, 0x9e, 0x36, 0x1a, 0x0a, 0x56, 0xab, 0x95, 0x86, 0x94, 0xa5, 0xc3, 0x6a, 0xfd, 0x31, 0x1f,
+	0x02, 0xdd, 0x8b, 0x4e, 0xea, 0xa7, 0xad, 0x63, 0x66, 0x95, 0x94, 0x43, 0xcb, 0x90, 0x0b, 0xc6,
+	0x6c, 0x3e, 0x29, 0x8f, 0x24, 0xc8, 0x07, 0x84, 0xb2, 0x52, 0x6b, 0x29, 0x58, 0x5a, 0x44, 0x6b,
+	0xb0, 0xc2, 0xe0, 0xf7, 0xeb, 0xad, 0x56, 0xfd, 0x84, 0x0b, 0x2e, 0x51, 0x7f, 0x89, 0x64, 0x86,
+	0xb7, 0x4c, 0xb7, 0x63, 0x91, 0xca, 0x41, 0xa4, 0xe8, 0xad, 0x95, 0x27, 0x8a, 0xda, 0xaa, 0x37,
+	0xd4, 0xfd, 0xfa, 0x69, 0xed, 0xa0, 0x84, 0x9f, 0x48, 0x2b, 0x31, 0x56, 0xf0, 0xd6, 0xe5, 0x3a,
+	0xae, 0x29, 0x58, 0x42, 0xe8, 0x3a, 0x14, 0x23, 0x16, 0x47, 0x8c, 0x14, 0x0b, 0x91, 0xfb, 0x29,
+	0x97, 0x3d, 0x70, 0xbd, 0xd5, 0x81, 0x23, 0x47, 0xa6, 0x5b, 0x8b, 0xf3, 0x62, 0xf3, 0xad, 0xa3,
+	0x4d, 0xb8, 0x3a, 0xe0, 0x0d, 0x4f, 0x78, 0x65, 0x10, 0xd5, 0xe1, 0x19, 0x8b, 0xe8, 0x26, 0x5c,
+	0x13, 0xe3, 0xac, 0x06, 0x21, 0x08, 0x23, 0x26, 0x5d, 0x45, 0x5b, 0x70, 0x3d, 0x16, 0xd2, 0x61,
+	0x89, 0x0d, 0xea, 0xd0, 0x00, 0xa2, 0x84, 0xd5, 0x16, 0x2e, 0x1d, 0xd1, 0xcd, 0xfe, 0x1a, 0xf5,
+	0x3e, 0xd7, 0x13, 0xc8, 0xd7, 0x59, 0x7b, 0x13, 0xbe, 0x7b, 0xe3, 0xb4, 0x51, 0xa9, 0x4a, 0x9b,
+	0xb4, 0xbd, 0x19, 0x98, 0x17, 0x10, 0x6f, 0x50, 0xfd, 0xc3, 0x3a, 0x56, 0x8e, 0x95, 0xd2, 0x81,
+	0x7a, 0xc4, 0xba, 0x9f, 0x6a, 0x49, 0xba, 0x49, 0x7b, 0x90, 0xf2, 0x71, 0xa5, 0xa6, 0x1e, 0xd5,
+	0x4a, 0xad, 0x63, 0x0a, 0xb9, 0x45, 0xe7, 0x67, 0x24, 0x86, 0x7b, 0x54, 0xaf, 0x51, 0xea, 0x2d,
+	0xaa, 0xcf, 0xa8, 0x01, 0x32, 0x27, 0xcb, 0xf2, 0x03, 0xc8, 0x57, 0x6d, 0x9d, 0x25, 0x65, 0xc5,
+	0xea, 0xd8, 0xe8, 0x0e, 0x2c, 0x98, 0x9a, 0xaf, 0x9a, 0x56, 0x97, 0x6f, 0xe5, 0x85, 0x30, 0x07,
+	0x69, 0x8e, 0xee, 0x54, 0x35, 0xbf, 0x6a, 0x75, 0xf1, 0xbc, 0xc9, 0x7e, 0xe5, 0xc7, 0x90, 0x69,
+	0xb8, 0xb4, 0x13, 0xf6, 0x2f, 0x10, 0x82, 0x39, 0x4b, 0xeb, 0x11, 0xde, 0xb5, 0xb0, 0x67, 0xda,
+	0x1d, 0x3e, 0xd7, 0xcc, 0x3e, 0xe1, 0xad, 0x4a, 0x30, 0x40, 0xb7, 0x20, 0xdf, 0x37, 0x2c, 0xff,
+	0xde, 0x3b, 0x6a, 0xc0, 0xa4, 0xa5, 0x63, 0x0e, 0xe7, 0x02, 0xda, 0x23, 0x4a, 0x92, 0x3f, 0x4f,
+	0x81, 0xa4, 0x58, 0xbe, 0xe1, 0x5f, 0x08, 0xcd, 0x86, 0x04, 0xa9, 0x9e, 0xd1, 0xe6, 0x13, 0xd0,
+	0x47, 0xb4, 0x0e, 0xf3, 0xa6, 0xad, 0x6b, 0x66, 0x38, 0x01, 0x1f, 0xa1, 0x2d, 0xc8, 0xb5, 0x89,
+	0xa7, 0xbb, 0x86, 0xc3, 0xaa, 0x49, 0xd0, 0x9b, 0x8a, 0x24, 0x6a, 0x99, 0xa7, 0xdb, 0x6e, 0xb8,
+	0x93, 0x07, 0x03, 0x24, 0x03, 0x08, 0x5b, 0x29, 0xdb, 0xc6, 0xf7, 0x93, 0xc5, 0x04, 0x16, 0xa8,
+	0xe8, 0x06, 0x80, 0x6f, 0x3b, 0x86, 0xae, 0x99, 0x86, 0x7f, 0xc1, 0x37, 0x73, 0x81, 0x32, 0xda,
+	0x12, 0x2d, 0xbc, 0x72, 0x4b, 0xb4, 0x0f, 0x59, 0x93, 0x07, 0xc7, 0x2b, 0x66, 0x58, 0x0b, 0x33,
+	0x11, 0x46, 0x8c, 0x22, 0x1e, 0xa8, 0xa1, 0xf7, 0x01, 0x9c, 0x20, 0x44, 0x06, 0xf1, 0x8a, 0x59,
+	0x06, 0x32, 0xb9, 0xae, 0xf2, 0x60, 0x62, 0x41, 0x47, 0xfe, 0x73, 0x02, 0xae, 0x52, 0x74, 0xd3,
+	0xf8, 0x8c, 0xb4, 0xeb, 0x67, 0xcf, 0x88, 0xee, 0x4f, 0x0d, 0xca, 0xeb, 0xb0, 0x68, 0x6a, 0x56,
+	0xb7, 0x4f, 0xdb, 0x54, 0xdd, 0x6e, 0x87, 0xb1, 0xc9, 0x87, 0xc4, 0xb2, 0xdd, 0x26, 0xd1, 0x6a,
+	0x49, 0xc5, 0x57, 0xcb, 0x98, 0x98, 0x8c, 0xf8, 0x33, 0xfd, 0xaa, 0xfe, 0x94, 0xff, 0x94, 0x84,
+	0xd5, 0xa6, 0xd6, 0x21, 0x4d, 0x76, 0x6c, 0x14, 0x5e, 0xe2, 0x5d, 0x48, 0x6b, 0xed, 0xbe, 0xe9,
+	0xf3, 0x13, 0xd2, 0x2c, 0x1b, 0x63, 0xa0, 0x40, 0x35, 0x3d, 0xc7, 0xb6, 0x3b, 0xec, 0x25, 0x67,
+	0xd4, 0x64, 0x0a, 0xe8, 0x01, 0x2c, 0xf4, 0x48, 0x9b, 0xae, 0x1a, 0xbe, 0x77, 0xce, 0xa2, 0x1b,
+	0xaa, 0xa0, 0x6f, 0x43, 0xe6, 0xb9, 0x61, 0x9b, 0x6c, 0x9d, 0xce, 0xcd, 0xac, 0x1e, 0xe9, 0xa0,
+	0x7b, 0x30, 0xe7, 0x6a, 0xfa, 0xc5, 0x25, 0xfa, 0x3f, 0x26, 0x2f, 0xbf, 0x80, 0x1c, 0xad, 0x01,
+	0xb6, 0xd5, 0xc5, 0x44, 0xf7, 0xd1, 0xdb, 0x90, 0xeb, 0x19, 0x96, 0x3a, 0x43, 0xc9, 0xc8, 0xf6,
+	0x0c, 0x2b, 0x78, 0x64, 0x4a, 0xda, 0x79, 0xa4, 0x94, 0x9c, 0xa6, 0xa4, 0x9d, 0x07, 0x8f, 0xb2,
+	0x0b, 0xd9, 0x32, 0x3d, 0xf8, 0xb2, 0x2a, 0xb5, 0x0d, 0x69, 0x76, 0x0a, 0xe6, 0x13, 0xa2, 0x98,
+	0x2e, 0x13, 0xc3, 0x81, 0xc0, 0x60, 0x4d, 0x25, 0xc5, 0x35, 0xf5, 0x06, 0x2c, 0x39, 0xc6, 0x39,
+	0x31, 0xd5, 0x8e, 0xab, 0xe9, 0x51, 0x89, 0x48, 0xe2, 0x45, 0x46, 0x3d, 0xe4, 0x44, 0xf9, 0x14,
+	0x8a, 0x07, 0x76, 0xcf, 0xb0, 0x34, 0xcb, 0x67, 0xa0, 0x9e, 0xb0, 0x64, 0xbe, 0x05, 0xf3, 0x6c,
+	0x06, 0xaf, 0x98, 0x60, 0x39, 0x75, 0x6b, 0x92, 0x0b, 0x23, 0xab, 0x31, 0x57, 0x90, 0x4d, 0x58,
+	0x66, 0xc7, 0xab, 0x46, 0x94, 0x63, 0xe8, 0x09, 0x2c, 0xb7, 0xf9, 0x4c, 0x6a, 0x04, 0x4b, 0x5f,
+	0xed, 0xeb, 0x93, 0x60, 0x27, 0x19, 0x86, 0x97, 0xda, 0x31, 0x8e, 0xfc, 0xdb, 0x04, 0x64, 0xca,
+	0xae, 0xed, 0x1c, 0x1b, 0x96, 0xff, 0x65, 0x9e, 0xd7, 0x6e, 0xc4, 0x6a, 0x65, 0xe0, 0x5e, 0xb1,
+	0x4e, 0xee, 0x42, 0xc1, 0xe8, 0x39, 0xb6, 0xeb, 0x6b, 0x96, 0x4e, 0x86, 0x1d, 0x8d, 0x06, 0xac,
+	0xc8, 0xdb, 0x8f, 0xa0, 0x10, 0xda, 0x29, 0x3a, 0xfa, 0x3b, 0x00, 0xba, 0x6b, 0x3b, 0xea, 0x53,
+	0x4a, 0xe7, 0xce, 0x9e, 0x58, 0xc0, 0x42, 0x00, 0x9c, 0xd5, 0x43, 0x28, 0xf9, 0x1e, 0x2c, 0x47,
+	0xb8, 0x0d, 0xcd, 0xd5, 0x7a, 0x1e, 0x2d, 0x51, 0x9a, 0xe7, 0x10, 0xdd, 0x57, 0xd9, 0x1d, 0x4e,
+	0x00, 0x9b, 0xc4, 0xf9, 0x80, 0x88, 0x19, 0x4d, 0x3e, 0x00, 0xf4, 0x98, 0x9c, 0x1d, 0x84, 0xa7,
+	0x2f, 0xae, 0xba, 0x03, 0x05, 0xc3, 0xd2, 0xcd, 0x7e, 0x9b, 0xa8, 0x5d, 0x62, 0xc7, 0x6e, 0x46,
+	0x32, 0x78, 0x85, 0xb3, 0x8e, 0x88, 0xcd, 0x2f, 0x48, 0xe4, 0x9f, 0xa4, 0x20, 0xcf, 0xa2, 0x5d,
+	0xa6, 0x47, 0xf0, 0x73, 0x1f, 0x1d, 0xd1, 0xf2, 0xe8, 0xab, 0xa6, 0x6d, 0x75, 0x55, 0x97, 0xe8,
+	0x3e, 0x0f, 0xc1, 0xc4, 0x93, 0xb8, 0x90, 0x6e, 0x38, 0x67, 0x0a, 0xb9, 0xf7, 0x06, 0x2c, 0x45,
+	0x75, 0x36, 0x70, 0x4e, 0x72, 0x2b, 0xb5, 0x9d, 0xc5, 0x51, 0xf5, 0x65, 0x6f, 0x8c, 0x9a, 0xb0,
+	0x32, 0xf0, 0x9f, 0xea, 0xb0, 0xb7, 0xe0, 0xfd, 0xf5, 0x9b, 0x2f, 0x73, 0x23, 0xf7, 0x17, 0x5e,
+	0xd6, 0x87, 0x1c, 0xa8, 0xc2, 0x5a, 0xfc, 0x0e, 0x2e, 0x04, 0x0e, 0x8a, 0xf3, 0x5b, 0x53, 0x36,
+	0x18, 0xaa, 0x14, 0x14, 0x60, 0x0e, 0x5e, 0x70, 0x46, 0x89, 0xe8, 0x13, 0x58, 0x8d, 0xdd, 0xc4,
+	0x85, 0xf8, 0xf3, 0x0c, 0xff, 0xf6, 0x24, 0xfc, 0xd1, 0x80, 0x61, 0xf4, 0x62, 0x84, 0x26, 0x7f,
+	0x91, 0x80, 0x55, 0xbe, 0xc4, 0x08, 0x0b, 0x0e, 0x26, 0xdf, 0xef, 0x13, 0x8f, 0xd6, 0xb3, 0x34,
+	0xbb, 0x4e, 0xe1, 0x41, 0xd9, 0x9c, 0x7a, 0x3d, 0x82, 0x03, 0x59, 0x74, 0x1f, 0x32, 0x9d, 0xe0,
+	0xea, 0x2c, 0x08, 0x41, 0x6e, 0xef, 0xe6, 0x4b, 0xae, 0xd8, 0x70, 0xa4, 0x40, 0x33, 0x32, 0xb8,
+	0xd1, 0xd1, 0x83, 0xf5, 0xc1, 0x12, 0x64, 0x4a, 0x46, 0x8a, 0x6b, 0x09, 0xe7, 0x0d, 0x61, 0x24,
+	0x3f, 0x84, 0x75, 0xc6, 0x1d, 0x24, 0x4f, 0xb8, 0xe6, 0x24, 0x48, 0x0d, 0x2e, 0x94, 0xe8, 0x23,
+	0xba, 0x09, 0x39, 0x87, 0xce, 0x6a, 0xf5, 0x7b, 0x67, 0xc4, 0x0d, 0x2f, 0xf6, 0x28, 0xa9, 0xc6,
+	0x28, 0xf2, 0x3f, 0xb2, 0xb0, 0x36, 0xe4, 0x22, 0xcf, 0xb1, 0x2d, 0x8f, 0xa0, 0x0f, 0x41, 0xea,
+	0x68, 0x3a, 0x11, 0xae, 0x54, 0xc3, 0xb4, 0xfc, 0xea, 0x6c, 0xa7, 0x3f, 0xbc, 0xdc, 0x89, 0x8d,
+	0x3d, 0xf4, 0x5d, 0x58, 0x0d, 0x2f, 0x2c, 0x62, 0xb0, 0x81, 0x37, 0xb7, 0x27, 0xc1, 0x0e, 0x77,
+	0x88, 0xb8, 0x10, 0xa2, 0x88, 0xe0, 0x4d, 0x90, 0x4c, 0xbb, 0x6b, 0xc7, 0x80, 0x53, 0x97, 0x04,
+	0x5e, 0xa6, 0x08, 0x22, 0xe8, 0x29, 0xac, 0x98, 0xda, 0x19, 0x31, 0x63, 0xa8, 0x73, 0x97, 0x44,
+	0x95, 0x18, 0x84, 0x08, 0xeb, 0xc1, 0x75, 0x33, 0x6c, 0xb5, 0x54, 0x9b, 0xf5, 0x5a, 0xb1, 0x19,
+	0xd6, 0xd9, 0x0c, 0x77, 0xa7, 0x35, 0x81, 0x63, 0xdb, 0x34, 0xbc, 0x61, 0x4e, 0x62, 0x31, 0x07,
+	0x0d, 0xdd, 0x91, 0xd3, 0x3c, 0xbe, 0xa4, 0x83, 0x28, 0x82, 0x08, 0xfa, 0x11, 0xac, 0x76, 0xfa,
+	0xa6, 0xa9, 0x0e, 0x21, 0xb3, 0x0b, 0x98, 0x29, 0x2b, 0xa5, 0x15, 0x83, 0xc1, 0x88, 0x62, 0xc4,
+	0x69, 0xe8, 0x0c, 0xd6, 0x3d, 0xad, 0x43, 0xc2, 0xc2, 0x23, 0x60, 0x07, 0xc5, 0xe1, 0xce, 0x24,
+	0xec, 0x71, 0xad, 0x1f, 0x5e, 0xf5, 0xc6, 0x35, 0x84, 0x5d, 0xb8, 0x16, 0x64, 0xe5, 0xa0, 0x0f,
+	0x16, 0x27, 0xca, 0x4c, 0x2f, 0x9f, 0x43, 0xbb, 0x3b, 0xbe, 0x6a, 0xc4, 0x09, 0xc2, 0x44, 0x2a,
+	0xac, 0x09, 0xd5, 0x59, 0x98, 0x22, 0x37, 0xbd, 0x90, 0x8e, 0xd9, 0x29, 0x71, 0x41, 0x1f, 0xb3,
+	0x7d, 0x56, 0x60, 0x31, 0x56, 0x48, 0xd9, 0x3d, 0xd5, 0x94, 0xfa, 0x22, 0x56, 0x50, 0x9c, 0x17,
+	0x6b, 0x27, 0x75, 0xfc, 0x50, 0xd1, 0x0f, 0x77, 0xbf, 0xa5, 0xe9, 0x8e, 0x8f, 0x55, 0x7d, 0xbe,
+	0x31, 0xe2, 0x55, 0x67, 0x0c, 0x95, 0x76, 0x76, 0xc4, 0x75, 0x6d, 0x97, 0x35, 0xa6, 0x42, 0x67,
+	0xe7, 0x3a, 0xfa, 0x4e, 0x93, 0x7d, 0x12, 0xc1, 0x81, 0x00, 0x3a, 0xe6, 0x97, 0xdc, 0xe7, 0x7e,
+	0x71, 0x8d, 0xc9, 0xee, 0x4c, 0x0d, 0xc7, 0x48, 0x51, 0xc4, 0xa1, 0xba, 0xfc, 0x57, 0x61, 0x37,
+	0x38, 0x34, 0xcc, 0x41, 0xa5, 0x3b, 0x84, 0xbc, 0x61, 0x39, 0x7d, 0x3f, 0xb8, 0x5f, 0xed, 0xbe,
+	0x6c, 0xa7, 0xae, 0x50, 0x59, 0x76, 0xdb, 0xda, 0xc5, 0x39, 0x63, 0x30, 0x40, 0x0f, 0x21, 0xeb,
+	0x72, 0xcc, 0xb0, 0xa6, 0x7d, 0x6d, 0x12, 0xc8, 0xd8, 0x9a, 0x8b, 0x07, 0xfa, 0xb4, 0x72, 0xfb,
+	0xb6, 0xaf, 0x99, 0x2a, 0x2d, 0xd6, 0x1e, 0xdb, 0x2e, 0xd2, 0xf4, 0x00, 0xea, 0x6b, 0x66, 0x83,
+	0x52, 0xe4, 0x0e, 0x6c, 0xec, 0x6b, 0x7e, 0xb4, 0x9c, 0x03, 0x24, 0x2f, 0xdc, 0xe1, 0x8e, 0x21,
+	0xe3, 0x06, 0x8f, 0x61, 0xd5, 0xbe, 0x33, 0xa3, 0x29, 0x4c, 0x09, 0x47, 0xda, 0xf2, 0x33, 0xb8,
+	0x36, 0x76, 0x1e, 0xee, 0xbc, 0xd8, 0x4b, 0x27, 0xfe, 0xb3, 0x97, 0x96, 0xff, 0x95, 0x80, 0x42,
+	0x3c, 0x44, 0xc1, 0xdb, 0x7c, 0x59, 0x11, 0xfa, 0x1f, 0xd9, 0xc2, 0xe9, 0x71, 0x25, 0x08, 0x2b,
+	0xdd, 0x4a, 0xd2, 0x38, 0x18, 0xc8, 0x6d, 0xb8, 0x1a, 0xf3, 0x34, 0xf5, 0x40, 0x14, 0xd0, 0xa3,
+	0x91, 0x80, 0xbe, 0xf5, 0x32, 0x37, 0x0b, 0x1e, 0x14, 0xe2, 0xf9, 0x74, 0x68, 0xdd, 0xf0, 0x59,
+	0x78, 0x38, 0x3f, 0x18, 0x0d, 0xe7, 0x9d, 0xd9, 0xe6, 0x19, 0x8d, 0xe6, 0x1f, 0x92, 0x50, 0x2c,
+	0x79, 0x17, 0x96, 0xfe, 0xff, 0x10, 0xd2, 0x0a, 0x2c, 0xda, 0x7d, 0x5f, 0x78, 0xa1, 0xb9, 0xe9,
+	0x50, 0x75, 0x26, 0xcc, 0xdf, 0x28, 0x6f, 0x0b, 0x23, 0xb9, 0x03, 0x57, 0xc7, 0xb8, 0x8d, 0x07,
+	0x68, 0x64, 0x9e, 0xc4, 0x2b, 0xcf, 0xf3, 0xc7, 0x04, 0xdc, 0x64, 0x13, 0xfd, 0x37, 0xea, 0xc8,
+	0xa8, 0xe1, 0xc9, 0x57, 0x36, 0xbc, 0x07, 0x5b, 0x93, 0xed, 0xfe, 0xf2, 0xfd, 0x64, 0xc1, 0x8d,
+	0xd1, 0xe9, 0x62, 0xc9, 0x59, 0x1d, 0xf1, 0xd2, 0xc4, 0x03, 0xfd, 0xa4, 0x84, 0x10, 0x32, 0xd4,
+	0x1d, 0x17, 0x96, 0x78, 0x9a, 0xd6, 0x47, 0xd3, 0xf4, 0xee, 0x25, 0x66, 0x1c, 0xcd, 0xd5, 0x1f,
+	0x27, 0x20, 0x27, 0xe4, 0x18, 0x7a, 0x1f, 0xa0, 0xab, 0x7b, 0x2a, 0xff, 0x8a, 0x1c, 0xf8, 0x6e,
+	0xe2, 0xdd, 0xc7, 0x91, 0xee, 0xf1, 0x6f, 0xc8, 0xd9, 0x6e, 0xf8, 0x28, 0x7e, 0x9d, 0x4e, 0xc5,
+	0xbf, 0x4e, 0x5f, 0x83, 0x6c, 0xcf, 0xe8, 0x11, 0x95, 0x7d, 0x50, 0xe2, 0x5f, 0xb7, 0x29, 0xa1,
+	0x75, 0xe1, 0x10, 0xf9, 0x87, 0x90, 0x17, 0x43, 0x81, 0xea, 0xb0, 0x4c, 0x0d, 0x69, 0x13, 0xcf,
+	0x37, 0xac, 0xa0, 0x67, 0x4a, 0x4c, 0xef, 0x2d, 0x8f, 0x74, 0xef, 0x60, 0x20, 0x8d, 0x97, 0xba,
+	0xb1, 0x31, 0xda, 0x04, 0x38, 0xa3, 0x8e, 0x55, 0x3d, 0xe3, 0x33, 0xc2, 0x4f, 0x44, 0x59, 0x46,
+	0x69, 0x1a, 0x9f, 0x11, 0x79, 0x13, 0xb2, 0xd1, 0xeb, 0x8c, 0x1e, 0xa8, 0x64, 0x19, 0x96, 0xe2,
+	0xf8, 0x63, 0x64, 0x7e, 0x97, 0x84, 0x95, 0x7a, 0xf8, 0xbf, 0x91, 0x13, 0xe2, 0x6b, 0x6d, 0xcd,
+	0xd7, 0x90, 0x02, 0x69, 0x8f, 0x46, 0x80, 0x5f, 0x3e, 0x4e, 0xfc, 0x48, 0x3d, 0xa2, 0xc9, 0x1a,
+	0x22, 0x82, 0x03, 0x6d, 0x74, 0x1f, 0x72, 0xba, 0x4b, 0x34, 0x9f, 0xa8, 0xbe, 0xd1, 0x23, 0xfc,
+	0x20, 0xbe, 0x11, 0x82, 0x85, 0xff, 0x39, 0xd9, 0x69, 0x85, 0xff, 0x39, 0xc1, 0x10, 0x88, 0x53,
+	0x02, 0x55, 0xee, 0x3b, 0xed, 0x48, 0x79, 0xfe, 0xe5, 0xca, 0x81, 0x38, 0x25, 0xc8, 0x1f, 0x42,
+	0x9a, 0x59, 0x82, 0xd6, 0x60, 0xa5, 0xd9, 0x2a, 0xb5, 0x86, 0xff, 0xee, 0x91, 0x83, 0x85, 0x32,
+	0x56, 0x4a, 0x2d, 0xe5, 0x40, 0x4a, 0xd0, 0x01, 0x3e, 0xad, 0xd5, 0x2a, 0xb5, 0x23, 0x29, 0x89,
+	0x32, 0x30, 0x77, 0x50, 0xaf, 0x29, 0x52, 0x0a, 0x2d, 0x42, 0xb6, 0x5c, 0xaa, 0x95, 0x95, 0x6a,
+	0x55, 0x39, 0x90, 0xe6, 0x6e, 0x13, 0x00, 0xe1, 0x2b, 0x66, 0x0e, 0x16, 0xf8, 0x27, 0x3d, 0xe9,
+	0x35, 0xb4, 0x02, 0x8b, 0x8f, 0x14, 0xfc, 0x44, 0x3d, 0xad, 0x55, 0x2b, 0x0f, 0x95, 0xea, 0x13,
+	0x29, 0x81, 0xf2, 0x90, 0x89, 0x46, 0x49, 0x3a, 0x6a, 0xd4, 0x9b, 0xcd, 0xca, 0x7e, 0x95, 0x02,
+	0x03, 0xcc, 0x73, 0xce, 0x1c, 0x5a, 0x86, 0x1c, 0x53, 0xe5, 0x84, 0xf4, 0xde, 0xe7, 0x69, 0x58,
+	0x12, 0xbb, 0x43, 0xdb, 0x45, 0xbf, 0x4c, 0x40, 0x61, 0x4c, 0xf9, 0x40, 0x7b, 0x13, 0xaf, 0xc8,
+	0x26, 0xd6, 0xc8, 0x8d, 0xb7, 0x2f, 0xa5, 0x13, 0x64, 0x9c, 0x7c, 0xe3, 0x47, 0x5f, 0xfc, 0xfd,
+	0xa7, 0xc9, 0xa2, 0x5c, 0x88, 0xfe, 0x73, 0xe5, 0xbd, 0xc7, 0xcf, 0x05, 0xe4, 0xbd, 0xc4, 0x6d,
+	0xf4, 0xf3, 0x04, 0xa0, 0xd1, 0x02, 0x80, 0xee, 0xce, 0x34, 0x97, 0x58, 0x9c, 0x36, 0xf6, 0x2e,
+	0xa3, 0xc2, 0xad, 0xdb, 0x64, 0xd6, 0x5d, 0x91, 0x11, 0xb5, 0xae, 0x43, 0x59, 0x31, 0xe3, 0x7e,
+	0x91, 0xe0, 0x3b, 0xfb, 0x38, 0x17, 0x7e, 0x73, 0x6a, 0x21, 0x9a, 0xe2, 0xc7, 0xe8, 0x1a, 0x46,
+	0xf8, 0x03, 0xd6, 0x20, 0x1d, 0xe4, 0x6d, 0x66, 0x93, 0x2c, 0x6f, 0x8a, 0x1e, 0x1b, 0x81, 0xa4,
+	0xe6, 0xfd, 0x2c, 0x01, 0x57, 0x26, 0x54, 0x50, 0x74, 0x6f, 0x76, 0xeb, 0x62, 0x5e, 0x7c, 0x89,
+	0x71, 0x6f, 0x32, 0xe3, 0x6e, 0xc9, 0xd7, 0x05, 0x87, 0x8d, 0xb3, 0x6d, 0xff, 0x07, 0xb0, 0xa1,
+	0xdb, 0xbd, 0x09, 0x46, 0xec, 0x17, 0xe2, 0xcb, 0xb4, 0x41, 0x33, 0xb2, 0x91, 0xf8, 0xf8, 0x01,
+	0x17, 0xef, 0xda, 0xa6, 0x66, 0x75, 0x77, 0x6c, 0xb7, 0xbb, 0xdb, 0x25, 0x16, 0xcb, 0xd7, 0xdd,
+	0x80, 0xa5, 0x39, 0x86, 0x37, 0xfc, 0x27, 0xb7, 0xfb, 0xc1, 0xd3, 0x3f, 0x13, 0x89, 0x5f, 0x27,
+	0xe7, 0x8e, 0xca, 0x8f, 0x6a, 0x67, 0xf3, 0x4c, 0xe5, 0xed, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff,
+	0x88, 0xec, 0xbf, 0xf1, 0xfc, 0x27, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3010,214 +3268,3 @@ var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/vision/v1/image_annotator.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/vision/v1/image_annotator.proto", fileDescriptor_image_annotator_faae31fa1d905783)
-}
-
-var fileDescriptor_image_annotator_faae31fa1d905783 = []byte{
-	// 3240 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x5f, 0x6f, 0x1b, 0x59,
-	0x15, 0x5f, 0xdb, 0x71, 0x62, 0x1f, 0x3b, 0xc9, 0xe4, 0x3a, 0x49, 0xdd, 0xb4, 0x69, 0xd3, 0x59,
-	0x96, 0x8d, 0xba, 0x25, 0xa1, 0xd9, 0xa5, 0x2c, 0xdb, 0x0a, 0xd6, 0x71, 0x26, 0x89, 0xb7, 0x8e,
-	0xed, 0xbd, 0x76, 0xda, 0xed, 0xb2, 0x62, 0x34, 0x19, 0x5f, 0xbb, 0xd3, 0x1d, 0xcf, 0x0c, 0x33,
-	0xe3, 0x36, 0x59, 0x24, 0x1e, 0x78, 0x40, 0xda, 0x57, 0x78, 0x02, 0x21, 0x84, 0x40, 0x82, 0x2f,
-	0x00, 0x3c, 0xf3, 0x86, 0x90, 0x78, 0x41, 0xfb, 0x15, 0x78, 0xe0, 0x23, 0x20, 0xf1, 0x82, 0xee,
-	0x9d, 0x3b, 0xe3, 0x3b, 0xfe, 0x57, 0xa7, 0xac, 0x10, 0x12, 0x4f, 0x9e, 0x7b, 0xfe, 0xfc, 0xee,
-	0x99, 0x73, 0xee, 0x39, 0xf7, 0xdc, 0x3b, 0x86, 0x3b, 0x5d, 0xdb, 0xee, 0x9a, 0x64, 0x57, 0x37,
-	0xed, 0x7e, 0x7b, 0xf7, 0xb9, 0xe1, 0x19, 0xb6, 0xb5, 0xfb, 0xfc, 0xee, 0xae, 0xd1, 0xd3, 0xba,
-	0x44, 0xd5, 0x2c, 0xcb, 0xf6, 0x35, 0xdf, 0x76, 0x77, 0x1c, 0xd7, 0xf6, 0x6d, 0xb4, 0x1e, 0x48,
-	0xef, 0x30, 0xe9, 0x9d, 0x40, 0x7a, 0xe7, 0xf9, 0xdd, 0x8d, 0xeb, 0x1c, 0x45, 0x73, 0x8c, 0x5d,
-	0xae, 0x63, 0xd8, 0x96, 0x17, 0x68, 0x6d, 0xbc, 0x31, 0x61, 0x8e, 0x2e, 0xb1, 0x7b, 0xc4, 0x77,
-	0x2f, 0xb8, 0xd8, 0x5b, 0x13, 0xc4, 0x1c, 0xd7, 0x6e, 0xf7, 0x75, 0x5f, 0xf5, 0x88, 0xe6, 0xea,
-	0x4f, 0xb9, 0xf0, 0x24, 0xbb, 0x7d, 0x72, 0xee, 0xab, 0x03, 0x13, 0xb8, 0xf4, 0xed, 0x09, 0xd2,
-	0x2f, 0xc8, 0x99, 0xda, 0x26, 0x3e, 0xd1, 0x05, 0xd9, 0xd7, 0xb9, 0xac, 0x69, 0x5b, 0x5d, 0xb7,
-	0x6f, 0x59, 0x86, 0xd5, 0xdd, 0xb5, 0x1d, 0xe2, 0xc6, 0x5e, 0x69, 0x8b, 0x0b, 0xb1, 0xd1, 0x59,
-	0xbf, 0xb3, 0xdb, 0x31, 0x88, 0xd9, 0x56, 0x7b, 0x9a, 0xf7, 0x29, 0x97, 0xb8, 0x39, 0x2c, 0xe1,
-	0x1b, 0x3d, 0xe2, 0xf9, 0x5a, 0xcf, 0xe1, 0x02, 0x57, 0xb8, 0x80, 0xeb, 0xe8, 0xbb, 0x9e, 0xaf,
-	0xf9, 0x7d, 0x6f, 0x88, 0xe1, 0x5f, 0x38, 0x64, 0x57, 0xb7, 0xcd, 0xd0, 0xfb, 0x1b, 0x45, 0x91,
-	0x61, 0x6a, 0xbe, 0x69, 0x75, 0x03, 0x8e, 0xfc, 0xab, 0x14, 0x2c, 0x1c, 0x12, 0xcd, 0xef, 0xbb,
-	0x04, 0xbd, 0x0b, 0x73, 0x54, 0xa0, 0x98, 0xd8, 0x4a, 0x6c, 0x2f, 0xed, 0x7d, 0x65, 0x67, 0x7c,
-	0xc8, 0x76, 0xb8, 0xf8, 0x4e, 0xeb, 0xc2, 0x21, 0x98, 0x69, 0xa0, 0x9b, 0x90, 0xeb, 0x69, 0xe7,
-	0xaa, 0x4b, 0xbc, 0xbe, 0xe9, 0x7b, 0xc5, 0xe4, 0x56, 0x62, 0x3b, 0x8d, 0xa1, 0xa7, 0x9d, 0xe3,
-	0x80, 0x82, 0x56, 0x21, 0xdd, 0xb3, 0xdb, 0xc4, 0x2c, 0xa6, 0xb6, 0x12, 0xdb, 0x59, 0x1c, 0x0c,
-	0xe4, 0xdf, 0x24, 0x61, 0x8e, 0xa2, 0xa0, 0x55, 0x90, 0x5a, 0x4f, 0x1a, 0x8a, 0x7a, 0x5a, 0x6b,
-	0x36, 0x94, 0x72, 0xe5, 0xb0, 0xa2, 0x1c, 0x48, 0xaf, 0x21, 0x04, 0x4b, 0x87, 0xa5, 0xb2, 0xa2,
-	0x1e, 0x28, 0x2d, 0xa5, 0xdc, 0xaa, 0xd4, 0x6b, 0x52, 0x02, 0xad, 0x03, 0xaa, 0x96, 0x6a, 0x07,
-	0x27, 0x25, 0xfc, 0x50, 0xa0, 0x27, 0xa9, 0x6c, 0xb5, 0x7e, 0x54, 0x17, 0x68, 0x29, 0x54, 0x80,
-	0xe5, 0x6a, 0x69, 0x5f, 0xa9, 0x0a, 0xc4, 0x39, 0x2a, 0xd8, 0x52, 0x3e, 0x6a, 0x09, 0xb4, 0x34,
-	0xba, 0x06, 0x57, 0x0e, 0xea, 0xe5, 0xd3, 0x13, 0xa5, 0xd6, 0x52, 0x87, 0x98, 0x39, 0x74, 0x15,
-	0xd6, 0x9a, 0xa5, 0x43, 0x45, 0x6d, 0x2a, 0x25, 0x5c, 0x3e, 0x16, 0x58, 0xf3, 0xd4, 0xec, 0xca,
-	0x49, 0xe9, 0x48, 0x51, 0x1b, 0xb8, 0xde, 0x50, 0x70, 0xab, 0xa2, 0x34, 0xa5, 0x05, 0xb4, 0x04,
-	0x50, 0xc6, 0xf5, 0x86, 0x7a, 0x5c, 0xa9, 0xb5, 0x9a, 0x52, 0x16, 0xad, 0xc0, 0xe2, 0x63, 0x65,
-	0x5f, 0x50, 0x04, 0x6a, 0x44, 0x03, 0xd7, 0x0f, 0x4e, 0xcb, 0x2d, 0x0e, 0x2b, 0xe5, 0xd1, 0x15,
-	0x28, 0xd4, 0xf7, 0x3f, 0x50, 0xca, 0x2d, 0xb5, 0x5a, 0x2f, 0x97, 0xaa, 0x95, 0x8f, 0x4b, 0x4c,
-	0xb8, 0x20, 0xd7, 0x20, 0x57, 0xa1, 0x39, 0xd5, 0xb4, 0xfb, 0xae, 0x4e, 0x90, 0x0c, 0x8b, 0x5d,
-	0xdd, 0x53, 0x83, 0x34, 0xeb, 0xbb, 0x06, 0x0b, 0x57, 0x16, 0xe7, 0xba, 0xba, 0xc7, 0xc4, 0x4e,
-	0x5d, 0x03, 0x5d, 0x83, 0xec, 0x80, 0x9f, 0x64, 0xfc, 0x8c, 0xc1, 0x99, 0xf2, 0xf7, 0x20, 0xcd,
-	0x04, 0x51, 0x11, 0x16, 0x74, 0xdb, 0xf2, 0x89, 0xe5, 0x33, 0x8c, 0x3c, 0x0e, 0x87, 0xe8, 0x3e,
-	0xcc, 0x7b, 0x6c, 0x36, 0xa6, 0x9c, 0xdb, 0x7b, 0x7d, 0xd2, 0x5a, 0x10, 0x0c, 0xc3, 0x5c, 0x45,
-	0xfe, 0xdb, 0x32, 0x2c, 0x1d, 0x6a, 0x3a, 0x29, 0x45, 0xb9, 0x84, 0x2a, 0xb0, 0x78, 0x66, 0xf7,
-	0xad, 0xb6, 0x61, 0x75, 0x55, 0xc7, 0x36, 0x2f, 0xd8, 0x7c, 0xb9, 0xc9, 0x4b, 0x6c, 0x9f, 0x0b,
-	0x37, 0x6c, 0xf3, 0x02, 0xe7, 0xcf, 0x84, 0x11, 0xaa, 0x81, 0xd4, 0x69, 0xab, 0x71, 0xb4, 0xe4,
-	0x25, 0xd0, 0x96, 0x3a, 0x6d, 0x71, 0x8c, 0x4e, 0x20, 0x6b, 0x6a, 0x56, 0xbb, 0xa7, 0xb9, 0x9f,
-	0x7a, 0xc5, 0xd4, 0x56, 0x6a, 0x3b, 0xb7, 0xb7, 0x3b, 0x71, 0xe5, 0xc7, 0xde, 0x6a, 0xa7, 0xca,
-	0xf5, 0xf0, 0x00, 0x01, 0x6d, 0x02, 0xb8, 0xb6, 0x69, 0xaa, 0x9a, 0xd5, 0x35, 0x49, 0x71, 0x6e,
-	0x2b, 0xb1, 0x9d, 0xc4, 0x59, 0x4a, 0x29, 0x51, 0x02, 0x0d, 0x8c, 0xa3, 0x59, 0x9c, 0x9b, 0x66,
-	0xdc, 0x8c, 0xa3, 0x59, 0x01, 0x73, 0x13, 0xc0, 0x37, 0x4c, 0x9f, 0x73, 0xe7, 0x03, 0x5d, 0x4a,
-	0x09, 0xd8, 0x77, 0x61, 0x35, 0xaa, 0x38, 0xaa, 0x6e, 0x5b, 0x1d, 0xa3, 0x4d, 0x2c, 0x9d, 0x14,
-	0x17, 0x98, 0x60, 0x21, 0xe2, 0x95, 0x23, 0x16, 0xfa, 0x06, 0xac, 0x87, 0xa6, 0x51, 0x67, 0x09,
-	0x4a, 0x19, 0xa6, 0xb4, 0x26, 0x70, 0x05, 0xb5, 0x0a, 0x2c, 0x3d, 0xb3, 0x2f, 0x54, 0xd3, 0xf8,
-	0x94, 0x98, 0xc6, 0x53, 0xdb, 0x6e, 0x17, 0xb3, 0xac, 0x24, 0xc8, 0x93, 0x1c, 0x53, 0x8d, 0x24,
-	0xf1, 0xe2, 0x33, 0xfb, 0x62, 0x30, 0x44, 0x75, 0x58, 0xf1, 0x6c, 0xd7, 0xb5, 0x5f, 0x88, 0x68,
-	0x30, 0x33, 0x9a, 0x14, 0x28, 0x0b, 0x80, 0x27, 0x20, 0x69, 0x56, 0x97, 0xb8, 0x22, 0x5e, 0x6e,
-	0x66, 0xbc, 0x65, 0xa6, 0x2b, 0xc0, 0x35, 0xa1, 0xe0, 0xf5, 0x5d, 0xc7, 0x35, 0x3c, 0x22, 0x22,
-	0xe6, 0x67, 0x46, 0x44, 0xa1, 0xba, 0x00, 0xfa, 0x09, 0x14, 0xfb, 0x56, 0x9b, 0xb8, 0x2a, 0x39,
-	0x77, 0x6c, 0x8f, 0xb4, 0x45, 0xe4, 0xc5, 0x99, 0x91, 0xd7, 0x19, 0x86, 0x12, 0x40, 0x08, 0xe8,
-	0x1f, 0x02, 0x3a, 0x33, 0xfb, 0xae, 0x1b, 0xc7, 0x5d, 0x9a, 0x19, 0x77, 0x85, 0x6b, 0xc7, 0xbd,
-	0xf0, 0x94, 0x68, 0xed, 0x17, 0x44, 0x8b, 0xf9, 0x75, 0x79, 0x76, 0x2f, 0x84, 0xea, 0x03, 0xda,
-	0xc6, 0x5f, 0x16, 0x20, 0x13, 0xa6, 0x08, 0x3a, 0xe6, 0x7b, 0x4b, 0x8a, 0x41, 0xbe, 0x73, 0xc9,
-	0x0c, 0x13, 0xf7, 0x9a, 0x07, 0x90, 0x71, 0x6c, 0xcf, 0xa0, 0x7c, 0x96, 0x5f, 0xb9, 0xbd, 0xad,
-	0x49, 0x68, 0x0d, 0x2e, 0x87, 0x23, 0x0d, 0xf9, 0xf7, 0xf3, 0x83, 0x2d, 0xe7, 0xb4, 0xf6, 0xb0,
-	0x56, 0x7f, 0x5c, 0x53, 0xc3, 0x0d, 0x45, 0x7a, 0x0d, 0xe5, 0x21, 0x53, 0x55, 0x0e, 0x5b, 0xaa,
-	0xf2, 0x44, 0x91, 0x12, 0x68, 0x11, 0xb2, 0xb8, 0x72, 0x74, 0x1c, 0x0c, 0x93, 0xa8, 0x08, 0xab,
-	0x8c, 0x59, 0x3f, 0x54, 0x43, 0xa1, 0x7d, 0x5c, 0x7f, 0x2c, 0xa5, 0xe8, 0x1e, 0x11, 0x08, 0x0e,
-	0xb3, 0xe6, 0x28, 0x2b, 0x54, 0x8a, 0xb0, 0x18, 0x2b, 0x8d, 0x36, 0x60, 0x3d, 0xd2, 0x8a, 0xf3,
-	0xe6, 0xa9, 0xda, 0x49, 0xe5, 0xa0, 0x51, 0xaf, 0xd4, 0x5a, 0xea, 0xbe, 0xd2, 0x7a, 0xac, 0x28,
-	0x35, 0xca, 0xa5, 0xfb, 0x4b, 0x1e, 0x32, 0xb5, 0x7a, 0x53, 0x51, 0x5b, 0x95, 0x86, 0x94, 0xa1,
-	0x36, 0x9e, 0x36, 0x1a, 0x0a, 0x56, 0xab, 0x95, 0x86, 0x94, 0xa5, 0xc3, 0x6a, 0xfd, 0x31, 0x1f,
-	0x02, 0xdd, 0x8b, 0x4e, 0xea, 0xa7, 0xad, 0x63, 0x66, 0x95, 0x94, 0x43, 0xcb, 0x90, 0x0b, 0xc6,
-	0x6c, 0x3e, 0x29, 0x8f, 0x24, 0xc8, 0x07, 0x84, 0xb2, 0x52, 0x6b, 0x29, 0x58, 0x5a, 0x44, 0x6b,
-	0xb0, 0xc2, 0xe0, 0xf7, 0xeb, 0xad, 0x56, 0xfd, 0x84, 0x0b, 0x2e, 0x51, 0x7f, 0x89, 0x64, 0x86,
-	0xb7, 0x4c, 0xb7, 0x63, 0x91, 0xca, 0x41, 0xa4, 0xe8, 0xad, 0x95, 0x27, 0x8a, 0xda, 0xaa, 0x37,
-	0xd4, 0xfd, 0xfa, 0x69, 0xed, 0xa0, 0x84, 0x9f, 0x48, 0x2b, 0x31, 0x56, 0xf0, 0xd6, 0xe5, 0x3a,
-	0xae, 0x29, 0x58, 0x42, 0xe8, 0x3a, 0x14, 0x23, 0x16, 0x47, 0x8c, 0x14, 0x0b, 0x91, 0xfb, 0x29,
-	0x97, 0x3d, 0x70, 0xbd, 0xd5, 0x81, 0x23, 0x47, 0xa6, 0x5b, 0x8b, 0xf3, 0x62, 0xf3, 0xad, 0xa3,
-	0x4d, 0xb8, 0x3a, 0xe0, 0x0d, 0x4f, 0x78, 0x65, 0x10, 0xd5, 0xe1, 0x19, 0x8b, 0xe8, 0x26, 0x5c,
-	0x13, 0xe3, 0xac, 0x06, 0x21, 0x08, 0x23, 0x26, 0x5d, 0x45, 0x5b, 0x70, 0x3d, 0x16, 0xd2, 0x61,
-	0x89, 0x0d, 0xea, 0xd0, 0x00, 0xa2, 0x84, 0xd5, 0x16, 0x2e, 0x1d, 0xd1, 0xcd, 0xfe, 0x1a, 0xf5,
-	0x3e, 0xd7, 0x13, 0xc8, 0xd7, 0x59, 0x7b, 0x13, 0xbe, 0x7b, 0xe3, 0xb4, 0x51, 0xa9, 0x4a, 0x9b,
-	0xb4, 0xbd, 0x19, 0x98, 0x17, 0x10, 0x6f, 0x50, 0xfd, 0xc3, 0x3a, 0x56, 0x8e, 0x95, 0xd2, 0x81,
-	0x7a, 0xc4, 0xba, 0x9f, 0x6a, 0x49, 0xba, 0x49, 0x7b, 0x90, 0xf2, 0x71, 0xa5, 0xa6, 0x1e, 0xd5,
-	0x4a, 0xad, 0x63, 0x0a, 0xb9, 0x45, 0xe7, 0x67, 0x24, 0x86, 0x7b, 0x54, 0xaf, 0x51, 0xea, 0x2d,
-	0xaa, 0xcf, 0xa8, 0x01, 0x32, 0x27, 0xcb, 0xf2, 0x03, 0xc8, 0x57, 0x6d, 0x9d, 0x25, 0x65, 0xc5,
-	0xea, 0xd8, 0xe8, 0x0e, 0x2c, 0x98, 0x9a, 0xaf, 0x9a, 0x56, 0x97, 0x6f, 0xe5, 0x85, 0x30, 0x07,
-	0x69, 0x8e, 0xee, 0x54, 0x35, 0xbf, 0x6a, 0x75, 0xf1, 0xbc, 0xc9, 0x7e, 0xe5, 0xc7, 0x90, 0x69,
-	0xb8, 0xb4, 0x13, 0xf6, 0x2f, 0x10, 0x82, 0x39, 0x4b, 0xeb, 0x11, 0xde, 0xb5, 0xb0, 0x67, 0xda,
-	0x1d, 0x3e, 0xd7, 0xcc, 0x3e, 0xe1, 0xad, 0x4a, 0x30, 0x40, 0xb7, 0x20, 0xdf, 0x37, 0x2c, 0xff,
-	0xde, 0x3b, 0x6a, 0xc0, 0xa4, 0xa5, 0x63, 0x0e, 0xe7, 0x02, 0xda, 0x23, 0x4a, 0x92, 0x3f, 0x4f,
-	0x81, 0xa4, 0x58, 0xbe, 0xe1, 0x5f, 0x08, 0xcd, 0x86, 0x04, 0xa9, 0x9e, 0xd1, 0xe6, 0x13, 0xd0,
-	0x47, 0xb4, 0x0e, 0xf3, 0xa6, 0xad, 0x6b, 0x66, 0x38, 0x01, 0x1f, 0xa1, 0x2d, 0xc8, 0xb5, 0x89,
-	0xa7, 0xbb, 0x86, 0xc3, 0xaa, 0x49, 0xd0, 0x9b, 0x8a, 0x24, 0x6a, 0x99, 0xa7, 0xdb, 0x6e, 0xb8,
-	0x93, 0x07, 0x03, 0x24, 0x03, 0x08, 0x5b, 0x29, 0xdb, 0xc6, 0xf7, 0x93, 0xc5, 0x04, 0x16, 0xa8,
-	0xe8, 0x06, 0x80, 0x6f, 0x3b, 0x86, 0xae, 0x99, 0x86, 0x7f, 0xc1, 0x37, 0x73, 0x81, 0x32, 0xda,
-	0x12, 0x2d, 0xbc, 0x72, 0x4b, 0xb4, 0x0f, 0x59, 0x93, 0x07, 0xc7, 0x2b, 0x66, 0x58, 0x0b, 0x33,
-	0x11, 0x46, 0x8c, 0x22, 0x1e, 0xa8, 0xa1, 0xf7, 0x01, 0x9c, 0x20, 0x44, 0x06, 0xf1, 0x8a, 0x59,
-	0x06, 0x32, 0xb9, 0xae, 0xf2, 0x60, 0x62, 0x41, 0x47, 0xfe, 0x73, 0x02, 0xae, 0x52, 0x74, 0xd3,
-	0xf8, 0x8c, 0xb4, 0xeb, 0x67, 0xcf, 0x88, 0xee, 0x4f, 0x0d, 0xca, 0xeb, 0xb0, 0x68, 0x6a, 0x56,
-	0xb7, 0x4f, 0xdb, 0x54, 0xdd, 0x6e, 0x87, 0xb1, 0xc9, 0x87, 0xc4, 0xb2, 0xdd, 0x26, 0xd1, 0x6a,
-	0x49, 0xc5, 0x57, 0xcb, 0x98, 0x98, 0x8c, 0xf8, 0x33, 0xfd, 0xaa, 0xfe, 0x94, 0xff, 0x94, 0x84,
-	0xd5, 0xa6, 0xd6, 0x21, 0x4d, 0x76, 0x6c, 0x14, 0x5e, 0xe2, 0x5d, 0x48, 0x6b, 0xed, 0xbe, 0xe9,
-	0xf3, 0x13, 0xd2, 0x2c, 0x1b, 0x63, 0xa0, 0x40, 0x35, 0x3d, 0xc7, 0xb6, 0x3b, 0xec, 0x25, 0x67,
-	0xd4, 0x64, 0x0a, 0xe8, 0x01, 0x2c, 0xf4, 0x48, 0x9b, 0xae, 0x1a, 0xbe, 0x77, 0xce, 0xa2, 0x1b,
-	0xaa, 0xa0, 0x6f, 0x43, 0xe6, 0xb9, 0x61, 0x9b, 0x6c, 0x9d, 0xce, 0xcd, 0xac, 0x1e, 0xe9, 0xa0,
-	0x7b, 0x30, 0xe7, 0x6a, 0xfa, 0xc5, 0x25, 0xfa, 0x3f, 0x26, 0x2f, 0xbf, 0x80, 0x1c, 0xad, 0x01,
-	0xb6, 0xd5, 0xc5, 0x44, 0xf7, 0xd1, 0xdb, 0x90, 0xeb, 0x19, 0x96, 0x3a, 0x43, 0xc9, 0xc8, 0xf6,
-	0x0c, 0x2b, 0x78, 0x64, 0x4a, 0xda, 0x79, 0xa4, 0x94, 0x9c, 0xa6, 0xa4, 0x9d, 0x07, 0x8f, 0xb2,
-	0x0b, 0xd9, 0x32, 0x3d, 0xf8, 0xb2, 0x2a, 0xb5, 0x0d, 0x69, 0x76, 0x0a, 0xe6, 0x13, 0xa2, 0x98,
-	0x2e, 0x13, 0xc3, 0x81, 0xc0, 0x60, 0x4d, 0x25, 0xc5, 0x35, 0xf5, 0x06, 0x2c, 0x39, 0xc6, 0x39,
-	0x31, 0xd5, 0x8e, 0xab, 0xe9, 0x51, 0x89, 0x48, 0xe2, 0x45, 0x46, 0x3d, 0xe4, 0x44, 0xf9, 0x14,
-	0x8a, 0x07, 0x76, 0xcf, 0xb0, 0x34, 0xcb, 0x67, 0xa0, 0x9e, 0xb0, 0x64, 0xbe, 0x05, 0xf3, 0x6c,
-	0x06, 0xaf, 0x98, 0x60, 0x39, 0x75, 0x6b, 0x92, 0x0b, 0x23, 0xab, 0x31, 0x57, 0x90, 0x4d, 0x58,
-	0x66, 0xc7, 0xab, 0x46, 0x94, 0x63, 0xe8, 0x09, 0x2c, 0xb7, 0xf9, 0x4c, 0x6a, 0x04, 0x4b, 0x5f,
-	0xed, 0xeb, 0x93, 0x60, 0x27, 0x19, 0x86, 0x97, 0xda, 0x31, 0x8e, 0xfc, 0xdb, 0x04, 0x64, 0xca,
-	0xae, 0xed, 0x1c, 0x1b, 0x96, 0xff, 0x65, 0x9e, 0xd7, 0x6e, 0xc4, 0x6a, 0x65, 0xe0, 0x5e, 0xb1,
-	0x4e, 0xee, 0x42, 0xc1, 0xe8, 0x39, 0xb6, 0xeb, 0x6b, 0x96, 0x4e, 0x86, 0x1d, 0x8d, 0x06, 0xac,
-	0xc8, 0xdb, 0x8f, 0xa0, 0x10, 0xda, 0x29, 0x3a, 0xfa, 0x3b, 0x00, 0xba, 0x6b, 0x3b, 0xea, 0x53,
-	0x4a, 0xe7, 0xce, 0x9e, 0x58, 0xc0, 0x42, 0x00, 0x9c, 0xd5, 0x43, 0x28, 0xf9, 0x1e, 0x2c, 0x47,
-	0xb8, 0x0d, 0xcd, 0xd5, 0x7a, 0x1e, 0x2d, 0x51, 0x9a, 0xe7, 0x10, 0xdd, 0x57, 0xd9, 0x1d, 0x4e,
-	0x00, 0x9b, 0xc4, 0xf9, 0x80, 0x88, 0x19, 0x4d, 0x3e, 0x00, 0xf4, 0x98, 0x9c, 0x1d, 0x84, 0xa7,
-	0x2f, 0xae, 0xba, 0x03, 0x05, 0xc3, 0xd2, 0xcd, 0x7e, 0x9b, 0xa8, 0x5d, 0x62, 0xc7, 0x6e, 0x46,
-	0x32, 0x78, 0x85, 0xb3, 0x8e, 0x88, 0xcd, 0x2f, 0x48, 0xe4, 0x9f, 0xa4, 0x20, 0xcf, 0xa2, 0x5d,
-	0xa6, 0x47, 0xf0, 0x73, 0x1f, 0x1d, 0xd1, 0xf2, 0xe8, 0xab, 0xa6, 0x6d, 0x75, 0x55, 0x97, 0xe8,
-	0x3e, 0x0f, 0xc1, 0xc4, 0x93, 0xb8, 0x90, 0x6e, 0x38, 0x67, 0x0a, 0xb9, 0xf7, 0x06, 0x2c, 0x45,
-	0x75, 0x36, 0x70, 0x4e, 0x72, 0x2b, 0xb5, 0x9d, 0xc5, 0x51, 0xf5, 0x65, 0x6f, 0x8c, 0x9a, 0xb0,
-	0x32, 0xf0, 0x9f, 0xea, 0xb0, 0xb7, 0xe0, 0xfd, 0xf5, 0x9b, 0x2f, 0x73, 0x23, 0xf7, 0x17, 0x5e,
-	0xd6, 0x87, 0x1c, 0xa8, 0xc2, 0x5a, 0xfc, 0x0e, 0x2e, 0x04, 0x0e, 0x8a, 0xf3, 0x5b, 0x53, 0x36,
-	0x18, 0xaa, 0x14, 0x14, 0x60, 0x0e, 0x5e, 0x70, 0x46, 0x89, 0xe8, 0x13, 0x58, 0x8d, 0xdd, 0xc4,
-	0x85, 0xf8, 0xf3, 0x0c, 0xff, 0xf6, 0x24, 0xfc, 0xd1, 0x80, 0x61, 0xf4, 0x62, 0x84, 0x26, 0x7f,
-	0x91, 0x80, 0x55, 0xbe, 0xc4, 0x08, 0x0b, 0x0e, 0x26, 0xdf, 0xef, 0x13, 0x8f, 0xd6, 0xb3, 0x34,
-	0xbb, 0x4e, 0xe1, 0x41, 0xd9, 0x9c, 0x7a, 0x3d, 0x82, 0x03, 0x59, 0x74, 0x1f, 0x32, 0x9d, 0xe0,
-	0xea, 0x2c, 0x08, 0x41, 0x6e, 0xef, 0xe6, 0x4b, 0xae, 0xd8, 0x70, 0xa4, 0x40, 0x33, 0x32, 0xb8,
-	0xd1, 0xd1, 0x83, 0xf5, 0xc1, 0x12, 0x64, 0x4a, 0x46, 0x8a, 0x6b, 0x09, 0xe7, 0x0d, 0x61, 0x24,
-	0x3f, 0x84, 0x75, 0xc6, 0x1d, 0x24, 0x4f, 0xb8, 0xe6, 0x24, 0x48, 0x0d, 0x2e, 0x94, 0xe8, 0x23,
-	0xba, 0x09, 0x39, 0x87, 0xce, 0x6a, 0xf5, 0x7b, 0x67, 0xc4, 0x0d, 0x2f, 0xf6, 0x28, 0xa9, 0xc6,
-	0x28, 0xf2, 0x3f, 0xb2, 0xb0, 0x36, 0xe4, 0x22, 0xcf, 0xb1, 0x2d, 0x8f, 0xa0, 0x0f, 0x41, 0xea,
-	0x68, 0x3a, 0x11, 0xae, 0x54, 0xc3, 0xb4, 0xfc, 0xea, 0x6c, 0xa7, 0x3f, 0xbc, 0xdc, 0x89, 0x8d,
-	0x3d, 0xf4, 0x5d, 0x58, 0x0d, 0x2f, 0x2c, 0x62, 0xb0, 0x81, 0x37, 0xb7, 0x27, 0xc1, 0x0e, 0x77,
-	0x88, 0xb8, 0x10, 0xa2, 0x88, 0xe0, 0x4d, 0x90, 0x4c, 0xbb, 0x6b, 0xc7, 0x80, 0x53, 0x97, 0x04,
-	0x5e, 0xa6, 0x08, 0x22, 0xe8, 0x29, 0xac, 0x98, 0xda, 0x19, 0x31, 0x63, 0xa8, 0x73, 0x97, 0x44,
-	0x95, 0x18, 0x84, 0x08, 0xeb, 0xc1, 0x75, 0x33, 0x6c, 0xb5, 0x54, 0x9b, 0xf5, 0x5a, 0xb1, 0x19,
-	0xd6, 0xd9, 0x0c, 0x77, 0xa7, 0x35, 0x81, 0x63, 0xdb, 0x34, 0xbc, 0x61, 0x4e, 0x62, 0x31, 0x07,
-	0x0d, 0xdd, 0x91, 0xd3, 0x3c, 0xbe, 0xa4, 0x83, 0x28, 0x82, 0x08, 0xfa, 0x11, 0xac, 0x76, 0xfa,
-	0xa6, 0xa9, 0x0e, 0x21, 0xb3, 0x0b, 0x98, 0x29, 0x2b, 0xa5, 0x15, 0x83, 0xc1, 0x88, 0x62, 0xc4,
-	0x69, 0xe8, 0x0c, 0xd6, 0x3d, 0xad, 0x43, 0xc2, 0xc2, 0x23, 0x60, 0x07, 0xc5, 0xe1, 0xce, 0x24,
-	0xec, 0x71, 0xad, 0x1f, 0x5e, 0xf5, 0xc6, 0x35, 0x84, 0x5d, 0xb8, 0x16, 0x64, 0xe5, 0xa0, 0x0f,
-	0x16, 0x27, 0xca, 0x4c, 0x2f, 0x9f, 0x43, 0xbb, 0x3b, 0xbe, 0x6a, 0xc4, 0x09, 0xc2, 0x44, 0x2a,
-	0xac, 0x09, 0xd5, 0x59, 0x98, 0x22, 0x37, 0xbd, 0x90, 0x8e, 0xd9, 0x29, 0x71, 0x41, 0x1f, 0xb3,
-	0x7d, 0x56, 0x60, 0x31, 0x56, 0x48, 0xd9, 0x3d, 0xd5, 0x94, 0xfa, 0x22, 0x56, 0x50, 0x9c, 0x17,
-	0x6b, 0x27, 0x75, 0xfc, 0x50, 0xd1, 0x0f, 0x77, 0xbf, 0xa5, 0xe9, 0x8e, 0x8f, 0x55, 0x7d, 0xbe,
-	0x31, 0xe2, 0x55, 0x67, 0x0c, 0x95, 0x76, 0x76, 0xc4, 0x75, 0x6d, 0x97, 0x35, 0xa6, 0x42, 0x67,
-	0xe7, 0x3a, 0xfa, 0x4e, 0x93, 0x7d, 0x12, 0xc1, 0x81, 0x00, 0x3a, 0xe6, 0x97, 0xdc, 0xe7, 0x7e,
-	0x71, 0x8d, 0xc9, 0xee, 0x4c, 0x0d, 0xc7, 0x48, 0x51, 0xc4, 0xa1, 0xba, 0xfc, 0x57, 0x61, 0x37,
-	0x38, 0x34, 0xcc, 0x41, 0xa5, 0x3b, 0x84, 0xbc, 0x61, 0x39, 0x7d, 0x3f, 0xb8, 0x5f, 0xed, 0xbe,
-	0x6c, 0xa7, 0xae, 0x50, 0x59, 0x76, 0xdb, 0xda, 0xc5, 0x39, 0x63, 0x30, 0x40, 0x0f, 0x21, 0xeb,
-	0x72, 0xcc, 0xb0, 0xa6, 0x7d, 0x6d, 0x12, 0xc8, 0xd8, 0x9a, 0x8b, 0x07, 0xfa, 0xb4, 0x72, 0xfb,
-	0xb6, 0xaf, 0x99, 0x2a, 0x2d, 0xd6, 0x1e, 0xdb, 0x2e, 0xd2, 0xf4, 0x00, 0xea, 0x6b, 0x66, 0x83,
-	0x52, 0xe4, 0x0e, 0x6c, 0xec, 0x6b, 0x7e, 0xb4, 0x9c, 0x03, 0x24, 0x2f, 0xdc, 0xe1, 0x8e, 0x21,
-	0xe3, 0x06, 0x8f, 0x61, 0xd5, 0xbe, 0x33, 0xa3, 0x29, 0x4c, 0x09, 0x47, 0xda, 0xf2, 0x33, 0xb8,
-	0x36, 0x76, 0x1e, 0xee, 0xbc, 0xd8, 0x4b, 0x27, 0xfe, 0xb3, 0x97, 0x96, 0xff, 0x95, 0x80, 0x42,
-	0x3c, 0x44, 0xc1, 0xdb, 0x7c, 0x59, 0x11, 0xfa, 0x1f, 0xd9, 0xc2, 0xe9, 0x71, 0x25, 0x08, 0x2b,
-	0xdd, 0x4a, 0xd2, 0x38, 0x18, 0xc8, 0x6d, 0xb8, 0x1a, 0xf3, 0x34, 0xf5, 0x40, 0x14, 0xd0, 0xa3,
-	0x91, 0x80, 0xbe, 0xf5, 0x32, 0x37, 0x0b, 0x1e, 0x14, 0xe2, 0xf9, 0x74, 0x68, 0xdd, 0xf0, 0x59,
-	0x78, 0x38, 0x3f, 0x18, 0x0d, 0xe7, 0x9d, 0xd9, 0xe6, 0x19, 0x8d, 0xe6, 0x1f, 0x92, 0x50, 0x2c,
-	0x79, 0x17, 0x96, 0xfe, 0xff, 0x10, 0xd2, 0x0a, 0x2c, 0xda, 0x7d, 0x5f, 0x78, 0xa1, 0xb9, 0xe9,
-	0x50, 0x75, 0x26, 0xcc, 0xdf, 0x28, 0x6f, 0x0b, 0x23, 0xb9, 0x03, 0x57, 0xc7, 0xb8, 0x8d, 0x07,
-	0x68, 0x64, 0x9e, 0xc4, 0x2b, 0xcf, 0xf3, 0xc7, 0x04, 0xdc, 0x64, 0x13, 0xfd, 0x37, 0xea, 0xc8,
-	0xa8, 0xe1, 0xc9, 0x57, 0x36, 0xbc, 0x07, 0x5b, 0x93, 0xed, 0xfe, 0xf2, 0xfd, 0x64, 0xc1, 0x8d,
-	0xd1, 0xe9, 0x62, 0xc9, 0x59, 0x1d, 0xf1, 0xd2, 0xc4, 0x03, 0xfd, 0xa4, 0x84, 0x10, 0x32, 0xd4,
-	0x1d, 0x17, 0x96, 0x78, 0x9a, 0xd6, 0x47, 0xd3, 0xf4, 0xee, 0x25, 0x66, 0x1c, 0xcd, 0xd5, 0x1f,
-	0x27, 0x20, 0x27, 0xe4, 0x18, 0x7a, 0x1f, 0xa0, 0xab, 0x7b, 0x2a, 0xff, 0x8a, 0x1c, 0xf8, 0x6e,
-	0xe2, 0xdd, 0xc7, 0x91, 0xee, 0xf1, 0x6f, 0xc8, 0xd9, 0x6e, 0xf8, 0x28, 0x7e, 0x9d, 0x4e, 0xc5,
-	0xbf, 0x4e, 0x5f, 0x83, 0x6c, 0xcf, 0xe8, 0x11, 0x95, 0x7d, 0x50, 0xe2, 0x5f, 0xb7, 0x29, 0xa1,
-	0x75, 0xe1, 0x10, 0xf9, 0x87, 0x90, 0x17, 0x43, 0x81, 0xea, 0xb0, 0x4c, 0x0d, 0x69, 0x13, 0xcf,
-	0x37, 0xac, 0xa0, 0x67, 0x4a, 0x4c, 0xef, 0x2d, 0x8f, 0x74, 0xef, 0x60, 0x20, 0x8d, 0x97, 0xba,
-	0xb1, 0x31, 0xda, 0x04, 0x38, 0xa3, 0x8e, 0x55, 0x3d, 0xe3, 0x33, 0xc2, 0x4f, 0x44, 0x59, 0x46,
-	0x69, 0x1a, 0x9f, 0x11, 0x79, 0x13, 0xb2, 0xd1, 0xeb, 0x8c, 0x1e, 0xa8, 0x64, 0x19, 0x96, 0xe2,
-	0xf8, 0x63, 0x64, 0x7e, 0x97, 0x84, 0x95, 0x7a, 0xf8, 0xbf, 0x91, 0x13, 0xe2, 0x6b, 0x6d, 0xcd,
-	0xd7, 0x90, 0x02, 0x69, 0x8f, 0x46, 0x80, 0x5f, 0x3e, 0x4e, 0xfc, 0x48, 0x3d, 0xa2, 0xc9, 0x1a,
-	0x22, 0x82, 0x03, 0x6d, 0x74, 0x1f, 0x72, 0xba, 0x4b, 0x34, 0x9f, 0xa8, 0xbe, 0xd1, 0x23, 0xfc,
-	0x20, 0xbe, 0x11, 0x82, 0x85, 0xff, 0x39, 0xd9, 0x69, 0x85, 0xff, 0x39, 0xc1, 0x10, 0x88, 0x53,
-	0x02, 0x55, 0xee, 0x3b, 0xed, 0x48, 0x79, 0xfe, 0xe5, 0xca, 0x81, 0x38, 0x25, 0xc8, 0x1f, 0x42,
-	0x9a, 0x59, 0x82, 0xd6, 0x60, 0xa5, 0xd9, 0x2a, 0xb5, 0x86, 0xff, 0xee, 0x91, 0x83, 0x85, 0x32,
-	0x56, 0x4a, 0x2d, 0xe5, 0x40, 0x4a, 0xd0, 0x01, 0x3e, 0xad, 0xd5, 0x2a, 0xb5, 0x23, 0x29, 0x89,
-	0x32, 0x30, 0x77, 0x50, 0xaf, 0x29, 0x52, 0x0a, 0x2d, 0x42, 0xb6, 0x5c, 0xaa, 0x95, 0x95, 0x6a,
-	0x55, 0x39, 0x90, 0xe6, 0x6e, 0x13, 0x00, 0xe1, 0x2b, 0x66, 0x0e, 0x16, 0xf8, 0x27, 0x3d, 0xe9,
-	0x35, 0xb4, 0x02, 0x8b, 0x8f, 0x14, 0xfc, 0x44, 0x3d, 0xad, 0x55, 0x2b, 0x0f, 0x95, 0xea, 0x13,
-	0x29, 0x81, 0xf2, 0x90, 0x89, 0x46, 0x49, 0x3a, 0x6a, 0xd4, 0x9b, 0xcd, 0xca, 0x7e, 0x95, 0x02,
-	0x03, 0xcc, 0x73, 0xce, 0x1c, 0x5a, 0x86, 0x1c, 0x53, 0xe5, 0x84, 0xf4, 0xde, 0xe7, 0x69, 0x58,
-	0x12, 0xbb, 0x43, 0xdb, 0x45, 0xbf, 0x4c, 0x40, 0x61, 0x4c, 0xf9, 0x40, 0x7b, 0x13, 0xaf, 0xc8,
-	0x26, 0xd6, 0xc8, 0x8d, 0xb7, 0x2f, 0xa5, 0x13, 0x64, 0x9c, 0x7c, 0xe3, 0x47, 0x5f, 0xfc, 0xfd,
-	0xa7, 0xc9, 0xa2, 0x5c, 0x88, 0xfe, 0x73, 0xe5, 0xbd, 0xc7, 0xcf, 0x05, 0xe4, 0xbd, 0xc4, 0x6d,
-	0xf4, 0xf3, 0x04, 0xa0, 0xd1, 0x02, 0x80, 0xee, 0xce, 0x34, 0x97, 0x58, 0x9c, 0x36, 0xf6, 0x2e,
-	0xa3, 0xc2, 0xad, 0xdb, 0x64, 0xd6, 0x5d, 0x91, 0x11, 0xb5, 0xae, 0x43, 0x59, 0x31, 0xe3, 0x7e,
-	0x91, 0xe0, 0x3b, 0xfb, 0x38, 0x17, 0x7e, 0x73, 0x6a, 0x21, 0x9a, 0xe2, 0xc7, 0xe8, 0x1a, 0x46,
-	0xf8, 0x03, 0xd6, 0x20, 0x1d, 0xe4, 0x6d, 0x66, 0x93, 0x2c, 0x6f, 0x8a, 0x1e, 0x1b, 0x81, 0xa4,
-	0xe6, 0xfd, 0x2c, 0x01, 0x57, 0x26, 0x54, 0x50, 0x74, 0x6f, 0x76, 0xeb, 0x62, 0x5e, 0x7c, 0x89,
-	0x71, 0x6f, 0x32, 0xe3, 0x6e, 0xc9, 0xd7, 0x05, 0x87, 0x8d, 0xb3, 0x6d, 0xff, 0x07, 0xb0, 0xa1,
-	0xdb, 0xbd, 0x09, 0x46, 0xec, 0x17, 0xe2, 0xcb, 0xb4, 0x41, 0x33, 0xb2, 0x91, 0xf8, 0xf8, 0x01,
-	0x17, 0xef, 0xda, 0xa6, 0x66, 0x75, 0x77, 0x6c, 0xb7, 0xbb, 0xdb, 0x25, 0x16, 0xcb, 0xd7, 0xdd,
-	0x80, 0xa5, 0x39, 0x86, 0x37, 0xfc, 0x27, 0xb7, 0xfb, 0xc1, 0xd3, 0x3f, 0x13, 0x89, 0x5f, 0x27,
-	0xe7, 0x8e, 0xca, 0x8f, 0x6a, 0x67, 0xf3, 0x4c, 0xe5, 0xed, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff,
-	0x88, 0xec, 0xbf, 0xf1, 0xfc, 0x27, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/vision/v1/product_search.pb.go b/googleapis/cloud/vision/v1/product_search.pb.go
index d8fadc4f56..e982fc507e 100644
--- a/googleapis/cloud/vision/v1/product_search.pb.go
+++ b/googleapis/cloud/vision/v1/product_search.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/product_search.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Parameters for a product search request.
 type ProductSearchParams struct {
@@ -53,16 +56,17 @@ func (m *ProductSearchParams) Reset()         { *m = ProductSearchParams{} }
 func (m *ProductSearchParams) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchParams) ProtoMessage()    {}
 func (*ProductSearchParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_541754fa22b35e11, []int{0}
+	return fileDescriptor_4fdf2c80d2106c63, []int{0}
 }
+
 func (m *ProductSearchParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchParams.Unmarshal(m, b)
 }
 func (m *ProductSearchParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchParams.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchParams.Merge(dst, src)
+func (m *ProductSearchParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchParams.Merge(m, src)
 }
 func (m *ProductSearchParams) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchParams.Size(m)
@@ -123,16 +127,17 @@ func (m *ProductSearchResults) Reset()         { *m = ProductSearchResults{} }
 func (m *ProductSearchResults) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults) ProtoMessage()    {}
 func (*ProductSearchResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_541754fa22b35e11, []int{1}
+	return fileDescriptor_4fdf2c80d2106c63, []int{1}
 }
+
 func (m *ProductSearchResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults.Unmarshal(m, b)
 }
 func (m *ProductSearchResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults.Merge(dst, src)
+func (m *ProductSearchResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults.Merge(m, src)
 }
 func (m *ProductSearchResults) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults.Size(m)
@@ -183,16 +188,17 @@ func (m *ProductSearchResults_Result) Reset()         { *m = ProductSearchResult
 func (m *ProductSearchResults_Result) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults_Result) ProtoMessage()    {}
 func (*ProductSearchResults_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_541754fa22b35e11, []int{1, 0}
+	return fileDescriptor_4fdf2c80d2106c63, []int{1, 0}
 }
+
 func (m *ProductSearchResults_Result) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults_Result.Unmarshal(m, b)
 }
 func (m *ProductSearchResults_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults_Result.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults_Result) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults_Result.Merge(dst, src)
+func (m *ProductSearchResults_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_Result.Merge(m, src)
 }
 func (m *ProductSearchResults_Result) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults_Result.Size(m)
@@ -240,16 +246,17 @@ func (m *ProductSearchResults_GroupedResult) Reset()         { *m = ProductSearc
 func (m *ProductSearchResults_GroupedResult) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults_GroupedResult) ProtoMessage()    {}
 func (*ProductSearchResults_GroupedResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_541754fa22b35e11, []int{1, 1}
+	return fileDescriptor_4fdf2c80d2106c63, []int{1, 1}
 }
+
 func (m *ProductSearchResults_GroupedResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults_GroupedResult.Unmarshal(m, b)
 }
 func (m *ProductSearchResults_GroupedResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults_GroupedResult.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults_GroupedResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults_GroupedResult.Merge(dst, src)
+func (m *ProductSearchResults_GroupedResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_GroupedResult.Merge(m, src)
 }
 func (m *ProductSearchResults_GroupedResult) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults_GroupedResult.Size(m)
@@ -282,10 +289,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1/product_search.proto", fileDescriptor_product_search_541754fa22b35e11)
+	proto.RegisterFile("google/cloud/vision/v1/product_search.proto", fileDescriptor_4fdf2c80d2106c63)
 }
 
-var fileDescriptor_product_search_541754fa22b35e11 = []byte{
+var fileDescriptor_4fdf2c80d2106c63 = []byte{
 	// 485 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xcf, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0x95, 0x76, 0x4b, 0xa9, 0xcb, 0x0e, 0x98, 0x31, 0xa2, 0x08, 0xa9, 0xd5, 0x04, 0x52,
diff --git a/googleapis/cloud/vision/v1/product_search_service.pb.go b/googleapis/cloud/vision/v1/product_search_service.pb.go
index 2927b73b84..4f58494fb8 100644
--- a/googleapis/cloud/vision/v1/product_search_service.pb.go
+++ b/googleapis/cloud/vision/v1/product_search_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/product_search_service.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates the possible states that the batch request can be in.
 type BatchOperationMetadata_State int32
@@ -55,6 +55,7 @@ var BatchOperationMetadata_State_name = map[int32]string{
 	3: "FAILED",
 	4: "CANCELLED",
 }
+
 var BatchOperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"PROCESSING":        1,
@@ -66,8 +67,9 @@ var BatchOperationMetadata_State_value = map[string]int32{
 func (x BatchOperationMetadata_State) String() string {
 	return proto.EnumName(BatchOperationMetadata_State_name, int32(x))
 }
+
 func (BatchOperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{28, 0}
+	return fileDescriptor_7cf22baa8e45dc96, []int{28, 0}
 }
 
 // A Product contains ReferenceImages.
@@ -109,16 +111,17 @@ func (m *Product) Reset()         { *m = Product{} }
 func (m *Product) String() string { return proto.CompactTextString(m) }
 func (*Product) ProtoMessage()    {}
 func (*Product) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{0}
+	return fileDescriptor_7cf22baa8e45dc96, []int{0}
 }
+
 func (m *Product) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Product.Unmarshal(m, b)
 }
 func (m *Product) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Product.Marshal(b, m, deterministic)
 }
-func (dst *Product) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Product.Merge(dst, src)
+func (m *Product) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product.Merge(m, src)
 }
 func (m *Product) XXX_Size() int {
 	return xxx_messageInfo_Product.Size(m)
@@ -181,16 +184,17 @@ func (m *Product_KeyValue) Reset()         { *m = Product_KeyValue{} }
 func (m *Product_KeyValue) String() string { return proto.CompactTextString(m) }
 func (*Product_KeyValue) ProtoMessage()    {}
 func (*Product_KeyValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{0, 0}
+	return fileDescriptor_7cf22baa8e45dc96, []int{0, 0}
 }
+
 func (m *Product_KeyValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Product_KeyValue.Unmarshal(m, b)
 }
 func (m *Product_KeyValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Product_KeyValue.Marshal(b, m, deterministic)
 }
-func (dst *Product_KeyValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Product_KeyValue.Merge(dst, src)
+func (m *Product_KeyValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product_KeyValue.Merge(m, src)
 }
 func (m *Product_KeyValue) XXX_Size() int {
 	return xxx_messageInfo_Product_KeyValue.Size(m)
@@ -250,16 +254,17 @@ func (m *ProductSet) Reset()         { *m = ProductSet{} }
 func (m *ProductSet) String() string { return proto.CompactTextString(m) }
 func (*ProductSet) ProtoMessage()    {}
 func (*ProductSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{1}
+	return fileDescriptor_7cf22baa8e45dc96, []int{1}
 }
+
 func (m *ProductSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSet.Unmarshal(m, b)
 }
 func (m *ProductSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSet.Marshal(b, m, deterministic)
 }
-func (dst *ProductSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSet.Merge(dst, src)
+func (m *ProductSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSet.Merge(m, src)
 }
 func (m *ProductSet) XXX_Size() int {
 	return xxx_messageInfo_ProductSet.Size(m)
@@ -333,16 +338,17 @@ func (m *ReferenceImage) Reset()         { *m = ReferenceImage{} }
 func (m *ReferenceImage) String() string { return proto.CompactTextString(m) }
 func (*ReferenceImage) ProtoMessage()    {}
 func (*ReferenceImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{2}
+	return fileDescriptor_7cf22baa8e45dc96, []int{2}
 }
+
 func (m *ReferenceImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReferenceImage.Unmarshal(m, b)
 }
 func (m *ReferenceImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReferenceImage.Marshal(b, m, deterministic)
 }
-func (dst *ReferenceImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReferenceImage.Merge(dst, src)
+func (m *ReferenceImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceImage.Merge(m, src)
 }
 func (m *ReferenceImage) XXX_Size() int {
 	return xxx_messageInfo_ReferenceImage.Size(m)
@@ -397,16 +403,17 @@ func (m *CreateProductRequest) Reset()         { *m = CreateProductRequest{} }
 func (m *CreateProductRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProductRequest) ProtoMessage()    {}
 func (*CreateProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{3}
+	return fileDescriptor_7cf22baa8e45dc96, []int{3}
 }
+
 func (m *CreateProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProductRequest.Unmarshal(m, b)
 }
 func (m *CreateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProductRequest.Merge(dst, src)
+func (m *CreateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductRequest.Merge(m, src)
 }
 func (m *CreateProductRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProductRequest.Size(m)
@@ -458,16 +465,17 @@ func (m *ListProductsRequest) Reset()         { *m = ListProductsRequest{} }
 func (m *ListProductsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductsRequest) ProtoMessage()    {}
 func (*ListProductsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{4}
+	return fileDescriptor_7cf22baa8e45dc96, []int{4}
 }
+
 func (m *ListProductsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsRequest.Unmarshal(m, b)
 }
 func (m *ListProductsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsRequest.Merge(dst, src)
+func (m *ListProductsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsRequest.Merge(m, src)
 }
 func (m *ListProductsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductsRequest.Size(m)
@@ -515,16 +523,17 @@ func (m *ListProductsResponse) Reset()         { *m = ListProductsResponse{} }
 func (m *ListProductsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductsResponse) ProtoMessage()    {}
 func (*ListProductsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{5}
+	return fileDescriptor_7cf22baa8e45dc96, []int{5}
 }
+
 func (m *ListProductsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsResponse.Unmarshal(m, b)
 }
 func (m *ListProductsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsResponse.Merge(dst, src)
+func (m *ListProductsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsResponse.Merge(m, src)
 }
 func (m *ListProductsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductsResponse.Size(m)
@@ -565,16 +574,17 @@ func (m *GetProductRequest) Reset()         { *m = GetProductRequest{} }
 func (m *GetProductRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductRequest) ProtoMessage()    {}
 func (*GetProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{6}
+	return fileDescriptor_7cf22baa8e45dc96, []int{6}
 }
+
 func (m *GetProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductRequest.Unmarshal(m, b)
 }
 func (m *GetProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductRequest.Merge(dst, src)
+func (m *GetProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductRequest.Merge(m, src)
 }
 func (m *GetProductRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductRequest.Size(m)
@@ -612,16 +622,17 @@ func (m *UpdateProductRequest) Reset()         { *m = UpdateProductRequest{} }
 func (m *UpdateProductRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProductRequest) ProtoMessage()    {}
 func (*UpdateProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{7}
+	return fileDescriptor_7cf22baa8e45dc96, []int{7}
 }
+
 func (m *UpdateProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProductRequest.Unmarshal(m, b)
 }
 func (m *UpdateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProductRequest.Merge(dst, src)
+func (m *UpdateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductRequest.Merge(m, src)
 }
 func (m *UpdateProductRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProductRequest.Size(m)
@@ -662,16 +673,17 @@ func (m *DeleteProductRequest) Reset()         { *m = DeleteProductRequest{} }
 func (m *DeleteProductRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteProductRequest) ProtoMessage()    {}
 func (*DeleteProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{8}
+	return fileDescriptor_7cf22baa8e45dc96, []int{8}
 }
+
 func (m *DeleteProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteProductRequest.Unmarshal(m, b)
 }
 func (m *DeleteProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteProductRequest.Merge(dst, src)
+func (m *DeleteProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductRequest.Merge(m, src)
 }
 func (m *DeleteProductRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteProductRequest.Size(m)
@@ -711,16 +723,17 @@ func (m *CreateProductSetRequest) Reset()         { *m = CreateProductSetRequest
 func (m *CreateProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProductSetRequest) ProtoMessage()    {}
 func (*CreateProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{9}
+	return fileDescriptor_7cf22baa8e45dc96, []int{9}
 }
+
 func (m *CreateProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProductSetRequest.Unmarshal(m, b)
 }
 func (m *CreateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProductSetRequest.Merge(dst, src)
+func (m *CreateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductSetRequest.Merge(m, src)
 }
 func (m *CreateProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProductSetRequest.Size(m)
@@ -771,16 +784,17 @@ func (m *ListProductSetsRequest) Reset()         { *m = ListProductSetsRequest{}
 func (m *ListProductSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductSetsRequest) ProtoMessage()    {}
 func (*ListProductSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{10}
+	return fileDescriptor_7cf22baa8e45dc96, []int{10}
 }
+
 func (m *ListProductSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductSetsRequest.Unmarshal(m, b)
 }
 func (m *ListProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductSetsRequest.Merge(dst, src)
+func (m *ListProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsRequest.Merge(m, src)
 }
 func (m *ListProductSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductSetsRequest.Size(m)
@@ -828,16 +842,17 @@ func (m *ListProductSetsResponse) Reset()         { *m = ListProductSetsResponse
 func (m *ListProductSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductSetsResponse) ProtoMessage()    {}
 func (*ListProductSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{11}
+	return fileDescriptor_7cf22baa8e45dc96, []int{11}
 }
+
 func (m *ListProductSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductSetsResponse.Unmarshal(m, b)
 }
 func (m *ListProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductSetsResponse.Merge(dst, src)
+func (m *ListProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsResponse.Merge(m, src)
 }
 func (m *ListProductSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductSetsResponse.Size(m)
@@ -878,16 +893,17 @@ func (m *GetProductSetRequest) Reset()         { *m = GetProductSetRequest{} }
 func (m *GetProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductSetRequest) ProtoMessage()    {}
 func (*GetProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{12}
+	return fileDescriptor_7cf22baa8e45dc96, []int{12}
 }
+
 func (m *GetProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductSetRequest.Unmarshal(m, b)
 }
 func (m *GetProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductSetRequest.Merge(dst, src)
+func (m *GetProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductSetRequest.Merge(m, src)
 }
 func (m *GetProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductSetRequest.Size(m)
@@ -923,16 +939,17 @@ func (m *UpdateProductSetRequest) Reset()         { *m = UpdateProductSetRequest
 func (m *UpdateProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProductSetRequest) ProtoMessage()    {}
 func (*UpdateProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{13}
+	return fileDescriptor_7cf22baa8e45dc96, []int{13}
 }
+
 func (m *UpdateProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProductSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProductSetRequest.Merge(dst, src)
+func (m *UpdateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductSetRequest.Merge(m, src)
 }
 func (m *UpdateProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProductSetRequest.Size(m)
@@ -973,16 +990,17 @@ func (m *DeleteProductSetRequest) Reset()         { *m = DeleteProductSetRequest
 func (m *DeleteProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteProductSetRequest) ProtoMessage()    {}
 func (*DeleteProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{14}
+	return fileDescriptor_7cf22baa8e45dc96, []int{14}
 }
+
 func (m *DeleteProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteProductSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteProductSetRequest.Merge(dst, src)
+func (m *DeleteProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductSetRequest.Merge(m, src)
 }
 func (m *DeleteProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteProductSetRequest.Size(m)
@@ -1024,16 +1042,17 @@ func (m *CreateReferenceImageRequest) Reset()         { *m = CreateReferenceImag
 func (m *CreateReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateReferenceImageRequest) ProtoMessage()    {}
 func (*CreateReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{15}
+	return fileDescriptor_7cf22baa8e45dc96, []int{15}
 }
+
 func (m *CreateReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *CreateReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateReferenceImageRequest.Merge(dst, src)
+func (m *CreateReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateReferenceImageRequest.Merge(m, src)
 }
 func (m *CreateReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateReferenceImageRequest.Size(m)
@@ -1088,16 +1107,17 @@ func (m *ListReferenceImagesRequest) Reset()         { *m = ListReferenceImagesR
 func (m *ListReferenceImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListReferenceImagesRequest) ProtoMessage()    {}
 func (*ListReferenceImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{16}
+	return fileDescriptor_7cf22baa8e45dc96, []int{16}
 }
+
 func (m *ListReferenceImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReferenceImagesRequest.Unmarshal(m, b)
 }
 func (m *ListReferenceImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReferenceImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListReferenceImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReferenceImagesRequest.Merge(dst, src)
+func (m *ListReferenceImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesRequest.Merge(m, src)
 }
 func (m *ListReferenceImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListReferenceImagesRequest.Size(m)
@@ -1146,16 +1166,17 @@ func (m *ListReferenceImagesResponse) Reset()         { *m = ListReferenceImages
 func (m *ListReferenceImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListReferenceImagesResponse) ProtoMessage()    {}
 func (*ListReferenceImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{17}
+	return fileDescriptor_7cf22baa8e45dc96, []int{17}
 }
+
 func (m *ListReferenceImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReferenceImagesResponse.Unmarshal(m, b)
 }
 func (m *ListReferenceImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReferenceImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListReferenceImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReferenceImagesResponse.Merge(dst, src)
+func (m *ListReferenceImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesResponse.Merge(m, src)
 }
 func (m *ListReferenceImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListReferenceImagesResponse.Size(m)
@@ -1204,16 +1225,17 @@ func (m *GetReferenceImageRequest) Reset()         { *m = GetReferenceImageReque
 func (m *GetReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*GetReferenceImageRequest) ProtoMessage()    {}
 func (*GetReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{18}
+	return fileDescriptor_7cf22baa8e45dc96, []int{18}
 }
+
 func (m *GetReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *GetReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetReferenceImageRequest.Merge(dst, src)
+func (m *GetReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceImageRequest.Merge(m, src)
 }
 func (m *GetReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_GetReferenceImageRequest.Size(m)
@@ -1248,16 +1270,17 @@ func (m *DeleteReferenceImageRequest) Reset()         { *m = DeleteReferenceImag
 func (m *DeleteReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteReferenceImageRequest) ProtoMessage()    {}
 func (*DeleteReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{19}
+	return fileDescriptor_7cf22baa8e45dc96, []int{19}
 }
+
 func (m *DeleteReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *DeleteReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteReferenceImageRequest.Merge(dst, src)
+func (m *DeleteReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteReferenceImageRequest.Merge(m, src)
 }
 func (m *DeleteReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Size(m)
@@ -1296,16 +1319,17 @@ func (m *AddProductToProductSetRequest) Reset()         { *m = AddProductToProdu
 func (m *AddProductToProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*AddProductToProductSetRequest) ProtoMessage()    {}
 func (*AddProductToProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{20}
+	return fileDescriptor_7cf22baa8e45dc96, []int{20}
 }
+
 func (m *AddProductToProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddProductToProductSetRequest.Unmarshal(m, b)
 }
 func (m *AddProductToProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddProductToProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *AddProductToProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddProductToProductSetRequest.Merge(dst, src)
+func (m *AddProductToProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddProductToProductSetRequest.Merge(m, src)
 }
 func (m *AddProductToProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_AddProductToProductSetRequest.Size(m)
@@ -1351,16 +1375,17 @@ func (m *RemoveProductFromProductSetRequest) Reset()         { *m = RemoveProduc
 func (m *RemoveProductFromProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*RemoveProductFromProductSetRequest) ProtoMessage()    {}
 func (*RemoveProductFromProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{21}
+	return fileDescriptor_7cf22baa8e45dc96, []int{21}
 }
+
 func (m *RemoveProductFromProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Unmarshal(m, b)
 }
 func (m *RemoveProductFromProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *RemoveProductFromProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveProductFromProductSetRequest.Merge(dst, src)
+func (m *RemoveProductFromProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveProductFromProductSetRequest.Merge(m, src)
 }
 func (m *RemoveProductFromProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Size(m)
@@ -1405,16 +1430,17 @@ func (m *ListProductsInProductSetRequest) Reset()         { *m = ListProductsInP
 func (m *ListProductsInProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductsInProductSetRequest) ProtoMessage()    {}
 func (*ListProductsInProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{22}
+	return fileDescriptor_7cf22baa8e45dc96, []int{22}
 }
+
 func (m *ListProductsInProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Unmarshal(m, b)
 }
 func (m *ListProductsInProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsInProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsInProductSetRequest.Merge(dst, src)
+func (m *ListProductsInProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetRequest.Merge(m, src)
 }
 func (m *ListProductsInProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Size(m)
@@ -1462,16 +1488,17 @@ func (m *ListProductsInProductSetResponse) Reset()         { *m = ListProductsIn
 func (m *ListProductsInProductSetResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductsInProductSetResponse) ProtoMessage()    {}
 func (*ListProductsInProductSetResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{23}
+	return fileDescriptor_7cf22baa8e45dc96, []int{23}
 }
+
 func (m *ListProductsInProductSetResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Unmarshal(m, b)
 }
 func (m *ListProductsInProductSetResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsInProductSetResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsInProductSetResponse.Merge(dst, src)
+func (m *ListProductsInProductSetResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetResponse.Merge(m, src)
 }
 func (m *ListProductsInProductSetResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Size(m)
@@ -1572,16 +1599,17 @@ func (m *ImportProductSetsGcsSource) Reset()         { *m = ImportProductSetsGcs
 func (m *ImportProductSetsGcsSource) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsGcsSource) ProtoMessage()    {}
 func (*ImportProductSetsGcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{24}
+	return fileDescriptor_7cf22baa8e45dc96, []int{24}
 }
+
 func (m *ImportProductSetsGcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Unmarshal(m, b)
 }
 func (m *ImportProductSetsGcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsGcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsGcsSource.Merge(dst, src)
+func (m *ImportProductSetsGcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsGcsSource.Merge(m, src)
 }
 func (m *ImportProductSetsGcsSource) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Size(m)
@@ -1615,16 +1643,17 @@ func (m *ImportProductSetsInputConfig) Reset()         { *m = ImportProductSetsI
 func (m *ImportProductSetsInputConfig) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsInputConfig) ProtoMessage()    {}
 func (*ImportProductSetsInputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{25}
+	return fileDescriptor_7cf22baa8e45dc96, []int{25}
 }
+
 func (m *ImportProductSetsInputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Unmarshal(m, b)
 }
 func (m *ImportProductSetsInputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsInputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsInputConfig.Merge(dst, src)
+func (m *ImportProductSetsInputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsInputConfig.Merge(m, src)
 }
 func (m *ImportProductSetsInputConfig) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Size(m)
@@ -1659,61 +1688,13 @@ func (m *ImportProductSetsInputConfig) GetGcsSource() *ImportProductSetsGcsSourc
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImportProductSetsInputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImportProductSetsInputConfig_OneofMarshaler, _ImportProductSetsInputConfig_OneofUnmarshaler, _ImportProductSetsInputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImportProductSetsInputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImportProductSetsInputConfig_GcsSource)(nil),
 	}
 }
 
-func _ImportProductSetsInputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImportProductSetsInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *ImportProductSetsInputConfig_GcsSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ImportProductSetsInputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImportProductSetsInputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImportProductSetsInputConfig)
-	switch tag {
-	case 1: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImportProductSetsGcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &ImportProductSetsInputConfig_GcsSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImportProductSetsInputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImportProductSetsInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *ImportProductSetsInputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for the `ImportProductSets` method.
 type ImportProductSetsRequest struct {
 	// The project in which the ProductSets should be imported.
@@ -1731,16 +1712,17 @@ func (m *ImportProductSetsRequest) Reset()         { *m = ImportProductSetsReque
 func (m *ImportProductSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsRequest) ProtoMessage()    {}
 func (*ImportProductSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{26}
+	return fileDescriptor_7cf22baa8e45dc96, []int{26}
 }
+
 func (m *ImportProductSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsRequest.Unmarshal(m, b)
 }
 func (m *ImportProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsRequest.Merge(dst, src)
+func (m *ImportProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsRequest.Merge(m, src)
 }
 func (m *ImportProductSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsRequest.Size(m)
@@ -1791,16 +1773,17 @@ func (m *ImportProductSetsResponse) Reset()         { *m = ImportProductSetsResp
 func (m *ImportProductSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsResponse) ProtoMessage()    {}
 func (*ImportProductSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{27}
+	return fileDescriptor_7cf22baa8e45dc96, []int{27}
 }
+
 func (m *ImportProductSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsResponse.Unmarshal(m, b)
 }
 func (m *ImportProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsResponse.Merge(dst, src)
+func (m *ImportProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsResponse.Merge(m, src)
 }
 func (m *ImportProductSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsResponse.Size(m)
@@ -1847,16 +1830,17 @@ func (m *BatchOperationMetadata) Reset()         { *m = BatchOperationMetadata{}
 func (m *BatchOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*BatchOperationMetadata) ProtoMessage()    {}
 func (*BatchOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_914a807106064587, []int{28}
+	return fileDescriptor_7cf22baa8e45dc96, []int{28}
 }
+
 func (m *BatchOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchOperationMetadata.Unmarshal(m, b)
 }
 func (m *BatchOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *BatchOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchOperationMetadata.Merge(dst, src)
+func (m *BatchOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchOperationMetadata.Merge(m, src)
 }
 func (m *BatchOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_BatchOperationMetadata.Size(m)
@@ -1889,6 +1873,7 @@ func (m *BatchOperationMetadata) GetEndTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1.BatchOperationMetadata_State", BatchOperationMetadata_State_name, BatchOperationMetadata_State_value)
 	proto.RegisterType((*Product)(nil), "google.cloud.vision.v1.Product")
 	proto.RegisterType((*Product_KeyValue)(nil), "google.cloud.vision.v1.Product.KeyValue")
 	proto.RegisterType((*ProductSet)(nil), "google.cloud.vision.v1.ProductSet")
@@ -1919,7 +1904,130 @@ func init() {
 	proto.RegisterType((*ImportProductSetsRequest)(nil), "google.cloud.vision.v1.ImportProductSetsRequest")
 	proto.RegisterType((*ImportProductSetsResponse)(nil), "google.cloud.vision.v1.ImportProductSetsResponse")
 	proto.RegisterType((*BatchOperationMetadata)(nil), "google.cloud.vision.v1.BatchOperationMetadata")
-	proto.RegisterEnum("google.cloud.vision.v1.BatchOperationMetadata_State", BatchOperationMetadata_State_name, BatchOperationMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1/product_search_service.proto", fileDescriptor_7cf22baa8e45dc96)
+}
+
+var fileDescriptor_7cf22baa8e45dc96 = []byte{
+	// 1853 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4f, 0x73, 0xdb, 0xc6,
+	0x15, 0xcf, 0x4a, 0x96, 0x2d, 0x3d, 0x8a, 0x12, 0xbd, 0x55, 0x25, 0x86, 0x8a, 0xc7, 0x2a, 0x9a,
+	0xa6, 0x0e, 0xeb, 0x02, 0x35, 0xe5, 0xd4, 0x09, 0x55, 0xbb, 0x91, 0x68, 0x4a, 0x61, 0x22, 0xcb,
+	0x0a, 0x28, 0x25, 0xd3, 0x5e, 0x38, 0x10, 0xb0, 0x42, 0x50, 0x81, 0x00, 0x82, 0x05, 0x35, 0x51,
+	0x32, 0x3e, 0xb4, 0x3d, 0x34, 0x33, 0x99, 0xc9, 0xa1, 0xed, 0xa9, 0x7f, 0x67, 0x3a, 0xd3, 0xe9,
+	0xa1, 0xd3, 0x5e, 0xd2, 0x1c, 0x3a, 0xbd, 0xf7, 0xd4, 0x19, 0x1f, 0xfa, 0x15, 0xfa, 0x21, 0x7a,
+	0xec, 0xec, 0x62, 0x41, 0x02, 0x10, 0x20, 0x82, 0xd6, 0xb8, 0x37, 0x2c, 0xf0, 0xfe, 0xfc, 0xde,
+	0x7b, 0xbf, 0xdd, 0x7d, 0x8f, 0x84, 0x75, 0xd3, 0x75, 0x4d, 0x9b, 0x28, 0xba, 0xed, 0x0e, 0x0c,
+	0xe5, 0xd4, 0xa2, 0x96, 0xeb, 0x28, 0xa7, 0x77, 0x14, 0xcf, 0x77, 0x8d, 0x81, 0x1e, 0xf4, 0x28,
+	0xd1, 0x7c, 0xfd, 0x83, 0x1e, 0x25, 0xfe, 0xa9, 0xa5, 0x13, 0xd9, 0xf3, 0xdd, 0xc0, 0xc5, 0xcb,
+	0xa1, 0x92, 0xcc, 0x95, 0xe4, 0x50, 0x49, 0x3e, 0xbd, 0x53, 0x7b, 0x49, 0x18, 0xd3, 0x3c, 0x4b,
+	0xd1, 0x1c, 0xc7, 0x0d, 0xb4, 0xc0, 0x72, 0x1d, 0x1a, 0x6a, 0xd5, 0xbe, 0x91, 0xe3, 0xca, 0x24,
+	0x6e, 0x9f, 0x04, 0xfe, 0x99, 0x10, 0xfb, 0xba, 0x10, 0xb3, 0x5d, 0xc7, 0xf4, 0x07, 0x8e, 0x63,
+	0x39, 0xa6, 0xe2, 0x7a, 0xc4, 0x4f, 0xd8, 0x5a, 0x15, 0x42, 0x7c, 0x75, 0x34, 0x38, 0x56, 0x48,
+	0xdf, 0x0b, 0x22, 0x0b, 0x6b, 0xe9, 0x8f, 0xc7, 0x16, 0xb1, 0x8d, 0x5e, 0x5f, 0xa3, 0x27, 0x42,
+	0xe2, 0x66, 0x5a, 0x22, 0xb0, 0xfa, 0x84, 0x06, 0x5a, 0xdf, 0x13, 0x02, 0x2b, 0x42, 0xc0, 0xf7,
+	0x74, 0x85, 0x06, 0x5a, 0x30, 0x10, 0x8e, 0xa5, 0x9f, 0x4f, 0xc1, 0xb5, 0xfd, 0x30, 0x37, 0x18,
+	0xc3, 0x15, 0x47, 0xeb, 0x93, 0x2a, 0x5a, 0x43, 0xb7, 0xe6, 0x54, 0xfe, 0x8c, 0xbf, 0x06, 0xf3,
+	0x86, 0x45, 0x3d, 0x5b, 0x3b, 0xeb, 0xf1, 0x6f, 0x53, 0xfc, 0x5b, 0x49, 0xbc, 0xdb, 0x63, 0x22,
+	0x6b, 0x50, 0x32, 0x08, 0xd5, 0x7d, 0xcb, 0x63, 0x11, 0x55, 0xa7, 0x85, 0xc4, 0xe8, 0x15, 0x7e,
+	0x15, 0x2a, 0x51, 0xfe, 0x75, 0x2d, 0x20, 0xa6, 0xeb, 0x9f, 0x55, 0xaf, 0x70, 0xb1, 0x45, 0xf1,
+	0xbe, 0x25, 0x5e, 0xe3, 0xc7, 0xb0, 0x10, 0x89, 0xda, 0xda, 0x11, 0xb1, 0x69, 0x75, 0x66, 0x6d,
+	0xfa, 0x56, 0xa9, 0x71, 0x4b, 0xce, 0xae, 0x91, 0x2c, 0xc0, 0xcb, 0xef, 0x90, 0xb3, 0xf7, 0x34,
+	0x7b, 0x40, 0xd4, 0xb2, 0xd0, 0xdf, 0xe5, 0xea, 0xb5, 0x06, 0xcc, 0x46, 0x9f, 0x70, 0x05, 0xa6,
+	0x4f, 0xc8, 0x99, 0x88, 0x8f, 0x3d, 0xe2, 0x25, 0x98, 0x39, 0x65, 0x9f, 0x44, 0x5c, 0xe1, 0x42,
+	0xfa, 0x02, 0x01, 0x08, 0xbb, 0x5d, 0xf2, 0xcc, 0x79, 0x79, 0x03, 0xc0, 0x72, 0x0c, 0xf2, 0x51,
+	0x8f, 0x15, 0x83, 0xa7, 0xa5, 0xd4, 0xa8, 0x45, 0x61, 0x44, 0x95, 0x92, 0x0f, 0xa2, 0x4a, 0xa9,
+	0x73, 0x5c, 0x9a, 0xad, 0xf1, 0x3a, 0x94, 0x42, 0x55, 0xe2, 0xfb, 0xae, 0xcf, 0x73, 0x55, 0x6a,
+	0xe0, 0x48, 0xd7, 0xf7, 0x74, 0xb9, 0xcb, 0x8b, 0xa8, 0x86, 0x1e, 0xda, 0x4c, 0x4a, 0xfa, 0x29,
+	0x82, 0x05, 0x95, 0x1c, 0x13, 0x9f, 0x38, 0x3a, 0xe9, 0xf4, 0x35, 0x93, 0x64, 0x22, 0xaf, 0xc0,
+	0xf4, 0xc0, 0xb7, 0x04, 0x60, 0xf6, 0x88, 0xdf, 0x81, 0x85, 0x23, 0x77, 0xe0, 0x18, 0x96, 0x63,
+	0xf6, 0x3c, 0xd7, 0x3e, 0xa3, 0xd5, 0x69, 0x9e, 0xf3, 0x97, 0xf3, 0x72, 0xbe, 0x25, 0xa4, 0xf7,
+	0x5d, 0xfb, 0x4c, 0x2d, 0x1f, 0xc5, 0x56, 0x54, 0xfa, 0x14, 0xc1, 0x52, 0xcb, 0x27, 0x5a, 0x40,
+	0x44, 0x06, 0x55, 0xf2, 0xe1, 0x80, 0xd0, 0x00, 0x2f, 0xc3, 0x55, 0x4f, 0xf3, 0x89, 0x13, 0x08,
+	0x34, 0x62, 0x85, 0xdf, 0x80, 0x6b, 0xa2, 0x62, 0x1c, 0x53, 0xa9, 0x71, 0x73, 0x4c, 0xa9, 0xd5,
+	0x48, 0x1e, 0xdf, 0x00, 0x88, 0xc8, 0x62, 0x19, 0x82, 0x78, 0x73, 0xe2, 0x4d, 0xc7, 0x90, 0x2c,
+	0xf8, 0xca, 0xae, 0x45, 0x03, 0xa1, 0x46, 0xc7, 0x01, 0x59, 0x85, 0x39, 0x4f, 0x33, 0x49, 0x8f,
+	0x5a, 0x1f, 0x87, 0xf5, 0x9c, 0x51, 0x67, 0xd9, 0x8b, 0xae, 0xf5, 0x31, 0xe1, 0xae, 0xd8, 0xc7,
+	0xc0, 0x3d, 0x21, 0xce, 0xd0, 0x95, 0x66, 0x92, 0x03, 0xf6, 0x42, 0xfa, 0x04, 0x96, 0x92, 0xae,
+	0xa8, 0xe7, 0x3a, 0x94, 0xe0, 0x0d, 0x98, 0x15, 0x78, 0x68, 0x15, 0xf1, 0xa4, 0x8e, 0x8d, 0x6e,
+	0xa8, 0x80, 0x5f, 0x81, 0x45, 0x87, 0x7c, 0x14, 0xf4, 0x62, 0x8e, 0xc3, 0xaa, 0x95, 0xd9, 0xeb,
+	0xfd, 0xa1, 0xf3, 0x6f, 0xc2, 0xf5, 0x1d, 0x12, 0xa4, 0xd2, 0x9d, 0x51, 0x7a, 0xe9, 0x73, 0x04,
+	0x4b, 0x87, 0x9e, 0x71, 0xbe, 0x36, 0xb1, 0x1a, 0xa0, 0x09, 0x6b, 0xb0, 0x01, 0xa5, 0x01, 0x37,
+	0xc9, 0xcf, 0x23, 0x51, 0xc2, 0xf3, 0x34, 0xdf, 0x66, 0x47, 0xd6, 0x23, 0x8d, 0x9e, 0xa8, 0x10,
+	0x8a, 0xb3, 0x67, 0xa9, 0x0e, 0x4b, 0x0f, 0x89, 0x4d, 0xce, 0xe1, 0xc9, 0x02, 0xff, 0x1b, 0x04,
+	0x2b, 0x09, 0x62, 0x75, 0xc9, 0x58, 0x6e, 0xb5, 0xa0, 0x34, 0x3a, 0xf8, 0x23, 0x7e, 0x49, 0x63,
+	0x62, 0x63, 0x76, 0x23, 0x5e, 0xb1, 0xed, 0xff, 0xf2, 0xe8, 0x48, 0xa2, 0x24, 0xc6, 0xb4, 0xf9,
+	0x91, 0x4c, 0xc7, 0x90, 0x6c, 0x58, 0x8e, 0x31, 0xa0, 0x4b, 0x9e, 0x2f, 0xdf, 0x3e, 0x45, 0xb0,
+	0x72, 0xce, 0x9d, 0xe0, 0x5c, 0x1b, 0xe6, 0x63, 0x78, 0x23, 0xde, 0x15, 0x89, 0xba, 0x34, 0x8a,
+	0xa8, 0x38, 0xfb, 0xea, 0xb0, 0x34, 0x62, 0x5f, 0xac, 0x26, 0x59, 0x35, 0xfc, 0x35, 0x82, 0x95,
+	0x04, 0x01, 0x63, 0xf2, 0xa9, 0x5a, 0xa1, 0x67, 0xaa, 0xd5, 0xa5, 0xd8, 0xf8, 0x6d, 0x58, 0x49,
+	0xb0, 0x71, 0x4c, 0x30, 0x7f, 0x43, 0xb0, 0x1a, 0x12, 0x32, 0x79, 0xea, 0x8e, 0xab, 0xfb, 0x63,
+	0x58, 0xf4, 0x23, 0x85, 0x9e, 0xc5, 0x34, 0x04, 0xce, 0x57, 0xf2, 0x82, 0x4d, 0xd9, 0x5f, 0xf0,
+	0x93, 0xa7, 0xfc, 0x6d, 0xc0, 0x29, 0x83, 0x23, 0x92, 0x56, 0x92, 0xb2, 0x1d, 0x43, 0xf2, 0xa0,
+	0xc6, 0x98, 0x93, 0xb4, 0xf9, 0x5c, 0xc9, 0xfa, 0x25, 0x82, 0xd5, 0x4c, 0x97, 0x82, 0xb0, 0xef,
+	0x42, 0x25, 0x85, 0x3f, 0x22, 0x6d, 0xd1, 0x8c, 0x2c, 0x26, 0xa3, 0xa4, 0x17, 0xc3, 0xcd, 0x60,
+	0xf6, 0x74, 0x16, 0xb3, 0x65, 0xa8, 0xee, 0x90, 0x20, 0xbb, 0xb8, 0x59, 0x84, 0xb8, 0x03, 0xab,
+	0x21, 0x7f, 0x8a, 0xab, 0x3c, 0x82, 0x1b, 0x9b, 0x86, 0x21, 0xf8, 0x76, 0xe0, 0x16, 0x22, 0x1e,
+	0xae, 0x26, 0x6f, 0xcc, 0xb9, 0xe1, 0x61, 0x2c, 0xa9, 0x20, 0xa9, 0xa4, 0xef, 0x9e, 0x46, 0x0c,
+	0xde, 0xf6, 0xdd, 0xfe, 0x65, 0x6d, 0x7e, 0x08, 0x37, 0xe3, 0x57, 0x5b, 0xc7, 0x29, 0x66, 0xf0,
+	0x32, 0x84, 0xf9, 0x19, 0x82, 0xb5, 0x7c, 0x9f, 0xff, 0xcf, 0xab, 0xf5, 0x01, 0xd4, 0x3a, 0x7d,
+	0xcf, 0xf5, 0xe3, 0x07, 0xed, 0x8e, 0x4e, 0xbb, 0xee, 0xc0, 0xd7, 0x59, 0xe7, 0x3b, 0xaf, 0xd3,
+	0xd3, 0xde, 0xb1, 0x65, 0x93, 0x1e, 0xeb, 0xa9, 0xc2, 0xf8, 0x41, 0xa7, 0xa7, 0xdb, 0x96, 0x4d,
+	0x0e, 0x7d, 0x4b, 0x7a, 0x02, 0x2f, 0x9d, 0xd3, 0xef, 0x38, 0xde, 0x20, 0x68, 0xb9, 0xce, 0xb1,
+	0x65, 0xe2, 0x2e, 0x80, 0xa9, 0xd3, 0x1e, 0xe5, 0xf6, 0xc4, 0x99, 0xd7, 0xc8, 0x0b, 0x23, 0x1f,
+	0xc9, 0x5b, 0x2f, 0xa8, 0x73, 0x66, 0xb4, 0xd8, 0x9a, 0x85, 0xab, 0xa1, 0x41, 0xe9, 0x33, 0x04,
+	0xd5, 0x73, 0x5a, 0xe3, 0xb6, 0xfa, 0xfb, 0x30, 0x6f, 0x31, 0x88, 0x3d, 0x9d, 0x63, 0x14, 0x87,
+	0xd3, 0xdd, 0xc2, 0xa8, 0x62, 0xf1, 0xa9, 0x25, 0x6b, 0xb4, 0x90, 0x7e, 0x87, 0xe0, 0xc5, 0x0c,
+	0x34, 0xcf, 0xef, 0x14, 0x90, 0x61, 0x36, 0x1c, 0x76, 0x08, 0xad, 0x4e, 0x71, 0x53, 0x59, 0x3d,
+	0xf4, 0x50, 0x46, 0xfa, 0x62, 0x0a, 0x96, 0xb7, 0xb4, 0x40, 0xff, 0xe0, 0x71, 0x34, 0x9f, 0x3d,
+	0x22, 0x81, 0x66, 0x68, 0x81, 0x86, 0xdf, 0x86, 0x19, 0x26, 0x16, 0xd6, 0x68, 0x21, 0x3f, 0x1b,
+	0xd9, 0xea, 0xdc, 0x15, 0x51, 0x43, 0x13, 0xec, 0x92, 0xa2, 0x83, 0xa3, 0xbe, 0x15, 0x84, 0x93,
+	0xc1, 0xd4, 0xd8, 0xc9, 0x00, 0x42, 0x71, 0x3e, 0x1a, 0xbc, 0x06, 0xb3, 0xc4, 0x31, 0x8a, 0xce,
+	0x14, 0xd7, 0x88, 0x63, 0xb0, 0x95, 0xf4, 0x03, 0x98, 0xe1, 0x18, 0xf0, 0x57, 0xe1, 0x7a, 0xf7,
+	0x60, 0xf3, 0xa0, 0xdd, 0x3b, 0xdc, 0xeb, 0xee, 0xb7, 0x5b, 0x9d, 0xed, 0x4e, 0xfb, 0x61, 0xe5,
+	0x05, 0xbc, 0x00, 0xb0, 0xaf, 0x3e, 0x6e, 0xb5, 0xbb, 0xdd, 0xce, 0xde, 0x4e, 0x05, 0xb1, 0x75,
+	0xf7, 0xb0, 0xc5, 0xd6, 0xdb, 0x87, 0xbb, 0x95, 0x29, 0x0c, 0x70, 0x75, 0x7b, 0xb3, 0xb3, 0xdb,
+	0x7e, 0x58, 0x99, 0xc6, 0x65, 0x98, 0x6b, 0x6d, 0xee, 0xb5, 0xda, 0xbb, 0x6c, 0x79, 0xa5, 0xf1,
+	0xb4, 0x0a, 0xe5, 0x61, 0x41, 0xd9, 0x74, 0x8d, 0xff, 0x82, 0xa0, 0x92, 0x6e, 0xd5, 0xb0, 0x92,
+	0x97, 0xb2, 0x9c, 0xa6, 0xae, 0x56, 0xe0, 0xee, 0x97, 0x1e, 0xfe, 0xe4, 0xdf, 0xff, 0xf9, 0xc5,
+	0xd4, 0x03, 0x49, 0x61, 0x83, 0xf7, 0x27, 0x21, 0x81, 0xef, 0x7b, 0xbe, 0xfb, 0x23, 0xa2, 0x07,
+	0x54, 0xa9, 0x2b, 0xb6, 0xab, 0x87, 0x73, 0xb6, 0x52, 0x7f, 0xa2, 0xc4, 0xba, 0x9b, 0x66, 0xbc,
+	0xd7, 0xc0, 0x7f, 0x46, 0xb0, 0x98, 0xea, 0xa6, 0xb0, 0x9c, 0xe7, 0x3d, 0xbb, 0xcb, 0xab, 0x29,
+	0x85, 0xe5, 0x43, 0xbe, 0x4b, 0xf7, 0x38, 0xf4, 0x3b, 0x78, 0x52, 0xe8, 0xf8, 0x57, 0x08, 0xca,
+	0x89, 0x8e, 0x0b, 0xdf, 0xce, 0xf3, 0x9d, 0xd5, 0x98, 0x15, 0xca, 0x6b, 0x12, 0x1c, 0x3b, 0xd0,
+	0x73, 0xa0, 0xc5, 0x91, 0x29, 0xf5, 0x27, 0xf8, 0xef, 0x08, 0x2a, 0xe9, 0x0e, 0x2f, 0xbf, 0xf4,
+	0x39, 0xbd, 0x60, 0x21, 0x88, 0xfb, 0x1c, 0xe2, 0xdb, 0x8d, 0x8d, 0x30, 0x7f, 0xa3, 0x72, 0xca,
+	0xc5, 0xe1, 0x26, 0x69, 0xf0, 0x4b, 0x04, 0x95, 0x74, 0x03, 0x98, 0x8f, 0x3d, 0xa7, 0x55, 0xac,
+	0x2d, 0x9f, 0xdb, 0x8e, 0xed, 0xbe, 0x17, 0x9c, 0x45, 0x29, 0xad, 0x4f, 0x9c, 0xd2, 0xdf, 0x22,
+	0x28, 0x27, 0xf6, 0x48, 0x7e, 0xbd, 0xb3, 0x06, 0xef, 0xda, 0xb8, 0x6b, 0x51, 0xba, 0xcf, 0x91,
+	0xdd, 0x93, 0x6e, 0x4f, 0xc0, 0x44, 0xda, 0x1c, 0x4e, 0x80, 0xbf, 0x47, 0x30, 0x1f, 0xbf, 0xad,
+	0xf1, 0xb7, 0x0a, 0x6c, 0x85, 0xe1, 0xbe, 0xb9, 0x5d, 0x4c, 0x58, 0x6c, 0x9a, 0xbb, 0x1c, 0xaa,
+	0x8c, 0x27, 0x82, 0x8a, 0x3f, 0x47, 0x00, 0xa3, 0xad, 0x80, 0x5f, 0x1d, 0xbf, 0x5d, 0x0a, 0xe7,
+	0x2e, 0x09, 0xa8, 0x40, 0x55, 0x79, 0x49, 0xff, 0x88, 0xa0, 0x9c, 0xe0, 0x7e, 0x7e, 0x49, 0xb3,
+	0xe6, 0xf5, 0xf1, 0xb0, 0xda, 0x1c, 0xd6, 0xf7, 0x1b, 0x77, 0xe3, 0x9b, 0x43, 0x2e, 0x08, 0x6f,
+	0x54, 0xda, 0xcf, 0x10, 0x94, 0x13, 0x3c, 0xcf, 0xc7, 0x99, 0x35, 0xc7, 0xe7, 0xee, 0x05, 0x91,
+	0xb5, 0xfa, 0x64, 0x59, 0xfb, 0xd7, 0xf0, 0xa7, 0xa5, 0xd4, 0xcf, 0x5c, 0xeb, 0x17, 0xef, 0x87,
+	0xcc, 0x76, 0xbc, 0x56, 0xb0, 0xab, 0x90, 0xde, 0xe7, 0x58, 0xdf, 0x95, 0x1e, 0x8c, 0xa7, 0x5c,
+	0x1c, 0xad, 0x92, 0x6a, 0x46, 0x9a, 0xe9, 0xa1, 0x8f, 0xdd, 0x3a, 0x4b, 0x59, 0xf3, 0x42, 0x7e,
+	0x38, 0x17, 0x4c, 0x17, 0xb9, 0xa9, 0xde, 0xe6, 0xf0, 0xdf, 0xac, 0x3f, 0x98, 0x20, 0xd5, 0x69,
+	0xec, 0x2c, 0xf9, 0xff, 0x44, 0xe1, 0xaf, 0x69, 0xa9, 0x21, 0x0e, 0x37, 0x2e, 0xda, 0xbf, 0xd9,
+	0x43, 0x66, 0x6d, 0x7d, 0x22, 0x1d, 0xb1, 0xf5, 0x45, 0x20, 0xf8, 0x92, 0x75, 0xc0, 0x5f, 0x22,
+	0xfe, 0x73, 0x59, 0x2a, 0xe7, 0xdf, 0xb9, 0xe0, 0x4c, 0xb8, 0x1c, 0x7f, 0x92, 0xb8, 0x9f, 0xbd,
+	0x00, 0x7f, 0x45, 0xb0, 0x9c, 0x3d, 0x2b, 0xe2, 0xd7, 0xf2, 0xa0, 0x5c, 0x38, 0x5b, 0xe6, 0x52,
+	0x46, 0x1c, 0x1e, 0x52, 0x73, 0xc2, 0x9b, 0xaa, 0xa9, 0x0d, 0xdd, 0x35, 0x51, 0x1d, 0xff, 0x03,
+	0xc1, 0xea, 0x05, 0xd3, 0x28, 0x6e, 0xe6, 0x27, 0x70, 0xdc, 0x08, 0x9b, 0x0b, 0xfd, 0x2d, 0x0e,
+	0x7d, 0x4b, 0xba, 0x3f, 0x29, 0x74, 0x3f, 0xee, 0x93, 0xa1, 0x7f, 0x8a, 0xa0, 0x9a, 0x37, 0x83,
+	0xe2, 0x7b, 0x45, 0x2e, 0xad, 0x8c, 0x49, 0xb9, 0xf6, 0xfa, 0xe4, 0x8a, 0x82, 0xfe, 0x6f, 0xf2,
+	0xc8, 0x9a, 0xf8, 0xf5, 0x09, 0x23, 0x1b, 0xdd, 0x82, 0x7f, 0x42, 0x70, 0xfd, 0xdc, 0xf8, 0x95,
+	0x4f, 0xfc, 0xbc, 0xb9, 0xb1, 0x76, 0x23, 0xd2, 0x88, 0xfd, 0xa3, 0x25, 0x0f, 0x47, 0x1e, 0x69,
+	0x93, 0x03, 0xdd, 0x90, 0xbe, 0x3b, 0x69, 0x4b, 0x6e, 0x71, 0x87, 0x4d, 0x54, 0xdf, 0xfa, 0x31,
+	0x82, 0x9a, 0xee, 0xf6, 0x73, 0x90, 0x6d, 0xbd, 0x98, 0x98, 0x36, 0xba, 0xe1, 0x5f, 0x79, 0xfb,
+	0x8c, 0x08, 0xfb, 0xe8, 0x87, 0xdf, 0x13, 0x4a, 0xa6, 0x6b, 0x6b, 0x8e, 0x29, 0xbb, 0xbe, 0xa9,
+	0x98, 0xc4, 0xe1, 0x34, 0x51, 0xc2, 0x4f, 0x9a, 0x67, 0xd1, 0xf4, 0x9f, 0x76, 0x1b, 0xe1, 0xd3,
+	0x7f, 0x11, 0xfa, 0xc3, 0xd4, 0x95, 0x9d, 0xd6, 0x7b, 0x7b, 0x47, 0x57, 0xb9, 0xca, 0xfa, 0xff,
+	0x02, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xa2, 0x18, 0x20, 0x51, 0x1c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2818,127 +2926,3 @@ var _ProductSearch_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/vision/v1/product_search_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/vision/v1/product_search_service.proto", fileDescriptor_product_search_service_914a807106064587)
-}
-
-var fileDescriptor_product_search_service_914a807106064587 = []byte{
-	// 1853 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4f, 0x73, 0xdb, 0xc6,
-	0x15, 0xcf, 0x4a, 0x96, 0x2d, 0x3d, 0x8a, 0x12, 0xbd, 0x55, 0x25, 0x86, 0x8a, 0xc7, 0x2a, 0x9a,
-	0xa6, 0x0e, 0xeb, 0x02, 0x35, 0xe5, 0xd4, 0x09, 0x55, 0xbb, 0x91, 0x68, 0x4a, 0x61, 0x22, 0xcb,
-	0x0a, 0x28, 0x25, 0xd3, 0x5e, 0x38, 0x10, 0xb0, 0x42, 0x50, 0x81, 0x00, 0x82, 0x05, 0x35, 0x51,
-	0x32, 0x3e, 0xb4, 0x3d, 0x34, 0x33, 0x99, 0xc9, 0xa1, 0xed, 0xa9, 0x7f, 0x67, 0x3a, 0xd3, 0xe9,
-	0xa1, 0xd3, 0x5e, 0xd2, 0x1c, 0x3a, 0xbd, 0xf7, 0xd4, 0x19, 0x1f, 0xfa, 0x15, 0xfa, 0x21, 0x7a,
-	0xec, 0xec, 0x62, 0x41, 0x02, 0x10, 0x20, 0x82, 0xd6, 0xb8, 0x37, 0x2c, 0xf0, 0xfe, 0xfc, 0xde,
-	0x7b, 0xbf, 0xdd, 0x7d, 0x8f, 0x84, 0x75, 0xd3, 0x75, 0x4d, 0x9b, 0x28, 0xba, 0xed, 0x0e, 0x0c,
-	0xe5, 0xd4, 0xa2, 0x96, 0xeb, 0x28, 0xa7, 0x77, 0x14, 0xcf, 0x77, 0x8d, 0x81, 0x1e, 0xf4, 0x28,
-	0xd1, 0x7c, 0xfd, 0x83, 0x1e, 0x25, 0xfe, 0xa9, 0xa5, 0x13, 0xd9, 0xf3, 0xdd, 0xc0, 0xc5, 0xcb,
-	0xa1, 0x92, 0xcc, 0x95, 0xe4, 0x50, 0x49, 0x3e, 0xbd, 0x53, 0x7b, 0x49, 0x18, 0xd3, 0x3c, 0x4b,
-	0xd1, 0x1c, 0xc7, 0x0d, 0xb4, 0xc0, 0x72, 0x1d, 0x1a, 0x6a, 0xd5, 0xbe, 0x91, 0xe3, 0xca, 0x24,
-	0x6e, 0x9f, 0x04, 0xfe, 0x99, 0x10, 0xfb, 0xba, 0x10, 0xb3, 0x5d, 0xc7, 0xf4, 0x07, 0x8e, 0x63,
-	0x39, 0xa6, 0xe2, 0x7a, 0xc4, 0x4f, 0xd8, 0x5a, 0x15, 0x42, 0x7c, 0x75, 0x34, 0x38, 0x56, 0x48,
-	0xdf, 0x0b, 0x22, 0x0b, 0x6b, 0xe9, 0x8f, 0xc7, 0x16, 0xb1, 0x8d, 0x5e, 0x5f, 0xa3, 0x27, 0x42,
-	0xe2, 0x66, 0x5a, 0x22, 0xb0, 0xfa, 0x84, 0x06, 0x5a, 0xdf, 0x13, 0x02, 0x2b, 0x42, 0xc0, 0xf7,
-	0x74, 0x85, 0x06, 0x5a, 0x30, 0x10, 0x8e, 0xa5, 0x9f, 0x4f, 0xc1, 0xb5, 0xfd, 0x30, 0x37, 0x18,
-	0xc3, 0x15, 0x47, 0xeb, 0x93, 0x2a, 0x5a, 0x43, 0xb7, 0xe6, 0x54, 0xfe, 0x8c, 0xbf, 0x06, 0xf3,
-	0x86, 0x45, 0x3d, 0x5b, 0x3b, 0xeb, 0xf1, 0x6f, 0x53, 0xfc, 0x5b, 0x49, 0xbc, 0xdb, 0x63, 0x22,
-	0x6b, 0x50, 0x32, 0x08, 0xd5, 0x7d, 0xcb, 0x63, 0x11, 0x55, 0xa7, 0x85, 0xc4, 0xe8, 0x15, 0x7e,
-	0x15, 0x2a, 0x51, 0xfe, 0x75, 0x2d, 0x20, 0xa6, 0xeb, 0x9f, 0x55, 0xaf, 0x70, 0xb1, 0x45, 0xf1,
-	0xbe, 0x25, 0x5e, 0xe3, 0xc7, 0xb0, 0x10, 0x89, 0xda, 0xda, 0x11, 0xb1, 0x69, 0x75, 0x66, 0x6d,
-	0xfa, 0x56, 0xa9, 0x71, 0x4b, 0xce, 0xae, 0x91, 0x2c, 0xc0, 0xcb, 0xef, 0x90, 0xb3, 0xf7, 0x34,
-	0x7b, 0x40, 0xd4, 0xb2, 0xd0, 0xdf, 0xe5, 0xea, 0xb5, 0x06, 0xcc, 0x46, 0x9f, 0x70, 0x05, 0xa6,
-	0x4f, 0xc8, 0x99, 0x88, 0x8f, 0x3d, 0xe2, 0x25, 0x98, 0x39, 0x65, 0x9f, 0x44, 0x5c, 0xe1, 0x42,
-	0xfa, 0x02, 0x01, 0x08, 0xbb, 0x5d, 0xf2, 0xcc, 0x79, 0x79, 0x03, 0xc0, 0x72, 0x0c, 0xf2, 0x51,
-	0x8f, 0x15, 0x83, 0xa7, 0xa5, 0xd4, 0xa8, 0x45, 0x61, 0x44, 0x95, 0x92, 0x0f, 0xa2, 0x4a, 0xa9,
-	0x73, 0x5c, 0x9a, 0xad, 0xf1, 0x3a, 0x94, 0x42, 0x55, 0xe2, 0xfb, 0xae, 0xcf, 0x73, 0x55, 0x6a,
-	0xe0, 0x48, 0xd7, 0xf7, 0x74, 0xb9, 0xcb, 0x8b, 0xa8, 0x86, 0x1e, 0xda, 0x4c, 0x4a, 0xfa, 0x29,
-	0x82, 0x05, 0x95, 0x1c, 0x13, 0x9f, 0x38, 0x3a, 0xe9, 0xf4, 0x35, 0x93, 0x64, 0x22, 0xaf, 0xc0,
-	0xf4, 0xc0, 0xb7, 0x04, 0x60, 0xf6, 0x88, 0xdf, 0x81, 0x85, 0x23, 0x77, 0xe0, 0x18, 0x96, 0x63,
-	0xf6, 0x3c, 0xd7, 0x3e, 0xa3, 0xd5, 0x69, 0x9e, 0xf3, 0x97, 0xf3, 0x72, 0xbe, 0x25, 0xa4, 0xf7,
-	0x5d, 0xfb, 0x4c, 0x2d, 0x1f, 0xc5, 0x56, 0x54, 0xfa, 0x14, 0xc1, 0x52, 0xcb, 0x27, 0x5a, 0x40,
-	0x44, 0x06, 0x55, 0xf2, 0xe1, 0x80, 0xd0, 0x00, 0x2f, 0xc3, 0x55, 0x4f, 0xf3, 0x89, 0x13, 0x08,
-	0x34, 0x62, 0x85, 0xdf, 0x80, 0x6b, 0xa2, 0x62, 0x1c, 0x53, 0xa9, 0x71, 0x73, 0x4c, 0xa9, 0xd5,
-	0x48, 0x1e, 0xdf, 0x00, 0x88, 0xc8, 0x62, 0x19, 0x82, 0x78, 0x73, 0xe2, 0x4d, 0xc7, 0x90, 0x2c,
-	0xf8, 0xca, 0xae, 0x45, 0x03, 0xa1, 0x46, 0xc7, 0x01, 0x59, 0x85, 0x39, 0x4f, 0x33, 0x49, 0x8f,
-	0x5a, 0x1f, 0x87, 0xf5, 0x9c, 0x51, 0x67, 0xd9, 0x8b, 0xae, 0xf5, 0x31, 0xe1, 0xae, 0xd8, 0xc7,
-	0xc0, 0x3d, 0x21, 0xce, 0xd0, 0x95, 0x66, 0x92, 0x03, 0xf6, 0x42, 0xfa, 0x04, 0x96, 0x92, 0xae,
-	0xa8, 0xe7, 0x3a, 0x94, 0xe0, 0x0d, 0x98, 0x15, 0x78, 0x68, 0x15, 0xf1, 0xa4, 0x8e, 0x8d, 0x6e,
-	0xa8, 0x80, 0x5f, 0x81, 0x45, 0x87, 0x7c, 0x14, 0xf4, 0x62, 0x8e, 0xc3, 0xaa, 0x95, 0xd9, 0xeb,
-	0xfd, 0xa1, 0xf3, 0x6f, 0xc2, 0xf5, 0x1d, 0x12, 0xa4, 0xd2, 0x9d, 0x51, 0x7a, 0xe9, 0x73, 0x04,
-	0x4b, 0x87, 0x9e, 0x71, 0xbe, 0x36, 0xb1, 0x1a, 0xa0, 0x09, 0x6b, 0xb0, 0x01, 0xa5, 0x01, 0x37,
-	0xc9, 0xcf, 0x23, 0x51, 0xc2, 0xf3, 0x34, 0xdf, 0x66, 0x47, 0xd6, 0x23, 0x8d, 0x9e, 0xa8, 0x10,
-	0x8a, 0xb3, 0x67, 0xa9, 0x0e, 0x4b, 0x0f, 0x89, 0x4d, 0xce, 0xe1, 0xc9, 0x02, 0xff, 0x1b, 0x04,
-	0x2b, 0x09, 0x62, 0x75, 0xc9, 0x58, 0x6e, 0xb5, 0xa0, 0x34, 0x3a, 0xf8, 0x23, 0x7e, 0x49, 0x63,
-	0x62, 0x63, 0x76, 0x23, 0x5e, 0xb1, 0xed, 0xff, 0xf2, 0xe8, 0x48, 0xa2, 0x24, 0xc6, 0xb4, 0xf9,
-	0x91, 0x4c, 0xc7, 0x90, 0x6c, 0x58, 0x8e, 0x31, 0xa0, 0x4b, 0x9e, 0x2f, 0xdf, 0x3e, 0x45, 0xb0,
-	0x72, 0xce, 0x9d, 0xe0, 0x5c, 0x1b, 0xe6, 0x63, 0x78, 0x23, 0xde, 0x15, 0x89, 0xba, 0x34, 0x8a,
-	0xa8, 0x38, 0xfb, 0xea, 0xb0, 0x34, 0x62, 0x5f, 0xac, 0x26, 0x59, 0x35, 0xfc, 0x35, 0x82, 0x95,
-	0x04, 0x01, 0x63, 0xf2, 0xa9, 0x5a, 0xa1, 0x67, 0xaa, 0xd5, 0xa5, 0xd8, 0xf8, 0x6d, 0x58, 0x49,
-	0xb0, 0x71, 0x4c, 0x30, 0x7f, 0x43, 0xb0, 0x1a, 0x12, 0x32, 0x79, 0xea, 0x8e, 0xab, 0xfb, 0x63,
-	0x58, 0xf4, 0x23, 0x85, 0x9e, 0xc5, 0x34, 0x04, 0xce, 0x57, 0xf2, 0x82, 0x4d, 0xd9, 0x5f, 0xf0,
-	0x93, 0xa7, 0xfc, 0x6d, 0xc0, 0x29, 0x83, 0x23, 0x92, 0x56, 0x92, 0xb2, 0x1d, 0x43, 0xf2, 0xa0,
-	0xc6, 0x98, 0x93, 0xb4, 0xf9, 0x5c, 0xc9, 0xfa, 0x25, 0x82, 0xd5, 0x4c, 0x97, 0x82, 0xb0, 0xef,
-	0x42, 0x25, 0x85, 0x3f, 0x22, 0x6d, 0xd1, 0x8c, 0x2c, 0x26, 0xa3, 0xa4, 0x17, 0xc3, 0xcd, 0x60,
-	0xf6, 0x74, 0x16, 0xb3, 0x65, 0xa8, 0xee, 0x90, 0x20, 0xbb, 0xb8, 0x59, 0x84, 0xb8, 0x03, 0xab,
-	0x21, 0x7f, 0x8a, 0xab, 0x3c, 0x82, 0x1b, 0x9b, 0x86, 0x21, 0xf8, 0x76, 0xe0, 0x16, 0x22, 0x1e,
-	0xae, 0x26, 0x6f, 0xcc, 0xb9, 0xe1, 0x61, 0x2c, 0xa9, 0x20, 0xa9, 0xa4, 0xef, 0x9e, 0x46, 0x0c,
-	0xde, 0xf6, 0xdd, 0xfe, 0x65, 0x6d, 0x7e, 0x08, 0x37, 0xe3, 0x57, 0x5b, 0xc7, 0x29, 0x66, 0xf0,
-	0x32, 0x84, 0xf9, 0x19, 0x82, 0xb5, 0x7c, 0x9f, 0xff, 0xcf, 0xab, 0xf5, 0x01, 0xd4, 0x3a, 0x7d,
-	0xcf, 0xf5, 0xe3, 0x07, 0xed, 0x8e, 0x4e, 0xbb, 0xee, 0xc0, 0xd7, 0x59, 0xe7, 0x3b, 0xaf, 0xd3,
-	0xd3, 0xde, 0xb1, 0x65, 0x93, 0x1e, 0xeb, 0xa9, 0xc2, 0xf8, 0x41, 0xa7, 0xa7, 0xdb, 0x96, 0x4d,
-	0x0e, 0x7d, 0x4b, 0x7a, 0x02, 0x2f, 0x9d, 0xd3, 0xef, 0x38, 0xde, 0x20, 0x68, 0xb9, 0xce, 0xb1,
-	0x65, 0xe2, 0x2e, 0x80, 0xa9, 0xd3, 0x1e, 0xe5, 0xf6, 0xc4, 0x99, 0xd7, 0xc8, 0x0b, 0x23, 0x1f,
-	0xc9, 0x5b, 0x2f, 0xa8, 0x73, 0x66, 0xb4, 0xd8, 0x9a, 0x85, 0xab, 0xa1, 0x41, 0xe9, 0x33, 0x04,
-	0xd5, 0x73, 0x5a, 0xe3, 0xb6, 0xfa, 0xfb, 0x30, 0x6f, 0x31, 0x88, 0x3d, 0x9d, 0x63, 0x14, 0x87,
-	0xd3, 0xdd, 0xc2, 0xa8, 0x62, 0xf1, 0xa9, 0x25, 0x6b, 0xb4, 0x90, 0x7e, 0x87, 0xe0, 0xc5, 0x0c,
-	0x34, 0xcf, 0xef, 0x14, 0x90, 0x61, 0x36, 0x1c, 0x76, 0x08, 0xad, 0x4e, 0x71, 0x53, 0x59, 0x3d,
-	0xf4, 0x50, 0x46, 0xfa, 0x62, 0x0a, 0x96, 0xb7, 0xb4, 0x40, 0xff, 0xe0, 0x71, 0x34, 0x9f, 0x3d,
-	0x22, 0x81, 0x66, 0x68, 0x81, 0x86, 0xdf, 0x86, 0x19, 0x26, 0x16, 0xd6, 0x68, 0x21, 0x3f, 0x1b,
-	0xd9, 0xea, 0xdc, 0x15, 0x51, 0x43, 0x13, 0xec, 0x92, 0xa2, 0x83, 0xa3, 0xbe, 0x15, 0x84, 0x93,
-	0xc1, 0xd4, 0xd8, 0xc9, 0x00, 0x42, 0x71, 0x3e, 0x1a, 0xbc, 0x06, 0xb3, 0xc4, 0x31, 0x8a, 0xce,
-	0x14, 0xd7, 0x88, 0x63, 0xb0, 0x95, 0xf4, 0x03, 0x98, 0xe1, 0x18, 0xf0, 0x57, 0xe1, 0x7a, 0xf7,
-	0x60, 0xf3, 0xa0, 0xdd, 0x3b, 0xdc, 0xeb, 0xee, 0xb7, 0x5b, 0x9d, 0xed, 0x4e, 0xfb, 0x61, 0xe5,
-	0x05, 0xbc, 0x00, 0xb0, 0xaf, 0x3e, 0x6e, 0xb5, 0xbb, 0xdd, 0xce, 0xde, 0x4e, 0x05, 0xb1, 0x75,
-	0xf7, 0xb0, 0xc5, 0xd6, 0xdb, 0x87, 0xbb, 0x95, 0x29, 0x0c, 0x70, 0x75, 0x7b, 0xb3, 0xb3, 0xdb,
-	0x7e, 0x58, 0x99, 0xc6, 0x65, 0x98, 0x6b, 0x6d, 0xee, 0xb5, 0xda, 0xbb, 0x6c, 0x79, 0xa5, 0xf1,
-	0xb4, 0x0a, 0xe5, 0x61, 0x41, 0xd9, 0x74, 0x8d, 0xff, 0x82, 0xa0, 0x92, 0x6e, 0xd5, 0xb0, 0x92,
-	0x97, 0xb2, 0x9c, 0xa6, 0xae, 0x56, 0xe0, 0xee, 0x97, 0x1e, 0xfe, 0xe4, 0xdf, 0xff, 0xf9, 0xc5,
-	0xd4, 0x03, 0x49, 0x61, 0x83, 0xf7, 0x27, 0x21, 0x81, 0xef, 0x7b, 0xbe, 0xfb, 0x23, 0xa2, 0x07,
-	0x54, 0xa9, 0x2b, 0xb6, 0xab, 0x87, 0x73, 0xb6, 0x52, 0x7f, 0xa2, 0xc4, 0xba, 0x9b, 0x66, 0xbc,
-	0xd7, 0xc0, 0x7f, 0x46, 0xb0, 0x98, 0xea, 0xa6, 0xb0, 0x9c, 0xe7, 0x3d, 0xbb, 0xcb, 0xab, 0x29,
-	0x85, 0xe5, 0x43, 0xbe, 0x4b, 0xf7, 0x38, 0xf4, 0x3b, 0x78, 0x52, 0xe8, 0xf8, 0x57, 0x08, 0xca,
-	0x89, 0x8e, 0x0b, 0xdf, 0xce, 0xf3, 0x9d, 0xd5, 0x98, 0x15, 0xca, 0x6b, 0x12, 0x1c, 0x3b, 0xd0,
-	0x73, 0xa0, 0xc5, 0x91, 0x29, 0xf5, 0x27, 0xf8, 0xef, 0x08, 0x2a, 0xe9, 0x0e, 0x2f, 0xbf, 0xf4,
-	0x39, 0xbd, 0x60, 0x21, 0x88, 0xfb, 0x1c, 0xe2, 0xdb, 0x8d, 0x8d, 0x30, 0x7f, 0xa3, 0x72, 0xca,
-	0xc5, 0xe1, 0x26, 0x69, 0xf0, 0x4b, 0x04, 0x95, 0x74, 0x03, 0x98, 0x8f, 0x3d, 0xa7, 0x55, 0xac,
-	0x2d, 0x9f, 0xdb, 0x8e, 0xed, 0xbe, 0x17, 0x9c, 0x45, 0x29, 0xad, 0x4f, 0x9c, 0xd2, 0xdf, 0x22,
-	0x28, 0x27, 0xf6, 0x48, 0x7e, 0xbd, 0xb3, 0x06, 0xef, 0xda, 0xb8, 0x6b, 0x51, 0xba, 0xcf, 0x91,
-	0xdd, 0x93, 0x6e, 0x4f, 0xc0, 0x44, 0xda, 0x1c, 0x4e, 0x80, 0xbf, 0x47, 0x30, 0x1f, 0xbf, 0xad,
-	0xf1, 0xb7, 0x0a, 0x6c, 0x85, 0xe1, 0xbe, 0xb9, 0x5d, 0x4c, 0x58, 0x6c, 0x9a, 0xbb, 0x1c, 0xaa,
-	0x8c, 0x27, 0x82, 0x8a, 0x3f, 0x47, 0x00, 0xa3, 0xad, 0x80, 0x5f, 0x1d, 0xbf, 0x5d, 0x0a, 0xe7,
-	0x2e, 0x09, 0xa8, 0x40, 0x55, 0x79, 0x49, 0xff, 0x88, 0xa0, 0x9c, 0xe0, 0x7e, 0x7e, 0x49, 0xb3,
-	0xe6, 0xf5, 0xf1, 0xb0, 0xda, 0x1c, 0xd6, 0xf7, 0x1b, 0x77, 0xe3, 0x9b, 0x43, 0x2e, 0x08, 0x6f,
-	0x54, 0xda, 0xcf, 0x10, 0x94, 0x13, 0x3c, 0xcf, 0xc7, 0x99, 0x35, 0xc7, 0xe7, 0xee, 0x05, 0x91,
-	0xb5, 0xfa, 0x64, 0x59, 0xfb, 0xd7, 0xf0, 0xa7, 0xa5, 0xd4, 0xcf, 0x5c, 0xeb, 0x17, 0xef, 0x87,
-	0xcc, 0x76, 0xbc, 0x56, 0xb0, 0xab, 0x90, 0xde, 0xe7, 0x58, 0xdf, 0x95, 0x1e, 0x8c, 0xa7, 0x5c,
-	0x1c, 0xad, 0x92, 0x6a, 0x46, 0x9a, 0xe9, 0xa1, 0x8f, 0xdd, 0x3a, 0x4b, 0x59, 0xf3, 0x42, 0x7e,
-	0x38, 0x17, 0x4c, 0x17, 0xb9, 0xa9, 0xde, 0xe6, 0xf0, 0xdf, 0xac, 0x3f, 0x98, 0x20, 0xd5, 0x69,
-	0xec, 0x2c, 0xf9, 0xff, 0x44, 0xe1, 0xaf, 0x69, 0xa9, 0x21, 0x0e, 0x37, 0x2e, 0xda, 0xbf, 0xd9,
-	0x43, 0x66, 0x6d, 0x7d, 0x22, 0x1d, 0xb1, 0xf5, 0x45, 0x20, 0xf8, 0x92, 0x75, 0xc0, 0x5f, 0x22,
-	0xfe, 0x73, 0x59, 0x2a, 0xe7, 0xdf, 0xb9, 0xe0, 0x4c, 0xb8, 0x1c, 0x7f, 0x92, 0xb8, 0x9f, 0xbd,
-	0x00, 0x7f, 0x45, 0xb0, 0x9c, 0x3d, 0x2b, 0xe2, 0xd7, 0xf2, 0xa0, 0x5c, 0x38, 0x5b, 0xe6, 0x52,
-	0x46, 0x1c, 0x1e, 0x52, 0x73, 0xc2, 0x9b, 0xaa, 0xa9, 0x0d, 0xdd, 0x35, 0x51, 0x1d, 0xff, 0x03,
-	0xc1, 0xea, 0x05, 0xd3, 0x28, 0x6e, 0xe6, 0x27, 0x70, 0xdc, 0x08, 0x9b, 0x0b, 0xfd, 0x2d, 0x0e,
-	0x7d, 0x4b, 0xba, 0x3f, 0x29, 0x74, 0x3f, 0xee, 0x93, 0xa1, 0x7f, 0x8a, 0xa0, 0x9a, 0x37, 0x83,
-	0xe2, 0x7b, 0x45, 0x2e, 0xad, 0x8c, 0x49, 0xb9, 0xf6, 0xfa, 0xe4, 0x8a, 0x82, 0xfe, 0x6f, 0xf2,
-	0xc8, 0x9a, 0xf8, 0xf5, 0x09, 0x23, 0x1b, 0xdd, 0x82, 0x7f, 0x42, 0x70, 0xfd, 0xdc, 0xf8, 0x95,
-	0x4f, 0xfc, 0xbc, 0xb9, 0xb1, 0x76, 0x23, 0xd2, 0x88, 0xfd, 0xa3, 0x25, 0x0f, 0x47, 0x1e, 0x69,
-	0x93, 0x03, 0xdd, 0x90, 0xbe, 0x3b, 0x69, 0x4b, 0x6e, 0x71, 0x87, 0x4d, 0x54, 0xdf, 0xfa, 0x31,
-	0x82, 0x9a, 0xee, 0xf6, 0x73, 0x90, 0x6d, 0xbd, 0x98, 0x98, 0x36, 0xba, 0xe1, 0x5f, 0x79, 0xfb,
-	0x8c, 0x08, 0xfb, 0xe8, 0x87, 0xdf, 0x13, 0x4a, 0xa6, 0x6b, 0x6b, 0x8e, 0x29, 0xbb, 0xbe, 0xa9,
-	0x98, 0xc4, 0xe1, 0x34, 0x51, 0xc2, 0x4f, 0x9a, 0x67, 0xd1, 0xf4, 0x9f, 0x76, 0x1b, 0xe1, 0xd3,
-	0x7f, 0x11, 0xfa, 0xc3, 0xd4, 0x95, 0x9d, 0xd6, 0x7b, 0x7b, 0x47, 0x57, 0xb9, 0xca, 0xfa, 0xff,
-	0x02, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xa2, 0x18, 0x20, 0x51, 0x1c, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/vision/v1/text_annotation.pb.go b/googleapis/cloud/vision/v1/text_annotation.pb.go
index 4dc4594fc2..7565a59e9e 100644
--- a/googleapis/cloud/vision/v1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1/text_annotation.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum to denote the type of break found. New line, space etc.
 type TextAnnotation_DetectedBreak_BreakType int32
@@ -46,6 +49,7 @@ var TextAnnotation_DetectedBreak_BreakType_name = map[int32]string{
 	4: "HYPHEN",
 	5: "LINE_BREAK",
 }
+
 var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 	"UNKNOWN":        0,
 	"SPACE":          1,
@@ -58,8 +62,9 @@ var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 func (x TextAnnotation_DetectedBreak_BreakType) String() string {
 	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
 }
+
 func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{0, 1, 0}
+	return fileDescriptor_9caabbd9b4627d68, []int{0, 1, 0}
 }
 
 // Type of a block (text, image etc) as identified by OCR.
@@ -88,6 +93,7 @@ var Block_BlockType_name = map[int32]string{
 	4: "RULER",
 	5: "BARCODE",
 }
+
 var Block_BlockType_value = map[string]int32{
 	"UNKNOWN": 0,
 	"TEXT":    1,
@@ -100,8 +106,9 @@ var Block_BlockType_value = map[string]int32{
 func (x Block_BlockType) String() string {
 	return proto.EnumName(Block_BlockType_name, int32(x))
 }
+
 func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{2, 0}
+	return fileDescriptor_9caabbd9b4627d68, []int{2, 0}
 }
 
 // TextAnnotation contains a structured representation of OCR extracted text.
@@ -126,16 +133,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{0}
+	return fileDescriptor_9caabbd9b4627d68, []int{0}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -177,16 +185,17 @@ func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_
 func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
 func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{0, 0}
+	return fileDescriptor_9caabbd9b4627d68, []int{0, 0}
 }
+
 func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+func (m *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
@@ -226,16 +235,17 @@ func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_Det
 func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
 func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{0, 1}
+	return fileDescriptor_9caabbd9b4627d68, []int{0, 1}
 }
+
 func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+func (m *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
@@ -275,16 +285,17 @@ func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_Text
 func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_TextProperty) ProtoMessage()    {}
 func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{0, 2}
+	return fileDescriptor_9caabbd9b4627d68, []int{0, 2}
 }
+
 func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
 }
 func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+func (m *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(m, src)
 }
 func (m *TextAnnotation_TextProperty) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
@@ -332,16 +343,17 @@ func (m *Page) Reset()         { *m = Page{} }
 func (m *Page) String() string { return proto.CompactTextString(m) }
 func (*Page) ProtoMessage()    {}
 func (*Page) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{1}
+	return fileDescriptor_9caabbd9b4627d68, []int{1}
 }
+
 func (m *Page) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Page.Unmarshal(m, b)
 }
 func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
 }
-func (dst *Page) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Page.Merge(dst, src)
+func (m *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(m, src)
 }
 func (m *Page) XXX_Size() int {
 	return xxx_messageInfo_Page.Size(m)
@@ -427,16 +439,17 @@ func (m *Block) Reset()         { *m = Block{} }
 func (m *Block) String() string { return proto.CompactTextString(m) }
 func (*Block) ProtoMessage()    {}
 func (*Block) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{2}
+	return fileDescriptor_9caabbd9b4627d68, []int{2}
 }
+
 func (m *Block) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Block.Unmarshal(m, b)
 }
 func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
 }
-func (dst *Block) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Block.Merge(dst, src)
+func (m *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(m, src)
 }
 func (m *Block) XXX_Size() int {
 	return xxx_messageInfo_Block.Size(m)
@@ -515,16 +528,17 @@ func (m *Paragraph) Reset()         { *m = Paragraph{} }
 func (m *Paragraph) String() string { return proto.CompactTextString(m) }
 func (*Paragraph) ProtoMessage()    {}
 func (*Paragraph) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{3}
+	return fileDescriptor_9caabbd9b4627d68, []int{3}
 }
+
 func (m *Paragraph) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
 }
 func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
 }
-func (dst *Paragraph) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Paragraph.Merge(dst, src)
+func (m *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(m, src)
 }
 func (m *Paragraph) XXX_Size() int {
 	return xxx_messageInfo_Paragraph.Size(m)
@@ -597,16 +611,17 @@ func (m *Word) Reset()         { *m = Word{} }
 func (m *Word) String() string { return proto.CompactTextString(m) }
 func (*Word) ProtoMessage()    {}
 func (*Word) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{4}
+	return fileDescriptor_9caabbd9b4627d68, []int{4}
 }
+
 func (m *Word) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Word.Unmarshal(m, b)
 }
 func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
 }
-func (dst *Word) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Word.Merge(dst, src)
+func (m *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(m, src)
 }
 func (m *Word) XXX_Size() int {
 	return xxx_messageInfo_Word.Size(m)
@@ -678,16 +693,17 @@ func (m *Symbol) Reset()         { *m = Symbol{} }
 func (m *Symbol) String() string { return proto.CompactTextString(m) }
 func (*Symbol) ProtoMessage()    {}
 func (*Symbol) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_29fd59b3d2ddfb72, []int{5}
+	return fileDescriptor_9caabbd9b4627d68, []int{5}
 }
+
 func (m *Symbol) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Symbol.Unmarshal(m, b)
 }
 func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
 }
-func (dst *Symbol) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Symbol.Merge(dst, src)
+func (m *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(m, src)
 }
 func (m *Symbol) XXX_Size() int {
 	return xxx_messageInfo_Symbol.Size(m)
@@ -727,6 +743,8 @@ func (m *Symbol) GetConfidence() float32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
+	proto.RegisterEnum("google.cloud.vision.v1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.vision.v1.TextAnnotation")
 	proto.RegisterType((*TextAnnotation_DetectedLanguage)(nil), "google.cloud.vision.v1.TextAnnotation.DetectedLanguage")
 	proto.RegisterType((*TextAnnotation_DetectedBreak)(nil), "google.cloud.vision.v1.TextAnnotation.DetectedBreak")
@@ -736,15 +754,13 @@ func init() {
 	proto.RegisterType((*Paragraph)(nil), "google.cloud.vision.v1.Paragraph")
 	proto.RegisterType((*Word)(nil), "google.cloud.vision.v1.Word")
 	proto.RegisterType((*Symbol)(nil), "google.cloud.vision.v1.Symbol")
-	proto.RegisterEnum("google.cloud.vision.v1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
-	proto.RegisterEnum("google.cloud.vision.v1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1/text_annotation.proto", fileDescriptor_text_annotation_29fd59b3d2ddfb72)
+	proto.RegisterFile("google/cloud/vision/v1/text_annotation.proto", fileDescriptor_9caabbd9b4627d68)
 }
 
-var fileDescriptor_text_annotation_29fd59b3d2ddfb72 = []byte{
+var fileDescriptor_9caabbd9b4627d68 = []byte{
 	// 774 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcf, 0x6f, 0xd3, 0x58,
 	0x10, 0x5e, 0x27, 0x76, 0x1a, 0x4f, 0xda, 0xc8, 0xfb, 0x76, 0x55, 0x45, 0xd9, 0x6e, 0xd5, 0xcd,
diff --git a/googleapis/cloud/vision/v1/web_detection.pb.go b/googleapis/cloud/vision/v1/web_detection.pb.go
index 9880f23a7b..b4d80d4f97 100644
--- a/googleapis/cloud/vision/v1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1/web_detection.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Relevant information for the image from the Internet.
 type WebDetection struct {
@@ -46,16 +49,17 @@ func (m *WebDetection) Reset()         { *m = WebDetection{} }
 func (m *WebDetection) String() string { return proto.CompactTextString(m) }
 func (*WebDetection) ProtoMessage()    {}
 func (*WebDetection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_bc054784537d86ab, []int{0}
+	return fileDescriptor_894df371610d13f4, []int{0}
 }
+
 func (m *WebDetection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
 }
 func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection.Merge(dst, src)
+func (m *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(m, src)
 }
 func (m *WebDetection) XXX_Size() int {
 	return xxx_messageInfo_WebDetection.Size(m)
@@ -126,16 +130,17 @@ func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{}
 func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebEntity) ProtoMessage()    {}
 func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_bc054784537d86ab, []int{0, 0}
+	return fileDescriptor_894df371610d13f4, []int{0, 0}
 }
+
 func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
 }
 func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+func (m *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(m, src)
 }
 func (m *WebDetection_WebEntity) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
@@ -182,16 +187,17 @@ func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
 func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebImage) ProtoMessage()    {}
 func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_bc054784537d86ab, []int{0, 1}
+	return fileDescriptor_894df371610d13f4, []int{0, 1}
 }
+
 func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+func (m *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(m, src)
 }
 func (m *WebDetection_WebImage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebImage.Size(m)
@@ -233,16 +239,17 @@ func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
 func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebLabel) ProtoMessage()    {}
 func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_bc054784537d86ab, []int{0, 2}
+	return fileDescriptor_894df371610d13f4, []int{0, 2}
 }
+
 func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
 }
 func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+func (m *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(m, src)
 }
 func (m *WebDetection_WebLabel) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
@@ -292,16 +299,17 @@ func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
 func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebPage) ProtoMessage()    {}
 func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_bc054784537d86ab, []int{0, 3}
+	return fileDescriptor_894df371610d13f4, []int{0, 3}
 }
+
 func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+func (m *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(m, src)
 }
 func (m *WebDetection_WebPage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebPage.Size(m)
@@ -356,10 +364,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1/web_detection.proto", fileDescriptor_web_detection_bc054784537d86ab)
+	proto.RegisterFile("google/cloud/vision/v1/web_detection.proto", fileDescriptor_894df371610d13f4)
 }
 
-var fileDescriptor_web_detection_bc054784537d86ab = []byte{
+var fileDescriptor_894df371610d13f4 = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xdf, 0x6e, 0xd3, 0x30,
 	0x14, 0xc6, 0x95, 0xb6, 0x1b, 0xad, 0x5b, 0x04, 0xb3, 0x06, 0x8b, 0x02, 0x48, 0x15, 0xdc, 0x54,
diff --git a/googleapis/cloud/vision/v1p1beta1/geometry.pb.go b/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
index c3ce08dd99..ced47f9960 100644
--- a/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A vertex represents a 2D point in the image.
 // NOTE: the vertex coordinates are in the same scale as the original image.
@@ -34,16 +37,17 @@ func (m *Vertex) Reset()         { *m = Vertex{} }
 func (m *Vertex) String() string { return proto.CompactTextString(m) }
 func (*Vertex) ProtoMessage()    {}
 func (*Vertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_b5cd86c78d12f2ad, []int{0}
+	return fileDescriptor_a110c700536b1e95, []int{0}
 }
+
 func (m *Vertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vertex.Unmarshal(m, b)
 }
 func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
 }
-func (dst *Vertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vertex.Merge(dst, src)
+func (m *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(m, src)
 }
 func (m *Vertex) XXX_Size() int {
 	return xxx_messageInfo_Vertex.Size(m)
@@ -81,16 +85,17 @@ func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
 func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*BoundingPoly) ProtoMessage()    {}
 func (*BoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_b5cd86c78d12f2ad, []int{1}
+	return fileDescriptor_a110c700536b1e95, []int{1}
 }
+
 func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
 }
 func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+func (m *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(m, src)
 }
 func (m *BoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_BoundingPoly.Size(m)
@@ -127,16 +132,17 @@ func (m *Position) Reset()         { *m = Position{} }
 func (m *Position) String() string { return proto.CompactTextString(m) }
 func (*Position) ProtoMessage()    {}
 func (*Position) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_b5cd86c78d12f2ad, []int{2}
+	return fileDescriptor_a110c700536b1e95, []int{2}
 }
+
 func (m *Position) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Position.Unmarshal(m, b)
 }
 func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
 }
-func (dst *Position) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Position.Merge(dst, src)
+func (m *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(m, src)
 }
 func (m *Position) XXX_Size() int {
 	return xxx_messageInfo_Position.Size(m)
@@ -175,10 +181,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p1beta1/geometry.proto", fileDescriptor_geometry_b5cd86c78d12f2ad)
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/geometry.proto", fileDescriptor_a110c700536b1e95)
 }
 
-var fileDescriptor_geometry_b5cd86c78d12f2ad = []byte{
+var fileDescriptor_a110c700536b1e95 = []byte{
 	// 243 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4b, 0xc3, 0x40,
 	0x14, 0x87, 0x79, 0x29, 0x96, 0x72, 0xd6, 0x25, 0x53, 0x16, 0xa1, 0x06, 0x85, 0x0e, 0x72, 0x47,
diff --git a/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go b/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
index 2bd5a88e6f..b07ea5a05f 100644
--- a/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
@@ -54,6 +54,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"UNKNOWN":       0,
 	"VERY_UNLIKELY": 1,
@@ -66,8 +67,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{0}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{0}
 }
 
 // Type of image feature.
@@ -112,6 +114,7 @@ var Feature_Type_name = map[int32]string{
 	9:  "CROP_HINTS",
 	10: "WEB_DETECTION",
 }
+
 var Feature_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":        0,
 	"FACE_DETECTION":          1,
@@ -129,8 +132,9 @@ var Feature_Type_value = map[string]int32{
 func (x Feature_Type) String() string {
 	return proto.EnumName(Feature_Type_name, int32(x))
 }
+
 func (Feature_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{0, 0}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{0, 0}
 }
 
 // Face landmark (feature) type.
@@ -249,6 +253,7 @@ var FaceAnnotation_Landmark_Type_name = map[int32]string{
 	33: "CHIN_LEFT_GONION",
 	34: "CHIN_RIGHT_GONION",
 }
+
 var FaceAnnotation_Landmark_Type_value = map[string]int32{
 	"UNKNOWN_LANDMARK":             0,
 	"LEFT_EYE":                     1,
@@ -290,8 +295,9 @@ var FaceAnnotation_Landmark_Type_value = map[string]int32{
 func (x FaceAnnotation_Landmark_Type) String() string {
 	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
 }
+
 func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{3, 0, 0}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{3, 0, 0}
 }
 
 // Users describe the type of Google Cloud Vision API tasks to perform over
@@ -316,16 +322,17 @@ func (m *Feature) Reset()         { *m = Feature{} }
 func (m *Feature) String() string { return proto.CompactTextString(m) }
 func (*Feature) ProtoMessage()    {}
 func (*Feature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{0}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{0}
 }
+
 func (m *Feature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feature.Unmarshal(m, b)
 }
 func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
 }
-func (dst *Feature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feature.Merge(dst, src)
+func (m *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(m, src)
 }
 func (m *Feature) XXX_Size() int {
 	return xxx_messageInfo_Feature.Size(m)
@@ -386,16 +393,17 @@ func (m *ImageSource) Reset()         { *m = ImageSource{} }
 func (m *ImageSource) String() string { return proto.CompactTextString(m) }
 func (*ImageSource) ProtoMessage()    {}
 func (*ImageSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{1}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{1}
 }
+
 func (m *ImageSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
 }
 func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
 }
-func (dst *ImageSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageSource.Merge(dst, src)
+func (m *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(m, src)
 }
 func (m *ImageSource) XXX_Size() int {
 	return xxx_messageInfo_ImageSource.Size(m)
@@ -439,16 +447,17 @@ func (m *Image) Reset()         { *m = Image{} }
 func (m *Image) String() string { return proto.CompactTextString(m) }
 func (*Image) ProtoMessage()    {}
 func (*Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{2}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{2}
 }
+
 func (m *Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Image.Unmarshal(m, b)
 }
 func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
 }
-func (dst *Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Image.Merge(dst, src)
+func (m *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(m, src)
 }
 func (m *Image) XXX_Size() int {
 	return xxx_messageInfo_Image.Size(m)
@@ -530,16 +539,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{3}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{3}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -670,16 +680,17 @@ func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark
 func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation_Landmark) ProtoMessage()    {}
 func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{3, 0}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{3, 0}
 }
+
 func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
 }
 func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+func (m *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(m, src)
 }
 func (m *FaceAnnotation_Landmark) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
@@ -717,16 +728,17 @@ func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
 func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
 func (*LocationInfo) ProtoMessage()    {}
 func (*LocationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{4}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{4}
 }
+
 func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
 }
 func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
 }
-func (dst *LocationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationInfo.Merge(dst, src)
+func (m *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(m, src)
 }
 func (m *LocationInfo) XXX_Size() int {
 	return xxx_messageInfo_LocationInfo.Size(m)
@@ -761,16 +773,17 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{5}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{5}
 }
+
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(dst, src)
+func (m *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(m, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -847,16 +860,17 @@ func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
 func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
 func (*EntityAnnotation) ProtoMessage()    {}
 func (*EntityAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{6}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{6}
 }
+
 func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
 }
 func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+func (m *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(m, src)
 }
 func (m *EntityAnnotation) XXX_Size() int {
 	return xxx_messageInfo_EntityAnnotation.Size(m)
@@ -960,16 +974,17 @@ func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
 func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
 func (*SafeSearchAnnotation) ProtoMessage()    {}
 func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{7}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{7}
 }
+
 func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
 }
 func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+func (m *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(m, src)
 }
 func (m *SafeSearchAnnotation) XXX_Size() int {
 	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
@@ -1030,16 +1045,17 @@ func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
 func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
 func (*LatLongRect) ProtoMessage()    {}
 func (*LatLongRect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{8}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{8}
 }
+
 func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
 }
 func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
 }
-func (dst *LatLongRect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LatLongRect.Merge(dst, src)
+func (m *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(m, src)
 }
 func (m *LatLongRect) XXX_Size() int {
 	return xxx_messageInfo_LatLongRect.Size(m)
@@ -1083,16 +1099,17 @@ func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
 func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
 func (*ColorInfo) ProtoMessage()    {}
 func (*ColorInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{9}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{9}
 }
+
 func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
 }
 func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
 }
-func (dst *ColorInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColorInfo.Merge(dst, src)
+func (m *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(m, src)
 }
 func (m *ColorInfo) XXX_Size() int {
 	return xxx_messageInfo_ColorInfo.Size(m)
@@ -1137,16 +1154,17 @@ func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotati
 func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*DominantColorsAnnotation) ProtoMessage()    {}
 func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{10}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{10}
 }
+
 func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
 }
 func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+func (m *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(m, src)
 }
 func (m *DominantColorsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
@@ -1177,16 +1195,17 @@ func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
 func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
 func (*ImageProperties) ProtoMessage()    {}
 func (*ImageProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{11}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{11}
 }
+
 func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
 }
 func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
 }
-func (dst *ImageProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageProperties.Merge(dst, src)
+func (m *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(m, src)
 }
 func (m *ImageProperties) XXX_Size() int {
 	return xxx_messageInfo_ImageProperties.Size(m)
@@ -1223,16 +1242,17 @@ func (m *CropHint) Reset()         { *m = CropHint{} }
 func (m *CropHint) String() string { return proto.CompactTextString(m) }
 func (*CropHint) ProtoMessage()    {}
 func (*CropHint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{12}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{12}
 }
+
 func (m *CropHint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHint.Unmarshal(m, b)
 }
 func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
 }
-func (dst *CropHint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHint.Merge(dst, src)
+func (m *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(m, src)
 }
 func (m *CropHint) XXX_Size() int {
 	return xxx_messageInfo_CropHint.Size(m)
@@ -1277,16 +1297,17 @@ func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
 func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*CropHintsAnnotation) ProtoMessage()    {}
 func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{13}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{13}
 }
+
 func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
 }
 func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+func (m *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(m, src)
 }
 func (m *CropHintsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_CropHintsAnnotation.Size(m)
@@ -1322,16 +1343,17 @@ func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
 func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
 func (*CropHintsParams) ProtoMessage()    {}
 func (*CropHintsParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{14}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{14}
 }
+
 func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
 }
 func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+func (m *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(m, src)
 }
 func (m *CropHintsParams) XXX_Size() int {
 	return xxx_messageInfo_CropHintsParams.Size(m)
@@ -1362,16 +1384,17 @@ func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
 func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
 func (*WebDetectionParams) ProtoMessage()    {}
 func (*WebDetectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{15}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{15}
 }
+
 func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
 }
 func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
 }
-func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+func (m *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(m, src)
 }
 func (m *WebDetectionParams) XXX_Size() int {
 	return xxx_messageInfo_WebDetectionParams.Size(m)
@@ -1415,16 +1438,17 @@ func (m *ImageContext) Reset()         { *m = ImageContext{} }
 func (m *ImageContext) String() string { return proto.CompactTextString(m) }
 func (*ImageContext) ProtoMessage()    {}
 func (*ImageContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{16}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{16}
 }
+
 func (m *ImageContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
 }
 func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageContext.Merge(dst, src)
+func (m *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(m, src)
 }
 func (m *ImageContext) XXX_Size() int {
 	return xxx_messageInfo_ImageContext.Size(m)
@@ -1481,16 +1505,17 @@ func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
 func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageRequest) ProtoMessage()    {}
 func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{17}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{17}
 }
+
 func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
 }
 func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+func (m *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(m, src)
 }
 func (m *AnnotateImageRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageRequest.Size(m)
@@ -1560,16 +1585,17 @@ func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
 func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageResponse) ProtoMessage()    {}
 func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{18}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{18}
 }
+
 func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
 }
 func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+func (m *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(m, src)
 }
 func (m *AnnotateImageResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageResponse.Size(m)
@@ -1670,16 +1696,17 @@ func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesR
 func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
 func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{19}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{19}
 }
+
 func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+func (m *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(m, src)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
@@ -1710,16 +1737,17 @@ func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImages
 func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
 func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_e65877f16ecf0354, []int{20}
+	return fileDescriptor_1f6928ee25f8ae1f, []int{20}
 }
+
 func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+func (m *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(m, src)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
@@ -1738,6 +1766,9 @@ func (m *BatchAnnotateImagesResponse) GetResponses() []*AnnotateImageResponse {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p1beta1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.vision.v1p1beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p1beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
 	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1p1beta1.Feature")
 	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1p1beta1.ImageSource")
 	proto.RegisterType((*Image)(nil), "google.cloud.vision.v1p1beta1.Image")
@@ -1760,90 +1791,13 @@ func init() {
 	proto.RegisterType((*AnnotateImageResponse)(nil), "google.cloud.vision.v1p1beta1.AnnotateImageResponse")
 	proto.RegisterType((*BatchAnnotateImagesRequest)(nil), "google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest")
 	proto.RegisterType((*BatchAnnotateImagesResponse)(nil), "google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse")
-	proto.RegisterEnum("google.cloud.vision.v1p1beta1.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.cloud.vision.v1p1beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1p1beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ImageAnnotatorClient is the client API for ImageAnnotator service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ImageAnnotatorClient interface {
-	// Run image detection and annotation for a batch of images.
-	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
-}
-
-type imageAnnotatorClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
-	return &imageAnnotatorClient{cc}
-}
-
-func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
-	out := new(BatchAnnotateImagesResponse)
-	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p1beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ImageAnnotatorServer is the server API for ImageAnnotator service.
-type ImageAnnotatorServer interface {
-	// Run image detection and annotation for a batch of images.
-	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
-}
-
-func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
-	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
-}
-
-func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BatchAnnotateImagesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.vision.v1p1beta1.ImageAnnotator/BatchAnnotateImages",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.vision.v1p1beta1.ImageAnnotator",
-	HandlerType: (*ImageAnnotatorServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "BatchAnnotateImages",
-			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/vision/v1p1beta1/image_annotator.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p1beta1/image_annotator.proto", fileDescriptor_image_annotator_e65877f16ecf0354)
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/image_annotator.proto", fileDescriptor_1f6928ee25f8ae1f)
 }
 
-var fileDescriptor_image_annotator_e65877f16ecf0354 = []byte{
+var fileDescriptor_1f6928ee25f8ae1f = []byte{
 	// 2392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x72, 0xe3, 0xc6,
 	0xf1, 0x37, 0xa9, 0x2f, 0xb2, 0x49, 0x91, 0xd0, 0x48, 0x2b, 0x73, 0xb5, 0xbb, 0x5e, 0x19, 0xff,
@@ -1996,3 +1950,77 @@ var fileDescriptor_image_annotator_e65877f16ecf0354 = []byte{
 	0x54, 0x08, 0xfe, 0x95, 0xcb, 0x5d, 0xae, 0x73, 0xc8, 0xc3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff,
 	0xb8, 0x10, 0xf5, 0x85, 0x78, 0x1b, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ImageAnnotatorClient is the client API for ImageAnnotator service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ImageAnnotatorClient interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
+}
+
+type imageAnnotatorClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
+	return &imageAnnotatorClient{cc}
+}
+
+func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
+	out := new(BatchAnnotateImagesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p1beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ImageAnnotatorServer is the server API for ImageAnnotator service.
+type ImageAnnotatorServer interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
+}
+
+func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
+	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
+}
+
+func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchAnnotateImagesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p1beta1.ImageAnnotator/BatchAnnotateImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.vision.v1p1beta1.ImageAnnotator",
+	HandlerType: (*ImageAnnotatorServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "BatchAnnotateImages",
+			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/vision/v1p1beta1/image_annotator.proto",
+}
diff --git a/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go b/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
index 168bccc795..9c0f54f02a 100644
--- a/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum to denote the type of break found. New line, space etc.
 type TextAnnotation_DetectedBreak_BreakType int32
@@ -46,6 +49,7 @@ var TextAnnotation_DetectedBreak_BreakType_name = map[int32]string{
 	4: "HYPHEN",
 	5: "LINE_BREAK",
 }
+
 var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 	"UNKNOWN":        0,
 	"SPACE":          1,
@@ -58,8 +62,9 @@ var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 func (x TextAnnotation_DetectedBreak_BreakType) String() string {
 	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
 }
+
 func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{0, 1, 0}
+	return fileDescriptor_74ab7e2078bf72c5, []int{0, 1, 0}
 }
 
 // Type of a block (text, image etc) as identified by OCR.
@@ -88,6 +93,7 @@ var Block_BlockType_name = map[int32]string{
 	4: "RULER",
 	5: "BARCODE",
 }
+
 var Block_BlockType_value = map[string]int32{
 	"UNKNOWN": 0,
 	"TEXT":    1,
@@ -100,8 +106,9 @@ var Block_BlockType_value = map[string]int32{
 func (x Block_BlockType) String() string {
 	return proto.EnumName(Block_BlockType_name, int32(x))
 }
+
 func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{2, 0}
+	return fileDescriptor_74ab7e2078bf72c5, []int{2, 0}
 }
 
 // TextAnnotation contains a structured representation of OCR extracted text.
@@ -126,16 +133,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{0}
+	return fileDescriptor_74ab7e2078bf72c5, []int{0}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -177,16 +185,17 @@ func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_
 func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
 func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{0, 0}
+	return fileDescriptor_74ab7e2078bf72c5, []int{0, 0}
 }
+
 func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+func (m *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
@@ -226,16 +235,17 @@ func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_Det
 func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
 func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{0, 1}
+	return fileDescriptor_74ab7e2078bf72c5, []int{0, 1}
 }
+
 func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+func (m *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
@@ -275,16 +285,17 @@ func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_Text
 func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_TextProperty) ProtoMessage()    {}
 func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{0, 2}
+	return fileDescriptor_74ab7e2078bf72c5, []int{0, 2}
 }
+
 func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
 }
 func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+func (m *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(m, src)
 }
 func (m *TextAnnotation_TextProperty) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
@@ -330,16 +341,17 @@ func (m *Page) Reset()         { *m = Page{} }
 func (m *Page) String() string { return proto.CompactTextString(m) }
 func (*Page) ProtoMessage()    {}
 func (*Page) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{1}
+	return fileDescriptor_74ab7e2078bf72c5, []int{1}
 }
+
 func (m *Page) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Page.Unmarshal(m, b)
 }
 func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
 }
-func (dst *Page) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Page.Merge(dst, src)
+func (m *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(m, src)
 }
 func (m *Page) XXX_Size() int {
 	return xxx_messageInfo_Page.Size(m)
@@ -420,16 +432,17 @@ func (m *Block) Reset()         { *m = Block{} }
 func (m *Block) String() string { return proto.CompactTextString(m) }
 func (*Block) ProtoMessage()    {}
 func (*Block) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{2}
+	return fileDescriptor_74ab7e2078bf72c5, []int{2}
 }
+
 func (m *Block) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Block.Unmarshal(m, b)
 }
 func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
 }
-func (dst *Block) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Block.Merge(dst, src)
+func (m *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(m, src)
 }
 func (m *Block) XXX_Size() int {
 	return xxx_messageInfo_Block.Size(m)
@@ -508,16 +521,17 @@ func (m *Paragraph) Reset()         { *m = Paragraph{} }
 func (m *Paragraph) String() string { return proto.CompactTextString(m) }
 func (*Paragraph) ProtoMessage()    {}
 func (*Paragraph) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{3}
+	return fileDescriptor_74ab7e2078bf72c5, []int{3}
 }
+
 func (m *Paragraph) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
 }
 func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
 }
-func (dst *Paragraph) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Paragraph.Merge(dst, src)
+func (m *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(m, src)
 }
 func (m *Paragraph) XXX_Size() int {
 	return xxx_messageInfo_Paragraph.Size(m)
@@ -590,16 +604,17 @@ func (m *Word) Reset()         { *m = Word{} }
 func (m *Word) String() string { return proto.CompactTextString(m) }
 func (*Word) ProtoMessage()    {}
 func (*Word) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{4}
+	return fileDescriptor_74ab7e2078bf72c5, []int{4}
 }
+
 func (m *Word) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Word.Unmarshal(m, b)
 }
 func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
 }
-func (dst *Word) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Word.Merge(dst, src)
+func (m *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(m, src)
 }
 func (m *Word) XXX_Size() int {
 	return xxx_messageInfo_Word.Size(m)
@@ -671,16 +686,17 @@ func (m *Symbol) Reset()         { *m = Symbol{} }
 func (m *Symbol) String() string { return proto.CompactTextString(m) }
 func (*Symbol) ProtoMessage()    {}
 func (*Symbol) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_66d065b83e9aab34, []int{5}
+	return fileDescriptor_74ab7e2078bf72c5, []int{5}
 }
+
 func (m *Symbol) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Symbol.Unmarshal(m, b)
 }
 func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
 }
-func (dst *Symbol) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Symbol.Merge(dst, src)
+func (m *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(m, src)
 }
 func (m *Symbol) XXX_Size() int {
 	return xxx_messageInfo_Symbol.Size(m)
@@ -720,6 +736,8 @@ func (m *Symbol) GetConfidence() float32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p1beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
+	proto.RegisterEnum("google.cloud.vision.v1p1beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.vision.v1p1beta1.TextAnnotation")
 	proto.RegisterType((*TextAnnotation_DetectedLanguage)(nil), "google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage")
 	proto.RegisterType((*TextAnnotation_DetectedBreak)(nil), "google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak")
@@ -729,15 +747,13 @@ func init() {
 	proto.RegisterType((*Paragraph)(nil), "google.cloud.vision.v1p1beta1.Paragraph")
 	proto.RegisterType((*Word)(nil), "google.cloud.vision.v1p1beta1.Word")
 	proto.RegisterType((*Symbol)(nil), "google.cloud.vision.v1p1beta1.Symbol")
-	proto.RegisterEnum("google.cloud.vision.v1p1beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
-	proto.RegisterEnum("google.cloud.vision.v1p1beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p1beta1/text_annotation.proto", fileDescriptor_text_annotation_66d065b83e9aab34)
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/text_annotation.proto", fileDescriptor_74ab7e2078bf72c5)
 }
 
-var fileDescriptor_text_annotation_66d065b83e9aab34 = []byte{
+var fileDescriptor_74ab7e2078bf72c5 = []byte{
 	// 775 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xd3, 0x48,
 	0x14, 0x5f, 0x27, 0x76, 0x1a, 0xbf, 0xb4, 0x91, 0x77, 0x76, 0xb5, 0x8a, 0xb2, 0xbb, 0xa8, 0xa4,
diff --git a/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go b/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
index 3cf6181d35..5f9cc00b99 100644
--- a/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Relevant information for the image from the Internet.
 type WebDetection struct {
@@ -45,16 +48,17 @@ func (m *WebDetection) Reset()         { *m = WebDetection{} }
 func (m *WebDetection) String() string { return proto.CompactTextString(m) }
 func (*WebDetection) ProtoMessage()    {}
 func (*WebDetection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_fd6fa85ea390cf49, []int{0}
+	return fileDescriptor_ba190e118244c98b, []int{0}
 }
+
 func (m *WebDetection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
 }
 func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection.Merge(dst, src)
+func (m *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(m, src)
 }
 func (m *WebDetection) XXX_Size() int {
 	return xxx_messageInfo_WebDetection.Size(m)
@@ -125,16 +129,17 @@ func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{}
 func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebEntity) ProtoMessage()    {}
 func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_fd6fa85ea390cf49, []int{0, 0}
+	return fileDescriptor_ba190e118244c98b, []int{0, 0}
 }
+
 func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
 }
 func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+func (m *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(m, src)
 }
 func (m *WebDetection_WebEntity) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
@@ -181,16 +186,17 @@ func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
 func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebImage) ProtoMessage()    {}
 func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_fd6fa85ea390cf49, []int{0, 1}
+	return fileDescriptor_ba190e118244c98b, []int{0, 1}
 }
+
 func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+func (m *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(m, src)
 }
 func (m *WebDetection_WebImage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebImage.Size(m)
@@ -240,16 +246,17 @@ func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
 func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebPage) ProtoMessage()    {}
 func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_fd6fa85ea390cf49, []int{0, 2}
+	return fileDescriptor_ba190e118244c98b, []int{0, 2}
 }
+
 func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+func (m *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(m, src)
 }
 func (m *WebDetection_WebPage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebPage.Size(m)
@@ -312,16 +319,17 @@ func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
 func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebLabel) ProtoMessage()    {}
 func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_fd6fa85ea390cf49, []int{0, 3}
+	return fileDescriptor_ba190e118244c98b, []int{0, 3}
 }
+
 func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
 }
 func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+func (m *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(m, src)
 }
 func (m *WebDetection_WebLabel) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
@@ -355,10 +363,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p1beta1/web_detection.proto", fileDescriptor_web_detection_fd6fa85ea390cf49)
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/web_detection.proto", fileDescriptor_ba190e118244c98b)
 }
 
-var fileDescriptor_web_detection_fd6fa85ea390cf49 = []byte{
+var fileDescriptor_ba190e118244c98b = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
 	0x18, 0xc6, 0x95, 0x76, 0x1b, 0x8b, 0x5b, 0x04, 0xb3, 0x86, 0x16, 0x05, 0x26, 0x15, 0xb8, 0xf4,
diff --git a/googleapis/cloud/vision/v1p2beta1/geometry.pb.go b/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
index c61a4ff03c..12448b32fb 100644
--- a/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A vertex represents a 2D point in the image.
 // NOTE: the vertex coordinates are in the same scale as the original image.
@@ -34,16 +37,17 @@ func (m *Vertex) Reset()         { *m = Vertex{} }
 func (m *Vertex) String() string { return proto.CompactTextString(m) }
 func (*Vertex) ProtoMessage()    {}
 func (*Vertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_9c5927b87470c5c2, []int{0}
+	return fileDescriptor_e749cb92138e5a14, []int{0}
 }
+
 func (m *Vertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vertex.Unmarshal(m, b)
 }
 func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
 }
-func (dst *Vertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vertex.Merge(dst, src)
+func (m *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(m, src)
 }
 func (m *Vertex) XXX_Size() int {
 	return xxx_messageInfo_Vertex.Size(m)
@@ -85,16 +89,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_9c5927b87470c5c2, []int{1}
+	return fileDescriptor_e749cb92138e5a14, []int{1}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -134,16 +139,17 @@ func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
 func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*BoundingPoly) ProtoMessage()    {}
 func (*BoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_9c5927b87470c5c2, []int{2}
+	return fileDescriptor_e749cb92138e5a14, []int{2}
 }
+
 func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
 }
 func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+func (m *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(m, src)
 }
 func (m *BoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_BoundingPoly.Size(m)
@@ -187,16 +193,17 @@ func (m *Position) Reset()         { *m = Position{} }
 func (m *Position) String() string { return proto.CompactTextString(m) }
 func (*Position) ProtoMessage()    {}
 func (*Position) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_9c5927b87470c5c2, []int{3}
+	return fileDescriptor_e749cb92138e5a14, []int{3}
 }
+
 func (m *Position) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Position.Unmarshal(m, b)
 }
 func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
 }
-func (dst *Position) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Position.Merge(dst, src)
+func (m *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(m, src)
 }
 func (m *Position) XXX_Size() int {
 	return xxx_messageInfo_Position.Size(m)
@@ -236,10 +243,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p2beta1/geometry.proto", fileDescriptor_geometry_9c5927b87470c5c2)
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/geometry.proto", fileDescriptor_e749cb92138e5a14)
 }
 
-var fileDescriptor_geometry_9c5927b87470c5c2 = []byte{
+var fileDescriptor_e749cb92138e5a14 = []byte{
 	// 283 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xc1, 0x4b, 0xc3, 0x30,
 	0x14, 0xc6, 0x49, 0x87, 0x63, 0xc4, 0x09, 0x52, 0x2f, 0xbd, 0x08, 0xb3, 0x28, 0xec, 0x20, 0x09,
diff --git a/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go b/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
index b300cb6ad4..aca545b87c 100644
--- a/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
@@ -56,6 +56,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"UNKNOWN":       0,
 	"VERY_UNLIKELY": 1,
@@ -68,8 +69,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{0}
+	return fileDescriptor_357ce83580ed3103, []int{0}
 }
 
 // Type of Google Cloud Vision API feature to be extracted.
@@ -118,6 +120,7 @@ var Feature_Type_name = map[int32]string{
 	9:  "CROP_HINTS",
 	10: "WEB_DETECTION",
 }
+
 var Feature_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":        0,
 	"FACE_DETECTION":          1,
@@ -135,8 +138,9 @@ var Feature_Type_value = map[string]int32{
 func (x Feature_Type) String() string {
 	return proto.EnumName(Feature_Type_name, int32(x))
 }
+
 func (Feature_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{0, 0}
+	return fileDescriptor_357ce83580ed3103, []int{0, 0}
 }
 
 // Face landmark (feature) type.
@@ -255,6 +259,7 @@ var FaceAnnotation_Landmark_Type_name = map[int32]string{
 	33: "CHIN_LEFT_GONION",
 	34: "CHIN_RIGHT_GONION",
 }
+
 var FaceAnnotation_Landmark_Type_value = map[string]int32{
 	"UNKNOWN_LANDMARK":             0,
 	"LEFT_EYE":                     1,
@@ -296,8 +301,9 @@ var FaceAnnotation_Landmark_Type_value = map[string]int32{
 func (x FaceAnnotation_Landmark_Type) String() string {
 	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
 }
+
 func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{3, 0, 0}
+	return fileDescriptor_357ce83580ed3103, []int{3, 0, 0}
 }
 
 // Batch operation states.
@@ -323,6 +329,7 @@ var OperationMetadata_State_name = map[int32]string{
 	3: "DONE",
 	4: "CANCELLED",
 }
+
 var OperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATED":           1,
@@ -334,8 +341,9 @@ var OperationMetadata_State_value = map[string]int32{
 func (x OperationMetadata_State) String() string {
 	return proto.EnumName(OperationMetadata_State_name, int32(x))
 }
+
 func (OperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{31, 0}
+	return fileDescriptor_357ce83580ed3103, []int{31, 0}
 }
 
 // The type of Google Cloud Vision API detection to perform, and the maximum
@@ -360,16 +368,17 @@ func (m *Feature) Reset()         { *m = Feature{} }
 func (m *Feature) String() string { return proto.CompactTextString(m) }
 func (*Feature) ProtoMessage()    {}
 func (*Feature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{0}
+	return fileDescriptor_357ce83580ed3103, []int{0}
 }
+
 func (m *Feature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feature.Unmarshal(m, b)
 }
 func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
 }
-func (dst *Feature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feature.Merge(dst, src)
+func (m *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(m, src)
 }
 func (m *Feature) XXX_Size() int {
 	return xxx_messageInfo_Feature.Size(m)
@@ -437,16 +446,17 @@ func (m *ImageSource) Reset()         { *m = ImageSource{} }
 func (m *ImageSource) String() string { return proto.CompactTextString(m) }
 func (*ImageSource) ProtoMessage()    {}
 func (*ImageSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{1}
+	return fileDescriptor_357ce83580ed3103, []int{1}
 }
+
 func (m *ImageSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
 }
 func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
 }
-func (dst *ImageSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageSource.Merge(dst, src)
+func (m *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(m, src)
 }
 func (m *ImageSource) XXX_Size() int {
 	return xxx_messageInfo_ImageSource.Size(m)
@@ -490,16 +500,17 @@ func (m *Image) Reset()         { *m = Image{} }
 func (m *Image) String() string { return proto.CompactTextString(m) }
 func (*Image) ProtoMessage()    {}
 func (*Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{2}
+	return fileDescriptor_357ce83580ed3103, []int{2}
 }
+
 func (m *Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Image.Unmarshal(m, b)
 }
 func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
 }
-func (dst *Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Image.Merge(dst, src)
+func (m *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(m, src)
 }
 func (m *Image) XXX_Size() int {
 	return xxx_messageInfo_Image.Size(m)
@@ -581,16 +592,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{3}
+	return fileDescriptor_357ce83580ed3103, []int{3}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -721,16 +733,17 @@ func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark
 func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation_Landmark) ProtoMessage()    {}
 func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{3, 0}
+	return fileDescriptor_357ce83580ed3103, []int{3, 0}
 }
+
 func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
 }
 func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+func (m *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(m, src)
 }
 func (m *FaceAnnotation_Landmark) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
@@ -768,16 +781,17 @@ func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
 func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
 func (*LocationInfo) ProtoMessage()    {}
 func (*LocationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{4}
+	return fileDescriptor_357ce83580ed3103, []int{4}
 }
+
 func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
 }
 func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
 }
-func (dst *LocationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationInfo.Merge(dst, src)
+func (m *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(m, src)
 }
 func (m *LocationInfo) XXX_Size() int {
 	return xxx_messageInfo_LocationInfo.Size(m)
@@ -812,16 +826,17 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{5}
+	return fileDescriptor_357ce83580ed3103, []int{5}
 }
+
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(dst, src)
+func (m *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(m, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -899,16 +914,17 @@ func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
 func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
 func (*EntityAnnotation) ProtoMessage()    {}
 func (*EntityAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{6}
+	return fileDescriptor_357ce83580ed3103, []int{6}
 }
+
 func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
 }
 func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+func (m *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(m, src)
 }
 func (m *EntityAnnotation) XXX_Size() int {
 	return xxx_messageInfo_EntityAnnotation.Size(m)
@@ -1012,16 +1028,17 @@ func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
 func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
 func (*SafeSearchAnnotation) ProtoMessage()    {}
 func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{7}
+	return fileDescriptor_357ce83580ed3103, []int{7}
 }
+
 func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
 }
 func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+func (m *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(m, src)
 }
 func (m *SafeSearchAnnotation) XXX_Size() int {
 	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
@@ -1082,16 +1099,17 @@ func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
 func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
 func (*LatLongRect) ProtoMessage()    {}
 func (*LatLongRect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{8}
+	return fileDescriptor_357ce83580ed3103, []int{8}
 }
+
 func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
 }
 func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
 }
-func (dst *LatLongRect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LatLongRect.Merge(dst, src)
+func (m *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(m, src)
 }
 func (m *LatLongRect) XXX_Size() int {
 	return xxx_messageInfo_LatLongRect.Size(m)
@@ -1135,16 +1153,17 @@ func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
 func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
 func (*ColorInfo) ProtoMessage()    {}
 func (*ColorInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{9}
+	return fileDescriptor_357ce83580ed3103, []int{9}
 }
+
 func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
 }
 func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
 }
-func (dst *ColorInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColorInfo.Merge(dst, src)
+func (m *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(m, src)
 }
 func (m *ColorInfo) XXX_Size() int {
 	return xxx_messageInfo_ColorInfo.Size(m)
@@ -1189,16 +1208,17 @@ func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotati
 func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*DominantColorsAnnotation) ProtoMessage()    {}
 func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{10}
+	return fileDescriptor_357ce83580ed3103, []int{10}
 }
+
 func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
 }
 func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+func (m *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(m, src)
 }
 func (m *DominantColorsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
@@ -1229,16 +1249,17 @@ func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
 func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
 func (*ImageProperties) ProtoMessage()    {}
 func (*ImageProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{11}
+	return fileDescriptor_357ce83580ed3103, []int{11}
 }
+
 func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
 }
 func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
 }
-func (dst *ImageProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageProperties.Merge(dst, src)
+func (m *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(m, src)
 }
 func (m *ImageProperties) XXX_Size() int {
 	return xxx_messageInfo_ImageProperties.Size(m)
@@ -1275,16 +1296,17 @@ func (m *CropHint) Reset()         { *m = CropHint{} }
 func (m *CropHint) String() string { return proto.CompactTextString(m) }
 func (*CropHint) ProtoMessage()    {}
 func (*CropHint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{12}
+	return fileDescriptor_357ce83580ed3103, []int{12}
 }
+
 func (m *CropHint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHint.Unmarshal(m, b)
 }
 func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
 }
-func (dst *CropHint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHint.Merge(dst, src)
+func (m *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(m, src)
 }
 func (m *CropHint) XXX_Size() int {
 	return xxx_messageInfo_CropHint.Size(m)
@@ -1329,16 +1351,17 @@ func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
 func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*CropHintsAnnotation) ProtoMessage()    {}
 func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{13}
+	return fileDescriptor_357ce83580ed3103, []int{13}
 }
+
 func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
 }
 func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+func (m *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(m, src)
 }
 func (m *CropHintsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_CropHintsAnnotation.Size(m)
@@ -1374,16 +1397,17 @@ func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
 func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
 func (*CropHintsParams) ProtoMessage()    {}
 func (*CropHintsParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{14}
+	return fileDescriptor_357ce83580ed3103, []int{14}
 }
+
 func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
 }
 func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+func (m *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(m, src)
 }
 func (m *CropHintsParams) XXX_Size() int {
 	return xxx_messageInfo_CropHintsParams.Size(m)
@@ -1414,16 +1438,17 @@ func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
 func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
 func (*WebDetectionParams) ProtoMessage()    {}
 func (*WebDetectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{15}
+	return fileDescriptor_357ce83580ed3103, []int{15}
 }
+
 func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
 }
 func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
 }
-func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+func (m *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(m, src)
 }
 func (m *WebDetectionParams) XXX_Size() int {
 	return xxx_messageInfo_WebDetectionParams.Size(m)
@@ -1467,16 +1492,17 @@ func (m *ImageContext) Reset()         { *m = ImageContext{} }
 func (m *ImageContext) String() string { return proto.CompactTextString(m) }
 func (*ImageContext) ProtoMessage()    {}
 func (*ImageContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{16}
+	return fileDescriptor_357ce83580ed3103, []int{16}
 }
+
 func (m *ImageContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
 }
 func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageContext.Merge(dst, src)
+func (m *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(m, src)
 }
 func (m *ImageContext) XXX_Size() int {
 	return xxx_messageInfo_ImageContext.Size(m)
@@ -1533,16 +1559,17 @@ func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
 func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageRequest) ProtoMessage()    {}
 func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{17}
+	return fileDescriptor_357ce83580ed3103, []int{17}
 }
+
 func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
 }
 func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+func (m *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(m, src)
 }
 func (m *AnnotateImageRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageRequest.Size(m)
@@ -1591,16 +1618,17 @@ func (m *ImageAnnotationContext) Reset()         { *m = ImageAnnotationContext{}
 func (m *ImageAnnotationContext) String() string { return proto.CompactTextString(m) }
 func (*ImageAnnotationContext) ProtoMessage()    {}
 func (*ImageAnnotationContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{18}
+	return fileDescriptor_357ce83580ed3103, []int{18}
 }
+
 func (m *ImageAnnotationContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageAnnotationContext.Unmarshal(m, b)
 }
 func (m *ImageAnnotationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageAnnotationContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageAnnotationContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageAnnotationContext.Merge(dst, src)
+func (m *ImageAnnotationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAnnotationContext.Merge(m, src)
 }
 func (m *ImageAnnotationContext) XXX_Size() int {
 	return xxx_messageInfo_ImageAnnotationContext.Size(m)
@@ -1666,16 +1694,17 @@ func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
 func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageResponse) ProtoMessage()    {}
 func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{19}
+	return fileDescriptor_357ce83580ed3103, []int{19}
 }
+
 func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
 }
 func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+func (m *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(m, src)
 }
 func (m *AnnotateImageResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageResponse.Size(m)
@@ -1786,16 +1815,17 @@ func (m *AnnotateFileResponse) Reset()         { *m = AnnotateFileResponse{} }
 func (m *AnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateFileResponse) ProtoMessage()    {}
 func (*AnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{20}
+	return fileDescriptor_357ce83580ed3103, []int{20}
 }
+
 func (m *AnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateFileResponse.Merge(dst, src)
+func (m *AnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileResponse.Merge(m, src)
 }
 func (m *AnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateFileResponse.Size(m)
@@ -1833,16 +1863,17 @@ func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesR
 func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
 func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{21}
+	return fileDescriptor_357ce83580ed3103, []int{21}
 }
+
 func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+func (m *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(m, src)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
@@ -1873,16 +1904,17 @@ func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImages
 func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
 func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{22}
+	return fileDescriptor_357ce83580ed3103, []int{22}
 }
+
 func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+func (m *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(m, src)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
@@ -1919,16 +1951,17 @@ func (m *AsyncAnnotateFileRequest) Reset()         { *m = AsyncAnnotateFileReque
 func (m *AsyncAnnotateFileRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileRequest) ProtoMessage()    {}
 func (*AsyncAnnotateFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{23}
+	return fileDescriptor_357ce83580ed3103, []int{23}
 }
+
 func (m *AsyncAnnotateFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(dst, src)
+func (m *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(m, src)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Size(m)
@@ -1980,16 +2013,17 @@ func (m *AsyncAnnotateFileResponse) Reset()         { *m = AsyncAnnotateFileResp
 func (m *AsyncAnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileResponse) ProtoMessage()    {}
 func (*AsyncAnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{24}
+	return fileDescriptor_357ce83580ed3103, []int{24}
 }
+
 func (m *AsyncAnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(dst, src)
+func (m *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(m, src)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Size(m)
@@ -2021,16 +2055,17 @@ func (m *AsyncBatchAnnotateFilesRequest) Reset()         { *m = AsyncBatchAnnota
 func (m *AsyncBatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesRequest) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{25}
+	return fileDescriptor_357ce83580ed3103, []int{25}
 }
+
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Size(m)
@@ -2062,16 +2097,17 @@ func (m *AsyncBatchAnnotateFilesResponse) Reset()         { *m = AsyncBatchAnnot
 func (m *AsyncBatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesResponse) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{26}
+	return fileDescriptor_357ce83580ed3103, []int{26}
 }
+
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Size(m)
@@ -2105,16 +2141,17 @@ func (m *InputConfig) Reset()         { *m = InputConfig{} }
 func (m *InputConfig) String() string { return proto.CompactTextString(m) }
 func (*InputConfig) ProtoMessage()    {}
 func (*InputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{27}
+	return fileDescriptor_357ce83580ed3103, []int{27}
 }
+
 func (m *InputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
 }
 func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputConfig.Merge(dst, src)
+func (m *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(m, src)
 }
 func (m *InputConfig) XXX_Size() int {
 	return xxx_messageInfo_InputConfig.Size(m)
@@ -2163,16 +2200,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{28}
+	return fileDescriptor_357ce83580ed3103, []int{28}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -2211,16 +2249,17 @@ func (m *GcsSource) Reset()         { *m = GcsSource{} }
 func (m *GcsSource) String() string { return proto.CompactTextString(m) }
 func (*GcsSource) ProtoMessage()    {}
 func (*GcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{29}
+	return fileDescriptor_357ce83580ed3103, []int{29}
 }
+
 func (m *GcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
 }
 func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
 }
-func (dst *GcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsSource.Merge(dst, src)
+func (m *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(m, src)
 }
 func (m *GcsSource) XXX_Size() int {
 	return xxx_messageInfo_GcsSource.Size(m)
@@ -2265,16 +2304,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{30}
+	return fileDescriptor_357ce83580ed3103, []int{30}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -2309,16 +2349,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_3f9c4b0d06e54350, []int{31}
+	return fileDescriptor_357ce83580ed3103, []int{31}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -2351,6 +2392,10 @@ func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
 	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1p2beta1.Feature")
 	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1p2beta1.ImageSource")
 	proto.RegisterType((*Image)(nil), "google.cloud.vision.v1p2beta1.Image")
@@ -2384,136 +2429,13 @@ func init() {
 	proto.RegisterType((*GcsSource)(nil), "google.cloud.vision.v1p2beta1.GcsSource")
 	proto.RegisterType((*GcsDestination)(nil), "google.cloud.vision.v1p2beta1.GcsDestination")
 	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.vision.v1p2beta1.OperationMetadata")
-	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1p2beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1p2beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ImageAnnotatorClient is the client API for ImageAnnotator service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ImageAnnotatorClient interface {
-	// Run image detection and annotation for a batch of images.
-	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
-	// Run async image detection and annotation for a list of generic files (e.g.
-	// PDF) which may contain multiple pages and multiple images per page.
-	// Progress and results can be retrieved through the
-	// `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `OperationMetadata` (metadata).
-	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
-	AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-}
-
-type imageAnnotatorClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
-	return &imageAnnotatorClient{cc}
-}
-
-func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
-	out := new(BatchAnnotateImagesResponse)
-	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p2beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *imageAnnotatorClient) AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
-	out := new(longrunning.Operation)
-	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p2beta1.ImageAnnotator/AsyncBatchAnnotateFiles", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ImageAnnotatorServer is the server API for ImageAnnotator service.
-type ImageAnnotatorServer interface {
-	// Run image detection and annotation for a batch of images.
-	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
-	// Run async image detection and annotation for a list of generic files (e.g.
-	// PDF) which may contain multiple pages and multiple images per page.
-	// Progress and results can be retrieved through the
-	// `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `OperationMetadata` (metadata).
-	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
-	AsyncBatchAnnotateFiles(context.Context, *AsyncBatchAnnotateFilesRequest) (*longrunning.Operation, error)
-}
-
-func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
-	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
-}
-
-func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BatchAnnotateImagesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.vision.v1p2beta1.ImageAnnotator/BatchAnnotateImages",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ImageAnnotator_AsyncBatchAnnotateFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AsyncBatchAnnotateFilesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.vision.v1p2beta1.ImageAnnotator/AsyncBatchAnnotateFiles",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, req.(*AsyncBatchAnnotateFilesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.vision.v1p2beta1.ImageAnnotator",
-	HandlerType: (*ImageAnnotatorServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "BatchAnnotateImages",
-			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
-		},
-		{
-			MethodName: "AsyncBatchAnnotateFiles",
-			Handler:    _ImageAnnotator_AsyncBatchAnnotateFiles_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/vision/v1p2beta1/image_annotator.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p2beta1/image_annotator.proto", fileDescriptor_image_annotator_3f9c4b0d06e54350)
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/image_annotator.proto", fileDescriptor_357ce83580ed3103)
 }
 
-var fileDescriptor_image_annotator_3f9c4b0d06e54350 = []byte{
+var fileDescriptor_357ce83580ed3103 = []byte{
 	// 2899 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x73, 0xdb, 0xc6,
 	0xf5, 0x0f, 0xa9, 0x5f, 0xe4, 0x23, 0x25, 0x41, 0xab, 0x1f, 0xa6, 0x65, 0x2b, 0x56, 0x90, 0x6f,
@@ -2698,3 +2620,122 @@ var fileDescriptor_image_annotator_3f9c4b0d06e54350 = []byte{
 	0xce, 0x17, 0x19, 0xe4, 0xfe, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xcd, 0x74, 0xeb, 0xe8,
 	0x22, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ImageAnnotatorClient is the client API for ImageAnnotator service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ImageAnnotatorClient interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
+	// Run async image detection and annotation for a list of generic files (e.g.
+	// PDF) which may contain multiple pages and multiple images per page.
+	// Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type imageAnnotatorClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
+	return &imageAnnotatorClient{cc}
+}
+
+func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
+	out := new(BatchAnnotateImagesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p2beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *imageAnnotatorClient) AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p2beta1.ImageAnnotator/AsyncBatchAnnotateFiles", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ImageAnnotatorServer is the server API for ImageAnnotator service.
+type ImageAnnotatorServer interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
+	// Run async image detection and annotation for a list of generic files (e.g.
+	// PDF) which may contain multiple pages and multiple images per page.
+	// Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(context.Context, *AsyncBatchAnnotateFilesRequest) (*longrunning.Operation, error)
+}
+
+func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
+	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
+}
+
+func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchAnnotateImagesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p2beta1.ImageAnnotator/BatchAnnotateImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ImageAnnotator_AsyncBatchAnnotateFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AsyncBatchAnnotateFilesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p2beta1.ImageAnnotator/AsyncBatchAnnotateFiles",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, req.(*AsyncBatchAnnotateFilesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.vision.v1p2beta1.ImageAnnotator",
+	HandlerType: (*ImageAnnotatorServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "BatchAnnotateImages",
+			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
+		},
+		{
+			MethodName: "AsyncBatchAnnotateFiles",
+			Handler:    _ImageAnnotator_AsyncBatchAnnotateFiles_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/vision/v1p2beta1/image_annotator.proto",
+}
diff --git a/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go b/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
index 99c9960135..4ba0c3419e 100644
--- a/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum to denote the type of break found. New line, space etc.
 type TextAnnotation_DetectedBreak_BreakType int32
@@ -46,6 +49,7 @@ var TextAnnotation_DetectedBreak_BreakType_name = map[int32]string{
 	4: "HYPHEN",
 	5: "LINE_BREAK",
 }
+
 var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 	"UNKNOWN":        0,
 	"SPACE":          1,
@@ -58,8 +62,9 @@ var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 func (x TextAnnotation_DetectedBreak_BreakType) String() string {
 	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
 }
+
 func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{0, 1, 0}
+	return fileDescriptor_5d838ababbc8449e, []int{0, 1, 0}
 }
 
 // Type of a block (text, image etc) as identified by OCR.
@@ -88,6 +93,7 @@ var Block_BlockType_name = map[int32]string{
 	4: "RULER",
 	5: "BARCODE",
 }
+
 var Block_BlockType_value = map[string]int32{
 	"UNKNOWN": 0,
 	"TEXT":    1,
@@ -100,8 +106,9 @@ var Block_BlockType_value = map[string]int32{
 func (x Block_BlockType) String() string {
 	return proto.EnumName(Block_BlockType_name, int32(x))
 }
+
 func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{2, 0}
+	return fileDescriptor_5d838ababbc8449e, []int{2, 0}
 }
 
 // TextAnnotation contains a structured representation of OCR extracted text.
@@ -126,16 +133,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{0}
+	return fileDescriptor_5d838ababbc8449e, []int{0}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -177,16 +185,17 @@ func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_
 func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
 func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{0, 0}
+	return fileDescriptor_5d838ababbc8449e, []int{0, 0}
 }
+
 func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+func (m *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
@@ -226,16 +235,17 @@ func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_Det
 func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
 func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{0, 1}
+	return fileDescriptor_5d838ababbc8449e, []int{0, 1}
 }
+
 func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+func (m *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
@@ -275,16 +285,17 @@ func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_Text
 func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_TextProperty) ProtoMessage()    {}
 func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{0, 2}
+	return fileDescriptor_5d838ababbc8449e, []int{0, 2}
 }
+
 func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
 }
 func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+func (m *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(m, src)
 }
 func (m *TextAnnotation_TextProperty) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
@@ -332,16 +343,17 @@ func (m *Page) Reset()         { *m = Page{} }
 func (m *Page) String() string { return proto.CompactTextString(m) }
 func (*Page) ProtoMessage()    {}
 func (*Page) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{1}
+	return fileDescriptor_5d838ababbc8449e, []int{1}
 }
+
 func (m *Page) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Page.Unmarshal(m, b)
 }
 func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
 }
-func (dst *Page) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Page.Merge(dst, src)
+func (m *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(m, src)
 }
 func (m *Page) XXX_Size() int {
 	return xxx_messageInfo_Page.Size(m)
@@ -427,16 +439,17 @@ func (m *Block) Reset()         { *m = Block{} }
 func (m *Block) String() string { return proto.CompactTextString(m) }
 func (*Block) ProtoMessage()    {}
 func (*Block) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{2}
+	return fileDescriptor_5d838ababbc8449e, []int{2}
 }
+
 func (m *Block) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Block.Unmarshal(m, b)
 }
 func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
 }
-func (dst *Block) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Block.Merge(dst, src)
+func (m *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(m, src)
 }
 func (m *Block) XXX_Size() int {
 	return xxx_messageInfo_Block.Size(m)
@@ -515,16 +528,17 @@ func (m *Paragraph) Reset()         { *m = Paragraph{} }
 func (m *Paragraph) String() string { return proto.CompactTextString(m) }
 func (*Paragraph) ProtoMessage()    {}
 func (*Paragraph) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{3}
+	return fileDescriptor_5d838ababbc8449e, []int{3}
 }
+
 func (m *Paragraph) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
 }
 func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
 }
-func (dst *Paragraph) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Paragraph.Merge(dst, src)
+func (m *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(m, src)
 }
 func (m *Paragraph) XXX_Size() int {
 	return xxx_messageInfo_Paragraph.Size(m)
@@ -597,16 +611,17 @@ func (m *Word) Reset()         { *m = Word{} }
 func (m *Word) String() string { return proto.CompactTextString(m) }
 func (*Word) ProtoMessage()    {}
 func (*Word) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{4}
+	return fileDescriptor_5d838ababbc8449e, []int{4}
 }
+
 func (m *Word) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Word.Unmarshal(m, b)
 }
 func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
 }
-func (dst *Word) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Word.Merge(dst, src)
+func (m *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(m, src)
 }
 func (m *Word) XXX_Size() int {
 	return xxx_messageInfo_Word.Size(m)
@@ -678,16 +693,17 @@ func (m *Symbol) Reset()         { *m = Symbol{} }
 func (m *Symbol) String() string { return proto.CompactTextString(m) }
 func (*Symbol) ProtoMessage()    {}
 func (*Symbol) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_233617d1b400f277, []int{5}
+	return fileDescriptor_5d838ababbc8449e, []int{5}
 }
+
 func (m *Symbol) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Symbol.Unmarshal(m, b)
 }
 func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
 }
-func (dst *Symbol) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Symbol.Merge(dst, src)
+func (m *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(m, src)
 }
 func (m *Symbol) XXX_Size() int {
 	return xxx_messageInfo_Symbol.Size(m)
@@ -727,6 +743,8 @@ func (m *Symbol) GetConfidence() float32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.vision.v1p2beta1.TextAnnotation")
 	proto.RegisterType((*TextAnnotation_DetectedLanguage)(nil), "google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage")
 	proto.RegisterType((*TextAnnotation_DetectedBreak)(nil), "google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak")
@@ -736,15 +754,13 @@ func init() {
 	proto.RegisterType((*Paragraph)(nil), "google.cloud.vision.v1p2beta1.Paragraph")
 	proto.RegisterType((*Word)(nil), "google.cloud.vision.v1p2beta1.Word")
 	proto.RegisterType((*Symbol)(nil), "google.cloud.vision.v1p2beta1.Symbol")
-	proto.RegisterEnum("google.cloud.vision.v1p2beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
-	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p2beta1/text_annotation.proto", fileDescriptor_text_annotation_233617d1b400f277)
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/text_annotation.proto", fileDescriptor_5d838ababbc8449e)
 }
 
-var fileDescriptor_text_annotation_233617d1b400f277 = []byte{
+var fileDescriptor_5d838ababbc8449e = []byte{
 	// 774 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xd3, 0x48,
 	0x14, 0x5f, 0x27, 0x76, 0x1a, 0xbf, 0xb4, 0x91, 0x77, 0x76, 0xb5, 0x8a, 0xb2, 0xbb, 0xa8, 0xa4,
diff --git a/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go b/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
index 15a9f14d87..208d0e5763 100644
--- a/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p2beta1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Relevant information for the image from the Internet.
 type WebDetection struct {
@@ -45,16 +48,17 @@ func (m *WebDetection) Reset()         { *m = WebDetection{} }
 func (m *WebDetection) String() string { return proto.CompactTextString(m) }
 func (*WebDetection) ProtoMessage()    {}
 func (*WebDetection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_1ca040388105f0cb, []int{0}
+	return fileDescriptor_c9258baccea8b1f2, []int{0}
 }
+
 func (m *WebDetection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
 }
 func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection.Merge(dst, src)
+func (m *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(m, src)
 }
 func (m *WebDetection) XXX_Size() int {
 	return xxx_messageInfo_WebDetection.Size(m)
@@ -125,16 +129,17 @@ func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{}
 func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebEntity) ProtoMessage()    {}
 func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_1ca040388105f0cb, []int{0, 0}
+	return fileDescriptor_c9258baccea8b1f2, []int{0, 0}
 }
+
 func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
 }
 func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+func (m *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(m, src)
 }
 func (m *WebDetection_WebEntity) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
@@ -181,16 +186,17 @@ func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
 func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebImage) ProtoMessage()    {}
 func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_1ca040388105f0cb, []int{0, 1}
+	return fileDescriptor_c9258baccea8b1f2, []int{0, 1}
 }
+
 func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+func (m *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(m, src)
 }
 func (m *WebDetection_WebImage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebImage.Size(m)
@@ -240,16 +246,17 @@ func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
 func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebPage) ProtoMessage()    {}
 func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_1ca040388105f0cb, []int{0, 2}
+	return fileDescriptor_c9258baccea8b1f2, []int{0, 2}
 }
+
 func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+func (m *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(m, src)
 }
 func (m *WebDetection_WebPage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebPage.Size(m)
@@ -312,16 +319,17 @@ func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
 func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebLabel) ProtoMessage()    {}
 func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_1ca040388105f0cb, []int{0, 3}
+	return fileDescriptor_c9258baccea8b1f2, []int{0, 3}
 }
+
 func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
 }
 func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+func (m *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(m, src)
 }
 func (m *WebDetection_WebLabel) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
@@ -355,10 +363,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p2beta1/web_detection.proto", fileDescriptor_web_detection_1ca040388105f0cb)
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/web_detection.proto", fileDescriptor_c9258baccea8b1f2)
 }
 
-var fileDescriptor_web_detection_1ca040388105f0cb = []byte{
+var fileDescriptor_c9258baccea8b1f2 = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
 	0x18, 0xc6, 0x95, 0x76, 0x1b, 0x8d, 0x5b, 0x04, 0xb3, 0x86, 0x16, 0x05, 0x26, 0x15, 0xb8, 0xf4,
diff --git a/googleapis/cloud/vision/v1p3beta1/geometry.pb.go b/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
index 79e2d47ba5..9bfdf673b6 100644
--- a/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A vertex represents a 2D point in the image.
 // NOTE: the vertex coordinates are in the same scale as the original image.
@@ -35,16 +38,17 @@ func (m *Vertex) Reset()         { *m = Vertex{} }
 func (m *Vertex) String() string { return proto.CompactTextString(m) }
 func (*Vertex) ProtoMessage()    {}
 func (*Vertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_eec0e7cba47b2d57, []int{0}
+	return fileDescriptor_41f6dd02aceb81a1, []int{0}
 }
+
 func (m *Vertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vertex.Unmarshal(m, b)
 }
 func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
 }
-func (dst *Vertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vertex.Merge(dst, src)
+func (m *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(m, src)
 }
 func (m *Vertex) XXX_Size() int {
 	return xxx_messageInfo_Vertex.Size(m)
@@ -86,16 +90,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_eec0e7cba47b2d57, []int{1}
+	return fileDescriptor_41f6dd02aceb81a1, []int{1}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -135,16 +140,17 @@ func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
 func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*BoundingPoly) ProtoMessage()    {}
 func (*BoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_eec0e7cba47b2d57, []int{2}
+	return fileDescriptor_41f6dd02aceb81a1, []int{2}
 }
+
 func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
 }
 func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+func (m *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(m, src)
 }
 func (m *BoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_BoundingPoly.Size(m)
@@ -182,16 +188,17 @@ func (m *NormalizedBoundingPoly) Reset()         { *m = NormalizedBoundingPoly{}
 func (m *NormalizedBoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*NormalizedBoundingPoly) ProtoMessage()    {}
 func (*NormalizedBoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_eec0e7cba47b2d57, []int{3}
+	return fileDescriptor_41f6dd02aceb81a1, []int{3}
 }
+
 func (m *NormalizedBoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedBoundingPoly.Unmarshal(m, b)
 }
 func (m *NormalizedBoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedBoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedBoundingPoly.Merge(dst, src)
+func (m *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingPoly.Merge(m, src)
 }
 func (m *NormalizedBoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_NormalizedBoundingPoly.Size(m)
@@ -228,16 +235,17 @@ func (m *Position) Reset()         { *m = Position{} }
 func (m *Position) String() string { return proto.CompactTextString(m) }
 func (*Position) ProtoMessage()    {}
 func (*Position) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_eec0e7cba47b2d57, []int{4}
+	return fileDescriptor_41f6dd02aceb81a1, []int{4}
 }
+
 func (m *Position) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Position.Unmarshal(m, b)
 }
 func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
 }
-func (dst *Position) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Position.Merge(dst, src)
+func (m *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(m, src)
 }
 func (m *Position) XXX_Size() int {
 	return xxx_messageInfo_Position.Size(m)
@@ -278,10 +286,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p3beta1/geometry.proto", fileDescriptor_geometry_eec0e7cba47b2d57)
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/geometry.proto", fileDescriptor_41f6dd02aceb81a1)
 }
 
-var fileDescriptor_geometry_eec0e7cba47b2d57 = []byte{
+var fileDescriptor_41f6dd02aceb81a1 = []byte{
 	// 316 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4b, 0xc3, 0x30,
 	0x14, 0xc6, 0x49, 0x87, 0x63, 0xc4, 0x09, 0x52, 0x41, 0x8a, 0x28, 0xcc, 0xa2, 0xb0, 0x83, 0x24,
diff --git a/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go b/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
index 1ca665abb9..61a9d4cb75 100644
--- a/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
@@ -56,6 +56,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"UNKNOWN":       0,
 	"VERY_UNLIKELY": 1,
@@ -68,8 +69,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{0}
+	return fileDescriptor_2b863578148790db, []int{0}
 }
 
 // Type of Google Cloud Vision API feature to be extracted.
@@ -124,6 +126,7 @@ var Feature_Type_name = map[int32]string{
 	12: "PRODUCT_SEARCH",
 	19: "OBJECT_LOCALIZATION",
 }
+
 var Feature_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":        0,
 	"FACE_DETECTION":          1,
@@ -143,8 +146,9 @@ var Feature_Type_value = map[string]int32{
 func (x Feature_Type) String() string {
 	return proto.EnumName(Feature_Type_name, int32(x))
 }
+
 func (Feature_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{0, 0}
+	return fileDescriptor_2b863578148790db, []int{0, 0}
 }
 
 // Face landmark (feature) type.
@@ -263,6 +267,7 @@ var FaceAnnotation_Landmark_Type_name = map[int32]string{
 	33: "CHIN_LEFT_GONION",
 	34: "CHIN_RIGHT_GONION",
 }
+
 var FaceAnnotation_Landmark_Type_value = map[string]int32{
 	"UNKNOWN_LANDMARK":             0,
 	"LEFT_EYE":                     1,
@@ -304,8 +309,9 @@ var FaceAnnotation_Landmark_Type_value = map[string]int32{
 func (x FaceAnnotation_Landmark_Type) String() string {
 	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
 }
+
 func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{3, 0, 0}
+	return fileDescriptor_2b863578148790db, []int{3, 0, 0}
 }
 
 // Batch operation states.
@@ -331,6 +337,7 @@ var OperationMetadata_State_name = map[int32]string{
 	3: "DONE",
 	4: "CANCELLED",
 }
+
 var OperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATED":           1,
@@ -342,8 +349,9 @@ var OperationMetadata_State_value = map[string]int32{
 func (x OperationMetadata_State) String() string {
 	return proto.EnumName(OperationMetadata_State_name, int32(x))
 }
+
 func (OperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{32, 0}
+	return fileDescriptor_2b863578148790db, []int{32, 0}
 }
 
 // The type of Google Cloud Vision API detection to perform, and the maximum
@@ -368,16 +376,17 @@ func (m *Feature) Reset()         { *m = Feature{} }
 func (m *Feature) String() string { return proto.CompactTextString(m) }
 func (*Feature) ProtoMessage()    {}
 func (*Feature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{0}
+	return fileDescriptor_2b863578148790db, []int{0}
 }
+
 func (m *Feature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feature.Unmarshal(m, b)
 }
 func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
 }
-func (dst *Feature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feature.Merge(dst, src)
+func (m *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(m, src)
 }
 func (m *Feature) XXX_Size() int {
 	return xxx_messageInfo_Feature.Size(m)
@@ -445,16 +454,17 @@ func (m *ImageSource) Reset()         { *m = ImageSource{} }
 func (m *ImageSource) String() string { return proto.CompactTextString(m) }
 func (*ImageSource) ProtoMessage()    {}
 func (*ImageSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{1}
+	return fileDescriptor_2b863578148790db, []int{1}
 }
+
 func (m *ImageSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
 }
 func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
 }
-func (dst *ImageSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageSource.Merge(dst, src)
+func (m *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(m, src)
 }
 func (m *ImageSource) XXX_Size() int {
 	return xxx_messageInfo_ImageSource.Size(m)
@@ -498,16 +508,17 @@ func (m *Image) Reset()         { *m = Image{} }
 func (m *Image) String() string { return proto.CompactTextString(m) }
 func (*Image) ProtoMessage()    {}
 func (*Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{2}
+	return fileDescriptor_2b863578148790db, []int{2}
 }
+
 func (m *Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Image.Unmarshal(m, b)
 }
 func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
 }
-func (dst *Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Image.Merge(dst, src)
+func (m *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(m, src)
 }
 func (m *Image) XXX_Size() int {
 	return xxx_messageInfo_Image.Size(m)
@@ -589,16 +600,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{3}
+	return fileDescriptor_2b863578148790db, []int{3}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -729,16 +741,17 @@ func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark
 func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation_Landmark) ProtoMessage()    {}
 func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{3, 0}
+	return fileDescriptor_2b863578148790db, []int{3, 0}
 }
+
 func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
 }
 func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+func (m *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(m, src)
 }
 func (m *FaceAnnotation_Landmark) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
@@ -776,16 +789,17 @@ func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
 func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
 func (*LocationInfo) ProtoMessage()    {}
 func (*LocationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{4}
+	return fileDescriptor_2b863578148790db, []int{4}
 }
+
 func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
 }
 func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
 }
-func (dst *LocationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationInfo.Merge(dst, src)
+func (m *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(m, src)
 }
 func (m *LocationInfo) XXX_Size() int {
 	return xxx_messageInfo_LocationInfo.Size(m)
@@ -820,16 +834,17 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{5}
+	return fileDescriptor_2b863578148790db, []int{5}
 }
+
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(dst, src)
+func (m *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(m, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -907,16 +922,17 @@ func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
 func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
 func (*EntityAnnotation) ProtoMessage()    {}
 func (*EntityAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{6}
+	return fileDescriptor_2b863578148790db, []int{6}
 }
+
 func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
 }
 func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+func (m *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(m, src)
 }
 func (m *EntityAnnotation) XXX_Size() int {
 	return xxx_messageInfo_EntityAnnotation.Size(m)
@@ -1013,16 +1029,17 @@ func (m *LocalizedObjectAnnotation) Reset()         { *m = LocalizedObjectAnnota
 func (m *LocalizedObjectAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LocalizedObjectAnnotation) ProtoMessage()    {}
 func (*LocalizedObjectAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{7}
+	return fileDescriptor_2b863578148790db, []int{7}
 }
+
 func (m *LocalizedObjectAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Unmarshal(m, b)
 }
 func (m *LocalizedObjectAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LocalizedObjectAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocalizedObjectAnnotation.Merge(dst, src)
+func (m *LocalizedObjectAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalizedObjectAnnotation.Merge(m, src)
 }
 func (m *LocalizedObjectAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Size(m)
@@ -1098,16 +1115,17 @@ func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
 func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
 func (*SafeSearchAnnotation) ProtoMessage()    {}
 func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{8}
+	return fileDescriptor_2b863578148790db, []int{8}
 }
+
 func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
 }
 func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+func (m *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(m, src)
 }
 func (m *SafeSearchAnnotation) XXX_Size() int {
 	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
@@ -1168,16 +1186,17 @@ func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
 func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
 func (*LatLongRect) ProtoMessage()    {}
 func (*LatLongRect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{9}
+	return fileDescriptor_2b863578148790db, []int{9}
 }
+
 func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
 }
 func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
 }
-func (dst *LatLongRect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LatLongRect.Merge(dst, src)
+func (m *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(m, src)
 }
 func (m *LatLongRect) XXX_Size() int {
 	return xxx_messageInfo_LatLongRect.Size(m)
@@ -1221,16 +1240,17 @@ func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
 func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
 func (*ColorInfo) ProtoMessage()    {}
 func (*ColorInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{10}
+	return fileDescriptor_2b863578148790db, []int{10}
 }
+
 func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
 }
 func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
 }
-func (dst *ColorInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColorInfo.Merge(dst, src)
+func (m *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(m, src)
 }
 func (m *ColorInfo) XXX_Size() int {
 	return xxx_messageInfo_ColorInfo.Size(m)
@@ -1275,16 +1295,17 @@ func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotati
 func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*DominantColorsAnnotation) ProtoMessage()    {}
 func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{11}
+	return fileDescriptor_2b863578148790db, []int{11}
 }
+
 func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
 }
 func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+func (m *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(m, src)
 }
 func (m *DominantColorsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
@@ -1315,16 +1336,17 @@ func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
 func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
 func (*ImageProperties) ProtoMessage()    {}
 func (*ImageProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{12}
+	return fileDescriptor_2b863578148790db, []int{12}
 }
+
 func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
 }
 func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
 }
-func (dst *ImageProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageProperties.Merge(dst, src)
+func (m *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(m, src)
 }
 func (m *ImageProperties) XXX_Size() int {
 	return xxx_messageInfo_ImageProperties.Size(m)
@@ -1361,16 +1383,17 @@ func (m *CropHint) Reset()         { *m = CropHint{} }
 func (m *CropHint) String() string { return proto.CompactTextString(m) }
 func (*CropHint) ProtoMessage()    {}
 func (*CropHint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{13}
+	return fileDescriptor_2b863578148790db, []int{13}
 }
+
 func (m *CropHint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHint.Unmarshal(m, b)
 }
 func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
 }
-func (dst *CropHint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHint.Merge(dst, src)
+func (m *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(m, src)
 }
 func (m *CropHint) XXX_Size() int {
 	return xxx_messageInfo_CropHint.Size(m)
@@ -1415,16 +1438,17 @@ func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
 func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*CropHintsAnnotation) ProtoMessage()    {}
 func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{14}
+	return fileDescriptor_2b863578148790db, []int{14}
 }
+
 func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
 }
 func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+func (m *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(m, src)
 }
 func (m *CropHintsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_CropHintsAnnotation.Size(m)
@@ -1460,16 +1484,17 @@ func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
 func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
 func (*CropHintsParams) ProtoMessage()    {}
 func (*CropHintsParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{15}
+	return fileDescriptor_2b863578148790db, []int{15}
 }
+
 func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
 }
 func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+func (m *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(m, src)
 }
 func (m *CropHintsParams) XXX_Size() int {
 	return xxx_messageInfo_CropHintsParams.Size(m)
@@ -1500,16 +1525,17 @@ func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
 func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
 func (*WebDetectionParams) ProtoMessage()    {}
 func (*WebDetectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{16}
+	return fileDescriptor_2b863578148790db, []int{16}
 }
+
 func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
 }
 func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
 }
-func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+func (m *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(m, src)
 }
 func (m *WebDetectionParams) XXX_Size() int {
 	return xxx_messageInfo_WebDetectionParams.Size(m)
@@ -1555,16 +1581,17 @@ func (m *ImageContext) Reset()         { *m = ImageContext{} }
 func (m *ImageContext) String() string { return proto.CompactTextString(m) }
 func (*ImageContext) ProtoMessage()    {}
 func (*ImageContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{17}
+	return fileDescriptor_2b863578148790db, []int{17}
 }
+
 func (m *ImageContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
 }
 func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageContext.Merge(dst, src)
+func (m *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(m, src)
 }
 func (m *ImageContext) XXX_Size() int {
 	return xxx_messageInfo_ImageContext.Size(m)
@@ -1628,16 +1655,17 @@ func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
 func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageRequest) ProtoMessage()    {}
 func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{18}
+	return fileDescriptor_2b863578148790db, []int{18}
 }
+
 func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
 }
 func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+func (m *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(m, src)
 }
 func (m *AnnotateImageRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageRequest.Size(m)
@@ -1686,16 +1714,17 @@ func (m *ImageAnnotationContext) Reset()         { *m = ImageAnnotationContext{}
 func (m *ImageAnnotationContext) String() string { return proto.CompactTextString(m) }
 func (*ImageAnnotationContext) ProtoMessage()    {}
 func (*ImageAnnotationContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{19}
+	return fileDescriptor_2b863578148790db, []int{19}
 }
+
 func (m *ImageAnnotationContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageAnnotationContext.Unmarshal(m, b)
 }
 func (m *ImageAnnotationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageAnnotationContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageAnnotationContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageAnnotationContext.Merge(dst, src)
+func (m *ImageAnnotationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAnnotationContext.Merge(m, src)
 }
 func (m *ImageAnnotationContext) XXX_Size() int {
 	return xxx_messageInfo_ImageAnnotationContext.Size(m)
@@ -1766,16 +1795,17 @@ func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
 func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageResponse) ProtoMessage()    {}
 func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{20}
+	return fileDescriptor_2b863578148790db, []int{20}
 }
+
 func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
 }
 func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+func (m *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(m, src)
 }
 func (m *AnnotateImageResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageResponse.Size(m)
@@ -1900,16 +1930,17 @@ func (m *AnnotateFileResponse) Reset()         { *m = AnnotateFileResponse{} }
 func (m *AnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateFileResponse) ProtoMessage()    {}
 func (*AnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{21}
+	return fileDescriptor_2b863578148790db, []int{21}
 }
+
 func (m *AnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateFileResponse.Merge(dst, src)
+func (m *AnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileResponse.Merge(m, src)
 }
 func (m *AnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateFileResponse.Size(m)
@@ -1947,16 +1978,17 @@ func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesR
 func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
 func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{22}
+	return fileDescriptor_2b863578148790db, []int{22}
 }
+
 func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+func (m *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(m, src)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
@@ -1987,16 +2019,17 @@ func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImages
 func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
 func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{23}
+	return fileDescriptor_2b863578148790db, []int{23}
 }
+
 func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+func (m *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(m, src)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
@@ -2033,16 +2066,17 @@ func (m *AsyncAnnotateFileRequest) Reset()         { *m = AsyncAnnotateFileReque
 func (m *AsyncAnnotateFileRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileRequest) ProtoMessage()    {}
 func (*AsyncAnnotateFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{24}
+	return fileDescriptor_2b863578148790db, []int{24}
 }
+
 func (m *AsyncAnnotateFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(dst, src)
+func (m *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(m, src)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Size(m)
@@ -2094,16 +2128,17 @@ func (m *AsyncAnnotateFileResponse) Reset()         { *m = AsyncAnnotateFileResp
 func (m *AsyncAnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileResponse) ProtoMessage()    {}
 func (*AsyncAnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{25}
+	return fileDescriptor_2b863578148790db, []int{25}
 }
+
 func (m *AsyncAnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(dst, src)
+func (m *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(m, src)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Size(m)
@@ -2135,16 +2170,17 @@ func (m *AsyncBatchAnnotateFilesRequest) Reset()         { *m = AsyncBatchAnnota
 func (m *AsyncBatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesRequest) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{26}
+	return fileDescriptor_2b863578148790db, []int{26}
 }
+
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Size(m)
@@ -2176,16 +2212,17 @@ func (m *AsyncBatchAnnotateFilesResponse) Reset()         { *m = AsyncBatchAnnot
 func (m *AsyncBatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesResponse) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{27}
+	return fileDescriptor_2b863578148790db, []int{27}
 }
+
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Size(m)
@@ -2219,16 +2256,17 @@ func (m *InputConfig) Reset()         { *m = InputConfig{} }
 func (m *InputConfig) String() string { return proto.CompactTextString(m) }
 func (*InputConfig) ProtoMessage()    {}
 func (*InputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{28}
+	return fileDescriptor_2b863578148790db, []int{28}
 }
+
 func (m *InputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
 }
 func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputConfig.Merge(dst, src)
+func (m *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(m, src)
 }
 func (m *InputConfig) XXX_Size() int {
 	return xxx_messageInfo_InputConfig.Size(m)
@@ -2278,16 +2316,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{29}
+	return fileDescriptor_2b863578148790db, []int{29}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -2326,16 +2365,17 @@ func (m *GcsSource) Reset()         { *m = GcsSource{} }
 func (m *GcsSource) String() string { return proto.CompactTextString(m) }
 func (*GcsSource) ProtoMessage()    {}
 func (*GcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{30}
+	return fileDescriptor_2b863578148790db, []int{30}
 }
+
 func (m *GcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
 }
 func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
 }
-func (dst *GcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsSource.Merge(dst, src)
+func (m *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(m, src)
 }
 func (m *GcsSource) XXX_Size() int {
 	return xxx_messageInfo_GcsSource.Size(m)
@@ -2380,16 +2420,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{31}
+	return fileDescriptor_2b863578148790db, []int{31}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -2424,16 +2465,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_741235179f821499, []int{32}
+	return fileDescriptor_2b863578148790db, []int{32}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -2466,6 +2508,10 @@ func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
 	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1p3beta1.Feature")
 	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1p3beta1.ImageSource")
 	proto.RegisterType((*Image)(nil), "google.cloud.vision.v1p3beta1.Image")
@@ -2500,136 +2546,13 @@ func init() {
 	proto.RegisterType((*GcsSource)(nil), "google.cloud.vision.v1p3beta1.GcsSource")
 	proto.RegisterType((*GcsDestination)(nil), "google.cloud.vision.v1p3beta1.GcsDestination")
 	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.vision.v1p3beta1.OperationMetadata")
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ImageAnnotatorClient is the client API for ImageAnnotator service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ImageAnnotatorClient interface {
-	// Run image detection and annotation for a batch of images.
-	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
-	// Run asynchronous image detection and annotation for a list of generic
-	// files, such as PDF files, which may contain multiple pages and multiple
-	// images per page. Progress and results can be retrieved through the
-	// `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `OperationMetadata` (metadata).
-	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
-	AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-}
-
-type imageAnnotatorClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
-	return &imageAnnotatorClient{cc}
-}
-
-func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
-	out := new(BatchAnnotateImagesResponse)
-	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *imageAnnotatorClient) AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
-	out := new(longrunning.Operation)
-	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ImageAnnotator/AsyncBatchAnnotateFiles", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ImageAnnotatorServer is the server API for ImageAnnotator service.
-type ImageAnnotatorServer interface {
-	// Run image detection and annotation for a batch of images.
-	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
-	// Run asynchronous image detection and annotation for a list of generic
-	// files, such as PDF files, which may contain multiple pages and multiple
-	// images per page. Progress and results can be retrieved through the
-	// `google.longrunning.Operations` interface.
-	// `Operation.metadata` contains `OperationMetadata` (metadata).
-	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
-	AsyncBatchAnnotateFiles(context.Context, *AsyncBatchAnnotateFilesRequest) (*longrunning.Operation, error)
-}
-
-func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
-	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
-}
-
-func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BatchAnnotateImagesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.vision.v1p3beta1.ImageAnnotator/BatchAnnotateImages",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ImageAnnotator_AsyncBatchAnnotateFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AsyncBatchAnnotateFilesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.vision.v1p3beta1.ImageAnnotator/AsyncBatchAnnotateFiles",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, req.(*AsyncBatchAnnotateFilesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.vision.v1p3beta1.ImageAnnotator",
-	HandlerType: (*ImageAnnotatorServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "BatchAnnotateImages",
-			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
-		},
-		{
-			MethodName: "AsyncBatchAnnotateFiles",
-			Handler:    _ImageAnnotator_AsyncBatchAnnotateFiles_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/vision/v1p3beta1/image_annotator.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p3beta1/image_annotator.proto", fileDescriptor_image_annotator_741235179f821499)
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/image_annotator.proto", fileDescriptor_2b863578148790db)
 }
 
-var fileDescriptor_image_annotator_741235179f821499 = []byte{
+var fileDescriptor_2b863578148790db = []byte{
 	// 3065 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x73, 0xdb, 0xc6,
 	0xf5, 0x0f, 0xa9, 0x5f, 0xe4, 0x23, 0x25, 0x41, 0xab, 0x1f, 0xa6, 0x65, 0x2b, 0x56, 0x90, 0x6f,
@@ -2824,3 +2747,122 @@ var fileDescriptor_image_annotator_741235179f821499 = []byte{
 	0x47, 0xb1, 0xe0, 0x5f, 0xb9, 0xdc, 0xd9, 0x2c, 0x87, 0xdc, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff,
 	0xff, 0xeb, 0x48, 0xba, 0xeb, 0x69, 0x25, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ImageAnnotatorClient is the client API for ImageAnnotator service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ImageAnnotatorClient interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
+	// Run asynchronous image detection and annotation for a list of generic
+	// files, such as PDF files, which may contain multiple pages and multiple
+	// images per page. Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type imageAnnotatorClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
+	return &imageAnnotatorClient{cc}
+}
+
+func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
+	out := new(BatchAnnotateImagesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *imageAnnotatorClient) AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ImageAnnotator/AsyncBatchAnnotateFiles", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ImageAnnotatorServer is the server API for ImageAnnotator service.
+type ImageAnnotatorServer interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
+	// Run asynchronous image detection and annotation for a list of generic
+	// files, such as PDF files, which may contain multiple pages and multiple
+	// images per page. Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(context.Context, *AsyncBatchAnnotateFilesRequest) (*longrunning.Operation, error)
+}
+
+func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
+	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
+}
+
+func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchAnnotateImagesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ImageAnnotator/BatchAnnotateImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ImageAnnotator_AsyncBatchAnnotateFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AsyncBatchAnnotateFilesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ImageAnnotator/AsyncBatchAnnotateFiles",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, req.(*AsyncBatchAnnotateFilesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.vision.v1p3beta1.ImageAnnotator",
+	HandlerType: (*ImageAnnotatorServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "BatchAnnotateImages",
+			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
+		},
+		{
+			MethodName: "AsyncBatchAnnotateFiles",
+			Handler:    _ImageAnnotator_AsyncBatchAnnotateFiles_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/vision/v1p3beta1/image_annotator.proto",
+}
diff --git a/googleapis/cloud/vision/v1p3beta1/product_search.pb.go b/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
index 80bd29a7db..34f7ce14b8 100644
--- a/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/product_search.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Supported product search categories.
 type ProductSearchCategory int32
@@ -37,6 +40,7 @@ var ProductSearchCategory_name = map[int32]string{
 	1: "SHOES",
 	2: "BAGS",
 }
+
 var ProductSearchCategory_value = map[string]int32{
 	"PRODUCT_SEARCH_CATEGORY_UNSPECIFIED": 0,
 	"SHOES":                               1,
@@ -46,8 +50,9 @@ var ProductSearchCategory_value = map[string]int32{
 func (x ProductSearchCategory) String() string {
 	return proto.EnumName(ProductSearchCategory_name, int32(x))
 }
+
 func (ProductSearchCategory) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_16e9353648db1cfe, []int{0}
+	return fileDescriptor_39c225061f094f0f, []int{0}
 }
 
 // Specifies the fields to include in product search results.
@@ -66,6 +71,7 @@ var ProductSearchResultsView_name = map[int32]string{
 	0: "BASIC",
 	1: "FULL",
 }
+
 var ProductSearchResultsView_value = map[string]int32{
 	"BASIC": 0,
 	"FULL":  1,
@@ -74,8 +80,9 @@ var ProductSearchResultsView_value = map[string]int32{
 func (x ProductSearchResultsView) String() string {
 	return proto.EnumName(ProductSearchResultsView_name, int32(x))
 }
+
 func (ProductSearchResultsView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_16e9353648db1cfe, []int{1}
+	return fileDescriptor_39c225061f094f0f, []int{1}
 }
 
 // Parameters for a product search request.
@@ -130,16 +137,17 @@ func (m *ProductSearchParams) Reset()         { *m = ProductSearchParams{} }
 func (m *ProductSearchParams) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchParams) ProtoMessage()    {}
 func (*ProductSearchParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_16e9353648db1cfe, []int{0}
+	return fileDescriptor_39c225061f094f0f, []int{0}
 }
+
 func (m *ProductSearchParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchParams.Unmarshal(m, b)
 }
 func (m *ProductSearchParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchParams.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchParams.Merge(dst, src)
+func (m *ProductSearchParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchParams.Merge(m, src)
 }
 func (m *ProductSearchParams) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchParams.Size(m)
@@ -238,16 +246,17 @@ func (m *ProductSearchResults) Reset()         { *m = ProductSearchResults{} }
 func (m *ProductSearchResults) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults) ProtoMessage()    {}
 func (*ProductSearchResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_16e9353648db1cfe, []int{1}
+	return fileDescriptor_39c225061f094f0f, []int{1}
 }
+
 func (m *ProductSearchResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults.Unmarshal(m, b)
 }
 func (m *ProductSearchResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults.Merge(dst, src)
+func (m *ProductSearchResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults.Merge(m, src)
 }
 func (m *ProductSearchResults) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults.Size(m)
@@ -317,16 +326,17 @@ func (m *ProductSearchResults_ProductInfo) Reset()         { *m = ProductSearchR
 func (m *ProductSearchResults_ProductInfo) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults_ProductInfo) ProtoMessage()    {}
 func (*ProductSearchResults_ProductInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_16e9353648db1cfe, []int{1, 0}
+	return fileDescriptor_39c225061f094f0f, []int{1, 0}
 }
+
 func (m *ProductSearchResults_ProductInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults_ProductInfo.Unmarshal(m, b)
 }
 func (m *ProductSearchResults_ProductInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults_ProductInfo.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults_ProductInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults_ProductInfo.Merge(dst, src)
+func (m *ProductSearchResults_ProductInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_ProductInfo.Merge(m, src)
 }
 func (m *ProductSearchResults_ProductInfo) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults_ProductInfo.Size(m)
@@ -380,16 +390,17 @@ func (m *ProductSearchResults_Result) Reset()         { *m = ProductSearchResult
 func (m *ProductSearchResults_Result) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults_Result) ProtoMessage()    {}
 func (*ProductSearchResults_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_16e9353648db1cfe, []int{1, 1}
+	return fileDescriptor_39c225061f094f0f, []int{1, 1}
 }
+
 func (m *ProductSearchResults_Result) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults_Result.Unmarshal(m, b)
 }
 func (m *ProductSearchResults_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults_Result.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults_Result) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults_Result.Merge(dst, src)
+func (m *ProductSearchResults_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_Result.Merge(m, src)
 }
 func (m *ProductSearchResults_Result) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults_Result.Size(m)
@@ -422,19 +433,19 @@ func (m *ProductSearchResults_Result) GetImage() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.ProductSearchCategory", ProductSearchCategory_name, ProductSearchCategory_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.ProductSearchResultsView", ProductSearchResultsView_name, ProductSearchResultsView_value)
 	proto.RegisterType((*ProductSearchParams)(nil), "google.cloud.vision.v1p3beta1.ProductSearchParams")
 	proto.RegisterType((*ProductSearchResults)(nil), "google.cloud.vision.v1p3beta1.ProductSearchResults")
 	proto.RegisterType((*ProductSearchResults_ProductInfo)(nil), "google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo")
 	proto.RegisterType((*ProductSearchResults_Result)(nil), "google.cloud.vision.v1p3beta1.ProductSearchResults.Result")
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.ProductSearchCategory", ProductSearchCategory_name, ProductSearchCategory_value)
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.ProductSearchResultsView", ProductSearchResultsView_name, ProductSearchResultsView_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p3beta1/product_search.proto", fileDescriptor_product_search_16e9353648db1cfe)
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/product_search.proto", fileDescriptor_39c225061f094f0f)
 }
 
-var fileDescriptor_product_search_16e9353648db1cfe = []byte{
+var fileDescriptor_39c225061f094f0f = []byte{
 	// 698 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xdf, 0x6e, 0xd3, 0x30,
 	0x14, 0xc6, 0x97, 0xfe, 0x5b, 0x73, 0x3a, 0xa0, 0x98, 0x31, 0x45, 0x85, 0x69, 0xdd, 0x90, 0xa0,
diff --git a/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go b/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
index 48a4d528f3..19c6d42189 100644
--- a/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/product_search_service.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates the possible states that the batch request can be in.
 type BatchOperationMetadata_State int32
@@ -55,6 +55,7 @@ var BatchOperationMetadata_State_name = map[int32]string{
 	3: "FAILED",
 	4: "CANCELLED",
 }
+
 var BatchOperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"PROCESSING":        1,
@@ -66,8 +67,9 @@ var BatchOperationMetadata_State_value = map[string]int32{
 func (x BatchOperationMetadata_State) String() string {
 	return proto.EnumName(BatchOperationMetadata_State_name, int32(x))
 }
+
 func (BatchOperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{28, 0}
+	return fileDescriptor_3e303776708d7396, []int{28, 0}
 }
 
 // A Product contains ReferenceImages.
@@ -109,16 +111,17 @@ func (m *Product) Reset()         { *m = Product{} }
 func (m *Product) String() string { return proto.CompactTextString(m) }
 func (*Product) ProtoMessage()    {}
 func (*Product) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{0}
+	return fileDescriptor_3e303776708d7396, []int{0}
 }
+
 func (m *Product) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Product.Unmarshal(m, b)
 }
 func (m *Product) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Product.Marshal(b, m, deterministic)
 }
-func (dst *Product) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Product.Merge(dst, src)
+func (m *Product) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product.Merge(m, src)
 }
 func (m *Product) XXX_Size() int {
 	return xxx_messageInfo_Product.Size(m)
@@ -181,16 +184,17 @@ func (m *Product_KeyValue) Reset()         { *m = Product_KeyValue{} }
 func (m *Product_KeyValue) String() string { return proto.CompactTextString(m) }
 func (*Product_KeyValue) ProtoMessage()    {}
 func (*Product_KeyValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{0, 0}
+	return fileDescriptor_3e303776708d7396, []int{0, 0}
 }
+
 func (m *Product_KeyValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Product_KeyValue.Unmarshal(m, b)
 }
 func (m *Product_KeyValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Product_KeyValue.Marshal(b, m, deterministic)
 }
-func (dst *Product_KeyValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Product_KeyValue.Merge(dst, src)
+func (m *Product_KeyValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product_KeyValue.Merge(m, src)
 }
 func (m *Product_KeyValue) XXX_Size() int {
 	return xxx_messageInfo_Product_KeyValue.Size(m)
@@ -249,16 +253,17 @@ func (m *ProductSet) Reset()         { *m = ProductSet{} }
 func (m *ProductSet) String() string { return proto.CompactTextString(m) }
 func (*ProductSet) ProtoMessage()    {}
 func (*ProductSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{1}
+	return fileDescriptor_3e303776708d7396, []int{1}
 }
+
 func (m *ProductSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSet.Unmarshal(m, b)
 }
 func (m *ProductSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSet.Marshal(b, m, deterministic)
 }
-func (dst *ProductSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSet.Merge(dst, src)
+func (m *ProductSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSet.Merge(m, src)
 }
 func (m *ProductSet) XXX_Size() int {
 	return xxx_messageInfo_ProductSet.Size(m)
@@ -332,16 +337,17 @@ func (m *ReferenceImage) Reset()         { *m = ReferenceImage{} }
 func (m *ReferenceImage) String() string { return proto.CompactTextString(m) }
 func (*ReferenceImage) ProtoMessage()    {}
 func (*ReferenceImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{2}
+	return fileDescriptor_3e303776708d7396, []int{2}
 }
+
 func (m *ReferenceImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReferenceImage.Unmarshal(m, b)
 }
 func (m *ReferenceImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReferenceImage.Marshal(b, m, deterministic)
 }
-func (dst *ReferenceImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReferenceImage.Merge(dst, src)
+func (m *ReferenceImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceImage.Merge(m, src)
 }
 func (m *ReferenceImage) XXX_Size() int {
 	return xxx_messageInfo_ReferenceImage.Size(m)
@@ -396,16 +402,17 @@ func (m *CreateProductRequest) Reset()         { *m = CreateProductRequest{} }
 func (m *CreateProductRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProductRequest) ProtoMessage()    {}
 func (*CreateProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{3}
+	return fileDescriptor_3e303776708d7396, []int{3}
 }
+
 func (m *CreateProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProductRequest.Unmarshal(m, b)
 }
 func (m *CreateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProductRequest.Merge(dst, src)
+func (m *CreateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductRequest.Merge(m, src)
 }
 func (m *CreateProductRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProductRequest.Size(m)
@@ -457,16 +464,17 @@ func (m *ListProductsRequest) Reset()         { *m = ListProductsRequest{} }
 func (m *ListProductsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductsRequest) ProtoMessage()    {}
 func (*ListProductsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{4}
+	return fileDescriptor_3e303776708d7396, []int{4}
 }
+
 func (m *ListProductsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsRequest.Unmarshal(m, b)
 }
 func (m *ListProductsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsRequest.Merge(dst, src)
+func (m *ListProductsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsRequest.Merge(m, src)
 }
 func (m *ListProductsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductsRequest.Size(m)
@@ -514,16 +522,17 @@ func (m *ListProductsResponse) Reset()         { *m = ListProductsResponse{} }
 func (m *ListProductsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductsResponse) ProtoMessage()    {}
 func (*ListProductsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{5}
+	return fileDescriptor_3e303776708d7396, []int{5}
 }
+
 func (m *ListProductsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsResponse.Unmarshal(m, b)
 }
 func (m *ListProductsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsResponse.Merge(dst, src)
+func (m *ListProductsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsResponse.Merge(m, src)
 }
 func (m *ListProductsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductsResponse.Size(m)
@@ -564,16 +573,17 @@ func (m *GetProductRequest) Reset()         { *m = GetProductRequest{} }
 func (m *GetProductRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductRequest) ProtoMessage()    {}
 func (*GetProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{6}
+	return fileDescriptor_3e303776708d7396, []int{6}
 }
+
 func (m *GetProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductRequest.Unmarshal(m, b)
 }
 func (m *GetProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductRequest.Merge(dst, src)
+func (m *GetProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductRequest.Merge(m, src)
 }
 func (m *GetProductRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductRequest.Size(m)
@@ -611,16 +621,17 @@ func (m *UpdateProductRequest) Reset()         { *m = UpdateProductRequest{} }
 func (m *UpdateProductRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProductRequest) ProtoMessage()    {}
 func (*UpdateProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{7}
+	return fileDescriptor_3e303776708d7396, []int{7}
 }
+
 func (m *UpdateProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProductRequest.Unmarshal(m, b)
 }
 func (m *UpdateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProductRequest.Merge(dst, src)
+func (m *UpdateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductRequest.Merge(m, src)
 }
 func (m *UpdateProductRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProductRequest.Size(m)
@@ -661,16 +672,17 @@ func (m *DeleteProductRequest) Reset()         { *m = DeleteProductRequest{} }
 func (m *DeleteProductRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteProductRequest) ProtoMessage()    {}
 func (*DeleteProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{8}
+	return fileDescriptor_3e303776708d7396, []int{8}
 }
+
 func (m *DeleteProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteProductRequest.Unmarshal(m, b)
 }
 func (m *DeleteProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteProductRequest.Merge(dst, src)
+func (m *DeleteProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductRequest.Merge(m, src)
 }
 func (m *DeleteProductRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteProductRequest.Size(m)
@@ -710,16 +722,17 @@ func (m *CreateProductSetRequest) Reset()         { *m = CreateProductSetRequest
 func (m *CreateProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProductSetRequest) ProtoMessage()    {}
 func (*CreateProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{9}
+	return fileDescriptor_3e303776708d7396, []int{9}
 }
+
 func (m *CreateProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProductSetRequest.Unmarshal(m, b)
 }
 func (m *CreateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProductSetRequest.Merge(dst, src)
+func (m *CreateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductSetRequest.Merge(m, src)
 }
 func (m *CreateProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProductSetRequest.Size(m)
@@ -770,16 +783,17 @@ func (m *ListProductSetsRequest) Reset()         { *m = ListProductSetsRequest{}
 func (m *ListProductSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductSetsRequest) ProtoMessage()    {}
 func (*ListProductSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{10}
+	return fileDescriptor_3e303776708d7396, []int{10}
 }
+
 func (m *ListProductSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductSetsRequest.Unmarshal(m, b)
 }
 func (m *ListProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductSetsRequest.Merge(dst, src)
+func (m *ListProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsRequest.Merge(m, src)
 }
 func (m *ListProductSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductSetsRequest.Size(m)
@@ -827,16 +841,17 @@ func (m *ListProductSetsResponse) Reset()         { *m = ListProductSetsResponse
 func (m *ListProductSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductSetsResponse) ProtoMessage()    {}
 func (*ListProductSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{11}
+	return fileDescriptor_3e303776708d7396, []int{11}
 }
+
 func (m *ListProductSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductSetsResponse.Unmarshal(m, b)
 }
 func (m *ListProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductSetsResponse.Merge(dst, src)
+func (m *ListProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsResponse.Merge(m, src)
 }
 func (m *ListProductSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductSetsResponse.Size(m)
@@ -877,16 +892,17 @@ func (m *GetProductSetRequest) Reset()         { *m = GetProductSetRequest{} }
 func (m *GetProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductSetRequest) ProtoMessage()    {}
 func (*GetProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{12}
+	return fileDescriptor_3e303776708d7396, []int{12}
 }
+
 func (m *GetProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductSetRequest.Unmarshal(m, b)
 }
 func (m *GetProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductSetRequest.Merge(dst, src)
+func (m *GetProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductSetRequest.Merge(m, src)
 }
 func (m *GetProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductSetRequest.Size(m)
@@ -922,16 +938,17 @@ func (m *UpdateProductSetRequest) Reset()         { *m = UpdateProductSetRequest
 func (m *UpdateProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProductSetRequest) ProtoMessage()    {}
 func (*UpdateProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{13}
+	return fileDescriptor_3e303776708d7396, []int{13}
 }
+
 func (m *UpdateProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProductSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProductSetRequest.Merge(dst, src)
+func (m *UpdateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductSetRequest.Merge(m, src)
 }
 func (m *UpdateProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProductSetRequest.Size(m)
@@ -972,16 +989,17 @@ func (m *DeleteProductSetRequest) Reset()         { *m = DeleteProductSetRequest
 func (m *DeleteProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteProductSetRequest) ProtoMessage()    {}
 func (*DeleteProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{14}
+	return fileDescriptor_3e303776708d7396, []int{14}
 }
+
 func (m *DeleteProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteProductSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteProductSetRequest.Merge(dst, src)
+func (m *DeleteProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductSetRequest.Merge(m, src)
 }
 func (m *DeleteProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteProductSetRequest.Size(m)
@@ -1023,16 +1041,17 @@ func (m *CreateReferenceImageRequest) Reset()         { *m = CreateReferenceImag
 func (m *CreateReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateReferenceImageRequest) ProtoMessage()    {}
 func (*CreateReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{15}
+	return fileDescriptor_3e303776708d7396, []int{15}
 }
+
 func (m *CreateReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *CreateReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateReferenceImageRequest.Merge(dst, src)
+func (m *CreateReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateReferenceImageRequest.Merge(m, src)
 }
 func (m *CreateReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateReferenceImageRequest.Size(m)
@@ -1087,16 +1106,17 @@ func (m *ListReferenceImagesRequest) Reset()         { *m = ListReferenceImagesR
 func (m *ListReferenceImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListReferenceImagesRequest) ProtoMessage()    {}
 func (*ListReferenceImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{16}
+	return fileDescriptor_3e303776708d7396, []int{16}
 }
+
 func (m *ListReferenceImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReferenceImagesRequest.Unmarshal(m, b)
 }
 func (m *ListReferenceImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReferenceImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListReferenceImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReferenceImagesRequest.Merge(dst, src)
+func (m *ListReferenceImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesRequest.Merge(m, src)
 }
 func (m *ListReferenceImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListReferenceImagesRequest.Size(m)
@@ -1145,16 +1165,17 @@ func (m *ListReferenceImagesResponse) Reset()         { *m = ListReferenceImages
 func (m *ListReferenceImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListReferenceImagesResponse) ProtoMessage()    {}
 func (*ListReferenceImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{17}
+	return fileDescriptor_3e303776708d7396, []int{17}
 }
+
 func (m *ListReferenceImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReferenceImagesResponse.Unmarshal(m, b)
 }
 func (m *ListReferenceImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReferenceImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListReferenceImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReferenceImagesResponse.Merge(dst, src)
+func (m *ListReferenceImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesResponse.Merge(m, src)
 }
 func (m *ListReferenceImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListReferenceImagesResponse.Size(m)
@@ -1203,16 +1224,17 @@ func (m *GetReferenceImageRequest) Reset()         { *m = GetReferenceImageReque
 func (m *GetReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*GetReferenceImageRequest) ProtoMessage()    {}
 func (*GetReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{18}
+	return fileDescriptor_3e303776708d7396, []int{18}
 }
+
 func (m *GetReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *GetReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetReferenceImageRequest.Merge(dst, src)
+func (m *GetReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceImageRequest.Merge(m, src)
 }
 func (m *GetReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_GetReferenceImageRequest.Size(m)
@@ -1247,16 +1269,17 @@ func (m *DeleteReferenceImageRequest) Reset()         { *m = DeleteReferenceImag
 func (m *DeleteReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteReferenceImageRequest) ProtoMessage()    {}
 func (*DeleteReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{19}
+	return fileDescriptor_3e303776708d7396, []int{19}
 }
+
 func (m *DeleteReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *DeleteReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteReferenceImageRequest.Merge(dst, src)
+func (m *DeleteReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteReferenceImageRequest.Merge(m, src)
 }
 func (m *DeleteReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Size(m)
@@ -1295,16 +1318,17 @@ func (m *AddProductToProductSetRequest) Reset()         { *m = AddProductToProdu
 func (m *AddProductToProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*AddProductToProductSetRequest) ProtoMessage()    {}
 func (*AddProductToProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{20}
+	return fileDescriptor_3e303776708d7396, []int{20}
 }
+
 func (m *AddProductToProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddProductToProductSetRequest.Unmarshal(m, b)
 }
 func (m *AddProductToProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddProductToProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *AddProductToProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddProductToProductSetRequest.Merge(dst, src)
+func (m *AddProductToProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddProductToProductSetRequest.Merge(m, src)
 }
 func (m *AddProductToProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_AddProductToProductSetRequest.Size(m)
@@ -1350,16 +1374,17 @@ func (m *RemoveProductFromProductSetRequest) Reset()         { *m = RemoveProduc
 func (m *RemoveProductFromProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*RemoveProductFromProductSetRequest) ProtoMessage()    {}
 func (*RemoveProductFromProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{21}
+	return fileDescriptor_3e303776708d7396, []int{21}
 }
+
 func (m *RemoveProductFromProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Unmarshal(m, b)
 }
 func (m *RemoveProductFromProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *RemoveProductFromProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveProductFromProductSetRequest.Merge(dst, src)
+func (m *RemoveProductFromProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveProductFromProductSetRequest.Merge(m, src)
 }
 func (m *RemoveProductFromProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Size(m)
@@ -1404,16 +1429,17 @@ func (m *ListProductsInProductSetRequest) Reset()         { *m = ListProductsInP
 func (m *ListProductsInProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductsInProductSetRequest) ProtoMessage()    {}
 func (*ListProductsInProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{22}
+	return fileDescriptor_3e303776708d7396, []int{22}
 }
+
 func (m *ListProductsInProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Unmarshal(m, b)
 }
 func (m *ListProductsInProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsInProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsInProductSetRequest.Merge(dst, src)
+func (m *ListProductsInProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetRequest.Merge(m, src)
 }
 func (m *ListProductsInProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Size(m)
@@ -1461,16 +1487,17 @@ func (m *ListProductsInProductSetResponse) Reset()         { *m = ListProductsIn
 func (m *ListProductsInProductSetResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductsInProductSetResponse) ProtoMessage()    {}
 func (*ListProductsInProductSetResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{23}
+	return fileDescriptor_3e303776708d7396, []int{23}
 }
+
 func (m *ListProductsInProductSetResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Unmarshal(m, b)
 }
 func (m *ListProductsInProductSetResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsInProductSetResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsInProductSetResponse.Merge(dst, src)
+func (m *ListProductsInProductSetResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetResponse.Merge(m, src)
 }
 func (m *ListProductsInProductSetResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Size(m)
@@ -1565,16 +1592,17 @@ func (m *ImportProductSetsGcsSource) Reset()         { *m = ImportProductSetsGcs
 func (m *ImportProductSetsGcsSource) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsGcsSource) ProtoMessage()    {}
 func (*ImportProductSetsGcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{24}
+	return fileDescriptor_3e303776708d7396, []int{24}
 }
+
 func (m *ImportProductSetsGcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Unmarshal(m, b)
 }
 func (m *ImportProductSetsGcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsGcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsGcsSource.Merge(dst, src)
+func (m *ImportProductSetsGcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsGcsSource.Merge(m, src)
 }
 func (m *ImportProductSetsGcsSource) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Size(m)
@@ -1608,16 +1636,17 @@ func (m *ImportProductSetsInputConfig) Reset()         { *m = ImportProductSetsI
 func (m *ImportProductSetsInputConfig) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsInputConfig) ProtoMessage()    {}
 func (*ImportProductSetsInputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{25}
+	return fileDescriptor_3e303776708d7396, []int{25}
 }
+
 func (m *ImportProductSetsInputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Unmarshal(m, b)
 }
 func (m *ImportProductSetsInputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsInputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsInputConfig.Merge(dst, src)
+func (m *ImportProductSetsInputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsInputConfig.Merge(m, src)
 }
 func (m *ImportProductSetsInputConfig) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Size(m)
@@ -1652,61 +1681,13 @@ func (m *ImportProductSetsInputConfig) GetGcsSource() *ImportProductSetsGcsSourc
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImportProductSetsInputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImportProductSetsInputConfig_OneofMarshaler, _ImportProductSetsInputConfig_OneofUnmarshaler, _ImportProductSetsInputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImportProductSetsInputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImportProductSetsInputConfig_GcsSource)(nil),
 	}
 }
 
-func _ImportProductSetsInputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImportProductSetsInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *ImportProductSetsInputConfig_GcsSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ImportProductSetsInputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImportProductSetsInputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImportProductSetsInputConfig)
-	switch tag {
-	case 1: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImportProductSetsGcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &ImportProductSetsInputConfig_GcsSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImportProductSetsInputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImportProductSetsInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *ImportProductSetsInputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for the `ImportProductSets` method.
 type ImportProductSetsRequest struct {
 	// The project in which the ProductSets should be imported.
@@ -1724,16 +1705,17 @@ func (m *ImportProductSetsRequest) Reset()         { *m = ImportProductSetsReque
 func (m *ImportProductSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsRequest) ProtoMessage()    {}
 func (*ImportProductSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{26}
+	return fileDescriptor_3e303776708d7396, []int{26}
 }
+
 func (m *ImportProductSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsRequest.Unmarshal(m, b)
 }
 func (m *ImportProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsRequest.Merge(dst, src)
+func (m *ImportProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsRequest.Merge(m, src)
 }
 func (m *ImportProductSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsRequest.Size(m)
@@ -1784,16 +1766,17 @@ func (m *ImportProductSetsResponse) Reset()         { *m = ImportProductSetsResp
 func (m *ImportProductSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsResponse) ProtoMessage()    {}
 func (*ImportProductSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{27}
+	return fileDescriptor_3e303776708d7396, []int{27}
 }
+
 func (m *ImportProductSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsResponse.Unmarshal(m, b)
 }
 func (m *ImportProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsResponse.Merge(dst, src)
+func (m *ImportProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsResponse.Merge(m, src)
 }
 func (m *ImportProductSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsResponse.Size(m)
@@ -1840,16 +1823,17 @@ func (m *BatchOperationMetadata) Reset()         { *m = BatchOperationMetadata{}
 func (m *BatchOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*BatchOperationMetadata) ProtoMessage()    {}
 func (*BatchOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_ad9db519f21bfe92, []int{28}
+	return fileDescriptor_3e303776708d7396, []int{28}
 }
+
 func (m *BatchOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchOperationMetadata.Unmarshal(m, b)
 }
 func (m *BatchOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *BatchOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchOperationMetadata.Merge(dst, src)
+func (m *BatchOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchOperationMetadata.Merge(m, src)
 }
 func (m *BatchOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_BatchOperationMetadata.Size(m)
@@ -1882,6 +1866,7 @@ func (m *BatchOperationMetadata) GetEndTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.BatchOperationMetadata_State", BatchOperationMetadata_State_name, BatchOperationMetadata_State_value)
 	proto.RegisterType((*Product)(nil), "google.cloud.vision.v1p3beta1.Product")
 	proto.RegisterType((*Product_KeyValue)(nil), "google.cloud.vision.v1p3beta1.Product.KeyValue")
 	proto.RegisterType((*ProductSet)(nil), "google.cloud.vision.v1p3beta1.ProductSet")
@@ -1912,7 +1897,131 @@ func init() {
 	proto.RegisterType((*ImportProductSetsRequest)(nil), "google.cloud.vision.v1p3beta1.ImportProductSetsRequest")
 	proto.RegisterType((*ImportProductSetsResponse)(nil), "google.cloud.vision.v1p3beta1.ImportProductSetsResponse")
 	proto.RegisterType((*BatchOperationMetadata)(nil), "google.cloud.vision.v1p3beta1.BatchOperationMetadata")
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.BatchOperationMetadata_State", BatchOperationMetadata_State_name, BatchOperationMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/product_search_service.proto", fileDescriptor_3e303776708d7396)
+}
+
+var fileDescriptor_3e303776708d7396 = []byte{
+	// 1867 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0xc6,
+	0x15, 0xce, 0xd8, 0xeb, 0x5d, 0xfb, 0xc9, 0xb2, 0xb5, 0x53, 0xd7, 0x56, 0xe4, 0x2c, 0xe2, 0xb0,
+	0x45, 0x9a, 0xa8, 0x89, 0xd8, 0x95, 0xb1, 0xdb, 0xae, 0xdc, 0x6c, 0x6a, 0xcb, 0xb2, 0xa3, 0xc6,
+	0xbb, 0xeb, 0x50, 0xf6, 0x36, 0xcd, 0x21, 0x02, 0x4d, 0x8e, 0x19, 0x76, 0x29, 0x92, 0xe1, 0x50,
+	0x46, 0x94, 0x22, 0x97, 0xa0, 0x87, 0xa2, 0x87, 0x06, 0x68, 0xd1, 0x43, 0x4e, 0x05, 0x12, 0xf4,
+	0x5c, 0xa0, 0x3f, 0x0e, 0x4d, 0x73, 0x28, 0x7a, 0x6b, 0x0f, 0xbd, 0xf4, 0xd8, 0x53, 0x81, 0xfc,
+	0x11, 0x3d, 0x16, 0x33, 0x1c, 0x4a, 0x24, 0x45, 0x99, 0x94, 0x36, 0x8b, 0xdc, 0x34, 0xc3, 0xf7,
+	0xde, 0x7c, 0xef, 0xbd, 0x6f, 0x66, 0xde, 0x1b, 0x41, 0xc3, 0x70, 0x1c, 0xc3, 0x22, 0xb2, 0x66,
+	0x39, 0x7d, 0x5d, 0xbe, 0x30, 0xa9, 0xe9, 0xd8, 0xf2, 0xc5, 0x4d, 0x77, 0xfb, 0x8c, 0xf8, 0xea,
+	0x4d, 0xd9, 0xf5, 0x1c, 0xbd, 0xaf, 0xf9, 0x5d, 0x4a, 0x54, 0x4f, 0x7b, 0xa7, 0x4b, 0x89, 0x77,
+	0x61, 0x6a, 0xa4, 0xe6, 0x7a, 0x8e, 0xef, 0xe0, 0x1b, 0x81, 0x6e, 0x8d, 0xeb, 0xd6, 0x02, 0xdd,
+	0xda, 0x50, 0xb7, 0xf2, 0x8c, 0x30, 0xad, 0xba, 0xa6, 0xac, 0xda, 0xb6, 0xe3, 0xab, 0xbe, 0xe9,
+	0xd8, 0x34, 0x50, 0xae, 0xbc, 0x74, 0xf9, 0xc2, 0x06, 0x71, 0x7a, 0xc4, 0xf7, 0x06, 0x42, 0xfa,
+	0x1b, 0x42, 0xda, 0x72, 0x6c, 0xc3, 0xeb, 0xdb, 0xb6, 0x69, 0x1b, 0xb2, 0xe3, 0x12, 0x2f, 0x66,
+	0x72, 0x53, 0x08, 0xf1, 0xd1, 0x59, 0xff, 0x5c, 0x26, 0x3d, 0xd7, 0x0f, 0x2d, 0x6c, 0x25, 0x3f,
+	0x9e, 0x9b, 0xc4, 0xd2, 0xbb, 0x3d, 0x95, 0x3e, 0x12, 0x12, 0xcf, 0x26, 0x25, 0x7c, 0xb3, 0x47,
+	0xa8, 0xaf, 0xf6, 0x5c, 0x21, 0xb0, 0x21, 0x04, 0x3c, 0x57, 0x93, 0xa9, 0xaf, 0xfa, 0x7d, 0xb1,
+	0xb0, 0xf4, 0xf1, 0x1c, 0x5c, 0x3b, 0x0e, 0x22, 0x85, 0x31, 0x5c, 0xb1, 0xd5, 0x1e, 0x29, 0xa3,
+	0x2d, 0xf4, 0xc2, 0x92, 0xc2, 0x7f, 0xe3, 0xe7, 0x60, 0x59, 0x37, 0xa9, 0x6b, 0xa9, 0x83, 0x2e,
+	0xff, 0x36, 0xc7, 0xbf, 0x15, 0xc4, 0xdc, 0x7d, 0x26, 0xb2, 0x05, 0x05, 0x9d, 0x50, 0xcd, 0x33,
+	0x5d, 0xe6, 0x51, 0x79, 0x5e, 0x48, 0x8c, 0xa6, 0xf0, 0x8b, 0x50, 0x0a, 0xb3, 0xa1, 0xa9, 0x3e,
+	0x31, 0x1c, 0x6f, 0x50, 0xbe, 0xc2, 0xc5, 0x56, 0xc5, 0x7c, 0x53, 0x4c, 0xe3, 0x87, 0xb0, 0x12,
+	0x8a, 0x5a, 0xea, 0x19, 0xb1, 0x68, 0x79, 0x61, 0x6b, 0xfe, 0x85, 0x42, 0x5d, 0xae, 0x5d, 0x9a,
+	0xb1, 0x9a, 0xf0, 0xa1, 0xf6, 0x3a, 0x19, 0x3c, 0x54, 0xad, 0x3e, 0x51, 0x8a, 0xc2, 0xcc, 0x11,
+	0xb7, 0x52, 0xa9, 0xc3, 0x62, 0xf8, 0x09, 0x97, 0x60, 0xfe, 0x11, 0x19, 0x08, 0x37, 0xd9, 0x4f,
+	0xbc, 0x06, 0x0b, 0x17, 0xec, 0x93, 0x70, 0x2f, 0x18, 0x48, 0x7f, 0x44, 0x00, 0xc2, 0x6e, 0x87,
+	0xcc, 0x1c, 0x9e, 0x3b, 0x00, 0xa6, 0xad, 0x93, 0xf7, 0xba, 0x2c, 0x27, 0x3c, 0x3a, 0x85, 0x7a,
+	0x25, 0xf4, 0x26, 0x4c, 0x58, 0xed, 0x24, 0x4c, 0x98, 0xb2, 0xc4, 0xa5, 0xd9, 0x18, 0x6f, 0x43,
+	0x21, 0x50, 0x25, 0x9e, 0xe7, 0x78, 0x3c, 0x64, 0x85, 0x3a, 0x0e, 0x75, 0x3d, 0x57, 0xab, 0x75,
+	0x78, 0x2e, 0x95, 0x60, 0x85, 0x16, 0x93, 0x92, 0x7e, 0x81, 0x60, 0x45, 0x21, 0xe7, 0xc4, 0x23,
+	0xb6, 0x46, 0xda, 0x3d, 0xd5, 0x20, 0xa9, 0xc8, 0x4b, 0x30, 0xdf, 0xf7, 0x4c, 0x01, 0x98, 0xfd,
+	0xc4, 0x0a, 0xac, 0x9c, 0x39, 0x7d, 0x5b, 0x37, 0x6d, 0xa3, 0xeb, 0x3a, 0xd6, 0x80, 0x96, 0xe7,
+	0x79, 0xe8, 0xbf, 0x9d, 0x11, 0xfa, 0x3d, 0xa1, 0x74, 0xec, 0x58, 0x03, 0xa5, 0x78, 0x16, 0x19,
+	0x51, 0xe9, 0x23, 0x04, 0x6b, 0x4d, 0x8f, 0xa8, 0x3e, 0x11, 0x81, 0x54, 0xc8, 0xbb, 0x7d, 0x42,
+	0x7d, 0xbc, 0x0e, 0x57, 0x5d, 0xd5, 0x23, 0xb6, 0x2f, 0x40, 0x89, 0x11, 0xfe, 0x01, 0x5c, 0x13,
+	0x89, 0xe3, 0xd0, 0x0a, 0xf5, 0xe7, 0xf3, 0x25, 0x5e, 0x09, 0xd5, 0xf0, 0x0d, 0x80, 0x90, 0x41,
+	0xa6, 0x2e, 0xd8, 0xb8, 0x24, 0x66, 0xda, 0xba, 0x64, 0xc2, 0xd7, 0x8e, 0x4c, 0xea, 0x0b, 0x35,
+	0x9a, 0x85, 0x67, 0x13, 0x96, 0x5c, 0xd5, 0x20, 0x5d, 0x6a, 0xbe, 0x1f, 0x64, 0x77, 0x41, 0x59,
+	0x64, 0x13, 0x1d, 0xf3, 0x7d, 0xc2, 0x97, 0x62, 0x1f, 0x7d, 0xe7, 0x11, 0xb1, 0x87, 0x4b, 0xa9,
+	0x06, 0x39, 0x61, 0x13, 0xd2, 0x87, 0x08, 0xd6, 0xe2, 0x6b, 0x51, 0xd7, 0xb1, 0x29, 0xc1, 0x7b,
+	0xb0, 0x28, 0x00, 0xd1, 0x32, 0xe2, 0x31, 0xce, 0xeb, 0xe5, 0x50, 0x0f, 0x3f, 0x0f, 0xab, 0x36,
+	0x79, 0xcf, 0xef, 0x46, 0x00, 0x04, 0xb9, 0x2c, 0xb2, 0xe9, 0xe3, 0x21, 0x88, 0x6f, 0xc1, 0xf5,
+	0x43, 0xe2, 0x27, 0xa2, 0x9f, 0x42, 0x08, 0xe9, 0x37, 0x08, 0xd6, 0x4e, 0x5d, 0x7d, 0x3c, 0x55,
+	0x91, 0x94, 0xa0, 0xd9, 0x52, 0xb2, 0x03, 0x85, 0x3e, 0xb7, 0xcc, 0xcf, 0x2c, 0x91, 0xd8, 0xf1,
+	0x3d, 0x70, 0xc0, 0x8e, 0xb5, 0x7b, 0x2a, 0x7d, 0xa4, 0x40, 0x20, 0xce, 0x7e, 0x4b, 0x55, 0x58,
+	0xdb, 0x27, 0x16, 0x19, 0x83, 0x95, 0xe6, 0xc3, 0xa7, 0x08, 0x36, 0x62, 0x74, 0xeb, 0x90, 0x4c,
+	0xc6, 0xfd, 0x10, 0x0a, 0xa3, 0xab, 0x22, 0x64, 0xdd, 0x8b, 0xf9, 0x5c, 0x64, 0xe6, 0x43, 0xb6,
+	0xb1, 0x23, 0xe2, 0x9b, 0xa3, 0xd3, 0x8b, 0x92, 0x08, 0xff, 0x96, 0x47, 0x32, 0x6d, 0x5d, 0xb2,
+	0x60, 0x3d, 0x42, 0x8b, 0x0e, 0x79, 0xb2, 0x2c, 0xfc, 0x08, 0xc1, 0xc6, 0xd8, 0x72, 0x82, 0x88,
+	0x47, 0xb0, 0x1c, 0xc1, 0x1b, 0x92, 0x71, 0x0a, 0xe7, 0x0b, 0x23, 0xc7, 0xf2, 0x53, 0xb2, 0x0a,
+	0x6b, 0x23, 0x4a, 0x46, 0x32, 0x94, 0x96, 0xd1, 0x4f, 0x10, 0x6c, 0xc4, 0x58, 0x19, 0x91, 0x4f,
+	0x64, 0x0e, 0x3d, 0x4e, 0xe6, 0x1e, 0x8b, 0xa2, 0x2f, 0xc3, 0x46, 0x8c, 0xa2, 0x19, 0x3e, 0xfd,
+	0x15, 0xc1, 0x66, 0xc0, 0xd2, 0xf8, 0x39, 0x9d, 0xc5, 0x82, 0x87, 0xb0, 0xea, 0x85, 0x0a, 0x5d,
+	0x93, 0x69, 0x08, 0x9c, 0x2f, 0x67, 0xf8, 0x9c, 0x58, 0x66, 0xc5, 0x8b, 0x5f, 0x0f, 0x2f, 0x01,
+	0x4e, 0xd8, 0x1d, 0x31, 0xb7, 0x14, 0x97, 0x6d, 0xeb, 0x92, 0x0b, 0x15, 0x46, 0xa7, 0xb8, 0xcd,
+	0x27, 0xca, 0xe0, 0xcf, 0x11, 0x6c, 0xa6, 0x2e, 0x29, 0x58, 0xfc, 0x26, 0x94, 0x12, 0xf8, 0x43,
+	0x26, 0x4f, 0x19, 0x98, 0xd5, 0xb8, 0xb3, 0xf4, 0x72, 0xd4, 0x29, 0x74, 0x9f, 0x4f, 0xa3, 0x7b,
+	0x0d, 0xca, 0x87, 0xc4, 0x4f, 0x4f, 0x75, 0x1a, 0x3d, 0x6e, 0xc2, 0x66, 0xc0, 0xa6, 0xfc, 0x2a,
+	0xf7, 0xe0, 0xc6, 0xae, 0xae, 0x0b, 0xf6, 0x9d, 0x38, 0xb9, 0x68, 0x88, 0xcb, 0xf1, 0xab, 0x76,
+	0x69, 0x78, 0x5e, 0x4b, 0x0a, 0x48, 0x0a, 0xe9, 0x39, 0x17, 0x21, 0x9f, 0x0f, 0x3c, 0xa7, 0xf7,
+	0xb8, 0x36, 0xdf, 0x85, 0x67, 0xa3, 0x77, 0x61, 0xdb, 0xce, 0x67, 0xf0, 0x71, 0x78, 0xf3, 0x4b,
+	0x04, 0x5b, 0x93, 0xd7, 0xfc, 0x0a, 0xee, 0xe2, 0xbb, 0x50, 0x69, 0xf7, 0x5c, 0xc7, 0x8b, 0x9e,
+	0xc5, 0x87, 0x1a, 0xed, 0x38, 0x7d, 0x4f, 0x63, 0x75, 0xf4, 0xb2, 0x46, 0x2f, 0xba, 0xe7, 0xa6,
+	0x45, 0xba, 0xac, 0x34, 0x0b, 0xc2, 0x00, 0x1a, 0xbd, 0x38, 0x30, 0x2d, 0x72, 0xea, 0x99, 0xd2,
+	0xcf, 0x10, 0x3c, 0x33, 0x66, 0xa0, 0x6d, 0xbb, 0x7d, 0xbf, 0xe9, 0xd8, 0xe7, 0xa6, 0x81, 0xdf,
+	0x02, 0x30, 0x34, 0xda, 0xa5, 0xdc, 0xa0, 0x38, 0x10, 0xef, 0x64, 0xb8, 0x33, 0x19, 0xd1, 0x6b,
+	0x4f, 0x29, 0x4b, 0x46, 0x38, 0xd8, 0x5b, 0x84, 0xab, 0x81, 0x5d, 0xe9, 0x57, 0x08, 0xca, 0x63,
+	0x5a, 0x59, 0x07, 0xc0, 0xdb, 0xb0, 0x6c, 0x32, 0xa4, 0x5d, 0x8d, 0x43, 0x15, 0x27, 0xd7, 0xce,
+	0xb4, 0xe0, 0x22, 0xde, 0x2a, 0x05, 0x73, 0x34, 0x90, 0x7e, 0x87, 0xe0, 0xe9, 0x14, 0x50, 0x4f,
+	0xfc, 0x88, 0xa8, 0xc1, 0x62, 0xd0, 0x50, 0x11, 0x5a, 0x9e, 0xe3, 0x16, 0xd3, 0x0a, 0xf4, 0xa1,
+	0x8c, 0xf4, 0xd9, 0x1c, 0xac, 0xef, 0xa9, 0xbe, 0xf6, 0xce, 0x83, 0xb0, 0x07, 0xbc, 0x47, 0x7c,
+	0x55, 0x57, 0x7d, 0x15, 0xbf, 0x01, 0x0b, 0x4c, 0x2c, 0x48, 0xdc, 0x4a, 0x66, 0x6c, 0xd2, 0xad,
+	0xf0, 0x15, 0x89, 0x12, 0x58, 0x62, 0xd7, 0x1a, 0xed, 0x9f, 0xf5, 0x4c, 0x3f, 0xe8, 0x3e, 0xe6,
+	0x32, 0xbb, 0x0f, 0x08, 0xc4, 0x79, 0xfb, 0x71, 0x0b, 0x16, 0x89, 0xad, 0xe7, 0xed, 0x5b, 0xae,
+	0x11, 0x5b, 0x67, 0x23, 0xe9, 0xc7, 0xb0, 0xc0, 0x31, 0xe0, 0xaf, 0xc3, 0xf5, 0xce, 0xc9, 0xee,
+	0x49, 0xab, 0x7b, 0x7a, 0xbf, 0x73, 0xdc, 0x6a, 0xb6, 0x0f, 0xda, 0xad, 0xfd, 0xd2, 0x53, 0x78,
+	0x05, 0xe0, 0x58, 0x79, 0xd0, 0x6c, 0x75, 0x3a, 0xed, 0xfb, 0x87, 0x25, 0xc4, 0xc6, 0x9d, 0xd3,
+	0x26, 0x1b, 0x1f, 0x9c, 0x1e, 0x95, 0xe6, 0x30, 0xc0, 0xd5, 0x83, 0xdd, 0xf6, 0x51, 0x6b, 0xbf,
+	0x34, 0x8f, 0x8b, 0xb0, 0xd4, 0xdc, 0xbd, 0xdf, 0x6c, 0x1d, 0xb1, 0xe1, 0x95, 0xfa, 0x6f, 0x37,
+	0xa1, 0x38, 0x4c, 0x2f, 0x6b, 0xeb, 0xf1, 0xdf, 0x11, 0x94, 0x92, 0x15, 0x1f, 0xbe, 0x9d, 0x11,
+	0xb9, 0x09, 0x25, 0x62, 0x25, 0x7f, 0xed, 0x20, 0xbd, 0xfe, 0xe1, 0xbf, 0xbf, 0xf8, 0xf5, 0x5c,
+	0x4b, 0xba, 0x1d, 0x69, 0xfc, 0x7f, 0x1a, 0x50, 0xfd, 0x15, 0xd7, 0x73, 0x7e, 0x42, 0x34, 0x9f,
+	0xca, 0x55, 0xd9, 0x72, 0xb4, 0xa0, 0xcf, 0x97, 0xab, 0x1f, 0xc8, 0x91, 0x5a, 0xa9, 0x11, 0xad,
+	0x5c, 0xf0, 0xdf, 0x10, 0xac, 0x26, 0x4a, 0x34, 0x7c, 0x2b, 0x03, 0x4b, 0x7a, 0x05, 0x59, 0xb9,
+	0x3d, 0xad, 0x5a, 0xb0, 0x41, 0xa4, 0xbb, 0xdc, 0x9f, 0xef, 0xe1, 0x19, 0xfd, 0xc1, 0xbf, 0x47,
+	0x50, 0x8c, 0x15, 0x75, 0x78, 0x3b, 0x03, 0x49, 0x5a, 0x09, 0x38, 0x4d, 0x06, 0x52, 0x11, 0xb3,
+	0x3b, 0x63, 0x02, 0xde, 0x28, 0x5c, 0xb9, 0xfa, 0x01, 0xfe, 0x17, 0x82, 0x52, 0xb2, 0xb2, 0xcc,
+	0x64, 0xce, 0x84, 0x52, 0x74, 0x1a, 0xdc, 0x3f, 0xe2, 0xb8, 0xdf, 0xa8, 0xef, 0xc5, 0x22, 0x3d,
+	0x62, 0x43, 0x2d, 0xbf, 0x0f, 0x71, 0x16, 0x7d, 0x82, 0xa0, 0x94, 0x2c, 0x43, 0x33, 0x1d, 0x9a,
+	0x50, 0xb7, 0x56, 0xd6, 0xc7, 0x76, 0x7a, 0xab, 0xe7, 0xfa, 0x83, 0x30, 0xea, 0xd5, 0x59, 0xa3,
+	0xfe, 0x07, 0x04, 0xc5, 0xd8, 0xf6, 0xcb, 0xe4, 0x49, 0xda, 0xf3, 0x41, 0x25, 0xe7, 0x1d, 0x2d,
+	0xed, 0x73, 0xb8, 0x77, 0xa5, 0xed, 0xe9, 0x69, 0x4d, 0x1b, 0xc3, 0xfe, 0xf5, 0x4f, 0x08, 0x96,
+	0xa3, 0x85, 0x04, 0xae, 0xe7, 0xdf, 0x65, 0xc3, 0x9d, 0xb9, 0x3d, 0x95, 0x8e, 0xd8, 0x96, 0x3b,
+	0x1c, 0xff, 0x2d, 0x3c, 0x0b, 0x7e, 0xfc, 0x29, 0x02, 0x18, 0xed, 0x32, 0xfc, 0x9d, 0xdc, 0x1b,
+	0x72, 0xda, 0x28, 0xa7, 0xa2, 0xcc, 0x41, 0x0a, 0xce, 0x88, 0xcf, 0x10, 0x14, 0x63, 0xdb, 0x2a,
+	0x93, 0x11, 0x69, 0xaf, 0x14, 0xb9, 0xb1, 0x1e, 0x71, 0xac, 0x07, 0xf5, 0x9d, 0x94, 0xed, 0x57,
+	0xcb, 0x89, 0x79, 0xc4, 0x8c, 0x8f, 0x11, 0x14, 0x63, 0x5b, 0x28, 0x13, 0x7c, 0xda, 0x5b, 0xc6,
+	0xc4, 0xdd, 0x26, 0x02, 0x5b, 0x9d, 0x29, 0xb0, 0xff, 0x1d, 0xbe, 0xbd, 0x25, 0x9e, 0x03, 0x1b,
+	0xb9, 0x76, 0x5c, 0x6a, 0xf7, 0x51, 0x99, 0xae, 0x5c, 0x92, 0xde, 0xe6, 0x0e, 0xbc, 0x29, 0xb5,
+	0x72, 0xf3, 0x37, 0xea, 0x82, 0x9c, 0x28, 0xb6, 0x1a, 0xc9, 0xfe, 0x17, 0xff, 0x05, 0x85, 0xaf,
+	0x43, 0x53, 0xfa, 0x78, 0x49, 0x87, 0x35, 0x31, 0x1b, 0xf7, 0xb8, 0x33, 0x87, 0xd5, 0xd6, 0xf4,
+	0xd9, 0x48, 0x7a, 0xc2, 0xf2, 0xf3, 0x1f, 0x14, 0x3c, 0x45, 0x26, 0xda, 0x5a, 0x7c, 0x27, 0xc7,
+	0x41, 0x91, 0xde, 0x7d, 0x57, 0x1a, 0xb3, 0xa8, 0x8a, 0xa3, 0x46, 0x78, 0x87, 0xbf, 0x9c, 0x54,
+	0xe1, 0x7f, 0x22, 0xfe, 0xf0, 0x98, 0x48, 0xcb, 0x77, 0xb3, 0xcf, 0xa0, 0x2f, 0x85, 0x77, 0xa9,
+	0xce, 0xcc, 0x9e, 0xaa, 0xcf, 0x11, 0xac, 0xa7, 0x37, 0xd8, 0xf8, 0xfb, 0x19, 0xc0, 0x2e, 0xed,
+	0xcb, 0x27, 0x52, 0x4d, 0x9c, 0x52, 0xd2, 0xee, 0x6c, 0xd7, 0x6c, 0x43, 0x1d, 0xae, 0xda, 0x40,
+	0x55, 0xfc, 0x0f, 0x04, 0x9b, 0x97, 0x34, 0xf4, 0x78, 0x37, 0x33, 0xb8, 0x59, 0x8f, 0x01, 0x13,
+	0x1d, 0x79, 0xc0, 0x1d, 0x69, 0x4b, 0xfb, 0x33, 0x3a, 0xe2, 0x45, 0x97, 0x66, 0xbe, 0x7c, 0x81,
+	0xa0, 0x3c, 0xa9, 0xa9, 0xc7, 0x77, 0xa7, 0xb8, 0x63, 0x53, 0x5e, 0x20, 0x2a, 0xaf, 0xce, 0xac,
+	0x2f, 0x36, 0xd1, 0x21, 0x77, 0x77, 0x17, 0xbf, 0x3a, 0x9b, 0xbb, 0xa3, 0xbb, 0xfb, 0xcf, 0x08,
+	0xae, 0x8f, 0xb5, 0xb3, 0x99, 0xdb, 0x67, 0x52, 0x57, 0x5e, 0xb9, 0x11, 0x2a, 0x46, 0xfe, 0x85,
+	0xac, 0x0d, 0x7b, 0x47, 0xe9, 0x35, 0x0e, 0x7b, 0x4f, 0x7a, 0x65, 0xc6, 0x6e, 0xc6, 0xe4, 0xeb,
+	0x36, 0x50, 0x75, 0xef, 0xe7, 0x08, 0x9e, 0xd3, 0x9c, 0xde, 0xe5, 0x38, 0xf7, 0x9e, 0x8e, 0x35,
+	0x71, 0x9d, 0xe0, 0xaf, 0xd9, 0x63, 0xc6, 0x9c, 0x63, 0xf4, 0x56, 0x53, 0xe8, 0x1a, 0x8e, 0xa5,
+	0xda, 0x46, 0xcd, 0xf1, 0x0c, 0xd9, 0x20, 0x36, 0xe7, 0x95, 0x1c, 0x7c, 0x52, 0x5d, 0x93, 0x4e,
+	0xf8, 0xf7, 0x75, 0x27, 0x98, 0xf8, 0x1f, 0x42, 0x67, 0x57, 0xb9, 0xca, 0xf6, 0xff, 0x03, 0x00,
+	0x00, 0xff, 0xff, 0x24, 0x8c, 0xbc, 0xfe, 0x28, 0x1e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2841,128 +2950,3 @@ var _ProductSearch_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/vision/v1p3beta1/product_search_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/vision/v1p3beta1/product_search_service.proto", fileDescriptor_product_search_service_ad9db519f21bfe92)
-}
-
-var fileDescriptor_product_search_service_ad9db519f21bfe92 = []byte{
-	// 1867 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0xc6,
-	0x15, 0xce, 0xd8, 0xeb, 0x5d, 0xfb, 0xc9, 0xb2, 0xb5, 0x53, 0xd7, 0x56, 0xe4, 0x2c, 0xe2, 0xb0,
-	0x45, 0x9a, 0xa8, 0x89, 0xd8, 0x95, 0xb1, 0xdb, 0xae, 0xdc, 0x6c, 0x6a, 0xcb, 0xb2, 0xa3, 0xc6,
-	0xbb, 0xeb, 0x50, 0xf6, 0x36, 0xcd, 0x21, 0x02, 0x4d, 0x8e, 0x19, 0x76, 0x29, 0x92, 0xe1, 0x50,
-	0x46, 0x94, 0x22, 0x97, 0xa0, 0x87, 0xa2, 0x87, 0x06, 0x68, 0xd1, 0x43, 0x4e, 0x05, 0x12, 0xf4,
-	0x5c, 0xa0, 0x3f, 0x0e, 0x4d, 0x73, 0x28, 0x7a, 0x6b, 0x0f, 0xbd, 0xf4, 0xd8, 0x53, 0x81, 0xfc,
-	0x11, 0x3d, 0x16, 0x33, 0x1c, 0x4a, 0x24, 0x45, 0x99, 0x94, 0x36, 0x8b, 0xdc, 0x34, 0xc3, 0xf7,
-	0xde, 0x7c, 0xef, 0xbd, 0x6f, 0x66, 0xde, 0x1b, 0x41, 0xc3, 0x70, 0x1c, 0xc3, 0x22, 0xb2, 0x66,
-	0x39, 0x7d, 0x5d, 0xbe, 0x30, 0xa9, 0xe9, 0xd8, 0xf2, 0xc5, 0x4d, 0x77, 0xfb, 0x8c, 0xf8, 0xea,
-	0x4d, 0xd9, 0xf5, 0x1c, 0xbd, 0xaf, 0xf9, 0x5d, 0x4a, 0x54, 0x4f, 0x7b, 0xa7, 0x4b, 0x89, 0x77,
-	0x61, 0x6a, 0xa4, 0xe6, 0x7a, 0x8e, 0xef, 0xe0, 0x1b, 0x81, 0x6e, 0x8d, 0xeb, 0xd6, 0x02, 0xdd,
-	0xda, 0x50, 0xb7, 0xf2, 0x8c, 0x30, 0xad, 0xba, 0xa6, 0xac, 0xda, 0xb6, 0xe3, 0xab, 0xbe, 0xe9,
-	0xd8, 0x34, 0x50, 0xae, 0xbc, 0x74, 0xf9, 0xc2, 0x06, 0x71, 0x7a, 0xc4, 0xf7, 0x06, 0x42, 0xfa,
-	0x1b, 0x42, 0xda, 0x72, 0x6c, 0xc3, 0xeb, 0xdb, 0xb6, 0x69, 0x1b, 0xb2, 0xe3, 0x12, 0x2f, 0x66,
-	0x72, 0x53, 0x08, 0xf1, 0xd1, 0x59, 0xff, 0x5c, 0x26, 0x3d, 0xd7, 0x0f, 0x2d, 0x6c, 0x25, 0x3f,
-	0x9e, 0x9b, 0xc4, 0xd2, 0xbb, 0x3d, 0x95, 0x3e, 0x12, 0x12, 0xcf, 0x26, 0x25, 0x7c, 0xb3, 0x47,
-	0xa8, 0xaf, 0xf6, 0x5c, 0x21, 0xb0, 0x21, 0x04, 0x3c, 0x57, 0x93, 0xa9, 0xaf, 0xfa, 0x7d, 0xb1,
-	0xb0, 0xf4, 0xf1, 0x1c, 0x5c, 0x3b, 0x0e, 0x22, 0x85, 0x31, 0x5c, 0xb1, 0xd5, 0x1e, 0x29, 0xa3,
-	0x2d, 0xf4, 0xc2, 0x92, 0xc2, 0x7f, 0xe3, 0xe7, 0x60, 0x59, 0x37, 0xa9, 0x6b, 0xa9, 0x83, 0x2e,
-	0xff, 0x36, 0xc7, 0xbf, 0x15, 0xc4, 0xdc, 0x7d, 0x26, 0xb2, 0x05, 0x05, 0x9d, 0x50, 0xcd, 0x33,
-	0x5d, 0xe6, 0x51, 0x79, 0x5e, 0x48, 0x8c, 0xa6, 0xf0, 0x8b, 0x50, 0x0a, 0xb3, 0xa1, 0xa9, 0x3e,
-	0x31, 0x1c, 0x6f, 0x50, 0xbe, 0xc2, 0xc5, 0x56, 0xc5, 0x7c, 0x53, 0x4c, 0xe3, 0x87, 0xb0, 0x12,
-	0x8a, 0x5a, 0xea, 0x19, 0xb1, 0x68, 0x79, 0x61, 0x6b, 0xfe, 0x85, 0x42, 0x5d, 0xae, 0x5d, 0x9a,
-	0xb1, 0x9a, 0xf0, 0xa1, 0xf6, 0x3a, 0x19, 0x3c, 0x54, 0xad, 0x3e, 0x51, 0x8a, 0xc2, 0xcc, 0x11,
-	0xb7, 0x52, 0xa9, 0xc3, 0x62, 0xf8, 0x09, 0x97, 0x60, 0xfe, 0x11, 0x19, 0x08, 0x37, 0xd9, 0x4f,
-	0xbc, 0x06, 0x0b, 0x17, 0xec, 0x93, 0x70, 0x2f, 0x18, 0x48, 0x7f, 0x44, 0x00, 0xc2, 0x6e, 0x87,
-	0xcc, 0x1c, 0x9e, 0x3b, 0x00, 0xa6, 0xad, 0x93, 0xf7, 0xba, 0x2c, 0x27, 0x3c, 0x3a, 0x85, 0x7a,
-	0x25, 0xf4, 0x26, 0x4c, 0x58, 0xed, 0x24, 0x4c, 0x98, 0xb2, 0xc4, 0xa5, 0xd9, 0x18, 0x6f, 0x43,
-	0x21, 0x50, 0x25, 0x9e, 0xe7, 0x78, 0x3c, 0x64, 0x85, 0x3a, 0x0e, 0x75, 0x3d, 0x57, 0xab, 0x75,
-	0x78, 0x2e, 0x95, 0x60, 0x85, 0x16, 0x93, 0x92, 0x7e, 0x81, 0x60, 0x45, 0x21, 0xe7, 0xc4, 0x23,
-	0xb6, 0x46, 0xda, 0x3d, 0xd5, 0x20, 0xa9, 0xc8, 0x4b, 0x30, 0xdf, 0xf7, 0x4c, 0x01, 0x98, 0xfd,
-	0xc4, 0x0a, 0xac, 0x9c, 0x39, 0x7d, 0x5b, 0x37, 0x6d, 0xa3, 0xeb, 0x3a, 0xd6, 0x80, 0x96, 0xe7,
-	0x79, 0xe8, 0xbf, 0x9d, 0x11, 0xfa, 0x3d, 0xa1, 0x74, 0xec, 0x58, 0x03, 0xa5, 0x78, 0x16, 0x19,
-	0x51, 0xe9, 0x23, 0x04, 0x6b, 0x4d, 0x8f, 0xa8, 0x3e, 0x11, 0x81, 0x54, 0xc8, 0xbb, 0x7d, 0x42,
-	0x7d, 0xbc, 0x0e, 0x57, 0x5d, 0xd5, 0x23, 0xb6, 0x2f, 0x40, 0x89, 0x11, 0xfe, 0x01, 0x5c, 0x13,
-	0x89, 0xe3, 0xd0, 0x0a, 0xf5, 0xe7, 0xf3, 0x25, 0x5e, 0x09, 0xd5, 0xf0, 0x0d, 0x80, 0x90, 0x41,
-	0xa6, 0x2e, 0xd8, 0xb8, 0x24, 0x66, 0xda, 0xba, 0x64, 0xc2, 0xd7, 0x8e, 0x4c, 0xea, 0x0b, 0x35,
-	0x9a, 0x85, 0x67, 0x13, 0x96, 0x5c, 0xd5, 0x20, 0x5d, 0x6a, 0xbe, 0x1f, 0x64, 0x77, 0x41, 0x59,
-	0x64, 0x13, 0x1d, 0xf3, 0x7d, 0xc2, 0x97, 0x62, 0x1f, 0x7d, 0xe7, 0x11, 0xb1, 0x87, 0x4b, 0xa9,
-	0x06, 0x39, 0x61, 0x13, 0xd2, 0x87, 0x08, 0xd6, 0xe2, 0x6b, 0x51, 0xd7, 0xb1, 0x29, 0xc1, 0x7b,
-	0xb0, 0x28, 0x00, 0xd1, 0x32, 0xe2, 0x31, 0xce, 0xeb, 0xe5, 0x50, 0x0f, 0x3f, 0x0f, 0xab, 0x36,
-	0x79, 0xcf, 0xef, 0x46, 0x00, 0x04, 0xb9, 0x2c, 0xb2, 0xe9, 0xe3, 0x21, 0x88, 0x6f, 0xc1, 0xf5,
-	0x43, 0xe2, 0x27, 0xa2, 0x9f, 0x42, 0x08, 0xe9, 0x37, 0x08, 0xd6, 0x4e, 0x5d, 0x7d, 0x3c, 0x55,
-	0x91, 0x94, 0xa0, 0xd9, 0x52, 0xb2, 0x03, 0x85, 0x3e, 0xb7, 0xcc, 0xcf, 0x2c, 0x91, 0xd8, 0xf1,
-	0x3d, 0x70, 0xc0, 0x8e, 0xb5, 0x7b, 0x2a, 0x7d, 0xa4, 0x40, 0x20, 0xce, 0x7e, 0x4b, 0x55, 0x58,
-	0xdb, 0x27, 0x16, 0x19, 0x83, 0x95, 0xe6, 0xc3, 0xa7, 0x08, 0x36, 0x62, 0x74, 0xeb, 0x90, 0x4c,
-	0xc6, 0xfd, 0x10, 0x0a, 0xa3, 0xab, 0x22, 0x64, 0xdd, 0x8b, 0xf9, 0x5c, 0x64, 0xe6, 0x43, 0xb6,
-	0xb1, 0x23, 0xe2, 0x9b, 0xa3, 0xd3, 0x8b, 0x92, 0x08, 0xff, 0x96, 0x47, 0x32, 0x6d, 0x5d, 0xb2,
-	0x60, 0x3d, 0x42, 0x8b, 0x0e, 0x79, 0xb2, 0x2c, 0xfc, 0x08, 0xc1, 0xc6, 0xd8, 0x72, 0x82, 0x88,
-	0x47, 0xb0, 0x1c, 0xc1, 0x1b, 0x92, 0x71, 0x0a, 0xe7, 0x0b, 0x23, 0xc7, 0xf2, 0x53, 0xb2, 0x0a,
-	0x6b, 0x23, 0x4a, 0x46, 0x32, 0x94, 0x96, 0xd1, 0x4f, 0x10, 0x6c, 0xc4, 0x58, 0x19, 0x91, 0x4f,
-	0x64, 0x0e, 0x3d, 0x4e, 0xe6, 0x1e, 0x8b, 0xa2, 0x2f, 0xc3, 0x46, 0x8c, 0xa2, 0x19, 0x3e, 0xfd,
-	0x15, 0xc1, 0x66, 0xc0, 0xd2, 0xf8, 0x39, 0x9d, 0xc5, 0x82, 0x87, 0xb0, 0xea, 0x85, 0x0a, 0x5d,
-	0x93, 0x69, 0x08, 0x9c, 0x2f, 0x67, 0xf8, 0x9c, 0x58, 0x66, 0xc5, 0x8b, 0x5f, 0x0f, 0x2f, 0x01,
-	0x4e, 0xd8, 0x1d, 0x31, 0xb7, 0x14, 0x97, 0x6d, 0xeb, 0x92, 0x0b, 0x15, 0x46, 0xa7, 0xb8, 0xcd,
-	0x27, 0xca, 0xe0, 0xcf, 0x11, 0x6c, 0xa6, 0x2e, 0x29, 0x58, 0xfc, 0x26, 0x94, 0x12, 0xf8, 0x43,
-	0x26, 0x4f, 0x19, 0x98, 0xd5, 0xb8, 0xb3, 0xf4, 0x72, 0xd4, 0x29, 0x74, 0x9f, 0x4f, 0xa3, 0x7b,
-	0x0d, 0xca, 0x87, 0xc4, 0x4f, 0x4f, 0x75, 0x1a, 0x3d, 0x6e, 0xc2, 0x66, 0xc0, 0xa6, 0xfc, 0x2a,
-	0xf7, 0xe0, 0xc6, 0xae, 0xae, 0x0b, 0xf6, 0x9d, 0x38, 0xb9, 0x68, 0x88, 0xcb, 0xf1, 0xab, 0x76,
-	0x69, 0x78, 0x5e, 0x4b, 0x0a, 0x48, 0x0a, 0xe9, 0x39, 0x17, 0x21, 0x9f, 0x0f, 0x3c, 0xa7, 0xf7,
-	0xb8, 0x36, 0xdf, 0x85, 0x67, 0xa3, 0x77, 0x61, 0xdb, 0xce, 0x67, 0xf0, 0x71, 0x78, 0xf3, 0x4b,
-	0x04, 0x5b, 0x93, 0xd7, 0xfc, 0x0a, 0xee, 0xe2, 0xbb, 0x50, 0x69, 0xf7, 0x5c, 0xc7, 0x8b, 0x9e,
-	0xc5, 0x87, 0x1a, 0xed, 0x38, 0x7d, 0x4f, 0x63, 0x75, 0xf4, 0xb2, 0x46, 0x2f, 0xba, 0xe7, 0xa6,
-	0x45, 0xba, 0xac, 0x34, 0x0b, 0xc2, 0x00, 0x1a, 0xbd, 0x38, 0x30, 0x2d, 0x72, 0xea, 0x99, 0xd2,
-	0xcf, 0x10, 0x3c, 0x33, 0x66, 0xa0, 0x6d, 0xbb, 0x7d, 0xbf, 0xe9, 0xd8, 0xe7, 0xa6, 0x81, 0xdf,
-	0x02, 0x30, 0x34, 0xda, 0xa5, 0xdc, 0xa0, 0x38, 0x10, 0xef, 0x64, 0xb8, 0x33, 0x19, 0xd1, 0x6b,
-	0x4f, 0x29, 0x4b, 0x46, 0x38, 0xd8, 0x5b, 0x84, 0xab, 0x81, 0x5d, 0xe9, 0x57, 0x08, 0xca, 0x63,
-	0x5a, 0x59, 0x07, 0xc0, 0xdb, 0xb0, 0x6c, 0x32, 0xa4, 0x5d, 0x8d, 0x43, 0x15, 0x27, 0xd7, 0xce,
-	0xb4, 0xe0, 0x22, 0xde, 0x2a, 0x05, 0x73, 0x34, 0x90, 0x7e, 0x87, 0xe0, 0xe9, 0x14, 0x50, 0x4f,
-	0xfc, 0x88, 0xa8, 0xc1, 0x62, 0xd0, 0x50, 0x11, 0x5a, 0x9e, 0xe3, 0x16, 0xd3, 0x0a, 0xf4, 0xa1,
-	0x8c, 0xf4, 0xd9, 0x1c, 0xac, 0xef, 0xa9, 0xbe, 0xf6, 0xce, 0x83, 0xb0, 0x07, 0xbc, 0x47, 0x7c,
-	0x55, 0x57, 0x7d, 0x15, 0xbf, 0x01, 0x0b, 0x4c, 0x2c, 0x48, 0xdc, 0x4a, 0x66, 0x6c, 0xd2, 0xad,
-	0xf0, 0x15, 0x89, 0x12, 0x58, 0x62, 0xd7, 0x1a, 0xed, 0x9f, 0xf5, 0x4c, 0x3f, 0xe8, 0x3e, 0xe6,
-	0x32, 0xbb, 0x0f, 0x08, 0xc4, 0x79, 0xfb, 0x71, 0x0b, 0x16, 0x89, 0xad, 0xe7, 0xed, 0x5b, 0xae,
-	0x11, 0x5b, 0x67, 0x23, 0xe9, 0xc7, 0xb0, 0xc0, 0x31, 0xe0, 0xaf, 0xc3, 0xf5, 0xce, 0xc9, 0xee,
-	0x49, 0xab, 0x7b, 0x7a, 0xbf, 0x73, 0xdc, 0x6a, 0xb6, 0x0f, 0xda, 0xad, 0xfd, 0xd2, 0x53, 0x78,
-	0x05, 0xe0, 0x58, 0x79, 0xd0, 0x6c, 0x75, 0x3a, 0xed, 0xfb, 0x87, 0x25, 0xc4, 0xc6, 0x9d, 0xd3,
-	0x26, 0x1b, 0x1f, 0x9c, 0x1e, 0x95, 0xe6, 0x30, 0xc0, 0xd5, 0x83, 0xdd, 0xf6, 0x51, 0x6b, 0xbf,
-	0x34, 0x8f, 0x8b, 0xb0, 0xd4, 0xdc, 0xbd, 0xdf, 0x6c, 0x1d, 0xb1, 0xe1, 0x95, 0xfa, 0x6f, 0x37,
-	0xa1, 0x38, 0x4c, 0x2f, 0x6b, 0xeb, 0xf1, 0xdf, 0x11, 0x94, 0x92, 0x15, 0x1f, 0xbe, 0x9d, 0x11,
-	0xb9, 0x09, 0x25, 0x62, 0x25, 0x7f, 0xed, 0x20, 0xbd, 0xfe, 0xe1, 0xbf, 0xbf, 0xf8, 0xf5, 0x5c,
-	0x4b, 0xba, 0x1d, 0x69, 0xfc, 0x7f, 0x1a, 0x50, 0xfd, 0x15, 0xd7, 0x73, 0x7e, 0x42, 0x34, 0x9f,
-	0xca, 0x55, 0xd9, 0x72, 0xb4, 0xa0, 0xcf, 0x97, 0xab, 0x1f, 0xc8, 0x91, 0x5a, 0xa9, 0x11, 0xad,
-	0x5c, 0xf0, 0xdf, 0x10, 0xac, 0x26, 0x4a, 0x34, 0x7c, 0x2b, 0x03, 0x4b, 0x7a, 0x05, 0x59, 0xb9,
-	0x3d, 0xad, 0x5a, 0xb0, 0x41, 0xa4, 0xbb, 0xdc, 0x9f, 0xef, 0xe1, 0x19, 0xfd, 0xc1, 0xbf, 0x47,
-	0x50, 0x8c, 0x15, 0x75, 0x78, 0x3b, 0x03, 0x49, 0x5a, 0x09, 0x38, 0x4d, 0x06, 0x52, 0x11, 0xb3,
-	0x3b, 0x63, 0x02, 0xde, 0x28, 0x5c, 0xb9, 0xfa, 0x01, 0xfe, 0x17, 0x82, 0x52, 0xb2, 0xb2, 0xcc,
-	0x64, 0xce, 0x84, 0x52, 0x74, 0x1a, 0xdc, 0x3f, 0xe2, 0xb8, 0xdf, 0xa8, 0xef, 0xc5, 0x22, 0x3d,
-	0x62, 0x43, 0x2d, 0xbf, 0x0f, 0x71, 0x16, 0x7d, 0x82, 0xa0, 0x94, 0x2c, 0x43, 0x33, 0x1d, 0x9a,
-	0x50, 0xb7, 0x56, 0xd6, 0xc7, 0x76, 0x7a, 0xab, 0xe7, 0xfa, 0x83, 0x30, 0xea, 0xd5, 0x59, 0xa3,
-	0xfe, 0x07, 0x04, 0xc5, 0xd8, 0xf6, 0xcb, 0xe4, 0x49, 0xda, 0xf3, 0x41, 0x25, 0xe7, 0x1d, 0x2d,
-	0xed, 0x73, 0xb8, 0x77, 0xa5, 0xed, 0xe9, 0x69, 0x4d, 0x1b, 0xc3, 0xfe, 0xf5, 0x4f, 0x08, 0x96,
-	0xa3, 0x85, 0x04, 0xae, 0xe7, 0xdf, 0x65, 0xc3, 0x9d, 0xb9, 0x3d, 0x95, 0x8e, 0xd8, 0x96, 0x3b,
-	0x1c, 0xff, 0x2d, 0x3c, 0x0b, 0x7e, 0xfc, 0x29, 0x02, 0x18, 0xed, 0x32, 0xfc, 0x9d, 0xdc, 0x1b,
-	0x72, 0xda, 0x28, 0xa7, 0xa2, 0xcc, 0x41, 0x0a, 0xce, 0x88, 0xcf, 0x10, 0x14, 0x63, 0xdb, 0x2a,
-	0x93, 0x11, 0x69, 0xaf, 0x14, 0xb9, 0xb1, 0x1e, 0x71, 0xac, 0x07, 0xf5, 0x9d, 0x94, 0xed, 0x57,
-	0xcb, 0x89, 0x79, 0xc4, 0x8c, 0x8f, 0x11, 0x14, 0x63, 0x5b, 0x28, 0x13, 0x7c, 0xda, 0x5b, 0xc6,
-	0xc4, 0xdd, 0x26, 0x02, 0x5b, 0x9d, 0x29, 0xb0, 0xff, 0x1d, 0xbe, 0xbd, 0x25, 0x9e, 0x03, 0x1b,
-	0xb9, 0x76, 0x5c, 0x6a, 0xf7, 0x51, 0x99, 0xae, 0x5c, 0x92, 0xde, 0xe6, 0x0e, 0xbc, 0x29, 0xb5,
-	0x72, 0xf3, 0x37, 0xea, 0x82, 0x9c, 0x28, 0xb6, 0x1a, 0xc9, 0xfe, 0x17, 0xff, 0x05, 0x85, 0xaf,
-	0x43, 0x53, 0xfa, 0x78, 0x49, 0x87, 0x35, 0x31, 0x1b, 0xf7, 0xb8, 0x33, 0x87, 0xd5, 0xd6, 0xf4,
-	0xd9, 0x48, 0x7a, 0xc2, 0xf2, 0xf3, 0x1f, 0x14, 0x3c, 0x45, 0x26, 0xda, 0x5a, 0x7c, 0x27, 0xc7,
-	0x41, 0x91, 0xde, 0x7d, 0x57, 0x1a, 0xb3, 0xa8, 0x8a, 0xa3, 0x46, 0x78, 0x87, 0xbf, 0x9c, 0x54,
-	0xe1, 0x7f, 0x22, 0xfe, 0xf0, 0x98, 0x48, 0xcb, 0x77, 0xb3, 0xcf, 0xa0, 0x2f, 0x85, 0x77, 0xa9,
-	0xce, 0xcc, 0x9e, 0xaa, 0xcf, 0x11, 0xac, 0xa7, 0x37, 0xd8, 0xf8, 0xfb, 0x19, 0xc0, 0x2e, 0xed,
-	0xcb, 0x27, 0x52, 0x4d, 0x9c, 0x52, 0xd2, 0xee, 0x6c, 0xd7, 0x6c, 0x43, 0x1d, 0xae, 0xda, 0x40,
-	0x55, 0xfc, 0x0f, 0x04, 0x9b, 0x97, 0x34, 0xf4, 0x78, 0x37, 0x33, 0xb8, 0x59, 0x8f, 0x01, 0x13,
-	0x1d, 0x79, 0xc0, 0x1d, 0x69, 0x4b, 0xfb, 0x33, 0x3a, 0xe2, 0x45, 0x97, 0x66, 0xbe, 0x7c, 0x81,
-	0xa0, 0x3c, 0xa9, 0xa9, 0xc7, 0x77, 0xa7, 0xb8, 0x63, 0x53, 0x5e, 0x20, 0x2a, 0xaf, 0xce, 0xac,
-	0x2f, 0x36, 0xd1, 0x21, 0x77, 0x77, 0x17, 0xbf, 0x3a, 0x9b, 0xbb, 0xa3, 0xbb, 0xfb, 0xcf, 0x08,
-	0xae, 0x8f, 0xb5, 0xb3, 0x99, 0xdb, 0x67, 0x52, 0x57, 0x5e, 0xb9, 0x11, 0x2a, 0x46, 0xfe, 0x85,
-	0xac, 0x0d, 0x7b, 0x47, 0xe9, 0x35, 0x0e, 0x7b, 0x4f, 0x7a, 0x65, 0xc6, 0x6e, 0xc6, 0xe4, 0xeb,
-	0x36, 0x50, 0x75, 0xef, 0xe7, 0x08, 0x9e, 0xd3, 0x9c, 0xde, 0xe5, 0x38, 0xf7, 0x9e, 0x8e, 0x35,
-	0x71, 0x9d, 0xe0, 0xaf, 0xd9, 0x63, 0xc6, 0x9c, 0x63, 0xf4, 0x56, 0x53, 0xe8, 0x1a, 0x8e, 0xa5,
-	0xda, 0x46, 0xcd, 0xf1, 0x0c, 0xd9, 0x20, 0x36, 0xe7, 0x95, 0x1c, 0x7c, 0x52, 0x5d, 0x93, 0x4e,
-	0xf8, 0xf7, 0x75, 0x27, 0x98, 0xf8, 0x1f, 0x42, 0x67, 0x57, 0xb9, 0xca, 0xf6, 0xff, 0x03, 0x00,
-	0x00, 0xff, 0xff, 0x24, 0x8c, 0xbc, 0xfe, 0x28, 0x1e, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go b/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
index db0ad4ab2a..297dc434d0 100644
--- a/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum to denote the type of break found. New line, space etc.
 type TextAnnotation_DetectedBreak_BreakType int32
@@ -46,6 +49,7 @@ var TextAnnotation_DetectedBreak_BreakType_name = map[int32]string{
 	4: "HYPHEN",
 	5: "LINE_BREAK",
 }
+
 var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 	"UNKNOWN":        0,
 	"SPACE":          1,
@@ -58,8 +62,9 @@ var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 func (x TextAnnotation_DetectedBreak_BreakType) String() string {
 	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
 }
+
 func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{0, 1, 0}
+	return fileDescriptor_44c2be7a5d3957fa, []int{0, 1, 0}
 }
 
 // Type of a block (text, image etc) as identified by OCR.
@@ -88,6 +93,7 @@ var Block_BlockType_name = map[int32]string{
 	4: "RULER",
 	5: "BARCODE",
 }
+
 var Block_BlockType_value = map[string]int32{
 	"UNKNOWN": 0,
 	"TEXT":    1,
@@ -100,8 +106,9 @@ var Block_BlockType_value = map[string]int32{
 func (x Block_BlockType) String() string {
 	return proto.EnumName(Block_BlockType_name, int32(x))
 }
+
 func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{2, 0}
+	return fileDescriptor_44c2be7a5d3957fa, []int{2, 0}
 }
 
 // TextAnnotation contains a structured representation of OCR extracted text.
@@ -126,16 +133,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{0}
+	return fileDescriptor_44c2be7a5d3957fa, []int{0}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -177,16 +185,17 @@ func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_
 func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
 func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{0, 0}
+	return fileDescriptor_44c2be7a5d3957fa, []int{0, 0}
 }
+
 func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+func (m *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
@@ -226,16 +235,17 @@ func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_Det
 func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
 func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{0, 1}
+	return fileDescriptor_44c2be7a5d3957fa, []int{0, 1}
 }
+
 func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+func (m *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
@@ -275,16 +285,17 @@ func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_Text
 func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_TextProperty) ProtoMessage()    {}
 func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{0, 2}
+	return fileDescriptor_44c2be7a5d3957fa, []int{0, 2}
 }
+
 func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
 }
 func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+func (m *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(m, src)
 }
 func (m *TextAnnotation_TextProperty) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
@@ -332,16 +343,17 @@ func (m *Page) Reset()         { *m = Page{} }
 func (m *Page) String() string { return proto.CompactTextString(m) }
 func (*Page) ProtoMessage()    {}
 func (*Page) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{1}
+	return fileDescriptor_44c2be7a5d3957fa, []int{1}
 }
+
 func (m *Page) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Page.Unmarshal(m, b)
 }
 func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
 }
-func (dst *Page) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Page.Merge(dst, src)
+func (m *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(m, src)
 }
 func (m *Page) XXX_Size() int {
 	return xxx_messageInfo_Page.Size(m)
@@ -427,16 +439,17 @@ func (m *Block) Reset()         { *m = Block{} }
 func (m *Block) String() string { return proto.CompactTextString(m) }
 func (*Block) ProtoMessage()    {}
 func (*Block) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{2}
+	return fileDescriptor_44c2be7a5d3957fa, []int{2}
 }
+
 func (m *Block) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Block.Unmarshal(m, b)
 }
 func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
 }
-func (dst *Block) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Block.Merge(dst, src)
+func (m *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(m, src)
 }
 func (m *Block) XXX_Size() int {
 	return xxx_messageInfo_Block.Size(m)
@@ -515,16 +528,17 @@ func (m *Paragraph) Reset()         { *m = Paragraph{} }
 func (m *Paragraph) String() string { return proto.CompactTextString(m) }
 func (*Paragraph) ProtoMessage()    {}
 func (*Paragraph) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{3}
+	return fileDescriptor_44c2be7a5d3957fa, []int{3}
 }
+
 func (m *Paragraph) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
 }
 func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
 }
-func (dst *Paragraph) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Paragraph.Merge(dst, src)
+func (m *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(m, src)
 }
 func (m *Paragraph) XXX_Size() int {
 	return xxx_messageInfo_Paragraph.Size(m)
@@ -597,16 +611,17 @@ func (m *Word) Reset()         { *m = Word{} }
 func (m *Word) String() string { return proto.CompactTextString(m) }
 func (*Word) ProtoMessage()    {}
 func (*Word) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{4}
+	return fileDescriptor_44c2be7a5d3957fa, []int{4}
 }
+
 func (m *Word) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Word.Unmarshal(m, b)
 }
 func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
 }
-func (dst *Word) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Word.Merge(dst, src)
+func (m *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(m, src)
 }
 func (m *Word) XXX_Size() int {
 	return xxx_messageInfo_Word.Size(m)
@@ -678,16 +693,17 @@ func (m *Symbol) Reset()         { *m = Symbol{} }
 func (m *Symbol) String() string { return proto.CompactTextString(m) }
 func (*Symbol) ProtoMessage()    {}
 func (*Symbol) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_2b5b30276ebe092b, []int{5}
+	return fileDescriptor_44c2be7a5d3957fa, []int{5}
 }
+
 func (m *Symbol) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Symbol.Unmarshal(m, b)
 }
 func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
 }
-func (dst *Symbol) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Symbol.Merge(dst, src)
+func (m *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(m, src)
 }
 func (m *Symbol) XXX_Size() int {
 	return xxx_messageInfo_Symbol.Size(m)
@@ -727,6 +743,8 @@ func (m *Symbol) GetConfidence() float32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.vision.v1p3beta1.TextAnnotation")
 	proto.RegisterType((*TextAnnotation_DetectedLanguage)(nil), "google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage")
 	proto.RegisterType((*TextAnnotation_DetectedBreak)(nil), "google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak")
@@ -736,15 +754,13 @@ func init() {
 	proto.RegisterType((*Paragraph)(nil), "google.cloud.vision.v1p3beta1.Paragraph")
 	proto.RegisterType((*Word)(nil), "google.cloud.vision.v1p3beta1.Word")
 	proto.RegisterType((*Symbol)(nil), "google.cloud.vision.v1p3beta1.Symbol")
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
-	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p3beta1/text_annotation.proto", fileDescriptor_text_annotation_2b5b30276ebe092b)
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/text_annotation.proto", fileDescriptor_44c2be7a5d3957fa)
 }
 
-var fileDescriptor_text_annotation_2b5b30276ebe092b = []byte{
+var fileDescriptor_44c2be7a5d3957fa = []byte{
 	// 775 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xd3, 0x48,
 	0x14, 0x5f, 0x27, 0x76, 0x1a, 0xbf, 0xb4, 0x91, 0x77, 0x76, 0xb5, 0x8a, 0xb2, 0xbb, 0xa8, 0xa4,
diff --git a/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go b/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
index fe1d777019..5eda81d576 100644
--- a/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p3beta1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Relevant information for the image from the Internet.
 type WebDetection struct {
@@ -45,16 +48,17 @@ func (m *WebDetection) Reset()         { *m = WebDetection{} }
 func (m *WebDetection) String() string { return proto.CompactTextString(m) }
 func (*WebDetection) ProtoMessage()    {}
 func (*WebDetection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_589fe4db54ca6b50, []int{0}
+	return fileDescriptor_05fec4ec9a1917ba, []int{0}
 }
+
 func (m *WebDetection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
 }
 func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection.Merge(dst, src)
+func (m *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(m, src)
 }
 func (m *WebDetection) XXX_Size() int {
 	return xxx_messageInfo_WebDetection.Size(m)
@@ -125,16 +129,17 @@ func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{}
 func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebEntity) ProtoMessage()    {}
 func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_589fe4db54ca6b50, []int{0, 0}
+	return fileDescriptor_05fec4ec9a1917ba, []int{0, 0}
 }
+
 func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
 }
 func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+func (m *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(m, src)
 }
 func (m *WebDetection_WebEntity) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
@@ -181,16 +186,17 @@ func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
 func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebImage) ProtoMessage()    {}
 func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_589fe4db54ca6b50, []int{0, 1}
+	return fileDescriptor_05fec4ec9a1917ba, []int{0, 1}
 }
+
 func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+func (m *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(m, src)
 }
 func (m *WebDetection_WebImage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebImage.Size(m)
@@ -240,16 +246,17 @@ func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
 func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebPage) ProtoMessage()    {}
 func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_589fe4db54ca6b50, []int{0, 2}
+	return fileDescriptor_05fec4ec9a1917ba, []int{0, 2}
 }
+
 func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+func (m *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(m, src)
 }
 func (m *WebDetection_WebPage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebPage.Size(m)
@@ -312,16 +319,17 @@ func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
 func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebLabel) ProtoMessage()    {}
 func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_589fe4db54ca6b50, []int{0, 3}
+	return fileDescriptor_05fec4ec9a1917ba, []int{0, 3}
 }
+
 func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
 }
 func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+func (m *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(m, src)
 }
 func (m *WebDetection_WebLabel) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
@@ -355,10 +363,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p3beta1/web_detection.proto", fileDescriptor_web_detection_589fe4db54ca6b50)
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/web_detection.proto", fileDescriptor_05fec4ec9a1917ba)
 }
 
-var fileDescriptor_web_detection_589fe4db54ca6b50 = []byte{
+var fileDescriptor_05fec4ec9a1917ba = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
 	0x18, 0xc6, 0x95, 0x76, 0x1b, 0x8d, 0x5b, 0x04, 0xb3, 0x86, 0x16, 0x05, 0x26, 0x15, 0xb8, 0xf4,
diff --git a/googleapis/cloud/vision/v1p4beta1/geometry.pb.go b/googleapis/cloud/vision/v1p4beta1/geometry.pb.go
index 24cb0e83b0..ca853c2a7a 100644
--- a/googleapis/cloud/vision/v1p4beta1/geometry.pb.go
+++ b/googleapis/cloud/vision/v1p4beta1/geometry.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p4beta1/geometry.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p4beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A vertex represents a 2D point in the image.
 // NOTE: the vertex coordinates are in the same scale as the original image.
@@ -35,16 +38,17 @@ func (m *Vertex) Reset()         { *m = Vertex{} }
 func (m *Vertex) String() string { return proto.CompactTextString(m) }
 func (*Vertex) ProtoMessage()    {}
 func (*Vertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_4a9669950dfd9675, []int{0}
+	return fileDescriptor_ece6a5fb4f75daa0, []int{0}
 }
+
 func (m *Vertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vertex.Unmarshal(m, b)
 }
 func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
 }
-func (dst *Vertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vertex.Merge(dst, src)
+func (m *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(m, src)
 }
 func (m *Vertex) XXX_Size() int {
 	return xxx_messageInfo_Vertex.Size(m)
@@ -86,16 +90,17 @@ func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
 func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
 func (*NormalizedVertex) ProtoMessage()    {}
 func (*NormalizedVertex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_4a9669950dfd9675, []int{1}
+	return fileDescriptor_ece6a5fb4f75daa0, []int{1}
 }
+
 func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
 }
 func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
 }
-func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+func (m *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(m, src)
 }
 func (m *NormalizedVertex) XXX_Size() int {
 	return xxx_messageInfo_NormalizedVertex.Size(m)
@@ -135,16 +140,17 @@ func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
 func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
 func (*BoundingPoly) ProtoMessage()    {}
 func (*BoundingPoly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_4a9669950dfd9675, []int{2}
+	return fileDescriptor_ece6a5fb4f75daa0, []int{2}
 }
+
 func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
 }
 func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
 }
-func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+func (m *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(m, src)
 }
 func (m *BoundingPoly) XXX_Size() int {
 	return xxx_messageInfo_BoundingPoly.Size(m)
@@ -188,16 +194,17 @@ func (m *Position) Reset()         { *m = Position{} }
 func (m *Position) String() string { return proto.CompactTextString(m) }
 func (*Position) ProtoMessage()    {}
 func (*Position) Descriptor() ([]byte, []int) {
-	return fileDescriptor_geometry_4a9669950dfd9675, []int{3}
+	return fileDescriptor_ece6a5fb4f75daa0, []int{3}
 }
+
 func (m *Position) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Position.Unmarshal(m, b)
 }
 func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
 }
-func (dst *Position) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Position.Merge(dst, src)
+func (m *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(m, src)
 }
 func (m *Position) XXX_Size() int {
 	return xxx_messageInfo_Position.Size(m)
@@ -237,10 +244,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p4beta1/geometry.proto", fileDescriptor_geometry_4a9669950dfd9675)
+	proto.RegisterFile("google/cloud/vision/v1p4beta1/geometry.proto", fileDescriptor_ece6a5fb4f75daa0)
 }
 
-var fileDescriptor_geometry_4a9669950dfd9675 = []byte{
+var fileDescriptor_ece6a5fb4f75daa0 = []byte{
 	// 311 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x6a, 0xf3, 0x30,
 	0x14, 0x85, 0x91, 0xf3, 0xff, 0x21, 0xa8, 0x29, 0x14, 0x77, 0x31, 0xa5, 0x85, 0xd4, 0xb4, 0x90,
diff --git a/googleapis/cloud/vision/v1p4beta1/image_annotator.pb.go b/googleapis/cloud/vision/v1p4beta1/image_annotator.pb.go
index 120e85c135..1e486571fb 100644
--- a/googleapis/cloud/vision/v1p4beta1/image_annotator.pb.go
+++ b/googleapis/cloud/vision/v1p4beta1/image_annotator.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p4beta1/image_annotator.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import color "google.golang.org/genproto/googleapis/type/color"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	color "google.golang.org/genproto/googleapis/type/color"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -28,7 +28,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
@@ -57,6 +57,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"UNKNOWN":       0,
 	"VERY_UNLIKELY": 1,
@@ -69,8 +70,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{0}
+	return fileDescriptor_8288fdc97aa9da03, []int{0}
 }
 
 // Type of Google Cloud Vision API feature to be extracted.
@@ -125,6 +127,7 @@ var Feature_Type_name = map[int32]string{
 	12: "PRODUCT_SEARCH",
 	19: "OBJECT_LOCALIZATION",
 }
+
 var Feature_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":        0,
 	"FACE_DETECTION":          1,
@@ -144,8 +147,9 @@ var Feature_Type_value = map[string]int32{
 func (x Feature_Type) String() string {
 	return proto.EnumName(Feature_Type_name, int32(x))
 }
+
 func (Feature_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{0, 0}
+	return fileDescriptor_8288fdc97aa9da03, []int{0, 0}
 }
 
 // Face landmark (feature) type.
@@ -264,6 +268,7 @@ var FaceAnnotation_Landmark_Type_name = map[int32]string{
 	33: "CHIN_LEFT_GONION",
 	34: "CHIN_RIGHT_GONION",
 }
+
 var FaceAnnotation_Landmark_Type_value = map[string]int32{
 	"UNKNOWN_LANDMARK":             0,
 	"LEFT_EYE":                     1,
@@ -305,8 +310,9 @@ var FaceAnnotation_Landmark_Type_value = map[string]int32{
 func (x FaceAnnotation_Landmark_Type) String() string {
 	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
 }
+
 func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{3, 0, 0}
+	return fileDescriptor_8288fdc97aa9da03, []int{3, 0, 0}
 }
 
 // Batch operation states.
@@ -332,6 +338,7 @@ var OperationMetadata_State_name = map[int32]string{
 	3: "DONE",
 	4: "CANCELLED",
 }
+
 var OperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATED":           1,
@@ -343,8 +350,9 @@ var OperationMetadata_State_value = map[string]int32{
 func (x OperationMetadata_State) String() string {
 	return proto.EnumName(OperationMetadata_State_name, int32(x))
 }
+
 func (OperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{37, 0}
+	return fileDescriptor_8288fdc97aa9da03, []int{37, 0}
 }
 
 // The type of Google Cloud Vision API detection to perform, and the maximum
@@ -369,16 +377,17 @@ func (m *Feature) Reset()         { *m = Feature{} }
 func (m *Feature) String() string { return proto.CompactTextString(m) }
 func (*Feature) ProtoMessage()    {}
 func (*Feature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{0}
+	return fileDescriptor_8288fdc97aa9da03, []int{0}
 }
+
 func (m *Feature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feature.Unmarshal(m, b)
 }
 func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
 }
-func (dst *Feature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Feature.Merge(dst, src)
+func (m *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(m, src)
 }
 func (m *Feature) XXX_Size() int {
 	return xxx_messageInfo_Feature.Size(m)
@@ -446,16 +455,17 @@ func (m *ImageSource) Reset()         { *m = ImageSource{} }
 func (m *ImageSource) String() string { return proto.CompactTextString(m) }
 func (*ImageSource) ProtoMessage()    {}
 func (*ImageSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{1}
+	return fileDescriptor_8288fdc97aa9da03, []int{1}
 }
+
 func (m *ImageSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
 }
 func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
 }
-func (dst *ImageSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageSource.Merge(dst, src)
+func (m *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(m, src)
 }
 func (m *ImageSource) XXX_Size() int {
 	return xxx_messageInfo_ImageSource.Size(m)
@@ -499,16 +509,17 @@ func (m *Image) Reset()         { *m = Image{} }
 func (m *Image) String() string { return proto.CompactTextString(m) }
 func (*Image) ProtoMessage()    {}
 func (*Image) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{2}
+	return fileDescriptor_8288fdc97aa9da03, []int{2}
 }
+
 func (m *Image) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Image.Unmarshal(m, b)
 }
 func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
 }
-func (dst *Image) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Image.Merge(dst, src)
+func (m *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(m, src)
 }
 func (m *Image) XXX_Size() int {
 	return xxx_messageInfo_Image.Size(m)
@@ -590,16 +601,17 @@ func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
 func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation) ProtoMessage()    {}
 func (*FaceAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{3}
+	return fileDescriptor_8288fdc97aa9da03, []int{3}
 }
+
 func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
 }
 func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+func (m *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(m, src)
 }
 func (m *FaceAnnotation) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation.Size(m)
@@ -730,16 +742,17 @@ func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark
 func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
 func (*FaceAnnotation_Landmark) ProtoMessage()    {}
 func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{3, 0}
+	return fileDescriptor_8288fdc97aa9da03, []int{3, 0}
 }
+
 func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
 }
 func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
 }
-func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+func (m *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(m, src)
 }
 func (m *FaceAnnotation_Landmark) XXX_Size() int {
 	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
@@ -777,16 +790,17 @@ func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
 func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
 func (*LocationInfo) ProtoMessage()    {}
 func (*LocationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{4}
+	return fileDescriptor_8288fdc97aa9da03, []int{4}
 }
+
 func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
 }
 func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
 }
-func (dst *LocationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationInfo.Merge(dst, src)
+func (m *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(m, src)
 }
 func (m *LocationInfo) XXX_Size() int {
 	return xxx_messageInfo_LocationInfo.Size(m)
@@ -821,16 +835,17 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{5}
+	return fileDescriptor_8288fdc97aa9da03, []int{5}
 }
+
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(dst, src)
+func (m *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(m, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -908,16 +923,17 @@ func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
 func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
 func (*EntityAnnotation) ProtoMessage()    {}
 func (*EntityAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{6}
+	return fileDescriptor_8288fdc97aa9da03, []int{6}
 }
+
 func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
 }
 func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+func (m *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(m, src)
 }
 func (m *EntityAnnotation) XXX_Size() int {
 	return xxx_messageInfo_EntityAnnotation.Size(m)
@@ -1015,16 +1031,17 @@ func (m *LocalizedObjectAnnotation) Reset()         { *m = LocalizedObjectAnnota
 func (m *LocalizedObjectAnnotation) String() string { return proto.CompactTextString(m) }
 func (*LocalizedObjectAnnotation) ProtoMessage()    {}
 func (*LocalizedObjectAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{7}
+	return fileDescriptor_8288fdc97aa9da03, []int{7}
 }
+
 func (m *LocalizedObjectAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Unmarshal(m, b)
 }
 func (m *LocalizedObjectAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *LocalizedObjectAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocalizedObjectAnnotation.Merge(dst, src)
+func (m *LocalizedObjectAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalizedObjectAnnotation.Merge(m, src)
 }
 func (m *LocalizedObjectAnnotation) XXX_Size() int {
 	return xxx_messageInfo_LocalizedObjectAnnotation.Size(m)
@@ -1100,16 +1117,17 @@ func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
 func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
 func (*SafeSearchAnnotation) ProtoMessage()    {}
 func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{8}
+	return fileDescriptor_8288fdc97aa9da03, []int{8}
 }
+
 func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
 }
 func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+func (m *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(m, src)
 }
 func (m *SafeSearchAnnotation) XXX_Size() int {
 	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
@@ -1170,16 +1188,17 @@ func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
 func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
 func (*LatLongRect) ProtoMessage()    {}
 func (*LatLongRect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{9}
+	return fileDescriptor_8288fdc97aa9da03, []int{9}
 }
+
 func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
 }
 func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
 }
-func (dst *LatLongRect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LatLongRect.Merge(dst, src)
+func (m *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(m, src)
 }
 func (m *LatLongRect) XXX_Size() int {
 	return xxx_messageInfo_LatLongRect.Size(m)
@@ -1223,16 +1242,17 @@ func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
 func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
 func (*ColorInfo) ProtoMessage()    {}
 func (*ColorInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{10}
+	return fileDescriptor_8288fdc97aa9da03, []int{10}
 }
+
 func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
 }
 func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
 }
-func (dst *ColorInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ColorInfo.Merge(dst, src)
+func (m *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(m, src)
 }
 func (m *ColorInfo) XXX_Size() int {
 	return xxx_messageInfo_ColorInfo.Size(m)
@@ -1277,16 +1297,17 @@ func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotati
 func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*DominantColorsAnnotation) ProtoMessage()    {}
 func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{11}
+	return fileDescriptor_8288fdc97aa9da03, []int{11}
 }
+
 func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
 }
 func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+func (m *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(m, src)
 }
 func (m *DominantColorsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
@@ -1317,16 +1338,17 @@ func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
 func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
 func (*ImageProperties) ProtoMessage()    {}
 func (*ImageProperties) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{12}
+	return fileDescriptor_8288fdc97aa9da03, []int{12}
 }
+
 func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
 }
 func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
 }
-func (dst *ImageProperties) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageProperties.Merge(dst, src)
+func (m *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(m, src)
 }
 func (m *ImageProperties) XXX_Size() int {
 	return xxx_messageInfo_ImageProperties.Size(m)
@@ -1363,16 +1385,17 @@ func (m *CropHint) Reset()         { *m = CropHint{} }
 func (m *CropHint) String() string { return proto.CompactTextString(m) }
 func (*CropHint) ProtoMessage()    {}
 func (*CropHint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{13}
+	return fileDescriptor_8288fdc97aa9da03, []int{13}
 }
+
 func (m *CropHint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHint.Unmarshal(m, b)
 }
 func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
 }
-func (dst *CropHint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHint.Merge(dst, src)
+func (m *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(m, src)
 }
 func (m *CropHint) XXX_Size() int {
 	return xxx_messageInfo_CropHint.Size(m)
@@ -1417,16 +1440,17 @@ func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
 func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
 func (*CropHintsAnnotation) ProtoMessage()    {}
 func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{14}
+	return fileDescriptor_8288fdc97aa9da03, []int{14}
 }
+
 func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
 }
 func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+func (m *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(m, src)
 }
 func (m *CropHintsAnnotation) XXX_Size() int {
 	return xxx_messageInfo_CropHintsAnnotation.Size(m)
@@ -1462,16 +1486,17 @@ func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
 func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
 func (*CropHintsParams) ProtoMessage()    {}
 func (*CropHintsParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{15}
+	return fileDescriptor_8288fdc97aa9da03, []int{15}
 }
+
 func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
 }
 func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
 }
-func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+func (m *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(m, src)
 }
 func (m *CropHintsParams) XXX_Size() int {
 	return xxx_messageInfo_CropHintsParams.Size(m)
@@ -1502,16 +1527,17 @@ func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
 func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
 func (*WebDetectionParams) ProtoMessage()    {}
 func (*WebDetectionParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{16}
+	return fileDescriptor_8288fdc97aa9da03, []int{16}
 }
+
 func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
 }
 func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
 }
-func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+func (m *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(m, src)
 }
 func (m *WebDetectionParams) XXX_Size() int {
 	return xxx_messageInfo_WebDetectionParams.Size(m)
@@ -1557,16 +1583,17 @@ func (m *ImageContext) Reset()         { *m = ImageContext{} }
 func (m *ImageContext) String() string { return proto.CompactTextString(m) }
 func (*ImageContext) ProtoMessage()    {}
 func (*ImageContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{17}
+	return fileDescriptor_8288fdc97aa9da03, []int{17}
 }
+
 func (m *ImageContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
 }
 func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageContext.Merge(dst, src)
+func (m *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(m, src)
 }
 func (m *ImageContext) XXX_Size() int {
 	return xxx_messageInfo_ImageContext.Size(m)
@@ -1630,16 +1657,17 @@ func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
 func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageRequest) ProtoMessage()    {}
 func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{18}
+	return fileDescriptor_8288fdc97aa9da03, []int{18}
 }
+
 func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
 }
 func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+func (m *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(m, src)
 }
 func (m *AnnotateImageRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageRequest.Size(m)
@@ -1688,16 +1716,17 @@ func (m *ImageAnnotationContext) Reset()         { *m = ImageAnnotationContext{}
 func (m *ImageAnnotationContext) String() string { return proto.CompactTextString(m) }
 func (*ImageAnnotationContext) ProtoMessage()    {}
 func (*ImageAnnotationContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{19}
+	return fileDescriptor_8288fdc97aa9da03, []int{19}
 }
+
 func (m *ImageAnnotationContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageAnnotationContext.Unmarshal(m, b)
 }
 func (m *ImageAnnotationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageAnnotationContext.Marshal(b, m, deterministic)
 }
-func (dst *ImageAnnotationContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageAnnotationContext.Merge(dst, src)
+func (m *ImageAnnotationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAnnotationContext.Merge(m, src)
 }
 func (m *ImageAnnotationContext) XXX_Size() int {
 	return xxx_messageInfo_ImageAnnotationContext.Size(m)
@@ -1768,16 +1797,17 @@ func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
 func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateImageResponse) ProtoMessage()    {}
 func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{20}
+	return fileDescriptor_8288fdc97aa9da03, []int{20}
 }
+
 func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
 }
 func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+func (m *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(m, src)
 }
 func (m *AnnotateImageResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateImageResponse.Size(m)
@@ -1904,16 +1934,17 @@ func (m *AnnotateFileResponse) Reset()         { *m = AnnotateFileResponse{} }
 func (m *AnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AnnotateFileResponse) ProtoMessage()    {}
 func (*AnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{21}
+	return fileDescriptor_8288fdc97aa9da03, []int{21}
 }
+
 func (m *AnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateFileResponse.Merge(dst, src)
+func (m *AnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileResponse.Merge(m, src)
 }
 func (m *AnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AnnotateFileResponse.Size(m)
@@ -1958,16 +1989,17 @@ func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesR
 func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
 func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{22}
+	return fileDescriptor_8288fdc97aa9da03, []int{22}
 }
+
 func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+func (m *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(m, src)
 }
 func (m *BatchAnnotateImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
@@ -1998,16 +2030,17 @@ func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImages
 func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
 func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{23}
+	return fileDescriptor_8288fdc97aa9da03, []int{23}
 }
+
 func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+func (m *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(m, src)
 }
 func (m *BatchAnnotateImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
@@ -2057,16 +2090,17 @@ func (m *AnnotateFileRequest) Reset()         { *m = AnnotateFileRequest{} }
 func (m *AnnotateFileRequest) String() string { return proto.CompactTextString(m) }
 func (*AnnotateFileRequest) ProtoMessage()    {}
 func (*AnnotateFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{24}
+	return fileDescriptor_8288fdc97aa9da03, []int{24}
 }
+
 func (m *AnnotateFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotateFileRequest.Unmarshal(m, b)
 }
 func (m *AnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotateFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *AnnotateFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotateFileRequest.Merge(dst, src)
+func (m *AnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileRequest.Merge(m, src)
 }
 func (m *AnnotateFileRequest) XXX_Size() int {
 	return xxx_messageInfo_AnnotateFileRequest.Size(m)
@@ -2119,16 +2153,17 @@ func (m *BatchAnnotateFilesRequest) Reset()         { *m = BatchAnnotateFilesReq
 func (m *BatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateFilesRequest) ProtoMessage()    {}
 func (*BatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{25}
+	return fileDescriptor_8288fdc97aa9da03, []int{25}
 }
+
 func (m *BatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateFilesRequest.Unmarshal(m, b)
 }
 func (m *BatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateFilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateFilesRequest.Merge(dst, src)
+func (m *BatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateFilesRequest.Merge(m, src)
 }
 func (m *BatchAnnotateFilesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateFilesRequest.Size(m)
@@ -2160,16 +2195,17 @@ func (m *BatchAnnotateFilesResponse) Reset()         { *m = BatchAnnotateFilesRe
 func (m *BatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchAnnotateFilesResponse) ProtoMessage()    {}
 func (*BatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{26}
+	return fileDescriptor_8288fdc97aa9da03, []int{26}
 }
+
 func (m *BatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchAnnotateFilesResponse.Unmarshal(m, b)
 }
 func (m *BatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchAnnotateFilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchAnnotateFilesResponse.Merge(dst, src)
+func (m *BatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateFilesResponse.Merge(m, src)
 }
 func (m *BatchAnnotateFilesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchAnnotateFilesResponse.Size(m)
@@ -2206,16 +2242,17 @@ func (m *AsyncAnnotateFileRequest) Reset()         { *m = AsyncAnnotateFileReque
 func (m *AsyncAnnotateFileRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileRequest) ProtoMessage()    {}
 func (*AsyncAnnotateFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{27}
+	return fileDescriptor_8288fdc97aa9da03, []int{27}
 }
+
 func (m *AsyncAnnotateFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(dst, src)
+func (m *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(m, src)
 }
 func (m *AsyncAnnotateFileRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileRequest.Size(m)
@@ -2267,16 +2304,17 @@ func (m *AsyncAnnotateFileResponse) Reset()         { *m = AsyncAnnotateFileResp
 func (m *AsyncAnnotateFileResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncAnnotateFileResponse) ProtoMessage()    {}
 func (*AsyncAnnotateFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{28}
+	return fileDescriptor_8288fdc97aa9da03, []int{28}
 }
+
 func (m *AsyncAnnotateFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Unmarshal(m, b)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(dst, src)
+func (m *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(m, src)
 }
 func (m *AsyncAnnotateFileResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncAnnotateFileResponse.Size(m)
@@ -2309,16 +2347,17 @@ func (m *AsyncBatchAnnotateImagesRequest) Reset()         { *m = AsyncBatchAnnot
 func (m *AsyncBatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateImagesRequest) ProtoMessage()    {}
 func (*AsyncBatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{29}
+	return fileDescriptor_8288fdc97aa9da03, []int{29}
 }
+
 func (m *AsyncBatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Merge(dst, src)
+func (m *AsyncBatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesRequest.Size(m)
@@ -2356,16 +2395,17 @@ func (m *AsyncBatchAnnotateImagesResponse) Reset()         { *m = AsyncBatchAnno
 func (m *AsyncBatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateImagesResponse) ProtoMessage()    {}
 func (*AsyncBatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{30}
+	return fileDescriptor_8288fdc97aa9da03, []int{30}
 }
+
 func (m *AsyncBatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Merge(dst, src)
+func (m *AsyncBatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateImagesResponse.Size(m)
@@ -2397,16 +2437,17 @@ func (m *AsyncBatchAnnotateFilesRequest) Reset()         { *m = AsyncBatchAnnota
 func (m *AsyncBatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesRequest) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{31}
+	return fileDescriptor_8288fdc97aa9da03, []int{31}
 }
+
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesRequest) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Size(m)
@@ -2438,16 +2479,17 @@ func (m *AsyncBatchAnnotateFilesResponse) Reset()         { *m = AsyncBatchAnnot
 func (m *AsyncBatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
 func (*AsyncBatchAnnotateFilesResponse) ProtoMessage()    {}
 func (*AsyncBatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{32}
+	return fileDescriptor_8288fdc97aa9da03, []int{32}
 }
+
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Unmarshal(m, b)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Marshal(b, m, deterministic)
 }
-func (dst *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(dst, src)
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(m, src)
 }
 func (m *AsyncBatchAnnotateFilesResponse) XXX_Size() int {
 	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Size(m)
@@ -2488,16 +2530,17 @@ func (m *InputConfig) Reset()         { *m = InputConfig{} }
 func (m *InputConfig) String() string { return proto.CompactTextString(m) }
 func (*InputConfig) ProtoMessage()    {}
 func (*InputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{33}
+	return fileDescriptor_8288fdc97aa9da03, []int{33}
 }
+
 func (m *InputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
 }
 func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
 }
-func (dst *InputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputConfig.Merge(dst, src)
+func (m *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(m, src)
 }
 func (m *InputConfig) XXX_Size() int {
 	return xxx_messageInfo_InputConfig.Size(m)
@@ -2554,16 +2597,17 @@ func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
 func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputConfig) ProtoMessage()    {}
 func (*OutputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{34}
+	return fileDescriptor_8288fdc97aa9da03, []int{34}
 }
+
 func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
 }
 func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputConfig.Merge(dst, src)
+func (m *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(m, src)
 }
 func (m *OutputConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputConfig.Size(m)
@@ -2602,16 +2646,17 @@ func (m *GcsSource) Reset()         { *m = GcsSource{} }
 func (m *GcsSource) String() string { return proto.CompactTextString(m) }
 func (*GcsSource) ProtoMessage()    {}
 func (*GcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{35}
+	return fileDescriptor_8288fdc97aa9da03, []int{35}
 }
+
 func (m *GcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
 }
 func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
 }
-func (dst *GcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsSource.Merge(dst, src)
+func (m *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(m, src)
 }
 func (m *GcsSource) XXX_Size() int {
 	return xxx_messageInfo_GcsSource.Size(m)
@@ -2656,16 +2701,17 @@ func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
 func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
 func (*GcsDestination) ProtoMessage()    {}
 func (*GcsDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{36}
+	return fileDescriptor_8288fdc97aa9da03, []int{36}
 }
+
 func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
 }
 func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
 }
-func (dst *GcsDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsDestination.Merge(dst, src)
+func (m *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(m, src)
 }
 func (m *GcsDestination) XXX_Size() int {
 	return xxx_messageInfo_GcsDestination.Size(m)
@@ -2700,16 +2746,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_annotator_4a9ef5af0fc4f4ff, []int{37}
+	return fileDescriptor_8288fdc97aa9da03, []int{37}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -2742,6 +2789,10 @@ func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p4beta1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.vision.v1p4beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p4beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p4beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
 	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1p4beta1.Feature")
 	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1p4beta1.ImageSource")
 	proto.RegisterType((*Image)(nil), "google.cloud.vision.v1p4beta1.Image")
@@ -2781,10 +2832,218 @@ func init() {
 	proto.RegisterType((*GcsSource)(nil), "google.cloud.vision.v1p4beta1.GcsSource")
 	proto.RegisterType((*GcsDestination)(nil), "google.cloud.vision.v1p4beta1.GcsDestination")
 	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.vision.v1p4beta1.OperationMetadata")
-	proto.RegisterEnum("google.cloud.vision.v1p4beta1.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.cloud.vision.v1p4beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1p4beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
-	proto.RegisterEnum("google.cloud.vision.v1p4beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p4beta1/image_annotator.proto", fileDescriptor_8288fdc97aa9da03)
+}
+
+var fileDescriptor_8288fdc97aa9da03 = []byte{
+	// 3262 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x41, 0x6f, 0x23, 0xc7,
+	0x95, 0x36, 0x49, 0x51, 0x22, 0x1f, 0x29, 0xa9, 0x55, 0x94, 0x34, 0x94, 0x66, 0x34, 0x23, 0xb7,
+	0xed, 0x5d, 0xd9, 0xeb, 0x95, 0x30, 0x1a, 0xdb, 0x6b, 0x8f, 0xd7, 0xeb, 0xa5, 0xa8, 0x96, 0xc4,
+	0x1d, 0x8a, 0xa4, 0x4b, 0xd4, 0x8c, 0x67, 0xe0, 0x45, 0x6f, 0xab, 0x59, 0xe4, 0xb4, 0xa7, 0xd9,
+	0xd5, 0xee, 0x6e, 0xce, 0x48, 0x73, 0x5c, 0x60, 0x0f, 0x7b, 0x58, 0x60, 0x81, 0xdc, 0x73, 0x48,
+	0x10, 0x18, 0x08, 0x10, 0xe7, 0x90, 0xfc, 0x83, 0xe4, 0x9c, 0x20, 0xc8, 0x21, 0x40, 0xae, 0xc9,
+	0x21, 0x3f, 0x21, 0xc7, 0xa0, 0xaa, 0xab, 0xc9, 0x6a, 0x92, 0x23, 0x8a, 0x33, 0x76, 0x10, 0x20,
+	0x27, 0x76, 0xbd, 0x57, 0xdf, 0xf7, 0xaa, 0xde, 0xab, 0x7a, 0xf5, 0xba, 0xd8, 0x70, 0xa7, 0x43,
+	0x69, 0xc7, 0x26, 0x3b, 0xa6, 0x4d, 0x7b, 0xad, 0x9d, 0xa7, 0x96, 0x6f, 0x51, 0x67, 0xe7, 0xe9,
+	0x6d, 0xf7, 0xbd, 0x33, 0x12, 0x18, 0xb7, 0x77, 0xac, 0xae, 0xd1, 0x21, 0xba, 0xe1, 0x38, 0x34,
+	0x30, 0x02, 0xea, 0x6d, 0xbb, 0x1e, 0x0d, 0x28, 0xda, 0x08, 0x41, 0xdb, 0x1c, 0xb4, 0x1d, 0x82,
+	0xb6, 0xfb, 0xa0, 0xf5, 0x1b, 0x82, 0xd3, 0x70, 0xad, 0x1d, 0x01, 0xb5, 0xa8, 0xe3, 0x87, 0xe0,
+	0xf5, 0x77, 0x2f, 0xb7, 0xd8, 0x21, 0xb4, 0x4b, 0x02, 0xef, 0x42, 0xf4, 0xde, 0xbd, 0xbc, 0xb7,
+	0xeb, 0xd1, 0x56, 0xcf, 0x0c, 0x74, 0x9f, 0x18, 0x9e, 0xf9, 0x58, 0x60, 0x26, 0xcc, 0x29, 0x20,
+	0xe7, 0x81, 0x3e, 0x18, 0x97, 0x00, 0xdd, 0xbe, 0x1c, 0xf4, 0x8c, 0x9c, 0xe9, 0x2d, 0x12, 0x10,
+	0x53, 0x82, 0xbc, 0x21, 0x20, 0x36, 0x75, 0x3a, 0x5e, 0xcf, 0x71, 0x2c, 0xa7, 0xb3, 0x43, 0x5d,
+	0xe2, 0xc5, 0xa6, 0xbb, 0x29, 0x3a, 0xf1, 0xd6, 0x59, 0xaf, 0xbd, 0xd3, 0xb6, 0x88, 0xdd, 0xd2,
+	0xbb, 0x86, 0xff, 0x44, 0xf4, 0xb8, 0x35, 0xdc, 0x23, 0xb0, 0xba, 0xc4, 0x0f, 0x8c, 0xae, 0x2b,
+	0x3a, 0x5c, 0x13, 0x1d, 0x3c, 0xd7, 0xdc, 0xf1, 0x03, 0x23, 0xe8, 0xf9, 0x43, 0x8a, 0xe0, 0xc2,
+	0x25, 0x3b, 0x26, 0xb5, 0xa3, 0x00, 0xad, 0x17, 0x65, 0x85, 0x6d, 0x04, 0xb6, 0xd3, 0x09, 0x35,
+	0xea, 0xd7, 0x29, 0x98, 0x3b, 0x20, 0x46, 0xd0, 0xf3, 0x08, 0xfa, 0x14, 0x66, 0x58, 0x87, 0x62,
+	0x62, 0x33, 0xb1, 0xb5, 0xb0, 0xfb, 0x4f, 0xdb, 0x97, 0x46, 0x75, 0x5b, 0xa0, 0xb6, 0x9b, 0x17,
+	0x2e, 0xc1, 0x1c, 0x88, 0x6e, 0x41, 0xae, 0x6b, 0x9c, 0xeb, 0x1e, 0xf1, 0x7b, 0x76, 0xe0, 0x17,
+	0x93, 0x9b, 0x89, 0xad, 0x34, 0x86, 0xae, 0x71, 0x8e, 0x43, 0x09, 0x5a, 0x86, 0x74, 0x97, 0xb6,
+	0x88, 0x5d, 0x4c, 0x6d, 0x26, 0xb6, 0xb2, 0x38, 0x6c, 0xa8, 0x3f, 0x4c, 0xc2, 0x0c, 0x63, 0x41,
+	0xcb, 0xa0, 0x34, 0x1f, 0x36, 0x34, 0xfd, 0xb4, 0x76, 0xd2, 0xd0, 0xca, 0x95, 0x83, 0x8a, 0xb6,
+	0xaf, 0xbc, 0x86, 0x10, 0x2c, 0x1c, 0x94, 0xca, 0x9a, 0xbe, 0xaf, 0x35, 0xb5, 0x72, 0xb3, 0x52,
+	0xaf, 0x29, 0x09, 0xb4, 0x0a, 0xa8, 0x5a, 0xaa, 0xed, 0x1f, 0x97, 0xf0, 0x3d, 0x49, 0x9e, 0x64,
+	0x7d, 0xab, 0xf5, 0xc3, 0xba, 0x24, 0x4b, 0xa1, 0x02, 0x2c, 0x56, 0x4b, 0x7b, 0x5a, 0x55, 0x12,
+	0xce, 0xb0, 0x8e, 0x4d, 0xed, 0xf3, 0xa6, 0x24, 0x4b, 0xa3, 0xeb, 0x70, 0x6d, 0xbf, 0x5e, 0x3e,
+	0x3d, 0xd6, 0x6a, 0x4d, 0x7d, 0x48, 0x99, 0x43, 0x6b, 0xb0, 0x72, 0x52, 0x3a, 0xd0, 0xf4, 0x13,
+	0xad, 0x84, 0xcb, 0x47, 0x92, 0x6a, 0x96, 0x0d, 0xbb, 0x72, 0x5c, 0x3a, 0xd4, 0xf4, 0x06, 0xae,
+	0x37, 0x34, 0xdc, 0xac, 0x68, 0x27, 0xca, 0x1c, 0x5a, 0x00, 0x28, 0xe3, 0x7a, 0x43, 0x3f, 0xaa,
+	0xd4, 0x9a, 0x27, 0x4a, 0x16, 0x2d, 0xc1, 0xfc, 0x03, 0x6d, 0x4f, 0x02, 0x02, 0x1b, 0x44, 0x03,
+	0xd7, 0xf7, 0x4f, 0xcb, 0x4d, 0x41, 0xab, 0xe4, 0xd1, 0x35, 0x28, 0xd4, 0xf7, 0xfe, 0x43, 0x2b,
+	0x37, 0xf5, 0x6a, 0xbd, 0x5c, 0xaa, 0x56, 0x1e, 0x95, 0x78, 0xe7, 0x82, 0x5a, 0x83, 0x5c, 0x85,
+	0xed, 0xbe, 0x13, 0xda, 0xf3, 0x4c, 0x82, 0x54, 0x98, 0xef, 0x98, 0xbe, 0x1e, 0x6e, 0xc8, 0x9e,
+	0x67, 0xf1, 0xa8, 0x65, 0x71, 0xae, 0x63, 0xfa, 0xbc, 0xdb, 0xa9, 0x67, 0xa1, 0xeb, 0x90, 0x1d,
+	0xe8, 0x93, 0x5c, 0x9f, 0xb1, 0x84, 0x52, 0x25, 0x90, 0xe6, 0x1d, 0x51, 0x11, 0xe6, 0x4c, 0xea,
+	0x04, 0xc4, 0x09, 0x38, 0x47, 0x1e, 0x47, 0x4d, 0xb4, 0x07, 0xb3, 0x3e, 0xb7, 0xc6, 0xc1, 0xb9,
+	0xdd, 0x77, 0x26, 0x2c, 0x09, 0x69, 0x7c, 0x58, 0x20, 0xd5, 0x1f, 0x29, 0xb0, 0x70, 0x60, 0x98,
+	0xa4, 0xd4, 0xdf, 0x60, 0xa8, 0x01, 0xf3, 0x67, 0xb4, 0xe7, 0xb4, 0x2c, 0xa7, 0xa3, 0xbb, 0xd4,
+	0xbe, 0xe0, 0x66, 0x73, 0x13, 0x17, 0xdc, 0x9e, 0xc0, 0x34, 0xa8, 0x7d, 0x81, 0xf3, 0x67, 0x52,
+	0x0b, 0x9d, 0x82, 0xd2, 0x6e, 0xe9, 0x71, 0xd2, 0xe4, 0xf4, 0xa4, 0x0b, 0xed, 0x96, 0xdc, 0x46,
+	0x4d, 0xc8, 0xda, 0x86, 0xd3, 0xea, 0x1a, 0xde, 0x13, 0xbf, 0x98, 0xda, 0x4c, 0x6d, 0xe5, 0x76,
+	0x3f, 0x98, 0xb4, 0x2b, 0x62, 0x53, 0xdd, 0xae, 0x0a, 0x38, 0x1e, 0x10, 0xa1, 0x0d, 0x00, 0x8f,
+	0xda, 0xb6, 0x6e, 0x38, 0x1d, 0x9b, 0x14, 0x67, 0x36, 0x13, 0x5b, 0x49, 0x9c, 0x65, 0x92, 0x12,
+	0x13, 0xb0, 0xa0, 0xb9, 0x86, 0x23, 0xb4, 0x69, 0xae, 0xcd, 0xb8, 0x86, 0x13, 0x2a, 0x37, 0x00,
+	0x02, 0xcb, 0x0e, 0x84, 0x76, 0x36, 0xc4, 0x32, 0x49, 0xa8, 0xbe, 0x0d, 0xcb, 0xfd, 0xa4, 0xa4,
+	0x9b, 0xd4, 0x69, 0x5b, 0x2d, 0xe2, 0x98, 0xa4, 0x38, 0xc7, 0x3b, 0x16, 0xfa, 0xba, 0x72, 0x5f,
+	0x85, 0xde, 0x87, 0xd5, 0x68, 0x68, 0xcc, 0x75, 0x12, 0x28, 0xc3, 0x41, 0x2b, 0x92, 0x56, 0x82,
+	0x35, 0x60, 0xe1, 0x4b, 0x7a, 0xa1, 0xdb, 0xd6, 0x13, 0x62, 0x5b, 0x8f, 0x29, 0x6d, 0x15, 0xb3,
+	0x3c, 0x6b, 0xbc, 0x3d, 0xc1, 0x3f, 0xd5, 0x3e, 0x00, 0xcf, 0x7f, 0x49, 0x2f, 0x06, 0x4d, 0x74,
+	0x1f, 0x96, 0x7c, 0xea, 0x79, 0xf4, 0x99, 0x4c, 0x0a, 0xd3, 0x92, 0x2a, 0x21, 0x87, 0xc4, 0xdb,
+	0x04, 0xc5, 0x70, 0x3a, 0xc4, 0x93, 0x69, 0x73, 0xd3, 0xd2, 0x2e, 0x72, 0x0a, 0x89, 0xf5, 0x11,
+	0x14, 0xfc, 0x9e, 0xe7, 0x7a, 0x96, 0x4f, 0x64, 0xe2, 0xfc, 0xb4, 0xc4, 0x28, 0x62, 0x91, 0xb8,
+	0x4d, 0x28, 0xf6, 0x9c, 0x16, 0xf1, 0x74, 0x72, 0xee, 0x52, 0x9f, 0xb4, 0x64, 0x03, 0xf3, 0xd3,
+	0x1a, 0x58, 0xe5, 0x54, 0x5a, 0xc8, 0x24, 0x19, 0xf9, 0x1c, 0xd0, 0x99, 0xdd, 0xf3, 0xbc, 0x38,
+	0xfd, 0xc2, 0xb4, 0xf4, 0x4b, 0x82, 0x24, 0xee, 0x9a, 0xc7, 0xc4, 0x68, 0x3d, 0x23, 0x46, 0xcc,
+	0xe7, 0x8b, 0x53, 0xbb, 0x26, 0x62, 0x19, 0xc8, 0xd6, 0x7f, 0x37, 0x07, 0x99, 0x68, 0x4f, 0xa1,
+	0xba, 0x38, 0xaf, 0x52, 0x9c, 0xf9, 0xe3, 0x97, 0xdb, 0x99, 0xf2, 0xf9, 0x55, 0x86, 0x8c, 0x4b,
+	0x7d, 0x8b, 0xe9, 0xf9, 0xbe, 0xcc, 0xed, 0xfe, 0xe3, 0x04, 0xd2, 0x86, 0xe8, 0x8e, 0xfb, 0x40,
+	0xf5, 0xe7, 0xb3, 0x83, 0xd3, 0xec, 0xb4, 0x76, 0xaf, 0x56, 0x7f, 0x50, 0xd3, 0xa3, 0xb3, 0x4a,
+	0x79, 0x0d, 0xe5, 0x21, 0x53, 0xd5, 0x0e, 0x9a, 0xba, 0xf6, 0x50, 0x53, 0x12, 0x68, 0x1e, 0xb2,
+	0xb8, 0x72, 0x78, 0x14, 0x36, 0x93, 0xa8, 0x08, 0xcb, 0x5c, 0x59, 0x3f, 0xd0, 0xa3, 0x4e, 0x7b,
+	0xb8, 0xfe, 0x40, 0x49, 0xb1, 0xe3, 0x27, 0xec, 0x38, 0xac, 0x9a, 0x61, 0xaa, 0x08, 0xd4, 0xe7,
+	0xe2, 0xaa, 0x34, 0x5a, 0x87, 0xd5, 0x3e, 0x2a, 0xae, 0x9b, 0x65, 0xb0, 0xe3, 0xca, 0x7e, 0xa3,
+	0x5e, 0xa9, 0x35, 0xf5, 0x3d, 0xad, 0xf9, 0x40, 0xd3, 0x6a, 0x4c, 0xcb, 0x8e, 0xae, 0x3c, 0x64,
+	0x6a, 0xf5, 0x13, 0x4d, 0x6f, 0x56, 0x1a, 0x4a, 0x86, 0x8d, 0xf1, 0xb4, 0xd1, 0xd0, 0xb0, 0x5e,
+	0xad, 0x34, 0x94, 0x2c, 0x6b, 0x56, 0xeb, 0x0f, 0x44, 0x13, 0xd8, 0x31, 0x77, 0x5c, 0x3f, 0x6d,
+	0x1e, 0xf1, 0x51, 0x29, 0x39, 0xb4, 0x08, 0xb9, 0xb0, 0xcd, 0xed, 0x29, 0x79, 0xa4, 0x40, 0x3e,
+	0x14, 0x94, 0xb5, 0x5a, 0x53, 0xc3, 0xca, 0x3c, 0x5a, 0x81, 0x25, 0x4e, 0xbf, 0x57, 0x6f, 0x36,
+	0xeb, 0xc7, 0xa2, 0xe3, 0x02, 0xf3, 0x97, 0x2c, 0xe6, 0x7c, 0x8b, 0xec, 0xa4, 0x97, 0xa5, 0x82,
+	0x44, 0xe9, 0xcf, 0x5a, 0x7b, 0xa8, 0xe9, 0xcd, 0x7a, 0x43, 0xdf, 0xab, 0x9f, 0xd6, 0xf6, 0x4b,
+	0xf8, 0xa1, 0xb2, 0x14, 0x53, 0x85, 0xb3, 0x2e, 0xd7, 0x71, 0x4d, 0xc3, 0x0a, 0x42, 0x37, 0xa0,
+	0xd8, 0x57, 0x09, 0xc6, 0x3e, 0xb0, 0xd0, 0x77, 0x3f, 0xd3, 0xf2, 0x07, 0x81, 0x5b, 0x1e, 0x38,
+	0x72, 0xc4, 0xdc, 0x4a, 0x5c, 0x17, 0xb3, 0xb7, 0x8a, 0x36, 0x60, 0x6d, 0xa0, 0x1b, 0x36, 0x78,
+	0x6d, 0x10, 0xd5, 0x61, 0x8b, 0x45, 0x74, 0x0b, 0xae, 0xcb, 0x71, 0xd6, 0xc3, 0x10, 0x44, 0x11,
+	0x53, 0xd6, 0xd0, 0x26, 0xdc, 0x88, 0x85, 0x74, 0xb8, 0xc7, 0x3a, 0x73, 0x68, 0x48, 0x51, 0xc2,
+	0x7a, 0x13, 0x97, 0x0e, 0x59, 0x1d, 0x71, 0x9d, 0x79, 0x5f, 0xe0, 0x24, 0xf1, 0x0d, 0x5e, 0x39,
+	0x45, 0x73, 0x6f, 0x9c, 0x36, 0x2a, 0x55, 0x65, 0x83, 0x55, 0x4e, 0x83, 0xe1, 0x85, 0xc2, 0x9b,
+	0x0c, 0x7f, 0x50, 0xc7, 0xda, 0x91, 0x56, 0xda, 0xd7, 0x0f, 0x79, 0x61, 0x55, 0x2d, 0x29, 0xb7,
+	0x58, 0x79, 0x53, 0x3e, 0xaa, 0xd4, 0xf4, 0xc3, 0x5a, 0xa9, 0x79, 0xc4, 0x28, 0x37, 0x99, 0x7d,
+	0x2e, 0xe2, 0xbc, 0x87, 0xf5, 0x1a, 0x93, 0xbe, 0xce, 0xf0, 0x5c, 0x1a, 0x32, 0x0b, 0xb1, 0xaa,
+	0xfe, 0x2b, 0xe4, 0xab, 0xd4, 0xe4, 0x7b, 0xb3, 0xe2, 0xb4, 0x29, 0x7a, 0x17, 0xe6, 0x6c, 0x23,
+	0xd0, 0x6d, 0xa7, 0x23, 0xca, 0x83, 0x42, 0xb4, 0x15, 0xd9, 0x56, 0xdd, 0xae, 0x1a, 0x41, 0xd5,
+	0xe9, 0xe0, 0x59, 0x9b, 0xff, 0xaa, 0x0f, 0x20, 0xd3, 0xf0, 0x58, 0xad, 0x1d, 0x5c, 0x20, 0x04,
+	0x33, 0x8e, 0xd1, 0x25, 0xa2, 0x20, 0xe2, 0xcf, 0xac, 0xf0, 0x7c, 0x6a, 0xd8, 0x3d, 0x22, 0xaa,
+	0xa0, 0xb0, 0x81, 0x5e, 0x87, 0x7c, 0xcf, 0x72, 0x82, 0x0f, 0xde, 0xd3, 0x43, 0x25, 0x4b, 0x24,
+	0x33, 0x38, 0x17, 0xca, 0xee, 0x33, 0x91, 0xfa, 0xfd, 0x14, 0x28, 0x9a, 0x13, 0x58, 0xc1, 0x85,
+	0x54, 0xc0, 0x28, 0x90, 0xea, 0x5a, 0x2d, 0x61, 0x80, 0x3d, 0xa2, 0x55, 0x98, 0xb5, 0xa9, 0x69,
+	0xd8, 0x91, 0x01, 0xd1, 0x42, 0x9b, 0x90, 0x6b, 0x11, 0xdf, 0xf4, 0x2c, 0x97, 0x27, 0x95, 0xb0,
+	0xec, 0x95, 0x45, 0x6c, 0x64, 0xbe, 0x49, 0xbd, 0xa8, 0x10, 0x08, 0x1b, 0x48, 0x05, 0x90, 0x4e,
+	0x62, 0x5e, 0x05, 0xec, 0x25, 0x8b, 0x09, 0x2c, 0x49, 0xd1, 0x4d, 0x80, 0x80, 0xba, 0x96, 0x69,
+	0xd8, 0x56, 0x70, 0x21, 0x6a, 0x01, 0x49, 0x32, 0x5a, 0x66, 0xcd, 0xbd, 0x6a, 0x99, 0x55, 0x81,
+	0xac, 0x2d, 0x62, 0xe4, 0x17, 0x33, 0xbc, 0x1e, 0x9a, 0xc4, 0x26, 0xc7, 0x14, 0x0f, 0xd0, 0xe8,
+	0x10, 0xc0, 0x0d, 0x03, 0x66, 0x11, 0xbf, 0x98, 0xe5, 0x5c, 0x13, 0x93, 0xad, 0x88, 0x30, 0x96,
+	0xa0, 0xea, 0xaf, 0x12, 0xb0, 0xc6, 0x8c, 0xd8, 0xd6, 0x73, 0xd2, 0xaa, 0x9f, 0x7d, 0x49, 0xcc,
+	0xe0, 0xd2, 0x48, 0xbd, 0x01, 0xf3, 0xb6, 0xe1, 0x74, 0x7a, 0xac, 0x2c, 0x36, 0x69, 0x2b, 0x0a,
+	0x58, 0x3e, 0x12, 0x96, 0x69, 0x8b, 0xf4, 0x97, 0x50, 0x2a, 0xbe, 0x84, 0xc6, 0x04, 0x6a, 0xc4,
+	0xc9, 0xe9, 0x57, 0x74, 0xb2, 0xfa, 0x87, 0x24, 0x2c, 0x9f, 0x18, 0x6d, 0x72, 0xc2, 0x5f, 0x61,
+	0xa5, 0xb9, 0x7c, 0x0a, 0x69, 0xa3, 0xd5, 0xb3, 0x03, 0xf1, 0x7e, 0x36, 0xc5, 0x49, 0x1a, 0xe2,
+	0x18, 0x81, 0xef, 0x52, 0xda, 0xe6, 0x53, 0x9e, 0x8e, 0x80, 0xe3, 0x50, 0x19, 0xe6, 0xba, 0xa4,
+	0xc5, 0xd6, 0x97, 0x38, 0x73, 0xa7, 0xa0, 0x88, 0x90, 0x48, 0x83, 0xcc, 0x53, 0x8b, 0xda, 0x7c,
+	0x61, 0xcf, 0x4c, 0xcb, 0xd2, 0x87, 0xa2, 0x4f, 0x60, 0xc6, 0x33, 0xcc, 0x8b, 0xe9, 0xcb, 0x4e,
+	0x0e, 0x53, 0x9f, 0x41, 0x8e, 0xa5, 0x10, 0xea, 0x74, 0x30, 0x31, 0x03, 0x74, 0x07, 0x72, 0x5d,
+	0xcb, 0xd1, 0xaf, 0x90, 0x71, 0xb2, 0x5d, 0xcb, 0x09, 0x1f, 0x39, 0xc8, 0x38, 0xef, 0x83, 0x92,
+	0x97, 0x81, 0x8c, 0xf3, 0xf0, 0x51, 0xf5, 0x20, 0x5b, 0x66, 0x6f, 0xe6, 0x3c, 0xc9, 0x6d, 0x41,
+	0x9a, 0xbf, 0xa6, 0x0b, 0x83, 0x28, 0x86, 0xe5, 0xdd, 0x70, 0xd8, 0x61, 0xb0, 0xfa, 0x92, 0xf2,
+	0xea, 0x7b, 0x0b, 0x16, 0x5c, 0xeb, 0x9c, 0xd8, 0x7a, 0xdb, 0x33, 0xcc, 0x7e, 0x86, 0x49, 0xe2,
+	0x79, 0x2e, 0x3d, 0x10, 0x42, 0xf5, 0x0b, 0x28, 0xee, 0xd3, 0xae, 0xe5, 0x18, 0x4e, 0xc0, 0x49,
+	0x7d, 0x69, 0x55, 0xfd, 0x3b, 0xcc, 0x72, 0x0b, 0x7e, 0x31, 0xc1, 0x37, 0xe1, 0xd6, 0x04, 0x4f,
+	0xf6, 0x07, 0x8f, 0x05, 0x4e, 0xf5, 0x61, 0x91, 0xbf, 0xf8, 0x35, 0xfa, 0x9b, 0x12, 0xfd, 0x17,
+	0x2c, 0xb6, 0x84, 0x41, 0xbd, 0xcf, 0xce, 0x66, 0xf8, 0x2f, 0x13, 0xd8, 0x5f, 0x34, 0x4c, 0xbc,
+	0xd0, 0x8a, 0x69, 0xd4, 0x9f, 0x24, 0x20, 0x53, 0xf6, 0xa8, 0x7b, 0x64, 0x39, 0xc1, 0x77, 0xf0,
+	0x42, 0x79, 0x33, 0x96, 0x7f, 0x43, 0x9f, 0xcb, 0xb9, 0x77, 0x07, 0x0a, 0x56, 0xd7, 0xa5, 0x5e,
+	0x60, 0x38, 0x26, 0x19, 0xf6, 0x3e, 0x1a, 0xa8, 0xfa, 0x21, 0xf8, 0x4f, 0x28, 0x44, 0xc3, 0x95,
+	0xbd, 0x7f, 0x00, 0x60, 0x7a, 0xd4, 0xd5, 0x1f, 0x33, 0xb9, 0x88, 0xc0, 0xa4, 0x34, 0x18, 0xf1,
+	0xe0, 0xac, 0x19, 0x31, 0xaa, 0x1f, 0xc0, 0x62, 0x9f, 0xbe, 0x61, 0x78, 0x46, 0xd7, 0x67, 0x89,
+	0xce, 0xf0, 0x5d, 0x62, 0x06, 0x3a, 0xbf, 0x80, 0x0a, 0xd9, 0x93, 0x38, 0x1f, 0x0a, 0x31, 0x97,
+	0xa9, 0xfb, 0x80, 0x1e, 0x90, 0xb3, 0xfd, 0xe8, 0xbd, 0x50, 0x40, 0xb7, 0xa1, 0x60, 0x39, 0xa6,
+	0xdd, 0x6b, 0x11, 0xbd, 0x43, 0x68, 0xec, 0x3e, 0x27, 0x83, 0x97, 0x84, 0xea, 0x90, 0x50, 0x71,
+	0xad, 0xa3, 0x7e, 0x93, 0x82, 0x3c, 0x5f, 0x02, 0x65, 0xea, 0x04, 0xe4, 0x3c, 0x40, 0x35, 0x96,
+	0x64, 0x03, 0xdd, 0xa6, 0x4e, 0x47, 0xf7, 0x88, 0x19, 0x88, 0x80, 0x4c, 0xba, 0x3f, 0x90, 0x76,
+	0x24, 0xce, 0xd9, 0xd2, 0xf6, 0x7c, 0x0b, 0x16, 0xfa, 0x49, 0x3b, 0x74, 0x55, 0x72, 0x33, 0xb5,
+	0x95, 0xc5, 0xfd, 0x54, 0xce, 0x27, 0x8e, 0x1e, 0xc1, 0xd2, 0xc0, 0x9b, 0xba, 0xcb, 0x27, 0x23,
+	0x0a, 0xf9, 0xed, 0x2b, 0x3a, 0x55, 0x78, 0x0f, 0x2f, 0x9a, 0x43, 0xee, 0x6c, 0xc3, 0x4a, 0xfc,
+	0x72, 0x31, 0xe2, 0x0f, 0x13, 0xfe, 0xee, 0xe4, 0xb3, 0x8b, 0x61, 0xc3, 0xa4, 0x2e, 0x6c, 0x14,
+	0xdc, 0x51, 0x21, 0x32, 0x61, 0x39, 0x76, 0xb7, 0x18, 0x99, 0x99, 0xe5, 0x66, 0x6e, 0x4f, 0x30,
+	0x33, 0x1a, 0x4c, 0x8c, 0x9e, 0x8d, 0xc8, 0xd4, 0x3f, 0x25, 0x60, 0x59, 0xac, 0x42, 0xc2, 0x03,
+	0x87, 0xc9, 0x57, 0x3d, 0xe2, 0x07, 0xe8, 0x2e, 0xa4, 0xf9, 0x05, 0x91, 0x08, 0xd8, 0x9b, 0x57,
+	0xb9, 0xf0, 0xc1, 0x21, 0x04, 0xed, 0x41, 0xa6, 0x1d, 0xde, 0x09, 0x86, 0xe1, 0xc9, 0xed, 0xfe,
+	0xc3, 0xd5, 0xae, 0x10, 0x71, 0x1f, 0xc7, 0x76, 0x72, 0x78, 0x63, 0x65, 0x86, 0x2b, 0x89, 0xef,
+	0xa8, 0xc9, 0x3b, 0x59, 0x5e, 0x7c, 0x38, 0x6f, 0x49, 0x2d, 0xf5, 0x1e, 0xac, 0x72, 0xed, 0x60,
+	0xd3, 0x45, 0x8b, 0x54, 0x81, 0xd4, 0xe0, 0xde, 0x8c, 0x3d, 0xa2, 0x5b, 0x90, 0x73, 0x99, 0x71,
+	0xa7, 0xd7, 0x3d, 0x23, 0x5e, 0x74, 0x7f, 0xc9, 0x44, 0x35, 0x2e, 0x51, 0x7f, 0x01, 0xb0, 0x32,
+	0xe4, 0x37, 0xdf, 0xa5, 0x8e, 0x4f, 0xd0, 0xe7, 0xa0, 0xb4, 0x0d, 0x93, 0x48, 0xf7, 0xc8, 0xd1,
+	0x76, 0xfe, 0xe7, 0xa9, 0xde, 0x4b, 0xf1, 0x62, 0x3b, 0xd6, 0xf6, 0xd1, 0x19, 0x2c, 0x47, 0x57,
+	0x30, 0x31, 0xf6, 0xd0, 0xc5, 0x3b, 0x13, 0xd8, 0x87, 0x6b, 0x57, 0x5c, 0x88, 0xc8, 0x64, 0x1b,
+	0x8f, 0x40, 0xb1, 0x69, 0x87, 0xc6, 0xf8, 0x53, 0x2f, 0xc7, 0xbf, 0xc8, 0x88, 0x64, 0xee, 0x2f,
+	0x60, 0xc9, 0x36, 0xce, 0x88, 0x1d, 0x23, 0x9f, 0x79, 0x39, 0x72, 0x85, 0x33, 0xc9, 0xec, 0xcf,
+	0xe1, 0x86, 0x1d, 0x55, 0x7f, 0x3a, 0xe5, 0xe5, 0x5f, 0xcc, 0xd0, 0x2a, 0x37, 0xf4, 0xe1, 0x15,
+	0xaa, 0xd4, 0xb1, 0x05, 0x24, 0x5e, 0xb7, 0x5f, 0xa4, 0xe2, 0x5e, 0x1b, 0xfa, 0xef, 0x80, 0x65,
+	0x83, 0x97, 0xf3, 0x1a, 0x23, 0x92, 0xb9, 0x75, 0x58, 0x6e, 0xf7, 0x6c, 0x5b, 0x1f, 0x32, 0xc0,
+	0x2f, 0x98, 0x26, 0xaf, 0xa9, 0x66, 0x8c, 0x0d, 0x23, 0x46, 0x15, 0x97, 0x21, 0x0b, 0x56, 0x7d,
+	0xa3, 0x4d, 0xa2, 0x64, 0x26, 0x99, 0x08, 0x33, 0xcd, 0x9d, 0x09, 0x26, 0xc6, 0x95, 0xa8, 0x78,
+	0xd9, 0x1f, 0x57, 0xb8, 0x3a, 0x70, 0x3d, 0xdc, 0xd4, 0x83, 0xb2, 0x5d, 0xb6, 0x97, 0xb9, 0x52,
+	0x82, 0x1e, 0x2a, 0x31, 0xf0, 0x9a, 0x15, 0x17, 0x48, 0xf6, 0xda, 0xb0, 0x22, 0x1d, 0x03, 0x92,
+	0xa5, 0xdc, 0x95, 0x52, 0xf5, 0x98, 0x73, 0x1a, 0x17, 0xcc, 0x31, 0x87, 0x77, 0x03, 0xe6, 0x63,
+	0xa9, 0x9a, 0x5f, 0xce, 0x4d, 0x4e, 0x56, 0x72, 0x8e, 0xc6, 0x79, 0x39, 0x3b, 0xb3, 0xa0, 0x0c,
+	0x1d, 0x32, 0xd1, 0xd9, 0xbb, 0x70, 0xa5, 0xa0, 0xc4, 0x4e, 0x19, 0x71, 0x3a, 0xe3, 0x65, 0x77,
+	0x8c, 0x94, 0x95, 0x9e, 0xc4, 0xf3, 0xa8, 0xc7, 0x0b, 0x68, 0xa9, 0xf4, 0xf4, 0x5c, 0x73, 0xfb,
+	0x84, 0xff, 0xa9, 0x84, 0xc3, 0x0e, 0xa8, 0x2e, 0xfe, 0x1f, 0x38, 0x0f, 0x8a, 0x2b, 0xbc, 0xef,
+	0xfb, 0x57, 0x09, 0xd5, 0x48, 0xbe, 0xc5, 0x11, 0x8b, 0xfa, 0x7b, 0xe9, 0xf4, 0x39, 0xb0, 0xec,
+	0x41, 0x12, 0x3d, 0x86, 0xbc, 0xe5, 0xb8, 0xbd, 0x20, 0xbc, 0x85, 0xee, 0x5c, 0xb1, 0x6a, 0xa8,
+	0x30, 0x08, 0xbf, 0x9a, 0xee, 0xe0, 0x9c, 0x35, 0x68, 0x20, 0x0c, 0x59, 0x4f, 0x50, 0x47, 0xe9,
+	0xf2, 0xbd, 0x09, 0x5c, 0x63, 0x93, 0x3b, 0x1e, 0xd0, 0xb0, 0x23, 0x22, 0xa0, 0x81, 0x61, 0xeb,
+	0xec, 0x54, 0xf0, 0xf9, 0xf1, 0x94, 0x66, 0x6f, 0xdd, 0x81, 0x61, 0x37, 0x98, 0x44, 0xed, 0xc2,
+	0xfa, 0x9e, 0x11, 0xf4, 0xd7, 0x7f, 0xc8, 0xe4, 0x47, 0xe7, 0x6b, 0x1d, 0x32, 0x5e, 0xf8, 0x18,
+	0x1d, 0x0f, 0x77, 0xa6, 0x1b, 0x11, 0xc7, 0xe2, 0x3e, 0x89, 0xfa, 0x15, 0x5c, 0x1f, 0x6b, 0x4e,
+	0x78, 0x34, 0xe6, 0x82, 0xc4, 0xb7, 0xe2, 0x02, 0xf5, 0xff, 0x93, 0x50, 0x88, 0x87, 0x2f, 0x9c,
+	0xdb, 0xb7, 0x1c, 0xbd, 0xbf, 0xc9, 0x72, 0x82, 0xbd, 0x87, 0x85, 0x91, 0x67, 0x27, 0x58, 0x1a,
+	0x87, 0x0d, 0xf5, 0x09, 0xac, 0xc5, 0xa2, 0xc0, 0xdc, 0xd2, 0x8f, 0x79, 0x6d, 0x24, 0xe6, 0xbb,
+	0x57, 0x0c, 0x81, 0xe4, 0x5d, 0x29, 0xe4, 0x74, 0x68, 0x85, 0x09, 0x63, 0x22, 0xe2, 0x9f, 0x8d,
+	0x46, 0xfc, 0xce, 0x54, 0xe6, 0x46, 0x03, 0xfe, 0x9b, 0x24, 0x14, 0x4b, 0xfe, 0x85, 0x63, 0xfe,
+	0xdd, 0x46, 0xbd, 0x01, 0xf3, 0xb4, 0x17, 0x48, 0xb3, 0x9c, 0xb9, 0x12, 0x63, 0x9d, 0x63, 0xc4,
+	0x34, 0xf3, 0x54, 0x6a, 0xa9, 0x5d, 0x58, 0x1b, 0xe3, 0x52, 0x11, 0xc3, 0x11, 0x73, 0x89, 0x57,
+	0x35, 0xf7, 0xcb, 0x04, 0xdc, 0xe2, 0xf6, 0xfe, 0x8a, 0xb9, 0x69, 0x74, 0x1a, 0xc9, 0x57, 0x9d,
+	0x46, 0x00, 0x9b, 0x2f, 0x9e, 0xc5, 0x77, 0xe6, 0xbc, 0x1e, 0xdc, 0x1c, 0xb5, 0x1a, 0xdb, 0xe2,
+	0x27, 0x23, 0xae, 0x9b, 0x74, 0xd1, 0xf1, 0xa2, 0xfd, 0x24, 0xed, 0xf3, 0x8b, 0x71, 0x21, 0x8b,
+	0x6f, 0xf6, 0xfb, 0xa3, 0x9b, 0xfd, 0xc3, 0xe9, 0x0d, 0x8f, 0xee, 0xf8, 0xff, 0x4b, 0x40, 0x4e,
+	0xda, 0xa2, 0xe8, 0x10, 0xa0, 0x63, 0xfa, 0xba, 0xf8, 0x18, 0x20, 0x74, 0xe8, 0xa4, 0x8b, 0xa2,
+	0x43, 0xd3, 0x17, 0x9f, 0x02, 0x64, 0x3b, 0xd1, 0xa3, 0xfc, 0xad, 0x41, 0x2a, 0xfe, 0xad, 0xc1,
+	0x75, 0xc8, 0x76, 0xad, 0x2e, 0xd1, 0xf9, 0x3f, 0x7a, 0xe2, 0x5b, 0x05, 0x26, 0x68, 0x5e, 0xb8,
+	0x44, 0xfd, 0x9f, 0x04, 0xe4, 0xe5, 0x00, 0xa1, 0xfb, 0xb0, 0xc8, 0x06, 0xd4, 0x22, 0x7e, 0x60,
+	0x39, 0x61, 0x71, 0x97, 0xb8, 0x52, 0x65, 0x7c, 0x68, 0xfa, 0xfb, 0x03, 0x10, 0x5e, 0xe8, 0xc4,
+	0xda, 0x68, 0x03, 0xe0, 0x8c, 0xb9, 0x5b, 0xf7, 0xad, 0xe7, 0x44, 0xbc, 0x00, 0x66, 0xb9, 0xe4,
+	0xc4, 0x7a, 0x4e, 0xd4, 0x0d, 0xc8, 0xf6, 0xa7, 0x35, 0xfa, 0xfe, 0xa8, 0xaa, 0xb0, 0x10, 0xe7,
+	0x1f, 0xd3, 0xe7, 0x9b, 0x24, 0x2c, 0xd5, 0xa3, 0x8f, 0x82, 0x8e, 0x49, 0x60, 0xb4, 0x8c, 0xc0,
+	0x40, 0x55, 0x48, 0xfb, 0x2c, 0x20, 0xe2, 0x6e, 0x77, 0xd2, 0x57, 0x06, 0x23, 0x04, 0xbc, 0x64,
+	0x23, 0x38, 0x24, 0x41, 0x1f, 0x43, 0xce, 0xf4, 0x88, 0x11, 0x10, 0x3d, 0xb0, 0xba, 0x44, 0xdc,
+	0x50, 0xac, 0x47, 0x9c, 0xd1, 0x77, 0x45, 0xdb, 0xcd, 0xe8, 0xbb, 0x22, 0x0c, 0x61, 0x77, 0x26,
+	0x60, 0xe0, 0x9e, 0xdb, 0xea, 0x83, 0x67, 0x27, 0x83, 0xc3, 0xee, 0x4c, 0xa0, 0x7e, 0x06, 0x69,
+	0x3e, 0x12, 0xb4, 0x02, 0x4b, 0x27, 0xcd, 0x52, 0x73, 0xf8, 0x5b, 0x9e, 0x1c, 0xcc, 0x95, 0xb1,
+	0x56, 0x6a, 0x6a, 0xfb, 0x4a, 0x82, 0x35, 0xf0, 0x69, 0xad, 0x56, 0xa9, 0x1d, 0x2a, 0x49, 0x94,
+	0x81, 0x99, 0xfd, 0x7a, 0x4d, 0x53, 0x52, 0x68, 0x1e, 0xb2, 0xe5, 0x52, 0xad, 0xac, 0x55, 0xab,
+	0xda, 0xbe, 0x32, 0xf3, 0x0e, 0x01, 0x90, 0xfe, 0x5c, 0xce, 0xc1, 0x9c, 0xf8, 0x53, 0x55, 0x79,
+	0x0d, 0x2d, 0xc1, 0xfc, 0x7d, 0x0d, 0x3f, 0xd4, 0x4f, 0x6b, 0xd5, 0xca, 0x3d, 0xad, 0xfa, 0x50,
+	0x49, 0xa0, 0x3c, 0x64, 0xfa, 0xad, 0x24, 0x6b, 0x35, 0xea, 0x27, 0x27, 0x95, 0xbd, 0x2a, 0x23,
+	0x06, 0x98, 0x15, 0x9a, 0x19, 0xb4, 0x08, 0x39, 0x0e, 0x15, 0x82, 0xf4, 0xee, 0xaf, 0xd3, 0xb0,
+	0x20, 0x17, 0xae, 0xd4, 0x43, 0x3f, 0x4b, 0x40, 0x61, 0x4c, 0xa6, 0x41, 0x1f, 0x4d, 0xba, 0x57,
+	0x7c, 0x61, 0x8e, 0x5d, 0xbf, 0xfb, 0x32, 0xd0, 0x70, 0x57, 0xaa, 0x6f, 0xfd, 0xf7, 0x6f, 0xff,
+	0xf8, 0xbd, 0xe4, 0x2d, 0x75, 0x7d, 0xf8, 0x7b, 0x3c, 0xff, 0xae, 0x78, 0xc7, 0x21, 0x77, 0x13,
+	0xef, 0xa0, 0x9f, 0x26, 0x00, 0x8d, 0xa6, 0x0c, 0xf4, 0xe1, 0x34, 0x96, 0xe5, 0xe4, 0xb6, 0xfe,
+	0xd1, 0x4b, 0x20, 0xc5, 0x90, 0xdf, 0xe4, 0x43, 0xbe, 0xa9, 0xae, 0x49, 0x43, 0x6e, 0xb3, 0x1e,
+	0xb1, 0x11, 0xff, 0x38, 0x21, 0xea, 0x8b, 0x71, 0xce, 0xfe, 0xb7, 0xab, 0xe4, 0xb3, 0x4b, 0x3c,
+	0xbe, 0x11, 0xe1, 0xa5, 0xaf, 0xf2, 0x06, 0xfb, 0x47, 0xdd, 0xe1, 0x23, 0x7c, 0x5b, 0x7d, 0x73,
+	0x8c, 0x53, 0x47, 0x98, 0xd9, 0x60, 0xbf, 0x4e, 0xc0, 0xb5, 0x17, 0xa4, 0x65, 0xf4, 0xc9, 0xd4,
+	0x63, 0x8d, 0x39, 0x7a, 0xc2, 0x50, 0xb7, 0xf9, 0x50, 0xb7, 0xd4, 0x37, 0x46, 0x9d, 0x39, 0x6e,
+	0xa4, 0x7b, 0xff, 0x9b, 0x80, 0xd7, 0x4d, 0xda, 0xbd, 0x7c, 0x4c, 0x7b, 0x85, 0xf8, 0xa2, 0x6f,
+	0xb0, 0xfd, 0xdd, 0x48, 0x3c, 0x2a, 0x0b, 0x54, 0x87, 0xda, 0x86, 0xd3, 0xd9, 0xa6, 0x5e, 0x67,
+	0xa7, 0x43, 0x1c, 0xbe, 0xfb, 0x77, 0x42, 0x95, 0xe1, 0x5a, 0xfe, 0x0b, 0xbe, 0x8e, 0xfc, 0x38,
+	0x14, 0xfc, 0x39, 0x91, 0xf8, 0x41, 0x72, 0xe6, 0xb0, 0x7c, 0xbf, 0x76, 0x36, 0xcb, 0x91, 0x77,
+	0xfe, 0x12, 0x00, 0x00, 0xff, 0xff, 0x60, 0xef, 0x71, 0x29, 0x5f, 0x2a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3001,215 +3260,3 @@ var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/vision/v1p4beta1/image_annotator.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/vision/v1p4beta1/image_annotator.proto", fileDescriptor_image_annotator_4a9ef5af0fc4f4ff)
-}
-
-var fileDescriptor_image_annotator_4a9ef5af0fc4f4ff = []byte{
-	// 3262 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x41, 0x6f, 0x23, 0xc7,
-	0x95, 0x36, 0x49, 0x51, 0x22, 0x1f, 0x29, 0xa9, 0x55, 0x94, 0x34, 0x94, 0x66, 0x34, 0x23, 0xb7,
-	0xed, 0x5d, 0xd9, 0xeb, 0x95, 0x30, 0x1a, 0xdb, 0x6b, 0x8f, 0xd7, 0xeb, 0xa5, 0xa8, 0x96, 0xc4,
-	0x1d, 0x8a, 0xa4, 0x4b, 0xd4, 0x8c, 0x67, 0xe0, 0x45, 0x6f, 0xab, 0x59, 0xe4, 0xb4, 0xa7, 0xd9,
-	0xd5, 0xee, 0x6e, 0xce, 0x48, 0x73, 0x5c, 0x60, 0x0f, 0x7b, 0x58, 0x60, 0x81, 0xdc, 0x73, 0x48,
-	0x10, 0x18, 0x08, 0x10, 0xe7, 0x90, 0xfc, 0x83, 0xe4, 0x9c, 0x20, 0xc8, 0x21, 0x40, 0xae, 0xc9,
-	0x21, 0x3f, 0x21, 0xc7, 0xa0, 0xaa, 0xab, 0xc9, 0x6a, 0x92, 0x23, 0x8a, 0x33, 0x76, 0x10, 0x20,
-	0x27, 0x76, 0xbd, 0x57, 0xdf, 0xf7, 0xaa, 0xde, 0xab, 0x7a, 0xf5, 0xba, 0xd8, 0x70, 0xa7, 0x43,
-	0x69, 0xc7, 0x26, 0x3b, 0xa6, 0x4d, 0x7b, 0xad, 0x9d, 0xa7, 0x96, 0x6f, 0x51, 0x67, 0xe7, 0xe9,
-	0x6d, 0xf7, 0xbd, 0x33, 0x12, 0x18, 0xb7, 0x77, 0xac, 0xae, 0xd1, 0x21, 0xba, 0xe1, 0x38, 0x34,
-	0x30, 0x02, 0xea, 0x6d, 0xbb, 0x1e, 0x0d, 0x28, 0xda, 0x08, 0x41, 0xdb, 0x1c, 0xb4, 0x1d, 0x82,
-	0xb6, 0xfb, 0xa0, 0xf5, 0x1b, 0x82, 0xd3, 0x70, 0xad, 0x1d, 0x01, 0xb5, 0xa8, 0xe3, 0x87, 0xe0,
-	0xf5, 0x77, 0x2f, 0xb7, 0xd8, 0x21, 0xb4, 0x4b, 0x02, 0xef, 0x42, 0xf4, 0xde, 0xbd, 0xbc, 0xb7,
-	0xeb, 0xd1, 0x56, 0xcf, 0x0c, 0x74, 0x9f, 0x18, 0x9e, 0xf9, 0x58, 0x60, 0x26, 0xcc, 0x29, 0x20,
-	0xe7, 0x81, 0x3e, 0x18, 0x97, 0x00, 0xdd, 0xbe, 0x1c, 0xf4, 0x8c, 0x9c, 0xe9, 0x2d, 0x12, 0x10,
-	0x53, 0x82, 0xbc, 0x21, 0x20, 0x36, 0x75, 0x3a, 0x5e, 0xcf, 0x71, 0x2c, 0xa7, 0xb3, 0x43, 0x5d,
-	0xe2, 0xc5, 0xa6, 0xbb, 0x29, 0x3a, 0xf1, 0xd6, 0x59, 0xaf, 0xbd, 0xd3, 0xb6, 0x88, 0xdd, 0xd2,
-	0xbb, 0x86, 0xff, 0x44, 0xf4, 0xb8, 0x35, 0xdc, 0x23, 0xb0, 0xba, 0xc4, 0x0f, 0x8c, 0xae, 0x2b,
-	0x3a, 0x5c, 0x13, 0x1d, 0x3c, 0xd7, 0xdc, 0xf1, 0x03, 0x23, 0xe8, 0xf9, 0x43, 0x8a, 0xe0, 0xc2,
-	0x25, 0x3b, 0x26, 0xb5, 0xa3, 0x00, 0xad, 0x17, 0x65, 0x85, 0x6d, 0x04, 0xb6, 0xd3, 0x09, 0x35,
-	0xea, 0xd7, 0x29, 0x98, 0x3b, 0x20, 0x46, 0xd0, 0xf3, 0x08, 0xfa, 0x14, 0x66, 0x58, 0x87, 0x62,
-	0x62, 0x33, 0xb1, 0xb5, 0xb0, 0xfb, 0x4f, 0xdb, 0x97, 0x46, 0x75, 0x5b, 0xa0, 0xb6, 0x9b, 0x17,
-	0x2e, 0xc1, 0x1c, 0x88, 0x6e, 0x41, 0xae, 0x6b, 0x9c, 0xeb, 0x1e, 0xf1, 0x7b, 0x76, 0xe0, 0x17,
-	0x93, 0x9b, 0x89, 0xad, 0x34, 0x86, 0xae, 0x71, 0x8e, 0x43, 0x09, 0x5a, 0x86, 0x74, 0x97, 0xb6,
-	0x88, 0x5d, 0x4c, 0x6d, 0x26, 0xb6, 0xb2, 0x38, 0x6c, 0xa8, 0x3f, 0x4c, 0xc2, 0x0c, 0x63, 0x41,
-	0xcb, 0xa0, 0x34, 0x1f, 0x36, 0x34, 0xfd, 0xb4, 0x76, 0xd2, 0xd0, 0xca, 0x95, 0x83, 0x8a, 0xb6,
-	0xaf, 0xbc, 0x86, 0x10, 0x2c, 0x1c, 0x94, 0xca, 0x9a, 0xbe, 0xaf, 0x35, 0xb5, 0x72, 0xb3, 0x52,
-	0xaf, 0x29, 0x09, 0xb4, 0x0a, 0xa8, 0x5a, 0xaa, 0xed, 0x1f, 0x97, 0xf0, 0x3d, 0x49, 0x9e, 0x64,
-	0x7d, 0xab, 0xf5, 0xc3, 0xba, 0x24, 0x4b, 0xa1, 0x02, 0x2c, 0x56, 0x4b, 0x7b, 0x5a, 0x55, 0x12,
-	0xce, 0xb0, 0x8e, 0x4d, 0xed, 0xf3, 0xa6, 0x24, 0x4b, 0xa3, 0xeb, 0x70, 0x6d, 0xbf, 0x5e, 0x3e,
-	0x3d, 0xd6, 0x6a, 0x4d, 0x7d, 0x48, 0x99, 0x43, 0x6b, 0xb0, 0x72, 0x52, 0x3a, 0xd0, 0xf4, 0x13,
-	0xad, 0x84, 0xcb, 0x47, 0x92, 0x6a, 0x96, 0x0d, 0xbb, 0x72, 0x5c, 0x3a, 0xd4, 0xf4, 0x06, 0xae,
-	0x37, 0x34, 0xdc, 0xac, 0x68, 0x27, 0xca, 0x1c, 0x5a, 0x00, 0x28, 0xe3, 0x7a, 0x43, 0x3f, 0xaa,
-	0xd4, 0x9a, 0x27, 0x4a, 0x16, 0x2d, 0xc1, 0xfc, 0x03, 0x6d, 0x4f, 0x02, 0x02, 0x1b, 0x44, 0x03,
-	0xd7, 0xf7, 0x4f, 0xcb, 0x4d, 0x41, 0xab, 0xe4, 0xd1, 0x35, 0x28, 0xd4, 0xf7, 0xfe, 0x43, 0x2b,
-	0x37, 0xf5, 0x6a, 0xbd, 0x5c, 0xaa, 0x56, 0x1e, 0x95, 0x78, 0xe7, 0x82, 0x5a, 0x83, 0x5c, 0x85,
-	0xed, 0xbe, 0x13, 0xda, 0xf3, 0x4c, 0x82, 0x54, 0x98, 0xef, 0x98, 0xbe, 0x1e, 0x6e, 0xc8, 0x9e,
-	0x67, 0xf1, 0xa8, 0x65, 0x71, 0xae, 0x63, 0xfa, 0xbc, 0xdb, 0xa9, 0x67, 0xa1, 0xeb, 0x90, 0x1d,
-	0xe8, 0x93, 0x5c, 0x9f, 0xb1, 0x84, 0x52, 0x25, 0x90, 0xe6, 0x1d, 0x51, 0x11, 0xe6, 0x4c, 0xea,
-	0x04, 0xc4, 0x09, 0x38, 0x47, 0x1e, 0x47, 0x4d, 0xb4, 0x07, 0xb3, 0x3e, 0xb7, 0xc6, 0xc1, 0xb9,
-	0xdd, 0x77, 0x26, 0x2c, 0x09, 0x69, 0x7c, 0x58, 0x20, 0xd5, 0x1f, 0x29, 0xb0, 0x70, 0x60, 0x98,
-	0xa4, 0xd4, 0xdf, 0x60, 0xa8, 0x01, 0xf3, 0x67, 0xb4, 0xe7, 0xb4, 0x2c, 0xa7, 0xa3, 0xbb, 0xd4,
-	0xbe, 0xe0, 0x66, 0x73, 0x13, 0x17, 0xdc, 0x9e, 0xc0, 0x34, 0xa8, 0x7d, 0x81, 0xf3, 0x67, 0x52,
-	0x0b, 0x9d, 0x82, 0xd2, 0x6e, 0xe9, 0x71, 0xd2, 0xe4, 0xf4, 0xa4, 0x0b, 0xed, 0x96, 0xdc, 0x46,
-	0x4d, 0xc8, 0xda, 0x86, 0xd3, 0xea, 0x1a, 0xde, 0x13, 0xbf, 0x98, 0xda, 0x4c, 0x6d, 0xe5, 0x76,
-	0x3f, 0x98, 0xb4, 0x2b, 0x62, 0x53, 0xdd, 0xae, 0x0a, 0x38, 0x1e, 0x10, 0xa1, 0x0d, 0x00, 0x8f,
-	0xda, 0xb6, 0x6e, 0x38, 0x1d, 0x9b, 0x14, 0x67, 0x36, 0x13, 0x5b, 0x49, 0x9c, 0x65, 0x92, 0x12,
-	0x13, 0xb0, 0xa0, 0xb9, 0x86, 0x23, 0xb4, 0x69, 0xae, 0xcd, 0xb8, 0x86, 0x13, 0x2a, 0x37, 0x00,
-	0x02, 0xcb, 0x0e, 0x84, 0x76, 0x36, 0xc4, 0x32, 0x49, 0xa8, 0xbe, 0x0d, 0xcb, 0xfd, 0xa4, 0xa4,
-	0x9b, 0xd4, 0x69, 0x5b, 0x2d, 0xe2, 0x98, 0xa4, 0x38, 0xc7, 0x3b, 0x16, 0xfa, 0xba, 0x72, 0x5f,
-	0x85, 0xde, 0x87, 0xd5, 0x68, 0x68, 0xcc, 0x75, 0x12, 0x28, 0xc3, 0x41, 0x2b, 0x92, 0x56, 0x82,
-	0x35, 0x60, 0xe1, 0x4b, 0x7a, 0xa1, 0xdb, 0xd6, 0x13, 0x62, 0x5b, 0x8f, 0x29, 0x6d, 0x15, 0xb3,
-	0x3c, 0x6b, 0xbc, 0x3d, 0xc1, 0x3f, 0xd5, 0x3e, 0x00, 0xcf, 0x7f, 0x49, 0x2f, 0x06, 0x4d, 0x74,
-	0x1f, 0x96, 0x7c, 0xea, 0x79, 0xf4, 0x99, 0x4c, 0x0a, 0xd3, 0x92, 0x2a, 0x21, 0x87, 0xc4, 0xdb,
-	0x04, 0xc5, 0x70, 0x3a, 0xc4, 0x93, 0x69, 0x73, 0xd3, 0xd2, 0x2e, 0x72, 0x0a, 0x89, 0xf5, 0x11,
-	0x14, 0xfc, 0x9e, 0xe7, 0x7a, 0x96, 0x4f, 0x64, 0xe2, 0xfc, 0xb4, 0xc4, 0x28, 0x62, 0x91, 0xb8,
-	0x4d, 0x28, 0xf6, 0x9c, 0x16, 0xf1, 0x74, 0x72, 0xee, 0x52, 0x9f, 0xb4, 0x64, 0x03, 0xf3, 0xd3,
-	0x1a, 0x58, 0xe5, 0x54, 0x5a, 0xc8, 0x24, 0x19, 0xf9, 0x1c, 0xd0, 0x99, 0xdd, 0xf3, 0xbc, 0x38,
-	0xfd, 0xc2, 0xb4, 0xf4, 0x4b, 0x82, 0x24, 0xee, 0x9a, 0xc7, 0xc4, 0x68, 0x3d, 0x23, 0x46, 0xcc,
-	0xe7, 0x8b, 0x53, 0xbb, 0x26, 0x62, 0x19, 0xc8, 0xd6, 0x7f, 0x37, 0x07, 0x99, 0x68, 0x4f, 0xa1,
-	0xba, 0x38, 0xaf, 0x52, 0x9c, 0xf9, 0xe3, 0x97, 0xdb, 0x99, 0xf2, 0xf9, 0x55, 0x86, 0x8c, 0x4b,
-	0x7d, 0x8b, 0xe9, 0xf9, 0xbe, 0xcc, 0xed, 0xfe, 0xe3, 0x04, 0xd2, 0x86, 0xe8, 0x8e, 0xfb, 0x40,
-	0xf5, 0xe7, 0xb3, 0x83, 0xd3, 0xec, 0xb4, 0x76, 0xaf, 0x56, 0x7f, 0x50, 0xd3, 0xa3, 0xb3, 0x4a,
-	0x79, 0x0d, 0xe5, 0x21, 0x53, 0xd5, 0x0e, 0x9a, 0xba, 0xf6, 0x50, 0x53, 0x12, 0x68, 0x1e, 0xb2,
-	0xb8, 0x72, 0x78, 0x14, 0x36, 0x93, 0xa8, 0x08, 0xcb, 0x5c, 0x59, 0x3f, 0xd0, 0xa3, 0x4e, 0x7b,
-	0xb8, 0xfe, 0x40, 0x49, 0xb1, 0xe3, 0x27, 0xec, 0x38, 0xac, 0x9a, 0x61, 0xaa, 0x08, 0xd4, 0xe7,
-	0xe2, 0xaa, 0x34, 0x5a, 0x87, 0xd5, 0x3e, 0x2a, 0xae, 0x9b, 0x65, 0xb0, 0xe3, 0xca, 0x7e, 0xa3,
-	0x5e, 0xa9, 0x35, 0xf5, 0x3d, 0xad, 0xf9, 0x40, 0xd3, 0x6a, 0x4c, 0xcb, 0x8e, 0xae, 0x3c, 0x64,
-	0x6a, 0xf5, 0x13, 0x4d, 0x6f, 0x56, 0x1a, 0x4a, 0x86, 0x8d, 0xf1, 0xb4, 0xd1, 0xd0, 0xb0, 0x5e,
-	0xad, 0x34, 0x94, 0x2c, 0x6b, 0x56, 0xeb, 0x0f, 0x44, 0x13, 0xd8, 0x31, 0x77, 0x5c, 0x3f, 0x6d,
-	0x1e, 0xf1, 0x51, 0x29, 0x39, 0xb4, 0x08, 0xb9, 0xb0, 0xcd, 0xed, 0x29, 0x79, 0xa4, 0x40, 0x3e,
-	0x14, 0x94, 0xb5, 0x5a, 0x53, 0xc3, 0xca, 0x3c, 0x5a, 0x81, 0x25, 0x4e, 0xbf, 0x57, 0x6f, 0x36,
-	0xeb, 0xc7, 0xa2, 0xe3, 0x02, 0xf3, 0x97, 0x2c, 0xe6, 0x7c, 0x8b, 0xec, 0xa4, 0x97, 0xa5, 0x82,
-	0x44, 0xe9, 0xcf, 0x5a, 0x7b, 0xa8, 0xe9, 0xcd, 0x7a, 0x43, 0xdf, 0xab, 0x9f, 0xd6, 0xf6, 0x4b,
-	0xf8, 0xa1, 0xb2, 0x14, 0x53, 0x85, 0xb3, 0x2e, 0xd7, 0x71, 0x4d, 0xc3, 0x0a, 0x42, 0x37, 0xa0,
-	0xd8, 0x57, 0x09, 0xc6, 0x3e, 0xb0, 0xd0, 0x77, 0x3f, 0xd3, 0xf2, 0x07, 0x81, 0x5b, 0x1e, 0x38,
-	0x72, 0xc4, 0xdc, 0x4a, 0x5c, 0x17, 0xb3, 0xb7, 0x8a, 0x36, 0x60, 0x6d, 0xa0, 0x1b, 0x36, 0x78,
-	0x6d, 0x10, 0xd5, 0x61, 0x8b, 0x45, 0x74, 0x0b, 0xae, 0xcb, 0x71, 0xd6, 0xc3, 0x10, 0x44, 0x11,
-	0x53, 0xd6, 0xd0, 0x26, 0xdc, 0x88, 0x85, 0x74, 0xb8, 0xc7, 0x3a, 0x73, 0x68, 0x48, 0x51, 0xc2,
-	0x7a, 0x13, 0x97, 0x0e, 0x59, 0x1d, 0x71, 0x9d, 0x79, 0x5f, 0xe0, 0x24, 0xf1, 0x0d, 0x5e, 0x39,
-	0x45, 0x73, 0x6f, 0x9c, 0x36, 0x2a, 0x55, 0x65, 0x83, 0x55, 0x4e, 0x83, 0xe1, 0x85, 0xc2, 0x9b,
-	0x0c, 0x7f, 0x50, 0xc7, 0xda, 0x91, 0x56, 0xda, 0xd7, 0x0f, 0x79, 0x61, 0x55, 0x2d, 0x29, 0xb7,
-	0x58, 0x79, 0x53, 0x3e, 0xaa, 0xd4, 0xf4, 0xc3, 0x5a, 0xa9, 0x79, 0xc4, 0x28, 0x37, 0x99, 0x7d,
-	0x2e, 0xe2, 0xbc, 0x87, 0xf5, 0x1a, 0x93, 0xbe, 0xce, 0xf0, 0x5c, 0x1a, 0x32, 0x0b, 0xb1, 0xaa,
-	0xfe, 0x2b, 0xe4, 0xab, 0xd4, 0xe4, 0x7b, 0xb3, 0xe2, 0xb4, 0x29, 0x7a, 0x17, 0xe6, 0x6c, 0x23,
-	0xd0, 0x6d, 0xa7, 0x23, 0xca, 0x83, 0x42, 0xb4, 0x15, 0xd9, 0x56, 0xdd, 0xae, 0x1a, 0x41, 0xd5,
-	0xe9, 0xe0, 0x59, 0x9b, 0xff, 0xaa, 0x0f, 0x20, 0xd3, 0xf0, 0x58, 0xad, 0x1d, 0x5c, 0x20, 0x04,
-	0x33, 0x8e, 0xd1, 0x25, 0xa2, 0x20, 0xe2, 0xcf, 0xac, 0xf0, 0x7c, 0x6a, 0xd8, 0x3d, 0x22, 0xaa,
-	0xa0, 0xb0, 0x81, 0x5e, 0x87, 0x7c, 0xcf, 0x72, 0x82, 0x0f, 0xde, 0xd3, 0x43, 0x25, 0x4b, 0x24,
-	0x33, 0x38, 0x17, 0xca, 0xee, 0x33, 0x91, 0xfa, 0xfd, 0x14, 0x28, 0x9a, 0x13, 0x58, 0xc1, 0x85,
-	0x54, 0xc0, 0x28, 0x90, 0xea, 0x5a, 0x2d, 0x61, 0x80, 0x3d, 0xa2, 0x55, 0x98, 0xb5, 0xa9, 0x69,
-	0xd8, 0x91, 0x01, 0xd1, 0x42, 0x9b, 0x90, 0x6b, 0x11, 0xdf, 0xf4, 0x2c, 0x97, 0x27, 0x95, 0xb0,
-	0xec, 0x95, 0x45, 0x6c, 0x64, 0xbe, 0x49, 0xbd, 0xa8, 0x10, 0x08, 0x1b, 0x48, 0x05, 0x90, 0x4e,
-	0x62, 0x5e, 0x05, 0xec, 0x25, 0x8b, 0x09, 0x2c, 0x49, 0xd1, 0x4d, 0x80, 0x80, 0xba, 0x96, 0x69,
-	0xd8, 0x56, 0x70, 0x21, 0x6a, 0x01, 0x49, 0x32, 0x5a, 0x66, 0xcd, 0xbd, 0x6a, 0x99, 0x55, 0x81,
-	0xac, 0x2d, 0x62, 0xe4, 0x17, 0x33, 0xbc, 0x1e, 0x9a, 0xc4, 0x26, 0xc7, 0x14, 0x0f, 0xd0, 0xe8,
-	0x10, 0xc0, 0x0d, 0x03, 0x66, 0x11, 0xbf, 0x98, 0xe5, 0x5c, 0x13, 0x93, 0xad, 0x88, 0x30, 0x96,
-	0xa0, 0xea, 0xaf, 0x12, 0xb0, 0xc6, 0x8c, 0xd8, 0xd6, 0x73, 0xd2, 0xaa, 0x9f, 0x7d, 0x49, 0xcc,
-	0xe0, 0xd2, 0x48, 0xbd, 0x01, 0xf3, 0xb6, 0xe1, 0x74, 0x7a, 0xac, 0x2c, 0x36, 0x69, 0x2b, 0x0a,
-	0x58, 0x3e, 0x12, 0x96, 0x69, 0x8b, 0xf4, 0x97, 0x50, 0x2a, 0xbe, 0x84, 0xc6, 0x04, 0x6a, 0xc4,
-	0xc9, 0xe9, 0x57, 0x74, 0xb2, 0xfa, 0x87, 0x24, 0x2c, 0x9f, 0x18, 0x6d, 0x72, 0xc2, 0x5f, 0x61,
-	0xa5, 0xb9, 0x7c, 0x0a, 0x69, 0xa3, 0xd5, 0xb3, 0x03, 0xf1, 0x7e, 0x36, 0xc5, 0x49, 0x1a, 0xe2,
-	0x18, 0x81, 0xef, 0x52, 0xda, 0xe6, 0x53, 0x9e, 0x8e, 0x80, 0xe3, 0x50, 0x19, 0xe6, 0xba, 0xa4,
-	0xc5, 0xd6, 0x97, 0x38, 0x73, 0xa7, 0xa0, 0x88, 0x90, 0x48, 0x83, 0xcc, 0x53, 0x8b, 0xda, 0x7c,
-	0x61, 0xcf, 0x4c, 0xcb, 0xd2, 0x87, 0xa2, 0x4f, 0x60, 0xc6, 0x33, 0xcc, 0x8b, 0xe9, 0xcb, 0x4e,
-	0x0e, 0x53, 0x9f, 0x41, 0x8e, 0xa5, 0x10, 0xea, 0x74, 0x30, 0x31, 0x03, 0x74, 0x07, 0x72, 0x5d,
-	0xcb, 0xd1, 0xaf, 0x90, 0x71, 0xb2, 0x5d, 0xcb, 0x09, 0x1f, 0x39, 0xc8, 0x38, 0xef, 0x83, 0x92,
-	0x97, 0x81, 0x8c, 0xf3, 0xf0, 0x51, 0xf5, 0x20, 0x5b, 0x66, 0x6f, 0xe6, 0x3c, 0xc9, 0x6d, 0x41,
-	0x9a, 0xbf, 0xa6, 0x0b, 0x83, 0x28, 0x86, 0xe5, 0xdd, 0x70, 0xd8, 0x61, 0xb0, 0xfa, 0x92, 0xf2,
-	0xea, 0x7b, 0x0b, 0x16, 0x5c, 0xeb, 0x9c, 0xd8, 0x7a, 0xdb, 0x33, 0xcc, 0x7e, 0x86, 0x49, 0xe2,
-	0x79, 0x2e, 0x3d, 0x10, 0x42, 0xf5, 0x0b, 0x28, 0xee, 0xd3, 0xae, 0xe5, 0x18, 0x4e, 0xc0, 0x49,
-	0x7d, 0x69, 0x55, 0xfd, 0x3b, 0xcc, 0x72, 0x0b, 0x7e, 0x31, 0xc1, 0x37, 0xe1, 0xd6, 0x04, 0x4f,
-	0xf6, 0x07, 0x8f, 0x05, 0x4e, 0xf5, 0x61, 0x91, 0xbf, 0xf8, 0x35, 0xfa, 0x9b, 0x12, 0xfd, 0x17,
-	0x2c, 0xb6, 0x84, 0x41, 0xbd, 0xcf, 0xce, 0x66, 0xf8, 0x2f, 0x13, 0xd8, 0x5f, 0x34, 0x4c, 0xbc,
-	0xd0, 0x8a, 0x69, 0xd4, 0x9f, 0x24, 0x20, 0x53, 0xf6, 0xa8, 0x7b, 0x64, 0x39, 0xc1, 0x77, 0xf0,
-	0x42, 0x79, 0x33, 0x96, 0x7f, 0x43, 0x9f, 0xcb, 0xb9, 0x77, 0x07, 0x0a, 0x56, 0xd7, 0xa5, 0x5e,
-	0x60, 0x38, 0x26, 0x19, 0xf6, 0x3e, 0x1a, 0xa8, 0xfa, 0x21, 0xf8, 0x4f, 0x28, 0x44, 0xc3, 0x95,
-	0xbd, 0x7f, 0x00, 0x60, 0x7a, 0xd4, 0xd5, 0x1f, 0x33, 0xb9, 0x88, 0xc0, 0xa4, 0x34, 0x18, 0xf1,
-	0xe0, 0xac, 0x19, 0x31, 0xaa, 0x1f, 0xc0, 0x62, 0x9f, 0xbe, 0x61, 0x78, 0x46, 0xd7, 0x67, 0x89,
-	0xce, 0xf0, 0x5d, 0x62, 0x06, 0x3a, 0xbf, 0x80, 0x0a, 0xd9, 0x93, 0x38, 0x1f, 0x0a, 0x31, 0x97,
-	0xa9, 0xfb, 0x80, 0x1e, 0x90, 0xb3, 0xfd, 0xe8, 0xbd, 0x50, 0x40, 0xb7, 0xa1, 0x60, 0x39, 0xa6,
-	0xdd, 0x6b, 0x11, 0xbd, 0x43, 0x68, 0xec, 0x3e, 0x27, 0x83, 0x97, 0x84, 0xea, 0x90, 0x50, 0x71,
-	0xad, 0xa3, 0x7e, 0x93, 0x82, 0x3c, 0x5f, 0x02, 0x65, 0xea, 0x04, 0xe4, 0x3c, 0x40, 0x35, 0x96,
-	0x64, 0x03, 0xdd, 0xa6, 0x4e, 0x47, 0xf7, 0x88, 0x19, 0x88, 0x80, 0x4c, 0xba, 0x3f, 0x90, 0x76,
-	0x24, 0xce, 0xd9, 0xd2, 0xf6, 0x7c, 0x0b, 0x16, 0xfa, 0x49, 0x3b, 0x74, 0x55, 0x72, 0x33, 0xb5,
-	0x95, 0xc5, 0xfd, 0x54, 0xce, 0x27, 0x8e, 0x1e, 0xc1, 0xd2, 0xc0, 0x9b, 0xba, 0xcb, 0x27, 0x23,
-	0x0a, 0xf9, 0xed, 0x2b, 0x3a, 0x55, 0x78, 0x0f, 0x2f, 0x9a, 0x43, 0xee, 0x6c, 0xc3, 0x4a, 0xfc,
-	0x72, 0x31, 0xe2, 0x0f, 0x13, 0xfe, 0xee, 0xe4, 0xb3, 0x8b, 0x61, 0xc3, 0xa4, 0x2e, 0x6c, 0x14,
-	0xdc, 0x51, 0x21, 0x32, 0x61, 0x39, 0x76, 0xb7, 0x18, 0x99, 0x99, 0xe5, 0x66, 0x6e, 0x4f, 0x30,
-	0x33, 0x1a, 0x4c, 0x8c, 0x9e, 0x8d, 0xc8, 0xd4, 0x3f, 0x25, 0x60, 0x59, 0xac, 0x42, 0xc2, 0x03,
-	0x87, 0xc9, 0x57, 0x3d, 0xe2, 0x07, 0xe8, 0x2e, 0xa4, 0xf9, 0x05, 0x91, 0x08, 0xd8, 0x9b, 0x57,
-	0xb9, 0xf0, 0xc1, 0x21, 0x04, 0xed, 0x41, 0xa6, 0x1d, 0xde, 0x09, 0x86, 0xe1, 0xc9, 0xed, 0xfe,
-	0xc3, 0xd5, 0xae, 0x10, 0x71, 0x1f, 0xc7, 0x76, 0x72, 0x78, 0x63, 0x65, 0x86, 0x2b, 0x89, 0xef,
-	0xa8, 0xc9, 0x3b, 0x59, 0x5e, 0x7c, 0x38, 0x6f, 0x49, 0x2d, 0xf5, 0x1e, 0xac, 0x72, 0xed, 0x60,
-	0xd3, 0x45, 0x8b, 0x54, 0x81, 0xd4, 0xe0, 0xde, 0x8c, 0x3d, 0xa2, 0x5b, 0x90, 0x73, 0x99, 0x71,
-	0xa7, 0xd7, 0x3d, 0x23, 0x5e, 0x74, 0x7f, 0xc9, 0x44, 0x35, 0x2e, 0x51, 0x7f, 0x01, 0xb0, 0x32,
-	0xe4, 0x37, 0xdf, 0xa5, 0x8e, 0x4f, 0xd0, 0xe7, 0xa0, 0xb4, 0x0d, 0x93, 0x48, 0xf7, 0xc8, 0xd1,
-	0x76, 0xfe, 0xe7, 0xa9, 0xde, 0x4b, 0xf1, 0x62, 0x3b, 0xd6, 0xf6, 0xd1, 0x19, 0x2c, 0x47, 0x57,
-	0x30, 0x31, 0xf6, 0xd0, 0xc5, 0x3b, 0x13, 0xd8, 0x87, 0x6b, 0x57, 0x5c, 0x88, 0xc8, 0x64, 0x1b,
-	0x8f, 0x40, 0xb1, 0x69, 0x87, 0xc6, 0xf8, 0x53, 0x2f, 0xc7, 0xbf, 0xc8, 0x88, 0x64, 0xee, 0x2f,
-	0x60, 0xc9, 0x36, 0xce, 0x88, 0x1d, 0x23, 0x9f, 0x79, 0x39, 0x72, 0x85, 0x33, 0xc9, 0xec, 0xcf,
-	0xe1, 0x86, 0x1d, 0x55, 0x7f, 0x3a, 0xe5, 0xe5, 0x5f, 0xcc, 0xd0, 0x2a, 0x37, 0xf4, 0xe1, 0x15,
-	0xaa, 0xd4, 0xb1, 0x05, 0x24, 0x5e, 0xb7, 0x5f, 0xa4, 0xe2, 0x5e, 0x1b, 0xfa, 0xef, 0x80, 0x65,
-	0x83, 0x97, 0xf3, 0x1a, 0x23, 0x92, 0xb9, 0x75, 0x58, 0x6e, 0xf7, 0x6c, 0x5b, 0x1f, 0x32, 0xc0,
-	0x2f, 0x98, 0x26, 0xaf, 0xa9, 0x66, 0x8c, 0x0d, 0x23, 0x46, 0x15, 0x97, 0x21, 0x0b, 0x56, 0x7d,
-	0xa3, 0x4d, 0xa2, 0x64, 0x26, 0x99, 0x08, 0x33, 0xcd, 0x9d, 0x09, 0x26, 0xc6, 0x95, 0xa8, 0x78,
-	0xd9, 0x1f, 0x57, 0xb8, 0x3a, 0x70, 0x3d, 0xdc, 0xd4, 0x83, 0xb2, 0x5d, 0xb6, 0x97, 0xb9, 0x52,
-	0x82, 0x1e, 0x2a, 0x31, 0xf0, 0x9a, 0x15, 0x17, 0x48, 0xf6, 0xda, 0xb0, 0x22, 0x1d, 0x03, 0x92,
-	0xa5, 0xdc, 0x95, 0x52, 0xf5, 0x98, 0x73, 0x1a, 0x17, 0xcc, 0x31, 0x87, 0x77, 0x03, 0xe6, 0x63,
-	0xa9, 0x9a, 0x5f, 0xce, 0x4d, 0x4e, 0x56, 0x72, 0x8e, 0xc6, 0x79, 0x39, 0x3b, 0xb3, 0xa0, 0x0c,
-	0x1d, 0x32, 0xd1, 0xd9, 0xbb, 0x70, 0xa5, 0xa0, 0xc4, 0x4e, 0x19, 0x71, 0x3a, 0xe3, 0x65, 0x77,
-	0x8c, 0x94, 0x95, 0x9e, 0xc4, 0xf3, 0xa8, 0xc7, 0x0b, 0x68, 0xa9, 0xf4, 0xf4, 0x5c, 0x73, 0xfb,
-	0x84, 0xff, 0xa9, 0x84, 0xc3, 0x0e, 0xa8, 0x2e, 0xfe, 0x1f, 0x38, 0x0f, 0x8a, 0x2b, 0xbc, 0xef,
-	0xfb, 0x57, 0x09, 0xd5, 0x48, 0xbe, 0xc5, 0x11, 0x8b, 0xfa, 0x7b, 0xe9, 0xf4, 0x39, 0xb0, 0xec,
-	0x41, 0x12, 0x3d, 0x86, 0xbc, 0xe5, 0xb8, 0xbd, 0x20, 0xbc, 0x85, 0xee, 0x5c, 0xb1, 0x6a, 0xa8,
-	0x30, 0x08, 0xbf, 0x9a, 0xee, 0xe0, 0x9c, 0x35, 0x68, 0x20, 0x0c, 0x59, 0x4f, 0x50, 0x47, 0xe9,
-	0xf2, 0xbd, 0x09, 0x5c, 0x63, 0x93, 0x3b, 0x1e, 0xd0, 0xb0, 0x23, 0x22, 0xa0, 0x81, 0x61, 0xeb,
-	0xec, 0x54, 0xf0, 0xf9, 0xf1, 0x94, 0x66, 0x6f, 0xdd, 0x81, 0x61, 0x37, 0x98, 0x44, 0xed, 0xc2,
-	0xfa, 0x9e, 0x11, 0xf4, 0xd7, 0x7f, 0xc8, 0xe4, 0x47, 0xe7, 0x6b, 0x1d, 0x32, 0x5e, 0xf8, 0x18,
-	0x1d, 0x0f, 0x77, 0xa6, 0x1b, 0x11, 0xc7, 0xe2, 0x3e, 0x89, 0xfa, 0x15, 0x5c, 0x1f, 0x6b, 0x4e,
-	0x78, 0x34, 0xe6, 0x82, 0xc4, 0xb7, 0xe2, 0x02, 0xf5, 0xff, 0x93, 0x50, 0x88, 0x87, 0x2f, 0x9c,
-	0xdb, 0xb7, 0x1c, 0xbd, 0xbf, 0xc9, 0x72, 0x82, 0xbd, 0x87, 0x85, 0x91, 0x67, 0x27, 0x58, 0x1a,
-	0x87, 0x0d, 0xf5, 0x09, 0xac, 0xc5, 0xa2, 0xc0, 0xdc, 0xd2, 0x8f, 0x79, 0x6d, 0x24, 0xe6, 0xbb,
-	0x57, 0x0c, 0x81, 0xe4, 0x5d, 0x29, 0xe4, 0x74, 0x68, 0x85, 0x09, 0x63, 0x22, 0xe2, 0x9f, 0x8d,
-	0x46, 0xfc, 0xce, 0x54, 0xe6, 0x46, 0x03, 0xfe, 0x9b, 0x24, 0x14, 0x4b, 0xfe, 0x85, 0x63, 0xfe,
-	0xdd, 0x46, 0xbd, 0x01, 0xf3, 0xb4, 0x17, 0x48, 0xb3, 0x9c, 0xb9, 0x12, 0x63, 0x9d, 0x63, 0xc4,
-	0x34, 0xf3, 0x54, 0x6a, 0xa9, 0x5d, 0x58, 0x1b, 0xe3, 0x52, 0x11, 0xc3, 0x11, 0x73, 0x89, 0x57,
-	0x35, 0xf7, 0xcb, 0x04, 0xdc, 0xe2, 0xf6, 0xfe, 0x8a, 0xb9, 0x69, 0x74, 0x1a, 0xc9, 0x57, 0x9d,
-	0x46, 0x00, 0x9b, 0x2f, 0x9e, 0xc5, 0x77, 0xe6, 0xbc, 0x1e, 0xdc, 0x1c, 0xb5, 0x1a, 0xdb, 0xe2,
-	0x27, 0x23, 0xae, 0x9b, 0x74, 0xd1, 0xf1, 0xa2, 0xfd, 0x24, 0xed, 0xf3, 0x8b, 0x71, 0x21, 0x8b,
-	0x6f, 0xf6, 0xfb, 0xa3, 0x9b, 0xfd, 0xc3, 0xe9, 0x0d, 0x8f, 0xee, 0xf8, 0xff, 0x4b, 0x40, 0x4e,
-	0xda, 0xa2, 0xe8, 0x10, 0xa0, 0x63, 0xfa, 0xba, 0xf8, 0x18, 0x20, 0x74, 0xe8, 0xa4, 0x8b, 0xa2,
-	0x43, 0xd3, 0x17, 0x9f, 0x02, 0x64, 0x3b, 0xd1, 0xa3, 0xfc, 0xad, 0x41, 0x2a, 0xfe, 0xad, 0xc1,
-	0x75, 0xc8, 0x76, 0xad, 0x2e, 0xd1, 0xf9, 0x3f, 0x7a, 0xe2, 0x5b, 0x05, 0x26, 0x68, 0x5e, 0xb8,
-	0x44, 0xfd, 0x9f, 0x04, 0xe4, 0xe5, 0x00, 0xa1, 0xfb, 0xb0, 0xc8, 0x06, 0xd4, 0x22, 0x7e, 0x60,
-	0x39, 0x61, 0x71, 0x97, 0xb8, 0x52, 0x65, 0x7c, 0x68, 0xfa, 0xfb, 0x03, 0x10, 0x5e, 0xe8, 0xc4,
-	0xda, 0x68, 0x03, 0xe0, 0x8c, 0xb9, 0x5b, 0xf7, 0xad, 0xe7, 0x44, 0xbc, 0x00, 0x66, 0xb9, 0xe4,
-	0xc4, 0x7a, 0x4e, 0xd4, 0x0d, 0xc8, 0xf6, 0xa7, 0x35, 0xfa, 0xfe, 0xa8, 0xaa, 0xb0, 0x10, 0xe7,
-	0x1f, 0xd3, 0xe7, 0x9b, 0x24, 0x2c, 0xd5, 0xa3, 0x8f, 0x82, 0x8e, 0x49, 0x60, 0xb4, 0x8c, 0xc0,
-	0x40, 0x55, 0x48, 0xfb, 0x2c, 0x20, 0xe2, 0x6e, 0x77, 0xd2, 0x57, 0x06, 0x23, 0x04, 0xbc, 0x64,
-	0x23, 0x38, 0x24, 0x41, 0x1f, 0x43, 0xce, 0xf4, 0x88, 0x11, 0x10, 0x3d, 0xb0, 0xba, 0x44, 0xdc,
-	0x50, 0xac, 0x47, 0x9c, 0xd1, 0x77, 0x45, 0xdb, 0xcd, 0xe8, 0xbb, 0x22, 0x0c, 0x61, 0x77, 0x26,
-	0x60, 0xe0, 0x9e, 0xdb, 0xea, 0x83, 0x67, 0x27, 0x83, 0xc3, 0xee, 0x4c, 0xa0, 0x7e, 0x06, 0x69,
-	0x3e, 0x12, 0xb4, 0x02, 0x4b, 0x27, 0xcd, 0x52, 0x73, 0xf8, 0x5b, 0x9e, 0x1c, 0xcc, 0x95, 0xb1,
-	0x56, 0x6a, 0x6a, 0xfb, 0x4a, 0x82, 0x35, 0xf0, 0x69, 0xad, 0x56, 0xa9, 0x1d, 0x2a, 0x49, 0x94,
-	0x81, 0x99, 0xfd, 0x7a, 0x4d, 0x53, 0x52, 0x68, 0x1e, 0xb2, 0xe5, 0x52, 0xad, 0xac, 0x55, 0xab,
-	0xda, 0xbe, 0x32, 0xf3, 0x0e, 0x01, 0x90, 0xfe, 0x5c, 0xce, 0xc1, 0x9c, 0xf8, 0x53, 0x55, 0x79,
-	0x0d, 0x2d, 0xc1, 0xfc, 0x7d, 0x0d, 0x3f, 0xd4, 0x4f, 0x6b, 0xd5, 0xca, 0x3d, 0xad, 0xfa, 0x50,
-	0x49, 0xa0, 0x3c, 0x64, 0xfa, 0xad, 0x24, 0x6b, 0x35, 0xea, 0x27, 0x27, 0x95, 0xbd, 0x2a, 0x23,
-	0x06, 0x98, 0x15, 0x9a, 0x19, 0xb4, 0x08, 0x39, 0x0e, 0x15, 0x82, 0xf4, 0xee, 0xaf, 0xd3, 0xb0,
-	0x20, 0x17, 0xae, 0xd4, 0x43, 0x3f, 0x4b, 0x40, 0x61, 0x4c, 0xa6, 0x41, 0x1f, 0x4d, 0xba, 0x57,
-	0x7c, 0x61, 0x8e, 0x5d, 0xbf, 0xfb, 0x32, 0xd0, 0x70, 0x57, 0xaa, 0x6f, 0xfd, 0xf7, 0x6f, 0xff,
-	0xf8, 0xbd, 0xe4, 0x2d, 0x75, 0x7d, 0xf8, 0x7b, 0x3c, 0xff, 0xae, 0x78, 0xc7, 0x21, 0x77, 0x13,
-	0xef, 0xa0, 0x9f, 0x26, 0x00, 0x8d, 0xa6, 0x0c, 0xf4, 0xe1, 0x34, 0x96, 0xe5, 0xe4, 0xb6, 0xfe,
-	0xd1, 0x4b, 0x20, 0xc5, 0x90, 0xdf, 0xe4, 0x43, 0xbe, 0xa9, 0xae, 0x49, 0x43, 0x6e, 0xb3, 0x1e,
-	0xb1, 0x11, 0xff, 0x38, 0x21, 0xea, 0x8b, 0x71, 0xce, 0xfe, 0xb7, 0xab, 0xe4, 0xb3, 0x4b, 0x3c,
-	0xbe, 0x11, 0xe1, 0xa5, 0xaf, 0xf2, 0x06, 0xfb, 0x47, 0xdd, 0xe1, 0x23, 0x7c, 0x5b, 0x7d, 0x73,
-	0x8c, 0x53, 0x47, 0x98, 0xd9, 0x60, 0xbf, 0x4e, 0xc0, 0xb5, 0x17, 0xa4, 0x65, 0xf4, 0xc9, 0xd4,
-	0x63, 0x8d, 0x39, 0x7a, 0xc2, 0x50, 0xb7, 0xf9, 0x50, 0xb7, 0xd4, 0x37, 0x46, 0x9d, 0x39, 0x6e,
-	0xa4, 0x7b, 0xff, 0x9b, 0x80, 0xd7, 0x4d, 0xda, 0xbd, 0x7c, 0x4c, 0x7b, 0x85, 0xf8, 0xa2, 0x6f,
-	0xb0, 0xfd, 0xdd, 0x48, 0x3c, 0x2a, 0x0b, 0x54, 0x87, 0xda, 0x86, 0xd3, 0xd9, 0xa6, 0x5e, 0x67,
-	0xa7, 0x43, 0x1c, 0xbe, 0xfb, 0x77, 0x42, 0x95, 0xe1, 0x5a, 0xfe, 0x0b, 0xbe, 0x8e, 0xfc, 0x38,
-	0x14, 0xfc, 0x39, 0x91, 0xf8, 0x41, 0x72, 0xe6, 0xb0, 0x7c, 0xbf, 0x76, 0x36, 0xcb, 0x91, 0x77,
-	0xfe, 0x12, 0x00, 0x00, 0xff, 0xff, 0x60, 0xef, 0x71, 0x29, 0x5f, 0x2a, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/vision/v1p4beta1/product_search.pb.go b/googleapis/cloud/vision/v1p4beta1/product_search.pb.go
index 6e72383189..6316dcfe4b 100644
--- a/googleapis/cloud/vision/v1p4beta1/product_search.pb.go
+++ b/googleapis/cloud/vision/v1p4beta1/product_search.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p4beta1/product_search.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p4beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Parameters for a product search request.
 type ProductSearchParams struct {
@@ -52,16 +55,17 @@ func (m *ProductSearchParams) Reset()         { *m = ProductSearchParams{} }
 func (m *ProductSearchParams) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchParams) ProtoMessage()    {}
 func (*ProductSearchParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_573b317bf5620815, []int{0}
+	return fileDescriptor_788f05efda4e1c3a, []int{0}
 }
+
 func (m *ProductSearchParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchParams.Unmarshal(m, b)
 }
 func (m *ProductSearchParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchParams.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchParams.Merge(dst, src)
+func (m *ProductSearchParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchParams.Merge(m, src)
 }
 func (m *ProductSearchParams) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchParams.Size(m)
@@ -121,16 +125,17 @@ func (m *ProductSearchResults) Reset()         { *m = ProductSearchResults{} }
 func (m *ProductSearchResults) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults) ProtoMessage()    {}
 func (*ProductSearchResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_573b317bf5620815, []int{1}
+	return fileDescriptor_788f05efda4e1c3a, []int{1}
 }
+
 func (m *ProductSearchResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults.Unmarshal(m, b)
 }
 func (m *ProductSearchResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults.Merge(dst, src)
+func (m *ProductSearchResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults.Merge(m, src)
 }
 func (m *ProductSearchResults) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults.Size(m)
@@ -181,16 +186,17 @@ func (m *ProductSearchResults_Result) Reset()         { *m = ProductSearchResult
 func (m *ProductSearchResults_Result) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults_Result) ProtoMessage()    {}
 func (*ProductSearchResults_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_573b317bf5620815, []int{1, 0}
+	return fileDescriptor_788f05efda4e1c3a, []int{1, 0}
 }
+
 func (m *ProductSearchResults_Result) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults_Result.Unmarshal(m, b)
 }
 func (m *ProductSearchResults_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults_Result.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults_Result) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults_Result.Merge(dst, src)
+func (m *ProductSearchResults_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_Result.Merge(m, src)
 }
 func (m *ProductSearchResults_Result) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults_Result.Size(m)
@@ -238,16 +244,17 @@ func (m *ProductSearchResults_GroupedResult) Reset()         { *m = ProductSearc
 func (m *ProductSearchResults_GroupedResult) String() string { return proto.CompactTextString(m) }
 func (*ProductSearchResults_GroupedResult) ProtoMessage()    {}
 func (*ProductSearchResults_GroupedResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_573b317bf5620815, []int{1, 1}
+	return fileDescriptor_788f05efda4e1c3a, []int{1, 1}
 }
+
 func (m *ProductSearchResults_GroupedResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSearchResults_GroupedResult.Unmarshal(m, b)
 }
 func (m *ProductSearchResults_GroupedResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSearchResults_GroupedResult.Marshal(b, m, deterministic)
 }
-func (dst *ProductSearchResults_GroupedResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSearchResults_GroupedResult.Merge(dst, src)
+func (m *ProductSearchResults_GroupedResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_GroupedResult.Merge(m, src)
 }
 func (m *ProductSearchResults_GroupedResult) XXX_Size() int {
 	return xxx_messageInfo_ProductSearchResults_GroupedResult.Size(m)
@@ -280,10 +287,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p4beta1/product_search.proto", fileDescriptor_product_search_573b317bf5620815)
+	proto.RegisterFile("google/cloud/vision/v1p4beta1/product_search.proto", fileDescriptor_788f05efda4e1c3a)
 }
 
-var fileDescriptor_product_search_573b317bf5620815 = []byte{
+var fileDescriptor_788f05efda4e1c3a = []byte{
 	// 495 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x8e, 0xd3, 0x3c,
 	0x14, 0x95, 0xdb, 0x99, 0xf4, 0xab, 0xfb, 0xcd, 0x02, 0x33, 0x40, 0x14, 0x81, 0xa6, 0xcc, 0x02,
diff --git a/googleapis/cloud/vision/v1p4beta1/product_search_service.pb.go b/googleapis/cloud/vision/v1p4beta1/product_search_service.pb.go
index e43996f3eb..b8b58678e3 100644
--- a/googleapis/cloud/vision/v1p4beta1/product_search_service.pb.go
+++ b/googleapis/cloud/vision/v1p4beta1/product_search_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p4beta1/product_search_service.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p4beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package vision
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates the possible states that the batch request can be in.
 type BatchOperationMetadata_State int32
@@ -55,6 +55,7 @@ var BatchOperationMetadata_State_name = map[int32]string{
 	3: "FAILED",
 	4: "CANCELLED",
 }
+
 var BatchOperationMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"PROCESSING":        1,
@@ -66,8 +67,9 @@ var BatchOperationMetadata_State_value = map[string]int32{
 func (x BatchOperationMetadata_State) String() string {
 	return proto.EnumName(BatchOperationMetadata_State_name, int32(x))
 }
+
 func (BatchOperationMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{28, 0}
+	return fileDescriptor_3ac817753c311f0a, []int{28, 0}
 }
 
 // A Product contains ReferenceImages.
@@ -109,16 +111,17 @@ func (m *Product) Reset()         { *m = Product{} }
 func (m *Product) String() string { return proto.CompactTextString(m) }
 func (*Product) ProtoMessage()    {}
 func (*Product) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{0}
+	return fileDescriptor_3ac817753c311f0a, []int{0}
 }
+
 func (m *Product) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Product.Unmarshal(m, b)
 }
 func (m *Product) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Product.Marshal(b, m, deterministic)
 }
-func (dst *Product) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Product.Merge(dst, src)
+func (m *Product) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product.Merge(m, src)
 }
 func (m *Product) XXX_Size() int {
 	return xxx_messageInfo_Product.Size(m)
@@ -181,16 +184,17 @@ func (m *Product_KeyValue) Reset()         { *m = Product_KeyValue{} }
 func (m *Product_KeyValue) String() string { return proto.CompactTextString(m) }
 func (*Product_KeyValue) ProtoMessage()    {}
 func (*Product_KeyValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{0, 0}
+	return fileDescriptor_3ac817753c311f0a, []int{0, 0}
 }
+
 func (m *Product_KeyValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Product_KeyValue.Unmarshal(m, b)
 }
 func (m *Product_KeyValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Product_KeyValue.Marshal(b, m, deterministic)
 }
-func (dst *Product_KeyValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Product_KeyValue.Merge(dst, src)
+func (m *Product_KeyValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product_KeyValue.Merge(m, src)
 }
 func (m *Product_KeyValue) XXX_Size() int {
 	return xxx_messageInfo_Product_KeyValue.Size(m)
@@ -250,16 +254,17 @@ func (m *ProductSet) Reset()         { *m = ProductSet{} }
 func (m *ProductSet) String() string { return proto.CompactTextString(m) }
 func (*ProductSet) ProtoMessage()    {}
 func (*ProductSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{1}
+	return fileDescriptor_3ac817753c311f0a, []int{1}
 }
+
 func (m *ProductSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProductSet.Unmarshal(m, b)
 }
 func (m *ProductSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProductSet.Marshal(b, m, deterministic)
 }
-func (dst *ProductSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProductSet.Merge(dst, src)
+func (m *ProductSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSet.Merge(m, src)
 }
 func (m *ProductSet) XXX_Size() int {
 	return xxx_messageInfo_ProductSet.Size(m)
@@ -333,16 +338,17 @@ func (m *ReferenceImage) Reset()         { *m = ReferenceImage{} }
 func (m *ReferenceImage) String() string { return proto.CompactTextString(m) }
 func (*ReferenceImage) ProtoMessage()    {}
 func (*ReferenceImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{2}
+	return fileDescriptor_3ac817753c311f0a, []int{2}
 }
+
 func (m *ReferenceImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReferenceImage.Unmarshal(m, b)
 }
 func (m *ReferenceImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReferenceImage.Marshal(b, m, deterministic)
 }
-func (dst *ReferenceImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReferenceImage.Merge(dst, src)
+func (m *ReferenceImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceImage.Merge(m, src)
 }
 func (m *ReferenceImage) XXX_Size() int {
 	return xxx_messageInfo_ReferenceImage.Size(m)
@@ -397,16 +403,17 @@ func (m *CreateProductRequest) Reset()         { *m = CreateProductRequest{} }
 func (m *CreateProductRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProductRequest) ProtoMessage()    {}
 func (*CreateProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{3}
+	return fileDescriptor_3ac817753c311f0a, []int{3}
 }
+
 func (m *CreateProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProductRequest.Unmarshal(m, b)
 }
 func (m *CreateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProductRequest.Merge(dst, src)
+func (m *CreateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductRequest.Merge(m, src)
 }
 func (m *CreateProductRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProductRequest.Size(m)
@@ -458,16 +465,17 @@ func (m *ListProductsRequest) Reset()         { *m = ListProductsRequest{} }
 func (m *ListProductsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductsRequest) ProtoMessage()    {}
 func (*ListProductsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{4}
+	return fileDescriptor_3ac817753c311f0a, []int{4}
 }
+
 func (m *ListProductsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsRequest.Unmarshal(m, b)
 }
 func (m *ListProductsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsRequest.Merge(dst, src)
+func (m *ListProductsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsRequest.Merge(m, src)
 }
 func (m *ListProductsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductsRequest.Size(m)
@@ -515,16 +523,17 @@ func (m *ListProductsResponse) Reset()         { *m = ListProductsResponse{} }
 func (m *ListProductsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductsResponse) ProtoMessage()    {}
 func (*ListProductsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{5}
+	return fileDescriptor_3ac817753c311f0a, []int{5}
 }
+
 func (m *ListProductsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsResponse.Unmarshal(m, b)
 }
 func (m *ListProductsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsResponse.Merge(dst, src)
+func (m *ListProductsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsResponse.Merge(m, src)
 }
 func (m *ListProductsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductsResponse.Size(m)
@@ -565,16 +574,17 @@ func (m *GetProductRequest) Reset()         { *m = GetProductRequest{} }
 func (m *GetProductRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductRequest) ProtoMessage()    {}
 func (*GetProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{6}
+	return fileDescriptor_3ac817753c311f0a, []int{6}
 }
+
 func (m *GetProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductRequest.Unmarshal(m, b)
 }
 func (m *GetProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductRequest.Merge(dst, src)
+func (m *GetProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductRequest.Merge(m, src)
 }
 func (m *GetProductRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductRequest.Size(m)
@@ -612,16 +622,17 @@ func (m *UpdateProductRequest) Reset()         { *m = UpdateProductRequest{} }
 func (m *UpdateProductRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProductRequest) ProtoMessage()    {}
 func (*UpdateProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{7}
+	return fileDescriptor_3ac817753c311f0a, []int{7}
 }
+
 func (m *UpdateProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProductRequest.Unmarshal(m, b)
 }
 func (m *UpdateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProductRequest.Merge(dst, src)
+func (m *UpdateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductRequest.Merge(m, src)
 }
 func (m *UpdateProductRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProductRequest.Size(m)
@@ -662,16 +673,17 @@ func (m *DeleteProductRequest) Reset()         { *m = DeleteProductRequest{} }
 func (m *DeleteProductRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteProductRequest) ProtoMessage()    {}
 func (*DeleteProductRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{8}
+	return fileDescriptor_3ac817753c311f0a, []int{8}
 }
+
 func (m *DeleteProductRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteProductRequest.Unmarshal(m, b)
 }
 func (m *DeleteProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteProductRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteProductRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteProductRequest.Merge(dst, src)
+func (m *DeleteProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductRequest.Merge(m, src)
 }
 func (m *DeleteProductRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteProductRequest.Size(m)
@@ -711,16 +723,17 @@ func (m *CreateProductSetRequest) Reset()         { *m = CreateProductSetRequest
 func (m *CreateProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProductSetRequest) ProtoMessage()    {}
 func (*CreateProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{9}
+	return fileDescriptor_3ac817753c311f0a, []int{9}
 }
+
 func (m *CreateProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProductSetRequest.Unmarshal(m, b)
 }
 func (m *CreateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProductSetRequest.Merge(dst, src)
+func (m *CreateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductSetRequest.Merge(m, src)
 }
 func (m *CreateProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProductSetRequest.Size(m)
@@ -771,16 +784,17 @@ func (m *ListProductSetsRequest) Reset()         { *m = ListProductSetsRequest{}
 func (m *ListProductSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductSetsRequest) ProtoMessage()    {}
 func (*ListProductSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{10}
+	return fileDescriptor_3ac817753c311f0a, []int{10}
 }
+
 func (m *ListProductSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductSetsRequest.Unmarshal(m, b)
 }
 func (m *ListProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductSetsRequest.Merge(dst, src)
+func (m *ListProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsRequest.Merge(m, src)
 }
 func (m *ListProductSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductSetsRequest.Size(m)
@@ -828,16 +842,17 @@ func (m *ListProductSetsResponse) Reset()         { *m = ListProductSetsResponse
 func (m *ListProductSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductSetsResponse) ProtoMessage()    {}
 func (*ListProductSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{11}
+	return fileDescriptor_3ac817753c311f0a, []int{11}
 }
+
 func (m *ListProductSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductSetsResponse.Unmarshal(m, b)
 }
 func (m *ListProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductSetsResponse.Merge(dst, src)
+func (m *ListProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsResponse.Merge(m, src)
 }
 func (m *ListProductSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductSetsResponse.Size(m)
@@ -878,16 +893,17 @@ func (m *GetProductSetRequest) Reset()         { *m = GetProductSetRequest{} }
 func (m *GetProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetProductSetRequest) ProtoMessage()    {}
 func (*GetProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{12}
+	return fileDescriptor_3ac817753c311f0a, []int{12}
 }
+
 func (m *GetProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetProductSetRequest.Unmarshal(m, b)
 }
 func (m *GetProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetProductSetRequest.Merge(dst, src)
+func (m *GetProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductSetRequest.Merge(m, src)
 }
 func (m *GetProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetProductSetRequest.Size(m)
@@ -923,16 +939,17 @@ func (m *UpdateProductSetRequest) Reset()         { *m = UpdateProductSetRequest
 func (m *UpdateProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProductSetRequest) ProtoMessage()    {}
 func (*UpdateProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{13}
+	return fileDescriptor_3ac817753c311f0a, []int{13}
 }
+
 func (m *UpdateProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProductSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProductSetRequest.Merge(dst, src)
+func (m *UpdateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductSetRequest.Merge(m, src)
 }
 func (m *UpdateProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProductSetRequest.Size(m)
@@ -973,16 +990,17 @@ func (m *DeleteProductSetRequest) Reset()         { *m = DeleteProductSetRequest
 func (m *DeleteProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteProductSetRequest) ProtoMessage()    {}
 func (*DeleteProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{14}
+	return fileDescriptor_3ac817753c311f0a, []int{14}
 }
+
 func (m *DeleteProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteProductSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteProductSetRequest.Merge(dst, src)
+func (m *DeleteProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductSetRequest.Merge(m, src)
 }
 func (m *DeleteProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteProductSetRequest.Size(m)
@@ -1024,16 +1042,17 @@ func (m *CreateReferenceImageRequest) Reset()         { *m = CreateReferenceImag
 func (m *CreateReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateReferenceImageRequest) ProtoMessage()    {}
 func (*CreateReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{15}
+	return fileDescriptor_3ac817753c311f0a, []int{15}
 }
+
 func (m *CreateReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *CreateReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateReferenceImageRequest.Merge(dst, src)
+func (m *CreateReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateReferenceImageRequest.Merge(m, src)
 }
 func (m *CreateReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateReferenceImageRequest.Size(m)
@@ -1088,16 +1107,17 @@ func (m *ListReferenceImagesRequest) Reset()         { *m = ListReferenceImagesR
 func (m *ListReferenceImagesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListReferenceImagesRequest) ProtoMessage()    {}
 func (*ListReferenceImagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{16}
+	return fileDescriptor_3ac817753c311f0a, []int{16}
 }
+
 func (m *ListReferenceImagesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReferenceImagesRequest.Unmarshal(m, b)
 }
 func (m *ListReferenceImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReferenceImagesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListReferenceImagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReferenceImagesRequest.Merge(dst, src)
+func (m *ListReferenceImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesRequest.Merge(m, src)
 }
 func (m *ListReferenceImagesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListReferenceImagesRequest.Size(m)
@@ -1146,16 +1166,17 @@ func (m *ListReferenceImagesResponse) Reset()         { *m = ListReferenceImages
 func (m *ListReferenceImagesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListReferenceImagesResponse) ProtoMessage()    {}
 func (*ListReferenceImagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{17}
+	return fileDescriptor_3ac817753c311f0a, []int{17}
 }
+
 func (m *ListReferenceImagesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReferenceImagesResponse.Unmarshal(m, b)
 }
 func (m *ListReferenceImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReferenceImagesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListReferenceImagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReferenceImagesResponse.Merge(dst, src)
+func (m *ListReferenceImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesResponse.Merge(m, src)
 }
 func (m *ListReferenceImagesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListReferenceImagesResponse.Size(m)
@@ -1204,16 +1225,17 @@ func (m *GetReferenceImageRequest) Reset()         { *m = GetReferenceImageReque
 func (m *GetReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*GetReferenceImageRequest) ProtoMessage()    {}
 func (*GetReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{18}
+	return fileDescriptor_3ac817753c311f0a, []int{18}
 }
+
 func (m *GetReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *GetReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetReferenceImageRequest.Merge(dst, src)
+func (m *GetReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceImageRequest.Merge(m, src)
 }
 func (m *GetReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_GetReferenceImageRequest.Size(m)
@@ -1248,16 +1270,17 @@ func (m *DeleteReferenceImageRequest) Reset()         { *m = DeleteReferenceImag
 func (m *DeleteReferenceImageRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteReferenceImageRequest) ProtoMessage()    {}
 func (*DeleteReferenceImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{19}
+	return fileDescriptor_3ac817753c311f0a, []int{19}
 }
+
 func (m *DeleteReferenceImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Unmarshal(m, b)
 }
 func (m *DeleteReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteReferenceImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteReferenceImageRequest.Merge(dst, src)
+func (m *DeleteReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteReferenceImageRequest.Merge(m, src)
 }
 func (m *DeleteReferenceImageRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteReferenceImageRequest.Size(m)
@@ -1296,16 +1319,17 @@ func (m *AddProductToProductSetRequest) Reset()         { *m = AddProductToProdu
 func (m *AddProductToProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*AddProductToProductSetRequest) ProtoMessage()    {}
 func (*AddProductToProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{20}
+	return fileDescriptor_3ac817753c311f0a, []int{20}
 }
+
 func (m *AddProductToProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddProductToProductSetRequest.Unmarshal(m, b)
 }
 func (m *AddProductToProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddProductToProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *AddProductToProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddProductToProductSetRequest.Merge(dst, src)
+func (m *AddProductToProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddProductToProductSetRequest.Merge(m, src)
 }
 func (m *AddProductToProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_AddProductToProductSetRequest.Size(m)
@@ -1351,16 +1375,17 @@ func (m *RemoveProductFromProductSetRequest) Reset()         { *m = RemoveProduc
 func (m *RemoveProductFromProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*RemoveProductFromProductSetRequest) ProtoMessage()    {}
 func (*RemoveProductFromProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{21}
+	return fileDescriptor_3ac817753c311f0a, []int{21}
 }
+
 func (m *RemoveProductFromProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Unmarshal(m, b)
 }
 func (m *RemoveProductFromProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *RemoveProductFromProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoveProductFromProductSetRequest.Merge(dst, src)
+func (m *RemoveProductFromProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveProductFromProductSetRequest.Merge(m, src)
 }
 func (m *RemoveProductFromProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_RemoveProductFromProductSetRequest.Size(m)
@@ -1405,16 +1430,17 @@ func (m *ListProductsInProductSetRequest) Reset()         { *m = ListProductsInP
 func (m *ListProductsInProductSetRequest) String() string { return proto.CompactTextString(m) }
 func (*ListProductsInProductSetRequest) ProtoMessage()    {}
 func (*ListProductsInProductSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{22}
+	return fileDescriptor_3ac817753c311f0a, []int{22}
 }
+
 func (m *ListProductsInProductSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Unmarshal(m, b)
 }
 func (m *ListProductsInProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsInProductSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsInProductSetRequest.Merge(dst, src)
+func (m *ListProductsInProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetRequest.Merge(m, src)
 }
 func (m *ListProductsInProductSetRequest) XXX_Size() int {
 	return xxx_messageInfo_ListProductsInProductSetRequest.Size(m)
@@ -1462,16 +1488,17 @@ func (m *ListProductsInProductSetResponse) Reset()         { *m = ListProductsIn
 func (m *ListProductsInProductSetResponse) String() string { return proto.CompactTextString(m) }
 func (*ListProductsInProductSetResponse) ProtoMessage()    {}
 func (*ListProductsInProductSetResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{23}
+	return fileDescriptor_3ac817753c311f0a, []int{23}
 }
+
 func (m *ListProductsInProductSetResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Unmarshal(m, b)
 }
 func (m *ListProductsInProductSetResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListProductsInProductSetResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListProductsInProductSetResponse.Merge(dst, src)
+func (m *ListProductsInProductSetResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetResponse.Merge(m, src)
 }
 func (m *ListProductsInProductSetResponse) XXX_Size() int {
 	return xxx_messageInfo_ListProductsInProductSetResponse.Size(m)
@@ -1572,16 +1599,17 @@ func (m *ImportProductSetsGcsSource) Reset()         { *m = ImportProductSetsGcs
 func (m *ImportProductSetsGcsSource) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsGcsSource) ProtoMessage()    {}
 func (*ImportProductSetsGcsSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{24}
+	return fileDescriptor_3ac817753c311f0a, []int{24}
 }
+
 func (m *ImportProductSetsGcsSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Unmarshal(m, b)
 }
 func (m *ImportProductSetsGcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsGcsSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsGcsSource.Merge(dst, src)
+func (m *ImportProductSetsGcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsGcsSource.Merge(m, src)
 }
 func (m *ImportProductSetsGcsSource) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsGcsSource.Size(m)
@@ -1615,16 +1643,17 @@ func (m *ImportProductSetsInputConfig) Reset()         { *m = ImportProductSetsI
 func (m *ImportProductSetsInputConfig) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsInputConfig) ProtoMessage()    {}
 func (*ImportProductSetsInputConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{25}
+	return fileDescriptor_3ac817753c311f0a, []int{25}
 }
+
 func (m *ImportProductSetsInputConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Unmarshal(m, b)
 }
 func (m *ImportProductSetsInputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsInputConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsInputConfig.Merge(dst, src)
+func (m *ImportProductSetsInputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsInputConfig.Merge(m, src)
 }
 func (m *ImportProductSetsInputConfig) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsInputConfig.Size(m)
@@ -1659,61 +1688,13 @@ func (m *ImportProductSetsInputConfig) GetGcsSource() *ImportProductSetsGcsSourc
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ImportProductSetsInputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ImportProductSetsInputConfig_OneofMarshaler, _ImportProductSetsInputConfig_OneofUnmarshaler, _ImportProductSetsInputConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ImportProductSetsInputConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ImportProductSetsInputConfig_GcsSource)(nil),
 	}
 }
 
-func _ImportProductSetsInputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ImportProductSetsInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *ImportProductSetsInputConfig_GcsSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ImportProductSetsInputConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ImportProductSetsInputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ImportProductSetsInputConfig)
-	switch tag {
-	case 1: // source.gcs_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImportProductSetsGcsSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &ImportProductSetsInputConfig_GcsSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ImportProductSetsInputConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ImportProductSetsInputConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *ImportProductSetsInputConfig_GcsSource:
-		s := proto.Size(x.GcsSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for the `ImportProductSets` method.
 type ImportProductSetsRequest struct {
 	// The project in which the ProductSets should be imported.
@@ -1731,16 +1712,17 @@ func (m *ImportProductSetsRequest) Reset()         { *m = ImportProductSetsReque
 func (m *ImportProductSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsRequest) ProtoMessage()    {}
 func (*ImportProductSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{26}
+	return fileDescriptor_3ac817753c311f0a, []int{26}
 }
+
 func (m *ImportProductSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsRequest.Unmarshal(m, b)
 }
 func (m *ImportProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsRequest.Merge(dst, src)
+func (m *ImportProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsRequest.Merge(m, src)
 }
 func (m *ImportProductSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsRequest.Size(m)
@@ -1791,16 +1773,17 @@ func (m *ImportProductSetsResponse) Reset()         { *m = ImportProductSetsResp
 func (m *ImportProductSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportProductSetsResponse) ProtoMessage()    {}
 func (*ImportProductSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{27}
+	return fileDescriptor_3ac817753c311f0a, []int{27}
 }
+
 func (m *ImportProductSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportProductSetsResponse.Unmarshal(m, b)
 }
 func (m *ImportProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportProductSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportProductSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportProductSetsResponse.Merge(dst, src)
+func (m *ImportProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsResponse.Merge(m, src)
 }
 func (m *ImportProductSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportProductSetsResponse.Size(m)
@@ -1847,16 +1830,17 @@ func (m *BatchOperationMetadata) Reset()         { *m = BatchOperationMetadata{}
 func (m *BatchOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*BatchOperationMetadata) ProtoMessage()    {}
 func (*BatchOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_product_search_service_6c1bda02aae064cc, []int{28}
+	return fileDescriptor_3ac817753c311f0a, []int{28}
 }
+
 func (m *BatchOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchOperationMetadata.Unmarshal(m, b)
 }
 func (m *BatchOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *BatchOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchOperationMetadata.Merge(dst, src)
+func (m *BatchOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchOperationMetadata.Merge(m, src)
 }
 func (m *BatchOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_BatchOperationMetadata.Size(m)
@@ -1889,6 +1873,7 @@ func (m *BatchOperationMetadata) GetEndTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p4beta1.BatchOperationMetadata_State", BatchOperationMetadata_State_name, BatchOperationMetadata_State_value)
 	proto.RegisterType((*Product)(nil), "google.cloud.vision.v1p4beta1.Product")
 	proto.RegisterType((*Product_KeyValue)(nil), "google.cloud.vision.v1p4beta1.Product.KeyValue")
 	proto.RegisterType((*ProductSet)(nil), "google.cloud.vision.v1p4beta1.ProductSet")
@@ -1919,7 +1904,132 @@ func init() {
 	proto.RegisterType((*ImportProductSetsRequest)(nil), "google.cloud.vision.v1p4beta1.ImportProductSetsRequest")
 	proto.RegisterType((*ImportProductSetsResponse)(nil), "google.cloud.vision.v1p4beta1.ImportProductSetsResponse")
 	proto.RegisterType((*BatchOperationMetadata)(nil), "google.cloud.vision.v1p4beta1.BatchOperationMetadata")
-	proto.RegisterEnum("google.cloud.vision.v1p4beta1.BatchOperationMetadata_State", BatchOperationMetadata_State_name, BatchOperationMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p4beta1/product_search_service.proto", fileDescriptor_3ac817753c311f0a)
+}
+
+var fileDescriptor_3ac817753c311f0a = []byte{
+	// 1874 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0xc6,
+	0x15, 0xce, 0xd8, 0xeb, 0x5d, 0xfb, 0xc9, 0xb2, 0xb5, 0x53, 0xd7, 0x56, 0xe4, 0x2c, 0xe2, 0xb0,
+	0x45, 0x9a, 0xa8, 0x89, 0xd8, 0x95, 0xbb, 0xdb, 0xae, 0xdc, 0x6c, 0x6a, 0xcb, 0xb2, 0xa3, 0xc6,
+	0xeb, 0x75, 0x28, 0x7b, 0x9b, 0xe6, 0x10, 0x81, 0x26, 0xc7, 0x0c, 0xbb, 0x14, 0xc9, 0x70, 0x28,
+	0x23, 0x4e, 0x91, 0x4b, 0xd0, 0x53, 0x0f, 0x5d, 0xa0, 0x45, 0x0f, 0x39, 0x15, 0xd8, 0xa0, 0xe7,
+	0x02, 0xfd, 0x71, 0x68, 0x9a, 0x43, 0xd1, 0x5b, 0x7b, 0xe8, 0xa5, 0xc7, 0x9e, 0x0a, 0xe4, 0x8f,
+	0xe8, 0xb1, 0x98, 0xe1, 0x50, 0x22, 0x29, 0xca, 0xa4, 0xb4, 0x59, 0xe4, 0xa6, 0x19, 0xbe, 0xf7,
+	0xe6, 0x7b, 0xef, 0x7d, 0x33, 0xf3, 0xde, 0x08, 0x1a, 0x86, 0xe3, 0x18, 0x16, 0x91, 0x35, 0xcb,
+	0xe9, 0xeb, 0xf2, 0xb9, 0x49, 0x4d, 0xc7, 0x96, 0xcf, 0x6f, 0xba, 0xdf, 0x3d, 0x25, 0xbe, 0x7a,
+	0x53, 0x76, 0x3d, 0x47, 0xef, 0x6b, 0x7e, 0x97, 0x12, 0xd5, 0xd3, 0xde, 0xeb, 0x52, 0xe2, 0x9d,
+	0x9b, 0x1a, 0xa9, 0xb9, 0x9e, 0xe3, 0x3b, 0xf8, 0x46, 0xa0, 0x5b, 0xe3, 0xba, 0xb5, 0x40, 0xb7,
+	0x36, 0xd0, 0xad, 0x3c, 0x27, 0x4c, 0xab, 0xae, 0x29, 0xab, 0xb6, 0xed, 0xf8, 0xaa, 0x6f, 0x3a,
+	0x36, 0x0d, 0x94, 0x2b, 0xaf, 0x5c, 0xbe, 0xb0, 0x41, 0x9c, 0x1e, 0xf1, 0xbd, 0x0b, 0x21, 0xfd,
+	0x0d, 0x21, 0x6d, 0x39, 0xb6, 0xe1, 0xf5, 0x6d, 0xdb, 0xb4, 0x0d, 0xd9, 0x71, 0x89, 0x17, 0x33,
+	0xb9, 0x2e, 0x84, 0xf8, 0xe8, 0xb4, 0x7f, 0x26, 0x93, 0x9e, 0xeb, 0x87, 0x16, 0x36, 0x92, 0x1f,
+	0xcf, 0x4c, 0x62, 0xe9, 0xdd, 0x9e, 0x4a, 0x1f, 0x0a, 0x89, 0xe7, 0x93, 0x12, 0xbe, 0xd9, 0x23,
+	0xd4, 0x57, 0x7b, 0xae, 0x10, 0x58, 0x13, 0x02, 0x9e, 0xab, 0xc9, 0xd4, 0x57, 0xfd, 0xbe, 0x58,
+	0x58, 0xfa, 0x64, 0x06, 0xae, 0x1d, 0x05, 0x91, 0xc2, 0x18, 0xae, 0xd8, 0x6a, 0x8f, 0x94, 0xd1,
+	0x06, 0x7a, 0x69, 0x41, 0xe1, 0xbf, 0xf1, 0x0b, 0xb0, 0xa8, 0x9b, 0xd4, 0xb5, 0xd4, 0x8b, 0x2e,
+	0xff, 0x36, 0xc3, 0xbf, 0x15, 0xc4, 0xdc, 0x21, 0x13, 0xd9, 0x80, 0x82, 0x4e, 0xa8, 0xe6, 0x99,
+	0x2e, 0xf3, 0xa8, 0x3c, 0x2b, 0x24, 0x86, 0x53, 0xf8, 0x65, 0x28, 0x85, 0xd9, 0xd0, 0x54, 0x9f,
+	0x18, 0x8e, 0x77, 0x51, 0xbe, 0xc2, 0xc5, 0x96, 0xc5, 0x7c, 0x53, 0x4c, 0xe3, 0x07, 0xb0, 0x14,
+	0x8a, 0x5a, 0xea, 0x29, 0xb1, 0x68, 0x79, 0x6e, 0x63, 0xf6, 0xa5, 0x42, 0x5d, 0xae, 0x5d, 0x9a,
+	0xb1, 0x9a, 0xf0, 0xa1, 0xf6, 0x26, 0xb9, 0x78, 0xa0, 0x5a, 0x7d, 0xa2, 0x14, 0x85, 0x99, 0x03,
+	0x6e, 0xa5, 0x52, 0x87, 0xf9, 0xf0, 0x13, 0x2e, 0xc1, 0xec, 0x43, 0x72, 0x21, 0xdc, 0x64, 0x3f,
+	0xf1, 0x0a, 0xcc, 0x9d, 0xb3, 0x4f, 0xc2, 0xbd, 0x60, 0x20, 0xfd, 0x11, 0x01, 0x08, 0xbb, 0x1d,
+	0x32, 0x75, 0x78, 0xee, 0x00, 0x98, 0xb6, 0x4e, 0x3e, 0xe8, 0xb2, 0x9c, 0xf0, 0xe8, 0x14, 0xea,
+	0x95, 0xd0, 0x9b, 0x30, 0x61, 0xb5, 0xe3, 0x30, 0x61, 0xca, 0x02, 0x97, 0x66, 0x63, 0xbc, 0x09,
+	0x85, 0x40, 0x95, 0x78, 0x9e, 0xe3, 0xf1, 0x90, 0x15, 0xea, 0x38, 0xd4, 0xf5, 0x5c, 0xad, 0xd6,
+	0xe1, 0xb9, 0x54, 0x82, 0x15, 0x5a, 0x4c, 0x4a, 0xfa, 0x05, 0x82, 0x25, 0x85, 0x9c, 0x11, 0x8f,
+	0xd8, 0x1a, 0x69, 0xf7, 0x54, 0x83, 0xa4, 0x22, 0x2f, 0xc1, 0x6c, 0xdf, 0x33, 0x05, 0x60, 0xf6,
+	0x13, 0x2b, 0xb0, 0x74, 0xea, 0xf4, 0x6d, 0xdd, 0xb4, 0x8d, 0xae, 0xeb, 0x58, 0x17, 0xb4, 0x3c,
+	0xcb, 0x43, 0xff, 0xed, 0x8c, 0xd0, 0xef, 0x08, 0xa5, 0x23, 0xc7, 0xba, 0x50, 0x8a, 0xa7, 0x91,
+	0x11, 0x95, 0x1e, 0x21, 0x58, 0x69, 0x7a, 0x44, 0xf5, 0x89, 0x08, 0xa4, 0x42, 0xde, 0xef, 0x13,
+	0xea, 0xe3, 0x55, 0xb8, 0xea, 0xaa, 0x1e, 0xb1, 0x7d, 0x01, 0x4a, 0x8c, 0xf0, 0x0f, 0xe1, 0x9a,
+	0x48, 0x1c, 0x87, 0x56, 0xa8, 0xbf, 0x98, 0x2f, 0xf1, 0x4a, 0xa8, 0x86, 0x6f, 0x00, 0x84, 0x0c,
+	0x32, 0x75, 0xc1, 0xc6, 0x05, 0x31, 0xd3, 0xd6, 0x25, 0x13, 0xbe, 0x76, 0x60, 0x52, 0x5f, 0xa8,
+	0xd1, 0x2c, 0x3c, 0xeb, 0xb0, 0xe0, 0xaa, 0x06, 0xe9, 0x52, 0xf3, 0xc3, 0x20, 0xbb, 0x73, 0xca,
+	0x3c, 0x9b, 0xe8, 0x98, 0x1f, 0x12, 0xbe, 0x14, 0xfb, 0xe8, 0x3b, 0x0f, 0x89, 0x3d, 0x58, 0x4a,
+	0x35, 0xc8, 0x31, 0x9b, 0x90, 0x3e, 0x46, 0xb0, 0x12, 0x5f, 0x8b, 0xba, 0x8e, 0x4d, 0x09, 0xde,
+	0x81, 0x79, 0x01, 0x88, 0x96, 0x11, 0x8f, 0x71, 0x5e, 0x2f, 0x07, 0x7a, 0xf8, 0x45, 0x58, 0xb6,
+	0xc9, 0x07, 0x7e, 0x37, 0x02, 0x20, 0xc8, 0x65, 0x91, 0x4d, 0x1f, 0x0d, 0x40, 0x7c, 0x0b, 0xae,
+	0xef, 0x13, 0x3f, 0x11, 0xfd, 0x14, 0x42, 0x48, 0xbf, 0x41, 0xb0, 0x72, 0xe2, 0xea, 0xa3, 0xa9,
+	0x8a, 0xa4, 0x04, 0x4d, 0x97, 0x92, 0x2d, 0x28, 0xf4, 0xb9, 0x65, 0x7e, 0x66, 0x89, 0xc4, 0x8e,
+	0xee, 0x81, 0x3d, 0x76, 0xac, 0xdd, 0x53, 0xe9, 0x43, 0x05, 0x02, 0x71, 0xf6, 0x5b, 0xaa, 0xc2,
+	0xca, 0x2e, 0xb1, 0xc8, 0x08, 0xac, 0x34, 0x1f, 0x3e, 0x45, 0xb0, 0x16, 0xa3, 0x5b, 0x87, 0x64,
+	0x32, 0xee, 0x47, 0x50, 0x18, 0x5e, 0x15, 0x21, 0xeb, 0x5e, 0xce, 0xe7, 0x22, 0x33, 0x1f, 0xb2,
+	0x8d, 0x1d, 0x11, 0xdf, 0x1c, 0x9e, 0x5e, 0x94, 0x44, 0xf8, 0xb7, 0x38, 0x94, 0x69, 0xeb, 0x92,
+	0x05, 0xab, 0x11, 0x5a, 0x74, 0xc8, 0xd3, 0x65, 0xe1, 0x23, 0x04, 0x6b, 0x23, 0xcb, 0x09, 0x22,
+	0x1e, 0xc0, 0x62, 0x04, 0x6f, 0x48, 0xc6, 0x09, 0x9c, 0x2f, 0x0c, 0x1d, 0xcb, 0x4f, 0xc9, 0x2a,
+	0xac, 0x0c, 0x29, 0x19, 0xc9, 0x50, 0x5a, 0x46, 0x1f, 0x23, 0x58, 0x8b, 0xb1, 0x32, 0x22, 0x9f,
+	0xc8, 0x1c, 0x7a, 0x92, 0xcc, 0x3d, 0x11, 0x45, 0x5f, 0x85, 0xb5, 0x18, 0x45, 0x33, 0x7c, 0xfa,
+	0x2b, 0x82, 0xf5, 0x80, 0xa5, 0xf1, 0x73, 0x3a, 0x8b, 0x05, 0x0f, 0x60, 0xd9, 0x0b, 0x15, 0xba,
+	0x26, 0xd3, 0x10, 0x38, 0x5f, 0xcd, 0xf0, 0x39, 0xb1, 0xcc, 0x92, 0x17, 0xbf, 0x1e, 0x5e, 0x01,
+	0x9c, 0xb0, 0x3b, 0x64, 0x6e, 0x29, 0x2e, 0xdb, 0xd6, 0x25, 0x17, 0x2a, 0x8c, 0x4e, 0x71, 0x9b,
+	0x4f, 0x95, 0xc1, 0x9f, 0x23, 0x58, 0x4f, 0x5d, 0x52, 0xb0, 0xf8, 0x6d, 0x28, 0x25, 0xf0, 0x87,
+	0x4c, 0x9e, 0x30, 0x30, 0xcb, 0x71, 0x67, 0xe9, 0xe5, 0xa8, 0x53, 0xe8, 0x3e, 0x9b, 0x46, 0xf7,
+	0x1a, 0x94, 0xf7, 0x89, 0x9f, 0x9e, 0xea, 0x34, 0x7a, 0xdc, 0x84, 0xf5, 0x80, 0x4d, 0xf9, 0x55,
+	0xee, 0xc1, 0x8d, 0x6d, 0x5d, 0x17, 0xec, 0x3b, 0x76, 0x72, 0xd1, 0x10, 0x97, 0xe3, 0x57, 0xed,
+	0xc2, 0xe0, 0xbc, 0x96, 0x14, 0x90, 0x14, 0xd2, 0x73, 0xce, 0x43, 0x3e, 0xef, 0x79, 0x4e, 0xef,
+	0x49, 0x6d, 0xbe, 0x0f, 0xcf, 0x47, 0xef, 0xc2, 0xb6, 0x9d, 0xcf, 0xe0, 0x93, 0xf0, 0xe6, 0x97,
+	0x08, 0x36, 0xc6, 0xaf, 0xf9, 0x15, 0xdc, 0xc5, 0x77, 0xa1, 0xd2, 0xee, 0xb9, 0x8e, 0x17, 0x3d,
+	0x8b, 0xf7, 0x35, 0xda, 0x71, 0xfa, 0x9e, 0xc6, 0xea, 0xe8, 0x45, 0x8d, 0x9e, 0x77, 0xcf, 0x4c,
+	0x8b, 0x74, 0x59, 0x69, 0x16, 0x84, 0x01, 0x34, 0x7a, 0xbe, 0x67, 0x5a, 0xe4, 0xc4, 0x33, 0xa5,
+	0x9f, 0x23, 0x78, 0x6e, 0xc4, 0x40, 0xdb, 0x76, 0xfb, 0x7e, 0xd3, 0xb1, 0xcf, 0x4c, 0x03, 0xbf,
+	0x03, 0x60, 0x68, 0xb4, 0x4b, 0xb9, 0x41, 0x71, 0x20, 0xde, 0xc9, 0x70, 0x67, 0x3c, 0xa2, 0x37,
+	0x9e, 0x51, 0x16, 0x8c, 0x70, 0xb0, 0x33, 0x0f, 0x57, 0x03, 0xbb, 0xd2, 0xaf, 0x10, 0x94, 0x47,
+	0xb4, 0xb2, 0x0e, 0x80, 0x77, 0x61, 0xd1, 0x64, 0x48, 0xbb, 0x1a, 0x87, 0x2a, 0x4e, 0xae, 0xad,
+	0x49, 0xc1, 0x45, 0xbc, 0x55, 0x0a, 0xe6, 0x70, 0x20, 0xfd, 0x0e, 0xc1, 0xb3, 0x29, 0xa0, 0x9e,
+	0xfa, 0x11, 0x51, 0x83, 0xf9, 0xa0, 0xa1, 0x22, 0xb4, 0x3c, 0xc3, 0x2d, 0xa6, 0x15, 0xe8, 0x03,
+	0x19, 0xe9, 0xb3, 0x19, 0x58, 0xdd, 0x51, 0x7d, 0xed, 0xbd, 0xfb, 0x61, 0x0f, 0x78, 0x8f, 0xf8,
+	0xaa, 0xae, 0xfa, 0x2a, 0x7e, 0x0b, 0xe6, 0x98, 0x58, 0x90, 0xb8, 0xa5, 0xcc, 0xd8, 0xa4, 0x5b,
+	0xe1, 0x2b, 0x12, 0x25, 0xb0, 0xc4, 0xae, 0x35, 0xda, 0x3f, 0xed, 0x99, 0x7e, 0xd0, 0x7d, 0xcc,
+	0x64, 0x76, 0x1f, 0x10, 0x88, 0xf3, 0xf6, 0xe3, 0x16, 0xcc, 0x13, 0x5b, 0xcf, 0xdb, 0xb7, 0x5c,
+	0x23, 0xb6, 0xce, 0x46, 0xd2, 0x4f, 0x60, 0x8e, 0x63, 0xc0, 0x5f, 0x87, 0xeb, 0x9d, 0xe3, 0xed,
+	0xe3, 0x56, 0xf7, 0xe4, 0xb0, 0x73, 0xd4, 0x6a, 0xb6, 0xf7, 0xda, 0xad, 0xdd, 0xd2, 0x33, 0x78,
+	0x09, 0xe0, 0x48, 0xb9, 0xdf, 0x6c, 0x75, 0x3a, 0xed, 0xc3, 0xfd, 0x12, 0x62, 0xe3, 0xce, 0x49,
+	0x93, 0x8d, 0xf7, 0x4e, 0x0e, 0x4a, 0x33, 0x18, 0xe0, 0xea, 0xde, 0x76, 0xfb, 0xa0, 0xb5, 0x5b,
+	0x9a, 0xc5, 0x45, 0x58, 0x68, 0x6e, 0x1f, 0x36, 0x5b, 0x07, 0x6c, 0x78, 0xa5, 0xfe, 0xdb, 0x75,
+	0x28, 0x0e, 0xd2, 0xcb, 0xda, 0x7a, 0xfc, 0x77, 0x04, 0xa5, 0x64, 0xc5, 0x87, 0x6f, 0x67, 0x44,
+	0x6e, 0x4c, 0x89, 0x58, 0xc9, 0x5f, 0x3b, 0x48, 0x6f, 0x7e, 0xfc, 0xef, 0x2f, 0x7e, 0x3d, 0xd3,
+	0x92, 0x6e, 0x47, 0x1a, 0xff, 0x9f, 0x05, 0x54, 0x7f, 0xcd, 0xf5, 0x9c, 0x9f, 0x12, 0xcd, 0xa7,
+	0x72, 0x55, 0xb6, 0x1c, 0x2d, 0xe8, 0xf3, 0xe5, 0xea, 0x47, 0x72, 0xa4, 0x56, 0x6a, 0x44, 0x2b,
+	0x17, 0xfc, 0x37, 0x04, 0xcb, 0x89, 0x12, 0x0d, 0xdf, 0xca, 0xc0, 0x92, 0x5e, 0x41, 0x56, 0x6e,
+	0x4f, 0xaa, 0x16, 0x6c, 0x10, 0xe9, 0x2e, 0xf7, 0xe7, 0xfb, 0x78, 0x4a, 0x7f, 0xf0, 0xef, 0x11,
+	0x14, 0x63, 0x45, 0x1d, 0xde, 0xcc, 0x40, 0x92, 0x56, 0x02, 0x4e, 0x92, 0x81, 0x54, 0xc4, 0xec,
+	0xce, 0x18, 0x83, 0x37, 0x0a, 0x57, 0xae, 0x7e, 0x84, 0xff, 0x85, 0xa0, 0x94, 0xac, 0x2c, 0x33,
+	0x99, 0x33, 0xa6, 0x14, 0x9d, 0x04, 0xf7, 0x8f, 0x39, 0xee, 0xb7, 0xea, 0x3b, 0xb1, 0x48, 0x0f,
+	0xd9, 0x50, 0xcb, 0xef, 0x43, 0x9c, 0x45, 0x8f, 0x11, 0x94, 0x92, 0x65, 0x68, 0xa6, 0x43, 0x63,
+	0xea, 0xd6, 0xca, 0xea, 0xc8, 0x4e, 0x6f, 0xf5, 0x5c, 0xff, 0x22, 0x8c, 0x7a, 0x75, 0xda, 0xa8,
+	0xff, 0x01, 0x41, 0x31, 0xb6, 0xfd, 0x32, 0x79, 0x92, 0xf6, 0x7c, 0x50, 0xc9, 0x79, 0x47, 0x4b,
+	0xbb, 0x1c, 0xee, 0x5d, 0x69, 0x73, 0x72, 0x5a, 0xd3, 0xc6, 0xa0, 0x7f, 0xfd, 0x13, 0x82, 0xc5,
+	0x68, 0x21, 0x81, 0xeb, 0xf9, 0x77, 0xd9, 0x60, 0x67, 0x6e, 0x4e, 0xa4, 0x23, 0xb6, 0xe5, 0x16,
+	0xc7, 0x7f, 0x0b, 0x4f, 0x83, 0x1f, 0x7f, 0x8a, 0x00, 0x86, 0xbb, 0x0c, 0x7f, 0x27, 0xf7, 0x86,
+	0x9c, 0x34, 0xca, 0xa9, 0x28, 0x73, 0x90, 0x82, 0x33, 0xe2, 0x33, 0x04, 0xc5, 0xd8, 0xb6, 0xca,
+	0x64, 0x44, 0xda, 0x2b, 0x45, 0x6e, 0xac, 0x07, 0x1c, 0xeb, 0x5e, 0x7d, 0x2b, 0x65, 0xfb, 0xd5,
+	0x72, 0x62, 0x1e, 0x32, 0xe3, 0x13, 0x04, 0xc5, 0xd8, 0x16, 0xca, 0x04, 0x9f, 0xf6, 0x96, 0x31,
+	0x76, 0xb7, 0x89, 0xc0, 0x56, 0xa7, 0x0a, 0xec, 0x7f, 0x07, 0x6f, 0x6f, 0x89, 0xe7, 0xc0, 0x46,
+	0xae, 0x1d, 0x97, 0xda, 0x7d, 0x54, 0x26, 0x2b, 0x97, 0xa4, 0x77, 0xb9, 0x03, 0x6f, 0x4b, 0xad,
+	0xdc, 0xfc, 0x8d, 0xba, 0x20, 0x27, 0x8a, 0xad, 0x46, 0xb2, 0xff, 0xc5, 0x7f, 0x41, 0xe1, 0xeb,
+	0xd0, 0x84, 0x3e, 0x5e, 0xd2, 0x61, 0x8d, 0xcd, 0xc6, 0x3d, 0xee, 0xcc, 0x7e, 0xb5, 0x35, 0x79,
+	0x36, 0x92, 0x9e, 0xb0, 0xfc, 0xfc, 0x07, 0x05, 0x4f, 0x91, 0x89, 0xb6, 0x16, 0xdf, 0xc9, 0x71,
+	0x50, 0xa4, 0x77, 0xdf, 0x95, 0xc6, 0x34, 0xaa, 0xe2, 0xa8, 0x11, 0xde, 0xe1, 0x2f, 0x27, 0x55,
+	0xf8, 0x9f, 0x88, 0x3f, 0x3c, 0x26, 0xd2, 0xf2, 0xbd, 0xec, 0x33, 0xe8, 0x4b, 0xe1, 0x5d, 0xaa,
+	0x33, 0xd3, 0xa7, 0xea, 0x73, 0x04, 0xab, 0xe9, 0x0d, 0x36, 0xfe, 0x41, 0x06, 0xb0, 0x4b, 0xfb,
+	0xf2, 0xb1, 0x54, 0x13, 0xa7, 0x94, 0xb4, 0x3d, 0xdd, 0x35, 0xdb, 0x50, 0x07, 0xab, 0x36, 0x50,
+	0x15, 0xff, 0x03, 0xc1, 0xfa, 0x25, 0x0d, 0x3d, 0xde, 0xce, 0x0c, 0x6e, 0xd6, 0x63, 0xc0, 0x58,
+	0x47, 0xee, 0x73, 0x47, 0xda, 0xd2, 0xee, 0x94, 0x8e, 0x78, 0xd1, 0xa5, 0x99, 0x2f, 0x5f, 0x20,
+	0x28, 0x8f, 0x6b, 0xea, 0xf1, 0xdd, 0x09, 0xee, 0xd8, 0x94, 0x17, 0x88, 0xca, 0xeb, 0x53, 0xeb,
+	0x8b, 0x4d, 0xb4, 0xcf, 0xdd, 0xdd, 0xc6, 0xaf, 0x4f, 0xe7, 0xee, 0xf0, 0xee, 0xfe, 0x33, 0x82,
+	0xeb, 0x23, 0xed, 0x6c, 0xe6, 0xf6, 0x19, 0xd7, 0x95, 0x57, 0x6e, 0x84, 0x8a, 0x91, 0x7f, 0x21,
+	0x6b, 0x83, 0xde, 0x51, 0x7a, 0x83, 0xc3, 0xde, 0x91, 0x5e, 0x9b, 0xb2, 0x9b, 0x31, 0xf9, 0xba,
+	0x0d, 0x54, 0xdd, 0x79, 0x84, 0xe0, 0x05, 0xcd, 0xe9, 0x5d, 0x8e, 0x73, 0xe7, 0xd9, 0x58, 0x13,
+	0xd7, 0x09, 0xfe, 0x9a, 0x3d, 0x62, 0xcc, 0x39, 0x42, 0xef, 0x34, 0x85, 0xae, 0xe1, 0x58, 0xaa,
+	0x6d, 0xd4, 0x1c, 0xcf, 0x90, 0x0d, 0x62, 0x73, 0x5e, 0xc9, 0xc1, 0x27, 0xd5, 0x35, 0xe9, 0x98,
+	0x7f, 0x5f, 0xb7, 0x82, 0x89, 0xff, 0x21, 0xf4, 0x78, 0xe6, 0xca, 0x7e, 0xf3, 0xc1, 0xe1, 0xe9,
+	0x55, 0xae, 0xb9, 0xf9, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x32, 0x1a, 0x41, 0x2f, 0x1e,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2850,129 +2960,3 @@ var _ProductSearch_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/vision/v1p4beta1/product_search_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/vision/v1p4beta1/product_search_service.proto", fileDescriptor_product_search_service_6c1bda02aae064cc)
-}
-
-var fileDescriptor_product_search_service_6c1bda02aae064cc = []byte{
-	// 1874 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0xc6,
-	0x15, 0xce, 0xd8, 0xeb, 0x5d, 0xfb, 0xc9, 0xb2, 0xb5, 0x53, 0xd7, 0x56, 0xe4, 0x2c, 0xe2, 0xb0,
-	0x45, 0x9a, 0xa8, 0x89, 0xd8, 0x95, 0xbb, 0xdb, 0xae, 0xdc, 0x6c, 0x6a, 0xcb, 0xb2, 0xa3, 0xc6,
-	0xeb, 0x75, 0x28, 0x7b, 0x9b, 0xe6, 0x10, 0x81, 0x26, 0xc7, 0x0c, 0xbb, 0x14, 0xc9, 0x70, 0x28,
-	0x23, 0x4e, 0x91, 0x4b, 0xd0, 0x53, 0x0f, 0x5d, 0xa0, 0x45, 0x0f, 0x39, 0x15, 0xd8, 0xa0, 0xe7,
-	0x02, 0xfd, 0x71, 0x68, 0x9a, 0x43, 0xd1, 0x5b, 0x7b, 0xe8, 0xa5, 0xc7, 0x9e, 0x0a, 0xe4, 0x8f,
-	0xe8, 0xb1, 0x98, 0xe1, 0x50, 0x22, 0x29, 0xca, 0xa4, 0xb4, 0x59, 0xe4, 0xa6, 0x19, 0xbe, 0xf7,
-	0xe6, 0x7b, 0xef, 0x7d, 0x33, 0xf3, 0xde, 0x08, 0x1a, 0x86, 0xe3, 0x18, 0x16, 0x91, 0x35, 0xcb,
-	0xe9, 0xeb, 0xf2, 0xb9, 0x49, 0x4d, 0xc7, 0x96, 0xcf, 0x6f, 0xba, 0xdf, 0x3d, 0x25, 0xbe, 0x7a,
-	0x53, 0x76, 0x3d, 0x47, 0xef, 0x6b, 0x7e, 0x97, 0x12, 0xd5, 0xd3, 0xde, 0xeb, 0x52, 0xe2, 0x9d,
-	0x9b, 0x1a, 0xa9, 0xb9, 0x9e, 0xe3, 0x3b, 0xf8, 0x46, 0xa0, 0x5b, 0xe3, 0xba, 0xb5, 0x40, 0xb7,
-	0x36, 0xd0, 0xad, 0x3c, 0x27, 0x4c, 0xab, 0xae, 0x29, 0xab, 0xb6, 0xed, 0xf8, 0xaa, 0x6f, 0x3a,
-	0x36, 0x0d, 0x94, 0x2b, 0xaf, 0x5c, 0xbe, 0xb0, 0x41, 0x9c, 0x1e, 0xf1, 0xbd, 0x0b, 0x21, 0xfd,
-	0x0d, 0x21, 0x6d, 0x39, 0xb6, 0xe1, 0xf5, 0x6d, 0xdb, 0xb4, 0x0d, 0xd9, 0x71, 0x89, 0x17, 0x33,
-	0xb9, 0x2e, 0x84, 0xf8, 0xe8, 0xb4, 0x7f, 0x26, 0x93, 0x9e, 0xeb, 0x87, 0x16, 0x36, 0x92, 0x1f,
-	0xcf, 0x4c, 0x62, 0xe9, 0xdd, 0x9e, 0x4a, 0x1f, 0x0a, 0x89, 0xe7, 0x93, 0x12, 0xbe, 0xd9, 0x23,
-	0xd4, 0x57, 0x7b, 0xae, 0x10, 0x58, 0x13, 0x02, 0x9e, 0xab, 0xc9, 0xd4, 0x57, 0xfd, 0xbe, 0x58,
-	0x58, 0xfa, 0x64, 0x06, 0xae, 0x1d, 0x05, 0x91, 0xc2, 0x18, 0xae, 0xd8, 0x6a, 0x8f, 0x94, 0xd1,
-	0x06, 0x7a, 0x69, 0x41, 0xe1, 0xbf, 0xf1, 0x0b, 0xb0, 0xa8, 0x9b, 0xd4, 0xb5, 0xd4, 0x8b, 0x2e,
-	0xff, 0x36, 0xc3, 0xbf, 0x15, 0xc4, 0xdc, 0x21, 0x13, 0xd9, 0x80, 0x82, 0x4e, 0xa8, 0xe6, 0x99,
-	0x2e, 0xf3, 0xa8, 0x3c, 0x2b, 0x24, 0x86, 0x53, 0xf8, 0x65, 0x28, 0x85, 0xd9, 0xd0, 0x54, 0x9f,
-	0x18, 0x8e, 0x77, 0x51, 0xbe, 0xc2, 0xc5, 0x96, 0xc5, 0x7c, 0x53, 0x4c, 0xe3, 0x07, 0xb0, 0x14,
-	0x8a, 0x5a, 0xea, 0x29, 0xb1, 0x68, 0x79, 0x6e, 0x63, 0xf6, 0xa5, 0x42, 0x5d, 0xae, 0x5d, 0x9a,
-	0xb1, 0x9a, 0xf0, 0xa1, 0xf6, 0x26, 0xb9, 0x78, 0xa0, 0x5a, 0x7d, 0xa2, 0x14, 0x85, 0x99, 0x03,
-	0x6e, 0xa5, 0x52, 0x87, 0xf9, 0xf0, 0x13, 0x2e, 0xc1, 0xec, 0x43, 0x72, 0x21, 0xdc, 0x64, 0x3f,
-	0xf1, 0x0a, 0xcc, 0x9d, 0xb3, 0x4f, 0xc2, 0xbd, 0x60, 0x20, 0xfd, 0x11, 0x01, 0x08, 0xbb, 0x1d,
-	0x32, 0x75, 0x78, 0xee, 0x00, 0x98, 0xb6, 0x4e, 0x3e, 0xe8, 0xb2, 0x9c, 0xf0, 0xe8, 0x14, 0xea,
-	0x95, 0xd0, 0x9b, 0x30, 0x61, 0xb5, 0xe3, 0x30, 0x61, 0xca, 0x02, 0x97, 0x66, 0x63, 0xbc, 0x09,
-	0x85, 0x40, 0x95, 0x78, 0x9e, 0xe3, 0xf1, 0x90, 0x15, 0xea, 0x38, 0xd4, 0xf5, 0x5c, 0xad, 0xd6,
-	0xe1, 0xb9, 0x54, 0x82, 0x15, 0x5a, 0x4c, 0x4a, 0xfa, 0x05, 0x82, 0x25, 0x85, 0x9c, 0x11, 0x8f,
-	0xd8, 0x1a, 0x69, 0xf7, 0x54, 0x83, 0xa4, 0x22, 0x2f, 0xc1, 0x6c, 0xdf, 0x33, 0x05, 0x60, 0xf6,
-	0x13, 0x2b, 0xb0, 0x74, 0xea, 0xf4, 0x6d, 0xdd, 0xb4, 0x8d, 0xae, 0xeb, 0x58, 0x17, 0xb4, 0x3c,
-	0xcb, 0x43, 0xff, 0xed, 0x8c, 0xd0, 0xef, 0x08, 0xa5, 0x23, 0xc7, 0xba, 0x50, 0x8a, 0xa7, 0x91,
-	0x11, 0x95, 0x1e, 0x21, 0x58, 0x69, 0x7a, 0x44, 0xf5, 0x89, 0x08, 0xa4, 0x42, 0xde, 0xef, 0x13,
-	0xea, 0xe3, 0x55, 0xb8, 0xea, 0xaa, 0x1e, 0xb1, 0x7d, 0x01, 0x4a, 0x8c, 0xf0, 0x0f, 0xe1, 0x9a,
-	0x48, 0x1c, 0x87, 0x56, 0xa8, 0xbf, 0x98, 0x2f, 0xf1, 0x4a, 0xa8, 0x86, 0x6f, 0x00, 0x84, 0x0c,
-	0x32, 0x75, 0xc1, 0xc6, 0x05, 0x31, 0xd3, 0xd6, 0x25, 0x13, 0xbe, 0x76, 0x60, 0x52, 0x5f, 0xa8,
-	0xd1, 0x2c, 0x3c, 0xeb, 0xb0, 0xe0, 0xaa, 0x06, 0xe9, 0x52, 0xf3, 0xc3, 0x20, 0xbb, 0x73, 0xca,
-	0x3c, 0x9b, 0xe8, 0x98, 0x1f, 0x12, 0xbe, 0x14, 0xfb, 0xe8, 0x3b, 0x0f, 0x89, 0x3d, 0x58, 0x4a,
-	0x35, 0xc8, 0x31, 0x9b, 0x90, 0x3e, 0x46, 0xb0, 0x12, 0x5f, 0x8b, 0xba, 0x8e, 0x4d, 0x09, 0xde,
-	0x81, 0x79, 0x01, 0x88, 0x96, 0x11, 0x8f, 0x71, 0x5e, 0x2f, 0x07, 0x7a, 0xf8, 0x45, 0x58, 0xb6,
-	0xc9, 0x07, 0x7e, 0x37, 0x02, 0x20, 0xc8, 0x65, 0x91, 0x4d, 0x1f, 0x0d, 0x40, 0x7c, 0x0b, 0xae,
-	0xef, 0x13, 0x3f, 0x11, 0xfd, 0x14, 0x42, 0x48, 0xbf, 0x41, 0xb0, 0x72, 0xe2, 0xea, 0xa3, 0xa9,
-	0x8a, 0xa4, 0x04, 0x4d, 0x97, 0x92, 0x2d, 0x28, 0xf4, 0xb9, 0x65, 0x7e, 0x66, 0x89, 0xc4, 0x8e,
-	0xee, 0x81, 0x3d, 0x76, 0xac, 0xdd, 0x53, 0xe9, 0x43, 0x05, 0x02, 0x71, 0xf6, 0x5b, 0xaa, 0xc2,
-	0xca, 0x2e, 0xb1, 0xc8, 0x08, 0xac, 0x34, 0x1f, 0x3e, 0x45, 0xb0, 0x16, 0xa3, 0x5b, 0x87, 0x64,
-	0x32, 0xee, 0x47, 0x50, 0x18, 0x5e, 0x15, 0x21, 0xeb, 0x5e, 0xce, 0xe7, 0x22, 0x33, 0x1f, 0xb2,
-	0x8d, 0x1d, 0x11, 0xdf, 0x1c, 0x9e, 0x5e, 0x94, 0x44, 0xf8, 0xb7, 0x38, 0x94, 0x69, 0xeb, 0x92,
-	0x05, 0xab, 0x11, 0x5a, 0x74, 0xc8, 0xd3, 0x65, 0xe1, 0x23, 0x04, 0x6b, 0x23, 0xcb, 0x09, 0x22,
-	0x1e, 0xc0, 0x62, 0x04, 0x6f, 0x48, 0xc6, 0x09, 0x9c, 0x2f, 0x0c, 0x1d, 0xcb, 0x4f, 0xc9, 0x2a,
-	0xac, 0x0c, 0x29, 0x19, 0xc9, 0x50, 0x5a, 0x46, 0x1f, 0x23, 0x58, 0x8b, 0xb1, 0x32, 0x22, 0x9f,
-	0xc8, 0x1c, 0x7a, 0x92, 0xcc, 0x3d, 0x11, 0x45, 0x5f, 0x85, 0xb5, 0x18, 0x45, 0x33, 0x7c, 0xfa,
-	0x2b, 0x82, 0xf5, 0x80, 0xa5, 0xf1, 0x73, 0x3a, 0x8b, 0x05, 0x0f, 0x60, 0xd9, 0x0b, 0x15, 0xba,
-	0x26, 0xd3, 0x10, 0x38, 0x5f, 0xcd, 0xf0, 0x39, 0xb1, 0xcc, 0x92, 0x17, 0xbf, 0x1e, 0x5e, 0x01,
-	0x9c, 0xb0, 0x3b, 0x64, 0x6e, 0x29, 0x2e, 0xdb, 0xd6, 0x25, 0x17, 0x2a, 0x8c, 0x4e, 0x71, 0x9b,
-	0x4f, 0x95, 0xc1, 0x9f, 0x23, 0x58, 0x4f, 0x5d, 0x52, 0xb0, 0xf8, 0x6d, 0x28, 0x25, 0xf0, 0x87,
-	0x4c, 0x9e, 0x30, 0x30, 0xcb, 0x71, 0x67, 0xe9, 0xe5, 0xa8, 0x53, 0xe8, 0x3e, 0x9b, 0x46, 0xf7,
-	0x1a, 0x94, 0xf7, 0x89, 0x9f, 0x9e, 0xea, 0x34, 0x7a, 0xdc, 0x84, 0xf5, 0x80, 0x4d, 0xf9, 0x55,
-	0xee, 0xc1, 0x8d, 0x6d, 0x5d, 0x17, 0xec, 0x3b, 0x76, 0x72, 0xd1, 0x10, 0x97, 0xe3, 0x57, 0xed,
-	0xc2, 0xe0, 0xbc, 0x96, 0x14, 0x90, 0x14, 0xd2, 0x73, 0xce, 0x43, 0x3e, 0xef, 0x79, 0x4e, 0xef,
-	0x49, 0x6d, 0xbe, 0x0f, 0xcf, 0x47, 0xef, 0xc2, 0xb6, 0x9d, 0xcf, 0xe0, 0x93, 0xf0, 0xe6, 0x97,
-	0x08, 0x36, 0xc6, 0xaf, 0xf9, 0x15, 0xdc, 0xc5, 0x77, 0xa1, 0xd2, 0xee, 0xb9, 0x8e, 0x17, 0x3d,
-	0x8b, 0xf7, 0x35, 0xda, 0x71, 0xfa, 0x9e, 0xc6, 0xea, 0xe8, 0x45, 0x8d, 0x9e, 0x77, 0xcf, 0x4c,
-	0x8b, 0x74, 0x59, 0x69, 0x16, 0x84, 0x01, 0x34, 0x7a, 0xbe, 0x67, 0x5a, 0xe4, 0xc4, 0x33, 0xa5,
-	0x9f, 0x23, 0x78, 0x6e, 0xc4, 0x40, 0xdb, 0x76, 0xfb, 0x7e, 0xd3, 0xb1, 0xcf, 0x4c, 0x03, 0xbf,
-	0x03, 0x60, 0x68, 0xb4, 0x4b, 0xb9, 0x41, 0x71, 0x20, 0xde, 0xc9, 0x70, 0x67, 0x3c, 0xa2, 0x37,
-	0x9e, 0x51, 0x16, 0x8c, 0x70, 0xb0, 0x33, 0x0f, 0x57, 0x03, 0xbb, 0xd2, 0xaf, 0x10, 0x94, 0x47,
-	0xb4, 0xb2, 0x0e, 0x80, 0x77, 0x61, 0xd1, 0x64, 0x48, 0xbb, 0x1a, 0x87, 0x2a, 0x4e, 0xae, 0xad,
-	0x49, 0xc1, 0x45, 0xbc, 0x55, 0x0a, 0xe6, 0x70, 0x20, 0xfd, 0x0e, 0xc1, 0xb3, 0x29, 0xa0, 0x9e,
-	0xfa, 0x11, 0x51, 0x83, 0xf9, 0xa0, 0xa1, 0x22, 0xb4, 0x3c, 0xc3, 0x2d, 0xa6, 0x15, 0xe8, 0x03,
-	0x19, 0xe9, 0xb3, 0x19, 0x58, 0xdd, 0x51, 0x7d, 0xed, 0xbd, 0xfb, 0x61, 0x0f, 0x78, 0x8f, 0xf8,
-	0xaa, 0xae, 0xfa, 0x2a, 0x7e, 0x0b, 0xe6, 0x98, 0x58, 0x90, 0xb8, 0xa5, 0xcc, 0xd8, 0xa4, 0x5b,
-	0xe1, 0x2b, 0x12, 0x25, 0xb0, 0xc4, 0xae, 0x35, 0xda, 0x3f, 0xed, 0x99, 0x7e, 0xd0, 0x7d, 0xcc,
-	0x64, 0x76, 0x1f, 0x10, 0x88, 0xf3, 0xf6, 0xe3, 0x16, 0xcc, 0x13, 0x5b, 0xcf, 0xdb, 0xb7, 0x5c,
-	0x23, 0xb6, 0xce, 0x46, 0xd2, 0x4f, 0x60, 0x8e, 0x63, 0xc0, 0x5f, 0x87, 0xeb, 0x9d, 0xe3, 0xed,
-	0xe3, 0x56, 0xf7, 0xe4, 0xb0, 0x73, 0xd4, 0x6a, 0xb6, 0xf7, 0xda, 0xad, 0xdd, 0xd2, 0x33, 0x78,
-	0x09, 0xe0, 0x48, 0xb9, 0xdf, 0x6c, 0x75, 0x3a, 0xed, 0xc3, 0xfd, 0x12, 0x62, 0xe3, 0xce, 0x49,
-	0x93, 0x8d, 0xf7, 0x4e, 0x0e, 0x4a, 0x33, 0x18, 0xe0, 0xea, 0xde, 0x76, 0xfb, 0xa0, 0xb5, 0x5b,
-	0x9a, 0xc5, 0x45, 0x58, 0x68, 0x6e, 0x1f, 0x36, 0x5b, 0x07, 0x6c, 0x78, 0xa5, 0xfe, 0xdb, 0x75,
-	0x28, 0x0e, 0xd2, 0xcb, 0xda, 0x7a, 0xfc, 0x77, 0x04, 0xa5, 0x64, 0xc5, 0x87, 0x6f, 0x67, 0x44,
-	0x6e, 0x4c, 0x89, 0x58, 0xc9, 0x5f, 0x3b, 0x48, 0x6f, 0x7e, 0xfc, 0xef, 0x2f, 0x7e, 0x3d, 0xd3,
-	0x92, 0x6e, 0x47, 0x1a, 0xff, 0x9f, 0x05, 0x54, 0x7f, 0xcd, 0xf5, 0x9c, 0x9f, 0x12, 0xcd, 0xa7,
-	0x72, 0x55, 0xb6, 0x1c, 0x2d, 0xe8, 0xf3, 0xe5, 0xea, 0x47, 0x72, 0xa4, 0x56, 0x6a, 0x44, 0x2b,
-	0x17, 0xfc, 0x37, 0x04, 0xcb, 0x89, 0x12, 0x0d, 0xdf, 0xca, 0xc0, 0x92, 0x5e, 0x41, 0x56, 0x6e,
-	0x4f, 0xaa, 0x16, 0x6c, 0x10, 0xe9, 0x2e, 0xf7, 0xe7, 0xfb, 0x78, 0x4a, 0x7f, 0xf0, 0xef, 0x11,
-	0x14, 0x63, 0x45, 0x1d, 0xde, 0xcc, 0x40, 0x92, 0x56, 0x02, 0x4e, 0x92, 0x81, 0x54, 0xc4, 0xec,
-	0xce, 0x18, 0x83, 0x37, 0x0a, 0x57, 0xae, 0x7e, 0x84, 0xff, 0x85, 0xa0, 0x94, 0xac, 0x2c, 0x33,
-	0x99, 0x33, 0xa6, 0x14, 0x9d, 0x04, 0xf7, 0x8f, 0x39, 0xee, 0xb7, 0xea, 0x3b, 0xb1, 0x48, 0x0f,
-	0xd9, 0x50, 0xcb, 0xef, 0x43, 0x9c, 0x45, 0x8f, 0x11, 0x94, 0x92, 0x65, 0x68, 0xa6, 0x43, 0x63,
-	0xea, 0xd6, 0xca, 0xea, 0xc8, 0x4e, 0x6f, 0xf5, 0x5c, 0xff, 0x22, 0x8c, 0x7a, 0x75, 0xda, 0xa8,
-	0xff, 0x01, 0x41, 0x31, 0xb6, 0xfd, 0x32, 0x79, 0x92, 0xf6, 0x7c, 0x50, 0xc9, 0x79, 0x47, 0x4b,
-	0xbb, 0x1c, 0xee, 0x5d, 0x69, 0x73, 0x72, 0x5a, 0xd3, 0xc6, 0xa0, 0x7f, 0xfd, 0x13, 0x82, 0xc5,
-	0x68, 0x21, 0x81, 0xeb, 0xf9, 0x77, 0xd9, 0x60, 0x67, 0x6e, 0x4e, 0xa4, 0x23, 0xb6, 0xe5, 0x16,
-	0xc7, 0x7f, 0x0b, 0x4f, 0x83, 0x1f, 0x7f, 0x8a, 0x00, 0x86, 0xbb, 0x0c, 0x7f, 0x27, 0xf7, 0x86,
-	0x9c, 0x34, 0xca, 0xa9, 0x28, 0x73, 0x90, 0x82, 0x33, 0xe2, 0x33, 0x04, 0xc5, 0xd8, 0xb6, 0xca,
-	0x64, 0x44, 0xda, 0x2b, 0x45, 0x6e, 0xac, 0x07, 0x1c, 0xeb, 0x5e, 0x7d, 0x2b, 0x65, 0xfb, 0xd5,
-	0x72, 0x62, 0x1e, 0x32, 0xe3, 0x13, 0x04, 0xc5, 0xd8, 0x16, 0xca, 0x04, 0x9f, 0xf6, 0x96, 0x31,
-	0x76, 0xb7, 0x89, 0xc0, 0x56, 0xa7, 0x0a, 0xec, 0x7f, 0x07, 0x6f, 0x6f, 0x89, 0xe7, 0xc0, 0x46,
-	0xae, 0x1d, 0x97, 0xda, 0x7d, 0x54, 0x26, 0x2b, 0x97, 0xa4, 0x77, 0xb9, 0x03, 0x6f, 0x4b, 0xad,
-	0xdc, 0xfc, 0x8d, 0xba, 0x20, 0x27, 0x8a, 0xad, 0x46, 0xb2, 0xff, 0xc5, 0x7f, 0x41, 0xe1, 0xeb,
-	0xd0, 0x84, 0x3e, 0x5e, 0xd2, 0x61, 0x8d, 0xcd, 0xc6, 0x3d, 0xee, 0xcc, 0x7e, 0xb5, 0x35, 0x79,
-	0x36, 0x92, 0x9e, 0xb0, 0xfc, 0xfc, 0x07, 0x05, 0x4f, 0x91, 0x89, 0xb6, 0x16, 0xdf, 0xc9, 0x71,
-	0x50, 0xa4, 0x77, 0xdf, 0x95, 0xc6, 0x34, 0xaa, 0xe2, 0xa8, 0x11, 0xde, 0xe1, 0x2f, 0x27, 0x55,
-	0xf8, 0x9f, 0x88, 0x3f, 0x3c, 0x26, 0xd2, 0xf2, 0xbd, 0xec, 0x33, 0xe8, 0x4b, 0xe1, 0x5d, 0xaa,
-	0x33, 0xd3, 0xa7, 0xea, 0x73, 0x04, 0xab, 0xe9, 0x0d, 0x36, 0xfe, 0x41, 0x06, 0xb0, 0x4b, 0xfb,
-	0xf2, 0xb1, 0x54, 0x13, 0xa7, 0x94, 0xb4, 0x3d, 0xdd, 0x35, 0xdb, 0x50, 0x07, 0xab, 0x36, 0x50,
-	0x15, 0xff, 0x03, 0xc1, 0xfa, 0x25, 0x0d, 0x3d, 0xde, 0xce, 0x0c, 0x6e, 0xd6, 0x63, 0xc0, 0x58,
-	0x47, 0xee, 0x73, 0x47, 0xda, 0xd2, 0xee, 0x94, 0x8e, 0x78, 0xd1, 0xa5, 0x99, 0x2f, 0x5f, 0x20,
-	0x28, 0x8f, 0x6b, 0xea, 0xf1, 0xdd, 0x09, 0xee, 0xd8, 0x94, 0x17, 0x88, 0xca, 0xeb, 0x53, 0xeb,
-	0x8b, 0x4d, 0xb4, 0xcf, 0xdd, 0xdd, 0xc6, 0xaf, 0x4f, 0xe7, 0xee, 0xf0, 0xee, 0xfe, 0x33, 0x82,
-	0xeb, 0x23, 0xed, 0x6c, 0xe6, 0xf6, 0x19, 0xd7, 0x95, 0x57, 0x6e, 0x84, 0x8a, 0x91, 0x7f, 0x21,
-	0x6b, 0x83, 0xde, 0x51, 0x7a, 0x83, 0xc3, 0xde, 0x91, 0x5e, 0x9b, 0xb2, 0x9b, 0x31, 0xf9, 0xba,
-	0x0d, 0x54, 0xdd, 0x79, 0x84, 0xe0, 0x05, 0xcd, 0xe9, 0x5d, 0x8e, 0x73, 0xe7, 0xd9, 0x58, 0x13,
-	0xd7, 0x09, 0xfe, 0x9a, 0x3d, 0x62, 0xcc, 0x39, 0x42, 0xef, 0x34, 0x85, 0xae, 0xe1, 0x58, 0xaa,
-	0x6d, 0xd4, 0x1c, 0xcf, 0x90, 0x0d, 0x62, 0x73, 0x5e, 0xc9, 0xc1, 0x27, 0xd5, 0x35, 0xe9, 0x98,
-	0x7f, 0x5f, 0xb7, 0x82, 0x89, 0xff, 0x21, 0xf4, 0x78, 0xe6, 0xca, 0x7e, 0xf3, 0xc1, 0xe1, 0xe9,
-	0x55, 0xae, 0xb9, 0xf9, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x32, 0x1a, 0x41, 0x2f, 0x1e,
-	0x00, 0x00,
-}
diff --git a/googleapis/cloud/vision/v1p4beta1/text_annotation.pb.go b/googleapis/cloud/vision/v1p4beta1/text_annotation.pb.go
index 308ccae319..26a2868650 100644
--- a/googleapis/cloud/vision/v1p4beta1/text_annotation.pb.go
+++ b/googleapis/cloud/vision/v1p4beta1/text_annotation.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p4beta1/text_annotation.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p4beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enum to denote the type of break found. New line, space etc.
 type TextAnnotation_DetectedBreak_BreakType int32
@@ -46,6 +49,7 @@ var TextAnnotation_DetectedBreak_BreakType_name = map[int32]string{
 	4: "HYPHEN",
 	5: "LINE_BREAK",
 }
+
 var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 	"UNKNOWN":        0,
 	"SPACE":          1,
@@ -58,8 +62,9 @@ var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
 func (x TextAnnotation_DetectedBreak_BreakType) String() string {
 	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
 }
+
 func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{0, 1, 0}
+	return fileDescriptor_c423097b992ebbd5, []int{0, 1, 0}
 }
 
 // Type of a block (text, image etc) as identified by OCR.
@@ -88,6 +93,7 @@ var Block_BlockType_name = map[int32]string{
 	4: "RULER",
 	5: "BARCODE",
 }
+
 var Block_BlockType_value = map[string]int32{
 	"UNKNOWN": 0,
 	"TEXT":    1,
@@ -100,8 +106,9 @@ var Block_BlockType_value = map[string]int32{
 func (x Block_BlockType) String() string {
 	return proto.EnumName(Block_BlockType_name, int32(x))
 }
+
 func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{2, 0}
+	return fileDescriptor_c423097b992ebbd5, []int{2, 0}
 }
 
 // TextAnnotation contains a structured representation of OCR extracted text.
@@ -126,16 +133,17 @@ func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
 func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation) ProtoMessage()    {}
 func (*TextAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{0}
+	return fileDescriptor_c423097b992ebbd5, []int{0}
 }
+
 func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
 }
 func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+func (m *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(m, src)
 }
 func (m *TextAnnotation) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation.Size(m)
@@ -177,16 +185,17 @@ func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_
 func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
 func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{0, 0}
+	return fileDescriptor_c423097b992ebbd5, []int{0, 0}
 }
+
 func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+func (m *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
@@ -226,16 +235,17 @@ func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_Det
 func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
 func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{0, 1}
+	return fileDescriptor_c423097b992ebbd5, []int{0, 1}
 }
+
 func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+func (m *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(m, src)
 }
 func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
@@ -275,16 +285,17 @@ func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_Text
 func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_TextProperty) ProtoMessage()    {}
 func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{0, 2}
+	return fileDescriptor_c423097b992ebbd5, []int{0, 2}
 }
+
 func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
 }
 func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
 }
-func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+func (m *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(m, src)
 }
 func (m *TextAnnotation_TextProperty) XXX_Size() int {
 	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
@@ -332,16 +343,17 @@ func (m *Page) Reset()         { *m = Page{} }
 func (m *Page) String() string { return proto.CompactTextString(m) }
 func (*Page) ProtoMessage()    {}
 func (*Page) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{1}
+	return fileDescriptor_c423097b992ebbd5, []int{1}
 }
+
 func (m *Page) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Page.Unmarshal(m, b)
 }
 func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
 }
-func (dst *Page) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Page.Merge(dst, src)
+func (m *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(m, src)
 }
 func (m *Page) XXX_Size() int {
 	return xxx_messageInfo_Page.Size(m)
@@ -427,16 +439,17 @@ func (m *Block) Reset()         { *m = Block{} }
 func (m *Block) String() string { return proto.CompactTextString(m) }
 func (*Block) ProtoMessage()    {}
 func (*Block) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{2}
+	return fileDescriptor_c423097b992ebbd5, []int{2}
 }
+
 func (m *Block) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Block.Unmarshal(m, b)
 }
 func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
 }
-func (dst *Block) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Block.Merge(dst, src)
+func (m *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(m, src)
 }
 func (m *Block) XXX_Size() int {
 	return xxx_messageInfo_Block.Size(m)
@@ -515,16 +528,17 @@ func (m *Paragraph) Reset()         { *m = Paragraph{} }
 func (m *Paragraph) String() string { return proto.CompactTextString(m) }
 func (*Paragraph) ProtoMessage()    {}
 func (*Paragraph) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{3}
+	return fileDescriptor_c423097b992ebbd5, []int{3}
 }
+
 func (m *Paragraph) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
 }
 func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
 }
-func (dst *Paragraph) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Paragraph.Merge(dst, src)
+func (m *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(m, src)
 }
 func (m *Paragraph) XXX_Size() int {
 	return xxx_messageInfo_Paragraph.Size(m)
@@ -597,16 +611,17 @@ func (m *Word) Reset()         { *m = Word{} }
 func (m *Word) String() string { return proto.CompactTextString(m) }
 func (*Word) ProtoMessage()    {}
 func (*Word) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{4}
+	return fileDescriptor_c423097b992ebbd5, []int{4}
 }
+
 func (m *Word) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Word.Unmarshal(m, b)
 }
 func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
 }
-func (dst *Word) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Word.Merge(dst, src)
+func (m *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(m, src)
 }
 func (m *Word) XXX_Size() int {
 	return xxx_messageInfo_Word.Size(m)
@@ -678,16 +693,17 @@ func (m *Symbol) Reset()         { *m = Symbol{} }
 func (m *Symbol) String() string { return proto.CompactTextString(m) }
 func (*Symbol) ProtoMessage()    {}
 func (*Symbol) Descriptor() ([]byte, []int) {
-	return fileDescriptor_text_annotation_4efa847ad22b599e, []int{5}
+	return fileDescriptor_c423097b992ebbd5, []int{5}
 }
+
 func (m *Symbol) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Symbol.Unmarshal(m, b)
 }
 func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
 }
-func (dst *Symbol) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Symbol.Merge(dst, src)
+func (m *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(m, src)
 }
 func (m *Symbol) XXX_Size() int {
 	return xxx_messageInfo_Symbol.Size(m)
@@ -727,6 +743,8 @@ func (m *Symbol) GetConfidence() float32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.vision.v1p4beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
+	proto.RegisterEnum("google.cloud.vision.v1p4beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.vision.v1p4beta1.TextAnnotation")
 	proto.RegisterType((*TextAnnotation_DetectedLanguage)(nil), "google.cloud.vision.v1p4beta1.TextAnnotation.DetectedLanguage")
 	proto.RegisterType((*TextAnnotation_DetectedBreak)(nil), "google.cloud.vision.v1p4beta1.TextAnnotation.DetectedBreak")
@@ -736,15 +754,13 @@ func init() {
 	proto.RegisterType((*Paragraph)(nil), "google.cloud.vision.v1p4beta1.Paragraph")
 	proto.RegisterType((*Word)(nil), "google.cloud.vision.v1p4beta1.Word")
 	proto.RegisterType((*Symbol)(nil), "google.cloud.vision.v1p4beta1.Symbol")
-	proto.RegisterEnum("google.cloud.vision.v1p4beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
-	proto.RegisterEnum("google.cloud.vision.v1p4beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p4beta1/text_annotation.proto", fileDescriptor_text_annotation_4efa847ad22b599e)
+	proto.RegisterFile("google/cloud/vision/v1p4beta1/text_annotation.proto", fileDescriptor_c423097b992ebbd5)
 }
 
-var fileDescriptor_text_annotation_4efa847ad22b599e = []byte{
+var fileDescriptor_c423097b992ebbd5 = []byte{
 	// 785 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xdd, 0x6a, 0xdb, 0x48,
 	0x14, 0x5e, 0xd9, 0x92, 0x63, 0x1d, 0x27, 0x46, 0x3b, 0xbb, 0x2c, 0xc6, 0xfb, 0x43, 0xd6, 0xd9,
diff --git a/googleapis/cloud/vision/v1p4beta1/web_detection.pb.go b/googleapis/cloud/vision/v1p4beta1/web_detection.pb.go
index 8bf0f72e5d..75c4ea4da7 100644
--- a/googleapis/cloud/vision/v1p4beta1/web_detection.pb.go
+++ b/googleapis/cloud/vision/v1p4beta1/web_detection.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p4beta1/web_detection.proto
 
-package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p4beta1"
+package vision
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Relevant information for the image from the Internet.
 type WebDetection struct {
@@ -46,16 +49,17 @@ func (m *WebDetection) Reset()         { *m = WebDetection{} }
 func (m *WebDetection) String() string { return proto.CompactTextString(m) }
 func (*WebDetection) ProtoMessage()    {}
 func (*WebDetection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_12add5f6a37c3a06, []int{0}
+	return fileDescriptor_f3e7265af1b70904, []int{0}
 }
+
 func (m *WebDetection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
 }
 func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection.Merge(dst, src)
+func (m *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(m, src)
 }
 func (m *WebDetection) XXX_Size() int {
 	return xxx_messageInfo_WebDetection.Size(m)
@@ -126,16 +130,17 @@ func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{}
 func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebEntity) ProtoMessage()    {}
 func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_12add5f6a37c3a06, []int{0, 0}
+	return fileDescriptor_f3e7265af1b70904, []int{0, 0}
 }
+
 func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
 }
 func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+func (m *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(m, src)
 }
 func (m *WebDetection_WebEntity) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
@@ -182,16 +187,17 @@ func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
 func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebImage) ProtoMessage()    {}
 func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_12add5f6a37c3a06, []int{0, 1}
+	return fileDescriptor_f3e7265af1b70904, []int{0, 1}
 }
+
 func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+func (m *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(m, src)
 }
 func (m *WebDetection_WebImage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebImage.Size(m)
@@ -233,16 +239,17 @@ func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
 func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebLabel) ProtoMessage()    {}
 func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_12add5f6a37c3a06, []int{0, 2}
+	return fileDescriptor_f3e7265af1b70904, []int{0, 2}
 }
+
 func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
 }
 func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+func (m *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(m, src)
 }
 func (m *WebDetection_WebLabel) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
@@ -292,16 +299,17 @@ func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
 func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
 func (*WebDetection_WebPage) ProtoMessage()    {}
 func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_detection_12add5f6a37c3a06, []int{0, 3}
+	return fileDescriptor_f3e7265af1b70904, []int{0, 3}
 }
+
 func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
 }
 func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
 }
-func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+func (m *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(m, src)
 }
 func (m *WebDetection_WebPage) XXX_Size() int {
 	return xxx_messageInfo_WebDetection_WebPage.Size(m)
@@ -356,10 +364,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p4beta1/web_detection.proto", fileDescriptor_web_detection_12add5f6a37c3a06)
+	proto.RegisterFile("google/cloud/vision/v1p4beta1/web_detection.proto", fileDescriptor_f3e7265af1b70904)
 }
 
-var fileDescriptor_web_detection_12add5f6a37c3a06 = []byte{
+var fileDescriptor_f3e7265af1b70904 = []byte{
 	// 517 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4d, 0x6f, 0xd3, 0x30,
 	0x18, 0xc7, 0x95, 0xb4, 0x1b, 0x8d, 0x5b, 0x04, 0xb3, 0x86, 0x16, 0x05, 0x26, 0x15, 0xb8, 0xf4,
diff --git a/googleapis/cloud/webrisk/v1beta1/webrisk.pb.go b/googleapis/cloud/webrisk/v1beta1/webrisk.pb.go
index 0f58b7d55b..78a0afa7ec 100644
--- a/googleapis/cloud/webrisk/v1beta1/webrisk.pb.go
+++ b/googleapis/cloud/webrisk/v1beta1/webrisk.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/webrisk/v1beta1/webrisk.proto
 
-package webrisk // import "google.golang.org/genproto/googleapis/cloud/webrisk/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package webrisk
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of threat. This maps dirrectly to the threat list a threat may
 // belong to.
@@ -46,6 +46,7 @@ var ThreatType_name = map[int32]string{
 	2: "SOCIAL_ENGINEERING",
 	3: "UNWANTED_SOFTWARE",
 }
+
 var ThreatType_value = map[string]int32{
 	"THREAT_TYPE_UNSPECIFIED": 0,
 	"MALWARE":                 1,
@@ -56,8 +57,9 @@ var ThreatType_value = map[string]int32{
 func (x ThreatType) String() string {
 	return proto.EnumName(ThreatType_name, int32(x))
 }
+
 func (ThreatType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{0}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{0}
 }
 
 // The ways in which threat entry sets can be compressed.
@@ -77,6 +79,7 @@ var CompressionType_name = map[int32]string{
 	1: "RAW",
 	2: "RICE",
 }
+
 var CompressionType_value = map[string]int32{
 	"COMPRESSION_TYPE_UNSPECIFIED": 0,
 	"RAW":                          1,
@@ -86,8 +89,9 @@ var CompressionType_value = map[string]int32{
 func (x CompressionType) String() string {
 	return proto.EnumName(CompressionType_name, int32(x))
 }
+
 func (CompressionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{1}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{1}
 }
 
 // The type of response sent to the client.
@@ -109,6 +113,7 @@ var ComputeThreatListDiffResponse_ResponseType_name = map[int32]string{
 	1: "DIFF",
 	2: "RESET",
 }
+
 var ComputeThreatListDiffResponse_ResponseType_value = map[string]int32{
 	"RESPONSE_TYPE_UNSPECIFIED": 0,
 	"DIFF":                      1,
@@ -118,8 +123,9 @@ var ComputeThreatListDiffResponse_ResponseType_value = map[string]int32{
 func (x ComputeThreatListDiffResponse_ResponseType) String() string {
 	return proto.EnumName(ComputeThreatListDiffResponse_ResponseType_name, int32(x))
 }
+
 func (ComputeThreatListDiffResponse_ResponseType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{1, 0}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{1, 0}
 }
 
 // Describes an API diff request.
@@ -140,16 +146,17 @@ func (m *ComputeThreatListDiffRequest) Reset()         { *m = ComputeThreatListD
 func (m *ComputeThreatListDiffRequest) String() string { return proto.CompactTextString(m) }
 func (*ComputeThreatListDiffRequest) ProtoMessage()    {}
 func (*ComputeThreatListDiffRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{0}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{0}
 }
+
 func (m *ComputeThreatListDiffRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ComputeThreatListDiffRequest.Unmarshal(m, b)
 }
 func (m *ComputeThreatListDiffRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ComputeThreatListDiffRequest.Marshal(b, m, deterministic)
 }
-func (dst *ComputeThreatListDiffRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ComputeThreatListDiffRequest.Merge(dst, src)
+func (m *ComputeThreatListDiffRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComputeThreatListDiffRequest.Merge(m, src)
 }
 func (m *ComputeThreatListDiffRequest) XXX_Size() int {
 	return xxx_messageInfo_ComputeThreatListDiffRequest.Size(m)
@@ -204,16 +211,17 @@ func (m *ComputeThreatListDiffRequest_Constraints) Reset() {
 func (m *ComputeThreatListDiffRequest_Constraints) String() string { return proto.CompactTextString(m) }
 func (*ComputeThreatListDiffRequest_Constraints) ProtoMessage()    {}
 func (*ComputeThreatListDiffRequest_Constraints) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{0, 0}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{0, 0}
 }
+
 func (m *ComputeThreatListDiffRequest_Constraints) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ComputeThreatListDiffRequest_Constraints.Unmarshal(m, b)
 }
 func (m *ComputeThreatListDiffRequest_Constraints) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ComputeThreatListDiffRequest_Constraints.Marshal(b, m, deterministic)
 }
-func (dst *ComputeThreatListDiffRequest_Constraints) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ComputeThreatListDiffRequest_Constraints.Merge(dst, src)
+func (m *ComputeThreatListDiffRequest_Constraints) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComputeThreatListDiffRequest_Constraints.Merge(m, src)
 }
 func (m *ComputeThreatListDiffRequest_Constraints) XXX_Size() int {
 	return xxx_messageInfo_ComputeThreatListDiffRequest_Constraints.Size(m)
@@ -275,16 +283,17 @@ func (m *ComputeThreatListDiffResponse) Reset()         { *m = ComputeThreatList
 func (m *ComputeThreatListDiffResponse) String() string { return proto.CompactTextString(m) }
 func (*ComputeThreatListDiffResponse) ProtoMessage()    {}
 func (*ComputeThreatListDiffResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{1}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{1}
 }
+
 func (m *ComputeThreatListDiffResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ComputeThreatListDiffResponse.Unmarshal(m, b)
 }
 func (m *ComputeThreatListDiffResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ComputeThreatListDiffResponse.Marshal(b, m, deterministic)
 }
-func (dst *ComputeThreatListDiffResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ComputeThreatListDiffResponse.Merge(dst, src)
+func (m *ComputeThreatListDiffResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComputeThreatListDiffResponse.Merge(m, src)
 }
 func (m *ComputeThreatListDiffResponse) XXX_Size() int {
 	return xxx_messageInfo_ComputeThreatListDiffResponse.Size(m)
@@ -353,16 +362,17 @@ func (m *ComputeThreatListDiffResponse_Checksum) Reset() {
 func (m *ComputeThreatListDiffResponse_Checksum) String() string { return proto.CompactTextString(m) }
 func (*ComputeThreatListDiffResponse_Checksum) ProtoMessage()    {}
 func (*ComputeThreatListDiffResponse_Checksum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{1, 0}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{1, 0}
 }
+
 func (m *ComputeThreatListDiffResponse_Checksum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ComputeThreatListDiffResponse_Checksum.Unmarshal(m, b)
 }
 func (m *ComputeThreatListDiffResponse_Checksum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ComputeThreatListDiffResponse_Checksum.Marshal(b, m, deterministic)
 }
-func (dst *ComputeThreatListDiffResponse_Checksum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ComputeThreatListDiffResponse_Checksum.Merge(dst, src)
+func (m *ComputeThreatListDiffResponse_Checksum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComputeThreatListDiffResponse_Checksum.Merge(m, src)
 }
 func (m *ComputeThreatListDiffResponse_Checksum) XXX_Size() int {
 	return xxx_messageInfo_ComputeThreatListDiffResponse_Checksum.Size(m)
@@ -395,16 +405,17 @@ func (m *SearchUrisRequest) Reset()         { *m = SearchUrisRequest{} }
 func (m *SearchUrisRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchUrisRequest) ProtoMessage()    {}
 func (*SearchUrisRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{2}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{2}
 }
+
 func (m *SearchUrisRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchUrisRequest.Unmarshal(m, b)
 }
 func (m *SearchUrisRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchUrisRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchUrisRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchUrisRequest.Merge(dst, src)
+func (m *SearchUrisRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchUrisRequest.Merge(m, src)
 }
 func (m *SearchUrisRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchUrisRequest.Size(m)
@@ -441,16 +452,17 @@ func (m *SearchUrisResponse) Reset()         { *m = SearchUrisResponse{} }
 func (m *SearchUrisResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchUrisResponse) ProtoMessage()    {}
 func (*SearchUrisResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{3}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{3}
 }
+
 func (m *SearchUrisResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchUrisResponse.Unmarshal(m, b)
 }
 func (m *SearchUrisResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchUrisResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchUrisResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchUrisResponse.Merge(dst, src)
+func (m *SearchUrisResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchUrisResponse.Merge(m, src)
 }
 func (m *SearchUrisResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchUrisResponse.Size(m)
@@ -484,16 +496,17 @@ func (m *SearchUrisResponse_ThreatUri) Reset()         { *m = SearchUrisResponse
 func (m *SearchUrisResponse_ThreatUri) String() string { return proto.CompactTextString(m) }
 func (*SearchUrisResponse_ThreatUri) ProtoMessage()    {}
 func (*SearchUrisResponse_ThreatUri) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{3, 0}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{3, 0}
 }
+
 func (m *SearchUrisResponse_ThreatUri) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchUrisResponse_ThreatUri.Unmarshal(m, b)
 }
 func (m *SearchUrisResponse_ThreatUri) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchUrisResponse_ThreatUri.Marshal(b, m, deterministic)
 }
-func (dst *SearchUrisResponse_ThreatUri) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchUrisResponse_ThreatUri.Merge(dst, src)
+func (m *SearchUrisResponse_ThreatUri) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchUrisResponse_ThreatUri.Merge(m, src)
 }
 func (m *SearchUrisResponse_ThreatUri) XXX_Size() int {
 	return xxx_messageInfo_SearchUrisResponse_ThreatUri.Size(m)
@@ -534,16 +547,17 @@ func (m *SearchHashesRequest) Reset()         { *m = SearchHashesRequest{} }
 func (m *SearchHashesRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchHashesRequest) ProtoMessage()    {}
 func (*SearchHashesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{4}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{4}
 }
+
 func (m *SearchHashesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchHashesRequest.Unmarshal(m, b)
 }
 func (m *SearchHashesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchHashesRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchHashesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchHashesRequest.Merge(dst, src)
+func (m *SearchHashesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchHashesRequest.Merge(m, src)
 }
 func (m *SearchHashesRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchHashesRequest.Size(m)
@@ -584,16 +598,17 @@ func (m *SearchHashesResponse) Reset()         { *m = SearchHashesResponse{} }
 func (m *SearchHashesResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchHashesResponse) ProtoMessage()    {}
 func (*SearchHashesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{5}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{5}
 }
+
 func (m *SearchHashesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchHashesResponse.Unmarshal(m, b)
 }
 func (m *SearchHashesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchHashesResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchHashesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchHashesResponse.Merge(dst, src)
+func (m *SearchHashesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchHashesResponse.Merge(m, src)
 }
 func (m *SearchHashesResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchHashesResponse.Size(m)
@@ -638,16 +653,17 @@ func (m *SearchHashesResponse_ThreatHash) Reset()         { *m = SearchHashesRes
 func (m *SearchHashesResponse_ThreatHash) String() string { return proto.CompactTextString(m) }
 func (*SearchHashesResponse_ThreatHash) ProtoMessage()    {}
 func (*SearchHashesResponse_ThreatHash) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{5, 0}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{5, 0}
 }
+
 func (m *SearchHashesResponse_ThreatHash) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchHashesResponse_ThreatHash.Unmarshal(m, b)
 }
 func (m *SearchHashesResponse_ThreatHash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchHashesResponse_ThreatHash.Marshal(b, m, deterministic)
 }
-func (dst *SearchHashesResponse_ThreatHash) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchHashesResponse_ThreatHash.Merge(dst, src)
+func (m *SearchHashesResponse_ThreatHash) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchHashesResponse_ThreatHash.Merge(m, src)
 }
 func (m *SearchHashesResponse_ThreatHash) XXX_Size() int {
 	return xxx_messageInfo_SearchHashesResponse_ThreatHash.Size(m)
@@ -698,16 +714,17 @@ func (m *ThreatEntryAdditions) Reset()         { *m = ThreatEntryAdditions{} }
 func (m *ThreatEntryAdditions) String() string { return proto.CompactTextString(m) }
 func (*ThreatEntryAdditions) ProtoMessage()    {}
 func (*ThreatEntryAdditions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{6}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{6}
 }
+
 func (m *ThreatEntryAdditions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ThreatEntryAdditions.Unmarshal(m, b)
 }
 func (m *ThreatEntryAdditions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ThreatEntryAdditions.Marshal(b, m, deterministic)
 }
-func (dst *ThreatEntryAdditions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ThreatEntryAdditions.Merge(dst, src)
+func (m *ThreatEntryAdditions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ThreatEntryAdditions.Merge(m, src)
 }
 func (m *ThreatEntryAdditions) XXX_Size() int {
 	return xxx_messageInfo_ThreatEntryAdditions.Size(m)
@@ -750,16 +767,17 @@ func (m *ThreatEntryRemovals) Reset()         { *m = ThreatEntryRemovals{} }
 func (m *ThreatEntryRemovals) String() string { return proto.CompactTextString(m) }
 func (*ThreatEntryRemovals) ProtoMessage()    {}
 func (*ThreatEntryRemovals) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{7}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{7}
 }
+
 func (m *ThreatEntryRemovals) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ThreatEntryRemovals.Unmarshal(m, b)
 }
 func (m *ThreatEntryRemovals) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ThreatEntryRemovals.Marshal(b, m, deterministic)
 }
-func (dst *ThreatEntryRemovals) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ThreatEntryRemovals.Merge(dst, src)
+func (m *ThreatEntryRemovals) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ThreatEntryRemovals.Merge(m, src)
 }
 func (m *ThreatEntryRemovals) XXX_Size() int {
 	return xxx_messageInfo_ThreatEntryRemovals.Size(m)
@@ -797,16 +815,17 @@ func (m *RawIndices) Reset()         { *m = RawIndices{} }
 func (m *RawIndices) String() string { return proto.CompactTextString(m) }
 func (*RawIndices) ProtoMessage()    {}
 func (*RawIndices) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{8}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{8}
 }
+
 func (m *RawIndices) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RawIndices.Unmarshal(m, b)
 }
 func (m *RawIndices) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RawIndices.Marshal(b, m, deterministic)
 }
-func (dst *RawIndices) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RawIndices.Merge(dst, src)
+func (m *RawIndices) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RawIndices.Merge(m, src)
 }
 func (m *RawIndices) XXX_Size() int {
 	return xxx_messageInfo_RawIndices.Size(m)
@@ -849,16 +868,17 @@ func (m *RawHashes) Reset()         { *m = RawHashes{} }
 func (m *RawHashes) String() string { return proto.CompactTextString(m) }
 func (*RawHashes) ProtoMessage()    {}
 func (*RawHashes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{9}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{9}
 }
+
 func (m *RawHashes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RawHashes.Unmarshal(m, b)
 }
 func (m *RawHashes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RawHashes.Marshal(b, m, deterministic)
 }
-func (dst *RawHashes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RawHashes.Merge(dst, src)
+func (m *RawHashes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RawHashes.Merge(m, src)
 }
 func (m *RawHashes) XXX_Size() int {
 	return xxx_messageInfo_RawHashes.Size(m)
@@ -908,16 +928,17 @@ func (m *RiceDeltaEncoding) Reset()         { *m = RiceDeltaEncoding{} }
 func (m *RiceDeltaEncoding) String() string { return proto.CompactTextString(m) }
 func (*RiceDeltaEncoding) ProtoMessage()    {}
 func (*RiceDeltaEncoding) Descriptor() ([]byte, []int) {
-	return fileDescriptor_webrisk_6b128999d2c68f99, []int{10}
+	return fileDescriptor_39d7fa5775f5f7c7, []int{10}
 }
+
 func (m *RiceDeltaEncoding) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RiceDeltaEncoding.Unmarshal(m, b)
 }
 func (m *RiceDeltaEncoding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RiceDeltaEncoding.Marshal(b, m, deterministic)
 }
-func (dst *RiceDeltaEncoding) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RiceDeltaEncoding.Merge(dst, src)
+func (m *RiceDeltaEncoding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RiceDeltaEncoding.Merge(m, src)
 }
 func (m *RiceDeltaEncoding) XXX_Size() int {
 	return xxx_messageInfo_RiceDeltaEncoding.Size(m)
@@ -957,6 +978,9 @@ func (m *RiceDeltaEncoding) GetEncodedData() []byte {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.webrisk.v1beta1.ThreatType", ThreatType_name, ThreatType_value)
+	proto.RegisterEnum("google.cloud.webrisk.v1beta1.CompressionType", CompressionType_name, CompressionType_value)
+	proto.RegisterEnum("google.cloud.webrisk.v1beta1.ComputeThreatListDiffResponse_ResponseType", ComputeThreatListDiffResponse_ResponseType_name, ComputeThreatListDiffResponse_ResponseType_value)
 	proto.RegisterType((*ComputeThreatListDiffRequest)(nil), "google.cloud.webrisk.v1beta1.ComputeThreatListDiffRequest")
 	proto.RegisterType((*ComputeThreatListDiffRequest_Constraints)(nil), "google.cloud.webrisk.v1beta1.ComputeThreatListDiffRequest.Constraints")
 	proto.RegisterType((*ComputeThreatListDiffResponse)(nil), "google.cloud.webrisk.v1beta1.ComputeThreatListDiffResponse")
@@ -972,9 +996,98 @@ func init() {
 	proto.RegisterType((*RawIndices)(nil), "google.cloud.webrisk.v1beta1.RawIndices")
 	proto.RegisterType((*RawHashes)(nil), "google.cloud.webrisk.v1beta1.RawHashes")
 	proto.RegisterType((*RiceDeltaEncoding)(nil), "google.cloud.webrisk.v1beta1.RiceDeltaEncoding")
-	proto.RegisterEnum("google.cloud.webrisk.v1beta1.ThreatType", ThreatType_name, ThreatType_value)
-	proto.RegisterEnum("google.cloud.webrisk.v1beta1.CompressionType", CompressionType_name, CompressionType_value)
-	proto.RegisterEnum("google.cloud.webrisk.v1beta1.ComputeThreatListDiffResponse_ResponseType", ComputeThreatListDiffResponse_ResponseType_name, ComputeThreatListDiffResponse_ResponseType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/webrisk/v1beta1/webrisk.proto", fileDescriptor_39d7fa5775f5f7c7)
+}
+
+var fileDescriptor_39d7fa5775f5f7c7 = []byte{
+	// 1333 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
+	0x14, 0x67, 0xed, 0x7c, 0xbe, 0x75, 0x53, 0x67, 0x9a, 0x04, 0x63, 0x52, 0x1a, 0x16, 0x01, 0x56,
+	0x24, 0xec, 0xc6, 0x08, 0x0e, 0xa9, 0x38, 0x38, 0xce, 0x3a, 0xb5, 0x9a, 0x3a, 0xd6, 0xd8, 0x49,
+	0x04, 0xaa, 0xb4, 0x4c, 0xd6, 0x63, 0x7b, 0x94, 0x78, 0x77, 0x99, 0x59, 0xe7, 0xa3, 0x27, 0x04,
+	0x67, 0x4e, 0xa8, 0x67, 0x24, 0x8e, 0x3d, 0x71, 0x40, 0x1c, 0xf8, 0x13, 0x7a, 0xe1, 0xc0, 0xbf,
+	0xc0, 0x89, 0x3b, 0x37, 0x0e, 0x68, 0x66, 0x67, 0xd7, 0x6e, 0x1b, 0xd2, 0xa4, 0xe9, 0x6d, 0xf6,
+	0xbd, 0x37, 0xbf, 0xf7, 0x39, 0xef, 0xbd, 0x85, 0xd5, 0x9e, 0xef, 0xf7, 0x8e, 0x68, 0xc9, 0x3d,
+	0xf2, 0x87, 0x9d, 0xd2, 0x09, 0x3d, 0xe0, 0x4c, 0x1c, 0x96, 0x8e, 0xd7, 0x0e, 0x68, 0x48, 0xd6,
+	0xe2, 0xef, 0x62, 0xc0, 0xfd, 0xd0, 0x47, 0xcb, 0x91, 0x6c, 0x51, 0xc9, 0x16, 0x63, 0x9e, 0x96,
+	0xcd, 0x6b, 0x6e, 0x89, 0x04, 0xac, 0x44, 0x3c, 0xcf, 0x0f, 0x49, 0xc8, 0x7c, 0x4f, 0x44, 0x77,
+	0xf3, 0x77, 0x34, 0x57, 0x7d, 0x1d, 0x0c, 0xbb, 0xa5, 0x90, 0x0d, 0xa8, 0x08, 0xc9, 0x20, 0x88,
+	0x04, 0xac, 0x67, 0x69, 0x58, 0xae, 0xfa, 0x83, 0x60, 0x18, 0xd2, 0x76, 0x9f, 0x53, 0x12, 0x6e,
+	0x33, 0x11, 0x6e, 0xb2, 0x6e, 0x17, 0xd3, 0x6f, 0x86, 0x54, 0x84, 0xa8, 0x0e, 0x66, 0xa8, 0x18,
+	0x4e, 0x78, 0x16, 0xd0, 0x9c, 0xb1, 0x62, 0x14, 0xe6, 0xca, 0x85, 0xe2, 0x45, 0x36, 0x15, 0x23,
+	0xa4, 0xf6, 0x59, 0x40, 0x31, 0x84, 0xc9, 0x19, 0x7d, 0x00, 0x37, 0x8e, 0x29, 0x17, 0xcc, 0xf7,
+	0x9c, 0xd0, 0x3f, 0xa4, 0x5e, 0x2e, 0xb5, 0x62, 0x14, 0x32, 0x38, 0xa3, 0x89, 0x6d, 0x49, 0x43,
+	0x7d, 0x30, 0x5d, 0xdf, 0x13, 0x21, 0x27, 0xcc, 0x0b, 0x45, 0x2e, 0xbd, 0x62, 0x14, 0xcc, 0x72,
+	0xed, 0x62, 0x7d, 0x17, 0x39, 0x50, 0xac, 0x8e, 0xd0, 0xf0, 0x38, 0x74, 0xfe, 0x0f, 0x03, 0xcc,
+	0x31, 0x26, 0x2a, 0x40, 0x76, 0x40, 0x4e, 0x9d, 0x0e, 0xeb, 0x76, 0x1d, 0xea, 0x85, 0x9c, 0x51,
+	0xa1, 0xdc, 0x9d, 0xc4, 0x73, 0x03, 0x72, 0x2a, 0x21, 0xed, 0x88, 0x8a, 0xee, 0xc2, 0x82, 0x92,
+	0x24, 0x21, 0x39, 0x20, 0x82, 0x26, 0xd2, 0x29, 0x25, 0x8d, 0xa4, 0xb4, 0x66, 0xc5, 0x37, 0x3a,
+	0xb0, 0x24, 0x86, 0x41, 0xe0, 0xf3, 0x90, 0x76, 0x1c, 0xd7, 0x1f, 0x04, 0x9c, 0x0a, 0xe9, 0xb3,
+	0x74, 0x30, 0x5d, 0x98, 0x2b, 0x7f, 0xf2, 0x6a, 0x07, 0xf5, 0x0d, 0x15, 0xd5, 0xc5, 0x04, 0x6c,
+	0x8c, 0x23, 0xac, 0x7f, 0x26, 0xe0, 0xf6, 0xff, 0xc4, 0x42, 0x04, 0xbe, 0x27, 0x28, 0x1a, 0xc0,
+	0x0d, 0xae, 0xcf, 0x51, 0x3e, 0x27, 0x54, 0x3e, 0xef, 0xbf, 0x56, 0x7c, 0x23, 0x9c, 0x62, 0x7c,
+	0x50, 0x96, 0x65, 0xf8, 0xd8, 0x17, 0x6a, 0xc2, 0x2c, 0xe9, 0x74, 0x98, 0xaa, 0xc8, 0xdc, 0xa4,
+	0x4a, 0x65, 0xf9, 0x32, 0xa5, 0x23, 0xc3, 0x76, 0x56, 0x89, 0x6f, 0xe2, 0x11, 0x08, 0x7a, 0x08,
+	0x33, 0x9c, 0x0e, 0xfc, 0x63, 0x72, 0x24, 0x72, 0x53, 0x0a, 0x70, 0xed, 0xd2, 0x80, 0x58, 0x5f,
+	0xc4, 0x09, 0x04, 0x5a, 0x85, 0x79, 0x8f, 0x9e, 0x38, 0xcf, 0x97, 0xe5, 0xb4, 0x2a, 0xcb, 0x9b,
+	0x1e, 0x3d, 0xd9, 0x1b, 0xaf, 0xcc, 0xaf, 0x61, 0xc6, 0xed, 0x53, 0xf7, 0x50, 0x0c, 0x07, 0xb9,
+	0x19, 0xa5, 0x7a, 0xf3, 0x3a, 0x61, 0xab, 0x6a, 0x2c, 0x9c, 0xa0, 0xa2, 0x06, 0x2c, 0x72, 0xea,
+	0xfa, 0x83, 0x01, 0xf5, 0x3a, 0xb4, 0xe3, 0x78, 0xf4, 0x34, 0x54, 0xe5, 0xa8, 0x0a, 0xcb, 0x2c,
+	0xe7, 0x63, 0x75, 0xf1, 0x6b, 0x2e, 0xb6, 0xe3, 0xd7, 0x8c, 0x6f, 0x8d, 0x5d, 0x6c, 0xd0, 0x53,
+	0xa5, 0x2a, 0x6f, 0xc1, 0x4c, 0xac, 0x05, 0x2d, 0xc1, 0x94, 0xe8, 0x93, 0xf2, 0x67, 0x9f, 0xab,
+	0x9a, 0xce, 0x60, 0xfd, 0x65, 0x6d, 0x40, 0x66, 0x3c, 0x81, 0xe8, 0x36, 0xbc, 0x83, 0xed, 0x56,
+	0x73, 0xa7, 0xd1, 0xb2, 0x9d, 0xf6, 0x97, 0x4d, 0xdb, 0xd9, 0x6d, 0xb4, 0x9a, 0x76, 0xb5, 0x5e,
+	0xab, 0xdb, 0x9b, 0xd9, 0xb7, 0xd0, 0x0c, 0x4c, 0x6c, 0xd6, 0x6b, 0xb5, 0xac, 0x81, 0x66, 0x61,
+	0x12, 0xdb, 0x2d, 0xbb, 0x9d, 0x4d, 0x59, 0x1c, 0xe6, 0x5b, 0x94, 0x70, 0xb7, 0xbf, 0xcb, 0x99,
+	0x88, 0x1b, 0x47, 0x16, 0xd2, 0x43, 0xce, 0x94, 0xb6, 0x59, 0x2c, 0x8f, 0xe8, 0x01, 0x64, 0xc6,
+	0x5a, 0x89, 0x7c, 0x2e, 0xe9, 0x2b, 0xf5, 0x12, 0x73, 0xd4, 0x4b, 0x84, 0xf5, 0x6d, 0x0a, 0xd0,
+	0xb8, 0x52, 0x5d, 0xe0, 0x18, 0xa6, 0x22, 0x29, 0xa5, 0xd8, 0x2c, 0xaf, 0x5f, 0x8c, 0xfe, 0x32,
+	0x82, 0x56, 0xb8, 0xcb, 0x19, 0xd6, 0x48, 0xf9, 0x27, 0x06, 0xcc, 0x26, 0xd4, 0x97, 0xbc, 0x30,
+	0xae, 0xe1, 0x05, 0xba, 0x07, 0x26, 0x3d, 0x0d, 0x18, 0xa7, 0x8e, 0x6c, 0xcc, 0x97, 0xc8, 0x33,
+	0x44, 0xe2, 0x92, 0x60, 0x7d, 0x6f, 0xc0, 0xad, 0xc8, 0x81, 0xfb, 0x44, 0xf4, 0x69, 0x12, 0xf9,
+	0x3b, 0x60, 0xf6, 0x89, 0xe8, 0x3b, 0x01, 0xa7, 0x5d, 0x76, 0xaa, 0xf3, 0x0d, 0x92, 0xd4, 0x54,
+	0x94, 0x37, 0x9b, 0x88, 0xbf, 0x53, 0xb0, 0xf0, 0xbc, 0x15, 0x3a, 0x15, 0xfb, 0x30, 0x1d, 0xc9,
+	0x45, 0x31, 0x32, 0xcb, 0x5f, 0x5c, 0x26, 0x17, 0xcf, 0x83, 0x68, 0xad, 0x92, 0x88, 0x63, 0x34,
+	0xb4, 0x0d, 0x0b, 0x1e, 0xed, 0x91, 0x90, 0x1d, 0x53, 0xe7, 0x6a, 0xd1, 0x43, 0xf1, 0x3d, 0x3b,
+	0x89, 0x62, 0xfe, 0xa9, 0x01, 0x30, 0xd2, 0xf2, 0x66, 0xd3, 0x8b, 0x60, 0x42, 0x86, 0x5d, 0x0f,
+	0x3a, 0x75, 0x7e, 0x31, 0xe5, 0xe9, 0x2b, 0xa5, 0xfc, 0x17, 0x03, 0x16, 0xce, 0x6b, 0x91, 0xa8,
+	0x06, 0xc0, 0xc9, 0x89, 0xd3, 0x57, 0xd1, 0xd3, 0xf1, 0xfe, 0xf8, 0x62, 0xa3, 0x31, 0x39, 0xd1,
+	0xc1, 0x9e, 0xe5, 0xf1, 0x11, 0x35, 0xc1, 0xe4, 0xcc, 0xa5, 0x31, 0x50, 0x14, 0xd2, 0xd2, 0x2b,
+	0x80, 0x98, 0x4b, 0x37, 0xe9, 0x51, 0x48, 0x6c, 0xcf, 0xf5, 0x3b, 0xcc, 0xeb, 0x61, 0x90, 0x18,
+	0x11, 0xa2, 0xf5, 0xab, 0x01, 0xb7, 0xce, 0x69, 0xc2, 0x72, 0xb1, 0x90, 0x16, 0x33, 0xaf, 0xc3,
+	0x5c, 0x3d, 0x69, 0xcd, 0x57, 0xc5, 0x19, 0x93, 0x93, 0x7a, 0x24, 0x8f, 0xa5, 0xbb, 0xfa, 0x8c,
+	0x30, 0x64, 0x94, 0xd1, 0x31, 0xd6, 0x6b, 0x5a, 0xad, 0x3c, 0xd7, 0x98, 0xd6, 0x47, 0x00, 0x23,
+	0x6d, 0x28, 0x07, 0xd3, 0x23, 0x43, 0xd3, 0x85, 0x49, 0x1c, 0x7f, 0x5a, 0x0f, 0x60, 0x36, 0x09,
+	0xa4, 0x7c, 0x79, 0xd1, 0xa3, 0x73, 0x04, 0x7b, 0x4c, 0xf5, 0xf6, 0x00, 0x11, 0xa9, 0xc5, 0x1e,
+	0xcb, 0xee, 0x3a, 0x9e, 0xa6, 0xa8, 0x2c, 0x46, 0xd1, 0xb7, 0x7e, 0x32, 0x60, 0xfe, 0x25, 0xbb,
+	0x24, 0x6a, 0x97, 0x71, 0x11, 0x3a, 0xc7, 0xe4, 0x68, 0x18, 0xa1, 0xa6, 0x31, 0x28, 0xd2, 0x9e,
+	0xa4, 0xa0, 0x0f, 0x61, 0x4e, 0xf9, 0x1f, 0x10, 0x4e, 0x06, 0x34, 0xa4, 0x5c, 0x6f, 0x22, 0x37,
+	0x24, 0xb5, 0x19, 0x13, 0x25, 0x8e, 0xdc, 0x54, 0xce, 0x1c, 0xd7, 0x1f, 0x7a, 0xa1, 0xaa, 0xbc,
+	0x49, 0x0c, 0x8a, 0x54, 0x95, 0x14, 0xf4, 0x3e, 0x64, 0xa8, 0x54, 0x4a, 0x3b, 0x6a, 0xb7, 0x51,
+	0xcb, 0x41, 0x06, 0x9b, 0x9a, 0x26, 0x77, 0x9a, 0x55, 0x1a, 0x3f, 0x16, 0x35, 0x2c, 0xde, 0x85,
+	0xb7, 0xdb, 0xf7, 0xb1, 0x5d, 0x69, 0x9f, 0x37, 0x2a, 0x4c, 0x98, 0x7e, 0x58, 0xd9, 0xde, 0xaf,
+	0x60, 0x3b, 0x6b, 0xa0, 0x25, 0x40, 0xad, 0x9d, 0x6a, 0xbd, 0xb2, 0xed, 0xd8, 0x8d, 0xad, 0x7a,
+	0xc3, 0xb6, 0x71, 0xbd, 0xb1, 0x95, 0x4d, 0xa1, 0x45, 0x98, 0xdf, 0x6d, 0xec, 0x57, 0x1a, 0x6d,
+	0x7b, 0xd3, 0x69, 0xed, 0xd4, 0xda, 0x4a, 0x3c, 0xbd, 0x5a, 0x83, 0x9b, 0x2f, 0xec, 0x3c, 0x68,
+	0x05, 0x96, 0xab, 0x3b, 0x0f, 0x9b, 0xd8, 0x6e, 0xb5, 0xea, 0x3b, 0x8d, 0xf3, 0x14, 0x4e, 0x43,
+	0x1a, 0x57, 0xf6, 0xb3, 0x86, 0x1c, 0x52, 0xb8, 0x5e, 0xb5, 0xb3, 0xa9, 0xf2, 0xbf, 0x69, 0x58,
+	0xdc, 0xa7, 0x07, 0x98, 0x89, 0xc3, 0x16, 0xe5, 0xc7, 0xcc, 0xa5, 0x7b, 0x6b, 0x1b, 0x32, 0xfd,
+	0xe8, 0x77, 0x03, 0x16, 0xcf, 0x1d, 0xd0, 0x68, 0xfd, 0xf5, 0x97, 0xcd, 0xfc, 0xbd, 0x6b, 0x6c,
+	0x04, 0x56, 0xe1, 0xbb, 0x3f, 0xff, 0xfa, 0x31, 0x65, 0xa1, 0x95, 0xe4, 0x47, 0x20, 0x4c, 0x04,
+	0xc5, 0xba, 0x1b, 0xdd, 0x55, 0x26, 0xfe, 0x60, 0x00, 0x8c, 0x46, 0x17, 0x2a, 0x5d, 0x7e, 0xc8,
+	0x45, 0x66, 0xde, 0xbd, 0xea, 0x54, 0xb4, 0x96, 0x95, 0x6d, 0x4b, 0x68, 0x21, 0xb1, 0x6d, 0xc8,
+	0x99, 0x58, 0x17, 0x4a, 0x12, 0x3d, 0x31, 0x20, 0x33, 0xde, 0xbe, 0xd1, 0xda, 0x55, 0x5a, 0x7d,
+	0x64, 0x53, 0xf9, 0xea, 0xd3, 0xc1, 0x7a, 0x4f, 0x59, 0x95, 0x43, 0x4b, 0x89, 0x55, 0xd1, 0xcb,
+	0xd2, 0x76, 0x6d, 0xfc, 0x66, 0x40, 0xde, 0xf5, 0x07, 0x31, 0xf2, 0x0b, 0x98, 0x1b, 0x19, 0x5d,
+	0x1a, 0x4d, 0xd9, 0x74, 0x9b, 0xc6, 0x57, 0x55, 0x2d, 0xd7, 0xf3, 0x8f, 0x88, 0xd7, 0x2b, 0xfa,
+	0xbc, 0x57, 0xea, 0x51, 0x4f, 0xb5, 0xe4, 0x52, 0xc4, 0x22, 0x01, 0x13, 0xe7, 0xff, 0xb4, 0xdd,
+	0xd3, 0xdf, 0x3f, 0xa7, 0x26, 0xb6, 0xaa, 0xfb, 0xf8, 0x69, 0x6a, 0x79, 0x2b, 0x02, 0xab, 0x2a,
+	0x77, 0xb4, 0xa6, 0xa2, 0x2e, 0xbf, 0x67, 0x31, 0xfb, 0x91, 0x62, 0x3f, 0xd2, 0xec, 0x47, 0x7b,
+	0x11, 0xd8, 0xc1, 0x94, 0x52, 0xfa, 0xe9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xca, 0x5c, 0x3e,
+	0xd4, 0x28, 0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1128,95 +1241,3 @@ var _WebRiskServiceV1Beta1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/webrisk/v1beta1/webrisk.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/webrisk/v1beta1/webrisk.proto", fileDescriptor_webrisk_6b128999d2c68f99)
-}
-
-var fileDescriptor_webrisk_6b128999d2c68f99 = []byte{
-	// 1333 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0xed, 0x7c, 0xbe, 0x75, 0x53, 0x67, 0x9a, 0x04, 0x63, 0x52, 0x1a, 0x16, 0x01, 0x56,
-	0x24, 0xec, 0xc6, 0x08, 0x0e, 0xa9, 0x38, 0x38, 0xce, 0x3a, 0xb5, 0x9a, 0x3a, 0xd6, 0xd8, 0x49,
-	0x04, 0xaa, 0xb4, 0x4c, 0xd6, 0x63, 0x7b, 0x94, 0x78, 0x77, 0x99, 0x59, 0xe7, 0xa3, 0x27, 0x04,
-	0x67, 0x4e, 0xa8, 0x67, 0x24, 0x8e, 0x3d, 0x71, 0x40, 0x1c, 0xf8, 0x13, 0x7a, 0xe1, 0xc0, 0xbf,
-	0xc0, 0x89, 0x3b, 0x37, 0x0e, 0x68, 0x66, 0x67, 0xd7, 0x6e, 0x1b, 0xd2, 0xa4, 0xe9, 0x6d, 0xf6,
-	0xbd, 0x37, 0xbf, 0xf7, 0x39, 0xef, 0xbd, 0x85, 0xd5, 0x9e, 0xef, 0xf7, 0x8e, 0x68, 0xc9, 0x3d,
-	0xf2, 0x87, 0x9d, 0xd2, 0x09, 0x3d, 0xe0, 0x4c, 0x1c, 0x96, 0x8e, 0xd7, 0x0e, 0x68, 0x48, 0xd6,
-	0xe2, 0xef, 0x62, 0xc0, 0xfd, 0xd0, 0x47, 0xcb, 0x91, 0x6c, 0x51, 0xc9, 0x16, 0x63, 0x9e, 0x96,
-	0xcd, 0x6b, 0x6e, 0x89, 0x04, 0xac, 0x44, 0x3c, 0xcf, 0x0f, 0x49, 0xc8, 0x7c, 0x4f, 0x44, 0x77,
-	0xf3, 0x77, 0x34, 0x57, 0x7d, 0x1d, 0x0c, 0xbb, 0xa5, 0x90, 0x0d, 0xa8, 0x08, 0xc9, 0x20, 0x88,
-	0x04, 0xac, 0x67, 0x69, 0x58, 0xae, 0xfa, 0x83, 0x60, 0x18, 0xd2, 0x76, 0x9f, 0x53, 0x12, 0x6e,
-	0x33, 0x11, 0x6e, 0xb2, 0x6e, 0x17, 0xd3, 0x6f, 0x86, 0x54, 0x84, 0xa8, 0x0e, 0x66, 0xa8, 0x18,
-	0x4e, 0x78, 0x16, 0xd0, 0x9c, 0xb1, 0x62, 0x14, 0xe6, 0xca, 0x85, 0xe2, 0x45, 0x36, 0x15, 0x23,
-	0xa4, 0xf6, 0x59, 0x40, 0x31, 0x84, 0xc9, 0x19, 0x7d, 0x00, 0x37, 0x8e, 0x29, 0x17, 0xcc, 0xf7,
-	0x9c, 0xd0, 0x3f, 0xa4, 0x5e, 0x2e, 0xb5, 0x62, 0x14, 0x32, 0x38, 0xa3, 0x89, 0x6d, 0x49, 0x43,
-	0x7d, 0x30, 0x5d, 0xdf, 0x13, 0x21, 0x27, 0xcc, 0x0b, 0x45, 0x2e, 0xbd, 0x62, 0x14, 0xcc, 0x72,
-	0xed, 0x62, 0x7d, 0x17, 0x39, 0x50, 0xac, 0x8e, 0xd0, 0xf0, 0x38, 0x74, 0xfe, 0x0f, 0x03, 0xcc,
-	0x31, 0x26, 0x2a, 0x40, 0x76, 0x40, 0x4e, 0x9d, 0x0e, 0xeb, 0x76, 0x1d, 0xea, 0x85, 0x9c, 0x51,
-	0xa1, 0xdc, 0x9d, 0xc4, 0x73, 0x03, 0x72, 0x2a, 0x21, 0xed, 0x88, 0x8a, 0xee, 0xc2, 0x82, 0x92,
-	0x24, 0x21, 0x39, 0x20, 0x82, 0x26, 0xd2, 0x29, 0x25, 0x8d, 0xa4, 0xb4, 0x66, 0xc5, 0x37, 0x3a,
-	0xb0, 0x24, 0x86, 0x41, 0xe0, 0xf3, 0x90, 0x76, 0x1c, 0xd7, 0x1f, 0x04, 0x9c, 0x0a, 0xe9, 0xb3,
-	0x74, 0x30, 0x5d, 0x98, 0x2b, 0x7f, 0xf2, 0x6a, 0x07, 0xf5, 0x0d, 0x15, 0xd5, 0xc5, 0x04, 0x6c,
-	0x8c, 0x23, 0xac, 0x7f, 0x26, 0xe0, 0xf6, 0xff, 0xc4, 0x42, 0x04, 0xbe, 0x27, 0x28, 0x1a, 0xc0,
-	0x0d, 0xae, 0xcf, 0x51, 0x3e, 0x27, 0x54, 0x3e, 0xef, 0xbf, 0x56, 0x7c, 0x23, 0x9c, 0x62, 0x7c,
-	0x50, 0x96, 0x65, 0xf8, 0xd8, 0x17, 0x6a, 0xc2, 0x2c, 0xe9, 0x74, 0x98, 0xaa, 0xc8, 0xdc, 0xa4,
-	0x4a, 0x65, 0xf9, 0x32, 0xa5, 0x23, 0xc3, 0x76, 0x56, 0x89, 0x6f, 0xe2, 0x11, 0x08, 0x7a, 0x08,
-	0x33, 0x9c, 0x0e, 0xfc, 0x63, 0x72, 0x24, 0x72, 0x53, 0x0a, 0x70, 0xed, 0xd2, 0x80, 0x58, 0x5f,
-	0xc4, 0x09, 0x04, 0x5a, 0x85, 0x79, 0x8f, 0x9e, 0x38, 0xcf, 0x97, 0xe5, 0xb4, 0x2a, 0xcb, 0x9b,
-	0x1e, 0x3d, 0xd9, 0x1b, 0xaf, 0xcc, 0xaf, 0x61, 0xc6, 0xed, 0x53, 0xf7, 0x50, 0x0c, 0x07, 0xb9,
-	0x19, 0xa5, 0x7a, 0xf3, 0x3a, 0x61, 0xab, 0x6a, 0x2c, 0x9c, 0xa0, 0xa2, 0x06, 0x2c, 0x72, 0xea,
-	0xfa, 0x83, 0x01, 0xf5, 0x3a, 0xb4, 0xe3, 0x78, 0xf4, 0x34, 0x54, 0xe5, 0xa8, 0x0a, 0xcb, 0x2c,
-	0xe7, 0x63, 0x75, 0xf1, 0x6b, 0x2e, 0xb6, 0xe3, 0xd7, 0x8c, 0x6f, 0x8d, 0x5d, 0x6c, 0xd0, 0x53,
-	0xa5, 0x2a, 0x6f, 0xc1, 0x4c, 0xac, 0x05, 0x2d, 0xc1, 0x94, 0xe8, 0x93, 0xf2, 0x67, 0x9f, 0xab,
-	0x9a, 0xce, 0x60, 0xfd, 0x65, 0x6d, 0x40, 0x66, 0x3c, 0x81, 0xe8, 0x36, 0xbc, 0x83, 0xed, 0x56,
-	0x73, 0xa7, 0xd1, 0xb2, 0x9d, 0xf6, 0x97, 0x4d, 0xdb, 0xd9, 0x6d, 0xb4, 0x9a, 0x76, 0xb5, 0x5e,
-	0xab, 0xdb, 0x9b, 0xd9, 0xb7, 0xd0, 0x0c, 0x4c, 0x6c, 0xd6, 0x6b, 0xb5, 0xac, 0x81, 0x66, 0x61,
-	0x12, 0xdb, 0x2d, 0xbb, 0x9d, 0x4d, 0x59, 0x1c, 0xe6, 0x5b, 0x94, 0x70, 0xb7, 0xbf, 0xcb, 0x99,
-	0x88, 0x1b, 0x47, 0x16, 0xd2, 0x43, 0xce, 0x94, 0xb6, 0x59, 0x2c, 0x8f, 0xe8, 0x01, 0x64, 0xc6,
-	0x5a, 0x89, 0x7c, 0x2e, 0xe9, 0x2b, 0xf5, 0x12, 0x73, 0xd4, 0x4b, 0x84, 0xf5, 0x6d, 0x0a, 0xd0,
-	0xb8, 0x52, 0x5d, 0xe0, 0x18, 0xa6, 0x22, 0x29, 0xa5, 0xd8, 0x2c, 0xaf, 0x5f, 0x8c, 0xfe, 0x32,
-	0x82, 0x56, 0xb8, 0xcb, 0x19, 0xd6, 0x48, 0xf9, 0x27, 0x06, 0xcc, 0x26, 0xd4, 0x97, 0xbc, 0x30,
-	0xae, 0xe1, 0x05, 0xba, 0x07, 0x26, 0x3d, 0x0d, 0x18, 0xa7, 0x8e, 0x6c, 0xcc, 0x97, 0xc8, 0x33,
-	0x44, 0xe2, 0x92, 0x60, 0x7d, 0x6f, 0xc0, 0xad, 0xc8, 0x81, 0xfb, 0x44, 0xf4, 0x69, 0x12, 0xf9,
-	0x3b, 0x60, 0xf6, 0x89, 0xe8, 0x3b, 0x01, 0xa7, 0x5d, 0x76, 0xaa, 0xf3, 0x0d, 0x92, 0xd4, 0x54,
-	0x94, 0x37, 0x9b, 0x88, 0xbf, 0x53, 0xb0, 0xf0, 0xbc, 0x15, 0x3a, 0x15, 0xfb, 0x30, 0x1d, 0xc9,
-	0x45, 0x31, 0x32, 0xcb, 0x5f, 0x5c, 0x26, 0x17, 0xcf, 0x83, 0x68, 0xad, 0x92, 0x88, 0x63, 0x34,
-	0xb4, 0x0d, 0x0b, 0x1e, 0xed, 0x91, 0x90, 0x1d, 0x53, 0xe7, 0x6a, 0xd1, 0x43, 0xf1, 0x3d, 0x3b,
-	0x89, 0x62, 0xfe, 0xa9, 0x01, 0x30, 0xd2, 0xf2, 0x66, 0xd3, 0x8b, 0x60, 0x42, 0x86, 0x5d, 0x0f,
-	0x3a, 0x75, 0x7e, 0x31, 0xe5, 0xe9, 0x2b, 0xa5, 0xfc, 0x17, 0x03, 0x16, 0xce, 0x6b, 0x91, 0xa8,
-	0x06, 0xc0, 0xc9, 0x89, 0xd3, 0x57, 0xd1, 0xd3, 0xf1, 0xfe, 0xf8, 0x62, 0xa3, 0x31, 0x39, 0xd1,
-	0xc1, 0x9e, 0xe5, 0xf1, 0x11, 0x35, 0xc1, 0xe4, 0xcc, 0xa5, 0x31, 0x50, 0x14, 0xd2, 0xd2, 0x2b,
-	0x80, 0x98, 0x4b, 0x37, 0xe9, 0x51, 0x48, 0x6c, 0xcf, 0xf5, 0x3b, 0xcc, 0xeb, 0x61, 0x90, 0x18,
-	0x11, 0xa2, 0xf5, 0xab, 0x01, 0xb7, 0xce, 0x69, 0xc2, 0x72, 0xb1, 0x90, 0x16, 0x33, 0xaf, 0xc3,
-	0x5c, 0x3d, 0x69, 0xcd, 0x57, 0xc5, 0x19, 0x93, 0x93, 0x7a, 0x24, 0x8f, 0xa5, 0xbb, 0xfa, 0x8c,
-	0x30, 0x64, 0x94, 0xd1, 0x31, 0xd6, 0x6b, 0x5a, 0xad, 0x3c, 0xd7, 0x98, 0xd6, 0x47, 0x00, 0x23,
-	0x6d, 0x28, 0x07, 0xd3, 0x23, 0x43, 0xd3, 0x85, 0x49, 0x1c, 0x7f, 0x5a, 0x0f, 0x60, 0x36, 0x09,
-	0xa4, 0x7c, 0x79, 0xd1, 0xa3, 0x73, 0x04, 0x7b, 0x4c, 0xf5, 0xf6, 0x00, 0x11, 0xa9, 0xc5, 0x1e,
-	0xcb, 0xee, 0x3a, 0x9e, 0xa6, 0xa8, 0x2c, 0x46, 0xd1, 0xb7, 0x7e, 0x32, 0x60, 0xfe, 0x25, 0xbb,
-	0x24, 0x6a, 0x97, 0x71, 0x11, 0x3a, 0xc7, 0xe4, 0x68, 0x18, 0xa1, 0xa6, 0x31, 0x28, 0xd2, 0x9e,
-	0xa4, 0xa0, 0x0f, 0x61, 0x4e, 0xf9, 0x1f, 0x10, 0x4e, 0x06, 0x34, 0xa4, 0x5c, 0x6f, 0x22, 0x37,
-	0x24, 0xb5, 0x19, 0x13, 0x25, 0x8e, 0xdc, 0x54, 0xce, 0x1c, 0xd7, 0x1f, 0x7a, 0xa1, 0xaa, 0xbc,
-	0x49, 0x0c, 0x8a, 0x54, 0x95, 0x14, 0xf4, 0x3e, 0x64, 0xa8, 0x54, 0x4a, 0x3b, 0x6a, 0xb7, 0x51,
-	0xcb, 0x41, 0x06, 0x9b, 0x9a, 0x26, 0x77, 0x9a, 0x55, 0x1a, 0x3f, 0x16, 0x35, 0x2c, 0xde, 0x85,
-	0xb7, 0xdb, 0xf7, 0xb1, 0x5d, 0x69, 0x9f, 0x37, 0x2a, 0x4c, 0x98, 0x7e, 0x58, 0xd9, 0xde, 0xaf,
-	0x60, 0x3b, 0x6b, 0xa0, 0x25, 0x40, 0xad, 0x9d, 0x6a, 0xbd, 0xb2, 0xed, 0xd8, 0x8d, 0xad, 0x7a,
-	0xc3, 0xb6, 0x71, 0xbd, 0xb1, 0x95, 0x4d, 0xa1, 0x45, 0x98, 0xdf, 0x6d, 0xec, 0x57, 0x1a, 0x6d,
-	0x7b, 0xd3, 0x69, 0xed, 0xd4, 0xda, 0x4a, 0x3c, 0xbd, 0x5a, 0x83, 0x9b, 0x2f, 0xec, 0x3c, 0x68,
-	0x05, 0x96, 0xab, 0x3b, 0x0f, 0x9b, 0xd8, 0x6e, 0xb5, 0xea, 0x3b, 0x8d, 0xf3, 0x14, 0x4e, 0x43,
-	0x1a, 0x57, 0xf6, 0xb3, 0x86, 0x1c, 0x52, 0xb8, 0x5e, 0xb5, 0xb3, 0xa9, 0xf2, 0xbf, 0x69, 0x58,
-	0xdc, 0xa7, 0x07, 0x98, 0x89, 0xc3, 0x16, 0xe5, 0xc7, 0xcc, 0xa5, 0x7b, 0x6b, 0x1b, 0x32, 0xfd,
-	0xe8, 0x77, 0x03, 0x16, 0xcf, 0x1d, 0xd0, 0x68, 0xfd, 0xf5, 0x97, 0xcd, 0xfc, 0xbd, 0x6b, 0x6c,
-	0x04, 0x56, 0xe1, 0xbb, 0x3f, 0xff, 0xfa, 0x31, 0x65, 0xa1, 0x95, 0xe4, 0x47, 0x20, 0x4c, 0x04,
-	0xc5, 0xba, 0x1b, 0xdd, 0x55, 0x26, 0xfe, 0x60, 0x00, 0x8c, 0x46, 0x17, 0x2a, 0x5d, 0x7e, 0xc8,
-	0x45, 0x66, 0xde, 0xbd, 0xea, 0x54, 0xb4, 0x96, 0x95, 0x6d, 0x4b, 0x68, 0x21, 0xb1, 0x6d, 0xc8,
-	0x99, 0x58, 0x17, 0x4a, 0x12, 0x3d, 0x31, 0x20, 0x33, 0xde, 0xbe, 0xd1, 0xda, 0x55, 0x5a, 0x7d,
-	0x64, 0x53, 0xf9, 0xea, 0xd3, 0xc1, 0x7a, 0x4f, 0x59, 0x95, 0x43, 0x4b, 0x89, 0x55, 0xd1, 0xcb,
-	0xd2, 0x76, 0x6d, 0xfc, 0x66, 0x40, 0xde, 0xf5, 0x07, 0x31, 0xf2, 0x0b, 0x98, 0x1b, 0x19, 0x5d,
-	0x1a, 0x4d, 0xd9, 0x74, 0x9b, 0xc6, 0x57, 0x55, 0x2d, 0xd7, 0xf3, 0x8f, 0x88, 0xd7, 0x2b, 0xfa,
-	0xbc, 0x57, 0xea, 0x51, 0x4f, 0xb5, 0xe4, 0x52, 0xc4, 0x22, 0x01, 0x13, 0xe7, 0xff, 0xb4, 0xdd,
-	0xd3, 0xdf, 0x3f, 0xa7, 0x26, 0xb6, 0xaa, 0xfb, 0xf8, 0x69, 0x6a, 0x79, 0x2b, 0x02, 0xab, 0x2a,
-	0x77, 0xb4, 0xa6, 0xa2, 0x2e, 0xbf, 0x67, 0x31, 0xfb, 0x91, 0x62, 0x3f, 0xd2, 0xec, 0x47, 0x7b,
-	0x11, 0xd8, 0xc1, 0x94, 0x52, 0xfa, 0xe9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xca, 0x5c, 0x3e,
-	0xd4, 0x28, 0x0e, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
index 542aea373d..03f1cb8e26 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/crawled_url.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A CrawledUrl resource represents a URL that was crawled during a ScanRun. Web
 // Security Scanner Service crawls the web applications, following all links
@@ -42,16 +45,17 @@ func (m *CrawledUrl) Reset()         { *m = CrawledUrl{} }
 func (m *CrawledUrl) String() string { return proto.CompactTextString(m) }
 func (*CrawledUrl) ProtoMessage()    {}
 func (*CrawledUrl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_crawled_url_fd7b6fb38bf10fe0, []int{0}
+	return fileDescriptor_a45f0d639c4b8a44, []int{0}
 }
+
 func (m *CrawledUrl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CrawledUrl.Unmarshal(m, b)
 }
 func (m *CrawledUrl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CrawledUrl.Marshal(b, m, deterministic)
 }
-func (dst *CrawledUrl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CrawledUrl.Merge(dst, src)
+func (m *CrawledUrl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CrawledUrl.Merge(m, src)
 }
 func (m *CrawledUrl) XXX_Size() int {
 	return xxx_messageInfo_CrawledUrl.Size(m)
@@ -88,10 +92,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/crawled_url.proto", fileDescriptor_crawled_url_fd7b6fb38bf10fe0)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/crawled_url.proto", fileDescriptor_a45f0d639c4b8a44)
 }
 
-var fileDescriptor_crawled_url_fd7b6fb38bf10fe0 = []byte{
+var fileDescriptor_a45f0d639c4b8a44 = []byte{
 	// 235 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x31, 0x4b, 0x04, 0x31,
 	0x10, 0x85, 0x59, 0x4f, 0x04, 0xc7, 0x42, 0x49, 0xb5, 0x88, 0xa0, 0xd8, 0x28, 0x08, 0x09, 0x62,
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
index 74594eb644..336ef25ec1 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/finding.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Types of Findings.
 type Finding_FindingType int32
@@ -70,6 +73,7 @@ var Finding_FindingType_name = map[int32]string{
 	4: "XSS_ERROR",
 	6: "CLEAR_TEXT_PASSWORD",
 }
+
 var Finding_FindingType_value = map[string]int32{
 	"FINDING_TYPE_UNSPECIFIED": 0,
 	"MIXED_CONTENT":            1,
@@ -83,8 +87,9 @@ var Finding_FindingType_value = map[string]int32{
 func (x Finding_FindingType) String() string {
 	return proto.EnumName(Finding_FindingType_name, int32(x))
 }
+
 func (Finding_FindingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_finding_0d846c4fd25e6d9a, []int{0, 0}
+	return fileDescriptor_811918cc7b338327, []int{0, 0}
 }
 
 // A Finding resource represents a vulnerability instance identified during a
@@ -150,16 +155,17 @@ func (m *Finding) Reset()         { *m = Finding{} }
 func (m *Finding) String() string { return proto.CompactTextString(m) }
 func (*Finding) ProtoMessage()    {}
 func (*Finding) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_0d846c4fd25e6d9a, []int{0}
+	return fileDescriptor_811918cc7b338327, []int{0}
 }
+
 func (m *Finding) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Finding.Unmarshal(m, b)
 }
 func (m *Finding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Finding.Marshal(b, m, deterministic)
 }
-func (dst *Finding) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Finding.Merge(dst, src)
+func (m *Finding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Finding.Merge(m, src)
 }
 func (m *Finding) XXX_Size() int {
 	return xxx_messageInfo_Finding.Size(m)
@@ -269,15 +275,15 @@ func (m *Finding) GetXss() *Xss {
 }
 
 func init() {
-	proto.RegisterType((*Finding)(nil), "google.cloud.websecurityscanner.v1alpha.Finding")
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.Finding_FindingType", Finding_FindingType_name, Finding_FindingType_value)
+	proto.RegisterType((*Finding)(nil), "google.cloud.websecurityscanner.v1alpha.Finding")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding.proto", fileDescriptor_finding_0d846c4fd25e6d9a)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding.proto", fileDescriptor_811918cc7b338327)
 }
 
-var fileDescriptor_finding_0d846c4fd25e6d9a = []byte{
+var fileDescriptor_811918cc7b338327 = []byte{
 	// 631 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5f, 0x6f, 0xd3, 0x3e,
 	0x14, 0xfd, 0x65, 0xff, 0xeb, 0x74, 0x5b, 0xe6, 0xdf, 0x10, 0xd1, 0x18, 0x5a, 0xb5, 0x17, 0x86,
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
index e6b26df513..574d9af4ef 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Information reported for an outdated library.
 type OutdatedLibrary struct {
@@ -36,16 +39,17 @@ func (m *OutdatedLibrary) Reset()         { *m = OutdatedLibrary{} }
 func (m *OutdatedLibrary) String() string { return proto.CompactTextString(m) }
 func (*OutdatedLibrary) ProtoMessage()    {}
 func (*OutdatedLibrary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_0a47c25fab663451, []int{0}
+	return fileDescriptor_067c3e019cef51ec, []int{0}
 }
+
 func (m *OutdatedLibrary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutdatedLibrary.Unmarshal(m, b)
 }
 func (m *OutdatedLibrary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutdatedLibrary.Marshal(b, m, deterministic)
 }
-func (dst *OutdatedLibrary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutdatedLibrary.Merge(dst, src)
+func (m *OutdatedLibrary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutdatedLibrary.Merge(m, src)
 }
 func (m *OutdatedLibrary) XXX_Size() int {
 	return xxx_messageInfo_OutdatedLibrary.Size(m)
@@ -93,16 +97,17 @@ func (m *ViolatingResource) Reset()         { *m = ViolatingResource{} }
 func (m *ViolatingResource) String() string { return proto.CompactTextString(m) }
 func (*ViolatingResource) ProtoMessage()    {}
 func (*ViolatingResource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_0a47c25fab663451, []int{1}
+	return fileDescriptor_067c3e019cef51ec, []int{1}
 }
+
 func (m *ViolatingResource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ViolatingResource.Unmarshal(m, b)
 }
 func (m *ViolatingResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ViolatingResource.Marshal(b, m, deterministic)
 }
-func (dst *ViolatingResource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ViolatingResource.Merge(dst, src)
+func (m *ViolatingResource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ViolatingResource.Merge(m, src)
 }
 func (m *ViolatingResource) XXX_Size() int {
 	return xxx_messageInfo_ViolatingResource.Size(m)
@@ -140,16 +145,17 @@ func (m *VulnerableParameters) Reset()         { *m = VulnerableParameters{} }
 func (m *VulnerableParameters) String() string { return proto.CompactTextString(m) }
 func (*VulnerableParameters) ProtoMessage()    {}
 func (*VulnerableParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_0a47c25fab663451, []int{2}
+	return fileDescriptor_067c3e019cef51ec, []int{2}
 }
+
 func (m *VulnerableParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerableParameters.Unmarshal(m, b)
 }
 func (m *VulnerableParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerableParameters.Marshal(b, m, deterministic)
 }
-func (dst *VulnerableParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerableParameters.Merge(dst, src)
+func (m *VulnerableParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerableParameters.Merge(m, src)
 }
 func (m *VulnerableParameters) XXX_Size() int {
 	return xxx_messageInfo_VulnerableParameters.Size(m)
@@ -182,16 +188,17 @@ func (m *Xss) Reset()         { *m = Xss{} }
 func (m *Xss) String() string { return proto.CompactTextString(m) }
 func (*Xss) ProtoMessage()    {}
 func (*Xss) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_0a47c25fab663451, []int{3}
+	return fileDescriptor_067c3e019cef51ec, []int{3}
 }
+
 func (m *Xss) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Xss.Unmarshal(m, b)
 }
 func (m *Xss) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Xss.Marshal(b, m, deterministic)
 }
-func (dst *Xss) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Xss.Merge(dst, src)
+func (m *Xss) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Xss.Merge(m, src)
 }
 func (m *Xss) XXX_Size() int {
 	return xxx_messageInfo_Xss.Size(m)
@@ -224,10 +231,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding_addon.proto", fileDescriptor_finding_addon_0a47c25fab663451)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding_addon.proto", fileDescriptor_067c3e019cef51ec)
 }
 
-var fileDescriptor_finding_addon_0a47c25fab663451 = []byte{
+var fileDescriptor_067c3e019cef51ec = []byte{
 	// 388 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6b, 0xd4, 0x50,
 	0x10, 0xc6, 0x89, 0x0b, 0x4a, 0xdf, 0xb6, 0x2e, 0x0d, 0x1e, 0x82, 0x78, 0xa8, 0x2b, 0xd8, 0x82,
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
index 16a57b871d..63aff00696 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A FindingTypeStats resource represents stats regarding a specific FindingType
 // of Findings under a given ScanRun.
@@ -37,16 +40,17 @@ func (m *FindingTypeStats) Reset()         { *m = FindingTypeStats{} }
 func (m *FindingTypeStats) String() string { return proto.CompactTextString(m) }
 func (*FindingTypeStats) ProtoMessage()    {}
 func (*FindingTypeStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_type_stats_93e51e03522ec716, []int{0}
+	return fileDescriptor_91da39ac488bf6ea, []int{0}
 }
+
 func (m *FindingTypeStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FindingTypeStats.Unmarshal(m, b)
 }
 func (m *FindingTypeStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FindingTypeStats.Marshal(b, m, deterministic)
 }
-func (dst *FindingTypeStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FindingTypeStats.Merge(dst, src)
+func (m *FindingTypeStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FindingTypeStats.Merge(m, src)
 }
 func (m *FindingTypeStats) XXX_Size() int {
 	return xxx_messageInfo_FindingTypeStats.Size(m)
@@ -76,10 +80,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto", fileDescriptor_finding_type_stats_93e51e03522ec716)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto", fileDescriptor_91da39ac488bf6ea)
 }
 
-var fileDescriptor_finding_type_stats_93e51e03522ec716 = []byte{
+var fileDescriptor_91da39ac488bf6ea = []byte{
 	// 256 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xc9, 0x2f, 0x4d, 0xd1, 0x2f, 0x4f, 0x4d, 0x2a, 0x4e, 0x4d, 0x2e,
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
index 602f3a869c..ffe5dd5417 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/scan_config.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Type of user agents used for scanning.
 type ScanConfig_UserAgent int32
@@ -40,6 +43,7 @@ var ScanConfig_UserAgent_name = map[int32]string{
 	2: "CHROME_ANDROID",
 	3: "SAFARI_IPHONE",
 }
+
 var ScanConfig_UserAgent_value = map[string]int32{
 	"USER_AGENT_UNSPECIFIED": 0,
 	"CHROME_LINUX":           1,
@@ -50,8 +54,9 @@ var ScanConfig_UserAgent_value = map[string]int32{
 func (x ScanConfig_UserAgent) String() string {
 	return proto.EnumName(ScanConfig_UserAgent_name, int32(x))
 }
+
 func (ScanConfig_UserAgent) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_dda68c43e028bff3, []int{0, 0}
+	return fileDescriptor_50b1b6d7cca97898, []int{0, 0}
 }
 
 // Cloud platforms supported by Cloud Web Security Scanner.
@@ -72,6 +77,7 @@ var ScanConfig_TargetPlatform_name = map[int32]string{
 	1: "APP_ENGINE",
 	2: "COMPUTE",
 }
+
 var ScanConfig_TargetPlatform_value = map[string]int32{
 	"TARGET_PLATFORM_UNSPECIFIED": 0,
 	"APP_ENGINE":                  1,
@@ -81,8 +87,9 @@ var ScanConfig_TargetPlatform_value = map[string]int32{
 func (x ScanConfig_TargetPlatform) String() string {
 	return proto.EnumName(ScanConfig_TargetPlatform_name, int32(x))
 }
+
 func (ScanConfig_TargetPlatform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_dda68c43e028bff3, []int{0, 1}
+	return fileDescriptor_50b1b6d7cca97898, []int{0, 1}
 }
 
 // A ScanConfig resource contains the configurations to launch a scan.
@@ -124,16 +131,17 @@ func (m *ScanConfig) Reset()         { *m = ScanConfig{} }
 func (m *ScanConfig) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig) ProtoMessage()    {}
 func (*ScanConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_dda68c43e028bff3, []int{0}
+	return fileDescriptor_50b1b6d7cca97898, []int{0}
 }
+
 func (m *ScanConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig.Unmarshal(m, b)
 }
 func (m *ScanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig.Merge(dst, src)
+func (m *ScanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig.Merge(m, src)
 }
 func (m *ScanConfig) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig.Size(m)
@@ -225,16 +233,17 @@ func (m *ScanConfig_Authentication) Reset()         { *m = ScanConfig_Authentica
 func (m *ScanConfig_Authentication) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Authentication) ProtoMessage()    {}
 func (*ScanConfig_Authentication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_dda68c43e028bff3, []int{0, 0}
+	return fileDescriptor_50b1b6d7cca97898, []int{0, 0}
 }
+
 func (m *ScanConfig_Authentication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Authentication.Unmarshal(m, b)
 }
 func (m *ScanConfig_Authentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Authentication.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Authentication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Authentication.Merge(dst, src)
+func (m *ScanConfig_Authentication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication.Merge(m, src)
 }
 func (m *ScanConfig_Authentication) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Authentication.Size(m)
@@ -282,80 +291,14 @@ func (m *ScanConfig_Authentication) GetCustomAccount() *ScanConfig_Authenticatio
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ScanConfig_Authentication) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ScanConfig_Authentication_OneofMarshaler, _ScanConfig_Authentication_OneofUnmarshaler, _ScanConfig_Authentication_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ScanConfig_Authentication) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ScanConfig_Authentication_GoogleAccount_)(nil),
 		(*ScanConfig_Authentication_CustomAccount_)(nil),
 	}
 }
 
-func _ScanConfig_Authentication_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ScanConfig_Authentication)
-	// authentication
-	switch x := m.Authentication.(type) {
-	case *ScanConfig_Authentication_GoogleAccount_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GoogleAccount); err != nil {
-			return err
-		}
-	case *ScanConfig_Authentication_CustomAccount_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomAccount); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ScanConfig_Authentication.Authentication has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ScanConfig_Authentication_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ScanConfig_Authentication)
-	switch tag {
-	case 1: // authentication.google_account
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ScanConfig_Authentication_GoogleAccount)
-		err := b.DecodeMessage(msg)
-		m.Authentication = &ScanConfig_Authentication_GoogleAccount_{msg}
-		return true, err
-	case 2: // authentication.custom_account
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ScanConfig_Authentication_CustomAccount)
-		err := b.DecodeMessage(msg)
-		m.Authentication = &ScanConfig_Authentication_CustomAccount_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ScanConfig_Authentication_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ScanConfig_Authentication)
-	// authentication
-	switch x := m.Authentication.(type) {
-	case *ScanConfig_Authentication_GoogleAccount_:
-		s := proto.Size(x.GoogleAccount)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ScanConfig_Authentication_CustomAccount_:
-		s := proto.Size(x.CustomAccount)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Describes authentication configuration that uses a Google account.
 type ScanConfig_Authentication_GoogleAccount struct {
 	// Required.
@@ -377,16 +320,17 @@ func (m *ScanConfig_Authentication_GoogleAccount) Reset() {
 func (m *ScanConfig_Authentication_GoogleAccount) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Authentication_GoogleAccount) ProtoMessage()    {}
 func (*ScanConfig_Authentication_GoogleAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_dda68c43e028bff3, []int{0, 0, 0}
+	return fileDescriptor_50b1b6d7cca97898, []int{0, 0, 0}
 }
+
 func (m *ScanConfig_Authentication_GoogleAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Unmarshal(m, b)
 }
 func (m *ScanConfig_Authentication_GoogleAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Authentication_GoogleAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Merge(dst, src)
+func (m *ScanConfig_Authentication_GoogleAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Merge(m, src)
 }
 func (m *ScanConfig_Authentication_GoogleAccount) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Size(m)
@@ -435,16 +379,17 @@ func (m *ScanConfig_Authentication_CustomAccount) Reset() {
 func (m *ScanConfig_Authentication_CustomAccount) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Authentication_CustomAccount) ProtoMessage()    {}
 func (*ScanConfig_Authentication_CustomAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_dda68c43e028bff3, []int{0, 0, 1}
+	return fileDescriptor_50b1b6d7cca97898, []int{0, 0, 1}
 }
+
 func (m *ScanConfig_Authentication_CustomAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Unmarshal(m, b)
 }
 func (m *ScanConfig_Authentication_CustomAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Authentication_CustomAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Merge(dst, src)
+func (m *ScanConfig_Authentication_CustomAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Merge(m, src)
 }
 func (m *ScanConfig_Authentication_CustomAccount) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Size(m)
@@ -495,16 +440,17 @@ func (m *ScanConfig_Schedule) Reset()         { *m = ScanConfig_Schedule{} }
 func (m *ScanConfig_Schedule) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Schedule) ProtoMessage()    {}
 func (*ScanConfig_Schedule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_dda68c43e028bff3, []int{0, 1}
+	return fileDescriptor_50b1b6d7cca97898, []int{0, 1}
 }
+
 func (m *ScanConfig_Schedule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Schedule.Unmarshal(m, b)
 }
 func (m *ScanConfig_Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Schedule.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Schedule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Schedule.Merge(dst, src)
+func (m *ScanConfig_Schedule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Schedule.Merge(m, src)
 }
 func (m *ScanConfig_Schedule) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Schedule.Size(m)
@@ -530,20 +476,20 @@ func (m *ScanConfig_Schedule) GetIntervalDurationDays() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanConfig_UserAgent", ScanConfig_UserAgent_name, ScanConfig_UserAgent_value)
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanConfig_TargetPlatform", ScanConfig_TargetPlatform_name, ScanConfig_TargetPlatform_value)
 	proto.RegisterType((*ScanConfig)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig")
 	proto.RegisterType((*ScanConfig_Authentication)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication")
 	proto.RegisterType((*ScanConfig_Authentication_GoogleAccount)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount")
 	proto.RegisterType((*ScanConfig_Authentication_CustomAccount)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount")
 	proto.RegisterType((*ScanConfig_Schedule)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule")
-	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanConfig_UserAgent", ScanConfig_UserAgent_name, ScanConfig_UserAgent_value)
-	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanConfig_TargetPlatform", ScanConfig_TargetPlatform_name, ScanConfig_TargetPlatform_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/scan_config.proto", fileDescriptor_scan_config_dda68c43e028bff3)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/scan_config.proto", fileDescriptor_50b1b6d7cca97898)
 }
 
-var fileDescriptor_scan_config_dda68c43e028bff3 = []byte{
+var fileDescriptor_50b1b6d7cca97898 = []byte{
 	// 748 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x51, 0x6f, 0xe3, 0x44,
 	0x10, 0x3e, 0x37, 0xd7, 0x36, 0x99, 0x36, 0x39, 0xdf, 0x0a, 0x1d, 0x91, 0x0f, 0xe9, 0x42, 0x79,
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
index 53a46c6fc9..3528bc8eaa 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/scan_run.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Types of ScanRun execution state.
 type ScanRun_ExecutionState int32
@@ -41,6 +44,7 @@ var ScanRun_ExecutionState_name = map[int32]string{
 	2: "SCANNING",
 	3: "FINISHED",
 }
+
 var ScanRun_ExecutionState_value = map[string]int32{
 	"EXECUTION_STATE_UNSPECIFIED": 0,
 	"QUEUED":                      1,
@@ -51,8 +55,9 @@ var ScanRun_ExecutionState_value = map[string]int32{
 func (x ScanRun_ExecutionState) String() string {
 	return proto.EnumName(ScanRun_ExecutionState_name, int32(x))
 }
+
 func (ScanRun_ExecutionState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_013f75bb73c5af19, []int{0, 0}
+	return fileDescriptor_d1e91fc2897e59cf, []int{0, 0}
 }
 
 // Types of ScanRun result state.
@@ -76,6 +81,7 @@ var ScanRun_ResultState_name = map[int32]string{
 	2: "ERROR",
 	3: "KILLED",
 }
+
 var ScanRun_ResultState_value = map[string]int32{
 	"RESULT_STATE_UNSPECIFIED": 0,
 	"SUCCESS":                  1,
@@ -86,8 +92,9 @@ var ScanRun_ResultState_value = map[string]int32{
 func (x ScanRun_ResultState) String() string {
 	return proto.EnumName(ScanRun_ResultState_name, int32(x))
 }
+
 func (ScanRun_ResultState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_013f75bb73c5af19, []int{0, 1}
+	return fileDescriptor_d1e91fc2897e59cf, []int{0, 1}
 }
 
 // A ScanRun is a output-only resource representing an actual run of the scan.
@@ -139,16 +146,17 @@ func (m *ScanRun) Reset()         { *m = ScanRun{} }
 func (m *ScanRun) String() string { return proto.CompactTextString(m) }
 func (*ScanRun) ProtoMessage()    {}
 func (*ScanRun) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_013f75bb73c5af19, []int{0}
+	return fileDescriptor_d1e91fc2897e59cf, []int{0}
 }
+
 func (m *ScanRun) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanRun.Unmarshal(m, b)
 }
 func (m *ScanRun) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanRun.Marshal(b, m, deterministic)
 }
-func (dst *ScanRun) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanRun.Merge(dst, src)
+func (m *ScanRun) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanRun.Merge(m, src)
 }
 func (m *ScanRun) XXX_Size() int {
 	return xxx_messageInfo_ScanRun.Size(m)
@@ -223,16 +231,16 @@ func (m *ScanRun) GetProgressPercent() int32 {
 }
 
 func init() {
-	proto.RegisterType((*ScanRun)(nil), "google.cloud.websecurityscanner.v1alpha.ScanRun")
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanRun_ExecutionState", ScanRun_ExecutionState_name, ScanRun_ExecutionState_value)
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanRun_ResultState", ScanRun_ResultState_name, ScanRun_ResultState_value)
+	proto.RegisterType((*ScanRun)(nil), "google.cloud.websecurityscanner.v1alpha.ScanRun")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/scan_run.proto", fileDescriptor_scan_run_013f75bb73c5af19)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/scan_run.proto", fileDescriptor_d1e91fc2897e59cf)
 }
 
-var fileDescriptor_scan_run_013f75bb73c5af19 = []byte{
+var fileDescriptor_d1e91fc2897e59cf = []byte{
 	// 547 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xdd, 0x6e, 0xd3, 0x3c,
 	0x18, 0xfe, 0xb2, 0xad, 0x6b, 0xeb, 0x4e, 0x5b, 0x3e, 0x73, 0x12, 0x8d, 0x49, 0x8b, 0x76, 0x42,
diff --git a/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go b/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
index 213d551007..706e7c1d3d 100644
--- a/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package websecurityscanner
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request for the `CreateScanConfig` method.
 type CreateScanConfigRequest struct {
@@ -44,16 +44,17 @@ func (m *CreateScanConfigRequest) Reset()         { *m = CreateScanConfigRequest
 func (m *CreateScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateScanConfigRequest) ProtoMessage()    {}
 func (*CreateScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{0}
+	return fileDescriptor_23d01882da6eef5f, []int{0}
 }
+
 func (m *CreateScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateScanConfigRequest.Unmarshal(m, b)
 }
 func (m *CreateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateScanConfigRequest.Merge(dst, src)
+func (m *CreateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateScanConfigRequest.Merge(m, src)
 }
 func (m *CreateScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateScanConfigRequest.Size(m)
@@ -93,16 +94,17 @@ func (m *DeleteScanConfigRequest) Reset()         { *m = DeleteScanConfigRequest
 func (m *DeleteScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteScanConfigRequest) ProtoMessage()    {}
 func (*DeleteScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{1}
+	return fileDescriptor_23d01882da6eef5f, []int{1}
 }
+
 func (m *DeleteScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteScanConfigRequest.Unmarshal(m, b)
 }
 func (m *DeleteScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteScanConfigRequest.Merge(dst, src)
+func (m *DeleteScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteScanConfigRequest.Merge(m, src)
 }
 func (m *DeleteScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteScanConfigRequest.Size(m)
@@ -135,16 +137,17 @@ func (m *GetScanConfigRequest) Reset()         { *m = GetScanConfigRequest{} }
 func (m *GetScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetScanConfigRequest) ProtoMessage()    {}
 func (*GetScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{2}
+	return fileDescriptor_23d01882da6eef5f, []int{2}
 }
+
 func (m *GetScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetScanConfigRequest.Unmarshal(m, b)
 }
 func (m *GetScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetScanConfigRequest.Merge(dst, src)
+func (m *GetScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanConfigRequest.Merge(m, src)
 }
 func (m *GetScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetScanConfigRequest.Size(m)
@@ -185,16 +188,17 @@ func (m *ListScanConfigsRequest) Reset()         { *m = ListScanConfigsRequest{}
 func (m *ListScanConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsRequest) ProtoMessage()    {}
 func (*ListScanConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{3}
+	return fileDescriptor_23d01882da6eef5f, []int{3}
 }
+
 func (m *ListScanConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListScanConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsRequest.Merge(dst, src)
+func (m *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsRequest.Merge(m, src)
 }
 func (m *ListScanConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsRequest.Size(m)
@@ -247,16 +251,17 @@ func (m *UpdateScanConfigRequest) Reset()         { *m = UpdateScanConfigRequest
 func (m *UpdateScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateScanConfigRequest) ProtoMessage()    {}
 func (*UpdateScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{4}
+	return fileDescriptor_23d01882da6eef5f, []int{4}
 }
+
 func (m *UpdateScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateScanConfigRequest.Unmarshal(m, b)
 }
 func (m *UpdateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateScanConfigRequest.Merge(dst, src)
+func (m *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateScanConfigRequest.Merge(m, src)
 }
 func (m *UpdateScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateScanConfigRequest.Size(m)
@@ -297,16 +302,17 @@ func (m *ListScanConfigsResponse) Reset()         { *m = ListScanConfigsResponse
 func (m *ListScanConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsResponse) ProtoMessage()    {}
 func (*ListScanConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{5}
+	return fileDescriptor_23d01882da6eef5f, []int{5}
 }
+
 func (m *ListScanConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListScanConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsResponse.Merge(dst, src)
+func (m *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsResponse.Merge(m, src)
 }
 func (m *ListScanConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsResponse.Size(m)
@@ -346,16 +352,17 @@ func (m *StartScanRunRequest) Reset()         { *m = StartScanRunRequest{} }
 func (m *StartScanRunRequest) String() string { return proto.CompactTextString(m) }
 func (*StartScanRunRequest) ProtoMessage()    {}
 func (*StartScanRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{6}
+	return fileDescriptor_23d01882da6eef5f, []int{6}
 }
+
 func (m *StartScanRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StartScanRunRequest.Unmarshal(m, b)
 }
 func (m *StartScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StartScanRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *StartScanRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StartScanRunRequest.Merge(dst, src)
+func (m *StartScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartScanRunRequest.Merge(m, src)
 }
 func (m *StartScanRunRequest) XXX_Size() int {
 	return xxx_messageInfo_StartScanRunRequest.Size(m)
@@ -389,16 +396,17 @@ func (m *GetScanRunRequest) Reset()         { *m = GetScanRunRequest{} }
 func (m *GetScanRunRequest) String() string { return proto.CompactTextString(m) }
 func (*GetScanRunRequest) ProtoMessage()    {}
 func (*GetScanRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{7}
+	return fileDescriptor_23d01882da6eef5f, []int{7}
 }
+
 func (m *GetScanRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetScanRunRequest.Unmarshal(m, b)
 }
 func (m *GetScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetScanRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetScanRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetScanRunRequest.Merge(dst, src)
+func (m *GetScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanRunRequest.Merge(m, src)
 }
 func (m *GetScanRunRequest) XXX_Size() int {
 	return xxx_messageInfo_GetScanRunRequest.Size(m)
@@ -439,16 +447,17 @@ func (m *ListScanRunsRequest) Reset()         { *m = ListScanRunsRequest{} }
 func (m *ListScanRunsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListScanRunsRequest) ProtoMessage()    {}
 func (*ListScanRunsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{8}
+	return fileDescriptor_23d01882da6eef5f, []int{8}
 }
+
 func (m *ListScanRunsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanRunsRequest.Unmarshal(m, b)
 }
 func (m *ListScanRunsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanRunsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListScanRunsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanRunsRequest.Merge(dst, src)
+func (m *ListScanRunsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanRunsRequest.Merge(m, src)
 }
 func (m *ListScanRunsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListScanRunsRequest.Size(m)
@@ -496,16 +505,17 @@ func (m *ListScanRunsResponse) Reset()         { *m = ListScanRunsResponse{} }
 func (m *ListScanRunsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListScanRunsResponse) ProtoMessage()    {}
 func (*ListScanRunsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{9}
+	return fileDescriptor_23d01882da6eef5f, []int{9}
 }
+
 func (m *ListScanRunsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanRunsResponse.Unmarshal(m, b)
 }
 func (m *ListScanRunsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanRunsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListScanRunsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanRunsResponse.Merge(dst, src)
+func (m *ListScanRunsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanRunsResponse.Merge(m, src)
 }
 func (m *ListScanRunsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListScanRunsResponse.Size(m)
@@ -546,16 +556,17 @@ func (m *StopScanRunRequest) Reset()         { *m = StopScanRunRequest{} }
 func (m *StopScanRunRequest) String() string { return proto.CompactTextString(m) }
 func (*StopScanRunRequest) ProtoMessage()    {}
 func (*StopScanRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{10}
+	return fileDescriptor_23d01882da6eef5f, []int{10}
 }
+
 func (m *StopScanRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StopScanRunRequest.Unmarshal(m, b)
 }
 func (m *StopScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StopScanRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *StopScanRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StopScanRunRequest.Merge(dst, src)
+func (m *StopScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StopScanRunRequest.Merge(m, src)
 }
 func (m *StopScanRunRequest) XXX_Size() int {
 	return xxx_messageInfo_StopScanRunRequest.Size(m)
@@ -597,16 +608,17 @@ func (m *ListCrawledUrlsRequest) Reset()         { *m = ListCrawledUrlsRequest{}
 func (m *ListCrawledUrlsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCrawledUrlsRequest) ProtoMessage()    {}
 func (*ListCrawledUrlsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{11}
+	return fileDescriptor_23d01882da6eef5f, []int{11}
 }
+
 func (m *ListCrawledUrlsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCrawledUrlsRequest.Unmarshal(m, b)
 }
 func (m *ListCrawledUrlsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCrawledUrlsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCrawledUrlsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCrawledUrlsRequest.Merge(dst, src)
+func (m *ListCrawledUrlsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCrawledUrlsRequest.Merge(m, src)
 }
 func (m *ListCrawledUrlsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCrawledUrlsRequest.Size(m)
@@ -654,16 +666,17 @@ func (m *ListCrawledUrlsResponse) Reset()         { *m = ListCrawledUrlsResponse
 func (m *ListCrawledUrlsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCrawledUrlsResponse) ProtoMessage()    {}
 func (*ListCrawledUrlsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{12}
+	return fileDescriptor_23d01882da6eef5f, []int{12}
 }
+
 func (m *ListCrawledUrlsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCrawledUrlsResponse.Unmarshal(m, b)
 }
 func (m *ListCrawledUrlsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCrawledUrlsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCrawledUrlsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCrawledUrlsResponse.Merge(dst, src)
+func (m *ListCrawledUrlsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCrawledUrlsResponse.Merge(m, src)
 }
 func (m *ListCrawledUrlsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCrawledUrlsResponse.Size(m)
@@ -704,16 +717,17 @@ func (m *GetFindingRequest) Reset()         { *m = GetFindingRequest{} }
 func (m *GetFindingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFindingRequest) ProtoMessage()    {}
 func (*GetFindingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{13}
+	return fileDescriptor_23d01882da6eef5f, []int{13}
 }
+
 func (m *GetFindingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFindingRequest.Unmarshal(m, b)
 }
 func (m *GetFindingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFindingRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFindingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFindingRequest.Merge(dst, src)
+func (m *GetFindingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFindingRequest.Merge(m, src)
 }
 func (m *GetFindingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFindingRequest.Size(m)
@@ -760,16 +774,17 @@ func (m *ListFindingsRequest) Reset()         { *m = ListFindingsRequest{} }
 func (m *ListFindingsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsRequest) ProtoMessage()    {}
 func (*ListFindingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{14}
+	return fileDescriptor_23d01882da6eef5f, []int{14}
 }
+
 func (m *ListFindingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsRequest.Unmarshal(m, b)
 }
 func (m *ListFindingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsRequest.Merge(dst, src)
+func (m *ListFindingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsRequest.Merge(m, src)
 }
 func (m *ListFindingsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsRequest.Size(m)
@@ -824,16 +839,17 @@ func (m *ListFindingsResponse) Reset()         { *m = ListFindingsResponse{} }
 func (m *ListFindingsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsResponse) ProtoMessage()    {}
 func (*ListFindingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{15}
+	return fileDescriptor_23d01882da6eef5f, []int{15}
 }
+
 func (m *ListFindingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsResponse.Unmarshal(m, b)
 }
 func (m *ListFindingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsResponse.Merge(dst, src)
+func (m *ListFindingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsResponse.Merge(m, src)
 }
 func (m *ListFindingsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsResponse.Size(m)
@@ -874,16 +890,17 @@ func (m *ListFindingTypeStatsRequest) Reset()         { *m = ListFindingTypeStat
 func (m *ListFindingTypeStatsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFindingTypeStatsRequest) ProtoMessage()    {}
 func (*ListFindingTypeStatsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{16}
+	return fileDescriptor_23d01882da6eef5f, []int{16}
 }
+
 func (m *ListFindingTypeStatsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingTypeStatsRequest.Unmarshal(m, b)
 }
 func (m *ListFindingTypeStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingTypeStatsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingTypeStatsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingTypeStatsRequest.Merge(dst, src)
+func (m *ListFindingTypeStatsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingTypeStatsRequest.Merge(m, src)
 }
 func (m *ListFindingTypeStatsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFindingTypeStatsRequest.Size(m)
@@ -914,16 +931,17 @@ func (m *ListFindingTypeStatsResponse) Reset()         { *m = ListFindingTypeSta
 func (m *ListFindingTypeStatsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFindingTypeStatsResponse) ProtoMessage()    {}
 func (*ListFindingTypeStatsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_80f7154cd0746ae1, []int{17}
+	return fileDescriptor_23d01882da6eef5f, []int{17}
 }
+
 func (m *ListFindingTypeStatsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingTypeStatsResponse.Unmarshal(m, b)
 }
 func (m *ListFindingTypeStatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingTypeStatsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingTypeStatsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingTypeStatsResponse.Merge(dst, src)
+func (m *ListFindingTypeStatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingTypeStatsResponse.Merge(m, src)
 }
 func (m *ListFindingTypeStatsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFindingTypeStatsResponse.Size(m)
@@ -962,6 +980,84 @@ func init() {
 	proto.RegisterType((*ListFindingTypeStatsResponse)(nil), "google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto", fileDescriptor_23d01882da6eef5f)
+}
+
+var fileDescriptor_23d01882da6eef5f = []byte{
+	// 1115 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcf, 0x6f, 0x1b, 0x45,
+	0x14, 0xd6, 0xb4, 0x25, 0x4a, 0x9e, 0x53, 0x35, 0x4c, 0xa3, 0x38, 0xda, 0x14, 0xc9, 0xda, 0x03,
+	0x35, 0x46, 0x78, 0x4b, 0x42, 0x80, 0x38, 0x18, 0x42, 0xdc, 0x06, 0x90, 0x5a, 0x14, 0xd9, 0x29,
+	0x08, 0x2e, 0xab, 0x8d, 0x3d, 0x36, 0x4b, 0x36, 0xb3, 0xcb, 0xce, 0x98, 0x92, 0xa2, 0x1e, 0xe0,
+	0xc2, 0x05, 0x4e, 0x9c, 0xb8, 0x70, 0xe1, 0xca, 0x15, 0x21, 0x8e, 0x70, 0x40, 0x3d, 0x22, 0x95,
+	0x3b, 0x17, 0xfe, 0x03, 0xfe, 0x01, 0xb4, 0xb3, 0xb3, 0xf6, 0x78, 0x77, 0x6b, 0xef, 0x38, 0xca,
+	0x6d, 0xe7, 0xd7, 0x9b, 0xef, 0x7d, 0xef, 0xbd, 0x79, 0x9f, 0x16, 0xf6, 0x07, 0xbe, 0x3f, 0xf0,
+	0x88, 0xd5, 0xf5, 0xfc, 0x61, 0xcf, 0x7a, 0x40, 0x8e, 0x19, 0xe9, 0x0e, 0x43, 0x97, 0x9f, 0xb1,
+	0xae, 0x43, 0x29, 0x09, 0xad, 0xcf, 0x5f, 0x76, 0xbc, 0xe0, 0x13, 0x27, 0x5a, 0xb2, 0x93, 0x35,
+	0x5b, 0x2e, 0xd6, 0x83, 0xd0, 0xe7, 0x3e, 0xbe, 0x19, 0xdb, 0xa8, 0x0b, 0x1b, 0xf5, 0xac, 0x8d,
+	0xba, 0xb4, 0x61, 0xdc, 0x90, 0x97, 0x39, 0x81, 0x6b, 0x39, 0x94, 0xfa, 0xdc, 0xe1, 0xae, 0x4f,
+	0x59, 0x6c, 0xc6, 0xd8, 0x29, 0x0a, 0xa5, 0x1b, 0x3a, 0x0f, 0x3c, 0xd2, 0xb3, 0x87, 0xa1, 0x27,
+	0x8f, 0x6e, 0x17, 0x3d, 0xda, 0x77, 0x69, 0xcf, 0xa5, 0x03, 0x79, 0x6c, 0x4f, 0xf3, 0x98, 0xcd,
+	0xcf, 0x02, 0x62, 0x33, 0xee, 0x70, 0x6d, 0xcc, 0xd1, 0xd8, 0xee, 0xfa, 0xb4, 0xef, 0x26, 0x97,
+	0xbf, 0xaa, 0x75, 0x34, 0x1c, 0x52, 0x79, 0x6e, 0x43, 0x9e, 0x13, 0xa3, 0xe3, 0x61, 0xdf, 0x22,
+	0xa7, 0x01, 0x3f, 0x93, 0x8b, 0x95, 0xf4, 0x62, 0xdf, 0x25, 0x5e, 0xcf, 0x3e, 0x75, 0xd8, 0x49,
+	0xbc, 0xc3, 0xfc, 0x06, 0x41, 0xb9, 0x15, 0x12, 0x87, 0x93, 0x4e, 0xd7, 0xa1, 0x2d, 0x81, 0xa8,
+	0x4d, 0x3e, 0x1b, 0x12, 0xc6, 0xf1, 0x1a, 0x2c, 0x04, 0x4e, 0x48, 0x28, 0x5f, 0x47, 0x15, 0x54,
+	0x5d, 0x6a, 0xcb, 0x11, 0x3e, 0x82, 0x92, 0x82, 0x7f, 0xfd, 0x52, 0x05, 0x55, 0x4b, 0x9b, 0x5b,
+	0xf5, 0x82, 0x61, 0xaf, 0x2b, 0x17, 0x01, 0x1b, 0x7d, 0x9b, 0x2f, 0x41, 0xf9, 0x36, 0xf1, 0x48,
+	0x1e, 0x10, 0x0c, 0x57, 0xa8, 0x73, 0x4a, 0x24, 0x0c, 0xf1, 0x6d, 0xd6, 0x60, 0xf5, 0x1d, 0xc2,
+	0x8b, 0xed, 0xf5, 0x60, 0xed, 0xae, 0xcb, 0x94, 0xcd, 0x6c, 0x96, 0x8b, 0xcf, 0x01, 0x04, 0xce,
+	0x80, 0xd8, 0xdc, 0x3f, 0x21, 0x54, 0x78, 0xb8, 0xd4, 0x5e, 0x8a, 0x66, 0x8e, 0xa2, 0x09, 0xbc,
+	0x01, 0x62, 0x60, 0x33, 0xf7, 0x21, 0x59, 0xbf, 0x5c, 0x41, 0xd5, 0x67, 0xda, 0x8b, 0xd1, 0x44,
+	0xc7, 0x7d, 0x48, 0xcc, 0x9f, 0x11, 0x94, 0xef, 0x07, 0xbd, 0x5c, 0x4a, 0x2f, 0x84, 0x3a, 0xbc,
+	0x0b, 0xa5, 0xa1, 0xb8, 0x50, 0x44, 0x56, 0x00, 0x2a, 0x6d, 0x1a, 0x89, 0xd5, 0x24, 0xf8, 0xf5,
+	0x83, 0x28, 0xf8, 0xf7, 0x1c, 0x76, 0xd2, 0x86, 0x78, 0x7b, 0xf4, 0x6d, 0xfe, 0x80, 0xa0, 0x9c,
+	0x61, 0x87, 0x05, 0x3e, 0x65, 0x04, 0x7f, 0x00, 0xcb, 0x0a, 0x5c, 0xb6, 0x8e, 0x2a, 0x97, 0xe7,
+	0xc5, 0x5b, 0x1a, 0xe3, 0x65, 0xf8, 0x79, 0xb8, 0x46, 0xc9, 0x17, 0xdc, 0xce, 0x70, 0x7c, 0x35,
+	0x9a, 0x3e, 0x4c, 0x78, 0x36, 0x5f, 0x80, 0xeb, 0x1d, 0xee, 0x84, 0x02, 0x5b, 0x7b, 0x48, 0xa7,
+	0xc5, 0xf8, 0x26, 0x3c, 0x2b, 0xf3, 0x61, 0xc6, 0x46, 0x17, 0xae, 0x27, 0xee, 0xb6, 0x87, 0xf4,
+	0x42, 0x33, 0xe1, 0x3b, 0x04, 0xab, 0x93, 0x77, 0x49, 0x5e, 0xef, 0xc1, 0x52, 0x52, 0xc6, 0x09,
+	0xa9, 0xb7, 0xb4, 0x48, 0x8d, 0x7c, 0x5c, 0x64, 0xd2, 0x6c, 0x61, 0x3a, 0xab, 0x80, 0x3b, 0xdc,
+	0x0f, 0x0a, 0x90, 0x24, 0x2b, 0xa6, 0x15, 0x3f, 0xad, 0xf7, 0x43, 0xef, 0x42, 0x79, 0x4a, 0x52,
+	0x70, 0xe2, 0xba, 0x71, 0x0a, 0x2a, 0x0f, 0xbc, 0x7e, 0x0a, 0x8e, 0x6d, 0xb6, 0x4b, 0xdd, 0xb1,
+	0xfd, 0xc2, 0x9c, 0xc5, 0x79, 0x75, 0x10, 0xbf, 0xf8, 0xd3, 0x28, 0xfb, 0x0a, 0xc5, 0x89, 0x25,
+	0xb7, 0xce, 0x24, 0x6c, 0x0d, 0x16, 0xfa, 0xae, 0xc7, 0x49, 0x28, 0xef, 0x95, 0xa3, 0x14, 0x91,
+	0x97, 0xa7, 0x12, 0x79, 0x25, 0x45, 0xe4, 0xb7, 0x32, 0xe1, 0xc6, 0x18, 0x24, 0x8b, 0x77, 0x61,
+	0x51, 0x36, 0x2d, 0xfd, 0x7c, 0x4b, 0x7c, 0x1f, 0x59, 0x28, 0xcc, 0xdd, 0x36, 0x6c, 0x28, 0x68,
+	0x8e, 0xce, 0x02, 0xd2, 0x89, 0x9a, 0xe5, 0x0c, 0x66, 0xa2, 0x9e, 0x74, 0x23, 0xff, 0x9c, 0xf4,
+	0x66, 0x00, 0x38, 0xdb, 0x82, 0xa5, 0x5f, 0x3b, 0xba, 0x7e, 0x8d, 0xcd, 0xaf, 0xf4, 0x53, 0x33,
+	0x9b, 0x7f, 0xad, 0x02, 0xfe, 0x90, 0x1c, 0x77, 0xa4, 0x85, 0x4e, 0x6c, 0x01, 0x3f, 0x46, 0xb0,
+	0x92, 0x6e, 0x9a, 0x78, 0x4f, 0x23, 0x25, 0x73, 0xfb, 0xad, 0x31, 0xcf, 0xbb, 0x6a, 0x36, 0xbf,
+	0x7e, 0xf2, 0xef, 0xf7, 0x97, 0x5e, 0x33, 0xab, 0x23, 0x81, 0xf0, 0x65, 0x4c, 0x63, 0x33, 0x08,
+	0xfd, 0x4f, 0x49, 0x97, 0x33, 0xab, 0xf6, 0xc8, 0x52, 0x1e, 0xdf, 0x86, 0xda, 0x81, 0xf0, 0x8f,
+	0x08, 0x56, 0xd2, 0x6d, 0x57, 0xc3, 0x95, 0xa7, 0x74, 0x6c, 0x63, 0x2d, 0xd3, 0x7c, 0xee, 0x44,
+	0xb2, 0xc4, 0xbc, 0x25, 0xd0, 0xd6, 0x6a, 0x0a, 0xda, 0xa8, 0x78, 0x14, 0xac, 0x2a, 0x54, 0xab,
+	0xf6, 0x08, 0xff, 0x82, 0xe0, 0xea, 0x44, 0xa3, 0xc7, 0xcd, 0xc2, 0xe8, 0xf2, 0x04, 0xc2, 0x7c,
+	0x2c, 0x4b, 0xdc, 0xb8, 0x38, 0xee, 0x3f, 0x11, 0x5c, 0x4b, 0xb5, 0x55, 0xfc, 0x56, 0xe1, 0xab,
+	0xf3, 0xe5, 0x8a, 0xb1, 0x37, 0xbf, 0x81, 0xb8, 0x74, 0xf2, 0x1c, 0x99, 0x9e, 0x2e, 0xf8, 0x6f,
+	0x04, 0x2b, 0x69, 0x39, 0xa3, 0x91, 0x21, 0x4f, 0x51, 0x42, 0xf3, 0x85, 0xe1, 0x3d, 0x81, 0xbe,
+	0xb5, 0xf9, 0xca, 0x18, 0xbd, 0xaa, 0xa4, 0xa7, 0x87, 0x64, 0x32, 0xf1, 0x7f, 0x43, 0xb0, 0xac,
+	0x6a, 0x0b, 0xfc, 0x46, 0x71, 0x40, 0x59, 0x49, 0x62, 0x68, 0xb7, 0x6f, 0x73, 0x47, 0xf8, 0xb2,
+	0x65, 0xd6, 0x8b, 0xa6, 0x54, 0x83, 0x45, 0xf7, 0x36, 0x50, 0x0d, 0xff, 0x8a, 0x00, 0xc6, 0x62,
+	0x07, 0x37, 0x74, 0x0b, 0xe2, 0x5c, 0xb8, 0x77, 0x05, 0xee, 0x6d, 0xbc, 0x55, 0x10, 0xb7, 0x95,
+	0xc8, 0x94, 0xa8, 0x2a, 0x1e, 0x23, 0x58, 0x56, 0x15, 0x91, 0x06, 0xeb, 0x39, 0xa2, 0xcd, 0x68,
+	0xce, 0x79, 0x5a, 0x16, 0x43, 0x8e, 0x2b, 0x99, 0x62, 0x48, 0x05, 0x61, 0xe4, 0x0d, 0xfe, 0x1d,
+	0x41, 0x49, 0x51, 0x53, 0x78, 0x57, 0x23, 0x7f, 0xd2, 0x1a, 0x6c, 0x8e, 0x30, 0xb4, 0x04, 0xf6,
+	0xa6, 0xf9, 0xfa, 0x1c, 0x61, 0x68, 0x30, 0xee, 0x07, 0x51, 0x22, 0xfd, 0x23, 0x1f, 0x29, 0x45,
+	0x78, 0x69, 0x3e, 0x52, 0x59, 0x85, 0xa8, 0xf9, 0x48, 0xe5, 0x68, 0xbe, 0xa4, 0xcc, 0xf1, 0xdb,
+	0x85, 0xe3, 0xa2, 0x7a, 0x67, 0xa9, 0x32, 0xef, 0x8f, 0xb8, 0x54, 0x64, 0xaf, 0xd7, 0x2b, 0x95,
+	0x49, 0xd1, 0x67, 0x68, 0x2b, 0x26, 0xf3, 0x40, 0xf8, 0xb1, 0x87, 0xdf, 0xd4, 0x8f, 0x51, 0xf2,
+	0x8f, 0x41, 0x54, 0xcd, 0x13, 0x59, 0x35, 0x89, 0xac, 0xd3, 0xac, 0x9a, 0x94, 0x22, 0xd5, 0xac,
+	0x9a, 0xb4, 0x96, 0xcc, 0xf3, 0x4a, 0x27, 0x3a, 0x23, 0x15, 0xf9, 0xdf, 0xa4, 0x58, 0x1d, 0xa9,
+	0x2e, 0x7c, 0x7b, 0x1e, 0x7c, 0x69, 0x75, 0x69, 0xdc, 0x39, 0xa7, 0x15, 0xe9, 0xed, 0xfb, 0xc2,
+	0xdb, 0x77, 0xf1, 0xc1, 0xb9, 0xbc, 0x1d, 0xd9, 0xdd, 0xff, 0x09, 0xc1, 0x8b, 0x5d, 0xff, 0xb4,
+	0x28, 0xb8, 0xfd, 0x72, 0x56, 0x7f, 0x1e, 0x46, 0x9a, 0xea, 0x10, 0x7d, 0xfc, 0x91, 0xb4, 0x31,
+	0xf0, 0x3d, 0x87, 0x0e, 0xea, 0x7e, 0x38, 0xb0, 0x06, 0x84, 0x0a, 0xc5, 0x65, 0xc5, 0x4b, 0x4e,
+	0xe0, 0xb2, 0x99, 0x7f, 0x94, 0x76, 0xb3, 0x4b, 0xc7, 0x0b, 0xc2, 0xca, 0xd6, 0xff, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x32, 0x00, 0x5e, 0x95, 0x10, 0x14, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1457,81 +1553,3 @@ var _WebSecurityScanner_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto", fileDescriptor_web_security_scanner_80f7154cd0746ae1)
-}
-
-var fileDescriptor_web_security_scanner_80f7154cd0746ae1 = []byte{
-	// 1115 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xd6, 0xb4, 0x25, 0x4a, 0x9e, 0x53, 0x35, 0x4c, 0xa3, 0x38, 0xda, 0x14, 0xc9, 0xda, 0x03,
-	0x35, 0x46, 0x78, 0x4b, 0x42, 0x80, 0x38, 0x18, 0x42, 0xdc, 0x06, 0x90, 0x5a, 0x14, 0xd9, 0x29,
-	0x08, 0x2e, 0xab, 0x8d, 0x3d, 0x36, 0x4b, 0x36, 0xb3, 0xcb, 0xce, 0x98, 0x92, 0xa2, 0x1e, 0xe0,
-	0xc2, 0x05, 0x4e, 0x9c, 0xb8, 0x70, 0xe1, 0xca, 0x15, 0x21, 0x8e, 0x70, 0x40, 0x3d, 0x22, 0x95,
-	0x3b, 0x17, 0xfe, 0x03, 0xfe, 0x01, 0xb4, 0xb3, 0xb3, 0xf6, 0x78, 0x77, 0x6b, 0xef, 0x38, 0xca,
-	0x6d, 0xe7, 0xd7, 0x9b, 0xef, 0x7d, 0xef, 0xbd, 0x79, 0x9f, 0x16, 0xf6, 0x07, 0xbe, 0x3f, 0xf0,
-	0x88, 0xd5, 0xf5, 0xfc, 0x61, 0xcf, 0x7a, 0x40, 0x8e, 0x19, 0xe9, 0x0e, 0x43, 0x97, 0x9f, 0xb1,
-	0xae, 0x43, 0x29, 0x09, 0xad, 0xcf, 0x5f, 0x76, 0xbc, 0xe0, 0x13, 0x27, 0x5a, 0xb2, 0x93, 0x35,
-	0x5b, 0x2e, 0xd6, 0x83, 0xd0, 0xe7, 0x3e, 0xbe, 0x19, 0xdb, 0xa8, 0x0b, 0x1b, 0xf5, 0xac, 0x8d,
-	0xba, 0xb4, 0x61, 0xdc, 0x90, 0x97, 0x39, 0x81, 0x6b, 0x39, 0x94, 0xfa, 0xdc, 0xe1, 0xae, 0x4f,
-	0x59, 0x6c, 0xc6, 0xd8, 0x29, 0x0a, 0xa5, 0x1b, 0x3a, 0x0f, 0x3c, 0xd2, 0xb3, 0x87, 0xa1, 0x27,
-	0x8f, 0x6e, 0x17, 0x3d, 0xda, 0x77, 0x69, 0xcf, 0xa5, 0x03, 0x79, 0x6c, 0x4f, 0xf3, 0x98, 0xcd,
-	0xcf, 0x02, 0x62, 0x33, 0xee, 0x70, 0x6d, 0xcc, 0xd1, 0xd8, 0xee, 0xfa, 0xb4, 0xef, 0x26, 0x97,
-	0xbf, 0xaa, 0x75, 0x34, 0x1c, 0x52, 0x79, 0x6e, 0x43, 0x9e, 0x13, 0xa3, 0xe3, 0x61, 0xdf, 0x22,
-	0xa7, 0x01, 0x3f, 0x93, 0x8b, 0x95, 0xf4, 0x62, 0xdf, 0x25, 0x5e, 0xcf, 0x3e, 0x75, 0xd8, 0x49,
-	0xbc, 0xc3, 0xfc, 0x06, 0x41, 0xb9, 0x15, 0x12, 0x87, 0x93, 0x4e, 0xd7, 0xa1, 0x2d, 0x81, 0xa8,
-	0x4d, 0x3e, 0x1b, 0x12, 0xc6, 0xf1, 0x1a, 0x2c, 0x04, 0x4e, 0x48, 0x28, 0x5f, 0x47, 0x15, 0x54,
-	0x5d, 0x6a, 0xcb, 0x11, 0x3e, 0x82, 0x92, 0x82, 0x7f, 0xfd, 0x52, 0x05, 0x55, 0x4b, 0x9b, 0x5b,
-	0xf5, 0x82, 0x61, 0xaf, 0x2b, 0x17, 0x01, 0x1b, 0x7d, 0x9b, 0x2f, 0x41, 0xf9, 0x36, 0xf1, 0x48,
-	0x1e, 0x10, 0x0c, 0x57, 0xa8, 0x73, 0x4a, 0x24, 0x0c, 0xf1, 0x6d, 0xd6, 0x60, 0xf5, 0x1d, 0xc2,
-	0x8b, 0xed, 0xf5, 0x60, 0xed, 0xae, 0xcb, 0x94, 0xcd, 0x6c, 0x96, 0x8b, 0xcf, 0x01, 0x04, 0xce,
-	0x80, 0xd8, 0xdc, 0x3f, 0x21, 0x54, 0x78, 0xb8, 0xd4, 0x5e, 0x8a, 0x66, 0x8e, 0xa2, 0x09, 0xbc,
-	0x01, 0x62, 0x60, 0x33, 0xf7, 0x21, 0x59, 0xbf, 0x5c, 0x41, 0xd5, 0x67, 0xda, 0x8b, 0xd1, 0x44,
-	0xc7, 0x7d, 0x48, 0xcc, 0x9f, 0x11, 0x94, 0xef, 0x07, 0xbd, 0x5c, 0x4a, 0x2f, 0x84, 0x3a, 0xbc,
-	0x0b, 0xa5, 0xa1, 0xb8, 0x50, 0x44, 0x56, 0x00, 0x2a, 0x6d, 0x1a, 0x89, 0xd5, 0x24, 0xf8, 0xf5,
-	0x83, 0x28, 0xf8, 0xf7, 0x1c, 0x76, 0xd2, 0x86, 0x78, 0x7b, 0xf4, 0x6d, 0xfe, 0x80, 0xa0, 0x9c,
-	0x61, 0x87, 0x05, 0x3e, 0x65, 0x04, 0x7f, 0x00, 0xcb, 0x0a, 0x5c, 0xb6, 0x8e, 0x2a, 0x97, 0xe7,
-	0xc5, 0x5b, 0x1a, 0xe3, 0x65, 0xf8, 0x79, 0xb8, 0x46, 0xc9, 0x17, 0xdc, 0xce, 0x70, 0x7c, 0x35,
-	0x9a, 0x3e, 0x4c, 0x78, 0x36, 0x5f, 0x80, 0xeb, 0x1d, 0xee, 0x84, 0x02, 0x5b, 0x7b, 0x48, 0xa7,
-	0xc5, 0xf8, 0x26, 0x3c, 0x2b, 0xf3, 0x61, 0xc6, 0x46, 0x17, 0xae, 0x27, 0xee, 0xb6, 0x87, 0xf4,
-	0x42, 0x33, 0xe1, 0x3b, 0x04, 0xab, 0x93, 0x77, 0x49, 0x5e, 0xef, 0xc1, 0x52, 0x52, 0xc6, 0x09,
-	0xa9, 0xb7, 0xb4, 0x48, 0x8d, 0x7c, 0x5c, 0x64, 0xd2, 0x6c, 0x61, 0x3a, 0xab, 0x80, 0x3b, 0xdc,
-	0x0f, 0x0a, 0x90, 0x24, 0x2b, 0xa6, 0x15, 0x3f, 0xad, 0xf7, 0x43, 0xef, 0x42, 0x79, 0x4a, 0x52,
-	0x70, 0xe2, 0xba, 0x71, 0x0a, 0x2a, 0x0f, 0xbc, 0x7e, 0x0a, 0x8e, 0x6d, 0xb6, 0x4b, 0xdd, 0xb1,
-	0xfd, 0xc2, 0x9c, 0xc5, 0x79, 0x75, 0x10, 0xbf, 0xf8, 0xd3, 0x28, 0xfb, 0x0a, 0xc5, 0x89, 0x25,
-	0xb7, 0xce, 0x24, 0x6c, 0x0d, 0x16, 0xfa, 0xae, 0xc7, 0x49, 0x28, 0xef, 0x95, 0xa3, 0x14, 0x91,
-	0x97, 0xa7, 0x12, 0x79, 0x25, 0x45, 0xe4, 0xb7, 0x32, 0xe1, 0xc6, 0x18, 0x24, 0x8b, 0x77, 0x61,
-	0x51, 0x36, 0x2d, 0xfd, 0x7c, 0x4b, 0x7c, 0x1f, 0x59, 0x28, 0xcc, 0xdd, 0x36, 0x6c, 0x28, 0x68,
-	0x8e, 0xce, 0x02, 0xd2, 0x89, 0x9a, 0xe5, 0x0c, 0x66, 0xa2, 0x9e, 0x74, 0x23, 0xff, 0x9c, 0xf4,
-	0x66, 0x00, 0x38, 0xdb, 0x82, 0xa5, 0x5f, 0x3b, 0xba, 0x7e, 0x8d, 0xcd, 0xaf, 0xf4, 0x53, 0x33,
-	0x9b, 0x7f, 0xad, 0x02, 0xfe, 0x90, 0x1c, 0x77, 0xa4, 0x85, 0x4e, 0x6c, 0x01, 0x3f, 0x46, 0xb0,
-	0x92, 0x6e, 0x9a, 0x78, 0x4f, 0x23, 0x25, 0x73, 0xfb, 0xad, 0x31, 0xcf, 0xbb, 0x6a, 0x36, 0xbf,
-	0x7e, 0xf2, 0xef, 0xf7, 0x97, 0x5e, 0x33, 0xab, 0x23, 0x81, 0xf0, 0x65, 0x4c, 0x63, 0x33, 0x08,
-	0xfd, 0x4f, 0x49, 0x97, 0x33, 0xab, 0xf6, 0xc8, 0x52, 0x1e, 0xdf, 0x86, 0xda, 0x81, 0xf0, 0x8f,
-	0x08, 0x56, 0xd2, 0x6d, 0x57, 0xc3, 0x95, 0xa7, 0x74, 0x6c, 0x63, 0x2d, 0xd3, 0x7c, 0xee, 0x44,
-	0xb2, 0xc4, 0xbc, 0x25, 0xd0, 0xd6, 0x6a, 0x0a, 0xda, 0xa8, 0x78, 0x14, 0xac, 0x2a, 0x54, 0xab,
-	0xf6, 0x08, 0xff, 0x82, 0xe0, 0xea, 0x44, 0xa3, 0xc7, 0xcd, 0xc2, 0xe8, 0xf2, 0x04, 0xc2, 0x7c,
-	0x2c, 0x4b, 0xdc, 0xb8, 0x38, 0xee, 0x3f, 0x11, 0x5c, 0x4b, 0xb5, 0x55, 0xfc, 0x56, 0xe1, 0xab,
-	0xf3, 0xe5, 0x8a, 0xb1, 0x37, 0xbf, 0x81, 0xb8, 0x74, 0xf2, 0x1c, 0x99, 0x9e, 0x2e, 0xf8, 0x6f,
-	0x04, 0x2b, 0x69, 0x39, 0xa3, 0x91, 0x21, 0x4f, 0x51, 0x42, 0xf3, 0x85, 0xe1, 0x3d, 0x81, 0xbe,
-	0xb5, 0xf9, 0xca, 0x18, 0xbd, 0xaa, 0xa4, 0xa7, 0x87, 0x64, 0x32, 0xf1, 0x7f, 0x43, 0xb0, 0xac,
-	0x6a, 0x0b, 0xfc, 0x46, 0x71, 0x40, 0x59, 0x49, 0x62, 0x68, 0xb7, 0x6f, 0x73, 0x47, 0xf8, 0xb2,
-	0x65, 0xd6, 0x8b, 0xa6, 0x54, 0x83, 0x45, 0xf7, 0x36, 0x50, 0x0d, 0xff, 0x8a, 0x00, 0xc6, 0x62,
-	0x07, 0x37, 0x74, 0x0b, 0xe2, 0x5c, 0xb8, 0x77, 0x05, 0xee, 0x6d, 0xbc, 0x55, 0x10, 0xb7, 0x95,
-	0xc8, 0x94, 0xa8, 0x2a, 0x1e, 0x23, 0x58, 0x56, 0x15, 0x91, 0x06, 0xeb, 0x39, 0xa2, 0xcd, 0x68,
-	0xce, 0x79, 0x5a, 0x16, 0x43, 0x8e, 0x2b, 0x99, 0x62, 0x48, 0x05, 0x61, 0xe4, 0x0d, 0xfe, 0x1d,
-	0x41, 0x49, 0x51, 0x53, 0x78, 0x57, 0x23, 0x7f, 0xd2, 0x1a, 0x6c, 0x8e, 0x30, 0xb4, 0x04, 0xf6,
-	0xa6, 0xf9, 0xfa, 0x1c, 0x61, 0x68, 0x30, 0xee, 0x07, 0x51, 0x22, 0xfd, 0x23, 0x1f, 0x29, 0x45,
-	0x78, 0x69, 0x3e, 0x52, 0x59, 0x85, 0xa8, 0xf9, 0x48, 0xe5, 0x68, 0xbe, 0xa4, 0xcc, 0xf1, 0xdb,
-	0x85, 0xe3, 0xa2, 0x7a, 0x67, 0xa9, 0x32, 0xef, 0x8f, 0xb8, 0x54, 0x64, 0xaf, 0xd7, 0x2b, 0x95,
-	0x49, 0xd1, 0x67, 0x68, 0x2b, 0x26, 0xf3, 0x40, 0xf8, 0xb1, 0x87, 0xdf, 0xd4, 0x8f, 0x51, 0xf2,
-	0x8f, 0x41, 0x54, 0xcd, 0x13, 0x59, 0x35, 0x89, 0xac, 0xd3, 0xac, 0x9a, 0x94, 0x22, 0xd5, 0xac,
-	0x9a, 0xb4, 0x96, 0xcc, 0xf3, 0x4a, 0x27, 0x3a, 0x23, 0x15, 0xf9, 0xdf, 0xa4, 0x58, 0x1d, 0xa9,
-	0x2e, 0x7c, 0x7b, 0x1e, 0x7c, 0x69, 0x75, 0x69, 0xdc, 0x39, 0xa7, 0x15, 0xe9, 0xed, 0xfb, 0xc2,
-	0xdb, 0x77, 0xf1, 0xc1, 0xb9, 0xbc, 0x1d, 0xd9, 0xdd, 0xff, 0x09, 0xc1, 0x8b, 0x5d, 0xff, 0xb4,
-	0x28, 0xb8, 0xfd, 0x72, 0x56, 0x7f, 0x1e, 0x46, 0x9a, 0xea, 0x10, 0x7d, 0xfc, 0x91, 0xb4, 0x31,
-	0xf0, 0x3d, 0x87, 0x0e, 0xea, 0x7e, 0x38, 0xb0, 0x06, 0x84, 0x0a, 0xc5, 0x65, 0xc5, 0x4b, 0x4e,
-	0xe0, 0xb2, 0x99, 0x7f, 0x94, 0x76, 0xb3, 0x4b, 0xc7, 0x0b, 0xc2, 0xca, 0xd6, 0xff, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x32, 0x00, 0x5e, 0x95, 0x10, 0x14, 0x00, 0x00,
-}
diff --git a/googleapis/cloud/websecurityscanner/v1beta/crawled_url.pb.go b/googleapis/cloud/websecurityscanner/v1beta/crawled_url.pb.go
index 6f4e71d709..19273ed8fe 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/crawled_url.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/crawled_url.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/crawled_url.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A CrawledUrl resource represents a URL that was crawled during a ScanRun. Web
 // Security Scanner Service crawls the web applications, following all links
@@ -42,16 +45,17 @@ func (m *CrawledUrl) Reset()         { *m = CrawledUrl{} }
 func (m *CrawledUrl) String() string { return proto.CompactTextString(m) }
 func (*CrawledUrl) ProtoMessage()    {}
 func (*CrawledUrl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_crawled_url_47969d3dbeaecdf6, []int{0}
+	return fileDescriptor_4d117cd3bfcd0897, []int{0}
 }
+
 func (m *CrawledUrl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CrawledUrl.Unmarshal(m, b)
 }
 func (m *CrawledUrl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CrawledUrl.Marshal(b, m, deterministic)
 }
-func (dst *CrawledUrl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CrawledUrl.Merge(dst, src)
+func (m *CrawledUrl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CrawledUrl.Merge(m, src)
 }
 func (m *CrawledUrl) XXX_Size() int {
 	return xxx_messageInfo_CrawledUrl.Size(m)
@@ -88,10 +92,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/crawled_url.proto", fileDescriptor_crawled_url_47969d3dbeaecdf6)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/crawled_url.proto", fileDescriptor_4d117cd3bfcd0897)
 }
 
-var fileDescriptor_crawled_url_47969d3dbeaecdf6 = []byte{
+var fileDescriptor_4d117cd3bfcd0897 = []byte{
 	// 235 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x31, 0x4b, 0x04, 0x31,
 	0x10, 0x85, 0x59, 0x4f, 0x04, 0xc7, 0x42, 0x49, 0xb5, 0x88, 0xa0, 0x58, 0x88, 0x58, 0x24, 0x88,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/finding.pb.go b/googleapis/cloud/websecurityscanner/v1beta/finding.pb.go
index c1a1707c3b..9a447480e8 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/finding.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/finding.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/finding.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Finding resource represents a vulnerability instance identified during a
 // ScanRun.
@@ -91,16 +94,17 @@ func (m *Finding) Reset()         { *m = Finding{} }
 func (m *Finding) String() string { return proto.CompactTextString(m) }
 func (*Finding) ProtoMessage()    {}
 func (*Finding) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_18e691d702d328cd, []int{0}
+	return fileDescriptor_a1082375f5efc351, []int{0}
 }
+
 func (m *Finding) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Finding.Unmarshal(m, b)
 }
 func (m *Finding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Finding.Marshal(b, m, deterministic)
 }
-func (dst *Finding) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Finding.Merge(dst, src)
+func (m *Finding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Finding.Merge(m, src)
 }
 func (m *Finding) XXX_Size() int {
 	return xxx_messageInfo_Finding.Size(m)
@@ -228,10 +232,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/finding.proto", fileDescriptor_finding_18e691d702d328cd)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/finding.proto", fileDescriptor_a1082375f5efc351)
 }
 
-var fileDescriptor_finding_18e691d702d328cd = []byte{
+var fileDescriptor_a1082375f5efc351 = []byte{
 	// 517 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x5f, 0x8b, 0x13, 0x31,
 	0x14, 0xc5, 0xa9, 0xbb, 0x76, 0xb7, 0x99, 0x6a, 0xbb, 0x41, 0x21, 0xac, 0xca, 0x56, 0x1f, 0x64,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/finding_addon.pb.go b/googleapis/cloud/websecurityscanner/v1beta/finding_addon.pb.go
index be62a071c1..643aa13378 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/finding_addon.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/finding_addon.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/finding_addon.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // ! Information about a vulnerability with an HTML.
 type Form struct {
@@ -34,16 +37,17 @@ func (m *Form) Reset()         { *m = Form{} }
 func (m *Form) String() string { return proto.CompactTextString(m) }
 func (*Form) ProtoMessage()    {}
 func (*Form) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_2b00ebbf5c6ee79e, []int{0}
+	return fileDescriptor_ed5f8e8e70210d53, []int{0}
 }
+
 func (m *Form) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Form.Unmarshal(m, b)
 }
 func (m *Form) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Form.Marshal(b, m, deterministic)
 }
-func (dst *Form) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Form.Merge(dst, src)
+func (m *Form) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Form.Merge(m, src)
 }
 func (m *Form) XXX_Size() int {
 	return xxx_messageInfo_Form.Size(m)
@@ -85,16 +89,17 @@ func (m *OutdatedLibrary) Reset()         { *m = OutdatedLibrary{} }
 func (m *OutdatedLibrary) String() string { return proto.CompactTextString(m) }
 func (*OutdatedLibrary) ProtoMessage()    {}
 func (*OutdatedLibrary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_2b00ebbf5c6ee79e, []int{1}
+	return fileDescriptor_ed5f8e8e70210d53, []int{1}
 }
+
 func (m *OutdatedLibrary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutdatedLibrary.Unmarshal(m, b)
 }
 func (m *OutdatedLibrary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutdatedLibrary.Marshal(b, m, deterministic)
 }
-func (dst *OutdatedLibrary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutdatedLibrary.Merge(dst, src)
+func (m *OutdatedLibrary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutdatedLibrary.Merge(m, src)
 }
 func (m *OutdatedLibrary) XXX_Size() int {
 	return xxx_messageInfo_OutdatedLibrary.Size(m)
@@ -142,16 +147,17 @@ func (m *ViolatingResource) Reset()         { *m = ViolatingResource{} }
 func (m *ViolatingResource) String() string { return proto.CompactTextString(m) }
 func (*ViolatingResource) ProtoMessage()    {}
 func (*ViolatingResource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_2b00ebbf5c6ee79e, []int{2}
+	return fileDescriptor_ed5f8e8e70210d53, []int{2}
 }
+
 func (m *ViolatingResource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ViolatingResource.Unmarshal(m, b)
 }
 func (m *ViolatingResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ViolatingResource.Marshal(b, m, deterministic)
 }
-func (dst *ViolatingResource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ViolatingResource.Merge(dst, src)
+func (m *ViolatingResource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ViolatingResource.Merge(m, src)
 }
 func (m *ViolatingResource) XXX_Size() int {
 	return xxx_messageInfo_ViolatingResource.Size(m)
@@ -189,16 +195,17 @@ func (m *VulnerableParameters) Reset()         { *m = VulnerableParameters{} }
 func (m *VulnerableParameters) String() string { return proto.CompactTextString(m) }
 func (*VulnerableParameters) ProtoMessage()    {}
 func (*VulnerableParameters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_2b00ebbf5c6ee79e, []int{3}
+	return fileDescriptor_ed5f8e8e70210d53, []int{3}
 }
+
 func (m *VulnerableParameters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerableParameters.Unmarshal(m, b)
 }
 func (m *VulnerableParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerableParameters.Marshal(b, m, deterministic)
 }
-func (dst *VulnerableParameters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerableParameters.Merge(dst, src)
+func (m *VulnerableParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerableParameters.Merge(m, src)
 }
 func (m *VulnerableParameters) XXX_Size() int {
 	return xxx_messageInfo_VulnerableParameters.Size(m)
@@ -231,16 +238,17 @@ func (m *VulnerableHeaders) Reset()         { *m = VulnerableHeaders{} }
 func (m *VulnerableHeaders) String() string { return proto.CompactTextString(m) }
 func (*VulnerableHeaders) ProtoMessage()    {}
 func (*VulnerableHeaders) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_2b00ebbf5c6ee79e, []int{4}
+	return fileDescriptor_ed5f8e8e70210d53, []int{4}
 }
+
 func (m *VulnerableHeaders) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerableHeaders.Unmarshal(m, b)
 }
 func (m *VulnerableHeaders) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerableHeaders.Marshal(b, m, deterministic)
 }
-func (dst *VulnerableHeaders) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerableHeaders.Merge(dst, src)
+func (m *VulnerableHeaders) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerableHeaders.Merge(m, src)
 }
 func (m *VulnerableHeaders) XXX_Size() int {
 	return xxx_messageInfo_VulnerableHeaders.Size(m)
@@ -280,16 +288,17 @@ func (m *VulnerableHeaders_Header) Reset()         { *m = VulnerableHeaders_Head
 func (m *VulnerableHeaders_Header) String() string { return proto.CompactTextString(m) }
 func (*VulnerableHeaders_Header) ProtoMessage()    {}
 func (*VulnerableHeaders_Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_2b00ebbf5c6ee79e, []int{4, 0}
+	return fileDescriptor_ed5f8e8e70210d53, []int{4, 0}
 }
+
 func (m *VulnerableHeaders_Header) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerableHeaders_Header.Unmarshal(m, b)
 }
 func (m *VulnerableHeaders_Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerableHeaders_Header.Marshal(b, m, deterministic)
 }
-func (dst *VulnerableHeaders_Header) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerableHeaders_Header.Merge(dst, src)
+func (m *VulnerableHeaders_Header) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerableHeaders_Header.Merge(m, src)
 }
 func (m *VulnerableHeaders_Header) XXX_Size() int {
 	return xxx_messageInfo_VulnerableHeaders_Header.Size(m)
@@ -329,16 +338,17 @@ func (m *Xss) Reset()         { *m = Xss{} }
 func (m *Xss) String() string { return proto.CompactTextString(m) }
 func (*Xss) ProtoMessage()    {}
 func (*Xss) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_addon_2b00ebbf5c6ee79e, []int{5}
+	return fileDescriptor_ed5f8e8e70210d53, []int{5}
 }
+
 func (m *Xss) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Xss.Unmarshal(m, b)
 }
 func (m *Xss) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Xss.Marshal(b, m, deterministic)
 }
-func (dst *Xss) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Xss.Merge(dst, src)
+func (m *Xss) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Xss.Merge(m, src)
 }
 func (m *Xss) XXX_Size() int {
 	return xxx_messageInfo_Xss.Size(m)
@@ -374,10 +384,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/finding_addon.proto", fileDescriptor_finding_addon_2b00ebbf5c6ee79e)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/finding_addon.proto", fileDescriptor_ed5f8e8e70210d53)
 }
 
-var fileDescriptor_finding_addon_2b00ebbf5c6ee79e = []byte{
+var fileDescriptor_ed5f8e8e70210d53 = []byte{
 	// 502 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x41, 0x6f, 0xd3, 0x4c,
 	0x10, 0x55, 0x92, 0x7e, 0xa9, 0xb2, 0x69, 0x1b, 0x65, 0x55, 0x7d, 0xb2, 0x2a, 0x90, 0x8a, 0x91,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/finding_type_stats.pb.go b/googleapis/cloud/websecurityscanner/v1beta/finding_type_stats.pb.go
index 7f948c0e3c..1d7d54bcdf 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/finding_type_stats.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/finding_type_stats.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/finding_type_stats.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A FindingTypeStats resource represents stats regarding a specific FindingType
 // of Findings under a given ScanRun.
@@ -37,16 +40,17 @@ func (m *FindingTypeStats) Reset()         { *m = FindingTypeStats{} }
 func (m *FindingTypeStats) String() string { return proto.CompactTextString(m) }
 func (*FindingTypeStats) ProtoMessage()    {}
 func (*FindingTypeStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_finding_type_stats_4b1a34a40ed70c6c, []int{0}
+	return fileDescriptor_2cd330f4bd03c930, []int{0}
 }
+
 func (m *FindingTypeStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FindingTypeStats.Unmarshal(m, b)
 }
 func (m *FindingTypeStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FindingTypeStats.Marshal(b, m, deterministic)
 }
-func (dst *FindingTypeStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FindingTypeStats.Merge(dst, src)
+func (m *FindingTypeStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FindingTypeStats.Merge(m, src)
 }
 func (m *FindingTypeStats) XXX_Size() int {
 	return xxx_messageInfo_FindingTypeStats.Size(m)
@@ -76,10 +80,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/finding_type_stats.proto", fileDescriptor_finding_type_stats_4b1a34a40ed70c6c)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/finding_type_stats.proto", fileDescriptor_2cd330f4bd03c930)
 }
 
-var fileDescriptor_finding_type_stats_4b1a34a40ed70c6c = []byte{
+var fileDescriptor_2cd330f4bd03c930 = []byte{
 	// 236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd0, 0xc1, 0x4a, 0x03, 0x31,
 	0x10, 0x06, 0x60, 0x22, 0x28, 0x18, 0x15, 0x64, 0x41, 0x28, 0xe2, 0xa1, 0x2a, 0x48, 0xf1, 0x90,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/scan_config.pb.go b/googleapis/cloud/websecurityscanner/v1beta/scan_config.pb.go
index 7ce47f0332..8b902b36ae 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/scan_config.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/scan_config.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/scan_config.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Type of user agents used for scanning.
 type ScanConfig_UserAgent int32
@@ -40,6 +43,7 @@ var ScanConfig_UserAgent_name = map[int32]string{
 	2: "CHROME_ANDROID",
 	3: "SAFARI_IPHONE",
 }
+
 var ScanConfig_UserAgent_value = map[string]int32{
 	"USER_AGENT_UNSPECIFIED": 0,
 	"CHROME_LINUX":           1,
@@ -50,8 +54,9 @@ var ScanConfig_UserAgent_value = map[string]int32{
 func (x ScanConfig_UserAgent) String() string {
 	return proto.EnumName(ScanConfig_UserAgent_name, int32(x))
 }
+
 func (ScanConfig_UserAgent) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 0}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 0}
 }
 
 // Cloud platforms supported by Cloud Web Security Scanner.
@@ -72,6 +77,7 @@ var ScanConfig_TargetPlatform_name = map[int32]string{
 	1: "APP_ENGINE",
 	2: "COMPUTE",
 }
+
 var ScanConfig_TargetPlatform_value = map[string]int32{
 	"TARGET_PLATFORM_UNSPECIFIED": 0,
 	"APP_ENGINE":                  1,
@@ -81,8 +87,9 @@ var ScanConfig_TargetPlatform_value = map[string]int32{
 func (x ScanConfig_TargetPlatform) String() string {
 	return proto.EnumName(ScanConfig_TargetPlatform_name, int32(x))
 }
+
 func (ScanConfig_TargetPlatform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 1}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 1}
 }
 
 // Scan risk levels supported by Cloud Web Security Scanner. LOW impact
@@ -104,6 +111,7 @@ var ScanConfig_RiskLevel_name = map[int32]string{
 	1: "NORMAL",
 	2: "LOW",
 }
+
 var ScanConfig_RiskLevel_value = map[string]int32{
 	"RISK_LEVEL_UNSPECIFIED": 0,
 	"NORMAL":                 1,
@@ -113,8 +121,9 @@ var ScanConfig_RiskLevel_value = map[string]int32{
 func (x ScanConfig_RiskLevel) String() string {
 	return proto.EnumName(ScanConfig_RiskLevel_name, int32(x))
 }
+
 func (ScanConfig_RiskLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 2}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 2}
 }
 
 // Controls export of scan configurations and results to Cloud Security
@@ -135,6 +144,7 @@ var ScanConfig_ExportToSecurityCommandCenter_name = map[int32]string{
 	1: "ENABLED",
 	2: "DISABLED",
 }
+
 var ScanConfig_ExportToSecurityCommandCenter_value = map[string]int32{
 	"EXPORT_TO_SECURITY_COMMAND_CENTER_UNSPECIFIED": 0,
 	"ENABLED":  1,
@@ -144,8 +154,9 @@ var ScanConfig_ExportToSecurityCommandCenter_value = map[string]int32{
 func (x ScanConfig_ExportToSecurityCommandCenter) String() string {
 	return proto.EnumName(ScanConfig_ExportToSecurityCommandCenter_name, int32(x))
 }
+
 func (ScanConfig_ExportToSecurityCommandCenter) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 3}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 3}
 }
 
 // A ScanConfig resource contains the configurations to launch a scan.
@@ -194,16 +205,17 @@ func (m *ScanConfig) Reset()         { *m = ScanConfig{} }
 func (m *ScanConfig) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig) ProtoMessage()    {}
 func (*ScanConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0}
 }
+
 func (m *ScanConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig.Unmarshal(m, b)
 }
 func (m *ScanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig.Merge(dst, src)
+func (m *ScanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig.Merge(m, src)
 }
 func (m *ScanConfig) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig.Size(m)
@@ -316,16 +328,17 @@ func (m *ScanConfig_Authentication) Reset()         { *m = ScanConfig_Authentica
 func (m *ScanConfig_Authentication) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Authentication) ProtoMessage()    {}
 func (*ScanConfig_Authentication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 0}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 0}
 }
+
 func (m *ScanConfig_Authentication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Authentication.Unmarshal(m, b)
 }
 func (m *ScanConfig_Authentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Authentication.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Authentication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Authentication.Merge(dst, src)
+func (m *ScanConfig_Authentication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication.Merge(m, src)
 }
 func (m *ScanConfig_Authentication) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Authentication.Size(m)
@@ -373,80 +386,14 @@ func (m *ScanConfig_Authentication) GetCustomAccount() *ScanConfig_Authenticatio
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ScanConfig_Authentication) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ScanConfig_Authentication_OneofMarshaler, _ScanConfig_Authentication_OneofUnmarshaler, _ScanConfig_Authentication_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ScanConfig_Authentication) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ScanConfig_Authentication_GoogleAccount_)(nil),
 		(*ScanConfig_Authentication_CustomAccount_)(nil),
 	}
 }
 
-func _ScanConfig_Authentication_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ScanConfig_Authentication)
-	// authentication
-	switch x := m.Authentication.(type) {
-	case *ScanConfig_Authentication_GoogleAccount_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GoogleAccount); err != nil {
-			return err
-		}
-	case *ScanConfig_Authentication_CustomAccount_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CustomAccount); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ScanConfig_Authentication.Authentication has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ScanConfig_Authentication_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ScanConfig_Authentication)
-	switch tag {
-	case 1: // authentication.google_account
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ScanConfig_Authentication_GoogleAccount)
-		err := b.DecodeMessage(msg)
-		m.Authentication = &ScanConfig_Authentication_GoogleAccount_{msg}
-		return true, err
-	case 2: // authentication.custom_account
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ScanConfig_Authentication_CustomAccount)
-		err := b.DecodeMessage(msg)
-		m.Authentication = &ScanConfig_Authentication_CustomAccount_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ScanConfig_Authentication_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ScanConfig_Authentication)
-	// authentication
-	switch x := m.Authentication.(type) {
-	case *ScanConfig_Authentication_GoogleAccount_:
-		s := proto.Size(x.GoogleAccount)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ScanConfig_Authentication_CustomAccount_:
-		s := proto.Size(x.CustomAccount)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Describes authentication configuration that uses a Google account.
 type ScanConfig_Authentication_GoogleAccount struct {
 	// Required.
@@ -468,16 +415,17 @@ func (m *ScanConfig_Authentication_GoogleAccount) Reset() {
 func (m *ScanConfig_Authentication_GoogleAccount) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Authentication_GoogleAccount) ProtoMessage()    {}
 func (*ScanConfig_Authentication_GoogleAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 0, 0}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 0, 0}
 }
+
 func (m *ScanConfig_Authentication_GoogleAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Unmarshal(m, b)
 }
 func (m *ScanConfig_Authentication_GoogleAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Authentication_GoogleAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Merge(dst, src)
+func (m *ScanConfig_Authentication_GoogleAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Merge(m, src)
 }
 func (m *ScanConfig_Authentication_GoogleAccount) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Size(m)
@@ -526,16 +474,17 @@ func (m *ScanConfig_Authentication_CustomAccount) Reset() {
 func (m *ScanConfig_Authentication_CustomAccount) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Authentication_CustomAccount) ProtoMessage()    {}
 func (*ScanConfig_Authentication_CustomAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 0, 1}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 0, 1}
 }
+
 func (m *ScanConfig_Authentication_CustomAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Unmarshal(m, b)
 }
 func (m *ScanConfig_Authentication_CustomAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Authentication_CustomAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Merge(dst, src)
+func (m *ScanConfig_Authentication_CustomAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Merge(m, src)
 }
 func (m *ScanConfig_Authentication_CustomAccount) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Size(m)
@@ -586,16 +535,17 @@ func (m *ScanConfig_Schedule) Reset()         { *m = ScanConfig_Schedule{} }
 func (m *ScanConfig_Schedule) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig_Schedule) ProtoMessage()    {}
 func (*ScanConfig_Schedule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_cb3798ae69a3d538, []int{0, 1}
+	return fileDescriptor_0b8e0c37c8759a6e, []int{0, 1}
 }
+
 func (m *ScanConfig_Schedule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig_Schedule.Unmarshal(m, b)
 }
 func (m *ScanConfig_Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig_Schedule.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig_Schedule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig_Schedule.Merge(dst, src)
+func (m *ScanConfig_Schedule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Schedule.Merge(m, src)
 }
 func (m *ScanConfig_Schedule) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig_Schedule.Size(m)
@@ -621,22 +571,22 @@ func (m *ScanConfig_Schedule) GetIntervalDurationDays() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_UserAgent", ScanConfig_UserAgent_name, ScanConfig_UserAgent_value)
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_TargetPlatform", ScanConfig_TargetPlatform_name, ScanConfig_TargetPlatform_value)
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_RiskLevel", ScanConfig_RiskLevel_name, ScanConfig_RiskLevel_value)
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_ExportToSecurityCommandCenter", ScanConfig_ExportToSecurityCommandCenter_name, ScanConfig_ExportToSecurityCommandCenter_value)
 	proto.RegisterType((*ScanConfig)(nil), "google.cloud.websecurityscanner.v1beta.ScanConfig")
 	proto.RegisterType((*ScanConfig_Authentication)(nil), "google.cloud.websecurityscanner.v1beta.ScanConfig.Authentication")
 	proto.RegisterType((*ScanConfig_Authentication_GoogleAccount)(nil), "google.cloud.websecurityscanner.v1beta.ScanConfig.Authentication.GoogleAccount")
 	proto.RegisterType((*ScanConfig_Authentication_CustomAccount)(nil), "google.cloud.websecurityscanner.v1beta.ScanConfig.Authentication.CustomAccount")
 	proto.RegisterType((*ScanConfig_Schedule)(nil), "google.cloud.websecurityscanner.v1beta.ScanConfig.Schedule")
-	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_UserAgent", ScanConfig_UserAgent_name, ScanConfig_UserAgent_value)
-	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_TargetPlatform", ScanConfig_TargetPlatform_name, ScanConfig_TargetPlatform_value)
-	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_RiskLevel", ScanConfig_RiskLevel_name, ScanConfig_RiskLevel_value)
-	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfig_ExportToSecurityCommandCenter", ScanConfig_ExportToSecurityCommandCenter_name, ScanConfig_ExportToSecurityCommandCenter_value)
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_config.proto", fileDescriptor_scan_config_cb3798ae69a3d538)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_config.proto", fileDescriptor_0b8e0c37c8759a6e)
 }
 
-var fileDescriptor_scan_config_cb3798ae69a3d538 = []byte{
+var fileDescriptor_0b8e0c37c8759a6e = []byte{
 	// 943 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x6d, 0x6f, 0xdb, 0x36,
 	0x10, 0xc7, 0x2b, 0xbb, 0x4d, 0xec, 0xf3, 0x43, 0x55, 0x62, 0xe8, 0x04, 0x77, 0x45, 0xdd, 0x0c,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/scan_config_error.pb.go b/googleapis/cloud/websecurityscanner/v1beta/scan_config_error.pb.go
index ef30617adb..d844e56895 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/scan_config_error.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/scan_config_error.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/scan_config_error.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Output only.
 // Defines an error reason code.
@@ -167,6 +170,7 @@ var ScanConfigError_Code_name = map[int32]string{
 	41: "UNSUPPORTED_FINDING_TYPE",
 	42: "UNSUPPORTED_URL_SCHEME",
 }
+
 var ScanConfigError_Code_value = map[string]int32{
 	"CODE_UNSPECIFIED":                                    0,
 	"OK":                                                  0,
@@ -214,8 +218,9 @@ var ScanConfigError_Code_value = map[string]int32{
 func (x ScanConfigError_Code) String() string {
 	return proto.EnumName(ScanConfigError_Code_name, int32(x))
 }
+
 func (ScanConfigError_Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_error_4b32cc55957c457c, []int{0, 0}
+	return fileDescriptor_925639d0d0b22665, []int{0, 0}
 }
 
 // Defines a custom error message used by CreateScanConfig and UpdateScanConfig
@@ -241,16 +246,17 @@ func (m *ScanConfigError) Reset()         { *m = ScanConfigError{} }
 func (m *ScanConfigError) String() string { return proto.CompactTextString(m) }
 func (*ScanConfigError) ProtoMessage()    {}
 func (*ScanConfigError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_config_error_4b32cc55957c457c, []int{0}
+	return fileDescriptor_925639d0d0b22665, []int{0}
 }
+
 func (m *ScanConfigError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfigError.Unmarshal(m, b)
 }
 func (m *ScanConfigError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfigError.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfigError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfigError.Merge(dst, src)
+func (m *ScanConfigError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfigError.Merge(m, src)
 }
 func (m *ScanConfigError) XXX_Size() int {
 	return xxx_messageInfo_ScanConfigError.Size(m)
@@ -276,15 +282,15 @@ func (m *ScanConfigError) GetFieldName() string {
 }
 
 func init() {
-	proto.RegisterType((*ScanConfigError)(nil), "google.cloud.websecurityscanner.v1beta.ScanConfigError")
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanConfigError_Code", ScanConfigError_Code_name, ScanConfigError_Code_value)
+	proto.RegisterType((*ScanConfigError)(nil), "google.cloud.websecurityscanner.v1beta.ScanConfigError")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_config_error.proto", fileDescriptor_scan_config_error_4b32cc55957c457c)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_config_error.proto", fileDescriptor_925639d0d0b22665)
 }
 
-var fileDescriptor_scan_config_error_4b32cc55957c457c = []byte{
+var fileDescriptor_925639d0d0b22665 = []byte{
 	// 865 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x5d, 0x53, 0x1b, 0x37,
 	0x14, 0x8d, 0x29, 0x43, 0x8b, 0xd2, 0x12, 0x8d, 0x42, 0xc1, 0xe1, 0x2b, 0x0e, 0x25, 0x84, 0x90,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/scan_run.pb.go b/googleapis/cloud/websecurityscanner/v1beta/scan_run.pb.go
index 2cd744369e..ff3df3bcbe 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/scan_run.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/scan_run.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/scan_run.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Types of ScanRun execution state.
 type ScanRun_ExecutionState int32
@@ -41,6 +44,7 @@ var ScanRun_ExecutionState_name = map[int32]string{
 	2: "SCANNING",
 	3: "FINISHED",
 }
+
 var ScanRun_ExecutionState_value = map[string]int32{
 	"EXECUTION_STATE_UNSPECIFIED": 0,
 	"QUEUED":                      1,
@@ -51,8 +55,9 @@ var ScanRun_ExecutionState_value = map[string]int32{
 func (x ScanRun_ExecutionState) String() string {
 	return proto.EnumName(ScanRun_ExecutionState_name, int32(x))
 }
+
 func (ScanRun_ExecutionState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_4ba20ab7789cc312, []int{0, 0}
+	return fileDescriptor_2eb36166aad58bfe, []int{0, 0}
 }
 
 // Types of ScanRun result state.
@@ -76,6 +81,7 @@ var ScanRun_ResultState_name = map[int32]string{
 	2: "ERROR",
 	3: "KILLED",
 }
+
 var ScanRun_ResultState_value = map[string]int32{
 	"RESULT_STATE_UNSPECIFIED": 0,
 	"SUCCESS":                  1,
@@ -86,8 +92,9 @@ var ScanRun_ResultState_value = map[string]int32{
 func (x ScanRun_ResultState) String() string {
 	return proto.EnumName(ScanRun_ResultState_name, int32(x))
 }
+
 func (ScanRun_ResultState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_4ba20ab7789cc312, []int{0, 1}
+	return fileDescriptor_2eb36166aad58bfe, []int{0, 1}
 }
 
 // A ScanRun is a output-only resource representing an actual run of the scan.
@@ -147,16 +154,17 @@ func (m *ScanRun) Reset()         { *m = ScanRun{} }
 func (m *ScanRun) String() string { return proto.CompactTextString(m) }
 func (*ScanRun) ProtoMessage()    {}
 func (*ScanRun) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_4ba20ab7789cc312, []int{0}
+	return fileDescriptor_2eb36166aad58bfe, []int{0}
 }
+
 func (m *ScanRun) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanRun.Unmarshal(m, b)
 }
 func (m *ScanRun) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanRun.Marshal(b, m, deterministic)
 }
-func (dst *ScanRun) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanRun.Merge(dst, src)
+func (m *ScanRun) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanRun.Merge(m, src)
 }
 func (m *ScanRun) XXX_Size() int {
 	return xxx_messageInfo_ScanRun.Size(m)
@@ -245,16 +253,16 @@ func (m *ScanRun) GetWarningTraces() []*ScanRunWarningTrace {
 }
 
 func init() {
-	proto.RegisterType((*ScanRun)(nil), "google.cloud.websecurityscanner.v1beta.ScanRun")
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanRun_ExecutionState", ScanRun_ExecutionState_name, ScanRun_ExecutionState_value)
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanRun_ResultState", ScanRun_ResultState_name, ScanRun_ResultState_value)
+	proto.RegisterType((*ScanRun)(nil), "google.cloud.websecurityscanner.v1beta.ScanRun")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_run.proto", fileDescriptor_scan_run_4ba20ab7789cc312)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_run.proto", fileDescriptor_2eb36166aad58bfe)
 }
 
-var fileDescriptor_scan_run_4ba20ab7789cc312 = []byte{
+var fileDescriptor_2eb36166aad58bfe = []byte{
 	// 616 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x5d, 0x4b, 0xdc, 0x4c,
 	0x14, 0xc7, 0x9f, 0xb8, 0xba, 0x2f, 0x27, 0x3e, 0x6b, 0x3a, 0xbd, 0x09, 0x56, 0x30, 0x78, 0x51,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/scan_run_error_trace.pb.go b/googleapis/cloud/websecurityscanner/v1beta/scan_run_error_trace.pb.go
index 6f8c069fe2..822cd7433f 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/scan_run_error_trace.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/scan_run_error_trace.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/scan_run_error_trace.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Output only.
 // Defines an error reason code.
@@ -54,6 +57,7 @@ var ScanRunErrorTrace_Code_name = map[int32]string{
 	5: "TOO_MANY_REDIRECTS",
 	6: "TOO_MANY_HTTP_ERRORS",
 }
+
 var ScanRunErrorTrace_Code_value = map[string]int32{
 	"CODE_UNSPECIFIED":            0,
 	"INTERNAL_ERROR":              1,
@@ -67,8 +71,9 @@ var ScanRunErrorTrace_Code_value = map[string]int32{
 func (x ScanRunErrorTrace_Code) String() string {
 	return proto.EnumName(ScanRunErrorTrace_Code_name, int32(x))
 }
+
 func (ScanRunErrorTrace_Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_error_trace_3b9236ac69667833, []int{0, 0}
+	return fileDescriptor_7b7ccbd97c6273c4, []int{0, 0}
 }
 
 // Output only.
@@ -96,16 +101,17 @@ func (m *ScanRunErrorTrace) Reset()         { *m = ScanRunErrorTrace{} }
 func (m *ScanRunErrorTrace) String() string { return proto.CompactTextString(m) }
 func (*ScanRunErrorTrace) ProtoMessage()    {}
 func (*ScanRunErrorTrace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_error_trace_3b9236ac69667833, []int{0}
+	return fileDescriptor_7b7ccbd97c6273c4, []int{0}
 }
+
 func (m *ScanRunErrorTrace) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanRunErrorTrace.Unmarshal(m, b)
 }
 func (m *ScanRunErrorTrace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanRunErrorTrace.Marshal(b, m, deterministic)
 }
-func (dst *ScanRunErrorTrace) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanRunErrorTrace.Merge(dst, src)
+func (m *ScanRunErrorTrace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanRunErrorTrace.Merge(m, src)
 }
 func (m *ScanRunErrorTrace) XXX_Size() int {
 	return xxx_messageInfo_ScanRunErrorTrace.Size(m)
@@ -138,15 +144,15 @@ func (m *ScanRunErrorTrace) GetMostCommonHttpErrorCode() int32 {
 }
 
 func init() {
-	proto.RegisterType((*ScanRunErrorTrace)(nil), "google.cloud.websecurityscanner.v1beta.ScanRunErrorTrace")
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanRunErrorTrace_Code", ScanRunErrorTrace_Code_name, ScanRunErrorTrace_Code_value)
+	proto.RegisterType((*ScanRunErrorTrace)(nil), "google.cloud.websecurityscanner.v1beta.ScanRunErrorTrace")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_run_error_trace.proto", fileDescriptor_scan_run_error_trace_3b9236ac69667833)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_run_error_trace.proto", fileDescriptor_7b7ccbd97c6273c4)
 }
 
-var fileDescriptor_scan_run_error_trace_3b9236ac69667833 = []byte{
+var fileDescriptor_7b7ccbd97c6273c4 = []byte{
 	// 432 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcb, 0x6e, 0x13, 0x31,
 	0x14, 0x86, 0x99, 0x26, 0xed, 0xc2, 0x48, 0x65, 0x62, 0x95, 0x12, 0x51, 0x24, 0xa2, 0x2e, 0x50,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/scan_run_warning_trace.pb.go b/googleapis/cloud/websecurityscanner/v1beta/scan_run_warning_trace.pb.go
index 8b649b628a..4f380757c9 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/scan_run_warning_trace.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/scan_run_warning_trace.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/scan_run_warning_trace.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
+package websecurityscanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Output only.
 // Defines a warning message code.
@@ -48,6 +51,7 @@ var ScanRunWarningTrace_Code_name = map[int32]string{
 	3: "TOO_MANY_FUZZ_TASKS",
 	4: "BLOCKED_BY_IAP",
 }
+
 var ScanRunWarningTrace_Code_value = map[string]int32{
 	"CODE_UNSPECIFIED":           0,
 	"INSUFFICIENT_CRAWL_RESULTS": 1,
@@ -59,8 +63,9 @@ var ScanRunWarningTrace_Code_value = map[string]int32{
 func (x ScanRunWarningTrace_Code) String() string {
 	return proto.EnumName(ScanRunWarningTrace_Code_name, int32(x))
 }
+
 func (ScanRunWarningTrace_Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_warning_trace_e453d12033752715, []int{0, 0}
+	return fileDescriptor_8ce6d2f19679e52d, []int{0, 0}
 }
 
 // Output only.
@@ -79,16 +84,17 @@ func (m *ScanRunWarningTrace) Reset()         { *m = ScanRunWarningTrace{} }
 func (m *ScanRunWarningTrace) String() string { return proto.CompactTextString(m) }
 func (*ScanRunWarningTrace) ProtoMessage()    {}
 func (*ScanRunWarningTrace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_scan_run_warning_trace_e453d12033752715, []int{0}
+	return fileDescriptor_8ce6d2f19679e52d, []int{0}
 }
+
 func (m *ScanRunWarningTrace) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanRunWarningTrace.Unmarshal(m, b)
 }
 func (m *ScanRunWarningTrace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanRunWarningTrace.Marshal(b, m, deterministic)
 }
-func (dst *ScanRunWarningTrace) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanRunWarningTrace.Merge(dst, src)
+func (m *ScanRunWarningTrace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanRunWarningTrace.Merge(m, src)
 }
 func (m *ScanRunWarningTrace) XXX_Size() int {
 	return xxx_messageInfo_ScanRunWarningTrace.Size(m)
@@ -107,15 +113,15 @@ func (m *ScanRunWarningTrace) GetCode() ScanRunWarningTrace_Code {
 }
 
 func init() {
-	proto.RegisterType((*ScanRunWarningTrace)(nil), "google.cloud.websecurityscanner.v1beta.ScanRunWarningTrace")
 	proto.RegisterEnum("google.cloud.websecurityscanner.v1beta.ScanRunWarningTrace_Code", ScanRunWarningTrace_Code_name, ScanRunWarningTrace_Code_value)
+	proto.RegisterType((*ScanRunWarningTrace)(nil), "google.cloud.websecurityscanner.v1beta.ScanRunWarningTrace")
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_run_warning_trace.proto", fileDescriptor_scan_run_warning_trace_e453d12033752715)
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/scan_run_warning_trace.proto", fileDescriptor_8ce6d2f19679e52d)
 }
 
-var fileDescriptor_scan_run_warning_trace_e453d12033752715 = []byte{
+var fileDescriptor_8ce6d2f19679e52d = []byte{
 	// 318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0xd1, 0x41, 0x4b, 0xf3, 0x30,
 	0x18, 0xc0, 0xf1, 0x37, 0xef, 0x3b, 0xde, 0x43, 0x0e, 0xa3, 0x64, 0xa2, 0x63, 0x07, 0x91, 0x1d,
diff --git a/googleapis/cloud/websecurityscanner/v1beta/web_security_scanner.pb.go b/googleapis/cloud/websecurityscanner/v1beta/web_security_scanner.pb.go
index 38f7e23dc1..9198059497 100644
--- a/googleapis/cloud/websecurityscanner/v1beta/web_security_scanner.pb.go
+++ b/googleapis/cloud/websecurityscanner/v1beta/web_security_scanner.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/websecurityscanner/v1beta/web_security_scanner.proto
 
-package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1beta"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package websecurityscanner
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request for the `CreateScanConfig` method.
 type CreateScanConfigRequest struct {
@@ -44,16 +44,17 @@ func (m *CreateScanConfigRequest) Reset()         { *m = CreateScanConfigRequest
 func (m *CreateScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateScanConfigRequest) ProtoMessage()    {}
 func (*CreateScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{0}
+	return fileDescriptor_aab783dd0f551f53, []int{0}
 }
+
 func (m *CreateScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateScanConfigRequest.Unmarshal(m, b)
 }
 func (m *CreateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateScanConfigRequest.Merge(dst, src)
+func (m *CreateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateScanConfigRequest.Merge(m, src)
 }
 func (m *CreateScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateScanConfigRequest.Size(m)
@@ -93,16 +94,17 @@ func (m *DeleteScanConfigRequest) Reset()         { *m = DeleteScanConfigRequest
 func (m *DeleteScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteScanConfigRequest) ProtoMessage()    {}
 func (*DeleteScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{1}
+	return fileDescriptor_aab783dd0f551f53, []int{1}
 }
+
 func (m *DeleteScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteScanConfigRequest.Unmarshal(m, b)
 }
 func (m *DeleteScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteScanConfigRequest.Merge(dst, src)
+func (m *DeleteScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteScanConfigRequest.Merge(m, src)
 }
 func (m *DeleteScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteScanConfigRequest.Size(m)
@@ -135,16 +137,17 @@ func (m *GetScanConfigRequest) Reset()         { *m = GetScanConfigRequest{} }
 func (m *GetScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetScanConfigRequest) ProtoMessage()    {}
 func (*GetScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{2}
+	return fileDescriptor_aab783dd0f551f53, []int{2}
 }
+
 func (m *GetScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetScanConfigRequest.Unmarshal(m, b)
 }
 func (m *GetScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetScanConfigRequest.Merge(dst, src)
+func (m *GetScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanConfigRequest.Merge(m, src)
 }
 func (m *GetScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetScanConfigRequest.Size(m)
@@ -185,16 +188,17 @@ func (m *ListScanConfigsRequest) Reset()         { *m = ListScanConfigsRequest{}
 func (m *ListScanConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsRequest) ProtoMessage()    {}
 func (*ListScanConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{3}
+	return fileDescriptor_aab783dd0f551f53, []int{3}
 }
+
 func (m *ListScanConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListScanConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsRequest.Merge(dst, src)
+func (m *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsRequest.Merge(m, src)
 }
 func (m *ListScanConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsRequest.Size(m)
@@ -247,16 +251,17 @@ func (m *UpdateScanConfigRequest) Reset()         { *m = UpdateScanConfigRequest
 func (m *UpdateScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateScanConfigRequest) ProtoMessage()    {}
 func (*UpdateScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{4}
+	return fileDescriptor_aab783dd0f551f53, []int{4}
 }
+
 func (m *UpdateScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateScanConfigRequest.Unmarshal(m, b)
 }
 func (m *UpdateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateScanConfigRequest.Merge(dst, src)
+func (m *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateScanConfigRequest.Merge(m, src)
 }
 func (m *UpdateScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateScanConfigRequest.Size(m)
@@ -297,16 +302,17 @@ func (m *ListScanConfigsResponse) Reset()         { *m = ListScanConfigsResponse
 func (m *ListScanConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsResponse) ProtoMessage()    {}
 func (*ListScanConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{5}
+	return fileDescriptor_aab783dd0f551f53, []int{5}
 }
+
 func (m *ListScanConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListScanConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsResponse.Merge(dst, src)
+func (m *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsResponse.Merge(m, src)
 }
 func (m *ListScanConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsResponse.Size(m)
@@ -346,16 +352,17 @@ func (m *StartScanRunRequest) Reset()         { *m = StartScanRunRequest{} }
 func (m *StartScanRunRequest) String() string { return proto.CompactTextString(m) }
 func (*StartScanRunRequest) ProtoMessage()    {}
 func (*StartScanRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{6}
+	return fileDescriptor_aab783dd0f551f53, []int{6}
 }
+
 func (m *StartScanRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StartScanRunRequest.Unmarshal(m, b)
 }
 func (m *StartScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StartScanRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *StartScanRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StartScanRunRequest.Merge(dst, src)
+func (m *StartScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartScanRunRequest.Merge(m, src)
 }
 func (m *StartScanRunRequest) XXX_Size() int {
 	return xxx_messageInfo_StartScanRunRequest.Size(m)
@@ -389,16 +396,17 @@ func (m *GetScanRunRequest) Reset()         { *m = GetScanRunRequest{} }
 func (m *GetScanRunRequest) String() string { return proto.CompactTextString(m) }
 func (*GetScanRunRequest) ProtoMessage()    {}
 func (*GetScanRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{7}
+	return fileDescriptor_aab783dd0f551f53, []int{7}
 }
+
 func (m *GetScanRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetScanRunRequest.Unmarshal(m, b)
 }
 func (m *GetScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetScanRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetScanRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetScanRunRequest.Merge(dst, src)
+func (m *GetScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanRunRequest.Merge(m, src)
 }
 func (m *GetScanRunRequest) XXX_Size() int {
 	return xxx_messageInfo_GetScanRunRequest.Size(m)
@@ -439,16 +447,17 @@ func (m *ListScanRunsRequest) Reset()         { *m = ListScanRunsRequest{} }
 func (m *ListScanRunsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListScanRunsRequest) ProtoMessage()    {}
 func (*ListScanRunsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{8}
+	return fileDescriptor_aab783dd0f551f53, []int{8}
 }
+
 func (m *ListScanRunsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanRunsRequest.Unmarshal(m, b)
 }
 func (m *ListScanRunsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanRunsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListScanRunsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanRunsRequest.Merge(dst, src)
+func (m *ListScanRunsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanRunsRequest.Merge(m, src)
 }
 func (m *ListScanRunsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListScanRunsRequest.Size(m)
@@ -496,16 +505,17 @@ func (m *ListScanRunsResponse) Reset()         { *m = ListScanRunsResponse{} }
 func (m *ListScanRunsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListScanRunsResponse) ProtoMessage()    {}
 func (*ListScanRunsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{9}
+	return fileDescriptor_aab783dd0f551f53, []int{9}
 }
+
 func (m *ListScanRunsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanRunsResponse.Unmarshal(m, b)
 }
 func (m *ListScanRunsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanRunsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListScanRunsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanRunsResponse.Merge(dst, src)
+func (m *ListScanRunsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanRunsResponse.Merge(m, src)
 }
 func (m *ListScanRunsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListScanRunsResponse.Size(m)
@@ -546,16 +556,17 @@ func (m *StopScanRunRequest) Reset()         { *m = StopScanRunRequest{} }
 func (m *StopScanRunRequest) String() string { return proto.CompactTextString(m) }
 func (*StopScanRunRequest) ProtoMessage()    {}
 func (*StopScanRunRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{10}
+	return fileDescriptor_aab783dd0f551f53, []int{10}
 }
+
 func (m *StopScanRunRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StopScanRunRequest.Unmarshal(m, b)
 }
 func (m *StopScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StopScanRunRequest.Marshal(b, m, deterministic)
 }
-func (dst *StopScanRunRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StopScanRunRequest.Merge(dst, src)
+func (m *StopScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StopScanRunRequest.Merge(m, src)
 }
 func (m *StopScanRunRequest) XXX_Size() int {
 	return xxx_messageInfo_StopScanRunRequest.Size(m)
@@ -597,16 +608,17 @@ func (m *ListCrawledUrlsRequest) Reset()         { *m = ListCrawledUrlsRequest{}
 func (m *ListCrawledUrlsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCrawledUrlsRequest) ProtoMessage()    {}
 func (*ListCrawledUrlsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{11}
+	return fileDescriptor_aab783dd0f551f53, []int{11}
 }
+
 func (m *ListCrawledUrlsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCrawledUrlsRequest.Unmarshal(m, b)
 }
 func (m *ListCrawledUrlsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCrawledUrlsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCrawledUrlsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCrawledUrlsRequest.Merge(dst, src)
+func (m *ListCrawledUrlsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCrawledUrlsRequest.Merge(m, src)
 }
 func (m *ListCrawledUrlsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCrawledUrlsRequest.Size(m)
@@ -654,16 +666,17 @@ func (m *ListCrawledUrlsResponse) Reset()         { *m = ListCrawledUrlsResponse
 func (m *ListCrawledUrlsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCrawledUrlsResponse) ProtoMessage()    {}
 func (*ListCrawledUrlsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{12}
+	return fileDescriptor_aab783dd0f551f53, []int{12}
 }
+
 func (m *ListCrawledUrlsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCrawledUrlsResponse.Unmarshal(m, b)
 }
 func (m *ListCrawledUrlsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCrawledUrlsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCrawledUrlsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCrawledUrlsResponse.Merge(dst, src)
+func (m *ListCrawledUrlsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCrawledUrlsResponse.Merge(m, src)
 }
 func (m *ListCrawledUrlsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCrawledUrlsResponse.Size(m)
@@ -704,16 +717,17 @@ func (m *GetFindingRequest) Reset()         { *m = GetFindingRequest{} }
 func (m *GetFindingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFindingRequest) ProtoMessage()    {}
 func (*GetFindingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{13}
+	return fileDescriptor_aab783dd0f551f53, []int{13}
 }
+
 func (m *GetFindingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFindingRequest.Unmarshal(m, b)
 }
 func (m *GetFindingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFindingRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFindingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFindingRequest.Merge(dst, src)
+func (m *GetFindingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFindingRequest.Merge(m, src)
 }
 func (m *GetFindingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFindingRequest.Size(m)
@@ -760,16 +774,17 @@ func (m *ListFindingsRequest) Reset()         { *m = ListFindingsRequest{} }
 func (m *ListFindingsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsRequest) ProtoMessage()    {}
 func (*ListFindingsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{14}
+	return fileDescriptor_aab783dd0f551f53, []int{14}
 }
+
 func (m *ListFindingsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsRequest.Unmarshal(m, b)
 }
 func (m *ListFindingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsRequest.Merge(dst, src)
+func (m *ListFindingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsRequest.Merge(m, src)
 }
 func (m *ListFindingsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsRequest.Size(m)
@@ -824,16 +839,17 @@ func (m *ListFindingsResponse) Reset()         { *m = ListFindingsResponse{} }
 func (m *ListFindingsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFindingsResponse) ProtoMessage()    {}
 func (*ListFindingsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{15}
+	return fileDescriptor_aab783dd0f551f53, []int{15}
 }
+
 func (m *ListFindingsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingsResponse.Unmarshal(m, b)
 }
 func (m *ListFindingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingsResponse.Merge(dst, src)
+func (m *ListFindingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsResponse.Merge(m, src)
 }
 func (m *ListFindingsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFindingsResponse.Size(m)
@@ -874,16 +890,17 @@ func (m *ListFindingTypeStatsRequest) Reset()         { *m = ListFindingTypeStat
 func (m *ListFindingTypeStatsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFindingTypeStatsRequest) ProtoMessage()    {}
 func (*ListFindingTypeStatsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{16}
+	return fileDescriptor_aab783dd0f551f53, []int{16}
 }
+
 func (m *ListFindingTypeStatsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingTypeStatsRequest.Unmarshal(m, b)
 }
 func (m *ListFindingTypeStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingTypeStatsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingTypeStatsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingTypeStatsRequest.Merge(dst, src)
+func (m *ListFindingTypeStatsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingTypeStatsRequest.Merge(m, src)
 }
 func (m *ListFindingTypeStatsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFindingTypeStatsRequest.Size(m)
@@ -914,16 +931,17 @@ func (m *ListFindingTypeStatsResponse) Reset()         { *m = ListFindingTypeSta
 func (m *ListFindingTypeStatsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFindingTypeStatsResponse) ProtoMessage()    {}
 func (*ListFindingTypeStatsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_web_security_scanner_ccd98c4097e38a3b, []int{17}
+	return fileDescriptor_aab783dd0f551f53, []int{17}
 }
+
 func (m *ListFindingTypeStatsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFindingTypeStatsResponse.Unmarshal(m, b)
 }
 func (m *ListFindingTypeStatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFindingTypeStatsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFindingTypeStatsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFindingTypeStatsResponse.Merge(dst, src)
+func (m *ListFindingTypeStatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingTypeStatsResponse.Merge(m, src)
 }
 func (m *ListFindingTypeStatsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFindingTypeStatsResponse.Size(m)
@@ -962,6 +980,84 @@ func init() {
 	proto.RegisterType((*ListFindingTypeStatsResponse)(nil), "google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/web_security_scanner.proto", fileDescriptor_aab783dd0f551f53)
+}
+
+var fileDescriptor_aab783dd0f551f53 = []byte{
+	// 1113 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0xd6, 0xb4, 0x25, 0x4a, 0x9e, 0x53, 0x35, 0x4c, 0xa3, 0x38, 0xda, 0x14, 0xc9, 0xda, 0x43,
+	0x9b, 0x5a, 0xaa, 0x57, 0xb8, 0x2d, 0x04, 0x27, 0x25, 0x90, 0x34, 0x2d, 0x12, 0xad, 0x14, 0xd9,
+	0x8d, 0x40, 0x5c, 0x56, 0x6b, 0x7b, 0x6c, 0x2d, 0xd9, 0xcc, 0x2e, 0x3b, 0xb3, 0x94, 0x14, 0xf5,
+	0x00, 0x07, 0x2e, 0x70, 0xe3, 0xc2, 0x81, 0x0b, 0x57, 0xb8, 0x21, 0xc4, 0x11, 0x0e, 0xa8, 0x77,
+	0x10, 0x57, 0x8e, 0xfc, 0x00, 0x7e, 0x02, 0xda, 0xd9, 0x59, 0x7b, 0xbd, 0xbb, 0xb5, 0x67, 0x1c,
+	0xe5, 0xe6, 0x9d, 0x99, 0xf7, 0xe6, 0x7b, 0xdf, 0x7b, 0x6f, 0xde, 0x27, 0xc3, 0xbb, 0x43, 0xdf,
+	0x1f, 0x7a, 0xc4, 0xea, 0x79, 0x7e, 0xd4, 0xb7, 0x9e, 0x92, 0x2e, 0x23, 0xbd, 0x28, 0x74, 0xf9,
+	0x29, 0xeb, 0x39, 0x94, 0x92, 0xd0, 0xfa, 0xf4, 0xf5, 0x2e, 0xe1, 0x4e, 0xbc, 0x63, 0xa7, 0x5b,
+	0xb6, 0xdc, 0x6b, 0x04, 0xa1, 0xcf, 0x7d, 0x7c, 0x3d, 0x71, 0xd1, 0x10, 0x2e, 0x1a, 0x45, 0x17,
+	0x8d, 0xc4, 0x85, 0x71, 0x4d, 0x5e, 0xe5, 0x04, 0xae, 0xe5, 0x50, 0xea, 0x73, 0x87, 0xbb, 0x3e,
+	0x65, 0x89, 0x17, 0x63, 0x4b, 0x11, 0x48, 0x2f, 0x74, 0x9e, 0x7a, 0xa4, 0x6f, 0x47, 0xa1, 0x27,
+	0x2d, 0xef, 0x28, 0x5a, 0x0e, 0x5c, 0xda, 0x77, 0xe9, 0x50, 0x5a, 0xed, 0xea, 0x59, 0xd9, 0xfc,
+	0x34, 0x20, 0x36, 0xe3, 0x0e, 0xd7, 0x05, 0x1c, 0x7f, 0xda, 0x3d, 0x9f, 0x0e, 0xdc, 0xf4, 0xea,
+	0xbb, 0x3a, 0x96, 0x61, 0x44, 0xa5, 0xd9, 0x86, 0x34, 0x13, 0x5f, 0xdd, 0x68, 0x60, 0x91, 0x93,
+	0x80, 0x9f, 0xca, 0xcd, 0x5a, 0x7e, 0x73, 0xe0, 0x12, 0xaf, 0x6f, 0x9f, 0x38, 0xec, 0x38, 0x39,
+	0x61, 0x7e, 0x85, 0xa0, 0xba, 0x1f, 0x12, 0x87, 0x93, 0x4e, 0xcf, 0xa1, 0xfb, 0x02, 0x50, 0x9b,
+	0x7c, 0x12, 0x11, 0xc6, 0xf1, 0x1a, 0x2c, 0x04, 0x4e, 0x48, 0x28, 0x5f, 0x47, 0x35, 0xb4, 0xb9,
+	0xd4, 0x96, 0x5f, 0xb8, 0x03, 0x95, 0x0c, 0xfc, 0xf5, 0x0b, 0x35, 0xb4, 0x59, 0x69, 0x36, 0x1b,
+	0x6a, 0x09, 0x6f, 0x64, 0xee, 0x01, 0x36, 0xfa, 0x6d, 0xde, 0x82, 0xea, 0x7d, 0xe2, 0x91, 0x32,
+	0x1c, 0x18, 0x2e, 0x51, 0xe7, 0x84, 0x48, 0x14, 0xe2, 0xb7, 0x59, 0x87, 0xd5, 0x87, 0x84, 0xab,
+	0x9d, 0xf5, 0x60, 0xed, 0x91, 0xcb, 0x32, 0x87, 0xd9, 0xac, 0x08, 0x5f, 0x03, 0x08, 0x9c, 0x21,
+	0xb1, 0xb9, 0x7f, 0x4c, 0xa8, 0x08, 0x70, 0xa9, 0xbd, 0x14, 0xaf, 0x3c, 0x89, 0x17, 0xf0, 0x06,
+	0x88, 0x0f, 0x9b, 0xb9, 0xcf, 0xc8, 0xfa, 0xc5, 0x1a, 0xda, 0x7c, 0xa5, 0xbd, 0x18, 0x2f, 0x74,
+	0xdc, 0x67, 0xc4, 0xfc, 0x09, 0x41, 0xf5, 0x28, 0xe8, 0x97, 0x32, 0x7a, 0x1e, 0xcc, 0xe1, 0x6d,
+	0xa8, 0x44, 0xe2, 0x3e, 0x91, 0x57, 0x81, 0xa7, 0xd2, 0x34, 0x52, 0xa7, 0x69, 0xea, 0x1b, 0x0f,
+	0xe2, 0xd4, 0x3f, 0x76, 0xd8, 0x71, 0x1b, 0x92, 0xe3, 0xf1, 0x6f, 0xf3, 0x3b, 0x04, 0xd5, 0x02,
+	0x39, 0x2c, 0xf0, 0x29, 0x23, 0xf8, 0x08, 0x96, 0x33, 0x68, 0xd9, 0x3a, 0xaa, 0x5d, 0x9c, 0x13,
+	0x6e, 0x65, 0x0c, 0x97, 0xe1, 0xeb, 0x70, 0x85, 0x92, 0xcf, 0xb8, 0x5d, 0x60, 0xf8, 0x72, 0xbc,
+	0x7c, 0x98, 0xb2, 0x6c, 0xde, 0x84, 0xab, 0x1d, 0xee, 0x84, 0x02, 0x5a, 0x3b, 0xa2, 0xd3, 0x32,
+	0x7c, 0x03, 0x5e, 0x95, 0xd5, 0x30, 0xe3, 0xa0, 0x0b, 0x57, 0xd3, 0x68, 0xdb, 0x11, 0x3d, 0xd7,
+	0x3a, 0xf8, 0x06, 0xc1, 0xea, 0xe4, 0x5d, 0x92, 0xd6, 0x47, 0xb0, 0x94, 0xf6, 0x70, 0xca, 0xa9,
+	0xa5, 0xc3, 0x69, 0x1c, 0xe2, 0x22, 0x93, 0x5e, 0x95, 0xd9, 0xdc, 0x04, 0xdc, 0xe1, 0x7e, 0xa0,
+	0xc0, 0x91, 0x6c, 0x97, 0xfd, 0xe4, 0x49, 0x3d, 0x0a, 0xbd, 0x73, 0xa5, 0x29, 0x2d, 0xc0, 0x89,
+	0xeb, 0xc6, 0x05, 0x98, 0x79, 0xd8, 0xb5, 0x0b, 0x70, 0xec, 0xb2, 0x5d, 0xe9, 0x8d, 0xdd, 0x2b,
+	0x53, 0x96, 0x54, 0xd5, 0x83, 0xe4, 0xa9, 0x9f, 0xc6, 0xd8, 0x17, 0x28, 0x29, 0x2b, 0x79, 0x74,
+	0x26, 0x5f, 0x6b, 0xb0, 0x30, 0x70, 0x3d, 0x4e, 0x42, 0x79, 0xaf, 0xfc, 0xca, 0xf1, 0x78, 0x71,
+	0x2a, 0x8f, 0x97, 0x72, 0x3c, 0x7e, 0x2d, 0xcb, 0x6d, 0x8c, 0x41, 0x92, 0xf8, 0x3e, 0x2c, 0xca,
+	0x69, 0xa5, 0x5d, 0x6d, 0x69, 0xe8, 0x23, 0x07, 0xca, 0xd4, 0xdd, 0x85, 0x8d, 0x0c, 0x98, 0x27,
+	0xa7, 0x01, 0xe9, 0xc4, 0x43, 0x72, 0x06, 0x31, 0xf1, 0x34, 0xba, 0x56, 0x6e, 0x27, 0x83, 0x19,
+	0x00, 0x2e, 0x8e, 0x5e, 0x19, 0xd6, 0x96, 0x66, 0x58, 0x63, 0xef, 0x2b, 0x83, 0xdc, 0x4a, 0xf3,
+	0xc7, 0x55, 0xc0, 0x1f, 0x90, 0x6e, 0x47, 0x3a, 0xe8, 0x24, 0x0e, 0xf0, 0x0b, 0x04, 0x2b, 0xf9,
+	0x69, 0x89, 0x77, 0xd5, 0xeb, 0xb1, 0x74, 0xce, 0x1a, 0x73, 0xbc, 0xa8, 0xe6, 0xce, 0x97, 0x7f,
+	0xff, 0xfb, 0xed, 0x85, 0x37, 0xcc, 0x1b, 0xa9, 0x2c, 0xf8, 0x3c, 0xa1, 0xf0, 0x5e, 0x10, 0xfa,
+	0x1f, 0x93, 0x1e, 0x67, 0x56, 0xfd, 0xb9, 0x95, 0x79, 0x75, 0x5b, 0xd9, 0xc1, 0x83, 0xbf, 0x47,
+	0xb0, 0x92, 0x9f, 0xb6, 0xea, 0x71, 0xbc, 0x64, 0x4e, 0x1b, 0x6b, 0x85, 0x99, 0x73, 0x10, 0x6b,
+	0x11, 0xd3, 0x12, 0x58, 0x6f, 0xd6, 0xc7, 0x58, 0xe3, 0xae, 0xc9, 0x20, 0xcd, 0x02, 0xb5, 0xea,
+	0xcf, 0xf1, 0xcf, 0x08, 0x2e, 0x4f, 0x4c, 0x77, 0xbc, 0xa3, 0x8a, 0xad, 0x4c, 0x14, 0xcc, 0x45,
+	0xb0, 0x04, 0x8d, 0x95, 0x41, 0xff, 0x81, 0xe0, 0x4a, 0x6e, 0x92, 0xe2, 0xb7, 0x55, 0x2f, 0x2e,
+	0xd7, 0x27, 0xc6, 0xee, 0xdc, 0xf6, 0x49, 0xbf, 0x94, 0x44, 0x31, 0xbd, 0x4c, 0xf0, 0x5f, 0x08,
+	0x56, 0xf2, 0xea, 0x45, 0xbd, 0x32, 0x5e, 0xa2, 0x7b, 0xe6, 0x4a, 0xc0, 0x7b, 0x02, 0xfa, 0x5e,
+	0xf3, 0xf6, 0x08, 0x7a, 0x56, 0x33, 0x4f, 0x4f, 0xc6, 0x64, 0xb5, 0xff, 0x8a, 0x60, 0x39, 0xab,
+	0x24, 0xf0, 0xb6, 0x32, 0x9c, 0xa2, 0xfe, 0x30, 0x74, 0x67, 0xb5, 0xb9, 0x25, 0x02, 0x69, 0x9a,
+	0xb7, 0x14, 0x2b, 0xa9, 0xc5, 0xe2, 0x5b, 0x5b, 0xa8, 0x8e, 0x7f, 0x41, 0x00, 0x63, 0x5d, 0x83,
+	0xdf, 0xd2, 0x6c, 0x82, 0xb3, 0x80, 0x6e, 0x09, 0xd0, 0x77, 0x70, 0x53, 0x0d, 0xb4, 0x95, 0xea,
+	0x91, 0xb8, 0x13, 0x5e, 0x20, 0x58, 0xce, 0x2a, 0x1f, 0x75, 0xbe, 0x4b, 0xb4, 0x99, 0xb1, 0x33,
+	0x9f, 0xb1, 0x6c, 0x80, 0x62, 0x1c, 0x85, 0x06, 0xc8, 0xd1, 0x3f, 0x0a, 0x05, 0xff, 0x86, 0xa0,
+	0x92, 0xd1, 0x4c, 0xb8, 0xa5, 0x5e, 0x36, 0x79, 0xa1, 0xa5, 0x9f, 0x80, 0x3d, 0x01, 0x7c, 0xc7,
+	0x7c, 0x53, 0x3f, 0x01, 0x2d, 0xc6, 0xfd, 0x20, 0xae, 0x9f, 0x7f, 0xe4, 0x93, 0x94, 0xd1, 0x56,
+	0x7a, 0x4f, 0x52, 0x51, 0x03, 0xea, 0x3d, 0x49, 0x25, 0xa2, 0x2e, 0xed, 0x6b, 0xfc, 0x8e, 0x6a,
+	0x46, 0xb2, 0xa1, 0x59, 0x59, 0x1d, 0xf7, 0x7b, 0xd2, 0x1e, 0x72, 0x9c, 0x6b, 0xb5, 0xc7, 0xa4,
+	0xa8, 0x33, 0x74, 0x15, 0x91, 0x79, 0x20, 0x82, 0xd8, 0xc5, 0xf7, 0xb4, 0xb3, 0x93, 0xfe, 0x75,
+	0x20, 0x3a, 0xe5, 0x4f, 0xd9, 0x29, 0xa9, 0x68, 0xd3, 0xeb, 0x94, 0x9c, 0xdc, 0xd4, 0xeb, 0x94,
+	0xbc, 0x4e, 0x2c, 0x09, 0x49, 0x27, 0x2f, 0x23, 0x85, 0xf8, 0xdf, 0xa4, 0x0e, 0x1d, 0x49, 0x2a,
+	0xbc, 0x3f, 0x07, 0xba, 0xbc, 0x70, 0x34, 0xee, 0x9f, 0xcd, 0x89, 0x0c, 0xf5, 0xb1, 0x08, 0xf5,
+	0x21, 0x3e, 0x38, 0x4b, 0xa8, 0x23, 0xb7, 0x7b, 0x3f, 0x20, 0xa8, 0xf7, 0xfc, 0x13, 0x45, 0x68,
+	0x7b, 0xd5, 0xa2, 0xb0, 0x3c, 0x8c, 0x05, 0xd3, 0x21, 0xfa, 0xe8, 0x43, 0xe9, 0x62, 0xe8, 0x7b,
+	0x0e, 0x1d, 0x36, 0xfc, 0x70, 0x68, 0x0d, 0x09, 0x15, 0x72, 0xca, 0x4a, 0xb6, 0x9c, 0xc0, 0x65,
+	0xb3, 0xfe, 0x22, 0xda, 0x2e, 0xee, 0x74, 0x17, 0x84, 0x93, 0xdb, 0xff, 0x07, 0x00, 0x00, 0xff,
+	0xff, 0x46, 0x3b, 0x5e, 0x3b, 0xda, 0x13, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1457,81 +1553,3 @@ var _WebSecurityScanner_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/websecurityscanner/v1beta/web_security_scanner.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/cloud/websecurityscanner/v1beta/web_security_scanner.proto", fileDescriptor_web_security_scanner_ccd98c4097e38a3b)
-}
-
-var fileDescriptor_web_security_scanner_ccd98c4097e38a3b = []byte{
-	// 1113 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x41, 0x6f, 0x1b, 0x45,
-	0x14, 0xd6, 0xb4, 0x25, 0x4a, 0x9e, 0x53, 0x35, 0x4c, 0xa3, 0x38, 0xda, 0x14, 0xc9, 0xda, 0x43,
-	0x9b, 0x5a, 0xaa, 0x57, 0xb8, 0x2d, 0x04, 0x27, 0x25, 0x90, 0x34, 0x2d, 0x12, 0xad, 0x14, 0xd9,
-	0x8d, 0x40, 0x5c, 0x56, 0x6b, 0x7b, 0x6c, 0x2d, 0xd9, 0xcc, 0x2e, 0x3b, 0xb3, 0x94, 0x14, 0xf5,
-	0x00, 0x07, 0x2e, 0x70, 0xe3, 0xc2, 0x81, 0x0b, 0x57, 0xb8, 0x21, 0xc4, 0x11, 0x0e, 0xa8, 0x77,
-	0x10, 0x57, 0x8e, 0xfc, 0x00, 0x7e, 0x02, 0xda, 0xd9, 0x59, 0x7b, 0xbd, 0xbb, 0xb5, 0x67, 0x1c,
-	0xe5, 0xe6, 0x9d, 0x99, 0xf7, 0xe6, 0x7b, 0xdf, 0x7b, 0x6f, 0xde, 0x27, 0xc3, 0xbb, 0x43, 0xdf,
-	0x1f, 0x7a, 0xc4, 0xea, 0x79, 0x7e, 0xd4, 0xb7, 0x9e, 0x92, 0x2e, 0x23, 0xbd, 0x28, 0x74, 0xf9,
-	0x29, 0xeb, 0x39, 0x94, 0x92, 0xd0, 0xfa, 0xf4, 0xf5, 0x2e, 0xe1, 0x4e, 0xbc, 0x63, 0xa7, 0x5b,
-	0xb6, 0xdc, 0x6b, 0x04, 0xa1, 0xcf, 0x7d, 0x7c, 0x3d, 0x71, 0xd1, 0x10, 0x2e, 0x1a, 0x45, 0x17,
-	0x8d, 0xc4, 0x85, 0x71, 0x4d, 0x5e, 0xe5, 0x04, 0xae, 0xe5, 0x50, 0xea, 0x73, 0x87, 0xbb, 0x3e,
-	0x65, 0x89, 0x17, 0x63, 0x4b, 0x11, 0x48, 0x2f, 0x74, 0x9e, 0x7a, 0xa4, 0x6f, 0x47, 0xa1, 0x27,
-	0x2d, 0xef, 0x28, 0x5a, 0x0e, 0x5c, 0xda, 0x77, 0xe9, 0x50, 0x5a, 0xed, 0xea, 0x59, 0xd9, 0xfc,
-	0x34, 0x20, 0x36, 0xe3, 0x0e, 0xd7, 0x05, 0x1c, 0x7f, 0xda, 0x3d, 0x9f, 0x0e, 0xdc, 0xf4, 0xea,
-	0xbb, 0x3a, 0x96, 0x61, 0x44, 0xa5, 0xd9, 0x86, 0x34, 0x13, 0x5f, 0xdd, 0x68, 0x60, 0x91, 0x93,
-	0x80, 0x9f, 0xca, 0xcd, 0x5a, 0x7e, 0x73, 0xe0, 0x12, 0xaf, 0x6f, 0x9f, 0x38, 0xec, 0x38, 0x39,
-	0x61, 0x7e, 0x85, 0xa0, 0xba, 0x1f, 0x12, 0x87, 0x93, 0x4e, 0xcf, 0xa1, 0xfb, 0x02, 0x50, 0x9b,
-	0x7c, 0x12, 0x11, 0xc6, 0xf1, 0x1a, 0x2c, 0x04, 0x4e, 0x48, 0x28, 0x5f, 0x47, 0x35, 0xb4, 0xb9,
-	0xd4, 0x96, 0x5f, 0xb8, 0x03, 0x95, 0x0c, 0xfc, 0xf5, 0x0b, 0x35, 0xb4, 0x59, 0x69, 0x36, 0x1b,
-	0x6a, 0x09, 0x6f, 0x64, 0xee, 0x01, 0x36, 0xfa, 0x6d, 0xde, 0x82, 0xea, 0x7d, 0xe2, 0x91, 0x32,
-	0x1c, 0x18, 0x2e, 0x51, 0xe7, 0x84, 0x48, 0x14, 0xe2, 0xb7, 0x59, 0x87, 0xd5, 0x87, 0x84, 0xab,
-	0x9d, 0xf5, 0x60, 0xed, 0x91, 0xcb, 0x32, 0x87, 0xd9, 0xac, 0x08, 0x5f, 0x03, 0x08, 0x9c, 0x21,
-	0xb1, 0xb9, 0x7f, 0x4c, 0xa8, 0x08, 0x70, 0xa9, 0xbd, 0x14, 0xaf, 0x3c, 0x89, 0x17, 0xf0, 0x06,
-	0x88, 0x0f, 0x9b, 0xb9, 0xcf, 0xc8, 0xfa, 0xc5, 0x1a, 0xda, 0x7c, 0xa5, 0xbd, 0x18, 0x2f, 0x74,
-	0xdc, 0x67, 0xc4, 0xfc, 0x09, 0x41, 0xf5, 0x28, 0xe8, 0x97, 0x32, 0x7a, 0x1e, 0xcc, 0xe1, 0x6d,
-	0xa8, 0x44, 0xe2, 0x3e, 0x91, 0x57, 0x81, 0xa7, 0xd2, 0x34, 0x52, 0xa7, 0x69, 0xea, 0x1b, 0x0f,
-	0xe2, 0xd4, 0x3f, 0x76, 0xd8, 0x71, 0x1b, 0x92, 0xe3, 0xf1, 0x6f, 0xf3, 0x3b, 0x04, 0xd5, 0x02,
-	0x39, 0x2c, 0xf0, 0x29, 0x23, 0xf8, 0x08, 0x96, 0x33, 0x68, 0xd9, 0x3a, 0xaa, 0x5d, 0x9c, 0x13,
-	0x6e, 0x65, 0x0c, 0x97, 0xe1, 0xeb, 0x70, 0x85, 0x92, 0xcf, 0xb8, 0x5d, 0x60, 0xf8, 0x72, 0xbc,
-	0x7c, 0x98, 0xb2, 0x6c, 0xde, 0x84, 0xab, 0x1d, 0xee, 0x84, 0x02, 0x5a, 0x3b, 0xa2, 0xd3, 0x32,
-	0x7c, 0x03, 0x5e, 0x95, 0xd5, 0x30, 0xe3, 0xa0, 0x0b, 0x57, 0xd3, 0x68, 0xdb, 0x11, 0x3d, 0xd7,
-	0x3a, 0xf8, 0x06, 0xc1, 0xea, 0xe4, 0x5d, 0x92, 0xd6, 0x47, 0xb0, 0x94, 0xf6, 0x70, 0xca, 0xa9,
-	0xa5, 0xc3, 0x69, 0x1c, 0xe2, 0x22, 0x93, 0x5e, 0x95, 0xd9, 0xdc, 0x04, 0xdc, 0xe1, 0x7e, 0xa0,
-	0xc0, 0x91, 0x6c, 0x97, 0xfd, 0xe4, 0x49, 0x3d, 0x0a, 0xbd, 0x73, 0xa5, 0x29, 0x2d, 0xc0, 0x89,
-	0xeb, 0xc6, 0x05, 0x98, 0x79, 0xd8, 0xb5, 0x0b, 0x70, 0xec, 0xb2, 0x5d, 0xe9, 0x8d, 0xdd, 0x2b,
-	0x53, 0x96, 0x54, 0xd5, 0x83, 0xe4, 0xa9, 0x9f, 0xc6, 0xd8, 0x17, 0x28, 0x29, 0x2b, 0x79, 0x74,
-	0x26, 0x5f, 0x6b, 0xb0, 0x30, 0x70, 0x3d, 0x4e, 0x42, 0x79, 0xaf, 0xfc, 0xca, 0xf1, 0x78, 0x71,
-	0x2a, 0x8f, 0x97, 0x72, 0x3c, 0x7e, 0x2d, 0xcb, 0x6d, 0x8c, 0x41, 0x92, 0xf8, 0x3e, 0x2c, 0xca,
-	0x69, 0xa5, 0x5d, 0x6d, 0x69, 0xe8, 0x23, 0x07, 0xca, 0xd4, 0xdd, 0x85, 0x8d, 0x0c, 0x98, 0x27,
-	0xa7, 0x01, 0xe9, 0xc4, 0x43, 0x72, 0x06, 0x31, 0xf1, 0x34, 0xba, 0x56, 0x6e, 0x27, 0x83, 0x19,
-	0x00, 0x2e, 0x8e, 0x5e, 0x19, 0xd6, 0x96, 0x66, 0x58, 0x63, 0xef, 0x2b, 0x83, 0xdc, 0x4a, 0xf3,
-	0xc7, 0x55, 0xc0, 0x1f, 0x90, 0x6e, 0x47, 0x3a, 0xe8, 0x24, 0x0e, 0xf0, 0x0b, 0x04, 0x2b, 0xf9,
-	0x69, 0x89, 0x77, 0xd5, 0xeb, 0xb1, 0x74, 0xce, 0x1a, 0x73, 0xbc, 0xa8, 0xe6, 0xce, 0x97, 0x7f,
-	0xff, 0xfb, 0xed, 0x85, 0x37, 0xcc, 0x1b, 0xa9, 0x2c, 0xf8, 0x3c, 0xa1, 0xf0, 0x5e, 0x10, 0xfa,
-	0x1f, 0x93, 0x1e, 0x67, 0x56, 0xfd, 0xb9, 0x95, 0x79, 0x75, 0x5b, 0xd9, 0xc1, 0x83, 0xbf, 0x47,
-	0xb0, 0x92, 0x9f, 0xb6, 0xea, 0x71, 0xbc, 0x64, 0x4e, 0x1b, 0x6b, 0x85, 0x99, 0x73, 0x10, 0x6b,
-	0x11, 0xd3, 0x12, 0x58, 0x6f, 0xd6, 0xc7, 0x58, 0xe3, 0xae, 0xc9, 0x20, 0xcd, 0x02, 0xb5, 0xea,
-	0xcf, 0xf1, 0xcf, 0x08, 0x2e, 0x4f, 0x4c, 0x77, 0xbc, 0xa3, 0x8a, 0xad, 0x4c, 0x14, 0xcc, 0x45,
-	0xb0, 0x04, 0x8d, 0x95, 0x41, 0xff, 0x81, 0xe0, 0x4a, 0x6e, 0x92, 0xe2, 0xb7, 0x55, 0x2f, 0x2e,
-	0xd7, 0x27, 0xc6, 0xee, 0xdc, 0xf6, 0x49, 0xbf, 0x94, 0x44, 0x31, 0xbd, 0x4c, 0xf0, 0x5f, 0x08,
-	0x56, 0xf2, 0xea, 0x45, 0xbd, 0x32, 0x5e, 0xa2, 0x7b, 0xe6, 0x4a, 0xc0, 0x7b, 0x02, 0xfa, 0x5e,
-	0xf3, 0xf6, 0x08, 0x7a, 0x56, 0x33, 0x4f, 0x4f, 0xc6, 0x64, 0xb5, 0xff, 0x8a, 0x60, 0x39, 0xab,
-	0x24, 0xf0, 0xb6, 0x32, 0x9c, 0xa2, 0xfe, 0x30, 0x74, 0x67, 0xb5, 0xb9, 0x25, 0x02, 0x69, 0x9a,
-	0xb7, 0x14, 0x2b, 0xa9, 0xc5, 0xe2, 0x5b, 0x5b, 0xa8, 0x8e, 0x7f, 0x41, 0x00, 0x63, 0x5d, 0x83,
-	0xdf, 0xd2, 0x6c, 0x82, 0xb3, 0x80, 0x6e, 0x09, 0xd0, 0x77, 0x70, 0x53, 0x0d, 0xb4, 0x95, 0xea,
-	0x91, 0xb8, 0x13, 0x5e, 0x20, 0x58, 0xce, 0x2a, 0x1f, 0x75, 0xbe, 0x4b, 0xb4, 0x99, 0xb1, 0x33,
-	0x9f, 0xb1, 0x6c, 0x80, 0x62, 0x1c, 0x85, 0x06, 0xc8, 0xd1, 0x3f, 0x0a, 0x05, 0xff, 0x86, 0xa0,
-	0x92, 0xd1, 0x4c, 0xb8, 0xa5, 0x5e, 0x36, 0x79, 0xa1, 0xa5, 0x9f, 0x80, 0x3d, 0x01, 0x7c, 0xc7,
-	0x7c, 0x53, 0x3f, 0x01, 0x2d, 0xc6, 0xfd, 0x20, 0xae, 0x9f, 0x7f, 0xe4, 0x93, 0x94, 0xd1, 0x56,
-	0x7a, 0x4f, 0x52, 0x51, 0x03, 0xea, 0x3d, 0x49, 0x25, 0xa2, 0x2e, 0xed, 0x6b, 0xfc, 0x8e, 0x6a,
-	0x46, 0xb2, 0xa1, 0x59, 0x59, 0x1d, 0xf7, 0x7b, 0xd2, 0x1e, 0x72, 0x9c, 0x6b, 0xb5, 0xc7, 0xa4,
-	0xa8, 0x33, 0x74, 0x15, 0x91, 0x79, 0x20, 0x82, 0xd8, 0xc5, 0xf7, 0xb4, 0xb3, 0x93, 0xfe, 0x75,
-	0x20, 0x3a, 0xe5, 0x4f, 0xd9, 0x29, 0xa9, 0x68, 0xd3, 0xeb, 0x94, 0x9c, 0xdc, 0xd4, 0xeb, 0x94,
-	0xbc, 0x4e, 0x2c, 0x09, 0x49, 0x27, 0x2f, 0x23, 0x85, 0xf8, 0xdf, 0xa4, 0x0e, 0x1d, 0x49, 0x2a,
-	0xbc, 0x3f, 0x07, 0xba, 0xbc, 0x70, 0x34, 0xee, 0x9f, 0xcd, 0x89, 0x0c, 0xf5, 0xb1, 0x08, 0xf5,
-	0x21, 0x3e, 0x38, 0x4b, 0xa8, 0x23, 0xb7, 0x7b, 0x3f, 0x20, 0xa8, 0xf7, 0xfc, 0x13, 0x45, 0x68,
-	0x7b, 0xd5, 0xa2, 0xb0, 0x3c, 0x8c, 0x05, 0xd3, 0x21, 0xfa, 0xe8, 0x43, 0xe9, 0x62, 0xe8, 0x7b,
-	0x0e, 0x1d, 0x36, 0xfc, 0x70, 0x68, 0x0d, 0x09, 0x15, 0x72, 0xca, 0x4a, 0xb6, 0x9c, 0xc0, 0x65,
-	0xb3, 0xfe, 0x22, 0xda, 0x2e, 0xee, 0x74, 0x17, 0x84, 0x93, 0xdb, 0xff, 0x07, 0x00, 0x00, 0xff,
-	0xff, 0x46, 0x3b, 0x5e, 0x3b, 0xda, 0x13, 0x00, 0x00,
-}
diff --git a/googleapis/container/v1/cluster_service.pb.go b/googleapis/container/v1/cluster_service.pb.go
index e8a7dbe3bf..5aaef56b1a 100644
--- a/googleapis/container/v1/cluster_service.pb.go
+++ b/googleapis/container/v1/cluster_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1/cluster_service.proto
 
-package container // import "google.golang.org/genproto/googleapis/container/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package container
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Allowed Network Policy providers.
 type NetworkPolicy_Provider int32
@@ -39,6 +39,7 @@ var NetworkPolicy_Provider_name = map[int32]string{
 	0: "PROVIDER_UNSPECIFIED",
 	1: "CALICO",
 }
+
 var NetworkPolicy_Provider_value = map[string]int32{
 	"PROVIDER_UNSPECIFIED": 0,
 	"CALICO":               1,
@@ -47,8 +48,9 @@ var NetworkPolicy_Provider_value = map[string]int32{
 func (x NetworkPolicy_Provider) String() string {
 	return proto.EnumName(NetworkPolicy_Provider_name, int32(x))
 }
+
 func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{11, 0}
+	return fileDescriptor_1c7f18b1699f357a, []int{11, 0}
 }
 
 // The current status of the cluster.
@@ -85,6 +87,7 @@ var Cluster_Status_name = map[int32]string{
 	5: "ERROR",
 	6: "DEGRADED",
 }
+
 var Cluster_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PROVISIONING":       1,
@@ -98,8 +101,9 @@ var Cluster_Status_value = map[string]int32{
 func (x Cluster_Status) String() string {
 	return proto.EnumName(Cluster_Status_name, int32(x))
 }
+
 func (Cluster_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{13, 0}
+	return fileDescriptor_1c7f18b1699f357a, []int{13, 0}
 }
 
 // Current status of the operation.
@@ -125,6 +129,7 @@ var Operation_Status_name = map[int32]string{
 	3: "DONE",
 	4: "ABORTING",
 }
+
 var Operation_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PENDING":            1,
@@ -136,8 +141,9 @@ var Operation_Status_value = map[string]int32{
 func (x Operation_Status) String() string {
 	return proto.EnumName(Operation_Status_name, int32(x))
 }
+
 func (Operation_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{15, 0}
+	return fileDescriptor_1c7f18b1699f357a, []int{15, 0}
 }
 
 // Operation type.
@@ -199,6 +205,7 @@ var Operation_Type_name = map[int32]string{
 	15: "SET_NETWORK_POLICY",
 	16: "SET_MAINTENANCE_POLICY",
 }
+
 var Operation_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":         0,
 	"CREATE_CLUSTER":           1,
@@ -222,8 +229,9 @@ var Operation_Type_value = map[string]int32{
 func (x Operation_Type) String() string {
 	return proto.EnumName(Operation_Type_name, int32(x))
 }
+
 func (Operation_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{15, 1}
+	return fileDescriptor_1c7f18b1699f357a, []int{15, 1}
 }
 
 // Operation type: what type update to perform.
@@ -249,6 +257,7 @@ var SetMasterAuthRequest_Action_name = map[int32]string{
 	2: "GENERATE_PASSWORD",
 	3: "SET_USERNAME",
 }
+
 var SetMasterAuthRequest_Action_value = map[string]int32{
 	"UNKNOWN":           0,
 	"SET_PASSWORD":      1,
@@ -259,8 +268,9 @@ var SetMasterAuthRequest_Action_value = map[string]int32{
 func (x SetMasterAuthRequest_Action) String() string {
 	return proto.EnumName(SetMasterAuthRequest_Action_name, int32(x))
 }
+
 func (SetMasterAuthRequest_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{26, 0}
+	return fileDescriptor_1c7f18b1699f357a, []int{26, 0}
 }
 
 // The current status of the node pool instance.
@@ -299,6 +309,7 @@ var NodePool_Status_name = map[int32]string{
 	5: "STOPPING",
 	6: "ERROR",
 }
+
 var NodePool_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PROVISIONING":       1,
@@ -312,8 +323,9 @@ var NodePool_Status_value = map[string]int32{
 func (x NodePool_Status) String() string {
 	return proto.EnumName(NodePool_Status_name, int32(x))
 }
+
 func (NodePool_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{40, 0}
+	return fileDescriptor_1c7f18b1699f357a, []int{40, 0}
 }
 
 // Parameters that describe the nodes in a cluster.
@@ -425,16 +437,17 @@ func (m *NodeConfig) Reset()         { *m = NodeConfig{} }
 func (m *NodeConfig) String() string { return proto.CompactTextString(m) }
 func (*NodeConfig) ProtoMessage()    {}
 func (*NodeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{0}
+	return fileDescriptor_1c7f18b1699f357a, []int{0}
 }
+
 func (m *NodeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeConfig.Unmarshal(m, b)
 }
 func (m *NodeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeConfig.Marshal(b, m, deterministic)
 }
-func (dst *NodeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeConfig.Merge(dst, src)
+func (m *NodeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeConfig.Merge(m, src)
 }
 func (m *NodeConfig) XXX_Size() int {
 	return xxx_messageInfo_NodeConfig.Size(m)
@@ -571,16 +584,17 @@ func (m *MasterAuth) Reset()         { *m = MasterAuth{} }
 func (m *MasterAuth) String() string { return proto.CompactTextString(m) }
 func (*MasterAuth) ProtoMessage()    {}
 func (*MasterAuth) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{1}
+	return fileDescriptor_1c7f18b1699f357a, []int{1}
 }
+
 func (m *MasterAuth) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuth.Unmarshal(m, b)
 }
 func (m *MasterAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuth.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuth) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuth.Merge(dst, src)
+func (m *MasterAuth) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuth.Merge(m, src)
 }
 func (m *MasterAuth) XXX_Size() int {
 	return xxx_messageInfo_MasterAuth.Size(m)
@@ -646,16 +660,17 @@ func (m *ClientCertificateConfig) Reset()         { *m = ClientCertificateConfig
 func (m *ClientCertificateConfig) String() string { return proto.CompactTextString(m) }
 func (*ClientCertificateConfig) ProtoMessage()    {}
 func (*ClientCertificateConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{2}
+	return fileDescriptor_1c7f18b1699f357a, []int{2}
 }
+
 func (m *ClientCertificateConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientCertificateConfig.Unmarshal(m, b)
 }
 func (m *ClientCertificateConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientCertificateConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClientCertificateConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientCertificateConfig.Merge(dst, src)
+func (m *ClientCertificateConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientCertificateConfig.Merge(m, src)
 }
 func (m *ClientCertificateConfig) XXX_Size() int {
 	return xxx_messageInfo_ClientCertificateConfig.Size(m)
@@ -698,16 +713,17 @@ func (m *AddonsConfig) Reset()         { *m = AddonsConfig{} }
 func (m *AddonsConfig) String() string { return proto.CompactTextString(m) }
 func (*AddonsConfig) ProtoMessage()    {}
 func (*AddonsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{3}
+	return fileDescriptor_1c7f18b1699f357a, []int{3}
 }
+
 func (m *AddonsConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddonsConfig.Unmarshal(m, b)
 }
 func (m *AddonsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddonsConfig.Marshal(b, m, deterministic)
 }
-func (dst *AddonsConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddonsConfig.Merge(dst, src)
+func (m *AddonsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddonsConfig.Merge(m, src)
 }
 func (m *AddonsConfig) XXX_Size() int {
 	return xxx_messageInfo_AddonsConfig.Size(m)
@@ -762,16 +778,17 @@ func (m *HttpLoadBalancing) Reset()         { *m = HttpLoadBalancing{} }
 func (m *HttpLoadBalancing) String() string { return proto.CompactTextString(m) }
 func (*HttpLoadBalancing) ProtoMessage()    {}
 func (*HttpLoadBalancing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{4}
+	return fileDescriptor_1c7f18b1699f357a, []int{4}
 }
+
 func (m *HttpLoadBalancing) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpLoadBalancing.Unmarshal(m, b)
 }
 func (m *HttpLoadBalancing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpLoadBalancing.Marshal(b, m, deterministic)
 }
-func (dst *HttpLoadBalancing) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpLoadBalancing.Merge(dst, src)
+func (m *HttpLoadBalancing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpLoadBalancing.Merge(m, src)
 }
 func (m *HttpLoadBalancing) XXX_Size() int {
 	return xxx_messageInfo_HttpLoadBalancing.Size(m)
@@ -806,16 +823,17 @@ func (m *HorizontalPodAutoscaling) Reset()         { *m = HorizontalPodAutoscali
 func (m *HorizontalPodAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*HorizontalPodAutoscaling) ProtoMessage()    {}
 func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{5}
+	return fileDescriptor_1c7f18b1699f357a, []int{5}
 }
+
 func (m *HorizontalPodAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Unmarshal(m, b)
 }
 func (m *HorizontalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HorizontalPodAutoscaling.Merge(dst, src)
+func (m *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HorizontalPodAutoscaling.Merge(m, src)
 }
 func (m *HorizontalPodAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Size(m)
@@ -846,16 +864,17 @@ func (m *KubernetesDashboard) Reset()         { *m = KubernetesDashboard{} }
 func (m *KubernetesDashboard) String() string { return proto.CompactTextString(m) }
 func (*KubernetesDashboard) ProtoMessage()    {}
 func (*KubernetesDashboard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{6}
+	return fileDescriptor_1c7f18b1699f357a, []int{6}
 }
+
 func (m *KubernetesDashboard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KubernetesDashboard.Unmarshal(m, b)
 }
 func (m *KubernetesDashboard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KubernetesDashboard.Marshal(b, m, deterministic)
 }
-func (dst *KubernetesDashboard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KubernetesDashboard.Merge(dst, src)
+func (m *KubernetesDashboard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KubernetesDashboard.Merge(m, src)
 }
 func (m *KubernetesDashboard) XXX_Size() int {
 	return xxx_messageInfo_KubernetesDashboard.Size(m)
@@ -888,16 +907,17 @@ func (m *NetworkPolicyConfig) Reset()         { *m = NetworkPolicyConfig{} }
 func (m *NetworkPolicyConfig) String() string { return proto.CompactTextString(m) }
 func (*NetworkPolicyConfig) ProtoMessage()    {}
 func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{7}
+	return fileDescriptor_1c7f18b1699f357a, []int{7}
 }
+
 func (m *NetworkPolicyConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkPolicyConfig.Unmarshal(m, b)
 }
 func (m *NetworkPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkPolicyConfig.Marshal(b, m, deterministic)
 }
-func (dst *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkPolicyConfig.Merge(dst, src)
+func (m *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicyConfig.Merge(m, src)
 }
 func (m *NetworkPolicyConfig) XXX_Size() int {
 	return xxx_messageInfo_NetworkPolicyConfig.Size(m)
@@ -941,16 +961,17 @@ func (m *PrivateClusterConfig) Reset()         { *m = PrivateClusterConfig{} }
 func (m *PrivateClusterConfig) String() string { return proto.CompactTextString(m) }
 func (*PrivateClusterConfig) ProtoMessage()    {}
 func (*PrivateClusterConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{8}
+	return fileDescriptor_1c7f18b1699f357a, []int{8}
 }
+
 func (m *PrivateClusterConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivateClusterConfig.Unmarshal(m, b)
 }
 func (m *PrivateClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivateClusterConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivateClusterConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivateClusterConfig.Merge(dst, src)
+func (m *PrivateClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivateClusterConfig.Merge(m, src)
 }
 func (m *PrivateClusterConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivateClusterConfig.Size(m)
@@ -1015,16 +1036,17 @@ func (m *MasterAuthorizedNetworksConfig) Reset()         { *m = MasterAuthorized
 func (m *MasterAuthorizedNetworksConfig) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{9}
+	return fileDescriptor_1c7f18b1699f357a, []int{9}
 }
+
 func (m *MasterAuthorizedNetworksConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Unmarshal(m, b)
 }
 func (m *MasterAuthorizedNetworksConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(dst, src)
+func (m *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(m, src)
 }
 func (m *MasterAuthorizedNetworksConfig) XXX_Size() int {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Size(m)
@@ -1066,16 +1088,17 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig_CidrBlock) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig_CidrBlock) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{9, 0}
+	return fileDescriptor_1c7f18b1699f357a, []int{9, 0}
 }
+
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Unmarshal(m, b)
 }
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(dst, src)
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(m, src)
 }
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Size() int {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Size(m)
@@ -1117,16 +1140,17 @@ func (m *LegacyAbac) Reset()         { *m = LegacyAbac{} }
 func (m *LegacyAbac) String() string { return proto.CompactTextString(m) }
 func (*LegacyAbac) ProtoMessage()    {}
 func (*LegacyAbac) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{10}
+	return fileDescriptor_1c7f18b1699f357a, []int{10}
 }
+
 func (m *LegacyAbac) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LegacyAbac.Unmarshal(m, b)
 }
 func (m *LegacyAbac) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LegacyAbac.Marshal(b, m, deterministic)
 }
-func (dst *LegacyAbac) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LegacyAbac.Merge(dst, src)
+func (m *LegacyAbac) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LegacyAbac.Merge(m, src)
 }
 func (m *LegacyAbac) XXX_Size() int {
 	return xxx_messageInfo_LegacyAbac.Size(m)
@@ -1160,16 +1184,17 @@ func (m *NetworkPolicy) Reset()         { *m = NetworkPolicy{} }
 func (m *NetworkPolicy) String() string { return proto.CompactTextString(m) }
 func (*NetworkPolicy) ProtoMessage()    {}
 func (*NetworkPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{11}
+	return fileDescriptor_1c7f18b1699f357a, []int{11}
 }
+
 func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkPolicy.Unmarshal(m, b)
 }
 func (m *NetworkPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkPolicy.Marshal(b, m, deterministic)
 }
-func (dst *NetworkPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkPolicy.Merge(dst, src)
+func (m *NetworkPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicy.Merge(m, src)
 }
 func (m *NetworkPolicy) XXX_Size() int {
 	return xxx_messageInfo_NetworkPolicy.Size(m)
@@ -1284,16 +1309,17 @@ func (m *IPAllocationPolicy) Reset()         { *m = IPAllocationPolicy{} }
 func (m *IPAllocationPolicy) String() string { return proto.CompactTextString(m) }
 func (*IPAllocationPolicy) ProtoMessage()    {}
 func (*IPAllocationPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{12}
+	return fileDescriptor_1c7f18b1699f357a, []int{12}
 }
+
 func (m *IPAllocationPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IPAllocationPolicy.Unmarshal(m, b)
 }
 func (m *IPAllocationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IPAllocationPolicy.Marshal(b, m, deterministic)
 }
-func (dst *IPAllocationPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IPAllocationPolicy.Merge(dst, src)
+func (m *IPAllocationPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IPAllocationPolicy.Merge(m, src)
 }
 func (m *IPAllocationPolicy) XXX_Size() int {
 	return xxx_messageInfo_IPAllocationPolicy.Size(m)
@@ -1556,16 +1582,17 @@ func (m *Cluster) Reset()         { *m = Cluster{} }
 func (m *Cluster) String() string { return proto.CompactTextString(m) }
 func (*Cluster) ProtoMessage()    {}
 func (*Cluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{13}
+	return fileDescriptor_1c7f18b1699f357a, []int{13}
 }
+
 func (m *Cluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cluster.Unmarshal(m, b)
 }
 func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
 }
-func (dst *Cluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cluster.Merge(dst, src)
+func (m *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(m, src)
 }
 func (m *Cluster) XXX_Size() int {
 	return xxx_messageInfo_Cluster.Size(m)
@@ -1912,16 +1939,17 @@ func (m *ClusterUpdate) Reset()         { *m = ClusterUpdate{} }
 func (m *ClusterUpdate) String() string { return proto.CompactTextString(m) }
 func (*ClusterUpdate) ProtoMessage()    {}
 func (*ClusterUpdate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{14}
+	return fileDescriptor_1c7f18b1699f357a, []int{14}
 }
+
 func (m *ClusterUpdate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterUpdate.Unmarshal(m, b)
 }
 func (m *ClusterUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterUpdate.Marshal(b, m, deterministic)
 }
-func (dst *ClusterUpdate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterUpdate.Merge(dst, src)
+func (m *ClusterUpdate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterUpdate.Merge(m, src)
 }
 func (m *ClusterUpdate) XXX_Size() int {
 	return xxx_messageInfo_ClusterUpdate.Size(m)
@@ -2037,16 +2065,17 @@ func (m *Operation) Reset()         { *m = Operation{} }
 func (m *Operation) String() string { return proto.CompactTextString(m) }
 func (*Operation) ProtoMessage()    {}
 func (*Operation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{15}
+	return fileDescriptor_1c7f18b1699f357a, []int{15}
 }
+
 func (m *Operation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operation.Unmarshal(m, b)
 }
 func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
 }
-func (dst *Operation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operation.Merge(dst, src)
+func (m *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(m, src)
 }
 func (m *Operation) XXX_Size() int {
 	return xxx_messageInfo_Operation.Size(m)
@@ -2161,16 +2190,17 @@ func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
 func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterRequest) ProtoMessage()    {}
 func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{16}
+	return fileDescriptor_1c7f18b1699f357a, []int{16}
 }
+
 func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
 }
 func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+func (m *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(m, src)
 }
 func (m *CreateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterRequest.Size(m)
@@ -2237,16 +2267,17 @@ func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
 func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterRequest) ProtoMessage()    {}
 func (*GetClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{17}
+	return fileDescriptor_1c7f18b1699f357a, []int{17}
 }
+
 func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
 }
 func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+func (m *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(m, src)
 }
 func (m *GetClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClusterRequest.Size(m)
@@ -2316,16 +2347,17 @@ func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
 func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateClusterRequest) ProtoMessage()    {}
 func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{18}
+	return fileDescriptor_1c7f18b1699f357a, []int{18}
 }
+
 func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
 }
 func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+func (m *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(m, src)
 }
 func (m *UpdateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateClusterRequest.Size(m)
@@ -2418,16 +2450,17 @@ func (m *UpdateNodePoolRequest) Reset()         { *m = UpdateNodePoolRequest{} }
 func (m *UpdateNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateNodePoolRequest) ProtoMessage()    {}
 func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{19}
+	return fileDescriptor_1c7f18b1699f357a, []int{19}
 }
+
 func (m *UpdateNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateNodePoolRequest.Unmarshal(m, b)
 }
 func (m *UpdateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateNodePoolRequest.Merge(dst, src)
+func (m *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNodePoolRequest.Merge(m, src)
 }
 func (m *UpdateNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateNodePoolRequest.Size(m)
@@ -2523,16 +2556,17 @@ func (m *SetNodePoolAutoscalingRequest) Reset()         { *m = SetNodePoolAutosc
 func (m *SetNodePoolAutoscalingRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolAutoscalingRequest) ProtoMessage()    {}
 func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{20}
+	return fileDescriptor_1c7f18b1699f357a, []int{20}
 }
+
 func (m *SetNodePoolAutoscalingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolAutoscalingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(dst, src)
+func (m *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(m, src)
 }
 func (m *SetNodePoolAutoscalingRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Size(m)
@@ -2621,16 +2655,17 @@ func (m *SetLoggingServiceRequest) Reset()         { *m = SetLoggingServiceReque
 func (m *SetLoggingServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLoggingServiceRequest) ProtoMessage()    {}
 func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{21}
+	return fileDescriptor_1c7f18b1699f357a, []int{21}
 }
+
 func (m *SetLoggingServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLoggingServiceRequest.Unmarshal(m, b)
 }
 func (m *SetLoggingServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLoggingServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLoggingServiceRequest.Merge(dst, src)
+func (m *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLoggingServiceRequest.Merge(m, src)
 }
 func (m *SetLoggingServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLoggingServiceRequest.Size(m)
@@ -2710,16 +2745,17 @@ func (m *SetMonitoringServiceRequest) Reset()         { *m = SetMonitoringServic
 func (m *SetMonitoringServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMonitoringServiceRequest) ProtoMessage()    {}
 func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{22}
+	return fileDescriptor_1c7f18b1699f357a, []int{22}
 }
+
 func (m *SetMonitoringServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Unmarshal(m, b)
 }
 func (m *SetMonitoringServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMonitoringServiceRequest.Merge(dst, src)
+func (m *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMonitoringServiceRequest.Merge(m, src)
 }
 func (m *SetMonitoringServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Size(m)
@@ -2797,16 +2833,17 @@ func (m *SetAddonsConfigRequest) Reset()         { *m = SetAddonsConfigRequest{}
 func (m *SetAddonsConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*SetAddonsConfigRequest) ProtoMessage()    {}
 func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{23}
+	return fileDescriptor_1c7f18b1699f357a, []int{23}
 }
+
 func (m *SetAddonsConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetAddonsConfigRequest.Unmarshal(m, b)
 }
 func (m *SetAddonsConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetAddonsConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetAddonsConfigRequest.Merge(dst, src)
+func (m *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetAddonsConfigRequest.Merge(m, src)
 }
 func (m *SetAddonsConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_SetAddonsConfigRequest.Size(m)
@@ -2889,16 +2926,17 @@ func (m *SetLocationsRequest) Reset()         { *m = SetLocationsRequest{} }
 func (m *SetLocationsRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLocationsRequest) ProtoMessage()    {}
 func (*SetLocationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{24}
+	return fileDescriptor_1c7f18b1699f357a, []int{24}
 }
+
 func (m *SetLocationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLocationsRequest.Unmarshal(m, b)
 }
 func (m *SetLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLocationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLocationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLocationsRequest.Merge(dst, src)
+func (m *SetLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLocationsRequest.Merge(m, src)
 }
 func (m *SetLocationsRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLocationsRequest.Size(m)
@@ -2984,16 +3022,17 @@ func (m *UpdateMasterRequest) Reset()         { *m = UpdateMasterRequest{} }
 func (m *UpdateMasterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateMasterRequest) ProtoMessage()    {}
 func (*UpdateMasterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{25}
+	return fileDescriptor_1c7f18b1699f357a, []int{25}
 }
+
 func (m *UpdateMasterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateMasterRequest.Unmarshal(m, b)
 }
 func (m *UpdateMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateMasterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateMasterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateMasterRequest.Merge(dst, src)
+func (m *UpdateMasterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateMasterRequest.Merge(m, src)
 }
 func (m *UpdateMasterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateMasterRequest.Size(m)
@@ -3072,16 +3111,17 @@ func (m *SetMasterAuthRequest) Reset()         { *m = SetMasterAuthRequest{} }
 func (m *SetMasterAuthRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMasterAuthRequest) ProtoMessage()    {}
 func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{26}
+	return fileDescriptor_1c7f18b1699f357a, []int{26}
 }
+
 func (m *SetMasterAuthRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMasterAuthRequest.Unmarshal(m, b)
 }
 func (m *SetMasterAuthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMasterAuthRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMasterAuthRequest.Merge(dst, src)
+func (m *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMasterAuthRequest.Merge(m, src)
 }
 func (m *SetMasterAuthRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMasterAuthRequest.Size(m)
@@ -3163,16 +3203,17 @@ func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
 func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteClusterRequest) ProtoMessage()    {}
 func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{27}
+	return fileDescriptor_1c7f18b1699f357a, []int{27}
 }
+
 func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+func (m *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(m, src)
 }
 func (m *DeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteClusterRequest.Size(m)
@@ -3238,16 +3279,17 @@ func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
 func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListClustersRequest) ProtoMessage()    {}
 func (*ListClustersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{28}
+	return fileDescriptor_1c7f18b1699f357a, []int{28}
 }
+
 func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
 }
 func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+func (m *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(m, src)
 }
 func (m *ListClustersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListClustersRequest.Size(m)
@@ -3298,16 +3340,17 @@ func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
 func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListClustersResponse) ProtoMessage()    {}
 func (*ListClustersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{29}
+	return fileDescriptor_1c7f18b1699f357a, []int{29}
 }
+
 func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
 }
 func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+func (m *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(m, src)
 }
 func (m *ListClustersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListClustersResponse.Size(m)
@@ -3358,16 +3401,17 @@ func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
 func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOperationRequest) ProtoMessage()    {}
 func (*GetOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{30}
+	return fileDescriptor_1c7f18b1699f357a, []int{30}
 }
+
 func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
 }
 func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+func (m *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(m, src)
 }
 func (m *GetOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOperationRequest.Size(m)
@@ -3432,16 +3476,17 @@ func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
 func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsRequest) ProtoMessage()    {}
 func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{31}
+	return fileDescriptor_1c7f18b1699f357a, []int{31}
 }
+
 func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
 }
 func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+func (m *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(m, src)
 }
 func (m *ListOperationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsRequest.Size(m)
@@ -3500,16 +3545,17 @@ func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{}
 func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelOperationRequest) ProtoMessage()    {}
 func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{32}
+	return fileDescriptor_1c7f18b1699f357a, []int{32}
 }
+
 func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
 }
 func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+func (m *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(m, src)
 }
 func (m *CancelOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelOperationRequest.Size(m)
@@ -3567,16 +3613,17 @@ func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{}
 func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsResponse) ProtoMessage()    {}
 func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{33}
+	return fileDescriptor_1c7f18b1699f357a, []int{33}
 }
+
 func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
 }
 func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+func (m *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(m, src)
 }
 func (m *ListOperationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsResponse.Size(m)
@@ -3623,16 +3670,17 @@ func (m *GetServerConfigRequest) Reset()         { *m = GetServerConfigRequest{}
 func (m *GetServerConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServerConfigRequest) ProtoMessage()    {}
 func (*GetServerConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{34}
+	return fileDescriptor_1c7f18b1699f357a, []int{34}
 }
+
 func (m *GetServerConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServerConfigRequest.Unmarshal(m, b)
 }
 func (m *GetServerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServerConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServerConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServerConfigRequest.Merge(dst, src)
+func (m *GetServerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerConfigRequest.Merge(m, src)
 }
 func (m *GetServerConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServerConfigRequest.Size(m)
@@ -3687,16 +3735,17 @@ func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
 func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
 func (*ServerConfig) ProtoMessage()    {}
 func (*ServerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{35}
+	return fileDescriptor_1c7f18b1699f357a, []int{35}
 }
+
 func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
 }
 func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ServerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerConfig.Merge(dst, src)
+func (m *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(m, src)
 }
 func (m *ServerConfig) XXX_Size() int {
 	return xxx_messageInfo_ServerConfig.Size(m)
@@ -3771,16 +3820,17 @@ func (m *CreateNodePoolRequest) Reset()         { *m = CreateNodePoolRequest{} }
 func (m *CreateNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateNodePoolRequest) ProtoMessage()    {}
 func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{36}
+	return fileDescriptor_1c7f18b1699f357a, []int{36}
 }
+
 func (m *CreateNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateNodePoolRequest.Unmarshal(m, b)
 }
 func (m *CreateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateNodePoolRequest.Merge(dst, src)
+func (m *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNodePoolRequest.Merge(m, src)
 }
 func (m *CreateNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateNodePoolRequest.Size(m)
@@ -3859,16 +3909,17 @@ func (m *DeleteNodePoolRequest) Reset()         { *m = DeleteNodePoolRequest{} }
 func (m *DeleteNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteNodePoolRequest) ProtoMessage()    {}
 func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{37}
+	return fileDescriptor_1c7f18b1699f357a, []int{37}
 }
+
 func (m *DeleteNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteNodePoolRequest.Unmarshal(m, b)
 }
 func (m *DeleteNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteNodePoolRequest.Merge(dst, src)
+func (m *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNodePoolRequest.Merge(m, src)
 }
 func (m *DeleteNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteNodePoolRequest.Size(m)
@@ -3944,16 +3995,17 @@ func (m *ListNodePoolsRequest) Reset()         { *m = ListNodePoolsRequest{} }
 func (m *ListNodePoolsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNodePoolsRequest) ProtoMessage()    {}
 func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{38}
+	return fileDescriptor_1c7f18b1699f357a, []int{38}
 }
+
 func (m *ListNodePoolsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNodePoolsRequest.Unmarshal(m, b)
 }
 func (m *ListNodePoolsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNodePoolsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNodePoolsRequest.Merge(dst, src)
+func (m *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsRequest.Merge(m, src)
 }
 func (m *ListNodePoolsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNodePoolsRequest.Size(m)
@@ -4025,16 +4077,17 @@ func (m *GetNodePoolRequest) Reset()         { *m = GetNodePoolRequest{} }
 func (m *GetNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*GetNodePoolRequest) ProtoMessage()    {}
 func (*GetNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{39}
+	return fileDescriptor_1c7f18b1699f357a, []int{39}
 }
+
 func (m *GetNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNodePoolRequest.Unmarshal(m, b)
 }
 func (m *GetNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNodePoolRequest.Merge(dst, src)
+func (m *GetNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNodePoolRequest.Merge(m, src)
 }
 func (m *GetNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNodePoolRequest.Size(m)
@@ -4127,16 +4180,17 @@ func (m *NodePool) Reset()         { *m = NodePool{} }
 func (m *NodePool) String() string { return proto.CompactTextString(m) }
 func (*NodePool) ProtoMessage()    {}
 func (*NodePool) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{40}
+	return fileDescriptor_1c7f18b1699f357a, []int{40}
 }
+
 func (m *NodePool) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodePool.Unmarshal(m, b)
 }
 func (m *NodePool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodePool.Marshal(b, m, deterministic)
 }
-func (dst *NodePool) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodePool.Merge(dst, src)
+func (m *NodePool) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePool.Merge(m, src)
 }
 func (m *NodePool) XXX_Size() int {
 	return xxx_messageInfo_NodePool.Size(m)
@@ -4240,16 +4294,17 @@ func (m *NodeManagement) Reset()         { *m = NodeManagement{} }
 func (m *NodeManagement) String() string { return proto.CompactTextString(m) }
 func (*NodeManagement) ProtoMessage()    {}
 func (*NodeManagement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{41}
+	return fileDescriptor_1c7f18b1699f357a, []int{41}
 }
+
 func (m *NodeManagement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeManagement.Unmarshal(m, b)
 }
 func (m *NodeManagement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeManagement.Marshal(b, m, deterministic)
 }
-func (dst *NodeManagement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeManagement.Merge(dst, src)
+func (m *NodeManagement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeManagement.Merge(m, src)
 }
 func (m *NodeManagement) XXX_Size() int {
 	return xxx_messageInfo_NodeManagement.Size(m)
@@ -4300,16 +4355,17 @@ func (m *AutoUpgradeOptions) Reset()         { *m = AutoUpgradeOptions{} }
 func (m *AutoUpgradeOptions) String() string { return proto.CompactTextString(m) }
 func (*AutoUpgradeOptions) ProtoMessage()    {}
 func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{42}
+	return fileDescriptor_1c7f18b1699f357a, []int{42}
 }
+
 func (m *AutoUpgradeOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AutoUpgradeOptions.Unmarshal(m, b)
 }
 func (m *AutoUpgradeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AutoUpgradeOptions.Marshal(b, m, deterministic)
 }
-func (dst *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AutoUpgradeOptions.Merge(dst, src)
+func (m *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutoUpgradeOptions.Merge(m, src)
 }
 func (m *AutoUpgradeOptions) XXX_Size() int {
 	return xxx_messageInfo_AutoUpgradeOptions.Size(m)
@@ -4347,16 +4403,17 @@ func (m *MaintenancePolicy) Reset()         { *m = MaintenancePolicy{} }
 func (m *MaintenancePolicy) String() string { return proto.CompactTextString(m) }
 func (*MaintenancePolicy) ProtoMessage()    {}
 func (*MaintenancePolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{43}
+	return fileDescriptor_1c7f18b1699f357a, []int{43}
 }
+
 func (m *MaintenancePolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaintenancePolicy.Unmarshal(m, b)
 }
 func (m *MaintenancePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaintenancePolicy.Marshal(b, m, deterministic)
 }
-func (dst *MaintenancePolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaintenancePolicy.Merge(dst, src)
+func (m *MaintenancePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenancePolicy.Merge(m, src)
 }
 func (m *MaintenancePolicy) XXX_Size() int {
 	return xxx_messageInfo_MaintenancePolicy.Size(m)
@@ -4388,16 +4445,17 @@ func (m *MaintenanceWindow) Reset()         { *m = MaintenanceWindow{} }
 func (m *MaintenanceWindow) String() string { return proto.CompactTextString(m) }
 func (*MaintenanceWindow) ProtoMessage()    {}
 func (*MaintenanceWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{44}
+	return fileDescriptor_1c7f18b1699f357a, []int{44}
 }
+
 func (m *MaintenanceWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaintenanceWindow.Unmarshal(m, b)
 }
 func (m *MaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaintenanceWindow.Marshal(b, m, deterministic)
 }
-func (dst *MaintenanceWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaintenanceWindow.Merge(dst, src)
+func (m *MaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenanceWindow.Merge(m, src)
 }
 func (m *MaintenanceWindow) XXX_Size() int {
 	return xxx_messageInfo_MaintenanceWindow.Size(m)
@@ -4432,61 +4490,13 @@ func (m *MaintenanceWindow) GetDailyMaintenanceWindow() *DailyMaintenanceWindow
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MaintenanceWindow) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MaintenanceWindow_OneofMarshaler, _MaintenanceWindow_OneofUnmarshaler, _MaintenanceWindow_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MaintenanceWindow) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MaintenanceWindow_DailyMaintenanceWindow)(nil),
 	}
 }
 
-func _MaintenanceWindow_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MaintenanceWindow)
-	// policy
-	switch x := m.Policy.(type) {
-	case *MaintenanceWindow_DailyMaintenanceWindow:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DailyMaintenanceWindow); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MaintenanceWindow.Policy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MaintenanceWindow_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MaintenanceWindow)
-	switch tag {
-	case 2: // policy.daily_maintenance_window
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DailyMaintenanceWindow)
-		err := b.DecodeMessage(msg)
-		m.Policy = &MaintenanceWindow_DailyMaintenanceWindow{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MaintenanceWindow)
-	// policy
-	switch x := m.Policy.(type) {
-	case *MaintenanceWindow_DailyMaintenanceWindow:
-		s := proto.Size(x.DailyMaintenanceWindow)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Time window specified for daily maintenance operations.
 type DailyMaintenanceWindow struct {
 	// Time within the maintenance window to start the maintenance operations.
@@ -4507,16 +4517,17 @@ func (m *DailyMaintenanceWindow) Reset()         { *m = DailyMaintenanceWindow{}
 func (m *DailyMaintenanceWindow) String() string { return proto.CompactTextString(m) }
 func (*DailyMaintenanceWindow) ProtoMessage()    {}
 func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{45}
+	return fileDescriptor_1c7f18b1699f357a, []int{45}
 }
+
 func (m *DailyMaintenanceWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DailyMaintenanceWindow.Unmarshal(m, b)
 }
 func (m *DailyMaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DailyMaintenanceWindow.Marshal(b, m, deterministic)
 }
-func (dst *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DailyMaintenanceWindow.Merge(dst, src)
+func (m *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DailyMaintenanceWindow.Merge(m, src)
 }
 func (m *DailyMaintenanceWindow) XXX_Size() int {
 	return xxx_messageInfo_DailyMaintenanceWindow.Size(m)
@@ -4574,16 +4585,17 @@ func (m *SetNodePoolManagementRequest) Reset()         { *m = SetNodePoolManagem
 func (m *SetNodePoolManagementRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolManagementRequest) ProtoMessage()    {}
 func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{46}
+	return fileDescriptor_1c7f18b1699f357a, []int{46}
 }
+
 func (m *SetNodePoolManagementRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolManagementRequest.Merge(dst, src)
+func (m *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolManagementRequest.Merge(m, src)
 }
 func (m *SetNodePoolManagementRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Size(m)
@@ -4673,16 +4685,17 @@ func (m *SetNodePoolSizeRequest) Reset()         { *m = SetNodePoolSizeRequest{}
 func (m *SetNodePoolSizeRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolSizeRequest) ProtoMessage()    {}
 func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{47}
+	return fileDescriptor_1c7f18b1699f357a, []int{47}
 }
+
 func (m *SetNodePoolSizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolSizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolSizeRequest.Merge(dst, src)
+func (m *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolSizeRequest.Merge(m, src)
 }
 func (m *SetNodePoolSizeRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Size(m)
@@ -4771,16 +4784,17 @@ func (m *RollbackNodePoolUpgradeRequest) Reset()         { *m = RollbackNodePool
 func (m *RollbackNodePoolUpgradeRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackNodePoolUpgradeRequest) ProtoMessage()    {}
 func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{48}
+	return fileDescriptor_1c7f18b1699f357a, []int{48}
 }
+
 func (m *RollbackNodePoolUpgradeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Unmarshal(m, b)
 }
 func (m *RollbackNodePoolUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(dst, src)
+func (m *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(m, src)
 }
 func (m *RollbackNodePoolUpgradeRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Size(m)
@@ -4843,16 +4857,17 @@ func (m *ListNodePoolsResponse) Reset()         { *m = ListNodePoolsResponse{} }
 func (m *ListNodePoolsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNodePoolsResponse) ProtoMessage()    {}
 func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{49}
+	return fileDescriptor_1c7f18b1699f357a, []int{49}
 }
+
 func (m *ListNodePoolsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNodePoolsResponse.Unmarshal(m, b)
 }
 func (m *ListNodePoolsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNodePoolsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNodePoolsResponse.Merge(dst, src)
+func (m *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsResponse.Merge(m, src)
 }
 func (m *ListNodePoolsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNodePoolsResponse.Size(m)
@@ -4890,16 +4905,17 @@ func (m *NodePoolAutoscaling) Reset()         { *m = NodePoolAutoscaling{} }
 func (m *NodePoolAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*NodePoolAutoscaling) ProtoMessage()    {}
 func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{50}
+	return fileDescriptor_1c7f18b1699f357a, []int{50}
 }
+
 func (m *NodePoolAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodePoolAutoscaling.Unmarshal(m, b)
 }
 func (m *NodePoolAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodePoolAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodePoolAutoscaling.Merge(dst, src)
+func (m *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePoolAutoscaling.Merge(m, src)
 }
 func (m *NodePoolAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_NodePoolAutoscaling.Size(m)
@@ -4968,16 +4984,17 @@ func (m *SetLabelsRequest) Reset()         { *m = SetLabelsRequest{} }
 func (m *SetLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLabelsRequest) ProtoMessage()    {}
 func (*SetLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{51}
+	return fileDescriptor_1c7f18b1699f357a, []int{51}
 }
+
 func (m *SetLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLabelsRequest.Unmarshal(m, b)
 }
 func (m *SetLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLabelsRequest.Merge(dst, src)
+func (m *SetLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLabelsRequest.Merge(m, src)
 }
 func (m *SetLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLabelsRequest.Size(m)
@@ -5062,16 +5079,17 @@ func (m *SetLegacyAbacRequest) Reset()         { *m = SetLegacyAbacRequest{} }
 func (m *SetLegacyAbacRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLegacyAbacRequest) ProtoMessage()    {}
 func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{52}
+	return fileDescriptor_1c7f18b1699f357a, []int{52}
 }
+
 func (m *SetLegacyAbacRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLegacyAbacRequest.Unmarshal(m, b)
 }
 func (m *SetLegacyAbacRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLegacyAbacRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLegacyAbacRequest.Merge(dst, src)
+func (m *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLegacyAbacRequest.Merge(m, src)
 }
 func (m *SetLegacyAbacRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLegacyAbacRequest.Size(m)
@@ -5149,16 +5167,17 @@ func (m *StartIPRotationRequest) Reset()         { *m = StartIPRotationRequest{}
 func (m *StartIPRotationRequest) String() string { return proto.CompactTextString(m) }
 func (*StartIPRotationRequest) ProtoMessage()    {}
 func (*StartIPRotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{53}
+	return fileDescriptor_1c7f18b1699f357a, []int{53}
 }
+
 func (m *StartIPRotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StartIPRotationRequest.Unmarshal(m, b)
 }
 func (m *StartIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StartIPRotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *StartIPRotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StartIPRotationRequest.Merge(dst, src)
+func (m *StartIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartIPRotationRequest.Merge(m, src)
 }
 func (m *StartIPRotationRequest) XXX_Size() int {
 	return xxx_messageInfo_StartIPRotationRequest.Size(m)
@@ -5233,16 +5252,17 @@ func (m *CompleteIPRotationRequest) Reset()         { *m = CompleteIPRotationReq
 func (m *CompleteIPRotationRequest) String() string { return proto.CompactTextString(m) }
 func (*CompleteIPRotationRequest) ProtoMessage()    {}
 func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{54}
+	return fileDescriptor_1c7f18b1699f357a, []int{54}
 }
+
 func (m *CompleteIPRotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompleteIPRotationRequest.Unmarshal(m, b)
 }
 func (m *CompleteIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompleteIPRotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompleteIPRotationRequest.Merge(dst, src)
+func (m *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteIPRotationRequest.Merge(m, src)
 }
 func (m *CompleteIPRotationRequest) XXX_Size() int {
 	return xxx_messageInfo_CompleteIPRotationRequest.Size(m)
@@ -5300,16 +5320,17 @@ func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
 func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
 func (*AcceleratorConfig) ProtoMessage()    {}
 func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{55}
+	return fileDescriptor_1c7f18b1699f357a, []int{55}
 }
+
 func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
 }
 func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
 }
-func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+func (m *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(m, src)
 }
 func (m *AcceleratorConfig) XXX_Size() int {
 	return xxx_messageInfo_AcceleratorConfig.Size(m)
@@ -5362,16 +5383,17 @@ func (m *SetNetworkPolicyRequest) Reset()         { *m = SetNetworkPolicyRequest
 func (m *SetNetworkPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNetworkPolicyRequest) ProtoMessage()    {}
 func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{56}
+	return fileDescriptor_1c7f18b1699f357a, []int{56}
 }
+
 func (m *SetNetworkPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Unmarshal(m, b)
 }
 func (m *SetNetworkPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNetworkPolicyRequest.Merge(dst, src)
+func (m *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNetworkPolicyRequest.Merge(m, src)
 }
 func (m *SetNetworkPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Size(m)
@@ -5447,16 +5469,17 @@ func (m *SetMaintenancePolicyRequest) Reset()         { *m = SetMaintenancePolic
 func (m *SetMaintenancePolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMaintenancePolicyRequest) ProtoMessage()    {}
 func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{57}
+	return fileDescriptor_1c7f18b1699f357a, []int{57}
 }
+
 func (m *SetMaintenancePolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Unmarshal(m, b)
 }
 func (m *SetMaintenancePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(dst, src)
+func (m *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(m, src)
 }
 func (m *SetMaintenancePolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Size(m)
@@ -5522,16 +5545,17 @@ func (m *NetworkConfig) Reset()         { *m = NetworkConfig{} }
 func (m *NetworkConfig) String() string { return proto.CompactTextString(m) }
 func (*NetworkConfig) ProtoMessage()    {}
 func (*NetworkConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_0391086e6c7dadfe, []int{58}
+	return fileDescriptor_1c7f18b1699f357a, []int{58}
 }
+
 func (m *NetworkConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkConfig.Unmarshal(m, b)
 }
 func (m *NetworkConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkConfig.Marshal(b, m, deterministic)
 }
-func (dst *NetworkConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkConfig.Merge(dst, src)
+func (m *NetworkConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkConfig.Merge(m, src)
 }
 func (m *NetworkConfig) XXX_Size() int {
 	return xxx_messageInfo_NetworkConfig.Size(m)
@@ -5557,6 +5581,12 @@ func (m *NetworkConfig) GetSubnetwork() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.container.v1.NetworkPolicy_Provider", NetworkPolicy_Provider_name, NetworkPolicy_Provider_value)
+	proto.RegisterEnum("google.container.v1.Cluster_Status", Cluster_Status_name, Cluster_Status_value)
+	proto.RegisterEnum("google.container.v1.Operation_Status", Operation_Status_name, Operation_Status_value)
+	proto.RegisterEnum("google.container.v1.Operation_Type", Operation_Type_name, Operation_Type_value)
+	proto.RegisterEnum("google.container.v1.SetMasterAuthRequest_Action", SetMasterAuthRequest_Action_name, SetMasterAuthRequest_Action_value)
+	proto.RegisterEnum("google.container.v1.NodePool_Status", NodePool_Status_name, NodePool_Status_value)
 	proto.RegisterType((*NodeConfig)(nil), "google.container.v1.NodeConfig")
 	proto.RegisterMapType((map[string]string)(nil), "google.container.v1.NodeConfig.LabelsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.container.v1.NodeConfig.MetadataEntry")
@@ -5621,1156 +5651,13 @@ func init() {
 	proto.RegisterType((*SetNetworkPolicyRequest)(nil), "google.container.v1.SetNetworkPolicyRequest")
 	proto.RegisterType((*SetMaintenancePolicyRequest)(nil), "google.container.v1.SetMaintenancePolicyRequest")
 	proto.RegisterType((*NetworkConfig)(nil), "google.container.v1.NetworkConfig")
-	proto.RegisterEnum("google.container.v1.NetworkPolicy_Provider", NetworkPolicy_Provider_name, NetworkPolicy_Provider_value)
-	proto.RegisterEnum("google.container.v1.Cluster_Status", Cluster_Status_name, Cluster_Status_value)
-	proto.RegisterEnum("google.container.v1.Operation_Status", Operation_Status_name, Operation_Status_value)
-	proto.RegisterEnum("google.container.v1.Operation_Type", Operation_Type_name, Operation_Type_value)
-	proto.RegisterEnum("google.container.v1.SetMasterAuthRequest_Action", SetMasterAuthRequest_Action_name, SetMasterAuthRequest_Action_value)
-	proto.RegisterEnum("google.container.v1.NodePool_Status", NodePool_Status_name, NodePool_Status_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ClusterManagerClient is the client API for ClusterManager service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ClusterManagerClient interface {
-	// Lists all clusters owned by a project in either the specified zone or all
-	// zones.
-	ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error)
-	// Gets the details of a specific cluster.
-	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
-	// Creates a cluster, consisting of the specified number and type of Google
-	// Compute Engine instances.
-	//
-	// By default, the cluster is created in the project's
-	// [default network](/compute/docs/networks-and-firewalls#networks).
-	//
-	// One firewall is added for the cluster. After cluster creation,
-	// the cluster creates routes for each node to allow the containers
-	// on that node to communicate with all other instances in the
-	// cluster.
-	//
-	// Finally, an entry is added to the project's global metadata indicating
-	// which CIDR range is being used by the cluster.
-	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the settings of a specific cluster.
-	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the version and/or image type for a specific node pool.
-	UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the autoscaling settings for a specific node pool.
-	SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the logging service for a specific cluster.
-	SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the monitoring service for a specific cluster.
-	SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the addons for a specific cluster.
-	SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the locations for a specific cluster.
-	SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the master for a specific cluster.
-	UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Used to set master auth materials. Currently supports :-
-	// Changing the admin password for a specific cluster.
-	// This can be either via password generation or explicitly set the password.
-	SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Deletes the cluster, including the Kubernetes endpoint and all worker
-	// nodes.
-	//
-	// Firewalls and routes that were configured during cluster creation
-	// are also deleted.
-	//
-	// Other Google Compute Engine resources that might be in use by the cluster
-	// (e.g. load balancer resources) will not be deleted if they weren't present
-	// at the initial create time.
-	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Lists all operations in a project in a specific zone or all zones.
-	ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error)
-	// Gets the specified operation.
-	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Cancels the specified operation.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Returns configuration info about the Kubernetes Engine service.
-	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
-	// Lists the node pools for a cluster.
-	ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error)
-	// Retrieves the node pool requested.
-	GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error)
-	// Creates a node pool for a cluster.
-	CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Deletes a node pool from a cluster.
-	DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Roll back the previously Aborted or Failed NodePool upgrade.
-	// This will be an no-op if the last upgrade successfully completed.
-	RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the NodeManagement options for a node pool.
-	SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets labels on a cluster.
-	SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Enables or disables the ABAC authorization mechanism on a cluster.
-	SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Start master IP rotation.
-	StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Completes master IP rotation.
-	CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the size for a specific node pool.
-	SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Enables/Disables Network Policy for a cluster.
-	SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the maintenance policy for a cluster.
-	SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error)
-}
-
-type clusterManagerClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
-	return &clusterManagerClient{cc}
-}
-
-func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
-	out := new(ListClustersResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListClusters", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
-	out := new(Cluster)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
 }
 
-func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
+func init() {
+	proto.RegisterFile("google/container/v1/cluster_service.proto", fileDescriptor_1c7f18b1699f357a)
 }
 
-func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLoggingService", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMonitoringService", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetAddonsConfig", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLocations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateMaster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMasterAuth", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
-	out := new(ListOperationsResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListOperations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetOperation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CancelOperation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
-	out := new(ServerConfig)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetServerConfig", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
-	out := new(ListNodePoolsResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListNodePools", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
-	out := new(NodePool)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolManagement", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLabels", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLegacyAbac", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/StartIPRotation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CompleteIPRotation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolSize", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNetworkPolicy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ClusterManagerServer is the server API for ClusterManager service.
-type ClusterManagerServer interface {
-	// Lists all clusters owned by a project in either the specified zone or all
-	// zones.
-	ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error)
-	// Gets the details of a specific cluster.
-	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
-	// Creates a cluster, consisting of the specified number and type of Google
-	// Compute Engine instances.
-	//
-	// By default, the cluster is created in the project's
-	// [default network](/compute/docs/networks-and-firewalls#networks).
-	//
-	// One firewall is added for the cluster. After cluster creation,
-	// the cluster creates routes for each node to allow the containers
-	// on that node to communicate with all other instances in the
-	// cluster.
-	//
-	// Finally, an entry is added to the project's global metadata indicating
-	// which CIDR range is being used by the cluster.
-	CreateCluster(context.Context, *CreateClusterRequest) (*Operation, error)
-	// Updates the settings of a specific cluster.
-	UpdateCluster(context.Context, *UpdateClusterRequest) (*Operation, error)
-	// Updates the version and/or image type for a specific node pool.
-	UpdateNodePool(context.Context, *UpdateNodePoolRequest) (*Operation, error)
-	// Sets the autoscaling settings for a specific node pool.
-	SetNodePoolAutoscaling(context.Context, *SetNodePoolAutoscalingRequest) (*Operation, error)
-	// Sets the logging service for a specific cluster.
-	SetLoggingService(context.Context, *SetLoggingServiceRequest) (*Operation, error)
-	// Sets the monitoring service for a specific cluster.
-	SetMonitoringService(context.Context, *SetMonitoringServiceRequest) (*Operation, error)
-	// Sets the addons for a specific cluster.
-	SetAddonsConfig(context.Context, *SetAddonsConfigRequest) (*Operation, error)
-	// Sets the locations for a specific cluster.
-	SetLocations(context.Context, *SetLocationsRequest) (*Operation, error)
-	// Updates the master for a specific cluster.
-	UpdateMaster(context.Context, *UpdateMasterRequest) (*Operation, error)
-	// Used to set master auth materials. Currently supports :-
-	// Changing the admin password for a specific cluster.
-	// This can be either via password generation or explicitly set the password.
-	SetMasterAuth(context.Context, *SetMasterAuthRequest) (*Operation, error)
-	// Deletes the cluster, including the Kubernetes endpoint and all worker
-	// nodes.
-	//
-	// Firewalls and routes that were configured during cluster creation
-	// are also deleted.
-	//
-	// Other Google Compute Engine resources that might be in use by the cluster
-	// (e.g. load balancer resources) will not be deleted if they weren't present
-	// at the initial create time.
-	DeleteCluster(context.Context, *DeleteClusterRequest) (*Operation, error)
-	// Lists all operations in a project in a specific zone or all zones.
-	ListOperations(context.Context, *ListOperationsRequest) (*ListOperationsResponse, error)
-	// Gets the specified operation.
-	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
-	// Cancels the specified operation.
-	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
-	// Returns configuration info about the Kubernetes Engine service.
-	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
-	// Lists the node pools for a cluster.
-	ListNodePools(context.Context, *ListNodePoolsRequest) (*ListNodePoolsResponse, error)
-	// Retrieves the node pool requested.
-	GetNodePool(context.Context, *GetNodePoolRequest) (*NodePool, error)
-	// Creates a node pool for a cluster.
-	CreateNodePool(context.Context, *CreateNodePoolRequest) (*Operation, error)
-	// Deletes a node pool from a cluster.
-	DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error)
-	// Roll back the previously Aborted or Failed NodePool upgrade.
-	// This will be an no-op if the last upgrade successfully completed.
-	RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error)
-	// Sets the NodeManagement options for a node pool.
-	SetNodePoolManagement(context.Context, *SetNodePoolManagementRequest) (*Operation, error)
-	// Sets labels on a cluster.
-	SetLabels(context.Context, *SetLabelsRequest) (*Operation, error)
-	// Enables or disables the ABAC authorization mechanism on a cluster.
-	SetLegacyAbac(context.Context, *SetLegacyAbacRequest) (*Operation, error)
-	// Start master IP rotation.
-	StartIPRotation(context.Context, *StartIPRotationRequest) (*Operation, error)
-	// Completes master IP rotation.
-	CompleteIPRotation(context.Context, *CompleteIPRotationRequest) (*Operation, error)
-	// Sets the size for a specific node pool.
-	SetNodePoolSize(context.Context, *SetNodePoolSizeRequest) (*Operation, error)
-	// Enables/Disables Network Policy for a cluster.
-	SetNetworkPolicy(context.Context, *SetNetworkPolicyRequest) (*Operation, error)
-	// Sets the maintenance policy for a cluster.
-	SetMaintenancePolicy(context.Context, *SetMaintenancePolicyRequest) (*Operation, error)
-}
-
-func RegisterClusterManagerServer(s *grpc.Server, srv ClusterManagerServer) {
-	s.RegisterService(&_ClusterManager_serviceDesc, srv)
-}
-
-func _ClusterManager_ListClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListClustersRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListClusters(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/ListClusters",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListClusters(ctx, req.(*ListClustersRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/GetCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetCluster(ctx, req.(*GetClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CreateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CreateCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/CreateCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CreateCluster(ctx, req.(*CreateClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/UpdateCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateCluster(ctx, req.(*UpdateClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/UpdateNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateNodePool(ctx, req.(*UpdateNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolAutoscaling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolAutoscalingRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetNodePoolAutoscaling",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, req.(*SetNodePoolAutoscalingRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLoggingService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLoggingServiceRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLoggingService(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetLoggingService",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLoggingService(ctx, req.(*SetLoggingServiceRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMonitoringService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMonitoringServiceRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMonitoringService(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetMonitoringService",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMonitoringService(ctx, req.(*SetMonitoringServiceRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetAddonsConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetAddonsConfigRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetAddonsConfig",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, req.(*SetAddonsConfigRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLocationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLocations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetLocations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLocations(ctx, req.(*SetLocationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateMaster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateMasterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateMaster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/UpdateMaster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateMaster(ctx, req.(*UpdateMasterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMasterAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMasterAuthRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMasterAuth(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetMasterAuth",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMasterAuth(ctx, req.(*SetMasterAuthRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_DeleteCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).DeleteCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/DeleteCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).DeleteCluster(ctx, req.(*DeleteClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListOperations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListOperationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListOperations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/ListOperations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListOperations(ctx, req.(*ListOperationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetOperationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetOperation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/GetOperation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetOperation(ctx, req.(*GetOperationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CancelOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CancelOperationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CancelOperation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/CancelOperation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CancelOperation(ctx, req.(*CancelOperationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetServerConfigRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetServerConfig(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/GetServerConfig",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetServerConfig(ctx, req.(*GetServerConfigRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListNodePools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListNodePoolsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListNodePools(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/ListNodePools",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListNodePools(ctx, req.(*ListNodePoolsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/GetNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetNodePool(ctx, req.(*GetNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CreateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CreateNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/CreateNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CreateNodePool(ctx, req.(*CreateNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_DeleteNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).DeleteNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/DeleteNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).DeleteNodePool(ctx, req.(*DeleteNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_RollbackNodePoolUpgrade_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RollbackNodePoolUpgradeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, req.(*RollbackNodePoolUpgradeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolManagement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolManagementRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetNodePoolManagement",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, req.(*SetNodePoolManagementRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLabels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLabelsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLabels(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetLabels",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLabels(ctx, req.(*SetLabelsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLegacyAbac_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLegacyAbacRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetLegacyAbac",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, req.(*SetLegacyAbacRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_StartIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(StartIPRotationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).StartIPRotation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/StartIPRotation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).StartIPRotation(ctx, req.(*StartIPRotationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CompleteIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CompleteIPRotationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/CompleteIPRotation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, req.(*CompleteIPRotationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolSize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolSizeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetNodePoolSize",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, req.(*SetNodePoolSizeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNetworkPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNetworkPolicyRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetNetworkPolicy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, req.(*SetNetworkPolicyRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMaintenancePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMaintenancePolicyRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1.ClusterManager/SetMaintenancePolicy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, req.(*SetMaintenancePolicyRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ClusterManager_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.container.v1.ClusterManager",
-	HandlerType: (*ClusterManagerServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "ListClusters",
-			Handler:    _ClusterManager_ListClusters_Handler,
-		},
-		{
-			MethodName: "GetCluster",
-			Handler:    _ClusterManager_GetCluster_Handler,
-		},
-		{
-			MethodName: "CreateCluster",
-			Handler:    _ClusterManager_CreateCluster_Handler,
-		},
-		{
-			MethodName: "UpdateCluster",
-			Handler:    _ClusterManager_UpdateCluster_Handler,
-		},
-		{
-			MethodName: "UpdateNodePool",
-			Handler:    _ClusterManager_UpdateNodePool_Handler,
-		},
-		{
-			MethodName: "SetNodePoolAutoscaling",
-			Handler:    _ClusterManager_SetNodePoolAutoscaling_Handler,
-		},
-		{
-			MethodName: "SetLoggingService",
-			Handler:    _ClusterManager_SetLoggingService_Handler,
-		},
-		{
-			MethodName: "SetMonitoringService",
-			Handler:    _ClusterManager_SetMonitoringService_Handler,
-		},
-		{
-			MethodName: "SetAddonsConfig",
-			Handler:    _ClusterManager_SetAddonsConfig_Handler,
-		},
-		{
-			MethodName: "SetLocations",
-			Handler:    _ClusterManager_SetLocations_Handler,
-		},
-		{
-			MethodName: "UpdateMaster",
-			Handler:    _ClusterManager_UpdateMaster_Handler,
-		},
-		{
-			MethodName: "SetMasterAuth",
-			Handler:    _ClusterManager_SetMasterAuth_Handler,
-		},
-		{
-			MethodName: "DeleteCluster",
-			Handler:    _ClusterManager_DeleteCluster_Handler,
-		},
-		{
-			MethodName: "ListOperations",
-			Handler:    _ClusterManager_ListOperations_Handler,
-		},
-		{
-			MethodName: "GetOperation",
-			Handler:    _ClusterManager_GetOperation_Handler,
-		},
-		{
-			MethodName: "CancelOperation",
-			Handler:    _ClusterManager_CancelOperation_Handler,
-		},
-		{
-			MethodName: "GetServerConfig",
-			Handler:    _ClusterManager_GetServerConfig_Handler,
-		},
-		{
-			MethodName: "ListNodePools",
-			Handler:    _ClusterManager_ListNodePools_Handler,
-		},
-		{
-			MethodName: "GetNodePool",
-			Handler:    _ClusterManager_GetNodePool_Handler,
-		},
-		{
-			MethodName: "CreateNodePool",
-			Handler:    _ClusterManager_CreateNodePool_Handler,
-		},
-		{
-			MethodName: "DeleteNodePool",
-			Handler:    _ClusterManager_DeleteNodePool_Handler,
-		},
-		{
-			MethodName: "RollbackNodePoolUpgrade",
-			Handler:    _ClusterManager_RollbackNodePoolUpgrade_Handler,
-		},
-		{
-			MethodName: "SetNodePoolManagement",
-			Handler:    _ClusterManager_SetNodePoolManagement_Handler,
-		},
-		{
-			MethodName: "SetLabels",
-			Handler:    _ClusterManager_SetLabels_Handler,
-		},
-		{
-			MethodName: "SetLegacyAbac",
-			Handler:    _ClusterManager_SetLegacyAbac_Handler,
-		},
-		{
-			MethodName: "StartIPRotation",
-			Handler:    _ClusterManager_StartIPRotation_Handler,
-		},
-		{
-			MethodName: "CompleteIPRotation",
-			Handler:    _ClusterManager_CompleteIPRotation_Handler,
-		},
-		{
-			MethodName: "SetNodePoolSize",
-			Handler:    _ClusterManager_SetNodePoolSize_Handler,
-		},
-		{
-			MethodName: "SetNetworkPolicy",
-			Handler:    _ClusterManager_SetNetworkPolicy_Handler,
-		},
-		{
-			MethodName: "SetMaintenancePolicy",
-			Handler:    _ClusterManager_SetMaintenancePolicy_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/container/v1/cluster_service.proto",
-}
-
-func init() {
-	proto.RegisterFile("google/container/v1/cluster_service.proto", fileDescriptor_cluster_service_0391086e6c7dadfe)
-}
-
-var fileDescriptor_cluster_service_0391086e6c7dadfe = []byte{
+var fileDescriptor_1c7f18b1699f357a = []byte{
 	// 5271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x3c, 0x6d, 0x8c, 0x24, 0xd7,
 	0x51, 0xe9, 0xd9, 0xd9, 0xd9, 0x9d, 0x9a, 0xd9, 0xd9, 0xd9, 0xb7, 0x1f, 0x37, 0x1e, 0xdf, 0xd9,
@@ -7103,3 +5990,1140 @@ var fileDescriptor_cluster_service_0391086e6c7dadfe = []byte{
 	0xbd, 0x79, 0xf5, 0xdc, 0x76, 0x8a, 0x6c, 0xf0, 0xf4, 0xf7, 0x03, 0x00, 0x00, 0xff, 0xff, 0x61,
 	0xea, 0xa4, 0xfb, 0xbd, 0x56, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ClusterManagerClient is the client API for ClusterManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ClusterManagerClient interface {
+	// Lists all clusters owned by a project in either the specified zone or all
+	// zones.
+	ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error)
+	// Gets the details of a specific cluster.
+	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
+	// Creates a cluster, consisting of the specified number and type of Google
+	// Compute Engine instances.
+	//
+	// By default, the cluster is created in the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// One firewall is added for the cluster. After cluster creation,
+	// the cluster creates routes for each node to allow the containers
+	// on that node to communicate with all other instances in the
+	// cluster.
+	//
+	// Finally, an entry is added to the project's global metadata indicating
+	// which CIDR range is being used by the cluster.
+	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the settings of a specific cluster.
+	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the version and/or image type for a specific node pool.
+	UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the autoscaling settings for a specific node pool.
+	SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the logging service for a specific cluster.
+	SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the monitoring service for a specific cluster.
+	SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the addons for a specific cluster.
+	SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the locations for a specific cluster.
+	SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the master for a specific cluster.
+	UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Used to set master auth materials. Currently supports :-
+	// Changing the admin password for a specific cluster.
+	// This can be either via password generation or explicitly set the password.
+	SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Deletes the cluster, including the Kubernetes endpoint and all worker
+	// nodes.
+	//
+	// Firewalls and routes that were configured during cluster creation
+	// are also deleted.
+	//
+	// Other Google Compute Engine resources that might be in use by the cluster
+	// (e.g. load balancer resources) will not be deleted if they weren't present
+	// at the initial create time.
+	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Lists all operations in a project in a specific zone or all zones.
+	ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error)
+	// Gets the specified operation.
+	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Cancels the specified operation.
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Returns configuration info about the Kubernetes Engine service.
+	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
+	// Lists the node pools for a cluster.
+	ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error)
+	// Retrieves the node pool requested.
+	GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error)
+	// Creates a node pool for a cluster.
+	CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Deletes a node pool from a cluster.
+	DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Roll back the previously Aborted or Failed NodePool upgrade.
+	// This will be an no-op if the last upgrade successfully completed.
+	RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the NodeManagement options for a node pool.
+	SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets labels on a cluster.
+	SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Enables or disables the ABAC authorization mechanism on a cluster.
+	SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Start master IP rotation.
+	StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Completes master IP rotation.
+	CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the size for a specific node pool.
+	SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Enables/Disables Network Policy for a cluster.
+	SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the maintenance policy for a cluster.
+	SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error)
+}
+
+type clusterManagerClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
+	return &clusterManagerClient{cc}
+}
+
+func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
+	out := new(ListClustersResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListClusters", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
+	out := new(Cluster)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLoggingService", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMonitoringService", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetAddonsConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLocations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateMaster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMasterAuth", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
+	out := new(ListOperationsResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListOperations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetOperation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CancelOperation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
+	out := new(ServerConfig)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetServerConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
+	out := new(ListNodePoolsResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListNodePools", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
+	out := new(NodePool)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolManagement", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLabels", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLegacyAbac", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/StartIPRotation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CompleteIPRotation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolSize", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNetworkPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ClusterManagerServer is the server API for ClusterManager service.
+type ClusterManagerServer interface {
+	// Lists all clusters owned by a project in either the specified zone or all
+	// zones.
+	ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error)
+	// Gets the details of a specific cluster.
+	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
+	// Creates a cluster, consisting of the specified number and type of Google
+	// Compute Engine instances.
+	//
+	// By default, the cluster is created in the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// One firewall is added for the cluster. After cluster creation,
+	// the cluster creates routes for each node to allow the containers
+	// on that node to communicate with all other instances in the
+	// cluster.
+	//
+	// Finally, an entry is added to the project's global metadata indicating
+	// which CIDR range is being used by the cluster.
+	CreateCluster(context.Context, *CreateClusterRequest) (*Operation, error)
+	// Updates the settings of a specific cluster.
+	UpdateCluster(context.Context, *UpdateClusterRequest) (*Operation, error)
+	// Updates the version and/or image type for a specific node pool.
+	UpdateNodePool(context.Context, *UpdateNodePoolRequest) (*Operation, error)
+	// Sets the autoscaling settings for a specific node pool.
+	SetNodePoolAutoscaling(context.Context, *SetNodePoolAutoscalingRequest) (*Operation, error)
+	// Sets the logging service for a specific cluster.
+	SetLoggingService(context.Context, *SetLoggingServiceRequest) (*Operation, error)
+	// Sets the monitoring service for a specific cluster.
+	SetMonitoringService(context.Context, *SetMonitoringServiceRequest) (*Operation, error)
+	// Sets the addons for a specific cluster.
+	SetAddonsConfig(context.Context, *SetAddonsConfigRequest) (*Operation, error)
+	// Sets the locations for a specific cluster.
+	SetLocations(context.Context, *SetLocationsRequest) (*Operation, error)
+	// Updates the master for a specific cluster.
+	UpdateMaster(context.Context, *UpdateMasterRequest) (*Operation, error)
+	// Used to set master auth materials. Currently supports :-
+	// Changing the admin password for a specific cluster.
+	// This can be either via password generation or explicitly set the password.
+	SetMasterAuth(context.Context, *SetMasterAuthRequest) (*Operation, error)
+	// Deletes the cluster, including the Kubernetes endpoint and all worker
+	// nodes.
+	//
+	// Firewalls and routes that were configured during cluster creation
+	// are also deleted.
+	//
+	// Other Google Compute Engine resources that might be in use by the cluster
+	// (e.g. load balancer resources) will not be deleted if they weren't present
+	// at the initial create time.
+	DeleteCluster(context.Context, *DeleteClusterRequest) (*Operation, error)
+	// Lists all operations in a project in a specific zone or all zones.
+	ListOperations(context.Context, *ListOperationsRequest) (*ListOperationsResponse, error)
+	// Gets the specified operation.
+	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
+	// Cancels the specified operation.
+	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
+	// Returns configuration info about the Kubernetes Engine service.
+	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
+	// Lists the node pools for a cluster.
+	ListNodePools(context.Context, *ListNodePoolsRequest) (*ListNodePoolsResponse, error)
+	// Retrieves the node pool requested.
+	GetNodePool(context.Context, *GetNodePoolRequest) (*NodePool, error)
+	// Creates a node pool for a cluster.
+	CreateNodePool(context.Context, *CreateNodePoolRequest) (*Operation, error)
+	// Deletes a node pool from a cluster.
+	DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error)
+	// Roll back the previously Aborted or Failed NodePool upgrade.
+	// This will be an no-op if the last upgrade successfully completed.
+	RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error)
+	// Sets the NodeManagement options for a node pool.
+	SetNodePoolManagement(context.Context, *SetNodePoolManagementRequest) (*Operation, error)
+	// Sets labels on a cluster.
+	SetLabels(context.Context, *SetLabelsRequest) (*Operation, error)
+	// Enables or disables the ABAC authorization mechanism on a cluster.
+	SetLegacyAbac(context.Context, *SetLegacyAbacRequest) (*Operation, error)
+	// Start master IP rotation.
+	StartIPRotation(context.Context, *StartIPRotationRequest) (*Operation, error)
+	// Completes master IP rotation.
+	CompleteIPRotation(context.Context, *CompleteIPRotationRequest) (*Operation, error)
+	// Sets the size for a specific node pool.
+	SetNodePoolSize(context.Context, *SetNodePoolSizeRequest) (*Operation, error)
+	// Enables/Disables Network Policy for a cluster.
+	SetNetworkPolicy(context.Context, *SetNetworkPolicyRequest) (*Operation, error)
+	// Sets the maintenance policy for a cluster.
+	SetMaintenancePolicy(context.Context, *SetMaintenancePolicyRequest) (*Operation, error)
+}
+
+func RegisterClusterManagerServer(s *grpc.Server, srv ClusterManagerServer) {
+	s.RegisterService(&_ClusterManager_serviceDesc, srv)
+}
+
+func _ClusterManager_ListClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListClustersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListClusters(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/ListClusters",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListClusters(ctx, req.(*ListClustersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/GetCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetCluster(ctx, req.(*GetClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CreateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CreateCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/CreateCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CreateCluster(ctx, req.(*CreateClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/UpdateCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateCluster(ctx, req.(*UpdateClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/UpdateNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateNodePool(ctx, req.(*UpdateNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolAutoscaling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolAutoscalingRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetNodePoolAutoscaling",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, req.(*SetNodePoolAutoscalingRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLoggingService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLoggingServiceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLoggingService(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetLoggingService",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLoggingService(ctx, req.(*SetLoggingServiceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMonitoringService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMonitoringServiceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMonitoringService(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetMonitoringService",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMonitoringService(ctx, req.(*SetMonitoringServiceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetAddonsConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetAddonsConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetAddonsConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, req.(*SetAddonsConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLocationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLocations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetLocations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLocations(ctx, req.(*SetLocationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateMaster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateMasterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateMaster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/UpdateMaster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateMaster(ctx, req.(*UpdateMasterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMasterAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMasterAuthRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMasterAuth(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetMasterAuth",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMasterAuth(ctx, req.(*SetMasterAuthRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_DeleteCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).DeleteCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/DeleteCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).DeleteCluster(ctx, req.(*DeleteClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListOperations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListOperationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListOperations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/ListOperations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListOperations(ctx, req.(*ListOperationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/GetOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetOperation(ctx, req.(*GetOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CancelOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CancelOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/CancelOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CancelOperation(ctx, req.(*CancelOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetServerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetServerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/GetServerConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetServerConfig(ctx, req.(*GetServerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListNodePools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListNodePoolsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListNodePools(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/ListNodePools",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListNodePools(ctx, req.(*ListNodePoolsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/GetNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetNodePool(ctx, req.(*GetNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CreateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CreateNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/CreateNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CreateNodePool(ctx, req.(*CreateNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_DeleteNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).DeleteNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/DeleteNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).DeleteNodePool(ctx, req.(*DeleteNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_RollbackNodePoolUpgrade_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RollbackNodePoolUpgradeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, req.(*RollbackNodePoolUpgradeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolManagement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolManagementRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetNodePoolManagement",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, req.(*SetNodePoolManagementRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLabels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLabelsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLabels(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetLabels",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLabels(ctx, req.(*SetLabelsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLegacyAbac_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLegacyAbacRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetLegacyAbac",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, req.(*SetLegacyAbacRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_StartIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StartIPRotationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).StartIPRotation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/StartIPRotation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).StartIPRotation(ctx, req.(*StartIPRotationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CompleteIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CompleteIPRotationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/CompleteIPRotation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, req.(*CompleteIPRotationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolSize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolSizeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetNodePoolSize",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, req.(*SetNodePoolSizeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNetworkPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNetworkPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetNetworkPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, req.(*SetNetworkPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMaintenancePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMaintenancePolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1.ClusterManager/SetMaintenancePolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, req.(*SetMaintenancePolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ClusterManager_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.container.v1.ClusterManager",
+	HandlerType: (*ClusterManagerServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListClusters",
+			Handler:    _ClusterManager_ListClusters_Handler,
+		},
+		{
+			MethodName: "GetCluster",
+			Handler:    _ClusterManager_GetCluster_Handler,
+		},
+		{
+			MethodName: "CreateCluster",
+			Handler:    _ClusterManager_CreateCluster_Handler,
+		},
+		{
+			MethodName: "UpdateCluster",
+			Handler:    _ClusterManager_UpdateCluster_Handler,
+		},
+		{
+			MethodName: "UpdateNodePool",
+			Handler:    _ClusterManager_UpdateNodePool_Handler,
+		},
+		{
+			MethodName: "SetNodePoolAutoscaling",
+			Handler:    _ClusterManager_SetNodePoolAutoscaling_Handler,
+		},
+		{
+			MethodName: "SetLoggingService",
+			Handler:    _ClusterManager_SetLoggingService_Handler,
+		},
+		{
+			MethodName: "SetMonitoringService",
+			Handler:    _ClusterManager_SetMonitoringService_Handler,
+		},
+		{
+			MethodName: "SetAddonsConfig",
+			Handler:    _ClusterManager_SetAddonsConfig_Handler,
+		},
+		{
+			MethodName: "SetLocations",
+			Handler:    _ClusterManager_SetLocations_Handler,
+		},
+		{
+			MethodName: "UpdateMaster",
+			Handler:    _ClusterManager_UpdateMaster_Handler,
+		},
+		{
+			MethodName: "SetMasterAuth",
+			Handler:    _ClusterManager_SetMasterAuth_Handler,
+		},
+		{
+			MethodName: "DeleteCluster",
+			Handler:    _ClusterManager_DeleteCluster_Handler,
+		},
+		{
+			MethodName: "ListOperations",
+			Handler:    _ClusterManager_ListOperations_Handler,
+		},
+		{
+			MethodName: "GetOperation",
+			Handler:    _ClusterManager_GetOperation_Handler,
+		},
+		{
+			MethodName: "CancelOperation",
+			Handler:    _ClusterManager_CancelOperation_Handler,
+		},
+		{
+			MethodName: "GetServerConfig",
+			Handler:    _ClusterManager_GetServerConfig_Handler,
+		},
+		{
+			MethodName: "ListNodePools",
+			Handler:    _ClusterManager_ListNodePools_Handler,
+		},
+		{
+			MethodName: "GetNodePool",
+			Handler:    _ClusterManager_GetNodePool_Handler,
+		},
+		{
+			MethodName: "CreateNodePool",
+			Handler:    _ClusterManager_CreateNodePool_Handler,
+		},
+		{
+			MethodName: "DeleteNodePool",
+			Handler:    _ClusterManager_DeleteNodePool_Handler,
+		},
+		{
+			MethodName: "RollbackNodePoolUpgrade",
+			Handler:    _ClusterManager_RollbackNodePoolUpgrade_Handler,
+		},
+		{
+			MethodName: "SetNodePoolManagement",
+			Handler:    _ClusterManager_SetNodePoolManagement_Handler,
+		},
+		{
+			MethodName: "SetLabels",
+			Handler:    _ClusterManager_SetLabels_Handler,
+		},
+		{
+			MethodName: "SetLegacyAbac",
+			Handler:    _ClusterManager_SetLegacyAbac_Handler,
+		},
+		{
+			MethodName: "StartIPRotation",
+			Handler:    _ClusterManager_StartIPRotation_Handler,
+		},
+		{
+			MethodName: "CompleteIPRotation",
+			Handler:    _ClusterManager_CompleteIPRotation_Handler,
+		},
+		{
+			MethodName: "SetNodePoolSize",
+			Handler:    _ClusterManager_SetNodePoolSize_Handler,
+		},
+		{
+			MethodName: "SetNetworkPolicy",
+			Handler:    _ClusterManager_SetNetworkPolicy_Handler,
+		},
+		{
+			MethodName: "SetMaintenancePolicy",
+			Handler:    _ClusterManager_SetMaintenancePolicy_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/container/v1/cluster_service.proto",
+}
diff --git a/googleapis/container/v1alpha1/cluster_service.pb.go b/googleapis/container/v1alpha1/cluster_service.pb.go
index 7252d29b42..ea1255a057 100644
--- a/googleapis/container/v1alpha1/cluster_service.pb.go
+++ b/googleapis/container/v1alpha1/cluster_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1alpha1/cluster_service.proto
 
-package container // import "google.golang.org/genproto/googleapis/container/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package container
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Effect in taint.
 type NodeTaint_Effect int32
@@ -45,6 +45,7 @@ var NodeTaint_Effect_name = map[int32]string{
 	2: "PREFER_NO_SCHEDULE",
 	3: "NO_EXECUTE",
 }
+
 var NodeTaint_Effect_value = map[string]int32{
 	"EFFECT_UNSPECIFIED": 0,
 	"NO_SCHEDULE":        1,
@@ -55,8 +56,9 @@ var NodeTaint_Effect_value = map[string]int32{
 func (x NodeTaint_Effect) String() string {
 	return proto.EnumName(NodeTaint_Effect_name, int32(x))
 }
+
 func (NodeTaint_Effect) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{1, 0}
+	return fileDescriptor_339d8120448ec82b, []int{1, 0}
 }
 
 // Allowed Network Policy providers.
@@ -73,6 +75,7 @@ var NetworkPolicy_Provider_name = map[int32]string{
 	0: "PROVIDER_UNSPECIFIED",
 	1: "CALICO",
 }
+
 var NetworkPolicy_Provider_value = map[string]int32{
 	"PROVIDER_UNSPECIFIED": 0,
 	"CALICO":               1,
@@ -81,8 +84,9 @@ var NetworkPolicy_Provider_value = map[string]int32{
 func (x NetworkPolicy_Provider) String() string {
 	return proto.EnumName(NetworkPolicy_Provider_name, int32(x))
 }
+
 func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{10, 0}
+	return fileDescriptor_339d8120448ec82b, []int{10, 0}
 }
 
 // The current status of the cluster.
@@ -115,6 +119,7 @@ var Cluster_Status_name = map[int32]string{
 	4: "STOPPING",
 	5: "ERROR",
 }
+
 var Cluster_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PROVISIONING":       1,
@@ -127,8 +132,9 @@ var Cluster_Status_value = map[string]int32{
 func (x Cluster_Status) String() string {
 	return proto.EnumName(Cluster_Status_name, int32(x))
 }
+
 func (Cluster_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{13, 0}
+	return fileDescriptor_339d8120448ec82b, []int{13, 0}
 }
 
 // Current status of the operation.
@@ -154,6 +160,7 @@ var Operation_Status_name = map[int32]string{
 	3: "DONE",
 	4: "ABORTING",
 }
+
 var Operation_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PENDING":            1,
@@ -165,8 +172,9 @@ var Operation_Status_value = map[string]int32{
 func (x Operation_Status) String() string {
 	return proto.EnumName(Operation_Status_name, int32(x))
 }
+
 func (Operation_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{15, 0}
+	return fileDescriptor_339d8120448ec82b, []int{15, 0}
 }
 
 // Operation type.
@@ -228,6 +236,7 @@ var Operation_Type_name = map[int32]string{
 	15: "SET_NETWORK_POLICY",
 	16: "SET_MAINTENANCE_POLICY",
 }
+
 var Operation_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":         0,
 	"CREATE_CLUSTER":           1,
@@ -251,8 +260,9 @@ var Operation_Type_value = map[string]int32{
 func (x Operation_Type) String() string {
 	return proto.EnumName(Operation_Type_name, int32(x))
 }
+
 func (Operation_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{15, 1}
+	return fileDescriptor_339d8120448ec82b, []int{15, 1}
 }
 
 // Operation type: what type update to perform.
@@ -278,6 +288,7 @@ var SetMasterAuthRequest_Action_name = map[int32]string{
 	2: "GENERATE_PASSWORD",
 	3: "SET_USERNAME",
 }
+
 var SetMasterAuthRequest_Action_value = map[string]int32{
 	"UNKNOWN":           0,
 	"SET_PASSWORD":      1,
@@ -288,8 +299,9 @@ var SetMasterAuthRequest_Action_value = map[string]int32{
 func (x SetMasterAuthRequest_Action) String() string {
 	return proto.EnumName(SetMasterAuthRequest_Action_name, int32(x))
 }
+
 func (SetMasterAuthRequest_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{26, 0}
+	return fileDescriptor_339d8120448ec82b, []int{26, 0}
 }
 
 // The current status of the node pool instance.
@@ -328,6 +340,7 @@ var NodePool_Status_name = map[int32]string{
 	5: "STOPPING",
 	6: "ERROR",
 }
+
 var NodePool_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PROVISIONING":       1,
@@ -341,8 +354,9 @@ var NodePool_Status_value = map[string]int32{
 func (x NodePool_Status) String() string {
 	return proto.EnumName(NodePool_Status_name, int32(x))
 }
+
 func (NodePool_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{40, 0}
+	return fileDescriptor_339d8120448ec82b, []int{40, 0}
 }
 
 // Parameters that describe the nodes in a cluster.
@@ -444,16 +458,17 @@ func (m *NodeConfig) Reset()         { *m = NodeConfig{} }
 func (m *NodeConfig) String() string { return proto.CompactTextString(m) }
 func (*NodeConfig) ProtoMessage()    {}
 func (*NodeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{0}
+	return fileDescriptor_339d8120448ec82b, []int{0}
 }
+
 func (m *NodeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeConfig.Unmarshal(m, b)
 }
 func (m *NodeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeConfig.Marshal(b, m, deterministic)
 }
-func (dst *NodeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeConfig.Merge(dst, src)
+func (m *NodeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeConfig.Merge(m, src)
 }
 func (m *NodeConfig) XXX_Size() int {
 	return xxx_messageInfo_NodeConfig.Size(m)
@@ -576,16 +591,17 @@ func (m *NodeTaint) Reset()         { *m = NodeTaint{} }
 func (m *NodeTaint) String() string { return proto.CompactTextString(m) }
 func (*NodeTaint) ProtoMessage()    {}
 func (*NodeTaint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{1}
+	return fileDescriptor_339d8120448ec82b, []int{1}
 }
+
 func (m *NodeTaint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeTaint.Unmarshal(m, b)
 }
 func (m *NodeTaint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeTaint.Marshal(b, m, deterministic)
 }
-func (dst *NodeTaint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeTaint.Merge(dst, src)
+func (m *NodeTaint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeTaint.Merge(m, src)
 }
 func (m *NodeTaint) XXX_Size() int {
 	return xxx_messageInfo_NodeTaint.Size(m)
@@ -651,16 +667,17 @@ func (m *MasterAuth) Reset()         { *m = MasterAuth{} }
 func (m *MasterAuth) String() string { return proto.CompactTextString(m) }
 func (*MasterAuth) ProtoMessage()    {}
 func (*MasterAuth) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{2}
+	return fileDescriptor_339d8120448ec82b, []int{2}
 }
+
 func (m *MasterAuth) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuth.Unmarshal(m, b)
 }
 func (m *MasterAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuth.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuth) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuth.Merge(dst, src)
+func (m *MasterAuth) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuth.Merge(m, src)
 }
 func (m *MasterAuth) XXX_Size() int {
 	return xxx_messageInfo_MasterAuth.Size(m)
@@ -726,16 +743,17 @@ func (m *ClientCertificateConfig) Reset()         { *m = ClientCertificateConfig
 func (m *ClientCertificateConfig) String() string { return proto.CompactTextString(m) }
 func (*ClientCertificateConfig) ProtoMessage()    {}
 func (*ClientCertificateConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{3}
+	return fileDescriptor_339d8120448ec82b, []int{3}
 }
+
 func (m *ClientCertificateConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientCertificateConfig.Unmarshal(m, b)
 }
 func (m *ClientCertificateConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientCertificateConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClientCertificateConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientCertificateConfig.Merge(dst, src)
+func (m *ClientCertificateConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientCertificateConfig.Merge(m, src)
 }
 func (m *ClientCertificateConfig) XXX_Size() int {
 	return xxx_messageInfo_ClientCertificateConfig.Size(m)
@@ -778,16 +796,17 @@ func (m *AddonsConfig) Reset()         { *m = AddonsConfig{} }
 func (m *AddonsConfig) String() string { return proto.CompactTextString(m) }
 func (*AddonsConfig) ProtoMessage()    {}
 func (*AddonsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{4}
+	return fileDescriptor_339d8120448ec82b, []int{4}
 }
+
 func (m *AddonsConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddonsConfig.Unmarshal(m, b)
 }
 func (m *AddonsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddonsConfig.Marshal(b, m, deterministic)
 }
-func (dst *AddonsConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddonsConfig.Merge(dst, src)
+func (m *AddonsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddonsConfig.Merge(m, src)
 }
 func (m *AddonsConfig) XXX_Size() int {
 	return xxx_messageInfo_AddonsConfig.Size(m)
@@ -842,16 +861,17 @@ func (m *HttpLoadBalancing) Reset()         { *m = HttpLoadBalancing{} }
 func (m *HttpLoadBalancing) String() string { return proto.CompactTextString(m) }
 func (*HttpLoadBalancing) ProtoMessage()    {}
 func (*HttpLoadBalancing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{5}
+	return fileDescriptor_339d8120448ec82b, []int{5}
 }
+
 func (m *HttpLoadBalancing) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpLoadBalancing.Unmarshal(m, b)
 }
 func (m *HttpLoadBalancing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpLoadBalancing.Marshal(b, m, deterministic)
 }
-func (dst *HttpLoadBalancing) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpLoadBalancing.Merge(dst, src)
+func (m *HttpLoadBalancing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpLoadBalancing.Merge(m, src)
 }
 func (m *HttpLoadBalancing) XXX_Size() int {
 	return xxx_messageInfo_HttpLoadBalancing.Size(m)
@@ -886,16 +906,17 @@ func (m *HorizontalPodAutoscaling) Reset()         { *m = HorizontalPodAutoscali
 func (m *HorizontalPodAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*HorizontalPodAutoscaling) ProtoMessage()    {}
 func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{6}
+	return fileDescriptor_339d8120448ec82b, []int{6}
 }
+
 func (m *HorizontalPodAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Unmarshal(m, b)
 }
 func (m *HorizontalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HorizontalPodAutoscaling.Merge(dst, src)
+func (m *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HorizontalPodAutoscaling.Merge(m, src)
 }
 func (m *HorizontalPodAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Size(m)
@@ -926,16 +947,17 @@ func (m *KubernetesDashboard) Reset()         { *m = KubernetesDashboard{} }
 func (m *KubernetesDashboard) String() string { return proto.CompactTextString(m) }
 func (*KubernetesDashboard) ProtoMessage()    {}
 func (*KubernetesDashboard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{7}
+	return fileDescriptor_339d8120448ec82b, []int{7}
 }
+
 func (m *KubernetesDashboard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KubernetesDashboard.Unmarshal(m, b)
 }
 func (m *KubernetesDashboard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KubernetesDashboard.Marshal(b, m, deterministic)
 }
-func (dst *KubernetesDashboard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KubernetesDashboard.Merge(dst, src)
+func (m *KubernetesDashboard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KubernetesDashboard.Merge(m, src)
 }
 func (m *KubernetesDashboard) XXX_Size() int {
 	return xxx_messageInfo_KubernetesDashboard.Size(m)
@@ -968,16 +990,17 @@ func (m *NetworkPolicyConfig) Reset()         { *m = NetworkPolicyConfig{} }
 func (m *NetworkPolicyConfig) String() string { return proto.CompactTextString(m) }
 func (*NetworkPolicyConfig) ProtoMessage()    {}
 func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{8}
+	return fileDescriptor_339d8120448ec82b, []int{8}
 }
+
 func (m *NetworkPolicyConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkPolicyConfig.Unmarshal(m, b)
 }
 func (m *NetworkPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkPolicyConfig.Marshal(b, m, deterministic)
 }
-func (dst *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkPolicyConfig.Merge(dst, src)
+func (m *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicyConfig.Merge(m, src)
 }
 func (m *NetworkPolicyConfig) XXX_Size() int {
 	return xxx_messageInfo_NetworkPolicyConfig.Size(m)
@@ -1014,16 +1037,17 @@ func (m *MasterAuthorizedNetworksConfig) Reset()         { *m = MasterAuthorized
 func (m *MasterAuthorizedNetworksConfig) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{9}
+	return fileDescriptor_339d8120448ec82b, []int{9}
 }
+
 func (m *MasterAuthorizedNetworksConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Unmarshal(m, b)
 }
 func (m *MasterAuthorizedNetworksConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(dst, src)
+func (m *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(m, src)
 }
 func (m *MasterAuthorizedNetworksConfig) XXX_Size() int {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Size(m)
@@ -1065,16 +1089,17 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig_CidrBlock) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig_CidrBlock) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{9, 0}
+	return fileDescriptor_339d8120448ec82b, []int{9, 0}
 }
+
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Unmarshal(m, b)
 }
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(dst, src)
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(m, src)
 }
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Size() int {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Size(m)
@@ -1115,16 +1140,17 @@ func (m *NetworkPolicy) Reset()         { *m = NetworkPolicy{} }
 func (m *NetworkPolicy) String() string { return proto.CompactTextString(m) }
 func (*NetworkPolicy) ProtoMessage()    {}
 func (*NetworkPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{10}
+	return fileDescriptor_339d8120448ec82b, []int{10}
 }
+
 func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkPolicy.Unmarshal(m, b)
 }
 func (m *NetworkPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkPolicy.Marshal(b, m, deterministic)
 }
-func (dst *NetworkPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkPolicy.Merge(dst, src)
+func (m *NetworkPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicy.Merge(m, src)
 }
 func (m *NetworkPolicy) XXX_Size() int {
 	return xxx_messageInfo_NetworkPolicy.Size(m)
@@ -1239,16 +1265,17 @@ func (m *IPAllocationPolicy) Reset()         { *m = IPAllocationPolicy{} }
 func (m *IPAllocationPolicy) String() string { return proto.CompactTextString(m) }
 func (*IPAllocationPolicy) ProtoMessage()    {}
 func (*IPAllocationPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{11}
+	return fileDescriptor_339d8120448ec82b, []int{11}
 }
+
 func (m *IPAllocationPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IPAllocationPolicy.Unmarshal(m, b)
 }
 func (m *IPAllocationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IPAllocationPolicy.Marshal(b, m, deterministic)
 }
-func (dst *IPAllocationPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IPAllocationPolicy.Merge(dst, src)
+func (m *IPAllocationPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IPAllocationPolicy.Merge(m, src)
 }
 func (m *IPAllocationPolicy) XXX_Size() int {
 	return xxx_messageInfo_IPAllocationPolicy.Size(m)
@@ -1350,16 +1377,17 @@ func (m *PodSecurityPolicyConfig) Reset()         { *m = PodSecurityPolicyConfig
 func (m *PodSecurityPolicyConfig) String() string { return proto.CompactTextString(m) }
 func (*PodSecurityPolicyConfig) ProtoMessage()    {}
 func (*PodSecurityPolicyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{12}
+	return fileDescriptor_339d8120448ec82b, []int{12}
 }
+
 func (m *PodSecurityPolicyConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PodSecurityPolicyConfig.Unmarshal(m, b)
 }
 func (m *PodSecurityPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PodSecurityPolicyConfig.Marshal(b, m, deterministic)
 }
-func (dst *PodSecurityPolicyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PodSecurityPolicyConfig.Merge(dst, src)
+func (m *PodSecurityPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PodSecurityPolicyConfig.Merge(m, src)
 }
 func (m *PodSecurityPolicyConfig) XXX_Size() int {
 	return xxx_messageInfo_PodSecurityPolicyConfig.Size(m)
@@ -1531,16 +1559,17 @@ func (m *Cluster) Reset()         { *m = Cluster{} }
 func (m *Cluster) String() string { return proto.CompactTextString(m) }
 func (*Cluster) ProtoMessage()    {}
 func (*Cluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{13}
+	return fileDescriptor_339d8120448ec82b, []int{13}
 }
+
 func (m *Cluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cluster.Unmarshal(m, b)
 }
 func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
 }
-func (dst *Cluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cluster.Merge(dst, src)
+func (m *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(m, src)
 }
 func (m *Cluster) XXX_Size() int {
 	return xxx_messageInfo_Cluster.Size(m)
@@ -1843,16 +1872,17 @@ func (m *ClusterUpdate) Reset()         { *m = ClusterUpdate{} }
 func (m *ClusterUpdate) String() string { return proto.CompactTextString(m) }
 func (*ClusterUpdate) ProtoMessage()    {}
 func (*ClusterUpdate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{14}
+	return fileDescriptor_339d8120448ec82b, []int{14}
 }
+
 func (m *ClusterUpdate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterUpdate.Unmarshal(m, b)
 }
 func (m *ClusterUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterUpdate.Marshal(b, m, deterministic)
 }
-func (dst *ClusterUpdate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterUpdate.Merge(dst, src)
+func (m *ClusterUpdate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterUpdate.Merge(m, src)
 }
 func (m *ClusterUpdate) XXX_Size() int {
 	return xxx_messageInfo_ClusterUpdate.Size(m)
@@ -1975,16 +2005,17 @@ func (m *Operation) Reset()         { *m = Operation{} }
 func (m *Operation) String() string { return proto.CompactTextString(m) }
 func (*Operation) ProtoMessage()    {}
 func (*Operation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{15}
+	return fileDescriptor_339d8120448ec82b, []int{15}
 }
+
 func (m *Operation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operation.Unmarshal(m, b)
 }
 func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
 }
-func (dst *Operation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operation.Merge(dst, src)
+func (m *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(m, src)
 }
 func (m *Operation) XXX_Size() int {
 	return xxx_messageInfo_Operation.Size(m)
@@ -2098,16 +2129,17 @@ func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
 func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterRequest) ProtoMessage()    {}
 func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{16}
+	return fileDescriptor_339d8120448ec82b, []int{16}
 }
+
 func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
 }
 func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+func (m *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(m, src)
 }
 func (m *CreateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterRequest.Size(m)
@@ -2172,16 +2204,17 @@ func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
 func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterRequest) ProtoMessage()    {}
 func (*GetClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{17}
+	return fileDescriptor_339d8120448ec82b, []int{17}
 }
+
 func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
 }
 func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+func (m *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(m, src)
 }
 func (m *GetClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClusterRequest.Size(m)
@@ -2248,16 +2281,17 @@ func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
 func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateClusterRequest) ProtoMessage()    {}
 func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{18}
+	return fileDescriptor_339d8120448ec82b, []int{18}
 }
+
 func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
 }
 func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+func (m *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(m, src)
 }
 func (m *UpdateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateClusterRequest.Size(m)
@@ -2338,16 +2372,17 @@ func (m *UpdateNodePoolRequest) Reset()         { *m = UpdateNodePoolRequest{} }
 func (m *UpdateNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateNodePoolRequest) ProtoMessage()    {}
 func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{19}
+	return fileDescriptor_339d8120448ec82b, []int{19}
 }
+
 func (m *UpdateNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateNodePoolRequest.Unmarshal(m, b)
 }
 func (m *UpdateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateNodePoolRequest.Merge(dst, src)
+func (m *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNodePoolRequest.Merge(m, src)
 }
 func (m *UpdateNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateNodePoolRequest.Size(m)
@@ -2439,16 +2474,17 @@ func (m *SetNodePoolAutoscalingRequest) Reset()         { *m = SetNodePoolAutosc
 func (m *SetNodePoolAutoscalingRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolAutoscalingRequest) ProtoMessage()    {}
 func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{20}
+	return fileDescriptor_339d8120448ec82b, []int{20}
 }
+
 func (m *SetNodePoolAutoscalingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolAutoscalingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(dst, src)
+func (m *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(m, src)
 }
 func (m *SetNodePoolAutoscalingRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Size(m)
@@ -2532,16 +2568,17 @@ func (m *SetLoggingServiceRequest) Reset()         { *m = SetLoggingServiceReque
 func (m *SetLoggingServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLoggingServiceRequest) ProtoMessage()    {}
 func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{21}
+	return fileDescriptor_339d8120448ec82b, []int{21}
 }
+
 func (m *SetLoggingServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLoggingServiceRequest.Unmarshal(m, b)
 }
 func (m *SetLoggingServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLoggingServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLoggingServiceRequest.Merge(dst, src)
+func (m *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLoggingServiceRequest.Merge(m, src)
 }
 func (m *SetLoggingServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLoggingServiceRequest.Size(m)
@@ -2619,16 +2656,17 @@ func (m *SetMonitoringServiceRequest) Reset()         { *m = SetMonitoringServic
 func (m *SetMonitoringServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMonitoringServiceRequest) ProtoMessage()    {}
 func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{22}
+	return fileDescriptor_339d8120448ec82b, []int{22}
 }
+
 func (m *SetMonitoringServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Unmarshal(m, b)
 }
 func (m *SetMonitoringServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMonitoringServiceRequest.Merge(dst, src)
+func (m *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMonitoringServiceRequest.Merge(m, src)
 }
 func (m *SetMonitoringServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Size(m)
@@ -2703,16 +2741,17 @@ func (m *SetAddonsConfigRequest) Reset()         { *m = SetAddonsConfigRequest{}
 func (m *SetAddonsConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*SetAddonsConfigRequest) ProtoMessage()    {}
 func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{23}
+	return fileDescriptor_339d8120448ec82b, []int{23}
 }
+
 func (m *SetAddonsConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetAddonsConfigRequest.Unmarshal(m, b)
 }
 func (m *SetAddonsConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetAddonsConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetAddonsConfigRequest.Merge(dst, src)
+func (m *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetAddonsConfigRequest.Merge(m, src)
 }
 func (m *SetAddonsConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_SetAddonsConfigRequest.Size(m)
@@ -2792,16 +2831,17 @@ func (m *SetLocationsRequest) Reset()         { *m = SetLocationsRequest{} }
 func (m *SetLocationsRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLocationsRequest) ProtoMessage()    {}
 func (*SetLocationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{24}
+	return fileDescriptor_339d8120448ec82b, []int{24}
 }
+
 func (m *SetLocationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLocationsRequest.Unmarshal(m, b)
 }
 func (m *SetLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLocationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLocationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLocationsRequest.Merge(dst, src)
+func (m *SetLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLocationsRequest.Merge(m, src)
 }
 func (m *SetLocationsRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLocationsRequest.Size(m)
@@ -2876,16 +2916,17 @@ func (m *UpdateMasterRequest) Reset()         { *m = UpdateMasterRequest{} }
 func (m *UpdateMasterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateMasterRequest) ProtoMessage()    {}
 func (*UpdateMasterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{25}
+	return fileDescriptor_339d8120448ec82b, []int{25}
 }
+
 func (m *UpdateMasterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateMasterRequest.Unmarshal(m, b)
 }
 func (m *UpdateMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateMasterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateMasterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateMasterRequest.Merge(dst, src)
+func (m *UpdateMasterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateMasterRequest.Merge(m, src)
 }
 func (m *UpdateMasterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateMasterRequest.Size(m)
@@ -2961,16 +3002,17 @@ func (m *SetMasterAuthRequest) Reset()         { *m = SetMasterAuthRequest{} }
 func (m *SetMasterAuthRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMasterAuthRequest) ProtoMessage()    {}
 func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{26}
+	return fileDescriptor_339d8120448ec82b, []int{26}
 }
+
 func (m *SetMasterAuthRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMasterAuthRequest.Unmarshal(m, b)
 }
 func (m *SetMasterAuthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMasterAuthRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMasterAuthRequest.Merge(dst, src)
+func (m *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMasterAuthRequest.Merge(m, src)
 }
 func (m *SetMasterAuthRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMasterAuthRequest.Size(m)
@@ -3049,16 +3091,17 @@ func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
 func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteClusterRequest) ProtoMessage()    {}
 func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{27}
+	return fileDescriptor_339d8120448ec82b, []int{27}
 }
+
 func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+func (m *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(m, src)
 }
 func (m *DeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteClusterRequest.Size(m)
@@ -3121,16 +3164,17 @@ func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
 func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListClustersRequest) ProtoMessage()    {}
 func (*ListClustersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{28}
+	return fileDescriptor_339d8120448ec82b, []int{28}
 }
+
 func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
 }
 func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+func (m *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(m, src)
 }
 func (m *ListClustersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListClustersRequest.Size(m)
@@ -3179,16 +3223,17 @@ func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
 func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListClustersResponse) ProtoMessage()    {}
 func (*ListClustersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{29}
+	return fileDescriptor_339d8120448ec82b, []int{29}
 }
+
 func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
 }
 func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+func (m *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(m, src)
 }
 func (m *ListClustersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListClustersResponse.Size(m)
@@ -3239,16 +3284,17 @@ func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
 func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOperationRequest) ProtoMessage()    {}
 func (*GetOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{30}
+	return fileDescriptor_339d8120448ec82b, []int{30}
 }
+
 func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
 }
 func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+func (m *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(m, src)
 }
 func (m *GetOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOperationRequest.Size(m)
@@ -3310,16 +3356,17 @@ func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
 func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsRequest) ProtoMessage()    {}
 func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{31}
+	return fileDescriptor_339d8120448ec82b, []int{31}
 }
+
 func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
 }
 func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+func (m *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(m, src)
 }
 func (m *ListOperationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsRequest.Size(m)
@@ -3376,16 +3423,17 @@ func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{}
 func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelOperationRequest) ProtoMessage()    {}
 func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{32}
+	return fileDescriptor_339d8120448ec82b, []int{32}
 }
+
 func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
 }
 func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+func (m *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(m, src)
 }
 func (m *CancelOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelOperationRequest.Size(m)
@@ -3440,16 +3488,17 @@ func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{}
 func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsResponse) ProtoMessage()    {}
 func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{33}
+	return fileDescriptor_339d8120448ec82b, []int{33}
 }
+
 func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
 }
 func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+func (m *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(m, src)
 }
 func (m *ListOperationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsResponse.Size(m)
@@ -3496,16 +3545,17 @@ func (m *GetServerConfigRequest) Reset()         { *m = GetServerConfigRequest{}
 func (m *GetServerConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServerConfigRequest) ProtoMessage()    {}
 func (*GetServerConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{34}
+	return fileDescriptor_339d8120448ec82b, []int{34}
 }
+
 func (m *GetServerConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServerConfigRequest.Unmarshal(m, b)
 }
 func (m *GetServerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServerConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServerConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServerConfigRequest.Merge(dst, src)
+func (m *GetServerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerConfigRequest.Merge(m, src)
 }
 func (m *GetServerConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServerConfigRequest.Size(m)
@@ -3558,16 +3608,17 @@ func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
 func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
 func (*ServerConfig) ProtoMessage()    {}
 func (*ServerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{35}
+	return fileDescriptor_339d8120448ec82b, []int{35}
 }
+
 func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
 }
 func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ServerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerConfig.Merge(dst, src)
+func (m *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(m, src)
 }
 func (m *ServerConfig) XXX_Size() int {
 	return xxx_messageInfo_ServerConfig.Size(m)
@@ -3641,16 +3692,17 @@ func (m *CreateNodePoolRequest) Reset()         { *m = CreateNodePoolRequest{} }
 func (m *CreateNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateNodePoolRequest) ProtoMessage()    {}
 func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{36}
+	return fileDescriptor_339d8120448ec82b, []int{36}
 }
+
 func (m *CreateNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateNodePoolRequest.Unmarshal(m, b)
 }
 func (m *CreateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateNodePoolRequest.Merge(dst, src)
+func (m *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNodePoolRequest.Merge(m, src)
 }
 func (m *CreateNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateNodePoolRequest.Size(m)
@@ -3725,16 +3777,17 @@ func (m *DeleteNodePoolRequest) Reset()         { *m = DeleteNodePoolRequest{} }
 func (m *DeleteNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteNodePoolRequest) ProtoMessage()    {}
 func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{37}
+	return fileDescriptor_339d8120448ec82b, []int{37}
 }
+
 func (m *DeleteNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteNodePoolRequest.Unmarshal(m, b)
 }
 func (m *DeleteNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteNodePoolRequest.Merge(dst, src)
+func (m *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNodePoolRequest.Merge(m, src)
 }
 func (m *DeleteNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteNodePoolRequest.Size(m)
@@ -3806,16 +3859,17 @@ func (m *ListNodePoolsRequest) Reset()         { *m = ListNodePoolsRequest{} }
 func (m *ListNodePoolsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNodePoolsRequest) ProtoMessage()    {}
 func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{38}
+	return fileDescriptor_339d8120448ec82b, []int{38}
 }
+
 func (m *ListNodePoolsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNodePoolsRequest.Unmarshal(m, b)
 }
 func (m *ListNodePoolsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNodePoolsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNodePoolsRequest.Merge(dst, src)
+func (m *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsRequest.Merge(m, src)
 }
 func (m *ListNodePoolsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNodePoolsRequest.Size(m)
@@ -3883,16 +3937,17 @@ func (m *GetNodePoolRequest) Reset()         { *m = GetNodePoolRequest{} }
 func (m *GetNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*GetNodePoolRequest) ProtoMessage()    {}
 func (*GetNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{39}
+	return fileDescriptor_339d8120448ec82b, []int{39}
 }
+
 func (m *GetNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNodePoolRequest.Unmarshal(m, b)
 }
 func (m *GetNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNodePoolRequest.Merge(dst, src)
+func (m *GetNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNodePoolRequest.Merge(m, src)
 }
 func (m *GetNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNodePoolRequest.Size(m)
@@ -3981,16 +4036,17 @@ func (m *NodePool) Reset()         { *m = NodePool{} }
 func (m *NodePool) String() string { return proto.CompactTextString(m) }
 func (*NodePool) ProtoMessage()    {}
 func (*NodePool) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{40}
+	return fileDescriptor_339d8120448ec82b, []int{40}
 }
+
 func (m *NodePool) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodePool.Unmarshal(m, b)
 }
 func (m *NodePool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodePool.Marshal(b, m, deterministic)
 }
-func (dst *NodePool) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodePool.Merge(dst, src)
+func (m *NodePool) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePool.Merge(m, src)
 }
 func (m *NodePool) XXX_Size() int {
 	return xxx_messageInfo_NodePool.Size(m)
@@ -4089,16 +4145,17 @@ func (m *NodeManagement) Reset()         { *m = NodeManagement{} }
 func (m *NodeManagement) String() string { return proto.CompactTextString(m) }
 func (*NodeManagement) ProtoMessage()    {}
 func (*NodeManagement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{41}
+	return fileDescriptor_339d8120448ec82b, []int{41}
 }
+
 func (m *NodeManagement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeManagement.Unmarshal(m, b)
 }
 func (m *NodeManagement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeManagement.Marshal(b, m, deterministic)
 }
-func (dst *NodeManagement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeManagement.Merge(dst, src)
+func (m *NodeManagement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeManagement.Merge(m, src)
 }
 func (m *NodeManagement) XXX_Size() int {
 	return xxx_messageInfo_NodeManagement.Size(m)
@@ -4149,16 +4206,17 @@ func (m *AutoUpgradeOptions) Reset()         { *m = AutoUpgradeOptions{} }
 func (m *AutoUpgradeOptions) String() string { return proto.CompactTextString(m) }
 func (*AutoUpgradeOptions) ProtoMessage()    {}
 func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{42}
+	return fileDescriptor_339d8120448ec82b, []int{42}
 }
+
 func (m *AutoUpgradeOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AutoUpgradeOptions.Unmarshal(m, b)
 }
 func (m *AutoUpgradeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AutoUpgradeOptions.Marshal(b, m, deterministic)
 }
-func (dst *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AutoUpgradeOptions.Merge(dst, src)
+func (m *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutoUpgradeOptions.Merge(m, src)
 }
 func (m *AutoUpgradeOptions) XXX_Size() int {
 	return xxx_messageInfo_AutoUpgradeOptions.Size(m)
@@ -4196,16 +4254,17 @@ func (m *MaintenancePolicy) Reset()         { *m = MaintenancePolicy{} }
 func (m *MaintenancePolicy) String() string { return proto.CompactTextString(m) }
 func (*MaintenancePolicy) ProtoMessage()    {}
 func (*MaintenancePolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{43}
+	return fileDescriptor_339d8120448ec82b, []int{43}
 }
+
 func (m *MaintenancePolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaintenancePolicy.Unmarshal(m, b)
 }
 func (m *MaintenancePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaintenancePolicy.Marshal(b, m, deterministic)
 }
-func (dst *MaintenancePolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaintenancePolicy.Merge(dst, src)
+func (m *MaintenancePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenancePolicy.Merge(m, src)
 }
 func (m *MaintenancePolicy) XXX_Size() int {
 	return xxx_messageInfo_MaintenancePolicy.Size(m)
@@ -4240,16 +4299,17 @@ func (m *MaintenanceWindow) Reset()         { *m = MaintenanceWindow{} }
 func (m *MaintenanceWindow) String() string { return proto.CompactTextString(m) }
 func (*MaintenanceWindow) ProtoMessage()    {}
 func (*MaintenanceWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{44}
+	return fileDescriptor_339d8120448ec82b, []int{44}
 }
+
 func (m *MaintenanceWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaintenanceWindow.Unmarshal(m, b)
 }
 func (m *MaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaintenanceWindow.Marshal(b, m, deterministic)
 }
-func (dst *MaintenanceWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaintenanceWindow.Merge(dst, src)
+func (m *MaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenanceWindow.Merge(m, src)
 }
 func (m *MaintenanceWindow) XXX_Size() int {
 	return xxx_messageInfo_MaintenanceWindow.Size(m)
@@ -4284,61 +4344,13 @@ func (m *MaintenanceWindow) GetDailyMaintenanceWindow() *DailyMaintenanceWindow
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MaintenanceWindow) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MaintenanceWindow_OneofMarshaler, _MaintenanceWindow_OneofUnmarshaler, _MaintenanceWindow_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MaintenanceWindow) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MaintenanceWindow_DailyMaintenanceWindow)(nil),
 	}
 }
 
-func _MaintenanceWindow_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MaintenanceWindow)
-	// policy
-	switch x := m.Policy.(type) {
-	case *MaintenanceWindow_DailyMaintenanceWindow:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DailyMaintenanceWindow); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MaintenanceWindow.Policy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MaintenanceWindow_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MaintenanceWindow)
-	switch tag {
-	case 2: // policy.daily_maintenance_window
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DailyMaintenanceWindow)
-		err := b.DecodeMessage(msg)
-		m.Policy = &MaintenanceWindow_DailyMaintenanceWindow{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MaintenanceWindow)
-	// policy
-	switch x := m.Policy.(type) {
-	case *MaintenanceWindow_DailyMaintenanceWindow:
-		s := proto.Size(x.DailyMaintenanceWindow)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Time window specified for daily maintenance operations.
 type DailyMaintenanceWindow struct {
 	// Time within the maintenance window to start the maintenance operations.
@@ -4356,16 +4368,17 @@ func (m *DailyMaintenanceWindow) Reset()         { *m = DailyMaintenanceWindow{}
 func (m *DailyMaintenanceWindow) String() string { return proto.CompactTextString(m) }
 func (*DailyMaintenanceWindow) ProtoMessage()    {}
 func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{45}
+	return fileDescriptor_339d8120448ec82b, []int{45}
 }
+
 func (m *DailyMaintenanceWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DailyMaintenanceWindow.Unmarshal(m, b)
 }
 func (m *DailyMaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DailyMaintenanceWindow.Marshal(b, m, deterministic)
 }
-func (dst *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DailyMaintenanceWindow.Merge(dst, src)
+func (m *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DailyMaintenanceWindow.Merge(m, src)
 }
 func (m *DailyMaintenanceWindow) XXX_Size() int {
 	return xxx_messageInfo_DailyMaintenanceWindow.Size(m)
@@ -4423,16 +4436,17 @@ func (m *SetNodePoolManagementRequest) Reset()         { *m = SetNodePoolManagem
 func (m *SetNodePoolManagementRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolManagementRequest) ProtoMessage()    {}
 func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{46}
+	return fileDescriptor_339d8120448ec82b, []int{46}
 }
+
 func (m *SetNodePoolManagementRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolManagementRequest.Merge(dst, src)
+func (m *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolManagementRequest.Merge(m, src)
 }
 func (m *SetNodePoolManagementRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Size(m)
@@ -4517,16 +4531,17 @@ func (m *SetNodePoolSizeRequest) Reset()         { *m = SetNodePoolSizeRequest{}
 func (m *SetNodePoolSizeRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolSizeRequest) ProtoMessage()    {}
 func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{47}
+	return fileDescriptor_339d8120448ec82b, []int{47}
 }
+
 func (m *SetNodePoolSizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolSizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolSizeRequest.Merge(dst, src)
+func (m *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolSizeRequest.Merge(m, src)
 }
 func (m *SetNodePoolSizeRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Size(m)
@@ -4611,16 +4626,17 @@ func (m *RollbackNodePoolUpgradeRequest) Reset()         { *m = RollbackNodePool
 func (m *RollbackNodePoolUpgradeRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackNodePoolUpgradeRequest) ProtoMessage()    {}
 func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{48}
+	return fileDescriptor_339d8120448ec82b, []int{48}
 }
+
 func (m *RollbackNodePoolUpgradeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Unmarshal(m, b)
 }
 func (m *RollbackNodePoolUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(dst, src)
+func (m *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(m, src)
 }
 func (m *RollbackNodePoolUpgradeRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Size(m)
@@ -4679,16 +4695,17 @@ func (m *ListNodePoolsResponse) Reset()         { *m = ListNodePoolsResponse{} }
 func (m *ListNodePoolsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNodePoolsResponse) ProtoMessage()    {}
 func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{49}
+	return fileDescriptor_339d8120448ec82b, []int{49}
 }
+
 func (m *ListNodePoolsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNodePoolsResponse.Unmarshal(m, b)
 }
 func (m *ListNodePoolsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNodePoolsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNodePoolsResponse.Merge(dst, src)
+func (m *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsResponse.Merge(m, src)
 }
 func (m *ListNodePoolsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNodePoolsResponse.Size(m)
@@ -4726,16 +4743,17 @@ func (m *NodePoolAutoscaling) Reset()         { *m = NodePoolAutoscaling{} }
 func (m *NodePoolAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*NodePoolAutoscaling) ProtoMessage()    {}
 func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{50}
+	return fileDescriptor_339d8120448ec82b, []int{50}
 }
+
 func (m *NodePoolAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodePoolAutoscaling.Unmarshal(m, b)
 }
 func (m *NodePoolAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodePoolAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodePoolAutoscaling.Merge(dst, src)
+func (m *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePoolAutoscaling.Merge(m, src)
 }
 func (m *NodePoolAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_NodePoolAutoscaling.Size(m)
@@ -4804,16 +4822,17 @@ func (m *SetLabelsRequest) Reset()         { *m = SetLabelsRequest{} }
 func (m *SetLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLabelsRequest) ProtoMessage()    {}
 func (*SetLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{51}
+	return fileDescriptor_339d8120448ec82b, []int{51}
 }
+
 func (m *SetLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLabelsRequest.Unmarshal(m, b)
 }
 func (m *SetLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLabelsRequest.Merge(dst, src)
+func (m *SetLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLabelsRequest.Merge(m, src)
 }
 func (m *SetLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLabelsRequest.Size(m)
@@ -4895,16 +4914,17 @@ func (m *SetLegacyAbacRequest) Reset()         { *m = SetLegacyAbacRequest{} }
 func (m *SetLegacyAbacRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLegacyAbacRequest) ProtoMessage()    {}
 func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{52}
+	return fileDescriptor_339d8120448ec82b, []int{52}
 }
+
 func (m *SetLegacyAbacRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLegacyAbacRequest.Unmarshal(m, b)
 }
 func (m *SetLegacyAbacRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLegacyAbacRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLegacyAbacRequest.Merge(dst, src)
+func (m *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLegacyAbacRequest.Merge(m, src)
 }
 func (m *SetLegacyAbacRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLegacyAbacRequest.Size(m)
@@ -4977,16 +4997,17 @@ func (m *StartIPRotationRequest) Reset()         { *m = StartIPRotationRequest{}
 func (m *StartIPRotationRequest) String() string { return proto.CompactTextString(m) }
 func (*StartIPRotationRequest) ProtoMessage()    {}
 func (*StartIPRotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{53}
+	return fileDescriptor_339d8120448ec82b, []int{53}
 }
+
 func (m *StartIPRotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StartIPRotationRequest.Unmarshal(m, b)
 }
 func (m *StartIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StartIPRotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *StartIPRotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StartIPRotationRequest.Merge(dst, src)
+func (m *StartIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartIPRotationRequest.Merge(m, src)
 }
 func (m *StartIPRotationRequest) XXX_Size() int {
 	return xxx_messageInfo_StartIPRotationRequest.Size(m)
@@ -5051,16 +5072,17 @@ func (m *CompleteIPRotationRequest) Reset()         { *m = CompleteIPRotationReq
 func (m *CompleteIPRotationRequest) String() string { return proto.CompactTextString(m) }
 func (*CompleteIPRotationRequest) ProtoMessage()    {}
 func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{54}
+	return fileDescriptor_339d8120448ec82b, []int{54}
 }
+
 func (m *CompleteIPRotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompleteIPRotationRequest.Unmarshal(m, b)
 }
 func (m *CompleteIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompleteIPRotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompleteIPRotationRequest.Merge(dst, src)
+func (m *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteIPRotationRequest.Merge(m, src)
 }
 func (m *CompleteIPRotationRequest) XXX_Size() int {
 	return xxx_messageInfo_CompleteIPRotationRequest.Size(m)
@@ -5115,16 +5137,17 @@ func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
 func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
 func (*AcceleratorConfig) ProtoMessage()    {}
 func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{55}
+	return fileDescriptor_339d8120448ec82b, []int{55}
 }
+
 func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
 }
 func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
 }
-func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+func (m *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(m, src)
 }
 func (m *AcceleratorConfig) XXX_Size() int {
 	return xxx_messageInfo_AcceleratorConfig.Size(m)
@@ -5178,16 +5201,17 @@ func (m *SetNetworkPolicyRequest) Reset()         { *m = SetNetworkPolicyRequest
 func (m *SetNetworkPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNetworkPolicyRequest) ProtoMessage()    {}
 func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{56}
+	return fileDescriptor_339d8120448ec82b, []int{56}
 }
+
 func (m *SetNetworkPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Unmarshal(m, b)
 }
 func (m *SetNetworkPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNetworkPolicyRequest.Merge(dst, src)
+func (m *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNetworkPolicyRequest.Merge(m, src)
 }
 func (m *SetNetworkPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Size(m)
@@ -5260,16 +5284,17 @@ func (m *SetMaintenancePolicyRequest) Reset()         { *m = SetMaintenancePolic
 func (m *SetMaintenancePolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMaintenancePolicyRequest) ProtoMessage()    {}
 func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_e36c06b9432393ee, []int{57}
+	return fileDescriptor_339d8120448ec82b, []int{57}
 }
+
 func (m *SetMaintenancePolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Unmarshal(m, b)
 }
 func (m *SetMaintenancePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(dst, src)
+func (m *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(m, src)
 }
 func (m *SetMaintenancePolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Size(m)
@@ -5316,6 +5341,13 @@ func (m *SetMaintenancePolicyRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.container.v1alpha1.NodeTaint_Effect", NodeTaint_Effect_name, NodeTaint_Effect_value)
+	proto.RegisterEnum("google.container.v1alpha1.NetworkPolicy_Provider", NetworkPolicy_Provider_name, NetworkPolicy_Provider_value)
+	proto.RegisterEnum("google.container.v1alpha1.Cluster_Status", Cluster_Status_name, Cluster_Status_value)
+	proto.RegisterEnum("google.container.v1alpha1.Operation_Status", Operation_Status_name, Operation_Status_value)
+	proto.RegisterEnum("google.container.v1alpha1.Operation_Type", Operation_Type_name, Operation_Type_value)
+	proto.RegisterEnum("google.container.v1alpha1.SetMasterAuthRequest_Action", SetMasterAuthRequest_Action_name, SetMasterAuthRequest_Action_value)
+	proto.RegisterEnum("google.container.v1alpha1.NodePool_Status", NodePool_Status_name, NodePool_Status_value)
 	proto.RegisterType((*NodeConfig)(nil), "google.container.v1alpha1.NodeConfig")
 	proto.RegisterMapType((map[string]string)(nil), "google.container.v1alpha1.NodeConfig.LabelsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.container.v1alpha1.NodeConfig.MetadataEntry")
@@ -5378,1159 +5410,13 @@ func init() {
 	proto.RegisterType((*AcceleratorConfig)(nil), "google.container.v1alpha1.AcceleratorConfig")
 	proto.RegisterType((*SetNetworkPolicyRequest)(nil), "google.container.v1alpha1.SetNetworkPolicyRequest")
 	proto.RegisterType((*SetMaintenancePolicyRequest)(nil), "google.container.v1alpha1.SetMaintenancePolicyRequest")
-	proto.RegisterEnum("google.container.v1alpha1.NodeTaint_Effect", NodeTaint_Effect_name, NodeTaint_Effect_value)
-	proto.RegisterEnum("google.container.v1alpha1.NetworkPolicy_Provider", NetworkPolicy_Provider_name, NetworkPolicy_Provider_value)
-	proto.RegisterEnum("google.container.v1alpha1.Cluster_Status", Cluster_Status_name, Cluster_Status_value)
-	proto.RegisterEnum("google.container.v1alpha1.Operation_Status", Operation_Status_name, Operation_Status_value)
-	proto.RegisterEnum("google.container.v1alpha1.Operation_Type", Operation_Type_name, Operation_Type_value)
-	proto.RegisterEnum("google.container.v1alpha1.SetMasterAuthRequest_Action", SetMasterAuthRequest_Action_name, SetMasterAuthRequest_Action_value)
-	proto.RegisterEnum("google.container.v1alpha1.NodePool_Status", NodePool_Status_name, NodePool_Status_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ClusterManagerClient is the client API for ClusterManager service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ClusterManagerClient interface {
-	// Lists all clusters owned by a project in either the specified zone or all
-	// zones.
-	ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error)
-	// Gets the details of a specific cluster.
-	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
-	// Creates a cluster, consisting of the specified number and type of Google
-	// Compute Engine instances.
-	//
-	// By default, the cluster is created in the project's
-	// [default network](/compute/docs/networks-and-firewalls#networks).
-	//
-	// One firewall is added for the cluster. After cluster creation,
-	// the cluster creates routes for each node to allow the containers
-	// on that node to communicate with all other instances in the
-	// cluster.
-	//
-	// Finally, an entry is added to the project's global metadata indicating
-	// which CIDR range is being used by the cluster.
-	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the settings of a specific cluster.
-	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the version and/or iamge type of a specific node pool.
-	UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the autoscaling settings of a specific node pool.
-	SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the logging service of a specific cluster.
-	SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the monitoring service of a specific cluster.
-	SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the addons of a specific cluster.
-	SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the locations of a specific cluster.
-	SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the master of a specific cluster.
-	UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Used to set master auth materials. Currently supports :-
-	// Changing the admin password of a specific cluster.
-	// This can be either via password generation or explicitly set.
-	// Modify basic_auth.csv and reset the K8S API server.
-	SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Deletes the cluster, including the Kubernetes endpoint and all worker
-	// nodes.
-	//
-	// Firewalls and routes that were configured during cluster creation
-	// are also deleted.
-	//
-	// Other Google Compute Engine resources that might be in use by the cluster
-	// (e.g. load balancer resources) will not be deleted if they weren't present
-	// at the initial create time.
-	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Lists all operations in a project in a specific zone or all zones.
-	ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error)
-	// Gets the specified operation.
-	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Cancels the specified operation.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Returns configuration info about the Container Engine service.
-	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
-	// Lists the node pools for a cluster.
-	ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error)
-	// Retrieves the node pool requested.
-	GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error)
-	// Creates a node pool for a cluster.
-	CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Deletes a node pool from a cluster.
-	DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Roll back the previously Aborted or Failed NodePool upgrade.
-	// This will be an no-op if the last upgrade successfully completed.
-	RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the NodeManagement options for a node pool.
-	SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets labels on a cluster.
-	SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Enables or disables the ABAC authorization mechanism on a cluster.
-	SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Start master IP rotation.
-	StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Completes master IP rotation.
-	CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the size of a specific node pool.
-	SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Enables/Disables Network Policy for a cluster.
-	SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the maintenance policy for a cluster.
-	SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error)
-}
-
-type clusterManagerClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
-	return &clusterManagerClient{cc}
-}
-
-func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
-	out := new(ListClustersResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListClusters", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
-	out := new(Cluster)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
 }
 
-func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
+func init() {
+	proto.RegisterFile("google/container/v1alpha1/cluster_service.proto", fileDescriptor_339d8120448ec82b)
 }
 
-func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLoggingService", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMonitoringService", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetAddonsConfig", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLocations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateMaster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMasterAuth", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
-	out := new(ListOperationsResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListOperations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetOperation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CancelOperation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
-	out := new(ServerConfig)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetServerConfig", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
-	out := new(ListNodePoolsResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListNodePools", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
-	out := new(NodePool)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolManagement", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLabels", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLegacyAbac", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/StartIPRotation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CompleteIPRotation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolSize", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNetworkPolicy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ClusterManagerServer is the server API for ClusterManager service.
-type ClusterManagerServer interface {
-	// Lists all clusters owned by a project in either the specified zone or all
-	// zones.
-	ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error)
-	// Gets the details of a specific cluster.
-	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
-	// Creates a cluster, consisting of the specified number and type of Google
-	// Compute Engine instances.
-	//
-	// By default, the cluster is created in the project's
-	// [default network](/compute/docs/networks-and-firewalls#networks).
-	//
-	// One firewall is added for the cluster. After cluster creation,
-	// the cluster creates routes for each node to allow the containers
-	// on that node to communicate with all other instances in the
-	// cluster.
-	//
-	// Finally, an entry is added to the project's global metadata indicating
-	// which CIDR range is being used by the cluster.
-	CreateCluster(context.Context, *CreateClusterRequest) (*Operation, error)
-	// Updates the settings of a specific cluster.
-	UpdateCluster(context.Context, *UpdateClusterRequest) (*Operation, error)
-	// Updates the version and/or iamge type of a specific node pool.
-	UpdateNodePool(context.Context, *UpdateNodePoolRequest) (*Operation, error)
-	// Sets the autoscaling settings of a specific node pool.
-	SetNodePoolAutoscaling(context.Context, *SetNodePoolAutoscalingRequest) (*Operation, error)
-	// Sets the logging service of a specific cluster.
-	SetLoggingService(context.Context, *SetLoggingServiceRequest) (*Operation, error)
-	// Sets the monitoring service of a specific cluster.
-	SetMonitoringService(context.Context, *SetMonitoringServiceRequest) (*Operation, error)
-	// Sets the addons of a specific cluster.
-	SetAddonsConfig(context.Context, *SetAddonsConfigRequest) (*Operation, error)
-	// Sets the locations of a specific cluster.
-	SetLocations(context.Context, *SetLocationsRequest) (*Operation, error)
-	// Updates the master of a specific cluster.
-	UpdateMaster(context.Context, *UpdateMasterRequest) (*Operation, error)
-	// Used to set master auth materials. Currently supports :-
-	// Changing the admin password of a specific cluster.
-	// This can be either via password generation or explicitly set.
-	// Modify basic_auth.csv and reset the K8S API server.
-	SetMasterAuth(context.Context, *SetMasterAuthRequest) (*Operation, error)
-	// Deletes the cluster, including the Kubernetes endpoint and all worker
-	// nodes.
-	//
-	// Firewalls and routes that were configured during cluster creation
-	// are also deleted.
-	//
-	// Other Google Compute Engine resources that might be in use by the cluster
-	// (e.g. load balancer resources) will not be deleted if they weren't present
-	// at the initial create time.
-	DeleteCluster(context.Context, *DeleteClusterRequest) (*Operation, error)
-	// Lists all operations in a project in a specific zone or all zones.
-	ListOperations(context.Context, *ListOperationsRequest) (*ListOperationsResponse, error)
-	// Gets the specified operation.
-	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
-	// Cancels the specified operation.
-	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
-	// Returns configuration info about the Container Engine service.
-	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
-	// Lists the node pools for a cluster.
-	ListNodePools(context.Context, *ListNodePoolsRequest) (*ListNodePoolsResponse, error)
-	// Retrieves the node pool requested.
-	GetNodePool(context.Context, *GetNodePoolRequest) (*NodePool, error)
-	// Creates a node pool for a cluster.
-	CreateNodePool(context.Context, *CreateNodePoolRequest) (*Operation, error)
-	// Deletes a node pool from a cluster.
-	DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error)
-	// Roll back the previously Aborted or Failed NodePool upgrade.
-	// This will be an no-op if the last upgrade successfully completed.
-	RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error)
-	// Sets the NodeManagement options for a node pool.
-	SetNodePoolManagement(context.Context, *SetNodePoolManagementRequest) (*Operation, error)
-	// Sets labels on a cluster.
-	SetLabels(context.Context, *SetLabelsRequest) (*Operation, error)
-	// Enables or disables the ABAC authorization mechanism on a cluster.
-	SetLegacyAbac(context.Context, *SetLegacyAbacRequest) (*Operation, error)
-	// Start master IP rotation.
-	StartIPRotation(context.Context, *StartIPRotationRequest) (*Operation, error)
-	// Completes master IP rotation.
-	CompleteIPRotation(context.Context, *CompleteIPRotationRequest) (*Operation, error)
-	// Sets the size of a specific node pool.
-	SetNodePoolSize(context.Context, *SetNodePoolSizeRequest) (*Operation, error)
-	// Enables/Disables Network Policy for a cluster.
-	SetNetworkPolicy(context.Context, *SetNetworkPolicyRequest) (*Operation, error)
-	// Sets the maintenance policy for a cluster.
-	SetMaintenancePolicy(context.Context, *SetMaintenancePolicyRequest) (*Operation, error)
-}
-
-func RegisterClusterManagerServer(s *grpc.Server, srv ClusterManagerServer) {
-	s.RegisterService(&_ClusterManager_serviceDesc, srv)
-}
-
-func _ClusterManager_ListClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListClustersRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListClusters(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/ListClusters",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListClusters(ctx, req.(*ListClustersRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/GetCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetCluster(ctx, req.(*GetClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CreateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CreateCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/CreateCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CreateCluster(ctx, req.(*CreateClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/UpdateCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateCluster(ctx, req.(*UpdateClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/UpdateNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateNodePool(ctx, req.(*UpdateNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolAutoscaling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolAutoscalingRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNodePoolAutoscaling",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, req.(*SetNodePoolAutoscalingRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLoggingService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLoggingServiceRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLoggingService(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLoggingService",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLoggingService(ctx, req.(*SetLoggingServiceRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMonitoringService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMonitoringServiceRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMonitoringService(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetMonitoringService",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMonitoringService(ctx, req.(*SetMonitoringServiceRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetAddonsConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetAddonsConfigRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetAddonsConfig",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, req.(*SetAddonsConfigRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLocationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLocations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLocations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLocations(ctx, req.(*SetLocationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateMaster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateMasterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateMaster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/UpdateMaster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateMaster(ctx, req.(*UpdateMasterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMasterAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMasterAuthRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMasterAuth(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetMasterAuth",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMasterAuth(ctx, req.(*SetMasterAuthRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_DeleteCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).DeleteCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/DeleteCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).DeleteCluster(ctx, req.(*DeleteClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListOperations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListOperationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListOperations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/ListOperations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListOperations(ctx, req.(*ListOperationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetOperationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetOperation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/GetOperation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetOperation(ctx, req.(*GetOperationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CancelOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CancelOperationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CancelOperation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/CancelOperation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CancelOperation(ctx, req.(*CancelOperationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetServerConfigRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetServerConfig(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/GetServerConfig",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetServerConfig(ctx, req.(*GetServerConfigRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListNodePools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListNodePoolsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListNodePools(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/ListNodePools",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListNodePools(ctx, req.(*ListNodePoolsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/GetNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetNodePool(ctx, req.(*GetNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CreateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CreateNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/CreateNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CreateNodePool(ctx, req.(*CreateNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_DeleteNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).DeleteNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/DeleteNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).DeleteNodePool(ctx, req.(*DeleteNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_RollbackNodePoolUpgrade_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RollbackNodePoolUpgradeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/RollbackNodePoolUpgrade",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, req.(*RollbackNodePoolUpgradeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolManagement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolManagementRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNodePoolManagement",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, req.(*SetNodePoolManagementRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLabels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLabelsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLabels(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLabels",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLabels(ctx, req.(*SetLabelsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLegacyAbac_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLegacyAbacRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLegacyAbac",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, req.(*SetLegacyAbacRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_StartIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(StartIPRotationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).StartIPRotation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/StartIPRotation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).StartIPRotation(ctx, req.(*StartIPRotationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CompleteIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CompleteIPRotationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/CompleteIPRotation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, req.(*CompleteIPRotationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolSize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolSizeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNodePoolSize",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, req.(*SetNodePoolSizeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNetworkPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNetworkPolicyRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNetworkPolicy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, req.(*SetNetworkPolicyRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMaintenancePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMaintenancePolicyRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1alpha1.ClusterManager/SetMaintenancePolicy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, req.(*SetMaintenancePolicyRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ClusterManager_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.container.v1alpha1.ClusterManager",
-	HandlerType: (*ClusterManagerServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "ListClusters",
-			Handler:    _ClusterManager_ListClusters_Handler,
-		},
-		{
-			MethodName: "GetCluster",
-			Handler:    _ClusterManager_GetCluster_Handler,
-		},
-		{
-			MethodName: "CreateCluster",
-			Handler:    _ClusterManager_CreateCluster_Handler,
-		},
-		{
-			MethodName: "UpdateCluster",
-			Handler:    _ClusterManager_UpdateCluster_Handler,
-		},
-		{
-			MethodName: "UpdateNodePool",
-			Handler:    _ClusterManager_UpdateNodePool_Handler,
-		},
-		{
-			MethodName: "SetNodePoolAutoscaling",
-			Handler:    _ClusterManager_SetNodePoolAutoscaling_Handler,
-		},
-		{
-			MethodName: "SetLoggingService",
-			Handler:    _ClusterManager_SetLoggingService_Handler,
-		},
-		{
-			MethodName: "SetMonitoringService",
-			Handler:    _ClusterManager_SetMonitoringService_Handler,
-		},
-		{
-			MethodName: "SetAddonsConfig",
-			Handler:    _ClusterManager_SetAddonsConfig_Handler,
-		},
-		{
-			MethodName: "SetLocations",
-			Handler:    _ClusterManager_SetLocations_Handler,
-		},
-		{
-			MethodName: "UpdateMaster",
-			Handler:    _ClusterManager_UpdateMaster_Handler,
-		},
-		{
-			MethodName: "SetMasterAuth",
-			Handler:    _ClusterManager_SetMasterAuth_Handler,
-		},
-		{
-			MethodName: "DeleteCluster",
-			Handler:    _ClusterManager_DeleteCluster_Handler,
-		},
-		{
-			MethodName: "ListOperations",
-			Handler:    _ClusterManager_ListOperations_Handler,
-		},
-		{
-			MethodName: "GetOperation",
-			Handler:    _ClusterManager_GetOperation_Handler,
-		},
-		{
-			MethodName: "CancelOperation",
-			Handler:    _ClusterManager_CancelOperation_Handler,
-		},
-		{
-			MethodName: "GetServerConfig",
-			Handler:    _ClusterManager_GetServerConfig_Handler,
-		},
-		{
-			MethodName: "ListNodePools",
-			Handler:    _ClusterManager_ListNodePools_Handler,
-		},
-		{
-			MethodName: "GetNodePool",
-			Handler:    _ClusterManager_GetNodePool_Handler,
-		},
-		{
-			MethodName: "CreateNodePool",
-			Handler:    _ClusterManager_CreateNodePool_Handler,
-		},
-		{
-			MethodName: "DeleteNodePool",
-			Handler:    _ClusterManager_DeleteNodePool_Handler,
-		},
-		{
-			MethodName: "RollbackNodePoolUpgrade",
-			Handler:    _ClusterManager_RollbackNodePoolUpgrade_Handler,
-		},
-		{
-			MethodName: "SetNodePoolManagement",
-			Handler:    _ClusterManager_SetNodePoolManagement_Handler,
-		},
-		{
-			MethodName: "SetLabels",
-			Handler:    _ClusterManager_SetLabels_Handler,
-		},
-		{
-			MethodName: "SetLegacyAbac",
-			Handler:    _ClusterManager_SetLegacyAbac_Handler,
-		},
-		{
-			MethodName: "StartIPRotation",
-			Handler:    _ClusterManager_StartIPRotation_Handler,
-		},
-		{
-			MethodName: "CompleteIPRotation",
-			Handler:    _ClusterManager_CompleteIPRotation_Handler,
-		},
-		{
-			MethodName: "SetNodePoolSize",
-			Handler:    _ClusterManager_SetNodePoolSize_Handler,
-		},
-		{
-			MethodName: "SetNetworkPolicy",
-			Handler:    _ClusterManager_SetNetworkPolicy_Handler,
-		},
-		{
-			MethodName: "SetMaintenancePolicy",
-			Handler:    _ClusterManager_SetMaintenancePolicy_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/container/v1alpha1/cluster_service.proto",
-}
-
-func init() {
-	proto.RegisterFile("google/container/v1alpha1/cluster_service.proto", fileDescriptor_cluster_service_e36c06b9432393ee)
-}
-
-var fileDescriptor_cluster_service_e36c06b9432393ee = []byte{
+var fileDescriptor_339d8120448ec82b = []byte{
 	// 4786 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x7c, 0x5d, 0x6c, 0x23, 0xd7,
 	0x75, 0x7f, 0x46, 0xa2, 0x28, 0xf1, 0x90, 0xa2, 0xa8, 0xab, 0x2f, 0x2e, 0xed, 0xb5, 0xd7, 0x13,
@@ -6833,3 +5719,1142 @@ var fileDescriptor_cluster_service_e36c06b9432393ee = []byte{
 	0x9a, 0x6e, 0xf9, 0xe2, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xec, 0x17, 0x6d, 0x5d, 0xce, 0x4d,
 	0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ClusterManagerClient is the client API for ClusterManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ClusterManagerClient interface {
+	// Lists all clusters owned by a project in either the specified zone or all
+	// zones.
+	ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error)
+	// Gets the details of a specific cluster.
+	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
+	// Creates a cluster, consisting of the specified number and type of Google
+	// Compute Engine instances.
+	//
+	// By default, the cluster is created in the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// One firewall is added for the cluster. After cluster creation,
+	// the cluster creates routes for each node to allow the containers
+	// on that node to communicate with all other instances in the
+	// cluster.
+	//
+	// Finally, an entry is added to the project's global metadata indicating
+	// which CIDR range is being used by the cluster.
+	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the settings of a specific cluster.
+	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the version and/or iamge type of a specific node pool.
+	UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the autoscaling settings of a specific node pool.
+	SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the logging service of a specific cluster.
+	SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the monitoring service of a specific cluster.
+	SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the addons of a specific cluster.
+	SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the locations of a specific cluster.
+	SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the master of a specific cluster.
+	UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Used to set master auth materials. Currently supports :-
+	// Changing the admin password of a specific cluster.
+	// This can be either via password generation or explicitly set.
+	// Modify basic_auth.csv and reset the K8S API server.
+	SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Deletes the cluster, including the Kubernetes endpoint and all worker
+	// nodes.
+	//
+	// Firewalls and routes that were configured during cluster creation
+	// are also deleted.
+	//
+	// Other Google Compute Engine resources that might be in use by the cluster
+	// (e.g. load balancer resources) will not be deleted if they weren't present
+	// at the initial create time.
+	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Lists all operations in a project in a specific zone or all zones.
+	ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error)
+	// Gets the specified operation.
+	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Cancels the specified operation.
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Returns configuration info about the Container Engine service.
+	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
+	// Lists the node pools for a cluster.
+	ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error)
+	// Retrieves the node pool requested.
+	GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error)
+	// Creates a node pool for a cluster.
+	CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Deletes a node pool from a cluster.
+	DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Roll back the previously Aborted or Failed NodePool upgrade.
+	// This will be an no-op if the last upgrade successfully completed.
+	RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the NodeManagement options for a node pool.
+	SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets labels on a cluster.
+	SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Enables or disables the ABAC authorization mechanism on a cluster.
+	SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Start master IP rotation.
+	StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Completes master IP rotation.
+	CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the size of a specific node pool.
+	SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Enables/Disables Network Policy for a cluster.
+	SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the maintenance policy for a cluster.
+	SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error)
+}
+
+type clusterManagerClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
+	return &clusterManagerClient{cc}
+}
+
+func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
+	out := new(ListClustersResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListClusters", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
+	out := new(Cluster)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLoggingService", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMonitoringService", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetAddonsConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLocations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateMaster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMasterAuth", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
+	out := new(ListOperationsResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListOperations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetOperation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CancelOperation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
+	out := new(ServerConfig)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetServerConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
+	out := new(ListNodePoolsResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListNodePools", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
+	out := new(NodePool)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolManagement", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLabels", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLegacyAbac", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/StartIPRotation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CompleteIPRotation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolSize", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNetworkPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ClusterManagerServer is the server API for ClusterManager service.
+type ClusterManagerServer interface {
+	// Lists all clusters owned by a project in either the specified zone or all
+	// zones.
+	ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error)
+	// Gets the details of a specific cluster.
+	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
+	// Creates a cluster, consisting of the specified number and type of Google
+	// Compute Engine instances.
+	//
+	// By default, the cluster is created in the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// One firewall is added for the cluster. After cluster creation,
+	// the cluster creates routes for each node to allow the containers
+	// on that node to communicate with all other instances in the
+	// cluster.
+	//
+	// Finally, an entry is added to the project's global metadata indicating
+	// which CIDR range is being used by the cluster.
+	CreateCluster(context.Context, *CreateClusterRequest) (*Operation, error)
+	// Updates the settings of a specific cluster.
+	UpdateCluster(context.Context, *UpdateClusterRequest) (*Operation, error)
+	// Updates the version and/or iamge type of a specific node pool.
+	UpdateNodePool(context.Context, *UpdateNodePoolRequest) (*Operation, error)
+	// Sets the autoscaling settings of a specific node pool.
+	SetNodePoolAutoscaling(context.Context, *SetNodePoolAutoscalingRequest) (*Operation, error)
+	// Sets the logging service of a specific cluster.
+	SetLoggingService(context.Context, *SetLoggingServiceRequest) (*Operation, error)
+	// Sets the monitoring service of a specific cluster.
+	SetMonitoringService(context.Context, *SetMonitoringServiceRequest) (*Operation, error)
+	// Sets the addons of a specific cluster.
+	SetAddonsConfig(context.Context, *SetAddonsConfigRequest) (*Operation, error)
+	// Sets the locations of a specific cluster.
+	SetLocations(context.Context, *SetLocationsRequest) (*Operation, error)
+	// Updates the master of a specific cluster.
+	UpdateMaster(context.Context, *UpdateMasterRequest) (*Operation, error)
+	// Used to set master auth materials. Currently supports :-
+	// Changing the admin password of a specific cluster.
+	// This can be either via password generation or explicitly set.
+	// Modify basic_auth.csv and reset the K8S API server.
+	SetMasterAuth(context.Context, *SetMasterAuthRequest) (*Operation, error)
+	// Deletes the cluster, including the Kubernetes endpoint and all worker
+	// nodes.
+	//
+	// Firewalls and routes that were configured during cluster creation
+	// are also deleted.
+	//
+	// Other Google Compute Engine resources that might be in use by the cluster
+	// (e.g. load balancer resources) will not be deleted if they weren't present
+	// at the initial create time.
+	DeleteCluster(context.Context, *DeleteClusterRequest) (*Operation, error)
+	// Lists all operations in a project in a specific zone or all zones.
+	ListOperations(context.Context, *ListOperationsRequest) (*ListOperationsResponse, error)
+	// Gets the specified operation.
+	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
+	// Cancels the specified operation.
+	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
+	// Returns configuration info about the Container Engine service.
+	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
+	// Lists the node pools for a cluster.
+	ListNodePools(context.Context, *ListNodePoolsRequest) (*ListNodePoolsResponse, error)
+	// Retrieves the node pool requested.
+	GetNodePool(context.Context, *GetNodePoolRequest) (*NodePool, error)
+	// Creates a node pool for a cluster.
+	CreateNodePool(context.Context, *CreateNodePoolRequest) (*Operation, error)
+	// Deletes a node pool from a cluster.
+	DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error)
+	// Roll back the previously Aborted or Failed NodePool upgrade.
+	// This will be an no-op if the last upgrade successfully completed.
+	RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error)
+	// Sets the NodeManagement options for a node pool.
+	SetNodePoolManagement(context.Context, *SetNodePoolManagementRequest) (*Operation, error)
+	// Sets labels on a cluster.
+	SetLabels(context.Context, *SetLabelsRequest) (*Operation, error)
+	// Enables or disables the ABAC authorization mechanism on a cluster.
+	SetLegacyAbac(context.Context, *SetLegacyAbacRequest) (*Operation, error)
+	// Start master IP rotation.
+	StartIPRotation(context.Context, *StartIPRotationRequest) (*Operation, error)
+	// Completes master IP rotation.
+	CompleteIPRotation(context.Context, *CompleteIPRotationRequest) (*Operation, error)
+	// Sets the size of a specific node pool.
+	SetNodePoolSize(context.Context, *SetNodePoolSizeRequest) (*Operation, error)
+	// Enables/Disables Network Policy for a cluster.
+	SetNetworkPolicy(context.Context, *SetNetworkPolicyRequest) (*Operation, error)
+	// Sets the maintenance policy for a cluster.
+	SetMaintenancePolicy(context.Context, *SetMaintenancePolicyRequest) (*Operation, error)
+}
+
+func RegisterClusterManagerServer(s *grpc.Server, srv ClusterManagerServer) {
+	s.RegisterService(&_ClusterManager_serviceDesc, srv)
+}
+
+func _ClusterManager_ListClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListClustersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListClusters(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/ListClusters",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListClusters(ctx, req.(*ListClustersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/GetCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetCluster(ctx, req.(*GetClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CreateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CreateCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/CreateCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CreateCluster(ctx, req.(*CreateClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/UpdateCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateCluster(ctx, req.(*UpdateClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/UpdateNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateNodePool(ctx, req.(*UpdateNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolAutoscaling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolAutoscalingRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNodePoolAutoscaling",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, req.(*SetNodePoolAutoscalingRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLoggingService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLoggingServiceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLoggingService(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLoggingService",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLoggingService(ctx, req.(*SetLoggingServiceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMonitoringService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMonitoringServiceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMonitoringService(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetMonitoringService",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMonitoringService(ctx, req.(*SetMonitoringServiceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetAddonsConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetAddonsConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetAddonsConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, req.(*SetAddonsConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLocationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLocations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLocations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLocations(ctx, req.(*SetLocationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateMaster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateMasterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateMaster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/UpdateMaster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateMaster(ctx, req.(*UpdateMasterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMasterAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMasterAuthRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMasterAuth(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetMasterAuth",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMasterAuth(ctx, req.(*SetMasterAuthRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_DeleteCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).DeleteCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/DeleteCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).DeleteCluster(ctx, req.(*DeleteClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListOperations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListOperationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListOperations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/ListOperations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListOperations(ctx, req.(*ListOperationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/GetOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetOperation(ctx, req.(*GetOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CancelOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CancelOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/CancelOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CancelOperation(ctx, req.(*CancelOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetServerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetServerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/GetServerConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetServerConfig(ctx, req.(*GetServerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListNodePools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListNodePoolsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListNodePools(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/ListNodePools",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListNodePools(ctx, req.(*ListNodePoolsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/GetNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetNodePool(ctx, req.(*GetNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CreateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CreateNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/CreateNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CreateNodePool(ctx, req.(*CreateNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_DeleteNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).DeleteNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/DeleteNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).DeleteNodePool(ctx, req.(*DeleteNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_RollbackNodePoolUpgrade_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RollbackNodePoolUpgradeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/RollbackNodePoolUpgrade",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, req.(*RollbackNodePoolUpgradeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolManagement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolManagementRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNodePoolManagement",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, req.(*SetNodePoolManagementRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLabels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLabelsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLabels(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLabels",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLabels(ctx, req.(*SetLabelsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLegacyAbac_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLegacyAbacRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetLegacyAbac",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, req.(*SetLegacyAbacRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_StartIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StartIPRotationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).StartIPRotation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/StartIPRotation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).StartIPRotation(ctx, req.(*StartIPRotationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CompleteIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CompleteIPRotationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/CompleteIPRotation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, req.(*CompleteIPRotationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolSize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolSizeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNodePoolSize",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, req.(*SetNodePoolSizeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNetworkPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNetworkPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetNetworkPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, req.(*SetNetworkPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMaintenancePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMaintenancePolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1alpha1.ClusterManager/SetMaintenancePolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, req.(*SetMaintenancePolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ClusterManager_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.container.v1alpha1.ClusterManager",
+	HandlerType: (*ClusterManagerServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListClusters",
+			Handler:    _ClusterManager_ListClusters_Handler,
+		},
+		{
+			MethodName: "GetCluster",
+			Handler:    _ClusterManager_GetCluster_Handler,
+		},
+		{
+			MethodName: "CreateCluster",
+			Handler:    _ClusterManager_CreateCluster_Handler,
+		},
+		{
+			MethodName: "UpdateCluster",
+			Handler:    _ClusterManager_UpdateCluster_Handler,
+		},
+		{
+			MethodName: "UpdateNodePool",
+			Handler:    _ClusterManager_UpdateNodePool_Handler,
+		},
+		{
+			MethodName: "SetNodePoolAutoscaling",
+			Handler:    _ClusterManager_SetNodePoolAutoscaling_Handler,
+		},
+		{
+			MethodName: "SetLoggingService",
+			Handler:    _ClusterManager_SetLoggingService_Handler,
+		},
+		{
+			MethodName: "SetMonitoringService",
+			Handler:    _ClusterManager_SetMonitoringService_Handler,
+		},
+		{
+			MethodName: "SetAddonsConfig",
+			Handler:    _ClusterManager_SetAddonsConfig_Handler,
+		},
+		{
+			MethodName: "SetLocations",
+			Handler:    _ClusterManager_SetLocations_Handler,
+		},
+		{
+			MethodName: "UpdateMaster",
+			Handler:    _ClusterManager_UpdateMaster_Handler,
+		},
+		{
+			MethodName: "SetMasterAuth",
+			Handler:    _ClusterManager_SetMasterAuth_Handler,
+		},
+		{
+			MethodName: "DeleteCluster",
+			Handler:    _ClusterManager_DeleteCluster_Handler,
+		},
+		{
+			MethodName: "ListOperations",
+			Handler:    _ClusterManager_ListOperations_Handler,
+		},
+		{
+			MethodName: "GetOperation",
+			Handler:    _ClusterManager_GetOperation_Handler,
+		},
+		{
+			MethodName: "CancelOperation",
+			Handler:    _ClusterManager_CancelOperation_Handler,
+		},
+		{
+			MethodName: "GetServerConfig",
+			Handler:    _ClusterManager_GetServerConfig_Handler,
+		},
+		{
+			MethodName: "ListNodePools",
+			Handler:    _ClusterManager_ListNodePools_Handler,
+		},
+		{
+			MethodName: "GetNodePool",
+			Handler:    _ClusterManager_GetNodePool_Handler,
+		},
+		{
+			MethodName: "CreateNodePool",
+			Handler:    _ClusterManager_CreateNodePool_Handler,
+		},
+		{
+			MethodName: "DeleteNodePool",
+			Handler:    _ClusterManager_DeleteNodePool_Handler,
+		},
+		{
+			MethodName: "RollbackNodePoolUpgrade",
+			Handler:    _ClusterManager_RollbackNodePoolUpgrade_Handler,
+		},
+		{
+			MethodName: "SetNodePoolManagement",
+			Handler:    _ClusterManager_SetNodePoolManagement_Handler,
+		},
+		{
+			MethodName: "SetLabels",
+			Handler:    _ClusterManager_SetLabels_Handler,
+		},
+		{
+			MethodName: "SetLegacyAbac",
+			Handler:    _ClusterManager_SetLegacyAbac_Handler,
+		},
+		{
+			MethodName: "StartIPRotation",
+			Handler:    _ClusterManager_StartIPRotation_Handler,
+		},
+		{
+			MethodName: "CompleteIPRotation",
+			Handler:    _ClusterManager_CompleteIPRotation_Handler,
+		},
+		{
+			MethodName: "SetNodePoolSize",
+			Handler:    _ClusterManager_SetNodePoolSize_Handler,
+		},
+		{
+			MethodName: "SetNetworkPolicy",
+			Handler:    _ClusterManager_SetNetworkPolicy_Handler,
+		},
+		{
+			MethodName: "SetMaintenancePolicy",
+			Handler:    _ClusterManager_SetMaintenancePolicy_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/container/v1alpha1/cluster_service.proto",
+}
diff --git a/googleapis/container/v1beta1/cluster_service.pb.go b/googleapis/container/v1beta1/cluster_service.pb.go
index a6f0e87ac7..df58aafb3d 100644
--- a/googleapis/container/v1beta1/cluster_service.pb.go
+++ b/googleapis/container/v1beta1/cluster_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1beta1/cluster_service.proto
 
-package container // import "google.golang.org/genproto/googleapis/container/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/iam/v1"
+package container
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/iam/v1"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible values for Effect in taint.
 type NodeTaint_Effect int32
@@ -46,6 +46,7 @@ var NodeTaint_Effect_name = map[int32]string{
 	2: "PREFER_NO_SCHEDULE",
 	3: "NO_EXECUTE",
 }
+
 var NodeTaint_Effect_value = map[string]int32{
 	"EFFECT_UNSPECIFIED": 0,
 	"NO_SCHEDULE":        1,
@@ -56,8 +57,9 @@ var NodeTaint_Effect_value = map[string]int32{
 func (x NodeTaint_Effect) String() string {
 	return proto.EnumName(NodeTaint_Effect_name, int32(x))
 }
+
 func (NodeTaint_Effect) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{1, 0}
+	return fileDescriptor_e39a67f424410134, []int{1, 0}
 }
 
 // Istio auth mode, https://istio.io/docs/concepts/security/mutual-tls.html
@@ -74,6 +76,7 @@ var IstioConfig_IstioAuthMode_name = map[int32]string{
 	0: "AUTH_NONE",
 	1: "AUTH_MUTUAL_TLS",
 }
+
 var IstioConfig_IstioAuthMode_value = map[string]int32{
 	"AUTH_NONE":       0,
 	"AUTH_MUTUAL_TLS": 1,
@@ -82,8 +85,9 @@ var IstioConfig_IstioAuthMode_value = map[string]int32{
 func (x IstioConfig_IstioAuthMode) String() string {
 	return proto.EnumName(IstioConfig_IstioAuthMode_name, int32(x))
 }
+
 func (IstioConfig_IstioAuthMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{10, 0}
+	return fileDescriptor_e39a67f424410134, []int{10, 0}
 }
 
 // Allowed Network Policy providers.
@@ -100,6 +104,7 @@ var NetworkPolicy_Provider_name = map[int32]string{
 	0: "PROVIDER_UNSPECIFIED",
 	1: "CALICO",
 }
+
 var NetworkPolicy_Provider_value = map[string]int32{
 	"PROVIDER_UNSPECIFIED": 0,
 	"CALICO":               1,
@@ -108,8 +113,9 @@ var NetworkPolicy_Provider_value = map[string]int32{
 func (x NetworkPolicy_Provider) String() string {
 	return proto.EnumName(NetworkPolicy_Provider_name, int32(x))
 }
+
 func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{14, 0}
+	return fileDescriptor_e39a67f424410134, []int{14, 0}
 }
 
 // The current status of the cluster.
@@ -146,6 +152,7 @@ var Cluster_Status_name = map[int32]string{
 	5: "ERROR",
 	6: "DEGRADED",
 }
+
 var Cluster_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PROVISIONING":       1,
@@ -159,8 +166,9 @@ var Cluster_Status_value = map[string]int32{
 func (x Cluster_Status) String() string {
 	return proto.EnumName(Cluster_Status_name, int32(x))
 }
+
 func (Cluster_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{18, 0}
+	return fileDescriptor_e39a67f424410134, []int{18, 0}
 }
 
 // Current status of the operation.
@@ -186,6 +194,7 @@ var Operation_Status_name = map[int32]string{
 	3: "DONE",
 	4: "ABORTING",
 }
+
 var Operation_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PENDING":            1,
@@ -197,8 +206,9 @@ var Operation_Status_value = map[string]int32{
 func (x Operation_Status) String() string {
 	return proto.EnumName(Operation_Status_name, int32(x))
 }
+
 func (Operation_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{20, 0}
+	return fileDescriptor_e39a67f424410134, []int{20, 0}
 }
 
 // Operation type.
@@ -260,6 +270,7 @@ var Operation_Type_name = map[int32]string{
 	15: "SET_NETWORK_POLICY",
 	16: "SET_MAINTENANCE_POLICY",
 }
+
 var Operation_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":         0,
 	"CREATE_CLUSTER":           1,
@@ -283,8 +294,9 @@ var Operation_Type_value = map[string]int32{
 func (x Operation_Type) String() string {
 	return proto.EnumName(Operation_Type_name, int32(x))
 }
+
 func (Operation_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{20, 1}
+	return fileDescriptor_e39a67f424410134, []int{20, 1}
 }
 
 // Operation type: what type update to perform.
@@ -310,6 +322,7 @@ var SetMasterAuthRequest_Action_name = map[int32]string{
 	2: "GENERATE_PASSWORD",
 	3: "SET_USERNAME",
 }
+
 var SetMasterAuthRequest_Action_value = map[string]int32{
 	"UNKNOWN":           0,
 	"SET_PASSWORD":      1,
@@ -320,8 +333,9 @@ var SetMasterAuthRequest_Action_value = map[string]int32{
 func (x SetMasterAuthRequest_Action) String() string {
 	return proto.EnumName(SetMasterAuthRequest_Action_name, int32(x))
 }
+
 func (SetMasterAuthRequest_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{32, 0}
+	return fileDescriptor_e39a67f424410134, []int{32, 0}
 }
 
 // The current status of the node pool instance.
@@ -360,6 +374,7 @@ var NodePool_Status_name = map[int32]string{
 	5: "STOPPING",
 	6: "ERROR",
 }
+
 var NodePool_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"PROVISIONING":       1,
@@ -373,8 +388,9 @@ var NodePool_Status_value = map[string]int32{
 func (x NodePool_Status) String() string {
 	return proto.EnumName(NodePool_Status_name, int32(x))
 }
+
 func (NodePool_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{46, 0}
+	return fileDescriptor_e39a67f424410134, []int{46, 0}
 }
 
 // NodeMetadata is the configuration for if and how to expose the node
@@ -402,6 +418,7 @@ var WorkloadMetadataConfig_NodeMetadata_name = map[int32]string{
 	1: "SECURE",
 	2: "EXPOSE",
 }
+
 var WorkloadMetadataConfig_NodeMetadata_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"SECURE":      1,
@@ -411,8 +428,9 @@ var WorkloadMetadataConfig_NodeMetadata_value = map[string]int32{
 func (x WorkloadMetadataConfig_NodeMetadata) String() string {
 	return proto.EnumName(WorkloadMetadataConfig_NodeMetadata_name, int32(x))
 }
+
 func (WorkloadMetadataConfig_NodeMetadata) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{64, 0}
+	return fileDescriptor_e39a67f424410134, []int{64, 0}
 }
 
 // LocationType is the type of GKE location, regional or zonal.
@@ -432,6 +450,7 @@ var Location_LocationType_name = map[int32]string{
 	1: "ZONE",
 	2: "REGION",
 }
+
 var Location_LocationType_value = map[string]int32{
 	"LOCATION_TYPE_UNSPECIFIED": 0,
 	"ZONE":                      1,
@@ -441,8 +460,9 @@ var Location_LocationType_value = map[string]int32{
 func (x Location_LocationType) String() string {
 	return proto.EnumName(Location_LocationType_name, int32(x))
 }
+
 func (Location_LocationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{69, 0}
+	return fileDescriptor_e39a67f424410134, []int{69, 0}
 }
 
 // Code for each condition
@@ -470,6 +490,7 @@ var StatusCondition_Code_name = map[int32]string{
 	3: "GCE_QUOTA_EXCEEDED",
 	4: "SET_BY_OPERATOR",
 }
+
 var StatusCondition_Code_value = map[string]int32{
 	"UNKNOWN":                     0,
 	"GCE_STOCKOUT":                1,
@@ -481,8 +502,9 @@ var StatusCondition_Code_value = map[string]int32{
 func (x StatusCondition_Code) String() string {
 	return proto.EnumName(StatusCondition_Code_name, int32(x))
 }
+
 func (StatusCondition_Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{70, 0}
+	return fileDescriptor_e39a67f424410134, []int{70, 0}
 }
 
 // Status shows the current usage of a secondary IP range.
@@ -512,6 +534,7 @@ var UsableSubnetworkSecondaryRange_Status_name = map[int32]string{
 	3: "IN_USE_SHAREABLE_POD",
 	4: "IN_USE_MANAGED_POD",
 }
+
 var UsableSubnetworkSecondaryRange_Status_value = map[string]int32{
 	"UNKNOWN":              0,
 	"UNUSED":               1,
@@ -523,8 +546,9 @@ var UsableSubnetworkSecondaryRange_Status_value = map[string]int32{
 func (x UsableSubnetworkSecondaryRange_Status) String() string {
 	return proto.EnumName(UsableSubnetworkSecondaryRange_Status_name, int32(x))
 }
+
 func (UsableSubnetworkSecondaryRange_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{74, 0}
+	return fileDescriptor_e39a67f424410134, []int{74, 0}
 }
 
 // Parameters that describe the nodes in a cluster.
@@ -643,16 +667,17 @@ func (m *NodeConfig) Reset()         { *m = NodeConfig{} }
 func (m *NodeConfig) String() string { return proto.CompactTextString(m) }
 func (*NodeConfig) ProtoMessage()    {}
 func (*NodeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{0}
+	return fileDescriptor_e39a67f424410134, []int{0}
 }
+
 func (m *NodeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeConfig.Unmarshal(m, b)
 }
 func (m *NodeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeConfig.Marshal(b, m, deterministic)
 }
-func (dst *NodeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeConfig.Merge(dst, src)
+func (m *NodeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeConfig.Merge(m, src)
 }
 func (m *NodeConfig) XXX_Size() int {
 	return xxx_messageInfo_NodeConfig.Size(m)
@@ -789,16 +814,17 @@ func (m *NodeTaint) Reset()         { *m = NodeTaint{} }
 func (m *NodeTaint) String() string { return proto.CompactTextString(m) }
 func (*NodeTaint) ProtoMessage()    {}
 func (*NodeTaint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{1}
+	return fileDescriptor_e39a67f424410134, []int{1}
 }
+
 func (m *NodeTaint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeTaint.Unmarshal(m, b)
 }
 func (m *NodeTaint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeTaint.Marshal(b, m, deterministic)
 }
-func (dst *NodeTaint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeTaint.Merge(dst, src)
+func (m *NodeTaint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeTaint.Merge(m, src)
 }
 func (m *NodeTaint) XXX_Size() int {
 	return xxx_messageInfo_NodeTaint.Size(m)
@@ -865,16 +891,17 @@ func (m *MasterAuth) Reset()         { *m = MasterAuth{} }
 func (m *MasterAuth) String() string { return proto.CompactTextString(m) }
 func (*MasterAuth) ProtoMessage()    {}
 func (*MasterAuth) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{2}
+	return fileDescriptor_e39a67f424410134, []int{2}
 }
+
 func (m *MasterAuth) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuth.Unmarshal(m, b)
 }
 func (m *MasterAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuth.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuth) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuth.Merge(dst, src)
+func (m *MasterAuth) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuth.Merge(m, src)
 }
 func (m *MasterAuth) XXX_Size() int {
 	return xxx_messageInfo_MasterAuth.Size(m)
@@ -940,16 +967,17 @@ func (m *ClientCertificateConfig) Reset()         { *m = ClientCertificateConfig
 func (m *ClientCertificateConfig) String() string { return proto.CompactTextString(m) }
 func (*ClientCertificateConfig) ProtoMessage()    {}
 func (*ClientCertificateConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{3}
+	return fileDescriptor_e39a67f424410134, []int{3}
 }
+
 func (m *ClientCertificateConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClientCertificateConfig.Unmarshal(m, b)
 }
 func (m *ClientCertificateConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClientCertificateConfig.Marshal(b, m, deterministic)
 }
-func (dst *ClientCertificateConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientCertificateConfig.Merge(dst, src)
+func (m *ClientCertificateConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientCertificateConfig.Merge(m, src)
 }
 func (m *ClientCertificateConfig) XXX_Size() int {
 	return xxx_messageInfo_ClientCertificateConfig.Size(m)
@@ -999,16 +1027,17 @@ func (m *AddonsConfig) Reset()         { *m = AddonsConfig{} }
 func (m *AddonsConfig) String() string { return proto.CompactTextString(m) }
 func (*AddonsConfig) ProtoMessage()    {}
 func (*AddonsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{4}
+	return fileDescriptor_e39a67f424410134, []int{4}
 }
+
 func (m *AddonsConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddonsConfig.Unmarshal(m, b)
 }
 func (m *AddonsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddonsConfig.Marshal(b, m, deterministic)
 }
-func (dst *AddonsConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddonsConfig.Merge(dst, src)
+func (m *AddonsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddonsConfig.Merge(m, src)
 }
 func (m *AddonsConfig) XXX_Size() int {
 	return xxx_messageInfo_AddonsConfig.Size(m)
@@ -1077,16 +1106,17 @@ func (m *HttpLoadBalancing) Reset()         { *m = HttpLoadBalancing{} }
 func (m *HttpLoadBalancing) String() string { return proto.CompactTextString(m) }
 func (*HttpLoadBalancing) ProtoMessage()    {}
 func (*HttpLoadBalancing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{5}
+	return fileDescriptor_e39a67f424410134, []int{5}
 }
+
 func (m *HttpLoadBalancing) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpLoadBalancing.Unmarshal(m, b)
 }
 func (m *HttpLoadBalancing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpLoadBalancing.Marshal(b, m, deterministic)
 }
-func (dst *HttpLoadBalancing) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpLoadBalancing.Merge(dst, src)
+func (m *HttpLoadBalancing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpLoadBalancing.Merge(m, src)
 }
 func (m *HttpLoadBalancing) XXX_Size() int {
 	return xxx_messageInfo_HttpLoadBalancing.Size(m)
@@ -1121,16 +1151,17 @@ func (m *HorizontalPodAutoscaling) Reset()         { *m = HorizontalPodAutoscali
 func (m *HorizontalPodAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*HorizontalPodAutoscaling) ProtoMessage()    {}
 func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{6}
+	return fileDescriptor_e39a67f424410134, []int{6}
 }
+
 func (m *HorizontalPodAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Unmarshal(m, b)
 }
 func (m *HorizontalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HorizontalPodAutoscaling.Merge(dst, src)
+func (m *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HorizontalPodAutoscaling.Merge(m, src)
 }
 func (m *HorizontalPodAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_HorizontalPodAutoscaling.Size(m)
@@ -1161,16 +1192,17 @@ func (m *KubernetesDashboard) Reset()         { *m = KubernetesDashboard{} }
 func (m *KubernetesDashboard) String() string { return proto.CompactTextString(m) }
 func (*KubernetesDashboard) ProtoMessage()    {}
 func (*KubernetesDashboard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{7}
+	return fileDescriptor_e39a67f424410134, []int{7}
 }
+
 func (m *KubernetesDashboard) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KubernetesDashboard.Unmarshal(m, b)
 }
 func (m *KubernetesDashboard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KubernetesDashboard.Marshal(b, m, deterministic)
 }
-func (dst *KubernetesDashboard) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KubernetesDashboard.Merge(dst, src)
+func (m *KubernetesDashboard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KubernetesDashboard.Merge(m, src)
 }
 func (m *KubernetesDashboard) XXX_Size() int {
 	return xxx_messageInfo_KubernetesDashboard.Size(m)
@@ -1203,16 +1235,17 @@ func (m *NetworkPolicyConfig) Reset()         { *m = NetworkPolicyConfig{} }
 func (m *NetworkPolicyConfig) String() string { return proto.CompactTextString(m) }
 func (*NetworkPolicyConfig) ProtoMessage()    {}
 func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{8}
+	return fileDescriptor_e39a67f424410134, []int{8}
 }
+
 func (m *NetworkPolicyConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkPolicyConfig.Unmarshal(m, b)
 }
 func (m *NetworkPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkPolicyConfig.Marshal(b, m, deterministic)
 }
-func (dst *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkPolicyConfig.Merge(dst, src)
+func (m *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicyConfig.Merge(m, src)
 }
 func (m *NetworkPolicyConfig) XXX_Size() int {
 	return xxx_messageInfo_NetworkPolicyConfig.Size(m)
@@ -1256,16 +1289,17 @@ func (m *PrivateClusterConfig) Reset()         { *m = PrivateClusterConfig{} }
 func (m *PrivateClusterConfig) String() string { return proto.CompactTextString(m) }
 func (*PrivateClusterConfig) ProtoMessage()    {}
 func (*PrivateClusterConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{9}
+	return fileDescriptor_e39a67f424410134, []int{9}
 }
+
 func (m *PrivateClusterConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivateClusterConfig.Unmarshal(m, b)
 }
 func (m *PrivateClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivateClusterConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivateClusterConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivateClusterConfig.Merge(dst, src)
+func (m *PrivateClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivateClusterConfig.Merge(m, src)
 }
 func (m *PrivateClusterConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivateClusterConfig.Size(m)
@@ -1326,16 +1360,17 @@ func (m *IstioConfig) Reset()         { *m = IstioConfig{} }
 func (m *IstioConfig) String() string { return proto.CompactTextString(m) }
 func (*IstioConfig) ProtoMessage()    {}
 func (*IstioConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{10}
+	return fileDescriptor_e39a67f424410134, []int{10}
 }
+
 func (m *IstioConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IstioConfig.Unmarshal(m, b)
 }
 func (m *IstioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IstioConfig.Marshal(b, m, deterministic)
 }
-func (dst *IstioConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IstioConfig.Merge(dst, src)
+func (m *IstioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IstioConfig.Merge(m, src)
 }
 func (m *IstioConfig) XXX_Size() int {
 	return xxx_messageInfo_IstioConfig.Size(m)
@@ -1373,16 +1408,17 @@ func (m *CloudRunConfig) Reset()         { *m = CloudRunConfig{} }
 func (m *CloudRunConfig) String() string { return proto.CompactTextString(m) }
 func (*CloudRunConfig) ProtoMessage()    {}
 func (*CloudRunConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{11}
+	return fileDescriptor_e39a67f424410134, []int{11}
 }
+
 func (m *CloudRunConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudRunConfig.Unmarshal(m, b)
 }
 func (m *CloudRunConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudRunConfig.Marshal(b, m, deterministic)
 }
-func (dst *CloudRunConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudRunConfig.Merge(dst, src)
+func (m *CloudRunConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudRunConfig.Merge(m, src)
 }
 func (m *CloudRunConfig) XXX_Size() int {
 	return xxx_messageInfo_CloudRunConfig.Size(m)
@@ -1419,16 +1455,17 @@ func (m *MasterAuthorizedNetworksConfig) Reset()         { *m = MasterAuthorized
 func (m *MasterAuthorizedNetworksConfig) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{12}
+	return fileDescriptor_e39a67f424410134, []int{12}
 }
+
 func (m *MasterAuthorizedNetworksConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Unmarshal(m, b)
 }
 func (m *MasterAuthorizedNetworksConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(dst, src)
+func (m *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(m, src)
 }
 func (m *MasterAuthorizedNetworksConfig) XXX_Size() int {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Size(m)
@@ -1470,16 +1507,17 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig_CidrBlock) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig_CidrBlock) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{12, 0}
+	return fileDescriptor_e39a67f424410134, []int{12, 0}
 }
+
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Unmarshal(m, b)
 }
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Marshal(b, m, deterministic)
 }
-func (dst *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(dst, src)
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(m, src)
 }
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Size() int {
 	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Size(m)
@@ -1521,16 +1559,17 @@ func (m *LegacyAbac) Reset()         { *m = LegacyAbac{} }
 func (m *LegacyAbac) String() string { return proto.CompactTextString(m) }
 func (*LegacyAbac) ProtoMessage()    {}
 func (*LegacyAbac) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{13}
+	return fileDescriptor_e39a67f424410134, []int{13}
 }
+
 func (m *LegacyAbac) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LegacyAbac.Unmarshal(m, b)
 }
 func (m *LegacyAbac) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LegacyAbac.Marshal(b, m, deterministic)
 }
-func (dst *LegacyAbac) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LegacyAbac.Merge(dst, src)
+func (m *LegacyAbac) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LegacyAbac.Merge(m, src)
 }
 func (m *LegacyAbac) XXX_Size() int {
 	return xxx_messageInfo_LegacyAbac.Size(m)
@@ -1564,16 +1603,17 @@ func (m *NetworkPolicy) Reset()         { *m = NetworkPolicy{} }
 func (m *NetworkPolicy) String() string { return proto.CompactTextString(m) }
 func (*NetworkPolicy) ProtoMessage()    {}
 func (*NetworkPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{14}
+	return fileDescriptor_e39a67f424410134, []int{14}
 }
+
 func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkPolicy.Unmarshal(m, b)
 }
 func (m *NetworkPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkPolicy.Marshal(b, m, deterministic)
 }
-func (dst *NetworkPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkPolicy.Merge(dst, src)
+func (m *NetworkPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicy.Merge(m, src)
 }
 func (m *NetworkPolicy) XXX_Size() int {
 	return xxx_messageInfo_NetworkPolicy.Size(m)
@@ -1717,16 +1757,17 @@ func (m *IPAllocationPolicy) Reset()         { *m = IPAllocationPolicy{} }
 func (m *IPAllocationPolicy) String() string { return proto.CompactTextString(m) }
 func (*IPAllocationPolicy) ProtoMessage()    {}
 func (*IPAllocationPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{15}
+	return fileDescriptor_e39a67f424410134, []int{15}
 }
+
 func (m *IPAllocationPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IPAllocationPolicy.Unmarshal(m, b)
 }
 func (m *IPAllocationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IPAllocationPolicy.Marshal(b, m, deterministic)
 }
-func (dst *IPAllocationPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IPAllocationPolicy.Merge(dst, src)
+func (m *IPAllocationPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IPAllocationPolicy.Merge(m, src)
 }
 func (m *IPAllocationPolicy) XXX_Size() int {
 	return xxx_messageInfo_IPAllocationPolicy.Size(m)
@@ -1845,16 +1886,17 @@ func (m *BinaryAuthorization) Reset()         { *m = BinaryAuthorization{} }
 func (m *BinaryAuthorization) String() string { return proto.CompactTextString(m) }
 func (*BinaryAuthorization) ProtoMessage()    {}
 func (*BinaryAuthorization) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{16}
+	return fileDescriptor_e39a67f424410134, []int{16}
 }
+
 func (m *BinaryAuthorization) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BinaryAuthorization.Unmarshal(m, b)
 }
 func (m *BinaryAuthorization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BinaryAuthorization.Marshal(b, m, deterministic)
 }
-func (dst *BinaryAuthorization) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BinaryAuthorization.Merge(dst, src)
+func (m *BinaryAuthorization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BinaryAuthorization.Merge(m, src)
 }
 func (m *BinaryAuthorization) XXX_Size() int {
 	return xxx_messageInfo_BinaryAuthorization.Size(m)
@@ -1886,16 +1928,17 @@ func (m *PodSecurityPolicyConfig) Reset()         { *m = PodSecurityPolicyConfig
 func (m *PodSecurityPolicyConfig) String() string { return proto.CompactTextString(m) }
 func (*PodSecurityPolicyConfig) ProtoMessage()    {}
 func (*PodSecurityPolicyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{17}
+	return fileDescriptor_e39a67f424410134, []int{17}
 }
+
 func (m *PodSecurityPolicyConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PodSecurityPolicyConfig.Unmarshal(m, b)
 }
 func (m *PodSecurityPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PodSecurityPolicyConfig.Marshal(b, m, deterministic)
 }
-func (dst *PodSecurityPolicyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PodSecurityPolicyConfig.Merge(dst, src)
+func (m *PodSecurityPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PodSecurityPolicyConfig.Merge(m, src)
 }
 func (m *PodSecurityPolicyConfig) XXX_Size() int {
 	return xxx_messageInfo_PodSecurityPolicyConfig.Size(m)
@@ -2127,16 +2170,17 @@ func (m *Cluster) Reset()         { *m = Cluster{} }
 func (m *Cluster) String() string { return proto.CompactTextString(m) }
 func (*Cluster) ProtoMessage()    {}
 func (*Cluster) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{18}
+	return fileDescriptor_e39a67f424410134, []int{18}
 }
+
 func (m *Cluster) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cluster.Unmarshal(m, b)
 }
 func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
 }
-func (dst *Cluster) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cluster.Merge(dst, src)
+func (m *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(m, src)
 }
 func (m *Cluster) XXX_Size() int {
 	return xxx_messageInfo_Cluster.Size(m)
@@ -2584,16 +2628,17 @@ func (m *ClusterUpdate) Reset()         { *m = ClusterUpdate{} }
 func (m *ClusterUpdate) String() string { return proto.CompactTextString(m) }
 func (*ClusterUpdate) ProtoMessage()    {}
 func (*ClusterUpdate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{19}
+	return fileDescriptor_e39a67f424410134, []int{19}
 }
+
 func (m *ClusterUpdate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterUpdate.Unmarshal(m, b)
 }
 func (m *ClusterUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterUpdate.Marshal(b, m, deterministic)
 }
-func (dst *ClusterUpdate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterUpdate.Merge(dst, src)
+func (m *ClusterUpdate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterUpdate.Merge(m, src)
 }
 func (m *ClusterUpdate) XXX_Size() int {
 	return xxx_messageInfo_ClusterUpdate.Size(m)
@@ -2757,16 +2802,17 @@ func (m *Operation) Reset()         { *m = Operation{} }
 func (m *Operation) String() string { return proto.CompactTextString(m) }
 func (*Operation) ProtoMessage()    {}
 func (*Operation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{20}
+	return fileDescriptor_e39a67f424410134, []int{20}
 }
+
 func (m *Operation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operation.Unmarshal(m, b)
 }
 func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
 }
-func (dst *Operation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operation.Merge(dst, src)
+func (m *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(m, src)
 }
 func (m *Operation) XXX_Size() int {
 	return xxx_messageInfo_Operation.Size(m)
@@ -2902,16 +2948,17 @@ func (m *OperationProgress) Reset()         { *m = OperationProgress{} }
 func (m *OperationProgress) String() string { return proto.CompactTextString(m) }
 func (*OperationProgress) ProtoMessage()    {}
 func (*OperationProgress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{21}
+	return fileDescriptor_e39a67f424410134, []int{21}
 }
+
 func (m *OperationProgress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationProgress.Unmarshal(m, b)
 }
 func (m *OperationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationProgress.Marshal(b, m, deterministic)
 }
-func (dst *OperationProgress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationProgress.Merge(dst, src)
+func (m *OperationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationProgress.Merge(m, src)
 }
 func (m *OperationProgress) XXX_Size() int {
 	return xxx_messageInfo_OperationProgress.Size(m)
@@ -2971,16 +3018,17 @@ func (m *OperationProgress_Metric) Reset()         { *m = OperationProgress_Metr
 func (m *OperationProgress_Metric) String() string { return proto.CompactTextString(m) }
 func (*OperationProgress_Metric) ProtoMessage()    {}
 func (*OperationProgress_Metric) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{21, 0}
+	return fileDescriptor_e39a67f424410134, []int{21, 0}
 }
+
 func (m *OperationProgress_Metric) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationProgress_Metric.Unmarshal(m, b)
 }
 func (m *OperationProgress_Metric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationProgress_Metric.Marshal(b, m, deterministic)
 }
-func (dst *OperationProgress_Metric) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationProgress_Metric.Merge(dst, src)
+func (m *OperationProgress_Metric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationProgress_Metric.Merge(m, src)
 }
 func (m *OperationProgress_Metric) XXX_Size() int {
 	return xxx_messageInfo_OperationProgress_Metric.Size(m)
@@ -3048,85 +3096,15 @@ func (m *OperationProgress_Metric) GetStringValue() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OperationProgress_Metric) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OperationProgress_Metric_OneofMarshaler, _OperationProgress_Metric_OneofUnmarshaler, _OperationProgress_Metric_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OperationProgress_Metric) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OperationProgress_Metric_IntValue)(nil),
 		(*OperationProgress_Metric_DoubleValue)(nil),
 		(*OperationProgress_Metric_StringValue)(nil),
 	}
 }
 
-func _OperationProgress_Metric_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OperationProgress_Metric)
-	// value
-	switch x := m.Value.(type) {
-	case *OperationProgress_Metric_IntValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntValue))
-	case *OperationProgress_Metric_DoubleValue:
-		b.EncodeVarint(3<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *OperationProgress_Metric_StringValue:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case nil:
-	default:
-		return fmt.Errorf("OperationProgress_Metric.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OperationProgress_Metric_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OperationProgress_Metric)
-	switch tag {
-	case 2: // value.int_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &OperationProgress_Metric_IntValue{int64(x)}
-		return true, err
-	case 3: // value.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Value = &OperationProgress_Metric_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 4: // value.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Value = &OperationProgress_Metric_StringValue{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OperationProgress_Metric_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OperationProgress_Metric)
-	// value
-	switch x := m.Value.(type) {
-	case *OperationProgress_Metric_IntValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IntValue))
-	case *OperationProgress_Metric_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *OperationProgress_Metric_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // CreateClusterRequest creates a cluster.
 type CreateClusterRequest struct {
 	// Deprecated. The Google Developers Console [project ID or project
@@ -3153,16 +3131,17 @@ func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
 func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateClusterRequest) ProtoMessage()    {}
 func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{22}
+	return fileDescriptor_e39a67f424410134, []int{22}
 }
+
 func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
 }
 func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+func (m *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(m, src)
 }
 func (m *CreateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateClusterRequest.Size(m)
@@ -3229,16 +3208,17 @@ func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
 func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterRequest) ProtoMessage()    {}
 func (*GetClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{23}
+	return fileDescriptor_e39a67f424410134, []int{23}
 }
+
 func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
 }
 func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+func (m *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(m, src)
 }
 func (m *GetClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_GetClusterRequest.Size(m)
@@ -3308,16 +3288,17 @@ func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
 func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateClusterRequest) ProtoMessage()    {}
 func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{24}
+	return fileDescriptor_e39a67f424410134, []int{24}
 }
+
 func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
 }
 func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+func (m *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(m, src)
 }
 func (m *UpdateClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateClusterRequest.Size(m)
@@ -3410,16 +3391,17 @@ func (m *UpdateNodePoolRequest) Reset()         { *m = UpdateNodePoolRequest{} }
 func (m *UpdateNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateNodePoolRequest) ProtoMessage()    {}
 func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{25}
+	return fileDescriptor_e39a67f424410134, []int{25}
 }
+
 func (m *UpdateNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateNodePoolRequest.Unmarshal(m, b)
 }
 func (m *UpdateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateNodePoolRequest.Merge(dst, src)
+func (m *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNodePoolRequest.Merge(m, src)
 }
 func (m *UpdateNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateNodePoolRequest.Size(m)
@@ -3515,16 +3497,17 @@ func (m *SetNodePoolAutoscalingRequest) Reset()         { *m = SetNodePoolAutosc
 func (m *SetNodePoolAutoscalingRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolAutoscalingRequest) ProtoMessage()    {}
 func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{26}
+	return fileDescriptor_e39a67f424410134, []int{26}
 }
+
 func (m *SetNodePoolAutoscalingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolAutoscalingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(dst, src)
+func (m *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(m, src)
 }
 func (m *SetNodePoolAutoscalingRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Size(m)
@@ -3613,16 +3596,17 @@ func (m *SetLoggingServiceRequest) Reset()         { *m = SetLoggingServiceReque
 func (m *SetLoggingServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLoggingServiceRequest) ProtoMessage()    {}
 func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{27}
+	return fileDescriptor_e39a67f424410134, []int{27}
 }
+
 func (m *SetLoggingServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLoggingServiceRequest.Unmarshal(m, b)
 }
 func (m *SetLoggingServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLoggingServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLoggingServiceRequest.Merge(dst, src)
+func (m *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLoggingServiceRequest.Merge(m, src)
 }
 func (m *SetLoggingServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLoggingServiceRequest.Size(m)
@@ -3702,16 +3686,17 @@ func (m *SetMonitoringServiceRequest) Reset()         { *m = SetMonitoringServic
 func (m *SetMonitoringServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMonitoringServiceRequest) ProtoMessage()    {}
 func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{28}
+	return fileDescriptor_e39a67f424410134, []int{28}
 }
+
 func (m *SetMonitoringServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Unmarshal(m, b)
 }
 func (m *SetMonitoringServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMonitoringServiceRequest.Merge(dst, src)
+func (m *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMonitoringServiceRequest.Merge(m, src)
 }
 func (m *SetMonitoringServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMonitoringServiceRequest.Size(m)
@@ -3789,16 +3774,17 @@ func (m *SetAddonsConfigRequest) Reset()         { *m = SetAddonsConfigRequest{}
 func (m *SetAddonsConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*SetAddonsConfigRequest) ProtoMessage()    {}
 func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{29}
+	return fileDescriptor_e39a67f424410134, []int{29}
 }
+
 func (m *SetAddonsConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetAddonsConfigRequest.Unmarshal(m, b)
 }
 func (m *SetAddonsConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetAddonsConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetAddonsConfigRequest.Merge(dst, src)
+func (m *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetAddonsConfigRequest.Merge(m, src)
 }
 func (m *SetAddonsConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_SetAddonsConfigRequest.Size(m)
@@ -3881,16 +3867,17 @@ func (m *SetLocationsRequest) Reset()         { *m = SetLocationsRequest{} }
 func (m *SetLocationsRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLocationsRequest) ProtoMessage()    {}
 func (*SetLocationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{30}
+	return fileDescriptor_e39a67f424410134, []int{30}
 }
+
 func (m *SetLocationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLocationsRequest.Unmarshal(m, b)
 }
 func (m *SetLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLocationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLocationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLocationsRequest.Merge(dst, src)
+func (m *SetLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLocationsRequest.Merge(m, src)
 }
 func (m *SetLocationsRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLocationsRequest.Size(m)
@@ -3976,16 +3963,17 @@ func (m *UpdateMasterRequest) Reset()         { *m = UpdateMasterRequest{} }
 func (m *UpdateMasterRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateMasterRequest) ProtoMessage()    {}
 func (*UpdateMasterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{31}
+	return fileDescriptor_e39a67f424410134, []int{31}
 }
+
 func (m *UpdateMasterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateMasterRequest.Unmarshal(m, b)
 }
 func (m *UpdateMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateMasterRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateMasterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateMasterRequest.Merge(dst, src)
+func (m *UpdateMasterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateMasterRequest.Merge(m, src)
 }
 func (m *UpdateMasterRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateMasterRequest.Size(m)
@@ -4064,16 +4052,17 @@ func (m *SetMasterAuthRequest) Reset()         { *m = SetMasterAuthRequest{} }
 func (m *SetMasterAuthRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMasterAuthRequest) ProtoMessage()    {}
 func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{32}
+	return fileDescriptor_e39a67f424410134, []int{32}
 }
+
 func (m *SetMasterAuthRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMasterAuthRequest.Unmarshal(m, b)
 }
 func (m *SetMasterAuthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMasterAuthRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMasterAuthRequest.Merge(dst, src)
+func (m *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMasterAuthRequest.Merge(m, src)
 }
 func (m *SetMasterAuthRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMasterAuthRequest.Size(m)
@@ -4155,16 +4144,17 @@ func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
 func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteClusterRequest) ProtoMessage()    {}
 func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{33}
+	return fileDescriptor_e39a67f424410134, []int{33}
 }
+
 func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
 }
 func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+func (m *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(m, src)
 }
 func (m *DeleteClusterRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteClusterRequest.Size(m)
@@ -4230,16 +4220,17 @@ func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
 func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListClustersRequest) ProtoMessage()    {}
 func (*ListClustersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{34}
+	return fileDescriptor_e39a67f424410134, []int{34}
 }
+
 func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
 }
 func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+func (m *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(m, src)
 }
 func (m *ListClustersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListClustersRequest.Size(m)
@@ -4290,16 +4281,17 @@ func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
 func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListClustersResponse) ProtoMessage()    {}
 func (*ListClustersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{35}
+	return fileDescriptor_e39a67f424410134, []int{35}
 }
+
 func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
 }
 func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+func (m *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(m, src)
 }
 func (m *ListClustersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListClustersResponse.Size(m)
@@ -4350,16 +4342,17 @@ func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
 func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOperationRequest) ProtoMessage()    {}
 func (*GetOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{36}
+	return fileDescriptor_e39a67f424410134, []int{36}
 }
+
 func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
 }
 func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+func (m *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(m, src)
 }
 func (m *GetOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOperationRequest.Size(m)
@@ -4424,16 +4417,17 @@ func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
 func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsRequest) ProtoMessage()    {}
 func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{37}
+	return fileDescriptor_e39a67f424410134, []int{37}
 }
+
 func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
 }
 func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+func (m *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(m, src)
 }
 func (m *ListOperationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsRequest.Size(m)
@@ -4492,16 +4486,17 @@ func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{}
 func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelOperationRequest) ProtoMessage()    {}
 func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{38}
+	return fileDescriptor_e39a67f424410134, []int{38}
 }
+
 func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
 }
 func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+func (m *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(m, src)
 }
 func (m *CancelOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelOperationRequest.Size(m)
@@ -4559,16 +4554,17 @@ func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{}
 func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsResponse) ProtoMessage()    {}
 func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{39}
+	return fileDescriptor_e39a67f424410134, []int{39}
 }
+
 func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
 }
 func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+func (m *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(m, src)
 }
 func (m *ListOperationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsResponse.Size(m)
@@ -4615,16 +4611,17 @@ func (m *GetServerConfigRequest) Reset()         { *m = GetServerConfigRequest{}
 func (m *GetServerConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServerConfigRequest) ProtoMessage()    {}
 func (*GetServerConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{40}
+	return fileDescriptor_e39a67f424410134, []int{40}
 }
+
 func (m *GetServerConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServerConfigRequest.Unmarshal(m, b)
 }
 func (m *GetServerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServerConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServerConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServerConfigRequest.Merge(dst, src)
+func (m *GetServerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerConfigRequest.Merge(m, src)
 }
 func (m *GetServerConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServerConfigRequest.Size(m)
@@ -4679,16 +4676,17 @@ func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
 func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
 func (*ServerConfig) ProtoMessage()    {}
 func (*ServerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{41}
+	return fileDescriptor_e39a67f424410134, []int{41}
 }
+
 func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
 }
 func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ServerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerConfig.Merge(dst, src)
+func (m *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(m, src)
 }
 func (m *ServerConfig) XXX_Size() int {
 	return xxx_messageInfo_ServerConfig.Size(m)
@@ -4763,16 +4761,17 @@ func (m *CreateNodePoolRequest) Reset()         { *m = CreateNodePoolRequest{} }
 func (m *CreateNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateNodePoolRequest) ProtoMessage()    {}
 func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{42}
+	return fileDescriptor_e39a67f424410134, []int{42}
 }
+
 func (m *CreateNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateNodePoolRequest.Unmarshal(m, b)
 }
 func (m *CreateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateNodePoolRequest.Merge(dst, src)
+func (m *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNodePoolRequest.Merge(m, src)
 }
 func (m *CreateNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateNodePoolRequest.Size(m)
@@ -4851,16 +4850,17 @@ func (m *DeleteNodePoolRequest) Reset()         { *m = DeleteNodePoolRequest{} }
 func (m *DeleteNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteNodePoolRequest) ProtoMessage()    {}
 func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{43}
+	return fileDescriptor_e39a67f424410134, []int{43}
 }
+
 func (m *DeleteNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteNodePoolRequest.Unmarshal(m, b)
 }
 func (m *DeleteNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteNodePoolRequest.Merge(dst, src)
+func (m *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNodePoolRequest.Merge(m, src)
 }
 func (m *DeleteNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteNodePoolRequest.Size(m)
@@ -4936,16 +4936,17 @@ func (m *ListNodePoolsRequest) Reset()         { *m = ListNodePoolsRequest{} }
 func (m *ListNodePoolsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNodePoolsRequest) ProtoMessage()    {}
 func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{44}
+	return fileDescriptor_e39a67f424410134, []int{44}
 }
+
 func (m *ListNodePoolsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNodePoolsRequest.Unmarshal(m, b)
 }
 func (m *ListNodePoolsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNodePoolsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNodePoolsRequest.Merge(dst, src)
+func (m *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsRequest.Merge(m, src)
 }
 func (m *ListNodePoolsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNodePoolsRequest.Size(m)
@@ -5017,16 +5018,17 @@ func (m *GetNodePoolRequest) Reset()         { *m = GetNodePoolRequest{} }
 func (m *GetNodePoolRequest) String() string { return proto.CompactTextString(m) }
 func (*GetNodePoolRequest) ProtoMessage()    {}
 func (*GetNodePoolRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{45}
+	return fileDescriptor_e39a67f424410134, []int{45}
 }
+
 func (m *GetNodePoolRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNodePoolRequest.Unmarshal(m, b)
 }
 func (m *GetNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNodePoolRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNodePoolRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNodePoolRequest.Merge(dst, src)
+func (m *GetNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNodePoolRequest.Merge(m, src)
 }
 func (m *GetNodePoolRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNodePoolRequest.Size(m)
@@ -5124,16 +5126,17 @@ func (m *NodePool) Reset()         { *m = NodePool{} }
 func (m *NodePool) String() string { return proto.CompactTextString(m) }
 func (*NodePool) ProtoMessage()    {}
 func (*NodePool) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{46}
+	return fileDescriptor_e39a67f424410134, []int{46}
 }
+
 func (m *NodePool) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodePool.Unmarshal(m, b)
 }
 func (m *NodePool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodePool.Marshal(b, m, deterministic)
 }
-func (dst *NodePool) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodePool.Merge(dst, src)
+func (m *NodePool) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePool.Merge(m, src)
 }
 func (m *NodePool) XXX_Size() int {
 	return xxx_messageInfo_NodePool.Size(m)
@@ -5246,16 +5249,17 @@ func (m *NodeManagement) Reset()         { *m = NodeManagement{} }
 func (m *NodeManagement) String() string { return proto.CompactTextString(m) }
 func (*NodeManagement) ProtoMessage()    {}
 func (*NodeManagement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{47}
+	return fileDescriptor_e39a67f424410134, []int{47}
 }
+
 func (m *NodeManagement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeManagement.Unmarshal(m, b)
 }
 func (m *NodeManagement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeManagement.Marshal(b, m, deterministic)
 }
-func (dst *NodeManagement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeManagement.Merge(dst, src)
+func (m *NodeManagement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeManagement.Merge(m, src)
 }
 func (m *NodeManagement) XXX_Size() int {
 	return xxx_messageInfo_NodeManagement.Size(m)
@@ -5306,16 +5310,17 @@ func (m *AutoUpgradeOptions) Reset()         { *m = AutoUpgradeOptions{} }
 func (m *AutoUpgradeOptions) String() string { return proto.CompactTextString(m) }
 func (*AutoUpgradeOptions) ProtoMessage()    {}
 func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{48}
+	return fileDescriptor_e39a67f424410134, []int{48}
 }
+
 func (m *AutoUpgradeOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AutoUpgradeOptions.Unmarshal(m, b)
 }
 func (m *AutoUpgradeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AutoUpgradeOptions.Marshal(b, m, deterministic)
 }
-func (dst *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AutoUpgradeOptions.Merge(dst, src)
+func (m *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutoUpgradeOptions.Merge(m, src)
 }
 func (m *AutoUpgradeOptions) XXX_Size() int {
 	return xxx_messageInfo_AutoUpgradeOptions.Size(m)
@@ -5353,16 +5358,17 @@ func (m *MaintenancePolicy) Reset()         { *m = MaintenancePolicy{} }
 func (m *MaintenancePolicy) String() string { return proto.CompactTextString(m) }
 func (*MaintenancePolicy) ProtoMessage()    {}
 func (*MaintenancePolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{49}
+	return fileDescriptor_e39a67f424410134, []int{49}
 }
+
 func (m *MaintenancePolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaintenancePolicy.Unmarshal(m, b)
 }
 func (m *MaintenancePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaintenancePolicy.Marshal(b, m, deterministic)
 }
-func (dst *MaintenancePolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaintenancePolicy.Merge(dst, src)
+func (m *MaintenancePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenancePolicy.Merge(m, src)
 }
 func (m *MaintenancePolicy) XXX_Size() int {
 	return xxx_messageInfo_MaintenancePolicy.Size(m)
@@ -5397,16 +5403,17 @@ func (m *MaintenanceWindow) Reset()         { *m = MaintenanceWindow{} }
 func (m *MaintenanceWindow) String() string { return proto.CompactTextString(m) }
 func (*MaintenanceWindow) ProtoMessage()    {}
 func (*MaintenanceWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{50}
+	return fileDescriptor_e39a67f424410134, []int{50}
 }
+
 func (m *MaintenanceWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaintenanceWindow.Unmarshal(m, b)
 }
 func (m *MaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaintenanceWindow.Marshal(b, m, deterministic)
 }
-func (dst *MaintenanceWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaintenanceWindow.Merge(dst, src)
+func (m *MaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenanceWindow.Merge(m, src)
 }
 func (m *MaintenanceWindow) XXX_Size() int {
 	return xxx_messageInfo_MaintenanceWindow.Size(m)
@@ -5441,61 +5448,13 @@ func (m *MaintenanceWindow) GetDailyMaintenanceWindow() *DailyMaintenanceWindow
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MaintenanceWindow) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MaintenanceWindow_OneofMarshaler, _MaintenanceWindow_OneofUnmarshaler, _MaintenanceWindow_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*MaintenanceWindow) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*MaintenanceWindow_DailyMaintenanceWindow)(nil),
 	}
 }
 
-func _MaintenanceWindow_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MaintenanceWindow)
-	// policy
-	switch x := m.Policy.(type) {
-	case *MaintenanceWindow_DailyMaintenanceWindow:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DailyMaintenanceWindow); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("MaintenanceWindow.Policy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MaintenanceWindow_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MaintenanceWindow)
-	switch tag {
-	case 2: // policy.daily_maintenance_window
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DailyMaintenanceWindow)
-		err := b.DecodeMessage(msg)
-		m.Policy = &MaintenanceWindow_DailyMaintenanceWindow{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MaintenanceWindow)
-	// policy
-	switch x := m.Policy.(type) {
-	case *MaintenanceWindow_DailyMaintenanceWindow:
-		s := proto.Size(x.DailyMaintenanceWindow)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Time window specified for daily maintenance operations.
 type DailyMaintenanceWindow struct {
 	// Time within the maintenance window to start the maintenance operations.
@@ -5513,16 +5472,17 @@ func (m *DailyMaintenanceWindow) Reset()         { *m = DailyMaintenanceWindow{}
 func (m *DailyMaintenanceWindow) String() string { return proto.CompactTextString(m) }
 func (*DailyMaintenanceWindow) ProtoMessage()    {}
 func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{51}
+	return fileDescriptor_e39a67f424410134, []int{51}
 }
+
 func (m *DailyMaintenanceWindow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DailyMaintenanceWindow.Unmarshal(m, b)
 }
 func (m *DailyMaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DailyMaintenanceWindow.Marshal(b, m, deterministic)
 }
-func (dst *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DailyMaintenanceWindow.Merge(dst, src)
+func (m *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DailyMaintenanceWindow.Merge(m, src)
 }
 func (m *DailyMaintenanceWindow) XXX_Size() int {
 	return xxx_messageInfo_DailyMaintenanceWindow.Size(m)
@@ -5580,16 +5540,17 @@ func (m *SetNodePoolManagementRequest) Reset()         { *m = SetNodePoolManagem
 func (m *SetNodePoolManagementRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolManagementRequest) ProtoMessage()    {}
 func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{52}
+	return fileDescriptor_e39a67f424410134, []int{52}
 }
+
 func (m *SetNodePoolManagementRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolManagementRequest.Merge(dst, src)
+func (m *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolManagementRequest.Merge(m, src)
 }
 func (m *SetNodePoolManagementRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolManagementRequest.Size(m)
@@ -5679,16 +5640,17 @@ func (m *SetNodePoolSizeRequest) Reset()         { *m = SetNodePoolSizeRequest{}
 func (m *SetNodePoolSizeRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNodePoolSizeRequest) ProtoMessage()    {}
 func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{53}
+	return fileDescriptor_e39a67f424410134, []int{53}
 }
+
 func (m *SetNodePoolSizeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Unmarshal(m, b)
 }
 func (m *SetNodePoolSizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNodePoolSizeRequest.Merge(dst, src)
+func (m *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolSizeRequest.Merge(m, src)
 }
 func (m *SetNodePoolSizeRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNodePoolSizeRequest.Size(m)
@@ -5777,16 +5739,17 @@ func (m *RollbackNodePoolUpgradeRequest) Reset()         { *m = RollbackNodePool
 func (m *RollbackNodePoolUpgradeRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackNodePoolUpgradeRequest) ProtoMessage()    {}
 func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{54}
+	return fileDescriptor_e39a67f424410134, []int{54}
 }
+
 func (m *RollbackNodePoolUpgradeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Unmarshal(m, b)
 }
 func (m *RollbackNodePoolUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(dst, src)
+func (m *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(m, src)
 }
 func (m *RollbackNodePoolUpgradeRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Size(m)
@@ -5849,16 +5812,17 @@ func (m *ListNodePoolsResponse) Reset()         { *m = ListNodePoolsResponse{} }
 func (m *ListNodePoolsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNodePoolsResponse) ProtoMessage()    {}
 func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{55}
+	return fileDescriptor_e39a67f424410134, []int{55}
 }
+
 func (m *ListNodePoolsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNodePoolsResponse.Unmarshal(m, b)
 }
 func (m *ListNodePoolsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNodePoolsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNodePoolsResponse.Merge(dst, src)
+func (m *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsResponse.Merge(m, src)
 }
 func (m *ListNodePoolsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNodePoolsResponse.Size(m)
@@ -5895,16 +5859,17 @@ func (m *ClusterAutoscaling) Reset()         { *m = ClusterAutoscaling{} }
 func (m *ClusterAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*ClusterAutoscaling) ProtoMessage()    {}
 func (*ClusterAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{56}
+	return fileDescriptor_e39a67f424410134, []int{56}
 }
+
 func (m *ClusterAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClusterAutoscaling.Unmarshal(m, b)
 }
 func (m *ClusterAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ClusterAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *ClusterAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClusterAutoscaling.Merge(dst, src)
+func (m *ClusterAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterAutoscaling.Merge(m, src)
 }
 func (m *ClusterAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_ClusterAutoscaling.Size(m)
@@ -5947,16 +5912,17 @@ func (m *ResourceLimit) Reset()         { *m = ResourceLimit{} }
 func (m *ResourceLimit) String() string { return proto.CompactTextString(m) }
 func (*ResourceLimit) ProtoMessage()    {}
 func (*ResourceLimit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{57}
+	return fileDescriptor_e39a67f424410134, []int{57}
 }
+
 func (m *ResourceLimit) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceLimit.Unmarshal(m, b)
 }
 func (m *ResourceLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceLimit.Marshal(b, m, deterministic)
 }
-func (dst *ResourceLimit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceLimit.Merge(dst, src)
+func (m *ResourceLimit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceLimit.Merge(m, src)
 }
 func (m *ResourceLimit) XXX_Size() int {
 	return xxx_messageInfo_ResourceLimit.Size(m)
@@ -6010,16 +5976,17 @@ func (m *NodePoolAutoscaling) Reset()         { *m = NodePoolAutoscaling{} }
 func (m *NodePoolAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*NodePoolAutoscaling) ProtoMessage()    {}
 func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{58}
+	return fileDescriptor_e39a67f424410134, []int{58}
 }
+
 func (m *NodePoolAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodePoolAutoscaling.Unmarshal(m, b)
 }
 func (m *NodePoolAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodePoolAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodePoolAutoscaling.Merge(dst, src)
+func (m *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePoolAutoscaling.Merge(m, src)
 }
 func (m *NodePoolAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_NodePoolAutoscaling.Size(m)
@@ -6095,16 +6062,17 @@ func (m *SetLabelsRequest) Reset()         { *m = SetLabelsRequest{} }
 func (m *SetLabelsRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLabelsRequest) ProtoMessage()    {}
 func (*SetLabelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{59}
+	return fileDescriptor_e39a67f424410134, []int{59}
 }
+
 func (m *SetLabelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLabelsRequest.Unmarshal(m, b)
 }
 func (m *SetLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLabelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLabelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLabelsRequest.Merge(dst, src)
+func (m *SetLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLabelsRequest.Merge(m, src)
 }
 func (m *SetLabelsRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLabelsRequest.Size(m)
@@ -6189,16 +6157,17 @@ func (m *SetLegacyAbacRequest) Reset()         { *m = SetLegacyAbacRequest{} }
 func (m *SetLegacyAbacRequest) String() string { return proto.CompactTextString(m) }
 func (*SetLegacyAbacRequest) ProtoMessage()    {}
 func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{60}
+	return fileDescriptor_e39a67f424410134, []int{60}
 }
+
 func (m *SetLegacyAbacRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetLegacyAbacRequest.Unmarshal(m, b)
 }
 func (m *SetLegacyAbacRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetLegacyAbacRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetLegacyAbacRequest.Merge(dst, src)
+func (m *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLegacyAbacRequest.Merge(m, src)
 }
 func (m *SetLegacyAbacRequest) XXX_Size() int {
 	return xxx_messageInfo_SetLegacyAbacRequest.Size(m)
@@ -6276,16 +6245,17 @@ func (m *StartIPRotationRequest) Reset()         { *m = StartIPRotationRequest{}
 func (m *StartIPRotationRequest) String() string { return proto.CompactTextString(m) }
 func (*StartIPRotationRequest) ProtoMessage()    {}
 func (*StartIPRotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{61}
+	return fileDescriptor_e39a67f424410134, []int{61}
 }
+
 func (m *StartIPRotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StartIPRotationRequest.Unmarshal(m, b)
 }
 func (m *StartIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StartIPRotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *StartIPRotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StartIPRotationRequest.Merge(dst, src)
+func (m *StartIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartIPRotationRequest.Merge(m, src)
 }
 func (m *StartIPRotationRequest) XXX_Size() int {
 	return xxx_messageInfo_StartIPRotationRequest.Size(m)
@@ -6360,16 +6330,17 @@ func (m *CompleteIPRotationRequest) Reset()         { *m = CompleteIPRotationReq
 func (m *CompleteIPRotationRequest) String() string { return proto.CompactTextString(m) }
 func (*CompleteIPRotationRequest) ProtoMessage()    {}
 func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{62}
+	return fileDescriptor_e39a67f424410134, []int{62}
 }
+
 func (m *CompleteIPRotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompleteIPRotationRequest.Unmarshal(m, b)
 }
 func (m *CompleteIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompleteIPRotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompleteIPRotationRequest.Merge(dst, src)
+func (m *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteIPRotationRequest.Merge(m, src)
 }
 func (m *CompleteIPRotationRequest) XXX_Size() int {
 	return xxx_messageInfo_CompleteIPRotationRequest.Size(m)
@@ -6427,16 +6398,17 @@ func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
 func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
 func (*AcceleratorConfig) ProtoMessage()    {}
 func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{63}
+	return fileDescriptor_e39a67f424410134, []int{63}
 }
+
 func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
 }
 func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
 }
-func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+func (m *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(m, src)
 }
 func (m *AcceleratorConfig) XXX_Size() int {
 	return xxx_messageInfo_AcceleratorConfig.Size(m)
@@ -6476,16 +6448,17 @@ func (m *WorkloadMetadataConfig) Reset()         { *m = WorkloadMetadataConfig{}
 func (m *WorkloadMetadataConfig) String() string { return proto.CompactTextString(m) }
 func (*WorkloadMetadataConfig) ProtoMessage()    {}
 func (*WorkloadMetadataConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{64}
+	return fileDescriptor_e39a67f424410134, []int{64}
 }
+
 func (m *WorkloadMetadataConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkloadMetadataConfig.Unmarshal(m, b)
 }
 func (m *WorkloadMetadataConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkloadMetadataConfig.Marshal(b, m, deterministic)
 }
-func (dst *WorkloadMetadataConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkloadMetadataConfig.Merge(dst, src)
+func (m *WorkloadMetadataConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkloadMetadataConfig.Merge(m, src)
 }
 func (m *WorkloadMetadataConfig) XXX_Size() int {
 	return xxx_messageInfo_WorkloadMetadataConfig.Size(m)
@@ -6531,16 +6504,17 @@ func (m *SetNetworkPolicyRequest) Reset()         { *m = SetNetworkPolicyRequest
 func (m *SetNetworkPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*SetNetworkPolicyRequest) ProtoMessage()    {}
 func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{65}
+	return fileDescriptor_e39a67f424410134, []int{65}
 }
+
 func (m *SetNetworkPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Unmarshal(m, b)
 }
 func (m *SetNetworkPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetNetworkPolicyRequest.Merge(dst, src)
+func (m *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNetworkPolicyRequest.Merge(m, src)
 }
 func (m *SetNetworkPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_SetNetworkPolicyRequest.Size(m)
@@ -6616,16 +6590,17 @@ func (m *SetMaintenancePolicyRequest) Reset()         { *m = SetMaintenancePolic
 func (m *SetMaintenancePolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*SetMaintenancePolicyRequest) ProtoMessage()    {}
 func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{66}
+	return fileDescriptor_e39a67f424410134, []int{66}
 }
+
 func (m *SetMaintenancePolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Unmarshal(m, b)
 }
 func (m *SetMaintenancePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(dst, src)
+func (m *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(m, src)
 }
 func (m *SetMaintenancePolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_SetMaintenancePolicyRequest.Size(m)
@@ -6685,16 +6660,17 @@ func (m *ListLocationsRequest) Reset()         { *m = ListLocationsRequest{} }
 func (m *ListLocationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListLocationsRequest) ProtoMessage()    {}
 func (*ListLocationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{67}
+	return fileDescriptor_e39a67f424410134, []int{67}
 }
+
 func (m *ListLocationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLocationsRequest.Unmarshal(m, b)
 }
 func (m *ListLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLocationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListLocationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLocationsRequest.Merge(dst, src)
+func (m *ListLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLocationsRequest.Merge(m, src)
 }
 func (m *ListLocationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListLocationsRequest.Size(m)
@@ -6731,16 +6707,17 @@ func (m *ListLocationsResponse) Reset()         { *m = ListLocationsResponse{} }
 func (m *ListLocationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListLocationsResponse) ProtoMessage()    {}
 func (*ListLocationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{68}
+	return fileDescriptor_e39a67f424410134, []int{68}
 }
+
 func (m *ListLocationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLocationsResponse.Unmarshal(m, b)
 }
 func (m *ListLocationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLocationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListLocationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLocationsResponse.Merge(dst, src)
+func (m *ListLocationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLocationsResponse.Merge(m, src)
 }
 func (m *ListLocationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListLocationsResponse.Size(m)
@@ -6785,16 +6762,17 @@ func (m *Location) Reset()         { *m = Location{} }
 func (m *Location) String() string { return proto.CompactTextString(m) }
 func (*Location) ProtoMessage()    {}
 func (*Location) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{69}
+	return fileDescriptor_e39a67f424410134, []int{69}
 }
+
 func (m *Location) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Location.Unmarshal(m, b)
 }
 func (m *Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Location.Marshal(b, m, deterministic)
 }
-func (dst *Location) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Location.Merge(dst, src)
+func (m *Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Location.Merge(m, src)
 }
 func (m *Location) XXX_Size() int {
 	return xxx_messageInfo_Location.Size(m)
@@ -6842,16 +6820,17 @@ func (m *StatusCondition) Reset()         { *m = StatusCondition{} }
 func (m *StatusCondition) String() string { return proto.CompactTextString(m) }
 func (*StatusCondition) ProtoMessage()    {}
 func (*StatusCondition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{70}
+	return fileDescriptor_e39a67f424410134, []int{70}
 }
+
 func (m *StatusCondition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StatusCondition.Unmarshal(m, b)
 }
 func (m *StatusCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StatusCondition.Marshal(b, m, deterministic)
 }
-func (dst *StatusCondition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StatusCondition.Merge(dst, src)
+func (m *StatusCondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatusCondition.Merge(m, src)
 }
 func (m *StatusCondition) XXX_Size() int {
 	return xxx_messageInfo_StatusCondition.Size(m)
@@ -6896,16 +6875,17 @@ func (m *NetworkConfig) Reset()         { *m = NetworkConfig{} }
 func (m *NetworkConfig) String() string { return proto.CompactTextString(m) }
 func (*NetworkConfig) ProtoMessage()    {}
 func (*NetworkConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{71}
+	return fileDescriptor_e39a67f424410134, []int{71}
 }
+
 func (m *NetworkConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkConfig.Unmarshal(m, b)
 }
 func (m *NetworkConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NetworkConfig.Marshal(b, m, deterministic)
 }
-func (dst *NetworkConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NetworkConfig.Merge(dst, src)
+func (m *NetworkConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkConfig.Merge(m, src)
 }
 func (m *NetworkConfig) XXX_Size() int {
 	return xxx_messageInfo_NetworkConfig.Size(m)
@@ -6958,16 +6938,17 @@ func (m *ListUsableSubnetworksRequest) Reset()         { *m = ListUsableSubnetwo
 func (m *ListUsableSubnetworksRequest) String() string { return proto.CompactTextString(m) }
 func (*ListUsableSubnetworksRequest) ProtoMessage()    {}
 func (*ListUsableSubnetworksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{72}
+	return fileDescriptor_e39a67f424410134, []int{72}
 }
+
 func (m *ListUsableSubnetworksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListUsableSubnetworksRequest.Unmarshal(m, b)
 }
 func (m *ListUsableSubnetworksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListUsableSubnetworksRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListUsableSubnetworksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListUsableSubnetworksRequest.Merge(dst, src)
+func (m *ListUsableSubnetworksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUsableSubnetworksRequest.Merge(m, src)
 }
 func (m *ListUsableSubnetworksRequest) XXX_Size() int {
 	return xxx_messageInfo_ListUsableSubnetworksRequest.Size(m)
@@ -7025,16 +7006,17 @@ func (m *ListUsableSubnetworksResponse) Reset()         { *m = ListUsableSubnetw
 func (m *ListUsableSubnetworksResponse) String() string { return proto.CompactTextString(m) }
 func (*ListUsableSubnetworksResponse) ProtoMessage()    {}
 func (*ListUsableSubnetworksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{73}
+	return fileDescriptor_e39a67f424410134, []int{73}
 }
+
 func (m *ListUsableSubnetworksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListUsableSubnetworksResponse.Unmarshal(m, b)
 }
 func (m *ListUsableSubnetworksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListUsableSubnetworksResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListUsableSubnetworksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListUsableSubnetworksResponse.Merge(dst, src)
+func (m *ListUsableSubnetworksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUsableSubnetworksResponse.Merge(m, src)
 }
 func (m *ListUsableSubnetworksResponse) XXX_Size() int {
 	return xxx_messageInfo_ListUsableSubnetworksResponse.Size(m)
@@ -7077,16 +7059,17 @@ func (m *UsableSubnetworkSecondaryRange) Reset()         { *m = UsableSubnetwork
 func (m *UsableSubnetworkSecondaryRange) String() string { return proto.CompactTextString(m) }
 func (*UsableSubnetworkSecondaryRange) ProtoMessage()    {}
 func (*UsableSubnetworkSecondaryRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{74}
+	return fileDescriptor_e39a67f424410134, []int{74}
 }
+
 func (m *UsableSubnetworkSecondaryRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UsableSubnetworkSecondaryRange.Unmarshal(m, b)
 }
 func (m *UsableSubnetworkSecondaryRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UsableSubnetworkSecondaryRange.Marshal(b, m, deterministic)
 }
-func (dst *UsableSubnetworkSecondaryRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UsableSubnetworkSecondaryRange.Merge(dst, src)
+func (m *UsableSubnetworkSecondaryRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UsableSubnetworkSecondaryRange.Merge(m, src)
 }
 func (m *UsableSubnetworkSecondaryRange) XXX_Size() int {
 	return xxx_messageInfo_UsableSubnetworkSecondaryRange.Size(m)
@@ -7145,16 +7128,17 @@ func (m *UsableSubnetwork) Reset()         { *m = UsableSubnetwork{} }
 func (m *UsableSubnetwork) String() string { return proto.CompactTextString(m) }
 func (*UsableSubnetwork) ProtoMessage()    {}
 func (*UsableSubnetwork) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{75}
+	return fileDescriptor_e39a67f424410134, []int{75}
 }
+
 func (m *UsableSubnetwork) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UsableSubnetwork.Unmarshal(m, b)
 }
 func (m *UsableSubnetwork) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UsableSubnetwork.Marshal(b, m, deterministic)
 }
-func (dst *UsableSubnetwork) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UsableSubnetwork.Merge(dst, src)
+func (m *UsableSubnetwork) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UsableSubnetwork.Merge(m, src)
 }
 func (m *UsableSubnetwork) XXX_Size() int {
 	return xxx_messageInfo_UsableSubnetwork.Size(m)
@@ -7215,16 +7199,17 @@ func (m *VerticalPodAutoscaling) Reset()         { *m = VerticalPodAutoscaling{}
 func (m *VerticalPodAutoscaling) String() string { return proto.CompactTextString(m) }
 func (*VerticalPodAutoscaling) ProtoMessage()    {}
 func (*VerticalPodAutoscaling) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{76}
+	return fileDescriptor_e39a67f424410134, []int{76}
 }
+
 func (m *VerticalPodAutoscaling) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VerticalPodAutoscaling.Unmarshal(m, b)
 }
 func (m *VerticalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VerticalPodAutoscaling.Marshal(b, m, deterministic)
 }
-func (dst *VerticalPodAutoscaling) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VerticalPodAutoscaling.Merge(dst, src)
+func (m *VerticalPodAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VerticalPodAutoscaling.Merge(m, src)
 }
 func (m *VerticalPodAutoscaling) XXX_Size() int {
 	return xxx_messageInfo_VerticalPodAutoscaling.Size(m)
@@ -7255,16 +7240,17 @@ func (m *MaxPodsConstraint) Reset()         { *m = MaxPodsConstraint{} }
 func (m *MaxPodsConstraint) String() string { return proto.CompactTextString(m) }
 func (*MaxPodsConstraint) ProtoMessage()    {}
 func (*MaxPodsConstraint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{77}
+	return fileDescriptor_e39a67f424410134, []int{77}
 }
+
 func (m *MaxPodsConstraint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaxPodsConstraint.Unmarshal(m, b)
 }
 func (m *MaxPodsConstraint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MaxPodsConstraint.Marshal(b, m, deterministic)
 }
-func (dst *MaxPodsConstraint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaxPodsConstraint.Merge(dst, src)
+func (m *MaxPodsConstraint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaxPodsConstraint.Merge(m, src)
 }
 func (m *MaxPodsConstraint) XXX_Size() int {
 	return xxx_messageInfo_MaxPodsConstraint.Size(m)
@@ -7298,16 +7284,17 @@ func (m *ResourceUsageExportConfig) Reset()         { *m = ResourceUsageExportCo
 func (m *ResourceUsageExportConfig) String() string { return proto.CompactTextString(m) }
 func (*ResourceUsageExportConfig) ProtoMessage()    {}
 func (*ResourceUsageExportConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{78}
+	return fileDescriptor_e39a67f424410134, []int{78}
 }
+
 func (m *ResourceUsageExportConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceUsageExportConfig.Unmarshal(m, b)
 }
 func (m *ResourceUsageExportConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceUsageExportConfig.Marshal(b, m, deterministic)
 }
-func (dst *ResourceUsageExportConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceUsageExportConfig.Merge(dst, src)
+func (m *ResourceUsageExportConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceUsageExportConfig.Merge(m, src)
 }
 func (m *ResourceUsageExportConfig) XXX_Size() int {
 	return xxx_messageInfo_ResourceUsageExportConfig.Size(m)
@@ -7349,16 +7336,17 @@ func (m *ResourceUsageExportConfig_BigQueryDestination) String() string {
 }
 func (*ResourceUsageExportConfig_BigQueryDestination) ProtoMessage() {}
 func (*ResourceUsageExportConfig_BigQueryDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cluster_service_b093026a38af0865, []int{78, 0}
+	return fileDescriptor_e39a67f424410134, []int{78, 0}
 }
+
 func (m *ResourceUsageExportConfig_BigQueryDestination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceUsageExportConfig_BigQueryDestination.Unmarshal(m, b)
 }
 func (m *ResourceUsageExportConfig_BigQueryDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceUsageExportConfig_BigQueryDestination.Marshal(b, m, deterministic)
 }
-func (dst *ResourceUsageExportConfig_BigQueryDestination) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceUsageExportConfig_BigQueryDestination.Merge(dst, src)
+func (m *ResourceUsageExportConfig_BigQueryDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceUsageExportConfig_BigQueryDestination.Merge(m, src)
 }
 func (m *ResourceUsageExportConfig_BigQueryDestination) XXX_Size() int {
 	return xxx_messageInfo_ResourceUsageExportConfig_BigQueryDestination.Size(m)
@@ -7377,6 +7365,18 @@ func (m *ResourceUsageExportConfig_BigQueryDestination) GetDatasetId() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.container.v1beta1.NodeTaint_Effect", NodeTaint_Effect_name, NodeTaint_Effect_value)
+	proto.RegisterEnum("google.container.v1beta1.IstioConfig_IstioAuthMode", IstioConfig_IstioAuthMode_name, IstioConfig_IstioAuthMode_value)
+	proto.RegisterEnum("google.container.v1beta1.NetworkPolicy_Provider", NetworkPolicy_Provider_name, NetworkPolicy_Provider_value)
+	proto.RegisterEnum("google.container.v1beta1.Cluster_Status", Cluster_Status_name, Cluster_Status_value)
+	proto.RegisterEnum("google.container.v1beta1.Operation_Status", Operation_Status_name, Operation_Status_value)
+	proto.RegisterEnum("google.container.v1beta1.Operation_Type", Operation_Type_name, Operation_Type_value)
+	proto.RegisterEnum("google.container.v1beta1.SetMasterAuthRequest_Action", SetMasterAuthRequest_Action_name, SetMasterAuthRequest_Action_value)
+	proto.RegisterEnum("google.container.v1beta1.NodePool_Status", NodePool_Status_name, NodePool_Status_value)
+	proto.RegisterEnum("google.container.v1beta1.WorkloadMetadataConfig_NodeMetadata", WorkloadMetadataConfig_NodeMetadata_name, WorkloadMetadataConfig_NodeMetadata_value)
+	proto.RegisterEnum("google.container.v1beta1.Location_LocationType", Location_LocationType_name, Location_LocationType_value)
+	proto.RegisterEnum("google.container.v1beta1.StatusCondition_Code", StatusCondition_Code_name, StatusCondition_Code_value)
+	proto.RegisterEnum("google.container.v1beta1.UsableSubnetworkSecondaryRange_Status", UsableSubnetworkSecondaryRange_Status_name, UsableSubnetworkSecondaryRange_Status_value)
 	proto.RegisterType((*NodeConfig)(nil), "google.container.v1beta1.NodeConfig")
 	proto.RegisterMapType((map[string]string)(nil), "google.container.v1beta1.NodeConfig.LabelsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.container.v1beta1.NodeConfig.MetadataEntry")
@@ -7463,1234 +7463,13 @@ func init() {
 	proto.RegisterType((*MaxPodsConstraint)(nil), "google.container.v1beta1.MaxPodsConstraint")
 	proto.RegisterType((*ResourceUsageExportConfig)(nil), "google.container.v1beta1.ResourceUsageExportConfig")
 	proto.RegisterType((*ResourceUsageExportConfig_BigQueryDestination)(nil), "google.container.v1beta1.ResourceUsageExportConfig.BigQueryDestination")
-	proto.RegisterEnum("google.container.v1beta1.NodeTaint_Effect", NodeTaint_Effect_name, NodeTaint_Effect_value)
-	proto.RegisterEnum("google.container.v1beta1.IstioConfig_IstioAuthMode", IstioConfig_IstioAuthMode_name, IstioConfig_IstioAuthMode_value)
-	proto.RegisterEnum("google.container.v1beta1.NetworkPolicy_Provider", NetworkPolicy_Provider_name, NetworkPolicy_Provider_value)
-	proto.RegisterEnum("google.container.v1beta1.Cluster_Status", Cluster_Status_name, Cluster_Status_value)
-	proto.RegisterEnum("google.container.v1beta1.Operation_Status", Operation_Status_name, Operation_Status_value)
-	proto.RegisterEnum("google.container.v1beta1.Operation_Type", Operation_Type_name, Operation_Type_value)
-	proto.RegisterEnum("google.container.v1beta1.SetMasterAuthRequest_Action", SetMasterAuthRequest_Action_name, SetMasterAuthRequest_Action_value)
-	proto.RegisterEnum("google.container.v1beta1.NodePool_Status", NodePool_Status_name, NodePool_Status_value)
-	proto.RegisterEnum("google.container.v1beta1.WorkloadMetadataConfig_NodeMetadata", WorkloadMetadataConfig_NodeMetadata_name, WorkloadMetadataConfig_NodeMetadata_value)
-	proto.RegisterEnum("google.container.v1beta1.Location_LocationType", Location_LocationType_name, Location_LocationType_value)
-	proto.RegisterEnum("google.container.v1beta1.StatusCondition_Code", StatusCondition_Code_name, StatusCondition_Code_value)
-	proto.RegisterEnum("google.container.v1beta1.UsableSubnetworkSecondaryRange_Status", UsableSubnetworkSecondaryRange_Status_name, UsableSubnetworkSecondaryRange_Status_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ClusterManagerClient is the client API for ClusterManager service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ClusterManagerClient interface {
-	// Lists all clusters owned by a project in either the specified zone or all
-	// zones.
-	ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error)
-	// Gets the details for a specific cluster.
-	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
-	// Creates a cluster, consisting of the specified number and type of Google
-	// Compute Engine instances.
-	//
-	// By default, the cluster is created in the project's
-	// [default network](/compute/docs/networks-and-firewalls#networks).
-	//
-	// One firewall is added for the cluster. After cluster creation,
-	// the cluster creates routes for each node to allow the containers
-	// on that node to communicate with all other instances in the
-	// cluster.
-	//
-	// Finally, an entry is added to the project's global metadata indicating
-	// which CIDR range is being used by the cluster.
-	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the settings for a specific cluster.
-	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the version and/or image type of a specific node pool.
-	UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the autoscaling settings of a specific node pool.
-	SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the logging service for a specific cluster.
-	SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the monitoring service for a specific cluster.
-	SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the addons for a specific cluster.
-	SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the locations for a specific cluster.
-	SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Updates the master for a specific cluster.
-	UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Used to set master auth materials. Currently supports :-
-	// Changing the admin password for a specific cluster.
-	// This can be either via password generation or explicitly set.
-	// Modify basic_auth.csv and reset the K8S API server.
-	SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Deletes the cluster, including the Kubernetes endpoint and all worker
-	// nodes.
-	//
-	// Firewalls and routes that were configured during cluster creation
-	// are also deleted.
-	//
-	// Other Google Compute Engine resources that might be in use by the cluster
-	// (e.g. load balancer resources) will not be deleted if they weren't present
-	// at the initial create time.
-	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Lists all operations in a project in a specific zone or all zones.
-	ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error)
-	// Gets the specified operation.
-	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Cancels the specified operation.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Returns configuration info about the Kubernetes Engine service.
-	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
-	// Lists the node pools for a cluster.
-	ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error)
-	// Retrieves the node pool requested.
-	GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error)
-	// Creates a node pool for a cluster.
-	CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Deletes a node pool from a cluster.
-	DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Roll back the previously Aborted or Failed NodePool upgrade.
-	// This will be an no-op if the last upgrade successfully completed.
-	RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the NodeManagement options for a node pool.
-	SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets labels on a cluster.
-	SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Enables or disables the ABAC authorization mechanism on a cluster.
-	SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Start master IP rotation.
-	StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Completes master IP rotation.
-	CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the size for a specific node pool.
-	SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Enables/Disables Network Policy for a cluster.
-	SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Sets the maintenance policy for a cluster.
-	SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error)
-	// Lists subnetworks that are usable for creating clusters in a project.
-	ListUsableSubnetworks(ctx context.Context, in *ListUsableSubnetworksRequest, opts ...grpc.CallOption) (*ListUsableSubnetworksResponse, error)
-	// Used to fetch locations that offer GKE.
-	ListLocations(ctx context.Context, in *ListLocationsRequest, opts ...grpc.CallOption) (*ListLocationsResponse, error)
 }
 
-type clusterManagerClient struct {
-	cc *grpc.ClientConn
+func init() {
+	proto.RegisterFile("google/container/v1beta1/cluster_service.proto", fileDescriptor_e39a67f424410134)
 }
 
-func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
-	return &clusterManagerClient{cc}
-}
-
-func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
-	out := new(ListClustersResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListClusters", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
-	out := new(Cluster)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLoggingService", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMonitoringService", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetAddonsConfig", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLocations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateMaster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMasterAuth", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteCluster", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
-	out := new(ListOperationsResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListOperations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetOperation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CancelOperation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
-	out := new(ServerConfig)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetServerConfig", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
-	out := new(ListNodePoolsResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListNodePools", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
-	out := new(NodePool)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteNodePool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolManagement", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLabels", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLegacyAbac", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/StartIPRotation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CompleteIPRotation", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolSize", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNetworkPolicy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
-	out := new(Operation)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListUsableSubnetworks(ctx context.Context, in *ListUsableSubnetworksRequest, opts ...grpc.CallOption) (*ListUsableSubnetworksResponse, error) {
-	out := new(ListUsableSubnetworksResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListUsableSubnetworks", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *clusterManagerClient) ListLocations(ctx context.Context, in *ListLocationsRequest, opts ...grpc.CallOption) (*ListLocationsResponse, error) {
-	out := new(ListLocationsResponse)
-	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListLocations", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ClusterManagerServer is the server API for ClusterManager service.
-type ClusterManagerServer interface {
-	// Lists all clusters owned by a project in either the specified zone or all
-	// zones.
-	ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error)
-	// Gets the details for a specific cluster.
-	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
-	// Creates a cluster, consisting of the specified number and type of Google
-	// Compute Engine instances.
-	//
-	// By default, the cluster is created in the project's
-	// [default network](/compute/docs/networks-and-firewalls#networks).
-	//
-	// One firewall is added for the cluster. After cluster creation,
-	// the cluster creates routes for each node to allow the containers
-	// on that node to communicate with all other instances in the
-	// cluster.
-	//
-	// Finally, an entry is added to the project's global metadata indicating
-	// which CIDR range is being used by the cluster.
-	CreateCluster(context.Context, *CreateClusterRequest) (*Operation, error)
-	// Updates the settings for a specific cluster.
-	UpdateCluster(context.Context, *UpdateClusterRequest) (*Operation, error)
-	// Updates the version and/or image type of a specific node pool.
-	UpdateNodePool(context.Context, *UpdateNodePoolRequest) (*Operation, error)
-	// Sets the autoscaling settings of a specific node pool.
-	SetNodePoolAutoscaling(context.Context, *SetNodePoolAutoscalingRequest) (*Operation, error)
-	// Sets the logging service for a specific cluster.
-	SetLoggingService(context.Context, *SetLoggingServiceRequest) (*Operation, error)
-	// Sets the monitoring service for a specific cluster.
-	SetMonitoringService(context.Context, *SetMonitoringServiceRequest) (*Operation, error)
-	// Sets the addons for a specific cluster.
-	SetAddonsConfig(context.Context, *SetAddonsConfigRequest) (*Operation, error)
-	// Sets the locations for a specific cluster.
-	SetLocations(context.Context, *SetLocationsRequest) (*Operation, error)
-	// Updates the master for a specific cluster.
-	UpdateMaster(context.Context, *UpdateMasterRequest) (*Operation, error)
-	// Used to set master auth materials. Currently supports :-
-	// Changing the admin password for a specific cluster.
-	// This can be either via password generation or explicitly set.
-	// Modify basic_auth.csv and reset the K8S API server.
-	SetMasterAuth(context.Context, *SetMasterAuthRequest) (*Operation, error)
-	// Deletes the cluster, including the Kubernetes endpoint and all worker
-	// nodes.
-	//
-	// Firewalls and routes that were configured during cluster creation
-	// are also deleted.
-	//
-	// Other Google Compute Engine resources that might be in use by the cluster
-	// (e.g. load balancer resources) will not be deleted if they weren't present
-	// at the initial create time.
-	DeleteCluster(context.Context, *DeleteClusterRequest) (*Operation, error)
-	// Lists all operations in a project in a specific zone or all zones.
-	ListOperations(context.Context, *ListOperationsRequest) (*ListOperationsResponse, error)
-	// Gets the specified operation.
-	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
-	// Cancels the specified operation.
-	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
-	// Returns configuration info about the Kubernetes Engine service.
-	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
-	// Lists the node pools for a cluster.
-	ListNodePools(context.Context, *ListNodePoolsRequest) (*ListNodePoolsResponse, error)
-	// Retrieves the node pool requested.
-	GetNodePool(context.Context, *GetNodePoolRequest) (*NodePool, error)
-	// Creates a node pool for a cluster.
-	CreateNodePool(context.Context, *CreateNodePoolRequest) (*Operation, error)
-	// Deletes a node pool from a cluster.
-	DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error)
-	// Roll back the previously Aborted or Failed NodePool upgrade.
-	// This will be an no-op if the last upgrade successfully completed.
-	RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error)
-	// Sets the NodeManagement options for a node pool.
-	SetNodePoolManagement(context.Context, *SetNodePoolManagementRequest) (*Operation, error)
-	// Sets labels on a cluster.
-	SetLabels(context.Context, *SetLabelsRequest) (*Operation, error)
-	// Enables or disables the ABAC authorization mechanism on a cluster.
-	SetLegacyAbac(context.Context, *SetLegacyAbacRequest) (*Operation, error)
-	// Start master IP rotation.
-	StartIPRotation(context.Context, *StartIPRotationRequest) (*Operation, error)
-	// Completes master IP rotation.
-	CompleteIPRotation(context.Context, *CompleteIPRotationRequest) (*Operation, error)
-	// Sets the size for a specific node pool.
-	SetNodePoolSize(context.Context, *SetNodePoolSizeRequest) (*Operation, error)
-	// Enables/Disables Network Policy for a cluster.
-	SetNetworkPolicy(context.Context, *SetNetworkPolicyRequest) (*Operation, error)
-	// Sets the maintenance policy for a cluster.
-	SetMaintenancePolicy(context.Context, *SetMaintenancePolicyRequest) (*Operation, error)
-	// Lists subnetworks that are usable for creating clusters in a project.
-	ListUsableSubnetworks(context.Context, *ListUsableSubnetworksRequest) (*ListUsableSubnetworksResponse, error)
-	// Used to fetch locations that offer GKE.
-	ListLocations(context.Context, *ListLocationsRequest) (*ListLocationsResponse, error)
-}
-
-func RegisterClusterManagerServer(s *grpc.Server, srv ClusterManagerServer) {
-	s.RegisterService(&_ClusterManager_serviceDesc, srv)
-}
-
-func _ClusterManager_ListClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListClustersRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListClusters(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/ListClusters",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListClusters(ctx, req.(*ListClustersRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/GetCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetCluster(ctx, req.(*GetClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CreateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CreateCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/CreateCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CreateCluster(ctx, req.(*CreateClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/UpdateCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateCluster(ctx, req.(*UpdateClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/UpdateNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateNodePool(ctx, req.(*UpdateNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolAutoscaling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolAutoscalingRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetNodePoolAutoscaling",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, req.(*SetNodePoolAutoscalingRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLoggingService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLoggingServiceRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLoggingService(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetLoggingService",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLoggingService(ctx, req.(*SetLoggingServiceRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMonitoringService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMonitoringServiceRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMonitoringService(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetMonitoringService",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMonitoringService(ctx, req.(*SetMonitoringServiceRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetAddonsConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetAddonsConfigRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetAddonsConfig",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, req.(*SetAddonsConfigRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLocationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLocations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetLocations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLocations(ctx, req.(*SetLocationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_UpdateMaster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateMasterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).UpdateMaster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/UpdateMaster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).UpdateMaster(ctx, req.(*UpdateMasterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMasterAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMasterAuthRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMasterAuth(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetMasterAuth",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMasterAuth(ctx, req.(*SetMasterAuthRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_DeleteCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteClusterRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).DeleteCluster(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/DeleteCluster",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).DeleteCluster(ctx, req.(*DeleteClusterRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListOperations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListOperationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListOperations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/ListOperations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListOperations(ctx, req.(*ListOperationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetOperationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetOperation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/GetOperation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetOperation(ctx, req.(*GetOperationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CancelOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CancelOperationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CancelOperation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/CancelOperation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CancelOperation(ctx, req.(*CancelOperationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetServerConfigRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetServerConfig(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/GetServerConfig",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetServerConfig(ctx, req.(*GetServerConfigRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListNodePools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListNodePoolsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListNodePools(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/ListNodePools",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListNodePools(ctx, req.(*ListNodePoolsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_GetNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).GetNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/GetNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).GetNodePool(ctx, req.(*GetNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CreateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CreateNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/CreateNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CreateNodePool(ctx, req.(*CreateNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_DeleteNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteNodePoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).DeleteNodePool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/DeleteNodePool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).DeleteNodePool(ctx, req.(*DeleteNodePoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_RollbackNodePoolUpgrade_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RollbackNodePoolUpgradeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, req.(*RollbackNodePoolUpgradeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolManagement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolManagementRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetNodePoolManagement",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, req.(*SetNodePoolManagementRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLabels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLabelsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLabels(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetLabels",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLabels(ctx, req.(*SetLabelsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetLegacyAbac_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetLegacyAbacRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetLegacyAbac",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, req.(*SetLegacyAbacRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_StartIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(StartIPRotationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).StartIPRotation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/StartIPRotation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).StartIPRotation(ctx, req.(*StartIPRotationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_CompleteIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CompleteIPRotationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/CompleteIPRotation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, req.(*CompleteIPRotationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNodePoolSize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNodePoolSizeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetNodePoolSize",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, req.(*SetNodePoolSizeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetNetworkPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetNetworkPolicyRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetNetworkPolicy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, req.(*SetNetworkPolicyRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_SetMaintenancePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetMaintenancePolicyRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/SetMaintenancePolicy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, req.(*SetMaintenancePolicyRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListUsableSubnetworks_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListUsableSubnetworksRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListUsableSubnetworks(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/ListUsableSubnetworks",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListUsableSubnetworks(ctx, req.(*ListUsableSubnetworksRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ClusterManager_ListLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListLocationsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterManagerServer).ListLocations(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.container.v1beta1.ClusterManager/ListLocations",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterManagerServer).ListLocations(ctx, req.(*ListLocationsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ClusterManager_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.container.v1beta1.ClusterManager",
-	HandlerType: (*ClusterManagerServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "ListClusters",
-			Handler:    _ClusterManager_ListClusters_Handler,
-		},
-		{
-			MethodName: "GetCluster",
-			Handler:    _ClusterManager_GetCluster_Handler,
-		},
-		{
-			MethodName: "CreateCluster",
-			Handler:    _ClusterManager_CreateCluster_Handler,
-		},
-		{
-			MethodName: "UpdateCluster",
-			Handler:    _ClusterManager_UpdateCluster_Handler,
-		},
-		{
-			MethodName: "UpdateNodePool",
-			Handler:    _ClusterManager_UpdateNodePool_Handler,
-		},
-		{
-			MethodName: "SetNodePoolAutoscaling",
-			Handler:    _ClusterManager_SetNodePoolAutoscaling_Handler,
-		},
-		{
-			MethodName: "SetLoggingService",
-			Handler:    _ClusterManager_SetLoggingService_Handler,
-		},
-		{
-			MethodName: "SetMonitoringService",
-			Handler:    _ClusterManager_SetMonitoringService_Handler,
-		},
-		{
-			MethodName: "SetAddonsConfig",
-			Handler:    _ClusterManager_SetAddonsConfig_Handler,
-		},
-		{
-			MethodName: "SetLocations",
-			Handler:    _ClusterManager_SetLocations_Handler,
-		},
-		{
-			MethodName: "UpdateMaster",
-			Handler:    _ClusterManager_UpdateMaster_Handler,
-		},
-		{
-			MethodName: "SetMasterAuth",
-			Handler:    _ClusterManager_SetMasterAuth_Handler,
-		},
-		{
-			MethodName: "DeleteCluster",
-			Handler:    _ClusterManager_DeleteCluster_Handler,
-		},
-		{
-			MethodName: "ListOperations",
-			Handler:    _ClusterManager_ListOperations_Handler,
-		},
-		{
-			MethodName: "GetOperation",
-			Handler:    _ClusterManager_GetOperation_Handler,
-		},
-		{
-			MethodName: "CancelOperation",
-			Handler:    _ClusterManager_CancelOperation_Handler,
-		},
-		{
-			MethodName: "GetServerConfig",
-			Handler:    _ClusterManager_GetServerConfig_Handler,
-		},
-		{
-			MethodName: "ListNodePools",
-			Handler:    _ClusterManager_ListNodePools_Handler,
-		},
-		{
-			MethodName: "GetNodePool",
-			Handler:    _ClusterManager_GetNodePool_Handler,
-		},
-		{
-			MethodName: "CreateNodePool",
-			Handler:    _ClusterManager_CreateNodePool_Handler,
-		},
-		{
-			MethodName: "DeleteNodePool",
-			Handler:    _ClusterManager_DeleteNodePool_Handler,
-		},
-		{
-			MethodName: "RollbackNodePoolUpgrade",
-			Handler:    _ClusterManager_RollbackNodePoolUpgrade_Handler,
-		},
-		{
-			MethodName: "SetNodePoolManagement",
-			Handler:    _ClusterManager_SetNodePoolManagement_Handler,
-		},
-		{
-			MethodName: "SetLabels",
-			Handler:    _ClusterManager_SetLabels_Handler,
-		},
-		{
-			MethodName: "SetLegacyAbac",
-			Handler:    _ClusterManager_SetLegacyAbac_Handler,
-		},
-		{
-			MethodName: "StartIPRotation",
-			Handler:    _ClusterManager_StartIPRotation_Handler,
-		},
-		{
-			MethodName: "CompleteIPRotation",
-			Handler:    _ClusterManager_CompleteIPRotation_Handler,
-		},
-		{
-			MethodName: "SetNodePoolSize",
-			Handler:    _ClusterManager_SetNodePoolSize_Handler,
-		},
-		{
-			MethodName: "SetNetworkPolicy",
-			Handler:    _ClusterManager_SetNetworkPolicy_Handler,
-		},
-		{
-			MethodName: "SetMaintenancePolicy",
-			Handler:    _ClusterManager_SetMaintenancePolicy_Handler,
-		},
-		{
-			MethodName: "ListUsableSubnetworks",
-			Handler:    _ClusterManager_ListUsableSubnetworks_Handler,
-		},
-		{
-			MethodName: "ListLocations",
-			Handler:    _ClusterManager_ListLocations_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/container/v1beta1/cluster_service.proto",
-}
-
-func init() {
-	proto.RegisterFile("google/container/v1beta1/cluster_service.proto", fileDescriptor_cluster_service_b093026a38af0865)
-}
-
-var fileDescriptor_cluster_service_b093026a38af0865 = []byte{
+var fileDescriptor_e39a67f424410134 = []byte{
 	// 7032 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5d, 0x6b, 0x6c, 0x23, 0xd7,
 	0x75, 0xf6, 0x50, 0x94, 0x44, 0x1d, 0x49, 0x14, 0x75, 0xa5, 0xd5, 0x72, 0xb9, 0x0f, 0xef, 0x8e,
@@ -9133,3 +7912,1212 @@ var fileDescriptor_cluster_service_b093026a38af0865 = []byte{
 	0xbc, 0x76, 0x99, 0xb5, 0xb5, 0x3b, 0x41, 0xfb, 0x7b, 0xe2, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff,
 	0x29, 0xa8, 0xb0, 0xd5, 0x0a, 0x72, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ClusterManagerClient is the client API for ClusterManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ClusterManagerClient interface {
+	// Lists all clusters owned by a project in either the specified zone or all
+	// zones.
+	ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error)
+	// Gets the details for a specific cluster.
+	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
+	// Creates a cluster, consisting of the specified number and type of Google
+	// Compute Engine instances.
+	//
+	// By default, the cluster is created in the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// One firewall is added for the cluster. After cluster creation,
+	// the cluster creates routes for each node to allow the containers
+	// on that node to communicate with all other instances in the
+	// cluster.
+	//
+	// Finally, an entry is added to the project's global metadata indicating
+	// which CIDR range is being used by the cluster.
+	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the settings for a specific cluster.
+	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the version and/or image type of a specific node pool.
+	UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the autoscaling settings of a specific node pool.
+	SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the logging service for a specific cluster.
+	SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the monitoring service for a specific cluster.
+	SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the addons for a specific cluster.
+	SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the locations for a specific cluster.
+	SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Updates the master for a specific cluster.
+	UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Used to set master auth materials. Currently supports :-
+	// Changing the admin password for a specific cluster.
+	// This can be either via password generation or explicitly set.
+	// Modify basic_auth.csv and reset the K8S API server.
+	SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Deletes the cluster, including the Kubernetes endpoint and all worker
+	// nodes.
+	//
+	// Firewalls and routes that were configured during cluster creation
+	// are also deleted.
+	//
+	// Other Google Compute Engine resources that might be in use by the cluster
+	// (e.g. load balancer resources) will not be deleted if they weren't present
+	// at the initial create time.
+	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Lists all operations in a project in a specific zone or all zones.
+	ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error)
+	// Gets the specified operation.
+	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Cancels the specified operation.
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Returns configuration info about the Kubernetes Engine service.
+	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
+	// Lists the node pools for a cluster.
+	ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error)
+	// Retrieves the node pool requested.
+	GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error)
+	// Creates a node pool for a cluster.
+	CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Deletes a node pool from a cluster.
+	DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Roll back the previously Aborted or Failed NodePool upgrade.
+	// This will be an no-op if the last upgrade successfully completed.
+	RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the NodeManagement options for a node pool.
+	SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets labels on a cluster.
+	SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Enables or disables the ABAC authorization mechanism on a cluster.
+	SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Start master IP rotation.
+	StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Completes master IP rotation.
+	CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the size for a specific node pool.
+	SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Enables/Disables Network Policy for a cluster.
+	SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Sets the maintenance policy for a cluster.
+	SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error)
+	// Lists subnetworks that are usable for creating clusters in a project.
+	ListUsableSubnetworks(ctx context.Context, in *ListUsableSubnetworksRequest, opts ...grpc.CallOption) (*ListUsableSubnetworksResponse, error)
+	// Used to fetch locations that offer GKE.
+	ListLocations(ctx context.Context, in *ListLocationsRequest, opts ...grpc.CallOption) (*ListLocationsResponse, error)
+}
+
+type clusterManagerClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
+	return &clusterManagerClient{cc}
+}
+
+func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
+	out := new(ListClustersResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListClusters", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
+	out := new(Cluster)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLoggingService", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMonitoringService", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetAddonsConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLocations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateMaster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMasterAuth", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteCluster", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
+	out := new(ListOperationsResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListOperations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetOperation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CancelOperation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
+	out := new(ServerConfig)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetServerConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
+	out := new(ListNodePoolsResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListNodePools", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
+	out := new(NodePool)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteNodePool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolManagement", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLabels", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLegacyAbac", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/StartIPRotation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CompleteIPRotation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolSize", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNetworkPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
+	out := new(Operation)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListUsableSubnetworks(ctx context.Context, in *ListUsableSubnetworksRequest, opts ...grpc.CallOption) (*ListUsableSubnetworksResponse, error) {
+	out := new(ListUsableSubnetworksResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListUsableSubnetworks", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *clusterManagerClient) ListLocations(ctx context.Context, in *ListLocationsRequest, opts ...grpc.CallOption) (*ListLocationsResponse, error) {
+	out := new(ListLocationsResponse)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListLocations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ClusterManagerServer is the server API for ClusterManager service.
+type ClusterManagerServer interface {
+	// Lists all clusters owned by a project in either the specified zone or all
+	// zones.
+	ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error)
+	// Gets the details for a specific cluster.
+	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
+	// Creates a cluster, consisting of the specified number and type of Google
+	// Compute Engine instances.
+	//
+	// By default, the cluster is created in the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// One firewall is added for the cluster. After cluster creation,
+	// the cluster creates routes for each node to allow the containers
+	// on that node to communicate with all other instances in the
+	// cluster.
+	//
+	// Finally, an entry is added to the project's global metadata indicating
+	// which CIDR range is being used by the cluster.
+	CreateCluster(context.Context, *CreateClusterRequest) (*Operation, error)
+	// Updates the settings for a specific cluster.
+	UpdateCluster(context.Context, *UpdateClusterRequest) (*Operation, error)
+	// Updates the version and/or image type of a specific node pool.
+	UpdateNodePool(context.Context, *UpdateNodePoolRequest) (*Operation, error)
+	// Sets the autoscaling settings of a specific node pool.
+	SetNodePoolAutoscaling(context.Context, *SetNodePoolAutoscalingRequest) (*Operation, error)
+	// Sets the logging service for a specific cluster.
+	SetLoggingService(context.Context, *SetLoggingServiceRequest) (*Operation, error)
+	// Sets the monitoring service for a specific cluster.
+	SetMonitoringService(context.Context, *SetMonitoringServiceRequest) (*Operation, error)
+	// Sets the addons for a specific cluster.
+	SetAddonsConfig(context.Context, *SetAddonsConfigRequest) (*Operation, error)
+	// Sets the locations for a specific cluster.
+	SetLocations(context.Context, *SetLocationsRequest) (*Operation, error)
+	// Updates the master for a specific cluster.
+	UpdateMaster(context.Context, *UpdateMasterRequest) (*Operation, error)
+	// Used to set master auth materials. Currently supports :-
+	// Changing the admin password for a specific cluster.
+	// This can be either via password generation or explicitly set.
+	// Modify basic_auth.csv and reset the K8S API server.
+	SetMasterAuth(context.Context, *SetMasterAuthRequest) (*Operation, error)
+	// Deletes the cluster, including the Kubernetes endpoint and all worker
+	// nodes.
+	//
+	// Firewalls and routes that were configured during cluster creation
+	// are also deleted.
+	//
+	// Other Google Compute Engine resources that might be in use by the cluster
+	// (e.g. load balancer resources) will not be deleted if they weren't present
+	// at the initial create time.
+	DeleteCluster(context.Context, *DeleteClusterRequest) (*Operation, error)
+	// Lists all operations in a project in a specific zone or all zones.
+	ListOperations(context.Context, *ListOperationsRequest) (*ListOperationsResponse, error)
+	// Gets the specified operation.
+	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
+	// Cancels the specified operation.
+	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
+	// Returns configuration info about the Kubernetes Engine service.
+	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
+	// Lists the node pools for a cluster.
+	ListNodePools(context.Context, *ListNodePoolsRequest) (*ListNodePoolsResponse, error)
+	// Retrieves the node pool requested.
+	GetNodePool(context.Context, *GetNodePoolRequest) (*NodePool, error)
+	// Creates a node pool for a cluster.
+	CreateNodePool(context.Context, *CreateNodePoolRequest) (*Operation, error)
+	// Deletes a node pool from a cluster.
+	DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error)
+	// Roll back the previously Aborted or Failed NodePool upgrade.
+	// This will be an no-op if the last upgrade successfully completed.
+	RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error)
+	// Sets the NodeManagement options for a node pool.
+	SetNodePoolManagement(context.Context, *SetNodePoolManagementRequest) (*Operation, error)
+	// Sets labels on a cluster.
+	SetLabels(context.Context, *SetLabelsRequest) (*Operation, error)
+	// Enables or disables the ABAC authorization mechanism on a cluster.
+	SetLegacyAbac(context.Context, *SetLegacyAbacRequest) (*Operation, error)
+	// Start master IP rotation.
+	StartIPRotation(context.Context, *StartIPRotationRequest) (*Operation, error)
+	// Completes master IP rotation.
+	CompleteIPRotation(context.Context, *CompleteIPRotationRequest) (*Operation, error)
+	// Sets the size for a specific node pool.
+	SetNodePoolSize(context.Context, *SetNodePoolSizeRequest) (*Operation, error)
+	// Enables/Disables Network Policy for a cluster.
+	SetNetworkPolicy(context.Context, *SetNetworkPolicyRequest) (*Operation, error)
+	// Sets the maintenance policy for a cluster.
+	SetMaintenancePolicy(context.Context, *SetMaintenancePolicyRequest) (*Operation, error)
+	// Lists subnetworks that are usable for creating clusters in a project.
+	ListUsableSubnetworks(context.Context, *ListUsableSubnetworksRequest) (*ListUsableSubnetworksResponse, error)
+	// Used to fetch locations that offer GKE.
+	ListLocations(context.Context, *ListLocationsRequest) (*ListLocationsResponse, error)
+}
+
+func RegisterClusterManagerServer(s *grpc.Server, srv ClusterManagerServer) {
+	s.RegisterService(&_ClusterManager_serviceDesc, srv)
+}
+
+func _ClusterManager_ListClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListClustersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListClusters(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/ListClusters",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListClusters(ctx, req.(*ListClustersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/GetCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetCluster(ctx, req.(*GetClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CreateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CreateCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/CreateCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CreateCluster(ctx, req.(*CreateClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/UpdateCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateCluster(ctx, req.(*UpdateClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/UpdateNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateNodePool(ctx, req.(*UpdateNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolAutoscaling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolAutoscalingRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetNodePoolAutoscaling",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolAutoscaling(ctx, req.(*SetNodePoolAutoscalingRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLoggingService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLoggingServiceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLoggingService(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetLoggingService",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLoggingService(ctx, req.(*SetLoggingServiceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMonitoringService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMonitoringServiceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMonitoringService(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetMonitoringService",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMonitoringService(ctx, req.(*SetMonitoringServiceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetAddonsConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetAddonsConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetAddonsConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetAddonsConfig(ctx, req.(*SetAddonsConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLocationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLocations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetLocations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLocations(ctx, req.(*SetLocationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_UpdateMaster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateMasterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).UpdateMaster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/UpdateMaster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).UpdateMaster(ctx, req.(*UpdateMasterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMasterAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMasterAuthRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMasterAuth(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetMasterAuth",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMasterAuth(ctx, req.(*SetMasterAuthRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_DeleteCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteClusterRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).DeleteCluster(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/DeleteCluster",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).DeleteCluster(ctx, req.(*DeleteClusterRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListOperations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListOperationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListOperations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/ListOperations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListOperations(ctx, req.(*ListOperationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/GetOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetOperation(ctx, req.(*GetOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CancelOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CancelOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/CancelOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CancelOperation(ctx, req.(*CancelOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetServerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetServerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/GetServerConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetServerConfig(ctx, req.(*GetServerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListNodePools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListNodePoolsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListNodePools(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/ListNodePools",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListNodePools(ctx, req.(*ListNodePoolsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_GetNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).GetNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/GetNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).GetNodePool(ctx, req.(*GetNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CreateNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CreateNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/CreateNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CreateNodePool(ctx, req.(*CreateNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_DeleteNodePool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteNodePoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).DeleteNodePool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/DeleteNodePool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).DeleteNodePool(ctx, req.(*DeleteNodePoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_RollbackNodePoolUpgrade_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RollbackNodePoolUpgradeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).RollbackNodePoolUpgrade(ctx, req.(*RollbackNodePoolUpgradeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolManagement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolManagementRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetNodePoolManagement",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolManagement(ctx, req.(*SetNodePoolManagementRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLabels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLabelsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLabels(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetLabels",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLabels(ctx, req.(*SetLabelsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetLegacyAbac_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetLegacyAbacRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetLegacyAbac",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetLegacyAbac(ctx, req.(*SetLegacyAbacRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_StartIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StartIPRotationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).StartIPRotation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/StartIPRotation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).StartIPRotation(ctx, req.(*StartIPRotationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_CompleteIPRotation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CompleteIPRotationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/CompleteIPRotation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).CompleteIPRotation(ctx, req.(*CompleteIPRotationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNodePoolSize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNodePoolSizeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetNodePoolSize",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNodePoolSize(ctx, req.(*SetNodePoolSizeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetNetworkPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetNetworkPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetNetworkPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetNetworkPolicy(ctx, req.(*SetNetworkPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_SetMaintenancePolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMaintenancePolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/SetMaintenancePolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).SetMaintenancePolicy(ctx, req.(*SetMaintenancePolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListUsableSubnetworks_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListUsableSubnetworksRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListUsableSubnetworks(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/ListUsableSubnetworks",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListUsableSubnetworks(ctx, req.(*ListUsableSubnetworksRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ClusterManager_ListLocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListLocationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ClusterManagerServer).ListLocations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.container.v1beta1.ClusterManager/ListLocations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ClusterManagerServer).ListLocations(ctx, req.(*ListLocationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ClusterManager_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.container.v1beta1.ClusterManager",
+	HandlerType: (*ClusterManagerServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListClusters",
+			Handler:    _ClusterManager_ListClusters_Handler,
+		},
+		{
+			MethodName: "GetCluster",
+			Handler:    _ClusterManager_GetCluster_Handler,
+		},
+		{
+			MethodName: "CreateCluster",
+			Handler:    _ClusterManager_CreateCluster_Handler,
+		},
+		{
+			MethodName: "UpdateCluster",
+			Handler:    _ClusterManager_UpdateCluster_Handler,
+		},
+		{
+			MethodName: "UpdateNodePool",
+			Handler:    _ClusterManager_UpdateNodePool_Handler,
+		},
+		{
+			MethodName: "SetNodePoolAutoscaling",
+			Handler:    _ClusterManager_SetNodePoolAutoscaling_Handler,
+		},
+		{
+			MethodName: "SetLoggingService",
+			Handler:    _ClusterManager_SetLoggingService_Handler,
+		},
+		{
+			MethodName: "SetMonitoringService",
+			Handler:    _ClusterManager_SetMonitoringService_Handler,
+		},
+		{
+			MethodName: "SetAddonsConfig",
+			Handler:    _ClusterManager_SetAddonsConfig_Handler,
+		},
+		{
+			MethodName: "SetLocations",
+			Handler:    _ClusterManager_SetLocations_Handler,
+		},
+		{
+			MethodName: "UpdateMaster",
+			Handler:    _ClusterManager_UpdateMaster_Handler,
+		},
+		{
+			MethodName: "SetMasterAuth",
+			Handler:    _ClusterManager_SetMasterAuth_Handler,
+		},
+		{
+			MethodName: "DeleteCluster",
+			Handler:    _ClusterManager_DeleteCluster_Handler,
+		},
+		{
+			MethodName: "ListOperations",
+			Handler:    _ClusterManager_ListOperations_Handler,
+		},
+		{
+			MethodName: "GetOperation",
+			Handler:    _ClusterManager_GetOperation_Handler,
+		},
+		{
+			MethodName: "CancelOperation",
+			Handler:    _ClusterManager_CancelOperation_Handler,
+		},
+		{
+			MethodName: "GetServerConfig",
+			Handler:    _ClusterManager_GetServerConfig_Handler,
+		},
+		{
+			MethodName: "ListNodePools",
+			Handler:    _ClusterManager_ListNodePools_Handler,
+		},
+		{
+			MethodName: "GetNodePool",
+			Handler:    _ClusterManager_GetNodePool_Handler,
+		},
+		{
+			MethodName: "CreateNodePool",
+			Handler:    _ClusterManager_CreateNodePool_Handler,
+		},
+		{
+			MethodName: "DeleteNodePool",
+			Handler:    _ClusterManager_DeleteNodePool_Handler,
+		},
+		{
+			MethodName: "RollbackNodePoolUpgrade",
+			Handler:    _ClusterManager_RollbackNodePoolUpgrade_Handler,
+		},
+		{
+			MethodName: "SetNodePoolManagement",
+			Handler:    _ClusterManager_SetNodePoolManagement_Handler,
+		},
+		{
+			MethodName: "SetLabels",
+			Handler:    _ClusterManager_SetLabels_Handler,
+		},
+		{
+			MethodName: "SetLegacyAbac",
+			Handler:    _ClusterManager_SetLegacyAbac_Handler,
+		},
+		{
+			MethodName: "StartIPRotation",
+			Handler:    _ClusterManager_StartIPRotation_Handler,
+		},
+		{
+			MethodName: "CompleteIPRotation",
+			Handler:    _ClusterManager_CompleteIPRotation_Handler,
+		},
+		{
+			MethodName: "SetNodePoolSize",
+			Handler:    _ClusterManager_SetNodePoolSize_Handler,
+		},
+		{
+			MethodName: "SetNetworkPolicy",
+			Handler:    _ClusterManager_SetNetworkPolicy_Handler,
+		},
+		{
+			MethodName: "SetMaintenancePolicy",
+			Handler:    _ClusterManager_SetMaintenancePolicy_Handler,
+		},
+		{
+			MethodName: "ListUsableSubnetworks",
+			Handler:    _ClusterManager_ListUsableSubnetworks_Handler,
+		},
+		{
+			MethodName: "ListLocations",
+			Handler:    _ClusterManager_ListLocations_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/container/v1beta1/cluster_service.proto",
+}
diff --git a/googleapis/datastore/admin/v1/datastore_admin.pb.go b/googleapis/datastore/admin/v1/datastore_admin.pb.go
index 33d67d28ee..f91ca55a29 100644
--- a/googleapis/datastore/admin/v1/datastore_admin.pb.go
+++ b/googleapis/datastore/admin/v1/datastore_admin.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Operation types.
 type OperationType int32
@@ -49,6 +49,7 @@ var OperationType_name = map[int32]string{
 	3: "CREATE_INDEX",
 	4: "DELETE_INDEX",
 }
+
 var OperationType_value = map[string]int32{
 	"OPERATION_TYPE_UNSPECIFIED": 0,
 	"EXPORT_ENTITIES":            1,
@@ -60,8 +61,9 @@ var OperationType_value = map[string]int32{
 func (x OperationType) String() string {
 	return proto.EnumName(OperationType_name, int32(x))
 }
+
 func (OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{0}
+	return fileDescriptor_891b89db06fa8774, []int{0}
 }
 
 // The various possible states for an ongoing Operation.
@@ -98,6 +100,7 @@ var CommonMetadata_State_name = map[int32]string{
 	6: "FAILED",
 	7: "CANCELLED",
 }
+
 var CommonMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"INITIALIZING":      1,
@@ -112,8 +115,9 @@ var CommonMetadata_State_value = map[string]int32{
 func (x CommonMetadata_State) String() string {
 	return proto.EnumName(CommonMetadata_State_name, int32(x))
 }
+
 func (CommonMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{0, 0}
+	return fileDescriptor_891b89db06fa8774, []int{0, 0}
 }
 
 // Metadata common to all Datastore Admin operations.
@@ -139,16 +143,17 @@ func (m *CommonMetadata) Reset()         { *m = CommonMetadata{} }
 func (m *CommonMetadata) String() string { return proto.CompactTextString(m) }
 func (*CommonMetadata) ProtoMessage()    {}
 func (*CommonMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{0}
+	return fileDescriptor_891b89db06fa8774, []int{0}
 }
+
 func (m *CommonMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommonMetadata.Unmarshal(m, b)
 }
 func (m *CommonMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommonMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CommonMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommonMetadata.Merge(dst, src)
+func (m *CommonMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommonMetadata.Merge(m, src)
 }
 func (m *CommonMetadata) XXX_Size() int {
 	return xxx_messageInfo_CommonMetadata.Size(m)
@@ -211,16 +216,17 @@ func (m *Progress) Reset()         { *m = Progress{} }
 func (m *Progress) String() string { return proto.CompactTextString(m) }
 func (*Progress) ProtoMessage()    {}
 func (*Progress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{1}
+	return fileDescriptor_891b89db06fa8774, []int{1}
 }
+
 func (m *Progress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Progress.Unmarshal(m, b)
 }
 func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
 }
-func (dst *Progress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Progress.Merge(dst, src)
+func (m *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(m, src)
 }
 func (m *Progress) XXX_Size() int {
 	return xxx_messageInfo_Progress.Size(m)
@@ -282,16 +288,17 @@ func (m *ExportEntitiesRequest) Reset()         { *m = ExportEntitiesRequest{} }
 func (m *ExportEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportEntitiesRequest) ProtoMessage()    {}
 func (*ExportEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{2}
+	return fileDescriptor_891b89db06fa8774, []int{2}
 }
+
 func (m *ExportEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEntitiesRequest.Unmarshal(m, b)
 }
 func (m *ExportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEntitiesRequest.Merge(dst, src)
+func (m *ExportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesRequest.Merge(m, src)
 }
 func (m *ExportEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportEntitiesRequest.Size(m)
@@ -365,16 +372,17 @@ func (m *ImportEntitiesRequest) Reset()         { *m = ImportEntitiesRequest{} }
 func (m *ImportEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportEntitiesRequest) ProtoMessage()    {}
 func (*ImportEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{3}
+	return fileDescriptor_891b89db06fa8774, []int{3}
 }
+
 func (m *ImportEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportEntitiesRequest.Unmarshal(m, b)
 }
 func (m *ImportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportEntitiesRequest.Merge(dst, src)
+func (m *ImportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesRequest.Merge(m, src)
 }
 func (m *ImportEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportEntitiesRequest.Size(m)
@@ -430,16 +438,17 @@ func (m *ExportEntitiesResponse) Reset()         { *m = ExportEntitiesResponse{}
 func (m *ExportEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportEntitiesResponse) ProtoMessage()    {}
 func (*ExportEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{4}
+	return fileDescriptor_891b89db06fa8774, []int{4}
 }
+
 func (m *ExportEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEntitiesResponse.Unmarshal(m, b)
 }
 func (m *ExportEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEntitiesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportEntitiesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEntitiesResponse.Merge(dst, src)
+func (m *ExportEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesResponse.Merge(m, src)
 }
 func (m *ExportEntitiesResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportEntitiesResponse.Size(m)
@@ -482,16 +491,17 @@ func (m *ExportEntitiesMetadata) Reset()         { *m = ExportEntitiesMetadata{}
 func (m *ExportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportEntitiesMetadata) ProtoMessage()    {}
 func (*ExportEntitiesMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{5}
+	return fileDescriptor_891b89db06fa8774, []int{5}
 }
+
 func (m *ExportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEntitiesMetadata.Unmarshal(m, b)
 }
 func (m *ExportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEntitiesMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportEntitiesMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEntitiesMetadata.Merge(dst, src)
+func (m *ExportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesMetadata.Merge(m, src)
 }
 func (m *ExportEntitiesMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportEntitiesMetadata.Size(m)
@@ -561,16 +571,17 @@ func (m *ImportEntitiesMetadata) Reset()         { *m = ImportEntitiesMetadata{}
 func (m *ImportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImportEntitiesMetadata) ProtoMessage()    {}
 func (*ImportEntitiesMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{6}
+	return fileDescriptor_891b89db06fa8774, []int{6}
 }
+
 func (m *ImportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportEntitiesMetadata.Unmarshal(m, b)
 }
 func (m *ImportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportEntitiesMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImportEntitiesMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportEntitiesMetadata.Merge(dst, src)
+func (m *ImportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesMetadata.Merge(m, src)
 }
 func (m *ImportEntitiesMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImportEntitiesMetadata.Size(m)
@@ -655,16 +666,17 @@ func (m *EntityFilter) Reset()         { *m = EntityFilter{} }
 func (m *EntityFilter) String() string { return proto.CompactTextString(m) }
 func (*EntityFilter) ProtoMessage()    {}
 func (*EntityFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{7}
+	return fileDescriptor_891b89db06fa8774, []int{7}
 }
+
 func (m *EntityFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityFilter.Unmarshal(m, b)
 }
 func (m *EntityFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityFilter.Marshal(b, m, deterministic)
 }
-func (dst *EntityFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityFilter.Merge(dst, src)
+func (m *EntityFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityFilter.Merge(m, src)
 }
 func (m *EntityFilter) XXX_Size() int {
 	return xxx_messageInfo_EntityFilter.Size(m)
@@ -705,16 +717,17 @@ func (m *GetIndexRequest) Reset()         { *m = GetIndexRequest{} }
 func (m *GetIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIndexRequest) ProtoMessage()    {}
 func (*GetIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{8}
+	return fileDescriptor_891b89db06fa8774, []int{8}
 }
+
 func (m *GetIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIndexRequest.Unmarshal(m, b)
 }
 func (m *GetIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIndexRequest.Merge(dst, src)
+func (m *GetIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIndexRequest.Merge(m, src)
 }
 func (m *GetIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIndexRequest.Size(m)
@@ -759,16 +772,17 @@ func (m *ListIndexesRequest) Reset()         { *m = ListIndexesRequest{} }
 func (m *ListIndexesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesRequest) ProtoMessage()    {}
 func (*ListIndexesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{9}
+	return fileDescriptor_891b89db06fa8774, []int{9}
 }
+
 func (m *ListIndexesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesRequest.Unmarshal(m, b)
 }
 func (m *ListIndexesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesRequest.Merge(dst, src)
+func (m *ListIndexesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesRequest.Merge(m, src)
 }
 func (m *ListIndexesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesRequest.Size(m)
@@ -823,16 +837,17 @@ func (m *ListIndexesResponse) Reset()         { *m = ListIndexesResponse{} }
 func (m *ListIndexesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesResponse) ProtoMessage()    {}
 func (*ListIndexesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{10}
+	return fileDescriptor_891b89db06fa8774, []int{10}
 }
+
 func (m *ListIndexesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesResponse.Unmarshal(m, b)
 }
 func (m *ListIndexesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesResponse.Merge(dst, src)
+func (m *ListIndexesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesResponse.Merge(m, src)
 }
 func (m *ListIndexesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesResponse.Size(m)
@@ -874,16 +889,17 @@ func (m *IndexOperationMetadata) Reset()         { *m = IndexOperationMetadata{}
 func (m *IndexOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*IndexOperationMetadata) ProtoMessage()    {}
 func (*IndexOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_35408641d3652505, []int{11}
+	return fileDescriptor_891b89db06fa8774, []int{11}
 }
+
 func (m *IndexOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IndexOperationMetadata.Unmarshal(m, b)
 }
 func (m *IndexOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IndexOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *IndexOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IndexOperationMetadata.Merge(dst, src)
+func (m *IndexOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IndexOperationMetadata.Merge(m, src)
 }
 func (m *IndexOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_IndexOperationMetadata.Size(m)
@@ -916,6 +932,8 @@ func (m *IndexOperationMetadata) GetIndexId() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.datastore.admin.v1.OperationType", OperationType_name, OperationType_value)
+	proto.RegisterEnum("google.datastore.admin.v1.CommonMetadata_State", CommonMetadata_State_name, CommonMetadata_State_value)
 	proto.RegisterType((*CommonMetadata)(nil), "google.datastore.admin.v1.CommonMetadata")
 	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1.CommonMetadata.LabelsEntry")
 	proto.RegisterType((*Progress)(nil), "google.datastore.admin.v1.Progress")
@@ -931,8 +949,90 @@ func init() {
 	proto.RegisterType((*ListIndexesRequest)(nil), "google.datastore.admin.v1.ListIndexesRequest")
 	proto.RegisterType((*ListIndexesResponse)(nil), "google.datastore.admin.v1.ListIndexesResponse")
 	proto.RegisterType((*IndexOperationMetadata)(nil), "google.datastore.admin.v1.IndexOperationMetadata")
-	proto.RegisterEnum("google.datastore.admin.v1.OperationType", OperationType_name, OperationType_value)
-	proto.RegisterEnum("google.datastore.admin.v1.CommonMetadata_State", CommonMetadata_State_name, CommonMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/datastore/admin/v1/datastore_admin.proto", fileDescriptor_891b89db06fa8774)
+}
+
+var fileDescriptor_891b89db06fa8774 = []byte{
+	// 1216 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x92, 0xdb, 0xc4,
+	0x13, 0xff, 0x4b, 0xfe, 0x88, 0xdd, 0x5e, 0x7b, 0x9d, 0xc9, 0x3f, 0x5b, 0x8e, 0x21, 0xc4, 0x68,
+	0x2b, 0xb0, 0x59, 0x40, 0x22, 0x86, 0x14, 0x64, 0xa1, 0xa8, 0x72, 0x6c, 0x6d, 0x4a, 0xe0, 0xd8,
+	0x2e, 0x59, 0x4b, 0x85, 0x5c, 0x54, 0xda, 0xd5, 0xc4, 0x25, 0x56, 0xd6, 0x08, 0x69, 0x1c, 0xd6,
+	0x49, 0xe5, 0xc2, 0x85, 0x03, 0x55, 0x5c, 0x38, 0xc0, 0x33, 0x70, 0xcc, 0x1b, 0x70, 0xe3, 0xce,
+	0x99, 0x5b, 0xde, 0x80, 0x17, 0xa0, 0x66, 0xf4, 0xb1, 0xf6, 0xc6, 0xeb, 0x35, 0x6c, 0xa8, 0xe2,
+	0xc0, 0xcd, 0xdd, 0xd3, 0xbf, 0xee, 0x9e, 0xdf, 0x74, 0xb7, 0x5b, 0xa0, 0x8c, 0x08, 0x19, 0xb9,
+	0x58, 0xb1, 0x2d, 0x6a, 0x85, 0x94, 0x04, 0x58, 0xb1, 0xec, 0xb1, 0xe3, 0x29, 0x8f, 0x6e, 0x1e,
+	0xab, 0x4c, 0xae, 0x92, 0xfd, 0x80, 0x50, 0x82, 0xae, 0x44, 0x00, 0x39, 0x3d, 0x95, 0xa3, 0xd3,
+	0x47, 0x37, 0xeb, 0xaf, 0xc6, 0xbe, 0x2c, 0xdf, 0x51, 0x2c, 0xcf, 0x23, 0xd4, 0xa2, 0x0e, 0xf1,
+	0xc2, 0x08, 0x58, 0xbf, 0x7e, 0x7a, 0x24, 0xc7, 0xb3, 0xf1, 0x51, 0x6c, 0xb6, 0x19, 0x9b, 0xb9,
+	0xc4, 0x1b, 0x05, 0x13, 0xcf, 0x73, 0xbc, 0x91, 0x42, 0x7c, 0x1c, 0xcc, 0xf9, 0xba, 0x16, 0x1b,
+	0x71, 0x69, 0x7f, 0xf2, 0x50, 0xa1, 0xce, 0x18, 0x87, 0xd4, 0x1a, 0xfb, 0x91, 0x81, 0xf4, 0x2c,
+	0x0b, 0x95, 0x36, 0x19, 0x8f, 0x89, 0x77, 0x0f, 0x53, 0x8b, 0x85, 0x44, 0xb7, 0x01, 0x42, 0x6a,
+	0x05, 0xd4, 0x64, 0xb6, 0x35, 0xa1, 0x21, 0x6c, 0x95, 0x9a, 0x75, 0x39, 0xbe, 0x4d, 0xe2, 0x48,
+	0x36, 0x12, 0x47, 0x7a, 0x91, 0x5b, 0x33, 0x19, 0xdd, 0x82, 0x02, 0xf6, 0xec, 0x08, 0x28, 0x9e,
+	0x09, 0xbc, 0x80, 0x3d, 0x9b, 0xc3, 0xfa, 0x50, 0x49, 0x33, 0x37, 0xe9, 0xd4, 0xc7, 0xb5, 0x4c,
+	0x43, 0xd8, 0xaa, 0x34, 0xb7, 0xe4, 0x53, 0x39, 0x94, 0xfb, 0x09, 0xc0, 0x98, 0xfa, 0x58, 0x2f,
+	0x93, 0x59, 0x11, 0xdd, 0x83, 0xbc, 0x6b, 0xed, 0x63, 0x37, 0xac, 0x65, 0x1b, 0x99, 0xad, 0x52,
+	0xf3, 0xd6, 0x12, 0x47, 0xf3, 0xb7, 0x97, 0xbb, 0x1c, 0xa7, 0x7a, 0x34, 0x98, 0xea, 0xb1, 0x13,
+	0xa4, 0x42, 0x2e, 0xa4, 0x16, 0xc5, 0xb5, 0x1c, 0x4f, 0x4b, 0x59, 0xdd, 0xdb, 0x90, 0xc1, 0xf4,
+	0x08, 0x5d, 0xbf, 0x0d, 0xa5, 0x19, 0xef, 0xa8, 0x0a, 0x99, 0x43, 0x3c, 0xe5, 0x04, 0x17, 0x75,
+	0xf6, 0x13, 0xfd, 0x1f, 0x72, 0x8f, 0x2c, 0x77, 0x12, 0x71, 0x57, 0xd4, 0x23, 0x61, 0x47, 0xfc,
+	0x50, 0x90, 0xbe, 0x13, 0x20, 0xc7, 0x7d, 0xa1, 0xcb, 0x70, 0x71, 0x68, 0xb4, 0x0c, 0xd5, 0xdc,
+	0xeb, 0x0d, 0x07, 0x6a, 0x5b, 0xdb, 0xd5, 0xd4, 0x4e, 0xf5, 0x7f, 0xa8, 0x0a, 0x6b, 0x5a, 0x4f,
+	0x33, 0xb4, 0x56, 0x57, 0x7b, 0xa0, 0xf5, 0xee, 0x56, 0x05, 0x54, 0x01, 0x18, 0xe8, 0xfd, 0xb6,
+	0x3a, 0x1c, 0x32, 0x59, 0x64, 0x72, 0xbb, 0xd5, 0x6b, 0xab, 0xdd, 0x2e, 0x93, 0x33, 0x4c, 0xde,
+	0xd5, 0x7a, 0x89, 0x7d, 0x96, 0xc9, 0xc3, 0xbd, 0x36, 0xb3, 0xdf, 0xdd, 0xeb, 0x56, 0x73, 0x08,
+	0x20, 0xbf, 0xdb, 0xd2, 0xba, 0x6a, 0xa7, 0x9a, 0x47, 0x65, 0x28, 0xc6, 0x58, 0xb5, 0x53, 0xbd,
+	0x20, 0xdd, 0x87, 0xc2, 0x20, 0x20, 0xa3, 0x00, 0x87, 0x21, 0xba, 0x0e, 0x95, 0xaf, 0x49, 0x70,
+	0x68, 0x1e, 0x90, 0xb1, 0xef, 0x62, 0x8a, 0x6d, 0x7e, 0xa1, 0x8c, 0x5e, 0x66, 0xda, 0x76, 0xa2,
+	0x4c, 0xcd, 0x70, 0x48, 0x9d, 0xb1, 0xc5, 0xcc, 0xc4, 0x63, 0x33, 0x35, 0x51, 0x4a, 0xbf, 0x88,
+	0x70, 0x59, 0x3d, 0xf2, 0x49, 0x40, 0x55, 0x8f, 0x3a, 0xd4, 0xc1, 0xa1, 0x8e, 0xbf, 0x9a, 0xe0,
+	0x90, 0xa2, 0xab, 0x00, 0x7e, 0x40, 0xbe, 0xc4, 0x07, 0xd4, 0x74, 0xec, 0x98, 0xb4, 0x62, 0xac,
+	0xd1, 0x6c, 0x64, 0xa4, 0x2f, 0x2e, 0xf2, 0x17, 0xff, 0x78, 0xc9, 0x1b, 0x2d, 0x0c, 0xb0, 0xf0,
+	0xe1, 0xbb, 0x50, 0xc6, 0xcc, 0x6c, 0x6a, 0x3e, 0x74, 0x5c, 0x8a, 0x03, 0x5e, 0x97, 0xa5, 0xe6,
+	0x9b, 0xcb, 0x9c, 0x73, 0xfb, 0x5d, 0x6e, 0xae, 0xaf, 0xe1, 0x19, 0x09, 0x6d, 0xc3, 0x45, 0x32,
+	0xa1, 0xfe, 0x84, 0x9a, 0x93, 0xc0, 0x35, 0xfd, 0x00, 0x3f, 0x74, 0x8e, 0x6a, 0x59, 0x7e, 0x93,
+	0xf5, 0xe8, 0x60, 0x2f, 0x70, 0x07, 0x5c, 0x7d, 0x9e, 0x5a, 0x79, 0x26, 0xc2, 0x65, 0x6d, 0xfc,
+	0x0f, 0x73, 0xb8, 0x30, 0xc0, 0x42, 0x0e, 0x5f, 0x81, 0xa2, 0xe3, 0xc5, 0x97, 0xe6, 0xfc, 0x15,
+	0xf5, 0x02, 0x57, 0xec, 0x05, 0xee, 0x8b, 0x04, 0x67, 0xcf, 0x41, 0xf0, 0x79, 0x48, 0xfb, 0x00,
+	0x36, 0x4e, 0x96, 0x45, 0xe8, 0x13, 0x2f, 0xc4, 0x8c, 0xb4, 0xe3, 0x57, 0x4b, 0x48, 0x4b, 0x9f,
+	0x4b, 0xfa, 0x43, 0x3c, 0x89, 0x4c, 0x07, 0x69, 0x0b, 0xf2, 0x07, 0x7c, 0x1c, 0xc4, 0x43, 0xf4,
+	0xc6, 0xca, 0x73, 0x43, 0x8f, 0x81, 0x68, 0x00, 0x17, 0xfd, 0xb8, 0xd3, 0x4c, 0x1c, 0xfb, 0x8f,
+	0x27, 0xeb, 0xe6, 0x12, 0x6f, 0x49, 0x77, 0xea, 0xd5, 0x04, 0x9d, 0x24, 0x87, 0x3e, 0x85, 0x4a,
+	0xea, 0x71, 0x7f, 0x4a, 0x71, 0x18, 0xd7, 0xf4, 0x4a, 0xee, 0xca, 0x09, 0xf4, 0x0e, 0x43, 0xbe,
+	0xdc, 0xd7, 0x5b, 0xdc, 0x1e, 0xb9, 0x85, 0xed, 0x21, 0x3d, 0x17, 0x61, 0x63, 0xbe, 0x04, 0xff,
+	0x63, 0xfd, 0xef, 0xb1, 0x3e, 0xd7, 0x9e, 0xb9, 0xf9, 0xf6, 0x94, 0x34, 0x58, 0x9b, 0x85, 0xb2,
+	0xfe, 0x39, 0x74, 0x3c, 0x3b, 0xac, 0x09, 0x8d, 0x0c, 0xeb, 0x1f, 0x2e, 0xa0, 0x4d, 0x28, 0x7b,
+	0xd6, 0x18, 0x87, 0xbe, 0x75, 0x80, 0x4d, 0xc7, 0x8e, 0xc6, 0x47, 0x51, 0x5f, 0x4b, 0x95, 0x9a,
+	0x1d, 0x4a, 0x9f, 0xc1, 0xfa, 0x5d, 0x4c, 0x35, 0xb6, 0xc0, 0xac, 0x38, 0x8e, 0xae, 0x40, 0x81,
+	0xef, 0x3b, 0xec, 0x30, 0x9a, 0x1b, 0x17, 0xb8, 0xac, 0xd9, 0xd2, 0xb7, 0x02, 0xa0, 0xae, 0x13,
+	0x46, 0xee, 0x56, 0x9e, 0x6f, 0x1b, 0x90, 0x9f, 0x19, 0xe3, 0x45, 0x3d, 0x96, 0x18, 0x05, 0xbe,
+	0x35, 0xc2, 0x66, 0xe8, 0x3c, 0xc6, 0x9c, 0xcc, 0x9c, 0x5e, 0x60, 0x8a, 0xa1, 0xf3, 0x98, 0xb7,
+	0x3f, 0x3f, 0xa4, 0xe4, 0x10, 0x7b, 0x31, 0x41, 0xdc, 0xdc, 0x60, 0x0a, 0x69, 0x0a, 0x97, 0xe6,
+	0x12, 0x89, 0x87, 0xc6, 0x0e, 0x44, 0xb9, 0xe2, 0x88, 0xaa, 0x52, 0xb3, 0xb1, 0x6c, 0x96, 0x72,
+	0x52, 0x12, 0x00, 0x7a, 0x03, 0xd6, 0x3d, 0x7c, 0x44, 0xcd, 0x99, 0xb0, 0xd1, 0xb8, 0x2a, 0x33,
+	0xf5, 0x20, 0x0d, 0xfd, 0xab, 0x00, 0x1b, 0x1c, 0x9a, 0xae, 0x42, 0xff, 0xee, 0x1e, 0x38, 0xfd,
+	0x3d, 0xb7, 0x9f, 0x42, 0x79, 0x6e, 0x9f, 0x43, 0xaf, 0x41, 0xbd, 0x3f, 0x50, 0xf5, 0x96, 0xa1,
+	0xf5, 0x7b, 0xa6, 0xf1, 0xc5, 0xe0, 0xe4, 0xba, 0x73, 0x09, 0xd6, 0xd5, 0xfb, 0x83, 0xbe, 0x6e,
+	0x98, 0x6a, 0xcf, 0xd0, 0x0c, 0x4d, 0x1d, 0x56, 0x05, 0xa6, 0xd4, 0xee, 0xcd, 0x2b, 0x45, 0xb6,
+	0x18, 0xb5, 0x75, 0x95, 0x2d, 0x4c, 0x5a, 0xaf, 0xa3, 0xde, 0xaf, 0x66, 0x98, 0xa6, 0xa3, 0x76,
+	0xd5, 0x54, 0x93, 0x6d, 0xfe, 0x9e, 0x85, 0x4a, 0x27, 0xb9, 0x4b, 0x8b, 0x5d, 0x05, 0x7d, 0x2f,
+	0x40, 0x65, 0x7e, 0xac, 0xa3, 0x77, 0xff, 0xea, 0x4a, 0x51, 0xbf, 0x9a, 0x20, 0x66, 0x76, 0xf4,
+	0xe3, 0xc5, 0x55, 0x7a, 0xeb, 0x9b, 0xdf, 0x9e, 0xff, 0x20, 0x5e, 0x97, 0x1a, 0x6c, 0xb5, 0x8f,
+	0xcb, 0x34, 0x54, 0x9e, 0x1c, 0x97, 0xf0, 0xd3, 0x1d, 0xcc, 0xfd, 0xee, 0x08, 0xdb, 0x3c, 0xa1,
+	0xf9, 0x89, 0xb7, 0x34, 0xa1, 0x85, 0xff, 0xcf, 0x2f, 0x21, 0x21, 0x67, 0x3c, 0x93, 0x50, 0x21,
+	0xe9, 0x68, 0xb4, 0xbd, 0x24, 0x95, 0x13, 0x6d, 0x5f, 0x3f, 0xb3, 0x15, 0xa4, 0xf7, 0x79, 0x1e,
+	0x32, 0x7a, 0xfb, 0xd4, 0x3c, 0x94, 0xb8, 0x59, 0x94, 0x27, 0x49, 0x49, 0x3d, 0x45, 0x3f, 0x0a,
+	0x50, 0x9a, 0xe9, 0x45, 0xf4, 0xce, 0x92, 0x38, 0x2f, 0x0e, 0x8f, 0xba, 0xbc, 0xaa, 0x79, 0xd4,
+	0xe2, 0xd2, 0x0d, 0x9e, 0xe4, 0x26, 0x7a, 0xfd, 0xcc, 0x24, 0xef, 0xfc, 0x24, 0xc0, 0xd5, 0x03,
+	0x32, 0x3e, 0x3d, 0xc0, 0x9d, 0x4b, 0xf3, 0xe5, 0x37, 0x60, 0x1f, 0x4b, 0x03, 0xe1, 0xc1, 0x27,
+	0x31, 0x62, 0x44, 0x5c, 0xcb, 0x1b, 0xc9, 0x24, 0x18, 0x29, 0x23, 0xec, 0xf1, 0x4f, 0xa9, 0xf8,
+	0x7b, 0xd4, 0xf2, 0x9d, 0x70, 0xc1, 0x97, 0xe2, 0x47, 0xfc, 0xc7, 0xcf, 0xe2, 0xb5, 0xbb, 0x91,
+	0x83, 0xb6, 0x4b, 0x26, 0xb6, 0x9c, 0x06, 0x91, 0x79, 0x14, 0xf9, 0xf3, 0x9b, 0xfb, 0x79, 0xee,
+	0xec, 0xbd, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x9b, 0xe0, 0xf0, 0x1a, 0xdf, 0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1139,87 +1239,3 @@ var _DatastoreAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/datastore/admin/v1/datastore_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/datastore/admin/v1/datastore_admin.proto", fileDescriptor_datastore_admin_35408641d3652505)
-}
-
-var fileDescriptor_datastore_admin_35408641d3652505 = []byte{
-	// 1216 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x92, 0xdb, 0xc4,
-	0x13, 0xff, 0x4b, 0xfe, 0x88, 0xdd, 0x5e, 0x7b, 0x9d, 0xc9, 0x3f, 0x5b, 0x8e, 0x21, 0xc4, 0x68,
-	0x2b, 0xb0, 0x59, 0x40, 0x22, 0x86, 0x14, 0x64, 0xa1, 0xa8, 0x72, 0x6c, 0x6d, 0x4a, 0xe0, 0xd8,
-	0x2e, 0x59, 0x4b, 0x85, 0x5c, 0x54, 0xda, 0xd5, 0xc4, 0x25, 0x56, 0xd6, 0x08, 0x69, 0x1c, 0xd6,
-	0x49, 0xe5, 0xc2, 0x85, 0x03, 0x55, 0x5c, 0x38, 0xc0, 0x33, 0x70, 0xcc, 0x1b, 0x70, 0xe3, 0xce,
-	0x99, 0x5b, 0xde, 0x80, 0x17, 0xa0, 0x66, 0xf4, 0xb1, 0xf6, 0xc6, 0xeb, 0x35, 0x6c, 0xa8, 0xe2,
-	0xc0, 0xcd, 0xdd, 0xd3, 0xbf, 0xee, 0x9e, 0xdf, 0x74, 0xb7, 0x5b, 0xa0, 0x8c, 0x08, 0x19, 0xb9,
-	0x58, 0xb1, 0x2d, 0x6a, 0x85, 0x94, 0x04, 0x58, 0xb1, 0xec, 0xb1, 0xe3, 0x29, 0x8f, 0x6e, 0x1e,
-	0xab, 0x4c, 0xae, 0x92, 0xfd, 0x80, 0x50, 0x82, 0xae, 0x44, 0x00, 0x39, 0x3d, 0x95, 0xa3, 0xd3,
-	0x47, 0x37, 0xeb, 0xaf, 0xc6, 0xbe, 0x2c, 0xdf, 0x51, 0x2c, 0xcf, 0x23, 0xd4, 0xa2, 0x0e, 0xf1,
-	0xc2, 0x08, 0x58, 0xbf, 0x7e, 0x7a, 0x24, 0xc7, 0xb3, 0xf1, 0x51, 0x6c, 0xb6, 0x19, 0x9b, 0xb9,
-	0xc4, 0x1b, 0x05, 0x13, 0xcf, 0x73, 0xbc, 0x91, 0x42, 0x7c, 0x1c, 0xcc, 0xf9, 0xba, 0x16, 0x1b,
-	0x71, 0x69, 0x7f, 0xf2, 0x50, 0xa1, 0xce, 0x18, 0x87, 0xd4, 0x1a, 0xfb, 0x91, 0x81, 0xf4, 0x2c,
-	0x0b, 0x95, 0x36, 0x19, 0x8f, 0x89, 0x77, 0x0f, 0x53, 0x8b, 0x85, 0x44, 0xb7, 0x01, 0x42, 0x6a,
-	0x05, 0xd4, 0x64, 0xb6, 0x35, 0xa1, 0x21, 0x6c, 0x95, 0x9a, 0x75, 0x39, 0xbe, 0x4d, 0xe2, 0x48,
-	0x36, 0x12, 0x47, 0x7a, 0x91, 0x5b, 0x33, 0x19, 0xdd, 0x82, 0x02, 0xf6, 0xec, 0x08, 0x28, 0x9e,
-	0x09, 0xbc, 0x80, 0x3d, 0x9b, 0xc3, 0xfa, 0x50, 0x49, 0x33, 0x37, 0xe9, 0xd4, 0xc7, 0xb5, 0x4c,
-	0x43, 0xd8, 0xaa, 0x34, 0xb7, 0xe4, 0x53, 0x39, 0x94, 0xfb, 0x09, 0xc0, 0x98, 0xfa, 0x58, 0x2f,
-	0x93, 0x59, 0x11, 0xdd, 0x83, 0xbc, 0x6b, 0xed, 0x63, 0x37, 0xac, 0x65, 0x1b, 0x99, 0xad, 0x52,
-	0xf3, 0xd6, 0x12, 0x47, 0xf3, 0xb7, 0x97, 0xbb, 0x1c, 0xa7, 0x7a, 0x34, 0x98, 0xea, 0xb1, 0x13,
-	0xa4, 0x42, 0x2e, 0xa4, 0x16, 0xc5, 0xb5, 0x1c, 0x4f, 0x4b, 0x59, 0xdd, 0xdb, 0x90, 0xc1, 0xf4,
-	0x08, 0x5d, 0xbf, 0x0d, 0xa5, 0x19, 0xef, 0xa8, 0x0a, 0x99, 0x43, 0x3c, 0xe5, 0x04, 0x17, 0x75,
-	0xf6, 0x13, 0xfd, 0x1f, 0x72, 0x8f, 0x2c, 0x77, 0x12, 0x71, 0x57, 0xd4, 0x23, 0x61, 0x47, 0xfc,
-	0x50, 0x90, 0xbe, 0x13, 0x20, 0xc7, 0x7d, 0xa1, 0xcb, 0x70, 0x71, 0x68, 0xb4, 0x0c, 0xd5, 0xdc,
-	0xeb, 0x0d, 0x07, 0x6a, 0x5b, 0xdb, 0xd5, 0xd4, 0x4e, 0xf5, 0x7f, 0xa8, 0x0a, 0x6b, 0x5a, 0x4f,
-	0x33, 0xb4, 0x56, 0x57, 0x7b, 0xa0, 0xf5, 0xee, 0x56, 0x05, 0x54, 0x01, 0x18, 0xe8, 0xfd, 0xb6,
-	0x3a, 0x1c, 0x32, 0x59, 0x64, 0x72, 0xbb, 0xd5, 0x6b, 0xab, 0xdd, 0x2e, 0x93, 0x33, 0x4c, 0xde,
-	0xd5, 0x7a, 0x89, 0x7d, 0x96, 0xc9, 0xc3, 0xbd, 0x36, 0xb3, 0xdf, 0xdd, 0xeb, 0x56, 0x73, 0x08,
-	0x20, 0xbf, 0xdb, 0xd2, 0xba, 0x6a, 0xa7, 0x9a, 0x47, 0x65, 0x28, 0xc6, 0x58, 0xb5, 0x53, 0xbd,
-	0x20, 0xdd, 0x87, 0xc2, 0x20, 0x20, 0xa3, 0x00, 0x87, 0x21, 0xba, 0x0e, 0x95, 0xaf, 0x49, 0x70,
-	0x68, 0x1e, 0x90, 0xb1, 0xef, 0x62, 0x8a, 0x6d, 0x7e, 0xa1, 0x8c, 0x5e, 0x66, 0xda, 0x76, 0xa2,
-	0x4c, 0xcd, 0x70, 0x48, 0x9d, 0xb1, 0xc5, 0xcc, 0xc4, 0x63, 0x33, 0x35, 0x51, 0x4a, 0xbf, 0x88,
-	0x70, 0x59, 0x3d, 0xf2, 0x49, 0x40, 0x55, 0x8f, 0x3a, 0xd4, 0xc1, 0xa1, 0x8e, 0xbf, 0x9a, 0xe0,
-	0x90, 0xa2, 0xab, 0x00, 0x7e, 0x40, 0xbe, 0xc4, 0x07, 0xd4, 0x74, 0xec, 0x98, 0xb4, 0x62, 0xac,
-	0xd1, 0x6c, 0x64, 0xa4, 0x2f, 0x2e, 0xf2, 0x17, 0xff, 0x78, 0xc9, 0x1b, 0x2d, 0x0c, 0xb0, 0xf0,
-	0xe1, 0xbb, 0x50, 0xc6, 0xcc, 0x6c, 0x6a, 0x3e, 0x74, 0x5c, 0x8a, 0x03, 0x5e, 0x97, 0xa5, 0xe6,
-	0x9b, 0xcb, 0x9c, 0x73, 0xfb, 0x5d, 0x6e, 0xae, 0xaf, 0xe1, 0x19, 0x09, 0x6d, 0xc3, 0x45, 0x32,
-	0xa1, 0xfe, 0x84, 0x9a, 0x93, 0xc0, 0x35, 0xfd, 0x00, 0x3f, 0x74, 0x8e, 0x6a, 0x59, 0x7e, 0x93,
-	0xf5, 0xe8, 0x60, 0x2f, 0x70, 0x07, 0x5c, 0x7d, 0x9e, 0x5a, 0x79, 0x26, 0xc2, 0x65, 0x6d, 0xfc,
-	0x0f, 0x73, 0xb8, 0x30, 0xc0, 0x42, 0x0e, 0x5f, 0x81, 0xa2, 0xe3, 0xc5, 0x97, 0xe6, 0xfc, 0x15,
-	0xf5, 0x02, 0x57, 0xec, 0x05, 0xee, 0x8b, 0x04, 0x67, 0xcf, 0x41, 0xf0, 0x79, 0x48, 0xfb, 0x00,
-	0x36, 0x4e, 0x96, 0x45, 0xe8, 0x13, 0x2f, 0xc4, 0x8c, 0xb4, 0xe3, 0x57, 0x4b, 0x48, 0x4b, 0x9f,
-	0x4b, 0xfa, 0x43, 0x3c, 0x89, 0x4c, 0x07, 0x69, 0x0b, 0xf2, 0x07, 0x7c, 0x1c, 0xc4, 0x43, 0xf4,
-	0xc6, 0xca, 0x73, 0x43, 0x8f, 0x81, 0x68, 0x00, 0x17, 0xfd, 0xb8, 0xd3, 0x4c, 0x1c, 0xfb, 0x8f,
-	0x27, 0xeb, 0xe6, 0x12, 0x6f, 0x49, 0x77, 0xea, 0xd5, 0x04, 0x9d, 0x24, 0x87, 0x3e, 0x85, 0x4a,
-	0xea, 0x71, 0x7f, 0x4a, 0x71, 0x18, 0xd7, 0xf4, 0x4a, 0xee, 0xca, 0x09, 0xf4, 0x0e, 0x43, 0xbe,
-	0xdc, 0xd7, 0x5b, 0xdc, 0x1e, 0xb9, 0x85, 0xed, 0x21, 0x3d, 0x17, 0x61, 0x63, 0xbe, 0x04, 0xff,
-	0x63, 0xfd, 0xef, 0xb1, 0x3e, 0xd7, 0x9e, 0xb9, 0xf9, 0xf6, 0x94, 0x34, 0x58, 0x9b, 0x85, 0xb2,
-	0xfe, 0x39, 0x74, 0x3c, 0x3b, 0xac, 0x09, 0x8d, 0x0c, 0xeb, 0x1f, 0x2e, 0xa0, 0x4d, 0x28, 0x7b,
-	0xd6, 0x18, 0x87, 0xbe, 0x75, 0x80, 0x4d, 0xc7, 0x8e, 0xc6, 0x47, 0x51, 0x5f, 0x4b, 0x95, 0x9a,
-	0x1d, 0x4a, 0x9f, 0xc1, 0xfa, 0x5d, 0x4c, 0x35, 0xb6, 0xc0, 0xac, 0x38, 0x8e, 0xae, 0x40, 0x81,
-	0xef, 0x3b, 0xec, 0x30, 0x9a, 0x1b, 0x17, 0xb8, 0xac, 0xd9, 0xd2, 0xb7, 0x02, 0xa0, 0xae, 0x13,
-	0x46, 0xee, 0x56, 0x9e, 0x6f, 0x1b, 0x90, 0x9f, 0x19, 0xe3, 0x45, 0x3d, 0x96, 0x18, 0x05, 0xbe,
-	0x35, 0xc2, 0x66, 0xe8, 0x3c, 0xc6, 0x9c, 0xcc, 0x9c, 0x5e, 0x60, 0x8a, 0xa1, 0xf3, 0x98, 0xb7,
-	0x3f, 0x3f, 0xa4, 0xe4, 0x10, 0x7b, 0x31, 0x41, 0xdc, 0xdc, 0x60, 0x0a, 0x69, 0x0a, 0x97, 0xe6,
-	0x12, 0x89, 0x87, 0xc6, 0x0e, 0x44, 0xb9, 0xe2, 0x88, 0xaa, 0x52, 0xb3, 0xb1, 0x6c, 0x96, 0x72,
-	0x52, 0x12, 0x00, 0x7a, 0x03, 0xd6, 0x3d, 0x7c, 0x44, 0xcd, 0x99, 0xb0, 0xd1, 0xb8, 0x2a, 0x33,
-	0xf5, 0x20, 0x0d, 0xfd, 0xab, 0x00, 0x1b, 0x1c, 0x9a, 0xae, 0x42, 0xff, 0xee, 0x1e, 0x38, 0xfd,
-	0x3d, 0xb7, 0x9f, 0x42, 0x79, 0x6e, 0x9f, 0x43, 0xaf, 0x41, 0xbd, 0x3f, 0x50, 0xf5, 0x96, 0xa1,
-	0xf5, 0x7b, 0xa6, 0xf1, 0xc5, 0xe0, 0xe4, 0xba, 0x73, 0x09, 0xd6, 0xd5, 0xfb, 0x83, 0xbe, 0x6e,
-	0x98, 0x6a, 0xcf, 0xd0, 0x0c, 0x4d, 0x1d, 0x56, 0x05, 0xa6, 0xd4, 0xee, 0xcd, 0x2b, 0x45, 0xb6,
-	0x18, 0xb5, 0x75, 0x95, 0x2d, 0x4c, 0x5a, 0xaf, 0xa3, 0xde, 0xaf, 0x66, 0x98, 0xa6, 0xa3, 0x76,
-	0xd5, 0x54, 0x93, 0x6d, 0xfe, 0x9e, 0x85, 0x4a, 0x27, 0xb9, 0x4b, 0x8b, 0x5d, 0x05, 0x7d, 0x2f,
-	0x40, 0x65, 0x7e, 0xac, 0xa3, 0x77, 0xff, 0xea, 0x4a, 0x51, 0xbf, 0x9a, 0x20, 0x66, 0x76, 0xf4,
-	0xe3, 0xc5, 0x55, 0x7a, 0xeb, 0x9b, 0xdf, 0x9e, 0xff, 0x20, 0x5e, 0x97, 0x1a, 0x6c, 0xb5, 0x8f,
-	0xcb, 0x34, 0x54, 0x9e, 0x1c, 0x97, 0xf0, 0xd3, 0x1d, 0xcc, 0xfd, 0xee, 0x08, 0xdb, 0x3c, 0xa1,
-	0xf9, 0x89, 0xb7, 0x34, 0xa1, 0x85, 0xff, 0xcf, 0x2f, 0x21, 0x21, 0x67, 0x3c, 0x93, 0x50, 0x21,
-	0xe9, 0x68, 0xb4, 0xbd, 0x24, 0x95, 0x13, 0x6d, 0x5f, 0x3f, 0xb3, 0x15, 0xa4, 0xf7, 0x79, 0x1e,
-	0x32, 0x7a, 0xfb, 0xd4, 0x3c, 0x94, 0xb8, 0x59, 0x94, 0x27, 0x49, 0x49, 0x3d, 0x45, 0x3f, 0x0a,
-	0x50, 0x9a, 0xe9, 0x45, 0xf4, 0xce, 0x92, 0x38, 0x2f, 0x0e, 0x8f, 0xba, 0xbc, 0xaa, 0x79, 0xd4,
-	0xe2, 0xd2, 0x0d, 0x9e, 0xe4, 0x26, 0x7a, 0xfd, 0xcc, 0x24, 0xef, 0xfc, 0x24, 0xc0, 0xd5, 0x03,
-	0x32, 0x3e, 0x3d, 0xc0, 0x9d, 0x4b, 0xf3, 0xe5, 0x37, 0x60, 0x1f, 0x4b, 0x03, 0xe1, 0xc1, 0x27,
-	0x31, 0x62, 0x44, 0x5c, 0xcb, 0x1b, 0xc9, 0x24, 0x18, 0x29, 0x23, 0xec, 0xf1, 0x4f, 0xa9, 0xf8,
-	0x7b, 0xd4, 0xf2, 0x9d, 0x70, 0xc1, 0x97, 0xe2, 0x47, 0xfc, 0xc7, 0xcf, 0xe2, 0xb5, 0xbb, 0x91,
-	0x83, 0xb6, 0x4b, 0x26, 0xb6, 0x9c, 0x06, 0x91, 0x79, 0x14, 0xf9, 0xf3, 0x9b, 0xfb, 0x79, 0xee,
-	0xec, 0xbd, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x9b, 0xe0, 0xf0, 0x1a, 0xdf, 0x0e, 0x00, 0x00,
-}
diff --git a/googleapis/datastore/admin/v1/index.pb.go b/googleapis/datastore/admin/v1/index.pb.go
index 25cbfa2b48..fe283e35f4 100644
--- a/googleapis/datastore/admin/v1/index.pb.go
+++ b/googleapis/datastore/admin/v1/index.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/admin/v1/index.proto
 
-package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // For an ordered index, specifies whether each of the entity's ancestors
 // will be included.
@@ -37,6 +40,7 @@ var Index_AncestorMode_name = map[int32]string{
 	1: "NONE",
 	2: "ALL_ANCESTORS",
 }
+
 var Index_AncestorMode_value = map[string]int32{
 	"ANCESTOR_MODE_UNSPECIFIED": 0,
 	"NONE":                      1,
@@ -46,8 +50,9 @@ var Index_AncestorMode_value = map[string]int32{
 func (x Index_AncestorMode) String() string {
 	return proto.EnumName(Index_AncestorMode_name, int32(x))
 }
+
 func (Index_AncestorMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_06304ce39414dba4, []int{0, 0}
+	return fileDescriptor_809cc5775e1cdeb3, []int{0, 0}
 }
 
 // The direction determines how a property is indexed.
@@ -69,6 +74,7 @@ var Index_Direction_name = map[int32]string{
 	1: "ASCENDING",
 	2: "DESCENDING",
 }
+
 var Index_Direction_value = map[string]int32{
 	"DIRECTION_UNSPECIFIED": 0,
 	"ASCENDING":             1,
@@ -78,8 +84,9 @@ var Index_Direction_value = map[string]int32{
 func (x Index_Direction) String() string {
 	return proto.EnumName(Index_Direction_name, int32(x))
 }
+
 func (Index_Direction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_06304ce39414dba4, []int{0, 1}
+	return fileDescriptor_809cc5775e1cdeb3, []int{0, 1}
 }
 
 // The possible set of states of an index.
@@ -118,6 +125,7 @@ var Index_State_name = map[int32]string{
 	3: "DELETING",
 	4: "ERROR",
 }
+
 var Index_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          1,
@@ -129,8 +137,9 @@ var Index_State_value = map[string]int32{
 func (x Index_State) String() string {
 	return proto.EnumName(Index_State_name, int32(x))
 }
+
 func (Index_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_06304ce39414dba4, []int{0, 2}
+	return fileDescriptor_809cc5775e1cdeb3, []int{0, 2}
 }
 
 // A minimal index definition.
@@ -163,16 +172,17 @@ func (m *Index) Reset()         { *m = Index{} }
 func (m *Index) String() string { return proto.CompactTextString(m) }
 func (*Index) ProtoMessage()    {}
 func (*Index) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_06304ce39414dba4, []int{0}
+	return fileDescriptor_809cc5775e1cdeb3, []int{0}
 }
+
 func (m *Index) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Index.Unmarshal(m, b)
 }
 func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Index.Marshal(b, m, deterministic)
 }
-func (dst *Index) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Index.Merge(dst, src)
+func (m *Index) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index.Merge(m, src)
 }
 func (m *Index) XXX_Size() int {
 	return xxx_messageInfo_Index.Size(m)
@@ -242,16 +252,17 @@ func (m *Index_IndexedProperty) Reset()         { *m = Index_IndexedProperty{} }
 func (m *Index_IndexedProperty) String() string { return proto.CompactTextString(m) }
 func (*Index_IndexedProperty) ProtoMessage()    {}
 func (*Index_IndexedProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_06304ce39414dba4, []int{0, 0}
+	return fileDescriptor_809cc5775e1cdeb3, []int{0, 0}
 }
+
 func (m *Index_IndexedProperty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Index_IndexedProperty.Unmarshal(m, b)
 }
 func (m *Index_IndexedProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Index_IndexedProperty.Marshal(b, m, deterministic)
 }
-func (dst *Index_IndexedProperty) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Index_IndexedProperty.Merge(dst, src)
+func (m *Index_IndexedProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index_IndexedProperty.Merge(m, src)
 }
 func (m *Index_IndexedProperty) XXX_Size() int {
 	return xxx_messageInfo_Index_IndexedProperty.Size(m)
@@ -277,18 +288,18 @@ func (m *Index_IndexedProperty) GetDirection() Index_Direction {
 }
 
 func init() {
-	proto.RegisterType((*Index)(nil), "google.datastore.admin.v1.Index")
-	proto.RegisterType((*Index_IndexedProperty)(nil), "google.datastore.admin.v1.Index.IndexedProperty")
 	proto.RegisterEnum("google.datastore.admin.v1.Index_AncestorMode", Index_AncestorMode_name, Index_AncestorMode_value)
 	proto.RegisterEnum("google.datastore.admin.v1.Index_Direction", Index_Direction_name, Index_Direction_value)
 	proto.RegisterEnum("google.datastore.admin.v1.Index_State", Index_State_name, Index_State_value)
+	proto.RegisterType((*Index)(nil), "google.datastore.admin.v1.Index")
+	proto.RegisterType((*Index_IndexedProperty)(nil), "google.datastore.admin.v1.Index.IndexedProperty")
 }
 
 func init() {
-	proto.RegisterFile("google/datastore/admin/v1/index.proto", fileDescriptor_index_06304ce39414dba4)
+	proto.RegisterFile("google/datastore/admin/v1/index.proto", fileDescriptor_809cc5775e1cdeb3)
 }
 
-var fileDescriptor_index_06304ce39414dba4 = []byte{
+var fileDescriptor_809cc5775e1cdeb3 = []byte{
 	// 492 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x6f, 0x6b, 0xd3, 0x4e,
 	0x1c, 0xff, 0xa5, 0x6d, 0xb6, 0xe6, 0xfb, 0xdb, 0x66, 0x76, 0x30, 0x48, 0x87, 0xc5, 0x52, 0x50,
diff --git a/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go b/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
index 850de01e7a..a76b2b3d0c 100644
--- a/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
+++ b/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/admin/v1beta1/datastore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Operation types.
 type OperationType int32
@@ -43,6 +43,7 @@ var OperationType_name = map[int32]string{
 	1: "EXPORT_ENTITIES",
 	2: "IMPORT_ENTITIES",
 }
+
 var OperationType_value = map[string]int32{
 	"OPERATION_TYPE_UNSPECIFIED": 0,
 	"EXPORT_ENTITIES":            1,
@@ -52,8 +53,9 @@ var OperationType_value = map[string]int32{
 func (x OperationType) String() string {
 	return proto.EnumName(OperationType_name, int32(x))
 }
+
 func (OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{0}
+	return fileDescriptor_b63216f38706ce20, []int{0}
 }
 
 // The various possible states for an ongoing Operation.
@@ -90,6 +92,7 @@ var CommonMetadata_State_name = map[int32]string{
 	6: "FAILED",
 	7: "CANCELLED",
 }
+
 var CommonMetadata_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"INITIALIZING":      1,
@@ -104,8 +107,9 @@ var CommonMetadata_State_value = map[string]int32{
 func (x CommonMetadata_State) String() string {
 	return proto.EnumName(CommonMetadata_State_name, int32(x))
 }
+
 func (CommonMetadata_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{0, 0}
+	return fileDescriptor_b63216f38706ce20, []int{0, 0}
 }
 
 // Metadata common to all Datastore Admin operations.
@@ -131,16 +135,17 @@ func (m *CommonMetadata) Reset()         { *m = CommonMetadata{} }
 func (m *CommonMetadata) String() string { return proto.CompactTextString(m) }
 func (*CommonMetadata) ProtoMessage()    {}
 func (*CommonMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{0}
+	return fileDescriptor_b63216f38706ce20, []int{0}
 }
+
 func (m *CommonMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommonMetadata.Unmarshal(m, b)
 }
 func (m *CommonMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommonMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CommonMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommonMetadata.Merge(dst, src)
+func (m *CommonMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommonMetadata.Merge(m, src)
 }
 func (m *CommonMetadata) XXX_Size() int {
 	return xxx_messageInfo_CommonMetadata.Size(m)
@@ -203,16 +208,17 @@ func (m *Progress) Reset()         { *m = Progress{} }
 func (m *Progress) String() string { return proto.CompactTextString(m) }
 func (*Progress) ProtoMessage()    {}
 func (*Progress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{1}
+	return fileDescriptor_b63216f38706ce20, []int{1}
 }
+
 func (m *Progress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Progress.Unmarshal(m, b)
 }
 func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
 }
-func (dst *Progress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Progress.Merge(dst, src)
+func (m *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(m, src)
 }
 func (m *Progress) XXX_Size() int {
 	return xxx_messageInfo_Progress.Size(m)
@@ -274,16 +280,17 @@ func (m *ExportEntitiesRequest) Reset()         { *m = ExportEntitiesRequest{} }
 func (m *ExportEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportEntitiesRequest) ProtoMessage()    {}
 func (*ExportEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{2}
+	return fileDescriptor_b63216f38706ce20, []int{2}
 }
+
 func (m *ExportEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEntitiesRequest.Unmarshal(m, b)
 }
 func (m *ExportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEntitiesRequest.Merge(dst, src)
+func (m *ExportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesRequest.Merge(m, src)
 }
 func (m *ExportEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportEntitiesRequest.Size(m)
@@ -357,16 +364,17 @@ func (m *ImportEntitiesRequest) Reset()         { *m = ImportEntitiesRequest{} }
 func (m *ImportEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportEntitiesRequest) ProtoMessage()    {}
 func (*ImportEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{3}
+	return fileDescriptor_b63216f38706ce20, []int{3}
 }
+
 func (m *ImportEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportEntitiesRequest.Unmarshal(m, b)
 }
 func (m *ImportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportEntitiesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportEntitiesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportEntitiesRequest.Merge(dst, src)
+func (m *ImportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesRequest.Merge(m, src)
 }
 func (m *ImportEntitiesRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportEntitiesRequest.Size(m)
@@ -422,16 +430,17 @@ func (m *ExportEntitiesResponse) Reset()         { *m = ExportEntitiesResponse{}
 func (m *ExportEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportEntitiesResponse) ProtoMessage()    {}
 func (*ExportEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{4}
+	return fileDescriptor_b63216f38706ce20, []int{4}
 }
+
 func (m *ExportEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEntitiesResponse.Unmarshal(m, b)
 }
 func (m *ExportEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEntitiesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportEntitiesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEntitiesResponse.Merge(dst, src)
+func (m *ExportEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesResponse.Merge(m, src)
 }
 func (m *ExportEntitiesResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportEntitiesResponse.Size(m)
@@ -474,16 +483,17 @@ func (m *ExportEntitiesMetadata) Reset()         { *m = ExportEntitiesMetadata{}
 func (m *ExportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportEntitiesMetadata) ProtoMessage()    {}
 func (*ExportEntitiesMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{5}
+	return fileDescriptor_b63216f38706ce20, []int{5}
 }
+
 func (m *ExportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportEntitiesMetadata.Unmarshal(m, b)
 }
 func (m *ExportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportEntitiesMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportEntitiesMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportEntitiesMetadata.Merge(dst, src)
+func (m *ExportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesMetadata.Merge(m, src)
 }
 func (m *ExportEntitiesMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportEntitiesMetadata.Size(m)
@@ -553,16 +563,17 @@ func (m *ImportEntitiesMetadata) Reset()         { *m = ImportEntitiesMetadata{}
 func (m *ImportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImportEntitiesMetadata) ProtoMessage()    {}
 func (*ImportEntitiesMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{6}
+	return fileDescriptor_b63216f38706ce20, []int{6}
 }
+
 func (m *ImportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportEntitiesMetadata.Unmarshal(m, b)
 }
 func (m *ImportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportEntitiesMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImportEntitiesMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportEntitiesMetadata.Merge(dst, src)
+func (m *ImportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesMetadata.Merge(m, src)
 }
 func (m *ImportEntitiesMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImportEntitiesMetadata.Size(m)
@@ -647,16 +658,17 @@ func (m *EntityFilter) Reset()         { *m = EntityFilter{} }
 func (m *EntityFilter) String() string { return proto.CompactTextString(m) }
 func (*EntityFilter) ProtoMessage()    {}
 func (*EntityFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_admin_f5b05ee5645ebe6f, []int{7}
+	return fileDescriptor_b63216f38706ce20, []int{7}
 }
+
 func (m *EntityFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityFilter.Unmarshal(m, b)
 }
 func (m *EntityFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityFilter.Marshal(b, m, deterministic)
 }
-func (dst *EntityFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityFilter.Merge(dst, src)
+func (m *EntityFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityFilter.Merge(m, src)
 }
 func (m *EntityFilter) XXX_Size() int {
 	return xxx_messageInfo_EntityFilter.Size(m)
@@ -682,6 +694,8 @@ func (m *EntityFilter) GetNamespaceIds() []string {
 }
 
 func init() {
+	proto.RegisterEnum("google.datastore.admin.v1beta1.OperationType", OperationType_name, OperationType_value)
+	proto.RegisterEnum("google.datastore.admin.v1beta1.CommonMetadata_State", CommonMetadata_State_name, CommonMetadata_State_value)
 	proto.RegisterType((*CommonMetadata)(nil), "google.datastore.admin.v1beta1.CommonMetadata")
 	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1beta1.CommonMetadata.LabelsEntry")
 	proto.RegisterType((*Progress)(nil), "google.datastore.admin.v1beta1.Progress")
@@ -693,8 +707,77 @@ func init() {
 	proto.RegisterType((*ExportEntitiesMetadata)(nil), "google.datastore.admin.v1beta1.ExportEntitiesMetadata")
 	proto.RegisterType((*ImportEntitiesMetadata)(nil), "google.datastore.admin.v1beta1.ImportEntitiesMetadata")
 	proto.RegisterType((*EntityFilter)(nil), "google.datastore.admin.v1beta1.EntityFilter")
-	proto.RegisterEnum("google.datastore.admin.v1beta1.OperationType", OperationType_name, OperationType_value)
-	proto.RegisterEnum("google.datastore.admin.v1beta1.CommonMetadata_State", CommonMetadata_State_name, CommonMetadata_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/datastore/admin/v1beta1/datastore_admin.proto", fileDescriptor_b63216f38706ce20)
+}
+
+var fileDescriptor_b63216f38706ce20 = []byte{
+	// 996 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x41, 0x8f, 0xdb, 0x44,
+	0x14, 0xc6, 0xce, 0x26, 0x6d, 0xde, 0x6e, 0xd2, 0xec, 0x94, 0xad, 0xa2, 0x40, 0xcb, 0xca, 0xa5,
+	0xd2, 0x6a, 0x05, 0x0e, 0x1b, 0x5a, 0x41, 0x97, 0x53, 0x36, 0xeb, 0x54, 0x46, 0x69, 0x12, 0x1c,
+	0x07, 0x75, 0x7b, 0xb1, 0x9c, 0x78, 0x36, 0x32, 0x6b, 0x7b, 0x8c, 0x3d, 0x29, 0x8d, 0x10, 0x17,
+	0x2e, 0x1c, 0x38, 0x72, 0xe1, 0x1f, 0x20, 0xf1, 0x1b, 0xb8, 0x70, 0xe1, 0xc2, 0x91, 0xbf, 0xc0,
+	0x8f, 0xe0, 0x88, 0x66, 0x3c, 0x76, 0xe2, 0x25, 0x10, 0xca, 0x16, 0x4e, 0xdc, 0xfc, 0xde, 0xbc,
+	0xef, 0x9b, 0x37, 0xdf, 0x9b, 0xf7, 0x3c, 0x70, 0x7f, 0x46, 0xc8, 0xcc, 0xc3, 0x4d, 0xc7, 0xa6,
+	0x76, 0x4c, 0x49, 0x84, 0x9b, 0xb6, 0xe3, 0xbb, 0x41, 0xf3, 0xd9, 0xd1, 0x04, 0x53, 0xfb, 0x68,
+	0xe9, 0xb7, 0xb8, 0x5f, 0x0d, 0x23, 0x42, 0x09, 0xba, 0x93, 0xa0, 0xd4, 0x6c, 0x55, 0x4d, 0x56,
+	0x05, 0xaa, 0xf1, 0xba, 0x60, 0xb5, 0x43, 0xb7, 0x69, 0x07, 0x01, 0xa1, 0x36, 0x75, 0x49, 0x10,
+	0x27, 0xe8, 0xc6, 0x5d, 0xb1, 0xea, 0x91, 0x60, 0x16, 0xcd, 0x83, 0xc0, 0x0d, 0x66, 0x4d, 0x12,
+	0xe2, 0x28, 0x17, 0xf4, 0x86, 0x08, 0xe2, 0xd6, 0x64, 0x7e, 0xde, 0xa4, 0xae, 0x8f, 0x63, 0x6a,
+	0xfb, 0x61, 0x12, 0xa0, 0xfc, 0xb8, 0x05, 0xd5, 0x0e, 0xf1, 0x7d, 0x12, 0x3c, 0xc6, 0xd4, 0x66,
+	0x99, 0xa0, 0x87, 0x00, 0x31, 0xb5, 0x23, 0x6a, 0xb1, 0xd8, 0xba, 0xb4, 0x2f, 0x1d, 0x6c, 0xb7,
+	0x1a, 0xaa, 0xc8, 0x35, 0x25, 0x52, 0xcd, 0x94, 0xc8, 0x28, 0xf3, 0x68, 0x66, 0xa3, 0x07, 0x70,
+	0x1d, 0x07, 0x4e, 0x02, 0x94, 0x37, 0x02, 0xaf, 0xe1, 0xc0, 0xe1, 0x30, 0x13, 0xaa, 0x59, 0xe6,
+	0x16, 0x5d, 0x84, 0xb8, 0x5e, 0xd8, 0x97, 0x0e, 0xaa, 0xad, 0xb7, 0xd5, 0xbf, 0x56, 0x48, 0x1d,
+	0xa4, 0x28, 0x73, 0x11, 0x62, 0xa3, 0x42, 0x56, 0x4d, 0x64, 0x40, 0xc9, 0xb3, 0x27, 0xd8, 0x8b,
+	0xeb, 0x5b, 0xfb, 0x85, 0x83, 0xed, 0xd6, 0xf1, 0x26, 0xb6, 0xbc, 0x0e, 0x6a, 0x8f, 0x83, 0xb5,
+	0x80, 0x46, 0x0b, 0x43, 0x30, 0xa1, 0x0f, 0xa1, 0x18, 0x53, 0x9b, 0xe2, 0x7a, 0x91, 0x27, 0x78,
+	0xff, 0x05, 0x29, 0x47, 0x0c, 0x6b, 0x24, 0x14, 0x8d, 0x87, 0xb0, 0xbd, 0xb2, 0x05, 0xaa, 0x41,
+	0xe1, 0x02, 0x2f, 0xb8, 0xde, 0x65, 0x83, 0x7d, 0xa2, 0x57, 0xa1, 0xf8, 0xcc, 0xf6, 0xe6, 0x89,
+	0x94, 0x65, 0x23, 0x31, 0x8e, 0xe5, 0xf7, 0x25, 0xe5, 0x6b, 0x09, 0x8a, 0x9c, 0x0b, 0xed, 0xc1,
+	0xee, 0xc8, 0x6c, 0x9b, 0x9a, 0x35, 0xee, 0x8f, 0x86, 0x5a, 0x47, 0xef, 0xea, 0xda, 0x69, 0xed,
+	0x15, 0x54, 0x83, 0x1d, 0xbd, 0xaf, 0x9b, 0x7a, 0xbb, 0xa7, 0x3f, 0xd5, 0xfb, 0x8f, 0x6a, 0x12,
+	0xaa, 0x02, 0x0c, 0x8d, 0x41, 0x47, 0x1b, 0x8d, 0x98, 0x2d, 0x33, 0xbb, 0xd3, 0xee, 0x77, 0xb4,
+	0x5e, 0x8f, 0xd9, 0x05, 0x66, 0x77, 0xf5, 0x7e, 0x1a, 0xbf, 0xc5, 0xec, 0xd1, 0xb8, 0xc3, 0xe2,
+	0xbb, 0xe3, 0x5e, 0xad, 0x88, 0x00, 0x4a, 0xdd, 0xb6, 0xde, 0xd3, 0x4e, 0x6b, 0x25, 0x54, 0x81,
+	0xb2, 0xc0, 0x6a, 0xa7, 0xb5, 0x6b, 0xca, 0x13, 0xb8, 0x3e, 0x8c, 0xc8, 0x2c, 0xc2, 0x71, 0x8c,
+	0xee, 0x41, 0xf5, 0x33, 0x12, 0x5d, 0x58, 0x53, 0xe2, 0x87, 0x1e, 0xa6, 0xd8, 0xe1, 0x07, 0x2a,
+	0x18, 0x15, 0xe6, 0xed, 0xa4, 0xce, 0x2c, 0x0c, 0xc7, 0xd4, 0xf5, 0x6d, 0x16, 0x26, 0x2f, 0xc3,
+	0xb4, 0xd4, 0xa9, 0xfc, 0x2c, 0xc3, 0x9e, 0xf6, 0x3c, 0x24, 0x11, 0xd5, 0x02, 0xea, 0x52, 0x17,
+	0xc7, 0x06, 0xfe, 0x74, 0x8e, 0x63, 0x8a, 0x6e, 0x03, 0x84, 0x11, 0xf9, 0x04, 0x4f, 0xa9, 0xe5,
+	0x3a, 0x42, 0xb4, 0xb2, 0xf0, 0xe8, 0x0e, 0x3a, 0xcb, 0x6a, 0x2f, 0xf3, 0xda, 0xb7, 0x37, 0x15,
+	0x6a, 0xed, 0x2e, 0x6b, 0xaf, 0xc0, 0x47, 0x50, 0xc1, 0x2c, 0x6c, 0x61, 0x9d, 0xbb, 0x1e, 0xc5,
+	0x11, 0xbf, 0xab, 0xdb, 0xad, 0xb7, 0x36, 0xee, 0xc0, 0x41, 0x5d, 0x8e, 0x31, 0x76, 0xf0, 0x8a,
+	0x85, 0x0e, 0x61, 0x97, 0xcc, 0x69, 0x38, 0xa7, 0xd6, 0x3c, 0xf2, 0xac, 0x30, 0xc2, 0xe7, 0xee,
+	0xf3, 0xfa, 0x16, 0x3f, 0xd3, 0x8d, 0x64, 0x61, 0x1c, 0x79, 0x43, 0xee, 0xbe, 0xca, 0xad, 0xf9,
+	0x41, 0x86, 0x3d, 0xdd, 0xff, 0x2f, 0xd4, 0x5c, 0xbb, 0xcb, 0x5a, 0x35, 0x5f, 0x83, 0xb2, 0x1b,
+	0x88, 0x93, 0x73, 0x25, 0xcb, 0xc6, 0x75, 0xee, 0x18, 0x47, 0xde, 0x1f, 0xa5, 0xde, 0xba, 0xaa,
+	0xd4, 0x57, 0x91, 0xef, 0x3d, 0xb8, 0x75, 0xf9, 0x96, 0xc4, 0x21, 0x09, 0x62, 0xcc, 0xe4, 0x5b,
+	0xd6, 0x2f, 0x95, 0x2f, 0x2b, 0x9c, 0xf2, 0x55, 0xe1, 0x32, 0x32, 0x9b, 0xb5, 0x5d, 0x28, 0x4d,
+	0xf9, 0x88, 0x10, 0x73, 0x56, 0x7d, 0xb1, 0x81, 0x62, 0x08, 0x34, 0x1a, 0xc3, 0x6e, 0x28, 0x5a,
+	0xd0, 0xc2, 0x62, 0x13, 0x31, 0x81, 0x0f, 0x36, 0x51, 0xa6, 0xbd, 0x6b, 0xd4, 0x52, 0x8a, 0x34,
+	0x4d, 0x34, 0x80, 0x6a, 0x46, 0x3b, 0x59, 0x50, 0x1c, 0x8b, 0xcb, 0xfe, 0xf7, 0x39, 0x2b, 0x29,
+	0xfe, 0x84, 0xc1, 0xff, 0x85, 0x8a, 0xae, 0x6f, 0x9e, 0xe2, 0xda, 0xe6, 0x51, 0x7e, 0x93, 0xe1,
+	0x56, 0xfe, 0x6e, 0xfe, 0x5f, 0x89, 0x97, 0x57, 0x89, 0x5c, 0x2f, 0x17, 0xf3, 0xbd, 0xac, 0xe8,
+	0xb0, 0xb3, 0x0a, 0x65, 0x7d, 0x76, 0xe1, 0x06, 0x4e, 0x5c, 0x97, 0xf6, 0x0b, 0xac, 0xcf, 0xb8,
+	0x81, 0xee, 0x42, 0x25, 0xb0, 0x7d, 0x1c, 0x87, 0xf6, 0x14, 0x5b, 0xae, 0x93, 0x0c, 0x9c, 0xb2,
+	0xb1, 0x93, 0x39, 0x75, 0x27, 0x3e, 0x3c, 0x83, 0x4a, 0xee, 0xc7, 0x8f, 0xee, 0x40, 0x63, 0x30,
+	0xd4, 0x8c, 0xb6, 0xa9, 0x0f, 0xfa, 0x96, 0x79, 0x36, 0xbc, 0xfc, 0x37, 0xbc, 0x09, 0x37, 0xb4,
+	0x27, 0xc3, 0x81, 0x61, 0x5a, 0x5a, 0xdf, 0xd4, 0x4d, 0x5d, 0x1b, 0xd5, 0x24, 0xe6, 0xd4, 0x1f,
+	0xe7, 0x9d, 0x72, 0xeb, 0x27, 0x19, 0xaa, 0xa7, 0xe9, 0xc9, 0xdb, 0xec, 0xe0, 0xe8, 0x5b, 0x09,
+	0xaa, 0xf9, 0xee, 0x45, 0x0f, 0xfe, 0xd1, 0xdf, 0xa4, 0x71, 0x3b, 0x85, 0xad, 0x3c, 0xd9, 0x96,
+	0x4f, 0x18, 0xe5, 0x9d, 0x2f, 0x7f, 0xf9, 0xf5, 0x1b, 0xf9, 0x50, 0xb9, 0x97, 0x3d, 0x1b, 0xc5,
+	0x04, 0x8e, 0x9b, 0x9f, 0x2f, 0xa7, 0xf3, 0x17, 0xc7, 0x98, 0x93, 0x1f, 0x4b, 0x87, 0x3c, 0xb5,
+	0xfc, 0x75, 0xde, 0x9c, 0xda, 0xda, 0xd1, 0xfc, 0xb2, 0x52, 0x73, 0x7d, 0x91, 0xda, 0xc9, 0x77,
+	0x12, 0x28, 0x53, 0xe2, 0x6f, 0xc8, 0xe6, 0xe4, 0x66, 0x5e, 0xec, 0x21, 0x7b, 0x24, 0x0e, 0xa5,
+	0xa7, 0x1d, 0x01, 0x9b, 0x11, 0xcf, 0x0e, 0x66, 0x2a, 0x89, 0x66, 0xcd, 0x19, 0x0e, 0xf8, 0x13,
+	0xb2, 0x99, 0x2c, 0xd9, 0xa1, 0x1b, 0xff, 0xd9, 0x73, 0xfb, 0x03, 0x6e, 0x7d, 0x2f, 0xbf, 0xf9,
+	0x28, 0x61, 0xe9, 0x78, 0x64, 0xee, 0xa8, 0xd9, 0x4e, 0x2a, 0xdf, 0x4a, 0xfd, 0xf8, 0xe8, 0x84,
+	0x05, 0x4f, 0x4a, 0x9c, 0xf6, 0xdd, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x77, 0x71, 0x2d, 0x88,
+	0xc4, 0x0b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -827,74 +910,3 @@ var _DatastoreAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/datastore/admin/v1beta1/datastore_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/datastore/admin/v1beta1/datastore_admin.proto", fileDescriptor_datastore_admin_f5b05ee5645ebe6f)
-}
-
-var fileDescriptor_datastore_admin_f5b05ee5645ebe6f = []byte{
-	// 996 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x41, 0x8f, 0xdb, 0x44,
-	0x14, 0xc6, 0xce, 0x26, 0x6d, 0xde, 0x6e, 0xd2, 0xec, 0x94, 0xad, 0xa2, 0x40, 0xcb, 0xca, 0xa5,
-	0xd2, 0x6a, 0x05, 0x0e, 0x1b, 0x5a, 0x41, 0x97, 0x53, 0x36, 0xeb, 0x54, 0x46, 0x69, 0x12, 0x1c,
-	0x07, 0x75, 0x7b, 0xb1, 0x9c, 0x78, 0x36, 0x32, 0x6b, 0x7b, 0x8c, 0x3d, 0x29, 0x8d, 0x10, 0x17,
-	0x2e, 0x1c, 0x38, 0x72, 0xe1, 0x1f, 0x20, 0xf1, 0x1b, 0xb8, 0x70, 0xe1, 0xc2, 0x91, 0xbf, 0xc0,
-	0x8f, 0xe0, 0x88, 0x66, 0x3c, 0x76, 0xe2, 0x25, 0x10, 0xca, 0x16, 0x4e, 0xdc, 0xfc, 0xde, 0xbc,
-	0xef, 0x9b, 0x37, 0xdf, 0x9b, 0xf7, 0x3c, 0x70, 0x7f, 0x46, 0xc8, 0xcc, 0xc3, 0x4d, 0xc7, 0xa6,
-	0x76, 0x4c, 0x49, 0x84, 0x9b, 0xb6, 0xe3, 0xbb, 0x41, 0xf3, 0xd9, 0xd1, 0x04, 0x53, 0xfb, 0x68,
-	0xe9, 0xb7, 0xb8, 0x5f, 0x0d, 0x23, 0x42, 0x09, 0xba, 0x93, 0xa0, 0xd4, 0x6c, 0x55, 0x4d, 0x56,
-	0x05, 0xaa, 0xf1, 0xba, 0x60, 0xb5, 0x43, 0xb7, 0x69, 0x07, 0x01, 0xa1, 0x36, 0x75, 0x49, 0x10,
-	0x27, 0xe8, 0xc6, 0x5d, 0xb1, 0xea, 0x91, 0x60, 0x16, 0xcd, 0x83, 0xc0, 0x0d, 0x66, 0x4d, 0x12,
-	0xe2, 0x28, 0x17, 0xf4, 0x86, 0x08, 0xe2, 0xd6, 0x64, 0x7e, 0xde, 0xa4, 0xae, 0x8f, 0x63, 0x6a,
-	0xfb, 0x61, 0x12, 0xa0, 0xfc, 0xb8, 0x05, 0xd5, 0x0e, 0xf1, 0x7d, 0x12, 0x3c, 0xc6, 0xd4, 0x66,
-	0x99, 0xa0, 0x87, 0x00, 0x31, 0xb5, 0x23, 0x6a, 0xb1, 0xd8, 0xba, 0xb4, 0x2f, 0x1d, 0x6c, 0xb7,
-	0x1a, 0xaa, 0xc8, 0x35, 0x25, 0x52, 0xcd, 0x94, 0xc8, 0x28, 0xf3, 0x68, 0x66, 0xa3, 0x07, 0x70,
-	0x1d, 0x07, 0x4e, 0x02, 0x94, 0x37, 0x02, 0xaf, 0xe1, 0xc0, 0xe1, 0x30, 0x13, 0xaa, 0x59, 0xe6,
-	0x16, 0x5d, 0x84, 0xb8, 0x5e, 0xd8, 0x97, 0x0e, 0xaa, 0xad, 0xb7, 0xd5, 0xbf, 0x56, 0x48, 0x1d,
-	0xa4, 0x28, 0x73, 0x11, 0x62, 0xa3, 0x42, 0x56, 0x4d, 0x64, 0x40, 0xc9, 0xb3, 0x27, 0xd8, 0x8b,
-	0xeb, 0x5b, 0xfb, 0x85, 0x83, 0xed, 0xd6, 0xf1, 0x26, 0xb6, 0xbc, 0x0e, 0x6a, 0x8f, 0x83, 0xb5,
-	0x80, 0x46, 0x0b, 0x43, 0x30, 0xa1, 0x0f, 0xa1, 0x18, 0x53, 0x9b, 0xe2, 0x7a, 0x91, 0x27, 0x78,
-	0xff, 0x05, 0x29, 0x47, 0x0c, 0x6b, 0x24, 0x14, 0x8d, 0x87, 0xb0, 0xbd, 0xb2, 0x05, 0xaa, 0x41,
-	0xe1, 0x02, 0x2f, 0xb8, 0xde, 0x65, 0x83, 0x7d, 0xa2, 0x57, 0xa1, 0xf8, 0xcc, 0xf6, 0xe6, 0x89,
-	0x94, 0x65, 0x23, 0x31, 0x8e, 0xe5, 0xf7, 0x25, 0xe5, 0x6b, 0x09, 0x8a, 0x9c, 0x0b, 0xed, 0xc1,
-	0xee, 0xc8, 0x6c, 0x9b, 0x9a, 0x35, 0xee, 0x8f, 0x86, 0x5a, 0x47, 0xef, 0xea, 0xda, 0x69, 0xed,
-	0x15, 0x54, 0x83, 0x1d, 0xbd, 0xaf, 0x9b, 0x7a, 0xbb, 0xa7, 0x3f, 0xd5, 0xfb, 0x8f, 0x6a, 0x12,
-	0xaa, 0x02, 0x0c, 0x8d, 0x41, 0x47, 0x1b, 0x8d, 0x98, 0x2d, 0x33, 0xbb, 0xd3, 0xee, 0x77, 0xb4,
-	0x5e, 0x8f, 0xd9, 0x05, 0x66, 0x77, 0xf5, 0x7e, 0x1a, 0xbf, 0xc5, 0xec, 0xd1, 0xb8, 0xc3, 0xe2,
-	0xbb, 0xe3, 0x5e, 0xad, 0x88, 0x00, 0x4a, 0xdd, 0xb6, 0xde, 0xd3, 0x4e, 0x6b, 0x25, 0x54, 0x81,
-	0xb2, 0xc0, 0x6a, 0xa7, 0xb5, 0x6b, 0xca, 0x13, 0xb8, 0x3e, 0x8c, 0xc8, 0x2c, 0xc2, 0x71, 0x8c,
-	0xee, 0x41, 0xf5, 0x33, 0x12, 0x5d, 0x58, 0x53, 0xe2, 0x87, 0x1e, 0xa6, 0xd8, 0xe1, 0x07, 0x2a,
-	0x18, 0x15, 0xe6, 0xed, 0xa4, 0xce, 0x2c, 0x0c, 0xc7, 0xd4, 0xf5, 0x6d, 0x16, 0x26, 0x2f, 0xc3,
-	0xb4, 0xd4, 0xa9, 0xfc, 0x2c, 0xc3, 0x9e, 0xf6, 0x3c, 0x24, 0x11, 0xd5, 0x02, 0xea, 0x52, 0x17,
-	0xc7, 0x06, 0xfe, 0x74, 0x8e, 0x63, 0x8a, 0x6e, 0x03, 0x84, 0x11, 0xf9, 0x04, 0x4f, 0xa9, 0xe5,
-	0x3a, 0x42, 0xb4, 0xb2, 0xf0, 0xe8, 0x0e, 0x3a, 0xcb, 0x6a, 0x2f, 0xf3, 0xda, 0xb7, 0x37, 0x15,
-	0x6a, 0xed, 0x2e, 0x6b, 0xaf, 0xc0, 0x47, 0x50, 0xc1, 0x2c, 0x6c, 0x61, 0x9d, 0xbb, 0x1e, 0xc5,
-	0x11, 0xbf, 0xab, 0xdb, 0xad, 0xb7, 0x36, 0xee, 0xc0, 0x41, 0x5d, 0x8e, 0x31, 0x76, 0xf0, 0x8a,
-	0x85, 0x0e, 0x61, 0x97, 0xcc, 0x69, 0x38, 0xa7, 0xd6, 0x3c, 0xf2, 0xac, 0x30, 0xc2, 0xe7, 0xee,
-	0xf3, 0xfa, 0x16, 0x3f, 0xd3, 0x8d, 0x64, 0x61, 0x1c, 0x79, 0x43, 0xee, 0xbe, 0xca, 0xad, 0xf9,
-	0x41, 0x86, 0x3d, 0xdd, 0xff, 0x2f, 0xd4, 0x5c, 0xbb, 0xcb, 0x5a, 0x35, 0x5f, 0x83, 0xb2, 0x1b,
-	0x88, 0x93, 0x73, 0x25, 0xcb, 0xc6, 0x75, 0xee, 0x18, 0x47, 0xde, 0x1f, 0xa5, 0xde, 0xba, 0xaa,
-	0xd4, 0x57, 0x91, 0xef, 0x3d, 0xb8, 0x75, 0xf9, 0x96, 0xc4, 0x21, 0x09, 0x62, 0xcc, 0xe4, 0x5b,
-	0xd6, 0x2f, 0x95, 0x2f, 0x2b, 0x9c, 0xf2, 0x55, 0xe1, 0x32, 0x32, 0x9b, 0xb5, 0x5d, 0x28, 0x4d,
-	0xf9, 0x88, 0x10, 0x73, 0x56, 0x7d, 0xb1, 0x81, 0x62, 0x08, 0x34, 0x1a, 0xc3, 0x6e, 0x28, 0x5a,
-	0xd0, 0xc2, 0x62, 0x13, 0x31, 0x81, 0x0f, 0x36, 0x51, 0xa6, 0xbd, 0x6b, 0xd4, 0x52, 0x8a, 0x34,
-	0x4d, 0x34, 0x80, 0x6a, 0x46, 0x3b, 0x59, 0x50, 0x1c, 0x8b, 0xcb, 0xfe, 0xf7, 0x39, 0x2b, 0x29,
-	0xfe, 0x84, 0xc1, 0xff, 0x85, 0x8a, 0xae, 0x6f, 0x9e, 0xe2, 0xda, 0xe6, 0x51, 0x7e, 0x93, 0xe1,
-	0x56, 0xfe, 0x6e, 0xfe, 0x5f, 0x89, 0x97, 0x57, 0x89, 0x5c, 0x2f, 0x17, 0xf3, 0xbd, 0xac, 0xe8,
-	0xb0, 0xb3, 0x0a, 0x65, 0x7d, 0x76, 0xe1, 0x06, 0x4e, 0x5c, 0x97, 0xf6, 0x0b, 0xac, 0xcf, 0xb8,
-	0x81, 0xee, 0x42, 0x25, 0xb0, 0x7d, 0x1c, 0x87, 0xf6, 0x14, 0x5b, 0xae, 0x93, 0x0c, 0x9c, 0xb2,
-	0xb1, 0x93, 0x39, 0x75, 0x27, 0x3e, 0x3c, 0x83, 0x4a, 0xee, 0xc7, 0x8f, 0xee, 0x40, 0x63, 0x30,
-	0xd4, 0x8c, 0xb6, 0xa9, 0x0f, 0xfa, 0x96, 0x79, 0x36, 0xbc, 0xfc, 0x37, 0xbc, 0x09, 0x37, 0xb4,
-	0x27, 0xc3, 0x81, 0x61, 0x5a, 0x5a, 0xdf, 0xd4, 0x4d, 0x5d, 0x1b, 0xd5, 0x24, 0xe6, 0xd4, 0x1f,
-	0xe7, 0x9d, 0x72, 0xeb, 0x27, 0x19, 0xaa, 0xa7, 0xe9, 0xc9, 0xdb, 0xec, 0xe0, 0xe8, 0x5b, 0x09,
-	0xaa, 0xf9, 0xee, 0x45, 0x0f, 0xfe, 0xd1, 0xdf, 0xa4, 0x71, 0x3b, 0x85, 0xad, 0x3c, 0xd9, 0x96,
-	0x4f, 0x18, 0xe5, 0x9d, 0x2f, 0x7f, 0xf9, 0xf5, 0x1b, 0xf9, 0x50, 0xb9, 0x97, 0x3d, 0x1b, 0xc5,
-	0x04, 0x8e, 0x9b, 0x9f, 0x2f, 0xa7, 0xf3, 0x17, 0xc7, 0x98, 0x93, 0x1f, 0x4b, 0x87, 0x3c, 0xb5,
-	0xfc, 0x75, 0xde, 0x9c, 0xda, 0xda, 0xd1, 0xfc, 0xb2, 0x52, 0x73, 0x7d, 0x91, 0xda, 0xc9, 0x77,
-	0x12, 0x28, 0x53, 0xe2, 0x6f, 0xc8, 0xe6, 0xe4, 0x66, 0x5e, 0xec, 0x21, 0x7b, 0x24, 0x0e, 0xa5,
-	0xa7, 0x1d, 0x01, 0x9b, 0x11, 0xcf, 0x0e, 0x66, 0x2a, 0x89, 0x66, 0xcd, 0x19, 0x0e, 0xf8, 0x13,
-	0xb2, 0x99, 0x2c, 0xd9, 0xa1, 0x1b, 0xff, 0xd9, 0x73, 0xfb, 0x03, 0x6e, 0x7d, 0x2f, 0xbf, 0xf9,
-	0x28, 0x61, 0xe9, 0x78, 0x64, 0xee, 0xa8, 0xd9, 0x4e, 0x2a, 0xdf, 0x4a, 0xfd, 0xf8, 0xe8, 0x84,
-	0x05, 0x4f, 0x4a, 0x9c, 0xf6, 0xdd, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x77, 0x71, 0x2d, 0x88,
-	0xc4, 0x0b, 0x00, 0x00,
-}
diff --git a/googleapis/datastore/v1/datastore.pb.go b/googleapis/datastore/v1/datastore.pb.go
index b7de20b2f3..7c46118544 100644
--- a/googleapis/datastore/v1/datastore.pb.go
+++ b/googleapis/datastore/v1/datastore.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/datastore.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package datastore
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The modes available for commits.
 type CommitRequest_Mode int32
@@ -43,6 +43,7 @@ var CommitRequest_Mode_name = map[int32]string{
 	1: "TRANSACTIONAL",
 	2: "NON_TRANSACTIONAL",
 }
+
 var CommitRequest_Mode_value = map[string]int32{
 	"MODE_UNSPECIFIED":  0,
 	"TRANSACTIONAL":     1,
@@ -52,8 +53,9 @@ var CommitRequest_Mode_value = map[string]int32{
 func (x CommitRequest_Mode) String() string {
 	return proto.EnumName(CommitRequest_Mode_name, int32(x))
 }
+
 func (CommitRequest_Mode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{8, 0}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{8, 0}
 }
 
 // The possible values for read consistencies.
@@ -73,6 +75,7 @@ var ReadOptions_ReadConsistency_name = map[int32]string{
 	1: "STRONG",
 	2: "EVENTUAL",
 }
+
 var ReadOptions_ReadConsistency_value = map[string]int32{
 	"READ_CONSISTENCY_UNSPECIFIED": 0,
 	"STRONG":                       1,
@@ -82,8 +85,9 @@ var ReadOptions_ReadConsistency_value = map[string]int32{
 func (x ReadOptions_ReadConsistency) String() string {
 	return proto.EnumName(ReadOptions_ReadConsistency_name, int32(x))
 }
+
 func (ReadOptions_ReadConsistency) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{16, 0}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{16, 0}
 }
 
 // The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
@@ -103,16 +107,17 @@ func (m *LookupRequest) Reset()         { *m = LookupRequest{} }
 func (m *LookupRequest) String() string { return proto.CompactTextString(m) }
 func (*LookupRequest) ProtoMessage()    {}
 func (*LookupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{0}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{0}
 }
+
 func (m *LookupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LookupRequest.Unmarshal(m, b)
 }
 func (m *LookupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LookupRequest.Marshal(b, m, deterministic)
 }
-func (dst *LookupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LookupRequest.Merge(dst, src)
+func (m *LookupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupRequest.Merge(m, src)
 }
 func (m *LookupRequest) XXX_Size() int {
 	return xxx_messageInfo_LookupRequest.Size(m)
@@ -167,16 +172,17 @@ func (m *LookupResponse) Reset()         { *m = LookupResponse{} }
 func (m *LookupResponse) String() string { return proto.CompactTextString(m) }
 func (*LookupResponse) ProtoMessage()    {}
 func (*LookupResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{1}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{1}
 }
+
 func (m *LookupResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LookupResponse.Unmarshal(m, b)
 }
 func (m *LookupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LookupResponse.Marshal(b, m, deterministic)
 }
-func (dst *LookupResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LookupResponse.Merge(dst, src)
+func (m *LookupResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupResponse.Merge(m, src)
 }
 func (m *LookupResponse) XXX_Size() int {
 	return xxx_messageInfo_LookupResponse.Size(m)
@@ -234,16 +240,17 @@ func (m *RunQueryRequest) Reset()         { *m = RunQueryRequest{} }
 func (m *RunQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*RunQueryRequest) ProtoMessage()    {}
 func (*RunQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{2}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{2}
 }
+
 func (m *RunQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryRequest.Unmarshal(m, b)
 }
 func (m *RunQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryRequest.Merge(dst, src)
+func (m *RunQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryRequest.Merge(m, src)
 }
 func (m *RunQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_RunQueryRequest.Size(m)
@@ -312,80 +319,14 @@ func (m *RunQueryRequest) GetGqlQuery() *GqlQuery {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RunQueryRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RunQueryRequest_OneofMarshaler, _RunQueryRequest_OneofUnmarshaler, _RunQueryRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RunQueryRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RunQueryRequest_Query)(nil),
 		(*RunQueryRequest_GqlQuery)(nil),
 	}
 }
 
-func _RunQueryRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_Query:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Query); err != nil {
-			return err
-		}
-	case *RunQueryRequest_GqlQuery:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GqlQuery); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RunQueryRequest.QueryType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RunQueryRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RunQueryRequest)
-	switch tag {
-	case 3: // query_type.query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Query)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &RunQueryRequest_Query{msg}
-		return true, err
-	case 7: // query_type.gql_query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GqlQuery)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &RunQueryRequest_GqlQuery{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_Query:
-		s := proto.Size(x.Query)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RunQueryRequest_GqlQuery:
-		s := proto.Size(x.GqlQuery)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for
 // [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
 type RunQueryResponse struct {
@@ -402,16 +343,17 @@ func (m *RunQueryResponse) Reset()         { *m = RunQueryResponse{} }
 func (m *RunQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*RunQueryResponse) ProtoMessage()    {}
 func (*RunQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{3}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{3}
 }
+
 func (m *RunQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryResponse.Unmarshal(m, b)
 }
 func (m *RunQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryResponse.Merge(dst, src)
+func (m *RunQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryResponse.Merge(m, src)
 }
 func (m *RunQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_RunQueryResponse.Size(m)
@@ -452,16 +394,17 @@ func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest
 func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionRequest) ProtoMessage()    {}
 func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{4}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{4}
 }
+
 func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
 }
 func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+func (m *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(m, src)
 }
 func (m *BeginTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionRequest.Size(m)
@@ -500,16 +443,17 @@ func (m *BeginTransactionResponse) Reset()         { *m = BeginTransactionRespon
 func (m *BeginTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionResponse) ProtoMessage()    {}
 func (*BeginTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{5}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{5}
 }
+
 func (m *BeginTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionResponse.Unmarshal(m, b)
 }
 func (m *BeginTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionResponse.Merge(dst, src)
+func (m *BeginTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionResponse.Merge(m, src)
 }
 func (m *BeginTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionResponse.Size(m)
@@ -543,16 +487,17 @@ func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
 func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackRequest) ProtoMessage()    {}
 func (*RollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{6}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{6}
 }
+
 func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
 }
 func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+func (m *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(m, src)
 }
 func (m *RollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackRequest.Size(m)
@@ -590,16 +535,17 @@ func (m *RollbackResponse) Reset()         { *m = RollbackResponse{} }
 func (m *RollbackResponse) String() string { return proto.CompactTextString(m) }
 func (*RollbackResponse) ProtoMessage()    {}
 func (*RollbackResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{7}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{7}
 }
+
 func (m *RollbackResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackResponse.Unmarshal(m, b)
 }
 func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic)
 }
-func (dst *RollbackResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackResponse.Merge(dst, src)
+func (m *RollbackResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackResponse.Merge(m, src)
 }
 func (m *RollbackResponse) XXX_Size() int {
 	return xxx_messageInfo_RollbackResponse.Size(m)
@@ -644,16 +590,17 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{8}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{8}
 }
+
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(dst, src)
+func (m *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(m, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -709,57 +656,13 @@ func (m *CommitRequest) GetMutations() []*Mutation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CommitRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CommitRequest_OneofMarshaler, _CommitRequest_OneofUnmarshaler, _CommitRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CommitRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CommitRequest_Transaction)(nil),
 	}
 }
 
-func _CommitRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CommitRequest)
-	// transaction_selector
-	switch x := m.TransactionSelector.(type) {
-	case *CommitRequest_Transaction:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case nil:
-	default:
-		return fmt.Errorf("CommitRequest.TransactionSelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CommitRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CommitRequest)
-	switch tag {
-	case 1: // transaction_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.TransactionSelector = &CommitRequest_Transaction{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CommitRequest)
-	// transaction_selector
-	switch x := m.TransactionSelector.(type) {
-	case *CommitRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
 type CommitResponse struct {
 	// The result of performing the mutations.
@@ -777,16 +680,17 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{9}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{9}
 }
+
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(dst, src)
+func (m *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(m, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -828,16 +732,17 @@ func (m *AllocateIdsRequest) Reset()         { *m = AllocateIdsRequest{} }
 func (m *AllocateIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*AllocateIdsRequest) ProtoMessage()    {}
 func (*AllocateIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{10}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{10}
 }
+
 func (m *AllocateIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocateIdsRequest.Unmarshal(m, b)
 }
 func (m *AllocateIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocateIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *AllocateIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocateIdsRequest.Merge(dst, src)
+func (m *AllocateIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsRequest.Merge(m, src)
 }
 func (m *AllocateIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_AllocateIdsRequest.Size(m)
@@ -877,16 +782,17 @@ func (m *AllocateIdsResponse) Reset()         { *m = AllocateIdsResponse{} }
 func (m *AllocateIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*AllocateIdsResponse) ProtoMessage()    {}
 func (*AllocateIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{11}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{11}
 }
+
 func (m *AllocateIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocateIdsResponse.Unmarshal(m, b)
 }
 func (m *AllocateIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocateIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *AllocateIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocateIdsResponse.Merge(dst, src)
+func (m *AllocateIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsResponse.Merge(m, src)
 }
 func (m *AllocateIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_AllocateIdsResponse.Size(m)
@@ -923,16 +829,17 @@ func (m *ReserveIdsRequest) Reset()         { *m = ReserveIdsRequest{} }
 func (m *ReserveIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*ReserveIdsRequest) ProtoMessage()    {}
 func (*ReserveIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{12}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{12}
 }
+
 func (m *ReserveIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReserveIdsRequest.Unmarshal(m, b)
 }
 func (m *ReserveIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReserveIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReserveIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReserveIdsRequest.Merge(dst, src)
+func (m *ReserveIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsRequest.Merge(m, src)
 }
 func (m *ReserveIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_ReserveIdsRequest.Size(m)
@@ -976,16 +883,17 @@ func (m *ReserveIdsResponse) Reset()         { *m = ReserveIdsResponse{} }
 func (m *ReserveIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*ReserveIdsResponse) ProtoMessage()    {}
 func (*ReserveIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{13}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{13}
 }
+
 func (m *ReserveIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReserveIdsResponse.Unmarshal(m, b)
 }
 func (m *ReserveIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReserveIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReserveIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReserveIdsResponse.Merge(dst, src)
+func (m *ReserveIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsResponse.Merge(m, src)
 }
 func (m *ReserveIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_ReserveIdsResponse.Size(m)
@@ -1029,16 +937,17 @@ func (m *Mutation) Reset()         { *m = Mutation{} }
 func (m *Mutation) String() string { return proto.CompactTextString(m) }
 func (*Mutation) ProtoMessage()    {}
 func (*Mutation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{14}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{14}
 }
+
 func (m *Mutation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation.Unmarshal(m, b)
 }
 func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
 }
-func (dst *Mutation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation.Merge(dst, src)
+func (m *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(m, src)
 }
 func (m *Mutation) XXX_Size() int {
 	return xxx_messageInfo_Mutation.Size(m)
@@ -1136,9 +1045,9 @@ func (m *Mutation) GetBaseVersion() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Mutation_OneofMarshaler, _Mutation_OneofUnmarshaler, _Mutation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Mutation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Mutation_Insert)(nil),
 		(*Mutation_Update)(nil),
 		(*Mutation_Upsert)(nil),
@@ -1147,133 +1056,6 @@ func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _Mutation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Mutation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Mutation_Insert:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Insert); err != nil {
-			return err
-		}
-	case *Mutation_Update:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *Mutation_Upsert:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Upsert); err != nil {
-			return err
-		}
-	case *Mutation_Delete:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Delete); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Mutation.Operation has unexpected type %T", x)
-	}
-	// conflict_detection_strategy
-	switch x := m.ConflictDetectionStrategy.(type) {
-	case *Mutation_BaseVersion:
-		b.EncodeVarint(8<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.BaseVersion))
-	case nil:
-	default:
-		return fmt.Errorf("Mutation.ConflictDetectionStrategy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Mutation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Mutation)
-	switch tag {
-	case 4: // operation.insert
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Insert{msg}
-		return true, err
-	case 5: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Update{msg}
-		return true, err
-	case 6: // operation.upsert
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Upsert{msg}
-		return true, err
-	case 7: // operation.delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Key)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Delete{msg}
-		return true, err
-	case 8: // conflict_detection_strategy.base_version
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConflictDetectionStrategy = &Mutation_BaseVersion{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Mutation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Mutation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Mutation_Insert:
-		s := proto.Size(x.Insert)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Upsert:
-		s := proto.Size(x.Upsert)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Delete:
-		s := proto.Size(x.Delete)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// conflict_detection_strategy
-	switch x := m.ConflictDetectionStrategy.(type) {
-	case *Mutation_BaseVersion:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.BaseVersion))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The result of applying a mutation.
 type MutationResult struct {
 	// The automatically allocated key.
@@ -1297,16 +1079,17 @@ func (m *MutationResult) Reset()         { *m = MutationResult{} }
 func (m *MutationResult) String() string { return proto.CompactTextString(m) }
 func (*MutationResult) ProtoMessage()    {}
 func (*MutationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{15}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{15}
 }
+
 func (m *MutationResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutationResult.Unmarshal(m, b)
 }
 func (m *MutationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutationResult.Marshal(b, m, deterministic)
 }
-func (dst *MutationResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutationResult.Merge(dst, src)
+func (m *MutationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutationResult.Merge(m, src)
 }
 func (m *MutationResult) XXX_Size() int {
 	return xxx_messageInfo_MutationResult.Size(m)
@@ -1357,16 +1140,17 @@ func (m *ReadOptions) Reset()         { *m = ReadOptions{} }
 func (m *ReadOptions) String() string { return proto.CompactTextString(m) }
 func (*ReadOptions) ProtoMessage()    {}
 func (*ReadOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{16}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{16}
 }
+
 func (m *ReadOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadOptions.Unmarshal(m, b)
 }
 func (m *ReadOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadOptions.Marshal(b, m, deterministic)
 }
-func (dst *ReadOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadOptions.Merge(dst, src)
+func (m *ReadOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadOptions.Merge(m, src)
 }
 func (m *ReadOptions) XXX_Size() int {
 	return xxx_messageInfo_ReadOptions.Size(m)
@@ -1414,71 +1198,14 @@ func (m *ReadOptions) GetTransaction() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadOptions_OneofMarshaler, _ReadOptions_OneofUnmarshaler, _ReadOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadOptions_ReadConsistency_)(nil),
 		(*ReadOptions_Transaction)(nil),
 	}
 }
 
-func _ReadOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadOptions)
-	// consistency_type
-	switch x := m.ConsistencyType.(type) {
-	case *ReadOptions_ReadConsistency_:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ReadConsistency))
-	case *ReadOptions_Transaction:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case nil:
-	default:
-		return fmt.Errorf("ReadOptions.ConsistencyType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadOptions)
-	switch tag {
-	case 1: // consistency_type.read_consistency
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConsistencyType = &ReadOptions_ReadConsistency_{ReadOptions_ReadConsistency(x)}
-		return true, err
-	case 2: // consistency_type.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencyType = &ReadOptions_Transaction{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadOptions)
-	// consistency_type
-	switch x := m.ConsistencyType.(type) {
-	case *ReadOptions_ReadConsistency_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ReadConsistency))
-	case *ReadOptions_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options for beginning a new transaction.
 //
 // Transactions can be created explicitly with calls to
@@ -1503,16 +1230,17 @@ func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
 func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions) ProtoMessage()    {}
 func (*TransactionOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{17}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{17}
 }
+
 func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
 }
 func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+func (m *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(m, src)
 }
 func (m *TransactionOptions) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions.Size(m)
@@ -1560,80 +1288,14 @@ func (m *TransactionOptions) GetReadOnly() *TransactionOptions_ReadOnly {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_OneofMarshaler, _TransactionOptions_OneofUnmarshaler, _TransactionOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadWrite_)(nil),
 		(*TransactionOptions_ReadOnly_)(nil),
 	}
 }
 
-func _TransactionOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadWrite_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadWrite); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadOnly_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadOnly); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions.Mode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions)
-	switch tag {
-	case 1: // mode.read_write
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadWrite)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadWrite_{msg}
-		return true, err
-	case 2: // mode.read_only
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadOnly)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadOnly_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadWrite_:
-		s := proto.Size(x.ReadWrite)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadOnly_:
-		s := proto.Size(x.ReadOnly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options specific to read / write transactions.
 type TransactionOptions_ReadWrite struct {
 	// The transaction identifier of the transaction being retried.
@@ -1647,16 +1309,17 @@ func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions
 func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
 func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{17, 0}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{17, 0}
 }
+
 func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+func (m *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(m, src)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
@@ -1685,16 +1348,17 @@ func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_
 func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
 func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_834dd4313146b835, []int{17, 1}
+	return fileDescriptor_9ad66bfcb30c1b57, []int{17, 1}
 }
+
 func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+func (m *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(m, src)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
@@ -1706,6 +1370,8 @@ func (m *TransactionOptions_ReadOnly) XXX_DiscardUnknown() {
 var xxx_messageInfo_TransactionOptions_ReadOnly proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("google.datastore.v1.CommitRequest_Mode", CommitRequest_Mode_name, CommitRequest_Mode_value)
+	proto.RegisterEnum("google.datastore.v1.ReadOptions_ReadConsistency", ReadOptions_ReadConsistency_name, ReadOptions_ReadConsistency_value)
 	proto.RegisterType((*LookupRequest)(nil), "google.datastore.v1.LookupRequest")
 	proto.RegisterType((*LookupResponse)(nil), "google.datastore.v1.LookupResponse")
 	proto.RegisterType((*RunQueryRequest)(nil), "google.datastore.v1.RunQueryRequest")
@@ -1726,8 +1392,101 @@ func init() {
 	proto.RegisterType((*TransactionOptions)(nil), "google.datastore.v1.TransactionOptions")
 	proto.RegisterType((*TransactionOptions_ReadWrite)(nil), "google.datastore.v1.TransactionOptions.ReadWrite")
 	proto.RegisterType((*TransactionOptions_ReadOnly)(nil), "google.datastore.v1.TransactionOptions.ReadOnly")
-	proto.RegisterEnum("google.datastore.v1.CommitRequest_Mode", CommitRequest_Mode_name, CommitRequest_Mode_value)
-	proto.RegisterEnum("google.datastore.v1.ReadOptions_ReadConsistency", ReadOptions_ReadConsistency_name, ReadOptions_ReadConsistency_value)
+}
+
+func init() {
+	proto.RegisterFile("google/datastore/v1/datastore.proto", fileDescriptor_9ad66bfcb30c1b57)
+}
+
+var fileDescriptor_9ad66bfcb30c1b57 = []byte{
+	// 1390 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdf, 0x6f, 0x1b, 0xc5,
+	0x13, 0xcf, 0x3a, 0x89, 0x63, 0x8f, 0xf3, 0xc3, 0xd9, 0xe4, 0xfb, 0xad, 0x71, 0x5b, 0xd5, 0x5c,
+	0x1a, 0x1a, 0xd2, 0xd6, 0x4e, 0x0c, 0x15, 0x52, 0x53, 0x21, 0xc5, 0x8e, 0xdb, 0x58, 0x34, 0x76,
+	0xd8, 0xa4, 0xe1, 0x87, 0x8a, 0xac, 0x8b, 0x6f, 0x6b, 0x8e, 0x9c, 0x6f, 0x2f, 0x77, 0xeb, 0x80,
+	0x85, 0xa8, 0x54, 0x10, 0xbc, 0xc1, 0x43, 0xf9, 0x0b, 0xfa, 0xc2, 0x03, 0xe2, 0x91, 0x27, 0xc4,
+	0x5f, 0xc0, 0x2b, 0xff, 0x02, 0x8f, 0xbc, 0xf1, 0x0f, 0xa0, 0xdb, 0xdb, 0xb3, 0x7d, 0xce, 0x5d,
+	0xec, 0x48, 0xbc, 0x79, 0x67, 0xe7, 0x33, 0xf3, 0x99, 0x99, 0xbd, 0x99, 0x31, 0xac, 0xb4, 0x18,
+	0x6b, 0x19, 0xb4, 0xa0, 0xa9, 0x5c, 0x75, 0x38, 0xb3, 0x69, 0xe1, 0x6c, 0xb3, 0x7f, 0xc8, 0x5b,
+	0x36, 0xe3, 0x0c, 0x2f, 0x79, 0x4a, 0xf9, 0xbe, 0xfc, 0x6c, 0x33, 0x7b, 0x4d, 0x22, 0x55, 0x4b,
+	0x2f, 0xa8, 0xa6, 0xc9, 0xb8, 0xca, 0x75, 0x66, 0x3a, 0x1e, 0x24, 0x9b, 0x0b, 0xb3, 0x4b, 0x4d,
+	0xae, 0xf3, 0xae, 0xd4, 0xb8, 0x11, 0xa6, 0x71, 0xda, 0xa1, 0xb6, 0x54, 0x50, 0x5e, 0x21, 0x98,
+	0x7b, 0xcc, 0xd8, 0x49, 0xc7, 0x22, 0xf4, 0xb4, 0x43, 0x1d, 0x8e, 0xaf, 0x03, 0x58, 0x36, 0xfb,
+	0x8c, 0x36, 0x79, 0x43, 0xd7, 0x32, 0x89, 0x1c, 0x5a, 0x4b, 0x92, 0xa4, 0x94, 0x54, 0x35, 0x5c,
+	0x86, 0x59, 0x9b, 0xaa, 0x5a, 0x83, 0x59, 0x82, 0x49, 0x06, 0xe5, 0xd0, 0x5a, 0xaa, 0x98, 0xcb,
+	0x87, 0xb0, 0xcf, 0x13, 0xaa, 0x6a, 0x75, 0x4f, 0x8f, 0xa4, 0xec, 0xfe, 0x01, 0xdf, 0x81, 0xa9,
+	0x13, 0xda, 0x75, 0x32, 0x93, 0xb9, 0xc9, 0xb5, 0x54, 0x31, 0x13, 0x0a, 0x7e, 0x8f, 0x76, 0x89,
+	0xd0, 0x52, 0x7e, 0x47, 0x30, 0xef, 0x73, 0x74, 0x2c, 0x66, 0x3a, 0x14, 0xbf, 0x03, 0xd3, 0xcf,
+	0x58, 0xc7, 0xd4, 0x32, 0x48, 0x58, 0x78, 0x3d, 0xd4, 0x42, 0x45, 0x64, 0x82, 0x50, 0xa7, 0x63,
+	0x70, 0xe2, 0xe9, 0xe3, 0x2d, 0x98, 0x69, 0xeb, 0x8e, 0xa3, 0x9b, 0xad, 0x4c, 0x6c, 0x5c, 0xa8,
+	0x8f, 0xc0, 0x6f, 0x43, 0x42, 0xa3, 0xcf, 0xa8, 0x6d, 0x53, 0x6d, 0x24, 0xf5, 0x9e, 0xa6, 0xf2,
+	0x5b, 0x0c, 0x16, 0x48, 0xc7, 0x7c, 0xdf, 0xcd, 0xfa, 0xf8, 0x49, 0xb6, 0x54, 0x9b, 0xeb, 0x6e,
+	0xb6, 0x5c, 0x85, 0xd8, 0x05, 0x49, 0xde, 0xf7, 0x15, 0xab, 0x1a, 0x49, 0x59, 0xfd, 0xc3, 0x7f,
+	0x53, 0xa9, 0x22, 0x4c, 0x8b, 0xe7, 0x92, 0x99, 0x14, 0xe8, 0x6c, 0x28, 0x5a, 0x84, 0xb6, 0x3b,
+	0x41, 0x3c, 0x55, 0xfc, 0x00, 0x92, 0xad, 0x53, 0xa3, 0xe1, 0xe1, 0x66, 0x04, 0xee, 0x7a, 0x28,
+	0xee, 0xd1, 0xa9, 0xe1, 0x43, 0x13, 0x2d, 0xf9, 0xbb, 0x34, 0x0b, 0x20, 0x90, 0x0d, 0xde, 0xb5,
+	0xa8, 0xf2, 0x02, 0x41, 0xba, 0x9f, 0x3c, 0x59, 0xfd, 0x2d, 0x98, 0x3e, 0x56, 0x79, 0xf3, 0x53,
+	0x19, 0xd2, 0x6a, 0x34, 0x29, 0xaf, 0x82, 0x25, 0x57, 0x99, 0x78, 0x18, 0xbc, 0xe1, 0x47, 0x14,
+	0x1b, 0x15, 0x91, 0x8c, 0x47, 0x79, 0x89, 0xe0, 0x4a, 0x89, 0xb6, 0x74, 0xf3, 0xd0, 0x56, 0x4d,
+	0x47, 0x6d, 0xba, 0x99, 0x19, 0xb3, 0x90, 0x1f, 0xc2, 0x12, 0xef, 0x83, 0x7a, 0xa5, 0x00, 0xe1,
+	0xfa, 0x56, 0xa8, 0xeb, 0x01, 0x27, 0x7e, 0x45, 0x30, 0x3f, 0x27, 0x53, 0x1e, 0x40, 0xe6, 0x3c,
+	0x27, 0x99, 0x9f, 0x1c, 0xa4, 0x06, 0x10, 0x22, 0x4b, 0xb3, 0x64, 0x50, 0xa4, 0x10, 0x58, 0x20,
+	0xcc, 0x30, 0x8e, 0xd5, 0xe6, 0xc9, 0x98, 0x91, 0x8c, 0xb6, 0x89, 0x21, 0xdd, 0xb7, 0xe9, 0x31,
+	0x51, 0x7e, 0x89, 0xc1, 0x5c, 0x99, 0xb5, 0xdb, 0x3a, 0x1f, 0xd3, 0xcd, 0x16, 0x4c, 0xb5, 0x99,
+	0x46, 0x33, 0xd3, 0x39, 0xb4, 0x36, 0x1f, 0x91, 0xa1, 0x80, 0xc1, 0xfc, 0x1e, 0xd3, 0x28, 0x11,
+	0x20, 0xac, 0x84, 0x70, 0xdc, 0x9d, 0x08, 0xb0, 0xc4, 0x5b, 0x90, 0x6c, 0x77, 0x64, 0x1b, 0xcd,
+	0xc4, 0xc5, 0x47, 0x1c, 0xfe, 0x38, 0xf7, 0xa4, 0x16, 0xe9, 0xeb, 0x2b, 0x0f, 0x61, 0xca, 0x75,
+	0x87, 0x97, 0x21, 0xbd, 0x57, 0xdf, 0xa9, 0x34, 0x9e, 0xd4, 0x0e, 0xf6, 0x2b, 0xe5, 0xea, 0xc3,
+	0x6a, 0x65, 0x27, 0x3d, 0x81, 0x17, 0x61, 0xee, 0x90, 0x6c, 0xd7, 0x0e, 0xb6, 0xcb, 0x87, 0xd5,
+	0x7a, 0x6d, 0xfb, 0x71, 0x1a, 0xe1, 0xff, 0xc1, 0x62, 0xad, 0x5e, 0x6b, 0x04, 0xc5, 0xb1, 0xd2,
+	0xff, 0x61, 0x79, 0xf0, 0x59, 0x38, 0xd4, 0xa0, 0x4d, 0xce, 0x6c, 0xe5, 0x5b, 0x04, 0xf3, 0x7e,
+	0x74, 0xb2, 0x96, 0x35, 0x48, 0xfb, 0xfe, 0x1b, 0xb6, 0x78, 0xcd, 0x7e, 0xdb, 0x5c, 0xb9, 0x98,
+	0xb6, 0xd7, 0xbb, 0x16, 0xda, 0x81, 0xb3, 0x83, 0x57, 0x60, 0x4e, 0x37, 0x35, 0xfa, 0x45, 0xa3,
+	0x63, 0x69, 0x2a, 0xa7, 0x4e, 0x66, 0x2a, 0x87, 0xd6, 0xa6, 0xc9, 0xac, 0x10, 0x3e, 0xf1, 0x64,
+	0x8a, 0x0a, 0x78, 0xdb, 0x30, 0x58, 0x53, 0xe5, 0xb4, 0xaa, 0x39, 0x63, 0x96, 0xce, 0x6f, 0xea,
+	0x68, 0xac, 0xa6, 0x5e, 0x86, 0xa5, 0x80, 0x0b, 0x19, 0xee, 0xe5, 0x8c, 0xbc, 0x40, 0xb0, 0x48,
+	0xa8, 0x43, 0xed, 0xb3, 0x4b, 0xf0, 0xbc, 0x01, 0x29, 0xd7, 0xdc, 0xb1, 0xea, 0x50, 0xf7, 0x3e,
+	0x29, 0xee, 0xc1, 0x17, 0x5d, 0x3a, 0x90, 0x65, 0xc0, 0x83, 0x14, 0xe4, 0xc3, 0xff, 0x35, 0x06,
+	0x09, 0xbf, 0x14, 0xf8, 0x1e, 0xc4, 0x75, 0xd3, 0xa1, 0x36, 0x17, 0xc9, 0x4e, 0x15, 0xaf, 0x5e,
+	0x30, 0x73, 0x76, 0x27, 0x88, 0x54, 0x76, 0x61, 0x5e, 0x91, 0xc4, 0xd7, 0x30, 0x1a, 0xe6, 0x29,
+	0x7b, 0x30, 0xe1, 0x2d, 0x3e, 0x26, 0x4c, 0x78, 0x2b, 0x42, 0x5c, 0xa3, 0x06, 0xe5, 0x54, 0xb6,
+	0xec, 0xc8, 0xb8, 0x5d, 0x8c, 0xa7, 0x89, 0x57, 0x60, 0x56, 0xa4, 0xf1, 0x8c, 0xda, 0x8e, 0xfb,
+	0xc5, 0xb9, 0xb9, 0x9e, 0xdc, 0x45, 0x24, 0xe5, 0x4a, 0x8f, 0x3c, 0x61, 0x29, 0x05, 0x49, 0x66,
+	0x51, 0x5b, 0xa4, 0xa2, 0x74, 0x1d, 0xae, 0x36, 0x99, 0xf9, 0xcc, 0xd0, 0x9b, 0xbc, 0xa1, 0x51,
+	0x4e, 0xe5, 0x07, 0xc0, 0x6d, 0x95, 0xd3, 0x56, 0x57, 0xf9, 0x06, 0xc1, 0x7c, 0xf0, 0x05, 0xe3,
+	0x75, 0x98, 0x3c, 0xa1, 0xfe, 0xfc, 0x89, 0x2e, 0x86, 0xab, 0x84, 0x33, 0x30, 0xe3, 0x53, 0x71,
+	0x33, 0x3d, 0x49, 0xfc, 0x23, 0xbe, 0x0d, 0x8b, 0x43, 0x7e, 0xa9, 0x26, 0xd2, 0x9a, 0x20, 0x69,
+	0xff, 0x62, 0x47, 0xca, 0x95, 0x7f, 0x10, 0xa4, 0x06, 0x26, 0x22, 0xfe, 0x04, 0xd2, 0x62, 0x92,
+	0x36, 0x99, 0xe9, 0xe8, 0x0e, 0xa7, 0x66, 0xb3, 0x2b, 0x9a, 0xcb, 0x7c, 0x71, 0x63, 0xd4, 0x34,
+	0x15, 0xbf, 0xcb, 0x7d, 0xdc, 0xee, 0x04, 0x59, 0xb0, 0x83, 0xa2, 0xe1, 0xb6, 0x15, 0x0b, 0x69,
+	0x5b, 0xca, 0x1e, 0x2c, 0x0c, 0x59, 0xc2, 0x39, 0xb8, 0x46, 0x2a, 0xdb, 0x3b, 0x8d, 0x72, 0xbd,
+	0x76, 0x50, 0x3d, 0x38, 0xac, 0xd4, 0xca, 0x1f, 0x0d, 0x35, 0x24, 0x80, 0xf8, 0xc1, 0x21, 0xa9,
+	0xd7, 0x1e, 0xa5, 0x11, 0x9e, 0x85, 0x44, 0xe5, 0xa8, 0x52, 0x3b, 0x7c, 0x22, 0x1a, 0x10, 0x86,
+	0xf4, 0x40, 0x30, 0xde, 0xa8, 0xfd, 0x3e, 0x06, 0xf8, 0xfc, 0xf0, 0xc1, 0x04, 0x40, 0x04, 0xff,
+	0xb9, 0xad, 0x73, 0x2a, 0x27, 0xee, 0xe6, 0x98, 0x93, 0x4b, 0x44, 0xff, 0x81, 0x0b, 0xdc, 0x9d,
+	0x20, 0x49, 0xdb, 0x3f, 0xe0, 0x3a, 0x24, 0xbd, 0xd5, 0xc4, 0x34, 0xfc, 0x39, 0xbc, 0x71, 0x19,
+	0x93, 0x75, 0xd3, 0x10, 0x4b, 0x83, 0x2d, 0x7f, 0x67, 0xdf, 0x85, 0x64, 0xcf, 0x15, 0xde, 0x84,
+	0x65, 0xcb, 0xa6, 0x67, 0x3a, 0xeb, 0x38, 0x8d, 0xf3, 0x33, 0x6b, 0xc9, 0xbf, 0x1b, 0xb0, 0x9d,
+	0x05, 0x48, 0xf8, 0x76, 0x4b, 0x71, 0x6f, 0x04, 0x15, 0xff, 0x9e, 0x81, 0xe4, 0x8e, 0x4f, 0x06,
+	0x3f, 0x87, 0xb8, 0xb7, 0x83, 0x62, 0x25, 0x94, 0x69, 0x60, 0x89, 0xce, 0xae, 0x5c, 0xa8, 0x23,
+	0x7b, 0xc4, 0xed, 0xaf, 0xff, 0xfc, 0xeb, 0xc7, 0xd8, 0xaa, 0x92, 0x73, 0x97, 0x72, 0xd9, 0x9f,
+	0x9c, 0xc2, 0x97, 0xfd, 0xde, 0xf5, 0xd5, 0x7d, 0x43, 0x20, 0xee, 0xa3, 0x75, 0xfc, 0x1d, 0x82,
+	0x84, 0xbf, 0x08, 0xe1, 0x9b, 0xe1, 0xcf, 0x2e, 0xb8, 0x64, 0x66, 0x57, 0x47, 0x68, 0x49, 0x1a,
+	0x77, 0x05, 0x8d, 0x5b, 0x8a, 0x12, 0x4d, 0xc3, 0x96, 0x18, 0x97, 0xc8, 0x4f, 0x08, 0xd2, 0xc3,
+	0x9b, 0x07, 0xbe, 0x13, 0xea, 0x2a, 0x62, 0x69, 0xca, 0xde, 0x1d, 0x53, 0x5b, 0x12, 0xbc, 0x27,
+	0x08, 0x16, 0x94, 0xf5, 0x68, 0x82, 0xc7, 0x43, 0x58, 0x97, 0xe8, 0x73, 0x88, 0x7b, 0xb3, 0x34,
+	0xa2, 0x62, 0x81, 0x35, 0x22, 0xa2, 0x62, 0xc1, 0x61, 0x3c, 0x4e, 0xc5, 0x9a, 0x02, 0xd1, 0xab,
+	0x98, 0x5c, 0x88, 0xa2, 0x2a, 0x16, 0xdc, 0xc1, 0xa2, 0x2a, 0x36, 0xbc, 0x55, 0x8d, 0x53, 0x31,
+	0x89, 0x71, 0x89, 0xbc, 0x44, 0x90, 0x1a, 0x98, 0xb5, 0x38, 0x7c, 0xab, 0x3a, 0x3f, 0xf0, 0xb3,
+	0x6b, 0xa3, 0x15, 0x25, 0xa3, 0x0d, 0xc1, 0x68, 0x5d, 0x59, 0x8d, 0x66, 0xa4, 0xf6, 0x61, 0x2e,
+	0xa9, 0x1f, 0x10, 0x40, 0x7f, 0x6e, 0xe2, 0x37, 0x22, 0x1a, 0xe9, 0xd0, 0x6c, 0xcf, 0xde, 0x1a,
+	0xa9, 0x27, 0x19, 0x15, 0x04, 0xa3, 0x37, 0x95, 0x9b, 0x17, 0xe4, 0xa8, 0x87, 0xba, 0x8f, 0xd6,
+	0x4b, 0xaf, 0x10, 0x5c, 0x69, 0xb2, 0x76, 0x98, 0xfd, 0xd2, 0x7c, 0xaf, 0x0f, 0xec, 0xbb, 0xff,
+	0x9a, 0xf7, 0xd1, 0xc7, 0x0f, 0xa4, 0x5a, 0x8b, 0x19, 0xaa, 0xd9, 0xca, 0x33, 0xbb, 0x55, 0x68,
+	0x51, 0x53, 0xfc, 0xa7, 0x2e, 0x78, 0x57, 0xaa, 0xa5, 0x3b, 0x81, 0xff, 0xdd, 0x5b, 0xbd, 0xc3,
+	0xcf, 0xb1, 0xd7, 0x1e, 0x79, 0xf0, 0xb2, 0xc1, 0x3a, 0x5a, 0xbe, 0x67, 0x3d, 0x7f, 0xb4, 0xf9,
+	0x87, 0x7f, 0xf7, 0x54, 0xdc, 0x3d, 0xed, 0xdd, 0x3d, 0x3d, 0xda, 0x3c, 0x8e, 0x0b, 0x07, 0x6f,
+	0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x25, 0x27, 0xe9, 0x95, 0x51, 0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2019,98 +1778,3 @@ var _Datastore_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/datastore/v1/datastore.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/datastore/v1/datastore.proto", fileDescriptor_datastore_834dd4313146b835)
-}
-
-var fileDescriptor_datastore_834dd4313146b835 = []byte{
-	// 1390 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdf, 0x6f, 0x1b, 0xc5,
-	0x13, 0xcf, 0x3a, 0x89, 0x63, 0x8f, 0xf3, 0xc3, 0xd9, 0xe4, 0xfb, 0xad, 0x71, 0x5b, 0xd5, 0x5c,
-	0x1a, 0x1a, 0xd2, 0xd6, 0x4e, 0x0c, 0x15, 0x52, 0x53, 0x21, 0xc5, 0x8e, 0xdb, 0x58, 0x34, 0x76,
-	0xd8, 0xa4, 0xe1, 0x87, 0x8a, 0xac, 0x8b, 0x6f, 0x6b, 0x8e, 0x9c, 0x6f, 0x2f, 0x77, 0xeb, 0x80,
-	0x85, 0xa8, 0x54, 0x10, 0xbc, 0xc1, 0x43, 0xf9, 0x0b, 0xfa, 0xc2, 0x03, 0xe2, 0x91, 0x27, 0xc4,
-	0x5f, 0xc0, 0x2b, 0xff, 0x02, 0x8f, 0xbc, 0xf1, 0x0f, 0xa0, 0xdb, 0xdb, 0xb3, 0x7d, 0xce, 0x5d,
-	0xec, 0x48, 0xbc, 0x79, 0x67, 0xe7, 0x33, 0xf3, 0x99, 0x99, 0xbd, 0x99, 0x31, 0xac, 0xb4, 0x18,
-	0x6b, 0x19, 0xb4, 0xa0, 0xa9, 0x5c, 0x75, 0x38, 0xb3, 0x69, 0xe1, 0x6c, 0xb3, 0x7f, 0xc8, 0x5b,
-	0x36, 0xe3, 0x0c, 0x2f, 0x79, 0x4a, 0xf9, 0xbe, 0xfc, 0x6c, 0x33, 0x7b, 0x4d, 0x22, 0x55, 0x4b,
-	0x2f, 0xa8, 0xa6, 0xc9, 0xb8, 0xca, 0x75, 0x66, 0x3a, 0x1e, 0x24, 0x9b, 0x0b, 0xb3, 0x4b, 0x4d,
-	0xae, 0xf3, 0xae, 0xd4, 0xb8, 0x11, 0xa6, 0x71, 0xda, 0xa1, 0xb6, 0x54, 0x50, 0x5e, 0x21, 0x98,
-	0x7b, 0xcc, 0xd8, 0x49, 0xc7, 0x22, 0xf4, 0xb4, 0x43, 0x1d, 0x8e, 0xaf, 0x03, 0x58, 0x36, 0xfb,
-	0x8c, 0x36, 0x79, 0x43, 0xd7, 0x32, 0x89, 0x1c, 0x5a, 0x4b, 0x92, 0xa4, 0x94, 0x54, 0x35, 0x5c,
-	0x86, 0x59, 0x9b, 0xaa, 0x5a, 0x83, 0x59, 0x82, 0x49, 0x06, 0xe5, 0xd0, 0x5a, 0xaa, 0x98, 0xcb,
-	0x87, 0xb0, 0xcf, 0x13, 0xaa, 0x6a, 0x75, 0x4f, 0x8f, 0xa4, 0xec, 0xfe, 0x01, 0xdf, 0x81, 0xa9,
-	0x13, 0xda, 0x75, 0x32, 0x93, 0xb9, 0xc9, 0xb5, 0x54, 0x31, 0x13, 0x0a, 0x7e, 0x8f, 0x76, 0x89,
-	0xd0, 0x52, 0x7e, 0x47, 0x30, 0xef, 0x73, 0x74, 0x2c, 0x66, 0x3a, 0x14, 0xbf, 0x03, 0xd3, 0xcf,
-	0x58, 0xc7, 0xd4, 0x32, 0x48, 0x58, 0x78, 0x3d, 0xd4, 0x42, 0x45, 0x64, 0x82, 0x50, 0xa7, 0x63,
-	0x70, 0xe2, 0xe9, 0xe3, 0x2d, 0x98, 0x69, 0xeb, 0x8e, 0xa3, 0x9b, 0xad, 0x4c, 0x6c, 0x5c, 0xa8,
-	0x8f, 0xc0, 0x6f, 0x43, 0x42, 0xa3, 0xcf, 0xa8, 0x6d, 0x53, 0x6d, 0x24, 0xf5, 0x9e, 0xa6, 0xf2,
-	0x5b, 0x0c, 0x16, 0x48, 0xc7, 0x7c, 0xdf, 0xcd, 0xfa, 0xf8, 0x49, 0xb6, 0x54, 0x9b, 0xeb, 0x6e,
-	0xb6, 0x5c, 0x85, 0xd8, 0x05, 0x49, 0xde, 0xf7, 0x15, 0xab, 0x1a, 0x49, 0x59, 0xfd, 0xc3, 0x7f,
-	0x53, 0xa9, 0x22, 0x4c, 0x8b, 0xe7, 0x92, 0x99, 0x14, 0xe8, 0x6c, 0x28, 0x5a, 0x84, 0xb6, 0x3b,
-	0x41, 0x3c, 0x55, 0xfc, 0x00, 0x92, 0xad, 0x53, 0xa3, 0xe1, 0xe1, 0x66, 0x04, 0xee, 0x7a, 0x28,
-	0xee, 0xd1, 0xa9, 0xe1, 0x43, 0x13, 0x2d, 0xf9, 0xbb, 0x34, 0x0b, 0x20, 0x90, 0x0d, 0xde, 0xb5,
-	0xa8, 0xf2, 0x02, 0x41, 0xba, 0x9f, 0x3c, 0x59, 0xfd, 0x2d, 0x98, 0x3e, 0x56, 0x79, 0xf3, 0x53,
-	0x19, 0xd2, 0x6a, 0x34, 0x29, 0xaf, 0x82, 0x25, 0x57, 0x99, 0x78, 0x18, 0xbc, 0xe1, 0x47, 0x14,
-	0x1b, 0x15, 0x91, 0x8c, 0x47, 0x79, 0x89, 0xe0, 0x4a, 0x89, 0xb6, 0x74, 0xf3, 0xd0, 0x56, 0x4d,
-	0x47, 0x6d, 0xba, 0x99, 0x19, 0xb3, 0x90, 0x1f, 0xc2, 0x12, 0xef, 0x83, 0x7a, 0xa5, 0x00, 0xe1,
-	0xfa, 0x56, 0xa8, 0xeb, 0x01, 0x27, 0x7e, 0x45, 0x30, 0x3f, 0x27, 0x53, 0x1e, 0x40, 0xe6, 0x3c,
-	0x27, 0x99, 0x9f, 0x1c, 0xa4, 0x06, 0x10, 0x22, 0x4b, 0xb3, 0x64, 0x50, 0xa4, 0x10, 0x58, 0x20,
-	0xcc, 0x30, 0x8e, 0xd5, 0xe6, 0xc9, 0x98, 0x91, 0x8c, 0xb6, 0x89, 0x21, 0xdd, 0xb7, 0xe9, 0x31,
-	0x51, 0x7e, 0x89, 0xc1, 0x5c, 0x99, 0xb5, 0xdb, 0x3a, 0x1f, 0xd3, 0xcd, 0x16, 0x4c, 0xb5, 0x99,
-	0x46, 0x33, 0xd3, 0x39, 0xb4, 0x36, 0x1f, 0x91, 0xa1, 0x80, 0xc1, 0xfc, 0x1e, 0xd3, 0x28, 0x11,
-	0x20, 0xac, 0x84, 0x70, 0xdc, 0x9d, 0x08, 0xb0, 0xc4, 0x5b, 0x90, 0x6c, 0x77, 0x64, 0x1b, 0xcd,
-	0xc4, 0xc5, 0x47, 0x1c, 0xfe, 0x38, 0xf7, 0xa4, 0x16, 0xe9, 0xeb, 0x2b, 0x0f, 0x61, 0xca, 0x75,
-	0x87, 0x97, 0x21, 0xbd, 0x57, 0xdf, 0xa9, 0x34, 0x9e, 0xd4, 0x0e, 0xf6, 0x2b, 0xe5, 0xea, 0xc3,
-	0x6a, 0x65, 0x27, 0x3d, 0x81, 0x17, 0x61, 0xee, 0x90, 0x6c, 0xd7, 0x0e, 0xb6, 0xcb, 0x87, 0xd5,
-	0x7a, 0x6d, 0xfb, 0x71, 0x1a, 0xe1, 0xff, 0xc1, 0x62, 0xad, 0x5e, 0x6b, 0x04, 0xc5, 0xb1, 0xd2,
-	0xff, 0x61, 0x79, 0xf0, 0x59, 0x38, 0xd4, 0xa0, 0x4d, 0xce, 0x6c, 0xe5, 0x5b, 0x04, 0xf3, 0x7e,
-	0x74, 0xb2, 0x96, 0x35, 0x48, 0xfb, 0xfe, 0x1b, 0xb6, 0x78, 0xcd, 0x7e, 0xdb, 0x5c, 0xb9, 0x98,
-	0xb6, 0xd7, 0xbb, 0x16, 0xda, 0x81, 0xb3, 0x83, 0x57, 0x60, 0x4e, 0x37, 0x35, 0xfa, 0x45, 0xa3,
-	0x63, 0x69, 0x2a, 0xa7, 0x4e, 0x66, 0x2a, 0x87, 0xd6, 0xa6, 0xc9, 0xac, 0x10, 0x3e, 0xf1, 0x64,
-	0x8a, 0x0a, 0x78, 0xdb, 0x30, 0x58, 0x53, 0xe5, 0xb4, 0xaa, 0x39, 0x63, 0x96, 0xce, 0x6f, 0xea,
-	0x68, 0xac, 0xa6, 0x5e, 0x86, 0xa5, 0x80, 0x0b, 0x19, 0xee, 0xe5, 0x8c, 0xbc, 0x40, 0xb0, 0x48,
-	0xa8, 0x43, 0xed, 0xb3, 0x4b, 0xf0, 0xbc, 0x01, 0x29, 0xd7, 0xdc, 0xb1, 0xea, 0x50, 0xf7, 0x3e,
-	0x29, 0xee, 0xc1, 0x17, 0x5d, 0x3a, 0x90, 0x65, 0xc0, 0x83, 0x14, 0xe4, 0xc3, 0xff, 0x35, 0x06,
-	0x09, 0xbf, 0x14, 0xf8, 0x1e, 0xc4, 0x75, 0xd3, 0xa1, 0x36, 0x17, 0xc9, 0x4e, 0x15, 0xaf, 0x5e,
-	0x30, 0x73, 0x76, 0x27, 0x88, 0x54, 0x76, 0x61, 0x5e, 0x91, 0xc4, 0xd7, 0x30, 0x1a, 0xe6, 0x29,
-	0x7b, 0x30, 0xe1, 0x2d, 0x3e, 0x26, 0x4c, 0x78, 0x2b, 0x42, 0x5c, 0xa3, 0x06, 0xe5, 0x54, 0xb6,
-	0xec, 0xc8, 0xb8, 0x5d, 0x8c, 0xa7, 0x89, 0x57, 0x60, 0x56, 0xa4, 0xf1, 0x8c, 0xda, 0x8e, 0xfb,
-	0xc5, 0xb9, 0xb9, 0x9e, 0xdc, 0x45, 0x24, 0xe5, 0x4a, 0x8f, 0x3c, 0x61, 0x29, 0x05, 0x49, 0x66,
-	0x51, 0x5b, 0xa4, 0xa2, 0x74, 0x1d, 0xae, 0x36, 0x99, 0xf9, 0xcc, 0xd0, 0x9b, 0xbc, 0xa1, 0x51,
-	0x4e, 0xe5, 0x07, 0xc0, 0x6d, 0x95, 0xd3, 0x56, 0x57, 0xf9, 0x06, 0xc1, 0x7c, 0xf0, 0x05, 0xe3,
-	0x75, 0x98, 0x3c, 0xa1, 0xfe, 0xfc, 0x89, 0x2e, 0x86, 0xab, 0x84, 0x33, 0x30, 0xe3, 0x53, 0x71,
-	0x33, 0x3d, 0x49, 0xfc, 0x23, 0xbe, 0x0d, 0x8b, 0x43, 0x7e, 0xa9, 0x26, 0xd2, 0x9a, 0x20, 0x69,
-	0xff, 0x62, 0x47, 0xca, 0x95, 0x7f, 0x10, 0xa4, 0x06, 0x26, 0x22, 0xfe, 0x04, 0xd2, 0x62, 0x92,
-	0x36, 0x99, 0xe9, 0xe8, 0x0e, 0xa7, 0x66, 0xb3, 0x2b, 0x9a, 0xcb, 0x7c, 0x71, 0x63, 0xd4, 0x34,
-	0x15, 0xbf, 0xcb, 0x7d, 0xdc, 0xee, 0x04, 0x59, 0xb0, 0x83, 0xa2, 0xe1, 0xb6, 0x15, 0x0b, 0x69,
-	0x5b, 0xca, 0x1e, 0x2c, 0x0c, 0x59, 0xc2, 0x39, 0xb8, 0x46, 0x2a, 0xdb, 0x3b, 0x8d, 0x72, 0xbd,
-	0x76, 0x50, 0x3d, 0x38, 0xac, 0xd4, 0xca, 0x1f, 0x0d, 0x35, 0x24, 0x80, 0xf8, 0xc1, 0x21, 0xa9,
-	0xd7, 0x1e, 0xa5, 0x11, 0x9e, 0x85, 0x44, 0xe5, 0xa8, 0x52, 0x3b, 0x7c, 0x22, 0x1a, 0x10, 0x86,
-	0xf4, 0x40, 0x30, 0xde, 0xa8, 0xfd, 0x3e, 0x06, 0xf8, 0xfc, 0xf0, 0xc1, 0x04, 0x40, 0x04, 0xff,
-	0xb9, 0xad, 0x73, 0x2a, 0x27, 0xee, 0xe6, 0x98, 0x93, 0x4b, 0x44, 0xff, 0x81, 0x0b, 0xdc, 0x9d,
-	0x20, 0x49, 0xdb, 0x3f, 0xe0, 0x3a, 0x24, 0xbd, 0xd5, 0xc4, 0x34, 0xfc, 0x39, 0xbc, 0x71, 0x19,
-	0x93, 0x75, 0xd3, 0x10, 0x4b, 0x83, 0x2d, 0x7f, 0x67, 0xdf, 0x85, 0x64, 0xcf, 0x15, 0xde, 0x84,
-	0x65, 0xcb, 0xa6, 0x67, 0x3a, 0xeb, 0x38, 0x8d, 0xf3, 0x33, 0x6b, 0xc9, 0xbf, 0x1b, 0xb0, 0x9d,
-	0x05, 0x48, 0xf8, 0x76, 0x4b, 0x71, 0x6f, 0x04, 0x15, 0xff, 0x9e, 0x81, 0xe4, 0x8e, 0x4f, 0x06,
-	0x3f, 0x87, 0xb8, 0xb7, 0x83, 0x62, 0x25, 0x94, 0x69, 0x60, 0x89, 0xce, 0xae, 0x5c, 0xa8, 0x23,
-	0x7b, 0xc4, 0xed, 0xaf, 0xff, 0xfc, 0xeb, 0xc7, 0xd8, 0xaa, 0x92, 0x73, 0x97, 0x72, 0xd9, 0x9f,
-	0x9c, 0xc2, 0x97, 0xfd, 0xde, 0xf5, 0xd5, 0x7d, 0x43, 0x20, 0xee, 0xa3, 0x75, 0xfc, 0x1d, 0x82,
-	0x84, 0xbf, 0x08, 0xe1, 0x9b, 0xe1, 0xcf, 0x2e, 0xb8, 0x64, 0x66, 0x57, 0x47, 0x68, 0x49, 0x1a,
-	0x77, 0x05, 0x8d, 0x5b, 0x8a, 0x12, 0x4d, 0xc3, 0x96, 0x18, 0x97, 0xc8, 0x4f, 0x08, 0xd2, 0xc3,
-	0x9b, 0x07, 0xbe, 0x13, 0xea, 0x2a, 0x62, 0x69, 0xca, 0xde, 0x1d, 0x53, 0x5b, 0x12, 0xbc, 0x27,
-	0x08, 0x16, 0x94, 0xf5, 0x68, 0x82, 0xc7, 0x43, 0x58, 0x97, 0xe8, 0x73, 0x88, 0x7b, 0xb3, 0x34,
-	0xa2, 0x62, 0x81, 0x35, 0x22, 0xa2, 0x62, 0xc1, 0x61, 0x3c, 0x4e, 0xc5, 0x9a, 0x02, 0xd1, 0xab,
-	0x98, 0x5c, 0x88, 0xa2, 0x2a, 0x16, 0xdc, 0xc1, 0xa2, 0x2a, 0x36, 0xbc, 0x55, 0x8d, 0x53, 0x31,
-	0x89, 0x71, 0x89, 0xbc, 0x44, 0x90, 0x1a, 0x98, 0xb5, 0x38, 0x7c, 0xab, 0x3a, 0x3f, 0xf0, 0xb3,
-	0x6b, 0xa3, 0x15, 0x25, 0xa3, 0x0d, 0xc1, 0x68, 0x5d, 0x59, 0x8d, 0x66, 0xa4, 0xf6, 0x61, 0x2e,
-	0xa9, 0x1f, 0x10, 0x40, 0x7f, 0x6e, 0xe2, 0x37, 0x22, 0x1a, 0xe9, 0xd0, 0x6c, 0xcf, 0xde, 0x1a,
-	0xa9, 0x27, 0x19, 0x15, 0x04, 0xa3, 0x37, 0x95, 0x9b, 0x17, 0xe4, 0xa8, 0x87, 0xba, 0x8f, 0xd6,
-	0x4b, 0xaf, 0x10, 0x5c, 0x69, 0xb2, 0x76, 0x98, 0xfd, 0xd2, 0x7c, 0xaf, 0x0f, 0xec, 0xbb, 0xff,
-	0x9a, 0xf7, 0xd1, 0xc7, 0x0f, 0xa4, 0x5a, 0x8b, 0x19, 0xaa, 0xd9, 0xca, 0x33, 0xbb, 0x55, 0x68,
-	0x51, 0x53, 0xfc, 0xa7, 0x2e, 0x78, 0x57, 0xaa, 0xa5, 0x3b, 0x81, 0xff, 0xdd, 0x5b, 0xbd, 0xc3,
-	0xcf, 0xb1, 0xd7, 0x1e, 0x79, 0xf0, 0xb2, 0xc1, 0x3a, 0x5a, 0xbe, 0x67, 0x3d, 0x7f, 0xb4, 0xf9,
-	0x87, 0x7f, 0xf7, 0x54, 0xdc, 0x3d, 0xed, 0xdd, 0x3d, 0x3d, 0xda, 0x3c, 0x8e, 0x0b, 0x07, 0x6f,
-	0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x25, 0x27, 0xe9, 0x95, 0x51, 0x10, 0x00, 0x00,
-}
diff --git a/googleapis/datastore/v1/entity.pb.go b/googleapis/datastore/v1/entity.pb.go
index ec4b4dc84d..acf6fd5701 100644
--- a/googleapis/datastore/v1/entity.pb.go
+++ b/googleapis/datastore/v1/entity.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/entity.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
+package datastore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A partition ID identifies a grouping of entities. The grouping is always
 // by project and namespace, however the namespace ID may be empty.
@@ -56,16 +59,17 @@ func (m *PartitionId) Reset()         { *m = PartitionId{} }
 func (m *PartitionId) String() string { return proto.CompactTextString(m) }
 func (*PartitionId) ProtoMessage()    {}
 func (*PartitionId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_3e78f5f5131c3012, []int{0}
+	return fileDescriptor_ecbfdafa45100300, []int{0}
 }
+
 func (m *PartitionId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartitionId.Unmarshal(m, b)
 }
 func (m *PartitionId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartitionId.Marshal(b, m, deterministic)
 }
-func (dst *PartitionId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartitionId.Merge(dst, src)
+func (m *PartitionId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionId.Merge(m, src)
 }
 func (m *PartitionId) XXX_Size() int {
 	return xxx_messageInfo_PartitionId.Size(m)
@@ -125,16 +129,17 @@ func (m *Key) Reset()         { *m = Key{} }
 func (m *Key) String() string { return proto.CompactTextString(m) }
 func (*Key) ProtoMessage()    {}
 func (*Key) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_3e78f5f5131c3012, []int{1}
+	return fileDescriptor_ecbfdafa45100300, []int{1}
 }
+
 func (m *Key) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Key.Unmarshal(m, b)
 }
 func (m *Key) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Key.Marshal(b, m, deterministic)
 }
-func (dst *Key) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Key.Merge(dst, src)
+func (m *Key) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key.Merge(m, src)
 }
 func (m *Key) XXX_Size() int {
 	return xxx_messageInfo_Key.Size(m)
@@ -184,16 +189,17 @@ func (m *Key_PathElement) Reset()         { *m = Key_PathElement{} }
 func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }
 func (*Key_PathElement) ProtoMessage()    {}
 func (*Key_PathElement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_3e78f5f5131c3012, []int{1, 0}
+	return fileDescriptor_ecbfdafa45100300, []int{1, 0}
 }
+
 func (m *Key_PathElement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Key_PathElement.Unmarshal(m, b)
 }
 func (m *Key_PathElement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Key_PathElement.Marshal(b, m, deterministic)
 }
-func (dst *Key_PathElement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Key_PathElement.Merge(dst, src)
+func (m *Key_PathElement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key_PathElement.Merge(m, src)
 }
 func (m *Key_PathElement) XXX_Size() int {
 	return xxx_messageInfo_Key_PathElement.Size(m)
@@ -248,71 +254,14 @@ func (m *Key_PathElement) GetName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Key_PathElement) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Key_PathElement_Id)(nil),
 		(*Key_PathElement_Name)(nil),
 	}
 }
 
-func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case nil:
-	default:
-		return fmt.Errorf("Key_PathElement.IdType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Key_PathElement)
-	switch tag {
-	case 2: // id_type.id
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.IdType = &Key_PathElement_Id{int64(x)}
-		return true, err
-	case 3: // id_type.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.IdType = &Key_PathElement_Name{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An array value.
 type ArrayValue struct {
 	// Values in the array.
@@ -328,16 +277,17 @@ func (m *ArrayValue) Reset()         { *m = ArrayValue{} }
 func (m *ArrayValue) String() string { return proto.CompactTextString(m) }
 func (*ArrayValue) ProtoMessage()    {}
 func (*ArrayValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_3e78f5f5131c3012, []int{2}
+	return fileDescriptor_ecbfdafa45100300, []int{2}
 }
+
 func (m *ArrayValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ArrayValue.Unmarshal(m, b)
 }
 func (m *ArrayValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ArrayValue.Marshal(b, m, deterministic)
 }
-func (dst *ArrayValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ArrayValue.Merge(dst, src)
+func (m *ArrayValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayValue.Merge(m, src)
 }
 func (m *ArrayValue) XXX_Size() int {
 	return xxx_messageInfo_ArrayValue.Size(m)
@@ -387,16 +337,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_3e78f5f5131c3012, []int{3}
+	return fileDescriptor_ecbfdafa45100300, []int{3}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -575,9 +526,9 @@ func (m *Value) GetExcludeFromIndexes() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_NullValue)(nil),
 		(*Value_BooleanValue)(nil),
 		(*Value_IntegerValue)(nil),
@@ -592,210 +543,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_IntegerValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		b.EncodeVarint(3<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Value_TimestampValue:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case *Value_KeyValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KeyValue); err != nil {
-			return err
-		}
-	case *Value_StringValue:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BlobValue:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BlobValue)
-	case *Value_GeoPointValue:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GeoPointValue); err != nil {
-			return err
-		}
-	case *Value_EntityValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EntityValue); err != nil {
-			return err
-		}
-	case *Value_ArrayValue:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ArrayValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Value.ValueType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 11: // value_type.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 1: // value_type.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_BooleanValue{x != 0}
-		return true, err
-	case 2: // value_type.integer_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_IntegerValue{int64(x)}
-		return true, err
-	case 3: // value_type.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.ValueType = &Value_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 10: // value_type.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_TimestampValue{msg}
-		return true, err
-	case 5: // value_type.key_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Key)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_KeyValue{msg}
-		return true, err
-	case 17: // value_type.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ValueType = &Value_StringValue{x}
-		return true, err
-	case 18: // value_type.blob_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ValueType = &Value_BlobValue{x}
-		return true, err
-	case 8: // value_type.geo_point_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(latlng.LatLng)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_GeoPointValue{msg}
-		return true, err
-	case 6: // value_type.entity_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_EntityValue{msg}
-		return true, err
-	case 9: // value_type.array_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_ArrayValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_IntegerValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_KeyValue:
-		s := proto.Size(x.KeyValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_StringValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BlobValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BlobValue)))
-		n += len(x.BlobValue)
-	case *Value_GeoPointValue:
-		s := proto.Size(x.GeoPointValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_EntityValue:
-		s := proto.Size(x.EntityValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ArrayValue:
-		s := proto.Size(x.ArrayValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Datastore data object.
 //
 // An entity is limited to 1 megabyte when stored. That _roughly_
@@ -825,16 +572,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_3e78f5f5131c3012, []int{4}
+	return fileDescriptor_ecbfdafa45100300, []int{4}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -869,11 +617,9 @@ func init() {
 	proto.RegisterMapType((map[string]*Value)(nil), "google.datastore.v1.Entity.PropertiesEntry")
 }
 
-func init() {
-	proto.RegisterFile("google/datastore/v1/entity.proto", fileDescriptor_entity_3e78f5f5131c3012)
-}
+func init() { proto.RegisterFile("google/datastore/v1/entity.proto", fileDescriptor_ecbfdafa45100300) }
 
-var fileDescriptor_entity_3e78f5f5131c3012 = []byte{
+var fileDescriptor_ecbfdafa45100300 = []byte{
 	// 780 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xff, 0x6e, 0xdc, 0x44,
 	0x10, 0xc7, 0xed, 0xbb, 0x5c, 0x1a, 0x8f, 0xdd, 0xa4, 0x6c, 0x2a, 0x61, 0x02, 0x28, 0x26, 0x80,
diff --git a/googleapis/datastore/v1/query.pb.go b/googleapis/datastore/v1/query.pb.go
index f703091d15..48e363ed36 100644
--- a/googleapis/datastore/v1/query.pb.go
+++ b/googleapis/datastore/v1/query.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/query.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
+package datastore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies what data the 'entity' field contains.
 // A `ResultType` is either implied (for example, in `LookupResponse.missing`
@@ -45,6 +48,7 @@ var EntityResult_ResultType_name = map[int32]string{
 	2: "PROJECTION",
 	3: "KEY_ONLY",
 }
+
 var EntityResult_ResultType_value = map[string]int32{
 	"RESULT_TYPE_UNSPECIFIED": 0,
 	"FULL":                    1,
@@ -55,8 +59,9 @@ var EntityResult_ResultType_value = map[string]int32{
 func (x EntityResult_ResultType) String() string {
 	return proto.EnumName(EntityResult_ResultType_name, int32(x))
 }
+
 func (EntityResult_ResultType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{0, 0}
+	return fileDescriptor_927b394a72d2bc0d, []int{0, 0}
 }
 
 // The sort direction.
@@ -76,6 +81,7 @@ var PropertyOrder_Direction_name = map[int32]string{
 	1: "ASCENDING",
 	2: "DESCENDING",
 }
+
 var PropertyOrder_Direction_value = map[string]int32{
 	"DIRECTION_UNSPECIFIED": 0,
 	"ASCENDING":             1,
@@ -85,8 +91,9 @@ var PropertyOrder_Direction_value = map[string]int32{
 func (x PropertyOrder_Direction) String() string {
 	return proto.EnumName(PropertyOrder_Direction_name, int32(x))
 }
+
 func (PropertyOrder_Direction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{5, 0}
+	return fileDescriptor_927b394a72d2bc0d, []int{5, 0}
 }
 
 // A composite filter operator.
@@ -103,6 +110,7 @@ var CompositeFilter_Operator_name = map[int32]string{
 	0: "OPERATOR_UNSPECIFIED",
 	1: "AND",
 }
+
 var CompositeFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED": 0,
 	"AND":                  1,
@@ -111,8 +119,9 @@ var CompositeFilter_Operator_value = map[string]int32{
 func (x CompositeFilter_Operator) String() string {
 	return proto.EnumName(CompositeFilter_Operator_name, int32(x))
 }
+
 func (CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{7, 0}
+	return fileDescriptor_927b394a72d2bc0d, []int{7, 0}
 }
 
 // A property filter operator.
@@ -144,6 +153,7 @@ var PropertyFilter_Operator_name = map[int32]string{
 	5:  "EQUAL",
 	11: "HAS_ANCESTOR",
 }
+
 var PropertyFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED":  0,
 	"LESS_THAN":             1,
@@ -157,8 +167,9 @@ var PropertyFilter_Operator_value = map[string]int32{
 func (x PropertyFilter_Operator) String() string {
 	return proto.EnumName(PropertyFilter_Operator_name, int32(x))
 }
+
 func (PropertyFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{8, 0}
+	return fileDescriptor_927b394a72d2bc0d, []int{8, 0}
 }
 
 // The possible values for the `more_results` field.
@@ -185,6 +196,7 @@ var QueryResultBatch_MoreResultsType_name = map[int32]string{
 	4: "MORE_RESULTS_AFTER_CURSOR",
 	3: "NO_MORE_RESULTS",
 }
+
 var QueryResultBatch_MoreResultsType_value = map[string]int32{
 	"MORE_RESULTS_TYPE_UNSPECIFIED": 0,
 	"NOT_FINISHED":                  1,
@@ -196,8 +208,9 @@ var QueryResultBatch_MoreResultsType_value = map[string]int32{
 func (x QueryResultBatch_MoreResultsType) String() string {
 	return proto.EnumName(QueryResultBatch_MoreResultsType_name, int32(x))
 }
+
 func (QueryResultBatch_MoreResultsType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{11, 0}
+	return fileDescriptor_927b394a72d2bc0d, []int{11, 0}
 }
 
 // The result of fetching an entity from Datastore.
@@ -226,16 +239,17 @@ func (m *EntityResult) Reset()         { *m = EntityResult{} }
 func (m *EntityResult) String() string { return proto.CompactTextString(m) }
 func (*EntityResult) ProtoMessage()    {}
 func (*EntityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{0}
+	return fileDescriptor_927b394a72d2bc0d, []int{0}
 }
+
 func (m *EntityResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityResult.Unmarshal(m, b)
 }
 func (m *EntityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityResult.Marshal(b, m, deterministic)
 }
-func (dst *EntityResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityResult.Merge(dst, src)
+func (m *EntityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityResult.Merge(m, src)
 }
 func (m *EntityResult) XXX_Size() int {
 	return xxx_messageInfo_EntityResult.Size(m)
@@ -309,16 +323,17 @@ func (m *Query) Reset()         { *m = Query{} }
 func (m *Query) String() string { return proto.CompactTextString(m) }
 func (*Query) ProtoMessage()    {}
 func (*Query) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{1}
+	return fileDescriptor_927b394a72d2bc0d, []int{1}
 }
+
 func (m *Query) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Query.Unmarshal(m, b)
 }
 func (m *Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Query.Marshal(b, m, deterministic)
 }
-func (dst *Query) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Query.Merge(dst, src)
+func (m *Query) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Query.Merge(m, src)
 }
 func (m *Query) XXX_Size() int {
 	return xxx_messageInfo_Query.Size(m)
@@ -405,16 +420,17 @@ func (m *KindExpression) Reset()         { *m = KindExpression{} }
 func (m *KindExpression) String() string { return proto.CompactTextString(m) }
 func (*KindExpression) ProtoMessage()    {}
 func (*KindExpression) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{2}
+	return fileDescriptor_927b394a72d2bc0d, []int{2}
 }
+
 func (m *KindExpression) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KindExpression.Unmarshal(m, b)
 }
 func (m *KindExpression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KindExpression.Marshal(b, m, deterministic)
 }
-func (dst *KindExpression) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KindExpression.Merge(dst, src)
+func (m *KindExpression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KindExpression.Merge(m, src)
 }
 func (m *KindExpression) XXX_Size() int {
 	return xxx_messageInfo_KindExpression.Size(m)
@@ -446,16 +462,17 @@ func (m *PropertyReference) Reset()         { *m = PropertyReference{} }
 func (m *PropertyReference) String() string { return proto.CompactTextString(m) }
 func (*PropertyReference) ProtoMessage()    {}
 func (*PropertyReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{3}
+	return fileDescriptor_927b394a72d2bc0d, []int{3}
 }
+
 func (m *PropertyReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PropertyReference.Unmarshal(m, b)
 }
 func (m *PropertyReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PropertyReference.Marshal(b, m, deterministic)
 }
-func (dst *PropertyReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PropertyReference.Merge(dst, src)
+func (m *PropertyReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyReference.Merge(m, src)
 }
 func (m *PropertyReference) XXX_Size() int {
 	return xxx_messageInfo_PropertyReference.Size(m)
@@ -486,16 +503,17 @@ func (m *Projection) Reset()         { *m = Projection{} }
 func (m *Projection) String() string { return proto.CompactTextString(m) }
 func (*Projection) ProtoMessage()    {}
 func (*Projection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{4}
+	return fileDescriptor_927b394a72d2bc0d, []int{4}
 }
+
 func (m *Projection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Projection.Unmarshal(m, b)
 }
 func (m *Projection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Projection.Marshal(b, m, deterministic)
 }
-func (dst *Projection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Projection.Merge(dst, src)
+func (m *Projection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Projection.Merge(m, src)
 }
 func (m *Projection) XXX_Size() int {
 	return xxx_messageInfo_Projection.Size(m)
@@ -528,16 +546,17 @@ func (m *PropertyOrder) Reset()         { *m = PropertyOrder{} }
 func (m *PropertyOrder) String() string { return proto.CompactTextString(m) }
 func (*PropertyOrder) ProtoMessage()    {}
 func (*PropertyOrder) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{5}
+	return fileDescriptor_927b394a72d2bc0d, []int{5}
 }
+
 func (m *PropertyOrder) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PropertyOrder.Unmarshal(m, b)
 }
 func (m *PropertyOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PropertyOrder.Marshal(b, m, deterministic)
 }
-func (dst *PropertyOrder) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PropertyOrder.Merge(dst, src)
+func (m *PropertyOrder) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyOrder.Merge(m, src)
 }
 func (m *PropertyOrder) XXX_Size() int {
 	return xxx_messageInfo_PropertyOrder.Size(m)
@@ -579,16 +598,17 @@ func (m *Filter) Reset()         { *m = Filter{} }
 func (m *Filter) String() string { return proto.CompactTextString(m) }
 func (*Filter) ProtoMessage()    {}
 func (*Filter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{6}
+	return fileDescriptor_927b394a72d2bc0d, []int{6}
 }
+
 func (m *Filter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Filter.Unmarshal(m, b)
 }
 func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Filter.Marshal(b, m, deterministic)
 }
-func (dst *Filter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Filter.Merge(dst, src)
+func (m *Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Filter.Merge(m, src)
 }
 func (m *Filter) XXX_Size() int {
 	return xxx_messageInfo_Filter.Size(m)
@@ -636,80 +656,14 @@ func (m *Filter) GetPropertyFilter() *PropertyFilter {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Filter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Filter_OneofMarshaler, _Filter_OneofUnmarshaler, _Filter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Filter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Filter_CompositeFilter)(nil),
 		(*Filter_PropertyFilter)(nil),
 	}
 }
 
-func _Filter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *Filter_CompositeFilter:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CompositeFilter); err != nil {
-			return err
-		}
-	case *Filter_PropertyFilter:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PropertyFilter); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Filter.FilterType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Filter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Filter)
-	switch tag {
-	case 1: // filter_type.composite_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CompositeFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &Filter_CompositeFilter{msg}
-		return true, err
-	case 2: // filter_type.property_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PropertyFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &Filter_PropertyFilter{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Filter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *Filter_CompositeFilter:
-		s := proto.Size(x.CompositeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Filter_PropertyFilter:
-		s := proto.Size(x.PropertyFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A filter that merges multiple other filters using the given operator.
 type CompositeFilter struct {
 	// The operator for combining multiple filters.
@@ -726,16 +680,17 @@ func (m *CompositeFilter) Reset()         { *m = CompositeFilter{} }
 func (m *CompositeFilter) String() string { return proto.CompactTextString(m) }
 func (*CompositeFilter) ProtoMessage()    {}
 func (*CompositeFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{7}
+	return fileDescriptor_927b394a72d2bc0d, []int{7}
 }
+
 func (m *CompositeFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompositeFilter.Unmarshal(m, b)
 }
 func (m *CompositeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompositeFilter.Marshal(b, m, deterministic)
 }
-func (dst *CompositeFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompositeFilter.Merge(dst, src)
+func (m *CompositeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompositeFilter.Merge(m, src)
 }
 func (m *CompositeFilter) XXX_Size() int {
 	return xxx_messageInfo_CompositeFilter.Size(m)
@@ -777,16 +732,17 @@ func (m *PropertyFilter) Reset()         { *m = PropertyFilter{} }
 func (m *PropertyFilter) String() string { return proto.CompactTextString(m) }
 func (*PropertyFilter) ProtoMessage()    {}
 func (*PropertyFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{8}
+	return fileDescriptor_927b394a72d2bc0d, []int{8}
 }
+
 func (m *PropertyFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PropertyFilter.Unmarshal(m, b)
 }
 func (m *PropertyFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PropertyFilter.Marshal(b, m, deterministic)
 }
-func (dst *PropertyFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PropertyFilter.Merge(dst, src)
+func (m *PropertyFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyFilter.Merge(m, src)
 }
 func (m *PropertyFilter) XXX_Size() int {
 	return xxx_messageInfo_PropertyFilter.Size(m)
@@ -850,16 +806,17 @@ func (m *GqlQuery) Reset()         { *m = GqlQuery{} }
 func (m *GqlQuery) String() string { return proto.CompactTextString(m) }
 func (*GqlQuery) ProtoMessage()    {}
 func (*GqlQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{9}
+	return fileDescriptor_927b394a72d2bc0d, []int{9}
 }
+
 func (m *GqlQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GqlQuery.Unmarshal(m, b)
 }
 func (m *GqlQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GqlQuery.Marshal(b, m, deterministic)
 }
-func (dst *GqlQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GqlQuery.Merge(dst, src)
+func (m *GqlQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQuery.Merge(m, src)
 }
 func (m *GqlQuery) XXX_Size() int {
 	return xxx_messageInfo_GqlQuery.Size(m)
@@ -915,16 +872,17 @@ func (m *GqlQueryParameter) Reset()         { *m = GqlQueryParameter{} }
 func (m *GqlQueryParameter) String() string { return proto.CompactTextString(m) }
 func (*GqlQueryParameter) ProtoMessage()    {}
 func (*GqlQueryParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{10}
+	return fileDescriptor_927b394a72d2bc0d, []int{10}
 }
+
 func (m *GqlQueryParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GqlQueryParameter.Unmarshal(m, b)
 }
 func (m *GqlQueryParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GqlQueryParameter.Marshal(b, m, deterministic)
 }
-func (dst *GqlQueryParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GqlQueryParameter.Merge(dst, src)
+func (m *GqlQueryParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQueryParameter.Merge(m, src)
 }
 func (m *GqlQueryParameter) XXX_Size() int {
 	return xxx_messageInfo_GqlQueryParameter.Size(m)
@@ -972,76 +930,14 @@ func (m *GqlQueryParameter) GetCursor() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GqlQueryParameter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GqlQueryParameter_OneofMarshaler, _GqlQueryParameter_OneofUnmarshaler, _GqlQueryParameter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GqlQueryParameter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GqlQueryParameter_Value)(nil),
 		(*GqlQueryParameter_Cursor)(nil),
 	}
 }
 
-func _GqlQueryParameter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GqlQueryParameter)
-	// parameter_type
-	switch x := m.ParameterType.(type) {
-	case *GqlQueryParameter_Value:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Value); err != nil {
-			return err
-		}
-	case *GqlQueryParameter_Cursor:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Cursor)
-	case nil:
-	default:
-		return fmt.Errorf("GqlQueryParameter.ParameterType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GqlQueryParameter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GqlQueryParameter)
-	switch tag {
-	case 2: // parameter_type.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.ParameterType = &GqlQueryParameter_Value{msg}
-		return true, err
-	case 3: // parameter_type.cursor
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ParameterType = &GqlQueryParameter_Cursor{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GqlQueryParameter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GqlQueryParameter)
-	// parameter_type
-	switch x := m.ParameterType.(type) {
-	case *GqlQueryParameter_Value:
-		s := proto.Size(x.Value)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GqlQueryParameter_Cursor:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Cursor)))
-		n += len(x.Cursor)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A batch of results produced by a query.
 type QueryResultBatch struct {
 	// The number of results skipped, typically because of an offset.
@@ -1076,16 +972,17 @@ func (m *QueryResultBatch) Reset()         { *m = QueryResultBatch{} }
 func (m *QueryResultBatch) String() string { return proto.CompactTextString(m) }
 func (*QueryResultBatch) ProtoMessage()    {}
 func (*QueryResultBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_e7d74dc9c1327cf5, []int{11}
+	return fileDescriptor_927b394a72d2bc0d, []int{11}
 }
+
 func (m *QueryResultBatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryResultBatch.Unmarshal(m, b)
 }
 func (m *QueryResultBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryResultBatch.Marshal(b, m, deterministic)
 }
-func (dst *QueryResultBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryResultBatch.Merge(dst, src)
+func (m *QueryResultBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResultBatch.Merge(m, src)
 }
 func (m *QueryResultBatch) XXX_Size() int {
 	return xxx_messageInfo_QueryResultBatch.Size(m)
@@ -1146,6 +1043,11 @@ func (m *QueryResultBatch) GetSnapshotVersion() int64 {
 }
 
 func init() {
+	proto.RegisterEnum("google.datastore.v1.EntityResult_ResultType", EntityResult_ResultType_name, EntityResult_ResultType_value)
+	proto.RegisterEnum("google.datastore.v1.PropertyOrder_Direction", PropertyOrder_Direction_name, PropertyOrder_Direction_value)
+	proto.RegisterEnum("google.datastore.v1.CompositeFilter_Operator", CompositeFilter_Operator_name, CompositeFilter_Operator_value)
+	proto.RegisterEnum("google.datastore.v1.PropertyFilter_Operator", PropertyFilter_Operator_name, PropertyFilter_Operator_value)
+	proto.RegisterEnum("google.datastore.v1.QueryResultBatch_MoreResultsType", QueryResultBatch_MoreResultsType_name, QueryResultBatch_MoreResultsType_value)
 	proto.RegisterType((*EntityResult)(nil), "google.datastore.v1.EntityResult")
 	proto.RegisterType((*Query)(nil), "google.datastore.v1.Query")
 	proto.RegisterType((*KindExpression)(nil), "google.datastore.v1.KindExpression")
@@ -1159,18 +1061,11 @@ func init() {
 	proto.RegisterMapType((map[string]*GqlQueryParameter)(nil), "google.datastore.v1.GqlQuery.NamedBindingsEntry")
 	proto.RegisterType((*GqlQueryParameter)(nil), "google.datastore.v1.GqlQueryParameter")
 	proto.RegisterType((*QueryResultBatch)(nil), "google.datastore.v1.QueryResultBatch")
-	proto.RegisterEnum("google.datastore.v1.EntityResult_ResultType", EntityResult_ResultType_name, EntityResult_ResultType_value)
-	proto.RegisterEnum("google.datastore.v1.PropertyOrder_Direction", PropertyOrder_Direction_name, PropertyOrder_Direction_value)
-	proto.RegisterEnum("google.datastore.v1.CompositeFilter_Operator", CompositeFilter_Operator_name, CompositeFilter_Operator_value)
-	proto.RegisterEnum("google.datastore.v1.PropertyFilter_Operator", PropertyFilter_Operator_name, PropertyFilter_Operator_value)
-	proto.RegisterEnum("google.datastore.v1.QueryResultBatch_MoreResultsType", QueryResultBatch_MoreResultsType_name, QueryResultBatch_MoreResultsType_value)
 }
 
-func init() {
-	proto.RegisterFile("google/datastore/v1/query.proto", fileDescriptor_query_e7d74dc9c1327cf5)
-}
+func init() { proto.RegisterFile("google/datastore/v1/query.proto", fileDescriptor_927b394a72d2bc0d) }
 
-var fileDescriptor_query_e7d74dc9c1327cf5 = []byte{
+var fileDescriptor_927b394a72d2bc0d = []byte{
 	// 1313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x72, 0xd3, 0x46,
 	0x14, 0x8e, 0x64, 0x3b, 0x89, 0x8f, 0xff, 0xc4, 0xd2, 0x82, 0x08, 0x50, 0x12, 0x41, 0x4b, 0x3a,
diff --git a/googleapis/datastore/v1beta3/datastore.pb.go b/googleapis/datastore/v1beta3/datastore.pb.go
index e4a2a3c75e..d4d8eee33f 100644
--- a/googleapis/datastore/v1beta3/datastore.pb.go
+++ b/googleapis/datastore/v1beta3/datastore.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/datastore.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package datastore
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The modes available for commits.
 type CommitRequest_Mode int32
@@ -43,6 +43,7 @@ var CommitRequest_Mode_name = map[int32]string{
 	1: "TRANSACTIONAL",
 	2: "NON_TRANSACTIONAL",
 }
+
 var CommitRequest_Mode_value = map[string]int32{
 	"MODE_UNSPECIFIED":  0,
 	"TRANSACTIONAL":     1,
@@ -52,8 +53,9 @@ var CommitRequest_Mode_value = map[string]int32{
 func (x CommitRequest_Mode) String() string {
 	return proto.EnumName(CommitRequest_Mode_name, int32(x))
 }
+
 func (CommitRequest_Mode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{8, 0}
+	return fileDescriptor_3be32184765753d5, []int{8, 0}
 }
 
 // The possible values for read consistencies.
@@ -73,6 +75,7 @@ var ReadOptions_ReadConsistency_name = map[int32]string{
 	1: "STRONG",
 	2: "EVENTUAL",
 }
+
 var ReadOptions_ReadConsistency_value = map[string]int32{
 	"READ_CONSISTENCY_UNSPECIFIED": 0,
 	"STRONG":                       1,
@@ -82,8 +85,9 @@ var ReadOptions_ReadConsistency_value = map[string]int32{
 func (x ReadOptions_ReadConsistency) String() string {
 	return proto.EnumName(ReadOptions_ReadConsistency_name, int32(x))
 }
+
 func (ReadOptions_ReadConsistency) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{16, 0}
+	return fileDescriptor_3be32184765753d5, []int{16, 0}
 }
 
 // The request for
@@ -104,16 +108,17 @@ func (m *LookupRequest) Reset()         { *m = LookupRequest{} }
 func (m *LookupRequest) String() string { return proto.CompactTextString(m) }
 func (*LookupRequest) ProtoMessage()    {}
 func (*LookupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{0}
+	return fileDescriptor_3be32184765753d5, []int{0}
 }
+
 func (m *LookupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LookupRequest.Unmarshal(m, b)
 }
 func (m *LookupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LookupRequest.Marshal(b, m, deterministic)
 }
-func (dst *LookupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LookupRequest.Merge(dst, src)
+func (m *LookupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupRequest.Merge(m, src)
 }
 func (m *LookupRequest) XXX_Size() int {
 	return xxx_messageInfo_LookupRequest.Size(m)
@@ -169,16 +174,17 @@ func (m *LookupResponse) Reset()         { *m = LookupResponse{} }
 func (m *LookupResponse) String() string { return proto.CompactTextString(m) }
 func (*LookupResponse) ProtoMessage()    {}
 func (*LookupResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{1}
+	return fileDescriptor_3be32184765753d5, []int{1}
 }
+
 func (m *LookupResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LookupResponse.Unmarshal(m, b)
 }
 func (m *LookupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LookupResponse.Marshal(b, m, deterministic)
 }
-func (dst *LookupResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LookupResponse.Merge(dst, src)
+func (m *LookupResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupResponse.Merge(m, src)
 }
 func (m *LookupResponse) XXX_Size() int {
 	return xxx_messageInfo_LookupResponse.Size(m)
@@ -237,16 +243,17 @@ func (m *RunQueryRequest) Reset()         { *m = RunQueryRequest{} }
 func (m *RunQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*RunQueryRequest) ProtoMessage()    {}
 func (*RunQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{2}
+	return fileDescriptor_3be32184765753d5, []int{2}
 }
+
 func (m *RunQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryRequest.Unmarshal(m, b)
 }
 func (m *RunQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryRequest.Merge(dst, src)
+func (m *RunQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryRequest.Merge(m, src)
 }
 func (m *RunQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_RunQueryRequest.Size(m)
@@ -315,80 +322,14 @@ func (m *RunQueryRequest) GetGqlQuery() *GqlQuery {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RunQueryRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RunQueryRequest_OneofMarshaler, _RunQueryRequest_OneofUnmarshaler, _RunQueryRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RunQueryRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RunQueryRequest_Query)(nil),
 		(*RunQueryRequest_GqlQuery)(nil),
 	}
 }
 
-func _RunQueryRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_Query:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Query); err != nil {
-			return err
-		}
-	case *RunQueryRequest_GqlQuery:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GqlQuery); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RunQueryRequest.QueryType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RunQueryRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RunQueryRequest)
-	switch tag {
-	case 3: // query_type.query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Query)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &RunQueryRequest_Query{msg}
-		return true, err
-	case 7: // query_type.gql_query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GqlQuery)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &RunQueryRequest_GqlQuery{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_Query:
-		s := proto.Size(x.Query)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RunQueryRequest_GqlQuery:
-		s := proto.Size(x.GqlQuery)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for
 // [Datastore.RunQuery][google.datastore.v1beta3.Datastore.RunQuery].
 type RunQueryResponse struct {
@@ -405,16 +346,17 @@ func (m *RunQueryResponse) Reset()         { *m = RunQueryResponse{} }
 func (m *RunQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*RunQueryResponse) ProtoMessage()    {}
 func (*RunQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{3}
+	return fileDescriptor_3be32184765753d5, []int{3}
 }
+
 func (m *RunQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryResponse.Unmarshal(m, b)
 }
 func (m *RunQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryResponse.Merge(dst, src)
+func (m *RunQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryResponse.Merge(m, src)
 }
 func (m *RunQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_RunQueryResponse.Size(m)
@@ -455,16 +397,17 @@ func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest
 func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionRequest) ProtoMessage()    {}
 func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{4}
+	return fileDescriptor_3be32184765753d5, []int{4}
 }
+
 func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
 }
 func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+func (m *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(m, src)
 }
 func (m *BeginTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionRequest.Size(m)
@@ -503,16 +446,17 @@ func (m *BeginTransactionResponse) Reset()         { *m = BeginTransactionRespon
 func (m *BeginTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionResponse) ProtoMessage()    {}
 func (*BeginTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{5}
+	return fileDescriptor_3be32184765753d5, []int{5}
 }
+
 func (m *BeginTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionResponse.Unmarshal(m, b)
 }
 func (m *BeginTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionResponse.Merge(dst, src)
+func (m *BeginTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionResponse.Merge(m, src)
 }
 func (m *BeginTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionResponse.Size(m)
@@ -547,16 +491,17 @@ func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
 func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackRequest) ProtoMessage()    {}
 func (*RollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{6}
+	return fileDescriptor_3be32184765753d5, []int{6}
 }
+
 func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
 }
 func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+func (m *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(m, src)
 }
 func (m *RollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackRequest.Size(m)
@@ -594,16 +539,17 @@ func (m *RollbackResponse) Reset()         { *m = RollbackResponse{} }
 func (m *RollbackResponse) String() string { return proto.CompactTextString(m) }
 func (*RollbackResponse) ProtoMessage()    {}
 func (*RollbackResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{7}
+	return fileDescriptor_3be32184765753d5, []int{7}
 }
+
 func (m *RollbackResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackResponse.Unmarshal(m, b)
 }
 func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic)
 }
-func (dst *RollbackResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackResponse.Merge(dst, src)
+func (m *RollbackResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackResponse.Merge(m, src)
 }
 func (m *RollbackResponse) XXX_Size() int {
 	return xxx_messageInfo_RollbackResponse.Size(m)
@@ -649,16 +595,17 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{8}
+	return fileDescriptor_3be32184765753d5, []int{8}
 }
+
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(dst, src)
+func (m *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(m, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -714,57 +661,13 @@ func (m *CommitRequest) GetMutations() []*Mutation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CommitRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CommitRequest_OneofMarshaler, _CommitRequest_OneofUnmarshaler, _CommitRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CommitRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CommitRequest_Transaction)(nil),
 	}
 }
 
-func _CommitRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CommitRequest)
-	// transaction_selector
-	switch x := m.TransactionSelector.(type) {
-	case *CommitRequest_Transaction:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case nil:
-	default:
-		return fmt.Errorf("CommitRequest.TransactionSelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CommitRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CommitRequest)
-	switch tag {
-	case 1: // transaction_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.TransactionSelector = &CommitRequest_Transaction{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CommitRequest)
-	// transaction_selector
-	switch x := m.TransactionSelector.(type) {
-	case *CommitRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for
 // [Datastore.Commit][google.datastore.v1beta3.Datastore.Commit].
 type CommitResponse struct {
@@ -783,16 +686,17 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{9}
+	return fileDescriptor_3be32184765753d5, []int{9}
 }
+
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(dst, src)
+func (m *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(m, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -834,16 +738,17 @@ func (m *AllocateIdsRequest) Reset()         { *m = AllocateIdsRequest{} }
 func (m *AllocateIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*AllocateIdsRequest) ProtoMessage()    {}
 func (*AllocateIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{10}
+	return fileDescriptor_3be32184765753d5, []int{10}
 }
+
 func (m *AllocateIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocateIdsRequest.Unmarshal(m, b)
 }
 func (m *AllocateIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocateIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *AllocateIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocateIdsRequest.Merge(dst, src)
+func (m *AllocateIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsRequest.Merge(m, src)
 }
 func (m *AllocateIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_AllocateIdsRequest.Size(m)
@@ -883,16 +788,17 @@ func (m *AllocateIdsResponse) Reset()         { *m = AllocateIdsResponse{} }
 func (m *AllocateIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*AllocateIdsResponse) ProtoMessage()    {}
 func (*AllocateIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{11}
+	return fileDescriptor_3be32184765753d5, []int{11}
 }
+
 func (m *AllocateIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AllocateIdsResponse.Unmarshal(m, b)
 }
 func (m *AllocateIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AllocateIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *AllocateIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AllocateIdsResponse.Merge(dst, src)
+func (m *AllocateIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsResponse.Merge(m, src)
 }
 func (m *AllocateIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_AllocateIdsResponse.Size(m)
@@ -929,16 +835,17 @@ func (m *ReserveIdsRequest) Reset()         { *m = ReserveIdsRequest{} }
 func (m *ReserveIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*ReserveIdsRequest) ProtoMessage()    {}
 func (*ReserveIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{12}
+	return fileDescriptor_3be32184765753d5, []int{12}
 }
+
 func (m *ReserveIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReserveIdsRequest.Unmarshal(m, b)
 }
 func (m *ReserveIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReserveIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReserveIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReserveIdsRequest.Merge(dst, src)
+func (m *ReserveIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsRequest.Merge(m, src)
 }
 func (m *ReserveIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_ReserveIdsRequest.Size(m)
@@ -982,16 +889,17 @@ func (m *ReserveIdsResponse) Reset()         { *m = ReserveIdsResponse{} }
 func (m *ReserveIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*ReserveIdsResponse) ProtoMessage()    {}
 func (*ReserveIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{13}
+	return fileDescriptor_3be32184765753d5, []int{13}
 }
+
 func (m *ReserveIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReserveIdsResponse.Unmarshal(m, b)
 }
 func (m *ReserveIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReserveIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReserveIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReserveIdsResponse.Merge(dst, src)
+func (m *ReserveIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsResponse.Merge(m, src)
 }
 func (m *ReserveIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_ReserveIdsResponse.Size(m)
@@ -1035,16 +943,17 @@ func (m *Mutation) Reset()         { *m = Mutation{} }
 func (m *Mutation) String() string { return proto.CompactTextString(m) }
 func (*Mutation) ProtoMessage()    {}
 func (*Mutation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{14}
+	return fileDescriptor_3be32184765753d5, []int{14}
 }
+
 func (m *Mutation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation.Unmarshal(m, b)
 }
 func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
 }
-func (dst *Mutation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation.Merge(dst, src)
+func (m *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(m, src)
 }
 func (m *Mutation) XXX_Size() int {
 	return xxx_messageInfo_Mutation.Size(m)
@@ -1142,9 +1051,9 @@ func (m *Mutation) GetBaseVersion() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Mutation_OneofMarshaler, _Mutation_OneofUnmarshaler, _Mutation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Mutation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Mutation_Insert)(nil),
 		(*Mutation_Update)(nil),
 		(*Mutation_Upsert)(nil),
@@ -1153,133 +1062,6 @@ func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _Mutation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Mutation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Mutation_Insert:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Insert); err != nil {
-			return err
-		}
-	case *Mutation_Update:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *Mutation_Upsert:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Upsert); err != nil {
-			return err
-		}
-	case *Mutation_Delete:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Delete); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Mutation.Operation has unexpected type %T", x)
-	}
-	// conflict_detection_strategy
-	switch x := m.ConflictDetectionStrategy.(type) {
-	case *Mutation_BaseVersion:
-		b.EncodeVarint(8<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.BaseVersion))
-	case nil:
-	default:
-		return fmt.Errorf("Mutation.ConflictDetectionStrategy has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Mutation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Mutation)
-	switch tag {
-	case 4: // operation.insert
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Insert{msg}
-		return true, err
-	case 5: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Update{msg}
-		return true, err
-	case 6: // operation.upsert
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Upsert{msg}
-		return true, err
-	case 7: // operation.delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Key)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Delete{msg}
-		return true, err
-	case 8: // conflict_detection_strategy.base_version
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConflictDetectionStrategy = &Mutation_BaseVersion{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Mutation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Mutation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Mutation_Insert:
-		s := proto.Size(x.Insert)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Upsert:
-		s := proto.Size(x.Upsert)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Delete:
-		s := proto.Size(x.Delete)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// conflict_detection_strategy
-	switch x := m.ConflictDetectionStrategy.(type) {
-	case *Mutation_BaseVersion:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.BaseVersion))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The result of applying a mutation.
 type MutationResult struct {
 	// The automatically allocated key.
@@ -1303,16 +1085,17 @@ func (m *MutationResult) Reset()         { *m = MutationResult{} }
 func (m *MutationResult) String() string { return proto.CompactTextString(m) }
 func (*MutationResult) ProtoMessage()    {}
 func (*MutationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{15}
+	return fileDescriptor_3be32184765753d5, []int{15}
 }
+
 func (m *MutationResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutationResult.Unmarshal(m, b)
 }
 func (m *MutationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutationResult.Marshal(b, m, deterministic)
 }
-func (dst *MutationResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutationResult.Merge(dst, src)
+func (m *MutationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutationResult.Merge(m, src)
 }
 func (m *MutationResult) XXX_Size() int {
 	return xxx_messageInfo_MutationResult.Size(m)
@@ -1363,16 +1146,17 @@ func (m *ReadOptions) Reset()         { *m = ReadOptions{} }
 func (m *ReadOptions) String() string { return proto.CompactTextString(m) }
 func (*ReadOptions) ProtoMessage()    {}
 func (*ReadOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{16}
+	return fileDescriptor_3be32184765753d5, []int{16}
 }
+
 func (m *ReadOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadOptions.Unmarshal(m, b)
 }
 func (m *ReadOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadOptions.Marshal(b, m, deterministic)
 }
-func (dst *ReadOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadOptions.Merge(dst, src)
+func (m *ReadOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadOptions.Merge(m, src)
 }
 func (m *ReadOptions) XXX_Size() int {
 	return xxx_messageInfo_ReadOptions.Size(m)
@@ -1420,71 +1204,14 @@ func (m *ReadOptions) GetTransaction() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ReadOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ReadOptions_OneofMarshaler, _ReadOptions_OneofUnmarshaler, _ReadOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ReadOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ReadOptions_ReadConsistency_)(nil),
 		(*ReadOptions_Transaction)(nil),
 	}
 }
 
-func _ReadOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ReadOptions)
-	// consistency_type
-	switch x := m.ConsistencyType.(type) {
-	case *ReadOptions_ReadConsistency_:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ReadConsistency))
-	case *ReadOptions_Transaction:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case nil:
-	default:
-		return fmt.Errorf("ReadOptions.ConsistencyType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ReadOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ReadOptions)
-	switch tag {
-	case 1: // consistency_type.read_consistency
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConsistencyType = &ReadOptions_ReadConsistency_{ReadOptions_ReadConsistency(x)}
-		return true, err
-	case 2: // consistency_type.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencyType = &ReadOptions_Transaction{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ReadOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ReadOptions)
-	// consistency_type
-	switch x := m.ConsistencyType.(type) {
-	case *ReadOptions_ReadConsistency_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ReadConsistency))
-	case *ReadOptions_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options for beginning a new transaction.
 //
 // Transactions can be created explicitly with calls to
@@ -1509,16 +1236,17 @@ func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
 func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions) ProtoMessage()    {}
 func (*TransactionOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{17}
+	return fileDescriptor_3be32184765753d5, []int{17}
 }
+
 func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
 }
 func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+func (m *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(m, src)
 }
 func (m *TransactionOptions) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions.Size(m)
@@ -1566,80 +1294,14 @@ func (m *TransactionOptions) GetReadOnly() *TransactionOptions_ReadOnly {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_OneofMarshaler, _TransactionOptions_OneofUnmarshaler, _TransactionOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadWrite_)(nil),
 		(*TransactionOptions_ReadOnly_)(nil),
 	}
 }
 
-func _TransactionOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadWrite_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadWrite); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadOnly_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadOnly); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions.Mode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions)
-	switch tag {
-	case 1: // mode.read_write
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadWrite)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadWrite_{msg}
-		return true, err
-	case 2: // mode.read_only
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadOnly)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadOnly_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadWrite_:
-		s := proto.Size(x.ReadWrite)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadOnly_:
-		s := proto.Size(x.ReadOnly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options specific to read / write transactions.
 type TransactionOptions_ReadWrite struct {
 	// The transaction identifier of the transaction being retried.
@@ -1653,16 +1315,17 @@ func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions
 func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
 func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{17, 0}
+	return fileDescriptor_3be32184765753d5, []int{17, 0}
 }
+
 func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+func (m *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(m, src)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
@@ -1691,16 +1354,17 @@ func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_
 func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
 func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datastore_062a2d11f20b0b0e, []int{17, 1}
+	return fileDescriptor_3be32184765753d5, []int{17, 1}
 }
+
 func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+func (m *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(m, src)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
@@ -1712,6 +1376,8 @@ func (m *TransactionOptions_ReadOnly) XXX_DiscardUnknown() {
 var xxx_messageInfo_TransactionOptions_ReadOnly proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("google.datastore.v1beta3.CommitRequest_Mode", CommitRequest_Mode_name, CommitRequest_Mode_value)
+	proto.RegisterEnum("google.datastore.v1beta3.ReadOptions_ReadConsistency", ReadOptions_ReadConsistency_name, ReadOptions_ReadConsistency_value)
 	proto.RegisterType((*LookupRequest)(nil), "google.datastore.v1beta3.LookupRequest")
 	proto.RegisterType((*LookupResponse)(nil), "google.datastore.v1beta3.LookupResponse")
 	proto.RegisterType((*RunQueryRequest)(nil), "google.datastore.v1beta3.RunQueryRequest")
@@ -1732,8 +1398,102 @@ func init() {
 	proto.RegisterType((*TransactionOptions)(nil), "google.datastore.v1beta3.TransactionOptions")
 	proto.RegisterType((*TransactionOptions_ReadWrite)(nil), "google.datastore.v1beta3.TransactionOptions.ReadWrite")
 	proto.RegisterType((*TransactionOptions_ReadOnly)(nil), "google.datastore.v1beta3.TransactionOptions.ReadOnly")
-	proto.RegisterEnum("google.datastore.v1beta3.CommitRequest_Mode", CommitRequest_Mode_name, CommitRequest_Mode_value)
-	proto.RegisterEnum("google.datastore.v1beta3.ReadOptions_ReadConsistency", ReadOptions_ReadConsistency_name, ReadOptions_ReadConsistency_value)
+}
+
+func init() {
+	proto.RegisterFile("google/datastore/v1beta3/datastore.proto", fileDescriptor_3be32184765753d5)
+}
+
+var fileDescriptor_3be32184765753d5 = []byte{
+	// 1403 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5,
+	0x17, 0xcf, 0x38, 0x89, 0x6b, 0x3f, 0xe7, 0x87, 0x33, 0xcd, 0xf7, 0x8b, 0x65, 0x5a, 0x6a, 0x6d,
+	0x29, 0x75, 0xd3, 0x62, 0x13, 0xb7, 0xa1, 0x22, 0x54, 0x28, 0xb6, 0xe3, 0xd6, 0x16, 0x8d, 0x1d,
+	0x26, 0x6e, 0x2a, 0x50, 0x91, 0xb5, 0xf6, 0x4e, 0xcc, 0x92, 0xf5, 0xce, 0x66, 0x77, 0x1c, 0x88,
+	0x10, 0x17, 0x0e, 0x08, 0x81, 0x38, 0x21, 0xd4, 0x13, 0x07, 0xae, 0x70, 0x2e, 0x7f, 0x03, 0x02,
+	0x89, 0x0b, 0x07, 0xfe, 0x01, 0xfe, 0x08, 0x8e, 0x68, 0x67, 0x67, 0xfd, 0x2b, 0xb5, 0xbd, 0xae,
+	0xb8, 0x79, 0xdf, 0x7e, 0x3e, 0xef, 0x7d, 0xe6, 0xbd, 0xd9, 0xf7, 0x5e, 0x02, 0xe9, 0x36, 0x63,
+	0x6d, 0x83, 0x66, 0x35, 0x95, 0xab, 0x0e, 0x67, 0x36, 0xcd, 0x9e, 0x6e, 0x36, 0x29, 0x57, 0x6f,
+	0xf7, 0x2d, 0x19, 0xcb, 0x66, 0x9c, 0xe1, 0x84, 0x87, 0xcc, 0xf4, 0xed, 0x12, 0x99, 0xbc, 0x24,
+	0x7d, 0xa8, 0x96, 0x9e, 0x55, 0x4d, 0x93, 0x71, 0x95, 0xeb, 0xcc, 0x74, 0x3c, 0x5e, 0xf2, 0xda,
+	0xd8, 0x08, 0xd4, 0xe4, 0x3a, 0x3f, 0x93, 0xb0, 0x57, 0xc7, 0xc2, 0x4e, 0xba, 0xd4, 0x96, 0x28,
+	0xe5, 0x67, 0x04, 0xcb, 0x0f, 0x19, 0x3b, 0xee, 0x5a, 0x84, 0x9e, 0x74, 0xa9, 0xc3, 0xf1, 0x65,
+	0x00, 0xcb, 0x66, 0x1f, 0xd3, 0x16, 0x6f, 0xe8, 0x5a, 0x22, 0x92, 0x42, 0xe9, 0x28, 0x89, 0x4a,
+	0x4b, 0x45, 0xc3, 0x65, 0x58, 0xb2, 0xa9, 0xaa, 0x35, 0x98, 0x25, 0x34, 0x25, 0x50, 0x0a, 0xa5,
+	0x63, 0xb9, 0x6b, 0x99, 0x71, 0x87, 0xc9, 0x10, 0xaa, 0x6a, 0x35, 0x0f, 0x4c, 0x62, 0x76, 0xff,
+	0x01, 0x6f, 0xc2, 0xc2, 0x31, 0x3d, 0x73, 0x12, 0xf3, 0xa9, 0xf9, 0x74, 0x2c, 0x77, 0x79, 0xbc,
+	0x87, 0x77, 0xe9, 0x19, 0x11, 0x50, 0xe5, 0x77, 0x04, 0x2b, 0xbe, 0x5a, 0xc7, 0x62, 0xa6, 0x43,
+	0xf1, 0x3d, 0x58, 0x3c, 0x62, 0x5d, 0x53, 0x4b, 0x20, 0xe1, 0xe6, 0xb5, 0xf1, 0x6e, 0x4a, 0x22,
+	0x3b, 0x84, 0x3a, 0x5d, 0x83, 0x13, 0x8f, 0x84, 0x77, 0xe0, 0x42, 0x47, 0x77, 0x1c, 0xdd, 0x6c,
+	0x27, 0x42, 0x33, 0xf1, 0x7d, 0x1a, 0x7e, 0x0b, 0x22, 0x1a, 0x3d, 0xa2, 0xb6, 0x4d, 0xb5, 0x60,
+	0x27, 0xe9, 0xc1, 0x95, 0x3f, 0x42, 0xb0, 0x4a, 0xba, 0xe6, 0x7b, 0x6e, 0x39, 0x82, 0x67, 0xdf,
+	0x52, 0x6d, 0xae, 0xbb, 0x19, 0x74, 0x01, 0xa1, 0x69, 0xd9, 0xdf, 0xf7, 0xd1, 0x15, 0x8d, 0xc4,
+	0xac, 0xfe, 0xc3, 0x7f, 0x58, 0xc7, 0xbb, 0xb0, 0x28, 0x6e, 0x54, 0x62, 0x5e, 0xb8, 0xb8, 0x32,
+	0xde, 0x85, 0x38, 0x69, 0x79, 0x8e, 0x78, 0x78, 0x9c, 0x87, 0x68, 0xfb, 0xc4, 0x68, 0x78, 0xe4,
+	0x0b, 0x82, 0xac, 0x8c, 0x27, 0x3f, 0x38, 0x31, 0x7c, 0x7e, 0xa4, 0x2d, 0x7f, 0x17, 0x96, 0x00,
+	0x04, 0xbd, 0xc1, 0xcf, 0x2c, 0xaa, 0x7c, 0x83, 0x20, 0xde, 0x4f, 0xa8, 0xbc, 0x20, 0x3b, 0xb0,
+	0xd8, 0x54, 0x79, 0xeb, 0x23, 0x79, 0xc2, 0x8d, 0x29, 0xf2, 0xbc, 0xfa, 0x16, 0x5c, 0x06, 0xf1,
+	0x88, 0x78, 0xcb, 0x3f, 0x60, 0x28, 0xd0, 0x01, 0xe5, 0xf1, 0x94, 0xa7, 0x08, 0x5e, 0x2a, 0xd0,
+	0xb6, 0x6e, 0xd6, 0x6d, 0xd5, 0x74, 0xd4, 0x96, 0x9b, 0xad, 0x80, 0x65, 0xfe, 0x10, 0x2e, 0xf2,
+	0x3e, 0xa9, 0x57, 0x23, 0x10, 0xf1, 0x6f, 0x8d, 0x8f, 0x3f, 0x10, 0xc9, 0x2f, 0x15, 0xe6, 0xe7,
+	0x6c, 0xca, 0x3d, 0x48, 0x9c, 0x17, 0x26, 0xd3, 0x95, 0x82, 0xd8, 0x00, 0x43, 0x24, 0x6d, 0x89,
+	0x0c, 0x9a, 0x14, 0x02, 0xab, 0x84, 0x19, 0x46, 0x53, 0x6d, 0x1d, 0x07, 0x3c, 0xce, 0x74, 0x9f,
+	0x18, 0xe2, 0x7d, 0x9f, 0x9e, 0x12, 0xe5, 0x97, 0x10, 0x2c, 0x17, 0x59, 0xa7, 0xa3, 0xf3, 0x80,
+	0x61, 0x76, 0x60, 0xa1, 0xc3, 0x34, 0x9a, 0x58, 0x4c, 0xa1, 0xf4, 0xca, 0xa4, 0x34, 0x0d, 0x79,
+	0xcd, 0xec, 0x31, 0x8d, 0x12, 0xc1, 0xc4, 0xca, 0x73, 0x84, 0x96, 0xe7, 0x86, 0xa4, 0xe2, 0x1d,
+	0x88, 0x76, 0xba, 0xb2, 0x23, 0x27, 0xc2, 0xe2, 0x8b, 0x9f, 0x70, 0x6b, 0xf7, 0x24, 0x94, 0xf4,
+	0x49, 0xca, 0x7d, 0x58, 0x70, 0x63, 0xe2, 0x75, 0x88, 0xef, 0xd5, 0x76, 0x4b, 0x8d, 0x47, 0xd5,
+	0x83, 0xfd, 0x52, 0xb1, 0x72, 0xbf, 0x52, 0xda, 0x8d, 0xcf, 0xe1, 0x35, 0x58, 0xae, 0x93, 0x7c,
+	0xf5, 0x20, 0x5f, 0xac, 0x57, 0x6a, 0xd5, 0xfc, 0xc3, 0x38, 0xc2, 0xff, 0x83, 0xb5, 0x6a, 0xad,
+	0xda, 0x18, 0x36, 0x87, 0x0a, 0xff, 0x87, 0xf5, 0xc1, 0x5b, 0xe2, 0x50, 0x83, 0xb6, 0x38, 0xb3,
+	0x95, 0xaf, 0x11, 0xac, 0xf8, 0x47, 0x94, 0x55, 0x3d, 0x80, 0xb8, 0x1f, 0xbf, 0x61, 0x8b, 0x1b,
+	0xee, 0xf7, 0xdd, 0x74, 0x00, 0xed, 0x5e, 0xcb, 0x5b, 0xed, 0x0c, 0x3d, 0x3b, 0xf8, 0x2a, 0x2c,
+	0xeb, 0xa6, 0x46, 0x3f, 0x6d, 0x74, 0x2d, 0x4d, 0xe5, 0xd4, 0x49, 0x2c, 0xa4, 0x50, 0x7a, 0x91,
+	0x2c, 0x09, 0xe3, 0x23, 0xcf, 0xa6, 0x1c, 0x01, 0xce, 0x1b, 0x06, 0x6b, 0xa9, 0x9c, 0x56, 0x34,
+	0x27, 0x60, 0x25, 0xfd, 0xd1, 0x80, 0x82, 0x8f, 0x86, 0x32, 0x5c, 0x1c, 0x8a, 0x23, 0x0f, 0xfe,
+	0x02, 0x9e, 0xbe, 0x44, 0xb0, 0x46, 0xa8, 0x43, 0xed, 0xd3, 0x19, 0x14, 0x5f, 0x81, 0x98, 0xeb,
+	0xb3, 0xa9, 0x3a, 0xd4, 0x7d, 0x1f, 0x15, 0xef, 0xc1, 0x37, 0xbd, 0xd8, 0x91, 0xd6, 0x01, 0x0f,
+	0xea, 0x90, 0x9f, 0xc5, 0xaf, 0x21, 0x88, 0xf8, 0x95, 0xc1, 0xdb, 0x10, 0xd6, 0x4d, 0x87, 0xda,
+	0x5c, 0xe4, 0x3e, 0x96, 0x4b, 0x4d, 0x1b, 0x5f, 0xe5, 0x39, 0x22, 0x19, 0x2e, 0xd7, 0x2b, 0x9c,
+	0xf8, 0x60, 0x02, 0x72, 0x3d, 0x86, 0xc7, 0x15, 0x71, 0xc3, 0xb3, 0x70, 0x45, 0xdc, 0xbb, 0x10,
+	0xd6, 0xa8, 0x41, 0x39, 0x95, 0x3d, 0x7f, 0x72, 0x2e, 0x5c, 0xa2, 0x07, 0xc7, 0x57, 0x61, 0x49,
+	0xe4, 0xf7, 0x94, 0xda, 0x8e, 0xfb, 0x79, 0xba, 0x45, 0x98, 0x2f, 0x23, 0x12, 0x73, 0xad, 0x87,
+	0x9e, 0xb1, 0x10, 0x83, 0x28, 0xb3, 0xa8, 0x2d, 0xd2, 0x53, 0xb8, 0x0c, 0x2f, 0xb7, 0x98, 0x79,
+	0x64, 0xe8, 0x2d, 0xde, 0xd0, 0x28, 0xa7, 0xf2, 0x43, 0xe1, 0xb6, 0xca, 0x69, 0xfb, 0x4c, 0xf9,
+	0x0a, 0xc1, 0xca, 0xf0, 0x25, 0xc7, 0x59, 0x98, 0x3f, 0xa6, 0xfe, 0x28, 0x9b, 0x52, 0x25, 0x17,
+	0x89, 0x13, 0x70, 0xc1, 0xd7, 0xe3, 0x96, 0x60, 0x9e, 0xf8, 0x8f, 0xf8, 0x26, 0xac, 0x8d, 0x04,
+	0xa7, 0x9a, 0x48, 0x75, 0x84, 0xc4, 0xfd, 0x17, 0xbb, 0xd2, 0xae, 0xfc, 0x83, 0x20, 0x36, 0x30,
+	0x61, 0x71, 0x13, 0xe2, 0x62, 0x3c, 0xb7, 0x98, 0xe9, 0xe8, 0x0e, 0xa7, 0x66, 0xeb, 0x4c, 0xb4,
+	0xa3, 0x95, 0xdc, 0x56, 0xa0, 0x11, 0x2d, 0x7e, 0x17, 0xfb, 0xe4, 0xf2, 0x1c, 0x59, 0xb5, 0x87,
+	0x4d, 0xa3, 0xdd, 0x2e, 0xf4, 0x9c, 0x6e, 0xa7, 0xec, 0xc1, 0xea, 0x88, 0x27, 0x9c, 0x82, 0x4b,
+	0xa4, 0x94, 0xdf, 0x6d, 0x14, 0x6b, 0xd5, 0x83, 0xca, 0x41, 0xbd, 0x54, 0x2d, 0xbe, 0x3f, 0xd2,
+	0xc2, 0x00, 0xc2, 0x07, 0x75, 0x52, 0xab, 0x3e, 0x88, 0x23, 0xbc, 0x04, 0x91, 0xd2, 0x61, 0xa9,
+	0x5a, 0x7f, 0x24, 0x5a, 0x16, 0x86, 0xf8, 0xc0, 0x89, 0xbc, 0xa9, 0xfd, 0x34, 0x04, 0xf8, 0xfc,
+	0xe0, 0xc2, 0x8f, 0x01, 0x44, 0x06, 0x3e, 0xb1, 0x75, 0x4e, 0xe5, 0xf0, 0x7e, 0x73, 0x96, 0xd1,
+	0x27, 0x52, 0xf0, 0xd8, 0x65, 0x97, 0xe7, 0x48, 0xd4, 0xf6, 0x1f, 0x70, 0x1d, 0xa2, 0xde, 0xe6,
+	0x63, 0x1a, 0xfe, 0x48, 0xdf, 0x9a, 0xd9, 0x6f, 0xcd, 0x34, 0xc4, 0x26, 0x62, 0xcb, 0xdf, 0xc9,
+	0x77, 0x20, 0xda, 0x8b, 0x87, 0x37, 0x61, 0xdd, 0xb2, 0xe9, 0xa9, 0xce, 0xba, 0x4e, 0xe3, 0xfc,
+	0xe4, 0xbb, 0xe8, 0xbf, 0x1b, 0xf0, 0x9d, 0x04, 0x88, 0xf8, 0x7e, 0x0b, 0x61, 0x6f, 0x90, 0xe5,
+	0xfe, 0x8a, 0x40, 0x74, 0xd7, 0x57, 0x84, 0xbf, 0x45, 0x10, 0xf6, 0x96, 0x5f, 0x7c, 0x7d, 0xbc,
+	0xde, 0xa1, 0x65, 0x3e, 0x99, 0x9e, 0x0e, 0x94, 0x6d, 0xe5, 0x8d, 0x2f, 0xfe, 0xfc, 0xfb, 0xbb,
+	0xd0, 0x86, 0x72, 0xad, 0xf7, 0x67, 0x82, 0x6c, 0x6e, 0x4e, 0xf6, 0xb3, 0x7e, 0xe3, 0xfb, 0x7c,
+	0xdb, 0x10, 0xb4, 0x6d, 0xb4, 0x81, 0xbf, 0x47, 0x10, 0xf1, 0xb7, 0x2d, 0x7c, 0x63, 0xc2, 0xad,
+	0x1c, 0x5e, 0x71, 0x93, 0x1b, 0x41, 0xa0, 0x52, 0x55, 0x4e, 0xa8, 0xba, 0xa5, 0x5c, 0x9f, 0xa2,
+	0xca, 0x96, 0x44, 0x57, 0xd7, 0x33, 0x04, 0xf1, 0xd1, 0xf5, 0x06, 0x6f, 0x8e, 0x0f, 0x3a, 0x66,
+	0x47, 0x4b, 0xe6, 0x66, 0xa1, 0x48, 0xbd, 0xdb, 0x42, 0xef, 0x1d, 0x25, 0x3b, 0x45, 0x6f, 0x73,
+	0xc4, 0x81, 0xab, 0xdb, 0xad, 0xaf, 0x37, 0xb6, 0x27, 0xd5, 0x77, 0x68, 0x77, 0x99, 0x54, 0xdf,
+	0xe1, 0x0d, 0x20, 0x70, 0x7d, 0x5b, 0x82, 0xd6, 0xab, 0xaf, 0x5c, 0xca, 0x26, 0xd6, 0x77, 0x78,
+	0x19, 0x9c, 0x58, 0xdf, 0xd1, 0x1d, 0x2f, 0x70, 0x7d, 0x25, 0xd1, 0xd5, 0xf5, 0x23, 0x82, 0xd8,
+	0xc0, 0xa8, 0xc7, 0x13, 0x16, 0xbd, 0xf3, 0x9b, 0x47, 0xf2, 0xf5, 0x80, 0x68, 0x29, 0x70, 0x4b,
+	0x08, 0xcc, 0x2a, 0x1b, 0x53, 0x04, 0xaa, 0x7d, 0xae, 0xab, 0xf1, 0x07, 0x04, 0xd0, 0x9f, 0xdd,
+	0xf8, 0xe6, 0xa4, 0x9e, 0x3d, 0xb2, 0x69, 0x24, 0x6f, 0x05, 0x03, 0x4b, 0x81, 0x77, 0x84, 0xc0,
+	0x8c, 0x72, 0x63, 0x5a, 0x06, 0x7b, 0xd4, 0x6d, 0xb4, 0x51, 0x78, 0x86, 0xe0, 0x52, 0x8b, 0x75,
+	0xc6, 0x46, 0x2a, 0xac, 0xf4, 0xfa, 0xce, 0xbe, 0xcd, 0x38, 0xdb, 0x47, 0x1f, 0xe4, 0x25, 0xb6,
+	0xcd, 0x0c, 0xd5, 0x6c, 0x67, 0x98, 0xdd, 0xce, 0xb6, 0xa9, 0x29, 0xfe, 0x8b, 0x90, 0xf5, 0x5e,
+	0xa9, 0x96, 0xee, 0x9c, 0xff, 0x77, 0xc3, 0xdb, 0x3d, 0xcb, 0x4f, 0xa1, 0x57, 0x1e, 0x78, 0x3e,
+	0x8a, 0x06, 0xeb, 0x6a, 0x99, 0x5e, 0x88, 0xcc, 0xe1, 0x66, 0xc1, 0x85, 0xfe, 0xe6, 0x03, 0x9e,
+	0x08, 0xc0, 0x93, 0x1e, 0xe0, 0xc9, 0xa1, 0xe7, 0xab, 0x19, 0x16, 0xf1, 0x6e, 0xff, 0x1b, 0x00,
+	0x00, 0xff, 0xff, 0x6a, 0xaa, 0xbe, 0x57, 0x66, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2025,99 +1785,3 @@ var _Datastore_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/datastore/v1beta3/datastore.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/datastore/v1beta3/datastore.proto", fileDescriptor_datastore_062a2d11f20b0b0e)
-}
-
-var fileDescriptor_datastore_062a2d11f20b0b0e = []byte{
-	// 1403 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5,
-	0x17, 0xcf, 0x38, 0x89, 0x6b, 0x3f, 0xe7, 0x87, 0x33, 0xcd, 0xf7, 0x8b, 0x65, 0x5a, 0x6a, 0x6d,
-	0x29, 0x75, 0xd3, 0x62, 0x13, 0xb7, 0xa1, 0x22, 0x54, 0x28, 0xb6, 0xe3, 0xd6, 0x16, 0x8d, 0x1d,
-	0x26, 0x6e, 0x2a, 0x50, 0x91, 0xb5, 0xf6, 0x4e, 0xcc, 0x92, 0xf5, 0xce, 0x66, 0x77, 0x1c, 0x88,
-	0x10, 0x17, 0x0e, 0x08, 0x81, 0x38, 0x21, 0xd4, 0x13, 0x07, 0xae, 0x70, 0x2e, 0x7f, 0x03, 0x02,
-	0x89, 0x0b, 0x07, 0xfe, 0x01, 0xfe, 0x08, 0x8e, 0x68, 0x67, 0x67, 0xfd, 0x2b, 0xb5, 0xbd, 0xae,
-	0xb8, 0x79, 0xdf, 0x7e, 0x3e, 0xef, 0x7d, 0xe6, 0xbd, 0xd9, 0xf7, 0x5e, 0x02, 0xe9, 0x36, 0x63,
-	0x6d, 0x83, 0x66, 0x35, 0x95, 0xab, 0x0e, 0x67, 0x36, 0xcd, 0x9e, 0x6e, 0x36, 0x29, 0x57, 0x6f,
-	0xf7, 0x2d, 0x19, 0xcb, 0x66, 0x9c, 0xe1, 0x84, 0x87, 0xcc, 0xf4, 0xed, 0x12, 0x99, 0xbc, 0x24,
-	0x7d, 0xa8, 0x96, 0x9e, 0x55, 0x4d, 0x93, 0x71, 0x95, 0xeb, 0xcc, 0x74, 0x3c, 0x5e, 0xf2, 0xda,
-	0xd8, 0x08, 0xd4, 0xe4, 0x3a, 0x3f, 0x93, 0xb0, 0x57, 0xc7, 0xc2, 0x4e, 0xba, 0xd4, 0x96, 0x28,
-	0xe5, 0x67, 0x04, 0xcb, 0x0f, 0x19, 0x3b, 0xee, 0x5a, 0x84, 0x9e, 0x74, 0xa9, 0xc3, 0xf1, 0x65,
-	0x00, 0xcb, 0x66, 0x1f, 0xd3, 0x16, 0x6f, 0xe8, 0x5a, 0x22, 0x92, 0x42, 0xe9, 0x28, 0x89, 0x4a,
-	0x4b, 0x45, 0xc3, 0x65, 0x58, 0xb2, 0xa9, 0xaa, 0x35, 0x98, 0x25, 0x34, 0x25, 0x50, 0x0a, 0xa5,
-	0x63, 0xb9, 0x6b, 0x99, 0x71, 0x87, 0xc9, 0x10, 0xaa, 0x6a, 0x35, 0x0f, 0x4c, 0x62, 0x76, 0xff,
-	0x01, 0x6f, 0xc2, 0xc2, 0x31, 0x3d, 0x73, 0x12, 0xf3, 0xa9, 0xf9, 0x74, 0x2c, 0x77, 0x79, 0xbc,
-	0x87, 0x77, 0xe9, 0x19, 0x11, 0x50, 0xe5, 0x77, 0x04, 0x2b, 0xbe, 0x5a, 0xc7, 0x62, 0xa6, 0x43,
-	0xf1, 0x3d, 0x58, 0x3c, 0x62, 0x5d, 0x53, 0x4b, 0x20, 0xe1, 0xe6, 0xb5, 0xf1, 0x6e, 0x4a, 0x22,
-	0x3b, 0x84, 0x3a, 0x5d, 0x83, 0x13, 0x8f, 0x84, 0x77, 0xe0, 0x42, 0x47, 0x77, 0x1c, 0xdd, 0x6c,
-	0x27, 0x42, 0x33, 0xf1, 0x7d, 0x1a, 0x7e, 0x0b, 0x22, 0x1a, 0x3d, 0xa2, 0xb6, 0x4d, 0xb5, 0x60,
-	0x27, 0xe9, 0xc1, 0x95, 0x3f, 0x42, 0xb0, 0x4a, 0xba, 0xe6, 0x7b, 0x6e, 0x39, 0x82, 0x67, 0xdf,
-	0x52, 0x6d, 0xae, 0xbb, 0x19, 0x74, 0x01, 0xa1, 0x69, 0xd9, 0xdf, 0xf7, 0xd1, 0x15, 0x8d, 0xc4,
-	0xac, 0xfe, 0xc3, 0x7f, 0x58, 0xc7, 0xbb, 0xb0, 0x28, 0x6e, 0x54, 0x62, 0x5e, 0xb8, 0xb8, 0x32,
-	0xde, 0x85, 0x38, 0x69, 0x79, 0x8e, 0x78, 0x78, 0x9c, 0x87, 0x68, 0xfb, 0xc4, 0x68, 0x78, 0xe4,
-	0x0b, 0x82, 0xac, 0x8c, 0x27, 0x3f, 0x38, 0x31, 0x7c, 0x7e, 0xa4, 0x2d, 0x7f, 0x17, 0x96, 0x00,
-	0x04, 0xbd, 0xc1, 0xcf, 0x2c, 0xaa, 0x7c, 0x83, 0x20, 0xde, 0x4f, 0xa8, 0xbc, 0x20, 0x3b, 0xb0,
-	0xd8, 0x54, 0x79, 0xeb, 0x23, 0x79, 0xc2, 0x8d, 0x29, 0xf2, 0xbc, 0xfa, 0x16, 0x5c, 0x06, 0xf1,
-	0x88, 0x78, 0xcb, 0x3f, 0x60, 0x28, 0xd0, 0x01, 0xe5, 0xf1, 0x94, 0xa7, 0x08, 0x5e, 0x2a, 0xd0,
-	0xb6, 0x6e, 0xd6, 0x6d, 0xd5, 0x74, 0xd4, 0x96, 0x9b, 0xad, 0x80, 0x65, 0xfe, 0x10, 0x2e, 0xf2,
-	0x3e, 0xa9, 0x57, 0x23, 0x10, 0xf1, 0x6f, 0x8d, 0x8f, 0x3f, 0x10, 0xc9, 0x2f, 0x15, 0xe6, 0xe7,
-	0x6c, 0xca, 0x3d, 0x48, 0x9c, 0x17, 0x26, 0xd3, 0x95, 0x82, 0xd8, 0x00, 0x43, 0x24, 0x6d, 0x89,
-	0x0c, 0x9a, 0x14, 0x02, 0xab, 0x84, 0x19, 0x46, 0x53, 0x6d, 0x1d, 0x07, 0x3c, 0xce, 0x74, 0x9f,
-	0x18, 0xe2, 0x7d, 0x9f, 0x9e, 0x12, 0xe5, 0x97, 0x10, 0x2c, 0x17, 0x59, 0xa7, 0xa3, 0xf3, 0x80,
-	0x61, 0x76, 0x60, 0xa1, 0xc3, 0x34, 0x9a, 0x58, 0x4c, 0xa1, 0xf4, 0xca, 0xa4, 0x34, 0x0d, 0x79,
-	0xcd, 0xec, 0x31, 0x8d, 0x12, 0xc1, 0xc4, 0xca, 0x73, 0x84, 0x96, 0xe7, 0x86, 0xa4, 0xe2, 0x1d,
-	0x88, 0x76, 0xba, 0xb2, 0x23, 0x27, 0xc2, 0xe2, 0x8b, 0x9f, 0x70, 0x6b, 0xf7, 0x24, 0x94, 0xf4,
-	0x49, 0xca, 0x7d, 0x58, 0x70, 0x63, 0xe2, 0x75, 0x88, 0xef, 0xd5, 0x76, 0x4b, 0x8d, 0x47, 0xd5,
-	0x83, 0xfd, 0x52, 0xb1, 0x72, 0xbf, 0x52, 0xda, 0x8d, 0xcf, 0xe1, 0x35, 0x58, 0xae, 0x93, 0x7c,
-	0xf5, 0x20, 0x5f, 0xac, 0x57, 0x6a, 0xd5, 0xfc, 0xc3, 0x38, 0xc2, 0xff, 0x83, 0xb5, 0x6a, 0xad,
-	0xda, 0x18, 0x36, 0x87, 0x0a, 0xff, 0x87, 0xf5, 0xc1, 0x5b, 0xe2, 0x50, 0x83, 0xb6, 0x38, 0xb3,
-	0x95, 0xaf, 0x11, 0xac, 0xf8, 0x47, 0x94, 0x55, 0x3d, 0x80, 0xb8, 0x1f, 0xbf, 0x61, 0x8b, 0x1b,
-	0xee, 0xf7, 0xdd, 0x74, 0x00, 0xed, 0x5e, 0xcb, 0x5b, 0xed, 0x0c, 0x3d, 0x3b, 0xf8, 0x2a, 0x2c,
-	0xeb, 0xa6, 0x46, 0x3f, 0x6d, 0x74, 0x2d, 0x4d, 0xe5, 0xd4, 0x49, 0x2c, 0xa4, 0x50, 0x7a, 0x91,
-	0x2c, 0x09, 0xe3, 0x23, 0xcf, 0xa6, 0x1c, 0x01, 0xce, 0x1b, 0x06, 0x6b, 0xa9, 0x9c, 0x56, 0x34,
-	0x27, 0x60, 0x25, 0xfd, 0xd1, 0x80, 0x82, 0x8f, 0x86, 0x32, 0x5c, 0x1c, 0x8a, 0x23, 0x0f, 0xfe,
-	0x02, 0x9e, 0xbe, 0x44, 0xb0, 0x46, 0xa8, 0x43, 0xed, 0xd3, 0x19, 0x14, 0x5f, 0x81, 0x98, 0xeb,
-	0xb3, 0xa9, 0x3a, 0xd4, 0x7d, 0x1f, 0x15, 0xef, 0xc1, 0x37, 0xbd, 0xd8, 0x91, 0xd6, 0x01, 0x0f,
-	0xea, 0x90, 0x9f, 0xc5, 0xaf, 0x21, 0x88, 0xf8, 0x95, 0xc1, 0xdb, 0x10, 0xd6, 0x4d, 0x87, 0xda,
-	0x5c, 0xe4, 0x3e, 0x96, 0x4b, 0x4d, 0x1b, 0x5f, 0xe5, 0x39, 0x22, 0x19, 0x2e, 0xd7, 0x2b, 0x9c,
-	0xf8, 0x60, 0x02, 0x72, 0x3d, 0x86, 0xc7, 0x15, 0x71, 0xc3, 0xb3, 0x70, 0x45, 0xdc, 0xbb, 0x10,
-	0xd6, 0xa8, 0x41, 0x39, 0x95, 0x3d, 0x7f, 0x72, 0x2e, 0x5c, 0xa2, 0x07, 0xc7, 0x57, 0x61, 0x49,
-	0xe4, 0xf7, 0x94, 0xda, 0x8e, 0xfb, 0x79, 0xba, 0x45, 0x98, 0x2f, 0x23, 0x12, 0x73, 0xad, 0x87,
-	0x9e, 0xb1, 0x10, 0x83, 0x28, 0xb3, 0xa8, 0x2d, 0xd2, 0x53, 0xb8, 0x0c, 0x2f, 0xb7, 0x98, 0x79,
-	0x64, 0xe8, 0x2d, 0xde, 0xd0, 0x28, 0xa7, 0xf2, 0x43, 0xe1, 0xb6, 0xca, 0x69, 0xfb, 0x4c, 0xf9,
-	0x0a, 0xc1, 0xca, 0xf0, 0x25, 0xc7, 0x59, 0x98, 0x3f, 0xa6, 0xfe, 0x28, 0x9b, 0x52, 0x25, 0x17,
-	0x89, 0x13, 0x70, 0xc1, 0xd7, 0xe3, 0x96, 0x60, 0x9e, 0xf8, 0x8f, 0xf8, 0x26, 0xac, 0x8d, 0x04,
-	0xa7, 0x9a, 0x48, 0x75, 0x84, 0xc4, 0xfd, 0x17, 0xbb, 0xd2, 0xae, 0xfc, 0x83, 0x20, 0x36, 0x30,
-	0x61, 0x71, 0x13, 0xe2, 0x62, 0x3c, 0xb7, 0x98, 0xe9, 0xe8, 0x0e, 0xa7, 0x66, 0xeb, 0x4c, 0xb4,
-	0xa3, 0x95, 0xdc, 0x56, 0xa0, 0x11, 0x2d, 0x7e, 0x17, 0xfb, 0xe4, 0xf2, 0x1c, 0x59, 0xb5, 0x87,
-	0x4d, 0xa3, 0xdd, 0x2e, 0xf4, 0x9c, 0x6e, 0xa7, 0xec, 0xc1, 0xea, 0x88, 0x27, 0x9c, 0x82, 0x4b,
-	0xa4, 0x94, 0xdf, 0x6d, 0x14, 0x6b, 0xd5, 0x83, 0xca, 0x41, 0xbd, 0x54, 0x2d, 0xbe, 0x3f, 0xd2,
-	0xc2, 0x00, 0xc2, 0x07, 0x75, 0x52, 0xab, 0x3e, 0x88, 0x23, 0xbc, 0x04, 0x91, 0xd2, 0x61, 0xa9,
-	0x5a, 0x7f, 0x24, 0x5a, 0x16, 0x86, 0xf8, 0xc0, 0x89, 0xbc, 0xa9, 0xfd, 0x34, 0x04, 0xf8, 0xfc,
-	0xe0, 0xc2, 0x8f, 0x01, 0x44, 0x06, 0x3e, 0xb1, 0x75, 0x4e, 0xe5, 0xf0, 0x7e, 0x73, 0x96, 0xd1,
-	0x27, 0x52, 0xf0, 0xd8, 0x65, 0x97, 0xe7, 0x48, 0xd4, 0xf6, 0x1f, 0x70, 0x1d, 0xa2, 0xde, 0xe6,
-	0x63, 0x1a, 0xfe, 0x48, 0xdf, 0x9a, 0xd9, 0x6f, 0xcd, 0x34, 0xc4, 0x26, 0x62, 0xcb, 0xdf, 0xc9,
-	0x77, 0x20, 0xda, 0x8b, 0x87, 0x37, 0x61, 0xdd, 0xb2, 0xe9, 0xa9, 0xce, 0xba, 0x4e, 0xe3, 0xfc,
-	0xe4, 0xbb, 0xe8, 0xbf, 0x1b, 0xf0, 0x9d, 0x04, 0x88, 0xf8, 0x7e, 0x0b, 0x61, 0x6f, 0x90, 0xe5,
-	0xfe, 0x8a, 0x40, 0x74, 0xd7, 0x57, 0x84, 0xbf, 0x45, 0x10, 0xf6, 0x96, 0x5f, 0x7c, 0x7d, 0xbc,
-	0xde, 0xa1, 0x65, 0x3e, 0x99, 0x9e, 0x0e, 0x94, 0x6d, 0xe5, 0x8d, 0x2f, 0xfe, 0xfc, 0xfb, 0xbb,
-	0xd0, 0x86, 0x72, 0xad, 0xf7, 0x67, 0x82, 0x6c, 0x6e, 0x4e, 0xf6, 0xb3, 0x7e, 0xe3, 0xfb, 0x7c,
-	0xdb, 0x10, 0xb4, 0x6d, 0xb4, 0x81, 0xbf, 0x47, 0x10, 0xf1, 0xb7, 0x2d, 0x7c, 0x63, 0xc2, 0xad,
-	0x1c, 0x5e, 0x71, 0x93, 0x1b, 0x41, 0xa0, 0x52, 0x55, 0x4e, 0xa8, 0xba, 0xa5, 0x5c, 0x9f, 0xa2,
-	0xca, 0x96, 0x44, 0x57, 0xd7, 0x33, 0x04, 0xf1, 0xd1, 0xf5, 0x06, 0x6f, 0x8e, 0x0f, 0x3a, 0x66,
-	0x47, 0x4b, 0xe6, 0x66, 0xa1, 0x48, 0xbd, 0xdb, 0x42, 0xef, 0x1d, 0x25, 0x3b, 0x45, 0x6f, 0x73,
-	0xc4, 0x81, 0xab, 0xdb, 0xad, 0xaf, 0x37, 0xb6, 0x27, 0xd5, 0x77, 0x68, 0x77, 0x99, 0x54, 0xdf,
-	0xe1, 0x0d, 0x20, 0x70, 0x7d, 0x5b, 0x82, 0xd6, 0xab, 0xaf, 0x5c, 0xca, 0x26, 0xd6, 0x77, 0x78,
-	0x19, 0x9c, 0x58, 0xdf, 0xd1, 0x1d, 0x2f, 0x70, 0x7d, 0x25, 0xd1, 0xd5, 0xf5, 0x23, 0x82, 0xd8,
-	0xc0, 0xa8, 0xc7, 0x13, 0x16, 0xbd, 0xf3, 0x9b, 0x47, 0xf2, 0xf5, 0x80, 0x68, 0x29, 0x70, 0x4b,
-	0x08, 0xcc, 0x2a, 0x1b, 0x53, 0x04, 0xaa, 0x7d, 0xae, 0xab, 0xf1, 0x07, 0x04, 0xd0, 0x9f, 0xdd,
-	0xf8, 0xe6, 0xa4, 0x9e, 0x3d, 0xb2, 0x69, 0x24, 0x6f, 0x05, 0x03, 0x4b, 0x81, 0x77, 0x84, 0xc0,
-	0x8c, 0x72, 0x63, 0x5a, 0x06, 0x7b, 0xd4, 0x6d, 0xb4, 0x51, 0x78, 0x86, 0xe0, 0x52, 0x8b, 0x75,
-	0xc6, 0x46, 0x2a, 0xac, 0xf4, 0xfa, 0xce, 0xbe, 0xcd, 0x38, 0xdb, 0x47, 0x1f, 0xe4, 0x25, 0xb6,
-	0xcd, 0x0c, 0xd5, 0x6c, 0x67, 0x98, 0xdd, 0xce, 0xb6, 0xa9, 0x29, 0xfe, 0x8b, 0x90, 0xf5, 0x5e,
-	0xa9, 0x96, 0xee, 0x9c, 0xff, 0x77, 0xc3, 0xdb, 0x3d, 0xcb, 0x4f, 0xa1, 0x57, 0x1e, 0x78, 0x3e,
-	0x8a, 0x06, 0xeb, 0x6a, 0x99, 0x5e, 0x88, 0xcc, 0xe1, 0x66, 0xc1, 0x85, 0xfe, 0xe6, 0x03, 0x9e,
-	0x08, 0xc0, 0x93, 0x1e, 0xe0, 0xc9, 0xa1, 0xe7, 0xab, 0x19, 0x16, 0xf1, 0x6e, 0xff, 0x1b, 0x00,
-	0x00, 0xff, 0xff, 0x6a, 0xaa, 0xbe, 0x57, 0x66, 0x11, 0x00, 0x00,
-}
diff --git a/googleapis/datastore/v1beta3/entity.pb.go b/googleapis/datastore/v1beta3/entity.pb.go
index 462495dfdf..4cfdbec80b 100644
--- a/googleapis/datastore/v1beta3/entity.pb.go
+++ b/googleapis/datastore/v1beta3/entity.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/entity.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
+package datastore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A partition ID identifies a grouping of entities. The grouping is always
 // by project and namespace, however the namespace ID may be empty.
@@ -56,16 +59,17 @@ func (m *PartitionId) Reset()         { *m = PartitionId{} }
 func (m *PartitionId) String() string { return proto.CompactTextString(m) }
 func (*PartitionId) ProtoMessage()    {}
 func (*PartitionId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_50acbc7f8774bafa, []int{0}
+	return fileDescriptor_66499b178484a7ed, []int{0}
 }
+
 func (m *PartitionId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartitionId.Unmarshal(m, b)
 }
 func (m *PartitionId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartitionId.Marshal(b, m, deterministic)
 }
-func (dst *PartitionId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartitionId.Merge(dst, src)
+func (m *PartitionId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionId.Merge(m, src)
 }
 func (m *PartitionId) XXX_Size() int {
 	return xxx_messageInfo_PartitionId.Size(m)
@@ -125,16 +129,17 @@ func (m *Key) Reset()         { *m = Key{} }
 func (m *Key) String() string { return proto.CompactTextString(m) }
 func (*Key) ProtoMessage()    {}
 func (*Key) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_50acbc7f8774bafa, []int{1}
+	return fileDescriptor_66499b178484a7ed, []int{1}
 }
+
 func (m *Key) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Key.Unmarshal(m, b)
 }
 func (m *Key) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Key.Marshal(b, m, deterministic)
 }
-func (dst *Key) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Key.Merge(dst, src)
+func (m *Key) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key.Merge(m, src)
 }
 func (m *Key) XXX_Size() int {
 	return xxx_messageInfo_Key.Size(m)
@@ -184,16 +189,17 @@ func (m *Key_PathElement) Reset()         { *m = Key_PathElement{} }
 func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }
 func (*Key_PathElement) ProtoMessage()    {}
 func (*Key_PathElement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_50acbc7f8774bafa, []int{1, 0}
+	return fileDescriptor_66499b178484a7ed, []int{1, 0}
 }
+
 func (m *Key_PathElement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Key_PathElement.Unmarshal(m, b)
 }
 func (m *Key_PathElement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Key_PathElement.Marshal(b, m, deterministic)
 }
-func (dst *Key_PathElement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Key_PathElement.Merge(dst, src)
+func (m *Key_PathElement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key_PathElement.Merge(m, src)
 }
 func (m *Key_PathElement) XXX_Size() int {
 	return xxx_messageInfo_Key_PathElement.Size(m)
@@ -248,71 +254,14 @@ func (m *Key_PathElement) GetName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Key_PathElement) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Key_PathElement_Id)(nil),
 		(*Key_PathElement_Name)(nil),
 	}
 }
 
-func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case nil:
-	default:
-		return fmt.Errorf("Key_PathElement.IdType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Key_PathElement)
-	switch tag {
-	case 2: // id_type.id
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.IdType = &Key_PathElement_Id{int64(x)}
-		return true, err
-	case 3: // id_type.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.IdType = &Key_PathElement_Name{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An array value.
 type ArrayValue struct {
 	// Values in the array.
@@ -328,16 +277,17 @@ func (m *ArrayValue) Reset()         { *m = ArrayValue{} }
 func (m *ArrayValue) String() string { return proto.CompactTextString(m) }
 func (*ArrayValue) ProtoMessage()    {}
 func (*ArrayValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_50acbc7f8774bafa, []int{2}
+	return fileDescriptor_66499b178484a7ed, []int{2}
 }
+
 func (m *ArrayValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ArrayValue.Unmarshal(m, b)
 }
 func (m *ArrayValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ArrayValue.Marshal(b, m, deterministic)
 }
-func (dst *ArrayValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ArrayValue.Merge(dst, src)
+func (m *ArrayValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayValue.Merge(m, src)
 }
 func (m *ArrayValue) XXX_Size() int {
 	return xxx_messageInfo_ArrayValue.Size(m)
@@ -387,16 +337,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_50acbc7f8774bafa, []int{3}
+	return fileDescriptor_66499b178484a7ed, []int{3}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -575,9 +526,9 @@ func (m *Value) GetExcludeFromIndexes() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_NullValue)(nil),
 		(*Value_BooleanValue)(nil),
 		(*Value_IntegerValue)(nil),
@@ -592,210 +543,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_IntegerValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		b.EncodeVarint(3<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Value_TimestampValue:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case *Value_KeyValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KeyValue); err != nil {
-			return err
-		}
-	case *Value_StringValue:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BlobValue:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BlobValue)
-	case *Value_GeoPointValue:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GeoPointValue); err != nil {
-			return err
-		}
-	case *Value_EntityValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EntityValue); err != nil {
-			return err
-		}
-	case *Value_ArrayValue:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ArrayValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Value.ValueType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 11: // value_type.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 1: // value_type.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_BooleanValue{x != 0}
-		return true, err
-	case 2: // value_type.integer_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_IntegerValue{int64(x)}
-		return true, err
-	case 3: // value_type.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.ValueType = &Value_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 10: // value_type.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_TimestampValue{msg}
-		return true, err
-	case 5: // value_type.key_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Key)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_KeyValue{msg}
-		return true, err
-	case 17: // value_type.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ValueType = &Value_StringValue{x}
-		return true, err
-	case 18: // value_type.blob_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ValueType = &Value_BlobValue{x}
-		return true, err
-	case 8: // value_type.geo_point_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(latlng.LatLng)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_GeoPointValue{msg}
-		return true, err
-	case 6: // value_type.entity_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Entity)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_EntityValue{msg}
-		return true, err
-	case 9: // value_type.array_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_ArrayValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_IntegerValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_KeyValue:
-		s := proto.Size(x.KeyValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_StringValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BlobValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BlobValue)))
-		n += len(x.BlobValue)
-	case *Value_GeoPointValue:
-		s := proto.Size(x.GeoPointValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_EntityValue:
-		s := proto.Size(x.EntityValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ArrayValue:
-		s := proto.Size(x.ArrayValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A Datastore data object.
 //
 // An entity is limited to 1 megabyte when stored. That _roughly_
@@ -825,16 +572,17 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_entity_50acbc7f8774bafa, []int{4}
+	return fileDescriptor_66499b178484a7ed, []int{4}
 }
+
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
 }
 func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
 }
-func (dst *Entity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Entity.Merge(dst, src)
+func (m *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(m, src)
 }
 func (m *Entity) XXX_Size() int {
 	return xxx_messageInfo_Entity.Size(m)
@@ -870,10 +618,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/datastore/v1beta3/entity.proto", fileDescriptor_entity_50acbc7f8774bafa)
+	proto.RegisterFile("google/datastore/v1beta3/entity.proto", fileDescriptor_66499b178484a7ed)
 }
 
-var fileDescriptor_entity_50acbc7f8774bafa = []byte{
+var fileDescriptor_66499b178484a7ed = []byte{
 	// 789 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xdf, 0x8e, 0xdb, 0x44,
 	0x14, 0xc6, 0xed, 0x64, 0xb3, 0x5d, 0x1f, 0xbb, 0xbb, 0x65, 0xda, 0x0b, 0x2b, 0x6a, 0xd9, 0x10,
diff --git a/googleapis/datastore/v1beta3/query.pb.go b/googleapis/datastore/v1beta3/query.pb.go
index ed8eac9e47..e6478e5721 100644
--- a/googleapis/datastore/v1beta3/query.pb.go
+++ b/googleapis/datastore/v1beta3/query.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/query.proto
 
-package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
+package datastore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies what data the 'entity' field contains.
 // A `ResultType` is either implied (for example, in `LookupResponse.missing`
@@ -45,6 +48,7 @@ var EntityResult_ResultType_name = map[int32]string{
 	2: "PROJECTION",
 	3: "KEY_ONLY",
 }
+
 var EntityResult_ResultType_value = map[string]int32{
 	"RESULT_TYPE_UNSPECIFIED": 0,
 	"FULL":                    1,
@@ -55,8 +59,9 @@ var EntityResult_ResultType_value = map[string]int32{
 func (x EntityResult_ResultType) String() string {
 	return proto.EnumName(EntityResult_ResultType_name, int32(x))
 }
+
 func (EntityResult_ResultType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{0, 0}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{0, 0}
 }
 
 // The sort direction.
@@ -76,6 +81,7 @@ var PropertyOrder_Direction_name = map[int32]string{
 	1: "ASCENDING",
 	2: "DESCENDING",
 }
+
 var PropertyOrder_Direction_value = map[string]int32{
 	"DIRECTION_UNSPECIFIED": 0,
 	"ASCENDING":             1,
@@ -85,8 +91,9 @@ var PropertyOrder_Direction_value = map[string]int32{
 func (x PropertyOrder_Direction) String() string {
 	return proto.EnumName(PropertyOrder_Direction_name, int32(x))
 }
+
 func (PropertyOrder_Direction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{5, 0}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{5, 0}
 }
 
 // A composite filter operator.
@@ -103,6 +110,7 @@ var CompositeFilter_Operator_name = map[int32]string{
 	0: "OPERATOR_UNSPECIFIED",
 	1: "AND",
 }
+
 var CompositeFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED": 0,
 	"AND":                  1,
@@ -111,8 +119,9 @@ var CompositeFilter_Operator_value = map[string]int32{
 func (x CompositeFilter_Operator) String() string {
 	return proto.EnumName(CompositeFilter_Operator_name, int32(x))
 }
+
 func (CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{7, 0}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{7, 0}
 }
 
 // A property filter operator.
@@ -144,6 +153,7 @@ var PropertyFilter_Operator_name = map[int32]string{
 	5:  "EQUAL",
 	11: "HAS_ANCESTOR",
 }
+
 var PropertyFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED":  0,
 	"LESS_THAN":             1,
@@ -157,8 +167,9 @@ var PropertyFilter_Operator_value = map[string]int32{
 func (x PropertyFilter_Operator) String() string {
 	return proto.EnumName(PropertyFilter_Operator_name, int32(x))
 }
+
 func (PropertyFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{8, 0}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{8, 0}
 }
 
 // The possible values for the `more_results` field.
@@ -185,6 +196,7 @@ var QueryResultBatch_MoreResultsType_name = map[int32]string{
 	4: "MORE_RESULTS_AFTER_CURSOR",
 	3: "NO_MORE_RESULTS",
 }
+
 var QueryResultBatch_MoreResultsType_value = map[string]int32{
 	"MORE_RESULTS_TYPE_UNSPECIFIED": 0,
 	"NOT_FINISHED":                  1,
@@ -196,8 +208,9 @@ var QueryResultBatch_MoreResultsType_value = map[string]int32{
 func (x QueryResultBatch_MoreResultsType) String() string {
 	return proto.EnumName(QueryResultBatch_MoreResultsType_name, int32(x))
 }
+
 func (QueryResultBatch_MoreResultsType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{11, 0}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{11, 0}
 }
 
 // The result of fetching an entity from Datastore.
@@ -227,16 +240,17 @@ func (m *EntityResult) Reset()         { *m = EntityResult{} }
 func (m *EntityResult) String() string { return proto.CompactTextString(m) }
 func (*EntityResult) ProtoMessage()    {}
 func (*EntityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{0}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{0}
 }
+
 func (m *EntityResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityResult.Unmarshal(m, b)
 }
 func (m *EntityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityResult.Marshal(b, m, deterministic)
 }
-func (dst *EntityResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityResult.Merge(dst, src)
+func (m *EntityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityResult.Merge(m, src)
 }
 func (m *EntityResult) XXX_Size() int {
 	return xxx_messageInfo_EntityResult.Size(m)
@@ -310,16 +324,17 @@ func (m *Query) Reset()         { *m = Query{} }
 func (m *Query) String() string { return proto.CompactTextString(m) }
 func (*Query) ProtoMessage()    {}
 func (*Query) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{1}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{1}
 }
+
 func (m *Query) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Query.Unmarshal(m, b)
 }
 func (m *Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Query.Marshal(b, m, deterministic)
 }
-func (dst *Query) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Query.Merge(dst, src)
+func (m *Query) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Query.Merge(m, src)
 }
 func (m *Query) XXX_Size() int {
 	return xxx_messageInfo_Query.Size(m)
@@ -406,16 +421,17 @@ func (m *KindExpression) Reset()         { *m = KindExpression{} }
 func (m *KindExpression) String() string { return proto.CompactTextString(m) }
 func (*KindExpression) ProtoMessage()    {}
 func (*KindExpression) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{2}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{2}
 }
+
 func (m *KindExpression) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KindExpression.Unmarshal(m, b)
 }
 func (m *KindExpression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KindExpression.Marshal(b, m, deterministic)
 }
-func (dst *KindExpression) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KindExpression.Merge(dst, src)
+func (m *KindExpression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KindExpression.Merge(m, src)
 }
 func (m *KindExpression) XXX_Size() int {
 	return xxx_messageInfo_KindExpression.Size(m)
@@ -447,16 +463,17 @@ func (m *PropertyReference) Reset()         { *m = PropertyReference{} }
 func (m *PropertyReference) String() string { return proto.CompactTextString(m) }
 func (*PropertyReference) ProtoMessage()    {}
 func (*PropertyReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{3}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{3}
 }
+
 func (m *PropertyReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PropertyReference.Unmarshal(m, b)
 }
 func (m *PropertyReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PropertyReference.Marshal(b, m, deterministic)
 }
-func (dst *PropertyReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PropertyReference.Merge(dst, src)
+func (m *PropertyReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyReference.Merge(m, src)
 }
 func (m *PropertyReference) XXX_Size() int {
 	return xxx_messageInfo_PropertyReference.Size(m)
@@ -487,16 +504,17 @@ func (m *Projection) Reset()         { *m = Projection{} }
 func (m *Projection) String() string { return proto.CompactTextString(m) }
 func (*Projection) ProtoMessage()    {}
 func (*Projection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{4}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{4}
 }
+
 func (m *Projection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Projection.Unmarshal(m, b)
 }
 func (m *Projection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Projection.Marshal(b, m, deterministic)
 }
-func (dst *Projection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Projection.Merge(dst, src)
+func (m *Projection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Projection.Merge(m, src)
 }
 func (m *Projection) XXX_Size() int {
 	return xxx_messageInfo_Projection.Size(m)
@@ -529,16 +547,17 @@ func (m *PropertyOrder) Reset()         { *m = PropertyOrder{} }
 func (m *PropertyOrder) String() string { return proto.CompactTextString(m) }
 func (*PropertyOrder) ProtoMessage()    {}
 func (*PropertyOrder) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{5}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{5}
 }
+
 func (m *PropertyOrder) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PropertyOrder.Unmarshal(m, b)
 }
 func (m *PropertyOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PropertyOrder.Marshal(b, m, deterministic)
 }
-func (dst *PropertyOrder) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PropertyOrder.Merge(dst, src)
+func (m *PropertyOrder) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyOrder.Merge(m, src)
 }
 func (m *PropertyOrder) XXX_Size() int {
 	return xxx_messageInfo_PropertyOrder.Size(m)
@@ -580,16 +599,17 @@ func (m *Filter) Reset()         { *m = Filter{} }
 func (m *Filter) String() string { return proto.CompactTextString(m) }
 func (*Filter) ProtoMessage()    {}
 func (*Filter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{6}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{6}
 }
+
 func (m *Filter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Filter.Unmarshal(m, b)
 }
 func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Filter.Marshal(b, m, deterministic)
 }
-func (dst *Filter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Filter.Merge(dst, src)
+func (m *Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Filter.Merge(m, src)
 }
 func (m *Filter) XXX_Size() int {
 	return xxx_messageInfo_Filter.Size(m)
@@ -637,80 +657,14 @@ func (m *Filter) GetPropertyFilter() *PropertyFilter {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Filter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Filter_OneofMarshaler, _Filter_OneofUnmarshaler, _Filter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Filter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Filter_CompositeFilter)(nil),
 		(*Filter_PropertyFilter)(nil),
 	}
 }
 
-func _Filter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *Filter_CompositeFilter:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CompositeFilter); err != nil {
-			return err
-		}
-	case *Filter_PropertyFilter:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PropertyFilter); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Filter.FilterType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Filter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Filter)
-	switch tag {
-	case 1: // filter_type.composite_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CompositeFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &Filter_CompositeFilter{msg}
-		return true, err
-	case 2: // filter_type.property_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PropertyFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &Filter_PropertyFilter{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Filter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *Filter_CompositeFilter:
-		s := proto.Size(x.CompositeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Filter_PropertyFilter:
-		s := proto.Size(x.PropertyFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A filter that merges multiple other filters using the given operator.
 type CompositeFilter struct {
 	// The operator for combining multiple filters.
@@ -727,16 +681,17 @@ func (m *CompositeFilter) Reset()         { *m = CompositeFilter{} }
 func (m *CompositeFilter) String() string { return proto.CompactTextString(m) }
 func (*CompositeFilter) ProtoMessage()    {}
 func (*CompositeFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{7}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{7}
 }
+
 func (m *CompositeFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CompositeFilter.Unmarshal(m, b)
 }
 func (m *CompositeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CompositeFilter.Marshal(b, m, deterministic)
 }
-func (dst *CompositeFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CompositeFilter.Merge(dst, src)
+func (m *CompositeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompositeFilter.Merge(m, src)
 }
 func (m *CompositeFilter) XXX_Size() int {
 	return xxx_messageInfo_CompositeFilter.Size(m)
@@ -778,16 +733,17 @@ func (m *PropertyFilter) Reset()         { *m = PropertyFilter{} }
 func (m *PropertyFilter) String() string { return proto.CompactTextString(m) }
 func (*PropertyFilter) ProtoMessage()    {}
 func (*PropertyFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{8}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{8}
 }
+
 func (m *PropertyFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PropertyFilter.Unmarshal(m, b)
 }
 func (m *PropertyFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PropertyFilter.Marshal(b, m, deterministic)
 }
-func (dst *PropertyFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PropertyFilter.Merge(dst, src)
+func (m *PropertyFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyFilter.Merge(m, src)
 }
 func (m *PropertyFilter) XXX_Size() int {
 	return xxx_messageInfo_PropertyFilter.Size(m)
@@ -851,16 +807,17 @@ func (m *GqlQuery) Reset()         { *m = GqlQuery{} }
 func (m *GqlQuery) String() string { return proto.CompactTextString(m) }
 func (*GqlQuery) ProtoMessage()    {}
 func (*GqlQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{9}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{9}
 }
+
 func (m *GqlQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GqlQuery.Unmarshal(m, b)
 }
 func (m *GqlQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GqlQuery.Marshal(b, m, deterministic)
 }
-func (dst *GqlQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GqlQuery.Merge(dst, src)
+func (m *GqlQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQuery.Merge(m, src)
 }
 func (m *GqlQuery) XXX_Size() int {
 	return xxx_messageInfo_GqlQuery.Size(m)
@@ -916,16 +873,17 @@ func (m *GqlQueryParameter) Reset()         { *m = GqlQueryParameter{} }
 func (m *GqlQueryParameter) String() string { return proto.CompactTextString(m) }
 func (*GqlQueryParameter) ProtoMessage()    {}
 func (*GqlQueryParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{10}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{10}
 }
+
 func (m *GqlQueryParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GqlQueryParameter.Unmarshal(m, b)
 }
 func (m *GqlQueryParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GqlQueryParameter.Marshal(b, m, deterministic)
 }
-func (dst *GqlQueryParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GqlQueryParameter.Merge(dst, src)
+func (m *GqlQueryParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQueryParameter.Merge(m, src)
 }
 func (m *GqlQueryParameter) XXX_Size() int {
 	return xxx_messageInfo_GqlQueryParameter.Size(m)
@@ -973,76 +931,14 @@ func (m *GqlQueryParameter) GetCursor() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GqlQueryParameter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GqlQueryParameter_OneofMarshaler, _GqlQueryParameter_OneofUnmarshaler, _GqlQueryParameter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GqlQueryParameter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GqlQueryParameter_Value)(nil),
 		(*GqlQueryParameter_Cursor)(nil),
 	}
 }
 
-func _GqlQueryParameter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GqlQueryParameter)
-	// parameter_type
-	switch x := m.ParameterType.(type) {
-	case *GqlQueryParameter_Value:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Value); err != nil {
-			return err
-		}
-	case *GqlQueryParameter_Cursor:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Cursor)
-	case nil:
-	default:
-		return fmt.Errorf("GqlQueryParameter.ParameterType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GqlQueryParameter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GqlQueryParameter)
-	switch tag {
-	case 2: // parameter_type.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.ParameterType = &GqlQueryParameter_Value{msg}
-		return true, err
-	case 3: // parameter_type.cursor
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ParameterType = &GqlQueryParameter_Cursor{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GqlQueryParameter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GqlQueryParameter)
-	// parameter_type
-	switch x := m.ParameterType.(type) {
-	case *GqlQueryParameter_Value:
-		s := proto.Size(x.Value)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *GqlQueryParameter_Cursor:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Cursor)))
-		n += len(x.Cursor)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A batch of results produced by a query.
 type QueryResultBatch struct {
 	// The number of results skipped, typically because of an offset.
@@ -1077,16 +973,17 @@ func (m *QueryResultBatch) Reset()         { *m = QueryResultBatch{} }
 func (m *QueryResultBatch) String() string { return proto.CompactTextString(m) }
 func (*QueryResultBatch) ProtoMessage()    {}
 func (*QueryResultBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_74b0994032fcddf6, []int{11}
+	return fileDescriptor_7ed60bbcd54eb2b7, []int{11}
 }
+
 func (m *QueryResultBatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryResultBatch.Unmarshal(m, b)
 }
 func (m *QueryResultBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryResultBatch.Marshal(b, m, deterministic)
 }
-func (dst *QueryResultBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryResultBatch.Merge(dst, src)
+func (m *QueryResultBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResultBatch.Merge(m, src)
 }
 func (m *QueryResultBatch) XXX_Size() int {
 	return xxx_messageInfo_QueryResultBatch.Size(m)
@@ -1147,6 +1044,11 @@ func (m *QueryResultBatch) GetSnapshotVersion() int64 {
 }
 
 func init() {
+	proto.RegisterEnum("google.datastore.v1beta3.EntityResult_ResultType", EntityResult_ResultType_name, EntityResult_ResultType_value)
+	proto.RegisterEnum("google.datastore.v1beta3.PropertyOrder_Direction", PropertyOrder_Direction_name, PropertyOrder_Direction_value)
+	proto.RegisterEnum("google.datastore.v1beta3.CompositeFilter_Operator", CompositeFilter_Operator_name, CompositeFilter_Operator_value)
+	proto.RegisterEnum("google.datastore.v1beta3.PropertyFilter_Operator", PropertyFilter_Operator_name, PropertyFilter_Operator_value)
+	proto.RegisterEnum("google.datastore.v1beta3.QueryResultBatch_MoreResultsType", QueryResultBatch_MoreResultsType_name, QueryResultBatch_MoreResultsType_value)
 	proto.RegisterType((*EntityResult)(nil), "google.datastore.v1beta3.EntityResult")
 	proto.RegisterType((*Query)(nil), "google.datastore.v1beta3.Query")
 	proto.RegisterType((*KindExpression)(nil), "google.datastore.v1beta3.KindExpression")
@@ -1160,18 +1062,13 @@ func init() {
 	proto.RegisterMapType((map[string]*GqlQueryParameter)(nil), "google.datastore.v1beta3.GqlQuery.NamedBindingsEntry")
 	proto.RegisterType((*GqlQueryParameter)(nil), "google.datastore.v1beta3.GqlQueryParameter")
 	proto.RegisterType((*QueryResultBatch)(nil), "google.datastore.v1beta3.QueryResultBatch")
-	proto.RegisterEnum("google.datastore.v1beta3.EntityResult_ResultType", EntityResult_ResultType_name, EntityResult_ResultType_value)
-	proto.RegisterEnum("google.datastore.v1beta3.PropertyOrder_Direction", PropertyOrder_Direction_name, PropertyOrder_Direction_value)
-	proto.RegisterEnum("google.datastore.v1beta3.CompositeFilter_Operator", CompositeFilter_Operator_name, CompositeFilter_Operator_value)
-	proto.RegisterEnum("google.datastore.v1beta3.PropertyFilter_Operator", PropertyFilter_Operator_name, PropertyFilter_Operator_value)
-	proto.RegisterEnum("google.datastore.v1beta3.QueryResultBatch_MoreResultsType", QueryResultBatch_MoreResultsType_name, QueryResultBatch_MoreResultsType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/datastore/v1beta3/query.proto", fileDescriptor_query_74b0994032fcddf6)
+	proto.RegisterFile("google/datastore/v1beta3/query.proto", fileDescriptor_7ed60bbcd54eb2b7)
 }
 
-var fileDescriptor_query_74b0994032fcddf6 = []byte{
+var fileDescriptor_7ed60bbcd54eb2b7 = []byte{
 	// 1323 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcb, 0x6e, 0xdb, 0x46,
 	0x14, 0x35, 0xa9, 0x87, 0xa5, 0xab, 0x17, 0x33, 0x69, 0x53, 0xc6, 0x79, 0xd4, 0x21, 0x92, 0x46,
diff --git a/googleapis/devtools/build/v1/build_events.pb.go b/googleapis/devtools/build/v1/build_events.pb.go
index 01a4cbecfc..46cfc83bb5 100644
--- a/googleapis/devtools/build/v1/build_events.pb.go
+++ b/googleapis/devtools/build/v1/build_events.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/build_events.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
+package build
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of console output stream.
 type ConsoleOutputStream int32
@@ -38,6 +41,7 @@ var ConsoleOutputStream_name = map[int32]string{
 	1: "STDOUT",
 	2: "STDERR",
 }
+
 var ConsoleOutputStream_value = map[string]int32{
 	"UNKNOWN": 0,
 	"STDOUT":  1,
@@ -47,8 +51,9 @@ var ConsoleOutputStream_value = map[string]int32{
 func (x ConsoleOutputStream) String() string {
 	return proto.EnumName(ConsoleOutputStream_name, int32(x))
 }
+
 func (ConsoleOutputStream) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0}
 }
 
 // How did the event stream finish.
@@ -71,6 +76,7 @@ var BuildEvent_BuildComponentStreamFinished_FinishType_name = map[int32]string{
 	1: "FINISHED",
 	2: "EXPIRED",
 }
+
 var BuildEvent_BuildComponentStreamFinished_FinishType_value = map[string]int32{
 	"FINISH_TYPE_UNSPECIFIED": 0,
 	"FINISHED":                1,
@@ -80,8 +86,9 @@ var BuildEvent_BuildComponentStreamFinished_FinishType_value = map[string]int32{
 func (x BuildEvent_BuildComponentStreamFinished_FinishType) String() string {
 	return proto.EnumName(BuildEvent_BuildComponentStreamFinished_FinishType_name, int32(x))
 }
+
 func (BuildEvent_BuildComponentStreamFinished_FinishType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0, 5, 0}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0, 5, 0}
 }
 
 // Which build component generates this event stream. Each build component
@@ -105,6 +112,7 @@ var StreamId_BuildComponent_name = map[int32]string{
 	2: "WORKER",
 	3: "TOOL",
 }
+
 var StreamId_BuildComponent_value = map[string]int32{
 	"UNKNOWN_COMPONENT": 0,
 	"CONTROLLER":        1,
@@ -115,8 +123,9 @@ var StreamId_BuildComponent_value = map[string]int32{
 func (x StreamId_BuildComponent) String() string {
 	return proto.EnumName(StreamId_BuildComponent_name, int32(x))
 }
+
 func (StreamId_BuildComponent) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{1, 0}
+	return fileDescriptor_b1e5c65e074f08f4, []int{1, 0}
 }
 
 // An event representing some state change that occurred in the build. This
@@ -148,16 +157,17 @@ func (m *BuildEvent) Reset()         { *m = BuildEvent{} }
 func (m *BuildEvent) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent) ProtoMessage()    {}
 func (*BuildEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0}
 }
+
 func (m *BuildEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildEvent.Unmarshal(m, b)
 }
 func (m *BuildEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildEvent.Marshal(b, m, deterministic)
 }
-func (dst *BuildEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildEvent.Merge(dst, src)
+func (m *BuildEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent.Merge(m, src)
 }
 func (m *BuildEvent) XXX_Size() int {
 	return xxx_messageInfo_BuildEvent.Size(m)
@@ -303,9 +313,9 @@ func (m *BuildEvent) GetSourceFetchEvent() *any.Any {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BuildEvent) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BuildEvent_OneofMarshaler, _BuildEvent_OneofUnmarshaler, _BuildEvent_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BuildEvent) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BuildEvent_InvocationAttemptStarted_)(nil),
 		(*BuildEvent_InvocationAttemptFinished_)(nil),
 		(*BuildEvent_BuildEnqueued_)(nil),
@@ -318,198 +328,6 @@ func (*BuildEvent) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _BuildEvent_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BuildEvent)
-	// event
-	switch x := m.Event.(type) {
-	case *BuildEvent_InvocationAttemptStarted_:
-		b.EncodeVarint(51<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InvocationAttemptStarted); err != nil {
-			return err
-		}
-	case *BuildEvent_InvocationAttemptFinished_:
-		b.EncodeVarint(52<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InvocationAttemptFinished); err != nil {
-			return err
-		}
-	case *BuildEvent_BuildEnqueued_:
-		b.EncodeVarint(53<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BuildEnqueued); err != nil {
-			return err
-		}
-	case *BuildEvent_BuildFinished_:
-		b.EncodeVarint(55<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BuildFinished); err != nil {
-			return err
-		}
-	case *BuildEvent_ConsoleOutput_:
-		b.EncodeVarint(56<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConsoleOutput); err != nil {
-			return err
-		}
-	case *BuildEvent_ComponentStreamFinished:
-		b.EncodeVarint(59<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ComponentStreamFinished); err != nil {
-			return err
-		}
-	case *BuildEvent_BazelEvent:
-		b.EncodeVarint(60<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BazelEvent); err != nil {
-			return err
-		}
-	case *BuildEvent_BuildExecutionEvent:
-		b.EncodeVarint(61<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BuildExecutionEvent); err != nil {
-			return err
-		}
-	case *BuildEvent_SourceFetchEvent:
-		b.EncodeVarint(62<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SourceFetchEvent); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BuildEvent.Event has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BuildEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BuildEvent)
-	switch tag {
-	case 51: // event.invocation_attempt_started
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildEvent_InvocationAttemptStarted)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_InvocationAttemptStarted_{msg}
-		return true, err
-	case 52: // event.invocation_attempt_finished
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildEvent_InvocationAttemptFinished)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_InvocationAttemptFinished_{msg}
-		return true, err
-	case 53: // event.build_enqueued
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildEvent_BuildEnqueued)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_BuildEnqueued_{msg}
-		return true, err
-	case 55: // event.build_finished
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildEvent_BuildFinished)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_BuildFinished_{msg}
-		return true, err
-	case 56: // event.console_output
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildEvent_ConsoleOutput)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_ConsoleOutput_{msg}
-		return true, err
-	case 59: // event.component_stream_finished
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildEvent_BuildComponentStreamFinished)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_ComponentStreamFinished{msg}
-		return true, err
-	case 60: // event.bazel_event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_BazelEvent{msg}
-		return true, err
-	case 61: // event.build_execution_event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_BuildExecutionEvent{msg}
-		return true, err
-	case 62: // event.source_fetch_event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Event = &BuildEvent_SourceFetchEvent{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BuildEvent_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BuildEvent)
-	// event
-	switch x := m.Event.(type) {
-	case *BuildEvent_InvocationAttemptStarted_:
-		s := proto.Size(x.InvocationAttemptStarted)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_InvocationAttemptFinished_:
-		s := proto.Size(x.InvocationAttemptFinished)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_BuildEnqueued_:
-		s := proto.Size(x.BuildEnqueued)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_BuildFinished_:
-		s := proto.Size(x.BuildFinished)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_ConsoleOutput_:
-		s := proto.Size(x.ConsoleOutput)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_ComponentStreamFinished:
-		s := proto.Size(x.ComponentStreamFinished)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_BazelEvent:
-		s := proto.Size(x.BazelEvent)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_BuildExecutionEvent:
-		s := proto.Size(x.BuildExecutionEvent)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildEvent_SourceFetchEvent:
-		s := proto.Size(x.SourceFetchEvent)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Notification that the build system has attempted to run the build tool.
 type BuildEvent_InvocationAttemptStarted struct {
 	// The number of the invocation attempt, starting at 1 and increasing by 1
@@ -527,16 +345,17 @@ func (m *BuildEvent_InvocationAttemptStarted) Reset()         { *m = BuildEvent_
 func (m *BuildEvent_InvocationAttemptStarted) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_InvocationAttemptStarted) ProtoMessage()    {}
 func (*BuildEvent_InvocationAttemptStarted) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0, 0}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0, 0}
 }
+
 func (m *BuildEvent_InvocationAttemptStarted) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Unmarshal(m, b)
 }
 func (m *BuildEvent_InvocationAttemptStarted) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Marshal(b, m, deterministic)
 }
-func (dst *BuildEvent_InvocationAttemptStarted) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Merge(dst, src)
+func (m *BuildEvent_InvocationAttemptStarted) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Merge(m, src)
 }
 func (m *BuildEvent_InvocationAttemptStarted) XXX_Size() int {
 	return xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Size(m)
@@ -574,16 +393,17 @@ func (m *BuildEvent_InvocationAttemptFinished) Reset()         { *m = BuildEvent
 func (m *BuildEvent_InvocationAttemptFinished) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_InvocationAttemptFinished) ProtoMessage()    {}
 func (*BuildEvent_InvocationAttemptFinished) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0, 1}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0, 1}
 }
+
 func (m *BuildEvent_InvocationAttemptFinished) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Unmarshal(m, b)
 }
 func (m *BuildEvent_InvocationAttemptFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Marshal(b, m, deterministic)
 }
-func (dst *BuildEvent_InvocationAttemptFinished) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Merge(dst, src)
+func (m *BuildEvent_InvocationAttemptFinished) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Merge(m, src)
 }
 func (m *BuildEvent_InvocationAttemptFinished) XXX_Size() int {
 	return xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Size(m)
@@ -614,16 +434,17 @@ func (m *BuildEvent_BuildEnqueued) Reset()         { *m = BuildEvent_BuildEnqueu
 func (m *BuildEvent_BuildEnqueued) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_BuildEnqueued) ProtoMessage()    {}
 func (*BuildEvent_BuildEnqueued) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0, 2}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0, 2}
 }
+
 func (m *BuildEvent_BuildEnqueued) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildEvent_BuildEnqueued.Unmarshal(m, b)
 }
 func (m *BuildEvent_BuildEnqueued) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildEvent_BuildEnqueued.Marshal(b, m, deterministic)
 }
-func (dst *BuildEvent_BuildEnqueued) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildEvent_BuildEnqueued.Merge(dst, src)
+func (m *BuildEvent_BuildEnqueued) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_BuildEnqueued.Merge(m, src)
 }
 func (m *BuildEvent_BuildEnqueued) XXX_Size() int {
 	return xxx_messageInfo_BuildEvent_BuildEnqueued.Size(m)
@@ -656,16 +477,17 @@ func (m *BuildEvent_BuildFinished) Reset()         { *m = BuildEvent_BuildFinish
 func (m *BuildEvent_BuildFinished) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_BuildFinished) ProtoMessage()    {}
 func (*BuildEvent_BuildFinished) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0, 3}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0, 3}
 }
+
 func (m *BuildEvent_BuildFinished) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildEvent_BuildFinished.Unmarshal(m, b)
 }
 func (m *BuildEvent_BuildFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildEvent_BuildFinished.Marshal(b, m, deterministic)
 }
-func (dst *BuildEvent_BuildFinished) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildEvent_BuildFinished.Merge(dst, src)
+func (m *BuildEvent_BuildFinished) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_BuildFinished.Merge(m, src)
 }
 func (m *BuildEvent_BuildFinished) XXX_Size() int {
 	return xxx_messageInfo_BuildEvent_BuildFinished.Size(m)
@@ -702,16 +524,17 @@ func (m *BuildEvent_ConsoleOutput) Reset()         { *m = BuildEvent_ConsoleOutp
 func (m *BuildEvent_ConsoleOutput) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_ConsoleOutput) ProtoMessage()    {}
 func (*BuildEvent_ConsoleOutput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0, 4}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0, 4}
 }
+
 func (m *BuildEvent_ConsoleOutput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildEvent_ConsoleOutput.Unmarshal(m, b)
 }
 func (m *BuildEvent_ConsoleOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildEvent_ConsoleOutput.Marshal(b, m, deterministic)
 }
-func (dst *BuildEvent_ConsoleOutput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildEvent_ConsoleOutput.Merge(dst, src)
+func (m *BuildEvent_ConsoleOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_ConsoleOutput.Merge(m, src)
 }
 func (m *BuildEvent_ConsoleOutput) XXX_Size() int {
 	return xxx_messageInfo_BuildEvent_ConsoleOutput.Size(m)
@@ -766,72 +589,14 @@ func (m *BuildEvent_ConsoleOutput) GetBinaryOutput() []byte {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BuildEvent_ConsoleOutput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BuildEvent_ConsoleOutput_OneofMarshaler, _BuildEvent_ConsoleOutput_OneofUnmarshaler, _BuildEvent_ConsoleOutput_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BuildEvent_ConsoleOutput) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BuildEvent_ConsoleOutput_TextOutput)(nil),
 		(*BuildEvent_ConsoleOutput_BinaryOutput)(nil),
 	}
 }
 
-func _BuildEvent_ConsoleOutput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BuildEvent_ConsoleOutput)
-	// output
-	switch x := m.Output.(type) {
-	case *BuildEvent_ConsoleOutput_TextOutput:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TextOutput)
-	case *BuildEvent_ConsoleOutput_BinaryOutput:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BinaryOutput)
-	case nil:
-	default:
-		return fmt.Errorf("BuildEvent_ConsoleOutput.Output has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BuildEvent_ConsoleOutput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BuildEvent_ConsoleOutput)
-	switch tag {
-	case 2: // output.text_output
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Output = &BuildEvent_ConsoleOutput_TextOutput{x}
-		return true, err
-	case 3: // output.binary_output
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Output = &BuildEvent_ConsoleOutput_BinaryOutput{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BuildEvent_ConsoleOutput_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BuildEvent_ConsoleOutput)
-	// output
-	switch x := m.Output.(type) {
-	case *BuildEvent_ConsoleOutput_TextOutput:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TextOutput)))
-		n += len(x.TextOutput)
-	case *BuildEvent_ConsoleOutput_BinaryOutput:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BinaryOutput)))
-		n += len(x.BinaryOutput)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Notification of the end of a build event stream published by a build
 // component other than CONTROLLER (See StreamId.BuildComponents).
 type BuildEvent_BuildComponentStreamFinished struct {
@@ -848,16 +613,17 @@ func (m *BuildEvent_BuildComponentStreamFinished) Reset() {
 func (m *BuildEvent_BuildComponentStreamFinished) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_BuildComponentStreamFinished) ProtoMessage()    {}
 func (*BuildEvent_BuildComponentStreamFinished) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{0, 5}
+	return fileDescriptor_b1e5c65e074f08f4, []int{0, 5}
 }
+
 func (m *BuildEvent_BuildComponentStreamFinished) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Unmarshal(m, b)
 }
 func (m *BuildEvent_BuildComponentStreamFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Marshal(b, m, deterministic)
 }
-func (dst *BuildEvent_BuildComponentStreamFinished) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Merge(dst, src)
+func (m *BuildEvent_BuildComponentStreamFinished) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Merge(m, src)
 }
 func (m *BuildEvent_BuildComponentStreamFinished) XXX_Size() int {
 	return xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Size(m)
@@ -893,16 +659,17 @@ func (m *StreamId) Reset()         { *m = StreamId{} }
 func (m *StreamId) String() string { return proto.CompactTextString(m) }
 func (*StreamId) ProtoMessage()    {}
 func (*StreamId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_events_fb145f4342778ee6, []int{1}
+	return fileDescriptor_b1e5c65e074f08f4, []int{1}
 }
+
 func (m *StreamId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamId.Unmarshal(m, b)
 }
 func (m *StreamId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamId.Marshal(b, m, deterministic)
 }
-func (dst *StreamId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamId.Merge(dst, src)
+func (m *StreamId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamId.Merge(m, src)
 }
 func (m *StreamId) XXX_Size() int {
 	return xxx_messageInfo_StreamId.Size(m)
@@ -935,6 +702,9 @@ func (m *StreamId) GetComponent() StreamId_BuildComponent {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.build.v1.ConsoleOutputStream", ConsoleOutputStream_name, ConsoleOutputStream_value)
+	proto.RegisterEnum("google.devtools.build.v1.BuildEvent_BuildComponentStreamFinished_FinishType", BuildEvent_BuildComponentStreamFinished_FinishType_name, BuildEvent_BuildComponentStreamFinished_FinishType_value)
+	proto.RegisterEnum("google.devtools.build.v1.StreamId_BuildComponent", StreamId_BuildComponent_name, StreamId_BuildComponent_value)
 	proto.RegisterType((*BuildEvent)(nil), "google.devtools.build.v1.BuildEvent")
 	proto.RegisterType((*BuildEvent_InvocationAttemptStarted)(nil), "google.devtools.build.v1.BuildEvent.InvocationAttemptStarted")
 	proto.RegisterType((*BuildEvent_InvocationAttemptFinished)(nil), "google.devtools.build.v1.BuildEvent.InvocationAttemptFinished")
@@ -943,16 +713,13 @@ func init() {
 	proto.RegisterType((*BuildEvent_ConsoleOutput)(nil), "google.devtools.build.v1.BuildEvent.ConsoleOutput")
 	proto.RegisterType((*BuildEvent_BuildComponentStreamFinished)(nil), "google.devtools.build.v1.BuildEvent.BuildComponentStreamFinished")
 	proto.RegisterType((*StreamId)(nil), "google.devtools.build.v1.StreamId")
-	proto.RegisterEnum("google.devtools.build.v1.ConsoleOutputStream", ConsoleOutputStream_name, ConsoleOutputStream_value)
-	proto.RegisterEnum("google.devtools.build.v1.BuildEvent_BuildComponentStreamFinished_FinishType", BuildEvent_BuildComponentStreamFinished_FinishType_name, BuildEvent_BuildComponentStreamFinished_FinishType_value)
-	proto.RegisterEnum("google.devtools.build.v1.StreamId_BuildComponent", StreamId_BuildComponent_name, StreamId_BuildComponent_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/build/v1/build_events.proto", fileDescriptor_build_events_fb145f4342778ee6)
+	proto.RegisterFile("google/devtools/build/v1/build_events.proto", fileDescriptor_b1e5c65e074f08f4)
 }
 
-var fileDescriptor_build_events_fb145f4342778ee6 = []byte{
+var fileDescriptor_b1e5c65e074f08f4 = []byte{
 	// 896 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x6d, 0x6f, 0xe3, 0x44,
 	0x10, 0xc7, 0xe3, 0xf6, 0x48, 0xd3, 0x69, 0x13, 0x7c, 0x7b, 0x9c, 0xce, 0xf1, 0x55, 0x02, 0x8a,
diff --git a/googleapis/devtools/build/v1/build_status.pb.go b/googleapis/devtools/build/v1/build_status.pb.go
index 9d69f8cdc9..38cf9c255b 100644
--- a/googleapis/devtools/build/v1/build_status.pb.go
+++ b/googleapis/devtools/build/v1/build_status.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/build_status.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
+package build
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The end result of the Build.
 type BuildStatus_Result int32
@@ -55,6 +58,7 @@ var BuildStatus_Result_name = map[int32]string{
 	8: "REQUEST_DEADLINE_EXCEEDED",
 	7: "CANCELLED",
 }
+
 var BuildStatus_Result_value = map[string]int32{
 	"UNKNOWN_STATUS":               0,
 	"COMMAND_SUCCEEDED":            1,
@@ -70,8 +74,9 @@ var BuildStatus_Result_value = map[string]int32{
 func (x BuildStatus_Result) String() string {
 	return proto.EnumName(BuildStatus_Result_name, int32(x))
 }
+
 func (BuildStatus_Result) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_build_status_9c10e159cbe6c1da, []int{0, 0}
+	return fileDescriptor_f5ec8917bb205301, []int{0, 0}
 }
 
 // Status used for both invocation attempt and overall build completion.
@@ -89,16 +94,17 @@ func (m *BuildStatus) Reset()         { *m = BuildStatus{} }
 func (m *BuildStatus) String() string { return proto.CompactTextString(m) }
 func (*BuildStatus) ProtoMessage()    {}
 func (*BuildStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_status_9c10e159cbe6c1da, []int{0}
+	return fileDescriptor_f5ec8917bb205301, []int{0}
 }
+
 func (m *BuildStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildStatus.Unmarshal(m, b)
 }
 func (m *BuildStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildStatus.Marshal(b, m, deterministic)
 }
-func (dst *BuildStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildStatus.Merge(dst, src)
+func (m *BuildStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildStatus.Merge(m, src)
 }
 func (m *BuildStatus) XXX_Size() int {
 	return xxx_messageInfo_BuildStatus.Size(m)
@@ -124,15 +130,15 @@ func (m *BuildStatus) GetDetails() *any.Any {
 }
 
 func init() {
-	proto.RegisterType((*BuildStatus)(nil), "google.devtools.build.v1.BuildStatus")
 	proto.RegisterEnum("google.devtools.build.v1.BuildStatus_Result", BuildStatus_Result_name, BuildStatus_Result_value)
+	proto.RegisterType((*BuildStatus)(nil), "google.devtools.build.v1.BuildStatus")
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/build/v1/build_status.proto", fileDescriptor_build_status_9c10e159cbe6c1da)
+	proto.RegisterFile("google/devtools/build/v1/build_status.proto", fileDescriptor_f5ec8917bb205301)
 }
 
-var fileDescriptor_build_status_9c10e159cbe6c1da = []byte{
+var fileDescriptor_f5ec8917bb205301 = []byte{
 	// 390 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x0b, 0xd3, 0x30,
 	0x18, 0xc6, 0xcd, 0xd4, 0x4e, 0x33, 0x1d, 0x35, 0xa8, 0x6c, 0x63, 0xc2, 0xd8, 0x69, 0xa0, 0xa4,
diff --git a/googleapis/devtools/build/v1/publish_build_event.pb.go b/googleapis/devtools/build/v1/publish_build_event.pb.go
index 1bdea944f4..40d02ab887 100644
--- a/googleapis/devtools/build/v1/publish_build_event.pb.go
+++ b/googleapis/devtools/build/v1/publish_build_event.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/publish_build_event.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package build
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The service level of the build request. Backends only uses this value when
 // the BuildEnqueued event is published to determine what level of service
@@ -43,6 +43,7 @@ var PublishLifecycleEventRequest_ServiceLevel_name = map[int32]string{
 	0: "NONINTERACTIVE",
 	1: "INTERACTIVE",
 }
+
 var PublishLifecycleEventRequest_ServiceLevel_value = map[string]int32{
 	"NONINTERACTIVE": 0,
 	"INTERACTIVE":    1,
@@ -51,8 +52,9 @@ var PublishLifecycleEventRequest_ServiceLevel_value = map[string]int32{
 func (x PublishLifecycleEventRequest_ServiceLevel) String() string {
 	return proto.EnumName(PublishLifecycleEventRequest_ServiceLevel_name, int32(x))
 }
+
 func (PublishLifecycleEventRequest_ServiceLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_publish_build_event_d745bb02eff36c4f, []int{0, 0}
+	return fileDescriptor_81da11d19c4841eb, []int{0, 0}
 }
 
 // Publishes 'lifecycle events' that update the high-level state of a build:
@@ -91,16 +93,17 @@ func (m *PublishLifecycleEventRequest) Reset()         { *m = PublishLifecycleEv
 func (m *PublishLifecycleEventRequest) String() string { return proto.CompactTextString(m) }
 func (*PublishLifecycleEventRequest) ProtoMessage()    {}
 func (*PublishLifecycleEventRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_publish_build_event_d745bb02eff36c4f, []int{0}
+	return fileDescriptor_81da11d19c4841eb, []int{0}
 }
+
 func (m *PublishLifecycleEventRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublishLifecycleEventRequest.Unmarshal(m, b)
 }
 func (m *PublishLifecycleEventRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublishLifecycleEventRequest.Marshal(b, m, deterministic)
 }
-func (dst *PublishLifecycleEventRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublishLifecycleEventRequest.Merge(dst, src)
+func (m *PublishLifecycleEventRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishLifecycleEventRequest.Merge(m, src)
 }
 func (m *PublishLifecycleEventRequest) XXX_Size() int {
 	return xxx_messageInfo_PublishLifecycleEventRequest.Size(m)
@@ -162,16 +165,17 @@ func (m *PublishBuildToolEventStreamResponse) Reset()         { *m = PublishBuil
 func (m *PublishBuildToolEventStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*PublishBuildToolEventStreamResponse) ProtoMessage()    {}
 func (*PublishBuildToolEventStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_publish_build_event_d745bb02eff36c4f, []int{1}
+	return fileDescriptor_81da11d19c4841eb, []int{1}
 }
+
 func (m *PublishBuildToolEventStreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublishBuildToolEventStreamResponse.Unmarshal(m, b)
 }
 func (m *PublishBuildToolEventStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublishBuildToolEventStreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *PublishBuildToolEventStreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublishBuildToolEventStreamResponse.Merge(dst, src)
+func (m *PublishBuildToolEventStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishBuildToolEventStreamResponse.Merge(m, src)
 }
 func (m *PublishBuildToolEventStreamResponse) XXX_Size() int {
 	return xxx_messageInfo_PublishBuildToolEventStreamResponse.Size(m)
@@ -216,16 +220,17 @@ func (m *OrderedBuildEvent) Reset()         { *m = OrderedBuildEvent{} }
 func (m *OrderedBuildEvent) String() string { return proto.CompactTextString(m) }
 func (*OrderedBuildEvent) ProtoMessage()    {}
 func (*OrderedBuildEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_publish_build_event_d745bb02eff36c4f, []int{2}
+	return fileDescriptor_81da11d19c4841eb, []int{2}
 }
+
 func (m *OrderedBuildEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OrderedBuildEvent.Unmarshal(m, b)
 }
 func (m *OrderedBuildEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OrderedBuildEvent.Marshal(b, m, deterministic)
 }
-func (dst *OrderedBuildEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OrderedBuildEvent.Merge(dst, src)
+func (m *OrderedBuildEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrderedBuildEvent.Merge(m, src)
 }
 func (m *OrderedBuildEvent) XXX_Size() int {
 	return xxx_messageInfo_OrderedBuildEvent.Size(m)
@@ -280,16 +285,17 @@ func (m *PublishBuildToolEventStreamRequest) Reset()         { *m = PublishBuild
 func (m *PublishBuildToolEventStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*PublishBuildToolEventStreamRequest) ProtoMessage()    {}
 func (*PublishBuildToolEventStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_publish_build_event_d745bb02eff36c4f, []int{3}
+	return fileDescriptor_81da11d19c4841eb, []int{3}
 }
+
 func (m *PublishBuildToolEventStreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublishBuildToolEventStreamRequest.Unmarshal(m, b)
 }
 func (m *PublishBuildToolEventStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublishBuildToolEventStreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *PublishBuildToolEventStreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublishBuildToolEventStreamRequest.Merge(dst, src)
+func (m *PublishBuildToolEventStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishBuildToolEventStreamRequest.Merge(m, src)
 }
 func (m *PublishBuildToolEventStreamRequest) XXX_Size() int {
 	return xxx_messageInfo_PublishBuildToolEventStreamRequest.Size(m)
@@ -322,11 +328,61 @@ func (m *PublishBuildToolEventStreamRequest) GetProjectId() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.build.v1.PublishLifecycleEventRequest_ServiceLevel", PublishLifecycleEventRequest_ServiceLevel_name, PublishLifecycleEventRequest_ServiceLevel_value)
 	proto.RegisterType((*PublishLifecycleEventRequest)(nil), "google.devtools.build.v1.PublishLifecycleEventRequest")
 	proto.RegisterType((*PublishBuildToolEventStreamResponse)(nil), "google.devtools.build.v1.PublishBuildToolEventStreamResponse")
 	proto.RegisterType((*OrderedBuildEvent)(nil), "google.devtools.build.v1.OrderedBuildEvent")
 	proto.RegisterType((*PublishBuildToolEventStreamRequest)(nil), "google.devtools.build.v1.PublishBuildToolEventStreamRequest")
-	proto.RegisterEnum("google.devtools.build.v1.PublishLifecycleEventRequest_ServiceLevel", PublishLifecycleEventRequest_ServiceLevel_name, PublishLifecycleEventRequest_ServiceLevel_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/build/v1/publish_build_event.proto", fileDescriptor_81da11d19c4841eb)
+}
+
+var fileDescriptor_81da11d19c4841eb = []byte{
+	// 670 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0x66, 0x9b, 0xb6, 0x22, 0x9b, 0x36, 0xa5, 0x0b, 0x05, 0x93, 0x16, 0x14, 0x2d, 0x48, 0x44,
+	0xad, 0x64, 0xd3, 0x44, 0xe2, 0x50, 0xa8, 0x80, 0x94, 0x48, 0x44, 0x54, 0x69, 0xe5, 0x46, 0x1c,
+	0xca, 0xc1, 0x38, 0xf6, 0x34, 0x35, 0x75, 0xbc, 0xc6, 0xbb, 0x0e, 0xaa, 0x10, 0x17, 0x5e, 0x80,
+	0x03, 0x4f, 0xc0, 0x63, 0xf0, 0x08, 0xdc, 0x90, 0x10, 0x6f, 0xc0, 0x99, 0x33, 0x47, 0xe4, 0x5d,
+	0x07, 0x0c, 0xc1, 0x41, 0xe4, 0xc0, 0xcd, 0xbb, 0x33, 0xdf, 0x37, 0xf3, 0xcd, 0xcf, 0x1a, 0xd7,
+	0xfb, 0x8c, 0xf5, 0x7d, 0x30, 0x5c, 0x18, 0x0a, 0xc6, 0x7c, 0x6e, 0xf4, 0x62, 0xcf, 0x77, 0x8d,
+	0xe1, 0xa6, 0x11, 0xc6, 0x3d, 0xdf, 0xe3, 0xc7, 0x96, 0xbc, 0xb0, 0x60, 0x08, 0x81, 0xd0, 0xc3,
+	0x88, 0x09, 0x46, 0x34, 0x85, 0xd1, 0x47, 0x18, 0x5d, 0xba, 0xe8, 0xc3, 0xcd, 0xca, 0x5a, 0xca,
+	0x66, 0x87, 0x9e, 0x61, 0x07, 0x01, 0x13, 0xb6, 0xf0, 0x58, 0xc0, 0x15, 0xae, 0xb2, 0x91, 0x1b,
+	0x2b, 0x13, 0x63, 0xe4, 0x7c, 0x35, 0x75, 0x96, 0xa7, 0x5e, 0x7c, 0x64, 0xb8, 0x71, 0x24, 0xd9,
+	0x52, 0xfb, 0xea, 0xef, 0x76, 0x18, 0x84, 0xe2, 0x54, 0x19, 0xe9, 0xbb, 0x02, 0x5e, 0xdb, 0x57,
+	0xf9, 0xef, 0x7a, 0x47, 0xe0, 0x9c, 0x3a, 0x3e, 0xb4, 0x12, 0x76, 0x13, 0x9e, 0xc7, 0xc0, 0x05,
+	0x39, 0xc6, 0x8b, 0x1c, 0xa2, 0xa1, 0xe7, 0x80, 0xe5, 0xc3, 0x10, 0x7c, 0x0d, 0x55, 0x51, 0xad,
+	0x5c, 0xdf, 0xd1, 0xf3, 0xa4, 0xe9, 0x93, 0xe8, 0xf4, 0x03, 0xc5, 0xb5, 0x9b, 0x50, 0x99, 0x0b,
+	0x3c, 0x73, 0x22, 0xbb, 0xb8, 0x94, 0x51, 0xa7, 0xcd, 0x54, 0x51, 0xad, 0x54, 0xdf, 0xc8, 0x8f,
+	0xb3, 0x17, 0xb9, 0x10, 0x81, 0xdb, 0x4c, 0xce, 0x2a, 0x06, 0xee, 0xfd, 0xf8, 0x26, 0xf7, 0x70,
+	0x99, 0x8b, 0x08, 0xec, 0x81, 0x25, 0xbc, 0x01, 0xb0, 0x58, 0x68, 0x05, 0x49, 0x78, 0x79, 0x44,
+	0x38, 0x2a, 0x87, 0xfe, 0x20, 0x2d, 0x97, 0xb9, 0xa8, 0x00, 0x5d, 0xe5, 0x4f, 0x1a, 0x78, 0x25,
+	0x60, 0xc2, 0x3b, 0xf2, 0x1c, 0x69, 0xb6, 0x4e, 0xe0, 0xf4, 0x05, 0x8b, 0x5c, 0xae, 0xcd, 0x56,
+	0x0b, 0xb5, 0xa2, 0x79, 0x21, 0x6b, 0x7c, 0x94, 0xda, 0xc8, 0x15, 0x8c, 0xc3, 0x88, 0x3d, 0x03,
+	0x47, 0x58, 0x9e, 0xab, 0xcd, 0x57, 0x51, 0xad, 0x68, 0x16, 0xd3, 0x9b, 0xb6, 0x4b, 0x1b, 0x78,
+	0x21, 0x5b, 0x01, 0x42, 0x70, 0xb9, 0xb3, 0xd7, 0x69, 0x77, 0xba, 0x2d, 0xf3, 0xfe, 0x4e, 0xb7,
+	0xfd, 0xb8, 0x75, 0xee, 0x0c, 0x59, 0xc2, 0xa5, 0xec, 0x05, 0xa2, 0x6f, 0x10, 0xbe, 0x96, 0x16,
+	0x55, 0x8a, 0xed, 0x32, 0xe6, 0x4b, 0x91, 0x07, 0x32, 0x5f, 0x13, 0x78, 0xc8, 0x02, 0x0e, 0xe4,
+	0x2e, 0x2e, 0xa6, 0x92, 0x3d, 0x57, 0xb6, 0xa9, 0x54, 0xa7, 0xf9, 0xe5, 0x53, 0xe0, 0xb6, 0x6b,
+	0x9e, 0xe5, 0xe9, 0x17, 0xb9, 0x81, 0x97, 0x78, 0xd2, 0xa7, 0xc0, 0x01, 0x2b, 0x88, 0x07, 0x3d,
+	0x88, 0x64, 0x17, 0x0a, 0x66, 0x79, 0x74, 0xdd, 0x91, 0xb7, 0xf4, 0x3d, 0xc2, 0xcb, 0x63, 0xe5,
+	0xff, 0x7f, 0xf1, 0xc9, 0x16, 0x9e, 0x53, 0x43, 0xa2, 0x7a, 0x7a, 0x3d, 0x3f, 0x4a, 0x66, 0x3a,
+	0x14, 0x84, 0x7e, 0x46, 0x98, 0x4e, 0xac, 0xa6, 0x9a, 0xfb, 0x27, 0xf8, 0x3c, 0x53, 0x0a, 0xb3,
+	0x7b, 0xad, 0xcd, 0xfe, 0xfb, 0x54, 0x2e, 0xb3, 0xb1, 0x4a, 0xe5, 0x8e, 0xd6, 0xdc, 0xd4, 0xa3,
+	0x55, 0xff, 0x58, 0xc0, 0xcb, 0x59, 0x5d, 0x2a, 0xd2, 0x07, 0x84, 0x57, 0xfe, 0xb8, 0x90, 0xe4,
+	0xd6, 0x74, 0x1b, 0x5c, 0xb9, 0x38, 0xb6, 0x40, 0xad, 0xe4, 0x3d, 0xa1, 0x4f, 0x5f, 0x7f, 0xfa,
+	0xf2, 0x76, 0xe6, 0x90, 0x36, 0xe4, 0x93, 0xa8, 0xd2, 0xe2, 0xc6, 0xcb, 0x9f, 0x29, 0x6f, 0xaf,
+	0xbf, 0x32, 0xfc, 0x5f, 0x28, 0xf9, 0x56, 0xfa, 0x74, 0x6e, 0xa1, 0xf5, 0xc3, 0x2a, 0x5d, 0x4d,
+	0x90, 0xf9, 0x1e, 0xe4, 0x2b, 0xc2, 0xab, 0x13, 0x3a, 0x47, 0xee, 0xfc, 0x55, 0xd1, 0x84, 0x86,
+	0x57, 0xb6, 0xa7, 0x44, 0xab, 0xe5, 0xa3, 0x1d, 0x29, 0xff, 0x21, 0x5d, 0x9f, 0x24, 0x1f, 0xc6,
+	0x54, 0x5f, 0xa2, 0x24, 0x01, 0x8c, 0x19, 0x6a, 0xe8, 0x26, 0x6a, 0x86, 0x78, 0xcd, 0x61, 0x83,
+	0xdc, 0xbc, 0x9a, 0x0b, 0x4d, 0xdb, 0x39, 0x81, 0xc0, 0xdd, 0x4f, 0x3a, 0xb1, 0x8f, 0x0e, 0xb7,
+	0x53, 0xcf, 0x3e, 0xf3, 0xed, 0xa0, 0xaf, 0xb3, 0xa8, 0x6f, 0xf4, 0x21, 0x90, 0x7d, 0x32, 0x94,
+	0xc9, 0x0e, 0x3d, 0x3e, 0xfe, 0x57, 0xb9, 0x2d, 0x3f, 0xbe, 0x21, 0xd4, 0x9b, 0x97, 0xce, 0x8d,
+	0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x68, 0x27, 0x13, 0xed, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -490,53 +546,3 @@ var _PublishBuildEvent_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/devtools/build/v1/publish_build_event.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/build/v1/publish_build_event.proto", fileDescriptor_publish_build_event_d745bb02eff36c4f)
-}
-
-var fileDescriptor_publish_build_event_d745bb02eff36c4f = []byte{
-	// 670 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0x66, 0x9b, 0xb6, 0x22, 0x9b, 0x36, 0xa5, 0x0b, 0x05, 0x93, 0x16, 0x14, 0x2d, 0x48, 0x44,
-	0xad, 0x64, 0xd3, 0x44, 0xe2, 0x50, 0xa8, 0x80, 0x94, 0x48, 0x44, 0x54, 0x69, 0xe5, 0x46, 0x1c,
-	0xca, 0xc1, 0x38, 0xf6, 0x34, 0x35, 0x75, 0xbc, 0xc6, 0xbb, 0x0e, 0xaa, 0x10, 0x17, 0x5e, 0x80,
-	0x03, 0x4f, 0xc0, 0x63, 0xf0, 0x08, 0xdc, 0x90, 0x10, 0x6f, 0xc0, 0x99, 0x33, 0x47, 0xe4, 0x5d,
-	0x07, 0x0c, 0xc1, 0x41, 0xe4, 0xc0, 0xcd, 0xbb, 0x33, 0xdf, 0x37, 0xf3, 0xcd, 0xcf, 0x1a, 0xd7,
-	0xfb, 0x8c, 0xf5, 0x7d, 0x30, 0x5c, 0x18, 0x0a, 0xc6, 0x7c, 0x6e, 0xf4, 0x62, 0xcf, 0x77, 0x8d,
-	0xe1, 0xa6, 0x11, 0xc6, 0x3d, 0xdf, 0xe3, 0xc7, 0x96, 0xbc, 0xb0, 0x60, 0x08, 0x81, 0xd0, 0xc3,
-	0x88, 0x09, 0x46, 0x34, 0x85, 0xd1, 0x47, 0x18, 0x5d, 0xba, 0xe8, 0xc3, 0xcd, 0xca, 0x5a, 0xca,
-	0x66, 0x87, 0x9e, 0x61, 0x07, 0x01, 0x13, 0xb6, 0xf0, 0x58, 0xc0, 0x15, 0xae, 0xb2, 0x91, 0x1b,
-	0x2b, 0x13, 0x63, 0xe4, 0x7c, 0x35, 0x75, 0x96, 0xa7, 0x5e, 0x7c, 0x64, 0xb8, 0x71, 0x24, 0xd9,
-	0x52, 0xfb, 0xea, 0xef, 0x76, 0x18, 0x84, 0xe2, 0x54, 0x19, 0xe9, 0xbb, 0x02, 0x5e, 0xdb, 0x57,
-	0xf9, 0xef, 0x7a, 0x47, 0xe0, 0x9c, 0x3a, 0x3e, 0xb4, 0x12, 0x76, 0x13, 0x9e, 0xc7, 0xc0, 0x05,
-	0x39, 0xc6, 0x8b, 0x1c, 0xa2, 0xa1, 0xe7, 0x80, 0xe5, 0xc3, 0x10, 0x7c, 0x0d, 0x55, 0x51, 0xad,
-	0x5c, 0xdf, 0xd1, 0xf3, 0xa4, 0xe9, 0x93, 0xe8, 0xf4, 0x03, 0xc5, 0xb5, 0x9b, 0x50, 0x99, 0x0b,
-	0x3c, 0x73, 0x22, 0xbb, 0xb8, 0x94, 0x51, 0xa7, 0xcd, 0x54, 0x51, 0xad, 0x54, 0xdf, 0xc8, 0x8f,
-	0xb3, 0x17, 0xb9, 0x10, 0x81, 0xdb, 0x4c, 0xce, 0x2a, 0x06, 0xee, 0xfd, 0xf8, 0x26, 0xf7, 0x70,
-	0x99, 0x8b, 0x08, 0xec, 0x81, 0x25, 0xbc, 0x01, 0xb0, 0x58, 0x68, 0x05, 0x49, 0x78, 0x79, 0x44,
-	0x38, 0x2a, 0x87, 0xfe, 0x20, 0x2d, 0x97, 0xb9, 0xa8, 0x00, 0x5d, 0xe5, 0x4f, 0x1a, 0x78, 0x25,
-	0x60, 0xc2, 0x3b, 0xf2, 0x1c, 0x69, 0xb6, 0x4e, 0xe0, 0xf4, 0x05, 0x8b, 0x5c, 0xae, 0xcd, 0x56,
-	0x0b, 0xb5, 0xa2, 0x79, 0x21, 0x6b, 0x7c, 0x94, 0xda, 0xc8, 0x15, 0x8c, 0xc3, 0x88, 0x3d, 0x03,
-	0x47, 0x58, 0x9e, 0xab, 0xcd, 0x57, 0x51, 0xad, 0x68, 0x16, 0xd3, 0x9b, 0xb6, 0x4b, 0x1b, 0x78,
-	0x21, 0x5b, 0x01, 0x42, 0x70, 0xb9, 0xb3, 0xd7, 0x69, 0x77, 0xba, 0x2d, 0xf3, 0xfe, 0x4e, 0xb7,
-	0xfd, 0xb8, 0x75, 0xee, 0x0c, 0x59, 0xc2, 0xa5, 0xec, 0x05, 0xa2, 0x6f, 0x10, 0xbe, 0x96, 0x16,
-	0x55, 0x8a, 0xed, 0x32, 0xe6, 0x4b, 0x91, 0x07, 0x32, 0x5f, 0x13, 0x78, 0xc8, 0x02, 0x0e, 0xe4,
-	0x2e, 0x2e, 0xa6, 0x92, 0x3d, 0x57, 0xb6, 0xa9, 0x54, 0xa7, 0xf9, 0xe5, 0x53, 0xe0, 0xb6, 0x6b,
-	0x9e, 0xe5, 0xe9, 0x17, 0xb9, 0x81, 0x97, 0x78, 0xd2, 0xa7, 0xc0, 0x01, 0x2b, 0x88, 0x07, 0x3d,
-	0x88, 0x64, 0x17, 0x0a, 0x66, 0x79, 0x74, 0xdd, 0x91, 0xb7, 0xf4, 0x3d, 0xc2, 0xcb, 0x63, 0xe5,
-	0xff, 0x7f, 0xf1, 0xc9, 0x16, 0x9e, 0x53, 0x43, 0xa2, 0x7a, 0x7a, 0x3d, 0x3f, 0x4a, 0x66, 0x3a,
-	0x14, 0x84, 0x7e, 0x46, 0x98, 0x4e, 0xac, 0xa6, 0x9a, 0xfb, 0x27, 0xf8, 0x3c, 0x53, 0x0a, 0xb3,
-	0x7b, 0xad, 0xcd, 0xfe, 0xfb, 0x54, 0x2e, 0xb3, 0xb1, 0x4a, 0xe5, 0x8e, 0xd6, 0xdc, 0xd4, 0xa3,
-	0x55, 0xff, 0x58, 0xc0, 0xcb, 0x59, 0x5d, 0x2a, 0xd2, 0x07, 0x84, 0x57, 0xfe, 0xb8, 0x90, 0xe4,
-	0xd6, 0x74, 0x1b, 0x5c, 0xb9, 0x38, 0xb6, 0x40, 0xad, 0xe4, 0x3d, 0xa1, 0x4f, 0x5f, 0x7f, 0xfa,
-	0xf2, 0x76, 0xe6, 0x90, 0x36, 0xe4, 0x93, 0xa8, 0xd2, 0xe2, 0xc6, 0xcb, 0x9f, 0x29, 0x6f, 0xaf,
-	0xbf, 0x32, 0xfc, 0x5f, 0x28, 0xf9, 0x56, 0xfa, 0x74, 0x6e, 0xa1, 0xf5, 0xc3, 0x2a, 0x5d, 0x4d,
-	0x90, 0xf9, 0x1e, 0xe4, 0x2b, 0xc2, 0xab, 0x13, 0x3a, 0x47, 0xee, 0xfc, 0x55, 0xd1, 0x84, 0x86,
-	0x57, 0xb6, 0xa7, 0x44, 0xab, 0xe5, 0xa3, 0x1d, 0x29, 0xff, 0x21, 0x5d, 0x9f, 0x24, 0x1f, 0xc6,
-	0x54, 0x5f, 0xa2, 0x24, 0x01, 0x8c, 0x19, 0x6a, 0xe8, 0x26, 0x6a, 0x86, 0x78, 0xcd, 0x61, 0x83,
-	0xdc, 0xbc, 0x9a, 0x0b, 0x4d, 0xdb, 0x39, 0x81, 0xc0, 0xdd, 0x4f, 0x3a, 0xb1, 0x8f, 0x0e, 0xb7,
-	0x53, 0xcf, 0x3e, 0xf3, 0xed, 0xa0, 0xaf, 0xb3, 0xa8, 0x6f, 0xf4, 0x21, 0x90, 0x7d, 0x32, 0x94,
-	0xc9, 0x0e, 0x3d, 0x3e, 0xfe, 0x57, 0xb9, 0x2d, 0x3f, 0xbe, 0x21, 0xd4, 0x9b, 0x97, 0xce, 0x8d,
-	0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x68, 0x27, 0x13, 0xed, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go b/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
index de367cbde6..688de7154b 100644
--- a/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
+++ b/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
@@ -1,22 +1,22 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudbuild/v1/cloudbuild.proto
 
-package cloudbuild // import "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/httpbody"
-import _ "google.golang.org/genproto/googleapis/cloud/audit"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package cloudbuild
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/httpbody"
+	_ "google.golang.org/genproto/googleapis/cloud/audit"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -29,7 +29,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Possible status of a build or build step.
 type Build_Status int32
@@ -63,6 +63,7 @@ var Build_Status_name = map[int32]string{
 	6: "TIMEOUT",
 	7: "CANCELLED",
 }
+
 var Build_Status_value = map[string]int32{
 	"STATUS_UNKNOWN": 0,
 	"QUEUED":         1,
@@ -77,8 +78,9 @@ var Build_Status_value = map[string]int32{
 func (x Build_Status) String() string {
 	return proto.EnumName(Build_Status_name, int32(x))
 }
+
 func (Build_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{10, 0}
+	return fileDescriptor_8a9099620ac1526a, []int{10, 0}
 }
 
 // Specifies the hash algorithm, if any.
@@ -98,6 +100,7 @@ var Hash_HashType_name = map[int32]string{
 	1: "SHA256",
 	2: "MD5",
 }
+
 var Hash_HashType_value = map[string]int32{
 	"NONE":   0,
 	"SHA256": 1,
@@ -107,8 +110,9 @@ var Hash_HashType_value = map[string]int32{
 func (x Hash_HashType) String() string {
 	return proto.EnumName(Hash_HashType_name, int32(x))
 }
+
 func (Hash_HashType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{16, 0}
+	return fileDescriptor_8a9099620ac1526a, []int{16, 0}
 }
 
 // Specifies the manner in which the build should be verified, if at all.
@@ -125,6 +129,7 @@ var BuildOptions_VerifyOption_name = map[int32]string{
 	0: "NOT_VERIFIED",
 	1: "VERIFIED",
 }
+
 var BuildOptions_VerifyOption_value = map[string]int32{
 	"NOT_VERIFIED": 0,
 	"VERIFIED":     1,
@@ -133,8 +138,9 @@ var BuildOptions_VerifyOption_value = map[string]int32{
 func (x BuildOptions_VerifyOption) String() string {
 	return proto.EnumName(BuildOptions_VerifyOption_name, int32(x))
 }
+
 func (BuildOptions_VerifyOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{30, 0}
+	return fileDescriptor_8a9099620ac1526a, []int{30, 0}
 }
 
 // Supported VM sizes.
@@ -154,6 +160,7 @@ var BuildOptions_MachineType_name = map[int32]string{
 	1: "N1_HIGHCPU_8",
 	2: "N1_HIGHCPU_32",
 }
+
 var BuildOptions_MachineType_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"N1_HIGHCPU_8":  1,
@@ -163,8 +170,9 @@ var BuildOptions_MachineType_value = map[string]int32{
 func (x BuildOptions_MachineType) String() string {
 	return proto.EnumName(BuildOptions_MachineType_name, int32(x))
 }
+
 func (BuildOptions_MachineType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{30, 1}
+	return fileDescriptor_8a9099620ac1526a, []int{30, 1}
 }
 
 // Specifies the behavior when there is an error in the substitution checks.
@@ -182,6 +190,7 @@ var BuildOptions_SubstitutionOption_name = map[int32]string{
 	0: "MUST_MATCH",
 	1: "ALLOW_LOOSE",
 }
+
 var BuildOptions_SubstitutionOption_value = map[string]int32{
 	"MUST_MATCH":  0,
 	"ALLOW_LOOSE": 1,
@@ -190,8 +199,9 @@ var BuildOptions_SubstitutionOption_value = map[string]int32{
 func (x BuildOptions_SubstitutionOption) String() string {
 	return proto.EnumName(BuildOptions_SubstitutionOption_name, int32(x))
 }
+
 func (BuildOptions_SubstitutionOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{30, 2}
+	return fileDescriptor_8a9099620ac1526a, []int{30, 2}
 }
 
 // Specifies the behavior when writing build logs to Google Cloud Storage.
@@ -212,6 +222,7 @@ var BuildOptions_LogStreamingOption_name = map[int32]string{
 	1: "STREAM_ON",
 	2: "STREAM_OFF",
 }
+
 var BuildOptions_LogStreamingOption_value = map[string]int32{
 	"STREAM_DEFAULT": 0,
 	"STREAM_ON":      1,
@@ -221,8 +232,9 @@ var BuildOptions_LogStreamingOption_value = map[string]int32{
 func (x BuildOptions_LogStreamingOption) String() string {
 	return proto.EnumName(BuildOptions_LogStreamingOption_name, int32(x))
 }
+
 func (BuildOptions_LogStreamingOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{30, 3}
+	return fileDescriptor_8a9099620ac1526a, []int{30, 3}
 }
 
 // Specifies the logging mode.
@@ -243,6 +255,7 @@ var BuildOptions_LoggingMode_name = map[int32]string{
 	1: "LEGACY",
 	2: "GCS_ONLY",
 }
+
 var BuildOptions_LoggingMode_value = map[string]int32{
 	"LOGGING_UNSPECIFIED": 0,
 	"LEGACY":              1,
@@ -252,8 +265,9 @@ var BuildOptions_LoggingMode_value = map[string]int32{
 func (x BuildOptions_LoggingMode) String() string {
 	return proto.EnumName(BuildOptions_LoggingMode_name, int32(x))
 }
+
 func (BuildOptions_LoggingMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{30, 4}
+	return fileDescriptor_8a9099620ac1526a, []int{30, 4}
 }
 
 // Specifies a build to retry.
@@ -271,16 +285,17 @@ func (m *RetryBuildRequest) Reset()         { *m = RetryBuildRequest{} }
 func (m *RetryBuildRequest) String() string { return proto.CompactTextString(m) }
 func (*RetryBuildRequest) ProtoMessage()    {}
 func (*RetryBuildRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{0}
+	return fileDescriptor_8a9099620ac1526a, []int{0}
 }
+
 func (m *RetryBuildRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryBuildRequest.Unmarshal(m, b)
 }
 func (m *RetryBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryBuildRequest.Marshal(b, m, deterministic)
 }
-func (dst *RetryBuildRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryBuildRequest.Merge(dst, src)
+func (m *RetryBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryBuildRequest.Merge(m, src)
 }
 func (m *RetryBuildRequest) XXX_Size() int {
 	return xxx_messageInfo_RetryBuildRequest.Size(m)
@@ -322,16 +337,17 @@ func (m *RunBuildTriggerRequest) Reset()         { *m = RunBuildTriggerRequest{}
 func (m *RunBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*RunBuildTriggerRequest) ProtoMessage()    {}
 func (*RunBuildTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{1}
+	return fileDescriptor_8a9099620ac1526a, []int{1}
 }
+
 func (m *RunBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunBuildTriggerRequest.Unmarshal(m, b)
 }
 func (m *RunBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunBuildTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunBuildTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunBuildTriggerRequest.Merge(dst, src)
+func (m *RunBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunBuildTriggerRequest.Merge(m, src)
 }
 func (m *RunBuildTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_RunBuildTriggerRequest.Size(m)
@@ -386,16 +402,17 @@ func (m *StorageSource) Reset()         { *m = StorageSource{} }
 func (m *StorageSource) String() string { return proto.CompactTextString(m) }
 func (*StorageSource) ProtoMessage()    {}
 func (*StorageSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{2}
+	return fileDescriptor_8a9099620ac1526a, []int{2}
 }
+
 func (m *StorageSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StorageSource.Unmarshal(m, b)
 }
 func (m *StorageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StorageSource.Marshal(b, m, deterministic)
 }
-func (dst *StorageSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StorageSource.Merge(dst, src)
+func (m *StorageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageSource.Merge(m, src)
 }
 func (m *StorageSource) XXX_Size() int {
 	return xxx_messageInfo_StorageSource.Size(m)
@@ -457,16 +474,17 @@ func (m *RepoSource) Reset()         { *m = RepoSource{} }
 func (m *RepoSource) String() string { return proto.CompactTextString(m) }
 func (*RepoSource) ProtoMessage()    {}
 func (*RepoSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{3}
+	return fileDescriptor_8a9099620ac1526a, []int{3}
 }
+
 func (m *RepoSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepoSource.Unmarshal(m, b)
 }
 func (m *RepoSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepoSource.Marshal(b, m, deterministic)
 }
-func (dst *RepoSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepoSource.Merge(dst, src)
+func (m *RepoSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoSource.Merge(m, src)
 }
 func (m *RepoSource) XXX_Size() int {
 	return xxx_messageInfo_RepoSource.Size(m)
@@ -548,87 +566,15 @@ func (m *RepoSource) GetDir() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RepoSource) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RepoSource_OneofMarshaler, _RepoSource_OneofUnmarshaler, _RepoSource_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RepoSource) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RepoSource_BranchName)(nil),
 		(*RepoSource_TagName)(nil),
 		(*RepoSource_CommitSha)(nil),
 	}
 }
 
-func _RepoSource_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RepoSource)
-	// revision
-	switch x := m.Revision.(type) {
-	case *RepoSource_BranchName:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.BranchName)
-	case *RepoSource_TagName:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TagName)
-	case *RepoSource_CommitSha:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CommitSha)
-	case nil:
-	default:
-		return fmt.Errorf("RepoSource.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RepoSource_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RepoSource)
-	switch tag {
-	case 3: // revision.branch_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &RepoSource_BranchName{x}
-		return true, err
-	case 4: // revision.tag_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &RepoSource_TagName{x}
-		return true, err
-	case 5: // revision.commit_sha
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &RepoSource_CommitSha{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RepoSource_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RepoSource)
-	// revision
-	switch x := m.Revision.(type) {
-	case *RepoSource_BranchName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BranchName)))
-		n += len(x.BranchName)
-	case *RepoSource_TagName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TagName)))
-		n += len(x.TagName)
-	case *RepoSource_CommitSha:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.CommitSha)))
-		n += len(x.CommitSha)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Location of the source in a supported storage service.
 type Source struct {
 	// Location of source.
@@ -646,16 +592,17 @@ func (m *Source) Reset()         { *m = Source{} }
 func (m *Source) String() string { return proto.CompactTextString(m) }
 func (*Source) ProtoMessage()    {}
 func (*Source) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{4}
+	return fileDescriptor_8a9099620ac1526a, []int{4}
 }
+
 func (m *Source) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Source.Unmarshal(m, b)
 }
 func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
 }
-func (dst *Source) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Source.Merge(dst, src)
+func (m *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(m, src)
 }
 func (m *Source) XXX_Size() int {
 	return xxx_messageInfo_Source.Size(m)
@@ -703,80 +650,14 @@ func (m *Source) GetRepoSource() *RepoSource {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Source) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Source_OneofMarshaler, _Source_OneofUnmarshaler, _Source_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Source) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Source_StorageSource)(nil),
 		(*Source_RepoSource)(nil),
 	}
 }
 
-func _Source_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Source)
-	// source
-	switch x := m.Source.(type) {
-	case *Source_StorageSource:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StorageSource); err != nil {
-			return err
-		}
-	case *Source_RepoSource:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RepoSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Source.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Source_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Source)
-	switch tag {
-	case 2: // source.storage_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StorageSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &Source_StorageSource{msg}
-		return true, err
-	case 3: // source.repo_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RepoSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &Source_RepoSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Source_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Source)
-	// source
-	switch x := m.Source.(type) {
-	case *Source_StorageSource:
-		s := proto.Size(x.StorageSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Source_RepoSource:
-		s := proto.Size(x.RepoSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An image built by the pipeline.
 type BuiltImage struct {
 	// Name used to push the container image to Google Container Registry, as
@@ -795,16 +676,17 @@ func (m *BuiltImage) Reset()         { *m = BuiltImage{} }
 func (m *BuiltImage) String() string { return proto.CompactTextString(m) }
 func (*BuiltImage) ProtoMessage()    {}
 func (*BuiltImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{5}
+	return fileDescriptor_8a9099620ac1526a, []int{5}
 }
+
 func (m *BuiltImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuiltImage.Unmarshal(m, b)
 }
 func (m *BuiltImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuiltImage.Marshal(b, m, deterministic)
 }
-func (dst *BuiltImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuiltImage.Merge(dst, src)
+func (m *BuiltImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuiltImage.Merge(m, src)
 }
 func (m *BuiltImage) XXX_Size() int {
 	return xxx_messageInfo_BuiltImage.Size(m)
@@ -926,16 +808,17 @@ func (m *BuildStep) Reset()         { *m = BuildStep{} }
 func (m *BuildStep) String() string { return proto.CompactTextString(m) }
 func (*BuildStep) ProtoMessage()    {}
 func (*BuildStep) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{6}
+	return fileDescriptor_8a9099620ac1526a, []int{6}
 }
+
 func (m *BuildStep) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildStep.Unmarshal(m, b)
 }
 func (m *BuildStep) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildStep.Marshal(b, m, deterministic)
 }
-func (dst *BuildStep) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildStep.Merge(dst, src)
+func (m *BuildStep) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildStep.Merge(m, src)
 }
 func (m *BuildStep) XXX_Size() int {
 	return xxx_messageInfo_BuildStep.Size(m)
@@ -1059,16 +942,17 @@ func (m *Volume) Reset()         { *m = Volume{} }
 func (m *Volume) String() string { return proto.CompactTextString(m) }
 func (*Volume) ProtoMessage()    {}
 func (*Volume) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{7}
+	return fileDescriptor_8a9099620ac1526a, []int{7}
 }
+
 func (m *Volume) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Volume.Unmarshal(m, b)
 }
 func (m *Volume) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Volume.Marshal(b, m, deterministic)
 }
-func (dst *Volume) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Volume.Merge(dst, src)
+func (m *Volume) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Volume.Merge(m, src)
 }
 func (m *Volume) XXX_Size() int {
 	return xxx_messageInfo_Volume.Size(m)
@@ -1120,16 +1004,17 @@ func (m *Results) Reset()         { *m = Results{} }
 func (m *Results) String() string { return proto.CompactTextString(m) }
 func (*Results) ProtoMessage()    {}
 func (*Results) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{8}
+	return fileDescriptor_8a9099620ac1526a, []int{8}
 }
+
 func (m *Results) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Results.Unmarshal(m, b)
 }
 func (m *Results) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Results.Marshal(b, m, deterministic)
 }
-func (dst *Results) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Results.Merge(dst, src)
+func (m *Results) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Results.Merge(m, src)
 }
 func (m *Results) XXX_Size() int {
 	return xxx_messageInfo_Results.Size(m)
@@ -1193,16 +1078,17 @@ func (m *ArtifactResult) Reset()         { *m = ArtifactResult{} }
 func (m *ArtifactResult) String() string { return proto.CompactTextString(m) }
 func (*ArtifactResult) ProtoMessage()    {}
 func (*ArtifactResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{9}
+	return fileDescriptor_8a9099620ac1526a, []int{9}
 }
+
 func (m *ArtifactResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ArtifactResult.Unmarshal(m, b)
 }
 func (m *ArtifactResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ArtifactResult.Marshal(b, m, deterministic)
 }
-func (dst *ArtifactResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ArtifactResult.Merge(dst, src)
+func (m *ArtifactResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArtifactResult.Merge(m, src)
 }
 func (m *ArtifactResult) XXX_Size() int {
 	return xxx_messageInfo_ArtifactResult.Size(m)
@@ -1327,16 +1213,17 @@ func (m *Build) Reset()         { *m = Build{} }
 func (m *Build) String() string { return proto.CompactTextString(m) }
 func (*Build) ProtoMessage()    {}
 func (*Build) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{10}
+	return fileDescriptor_8a9099620ac1526a, []int{10}
 }
+
 func (m *Build) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Build.Unmarshal(m, b)
 }
 func (m *Build) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Build.Marshal(b, m, deterministic)
 }
-func (dst *Build) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Build.Merge(dst, src)
+func (m *Build) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Build.Merge(m, src)
 }
 func (m *Build) XXX_Size() int {
 	return xxx_messageInfo_Build.Size(m)
@@ -1535,16 +1422,17 @@ func (m *Artifacts) Reset()         { *m = Artifacts{} }
 func (m *Artifacts) String() string { return proto.CompactTextString(m) }
 func (*Artifacts) ProtoMessage()    {}
 func (*Artifacts) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{11}
+	return fileDescriptor_8a9099620ac1526a, []int{11}
 }
+
 func (m *Artifacts) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Artifacts.Unmarshal(m, b)
 }
 func (m *Artifacts) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Artifacts.Marshal(b, m, deterministic)
 }
-func (dst *Artifacts) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Artifacts.Merge(dst, src)
+func (m *Artifacts) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifacts.Merge(m, src)
 }
 func (m *Artifacts) XXX_Size() int {
 	return xxx_messageInfo_Artifacts.Size(m)
@@ -1592,16 +1480,17 @@ func (m *Artifacts_ArtifactObjects) Reset()         { *m = Artifacts_ArtifactObj
 func (m *Artifacts_ArtifactObjects) String() string { return proto.CompactTextString(m) }
 func (*Artifacts_ArtifactObjects) ProtoMessage()    {}
 func (*Artifacts_ArtifactObjects) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{11, 0}
+	return fileDescriptor_8a9099620ac1526a, []int{11, 0}
 }
+
 func (m *Artifacts_ArtifactObjects) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Artifacts_ArtifactObjects.Unmarshal(m, b)
 }
 func (m *Artifacts_ArtifactObjects) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Artifacts_ArtifactObjects.Marshal(b, m, deterministic)
 }
-func (dst *Artifacts_ArtifactObjects) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Artifacts_ArtifactObjects.Merge(dst, src)
+func (m *Artifacts_ArtifactObjects) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifacts_ArtifactObjects.Merge(m, src)
 }
 func (m *Artifacts_ArtifactObjects) XXX_Size() int {
 	return xxx_messageInfo_Artifacts_ArtifactObjects.Size(m)
@@ -1648,16 +1537,17 @@ func (m *TimeSpan) Reset()         { *m = TimeSpan{} }
 func (m *TimeSpan) String() string { return proto.CompactTextString(m) }
 func (*TimeSpan) ProtoMessage()    {}
 func (*TimeSpan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{12}
+	return fileDescriptor_8a9099620ac1526a, []int{12}
 }
+
 func (m *TimeSpan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeSpan.Unmarshal(m, b)
 }
 func (m *TimeSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeSpan.Marshal(b, m, deterministic)
 }
-func (dst *TimeSpan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeSpan.Merge(dst, src)
+func (m *TimeSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeSpan.Merge(m, src)
 }
 func (m *TimeSpan) XXX_Size() int {
 	return xxx_messageInfo_TimeSpan.Size(m)
@@ -1695,16 +1585,17 @@ func (m *BuildOperationMetadata) Reset()         { *m = BuildOperationMetadata{}
 func (m *BuildOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*BuildOperationMetadata) ProtoMessage()    {}
 func (*BuildOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{13}
+	return fileDescriptor_8a9099620ac1526a, []int{13}
 }
+
 func (m *BuildOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildOperationMetadata.Unmarshal(m, b)
 }
 func (m *BuildOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *BuildOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildOperationMetadata.Merge(dst, src)
+func (m *BuildOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildOperationMetadata.Merge(m, src)
 }
 func (m *BuildOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_BuildOperationMetadata.Size(m)
@@ -1751,16 +1642,17 @@ func (m *SourceProvenance) Reset()         { *m = SourceProvenance{} }
 func (m *SourceProvenance) String() string { return proto.CompactTextString(m) }
 func (*SourceProvenance) ProtoMessage()    {}
 func (*SourceProvenance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{14}
+	return fileDescriptor_8a9099620ac1526a, []int{14}
 }
+
 func (m *SourceProvenance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceProvenance.Unmarshal(m, b)
 }
 func (m *SourceProvenance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceProvenance.Marshal(b, m, deterministic)
 }
-func (dst *SourceProvenance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceProvenance.Merge(dst, src)
+func (m *SourceProvenance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceProvenance.Merge(m, src)
 }
 func (m *SourceProvenance) XXX_Size() int {
 	return xxx_messageInfo_SourceProvenance.Size(m)
@@ -1806,16 +1698,17 @@ func (m *FileHashes) Reset()         { *m = FileHashes{} }
 func (m *FileHashes) String() string { return proto.CompactTextString(m) }
 func (*FileHashes) ProtoMessage()    {}
 func (*FileHashes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{15}
+	return fileDescriptor_8a9099620ac1526a, []int{15}
 }
+
 func (m *FileHashes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileHashes.Unmarshal(m, b)
 }
 func (m *FileHashes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileHashes.Marshal(b, m, deterministic)
 }
-func (dst *FileHashes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileHashes.Merge(dst, src)
+func (m *FileHashes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileHashes.Merge(m, src)
 }
 func (m *FileHashes) XXX_Size() int {
 	return xxx_messageInfo_FileHashes.Size(m)
@@ -1848,16 +1741,17 @@ func (m *Hash) Reset()         { *m = Hash{} }
 func (m *Hash) String() string { return proto.CompactTextString(m) }
 func (*Hash) ProtoMessage()    {}
 func (*Hash) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{16}
+	return fileDescriptor_8a9099620ac1526a, []int{16}
 }
+
 func (m *Hash) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Hash.Unmarshal(m, b)
 }
 func (m *Hash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Hash.Marshal(b, m, deterministic)
 }
-func (dst *Hash) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Hash.Merge(dst, src)
+func (m *Hash) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Hash.Merge(m, src)
 }
 func (m *Hash) XXX_Size() int {
 	return xxx_messageInfo_Hash.Size(m)
@@ -1903,16 +1797,17 @@ func (m *Secret) Reset()         { *m = Secret{} }
 func (m *Secret) String() string { return proto.CompactTextString(m) }
 func (*Secret) ProtoMessage()    {}
 func (*Secret) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{17}
+	return fileDescriptor_8a9099620ac1526a, []int{17}
 }
+
 func (m *Secret) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Secret.Unmarshal(m, b)
 }
 func (m *Secret) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Secret.Marshal(b, m, deterministic)
 }
-func (dst *Secret) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Secret.Merge(dst, src)
+func (m *Secret) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Secret.Merge(m, src)
 }
 func (m *Secret) XXX_Size() int {
 	return xxx_messageInfo_Secret.Size(m)
@@ -1952,16 +1847,17 @@ func (m *CreateBuildRequest) Reset()         { *m = CreateBuildRequest{} }
 func (m *CreateBuildRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateBuildRequest) ProtoMessage()    {}
 func (*CreateBuildRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{18}
+	return fileDescriptor_8a9099620ac1526a, []int{18}
 }
+
 func (m *CreateBuildRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateBuildRequest.Unmarshal(m, b)
 }
 func (m *CreateBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateBuildRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateBuildRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateBuildRequest.Merge(dst, src)
+func (m *CreateBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBuildRequest.Merge(m, src)
 }
 func (m *CreateBuildRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateBuildRequest.Size(m)
@@ -2001,16 +1897,17 @@ func (m *GetBuildRequest) Reset()         { *m = GetBuildRequest{} }
 func (m *GetBuildRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBuildRequest) ProtoMessage()    {}
 func (*GetBuildRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{19}
+	return fileDescriptor_8a9099620ac1526a, []int{19}
 }
+
 func (m *GetBuildRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBuildRequest.Unmarshal(m, b)
 }
 func (m *GetBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBuildRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetBuildRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBuildRequest.Merge(dst, src)
+func (m *GetBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBuildRequest.Merge(m, src)
 }
 func (m *GetBuildRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBuildRequest.Size(m)
@@ -2054,16 +1951,17 @@ func (m *ListBuildsRequest) Reset()         { *m = ListBuildsRequest{} }
 func (m *ListBuildsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListBuildsRequest) ProtoMessage()    {}
 func (*ListBuildsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{20}
+	return fileDescriptor_8a9099620ac1526a, []int{20}
 }
+
 func (m *ListBuildsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBuildsRequest.Unmarshal(m, b)
 }
 func (m *ListBuildsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBuildsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListBuildsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBuildsRequest.Merge(dst, src)
+func (m *ListBuildsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildsRequest.Merge(m, src)
 }
 func (m *ListBuildsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListBuildsRequest.Size(m)
@@ -2117,16 +2015,17 @@ func (m *ListBuildsResponse) Reset()         { *m = ListBuildsResponse{} }
 func (m *ListBuildsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListBuildsResponse) ProtoMessage()    {}
 func (*ListBuildsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{21}
+	return fileDescriptor_8a9099620ac1526a, []int{21}
 }
+
 func (m *ListBuildsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBuildsResponse.Unmarshal(m, b)
 }
 func (m *ListBuildsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBuildsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListBuildsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBuildsResponse.Merge(dst, src)
+func (m *ListBuildsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildsResponse.Merge(m, src)
 }
 func (m *ListBuildsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListBuildsResponse.Size(m)
@@ -2166,16 +2065,17 @@ func (m *CancelBuildRequest) Reset()         { *m = CancelBuildRequest{} }
 func (m *CancelBuildRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelBuildRequest) ProtoMessage()    {}
 func (*CancelBuildRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{22}
+	return fileDescriptor_8a9099620ac1526a, []int{22}
 }
+
 func (m *CancelBuildRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelBuildRequest.Unmarshal(m, b)
 }
 func (m *CancelBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelBuildRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelBuildRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelBuildRequest.Merge(dst, src)
+func (m *CancelBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelBuildRequest.Merge(m, src)
 }
 func (m *CancelBuildRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelBuildRequest.Size(m)
@@ -2253,16 +2153,17 @@ func (m *BuildTrigger) Reset()         { *m = BuildTrigger{} }
 func (m *BuildTrigger) String() string { return proto.CompactTextString(m) }
 func (*BuildTrigger) ProtoMessage()    {}
 func (*BuildTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{23}
+	return fileDescriptor_8a9099620ac1526a, []int{23}
 }
+
 func (m *BuildTrigger) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildTrigger.Unmarshal(m, b)
 }
 func (m *BuildTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildTrigger.Marshal(b, m, deterministic)
 }
-func (dst *BuildTrigger) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildTrigger.Merge(dst, src)
+func (m *BuildTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildTrigger.Merge(m, src)
 }
 func (m *BuildTrigger) XXX_Size() int {
 	return xxx_messageInfo_BuildTrigger.Size(m)
@@ -2366,76 +2267,14 @@ func (m *BuildTrigger) GetIncludedFiles() []string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BuildTrigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BuildTrigger_OneofMarshaler, _BuildTrigger_OneofUnmarshaler, _BuildTrigger_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BuildTrigger) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BuildTrigger_Build)(nil),
 		(*BuildTrigger_Filename)(nil),
 	}
 }
 
-func _BuildTrigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BuildTrigger)
-	// build_template
-	switch x := m.BuildTemplate.(type) {
-	case *BuildTrigger_Build:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Build); err != nil {
-			return err
-		}
-	case *BuildTrigger_Filename:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Filename)
-	case nil:
-	default:
-		return fmt.Errorf("BuildTrigger.BuildTemplate has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BuildTrigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BuildTrigger)
-	switch tag {
-	case 4: // build_template.build
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Build)
-		err := b.DecodeMessage(msg)
-		m.BuildTemplate = &BuildTrigger_Build{msg}
-		return true, err
-	case 8: // build_template.filename
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.BuildTemplate = &BuildTrigger_Filename{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BuildTrigger_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BuildTrigger)
-	// build_template
-	switch x := m.BuildTemplate.(type) {
-	case *BuildTrigger_Build:
-		s := proto.Size(x.Build)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BuildTrigger_Filename:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Filename)))
-		n += len(x.Filename)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request to create a new `BuildTrigger`.
 type CreateBuildTriggerRequest struct {
 	// ID of the project for which to configure automatic builds.
@@ -2451,16 +2290,17 @@ func (m *CreateBuildTriggerRequest) Reset()         { *m = CreateBuildTriggerReq
 func (m *CreateBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateBuildTriggerRequest) ProtoMessage()    {}
 func (*CreateBuildTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{24}
+	return fileDescriptor_8a9099620ac1526a, []int{24}
 }
+
 func (m *CreateBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateBuildTriggerRequest.Unmarshal(m, b)
 }
 func (m *CreateBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateBuildTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateBuildTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateBuildTriggerRequest.Merge(dst, src)
+func (m *CreateBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBuildTriggerRequest.Merge(m, src)
 }
 func (m *CreateBuildTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateBuildTriggerRequest.Size(m)
@@ -2500,16 +2340,17 @@ func (m *GetBuildTriggerRequest) Reset()         { *m = GetBuildTriggerRequest{}
 func (m *GetBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBuildTriggerRequest) ProtoMessage()    {}
 func (*GetBuildTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{25}
+	return fileDescriptor_8a9099620ac1526a, []int{25}
 }
+
 func (m *GetBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBuildTriggerRequest.Unmarshal(m, b)
 }
 func (m *GetBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBuildTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetBuildTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBuildTriggerRequest.Merge(dst, src)
+func (m *GetBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBuildTriggerRequest.Merge(m, src)
 }
 func (m *GetBuildTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBuildTriggerRequest.Size(m)
@@ -2547,16 +2388,17 @@ func (m *ListBuildTriggersRequest) Reset()         { *m = ListBuildTriggersReque
 func (m *ListBuildTriggersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListBuildTriggersRequest) ProtoMessage()    {}
 func (*ListBuildTriggersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{26}
+	return fileDescriptor_8a9099620ac1526a, []int{26}
 }
+
 func (m *ListBuildTriggersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBuildTriggersRequest.Unmarshal(m, b)
 }
 func (m *ListBuildTriggersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBuildTriggersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListBuildTriggersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBuildTriggersRequest.Merge(dst, src)
+func (m *ListBuildTriggersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildTriggersRequest.Merge(m, src)
 }
 func (m *ListBuildTriggersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListBuildTriggersRequest.Size(m)
@@ -2587,16 +2429,17 @@ func (m *ListBuildTriggersResponse) Reset()         { *m = ListBuildTriggersResp
 func (m *ListBuildTriggersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListBuildTriggersResponse) ProtoMessage()    {}
 func (*ListBuildTriggersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{27}
+	return fileDescriptor_8a9099620ac1526a, []int{27}
 }
+
 func (m *ListBuildTriggersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBuildTriggersResponse.Unmarshal(m, b)
 }
 func (m *ListBuildTriggersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBuildTriggersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListBuildTriggersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBuildTriggersResponse.Merge(dst, src)
+func (m *ListBuildTriggersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildTriggersResponse.Merge(m, src)
 }
 func (m *ListBuildTriggersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListBuildTriggersResponse.Size(m)
@@ -2629,16 +2472,17 @@ func (m *DeleteBuildTriggerRequest) Reset()         { *m = DeleteBuildTriggerReq
 func (m *DeleteBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteBuildTriggerRequest) ProtoMessage()    {}
 func (*DeleteBuildTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{28}
+	return fileDescriptor_8a9099620ac1526a, []int{28}
 }
+
 func (m *DeleteBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteBuildTriggerRequest.Unmarshal(m, b)
 }
 func (m *DeleteBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteBuildTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteBuildTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteBuildTriggerRequest.Merge(dst, src)
+func (m *DeleteBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteBuildTriggerRequest.Merge(m, src)
 }
 func (m *DeleteBuildTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteBuildTriggerRequest.Size(m)
@@ -2680,16 +2524,17 @@ func (m *UpdateBuildTriggerRequest) Reset()         { *m = UpdateBuildTriggerReq
 func (m *UpdateBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateBuildTriggerRequest) ProtoMessage()    {}
 func (*UpdateBuildTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{29}
+	return fileDescriptor_8a9099620ac1526a, []int{29}
 }
+
 func (m *UpdateBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateBuildTriggerRequest.Unmarshal(m, b)
 }
 func (m *UpdateBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateBuildTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateBuildTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateBuildTriggerRequest.Merge(dst, src)
+func (m *UpdateBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBuildTriggerRequest.Merge(m, src)
 }
 func (m *UpdateBuildTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateBuildTriggerRequest.Size(m)
@@ -2780,16 +2625,17 @@ func (m *BuildOptions) Reset()         { *m = BuildOptions{} }
 func (m *BuildOptions) String() string { return proto.CompactTextString(m) }
 func (*BuildOptions) ProtoMessage()    {}
 func (*BuildOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cloudbuild_bcd614f113dbc5d4, []int{30}
+	return fileDescriptor_8a9099620ac1526a, []int{30}
 }
+
 func (m *BuildOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildOptions.Unmarshal(m, b)
 }
 func (m *BuildOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildOptions.Marshal(b, m, deterministic)
 }
-func (dst *BuildOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildOptions.Merge(dst, src)
+func (m *BuildOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildOptions.Merge(m, src)
 }
 func (m *BuildOptions) XXX_Size() int {
 	return xxx_messageInfo_BuildOptions.Size(m)
@@ -2878,6 +2724,13 @@ func (m *BuildOptions) GetVolumes() []*Volume {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.cloudbuild.v1.Build_Status", Build_Status_name, Build_Status_value)
+	proto.RegisterEnum("google.devtools.cloudbuild.v1.Hash_HashType", Hash_HashType_name, Hash_HashType_value)
+	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_VerifyOption", BuildOptions_VerifyOption_name, BuildOptions_VerifyOption_value)
+	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_MachineType", BuildOptions_MachineType_name, BuildOptions_MachineType_value)
+	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_SubstitutionOption", BuildOptions_SubstitutionOption_name, BuildOptions_SubstitutionOption_value)
+	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_LogStreamingOption", BuildOptions_LogStreamingOption_name, BuildOptions_LogStreamingOption_value)
+	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_LoggingMode", BuildOptions_LoggingMode_name, BuildOptions_LoggingMode_value)
 	proto.RegisterType((*RetryBuildRequest)(nil), "google.devtools.cloudbuild.v1.RetryBuildRequest")
 	proto.RegisterType((*RunBuildTriggerRequest)(nil), "google.devtools.cloudbuild.v1.RunBuildTriggerRequest")
 	proto.RegisterType((*StorageSource)(nil), "google.devtools.cloudbuild.v1.StorageSource")
@@ -2915,13 +2768,198 @@ func init() {
 	proto.RegisterType((*DeleteBuildTriggerRequest)(nil), "google.devtools.cloudbuild.v1.DeleteBuildTriggerRequest")
 	proto.RegisterType((*UpdateBuildTriggerRequest)(nil), "google.devtools.cloudbuild.v1.UpdateBuildTriggerRequest")
 	proto.RegisterType((*BuildOptions)(nil), "google.devtools.cloudbuild.v1.BuildOptions")
-	proto.RegisterEnum("google.devtools.cloudbuild.v1.Build_Status", Build_Status_name, Build_Status_value)
-	proto.RegisterEnum("google.devtools.cloudbuild.v1.Hash_HashType", Hash_HashType_name, Hash_HashType_value)
-	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_VerifyOption", BuildOptions_VerifyOption_name, BuildOptions_VerifyOption_value)
-	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_MachineType", BuildOptions_MachineType_name, BuildOptions_MachineType_value)
-	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_SubstitutionOption", BuildOptions_SubstitutionOption_name, BuildOptions_SubstitutionOption_value)
-	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_LogStreamingOption", BuildOptions_LogStreamingOption_name, BuildOptions_LogStreamingOption_value)
-	proto.RegisterEnum("google.devtools.cloudbuild.v1.BuildOptions_LoggingMode", BuildOptions_LoggingMode_name, BuildOptions_LoggingMode_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/cloudbuild/v1/cloudbuild.proto", fileDescriptor_8a9099620ac1526a)
+}
+
+var fileDescriptor_8a9099620ac1526a = []byte{
+	// 2941 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xcb, 0x73, 0xdb, 0xd6,
+	0xd5, 0x17, 0x48, 0x89, 0x8f, 0x43, 0x4a, 0x82, 0x6f, 0x1c, 0x99, 0xa2, 0xe3, 0x58, 0x81, 0xe3,
+	0x44, 0xb1, 0x13, 0x31, 0x92, 0x3f, 0xc7, 0x8e, 0xf2, 0xb0, 0x24, 0x8a, 0x7a, 0x4c, 0x28, 0xd2,
+	0x01, 0x49, 0x67, 0x92, 0xef, 0xfb, 0x06, 0x05, 0x89, 0x2b, 0x0a, 0x15, 0x08, 0xa0, 0xc0, 0x25,
+	0x53, 0x25, 0xcd, 0x74, 0x9a, 0xe9, 0xb4, 0xd3, 0x55, 0x3b, 0xd3, 0xe9, 0xa2, 0xd3, 0x45, 0x1f,
+	0xeb, 0x4e, 0xa7, 0xd3, 0x2e, 0xba, 0xca, 0xba, 0xeb, 0x4e, 0x57, 0xdd, 0x76, 0xfa, 0x47, 0x74,
+	0xd5, 0xe9, 0xdc, 0x07, 0x48, 0x90, 0xb4, 0x03, 0xc2, 0x6e, 0x37, 0x36, 0xee, 0xb9, 0xf7, 0x9c,
+	0x7b, 0xee, 0x79, 0xdd, 0xdf, 0xb9, 0x14, 0x6c, 0x74, 0x1d, 0xa7, 0x6b, 0xe1, 0x92, 0x81, 0x07,
+	0xc4, 0x71, 0x2c, 0xbf, 0xd4, 0xb1, 0x9c, 0xbe, 0xd1, 0xee, 0x9b, 0x96, 0x51, 0x1a, 0x6c, 0x86,
+	0x46, 0x1b, 0xae, 0xe7, 0x10, 0x07, 0x5d, 0xe3, 0xeb, 0x37, 0x82, 0xf5, 0x1b, 0xa1, 0x15, 0x83,
+	0xcd, 0xe2, 0x0b, 0x42, 0x9c, 0xee, 0x9a, 0x25, 0xdd, 0xb6, 0x1d, 0xa2, 0x13, 0xd3, 0xb1, 0x7d,
+	0xce, 0x5c, 0x5c, 0x0d, 0xcd, 0x9e, 0x11, 0xe2, 0xb6, 0x1d, 0xe3, 0x42, 0x4c, 0x29, 0x62, 0x8a,
+	0x89, 0x2b, 0xe9, 0x7d, 0xc3, 0x24, 0xfc, 0x5f, 0xcd, 0x72, 0xba, 0x62, 0xcd, 0x0d, 0xb1, 0xc6,
+	0x72, 0xec, 0xae, 0xd7, 0xb7, 0x6d, 0xd3, 0xee, 0x96, 0x1c, 0x17, 0x7b, 0x63, 0x7b, 0xbc, 0x28,
+	0x16, 0xb1, 0x51, 0xbb, 0x7f, 0x5a, 0x32, 0xfa, 0x7c, 0x81, 0x98, 0xbf, 0x3a, 0x39, 0x8f, 0x7b,
+	0x2e, 0x09, 0xb4, 0x58, 0x9b, 0x9c, 0x3c, 0x35, 0xb1, 0x65, 0x68, 0x3d, 0xdd, 0x3f, 0x17, 0x2b,
+	0xae, 0x4f, 0xae, 0x20, 0x66, 0x0f, 0xfb, 0x44, 0xef, 0xb9, 0x7c, 0x81, 0xb2, 0x07, 0x97, 0x54,
+	0x4c, 0xbc, 0x8b, 0x3d, 0x6a, 0x12, 0x15, 0x7f, 0xab, 0x8f, 0x7d, 0x82, 0xae, 0x01, 0xb8, 0x9e,
+	0xf3, 0x4d, 0xdc, 0x21, 0x9a, 0x69, 0x14, 0xa4, 0x35, 0x69, 0x3d, 0xab, 0x66, 0x05, 0xe5, 0xd8,
+	0x40, 0x4b, 0x90, 0x30, 0x8d, 0x42, 0x82, 0x91, 0x13, 0xa6, 0xa1, 0xfc, 0x5c, 0x82, 0x15, 0xb5,
+	0x6f, 0x33, 0x11, 0x4d, 0xcf, 0xec, 0x76, 0xb1, 0x37, 0xa3, 0xa4, 0x6b, 0x00, 0x84, 0x33, 0x68,
+	0x43, 0x89, 0x59, 0x41, 0x39, 0x36, 0xd0, 0x2e, 0xa4, 0x7c, 0xa7, 0xef, 0x75, 0x70, 0x21, 0xb9,
+	0x26, 0xad, 0xe7, 0xb6, 0x5e, 0xdb, 0xf8, 0x5a, 0x77, 0x6e, 0xa8, 0xd8, 0x75, 0x1a, 0x8c, 0x41,
+	0x15, 0x8c, 0x8a, 0x06, 0x8b, 0x0d, 0xe2, 0x78, 0x7a, 0x17, 0xf3, 0x09, 0xb4, 0x02, 0xa9, 0x76,
+	0xbf, 0x73, 0x8e, 0x89, 0xd0, 0x46, 0x8c, 0x28, 0xdd, 0x69, 0x53, 0xb5, 0x84, 0x1a, 0x62, 0x84,
+	0x5e, 0x04, 0xe8, 0x62, 0x5b, 0x78, 0x8d, 0xe9, 0x91, 0x54, 0x43, 0x14, 0xe5, 0xcf, 0x12, 0xc0,
+	0x68, 0xdf, 0xa8, 0x03, 0x5f, 0x85, 0xac, 0x87, 0x5d, 0x47, 0xb3, 0xf5, 0x1e, 0x16, 0x1b, 0x65,
+	0x28, 0xa1, 0xa6, 0xf7, 0x30, 0x7a, 0x09, 0x72, 0x6d, 0x4f, 0xb7, 0x3b, 0x67, 0x7c, 0x9a, 0xee,
+	0x95, 0x3d, 0x9a, 0x53, 0x81, 0x13, 0xd9, 0x92, 0xab, 0x90, 0x21, 0x7a, 0x97, 0xcf, 0xcf, 0x8b,
+	0xf9, 0x34, 0xd1, 0xbb, 0x6c, 0xf2, 0x3a, 0x40, 0xc7, 0xe9, 0xf5, 0x4c, 0xa2, 0xf9, 0x67, 0x7a,
+	0x61, 0x41, 0x4c, 0x67, 0x39, 0xad, 0x71, 0xa6, 0x23, 0x19, 0x92, 0x86, 0xe9, 0x15, 0xd2, 0x6c,
+	0x5f, 0xfa, 0xb9, 0x07, 0x90, 0xf1, 0xf0, 0xc0, 0xf4, 0xe9, 0x49, 0xfe, 0x24, 0x41, 0x4a, 0x9c,
+	0xa2, 0x05, 0x4b, 0x3e, 0xb7, 0x9a, 0x26, 0x1c, 0x90, 0x60, 0x0e, 0x78, 0x3d, 0xc2, 0x01, 0x63,
+	0xa6, 0x3e, 0x9a, 0x53, 0x17, 0xfd, 0x31, 0xdb, 0x57, 0x21, 0xc7, 0x4e, 0xff, 0x94, 0x4e, 0xa5,
+	0xb6, 0xf0, 0x86, 0xa3, 0xbd, 0x4c, 0x10, 0x1d, 0xca, 0x97, 0x12, 0x00, 0x8d, 0x3e, 0x72, 0xdc,
+	0xd3, 0xbb, 0x18, 0x21, 0x98, 0x67, 0x06, 0xe2, 0xd6, 0x67, 0xdf, 0xd4, 0xbd, 0x86, 0xd9, 0xc5,
+	0x3e, 0xe1, 0x66, 0x55, 0xc5, 0x08, 0x1d, 0x41, 0xce, 0xed, 0xfb, 0x67, 0x1a, 0x31, 0x7b, 0xa6,
+	0xdd, 0x65, 0x36, 0xcd, 0x6d, 0xbd, 0x1a, 0xa1, 0x52, 0xd3, 0xec, 0xe1, 0x86, 0xab, 0xdb, 0x2a,
+	0x50, 0xde, 0x26, 0x63, 0x55, 0x7e, 0x38, 0x0f, 0x59, 0x96, 0x02, 0x0d, 0x82, 0xdd, 0xc7, 0xea,
+	0x20, 0x43, 0x12, 0xdb, 0x83, 0x42, 0x62, 0x2d, 0x49, 0xcd, 0x8f, 0xed, 0x01, 0x5d, 0xa5, 0x7b,
+	0x5d, 0xbf, 0x90, 0x64, 0x24, 0xf6, 0x1d, 0x38, 0x69, 0x7e, 0xe8, 0x24, 0x91, 0x6f, 0x0b, 0x41,
+	0xbe, 0xa1, 0x55, 0xc8, 0x7c, 0xaa, 0x9b, 0x44, 0x3b, 0x75, 0xbc, 0x42, 0x8a, 0x71, 0xa6, 0xe9,
+	0xf8, 0xc0, 0xf1, 0x68, 0xb4, 0x62, 0x9b, 0x78, 0x17, 0xae, 0x63, 0xda, 0x44, 0x38, 0x3a, 0x44,
+	0xa1, 0xe1, 0xe9, 0xe3, 0x8e, 0x87, 0x89, 0x46, 0x35, 0xc9, 0x30, 0xe6, 0x2c, 0xa7, 0x54, 0xec,
+	0x01, 0x7a, 0x00, 0xe9, 0x81, 0x63, 0xf5, 0x7b, 0xd8, 0x2f, 0x64, 0xd7, 0x92, 0xeb, 0xb9, 0xad,
+	0x9b, 0x11, 0x96, 0x78, 0xc4, 0x56, 0xab, 0x01, 0x17, 0x7a, 0x00, 0x29, 0x61, 0x49, 0x88, 0x67,
+	0x49, 0xc1, 0xc6, 0xfd, 0x61, 0x59, 0x81, 0x3f, 0x16, 0x63, 0xfb, 0xc3, 0xb2, 0xb8, 0x3f, 0xd0,
+	0x1d, 0x48, 0xd3, 0x62, 0xe7, 0xf4, 0x49, 0x21, 0xc7, 0xa4, 0xac, 0x06, 0x52, 0x82, 0x62, 0xb8,
+	0xb1, 0x2f, 0x6a, 0xad, 0x1a, 0xac, 0x44, 0x65, 0x48, 0xf9, 0x44, 0x27, 0x7d, 0xbf, 0x90, 0x5f,
+	0x93, 0xd6, 0x97, 0xb6, 0x6e, 0x47, 0xec, 0xcc, 0x1c, 0xbe, 0xd1, 0x60, 0x2c, 0xaa, 0x60, 0x55,
+	0xde, 0x84, 0x14, 0xb7, 0xcb, 0x63, 0xa3, 0x00, 0xc1, 0xbc, 0xab, 0x93, 0x33, 0x91, 0xfd, 0xec,
+	0x5b, 0xf9, 0xa7, 0x04, 0x69, 0x15, 0xfb, 0x7d, 0x8b, 0xf8, 0xb4, 0xe8, 0x99, 0x34, 0x8c, 0x7d,
+	0x16, 0x28, 0xd1, 0xf9, 0x31, 0x0a, 0x7c, 0x55, 0x30, 0xa2, 0x5b, 0x70, 0x89, 0x4d, 0x6b, 0x3e,
+	0xc1, 0xae, 0x26, 0xa4, 0xf1, 0x18, 0x5b, 0x6e, 0x07, 0x21, 0x7a, 0xcc, 0xd7, 0xde, 0x86, 0x4b,
+	0xba, 0x47, 0xcc, 0x53, 0xbd, 0x43, 0xb4, 0x9e, 0x6e, 0x9b, 0xa7, 0x34, 0x47, 0x78, 0xf0, 0xc9,
+	0xc1, 0xc4, 0x89, 0xa0, 0xa3, 0x1b, 0xb0, 0x68, 0xf7, 0x7b, 0x5a, 0x40, 0xf7, 0x59, 0x50, 0x26,
+	0xd5, 0xbc, 0xdd, 0xef, 0xed, 0x06, 0x34, 0xf4, 0x3a, 0xa0, 0xd0, 0xee, 0x4e, 0x9f, 0xb8, 0x7d,
+	0xe2, 0xb3, 0x40, 0xcd, 0xab, 0xf2, 0x70, 0xfb, 0x3a, 0xa7, 0x2b, 0x04, 0x96, 0x02, 0x56, 0x6e,
+	0x01, 0x54, 0x84, 0x8c, 0xe5, 0x74, 0x78, 0xbd, 0xe5, 0x86, 0x1b, 0x8e, 0xd1, 0x01, 0x64, 0x4f,
+	0x4d, 0x0b, 0x6b, 0x67, 0xba, 0x7f, 0x36, 0xa3, 0x7d, 0x0e, 0x4c, 0x0b, 0x1f, 0xe9, 0xfe, 0x19,
+	0xf6, 0xd5, 0xcc, 0xa9, 0xf8, 0x56, 0xfe, 0x96, 0x83, 0x05, 0xe6, 0x3b, 0x91, 0x5c, 0xd2, 0x30,
+	0xb9, 0xc6, 0x0b, 0xb8, 0x3c, 0x59, 0xc0, 0x47, 0x01, 0x92, 0x78, 0xea, 0x00, 0xa1, 0x66, 0xe4,
+	0x5f, 0x9a, 0x81, 0x89, 0x6e, 0x5a, 0x85, 0x02, 0xdb, 0x26, 0xcf, 0x89, 0xfb, 0x8c, 0x86, 0xde,
+	0x9b, 0xb8, 0xfc, 0xa2, 0x52, 0x71, 0xfc, 0xe2, 0x43, 0xef, 0xc3, 0x02, 0xb5, 0xbf, 0x5f, 0xc8,
+	0x31, 0x2b, 0xad, 0xcf, 0xa2, 0x27, 0xf5, 0x8b, 0xca, 0xd9, 0xd0, 0x0e, 0xa4, 0x3d, 0x1e, 0x91,
+	0x22, 0x95, 0x5f, 0x89, 0xac, 0xd3, 0x6c, 0xb5, 0x1a, 0xb0, 0xa1, 0x77, 0x20, 0xd7, 0xf1, 0xb0,
+	0x4e, 0x30, 0x4d, 0x66, 0x5c, 0x48, 0x31, 0x29, 0xc5, 0xa9, 0x24, 0x6c, 0x06, 0x88, 0x44, 0x05,
+	0xbe, 0x9c, 0x12, 0xd0, 0xdb, 0x00, 0x3e, 0xd1, 0x3d, 0xc2, 0x79, 0xd3, 0x91, 0xbc, 0x59, 0xb6,
+	0x9a, 0xb1, 0xbe, 0x03, 0xb9, 0x53, 0xd3, 0x36, 0x79, 0x51, 0xc7, 0x85, 0x4c, 0xf4, 0xbe, 0x7c,
+	0x39, 0x63, 0x0e, 0x55, 0x8d, 0xfc, 0xcc, 0x55, 0x63, 0x65, 0x98, 0xb2, 0x8b, 0x2c, 0xc9, 0x82,
+	0x3c, 0x3c, 0x80, 0xec, 0x28, 0x55, 0x6e, 0x32, 0x71, 0x51, 0x7e, 0x18, 0xa6, 0x91, 0x3a, 0x62,
+	0x45, 0xd7, 0x21, 0x67, 0x39, 0x5d, 0x5f, 0x13, 0xc0, 0xe5, 0x39, 0x5e, 0xd6, 0x29, 0x69, 0x8f,
+	0x83, 0x97, 0xff, 0x83, 0x4b, 0xdc, 0xed, 0x9a, 0xeb, 0x39, 0x03, 0x6c, 0xeb, 0x76, 0x07, 0x17,
+	0x9e, 0x67, 0x1b, 0x96, 0x66, 0x0a, 0x9b, 0x87, 0x43, 0x36, 0x55, 0xf6, 0x27, 0x28, 0x68, 0x1d,
+	0x78, 0xda, 0x6a, 0x21, 0xac, 0xb6, 0xc2, 0x74, 0x58, 0x6a, 0x87, 0x30, 0xdf, 0xb1, 0x81, 0x2a,
+	0x90, 0x76, 0x5c, 0x06, 0x6f, 0x0b, 0x57, 0xd8, 0xee, 0x33, 0xa5, 0x47, 0x9d, 0xb3, 0xa8, 0x01,
+	0x2f, 0xba, 0x02, 0x69, 0xcb, 0xe9, 0x6a, 0x7d, 0xcf, 0x2a, 0xac, 0xf2, 0xdb, 0xda, 0x72, 0xba,
+	0x2d, 0xcf, 0x42, 0xff, 0x0f, 0x8b, 0x7e, 0xbf, 0xed, 0x13, 0x93, 0xf4, 0xf9, 0x2e, 0xd7, 0x58,
+	0x70, 0xdf, 0x9b, 0x2d, 0x09, 0xc3, 0x9c, 0x15, 0x7a, 0x27, 0xaa, 0xe3, 0xd2, 0x68, 0x69, 0x26,
+	0x7a, 0xd7, 0x2f, 0x5c, 0xe7, 0xd7, 0x31, 0xfd, 0xa6, 0x57, 0x22, 0xbf, 0x1f, 0xfd, 0xc2, 0xda,
+	0x4c, 0x57, 0x62, 0x83, 0xad, 0x56, 0x03, 0x2e, 0x74, 0x34, 0xbc, 0x12, 0x5f, 0x62, 0xfc, 0x6f,
+	0xce, 0xa4, 0x2c, 0xbf, 0xc4, 0xb8, 0x96, 0x82, 0xbf, 0xb8, 0x03, 0x68, 0xfa, 0x0c, 0x14, 0x2f,
+	0x9c, 0xe3, 0x0b, 0x51, 0xc1, 0xe8, 0x27, 0xba, 0x0c, 0x0b, 0x03, 0xdd, 0xea, 0x07, 0x00, 0x93,
+	0x0f, 0xb6, 0x13, 0xf7, 0xa5, 0x62, 0x1b, 0x72, 0x21, 0xc1, 0x8f, 0x61, 0x7d, 0x2f, 0xcc, 0x1a,
+	0xe3, 0xe2, 0x1d, 0xed, 0xa1, 0x7c, 0x17, 0x52, 0xbc, 0xdc, 0x21, 0x04, 0x4b, 0x8d, 0xe6, 0x6e,
+	0xb3, 0xd5, 0xd0, 0x5a, 0xb5, 0x0f, 0x6a, 0xf5, 0x8f, 0x6a, 0xf2, 0x1c, 0x02, 0x48, 0x7d, 0xd8,
+	0xaa, 0xb4, 0x2a, 0xfb, 0xb2, 0x84, 0x72, 0x90, 0xfe, 0xa8, 0xae, 0x7e, 0x70, 0x5c, 0x3b, 0x94,
+	0x13, 0x74, 0xd0, 0x68, 0x95, 0xcb, 0x95, 0x46, 0x43, 0x4e, 0xd2, 0xc1, 0xc1, 0xee, 0x71, 0xb5,
+	0xa5, 0x56, 0xe4, 0x79, 0x2a, 0xe6, 0xb8, 0xd6, 0xac, 0xa8, 0xb5, 0xdd, 0xaa, 0x56, 0x51, 0xd5,
+	0xba, 0x2a, 0x2f, 0xd0, 0x05, 0xcd, 0xe3, 0x93, 0x4a, 0xbd, 0xd5, 0x94, 0x53, 0x68, 0x11, 0xb2,
+	0xe5, 0xdd, 0x5a, 0xb9, 0x52, 0xad, 0x56, 0xf6, 0xe5, 0xb4, 0xf2, 0x2f, 0x09, 0xb2, 0xa3, 0xdb,
+	0x68, 0x94, 0x9b, 0xd2, 0x58, 0x6e, 0xaa, 0x90, 0xe6, 0x08, 0xdf, 0x17, 0x67, 0xbd, 0x3f, 0x6b,
+	0x66, 0x0e, 0xbf, 0xea, 0x9c, 0x5f, 0x0d, 0x04, 0x15, 0xbf, 0x2f, 0xc1, 0xf2, 0xc4, 0xe4, 0xd7,
+	0xde, 0x66, 0x97, 0x61, 0x81, 0x5e, 0xff, 0xbe, 0x80, 0x84, 0x7c, 0x10, 0xc2, 0x50, 0xc9, 0xa7,
+	0xc2, 0x50, 0xca, 0x77, 0x20, 0x13, 0xd0, 0x26, 0xea, 0xa8, 0x14, 0xa7, 0x8e, 0xde, 0x85, 0x0c,
+	0xb6, 0x0d, 0xce, 0x98, 0x88, 0x64, 0x4c, 0x63, 0xdb, 0xa0, 0x23, 0xa5, 0x09, 0x2b, 0x22, 0xab,
+	0x45, 0x8b, 0x74, 0x82, 0x89, 0x6e, 0xe8, 0x44, 0x47, 0xdb, 0xb0, 0xc0, 0x94, 0x16, 0x6a, 0xbc,
+	0x3c, 0x4b, 0x22, 0xa8, 0x9c, 0x45, 0xf9, 0x75, 0x12, 0xe4, 0xc9, 0x52, 0x85, 0x0c, 0xb8, 0xe2,
+	0x61, 0xdf, 0xb1, 0x06, 0x98, 0x82, 0x8d, 0xb1, 0x7e, 0x25, 0x19, 0xbf, 0x5f, 0x51, 0x9f, 0x0f,
+	0x84, 0x8d, 0x77, 0x8c, 0xff, 0x0b, 0x97, 0x87, 0xbb, 0x84, 0xdb, 0x97, 0x54, 0xdc, 0x9e, 0x14,
+	0x05, 0x62, 0x42, 0xfd, 0xe2, 0x37, 0xe8, 0x65, 0x25, 0x00, 0x0d, 0xf6, 0x0b, 0xf3, 0xac, 0x44,
+	0x3c, 0x88, 0x59, 0xb3, 0x43, 0x18, 0x87, 0x57, 0x0c, 0x38, 0x1d, 0x12, 0x8a, 0x67, 0xb0, 0x3c,
+	0x31, 0xfd, 0x98, 0xbc, 0x7f, 0x30, 0x9e, 0xf7, 0x31, 0x30, 0x55, 0x28, 0xf3, 0x6b, 0x00, 0xa3,
+	0x09, 0xb4, 0x13, 0x86, 0x6a, 0x12, 0x3b, 0xd7, 0x8d, 0x08, 0xb1, 0x94, 0x33, 0x04, 0xd2, 0x7e,
+	0x24, 0xc1, 0x3c, 0xfd, 0x40, 0x3b, 0x30, 0x4f, 0x2e, 0x5c, 0x1e, 0xbe, 0x4b, 0x91, 0x4e, 0xa5,
+	0x2c, 0xec, 0x9f, 0xe6, 0x85, 0x8b, 0x55, 0xc6, 0x39, 0x5e, 0x12, 0xf3, 0x42, 0x69, 0xe5, 0x35,
+	0xc8, 0x04, 0xeb, 0x50, 0x06, 0xe6, 0x6b, 0xf5, 0x5a, 0x85, 0x97, 0xa8, 0xc6, 0xd1, 0xee, 0xd6,
+	0xdd, 0xb7, 0x64, 0x09, 0xa5, 0x21, 0x79, 0xb2, 0x7f, 0x57, 0x4e, 0x28, 0x5f, 0xd1, 0xe6, 0x98,
+	0x55, 0x74, 0xb4, 0x06, 0xf9, 0xf3, 0x9e, 0xaf, 0x9d, 0xe3, 0x0b, 0x2d, 0x04, 0xee, 0xe1, 0xbc,
+	0xe7, 0x7f, 0x80, 0x2f, 0x58, 0x23, 0xde, 0x18, 0xeb, 0xb2, 0x92, 0xec, 0xec, 0xff, 0x33, 0xd3,
+	0xb5, 0x21, 0xfe, 0xab, 0xd8, 0x03, 0xee, 0xc8, 0x51, 0x6f, 0x56, 0x7c, 0x17, 0x96, 0xc6, 0x27,
+	0xa3, 0x2a, 0x7f, 0x3e, 0xec, 0x1b, 0x07, 0x50, 0x99, 0xa1, 0xab, 0x38, 0x0f, 0x3d, 0xc3, 0x84,
+	0x4d, 0xc4, 0x4f, 0xd8, 0x1d, 0x58, 0x3e, 0xc4, 0xe4, 0x59, 0x9e, 0x95, 0x7e, 0x20, 0xc1, 0xa5,
+	0xaa, 0xe9, 0x73, 0x19, 0xfe, 0x8c, 0x42, 0xae, 0x42, 0xd6, 0x65, 0x65, 0xc0, 0xfc, 0x8c, 0x5b,
+	0x61, 0x41, 0xcd, 0x50, 0x42, 0xc3, 0xfc, 0x8c, 0x3f, 0xce, 0xd0, 0x49, 0xe2, 0x9c, 0x63, 0x5b,
+	0x3c, 0x04, 0xb0, 0xe5, 0x4d, 0x4a, 0xa0, 0x57, 0xc5, 0xa9, 0x69, 0x11, 0xec, 0x31, 0xcc, 0x98,
+	0x55, 0xc5, 0x48, 0xf9, 0x0c, 0x50, 0x58, 0x0f, 0xdf, 0x75, 0x6c, 0x1f, 0xa3, 0x77, 0x21, 0xc5,
+	0x4e, 0xea, 0x8b, 0xe0, 0x9e, 0xcd, 0x3a, 0x82, 0x07, 0xbd, 0x02, 0xcb, 0x36, 0xfe, 0x36, 0xd1,
+	0x42, 0xfa, 0xf0, 0x93, 0x2f, 0x52, 0xf2, 0xc3, 0x40, 0x27, 0xa5, 0x0c, 0xa8, 0x4c, 0x53, 0xdc,
+	0x7a, 0x16, 0x4b, 0xfe, 0x65, 0x1e, 0xf2, 0xe1, 0xd7, 0xb9, 0xa9, 0xa6, 0x67, 0x0d, 0x72, 0x06,
+	0xf6, 0x3b, 0x9e, 0xc9, 0x00, 0x18, 0x03, 0xfc, 0x59, 0x35, 0x4c, 0x42, 0x4d, 0x90, 0x03, 0xf4,
+	0x47, 0x70, 0xcf, 0xb5, 0x74, 0x12, 0xa0, 0xf2, 0x18, 0x05, 0x70, 0x59, 0x88, 0x68, 0x0a, 0x09,
+	0xe8, 0xdd, 0x20, 0xc0, 0xe6, 0x67, 0x0f, 0xb0, 0xa3, 0x39, 0x11, 0x62, 0xe8, 0x05, 0x60, 0xb5,
+	0x82, 0x25, 0x61, 0x46, 0xbc, 0x76, 0x0d, 0x29, 0x93, 0xed, 0xc7, 0x42, 0xac, 0xf6, 0xa3, 0x08,
+	0x19, 0xc3, 0xf4, 0xf5, 0xb6, 0x85, 0x8d, 0x42, 0x76, 0x4d, 0x5a, 0xcf, 0xa8, 0xc3, 0x31, 0x32,
+	0x26, 0x41, 0x28, 0xef, 0xb0, 0xde, 0x9f, 0x45, 0x79, 0xe1, 0x80, 0x19, 0xb0, 0xe8, 0x0d, 0x58,
+	0x34, 0xbb, 0xb6, 0xe3, 0x61, 0x43, 0xa3, 0x47, 0xf2, 0x0b, 0xcb, 0x0c, 0x23, 0xe4, 0x05, 0x91,
+	0x16, 0x5a, 0x1f, 0xdd, 0x84, 0x25, 0xd3, 0xee, 0x58, 0x7d, 0x63, 0xb8, 0x4a, 0x66, 0xab, 0x16,
+	0x03, 0x2a, 0x5b, 0xf6, 0xec, 0xc0, 0x71, 0x4f, 0x86, 0x25, 0xd1, 0x02, 0x08, 0xd7, 0x29, 0xdf,
+	0x93, 0x60, 0x35, 0x54, 0x51, 0xe2, 0xbd, 0xfb, 0x56, 0x20, 0x2d, 0x42, 0x41, 0x94, 0x96, 0xdb,
+	0x31, 0x8c, 0xa7, 0x06, 0xbc, 0xca, 0x23, 0x58, 0x09, 0x6a, 0xcc, 0x7f, 0xf2, 0xdd, 0x59, 0x79,
+	0x1b, 0x0a, 0xc3, 0x84, 0x17, 0x82, 0x67, 0xac, 0x3f, 0x8a, 0x01, 0xab, 0x8f, 0x61, 0x15, 0x25,
+	0xe3, 0x10, 0x32, 0x62, 0x93, 0xa0, 0x68, 0xc4, 0x3a, 0xf7, 0x90, 0x59, 0xf9, 0x18, 0x56, 0xf7,
+	0xb1, 0x85, 0x9f, 0xca, 0xf6, 0x11, 0x67, 0xff, 0x95, 0x04, 0xab, 0x2d, 0xd7, 0xd0, 0xff, 0x0b,
+	0xb2, 0xc3, 0x6e, 0x4f, 0x3e, 0x83, 0xdb, 0xff, 0x9e, 0x11, 0xe5, 0x4c, 0x34, 0x8e, 0xa8, 0x0d,
+	0x2b, 0x53, 0xed, 0xef, 0x08, 0x77, 0xc4, 0x45, 0x0c, 0x97, 0x27, 0x1b, 0x60, 0x86, 0x41, 0x5c,
+	0x8a, 0x35, 0x99, 0x11, 0xb0, 0xa1, 0x0d, 0xb0, 0x67, 0x9e, 0x5e, 0x68, 0xbc, 0x5f, 0x15, 0x2f,
+	0x41, 0xf7, 0x63, 0xb4, 0xba, 0x1b, 0x8f, 0x98, 0x00, 0x3e, 0xa2, 0xb8, 0x53, 0x08, 0x0e, 0x93,
+	0xd1, 0x27, 0x90, 0xef, 0xe9, 0x9d, 0x33, 0xd3, 0xc6, 0x1a, 0x43, 0x3f, 0x49, 0xb6, 0xcd, 0xbd,
+	0x38, 0xdb, 0x9c, 0x70, 0x7e, 0x76, 0xac, 0x5c, 0x6f, 0x34, 0xa0, 0x18, 0xc6, 0x30, 0xfd, 0x73,
+	0x76, 0x4d, 0x6a, 0xdd, 0x36, 0xc3, 0xb2, 0x49, 0x15, 0x28, 0x8d, 0xde, 0x94, 0x87, 0x6d, 0xe4,
+	0xc0, 0x73, 0xe1, 0x82, 0x14, 0x9c, 0x75, 0x9e, 0x29, 0xf1, 0x7e, 0x1c, 0x25, 0xc2, 0xa5, 0x47,
+	0x9c, 0x18, 0xf9, 0x53, 0x34, 0xe4, 0xc2, 0x65, 0xda, 0xf4, 0xfb, 0xc4, 0xc3, 0x3a, 0x6d, 0x63,
+	0x82, 0x1d, 0x17, 0xe2, 0xef, 0x58, 0x75, 0xba, 0x8d, 0x40, 0x4c, 0xb0, 0xa3, 0x35, 0x45, 0x43,
+	0xd7, 0x21, 0xf7, 0xa9, 0xe3, 0x9d, 0x63, 0x4f, 0x73, 0x1d, 0xc7, 0x0a, 0x5e, 0xcb, 0x39, 0xe9,
+	0xa1, 0xe3, 0x58, 0xe8, 0x43, 0xf6, 0x0e, 0xd1, 0xa5, 0xad, 0x58, 0x2e, 0xbe, 0xf1, 0xab, 0x9c,
+	0xf5, 0xc4, 0x31, 0xb0, 0x1a, 0xc8, 0x09, 0x7e, 0x03, 0xc8, 0x8f, 0x7e, 0x03, 0x18, 0x7f, 0x92,
+	0x5f, 0xfc, 0x9a, 0x27, 0xf9, 0xa5, 0xa7, 0x79, 0x92, 0x57, 0x36, 0x20, 0x3f, 0x16, 0x56, 0x32,
+	0xe4, 0x6b, 0xf5, 0xa6, 0xf6, 0xa8, 0xa2, 0x1e, 0x1f, 0x1c, 0x57, 0xf6, 0xe5, 0x39, 0x94, 0x87,
+	0xcc, 0x70, 0x24, 0x29, 0x65, 0xc8, 0x85, 0xc2, 0x06, 0x2d, 0x43, 0xae, 0x55, 0x6b, 0x3c, 0xac,
+	0x94, 0x83, 0xd5, 0x94, 0x7f, 0x53, 0x3b, 0x3a, 0x3e, 0x3c, 0x2a, 0x3f, 0x6c, 0x69, 0xf7, 0x65,
+	0x09, 0x5d, 0x82, 0xc5, 0x10, 0xe5, 0xce, 0x96, 0x9c, 0x50, 0xee, 0x8e, 0xdf, 0x38, 0x62, 0xeb,
+	0x25, 0x80, 0x93, 0x56, 0xa3, 0xa9, 0x9d, 0xec, 0x36, 0xcb, 0x47, 0xf2, 0x1c, 0x95, 0xbd, 0x5b,
+	0xad, 0xd6, 0x3f, 0xd2, 0xaa, 0xf5, 0x7a, 0xa3, 0x22, 0x4b, 0xca, 0x21, 0xa0, 0x69, 0xdf, 0xf1,
+	0x77, 0x04, 0xb5, 0xb2, 0x7b, 0xa2, 0xed, 0x57, 0x0e, 0x76, 0x5b, 0xd5, 0xa6, 0x3c, 0x47, 0x7b,
+	0x7e, 0x41, 0xab, 0xd7, 0x64, 0x89, 0x4a, 0x0e, 0x86, 0x07, 0x07, 0x72, 0x42, 0xd9, 0x81, 0x5c,
+	0xc8, 0xfc, 0xe8, 0x0a, 0x3c, 0x57, 0xad, 0x1f, 0x1e, 0x1e, 0xd7, 0x0e, 0xb5, 0xf1, 0xc3, 0x00,
+	0xa4, 0xaa, 0x95, 0xc3, 0xdd, 0xf2, 0xc7, 0xb2, 0x44, 0xcd, 0x70, 0x58, 0x6e, 0x68, 0xf5, 0x5a,
+	0xf5, 0x63, 0x39, 0xb1, 0xf5, 0xc7, 0x25, 0x80, 0x32, 0x35, 0x2c, 0x7f, 0x26, 0xfe, 0x89, 0x04,
+	0xb9, 0xd0, 0x75, 0x87, 0x36, 0x23, 0xbc, 0x30, 0x0d, 0xb6, 0x8b, 0xd7, 0x02, 0x96, 0xd0, 0x0f,
+	0xc2, 0x1b, 0xc3, 0x2e, 0x59, 0x29, 0x7d, 0xf9, 0xd7, 0x7f, 0xfc, 0x34, 0xf1, 0x9a, 0xb2, 0x56,
+	0x1a, 0x6c, 0x96, 0x44, 0x49, 0xf5, 0x4b, 0x9f, 0x8f, 0xca, 0xed, 0x17, 0x25, 0x8e, 0x1d, 0xb7,
+	0x05, 0xfc, 0xf9, 0xb1, 0x04, 0x99, 0xe0, 0xfa, 0x43, 0x1b, 0x11, 0xfa, 0x4c, 0x60, 0xf1, 0xe2,
+	0x4c, 0x50, 0x4b, 0x79, 0x83, 0xe9, 0xf4, 0x2a, 0xba, 0x19, 0xa5, 0x53, 0xe9, 0x73, 0xd3, 0xf8,
+	0x02, 0xfd, 0x42, 0x02, 0x18, 0x21, 0x65, 0x14, 0xf5, 0xd2, 0x35, 0x05, 0xee, 0x8b, 0x9b, 0x31,
+	0x38, 0xf8, 0x9d, 0xaa, 0xac, 0x33, 0x15, 0x15, 0x14, 0x69, 0x36, 0xf4, 0x4b, 0xea, 0xc2, 0x11,
+	0x96, 0x8e, 0x76, 0xe1, 0x14, 0xee, 0x9e, 0xd1, 0x6a, 0xf7, 0x98, 0x4a, 0x9b, 0xca, 0xeb, 0x33,
+	0x59, 0x6d, 0xbb, 0xc3, 0xf6, 0xd9, 0x96, 0x6e, 0xa1, 0x9f, 0xb1, 0xdf, 0x92, 0x83, 0x5f, 0xe3,
+	0x23, 0xed, 0x37, 0xf5, 0xc3, 0x7d, 0x54, 0x88, 0xbd, 0xc5, 0x14, 0x7b, 0x53, 0xb9, 0x3d, 0x9b,
+	0x62, 0x1e, 0x95, 0x4f, 0xf5, 0xfa, 0xbd, 0x34, 0xd6, 0x3d, 0x06, 0x5d, 0xc4, 0xfd, 0xd9, 0x73,
+	0x60, 0x1c, 0x46, 0x14, 0xe3, 0xdc, 0xfb, 0xca, 0x1d, 0xa6, 0xf5, 0x1b, 0x8a, 0xf2, 0x64, 0xad,
+	0x03, 0x60, 0xb4, 0x1d, 0x60, 0x04, 0xf4, 0x3b, 0x69, 0xd4, 0x7f, 0x06, 0xfa, 0xde, 0x9d, 0x31,
+	0x47, 0x9e, 0x45, 0x59, 0xe1, 0x7b, 0x54, 0x8a, 0x56, 0xb6, 0xf4, 0xf9, 0x08, 0x2b, 0x7d, 0x81,
+	0xfe, 0x10, 0xee, 0x76, 0x03, 0xe4, 0x88, 0xee, 0xcd, 0x9a, 0x10, 0x13, 0x30, 0xb5, 0x78, 0x3f,
+	0x3e, 0xa3, 0x48, 0xa8, 0x5b, 0xec, 0x04, 0x2f, 0xa3, 0x19, 0xcc, 0x4d, 0x53, 0x0a, 0x4d, 0x03,
+	0xd1, 0xc8, 0xc0, 0x78, 0x22, 0x76, 0x2d, 0xae, 0x4c, 0xf5, 0x67, 0x95, 0x9e, 0x4b, 0x2e, 0x02,
+	0xb3, 0xde, 0x8a, 0x6d, 0xd6, 0xaf, 0x24, 0x40, 0xd3, 0x70, 0x36, 0x52, 0xc3, 0x27, 0x22, 0xe0,
+	0x78, 0xd1, 0xb0, 0xc3, 0xd4, 0xde, 0xde, 0x8a, 0xab, 0xf6, 0x28, 0x8e, 0x7f, 0x2b, 0xc1, 0xf2,
+	0xc4, 0xdf, 0xd6, 0x44, 0xc6, 0xf1, 0xe3, 0xff, 0x16, 0x27, 0xaa, 0x38, 0x94, 0x99, 0xae, 0xef,
+	0x29, 0x77, 0xe2, 0xea, 0xea, 0xf5, 0xed, 0x6d, 0xf1, 0xab, 0xe3, 0xde, 0x39, 0x14, 0x3a, 0x4e,
+	0x2f, 0xd8, 0x68, 0x4c, 0xad, 0x87, 0xd2, 0x27, 0x87, 0x82, 0xde, 0x75, 0x2c, 0xdd, 0xee, 0x6e,
+	0x38, 0x5e, 0xb7, 0xd4, 0xc5, 0x36, 0x73, 0x75, 0x89, 0x4f, 0xe9, 0xae, 0xe9, 0x3f, 0xe1, 0x8f,
+	0xbb, 0xde, 0x19, 0x8d, 0x7e, 0x93, 0x48, 0x1e, 0x96, 0xf7, 0xda, 0x29, 0xc6, 0x79, 0xe7, 0xdf,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0x87, 0x2f, 0xf0, 0xd9, 0x15, 0x26, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3439,195 +3477,3 @@ var _CloudBuild_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/cloudbuild/v1/cloudbuild.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/cloudbuild/v1/cloudbuild.proto", fileDescriptor_cloudbuild_bcd614f113dbc5d4)
-}
-
-var fileDescriptor_cloudbuild_bcd614f113dbc5d4 = []byte{
-	// 2941 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xcb, 0x73, 0xdb, 0xd6,
-	0xd5, 0x17, 0x48, 0x89, 0x8f, 0x43, 0x4a, 0x82, 0x6f, 0x1c, 0x99, 0xa2, 0xe3, 0x58, 0x81, 0xe3,
-	0x44, 0xb1, 0x13, 0x31, 0x92, 0x3f, 0xc7, 0x8e, 0xf2, 0xb0, 0x24, 0x8a, 0x7a, 0x4c, 0x28, 0xd2,
-	0x01, 0x49, 0x67, 0x92, 0xef, 0xfb, 0x06, 0x05, 0x89, 0x2b, 0x0a, 0x15, 0x08, 0xa0, 0xc0, 0x25,
-	0x53, 0x25, 0xcd, 0x74, 0x9a, 0xe9, 0xb4, 0xd3, 0x55, 0x3b, 0xd3, 0xe9, 0xa2, 0xd3, 0x45, 0x1f,
-	0xeb, 0x4e, 0xa7, 0xd3, 0x2e, 0xba, 0xca, 0xba, 0xeb, 0x4e, 0x57, 0xdd, 0x76, 0xfa, 0x47, 0x74,
-	0xd5, 0xe9, 0xdc, 0x07, 0x48, 0x90, 0xb4, 0x03, 0xc2, 0x6e, 0x37, 0x36, 0xee, 0xb9, 0xf7, 0x9c,
-	0x7b, 0xee, 0x79, 0xdd, 0xdf, 0xb9, 0x14, 0x6c, 0x74, 0x1d, 0xa7, 0x6b, 0xe1, 0x92, 0x81, 0x07,
-	0xc4, 0x71, 0x2c, 0xbf, 0xd4, 0xb1, 0x9c, 0xbe, 0xd1, 0xee, 0x9b, 0x96, 0x51, 0x1a, 0x6c, 0x86,
-	0x46, 0x1b, 0xae, 0xe7, 0x10, 0x07, 0x5d, 0xe3, 0xeb, 0x37, 0x82, 0xf5, 0x1b, 0xa1, 0x15, 0x83,
-	0xcd, 0xe2, 0x0b, 0x42, 0x9c, 0xee, 0x9a, 0x25, 0xdd, 0xb6, 0x1d, 0xa2, 0x13, 0xd3, 0xb1, 0x7d,
-	0xce, 0x5c, 0x5c, 0x0d, 0xcd, 0x9e, 0x11, 0xe2, 0xb6, 0x1d, 0xe3, 0x42, 0x4c, 0x29, 0x62, 0x8a,
-	0x89, 0x2b, 0xe9, 0x7d, 0xc3, 0x24, 0xfc, 0x5f, 0xcd, 0x72, 0xba, 0x62, 0xcd, 0x0d, 0xb1, 0xc6,
-	0x72, 0xec, 0xae, 0xd7, 0xb7, 0x6d, 0xd3, 0xee, 0x96, 0x1c, 0x17, 0x7b, 0x63, 0x7b, 0xbc, 0x28,
-	0x16, 0xb1, 0x51, 0xbb, 0x7f, 0x5a, 0x32, 0xfa, 0x7c, 0x81, 0x98, 0xbf, 0x3a, 0x39, 0x8f, 0x7b,
-	0x2e, 0x09, 0xb4, 0x58, 0x9b, 0x9c, 0x3c, 0x35, 0xb1, 0x65, 0x68, 0x3d, 0xdd, 0x3f, 0x17, 0x2b,
-	0xae, 0x4f, 0xae, 0x20, 0x66, 0x0f, 0xfb, 0x44, 0xef, 0xb9, 0x7c, 0x81, 0xb2, 0x07, 0x97, 0x54,
-	0x4c, 0xbc, 0x8b, 0x3d, 0x6a, 0x12, 0x15, 0x7f, 0xab, 0x8f, 0x7d, 0x82, 0xae, 0x01, 0xb8, 0x9e,
-	0xf3, 0x4d, 0xdc, 0x21, 0x9a, 0x69, 0x14, 0xa4, 0x35, 0x69, 0x3d, 0xab, 0x66, 0x05, 0xe5, 0xd8,
-	0x40, 0x4b, 0x90, 0x30, 0x8d, 0x42, 0x82, 0x91, 0x13, 0xa6, 0xa1, 0xfc, 0x5c, 0x82, 0x15, 0xb5,
-	0x6f, 0x33, 0x11, 0x4d, 0xcf, 0xec, 0x76, 0xb1, 0x37, 0xa3, 0xa4, 0x6b, 0x00, 0x84, 0x33, 0x68,
-	0x43, 0x89, 0x59, 0x41, 0x39, 0x36, 0xd0, 0x2e, 0xa4, 0x7c, 0xa7, 0xef, 0x75, 0x70, 0x21, 0xb9,
-	0x26, 0xad, 0xe7, 0xb6, 0x5e, 0xdb, 0xf8, 0x5a, 0x77, 0x6e, 0xa8, 0xd8, 0x75, 0x1a, 0x8c, 0x41,
-	0x15, 0x8c, 0x8a, 0x06, 0x8b, 0x0d, 0xe2, 0x78, 0x7a, 0x17, 0xf3, 0x09, 0xb4, 0x02, 0xa9, 0x76,
-	0xbf, 0x73, 0x8e, 0x89, 0xd0, 0x46, 0x8c, 0x28, 0xdd, 0x69, 0x53, 0xb5, 0x84, 0x1a, 0x62, 0x84,
-	0x5e, 0x04, 0xe8, 0x62, 0x5b, 0x78, 0x8d, 0xe9, 0x91, 0x54, 0x43, 0x14, 0xe5, 0xcf, 0x12, 0xc0,
-	0x68, 0xdf, 0xa8, 0x03, 0x5f, 0x85, 0xac, 0x87, 0x5d, 0x47, 0xb3, 0xf5, 0x1e, 0x16, 0x1b, 0x65,
-	0x28, 0xa1, 0xa6, 0xf7, 0x30, 0x7a, 0x09, 0x72, 0x6d, 0x4f, 0xb7, 0x3b, 0x67, 0x7c, 0x9a, 0xee,
-	0x95, 0x3d, 0x9a, 0x53, 0x81, 0x13, 0xd9, 0x92, 0xab, 0x90, 0x21, 0x7a, 0x97, 0xcf, 0xcf, 0x8b,
-	0xf9, 0x34, 0xd1, 0xbb, 0x6c, 0xf2, 0x3a, 0x40, 0xc7, 0xe9, 0xf5, 0x4c, 0xa2, 0xf9, 0x67, 0x7a,
-	0x61, 0x41, 0x4c, 0x67, 0x39, 0xad, 0x71, 0xa6, 0x23, 0x19, 0x92, 0x86, 0xe9, 0x15, 0xd2, 0x6c,
-	0x5f, 0xfa, 0xb9, 0x07, 0x90, 0xf1, 0xf0, 0xc0, 0xf4, 0xe9, 0x49, 0xfe, 0x24, 0x41, 0x4a, 0x9c,
-	0xa2, 0x05, 0x4b, 0x3e, 0xb7, 0x9a, 0x26, 0x1c, 0x90, 0x60, 0x0e, 0x78, 0x3d, 0xc2, 0x01, 0x63,
-	0xa6, 0x3e, 0x9a, 0x53, 0x17, 0xfd, 0x31, 0xdb, 0x57, 0x21, 0xc7, 0x4e, 0xff, 0x94, 0x4e, 0xa5,
-	0xb6, 0xf0, 0x86, 0xa3, 0xbd, 0x4c, 0x10, 0x1d, 0xca, 0x97, 0x12, 0x00, 0x8d, 0x3e, 0x72, 0xdc,
-	0xd3, 0xbb, 0x18, 0x21, 0x98, 0x67, 0x06, 0xe2, 0xd6, 0x67, 0xdf, 0xd4, 0xbd, 0x86, 0xd9, 0xc5,
-	0x3e, 0xe1, 0x66, 0x55, 0xc5, 0x08, 0x1d, 0x41, 0xce, 0xed, 0xfb, 0x67, 0x1a, 0x31, 0x7b, 0xa6,
-	0xdd, 0x65, 0x36, 0xcd, 0x6d, 0xbd, 0x1a, 0xa1, 0x52, 0xd3, 0xec, 0xe1, 0x86, 0xab, 0xdb, 0x2a,
-	0x50, 0xde, 0x26, 0x63, 0x55, 0x7e, 0x38, 0x0f, 0x59, 0x96, 0x02, 0x0d, 0x82, 0xdd, 0xc7, 0xea,
-	0x20, 0x43, 0x12, 0xdb, 0x83, 0x42, 0x62, 0x2d, 0x49, 0xcd, 0x8f, 0xed, 0x01, 0x5d, 0xa5, 0x7b,
-	0x5d, 0xbf, 0x90, 0x64, 0x24, 0xf6, 0x1d, 0x38, 0x69, 0x7e, 0xe8, 0x24, 0x91, 0x6f, 0x0b, 0x41,
-	0xbe, 0xa1, 0x55, 0xc8, 0x7c, 0xaa, 0x9b, 0x44, 0x3b, 0x75, 0xbc, 0x42, 0x8a, 0x71, 0xa6, 0xe9,
-	0xf8, 0xc0, 0xf1, 0x68, 0xb4, 0x62, 0x9b, 0x78, 0x17, 0xae, 0x63, 0xda, 0x44, 0x38, 0x3a, 0x44,
-	0xa1, 0xe1, 0xe9, 0xe3, 0x8e, 0x87, 0x89, 0x46, 0x35, 0xc9, 0x30, 0xe6, 0x2c, 0xa7, 0x54, 0xec,
-	0x01, 0x7a, 0x00, 0xe9, 0x81, 0x63, 0xf5, 0x7b, 0xd8, 0x2f, 0x64, 0xd7, 0x92, 0xeb, 0xb9, 0xad,
-	0x9b, 0x11, 0x96, 0x78, 0xc4, 0x56, 0xab, 0x01, 0x17, 0x7a, 0x00, 0x29, 0x61, 0x49, 0x88, 0x67,
-	0x49, 0xc1, 0xc6, 0xfd, 0x61, 0x59, 0x81, 0x3f, 0x16, 0x63, 0xfb, 0xc3, 0xb2, 0xb8, 0x3f, 0xd0,
-	0x1d, 0x48, 0xd3, 0x62, 0xe7, 0xf4, 0x49, 0x21, 0xc7, 0xa4, 0xac, 0x06, 0x52, 0x82, 0x62, 0xb8,
-	0xb1, 0x2f, 0x6a, 0xad, 0x1a, 0xac, 0x44, 0x65, 0x48, 0xf9, 0x44, 0x27, 0x7d, 0xbf, 0x90, 0x5f,
-	0x93, 0xd6, 0x97, 0xb6, 0x6e, 0x47, 0xec, 0xcc, 0x1c, 0xbe, 0xd1, 0x60, 0x2c, 0xaa, 0x60, 0x55,
-	0xde, 0x84, 0x14, 0xb7, 0xcb, 0x63, 0xa3, 0x00, 0xc1, 0xbc, 0xab, 0x93, 0x33, 0x91, 0xfd, 0xec,
-	0x5b, 0xf9, 0xa7, 0x04, 0x69, 0x15, 0xfb, 0x7d, 0x8b, 0xf8, 0xb4, 0xe8, 0x99, 0x34, 0x8c, 0x7d,
-	0x16, 0x28, 0xd1, 0xf9, 0x31, 0x0a, 0x7c, 0x55, 0x30, 0xa2, 0x5b, 0x70, 0x89, 0x4d, 0x6b, 0x3e,
-	0xc1, 0xae, 0x26, 0xa4, 0xf1, 0x18, 0x5b, 0x6e, 0x07, 0x21, 0x7a, 0xcc, 0xd7, 0xde, 0x86, 0x4b,
-	0xba, 0x47, 0xcc, 0x53, 0xbd, 0x43, 0xb4, 0x9e, 0x6e, 0x9b, 0xa7, 0x34, 0x47, 0x78, 0xf0, 0xc9,
-	0xc1, 0xc4, 0x89, 0xa0, 0xa3, 0x1b, 0xb0, 0x68, 0xf7, 0x7b, 0x5a, 0x40, 0xf7, 0x59, 0x50, 0x26,
-	0xd5, 0xbc, 0xdd, 0xef, 0xed, 0x06, 0x34, 0xf4, 0x3a, 0xa0, 0xd0, 0xee, 0x4e, 0x9f, 0xb8, 0x7d,
-	0xe2, 0xb3, 0x40, 0xcd, 0xab, 0xf2, 0x70, 0xfb, 0x3a, 0xa7, 0x2b, 0x04, 0x96, 0x02, 0x56, 0x6e,
-	0x01, 0x54, 0x84, 0x8c, 0xe5, 0x74, 0x78, 0xbd, 0xe5, 0x86, 0x1b, 0x8e, 0xd1, 0x01, 0x64, 0x4f,
-	0x4d, 0x0b, 0x6b, 0x67, 0xba, 0x7f, 0x36, 0xa3, 0x7d, 0x0e, 0x4c, 0x0b, 0x1f, 0xe9, 0xfe, 0x19,
-	0xf6, 0xd5, 0xcc, 0xa9, 0xf8, 0x56, 0xfe, 0x96, 0x83, 0x05, 0xe6, 0x3b, 0x91, 0x5c, 0xd2, 0x30,
-	0xb9, 0xc6, 0x0b, 0xb8, 0x3c, 0x59, 0xc0, 0x47, 0x01, 0x92, 0x78, 0xea, 0x00, 0xa1, 0x66, 0xe4,
-	0x5f, 0x9a, 0x81, 0x89, 0x6e, 0x5a, 0x85, 0x02, 0xdb, 0x26, 0xcf, 0x89, 0xfb, 0x8c, 0x86, 0xde,
-	0x9b, 0xb8, 0xfc, 0xa2, 0x52, 0x71, 0xfc, 0xe2, 0x43, 0xef, 0xc3, 0x02, 0xb5, 0xbf, 0x5f, 0xc8,
-	0x31, 0x2b, 0xad, 0xcf, 0xa2, 0x27, 0xf5, 0x8b, 0xca, 0xd9, 0xd0, 0x0e, 0xa4, 0x3d, 0x1e, 0x91,
-	0x22, 0x95, 0x5f, 0x89, 0xac, 0xd3, 0x6c, 0xb5, 0x1a, 0xb0, 0xa1, 0x77, 0x20, 0xd7, 0xf1, 0xb0,
-	0x4e, 0x30, 0x4d, 0x66, 0x5c, 0x48, 0x31, 0x29, 0xc5, 0xa9, 0x24, 0x6c, 0x06, 0x88, 0x44, 0x05,
-	0xbe, 0x9c, 0x12, 0xd0, 0xdb, 0x00, 0x3e, 0xd1, 0x3d, 0xc2, 0x79, 0xd3, 0x91, 0xbc, 0x59, 0xb6,
-	0x9a, 0xb1, 0xbe, 0x03, 0xb9, 0x53, 0xd3, 0x36, 0x79, 0x51, 0xc7, 0x85, 0x4c, 0xf4, 0xbe, 0x7c,
-	0x39, 0x63, 0x0e, 0x55, 0x8d, 0xfc, 0xcc, 0x55, 0x63, 0x65, 0x98, 0xb2, 0x8b, 0x2c, 0xc9, 0x82,
-	0x3c, 0x3c, 0x80, 0xec, 0x28, 0x55, 0x6e, 0x32, 0x71, 0x51, 0x7e, 0x18, 0xa6, 0x91, 0x3a, 0x62,
-	0x45, 0xd7, 0x21, 0x67, 0x39, 0x5d, 0x5f, 0x13, 0xc0, 0xe5, 0x39, 0x5e, 0xd6, 0x29, 0x69, 0x8f,
-	0x83, 0x97, 0xff, 0x83, 0x4b, 0xdc, 0xed, 0x9a, 0xeb, 0x39, 0x03, 0x6c, 0xeb, 0x76, 0x07, 0x17,
-	0x9e, 0x67, 0x1b, 0x96, 0x66, 0x0a, 0x9b, 0x87, 0x43, 0x36, 0x55, 0xf6, 0x27, 0x28, 0x68, 0x1d,
-	0x78, 0xda, 0x6a, 0x21, 0xac, 0xb6, 0xc2, 0x74, 0x58, 0x6a, 0x87, 0x30, 0xdf, 0xb1, 0x81, 0x2a,
-	0x90, 0x76, 0x5c, 0x06, 0x6f, 0x0b, 0x57, 0xd8, 0xee, 0x33, 0xa5, 0x47, 0x9d, 0xb3, 0xa8, 0x01,
-	0x2f, 0xba, 0x02, 0x69, 0xcb, 0xe9, 0x6a, 0x7d, 0xcf, 0x2a, 0xac, 0xf2, 0xdb, 0xda, 0x72, 0xba,
-	0x2d, 0xcf, 0x42, 0xff, 0x0f, 0x8b, 0x7e, 0xbf, 0xed, 0x13, 0x93, 0xf4, 0xf9, 0x2e, 0xd7, 0x58,
-	0x70, 0xdf, 0x9b, 0x2d, 0x09, 0xc3, 0x9c, 0x15, 0x7a, 0x27, 0xaa, 0xe3, 0xd2, 0x68, 0x69, 0x26,
-	0x7a, 0xd7, 0x2f, 0x5c, 0xe7, 0xd7, 0x31, 0xfd, 0xa6, 0x57, 0x22, 0xbf, 0x1f, 0xfd, 0xc2, 0xda,
-	0x4c, 0x57, 0x62, 0x83, 0xad, 0x56, 0x03, 0x2e, 0x74, 0x34, 0xbc, 0x12, 0x5f, 0x62, 0xfc, 0x6f,
-	0xce, 0xa4, 0x2c, 0xbf, 0xc4, 0xb8, 0x96, 0x82, 0xbf, 0xb8, 0x03, 0x68, 0xfa, 0x0c, 0x14, 0x2f,
-	0x9c, 0xe3, 0x0b, 0x51, 0xc1, 0xe8, 0x27, 0xba, 0x0c, 0x0b, 0x03, 0xdd, 0xea, 0x07, 0x00, 0x93,
-	0x0f, 0xb6, 0x13, 0xf7, 0xa5, 0x62, 0x1b, 0x72, 0x21, 0xc1, 0x8f, 0x61, 0x7d, 0x2f, 0xcc, 0x1a,
-	0xe3, 0xe2, 0x1d, 0xed, 0xa1, 0x7c, 0x17, 0x52, 0xbc, 0xdc, 0x21, 0x04, 0x4b, 0x8d, 0xe6, 0x6e,
-	0xb3, 0xd5, 0xd0, 0x5a, 0xb5, 0x0f, 0x6a, 0xf5, 0x8f, 0x6a, 0xf2, 0x1c, 0x02, 0x48, 0x7d, 0xd8,
-	0xaa, 0xb4, 0x2a, 0xfb, 0xb2, 0x84, 0x72, 0x90, 0xfe, 0xa8, 0xae, 0x7e, 0x70, 0x5c, 0x3b, 0x94,
-	0x13, 0x74, 0xd0, 0x68, 0x95, 0xcb, 0x95, 0x46, 0x43, 0x4e, 0xd2, 0xc1, 0xc1, 0xee, 0x71, 0xb5,
-	0xa5, 0x56, 0xe4, 0x79, 0x2a, 0xe6, 0xb8, 0xd6, 0xac, 0xa8, 0xb5, 0xdd, 0xaa, 0x56, 0x51, 0xd5,
-	0xba, 0x2a, 0x2f, 0xd0, 0x05, 0xcd, 0xe3, 0x93, 0x4a, 0xbd, 0xd5, 0x94, 0x53, 0x68, 0x11, 0xb2,
-	0xe5, 0xdd, 0x5a, 0xb9, 0x52, 0xad, 0x56, 0xf6, 0xe5, 0xb4, 0xf2, 0x2f, 0x09, 0xb2, 0xa3, 0xdb,
-	0x68, 0x94, 0x9b, 0xd2, 0x58, 0x6e, 0xaa, 0x90, 0xe6, 0x08, 0xdf, 0x17, 0x67, 0xbd, 0x3f, 0x6b,
-	0x66, 0x0e, 0xbf, 0xea, 0x9c, 0x5f, 0x0d, 0x04, 0x15, 0xbf, 0x2f, 0xc1, 0xf2, 0xc4, 0xe4, 0xd7,
-	0xde, 0x66, 0x97, 0x61, 0x81, 0x5e, 0xff, 0xbe, 0x80, 0x84, 0x7c, 0x10, 0xc2, 0x50, 0xc9, 0xa7,
-	0xc2, 0x50, 0xca, 0x77, 0x20, 0x13, 0xd0, 0x26, 0xea, 0xa8, 0x14, 0xa7, 0x8e, 0xde, 0x85, 0x0c,
-	0xb6, 0x0d, 0xce, 0x98, 0x88, 0x64, 0x4c, 0x63, 0xdb, 0xa0, 0x23, 0xa5, 0x09, 0x2b, 0x22, 0xab,
-	0x45, 0x8b, 0x74, 0x82, 0x89, 0x6e, 0xe8, 0x44, 0x47, 0xdb, 0xb0, 0xc0, 0x94, 0x16, 0x6a, 0xbc,
-	0x3c, 0x4b, 0x22, 0xa8, 0x9c, 0x45, 0xf9, 0x75, 0x12, 0xe4, 0xc9, 0x52, 0x85, 0x0c, 0xb8, 0xe2,
-	0x61, 0xdf, 0xb1, 0x06, 0x98, 0x82, 0x8d, 0xb1, 0x7e, 0x25, 0x19, 0xbf, 0x5f, 0x51, 0x9f, 0x0f,
-	0x84, 0x8d, 0x77, 0x8c, 0xff, 0x0b, 0x97, 0x87, 0xbb, 0x84, 0xdb, 0x97, 0x54, 0xdc, 0x9e, 0x14,
-	0x05, 0x62, 0x42, 0xfd, 0xe2, 0x37, 0xe8, 0x65, 0x25, 0x00, 0x0d, 0xf6, 0x0b, 0xf3, 0xac, 0x44,
-	0x3c, 0x88, 0x59, 0xb3, 0x43, 0x18, 0x87, 0x57, 0x0c, 0x38, 0x1d, 0x12, 0x8a, 0x67, 0xb0, 0x3c,
-	0x31, 0xfd, 0x98, 0xbc, 0x7f, 0x30, 0x9e, 0xf7, 0x31, 0x30, 0x55, 0x28, 0xf3, 0x6b, 0x00, 0xa3,
-	0x09, 0xb4, 0x13, 0x86, 0x6a, 0x12, 0x3b, 0xd7, 0x8d, 0x08, 0xb1, 0x94, 0x33, 0x04, 0xd2, 0x7e,
-	0x24, 0xc1, 0x3c, 0xfd, 0x40, 0x3b, 0x30, 0x4f, 0x2e, 0x5c, 0x1e, 0xbe, 0x4b, 0x91, 0x4e, 0xa5,
-	0x2c, 0xec, 0x9f, 0xe6, 0x85, 0x8b, 0x55, 0xc6, 0x39, 0x5e, 0x12, 0xf3, 0x42, 0x69, 0xe5, 0x35,
-	0xc8, 0x04, 0xeb, 0x50, 0x06, 0xe6, 0x6b, 0xf5, 0x5a, 0x85, 0x97, 0xa8, 0xc6, 0xd1, 0xee, 0xd6,
-	0xdd, 0xb7, 0x64, 0x09, 0xa5, 0x21, 0x79, 0xb2, 0x7f, 0x57, 0x4e, 0x28, 0x5f, 0xd1, 0xe6, 0x98,
-	0x55, 0x74, 0xb4, 0x06, 0xf9, 0xf3, 0x9e, 0xaf, 0x9d, 0xe3, 0x0b, 0x2d, 0x04, 0xee, 0xe1, 0xbc,
-	0xe7, 0x7f, 0x80, 0x2f, 0x58, 0x23, 0xde, 0x18, 0xeb, 0xb2, 0x92, 0xec, 0xec, 0xff, 0x33, 0xd3,
-	0xb5, 0x21, 0xfe, 0xab, 0xd8, 0x03, 0xee, 0xc8, 0x51, 0x6f, 0x56, 0x7c, 0x17, 0x96, 0xc6, 0x27,
-	0xa3, 0x2a, 0x7f, 0x3e, 0xec, 0x1b, 0x07, 0x50, 0x99, 0xa1, 0xab, 0x38, 0x0f, 0x3d, 0xc3, 0x84,
-	0x4d, 0xc4, 0x4f, 0xd8, 0x1d, 0x58, 0x3e, 0xc4, 0xe4, 0x59, 0x9e, 0x95, 0x7e, 0x20, 0xc1, 0xa5,
-	0xaa, 0xe9, 0x73, 0x19, 0xfe, 0x8c, 0x42, 0xae, 0x42, 0xd6, 0x65, 0x65, 0xc0, 0xfc, 0x8c, 0x5b,
-	0x61, 0x41, 0xcd, 0x50, 0x42, 0xc3, 0xfc, 0x8c, 0x3f, 0xce, 0xd0, 0x49, 0xe2, 0x9c, 0x63, 0x5b,
-	0x3c, 0x04, 0xb0, 0xe5, 0x4d, 0x4a, 0xa0, 0x57, 0xc5, 0xa9, 0x69, 0x11, 0xec, 0x31, 0xcc, 0x98,
-	0x55, 0xc5, 0x48, 0xf9, 0x0c, 0x50, 0x58, 0x0f, 0xdf, 0x75, 0x6c, 0x1f, 0xa3, 0x77, 0x21, 0xc5,
-	0x4e, 0xea, 0x8b, 0xe0, 0x9e, 0xcd, 0x3a, 0x82, 0x07, 0xbd, 0x02, 0xcb, 0x36, 0xfe, 0x36, 0xd1,
-	0x42, 0xfa, 0xf0, 0x93, 0x2f, 0x52, 0xf2, 0xc3, 0x40, 0x27, 0xa5, 0x0c, 0xa8, 0x4c, 0x53, 0xdc,
-	0x7a, 0x16, 0x4b, 0xfe, 0x65, 0x1e, 0xf2, 0xe1, 0xd7, 0xb9, 0xa9, 0xa6, 0x67, 0x0d, 0x72, 0x06,
-	0xf6, 0x3b, 0x9e, 0xc9, 0x00, 0x18, 0x03, 0xfc, 0x59, 0x35, 0x4c, 0x42, 0x4d, 0x90, 0x03, 0xf4,
-	0x47, 0x70, 0xcf, 0xb5, 0x74, 0x12, 0xa0, 0xf2, 0x18, 0x05, 0x70, 0x59, 0x88, 0x68, 0x0a, 0x09,
-	0xe8, 0xdd, 0x20, 0xc0, 0xe6, 0x67, 0x0f, 0xb0, 0xa3, 0x39, 0x11, 0x62, 0xe8, 0x05, 0x60, 0xb5,
-	0x82, 0x25, 0x61, 0x46, 0xbc, 0x76, 0x0d, 0x29, 0x93, 0xed, 0xc7, 0x42, 0xac, 0xf6, 0xa3, 0x08,
-	0x19, 0xc3, 0xf4, 0xf5, 0xb6, 0x85, 0x8d, 0x42, 0x76, 0x4d, 0x5a, 0xcf, 0xa8, 0xc3, 0x31, 0x32,
-	0x26, 0x41, 0x28, 0xef, 0xb0, 0xde, 0x9f, 0x45, 0x79, 0xe1, 0x80, 0x19, 0xb0, 0xe8, 0x0d, 0x58,
-	0x34, 0xbb, 0xb6, 0xe3, 0x61, 0x43, 0xa3, 0x47, 0xf2, 0x0b, 0xcb, 0x0c, 0x23, 0xe4, 0x05, 0x91,
-	0x16, 0x5a, 0x1f, 0xdd, 0x84, 0x25, 0xd3, 0xee, 0x58, 0x7d, 0x63, 0xb8, 0x4a, 0x66, 0xab, 0x16,
-	0x03, 0x2a, 0x5b, 0xf6, 0xec, 0xc0, 0x71, 0x4f, 0x86, 0x25, 0xd1, 0x02, 0x08, 0xd7, 0x29, 0xdf,
-	0x93, 0x60, 0x35, 0x54, 0x51, 0xe2, 0xbd, 0xfb, 0x56, 0x20, 0x2d, 0x42, 0x41, 0x94, 0x96, 0xdb,
-	0x31, 0x8c, 0xa7, 0x06, 0xbc, 0xca, 0x23, 0x58, 0x09, 0x6a, 0xcc, 0x7f, 0xf2, 0xdd, 0x59, 0x79,
-	0x1b, 0x0a, 0xc3, 0x84, 0x17, 0x82, 0x67, 0xac, 0x3f, 0x8a, 0x01, 0xab, 0x8f, 0x61, 0x15, 0x25,
-	0xe3, 0x10, 0x32, 0x62, 0x93, 0xa0, 0x68, 0xc4, 0x3a, 0xf7, 0x90, 0x59, 0xf9, 0x18, 0x56, 0xf7,
-	0xb1, 0x85, 0x9f, 0xca, 0xf6, 0x11, 0x67, 0xff, 0x95, 0x04, 0xab, 0x2d, 0xd7, 0xd0, 0xff, 0x0b,
-	0xb2, 0xc3, 0x6e, 0x4f, 0x3e, 0x83, 0xdb, 0xff, 0x9e, 0x11, 0xe5, 0x4c, 0x34, 0x8e, 0xa8, 0x0d,
-	0x2b, 0x53, 0xed, 0xef, 0x08, 0x77, 0xc4, 0x45, 0x0c, 0x97, 0x27, 0x1b, 0x60, 0x86, 0x41, 0x5c,
-	0x8a, 0x35, 0x99, 0x11, 0xb0, 0xa1, 0x0d, 0xb0, 0x67, 0x9e, 0x5e, 0x68, 0xbc, 0x5f, 0x15, 0x2f,
-	0x41, 0xf7, 0x63, 0xb4, 0xba, 0x1b, 0x8f, 0x98, 0x00, 0x3e, 0xa2, 0xb8, 0x53, 0x08, 0x0e, 0x93,
-	0xd1, 0x27, 0x90, 0xef, 0xe9, 0x9d, 0x33, 0xd3, 0xc6, 0x1a, 0x43, 0x3f, 0x49, 0xb6, 0xcd, 0xbd,
-	0x38, 0xdb, 0x9c, 0x70, 0x7e, 0x76, 0xac, 0x5c, 0x6f, 0x34, 0xa0, 0x18, 0xc6, 0x30, 0xfd, 0x73,
-	0x76, 0x4d, 0x6a, 0xdd, 0x36, 0xc3, 0xb2, 0x49, 0x15, 0x28, 0x8d, 0xde, 0x94, 0x87, 0x6d, 0xe4,
-	0xc0, 0x73, 0xe1, 0x82, 0x14, 0x9c, 0x75, 0x9e, 0x29, 0xf1, 0x7e, 0x1c, 0x25, 0xc2, 0xa5, 0x47,
-	0x9c, 0x18, 0xf9, 0x53, 0x34, 0xe4, 0xc2, 0x65, 0xda, 0xf4, 0xfb, 0xc4, 0xc3, 0x3a, 0x6d, 0x63,
-	0x82, 0x1d, 0x17, 0xe2, 0xef, 0x58, 0x75, 0xba, 0x8d, 0x40, 0x4c, 0xb0, 0xa3, 0x35, 0x45, 0x43,
-	0xd7, 0x21, 0xf7, 0xa9, 0xe3, 0x9d, 0x63, 0x4f, 0x73, 0x1d, 0xc7, 0x0a, 0x5e, 0xcb, 0x39, 0xe9,
-	0xa1, 0xe3, 0x58, 0xe8, 0x43, 0xf6, 0x0e, 0xd1, 0xa5, 0xad, 0x58, 0x2e, 0xbe, 0xf1, 0xab, 0x9c,
-	0xf5, 0xc4, 0x31, 0xb0, 0x1a, 0xc8, 0x09, 0x7e, 0x03, 0xc8, 0x8f, 0x7e, 0x03, 0x18, 0x7f, 0x92,
-	0x5f, 0xfc, 0x9a, 0x27, 0xf9, 0xa5, 0xa7, 0x79, 0x92, 0x57, 0x36, 0x20, 0x3f, 0x16, 0x56, 0x32,
-	0xe4, 0x6b, 0xf5, 0xa6, 0xf6, 0xa8, 0xa2, 0x1e, 0x1f, 0x1c, 0x57, 0xf6, 0xe5, 0x39, 0x94, 0x87,
-	0xcc, 0x70, 0x24, 0x29, 0x65, 0xc8, 0x85, 0xc2, 0x06, 0x2d, 0x43, 0xae, 0x55, 0x6b, 0x3c, 0xac,
-	0x94, 0x83, 0xd5, 0x94, 0x7f, 0x53, 0x3b, 0x3a, 0x3e, 0x3c, 0x2a, 0x3f, 0x6c, 0x69, 0xf7, 0x65,
-	0x09, 0x5d, 0x82, 0xc5, 0x10, 0xe5, 0xce, 0x96, 0x9c, 0x50, 0xee, 0x8e, 0xdf, 0x38, 0x62, 0xeb,
-	0x25, 0x80, 0x93, 0x56, 0xa3, 0xa9, 0x9d, 0xec, 0x36, 0xcb, 0x47, 0xf2, 0x1c, 0x95, 0xbd, 0x5b,
-	0xad, 0xd6, 0x3f, 0xd2, 0xaa, 0xf5, 0x7a, 0xa3, 0x22, 0x4b, 0xca, 0x21, 0xa0, 0x69, 0xdf, 0xf1,
-	0x77, 0x04, 0xb5, 0xb2, 0x7b, 0xa2, 0xed, 0x57, 0x0e, 0x76, 0x5b, 0xd5, 0xa6, 0x3c, 0x47, 0x7b,
-	0x7e, 0x41, 0xab, 0xd7, 0x64, 0x89, 0x4a, 0x0e, 0x86, 0x07, 0x07, 0x72, 0x42, 0xd9, 0x81, 0x5c,
-	0xc8, 0xfc, 0xe8, 0x0a, 0x3c, 0x57, 0xad, 0x1f, 0x1e, 0x1e, 0xd7, 0x0e, 0xb5, 0xf1, 0xc3, 0x00,
-	0xa4, 0xaa, 0x95, 0xc3, 0xdd, 0xf2, 0xc7, 0xb2, 0x44, 0xcd, 0x70, 0x58, 0x6e, 0x68, 0xf5, 0x5a,
-	0xf5, 0x63, 0x39, 0xb1, 0xf5, 0xc7, 0x25, 0x80, 0x32, 0x35, 0x2c, 0x7f, 0x26, 0xfe, 0x89, 0x04,
-	0xb9, 0xd0, 0x75, 0x87, 0x36, 0x23, 0xbc, 0x30, 0x0d, 0xb6, 0x8b, 0xd7, 0x02, 0x96, 0xd0, 0x0f,
-	0xc2, 0x1b, 0xc3, 0x2e, 0x59, 0x29, 0x7d, 0xf9, 0xd7, 0x7f, 0xfc, 0x34, 0xf1, 0x9a, 0xb2, 0x56,
-	0x1a, 0x6c, 0x96, 0x44, 0x49, 0xf5, 0x4b, 0x9f, 0x8f, 0xca, 0xed, 0x17, 0x25, 0x8e, 0x1d, 0xb7,
-	0x05, 0xfc, 0xf9, 0xb1, 0x04, 0x99, 0xe0, 0xfa, 0x43, 0x1b, 0x11, 0xfa, 0x4c, 0x60, 0xf1, 0xe2,
-	0x4c, 0x50, 0x4b, 0x79, 0x83, 0xe9, 0xf4, 0x2a, 0xba, 0x19, 0xa5, 0x53, 0xe9, 0x73, 0xd3, 0xf8,
-	0x02, 0xfd, 0x42, 0x02, 0x18, 0x21, 0x65, 0x14, 0xf5, 0xd2, 0x35, 0x05, 0xee, 0x8b, 0x9b, 0x31,
-	0x38, 0xf8, 0x9d, 0xaa, 0xac, 0x33, 0x15, 0x15, 0x14, 0x69, 0x36, 0xf4, 0x4b, 0xea, 0xc2, 0x11,
-	0x96, 0x8e, 0x76, 0xe1, 0x14, 0xee, 0x9e, 0xd1, 0x6a, 0xf7, 0x98, 0x4a, 0x9b, 0xca, 0xeb, 0x33,
-	0x59, 0x6d, 0xbb, 0xc3, 0xf6, 0xd9, 0x96, 0x6e, 0xa1, 0x9f, 0xb1, 0xdf, 0x92, 0x83, 0x5f, 0xe3,
-	0x23, 0xed, 0x37, 0xf5, 0xc3, 0x7d, 0x54, 0x88, 0xbd, 0xc5, 0x14, 0x7b, 0x53, 0xb9, 0x3d, 0x9b,
-	0x62, 0x1e, 0x95, 0x4f, 0xf5, 0xfa, 0xbd, 0x34, 0xd6, 0x3d, 0x06, 0x5d, 0xc4, 0xfd, 0xd9, 0x73,
-	0x60, 0x1c, 0x46, 0x14, 0xe3, 0xdc, 0xfb, 0xca, 0x1d, 0xa6, 0xf5, 0x1b, 0x8a, 0xf2, 0x64, 0xad,
-	0x03, 0x60, 0xb4, 0x1d, 0x60, 0x04, 0xf4, 0x3b, 0x69, 0xd4, 0x7f, 0x06, 0xfa, 0xde, 0x9d, 0x31,
-	0x47, 0x9e, 0x45, 0x59, 0xe1, 0x7b, 0x54, 0x8a, 0x56, 0xb6, 0xf4, 0xf9, 0x08, 0x2b, 0x7d, 0x81,
-	0xfe, 0x10, 0xee, 0x76, 0x03, 0xe4, 0x88, 0xee, 0xcd, 0x9a, 0x10, 0x13, 0x30, 0xb5, 0x78, 0x3f,
-	0x3e, 0xa3, 0x48, 0xa8, 0x5b, 0xec, 0x04, 0x2f, 0xa3, 0x19, 0xcc, 0x4d, 0x53, 0x0a, 0x4d, 0x03,
-	0xd1, 0xc8, 0xc0, 0x78, 0x22, 0x76, 0x2d, 0xae, 0x4c, 0xf5, 0x67, 0x95, 0x9e, 0x4b, 0x2e, 0x02,
-	0xb3, 0xde, 0x8a, 0x6d, 0xd6, 0xaf, 0x24, 0x40, 0xd3, 0x70, 0x36, 0x52, 0xc3, 0x27, 0x22, 0xe0,
-	0x78, 0xd1, 0xb0, 0xc3, 0xd4, 0xde, 0xde, 0x8a, 0xab, 0xf6, 0x28, 0x8e, 0x7f, 0x2b, 0xc1, 0xf2,
-	0xc4, 0xdf, 0xd6, 0x44, 0xc6, 0xf1, 0xe3, 0xff, 0x16, 0x27, 0xaa, 0x38, 0x94, 0x99, 0xae, 0xef,
-	0x29, 0x77, 0xe2, 0xea, 0xea, 0xf5, 0xed, 0x6d, 0xf1, 0xab, 0xe3, 0xde, 0x39, 0x14, 0x3a, 0x4e,
-	0x2f, 0xd8, 0x68, 0x4c, 0xad, 0x87, 0xd2, 0x27, 0x87, 0x82, 0xde, 0x75, 0x2c, 0xdd, 0xee, 0x6e,
-	0x38, 0x5e, 0xb7, 0xd4, 0xc5, 0x36, 0x73, 0x75, 0x89, 0x4f, 0xe9, 0xae, 0xe9, 0x3f, 0xe1, 0x8f,
-	0xbb, 0xde, 0x19, 0x8d, 0x7e, 0x93, 0x48, 0x1e, 0x96, 0xf7, 0xda, 0x29, 0xc6, 0x79, 0xe7, 0xdf,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x87, 0x2f, 0xf0, 0xd9, 0x15, 0x26, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/clouddebugger/v2/controller.pb.go b/googleapis/devtools/clouddebugger/v2/controller.pb.go
index 3f8e0c395b..85c360ceb3 100644
--- a/googleapis/devtools/clouddebugger/v2/controller.pb.go
+++ b/googleapis/devtools/clouddebugger/v2/controller.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/controller.proto
 
-package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package clouddebugger
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request to register a debuggee.
 type RegisterDebuggeeRequest struct {
@@ -40,16 +40,17 @@ func (m *RegisterDebuggeeRequest) Reset()         { *m = RegisterDebuggeeRequest
 func (m *RegisterDebuggeeRequest) String() string { return proto.CompactTextString(m) }
 func (*RegisterDebuggeeRequest) ProtoMessage()    {}
 func (*RegisterDebuggeeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_controller_a5860eef34f5ab07, []int{0}
+	return fileDescriptor_694192a34270926f, []int{0}
 }
+
 func (m *RegisterDebuggeeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegisterDebuggeeRequest.Unmarshal(m, b)
 }
 func (m *RegisterDebuggeeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RegisterDebuggeeRequest.Marshal(b, m, deterministic)
 }
-func (dst *RegisterDebuggeeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RegisterDebuggeeRequest.Merge(dst, src)
+func (m *RegisterDebuggeeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegisterDebuggeeRequest.Merge(m, src)
 }
 func (m *RegisterDebuggeeRequest) XXX_Size() int {
 	return xxx_messageInfo_RegisterDebuggeeRequest.Size(m)
@@ -84,16 +85,17 @@ func (m *RegisterDebuggeeResponse) Reset()         { *m = RegisterDebuggeeRespon
 func (m *RegisterDebuggeeResponse) String() string { return proto.CompactTextString(m) }
 func (*RegisterDebuggeeResponse) ProtoMessage()    {}
 func (*RegisterDebuggeeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_controller_a5860eef34f5ab07, []int{1}
+	return fileDescriptor_694192a34270926f, []int{1}
 }
+
 func (m *RegisterDebuggeeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RegisterDebuggeeResponse.Unmarshal(m, b)
 }
 func (m *RegisterDebuggeeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RegisterDebuggeeResponse.Marshal(b, m, deterministic)
 }
-func (dst *RegisterDebuggeeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RegisterDebuggeeResponse.Merge(dst, src)
+func (m *RegisterDebuggeeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegisterDebuggeeResponse.Merge(m, src)
 }
 func (m *RegisterDebuggeeResponse) XXX_Size() int {
 	return xxx_messageInfo_RegisterDebuggeeResponse.Size(m)
@@ -136,16 +138,17 @@ func (m *ListActiveBreakpointsRequest) Reset()         { *m = ListActiveBreakpoi
 func (m *ListActiveBreakpointsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListActiveBreakpointsRequest) ProtoMessage()    {}
 func (*ListActiveBreakpointsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_controller_a5860eef34f5ab07, []int{2}
+	return fileDescriptor_694192a34270926f, []int{2}
 }
+
 func (m *ListActiveBreakpointsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListActiveBreakpointsRequest.Unmarshal(m, b)
 }
 func (m *ListActiveBreakpointsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListActiveBreakpointsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListActiveBreakpointsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListActiveBreakpointsRequest.Merge(dst, src)
+func (m *ListActiveBreakpointsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActiveBreakpointsRequest.Merge(m, src)
 }
 func (m *ListActiveBreakpointsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListActiveBreakpointsRequest.Size(m)
@@ -198,16 +201,17 @@ func (m *ListActiveBreakpointsResponse) Reset()         { *m = ListActiveBreakpo
 func (m *ListActiveBreakpointsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListActiveBreakpointsResponse) ProtoMessage()    {}
 func (*ListActiveBreakpointsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_controller_a5860eef34f5ab07, []int{3}
+	return fileDescriptor_694192a34270926f, []int{3}
 }
+
 func (m *ListActiveBreakpointsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListActiveBreakpointsResponse.Unmarshal(m, b)
 }
 func (m *ListActiveBreakpointsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListActiveBreakpointsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListActiveBreakpointsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListActiveBreakpointsResponse.Merge(dst, src)
+func (m *ListActiveBreakpointsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActiveBreakpointsResponse.Merge(m, src)
 }
 func (m *ListActiveBreakpointsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListActiveBreakpointsResponse.Size(m)
@@ -256,16 +260,17 @@ func (m *UpdateActiveBreakpointRequest) Reset()         { *m = UpdateActiveBreak
 func (m *UpdateActiveBreakpointRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateActiveBreakpointRequest) ProtoMessage()    {}
 func (*UpdateActiveBreakpointRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_controller_a5860eef34f5ab07, []int{4}
+	return fileDescriptor_694192a34270926f, []int{4}
 }
+
 func (m *UpdateActiveBreakpointRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateActiveBreakpointRequest.Unmarshal(m, b)
 }
 func (m *UpdateActiveBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateActiveBreakpointRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateActiveBreakpointRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateActiveBreakpointRequest.Merge(dst, src)
+func (m *UpdateActiveBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateActiveBreakpointRequest.Merge(m, src)
 }
 func (m *UpdateActiveBreakpointRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateActiveBreakpointRequest.Size(m)
@@ -302,16 +307,17 @@ func (m *UpdateActiveBreakpointResponse) Reset()         { *m = UpdateActiveBrea
 func (m *UpdateActiveBreakpointResponse) String() string { return proto.CompactTextString(m) }
 func (*UpdateActiveBreakpointResponse) ProtoMessage()    {}
 func (*UpdateActiveBreakpointResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_controller_a5860eef34f5ab07, []int{5}
+	return fileDescriptor_694192a34270926f, []int{5}
 }
+
 func (m *UpdateActiveBreakpointResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateActiveBreakpointResponse.Unmarshal(m, b)
 }
 func (m *UpdateActiveBreakpointResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateActiveBreakpointResponse.Marshal(b, m, deterministic)
 }
-func (dst *UpdateActiveBreakpointResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateActiveBreakpointResponse.Merge(dst, src)
+func (m *UpdateActiveBreakpointResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateActiveBreakpointResponse.Merge(m, src)
 }
 func (m *UpdateActiveBreakpointResponse) XXX_Size() int {
 	return xxx_messageInfo_UpdateActiveBreakpointResponse.Size(m)
@@ -331,6 +337,52 @@ func init() {
 	proto.RegisterType((*UpdateActiveBreakpointResponse)(nil), "google.devtools.clouddebugger.v2.UpdateActiveBreakpointResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/clouddebugger/v2/controller.proto", fileDescriptor_694192a34270926f)
+}
+
+var fileDescriptor_694192a34270926f = []byte{
+	// 602 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdd, 0x6a, 0xd4, 0x40,
+	0x14, 0x66, 0x5a, 0x94, 0x76, 0xa2, 0xb4, 0x0c, 0xa8, 0x21, 0xb6, 0xba, 0x0d, 0x52, 0x96, 0x75,
+	0xc9, 0x60, 0xf4, 0xc6, 0x15, 0xfc, 0xd9, 0xaa, 0x45, 0x68, 0xb5, 0x2c, 0xb5, 0x82, 0x2c, 0x2c,
+	0xd9, 0xe4, 0x18, 0x86, 0x66, 0x67, 0x62, 0x66, 0xb2, 0x56, 0x4a, 0x6f, 0xbc, 0x55, 0xbc, 0xf1,
+	0x2d, 0x7c, 0x01, 0xc1, 0x0b, 0x1f, 0xc0, 0x5b, 0x7d, 0x04, 0xaf, 0x7c, 0x0a, 0xc9, 0xdf, 0xfe,
+	0xb4, 0xdd, 0xa6, 0x5d, 0xbc, 0xcc, 0x77, 0xe6, 0xfb, 0xce, 0xf7, 0x4d, 0xce, 0x1c, 0x7c, 0xcb,
+	0x17, 0xc2, 0x0f, 0x80, 0x7a, 0xd0, 0x57, 0x42, 0x04, 0x92, 0xba, 0x81, 0x88, 0x3d, 0x0f, 0xba,
+	0xb1, 0xef, 0x43, 0x44, 0xfb, 0x36, 0x75, 0x05, 0x57, 0x91, 0x08, 0x02, 0x88, 0xac, 0x30, 0x12,
+	0x4a, 0x90, 0x4a, 0x46, 0xb1, 0x0a, 0x8a, 0x35, 0x46, 0xb1, 0xfa, 0xb6, 0xb1, 0x94, 0x8b, 0x3a,
+	0x21, 0xa3, 0x0e, 0xe7, 0x42, 0x39, 0x8a, 0x09, 0x2e, 0x33, 0xbe, 0x71, 0xb3, 0xb4, 0xa5, 0xe7,
+	0x28, 0x27, 0x3f, 0x7c, 0x35, 0x3f, 0x9c, 0x7e, 0x75, 0xe3, 0x37, 0x14, 0x7a, 0xa1, 0x7a, 0x9f,
+	0x15, 0x4d, 0x07, 0x5f, 0x69, 0x81, 0xcf, 0xa4, 0x82, 0xe8, 0x71, 0x46, 0x87, 0x16, 0xbc, 0x8d,
+	0x41, 0x2a, 0xf2, 0x14, 0xcf, 0xe5, 0x8a, 0xa0, 0xa3, 0x0a, 0xaa, 0x6a, 0x76, 0xcd, 0x2a, 0xf3,
+	0x6d, 0x0d, 0x44, 0x06, 0x5c, 0xb3, 0x8b, 0xf5, 0xa3, 0x2d, 0x64, 0x28, 0xb8, 0x84, 0xff, 0xd6,
+	0xe3, 0x13, 0xc2, 0x4b, 0x1b, 0x4c, 0xaa, 0x47, 0xae, 0x62, 0x7d, 0x68, 0x46, 0xe0, 0xec, 0x86,
+	0x82, 0x71, 0x25, 0x8b, 0x30, 0xd7, 0xb1, 0x56, 0x1c, 0xee, 0x30, 0x2f, 0xed, 0x35, 0xdf, 0xc2,
+	0x05, 0xf4, 0xcc, 0x23, 0xcb, 0x18, 0xbf, 0x73, 0x98, 0xea, 0x28, 0xb1, 0x0b, 0x5c, 0x9f, 0x49,
+	0xeb, 0xf3, 0x09, 0xb2, 0x9d, 0x00, 0xa4, 0x8e, 0x89, 0x8c, 0x5d, 0x17, 0xa4, 0xec, 0x08, 0xde,
+	0x51, 0xac, 0x07, 0x22, 0x56, 0xfa, 0x6c, 0x05, 0x55, 0xe7, 0x5a, 0x8b, 0x79, 0xe5, 0x05, 0xdf,
+	0xce, 0x70, 0xf3, 0x3b, 0xc2, 0xcb, 0x13, 0xec, 0xe4, 0xc1, 0x9f, 0x63, 0xad, 0x3b, 0x84, 0x75,
+	0x54, 0x99, 0xad, 0x6a, 0x76, 0xbd, 0x3c, 0xfb, 0x50, 0xab, 0x35, 0x2a, 0x40, 0x56, 0xf1, 0x02,
+	0x87, 0x3d, 0xd5, 0x39, 0x92, 0xe1, 0x62, 0x02, 0xbf, 0x1a, 0xe4, 0x58, 0xc1, 0x17, 0xd2, 0x23,
+	0xb0, 0x17, 0xb2, 0x08, 0xbc, 0x3c, 0x81, 0x96, 0x60, 0x4f, 0x32, 0xc8, 0xfc, 0x8c, 0xf0, 0xf2,
+	0xcb, 0xd0, 0x73, 0x14, 0x1c, 0xb6, 0x7f, 0xea, 0xcb, 0xdc, 0xc0, 0x78, 0x68, 0x2e, 0x35, 0x72,
+	0xd6, 0x70, 0x23, 0x7c, 0xb3, 0x82, 0xaf, 0x4d, 0xf2, 0x93, 0xdd, 0xa6, 0xfd, 0xf1, 0x1c, 0xd6,
+	0xd6, 0x06, 0x8f, 0xcc, 0x26, 0xdf, 0x10, 0x5e, 0x3c, 0x3c, 0x73, 0xe4, 0x6e, 0xb9, 0x81, 0x09,
+	0x4f, 0xc1, 0x68, 0x4c, 0x43, 0xcd, 0xbc, 0x99, 0xf5, 0x0f, 0xbf, 0xfe, 0x7c, 0x99, 0x59, 0x35,
+	0x57, 0xc6, 0x37, 0x01, 0x2d, 0xae, 0x4b, 0xd2, 0x28, 0xa7, 0x36, 0x50, 0x8d, 0xfc, 0x46, 0xf8,
+	0xd2, 0xb1, 0x93, 0x43, 0xee, 0x97, 0x7b, 0x38, 0xe9, 0x05, 0x18, 0x0f, 0xa6, 0xe6, 0xe7, 0x41,
+	0x1a, 0x69, 0x90, 0x3b, 0xc4, 0x9e, 0x18, 0x64, 0x7f, 0x64, 0x2a, 0x0e, 0xe8, 0xe8, 0x78, 0xfe,
+	0x45, 0xf8, 0xf2, 0xf1, 0xff, 0x90, 0x9c, 0xc2, 0xd7, 0x89, 0xd3, 0x68, 0x3c, 0x9c, 0x5e, 0x20,
+	0x4f, 0xb6, 0x99, 0x26, 0x5b, 0x37, 0x9a, 0x67, 0x4f, 0x46, 0xf7, 0x87, 0x1f, 0x16, 0xf3, 0x0e,
+	0x1a, 0xa8, 0xd6, 0xfc, 0x81, 0xf0, 0x0d, 0x57, 0xf4, 0x4a, 0x6d, 0x35, 0x17, 0x86, 0x33, 0xbb,
+	0x95, 0x6c, 0xe3, 0x2d, 0xf4, 0x7a, 0x33, 0x27, 0xf9, 0x22, 0x70, 0xb8, 0x6f, 0x89, 0xc8, 0xa7,
+	0x3e, 0xf0, 0x74, 0x57, 0xd3, 0xac, 0xe4, 0x84, 0x4c, 0x4e, 0x5e, 0xfc, 0xf7, 0xc6, 0x80, 0xaf,
+	0x33, 0xfa, 0x7a, 0xa6, 0xb7, 0x96, 0xc0, 0xc5, 0xe6, 0x8c, 0xac, 0x1d, 0xfb, 0x67, 0x51, 0x6a,
+	0xa7, 0xa5, 0x76, 0x51, 0x6a, 0xef, 0xd8, 0xdd, 0xf3, 0x69, 0xbf, 0xdb, 0xff, 0x02, 0x00, 0x00,
+	0xff, 0xff, 0x54, 0xe1, 0x5c, 0x2a, 0xda, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -530,49 +582,3 @@ var _Controller2_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/clouddebugger/v2/controller.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/clouddebugger/v2/controller.proto", fileDescriptor_controller_a5860eef34f5ab07)
-}
-
-var fileDescriptor_controller_a5860eef34f5ab07 = []byte{
-	// 602 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdd, 0x6a, 0xd4, 0x40,
-	0x14, 0x66, 0x5a, 0x94, 0x76, 0xa2, 0xb4, 0x0c, 0xa8, 0x21, 0xb6, 0xba, 0x0d, 0x52, 0x96, 0x75,
-	0xc9, 0x60, 0xf4, 0xc6, 0x15, 0xfc, 0xd9, 0xaa, 0x45, 0x68, 0xb5, 0x2c, 0xb5, 0x82, 0x2c, 0x2c,
-	0xd9, 0xe4, 0x18, 0x86, 0x66, 0x67, 0x62, 0x66, 0xb2, 0x56, 0x4a, 0x6f, 0xbc, 0x55, 0xbc, 0xf1,
-	0x2d, 0x7c, 0x01, 0xc1, 0x0b, 0x1f, 0xc0, 0x5b, 0x7d, 0x04, 0xaf, 0x7c, 0x0a, 0xc9, 0xdf, 0xfe,
-	0xb4, 0xdd, 0xa6, 0x5d, 0xbc, 0xcc, 0x77, 0xe6, 0xfb, 0xce, 0xf7, 0x4d, 0xce, 0x1c, 0x7c, 0xcb,
-	0x17, 0xc2, 0x0f, 0x80, 0x7a, 0xd0, 0x57, 0x42, 0x04, 0x92, 0xba, 0x81, 0x88, 0x3d, 0x0f, 0xba,
-	0xb1, 0xef, 0x43, 0x44, 0xfb, 0x36, 0x75, 0x05, 0x57, 0x91, 0x08, 0x02, 0x88, 0xac, 0x30, 0x12,
-	0x4a, 0x90, 0x4a, 0x46, 0xb1, 0x0a, 0x8a, 0x35, 0x46, 0xb1, 0xfa, 0xb6, 0xb1, 0x94, 0x8b, 0x3a,
-	0x21, 0xa3, 0x0e, 0xe7, 0x42, 0x39, 0x8a, 0x09, 0x2e, 0x33, 0xbe, 0x71, 0xb3, 0xb4, 0xa5, 0xe7,
-	0x28, 0x27, 0x3f, 0x7c, 0x35, 0x3f, 0x9c, 0x7e, 0x75, 0xe3, 0x37, 0x14, 0x7a, 0xa1, 0x7a, 0x9f,
-	0x15, 0x4d, 0x07, 0x5f, 0x69, 0x81, 0xcf, 0xa4, 0x82, 0xe8, 0x71, 0x46, 0x87, 0x16, 0xbc, 0x8d,
-	0x41, 0x2a, 0xf2, 0x14, 0xcf, 0xe5, 0x8a, 0xa0, 0xa3, 0x0a, 0xaa, 0x6a, 0x76, 0xcd, 0x2a, 0xf3,
-	0x6d, 0x0d, 0x44, 0x06, 0x5c, 0xb3, 0x8b, 0xf5, 0xa3, 0x2d, 0x64, 0x28, 0xb8, 0x84, 0xff, 0xd6,
-	0xe3, 0x13, 0xc2, 0x4b, 0x1b, 0x4c, 0xaa, 0x47, 0xae, 0x62, 0x7d, 0x68, 0x46, 0xe0, 0xec, 0x86,
-	0x82, 0x71, 0x25, 0x8b, 0x30, 0xd7, 0xb1, 0x56, 0x1c, 0xee, 0x30, 0x2f, 0xed, 0x35, 0xdf, 0xc2,
-	0x05, 0xf4, 0xcc, 0x23, 0xcb, 0x18, 0xbf, 0x73, 0x98, 0xea, 0x28, 0xb1, 0x0b, 0x5c, 0x9f, 0x49,
-	0xeb, 0xf3, 0x09, 0xb2, 0x9d, 0x00, 0xa4, 0x8e, 0x89, 0x8c, 0x5d, 0x17, 0xa4, 0xec, 0x08, 0xde,
-	0x51, 0xac, 0x07, 0x22, 0x56, 0xfa, 0x6c, 0x05, 0x55, 0xe7, 0x5a, 0x8b, 0x79, 0xe5, 0x05, 0xdf,
-	0xce, 0x70, 0xf3, 0x3b, 0xc2, 0xcb, 0x13, 0xec, 0xe4, 0xc1, 0x9f, 0x63, 0xad, 0x3b, 0x84, 0x75,
-	0x54, 0x99, 0xad, 0x6a, 0x76, 0xbd, 0x3c, 0xfb, 0x50, 0xab, 0x35, 0x2a, 0x40, 0x56, 0xf1, 0x02,
-	0x87, 0x3d, 0xd5, 0x39, 0x92, 0xe1, 0x62, 0x02, 0xbf, 0x1a, 0xe4, 0x58, 0xc1, 0x17, 0xd2, 0x23,
-	0xb0, 0x17, 0xb2, 0x08, 0xbc, 0x3c, 0x81, 0x96, 0x60, 0x4f, 0x32, 0xc8, 0xfc, 0x8c, 0xf0, 0xf2,
-	0xcb, 0xd0, 0x73, 0x14, 0x1c, 0xb6, 0x7f, 0xea, 0xcb, 0xdc, 0xc0, 0x78, 0x68, 0x2e, 0x35, 0x72,
-	0xd6, 0x70, 0x23, 0x7c, 0xb3, 0x82, 0xaf, 0x4d, 0xf2, 0x93, 0xdd, 0xa6, 0xfd, 0xf1, 0x1c, 0xd6,
-	0xd6, 0x06, 0x8f, 0xcc, 0x26, 0xdf, 0x10, 0x5e, 0x3c, 0x3c, 0x73, 0xe4, 0x6e, 0xb9, 0x81, 0x09,
-	0x4f, 0xc1, 0x68, 0x4c, 0x43, 0xcd, 0xbc, 0x99, 0xf5, 0x0f, 0xbf, 0xfe, 0x7c, 0x99, 0x59, 0x35,
-	0x57, 0xc6, 0x37, 0x01, 0x2d, 0xae, 0x4b, 0xd2, 0x28, 0xa7, 0x36, 0x50, 0x8d, 0xfc, 0x46, 0xf8,
-	0xd2, 0xb1, 0x93, 0x43, 0xee, 0x97, 0x7b, 0x38, 0xe9, 0x05, 0x18, 0x0f, 0xa6, 0xe6, 0xe7, 0x41,
-	0x1a, 0x69, 0x90, 0x3b, 0xc4, 0x9e, 0x18, 0x64, 0x7f, 0x64, 0x2a, 0x0e, 0xe8, 0xe8, 0x78, 0xfe,
-	0x45, 0xf8, 0xf2, 0xf1, 0xff, 0x90, 0x9c, 0xc2, 0xd7, 0x89, 0xd3, 0x68, 0x3c, 0x9c, 0x5e, 0x20,
-	0x4f, 0xb6, 0x99, 0x26, 0x5b, 0x37, 0x9a, 0x67, 0x4f, 0x46, 0xf7, 0x87, 0x1f, 0x16, 0xf3, 0x0e,
-	0x1a, 0xa8, 0xd6, 0xfc, 0x81, 0xf0, 0x0d, 0x57, 0xf4, 0x4a, 0x6d, 0x35, 0x17, 0x86, 0x33, 0xbb,
-	0x95, 0x6c, 0xe3, 0x2d, 0xf4, 0x7a, 0x33, 0x27, 0xf9, 0x22, 0x70, 0xb8, 0x6f, 0x89, 0xc8, 0xa7,
-	0x3e, 0xf0, 0x74, 0x57, 0xd3, 0xac, 0xe4, 0x84, 0x4c, 0x4e, 0x5e, 0xfc, 0xf7, 0xc6, 0x80, 0xaf,
-	0x33, 0xfa, 0x7a, 0xa6, 0xb7, 0x96, 0xc0, 0xc5, 0xe6, 0x8c, 0xac, 0x1d, 0xfb, 0x67, 0x51, 0x6a,
-	0xa7, 0xa5, 0x76, 0x51, 0x6a, 0xef, 0xd8, 0xdd, 0xf3, 0x69, 0xbf, 0xdb, 0xff, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0x54, 0xe1, 0x5c, 0x2a, 0xda, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/clouddebugger/v2/data.pb.go b/googleapis/devtools/clouddebugger/v2/data.pb.go
index fb7f4d03fb..694812654a 100644
--- a/googleapis/devtools/clouddebugger/v2/data.pb.go
+++ b/googleapis/devtools/clouddebugger/v2/data.pb.go
@@ -1,16 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/data.proto
 
-package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/devtools/source/v1"
+package clouddebugger
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/devtools/source/v1"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -21,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Enumerates references to which the message applies.
 type StatusMessage_Reference int32
@@ -52,6 +55,7 @@ var StatusMessage_Reference_name = map[int32]string{
 	5: "VARIABLE_NAME",
 	6: "VARIABLE_VALUE",
 }
+
 var StatusMessage_Reference_value = map[string]int32{
 	"UNSPECIFIED":                0,
 	"BREAKPOINT_SOURCE_LOCATION": 3,
@@ -65,8 +69,9 @@ var StatusMessage_Reference_value = map[string]int32{
 func (x StatusMessage_Reference) String() string {
 	return proto.EnumName(StatusMessage_Reference_name, int32(x))
 }
+
 func (StatusMessage_Reference) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{1, 0}
+	return fileDescriptor_af1dc785e55f21bc, []int{1, 0}
 }
 
 // Actions that can be taken when a breakpoint hits.
@@ -87,6 +92,7 @@ var Breakpoint_Action_name = map[int32]string{
 	0: "CAPTURE",
 	1: "LOG",
 }
+
 var Breakpoint_Action_value = map[string]int32{
 	"CAPTURE": 0,
 	"LOG":     1,
@@ -95,8 +101,9 @@ var Breakpoint_Action_value = map[string]int32{
 func (x Breakpoint_Action) String() string {
 	return proto.EnumName(Breakpoint_Action_name, int32(x))
 }
+
 func (Breakpoint_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{5, 0}
+	return fileDescriptor_af1dc785e55f21bc, []int{5, 0}
 }
 
 // Log severity levels.
@@ -116,6 +123,7 @@ var Breakpoint_LogLevel_name = map[int32]string{
 	1: "WARNING",
 	2: "ERROR",
 }
+
 var Breakpoint_LogLevel_value = map[string]int32{
 	"INFO":    0,
 	"WARNING": 1,
@@ -125,8 +133,9 @@ var Breakpoint_LogLevel_value = map[string]int32{
 func (x Breakpoint_LogLevel) String() string {
 	return proto.EnumName(Breakpoint_LogLevel_name, int32(x))
 }
+
 func (Breakpoint_LogLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{5, 1}
+	return fileDescriptor_af1dc785e55f21bc, []int{5, 1}
 }
 
 // Represents a message with parameters.
@@ -152,16 +161,17 @@ func (m *FormatMessage) Reset()         { *m = FormatMessage{} }
 func (m *FormatMessage) String() string { return proto.CompactTextString(m) }
 func (*FormatMessage) ProtoMessage()    {}
 func (*FormatMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{0}
+	return fileDescriptor_af1dc785e55f21bc, []int{0}
 }
+
 func (m *FormatMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FormatMessage.Unmarshal(m, b)
 }
 func (m *FormatMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FormatMessage.Marshal(b, m, deterministic)
 }
-func (dst *FormatMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FormatMessage.Merge(dst, src)
+func (m *FormatMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FormatMessage.Merge(m, src)
 }
 func (m *FormatMessage) XXX_Size() int {
 	return xxx_messageInfo_FormatMessage.Size(m)
@@ -207,16 +217,17 @@ func (m *StatusMessage) Reset()         { *m = StatusMessage{} }
 func (m *StatusMessage) String() string { return proto.CompactTextString(m) }
 func (*StatusMessage) ProtoMessage()    {}
 func (*StatusMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{1}
+	return fileDescriptor_af1dc785e55f21bc, []int{1}
 }
+
 func (m *StatusMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StatusMessage.Unmarshal(m, b)
 }
 func (m *StatusMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StatusMessage.Marshal(b, m, deterministic)
 }
-func (dst *StatusMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StatusMessage.Merge(dst, src)
+func (m *StatusMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatusMessage.Merge(m, src)
 }
 func (m *StatusMessage) XXX_Size() int {
 	return xxx_messageInfo_StatusMessage.Size(m)
@@ -267,16 +278,17 @@ func (m *SourceLocation) Reset()         { *m = SourceLocation{} }
 func (m *SourceLocation) String() string { return proto.CompactTextString(m) }
 func (*SourceLocation) ProtoMessage()    {}
 func (*SourceLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{2}
+	return fileDescriptor_af1dc785e55f21bc, []int{2}
 }
+
 func (m *SourceLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceLocation.Unmarshal(m, b)
 }
 func (m *SourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceLocation.Marshal(b, m, deterministic)
 }
-func (dst *SourceLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceLocation.Merge(dst, src)
+func (m *SourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceLocation.Merge(m, src)
 }
 func (m *SourceLocation) XXX_Size() int {
 	return xxx_messageInfo_SourceLocation.Size(m)
@@ -462,16 +474,17 @@ func (m *Variable) Reset()         { *m = Variable{} }
 func (m *Variable) String() string { return proto.CompactTextString(m) }
 func (*Variable) ProtoMessage()    {}
 func (*Variable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{3}
+	return fileDescriptor_af1dc785e55f21bc, []int{3}
 }
+
 func (m *Variable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Variable.Unmarshal(m, b)
 }
 func (m *Variable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Variable.Marshal(b, m, deterministic)
 }
-func (dst *Variable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Variable.Merge(dst, src)
+func (m *Variable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Variable.Merge(m, src)
 }
 func (m *Variable) XXX_Size() int {
 	return xxx_messageInfo_Variable.Size(m)
@@ -545,16 +558,17 @@ func (m *StackFrame) Reset()         { *m = StackFrame{} }
 func (m *StackFrame) String() string { return proto.CompactTextString(m) }
 func (*StackFrame) ProtoMessage()    {}
 func (*StackFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{4}
+	return fileDescriptor_af1dc785e55f21bc, []int{4}
 }
+
 func (m *StackFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StackFrame.Unmarshal(m, b)
 }
 func (m *StackFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StackFrame.Marshal(b, m, deterministic)
 }
-func (dst *StackFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StackFrame.Merge(dst, src)
+func (m *StackFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackFrame.Merge(m, src)
 }
 func (m *StackFrame) XXX_Size() int {
 	return xxx_messageInfo_StackFrame.Size(m)
@@ -684,16 +698,17 @@ func (m *Breakpoint) Reset()         { *m = Breakpoint{} }
 func (m *Breakpoint) String() string { return proto.CompactTextString(m) }
 func (*Breakpoint) ProtoMessage()    {}
 func (*Breakpoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{5}
+	return fileDescriptor_af1dc785e55f21bc, []int{5}
 }
+
 func (m *Breakpoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Breakpoint.Unmarshal(m, b)
 }
 func (m *Breakpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Breakpoint.Marshal(b, m, deterministic)
 }
-func (dst *Breakpoint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Breakpoint.Merge(dst, src)
+func (m *Breakpoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Breakpoint.Merge(m, src)
 }
 func (m *Breakpoint) XXX_Size() int {
 	return xxx_messageInfo_Breakpoint.Size(m)
@@ -870,16 +885,17 @@ func (m *Debuggee) Reset()         { *m = Debuggee{} }
 func (m *Debuggee) String() string { return proto.CompactTextString(m) }
 func (*Debuggee) ProtoMessage()    {}
 func (*Debuggee) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_3a367f88e807ff75, []int{6}
+	return fileDescriptor_af1dc785e55f21bc, []int{6}
 }
+
 func (m *Debuggee) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Debuggee.Unmarshal(m, b)
 }
 func (m *Debuggee) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Debuggee.Marshal(b, m, deterministic)
 }
-func (dst *Debuggee) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Debuggee.Merge(dst, src)
+func (m *Debuggee) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Debuggee.Merge(m, src)
 }
 func (m *Debuggee) XXX_Size() int {
 	return xxx_messageInfo_Debuggee.Size(m)
@@ -969,6 +985,9 @@ func (m *Debuggee) GetLabels() map[string]string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.clouddebugger.v2.StatusMessage_Reference", StatusMessage_Reference_name, StatusMessage_Reference_value)
+	proto.RegisterEnum("google.devtools.clouddebugger.v2.Breakpoint_Action", Breakpoint_Action_name, Breakpoint_Action_value)
+	proto.RegisterEnum("google.devtools.clouddebugger.v2.Breakpoint_LogLevel", Breakpoint_LogLevel_name, Breakpoint_LogLevel_value)
 	proto.RegisterType((*FormatMessage)(nil), "google.devtools.clouddebugger.v2.FormatMessage")
 	proto.RegisterType((*StatusMessage)(nil), "google.devtools.clouddebugger.v2.StatusMessage")
 	proto.RegisterType((*SourceLocation)(nil), "google.devtools.clouddebugger.v2.SourceLocation")
@@ -978,16 +997,13 @@ func init() {
 	proto.RegisterMapType((map[string]string)(nil), "google.devtools.clouddebugger.v2.Breakpoint.LabelsEntry")
 	proto.RegisterType((*Debuggee)(nil), "google.devtools.clouddebugger.v2.Debuggee")
 	proto.RegisterMapType((map[string]string)(nil), "google.devtools.clouddebugger.v2.Debuggee.LabelsEntry")
-	proto.RegisterEnum("google.devtools.clouddebugger.v2.StatusMessage_Reference", StatusMessage_Reference_name, StatusMessage_Reference_value)
-	proto.RegisterEnum("google.devtools.clouddebugger.v2.Breakpoint_Action", Breakpoint_Action_name, Breakpoint_Action_value)
-	proto.RegisterEnum("google.devtools.clouddebugger.v2.Breakpoint_LogLevel", Breakpoint_LogLevel_name, Breakpoint_LogLevel_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/clouddebugger/v2/data.proto", fileDescriptor_data_3a367f88e807ff75)
+	proto.RegisterFile("google/devtools/clouddebugger/v2/data.proto", fileDescriptor_af1dc785e55f21bc)
 }
 
-var fileDescriptor_data_3a367f88e807ff75 = []byte{
+var fileDescriptor_af1dc785e55f21bc = []byte{
 	// 1293 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x72, 0xda, 0x46,
 	0x14, 0x0e, 0x3f, 0x06, 0xe9, 0x60, 0x30, 0xd9, 0x26, 0x1d, 0xc5, 0x4d, 0x1d, 0x86, 0xe6, 0xc2,
diff --git a/googleapis/devtools/clouddebugger/v2/debugger.pb.go b/googleapis/devtools/clouddebugger/v2/debugger.pb.go
index 7da1a0081e..7304a6b577 100644
--- a/googleapis/devtools/clouddebugger/v2/debugger.pb.go
+++ b/googleapis/devtools/clouddebugger/v2/debugger.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/debugger.proto
 
-package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package clouddebugger
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request to set a breakpoint
 type SetBreakpointRequest struct {
@@ -44,16 +44,17 @@ func (m *SetBreakpointRequest) Reset()         { *m = SetBreakpointRequest{} }
 func (m *SetBreakpointRequest) String() string { return proto.CompactTextString(m) }
 func (*SetBreakpointRequest) ProtoMessage()    {}
 func (*SetBreakpointRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{0}
+	return fileDescriptor_682c945d4794189b, []int{0}
 }
+
 func (m *SetBreakpointRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetBreakpointRequest.Unmarshal(m, b)
 }
 func (m *SetBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetBreakpointRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetBreakpointRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetBreakpointRequest.Merge(dst, src)
+func (m *SetBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetBreakpointRequest.Merge(m, src)
 }
 func (m *SetBreakpointRequest) XXX_Size() int {
 	return xxx_messageInfo_SetBreakpointRequest.Size(m)
@@ -99,16 +100,17 @@ func (m *SetBreakpointResponse) Reset()         { *m = SetBreakpointResponse{} }
 func (m *SetBreakpointResponse) String() string { return proto.CompactTextString(m) }
 func (*SetBreakpointResponse) ProtoMessage()    {}
 func (*SetBreakpointResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{1}
+	return fileDescriptor_682c945d4794189b, []int{1}
 }
+
 func (m *SetBreakpointResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetBreakpointResponse.Unmarshal(m, b)
 }
 func (m *SetBreakpointResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetBreakpointResponse.Marshal(b, m, deterministic)
 }
-func (dst *SetBreakpointResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetBreakpointResponse.Merge(dst, src)
+func (m *SetBreakpointResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetBreakpointResponse.Merge(m, src)
 }
 func (m *SetBreakpointResponse) XXX_Size() int {
 	return xxx_messageInfo_SetBreakpointResponse.Size(m)
@@ -144,16 +146,17 @@ func (m *GetBreakpointRequest) Reset()         { *m = GetBreakpointRequest{} }
 func (m *GetBreakpointRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBreakpointRequest) ProtoMessage()    {}
 func (*GetBreakpointRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{2}
+	return fileDescriptor_682c945d4794189b, []int{2}
 }
+
 func (m *GetBreakpointRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBreakpointRequest.Unmarshal(m, b)
 }
 func (m *GetBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBreakpointRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetBreakpointRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBreakpointRequest.Merge(dst, src)
+func (m *GetBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBreakpointRequest.Merge(m, src)
 }
 func (m *GetBreakpointRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBreakpointRequest.Size(m)
@@ -199,16 +202,17 @@ func (m *GetBreakpointResponse) Reset()         { *m = GetBreakpointResponse{} }
 func (m *GetBreakpointResponse) String() string { return proto.CompactTextString(m) }
 func (*GetBreakpointResponse) ProtoMessage()    {}
 func (*GetBreakpointResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{3}
+	return fileDescriptor_682c945d4794189b, []int{3}
 }
+
 func (m *GetBreakpointResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBreakpointResponse.Unmarshal(m, b)
 }
 func (m *GetBreakpointResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBreakpointResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetBreakpointResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBreakpointResponse.Merge(dst, src)
+func (m *GetBreakpointResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBreakpointResponse.Merge(m, src)
 }
 func (m *GetBreakpointResponse) XXX_Size() int {
 	return xxx_messageInfo_GetBreakpointResponse.Size(m)
@@ -244,16 +248,17 @@ func (m *DeleteBreakpointRequest) Reset()         { *m = DeleteBreakpointRequest
 func (m *DeleteBreakpointRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteBreakpointRequest) ProtoMessage()    {}
 func (*DeleteBreakpointRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{4}
+	return fileDescriptor_682c945d4794189b, []int{4}
 }
+
 func (m *DeleteBreakpointRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteBreakpointRequest.Unmarshal(m, b)
 }
 func (m *DeleteBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteBreakpointRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteBreakpointRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteBreakpointRequest.Merge(dst, src)
+func (m *DeleteBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteBreakpointRequest.Merge(m, src)
 }
 func (m *DeleteBreakpointRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteBreakpointRequest.Size(m)
@@ -318,16 +323,17 @@ func (m *ListBreakpointsRequest) Reset()         { *m = ListBreakpointsRequest{}
 func (m *ListBreakpointsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListBreakpointsRequest) ProtoMessage()    {}
 func (*ListBreakpointsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{5}
+	return fileDescriptor_682c945d4794189b, []int{5}
 }
+
 func (m *ListBreakpointsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBreakpointsRequest.Unmarshal(m, b)
 }
 func (m *ListBreakpointsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBreakpointsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListBreakpointsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBreakpointsRequest.Merge(dst, src)
+func (m *ListBreakpointsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBreakpointsRequest.Merge(m, src)
 }
 func (m *ListBreakpointsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListBreakpointsRequest.Size(m)
@@ -406,16 +412,17 @@ func (m *ListBreakpointsRequest_BreakpointActionValue) String() string {
 }
 func (*ListBreakpointsRequest_BreakpointActionValue) ProtoMessage() {}
 func (*ListBreakpointsRequest_BreakpointActionValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{5, 0}
+	return fileDescriptor_682c945d4794189b, []int{5, 0}
 }
+
 func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Unmarshal(m, b)
 }
 func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Marshal(b, m, deterministic)
 }
-func (dst *ListBreakpointsRequest_BreakpointActionValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Merge(dst, src)
+func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Merge(m, src)
 }
 func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_Size() int {
 	return xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Size(m)
@@ -452,16 +459,17 @@ func (m *ListBreakpointsResponse) Reset()         { *m = ListBreakpointsResponse
 func (m *ListBreakpointsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListBreakpointsResponse) ProtoMessage()    {}
 func (*ListBreakpointsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{6}
+	return fileDescriptor_682c945d4794189b, []int{6}
 }
+
 func (m *ListBreakpointsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBreakpointsResponse.Unmarshal(m, b)
 }
 func (m *ListBreakpointsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBreakpointsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListBreakpointsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBreakpointsResponse.Merge(dst, src)
+func (m *ListBreakpointsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBreakpointsResponse.Merge(m, src)
 }
 func (m *ListBreakpointsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListBreakpointsResponse.Size(m)
@@ -505,16 +513,17 @@ func (m *ListDebuggeesRequest) Reset()         { *m = ListDebuggeesRequest{} }
 func (m *ListDebuggeesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDebuggeesRequest) ProtoMessage()    {}
 func (*ListDebuggeesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{7}
+	return fileDescriptor_682c945d4794189b, []int{7}
 }
+
 func (m *ListDebuggeesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDebuggeesRequest.Unmarshal(m, b)
 }
 func (m *ListDebuggeesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDebuggeesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDebuggeesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDebuggeesRequest.Merge(dst, src)
+func (m *ListDebuggeesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDebuggeesRequest.Merge(m, src)
 }
 func (m *ListDebuggeesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDebuggeesRequest.Size(m)
@@ -562,16 +571,17 @@ func (m *ListDebuggeesResponse) Reset()         { *m = ListDebuggeesResponse{} }
 func (m *ListDebuggeesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDebuggeesResponse) ProtoMessage()    {}
 func (*ListDebuggeesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_debugger_c54a26c25209c588, []int{8}
+	return fileDescriptor_682c945d4794189b, []int{8}
 }
+
 func (m *ListDebuggeesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDebuggeesResponse.Unmarshal(m, b)
 }
 func (m *ListDebuggeesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDebuggeesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDebuggeesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDebuggeesResponse.Merge(dst, src)
+func (m *ListDebuggeesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDebuggeesResponse.Merge(m, src)
 }
 func (m *ListDebuggeesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDebuggeesResponse.Size(m)
@@ -602,6 +612,65 @@ func init() {
 	proto.RegisterType((*ListDebuggeesResponse)(nil), "google.devtools.clouddebugger.v2.ListDebuggeesResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/clouddebugger/v2/debugger.proto", fileDescriptor_682c945d4794189b)
+}
+
+var fileDescriptor_682c945d4794189b = []byte{
+	// 802 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0xdb, 0x36,
+	0x14, 0x06, 0x9d, 0xe5, 0xc7, 0xc7, 0x71, 0x92, 0x11, 0xf9, 0x11, 0xbc, 0x3f, 0x43, 0xfb, 0xcb,
+	0xb2, 0x41, 0x1a, 0x94, 0x61, 0x4b, 0xb6, 0x9b, 0xc5, 0xcb, 0xe0, 0x18, 0xc8, 0x82, 0x40, 0xdb,
+	0x3c, 0x60, 0x08, 0x60, 0xc8, 0x36, 0x23, 0xa8, 0x51, 0x44, 0x55, 0xa4, 0xdc, 0x16, 0x41, 0x6e,
+	0x52, 0xa0, 0xf7, 0x45, 0x5f, 0xa0, 0xd7, 0x45, 0x81, 0xbe, 0x40, 0x0b, 0xf4, 0x3a, 0xbd, 0xec,
+	0x2b, 0xf4, 0x41, 0x0a, 0x49, 0x64, 0x2c, 0xbb, 0x6a, 0x6d, 0x39, 0x40, 0xee, 0xa8, 0x8f, 0x3c,
+	0x87, 0xdf, 0xf7, 0xf1, 0xf0, 0x50, 0xa0, 0xdb, 0x94, 0xda, 0x2e, 0xd1, 0xbb, 0xa4, 0xc7, 0x29,
+	0x75, 0x99, 0xde, 0x71, 0x69, 0xd8, 0xed, 0x92, 0x76, 0x68, 0xdb, 0x24, 0xd0, 0x7b, 0x86, 0x2e,
+	0xc7, 0x9a, 0x1f, 0x50, 0x4e, 0x71, 0x35, 0x09, 0xd0, 0x64, 0x80, 0x36, 0x10, 0xa0, 0xf5, 0x8c,
+	0xca, 0xa7, 0x22, 0xa5, 0xe5, 0x3b, 0xba, 0xe5, 0x79, 0x94, 0x5b, 0xdc, 0xa1, 0x1e, 0x4b, 0xe2,
+	0x2b, 0xdf, 0x8f, 0xde, 0xd0, 0xe2, 0x96, 0x58, 0xfc, 0x89, 0x58, 0x1c, 0x7f, 0xb5, 0xc3, 0x63,
+	0x9d, 0x9c, 0xfa, 0xfc, 0x5e, 0x32, 0xa9, 0x3e, 0x45, 0xb0, 0xfc, 0x37, 0xe1, 0xb5, 0x80, 0x58,
+	0x27, 0x3e, 0x75, 0x3c, 0x6e, 0x92, 0xdb, 0x21, 0x61, 0x1c, 0x7f, 0x01, 0x25, 0x91, 0x8f, 0xb4,
+	0x9c, 0xae, 0x82, 0xaa, 0x68, 0xbd, 0x68, 0x82, 0x84, 0x1a, 0x5d, 0xbc, 0x0f, 0xd0, 0xbe, 0x8a,
+	0x52, 0x0a, 0x55, 0xb4, 0x5e, 0x32, 0x7e, 0xd0, 0x46, 0x09, 0xd3, 0x52, 0x3b, 0xa5, 0xe2, 0xf1,
+	0xd7, 0xb0, 0xd0, 0x71, 0x1d, 0xe2, 0xf1, 0x56, 0x8f, 0x04, 0xcc, 0xa1, 0x9e, 0xf2, 0x51, 0xbc,
+	0x63, 0x39, 0x41, 0x9b, 0x09, 0xa8, 0x12, 0x58, 0x19, 0x62, 0xcb, 0x7c, 0xea, 0x31, 0x32, 0xc4,
+	0x06, 0x5d, 0x8f, 0x8d, 0x7a, 0x1f, 0xc1, 0x72, 0x7d, 0x22, 0x57, 0xbe, 0x84, 0x72, 0x3f, 0x4f,
+	0xb4, 0xa4, 0x10, 0x2f, 0x99, 0xef, 0x83, 0x8d, 0x6e, 0x0e, 0xb1, 0xf5, 0x1b, 0x10, 0xfb, 0x00,
+	0xc1, 0xda, 0x2e, 0x71, 0x09, 0x27, 0x37, 0xa7, 0x77, 0x2a, 0x4b, 0xef, 0xab, 0x29, 0x58, 0xdd,
+	0x77, 0x58, 0x4a, 0x31, 0x1b, 0x9b, 0xc7, 0x06, 0x7c, 0xec, 0x78, 0x1d, 0x37, 0xec, 0x92, 0x96,
+	0xe5, 0xba, 0xad, 0x90, 0x91, 0x80, 0xc5, 0x5c, 0xe6, 0xcc, 0x45, 0x31, 0xb1, 0xe3, 0xba, 0xff,
+	0x46, 0x30, 0xfe, 0x0e, 0x96, 0xe4, 0x5a, 0xc7, 0xb3, 0x3a, 0xdc, 0xe9, 0x91, 0x98, 0x50, 0x7f,
+	0x69, 0x43, 0xc0, 0xf8, 0x18, 0x66, 0xa2, 0x91, 0x38, 0xa1, 0x92, 0x71, 0x30, 0xda, 0xe5, 0x6c,
+	0x05, 0x29, 0xf3, 0x77, 0xe2, 0x84, 0x4d, 0xcb, 0x0d, 0x89, 0x29, 0xb2, 0xe3, 0x6f, 0xa1, 0xcc,
+	0x78, 0xe0, 0xf8, 0xad, 0x80, 0xb0, 0xd0, 0xe5, 0x4c, 0x99, 0x8e, 0xf8, 0xd4, 0x0a, 0x0a, 0x32,
+	0xe7, 0xe3, 0x09, 0x33, 0xc1, 0xf1, 0x67, 0x00, 0x77, 0x2c, 0x87, 0xb7, 0x38, 0x3d, 0x21, 0x9e,
+	0x32, 0x13, 0xfb, 0x50, 0x8c, 0x90, 0x7f, 0x22, 0x20, 0xc3, 0xe9, 0xb9, 0x0c, 0xa7, 0x2b, 0x6d,
+	0x58, 0xc9, 0xe4, 0x83, 0x1b, 0x30, 0xdd, 0x8b, 0x06, 0xb1, 0xc3, 0x0b, 0xc6, 0x66, 0x9e, 0xa2,
+	0xd2, 0x92, 0x44, 0x66, 0x92, 0x41, 0x7d, 0x88, 0x60, 0xed, 0x1d, 0x2f, 0x44, 0x01, 0x1f, 0x40,
+	0xa9, 0x5f, 0x20, 0x4c, 0x41, 0xd5, 0xa9, 0xdc, 0x15, 0x9c, 0x4e, 0x80, 0xbf, 0x81, 0x45, 0x8f,
+	0xdc, 0xe5, 0xad, 0x94, 0x35, 0x49, 0x1d, 0x96, 0x23, 0xf8, 0x3f, 0x69, 0x8f, 0x7a, 0x81, 0x60,
+	0x39, 0xe2, 0xb4, 0x2b, 0x0a, 0xe7, 0xaa, 0xbe, 0x14, 0x98, 0xf5, 0x03, 0x7a, 0x8b, 0x74, 0xb8,
+	0x08, 0x94, 0x9f, 0x79, 0x8a, 0x65, 0xcc, 0x6b, 0x6d, 0xc1, 0xca, 0x10, 0x07, 0xe1, 0xca, 0x1e,
+	0x14, 0x65, 0x45, 0x4b, 0x4f, 0x36, 0x46, 0x7b, 0x22, 0xf3, 0x98, 0xfd, 0x60, 0xe3, 0xc5, 0x2c,
+	0x14, 0x05, 0x1e, 0x18, 0xf8, 0x12, 0x41, 0x79, 0xa0, 0x6b, 0xe2, 0x9f, 0x47, 0xa7, 0xcd, 0x7a,
+	0x14, 0x2a, 0xbf, 0xe4, 0x8e, 0x4b, 0xa4, 0xa9, 0x7b, 0x17, 0xaf, 0xdf, 0x3c, 0x2a, 0xd4, 0xd4,
+	0x9f, 0xd2, 0x8f, 0xa1, 0x7e, 0x45, 0x58, 0x3f, 0x4b, 0xdd, 0xee, 0x73, 0x3d, 0x75, 0xb4, 0x3a,
+	0x23, 0xfc, 0xd7, 0xf4, 0x43, 0x11, 0x89, 0xa9, 0xe7, 0x15, 0x53, 0x9f, 0x50, 0x4c, 0xfd, 0x43,
+	0x62, 0xf0, 0xef, 0xb9, 0xc5, 0x9c, 0x0d, 0xf4, 0xca, 0x73, 0xfc, 0x0c, 0xc1, 0xd2, 0x70, 0xeb,
+	0xc5, 0xdb, 0xe3, 0x9c, 0x79, 0x66, 0xbb, 0xae, 0xac, 0xca, 0x50, 0xf9, 0xd6, 0x6b, 0x7f, 0x46,
+	0x6f, 0xbd, 0x64, 0xbc, 0x71, 0x7d, 0xc6, 0x2f, 0x11, 0x2c, 0x0e, 0xdd, 0x6a, 0xbc, 0x35, 0x69,
+	0x53, 0xac, 0x6c, 0x4f, 0x10, 0x29, 0x0e, 0x61, 0x2b, 0x96, 0x64, 0xe0, 0x1f, 0xf3, 0x4a, 0xc2,
+	0x8f, 0x11, 0x94, 0x07, 0x2e, 0xe0, 0x38, 0x15, 0x94, 0xd5, 0x35, 0xc6, 0xa9, 0xa0, 0xcc, 0x9b,
+	0xae, 0x7e, 0x1e, 0x93, 0x57, 0xf0, 0x6a, 0x36, 0xf9, 0xda, 0x73, 0x04, 0x5f, 0x75, 0xe8, 0xe9,
+	0xc8, 0xf4, 0xb5, 0xb2, 0xbc, 0xe5, 0x87, 0xd1, 0x81, 0x1f, 0xa2, 0xff, 0xff, 0x12, 0x21, 0x36,
+	0x75, 0x2d, 0xcf, 0xd6, 0x68, 0x60, 0xeb, 0x36, 0xf1, 0xe2, 0x72, 0x10, 0x7f, 0xa9, 0x96, 0xef,
+	0xb0, 0xf7, 0xff, 0x38, 0xfe, 0x36, 0x00, 0x3c, 0x29, 0x28, 0xf5, 0x24, 0xdf, 0x1f, 0x11, 0x2c,
+	0x7b, 0x4d, 0xa0, 0x35, 0x8d, 0x4b, 0x39, 0x75, 0x14, 0x4f, 0x1d, 0xc9, 0xa9, 0xa3, 0xa6, 0xd1,
+	0x9e, 0x89, 0xf7, 0xdb, 0x7c, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x13, 0xd7, 0xe1, 0x18, 0x0b,
+	0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -815,62 +884,3 @@ var _Debugger2_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/clouddebugger/v2/debugger.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/clouddebugger/v2/debugger.proto", fileDescriptor_debugger_c54a26c25209c588)
-}
-
-var fileDescriptor_debugger_c54a26c25209c588 = []byte{
-	// 802 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0xdb, 0x36,
-	0x14, 0x06, 0x9d, 0xe5, 0xc7, 0xc7, 0x71, 0x92, 0x11, 0xf9, 0x11, 0xbc, 0x3f, 0x43, 0xfb, 0xcb,
-	0xb2, 0x41, 0x1a, 0x94, 0x61, 0x4b, 0xb6, 0x9b, 0xc5, 0xcb, 0xe0, 0x18, 0xc8, 0x82, 0x40, 0xdb,
-	0x3c, 0x60, 0x08, 0x60, 0xc8, 0x36, 0x23, 0xa8, 0x51, 0x44, 0x55, 0xa4, 0xdc, 0x16, 0x41, 0x6e,
-	0x52, 0xa0, 0xf7, 0x45, 0x5f, 0xa0, 0xd7, 0x45, 0x81, 0xbe, 0x40, 0x0b, 0xf4, 0x3a, 0xbd, 0xec,
-	0x2b, 0xf4, 0x41, 0x0a, 0x49, 0x64, 0x2c, 0xbb, 0x6a, 0x6d, 0x39, 0x40, 0xee, 0xa8, 0x8f, 0x3c,
-	0x87, 0xdf, 0xf7, 0xf1, 0xf0, 0x50, 0xa0, 0xdb, 0x94, 0xda, 0x2e, 0xd1, 0xbb, 0xa4, 0xc7, 0x29,
-	0x75, 0x99, 0xde, 0x71, 0x69, 0xd8, 0xed, 0x92, 0x76, 0x68, 0xdb, 0x24, 0xd0, 0x7b, 0x86, 0x2e,
-	0xc7, 0x9a, 0x1f, 0x50, 0x4e, 0x71, 0x35, 0x09, 0xd0, 0x64, 0x80, 0x36, 0x10, 0xa0, 0xf5, 0x8c,
-	0xca, 0xa7, 0x22, 0xa5, 0xe5, 0x3b, 0xba, 0xe5, 0x79, 0x94, 0x5b, 0xdc, 0xa1, 0x1e, 0x4b, 0xe2,
-	0x2b, 0xdf, 0x8f, 0xde, 0xd0, 0xe2, 0x96, 0x58, 0xfc, 0x89, 0x58, 0x1c, 0x7f, 0xb5, 0xc3, 0x63,
-	0x9d, 0x9c, 0xfa, 0xfc, 0x5e, 0x32, 0xa9, 0x3e, 0x45, 0xb0, 0xfc, 0x37, 0xe1, 0xb5, 0x80, 0x58,
-	0x27, 0x3e, 0x75, 0x3c, 0x6e, 0x92, 0xdb, 0x21, 0x61, 0x1c, 0x7f, 0x01, 0x25, 0x91, 0x8f, 0xb4,
-	0x9c, 0xae, 0x82, 0xaa, 0x68, 0xbd, 0x68, 0x82, 0x84, 0x1a, 0x5d, 0xbc, 0x0f, 0xd0, 0xbe, 0x8a,
-	0x52, 0x0a, 0x55, 0xb4, 0x5e, 0x32, 0x7e, 0xd0, 0x46, 0x09, 0xd3, 0x52, 0x3b, 0xa5, 0xe2, 0xf1,
-	0xd7, 0xb0, 0xd0, 0x71, 0x1d, 0xe2, 0xf1, 0x56, 0x8f, 0x04, 0xcc, 0xa1, 0x9e, 0xf2, 0x51, 0xbc,
-	0x63, 0x39, 0x41, 0x9b, 0x09, 0xa8, 0x12, 0x58, 0x19, 0x62, 0xcb, 0x7c, 0xea, 0x31, 0x32, 0xc4,
-	0x06, 0x5d, 0x8f, 0x8d, 0x7a, 0x1f, 0xc1, 0x72, 0x7d, 0x22, 0x57, 0xbe, 0x84, 0x72, 0x3f, 0x4f,
-	0xb4, 0xa4, 0x10, 0x2f, 0x99, 0xef, 0x83, 0x8d, 0x6e, 0x0e, 0xb1, 0xf5, 0x1b, 0x10, 0xfb, 0x00,
-	0xc1, 0xda, 0x2e, 0x71, 0x09, 0x27, 0x37, 0xa7, 0x77, 0x2a, 0x4b, 0xef, 0xab, 0x29, 0x58, 0xdd,
-	0x77, 0x58, 0x4a, 0x31, 0x1b, 0x9b, 0xc7, 0x06, 0x7c, 0xec, 0x78, 0x1d, 0x37, 0xec, 0x92, 0x96,
-	0xe5, 0xba, 0xad, 0x90, 0x91, 0x80, 0xc5, 0x5c, 0xe6, 0xcc, 0x45, 0x31, 0xb1, 0xe3, 0xba, 0xff,
-	0x46, 0x30, 0xfe, 0x0e, 0x96, 0xe4, 0x5a, 0xc7, 0xb3, 0x3a, 0xdc, 0xe9, 0x91, 0x98, 0x50, 0x7f,
-	0x69, 0x43, 0xc0, 0xf8, 0x18, 0x66, 0xa2, 0x91, 0x38, 0xa1, 0x92, 0x71, 0x30, 0xda, 0xe5, 0x6c,
-	0x05, 0x29, 0xf3, 0x77, 0xe2, 0x84, 0x4d, 0xcb, 0x0d, 0x89, 0x29, 0xb2, 0xe3, 0x6f, 0xa1, 0xcc,
-	0x78, 0xe0, 0xf8, 0xad, 0x80, 0xb0, 0xd0, 0xe5, 0x4c, 0x99, 0x8e, 0xf8, 0xd4, 0x0a, 0x0a, 0x32,
-	0xe7, 0xe3, 0x09, 0x33, 0xc1, 0xf1, 0x67, 0x00, 0x77, 0x2c, 0x87, 0xb7, 0x38, 0x3d, 0x21, 0x9e,
-	0x32, 0x13, 0xfb, 0x50, 0x8c, 0x90, 0x7f, 0x22, 0x20, 0xc3, 0xe9, 0xb9, 0x0c, 0xa7, 0x2b, 0x6d,
-	0x58, 0xc9, 0xe4, 0x83, 0x1b, 0x30, 0xdd, 0x8b, 0x06, 0xb1, 0xc3, 0x0b, 0xc6, 0x66, 0x9e, 0xa2,
-	0xd2, 0x92, 0x44, 0x66, 0x92, 0x41, 0x7d, 0x88, 0x60, 0xed, 0x1d, 0x2f, 0x44, 0x01, 0x1f, 0x40,
-	0xa9, 0x5f, 0x20, 0x4c, 0x41, 0xd5, 0xa9, 0xdc, 0x15, 0x9c, 0x4e, 0x80, 0xbf, 0x81, 0x45, 0x8f,
-	0xdc, 0xe5, 0xad, 0x94, 0x35, 0x49, 0x1d, 0x96, 0x23, 0xf8, 0x3f, 0x69, 0x8f, 0x7a, 0x81, 0x60,
-	0x39, 0xe2, 0xb4, 0x2b, 0x0a, 0xe7, 0xaa, 0xbe, 0x14, 0x98, 0xf5, 0x03, 0x7a, 0x8b, 0x74, 0xb8,
-	0x08, 0x94, 0x9f, 0x79, 0x8a, 0x65, 0xcc, 0x6b, 0x6d, 0xc1, 0xca, 0x10, 0x07, 0xe1, 0xca, 0x1e,
-	0x14, 0x65, 0x45, 0x4b, 0x4f, 0x36, 0x46, 0x7b, 0x22, 0xf3, 0x98, 0xfd, 0x60, 0xe3, 0xc5, 0x2c,
-	0x14, 0x05, 0x1e, 0x18, 0xf8, 0x12, 0x41, 0x79, 0xa0, 0x6b, 0xe2, 0x9f, 0x47, 0xa7, 0xcd, 0x7a,
-	0x14, 0x2a, 0xbf, 0xe4, 0x8e, 0x4b, 0xa4, 0xa9, 0x7b, 0x17, 0xaf, 0xdf, 0x3c, 0x2a, 0xd4, 0xd4,
-	0x9f, 0xd2, 0x8f, 0xa1, 0x7e, 0x45, 0x58, 0x3f, 0x4b, 0xdd, 0xee, 0x73, 0x3d, 0x75, 0xb4, 0x3a,
-	0x23, 0xfc, 0xd7, 0xf4, 0x43, 0x11, 0x89, 0xa9, 0xe7, 0x15, 0x53, 0x9f, 0x50, 0x4c, 0xfd, 0x43,
-	0x62, 0xf0, 0xef, 0xb9, 0xc5, 0x9c, 0x0d, 0xf4, 0xca, 0x73, 0xfc, 0x0c, 0xc1, 0xd2, 0x70, 0xeb,
-	0xc5, 0xdb, 0xe3, 0x9c, 0x79, 0x66, 0xbb, 0xae, 0xac, 0xca, 0x50, 0xf9, 0xd6, 0x6b, 0x7f, 0x46,
-	0x6f, 0xbd, 0x64, 0xbc, 0x71, 0x7d, 0xc6, 0x2f, 0x11, 0x2c, 0x0e, 0xdd, 0x6a, 0xbc, 0x35, 0x69,
-	0x53, 0xac, 0x6c, 0x4f, 0x10, 0x29, 0x0e, 0x61, 0x2b, 0x96, 0x64, 0xe0, 0x1f, 0xf3, 0x4a, 0xc2,
-	0x8f, 0x11, 0x94, 0x07, 0x2e, 0xe0, 0x38, 0x15, 0x94, 0xd5, 0x35, 0xc6, 0xa9, 0xa0, 0xcc, 0x9b,
-	0xae, 0x7e, 0x1e, 0x93, 0x57, 0xf0, 0x6a, 0x36, 0xf9, 0xda, 0x73, 0x04, 0x5f, 0x75, 0xe8, 0xe9,
-	0xc8, 0xf4, 0xb5, 0xb2, 0xbc, 0xe5, 0x87, 0xd1, 0x81, 0x1f, 0xa2, 0xff, 0xff, 0x12, 0x21, 0x36,
-	0x75, 0x2d, 0xcf, 0xd6, 0x68, 0x60, 0xeb, 0x36, 0xf1, 0xe2, 0x72, 0x10, 0x7f, 0xa9, 0x96, 0xef,
-	0xb0, 0xf7, 0xff, 0x38, 0xfe, 0x36, 0x00, 0x3c, 0x29, 0x28, 0xf5, 0x24, 0xdf, 0x1f, 0x11, 0x2c,
-	0x7b, 0x4d, 0xa0, 0x35, 0x8d, 0x4b, 0x39, 0x75, 0x14, 0x4f, 0x1d, 0xc9, 0xa9, 0xa3, 0xa6, 0xd1,
-	0x9e, 0x89, 0xf7, 0xdb, 0x7c, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x13, 0xd7, 0xe1, 0x18, 0x0b,
-	0x00, 0x00,
-}
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
index a5b017b5e9..eda8a24d51 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/common.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
+package clouderrorreporting
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/monitoredres"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/monitoredres"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Description of a group of similar error events.
 type ErrorGroup struct {
@@ -40,16 +43,17 @@ func (m *ErrorGroup) Reset()         { *m = ErrorGroup{} }
 func (m *ErrorGroup) String() string { return proto.CompactTextString(m) }
 func (*ErrorGroup) ProtoMessage()    {}
 func (*ErrorGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_293c65082d2aefa2, []int{0}
+	return fileDescriptor_d0e89497b32fa506, []int{0}
 }
+
 func (m *ErrorGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorGroup.Unmarshal(m, b)
 }
 func (m *ErrorGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorGroup.Marshal(b, m, deterministic)
 }
-func (dst *ErrorGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorGroup.Merge(dst, src)
+func (m *ErrorGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorGroup.Merge(m, src)
 }
 func (m *ErrorGroup) XXX_Size() int {
 	return xxx_messageInfo_ErrorGroup.Size(m)
@@ -95,16 +99,17 @@ func (m *TrackingIssue) Reset()         { *m = TrackingIssue{} }
 func (m *TrackingIssue) String() string { return proto.CompactTextString(m) }
 func (*TrackingIssue) ProtoMessage()    {}
 func (*TrackingIssue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_293c65082d2aefa2, []int{1}
+	return fileDescriptor_d0e89497b32fa506, []int{1}
 }
+
 func (m *TrackingIssue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TrackingIssue.Unmarshal(m, b)
 }
 func (m *TrackingIssue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TrackingIssue.Marshal(b, m, deterministic)
 }
-func (dst *TrackingIssue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TrackingIssue.Merge(dst, src)
+func (m *TrackingIssue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrackingIssue.Merge(m, src)
 }
 func (m *TrackingIssue) XXX_Size() int {
 	return xxx_messageInfo_TrackingIssue.Size(m)
@@ -143,16 +148,17 @@ func (m *ErrorEvent) Reset()         { *m = ErrorEvent{} }
 func (m *ErrorEvent) String() string { return proto.CompactTextString(m) }
 func (*ErrorEvent) ProtoMessage()    {}
 func (*ErrorEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_293c65082d2aefa2, []int{2}
+	return fileDescriptor_d0e89497b32fa506, []int{2}
 }
+
 func (m *ErrorEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorEvent.Unmarshal(m, b)
 }
 func (m *ErrorEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorEvent.Marshal(b, m, deterministic)
 }
-func (dst *ErrorEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorEvent.Merge(dst, src)
+func (m *ErrorEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorEvent.Merge(m, src)
 }
 func (m *ErrorEvent) XXX_Size() int {
 	return xxx_messageInfo_ErrorEvent.Size(m)
@@ -220,16 +226,17 @@ func (m *ServiceContext) Reset()         { *m = ServiceContext{} }
 func (m *ServiceContext) String() string { return proto.CompactTextString(m) }
 func (*ServiceContext) ProtoMessage()    {}
 func (*ServiceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_293c65082d2aefa2, []int{3}
+	return fileDescriptor_d0e89497b32fa506, []int{3}
 }
+
 func (m *ServiceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServiceContext.Unmarshal(m, b)
 }
 func (m *ServiceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServiceContext.Marshal(b, m, deterministic)
 }
-func (dst *ServiceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceContext.Merge(dst, src)
+func (m *ServiceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceContext.Merge(m, src)
 }
 func (m *ServiceContext) XXX_Size() int {
 	return xxx_messageInfo_ServiceContext.Size(m)
@@ -294,16 +301,17 @@ func (m *ErrorContext) Reset()         { *m = ErrorContext{} }
 func (m *ErrorContext) String() string { return proto.CompactTextString(m) }
 func (*ErrorContext) ProtoMessage()    {}
 func (*ErrorContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_293c65082d2aefa2, []int{4}
+	return fileDescriptor_d0e89497b32fa506, []int{4}
 }
+
 func (m *ErrorContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorContext.Unmarshal(m, b)
 }
 func (m *ErrorContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorContext.Marshal(b, m, deterministic)
 }
-func (dst *ErrorContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorContext.Merge(dst, src)
+func (m *ErrorContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorContext.Merge(m, src)
 }
 func (m *ErrorContext) XXX_Size() int {
 	return xxx_messageInfo_ErrorContext.Size(m)
@@ -364,16 +372,17 @@ func (m *HttpRequestContext) Reset()         { *m = HttpRequestContext{} }
 func (m *HttpRequestContext) String() string { return proto.CompactTextString(m) }
 func (*HttpRequestContext) ProtoMessage()    {}
 func (*HttpRequestContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_293c65082d2aefa2, []int{5}
+	return fileDescriptor_d0e89497b32fa506, []int{5}
 }
+
 func (m *HttpRequestContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpRequestContext.Unmarshal(m, b)
 }
 func (m *HttpRequestContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpRequestContext.Marshal(b, m, deterministic)
 }
-func (dst *HttpRequestContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpRequestContext.Merge(dst, src)
+func (m *HttpRequestContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpRequestContext.Merge(m, src)
 }
 func (m *HttpRequestContext) XXX_Size() int {
 	return xxx_messageInfo_HttpRequestContext.Size(m)
@@ -450,16 +459,17 @@ func (m *SourceLocation) Reset()         { *m = SourceLocation{} }
 func (m *SourceLocation) String() string { return proto.CompactTextString(m) }
 func (*SourceLocation) ProtoMessage()    {}
 func (*SourceLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_293c65082d2aefa2, []int{6}
+	return fileDescriptor_d0e89497b32fa506, []int{6}
 }
+
 func (m *SourceLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceLocation.Unmarshal(m, b)
 }
 func (m *SourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceLocation.Marshal(b, m, deterministic)
 }
-func (dst *SourceLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceLocation.Merge(dst, src)
+func (m *SourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceLocation.Merge(m, src)
 }
 func (m *SourceLocation) XXX_Size() int {
 	return xxx_messageInfo_SourceLocation.Size(m)
@@ -502,10 +512,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/common.proto", fileDescriptor_common_293c65082d2aefa2)
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/common.proto", fileDescriptor_d0e89497b32fa506)
 }
 
-var fileDescriptor_common_293c65082d2aefa2 = []byte{
+var fileDescriptor_d0e89497b32fa506 = []byte{
 	// 705 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0x13, 0x31,
 	0x10, 0x56, 0x92, 0xfe, 0xc5, 0x69, 0x53, 0x64, 0x21, 0x14, 0x02, 0xa8, 0x25, 0xbd, 0x54, 0x42,
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
index c509b72545..8ac584b2db 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/error_group_service.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package clouderrorreporting
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A request to return an individual group.
 type GetGroupRequest struct {
@@ -44,16 +44,17 @@ func (m *GetGroupRequest) Reset()         { *m = GetGroupRequest{} }
 func (m *GetGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGroupRequest) ProtoMessage()    {}
 func (*GetGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_group_service_99a7665773c1719a, []int{0}
+	return fileDescriptor_cada5d349d61e784, []int{0}
 }
+
 func (m *GetGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGroupRequest.Unmarshal(m, b)
 }
 func (m *GetGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGroupRequest.Merge(dst, src)
+func (m *GetGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGroupRequest.Merge(m, src)
 }
 func (m *GetGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGroupRequest.Size(m)
@@ -84,16 +85,17 @@ func (m *UpdateGroupRequest) Reset()         { *m = UpdateGroupRequest{} }
 func (m *UpdateGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateGroupRequest) ProtoMessage()    {}
 func (*UpdateGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_group_service_99a7665773c1719a, []int{1}
+	return fileDescriptor_cada5d349d61e784, []int{1}
 }
+
 func (m *UpdateGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateGroupRequest.Unmarshal(m, b)
 }
 func (m *UpdateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateGroupRequest.Merge(dst, src)
+func (m *UpdateGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateGroupRequest.Merge(m, src)
 }
 func (m *UpdateGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateGroupRequest.Size(m)
@@ -116,6 +118,39 @@ func init() {
 	proto.RegisterType((*UpdateGroupRequest)(nil), "google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_group_service.proto", fileDescriptor_cada5d349d61e784)
+}
+
+var fileDescriptor_cada5d349d61e784 = []byte{
+	// 398 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcb, 0x4a, 0x23, 0x41,
+	0x14, 0x86, 0xe9, 0x0c, 0x33, 0x4c, 0x2a, 0x8b, 0x61, 0x6a, 0x31, 0x0c, 0xcd, 0x0c, 0x48, 0xdc,
+	0x68, 0x02, 0x55, 0x76, 0x5c, 0x18, 0xbc, 0x20, 0x44, 0x42, 0x56, 0x4a, 0x88, 0x98, 0x85, 0x04,
+	0x43, 0xa5, 0x53, 0x14, 0x2d, 0xdd, 0x75, 0xda, 0xea, 0x4a, 0x36, 0xe2, 0xc6, 0x07, 0x70, 0xe3,
+	0x5b, 0xb8, 0xf6, 0x05, 0xdc, 0xba, 0xf5, 0x15, 0x7c, 0x07, 0xb7, 0xd2, 0x55, 0xb9, 0x98, 0x8b,
+	0x60, 0x67, 0x7b, 0x2e, 0xff, 0xff, 0xd5, 0x5f, 0x07, 0xd5, 0x05, 0x80, 0x08, 0x39, 0xed, 0xf3,
+	0xa1, 0x06, 0x08, 0x13, 0xea, 0x87, 0x30, 0xe8, 0x73, 0xa5, 0x40, 0x29, 0x1e, 0x83, 0xd2, 0x81,
+	0x14, 0x74, 0xe8, 0xf5, 0xb8, 0x66, 0x1e, 0x35, 0xe5, 0xae, 0x50, 0x30, 0x88, 0xbb, 0x09, 0x57,
+	0xc3, 0xc0, 0xe7, 0x24, 0x56, 0xa0, 0x01, 0x97, 0xad, 0x0c, 0x19, 0xcb, 0x90, 0x25, 0x32, 0x64,
+	0x24, 0xe3, 0xfe, 0x1b, 0x79, 0xb2, 0x38, 0xa0, 0x4c, 0x4a, 0xd0, 0x4c, 0x07, 0x20, 0x13, 0x2b,
+	0xe5, 0x56, 0xb3, 0x10, 0xf9, 0x10, 0x45, 0x20, 0xed, 0x66, 0x71, 0x0b, 0xfd, 0x6a, 0x70, 0xdd,
+	0x48, 0xf1, 0x5a, 0xfc, 0x6a, 0xc0, 0x13, 0x8d, 0xff, 0x23, 0x64, 0x71, 0x25, 0x8b, 0xf8, 0x5f,
+	0x67, 0xcd, 0xd9, 0xc8, 0xb7, 0xf2, 0xa6, 0x72, 0xc2, 0x22, 0x5e, 0xf4, 0x11, 0x3e, 0x8b, 0xfb,
+	0x4c, 0xf3, 0x99, 0xa5, 0x63, 0xf4, 0xdd, 0x8c, 0x98, 0xf9, 0x42, 0x65, 0x87, 0x64, 0x78, 0x1c,
+	0xa9, 0xa7, 0x65, 0x2b, 0x67, 0x55, 0x2a, 0x77, 0xdf, 0xd0, 0xef, 0x69, 0xf5, 0xd4, 0xe6, 0x86,
+	0x1f, 0x1d, 0xf4, 0x73, 0x4c, 0x8b, 0xf7, 0x33, 0x59, 0xcc, 0x3d, 0xd2, 0x5d, 0x15, 0xb0, 0xe8,
+	0xdd, 0xbe, 0xbc, 0xde, 0xe7, 0xca, 0x78, 0x73, 0x92, 0xe7, 0xf5, 0x34, 0xad, 0x83, 0x58, 0xc1,
+	0x25, 0xf7, 0x75, 0x42, 0x4b, 0xd4, 0x54, 0x13, 0x5a, 0xba, 0xc1, 0x4f, 0x0e, 0x2a, 0x7c, 0x88,
+	0x0c, 0x1f, 0x66, 0xf2, 0x5e, 0x0c, 0x7b, 0x75, 0xf8, 0xaa, 0x81, 0xaf, 0xb8, 0xf3, 0xf0, 0xe4,
+	0x53, 0xf8, 0x5d, 0xfb, 0x21, 0xb5, 0x37, 0x07, 0xa5, 0x87, 0x93, 0xc5, 0xb8, 0xf6, 0x67, 0xe1,
+	0x07, 0x9b, 0xe9, 0xcd, 0x35, 0x9d, 0xf3, 0x8b, 0x91, 0x8c, 0x80, 0x90, 0x49, 0x41, 0x40, 0x09,
+	0x2a, 0xb8, 0x34, 0x17, 0x49, 0x6d, 0x8b, 0xc5, 0x41, 0xf2, 0xa5, 0x73, 0xde, 0x5b, 0xd2, 0x7b,
+	0xc8, 0xad, 0x37, 0xac, 0xc1, 0x51, 0xda, 0xb4, 0x09, 0xb4, 0x26, 0x7c, 0x6d, 0xaf, 0x96, 0x6e,
+	0x3e, 0x8f, 0xa7, 0x3a, 0x66, 0xaa, 0x33, 0x3b, 0xd5, 0x69, 0x5b, 0xfd, 0xde, 0x0f, 0x83, 0xb5,
+	0xfd, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x0a, 0xfa, 0x93, 0xf6, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -226,36 +261,3 @@ var _ErrorGroupService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/clouderrorreporting/v1beta1/error_group_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_group_service.proto", fileDescriptor_error_group_service_99a7665773c1719a)
-}
-
-var fileDescriptor_error_group_service_99a7665773c1719a = []byte{
-	// 398 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcb, 0x4a, 0x23, 0x41,
-	0x14, 0x86, 0xe9, 0x0c, 0x33, 0x4c, 0x2a, 0x8b, 0x61, 0x6a, 0x31, 0x0c, 0xcd, 0x0c, 0x48, 0xdc,
-	0x68, 0x02, 0x55, 0x76, 0x5c, 0x18, 0xbc, 0x20, 0x44, 0x42, 0x56, 0x4a, 0x88, 0x98, 0x85, 0x04,
-	0x43, 0xa5, 0x53, 0x14, 0x2d, 0xdd, 0x75, 0xda, 0xea, 0x4a, 0x36, 0xe2, 0xc6, 0x07, 0x70, 0xe3,
-	0x5b, 0xb8, 0xf6, 0x05, 0xdc, 0xba, 0xf5, 0x15, 0x7c, 0x07, 0xb7, 0xd2, 0x55, 0xb9, 0x98, 0x8b,
-	0x60, 0x67, 0x7b, 0x2e, 0xff, 0xff, 0xd5, 0x5f, 0x07, 0xd5, 0x05, 0x80, 0x08, 0x39, 0xed, 0xf3,
-	0xa1, 0x06, 0x08, 0x13, 0xea, 0x87, 0x30, 0xe8, 0x73, 0xa5, 0x40, 0x29, 0x1e, 0x83, 0xd2, 0x81,
-	0x14, 0x74, 0xe8, 0xf5, 0xb8, 0x66, 0x1e, 0x35, 0xe5, 0xae, 0x50, 0x30, 0x88, 0xbb, 0x09, 0x57,
-	0xc3, 0xc0, 0xe7, 0x24, 0x56, 0xa0, 0x01, 0x97, 0xad, 0x0c, 0x19, 0xcb, 0x90, 0x25, 0x32, 0x64,
-	0x24, 0xe3, 0xfe, 0x1b, 0x79, 0xb2, 0x38, 0xa0, 0x4c, 0x4a, 0xd0, 0x4c, 0x07, 0x20, 0x13, 0x2b,
-	0xe5, 0x56, 0xb3, 0x10, 0xf9, 0x10, 0x45, 0x20, 0xed, 0x66, 0x71, 0x0b, 0xfd, 0x6a, 0x70, 0xdd,
-	0x48, 0xf1, 0x5a, 0xfc, 0x6a, 0xc0, 0x13, 0x8d, 0xff, 0x23, 0x64, 0x71, 0x25, 0x8b, 0xf8, 0x5f,
-	0x67, 0xcd, 0xd9, 0xc8, 0xb7, 0xf2, 0xa6, 0x72, 0xc2, 0x22, 0x5e, 0xf4, 0x11, 0x3e, 0x8b, 0xfb,
-	0x4c, 0xf3, 0x99, 0xa5, 0x63, 0xf4, 0xdd, 0x8c, 0x98, 0xf9, 0x42, 0x65, 0x87, 0x64, 0x78, 0x1c,
-	0xa9, 0xa7, 0x65, 0x2b, 0x67, 0x55, 0x2a, 0x77, 0xdf, 0xd0, 0xef, 0x69, 0xf5, 0xd4, 0xe6, 0x86,
-	0x1f, 0x1d, 0xf4, 0x73, 0x4c, 0x8b, 0xf7, 0x33, 0x59, 0xcc, 0x3d, 0xd2, 0x5d, 0x15, 0xb0, 0xe8,
-	0xdd, 0xbe, 0xbc, 0xde, 0xe7, 0xca, 0x78, 0x73, 0x92, 0xe7, 0xf5, 0x34, 0xad, 0x83, 0x58, 0xc1,
-	0x25, 0xf7, 0x75, 0x42, 0x4b, 0xd4, 0x54, 0x13, 0x5a, 0xba, 0xc1, 0x4f, 0x0e, 0x2a, 0x7c, 0x88,
-	0x0c, 0x1f, 0x66, 0xf2, 0x5e, 0x0c, 0x7b, 0x75, 0xf8, 0xaa, 0x81, 0xaf, 0xb8, 0xf3, 0xf0, 0xe4,
-	0x53, 0xf8, 0x5d, 0xfb, 0x21, 0xb5, 0x37, 0x07, 0xa5, 0x87, 0x93, 0xc5, 0xb8, 0xf6, 0x67, 0xe1,
-	0x07, 0x9b, 0xe9, 0xcd, 0x35, 0x9d, 0xf3, 0x8b, 0x91, 0x8c, 0x80, 0x90, 0x49, 0x41, 0x40, 0x09,
-	0x2a, 0xb8, 0x34, 0x17, 0x49, 0x6d, 0x8b, 0xc5, 0x41, 0xf2, 0xa5, 0x73, 0xde, 0x5b, 0xd2, 0x7b,
-	0xc8, 0xad, 0x37, 0xac, 0xc1, 0x51, 0xda, 0xb4, 0x09, 0xb4, 0x26, 0x7c, 0x6d, 0xaf, 0x96, 0x6e,
-	0x3e, 0x8f, 0xa7, 0x3a, 0x66, 0xaa, 0x33, 0x3b, 0xd5, 0x69, 0x5b, 0xfd, 0xde, 0x0f, 0x83, 0xb5,
-	0xfd, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x0a, 0xfa, 0x93, 0xf6, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
index 65e44f7f88..94cce6270e 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package clouderrorreporting
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies how the time periods of error group counts are aligned.
 type TimedCountAlignment int32
@@ -53,6 +53,7 @@ var TimedCountAlignment_name = map[int32]string{
 	1: "ALIGNMENT_EQUAL_ROUNDED",
 	2: "ALIGNMENT_EQUAL_AT_END",
 }
+
 var TimedCountAlignment_value = map[string]int32{
 	"ERROR_COUNT_ALIGNMENT_UNSPECIFIED": 0,
 	"ALIGNMENT_EQUAL_ROUNDED":           1,
@@ -62,8 +63,9 @@ var TimedCountAlignment_value = map[string]int32{
 func (x TimedCountAlignment) String() string {
 	return proto.EnumName(TimedCountAlignment_name, int32(x))
 }
+
 func (TimedCountAlignment) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{0}
+	return fileDescriptor_ab5fabd294dba66f, []int{0}
 }
 
 // A sorting order of error groups.
@@ -90,6 +92,7 @@ var ErrorGroupOrder_name = map[int32]string{
 	3: "CREATED_DESC",
 	4: "AFFECTED_USERS_DESC",
 }
+
 var ErrorGroupOrder_value = map[string]int32{
 	"GROUP_ORDER_UNSPECIFIED": 0,
 	"COUNT_DESC":              1,
@@ -101,8 +104,9 @@ var ErrorGroupOrder_value = map[string]int32{
 func (x ErrorGroupOrder) String() string {
 	return proto.EnumName(ErrorGroupOrder_name, int32(x))
 }
+
 func (ErrorGroupOrder) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{1}
+	return fileDescriptor_ab5fabd294dba66f, []int{1}
 }
 
 // The supported time ranges.
@@ -136,6 +140,7 @@ var QueryTimeRange_Period_name = map[int32]string{
 	4: "PERIOD_1_WEEK",
 	5: "PERIOD_30_DAYS",
 }
+
 var QueryTimeRange_Period_value = map[string]int32{
 	"PERIOD_UNSPECIFIED": 0,
 	"PERIOD_1_HOUR":      1,
@@ -148,8 +153,9 @@ var QueryTimeRange_Period_value = map[string]int32{
 func (x QueryTimeRange_Period) String() string {
 	return proto.EnumName(QueryTimeRange_Period_name, int32(x))
 }
+
 func (QueryTimeRange_Period) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{6, 0}
+	return fileDescriptor_ab5fabd294dba66f, []int{6, 0}
 }
 
 // Specifies a set of `ErrorGroupStats` to return.
@@ -203,16 +209,17 @@ func (m *ListGroupStatsRequest) Reset()         { *m = ListGroupStatsRequest{} }
 func (m *ListGroupStatsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListGroupStatsRequest) ProtoMessage()    {}
 func (*ListGroupStatsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{0}
+	return fileDescriptor_ab5fabd294dba66f, []int{0}
 }
+
 func (m *ListGroupStatsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGroupStatsRequest.Unmarshal(m, b)
 }
 func (m *ListGroupStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGroupStatsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListGroupStatsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGroupStatsRequest.Merge(dst, src)
+func (m *ListGroupStatsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupStatsRequest.Merge(m, src)
 }
 func (m *ListGroupStatsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListGroupStatsRequest.Size(m)
@@ -315,16 +322,17 @@ func (m *ListGroupStatsResponse) Reset()         { *m = ListGroupStatsResponse{}
 func (m *ListGroupStatsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListGroupStatsResponse) ProtoMessage()    {}
 func (*ListGroupStatsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{1}
+	return fileDescriptor_ab5fabd294dba66f, []int{1}
 }
+
 func (m *ListGroupStatsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGroupStatsResponse.Unmarshal(m, b)
 }
 func (m *ListGroupStatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGroupStatsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListGroupStatsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGroupStatsResponse.Merge(dst, src)
+func (m *ListGroupStatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupStatsResponse.Merge(m, src)
 }
 func (m *ListGroupStatsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListGroupStatsResponse.Size(m)
@@ -414,16 +422,17 @@ func (m *ErrorGroupStats) Reset()         { *m = ErrorGroupStats{} }
 func (m *ErrorGroupStats) String() string { return proto.CompactTextString(m) }
 func (*ErrorGroupStats) ProtoMessage()    {}
 func (*ErrorGroupStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{2}
+	return fileDescriptor_ab5fabd294dba66f, []int{2}
 }
+
 func (m *ErrorGroupStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorGroupStats.Unmarshal(m, b)
 }
 func (m *ErrorGroupStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorGroupStats.Marshal(b, m, deterministic)
 }
-func (dst *ErrorGroupStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorGroupStats.Merge(dst, src)
+func (m *ErrorGroupStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorGroupStats.Merge(m, src)
 }
 func (m *ErrorGroupStats) XXX_Size() int {
 	return xxx_messageInfo_ErrorGroupStats.Size(m)
@@ -516,16 +525,17 @@ func (m *TimedCount) Reset()         { *m = TimedCount{} }
 func (m *TimedCount) String() string { return proto.CompactTextString(m) }
 func (*TimedCount) ProtoMessage()    {}
 func (*TimedCount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{3}
+	return fileDescriptor_ab5fabd294dba66f, []int{3}
 }
+
 func (m *TimedCount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimedCount.Unmarshal(m, b)
 }
 func (m *TimedCount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimedCount.Marshal(b, m, deterministic)
 }
-func (dst *TimedCount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimedCount.Merge(dst, src)
+func (m *TimedCount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimedCount.Merge(m, src)
 }
 func (m *TimedCount) XXX_Size() int {
 	return xxx_messageInfo_TimedCount.Size(m)
@@ -588,16 +598,17 @@ func (m *ListEventsRequest) Reset()         { *m = ListEventsRequest{} }
 func (m *ListEventsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListEventsRequest) ProtoMessage()    {}
 func (*ListEventsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{4}
+	return fileDescriptor_ab5fabd294dba66f, []int{4}
 }
+
 func (m *ListEventsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListEventsRequest.Unmarshal(m, b)
 }
 func (m *ListEventsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListEventsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListEventsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListEventsRequest.Merge(dst, src)
+func (m *ListEventsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEventsRequest.Merge(m, src)
 }
 func (m *ListEventsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListEventsRequest.Size(m)
@@ -669,16 +680,17 @@ func (m *ListEventsResponse) Reset()         { *m = ListEventsResponse{} }
 func (m *ListEventsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListEventsResponse) ProtoMessage()    {}
 func (*ListEventsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{5}
+	return fileDescriptor_ab5fabd294dba66f, []int{5}
 }
+
 func (m *ListEventsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListEventsResponse.Unmarshal(m, b)
 }
 func (m *ListEventsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListEventsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListEventsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListEventsResponse.Merge(dst, src)
+func (m *ListEventsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEventsResponse.Merge(m, src)
 }
 func (m *ListEventsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListEventsResponse.Size(m)
@@ -724,16 +736,17 @@ func (m *QueryTimeRange) Reset()         { *m = QueryTimeRange{} }
 func (m *QueryTimeRange) String() string { return proto.CompactTextString(m) }
 func (*QueryTimeRange) ProtoMessage()    {}
 func (*QueryTimeRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{6}
+	return fileDescriptor_ab5fabd294dba66f, []int{6}
 }
+
 func (m *QueryTimeRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryTimeRange.Unmarshal(m, b)
 }
 func (m *QueryTimeRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryTimeRange.Marshal(b, m, deterministic)
 }
-func (dst *QueryTimeRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryTimeRange.Merge(dst, src)
+func (m *QueryTimeRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryTimeRange.Merge(m, src)
 }
 func (m *QueryTimeRange) XXX_Size() int {
 	return xxx_messageInfo_QueryTimeRange.Size(m)
@@ -774,16 +787,17 @@ func (m *ServiceContextFilter) Reset()         { *m = ServiceContextFilter{} }
 func (m *ServiceContextFilter) String() string { return proto.CompactTextString(m) }
 func (*ServiceContextFilter) ProtoMessage()    {}
 func (*ServiceContextFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{7}
+	return fileDescriptor_ab5fabd294dba66f, []int{7}
 }
+
 func (m *ServiceContextFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServiceContextFilter.Unmarshal(m, b)
 }
 func (m *ServiceContextFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServiceContextFilter.Marshal(b, m, deterministic)
 }
-func (dst *ServiceContextFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceContextFilter.Merge(dst, src)
+func (m *ServiceContextFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceContextFilter.Merge(m, src)
 }
 func (m *ServiceContextFilter) XXX_Size() int {
 	return xxx_messageInfo_ServiceContextFilter.Size(m)
@@ -832,16 +846,17 @@ func (m *DeleteEventsRequest) Reset()         { *m = DeleteEventsRequest{} }
 func (m *DeleteEventsRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteEventsRequest) ProtoMessage()    {}
 func (*DeleteEventsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{8}
+	return fileDescriptor_ab5fabd294dba66f, []int{8}
 }
+
 func (m *DeleteEventsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteEventsRequest.Unmarshal(m, b)
 }
 func (m *DeleteEventsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteEventsRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteEventsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteEventsRequest.Merge(dst, src)
+func (m *DeleteEventsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEventsRequest.Merge(m, src)
 }
 func (m *DeleteEventsRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteEventsRequest.Size(m)
@@ -870,16 +885,17 @@ func (m *DeleteEventsResponse) Reset()         { *m = DeleteEventsResponse{} }
 func (m *DeleteEventsResponse) String() string { return proto.CompactTextString(m) }
 func (*DeleteEventsResponse) ProtoMessage()    {}
 func (*DeleteEventsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_stats_service_906700da599bba31, []int{9}
+	return fileDescriptor_ab5fabd294dba66f, []int{9}
 }
+
 func (m *DeleteEventsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteEventsResponse.Unmarshal(m, b)
 }
 func (m *DeleteEventsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteEventsResponse.Marshal(b, m, deterministic)
 }
-func (dst *DeleteEventsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteEventsResponse.Merge(dst, src)
+func (m *DeleteEventsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEventsResponse.Merge(m, src)
 }
 func (m *DeleteEventsResponse) XXX_Size() int {
 	return xxx_messageInfo_DeleteEventsResponse.Size(m)
@@ -891,6 +907,9 @@ func (m *DeleteEventsResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_DeleteEventsResponse proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment", TimedCountAlignment_name, TimedCountAlignment_value)
+	proto.RegisterEnum("google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder", ErrorGroupOrder_name, ErrorGroupOrder_value)
+	proto.RegisterEnum("google.devtools.clouderrorreporting.v1beta1.QueryTimeRange_Period", QueryTimeRange_Period_name, QueryTimeRange_Period_value)
 	proto.RegisterType((*ListGroupStatsRequest)(nil), "google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest")
 	proto.RegisterType((*ListGroupStatsResponse)(nil), "google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse")
 	proto.RegisterType((*ErrorGroupStats)(nil), "google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats")
@@ -901,9 +920,97 @@ func init() {
 	proto.RegisterType((*ServiceContextFilter)(nil), "google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter")
 	proto.RegisterType((*DeleteEventsRequest)(nil), "google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest")
 	proto.RegisterType((*DeleteEventsResponse)(nil), "google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse")
-	proto.RegisterEnum("google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment", TimedCountAlignment_name, TimedCountAlignment_value)
-	proto.RegisterEnum("google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder", ErrorGroupOrder_name, ErrorGroupOrder_value)
-	proto.RegisterEnum("google.devtools.clouderrorreporting.v1beta1.QueryTimeRange_Period", QueryTimeRange_Period_name, QueryTimeRange_Period_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto", fileDescriptor_ab5fabd294dba66f)
+}
+
+var fileDescriptor_ab5fabd294dba66f = []byte{
+	// 1328 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
+	0x14, 0x67, 0xed, 0x38, 0x89, 0x9f, 0x1d, 0xc7, 0x99, 0xa4, 0xe9, 0xd6, 0xe5, 0x23, 0x75, 0x05,
+	0x0a, 0xa9, 0xb0, 0x9b, 0x54, 0xa5, 0x45, 0xe5, 0xa3, 0x8e, 0xbd, 0x09, 0x51, 0x53, 0xdb, 0x1d,
+	0xdb, 0x45, 0x44, 0x55, 0x57, 0x1b, 0xfb, 0xc5, 0x5d, 0xb0, 0x77, 0x97, 0xdd, 0x71, 0xd4, 0x16,
+	0x55, 0x42, 0xdc, 0x38, 0xc3, 0x8d, 0xff, 0x80, 0xbf, 0x82, 0x13, 0x07, 0x4e, 0x48, 0xbd, 0x73,
+	0xe2, 0x0e, 0xe2, 0xc2, 0x15, 0xcd, 0xc7, 0xfa, 0xab, 0x11, 0xa9, 0x1d, 0x84, 0xb8, 0xed, 0xbc,
+	0x37, 0xef, 0xf7, 0x3e, 0xe6, 0xf7, 0xde, 0xcc, 0x82, 0xd1, 0x76, 0xdd, 0x76, 0x07, 0xf3, 0x2d,
+	0x3c, 0x66, 0xae, 0xdb, 0x09, 0xf2, 0xcd, 0x8e, 0xdb, 0x6b, 0xa1, 0xef, 0xbb, 0xbe, 0x8f, 0x9e,
+	0xeb, 0x33, 0xdb, 0x69, 0xe7, 0x8f, 0x37, 0x0f, 0x91, 0x59, 0x9b, 0x79, 0x21, 0x36, 0x03, 0x66,
+	0xb1, 0xc0, 0x0c, 0xd0, 0x3f, 0xb6, 0x9b, 0x98, 0xf3, 0x7c, 0x97, 0xb9, 0xe4, 0x8a, 0x84, 0xc9,
+	0x85, 0x30, 0xb9, 0x13, 0x60, 0x72, 0x0a, 0x26, 0xf3, 0xaa, 0xf2, 0x69, 0x79, 0x76, 0xde, 0x72,
+	0x1c, 0x97, 0x59, 0xcc, 0x76, 0x9d, 0x40, 0x42, 0x65, 0x6e, 0x4e, 0x12, 0x51, 0xd3, 0xed, 0x76,
+	0x5d, 0x47, 0x59, 0xbe, 0xae, 0x2c, 0xc5, 0xea, 0xb0, 0x77, 0x94, 0x6f, 0xf5, 0x7c, 0x01, 0xad,
+	0xf4, 0x6f, 0x8c, 0xeb, 0x99, 0xdd, 0xc5, 0x80, 0x59, 0x5d, 0x4f, 0x6e, 0xc8, 0x7e, 0x1f, 0x83,
+	0x73, 0xfb, 0x76, 0xc0, 0x76, 0x7d, 0xb7, 0xe7, 0xd5, 0x78, 0x9a, 0x14, 0xbf, 0xe8, 0x61, 0xc0,
+	0xc8, 0x25, 0x48, 0x7a, 0xbe, 0xfb, 0x19, 0x36, 0x99, 0xe9, 0x58, 0x5d, 0xd4, 0xb5, 0x35, 0x6d,
+	0x3d, 0x4e, 0x13, 0x4a, 0x56, 0xb6, 0xba, 0x48, 0x2e, 0xc0, 0x7c, 0x9b, 0xdb, 0x99, 0x76, 0x4b,
+	0x8f, 0xac, 0x45, 0xd7, 0xe3, 0x74, 0x4e, 0xac, 0xf7, 0x5a, 0xe4, 0x11, 0xa4, 0x54, 0xb9, 0xcc,
+	0x23, 0xbb, 0xc3, 0xd0, 0xd7, 0xa3, 0x6b, 0xda, 0x7a, 0x62, 0xab, 0x90, 0x9b, 0xa0, 0x6c, 0xb9,
+	0x9a, 0x84, 0x28, 0xba, 0x0e, 0xc3, 0xc7, 0x6c, 0x47, 0x00, 0xd1, 0x05, 0x05, 0x2c, 0x97, 0xe4,
+	0x00, 0x80, 0x27, 0x65, 0xfa, 0x96, 0xd3, 0x46, 0x3d, 0x26, 0xbc, 0xdc, 0x9a, 0xc8, 0xcb, 0xbd,
+	0x1e, 0xfa, 0x4f, 0xea, 0x76, 0x17, 0x29, 0x87, 0xa0, 0x71, 0x16, 0x7e, 0x92, 0x3b, 0xb0, 0xc2,
+	0x17, 0x2d, 0xb3, 0xe9, 0xf6, 0x1c, 0x66, 0x86, 0xc5, 0xd5, 0x67, 0x85, 0x97, 0x0b, 0xa1, 0x97,
+	0xb0, 0xba, 0xb9, 0x92, 0xda, 0x40, 0x89, 0x30, 0x2b, 0x72, 0xab, 0x50, 0x46, 0x1e, 0x42, 0xdc,
+	0xea, 0xd8, 0x6d, 0xa7, 0x8b, 0x0e, 0xd3, 0xe7, 0xd6, 0xb4, 0xf5, 0xd4, 0xd6, 0xed, 0x89, 0xe2,
+	0xac, 0xf7, 0x31, 0x0b, 0x21, 0x0e, 0x1d, 0x40, 0x92, 0x02, 0xa4, 0xfa, 0x0b, 0x93, 0xfb, 0xd7,
+	0xe7, 0x45, 0x98, 0x99, 0x17, 0xc2, 0xac, 0x87, 0x24, 0xa0, 0x0b, 0x7d, 0x0b, 0x2e, 0x23, 0x14,
+	0x62, 0xae, 0xdf, 0x42, 0x5f, 0x8f, 0x8b, 0xf0, 0xde, 0x9f, 0x28, 0x3c, 0x83, 0x8b, 0x05, 0x8f,
+	0x2a, 0x1c, 0x83, 0x4a, 0x28, 0x72, 0x11, 0xe2, 0x9e, 0xd5, 0x46, 0x33, 0xb0, 0x9f, 0xa2, 0x9e,
+	0x58, 0xd3, 0xd6, 0x63, 0x74, 0x9e, 0x0b, 0x6a, 0xf6, 0x53, 0x24, 0xaf, 0x01, 0x08, 0x25, 0x73,
+	0x3f, 0x47, 0x47, 0x4f, 0x0a, 0x8a, 0x89, 0xed, 0x75, 0x2e, 0xc8, 0xfe, 0xa1, 0xc1, 0xea, 0x38,
+	0x3b, 0x03, 0xcf, 0x75, 0x02, 0x24, 0x8f, 0x60, 0x49, 0xf6, 0xa6, 0x64, 0xa0, 0xe8, 0x50, 0x5d,
+	0x5b, 0x8b, 0xae, 0x27, 0xa6, 0x0e, 0x5b, 0x3a, 0x58, 0xc4, 0x51, 0x01, 0x79, 0x0b, 0x16, 0x1d,
+	0x7c, 0xcc, 0xcc, 0xa1, 0x40, 0x23, 0x22, 0xd0, 0x05, 0x2e, 0xae, 0x86, 0xc1, 0x92, 0x12, 0xa4,
+	0x07, 0x44, 0x34, 0x0f, 0xb1, 0x6d, 0x3b, 0xfa, 0xcc, 0xa9, 0x27, 0x90, 0xea, 0xb3, 0x6d, 0x9b,
+	0x5b, 0x64, 0xbf, 0x89, 0xc1, 0xe2, 0x58, 0x48, 0xe4, 0x2e, 0xc4, 0x44, 0x96, 0xa2, 0x07, 0x13,
+	0x5b, 0x37, 0xa6, 0xcc, 0x8f, 0x4a, 0x14, 0xb2, 0x02, 0x31, 0xc1, 0x67, 0x91, 0x46, 0x94, 0xca,
+	0x05, 0xb9, 0x0a, 0x2b, 0xd6, 0xd1, 0x11, 0x36, 0x19, 0xb6, 0xcc, 0x5e, 0x80, 0x7e, 0x20, 0x49,
+	0x2f, 0xfa, 0x36, 0x4a, 0x49, 0xa8, 0x6b, 0x70, 0x95, 0x20, 0x21, 0x39, 0x80, 0xe4, 0x50, 0x77,
+	0x04, 0xfa, 0x8c, 0xa8, 0xfe, 0x8d, 0x29, 0x39, 0x4d, 0x13, 0x83, 0x9e, 0x09, 0xc8, 0x36, 0x2c,
+	0x1e, 0xd9, 0x7e, 0xc0, 0xcc, 0x00, 0xd1, 0x91, 0x6c, 0x8e, 0x9d, 0xce, 0x66, 0x61, 0x52, 0x43,
+	0x74, 0x04, 0x9b, 0x6f, 0x43, 0xaa, 0x63, 0x8d, 0x40, 0xcc, 0x9e, 0x0a, 0x91, 0xe4, 0x16, 0x7d,
+	0x84, 0x47, 0xb0, 0xd4, 0xaf, 0x89, 0x9a, 0x3a, 0x81, 0x3e, 0x27, 0xd2, 0xbc, 0x75, 0x86, 0x41,
+	0x46, 0xd3, 0x21, 0xaa, 0x92, 0x07, 0x64, 0x0b, 0xce, 0x39, 0xbd, 0xae, 0xf9, 0xa2, 0xb7, 0x79,
+	0xd1, 0x31, 0xcb, 0x4e, 0xaf, 0x5b, 0x18, 0xb7, 0x31, 0x21, 0xe5, 0xa3, 0xe7, 0x63, 0x80, 0x0e,
+	0xbf, 0x4f, 0x8e, 0x51, 0xb4, 0xed, 0x54, 0xfc, 0x30, 0x8e, 0xf9, 0x30, 0x19, 0x83, 0xcb, 0x7e,
+	0xa7, 0x01, 0x0c, 0x0e, 0x68, 0xc0, 0x1b, 0x6d, 0x98, 0x37, 0xef, 0x01, 0x04, 0xcc, 0xf2, 0xd5,
+	0xc8, 0x89, 0x9c, 0x5a, 0xe1, 0xb8, 0xd8, 0x2d, 0xca, 0x7b, 0x1d, 0xe6, 0xd1, 0x69, 0x49, 0xc3,
+	0xe8, 0xa9, 0x86, 0x73, 0xe8, 0xb4, 0xf8, 0x2a, 0xfb, 0x3c, 0x02, 0x4b, 0x7c, 0x2a, 0x88, 0xa0,
+	0xa7, 0xbf, 0xaf, 0xb4, 0xff, 0xc3, 0x7d, 0x35, 0xf3, 0xaf, 0xde, 0x57, 0x23, 0xb3, 0x76, 0xf6,
+	0x1f, 0x67, 0xed, 0xdc, 0xf8, 0xac, 0xfd, 0x55, 0x03, 0x32, 0x5c, 0x55, 0x35, 0x67, 0x0f, 0x20,
+	0x29, 0xe7, 0x2c, 0x0a, 0xb9, 0x1a, 0xb1, 0x53, 0x53, 0x2c, 0x81, 0xfd, 0xef, 0xff, 0x7a, 0xb2,
+	0xfe, 0xae, 0x41, 0x6a, 0xb4, 0x74, 0xe4, 0x00, 0x66, 0x3d, 0xf4, 0x6d, 0xb7, 0x25, 0xd8, 0x92,
+	0xda, 0xda, 0x3e, 0xc3, 0x39, 0xe4, 0xaa, 0x02, 0x89, 0x2a, 0xc4, 0xec, 0x57, 0x1a, 0xcc, 0x4a,
+	0x11, 0x59, 0x05, 0x52, 0x35, 0xe8, 0x5e, 0xa5, 0x64, 0x36, 0xca, 0xb5, 0xaa, 0x51, 0xdc, 0xdb,
+	0xd9, 0x33, 0x4a, 0xe9, 0x57, 0xc8, 0x12, 0x2c, 0x28, 0xf9, 0xa6, 0xf9, 0x71, 0xa5, 0x41, 0xd3,
+	0x1a, 0x21, 0x90, 0x52, 0xa2, 0x77, 0x85, 0xa8, 0x96, 0x8e, 0x90, 0x34, 0x24, 0xfb, 0xdb, 0x4a,
+	0x85, 0x4f, 0xd3, 0xd1, 0x11, 0xc3, 0x4f, 0x0c, 0xe3, 0x4e, 0x7a, 0x66, 0xc8, 0xf0, 0xda, 0x55,
+	0xbe, 0xab, 0x96, 0x8e, 0x65, 0x5d, 0x58, 0x39, 0x89, 0x91, 0x44, 0x87, 0x39, 0xc5, 0xc9, 0xb0,
+	0x0d, 0xd4, 0x92, 0x6b, 0x8e, 0xd1, 0x0f, 0xf8, 0x1b, 0x27, 0x2a, 0x35, 0x6a, 0x49, 0x2e, 0xc3,
+	0x82, 0x8f, 0x81, 0xdb, 0xf3, 0x9b, 0x68, 0xb2, 0x27, 0x9e, 0x64, 0x6e, 0x9c, 0x26, 0x43, 0x61,
+	0xfd, 0x89, 0x87, 0xd9, 0x9b, 0xb0, 0x5c, 0xc2, 0x0e, 0x32, 0x9c, 0xb4, 0x35, 0xb3, 0xab, 0xb0,
+	0x32, 0x6a, 0x29, 0xe9, 0xb7, 0xd1, 0x83, 0xe5, 0x13, 0x9e, 0x3d, 0xe4, 0x4d, 0xb8, 0x64, 0x50,
+	0x5a, 0xa1, 0x66, 0xb1, 0xd2, 0x28, 0xd7, 0xcd, 0xc2, 0xfe, 0xde, 0x6e, 0xf9, 0xae, 0x51, 0xae,
+	0x8f, 0x15, 0xf8, 0x22, 0x9c, 0x1f, 0xa8, 0x8c, 0x7b, 0x8d, 0xc2, 0xbe, 0x49, 0x2b, 0x8d, 0x72,
+	0xc9, 0x28, 0xa5, 0x35, 0x92, 0x81, 0xd5, 0x71, 0x65, 0xa1, 0x6e, 0x1a, 0xe5, 0x52, 0x3a, 0xb2,
+	0xf1, 0x6c, 0xf8, 0x12, 0xae, 0xa8, 0x77, 0xcc, 0xf9, 0x5d, 0x5a, 0x69, 0x54, 0xcd, 0x0a, 0x2d,
+	0x19, 0x74, 0xcc, 0x51, 0x0a, 0x40, 0x46, 0x52, 0x32, 0x6a, 0x45, 0x79, 0x8c, 0xfb, 0x85, 0x5a,
+	0xdd, 0xac, 0x19, 0x46, 0x59, 0xca, 0xc4, 0x31, 0x16, 0xa9, 0x51, 0xa8, 0x1b, 0x25, 0x29, 0x89,
+	0x92, 0xf3, 0xb0, 0x5c, 0xd8, 0xd9, 0x31, 0x8a, 0x5c, 0xd4, 0xa8, 0x19, 0xb4, 0x26, 0x15, 0x33,
+	0x5b, 0x7f, 0xce, 0xc0, 0x92, 0xf0, 0x2f, 0xee, 0x7f, 0x75, 0x86, 0xe4, 0x17, 0x0d, 0x52, 0xa3,
+	0xaf, 0x21, 0x32, 0x19, 0x61, 0x4f, 0x7c, 0xe8, 0x67, 0x8a, 0x67, 0xc2, 0x90, 0xe7, 0x94, 0xbd,
+	0xfe, 0xf5, 0xf3, 0xdf, 0xbe, 0x8d, 0xe4, 0xc9, 0x3b, 0xfd, 0xff, 0x94, 0x2f, 0x87, 0x8f, 0xfc,
+	0x03, 0xb5, 0x08, 0xf2, 0x1b, 0xcf, 0xf2, 0xed, 0x41, 0xfc, 0x3f, 0x6a, 0x00, 0x83, 0xa1, 0x43,
+	0x3e, 0x9c, 0x38, 0x94, 0x11, 0xa2, 0x65, 0x3e, 0x9a, 0xda, 0x5e, 0xa5, 0xb1, 0x29, 0xd2, 0xb8,
+	0x42, 0xde, 0x7e, 0x89, 0x34, 0xe4, 0x40, 0x24, 0x3f, 0x69, 0x90, 0x1c, 0xa6, 0x2e, 0x99, 0xec,
+	0x51, 0x7f, 0x42, 0xbf, 0x64, 0x0a, 0x67, 0x40, 0x18, 0x4d, 0x64, 0xe3, 0xe5, 0x13, 0xd9, 0xfe,
+	0x4b, 0x03, 0xfe, 0x73, 0x39, 0x89, 0xef, 0xed, 0xd5, 0x17, 0x58, 0x5a, 0xe5, 0x83, 0xb8, 0xaa,
+	0x1d, 0x3c, 0x54, 0x30, 0x6d, 0xb7, 0x63, 0x39, 0xed, 0x9c, 0xeb, 0xb7, 0xf3, 0x6d, 0x74, 0xc4,
+	0x98, 0xce, 0x4b, 0x95, 0xe5, 0xd9, 0xc1, 0x4b, 0xfd, 0xf2, 0xde, 0x3a, 0x41, 0xf7, 0x43, 0xe4,
+	0xf2, 0xae, 0x74, 0x50, 0xe4, 0x4a, 0x79, 0xc5, 0xd0, 0x7e, 0x7c, 0xf7, 0x37, 0xb7, 0xb9, 0xe5,
+	0xcf, 0xe1, 0xae, 0x07, 0x62, 0xd7, 0x83, 0xd1, 0x5d, 0x0f, 0xee, 0x4b, 0xfc, 0xc3, 0x59, 0x11,
+	0xd6, 0xb5, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x90, 0xe3, 0x06, 0x1a, 0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1049,94 +1156,3 @@ var _ErrorStatsService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto", fileDescriptor_error_stats_service_906700da599bba31)
-}
-
-var fileDescriptor_error_stats_service_906700da599bba31 = []byte{
-	// 1328 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0xed, 0x38, 0x89, 0x9f, 0x1d, 0xc7, 0x99, 0xa4, 0xe9, 0xd6, 0xe5, 0x23, 0x75, 0x05,
-	0x0a, 0xa9, 0xb0, 0x9b, 0x54, 0xa5, 0x45, 0xe5, 0xa3, 0x8e, 0xbd, 0x09, 0x51, 0x53, 0xdb, 0x1d,
-	0xdb, 0x45, 0x44, 0x55, 0x57, 0x1b, 0xfb, 0xc5, 0x5d, 0xb0, 0x77, 0x97, 0xdd, 0x71, 0xd4, 0x16,
-	0x55, 0x42, 0xdc, 0x38, 0xc3, 0x8d, 0xff, 0x80, 0xbf, 0x82, 0x13, 0x07, 0x4e, 0x48, 0xbd, 0x73,
-	0xe2, 0x0e, 0xe2, 0xc2, 0x15, 0xcd, 0xc7, 0xfa, 0xab, 0x11, 0xa9, 0x1d, 0x84, 0xb8, 0xed, 0xbc,
-	0x37, 0xef, 0xf7, 0x3e, 0xe6, 0xf7, 0xde, 0xcc, 0x82, 0xd1, 0x76, 0xdd, 0x76, 0x07, 0xf3, 0x2d,
-	0x3c, 0x66, 0xae, 0xdb, 0x09, 0xf2, 0xcd, 0x8e, 0xdb, 0x6b, 0xa1, 0xef, 0xbb, 0xbe, 0x8f, 0x9e,
-	0xeb, 0x33, 0xdb, 0x69, 0xe7, 0x8f, 0x37, 0x0f, 0x91, 0x59, 0x9b, 0x79, 0x21, 0x36, 0x03, 0x66,
-	0xb1, 0xc0, 0x0c, 0xd0, 0x3f, 0xb6, 0x9b, 0x98, 0xf3, 0x7c, 0x97, 0xb9, 0xe4, 0x8a, 0x84, 0xc9,
-	0x85, 0x30, 0xb9, 0x13, 0x60, 0x72, 0x0a, 0x26, 0xf3, 0xaa, 0xf2, 0x69, 0x79, 0x76, 0xde, 0x72,
-	0x1c, 0x97, 0x59, 0xcc, 0x76, 0x9d, 0x40, 0x42, 0x65, 0x6e, 0x4e, 0x12, 0x51, 0xd3, 0xed, 0x76,
-	0x5d, 0x47, 0x59, 0xbe, 0xae, 0x2c, 0xc5, 0xea, 0xb0, 0x77, 0x94, 0x6f, 0xf5, 0x7c, 0x01, 0xad,
-	0xf4, 0x6f, 0x8c, 0xeb, 0x99, 0xdd, 0xc5, 0x80, 0x59, 0x5d, 0x4f, 0x6e, 0xc8, 0x7e, 0x1f, 0x83,
-	0x73, 0xfb, 0x76, 0xc0, 0x76, 0x7d, 0xb7, 0xe7, 0xd5, 0x78, 0x9a, 0x14, 0xbf, 0xe8, 0x61, 0xc0,
-	0xc8, 0x25, 0x48, 0x7a, 0xbe, 0xfb, 0x19, 0x36, 0x99, 0xe9, 0x58, 0x5d, 0xd4, 0xb5, 0x35, 0x6d,
-	0x3d, 0x4e, 0x13, 0x4a, 0x56, 0xb6, 0xba, 0x48, 0x2e, 0xc0, 0x7c, 0x9b, 0xdb, 0x99, 0x76, 0x4b,
-	0x8f, 0xac, 0x45, 0xd7, 0xe3, 0x74, 0x4e, 0xac, 0xf7, 0x5a, 0xe4, 0x11, 0xa4, 0x54, 0xb9, 0xcc,
-	0x23, 0xbb, 0xc3, 0xd0, 0xd7, 0xa3, 0x6b, 0xda, 0x7a, 0x62, 0xab, 0x90, 0x9b, 0xa0, 0x6c, 0xb9,
-	0x9a, 0x84, 0x28, 0xba, 0x0e, 0xc3, 0xc7, 0x6c, 0x47, 0x00, 0xd1, 0x05, 0x05, 0x2c, 0x97, 0xe4,
-	0x00, 0x80, 0x27, 0x65, 0xfa, 0x96, 0xd3, 0x46, 0x3d, 0x26, 0xbc, 0xdc, 0x9a, 0xc8, 0xcb, 0xbd,
-	0x1e, 0xfa, 0x4f, 0xea, 0x76, 0x17, 0x29, 0x87, 0xa0, 0x71, 0x16, 0x7e, 0x92, 0x3b, 0xb0, 0xc2,
-	0x17, 0x2d, 0xb3, 0xe9, 0xf6, 0x1c, 0x66, 0x86, 0xc5, 0xd5, 0x67, 0x85, 0x97, 0x0b, 0xa1, 0x97,
-	0xb0, 0xba, 0xb9, 0x92, 0xda, 0x40, 0x89, 0x30, 0x2b, 0x72, 0xab, 0x50, 0x46, 0x1e, 0x42, 0xdc,
-	0xea, 0xd8, 0x6d, 0xa7, 0x8b, 0x0e, 0xd3, 0xe7, 0xd6, 0xb4, 0xf5, 0xd4, 0xd6, 0xed, 0x89, 0xe2,
-	0xac, 0xf7, 0x31, 0x0b, 0x21, 0x0e, 0x1d, 0x40, 0x92, 0x02, 0xa4, 0xfa, 0x0b, 0x93, 0xfb, 0xd7,
-	0xe7, 0x45, 0x98, 0x99, 0x17, 0xc2, 0xac, 0x87, 0x24, 0xa0, 0x0b, 0x7d, 0x0b, 0x2e, 0x23, 0x14,
-	0x62, 0xae, 0xdf, 0x42, 0x5f, 0x8f, 0x8b, 0xf0, 0xde, 0x9f, 0x28, 0x3c, 0x83, 0x8b, 0x05, 0x8f,
-	0x2a, 0x1c, 0x83, 0x4a, 0x28, 0x72, 0x11, 0xe2, 0x9e, 0xd5, 0x46, 0x33, 0xb0, 0x9f, 0xa2, 0x9e,
-	0x58, 0xd3, 0xd6, 0x63, 0x74, 0x9e, 0x0b, 0x6a, 0xf6, 0x53, 0x24, 0xaf, 0x01, 0x08, 0x25, 0x73,
-	0x3f, 0x47, 0x47, 0x4f, 0x0a, 0x8a, 0x89, 0xed, 0x75, 0x2e, 0xc8, 0xfe, 0xa1, 0xc1, 0xea, 0x38,
-	0x3b, 0x03, 0xcf, 0x75, 0x02, 0x24, 0x8f, 0x60, 0x49, 0xf6, 0xa6, 0x64, 0xa0, 0xe8, 0x50, 0x5d,
-	0x5b, 0x8b, 0xae, 0x27, 0xa6, 0x0e, 0x5b, 0x3a, 0x58, 0xc4, 0x51, 0x01, 0x79, 0x0b, 0x16, 0x1d,
-	0x7c, 0xcc, 0xcc, 0xa1, 0x40, 0x23, 0x22, 0xd0, 0x05, 0x2e, 0xae, 0x86, 0xc1, 0x92, 0x12, 0xa4,
-	0x07, 0x44, 0x34, 0x0f, 0xb1, 0x6d, 0x3b, 0xfa, 0xcc, 0xa9, 0x27, 0x90, 0xea, 0xb3, 0x6d, 0x9b,
-	0x5b, 0x64, 0xbf, 0x89, 0xc1, 0xe2, 0x58, 0x48, 0xe4, 0x2e, 0xc4, 0x44, 0x96, 0xa2, 0x07, 0x13,
-	0x5b, 0x37, 0xa6, 0xcc, 0x8f, 0x4a, 0x14, 0xb2, 0x02, 0x31, 0xc1, 0x67, 0x91, 0x46, 0x94, 0xca,
-	0x05, 0xb9, 0x0a, 0x2b, 0xd6, 0xd1, 0x11, 0x36, 0x19, 0xb6, 0xcc, 0x5e, 0x80, 0x7e, 0x20, 0x49,
-	0x2f, 0xfa, 0x36, 0x4a, 0x49, 0xa8, 0x6b, 0x70, 0x95, 0x20, 0x21, 0x39, 0x80, 0xe4, 0x50, 0x77,
-	0x04, 0xfa, 0x8c, 0xa8, 0xfe, 0x8d, 0x29, 0x39, 0x4d, 0x13, 0x83, 0x9e, 0x09, 0xc8, 0x36, 0x2c,
-	0x1e, 0xd9, 0x7e, 0xc0, 0xcc, 0x00, 0xd1, 0x91, 0x6c, 0x8e, 0x9d, 0xce, 0x66, 0x61, 0x52, 0x43,
-	0x74, 0x04, 0x9b, 0x6f, 0x43, 0xaa, 0x63, 0x8d, 0x40, 0xcc, 0x9e, 0x0a, 0x91, 0xe4, 0x16, 0x7d,
-	0x84, 0x47, 0xb0, 0xd4, 0xaf, 0x89, 0x9a, 0x3a, 0x81, 0x3e, 0x27, 0xd2, 0xbc, 0x75, 0x86, 0x41,
-	0x46, 0xd3, 0x21, 0xaa, 0x92, 0x07, 0x64, 0x0b, 0xce, 0x39, 0xbd, 0xae, 0xf9, 0xa2, 0xb7, 0x79,
-	0xd1, 0x31, 0xcb, 0x4e, 0xaf, 0x5b, 0x18, 0xb7, 0x31, 0x21, 0xe5, 0xa3, 0xe7, 0x63, 0x80, 0x0e,
-	0xbf, 0x4f, 0x8e, 0x51, 0xb4, 0xed, 0x54, 0xfc, 0x30, 0x8e, 0xf9, 0x30, 0x19, 0x83, 0xcb, 0x7e,
-	0xa7, 0x01, 0x0c, 0x0e, 0x68, 0xc0, 0x1b, 0x6d, 0x98, 0x37, 0xef, 0x01, 0x04, 0xcc, 0xf2, 0xd5,
-	0xc8, 0x89, 0x9c, 0x5a, 0xe1, 0xb8, 0xd8, 0x2d, 0xca, 0x7b, 0x1d, 0xe6, 0xd1, 0x69, 0x49, 0xc3,
-	0xe8, 0xa9, 0x86, 0x73, 0xe8, 0xb4, 0xf8, 0x2a, 0xfb, 0x3c, 0x02, 0x4b, 0x7c, 0x2a, 0x88, 0xa0,
-	0xa7, 0xbf, 0xaf, 0xb4, 0xff, 0xc3, 0x7d, 0x35, 0xf3, 0xaf, 0xde, 0x57, 0x23, 0xb3, 0x76, 0xf6,
-	0x1f, 0x67, 0xed, 0xdc, 0xf8, 0xac, 0xfd, 0x55, 0x03, 0x32, 0x5c, 0x55, 0x35, 0x67, 0x0f, 0x20,
-	0x29, 0xe7, 0x2c, 0x0a, 0xb9, 0x1a, 0xb1, 0x53, 0x53, 0x2c, 0x81, 0xfd, 0xef, 0xff, 0x7a, 0xb2,
-	0xfe, 0xae, 0x41, 0x6a, 0xb4, 0x74, 0xe4, 0x00, 0x66, 0x3d, 0xf4, 0x6d, 0xb7, 0x25, 0xd8, 0x92,
-	0xda, 0xda, 0x3e, 0xc3, 0x39, 0xe4, 0xaa, 0x02, 0x89, 0x2a, 0xc4, 0xec, 0x57, 0x1a, 0xcc, 0x4a,
-	0x11, 0x59, 0x05, 0x52, 0x35, 0xe8, 0x5e, 0xa5, 0x64, 0x36, 0xca, 0xb5, 0xaa, 0x51, 0xdc, 0xdb,
-	0xd9, 0x33, 0x4a, 0xe9, 0x57, 0xc8, 0x12, 0x2c, 0x28, 0xf9, 0xa6, 0xf9, 0x71, 0xa5, 0x41, 0xd3,
-	0x1a, 0x21, 0x90, 0x52, 0xa2, 0x77, 0x85, 0xa8, 0x96, 0x8e, 0x90, 0x34, 0x24, 0xfb, 0xdb, 0x4a,
-	0x85, 0x4f, 0xd3, 0xd1, 0x11, 0xc3, 0x4f, 0x0c, 0xe3, 0x4e, 0x7a, 0x66, 0xc8, 0xf0, 0xda, 0x55,
-	0xbe, 0xab, 0x96, 0x8e, 0x65, 0x5d, 0x58, 0x39, 0x89, 0x91, 0x44, 0x87, 0x39, 0xc5, 0xc9, 0xb0,
-	0x0d, 0xd4, 0x92, 0x6b, 0x8e, 0xd1, 0x0f, 0xf8, 0x1b, 0x27, 0x2a, 0x35, 0x6a, 0x49, 0x2e, 0xc3,
-	0x82, 0x8f, 0x81, 0xdb, 0xf3, 0x9b, 0x68, 0xb2, 0x27, 0x9e, 0x64, 0x6e, 0x9c, 0x26, 0x43, 0x61,
-	0xfd, 0x89, 0x87, 0xd9, 0x9b, 0xb0, 0x5c, 0xc2, 0x0e, 0x32, 0x9c, 0xb4, 0x35, 0xb3, 0xab, 0xb0,
-	0x32, 0x6a, 0x29, 0xe9, 0xb7, 0xd1, 0x83, 0xe5, 0x13, 0x9e, 0x3d, 0xe4, 0x4d, 0xb8, 0x64, 0x50,
-	0x5a, 0xa1, 0x66, 0xb1, 0xd2, 0x28, 0xd7, 0xcd, 0xc2, 0xfe, 0xde, 0x6e, 0xf9, 0xae, 0x51, 0xae,
-	0x8f, 0x15, 0xf8, 0x22, 0x9c, 0x1f, 0xa8, 0x8c, 0x7b, 0x8d, 0xc2, 0xbe, 0x49, 0x2b, 0x8d, 0x72,
-	0xc9, 0x28, 0xa5, 0x35, 0x92, 0x81, 0xd5, 0x71, 0x65, 0xa1, 0x6e, 0x1a, 0xe5, 0x52, 0x3a, 0xb2,
-	0xf1, 0x6c, 0xf8, 0x12, 0xae, 0xa8, 0x77, 0xcc, 0xf9, 0x5d, 0x5a, 0x69, 0x54, 0xcd, 0x0a, 0x2d,
-	0x19, 0x74, 0xcc, 0x51, 0x0a, 0x40, 0x46, 0x52, 0x32, 0x6a, 0x45, 0x79, 0x8c, 0xfb, 0x85, 0x5a,
-	0xdd, 0xac, 0x19, 0x46, 0x59, 0xca, 0xc4, 0x31, 0x16, 0xa9, 0x51, 0xa8, 0x1b, 0x25, 0x29, 0x89,
-	0x92, 0xf3, 0xb0, 0x5c, 0xd8, 0xd9, 0x31, 0x8a, 0x5c, 0xd4, 0xa8, 0x19, 0xb4, 0x26, 0x15, 0x33,
-	0x5b, 0x7f, 0xce, 0xc0, 0x92, 0xf0, 0x2f, 0xee, 0x7f, 0x75, 0x86, 0xe4, 0x17, 0x0d, 0x52, 0xa3,
-	0xaf, 0x21, 0x32, 0x19, 0x61, 0x4f, 0x7c, 0xe8, 0x67, 0x8a, 0x67, 0xc2, 0x90, 0xe7, 0x94, 0xbd,
-	0xfe, 0xf5, 0xf3, 0xdf, 0xbe, 0x8d, 0xe4, 0xc9, 0x3b, 0xfd, 0xff, 0x94, 0x2f, 0x87, 0x8f, 0xfc,
-	0x03, 0xb5, 0x08, 0xf2, 0x1b, 0xcf, 0xf2, 0xed, 0x41, 0xfc, 0x3f, 0x6a, 0x00, 0x83, 0xa1, 0x43,
-	0x3e, 0x9c, 0x38, 0x94, 0x11, 0xa2, 0x65, 0x3e, 0x9a, 0xda, 0x5e, 0xa5, 0xb1, 0x29, 0xd2, 0xb8,
-	0x42, 0xde, 0x7e, 0x89, 0x34, 0xe4, 0x40, 0x24, 0x3f, 0x69, 0x90, 0x1c, 0xa6, 0x2e, 0x99, 0xec,
-	0x51, 0x7f, 0x42, 0xbf, 0x64, 0x0a, 0x67, 0x40, 0x18, 0x4d, 0x64, 0xe3, 0xe5, 0x13, 0xd9, 0xfe,
-	0x4b, 0x03, 0xfe, 0x73, 0x39, 0x89, 0xef, 0xed, 0xd5, 0x17, 0x58, 0x5a, 0xe5, 0x83, 0xb8, 0xaa,
-	0x1d, 0x3c, 0x54, 0x30, 0x6d, 0xb7, 0x63, 0x39, 0xed, 0x9c, 0xeb, 0xb7, 0xf3, 0x6d, 0x74, 0xc4,
-	0x98, 0xce, 0x4b, 0x95, 0xe5, 0xd9, 0xc1, 0x4b, 0xfd, 0xf2, 0xde, 0x3a, 0x41, 0xf7, 0x43, 0xe4,
-	0xf2, 0xae, 0x74, 0x50, 0xe4, 0x4a, 0x79, 0xc5, 0xd0, 0x7e, 0x7c, 0xf7, 0x37, 0xb7, 0xb9, 0xe5,
-	0xcf, 0xe1, 0xae, 0x07, 0x62, 0xd7, 0x83, 0xd1, 0x5d, 0x0f, 0xee, 0x4b, 0xfc, 0xc3, 0x59, 0x11,
-	0xd6, 0xb5, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x90, 0xe3, 0x06, 0x1a, 0x10, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go b/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
index aa3ed8fdaa..0902a1dbe4 100644
--- a/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
+++ b/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto
 
-package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package clouderrorreporting
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A request for reporting an individual error event.
 type ReportErrorEventRequest struct {
@@ -44,16 +44,17 @@ func (m *ReportErrorEventRequest) Reset()         { *m = ReportErrorEventRequest
 func (m *ReportErrorEventRequest) String() string { return proto.CompactTextString(m) }
 func (*ReportErrorEventRequest) ProtoMessage()    {}
 func (*ReportErrorEventRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_report_errors_service_e8d1154fe6c98b5b, []int{0}
+	return fileDescriptor_575af94d0209aede, []int{0}
 }
+
 func (m *ReportErrorEventRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportErrorEventRequest.Unmarshal(m, b)
 }
 func (m *ReportErrorEventRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportErrorEventRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReportErrorEventRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportErrorEventRequest.Merge(dst, src)
+func (m *ReportErrorEventRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportErrorEventRequest.Merge(m, src)
 }
 func (m *ReportErrorEventRequest) XXX_Size() int {
 	return xxx_messageInfo_ReportErrorEventRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *ReportErrorEventResponse) Reset()         { *m = ReportErrorEventRespon
 func (m *ReportErrorEventResponse) String() string { return proto.CompactTextString(m) }
 func (*ReportErrorEventResponse) ProtoMessage()    {}
 func (*ReportErrorEventResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_report_errors_service_e8d1154fe6c98b5b, []int{1}
+	return fileDescriptor_575af94d0209aede, []int{1}
 }
+
 func (m *ReportErrorEventResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportErrorEventResponse.Unmarshal(m, b)
 }
 func (m *ReportErrorEventResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportErrorEventResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReportErrorEventResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportErrorEventResponse.Merge(dst, src)
+func (m *ReportErrorEventResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportErrorEventResponse.Merge(m, src)
 }
 func (m *ReportErrorEventResponse) XXX_Size() int {
 	return xxx_messageInfo_ReportErrorEventResponse.Size(m)
@@ -134,16 +136,17 @@ func (m *ReportedErrorEvent) Reset()         { *m = ReportedErrorEvent{} }
 func (m *ReportedErrorEvent) String() string { return proto.CompactTextString(m) }
 func (*ReportedErrorEvent) ProtoMessage()    {}
 func (*ReportedErrorEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_report_errors_service_e8d1154fe6c98b5b, []int{2}
+	return fileDescriptor_575af94d0209aede, []int{2}
 }
+
 func (m *ReportedErrorEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportedErrorEvent.Unmarshal(m, b)
 }
 func (m *ReportedErrorEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportedErrorEvent.Marshal(b, m, deterministic)
 }
-func (dst *ReportedErrorEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportedErrorEvent.Merge(dst, src)
+func (m *ReportedErrorEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportedErrorEvent.Merge(m, src)
 }
 func (m *ReportedErrorEvent) XXX_Size() int {
 	return xxx_messageInfo_ReportedErrorEvent.Size(m)
@@ -188,6 +191,45 @@ func init() {
 	proto.RegisterType((*ReportedErrorEvent)(nil), "google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto", fileDescriptor_575af94d0209aede)
+}
+
+var fileDescriptor_575af94d0209aede = []byte{
+	// 490 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0x8a, 0x13, 0x41,
+	0x10, 0xc7, 0x99, 0xf8, 0xb1, 0x6c, 0x47, 0x54, 0xda, 0x83, 0xc3, 0x20, 0xb8, 0xc6, 0xcb, 0xa2,
+	0x30, 0x6d, 0xe2, 0xc5, 0xec, 0x22, 0x0b, 0x59, 0xc3, 0xde, 0x64, 0x99, 0xd5, 0x3d, 0x48, 0x70,
+	0xe8, 0x4c, 0xca, 0x61, 0x24, 0xd3, 0x35, 0x76, 0x77, 0x82, 0x20, 0x5e, 0x7c, 0x85, 0x7d, 0x05,
+	0x4f, 0x3e, 0x8a, 0x57, 0x5f, 0xc0, 0x83, 0x0f, 0xa1, 0x37, 0xe9, 0xaf, 0x25, 0x6b, 0x72, 0x70,
+	0xf4, 0x58, 0xd3, 0x55, 0xbf, 0xff, 0xbf, 0x3e, 0x86, 0x1c, 0x95, 0x88, 0xe5, 0x1c, 0xd8, 0x0c,
+	0x96, 0x1a, 0x71, 0xae, 0x58, 0x31, 0xc7, 0xc5, 0x0c, 0xa4, 0x44, 0x29, 0xa1, 0x41, 0xa9, 0x2b,
+	0x51, 0xb2, 0x65, 0x7f, 0x0a, 0x9a, 0xf7, 0x99, 0xfb, 0x92, 0xdb, 0x57, 0x95, 0x2b, 0x90, 0xcb,
+	0xaa, 0x80, 0xb4, 0x91, 0xa8, 0x91, 0x3e, 0x74, 0xa0, 0x34, 0x80, 0xd2, 0x0d, 0xa0, 0xd4, 0x83,
+	0x92, 0x3b, 0x5e, 0x95, 0x37, 0x15, 0xe3, 0x42, 0xa0, 0xe6, 0xba, 0x42, 0xa1, 0x1c, 0x2a, 0x79,
+	0xd2, 0xc6, 0x53, 0x81, 0x75, 0x8d, 0xc2, 0x57, 0xde, 0xf5, 0x95, 0x36, 0x9a, 0x2e, 0xde, 0x30,
+	0x5d, 0xd5, 0xa0, 0x34, 0xaf, 0x1b, 0x97, 0xd0, 0x3b, 0x8b, 0xc8, 0xed, 0xcc, 0x32, 0xc6, 0x06,
+	0x37, 0x5e, 0x82, 0xd0, 0x19, 0xbc, 0x5b, 0x80, 0xd2, 0xf4, 0x1e, 0xb9, 0xd6, 0x48, 0x7c, 0x0b,
+	0x85, 0xce, 0x05, 0xaf, 0x21, 0x8e, 0x76, 0xa2, 0xdd, 0xed, 0xac, 0xeb, 0xbf, 0x3d, 0xe7, 0x35,
+	0xd0, 0x97, 0xe4, 0x0a, 0x98, 0x92, 0xb8, 0xb3, 0x13, 0xed, 0x76, 0x07, 0x07, 0x69, 0x8b, 0xa6,
+	0x53, 0xa7, 0x0b, 0xb3, 0x15, 0x65, 0x47, 0xeb, 0x25, 0x24, 0x5e, 0x37, 0xa5, 0x1a, 0x14, 0x0a,
+	0x7a, 0x9f, 0x3b, 0x84, 0xae, 0x57, 0xd2, 0x21, 0x21, 0xb6, 0x36, 0x37, 0x1d, 0x5a, 0xab, 0xdd,
+	0x41, 0x12, 0xec, 0x84, 0xf6, 0xd3, 0x17, 0xa1, 0xfd, 0x6c, 0xdb, 0x66, 0x9b, 0x98, 0xce, 0xc8,
+	0x0d, 0xbf, 0xba, 0xbc, 0x40, 0xa1, 0xe1, 0x7d, 0x68, 0x67, 0xbf, 0x55, 0x3b, 0x27, 0x8e, 0x71,
+	0xe8, 0x10, 0xd9, 0x75, 0x75, 0x21, 0xa6, 0x31, 0xd9, 0xaa, 0x41, 0x29, 0x5e, 0x42, 0x7c, 0xc9,
+	0x0e, 0x32, 0x84, 0xf4, 0x84, 0x6c, 0x05, 0xdd, 0xcb, 0x56, 0x77, 0xd8, 0x4a, 0xd7, 0x0e, 0x21,
+	0xa8, 0x06, 0xd2, 0xe0, 0x67, 0x44, 0x6e, 0xad, 0xcc, 0x50, 0x79, 0x77, 0xf4, 0x7b, 0x44, 0x6e,
+	0xfe, 0x39, 0x5b, 0xfa, 0xec, 0x1f, 0xf6, 0xb6, 0x76, 0x2f, 0xc9, 0xf8, 0x3f, 0x29, 0x7e, 0xc1,
+	0x07, 0x9f, 0xbe, 0xfd, 0x38, 0xeb, 0x0c, 0x7b, 0x8f, 0xce, 0x4f, 0xfa, 0xc3, 0xea, 0x19, 0x3e,
+	0xf5, 0x81, 0x62, 0x0f, 0x3e, 0x32, 0xbb, 0x44, 0xb5, 0xe7, 0xe8, 0x7b, 0xee, 0x7a, 0x46, 0xbf,
+	0x22, 0x62, 0xfe, 0x82, 0x36, 0x6e, 0x46, 0xf1, 0x86, 0x59, 0x1d, 0x9b, 0xab, 0x39, 0x8e, 0x5e,
+	0xbd, 0xf6, 0xa0, 0x12, 0xe7, 0x5c, 0x94, 0x29, 0xca, 0x92, 0x95, 0x20, 0xec, 0x4d, 0x31, 0xf7,
+	0xc4, 0x9b, 0x4a, 0xfd, 0xd5, 0xdf, 0xb9, 0xbf, 0xe1, 0xed, 0x4b, 0xe7, 0xfe, 0x91, 0x13, 0x38,
+	0x34, 0x8f, 0x6e, 0x9f, 0xd9, 0xb9, 0xc3, 0xd3, 0xfe, 0xc8, 0x54, 0x7e, 0x0d, 0x59, 0x13, 0x9b,
+	0x35, 0xb9, 0x98, 0x35, 0x39, 0x75, 0xfc, 0xe9, 0x55, 0x6b, 0xeb, 0xf1, 0xef, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x2c, 0xd1, 0x8e, 0x76, 0xc7, 0x04, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -277,42 +319,3 @@ var _ReportErrorsService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto", fileDescriptor_report_errors_service_e8d1154fe6c98b5b)
-}
-
-var fileDescriptor_report_errors_service_e8d1154fe6c98b5b = []byte{
-	// 490 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0x8a, 0x13, 0x41,
-	0x10, 0xc7, 0x99, 0xf8, 0xb1, 0x6c, 0x47, 0x54, 0xda, 0x83, 0xc3, 0x20, 0xb8, 0xc6, 0xcb, 0xa2,
-	0x30, 0x6d, 0xe2, 0xc5, 0xec, 0x22, 0x0b, 0x59, 0xc3, 0xde, 0x64, 0x99, 0xd5, 0x3d, 0x48, 0x70,
-	0xe8, 0x4c, 0xca, 0x61, 0x24, 0xd3, 0x35, 0x76, 0x77, 0x82, 0x20, 0x5e, 0x7c, 0x85, 0x7d, 0x05,
-	0x4f, 0x3e, 0x8a, 0x57, 0x5f, 0xc0, 0x83, 0x0f, 0xa1, 0x37, 0xe9, 0xaf, 0x25, 0x6b, 0x72, 0x70,
-	0xf4, 0x58, 0xd3, 0x55, 0xbf, 0xff, 0xbf, 0x3e, 0x86, 0x1c, 0x95, 0x88, 0xe5, 0x1c, 0xd8, 0x0c,
-	0x96, 0x1a, 0x71, 0xae, 0x58, 0x31, 0xc7, 0xc5, 0x0c, 0xa4, 0x44, 0x29, 0xa1, 0x41, 0xa9, 0x2b,
-	0x51, 0xb2, 0x65, 0x7f, 0x0a, 0x9a, 0xf7, 0x99, 0xfb, 0x92, 0xdb, 0x57, 0x95, 0x2b, 0x90, 0xcb,
-	0xaa, 0x80, 0xb4, 0x91, 0xa8, 0x91, 0x3e, 0x74, 0xa0, 0x34, 0x80, 0xd2, 0x0d, 0xa0, 0xd4, 0x83,
-	0x92, 0x3b, 0x5e, 0x95, 0x37, 0x15, 0xe3, 0x42, 0xa0, 0xe6, 0xba, 0x42, 0xa1, 0x1c, 0x2a, 0x79,
-	0xd2, 0xc6, 0x53, 0x81, 0x75, 0x8d, 0xc2, 0x57, 0xde, 0xf5, 0x95, 0x36, 0x9a, 0x2e, 0xde, 0x30,
-	0x5d, 0xd5, 0xa0, 0x34, 0xaf, 0x1b, 0x97, 0xd0, 0x3b, 0x8b, 0xc8, 0xed, 0xcc, 0x32, 0xc6, 0x06,
-	0x37, 0x5e, 0x82, 0xd0, 0x19, 0xbc, 0x5b, 0x80, 0xd2, 0xf4, 0x1e, 0xb9, 0xd6, 0x48, 0x7c, 0x0b,
-	0x85, 0xce, 0x05, 0xaf, 0x21, 0x8e, 0x76, 0xa2, 0xdd, 0xed, 0xac, 0xeb, 0xbf, 0x3d, 0xe7, 0x35,
-	0xd0, 0x97, 0xe4, 0x0a, 0x98, 0x92, 0xb8, 0xb3, 0x13, 0xed, 0x76, 0x07, 0x07, 0x69, 0x8b, 0xa6,
-	0x53, 0xa7, 0x0b, 0xb3, 0x15, 0x65, 0x47, 0xeb, 0x25, 0x24, 0x5e, 0x37, 0xa5, 0x1a, 0x14, 0x0a,
-	0x7a, 0x9f, 0x3b, 0x84, 0xae, 0x57, 0xd2, 0x21, 0x21, 0xb6, 0x36, 0x37, 0x1d, 0x5a, 0xab, 0xdd,
-	0x41, 0x12, 0xec, 0x84, 0xf6, 0xd3, 0x17, 0xa1, 0xfd, 0x6c, 0xdb, 0x66, 0x9b, 0x98, 0xce, 0xc8,
-	0x0d, 0xbf, 0xba, 0xbc, 0x40, 0xa1, 0xe1, 0x7d, 0x68, 0x67, 0xbf, 0x55, 0x3b, 0x27, 0x8e, 0x71,
-	0xe8, 0x10, 0xd9, 0x75, 0x75, 0x21, 0xa6, 0x31, 0xd9, 0xaa, 0x41, 0x29, 0x5e, 0x42, 0x7c, 0xc9,
-	0x0e, 0x32, 0x84, 0xf4, 0x84, 0x6c, 0x05, 0xdd, 0xcb, 0x56, 0x77, 0xd8, 0x4a, 0xd7, 0x0e, 0x21,
-	0xa8, 0x06, 0xd2, 0xe0, 0x67, 0x44, 0x6e, 0xad, 0xcc, 0x50, 0x79, 0x77, 0xf4, 0x7b, 0x44, 0x6e,
-	0xfe, 0x39, 0x5b, 0xfa, 0xec, 0x1f, 0xf6, 0xb6, 0x76, 0x2f, 0xc9, 0xf8, 0x3f, 0x29, 0x7e, 0xc1,
-	0x07, 0x9f, 0xbe, 0xfd, 0x38, 0xeb, 0x0c, 0x7b, 0x8f, 0xce, 0x4f, 0xfa, 0xc3, 0xea, 0x19, 0x3e,
-	0xf5, 0x81, 0x62, 0x0f, 0x3e, 0x32, 0xbb, 0x44, 0xb5, 0xe7, 0xe8, 0x7b, 0xee, 0x7a, 0x46, 0xbf,
-	0x22, 0x62, 0xfe, 0x82, 0x36, 0x6e, 0x46, 0xf1, 0x86, 0x59, 0x1d, 0x9b, 0xab, 0x39, 0x8e, 0x5e,
-	0xbd, 0xf6, 0xa0, 0x12, 0xe7, 0x5c, 0x94, 0x29, 0xca, 0x92, 0x95, 0x20, 0xec, 0x4d, 0x31, 0xf7,
-	0xc4, 0x9b, 0x4a, 0xfd, 0xd5, 0xdf, 0xb9, 0xbf, 0xe1, 0xed, 0x4b, 0xe7, 0xfe, 0x91, 0x13, 0x38,
-	0x34, 0x8f, 0x6e, 0x9f, 0xd9, 0xb9, 0xc3, 0xd3, 0xfe, 0xc8, 0x54, 0x7e, 0x0d, 0x59, 0x13, 0x9b,
-	0x35, 0xb9, 0x98, 0x35, 0x39, 0x75, 0xfc, 0xe9, 0x55, 0x6b, 0xeb, 0xf1, 0xef, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x2c, 0xd1, 0x8e, 0x76, 0xc7, 0x04, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/cloudprofiler/v2/profiler.pb.go b/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
index 73a1653307..d2e75725f0 100644
--- a/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
+++ b/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudprofiler/v2/profiler.proto
 
-package cloudprofiler // import "google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package cloudprofiler
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // ProfileType is type of profiling data.
 // NOTE: the enumeration member names are used (in lowercase) as unique string
@@ -67,6 +67,7 @@ var ProfileType_name = map[int32]string{
 	6: "PEAK_HEAP",
 	7: "HEAP_ALLOC",
 }
+
 var ProfileType_value = map[string]int32{
 	"PROFILE_TYPE_UNSPECIFIED": 0,
 	"CPU":                      1,
@@ -81,8 +82,9 @@ var ProfileType_value = map[string]int32{
 func (x ProfileType) String() string {
 	return proto.EnumName(ProfileType_name, int32(x))
 }
+
 func (ProfileType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_profiler_852d4daf34af2ab9, []int{0}
+	return fileDescriptor_74a10a5851161432, []int{0}
 }
 
 // CreateProfileRequest describes a profile resource online creation request.
@@ -105,16 +107,17 @@ func (m *CreateProfileRequest) Reset()         { *m = CreateProfileRequest{} }
 func (m *CreateProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateProfileRequest) ProtoMessage()    {}
 func (*CreateProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profiler_852d4daf34af2ab9, []int{0}
+	return fileDescriptor_74a10a5851161432, []int{0}
 }
+
 func (m *CreateProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateProfileRequest.Unmarshal(m, b)
 }
 func (m *CreateProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateProfileRequest.Merge(dst, src)
+func (m *CreateProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProfileRequest.Merge(m, src)
 }
 func (m *CreateProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateProfileRequest.Size(m)
@@ -162,16 +165,17 @@ func (m *CreateOfflineProfileRequest) Reset()         { *m = CreateOfflineProfil
 func (m *CreateOfflineProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateOfflineProfileRequest) ProtoMessage()    {}
 func (*CreateOfflineProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profiler_852d4daf34af2ab9, []int{1}
+	return fileDescriptor_74a10a5851161432, []int{1}
 }
+
 func (m *CreateOfflineProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateOfflineProfileRequest.Unmarshal(m, b)
 }
 func (m *CreateOfflineProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateOfflineProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateOfflineProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateOfflineProfileRequest.Merge(dst, src)
+func (m *CreateOfflineProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateOfflineProfileRequest.Merge(m, src)
 }
 func (m *CreateOfflineProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateOfflineProfileRequest.Size(m)
@@ -214,16 +218,17 @@ func (m *UpdateProfileRequest) Reset()         { *m = UpdateProfileRequest{} }
 func (m *UpdateProfileRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateProfileRequest) ProtoMessage()    {}
 func (*UpdateProfileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profiler_852d4daf34af2ab9, []int{2}
+	return fileDescriptor_74a10a5851161432, []int{2}
 }
+
 func (m *UpdateProfileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateProfileRequest.Unmarshal(m, b)
 }
 func (m *UpdateProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateProfileRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateProfileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateProfileRequest.Merge(dst, src)
+func (m *UpdateProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProfileRequest.Merge(m, src)
 }
 func (m *UpdateProfileRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateProfileRequest.Size(m)
@@ -281,16 +286,17 @@ func (m *Profile) Reset()         { *m = Profile{} }
 func (m *Profile) String() string { return proto.CompactTextString(m) }
 func (*Profile) ProtoMessage()    {}
 func (*Profile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profiler_852d4daf34af2ab9, []int{3}
+	return fileDescriptor_74a10a5851161432, []int{3}
 }
+
 func (m *Profile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Profile.Unmarshal(m, b)
 }
 func (m *Profile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Profile.Marshal(b, m, deterministic)
 }
-func (dst *Profile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Profile.Merge(dst, src)
+func (m *Profile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Profile.Merge(m, src)
 }
 func (m *Profile) XXX_Size() int {
 	return xxx_messageInfo_Profile.Size(m)
@@ -378,16 +384,17 @@ func (m *Deployment) Reset()         { *m = Deployment{} }
 func (m *Deployment) String() string { return proto.CompactTextString(m) }
 func (*Deployment) ProtoMessage()    {}
 func (*Deployment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_profiler_852d4daf34af2ab9, []int{4}
+	return fileDescriptor_74a10a5851161432, []int{4}
 }
+
 func (m *Deployment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Deployment.Unmarshal(m, b)
 }
 func (m *Deployment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Deployment.Marshal(b, m, deterministic)
 }
-func (dst *Deployment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Deployment.Merge(dst, src)
+func (m *Deployment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployment.Merge(m, src)
 }
 func (m *Deployment) XXX_Size() int {
 	return xxx_messageInfo_Deployment.Size(m)
@@ -420,6 +427,7 @@ func (m *Deployment) GetLabels() map[string]string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.cloudprofiler.v2.ProfileType", ProfileType_name, ProfileType_value)
 	proto.RegisterType((*CreateProfileRequest)(nil), "google.devtools.cloudprofiler.v2.CreateProfileRequest")
 	proto.RegisterType((*CreateOfflineProfileRequest)(nil), "google.devtools.cloudprofiler.v2.CreateOfflineProfileRequest")
 	proto.RegisterType((*UpdateProfileRequest)(nil), "google.devtools.cloudprofiler.v2.UpdateProfileRequest")
@@ -427,7 +435,64 @@ func init() {
 	proto.RegisterMapType((map[string]string)(nil), "google.devtools.cloudprofiler.v2.Profile.LabelsEntry")
 	proto.RegisterType((*Deployment)(nil), "google.devtools.cloudprofiler.v2.Deployment")
 	proto.RegisterMapType((map[string]string)(nil), "google.devtools.cloudprofiler.v2.Deployment.LabelsEntry")
-	proto.RegisterEnum("google.devtools.cloudprofiler.v2.ProfileType", ProfileType_name, ProfileType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/cloudprofiler/v2/profiler.proto", fileDescriptor_74a10a5851161432)
+}
+
+var fileDescriptor_74a10a5851161432 = []byte{
+	// 786 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5f, 0x6f, 0xda, 0x56,
+	0x14, 0xdf, 0xc5, 0x04, 0xc2, 0x71, 0xc8, 0xac, 0xab, 0x68, 0x62, 0x2c, 0xdb, 0x2c, 0x4f, 0x93,
+	0x18, 0xdb, 0x6c, 0xc9, 0x51, 0xa6, 0xfc, 0x51, 0x34, 0x11, 0x70, 0x14, 0x34, 0x02, 0x96, 0x43,
+	0x34, 0x6d, 0x2f, 0xc8, 0xe0, 0x0b, 0x72, 0x63, 0x6c, 0xd7, 0x36, 0x48, 0xb4, 0xca, 0x4b, 0xd5,
+	0x6f, 0xd0, 0x97, 0xbe, 0xf5, 0xa1, 0x0f, 0x7d, 0xea, 0x87, 0xe8, 0x17, 0xa8, 0x2a, 0xf5, 0x2b,
+	0xf4, 0x83, 0x54, 0xb6, 0xaf, 0x09, 0x24, 0x44, 0x90, 0xa6, 0x6f, 0xe7, 0xde, 0x7b, 0xce, 0xcf,
+	0xbf, 0xdf, 0xb9, 0xc7, 0x3f, 0x1b, 0xa4, 0x81, 0xe3, 0x0c, 0x2c, 0x22, 0x19, 0x64, 0x1c, 0x38,
+	0x8e, 0xe5, 0x4b, 0x3d, 0xcb, 0x19, 0x19, 0xae, 0xe7, 0xf4, 0x4d, 0x8b, 0x78, 0xd2, 0x58, 0x96,
+	0x92, 0x58, 0x74, 0x3d, 0x27, 0x70, 0x30, 0x1f, 0x17, 0x88, 0x49, 0x81, 0x38, 0x57, 0x20, 0x8e,
+	0xe5, 0xe2, 0x36, 0x85, 0xd4, 0x5d, 0x53, 0xd2, 0x6d, 0xdb, 0x09, 0xf4, 0xc0, 0x74, 0x6c, 0x3f,
+	0xae, 0x2f, 0xfe, 0x44, 0x4f, 0xa3, 0x55, 0x77, 0xd4, 0x97, 0x8c, 0x91, 0x17, 0x25, 0xd0, 0x73,
+	0xfe, 0xe6, 0x79, 0xdf, 0x24, 0x96, 0xd1, 0x19, 0xea, 0xfe, 0x25, 0xcd, 0xf8, 0xf9, 0x66, 0x46,
+	0x60, 0x0e, 0x89, 0x1f, 0xe8, 0x43, 0x37, 0x4e, 0x10, 0xde, 0x23, 0xd8, 0xaa, 0x7a, 0x44, 0x0f,
+	0x88, 0x1a, 0xd3, 0xd2, 0xc8, 0xe3, 0x11, 0xf1, 0x03, 0xfc, 0x1d, 0x64, 0x5c, 0xdd, 0x23, 0x76,
+	0x50, 0x48, 0xf3, 0xa8, 0x94, 0xd3, 0xe8, 0x0a, 0x37, 0x00, 0x0c, 0xe2, 0x5a, 0xce, 0x64, 0x18,
+	0x9e, 0x21, 0x1e, 0x95, 0x58, 0xf9, 0x0f, 0x71, 0x99, 0x50, 0xb1, 0x36, 0xad, 0xd1, 0x66, 0xea,
+	0xb1, 0x0a, 0x1b, 0x34, 0xab, 0x13, 0x4c, 0x5c, 0x52, 0x48, 0xf1, 0x4c, 0x69, 0x53, 0xfe, 0x73,
+	0x39, 0x1e, 0x65, 0xdb, 0x9e, 0xb8, 0x44, 0x63, 0xdd, 0xeb, 0x85, 0xf0, 0x04, 0x7e, 0x88, 0xf5,
+	0xb4, 0xfa, 0x7d, 0xcb, 0xb4, 0xef, 0x96, 0x85, 0xe6, 0x64, 0x55, 0x21, 0x4b, 0x51, 0x0a, 0xa9,
+	0x48, 0xd3, 0x6f, 0x2b, 0x73, 0xd0, 0x92, 0x4a, 0xe1, 0x25, 0x82, 0xad, 0x0b, 0xd7, 0xb8, 0xdd,
+	0xcc, 0x19, 0x74, 0xf4, 0xa5, 0xe8, 0xf8, 0x10, 0xd8, 0x51, 0x04, 0x1e, 0x5d, 0x30, 0xa5, 0x59,
+	0x4c, 0x80, 0x92, 0x1b, 0x16, 0x4f, 0xc2, 0x19, 0x38, 0xd3, 0xfd, 0x4b, 0x0d, 0xe2, 0xf4, 0x30,
+	0x16, 0x5e, 0x33, 0x90, 0xa5, 0x88, 0x18, 0x43, 0xda, 0xd6, 0x87, 0x84, 0x76, 0x20, 0x8a, 0x17,
+	0x5c, 0x04, 0x7a, 0xd8, 0x45, 0xdc, 0x18, 0x14, 0xe6, 0x81, 0x83, 0xb2, 0x0b, 0xeb, 0xc9, 0xf0,
+	0x47, 0x03, 0xc9, 0xca, 0xdf, 0xdf, 0x52, 0x5e, 0xa3, 0x09, 0xda, 0x34, 0x15, 0xff, 0x02, 0xf9,
+	0x44, 0x56, 0x77, 0x12, 0x10, 0xbf, 0xb0, 0xc6, 0xa3, 0xd2, 0x86, 0x96, 0x68, 0x3d, 0x0e, 0xf7,
+	0xf0, 0x19, 0x64, 0x2c, 0xbd, 0x4b, 0x2c, 0xbf, 0x90, 0xe1, 0x99, 0x12, 0x2b, 0xef, 0xae, 0xac,
+	0x5a, 0x6c, 0x44, 0x75, 0x8a, 0x1d, 0x78, 0x13, 0x8d, 0x82, 0x14, 0xf7, 0x81, 0x9d, 0xd9, 0xc6,
+	0x1c, 0x30, 0x97, 0x64, 0x42, 0x9b, 0x1d, 0x86, 0x78, 0x0b, 0xd6, 0xc6, 0xba, 0x35, 0x8a, 0x9b,
+	0x9c, 0xd3, 0xe2, 0xc5, 0x41, 0x6a, 0x0f, 0x09, 0x1f, 0x10, 0xc0, 0x75, 0x03, 0xf0, 0x8f, 0x00,
+	0xae, 0xe7, 0x3c, 0x22, 0xbd, 0xa0, 0x63, 0x1a, 0x14, 0x21, 0x47, 0x77, 0xea, 0x46, 0x38, 0xcb,
+	0x81, 0xee, 0x0d, 0x48, 0x40, 0x81, 0xe8, 0x0a, 0xab, 0x53, 0x3d, 0x4c, 0xa4, 0x67, 0xef, 0x3e,
+	0x5d, 0xff, 0xca, 0x92, 0xca, 0xcf, 0x11, 0xb0, 0x33, 0x33, 0x82, 0xb7, 0xa1, 0xa0, 0x6a, 0xad,
+	0x93, 0x7a, 0x43, 0xe9, 0xb4, 0xff, 0x53, 0x95, 0xce, 0x45, 0xf3, 0x5c, 0x55, 0xaa, 0xf5, 0x93,
+	0xba, 0x52, 0xe3, 0xbe, 0xc1, 0x59, 0x60, 0xaa, 0xea, 0x05, 0x87, 0xf0, 0x3a, 0xa4, 0xff, 0xad,
+	0x34, 0x1a, 0x5c, 0x2a, 0x8c, 0x4e, 0x95, 0x8a, 0xca, 0x31, 0x98, 0x85, 0x6c, 0xfb, 0x54, 0x53,
+	0x2a, 0xb5, 0x73, 0x2e, 0x8d, 0x37, 0x01, 0xaa, 0xad, 0x66, 0x5b, 0x69, 0xb6, 0xeb, 0xad, 0x26,
+	0xb7, 0x86, 0xf3, 0x90, 0x53, 0x95, 0xca, 0x3f, 0x9d, 0x28, 0x37, 0x13, 0x1e, 0x87, 0x51, 0xa7,
+	0xd2, 0x68, 0xb4, 0xaa, 0x5c, 0x56, 0x7e, 0x93, 0x86, 0x6f, 0x29, 0x0d, 0xef, 0x9c, 0x78, 0x63,
+	0xb3, 0x47, 0xf0, 0x2b, 0x04, 0xf9, 0x39, 0xef, 0xc3, 0x7f, 0x2d, 0xef, 0xd4, 0x22, 0xb3, 0x2c,
+	0xae, 0xfe, 0x3a, 0x0b, 0xbf, 0x3f, 0xfb, 0xf8, 0xe9, 0x45, 0xea, 0x57, 0x81, 0x0f, 0xbf, 0x17,
+	0x4f, 0x63, 0xf7, 0x39, 0xa2, 0x77, 0xea, 0x4b, 0xe5, 0xab, 0xe4, 0x1b, 0xe2, 0x1f, 0xa0, 0x32,
+	0x7e, 0x37, 0x75, 0xe7, 0x79, 0x37, 0xc3, 0x47, 0xab, 0x12, 0x5d, 0xe8, 0x82, 0xf7, 0xe1, 0xfb,
+	0x77, 0xc4, 0x77, 0x5f, 0x10, 0x97, 0xf2, 0xed, 0xcd, 0x3e, 0xf0, 0x60, 0x6a, 0x5b, 0x6f, 0x11,
+	0xe4, 0xe7, 0x4c, 0x71, 0x95, 0x2e, 0x2f, 0x72, 0xd1, 0xfb, 0xb0, 0xde, 0x8f, 0x58, 0xef, 0xc8,
+	0xa5, 0x98, 0x35, 0x7d, 0x5b, 0x43, 0xa7, 0x9b, 0xe1, 0x3e, 0xa5, 0x2e, 0x95, 0xaf, 0xa6, 0x7c,
+	0x8f, 0x5b, 0xff, 0x9f, 0xd1, 0xc7, 0x0c, 0x1c, 0x4b, 0xb7, 0x07, 0xa2, 0xe3, 0x0d, 0xa4, 0x01,
+	0xb1, 0x23, 0x9b, 0xa1, 0xbf, 0x00, 0xba, 0x6b, 0xfa, 0x77, 0xff, 0x06, 0x1c, 0xce, 0x6d, 0x74,
+	0x33, 0x51, 0xe5, 0xce, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x08, 0x2b, 0x60, 0x3f, 0x08,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -607,61 +672,3 @@ var _ProfilerService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/cloudprofiler/v2/profiler.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/cloudprofiler/v2/profiler.proto", fileDescriptor_profiler_852d4daf34af2ab9)
-}
-
-var fileDescriptor_profiler_852d4daf34af2ab9 = []byte{
-	// 786 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5f, 0x6f, 0xda, 0x56,
-	0x14, 0xdf, 0xc5, 0x04, 0xc2, 0x71, 0xc8, 0xac, 0xab, 0x68, 0x62, 0x2c, 0xdb, 0x2c, 0x4f, 0x93,
-	0x18, 0xdb, 0x6c, 0xc9, 0x51, 0xa6, 0xfc, 0x51, 0x34, 0x11, 0x70, 0x14, 0x34, 0x02, 0x96, 0x43,
-	0x34, 0x6d, 0x2f, 0xc8, 0xe0, 0x0b, 0x72, 0x63, 0x6c, 0xd7, 0x36, 0x48, 0xb4, 0xca, 0x4b, 0xd5,
-	0x6f, 0xd0, 0x97, 0xbe, 0xf5, 0xa1, 0x0f, 0x7d, 0xea, 0x87, 0xe8, 0x17, 0xa8, 0x2a, 0xf5, 0x2b,
-	0xf4, 0x83, 0x54, 0xb6, 0xaf, 0x09, 0x24, 0x44, 0x90, 0xa6, 0x6f, 0xe7, 0xde, 0x7b, 0xce, 0xcf,
-	0xbf, 0xdf, 0xb9, 0xc7, 0x3f, 0x1b, 0xa4, 0x81, 0xe3, 0x0c, 0x2c, 0x22, 0x19, 0x64, 0x1c, 0x38,
-	0x8e, 0xe5, 0x4b, 0x3d, 0xcb, 0x19, 0x19, 0xae, 0xe7, 0xf4, 0x4d, 0x8b, 0x78, 0xd2, 0x58, 0x96,
-	0x92, 0x58, 0x74, 0x3d, 0x27, 0x70, 0x30, 0x1f, 0x17, 0x88, 0x49, 0x81, 0x38, 0x57, 0x20, 0x8e,
-	0xe5, 0xe2, 0x36, 0x85, 0xd4, 0x5d, 0x53, 0xd2, 0x6d, 0xdb, 0x09, 0xf4, 0xc0, 0x74, 0x6c, 0x3f,
-	0xae, 0x2f, 0xfe, 0x44, 0x4f, 0xa3, 0x55, 0x77, 0xd4, 0x97, 0x8c, 0x91, 0x17, 0x25, 0xd0, 0x73,
-	0xfe, 0xe6, 0x79, 0xdf, 0x24, 0x96, 0xd1, 0x19, 0xea, 0xfe, 0x25, 0xcd, 0xf8, 0xf9, 0x66, 0x46,
-	0x60, 0x0e, 0x89, 0x1f, 0xe8, 0x43, 0x37, 0x4e, 0x10, 0xde, 0x23, 0xd8, 0xaa, 0x7a, 0x44, 0x0f,
-	0x88, 0x1a, 0xd3, 0xd2, 0xc8, 0xe3, 0x11, 0xf1, 0x03, 0xfc, 0x1d, 0x64, 0x5c, 0xdd, 0x23, 0x76,
-	0x50, 0x48, 0xf3, 0xa8, 0x94, 0xd3, 0xe8, 0x0a, 0x37, 0x00, 0x0c, 0xe2, 0x5a, 0xce, 0x64, 0x18,
-	0x9e, 0x21, 0x1e, 0x95, 0x58, 0xf9, 0x0f, 0x71, 0x99, 0x50, 0xb1, 0x36, 0xad, 0xd1, 0x66, 0xea,
-	0xb1, 0x0a, 0x1b, 0x34, 0xab, 0x13, 0x4c, 0x5c, 0x52, 0x48, 0xf1, 0x4c, 0x69, 0x53, 0xfe, 0x73,
-	0x39, 0x1e, 0x65, 0xdb, 0x9e, 0xb8, 0x44, 0x63, 0xdd, 0xeb, 0x85, 0xf0, 0x04, 0x7e, 0x88, 0xf5,
-	0xb4, 0xfa, 0x7d, 0xcb, 0xb4, 0xef, 0x96, 0x85, 0xe6, 0x64, 0x55, 0x21, 0x4b, 0x51, 0x0a, 0xa9,
-	0x48, 0xd3, 0x6f, 0x2b, 0x73, 0xd0, 0x92, 0x4a, 0xe1, 0x25, 0x82, 0xad, 0x0b, 0xd7, 0xb8, 0xdd,
-	0xcc, 0x19, 0x74, 0xf4, 0xa5, 0xe8, 0xf8, 0x10, 0xd8, 0x51, 0x04, 0x1e, 0x5d, 0x30, 0xa5, 0x59,
-	0x4c, 0x80, 0x92, 0x1b, 0x16, 0x4f, 0xc2, 0x19, 0x38, 0xd3, 0xfd, 0x4b, 0x0d, 0xe2, 0xf4, 0x30,
-	0x16, 0x5e, 0x33, 0x90, 0xa5, 0x88, 0x18, 0x43, 0xda, 0xd6, 0x87, 0x84, 0x76, 0x20, 0x8a, 0x17,
-	0x5c, 0x04, 0x7a, 0xd8, 0x45, 0xdc, 0x18, 0x14, 0xe6, 0x81, 0x83, 0xb2, 0x0b, 0xeb, 0xc9, 0xf0,
-	0x47, 0x03, 0xc9, 0xca, 0xdf, 0xdf, 0x52, 0x5e, 0xa3, 0x09, 0xda, 0x34, 0x15, 0xff, 0x02, 0xf9,
-	0x44, 0x56, 0x77, 0x12, 0x10, 0xbf, 0xb0, 0xc6, 0xa3, 0xd2, 0x86, 0x96, 0x68, 0x3d, 0x0e, 0xf7,
-	0xf0, 0x19, 0x64, 0x2c, 0xbd, 0x4b, 0x2c, 0xbf, 0x90, 0xe1, 0x99, 0x12, 0x2b, 0xef, 0xae, 0xac,
-	0x5a, 0x6c, 0x44, 0x75, 0x8a, 0x1d, 0x78, 0x13, 0x8d, 0x82, 0x14, 0xf7, 0x81, 0x9d, 0xd9, 0xc6,
-	0x1c, 0x30, 0x97, 0x64, 0x42, 0x9b, 0x1d, 0x86, 0x78, 0x0b, 0xd6, 0xc6, 0xba, 0x35, 0x8a, 0x9b,
-	0x9c, 0xd3, 0xe2, 0xc5, 0x41, 0x6a, 0x0f, 0x09, 0x1f, 0x10, 0xc0, 0x75, 0x03, 0xf0, 0x8f, 0x00,
-	0xae, 0xe7, 0x3c, 0x22, 0xbd, 0xa0, 0x63, 0x1a, 0x14, 0x21, 0x47, 0x77, 0xea, 0x46, 0x38, 0xcb,
-	0x81, 0xee, 0x0d, 0x48, 0x40, 0x81, 0xe8, 0x0a, 0xab, 0x53, 0x3d, 0x4c, 0xa4, 0x67, 0xef, 0x3e,
-	0x5d, 0xff, 0xca, 0x92, 0xca, 0xcf, 0x11, 0xb0, 0x33, 0x33, 0x82, 0xb7, 0xa1, 0xa0, 0x6a, 0xad,
-	0x93, 0x7a, 0x43, 0xe9, 0xb4, 0xff, 0x53, 0x95, 0xce, 0x45, 0xf3, 0x5c, 0x55, 0xaa, 0xf5, 0x93,
-	0xba, 0x52, 0xe3, 0xbe, 0xc1, 0x59, 0x60, 0xaa, 0xea, 0x05, 0x87, 0xf0, 0x3a, 0xa4, 0xff, 0xad,
-	0x34, 0x1a, 0x5c, 0x2a, 0x8c, 0x4e, 0x95, 0x8a, 0xca, 0x31, 0x98, 0x85, 0x6c, 0xfb, 0x54, 0x53,
-	0x2a, 0xb5, 0x73, 0x2e, 0x8d, 0x37, 0x01, 0xaa, 0xad, 0x66, 0x5b, 0x69, 0xb6, 0xeb, 0xad, 0x26,
-	0xb7, 0x86, 0xf3, 0x90, 0x53, 0x95, 0xca, 0x3f, 0x9d, 0x28, 0x37, 0x13, 0x1e, 0x87, 0x51, 0xa7,
-	0xd2, 0x68, 0xb4, 0xaa, 0x5c, 0x56, 0x7e, 0x93, 0x86, 0x6f, 0x29, 0x0d, 0xef, 0x9c, 0x78, 0x63,
-	0xb3, 0x47, 0xf0, 0x2b, 0x04, 0xf9, 0x39, 0xef, 0xc3, 0x7f, 0x2d, 0xef, 0xd4, 0x22, 0xb3, 0x2c,
-	0xae, 0xfe, 0x3a, 0x0b, 0xbf, 0x3f, 0xfb, 0xf8, 0xe9, 0x45, 0xea, 0x57, 0x81, 0x0f, 0xbf, 0x17,
-	0x4f, 0x63, 0xf7, 0x39, 0xa2, 0x77, 0xea, 0x4b, 0xe5, 0xab, 0xe4, 0x1b, 0xe2, 0x1f, 0xa0, 0x32,
-	0x7e, 0x37, 0x75, 0xe7, 0x79, 0x37, 0xc3, 0x47, 0xab, 0x12, 0x5d, 0xe8, 0x82, 0xf7, 0xe1, 0xfb,
-	0x77, 0xc4, 0x77, 0x5f, 0x10, 0x97, 0xf2, 0xed, 0xcd, 0x3e, 0xf0, 0x60, 0x6a, 0x5b, 0x6f, 0x11,
-	0xe4, 0xe7, 0x4c, 0x71, 0x95, 0x2e, 0x2f, 0x72, 0xd1, 0xfb, 0xb0, 0xde, 0x8f, 0x58, 0xef, 0xc8,
-	0xa5, 0x98, 0x35, 0x7d, 0x5b, 0x43, 0xa7, 0x9b, 0xe1, 0x3e, 0xa5, 0x2e, 0x95, 0xaf, 0xa6, 0x7c,
-	0x8f, 0x5b, 0xff, 0x9f, 0xd1, 0xc7, 0x0c, 0x1c, 0x4b, 0xb7, 0x07, 0xa2, 0xe3, 0x0d, 0xa4, 0x01,
-	0xb1, 0x23, 0x9b, 0xa1, 0xbf, 0x00, 0xba, 0x6b, 0xfa, 0x77, 0xff, 0x06, 0x1c, 0xce, 0x6d, 0x74,
-	0x33, 0x51, 0xe5, 0xce, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x08, 0x2b, 0x60, 0x3f, 0x08,
-	0x00, 0x00,
-}
diff --git a/googleapis/devtools/cloudtrace/v1/trace.pb.go b/googleapis/devtools/cloudtrace/v1/trace.pb.go
index 0f5afcf8de..3c3ba6228c 100644
--- a/googleapis/devtools/cloudtrace/v1/trace.pb.go
+++ b/googleapis/devtools/cloudtrace/v1/trace.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v1/trace.proto
 
-package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package cloudtrace
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Type of span. Can be used to specify additional relationships between spans
 // in addition to a parent/child relationship.
@@ -46,6 +46,7 @@ var TraceSpan_SpanKind_name = map[int32]string{
 	1: "RPC_SERVER",
 	2: "RPC_CLIENT",
 }
+
 var TraceSpan_SpanKind_value = map[string]int32{
 	"SPAN_KIND_UNSPECIFIED": 0,
 	"RPC_SERVER":            1,
@@ -55,8 +56,9 @@ var TraceSpan_SpanKind_value = map[string]int32{
 func (x TraceSpan_SpanKind) String() string {
 	return proto.EnumName(TraceSpan_SpanKind_name, int32(x))
 }
+
 func (TraceSpan_SpanKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{2, 0}
+	return fileDescriptor_91f8d9fbc62846cf, []int{2, 0}
 }
 
 // Type of data returned for traces in the list.
@@ -83,6 +85,7 @@ var ListTracesRequest_ViewType_name = map[int32]string{
 	2: "ROOTSPAN",
 	3: "COMPLETE",
 }
+
 var ListTracesRequest_ViewType_value = map[string]int32{
 	"VIEW_TYPE_UNSPECIFIED": 0,
 	"MINIMAL":               1,
@@ -93,8 +96,9 @@ var ListTracesRequest_ViewType_value = map[string]int32{
 func (x ListTracesRequest_ViewType) String() string {
 	return proto.EnumName(ListTracesRequest_ViewType_name, int32(x))
 }
+
 func (ListTracesRequest_ViewType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{3, 0}
+	return fileDescriptor_91f8d9fbc62846cf, []int{3, 0}
 }
 
 // A trace describes how long it takes for an application to perform an
@@ -117,16 +121,17 @@ func (m *Trace) Reset()         { *m = Trace{} }
 func (m *Trace) String() string { return proto.CompactTextString(m) }
 func (*Trace) ProtoMessage()    {}
 func (*Trace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{0}
+	return fileDescriptor_91f8d9fbc62846cf, []int{0}
 }
+
 func (m *Trace) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Trace.Unmarshal(m, b)
 }
 func (m *Trace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Trace.Marshal(b, m, deterministic)
 }
-func (dst *Trace) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Trace.Merge(dst, src)
+func (m *Trace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Trace.Merge(m, src)
 }
 func (m *Trace) XXX_Size() int {
 	return xxx_messageInfo_Trace.Size(m)
@@ -171,16 +176,17 @@ func (m *Traces) Reset()         { *m = Traces{} }
 func (m *Traces) String() string { return proto.CompactTextString(m) }
 func (*Traces) ProtoMessage()    {}
 func (*Traces) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{1}
+	return fileDescriptor_91f8d9fbc62846cf, []int{1}
 }
+
 func (m *Traces) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Traces.Unmarshal(m, b)
 }
 func (m *Traces) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Traces.Marshal(b, m, deterministic)
 }
-func (dst *Traces) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Traces.Merge(dst, src)
+func (m *Traces) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Traces.Merge(m, src)
 }
 func (m *Traces) XXX_Size() int {
 	return xxx_messageInfo_Traces.Size(m)
@@ -270,16 +276,17 @@ func (m *TraceSpan) Reset()         { *m = TraceSpan{} }
 func (m *TraceSpan) String() string { return proto.CompactTextString(m) }
 func (*TraceSpan) ProtoMessage()    {}
 func (*TraceSpan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{2}
+	return fileDescriptor_91f8d9fbc62846cf, []int{2}
 }
+
 func (m *TraceSpan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TraceSpan.Unmarshal(m, b)
 }
 func (m *TraceSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TraceSpan.Marshal(b, m, deterministic)
 }
-func (dst *TraceSpan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TraceSpan.Merge(dst, src)
+func (m *TraceSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TraceSpan.Merge(m, src)
 }
 func (m *TraceSpan) XXX_Size() int {
 	return xxx_messageInfo_TraceSpan.Size(m)
@@ -414,16 +421,17 @@ func (m *ListTracesRequest) Reset()         { *m = ListTracesRequest{} }
 func (m *ListTracesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTracesRequest) ProtoMessage()    {}
 func (*ListTracesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{3}
+	return fileDescriptor_91f8d9fbc62846cf, []int{3}
 }
+
 func (m *ListTracesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTracesRequest.Unmarshal(m, b)
 }
 func (m *ListTracesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTracesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTracesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTracesRequest.Merge(dst, src)
+func (m *ListTracesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTracesRequest.Merge(m, src)
 }
 func (m *ListTracesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTracesRequest.Size(m)
@@ -507,16 +515,17 @@ func (m *ListTracesResponse) Reset()         { *m = ListTracesResponse{} }
 func (m *ListTracesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTracesResponse) ProtoMessage()    {}
 func (*ListTracesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{4}
+	return fileDescriptor_91f8d9fbc62846cf, []int{4}
 }
+
 func (m *ListTracesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTracesResponse.Unmarshal(m, b)
 }
 func (m *ListTracesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTracesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTracesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTracesResponse.Merge(dst, src)
+func (m *ListTracesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTracesResponse.Merge(m, src)
 }
 func (m *ListTracesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTracesResponse.Size(m)
@@ -556,16 +565,17 @@ func (m *GetTraceRequest) Reset()         { *m = GetTraceRequest{} }
 func (m *GetTraceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTraceRequest) ProtoMessage()    {}
 func (*GetTraceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{5}
+	return fileDescriptor_91f8d9fbc62846cf, []int{5}
 }
+
 func (m *GetTraceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTraceRequest.Unmarshal(m, b)
 }
 func (m *GetTraceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTraceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTraceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTraceRequest.Merge(dst, src)
+func (m *GetTraceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTraceRequest.Merge(m, src)
 }
 func (m *GetTraceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTraceRequest.Size(m)
@@ -605,16 +615,17 @@ func (m *PatchTracesRequest) Reset()         { *m = PatchTracesRequest{} }
 func (m *PatchTracesRequest) String() string { return proto.CompactTextString(m) }
 func (*PatchTracesRequest) ProtoMessage()    {}
 func (*PatchTracesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_6c7185ebccf38983, []int{6}
+	return fileDescriptor_91f8d9fbc62846cf, []int{6}
 }
+
 func (m *PatchTracesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PatchTracesRequest.Unmarshal(m, b)
 }
 func (m *PatchTracesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PatchTracesRequest.Marshal(b, m, deterministic)
 }
-func (dst *PatchTracesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PatchTracesRequest.Merge(dst, src)
+func (m *PatchTracesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PatchTracesRequest.Merge(m, src)
 }
 func (m *PatchTracesRequest) XXX_Size() int {
 	return xxx_messageInfo_PatchTracesRequest.Size(m)
@@ -640,6 +651,8 @@ func (m *PatchTracesRequest) GetTraces() *Traces {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.cloudtrace.v1.TraceSpan_SpanKind", TraceSpan_SpanKind_name, TraceSpan_SpanKind_value)
+	proto.RegisterEnum("google.devtools.cloudtrace.v1.ListTracesRequest_ViewType", ListTracesRequest_ViewType_name, ListTracesRequest_ViewType_value)
 	proto.RegisterType((*Trace)(nil), "google.devtools.cloudtrace.v1.Trace")
 	proto.RegisterType((*Traces)(nil), "google.devtools.cloudtrace.v1.Traces")
 	proto.RegisterType((*TraceSpan)(nil), "google.devtools.cloudtrace.v1.TraceSpan")
@@ -648,8 +661,71 @@ func init() {
 	proto.RegisterType((*ListTracesResponse)(nil), "google.devtools.cloudtrace.v1.ListTracesResponse")
 	proto.RegisterType((*GetTraceRequest)(nil), "google.devtools.cloudtrace.v1.GetTraceRequest")
 	proto.RegisterType((*PatchTracesRequest)(nil), "google.devtools.cloudtrace.v1.PatchTracesRequest")
-	proto.RegisterEnum("google.devtools.cloudtrace.v1.TraceSpan_SpanKind", TraceSpan_SpanKind_name, TraceSpan_SpanKind_value)
-	proto.RegisterEnum("google.devtools.cloudtrace.v1.ListTracesRequest_ViewType", ListTracesRequest_ViewType_name, ListTracesRequest_ViewType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/cloudtrace/v1/trace.proto", fileDescriptor_91f8d9fbc62846cf)
+}
+
+var fileDescriptor_91f8d9fbc62846cf = []byte{
+	// 898 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
+	0x14, 0x66, 0xed, 0x78, 0x6d, 0x1f, 0x87, 0xd4, 0x8c, 0x68, 0x71, 0x5d, 0x2a, 0xc2, 0xaa, 0x20,
+	0x03, 0x62, 0xb7, 0x76, 0x41, 0x22, 0xe5, 0x47, 0x6a, 0xdc, 0x6d, 0xb4, 0x8a, 0xe3, 0xac, 0xd6,
+	0xc6, 0x08, 0x14, 0x69, 0x35, 0xf1, 0x4e, 0xcd, 0x12, 0x7b, 0x66, 0xd9, 0x99, 0xb8, 0x38, 0x55,
+	0x2f, 0xe0, 0x92, 0x5b, 0xc4, 0x15, 0x6f, 0xd0, 0x4b, 0x1e, 0x83, 0x3b, 0xc4, 0x2b, 0x20, 0xf1,
+	0x1a, 0x68, 0x66, 0x76, 0x9b, 0x28, 0x51, 0x63, 0x07, 0x6e, 0xa2, 0x39, 0x67, 0xce, 0xef, 0xf7,
+	0x7d, 0x93, 0x35, 0xbc, 0x37, 0x61, 0x6c, 0x32, 0x25, 0x4e, 0x44, 0xe6, 0x82, 0xb1, 0x29, 0x77,
+	0xc6, 0x53, 0x76, 0x1c, 0x89, 0x14, 0x8f, 0x89, 0x33, 0x6f, 0x3b, 0xea, 0x60, 0x27, 0x29, 0x13,
+	0x0c, 0xdd, 0xd6, 0xa1, 0x76, 0x1e, 0x6a, 0x9f, 0x86, 0xda, 0xf3, 0x76, 0xf3, 0xcd, 0xac, 0x12,
+	0x4e, 0x62, 0x07, 0x53, 0xca, 0x04, 0x16, 0x31, 0xa3, 0x5c, 0x27, 0x37, 0x6f, 0x65, 0xb7, 0xca,
+	0x3a, 0x3c, 0x7e, 0xec, 0x90, 0x59, 0x22, 0x16, 0xd9, 0xe5, 0x5b, 0xe7, 0x2f, 0x45, 0x3c, 0x23,
+	0x5c, 0xe0, 0x59, 0xa2, 0x03, 0xac, 0x1f, 0x0d, 0x28, 0x0d, 0x65, 0x23, 0x74, 0x1b, 0x20, 0x49,
+	0xd9, 0x77, 0x64, 0x2c, 0xc2, 0x38, 0x6a, 0x18, 0x9b, 0x46, 0xab, 0x1a, 0x54, 0x33, 0x8f, 0x17,
+	0xa1, 0x9b, 0x50, 0x51, 0x03, 0xc9, 0xcb, 0x82, 0xba, 0x2c, 0x2b, 0xdb, 0x8b, 0xd0, 0x17, 0x50,
+	0xe2, 0x09, 0xa6, 0xbc, 0x51, 0xdc, 0x2c, 0xb6, 0x6a, 0x9d, 0x96, 0x7d, 0xe9, 0x3a, 0xb6, 0x6a,
+	0x37, 0x48, 0x30, 0x0d, 0x74, 0x9a, 0xf5, 0x08, 0x4c, 0xe5, 0xe3, 0xe8, 0x33, 0x30, 0x55, 0x18,
+	0x6f, 0x18, 0xaa, 0xd4, 0x9d, 0x55, 0x4a, 0x05, 0x59, 0x8e, 0xf5, 0x4f, 0x11, 0xaa, 0x2f, 0x8a,
+	0xa3, 0x37, 0xa0, 0x2c, 0xcb, 0xe7, 0xcb, 0x98, 0x81, 0x29, 0x4d, 0x2f, 0x42, 0x2e, 0xac, 0x1d,
+	0xc5, 0x54, 0x6f, 0xb1, 0xd1, 0x69, 0xaf, 0x3a, 0xad, 0x2d, 0xff, 0xec, 0xc6, 0x34, 0x0a, 0x54,
+	0x3a, 0x42, 0xb0, 0x46, 0xf1, 0x8c, 0x34, 0x8a, 0x0a, 0x0c, 0x75, 0x46, 0x5b, 0x00, 0x5c, 0xe0,
+	0x54, 0x84, 0x12, 0xe6, 0xc6, 0xda, 0xa6, 0xd1, 0xaa, 0x75, 0x9a, 0x79, 0x83, 0x9c, 0x03, 0x7b,
+	0x98, 0x73, 0x10, 0x54, 0x55, 0xb4, 0xb4, 0xd1, 0xc7, 0x50, 0x21, 0x34, 0xd2, 0x89, 0xa5, 0xa5,
+	0x89, 0x65, 0x42, 0x23, 0x95, 0x76, 0x07, 0x36, 0x12, 0x9c, 0x12, 0x2a, 0xc2, 0x7c, 0x59, 0x53,
+	0x2d, 0xbb, 0xae, 0xbd, 0x03, 0xbd, 0x72, 0x0f, 0xcc, 0x29, 0x3e, 0x24, 0x53, 0xde, 0x28, 0x2b,
+	0x5c, 0x3f, 0x5a, 0x79, 0xe9, 0x9e, 0x4a, 0x73, 0xa9, 0x48, 0x17, 0x41, 0x56, 0xa3, 0xb9, 0x05,
+	0xb5, 0x33, 0x6e, 0x54, 0x87, 0xe2, 0x11, 0x59, 0x64, 0x8a, 0x91, 0x47, 0xf4, 0x3a, 0x94, 0xe6,
+	0x78, 0x7a, 0x4c, 0x32, 0xa1, 0x68, 0xe3, 0x7e, 0xe1, 0x13, 0xc3, 0x72, 0xa1, 0x92, 0xc3, 0x88,
+	0x6e, 0xc2, 0xf5, 0x81, 0xff, 0xa0, 0x1f, 0xee, 0x7a, 0xfd, 0x87, 0xe1, 0x97, 0xfd, 0x81, 0xef,
+	0x76, 0xbd, 0x47, 0x9e, 0xfb, 0xb0, 0xfe, 0x0a, 0xda, 0x00, 0x08, 0xfc, 0x6e, 0x38, 0x70, 0x83,
+	0x91, 0x1b, 0xd4, 0x8d, 0xdc, 0xee, 0xf6, 0x3c, 0xb7, 0x3f, 0xac, 0x17, 0xac, 0xdf, 0x8b, 0xf0,
+	0x5a, 0x2f, 0xe6, 0x42, 0xcb, 0x26, 0x20, 0xdf, 0x1f, 0x13, 0x2e, 0x96, 0x29, 0x78, 0x0f, 0xd6,
+	0xe6, 0x31, 0x79, 0x92, 0xf1, 0xbe, 0xb5, 0x04, 0x82, 0x0b, 0xe5, 0xed, 0x51, 0x4c, 0x9e, 0x0c,
+	0x17, 0x09, 0x09, 0x54, 0x19, 0x74, 0x0b, 0xaa, 0x09, 0x9e, 0x90, 0x90, 0xc7, 0x27, 0x5a, 0x04,
+	0xa5, 0xa0, 0x22, 0x1d, 0x83, 0xf8, 0x44, 0x3f, 0x26, 0x79, 0x29, 0xd8, 0x11, 0xa1, 0x4a, 0x08,
+	0x72, 0x14, 0x3c, 0x21, 0x43, 0xe9, 0x38, 0xa7, 0x93, 0xd2, 0x7f, 0xd5, 0x89, 0xb9, 0xba, 0x4e,
+	0x6e, 0x80, 0xf9, 0x38, 0x9e, 0x0a, 0x92, 0x36, 0xca, 0x6a, 0x98, 0xcc, 0x92, 0xcf, 0x9a, 0xa5,
+	0x11, 0x49, 0xc3, 0xc3, 0x45, 0xa3, 0xa2, 0x9f, 0xb5, 0xb2, 0xb7, 0x17, 0x56, 0x1f, 0x2a, 0xf9,
+	0xca, 0x92, 0xab, 0x91, 0xe7, 0x7e, 0x15, 0x0e, 0xbf, 0xf6, 0xdd, 0x73, 0x5c, 0xd5, 0xa0, 0xbc,
+	0xe7, 0xf5, 0xbd, 0xbd, 0x07, 0xbd, 0xba, 0x81, 0xd6, 0xa1, 0x12, 0xec, 0xef, 0x0f, 0x25, 0xaf,
+	0xf5, 0x82, 0xb4, 0xba, 0xfb, 0x7b, 0x7e, 0xcf, 0x1d, 0xba, 0xf5, 0xa2, 0x75, 0x02, 0xe8, 0x2c,
+	0xa8, 0x3c, 0x61, 0x94, 0x93, 0xff, 0xf7, 0xe4, 0xd1, 0xbb, 0x70, 0x8d, 0x92, 0x1f, 0x44, 0x78,
+	0x06, 0x6c, 0xad, 0xb9, 0x57, 0xa5, 0xdb, 0xcf, 0x01, 0xb7, 0x76, 0xe1, 0xda, 0x0e, 0xd1, 0xad,
+	0x57, 0x54, 0xcb, 0xcb, 0xff, 0xdf, 0x59, 0x29, 0x20, 0x1f, 0x8b, 0xf1, 0xb7, 0x57, 0x52, 0xdf,
+	0xe7, 0x2f, 0xf6, 0x2c, 0x28, 0xd6, 0xde, 0x59, 0x65, 0x4f, 0x9e, 0x2f, 0xda, 0xf9, 0xb3, 0x08,
+	0xeb, 0xfa, 0x55, 0x92, 0x74, 0x1e, 0x8f, 0x09, 0xfa, 0xcd, 0x00, 0x38, 0x85, 0x13, 0xdd, 0xbd,
+	0xaa, 0x9c, 0x9b, 0xed, 0x2b, 0x64, 0x68, 0xae, 0xac, 0xd6, 0x4f, 0x7f, 0xfd, 0xfd, 0x4b, 0xc1,
+	0x42, 0x9b, 0xf2, 0x03, 0x96, 0xad, 0xc6, 0x9d, 0xa7, 0xa7, 0x6b, 0x3f, 0x73, 0x32, 0x5e, 0x7e,
+	0x35, 0xa0, 0x92, 0x03, 0x8e, 0xec, 0x25, 0x9d, 0xce, 0x31, 0xd3, 0x5c, 0x49, 0x02, 0xd6, 0x3d,
+	0x35, 0xcc, 0x87, 0xe8, 0x83, 0x65, 0xc3, 0x38, 0x4f, 0x73, 0x22, 0x9f, 0xa1, 0x9f, 0x0d, 0xa8,
+	0x9d, 0xe1, 0x0e, 0x2d, 0x03, 0xe1, 0x22, 0xcf, 0xcd, 0x1b, 0x17, 0x9e, 0x9b, 0x2b, 0x3f, 0xb8,
+	0xd6, 0x5d, 0x35, 0xcf, 0xfb, 0x9d, 0xa5, 0xe0, 0xdc, 0xcf, 0x38, 0xdd, 0x7e, 0x6e, 0xc0, 0xdb,
+	0x63, 0x36, 0xbb, 0x7c, 0x84, 0x6d, 0x50, 0xed, 0x7d, 0xd9, 0xcc, 0x37, 0xbe, 0xd9, 0xc9, 0x82,
+	0x27, 0x6c, 0x8a, 0xe9, 0xc4, 0x66, 0xe9, 0xc4, 0x99, 0x10, 0xaa, 0x46, 0x71, 0xf4, 0x15, 0x4e,
+	0x62, 0xfe, 0x92, 0x1f, 0x1d, 0x9f, 0x9e, 0x5a, 0xcf, 0x0b, 0xd7, 0x77, 0x74, 0xa5, 0xae, 0xf4,
+	0x69, 0x4c, 0xed, 0x51, 0xfb, 0x8f, 0xdc, 0x7f, 0xa0, 0xfc, 0x07, 0xca, 0x7f, 0x30, 0x6a, 0x1f,
+	0x9a, 0xaa, 0xc7, 0xbd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x08, 0xd9, 0xf5, 0xea, 0xd7, 0x08,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -803,68 +879,3 @@ var _TraceService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/cloudtrace/v1/trace.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/cloudtrace/v1/trace.proto", fileDescriptor_trace_6c7185ebccf38983)
-}
-
-var fileDescriptor_trace_6c7185ebccf38983 = []byte{
-	// 898 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
-	0x14, 0x66, 0xed, 0x78, 0x6d, 0x1f, 0x87, 0xd4, 0x8c, 0x68, 0x71, 0x5d, 0x2a, 0xc2, 0xaa, 0x20,
-	0x03, 0x62, 0xb7, 0x76, 0x41, 0x22, 0xe5, 0x47, 0x6a, 0xdc, 0x6d, 0xb4, 0x8a, 0xe3, 0xac, 0xd6,
-	0xc6, 0x08, 0x14, 0x69, 0x35, 0xf1, 0x4e, 0xcd, 0x12, 0x7b, 0x66, 0xd9, 0x99, 0xb8, 0x38, 0x55,
-	0x2f, 0xe0, 0x92, 0x5b, 0xc4, 0x15, 0x6f, 0xd0, 0x4b, 0x1e, 0x83, 0x3b, 0xc4, 0x2b, 0x20, 0xf1,
-	0x1a, 0x68, 0x66, 0x76, 0x9b, 0x28, 0x51, 0x63, 0x07, 0x6e, 0xa2, 0x39, 0x67, 0xce, 0xef, 0xf7,
-	0x7d, 0x93, 0x35, 0xbc, 0x37, 0x61, 0x6c, 0x32, 0x25, 0x4e, 0x44, 0xe6, 0x82, 0xb1, 0x29, 0x77,
-	0xc6, 0x53, 0x76, 0x1c, 0x89, 0x14, 0x8f, 0x89, 0x33, 0x6f, 0x3b, 0xea, 0x60, 0x27, 0x29, 0x13,
-	0x0c, 0xdd, 0xd6, 0xa1, 0x76, 0x1e, 0x6a, 0x9f, 0x86, 0xda, 0xf3, 0x76, 0xf3, 0xcd, 0xac, 0x12,
-	0x4e, 0x62, 0x07, 0x53, 0xca, 0x04, 0x16, 0x31, 0xa3, 0x5c, 0x27, 0x37, 0x6f, 0x65, 0xb7, 0xca,
-	0x3a, 0x3c, 0x7e, 0xec, 0x90, 0x59, 0x22, 0x16, 0xd9, 0xe5, 0x5b, 0xe7, 0x2f, 0x45, 0x3c, 0x23,
-	0x5c, 0xe0, 0x59, 0xa2, 0x03, 0xac, 0x1f, 0x0d, 0x28, 0x0d, 0x65, 0x23, 0x74, 0x1b, 0x20, 0x49,
-	0xd9, 0x77, 0x64, 0x2c, 0xc2, 0x38, 0x6a, 0x18, 0x9b, 0x46, 0xab, 0x1a, 0x54, 0x33, 0x8f, 0x17,
-	0xa1, 0x9b, 0x50, 0x51, 0x03, 0xc9, 0xcb, 0x82, 0xba, 0x2c, 0x2b, 0xdb, 0x8b, 0xd0, 0x17, 0x50,
-	0xe2, 0x09, 0xa6, 0xbc, 0x51, 0xdc, 0x2c, 0xb6, 0x6a, 0x9d, 0x96, 0x7d, 0xe9, 0x3a, 0xb6, 0x6a,
-	0x37, 0x48, 0x30, 0x0d, 0x74, 0x9a, 0xf5, 0x08, 0x4c, 0xe5, 0xe3, 0xe8, 0x33, 0x30, 0x55, 0x18,
-	0x6f, 0x18, 0xaa, 0xd4, 0x9d, 0x55, 0x4a, 0x05, 0x59, 0x8e, 0xf5, 0x4f, 0x11, 0xaa, 0x2f, 0x8a,
-	0xa3, 0x37, 0xa0, 0x2c, 0xcb, 0xe7, 0xcb, 0x98, 0x81, 0x29, 0x4d, 0x2f, 0x42, 0x2e, 0xac, 0x1d,
-	0xc5, 0x54, 0x6f, 0xb1, 0xd1, 0x69, 0xaf, 0x3a, 0xad, 0x2d, 0xff, 0xec, 0xc6, 0x34, 0x0a, 0x54,
-	0x3a, 0x42, 0xb0, 0x46, 0xf1, 0x8c, 0x34, 0x8a, 0x0a, 0x0c, 0x75, 0x46, 0x5b, 0x00, 0x5c, 0xe0,
-	0x54, 0x84, 0x12, 0xe6, 0xc6, 0xda, 0xa6, 0xd1, 0xaa, 0x75, 0x9a, 0x79, 0x83, 0x9c, 0x03, 0x7b,
-	0x98, 0x73, 0x10, 0x54, 0x55, 0xb4, 0xb4, 0xd1, 0xc7, 0x50, 0x21, 0x34, 0xd2, 0x89, 0xa5, 0xa5,
-	0x89, 0x65, 0x42, 0x23, 0x95, 0x76, 0x07, 0x36, 0x12, 0x9c, 0x12, 0x2a, 0xc2, 0x7c, 0x59, 0x53,
-	0x2d, 0xbb, 0xae, 0xbd, 0x03, 0xbd, 0x72, 0x0f, 0xcc, 0x29, 0x3e, 0x24, 0x53, 0xde, 0x28, 0x2b,
-	0x5c, 0x3f, 0x5a, 0x79, 0xe9, 0x9e, 0x4a, 0x73, 0xa9, 0x48, 0x17, 0x41, 0x56, 0xa3, 0xb9, 0x05,
-	0xb5, 0x33, 0x6e, 0x54, 0x87, 0xe2, 0x11, 0x59, 0x64, 0x8a, 0x91, 0x47, 0xf4, 0x3a, 0x94, 0xe6,
-	0x78, 0x7a, 0x4c, 0x32, 0xa1, 0x68, 0xe3, 0x7e, 0xe1, 0x13, 0xc3, 0x72, 0xa1, 0x92, 0xc3, 0x88,
-	0x6e, 0xc2, 0xf5, 0x81, 0xff, 0xa0, 0x1f, 0xee, 0x7a, 0xfd, 0x87, 0xe1, 0x97, 0xfd, 0x81, 0xef,
-	0x76, 0xbd, 0x47, 0x9e, 0xfb, 0xb0, 0xfe, 0x0a, 0xda, 0x00, 0x08, 0xfc, 0x6e, 0x38, 0x70, 0x83,
-	0x91, 0x1b, 0xd4, 0x8d, 0xdc, 0xee, 0xf6, 0x3c, 0xb7, 0x3f, 0xac, 0x17, 0xac, 0xdf, 0x8b, 0xf0,
-	0x5a, 0x2f, 0xe6, 0x42, 0xcb, 0x26, 0x20, 0xdf, 0x1f, 0x13, 0x2e, 0x96, 0x29, 0x78, 0x0f, 0xd6,
-	0xe6, 0x31, 0x79, 0x92, 0xf1, 0xbe, 0xb5, 0x04, 0x82, 0x0b, 0xe5, 0xed, 0x51, 0x4c, 0x9e, 0x0c,
-	0x17, 0x09, 0x09, 0x54, 0x19, 0x74, 0x0b, 0xaa, 0x09, 0x9e, 0x90, 0x90, 0xc7, 0x27, 0x5a, 0x04,
-	0xa5, 0xa0, 0x22, 0x1d, 0x83, 0xf8, 0x44, 0x3f, 0x26, 0x79, 0x29, 0xd8, 0x11, 0xa1, 0x4a, 0x08,
-	0x72, 0x14, 0x3c, 0x21, 0x43, 0xe9, 0x38, 0xa7, 0x93, 0xd2, 0x7f, 0xd5, 0x89, 0xb9, 0xba, 0x4e,
-	0x6e, 0x80, 0xf9, 0x38, 0x9e, 0x0a, 0x92, 0x36, 0xca, 0x6a, 0x98, 0xcc, 0x92, 0xcf, 0x9a, 0xa5,
-	0x11, 0x49, 0xc3, 0xc3, 0x45, 0xa3, 0xa2, 0x9f, 0xb5, 0xb2, 0xb7, 0x17, 0x56, 0x1f, 0x2a, 0xf9,
-	0xca, 0x92, 0xab, 0x91, 0xe7, 0x7e, 0x15, 0x0e, 0xbf, 0xf6, 0xdd, 0x73, 0x5c, 0xd5, 0xa0, 0xbc,
-	0xe7, 0xf5, 0xbd, 0xbd, 0x07, 0xbd, 0xba, 0x81, 0xd6, 0xa1, 0x12, 0xec, 0xef, 0x0f, 0x25, 0xaf,
-	0xf5, 0x82, 0xb4, 0xba, 0xfb, 0x7b, 0x7e, 0xcf, 0x1d, 0xba, 0xf5, 0xa2, 0x75, 0x02, 0xe8, 0x2c,
-	0xa8, 0x3c, 0x61, 0x94, 0x93, 0xff, 0xf7, 0xe4, 0xd1, 0xbb, 0x70, 0x8d, 0x92, 0x1f, 0x44, 0x78,
-	0x06, 0x6c, 0xad, 0xb9, 0x57, 0xa5, 0xdb, 0xcf, 0x01, 0xb7, 0x76, 0xe1, 0xda, 0x0e, 0xd1, 0xad,
-	0x57, 0x54, 0xcb, 0xcb, 0xff, 0xdf, 0x59, 0x29, 0x20, 0x1f, 0x8b, 0xf1, 0xb7, 0x57, 0x52, 0xdf,
-	0xe7, 0x2f, 0xf6, 0x2c, 0x28, 0xd6, 0xde, 0x59, 0x65, 0x4f, 0x9e, 0x2f, 0xda, 0xf9, 0xb3, 0x08,
-	0xeb, 0xfa, 0x55, 0x92, 0x74, 0x1e, 0x8f, 0x09, 0xfa, 0xcd, 0x00, 0x38, 0x85, 0x13, 0xdd, 0xbd,
-	0xaa, 0x9c, 0x9b, 0xed, 0x2b, 0x64, 0x68, 0xae, 0xac, 0xd6, 0x4f, 0x7f, 0xfd, 0xfd, 0x4b, 0xc1,
-	0x42, 0x9b, 0xf2, 0x03, 0x96, 0xad, 0xc6, 0x9d, 0xa7, 0xa7, 0x6b, 0x3f, 0x73, 0x32, 0x5e, 0x7e,
-	0x35, 0xa0, 0x92, 0x03, 0x8e, 0xec, 0x25, 0x9d, 0xce, 0x31, 0xd3, 0x5c, 0x49, 0x02, 0xd6, 0x3d,
-	0x35, 0xcc, 0x87, 0xe8, 0x83, 0x65, 0xc3, 0x38, 0x4f, 0x73, 0x22, 0x9f, 0xa1, 0x9f, 0x0d, 0xa8,
-	0x9d, 0xe1, 0x0e, 0x2d, 0x03, 0xe1, 0x22, 0xcf, 0xcd, 0x1b, 0x17, 0x9e, 0x9b, 0x2b, 0x3f, 0xb8,
-	0xd6, 0x5d, 0x35, 0xcf, 0xfb, 0x9d, 0xa5, 0xe0, 0xdc, 0xcf, 0x38, 0xdd, 0x7e, 0x6e, 0xc0, 0xdb,
-	0x63, 0x36, 0xbb, 0x7c, 0x84, 0x6d, 0x50, 0xed, 0x7d, 0xd9, 0xcc, 0x37, 0xbe, 0xd9, 0xc9, 0x82,
-	0x27, 0x6c, 0x8a, 0xe9, 0xc4, 0x66, 0xe9, 0xc4, 0x99, 0x10, 0xaa, 0x46, 0x71, 0xf4, 0x15, 0x4e,
-	0x62, 0xfe, 0x92, 0x1f, 0x1d, 0x9f, 0x9e, 0x5a, 0xcf, 0x0b, 0xd7, 0x77, 0x74, 0xa5, 0xae, 0xf4,
-	0x69, 0x4c, 0xed, 0x51, 0xfb, 0x8f, 0xdc, 0x7f, 0xa0, 0xfc, 0x07, 0xca, 0x7f, 0x30, 0x6a, 0x1f,
-	0x9a, 0xaa, 0xc7, 0xbd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x08, 0xd9, 0xf5, 0xea, 0xd7, 0x08,
-	0x00, 0x00,
-}
diff --git a/googleapis/devtools/cloudtrace/v2/trace.pb.go b/googleapis/devtools/cloudtrace/v2/trace.pb.go
index 0297ee9ad7..15e73796f8 100644
--- a/googleapis/devtools/cloudtrace/v2/trace.pb.go
+++ b/googleapis/devtools/cloudtrace/v2/trace.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v2/trace.proto
 
-package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
+package cloudtrace
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates whether the message was sent or received.
 type Span_TimeEvent_MessageEvent_Type int32
@@ -39,6 +42,7 @@ var Span_TimeEvent_MessageEvent_Type_name = map[int32]string{
 	1: "SENT",
 	2: "RECEIVED",
 }
+
 var Span_TimeEvent_MessageEvent_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"SENT":             1,
@@ -48,8 +52,9 @@ var Span_TimeEvent_MessageEvent_Type_value = map[string]int32{
 func (x Span_TimeEvent_MessageEvent_Type) String() string {
 	return proto.EnumName(Span_TimeEvent_MessageEvent_Type_name, int32(x))
 }
+
 func (Span_TimeEvent_MessageEvent_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 1, 1, 0}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 1, 1, 0}
 }
 
 // The relationship of the current span relative to the linked span: child,
@@ -70,6 +75,7 @@ var Span_Link_Type_name = map[int32]string{
 	1: "CHILD_LINKED_SPAN",
 	2: "PARENT_LINKED_SPAN",
 }
+
 var Span_Link_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED":   0,
 	"CHILD_LINKED_SPAN":  1,
@@ -79,8 +85,9 @@ var Span_Link_Type_value = map[string]int32{
 func (x Span_Link_Type) String() string {
 	return proto.EnumName(Span_Link_Type_name, int32(x))
 }
+
 func (Span_Link_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 3, 0}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 3, 0}
 }
 
 // A span represents a single operation within a trace. Spans can be
@@ -150,16 +157,17 @@ func (m *Span) Reset()         { *m = Span{} }
 func (m *Span) String() string { return proto.CompactTextString(m) }
 func (*Span) ProtoMessage()    {}
 func (*Span) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0}
+	return fileDescriptor_29869cc16dc8ce61, []int{0}
 }
+
 func (m *Span) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span.Unmarshal(m, b)
 }
 func (m *Span) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span.Marshal(b, m, deterministic)
 }
-func (dst *Span) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span.Merge(dst, src)
+func (m *Span) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span.Merge(m, src)
 }
 func (m *Span) XXX_Size() int {
 	return xxx_messageInfo_Span.Size(m)
@@ -285,16 +293,17 @@ func (m *Span_Attributes) Reset()         { *m = Span_Attributes{} }
 func (m *Span_Attributes) String() string { return proto.CompactTextString(m) }
 func (*Span_Attributes) ProtoMessage()    {}
 func (*Span_Attributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 0}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 0}
 }
+
 func (m *Span_Attributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span_Attributes.Unmarshal(m, b)
 }
 func (m *Span_Attributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span_Attributes.Marshal(b, m, deterministic)
 }
-func (dst *Span_Attributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span_Attributes.Merge(dst, src)
+func (m *Span_Attributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_Attributes.Merge(m, src)
 }
 func (m *Span_Attributes) XXX_Size() int {
 	return xxx_messageInfo_Span_Attributes.Size(m)
@@ -339,16 +348,17 @@ func (m *Span_TimeEvent) Reset()         { *m = Span_TimeEvent{} }
 func (m *Span_TimeEvent) String() string { return proto.CompactTextString(m) }
 func (*Span_TimeEvent) ProtoMessage()    {}
 func (*Span_TimeEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 1}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 1}
 }
+
 func (m *Span_TimeEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span_TimeEvent.Unmarshal(m, b)
 }
 func (m *Span_TimeEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span_TimeEvent.Marshal(b, m, deterministic)
 }
-func (dst *Span_TimeEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span_TimeEvent.Merge(dst, src)
+func (m *Span_TimeEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvent.Merge(m, src)
 }
 func (m *Span_TimeEvent) XXX_Size() int {
 	return xxx_messageInfo_Span_TimeEvent.Size(m)
@@ -403,80 +413,14 @@ func (m *Span_TimeEvent) GetMessageEvent() *Span_TimeEvent_MessageEvent {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Span_TimeEvent) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Span_TimeEvent_OneofMarshaler, _Span_TimeEvent_OneofUnmarshaler, _Span_TimeEvent_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Span_TimeEvent) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Span_TimeEvent_Annotation_)(nil),
 		(*Span_TimeEvent_MessageEvent_)(nil),
 	}
 }
 
-func _Span_TimeEvent_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Span_TimeEvent)
-	// value
-	switch x := m.Value.(type) {
-	case *Span_TimeEvent_Annotation_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Annotation); err != nil {
-			return err
-		}
-	case *Span_TimeEvent_MessageEvent_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MessageEvent); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Span_TimeEvent.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Span_TimeEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Span_TimeEvent)
-	switch tag {
-	case 2: // value.annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Span_TimeEvent_Annotation)
-		err := b.DecodeMessage(msg)
-		m.Value = &Span_TimeEvent_Annotation_{msg}
-		return true, err
-	case 3: // value.message_event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Span_TimeEvent_MessageEvent)
-		err := b.DecodeMessage(msg)
-		m.Value = &Span_TimeEvent_MessageEvent_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Span_TimeEvent_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Span_TimeEvent)
-	// value
-	switch x := m.Value.(type) {
-	case *Span_TimeEvent_Annotation_:
-		s := proto.Size(x.Annotation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Span_TimeEvent_MessageEvent_:
-		s := proto.Size(x.MessageEvent)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Text annotation with a set of attributes.
 type Span_TimeEvent_Annotation struct {
 	// A user-supplied message describing the event. The maximum length for
@@ -494,16 +438,17 @@ func (m *Span_TimeEvent_Annotation) Reset()         { *m = Span_TimeEvent_Annota
 func (m *Span_TimeEvent_Annotation) String() string { return proto.CompactTextString(m) }
 func (*Span_TimeEvent_Annotation) ProtoMessage()    {}
 func (*Span_TimeEvent_Annotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 1, 0}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 1, 0}
 }
+
 func (m *Span_TimeEvent_Annotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span_TimeEvent_Annotation.Unmarshal(m, b)
 }
 func (m *Span_TimeEvent_Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span_TimeEvent_Annotation.Marshal(b, m, deterministic)
 }
-func (dst *Span_TimeEvent_Annotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span_TimeEvent_Annotation.Merge(dst, src)
+func (m *Span_TimeEvent_Annotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvent_Annotation.Merge(m, src)
 }
 func (m *Span_TimeEvent_Annotation) XXX_Size() int {
 	return xxx_messageInfo_Span_TimeEvent_Annotation.Size(m)
@@ -551,16 +496,17 @@ func (m *Span_TimeEvent_MessageEvent) Reset()         { *m = Span_TimeEvent_Mess
 func (m *Span_TimeEvent_MessageEvent) String() string { return proto.CompactTextString(m) }
 func (*Span_TimeEvent_MessageEvent) ProtoMessage()    {}
 func (*Span_TimeEvent_MessageEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 1, 1}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 1, 1}
 }
+
 func (m *Span_TimeEvent_MessageEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span_TimeEvent_MessageEvent.Unmarshal(m, b)
 }
 func (m *Span_TimeEvent_MessageEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span_TimeEvent_MessageEvent.Marshal(b, m, deterministic)
 }
-func (dst *Span_TimeEvent_MessageEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span_TimeEvent_MessageEvent.Merge(dst, src)
+func (m *Span_TimeEvent_MessageEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvent_MessageEvent.Merge(m, src)
 }
 func (m *Span_TimeEvent_MessageEvent) XXX_Size() int {
 	return xxx_messageInfo_Span_TimeEvent_MessageEvent.Size(m)
@@ -620,16 +566,17 @@ func (m *Span_TimeEvents) Reset()         { *m = Span_TimeEvents{} }
 func (m *Span_TimeEvents) String() string { return proto.CompactTextString(m) }
 func (*Span_TimeEvents) ProtoMessage()    {}
 func (*Span_TimeEvents) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 2}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 2}
 }
+
 func (m *Span_TimeEvents) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span_TimeEvents.Unmarshal(m, b)
 }
 func (m *Span_TimeEvents) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span_TimeEvents.Marshal(b, m, deterministic)
 }
-func (dst *Span_TimeEvents) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span_TimeEvents.Merge(dst, src)
+func (m *Span_TimeEvents) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvents.Merge(m, src)
 }
 func (m *Span_TimeEvents) XXX_Size() int {
 	return xxx_messageInfo_Span_TimeEvents.Size(m)
@@ -684,16 +631,17 @@ func (m *Span_Link) Reset()         { *m = Span_Link{} }
 func (m *Span_Link) String() string { return proto.CompactTextString(m) }
 func (*Span_Link) ProtoMessage()    {}
 func (*Span_Link) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 3}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 3}
 }
+
 func (m *Span_Link) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span_Link.Unmarshal(m, b)
 }
 func (m *Span_Link) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span_Link.Marshal(b, m, deterministic)
 }
-func (dst *Span_Link) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span_Link.Merge(dst, src)
+func (m *Span_Link) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_Link.Merge(m, src)
 }
 func (m *Span_Link) XXX_Size() int {
 	return xxx_messageInfo_Span_Link.Size(m)
@@ -749,16 +697,17 @@ func (m *Span_Links) Reset()         { *m = Span_Links{} }
 func (m *Span_Links) String() string { return proto.CompactTextString(m) }
 func (*Span_Links) ProtoMessage()    {}
 func (*Span_Links) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{0, 4}
+	return fileDescriptor_29869cc16dc8ce61, []int{0, 4}
 }
+
 func (m *Span_Links) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Span_Links.Unmarshal(m, b)
 }
 func (m *Span_Links) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Span_Links.Marshal(b, m, deterministic)
 }
-func (dst *Span_Links) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Span_Links.Merge(dst, src)
+func (m *Span_Links) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_Links.Merge(m, src)
 }
 func (m *Span_Links) XXX_Size() int {
 	return xxx_messageInfo_Span_Links.Size(m)
@@ -801,16 +750,17 @@ func (m *AttributeValue) Reset()         { *m = AttributeValue{} }
 func (m *AttributeValue) String() string { return proto.CompactTextString(m) }
 func (*AttributeValue) ProtoMessage()    {}
 func (*AttributeValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{1}
+	return fileDescriptor_29869cc16dc8ce61, []int{1}
 }
+
 func (m *AttributeValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttributeValue.Unmarshal(m, b)
 }
 func (m *AttributeValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttributeValue.Marshal(b, m, deterministic)
 }
-func (dst *AttributeValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttributeValue.Merge(dst, src)
+func (m *AttributeValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttributeValue.Merge(m, src)
 }
 func (m *AttributeValue) XXX_Size() int {
 	return xxx_messageInfo_AttributeValue.Size(m)
@@ -871,93 +821,15 @@ func (m *AttributeValue) GetBoolValue() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AttributeValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AttributeValue_OneofMarshaler, _AttributeValue_OneofUnmarshaler, _AttributeValue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AttributeValue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AttributeValue_StringValue)(nil),
 		(*AttributeValue_IntValue)(nil),
 		(*AttributeValue_BoolValue)(nil),
 	}
 }
 
-func _AttributeValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AttributeValue)
-	// value
-	switch x := m.Value.(type) {
-	case *AttributeValue_StringValue:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StringValue); err != nil {
-			return err
-		}
-	case *AttributeValue_IntValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntValue))
-	case *AttributeValue_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("AttributeValue.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AttributeValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AttributeValue)
-	switch tag {
-	case 1: // value.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TruncatableString)
-		err := b.DecodeMessage(msg)
-		m.Value = &AttributeValue_StringValue{msg}
-		return true, err
-	case 2: // value.int_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &AttributeValue_IntValue{int64(x)}
-		return true, err
-	case 3: // value.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &AttributeValue_BoolValue{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AttributeValue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AttributeValue)
-	// value
-	switch x := m.Value.(type) {
-	case *AttributeValue_StringValue:
-		s := proto.Size(x.StringValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AttributeValue_IntValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IntValue))
-	case *AttributeValue_BoolValue:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A call stack appearing in a trace.
 type StackTrace struct {
 	// Stack frames in this stack trace. A maximum of 128 frames are allowed.
@@ -981,16 +853,17 @@ func (m *StackTrace) Reset()         { *m = StackTrace{} }
 func (m *StackTrace) String() string { return proto.CompactTextString(m) }
 func (*StackTrace) ProtoMessage()    {}
 func (*StackTrace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{2}
+	return fileDescriptor_29869cc16dc8ce61, []int{2}
 }
+
 func (m *StackTrace) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StackTrace.Unmarshal(m, b)
 }
 func (m *StackTrace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StackTrace.Marshal(b, m, deterministic)
 }
-func (dst *StackTrace) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StackTrace.Merge(dst, src)
+func (m *StackTrace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackTrace.Merge(m, src)
 }
 func (m *StackTrace) XXX_Size() int {
 	return xxx_messageInfo_StackTrace.Size(m)
@@ -1045,16 +918,17 @@ func (m *StackTrace_StackFrame) Reset()         { *m = StackTrace_StackFrame{} }
 func (m *StackTrace_StackFrame) String() string { return proto.CompactTextString(m) }
 func (*StackTrace_StackFrame) ProtoMessage()    {}
 func (*StackTrace_StackFrame) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{2, 0}
+	return fileDescriptor_29869cc16dc8ce61, []int{2, 0}
 }
+
 func (m *StackTrace_StackFrame) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StackTrace_StackFrame.Unmarshal(m, b)
 }
 func (m *StackTrace_StackFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StackTrace_StackFrame.Marshal(b, m, deterministic)
 }
-func (dst *StackTrace_StackFrame) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StackTrace_StackFrame.Merge(dst, src)
+func (m *StackTrace_StackFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackTrace_StackFrame.Merge(m, src)
 }
 func (m *StackTrace_StackFrame) XXX_Size() int {
 	return xxx_messageInfo_StackTrace_StackFrame.Size(m)
@@ -1131,16 +1005,17 @@ func (m *StackTrace_StackFrames) Reset()         { *m = StackTrace_StackFrames{}
 func (m *StackTrace_StackFrames) String() string { return proto.CompactTextString(m) }
 func (*StackTrace_StackFrames) ProtoMessage()    {}
 func (*StackTrace_StackFrames) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{2, 1}
+	return fileDescriptor_29869cc16dc8ce61, []int{2, 1}
 }
+
 func (m *StackTrace_StackFrames) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StackTrace_StackFrames.Unmarshal(m, b)
 }
 func (m *StackTrace_StackFrames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StackTrace_StackFrames.Marshal(b, m, deterministic)
 }
-func (dst *StackTrace_StackFrames) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StackTrace_StackFrames.Merge(dst, src)
+func (m *StackTrace_StackFrames) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackTrace_StackFrames.Merge(m, src)
 }
 func (m *StackTrace_StackFrames) XXX_Size() int {
 	return xxx_messageInfo_StackTrace_StackFrames.Size(m)
@@ -1182,16 +1057,17 @@ func (m *Module) Reset()         { *m = Module{} }
 func (m *Module) String() string { return proto.CompactTextString(m) }
 func (*Module) ProtoMessage()    {}
 func (*Module) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{3}
+	return fileDescriptor_29869cc16dc8ce61, []int{3}
 }
+
 func (m *Module) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Module.Unmarshal(m, b)
 }
 func (m *Module) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Module.Marshal(b, m, deterministic)
 }
-func (dst *Module) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Module.Merge(dst, src)
+func (m *Module) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Module.Merge(m, src)
 }
 func (m *Module) XXX_Size() int {
 	return xxx_messageInfo_Module.Size(m)
@@ -1238,16 +1114,17 @@ func (m *TruncatableString) Reset()         { *m = TruncatableString{} }
 func (m *TruncatableString) String() string { return proto.CompactTextString(m) }
 func (*TruncatableString) ProtoMessage()    {}
 func (*TruncatableString) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_717f3961302e3ac6, []int{4}
+	return fileDescriptor_29869cc16dc8ce61, []int{4}
 }
+
 func (m *TruncatableString) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TruncatableString.Unmarshal(m, b)
 }
 func (m *TruncatableString) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TruncatableString.Marshal(b, m, deterministic)
 }
-func (dst *TruncatableString) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TruncatableString.Merge(dst, src)
+func (m *TruncatableString) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TruncatableString.Merge(m, src)
 }
 func (m *TruncatableString) XXX_Size() int {
 	return xxx_messageInfo_TruncatableString.Size(m)
@@ -1273,6 +1150,8 @@ func (m *TruncatableString) GetTruncatedByteCount() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_TimeEvent_MessageEvent_Type", Span_TimeEvent_MessageEvent_Type_name, Span_TimeEvent_MessageEvent_Type_value)
+	proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_Link_Type", Span_Link_Type_name, Span_Link_Type_value)
 	proto.RegisterType((*Span)(nil), "google.devtools.cloudtrace.v2.Span")
 	proto.RegisterType((*Span_Attributes)(nil), "google.devtools.cloudtrace.v2.Span.Attributes")
 	proto.RegisterMapType((map[string]*AttributeValue)(nil), "google.devtools.cloudtrace.v2.Span.Attributes.AttributeMapEntry")
@@ -1288,15 +1167,13 @@ func init() {
 	proto.RegisterType((*StackTrace_StackFrames)(nil), "google.devtools.cloudtrace.v2.StackTrace.StackFrames")
 	proto.RegisterType((*Module)(nil), "google.devtools.cloudtrace.v2.Module")
 	proto.RegisterType((*TruncatableString)(nil), "google.devtools.cloudtrace.v2.TruncatableString")
-	proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_TimeEvent_MessageEvent_Type", Span_TimeEvent_MessageEvent_Type_name, Span_TimeEvent_MessageEvent_Type_value)
-	proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_Link_Type", Span_Link_Type_name, Span_Link_Type_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/cloudtrace/v2/trace.proto", fileDescriptor_trace_717f3961302e3ac6)
+	proto.RegisterFile("google/devtools/cloudtrace/v2/trace.proto", fileDescriptor_29869cc16dc8ce61)
 }
 
-var fileDescriptor_trace_717f3961302e3ac6 = []byte{
+var fileDescriptor_29869cc16dc8ce61 = []byte{
 	// 1425 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4b, 0x6f, 0xdb, 0xc6,
 	0x16, 0x36, 0xf5, 0xd6, 0x91, 0x6c, 0xc8, 0x13, 0x3b, 0x56, 0x94, 0xe4, 0x26, 0xd7, 0xf7, 0x16,
diff --git a/googleapis/devtools/cloudtrace/v2/tracing.pb.go b/googleapis/devtools/cloudtrace/v2/tracing.pb.go
index d88229bb9a..5bfabefd89 100644
--- a/googleapis/devtools/cloudtrace/v2/tracing.pb.go
+++ b/googleapis/devtools/cloudtrace/v2/tracing.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v2/tracing.proto
 
-package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package cloudtrace
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The request message for the `BatchWriteSpans` method.
 type BatchWriteSpansRequest struct {
@@ -43,16 +43,17 @@ func (m *BatchWriteSpansRequest) Reset()         { *m = BatchWriteSpansRequest{}
 func (m *BatchWriteSpansRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchWriteSpansRequest) ProtoMessage()    {}
 func (*BatchWriteSpansRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tracing_25bea29412890bc4, []int{0}
+	return fileDescriptor_d1f9b588db05fdc6, []int{0}
 }
+
 func (m *BatchWriteSpansRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchWriteSpansRequest.Unmarshal(m, b)
 }
 func (m *BatchWriteSpansRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchWriteSpansRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchWriteSpansRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchWriteSpansRequest.Merge(dst, src)
+func (m *BatchWriteSpansRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchWriteSpansRequest.Merge(m, src)
 }
 func (m *BatchWriteSpansRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchWriteSpansRequest.Size(m)
@@ -81,6 +82,40 @@ func init() {
 	proto.RegisterType((*BatchWriteSpansRequest)(nil), "google.devtools.cloudtrace.v2.BatchWriteSpansRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/cloudtrace/v2/tracing.proto", fileDescriptor_d1f9b588db05fdc6)
+}
+
+var fileDescriptor_d1f9b588db05fdc6 = []byte{
+	// 404 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x6a, 0xdb, 0x30,
+	0x14, 0x46, 0xde, 0x0f, 0x4c, 0x1b, 0x0c, 0x04, 0x0b, 0xc1, 0xdb, 0x58, 0xe6, 0x0d, 0x96, 0x64,
+	0x43, 0x02, 0x8f, 0x5d, 0x2c, 0x63, 0x37, 0x09, 0x23, 0xb7, 0x21, 0x19, 0x19, 0x8c, 0xdc, 0x28,
+	0x8e, 0xa6, 0x69, 0xd8, 0x92, 0x67, 0x29, 0x86, 0x52, 0x7a, 0xd3, 0x9b, 0x3e, 0x40, 0xfb, 0x14,
+	0xa5, 0xd0, 0xf7, 0xe8, 0x6d, 0x5f, 0xa1, 0x0f, 0x52, 0x24, 0xd9, 0x0d, 0x84, 0x34, 0xc9, 0x9d,
+	0xce, 0x39, 0xdf, 0xf9, 0xce, 0xf7, 0x7d, 0x36, 0xfc, 0xc8, 0x95, 0xe2, 0x29, 0x23, 0x0b, 0x56,
+	0x1a, 0xa5, 0x52, 0x4d, 0x92, 0x54, 0x2d, 0x17, 0xa6, 0xa0, 0x09, 0x23, 0x65, 0x4c, 0xec, 0x43,
+	0x48, 0x8e, 0xf3, 0x42, 0x19, 0x85, 0x5e, 0x7b, 0x30, 0xae, 0xc1, 0x78, 0x05, 0xc6, 0x65, 0x1c,
+	0xbe, 0xaa, 0xb8, 0x68, 0x2e, 0x08, 0x95, 0x52, 0x19, 0x6a, 0x84, 0x92, 0xda, 0x2f, 0x87, 0x9d,
+	0xdd, 0x97, 0x58, 0x05, 0x7d, 0x59, 0x41, 0x5d, 0x35, 0x5f, 0xfe, 0x21, 0x2c, 0xcb, 0xcd, 0x41,
+	0x35, 0x7c, 0xb3, 0x3e, 0x34, 0x22, 0x63, 0xda, 0xd0, 0x2c, 0xf7, 0x80, 0x88, 0xc3, 0x46, 0x9f,
+	0x9a, 0xe4, 0xef, 0xaf, 0x42, 0x18, 0x36, 0xc9, 0xa9, 0xd4, 0x63, 0xf6, 0x7f, 0xc9, 0xb4, 0x41,
+	0x08, 0x3e, 0x94, 0x34, 0x63, 0x4d, 0xd0, 0x02, 0xed, 0x27, 0x63, 0xf7, 0x46, 0x5f, 0xe1, 0x23,
+	0x6d, 0x31, 0xcd, 0xa0, 0xf5, 0xa0, 0xfd, 0x34, 0x7e, 0x87, 0xb7, 0x7a, 0xc4, 0x96, 0x6f, 0xec,
+	0x37, 0xe2, 0xcb, 0x00, 0x3e, 0xfb, 0x69, 0x07, 0x13, 0x56, 0x94, 0x22, 0x61, 0xe8, 0x0c, 0xc0,
+	0xe7, 0x6b, 0xa7, 0xd1, 0x97, 0x1d, 0x84, 0x9b, 0xa5, 0x86, 0x8d, 0x7a, 0xad, 0xb6, 0x89, 0x7f,
+	0xd8, 0x0c, 0xa2, 0xf8, 0xf8, 0xfa, 0xe6, 0x34, 0xf8, 0x14, 0x7d, 0xb0, 0x99, 0x1d, 0x5a, 0x07,
+	0xdf, 0xf3, 0x42, 0xfd, 0x63, 0x89, 0xd1, 0xa4, 0x7b, 0xe4, 0x53, 0xd4, 0xbd, 0xf9, 0x1d, 0x69,
+	0x0f, 0x74, 0xd1, 0x09, 0x80, 0x70, 0x50, 0x30, 0xea, 0x4f, 0xa0, 0x7d, 0x2c, 0x86, 0xfb, 0x80,
+	0x22, 0xe2, 0xc4, 0x74, 0xa2, 0xf7, 0x9b, 0xc4, 0x54, 0x5a, 0xac, 0x2a, 0x17, 0x57, 0x0f, 0x74,
+	0xfb, 0x17, 0x00, 0xbe, 0x4d, 0x54, 0xb6, 0x9d, 0xbb, 0xef, 0x42, 0x15, 0x92, 0x8f, 0xac, 0xf5,
+	0x11, 0xf8, 0x3d, 0xac, 0xe0, 0x5c, 0xa5, 0x54, 0x72, 0xac, 0x0a, 0x4e, 0x38, 0x93, 0x2e, 0x18,
+	0xe2, 0x47, 0x34, 0x17, 0xfa, 0x9e, 0x1f, 0xeb, 0xdb, 0xaa, 0x3a, 0x0f, 0x5e, 0x0c, 0x3d, 0xd3,
+	0xc0, 0xf6, 0xb0, 0xfb, 0x76, 0x78, 0x1a, 0x5f, 0xd5, 0xfd, 0x99, 0xeb, 0xcf, 0x5c, 0x7f, 0x36,
+	0x8d, 0xe7, 0x8f, 0xdd, 0x8d, 0xcf, 0xb7, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x94, 0x51, 0x1d,
+	0x25, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -191,37 +226,3 @@ var _TraceService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/cloudtrace/v2/tracing.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/cloudtrace/v2/tracing.proto", fileDescriptor_tracing_25bea29412890bc4)
-}
-
-var fileDescriptor_tracing_25bea29412890bc4 = []byte{
-	// 404 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x6a, 0xdb, 0x30,
-	0x14, 0x46, 0xde, 0x0f, 0x4c, 0x1b, 0x0c, 0x04, 0x0b, 0xc1, 0xdb, 0x58, 0xe6, 0x0d, 0x96, 0x64,
-	0x43, 0x02, 0x8f, 0x5d, 0x2c, 0x63, 0x37, 0x09, 0x23, 0xb7, 0x21, 0x19, 0x19, 0x8c, 0xdc, 0x28,
-	0x8e, 0xa6, 0x69, 0xd8, 0x92, 0x67, 0x29, 0x86, 0x52, 0x7a, 0xd3, 0x9b, 0x3e, 0x40, 0xfb, 0x14,
-	0xa5, 0xd0, 0xf7, 0xe8, 0x6d, 0x5f, 0xa1, 0x0f, 0x52, 0x24, 0xd9, 0x0d, 0x84, 0x34, 0xc9, 0x9d,
-	0xce, 0x39, 0xdf, 0xf9, 0xce, 0xf7, 0x7d, 0x36, 0xfc, 0xc8, 0x95, 0xe2, 0x29, 0x23, 0x0b, 0x56,
-	0x1a, 0xa5, 0x52, 0x4d, 0x92, 0x54, 0x2d, 0x17, 0xa6, 0xa0, 0x09, 0x23, 0x65, 0x4c, 0xec, 0x43,
-	0x48, 0x8e, 0xf3, 0x42, 0x19, 0x85, 0x5e, 0x7b, 0x30, 0xae, 0xc1, 0x78, 0x05, 0xc6, 0x65, 0x1c,
-	0xbe, 0xaa, 0xb8, 0x68, 0x2e, 0x08, 0x95, 0x52, 0x19, 0x6a, 0x84, 0x92, 0xda, 0x2f, 0x87, 0x9d,
-	0xdd, 0x97, 0x58, 0x05, 0x7d, 0x59, 0x41, 0x5d, 0x35, 0x5f, 0xfe, 0x21, 0x2c, 0xcb, 0xcd, 0x41,
-	0x35, 0x7c, 0xb3, 0x3e, 0x34, 0x22, 0x63, 0xda, 0xd0, 0x2c, 0xf7, 0x80, 0x88, 0xc3, 0x46, 0x9f,
-	0x9a, 0xe4, 0xef, 0xaf, 0x42, 0x18, 0x36, 0xc9, 0xa9, 0xd4, 0x63, 0xf6, 0x7f, 0xc9, 0xb4, 0x41,
-	0x08, 0x3e, 0x94, 0x34, 0x63, 0x4d, 0xd0, 0x02, 0xed, 0x27, 0x63, 0xf7, 0x46, 0x5f, 0xe1, 0x23,
-	0x6d, 0x31, 0xcd, 0xa0, 0xf5, 0xa0, 0xfd, 0x34, 0x7e, 0x87, 0xb7, 0x7a, 0xc4, 0x96, 0x6f, 0xec,
-	0x37, 0xe2, 0xcb, 0x00, 0x3e, 0xfb, 0x69, 0x07, 0x13, 0x56, 0x94, 0x22, 0x61, 0xe8, 0x0c, 0xc0,
-	0xe7, 0x6b, 0xa7, 0xd1, 0x97, 0x1d, 0x84, 0x9b, 0xa5, 0x86, 0x8d, 0x7a, 0xad, 0xb6, 0x89, 0x7f,
-	0xd8, 0x0c, 0xa2, 0xf8, 0xf8, 0xfa, 0xe6, 0x34, 0xf8, 0x14, 0x7d, 0xb0, 0x99, 0x1d, 0x5a, 0x07,
-	0xdf, 0xf3, 0x42, 0xfd, 0x63, 0x89, 0xd1, 0xa4, 0x7b, 0xe4, 0x53, 0xd4, 0xbd, 0xf9, 0x1d, 0x69,
-	0x0f, 0x74, 0xd1, 0x09, 0x80, 0x70, 0x50, 0x30, 0xea, 0x4f, 0xa0, 0x7d, 0x2c, 0x86, 0xfb, 0x80,
-	0x22, 0xe2, 0xc4, 0x74, 0xa2, 0xf7, 0x9b, 0xc4, 0x54, 0x5a, 0xac, 0x2a, 0x17, 0x57, 0x0f, 0x74,
-	0xfb, 0x17, 0x00, 0xbe, 0x4d, 0x54, 0xb6, 0x9d, 0xbb, 0xef, 0x42, 0x15, 0x92, 0x8f, 0xac, 0xf5,
-	0x11, 0xf8, 0x3d, 0xac, 0xe0, 0x5c, 0xa5, 0x54, 0x72, 0xac, 0x0a, 0x4e, 0x38, 0x93, 0x2e, 0x18,
-	0xe2, 0x47, 0x34, 0x17, 0xfa, 0x9e, 0x1f, 0xeb, 0xdb, 0xaa, 0x3a, 0x0f, 0x5e, 0x0c, 0x3d, 0xd3,
-	0xc0, 0xf6, 0xb0, 0xfb, 0x76, 0x78, 0x1a, 0x5f, 0xd5, 0xfd, 0x99, 0xeb, 0xcf, 0x5c, 0x7f, 0x36,
-	0x8d, 0xe7, 0x8f, 0xdd, 0x8d, 0xcf, 0xb7, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x94, 0x51, 0x1d,
-	0x25, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/containeranalysis/v1/containeranalysis.pb.go b/googleapis/devtools/containeranalysis/v1/containeranalysis.pb.go
index e65489366c..c11fac4b54 100644
--- a/googleapis/devtools/containeranalysis/v1/containeranalysis.pb.go
+++ b/googleapis/devtools/containeranalysis/v1/containeranalysis.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1/containeranalysis.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+package containeranalysis
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,40 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+func init() {
+	proto.RegisterFile("google/devtools/containeranalysis/v1/containeranalysis.proto", fileDescriptor_e74edb4ed33b4f81)
+}
+
+var fileDescriptor_e74edb4ed33b4f81 = []byte{
+	// 393 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x4f, 0x6a, 0xdb, 0x40,
+	0x14, 0xc6, 0x91, 0x4b, 0xbb, 0x10, 0xdd, 0x54, 0xd0, 0x8d, 0x28, 0x35, 0x88, 0x2e, 0x5a, 0x2f,
+	0x66, 0x70, 0xdb, 0x4d, 0xdd, 0x84, 0xe0, 0x78, 0x61, 0xb2, 0x33, 0xf9, 0xb3, 0xf1, 0x26, 0x8c,
+	0x27, 0x2f, 0x62, 0x82, 0x66, 0x9e, 0x32, 0x33, 0x12, 0x38, 0x21, 0x60, 0xb2, 0xc8, 0x05, 0x72,
+	0x83, 0x5c, 0x24, 0x87, 0xc8, 0x15, 0xb2, 0xcc, 0x21, 0x82, 0xa4, 0x51, 0xb0, 0x2d, 0xc7, 0x98,
+	0x40, 0x96, 0xf3, 0xbe, 0xf7, 0x7d, 0xf3, 0xfd, 0x60, 0xc6, 0xdf, 0x8a, 0x11, 0xe3, 0x04, 0xe8,
+	0x09, 0xe4, 0x16, 0x31, 0x31, 0x94, 0xa3, 0xb2, 0x4c, 0x28, 0xd0, 0x4c, 0xb1, 0x64, 0x6a, 0x84,
+	0xa1, 0x79, 0xb7, 0x39, 0x24, 0xa9, 0x46, 0x8b, 0xc1, 0x8f, 0xca, 0x4d, 0x6a, 0x37, 0x69, 0x2e,
+	0xe6, 0xdd, 0xf0, 0x9b, 0xbb, 0x83, 0xa5, 0x82, 0x32, 0xa5, 0xd0, 0x32, 0x2b, 0x50, 0xb9, 0x8c,
+	0xf0, 0xbb, 0x53, 0x05, 0x93, 0xc5, 0x55, 0x82, 0xc9, 0xe3, 0x14, 0x13, 0xc1, 0xa7, 0x4e, 0x0f,
+	0x17, 0xf5, 0x05, 0xad, 0xed, 0xb4, 0xf2, 0x34, 0xc9, 0x4e, 0xa9, 0x15, 0x12, 0x8c, 0x65, 0x32,
+	0xad, 0x16, 0x7e, 0xdf, 0x7c, 0xf4, 0xbf, 0x0c, 0xea, 0x4e, 0x7d, 0xd7, 0x29, 0xb8, 0xf7, 0xfc,
+	0xcf, 0x07, 0x60, 0xf7, 0x98, 0x1c, 0x95, 0x69, 0x41, 0x44, 0x1c, 0x88, 0x60, 0x92, 0xe4, 0x5d,
+	0x32, 0x2f, 0xee, 0xc3, 0x79, 0x06, 0xc6, 0x86, 0x5f, 0x97, 0x76, 0x2a, 0x35, 0xb2, 0xd7, 0x0f,
+	0x8f, 0xb7, 0x2d, 0x15, 0x91, 0xa2, 0xdc, 0xa5, 0x06, 0x83, 0x99, 0xe6, 0xb0, 0x9d, 0x6a, 0x3c,
+	0x03, 0x6e, 0x0d, 0xed, 0x50, 0x85, 0x16, 0x0c, 0xed, 0x5c, 0xf5, 0xcc, 0x5c, 0x6a, 0xcf, 0xeb,
+	0x8c, 0xff, 0x45, 0x7f, 0x5f, 0x35, 0x21, 0xe7, 0x99, 0xd6, 0xa0, 0xf8, 0x4a, 0x6b, 0x49, 0x30,
+	0x5c, 0x47, 0x30, 0x7c, 0x17, 0x82, 0xf8, 0xed, 0x04, 0x4b, 0xd6, 0xe0, 0xc9, 0xf3, 0x83, 0x43,
+	0x30, 0xe5, 0x10, 0xb4, 0x14, 0xc6, 0x14, 0x6f, 0x22, 0xf8, 0xb9, 0xd4, 0xb1, 0xb9, 0x52, 0xd3,
+	0xfc, 0xda, 0x60, 0xd3, 0xa4, 0xa8, 0x0c, 0x44, 0x33, 0xaf, 0x44, 0xbc, 0x58, 0xd3, 0xf6, 0x05,
+	0xd1, 0x36, 0x62, 0x0a, 0xd0, 0x9d, 0xa8, 0xb7, 0x29, 0xe8, 0xca, 0x80, 0xdd, 0x99, 0xe7, 0xb7,
+	0x39, 0xca, 0xba, 0xf3, 0xaa, 0x7f, 0x32, 0xf2, 0xc6, 0x47, 0x4e, 0x8e, 0x31, 0x61, 0x2a, 0x26,
+	0xa8, 0x63, 0x1a, 0x83, 0x2a, 0x9f, 0x32, 0xad, 0x24, 0x96, 0x0a, 0xb3, 0xfe, 0xb3, 0xfe, 0x6f,
+	0x0c, 0xef, 0x5a, 0x1f, 0x86, 0x83, 0xfe, 0xe4, 0x53, 0x99, 0xf3, 0xe7, 0x39, 0x00, 0x00, 0xff,
+	0xff, 0xba, 0xe6, 0x43, 0xb1, 0xf3, 0x03, 0x00, 0x00,
+}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -209,36 +242,3 @@ var _ContainerAnalysis_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/containeranalysis/v1/containeranalysis.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1/containeranalysis.proto", fileDescriptor_containeranalysis_21b725fe07df89a8)
-}
-
-var fileDescriptor_containeranalysis_21b725fe07df89a8 = []byte{
-	// 393 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x4f, 0x6a, 0xdb, 0x40,
-	0x14, 0xc6, 0x91, 0x4b, 0xbb, 0x10, 0xdd, 0x54, 0xd0, 0x8d, 0x28, 0x35, 0x88, 0x2e, 0x5a, 0x2f,
-	0x66, 0x70, 0xdb, 0x4d, 0xdd, 0x84, 0xe0, 0x78, 0x61, 0xb2, 0x33, 0xf9, 0xb3, 0xf1, 0x26, 0x8c,
-	0x27, 0x2f, 0x62, 0x82, 0x66, 0x9e, 0x32, 0x33, 0x12, 0x38, 0x21, 0x60, 0xb2, 0xc8, 0x05, 0x72,
-	0x83, 0x5c, 0x24, 0x87, 0xc8, 0x15, 0xb2, 0xcc, 0x21, 0x82, 0xa4, 0x51, 0xb0, 0x2d, 0xc7, 0x98,
-	0x40, 0x96, 0xf3, 0xbe, 0xf7, 0x7d, 0xf3, 0xfd, 0x60, 0xc6, 0xdf, 0x8a, 0x11, 0xe3, 0x04, 0xe8,
-	0x09, 0xe4, 0x16, 0x31, 0x31, 0x94, 0xa3, 0xb2, 0x4c, 0x28, 0xd0, 0x4c, 0xb1, 0x64, 0x6a, 0x84,
-	0xa1, 0x79, 0xb7, 0x39, 0x24, 0xa9, 0x46, 0x8b, 0xc1, 0x8f, 0xca, 0x4d, 0x6a, 0x37, 0x69, 0x2e,
-	0xe6, 0xdd, 0xf0, 0x9b, 0xbb, 0x83, 0xa5, 0x82, 0x32, 0xa5, 0xd0, 0x32, 0x2b, 0x50, 0xb9, 0x8c,
-	0xf0, 0xbb, 0x53, 0x05, 0x93, 0xc5, 0x55, 0x82, 0xc9, 0xe3, 0x14, 0x13, 0xc1, 0xa7, 0x4e, 0x0f,
-	0x17, 0xf5, 0x05, 0xad, 0xed, 0xb4, 0xf2, 0x34, 0xc9, 0x4e, 0xa9, 0x15, 0x12, 0x8c, 0x65, 0x32,
-	0xad, 0x16, 0x7e, 0xdf, 0x7c, 0xf4, 0xbf, 0x0c, 0xea, 0x4e, 0x7d, 0xd7, 0x29, 0xb8, 0xf7, 0xfc,
-	0xcf, 0x07, 0x60, 0xf7, 0x98, 0x1c, 0x95, 0x69, 0x41, 0x44, 0x1c, 0x88, 0x60, 0x92, 0xe4, 0x5d,
-	0x32, 0x2f, 0xee, 0xc3, 0x79, 0x06, 0xc6, 0x86, 0x5f, 0x97, 0x76, 0x2a, 0x35, 0xb2, 0xd7, 0x0f,
-	0x8f, 0xb7, 0x2d, 0x15, 0x91, 0xa2, 0xdc, 0xa5, 0x06, 0x83, 0x99, 0xe6, 0xb0, 0x9d, 0x6a, 0x3c,
-	0x03, 0x6e, 0x0d, 0xed, 0x50, 0x85, 0x16, 0x0c, 0xed, 0x5c, 0xf5, 0xcc, 0x5c, 0x6a, 0xcf, 0xeb,
-	0x8c, 0xff, 0x45, 0x7f, 0x5f, 0x35, 0x21, 0xe7, 0x99, 0xd6, 0xa0, 0xf8, 0x4a, 0x6b, 0x49, 0x30,
-	0x5c, 0x47, 0x30, 0x7c, 0x17, 0x82, 0xf8, 0xed, 0x04, 0x4b, 0xd6, 0xe0, 0xc9, 0xf3, 0x83, 0x43,
-	0x30, 0xe5, 0x10, 0xb4, 0x14, 0xc6, 0x14, 0x6f, 0x22, 0xf8, 0xb9, 0xd4, 0xb1, 0xb9, 0x52, 0xd3,
-	0xfc, 0xda, 0x60, 0xd3, 0xa4, 0xa8, 0x0c, 0x44, 0x33, 0xaf, 0x44, 0xbc, 0x58, 0xd3, 0xf6, 0x05,
-	0xd1, 0x36, 0x62, 0x0a, 0xd0, 0x9d, 0xa8, 0xb7, 0x29, 0xe8, 0xca, 0x80, 0xdd, 0x99, 0xe7, 0xb7,
-	0x39, 0xca, 0xba, 0xf3, 0xaa, 0x7f, 0x32, 0xf2, 0xc6, 0x47, 0x4e, 0x8e, 0x31, 0x61, 0x2a, 0x26,
-	0xa8, 0x63, 0x1a, 0x83, 0x2a, 0x9f, 0x32, 0xad, 0x24, 0x96, 0x0a, 0xb3, 0xfe, 0xb3, 0xfe, 0x6f,
-	0x0c, 0xef, 0x5a, 0x1f, 0x86, 0x83, 0xfe, 0xe4, 0x53, 0x99, 0xf3, 0xe7, 0x39, 0x00, 0x00, 0xff,
-	0xff, 0xba, 0xe6, 0x43, 0xb1, 0xf3, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
index 45c8a65fb0..1421f26cc7 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Instruction set architectures supported by various package managers.
 type PackageManager_Architecture int32
@@ -36,6 +39,7 @@ var PackageManager_Architecture_name = map[int32]string{
 	1: "X86",
 	2: "X64",
 }
+
 var PackageManager_Architecture_value = map[string]int32{
 	"ARCHITECTURE_UNSPECIFIED": 0,
 	"X86":                      1,
@@ -45,8 +49,9 @@ var PackageManager_Architecture_value = map[string]int32{
 func (x PackageManager_Architecture) String() string {
 	return proto.EnumName(PackageManager_Architecture_name, int32(x))
 }
+
 func (PackageManager_Architecture) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bill_of_materials_5994c0bb5dadb2f3, []int{0, 0}
+	return fileDescriptor_7bcf14fe966f6fd8, []int{0, 0}
 }
 
 // PackageManager provides metadata about available / installed packages.
@@ -60,16 +65,17 @@ func (m *PackageManager) Reset()         { *m = PackageManager{} }
 func (m *PackageManager) String() string { return proto.CompactTextString(m) }
 func (*PackageManager) ProtoMessage()    {}
 func (*PackageManager) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bill_of_materials_5994c0bb5dadb2f3, []int{0}
+	return fileDescriptor_7bcf14fe966f6fd8, []int{0}
 }
+
 func (m *PackageManager) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackageManager.Unmarshal(m, b)
 }
 func (m *PackageManager) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PackageManager.Marshal(b, m, deterministic)
 }
-func (dst *PackageManager) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PackageManager.Merge(dst, src)
+func (m *PackageManager) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager.Merge(m, src)
 }
 func (m *PackageManager) XXX_Size() int {
 	return xxx_messageInfo_PackageManager.Size(m)
@@ -107,16 +113,17 @@ func (m *PackageManager_Distribution) Reset()         { *m = PackageManager_Dist
 func (m *PackageManager_Distribution) String() string { return proto.CompactTextString(m) }
 func (*PackageManager_Distribution) ProtoMessage()    {}
 func (*PackageManager_Distribution) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bill_of_materials_5994c0bb5dadb2f3, []int{0, 0}
+	return fileDescriptor_7bcf14fe966f6fd8, []int{0, 0}
 }
+
 func (m *PackageManager_Distribution) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackageManager_Distribution.Unmarshal(m, b)
 }
 func (m *PackageManager_Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PackageManager_Distribution.Marshal(b, m, deterministic)
 }
-func (dst *PackageManager_Distribution) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PackageManager_Distribution.Merge(dst, src)
+func (m *PackageManager_Distribution) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Distribution.Merge(m, src)
 }
 func (m *PackageManager_Distribution) XXX_Size() int {
 	return xxx_messageInfo_PackageManager_Distribution.Size(m)
@@ -189,16 +196,17 @@ func (m *PackageManager_Location) Reset()         { *m = PackageManager_Location
 func (m *PackageManager_Location) String() string { return proto.CompactTextString(m) }
 func (*PackageManager_Location) ProtoMessage()    {}
 func (*PackageManager_Location) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bill_of_materials_5994c0bb5dadb2f3, []int{0, 1}
+	return fileDescriptor_7bcf14fe966f6fd8, []int{0, 1}
 }
+
 func (m *PackageManager_Location) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackageManager_Location.Unmarshal(m, b)
 }
 func (m *PackageManager_Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PackageManager_Location.Marshal(b, m, deterministic)
 }
-func (dst *PackageManager_Location) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PackageManager_Location.Merge(dst, src)
+func (m *PackageManager_Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Location.Merge(m, src)
 }
 func (m *PackageManager_Location) XXX_Size() int {
 	return xxx_messageInfo_PackageManager_Location.Size(m)
@@ -247,16 +255,17 @@ func (m *PackageManager_Package) Reset()         { *m = PackageManager_Package{}
 func (m *PackageManager_Package) String() string { return proto.CompactTextString(m) }
 func (*PackageManager_Package) ProtoMessage()    {}
 func (*PackageManager_Package) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bill_of_materials_5994c0bb5dadb2f3, []int{0, 2}
+	return fileDescriptor_7bcf14fe966f6fd8, []int{0, 2}
 }
+
 func (m *PackageManager_Package) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackageManager_Package.Unmarshal(m, b)
 }
 func (m *PackageManager_Package) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PackageManager_Package.Marshal(b, m, deterministic)
 }
-func (dst *PackageManager_Package) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PackageManager_Package.Merge(dst, src)
+func (m *PackageManager_Package) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Package.Merge(m, src)
 }
 func (m *PackageManager_Package) XXX_Size() int {
 	return xxx_messageInfo_PackageManager_Package.Size(m)
@@ -298,16 +307,17 @@ func (m *PackageManager_Installation) Reset()         { *m = PackageManager_Inst
 func (m *PackageManager_Installation) String() string { return proto.CompactTextString(m) }
 func (*PackageManager_Installation) ProtoMessage()    {}
 func (*PackageManager_Installation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bill_of_materials_5994c0bb5dadb2f3, []int{0, 3}
+	return fileDescriptor_7bcf14fe966f6fd8, []int{0, 3}
 }
+
 func (m *PackageManager_Installation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackageManager_Installation.Unmarshal(m, b)
 }
 func (m *PackageManager_Installation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PackageManager_Installation.Marshal(b, m, deterministic)
 }
-func (dst *PackageManager_Installation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PackageManager_Installation.Merge(dst, src)
+func (m *PackageManager_Installation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Installation.Merge(m, src)
 }
 func (m *PackageManager_Installation) XXX_Size() int {
 	return xxx_messageInfo_PackageManager_Installation.Size(m)
@@ -333,19 +343,19 @@ func (m *PackageManager_Installation) GetLocation() []*PackageManager_Location {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.PackageManager_Architecture", PackageManager_Architecture_name, PackageManager_Architecture_value)
 	proto.RegisterType((*PackageManager)(nil), "google.devtools.containeranalysis.v1alpha1.PackageManager")
 	proto.RegisterType((*PackageManager_Distribution)(nil), "google.devtools.containeranalysis.v1alpha1.PackageManager.Distribution")
 	proto.RegisterType((*PackageManager_Location)(nil), "google.devtools.containeranalysis.v1alpha1.PackageManager.Location")
 	proto.RegisterType((*PackageManager_Package)(nil), "google.devtools.containeranalysis.v1alpha1.PackageManager.Package")
 	proto.RegisterType((*PackageManager_Installation)(nil), "google.devtools.containeranalysis.v1alpha1.PackageManager.Installation")
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.PackageManager_Architecture", PackageManager_Architecture_name, PackageManager_Architecture_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto", fileDescriptor_bill_of_materials_5994c0bb5dadb2f3)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto", fileDescriptor_7bcf14fe966f6fd8)
 }
 
-var fileDescriptor_bill_of_materials_5994c0bb5dadb2f3 = []byte{
+var fileDescriptor_7bcf14fe966f6fd8 = []byte{
 	// 522 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xd1, 0x8a, 0xd3, 0x4e,
 	0x14, 0xc6, 0xff, 0x49, 0x97, 0x76, 0xf7, 0xb4, 0xff, 0x52, 0xe6, 0xc6, 0x10, 0x16, 0x29, 0x0b,
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
index 7a30d6dc0b..b95f9c0b29 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
@@ -1,22 +1,22 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/containeranalysis.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/any"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package containeranalysis
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/any"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -29,7 +29,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // This must be 1:1 with members of our oneofs, it can be used for filtering
 // Note and Occurrence on their kind.
@@ -64,6 +64,7 @@ var Note_Kind_name = map[int32]string{
 	7: "DISCOVERY",
 	8: "ATTESTATION_AUTHORITY",
 }
+
 var Note_Kind_value = map[string]int32{
 	"KIND_UNSPECIFIED":      0,
 	"PACKAGE_VULNERABILITY": 2,
@@ -78,8 +79,9 @@ var Note_Kind_value = map[string]int32{
 func (x Note_Kind) String() string {
 	return proto.EnumName(Note_Kind_name, int32(x))
 }
+
 func (Note_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{2, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{2, 0}
 }
 
 // Types of platforms.
@@ -102,6 +104,7 @@ var Deployable_Deployment_Platform_name = map[int32]string{
 	2: "FLEX",
 	3: "CUSTOM",
 }
+
 var Deployable_Deployment_Platform_value = map[string]int32{
 	"PLATFORM_UNSPECIFIED": 0,
 	"GKE":                  1,
@@ -112,8 +115,9 @@ var Deployable_Deployment_Platform_value = map[string]int32{
 func (x Deployable_Deployment_Platform) String() string {
 	return proto.EnumName(Deployable_Deployment_Platform_name, int32(x))
 }
+
 func (Deployable_Deployment_Platform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{3, 0, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{3, 0, 0}
 }
 
 // Analysis status for a resource.
@@ -143,6 +147,7 @@ var Discovery_Discovered_AnalysisStatus_name = map[int32]string{
 	4: "FINISHED_FAILED",
 	5: "UNSUPPORTED_RESOURCE",
 }
+
 var Discovery_Discovered_AnalysisStatus_value = map[string]int32{
 	"ANALYSIS_STATUS_UNSPECIFIED": 0,
 	"PENDING":                     1,
@@ -155,8 +160,9 @@ var Discovery_Discovered_AnalysisStatus_value = map[string]int32{
 func (x Discovery_Discovered_AnalysisStatus) String() string {
 	return proto.EnumName(Discovery_Discovered_AnalysisStatus_name, int32(x))
 }
+
 func (Discovery_Discovered_AnalysisStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{4, 0, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{4, 0, 0}
 }
 
 // Public key formats
@@ -176,6 +182,7 @@ var BuildSignature_KeyType_name = map[int32]string{
 	1: "PGP_ASCII_ARMORED",
 	2: "PKIX_PEM",
 }
+
 var BuildSignature_KeyType_value = map[string]int32{
 	"KEY_TYPE_UNSPECIFIED": 0,
 	"PGP_ASCII_ARMORED":    1,
@@ -185,8 +192,9 @@ var BuildSignature_KeyType_value = map[string]int32{
 func (x BuildSignature_KeyType) String() string {
 	return proto.EnumName(BuildSignature_KeyType_name, int32(x))
 }
+
 func (BuildSignature_KeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{6, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{6, 0}
 }
 
 // Type (for example schema) of the attestation payload that was signed.
@@ -206,6 +214,7 @@ var PgpSignedAttestation_ContentType_name = map[int32]string{
 	0: "CONTENT_TYPE_UNSPECIFIED",
 	1: "SIMPLE_SIGNING_JSON",
 }
+
 var PgpSignedAttestation_ContentType_value = map[string]int32{
 	"CONTENT_TYPE_UNSPECIFIED": 0,
 	"SIMPLE_SIGNING_JSON":      1,
@@ -214,8 +223,9 @@ var PgpSignedAttestation_ContentType_value = map[string]int32{
 func (x PgpSignedAttestation_ContentType) String() string {
 	return proto.EnumName(PgpSignedAttestation_ContentType_name, int32(x))
 }
+
 func (PgpSignedAttestation_ContentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{7, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{7, 0}
 }
 
 // `Occurrence` includes information about analysis occurrences for an image.
@@ -262,16 +272,17 @@ func (m *Occurrence) Reset()         { *m = Occurrence{} }
 func (m *Occurrence) String() string { return proto.CompactTextString(m) }
 func (*Occurrence) ProtoMessage()    {}
 func (*Occurrence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{0}
+	return fileDescriptor_5ffce145f2f590bf, []int{0}
 }
+
 func (m *Occurrence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Occurrence.Unmarshal(m, b)
 }
 func (m *Occurrence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Occurrence.Marshal(b, m, deterministic)
 }
-func (dst *Occurrence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Occurrence.Merge(dst, src)
+func (m *Occurrence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Occurrence.Merge(m, src)
 }
 func (m *Occurrence) XXX_Size() int {
 	return xxx_messageInfo_Occurrence.Size(m)
@@ -440,9 +451,9 @@ func (m *Occurrence) GetUpdateTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Occurrence) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Occurrence_OneofMarshaler, _Occurrence_OneofUnmarshaler, _Occurrence_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Occurrence) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Occurrence_VulnerabilityDetails)(nil),
 		(*Occurrence_BuildDetails)(nil),
 		(*Occurrence_DerivedImage)(nil),
@@ -453,162 +464,6 @@ func (*Occurrence) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _Occurrence_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Occurrence)
-	// details
-	switch x := m.Details.(type) {
-	case *Occurrence_VulnerabilityDetails:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VulnerabilityDetails); err != nil {
-			return err
-		}
-	case *Occurrence_BuildDetails:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BuildDetails); err != nil {
-			return err
-		}
-	case *Occurrence_DerivedImage:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DerivedImage); err != nil {
-			return err
-		}
-	case *Occurrence_Installation:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Installation); err != nil {
-			return err
-		}
-	case *Occurrence_Deployment:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Deployment); err != nil {
-			return err
-		}
-	case *Occurrence_Discovered:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Discovered); err != nil {
-			return err
-		}
-	case *Occurrence_Attestation:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Attestation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Occurrence.Details has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Occurrence_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Occurrence)
-	switch tag {
-	case 8: // details.vulnerability_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VulnerabilityType_VulnerabilityDetails)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_VulnerabilityDetails{msg}
-		return true, err
-	case 7: // details.build_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildDetails)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_BuildDetails{msg}
-		return true, err
-	case 11: // details.derived_image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DockerImage_Derived)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_DerivedImage{msg}
-		return true, err
-	case 12: // details.installation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PackageManager_Installation)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Installation{msg}
-		return true, err
-	case 14: // details.deployment
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Deployable_Deployment)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Deployment{msg}
-		return true, err
-	case 15: // details.discovered
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Discovery_Discovered)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Discovered{msg}
-		return true, err
-	case 16: // details.attestation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AttestationAuthority_Attestation)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Attestation{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Occurrence_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Occurrence)
-	// details
-	switch x := m.Details.(type) {
-	case *Occurrence_VulnerabilityDetails:
-		s := proto.Size(x.VulnerabilityDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_BuildDetails:
-		s := proto.Size(x.BuildDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_DerivedImage:
-		s := proto.Size(x.DerivedImage)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Installation:
-		s := proto.Size(x.Installation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Deployment:
-		s := proto.Size(x.Deployment)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Discovered:
-		s := proto.Size(x.Discovered)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Attestation:
-		s := proto.Size(x.Attestation)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Resource is an entity that can have metadata. E.g., a Docker image.
 type Resource struct {
 	// The name of the resource. E.g., the name of a Docker image - "Debian".
@@ -627,16 +482,17 @@ func (m *Resource) Reset()         { *m = Resource{} }
 func (m *Resource) String() string { return proto.CompactTextString(m) }
 func (*Resource) ProtoMessage()    {}
 func (*Resource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{1}
+	return fileDescriptor_5ffce145f2f590bf, []int{1}
 }
+
 func (m *Resource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resource.Unmarshal(m, b)
 }
 func (m *Resource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Resource.Marshal(b, m, deterministic)
 }
-func (dst *Resource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resource.Merge(dst, src)
+func (m *Resource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resource.Merge(m, src)
 }
 func (m *Resource) XXX_Size() int {
 	return xxx_messageInfo_Resource.Size(m)
@@ -710,16 +566,17 @@ func (m *Note) Reset()         { *m = Note{} }
 func (m *Note) String() string { return proto.CompactTextString(m) }
 func (*Note) ProtoMessage()    {}
 func (*Note) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{2}
+	return fileDescriptor_5ffce145f2f590bf, []int{2}
 }
+
 func (m *Note) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Note.Unmarshal(m, b)
 }
 func (m *Note) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Note.Marshal(b, m, deterministic)
 }
-func (dst *Note) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Note.Merge(dst, src)
+func (m *Note) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Note.Merge(m, src)
 }
 func (m *Note) XXX_Size() int {
 	return xxx_messageInfo_Note.Size(m)
@@ -888,9 +745,9 @@ func (m *Note) GetUpdateTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Note) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Note_OneofMarshaler, _Note_OneofUnmarshaler, _Note_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Note) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Note_VulnerabilityType)(nil),
 		(*Note_BuildType)(nil),
 		(*Note_BaseImage)(nil),
@@ -901,162 +758,6 @@ func (*Note) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, f
 	}
 }
 
-func _Note_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Note)
-	// note_type
-	switch x := m.NoteType.(type) {
-	case *Note_VulnerabilityType:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.VulnerabilityType); err != nil {
-			return err
-		}
-	case *Note_BuildType:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BuildType); err != nil {
-			return err
-		}
-	case *Note_BaseImage:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BaseImage); err != nil {
-			return err
-		}
-	case *Note_Package:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Package); err != nil {
-			return err
-		}
-	case *Note_Deployable:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Deployable); err != nil {
-			return err
-		}
-	case *Note_Discovery:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Discovery); err != nil {
-			return err
-		}
-	case *Note_AttestationAuthority:
-		b.EncodeVarint(19<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AttestationAuthority); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Note.NoteType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Note_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Note)
-	switch tag {
-	case 6: // note_type.vulnerability_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VulnerabilityType)
-		err := b.DecodeMessage(msg)
-		m.NoteType = &Note_VulnerabilityType{msg}
-		return true, err
-	case 8: // note_type.build_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildType)
-		err := b.DecodeMessage(msg)
-		m.NoteType = &Note_BuildType{msg}
-		return true, err
-	case 13: // note_type.base_image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DockerImage_Basis)
-		err := b.DecodeMessage(msg)
-		m.NoteType = &Note_BaseImage{msg}
-		return true, err
-	case 14: // note_type.package
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PackageManager_Package)
-		err := b.DecodeMessage(msg)
-		m.NoteType = &Note_Package{msg}
-		return true, err
-	case 17: // note_type.deployable
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Deployable)
-		err := b.DecodeMessage(msg)
-		m.NoteType = &Note_Deployable{msg}
-		return true, err
-	case 18: // note_type.discovery
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Discovery)
-		err := b.DecodeMessage(msg)
-		m.NoteType = &Note_Discovery{msg}
-		return true, err
-	case 19: // note_type.attestation_authority
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AttestationAuthority)
-		err := b.DecodeMessage(msg)
-		m.NoteType = &Note_AttestationAuthority{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Note_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Note)
-	// note_type
-	switch x := m.NoteType.(type) {
-	case *Note_VulnerabilityType:
-		s := proto.Size(x.VulnerabilityType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_BuildType:
-		s := proto.Size(x.BuildType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_BaseImage:
-		s := proto.Size(x.BaseImage)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_Package:
-		s := proto.Size(x.Package)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_Deployable:
-		s := proto.Size(x.Deployable)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_Discovery:
-		s := proto.Size(x.Discovery)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_AttestationAuthority:
-		s := proto.Size(x.AttestationAuthority)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Metadata for any related URL information
 type Note_RelatedUrl struct {
 	// Specific URL to associate with the note
@@ -1072,16 +773,17 @@ func (m *Note_RelatedUrl) Reset()         { *m = Note_RelatedUrl{} }
 func (m *Note_RelatedUrl) String() string { return proto.CompactTextString(m) }
 func (*Note_RelatedUrl) ProtoMessage()    {}
 func (*Note_RelatedUrl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{2, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{2, 0}
 }
+
 func (m *Note_RelatedUrl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Note_RelatedUrl.Unmarshal(m, b)
 }
 func (m *Note_RelatedUrl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Note_RelatedUrl.Marshal(b, m, deterministic)
 }
-func (dst *Note_RelatedUrl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Note_RelatedUrl.Merge(dst, src)
+func (m *Note_RelatedUrl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Note_RelatedUrl.Merge(m, src)
 }
 func (m *Note_RelatedUrl) XXX_Size() int {
 	return xxx_messageInfo_Note_RelatedUrl.Size(m)
@@ -1119,16 +821,17 @@ func (m *Deployable) Reset()         { *m = Deployable{} }
 func (m *Deployable) String() string { return proto.CompactTextString(m) }
 func (*Deployable) ProtoMessage()    {}
 func (*Deployable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{3}
+	return fileDescriptor_5ffce145f2f590bf, []int{3}
 }
+
 func (m *Deployable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Deployable.Unmarshal(m, b)
 }
 func (m *Deployable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Deployable.Marshal(b, m, deterministic)
 }
-func (dst *Deployable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Deployable.Merge(dst, src)
+func (m *Deployable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployable.Merge(m, src)
 }
 func (m *Deployable) XXX_Size() int {
 	return xxx_messageInfo_Deployable.Size(m)
@@ -1172,16 +875,17 @@ func (m *Deployable_Deployment) Reset()         { *m = Deployable_Deployment{} }
 func (m *Deployable_Deployment) String() string { return proto.CompactTextString(m) }
 func (*Deployable_Deployment) ProtoMessage()    {}
 func (*Deployable_Deployment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{3, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{3, 0}
 }
+
 func (m *Deployable_Deployment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Deployable_Deployment.Unmarshal(m, b)
 }
 func (m *Deployable_Deployment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Deployable_Deployment.Marshal(b, m, deterministic)
 }
-func (dst *Deployable_Deployment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Deployable_Deployment.Merge(dst, src)
+func (m *Deployable_Deployment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployable_Deployment.Merge(m, src)
 }
 func (m *Deployable_Deployment) XXX_Size() int {
 	return xxx_messageInfo_Deployable_Deployment.Size(m)
@@ -1258,16 +962,17 @@ func (m *Discovery) Reset()         { *m = Discovery{} }
 func (m *Discovery) String() string { return proto.CompactTextString(m) }
 func (*Discovery) ProtoMessage()    {}
 func (*Discovery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{4}
+	return fileDescriptor_5ffce145f2f590bf, []int{4}
 }
+
 func (m *Discovery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Discovery.Unmarshal(m, b)
 }
 func (m *Discovery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Discovery.Marshal(b, m, deterministic)
 }
-func (dst *Discovery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Discovery.Merge(dst, src)
+func (m *Discovery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Discovery.Merge(m, src)
 }
 func (m *Discovery) XXX_Size() int {
 	return xxx_messageInfo_Discovery.Size(m)
@@ -1304,16 +1009,17 @@ func (m *Discovery_Discovered) Reset()         { *m = Discovery_Discovered{} }
 func (m *Discovery_Discovered) String() string { return proto.CompactTextString(m) }
 func (*Discovery_Discovered) ProtoMessage()    {}
 func (*Discovery_Discovered) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{4, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{4, 0}
 }
+
 func (m *Discovery_Discovered) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Discovery_Discovered.Unmarshal(m, b)
 }
 func (m *Discovery_Discovered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Discovery_Discovered.Marshal(b, m, deterministic)
 }
-func (dst *Discovery_Discovered) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Discovery_Discovered.Merge(dst, src)
+func (m *Discovery_Discovered) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Discovery_Discovered.Merge(m, src)
 }
 func (m *Discovery_Discovered) XXX_Size() int {
 	return xxx_messageInfo_Discovery_Discovered.Size(m)
@@ -1362,16 +1068,17 @@ func (m *BuildType) Reset()         { *m = BuildType{} }
 func (m *BuildType) String() string { return proto.CompactTextString(m) }
 func (*BuildType) ProtoMessage()    {}
 func (*BuildType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{5}
+	return fileDescriptor_5ffce145f2f590bf, []int{5}
 }
+
 func (m *BuildType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildType.Unmarshal(m, b)
 }
 func (m *BuildType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildType.Marshal(b, m, deterministic)
 }
-func (dst *BuildType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildType.Merge(dst, src)
+func (m *BuildType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildType.Merge(m, src)
 }
 func (m *BuildType) XXX_Size() int {
 	return xxx_messageInfo_BuildType.Size(m)
@@ -1431,16 +1138,17 @@ func (m *BuildSignature) Reset()         { *m = BuildSignature{} }
 func (m *BuildSignature) String() string { return proto.CompactTextString(m) }
 func (*BuildSignature) ProtoMessage()    {}
 func (*BuildSignature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{6}
+	return fileDescriptor_5ffce145f2f590bf, []int{6}
 }
+
 func (m *BuildSignature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildSignature.Unmarshal(m, b)
 }
 func (m *BuildSignature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildSignature.Marshal(b, m, deterministic)
 }
-func (dst *BuildSignature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildSignature.Merge(dst, src)
+func (m *BuildSignature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildSignature.Merge(m, src)
 }
 func (m *BuildSignature) XXX_Size() int {
 	return xxx_messageInfo_BuildSignature.Size(m)
@@ -1519,16 +1227,17 @@ func (m *PgpSignedAttestation) Reset()         { *m = PgpSignedAttestation{} }
 func (m *PgpSignedAttestation) String() string { return proto.CompactTextString(m) }
 func (*PgpSignedAttestation) ProtoMessage()    {}
 func (*PgpSignedAttestation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{7}
+	return fileDescriptor_5ffce145f2f590bf, []int{7}
 }
+
 func (m *PgpSignedAttestation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PgpSignedAttestation.Unmarshal(m, b)
 }
 func (m *PgpSignedAttestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PgpSignedAttestation.Marshal(b, m, deterministic)
 }
-func (dst *PgpSignedAttestation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PgpSignedAttestation.Merge(dst, src)
+func (m *PgpSignedAttestation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PgpSignedAttestation.Merge(m, src)
 }
 func (m *PgpSignedAttestation) XXX_Size() int {
 	return xxx_messageInfo_PgpSignedAttestation.Size(m)
@@ -1577,57 +1286,13 @@ func (m *PgpSignedAttestation) GetPgpKeyId() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PgpSignedAttestation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PgpSignedAttestation_OneofMarshaler, _PgpSignedAttestation_OneofUnmarshaler, _PgpSignedAttestation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PgpSignedAttestation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PgpSignedAttestation_PgpKeyId)(nil),
 	}
 }
 
-func _PgpSignedAttestation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PgpSignedAttestation)
-	// key_id
-	switch x := m.KeyId.(type) {
-	case *PgpSignedAttestation_PgpKeyId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PgpKeyId)
-	case nil:
-	default:
-		return fmt.Errorf("PgpSignedAttestation.KeyId has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PgpSignedAttestation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PgpSignedAttestation)
-	switch tag {
-	case 2: // key_id.pgp_key_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.KeyId = &PgpSignedAttestation_PgpKeyId{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PgpSignedAttestation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PgpSignedAttestation)
-	// key_id
-	switch x := m.KeyId.(type) {
-	case *PgpSignedAttestation_PgpKeyId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PgpKeyId)))
-		n += len(x.PgpKeyId)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Note kind that represents a logical attestation "role" or "authority".  For
 // example, an organization might have one `AttestationAuthority` for "QA" and
 // one for "build".  This Note is intended to act strictly as a grouping
@@ -1647,16 +1312,17 @@ func (m *AttestationAuthority) Reset()         { *m = AttestationAuthority{} }
 func (m *AttestationAuthority) String() string { return proto.CompactTextString(m) }
 func (*AttestationAuthority) ProtoMessage()    {}
 func (*AttestationAuthority) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{8}
+	return fileDescriptor_5ffce145f2f590bf, []int{8}
 }
+
 func (m *AttestationAuthority) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttestationAuthority.Unmarshal(m, b)
 }
 func (m *AttestationAuthority) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttestationAuthority.Marshal(b, m, deterministic)
 }
-func (dst *AttestationAuthority) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttestationAuthority.Merge(dst, src)
+func (m *AttestationAuthority) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttestationAuthority.Merge(m, src)
 }
 func (m *AttestationAuthority) XXX_Size() int {
 	return xxx_messageInfo_AttestationAuthority.Size(m)
@@ -1697,16 +1363,17 @@ func (m *AttestationAuthority_AttestationAuthorityHint) String() string {
 }
 func (*AttestationAuthority_AttestationAuthorityHint) ProtoMessage() {}
 func (*AttestationAuthority_AttestationAuthorityHint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{8, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{8, 0}
 }
+
 func (m *AttestationAuthority_AttestationAuthorityHint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Unmarshal(m, b)
 }
 func (m *AttestationAuthority_AttestationAuthorityHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Marshal(b, m, deterministic)
 }
-func (dst *AttestationAuthority_AttestationAuthorityHint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Merge(dst, src)
+func (m *AttestationAuthority_AttestationAuthorityHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Merge(m, src)
 }
 func (m *AttestationAuthority_AttestationAuthorityHint) XXX_Size() int {
 	return xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Size(m)
@@ -1749,16 +1416,17 @@ func (m *AttestationAuthority_Attestation) Reset()         { *m = AttestationAut
 func (m *AttestationAuthority_Attestation) String() string { return proto.CompactTextString(m) }
 func (*AttestationAuthority_Attestation) ProtoMessage()    {}
 func (*AttestationAuthority_Attestation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{8, 1}
+	return fileDescriptor_5ffce145f2f590bf, []int{8, 1}
 }
+
 func (m *AttestationAuthority_Attestation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AttestationAuthority_Attestation.Unmarshal(m, b)
 }
 func (m *AttestationAuthority_Attestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AttestationAuthority_Attestation.Marshal(b, m, deterministic)
 }
-func (dst *AttestationAuthority_Attestation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AttestationAuthority_Attestation.Merge(dst, src)
+func (m *AttestationAuthority_Attestation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttestationAuthority_Attestation.Merge(m, src)
 }
 func (m *AttestationAuthority_Attestation) XXX_Size() int {
 	return xxx_messageInfo_AttestationAuthority_Attestation.Size(m)
@@ -1794,61 +1462,13 @@ func (m *AttestationAuthority_Attestation) GetPgpSignedAttestation() *PgpSignedA
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AttestationAuthority_Attestation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AttestationAuthority_Attestation_OneofMarshaler, _AttestationAuthority_Attestation_OneofUnmarshaler, _AttestationAuthority_Attestation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AttestationAuthority_Attestation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AttestationAuthority_Attestation_PgpSignedAttestation)(nil),
 	}
 }
 
-func _AttestationAuthority_Attestation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AttestationAuthority_Attestation)
-	// signature
-	switch x := m.Signature.(type) {
-	case *AttestationAuthority_Attestation_PgpSignedAttestation:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PgpSignedAttestation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AttestationAuthority_Attestation.Signature has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AttestationAuthority_Attestation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AttestationAuthority_Attestation)
-	switch tag {
-	case 1: // signature.pgp_signed_attestation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PgpSignedAttestation)
-		err := b.DecodeMessage(msg)
-		m.Signature = &AttestationAuthority_Attestation_PgpSignedAttestation{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AttestationAuthority_Attestation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AttestationAuthority_Attestation)
-	// signature
-	switch x := m.Signature.(type) {
-	case *AttestationAuthority_Attestation_PgpSignedAttestation:
-		s := proto.Size(x.PgpSignedAttestation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message encapsulating build provenance details.
 type BuildDetails struct {
 	// The actual provenance
@@ -1874,16 +1494,17 @@ func (m *BuildDetails) Reset()         { *m = BuildDetails{} }
 func (m *BuildDetails) String() string { return proto.CompactTextString(m) }
 func (*BuildDetails) ProtoMessage()    {}
 func (*BuildDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{9}
+	return fileDescriptor_5ffce145f2f590bf, []int{9}
 }
+
 func (m *BuildDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildDetails.Unmarshal(m, b)
 }
 func (m *BuildDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildDetails.Marshal(b, m, deterministic)
 }
-func (dst *BuildDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildDetails.Merge(dst, src)
+func (m *BuildDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildDetails.Merge(m, src)
 }
 func (m *BuildDetails) XXX_Size() int {
 	return xxx_messageInfo_BuildDetails.Size(m)
@@ -1926,16 +1547,17 @@ func (m *ScanConfig) Reset()         { *m = ScanConfig{} }
 func (m *ScanConfig) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig) ProtoMessage()    {}
 func (*ScanConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{10}
+	return fileDescriptor_5ffce145f2f590bf, []int{10}
 }
+
 func (m *ScanConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig.Unmarshal(m, b)
 }
 func (m *ScanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig.Merge(dst, src)
+func (m *ScanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig.Merge(m, src)
 }
 func (m *ScanConfig) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig.Size(m)
@@ -1981,16 +1603,17 @@ func (m *GetOccurrenceRequest) Reset()         { *m = GetOccurrenceRequest{} }
 func (m *GetOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOccurrenceRequest) ProtoMessage()    {}
 func (*GetOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{11}
+	return fileDescriptor_5ffce145f2f590bf, []int{11}
 }
+
 func (m *GetOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *GetOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOccurrenceRequest.Merge(dst, src)
+func (m *GetOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOccurrenceRequest.Merge(m, src)
 }
 func (m *GetOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOccurrenceRequest.Size(m)
@@ -2033,16 +1656,17 @@ func (m *ListOccurrencesRequest) Reset()         { *m = ListOccurrencesRequest{}
 func (m *ListOccurrencesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListOccurrencesRequest) ProtoMessage()    {}
 func (*ListOccurrencesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{12}
+	return fileDescriptor_5ffce145f2f590bf, []int{12}
 }
+
 func (m *ListOccurrencesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOccurrencesRequest.Unmarshal(m, b)
 }
 func (m *ListOccurrencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOccurrencesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListOccurrencesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOccurrencesRequest.Merge(dst, src)
+func (m *ListOccurrencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOccurrencesRequest.Merge(m, src)
 }
 func (m *ListOccurrencesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListOccurrencesRequest.Size(m)
@@ -2112,16 +1736,17 @@ func (m *ListOccurrencesResponse) Reset()         { *m = ListOccurrencesResponse
 func (m *ListOccurrencesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListOccurrencesResponse) ProtoMessage()    {}
 func (*ListOccurrencesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{13}
+	return fileDescriptor_5ffce145f2f590bf, []int{13}
 }
+
 func (m *ListOccurrencesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOccurrencesResponse.Unmarshal(m, b)
 }
 func (m *ListOccurrencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOccurrencesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListOccurrencesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOccurrencesResponse.Merge(dst, src)
+func (m *ListOccurrencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOccurrencesResponse.Merge(m, src)
 }
 func (m *ListOccurrencesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListOccurrencesResponse.Size(m)
@@ -2160,16 +1785,17 @@ func (m *DeleteOccurrenceRequest) Reset()         { *m = DeleteOccurrenceRequest
 func (m *DeleteOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteOccurrenceRequest) ProtoMessage()    {}
 func (*DeleteOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{14}
+	return fileDescriptor_5ffce145f2f590bf, []int{14}
 }
+
 func (m *DeleteOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *DeleteOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteOccurrenceRequest.Merge(dst, src)
+func (m *DeleteOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteOccurrenceRequest.Merge(m, src)
 }
 func (m *DeleteOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteOccurrenceRequest.Size(m)
@@ -2205,16 +1831,17 @@ func (m *CreateOccurrenceRequest) Reset()         { *m = CreateOccurrenceRequest
 func (m *CreateOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateOccurrenceRequest) ProtoMessage()    {}
 func (*CreateOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{15}
+	return fileDescriptor_5ffce145f2f590bf, []int{15}
 }
+
 func (m *CreateOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *CreateOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateOccurrenceRequest.Merge(dst, src)
+func (m *CreateOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateOccurrenceRequest.Merge(m, src)
 }
 func (m *CreateOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateOccurrenceRequest.Size(m)
@@ -2264,16 +1891,17 @@ func (m *UpdateOccurrenceRequest) Reset()         { *m = UpdateOccurrenceRequest
 func (m *UpdateOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateOccurrenceRequest) ProtoMessage()    {}
 func (*UpdateOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{16}
+	return fileDescriptor_5ffce145f2f590bf, []int{16}
 }
+
 func (m *UpdateOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *UpdateOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateOccurrenceRequest.Merge(dst, src)
+func (m *UpdateOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateOccurrenceRequest.Merge(m, src)
 }
 func (m *UpdateOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateOccurrenceRequest.Size(m)
@@ -2319,16 +1947,17 @@ func (m *GetNoteRequest) Reset()         { *m = GetNoteRequest{} }
 func (m *GetNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*GetNoteRequest) ProtoMessage()    {}
 func (*GetNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{17}
+	return fileDescriptor_5ffce145f2f590bf, []int{17}
 }
+
 func (m *GetNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNoteRequest.Unmarshal(m, b)
 }
 func (m *GetNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNoteRequest.Merge(dst, src)
+func (m *GetNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNoteRequest.Merge(m, src)
 }
 func (m *GetNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNoteRequest.Size(m)
@@ -2360,16 +1989,17 @@ func (m *GetOccurrenceNoteRequest) Reset()         { *m = GetOccurrenceNoteReque
 func (m *GetOccurrenceNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOccurrenceNoteRequest) ProtoMessage()    {}
 func (*GetOccurrenceNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{18}
+	return fileDescriptor_5ffce145f2f590bf, []int{18}
 }
+
 func (m *GetOccurrenceNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOccurrenceNoteRequest.Unmarshal(m, b)
 }
 func (m *GetOccurrenceNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOccurrenceNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOccurrenceNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOccurrenceNoteRequest.Merge(dst, src)
+func (m *GetOccurrenceNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOccurrenceNoteRequest.Merge(m, src)
 }
 func (m *GetOccurrenceNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOccurrenceNoteRequest.Size(m)
@@ -2410,16 +2040,17 @@ func (m *ListNotesRequest) Reset()         { *m = ListNotesRequest{} }
 func (m *ListNotesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNotesRequest) ProtoMessage()    {}
 func (*ListNotesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{19}
+	return fileDescriptor_5ffce145f2f590bf, []int{19}
 }
+
 func (m *ListNotesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotesRequest.Unmarshal(m, b)
 }
 func (m *ListNotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNotesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotesRequest.Merge(dst, src)
+func (m *ListNotesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotesRequest.Merge(m, src)
 }
 func (m *ListNotesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNotesRequest.Size(m)
@@ -2481,16 +2112,17 @@ func (m *ListNotesResponse) Reset()         { *m = ListNotesResponse{} }
 func (m *ListNotesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNotesResponse) ProtoMessage()    {}
 func (*ListNotesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{20}
+	return fileDescriptor_5ffce145f2f590bf, []int{20}
 }
+
 func (m *ListNotesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotesResponse.Unmarshal(m, b)
 }
 func (m *ListNotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNotesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotesResponse.Merge(dst, src)
+func (m *ListNotesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotesResponse.Merge(m, src)
 }
 func (m *ListNotesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNotesResponse.Size(m)
@@ -2529,16 +2161,17 @@ func (m *DeleteNoteRequest) Reset()         { *m = DeleteNoteRequest{} }
 func (m *DeleteNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteNoteRequest) ProtoMessage()    {}
 func (*DeleteNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{21}
+	return fileDescriptor_5ffce145f2f590bf, []int{21}
 }
+
 func (m *DeleteNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteNoteRequest.Unmarshal(m, b)
 }
 func (m *DeleteNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteNoteRequest.Merge(dst, src)
+func (m *DeleteNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNoteRequest.Merge(m, src)
 }
 func (m *DeleteNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteNoteRequest.Size(m)
@@ -2578,16 +2211,17 @@ func (m *CreateNoteRequest) Reset()         { *m = CreateNoteRequest{} }
 func (m *CreateNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateNoteRequest) ProtoMessage()    {}
 func (*CreateNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{22}
+	return fileDescriptor_5ffce145f2f590bf, []int{22}
 }
+
 func (m *CreateNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateNoteRequest.Unmarshal(m, b)
 }
 func (m *CreateNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateNoteRequest.Merge(dst, src)
+func (m *CreateNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNoteRequest.Merge(m, src)
 }
 func (m *CreateNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateNoteRequest.Size(m)
@@ -2644,16 +2278,17 @@ func (m *UpdateNoteRequest) Reset()         { *m = UpdateNoteRequest{} }
 func (m *UpdateNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateNoteRequest) ProtoMessage()    {}
 func (*UpdateNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{23}
+	return fileDescriptor_5ffce145f2f590bf, []int{23}
 }
+
 func (m *UpdateNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateNoteRequest.Unmarshal(m, b)
 }
 func (m *UpdateNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateNoteRequest.Merge(dst, src)
+func (m *UpdateNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNoteRequest.Merge(m, src)
 }
 func (m *UpdateNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateNoteRequest.Size(m)
@@ -2705,16 +2340,17 @@ func (m *ListNoteOccurrencesRequest) Reset()         { *m = ListNoteOccurrencesR
 func (m *ListNoteOccurrencesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNoteOccurrencesRequest) ProtoMessage()    {}
 func (*ListNoteOccurrencesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{24}
+	return fileDescriptor_5ffce145f2f590bf, []int{24}
 }
+
 func (m *ListNoteOccurrencesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNoteOccurrencesRequest.Unmarshal(m, b)
 }
 func (m *ListNoteOccurrencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNoteOccurrencesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNoteOccurrencesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNoteOccurrencesRequest.Merge(dst, src)
+func (m *ListNoteOccurrencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNoteOccurrencesRequest.Merge(m, src)
 }
 func (m *ListNoteOccurrencesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNoteOccurrencesRequest.Size(m)
@@ -2768,16 +2404,17 @@ func (m *ListNoteOccurrencesResponse) Reset()         { *m = ListNoteOccurrences
 func (m *ListNoteOccurrencesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNoteOccurrencesResponse) ProtoMessage()    {}
 func (*ListNoteOccurrencesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{25}
+	return fileDescriptor_5ffce145f2f590bf, []int{25}
 }
+
 func (m *ListNoteOccurrencesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNoteOccurrencesResponse.Unmarshal(m, b)
 }
 func (m *ListNoteOccurrencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNoteOccurrencesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNoteOccurrencesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNoteOccurrencesResponse.Merge(dst, src)
+func (m *ListNoteOccurrencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNoteOccurrencesResponse.Merge(m, src)
 }
 func (m *ListNoteOccurrencesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNoteOccurrencesResponse.Size(m)
@@ -2819,16 +2456,17 @@ func (m *CreateOperationRequest) Reset()         { *m = CreateOperationRequest{}
 func (m *CreateOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateOperationRequest) ProtoMessage()    {}
 func (*CreateOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{26}
+	return fileDescriptor_5ffce145f2f590bf, []int{26}
 }
+
 func (m *CreateOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateOperationRequest.Unmarshal(m, b)
 }
 func (m *CreateOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateOperationRequest.Merge(dst, src)
+func (m *CreateOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateOperationRequest.Merge(m, src)
 }
 func (m *CreateOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateOperationRequest.Size(m)
@@ -2877,16 +2515,17 @@ func (m *UpdateOperationRequest) Reset()         { *m = UpdateOperationRequest{}
 func (m *UpdateOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateOperationRequest) ProtoMessage()    {}
 func (*UpdateOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{27}
+	return fileDescriptor_5ffce145f2f590bf, []int{27}
 }
+
 func (m *UpdateOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateOperationRequest.Unmarshal(m, b)
 }
 func (m *UpdateOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateOperationRequest.Merge(dst, src)
+func (m *UpdateOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateOperationRequest.Merge(m, src)
 }
 func (m *UpdateOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateOperationRequest.Size(m)
@@ -2934,16 +2573,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{28}
+	return fileDescriptor_5ffce145f2f590bf, []int{28}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -2983,16 +2623,17 @@ func (m *GetVulnzOccurrencesSummaryRequest) Reset()         { *m = GetVulnzOccur
 func (m *GetVulnzOccurrencesSummaryRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVulnzOccurrencesSummaryRequest) ProtoMessage()    {}
 func (*GetVulnzOccurrencesSummaryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{29}
+	return fileDescriptor_5ffce145f2f590bf, []int{29}
 }
+
 func (m *GetVulnzOccurrencesSummaryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Unmarshal(m, b)
 }
 func (m *GetVulnzOccurrencesSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVulnzOccurrencesSummaryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Merge(dst, src)
+func (m *GetVulnzOccurrencesSummaryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Merge(m, src)
 }
 func (m *GetVulnzOccurrencesSummaryRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Size(m)
@@ -3032,16 +2673,17 @@ func (m *GetVulnzOccurrencesSummaryResponse) Reset()         { *m = GetVulnzOccu
 func (m *GetVulnzOccurrencesSummaryResponse) String() string { return proto.CompactTextString(m) }
 func (*GetVulnzOccurrencesSummaryResponse) ProtoMessage()    {}
 func (*GetVulnzOccurrencesSummaryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{30}
+	return fileDescriptor_5ffce145f2f590bf, []int{30}
 }
+
 func (m *GetVulnzOccurrencesSummaryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Unmarshal(m, b)
 }
 func (m *GetVulnzOccurrencesSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetVulnzOccurrencesSummaryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Merge(dst, src)
+func (m *GetVulnzOccurrencesSummaryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Merge(m, src)
 }
 func (m *GetVulnzOccurrencesSummaryResponse) XXX_Size() int {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Size(m)
@@ -3078,16 +2720,17 @@ func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) String() string {
 }
 func (*GetVulnzOccurrencesSummaryResponse_SeverityCount) ProtoMessage() {}
 func (*GetVulnzOccurrencesSummaryResponse_SeverityCount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{30, 0}
+	return fileDescriptor_5ffce145f2f590bf, []int{30, 0}
 }
+
 func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Unmarshal(m, b)
 }
 func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Marshal(b, m, deterministic)
 }
-func (dst *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Merge(dst, src)
+func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Merge(m, src)
 }
 func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Size() int {
 	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Size(m)
@@ -3127,16 +2770,17 @@ func (m *GetScanConfigRequest) Reset()         { *m = GetScanConfigRequest{} }
 func (m *GetScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetScanConfigRequest) ProtoMessage()    {}
 func (*GetScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{31}
+	return fileDescriptor_5ffce145f2f590bf, []int{31}
 }
+
 func (m *GetScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetScanConfigRequest.Unmarshal(m, b)
 }
 func (m *GetScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetScanConfigRequest.Merge(dst, src)
+func (m *GetScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanConfigRequest.Merge(m, src)
 }
 func (m *GetScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetScanConfigRequest.Size(m)
@@ -3174,16 +2818,17 @@ func (m *ListScanConfigsRequest) Reset()         { *m = ListScanConfigsRequest{}
 func (m *ListScanConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsRequest) ProtoMessage()    {}
 func (*ListScanConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{32}
+	return fileDescriptor_5ffce145f2f590bf, []int{32}
 }
+
 func (m *ListScanConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListScanConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsRequest.Merge(dst, src)
+func (m *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsRequest.Merge(m, src)
 }
 func (m *ListScanConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsRequest.Size(m)
@@ -3237,16 +2882,17 @@ func (m *ListScanConfigsResponse) Reset()         { *m = ListScanConfigsResponse
 func (m *ListScanConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsResponse) ProtoMessage()    {}
 func (*ListScanConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{33}
+	return fileDescriptor_5ffce145f2f590bf, []int{33}
 }
+
 func (m *ListScanConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListScanConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsResponse.Merge(dst, src)
+func (m *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsResponse.Merge(m, src)
 }
 func (m *ListScanConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsResponse.Size(m)
@@ -3289,16 +2935,17 @@ func (m *UpdateScanConfigRequest) Reset()         { *m = UpdateScanConfigRequest
 func (m *UpdateScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateScanConfigRequest) ProtoMessage()    {}
 func (*UpdateScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_a487a8754ddd6778, []int{34}
+	return fileDescriptor_5ffce145f2f590bf, []int{34}
 }
+
 func (m *UpdateScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateScanConfigRequest.Unmarshal(m, b)
 }
 func (m *UpdateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateScanConfigRequest.Merge(dst, src)
+func (m *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateScanConfigRequest.Merge(m, src)
 }
 func (m *UpdateScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateScanConfigRequest.Size(m)
@@ -3331,6 +2978,11 @@ func (m *UpdateScanConfigRequest) GetUpdateMask() *field_mask.FieldMask {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Note_Kind", Note_Kind_name, Note_Kind_value)
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Deployable_Deployment_Platform", Deployable_Deployment_Platform_name, Deployable_Deployment_Platform_value)
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Discovery_Discovered_AnalysisStatus", Discovery_Discovered_AnalysisStatus_name, Discovery_Discovered_AnalysisStatus_value)
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.BuildSignature_KeyType", BuildSignature_KeyType_name, BuildSignature_KeyType_value)
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.PgpSignedAttestation_ContentType", PgpSignedAttestation_ContentType_name, PgpSignedAttestation_ContentType_value)
 	proto.RegisterType((*Occurrence)(nil), "google.devtools.containeranalysis.v1alpha1.Occurrence")
 	proto.RegisterType((*Resource)(nil), "google.devtools.containeranalysis.v1alpha1.Resource")
 	proto.RegisterType((*Note)(nil), "google.devtools.containeranalysis.v1alpha1.Note")
@@ -3372,177 +3024,384 @@ func init() {
 	proto.RegisterType((*ListScanConfigsRequest)(nil), "google.devtools.containeranalysis.v1alpha1.ListScanConfigsRequest")
 	proto.RegisterType((*ListScanConfigsResponse)(nil), "google.devtools.containeranalysis.v1alpha1.ListScanConfigsResponse")
 	proto.RegisterType((*UpdateScanConfigRequest)(nil), "google.devtools.containeranalysis.v1alpha1.UpdateScanConfigRequest")
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Note_Kind", Note_Kind_name, Note_Kind_value)
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Deployable_Deployment_Platform", Deployable_Deployment_Platform_name, Deployable_Deployment_Platform_value)
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Discovery_Discovered_AnalysisStatus", Discovery_Discovered_AnalysisStatus_name, Discovery_Discovered_AnalysisStatus_value)
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.BuildSignature_KeyType", BuildSignature_KeyType_name, BuildSignature_KeyType_value)
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.PgpSignedAttestation_ContentType", PgpSignedAttestation_ContentType_name, PgpSignedAttestation_ContentType_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// ContainerAnalysisClient is the client API for ContainerAnalysis service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type ContainerAnalysisClient interface {
-	// Returns the requested `Occurrence`.
-	GetOccurrence(ctx context.Context, in *GetOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
-	// Lists active `Occurrences` for a given project matching the filters.
-	ListOccurrences(ctx context.Context, in *ListOccurrencesRequest, opts ...grpc.CallOption) (*ListOccurrencesResponse, error)
-	// Deletes the given `Occurrence` from the system. Use this when
-	// an `Occurrence` is no longer applicable for the given resource.
-	DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Creates a new `Occurrence`. Use this method to create `Occurrences`
-	// for a resource.
-	CreateOccurrence(ctx context.Context, in *CreateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
-	// Updates an existing occurrence.
-	UpdateOccurrence(ctx context.Context, in *UpdateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
-	// Gets the `Note` attached to the given `Occurrence`.
-	GetOccurrenceNote(ctx context.Context, in *GetOccurrenceNoteRequest, opts ...grpc.CallOption) (*Note, error)
-	// Returns the requested `Note`.
-	GetNote(ctx context.Context, in *GetNoteRequest, opts ...grpc.CallOption) (*Note, error)
-	// Lists all `Notes` for a given project.
-	ListNotes(ctx context.Context, in *ListNotesRequest, opts ...grpc.CallOption) (*ListNotesResponse, error)
-	// Deletes the given `Note` from the system.
-	DeleteNote(ctx context.Context, in *DeleteNoteRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Creates a new `Note`.
-	CreateNote(ctx context.Context, in *CreateNoteRequest, opts ...grpc.CallOption) (*Note, error)
-	// Updates an existing `Note`.
-	UpdateNote(ctx context.Context, in *UpdateNoteRequest, opts ...grpc.CallOption) (*Note, error)
-	// Lists `Occurrences` referencing the specified `Note`. Use this method to
-	// get all occurrences referencing your `Note` across all your customer
-	// projects.
-	ListNoteOccurrences(ctx context.Context, in *ListNoteOccurrencesRequest, opts ...grpc.CallOption) (*ListNoteOccurrencesResponse, error)
-	// Gets a summary of the number and severity of occurrences.
-	GetVulnzOccurrencesSummary(ctx context.Context, in *GetVulnzOccurrencesSummaryRequest, opts ...grpc.CallOption) (*GetVulnzOccurrencesSummaryResponse, error)
-	// Sets the access control policy on the specified `Note` or `Occurrence`.
-	// Requires `containeranalysis.notes.setIamPolicy` or
-	// `containeranalysis.occurrences.setIamPolicy` permission if the resource is
-	// a `Note` or an `Occurrence`, respectively.
-	// Attempting to call this method without these permissions will result in a `
-	// `PERMISSION_DENIED` error.
-	// Attempting to call this method on a non-existent resource will result in a
-	// `NOT_FOUND` error if the user has `containeranalysis.notes.list` permission
-	// on a `Note` or `containeranalysis.occurrences.list` on an `Occurrence`, or
-	// a `PERMISSION_DENIED` error otherwise. The resource takes the following
-	// formats: `projects/{projectid}/occurrences/{occurrenceid}` for occurrences
-	// and projects/{projectid}/notes/{noteid} for notes
-	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
-	// Gets the access control policy for a note or an `Occurrence` resource.
-	// Requires `containeranalysis.notes.setIamPolicy` or
-	// `containeranalysis.occurrences.setIamPolicy` permission if the resource is
-	// a note or occurrence, respectively.
-	// Attempting to call this method on a resource without the required
-	// permission will result in a `PERMISSION_DENIED` error. Attempting to call
-	// this method on a non-existent resource will result in a `NOT_FOUND` error
-	// if the user has list permission on the project, or a `PERMISSION_DENIED`
-	// error otherwise. The resource takes the following formats:
-	// `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for occurrences and
-	// projects/{PROJECT_ID}/notes/{NOTE_ID} for notes
-	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
-	// Returns the permissions that a caller has on the specified note or
-	// occurrence resource. Requires list permission on the project (for example,
-	// "storage.objects.list" on the containing bucket for testing permission of
-	// an object). Attempting to call this method on a non-existent resource will
-	// result in a `NOT_FOUND` error if the user has list permission on the
-	// project, or a `PERMISSION_DENIED` error otherwise. The resource takes the
-	// following formats: `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for
-	// `Occurrences` and `projects/{PROJECT_ID}/notes/{NOTE_ID}` for `Notes`
-	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
-	// Creates a new `Operation`.
-	CreateOperation(ctx context.Context, in *CreateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-	// Updates an existing operation returns an error if operation
-	//  does not exist. The only valid operations are to update mark the done bit
-	// change the result.
-	UpdateOperation(ctx context.Context, in *UpdateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
-	// Gets a specific scan configuration for a project.
-	GetScanConfig(ctx context.Context, in *GetScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
-	// Lists scan configurations for a project.
-	ListScanConfigs(ctx context.Context, in *ListScanConfigsRequest, opts ...grpc.CallOption) (*ListScanConfigsResponse, error)
-	// Updates the scan configuration to a new value.
-	UpdateScanConfig(ctx context.Context, in *UpdateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
-}
-
-type containerAnalysisClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewContainerAnalysisClient(cc *grpc.ClientConn) ContainerAnalysisClient {
-	return &containerAnalysisClient{cc}
-}
-
-func (c *containerAnalysisClient) GetOccurrence(ctx context.Context, in *GetOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
-	out := new(Occurrence)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrence", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *containerAnalysisClient) ListOccurrences(ctx context.Context, in *ListOccurrencesRequest, opts ...grpc.CallOption) (*ListOccurrencesResponse, error) {
-	out := new(ListOccurrencesResponse)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListOccurrences", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *containerAnalysisClient) DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/DeleteOccurrence", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *containerAnalysisClient) CreateOccurrence(ctx context.Context, in *CreateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
-	out := new(Occurrence)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateOccurrence", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *containerAnalysisClient) UpdateOccurrence(ctx context.Context, in *UpdateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
-	out := new(Occurrence)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateOccurrence", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *containerAnalysisClient) GetOccurrenceNote(ctx context.Context, in *GetOccurrenceNoteRequest, opts ...grpc.CallOption) (*Note, error) {
-	out := new(Note)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrenceNote", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
 }
 
-func (c *containerAnalysisClient) GetNote(ctx context.Context, in *GetNoteRequest, opts ...grpc.CallOption) (*Note, error) {
-	out := new(Note)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetNote", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
+func init() {
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/containeranalysis.proto", fileDescriptor_5ffce145f2f590bf)
 }
 
-func (c *containerAnalysisClient) ListNotes(ctx context.Context, in *ListNotesRequest, opts ...grpc.CallOption) (*ListNotesResponse, error) {
-	out := new(ListNotesResponse)
-	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListNotes", in, out, opts...)
+var fileDescriptor_5ffce145f2f590bf = []byte{
+	// 3256 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5b, 0xdb, 0x6f, 0x23, 0x57,
+	0x19, 0xdf, 0xc9, 0xd5, 0xfe, 0x9c, 0x8b, 0x73, 0x36, 0xbb, 0xeb, 0x7a, 0x7b, 0x49, 0xa7, 0x94,
+	0x6e, 0x53, 0x6a, 0x77, 0xd3, 0x96, 0xc2, 0x6e, 0x97, 0x5d, 0xc7, 0x76, 0x12, 0x37, 0x89, 0x63,
+	0xcd, 0x38, 0x61, 0xd3, 0x96, 0x8e, 0xc6, 0xf6, 0x89, 0x33, 0x64, 0x3c, 0x33, 0xcc, 0x8c, 0xc3,
+	0x66, 0x51, 0x25, 0x44, 0x0b, 0xa8, 0x12, 0x45, 0xe5, 0xfa, 0xc2, 0xa5, 0x52, 0x41, 0x95, 0x80,
+	0x17, 0x5e, 0x78, 0x83, 0x17, 0x40, 0x3c, 0x01, 0x42, 0xe2, 0x19, 0xf1, 0x00, 0x0f, 0xfc, 0x0b,
+	0x48, 0x3c, 0xa0, 0x73, 0xe6, 0x9c, 0x99, 0xf1, 0x25, 0x89, 0xc7, 0xde, 0x4a, 0x7d, 0xda, 0x39,
+	0xdf, 0xf9, 0xce, 0x77, 0x3b, 0xdf, 0xf9, 0x9d, 0xef, 0x3b, 0xf1, 0xc2, 0x6a, 0xd3, 0x34, 0x9b,
+	0x3a, 0xce, 0x36, 0xf0, 0xb1, 0x6b, 0x9a, 0xba, 0x93, 0xad, 0x9b, 0x86, 0xab, 0x6a, 0x06, 0xb6,
+	0x55, 0x43, 0xd5, 0x4f, 0x1c, 0xcd, 0xc9, 0x1e, 0x5f, 0x57, 0x75, 0xeb, 0x50, 0xbd, 0xde, 0x3b,
+	0x95, 0xb1, 0x6c, 0xd3, 0x35, 0xd1, 0xb2, 0x27, 0x23, 0xc3, 0x65, 0x64, 0x7a, 0x19, 0xb9, 0x8c,
+	0xf4, 0xc3, 0x4c, 0x9f, 0x6a, 0x69, 0x59, 0xd5, 0x30, 0x4c, 0x57, 0x75, 0x35, 0xd3, 0x60, 0x92,
+	0xd2, 0x51, 0xac, 0xa9, 0x69, 0xba, 0xae, 0x98, 0x07, 0x4a, 0x4b, 0x75, 0xb1, 0xad, 0xa9, 0x3a,
+	0x97, 0xf1, 0x72, 0x04, 0x19, 0x5a, 0x4b, 0x6d, 0x62, 0xa5, 0xa6, 0xfa, 0xbe, 0xa4, 0xd7, 0x22,
+	0xac, 0xb6, 0xd4, 0xfa, 0x11, 0x59, 0x7f, 0xdc, 0xd6, 0xc9, 0x7c, 0x4d, 0xd3, 0x35, 0xf7, 0x84,
+	0xc9, 0xb9, 0x19, 0x45, 0x8e, 0x6d, 0x1e, 0x63, 0x43, 0x35, 0xea, 0x98, 0x2d, 0x7e, 0x94, 0x2d,
+	0xd6, 0xd4, 0x56, 0xf6, 0xf8, 0x3a, 0xf9, 0x47, 0xb1, 0x4c, 0x5d, 0xab, 0x73, 0xe1, 0xe9, 0xce,
+	0xf9, 0x8e, 0xb9, 0x27, 0xd8, 0x9c, 0x6e, 0x1a, 0x4d, 0xbb, 0x6d, 0x18, 0x9a, 0xd1, 0xcc, 0x9a,
+	0x16, 0xb6, 0x3b, 0xe2, 0xfc, 0x10, 0x63, 0xa2, 0xa3, 0x5a, 0xfb, 0x20, 0xab, 0x1a, 0x7c, 0xfd,
+	0xd5, 0xee, 0x29, 0xdc, 0xb2, 0x7c, 0xaf, 0x96, 0xba, 0x27, 0x0f, 0x34, 0xac, 0x37, 0x94, 0x96,
+	0xea, 0x1c, 0x31, 0x8e, 0xc7, 0xba, 0x39, 0x5c, 0xad, 0x85, 0x1d, 0x57, 0x6d, 0x59, 0x8c, 0xe1,
+	0x0a, 0x63, 0xb0, 0xad, 0x7a, 0xd6, 0x71, 0x55, 0xb7, 0xcd, 0x6c, 0x12, 0x7f, 0x16, 0x07, 0xd8,
+	0xa9, 0xd7, 0xdb, 0xb6, 0x8d, 0x8d, 0x3a, 0x46, 0x08, 0x26, 0x0c, 0xb5, 0x85, 0x53, 0xc2, 0x92,
+	0x70, 0x2d, 0x2e, 0xd1, 0x6f, 0xf4, 0x38, 0xcc, 0xd8, 0xd8, 0x31, 0xdb, 0x76, 0x1d, 0x2b, 0x6d,
+	0x5b, 0x4f, 0x8d, 0xd1, 0xb9, 0x04, 0xa7, 0xed, 0xda, 0x3a, 0xaa, 0x40, 0x8c, 0x0f, 0x53, 0x0b,
+	0x4b, 0xc2, 0xb5, 0xc4, 0xca, 0x0b, 0x99, 0xc1, 0xd3, 0x33, 0x23, 0xb1, 0xb5, 0x92, 0x2f, 0x05,
+	0x5d, 0x85, 0xb8, 0x61, 0xba, 0x58, 0xa1, 0xd6, 0x8c, 0x53, 0x8d, 0x31, 0x42, 0x28, 0x13, 0x8b,
+	0x4a, 0x30, 0x71, 0xa4, 0x19, 0x8d, 0xd4, 0xd4, 0x92, 0x70, 0x6d, 0x6e, 0xe5, 0xc5, 0x28, 0xaa,
+	0xca, 0xa6, 0x8b, 0x33, 0x9b, 0x9a, 0xd1, 0x90, 0xa8, 0x08, 0xf4, 0x8e, 0x00, 0x97, 0x3a, 0x32,
+	0x49, 0x69, 0x60, 0x57, 0xd5, 0x74, 0x27, 0x15, 0xa3, 0x7e, 0x48, 0x51, 0x84, 0xef, 0x85, 0x05,
+	0x55, 0x4f, 0x2c, 0xdc, 0x49, 0x29, 0x78, 0x92, 0x37, 0x2e, 0x48, 0x8b, 0xc7, 0x7d, 0xe8, 0x48,
+	0x81, 0xd9, 0x5a, 0x5b, 0xd3, 0x1b, 0xbe, 0x09, 0xd3, 0xd4, 0x84, 0xcf, 0x44, 0x31, 0x61, 0x95,
+	0x08, 0x08, 0x14, 0xcd, 0xd4, 0x42, 0x63, 0x74, 0x00, 0xb3, 0x0d, 0x6c, 0x6b, 0xc7, 0xb8, 0xa1,
+	0xd0, 0x33, 0x98, 0x4a, 0x50, 0x05, 0xb7, 0xa3, 0x28, 0x28, 0x98, 0xf5, 0x23, 0x6c, 0x97, 0xc8,
+	0xf2, 0x4c, 0xc1, 0x13, 0x46, 0xf4, 0x30, 0xb9, 0x94, 0x8e, 0x5a, 0x30, 0xa3, 0x19, 0x8e, 0xab,
+	0xea, 0x3a, 0xcd, 0xff, 0xd4, 0x0c, 0x55, 0xb3, 0x1e, 0x45, 0x4d, 0xc5, 0x3b, 0xe5, 0xdb, 0xaa,
+	0xa1, 0x36, 0xb1, 0x9d, 0x29, 0x85, 0xc4, 0x11, 0x75, 0x61, 0xf1, 0xa8, 0x0e, 0xd0, 0xc0, 0x96,
+	0x6e, 0x9e, 0xb4, 0xb0, 0xe1, 0xa6, 0xe6, 0xa8, 0xb2, 0x5c, 0x24, 0x9f, 0xe8, 0x6a, 0xb5, 0xa6,
+	0x63, 0xf6, 0x49, 0x04, 0x6d, 0x5c, 0x90, 0x42, 0x62, 0x51, 0x0d, 0xa0, 0xa1, 0x39, 0x75, 0xf3,
+	0x18, 0xdb, 0xb8, 0x91, 0x9a, 0xa7, 0x4a, 0xee, 0x44, 0x52, 0xc2, 0x56, 0x9f, 0xf8, 0x5f, 0x34,
+	0x72, 0x21, 0xa9, 0xc8, 0x82, 0x84, 0xea, 0xba, 0xe4, 0xe0, 0xd2, 0xb0, 0x25, 0xa9, 0x92, 0xad,
+	0x28, 0x4a, 0x72, 0xc1, 0xf2, 0x5c, 0xdb, 0x3d, 0x34, 0x6d, 0x82, 0x8d, 0x21, 0xe2, 0xc6, 0x05,
+	0x29, 0xac, 0x02, 0x2d, 0x41, 0xc2, 0xc6, 0x2d, 0xdc, 0xd0, 0x3c, 0x8d, 0x93, 0xfc, 0x68, 0xfb,
+	0x24, 0x74, 0x13, 0x12, 0x75, 0x1b, 0xab, 0x2e, 0x56, 0x08, 0xa6, 0xa4, 0xe2, 0xd4, 0xa6, 0x34,
+	0xb7, 0x89, 0x03, 0x4e, 0xa6, 0xca, 0x01, 0x47, 0x02, 0x8f, 0x9d, 0x10, 0xc8, 0xe2, 0xb6, 0xd5,
+	0xf0, 0x17, 0xc3, 0xf9, 0x8b, 0x3d, 0x76, 0x42, 0x58, 0x8d, 0xc3, 0x34, 0x3b, 0x08, 0xe2, 0xd7,
+	0x05, 0x88, 0x71, 0x90, 0xe8, 0x8b, 0x51, 0x49, 0x18, 0x6f, 0xdb, 0x1a, 0x83, 0x26, 0xf2, 0x89,
+	0x64, 0x98, 0x21, 0x71, 0xc2, 0x86, 0xab, 0x1c, 0xaa, 0xce, 0x21, 0xc5, 0x90, 0xc4, 0xca, 0x73,
+	0x51, 0x82, 0xb9, 0xa1, 0x3a, 0x87, 0x52, 0x82, 0x49, 0x21, 0x03, 0xf1, 0x7f, 0x00, 0x13, 0x04,
+	0x41, 0xfa, 0xda, 0xf0, 0x0c, 0x2c, 0x38, 0x87, 0xa6, 0xed, 0x2a, 0x0d, 0xec, 0xd4, 0x6d, 0xcd,
+	0xa2, 0x11, 0xf5, 0xa0, 0x2b, 0x49, 0x27, 0x0a, 0x01, 0x1d, 0x3d, 0x0d, 0x49, 0x72, 0x57, 0x74,
+	0xf0, 0x4e, 0x50, 0xde, 0x79, 0x42, 0x0f, 0xb3, 0x72, 0xb4, 0x8b, 0x8f, 0x8e, 0x76, 0x06, 0xa0,
+	0x4e, 0xb0, 0x73, 0x4f, 0x2c, 0x4c, 0x61, 0x34, 0xb1, 0x72, 0x6b, 0x24, 0xa4, 0xdb, 0xb8, 0x20,
+	0x2d, 0x1c, 0x77, 0x13, 0xd1, 0x1e, 0x80, 0x87, 0x68, 0x54, 0x8f, 0x87, 0xa8, 0x2f, 0x46, 0x86,
+	0x33, 0x26, 0x3f, 0x5e, 0xe3, 0x03, 0xf4, 0x06, 0x40, 0x4d, 0x75, 0x30, 0x43, 0xb1, 0xd9, 0xe8,
+	0xf6, 0x87, 0x51, 0x6c, 0x95, 0x14, 0x22, 0x54, 0xbe, 0xea, 0x60, 0x0f, 0xc0, 0xde, 0x80, 0x69,
+	0x56, 0x66, 0x30, 0x38, 0x59, 0x1d, 0x01, 0xbb, 0xd8, 0x70, 0xe3, 0x82, 0xc4, 0x85, 0xa2, 0xbb,
+	0x1c, 0xb1, 0x08, 0xe6, 0xb0, 0x1b, 0xf3, 0xd3, 0xc3, 0x21, 0x56, 0x00, 0x53, 0x64, 0x84, 0x76,
+	0x21, 0xce, 0x01, 0xe5, 0x24, 0x85, 0xa2, 0x07, 0xdc, 0x47, 0x29, 0x12, 0x10, 0x5f, 0x12, 0xfa,
+	0x32, 0x5c, 0x0a, 0xc1, 0x86, 0xa2, 0x72, 0x6c, 0x49, 0x5d, 0x8c, 0x0e, 0x84, 0xfd, 0x30, 0x8a,
+	0xdc, 0x89, 0x6a, 0x1f, 0x3a, 0x7a, 0x9d, 0x00, 0x94, 0xae, 0xba, 0xb8, 0x41, 0x6b, 0x8f, 0xe9,
+	0xa5, 0xf1, 0x6b, 0x89, 0x95, 0x9b, 0x91, 0xcf, 0x80, 0xe4, 0xc9, 0xd8, 0xb5, 0x75, 0x09, 0x6c,
+	0xff, 0x1b, 0xe5, 0x61, 0x1e, 0xdf, 0xb3, 0x34, 0xaf, 0x4c, 0x1b, 0x14, 0xa3, 0xe6, 0x82, 0x25,
+	0x1c, 0xe4, 0xc2, 0x08, 0x99, 0x18, 0x05, 0x21, 0x67, 0xa2, 0x20, 0x64, 0xfa, 0x05, 0x80, 0xc0,
+	0x31, 0x0f, 0x03, 0x75, 0x06, 0x49, 0xe4, 0x13, 0x2d, 0xc2, 0xa4, 0xae, 0xd6, 0x30, 0x2f, 0xd9,
+	0xbc, 0x81, 0xf8, 0x4b, 0x01, 0x26, 0x08, 0x26, 0xa0, 0x45, 0x48, 0x6e, 0x96, 0xca, 0x05, 0x65,
+	0xb7, 0x2c, 0x57, 0x8a, 0xf9, 0xd2, 0x5a, 0xa9, 0x58, 0x48, 0x5e, 0x40, 0x0f, 0xc1, 0xa5, 0x4a,
+	0x2e, 0xbf, 0x99, 0x5b, 0x2f, 0x2a, 0x7b, 0xbb, 0x5b, 0xe5, 0xa2, 0x94, 0x5b, 0x2d, 0x6d, 0x95,
+	0xaa, 0xfb, 0xc9, 0x31, 0xb4, 0x00, 0xb3, 0xab, 0xbb, 0xa5, 0xad, 0x82, 0x52, 0x28, 0x56, 0x73,
+	0xa5, 0x2d, 0x39, 0x39, 0x8e, 0xe6, 0x21, 0x51, 0xda, 0x26, 0xbc, 0xab, 0x39, 0xb9, 0x24, 0x27,
+	0x27, 0xd0, 0x45, 0x98, 0xe7, 0xcb, 0xb7, 0x73, 0xe5, 0xdc, 0x7a, 0x51, 0x4a, 0x4e, 0xa2, 0x39,
+	0x80, 0x42, 0xb1, 0xb2, 0xb5, 0xb3, 0x9f, 0x5b, 0xdd, 0x2a, 0x26, 0xa7, 0xd0, 0x2c, 0xc4, 0x0b,
+	0x25, 0x39, 0xbf, 0xb3, 0x57, 0x94, 0xf6, 0x93, 0xd3, 0x44, 0x65, 0xae, 0x5a, 0x2d, 0xca, 0xd5,
+	0x5c, 0xb5, 0xb4, 0x53, 0x56, 0x72, 0xbb, 0xd5, 0x8d, 0x1d, 0x89, 0xa8, 0x8c, 0xad, 0x26, 0x58,
+	0x1d, 0x48, 0x00, 0x44, 0xfc, 0xc7, 0x38, 0x40, 0x90, 0xf9, 0x5d, 0x85, 0xa9, 0x96, 0x12, 0x96,
+	0xc6, 0x3b, 0x0b, 0x53, 0x2d, 0xfd, 0x2b, 0x7f, 0x05, 0xbd, 0xc4, 0x1f, 0x01, 0x68, 0x3b, 0xd8,
+	0x56, 0x70, 0x4b, 0xd5, 0x78, 0xa4, 0xe2, 0x84, 0x52, 0x24, 0x04, 0xb2, 0x19, 0xde, 0x51, 0xf2,
+	0x36, 0x63, 0xec, 0xfc, 0xcd, 0xf0, 0xd8, 0xe9, 0x4e, 0xde, 0x86, 0xd9, 0xb6, 0x11, 0x5e, 0x3e,
+	0x7e, 0xee, 0xf2, 0x19, 0xbe, 0x80, 0x0a, 0xb8, 0x0c, 0x53, 0x75, 0xd3, 0x38, 0xd0, 0x9a, 0x14,
+	0x28, 0xe3, 0x12, 0x1b, 0xa1, 0x14, 0x4c, 0xab, 0x8d, 0x86, 0x8d, 0x1d, 0x87, 0xdd, 0xcf, 0x7c,
+	0xd8, 0x13, 0x80, 0xa9, 0x9e, 0x00, 0xa0, 0x03, 0x88, 0x59, 0xba, 0xea, 0x1e, 0x98, 0x76, 0x8b,
+	0x96, 0x93, 0x73, 0x2b, 0xaf, 0x8c, 0x5c, 0x19, 0x65, 0x2a, 0x4c, 0xa2, 0xe4, 0xcb, 0x16, 0xf3,
+	0x10, 0xe3, 0x54, 0x94, 0x82, 0xc5, 0xca, 0x56, 0xae, 0xba, 0xb6, 0x23, 0x6d, 0x77, 0xe5, 0xd6,
+	0x34, 0x8c, 0xaf, 0x6f, 0x16, 0x93, 0x02, 0x8a, 0xc1, 0xc4, 0xda, 0x56, 0xf1, 0x6e, 0x72, 0x0c,
+	0x01, 0x4c, 0xe5, 0x77, 0xe5, 0xea, 0xce, 0x76, 0x72, 0x5c, 0x7c, 0x67, 0x02, 0xe2, 0x3e, 0x00,
+	0xa1, 0x57, 0x61, 0x96, 0x1b, 0xa4, 0xd0, 0x0b, 0x50, 0x18, 0xe5, 0x02, 0x9c, 0xe1, 0x93, 0x64,
+	0x94, 0x7e, 0x9f, 0xe4, 0x45, 0x50, 0x78, 0xdd, 0x84, 0xb8, 0xdf, 0xad, 0x51, 0x35, 0x89, 0x95,
+	0x47, 0xb8, 0x9a, 0x50, 0x4b, 0x97, 0xd9, 0xe1, 0x4c, 0x52, 0xc0, 0x8f, 0xee, 0xc1, 0xbc, 0x6f,
+	0xa7, 0xd7, 0x5b, 0xd1, 0x7d, 0x9a, 0x5b, 0xd9, 0x19, 0xb5, 0x3c, 0xcc, 0xe4, 0x18, 0x9b, 0x4c,
+	0xc5, 0x4a, 0x73, 0x6a, 0xc7, 0x18, 0xad, 0xc1, 0xa5, 0x2e, 0xcd, 0x0a, 0xb6, 0x6d, 0xd3, 0x66,
+	0x37, 0x3a, 0xe2, 0xfa, 0x6d, 0xab, 0x9e, 0x61, 0x22, 0x2e, 0x76, 0x8a, 0x28, 0x12, 0x76, 0xf1,
+	0x3b, 0x02, 0xcc, 0x75, 0xaa, 0x42, 0x8f, 0xc1, 0xd5, 0x5c, 0x39, 0xb7, 0xb5, 0x2f, 0x97, 0x64,
+	0x85, 0x9c, 0xcb, 0x5d, 0xb9, 0x6b, 0x2b, 0x13, 0x30, 0x5d, 0x29, 0x96, 0x0b, 0xa5, 0xf2, 0x7a,
+	0x52, 0x40, 0x33, 0x10, 0x93, 0xf3, 0xb9, 0x72, 0x99, 0x8c, 0xc6, 0x08, 0xae, 0xac, 0x95, 0xca,
+	0x25, 0x79, 0xa3, 0x58, 0x50, 0xe4, 0xdd, 0x7c, 0xbe, 0x28, 0x13, 0xa4, 0xb8, 0x08, 0xf3, 0x3e,
+	0x75, 0x2d, 0x57, 0xda, 0x2a, 0x16, 0x92, 0x13, 0x24, 0x55, 0x76, 0xcb, 0xf2, 0x6e, 0xa5, 0xb2,
+	0x23, 0x55, 0x8b, 0x05, 0x45, 0x2a, 0xca, 0x3b, 0xbb, 0x52, 0xbe, 0x98, 0x9c, 0x14, 0xbf, 0x2d,
+	0x40, 0xdc, 0xbf, 0xfd, 0xd1, 0x53, 0x30, 0x4f, 0x6f, 0x7f, 0x6c, 0x2b, 0xc7, 0xd8, 0x76, 0xf8,
+	0x36, 0xc5, 0xa5, 0x39, 0x46, 0xde, 0xf3, 0xa8, 0xe8, 0x2e, 0xc4, 0x1d, 0xad, 0x69, 0xa8, 0x6e,
+	0xdb, 0xe6, 0x07, 0xf8, 0x46, 0xe4, 0x82, 0x43, 0xe6, 0x12, 0xa4, 0x40, 0x98, 0xf8, 0xee, 0x18,
+	0xcc, 0x75, 0xce, 0x12, 0x38, 0xb1, 0xda, 0x35, 0x5d, 0xab, 0x2b, 0x47, 0xf8, 0x84, 0xc3, 0x89,
+	0x47, 0xd9, 0xc4, 0x27, 0xe8, 0xe1, 0x6e, 0x5b, 0xe2, 0x21, 0x79, 0xe8, 0x12, 0x4c, 0x1d, 0xe1,
+	0x13, 0x45, 0x6b, 0xb0, 0x1a, 0x71, 0xf2, 0x08, 0x9f, 0x94, 0x1a, 0xe8, 0x0b, 0x10, 0x23, 0x64,
+	0x5a, 0x30, 0x4d, 0xd0, 0x34, 0x5a, 0x1d, 0xde, 0xfe, 0xcc, 0x26, 0xa6, 0x85, 0x98, 0x34, 0x7d,
+	0xe4, 0x7d, 0x88, 0x1b, 0x30, 0xcd, 0x68, 0x24, 0xf6, 0x9b, 0xc5, 0x7d, 0xa5, 0xba, 0x5f, 0x29,
+	0x76, 0xed, 0xed, 0x25, 0x58, 0xa8, 0xac, 0x57, 0x94, 0x9c, 0x9c, 0x2f, 0x95, 0x94, 0x9c, 0xb4,
+	0xbd, 0x23, 0x15, 0x0b, 0xde, 0x2e, 0x57, 0x36, 0x4b, 0x77, 0x95, 0x4a, 0x71, 0x3b, 0x39, 0x26,
+	0xfe, 0x60, 0x0c, 0x16, 0x2b, 0x4d, 0x8b, 0xe8, 0xc2, 0x8d, 0xd0, 0x9d, 0xde, 0xe9, 0xb6, 0xd0,
+	0xed, 0xb6, 0x19, 0xd4, 0xe5, 0xd4, 0xc7, 0x71, 0xea, 0x63, 0xa4, 0x26, 0xa7, 0x9f, 0xd6, 0x4c,
+	0xde, 0x13, 0x4a, 0xbd, 0xe5, 0x35, 0x3b, 0x75, 0xf3, 0x51, 0x00, 0xab, 0x69, 0x29, 0x2c, 0xd6,
+	0x74, 0x1b, 0x36, 0x2e, 0x48, 0x31, 0xab, 0x69, 0x6d, 0x92, 0x80, 0x8b, 0x05, 0x48, 0x84, 0xd6,
+	0xa2, 0x87, 0x21, 0x95, 0xdf, 0x29, 0x57, 0x8b, 0xe5, 0x6a, 0xbf, 0xc8, 0x5c, 0x81, 0x8b, 0x72,
+	0x69, 0xbb, 0xb2, 0x55, 0x54, 0xe4, 0xd2, 0x3a, 0x49, 0x77, 0xe5, 0x15, 0x79, 0xa7, 0x9c, 0x14,
+	0x56, 0x63, 0x7c, 0x37, 0xc5, 0xff, 0x8c, 0xc1, 0x62, 0xbf, 0x12, 0x07, 0xb5, 0x60, 0xe2, 0x50,
+	0x33, 0x5c, 0x86, 0x2f, 0xfb, 0x0f, 0xb2, 0xad, 0x0b, 0xea, 0x28, 0xcd, 0x70, 0x25, 0xaa, 0x26,
+	0xfd, 0x0a, 0xa4, 0x4e, 0xe3, 0x40, 0x19, 0xb8, 0x78, 0xd8, 0x6e, 0xa9, 0x86, 0x62, 0x63, 0xb5,
+	0x41, 0xd0, 0x5d, 0x09, 0x75, 0x33, 0x0b, 0x74, 0x4a, 0x62, 0x33, 0x65, 0xb5, 0x85, 0xd3, 0xdf,
+	0x17, 0x20, 0x11, 0xde, 0xe2, 0x7b, 0x70, 0x99, 0xc4, 0xd4, 0xa1, 0xbb, 0xa0, 0x84, 0x7b, 0x56,
+	0x21, 0x7a, 0x3d, 0xd8, 0x6f, 0x3b, 0x49, 0x3d, 0x68, 0xf5, 0xa1, 0x93, 0x7a, 0x20, 0x38, 0x92,
+	0x3f, 0x14, 0x60, 0x26, 0xfc, 0xe0, 0x81, 0x5e, 0x03, 0x08, 0x9e, 0xf5, 0x98, 0x2d, 0x37, 0x23,
+	0x1f, 0x9f, 0x8a, 0x2f, 0x42, 0x0a, 0x89, 0x23, 0x2d, 0x5b, 0x30, 0x52, 0x6a, 0x27, 0x2e, 0x76,
+	0xd8, 0xa9, 0x9e, 0x0f, 0xe8, 0xab, 0x84, 0x2c, 0xbe, 0x0e, 0x20, 0xd7, 0x55, 0x23, 0xef, 0x5d,
+	0xe0, 0xfd, 0x9a, 0xc5, 0x25, 0x52, 0x6a, 0x04, 0xad, 0x1f, 0x7b, 0x53, 0x0b, 0x91, 0xc8, 0xb5,
+	0x8f, 0x0d, 0xb2, 0x03, 0x1e, 0x40, 0xc4, 0x24, 0x3e, 0x14, 0x97, 0x61, 0x71, 0x1d, 0xbb, 0xc1,
+	0xab, 0x9d, 0x84, 0xbf, 0xd4, 0xc6, 0x8e, 0xdb, 0x4f, 0x8f, 0xf8, 0x2f, 0x01, 0x2e, 0x6f, 0x69,
+	0x4e, 0x88, 0xdb, 0x39, 0x83, 0x9d, 0xd4, 0x20, 0x96, 0x6a, 0x63, 0xc3, 0x65, 0xa5, 0x06, 0x1b,
+	0x11, 0xfa, 0x81, 0xa6, 0xbb, 0xd8, 0x66, 0x96, 0xb2, 0x11, 0xba, 0x0a, 0x71, 0x4b, 0x6d, 0x62,
+	0xc5, 0xd1, 0xee, 0x7b, 0x47, 0x79, 0x52, 0x8a, 0x11, 0x82, 0xac, 0xdd, 0xf7, 0xe0, 0x91, 0x4c,
+	0xba, 0xe6, 0x11, 0xe6, 0xdd, 0x2d, 0x65, 0xaf, 0x12, 0xc2, 0x03, 0x7c, 0xc5, 0x13, 0x7f, 0x24,
+	0xc0, 0x95, 0x1e, 0x2f, 0x1d, 0xcb, 0x34, 0x1c, 0xd2, 0x6b, 0x25, 0xcc, 0x80, 0x4c, 0x8b, 0xc4,
+	0x88, 0xcd, 0x56, 0x28, 0xd2, 0x61, 0x51, 0xe8, 0x93, 0x30, 0x6f, 0xe0, 0x7b, 0xae, 0x12, 0x72,
+	0xd2, 0x8b, 0xce, 0x2c, 0x21, 0x57, 0xb8, 0xa3, 0xe2, 0xb3, 0x70, 0xa5, 0x80, 0x75, 0xec, 0xe2,
+	0xc1, 0xb6, 0xec, 0x27, 0x02, 0x5c, 0xc9, 0xd3, 0x0e, 0x61, 0x20, 0xfe, 0xd0, 0x9e, 0x8d, 0x77,
+	0xec, 0xd9, 0x1e, 0x40, 0x60, 0x2d, 0xbb, 0x0b, 0x87, 0xf5, 0x3b, 0x24, 0x49, 0xfc, 0xbd, 0x00,
+	0x57, 0x76, 0x69, 0x13, 0x32, 0x98, 0x7d, 0x1f, 0x91, 0x1d, 0xa1, 0xd6, 0xa9, 0xa5, 0x3a, 0x47,
+	0xa7, 0x96, 0xdb, 0x6b, 0x1a, 0xd6, 0x1b, 0xdb, 0xaa, 0x73, 0xc4, 0x5b, 0x27, 0xf2, 0x2d, 0x7e,
+	0x02, 0xe6, 0xd6, 0xb1, 0x4b, 0xf2, 0xe8, 0xac, 0xad, 0xc8, 0x40, 0xaa, 0xe3, 0xa4, 0x9d, 0xc7,
+	0xff, 0x5d, 0x01, 0x92, 0x24, 0x0f, 0x09, 0xdf, 0xc7, 0xe5, 0x9c, 0x89, 0x6f, 0x09, 0xb0, 0x10,
+	0x32, 0x8a, 0x1d, 0x8b, 0x35, 0x98, 0x24, 0x8d, 0x15, 0x3f, 0x10, 0xcf, 0x45, 0x3d, 0x7e, 0x92,
+	0xb7, 0x7c, 0xe0, 0x43, 0xf0, 0x14, 0x2c, 0x78, 0x87, 0xe0, 0xbc, 0x18, 0xfe, 0x54, 0x80, 0x05,
+	0x2f, 0xfd, 0xcf, 0xe1, 0x0c, 0x05, 0x71, 0xa2, 0x23, 0x88, 0x57, 0x60, 0x9a, 0xf6, 0x8c, 0xfc,
+	0xba, 0x97, 0xa6, 0xc8, 0xb0, 0xd4, 0x40, 0x05, 0x98, 0x20, 0x5f, 0xc3, 0xbc, 0x05, 0x52, 0x5b,
+	0xe8, 0x6a, 0xd2, 0x3f, 0x2f, 0x78, 0xf9, 0x7f, 0x9e, 0x81, 0x5c, 0xdf, 0xd8, 0x28, 0xfa, 0x46,
+	0xcb, 0xf3, 0xb7, 0x05, 0x48, 0xf3, 0xcd, 0x1f, 0xfc, 0x0e, 0x78, 0xe0, 0x39, 0xf8, 0xbe, 0x00,
+	0x57, 0xfb, 0x9a, 0xf1, 0xb1, 0x01, 0xe9, 0xf7, 0x04, 0xb8, 0xcc, 0x50, 0xd7, 0x6f, 0xf2, 0x58,
+	0x90, 0x82, 0x3c, 0x13, 0x3a, 0xf2, 0xec, 0x71, 0x98, 0xf1, 0xbb, 0xc0, 0x20, 0xd9, 0x12, 0x3e,
+	0xad, 0xd4, 0xd5, 0x58, 0x8e, 0x47, 0x6b, 0x2c, 0xc5, 0x0f, 0x05, 0xb8, 0xcc, 0x80, 0xb6, 0xdb,
+	0xa4, 0x7e, 0xfb, 0x36, 0x8a, 0xae, 0xee, 0x24, 0x9b, 0x88, 0x94, 0x64, 0xdf, 0x14, 0x60, 0xc1,
+	0x97, 0xba, 0x8d, 0x5d, 0xb5, 0xa1, 0xba, 0x6a, 0xf7, 0xbb, 0x98, 0x10, 0xe9, 0x5d, 0xec, 0x45,
+	0x88, 0x61, 0xa3, 0x31, 0xe8, 0x3b, 0xcc, 0x34, 0x36, 0x1a, 0x64, 0x24, 0xca, 0xf0, 0xf8, 0x3a,
+	0x76, 0xf7, 0xda, 0xba, 0x71, 0x3f, 0x94, 0x66, 0x72, 0xbb, 0xd5, 0x52, 0xed, 0x93, 0xf3, 0xf6,
+	0xf3, 0x94, 0xc4, 0x17, 0x3f, 0x1c, 0x03, 0xf1, 0x2c, 0xa9, 0x2c, 0x87, 0x5d, 0x98, 0xaa, 0x9b,
+	0x6d, 0xc3, 0xe5, 0xe9, 0xfb, 0x7a, 0x94, 0xf4, 0x3d, 0x5f, 0x7e, 0x46, 0xc6, 0xc7, 0x98, 0x54,
+	0xf0, 0x79, 0xa2, 0x44, 0x62, 0xba, 0xd2, 0xef, 0x08, 0x30, 0xdb, 0x31, 0x83, 0x6a, 0x10, 0x73,
+	0x18, 0x81, 0x3d, 0x99, 0xac, 0x8d, 0xf6, 0x47, 0x4c, 0x2e, 0x5e, 0xf2, 0xe5, 0xa2, 0x45, 0x98,
+	0xa4, 0xfa, 0x69, 0xa4, 0xc6, 0x25, 0x6f, 0xc0, 0x0a, 0xd3, 0xa0, 0xf2, 0x3d, 0x0b, 0xe6, 0xdf,
+	0x66, 0x85, 0x69, 0xc0, 0xed, 0x0c, 0xb9, 0x3f, 0x23, 0x01, 0xd3, 0x8f, 0x59, 0xe5, 0xd8, 0x61,
+	0x06, 0xdb, 0xd0, 0x7d, 0x98, 0x71, 0xea, 0xaa, 0xa1, 0x78, 0xef, 0x70, 0x43, 0xa1, 0x52, 0x28,
+	0x16, 0x09, 0x27, 0x50, 0x31, 0x30, 0x2a, 0xfd, 0xc1, 0xaf, 0xb5, 0x06, 0x8a, 0x2a, 0xfa, 0x3c,
+	0x24, 0x42, 0x26, 0x0f, 0x53, 0x6c, 0x85, 0xf4, 0x40, 0x60, 0xf1, 0x48, 0x97, 0xd0, 0xca, 0x9f,
+	0x96, 0x60, 0x21, 0xcf, 0x55, 0xf2, 0x87, 0x26, 0xf4, 0x5b, 0x01, 0x66, 0x3b, 0xaa, 0x2b, 0x74,
+	0x27, 0xe2, 0x89, 0xe9, 0xa9, 0x3f, 0xd3, 0x43, 0x5e, 0x19, 0xe2, 0xf5, 0xaf, 0xfd, 0xfd, 0xdf,
+	0xdf, 0x1b, 0x7b, 0x06, 0x3d, 0x1d, 0xfc, 0x3e, 0xe4, 0x2b, 0x24, 0xa0, 0xb7, 0x2c, 0xdb, 0xfc,
+	0x22, 0xae, 0xbb, 0x4e, 0x76, 0x39, 0x1b, 0xba, 0x55, 0xb2, 0xcb, 0x6f, 0xa2, 0xbf, 0x08, 0x30,
+	0xdf, 0xd5, 0x73, 0xa0, 0x48, 0x4f, 0x35, 0xfd, 0xdb, 0xb2, 0x74, 0x7e, 0x24, 0x19, 0x5e, 0xea,
+	0xf6, 0xf5, 0xc7, 0x3b, 0x45, 0x21, 0x8f, 0xde, 0x0c, 0xbb, 0x84, 0x3e, 0x10, 0x20, 0xd9, 0xdd,
+	0xa6, 0xa0, 0x7c, 0xb4, 0xc7, 0xe2, 0xbe, 0x4d, 0x4e, 0xfa, 0x72, 0x4f, 0x9a, 0x14, 0x5b, 0x96,
+	0x7b, 0xc2, 0x8d, 0x5c, 0x8e, 0x10, 0xf4, 0xbf, 0x0a, 0x90, 0xec, 0xee, 0x8d, 0xa2, 0x19, 0x79,
+	0x4a, 0x67, 0x35, 0x74, 0xe6, 0xdc, 0xa2, 0x4e, 0xbc, 0x24, 0x0e, 0x1e, 0xe9, 0x1b, 0xe1, 0x26,
+	0x86, 0x38, 0xd4, 0xdd, 0x4c, 0x45, 0x73, 0xe8, 0x94, 0x56, 0x6c, 0x54, 0x87, 0x56, 0x06, 0xdf,
+	0x95, 0x0e, 0x87, 0xfe, 0x28, 0xc0, 0x42, 0x4f, 0xcf, 0x84, 0x0a, 0x43, 0x9f, 0xec, 0x50, 0x8d,
+	0x9d, 0x8e, 0x5c, 0x41, 0x8b, 0x2f, 0x51, 0x67, 0xae, 0xa3, 0xec, 0xc0, 0xce, 0x64, 0xbd, 0xb6,
+	0xe6, 0xe7, 0x02, 0x4c, 0xb3, 0x06, 0x11, 0xdd, 0x88, 0x68, 0xfc, 0x68, 0x26, 0x3f, 0x43, 0x4d,
+	0x7e, 0x12, 0x3d, 0x71, 0x86, 0xc9, 0xd4, 0x46, 0x72, 0x1e, 0x7e, 0x23, 0x40, 0xdc, 0xef, 0xed,
+	0xd0, 0xcb, 0x51, 0xa1, 0x23, 0xdc, 0xa7, 0xa6, 0x6f, 0x0d, 0xb9, 0x9a, 0x41, 0x4e, 0x3f, 0xbb,
+	0xfb, 0x1c, 0x04, 0x2f, 0xbc, 0xef, 0x09, 0x00, 0x41, 0x3b, 0x88, 0x6e, 0x45, 0x87, 0x99, 0x70,
+	0x90, 0x4f, 0x03, 0x18, 0x66, 0xd2, 0xf2, 0x40, 0xa1, 0xfc, 0xb5, 0x00, 0x10, 0xf4, 0x9d, 0xd1,
+	0x4c, 0xea, 0xe9, 0x57, 0x87, 0xd8, 0x77, 0x86, 0x86, 0xe2, 0x20, 0xf1, 0xbb, 0xe1, 0x75, 0x86,
+	0xc4, 0xe4, 0xa0, 0x13, 0x8d, 0x66, 0x72, 0x4f, 0x07, 0x3b, 0xbc, 0xc9, 0x2b, 0x83, 0xc4, 0x97,
+	0x99, 0xfc, 0x4f, 0x01, 0x2e, 0xf6, 0x69, 0x04, 0xd1, 0xda, 0x30, 0xc9, 0xd7, 0xe7, 0xf6, 0x5c,
+	0x1f, 0x59, 0x0e, 0x4b, 0xe7, 0x41, 0x90, 0x83, 0xfb, 0xd6, 0x71, 0x8f, 0xbe, 0x35, 0x06, 0xe9,
+	0xd3, 0xab, 0x79, 0xb4, 0xfd, 0xa0, 0xba, 0x02, 0xcf, 0xdf, 0xf2, 0x83, 0x6d, 0x32, 0xc4, 0x35,
+	0xea, 0xf6, 0x1d, 0xf4, 0xb9, 0xc1, 0xaf, 0xb3, 0x8e, 0x9f, 0xfd, 0x70, 0x37, 0xff, 0x2c, 0xc0,
+	0x8c, 0x8c, 0xdd, 0x92, 0xda, 0xaa, 0xd0, 0xdf, 0xc9, 0x22, 0x91, 0x1b, 0xaa, 0xa9, 0xad, 0xcc,
+	0xf1, 0xf5, 0x4c, 0x78, 0x92, 0x3b, 0x73, 0xa9, 0x8b, 0xc7, 0x9b, 0x15, 0xbf, 0x2a, 0x50, 0xa3,
+	0xee, 0x8b, 0x2f, 0x84, 0x8c, 0xe2, 0x7f, 0xe4, 0xee, 0x9b, 0x6b, 0x4e, 0x48, 0xf8, 0x0d, 0x61,
+	0xf9, 0xd5, 0xdb, 0xe2, 0x8d, 0x73, 0x96, 0x76, 0xdd, 0x68, 0x5d, 0x02, 0xa8, 0x3b, 0xeb, 0x67,
+	0xb9, 0xb3, 0xfe, 0x51, 0xba, 0xd3, 0x1c, 0xd5, 0x9d, 0x2e, 0x01, 0xe8, 0xbf, 0x02, 0xa0, 0x2a,
+	0x76, 0x28, 0x11, 0xdb, 0x2d, 0xcd, 0x71, 0x34, 0xd3, 0x70, 0xd0, 0xb5, 0x2e, 0x83, 0x7b, 0x59,
+	0xb8, 0x6b, 0x4f, 0x0f, 0xc0, 0xc9, 0x32, 0xea, 0x5d, 0xcf, 0xdd, 0x6f, 0x08, 0xe7, 0x1a, 0xed,
+	0xfb, 0xeb, 0xf6, 0x48, 0x23, 0x5e, 0x17, 0xc5, 0x3b, 0xd1, 0xbc, 0xee, 0x2b, 0x06, 0xfd, 0x42,
+	0x80, 0xf9, 0xae, 0x87, 0x9e, 0x68, 0x75, 0x7b, 0xff, 0x57, 0xa2, 0xf4, 0xd9, 0x6f, 0x2d, 0xe2,
+	0xf3, 0x34, 0x0a, 0xcf, 0x8a, 0xd7, 0xce, 0x39, 0x58, 0xfe, 0x8f, 0xc6, 0xb9, 0xad, 0x5d, 0x2f,
+	0x40, 0xd1, 0x6c, 0xed, 0xff, 0x7c, 0x34, 0xa0, 0xad, 0x2b, 0xd7, 0xce, 0xaa, 0x9a, 0x7c, 0x43,
+	0x49, 0xa8, 0x85, 0x65, 0xf4, 0x3b, 0xaf, 0x9d, 0x0b, 0xfd, 0xdd, 0x2b, 0x6a, 0x3b, 0xd7, 0xd3,
+	0xe2, 0xa6, 0x87, 0xec, 0x5c, 0xc5, 0x15, 0xea, 0xc0, 0xa7, 0xd0, 0xf2, 0x19, 0x0e, 0x84, 0x5b,
+	0x7b, 0xd6, 0x5a, 0xcc, 0x77, 0xbd, 0x04, 0x44, 0xef, 0xe7, 0x7a, 0x5f, 0x33, 0xa2, 0xf7, 0x73,
+	0x7d, 0x9e, 0x22, 0xfa, 0x3a, 0xd4, 0x27, 0x7b, 0xc2, 0x3e, 0xa1, 0xbf, 0xf9, 0xad, 0x45, 0x68,
+	0x4f, 0x86, 0x68, 0x2d, 0x1e, 0xdc, 0xb6, 0xdc, 0xa6, 0x5e, 0x7c, 0x76, 0x25, 0xc2, 0xb6, 0xdc,
+	0x08, 0xbf, 0x67, 0xac, 0x7e, 0x4b, 0x80, 0x27, 0xeb, 0x66, 0x8b, 0xab, 0x3f, 0x5d, 0x6b, 0x45,
+	0x78, 0xf5, 0x35, 0xc6, 0xd4, 0x34, 0x75, 0xd5, 0x68, 0x66, 0x4c, 0xbb, 0x99, 0x6d, 0x62, 0x83,
+	0x56, 0x88, 0x59, 0x6f, 0x4a, 0xb5, 0x34, 0x67, 0x90, 0xff, 0x2a, 0x72, 0xb3, 0x67, 0xea, 0x83,
+	0xb1, 0xf1, 0xf5, 0x7c, 0xae, 0x36, 0x45, 0xa5, 0x3d, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xb3, 0xe0, 0xe0, 0x39, 0xcf, 0x33, 0x00, 0x00,
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ContainerAnalysisClient is the client API for ContainerAnalysis service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ContainerAnalysisClient interface {
+	// Returns the requested `Occurrence`.
+	GetOccurrence(ctx context.Context, in *GetOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
+	// Lists active `Occurrences` for a given project matching the filters.
+	ListOccurrences(ctx context.Context, in *ListOccurrencesRequest, opts ...grpc.CallOption) (*ListOccurrencesResponse, error)
+	// Deletes the given `Occurrence` from the system. Use this when
+	// an `Occurrence` is no longer applicable for the given resource.
+	DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a new `Occurrence`. Use this method to create `Occurrences`
+	// for a resource.
+	CreateOccurrence(ctx context.Context, in *CreateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
+	// Updates an existing occurrence.
+	UpdateOccurrence(ctx context.Context, in *UpdateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
+	// Gets the `Note` attached to the given `Occurrence`.
+	GetOccurrenceNote(ctx context.Context, in *GetOccurrenceNoteRequest, opts ...grpc.CallOption) (*Note, error)
+	// Returns the requested `Note`.
+	GetNote(ctx context.Context, in *GetNoteRequest, opts ...grpc.CallOption) (*Note, error)
+	// Lists all `Notes` for a given project.
+	ListNotes(ctx context.Context, in *ListNotesRequest, opts ...grpc.CallOption) (*ListNotesResponse, error)
+	// Deletes the given `Note` from the system.
+	DeleteNote(ctx context.Context, in *DeleteNoteRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a new `Note`.
+	CreateNote(ctx context.Context, in *CreateNoteRequest, opts ...grpc.CallOption) (*Note, error)
+	// Updates an existing `Note`.
+	UpdateNote(ctx context.Context, in *UpdateNoteRequest, opts ...grpc.CallOption) (*Note, error)
+	// Lists `Occurrences` referencing the specified `Note`. Use this method to
+	// get all occurrences referencing your `Note` across all your customer
+	// projects.
+	ListNoteOccurrences(ctx context.Context, in *ListNoteOccurrencesRequest, opts ...grpc.CallOption) (*ListNoteOccurrencesResponse, error)
+	// Gets a summary of the number and severity of occurrences.
+	GetVulnzOccurrencesSummary(ctx context.Context, in *GetVulnzOccurrencesSummaryRequest, opts ...grpc.CallOption) (*GetVulnzOccurrencesSummaryResponse, error)
+	// Sets the access control policy on the specified `Note` or `Occurrence`.
+	// Requires `containeranalysis.notes.setIamPolicy` or
+	// `containeranalysis.occurrences.setIamPolicy` permission if the resource is
+	// a `Note` or an `Occurrence`, respectively.
+	// Attempting to call this method without these permissions will result in a `
+	// `PERMISSION_DENIED` error.
+	// Attempting to call this method on a non-existent resource will result in a
+	// `NOT_FOUND` error if the user has `containeranalysis.notes.list` permission
+	// on a `Note` or `containeranalysis.occurrences.list` on an `Occurrence`, or
+	// a `PERMISSION_DENIED` error otherwise. The resource takes the following
+	// formats: `projects/{projectid}/occurrences/{occurrenceid}` for occurrences
+	// and projects/{projectid}/notes/{noteid} for notes
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
+	// Gets the access control policy for a note or an `Occurrence` resource.
+	// Requires `containeranalysis.notes.setIamPolicy` or
+	// `containeranalysis.occurrences.setIamPolicy` permission if the resource is
+	// a note or occurrence, respectively.
+	// Attempting to call this method on a resource without the required
+	// permission will result in a `PERMISSION_DENIED` error. Attempting to call
+	// this method on a non-existent resource will result in a `NOT_FOUND` error
+	// if the user has list permission on the project, or a `PERMISSION_DENIED`
+	// error otherwise. The resource takes the following formats:
+	// `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for occurrences and
+	// projects/{PROJECT_ID}/notes/{NOTE_ID} for notes
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
+	// Returns the permissions that a caller has on the specified note or
+	// occurrence resource. Requires list permission on the project (for example,
+	// "storage.objects.list" on the containing bucket for testing permission of
+	// an object). Attempting to call this method on a non-existent resource will
+	// result in a `NOT_FOUND` error if the user has list permission on the
+	// project, or a `PERMISSION_DENIED` error otherwise. The resource takes the
+	// following formats: `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for
+	// `Occurrences` and `projects/{PROJECT_ID}/notes/{NOTE_ID}` for `Notes`
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
+	// Creates a new `Operation`.
+	CreateOperation(ctx context.Context, in *CreateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Updates an existing operation returns an error if operation
+	//  does not exist. The only valid operations are to update mark the done bit
+	// change the result.
+	UpdateOperation(ctx context.Context, in *UpdateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Gets a specific scan configuration for a project.
+	GetScanConfig(ctx context.Context, in *GetScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
+	// Lists scan configurations for a project.
+	ListScanConfigs(ctx context.Context, in *ListScanConfigsRequest, opts ...grpc.CallOption) (*ListScanConfigsResponse, error)
+	// Updates the scan configuration to a new value.
+	UpdateScanConfig(ctx context.Context, in *UpdateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
+}
+
+type containerAnalysisClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewContainerAnalysisClient(cc *grpc.ClientConn) ContainerAnalysisClient {
+	return &containerAnalysisClient{cc}
+}
+
+func (c *containerAnalysisClient) GetOccurrence(ctx context.Context, in *GetOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
+	out := new(Occurrence)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrence", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) ListOccurrences(ctx context.Context, in *ListOccurrencesRequest, opts ...grpc.CallOption) (*ListOccurrencesResponse, error) {
+	out := new(ListOccurrencesResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListOccurrences", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/DeleteOccurrence", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) CreateOccurrence(ctx context.Context, in *CreateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
+	out := new(Occurrence)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateOccurrence", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) UpdateOccurrence(ctx context.Context, in *UpdateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
+	out := new(Occurrence)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateOccurrence", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) GetOccurrenceNote(ctx context.Context, in *GetOccurrenceNoteRequest, opts ...grpc.CallOption) (*Note, error) {
+	out := new(Note)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrenceNote", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) GetNote(ctx context.Context, in *GetNoteRequest, opts ...grpc.CallOption) (*Note, error) {
+	out := new(Note)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetNote", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) ListNotes(ctx context.Context, in *ListNotesRequest, opts ...grpc.CallOption) (*ListNotesResponse, error) {
+	out := new(ListNotesResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListNotes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4220,215 +4079,3 @@ var _ContainerAnalysis_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/containeranalysis/v1alpha1/containeranalysis.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/containeranalysis.proto", fileDescriptor_containeranalysis_a487a8754ddd6778)
-}
-
-var fileDescriptor_containeranalysis_a487a8754ddd6778 = []byte{
-	// 3256 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5b, 0xdb, 0x6f, 0x23, 0x57,
-	0x19, 0xdf, 0xc9, 0xd5, 0xfe, 0x9c, 0x8b, 0x73, 0x36, 0xbb, 0xeb, 0x7a, 0x7b, 0x49, 0xa7, 0x94,
-	0x6e, 0x53, 0x6a, 0x77, 0xd3, 0x96, 0xc2, 0x6e, 0x97, 0x5d, 0xc7, 0x76, 0x12, 0x37, 0x89, 0x63,
-	0xcd, 0x38, 0x61, 0xd3, 0x96, 0x8e, 0xc6, 0xf6, 0x89, 0x33, 0x64, 0x3c, 0x33, 0xcc, 0x8c, 0xc3,
-	0x66, 0x51, 0x25, 0x44, 0x0b, 0xa8, 0x12, 0x45, 0xe5, 0xfa, 0xc2, 0xa5, 0x52, 0x41, 0x95, 0x80,
-	0x17, 0x5e, 0x78, 0x83, 0x17, 0x40, 0x3c, 0x01, 0x42, 0xe2, 0x19, 0xf1, 0x00, 0x0f, 0xfc, 0x0b,
-	0x48, 0x3c, 0xa0, 0x73, 0xe6, 0x9c, 0x99, 0xf1, 0x25, 0x89, 0xc7, 0xde, 0x4a, 0x7d, 0xda, 0x39,
-	0xdf, 0xf9, 0xce, 0x77, 0x3b, 0xdf, 0xf9, 0x9d, 0xef, 0x3b, 0xf1, 0xc2, 0x6a, 0xd3, 0x34, 0x9b,
-	0x3a, 0xce, 0x36, 0xf0, 0xb1, 0x6b, 0x9a, 0xba, 0x93, 0xad, 0x9b, 0x86, 0xab, 0x6a, 0x06, 0xb6,
-	0x55, 0x43, 0xd5, 0x4f, 0x1c, 0xcd, 0xc9, 0x1e, 0x5f, 0x57, 0x75, 0xeb, 0x50, 0xbd, 0xde, 0x3b,
-	0x95, 0xb1, 0x6c, 0xd3, 0x35, 0xd1, 0xb2, 0x27, 0x23, 0xc3, 0x65, 0x64, 0x7a, 0x19, 0xb9, 0x8c,
-	0xf4, 0xc3, 0x4c, 0x9f, 0x6a, 0x69, 0x59, 0xd5, 0x30, 0x4c, 0x57, 0x75, 0x35, 0xd3, 0x60, 0x92,
-	0xd2, 0x51, 0xac, 0xa9, 0x69, 0xba, 0xae, 0x98, 0x07, 0x4a, 0x4b, 0x75, 0xb1, 0xad, 0xa9, 0x3a,
-	0x97, 0xf1, 0x72, 0x04, 0x19, 0x5a, 0x4b, 0x6d, 0x62, 0xa5, 0xa6, 0xfa, 0xbe, 0xa4, 0xd7, 0x22,
-	0xac, 0xb6, 0xd4, 0xfa, 0x11, 0x59, 0x7f, 0xdc, 0xd6, 0xc9, 0x7c, 0x4d, 0xd3, 0x35, 0xf7, 0x84,
-	0xc9, 0xb9, 0x19, 0x45, 0x8e, 0x6d, 0x1e, 0x63, 0x43, 0x35, 0xea, 0x98, 0x2d, 0x7e, 0x94, 0x2d,
-	0xd6, 0xd4, 0x56, 0xf6, 0xf8, 0x3a, 0xf9, 0x47, 0xb1, 0x4c, 0x5d, 0xab, 0x73, 0xe1, 0xe9, 0xce,
-	0xf9, 0x8e, 0xb9, 0x27, 0xd8, 0x9c, 0x6e, 0x1a, 0x4d, 0xbb, 0x6d, 0x18, 0x9a, 0xd1, 0xcc, 0x9a,
-	0x16, 0xb6, 0x3b, 0xe2, 0xfc, 0x10, 0x63, 0xa2, 0xa3, 0x5a, 0xfb, 0x20, 0xab, 0x1a, 0x7c, 0xfd,
-	0xd5, 0xee, 0x29, 0xdc, 0xb2, 0x7c, 0xaf, 0x96, 0xba, 0x27, 0x0f, 0x34, 0xac, 0x37, 0x94, 0x96,
-	0xea, 0x1c, 0x31, 0x8e, 0xc7, 0xba, 0x39, 0x5c, 0xad, 0x85, 0x1d, 0x57, 0x6d, 0x59, 0x8c, 0xe1,
-	0x0a, 0x63, 0xb0, 0xad, 0x7a, 0xd6, 0x71, 0x55, 0xb7, 0xcd, 0x6c, 0x12, 0x7f, 0x16, 0x07, 0xd8,
-	0xa9, 0xd7, 0xdb, 0xb6, 0x8d, 0x8d, 0x3a, 0x46, 0x08, 0x26, 0x0c, 0xb5, 0x85, 0x53, 0xc2, 0x92,
-	0x70, 0x2d, 0x2e, 0xd1, 0x6f, 0xf4, 0x38, 0xcc, 0xd8, 0xd8, 0x31, 0xdb, 0x76, 0x1d, 0x2b, 0x6d,
-	0x5b, 0x4f, 0x8d, 0xd1, 0xb9, 0x04, 0xa7, 0xed, 0xda, 0x3a, 0xaa, 0x40, 0x8c, 0x0f, 0x53, 0x0b,
-	0x4b, 0xc2, 0xb5, 0xc4, 0xca, 0x0b, 0x99, 0xc1, 0xd3, 0x33, 0x23, 0xb1, 0xb5, 0x92, 0x2f, 0x05,
-	0x5d, 0x85, 0xb8, 0x61, 0xba, 0x58, 0xa1, 0xd6, 0x8c, 0x53, 0x8d, 0x31, 0x42, 0x28, 0x13, 0x8b,
-	0x4a, 0x30, 0x71, 0xa4, 0x19, 0x8d, 0xd4, 0xd4, 0x92, 0x70, 0x6d, 0x6e, 0xe5, 0xc5, 0x28, 0xaa,
-	0xca, 0xa6, 0x8b, 0x33, 0x9b, 0x9a, 0xd1, 0x90, 0xa8, 0x08, 0xf4, 0x8e, 0x00, 0x97, 0x3a, 0x32,
-	0x49, 0x69, 0x60, 0x57, 0xd5, 0x74, 0x27, 0x15, 0xa3, 0x7e, 0x48, 0x51, 0x84, 0xef, 0x85, 0x05,
-	0x55, 0x4f, 0x2c, 0xdc, 0x49, 0x29, 0x78, 0x92, 0x37, 0x2e, 0x48, 0x8b, 0xc7, 0x7d, 0xe8, 0x48,
-	0x81, 0xd9, 0x5a, 0x5b, 0xd3, 0x1b, 0xbe, 0x09, 0xd3, 0xd4, 0x84, 0xcf, 0x44, 0x31, 0x61, 0x95,
-	0x08, 0x08, 0x14, 0xcd, 0xd4, 0x42, 0x63, 0x74, 0x00, 0xb3, 0x0d, 0x6c, 0x6b, 0xc7, 0xb8, 0xa1,
-	0xd0, 0x33, 0x98, 0x4a, 0x50, 0x05, 0xb7, 0xa3, 0x28, 0x28, 0x98, 0xf5, 0x23, 0x6c, 0x97, 0xc8,
-	0xf2, 0x4c, 0xc1, 0x13, 0x46, 0xf4, 0x30, 0xb9, 0x94, 0x8e, 0x5a, 0x30, 0xa3, 0x19, 0x8e, 0xab,
-	0xea, 0x3a, 0xcd, 0xff, 0xd4, 0x0c, 0x55, 0xb3, 0x1e, 0x45, 0x4d, 0xc5, 0x3b, 0xe5, 0xdb, 0xaa,
-	0xa1, 0x36, 0xb1, 0x9d, 0x29, 0x85, 0xc4, 0x11, 0x75, 0x61, 0xf1, 0xa8, 0x0e, 0xd0, 0xc0, 0x96,
-	0x6e, 0x9e, 0xb4, 0xb0, 0xe1, 0xa6, 0xe6, 0xa8, 0xb2, 0x5c, 0x24, 0x9f, 0xe8, 0x6a, 0xb5, 0xa6,
-	0x63, 0xf6, 0x49, 0x04, 0x6d, 0x5c, 0x90, 0x42, 0x62, 0x51, 0x0d, 0xa0, 0xa1, 0x39, 0x75, 0xf3,
-	0x18, 0xdb, 0xb8, 0x91, 0x9a, 0xa7, 0x4a, 0xee, 0x44, 0x52, 0xc2, 0x56, 0x9f, 0xf8, 0x5f, 0x34,
-	0x72, 0x21, 0xa9, 0xc8, 0x82, 0x84, 0xea, 0xba, 0xe4, 0xe0, 0xd2, 0xb0, 0x25, 0xa9, 0x92, 0xad,
-	0x28, 0x4a, 0x72, 0xc1, 0xf2, 0x5c, 0xdb, 0x3d, 0x34, 0x6d, 0x82, 0x8d, 0x21, 0xe2, 0xc6, 0x05,
-	0x29, 0xac, 0x02, 0x2d, 0x41, 0xc2, 0xc6, 0x2d, 0xdc, 0xd0, 0x3c, 0x8d, 0x93, 0xfc, 0x68, 0xfb,
-	0x24, 0x74, 0x13, 0x12, 0x75, 0x1b, 0xab, 0x2e, 0x56, 0x08, 0xa6, 0xa4, 0xe2, 0xd4, 0xa6, 0x34,
-	0xb7, 0x89, 0x03, 0x4e, 0xa6, 0xca, 0x01, 0x47, 0x02, 0x8f, 0x9d, 0x10, 0xc8, 0xe2, 0xb6, 0xd5,
-	0xf0, 0x17, 0xc3, 0xf9, 0x8b, 0x3d, 0x76, 0x42, 0x58, 0x8d, 0xc3, 0x34, 0x3b, 0x08, 0xe2, 0xd7,
-	0x05, 0x88, 0x71, 0x90, 0xe8, 0x8b, 0x51, 0x49, 0x18, 0x6f, 0xdb, 0x1a, 0x83, 0x26, 0xf2, 0x89,
-	0x64, 0x98, 0x21, 0x71, 0xc2, 0x86, 0xab, 0x1c, 0xaa, 0xce, 0x21, 0xc5, 0x90, 0xc4, 0xca, 0x73,
-	0x51, 0x82, 0xb9, 0xa1, 0x3a, 0x87, 0x52, 0x82, 0x49, 0x21, 0x03, 0xf1, 0x7f, 0x00, 0x13, 0x04,
-	0x41, 0xfa, 0xda, 0xf0, 0x0c, 0x2c, 0x38, 0x87, 0xa6, 0xed, 0x2a, 0x0d, 0xec, 0xd4, 0x6d, 0xcd,
-	0xa2, 0x11, 0xf5, 0xa0, 0x2b, 0x49, 0x27, 0x0a, 0x01, 0x1d, 0x3d, 0x0d, 0x49, 0x72, 0x57, 0x74,
-	0xf0, 0x4e, 0x50, 0xde, 0x79, 0x42, 0x0f, 0xb3, 0x72, 0xb4, 0x8b, 0x8f, 0x8e, 0x76, 0x06, 0xa0,
-	0x4e, 0xb0, 0x73, 0x4f, 0x2c, 0x4c, 0x61, 0x34, 0xb1, 0x72, 0x6b, 0x24, 0xa4, 0xdb, 0xb8, 0x20,
-	0x2d, 0x1c, 0x77, 0x13, 0xd1, 0x1e, 0x80, 0x87, 0x68, 0x54, 0x8f, 0x87, 0xa8, 0x2f, 0x46, 0x86,
-	0x33, 0x26, 0x3f, 0x5e, 0xe3, 0x03, 0xf4, 0x06, 0x40, 0x4d, 0x75, 0x30, 0x43, 0xb1, 0xd9, 0xe8,
-	0xf6, 0x87, 0x51, 0x6c, 0x95, 0x14, 0x22, 0x54, 0xbe, 0xea, 0x60, 0x0f, 0xc0, 0xde, 0x80, 0x69,
-	0x56, 0x66, 0x30, 0x38, 0x59, 0x1d, 0x01, 0xbb, 0xd8, 0x70, 0xe3, 0x82, 0xc4, 0x85, 0xa2, 0xbb,
-	0x1c, 0xb1, 0x08, 0xe6, 0xb0, 0x1b, 0xf3, 0xd3, 0xc3, 0x21, 0x56, 0x00, 0x53, 0x64, 0x84, 0x76,
-	0x21, 0xce, 0x01, 0xe5, 0x24, 0x85, 0xa2, 0x07, 0xdc, 0x47, 0x29, 0x12, 0x10, 0x5f, 0x12, 0xfa,
-	0x32, 0x5c, 0x0a, 0xc1, 0x86, 0xa2, 0x72, 0x6c, 0x49, 0x5d, 0x8c, 0x0e, 0x84, 0xfd, 0x30, 0x8a,
-	0xdc, 0x89, 0x6a, 0x1f, 0x3a, 0x7a, 0x9d, 0x00, 0x94, 0xae, 0xba, 0xb8, 0x41, 0x6b, 0x8f, 0xe9,
-	0xa5, 0xf1, 0x6b, 0x89, 0x95, 0x9b, 0x91, 0xcf, 0x80, 0xe4, 0xc9, 0xd8, 0xb5, 0x75, 0x09, 0x6c,
-	0xff, 0x1b, 0xe5, 0x61, 0x1e, 0xdf, 0xb3, 0x34, 0xaf, 0x4c, 0x1b, 0x14, 0xa3, 0xe6, 0x82, 0x25,
-	0x1c, 0xe4, 0xc2, 0x08, 0x99, 0x18, 0x05, 0x21, 0x67, 0xa2, 0x20, 0x64, 0xfa, 0x05, 0x80, 0xc0,
-	0x31, 0x0f, 0x03, 0x75, 0x06, 0x49, 0xe4, 0x13, 0x2d, 0xc2, 0xa4, 0xae, 0xd6, 0x30, 0x2f, 0xd9,
-	0xbc, 0x81, 0xf8, 0x4b, 0x01, 0x26, 0x08, 0x26, 0xa0, 0x45, 0x48, 0x6e, 0x96, 0xca, 0x05, 0x65,
-	0xb7, 0x2c, 0x57, 0x8a, 0xf9, 0xd2, 0x5a, 0xa9, 0x58, 0x48, 0x5e, 0x40, 0x0f, 0xc1, 0xa5, 0x4a,
-	0x2e, 0xbf, 0x99, 0x5b, 0x2f, 0x2a, 0x7b, 0xbb, 0x5b, 0xe5, 0xa2, 0x94, 0x5b, 0x2d, 0x6d, 0x95,
-	0xaa, 0xfb, 0xc9, 0x31, 0xb4, 0x00, 0xb3, 0xab, 0xbb, 0xa5, 0xad, 0x82, 0x52, 0x28, 0x56, 0x73,
-	0xa5, 0x2d, 0x39, 0x39, 0x8e, 0xe6, 0x21, 0x51, 0xda, 0x26, 0xbc, 0xab, 0x39, 0xb9, 0x24, 0x27,
-	0x27, 0xd0, 0x45, 0x98, 0xe7, 0xcb, 0xb7, 0x73, 0xe5, 0xdc, 0x7a, 0x51, 0x4a, 0x4e, 0xa2, 0x39,
-	0x80, 0x42, 0xb1, 0xb2, 0xb5, 0xb3, 0x9f, 0x5b, 0xdd, 0x2a, 0x26, 0xa7, 0xd0, 0x2c, 0xc4, 0x0b,
-	0x25, 0x39, 0xbf, 0xb3, 0x57, 0x94, 0xf6, 0x93, 0xd3, 0x44, 0x65, 0xae, 0x5a, 0x2d, 0xca, 0xd5,
-	0x5c, 0xb5, 0xb4, 0x53, 0x56, 0x72, 0xbb, 0xd5, 0x8d, 0x1d, 0x89, 0xa8, 0x8c, 0xad, 0x26, 0x58,
-	0x1d, 0x48, 0x00, 0x44, 0xfc, 0xc7, 0x38, 0x40, 0x90, 0xf9, 0x5d, 0x85, 0xa9, 0x96, 0x12, 0x96,
-	0xc6, 0x3b, 0x0b, 0x53, 0x2d, 0xfd, 0x2b, 0x7f, 0x05, 0xbd, 0xc4, 0x1f, 0x01, 0x68, 0x3b, 0xd8,
-	0x56, 0x70, 0x4b, 0xd5, 0x78, 0xa4, 0xe2, 0x84, 0x52, 0x24, 0x04, 0xb2, 0x19, 0xde, 0x51, 0xf2,
-	0x36, 0x63, 0xec, 0xfc, 0xcd, 0xf0, 0xd8, 0xe9, 0x4e, 0xde, 0x86, 0xd9, 0xb6, 0x11, 0x5e, 0x3e,
-	0x7e, 0xee, 0xf2, 0x19, 0xbe, 0x80, 0x0a, 0xb8, 0x0c, 0x53, 0x75, 0xd3, 0x38, 0xd0, 0x9a, 0x14,
-	0x28, 0xe3, 0x12, 0x1b, 0xa1, 0x14, 0x4c, 0xab, 0x8d, 0x86, 0x8d, 0x1d, 0x87, 0xdd, 0xcf, 0x7c,
-	0xd8, 0x13, 0x80, 0xa9, 0x9e, 0x00, 0xa0, 0x03, 0x88, 0x59, 0xba, 0xea, 0x1e, 0x98, 0x76, 0x8b,
-	0x96, 0x93, 0x73, 0x2b, 0xaf, 0x8c, 0x5c, 0x19, 0x65, 0x2a, 0x4c, 0xa2, 0xe4, 0xcb, 0x16, 0xf3,
-	0x10, 0xe3, 0x54, 0x94, 0x82, 0xc5, 0xca, 0x56, 0xae, 0xba, 0xb6, 0x23, 0x6d, 0x77, 0xe5, 0xd6,
-	0x34, 0x8c, 0xaf, 0x6f, 0x16, 0x93, 0x02, 0x8a, 0xc1, 0xc4, 0xda, 0x56, 0xf1, 0x6e, 0x72, 0x0c,
-	0x01, 0x4c, 0xe5, 0x77, 0xe5, 0xea, 0xce, 0x76, 0x72, 0x5c, 0x7c, 0x67, 0x02, 0xe2, 0x3e, 0x00,
-	0xa1, 0x57, 0x61, 0x96, 0x1b, 0xa4, 0xd0, 0x0b, 0x50, 0x18, 0xe5, 0x02, 0x9c, 0xe1, 0x93, 0x64,
-	0x94, 0x7e, 0x9f, 0xe4, 0x45, 0x50, 0x78, 0xdd, 0x84, 0xb8, 0xdf, 0xad, 0x51, 0x35, 0x89, 0x95,
-	0x47, 0xb8, 0x9a, 0x50, 0x4b, 0x97, 0xd9, 0xe1, 0x4c, 0x52, 0xc0, 0x8f, 0xee, 0xc1, 0xbc, 0x6f,
-	0xa7, 0xd7, 0x5b, 0xd1, 0x7d, 0x9a, 0x5b, 0xd9, 0x19, 0xb5, 0x3c, 0xcc, 0xe4, 0x18, 0x9b, 0x4c,
-	0xc5, 0x4a, 0x73, 0x6a, 0xc7, 0x18, 0xad, 0xc1, 0xa5, 0x2e, 0xcd, 0x0a, 0xb6, 0x6d, 0xd3, 0x66,
-	0x37, 0x3a, 0xe2, 0xfa, 0x6d, 0xab, 0x9e, 0x61, 0x22, 0x2e, 0x76, 0x8a, 0x28, 0x12, 0x76, 0xf1,
-	0x3b, 0x02, 0xcc, 0x75, 0xaa, 0x42, 0x8f, 0xc1, 0xd5, 0x5c, 0x39, 0xb7, 0xb5, 0x2f, 0x97, 0x64,
-	0x85, 0x9c, 0xcb, 0x5d, 0xb9, 0x6b, 0x2b, 0x13, 0x30, 0x5d, 0x29, 0x96, 0x0b, 0xa5, 0xf2, 0x7a,
-	0x52, 0x40, 0x33, 0x10, 0x93, 0xf3, 0xb9, 0x72, 0x99, 0x8c, 0xc6, 0x08, 0xae, 0xac, 0x95, 0xca,
-	0x25, 0x79, 0xa3, 0x58, 0x50, 0xe4, 0xdd, 0x7c, 0xbe, 0x28, 0x13, 0xa4, 0xb8, 0x08, 0xf3, 0x3e,
-	0x75, 0x2d, 0x57, 0xda, 0x2a, 0x16, 0x92, 0x13, 0x24, 0x55, 0x76, 0xcb, 0xf2, 0x6e, 0xa5, 0xb2,
-	0x23, 0x55, 0x8b, 0x05, 0x45, 0x2a, 0xca, 0x3b, 0xbb, 0x52, 0xbe, 0x98, 0x9c, 0x14, 0xbf, 0x2d,
-	0x40, 0xdc, 0xbf, 0xfd, 0xd1, 0x53, 0x30, 0x4f, 0x6f, 0x7f, 0x6c, 0x2b, 0xc7, 0xd8, 0x76, 0xf8,
-	0x36, 0xc5, 0xa5, 0x39, 0x46, 0xde, 0xf3, 0xa8, 0xe8, 0x2e, 0xc4, 0x1d, 0xad, 0x69, 0xa8, 0x6e,
-	0xdb, 0xe6, 0x07, 0xf8, 0x46, 0xe4, 0x82, 0x43, 0xe6, 0x12, 0xa4, 0x40, 0x98, 0xf8, 0xee, 0x18,
-	0xcc, 0x75, 0xce, 0x12, 0x38, 0xb1, 0xda, 0x35, 0x5d, 0xab, 0x2b, 0x47, 0xf8, 0x84, 0xc3, 0x89,
-	0x47, 0xd9, 0xc4, 0x27, 0xe8, 0xe1, 0x6e, 0x5b, 0xe2, 0x21, 0x79, 0xe8, 0x12, 0x4c, 0x1d, 0xe1,
-	0x13, 0x45, 0x6b, 0xb0, 0x1a, 0x71, 0xf2, 0x08, 0x9f, 0x94, 0x1a, 0xe8, 0x0b, 0x10, 0x23, 0x64,
-	0x5a, 0x30, 0x4d, 0xd0, 0x34, 0x5a, 0x1d, 0xde, 0xfe, 0xcc, 0x26, 0xa6, 0x85, 0x98, 0x34, 0x7d,
-	0xe4, 0x7d, 0x88, 0x1b, 0x30, 0xcd, 0x68, 0x24, 0xf6, 0x9b, 0xc5, 0x7d, 0xa5, 0xba, 0x5f, 0x29,
-	0x76, 0xed, 0xed, 0x25, 0x58, 0xa8, 0xac, 0x57, 0x94, 0x9c, 0x9c, 0x2f, 0x95, 0x94, 0x9c, 0xb4,
-	0xbd, 0x23, 0x15, 0x0b, 0xde, 0x2e, 0x57, 0x36, 0x4b, 0x77, 0x95, 0x4a, 0x71, 0x3b, 0x39, 0x26,
-	0xfe, 0x60, 0x0c, 0x16, 0x2b, 0x4d, 0x8b, 0xe8, 0xc2, 0x8d, 0xd0, 0x9d, 0xde, 0xe9, 0xb6, 0xd0,
-	0xed, 0xb6, 0x19, 0xd4, 0xe5, 0xd4, 0xc7, 0x71, 0xea, 0x63, 0xa4, 0x26, 0xa7, 0x9f, 0xd6, 0x4c,
-	0xde, 0x13, 0x4a, 0xbd, 0xe5, 0x35, 0x3b, 0x75, 0xf3, 0x51, 0x00, 0xab, 0x69, 0x29, 0x2c, 0xd6,
-	0x74, 0x1b, 0x36, 0x2e, 0x48, 0x31, 0xab, 0x69, 0x6d, 0x92, 0x80, 0x8b, 0x05, 0x48, 0x84, 0xd6,
-	0xa2, 0x87, 0x21, 0x95, 0xdf, 0x29, 0x57, 0x8b, 0xe5, 0x6a, 0xbf, 0xc8, 0x5c, 0x81, 0x8b, 0x72,
-	0x69, 0xbb, 0xb2, 0x55, 0x54, 0xe4, 0xd2, 0x3a, 0x49, 0x77, 0xe5, 0x15, 0x79, 0xa7, 0x9c, 0x14,
-	0x56, 0x63, 0x7c, 0x37, 0xc5, 0xff, 0x8c, 0xc1, 0x62, 0xbf, 0x12, 0x07, 0xb5, 0x60, 0xe2, 0x50,
-	0x33, 0x5c, 0x86, 0x2f, 0xfb, 0x0f, 0xb2, 0xad, 0x0b, 0xea, 0x28, 0xcd, 0x70, 0x25, 0xaa, 0x26,
-	0xfd, 0x0a, 0xa4, 0x4e, 0xe3, 0x40, 0x19, 0xb8, 0x78, 0xd8, 0x6e, 0xa9, 0x86, 0x62, 0x63, 0xb5,
-	0x41, 0xd0, 0x5d, 0x09, 0x75, 0x33, 0x0b, 0x74, 0x4a, 0x62, 0x33, 0x65, 0xb5, 0x85, 0xd3, 0xdf,
-	0x17, 0x20, 0x11, 0xde, 0xe2, 0x7b, 0x70, 0x99, 0xc4, 0xd4, 0xa1, 0xbb, 0xa0, 0x84, 0x7b, 0x56,
-	0x21, 0x7a, 0x3d, 0xd8, 0x6f, 0x3b, 0x49, 0x3d, 0x68, 0xf5, 0xa1, 0x93, 0x7a, 0x20, 0x38, 0x92,
-	0x3f, 0x14, 0x60, 0x26, 0xfc, 0xe0, 0x81, 0x5e, 0x03, 0x08, 0x9e, 0xf5, 0x98, 0x2d, 0x37, 0x23,
-	0x1f, 0x9f, 0x8a, 0x2f, 0x42, 0x0a, 0x89, 0x23, 0x2d, 0x5b, 0x30, 0x52, 0x6a, 0x27, 0x2e, 0x76,
-	0xd8, 0xa9, 0x9e, 0x0f, 0xe8, 0xab, 0x84, 0x2c, 0xbe, 0x0e, 0x20, 0xd7, 0x55, 0x23, 0xef, 0x5d,
-	0xe0, 0xfd, 0x9a, 0xc5, 0x25, 0x52, 0x6a, 0x04, 0xad, 0x1f, 0x7b, 0x53, 0x0b, 0x91, 0xc8, 0xb5,
-	0x8f, 0x0d, 0xb2, 0x03, 0x1e, 0x40, 0xc4, 0x24, 0x3e, 0x14, 0x97, 0x61, 0x71, 0x1d, 0xbb, 0xc1,
-	0xab, 0x9d, 0x84, 0xbf, 0xd4, 0xc6, 0x8e, 0xdb, 0x4f, 0x8f, 0xf8, 0x2f, 0x01, 0x2e, 0x6f, 0x69,
-	0x4e, 0x88, 0xdb, 0x39, 0x83, 0x9d, 0xd4, 0x20, 0x96, 0x6a, 0x63, 0xc3, 0x65, 0xa5, 0x06, 0x1b,
-	0x11, 0xfa, 0x81, 0xa6, 0xbb, 0xd8, 0x66, 0x96, 0xb2, 0x11, 0xba, 0x0a, 0x71, 0x4b, 0x6d, 0x62,
-	0xc5, 0xd1, 0xee, 0x7b, 0x47, 0x79, 0x52, 0x8a, 0x11, 0x82, 0xac, 0xdd, 0xf7, 0xe0, 0x91, 0x4c,
-	0xba, 0xe6, 0x11, 0xe6, 0xdd, 0x2d, 0x65, 0xaf, 0x12, 0xc2, 0x03, 0x7c, 0xc5, 0x13, 0x7f, 0x24,
-	0xc0, 0x95, 0x1e, 0x2f, 0x1d, 0xcb, 0x34, 0x1c, 0xd2, 0x6b, 0x25, 0xcc, 0x80, 0x4c, 0x8b, 0xc4,
-	0x88, 0xcd, 0x56, 0x28, 0xd2, 0x61, 0x51, 0xe8, 0x93, 0x30, 0x6f, 0xe0, 0x7b, 0xae, 0x12, 0x72,
-	0xd2, 0x8b, 0xce, 0x2c, 0x21, 0x57, 0xb8, 0xa3, 0xe2, 0xb3, 0x70, 0xa5, 0x80, 0x75, 0xec, 0xe2,
-	0xc1, 0xb6, 0xec, 0x27, 0x02, 0x5c, 0xc9, 0xd3, 0x0e, 0x61, 0x20, 0xfe, 0xd0, 0x9e, 0x8d, 0x77,
-	0xec, 0xd9, 0x1e, 0x40, 0x60, 0x2d, 0xbb, 0x0b, 0x87, 0xf5, 0x3b, 0x24, 0x49, 0xfc, 0xbd, 0x00,
-	0x57, 0x76, 0x69, 0x13, 0x32, 0x98, 0x7d, 0x1f, 0x91, 0x1d, 0xa1, 0xd6, 0xa9, 0xa5, 0x3a, 0x47,
-	0xa7, 0x96, 0xdb, 0x6b, 0x1a, 0xd6, 0x1b, 0xdb, 0xaa, 0x73, 0xc4, 0x5b, 0x27, 0xf2, 0x2d, 0x7e,
-	0x02, 0xe6, 0xd6, 0xb1, 0x4b, 0xf2, 0xe8, 0xac, 0xad, 0xc8, 0x40, 0xaa, 0xe3, 0xa4, 0x9d, 0xc7,
-	0xff, 0x5d, 0x01, 0x92, 0x24, 0x0f, 0x09, 0xdf, 0xc7, 0xe5, 0x9c, 0x89, 0x6f, 0x09, 0xb0, 0x10,
-	0x32, 0x8a, 0x1d, 0x8b, 0x35, 0x98, 0x24, 0x8d, 0x15, 0x3f, 0x10, 0xcf, 0x45, 0x3d, 0x7e, 0x92,
-	0xb7, 0x7c, 0xe0, 0x43, 0xf0, 0x14, 0x2c, 0x78, 0x87, 0xe0, 0xbc, 0x18, 0xfe, 0x54, 0x80, 0x05,
-	0x2f, 0xfd, 0xcf, 0xe1, 0x0c, 0x05, 0x71, 0xa2, 0x23, 0x88, 0x57, 0x60, 0x9a, 0xf6, 0x8c, 0xfc,
-	0xba, 0x97, 0xa6, 0xc8, 0xb0, 0xd4, 0x40, 0x05, 0x98, 0x20, 0x5f, 0xc3, 0xbc, 0x05, 0x52, 0x5b,
-	0xe8, 0x6a, 0xd2, 0x3f, 0x2f, 0x78, 0xf9, 0x7f, 0x9e, 0x81, 0x5c, 0xdf, 0xd8, 0x28, 0xfa, 0x46,
-	0xcb, 0xf3, 0xb7, 0x05, 0x48, 0xf3, 0xcd, 0x1f, 0xfc, 0x0e, 0x78, 0xe0, 0x39, 0xf8, 0xbe, 0x00,
-	0x57, 0xfb, 0x9a, 0xf1, 0xb1, 0x01, 0xe9, 0xf7, 0x04, 0xb8, 0xcc, 0x50, 0xd7, 0x6f, 0xf2, 0x58,
-	0x90, 0x82, 0x3c, 0x13, 0x3a, 0xf2, 0xec, 0x71, 0x98, 0xf1, 0xbb, 0xc0, 0x20, 0xd9, 0x12, 0x3e,
-	0xad, 0xd4, 0xd5, 0x58, 0x8e, 0x47, 0x6b, 0x2c, 0xc5, 0x0f, 0x05, 0xb8, 0xcc, 0x80, 0xb6, 0xdb,
-	0xa4, 0x7e, 0xfb, 0x36, 0x8a, 0xae, 0xee, 0x24, 0x9b, 0x88, 0x94, 0x64, 0xdf, 0x14, 0x60, 0xc1,
-	0x97, 0xba, 0x8d, 0x5d, 0xb5, 0xa1, 0xba, 0x6a, 0xf7, 0xbb, 0x98, 0x10, 0xe9, 0x5d, 0xec, 0x45,
-	0x88, 0x61, 0xa3, 0x31, 0xe8, 0x3b, 0xcc, 0x34, 0x36, 0x1a, 0x64, 0x24, 0xca, 0xf0, 0xf8, 0x3a,
-	0x76, 0xf7, 0xda, 0xba, 0x71, 0x3f, 0x94, 0x66, 0x72, 0xbb, 0xd5, 0x52, 0xed, 0x93, 0xf3, 0xf6,
-	0xf3, 0x94, 0xc4, 0x17, 0x3f, 0x1c, 0x03, 0xf1, 0x2c, 0xa9, 0x2c, 0x87, 0x5d, 0x98, 0xaa, 0x9b,
-	0x6d, 0xc3, 0xe5, 0xe9, 0xfb, 0x7a, 0x94, 0xf4, 0x3d, 0x5f, 0x7e, 0x46, 0xc6, 0xc7, 0x98, 0x54,
-	0xf0, 0x79, 0xa2, 0x44, 0x62, 0xba, 0xd2, 0xef, 0x08, 0x30, 0xdb, 0x31, 0x83, 0x6a, 0x10, 0x73,
-	0x18, 0x81, 0x3d, 0x99, 0xac, 0x8d, 0xf6, 0x47, 0x4c, 0x2e, 0x5e, 0xf2, 0xe5, 0xa2, 0x45, 0x98,
-	0xa4, 0xfa, 0x69, 0xa4, 0xc6, 0x25, 0x6f, 0xc0, 0x0a, 0xd3, 0xa0, 0xf2, 0x3d, 0x0b, 0xe6, 0xdf,
-	0x66, 0x85, 0x69, 0xc0, 0xed, 0x0c, 0xb9, 0x3f, 0x23, 0x01, 0xd3, 0x8f, 0x59, 0xe5, 0xd8, 0x61,
-	0x06, 0xdb, 0xd0, 0x7d, 0x98, 0x71, 0xea, 0xaa, 0xa1, 0x78, 0xef, 0x70, 0x43, 0xa1, 0x52, 0x28,
-	0x16, 0x09, 0x27, 0x50, 0x31, 0x30, 0x2a, 0xfd, 0xc1, 0xaf, 0xb5, 0x06, 0x8a, 0x2a, 0xfa, 0x3c,
-	0x24, 0x42, 0x26, 0x0f, 0x53, 0x6c, 0x85, 0xf4, 0x40, 0x60, 0xf1, 0x48, 0x97, 0xd0, 0xca, 0x9f,
-	0x96, 0x60, 0x21, 0xcf, 0x55, 0xf2, 0x87, 0x26, 0xf4, 0x5b, 0x01, 0x66, 0x3b, 0xaa, 0x2b, 0x74,
-	0x27, 0xe2, 0x89, 0xe9, 0xa9, 0x3f, 0xd3, 0x43, 0x5e, 0x19, 0xe2, 0xf5, 0xaf, 0xfd, 0xfd, 0xdf,
-	0xdf, 0x1b, 0x7b, 0x06, 0x3d, 0x1d, 0xfc, 0x3e, 0xe4, 0x2b, 0x24, 0xa0, 0xb7, 0x2c, 0xdb, 0xfc,
-	0x22, 0xae, 0xbb, 0x4e, 0x76, 0x39, 0x1b, 0xba, 0x55, 0xb2, 0xcb, 0x6f, 0xa2, 0xbf, 0x08, 0x30,
-	0xdf, 0xd5, 0x73, 0xa0, 0x48, 0x4f, 0x35, 0xfd, 0xdb, 0xb2, 0x74, 0x7e, 0x24, 0x19, 0x5e, 0xea,
-	0xf6, 0xf5, 0xc7, 0x3b, 0x45, 0x21, 0x8f, 0xde, 0x0c, 0xbb, 0x84, 0x3e, 0x10, 0x20, 0xd9, 0xdd,
-	0xa6, 0xa0, 0x7c, 0xb4, 0xc7, 0xe2, 0xbe, 0x4d, 0x4e, 0xfa, 0x72, 0x4f, 0x9a, 0x14, 0x5b, 0x96,
-	0x7b, 0xc2, 0x8d, 0x5c, 0x8e, 0x10, 0xf4, 0xbf, 0x0a, 0x90, 0xec, 0xee, 0x8d, 0xa2, 0x19, 0x79,
-	0x4a, 0x67, 0x35, 0x74, 0xe6, 0xdc, 0xa2, 0x4e, 0xbc, 0x24, 0x0e, 0x1e, 0xe9, 0x1b, 0xe1, 0x26,
-	0x86, 0x38, 0xd4, 0xdd, 0x4c, 0x45, 0x73, 0xe8, 0x94, 0x56, 0x6c, 0x54, 0x87, 0x56, 0x06, 0xdf,
-	0x95, 0x0e, 0x87, 0xfe, 0x28, 0xc0, 0x42, 0x4f, 0xcf, 0x84, 0x0a, 0x43, 0x9f, 0xec, 0x50, 0x8d,
-	0x9d, 0x8e, 0x5c, 0x41, 0x8b, 0x2f, 0x51, 0x67, 0xae, 0xa3, 0xec, 0xc0, 0xce, 0x64, 0xbd, 0xb6,
-	0xe6, 0xe7, 0x02, 0x4c, 0xb3, 0x06, 0x11, 0xdd, 0x88, 0x68, 0xfc, 0x68, 0x26, 0x3f, 0x43, 0x4d,
-	0x7e, 0x12, 0x3d, 0x71, 0x86, 0xc9, 0xd4, 0x46, 0x72, 0x1e, 0x7e, 0x23, 0x40, 0xdc, 0xef, 0xed,
-	0xd0, 0xcb, 0x51, 0xa1, 0x23, 0xdc, 0xa7, 0xa6, 0x6f, 0x0d, 0xb9, 0x9a, 0x41, 0x4e, 0x3f, 0xbb,
-	0xfb, 0x1c, 0x04, 0x2f, 0xbc, 0xef, 0x09, 0x00, 0x41, 0x3b, 0x88, 0x6e, 0x45, 0x87, 0x99, 0x70,
-	0x90, 0x4f, 0x03, 0x18, 0x66, 0xd2, 0xf2, 0x40, 0xa1, 0xfc, 0xb5, 0x00, 0x10, 0xf4, 0x9d, 0xd1,
-	0x4c, 0xea, 0xe9, 0x57, 0x87, 0xd8, 0x77, 0x86, 0x86, 0xe2, 0x20, 0xf1, 0xbb, 0xe1, 0x75, 0x86,
-	0xc4, 0xe4, 0xa0, 0x13, 0x8d, 0x66, 0x72, 0x4f, 0x07, 0x3b, 0xbc, 0xc9, 0x2b, 0x83, 0xc4, 0x97,
-	0x99, 0xfc, 0x4f, 0x01, 0x2e, 0xf6, 0x69, 0x04, 0xd1, 0xda, 0x30, 0xc9, 0xd7, 0xe7, 0xf6, 0x5c,
-	0x1f, 0x59, 0x0e, 0x4b, 0xe7, 0x41, 0x90, 0x83, 0xfb, 0xd6, 0x71, 0x8f, 0xbe, 0x35, 0x06, 0xe9,
-	0xd3, 0xab, 0x79, 0xb4, 0xfd, 0xa0, 0xba, 0x02, 0xcf, 0xdf, 0xf2, 0x83, 0x6d, 0x32, 0xc4, 0x35,
-	0xea, 0xf6, 0x1d, 0xf4, 0xb9, 0xc1, 0xaf, 0xb3, 0x8e, 0x9f, 0xfd, 0x70, 0x37, 0xff, 0x2c, 0xc0,
-	0x8c, 0x8c, 0xdd, 0x92, 0xda, 0xaa, 0xd0, 0xdf, 0xc9, 0x22, 0x91, 0x1b, 0xaa, 0xa9, 0xad, 0xcc,
-	0xf1, 0xf5, 0x4c, 0x78, 0x92, 0x3b, 0x73, 0xa9, 0x8b, 0xc7, 0x9b, 0x15, 0xbf, 0x2a, 0x50, 0xa3,
-	0xee, 0x8b, 0x2f, 0x84, 0x8c, 0xe2, 0x7f, 0xe4, 0xee, 0x9b, 0x6b, 0x4e, 0x48, 0xf8, 0x0d, 0x61,
-	0xf9, 0xd5, 0xdb, 0xe2, 0x8d, 0x73, 0x96, 0x76, 0xdd, 0x68, 0x5d, 0x02, 0xa8, 0x3b, 0xeb, 0x67,
-	0xb9, 0xb3, 0xfe, 0x51, 0xba, 0xd3, 0x1c, 0xd5, 0x9d, 0x2e, 0x01, 0xe8, 0xbf, 0x02, 0xa0, 0x2a,
-	0x76, 0x28, 0x11, 0xdb, 0x2d, 0xcd, 0x71, 0x34, 0xd3, 0x70, 0xd0, 0xb5, 0x2e, 0x83, 0x7b, 0x59,
-	0xb8, 0x6b, 0x4f, 0x0f, 0xc0, 0xc9, 0x32, 0xea, 0x5d, 0xcf, 0xdd, 0x6f, 0x08, 0xe7, 0x1a, 0xed,
-	0xfb, 0xeb, 0xf6, 0x48, 0x23, 0x5e, 0x17, 0xc5, 0x3b, 0xd1, 0xbc, 0xee, 0x2b, 0x06, 0xfd, 0x42,
-	0x80, 0xf9, 0xae, 0x87, 0x9e, 0x68, 0x75, 0x7b, 0xff, 0x57, 0xa2, 0xf4, 0xd9, 0x6f, 0x2d, 0xe2,
-	0xf3, 0x34, 0x0a, 0xcf, 0x8a, 0xd7, 0xce, 0x39, 0x58, 0xfe, 0x8f, 0xc6, 0xb9, 0xad, 0x5d, 0x2f,
-	0x40, 0xd1, 0x6c, 0xed, 0xff, 0x7c, 0x34, 0xa0, 0xad, 0x2b, 0xd7, 0xce, 0xaa, 0x9a, 0x7c, 0x43,
-	0x49, 0xa8, 0x85, 0x65, 0xf4, 0x3b, 0xaf, 0x9d, 0x0b, 0xfd, 0xdd, 0x2b, 0x6a, 0x3b, 0xd7, 0xd3,
-	0xe2, 0xa6, 0x87, 0xec, 0x5c, 0xc5, 0x15, 0xea, 0xc0, 0xa7, 0xd0, 0xf2, 0x19, 0x0e, 0x84, 0x5b,
-	0x7b, 0xd6, 0x5a, 0xcc, 0x77, 0xbd, 0x04, 0x44, 0xef, 0xe7, 0x7a, 0x5f, 0x33, 0xa2, 0xf7, 0x73,
-	0x7d, 0x9e, 0x22, 0xfa, 0x3a, 0xd4, 0x27, 0x7b, 0xc2, 0x3e, 0xa1, 0xbf, 0xf9, 0xad, 0x45, 0x68,
-	0x4f, 0x86, 0x68, 0x2d, 0x1e, 0xdc, 0xb6, 0xdc, 0xa6, 0x5e, 0x7c, 0x76, 0x25, 0xc2, 0xb6, 0xdc,
-	0x08, 0xbf, 0x67, 0xac, 0x7e, 0x4b, 0x80, 0x27, 0xeb, 0x66, 0x8b, 0xab, 0x3f, 0x5d, 0x6b, 0x45,
-	0x78, 0xf5, 0x35, 0xc6, 0xd4, 0x34, 0x75, 0xd5, 0x68, 0x66, 0x4c, 0xbb, 0x99, 0x6d, 0x62, 0x83,
-	0x56, 0x88, 0x59, 0x6f, 0x4a, 0xb5, 0x34, 0x67, 0x90, 0xff, 0x2a, 0x72, 0xb3, 0x67, 0xea, 0x83,
-	0xb1, 0xf1, 0xf5, 0x7c, 0xae, 0x36, 0x45, 0xa5, 0x3d, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0xb3, 0xe0, 0xe0, 0x39, 0xcf, 0x33, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
index 74247c0add..a305f534e8 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/image_basis.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Instructions from dockerfile
 type DockerImage_Layer_Directive int32
@@ -81,6 +84,7 @@ var DockerImage_Layer_Directive_name = map[int32]string{
 	16: "HEALTHCHECK",
 	17: "SHELL",
 }
+
 var DockerImage_Layer_Directive_value = map[string]int32{
 	"DIRECTIVE_UNSPECIFIED": 0,
 	"MAINTAINER":            1,
@@ -105,8 +109,9 @@ var DockerImage_Layer_Directive_value = map[string]int32{
 func (x DockerImage_Layer_Directive) String() string {
 	return proto.EnumName(DockerImage_Layer_Directive_name, int32(x))
 }
+
 func (DockerImage_Layer_Directive) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_basis_d44a570647a88cb8, []int{0, 0, 0}
+	return fileDescriptor_8cf422f4020c41c0, []int{0, 0, 0}
 }
 
 // DockerImage holds types defining base image notes
@@ -121,16 +126,17 @@ func (m *DockerImage) Reset()         { *m = DockerImage{} }
 func (m *DockerImage) String() string { return proto.CompactTextString(m) }
 func (*DockerImage) ProtoMessage()    {}
 func (*DockerImage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_basis_d44a570647a88cb8, []int{0}
+	return fileDescriptor_8cf422f4020c41c0, []int{0}
 }
+
 func (m *DockerImage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DockerImage.Unmarshal(m, b)
 }
 func (m *DockerImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DockerImage.Marshal(b, m, deterministic)
 }
-func (dst *DockerImage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DockerImage.Merge(dst, src)
+func (m *DockerImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage.Merge(m, src)
 }
 func (m *DockerImage) XXX_Size() int {
 	return xxx_messageInfo_DockerImage.Size(m)
@@ -156,16 +162,17 @@ func (m *DockerImage_Layer) Reset()         { *m = DockerImage_Layer{} }
 func (m *DockerImage_Layer) String() string { return proto.CompactTextString(m) }
 func (*DockerImage_Layer) ProtoMessage()    {}
 func (*DockerImage_Layer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_basis_d44a570647a88cb8, []int{0, 0}
+	return fileDescriptor_8cf422f4020c41c0, []int{0, 0}
 }
+
 func (m *DockerImage_Layer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DockerImage_Layer.Unmarshal(m, b)
 }
 func (m *DockerImage_Layer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DockerImage_Layer.Marshal(b, m, deterministic)
 }
-func (dst *DockerImage_Layer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DockerImage_Layer.Merge(dst, src)
+func (m *DockerImage_Layer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Layer.Merge(m, src)
 }
 func (m *DockerImage_Layer) XXX_Size() int {
 	return xxx_messageInfo_DockerImage_Layer.Size(m)
@@ -213,16 +220,17 @@ func (m *DockerImage_Fingerprint) Reset()         { *m = DockerImage_Fingerprint
 func (m *DockerImage_Fingerprint) String() string { return proto.CompactTextString(m) }
 func (*DockerImage_Fingerprint) ProtoMessage()    {}
 func (*DockerImage_Fingerprint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_basis_d44a570647a88cb8, []int{0, 1}
+	return fileDescriptor_8cf422f4020c41c0, []int{0, 1}
 }
+
 func (m *DockerImage_Fingerprint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DockerImage_Fingerprint.Unmarshal(m, b)
 }
 func (m *DockerImage_Fingerprint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DockerImage_Fingerprint.Marshal(b, m, deterministic)
 }
-func (dst *DockerImage_Fingerprint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DockerImage_Fingerprint.Merge(dst, src)
+func (m *DockerImage_Fingerprint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Fingerprint.Merge(m, src)
 }
 func (m *DockerImage_Fingerprint) XXX_Size() int {
 	return xxx_messageInfo_DockerImage_Fingerprint.Size(m)
@@ -274,16 +282,17 @@ func (m *DockerImage_Basis) Reset()         { *m = DockerImage_Basis{} }
 func (m *DockerImage_Basis) String() string { return proto.CompactTextString(m) }
 func (*DockerImage_Basis) ProtoMessage()    {}
 func (*DockerImage_Basis) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_basis_d44a570647a88cb8, []int{0, 2}
+	return fileDescriptor_8cf422f4020c41c0, []int{0, 2}
 }
+
 func (m *DockerImage_Basis) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DockerImage_Basis.Unmarshal(m, b)
 }
 func (m *DockerImage_Basis) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DockerImage_Basis.Marshal(b, m, deterministic)
 }
-func (dst *DockerImage_Basis) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DockerImage_Basis.Merge(dst, src)
+func (m *DockerImage_Basis) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Basis.Merge(m, src)
 }
 func (m *DockerImage_Basis) XXX_Size() int {
 	return xxx_messageInfo_DockerImage_Basis.Size(m)
@@ -333,16 +342,17 @@ func (m *DockerImage_Derived) Reset()         { *m = DockerImage_Derived{} }
 func (m *DockerImage_Derived) String() string { return proto.CompactTextString(m) }
 func (*DockerImage_Derived) ProtoMessage()    {}
 func (*DockerImage_Derived) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_basis_d44a570647a88cb8, []int{0, 3}
+	return fileDescriptor_8cf422f4020c41c0, []int{0, 3}
 }
+
 func (m *DockerImage_Derived) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DockerImage_Derived.Unmarshal(m, b)
 }
 func (m *DockerImage_Derived) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DockerImage_Derived.Marshal(b, m, deterministic)
 }
-func (dst *DockerImage_Derived) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DockerImage_Derived.Merge(dst, src)
+func (m *DockerImage_Derived) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Derived.Merge(m, src)
 }
 func (m *DockerImage_Derived) XXX_Size() int {
 	return xxx_messageInfo_DockerImage_Derived.Size(m)
@@ -382,19 +392,19 @@ func (m *DockerImage_Derived) GetBaseResourceUrl() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.DockerImage_Layer_Directive", DockerImage_Layer_Directive_name, DockerImage_Layer_Directive_value)
 	proto.RegisterType((*DockerImage)(nil), "google.devtools.containeranalysis.v1alpha1.DockerImage")
 	proto.RegisterType((*DockerImage_Layer)(nil), "google.devtools.containeranalysis.v1alpha1.DockerImage.Layer")
 	proto.RegisterType((*DockerImage_Fingerprint)(nil), "google.devtools.containeranalysis.v1alpha1.DockerImage.Fingerprint")
 	proto.RegisterType((*DockerImage_Basis)(nil), "google.devtools.containeranalysis.v1alpha1.DockerImage.Basis")
 	proto.RegisterType((*DockerImage_Derived)(nil), "google.devtools.containeranalysis.v1alpha1.DockerImage.Derived")
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.DockerImage_Layer_Directive", DockerImage_Layer_Directive_name, DockerImage_Layer_Directive_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/image_basis.proto", fileDescriptor_image_basis_d44a570647a88cb8)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/image_basis.proto", fileDescriptor_8cf422f4020c41c0)
 }
 
-var fileDescriptor_image_basis_d44a570647a88cb8 = []byte{
+var fileDescriptor_8cf422f4020c41c0 = []byte{
 	// 627 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xdf, 0x6e, 0xda, 0x30,
 	0x14, 0xc6, 0x17, 0x28, 0xd0, 0x9c, 0xf4, 0x8f, 0x6b, 0x69, 0x1a, 0x43, 0xbd, 0x60, 0x95, 0x26,
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
index f419c5e186..bbcf48b975 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Note provider-assigned severity/impact ranking
 type VulnerabilityType_Severity int32
@@ -45,6 +48,7 @@ var VulnerabilityType_Severity_name = map[int32]string{
 	4: "HIGH",
 	5: "CRITICAL",
 }
+
 var VulnerabilityType_Severity_value = map[string]int32{
 	"SEVERITY_UNSPECIFIED": 0,
 	"MINIMAL":              1,
@@ -57,8 +61,9 @@ var VulnerabilityType_Severity_value = map[string]int32{
 func (x VulnerabilityType_Severity) String() string {
 	return proto.EnumName(VulnerabilityType_Severity_name, int32(x))
 }
+
 func (VulnerabilityType_Severity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0, 0}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0, 0}
 }
 
 // Whether this is an ordinary package version or a
@@ -81,6 +86,7 @@ var VulnerabilityType_Version_VersionKind_name = map[int32]string{
 	1: "MINIMUM",
 	2: "MAXIMUM",
 }
+
 var VulnerabilityType_Version_VersionKind_value = map[string]int32{
 	"NORMAL":  0,
 	"MINIMUM": 1,
@@ -90,8 +96,9 @@ var VulnerabilityType_Version_VersionKind_value = map[string]int32{
 func (x VulnerabilityType_Version_VersionKind) String() string {
 	return proto.EnumName(VulnerabilityType_Version_VersionKind_name, int32(x))
 }
+
 func (VulnerabilityType_Version_VersionKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0, 0, 0}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0, 0, 0}
 }
 
 // VulnerabilityType provides metadata about a security vulnerability.
@@ -113,16 +120,17 @@ func (m *VulnerabilityType) Reset()         { *m = VulnerabilityType{} }
 func (m *VulnerabilityType) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType) ProtoMessage()    {}
 func (*VulnerabilityType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0}
 }
+
 func (m *VulnerabilityType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityType.Unmarshal(m, b)
 }
 func (m *VulnerabilityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityType.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityType.Merge(dst, src)
+func (m *VulnerabilityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType.Merge(m, src)
 }
 func (m *VulnerabilityType) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityType.Size(m)
@@ -178,16 +186,17 @@ func (m *VulnerabilityType_Version) Reset()         { *m = VulnerabilityType_Ver
 func (m *VulnerabilityType_Version) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_Version) ProtoMessage()    {}
 func (*VulnerabilityType_Version) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0, 0}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0, 0}
 }
+
 func (m *VulnerabilityType_Version) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityType_Version.Unmarshal(m, b)
 }
 func (m *VulnerabilityType_Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityType_Version.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityType_Version) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityType_Version.Merge(dst, src)
+func (m *VulnerabilityType_Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_Version.Merge(m, src)
 }
 func (m *VulnerabilityType_Version) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityType_Version.Size(m)
@@ -264,16 +273,17 @@ func (m *VulnerabilityType_Detail) Reset()         { *m = VulnerabilityType_Deta
 func (m *VulnerabilityType_Detail) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_Detail) ProtoMessage()    {}
 func (*VulnerabilityType_Detail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0, 1}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0, 1}
 }
+
 func (m *VulnerabilityType_Detail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityType_Detail.Unmarshal(m, b)
 }
 func (m *VulnerabilityType_Detail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityType_Detail.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityType_Detail) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityType_Detail.Merge(dst, src)
+func (m *VulnerabilityType_Detail) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_Detail.Merge(m, src)
 }
 func (m *VulnerabilityType_Detail) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityType_Detail.Size(m)
@@ -373,16 +383,17 @@ func (m *VulnerabilityType_VulnerabilityDetails) Reset() {
 func (m *VulnerabilityType_VulnerabilityDetails) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_VulnerabilityDetails) ProtoMessage()    {}
 func (*VulnerabilityType_VulnerabilityDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0, 2}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0, 2}
 }
+
 func (m *VulnerabilityType_VulnerabilityDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Unmarshal(m, b)
 }
 func (m *VulnerabilityType_VulnerabilityDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityType_VulnerabilityDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Merge(dst, src)
+func (m *VulnerabilityType_VulnerabilityDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Merge(m, src)
 }
 func (m *VulnerabilityType_VulnerabilityDetails) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Size(m)
@@ -439,16 +450,17 @@ func (m *VulnerabilityType_PackageIssue) Reset()         { *m = VulnerabilityTyp
 func (m *VulnerabilityType_PackageIssue) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_PackageIssue) ProtoMessage()    {}
 func (*VulnerabilityType_PackageIssue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0, 3}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0, 3}
 }
+
 func (m *VulnerabilityType_PackageIssue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityType_PackageIssue.Unmarshal(m, b)
 }
 func (m *VulnerabilityType_PackageIssue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityType_PackageIssue.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityType_PackageIssue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityType_PackageIssue.Merge(dst, src)
+func (m *VulnerabilityType_PackageIssue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_PackageIssue.Merge(m, src)
 }
 func (m *VulnerabilityType_PackageIssue) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityType_PackageIssue.Size(m)
@@ -502,16 +514,17 @@ func (m *VulnerabilityType_VulnerabilityLocation) Reset() {
 func (m *VulnerabilityType_VulnerabilityLocation) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_VulnerabilityLocation) ProtoMessage()    {}
 func (*VulnerabilityType_VulnerabilityLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_vulnerability_c46b00c226fdd05b, []int{0, 4}
+	return fileDescriptor_9c85f6a1c26e0b81, []int{0, 4}
 }
+
 func (m *VulnerabilityType_VulnerabilityLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Unmarshal(m, b)
 }
 func (m *VulnerabilityType_VulnerabilityLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityType_VulnerabilityLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Merge(dst, src)
+func (m *VulnerabilityType_VulnerabilityLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Merge(m, src)
 }
 func (m *VulnerabilityType_VulnerabilityLocation) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Size(m)
@@ -544,21 +557,21 @@ func (m *VulnerabilityType_VulnerabilityLocation) GetVersion() *VulnerabilityTyp
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity", VulnerabilityType_Severity_name, VulnerabilityType_Severity_value)
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Version_VersionKind", VulnerabilityType_Version_VersionKind_name, VulnerabilityType_Version_VersionKind_value)
 	proto.RegisterType((*VulnerabilityType)(nil), "google.devtools.containeranalysis.v1alpha1.VulnerabilityType")
 	proto.RegisterType((*VulnerabilityType_Version)(nil), "google.devtools.containeranalysis.v1alpha1.VulnerabilityType.Version")
 	proto.RegisterType((*VulnerabilityType_Detail)(nil), "google.devtools.containeranalysis.v1alpha1.VulnerabilityType.Detail")
 	proto.RegisterType((*VulnerabilityType_VulnerabilityDetails)(nil), "google.devtools.containeranalysis.v1alpha1.VulnerabilityType.VulnerabilityDetails")
 	proto.RegisterType((*VulnerabilityType_PackageIssue)(nil), "google.devtools.containeranalysis.v1alpha1.VulnerabilityType.PackageIssue")
 	proto.RegisterType((*VulnerabilityType_VulnerabilityLocation)(nil), "google.devtools.containeranalysis.v1alpha1.VulnerabilityType.VulnerabilityLocation")
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity", VulnerabilityType_Severity_name, VulnerabilityType_Severity_value)
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Version_VersionKind", VulnerabilityType_Version_VersionKind_name, VulnerabilityType_Version_VersionKind_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto", fileDescriptor_package_vulnerability_c46b00c226fdd05b)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto", fileDescriptor_9c85f6a1c26e0b81)
 }
 
-var fileDescriptor_package_vulnerability_c46b00c226fdd05b = []byte{
+var fileDescriptor_9c85f6a1c26e0b81 = []byte{
 	// 769 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6e, 0xfa, 0x46,
 	0x10, 0xae, 0x8d, 0xc1, 0x30, 0x26, 0x91, 0xb3, 0xa2, 0xaa, 0x85, 0x5a, 0x95, 0xa6, 0xaa, 0x84,
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
index a0153bda1e..0e1723e759 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/provenance.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies the hash algorithm, if any.
 type Hash_HashType int32
@@ -34,6 +37,7 @@ var Hash_HashType_name = map[int32]string{
 	0: "NONE",
 	1: "SHA256",
 }
+
 var Hash_HashType_value = map[string]int32{
 	"NONE":   0,
 	"SHA256": 1,
@@ -42,8 +46,9 @@ var Hash_HashType_value = map[string]int32{
 func (x Hash_HashType) String() string {
 	return proto.EnumName(Hash_HashType_name, int32(x))
 }
+
 func (Hash_HashType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{3, 0}
+	return fileDescriptor_fdbf35a243115a53, []int{3, 0}
 }
 
 // Provenance of a build. Contains all information needed to verify the full
@@ -87,16 +92,17 @@ func (m *BuildProvenance) Reset()         { *m = BuildProvenance{} }
 func (m *BuildProvenance) String() string { return proto.CompactTextString(m) }
 func (*BuildProvenance) ProtoMessage()    {}
 func (*BuildProvenance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{0}
+	return fileDescriptor_fdbf35a243115a53, []int{0}
 }
+
 func (m *BuildProvenance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildProvenance.Unmarshal(m, b)
 }
 func (m *BuildProvenance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildProvenance.Marshal(b, m, deterministic)
 }
-func (dst *BuildProvenance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildProvenance.Merge(dst, src)
+func (m *BuildProvenance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildProvenance.Merge(m, src)
 }
 func (m *BuildProvenance) XXX_Size() int {
 	return xxx_messageInfo_BuildProvenance.Size(m)
@@ -234,16 +240,17 @@ func (m *Source) Reset()         { *m = Source{} }
 func (m *Source) String() string { return proto.CompactTextString(m) }
 func (*Source) ProtoMessage()    {}
 func (*Source) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{1}
+	return fileDescriptor_fdbf35a243115a53, []int{1}
 }
+
 func (m *Source) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Source.Unmarshal(m, b)
 }
 func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
 }
-func (dst *Source) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Source.Merge(dst, src)
+func (m *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(m, src)
 }
 func (m *Source) XXX_Size() int {
 	return xxx_messageInfo_Source.Size(m)
@@ -319,80 +326,14 @@ func (m *Source) GetAdditionalContexts() []*SourceContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Source) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Source_OneofMarshaler, _Source_OneofUnmarshaler, _Source_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Source) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Source_StorageSource)(nil),
 		(*Source_RepoSource)(nil),
 	}
 }
 
-func _Source_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Source)
-	// source
-	switch x := m.Source.(type) {
-	case *Source_StorageSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StorageSource); err != nil {
-			return err
-		}
-	case *Source_RepoSource:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RepoSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Source.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Source_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Source)
-	switch tag {
-	case 1: // source.storage_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StorageSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &Source_StorageSource{msg}
-		return true, err
-	case 2: // source.repo_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RepoSource)
-		err := b.DecodeMessage(msg)
-		m.Source = &Source_RepoSource{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Source_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Source)
-	// source
-	switch x := m.Source.(type) {
-	case *Source_StorageSource:
-		s := proto.Size(x.StorageSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Source_RepoSource:
-		s := proto.Size(x.RepoSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Container message for hashes of byte content of files, used in Source
 // messages to verify integrity of source input to the build.
 type FileHashes struct {
@@ -407,16 +348,17 @@ func (m *FileHashes) Reset()         { *m = FileHashes{} }
 func (m *FileHashes) String() string { return proto.CompactTextString(m) }
 func (*FileHashes) ProtoMessage()    {}
 func (*FileHashes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{2}
+	return fileDescriptor_fdbf35a243115a53, []int{2}
 }
+
 func (m *FileHashes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileHashes.Unmarshal(m, b)
 }
 func (m *FileHashes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileHashes.Marshal(b, m, deterministic)
 }
-func (dst *FileHashes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileHashes.Merge(dst, src)
+func (m *FileHashes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileHashes.Merge(m, src)
 }
 func (m *FileHashes) XXX_Size() int {
 	return xxx_messageInfo_FileHashes.Size(m)
@@ -449,16 +391,17 @@ func (m *Hash) Reset()         { *m = Hash{} }
 func (m *Hash) String() string { return proto.CompactTextString(m) }
 func (*Hash) ProtoMessage()    {}
 func (*Hash) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{3}
+	return fileDescriptor_fdbf35a243115a53, []int{3}
 }
+
 func (m *Hash) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Hash.Unmarshal(m, b)
 }
 func (m *Hash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Hash.Marshal(b, m, deterministic)
 }
-func (dst *Hash) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Hash.Merge(dst, src)
+func (m *Hash) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Hash.Merge(m, src)
 }
 func (m *Hash) XXX_Size() int {
 	return xxx_messageInfo_Hash.Size(m)
@@ -503,16 +446,17 @@ func (m *StorageSource) Reset()         { *m = StorageSource{} }
 func (m *StorageSource) String() string { return proto.CompactTextString(m) }
 func (*StorageSource) ProtoMessage()    {}
 func (*StorageSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{4}
+	return fileDescriptor_fdbf35a243115a53, []int{4}
 }
+
 func (m *StorageSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StorageSource.Unmarshal(m, b)
 }
 func (m *StorageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StorageSource.Marshal(b, m, deterministic)
 }
-func (dst *StorageSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StorageSource.Merge(dst, src)
+func (m *StorageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageSource.Merge(m, src)
 }
 func (m *StorageSource) XXX_Size() int {
 	return xxx_messageInfo_StorageSource.Size(m)
@@ -568,16 +512,17 @@ func (m *RepoSource) Reset()         { *m = RepoSource{} }
 func (m *RepoSource) String() string { return proto.CompactTextString(m) }
 func (*RepoSource) ProtoMessage()    {}
 func (*RepoSource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{5}
+	return fileDescriptor_fdbf35a243115a53, []int{5}
 }
+
 func (m *RepoSource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepoSource.Unmarshal(m, b)
 }
 func (m *RepoSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepoSource.Marshal(b, m, deterministic)
 }
-func (dst *RepoSource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepoSource.Merge(dst, src)
+func (m *RepoSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoSource.Merge(m, src)
 }
 func (m *RepoSource) XXX_Size() int {
 	return xxx_messageInfo_RepoSource.Size(m)
@@ -652,87 +597,15 @@ func (m *RepoSource) GetCommitSha() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RepoSource) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RepoSource_OneofMarshaler, _RepoSource_OneofUnmarshaler, _RepoSource_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RepoSource) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RepoSource_BranchName)(nil),
 		(*RepoSource_TagName)(nil),
 		(*RepoSource_CommitSha)(nil),
 	}
 }
 
-func _RepoSource_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RepoSource)
-	// revision
-	switch x := m.Revision.(type) {
-	case *RepoSource_BranchName:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.BranchName)
-	case *RepoSource_TagName:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TagName)
-	case *RepoSource_CommitSha:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CommitSha)
-	case nil:
-	default:
-		return fmt.Errorf("RepoSource.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RepoSource_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RepoSource)
-	switch tag {
-	case 3: // revision.branch_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &RepoSource_BranchName{x}
-		return true, err
-	case 4: // revision.tag_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &RepoSource_TagName{x}
-		return true, err
-	case 5: // revision.commit_sha
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &RepoSource_CommitSha{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RepoSource_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RepoSource)
-	// revision
-	switch x := m.Revision.(type) {
-	case *RepoSource_BranchName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BranchName)))
-		n += len(x.BranchName)
-	case *RepoSource_TagName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TagName)))
-		n += len(x.TagName)
-	case *RepoSource_CommitSha:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.CommitSha)))
-		n += len(x.CommitSha)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Command describes a step performed as part of the build pipeline.
 type Command struct {
 	// Name of the command, as presented on the command line, or if the command is
@@ -759,16 +632,17 @@ func (m *Command) Reset()         { *m = Command{} }
 func (m *Command) String() string { return proto.CompactTextString(m) }
 func (*Command) ProtoMessage()    {}
 func (*Command) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{6}
+	return fileDescriptor_fdbf35a243115a53, []int{6}
 }
+
 func (m *Command) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Command.Unmarshal(m, b)
 }
 func (m *Command) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Command.Marshal(b, m, deterministic)
 }
-func (dst *Command) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Command.Merge(dst, src)
+func (m *Command) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Command.Merge(m, src)
 }
 func (m *Command) XXX_Size() int {
 	return xxx_messageInfo_Command.Size(m)
@@ -853,16 +727,17 @@ func (m *Artifact) Reset()         { *m = Artifact{} }
 func (m *Artifact) String() string { return proto.CompactTextString(m) }
 func (*Artifact) ProtoMessage()    {}
 func (*Artifact) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_62a3806b713433e8, []int{7}
+	return fileDescriptor_fdbf35a243115a53, []int{7}
 }
+
 func (m *Artifact) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Artifact.Unmarshal(m, b)
 }
 func (m *Artifact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Artifact.Marshal(b, m, deterministic)
 }
-func (dst *Artifact) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Artifact.Merge(dst, src)
+func (m *Artifact) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifact.Merge(m, src)
 }
 func (m *Artifact) XXX_Size() int {
 	return xxx_messageInfo_Artifact.Size(m)
@@ -902,6 +777,7 @@ func (m *Artifact) GetNames() []string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Hash_HashType", Hash_HashType_name, Hash_HashType_value)
 	proto.RegisterType((*BuildProvenance)(nil), "google.devtools.containeranalysis.v1alpha1.BuildProvenance")
 	proto.RegisterMapType((map[string]string)(nil), "google.devtools.containeranalysis.v1alpha1.BuildProvenance.BuildOptionsEntry")
 	proto.RegisterType((*Source)(nil), "google.devtools.containeranalysis.v1alpha1.Source")
@@ -912,14 +788,13 @@ func init() {
 	proto.RegisterType((*RepoSource)(nil), "google.devtools.containeranalysis.v1alpha1.RepoSource")
 	proto.RegisterType((*Command)(nil), "google.devtools.containeranalysis.v1alpha1.Command")
 	proto.RegisterType((*Artifact)(nil), "google.devtools.containeranalysis.v1alpha1.Artifact")
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Hash_HashType", Hash_HashType_name, Hash_HashType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/provenance.proto", fileDescriptor_provenance_62a3806b713433e8)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/provenance.proto", fileDescriptor_fdbf35a243115a53)
 }
 
-var fileDescriptor_provenance_62a3806b713433e8 = []byte{
+var fileDescriptor_fdbf35a243115a53 = []byte{
 	// 1026 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
 	0x14, 0xee, 0xfa, 0x77, 0xf7, 0xb8, 0x71, 0x92, 0xa1, 0xc0, 0xe2, 0x52, 0x62, 0x2c, 0x21, 0x22,
diff --git a/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go b/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
index 96e051be76..be899f53f4 100644
--- a/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
+++ b/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/source_context.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
+package containeranalysis
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of an alias.
 type AliasContext_Kind int32
@@ -40,6 +43,7 @@ var AliasContext_Kind_name = map[int32]string{
 	2: "MOVABLE",
 	4: "OTHER",
 }
+
 var AliasContext_Kind_value = map[string]int32{
 	"KIND_UNSPECIFIED": 0,
 	"FIXED":            1,
@@ -50,8 +54,9 @@ var AliasContext_Kind_value = map[string]int32{
 func (x AliasContext_Kind) String() string {
 	return proto.EnumName(AliasContext_Kind_name, int32(x))
 }
+
 func (AliasContext_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{1, 0}
+	return fileDescriptor_49411dfe5c54cc3e, []int{1, 0}
 }
 
 // A SourceContext is a reference to a tree of files. A SourceContext together
@@ -75,16 +80,17 @@ func (m *SourceContext) Reset()         { *m = SourceContext{} }
 func (m *SourceContext) String() string { return proto.CompactTextString(m) }
 func (*SourceContext) ProtoMessage()    {}
 func (*SourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{0}
+	return fileDescriptor_49411dfe5c54cc3e, []int{0}
 }
+
 func (m *SourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceContext.Unmarshal(m, b)
 }
 func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
 }
-func (dst *SourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceContext.Merge(dst, src)
+func (m *SourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceContext.Merge(m, src)
 }
 func (m *SourceContext) XXX_Size() int {
 	return xxx_messageInfo_SourceContext.Size(m)
@@ -152,99 +158,15 @@ func (m *SourceContext) GetLabels() map[string]string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SourceContext_OneofMarshaler, _SourceContext_OneofUnmarshaler, _SourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SourceContext_CloudRepo)(nil),
 		(*SourceContext_Gerrit)(nil),
 		(*SourceContext_Git)(nil),
 	}
 }
 
-func _SourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SourceContext)
-	// context
-	switch x := m.Context.(type) {
-	case *SourceContext_CloudRepo:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudRepo); err != nil {
-			return err
-		}
-	case *SourceContext_Gerrit:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Gerrit); err != nil {
-			return err
-		}
-	case *SourceContext_Git:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Git); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SourceContext.Context has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SourceContext)
-	switch tag {
-	case 1: // context.cloud_repo
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudRepoSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_CloudRepo{msg}
-		return true, err
-	case 2: // context.gerrit
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GerritSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_Gerrit{msg}
-		return true, err
-	case 3: // context.git
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GitSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_Git{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SourceContext)
-	// context
-	switch x := m.Context.(type) {
-	case *SourceContext_CloudRepo:
-		s := proto.Size(x.CloudRepo)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SourceContext_Gerrit:
-		s := proto.Size(x.Gerrit)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SourceContext_Git:
-		s := proto.Size(x.Git)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An alias to a repo revision.
 type AliasContext struct {
 	// The alias kind.
@@ -260,16 +182,17 @@ func (m *AliasContext) Reset()         { *m = AliasContext{} }
 func (m *AliasContext) String() string { return proto.CompactTextString(m) }
 func (*AliasContext) ProtoMessage()    {}
 func (*AliasContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{1}
+	return fileDescriptor_49411dfe5c54cc3e, []int{1}
 }
+
 func (m *AliasContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AliasContext.Unmarshal(m, b)
 }
 func (m *AliasContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AliasContext.Marshal(b, m, deterministic)
 }
-func (dst *AliasContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AliasContext.Merge(dst, src)
+func (m *AliasContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AliasContext.Merge(m, src)
 }
 func (m *AliasContext) XXX_Size() int {
 	return xxx_messageInfo_AliasContext.Size(m)
@@ -315,16 +238,17 @@ func (m *CloudRepoSourceContext) Reset()         { *m = CloudRepoSourceContext{}
 func (m *CloudRepoSourceContext) String() string { return proto.CompactTextString(m) }
 func (*CloudRepoSourceContext) ProtoMessage()    {}
 func (*CloudRepoSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{2}
+	return fileDescriptor_49411dfe5c54cc3e, []int{2}
 }
+
 func (m *CloudRepoSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudRepoSourceContext.Unmarshal(m, b)
 }
 func (m *CloudRepoSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudRepoSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudRepoSourceContext.Merge(dst, src)
+func (m *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudRepoSourceContext.Merge(m, src)
 }
 func (m *CloudRepoSourceContext) XXX_Size() int {
 	return xxx_messageInfo_CloudRepoSourceContext.Size(m)
@@ -379,76 +303,14 @@ func (m *CloudRepoSourceContext) GetAliasContext() *AliasContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CloudRepoSourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CloudRepoSourceContext_OneofMarshaler, _CloudRepoSourceContext_OneofUnmarshaler, _CloudRepoSourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CloudRepoSourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CloudRepoSourceContext_RevisionId)(nil),
 		(*CloudRepoSourceContext_AliasContext)(nil),
 	}
 }
 
-func _CloudRepoSourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CloudRepoSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *CloudRepoSourceContext_RevisionId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.RevisionId)
-	case *CloudRepoSourceContext_AliasContext:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AliasContext); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CloudRepoSourceContext.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CloudRepoSourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CloudRepoSourceContext)
-	switch tag {
-	case 2: // revision.revision_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &CloudRepoSourceContext_RevisionId{x}
-		return true, err
-	case 3: // revision.alias_context
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AliasContext)
-		err := b.DecodeMessage(msg)
-		m.Revision = &CloudRepoSourceContext_AliasContext{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CloudRepoSourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CloudRepoSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *CloudRepoSourceContext_RevisionId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RevisionId)))
-		n += len(x.RevisionId)
-	case *CloudRepoSourceContext_AliasContext:
-		s := proto.Size(x.AliasContext)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A SourceContext referring to a Gerrit project.
 type GerritSourceContext struct {
 	// The URI of a running Gerrit instance.
@@ -473,16 +335,17 @@ func (m *GerritSourceContext) Reset()         { *m = GerritSourceContext{} }
 func (m *GerritSourceContext) String() string { return proto.CompactTextString(m) }
 func (*GerritSourceContext) ProtoMessage()    {}
 func (*GerritSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{3}
+	return fileDescriptor_49411dfe5c54cc3e, []int{3}
 }
+
 func (m *GerritSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GerritSourceContext.Unmarshal(m, b)
 }
 func (m *GerritSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GerritSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *GerritSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GerritSourceContext.Merge(dst, src)
+func (m *GerritSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GerritSourceContext.Merge(m, src)
 }
 func (m *GerritSourceContext) XXX_Size() int {
 	return xxx_messageInfo_GerritSourceContext.Size(m)
@@ -544,76 +407,14 @@ func (m *GerritSourceContext) GetAliasContext() *AliasContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GerritSourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GerritSourceContext_OneofMarshaler, _GerritSourceContext_OneofUnmarshaler, _GerritSourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GerritSourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GerritSourceContext_RevisionId)(nil),
 		(*GerritSourceContext_AliasContext)(nil),
 	}
 }
 
-func _GerritSourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GerritSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *GerritSourceContext_RevisionId:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.RevisionId)
-	case *GerritSourceContext_AliasContext:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AliasContext); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GerritSourceContext.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GerritSourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GerritSourceContext)
-	switch tag {
-	case 3: // revision.revision_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &GerritSourceContext_RevisionId{x}
-		return true, err
-	case 4: // revision.alias_context
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AliasContext)
-		err := b.DecodeMessage(msg)
-		m.Revision = &GerritSourceContext_AliasContext{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GerritSourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GerritSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *GerritSourceContext_RevisionId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RevisionId)))
-		n += len(x.RevisionId)
-	case *GerritSourceContext_AliasContext:
-		s := proto.Size(x.AliasContext)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A GitSourceContext denotes a particular revision in a third party Git
 // repository (e.g., GitHub).
 type GitSourceContext struct {
@@ -631,16 +432,17 @@ func (m *GitSourceContext) Reset()         { *m = GitSourceContext{} }
 func (m *GitSourceContext) String() string { return proto.CompactTextString(m) }
 func (*GitSourceContext) ProtoMessage()    {}
 func (*GitSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{4}
+	return fileDescriptor_49411dfe5c54cc3e, []int{4}
 }
+
 func (m *GitSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GitSourceContext.Unmarshal(m, b)
 }
 func (m *GitSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GitSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *GitSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GitSourceContext.Merge(dst, src)
+func (m *GitSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GitSourceContext.Merge(m, src)
 }
 func (m *GitSourceContext) XXX_Size() int {
 	return xxx_messageInfo_GitSourceContext.Size(m)
@@ -683,16 +485,17 @@ func (m *RepoId) Reset()         { *m = RepoId{} }
 func (m *RepoId) String() string { return proto.CompactTextString(m) }
 func (*RepoId) ProtoMessage()    {}
 func (*RepoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{5}
+	return fileDescriptor_49411dfe5c54cc3e, []int{5}
 }
+
 func (m *RepoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepoId.Unmarshal(m, b)
 }
 func (m *RepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepoId.Marshal(b, m, deterministic)
 }
-func (dst *RepoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepoId.Merge(dst, src)
+func (m *RepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoId.Merge(m, src)
 }
 func (m *RepoId) XXX_Size() int {
 	return xxx_messageInfo_RepoId.Size(m)
@@ -740,76 +543,14 @@ func (m *RepoId) GetUid() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RepoId) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RepoId_OneofMarshaler, _RepoId_OneofUnmarshaler, _RepoId_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RepoId) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RepoId_ProjectRepoId)(nil),
 		(*RepoId_Uid)(nil),
 	}
 }
 
-func _RepoId_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RepoId)
-	// id
-	switch x := m.Id.(type) {
-	case *RepoId_ProjectRepoId:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProjectRepoId); err != nil {
-			return err
-		}
-	case *RepoId_Uid:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uid)
-	case nil:
-	default:
-		return fmt.Errorf("RepoId.Id has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RepoId_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RepoId)
-	switch tag {
-	case 1: // id.project_repo_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProjectRepoId)
-		err := b.DecodeMessage(msg)
-		m.Id = &RepoId_ProjectRepoId{msg}
-		return true, err
-	case 2: // id.uid
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Id = &RepoId_Uid{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RepoId_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RepoId)
-	// id
-	switch x := m.Id.(type) {
-	case *RepoId_ProjectRepoId:
-		s := proto.Size(x.ProjectRepoId)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RepoId_Uid:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uid)))
-		n += len(x.Uid)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Selects a repo using a Google Cloud Platform project ID (e.g.,
 // winged-cargo-31) and a repo name within that project.
 type ProjectRepoId struct {
@@ -826,16 +567,17 @@ func (m *ProjectRepoId) Reset()         { *m = ProjectRepoId{} }
 func (m *ProjectRepoId) String() string { return proto.CompactTextString(m) }
 func (*ProjectRepoId) ProtoMessage()    {}
 func (*ProjectRepoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_d60bdb3ee9072374, []int{6}
+	return fileDescriptor_49411dfe5c54cc3e, []int{6}
 }
+
 func (m *ProjectRepoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProjectRepoId.Unmarshal(m, b)
 }
 func (m *ProjectRepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProjectRepoId.Marshal(b, m, deterministic)
 }
-func (dst *ProjectRepoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProjectRepoId.Merge(dst, src)
+func (m *ProjectRepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectRepoId.Merge(m, src)
 }
 func (m *ProjectRepoId) XXX_Size() int {
 	return xxx_messageInfo_ProjectRepoId.Size(m)
@@ -861,6 +603,7 @@ func (m *ProjectRepoId) GetRepoName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.AliasContext_Kind", AliasContext_Kind_name, AliasContext_Kind_value)
 	proto.RegisterType((*SourceContext)(nil), "google.devtools.containeranalysis.v1alpha1.SourceContext")
 	proto.RegisterMapType((map[string]string)(nil), "google.devtools.containeranalysis.v1alpha1.SourceContext.LabelsEntry")
 	proto.RegisterType((*AliasContext)(nil), "google.devtools.containeranalysis.v1alpha1.AliasContext")
@@ -869,14 +612,13 @@ func init() {
 	proto.RegisterType((*GitSourceContext)(nil), "google.devtools.containeranalysis.v1alpha1.GitSourceContext")
 	proto.RegisterType((*RepoId)(nil), "google.devtools.containeranalysis.v1alpha1.RepoId")
 	proto.RegisterType((*ProjectRepoId)(nil), "google.devtools.containeranalysis.v1alpha1.ProjectRepoId")
-	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.AliasContext_Kind", AliasContext_Kind_name, AliasContext_Kind_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/source_context.proto", fileDescriptor_source_context_d60bdb3ee9072374)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/source_context.proto", fileDescriptor_49411dfe5c54cc3e)
 }
 
-var fileDescriptor_source_context_d60bdb3ee9072374 = []byte{
+var fileDescriptor_49411dfe5c54cc3e = []byte{
 	// 675 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0x5d, 0x4e, 0xdb, 0x4a,
 	0x14, 0xc7, 0xe3, 0x38, 0x24, 0xf8, 0x84, 0x70, 0xa3, 0xb9, 0xe8, 0x2a, 0x97, 0x7b, 0xab, 0x52,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go b/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go
index 206c4db45d..78ae7b7e38 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/attestation/attestation.proto
 
-package attestation // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/attestation"
+package attestation
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Type (for example schema) of the attestation payload that was signed.
 type PgpSignedAttestation_ContentType int32
@@ -35,6 +38,7 @@ var PgpSignedAttestation_ContentType_name = map[int32]string{
 	0: "CONTENT_TYPE_UNSPECIFIED",
 	1: "SIMPLE_SIGNING_JSON",
 }
+
 var PgpSignedAttestation_ContentType_value = map[string]int32{
 	"CONTENT_TYPE_UNSPECIFIED": 0,
 	"SIMPLE_SIGNING_JSON":      1,
@@ -43,8 +47,9 @@ var PgpSignedAttestation_ContentType_value = map[string]int32{
 func (x PgpSignedAttestation_ContentType) String() string {
 	return proto.EnumName(PgpSignedAttestation_ContentType_name, int32(x))
 }
+
 func (PgpSignedAttestation_ContentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_attestation_5f15fe591a16ad2d, []int{0, 0}
+	return fileDescriptor_a004b79c48a9c453, []int{0, 0}
 }
 
 // An attestation wrapper with a PGP-compatible signature. This message only
@@ -87,16 +92,17 @@ func (m *PgpSignedAttestation) Reset()         { *m = PgpSignedAttestation{} }
 func (m *PgpSignedAttestation) String() string { return proto.CompactTextString(m) }
 func (*PgpSignedAttestation) ProtoMessage()    {}
 func (*PgpSignedAttestation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_attestation_5f15fe591a16ad2d, []int{0}
+	return fileDescriptor_a004b79c48a9c453, []int{0}
 }
+
 func (m *PgpSignedAttestation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PgpSignedAttestation.Unmarshal(m, b)
 }
 func (m *PgpSignedAttestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PgpSignedAttestation.Marshal(b, m, deterministic)
 }
-func (dst *PgpSignedAttestation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PgpSignedAttestation.Merge(dst, src)
+func (m *PgpSignedAttestation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PgpSignedAttestation.Merge(m, src)
 }
 func (m *PgpSignedAttestation) XXX_Size() int {
 	return xxx_messageInfo_PgpSignedAttestation.Size(m)
@@ -145,57 +151,13 @@ func (m *PgpSignedAttestation) GetPgpKeyId() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PgpSignedAttestation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PgpSignedAttestation_OneofMarshaler, _PgpSignedAttestation_OneofUnmarshaler, _PgpSignedAttestation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PgpSignedAttestation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PgpSignedAttestation_PgpKeyId)(nil),
 	}
 }
 
-func _PgpSignedAttestation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PgpSignedAttestation)
-	// key_id
-	switch x := m.KeyId.(type) {
-	case *PgpSignedAttestation_PgpKeyId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PgpKeyId)
-	case nil:
-	default:
-		return fmt.Errorf("PgpSignedAttestation.KeyId has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PgpSignedAttestation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PgpSignedAttestation)
-	switch tag {
-	case 2: // key_id.pgp_key_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.KeyId = &PgpSignedAttestation_PgpKeyId{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PgpSignedAttestation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PgpSignedAttestation)
-	// key_id
-	switch x := m.KeyId.(type) {
-	case *PgpSignedAttestation_PgpKeyId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PgpKeyId)))
-		n += len(x.PgpKeyId)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Note kind that represents a logical attestation "role" or "authority". For
 // example, an organization might have one `Authority` for "QA" and one for
 // "build". This Note is intended to act strictly as a grouping mechanism for
@@ -216,16 +178,17 @@ func (m *Authority) Reset()         { *m = Authority{} }
 func (m *Authority) String() string { return proto.CompactTextString(m) }
 func (*Authority) ProtoMessage()    {}
 func (*Authority) Descriptor() ([]byte, []int) {
-	return fileDescriptor_attestation_5f15fe591a16ad2d, []int{1}
+	return fileDescriptor_a004b79c48a9c453, []int{1}
 }
+
 func (m *Authority) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Authority.Unmarshal(m, b)
 }
 func (m *Authority) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Authority.Marshal(b, m, deterministic)
 }
-func (dst *Authority) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Authority.Merge(dst, src)
+func (m *Authority) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Authority.Merge(m, src)
 }
 func (m *Authority) XXX_Size() int {
 	return xxx_messageInfo_Authority.Size(m)
@@ -262,16 +225,17 @@ func (m *Authority_Hint) Reset()         { *m = Authority_Hint{} }
 func (m *Authority_Hint) String() string { return proto.CompactTextString(m) }
 func (*Authority_Hint) ProtoMessage()    {}
 func (*Authority_Hint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_attestation_5f15fe591a16ad2d, []int{1, 0}
+	return fileDescriptor_a004b79c48a9c453, []int{1, 0}
 }
+
 func (m *Authority_Hint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Authority_Hint.Unmarshal(m, b)
 }
 func (m *Authority_Hint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Authority_Hint.Marshal(b, m, deterministic)
 }
-func (dst *Authority_Hint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Authority_Hint.Merge(dst, src)
+func (m *Authority_Hint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Authority_Hint.Merge(m, src)
 }
 func (m *Authority_Hint) XXX_Size() int {
 	return xxx_messageInfo_Authority_Hint.Size(m)
@@ -302,16 +266,17 @@ func (m *Details) Reset()         { *m = Details{} }
 func (m *Details) String() string { return proto.CompactTextString(m) }
 func (*Details) ProtoMessage()    {}
 func (*Details) Descriptor() ([]byte, []int) {
-	return fileDescriptor_attestation_5f15fe591a16ad2d, []int{2}
+	return fileDescriptor_a004b79c48a9c453, []int{2}
 }
+
 func (m *Details) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Details.Unmarshal(m, b)
 }
 func (m *Details) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Details.Marshal(b, m, deterministic)
 }
-func (dst *Details) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Details.Merge(dst, src)
+func (m *Details) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Details.Merge(m, src)
 }
 func (m *Details) XXX_Size() int {
 	return xxx_messageInfo_Details.Size(m)
@@ -354,16 +319,17 @@ func (m *Attestation) Reset()         { *m = Attestation{} }
 func (m *Attestation) String() string { return proto.CompactTextString(m) }
 func (*Attestation) ProtoMessage()    {}
 func (*Attestation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_attestation_5f15fe591a16ad2d, []int{3}
+	return fileDescriptor_a004b79c48a9c453, []int{3}
 }
+
 func (m *Attestation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Attestation.Unmarshal(m, b)
 }
 func (m *Attestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Attestation.Marshal(b, m, deterministic)
 }
-func (dst *Attestation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Attestation.Merge(dst, src)
+func (m *Attestation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Attestation.Merge(m, src)
 }
 func (m *Attestation) XXX_Size() int {
 	return xxx_messageInfo_Attestation.Size(m)
@@ -398,75 +364,27 @@ func (m *Attestation) GetPgpSignedAttestation() *PgpSignedAttestation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Attestation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Attestation_OneofMarshaler, _Attestation_OneofUnmarshaler, _Attestation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Attestation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Attestation_PgpSignedAttestation)(nil),
 	}
 }
 
-func _Attestation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Attestation)
-	// signature
-	switch x := m.Signature.(type) {
-	case *Attestation_PgpSignedAttestation:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PgpSignedAttestation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Attestation.Signature has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Attestation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Attestation)
-	switch tag {
-	case 1: // signature.pgp_signed_attestation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PgpSignedAttestation)
-		err := b.DecodeMessage(msg)
-		m.Signature = &Attestation_PgpSignedAttestation{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Attestation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Attestation)
-	// signature
-	switch x := m.Signature.(type) {
-	case *Attestation_PgpSignedAttestation:
-		s := proto.Size(x.PgpSignedAttestation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.attestation.PgpSignedAttestation_ContentType", PgpSignedAttestation_ContentType_name, PgpSignedAttestation_ContentType_value)
 	proto.RegisterType((*PgpSignedAttestation)(nil), "grafeas.v1beta1.attestation.PgpSignedAttestation")
 	proto.RegisterType((*Authority)(nil), "grafeas.v1beta1.attestation.Authority")
 	proto.RegisterType((*Authority_Hint)(nil), "grafeas.v1beta1.attestation.Authority.Hint")
 	proto.RegisterType((*Details)(nil), "grafeas.v1beta1.attestation.Details")
 	proto.RegisterType((*Attestation)(nil), "grafeas.v1beta1.attestation.Attestation")
-	proto.RegisterEnum("grafeas.v1beta1.attestation.PgpSignedAttestation_ContentType", PgpSignedAttestation_ContentType_name, PgpSignedAttestation_ContentType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/attestation/attestation.proto", fileDescriptor_attestation_5f15fe591a16ad2d)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/attestation/attestation.proto", fileDescriptor_a004b79c48a9c453)
 }
 
-var fileDescriptor_attestation_5f15fe591a16ad2d = []byte{
+var fileDescriptor_a004b79c48a9c453 = []byte{
 	// 452 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5d, 0x6f, 0xd3, 0x30,
 	0x14, 0x6d, 0xba, 0x69, 0xac, 0x37, 0x08, 0x8d, 0x6c, 0x82, 0x0a, 0xa6, 0x69, 0xca, 0x53, 0x25,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go b/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go
index d99250b862..078e0ce9b3 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/build/build.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/build/build.proto
 
-package build // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/build"
+package build
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Public key formats
 type BuildSignature_KeyType int32
@@ -36,6 +39,7 @@ var BuildSignature_KeyType_name = map[int32]string{
 	1: "PGP_ASCII_ARMORED",
 	2: "PKIX_PEM",
 }
+
 var BuildSignature_KeyType_value = map[string]int32{
 	"KEY_TYPE_UNSPECIFIED": 0,
 	"PGP_ASCII_ARMORED":    1,
@@ -45,8 +49,9 @@ var BuildSignature_KeyType_value = map[string]int32{
 func (x BuildSignature_KeyType) String() string {
 	return proto.EnumName(BuildSignature_KeyType_name, int32(x))
 }
+
 func (BuildSignature_KeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_build_fc5a1b8d414ac9bd, []int{1, 0}
+	return fileDescriptor_040ca5655a0ae0a6, []int{1, 0}
 }
 
 // Note holding the version of the provider's builder and the signature of the
@@ -66,16 +71,17 @@ func (m *Build) Reset()         { *m = Build{} }
 func (m *Build) String() string { return proto.CompactTextString(m) }
 func (*Build) ProtoMessage()    {}
 func (*Build) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_fc5a1b8d414ac9bd, []int{0}
+	return fileDescriptor_040ca5655a0ae0a6, []int{0}
 }
+
 func (m *Build) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Build.Unmarshal(m, b)
 }
 func (m *Build) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Build.Marshal(b, m, deterministic)
 }
-func (dst *Build) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Build.Merge(dst, src)
+func (m *Build) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Build.Merge(m, src)
 }
 func (m *Build) XXX_Size() int {
 	return xxx_messageInfo_Build.Size(m)
@@ -136,16 +142,17 @@ func (m *BuildSignature) Reset()         { *m = BuildSignature{} }
 func (m *BuildSignature) String() string { return proto.CompactTextString(m) }
 func (*BuildSignature) ProtoMessage()    {}
 func (*BuildSignature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_fc5a1b8d414ac9bd, []int{1}
+	return fileDescriptor_040ca5655a0ae0a6, []int{1}
 }
+
 func (m *BuildSignature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildSignature.Unmarshal(m, b)
 }
 func (m *BuildSignature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildSignature.Marshal(b, m, deterministic)
 }
-func (dst *BuildSignature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildSignature.Merge(dst, src)
+func (m *BuildSignature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildSignature.Merge(m, src)
 }
 func (m *BuildSignature) XXX_Size() int {
 	return xxx_messageInfo_BuildSignature.Size(m)
@@ -209,16 +216,17 @@ func (m *Details) Reset()         { *m = Details{} }
 func (m *Details) String() string { return proto.CompactTextString(m) }
 func (*Details) ProtoMessage()    {}
 func (*Details) Descriptor() ([]byte, []int) {
-	return fileDescriptor_build_fc5a1b8d414ac9bd, []int{2}
+	return fileDescriptor_040ca5655a0ae0a6, []int{2}
 }
+
 func (m *Details) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Details.Unmarshal(m, b)
 }
 func (m *Details) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Details.Marshal(b, m, deterministic)
 }
-func (dst *Details) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Details.Merge(dst, src)
+func (m *Details) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Details.Merge(m, src)
 }
 func (m *Details) XXX_Size() int {
 	return xxx_messageInfo_Details.Size(m)
@@ -244,17 +252,17 @@ func (m *Details) GetProvenanceBytes() string {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.build.BuildSignature_KeyType", BuildSignature_KeyType_name, BuildSignature_KeyType_value)
 	proto.RegisterType((*Build)(nil), "grafeas.v1beta1.build.Build")
 	proto.RegisterType((*BuildSignature)(nil), "grafeas.v1beta1.build.BuildSignature")
 	proto.RegisterType((*Details)(nil), "grafeas.v1beta1.build.Details")
-	proto.RegisterEnum("grafeas.v1beta1.build.BuildSignature_KeyType", BuildSignature_KeyType_name, BuildSignature_KeyType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/build/build.proto", fileDescriptor_build_fc5a1b8d414ac9bd)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/build/build.proto", fileDescriptor_040ca5655a0ae0a6)
 }
 
-var fileDescriptor_build_fc5a1b8d414ac9bd = []byte{
+var fileDescriptor_040ca5655a0ae0a6 = []byte{
 	// 434 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0x6f, 0xd3, 0x40,
 	0x10, 0xc5, 0x29, 0x6d, 0x9a, 0x69, 0x95, 0x86, 0x15, 0x91, 0x2c, 0x04, 0x52, 0x14, 0x09, 0x11,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go b/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go
index ea676c22c6..06806258ce 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/common/common.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/common/common.proto
 
-package common // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Kind represents the kinds of notes supported.
 type NoteKind int32
@@ -50,6 +53,7 @@ var NoteKind_name = map[int32]string{
 	6: "DISCOVERY",
 	7: "ATTESTATION",
 }
+
 var NoteKind_value = map[string]int32{
 	"NOTE_KIND_UNSPECIFIED": 0,
 	"VULNERABILITY":         1,
@@ -64,8 +68,9 @@ var NoteKind_value = map[string]int32{
 func (x NoteKind) String() string {
 	return proto.EnumName(NoteKind_name, int32(x))
 }
+
 func (NoteKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_945c0ba544e58d51, []int{0}
+	return fileDescriptor_baf5189c00300310, []int{0}
 }
 
 // Metadata for any related URL information.
@@ -83,16 +88,17 @@ func (m *RelatedUrl) Reset()         { *m = RelatedUrl{} }
 func (m *RelatedUrl) String() string { return proto.CompactTextString(m) }
 func (*RelatedUrl) ProtoMessage()    {}
 func (*RelatedUrl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_945c0ba544e58d51, []int{0}
+	return fileDescriptor_baf5189c00300310, []int{0}
 }
+
 func (m *RelatedUrl) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RelatedUrl.Unmarshal(m, b)
 }
 func (m *RelatedUrl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RelatedUrl.Marshal(b, m, deterministic)
 }
-func (dst *RelatedUrl) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RelatedUrl.Merge(dst, src)
+func (m *RelatedUrl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RelatedUrl.Merge(m, src)
 }
 func (m *RelatedUrl) XXX_Size() int {
 	return xxx_messageInfo_RelatedUrl.Size(m)
@@ -118,15 +124,15 @@ func (m *RelatedUrl) GetLabel() string {
 }
 
 func init() {
-	proto.RegisterType((*RelatedUrl)(nil), "grafeas.v1beta1.RelatedUrl")
 	proto.RegisterEnum("grafeas.v1beta1.NoteKind", NoteKind_name, NoteKind_value)
+	proto.RegisterType((*RelatedUrl)(nil), "grafeas.v1beta1.RelatedUrl")
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/common/common.proto", fileDescriptor_common_945c0ba544e58d51)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/common/common.proto", fileDescriptor_baf5189c00300310)
 }
 
-var fileDescriptor_common_945c0ba544e58d51 = []byte{
+var fileDescriptor_baf5189c00300310 = []byte{
 	// 322 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x41, 0x6b, 0xea, 0x40,
 	0x14, 0x85, 0x5f, 0xf4, 0xa9, 0xcf, 0x2b, 0x3e, 0xa7, 0x43, 0x0b, 0xba, 0x2b, 0x5d, 0x95, 0x2e,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go b/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go
index 0429cb2346..57a9580b13 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/containeranalysis.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/containeranalysis.proto
 
-package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+package containeranalysis
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A scan configuration specifies whether Cloud components in a project have a
 // particular type of analysis being run. For example, it can configure whether
@@ -51,16 +51,17 @@ func (m *ScanConfig) Reset()         { *m = ScanConfig{} }
 func (m *ScanConfig) String() string { return proto.CompactTextString(m) }
 func (*ScanConfig) ProtoMessage()    {}
 func (*ScanConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_0620917dfaf828c6, []int{0}
+	return fileDescriptor_20a7ff65c4c4547f, []int{0}
 }
+
 func (m *ScanConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ScanConfig.Unmarshal(m, b)
 }
 func (m *ScanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ScanConfig.Marshal(b, m, deterministic)
 }
-func (dst *ScanConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ScanConfig.Merge(dst, src)
+func (m *ScanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig.Merge(m, src)
 }
 func (m *ScanConfig) XXX_Size() int {
 	return xxx_messageInfo_ScanConfig.Size(m)
@@ -120,16 +121,17 @@ func (m *GetScanConfigRequest) Reset()         { *m = GetScanConfigRequest{} }
 func (m *GetScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetScanConfigRequest) ProtoMessage()    {}
 func (*GetScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_0620917dfaf828c6, []int{1}
+	return fileDescriptor_20a7ff65c4c4547f, []int{1}
 }
+
 func (m *GetScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetScanConfigRequest.Unmarshal(m, b)
 }
 func (m *GetScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetScanConfigRequest.Merge(dst, src)
+func (m *GetScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanConfigRequest.Merge(m, src)
 }
 func (m *GetScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetScanConfigRequest.Size(m)
@@ -167,16 +169,17 @@ func (m *ListScanConfigsRequest) Reset()         { *m = ListScanConfigsRequest{}
 func (m *ListScanConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsRequest) ProtoMessage()    {}
 func (*ListScanConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_0620917dfaf828c6, []int{2}
+	return fileDescriptor_20a7ff65c4c4547f, []int{2}
 }
+
 func (m *ListScanConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListScanConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsRequest.Merge(dst, src)
+func (m *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsRequest.Merge(m, src)
 }
 func (m *ListScanConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsRequest.Size(m)
@@ -232,16 +235,17 @@ func (m *ListScanConfigsResponse) Reset()         { *m = ListScanConfigsResponse
 func (m *ListScanConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListScanConfigsResponse) ProtoMessage()    {}
 func (*ListScanConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_0620917dfaf828c6, []int{3}
+	return fileDescriptor_20a7ff65c4c4547f, []int{3}
 }
+
 func (m *ListScanConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListScanConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListScanConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListScanConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListScanConfigsResponse.Merge(dst, src)
+func (m *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsResponse.Merge(m, src)
 }
 func (m *ListScanConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListScanConfigsResponse.Size(m)
@@ -282,16 +286,17 @@ func (m *UpdateScanConfigRequest) Reset()         { *m = UpdateScanConfigRequest
 func (m *UpdateScanConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateScanConfigRequest) ProtoMessage()    {}
 func (*UpdateScanConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_containeranalysis_0620917dfaf828c6, []int{4}
+	return fileDescriptor_20a7ff65c4c4547f, []int{4}
 }
+
 func (m *UpdateScanConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateScanConfigRequest.Unmarshal(m, b)
 }
 func (m *UpdateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateScanConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateScanConfigRequest.Merge(dst, src)
+func (m *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateScanConfigRequest.Merge(m, src)
 }
 func (m *UpdateScanConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateScanConfigRequest.Size(m)
@@ -324,6 +329,62 @@ func init() {
 	proto.RegisterType((*UpdateScanConfigRequest)(nil), "google.devtools.containeranalysis.v1beta1.UpdateScanConfigRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/containeranalysis.proto", fileDescriptor_20a7ff65c4c4547f)
+}
+
+var fileDescriptor_20a7ff65c4c4547f = []byte{
+	// 766 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x4e, 0x1b, 0x49,
+	0x10, 0x56, 0xf3, 0xb7, 0xd0, 0x06, 0xb1, 0x6a, 0xed, 0x82, 0x35, 0xfb, 0x67, 0x8d, 0x56, 0x2b,
+	0xe3, 0xc3, 0xcc, 0x1a, 0xb4, 0x5a, 0x05, 0x44, 0x90, 0x21, 0x92, 0x15, 0x29, 0x07, 0x64, 0x08,
+	0x8a, 0xb8, 0x58, 0xed, 0x71, 0x31, 0xea, 0xc4, 0xd3, 0x3d, 0x99, 0x6e, 0x5b, 0x40, 0x44, 0x0e,
+	0x11, 0xb9, 0x24, 0xc7, 0x1c, 0x73, 0xcb, 0x5b, 0xe4, 0x11, 0x12, 0xe5, 0x16, 0x29, 0x4f, 0x90,
+	0x77, 0xc8, 0x35, 0x9a, 0x9e, 0x1e, 0x7b, 0xb0, 0x0d, 0xd8, 0xa0, 0x9c, 0xa0, 0xeb, 0xfb, 0xaa,
+	0xea, 0xfb, 0xaa, 0xdd, 0x65, 0xe3, 0x8a, 0x2f, 0x84, 0xdf, 0x02, 0xb7, 0x09, 0x1d, 0x25, 0x44,
+	0x4b, 0xba, 0x9e, 0xe0, 0x8a, 0x32, 0x0e, 0x11, 0xe5, 0xb4, 0x75, 0x22, 0x99, 0x74, 0x3b, 0xe5,
+	0x06, 0x28, 0x5a, 0x1e, 0x44, 0x9c, 0x30, 0x12, 0x4a, 0x90, 0x95, 0xa4, 0x84, 0x93, 0x96, 0x70,
+	0x06, 0x89, 0xa6, 0x84, 0xf5, 0xbb, 0xe9, 0x46, 0x43, 0xe6, 0x52, 0xce, 0x85, 0xa2, 0x8a, 0x09,
+	0x6e, 0x0a, 0x59, 0x7f, 0x1a, 0x94, 0xd1, 0xc0, 0xed, 0x94, 0xe3, 0x3f, 0xf5, 0x50, 0xb4, 0x98,
+	0x77, 0x62, 0x70, 0xeb, 0x22, 0x7e, 0x01, 0xfb, 0xcb, 0x60, 0xfa, 0xd4, 0x68, 0x1f, 0xb9, 0x8a,
+	0x05, 0x20, 0x15, 0x0d, 0xc2, 0x84, 0x60, 0x7f, 0x41, 0x18, 0xef, 0x79, 0x94, 0xef, 0x08, 0x7e,
+	0xc4, 0x7c, 0x42, 0xf0, 0x14, 0xa7, 0x01, 0xe4, 0x51, 0x01, 0x15, 0xe7, 0x6a, 0xfa, 0x7f, 0x52,
+	0xc0, 0xb9, 0x26, 0x48, 0x2f, 0x62, 0x61, 0xac, 0x2a, 0x3f, 0xa1, 0xa1, 0x6c, 0x88, 0xe4, 0xf1,
+	0x4f, 0xc0, 0x69, 0xa3, 0x05, 0xcd, 0xfc, 0x64, 0x01, 0x15, 0x67, 0x6b, 0xe9, 0x91, 0x6c, 0xe0,
+	0x9c, 0x17, 0x01, 0x55, 0x50, 0x8f, 0x1b, 0xe7, 0xa7, 0x0a, 0xa8, 0x98, 0x5b, 0xb5, 0x1c, 0x33,
+	0x9a, 0x54, 0x95, 0xb3, 0x9f, 0xaa, 0xaa, 0xe1, 0x84, 0x1e, 0x07, 0xe2, 0xe4, 0x76, 0xd8, 0xec,
+	0x26, 0x4f, 0x5f, 0x9f, 0x9c, 0xd0, 0xe3, 0x80, 0x5d, 0xc2, 0xbf, 0x54, 0x41, 0xf5, 0xac, 0xd5,
+	0xe0, 0x69, 0x1b, 0xa4, 0x1a, 0xe6, 0xd0, 0x3e, 0x47, 0x78, 0xe9, 0x01, 0x93, 0x19, 0xb6, 0x4c,
+	0xe9, 0x4b, 0x78, 0x26, 0xa4, 0x11, 0x70, 0x65, 0x12, 0xcc, 0x29, 0x8e, 0x1f, 0xb1, 0x96, 0x82,
+	0xc8, 0xcc, 0xc3, 0x9c, 0xc8, 0x6f, 0x78, 0x2e, 0xa4, 0x3e, 0xd4, 0x25, 0x3b, 0x05, 0x3d, 0x8c,
+	0xe9, 0xda, 0x6c, 0x1c, 0xd8, 0x63, 0xa7, 0x40, 0xfe, 0xc0, 0x58, 0x83, 0x4a, 0x3c, 0x01, 0xae,
+	0x87, 0x31, 0x57, 0xd3, 0xf4, 0xfd, 0x38, 0x60, 0xbf, 0x45, 0x78, 0x79, 0x40, 0x86, 0x0c, 0x05,
+	0x97, 0x40, 0x1e, 0xe1, 0x79, 0xe9, 0x51, 0x5e, 0xf7, 0x92, 0x78, 0x1e, 0x15, 0x26, 0x8b, 0xb9,
+	0xd5, 0xff, 0x9c, 0x91, 0x3f, 0x64, 0x4e, 0x66, 0x14, 0x39, 0xd9, 0xeb, 0x40, 0xfe, 0xc1, 0x8b,
+	0x1c, 0x8e, 0x55, 0x3d, 0xa3, 0x2c, 0xb1, 0xb4, 0x10, 0x87, 0x77, 0xbb, 0xea, 0x5e, 0x22, 0xbc,
+	0xfc, 0x50, 0xcf, 0x77, 0xa4, 0xa1, 0x92, 0x03, 0x9c, 0xcb, 0x28, 0xd6, 0x35, 0x6f, 0x2c, 0x18,
+	0xf7, 0x04, 0xaf, 0x9e, 0x63, 0x9c, 0xdf, 0x49, 0x93, 0x2a, 0x26, 0xe9, 0xa0, 0xbc, 0x1d, 0xe7,
+	0x90, 0x0f, 0x08, 0xcf, 0xef, 0x81, 0xba, 0x4f, 0x83, 0x5d, 0xfd, 0x0c, 0x88, 0x9d, 0x36, 0x64,
+	0x34, 0x70, 0x3a, 0x65, 0x27, 0x0b, 0x1a, 0xf5, 0xd6, 0xaf, 0x7d, 0x9c, 0x04, 0xb5, 0x9f, 0xbf,
+	0xf8, 0xfc, 0xf5, 0xcd, 0xc4, 0xb1, 0xbd, 0xd6, 0x7d, 0xea, 0xcf, 0x22, 0x90, 0xa2, 0x1d, 0x79,
+	0xb0, 0x19, 0x46, 0xe2, 0x31, 0x78, 0x4a, 0xba, 0x25, 0x97, 0x0b, 0x05, 0xd2, 0x2d, 0x9d, 0xad,
+	0xcb, 0x4c, 0xe9, 0x75, 0x54, 0x3a, 0xbc, 0x6b, 0xdf, 0xb9, 0x3a, 0x53, 0x78, 0x5e, 0x3b, 0x8a,
+	0x80, 0x7b, 0x43, 0xf3, 0xb5, 0x97, 0xea, 0x55, 0x5e, 0xaa, 0x3f, 0xce, 0x8b, 0x7f, 0x4b, 0x2f,
+	0x7d, 0xf9, 0xe4, 0x1b, 0xc2, 0x64, 0x1f, 0xa4, 0x0e, 0x42, 0x14, 0x30, 0x29, 0xe3, 0x05, 0x47,
+	0x8a, 0x7d, 0x6a, 0x07, 0x29, 0xa9, 0xaf, 0x95, 0x11, 0x98, 0xc9, 0x53, 0xb1, 0x5f, 0x23, 0x6d,
+	0xf6, 0x1c, 0x5d, 0xa7, 0xb9, 0xeb, 0x56, 0x0d, 0x14, 0x8b, 0x3d, 0xdf, 0xb3, 0xb7, 0xc6, 0xf2,
+	0x3c, 0xb4, 0x0a, 0x79, 0x8f, 0xf0, 0xc2, 0x85, 0x45, 0x44, 0xb6, 0xc6, 0x78, 0x03, 0xc3, 0x56,
+	0x98, 0x75, 0xb3, 0x47, 0x64, 0xff, 0xab, 0xc7, 0x52, 0x22, 0xc5, 0x9e, 0xab, 0xf8, 0xa1, 0x66,
+	0x1d, 0x65, 0xf6, 0x82, 0x5b, 0x3a, 0x23, 0x1f, 0x11, 0x5e, 0xec, 0x5b, 0x48, 0xa4, 0x32, 0x46,
+	0xf3, 0xe1, 0x3b, 0xd5, 0xda, 0xbe, 0x4d, 0x09, 0x73, 0xc9, 0x43, 0xcc, 0x24, 0x9b, 0x39, 0x63,
+	0xe7, 0x2c, 0xeb, 0x87, 0x7c, 0x42, 0xf8, 0xe7, 0xfe, 0xfd, 0x45, 0xc6, 0x91, 0x72, 0xc9, 0xf2,
+	0xbb, 0xe9, 0x75, 0x6c, 0x6a, 0x07, 0xff, 0x5b, 0x23, 0x5f, 0xc7, 0x7a, 0x76, 0x9f, 0x6e, 0xbf,
+	0x42, 0xf8, 0x6f, 0x4f, 0x04, 0x69, 0xef, 0x4b, 0x5b, 0xee, 0xa2, 0xc3, 0x43, 0xc3, 0xf1, 0x45,
+	0x8b, 0x72, 0xdf, 0x11, 0x91, 0xef, 0xfa, 0xc0, 0xf5, 0xf7, 0xa7, 0x9b, 0x40, 0x34, 0x64, 0x72,
+	0x84, 0xdf, 0x3a, 0x1b, 0x03, 0xc8, 0xbb, 0x89, 0xc9, 0xea, 0x4e, 0xa5, 0x31, 0xa3, 0x8b, 0xad,
+	0x7d, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xf6, 0x5c, 0x69, 0x37, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -612,59 +673,3 @@ var _ContainerAnalysisV1Beta1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/containeranalysis/v1beta1/containeranalysis.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/containeranalysis.proto", fileDescriptor_containeranalysis_0620917dfaf828c6)
-}
-
-var fileDescriptor_containeranalysis_0620917dfaf828c6 = []byte{
-	// 766 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x4e, 0x1b, 0x49,
-	0x10, 0x56, 0xf3, 0xb7, 0xd0, 0x06, 0xb1, 0x6a, 0xed, 0x82, 0x35, 0xfb, 0x67, 0x8d, 0x56, 0x2b,
-	0xe3, 0xc3, 0xcc, 0x1a, 0xb4, 0x5a, 0x05, 0x44, 0x90, 0x21, 0x92, 0x15, 0x29, 0x07, 0x64, 0x08,
-	0x8a, 0xb8, 0x58, 0xed, 0x71, 0x31, 0xea, 0xc4, 0xd3, 0x3d, 0x99, 0x6e, 0x5b, 0x40, 0x44, 0x0e,
-	0x11, 0xb9, 0x24, 0xc7, 0x1c, 0x73, 0xcb, 0x5b, 0xe4, 0x11, 0x12, 0xe5, 0x16, 0x29, 0x4f, 0x90,
-	0x77, 0xc8, 0x35, 0x9a, 0x9e, 0x1e, 0x7b, 0xb0, 0x0d, 0xd8, 0xa0, 0x9c, 0xa0, 0xeb, 0xfb, 0xaa,
-	0xea, 0xfb, 0xaa, 0xdd, 0x65, 0xe3, 0x8a, 0x2f, 0x84, 0xdf, 0x02, 0xb7, 0x09, 0x1d, 0x25, 0x44,
-	0x4b, 0xba, 0x9e, 0xe0, 0x8a, 0x32, 0x0e, 0x11, 0xe5, 0xb4, 0x75, 0x22, 0x99, 0x74, 0x3b, 0xe5,
-	0x06, 0x28, 0x5a, 0x1e, 0x44, 0x9c, 0x30, 0x12, 0x4a, 0x90, 0x95, 0xa4, 0x84, 0x93, 0x96, 0x70,
-	0x06, 0x89, 0xa6, 0x84, 0xf5, 0xbb, 0xe9, 0x46, 0x43, 0xe6, 0x52, 0xce, 0x85, 0xa2, 0x8a, 0x09,
-	0x6e, 0x0a, 0x59, 0x7f, 0x1a, 0x94, 0xd1, 0xc0, 0xed, 0x94, 0xe3, 0x3f, 0xf5, 0x50, 0xb4, 0x98,
-	0x77, 0x62, 0x70, 0xeb, 0x22, 0x7e, 0x01, 0xfb, 0xcb, 0x60, 0xfa, 0xd4, 0x68, 0x1f, 0xb9, 0x8a,
-	0x05, 0x20, 0x15, 0x0d, 0xc2, 0x84, 0x60, 0x7f, 0x41, 0x18, 0xef, 0x79, 0x94, 0xef, 0x08, 0x7e,
-	0xc4, 0x7c, 0x42, 0xf0, 0x14, 0xa7, 0x01, 0xe4, 0x51, 0x01, 0x15, 0xe7, 0x6a, 0xfa, 0x7f, 0x52,
-	0xc0, 0xb9, 0x26, 0x48, 0x2f, 0x62, 0x61, 0xac, 0x2a, 0x3f, 0xa1, 0xa1, 0x6c, 0x88, 0xe4, 0xf1,
-	0x4f, 0xc0, 0x69, 0xa3, 0x05, 0xcd, 0xfc, 0x64, 0x01, 0x15, 0x67, 0x6b, 0xe9, 0x91, 0x6c, 0xe0,
-	0x9c, 0x17, 0x01, 0x55, 0x50, 0x8f, 0x1b, 0xe7, 0xa7, 0x0a, 0xa8, 0x98, 0x5b, 0xb5, 0x1c, 0x33,
-	0x9a, 0x54, 0x95, 0xb3, 0x9f, 0xaa, 0xaa, 0xe1, 0x84, 0x1e, 0x07, 0xe2, 0xe4, 0x76, 0xd8, 0xec,
-	0x26, 0x4f, 0x5f, 0x9f, 0x9c, 0xd0, 0xe3, 0x80, 0x5d, 0xc2, 0xbf, 0x54, 0x41, 0xf5, 0xac, 0xd5,
-	0xe0, 0x69, 0x1b, 0xa4, 0x1a, 0xe6, 0xd0, 0x3e, 0x47, 0x78, 0xe9, 0x01, 0x93, 0x19, 0xb6, 0x4c,
-	0xe9, 0x4b, 0x78, 0x26, 0xa4, 0x11, 0x70, 0x65, 0x12, 0xcc, 0x29, 0x8e, 0x1f, 0xb1, 0x96, 0x82,
-	0xc8, 0xcc, 0xc3, 0x9c, 0xc8, 0x6f, 0x78, 0x2e, 0xa4, 0x3e, 0xd4, 0x25, 0x3b, 0x05, 0x3d, 0x8c,
-	0xe9, 0xda, 0x6c, 0x1c, 0xd8, 0x63, 0xa7, 0x40, 0xfe, 0xc0, 0x58, 0x83, 0x4a, 0x3c, 0x01, 0xae,
-	0x87, 0x31, 0x57, 0xd3, 0xf4, 0xfd, 0x38, 0x60, 0xbf, 0x45, 0x78, 0x79, 0x40, 0x86, 0x0c, 0x05,
-	0x97, 0x40, 0x1e, 0xe1, 0x79, 0xe9, 0x51, 0x5e, 0xf7, 0x92, 0x78, 0x1e, 0x15, 0x26, 0x8b, 0xb9,
-	0xd5, 0xff, 0x9c, 0x91, 0x3f, 0x64, 0x4e, 0x66, 0x14, 0x39, 0xd9, 0xeb, 0x40, 0xfe, 0xc1, 0x8b,
-	0x1c, 0x8e, 0x55, 0x3d, 0xa3, 0x2c, 0xb1, 0xb4, 0x10, 0x87, 0x77, 0xbb, 0xea, 0x5e, 0x22, 0xbc,
-	0xfc, 0x50, 0xcf, 0x77, 0xa4, 0xa1, 0x92, 0x03, 0x9c, 0xcb, 0x28, 0xd6, 0x35, 0x6f, 0x2c, 0x18,
-	0xf7, 0x04, 0xaf, 0x9e, 0x63, 0x9c, 0xdf, 0x49, 0x93, 0x2a, 0x26, 0xe9, 0xa0, 0xbc, 0x1d, 0xe7,
-	0x90, 0x0f, 0x08, 0xcf, 0xef, 0x81, 0xba, 0x4f, 0x83, 0x5d, 0xfd, 0x0c, 0x88, 0x9d, 0x36, 0x64,
-	0x34, 0x70, 0x3a, 0x65, 0x27, 0x0b, 0x1a, 0xf5, 0xd6, 0xaf, 0x7d, 0x9c, 0x04, 0xb5, 0x9f, 0xbf,
-	0xf8, 0xfc, 0xf5, 0xcd, 0xc4, 0xb1, 0xbd, 0xd6, 0x7d, 0xea, 0xcf, 0x22, 0x90, 0xa2, 0x1d, 0x79,
-	0xb0, 0x19, 0x46, 0xe2, 0x31, 0x78, 0x4a, 0xba, 0x25, 0x97, 0x0b, 0x05, 0xd2, 0x2d, 0x9d, 0xad,
-	0xcb, 0x4c, 0xe9, 0x75, 0x54, 0x3a, 0xbc, 0x6b, 0xdf, 0xb9, 0x3a, 0x53, 0x78, 0x5e, 0x3b, 0x8a,
-	0x80, 0x7b, 0x43, 0xf3, 0xb5, 0x97, 0xea, 0x55, 0x5e, 0xaa, 0x3f, 0xce, 0x8b, 0x7f, 0x4b, 0x2f,
-	0x7d, 0xf9, 0xe4, 0x1b, 0xc2, 0x64, 0x1f, 0xa4, 0x0e, 0x42, 0x14, 0x30, 0x29, 0xe3, 0x05, 0x47,
-	0x8a, 0x7d, 0x6a, 0x07, 0x29, 0xa9, 0xaf, 0x95, 0x11, 0x98, 0xc9, 0x53, 0xb1, 0x5f, 0x23, 0x6d,
-	0xf6, 0x1c, 0x5d, 0xa7, 0xb9, 0xeb, 0x56, 0x0d, 0x14, 0x8b, 0x3d, 0xdf, 0xb3, 0xb7, 0xc6, 0xf2,
-	0x3c, 0xb4, 0x0a, 0x79, 0x8f, 0xf0, 0xc2, 0x85, 0x45, 0x44, 0xb6, 0xc6, 0x78, 0x03, 0xc3, 0x56,
-	0x98, 0x75, 0xb3, 0x47, 0x64, 0xff, 0xab, 0xc7, 0x52, 0x22, 0xc5, 0x9e, 0xab, 0xf8, 0xa1, 0x66,
-	0x1d, 0x65, 0xf6, 0x82, 0x5b, 0x3a, 0x23, 0x1f, 0x11, 0x5e, 0xec, 0x5b, 0x48, 0xa4, 0x32, 0x46,
-	0xf3, 0xe1, 0x3b, 0xd5, 0xda, 0xbe, 0x4d, 0x09, 0x73, 0xc9, 0x43, 0xcc, 0x24, 0x9b, 0x39, 0x63,
-	0xe7, 0x2c, 0xeb, 0x87, 0x7c, 0x42, 0xf8, 0xe7, 0xfe, 0xfd, 0x45, 0xc6, 0x91, 0x72, 0xc9, 0xf2,
-	0xbb, 0xe9, 0x75, 0x6c, 0x6a, 0x07, 0xff, 0x5b, 0x23, 0x5f, 0xc7, 0x7a, 0x76, 0x9f, 0x6e, 0xbf,
-	0x42, 0xf8, 0x6f, 0x4f, 0x04, 0x69, 0xef, 0x4b, 0x5b, 0xee, 0xa2, 0xc3, 0x43, 0xc3, 0xf1, 0x45,
-	0x8b, 0x72, 0xdf, 0x11, 0x91, 0xef, 0xfa, 0xc0, 0xf5, 0xf7, 0xa7, 0x9b, 0x40, 0x34, 0x64, 0x72,
-	0x84, 0xdf, 0x3a, 0x1b, 0x03, 0xc8, 0xbb, 0x89, 0xc9, 0xea, 0x4e, 0xa5, 0x31, 0xa3, 0x8b, 0xad,
-	0x7d, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xf6, 0x5c, 0x69, 0x37, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go b/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go
index a13836950e..a480c13147 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/deployment/deployment.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/deployment/deployment.proto
 
-package deployment // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/deployment"
+package deployment
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Types of platforms.
 type Deployment_Platform int32
@@ -39,6 +42,7 @@ var Deployment_Platform_name = map[int32]string{
 	2: "FLEX",
 	3: "CUSTOM",
 }
+
 var Deployment_Platform_value = map[string]int32{
 	"PLATFORM_UNSPECIFIED": 0,
 	"GKE":                  1,
@@ -49,8 +53,9 @@ var Deployment_Platform_value = map[string]int32{
 func (x Deployment_Platform) String() string {
 	return proto.EnumName(Deployment_Platform_name, int32(x))
 }
+
 func (Deployment_Platform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_deployment_31a346de33a1fffc, []int{2, 0}
+	return fileDescriptor_27c2fb509818da47, []int{2, 0}
 }
 
 // An artifact that can be deployed in some runtime.
@@ -66,16 +71,17 @@ func (m *Deployable) Reset()         { *m = Deployable{} }
 func (m *Deployable) String() string { return proto.CompactTextString(m) }
 func (*Deployable) ProtoMessage()    {}
 func (*Deployable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_deployment_31a346de33a1fffc, []int{0}
+	return fileDescriptor_27c2fb509818da47, []int{0}
 }
+
 func (m *Deployable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Deployable.Unmarshal(m, b)
 }
 func (m *Deployable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Deployable.Marshal(b, m, deterministic)
 }
-func (dst *Deployable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Deployable.Merge(dst, src)
+func (m *Deployable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployable.Merge(m, src)
 }
 func (m *Deployable) XXX_Size() int {
 	return xxx_messageInfo_Deployable.Size(m)
@@ -106,16 +112,17 @@ func (m *Details) Reset()         { *m = Details{} }
 func (m *Details) String() string { return proto.CompactTextString(m) }
 func (*Details) ProtoMessage()    {}
 func (*Details) Descriptor() ([]byte, []int) {
-	return fileDescriptor_deployment_31a346de33a1fffc, []int{1}
+	return fileDescriptor_27c2fb509818da47, []int{1}
 }
+
 func (m *Details) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Details.Unmarshal(m, b)
 }
 func (m *Details) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Details.Marshal(b, m, deterministic)
 }
-func (dst *Details) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Details.Merge(dst, src)
+func (m *Details) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Details.Merge(m, src)
 }
 func (m *Details) XXX_Size() int {
 	return xxx_messageInfo_Details.Size(m)
@@ -159,16 +166,17 @@ func (m *Deployment) Reset()         { *m = Deployment{} }
 func (m *Deployment) String() string { return proto.CompactTextString(m) }
 func (*Deployment) ProtoMessage()    {}
 func (*Deployment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_deployment_31a346de33a1fffc, []int{2}
+	return fileDescriptor_27c2fb509818da47, []int{2}
 }
+
 func (m *Deployment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Deployment.Unmarshal(m, b)
 }
 func (m *Deployment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Deployment.Marshal(b, m, deterministic)
 }
-func (dst *Deployment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Deployment.Merge(dst, src)
+func (m *Deployment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployment.Merge(m, src)
 }
 func (m *Deployment) XXX_Size() int {
 	return xxx_messageInfo_Deployment.Size(m)
@@ -229,17 +237,17 @@ func (m *Deployment) GetPlatform() Deployment_Platform {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.deployment.Deployment_Platform", Deployment_Platform_name, Deployment_Platform_value)
 	proto.RegisterType((*Deployable)(nil), "grafeas.v1beta1.deployment.Deployable")
 	proto.RegisterType((*Details)(nil), "grafeas.v1beta1.deployment.Details")
 	proto.RegisterType((*Deployment)(nil), "grafeas.v1beta1.deployment.Deployment")
-	proto.RegisterEnum("grafeas.v1beta1.deployment.Deployment_Platform", Deployment_Platform_name, Deployment_Platform_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/deployment/deployment.proto", fileDescriptor_deployment_31a346de33a1fffc)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/deployment/deployment.proto", fileDescriptor_27c2fb509818da47)
 }
 
-var fileDescriptor_deployment_31a346de33a1fffc = []byte{
+var fileDescriptor_27c2fb509818da47 = []byte{
 	// 434 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x4d, 0x6b, 0xdb, 0x40,
 	0x10, 0xad, 0xac, 0xd4, 0x1f, 0xe3, 0xb4, 0x98, 0xa5, 0x14, 0x61, 0x08, 0x75, 0x7d, 0x28, 0x3e,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go b/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go
index 1bef6fab9b..417c9f95f8 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/discovery/discovery.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/discovery/discovery.proto
 
-package discovery // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/discovery"
+package discovery
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Whether the resource is continuously analyzed.
 type Discovered_ContinuousAnalysis int32
@@ -38,6 +41,7 @@ var Discovered_ContinuousAnalysis_name = map[int32]string{
 	1: "ACTIVE",
 	2: "INACTIVE",
 }
+
 var Discovered_ContinuousAnalysis_value = map[string]int32{
 	"CONTINUOUS_ANALYSIS_UNSPECIFIED": 0,
 	"ACTIVE":                          1,
@@ -47,8 +51,9 @@ var Discovered_ContinuousAnalysis_value = map[string]int32{
 func (x Discovered_ContinuousAnalysis) String() string {
 	return proto.EnumName(Discovered_ContinuousAnalysis_name, int32(x))
 }
+
 func (Discovered_ContinuousAnalysis) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_discovery_ce3fafdae1720c89, []int{2, 0}
+	return fileDescriptor_6ec5519deb85e465, []int{2, 0}
 }
 
 // Analysis status for a resource. Currently for initial analysis only (not
@@ -79,6 +84,7 @@ var Discovered_AnalysisStatus_name = map[int32]string{
 	4: "FINISHED_FAILED",
 	5: "FINISHED_UNSUPPORTED",
 }
+
 var Discovered_AnalysisStatus_value = map[string]int32{
 	"ANALYSIS_STATUS_UNSPECIFIED": 0,
 	"PENDING":                     1,
@@ -91,8 +97,9 @@ var Discovered_AnalysisStatus_value = map[string]int32{
 func (x Discovered_AnalysisStatus) String() string {
 	return proto.EnumName(Discovered_AnalysisStatus_name, int32(x))
 }
+
 func (Discovered_AnalysisStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_discovery_ce3fafdae1720c89, []int{2, 1}
+	return fileDescriptor_6ec5519deb85e465, []int{2, 1}
 }
 
 // A note that indicates a type of analysis a provider would perform. This note
@@ -110,16 +117,17 @@ func (m *Discovery) Reset()         { *m = Discovery{} }
 func (m *Discovery) String() string { return proto.CompactTextString(m) }
 func (*Discovery) ProtoMessage()    {}
 func (*Discovery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_discovery_ce3fafdae1720c89, []int{0}
+	return fileDescriptor_6ec5519deb85e465, []int{0}
 }
+
 func (m *Discovery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Discovery.Unmarshal(m, b)
 }
 func (m *Discovery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Discovery.Marshal(b, m, deterministic)
 }
-func (dst *Discovery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Discovery.Merge(dst, src)
+func (m *Discovery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Discovery.Merge(m, src)
 }
 func (m *Discovery) XXX_Size() int {
 	return xxx_messageInfo_Discovery.Size(m)
@@ -150,16 +158,17 @@ func (m *Details) Reset()         { *m = Details{} }
 func (m *Details) String() string { return proto.CompactTextString(m) }
 func (*Details) ProtoMessage()    {}
 func (*Details) Descriptor() ([]byte, []int) {
-	return fileDescriptor_discovery_ce3fafdae1720c89, []int{1}
+	return fileDescriptor_6ec5519deb85e465, []int{1}
 }
+
 func (m *Details) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Details.Unmarshal(m, b)
 }
 func (m *Details) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Details.Marshal(b, m, deterministic)
 }
-func (dst *Details) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Details.Merge(dst, src)
+func (m *Details) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Details.Merge(m, src)
 }
 func (m *Details) XXX_Size() int {
 	return xxx_messageInfo_Details.Size(m)
@@ -198,16 +207,17 @@ func (m *Discovered) Reset()         { *m = Discovered{} }
 func (m *Discovered) String() string { return proto.CompactTextString(m) }
 func (*Discovered) ProtoMessage()    {}
 func (*Discovered) Descriptor() ([]byte, []int) {
-	return fileDescriptor_discovery_ce3fafdae1720c89, []int{2}
+	return fileDescriptor_6ec5519deb85e465, []int{2}
 }
+
 func (m *Discovered) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Discovered.Unmarshal(m, b)
 }
 func (m *Discovered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Discovered.Marshal(b, m, deterministic)
 }
-func (dst *Discovered) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Discovered.Merge(dst, src)
+func (m *Discovered) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Discovered.Merge(m, src)
 }
 func (m *Discovered) XXX_Size() int {
 	return xxx_messageInfo_Discovered.Size(m)
@@ -247,18 +257,18 @@ func (m *Discovered) GetAnalysisStatusError() *status.Status {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.discovery.Discovered_ContinuousAnalysis", Discovered_ContinuousAnalysis_name, Discovered_ContinuousAnalysis_value)
+	proto.RegisterEnum("grafeas.v1beta1.discovery.Discovered_AnalysisStatus", Discovered_AnalysisStatus_name, Discovered_AnalysisStatus_value)
 	proto.RegisterType((*Discovery)(nil), "grafeas.v1beta1.discovery.Discovery")
 	proto.RegisterType((*Details)(nil), "grafeas.v1beta1.discovery.Details")
 	proto.RegisterType((*Discovered)(nil), "grafeas.v1beta1.discovery.Discovered")
-	proto.RegisterEnum("grafeas.v1beta1.discovery.Discovered_ContinuousAnalysis", Discovered_ContinuousAnalysis_name, Discovered_ContinuousAnalysis_value)
-	proto.RegisterEnum("grafeas.v1beta1.discovery.Discovered_AnalysisStatus", Discovered_AnalysisStatus_name, Discovered_AnalysisStatus_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/discovery/discovery.proto", fileDescriptor_discovery_ce3fafdae1720c89)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/discovery/discovery.proto", fileDescriptor_6ec5519deb85e465)
 }
 
-var fileDescriptor_discovery_ce3fafdae1720c89 = []byte{
+var fileDescriptor_6ec5519deb85e465 = []byte{
 	// 541 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdf, 0x6a, 0xdb, 0x4c,
 	0x10, 0xc5, 0x3f, 0x39, 0xf9, 0x92, 0x76, 0x92, 0x3a, 0x62, 0x9d, 0x52, 0xc7, 0x2d, 0xb8, 0xb8,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go b/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go
index 1e7b53e778..dfac578766 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/grafeas/grafeas.pb.go
@@ -1,27 +1,27 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/grafeas/grafeas.proto
 
-package grafeas // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/grafeas"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import attestation "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/attestation"
-import build "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/build"
-import common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
-import deployment "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/deployment"
-import discovery "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/discovery"
-import image "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/image"
-import _package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
-import provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
-import vulnerability "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/vulnerability"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package grafeas
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	attestation "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/attestation"
+	build "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/build"
+	common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+	deployment "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/deployment"
+	discovery "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/discovery"
+	image "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/image"
+	_package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+	provenance "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
+	vulnerability "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/vulnerability"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -34,7 +34,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An instance of an analysis type that has been found on a resource.
 type Occurrence struct {
@@ -77,16 +77,17 @@ func (m *Occurrence) Reset()         { *m = Occurrence{} }
 func (m *Occurrence) String() string { return proto.CompactTextString(m) }
 func (*Occurrence) ProtoMessage()    {}
 func (*Occurrence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{0}
+	return fileDescriptor_5865e5de1898162a, []int{0}
 }
+
 func (m *Occurrence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Occurrence.Unmarshal(m, b)
 }
 func (m *Occurrence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Occurrence.Marshal(b, m, deterministic)
 }
-func (dst *Occurrence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Occurrence.Merge(dst, src)
+func (m *Occurrence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Occurrence.Merge(m, src)
 }
 func (m *Occurrence) XXX_Size() int {
 	return xxx_messageInfo_Occurrence.Size(m)
@@ -248,9 +249,9 @@ func (m *Occurrence) GetAttestation() *attestation.Details {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Occurrence) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Occurrence_OneofMarshaler, _Occurrence_OneofUnmarshaler, _Occurrence_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Occurrence) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Occurrence_Vulnerability)(nil),
 		(*Occurrence_Build)(nil),
 		(*Occurrence_DerivedImage)(nil),
@@ -261,162 +262,6 @@ func (*Occurrence) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _Occurrence_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Occurrence)
-	// details
-	switch x := m.Details.(type) {
-	case *Occurrence_Vulnerability:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Vulnerability); err != nil {
-			return err
-		}
-	case *Occurrence_Build:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Build); err != nil {
-			return err
-		}
-	case *Occurrence_DerivedImage:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DerivedImage); err != nil {
-			return err
-		}
-	case *Occurrence_Installation:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Installation); err != nil {
-			return err
-		}
-	case *Occurrence_Deployment:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Deployment); err != nil {
-			return err
-		}
-	case *Occurrence_Discovered:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Discovered); err != nil {
-			return err
-		}
-	case *Occurrence_Attestation:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Attestation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Occurrence.Details has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Occurrence_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Occurrence)
-	switch tag {
-	case 8: // details.vulnerability
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(vulnerability.Details)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Vulnerability{msg}
-		return true, err
-	case 9: // details.build
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(build.Details)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Build{msg}
-		return true, err
-	case 10: // details.derived_image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(image.Details)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_DerivedImage{msg}
-		return true, err
-	case 11: // details.installation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_package.Details)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Installation{msg}
-		return true, err
-	case 12: // details.deployment
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(deployment.Details)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Deployment{msg}
-		return true, err
-	case 13: // details.discovered
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(discovery.Details)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Discovered{msg}
-		return true, err
-	case 14: // details.attestation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(attestation.Details)
-		err := b.DecodeMessage(msg)
-		m.Details = &Occurrence_Attestation{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Occurrence_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Occurrence)
-	// details
-	switch x := m.Details.(type) {
-	case *Occurrence_Vulnerability:
-		s := proto.Size(x.Vulnerability)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Build:
-		s := proto.Size(x.Build)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_DerivedImage:
-		s := proto.Size(x.DerivedImage)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Installation:
-		s := proto.Size(x.Installation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Deployment:
-		s := proto.Size(x.Deployment)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Discovered:
-		s := proto.Size(x.Discovered)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Occurrence_Attestation:
-		s := proto.Size(x.Attestation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An entity that can have metadata. For example, a Docker image.
 type Resource struct {
 	// The name of the resource. For example, the name of a Docker image -
@@ -436,16 +281,17 @@ func (m *Resource) Reset()         { *m = Resource{} }
 func (m *Resource) String() string { return proto.CompactTextString(m) }
 func (*Resource) ProtoMessage()    {}
 func (*Resource) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{1}
+	return fileDescriptor_5865e5de1898162a, []int{1}
 }
+
 func (m *Resource) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resource.Unmarshal(m, b)
 }
 func (m *Resource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Resource.Marshal(b, m, deterministic)
 }
-func (dst *Resource) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resource.Merge(dst, src)
+func (m *Resource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resource.Merge(m, src)
 }
 func (m *Resource) XXX_Size() int {
 	return xxx_messageInfo_Resource.Size(m)
@@ -521,16 +367,17 @@ func (m *Note) Reset()         { *m = Note{} }
 func (m *Note) String() string { return proto.CompactTextString(m) }
 func (*Note) ProtoMessage()    {}
 func (*Note) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{2}
+	return fileDescriptor_5865e5de1898162a, []int{2}
 }
+
 func (m *Note) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Note.Unmarshal(m, b)
 }
 func (m *Note) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Note.Marshal(b, m, deterministic)
 }
-func (dst *Note) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Note.Merge(dst, src)
+func (m *Note) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Note.Merge(m, src)
 }
 func (m *Note) XXX_Size() int {
 	return xxx_messageInfo_Note.Size(m)
@@ -706,9 +553,9 @@ func (m *Note) GetAttestationAuthority() *attestation.Authority {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Note) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Note_OneofMarshaler, _Note_OneofUnmarshaler, _Note_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Note) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Note_Vulnerability)(nil),
 		(*Note_Build)(nil),
 		(*Note_BaseImage)(nil),
@@ -719,162 +566,6 @@ func (*Note) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, f
 	}
 }
 
-func _Note_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Note)
-	// type
-	switch x := m.Type.(type) {
-	case *Note_Vulnerability:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Vulnerability); err != nil {
-			return err
-		}
-	case *Note_Build:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Build); err != nil {
-			return err
-		}
-	case *Note_BaseImage:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BaseImage); err != nil {
-			return err
-		}
-	case *Note_Package:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Package); err != nil {
-			return err
-		}
-	case *Note_Deployable:
-		b.EncodeVarint(14<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Deployable); err != nil {
-			return err
-		}
-	case *Note_Discovery:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Discovery); err != nil {
-			return err
-		}
-	case *Note_AttestationAuthority:
-		b.EncodeVarint(16<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AttestationAuthority); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Note.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Note_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Note)
-	switch tag {
-	case 10: // type.vulnerability
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(vulnerability.Vulnerability)
-		err := b.DecodeMessage(msg)
-		m.Type = &Note_Vulnerability{msg}
-		return true, err
-	case 11: // type.build
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(build.Build)
-		err := b.DecodeMessage(msg)
-		m.Type = &Note_Build{msg}
-		return true, err
-	case 12: // type.base_image
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(image.Basis)
-		err := b.DecodeMessage(msg)
-		m.Type = &Note_BaseImage{msg}
-		return true, err
-	case 13: // type.package
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_package.Package)
-		err := b.DecodeMessage(msg)
-		m.Type = &Note_Package{msg}
-		return true, err
-	case 14: // type.deployable
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(deployment.Deployable)
-		err := b.DecodeMessage(msg)
-		m.Type = &Note_Deployable{msg}
-		return true, err
-	case 15: // type.discovery
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(discovery.Discovery)
-		err := b.DecodeMessage(msg)
-		m.Type = &Note_Discovery{msg}
-		return true, err
-	case 16: // type.attestation_authority
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(attestation.Authority)
-		err := b.DecodeMessage(msg)
-		m.Type = &Note_AttestationAuthority{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Note_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Note)
-	// type
-	switch x := m.Type.(type) {
-	case *Note_Vulnerability:
-		s := proto.Size(x.Vulnerability)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_Build:
-		s := proto.Size(x.Build)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_BaseImage:
-		s := proto.Size(x.BaseImage)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_Package:
-		s := proto.Size(x.Package)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_Deployable:
-		s := proto.Size(x.Deployable)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_Discovery:
-		s := proto.Size(x.Discovery)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Note_AttestationAuthority:
-		s := proto.Size(x.AttestationAuthority)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request to get an occurrence.
 type GetOccurrenceRequest struct {
 	// The name of the occurrence in the form of
@@ -889,16 +580,17 @@ func (m *GetOccurrenceRequest) Reset()         { *m = GetOccurrenceRequest{} }
 func (m *GetOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOccurrenceRequest) ProtoMessage()    {}
 func (*GetOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{3}
+	return fileDescriptor_5865e5de1898162a, []int{3}
 }
+
 func (m *GetOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *GetOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOccurrenceRequest.Merge(dst, src)
+func (m *GetOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOccurrenceRequest.Merge(m, src)
 }
 func (m *GetOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOccurrenceRequest.Size(m)
@@ -936,16 +628,17 @@ func (m *ListOccurrencesRequest) Reset()         { *m = ListOccurrencesRequest{}
 func (m *ListOccurrencesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListOccurrencesRequest) ProtoMessage()    {}
 func (*ListOccurrencesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{4}
+	return fileDescriptor_5865e5de1898162a, []int{4}
 }
+
 func (m *ListOccurrencesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOccurrencesRequest.Unmarshal(m, b)
 }
 func (m *ListOccurrencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOccurrencesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListOccurrencesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOccurrencesRequest.Merge(dst, src)
+func (m *ListOccurrencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOccurrencesRequest.Merge(m, src)
 }
 func (m *ListOccurrencesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListOccurrencesRequest.Size(m)
@@ -1001,16 +694,17 @@ func (m *ListOccurrencesResponse) Reset()         { *m = ListOccurrencesResponse
 func (m *ListOccurrencesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListOccurrencesResponse) ProtoMessage()    {}
 func (*ListOccurrencesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{5}
+	return fileDescriptor_5865e5de1898162a, []int{5}
 }
+
 func (m *ListOccurrencesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOccurrencesResponse.Unmarshal(m, b)
 }
 func (m *ListOccurrencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOccurrencesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListOccurrencesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOccurrencesResponse.Merge(dst, src)
+func (m *ListOccurrencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOccurrencesResponse.Merge(m, src)
 }
 func (m *ListOccurrencesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListOccurrencesResponse.Size(m)
@@ -1049,16 +743,17 @@ func (m *DeleteOccurrenceRequest) Reset()         { *m = DeleteOccurrenceRequest
 func (m *DeleteOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteOccurrenceRequest) ProtoMessage()    {}
 func (*DeleteOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{6}
+	return fileDescriptor_5865e5de1898162a, []int{6}
 }
+
 func (m *DeleteOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *DeleteOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteOccurrenceRequest.Merge(dst, src)
+func (m *DeleteOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteOccurrenceRequest.Merge(m, src)
 }
 func (m *DeleteOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteOccurrenceRequest.Size(m)
@@ -1092,16 +787,17 @@ func (m *CreateOccurrenceRequest) Reset()         { *m = CreateOccurrenceRequest
 func (m *CreateOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateOccurrenceRequest) ProtoMessage()    {}
 func (*CreateOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{7}
+	return fileDescriptor_5865e5de1898162a, []int{7}
 }
+
 func (m *CreateOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *CreateOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateOccurrenceRequest.Merge(dst, src)
+func (m *CreateOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateOccurrenceRequest.Merge(m, src)
 }
 func (m *CreateOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateOccurrenceRequest.Size(m)
@@ -1144,16 +840,17 @@ func (m *UpdateOccurrenceRequest) Reset()         { *m = UpdateOccurrenceRequest
 func (m *UpdateOccurrenceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateOccurrenceRequest) ProtoMessage()    {}
 func (*UpdateOccurrenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{8}
+	return fileDescriptor_5865e5de1898162a, []int{8}
 }
+
 func (m *UpdateOccurrenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateOccurrenceRequest.Unmarshal(m, b)
 }
 func (m *UpdateOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateOccurrenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateOccurrenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateOccurrenceRequest.Merge(dst, src)
+func (m *UpdateOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateOccurrenceRequest.Merge(m, src)
 }
 func (m *UpdateOccurrenceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateOccurrenceRequest.Size(m)
@@ -1199,16 +896,17 @@ func (m *GetNoteRequest) Reset()         { *m = GetNoteRequest{} }
 func (m *GetNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*GetNoteRequest) ProtoMessage()    {}
 func (*GetNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{9}
+	return fileDescriptor_5865e5de1898162a, []int{9}
 }
+
 func (m *GetNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNoteRequest.Unmarshal(m, b)
 }
 func (m *GetNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNoteRequest.Merge(dst, src)
+func (m *GetNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNoteRequest.Merge(m, src)
 }
 func (m *GetNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNoteRequest.Size(m)
@@ -1240,16 +938,17 @@ func (m *GetOccurrenceNoteRequest) Reset()         { *m = GetOccurrenceNoteReque
 func (m *GetOccurrenceNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOccurrenceNoteRequest) ProtoMessage()    {}
 func (*GetOccurrenceNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{10}
+	return fileDescriptor_5865e5de1898162a, []int{10}
 }
+
 func (m *GetOccurrenceNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOccurrenceNoteRequest.Unmarshal(m, b)
 }
 func (m *GetOccurrenceNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOccurrenceNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOccurrenceNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOccurrenceNoteRequest.Merge(dst, src)
+func (m *GetOccurrenceNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOccurrenceNoteRequest.Merge(m, src)
 }
 func (m *GetOccurrenceNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOccurrenceNoteRequest.Size(m)
@@ -1287,16 +986,17 @@ func (m *ListNotesRequest) Reset()         { *m = ListNotesRequest{} }
 func (m *ListNotesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNotesRequest) ProtoMessage()    {}
 func (*ListNotesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{11}
+	return fileDescriptor_5865e5de1898162a, []int{11}
 }
+
 func (m *ListNotesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotesRequest.Unmarshal(m, b)
 }
 func (m *ListNotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNotesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotesRequest.Merge(dst, src)
+func (m *ListNotesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotesRequest.Merge(m, src)
 }
 func (m *ListNotesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNotesRequest.Size(m)
@@ -1352,16 +1052,17 @@ func (m *ListNotesResponse) Reset()         { *m = ListNotesResponse{} }
 func (m *ListNotesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNotesResponse) ProtoMessage()    {}
 func (*ListNotesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{12}
+	return fileDescriptor_5865e5de1898162a, []int{12}
 }
+
 func (m *ListNotesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotesResponse.Unmarshal(m, b)
 }
 func (m *ListNotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNotesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotesResponse.Merge(dst, src)
+func (m *ListNotesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotesResponse.Merge(m, src)
 }
 func (m *ListNotesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNotesResponse.Size(m)
@@ -1400,16 +1101,17 @@ func (m *DeleteNoteRequest) Reset()         { *m = DeleteNoteRequest{} }
 func (m *DeleteNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteNoteRequest) ProtoMessage()    {}
 func (*DeleteNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{13}
+	return fileDescriptor_5865e5de1898162a, []int{13}
 }
+
 func (m *DeleteNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteNoteRequest.Unmarshal(m, b)
 }
 func (m *DeleteNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteNoteRequest.Merge(dst, src)
+func (m *DeleteNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNoteRequest.Merge(m, src)
 }
 func (m *DeleteNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteNoteRequest.Size(m)
@@ -1445,16 +1147,17 @@ func (m *CreateNoteRequest) Reset()         { *m = CreateNoteRequest{} }
 func (m *CreateNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateNoteRequest) ProtoMessage()    {}
 func (*CreateNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{14}
+	return fileDescriptor_5865e5de1898162a, []int{14}
 }
+
 func (m *CreateNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateNoteRequest.Unmarshal(m, b)
 }
 func (m *CreateNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateNoteRequest.Merge(dst, src)
+func (m *CreateNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNoteRequest.Merge(m, src)
 }
 func (m *CreateNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateNoteRequest.Size(m)
@@ -1504,16 +1207,17 @@ func (m *UpdateNoteRequest) Reset()         { *m = UpdateNoteRequest{} }
 func (m *UpdateNoteRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateNoteRequest) ProtoMessage()    {}
 func (*UpdateNoteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{15}
+	return fileDescriptor_5865e5de1898162a, []int{15}
 }
+
 func (m *UpdateNoteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateNoteRequest.Unmarshal(m, b)
 }
 func (m *UpdateNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateNoteRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateNoteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateNoteRequest.Merge(dst, src)
+func (m *UpdateNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNoteRequest.Merge(m, src)
 }
 func (m *UpdateNoteRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateNoteRequest.Size(m)
@@ -1565,16 +1269,17 @@ func (m *ListNoteOccurrencesRequest) Reset()         { *m = ListNoteOccurrencesR
 func (m *ListNoteOccurrencesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNoteOccurrencesRequest) ProtoMessage()    {}
 func (*ListNoteOccurrencesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{16}
+	return fileDescriptor_5865e5de1898162a, []int{16}
 }
+
 func (m *ListNoteOccurrencesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNoteOccurrencesRequest.Unmarshal(m, b)
 }
 func (m *ListNoteOccurrencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNoteOccurrencesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNoteOccurrencesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNoteOccurrencesRequest.Merge(dst, src)
+func (m *ListNoteOccurrencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNoteOccurrencesRequest.Merge(m, src)
 }
 func (m *ListNoteOccurrencesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNoteOccurrencesRequest.Size(m)
@@ -1628,16 +1333,17 @@ func (m *ListNoteOccurrencesResponse) Reset()         { *m = ListNoteOccurrences
 func (m *ListNoteOccurrencesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNoteOccurrencesResponse) ProtoMessage()    {}
 func (*ListNoteOccurrencesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{17}
+	return fileDescriptor_5865e5de1898162a, []int{17}
 }
+
 func (m *ListNoteOccurrencesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNoteOccurrencesResponse.Unmarshal(m, b)
 }
 func (m *ListNoteOccurrencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNoteOccurrencesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNoteOccurrencesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNoteOccurrencesResponse.Merge(dst, src)
+func (m *ListNoteOccurrencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNoteOccurrencesResponse.Merge(m, src)
 }
 func (m *ListNoteOccurrencesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNoteOccurrencesResponse.Size(m)
@@ -1678,16 +1384,17 @@ func (m *BatchCreateNotesRequest) Reset()         { *m = BatchCreateNotesRequest
 func (m *BatchCreateNotesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateNotesRequest) ProtoMessage()    {}
 func (*BatchCreateNotesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{18}
+	return fileDescriptor_5865e5de1898162a, []int{18}
 }
+
 func (m *BatchCreateNotesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateNotesRequest.Unmarshal(m, b)
 }
 func (m *BatchCreateNotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateNotesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateNotesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateNotesRequest.Merge(dst, src)
+func (m *BatchCreateNotesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateNotesRequest.Merge(m, src)
 }
 func (m *BatchCreateNotesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateNotesRequest.Size(m)
@@ -1725,16 +1432,17 @@ func (m *BatchCreateNotesResponse) Reset()         { *m = BatchCreateNotesRespon
 func (m *BatchCreateNotesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateNotesResponse) ProtoMessage()    {}
 func (*BatchCreateNotesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{19}
+	return fileDescriptor_5865e5de1898162a, []int{19}
 }
+
 func (m *BatchCreateNotesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateNotesResponse.Unmarshal(m, b)
 }
 func (m *BatchCreateNotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateNotesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateNotesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateNotesResponse.Merge(dst, src)
+func (m *BatchCreateNotesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateNotesResponse.Merge(m, src)
 }
 func (m *BatchCreateNotesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateNotesResponse.Size(m)
@@ -1768,16 +1476,17 @@ func (m *BatchCreateOccurrencesRequest) Reset()         { *m = BatchCreateOccurr
 func (m *BatchCreateOccurrencesRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateOccurrencesRequest) ProtoMessage()    {}
 func (*BatchCreateOccurrencesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{20}
+	return fileDescriptor_5865e5de1898162a, []int{20}
 }
+
 func (m *BatchCreateOccurrencesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateOccurrencesRequest.Unmarshal(m, b)
 }
 func (m *BatchCreateOccurrencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateOccurrencesRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateOccurrencesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateOccurrencesRequest.Merge(dst, src)
+func (m *BatchCreateOccurrencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateOccurrencesRequest.Merge(m, src)
 }
 func (m *BatchCreateOccurrencesRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateOccurrencesRequest.Size(m)
@@ -1815,16 +1524,17 @@ func (m *BatchCreateOccurrencesResponse) Reset()         { *m = BatchCreateOccur
 func (m *BatchCreateOccurrencesResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateOccurrencesResponse) ProtoMessage()    {}
 func (*BatchCreateOccurrencesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{21}
+	return fileDescriptor_5865e5de1898162a, []int{21}
 }
+
 func (m *BatchCreateOccurrencesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateOccurrencesResponse.Unmarshal(m, b)
 }
 func (m *BatchCreateOccurrencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateOccurrencesResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateOccurrencesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateOccurrencesResponse.Merge(dst, src)
+func (m *BatchCreateOccurrencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateOccurrencesResponse.Merge(m, src)
 }
 func (m *BatchCreateOccurrencesResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateOccurrencesResponse.Size(m)
@@ -1860,16 +1570,17 @@ func (m *GetVulnerabilityOccurrencesSummaryRequest) Reset() {
 func (m *GetVulnerabilityOccurrencesSummaryRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVulnerabilityOccurrencesSummaryRequest) ProtoMessage()    {}
 func (*GetVulnerabilityOccurrencesSummaryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{22}
+	return fileDescriptor_5865e5de1898162a, []int{22}
 }
+
 func (m *GetVulnerabilityOccurrencesSummaryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVulnerabilityOccurrencesSummaryRequest.Unmarshal(m, b)
 }
 func (m *GetVulnerabilityOccurrencesSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVulnerabilityOccurrencesSummaryRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVulnerabilityOccurrencesSummaryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVulnerabilityOccurrencesSummaryRequest.Merge(dst, src)
+func (m *GetVulnerabilityOccurrencesSummaryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVulnerabilityOccurrencesSummaryRequest.Merge(m, src)
 }
 func (m *GetVulnerabilityOccurrencesSummaryRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVulnerabilityOccurrencesSummaryRequest.Size(m)
@@ -1908,16 +1619,17 @@ func (m *VulnerabilityOccurrencesSummary) Reset()         { *m = VulnerabilityOc
 func (m *VulnerabilityOccurrencesSummary) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityOccurrencesSummary) ProtoMessage()    {}
 func (*VulnerabilityOccurrencesSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{23}
+	return fileDescriptor_5865e5de1898162a, []int{23}
 }
+
 func (m *VulnerabilityOccurrencesSummary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityOccurrencesSummary.Unmarshal(m, b)
 }
 func (m *VulnerabilityOccurrencesSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityOccurrencesSummary.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityOccurrencesSummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityOccurrencesSummary.Merge(dst, src)
+func (m *VulnerabilityOccurrencesSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityOccurrencesSummary.Merge(m, src)
 }
 func (m *VulnerabilityOccurrencesSummary) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityOccurrencesSummary.Size(m)
@@ -1959,16 +1671,17 @@ func (m *VulnerabilityOccurrencesSummary_FixableTotalByDigest) String() string {
 }
 func (*VulnerabilityOccurrencesSummary_FixableTotalByDigest) ProtoMessage() {}
 func (*VulnerabilityOccurrencesSummary_FixableTotalByDigest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_grafeas_0102e4ff7bfb77b0, []int{23, 0}
+	return fileDescriptor_5865e5de1898162a, []int{23, 0}
 }
+
 func (m *VulnerabilityOccurrencesSummary_FixableTotalByDigest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityOccurrencesSummary_FixableTotalByDigest.Unmarshal(m, b)
 }
 func (m *VulnerabilityOccurrencesSummary_FixableTotalByDigest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityOccurrencesSummary_FixableTotalByDigest.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityOccurrencesSummary_FixableTotalByDigest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityOccurrencesSummary_FixableTotalByDigest.Merge(dst, src)
+func (m *VulnerabilityOccurrencesSummary_FixableTotalByDigest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityOccurrencesSummary_FixableTotalByDigest.Merge(m, src)
 }
 func (m *VulnerabilityOccurrencesSummary_FixableTotalByDigest) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityOccurrencesSummary_FixableTotalByDigest.Size(m)
@@ -2036,6 +1749,134 @@ func init() {
 	proto.RegisterType((*VulnerabilityOccurrencesSummary_FixableTotalByDigest)(nil), "grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/grafeas/grafeas.proto", fileDescriptor_5865e5de1898162a)
+}
+
+var fileDescriptor_5865e5de1898162a = []byte{
+	// 1920 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0x1b, 0xc7,
+	0x15, 0xf7, 0x52, 0x9f, 0x7c, 0xd4, 0x07, 0x35, 0x75, 0xac, 0x2d, 0x9d, 0xc4, 0xec, 0xc6, 0x75,
+	0x24, 0xda, 0x21, 0x6d, 0x39, 0x35, 0x1a, 0xd9, 0x82, 0x11, 0x4a, 0xb2, 0x64, 0xa4, 0x75, 0x8c,
+	0xb5, 0x12, 0x14, 0x2d, 0x02, 0x62, 0xc8, 0x1d, 0x51, 0x5b, 0x2d, 0x77, 0xb7, 0xbb, 0x43, 0xc2,
+	0x4c, 0x91, 0xa0, 0x28, 0xdc, 0xde, 0x8a, 0x1e, 0x0a, 0xb4, 0xf7, 0x5c, 0xda, 0x3f, 0xa1, 0xe8,
+	0xb1, 0xe7, 0xf6, 0xd4, 0x4b, 0x8b, 0x5e, 0xfb, 0x87, 0x14, 0xf3, 0xb1, 0xdc, 0x21, 0x77, 0x97,
+	0x5c, 0xc6, 0xfd, 0xb8, 0x88, 0xb3, 0xb3, 0xef, 0xfd, 0xe6, 0xcd, 0x9b, 0xf7, 0xfb, 0xcd, 0x23,
+	0x05, 0x8f, 0xbb, 0x9e, 0xd7, 0x75, 0x48, 0xc3, 0x22, 0x03, 0xea, 0x79, 0x4e, 0xd8, 0xe8, 0x78,
+	0x2e, 0xc5, 0xb6, 0x4b, 0x02, 0xec, 0x62, 0x67, 0x18, 0xda, 0x61, 0x63, 0x70, 0xaf, 0x4d, 0x28,
+	0xbe, 0xd7, 0xe8, 0x06, 0xf8, 0x9c, 0xe0, 0x30, 0xfa, 0xac, 0xfb, 0x81, 0x47, 0x3d, 0xb4, 0x19,
+	0x3d, 0x4a, 0xb3, 0xca, 0x9b, 0x12, 0x11, 0xfb, 0x76, 0x03, 0xbb, 0xae, 0x47, 0x31, 0xb5, 0x3d,
+	0x57, 0x9a, 0x57, 0x4e, 0xf2, 0xaf, 0x87, 0x29, 0x25, 0xa1, 0xf0, 0x56, 0xc7, 0x12, 0xe8, 0x61,
+	0x7e, 0xa0, 0x76, 0xdf, 0x76, 0x2c, 0xf1, 0x57, 0x3a, 0x1f, 0xe4, 0x77, 0xee, 0x78, 0xbd, 0x9e,
+	0xe7, 0xca, 0x0f, 0xe9, 0x7e, 0x9c, 0xdf, 0xdd, 0x22, 0xbe, 0xe3, 0x0d, 0x7b, 0xc4, 0xa5, 0xca,
+	0x50, 0xc2, 0x1c, 0xce, 0x01, 0x63, 0x87, 0x1d, 0x6f, 0x40, 0x82, 0x61, 0x3c, 0x9a, 0x3f, 0x0f,
+	0x76, 0x0f, 0x77, 0x89, 0xf8, 0x2b, 0x9d, 0xe7, 0x38, 0x7d, 0x1f, 0x77, 0x2e, 0x99, 0xbb, 0xfc,
+	0x9c, 0x3f, 0x13, 0x7e, 0xe0, 0x0d, 0x88, 0x8b, 0xdd, 0x0e, 0x51, 0x86, 0x12, 0xe6, 0xa3, 0xfc,
+	0x30, 0x83, 0xbe, 0xc3, 0xa6, 0xdb, 0xb6, 0x63, 0xd3, 0xe1, 0xf8, 0x93, 0x04, 0xbb, 0x2e, 0xc1,
+	0xf8, 0x53, 0xbb, 0x7f, 0xde, 0x20, 0x3d, 0x7f, 0xf4, 0xb2, 0x3a, 0xf9, 0xf2, 0xdc, 0x26, 0x8e,
+	0xd5, 0xea, 0xe1, 0xf0, 0x52, 0x5a, 0xdc, 0x98, 0xb4, 0xa0, 0x76, 0x8f, 0xd5, 0x5e, 0xcf, 0x17,
+	0x06, 0xc6, 0x1f, 0x97, 0x01, 0x3e, 0xee, 0x74, 0xfa, 0x41, 0x40, 0xdc, 0x0e, 0x41, 0x08, 0x16,
+	0x5d, 0xdc, 0x23, 0xba, 0x56, 0xd5, 0x76, 0x8a, 0x26, 0x1f, 0xa3, 0xef, 0xc0, 0x6a, 0x40, 0x42,
+	0xaf, 0x1f, 0x74, 0x88, 0x5e, 0xa8, 0x6a, 0x3b, 0xa5, 0xbd, 0x6f, 0xd6, 0x27, 0x78, 0x52, 0x37,
+	0xa5, 0x81, 0x39, 0x32, 0x45, 0xd7, 0xa1, 0xe8, 0x7a, 0x94, 0xb4, 0x38, 0xde, 0x02, 0xc7, 0x5b,
+	0x65, 0x13, 0xcf, 0x18, 0xe6, 0x7b, 0xb0, 0x78, 0x69, 0xbb, 0x96, 0xbe, 0x58, 0xd5, 0x76, 0x36,
+	0x52, 0xf0, 0x9e, 0x79, 0x94, 0x7c, 0x64, 0xbb, 0x96, 0xc9, 0xcd, 0x50, 0x15, 0x4a, 0x01, 0xe9,
+	0x11, 0xcb, 0xe6, 0xa4, 0xd1, 0x97, 0x38, 0x9a, 0x3a, 0x85, 0x1e, 0x42, 0xa9, 0x13, 0x10, 0x4c,
+	0x49, 0x8b, 0xed, 0x50, 0x5f, 0xe6, 0x71, 0x56, 0xea, 0x62, 0xfb, 0xf5, 0x68, 0xfb, 0xf5, 0xb3,
+	0x68, 0xfb, 0x26, 0x08, 0x73, 0x36, 0xc1, 0x9c, 0xfb, 0xbe, 0x35, 0x72, 0x5e, 0x99, 0xed, 0x2c,
+	0xcc, 0xb9, 0xf3, 0x33, 0x58, 0x1f, 0x3b, 0x38, 0x7d, 0x95, 0xbb, 0xdf, 0x4a, 0xec, 0x69, 0xfc,
+	0x78, 0x8f, 0x08, 0xc5, 0xb6, 0x13, 0x9e, 0x5e, 0x31, 0xc7, 0xdd, 0xd1, 0x03, 0x58, 0xe2, 0xec,
+	0xd6, 0x8b, 0x1c, 0xe7, 0xed, 0x04, 0x8e, 0xe0, 0x7e, 0xec, 0x2f, 0xcc, 0xd1, 0x31, 0xac, 0x5b,
+	0x24, 0xb0, 0x07, 0xc4, 0x6a, 0x71, 0x56, 0xe8, 0x90, 0xe1, 0x2f, 0x38, 0x13, 0xfb, 0xaf, 0x49,
+	0xb7, 0xa7, 0x6c, 0x1e, 0x3d, 0x81, 0x35, 0xdb, 0x0d, 0x29, 0x76, 0x1c, 0x91, 0xeb, 0x12, 0x47,
+	0xa9, 0x26, 0x50, 0x22, 0xea, 0x28, 0x38, 0xaa, 0x1f, 0x3a, 0x06, 0x88, 0x35, 0x42, 0x5f, 0xe3,
+	0x28, 0xef, 0x24, 0x50, 0x14, 0x19, 0x89, 0x81, 0x14, 0x47, 0x74, 0x04, 0x10, 0x89, 0x04, 0xb1,
+	0xf4, 0x75, 0x0e, 0x63, 0x24, 0x61, 0x46, 0x3a, 0xa2, 0xa2, 0x8c, 0xfc, 0xd0, 0x29, 0x94, 0x14,
+	0xd1, 0xd5, 0x37, 0x38, 0xcc, 0xcd, 0x04, 0x8c, 0x2a, 0xcc, 0x31, 0x90, 0xea, 0xda, 0x2c, 0xc2,
+	0x8a, 0x25, 0xde, 0x18, 0x7d, 0x58, 0x8d, 0xca, 0x3e, 0x95, 0x37, 0x65, 0x58, 0xe8, 0x07, 0x36,
+	0xa7, 0x4c, 0xd1, 0x64, 0x43, 0x74, 0x08, 0x6b, 0x4c, 0x0b, 0x88, 0x4b, 0x5b, 0x17, 0x38, 0xbc,
+	0xe0, 0xac, 0x48, 0xcd, 0x6d, 0x2c, 0x29, 0xa7, 0x38, 0xbc, 0x30, 0x4b, 0xd2, 0x8b, 0x3d, 0x18,
+	0x7f, 0x59, 0x81, 0x45, 0x46, 0x8f, 0xd4, 0x35, 0x6f, 0xc3, 0x56, 0x78, 0xe1, 0x05, 0xb4, 0x65,
+	0x91, 0xb0, 0x13, 0xd8, 0x3e, 0xdf, 0xae, 0x88, 0xa0, 0xcc, 0x5f, 0x1c, 0xc5, 0xf3, 0x68, 0x17,
+	0xca, 0x8e, 0xe7, 0x76, 0xc7, 0x6c, 0x05, 0x51, 0x37, 0xd9, 0xbc, 0x6a, 0x3a, 0x27, 0x5f, 0x1f,
+	0x31, 0xbe, 0x3a, 0x98, 0x12, 0xab, 0xd5, 0x0f, 0x1c, 0x7d, 0xa9, 0xba, 0xb0, 0x53, 0xda, 0xbb,
+	0x9e, 0xa2, 0x1a, 0xdc, 0xe6, 0x93, 0xc0, 0x31, 0x21, 0x18, 0x8d, 0xd1, 0x21, 0x6c, 0x92, 0x97,
+	0xbe, 0x1d, 0xf0, 0x8c, 0xe7, 0xe5, 0xf3, 0x46, 0xec, 0x12, 0x71, 0x5a, 0x15, 0x84, 0x95, 0xd7,
+	0x11, 0x84, 0xd5, 0xb9, 0x04, 0xe1, 0x0e, 0xa0, 0x68, 0xf3, 0x23, 0x01, 0x0c, 0xf5, 0x62, 0x75,
+	0x81, 0x1d, 0x82, 0x7c, 0xf3, 0x4c, 0x0a, 0x61, 0x88, 0xce, 0x26, 0xe5, 0x43, 0xd0, 0xf6, 0xce,
+	0x0c, 0xf9, 0xf8, 0x54, 0x7d, 0x4a, 0x8a, 0xc8, 0xfb, 0x91, 0x88, 0x08, 0xfa, 0xbe, 0x99, 0x21,
+	0x22, 0x4d, 0xf6, 0x37, 0x96, 0x90, 0x03, 0x80, 0x36, 0x0e, 0x89, 0xd4, 0x8f, 0xb5, 0x0c, 0x57,
+	0xa1, 0x1f, 0x4d, 0x1c, 0xda, 0x8c, 0x1d, 0x45, 0xe6, 0x21, 0xa4, 0xe3, 0x11, 0xac, 0x48, 0x55,
+	0x90, 0x44, 0xcd, 0x56, 0x8d, 0xe7, 0xe2, 0xf3, 0xf4, 0x8a, 0x19, 0xb9, 0xa0, 0xd3, 0x48, 0x30,
+	0x70, 0xdb, 0x21, 0x92, 0xa2, 0xb7, 0xa6, 0x0b, 0x46, 0x64, 0x1d, 0x6b, 0x06, 0x7b, 0x42, 0x47,
+	0x50, 0x1c, 0x09, 0x82, 0xbe, 0x99, 0xc1, 0x75, 0x45, 0x32, 0xa2, 0x11, 0xdb, 0xcd, 0x68, 0x1a,
+	0x7d, 0x06, 0x6f, 0x28, 0xc4, 0x6f, 0xe1, 0x3e, 0xbd, 0xf0, 0x02, 0x76, 0x40, 0xe5, 0x8c, 0xd0,
+	0x54, 0xf5, 0xf8, 0x30, 0xb2, 0x3e, 0xbd, 0x62, 0x5e, 0x55, 0x5e, 0x8c, 0xe6, 0x9b, 0xcb, 0xb0,
+	0x48, 0x87, 0x3e, 0x31, 0x6a, 0x70, 0xf5, 0x84, 0xd0, 0xf8, 0x0a, 0x36, 0xc9, 0x4f, 0xfa, 0x24,
+	0xa4, 0x69, 0xec, 0x36, 0x5e, 0x69, 0x70, 0xed, 0x7b, 0x76, 0xa8, 0x58, 0x87, 0x91, 0xf9, 0x35,
+	0x58, 0xf6, 0x71, 0xc0, 0xa4, 0x56, 0x38, 0xc8, 0x27, 0x36, 0x7f, 0x6e, 0x3b, 0x94, 0x04, 0x52,
+	0x05, 0xe4, 0x13, 0xbb, 0x9d, 0x7d, 0xdc, 0x25, 0xad, 0xd0, 0xfe, 0x5c, 0xdc, 0xce, 0x4b, 0xe6,
+	0x2a, 0x9b, 0x78, 0x61, 0x7f, 0x4e, 0xd0, 0x5b, 0x00, 0xfc, 0x25, 0xf5, 0x2e, 0x89, 0xcb, 0x39,
+	0x5f, 0x34, 0xb9, 0xf9, 0x19, 0x9b, 0x30, 0x7e, 0xa6, 0xc1, 0x76, 0x22, 0x8c, 0xd0, 0xf7, 0xdc,
+	0x90, 0xa0, 0x03, 0x28, 0x79, 0xf1, 0xb4, 0xae, 0x65, 0x30, 0x5f, 0xd9, 0xaf, 0x6a, 0x8f, 0x6e,
+	0xc1, 0xa6, 0x4b, 0x5e, 0xd2, 0x96, 0xb2, 0xbc, 0x88, 0x7b, 0x9d, 0x4d, 0x3f, 0x1f, 0x85, 0xf0,
+	0x1e, 0x6c, 0x1f, 0x11, 0x87, 0x50, 0x92, 0x2f, 0x71, 0x2e, 0x6c, 0x1f, 0x72, 0x76, 0x27, 0xcd,
+	0xb3, 0x12, 0xf7, 0x10, 0x20, 0x0e, 0x4c, 0xf6, 0x3d, 0x53, 0xf7, 0xa1, 0x98, 0x1b, 0xbf, 0xd7,
+	0x60, 0xfb, 0x13, 0xae, 0x08, 0xb9, 0xe2, 0x7b, 0xad, 0xc5, 0x14, 0xb1, 0x62, 0x8d, 0x9f, 0xbc,
+	0x54, 0x92, 0x62, 0xf5, 0x84, 0xf5, 0x86, 0xdf, 0xc7, 0xe1, 0x65, 0x24, 0x56, 0x6c, 0x6c, 0xdc,
+	0x84, 0x8d, 0x13, 0x42, 0x99, 0x1c, 0x4d, 0xcb, 0x5f, 0x1d, 0xf4, 0xb1, 0x22, 0x9d, 0x65, 0xff,
+	0x25, 0x94, 0x59, 0x81, 0x30, 0xb3, 0xff, 0x4b, 0x85, 0x5e, 0xc0, 0x96, 0xb2, 0xbe, 0x2c, 0xcd,
+	0xdb, 0xb0, 0xc4, 0xf4, 0x38, 0x2a, 0xca, 0x37, 0x52, 0x2f, 0x31, 0x53, 0xd8, 0xe4, 0x2e, 0xc4,
+	0x77, 0x61, 0x4b, 0x14, 0xe2, 0xac, 0x94, 0x78, 0xb0, 0x25, 0x4a, 0x50, 0x35, 0xcc, 0xca, 0xc9,
+	0x36, 0xac, 0xf0, 0xab, 0xc3, 0xb6, 0xa2, 0xa4, 0xb0, 0xc7, 0xa7, 0x16, 0xda, 0x85, 0x45, 0x36,
+	0x92, 0x87, 0x9c, 0xb1, 0x05, 0x6e, 0x62, 0xfc, 0x5a, 0x83, 0x2d, 0x51, 0x83, 0x33, 0x42, 0x1b,
+	0x81, 0x16, 0x66, 0x82, 0xbe, 0x5e, 0xad, 0xbd, 0xd2, 0xa0, 0x12, 0x1d, 0x4b, 0x8a, 0x84, 0xa5,
+	0x85, 0xf6, 0xdf, 0x28, 0x8e, 0x57, 0x1a, 0x5c, 0x4f, 0x0d, 0xe3, 0x7f, 0x2b, 0x61, 0x7f, 0xd5,
+	0x60, 0xbb, 0x89, 0x69, 0xe7, 0x22, 0x2e, 0x8b, 0x99, 0x5c, 0x79, 0x1a, 0x95, 0x70, 0x81, 0x07,
+	0x75, 0x3f, 0x11, 0x54, 0x06, 0x20, 0x3f, 0xc2, 0xf0, 0xd8, 0xa5, 0xc1, 0x50, 0x16, 0x78, 0xe5,
+	0x63, 0x80, 0x78, 0x92, 0xf5, 0xaa, 0x97, 0x64, 0x28, 0x57, 0x63, 0x43, 0xc6, 0x96, 0x01, 0x76,
+	0xfa, 0x33, 0xaa, 0x42, 0xd8, 0xec, 0x17, 0xbe, 0xab, 0x19, 0x27, 0xa0, 0x27, 0x57, 0xff, 0x1a,
+	0xd4, 0x33, 0x06, 0xf0, 0x96, 0x02, 0x34, 0xc7, 0x5d, 0x37, 0x71, 0x70, 0x85, 0xf9, 0x0e, 0xce,
+	0x68, 0xc1, 0xdb, 0x59, 0xeb, 0xfe, 0x47, 0x2a, 0xc3, 0xf8, 0x11, 0xec, 0x9e, 0x10, 0x3a, 0xd6,
+	0xb9, 0x29, 0xab, 0xbc, 0xe8, 0xf7, 0x7a, 0x38, 0x18, 0x7e, 0x4d, 0xb9, 0x34, 0xfe, 0x59, 0x80,
+	0x1b, 0x33, 0xa0, 0xd1, 0x67, 0xb0, 0xdc, 0xf1, 0xfa, 0x2e, 0x8d, 0x42, 0x3f, 0x4e, 0x84, 0x3e,
+	0x03, 0xa1, 0xfe, 0xc4, 0x7e, 0xc9, 0x5a, 0xac, 0x33, 0x8f, 0x62, 0xa7, 0x39, 0x3c, 0xb2, 0xbb,
+	0x24, 0xa4, 0xa6, 0x04, 0xad, 0xfc, 0x5d, 0x83, 0xab, 0x69, 0x06, 0x63, 0xbf, 0x20, 0x68, 0xf9,
+	0x7f, 0x41, 0x38, 0x84, 0xd5, 0x90, 0x0c, 0x08, 0x6f, 0xba, 0x0a, 0xfc, 0x8b, 0xc7, 0xbb, 0x33,
+	0xba, 0xe2, 0x17, 0xd2, 0xdc, 0x1c, 0x39, 0xa2, 0x77, 0x60, 0xfd, 0x5c, 0xc4, 0xd4, 0xe2, 0x61,
+	0x72, 0xb5, 0x58, 0x30, 0xd7, 0xe4, 0xe4, 0x21, 0x9b, 0x43, 0x37, 0xa0, 0x44, 0x59, 0xc4, 0xd2,
+	0x64, 0x91, 0x9b, 0x00, 0x9f, 0xe2, 0x06, 0x7b, 0x7f, 0xde, 0x82, 0x8d, 0x13, 0xb1, 0xf4, 0xa7,
+	0xf7, 0x9a, 0x6c, 0x65, 0xf4, 0x0b, 0x0d, 0xd6, 0xc7, 0x2e, 0x45, 0xf4, 0xed, 0x44, 0x74, 0x69,
+	0x9d, 0x5d, 0x65, 0x5a, 0xc1, 0x18, 0x77, 0x7f, 0xfe, 0xb7, 0x7f, 0xfd, 0xa6, 0x50, 0x43, 0x3b,
+	0xa3, 0xdf, 0x88, 0x7e, 0xca, 0x84, 0xf0, 0xc0, 0x0f, 0xbc, 0x1f, 0x93, 0x0e, 0x0d, 0x1b, 0xb5,
+	0x86, 0x52, 0x52, 0x8d, 0xda, 0x17, 0xe8, 0xb7, 0x1a, 0x6c, 0x4e, 0x74, 0x63, 0x28, 0x99, 0xa7,
+	0xf4, 0xb6, 0xb1, 0xb2, 0x33, 0xdb, 0x50, 0xd4, 0x7e, 0x5a, 0x60, 0xa2, 0x22, 0x95, 0xd0, 0xbe,
+	0x50, 0x63, 0x43, 0xbf, 0xd4, 0xa0, 0x3c, 0xd9, 0xa4, 0xa1, 0xe4, 0x82, 0x19, 0x7d, 0x5c, 0xe5,
+	0x5a, 0xe2, 0x56, 0x39, 0xee, 0xf9, 0x74, 0x18, 0x05, 0x52, 0xcb, 0x9f, 0xa1, 0xdf, 0x69, 0x50,
+	0x9e, 0x24, 0x75, 0x4a, 0x20, 0x19, 0x1d, 0xe2, 0xf4, 0xf3, 0x7a, 0xc4, 0xa3, 0x79, 0x60, 0xe4,
+	0x4e, 0xcb, 0xbe, 0xda, 0xba, 0xfd, 0x49, 0x83, 0x6b, 0xe9, 0x9a, 0x83, 0xea, 0xd3, 0xb4, 0x3d,
+	0xe5, 0x24, 0x1b, 0xb9, 0xed, 0xe5, 0x81, 0x3e, 0xe6, 0x91, 0x7f, 0x60, 0xbc, 0x9f, 0x3b, 0xf2,
+	0x76, 0x0c, 0xb8, 0xaf, 0xd5, 0x78, 0x5a, 0x27, 0x9b, 0xdc, 0x94, 0xb4, 0x66, 0xf4, 0xc1, 0xb9,
+	0xd2, 0xba, 0x97, 0xfb, 0x90, 0xc7, 0xd2, 0xfa, 0x2b, 0x0d, 0xb6, 0x12, 0xfd, 0x2a, 0xda, 0x9d,
+	0x4e, 0x4f, 0xa5, 0x4b, 0xaa, 0xa4, 0x5f, 0x50, 0xc6, 0x03, 0x1e, 0xd5, 0x5d, 0x54, 0xcf, 0x1b,
+	0x55, 0x43, 0x34, 0x93, 0x3d, 0x58, 0x91, 0x4d, 0x36, 0xba, 0x91, 0x16, 0x44, 0x8e, 0xa5, 0x6b,
+	0x7c, 0xe9, 0x9b, 0xc8, 0xc8, 0x5e, 0x9a, 0xaf, 0xc5, 0xea, 0xfd, 0x4b, 0x28, 0x8e, 0xba, 0x5f,
+	0xf4, 0xad, 0x54, 0x86, 0xab, 0xcd, 0x41, 0xc5, 0x98, 0x66, 0x22, 0xab, 0x25, 0x65, 0xfd, 0x94,
+	0x6a, 0x11, 0xdb, 0xa5, 0x00, 0x71, 0x4f, 0x8c, 0x8c, 0x0c, 0xc6, 0xab, 0x9b, 0xce, 0xe2, 0xba,
+	0x5c, 0xb5, 0x96, 0x67, 0xd7, 0x43, 0x80, 0xb8, 0xf5, 0x48, 0x59, 0x35, 0xd1, 0x7d, 0x67, 0xa5,
+	0x5a, 0x0a, 0x8c, 0x91, 0x63, 0xab, 0xfb, 0xa2, 0x2b, 0xfe, 0x4a, 0x83, 0xf2, 0x64, 0xef, 0x93,
+	0xc2, 0x84, 0x8c, 0xe6, 0xac, 0xb2, 0x9b, 0xc3, 0x52, 0x1e, 0xc3, 0x07, 0x3c, 0xb6, 0xfb, 0x46,
+	0x3d, 0x47, 0x6c, 0x13, 0x74, 0x1d, 0x02, 0xc4, 0x5f, 0x07, 0x52, 0xf2, 0x93, 0xf8, 0xae, 0x30,
+	0x23, 0x3f, 0x7b, 0x39, 0x0e, 0x45, 0xe6, 0xe7, 0x0f, 0x1a, 0x7c, 0x23, 0xa5, 0xe3, 0x46, 0xb7,
+	0x33, 0x0b, 0x2f, 0x45, 0xe0, 0xee, 0xe4, 0x33, 0x96, 0x89, 0xca, 0x41, 0xd5, 0x28, 0xc8, 0xb1,
+	0x4b, 0xeb, 0x1f, 0x1a, 0x18, 0xb3, 0x9b, 0x34, 0xb4, 0x9f, 0x46, 0xe3, 0x7c, 0x9d, 0x5d, 0xe5,
+	0xee, 0xbc, 0x5d, 0x97, 0x71, 0xcc, 0x37, 0xf3, 0x18, 0x1d, 0xe4, 0x96, 0xea, 0xb1, 0xb6, 0x48,
+	0xc2, 0x34, 0x07, 0x80, 0x6c, 0x6f, 0x72, 0xf1, 0xe7, 0xda, 0x0f, 0x7f, 0x20, 0xc9, 0xd7, 0xf5,
+	0x1c, 0xec, 0x76, 0xeb, 0x5e, 0xd0, 0x6d, 0x74, 0x89, 0xcb, 0xa9, 0xd8, 0x10, 0xaf, 0xb0, 0x6f,
+	0x87, 0x73, 0xfc, 0x57, 0xf5, 0xa1, 0xfc, 0xfc, 0xaa, 0xb0, 0x70, 0x62, 0x7e, 0xd8, 0x5e, 0xe6,
+	0x50, 0xf7, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x58, 0x08, 0x46, 0x82, 0x9f, 0x1d, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2609,131 +2450,3 @@ var _GrafeasV1Beta1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/containeranalysis/v1beta1/grafeas/grafeas.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/grafeas/grafeas.proto", fileDescriptor_grafeas_0102e4ff7bfb77b0)
-}
-
-var fileDescriptor_grafeas_0102e4ff7bfb77b0 = []byte{
-	// 1920 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0x1b, 0xc7,
-	0x15, 0xf7, 0x52, 0x9f, 0x7c, 0xd4, 0x07, 0x35, 0x75, 0xac, 0x2d, 0x9d, 0xc4, 0xec, 0xc6, 0x75,
-	0x24, 0xda, 0x21, 0x6d, 0x39, 0x35, 0x1a, 0xd9, 0x82, 0x11, 0x4a, 0xb2, 0x64, 0xa4, 0x75, 0x8c,
-	0xb5, 0x12, 0x14, 0x2d, 0x02, 0x62, 0xc8, 0x1d, 0x51, 0x5b, 0x2d, 0x77, 0xb7, 0xbb, 0x43, 0xc2,
-	0x4c, 0x91, 0xa0, 0x28, 0xdc, 0xde, 0x8a, 0x1e, 0x0a, 0xb4, 0xf7, 0x5c, 0xda, 0x3f, 0xa1, 0xe8,
-	0xb1, 0xe7, 0xf6, 0xd4, 0x4b, 0x8b, 0x5e, 0xfb, 0x87, 0x14, 0xf3, 0xb1, 0xdc, 0x21, 0x77, 0x97,
-	0x5c, 0xc6, 0xfd, 0xb8, 0x88, 0xb3, 0xb3, 0xef, 0xfd, 0xe6, 0xcd, 0x9b, 0xf7, 0xfb, 0xcd, 0x23,
-	0x05, 0x8f, 0xbb, 0x9e, 0xd7, 0x75, 0x48, 0xc3, 0x22, 0x03, 0xea, 0x79, 0x4e, 0xd8, 0xe8, 0x78,
-	0x2e, 0xc5, 0xb6, 0x4b, 0x02, 0xec, 0x62, 0x67, 0x18, 0xda, 0x61, 0x63, 0x70, 0xaf, 0x4d, 0x28,
-	0xbe, 0xd7, 0xe8, 0x06, 0xf8, 0x9c, 0xe0, 0x30, 0xfa, 0xac, 0xfb, 0x81, 0x47, 0x3d, 0xb4, 0x19,
-	0x3d, 0x4a, 0xb3, 0xca, 0x9b, 0x12, 0x11, 0xfb, 0x76, 0x03, 0xbb, 0xae, 0x47, 0x31, 0xb5, 0x3d,
-	0x57, 0x9a, 0x57, 0x4e, 0xf2, 0xaf, 0x87, 0x29, 0x25, 0xa1, 0xf0, 0x56, 0xc7, 0x12, 0xe8, 0x61,
-	0x7e, 0xa0, 0x76, 0xdf, 0x76, 0x2c, 0xf1, 0x57, 0x3a, 0x1f, 0xe4, 0x77, 0xee, 0x78, 0xbd, 0x9e,
-	0xe7, 0xca, 0x0f, 0xe9, 0x7e, 0x9c, 0xdf, 0xdd, 0x22, 0xbe, 0xe3, 0x0d, 0x7b, 0xc4, 0xa5, 0xca,
-	0x50, 0xc2, 0x1c, 0xce, 0x01, 0x63, 0x87, 0x1d, 0x6f, 0x40, 0x82, 0x61, 0x3c, 0x9a, 0x3f, 0x0f,
-	0x76, 0x0f, 0x77, 0x89, 0xf8, 0x2b, 0x9d, 0xe7, 0x38, 0x7d, 0x1f, 0x77, 0x2e, 0x99, 0xbb, 0xfc,
-	0x9c, 0x3f, 0x13, 0x7e, 0xe0, 0x0d, 0x88, 0x8b, 0xdd, 0x0e, 0x51, 0x86, 0x12, 0xe6, 0xa3, 0xfc,
-	0x30, 0x83, 0xbe, 0xc3, 0xa6, 0xdb, 0xb6, 0x63, 0xd3, 0xe1, 0xf8, 0x93, 0x04, 0xbb, 0x2e, 0xc1,
-	0xf8, 0x53, 0xbb, 0x7f, 0xde, 0x20, 0x3d, 0x7f, 0xf4, 0xb2, 0x3a, 0xf9, 0xf2, 0xdc, 0x26, 0x8e,
-	0xd5, 0xea, 0xe1, 0xf0, 0x52, 0x5a, 0xdc, 0x98, 0xb4, 0xa0, 0x76, 0x8f, 0xd5, 0x5e, 0xcf, 0x17,
-	0x06, 0xc6, 0x1f, 0x97, 0x01, 0x3e, 0xee, 0x74, 0xfa, 0x41, 0x40, 0xdc, 0x0e, 0x41, 0x08, 0x16,
-	0x5d, 0xdc, 0x23, 0xba, 0x56, 0xd5, 0x76, 0x8a, 0x26, 0x1f, 0xa3, 0xef, 0xc0, 0x6a, 0x40, 0x42,
-	0xaf, 0x1f, 0x74, 0x88, 0x5e, 0xa8, 0x6a, 0x3b, 0xa5, 0xbd, 0x6f, 0xd6, 0x27, 0x78, 0x52, 0x37,
-	0xa5, 0x81, 0x39, 0x32, 0x45, 0xd7, 0xa1, 0xe8, 0x7a, 0x94, 0xb4, 0x38, 0xde, 0x02, 0xc7, 0x5b,
-	0x65, 0x13, 0xcf, 0x18, 0xe6, 0x7b, 0xb0, 0x78, 0x69, 0xbb, 0x96, 0xbe, 0x58, 0xd5, 0x76, 0x36,
-	0x52, 0xf0, 0x9e, 0x79, 0x94, 0x7c, 0x64, 0xbb, 0x96, 0xc9, 0xcd, 0x50, 0x15, 0x4a, 0x01, 0xe9,
-	0x11, 0xcb, 0xe6, 0xa4, 0xd1, 0x97, 0x38, 0x9a, 0x3a, 0x85, 0x1e, 0x42, 0xa9, 0x13, 0x10, 0x4c,
-	0x49, 0x8b, 0xed, 0x50, 0x5f, 0xe6, 0x71, 0x56, 0xea, 0x62, 0xfb, 0xf5, 0x68, 0xfb, 0xf5, 0xb3,
-	0x68, 0xfb, 0x26, 0x08, 0x73, 0x36, 0xc1, 0x9c, 0xfb, 0xbe, 0x35, 0x72, 0x5e, 0x99, 0xed, 0x2c,
-	0xcc, 0xb9, 0xf3, 0x33, 0x58, 0x1f, 0x3b, 0x38, 0x7d, 0x95, 0xbb, 0xdf, 0x4a, 0xec, 0x69, 0xfc,
-	0x78, 0x8f, 0x08, 0xc5, 0xb6, 0x13, 0x9e, 0x5e, 0x31, 0xc7, 0xdd, 0xd1, 0x03, 0x58, 0xe2, 0xec,
-	0xd6, 0x8b, 0x1c, 0xe7, 0xed, 0x04, 0x8e, 0xe0, 0x7e, 0xec, 0x2f, 0xcc, 0xd1, 0x31, 0xac, 0x5b,
-	0x24, 0xb0, 0x07, 0xc4, 0x6a, 0x71, 0x56, 0xe8, 0x90, 0xe1, 0x2f, 0x38, 0x13, 0xfb, 0xaf, 0x49,
-	0xb7, 0xa7, 0x6c, 0x1e, 0x3d, 0x81, 0x35, 0xdb, 0x0d, 0x29, 0x76, 0x1c, 0x91, 0xeb, 0x12, 0x47,
-	0xa9, 0x26, 0x50, 0x22, 0xea, 0x28, 0x38, 0xaa, 0x1f, 0x3a, 0x06, 0x88, 0x35, 0x42, 0x5f, 0xe3,
-	0x28, 0xef, 0x24, 0x50, 0x14, 0x19, 0x89, 0x81, 0x14, 0x47, 0x74, 0x04, 0x10, 0x89, 0x04, 0xb1,
-	0xf4, 0x75, 0x0e, 0x63, 0x24, 0x61, 0x46, 0x3a, 0xa2, 0xa2, 0x8c, 0xfc, 0xd0, 0x29, 0x94, 0x14,
-	0xd1, 0xd5, 0x37, 0x38, 0xcc, 0xcd, 0x04, 0x8c, 0x2a, 0xcc, 0x31, 0x90, 0xea, 0xda, 0x2c, 0xc2,
-	0x8a, 0x25, 0xde, 0x18, 0x7d, 0x58, 0x8d, 0xca, 0x3e, 0x95, 0x37, 0x65, 0x58, 0xe8, 0x07, 0x36,
-	0xa7, 0x4c, 0xd1, 0x64, 0x43, 0x74, 0x08, 0x6b, 0x4c, 0x0b, 0x88, 0x4b, 0x5b, 0x17, 0x38, 0xbc,
-	0xe0, 0xac, 0x48, 0xcd, 0x6d, 0x2c, 0x29, 0xa7, 0x38, 0xbc, 0x30, 0x4b, 0xd2, 0x8b, 0x3d, 0x18,
-	0x7f, 0x59, 0x81, 0x45, 0x46, 0x8f, 0xd4, 0x35, 0x6f, 0xc3, 0x56, 0x78, 0xe1, 0x05, 0xb4, 0x65,
-	0x91, 0xb0, 0x13, 0xd8, 0x3e, 0xdf, 0xae, 0x88, 0xa0, 0xcc, 0x5f, 0x1c, 0xc5, 0xf3, 0x68, 0x17,
-	0xca, 0x8e, 0xe7, 0x76, 0xc7, 0x6c, 0x05, 0x51, 0x37, 0xd9, 0xbc, 0x6a, 0x3a, 0x27, 0x5f, 0x1f,
-	0x31, 0xbe, 0x3a, 0x98, 0x12, 0xab, 0xd5, 0x0f, 0x1c, 0x7d, 0xa9, 0xba, 0xb0, 0x53, 0xda, 0xbb,
-	0x9e, 0xa2, 0x1a, 0xdc, 0xe6, 0x93, 0xc0, 0x31, 0x21, 0x18, 0x8d, 0xd1, 0x21, 0x6c, 0x92, 0x97,
-	0xbe, 0x1d, 0xf0, 0x8c, 0xe7, 0xe5, 0xf3, 0x46, 0xec, 0x12, 0x71, 0x5a, 0x15, 0x84, 0x95, 0xd7,
-	0x11, 0x84, 0xd5, 0xb9, 0x04, 0xe1, 0x0e, 0xa0, 0x68, 0xf3, 0x23, 0x01, 0x0c, 0xf5, 0x62, 0x75,
-	0x81, 0x1d, 0x82, 0x7c, 0xf3, 0x4c, 0x0a, 0x61, 0x88, 0xce, 0x26, 0xe5, 0x43, 0xd0, 0xf6, 0xce,
-	0x0c, 0xf9, 0xf8, 0x54, 0x7d, 0x4a, 0x8a, 0xc8, 0xfb, 0x91, 0x88, 0x08, 0xfa, 0xbe, 0x99, 0x21,
-	0x22, 0x4d, 0xf6, 0x37, 0x96, 0x90, 0x03, 0x80, 0x36, 0x0e, 0x89, 0xd4, 0x8f, 0xb5, 0x0c, 0x57,
-	0xa1, 0x1f, 0x4d, 0x1c, 0xda, 0x8c, 0x1d, 0x45, 0xe6, 0x21, 0xa4, 0xe3, 0x11, 0xac, 0x48, 0x55,
-	0x90, 0x44, 0xcd, 0x56, 0x8d, 0xe7, 0xe2, 0xf3, 0xf4, 0x8a, 0x19, 0xb9, 0xa0, 0xd3, 0x48, 0x30,
-	0x70, 0xdb, 0x21, 0x92, 0xa2, 0xb7, 0xa6, 0x0b, 0x46, 0x64, 0x1d, 0x6b, 0x06, 0x7b, 0x42, 0x47,
-	0x50, 0x1c, 0x09, 0x82, 0xbe, 0x99, 0xc1, 0x75, 0x45, 0x32, 0xa2, 0x11, 0xdb, 0xcd, 0x68, 0x1a,
-	0x7d, 0x06, 0x6f, 0x28, 0xc4, 0x6f, 0xe1, 0x3e, 0xbd, 0xf0, 0x02, 0x76, 0x40, 0xe5, 0x8c, 0xd0,
-	0x54, 0xf5, 0xf8, 0x30, 0xb2, 0x3e, 0xbd, 0x62, 0x5e, 0x55, 0x5e, 0x8c, 0xe6, 0x9b, 0xcb, 0xb0,
-	0x48, 0x87, 0x3e, 0x31, 0x6a, 0x70, 0xf5, 0x84, 0xd0, 0xf8, 0x0a, 0x36, 0xc9, 0x4f, 0xfa, 0x24,
-	0xa4, 0x69, 0xec, 0x36, 0x5e, 0x69, 0x70, 0xed, 0x7b, 0x76, 0xa8, 0x58, 0x87, 0x91, 0xf9, 0x35,
-	0x58, 0xf6, 0x71, 0xc0, 0xa4, 0x56, 0x38, 0xc8, 0x27, 0x36, 0x7f, 0x6e, 0x3b, 0x94, 0x04, 0x52,
-	0x05, 0xe4, 0x13, 0xbb, 0x9d, 0x7d, 0xdc, 0x25, 0xad, 0xd0, 0xfe, 0x5c, 0xdc, 0xce, 0x4b, 0xe6,
-	0x2a, 0x9b, 0x78, 0x61, 0x7f, 0x4e, 0xd0, 0x5b, 0x00, 0xfc, 0x25, 0xf5, 0x2e, 0x89, 0xcb, 0x39,
-	0x5f, 0x34, 0xb9, 0xf9, 0x19, 0x9b, 0x30, 0x7e, 0xa6, 0xc1, 0x76, 0x22, 0x8c, 0xd0, 0xf7, 0xdc,
-	0x90, 0xa0, 0x03, 0x28, 0x79, 0xf1, 0xb4, 0xae, 0x65, 0x30, 0x5f, 0xd9, 0xaf, 0x6a, 0x8f, 0x6e,
-	0xc1, 0xa6, 0x4b, 0x5e, 0xd2, 0x96, 0xb2, 0xbc, 0x88, 0x7b, 0x9d, 0x4d, 0x3f, 0x1f, 0x85, 0xf0,
-	0x1e, 0x6c, 0x1f, 0x11, 0x87, 0x50, 0x92, 0x2f, 0x71, 0x2e, 0x6c, 0x1f, 0x72, 0x76, 0x27, 0xcd,
-	0xb3, 0x12, 0xf7, 0x10, 0x20, 0x0e, 0x4c, 0xf6, 0x3d, 0x53, 0xf7, 0xa1, 0x98, 0x1b, 0xbf, 0xd7,
-	0x60, 0xfb, 0x13, 0xae, 0x08, 0xb9, 0xe2, 0x7b, 0xad, 0xc5, 0x14, 0xb1, 0x62, 0x8d, 0x9f, 0xbc,
-	0x54, 0x92, 0x62, 0xf5, 0x84, 0xf5, 0x86, 0xdf, 0xc7, 0xe1, 0x65, 0x24, 0x56, 0x6c, 0x6c, 0xdc,
-	0x84, 0x8d, 0x13, 0x42, 0x99, 0x1c, 0x4d, 0xcb, 0x5f, 0x1d, 0xf4, 0xb1, 0x22, 0x9d, 0x65, 0xff,
-	0x25, 0x94, 0x59, 0x81, 0x30, 0xb3, 0xff, 0x4b, 0x85, 0x5e, 0xc0, 0x96, 0xb2, 0xbe, 0x2c, 0xcd,
-	0xdb, 0xb0, 0xc4, 0xf4, 0x38, 0x2a, 0xca, 0x37, 0x52, 0x2f, 0x31, 0x53, 0xd8, 0xe4, 0x2e, 0xc4,
-	0x77, 0x61, 0x4b, 0x14, 0xe2, 0xac, 0x94, 0x78, 0xb0, 0x25, 0x4a, 0x50, 0x35, 0xcc, 0xca, 0xc9,
-	0x36, 0xac, 0xf0, 0xab, 0xc3, 0xb6, 0xa2, 0xa4, 0xb0, 0xc7, 0xa7, 0x16, 0xda, 0x85, 0x45, 0x36,
-	0x92, 0x87, 0x9c, 0xb1, 0x05, 0x6e, 0x62, 0xfc, 0x5a, 0x83, 0x2d, 0x51, 0x83, 0x33, 0x42, 0x1b,
-	0x81, 0x16, 0x66, 0x82, 0xbe, 0x5e, 0xad, 0xbd, 0xd2, 0xa0, 0x12, 0x1d, 0x4b, 0x8a, 0x84, 0xa5,
-	0x85, 0xf6, 0xdf, 0x28, 0x8e, 0x57, 0x1a, 0x5c, 0x4f, 0x0d, 0xe3, 0x7f, 0x2b, 0x61, 0x7f, 0xd5,
-	0x60, 0xbb, 0x89, 0x69, 0xe7, 0x22, 0x2e, 0x8b, 0x99, 0x5c, 0x79, 0x1a, 0x95, 0x70, 0x81, 0x07,
-	0x75, 0x3f, 0x11, 0x54, 0x06, 0x20, 0x3f, 0xc2, 0xf0, 0xd8, 0xa5, 0xc1, 0x50, 0x16, 0x78, 0xe5,
-	0x63, 0x80, 0x78, 0x92, 0xf5, 0xaa, 0x97, 0x64, 0x28, 0x57, 0x63, 0x43, 0xc6, 0x96, 0x01, 0x76,
-	0xfa, 0x33, 0xaa, 0x42, 0xd8, 0xec, 0x17, 0xbe, 0xab, 0x19, 0x27, 0xa0, 0x27, 0x57, 0xff, 0x1a,
-	0xd4, 0x33, 0x06, 0xf0, 0x96, 0x02, 0x34, 0xc7, 0x5d, 0x37, 0x71, 0x70, 0x85, 0xf9, 0x0e, 0xce,
-	0x68, 0xc1, 0xdb, 0x59, 0xeb, 0xfe, 0x47, 0x2a, 0xc3, 0xf8, 0x11, 0xec, 0x9e, 0x10, 0x3a, 0xd6,
-	0xb9, 0x29, 0xab, 0xbc, 0xe8, 0xf7, 0x7a, 0x38, 0x18, 0x7e, 0x4d, 0xb9, 0x34, 0xfe, 0x59, 0x80,
-	0x1b, 0x33, 0xa0, 0xd1, 0x67, 0xb0, 0xdc, 0xf1, 0xfa, 0x2e, 0x8d, 0x42, 0x3f, 0x4e, 0x84, 0x3e,
-	0x03, 0xa1, 0xfe, 0xc4, 0x7e, 0xc9, 0x5a, 0xac, 0x33, 0x8f, 0x62, 0xa7, 0x39, 0x3c, 0xb2, 0xbb,
-	0x24, 0xa4, 0xa6, 0x04, 0xad, 0xfc, 0x5d, 0x83, 0xab, 0x69, 0x06, 0x63, 0xbf, 0x20, 0x68, 0xf9,
-	0x7f, 0x41, 0x38, 0x84, 0xd5, 0x90, 0x0c, 0x08, 0x6f, 0xba, 0x0a, 0xfc, 0x8b, 0xc7, 0xbb, 0x33,
-	0xba, 0xe2, 0x17, 0xd2, 0xdc, 0x1c, 0x39, 0xa2, 0x77, 0x60, 0xfd, 0x5c, 0xc4, 0xd4, 0xe2, 0x61,
-	0x72, 0xb5, 0x58, 0x30, 0xd7, 0xe4, 0xe4, 0x21, 0x9b, 0x43, 0x37, 0xa0, 0x44, 0x59, 0xc4, 0xd2,
-	0x64, 0x91, 0x9b, 0x00, 0x9f, 0xe2, 0x06, 0x7b, 0x7f, 0xde, 0x82, 0x8d, 0x13, 0xb1, 0xf4, 0xa7,
-	0xf7, 0x9a, 0x6c, 0x65, 0xf4, 0x0b, 0x0d, 0xd6, 0xc7, 0x2e, 0x45, 0xf4, 0xed, 0x44, 0x74, 0x69,
-	0x9d, 0x5d, 0x65, 0x5a, 0xc1, 0x18, 0x77, 0x7f, 0xfe, 0xb7, 0x7f, 0xfd, 0xa6, 0x50, 0x43, 0x3b,
-	0xa3, 0xdf, 0x88, 0x7e, 0xca, 0x84, 0xf0, 0xc0, 0x0f, 0xbc, 0x1f, 0x93, 0x0e, 0x0d, 0x1b, 0xb5,
-	0x86, 0x52, 0x52, 0x8d, 0xda, 0x17, 0xe8, 0xb7, 0x1a, 0x6c, 0x4e, 0x74, 0x63, 0x28, 0x99, 0xa7,
-	0xf4, 0xb6, 0xb1, 0xb2, 0x33, 0xdb, 0x50, 0xd4, 0x7e, 0x5a, 0x60, 0xa2, 0x22, 0x95, 0xd0, 0xbe,
-	0x50, 0x63, 0x43, 0xbf, 0xd4, 0xa0, 0x3c, 0xd9, 0xa4, 0xa1, 0xe4, 0x82, 0x19, 0x7d, 0x5c, 0xe5,
-	0x5a, 0xe2, 0x56, 0x39, 0xee, 0xf9, 0x74, 0x18, 0x05, 0x52, 0xcb, 0x9f, 0xa1, 0xdf, 0x69, 0x50,
-	0x9e, 0x24, 0x75, 0x4a, 0x20, 0x19, 0x1d, 0xe2, 0xf4, 0xf3, 0x7a, 0xc4, 0xa3, 0x79, 0x60, 0xe4,
-	0x4e, 0xcb, 0xbe, 0xda, 0xba, 0xfd, 0x49, 0x83, 0x6b, 0xe9, 0x9a, 0x83, 0xea, 0xd3, 0xb4, 0x3d,
-	0xe5, 0x24, 0x1b, 0xb9, 0xed, 0xe5, 0x81, 0x3e, 0xe6, 0x91, 0x7f, 0x60, 0xbc, 0x9f, 0x3b, 0xf2,
-	0x76, 0x0c, 0xb8, 0xaf, 0xd5, 0x78, 0x5a, 0x27, 0x9b, 0xdc, 0x94, 0xb4, 0x66, 0xf4, 0xc1, 0xb9,
-	0xd2, 0xba, 0x97, 0xfb, 0x90, 0xc7, 0xd2, 0xfa, 0x2b, 0x0d, 0xb6, 0x12, 0xfd, 0x2a, 0xda, 0x9d,
-	0x4e, 0x4f, 0xa5, 0x4b, 0xaa, 0xa4, 0x5f, 0x50, 0xc6, 0x03, 0x1e, 0xd5, 0x5d, 0x54, 0xcf, 0x1b,
-	0x55, 0x43, 0x34, 0x93, 0x3d, 0x58, 0x91, 0x4d, 0x36, 0xba, 0x91, 0x16, 0x44, 0x8e, 0xa5, 0x6b,
-	0x7c, 0xe9, 0x9b, 0xc8, 0xc8, 0x5e, 0x9a, 0xaf, 0xc5, 0xea, 0xfd, 0x4b, 0x28, 0x8e, 0xba, 0x5f,
-	0xf4, 0xad, 0x54, 0x86, 0xab, 0xcd, 0x41, 0xc5, 0x98, 0x66, 0x22, 0xab, 0x25, 0x65, 0xfd, 0x94,
-	0x6a, 0x11, 0xdb, 0xa5, 0x00, 0x71, 0x4f, 0x8c, 0x8c, 0x0c, 0xc6, 0xab, 0x9b, 0xce, 0xe2, 0xba,
-	0x5c, 0xb5, 0x96, 0x67, 0xd7, 0x43, 0x80, 0xb8, 0xf5, 0x48, 0x59, 0x35, 0xd1, 0x7d, 0x67, 0xa5,
-	0x5a, 0x0a, 0x8c, 0x91, 0x63, 0xab, 0xfb, 0xa2, 0x2b, 0xfe, 0x4a, 0x83, 0xf2, 0x64, 0xef, 0x93,
-	0xc2, 0x84, 0x8c, 0xe6, 0xac, 0xb2, 0x9b, 0xc3, 0x52, 0x1e, 0xc3, 0x07, 0x3c, 0xb6, 0xfb, 0x46,
-	0x3d, 0x47, 0x6c, 0x13, 0x74, 0x1d, 0x02, 0xc4, 0x5f, 0x07, 0x52, 0xf2, 0x93, 0xf8, 0xae, 0x30,
-	0x23, 0x3f, 0x7b, 0x39, 0x0e, 0x45, 0xe6, 0xe7, 0x0f, 0x1a, 0x7c, 0x23, 0xa5, 0xe3, 0x46, 0xb7,
-	0x33, 0x0b, 0x2f, 0x45, 0xe0, 0xee, 0xe4, 0x33, 0x96, 0x89, 0xca, 0x41, 0xd5, 0x28, 0xc8, 0xb1,
-	0x4b, 0xeb, 0x1f, 0x1a, 0x18, 0xb3, 0x9b, 0x34, 0xb4, 0x9f, 0x46, 0xe3, 0x7c, 0x9d, 0x5d, 0xe5,
-	0xee, 0xbc, 0x5d, 0x97, 0x71, 0xcc, 0x37, 0xf3, 0x18, 0x1d, 0xe4, 0x96, 0xea, 0xb1, 0xb6, 0x48,
-	0xc2, 0x34, 0x07, 0x80, 0x6c, 0x6f, 0x72, 0xf1, 0xe7, 0xda, 0x0f, 0x7f, 0x20, 0xc9, 0xd7, 0xf5,
-	0x1c, 0xec, 0x76, 0xeb, 0x5e, 0xd0, 0x6d, 0x74, 0x89, 0xcb, 0xa9, 0xd8, 0x10, 0xaf, 0xb0, 0x6f,
-	0x87, 0x73, 0xfc, 0x57, 0xf5, 0xa1, 0xfc, 0xfc, 0xaa, 0xb0, 0x70, 0x62, 0x7e, 0xd8, 0x5e, 0xe6,
-	0x50, 0xf7, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x58, 0x08, 0x46, 0x82, 0x9f, 0x1d, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go b/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go
index f4d66ace2b..62732fbde7 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/image/image.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/image/image.proto
 
-package image // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/image"
+package image
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Instructions from Dockerfile.
 type Layer_Directive int32
@@ -80,6 +83,7 @@ var Layer_Directive_name = map[int32]string{
 	16: "HEALTHCHECK",
 	17: "SHELL",
 }
+
 var Layer_Directive_value = map[string]int32{
 	"DIRECTIVE_UNSPECIFIED": 0,
 	"MAINTAINER":            1,
@@ -104,8 +108,9 @@ var Layer_Directive_value = map[string]int32{
 func (x Layer_Directive) String() string {
 	return proto.EnumName(Layer_Directive_name, int32(x))
 }
+
 func (Layer_Directive) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_image_c96c11ee6530869e, []int{0, 0}
+	return fileDescriptor_ab0486c83d3ae0f1, []int{0, 0}
 }
 
 // Layer holds metadata specific to a layer of a Docker image.
@@ -123,16 +128,17 @@ func (m *Layer) Reset()         { *m = Layer{} }
 func (m *Layer) String() string { return proto.CompactTextString(m) }
 func (*Layer) ProtoMessage()    {}
 func (*Layer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_c96c11ee6530869e, []int{0}
+	return fileDescriptor_ab0486c83d3ae0f1, []int{0}
 }
+
 func (m *Layer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Layer.Unmarshal(m, b)
 }
 func (m *Layer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Layer.Marshal(b, m, deterministic)
 }
-func (dst *Layer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Layer.Merge(dst, src)
+func (m *Layer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Layer.Merge(m, src)
 }
 func (m *Layer) XXX_Size() int {
 	return xxx_messageInfo_Layer.Size(m)
@@ -177,16 +183,17 @@ func (m *Fingerprint) Reset()         { *m = Fingerprint{} }
 func (m *Fingerprint) String() string { return proto.CompactTextString(m) }
 func (*Fingerprint) ProtoMessage()    {}
 func (*Fingerprint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_c96c11ee6530869e, []int{1}
+	return fileDescriptor_ab0486c83d3ae0f1, []int{1}
 }
+
 func (m *Fingerprint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Fingerprint.Unmarshal(m, b)
 }
 func (m *Fingerprint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Fingerprint.Marshal(b, m, deterministic)
 }
-func (dst *Fingerprint) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Fingerprint.Merge(dst, src)
+func (m *Fingerprint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Fingerprint.Merge(m, src)
 }
 func (m *Fingerprint) XXX_Size() int {
 	return xxx_messageInfo_Fingerprint.Size(m)
@@ -238,16 +245,17 @@ func (m *Basis) Reset()         { *m = Basis{} }
 func (m *Basis) String() string { return proto.CompactTextString(m) }
 func (*Basis) ProtoMessage()    {}
 func (*Basis) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_c96c11ee6530869e, []int{2}
+	return fileDescriptor_ab0486c83d3ae0f1, []int{2}
 }
+
 func (m *Basis) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Basis.Unmarshal(m, b)
 }
 func (m *Basis) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Basis.Marshal(b, m, deterministic)
 }
-func (dst *Basis) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Basis.Merge(dst, src)
+func (m *Basis) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Basis.Merge(m, src)
 }
 func (m *Basis) XXX_Size() int {
 	return xxx_messageInfo_Basis.Size(m)
@@ -285,16 +293,17 @@ func (m *Details) Reset()         { *m = Details{} }
 func (m *Details) String() string { return proto.CompactTextString(m) }
 func (*Details) ProtoMessage()    {}
 func (*Details) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_c96c11ee6530869e, []int{3}
+	return fileDescriptor_ab0486c83d3ae0f1, []int{3}
 }
+
 func (m *Details) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Details.Unmarshal(m, b)
 }
 func (m *Details) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Details.Marshal(b, m, deterministic)
 }
-func (dst *Details) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Details.Merge(dst, src)
+func (m *Details) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Details.Merge(m, src)
 }
 func (m *Details) XXX_Size() int {
 	return xxx_messageInfo_Details.Size(m)
@@ -337,16 +346,17 @@ func (m *Derived) Reset()         { *m = Derived{} }
 func (m *Derived) String() string { return proto.CompactTextString(m) }
 func (*Derived) ProtoMessage()    {}
 func (*Derived) Descriptor() ([]byte, []int) {
-	return fileDescriptor_image_c96c11ee6530869e, []int{4}
+	return fileDescriptor_ab0486c83d3ae0f1, []int{4}
 }
+
 func (m *Derived) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Derived.Unmarshal(m, b)
 }
 func (m *Derived) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Derived.Marshal(b, m, deterministic)
 }
-func (dst *Derived) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Derived.Merge(dst, src)
+func (m *Derived) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Derived.Merge(m, src)
 }
 func (m *Derived) XXX_Size() int {
 	return xxx_messageInfo_Derived.Size(m)
@@ -386,19 +396,19 @@ func (m *Derived) GetBaseResourceUrl() string {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.image.Layer_Directive", Layer_Directive_name, Layer_Directive_value)
 	proto.RegisterType((*Layer)(nil), "grafeas.v1beta1.image.Layer")
 	proto.RegisterType((*Fingerprint)(nil), "grafeas.v1beta1.image.Fingerprint")
 	proto.RegisterType((*Basis)(nil), "grafeas.v1beta1.image.Basis")
 	proto.RegisterType((*Details)(nil), "grafeas.v1beta1.image.Details")
 	proto.RegisterType((*Derived)(nil), "grafeas.v1beta1.image.Derived")
-	proto.RegisterEnum("grafeas.v1beta1.image.Layer_Directive", Layer_Directive_name, Layer_Directive_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/image/image.proto", fileDescriptor_image_c96c11ee6530869e)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/image/image.proto", fileDescriptor_ab0486c83d3ae0f1)
 }
 
-var fileDescriptor_image_c96c11ee6530869e = []byte{
+var fileDescriptor_ab0486c83d3ae0f1 = []byte{
 	// 613 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0x6e, 0xda, 0x40,
 	0x10, 0xc6, 0x6b, 0x08, 0x10, 0x8f, 0xf3, 0x67, 0xb3, 0x52, 0x54, 0x5a, 0x45, 0x15, 0xe5, 0x50,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go b/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go
index a93f006b77..6f626fb838 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/package/package.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/package/package.proto
 
-package _package // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+package _package
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Instruction set architectures supported by various package managers.
 type Architecture int32
@@ -35,6 +38,7 @@ var Architecture_name = map[int32]string{
 	1: "X86",
 	2: "X64",
 }
+
 var Architecture_value = map[string]int32{
 	"ARCHITECTURE_UNSPECIFIED": 0,
 	"X86":                      1,
@@ -44,8 +48,9 @@ var Architecture_value = map[string]int32{
 func (x Architecture) String() string {
 	return proto.EnumName(Architecture_name, int32(x))
 }
+
 func (Architecture) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{0}
+	return fileDescriptor_a2db18e408c1243f, []int{0}
 }
 
 // Whether this is an ordinary package version or a sentinel MIN/MAX version.
@@ -70,6 +75,7 @@ var Version_VersionKind_name = map[int32]string{
 	2: "MINIMUM",
 	3: "MAXIMUM",
 }
+
 var Version_VersionKind_value = map[string]int32{
 	"VERSION_KIND_UNSPECIFIED": 0,
 	"NORMAL":                   1,
@@ -80,8 +86,9 @@ var Version_VersionKind_value = map[string]int32{
 func (x Version_VersionKind) String() string {
 	return proto.EnumName(Version_VersionKind_name, int32(x))
 }
+
 func (Version_VersionKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{5, 0}
+	return fileDescriptor_a2db18e408c1243f, []int{5, 0}
 }
 
 // This represents a particular channel of distribution for a given package.
@@ -111,16 +118,17 @@ func (m *Distribution) Reset()         { *m = Distribution{} }
 func (m *Distribution) String() string { return proto.CompactTextString(m) }
 func (*Distribution) ProtoMessage()    {}
 func (*Distribution) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{0}
+	return fileDescriptor_a2db18e408c1243f, []int{0}
 }
+
 func (m *Distribution) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Distribution.Unmarshal(m, b)
 }
 func (m *Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Distribution.Marshal(b, m, deterministic)
 }
-func (dst *Distribution) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Distribution.Merge(dst, src)
+func (m *Distribution) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution.Merge(m, src)
 }
 func (m *Distribution) XXX_Size() int {
 	return xxx_messageInfo_Distribution.Size(m)
@@ -192,16 +200,17 @@ func (m *Location) Reset()         { *m = Location{} }
 func (m *Location) String() string { return proto.CompactTextString(m) }
 func (*Location) ProtoMessage()    {}
 func (*Location) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{1}
+	return fileDescriptor_a2db18e408c1243f, []int{1}
 }
+
 func (m *Location) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Location.Unmarshal(m, b)
 }
 func (m *Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Location.Marshal(b, m, deterministic)
 }
-func (dst *Location) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Location.Merge(dst, src)
+func (m *Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Location.Merge(m, src)
 }
 func (m *Location) XXX_Size() int {
 	return xxx_messageInfo_Location.Size(m)
@@ -250,16 +259,17 @@ func (m *Package) Reset()         { *m = Package{} }
 func (m *Package) String() string { return proto.CompactTextString(m) }
 func (*Package) ProtoMessage()    {}
 func (*Package) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{2}
+	return fileDescriptor_a2db18e408c1243f, []int{2}
 }
+
 func (m *Package) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Package.Unmarshal(m, b)
 }
 func (m *Package) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Package.Marshal(b, m, deterministic)
 }
-func (dst *Package) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Package.Merge(dst, src)
+func (m *Package) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Package.Merge(m, src)
 }
 func (m *Package) XXX_Size() int {
 	return xxx_messageInfo_Package.Size(m)
@@ -297,16 +307,17 @@ func (m *Details) Reset()         { *m = Details{} }
 func (m *Details) String() string { return proto.CompactTextString(m) }
 func (*Details) ProtoMessage()    {}
 func (*Details) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{3}
+	return fileDescriptor_a2db18e408c1243f, []int{3}
 }
+
 func (m *Details) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Details.Unmarshal(m, b)
 }
 func (m *Details) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Details.Marshal(b, m, deterministic)
 }
-func (dst *Details) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Details.Merge(dst, src)
+func (m *Details) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Details.Merge(m, src)
 }
 func (m *Details) XXX_Size() int {
 	return xxx_messageInfo_Details.Size(m)
@@ -341,16 +352,17 @@ func (m *Installation) Reset()         { *m = Installation{} }
 func (m *Installation) String() string { return proto.CompactTextString(m) }
 func (*Installation) ProtoMessage()    {}
 func (*Installation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{4}
+	return fileDescriptor_a2db18e408c1243f, []int{4}
 }
+
 func (m *Installation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Installation.Unmarshal(m, b)
 }
 func (m *Installation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Installation.Marshal(b, m, deterministic)
 }
-func (dst *Installation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Installation.Merge(dst, src)
+func (m *Installation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Installation.Merge(m, src)
 }
 func (m *Installation) XXX_Size() int {
 	return xxx_messageInfo_Installation.Size(m)
@@ -395,16 +407,17 @@ func (m *Version) Reset()         { *m = Version{} }
 func (m *Version) String() string { return proto.CompactTextString(m) }
 func (*Version) ProtoMessage()    {}
 func (*Version) Descriptor() ([]byte, []int) {
-	return fileDescriptor_package_bb5c882585bb63a7, []int{5}
+	return fileDescriptor_a2db18e408c1243f, []int{5}
 }
+
 func (m *Version) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Version.Unmarshal(m, b)
 }
 func (m *Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Version.Marshal(b, m, deterministic)
 }
-func (dst *Version) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Version.Merge(dst, src)
+func (m *Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Version.Merge(m, src)
 }
 func (m *Version) XXX_Size() int {
 	return xxx_messageInfo_Version.Size(m)
@@ -444,21 +457,21 @@ func (m *Version) GetKind() Version_VersionKind {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.package.Architecture", Architecture_name, Architecture_value)
+	proto.RegisterEnum("grafeas.v1beta1.package.Version_VersionKind", Version_VersionKind_name, Version_VersionKind_value)
 	proto.RegisterType((*Distribution)(nil), "grafeas.v1beta1.package.Distribution")
 	proto.RegisterType((*Location)(nil), "grafeas.v1beta1.package.Location")
 	proto.RegisterType((*Package)(nil), "grafeas.v1beta1.package.Package")
 	proto.RegisterType((*Details)(nil), "grafeas.v1beta1.package.Details")
 	proto.RegisterType((*Installation)(nil), "grafeas.v1beta1.package.Installation")
 	proto.RegisterType((*Version)(nil), "grafeas.v1beta1.package.Version")
-	proto.RegisterEnum("grafeas.v1beta1.package.Architecture", Architecture_name, Architecture_value)
-	proto.RegisterEnum("grafeas.v1beta1.package.Version_VersionKind", Version_VersionKind_name, Version_VersionKind_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/package/package.proto", fileDescriptor_package_bb5c882585bb63a7)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/package/package.proto", fileDescriptor_a2db18e408c1243f)
 }
 
-var fileDescriptor_package_bb5c882585bb63a7 = []byte{
+var fileDescriptor_a2db18e408c1243f = []byte{
 	// 575 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xff, 0x6a, 0xd4, 0x40,
 	0x10, 0x36, 0x49, 0x7b, 0x69, 0xe7, 0xce, 0x12, 0x16, 0xb1, 0x41, 0x44, 0x62, 0x40, 0x38, 0x44,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go b/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go
index 84edf6a9ff..e44a555251 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/provenance/provenance.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/provenance/provenance.proto
 
-package provenance // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/provenance"
+package provenance
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import source "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/source"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	source "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/source"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies the hash algorithm, if any.
 type Hash_HashType int32
@@ -34,6 +37,7 @@ var Hash_HashType_name = map[int32]string{
 	0: "HASH_TYPE_UNSPECIFIED",
 	1: "SHA256",
 }
+
 var Hash_HashType_value = map[string]int32{
 	"HASH_TYPE_UNSPECIFIED": 0,
 	"SHA256":                1,
@@ -42,8 +46,9 @@ var Hash_HashType_value = map[string]int32{
 func (x Hash_HashType) String() string {
 	return proto.EnumName(Hash_HashType_name, int32(x))
 }
+
 func (Hash_HashType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_4fd1fd2866d3bc11, []int{3, 0}
+	return fileDescriptor_4ab6101dd6eab75c, []int{3, 0}
 }
 
 // Provenance of a build. Contains all information needed to verify the full
@@ -87,16 +92,17 @@ func (m *BuildProvenance) Reset()         { *m = BuildProvenance{} }
 func (m *BuildProvenance) String() string { return proto.CompactTextString(m) }
 func (*BuildProvenance) ProtoMessage()    {}
 func (*BuildProvenance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_4fd1fd2866d3bc11, []int{0}
+	return fileDescriptor_4ab6101dd6eab75c, []int{0}
 }
+
 func (m *BuildProvenance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildProvenance.Unmarshal(m, b)
 }
 func (m *BuildProvenance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildProvenance.Marshal(b, m, deterministic)
 }
-func (dst *BuildProvenance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildProvenance.Merge(dst, src)
+func (m *BuildProvenance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildProvenance.Merge(m, src)
 }
 func (m *BuildProvenance) XXX_Size() int {
 	return xxx_messageInfo_BuildProvenance.Size(m)
@@ -228,16 +234,17 @@ func (m *Source) Reset()         { *m = Source{} }
 func (m *Source) String() string { return proto.CompactTextString(m) }
 func (*Source) ProtoMessage()    {}
 func (*Source) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_4fd1fd2866d3bc11, []int{1}
+	return fileDescriptor_4ab6101dd6eab75c, []int{1}
 }
+
 func (m *Source) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Source.Unmarshal(m, b)
 }
 func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
 }
-func (dst *Source) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Source.Merge(dst, src)
+func (m *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(m, src)
 }
 func (m *Source) XXX_Size() int {
 	return xxx_messageInfo_Source.Size(m)
@@ -290,16 +297,17 @@ func (m *FileHashes) Reset()         { *m = FileHashes{} }
 func (m *FileHashes) String() string { return proto.CompactTextString(m) }
 func (*FileHashes) ProtoMessage()    {}
 func (*FileHashes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_4fd1fd2866d3bc11, []int{2}
+	return fileDescriptor_4ab6101dd6eab75c, []int{2}
 }
+
 func (m *FileHashes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileHashes.Unmarshal(m, b)
 }
 func (m *FileHashes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileHashes.Marshal(b, m, deterministic)
 }
-func (dst *FileHashes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileHashes.Merge(dst, src)
+func (m *FileHashes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileHashes.Merge(m, src)
 }
 func (m *FileHashes) XXX_Size() int {
 	return xxx_messageInfo_FileHashes.Size(m)
@@ -332,16 +340,17 @@ func (m *Hash) Reset()         { *m = Hash{} }
 func (m *Hash) String() string { return proto.CompactTextString(m) }
 func (*Hash) ProtoMessage()    {}
 func (*Hash) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_4fd1fd2866d3bc11, []int{3}
+	return fileDescriptor_4ab6101dd6eab75c, []int{3}
 }
+
 func (m *Hash) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Hash.Unmarshal(m, b)
 }
 func (m *Hash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Hash.Marshal(b, m, deterministic)
 }
-func (dst *Hash) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Hash.Merge(dst, src)
+func (m *Hash) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Hash.Merge(m, src)
 }
 func (m *Hash) XXX_Size() int {
 	return xxx_messageInfo_Hash.Size(m)
@@ -392,16 +401,17 @@ func (m *Command) Reset()         { *m = Command{} }
 func (m *Command) String() string { return proto.CompactTextString(m) }
 func (*Command) ProtoMessage()    {}
 func (*Command) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_4fd1fd2866d3bc11, []int{4}
+	return fileDescriptor_4ab6101dd6eab75c, []int{4}
 }
+
 func (m *Command) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Command.Unmarshal(m, b)
 }
 func (m *Command) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Command.Marshal(b, m, deterministic)
 }
-func (dst *Command) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Command.Merge(dst, src)
+func (m *Command) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Command.Merge(m, src)
 }
 func (m *Command) XXX_Size() int {
 	return xxx_messageInfo_Command.Size(m)
@@ -477,16 +487,17 @@ func (m *Artifact) Reset()         { *m = Artifact{} }
 func (m *Artifact) String() string { return proto.CompactTextString(m) }
 func (*Artifact) ProtoMessage()    {}
 func (*Artifact) Descriptor() ([]byte, []int) {
-	return fileDescriptor_provenance_4fd1fd2866d3bc11, []int{5}
+	return fileDescriptor_4ab6101dd6eab75c, []int{5}
 }
+
 func (m *Artifact) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Artifact.Unmarshal(m, b)
 }
 func (m *Artifact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Artifact.Marshal(b, m, deterministic)
 }
-func (dst *Artifact) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Artifact.Merge(dst, src)
+func (m *Artifact) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifact.Merge(m, src)
 }
 func (m *Artifact) XXX_Size() int {
 	return xxx_messageInfo_Artifact.Size(m)
@@ -519,6 +530,7 @@ func (m *Artifact) GetNames() []string {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.provenance.Hash_HashType", Hash_HashType_name, Hash_HashType_value)
 	proto.RegisterType((*BuildProvenance)(nil), "grafeas.v1beta1.provenance.BuildProvenance")
 	proto.RegisterMapType((map[string]string)(nil), "grafeas.v1beta1.provenance.BuildProvenance.BuildOptionsEntry")
 	proto.RegisterType((*Source)(nil), "grafeas.v1beta1.provenance.Source")
@@ -527,14 +539,13 @@ func init() {
 	proto.RegisterType((*Hash)(nil), "grafeas.v1beta1.provenance.Hash")
 	proto.RegisterType((*Command)(nil), "grafeas.v1beta1.provenance.Command")
 	proto.RegisterType((*Artifact)(nil), "grafeas.v1beta1.provenance.Artifact")
-	proto.RegisterEnum("grafeas.v1beta1.provenance.Hash_HashType", Hash_HashType_name, Hash_HashType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/provenance/provenance.proto", fileDescriptor_provenance_4fd1fd2866d3bc11)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/provenance/provenance.proto", fileDescriptor_4ab6101dd6eab75c)
 }
 
-var fileDescriptor_provenance_4fd1fd2866d3bc11 = []byte{
+var fileDescriptor_4ab6101dd6eab75c = []byte{
 	// 848 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4b, 0x6f, 0x23, 0x45,
 	0x10, 0x66, 0xfc, 0x1c, 0x97, 0xb3, 0x49, 0xb6, 0x59, 0xa4, 0x8e, 0x51, 0x44, 0x64, 0x5e, 0xe1,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go b/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go
index b9acf23a98..3c7dc56a1f 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/source/source.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/source/source.proto
 
-package source // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/source"
+package source
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of an alias.
 type AliasContext_Kind int32
@@ -39,6 +42,7 @@ var AliasContext_Kind_name = map[int32]string{
 	2: "MOVABLE",
 	4: "OTHER",
 }
+
 var AliasContext_Kind_value = map[string]int32{
 	"KIND_UNSPECIFIED": 0,
 	"FIXED":            1,
@@ -49,8 +53,9 @@ var AliasContext_Kind_value = map[string]int32{
 func (x AliasContext_Kind) String() string {
 	return proto.EnumName(AliasContext_Kind_name, int32(x))
 }
+
 func (AliasContext_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{1, 0}
+	return fileDescriptor_9e8da9cb20b4f843, []int{1, 0}
 }
 
 // A SourceContext is a reference to a tree of files. A SourceContext together
@@ -74,16 +79,17 @@ func (m *SourceContext) Reset()         { *m = SourceContext{} }
 func (m *SourceContext) String() string { return proto.CompactTextString(m) }
 func (*SourceContext) ProtoMessage()    {}
 func (*SourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{0}
+	return fileDescriptor_9e8da9cb20b4f843, []int{0}
 }
+
 func (m *SourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceContext.Unmarshal(m, b)
 }
 func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
 }
-func (dst *SourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceContext.Merge(dst, src)
+func (m *SourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceContext.Merge(m, src)
 }
 func (m *SourceContext) XXX_Size() int {
 	return xxx_messageInfo_SourceContext.Size(m)
@@ -151,99 +157,15 @@ func (m *SourceContext) GetLabels() map[string]string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SourceContext_OneofMarshaler, _SourceContext_OneofUnmarshaler, _SourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SourceContext_CloudRepo)(nil),
 		(*SourceContext_Gerrit)(nil),
 		(*SourceContext_Git)(nil),
 	}
 }
 
-func _SourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SourceContext)
-	// context
-	switch x := m.Context.(type) {
-	case *SourceContext_CloudRepo:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudRepo); err != nil {
-			return err
-		}
-	case *SourceContext_Gerrit:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Gerrit); err != nil {
-			return err
-		}
-	case *SourceContext_Git:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Git); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SourceContext.Context has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SourceContext)
-	switch tag {
-	case 1: // context.cloud_repo
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudRepoSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_CloudRepo{msg}
-		return true, err
-	case 2: // context.gerrit
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GerritSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_Gerrit{msg}
-		return true, err
-	case 3: // context.git
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GitSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_Git{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SourceContext)
-	// context
-	switch x := m.Context.(type) {
-	case *SourceContext_CloudRepo:
-		s := proto.Size(x.CloudRepo)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SourceContext_Gerrit:
-		s := proto.Size(x.Gerrit)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SourceContext_Git:
-		s := proto.Size(x.Git)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An alias to a repo revision.
 type AliasContext struct {
 	// The alias kind.
@@ -259,16 +181,17 @@ func (m *AliasContext) Reset()         { *m = AliasContext{} }
 func (m *AliasContext) String() string { return proto.CompactTextString(m) }
 func (*AliasContext) ProtoMessage()    {}
 func (*AliasContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{1}
+	return fileDescriptor_9e8da9cb20b4f843, []int{1}
 }
+
 func (m *AliasContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AliasContext.Unmarshal(m, b)
 }
 func (m *AliasContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AliasContext.Marshal(b, m, deterministic)
 }
-func (dst *AliasContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AliasContext.Merge(dst, src)
+func (m *AliasContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AliasContext.Merge(m, src)
 }
 func (m *AliasContext) XXX_Size() int {
 	return xxx_messageInfo_AliasContext.Size(m)
@@ -314,16 +237,17 @@ func (m *CloudRepoSourceContext) Reset()         { *m = CloudRepoSourceContext{}
 func (m *CloudRepoSourceContext) String() string { return proto.CompactTextString(m) }
 func (*CloudRepoSourceContext) ProtoMessage()    {}
 func (*CloudRepoSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{2}
+	return fileDescriptor_9e8da9cb20b4f843, []int{2}
 }
+
 func (m *CloudRepoSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudRepoSourceContext.Unmarshal(m, b)
 }
 func (m *CloudRepoSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudRepoSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudRepoSourceContext.Merge(dst, src)
+func (m *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudRepoSourceContext.Merge(m, src)
 }
 func (m *CloudRepoSourceContext) XXX_Size() int {
 	return xxx_messageInfo_CloudRepoSourceContext.Size(m)
@@ -378,76 +302,14 @@ func (m *CloudRepoSourceContext) GetAliasContext() *AliasContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CloudRepoSourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CloudRepoSourceContext_OneofMarshaler, _CloudRepoSourceContext_OneofUnmarshaler, _CloudRepoSourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CloudRepoSourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CloudRepoSourceContext_RevisionId)(nil),
 		(*CloudRepoSourceContext_AliasContext)(nil),
 	}
 }
 
-func _CloudRepoSourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CloudRepoSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *CloudRepoSourceContext_RevisionId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.RevisionId)
-	case *CloudRepoSourceContext_AliasContext:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AliasContext); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CloudRepoSourceContext.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CloudRepoSourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CloudRepoSourceContext)
-	switch tag {
-	case 2: // revision.revision_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &CloudRepoSourceContext_RevisionId{x}
-		return true, err
-	case 3: // revision.alias_context
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AliasContext)
-		err := b.DecodeMessage(msg)
-		m.Revision = &CloudRepoSourceContext_AliasContext{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CloudRepoSourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CloudRepoSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *CloudRepoSourceContext_RevisionId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RevisionId)))
-		n += len(x.RevisionId)
-	case *CloudRepoSourceContext_AliasContext:
-		s := proto.Size(x.AliasContext)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A SourceContext referring to a Gerrit project.
 type GerritSourceContext struct {
 	// The URI of a running Gerrit instance.
@@ -472,16 +334,17 @@ func (m *GerritSourceContext) Reset()         { *m = GerritSourceContext{} }
 func (m *GerritSourceContext) String() string { return proto.CompactTextString(m) }
 func (*GerritSourceContext) ProtoMessage()    {}
 func (*GerritSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{3}
+	return fileDescriptor_9e8da9cb20b4f843, []int{3}
 }
+
 func (m *GerritSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GerritSourceContext.Unmarshal(m, b)
 }
 func (m *GerritSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GerritSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *GerritSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GerritSourceContext.Merge(dst, src)
+func (m *GerritSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GerritSourceContext.Merge(m, src)
 }
 func (m *GerritSourceContext) XXX_Size() int {
 	return xxx_messageInfo_GerritSourceContext.Size(m)
@@ -543,76 +406,14 @@ func (m *GerritSourceContext) GetAliasContext() *AliasContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GerritSourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GerritSourceContext_OneofMarshaler, _GerritSourceContext_OneofUnmarshaler, _GerritSourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GerritSourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GerritSourceContext_RevisionId)(nil),
 		(*GerritSourceContext_AliasContext)(nil),
 	}
 }
 
-func _GerritSourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GerritSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *GerritSourceContext_RevisionId:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.RevisionId)
-	case *GerritSourceContext_AliasContext:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AliasContext); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GerritSourceContext.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GerritSourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GerritSourceContext)
-	switch tag {
-	case 3: // revision.revision_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &GerritSourceContext_RevisionId{x}
-		return true, err
-	case 4: // revision.alias_context
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AliasContext)
-		err := b.DecodeMessage(msg)
-		m.Revision = &GerritSourceContext_AliasContext{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GerritSourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GerritSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *GerritSourceContext_RevisionId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RevisionId)))
-		n += len(x.RevisionId)
-	case *GerritSourceContext_AliasContext:
-		s := proto.Size(x.AliasContext)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A GitSourceContext denotes a particular revision in a third party Git
 // repository (e.g., GitHub).
 type GitSourceContext struct {
@@ -629,16 +430,17 @@ func (m *GitSourceContext) Reset()         { *m = GitSourceContext{} }
 func (m *GitSourceContext) String() string { return proto.CompactTextString(m) }
 func (*GitSourceContext) ProtoMessage()    {}
 func (*GitSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{4}
+	return fileDescriptor_9e8da9cb20b4f843, []int{4}
 }
+
 func (m *GitSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GitSourceContext.Unmarshal(m, b)
 }
 func (m *GitSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GitSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *GitSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GitSourceContext.Merge(dst, src)
+func (m *GitSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GitSourceContext.Merge(m, src)
 }
 func (m *GitSourceContext) XXX_Size() int {
 	return xxx_messageInfo_GitSourceContext.Size(m)
@@ -681,16 +483,17 @@ func (m *RepoId) Reset()         { *m = RepoId{} }
 func (m *RepoId) String() string { return proto.CompactTextString(m) }
 func (*RepoId) ProtoMessage()    {}
 func (*RepoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{5}
+	return fileDescriptor_9e8da9cb20b4f843, []int{5}
 }
+
 func (m *RepoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepoId.Unmarshal(m, b)
 }
 func (m *RepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepoId.Marshal(b, m, deterministic)
 }
-func (dst *RepoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepoId.Merge(dst, src)
+func (m *RepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoId.Merge(m, src)
 }
 func (m *RepoId) XXX_Size() int {
 	return xxx_messageInfo_RepoId.Size(m)
@@ -738,76 +541,14 @@ func (m *RepoId) GetUid() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RepoId) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RepoId_OneofMarshaler, _RepoId_OneofUnmarshaler, _RepoId_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RepoId) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RepoId_ProjectRepoId)(nil),
 		(*RepoId_Uid)(nil),
 	}
 }
 
-func _RepoId_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RepoId)
-	// id
-	switch x := m.Id.(type) {
-	case *RepoId_ProjectRepoId:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProjectRepoId); err != nil {
-			return err
-		}
-	case *RepoId_Uid:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uid)
-	case nil:
-	default:
-		return fmt.Errorf("RepoId.Id has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RepoId_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RepoId)
-	switch tag {
-	case 1: // id.project_repo_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProjectRepoId)
-		err := b.DecodeMessage(msg)
-		m.Id = &RepoId_ProjectRepoId{msg}
-		return true, err
-	case 2: // id.uid
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Id = &RepoId_Uid{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RepoId_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RepoId)
-	// id
-	switch x := m.Id.(type) {
-	case *RepoId_ProjectRepoId:
-		s := proto.Size(x.ProjectRepoId)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RepoId_Uid:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uid)))
-		n += len(x.Uid)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Selects a repo using a Google Cloud Platform project ID (e.g.,
 // winged-cargo-31) and a repo name within that project.
 type ProjectRepoId struct {
@@ -824,16 +565,17 @@ func (m *ProjectRepoId) Reset()         { *m = ProjectRepoId{} }
 func (m *ProjectRepoId) String() string { return proto.CompactTextString(m) }
 func (*ProjectRepoId) ProtoMessage()    {}
 func (*ProjectRepoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_41019e073d7a9204, []int{6}
+	return fileDescriptor_9e8da9cb20b4f843, []int{6}
 }
+
 func (m *ProjectRepoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProjectRepoId.Unmarshal(m, b)
 }
 func (m *ProjectRepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProjectRepoId.Marshal(b, m, deterministic)
 }
-func (dst *ProjectRepoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProjectRepoId.Merge(dst, src)
+func (m *ProjectRepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectRepoId.Merge(m, src)
 }
 func (m *ProjectRepoId) XXX_Size() int {
 	return xxx_messageInfo_ProjectRepoId.Size(m)
@@ -859,6 +601,7 @@ func (m *ProjectRepoId) GetRepoName() string {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.source.AliasContext_Kind", AliasContext_Kind_name, AliasContext_Kind_value)
 	proto.RegisterType((*SourceContext)(nil), "grafeas.v1beta1.source.SourceContext")
 	proto.RegisterMapType((map[string]string)(nil), "grafeas.v1beta1.source.SourceContext.LabelsEntry")
 	proto.RegisterType((*AliasContext)(nil), "grafeas.v1beta1.source.AliasContext")
@@ -867,14 +610,13 @@ func init() {
 	proto.RegisterType((*GitSourceContext)(nil), "grafeas.v1beta1.source.GitSourceContext")
 	proto.RegisterType((*RepoId)(nil), "grafeas.v1beta1.source.RepoId")
 	proto.RegisterType((*ProjectRepoId)(nil), "grafeas.v1beta1.source.ProjectRepoId")
-	proto.RegisterEnum("grafeas.v1beta1.source.AliasContext_Kind", AliasContext_Kind_name, AliasContext_Kind_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/source/source.proto", fileDescriptor_source_41019e073d7a9204)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/source/source.proto", fileDescriptor_9e8da9cb20b4f843)
 }
 
-var fileDescriptor_source_41019e073d7a9204 = []byte{
+var fileDescriptor_9e8da9cb20b4f843 = []byte{
 	// 640 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdd, 0x4e, 0xdb, 0x30,
 	0x18, 0x6d, 0xda, 0xd0, 0x92, 0xaf, 0x94, 0x45, 0x1e, 0x42, 0x65, 0xd3, 0x36, 0x16, 0x0d, 0x89,
diff --git a/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go b/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go
index dc31bf47df..8dddaea3fb 100644
--- a/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go
+++ b/googleapis/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.proto
 
-package vulnerability // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/vulnerability"
+package vulnerability
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
-import _package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	common "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/common"
+	_package "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/package"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Note provider-assigned severity/impact ranking.
 type Severity int32
@@ -46,6 +49,7 @@ var Severity_name = map[int32]string{
 	4: "HIGH",
 	5: "CRITICAL",
 }
+
 var Severity_value = map[string]int32{
 	"SEVERITY_UNSPECIFIED": 0,
 	"MINIMAL":              1,
@@ -58,8 +62,9 @@ var Severity_value = map[string]int32{
 func (x Severity) String() string {
 	return proto.EnumName(Severity_name, int32(x))
 }
+
 func (Severity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vulnerability_de415cb4c75f5ae1, []int{0}
+	return fileDescriptor_2a1e5608ee0186b1, []int{0}
 }
 
 // Vulnerability provides metadata about a security vulnerability.
@@ -81,16 +86,17 @@ func (m *Vulnerability) Reset()         { *m = Vulnerability{} }
 func (m *Vulnerability) String() string { return proto.CompactTextString(m) }
 func (*Vulnerability) ProtoMessage()    {}
 func (*Vulnerability) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vulnerability_de415cb4c75f5ae1, []int{0}
+	return fileDescriptor_2a1e5608ee0186b1, []int{0}
 }
+
 func (m *Vulnerability) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vulnerability.Unmarshal(m, b)
 }
 func (m *Vulnerability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vulnerability.Marshal(b, m, deterministic)
 }
-func (dst *Vulnerability) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vulnerability.Merge(dst, src)
+func (m *Vulnerability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vulnerability.Merge(m, src)
 }
 func (m *Vulnerability) XXX_Size() int {
 	return xxx_messageInfo_Vulnerability.Size(m)
@@ -157,16 +163,17 @@ func (m *Vulnerability_Detail) Reset()         { *m = Vulnerability_Detail{} }
 func (m *Vulnerability_Detail) String() string { return proto.CompactTextString(m) }
 func (*Vulnerability_Detail) ProtoMessage()    {}
 func (*Vulnerability_Detail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vulnerability_de415cb4c75f5ae1, []int{0, 0}
+	return fileDescriptor_2a1e5608ee0186b1, []int{0, 0}
 }
+
 func (m *Vulnerability_Detail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vulnerability_Detail.Unmarshal(m, b)
 }
 func (m *Vulnerability_Detail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vulnerability_Detail.Marshal(b, m, deterministic)
 }
-func (dst *Vulnerability_Detail) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vulnerability_Detail.Merge(dst, src)
+func (m *Vulnerability_Detail) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vulnerability_Detail.Merge(m, src)
 }
 func (m *Vulnerability_Detail) XXX_Size() int {
 	return xxx_messageInfo_Vulnerability_Detail.Size(m)
@@ -269,16 +276,17 @@ func (m *Details) Reset()         { *m = Details{} }
 func (m *Details) String() string { return proto.CompactTextString(m) }
 func (*Details) ProtoMessage()    {}
 func (*Details) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vulnerability_de415cb4c75f5ae1, []int{1}
+	return fileDescriptor_2a1e5608ee0186b1, []int{1}
 }
+
 func (m *Details) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Details.Unmarshal(m, b)
 }
 func (m *Details) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Details.Marshal(b, m, deterministic)
 }
-func (dst *Details) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Details.Merge(dst, src)
+func (m *Details) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Details.Merge(m, src)
 }
 func (m *Details) XXX_Size() int {
 	return xxx_messageInfo_Details.Size(m)
@@ -356,16 +364,17 @@ func (m *PackageIssue) Reset()         { *m = PackageIssue{} }
 func (m *PackageIssue) String() string { return proto.CompactTextString(m) }
 func (*PackageIssue) ProtoMessage()    {}
 func (*PackageIssue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vulnerability_de415cb4c75f5ae1, []int{2}
+	return fileDescriptor_2a1e5608ee0186b1, []int{2}
 }
+
 func (m *PackageIssue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackageIssue.Unmarshal(m, b)
 }
 func (m *PackageIssue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PackageIssue.Marshal(b, m, deterministic)
 }
-func (dst *PackageIssue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PackageIssue.Merge(dst, src)
+func (m *PackageIssue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageIssue.Merge(m, src)
 }
 func (m *PackageIssue) XXX_Size() int {
 	return xxx_messageInfo_PackageIssue.Size(m)
@@ -415,16 +424,17 @@ func (m *VulnerabilityLocation) Reset()         { *m = VulnerabilityLocation{} }
 func (m *VulnerabilityLocation) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityLocation) ProtoMessage()    {}
 func (*VulnerabilityLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vulnerability_de415cb4c75f5ae1, []int{3}
+	return fileDescriptor_2a1e5608ee0186b1, []int{3}
 }
+
 func (m *VulnerabilityLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VulnerabilityLocation.Unmarshal(m, b)
 }
 func (m *VulnerabilityLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VulnerabilityLocation.Marshal(b, m, deterministic)
 }
-func (dst *VulnerabilityLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VulnerabilityLocation.Merge(dst, src)
+func (m *VulnerabilityLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityLocation.Merge(m, src)
 }
 func (m *VulnerabilityLocation) XXX_Size() int {
 	return xxx_messageInfo_VulnerabilityLocation.Size(m)
@@ -457,19 +467,19 @@ func (m *VulnerabilityLocation) GetVersion() *_package.Version {
 }
 
 func init() {
+	proto.RegisterEnum("grafeas.v1beta1.vulnerability.Severity", Severity_name, Severity_value)
 	proto.RegisterType((*Vulnerability)(nil), "grafeas.v1beta1.vulnerability.Vulnerability")
 	proto.RegisterType((*Vulnerability_Detail)(nil), "grafeas.v1beta1.vulnerability.Vulnerability.Detail")
 	proto.RegisterType((*Details)(nil), "grafeas.v1beta1.vulnerability.Details")
 	proto.RegisterType((*PackageIssue)(nil), "grafeas.v1beta1.vulnerability.PackageIssue")
 	proto.RegisterType((*VulnerabilityLocation)(nil), "grafeas.v1beta1.vulnerability.VulnerabilityLocation")
-	proto.RegisterEnum("grafeas.v1beta1.vulnerability.Severity", Severity_name, Severity_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.proto", fileDescriptor_vulnerability_de415cb4c75f5ae1)
+	proto.RegisterFile("google/devtools/containeranalysis/v1beta1/vulnerability/vulnerability.proto", fileDescriptor_2a1e5608ee0186b1)
 }
 
-var fileDescriptor_vulnerability_de415cb4c75f5ae1 = []byte{
+var fileDescriptor_2a1e5608ee0186b1 = []byte{
 	// 727 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0xda, 0x48,
 	0x14, 0x5e, 0x63, 0x82, 0xe1, 0x00, 0x59, 0x67, 0x94, 0xd5, 0x5a, 0x59, 0x45, 0xeb, 0x65, 0x2f,
diff --git a/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go b/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
index 000ca7a352..aeb46b0eda 100644
--- a/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
+++ b/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteexecution/v1test/remote_execution.proto
 
-package remoteexecution // import "google.golang.org/genproto/googleapis/devtools/remoteexecution/v1test"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package remoteexecution
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The current stage of execution.
 type ExecuteOperationMetadata_Stage int32
@@ -49,6 +49,7 @@ var ExecuteOperationMetadata_Stage_name = map[int32]string{
 	3: "EXECUTING",
 	4: "COMPLETED",
 }
+
 var ExecuteOperationMetadata_Stage_value = map[string]int32{
 	"UNKNOWN":     0,
 	"CACHE_CHECK": 1,
@@ -60,8 +61,9 @@ var ExecuteOperationMetadata_Stage_value = map[string]int32{
 func (x ExecuteOperationMetadata_Stage) String() string {
 	return proto.EnumName(ExecuteOperationMetadata_Stage_name, int32(x))
 }
+
 func (ExecuteOperationMetadata_Stage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{14, 0}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{14, 0}
 }
 
 // An `Action` captures all the information about an execution which is required
@@ -162,16 +164,17 @@ func (m *Action) Reset()         { *m = Action{} }
 func (m *Action) String() string { return proto.CompactTextString(m) }
 func (*Action) ProtoMessage()    {}
 func (*Action) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{0}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{0}
 }
+
 func (m *Action) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action.Unmarshal(m, b)
 }
 func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action.Marshal(b, m, deterministic)
 }
-func (dst *Action) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action.Merge(dst, src)
+func (m *Action) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action.Merge(m, src)
 }
 func (m *Action) XXX_Size() int {
 	return xxx_messageInfo_Action.Size(m)
@@ -261,16 +264,17 @@ func (m *Command) Reset()         { *m = Command{} }
 func (m *Command) String() string { return proto.CompactTextString(m) }
 func (*Command) ProtoMessage()    {}
 func (*Command) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{1}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{1}
 }
+
 func (m *Command) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Command.Unmarshal(m, b)
 }
 func (m *Command) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Command.Marshal(b, m, deterministic)
 }
-func (dst *Command) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Command.Merge(dst, src)
+func (m *Command) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Command.Merge(m, src)
 }
 func (m *Command) XXX_Size() int {
 	return xxx_messageInfo_Command.Size(m)
@@ -311,16 +315,17 @@ func (m *Command_EnvironmentVariable) Reset()         { *m = Command_Environment
 func (m *Command_EnvironmentVariable) String() string { return proto.CompactTextString(m) }
 func (*Command_EnvironmentVariable) ProtoMessage()    {}
 func (*Command_EnvironmentVariable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{1, 0}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{1, 0}
 }
+
 func (m *Command_EnvironmentVariable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Command_EnvironmentVariable.Unmarshal(m, b)
 }
 func (m *Command_EnvironmentVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Command_EnvironmentVariable.Marshal(b, m, deterministic)
 }
-func (dst *Command_EnvironmentVariable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Command_EnvironmentVariable.Merge(dst, src)
+func (m *Command_EnvironmentVariable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Command_EnvironmentVariable.Merge(m, src)
 }
 func (m *Command_EnvironmentVariable) XXX_Size() int {
 	return xxx_messageInfo_Command_EnvironmentVariable.Size(m)
@@ -368,16 +373,17 @@ func (m *Platform) Reset()         { *m = Platform{} }
 func (m *Platform) String() string { return proto.CompactTextString(m) }
 func (*Platform) ProtoMessage()    {}
 func (*Platform) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{2}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{2}
 }
+
 func (m *Platform) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Platform.Unmarshal(m, b)
 }
 func (m *Platform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Platform.Marshal(b, m, deterministic)
 }
-func (dst *Platform) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Platform.Merge(dst, src)
+func (m *Platform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Platform.Merge(m, src)
 }
 func (m *Platform) XXX_Size() int {
 	return xxx_messageInfo_Platform.Size(m)
@@ -426,16 +432,17 @@ func (m *Platform_Property) Reset()         { *m = Platform_Property{} }
 func (m *Platform_Property) String() string { return proto.CompactTextString(m) }
 func (*Platform_Property) ProtoMessage()    {}
 func (*Platform_Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{2, 0}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{2, 0}
 }
+
 func (m *Platform_Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Platform_Property.Unmarshal(m, b)
 }
 func (m *Platform_Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Platform_Property.Marshal(b, m, deterministic)
 }
-func (dst *Platform_Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Platform_Property.Merge(dst, src)
+func (m *Platform_Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Platform_Property.Merge(m, src)
 }
 func (m *Platform_Property) XXX_Size() int {
 	return xxx_messageInfo_Platform_Property.Size(m)
@@ -534,16 +541,17 @@ func (m *Directory) Reset()         { *m = Directory{} }
 func (m *Directory) String() string { return proto.CompactTextString(m) }
 func (*Directory) ProtoMessage()    {}
 func (*Directory) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{3}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{3}
 }
+
 func (m *Directory) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Directory.Unmarshal(m, b)
 }
 func (m *Directory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Directory.Marshal(b, m, deterministic)
 }
-func (dst *Directory) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Directory.Merge(dst, src)
+func (m *Directory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Directory.Merge(m, src)
 }
 func (m *Directory) XXX_Size() int {
 	return xxx_messageInfo_Directory.Size(m)
@@ -585,16 +593,17 @@ func (m *FileNode) Reset()         { *m = FileNode{} }
 func (m *FileNode) String() string { return proto.CompactTextString(m) }
 func (*FileNode) ProtoMessage()    {}
 func (*FileNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{4}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{4}
 }
+
 func (m *FileNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileNode.Unmarshal(m, b)
 }
 func (m *FileNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileNode.Marshal(b, m, deterministic)
 }
-func (dst *FileNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileNode.Merge(dst, src)
+func (m *FileNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileNode.Merge(m, src)
 }
 func (m *FileNode) XXX_Size() int {
 	return xxx_messageInfo_FileNode.Size(m)
@@ -646,16 +655,17 @@ func (m *DirectoryNode) Reset()         { *m = DirectoryNode{} }
 func (m *DirectoryNode) String() string { return proto.CompactTextString(m) }
 func (*DirectoryNode) ProtoMessage()    {}
 func (*DirectoryNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{5}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{5}
 }
+
 func (m *DirectoryNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DirectoryNode.Unmarshal(m, b)
 }
 func (m *DirectoryNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DirectoryNode.Marshal(b, m, deterministic)
 }
-func (dst *DirectoryNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DirectoryNode.Merge(dst, src)
+func (m *DirectoryNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DirectoryNode.Merge(m, src)
 }
 func (m *DirectoryNode) XXX_Size() int {
 	return xxx_messageInfo_DirectoryNode.Size(m)
@@ -726,16 +736,17 @@ func (m *Digest) Reset()         { *m = Digest{} }
 func (m *Digest) String() string { return proto.CompactTextString(m) }
 func (*Digest) ProtoMessage()    {}
 func (*Digest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{6}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{6}
 }
+
 func (m *Digest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Digest.Unmarshal(m, b)
 }
 func (m *Digest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Digest.Marshal(b, m, deterministic)
 }
-func (dst *Digest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Digest.Merge(dst, src)
+func (m *Digest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Digest.Merge(m, src)
 }
 func (m *Digest) XXX_Size() int {
 	return xxx_messageInfo_Digest.Size(m)
@@ -866,16 +877,17 @@ func (m *ActionResult) Reset()         { *m = ActionResult{} }
 func (m *ActionResult) String() string { return proto.CompactTextString(m) }
 func (*ActionResult) ProtoMessage()    {}
 func (*ActionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{7}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{7}
 }
+
 func (m *ActionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ActionResult.Unmarshal(m, b)
 }
 func (m *ActionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ActionResult.Marshal(b, m, deterministic)
 }
-func (dst *ActionResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ActionResult.Merge(dst, src)
+func (m *ActionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ActionResult.Merge(m, src)
 }
 func (m *ActionResult) XXX_Size() int {
 	return xxx_messageInfo_ActionResult.Size(m)
@@ -970,16 +982,17 @@ func (m *OutputFile) Reset()         { *m = OutputFile{} }
 func (m *OutputFile) String() string { return proto.CompactTextString(m) }
 func (*OutputFile) ProtoMessage()    {}
 func (*OutputFile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{8}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{8}
 }
+
 func (m *OutputFile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputFile.Unmarshal(m, b)
 }
 func (m *OutputFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputFile.Marshal(b, m, deterministic)
 }
-func (dst *OutputFile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputFile.Merge(dst, src)
+func (m *OutputFile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputFile.Merge(m, src)
 }
 func (m *OutputFile) XXX_Size() int {
 	return xxx_messageInfo_OutputFile.Size(m)
@@ -1038,16 +1051,17 @@ func (m *Tree) Reset()         { *m = Tree{} }
 func (m *Tree) String() string { return proto.CompactTextString(m) }
 func (*Tree) ProtoMessage()    {}
 func (*Tree) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{9}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{9}
 }
+
 func (m *Tree) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Tree.Unmarshal(m, b)
 }
 func (m *Tree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Tree.Marshal(b, m, deterministic)
 }
-func (dst *Tree) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Tree.Merge(dst, src)
+func (m *Tree) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Tree.Merge(m, src)
 }
 func (m *Tree) XXX_Size() int {
 	return xxx_messageInfo_Tree.Size(m)
@@ -1095,16 +1109,17 @@ func (m *OutputDirectory) Reset()         { *m = OutputDirectory{} }
 func (m *OutputDirectory) String() string { return proto.CompactTextString(m) }
 func (*OutputDirectory) ProtoMessage()    {}
 func (*OutputDirectory) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{10}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{10}
 }
+
 func (m *OutputDirectory) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputDirectory.Unmarshal(m, b)
 }
 func (m *OutputDirectory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputDirectory.Marshal(b, m, deterministic)
 }
-func (dst *OutputDirectory) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputDirectory.Merge(dst, src)
+func (m *OutputDirectory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputDirectory.Merge(m, src)
 }
 func (m *OutputDirectory) XXX_Size() int {
 	return xxx_messageInfo_OutputDirectory.Size(m)
@@ -1166,16 +1181,17 @@ func (m *ExecuteRequest) Reset()         { *m = ExecuteRequest{} }
 func (m *ExecuteRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteRequest) ProtoMessage()    {}
 func (*ExecuteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{11}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{11}
 }
+
 func (m *ExecuteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteRequest.Unmarshal(m, b)
 }
 func (m *ExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteRequest.Merge(dst, src)
+func (m *ExecuteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteRequest.Merge(m, src)
 }
 func (m *ExecuteRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteRequest.Size(m)
@@ -1240,16 +1256,17 @@ func (m *LogFile) Reset()         { *m = LogFile{} }
 func (m *LogFile) String() string { return proto.CompactTextString(m) }
 func (*LogFile) ProtoMessage()    {}
 func (*LogFile) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{12}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{12}
 }
+
 func (m *LogFile) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogFile.Unmarshal(m, b)
 }
 func (m *LogFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogFile.Marshal(b, m, deterministic)
 }
-func (dst *LogFile) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogFile.Merge(dst, src)
+func (m *LogFile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogFile.Merge(m, src)
 }
 func (m *LogFile) XXX_Size() int {
 	return xxx_messageInfo_LogFile.Size(m)
@@ -1312,16 +1329,17 @@ func (m *ExecuteResponse) Reset()         { *m = ExecuteResponse{} }
 func (m *ExecuteResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteResponse) ProtoMessage()    {}
 func (*ExecuteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{13}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{13}
 }
+
 func (m *ExecuteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteResponse.Unmarshal(m, b)
 }
 func (m *ExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteResponse.Merge(dst, src)
+func (m *ExecuteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteResponse.Merge(m, src)
 }
 func (m *ExecuteResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteResponse.Size(m)
@@ -1387,16 +1405,17 @@ func (m *ExecuteOperationMetadata) Reset()         { *m = ExecuteOperationMetada
 func (m *ExecuteOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExecuteOperationMetadata) ProtoMessage()    {}
 func (*ExecuteOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{14}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{14}
 }
+
 func (m *ExecuteOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteOperationMetadata.Unmarshal(m, b)
 }
 func (m *ExecuteOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteOperationMetadata.Merge(dst, src)
+func (m *ExecuteOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteOperationMetadata.Merge(m, src)
 }
 func (m *ExecuteOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExecuteOperationMetadata.Size(m)
@@ -1456,16 +1475,17 @@ func (m *GetActionResultRequest) Reset()         { *m = GetActionResultRequest{}
 func (m *GetActionResultRequest) String() string { return proto.CompactTextString(m) }
 func (*GetActionResultRequest) ProtoMessage()    {}
 func (*GetActionResultRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{15}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{15}
 }
+
 func (m *GetActionResultRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetActionResultRequest.Unmarshal(m, b)
 }
 func (m *GetActionResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetActionResultRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetActionResultRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetActionResultRequest.Merge(dst, src)
+func (m *GetActionResultRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetActionResultRequest.Merge(m, src)
 }
 func (m *GetActionResultRequest) XXX_Size() int {
 	return xxx_messageInfo_GetActionResultRequest.Size(m)
@@ -1514,16 +1534,17 @@ func (m *UpdateActionResultRequest) Reset()         { *m = UpdateActionResultReq
 func (m *UpdateActionResultRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateActionResultRequest) ProtoMessage()    {}
 func (*UpdateActionResultRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{16}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{16}
 }
+
 func (m *UpdateActionResultRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateActionResultRequest.Unmarshal(m, b)
 }
 func (m *UpdateActionResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateActionResultRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateActionResultRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateActionResultRequest.Merge(dst, src)
+func (m *UpdateActionResultRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateActionResultRequest.Merge(m, src)
 }
 func (m *UpdateActionResultRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateActionResultRequest.Size(m)
@@ -1575,16 +1596,17 @@ func (m *FindMissingBlobsRequest) Reset()         { *m = FindMissingBlobsRequest
 func (m *FindMissingBlobsRequest) String() string { return proto.CompactTextString(m) }
 func (*FindMissingBlobsRequest) ProtoMessage()    {}
 func (*FindMissingBlobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{17}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{17}
 }
+
 func (m *FindMissingBlobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FindMissingBlobsRequest.Unmarshal(m, b)
 }
 func (m *FindMissingBlobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FindMissingBlobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *FindMissingBlobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FindMissingBlobsRequest.Merge(dst, src)
+func (m *FindMissingBlobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FindMissingBlobsRequest.Merge(m, src)
 }
 func (m *FindMissingBlobsRequest) XXX_Size() int {
 	return xxx_messageInfo_FindMissingBlobsRequest.Size(m)
@@ -1623,16 +1645,17 @@ func (m *FindMissingBlobsResponse) Reset()         { *m = FindMissingBlobsRespon
 func (m *FindMissingBlobsResponse) String() string { return proto.CompactTextString(m) }
 func (*FindMissingBlobsResponse) ProtoMessage()    {}
 func (*FindMissingBlobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{18}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{18}
 }
+
 func (m *FindMissingBlobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FindMissingBlobsResponse.Unmarshal(m, b)
 }
 func (m *FindMissingBlobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FindMissingBlobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *FindMissingBlobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FindMissingBlobsResponse.Merge(dst, src)
+func (m *FindMissingBlobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FindMissingBlobsResponse.Merge(m, src)
 }
 func (m *FindMissingBlobsResponse) XXX_Size() int {
 	return xxx_messageInfo_FindMissingBlobsResponse.Size(m)
@@ -1666,16 +1689,17 @@ func (m *UpdateBlobRequest) Reset()         { *m = UpdateBlobRequest{} }
 func (m *UpdateBlobRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateBlobRequest) ProtoMessage()    {}
 func (*UpdateBlobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{19}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{19}
 }
+
 func (m *UpdateBlobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateBlobRequest.Unmarshal(m, b)
 }
 func (m *UpdateBlobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateBlobRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateBlobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateBlobRequest.Merge(dst, src)
+func (m *UpdateBlobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBlobRequest.Merge(m, src)
 }
 func (m *UpdateBlobRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateBlobRequest.Size(m)
@@ -1720,16 +1744,17 @@ func (m *BatchUpdateBlobsRequest) Reset()         { *m = BatchUpdateBlobsRequest
 func (m *BatchUpdateBlobsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateBlobsRequest) ProtoMessage()    {}
 func (*BatchUpdateBlobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{20}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{20}
 }
+
 func (m *BatchUpdateBlobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateBlobsRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdateBlobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateBlobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateBlobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateBlobsRequest.Merge(dst, src)
+func (m *BatchUpdateBlobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateBlobsRequest.Merge(m, src)
 }
 func (m *BatchUpdateBlobsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateBlobsRequest.Size(m)
@@ -1768,16 +1793,17 @@ func (m *BatchUpdateBlobsResponse) Reset()         { *m = BatchUpdateBlobsRespon
 func (m *BatchUpdateBlobsResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateBlobsResponse) ProtoMessage()    {}
 func (*BatchUpdateBlobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{21}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{21}
 }
+
 func (m *BatchUpdateBlobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateBlobsResponse.Unmarshal(m, b)
 }
 func (m *BatchUpdateBlobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateBlobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateBlobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateBlobsResponse.Merge(dst, src)
+func (m *BatchUpdateBlobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateBlobsResponse.Merge(m, src)
 }
 func (m *BatchUpdateBlobsResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateBlobsResponse.Size(m)
@@ -1810,16 +1836,17 @@ func (m *BatchUpdateBlobsResponse_Response) Reset()         { *m = BatchUpdateBl
 func (m *BatchUpdateBlobsResponse_Response) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateBlobsResponse_Response) ProtoMessage()    {}
 func (*BatchUpdateBlobsResponse_Response) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{21, 0}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{21, 0}
 }
+
 func (m *BatchUpdateBlobsResponse_Response) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdateBlobsResponse_Response.Unmarshal(m, b)
 }
 func (m *BatchUpdateBlobsResponse_Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdateBlobsResponse_Response.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdateBlobsResponse_Response) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdateBlobsResponse_Response.Merge(dst, src)
+func (m *BatchUpdateBlobsResponse_Response) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateBlobsResponse_Response.Merge(m, src)
 }
 func (m *BatchUpdateBlobsResponse_Response) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdateBlobsResponse_Response.Size(m)
@@ -1876,16 +1903,17 @@ func (m *GetTreeRequest) Reset()         { *m = GetTreeRequest{} }
 func (m *GetTreeRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTreeRequest) ProtoMessage()    {}
 func (*GetTreeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{22}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{22}
 }
+
 func (m *GetTreeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTreeRequest.Unmarshal(m, b)
 }
 func (m *GetTreeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTreeRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTreeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTreeRequest.Merge(dst, src)
+func (m *GetTreeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTreeRequest.Merge(m, src)
 }
 func (m *GetTreeRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTreeRequest.Size(m)
@@ -1943,16 +1971,17 @@ func (m *GetTreeResponse) Reset()         { *m = GetTreeResponse{} }
 func (m *GetTreeResponse) String() string { return proto.CompactTextString(m) }
 func (*GetTreeResponse) ProtoMessage()    {}
 func (*GetTreeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{23}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{23}
 }
+
 func (m *GetTreeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTreeResponse.Unmarshal(m, b)
 }
 func (m *GetTreeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTreeResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetTreeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTreeResponse.Merge(dst, src)
+func (m *GetTreeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTreeResponse.Merge(m, src)
 }
 func (m *GetTreeResponse) XXX_Size() int {
 	return xxx_messageInfo_GetTreeResponse.Size(m)
@@ -1992,16 +2021,17 @@ func (m *ToolDetails) Reset()         { *m = ToolDetails{} }
 func (m *ToolDetails) String() string { return proto.CompactTextString(m) }
 func (*ToolDetails) ProtoMessage()    {}
 func (*ToolDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{24}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{24}
 }
+
 func (m *ToolDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ToolDetails.Unmarshal(m, b)
 }
 func (m *ToolDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ToolDetails.Marshal(b, m, deterministic)
 }
-func (dst *ToolDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ToolDetails.Merge(dst, src)
+func (m *ToolDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ToolDetails.Merge(m, src)
 }
 func (m *ToolDetails) XXX_Size() int {
 	return xxx_messageInfo_ToolDetails.Size(m)
@@ -2054,16 +2084,17 @@ func (m *RequestMetadata) Reset()         { *m = RequestMetadata{} }
 func (m *RequestMetadata) String() string { return proto.CompactTextString(m) }
 func (*RequestMetadata) ProtoMessage()    {}
 func (*RequestMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_remote_execution_3cbae0ca1c4e63f2, []int{25}
+	return fileDescriptor_1fc46b2dca8a7fdb, []int{25}
 }
+
 func (m *RequestMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestMetadata.Unmarshal(m, b)
 }
 func (m *RequestMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestMetadata.Marshal(b, m, deterministic)
 }
-func (dst *RequestMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestMetadata.Merge(dst, src)
+func (m *RequestMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestMetadata.Merge(m, src)
 }
 func (m *RequestMetadata) XXX_Size() int {
 	return xxx_messageInfo_RequestMetadata.Size(m)
@@ -2103,6 +2134,7 @@ func (m *RequestMetadata) GetCorrelatedInvocationsId() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.remoteexecution.v1test.ExecuteOperationMetadata_Stage", ExecuteOperationMetadata_Stage_name, ExecuteOperationMetadata_Stage_value)
 	proto.RegisterType((*Action)(nil), "google.devtools.remoteexecution.v1test.Action")
 	proto.RegisterType((*Command)(nil), "google.devtools.remoteexecution.v1test.Command")
 	proto.RegisterType((*Command_EnvironmentVariable)(nil), "google.devtools.remoteexecution.v1test.Command.EnvironmentVariable")
@@ -2133,7 +2165,141 @@ func init() {
 	proto.RegisterType((*GetTreeResponse)(nil), "google.devtools.remoteexecution.v1test.GetTreeResponse")
 	proto.RegisterType((*ToolDetails)(nil), "google.devtools.remoteexecution.v1test.ToolDetails")
 	proto.RegisterType((*RequestMetadata)(nil), "google.devtools.remoteexecution.v1test.RequestMetadata")
-	proto.RegisterEnum("google.devtools.remoteexecution.v1test.ExecuteOperationMetadata_Stage", ExecuteOperationMetadata_Stage_name, ExecuteOperationMetadata_Stage_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/remoteexecution/v1test/remote_execution.proto", fileDescriptor_1fc46b2dca8a7fdb)
+}
+
+var fileDescriptor_1fc46b2dca8a7fdb = []byte{
+	// 2025 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xdd, 0x6f, 0x23, 0x57,
+	0x15, 0x67, 0xec, 0x24, 0xb6, 0x8f, 0x9d, 0x75, 0xf6, 0x76, 0xe9, 0x7a, 0xdd, 0x2e, 0x4a, 0xa7,
+	0xa2, 0x8a, 0xa2, 0x62, 0xb3, 0xde, 0x96, 0x85, 0x54, 0xa5, 0x6c, 0x1c, 0x27, 0x8d, 0x9a, 0xaf,
+	0x4e, 0xe2, 0x74, 0xbb, 0xaa, 0x34, 0x9d, 0x78, 0x6e, 0xc6, 0xa3, 0xd8, 0x73, 0xcd, 0xbd, 0xd7,
+	0x69, 0xd2, 0x65, 0x79, 0xe0, 0x05, 0x09, 0x04, 0x12, 0x54, 0x08, 0x24, 0x78, 0x42, 0x42, 0x48,
+	0x88, 0x27, 0xfe, 0x00, 0x24, 0xf8, 0x03, 0x78, 0x80, 0x17, 0x9e, 0x11, 0x2f, 0xbc, 0xf1, 0xdc,
+	0x07, 0x84, 0xee, 0xc7, 0x7c, 0xd8, 0xc9, 0xb2, 0x63, 0x67, 0x57, 0xe2, 0xcd, 0x73, 0xce, 0x3d,
+	0xbf, 0xf3, 0x79, 0xcf, 0x39, 0x33, 0x86, 0xb7, 0x3d, 0x42, 0xbc, 0x1e, 0xae, 0xbb, 0xf8, 0x94,
+	0x13, 0xd2, 0x63, 0x75, 0x8a, 0xfb, 0x84, 0x63, 0x7c, 0x86, 0x3b, 0x43, 0xee, 0x93, 0xa0, 0x7e,
+	0x7a, 0x87, 0x63, 0xc6, 0x35, 0xd9, 0x8e, 0xe8, 0xb5, 0x01, 0x25, 0x9c, 0xa0, 0xd7, 0x94, 0x78,
+	0x2d, 0x14, 0xaf, 0x8d, 0x89, 0xd7, 0x94, 0x78, 0xf5, 0x65, 0xad, 0xc6, 0x19, 0xf8, 0x75, 0x27,
+	0x08, 0x08, 0x77, 0x04, 0x97, 0x29, 0x94, 0xea, 0xab, 0x9a, 0xdb, 0x23, 0x81, 0x47, 0x87, 0x41,
+	0xe0, 0x07, 0x5e, 0x9d, 0x0c, 0x30, 0x1d, 0x39, 0xf4, 0x25, 0x7d, 0x48, 0x3e, 0x1d, 0x0d, 0x8f,
+	0xeb, 0xee, 0x50, 0x1d, 0xd0, 0xfc, 0x9b, 0x9a, 0x4f, 0x07, 0x9d, 0x3a, 0xe3, 0x0e, 0x1f, 0x6a,
+	0x41, 0xf3, 0x0f, 0x59, 0x98, 0xbb, 0xdf, 0x11, 0x27, 0x51, 0x1b, 0xae, 0x75, 0x48, 0xbf, 0xef,
+	0x04, 0xae, 0xed, 0xfa, 0x1e, 0x66, 0xbc, 0x62, 0x2c, 0x1a, 0x4b, 0xc5, 0x46, 0xad, 0x96, 0xce,
+	0x8f, 0xda, 0x9a, 0x94, 0xb2, 0xe6, 0x35, 0x8a, 0x7a, 0x44, 0x0f, 0xe1, 0xba, 0x1f, 0x0c, 0x86,
+	0xdc, 0xa6, 0x84, 0xf0, 0x10, 0x39, 0x33, 0x15, 0x72, 0x59, 0x02, 0x59, 0x84, 0x70, 0x8d, 0xfd,
+	0x0a, 0x94, 0xc8, 0x90, 0x0b, 0xf0, 0x63, 0xbf, 0x87, 0x59, 0x25, 0xbb, 0x98, 0x5d, 0x2a, 0x58,
+	0x45, 0x45, 0x5b, 0x17, 0x24, 0xf4, 0x15, 0x40, 0xfa, 0x88, 0xeb, 0x53, 0xdc, 0xe1, 0x84, 0xfa,
+	0x98, 0x55, 0x66, 0xe4, 0xc1, 0xeb, 0x8a, 0xb3, 0x16, 0x33, 0xd0, 0x16, 0xe4, 0x07, 0x3d, 0x87,
+	0x1f, 0x13, 0xda, 0xaf, 0xcc, 0x4a, 0x23, 0xbf, 0x9a, 0xd6, 0xc8, 0x3d, 0x2d, 0x67, 0x45, 0x08,
+	0xe8, 0x2e, 0xe4, 0xb8, 0xdf, 0xc7, 0x64, 0xc8, 0x2b, 0x73, 0x12, 0xec, 0x56, 0x08, 0x16, 0x26,
+	0xaa, 0xb6, 0xa6, 0x13, 0x65, 0x85, 0x27, 0xd1, 0x22, 0x94, 0x5c, 0x62, 0x07, 0x84, 0xdb, 0x1d,
+	0xa7, 0xd3, 0xc5, 0x95, 0xdc, 0xa2, 0xb1, 0x94, 0xb7, 0xc0, 0x25, 0x3b, 0x84, 0x37, 0x05, 0xc5,
+	0xfc, 0x87, 0x01, 0xb9, 0xa6, 0x0a, 0x32, 0x7a, 0x19, 0x0a, 0x0e, 0xf5, 0x86, 0x7d, 0x1c, 0x70,
+	0x56, 0x31, 0xa4, 0x5b, 0x31, 0x01, 0x9d, 0xc1, 0x17, 0x71, 0x70, 0xea, 0x53, 0x12, 0x88, 0x67,
+	0xfb, 0xd4, 0xa1, 0xbe, 0x73, 0x24, 0x22, 0x95, 0x59, 0xcc, 0x2e, 0x15, 0x1b, 0xcd, 0xb4, 0xbe,
+	0x69, 0x6d, 0xb5, 0x56, 0x0c, 0x76, 0xa8, 0xb1, 0xac, 0x1b, 0xf8, 0x22, 0x91, 0x55, 0xdf, 0x81,
+	0x17, 0x2e, 0x39, 0x8c, 0x10, 0xcc, 0x04, 0x4e, 0x1f, 0xcb, 0xd2, 0x2a, 0x58, 0xf2, 0x37, 0xba,
+	0x01, 0xb3, 0xa7, 0x4e, 0x6f, 0x88, 0x65, 0x55, 0x14, 0x2c, 0xf5, 0x60, 0xfe, 0xd2, 0x80, 0x7c,
+	0x18, 0x52, 0xf4, 0x21, 0xc0, 0x80, 0x8a, 0xaa, 0xe7, 0x22, 0x7b, 0x86, 0x34, 0xfe, 0x1b, 0x93,
+	0x26, 0xa6, 0xb6, 0xa7, 0x20, 0xce, 0xad, 0x04, 0x58, 0xf5, 0x0d, 0xc8, 0x87, 0xf4, 0x09, 0xac,
+	0xfb, 0xbd, 0x01, 0x85, 0xb0, 0x6e, 0xce, 0xd1, 0x3a, 0xcc, 0xaa, 0x02, 0x54, 0x96, 0xa5, 0x2e,
+	0x19, 0x51, 0xa2, 0x3b, 0xc4, 0xc5, 0x96, 0x12, 0x47, 0x1f, 0x40, 0x31, 0x59, 0xa5, 0x2a, 0x49,
+	0x6f, 0xa6, 0xbf, 0x25, 0xda, 0x1e, 0x09, 0x99, 0x44, 0x32, 0x7f, 0x68, 0x40, 0x3e, 0x54, 0x76,
+	0xa9, 0x97, 0xeb, 0x30, 0x77, 0xa5, 0xab, 0xa9, 0xa5, 0xd1, 0xab, 0x30, 0xef, 0x33, 0xdd, 0x09,
+	0x45, 0xc2, 0x2b, 0x33, 0xb2, 0x7a, 0x4b, 0x3e, 0x6b, 0x45, 0x34, 0xf3, 0x04, 0xe6, 0x47, 0x6c,
+	0x7d, 0x9e, 0x16, 0x99, 0x6f, 0xc1, 0x9c, 0xee, 0x16, 0x08, 0x66, 0xba, 0x0e, 0xeb, 0x86, 0x5a,
+	0xc4, 0x6f, 0x74, 0x1b, 0x80, 0xf9, 0x9f, 0x62, 0xfb, 0xe8, 0x9c, 0xcb, 0x80, 0x1b, 0x4b, 0x59,
+	0xab, 0x20, 0x28, 0xab, 0x82, 0x60, 0xfe, 0x35, 0x0b, 0x25, 0xd5, 0x1e, 0x2d, 0xcc, 0x86, 0x3d,
+	0x8e, 0xda, 0x63, 0x1d, 0x47, 0xa5, 0xa8, 0x91, 0xd6, 0xb6, 0xdd, 0xa8, 0x33, 0x8d, 0x76, 0xa9,
+	0xe3, 0x4b, 0xbb, 0x54, 0x56, 0x82, 0xdf, 0x9b, 0x0c, 0x3c, 0x8a, 0xec, 0x65, 0xed, 0xed, 0x25,
+	0x28, 0xe0, 0x33, 0x9f, 0xdb, 0x1d, 0xe2, 0xaa, 0xd4, 0xcc, 0x5a, 0x79, 0x41, 0x68, 0x8a, 0x2c,
+	0x88, 0x58, 0x70, 0x97, 0x88, 0x56, 0xed, 0x7c, 0x22, 0xbb, 0x5f, 0xc9, 0x2a, 0x28, 0x8a, 0xe5,
+	0x7c, 0x82, 0xf6, 0x61, 0x5e, 0xb3, 0x75, 0x5e, 0xe6, 0xa6, 0xca, 0x4b, 0x49, 0x81, 0xe8, 0x9c,
+	0x28, 0x9d, 0x98, 0x52, 0xa9, 0x33, 0x17, 0xe9, 0xc4, 0x94, 0xc6, 0x3a, 0x05, 0x5b, 0xeb, 0xcc,
+	0x4f, 0xad, 0x13, 0x53, 0xaa, 0x9e, 0xcc, 0xdf, 0x1a, 0x00, 0x71, 0x22, 0x44, 0x59, 0x0c, 0x1c,
+	0x1e, 0x95, 0x85, 0xf8, 0xfd, 0xcc, 0xae, 0x43, 0x05, 0x72, 0x1d, 0x12, 0x70, 0x1c, 0xf0, 0x4a,
+	0x56, 0xfa, 0x16, 0x3e, 0xa6, 0xbb, 0x28, 0xbf, 0x32, 0x60, 0xe6, 0x80, 0x62, 0x8c, 0x5a, 0x30,
+	0x23, 0xc6, 0xa7, 0x9e, 0xc8, 0x77, 0x26, 0xee, 0x08, 0x96, 0x14, 0x47, 0xdb, 0x90, 0xef, 0x74,
+	0xfd, 0x9e, 0x4b, 0x71, 0xa0, 0x2b, 0x77, 0x0a, 0xa8, 0x08, 0xc2, 0xfc, 0xa3, 0x01, 0xe5, 0xb1,
+	0xa2, 0x7b, 0xae, 0xd1, 0xdc, 0x85, 0x22, 0xa7, 0x18, 0x87, 0xb5, 0x90, 0x9d, 0x0a, 0x0c, 0x04,
+	0x84, 0xae, 0x84, 0xcf, 0x32, 0x70, 0x4d, 0x85, 0x1b, 0x5b, 0xf8, 0xdb, 0xc3, 0xb0, 0x81, 0x05,
+	0x8c, 0x3b, 0x41, 0x07, 0xdb, 0x89, 0x9e, 0x54, 0x0a, 0x89, 0x3b, 0xba, 0x37, 0x39, 0xb2, 0x2b,
+	0x4c, 0xea, 0x90, 0xee, 0x25, 0x5a, 0x1a, 0x2d, 0xc3, 0x75, 0x76, 0xe2, 0x0f, 0xd4, 0xa0, 0xb7,
+	0x7b, 0x84, 0x9c, 0x0c, 0x07, 0xd2, 0xad, 0xbc, 0x55, 0x16, 0x0c, 0x39, 0xee, 0xb7, 0x24, 0x19,
+	0xdd, 0x85, 0x17, 0x39, 0xe1, 0x4e, 0xcf, 0x56, 0xdb, 0x94, 0x68, 0x3f, 0x76, 0x87, 0x0c, 0x03,
+	0xae, 0xef, 0xf1, 0x0b, 0x92, 0xbb, 0x19, 0xe8, 0xb2, 0x6e, 0x0a, 0xd6, 0xa5, 0x42, 0xaa, 0xd5,
+	0xcd, 0xca, 0x56, 0x37, 0x26, 0xa4, 0x9a, 0xde, 0x19, 0xe4, 0xb6, 0x88, 0x27, 0xef, 0x46, 0x9c,
+	0x39, 0xe3, 0x4a, 0x99, 0xfb, 0x32, 0x5c, 0xeb, 0x0e, 0xfb, 0x4e, 0x60, 0x53, 0xec, 0xb8, 0xb2,
+	0xdc, 0x33, 0xd2, 0xcb, 0x79, 0x49, 0xb5, 0x34, 0xd1, 0xfc, 0x41, 0x16, 0xca, 0x51, 0x3e, 0xd8,
+	0x80, 0x04, 0x0c, 0xa3, 0x2d, 0x98, 0xa3, 0xb2, 0xf7, 0x6a, 0x13, 0xde, 0x98, 0x30, 0xd6, 0x52,
+	0xd6, 0xd2, 0x18, 0x22, 0xbd, 0x32, 0xd8, 0xae, 0xad, 0x41, 0x95, 0x1d, 0x25, 0x45, 0xd4, 0x4d,
+	0x7e, 0x19, 0xe6, 0xd4, 0x92, 0xac, 0x4b, 0x0c, 0x85, 0x2a, 0xe9, 0xa0, 0x53, 0xdb, 0x97, 0x1c,
+	0x4b, 0x9f, 0x40, 0x5d, 0x28, 0x32, 0x4c, 0x4f, 0x31, 0xb5, 0x7b, 0xc4, 0x53, 0x8b, 0x65, 0xb1,
+	0xb1, 0x91, 0xd6, 0xc6, 0x31, 0x67, 0x6b, 0xfb, 0x12, 0x6a, 0x8b, 0x78, 0xac, 0x15, 0x70, 0x7a,
+	0x6e, 0x01, 0x8b, 0x08, 0xd5, 0x00, 0xca, 0x63, 0x6c, 0xb4, 0x00, 0xd9, 0x13, 0x7c, 0xae, 0x4b,
+	0x54, 0xfc, 0x44, 0xad, 0xe4, 0xb6, 0x52, 0x6c, 0xd4, 0xd3, 0x1a, 0xa2, 0x13, 0xae, 0xd7, 0x9b,
+	0x95, 0xcc, 0xd7, 0x0d, 0xf3, 0xf3, 0x0c, 0x54, 0xb4, 0x7d, 0xbb, 0xe1, 0xfb, 0xc6, 0x36, 0xe6,
+	0x8e, 0xeb, 0x70, 0x07, 0x7d, 0x04, 0xb3, 0x8c, 0x3b, 0x9e, 0xba, 0x1e, 0xd7, 0x1a, 0xeb, 0x13,
+	0x3a, 0x7c, 0x01, 0x50, 0x84, 0xd5, 0xc3, 0x96, 0x02, 0x15, 0x6d, 0x5f, 0xdd, 0x90, 0xab, 0xbd,
+	0x2f, 0x94, 0x14, 0x88, 0x1e, 0x35, 0xaf, 0x03, 0xd2, 0xf3, 0x8b, 0x71, 0x8a, 0x9d, 0xbe, 0xba,
+	0xde, 0x59, 0x19, 0xbb, 0x05, 0xc5, 0xd9, 0x97, 0x0c, 0x79, 0xc5, 0xd5, 0x69, 0x31, 0x79, 0x92,
+	0xa7, 0x67, 0xa2, 0xd3, 0x98, 0xd2, 0xf8, 0xb4, 0xb9, 0x0b, 0xb3, 0xd2, 0x01, 0x54, 0x84, 0x5c,
+	0x7b, 0xe7, 0xbd, 0x9d, 0xdd, 0x0f, 0x76, 0x16, 0xbe, 0x80, 0xca, 0x50, 0x6c, 0xde, 0x6f, 0xbe,
+	0xdb, 0xb2, 0x9b, 0xef, 0xb6, 0x9a, 0xef, 0x2d, 0x18, 0x08, 0x60, 0xee, 0xfd, 0x76, 0xab, 0xdd,
+	0x5a, 0x5b, 0xc8, 0xa0, 0x79, 0x28, 0xb4, 0x1e, 0xb4, 0x9a, 0xed, 0x83, 0xcd, 0x9d, 0x8d, 0x85,
+	0xac, 0x78, 0x6c, 0xee, 0x6e, 0xef, 0x6d, 0xb5, 0x0e, 0x5a, 0x6b, 0x0b, 0x33, 0xe6, 0x4f, 0x0d,
+	0x78, 0x71, 0x03, 0xf3, 0x91, 0x1a, 0x9e, 0xa4, 0x43, 0x3d, 0x8f, 0x08, 0x9a, 0xff, 0x36, 0xe0,
+	0x56, 0x7b, 0xe0, 0x3a, 0x1c, 0xff, 0x5f, 0xd9, 0x85, 0x3e, 0x8c, 0x40, 0xf5, 0xa5, 0xce, 0x5e,
+	0xa1, 0x53, 0x68, 0x68, 0xf5, 0x64, 0xfe, 0xc4, 0x80, 0x9b, 0xeb, 0x7e, 0xe0, 0x6e, 0xfb, 0x8c,
+	0xf9, 0x81, 0xb7, 0xda, 0x23, 0x47, 0x6c, 0x22, 0x87, 0xdf, 0x87, 0xd2, 0x51, 0x8f, 0x1c, 0x69,
+	0x77, 0xc3, 0x85, 0x71, 0x52, 0x7f, 0x8b, 0x02, 0x43, 0xfd, 0x66, 0xe6, 0x77, 0xa0, 0x72, 0xd1,
+	0x24, 0xdd, 0x2d, 0x3f, 0x86, 0x1b, 0x7d, 0x45, 0xb7, 0x9f, 0x81, 0x5a, 0xd4, 0x8f, 0x75, 0x84,
+	0xda, 0xbf, 0x0b, 0xd7, 0x55, 0x0d, 0x08, 0x62, 0x18, 0x0a, 0xf9, 0xed, 0x40, 0x2e, 0x36, 0x57,
+	0xfe, 0x76, 0x20, 0x51, 0xe2, 0x8d, 0x5d, 0x34, 0x07, 0x59, 0x24, 0x25, 0x4b, 0xfe, 0x36, 0x7f,
+	0x66, 0xc0, 0xcd, 0x55, 0x87, 0x77, 0xba, 0xb1, 0x15, 0x93, 0x65, 0xa4, 0x0d, 0x79, 0xaa, 0xce,
+	0x87, 0x61, 0x49, 0xfd, 0x26, 0x79, 0xc1, 0x71, 0x2b, 0x82, 0x32, 0x7f, 0x94, 0x81, 0xca, 0x45,
+	0xbb, 0x74, 0x5a, 0x3c, 0x28, 0x50, 0xfd, 0x3b, 0x7c, 0x49, 0xdc, 0x4c, 0xab, 0xf4, 0x49, 0xa0,
+	0xb5, 0xf0, 0x87, 0x15, 0x63, 0x57, 0xbf, 0x6f, 0x40, 0x3e, 0xd2, 0xba, 0x0b, 0xc5, 0x44, 0x11,
+	0x4c, 0x99, 0x12, 0x88, 0x4b, 0x2f, 0x31, 0x18, 0x33, 0x4f, 0x1b, 0x8c, 0xe6, 0x9f, 0x0d, 0xb8,
+	0xb6, 0x81, 0xb9, 0x58, 0x5f, 0x27, 0x4a, 0xcf, 0x2e, 0x14, 0xaf, 0xfe, 0xa5, 0x08, 0x68, 0xfc,
+	0x91, 0xe8, 0x25, 0x28, 0x0c, 0x1c, 0x0f, 0xdb, 0xe2, 0xad, 0x4e, 0x76, 0x86, 0x59, 0x2b, 0x2f,
+	0x08, 0xfb, 0xfe, 0xa7, 0xf2, 0x9d, 0x47, 0x32, 0x39, 0x39, 0xc1, 0x81, 0x6e, 0xef, 0xf2, 0xf8,
+	0x81, 0x20, 0x98, 0x3f, 0x36, 0xa0, 0x1c, 0x39, 0xa1, 0xa3, 0xba, 0x3f, 0xfa, 0x92, 0x6e, 0x4c,
+	0xbb, 0x47, 0x27, 0x51, 0xd0, 0x6b, 0x50, 0x0e, 0xf0, 0x19, 0xb7, 0x13, 0xc6, 0xa8, 0xef, 0x0d,
+	0xf3, 0x82, 0xbc, 0x17, 0x19, 0xb4, 0x0d, 0xc5, 0x03, 0x42, 0x7a, 0x6b, 0x98, 0x3b, 0x7e, 0x4f,
+	0xbe, 0xcf, 0x09, 0x6d, 0xc9, 0x68, 0xe6, 0x05, 0x41, 0x46, 0xf2, 0x15, 0x28, 0x49, 0xe6, 0x29,
+	0xa6, 0x2c, 0xdc, 0x55, 0x0b, 0x56, 0x51, 0xd0, 0x0e, 0x15, 0x49, 0x74, 0xf4, 0xb2, 0xce, 0x4e,
+	0x34, 0xda, 0x0f, 0xb5, 0x98, 0xab, 0x74, 0xe8, 0xb2, 0xb9, 0x9b, 0xd6, 0xc1, 0x84, 0x79, 0x4a,
+	0x57, 0xc2, 0x56, 0xdd, 0xa5, 0x7d, 0x57, 0xdb, 0x92, 0x57, 0x84, 0x4d, 0x57, 0x8c, 0x5b, 0xa9,
+	0xd4, 0x0f, 0x4e, 0x49, 0xc7, 0x09, 0x4f, 0xe9, 0xe1, 0x2c, 0x38, 0x9b, 0x11, 0x63, 0xd3, 0x45,
+	0x2b, 0x70, 0xab, 0x43, 0x28, 0xc5, 0x3d, 0x87, 0x63, 0x37, 0x21, 0xc3, 0x84, 0x90, 0x4a, 0xe2,
+	0xcd, 0xf8, 0x40, 0x2c, 0xca, 0x36, 0xdd, 0xc6, 0x6f, 0x0c, 0x28, 0xb4, 0x42, 0xa3, 0xd1, 0xcf,
+	0x0d, 0xc8, 0xe9, 0x9d, 0x04, 0x7d, 0x6d, 0xe2, 0xad, 0x4d, 0x06, 0xae, 0x7a, 0x3b, 0x94, 0x4b,
+	0x7c, 0xa2, 0xad, 0x45, 0x1b, 0x8e, 0xf9, 0xe6, 0xf7, 0xfe, 0xf6, 0xcf, 0xcf, 0x32, 0x75, 0x73,
+	0x39, 0xfc, 0x5c, 0xfc, 0x68, 0xe4, 0x12, 0xbc, 0xbd, 0xbc, 0xfc, 0xb8, 0xae, 0xe2, 0xc0, 0x56,
+	0x94, 0x2a, 0xbc, 0x62, 0x2c, 0x37, 0x3e, 0xcf, 0x42, 0x51, 0x0d, 0x26, 0xf9, 0x16, 0x80, 0xfe,
+	0xa5, 0x4a, 0x71, 0xe4, 0x6b, 0xc4, 0x37, 0xd3, 0x5a, 0x7c, 0xf9, 0x2a, 0x51, 0x9d, 0x6a, 0x42,
+	0x9a, 0x1f, 0x4b, 0x87, 0x1e, 0xa2, 0x07, 0x4f, 0x75, 0x48, 0x09, 0xb0, 0xfa, 0xa3, 0x91, 0x99,
+	0x5f, 0xeb, 0x3a, 0xac, 0xfb, 0x78, 0x9c, 0x18, 0x7f, 0x86, 0x79, 0x8c, 0xfe, 0x63, 0x00, 0xba,
+	0xb8, 0x68, 0xa0, 0xfb, 0x93, 0xf5, 0xe9, 0x67, 0xe7, 0x31, 0x91, 0x1e, 0xfb, 0xd5, 0xe7, 0xe6,
+	0xf1, 0xca, 0xe8, 0x02, 0xd3, 0xf8, 0xc5, 0x2c, 0xdc, 0x6a, 0xaa, 0x51, 0x78, 0xdf, 0x75, 0x29,
+	0x66, 0x4c, 0xbc, 0x1f, 0xed, 0x73, 0x42, 0xc5, 0x92, 0xf9, 0x17, 0x03, 0x16, 0xc6, 0x37, 0x00,
+	0xf4, 0x4e, 0xfa, 0x8f, 0x8e, 0x97, 0xae, 0x33, 0xd5, 0x6f, 0x4d, 0x0f, 0xa0, 0x3a, 0xa3, 0x79,
+	0x4f, 0x86, 0xe9, 0x8e, 0xf9, 0xfa, 0xff, 0x08, 0x93, 0x98, 0x26, 0x6c, 0xe5, 0x38, 0x86, 0x58,
+	0x31, 0x96, 0xa5, 0x43, 0xe3, 0x63, 0x2e, 0xbd, 0x43, 0x4f, 0xd8, 0x06, 0xd2, 0x3b, 0xf4, 0xa4,
+	0x09, 0x3b, 0x81, 0x43, 0x47, 0x31, 0x84, 0x70, 0xe8, 0xef, 0x06, 0xe4, 0xf4, 0xdc, 0x48, 0xdf,
+	0x56, 0x46, 0xa7, 0x65, 0xf5, 0xde, 0xc4, 0x72, 0xda, 0xea, 0x8f, 0xa4, 0xd5, 0x87, 0xe8, 0xe0,
+	0x69, 0x56, 0xd7, 0x1f, 0x25, 0x26, 0x6d, 0x58, 0xa3, 0x49, 0x52, 0xb2, 0x42, 0x3d, 0xa5, 0x65,
+	0xf5, 0x4f, 0x06, 0x2c, 0x77, 0x48, 0x3f, 0xa5, 0x71, 0xab, 0x37, 0x2c, 0x49, 0x8f, 0x3a, 0xee,
+	0x1e, 0x25, 0x9c, 0xec, 0x19, 0x0f, 0xdb, 0x5a, 0xde, 0x23, 0x3d, 0x27, 0xf0, 0x6a, 0x84, 0x7a,
+	0x75, 0x0f, 0x07, 0xf2, 0x6f, 0x91, 0xba, 0x62, 0x39, 0x03, 0x9f, 0x3d, 0xed, 0xaf, 0xb7, 0xb7,
+	0xc6, 0xc8, 0xbf, 0xce, 0x64, 0xad, 0xd6, 0x83, 0xdf, 0x65, 0x6e, 0x6f, 0x28, 0xf4, 0x31, 0xe5,
+	0xb5, 0xc3, 0x3b, 0x07, 0x98, 0xf1, 0xa3, 0x39, 0xa9, 0xe7, 0xee, 0x7f, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0xf0, 0x8a, 0x2f, 0x43, 0xe1, 0x1b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2670,138 +2836,3 @@ var _ContentAddressableStorage_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/remoteexecution/v1test/remote_execution.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/remoteexecution/v1test/remote_execution.proto", fileDescriptor_remote_execution_3cbae0ca1c4e63f2)
-}
-
-var fileDescriptor_remote_execution_3cbae0ca1c4e63f2 = []byte{
-	// 2025 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xdd, 0x6f, 0x23, 0x57,
-	0x15, 0x67, 0xec, 0x24, 0xb6, 0x8f, 0x9d, 0x75, 0xf6, 0x76, 0xe9, 0x7a, 0xdd, 0x2e, 0x4a, 0xa7,
-	0xa2, 0x8a, 0xa2, 0x62, 0xb3, 0xde, 0x96, 0x85, 0x54, 0xa5, 0x6c, 0x1c, 0x27, 0x8d, 0x9a, 0xaf,
-	0x4e, 0xe2, 0x74, 0xbb, 0xaa, 0x34, 0x9d, 0x78, 0x6e, 0xc6, 0xa3, 0xd8, 0x73, 0xcd, 0xbd, 0xd7,
-	0x69, 0xd2, 0x65, 0x79, 0xe0, 0x05, 0x09, 0x04, 0x12, 0x54, 0x08, 0x24, 0x78, 0x42, 0x42, 0x48,
-	0x88, 0x27, 0xfe, 0x00, 0x24, 0xf8, 0x03, 0x78, 0x80, 0x17, 0x9e, 0x11, 0x2f, 0xbc, 0xf1, 0xdc,
-	0x07, 0x84, 0xee, 0xc7, 0x7c, 0xd8, 0xc9, 0xb2, 0x63, 0x67, 0x57, 0xe2, 0xcd, 0x73, 0xce, 0x3d,
-	0xbf, 0xf3, 0x79, 0xcf, 0x39, 0x33, 0x86, 0xb7, 0x3d, 0x42, 0xbc, 0x1e, 0xae, 0xbb, 0xf8, 0x94,
-	0x13, 0xd2, 0x63, 0x75, 0x8a, 0xfb, 0x84, 0x63, 0x7c, 0x86, 0x3b, 0x43, 0xee, 0x93, 0xa0, 0x7e,
-	0x7a, 0x87, 0x63, 0xc6, 0x35, 0xd9, 0x8e, 0xe8, 0xb5, 0x01, 0x25, 0x9c, 0xa0, 0xd7, 0x94, 0x78,
-	0x2d, 0x14, 0xaf, 0x8d, 0x89, 0xd7, 0x94, 0x78, 0xf5, 0x65, 0xad, 0xc6, 0x19, 0xf8, 0x75, 0x27,
-	0x08, 0x08, 0x77, 0x04, 0x97, 0x29, 0x94, 0xea, 0xab, 0x9a, 0xdb, 0x23, 0x81, 0x47, 0x87, 0x41,
-	0xe0, 0x07, 0x5e, 0x9d, 0x0c, 0x30, 0x1d, 0x39, 0xf4, 0x25, 0x7d, 0x48, 0x3e, 0x1d, 0x0d, 0x8f,
-	0xeb, 0xee, 0x50, 0x1d, 0xd0, 0xfc, 0x9b, 0x9a, 0x4f, 0x07, 0x9d, 0x3a, 0xe3, 0x0e, 0x1f, 0x6a,
-	0x41, 0xf3, 0x0f, 0x59, 0x98, 0xbb, 0xdf, 0x11, 0x27, 0x51, 0x1b, 0xae, 0x75, 0x48, 0xbf, 0xef,
-	0x04, 0xae, 0xed, 0xfa, 0x1e, 0x66, 0xbc, 0x62, 0x2c, 0x1a, 0x4b, 0xc5, 0x46, 0xad, 0x96, 0xce,
-	0x8f, 0xda, 0x9a, 0x94, 0xb2, 0xe6, 0x35, 0x8a, 0x7a, 0x44, 0x0f, 0xe1, 0xba, 0x1f, 0x0c, 0x86,
-	0xdc, 0xa6, 0x84, 0xf0, 0x10, 0x39, 0x33, 0x15, 0x72, 0x59, 0x02, 0x59, 0x84, 0x70, 0x8d, 0xfd,
-	0x0a, 0x94, 0xc8, 0x90, 0x0b, 0xf0, 0x63, 0xbf, 0x87, 0x59, 0x25, 0xbb, 0x98, 0x5d, 0x2a, 0x58,
-	0x45, 0x45, 0x5b, 0x17, 0x24, 0xf4, 0x15, 0x40, 0xfa, 0x88, 0xeb, 0x53, 0xdc, 0xe1, 0x84, 0xfa,
-	0x98, 0x55, 0x66, 0xe4, 0xc1, 0xeb, 0x8a, 0xb3, 0x16, 0x33, 0xd0, 0x16, 0xe4, 0x07, 0x3d, 0x87,
-	0x1f, 0x13, 0xda, 0xaf, 0xcc, 0x4a, 0x23, 0xbf, 0x9a, 0xd6, 0xc8, 0x3d, 0x2d, 0x67, 0x45, 0x08,
-	0xe8, 0x2e, 0xe4, 0xb8, 0xdf, 0xc7, 0x64, 0xc8, 0x2b, 0x73, 0x12, 0xec, 0x56, 0x08, 0x16, 0x26,
-	0xaa, 0xb6, 0xa6, 0x13, 0x65, 0x85, 0x27, 0xd1, 0x22, 0x94, 0x5c, 0x62, 0x07, 0x84, 0xdb, 0x1d,
-	0xa7, 0xd3, 0xc5, 0x95, 0xdc, 0xa2, 0xb1, 0x94, 0xb7, 0xc0, 0x25, 0x3b, 0x84, 0x37, 0x05, 0xc5,
-	0xfc, 0x87, 0x01, 0xb9, 0xa6, 0x0a, 0x32, 0x7a, 0x19, 0x0a, 0x0e, 0xf5, 0x86, 0x7d, 0x1c, 0x70,
-	0x56, 0x31, 0xa4, 0x5b, 0x31, 0x01, 0x9d, 0xc1, 0x17, 0x71, 0x70, 0xea, 0x53, 0x12, 0x88, 0x67,
-	0xfb, 0xd4, 0xa1, 0xbe, 0x73, 0x24, 0x22, 0x95, 0x59, 0xcc, 0x2e, 0x15, 0x1b, 0xcd, 0xb4, 0xbe,
-	0x69, 0x6d, 0xb5, 0x56, 0x0c, 0x76, 0xa8, 0xb1, 0xac, 0x1b, 0xf8, 0x22, 0x91, 0x55, 0xdf, 0x81,
-	0x17, 0x2e, 0x39, 0x8c, 0x10, 0xcc, 0x04, 0x4e, 0x1f, 0xcb, 0xd2, 0x2a, 0x58, 0xf2, 0x37, 0xba,
-	0x01, 0xb3, 0xa7, 0x4e, 0x6f, 0x88, 0x65, 0x55, 0x14, 0x2c, 0xf5, 0x60, 0xfe, 0xd2, 0x80, 0x7c,
-	0x18, 0x52, 0xf4, 0x21, 0xc0, 0x80, 0x8a, 0xaa, 0xe7, 0x22, 0x7b, 0x86, 0x34, 0xfe, 0x1b, 0x93,
-	0x26, 0xa6, 0xb6, 0xa7, 0x20, 0xce, 0xad, 0x04, 0x58, 0xf5, 0x0d, 0xc8, 0x87, 0xf4, 0x09, 0xac,
-	0xfb, 0xbd, 0x01, 0x85, 0xb0, 0x6e, 0xce, 0xd1, 0x3a, 0xcc, 0xaa, 0x02, 0x54, 0x96, 0xa5, 0x2e,
-	0x19, 0x51, 0xa2, 0x3b, 0xc4, 0xc5, 0x96, 0x12, 0x47, 0x1f, 0x40, 0x31, 0x59, 0xa5, 0x2a, 0x49,
-	0x6f, 0xa6, 0xbf, 0x25, 0xda, 0x1e, 0x09, 0x99, 0x44, 0x32, 0x7f, 0x68, 0x40, 0x3e, 0x54, 0x76,
-	0xa9, 0x97, 0xeb, 0x30, 0x77, 0xa5, 0xab, 0xa9, 0xa5, 0xd1, 0xab, 0x30, 0xef, 0x33, 0xdd, 0x09,
-	0x45, 0xc2, 0x2b, 0x33, 0xb2, 0x7a, 0x4b, 0x3e, 0x6b, 0x45, 0x34, 0xf3, 0x04, 0xe6, 0x47, 0x6c,
-	0x7d, 0x9e, 0x16, 0x99, 0x6f, 0xc1, 0x9c, 0xee, 0x16, 0x08, 0x66, 0xba, 0x0e, 0xeb, 0x86, 0x5a,
-	0xc4, 0x6f, 0x74, 0x1b, 0x80, 0xf9, 0x9f, 0x62, 0xfb, 0xe8, 0x9c, 0xcb, 0x80, 0x1b, 0x4b, 0x59,
-	0xab, 0x20, 0x28, 0xab, 0x82, 0x60, 0xfe, 0x35, 0x0b, 0x25, 0xd5, 0x1e, 0x2d, 0xcc, 0x86, 0x3d,
-	0x8e, 0xda, 0x63, 0x1d, 0x47, 0xa5, 0xa8, 0x91, 0xd6, 0xb6, 0xdd, 0xa8, 0x33, 0x8d, 0x76, 0xa9,
-	0xe3, 0x4b, 0xbb, 0x54, 0x56, 0x82, 0xdf, 0x9b, 0x0c, 0x3c, 0x8a, 0xec, 0x65, 0xed, 0xed, 0x25,
-	0x28, 0xe0, 0x33, 0x9f, 0xdb, 0x1d, 0xe2, 0xaa, 0xd4, 0xcc, 0x5a, 0x79, 0x41, 0x68, 0x8a, 0x2c,
-	0x88, 0x58, 0x70, 0x97, 0x88, 0x56, 0xed, 0x7c, 0x22, 0xbb, 0x5f, 0xc9, 0x2a, 0x28, 0x8a, 0xe5,
-	0x7c, 0x82, 0xf6, 0x61, 0x5e, 0xb3, 0x75, 0x5e, 0xe6, 0xa6, 0xca, 0x4b, 0x49, 0x81, 0xe8, 0x9c,
-	0x28, 0x9d, 0x98, 0x52, 0xa9, 0x33, 0x17, 0xe9, 0xc4, 0x94, 0xc6, 0x3a, 0x05, 0x5b, 0xeb, 0xcc,
-	0x4f, 0xad, 0x13, 0x53, 0xaa, 0x9e, 0xcc, 0xdf, 0x1a, 0x00, 0x71, 0x22, 0x44, 0x59, 0x0c, 0x1c,
-	0x1e, 0x95, 0x85, 0xf8, 0xfd, 0xcc, 0xae, 0x43, 0x05, 0x72, 0x1d, 0x12, 0x70, 0x1c, 0xf0, 0x4a,
-	0x56, 0xfa, 0x16, 0x3e, 0xa6, 0xbb, 0x28, 0xbf, 0x32, 0x60, 0xe6, 0x80, 0x62, 0x8c, 0x5a, 0x30,
-	0x23, 0xc6, 0xa7, 0x9e, 0xc8, 0x77, 0x26, 0xee, 0x08, 0x96, 0x14, 0x47, 0xdb, 0x90, 0xef, 0x74,
-	0xfd, 0x9e, 0x4b, 0x71, 0xa0, 0x2b, 0x77, 0x0a, 0xa8, 0x08, 0xc2, 0xfc, 0xa3, 0x01, 0xe5, 0xb1,
-	0xa2, 0x7b, 0xae, 0xd1, 0xdc, 0x85, 0x22, 0xa7, 0x18, 0x87, 0xb5, 0x90, 0x9d, 0x0a, 0x0c, 0x04,
-	0x84, 0xae, 0x84, 0xcf, 0x32, 0x70, 0x4d, 0x85, 0x1b, 0x5b, 0xf8, 0xdb, 0xc3, 0xb0, 0x81, 0x05,
-	0x8c, 0x3b, 0x41, 0x07, 0xdb, 0x89, 0x9e, 0x54, 0x0a, 0x89, 0x3b, 0xba, 0x37, 0x39, 0xb2, 0x2b,
-	0x4c, 0xea, 0x90, 0xee, 0x25, 0x5a, 0x1a, 0x2d, 0xc3, 0x75, 0x76, 0xe2, 0x0f, 0xd4, 0xa0, 0xb7,
-	0x7b, 0x84, 0x9c, 0x0c, 0x07, 0xd2, 0xad, 0xbc, 0x55, 0x16, 0x0c, 0x39, 0xee, 0xb7, 0x24, 0x19,
-	0xdd, 0x85, 0x17, 0x39, 0xe1, 0x4e, 0xcf, 0x56, 0xdb, 0x94, 0x68, 0x3f, 0x76, 0x87, 0x0c, 0x03,
-	0xae, 0xef, 0xf1, 0x0b, 0x92, 0xbb, 0x19, 0xe8, 0xb2, 0x6e, 0x0a, 0xd6, 0xa5, 0x42, 0xaa, 0xd5,
-	0xcd, 0xca, 0x56, 0x37, 0x26, 0xa4, 0x9a, 0xde, 0x19, 0xe4, 0xb6, 0x88, 0x27, 0xef, 0x46, 0x9c,
-	0x39, 0xe3, 0x4a, 0x99, 0xfb, 0x32, 0x5c, 0xeb, 0x0e, 0xfb, 0x4e, 0x60, 0x53, 0xec, 0xb8, 0xb2,
-	0xdc, 0x33, 0xd2, 0xcb, 0x79, 0x49, 0xb5, 0x34, 0xd1, 0xfc, 0x41, 0x16, 0xca, 0x51, 0x3e, 0xd8,
-	0x80, 0x04, 0x0c, 0xa3, 0x2d, 0x98, 0xa3, 0xb2, 0xf7, 0x6a, 0x13, 0xde, 0x98, 0x30, 0xd6, 0x52,
-	0xd6, 0xd2, 0x18, 0x22, 0xbd, 0x32, 0xd8, 0xae, 0xad, 0x41, 0x95, 0x1d, 0x25, 0x45, 0xd4, 0x4d,
-	0x7e, 0x19, 0xe6, 0xd4, 0x92, 0xac, 0x4b, 0x0c, 0x85, 0x2a, 0xe9, 0xa0, 0x53, 0xdb, 0x97, 0x1c,
-	0x4b, 0x9f, 0x40, 0x5d, 0x28, 0x32, 0x4c, 0x4f, 0x31, 0xb5, 0x7b, 0xc4, 0x53, 0x8b, 0x65, 0xb1,
-	0xb1, 0x91, 0xd6, 0xc6, 0x31, 0x67, 0x6b, 0xfb, 0x12, 0x6a, 0x8b, 0x78, 0xac, 0x15, 0x70, 0x7a,
-	0x6e, 0x01, 0x8b, 0x08, 0xd5, 0x00, 0xca, 0x63, 0x6c, 0xb4, 0x00, 0xd9, 0x13, 0x7c, 0xae, 0x4b,
-	0x54, 0xfc, 0x44, 0xad, 0xe4, 0xb6, 0x52, 0x6c, 0xd4, 0xd3, 0x1a, 0xa2, 0x13, 0xae, 0xd7, 0x9b,
-	0x95, 0xcc, 0xd7, 0x0d, 0xf3, 0xf3, 0x0c, 0x54, 0xb4, 0x7d, 0xbb, 0xe1, 0xfb, 0xc6, 0x36, 0xe6,
-	0x8e, 0xeb, 0x70, 0x07, 0x7d, 0x04, 0xb3, 0x8c, 0x3b, 0x9e, 0xba, 0x1e, 0xd7, 0x1a, 0xeb, 0x13,
-	0x3a, 0x7c, 0x01, 0x50, 0x84, 0xd5, 0xc3, 0x96, 0x02, 0x15, 0x6d, 0x5f, 0xdd, 0x90, 0xab, 0xbd,
-	0x2f, 0x94, 0x14, 0x88, 0x1e, 0x35, 0xaf, 0x03, 0xd2, 0xf3, 0x8b, 0x71, 0x8a, 0x9d, 0xbe, 0xba,
-	0xde, 0x59, 0x19, 0xbb, 0x05, 0xc5, 0xd9, 0x97, 0x0c, 0x79, 0xc5, 0xd5, 0x69, 0x31, 0x79, 0x92,
-	0xa7, 0x67, 0xa2, 0xd3, 0x98, 0xd2, 0xf8, 0xb4, 0xb9, 0x0b, 0xb3, 0xd2, 0x01, 0x54, 0x84, 0x5c,
-	0x7b, 0xe7, 0xbd, 0x9d, 0xdd, 0x0f, 0x76, 0x16, 0xbe, 0x80, 0xca, 0x50, 0x6c, 0xde, 0x6f, 0xbe,
-	0xdb, 0xb2, 0x9b, 0xef, 0xb6, 0x9a, 0xef, 0x2d, 0x18, 0x08, 0x60, 0xee, 0xfd, 0x76, 0xab, 0xdd,
-	0x5a, 0x5b, 0xc8, 0xa0, 0x79, 0x28, 0xb4, 0x1e, 0xb4, 0x9a, 0xed, 0x83, 0xcd, 0x9d, 0x8d, 0x85,
-	0xac, 0x78, 0x6c, 0xee, 0x6e, 0xef, 0x6d, 0xb5, 0x0e, 0x5a, 0x6b, 0x0b, 0x33, 0xe6, 0x4f, 0x0d,
-	0x78, 0x71, 0x03, 0xf3, 0x91, 0x1a, 0x9e, 0xa4, 0x43, 0x3d, 0x8f, 0x08, 0x9a, 0xff, 0x36, 0xe0,
-	0x56, 0x7b, 0xe0, 0x3a, 0x1c, 0xff, 0x5f, 0xd9, 0x85, 0x3e, 0x8c, 0x40, 0xf5, 0xa5, 0xce, 0x5e,
-	0xa1, 0x53, 0x68, 0x68, 0xf5, 0x64, 0xfe, 0xc4, 0x80, 0x9b, 0xeb, 0x7e, 0xe0, 0x6e, 0xfb, 0x8c,
-	0xf9, 0x81, 0xb7, 0xda, 0x23, 0x47, 0x6c, 0x22, 0x87, 0xdf, 0x87, 0xd2, 0x51, 0x8f, 0x1c, 0x69,
-	0x77, 0xc3, 0x85, 0x71, 0x52, 0x7f, 0x8b, 0x02, 0x43, 0xfd, 0x66, 0xe6, 0x77, 0xa0, 0x72, 0xd1,
-	0x24, 0xdd, 0x2d, 0x3f, 0x86, 0x1b, 0x7d, 0x45, 0xb7, 0x9f, 0x81, 0x5a, 0xd4, 0x8f, 0x75, 0x84,
-	0xda, 0xbf, 0x0b, 0xd7, 0x55, 0x0d, 0x08, 0x62, 0x18, 0x0a, 0xf9, 0xed, 0x40, 0x2e, 0x36, 0x57,
-	0xfe, 0x76, 0x20, 0x51, 0xe2, 0x8d, 0x5d, 0x34, 0x07, 0x59, 0x24, 0x25, 0x4b, 0xfe, 0x36, 0x7f,
-	0x66, 0xc0, 0xcd, 0x55, 0x87, 0x77, 0xba, 0xb1, 0x15, 0x93, 0x65, 0xa4, 0x0d, 0x79, 0xaa, 0xce,
-	0x87, 0x61, 0x49, 0xfd, 0x26, 0x79, 0xc1, 0x71, 0x2b, 0x82, 0x32, 0x7f, 0x94, 0x81, 0xca, 0x45,
-	0xbb, 0x74, 0x5a, 0x3c, 0x28, 0x50, 0xfd, 0x3b, 0x7c, 0x49, 0xdc, 0x4c, 0xab, 0xf4, 0x49, 0xa0,
-	0xb5, 0xf0, 0x87, 0x15, 0x63, 0x57, 0xbf, 0x6f, 0x40, 0x3e, 0xd2, 0xba, 0x0b, 0xc5, 0x44, 0x11,
-	0x4c, 0x99, 0x12, 0x88, 0x4b, 0x2f, 0x31, 0x18, 0x33, 0x4f, 0x1b, 0x8c, 0xe6, 0x9f, 0x0d, 0xb8,
-	0xb6, 0x81, 0xb9, 0x58, 0x5f, 0x27, 0x4a, 0xcf, 0x2e, 0x14, 0xaf, 0xfe, 0xa5, 0x08, 0x68, 0xfc,
-	0x91, 0xe8, 0x25, 0x28, 0x0c, 0x1c, 0x0f, 0xdb, 0xe2, 0xad, 0x4e, 0x76, 0x86, 0x59, 0x2b, 0x2f,
-	0x08, 0xfb, 0xfe, 0xa7, 0xf2, 0x9d, 0x47, 0x32, 0x39, 0x39, 0xc1, 0x81, 0x6e, 0xef, 0xf2, 0xf8,
-	0x81, 0x20, 0x98, 0x3f, 0x36, 0xa0, 0x1c, 0x39, 0xa1, 0xa3, 0xba, 0x3f, 0xfa, 0x92, 0x6e, 0x4c,
-	0xbb, 0x47, 0x27, 0x51, 0xd0, 0x6b, 0x50, 0x0e, 0xf0, 0x19, 0xb7, 0x13, 0xc6, 0xa8, 0xef, 0x0d,
-	0xf3, 0x82, 0xbc, 0x17, 0x19, 0xb4, 0x0d, 0xc5, 0x03, 0x42, 0x7a, 0x6b, 0x98, 0x3b, 0x7e, 0x4f,
-	0xbe, 0xcf, 0x09, 0x6d, 0xc9, 0x68, 0xe6, 0x05, 0x41, 0x46, 0xf2, 0x15, 0x28, 0x49, 0xe6, 0x29,
-	0xa6, 0x2c, 0xdc, 0x55, 0x0b, 0x56, 0x51, 0xd0, 0x0e, 0x15, 0x49, 0x74, 0xf4, 0xb2, 0xce, 0x4e,
-	0x34, 0xda, 0x0f, 0xb5, 0x98, 0xab, 0x74, 0xe8, 0xb2, 0xb9, 0x9b, 0xd6, 0xc1, 0x84, 0x79, 0x4a,
-	0x57, 0xc2, 0x56, 0xdd, 0xa5, 0x7d, 0x57, 0xdb, 0x92, 0x57, 0x84, 0x4d, 0x57, 0x8c, 0x5b, 0xa9,
-	0xd4, 0x0f, 0x4e, 0x49, 0xc7, 0x09, 0x4f, 0xe9, 0xe1, 0x2c, 0x38, 0x9b, 0x11, 0x63, 0xd3, 0x45,
-	0x2b, 0x70, 0xab, 0x43, 0x28, 0xc5, 0x3d, 0x87, 0x63, 0x37, 0x21, 0xc3, 0x84, 0x90, 0x4a, 0xe2,
-	0xcd, 0xf8, 0x40, 0x2c, 0xca, 0x36, 0xdd, 0xc6, 0x6f, 0x0c, 0x28, 0xb4, 0x42, 0xa3, 0xd1, 0xcf,
-	0x0d, 0xc8, 0xe9, 0x9d, 0x04, 0x7d, 0x6d, 0xe2, 0xad, 0x4d, 0x06, 0xae, 0x7a, 0x3b, 0x94, 0x4b,
-	0x7c, 0xa2, 0xad, 0x45, 0x1b, 0x8e, 0xf9, 0xe6, 0xf7, 0xfe, 0xf6, 0xcf, 0xcf, 0x32, 0x75, 0x73,
-	0x39, 0xfc, 0x5c, 0xfc, 0x68, 0xe4, 0x12, 0xbc, 0xbd, 0xbc, 0xfc, 0xb8, 0xae, 0xe2, 0xc0, 0x56,
-	0x94, 0x2a, 0xbc, 0x62, 0x2c, 0x37, 0x3e, 0xcf, 0x42, 0x51, 0x0d, 0x26, 0xf9, 0x16, 0x80, 0xfe,
-	0xa5, 0x4a, 0x71, 0xe4, 0x6b, 0xc4, 0x37, 0xd3, 0x5a, 0x7c, 0xf9, 0x2a, 0x51, 0x9d, 0x6a, 0x42,
-	0x9a, 0x1f, 0x4b, 0x87, 0x1e, 0xa2, 0x07, 0x4f, 0x75, 0x48, 0x09, 0xb0, 0xfa, 0xa3, 0x91, 0x99,
-	0x5f, 0xeb, 0x3a, 0xac, 0xfb, 0x78, 0x9c, 0x18, 0x7f, 0x86, 0x79, 0x8c, 0xfe, 0x63, 0x00, 0xba,
-	0xb8, 0x68, 0xa0, 0xfb, 0x93, 0xf5, 0xe9, 0x67, 0xe7, 0x31, 0x91, 0x1e, 0xfb, 0xd5, 0xe7, 0xe6,
-	0xf1, 0xca, 0xe8, 0x02, 0xd3, 0xf8, 0xc5, 0x2c, 0xdc, 0x6a, 0xaa, 0x51, 0x78, 0xdf, 0x75, 0x29,
-	0x66, 0x4c, 0xbc, 0x1f, 0xed, 0x73, 0x42, 0xc5, 0x92, 0xf9, 0x17, 0x03, 0x16, 0xc6, 0x37, 0x00,
-	0xf4, 0x4e, 0xfa, 0x8f, 0x8e, 0x97, 0xae, 0x33, 0xd5, 0x6f, 0x4d, 0x0f, 0xa0, 0x3a, 0xa3, 0x79,
-	0x4f, 0x86, 0xe9, 0x8e, 0xf9, 0xfa, 0xff, 0x08, 0x93, 0x98, 0x26, 0x6c, 0xe5, 0x38, 0x86, 0x58,
-	0x31, 0x96, 0xa5, 0x43, 0xe3, 0x63, 0x2e, 0xbd, 0x43, 0x4f, 0xd8, 0x06, 0xd2, 0x3b, 0xf4, 0xa4,
-	0x09, 0x3b, 0x81, 0x43, 0x47, 0x31, 0x84, 0x70, 0xe8, 0xef, 0x06, 0xe4, 0xf4, 0xdc, 0x48, 0xdf,
-	0x56, 0x46, 0xa7, 0x65, 0xf5, 0xde, 0xc4, 0x72, 0xda, 0xea, 0x8f, 0xa4, 0xd5, 0x87, 0xe8, 0xe0,
-	0x69, 0x56, 0xd7, 0x1f, 0x25, 0x26, 0x6d, 0x58, 0xa3, 0x49, 0x52, 0xb2, 0x42, 0x3d, 0xa5, 0x65,
-	0xf5, 0x4f, 0x06, 0x2c, 0x77, 0x48, 0x3f, 0xa5, 0x71, 0xab, 0x37, 0x2c, 0x49, 0x8f, 0x3a, 0xee,
-	0x1e, 0x25, 0x9c, 0xec, 0x19, 0x0f, 0xdb, 0x5a, 0xde, 0x23, 0x3d, 0x27, 0xf0, 0x6a, 0x84, 0x7a,
-	0x75, 0x0f, 0x07, 0xf2, 0x6f, 0x91, 0xba, 0x62, 0x39, 0x03, 0x9f, 0x3d, 0xed, 0xaf, 0xb7, 0xb7,
-	0xc6, 0xc8, 0xbf, 0xce, 0x64, 0xad, 0xd6, 0x83, 0xdf, 0x65, 0x6e, 0x6f, 0x28, 0xf4, 0x31, 0xe5,
-	0xb5, 0xc3, 0x3b, 0x07, 0x98, 0xf1, 0xa3, 0x39, 0xa9, 0xe7, 0xee, 0x7f, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0xf0, 0x8a, 0x2f, 0x43, 0xe1, 0x1b, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/remoteworkers/v1test2/bots.pb.go b/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
index c9524e7e5e..6f4b325297 100644
--- a/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/bots.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package remoteworkers
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A coarse description of the status of the bot that the server uses to
 // determine whether to assign the bot new leases.
@@ -63,6 +63,7 @@ var BotStatus_name = map[int32]string{
 	3: "HOST_REBOOTING",
 	4: "BOT_TERMINATING",
 }
+
 var BotStatus_value = map[string]int32{
 	"BOT_STATUS_UNSPECIFIED": 0,
 	"OK":                     1,
@@ -74,8 +75,9 @@ var BotStatus_value = map[string]int32{
 func (x BotStatus) String() string {
 	return proto.EnumName(BotStatus_name, int32(x))
 }
+
 func (BotStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{0}
+	return fileDescriptor_129e24cb0c941ff8, []int{0}
 }
 
 // The state of the lease. All leases start in the PENDING state. A bot can
@@ -108,6 +110,7 @@ var LeaseState_name = map[int32]string{
 	4: "COMPLETED",
 	5: "CANCELLED",
 }
+
 var LeaseState_value = map[string]int32{
 	"LEASE_STATE_UNSPECIFIED": 0,
 	"PENDING":                 1,
@@ -119,8 +122,9 @@ var LeaseState_value = map[string]int32{
 func (x LeaseState) String() string {
 	return proto.EnumName(LeaseState_name, int32(x))
 }
+
 func (LeaseState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{1}
+	return fileDescriptor_129e24cb0c941ff8, []int{1}
 }
 
 // Possible administration actions.
@@ -150,6 +154,7 @@ var AdminTemp_Command_name = map[int32]string{
 	3: "BOT_TERMINATE",
 	4: "HOST_RESTART",
 }
+
 var AdminTemp_Command_value = map[string]int32{
 	"UNSPECIFIED":   0,
 	"BOT_UPDATE":    1,
@@ -161,8 +166,9 @@ var AdminTemp_Command_value = map[string]int32{
 func (x AdminTemp_Command) String() string {
 	return proto.EnumName(AdminTemp_Command_name, int32(x))
 }
+
 func (AdminTemp_Command) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{2, 0}
+	return fileDescriptor_129e24cb0c941ff8, []int{2, 0}
 }
 
 // Types of bot events.
@@ -182,6 +188,7 @@ var PostBotEventTempRequest_Type_name = map[int32]string{
 	1: "INFO",
 	2: "ERROR",
 }
+
 var PostBotEventTempRequest_Type_value = map[string]int32{
 	"UNSPECIFIED": 0,
 	"INFO":        1,
@@ -191,8 +198,9 @@ var PostBotEventTempRequest_Type_value = map[string]int32{
 func (x PostBotEventTempRequest_Type) String() string {
 	return proto.EnumName(PostBotEventTempRequest_Type_name, int32(x))
 }
+
 func (PostBotEventTempRequest_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{5, 0}
+	return fileDescriptor_129e24cb0c941ff8, []int{5, 0}
 }
 
 // A bot session represents the state of a bot while in continuous contact with
@@ -251,16 +259,17 @@ func (m *BotSession) Reset()         { *m = BotSession{} }
 func (m *BotSession) String() string { return proto.CompactTextString(m) }
 func (*BotSession) ProtoMessage()    {}
 func (*BotSession) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{0}
+	return fileDescriptor_129e24cb0c941ff8, []int{0}
 }
+
 func (m *BotSession) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BotSession.Unmarshal(m, b)
 }
 func (m *BotSession) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BotSession.Marshal(b, m, deterministic)
 }
-func (dst *BotSession) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BotSession.Merge(dst, src)
+func (m *BotSession) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BotSession.Merge(m, src)
 }
 func (m *BotSession) XXX_Size() int {
 	return xxx_messageInfo_BotSession.Size(m)
@@ -383,16 +392,17 @@ func (m *Lease) Reset()         { *m = Lease{} }
 func (m *Lease) String() string { return proto.CompactTextString(m) }
 func (*Lease) ProtoMessage()    {}
 func (*Lease) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{1}
+	return fileDescriptor_129e24cb0c941ff8, []int{1}
 }
+
 func (m *Lease) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Lease.Unmarshal(m, b)
 }
 func (m *Lease) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Lease.Marshal(b, m, deterministic)
 }
-func (dst *Lease) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Lease.Merge(dst, src)
+func (m *Lease) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Lease.Merge(m, src)
 }
 func (m *Lease) XXX_Size() int {
 	return xxx_messageInfo_Lease.Size(m)
@@ -494,16 +504,17 @@ func (m *AdminTemp) Reset()         { *m = AdminTemp{} }
 func (m *AdminTemp) String() string { return proto.CompactTextString(m) }
 func (*AdminTemp) ProtoMessage()    {}
 func (*AdminTemp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{2}
+	return fileDescriptor_129e24cb0c941ff8, []int{2}
 }
+
 func (m *AdminTemp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdminTemp.Unmarshal(m, b)
 }
 func (m *AdminTemp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdminTemp.Marshal(b, m, deterministic)
 }
-func (dst *AdminTemp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdminTemp.Merge(dst, src)
+func (m *AdminTemp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdminTemp.Merge(m, src)
 }
 func (m *AdminTemp) XXX_Size() int {
 	return xxx_messageInfo_AdminTemp.Size(m)
@@ -543,16 +554,17 @@ func (m *CreateBotSessionRequest) Reset()         { *m = CreateBotSessionRequest
 func (m *CreateBotSessionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateBotSessionRequest) ProtoMessage()    {}
 func (*CreateBotSessionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{3}
+	return fileDescriptor_129e24cb0c941ff8, []int{3}
 }
+
 func (m *CreateBotSessionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateBotSessionRequest.Unmarshal(m, b)
 }
 func (m *CreateBotSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateBotSessionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateBotSessionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateBotSessionRequest.Merge(dst, src)
+func (m *CreateBotSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBotSessionRequest.Merge(m, src)
 }
 func (m *CreateBotSessionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateBotSessionRequest.Size(m)
@@ -595,16 +607,17 @@ func (m *UpdateBotSessionRequest) Reset()         { *m = UpdateBotSessionRequest
 func (m *UpdateBotSessionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateBotSessionRequest) ProtoMessage()    {}
 func (*UpdateBotSessionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{4}
+	return fileDescriptor_129e24cb0c941ff8, []int{4}
 }
+
 func (m *UpdateBotSessionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateBotSessionRequest.Unmarshal(m, b)
 }
 func (m *UpdateBotSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateBotSessionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateBotSessionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateBotSessionRequest.Merge(dst, src)
+func (m *UpdateBotSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBotSessionRequest.Merge(m, src)
 }
 func (m *UpdateBotSessionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateBotSessionRequest.Size(m)
@@ -653,16 +666,17 @@ func (m *PostBotEventTempRequest) Reset()         { *m = PostBotEventTempRequest
 func (m *PostBotEventTempRequest) String() string { return proto.CompactTextString(m) }
 func (*PostBotEventTempRequest) ProtoMessage()    {}
 func (*PostBotEventTempRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bots_0fa217a861a9a803, []int{5}
+	return fileDescriptor_129e24cb0c941ff8, []int{5}
 }
+
 func (m *PostBotEventTempRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PostBotEventTempRequest.Unmarshal(m, b)
 }
 func (m *PostBotEventTempRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PostBotEventTempRequest.Marshal(b, m, deterministic)
 }
-func (dst *PostBotEventTempRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PostBotEventTempRequest.Merge(dst, src)
+func (m *PostBotEventTempRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PostBotEventTempRequest.Merge(m, src)
 }
 func (m *PostBotEventTempRequest) XXX_Size() int {
 	return xxx_messageInfo_PostBotEventTempRequest.Size(m)
@@ -695,16 +709,92 @@ func (m *PostBotEventTempRequest) GetMsg() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.BotStatus", BotStatus_name, BotStatus_value)
+	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.LeaseState", LeaseState_name, LeaseState_value)
+	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.AdminTemp_Command", AdminTemp_Command_name, AdminTemp_Command_value)
+	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.PostBotEventTempRequest_Type", PostBotEventTempRequest_Type_name, PostBotEventTempRequest_Type_value)
 	proto.RegisterType((*BotSession)(nil), "google.devtools.remoteworkers.v1test2.BotSession")
 	proto.RegisterType((*Lease)(nil), "google.devtools.remoteworkers.v1test2.Lease")
 	proto.RegisterType((*AdminTemp)(nil), "google.devtools.remoteworkers.v1test2.AdminTemp")
 	proto.RegisterType((*CreateBotSessionRequest)(nil), "google.devtools.remoteworkers.v1test2.CreateBotSessionRequest")
 	proto.RegisterType((*UpdateBotSessionRequest)(nil), "google.devtools.remoteworkers.v1test2.UpdateBotSessionRequest")
 	proto.RegisterType((*PostBotEventTempRequest)(nil), "google.devtools.remoteworkers.v1test2.PostBotEventTempRequest")
-	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.BotStatus", BotStatus_name, BotStatus_value)
-	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.LeaseState", LeaseState_name, LeaseState_value)
-	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.AdminTemp_Command", AdminTemp_Command_name, AdminTemp_Command_value)
-	proto.RegisterEnum("google.devtools.remoteworkers.v1test2.PostBotEventTempRequest_Type", PostBotEventTempRequest_Type_name, PostBotEventTempRequest_Type_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/bots.proto", fileDescriptor_129e24cb0c941ff8)
+}
+
+var fileDescriptor_129e24cb0c941ff8 = []byte{
+	// 1075 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x8e, 0xdb, 0x44,
+	0x14, 0xc6, 0xce, 0x5f, 0x73, 0xd2, 0xa6, 0xee, 0x00, 0x5d, 0x93, 0x22, 0x11, 0x59, 0xaa, 0xb4,
+	0x44, 0x8b, 0xdd, 0x0d, 0x42, 0x42, 0xad, 0x8a, 0x94, 0x1f, 0xef, 0x6e, 0x44, 0x36, 0x09, 0x13,
+	0x6f, 0x57, 0x70, 0x93, 0x3a, 0x9b, 0x69, 0x64, 0x6d, 0xec, 0x71, 0x3d, 0x93, 0x85, 0x15, 0xea,
+	0x0d, 0x12, 0x4f, 0xc0, 0x13, 0xc0, 0x15, 0xe2, 0x19, 0x10, 0x12, 0x37, 0xbc, 0x40, 0x5f, 0x81,
+	0xbe, 0x07, 0x9a, 0xb1, 0x93, 0x4d, 0xb2, 0xdd, 0xd6, 0x0b, 0xe2, 0x6e, 0x7e, 0xbe, 0xef, 0x9c,
+	0x2f, 0xe7, 0x7c, 0x67, 0x62, 0x78, 0x30, 0xa5, 0x74, 0x3a, 0x23, 0xd6, 0x84, 0x9c, 0x71, 0x4a,
+	0x67, 0xcc, 0x8a, 0x88, 0x4f, 0x39, 0xf9, 0x96, 0x46, 0xa7, 0x24, 0x62, 0xd6, 0xd9, 0x2e, 0x27,
+	0x8c, 0xd7, 0xad, 0x31, 0xe5, 0xcc, 0x0c, 0x23, 0xca, 0x29, 0xba, 0x1f, 0x33, 0xcc, 0x05, 0xc3,
+	0x5c, 0x63, 0x98, 0x09, 0xa3, 0xf2, 0x61, 0x12, 0xd8, 0x0d, 0x3d, 0xcb, 0x0d, 0x02, 0xca, 0x5d,
+	0xee, 0xd1, 0x20, 0x09, 0x52, 0xa9, 0xa7, 0x4b, 0x1b, 0xef, 0x13, 0xce, 0x07, 0x09, 0x47, 0xee,
+	0xc6, 0xf3, 0x67, 0x96, 0x1b, 0x9c, 0x27, 0x57, 0xf7, 0x36, 0xaf, 0x88, 0x1f, 0xf2, 0xc5, 0x65,
+	0x75, 0xf3, 0xf2, 0x99, 0x47, 0x66, 0x93, 0x91, 0xef, 0xb2, 0xd3, 0x04, 0xf1, 0xd1, 0x26, 0x82,
+	0x7b, 0x3e, 0x61, 0xdc, 0xf5, 0xc3, 0x04, 0xb0, 0x95, 0x00, 0xa2, 0xf0, 0xc4, 0x62, 0xdc, 0xe5,
+	0xf3, 0xe4, 0x77, 0x18, 0xaf, 0x54, 0x80, 0x26, 0xe5, 0x43, 0xc2, 0x98, 0x47, 0x03, 0x84, 0x20,
+	0x1b, 0xb8, 0x3e, 0xd1, 0x95, 0xaa, 0xb2, 0x5d, 0xc4, 0x72, 0x8d, 0xde, 0x87, 0xfc, 0x98, 0xf2,
+	0x91, 0x37, 0xd1, 0x55, 0x79, 0x9a, 0x1b, 0x53, 0xde, 0x99, 0xa0, 0x03, 0xc8, 0xc7, 0x91, 0xf4,
+	0x4c, 0x55, 0xd9, 0x2e, 0xd7, 0x1f, 0x98, 0xa9, 0xea, 0x6a, 0x8a, 0x6c, 0x92, 0x87, 0x13, 0x3e,
+	0xb2, 0x21, 0x1f, 0x83, 0xf4, 0x6c, 0x55, 0xd9, 0x2e, 0xd5, 0x3f, 0x49, 0x19, 0xe9, 0x58, 0xee,
+	0x71, 0x42, 0x46, 0x6d, 0xc8, 0xcf, 0x88, 0xcb, 0x08, 0xd3, 0x73, 0xd5, 0xcc, 0x76, 0xa9, 0xbe,
+	0x93, 0x32, 0x4c, 0x57, 0x90, 0x70, 0xc2, 0x45, 0x8f, 0xa0, 0x44, 0xbe, 0x0b, 0xbd, 0x88, 0x8c,
+	0x44, 0x0d, 0xf5, 0xbc, 0x54, 0x54, 0x59, 0x84, 0x5a, 0x14, 0xd8, 0x74, 0x16, 0x05, 0xc6, 0x10,
+	0xc3, 0xc5, 0x01, 0xd2, 0xa1, 0x70, 0x46, 0x22, 0x51, 0x49, 0xbd, 0x20, 0x6b, 0xb5, 0xd8, 0x1a,
+	0xaf, 0x32, 0x90, 0x93, 0x89, 0x50, 0x19, 0x54, 0x6f, 0x92, 0x5c, 0xab, 0xde, 0x04, 0x99, 0x50,
+	0x08, 0xdd, 0xf3, 0x19, 0x75, 0x27, 0xfa, 0x0d, 0x99, 0xec, 0xbd, 0x4b, 0xc9, 0x1a, 0xc1, 0x39,
+	0x5e, 0x80, 0xd0, 0x0e, 0xe4, 0x23, 0xc2, 0xe6, 0x33, 0xae, 0x17, 0xdf, 0x00, 0x4f, 0x30, 0x68,
+	0x1f, 0x72, 0xa2, 0xca, 0x44, 0xf6, 0xae, 0x5c, 0xdf, 0xbd, 0x4e, 0x4d, 0x44, 0x9b, 0x08, 0x8e,
+	0xf9, 0xa8, 0xb6, 0xd6, 0xee, 0x52, 0x1d, 0x2d, 0x22, 0x45, 0xe1, 0x89, 0xb9, 0xd1, 0xd0, 0xaf,
+	0xe0, 0x66, 0x44, 0x9e, 0xcf, 0xbd, 0x88, 0xf8, 0x24, 0xe0, 0xec, 0xdf, 0xb5, 0x75, 0x2d, 0xc4,
+	0x66, 0x5b, 0x72, 0xd7, 0x6a, 0x8b, 0x01, 0xe0, 0x32, 0xe6, 0x4d, 0x03, 0x11, 0x2b, 0xf6, 0x76,
+	0x53, 0xd5, 0x15, 0xbc, 0x72, 0x8a, 0x6c, 0xb8, 0xe3, 0x05, 0x33, 0x2f, 0x20, 0xa3, 0x15, 0x68,
+	0xfe, 0xea, 0x0a, 0xcb, 0x00, 0x5a, 0x4c, 0x69, 0x2c, 0x19, 0xc6, 0x4b, 0x05, 0x8a, 0x8d, 0x89,
+	0xef, 0x05, 0x0e, 0xf1, 0x43, 0x84, 0xa1, 0x70, 0x42, 0x7d, 0xdf, 0x0d, 0x26, 0x32, 0x6b, 0xb9,
+	0xfe, 0x79, 0xca, 0x1a, 0x2c, 0x43, 0x98, 0xad, 0x98, 0x8f, 0x17, 0x81, 0x90, 0x06, 0x19, 0x37,
+	0x9a, 0x26, 0xb3, 0x28, 0x96, 0xc6, 0x53, 0x28, 0x24, 0x28, 0x74, 0x1b, 0x4a, 0x47, 0xbd, 0xe1,
+	0xc0, 0x6e, 0x75, 0xf6, 0x3a, 0x76, 0x5b, 0x7b, 0x07, 0x95, 0x01, 0x9a, 0x7d, 0x67, 0x74, 0x34,
+	0x68, 0x37, 0x1c, 0x5b, 0x53, 0x04, 0x40, 0xec, 0xb1, 0x3d, 0x74, 0x1a, 0xd8, 0xd1, 0x54, 0x74,
+	0x07, 0x6e, 0x89, 0x03, 0xc7, 0xc6, 0x87, 0x9d, 0x9e, 0xc0, 0x64, 0x90, 0x06, 0x37, 0x0f, 0xfa,
+	0xc3, 0x0b, 0x50, 0xd6, 0xf8, 0x51, 0x81, 0xad, 0x56, 0x44, 0x5c, 0x4e, 0x2e, 0xde, 0x0a, 0x4c,
+	0x9e, 0xcf, 0x09, 0xe3, 0xe8, 0x2e, 0xe4, 0x43, 0x37, 0x5a, 0x16, 0x16, 0x27, 0x3b, 0x84, 0xa1,
+	0x24, 0x9e, 0x0d, 0x16, 0xa3, 0xa5, 0xde, 0x52, 0x6a, 0xff, 0xad, 0xa4, 0x81, 0xf1, 0x72, 0x6d,
+	0xfc, 0xa1, 0xc0, 0xd6, 0x51, 0x38, 0x79, 0xad, 0x8e, 0xd7, 0x3d, 0x5d, 0xff, 0x83, 0x06, 0xe1,
+	0xc4, 0xb9, 0x94, 0x20, 0x1f, 0xe0, 0x64, 0x1a, 0x2e, 0x3b, 0x71, 0x4f, 0xbc, 0xd1, 0x87, 0x2e,
+	0x3b, 0xc5, 0x10, 0xc3, 0xc5, 0xda, 0xf8, 0x4b, 0x81, 0xad, 0x01, 0x65, 0xbc, 0x49, 0xb9, 0x7d,
+	0x46, 0x02, 0x2e, 0x5a, 0xfc, 0xa6, 0x1f, 0x70, 0x0c, 0x59, 0x7e, 0x1e, 0x2e, 0xa6, 0xb7, 0x95,
+	0x52, 0xf9, 0x15, 0x19, 0x4c, 0xe7, 0x3c, 0x24, 0x58, 0x06, 0x14, 0x2e, 0xf2, 0xd9, 0x54, 0xaa,
+	0x2f, 0x62, 0xb1, 0x34, 0x76, 0x20, 0x2b, 0xee, 0x2f, 0x5b, 0xe8, 0x06, 0x64, 0x3b, 0xbd, 0xbd,
+	0xbe, 0xa6, 0xa0, 0x22, 0xe4, 0x6c, 0x8c, 0xfb, 0x58, 0x53, 0x6b, 0x53, 0x28, 0x2e, 0x1f, 0x72,
+	0x54, 0x81, 0xbb, 0xc2, 0x43, 0x43, 0xa7, 0xe1, 0x1c, 0x0d, 0x47, 0xeb, 0xec, 0x3c, 0xa8, 0xfd,
+	0x2f, 0x35, 0x05, 0xdd, 0x82, 0xe2, 0x51, 0xef, 0xc0, 0x6e, 0x74, 0x9d, 0x83, 0xaf, 0x35, 0x15,
+	0x21, 0x28, 0x27, 0x1e, 0x6b, 0xf6, 0xfb, 0x4e, 0xa7, 0xb7, 0xaf, 0x65, 0xd0, 0xbb, 0x70, 0x7b,
+	0xd5, 0x8a, 0xe2, 0x30, 0x5b, 0x7b, 0x0a, 0x70, 0xf1, 0x18, 0xa1, 0x7b, 0xb0, 0xd5, 0xb5, 0x1b,
+	0x43, 0x5b, 0xe6, 0xb2, 0x37, 0x52, 0x95, 0xa0, 0x30, 0xb0, 0x7b, 0x6d, 0xc1, 0x53, 0x10, 0x40,
+	0xbe, 0xd1, 0x72, 0x3a, 0x4f, 0x6c, 0x4d, 0x15, 0xb9, 0x5b, 0xfd, 0xc3, 0x41, 0xd7, 0x76, 0xec,
+	0xb6, 0x96, 0x95, 0xdb, 0x46, 0xaf, 0x65, 0x77, 0xbb, 0x76, 0x5b, 0xcb, 0xd5, 0x7f, 0xcd, 0x42,
+	0xb6, 0x49, 0x39, 0x43, 0xbf, 0x2b, 0xa0, 0x6d, 0xba, 0x1c, 0x7d, 0x91, 0xb2, 0xe6, 0x57, 0x8c,
+	0x47, 0xe5, 0xfa, 0x6e, 0x33, 0x3e, 0xfb, 0xe1, 0xe5, 0xdf, 0x3f, 0xa9, 0x96, 0x51, 0x5d, 0x7e,
+	0x46, 0x7c, 0x1f, 0xcf, 0xd4, 0xe3, 0x5a, 0xed, 0x85, 0x75, 0x61, 0x45, 0xf6, 0x70, 0xd5, 0xdd,
+	0x52, 0xfe, 0xe6, 0x70, 0xa4, 0x96, 0x7f, 0xc5, 0x54, 0xfd, 0x07, 0xf9, 0xf5, 0x15, 0xf9, 0xc2,
+	0xcb, 0x8f, 0x6b, 0xb5, 0x55, 0xed, 0x56, 0xed, 0xc5, 0xba, 0xfc, 0x9f, 0x15, 0xd0, 0x36, 0x8d,
+	0x9b, 0x5a, 0xfe, 0x15, 0x8e, 0xaf, 0xdc, 0xbd, 0x34, 0x97, 0xb6, 0xf8, 0xb0, 0x5a, 0x96, 0xb8,
+	0xf6, 0x56, 0x8d, 0x21, 0x65, 0x71, 0xd8, 0x87, 0x4a, 0xad, 0xf9, 0xa7, 0x02, 0x1f, 0x9f, 0x50,
+	0x3f, 0x9d, 0xa8, 0xe6, 0x1d, 0x2c, 0x8f, 0xe3, 0xff, 0x33, 0x26, 0x2c, 0x36, 0x50, 0xbe, 0xc1,
+	0x09, 0x77, 0x4a, 0x67, 0x6e, 0x30, 0x35, 0x69, 0x34, 0xb5, 0xa6, 0x24, 0x90, 0xf2, 0xac, 0xf8,
+	0xca, 0x0d, 0x3d, 0xf6, 0x96, 0xef, 0xca, 0x47, 0x6b, 0xa7, 0xbf, 0xa8, 0x2a, 0x3e, 0xfe, 0x4d,
+	0xbd, 0xbf, 0x1f, 0x47, 0x6e, 0x93, 0x33, 0x47, 0xaa, 0x5a, 0x4b, 0x6f, 0x3e, 0xd9, 0x75, 0x04,
+	0x75, 0x9c, 0x97, 0xb9, 0x3e, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x75, 0x00, 0xcd, 0xd5, 0x39,
+	0x0b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -864,79 +954,3 @@ var _Bots_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/remoteworkers/v1test2/bots.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/remoteworkers/v1test2/bots.proto", fileDescriptor_bots_0fa217a861a9a803)
-}
-
-var fileDescriptor_bots_0fa217a861a9a803 = []byte{
-	// 1075 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x8e, 0xdb, 0x44,
-	0x14, 0xc6, 0xce, 0x5f, 0x73, 0xd2, 0xa6, 0xee, 0x00, 0x5d, 0x93, 0x22, 0x11, 0x59, 0xaa, 0xb4,
-	0x44, 0x8b, 0xdd, 0x0d, 0x42, 0x42, 0xad, 0x8a, 0x94, 0x1f, 0xef, 0x6e, 0x44, 0x36, 0x09, 0x13,
-	0x6f, 0x57, 0x70, 0x93, 0x3a, 0x9b, 0x69, 0x64, 0x6d, 0xec, 0x71, 0x3d, 0x93, 0x85, 0x15, 0xea,
-	0x0d, 0x12, 0x4f, 0xc0, 0x13, 0xc0, 0x15, 0xe2, 0x19, 0x10, 0x12, 0x37, 0xbc, 0x40, 0x5f, 0x81,
-	0xbe, 0x07, 0x9a, 0xb1, 0x93, 0x4d, 0xb2, 0xdd, 0xd6, 0x0b, 0xe2, 0x6e, 0x7e, 0xbe, 0xef, 0x9c,
-	0x2f, 0xe7, 0x7c, 0x67, 0x62, 0x78, 0x30, 0xa5, 0x74, 0x3a, 0x23, 0xd6, 0x84, 0x9c, 0x71, 0x4a,
-	0x67, 0xcc, 0x8a, 0x88, 0x4f, 0x39, 0xf9, 0x96, 0x46, 0xa7, 0x24, 0x62, 0xd6, 0xd9, 0x2e, 0x27,
-	0x8c, 0xd7, 0xad, 0x31, 0xe5, 0xcc, 0x0c, 0x23, 0xca, 0x29, 0xba, 0x1f, 0x33, 0xcc, 0x05, 0xc3,
-	0x5c, 0x63, 0x98, 0x09, 0xa3, 0xf2, 0x61, 0x12, 0xd8, 0x0d, 0x3d, 0xcb, 0x0d, 0x02, 0xca, 0x5d,
-	0xee, 0xd1, 0x20, 0x09, 0x52, 0xa9, 0xa7, 0x4b, 0x1b, 0xef, 0x13, 0xce, 0x07, 0x09, 0x47, 0xee,
-	0xc6, 0xf3, 0x67, 0x96, 0x1b, 0x9c, 0x27, 0x57, 0xf7, 0x36, 0xaf, 0x88, 0x1f, 0xf2, 0xc5, 0x65,
-	0x75, 0xf3, 0xf2, 0x99, 0x47, 0x66, 0x93, 0x91, 0xef, 0xb2, 0xd3, 0x04, 0xf1, 0xd1, 0x26, 0x82,
-	0x7b, 0x3e, 0x61, 0xdc, 0xf5, 0xc3, 0x04, 0xb0, 0x95, 0x00, 0xa2, 0xf0, 0xc4, 0x62, 0xdc, 0xe5,
-	0xf3, 0xe4, 0x77, 0x18, 0xaf, 0x54, 0x80, 0x26, 0xe5, 0x43, 0xc2, 0x98, 0x47, 0x03, 0x84, 0x20,
-	0x1b, 0xb8, 0x3e, 0xd1, 0x95, 0xaa, 0xb2, 0x5d, 0xc4, 0x72, 0x8d, 0xde, 0x87, 0xfc, 0x98, 0xf2,
-	0x91, 0x37, 0xd1, 0x55, 0x79, 0x9a, 0x1b, 0x53, 0xde, 0x99, 0xa0, 0x03, 0xc8, 0xc7, 0x91, 0xf4,
-	0x4c, 0x55, 0xd9, 0x2e, 0xd7, 0x1f, 0x98, 0xa9, 0xea, 0x6a, 0x8a, 0x6c, 0x92, 0x87, 0x13, 0x3e,
-	0xb2, 0x21, 0x1f, 0x83, 0xf4, 0x6c, 0x55, 0xd9, 0x2e, 0xd5, 0x3f, 0x49, 0x19, 0xe9, 0x58, 0xee,
-	0x71, 0x42, 0x46, 0x6d, 0xc8, 0xcf, 0x88, 0xcb, 0x08, 0xd3, 0x73, 0xd5, 0xcc, 0x76, 0xa9, 0xbe,
-	0x93, 0x32, 0x4c, 0x57, 0x90, 0x70, 0xc2, 0x45, 0x8f, 0xa0, 0x44, 0xbe, 0x0b, 0xbd, 0x88, 0x8c,
-	0x44, 0x0d, 0xf5, 0xbc, 0x54, 0x54, 0x59, 0x84, 0x5a, 0x14, 0xd8, 0x74, 0x16, 0x05, 0xc6, 0x10,
-	0xc3, 0xc5, 0x01, 0xd2, 0xa1, 0x70, 0x46, 0x22, 0x51, 0x49, 0xbd, 0x20, 0x6b, 0xb5, 0xd8, 0x1a,
-	0xaf, 0x32, 0x90, 0x93, 0x89, 0x50, 0x19, 0x54, 0x6f, 0x92, 0x5c, 0xab, 0xde, 0x04, 0x99, 0x50,
-	0x08, 0xdd, 0xf3, 0x19, 0x75, 0x27, 0xfa, 0x0d, 0x99, 0xec, 0xbd, 0x4b, 0xc9, 0x1a, 0xc1, 0x39,
-	0x5e, 0x80, 0xd0, 0x0e, 0xe4, 0x23, 0xc2, 0xe6, 0x33, 0xae, 0x17, 0xdf, 0x00, 0x4f, 0x30, 0x68,
-	0x1f, 0x72, 0xa2, 0xca, 0x44, 0xf6, 0xae, 0x5c, 0xdf, 0xbd, 0x4e, 0x4d, 0x44, 0x9b, 0x08, 0x8e,
-	0xf9, 0xa8, 0xb6, 0xd6, 0xee, 0x52, 0x1d, 0x2d, 0x22, 0x45, 0xe1, 0x89, 0xb9, 0xd1, 0xd0, 0xaf,
-	0xe0, 0x66, 0x44, 0x9e, 0xcf, 0xbd, 0x88, 0xf8, 0x24, 0xe0, 0xec, 0xdf, 0xb5, 0x75, 0x2d, 0xc4,
-	0x66, 0x5b, 0x72, 0xd7, 0x6a, 0x8b, 0x01, 0xe0, 0x32, 0xe6, 0x4d, 0x03, 0x11, 0x2b, 0xf6, 0x76,
-	0x53, 0xd5, 0x15, 0xbc, 0x72, 0x8a, 0x6c, 0xb8, 0xe3, 0x05, 0x33, 0x2f, 0x20, 0xa3, 0x15, 0x68,
-	0xfe, 0xea, 0x0a, 0xcb, 0x00, 0x5a, 0x4c, 0x69, 0x2c, 0x19, 0xc6, 0x4b, 0x05, 0x8a, 0x8d, 0x89,
-	0xef, 0x05, 0x0e, 0xf1, 0x43, 0x84, 0xa1, 0x70, 0x42, 0x7d, 0xdf, 0x0d, 0x26, 0x32, 0x6b, 0xb9,
-	0xfe, 0x79, 0xca, 0x1a, 0x2c, 0x43, 0x98, 0xad, 0x98, 0x8f, 0x17, 0x81, 0x90, 0x06, 0x19, 0x37,
-	0x9a, 0x26, 0xb3, 0x28, 0x96, 0xc6, 0x53, 0x28, 0x24, 0x28, 0x74, 0x1b, 0x4a, 0x47, 0xbd, 0xe1,
-	0xc0, 0x6e, 0x75, 0xf6, 0x3a, 0x76, 0x5b, 0x7b, 0x07, 0x95, 0x01, 0x9a, 0x7d, 0x67, 0x74, 0x34,
-	0x68, 0x37, 0x1c, 0x5b, 0x53, 0x04, 0x40, 0xec, 0xb1, 0x3d, 0x74, 0x1a, 0xd8, 0xd1, 0x54, 0x74,
-	0x07, 0x6e, 0x89, 0x03, 0xc7, 0xc6, 0x87, 0x9d, 0x9e, 0xc0, 0x64, 0x90, 0x06, 0x37, 0x0f, 0xfa,
-	0xc3, 0x0b, 0x50, 0xd6, 0xf8, 0x51, 0x81, 0xad, 0x56, 0x44, 0x5c, 0x4e, 0x2e, 0xde, 0x0a, 0x4c,
-	0x9e, 0xcf, 0x09, 0xe3, 0xe8, 0x2e, 0xe4, 0x43, 0x37, 0x5a, 0x16, 0x16, 0x27, 0x3b, 0x84, 0xa1,
-	0x24, 0x9e, 0x0d, 0x16, 0xa3, 0xa5, 0xde, 0x52, 0x6a, 0xff, 0xad, 0xa4, 0x81, 0xf1, 0x72, 0x6d,
-	0xfc, 0xa1, 0xc0, 0xd6, 0x51, 0x38, 0x79, 0xad, 0x8e, 0xd7, 0x3d, 0x5d, 0xff, 0x83, 0x06, 0xe1,
-	0xc4, 0xb9, 0x94, 0x20, 0x1f, 0xe0, 0x64, 0x1a, 0x2e, 0x3b, 0x71, 0x4f, 0xbc, 0xd1, 0x87, 0x2e,
-	0x3b, 0xc5, 0x10, 0xc3, 0xc5, 0xda, 0xf8, 0x4b, 0x81, 0xad, 0x01, 0x65, 0xbc, 0x49, 0xb9, 0x7d,
-	0x46, 0x02, 0x2e, 0x5a, 0xfc, 0xa6, 0x1f, 0x70, 0x0c, 0x59, 0x7e, 0x1e, 0x2e, 0xa6, 0xb7, 0x95,
-	0x52, 0xf9, 0x15, 0x19, 0x4c, 0xe7, 0x3c, 0x24, 0x58, 0x06, 0x14, 0x2e, 0xf2, 0xd9, 0x54, 0xaa,
-	0x2f, 0x62, 0xb1, 0x34, 0x76, 0x20, 0x2b, 0xee, 0x2f, 0x5b, 0xe8, 0x06, 0x64, 0x3b, 0xbd, 0xbd,
-	0xbe, 0xa6, 0xa0, 0x22, 0xe4, 0x6c, 0x8c, 0xfb, 0x58, 0x53, 0x6b, 0x53, 0x28, 0x2e, 0x1f, 0x72,
-	0x54, 0x81, 0xbb, 0xc2, 0x43, 0x43, 0xa7, 0xe1, 0x1c, 0x0d, 0x47, 0xeb, 0xec, 0x3c, 0xa8, 0xfd,
-	0x2f, 0x35, 0x05, 0xdd, 0x82, 0xe2, 0x51, 0xef, 0xc0, 0x6e, 0x74, 0x9d, 0x83, 0xaf, 0x35, 0x15,
-	0x21, 0x28, 0x27, 0x1e, 0x6b, 0xf6, 0xfb, 0x4e, 0xa7, 0xb7, 0xaf, 0x65, 0xd0, 0xbb, 0x70, 0x7b,
-	0xd5, 0x8a, 0xe2, 0x30, 0x5b, 0x7b, 0x0a, 0x70, 0xf1, 0x18, 0xa1, 0x7b, 0xb0, 0xd5, 0xb5, 0x1b,
-	0x43, 0x5b, 0xe6, 0xb2, 0x37, 0x52, 0x95, 0xa0, 0x30, 0xb0, 0x7b, 0x6d, 0xc1, 0x53, 0x10, 0x40,
-	0xbe, 0xd1, 0x72, 0x3a, 0x4f, 0x6c, 0x4d, 0x15, 0xb9, 0x5b, 0xfd, 0xc3, 0x41, 0xd7, 0x76, 0xec,
-	0xb6, 0x96, 0x95, 0xdb, 0x46, 0xaf, 0x65, 0x77, 0xbb, 0x76, 0x5b, 0xcb, 0xd5, 0x7f, 0xcd, 0x42,
-	0xb6, 0x49, 0x39, 0x43, 0xbf, 0x2b, 0xa0, 0x6d, 0xba, 0x1c, 0x7d, 0x91, 0xb2, 0xe6, 0x57, 0x8c,
-	0x47, 0xe5, 0xfa, 0x6e, 0x33, 0x3e, 0xfb, 0xe1, 0xe5, 0xdf, 0x3f, 0xa9, 0x96, 0x51, 0x5d, 0x7e,
-	0x46, 0x7c, 0x1f, 0xcf, 0xd4, 0xe3, 0x5a, 0xed, 0x85, 0x75, 0x61, 0x45, 0xf6, 0x70, 0xd5, 0xdd,
-	0x52, 0xfe, 0xe6, 0x70, 0xa4, 0x96, 0x7f, 0xc5, 0x54, 0xfd, 0x07, 0xf9, 0xf5, 0x15, 0xf9, 0xc2,
-	0xcb, 0x8f, 0x6b, 0xb5, 0x55, 0xed, 0x56, 0xed, 0xc5, 0xba, 0xfc, 0x9f, 0x15, 0xd0, 0x36, 0x8d,
-	0x9b, 0x5a, 0xfe, 0x15, 0x8e, 0xaf, 0xdc, 0xbd, 0x34, 0x97, 0xb6, 0xf8, 0xb0, 0x5a, 0x96, 0xb8,
-	0xf6, 0x56, 0x8d, 0x21, 0x65, 0x71, 0xd8, 0x87, 0x4a, 0xad, 0xf9, 0xa7, 0x02, 0x1f, 0x9f, 0x50,
-	0x3f, 0x9d, 0xa8, 0xe6, 0x1d, 0x2c, 0x8f, 0xe3, 0xff, 0x33, 0x26, 0x2c, 0x36, 0x50, 0xbe, 0xc1,
-	0x09, 0x77, 0x4a, 0x67, 0x6e, 0x30, 0x35, 0x69, 0x34, 0xb5, 0xa6, 0x24, 0x90, 0xf2, 0xac, 0xf8,
-	0xca, 0x0d, 0x3d, 0xf6, 0x96, 0xef, 0xca, 0x47, 0x6b, 0xa7, 0xbf, 0xa8, 0x2a, 0x3e, 0xfe, 0x4d,
-	0xbd, 0xbf, 0x1f, 0x47, 0x6e, 0x93, 0x33, 0x47, 0xaa, 0x5a, 0x4b, 0x6f, 0x3e, 0xd9, 0x75, 0x04,
-	0x75, 0x9c, 0x97, 0xb9, 0x3e, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x75, 0x00, 0xcd, 0xd5, 0x39,
-	0x0b, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/remoteworkers/v1test2/command.pb.go b/googleapis/devtools/remoteworkers/v1test2/command.pb.go
index 6a301db6e0..5575b076db 100644
--- a/googleapis/devtools/remoteworkers/v1test2/command.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/command.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/command.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
+package remoteworkers
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes a shell-style task to execute, suitable for providing as the Bots
 // interface's `Lease.payload` field.
@@ -39,16 +42,17 @@ func (m *CommandTask) Reset()         { *m = CommandTask{} }
 func (m *CommandTask) String() string { return proto.CompactTextString(m) }
 func (*CommandTask) ProtoMessage()    {}
 func (*CommandTask) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{0}
+	return fileDescriptor_7b7f8597ab32e88e, []int{0}
 }
+
 func (m *CommandTask) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandTask.Unmarshal(m, b)
 }
 func (m *CommandTask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandTask.Marshal(b, m, deterministic)
 }
-func (dst *CommandTask) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandTask.Merge(dst, src)
+func (m *CommandTask) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask.Merge(m, src)
 }
 func (m *CommandTask) XXX_Size() int {
 	return xxx_messageInfo_CommandTask.Size(m)
@@ -114,16 +118,17 @@ func (m *CommandTask_Inputs) Reset()         { *m = CommandTask_Inputs{} }
 func (m *CommandTask_Inputs) String() string { return proto.CompactTextString(m) }
 func (*CommandTask_Inputs) ProtoMessage()    {}
 func (*CommandTask_Inputs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{0, 0}
+	return fileDescriptor_7b7f8597ab32e88e, []int{0, 0}
 }
+
 func (m *CommandTask_Inputs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandTask_Inputs.Unmarshal(m, b)
 }
 func (m *CommandTask_Inputs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandTask_Inputs.Marshal(b, m, deterministic)
 }
-func (dst *CommandTask_Inputs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandTask_Inputs.Merge(dst, src)
+func (m *CommandTask_Inputs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Inputs.Merge(m, src)
 }
 func (m *CommandTask_Inputs) XXX_Size() int {
 	return xxx_messageInfo_CommandTask_Inputs.Size(m)
@@ -172,16 +177,17 @@ func (m *CommandTask_Inputs_EnvironmentVariable) Reset() {
 func (m *CommandTask_Inputs_EnvironmentVariable) String() string { return proto.CompactTextString(m) }
 func (*CommandTask_Inputs_EnvironmentVariable) ProtoMessage()    {}
 func (*CommandTask_Inputs_EnvironmentVariable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{0, 0, 0}
+	return fileDescriptor_7b7f8597ab32e88e, []int{0, 0, 0}
 }
+
 func (m *CommandTask_Inputs_EnvironmentVariable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Unmarshal(m, b)
 }
 func (m *CommandTask_Inputs_EnvironmentVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Marshal(b, m, deterministic)
 }
-func (dst *CommandTask_Inputs_EnvironmentVariable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Merge(dst, src)
+func (m *CommandTask_Inputs_EnvironmentVariable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Merge(m, src)
 }
 func (m *CommandTask_Inputs_EnvironmentVariable) XXX_Size() int {
 	return xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Size(m)
@@ -235,16 +241,17 @@ func (m *CommandTask_Outputs) Reset()         { *m = CommandTask_Outputs{} }
 func (m *CommandTask_Outputs) String() string { return proto.CompactTextString(m) }
 func (*CommandTask_Outputs) ProtoMessage()    {}
 func (*CommandTask_Outputs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{0, 1}
+	return fileDescriptor_7b7f8597ab32e88e, []int{0, 1}
 }
+
 func (m *CommandTask_Outputs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandTask_Outputs.Unmarshal(m, b)
 }
 func (m *CommandTask_Outputs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandTask_Outputs.Marshal(b, m, deterministic)
 }
-func (dst *CommandTask_Outputs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandTask_Outputs.Merge(dst, src)
+func (m *CommandTask_Outputs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Outputs.Merge(m, src)
 }
 func (m *CommandTask_Outputs) XXX_Size() int {
 	return xxx_messageInfo_CommandTask_Outputs.Size(m)
@@ -310,16 +317,17 @@ func (m *CommandTask_Timeouts) Reset()         { *m = CommandTask_Timeouts{} }
 func (m *CommandTask_Timeouts) String() string { return proto.CompactTextString(m) }
 func (*CommandTask_Timeouts) ProtoMessage()    {}
 func (*CommandTask_Timeouts) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{0, 2}
+	return fileDescriptor_7b7f8597ab32e88e, []int{0, 2}
 }
+
 func (m *CommandTask_Timeouts) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandTask_Timeouts.Unmarshal(m, b)
 }
 func (m *CommandTask_Timeouts) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandTask_Timeouts.Marshal(b, m, deterministic)
 }
-func (dst *CommandTask_Timeouts) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandTask_Timeouts.Merge(dst, src)
+func (m *CommandTask_Timeouts) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Timeouts.Merge(m, src)
 }
 func (m *CommandTask_Timeouts) XXX_Size() int {
 	return xxx_messageInfo_CommandTask_Timeouts.Size(m)
@@ -373,16 +381,17 @@ func (m *CommandOutputs) Reset()         { *m = CommandOutputs{} }
 func (m *CommandOutputs) String() string { return proto.CompactTextString(m) }
 func (*CommandOutputs) ProtoMessage()    {}
 func (*CommandOutputs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{1}
+	return fileDescriptor_7b7f8597ab32e88e, []int{1}
 }
+
 func (m *CommandOutputs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandOutputs.Unmarshal(m, b)
 }
 func (m *CommandOutputs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandOutputs.Marshal(b, m, deterministic)
 }
-func (dst *CommandOutputs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandOutputs.Merge(dst, src)
+func (m *CommandOutputs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandOutputs.Merge(m, src)
 }
 func (m *CommandOutputs) XXX_Size() int {
 	return xxx_messageInfo_CommandOutputs.Size(m)
@@ -427,16 +436,17 @@ func (m *CommandOverhead) Reset()         { *m = CommandOverhead{} }
 func (m *CommandOverhead) String() string { return proto.CompactTextString(m) }
 func (*CommandOverhead) ProtoMessage()    {}
 func (*CommandOverhead) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{2}
+	return fileDescriptor_7b7f8597ab32e88e, []int{2}
 }
+
 func (m *CommandOverhead) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandOverhead.Unmarshal(m, b)
 }
 func (m *CommandOverhead) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandOverhead.Marshal(b, m, deterministic)
 }
-func (dst *CommandOverhead) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandOverhead.Merge(dst, src)
+func (m *CommandOverhead) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandOverhead.Merge(m, src)
 }
 func (m *CommandOverhead) XXX_Size() int {
 	return xxx_messageInfo_CommandOverhead.Size(m)
@@ -499,16 +509,17 @@ func (m *CommandResult) Reset()         { *m = CommandResult{} }
 func (m *CommandResult) String() string { return proto.CompactTextString(m) }
 func (*CommandResult) ProtoMessage()    {}
 func (*CommandResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{3}
+	return fileDescriptor_7b7f8597ab32e88e, []int{3}
 }
+
 func (m *CommandResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandResult.Unmarshal(m, b)
 }
 func (m *CommandResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandResult.Marshal(b, m, deterministic)
 }
-func (dst *CommandResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandResult.Merge(dst, src)
+func (m *CommandResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandResult.Merge(m, src)
 }
 func (m *CommandResult) XXX_Size() int {
 	return xxx_messageInfo_CommandResult.Size(m)
@@ -589,16 +600,17 @@ func (m *FileMetadata) Reset()         { *m = FileMetadata{} }
 func (m *FileMetadata) String() string { return proto.CompactTextString(m) }
 func (*FileMetadata) ProtoMessage()    {}
 func (*FileMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{4}
+	return fileDescriptor_7b7f8597ab32e88e, []int{4}
 }
+
 func (m *FileMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileMetadata.Unmarshal(m, b)
 }
 func (m *FileMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileMetadata.Marshal(b, m, deterministic)
 }
-func (dst *FileMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileMetadata.Merge(dst, src)
+func (m *FileMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileMetadata.Merge(m, src)
 }
 func (m *FileMetadata) XXX_Size() int {
 	return xxx_messageInfo_FileMetadata.Size(m)
@@ -655,16 +667,17 @@ func (m *DirectoryMetadata) Reset()         { *m = DirectoryMetadata{} }
 func (m *DirectoryMetadata) String() string { return proto.CompactTextString(m) }
 func (*DirectoryMetadata) ProtoMessage()    {}
 func (*DirectoryMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{5}
+	return fileDescriptor_7b7f8597ab32e88e, []int{5}
 }
+
 func (m *DirectoryMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DirectoryMetadata.Unmarshal(m, b)
 }
 func (m *DirectoryMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DirectoryMetadata.Marshal(b, m, deterministic)
 }
-func (dst *DirectoryMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DirectoryMetadata.Merge(dst, src)
+func (m *DirectoryMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DirectoryMetadata.Merge(m, src)
 }
 func (m *DirectoryMetadata) XXX_Size() int {
 	return xxx_messageInfo_DirectoryMetadata.Size(m)
@@ -716,16 +729,17 @@ func (m *Digest) Reset()         { *m = Digest{} }
 func (m *Digest) String() string { return proto.CompactTextString(m) }
 func (*Digest) ProtoMessage()    {}
 func (*Digest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{6}
+	return fileDescriptor_7b7f8597ab32e88e, []int{6}
 }
+
 func (m *Digest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Digest.Unmarshal(m, b)
 }
 func (m *Digest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Digest.Marshal(b, m, deterministic)
 }
-func (dst *Digest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Digest.Merge(dst, src)
+func (m *Digest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Digest.Merge(m, src)
 }
 func (m *Digest) XXX_Size() int {
 	return xxx_messageInfo_Digest.Size(m)
@@ -766,16 +780,17 @@ func (m *Directory) Reset()         { *m = Directory{} }
 func (m *Directory) String() string { return proto.CompactTextString(m) }
 func (*Directory) ProtoMessage()    {}
 func (*Directory) Descriptor() ([]byte, []int) {
-	return fileDescriptor_command_64a15fa32645f108, []int{7}
+	return fileDescriptor_7b7f8597ab32e88e, []int{7}
 }
+
 func (m *Directory) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Directory.Unmarshal(m, b)
 }
 func (m *Directory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Directory.Marshal(b, m, deterministic)
 }
-func (dst *Directory) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Directory.Merge(dst, src)
+func (m *Directory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Directory.Merge(m, src)
 }
 func (m *Directory) XXX_Size() int {
 	return xxx_messageInfo_Directory.Size(m)
@@ -816,10 +831,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/remoteworkers/v1test2/command.proto", fileDescriptor_command_64a15fa32645f108)
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/command.proto", fileDescriptor_7b7f8597ab32e88e)
 }
 
-var fileDescriptor_command_64a15fa32645f108 = []byte{
+var fileDescriptor_7b7f8597ab32e88e = []byte{
 	// 852 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x5d, 0x6f, 0x1b, 0x45,
 	0x14, 0xd5, 0xae, 0x3f, 0x62, 0x5f, 0xa7, 0x94, 0x0e, 0xa9, 0x70, 0xcd, 0x87, 0x22, 0xa3, 0x4a,
diff --git a/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go b/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
index 48a3c6f8bd..5038158cf8 100644
--- a/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/tasks.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package remoteworkers
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // DEPRECATED - use Lease.payload instead.
 // A Task represents a unit of work. Its result and logs are defined as
@@ -59,16 +59,17 @@ func (m *Task) Reset()         { *m = Task{} }
 func (m *Task) String() string { return proto.CompactTextString(m) }
 func (*Task) ProtoMessage()    {}
 func (*Task) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tasks_67f801ee7e4c185b, []int{0}
+	return fileDescriptor_164aeca5668e3481, []int{0}
 }
+
 func (m *Task) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Task.Unmarshal(m, b)
 }
 func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Task.Marshal(b, m, deterministic)
 }
-func (dst *Task) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Task.Merge(dst, src)
+func (m *Task) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Task.Merge(m, src)
 }
 func (m *Task) XXX_Size() int {
 	return xxx_messageInfo_Task.Size(m)
@@ -133,16 +134,17 @@ func (m *TaskResult) Reset()         { *m = TaskResult{} }
 func (m *TaskResult) String() string { return proto.CompactTextString(m) }
 func (*TaskResult) ProtoMessage()    {}
 func (*TaskResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tasks_67f801ee7e4c185b, []int{1}
+	return fileDescriptor_164aeca5668e3481, []int{1}
 }
+
 func (m *TaskResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TaskResult.Unmarshal(m, b)
 }
 func (m *TaskResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TaskResult.Marshal(b, m, deterministic)
 }
-func (dst *TaskResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TaskResult.Merge(dst, src)
+func (m *TaskResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TaskResult.Merge(m, src)
 }
 func (m *TaskResult) XXX_Size() int {
 	return xxx_messageInfo_TaskResult.Size(m)
@@ -201,16 +203,17 @@ func (m *GetTaskRequest) Reset()         { *m = GetTaskRequest{} }
 func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTaskRequest) ProtoMessage()    {}
 func (*GetTaskRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tasks_67f801ee7e4c185b, []int{2}
+	return fileDescriptor_164aeca5668e3481, []int{2}
 }
+
 func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b)
 }
 func (m *GetTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTaskRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTaskRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTaskRequest.Merge(dst, src)
+func (m *GetTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTaskRequest.Merge(m, src)
 }
 func (m *GetTaskRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTaskRequest.Size(m)
@@ -249,16 +252,17 @@ func (m *UpdateTaskResultRequest) Reset()         { *m = UpdateTaskResultRequest
 func (m *UpdateTaskResultRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateTaskResultRequest) ProtoMessage()    {}
 func (*UpdateTaskResultRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tasks_67f801ee7e4c185b, []int{3}
+	return fileDescriptor_164aeca5668e3481, []int{3}
 }
+
 func (m *UpdateTaskResultRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateTaskResultRequest.Unmarshal(m, b)
 }
 func (m *UpdateTaskResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateTaskResultRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateTaskResultRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateTaskResultRequest.Merge(dst, src)
+func (m *UpdateTaskResultRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTaskResultRequest.Merge(m, src)
 }
 func (m *UpdateTaskResultRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateTaskResultRequest.Size(m)
@@ -312,16 +316,17 @@ func (m *AddTaskLogRequest) Reset()         { *m = AddTaskLogRequest{} }
 func (m *AddTaskLogRequest) String() string { return proto.CompactTextString(m) }
 func (*AddTaskLogRequest) ProtoMessage()    {}
 func (*AddTaskLogRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tasks_67f801ee7e4c185b, []int{4}
+	return fileDescriptor_164aeca5668e3481, []int{4}
 }
+
 func (m *AddTaskLogRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddTaskLogRequest.Unmarshal(m, b)
 }
 func (m *AddTaskLogRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddTaskLogRequest.Marshal(b, m, deterministic)
 }
-func (dst *AddTaskLogRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddTaskLogRequest.Merge(dst, src)
+func (m *AddTaskLogRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddTaskLogRequest.Merge(m, src)
 }
 func (m *AddTaskLogRequest) XXX_Size() int {
 	return xxx_messageInfo_AddTaskLogRequest.Size(m)
@@ -359,16 +364,17 @@ func (m *AddTaskLogResponse) Reset()         { *m = AddTaskLogResponse{} }
 func (m *AddTaskLogResponse) String() string { return proto.CompactTextString(m) }
 func (*AddTaskLogResponse) ProtoMessage()    {}
 func (*AddTaskLogResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_tasks_67f801ee7e4c185b, []int{5}
+	return fileDescriptor_164aeca5668e3481, []int{5}
 }
+
 func (m *AddTaskLogResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddTaskLogResponse.Unmarshal(m, b)
 }
 func (m *AddTaskLogResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddTaskLogResponse.Marshal(b, m, deterministic)
 }
-func (dst *AddTaskLogResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddTaskLogResponse.Merge(dst, src)
+func (m *AddTaskLogResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddTaskLogResponse.Merge(m, src)
 }
 func (m *AddTaskLogResponse) XXX_Size() int {
 	return xxx_messageInfo_AddTaskLogResponse.Size(m)
@@ -396,6 +402,57 @@ func init() {
 	proto.RegisterType((*AddTaskLogResponse)(nil), "google.devtools.remoteworkers.v1test2.AddTaskLogResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/tasks.proto", fileDescriptor_164aeca5668e3481)
+}
+
+var fileDescriptor_164aeca5668e3481 = []byte{
+	// 682 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6b, 0x13, 0x41,
+	0x14, 0x66, 0x92, 0x34, 0x36, 0x2f, 0x20, 0x75, 0xa8, 0x36, 0x2e, 0x3d, 0xc4, 0xc5, 0x4a, 0x4c,
+	0xcb, 0x2e, 0x89, 0xa8, 0x35, 0xc5, 0x42, 0x8b, 0x5a, 0x0a, 0x15, 0x64, 0xad, 0x16, 0xbc, 0x94,
+	0x69, 0x76, 0x3a, 0x86, 0x6c, 0x76, 0xd6, 0x9d, 0xd9, 0x48, 0x90, 0x5e, 0x3c, 0x79, 0x15, 0xff,
+	0x03, 0x8f, 0x5e, 0xbc, 0x7a, 0x14, 0xef, 0x9e, 0x04, 0xff, 0x02, 0xff, 0x10, 0x99, 0x1f, 0x69,
+	0x9b, 0xfe, 0x88, 0xa9, 0xb7, 0x99, 0x79, 0xdf, 0xf7, 0xde, 0xfb, 0xde, 0xf7, 0xb2, 0x81, 0x06,
+	0xe3, 0x9c, 0x45, 0xd4, 0x0f, 0x69, 0x5f, 0x72, 0x1e, 0x09, 0x3f, 0xa5, 0x3d, 0x2e, 0xe9, 0x5b,
+	0x9e, 0x76, 0x69, 0x2a, 0xfc, 0x7e, 0x43, 0x52, 0x21, 0x9b, 0xbe, 0x24, 0xa2, 0x2b, 0xbc, 0x24,
+	0xe5, 0x92, 0xe3, 0x05, 0x43, 0xf1, 0x86, 0x14, 0x6f, 0x84, 0xe2, 0x59, 0x8a, 0x33, 0x6f, 0x33,
+	0x93, 0xa4, 0xe3, 0x93, 0x38, 0xe6, 0x92, 0xc8, 0x0e, 0x8f, 0x6d, 0x12, 0xe7, 0xba, 0x8d, 0xea,
+	0xdb, 0x5e, 0xb6, 0xef, 0x93, 0x78, 0x60, 0x43, 0xd5, 0x93, 0xa1, 0xfd, 0x0e, 0x8d, 0xc2, 0xdd,
+	0x1e, 0x11, 0x5d, 0x8b, 0x98, 0xb3, 0x88, 0x34, 0x69, 0xfb, 0x42, 0x12, 0x99, 0xd9, 0xac, 0xee,
+	0x6f, 0x04, 0x85, 0x6d, 0x22, 0xba, 0x18, 0x43, 0x21, 0x26, 0x3d, 0x5a, 0x41, 0x55, 0x54, 0x2b,
+	0x05, 0xfa, 0x8c, 0xef, 0x41, 0x39, 0xa4, 0xa2, 0x9d, 0x76, 0x12, 0xd5, 0x48, 0x25, 0x57, 0x45,
+	0xb5, 0x72, 0x73, 0xd6, 0xb3, 0x6a, 0x86, 0xd5, 0xbc, 0xb5, 0x78, 0x10, 0x1c, 0x07, 0xe2, 0x4d,
+	0x28, 0x44, 0x9c, 0x89, 0x4a, 0xbe, 0x9a, 0xaf, 0x95, 0x9b, 0x77, 0xbd, 0x89, 0xe4, 0x7b, 0xaa,
+	0x0d, 0x6f, 0x8b, 0x33, 0xf1, 0x38, 0x96, 0xe9, 0x20, 0xd0, 0x29, 0x9c, 0xfb, 0x50, 0x3a, 0x7c,
+	0xc2, 0x33, 0x90, 0xef, 0xd2, 0x81, 0x6d, 0x51, 0x1d, 0xf1, 0x2c, 0x4c, 0xf5, 0x49, 0x94, 0x51,
+	0xdd, 0x5b, 0x29, 0x30, 0x97, 0x56, 0x6e, 0x19, 0xb9, 0xdf, 0x11, 0x80, 0xca, 0x18, 0x50, 0x91,
+	0x45, 0xf2, 0x4c, 0x79, 0x0e, 0x4c, 0xb7, 0x79, 0x2f, 0x89, 0xa8, 0x34, 0xfc, 0xe9, 0xe0, 0xf0,
+	0x8e, 0xeb, 0x50, 0x34, 0x73, 0xaa, 0xe4, 0xb5, 0x6a, 0x3c, 0x14, 0x91, 0x26, 0x6d, 0xef, 0xb9,
+	0x8e, 0x04, 0x16, 0x81, 0x97, 0xa0, 0xc8, 0x33, 0x99, 0x64, 0xb2, 0x52, 0x18, 0x33, 0x21, 0x8b,
+	0xc1, 0x35, 0x28, 0xf4, 0xa8, 0x24, 0x95, 0xa9, 0x31, 0x58, 0x8d, 0x70, 0x6f, 0xc2, 0xe5, 0x0d,
+	0x2a, 0x8d, 0x88, 0x37, 0x19, 0x15, 0x67, 0xaa, 0x70, 0x7f, 0x22, 0x98, 0x7b, 0x91, 0x84, 0x44,
+	0xd2, 0x23, 0xb9, 0x63, 0xf0, 0x78, 0x13, 0x8a, 0xa9, 0x06, 0x59, 0x3f, 0x1b, 0x17, 0xb0, 0xc7,
+	0x66, 0xb7, 0x09, 0xf0, 0x0a, 0x94, 0x33, 0x5d, 0x59, 0xaf, 0x9a, 0x9d, 0x94, 0x73, 0x4a, 0xd1,
+	0x13, 0xb5, 0x8d, 0x4f, 0x15, 0x1d, 0x0c, 0x5c, 0x9d, 0xf1, 0x35, 0x28, 0x0a, 0x9e, 0xa5, 0x6d,
+	0xaa, 0xa7, 0x56, 0x0a, 0xec, 0xcd, 0x5d, 0x85, 0x2b, 0x6b, 0x61, 0xa8, 0xaa, 0x6d, 0x71, 0x36,
+	0x4e, 0xc8, 0x55, 0x28, 0x46, 0x9c, 0xed, 0x76, 0xc2, 0xa1, 0xf9, 0x11, 0x67, 0x9b, 0xa1, 0xbb,
+	0x04, 0xf8, 0x38, 0x5f, 0x24, 0x3c, 0x16, 0x54, 0x55, 0x7b, 0x4d, 0xe2, 0x30, 0x1a, 0xa6, 0xb0,
+	0xb7, 0xe6, 0x87, 0x02, 0x4c, 0x29, 0xac, 0xc0, 0x1f, 0x11, 0x5c, 0xb2, 0xe3, 0xc6, 0x93, 0xae,
+	0xec, 0xa8, 0x3d, 0xce, 0xe2, 0x05, 0x46, 0xe9, 0xba, 0xef, 0x7f, 0xfd, 0xf9, 0x94, 0x9b, 0xc7,
+	0xce, 0xe1, 0x27, 0xe3, 0x9d, 0x92, 0xf5, 0xb0, 0x5e, 0x37, 0xdf, 0x0e, 0xbf, 0x7e, 0x80, 0xbf,
+	0x21, 0x98, 0x39, 0xe9, 0x2d, 0x5e, 0x9d, 0xb0, 0xca, 0x39, 0x4b, 0xe1, 0x5c, 0xdc, 0x70, 0xb7,
+	0xa1, 0x7b, 0x5d, 0x6c, 0xde, 0x38, 0xb7, 0x57, 0xdf, 0xac, 0xc4, 0x41, 0x6b, 0xb8, 0x1b, 0x5f,
+	0x11, 0xc0, 0x91, 0x0f, 0x78, 0x79, 0xc2, 0xa2, 0xa7, 0xac, 0x77, 0x1e, 0xfc, 0x07, 0xd3, 0x98,
+	0xee, 0x2e, 0xe9, 0xb6, 0x6f, 0xb9, 0xe7, 0xb7, 0x7d, 0xd0, 0x22, 0x61, 0xb8, 0xc5, 0x59, 0x0b,
+	0xd5, 0xd7, 0x7f, 0x20, 0xb8, 0xdd, 0xe6, 0xbd, 0xc9, 0xca, 0xad, 0xe3, 0x40, 0x3f, 0xef, 0x98,
+	0x67, 0xbd, 0x42, 0xcf, 0xd0, 0xab, 0xc0, 0x92, 0x19, 0x8f, 0x48, 0xcc, 0x3c, 0x9e, 0x32, 0x9f,
+	0xd1, 0x58, 0xff, 0x12, 0x7c, 0x13, 0x22, 0x49, 0x47, 0xfc, 0xe3, 0xbf, 0x63, 0x65, 0xe4, 0xf5,
+	0x73, 0x2e, 0x17, 0xec, 0x7c, 0xc9, 0x2d, 0x6c, 0x98, 0xcc, 0x8f, 0x68, 0x7f, 0x5b, 0xb7, 0x35,
+	0x52, 0xdf, 0x7b, 0xd9, 0xd8, 0x56, 0xd4, 0xbd, 0xa2, 0xae, 0x75, 0xe7, 0x6f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xbb, 0x4a, 0x2c, 0x76, 0xa6, 0x06, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -555,54 +612,3 @@ var _Tasks_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/remoteworkers/v1test2/tasks.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/remoteworkers/v1test2/tasks.proto", fileDescriptor_tasks_67f801ee7e4c185b)
-}
-
-var fileDescriptor_tasks_67f801ee7e4c185b = []byte{
-	// 682 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6b, 0x13, 0x41,
-	0x14, 0x66, 0x92, 0x34, 0x36, 0x2f, 0x20, 0x75, 0xa8, 0x36, 0x2e, 0x3d, 0xc4, 0xc5, 0x4a, 0x4c,
-	0xcb, 0x2e, 0x89, 0xa8, 0x35, 0xc5, 0x42, 0x8b, 0x5a, 0x0a, 0x15, 0x64, 0xad, 0x16, 0xbc, 0x94,
-	0x69, 0x76, 0x3a, 0x86, 0x6c, 0x76, 0xd6, 0x9d, 0xd9, 0x48, 0x90, 0x5e, 0x3c, 0x79, 0x15, 0xff,
-	0x03, 0x8f, 0x5e, 0xbc, 0x7a, 0x14, 0xef, 0x9e, 0x04, 0xff, 0x02, 0xff, 0x10, 0x99, 0x1f, 0x69,
-	0x9b, 0xfe, 0x88, 0xa9, 0xb7, 0x99, 0x79, 0xdf, 0xf7, 0xde, 0xfb, 0xde, 0xf7, 0xb2, 0x81, 0x06,
-	0xe3, 0x9c, 0x45, 0xd4, 0x0f, 0x69, 0x5f, 0x72, 0x1e, 0x09, 0x3f, 0xa5, 0x3d, 0x2e, 0xe9, 0x5b,
-	0x9e, 0x76, 0x69, 0x2a, 0xfc, 0x7e, 0x43, 0x52, 0x21, 0x9b, 0xbe, 0x24, 0xa2, 0x2b, 0xbc, 0x24,
-	0xe5, 0x92, 0xe3, 0x05, 0x43, 0xf1, 0x86, 0x14, 0x6f, 0x84, 0xe2, 0x59, 0x8a, 0x33, 0x6f, 0x33,
-	0x93, 0xa4, 0xe3, 0x93, 0x38, 0xe6, 0x92, 0xc8, 0x0e, 0x8f, 0x6d, 0x12, 0xe7, 0xba, 0x8d, 0xea,
-	0xdb, 0x5e, 0xb6, 0xef, 0x93, 0x78, 0x60, 0x43, 0xd5, 0x93, 0xa1, 0xfd, 0x0e, 0x8d, 0xc2, 0xdd,
-	0x1e, 0x11, 0x5d, 0x8b, 0x98, 0xb3, 0x88, 0x34, 0x69, 0xfb, 0x42, 0x12, 0x99, 0xd9, 0xac, 0xee,
-	0x6f, 0x04, 0x85, 0x6d, 0x22, 0xba, 0x18, 0x43, 0x21, 0x26, 0x3d, 0x5a, 0x41, 0x55, 0x54, 0x2b,
-	0x05, 0xfa, 0x8c, 0xef, 0x41, 0x39, 0xa4, 0xa2, 0x9d, 0x76, 0x12, 0xd5, 0x48, 0x25, 0x57, 0x45,
-	0xb5, 0x72, 0x73, 0xd6, 0xb3, 0x6a, 0x86, 0xd5, 0xbc, 0xb5, 0x78, 0x10, 0x1c, 0x07, 0xe2, 0x4d,
-	0x28, 0x44, 0x9c, 0x89, 0x4a, 0xbe, 0x9a, 0xaf, 0x95, 0x9b, 0x77, 0xbd, 0x89, 0xe4, 0x7b, 0xaa,
-	0x0d, 0x6f, 0x8b, 0x33, 0xf1, 0x38, 0x96, 0xe9, 0x20, 0xd0, 0x29, 0x9c, 0xfb, 0x50, 0x3a, 0x7c,
-	0xc2, 0x33, 0x90, 0xef, 0xd2, 0x81, 0x6d, 0x51, 0x1d, 0xf1, 0x2c, 0x4c, 0xf5, 0x49, 0x94, 0x51,
-	0xdd, 0x5b, 0x29, 0x30, 0x97, 0x56, 0x6e, 0x19, 0xb9, 0xdf, 0x11, 0x80, 0xca, 0x18, 0x50, 0x91,
-	0x45, 0xf2, 0x4c, 0x79, 0x0e, 0x4c, 0xb7, 0x79, 0x2f, 0x89, 0xa8, 0x34, 0xfc, 0xe9, 0xe0, 0xf0,
-	0x8e, 0xeb, 0x50, 0x34, 0x73, 0xaa, 0xe4, 0xb5, 0x6a, 0x3c, 0x14, 0x91, 0x26, 0x6d, 0xef, 0xb9,
-	0x8e, 0x04, 0x16, 0x81, 0x97, 0xa0, 0xc8, 0x33, 0x99, 0x64, 0xb2, 0x52, 0x18, 0x33, 0x21, 0x8b,
-	0xc1, 0x35, 0x28, 0xf4, 0xa8, 0x24, 0x95, 0xa9, 0x31, 0x58, 0x8d, 0x70, 0x6f, 0xc2, 0xe5, 0x0d,
-	0x2a, 0x8d, 0x88, 0x37, 0x19, 0x15, 0x67, 0xaa, 0x70, 0x7f, 0x22, 0x98, 0x7b, 0x91, 0x84, 0x44,
-	0xd2, 0x23, 0xb9, 0x63, 0xf0, 0x78, 0x13, 0x8a, 0xa9, 0x06, 0x59, 0x3f, 0x1b, 0x17, 0xb0, 0xc7,
-	0x66, 0xb7, 0x09, 0xf0, 0x0a, 0x94, 0x33, 0x5d, 0x59, 0xaf, 0x9a, 0x9d, 0x94, 0x73, 0x4a, 0xd1,
-	0x13, 0xb5, 0x8d, 0x4f, 0x15, 0x1d, 0x0c, 0x5c, 0x9d, 0xf1, 0x35, 0x28, 0x0a, 0x9e, 0xa5, 0x6d,
-	0xaa, 0xa7, 0x56, 0x0a, 0xec, 0xcd, 0x5d, 0x85, 0x2b, 0x6b, 0x61, 0xa8, 0xaa, 0x6d, 0x71, 0x36,
-	0x4e, 0xc8, 0x55, 0x28, 0x46, 0x9c, 0xed, 0x76, 0xc2, 0xa1, 0xf9, 0x11, 0x67, 0x9b, 0xa1, 0xbb,
-	0x04, 0xf8, 0x38, 0x5f, 0x24, 0x3c, 0x16, 0x54, 0x55, 0x7b, 0x4d, 0xe2, 0x30, 0x1a, 0xa6, 0xb0,
-	0xb7, 0xe6, 0x87, 0x02, 0x4c, 0x29, 0xac, 0xc0, 0x1f, 0x11, 0x5c, 0xb2, 0xe3, 0xc6, 0x93, 0xae,
-	0xec, 0xa8, 0x3d, 0xce, 0xe2, 0x05, 0x46, 0xe9, 0xba, 0xef, 0x7f, 0xfd, 0xf9, 0x94, 0x9b, 0xc7,
-	0xce, 0xe1, 0x27, 0xe3, 0x9d, 0x92, 0xf5, 0xb0, 0x5e, 0x37, 0xdf, 0x0e, 0xbf, 0x7e, 0x80, 0xbf,
-	0x21, 0x98, 0x39, 0xe9, 0x2d, 0x5e, 0x9d, 0xb0, 0xca, 0x39, 0x4b, 0xe1, 0x5c, 0xdc, 0x70, 0xb7,
-	0xa1, 0x7b, 0x5d, 0x6c, 0xde, 0x38, 0xb7, 0x57, 0xdf, 0xac, 0xc4, 0x41, 0x6b, 0xb8, 0x1b, 0x5f,
-	0x11, 0xc0, 0x91, 0x0f, 0x78, 0x79, 0xc2, 0xa2, 0xa7, 0xac, 0x77, 0x1e, 0xfc, 0x07, 0xd3, 0x98,
-	0xee, 0x2e, 0xe9, 0xb6, 0x6f, 0xb9, 0xe7, 0xb7, 0x7d, 0xd0, 0x22, 0x61, 0xb8, 0xc5, 0x59, 0x0b,
-	0xd5, 0xd7, 0x7f, 0x20, 0xb8, 0xdd, 0xe6, 0xbd, 0xc9, 0xca, 0xad, 0xe3, 0x40, 0x3f, 0xef, 0x98,
-	0x67, 0xbd, 0x42, 0xcf, 0xd0, 0xab, 0xc0, 0x92, 0x19, 0x8f, 0x48, 0xcc, 0x3c, 0x9e, 0x32, 0x9f,
-	0xd1, 0x58, 0xff, 0x12, 0x7c, 0x13, 0x22, 0x49, 0x47, 0xfc, 0xe3, 0xbf, 0x63, 0x65, 0xe4, 0xf5,
-	0x73, 0x2e, 0x17, 0xec, 0x7c, 0xc9, 0x2d, 0x6c, 0x98, 0xcc, 0x8f, 0x68, 0x7f, 0x5b, 0xb7, 0x35,
-	0x52, 0xdf, 0x7b, 0xd9, 0xd8, 0x56, 0xd4, 0xbd, 0xa2, 0xae, 0x75, 0xe7, 0x6f, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xbb, 0x4a, 0x2c, 0x76, 0xa6, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/remoteworkers/v1test2/worker.pb.go b/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
index 26dd90e9c0..e868b50141 100644
--- a/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
+++ b/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/worker.proto
 
-package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
+package remoteworkers
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes a worker, which is a list of one or more devices and the
 // connections between them. A device could be a computer, a phone, or even an
@@ -91,16 +94,17 @@ func (m *Worker) Reset()         { *m = Worker{} }
 func (m *Worker) String() string { return proto.CompactTextString(m) }
 func (*Worker) ProtoMessage()    {}
 func (*Worker) Descriptor() ([]byte, []int) {
-	return fileDescriptor_worker_5f67d0a1f90b0802, []int{0}
+	return fileDescriptor_1a7edeeca1cd65a1, []int{0}
 }
+
 func (m *Worker) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Worker.Unmarshal(m, b)
 }
 func (m *Worker) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Worker.Marshal(b, m, deterministic)
 }
-func (dst *Worker) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Worker.Merge(dst, src)
+func (m *Worker) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Worker.Merge(m, src)
 }
 func (m *Worker) XXX_Size() int {
 	return xxx_messageInfo_Worker.Size(m)
@@ -156,16 +160,17 @@ func (m *Worker_Property) Reset()         { *m = Worker_Property{} }
 func (m *Worker_Property) String() string { return proto.CompactTextString(m) }
 func (*Worker_Property) ProtoMessage()    {}
 func (*Worker_Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_worker_5f67d0a1f90b0802, []int{0, 0}
+	return fileDescriptor_1a7edeeca1cd65a1, []int{0, 0}
 }
+
 func (m *Worker_Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Worker_Property.Unmarshal(m, b)
 }
 func (m *Worker_Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Worker_Property.Marshal(b, m, deterministic)
 }
-func (dst *Worker_Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Worker_Property.Merge(dst, src)
+func (m *Worker_Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Worker_Property.Merge(m, src)
 }
 func (m *Worker_Property) XXX_Size() int {
 	return xxx_messageInfo_Worker_Property.Size(m)
@@ -214,16 +219,17 @@ func (m *Worker_Config) Reset()         { *m = Worker_Config{} }
 func (m *Worker_Config) String() string { return proto.CompactTextString(m) }
 func (*Worker_Config) ProtoMessage()    {}
 func (*Worker_Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_worker_5f67d0a1f90b0802, []int{0, 1}
+	return fileDescriptor_1a7edeeca1cd65a1, []int{0, 1}
 }
+
 func (m *Worker_Config) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Worker_Config.Unmarshal(m, b)
 }
 func (m *Worker_Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Worker_Config.Marshal(b, m, deterministic)
 }
-func (dst *Worker_Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Worker_Config.Merge(dst, src)
+func (m *Worker_Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Worker_Config.Merge(m, src)
 }
 func (m *Worker_Config) XXX_Size() int {
 	return xxx_messageInfo_Worker_Config.Size(m)
@@ -281,16 +287,17 @@ func (m *Device) Reset()         { *m = Device{} }
 func (m *Device) String() string { return proto.CompactTextString(m) }
 func (*Device) ProtoMessage()    {}
 func (*Device) Descriptor() ([]byte, []int) {
-	return fileDescriptor_worker_5f67d0a1f90b0802, []int{1}
+	return fileDescriptor_1a7edeeca1cd65a1, []int{1}
 }
+
 func (m *Device) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Device.Unmarshal(m, b)
 }
 func (m *Device) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Device.Marshal(b, m, deterministic)
 }
-func (dst *Device) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Device.Merge(dst, src)
+func (m *Device) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device.Merge(m, src)
 }
 func (m *Device) XXX_Size() int {
 	return xxx_messageInfo_Device.Size(m)
@@ -340,16 +347,17 @@ func (m *Device_Property) Reset()         { *m = Device_Property{} }
 func (m *Device_Property) String() string { return proto.CompactTextString(m) }
 func (*Device_Property) ProtoMessage()    {}
 func (*Device_Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_worker_5f67d0a1f90b0802, []int{1, 0}
+	return fileDescriptor_1a7edeeca1cd65a1, []int{1, 0}
 }
+
 func (m *Device_Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Device_Property.Unmarshal(m, b)
 }
 func (m *Device_Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Device_Property.Marshal(b, m, deterministic)
 }
-func (dst *Device_Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Device_Property.Merge(dst, src)
+func (m *Device_Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device_Property.Merge(m, src)
 }
 func (m *Device_Property) XXX_Size() int {
 	return xxx_messageInfo_Device_Property.Size(m)
@@ -383,10 +391,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/remoteworkers/v1test2/worker.proto", fileDescriptor_worker_5f67d0a1f90b0802)
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/worker.proto", fileDescriptor_1a7edeeca1cd65a1)
 }
 
-var fileDescriptor_worker_5f67d0a1f90b0802 = []byte{
+var fileDescriptor_1a7edeeca1cd65a1 = []byte{
 	// 332 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xc1, 0x4a, 0xf3, 0x40,
 	0x10, 0xc7, 0x49, 0xca, 0x97, 0x7e, 0x8e, 0x17, 0x59, 0x45, 0x42, 0x4f, 0xa5, 0x50, 0xa8, 0x07,
diff --git a/googleapis/devtools/resultstore/v2/action.pb.go b/googleapis/devtools/resultstore/v2/action.pb.go
index 898a381a16..b35fa6ab58 100644
--- a/googleapis/devtools/resultstore/v2/action.pb.go
+++ b/googleapis/devtools/resultstore/v2/action.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/action.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates how/where this Action was executed.
 type ExecutionStrategy int32
@@ -42,6 +45,7 @@ var ExecutionStrategy_name = map[int32]string{
 	3: "LOCAL_PARALLEL",
 	4: "LOCAL_SEQUENTIAL",
 }
+
 var ExecutionStrategy_value = map[string]int32{
 	"EXECUTION_STRATEGY_UNSPECIFIED": 0,
 	"OTHER_ENVIRONMENT":              1,
@@ -53,8 +57,9 @@ var ExecutionStrategy_value = map[string]int32{
 func (x ExecutionStrategy) String() string {
 	return proto.EnumName(ExecutionStrategy_name, int32(x))
 }
+
 func (ExecutionStrategy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{0}
+	return fileDescriptor_e98e32542f2d3836, []int{0}
 }
 
 // Most build systems cache build results to speed up incremental builds.
@@ -79,6 +84,7 @@ var TestCaching_name = map[int32]string{
 	2: "REMOTE_CACHE_HIT",
 	3: "CACHE_MISS",
 }
+
 var TestCaching_value = map[string]int32{
 	"TEST_CACHING_UNSPECIFIED": 0,
 	"LOCAL_CACHE_HIT":          1,
@@ -89,8 +95,9 @@ var TestCaching_value = map[string]int32{
 func (x TestCaching) String() string {
 	return proto.EnumName(TestCaching_name, int32(x))
 }
+
 func (TestCaching) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{1}
+	return fileDescriptor_e98e32542f2d3836, []int{1}
 }
 
 // Errors in file post-processing are categorized using this enum.
@@ -125,6 +132,7 @@ var FileProcessingErrorType_name = map[int32]string{
 	6: "DEADLINE_EXCEEDED",
 	7: "NOT_FOUND",
 }
+
 var FileProcessingErrorType_value = map[string]int32{
 	"FILE_PROCESSING_ERROR_TYPE_UNSPECIFIED": 0,
 	"GENERIC_READ_ERROR":                     1,
@@ -139,8 +147,9 @@ var FileProcessingErrorType_value = map[string]int32{
 func (x FileProcessingErrorType) String() string {
 	return proto.EnumName(FileProcessingErrorType_name, int32(x))
 }
+
 func (FileProcessingErrorType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{2}
+	return fileDescriptor_e98e32542f2d3836, []int{2}
 }
 
 // An action that happened as part of a configured target. This action could be
@@ -226,16 +235,17 @@ func (m *Action) Reset()         { *m = Action{} }
 func (m *Action) String() string { return proto.CompactTextString(m) }
 func (*Action) ProtoMessage()    {}
 func (*Action) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{0}
+	return fileDescriptor_e98e32542f2d3836, []int{0}
 }
+
 func (m *Action) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action.Unmarshal(m, b)
 }
 func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action.Marshal(b, m, deterministic)
 }
-func (dst *Action) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action.Merge(dst, src)
+func (m *Action) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action.Merge(m, src)
 }
 func (m *Action) XXX_Size() int {
 	return xxx_messageInfo_Action.Size(m)
@@ -353,80 +363,14 @@ func (m *Action) GetFileProcessingErrors() []*FileProcessingErrors {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Action) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Action_OneofMarshaler, _Action_OneofUnmarshaler, _Action_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Action) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Action_BuildAction)(nil),
 		(*Action_TestAction)(nil),
 	}
 }
 
-func _Action_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Action)
-	// action_type
-	switch x := m.ActionType.(type) {
-	case *Action_BuildAction:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BuildAction); err != nil {
-			return err
-		}
-	case *Action_TestAction:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TestAction); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Action.ActionType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Action_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Action)
-	switch tag {
-	case 9: // action_type.build_action
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BuildAction)
-		err := b.DecodeMessage(msg)
-		m.ActionType = &Action_BuildAction{msg}
-		return true, err
-	case 10: // action_type.test_action
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TestAction)
-		err := b.DecodeMessage(msg)
-		m.ActionType = &Action_TestAction{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Action_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Action)
-	// action_type
-	switch x := m.ActionType.(type) {
-	case *Action_BuildAction:
-		s := proto.Size(x.BuildAction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Action_TestAction:
-		s := proto.Size(x.TestAction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The resource ID components that identify the Action.
 type Action_Id struct {
 	// The Invocation ID.
@@ -446,16 +390,17 @@ func (m *Action_Id) Reset()         { *m = Action_Id{} }
 func (m *Action_Id) String() string { return proto.CompactTextString(m) }
 func (*Action_Id) ProtoMessage()    {}
 func (*Action_Id) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{0, 0}
+	return fileDescriptor_e98e32542f2d3836, []int{0, 0}
 }
+
 func (m *Action_Id) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action_Id.Unmarshal(m, b)
 }
 func (m *Action_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action_Id.Marshal(b, m, deterministic)
 }
-func (dst *Action_Id) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action_Id.Merge(dst, src)
+func (m *Action_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_Id.Merge(m, src)
 }
 func (m *Action_Id) XXX_Size() int {
 	return xxx_messageInfo_Action_Id.Size(m)
@@ -517,16 +462,17 @@ func (m *BuildAction) Reset()         { *m = BuildAction{} }
 func (m *BuildAction) String() string { return proto.CompactTextString(m) }
 func (*BuildAction) ProtoMessage()    {}
 func (*BuildAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{1}
+	return fileDescriptor_e98e32542f2d3836, []int{1}
 }
+
 func (m *BuildAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BuildAction.Unmarshal(m, b)
 }
 func (m *BuildAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BuildAction.Marshal(b, m, deterministic)
 }
-func (dst *BuildAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BuildAction.Merge(dst, src)
+func (m *BuildAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildAction.Merge(m, src)
 }
 func (m *BuildAction) XXX_Size() int {
 	return xxx_messageInfo_BuildAction.Size(m)
@@ -596,16 +542,17 @@ func (m *TestAction) Reset()         { *m = TestAction{} }
 func (m *TestAction) String() string { return proto.CompactTextString(m) }
 func (*TestAction) ProtoMessage()    {}
 func (*TestAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{2}
+	return fileDescriptor_e98e32542f2d3836, []int{2}
 }
+
 func (m *TestAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestAction.Unmarshal(m, b)
 }
 func (m *TestAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestAction.Marshal(b, m, deterministic)
 }
-func (dst *TestAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestAction.Merge(dst, src)
+func (m *TestAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestAction.Merge(m, src)
 }
 func (m *TestAction) XXX_Size() int {
 	return xxx_messageInfo_TestAction.Size(m)
@@ -686,16 +633,17 @@ func (m *ActionAttributes) Reset()         { *m = ActionAttributes{} }
 func (m *ActionAttributes) String() string { return proto.CompactTextString(m) }
 func (*ActionAttributes) ProtoMessage()    {}
 func (*ActionAttributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{3}
+	return fileDescriptor_e98e32542f2d3836, []int{3}
 }
+
 func (m *ActionAttributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ActionAttributes.Unmarshal(m, b)
 }
 func (m *ActionAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ActionAttributes.Marshal(b, m, deterministic)
 }
-func (dst *ActionAttributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ActionAttributes.Merge(dst, src)
+func (m *ActionAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ActionAttributes.Merge(m, src)
 }
 func (m *ActionAttributes) XXX_Size() int {
 	return xxx_messageInfo_ActionAttributes.Size(m)
@@ -756,16 +704,17 @@ func (m *InputFileInfo) Reset()         { *m = InputFileInfo{} }
 func (m *InputFileInfo) String() string { return proto.CompactTextString(m) }
 func (*InputFileInfo) ProtoMessage()    {}
 func (*InputFileInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{4}
+	return fileDescriptor_e98e32542f2d3836, []int{4}
 }
+
 func (m *InputFileInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputFileInfo.Unmarshal(m, b)
 }
 func (m *InputFileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputFileInfo.Marshal(b, m, deterministic)
 }
-func (dst *InputFileInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputFileInfo.Merge(dst, src)
+func (m *InputFileInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputFileInfo.Merge(m, src)
 }
 func (m *InputFileInfo) XXX_Size() int {
 	return xxx_messageInfo_InputFileInfo.Size(m)
@@ -825,16 +774,17 @@ func (m *LocalTestTiming) Reset()         { *m = LocalTestTiming{} }
 func (m *LocalTestTiming) String() string { return proto.CompactTextString(m) }
 func (*LocalTestTiming) ProtoMessage()    {}
 func (*LocalTestTiming) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{5}
+	return fileDescriptor_e98e32542f2d3836, []int{5}
 }
+
 func (m *LocalTestTiming) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocalTestTiming.Unmarshal(m, b)
 }
 func (m *LocalTestTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocalTestTiming.Marshal(b, m, deterministic)
 }
-func (dst *LocalTestTiming) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocalTestTiming.Merge(dst, src)
+func (m *LocalTestTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalTestTiming.Merge(m, src)
 }
 func (m *LocalTestTiming) XXX_Size() int {
 	return xxx_messageInfo_LocalTestTiming.Size(m)
@@ -882,16 +832,17 @@ func (m *RemoteTestAttemptTiming) Reset()         { *m = RemoteTestAttemptTiming
 func (m *RemoteTestAttemptTiming) String() string { return proto.CompactTextString(m) }
 func (*RemoteTestAttemptTiming) ProtoMessage()    {}
 func (*RemoteTestAttemptTiming) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{6}
+	return fileDescriptor_e98e32542f2d3836, []int{6}
 }
+
 func (m *RemoteTestAttemptTiming) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoteTestAttemptTiming.Unmarshal(m, b)
 }
 func (m *RemoteTestAttemptTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoteTestAttemptTiming.Marshal(b, m, deterministic)
 }
-func (dst *RemoteTestAttemptTiming) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoteTestAttemptTiming.Merge(dst, src)
+func (m *RemoteTestAttemptTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoteTestAttemptTiming.Merge(m, src)
 }
 func (m *RemoteTestAttemptTiming) XXX_Size() int {
 	return xxx_messageInfo_RemoteTestAttemptTiming.Size(m)
@@ -953,16 +904,17 @@ func (m *RemoteTestTiming) Reset()         { *m = RemoteTestTiming{} }
 func (m *RemoteTestTiming) String() string { return proto.CompactTextString(m) }
 func (*RemoteTestTiming) ProtoMessage()    {}
 func (*RemoteTestTiming) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{7}
+	return fileDescriptor_e98e32542f2d3836, []int{7}
 }
+
 func (m *RemoteTestTiming) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoteTestTiming.Unmarshal(m, b)
 }
 func (m *RemoteTestTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RemoteTestTiming.Marshal(b, m, deterministic)
 }
-func (dst *RemoteTestTiming) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoteTestTiming.Merge(dst, src)
+func (m *RemoteTestTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoteTestTiming.Merge(m, src)
 }
 func (m *RemoteTestTiming) XXX_Size() int {
 	return xxx_messageInfo_RemoteTestTiming.Size(m)
@@ -1018,16 +970,17 @@ func (m *TestTiming) Reset()         { *m = TestTiming{} }
 func (m *TestTiming) String() string { return proto.CompactTextString(m) }
 func (*TestTiming) ProtoMessage()    {}
 func (*TestTiming) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{8}
+	return fileDescriptor_e98e32542f2d3836, []int{8}
 }
+
 func (m *TestTiming) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestTiming.Unmarshal(m, b)
 }
 func (m *TestTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestTiming.Marshal(b, m, deterministic)
 }
-func (dst *TestTiming) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestTiming.Merge(dst, src)
+func (m *TestTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestTiming.Merge(m, src)
 }
 func (m *TestTiming) XXX_Size() int {
 	return xxx_messageInfo_TestTiming.Size(m)
@@ -1096,80 +1049,14 @@ func (m *TestTiming) GetTestCaching() TestCaching {
 	return TestCaching_TEST_CACHING_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TestTiming) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TestTiming_OneofMarshaler, _TestTiming_OneofUnmarshaler, _TestTiming_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TestTiming) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TestTiming_Local)(nil),
 		(*TestTiming_Remote)(nil),
 	}
 }
 
-func _TestTiming_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TestTiming)
-	// location
-	switch x := m.Location.(type) {
-	case *TestTiming_Local:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Local); err != nil {
-			return err
-		}
-	case *TestTiming_Remote:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Remote); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TestTiming.Location has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TestTiming_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TestTiming)
-	switch tag {
-	case 1: // location.local
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LocalTestTiming)
-		err := b.DecodeMessage(msg)
-		m.Location = &TestTiming_Local{msg}
-		return true, err
-	case 2: // location.remote
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RemoteTestTiming)
-		err := b.DecodeMessage(msg)
-		m.Location = &TestTiming_Remote{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TestTiming_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TestTiming)
-	// location
-	switch x := m.Location.(type) {
-	case *TestTiming_Local:
-		s := proto.Size(x.Local)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TestTiming_Remote:
-		s := proto.Size(x.Remote)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A warning from a test execution.
 type TestWarning struct {
 	// Contains the message detailing the warning.
@@ -1183,16 +1070,17 @@ func (m *TestWarning) Reset()         { *m = TestWarning{} }
 func (m *TestWarning) String() string { return proto.CompactTextString(m) }
 func (*TestWarning) ProtoMessage()    {}
 func (*TestWarning) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{9}
+	return fileDescriptor_e98e32542f2d3836, []int{9}
 }
+
 func (m *TestWarning) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestWarning.Unmarshal(m, b)
 }
 func (m *TestWarning) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestWarning.Marshal(b, m, deterministic)
 }
-func (dst *TestWarning) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestWarning.Merge(dst, src)
+func (m *TestWarning) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestWarning.Merge(m, src)
 }
 func (m *TestWarning) XXX_Size() int {
 	return xxx_messageInfo_TestWarning.Size(m)
@@ -1225,16 +1113,17 @@ func (m *FileProcessingErrors) Reset()         { *m = FileProcessingErrors{} }
 func (m *FileProcessingErrors) String() string { return proto.CompactTextString(m) }
 func (*FileProcessingErrors) ProtoMessage()    {}
 func (*FileProcessingErrors) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{10}
+	return fileDescriptor_e98e32542f2d3836, []int{10}
 }
+
 func (m *FileProcessingErrors) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileProcessingErrors.Unmarshal(m, b)
 }
 func (m *FileProcessingErrors) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileProcessingErrors.Marshal(b, m, deterministic)
 }
-func (dst *FileProcessingErrors) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileProcessingErrors.Merge(dst, src)
+func (m *FileProcessingErrors) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileProcessingErrors.Merge(m, src)
 }
 func (m *FileProcessingErrors) XXX_Size() int {
 	return xxx_messageInfo_FileProcessingErrors.Size(m)
@@ -1274,16 +1163,17 @@ func (m *FileProcessingError) Reset()         { *m = FileProcessingError{} }
 func (m *FileProcessingError) String() string { return proto.CompactTextString(m) }
 func (*FileProcessingError) ProtoMessage()    {}
 func (*FileProcessingError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_action_2068b1c39ff365e5, []int{11}
+	return fileDescriptor_e98e32542f2d3836, []int{11}
 }
+
 func (m *FileProcessingError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileProcessingError.Unmarshal(m, b)
 }
 func (m *FileProcessingError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileProcessingError.Marshal(b, m, deterministic)
 }
-func (dst *FileProcessingError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileProcessingError.Merge(dst, src)
+func (m *FileProcessingError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileProcessingError.Merge(m, src)
 }
 func (m *FileProcessingError) XXX_Size() int {
 	return xxx_messageInfo_FileProcessingError.Size(m)
@@ -1309,6 +1199,9 @@ func (m *FileProcessingError) GetMessage() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.resultstore.v2.ExecutionStrategy", ExecutionStrategy_name, ExecutionStrategy_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.TestCaching", TestCaching_name, TestCaching_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.FileProcessingErrorType", FileProcessingErrorType_name, FileProcessingErrorType_value)
 	proto.RegisterType((*Action)(nil), "google.devtools.resultstore.v2.Action")
 	proto.RegisterType((*Action_Id)(nil), "google.devtools.resultstore.v2.Action.Id")
 	proto.RegisterType((*BuildAction)(nil), "google.devtools.resultstore.v2.BuildAction")
@@ -1322,16 +1215,13 @@ func init() {
 	proto.RegisterType((*TestWarning)(nil), "google.devtools.resultstore.v2.TestWarning")
 	proto.RegisterType((*FileProcessingErrors)(nil), "google.devtools.resultstore.v2.FileProcessingErrors")
 	proto.RegisterType((*FileProcessingError)(nil), "google.devtools.resultstore.v2.FileProcessingError")
-	proto.RegisterEnum("google.devtools.resultstore.v2.ExecutionStrategy", ExecutionStrategy_name, ExecutionStrategy_value)
-	proto.RegisterEnum("google.devtools.resultstore.v2.TestCaching", TestCaching_name, TestCaching_value)
-	proto.RegisterEnum("google.devtools.resultstore.v2.FileProcessingErrorType", FileProcessingErrorType_name, FileProcessingErrorType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/action.proto", fileDescriptor_action_2068b1c39ff365e5)
+	proto.RegisterFile("google/devtools/resultstore/v2/action.proto", fileDescriptor_e98e32542f2d3836)
 }
 
-var fileDescriptor_action_2068b1c39ff365e5 = []byte{
+var fileDescriptor_e98e32542f2d3836 = []byte{
 	// 1620 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x5f, 0x73, 0x23, 0x47,
 	0x11, 0x3f, 0x49, 0xb6, 0x4f, 0x6e, 0x9d, 0xe4, 0xf5, 0xd8, 0x77, 0xa7, 0x1c, 0x10, 0x0e, 0x01,
diff --git a/googleapis/devtools/resultstore/v2/common.pb.go b/googleapis/devtools/resultstore/v2/common.pb.go
index 5704164c4c..b641133de9 100644
--- a/googleapis/devtools/resultstore/v2/common.pb.go
+++ b/googleapis/devtools/resultstore/v2/common.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/common.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // These correspond to the prefix of the rule name. Eg cc_test has language CC.
 type Language int32
@@ -91,6 +94,7 @@ var Language_name = map[int32]string{
 	20: "SCALA",
 	21: "PROTO",
 }
+
 var Language_value = map[string]int32{
 	"LANGUAGE_UNSPECIFIED": 0,
 	"NONE":                 1,
@@ -118,8 +122,9 @@ var Language_value = map[string]int32{
 func (x Language) String() string {
 	return proto.EnumName(Language_name, int32(x))
 }
+
 func (Language) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_c40fe7cfb3b2f2fd, []int{0}
+	return fileDescriptor_ff56b05a77242216, []int{0}
 }
 
 // Status of a resource.
@@ -182,6 +187,7 @@ var Status_name = map[int32]string{
 	12: "UNKNOWN",
 	13: "SKIPPED",
 }
+
 var Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"BUILDING":           1,
@@ -202,8 +208,9 @@ var Status_value = map[string]int32{
 func (x Status) String() string {
 	return proto.EnumName(Status_name, int32(x))
 }
+
 func (Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_c40fe7cfb3b2f2fd, []int{1}
+	return fileDescriptor_ff56b05a77242216, []int{1}
 }
 
 // Describes the status of a resource in both enum and string form.
@@ -223,16 +230,17 @@ func (m *StatusAttributes) Reset()         { *m = StatusAttributes{} }
 func (m *StatusAttributes) String() string { return proto.CompactTextString(m) }
 func (*StatusAttributes) ProtoMessage()    {}
 func (*StatusAttributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_c40fe7cfb3b2f2fd, []int{0}
+	return fileDescriptor_ff56b05a77242216, []int{0}
 }
+
 func (m *StatusAttributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StatusAttributes.Unmarshal(m, b)
 }
 func (m *StatusAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StatusAttributes.Marshal(b, m, deterministic)
 }
-func (dst *StatusAttributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StatusAttributes.Merge(dst, src)
+func (m *StatusAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatusAttributes.Merge(m, src)
 }
 func (m *StatusAttributes) XXX_Size() int {
 	return xxx_messageInfo_StatusAttributes.Size(m)
@@ -272,16 +280,17 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_c40fe7cfb3b2f2fd, []int{1}
+	return fileDescriptor_ff56b05a77242216, []int{1}
 }
+
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(dst, src)
+func (m *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(m, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -322,16 +331,17 @@ func (m *Timing) Reset()         { *m = Timing{} }
 func (m *Timing) String() string { return proto.CompactTextString(m) }
 func (*Timing) ProtoMessage()    {}
 func (*Timing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_c40fe7cfb3b2f2fd, []int{2}
+	return fileDescriptor_ff56b05a77242216, []int{2}
 }
+
 func (m *Timing) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Timing.Unmarshal(m, b)
 }
 func (m *Timing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Timing.Marshal(b, m, deterministic)
 }
-func (dst *Timing) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Timing.Merge(dst, src)
+func (m *Timing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Timing.Merge(m, src)
 }
 func (m *Timing) XXX_Size() int {
 	return xxx_messageInfo_Timing.Size(m)
@@ -380,16 +390,17 @@ func (m *Dependency) Reset()         { *m = Dependency{} }
 func (m *Dependency) String() string { return proto.CompactTextString(m) }
 func (*Dependency) ProtoMessage()    {}
 func (*Dependency) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_c40fe7cfb3b2f2fd, []int{3}
+	return fileDescriptor_ff56b05a77242216, []int{3}
 }
+
 func (m *Dependency) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Dependency.Unmarshal(m, b)
 }
 func (m *Dependency) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Dependency.Marshal(b, m, deterministic)
 }
-func (dst *Dependency) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Dependency.Merge(dst, src)
+func (m *Dependency) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dependency.Merge(m, src)
 }
 func (m *Dependency) XXX_Size() int {
 	return xxx_messageInfo_Dependency.Size(m)
@@ -457,101 +468,29 @@ func (m *Dependency) GetLabel() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Dependency) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Dependency_OneofMarshaler, _Dependency_OneofUnmarshaler, _Dependency_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Dependency) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Dependency_Target)(nil),
 		(*Dependency_ConfiguredTarget)(nil),
 		(*Dependency_Action)(nil),
 	}
 }
 
-func _Dependency_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Dependency)
-	// resource
-	switch x := m.Resource.(type) {
-	case *Dependency_Target:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Target)
-	case *Dependency_ConfiguredTarget:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ConfiguredTarget)
-	case *Dependency_Action:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Action)
-	case nil:
-	default:
-		return fmt.Errorf("Dependency.Resource has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Dependency_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Dependency)
-	switch tag {
-	case 1: // resource.target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Resource = &Dependency_Target{x}
-		return true, err
-	case 2: // resource.configured_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Resource = &Dependency_ConfiguredTarget{x}
-		return true, err
-	case 3: // resource.action
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Resource = &Dependency_Action{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Dependency_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Dependency)
-	// resource
-	switch x := m.Resource.(type) {
-	case *Dependency_Target:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Target)))
-		n += len(x.Target)
-	case *Dependency_ConfiguredTarget:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ConfiguredTarget)))
-		n += len(x.ConfiguredTarget)
-	case *Dependency_Action:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Action)))
-		n += len(x.Action)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
+	proto.RegisterEnum("google.devtools.resultstore.v2.Language", Language_name, Language_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.Status", Status_name, Status_value)
 	proto.RegisterType((*StatusAttributes)(nil), "google.devtools.resultstore.v2.StatusAttributes")
 	proto.RegisterType((*Property)(nil), "google.devtools.resultstore.v2.Property")
 	proto.RegisterType((*Timing)(nil), "google.devtools.resultstore.v2.Timing")
 	proto.RegisterType((*Dependency)(nil), "google.devtools.resultstore.v2.Dependency")
-	proto.RegisterEnum("google.devtools.resultstore.v2.Language", Language_name, Language_value)
-	proto.RegisterEnum("google.devtools.resultstore.v2.Status", Status_name, Status_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/common.proto", fileDescriptor_common_c40fe7cfb3b2f2fd)
+	proto.RegisterFile("google/devtools/resultstore/v2/common.proto", fileDescriptor_ff56b05a77242216)
 }
 
-var fileDescriptor_common_c40fe7cfb3b2f2fd = []byte{
+var fileDescriptor_ff56b05a77242216 = []byte{
 	// 704 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xdf, 0x6e, 0xe3, 0x44,
 	0x14, 0xc6, 0xd7, 0x49, 0xeb, 0x3a, 0x27, 0xfd, 0x73, 0x98, 0x2d, 0x28, 0xf4, 0x02, 0xaa, 0x5c,
diff --git a/googleapis/devtools/resultstore/v2/configuration.pb.go b/googleapis/devtools/resultstore/v2/configuration.pb.go
index e11f312f65..eadfd074e2 100644
--- a/googleapis/devtools/resultstore/v2/configuration.pb.go
+++ b/googleapis/devtools/resultstore/v2/configuration.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/configuration.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a configuration within an Invocation associated with one or more
 // ConfiguredTargets. It captures the environment and other settings that
@@ -47,16 +50,17 @@ func (m *Configuration) Reset()         { *m = Configuration{} }
 func (m *Configuration) String() string { return proto.CompactTextString(m) }
 func (*Configuration) ProtoMessage()    {}
 func (*Configuration) Descriptor() ([]byte, []int) {
-	return fileDescriptor_configuration_9976ad0123b12f96, []int{0}
+	return fileDescriptor_c7cb6c7dfd72e78e, []int{0}
 }
+
 func (m *Configuration) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Configuration.Unmarshal(m, b)
 }
 func (m *Configuration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Configuration.Marshal(b, m, deterministic)
 }
-func (dst *Configuration) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Configuration.Merge(dst, src)
+func (m *Configuration) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Configuration.Merge(m, src)
 }
 func (m *Configuration) XXX_Size() int {
 	return xxx_messageInfo_Configuration.Size(m)
@@ -117,16 +121,17 @@ func (m *Configuration_Id) Reset()         { *m = Configuration_Id{} }
 func (m *Configuration_Id) String() string { return proto.CompactTextString(m) }
 func (*Configuration_Id) ProtoMessage()    {}
 func (*Configuration_Id) Descriptor() ([]byte, []int) {
-	return fileDescriptor_configuration_9976ad0123b12f96, []int{0, 0}
+	return fileDescriptor_c7cb6c7dfd72e78e, []int{0, 0}
 }
+
 func (m *Configuration_Id) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Configuration_Id.Unmarshal(m, b)
 }
 func (m *Configuration_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Configuration_Id.Marshal(b, m, deterministic)
 }
-func (dst *Configuration_Id) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Configuration_Id.Merge(dst, src)
+func (m *Configuration_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Configuration_Id.Merge(m, src)
 }
 func (m *Configuration_Id) XXX_Size() int {
 	return xxx_messageInfo_Configuration_Id.Size(m)
@@ -164,16 +169,17 @@ func (m *ConfigurationAttributes) Reset()         { *m = ConfigurationAttributes
 func (m *ConfigurationAttributes) String() string { return proto.CompactTextString(m) }
 func (*ConfigurationAttributes) ProtoMessage()    {}
 func (*ConfigurationAttributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_configuration_9976ad0123b12f96, []int{1}
+	return fileDescriptor_c7cb6c7dfd72e78e, []int{1}
 }
+
 func (m *ConfigurationAttributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfigurationAttributes.Unmarshal(m, b)
 }
 func (m *ConfigurationAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfigurationAttributes.Marshal(b, m, deterministic)
 }
-func (dst *ConfigurationAttributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfigurationAttributes.Merge(dst, src)
+func (m *ConfigurationAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigurationAttributes.Merge(m, src)
 }
 func (m *ConfigurationAttributes) XXX_Size() int {
 	return xxx_messageInfo_ConfigurationAttributes.Size(m)
@@ -198,10 +204,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/configuration.proto", fileDescriptor_configuration_9976ad0123b12f96)
+	proto.RegisterFile("google/devtools/resultstore/v2/configuration.proto", fileDescriptor_c7cb6c7dfd72e78e)
 }
 
-var fileDescriptor_configuration_9976ad0123b12f96 = []byte{
+var fileDescriptor_c7cb6c7dfd72e78e = []byte{
 	// 335 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x4f, 0xb3, 0x40,
 	0x10, 0xc6, 0x03, 0xbc, 0x6f, 0x93, 0x4e, 0x6d, 0xac, 0x7b, 0x29, 0xe9, 0xc1, 0x34, 0xf5, 0x82,
diff --git a/googleapis/devtools/resultstore/v2/configured_target.pb.go b/googleapis/devtools/resultstore/v2/configured_target.pb.go
index a8549c20eb..e74015f3bf 100644
--- a/googleapis/devtools/resultstore/v2/configured_target.pb.go
+++ b/googleapis/devtools/resultstore/v2/configured_target.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/configured_target.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Each ConfiguredTarget represents data for a given configuration of a given
 // target in a given Invocation.
@@ -58,16 +61,17 @@ func (m *ConfiguredTarget) Reset()         { *m = ConfiguredTarget{} }
 func (m *ConfiguredTarget) String() string { return proto.CompactTextString(m) }
 func (*ConfiguredTarget) ProtoMessage()    {}
 func (*ConfiguredTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_configured_target_b74dc45116856d73, []int{0}
+	return fileDescriptor_19ffdaac8c8f375e, []int{0}
 }
+
 func (m *ConfiguredTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfiguredTarget.Unmarshal(m, b)
 }
 func (m *ConfiguredTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfiguredTarget.Marshal(b, m, deterministic)
 }
-func (dst *ConfiguredTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfiguredTarget.Merge(dst, src)
+func (m *ConfiguredTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfiguredTarget.Merge(m, src)
 }
 func (m *ConfiguredTarget) XXX_Size() int {
 	return xxx_messageInfo_ConfiguredTarget.Size(m)
@@ -144,16 +148,17 @@ func (m *ConfiguredTarget_Id) Reset()         { *m = ConfiguredTarget_Id{} }
 func (m *ConfiguredTarget_Id) String() string { return proto.CompactTextString(m) }
 func (*ConfiguredTarget_Id) ProtoMessage()    {}
 func (*ConfiguredTarget_Id) Descriptor() ([]byte, []int) {
-	return fileDescriptor_configured_target_b74dc45116856d73, []int{0, 0}
+	return fileDescriptor_19ffdaac8c8f375e, []int{0, 0}
 }
+
 func (m *ConfiguredTarget_Id) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfiguredTarget_Id.Unmarshal(m, b)
 }
 func (m *ConfiguredTarget_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfiguredTarget_Id.Marshal(b, m, deterministic)
 }
-func (dst *ConfiguredTarget_Id) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfiguredTarget_Id.Merge(dst, src)
+func (m *ConfiguredTarget_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfiguredTarget_Id.Merge(m, src)
 }
 func (m *ConfiguredTarget_Id) XXX_Size() int {
 	return xxx_messageInfo_ConfiguredTarget_Id.Size(m)
@@ -203,16 +208,17 @@ func (m *ConfiguredTestAttributes) Reset()         { *m = ConfiguredTestAttribut
 func (m *ConfiguredTestAttributes) String() string { return proto.CompactTextString(m) }
 func (*ConfiguredTestAttributes) ProtoMessage()    {}
 func (*ConfiguredTestAttributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_configured_target_b74dc45116856d73, []int{1}
+	return fileDescriptor_19ffdaac8c8f375e, []int{1}
 }
+
 func (m *ConfiguredTestAttributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfiguredTestAttributes.Unmarshal(m, b)
 }
 func (m *ConfiguredTestAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfiguredTestAttributes.Marshal(b, m, deterministic)
 }
-func (dst *ConfiguredTestAttributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfiguredTestAttributes.Merge(dst, src)
+func (m *ConfiguredTestAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfiguredTestAttributes.Merge(m, src)
 }
 func (m *ConfiguredTestAttributes) XXX_Size() int {
 	return xxx_messageInfo_ConfiguredTestAttributes.Size(m)
@@ -251,10 +257,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/configured_target.proto", fileDescriptor_configured_target_b74dc45116856d73)
+	proto.RegisterFile("google/devtools/resultstore/v2/configured_target.proto", fileDescriptor_19ffdaac8c8f375e)
 }
 
-var fileDescriptor_configured_target_b74dc45116856d73 = []byte{
+var fileDescriptor_19ffdaac8c8f375e = []byte{
 	// 488 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdf, 0x8a, 0x13, 0x31,
 	0x14, 0xc6, 0xe9, 0x5f, 0xb7, 0x67, 0x5d, 0xdb, 0xcd, 0xd5, 0x58, 0x41, 0x4a, 0x95, 0xa5, 0xab,
diff --git a/googleapis/devtools/resultstore/v2/coverage.pb.go b/googleapis/devtools/resultstore/v2/coverage.pb.go
index 6517567ecf..2ef725d6ed 100644
--- a/googleapis/devtools/resultstore/v2/coverage.pb.go
+++ b/googleapis/devtools/resultstore/v2/coverage.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/coverage.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes line coverage for a file
 type LineCoverage struct {
@@ -49,16 +52,17 @@ func (m *LineCoverage) Reset()         { *m = LineCoverage{} }
 func (m *LineCoverage) String() string { return proto.CompactTextString(m) }
 func (*LineCoverage) ProtoMessage()    {}
 func (*LineCoverage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_coverage_cf37bf4336d4edc8, []int{0}
+	return fileDescriptor_823b424facf00e45, []int{0}
 }
+
 func (m *LineCoverage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LineCoverage.Unmarshal(m, b)
 }
 func (m *LineCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LineCoverage.Marshal(b, m, deterministic)
 }
-func (dst *LineCoverage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LineCoverage.Merge(dst, src)
+func (m *LineCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LineCoverage.Merge(m, src)
 }
 func (m *LineCoverage) XXX_Size() int {
 	return xxx_messageInfo_LineCoverage.Size(m)
@@ -123,16 +127,17 @@ func (m *BranchCoverage) Reset()         { *m = BranchCoverage{} }
 func (m *BranchCoverage) String() string { return proto.CompactTextString(m) }
 func (*BranchCoverage) ProtoMessage()    {}
 func (*BranchCoverage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_coverage_cf37bf4336d4edc8, []int{1}
+	return fileDescriptor_823b424facf00e45, []int{1}
 }
+
 func (m *BranchCoverage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BranchCoverage.Unmarshal(m, b)
 }
 func (m *BranchCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BranchCoverage.Marshal(b, m, deterministic)
 }
-func (dst *BranchCoverage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BranchCoverage.Merge(dst, src)
+func (m *BranchCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BranchCoverage.Merge(m, src)
 }
 func (m *BranchCoverage) XXX_Size() int {
 	return xxx_messageInfo_BranchCoverage.Size(m)
@@ -188,16 +193,17 @@ func (m *FileCoverage) Reset()         { *m = FileCoverage{} }
 func (m *FileCoverage) String() string { return proto.CompactTextString(m) }
 func (*FileCoverage) ProtoMessage()    {}
 func (*FileCoverage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_coverage_cf37bf4336d4edc8, []int{2}
+	return fileDescriptor_823b424facf00e45, []int{2}
 }
+
 func (m *FileCoverage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileCoverage.Unmarshal(m, b)
 }
 func (m *FileCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileCoverage.Marshal(b, m, deterministic)
 }
-func (dst *FileCoverage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileCoverage.Merge(dst, src)
+func (m *FileCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileCoverage.Merge(m, src)
 }
 func (m *FileCoverage) XXX_Size() int {
 	return xxx_messageInfo_FileCoverage.Size(m)
@@ -243,16 +249,17 @@ func (m *ActionCoverage) Reset()         { *m = ActionCoverage{} }
 func (m *ActionCoverage) String() string { return proto.CompactTextString(m) }
 func (*ActionCoverage) ProtoMessage()    {}
 func (*ActionCoverage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_coverage_cf37bf4336d4edc8, []int{3}
+	return fileDescriptor_823b424facf00e45, []int{3}
 }
+
 func (m *ActionCoverage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ActionCoverage.Unmarshal(m, b)
 }
 func (m *ActionCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ActionCoverage.Marshal(b, m, deterministic)
 }
-func (dst *ActionCoverage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ActionCoverage.Merge(dst, src)
+func (m *ActionCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ActionCoverage.Merge(m, src)
 }
 func (m *ActionCoverage) XXX_Size() int {
 	return xxx_messageInfo_ActionCoverage.Size(m)
@@ -278,10 +285,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/coverage.proto", fileDescriptor_coverage_cf37bf4336d4edc8)
+	proto.RegisterFile("google/devtools/resultstore/v2/coverage.proto", fileDescriptor_823b424facf00e45)
 }
 
-var fileDescriptor_coverage_cf37bf4336d4edc8 = []byte{
+var fileDescriptor_823b424facf00e45 = []byte{
 	// 372 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0x6b, 0xe3, 0x30,
 	0x10, 0xc5, 0xf9, 0x58, 0x76, 0x67, 0x6d, 0xef, 0xae, 0xd8, 0x83, 0xd9, 0xc3, 0x12, 0x0c, 0x81,
diff --git a/googleapis/devtools/resultstore/v2/coverage_summary.pb.go b/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
index 6c1b721e6f..d213e78e42 100644
--- a/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
+++ b/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/coverage_summary.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Summary of line coverage
 type LineCoverageSummary struct {
@@ -33,16 +36,17 @@ func (m *LineCoverageSummary) Reset()         { *m = LineCoverageSummary{} }
 func (m *LineCoverageSummary) String() string { return proto.CompactTextString(m) }
 func (*LineCoverageSummary) ProtoMessage()    {}
 func (*LineCoverageSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_coverage_summary_6ce81cdd85c870eb, []int{0}
+	return fileDescriptor_a504af212dd04847, []int{0}
 }
+
 func (m *LineCoverageSummary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LineCoverageSummary.Unmarshal(m, b)
 }
 func (m *LineCoverageSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LineCoverageSummary.Marshal(b, m, deterministic)
 }
-func (dst *LineCoverageSummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LineCoverageSummary.Merge(dst, src)
+func (m *LineCoverageSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LineCoverageSummary.Merge(m, src)
 }
 func (m *LineCoverageSummary) XXX_Size() int {
 	return xxx_messageInfo_LineCoverageSummary.Size(m)
@@ -92,16 +96,17 @@ func (m *BranchCoverageSummary) Reset()         { *m = BranchCoverageSummary{} }
 func (m *BranchCoverageSummary) String() string { return proto.CompactTextString(m) }
 func (*BranchCoverageSummary) ProtoMessage()    {}
 func (*BranchCoverageSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_coverage_summary_6ce81cdd85c870eb, []int{1}
+	return fileDescriptor_a504af212dd04847, []int{1}
 }
+
 func (m *BranchCoverageSummary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BranchCoverageSummary.Unmarshal(m, b)
 }
 func (m *BranchCoverageSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BranchCoverageSummary.Marshal(b, m, deterministic)
 }
-func (dst *BranchCoverageSummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BranchCoverageSummary.Merge(dst, src)
+func (m *BranchCoverageSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BranchCoverageSummary.Merge(m, src)
 }
 func (m *BranchCoverageSummary) XXX_Size() int {
 	return xxx_messageInfo_BranchCoverageSummary.Size(m)
@@ -150,16 +155,17 @@ func (m *LanguageCoverageSummary) Reset()         { *m = LanguageCoverageSummary
 func (m *LanguageCoverageSummary) String() string { return proto.CompactTextString(m) }
 func (*LanguageCoverageSummary) ProtoMessage()    {}
 func (*LanguageCoverageSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_coverage_summary_6ce81cdd85c870eb, []int{2}
+	return fileDescriptor_a504af212dd04847, []int{2}
 }
+
 func (m *LanguageCoverageSummary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LanguageCoverageSummary.Unmarshal(m, b)
 }
 func (m *LanguageCoverageSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LanguageCoverageSummary.Marshal(b, m, deterministic)
 }
-func (dst *LanguageCoverageSummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LanguageCoverageSummary.Merge(dst, src)
+func (m *LanguageCoverageSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LanguageCoverageSummary.Merge(m, src)
 }
 func (m *LanguageCoverageSummary) XXX_Size() int {
 	return xxx_messageInfo_LanguageCoverageSummary.Size(m)
@@ -198,10 +204,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/coverage_summary.proto", fileDescriptor_coverage_summary_6ce81cdd85c870eb)
+	proto.RegisterFile("google/devtools/resultstore/v2/coverage_summary.proto", fileDescriptor_a504af212dd04847)
 }
 
-var fileDescriptor_coverage_summary_6ce81cdd85c870eb = []byte{
+var fileDescriptor_a504af212dd04847 = []byte{
 	// 358 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x4b, 0xeb, 0x40,
 	0x14, 0x85, 0x49, 0xcb, 0x7b, 0x3c, 0xa6, 0xef, 0x95, 0x67, 0x4a, 0xa9, 0xb8, 0x10, 0xc9, 0xaa,
diff --git a/googleapis/devtools/resultstore/v2/file.pb.go b/googleapis/devtools/resultstore/v2/file.pb.go
index 2ee4c541e9..d6ee5c3d95 100644
--- a/googleapis/devtools/resultstore/v2/file.pb.go
+++ b/googleapis/devtools/resultstore/v2/file.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/file.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // If known, the hash function used to compute this digest.
 type File_HashType int32
@@ -39,6 +42,7 @@ var File_HashType_name = map[int32]string{
 	2: "SHA1",
 	3: "SHA256",
 }
+
 var File_HashType_value = map[string]int32{
 	"HASH_TYPE_UNSPECIFIED": 0,
 	"MD5":                   1,
@@ -49,8 +53,9 @@ var File_HashType_value = map[string]int32{
 func (x File_HashType) String() string {
 	return proto.EnumName(File_HashType_name, int32(x))
 }
+
 func (File_HashType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_file_ce5c35947c0b9efa, []int{0, 0}
+	return fileDescriptor_0f2079cd39696ac1, []int{0, 0}
 }
 
 // The metadata for a file or an archive file entry.
@@ -103,16 +108,17 @@ func (m *File) Reset()         { *m = File{} }
 func (m *File) String() string { return proto.CompactTextString(m) }
 func (*File) ProtoMessage()    {}
 func (*File) Descriptor() ([]byte, []int) {
-	return fileDescriptor_file_ce5c35947c0b9efa, []int{0}
+	return fileDescriptor_0f2079cd39696ac1, []int{0}
 }
+
 func (m *File) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_File.Unmarshal(m, b)
 }
 func (m *File) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_File.Marshal(b, m, deterministic)
 }
-func (dst *File) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_File.Merge(dst, src)
+func (m *File) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_File.Merge(m, src)
 }
 func (m *File) XXX_Size() int {
 	return xxx_messageInfo_File.Size(m)
@@ -213,16 +219,17 @@ func (m *ArchiveEntry) Reset()         { *m = ArchiveEntry{} }
 func (m *ArchiveEntry) String() string { return proto.CompactTextString(m) }
 func (*ArchiveEntry) ProtoMessage()    {}
 func (*ArchiveEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_file_ce5c35947c0b9efa, []int{1}
+	return fileDescriptor_0f2079cd39696ac1, []int{1}
 }
+
 func (m *ArchiveEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ArchiveEntry.Unmarshal(m, b)
 }
 func (m *ArchiveEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ArchiveEntry.Marshal(b, m, deterministic)
 }
-func (dst *ArchiveEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ArchiveEntry.Merge(dst, src)
+func (m *ArchiveEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArchiveEntry.Merge(m, src)
 }
 func (m *ArchiveEntry) XXX_Size() int {
 	return xxx_messageInfo_ArchiveEntry.Size(m)
@@ -255,16 +262,16 @@ func (m *ArchiveEntry) GetContentType() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.resultstore.v2.File_HashType", File_HashType_name, File_HashType_value)
 	proto.RegisterType((*File)(nil), "google.devtools.resultstore.v2.File")
 	proto.RegisterType((*ArchiveEntry)(nil), "google.devtools.resultstore.v2.ArchiveEntry")
-	proto.RegisterEnum("google.devtools.resultstore.v2.File_HashType", File_HashType_name, File_HashType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/file.proto", fileDescriptor_file_ce5c35947c0b9efa)
+	proto.RegisterFile("google/devtools/resultstore/v2/file.proto", fileDescriptor_0f2079cd39696ac1)
 }
 
-var fileDescriptor_file_ce5c35947c0b9efa = []byte{
+var fileDescriptor_0f2079cd39696ac1 = []byte{
 	// 453 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x61, 0x8b, 0xd3, 0x40,
 	0x10, 0x35, 0x4d, 0xed, 0xa5, 0xd3, 0xde, 0x11, 0x16, 0x94, 0xa8, 0x20, 0xb1, 0x20, 0x54, 0xd0,
diff --git a/googleapis/devtools/resultstore/v2/file_set.pb.go b/googleapis/devtools/resultstore/v2/file_set.pb.go
index abe72ea5a9..84065af825 100644
--- a/googleapis/devtools/resultstore/v2/file_set.pb.go
+++ b/googleapis/devtools/resultstore/v2/file_set.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/file_set.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a set of files within an Invocation. Can contain other file sets.
 type FileSet struct {
@@ -41,16 +44,17 @@ func (m *FileSet) Reset()         { *m = FileSet{} }
 func (m *FileSet) String() string { return proto.CompactTextString(m) }
 func (*FileSet) ProtoMessage()    {}
 func (*FileSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_file_set_ffa23055473f4928, []int{0}
+	return fileDescriptor_ca8d86e03917a704, []int{0}
 }
+
 func (m *FileSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileSet.Unmarshal(m, b)
 }
 func (m *FileSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileSet.Marshal(b, m, deterministic)
 }
-func (dst *FileSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileSet.Merge(dst, src)
+func (m *FileSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileSet.Merge(m, src)
 }
 func (m *FileSet) XXX_Size() int {
 	return xxx_messageInfo_FileSet.Size(m)
@@ -104,16 +108,17 @@ func (m *FileSet_Id) Reset()         { *m = FileSet_Id{} }
 func (m *FileSet_Id) String() string { return proto.CompactTextString(m) }
 func (*FileSet_Id) ProtoMessage()    {}
 func (*FileSet_Id) Descriptor() ([]byte, []int) {
-	return fileDescriptor_file_set_ffa23055473f4928, []int{0, 0}
+	return fileDescriptor_ca8d86e03917a704, []int{0, 0}
 }
+
 func (m *FileSet_Id) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FileSet_Id.Unmarshal(m, b)
 }
 func (m *FileSet_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FileSet_Id.Marshal(b, m, deterministic)
 }
-func (dst *FileSet_Id) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FileSet_Id.Merge(dst, src)
+func (m *FileSet_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileSet_Id.Merge(m, src)
 }
 func (m *FileSet_Id) XXX_Size() int {
 	return xxx_messageInfo_FileSet_Id.Size(m)
@@ -144,10 +149,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/file_set.proto", fileDescriptor_file_set_ffa23055473f4928)
+	proto.RegisterFile("google/devtools/resultstore/v2/file_set.proto", fileDescriptor_ca8d86e03917a704)
 }
 
-var fileDescriptor_file_set_ffa23055473f4928 = []byte{
+var fileDescriptor_ca8d86e03917a704 = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xbb, 0x4f, 0xc3, 0x30,
 	0x10, 0x87, 0x95, 0xa4, 0x3c, 0x72, 0x81, 0xc5, 0x53, 0x54, 0xa4, 0x2a, 0x2a, 0x0c, 0x01, 0x09,
diff --git a/googleapis/devtools/resultstore/v2/invocation.pb.go b/googleapis/devtools/resultstore/v2/invocation.pb.go
index e68002b1a0..c765299abc 100644
--- a/googleapis/devtools/resultstore/v2/invocation.pb.go
+++ b/googleapis/devtools/resultstore/v2/invocation.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/invocation.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An Invocation typically represents the result of running a tool. Each has a
 // unique ID, typically generated by the server. Target resources under each
@@ -57,16 +60,17 @@ func (m *Invocation) Reset()         { *m = Invocation{} }
 func (m *Invocation) String() string { return proto.CompactTextString(m) }
 func (*Invocation) ProtoMessage()    {}
 func (*Invocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_invocation_3c3642aab1b671da, []int{0}
+	return fileDescriptor_9a57b6cf1112b76d, []int{0}
 }
+
 func (m *Invocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Invocation.Unmarshal(m, b)
 }
 func (m *Invocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Invocation.Marshal(b, m, deterministic)
 }
-func (dst *Invocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Invocation.Merge(dst, src)
+func (m *Invocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Invocation.Merge(m, src)
 }
 func (m *Invocation) XXX_Size() int {
 	return xxx_messageInfo_Invocation.Size(m)
@@ -153,16 +157,17 @@ func (m *Invocation_Id) Reset()         { *m = Invocation_Id{} }
 func (m *Invocation_Id) String() string { return proto.CompactTextString(m) }
 func (*Invocation_Id) ProtoMessage()    {}
 func (*Invocation_Id) Descriptor() ([]byte, []int) {
-	return fileDescriptor_invocation_3c3642aab1b671da, []int{0, 0}
+	return fileDescriptor_9a57b6cf1112b76d, []int{0, 0}
 }
+
 func (m *Invocation_Id) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Invocation_Id.Unmarshal(m, b)
 }
 func (m *Invocation_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Invocation_Id.Marshal(b, m, deterministic)
 }
-func (dst *Invocation_Id) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Invocation_Id.Merge(dst, src)
+func (m *Invocation_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Invocation_Id.Merge(m, src)
 }
 func (m *Invocation_Id) XXX_Size() int {
 	return xxx_messageInfo_Invocation_Id.Size(m)
@@ -191,16 +196,17 @@ func (m *WorkspaceContext) Reset()         { *m = WorkspaceContext{} }
 func (m *WorkspaceContext) String() string { return proto.CompactTextString(m) }
 func (*WorkspaceContext) ProtoMessage()    {}
 func (*WorkspaceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_invocation_3c3642aab1b671da, []int{1}
+	return fileDescriptor_9a57b6cf1112b76d, []int{1}
 }
+
 func (m *WorkspaceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkspaceContext.Unmarshal(m, b)
 }
 func (m *WorkspaceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkspaceContext.Marshal(b, m, deterministic)
 }
-func (dst *WorkspaceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkspaceContext.Merge(dst, src)
+func (m *WorkspaceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkspaceContext.Merge(m, src)
 }
 func (m *WorkspaceContext) XXX_Size() int {
 	return xxx_messageInfo_WorkspaceContext.Size(m)
@@ -236,16 +242,17 @@ func (m *WorkspaceInfo) Reset()         { *m = WorkspaceInfo{} }
 func (m *WorkspaceInfo) String() string { return proto.CompactTextString(m) }
 func (*WorkspaceInfo) ProtoMessage()    {}
 func (*WorkspaceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_invocation_3c3642aab1b671da, []int{2}
+	return fileDescriptor_9a57b6cf1112b76d, []int{2}
 }
+
 func (m *WorkspaceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WorkspaceInfo.Unmarshal(m, b)
 }
 func (m *WorkspaceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WorkspaceInfo.Marshal(b, m, deterministic)
 }
-func (dst *WorkspaceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkspaceInfo.Merge(dst, src)
+func (m *WorkspaceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkspaceInfo.Merge(m, src)
 }
 func (m *WorkspaceInfo) XXX_Size() int {
 	return xxx_messageInfo_WorkspaceInfo.Size(m)
@@ -312,16 +319,17 @@ func (m *CommandLine) Reset()         { *m = CommandLine{} }
 func (m *CommandLine) String() string { return proto.CompactTextString(m) }
 func (*CommandLine) ProtoMessage()    {}
 func (*CommandLine) Descriptor() ([]byte, []int) {
-	return fileDescriptor_invocation_3c3642aab1b671da, []int{3}
+	return fileDescriptor_9a57b6cf1112b76d, []int{3}
 }
+
 func (m *CommandLine) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommandLine.Unmarshal(m, b)
 }
 func (m *CommandLine) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommandLine.Marshal(b, m, deterministic)
 }
-func (dst *CommandLine) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommandLine.Merge(dst, src)
+func (m *CommandLine) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandLine.Merge(m, src)
 }
 func (m *CommandLine) XXX_Size() int {
 	return xxx_messageInfo_CommandLine.Size(m)
@@ -394,16 +402,17 @@ func (m *InvocationAttributes) Reset()         { *m = InvocationAttributes{} }
 func (m *InvocationAttributes) String() string { return proto.CompactTextString(m) }
 func (*InvocationAttributes) ProtoMessage()    {}
 func (*InvocationAttributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_invocation_3c3642aab1b671da, []int{4}
+	return fileDescriptor_9a57b6cf1112b76d, []int{4}
 }
+
 func (m *InvocationAttributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InvocationAttributes.Unmarshal(m, b)
 }
 func (m *InvocationAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InvocationAttributes.Marshal(b, m, deterministic)
 }
-func (dst *InvocationAttributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InvocationAttributes.Merge(dst, src)
+func (m *InvocationAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InvocationAttributes.Merge(m, src)
 }
 func (m *InvocationAttributes) XXX_Size() int {
 	return xxx_messageInfo_InvocationAttributes.Size(m)
@@ -464,16 +473,17 @@ func (m *InvocationContext) Reset()         { *m = InvocationContext{} }
 func (m *InvocationContext) String() string { return proto.CompactTextString(m) }
 func (*InvocationContext) ProtoMessage()    {}
 func (*InvocationContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_invocation_3c3642aab1b671da, []int{5}
+	return fileDescriptor_9a57b6cf1112b76d, []int{5}
 }
+
 func (m *InvocationContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InvocationContext.Unmarshal(m, b)
 }
 func (m *InvocationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InvocationContext.Marshal(b, m, deterministic)
 }
-func (dst *InvocationContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InvocationContext.Merge(dst, src)
+func (m *InvocationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InvocationContext.Merge(m, src)
 }
 func (m *InvocationContext) XXX_Size() int {
 	return xxx_messageInfo_InvocationContext.Size(m)
@@ -509,10 +519,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/invocation.proto", fileDescriptor_invocation_3c3642aab1b671da)
+	proto.RegisterFile("google/devtools/resultstore/v2/invocation.proto", fileDescriptor_9a57b6cf1112b76d)
 }
 
-var fileDescriptor_invocation_3c3642aab1b671da = []byte{
+var fileDescriptor_9a57b6cf1112b76d = []byte{
 	// 697 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x71, 0x6b, 0x13, 0x31,
 	0x14, 0xa7, 0xed, 0xda, 0xad, 0xaf, 0xab, 0x74, 0x71, 0xca, 0x59, 0x50, 0x6a, 0x15, 0xe9, 0x18,
diff --git a/googleapis/devtools/resultstore/v2/resultstore_download.pb.go b/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
index c431d7c580..93dd563515 100644
--- a/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
+++ b/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/resultstore_download.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package resultstore
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request passed into GetInvocation
 type GetInvocationRequest struct {
@@ -39,16 +39,17 @@ func (m *GetInvocationRequest) Reset()         { *m = GetInvocationRequest{} }
 func (m *GetInvocationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInvocationRequest) ProtoMessage()    {}
 func (*GetInvocationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{0}
+	return fileDescriptor_466641838cdba1d1, []int{0}
 }
+
 func (m *GetInvocationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInvocationRequest.Unmarshal(m, b)
 }
 func (m *GetInvocationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInvocationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInvocationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInvocationRequest.Merge(dst, src)
+func (m *GetInvocationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInvocationRequest.Merge(m, src)
 }
 func (m *GetInvocationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInvocationRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *SearchInvocationsRequest) Reset()         { *m = SearchInvocationsReque
 func (m *SearchInvocationsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchInvocationsRequest) ProtoMessage()    {}
 func (*SearchInvocationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{1}
+	return fileDescriptor_466641838cdba1d1, []int{1}
 }
+
 func (m *SearchInvocationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchInvocationsRequest.Unmarshal(m, b)
 }
 func (m *SearchInvocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchInvocationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchInvocationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchInvocationsRequest.Merge(dst, src)
+func (m *SearchInvocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchInvocationsRequest.Merge(m, src)
 }
 func (m *SearchInvocationsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchInvocationsRequest.Size(m)
@@ -168,71 +170,14 @@ func (m *SearchInvocationsRequest) GetProjectId() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SearchInvocationsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SearchInvocationsRequest_OneofMarshaler, _SearchInvocationsRequest_OneofUnmarshaler, _SearchInvocationsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SearchInvocationsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SearchInvocationsRequest_PageToken)(nil),
 		(*SearchInvocationsRequest_Offset)(nil),
 	}
 }
 
-func _SearchInvocationsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SearchInvocationsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *SearchInvocationsRequest_PageToken:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PageToken)
-	case *SearchInvocationsRequest_Offset:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		return fmt.Errorf("SearchInvocationsRequest.PageStart has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SearchInvocationsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SearchInvocationsRequest)
-	switch tag {
-	case 2: // page_start.page_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PageStart = &SearchInvocationsRequest_PageToken{x}
-		return true, err
-	case 3: // page_start.offset
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.PageStart = &SearchInvocationsRequest_Offset{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SearchInvocationsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SearchInvocationsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *SearchInvocationsRequest_PageToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PageToken)))
-		n += len(x.PageToken)
-	case *SearchInvocationsRequest_Offset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response from calling SearchInvocations
 type SearchInvocationsResponse struct {
 	// Invocations matching the search, possibly capped at request.page_size or a
@@ -250,16 +195,17 @@ func (m *SearchInvocationsResponse) Reset()         { *m = SearchInvocationsResp
 func (m *SearchInvocationsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchInvocationsResponse) ProtoMessage()    {}
 func (*SearchInvocationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{2}
+	return fileDescriptor_466641838cdba1d1, []int{2}
 }
+
 func (m *SearchInvocationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchInvocationsResponse.Unmarshal(m, b)
 }
 func (m *SearchInvocationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchInvocationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchInvocationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchInvocationsResponse.Merge(dst, src)
+func (m *SearchInvocationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchInvocationsResponse.Merge(m, src)
 }
 func (m *SearchInvocationsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchInvocationsResponse.Size(m)
@@ -298,16 +244,17 @@ func (m *GetConfigurationRequest) Reset()         { *m = GetConfigurationRequest
 func (m *GetConfigurationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetConfigurationRequest) ProtoMessage()    {}
 func (*GetConfigurationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{3}
+	return fileDescriptor_466641838cdba1d1, []int{3}
 }
+
 func (m *GetConfigurationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConfigurationRequest.Unmarshal(m, b)
 }
 func (m *GetConfigurationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetConfigurationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetConfigurationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetConfigurationRequest.Merge(dst, src)
+func (m *GetConfigurationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigurationRequest.Merge(m, src)
 }
 func (m *GetConfigurationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetConfigurationRequest.Size(m)
@@ -348,16 +295,17 @@ func (m *ListConfigurationsRequest) Reset()         { *m = ListConfigurationsReq
 func (m *ListConfigurationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListConfigurationsRequest) ProtoMessage()    {}
 func (*ListConfigurationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{4}
+	return fileDescriptor_466641838cdba1d1, []int{4}
 }
+
 func (m *ListConfigurationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListConfigurationsRequest.Unmarshal(m, b)
 }
 func (m *ListConfigurationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListConfigurationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListConfigurationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListConfigurationsRequest.Merge(dst, src)
+func (m *ListConfigurationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigurationsRequest.Merge(m, src)
 }
 func (m *ListConfigurationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListConfigurationsRequest.Size(m)
@@ -419,71 +367,14 @@ func (m *ListConfigurationsRequest) GetOffset() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListConfigurationsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListConfigurationsRequest_OneofMarshaler, _ListConfigurationsRequest_OneofUnmarshaler, _ListConfigurationsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListConfigurationsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListConfigurationsRequest_PageToken)(nil),
 		(*ListConfigurationsRequest_Offset)(nil),
 	}
 }
 
-func _ListConfigurationsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListConfigurationsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListConfigurationsRequest_PageToken:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PageToken)
-	case *ListConfigurationsRequest_Offset:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		return fmt.Errorf("ListConfigurationsRequest.PageStart has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListConfigurationsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListConfigurationsRequest)
-	switch tag {
-	case 3: // page_start.page_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PageStart = &ListConfigurationsRequest_PageToken{x}
-		return true, err
-	case 4: // page_start.offset
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.PageStart = &ListConfigurationsRequest_Offset{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListConfigurationsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListConfigurationsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListConfigurationsRequest_PageToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PageToken)))
-		n += len(x.PageToken)
-	case *ListConfigurationsRequest_Offset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response from calling ListConfigurations
 type ListConfigurationsResponse struct {
 	// Configurations matching the request invocation,
@@ -501,16 +392,17 @@ func (m *ListConfigurationsResponse) Reset()         { *m = ListConfigurationsRe
 func (m *ListConfigurationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListConfigurationsResponse) ProtoMessage()    {}
 func (*ListConfigurationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{5}
+	return fileDescriptor_466641838cdba1d1, []int{5}
 }
+
 func (m *ListConfigurationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListConfigurationsResponse.Unmarshal(m, b)
 }
 func (m *ListConfigurationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListConfigurationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListConfigurationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListConfigurationsResponse.Merge(dst, src)
+func (m *ListConfigurationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigurationsResponse.Merge(m, src)
 }
 func (m *ListConfigurationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListConfigurationsResponse.Size(m)
@@ -549,16 +441,17 @@ func (m *GetTargetRequest) Reset()         { *m = GetTargetRequest{} }
 func (m *GetTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTargetRequest) ProtoMessage()    {}
 func (*GetTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{6}
+	return fileDescriptor_466641838cdba1d1, []int{6}
 }
+
 func (m *GetTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTargetRequest.Unmarshal(m, b)
 }
 func (m *GetTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTargetRequest.Merge(dst, src)
+func (m *GetTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTargetRequest.Merge(m, src)
 }
 func (m *GetTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTargetRequest.Size(m)
@@ -599,16 +492,17 @@ func (m *ListTargetsRequest) Reset()         { *m = ListTargetsRequest{} }
 func (m *ListTargetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTargetsRequest) ProtoMessage()    {}
 func (*ListTargetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{7}
+	return fileDescriptor_466641838cdba1d1, []int{7}
 }
+
 func (m *ListTargetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTargetsRequest.Unmarshal(m, b)
 }
 func (m *ListTargetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTargetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTargetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTargetsRequest.Merge(dst, src)
+func (m *ListTargetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTargetsRequest.Merge(m, src)
 }
 func (m *ListTargetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTargetsRequest.Size(m)
@@ -670,71 +564,14 @@ func (m *ListTargetsRequest) GetOffset() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListTargetsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListTargetsRequest_OneofMarshaler, _ListTargetsRequest_OneofUnmarshaler, _ListTargetsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListTargetsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListTargetsRequest_PageToken)(nil),
 		(*ListTargetsRequest_Offset)(nil),
 	}
 }
 
-func _ListTargetsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListTargetsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListTargetsRequest_PageToken:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PageToken)
-	case *ListTargetsRequest_Offset:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		return fmt.Errorf("ListTargetsRequest.PageStart has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListTargetsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListTargetsRequest)
-	switch tag {
-	case 3: // page_start.page_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PageStart = &ListTargetsRequest_PageToken{x}
-		return true, err
-	case 4: // page_start.offset
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.PageStart = &ListTargetsRequest_Offset{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListTargetsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListTargetsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListTargetsRequest_PageToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PageToken)))
-		n += len(x.PageToken)
-	case *ListTargetsRequest_Offset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response from calling ListTargetsResponse
 type ListTargetsResponse struct {
 	// Targets matching the request invocation,
@@ -752,16 +589,17 @@ func (m *ListTargetsResponse) Reset()         { *m = ListTargetsResponse{} }
 func (m *ListTargetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTargetsResponse) ProtoMessage()    {}
 func (*ListTargetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{8}
+	return fileDescriptor_466641838cdba1d1, []int{8}
 }
+
 func (m *ListTargetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTargetsResponse.Unmarshal(m, b)
 }
 func (m *ListTargetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTargetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTargetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTargetsResponse.Merge(dst, src)
+func (m *ListTargetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTargetsResponse.Merge(m, src)
 }
 func (m *ListTargetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTargetsResponse.Size(m)
@@ -800,16 +638,17 @@ func (m *GetConfiguredTargetRequest) Reset()         { *m = GetConfiguredTargetR
 func (m *GetConfiguredTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetConfiguredTargetRequest) ProtoMessage()    {}
 func (*GetConfiguredTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{9}
+	return fileDescriptor_466641838cdba1d1, []int{9}
 }
+
 func (m *GetConfiguredTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConfiguredTargetRequest.Unmarshal(m, b)
 }
 func (m *GetConfiguredTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetConfiguredTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetConfiguredTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetConfiguredTargetRequest.Merge(dst, src)
+func (m *GetConfiguredTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfiguredTargetRequest.Merge(m, src)
 }
 func (m *GetConfiguredTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetConfiguredTargetRequest.Size(m)
@@ -851,16 +690,17 @@ func (m *ListConfiguredTargetsRequest) Reset()         { *m = ListConfiguredTarg
 func (m *ListConfiguredTargetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListConfiguredTargetsRequest) ProtoMessage()    {}
 func (*ListConfiguredTargetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{10}
+	return fileDescriptor_466641838cdba1d1, []int{10}
 }
+
 func (m *ListConfiguredTargetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListConfiguredTargetsRequest.Unmarshal(m, b)
 }
 func (m *ListConfiguredTargetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListConfiguredTargetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListConfiguredTargetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListConfiguredTargetsRequest.Merge(dst, src)
+func (m *ListConfiguredTargetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfiguredTargetsRequest.Merge(m, src)
 }
 func (m *ListConfiguredTargetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListConfiguredTargetsRequest.Size(m)
@@ -922,71 +762,14 @@ func (m *ListConfiguredTargetsRequest) GetOffset() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListConfiguredTargetsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListConfiguredTargetsRequest_OneofMarshaler, _ListConfiguredTargetsRequest_OneofUnmarshaler, _ListConfiguredTargetsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListConfiguredTargetsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListConfiguredTargetsRequest_PageToken)(nil),
 		(*ListConfiguredTargetsRequest_Offset)(nil),
 	}
 }
 
-func _ListConfiguredTargetsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListConfiguredTargetsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListConfiguredTargetsRequest_PageToken:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PageToken)
-	case *ListConfiguredTargetsRequest_Offset:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		return fmt.Errorf("ListConfiguredTargetsRequest.PageStart has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListConfiguredTargetsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListConfiguredTargetsRequest)
-	switch tag {
-	case 3: // page_start.page_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PageStart = &ListConfiguredTargetsRequest_PageToken{x}
-		return true, err
-	case 4: // page_start.offset
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.PageStart = &ListConfiguredTargetsRequest_Offset{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListConfiguredTargetsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListConfiguredTargetsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListConfiguredTargetsRequest_PageToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PageToken)))
-		n += len(x.PageToken)
-	case *ListConfiguredTargetsRequest_Offset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response from calling ListConfiguredTargets
 type ListConfiguredTargetsResponse struct {
 	// ConfiguredTargets matching the request,
@@ -1004,16 +787,17 @@ func (m *ListConfiguredTargetsResponse) Reset()         { *m = ListConfiguredTar
 func (m *ListConfiguredTargetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListConfiguredTargetsResponse) ProtoMessage()    {}
 func (*ListConfiguredTargetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{11}
+	return fileDescriptor_466641838cdba1d1, []int{11}
 }
+
 func (m *ListConfiguredTargetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListConfiguredTargetsResponse.Unmarshal(m, b)
 }
 func (m *ListConfiguredTargetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListConfiguredTargetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListConfiguredTargetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListConfiguredTargetsResponse.Merge(dst, src)
+func (m *ListConfiguredTargetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfiguredTargetsResponse.Merge(m, src)
 }
 func (m *ListConfiguredTargetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListConfiguredTargetsResponse.Size(m)
@@ -1052,16 +836,17 @@ func (m *GetActionRequest) Reset()         { *m = GetActionRequest{} }
 func (m *GetActionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetActionRequest) ProtoMessage()    {}
 func (*GetActionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{12}
+	return fileDescriptor_466641838cdba1d1, []int{12}
 }
+
 func (m *GetActionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetActionRequest.Unmarshal(m, b)
 }
 func (m *GetActionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetActionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetActionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetActionRequest.Merge(dst, src)
+func (m *GetActionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetActionRequest.Merge(m, src)
 }
 func (m *GetActionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetActionRequest.Size(m)
@@ -1103,16 +888,17 @@ func (m *ListActionsRequest) Reset()         { *m = ListActionsRequest{} }
 func (m *ListActionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListActionsRequest) ProtoMessage()    {}
 func (*ListActionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{13}
+	return fileDescriptor_466641838cdba1d1, []int{13}
 }
+
 func (m *ListActionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListActionsRequest.Unmarshal(m, b)
 }
 func (m *ListActionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListActionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListActionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListActionsRequest.Merge(dst, src)
+func (m *ListActionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActionsRequest.Merge(m, src)
 }
 func (m *ListActionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListActionsRequest.Size(m)
@@ -1174,71 +960,14 @@ func (m *ListActionsRequest) GetOffset() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListActionsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListActionsRequest_OneofMarshaler, _ListActionsRequest_OneofUnmarshaler, _ListActionsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListActionsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListActionsRequest_PageToken)(nil),
 		(*ListActionsRequest_Offset)(nil),
 	}
 }
 
-func _ListActionsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListActionsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListActionsRequest_PageToken:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PageToken)
-	case *ListActionsRequest_Offset:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		return fmt.Errorf("ListActionsRequest.PageStart has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListActionsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListActionsRequest)
-	switch tag {
-	case 3: // page_start.page_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PageStart = &ListActionsRequest_PageToken{x}
-		return true, err
-	case 4: // page_start.offset
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.PageStart = &ListActionsRequest_Offset{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListActionsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListActionsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListActionsRequest_PageToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PageToken)))
-		n += len(x.PageToken)
-	case *ListActionsRequest_Offset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response from calling ListActions
 type ListActionsResponse struct {
 	// Actions matching the request,
@@ -1256,16 +985,17 @@ func (m *ListActionsResponse) Reset()         { *m = ListActionsResponse{} }
 func (m *ListActionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListActionsResponse) ProtoMessage()    {}
 func (*ListActionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{14}
+	return fileDescriptor_466641838cdba1d1, []int{14}
 }
+
 func (m *ListActionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListActionsResponse.Unmarshal(m, b)
 }
 func (m *ListActionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListActionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListActionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListActionsResponse.Merge(dst, src)
+func (m *ListActionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActionsResponse.Merge(m, src)
 }
 func (m *ListActionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListActionsResponse.Size(m)
@@ -1304,16 +1034,17 @@ func (m *GetFileSetRequest) Reset()         { *m = GetFileSetRequest{} }
 func (m *GetFileSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFileSetRequest) ProtoMessage()    {}
 func (*GetFileSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{15}
+	return fileDescriptor_466641838cdba1d1, []int{15}
 }
+
 func (m *GetFileSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFileSetRequest.Unmarshal(m, b)
 }
 func (m *GetFileSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFileSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFileSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFileSetRequest.Merge(dst, src)
+func (m *GetFileSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileSetRequest.Merge(m, src)
 }
 func (m *GetFileSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFileSetRequest.Size(m)
@@ -1354,16 +1085,17 @@ func (m *ListFileSetsRequest) Reset()         { *m = ListFileSetsRequest{} }
 func (m *ListFileSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFileSetsRequest) ProtoMessage()    {}
 func (*ListFileSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{16}
+	return fileDescriptor_466641838cdba1d1, []int{16}
 }
+
 func (m *ListFileSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFileSetsRequest.Unmarshal(m, b)
 }
 func (m *ListFileSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFileSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFileSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFileSetsRequest.Merge(dst, src)
+func (m *ListFileSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFileSetsRequest.Merge(m, src)
 }
 func (m *ListFileSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFileSetsRequest.Size(m)
@@ -1425,71 +1157,14 @@ func (m *ListFileSetsRequest) GetOffset() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListFileSetsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListFileSetsRequest_OneofMarshaler, _ListFileSetsRequest_OneofUnmarshaler, _ListFileSetsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListFileSetsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListFileSetsRequest_PageToken)(nil),
 		(*ListFileSetsRequest_Offset)(nil),
 	}
 }
 
-func _ListFileSetsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListFileSetsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListFileSetsRequest_PageToken:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PageToken)
-	case *ListFileSetsRequest_Offset:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		return fmt.Errorf("ListFileSetsRequest.PageStart has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListFileSetsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListFileSetsRequest)
-	switch tag {
-	case 3: // page_start.page_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.PageStart = &ListFileSetsRequest_PageToken{x}
-		return true, err
-	case 4: // page_start.offset
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.PageStart = &ListFileSetsRequest_Offset{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListFileSetsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListFileSetsRequest)
-	// page_start
-	switch x := m.PageStart.(type) {
-	case *ListFileSetsRequest_PageToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PageToken)))
-		n += len(x.PageToken)
-	case *ListFileSetsRequest_Offset:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Offset))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response from calling ListFileSets
 type ListFileSetsResponse struct {
 	// File sets matching the request,
@@ -1507,16 +1182,17 @@ func (m *ListFileSetsResponse) Reset()         { *m = ListFileSetsResponse{} }
 func (m *ListFileSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFileSetsResponse) ProtoMessage()    {}
 func (*ListFileSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_download_3481b489ba35ace6, []int{17}
+	return fileDescriptor_466641838cdba1d1, []int{17}
 }
+
 func (m *ListFileSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFileSetsResponse.Unmarshal(m, b)
 }
 func (m *ListFileSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFileSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFileSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFileSetsResponse.Merge(dst, src)
+func (m *ListFileSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFileSetsResponse.Merge(m, src)
 }
 func (m *ListFileSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFileSetsResponse.Size(m)
@@ -1562,6 +1238,80 @@ func init() {
 	proto.RegisterType((*ListFileSetsResponse)(nil), "google.devtools.resultstore.v2.ListFileSetsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_download.proto", fileDescriptor_466641838cdba1d1)
+}
+
+var fileDescriptor_466641838cdba1d1 = []byte{
+	// 1043 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xcf, 0x6f, 0xdc, 0x44,
+	0x14, 0xc7, 0x3b, 0xf9, 0x45, 0xf7, 0xa5, 0x85, 0xe6, 0x25, 0x14, 0xd7, 0xb4, 0x25, 0x32, 0x90,
+	0x46, 0xa9, 0xb2, 0x1b, 0xb6, 0x55, 0x69, 0x03, 0x45, 0x25, 0x54, 0x24, 0x91, 0x7a, 0xa8, 0x36,
+	0xe5, 0xc2, 0x65, 0x65, 0x76, 0x67, 0x8d, 0x61, 0xe3, 0xd9, 0x78, 0x26, 0x01, 0x8a, 0x10, 0x12,
+	0xe2, 0x1f, 0x28, 0x11, 0x07, 0x04, 0x27, 0x0e, 0x55, 0x6e, 0x9c, 0x10, 0x57, 0x24, 0xc4, 0x5f,
+	0x00, 0x7f, 0x02, 0x7f, 0x08, 0xf2, 0x78, 0x66, 0xe3, 0x71, 0xbc, 0xeb, 0x71, 0x4e, 0xb9, 0xc5,
+	0xde, 0xf7, 0x9d, 0x79, 0xef, 0x33, 0x5f, 0xfb, 0xbd, 0x18, 0xee, 0x05, 0x8c, 0x05, 0x7d, 0xda,
+	0xe8, 0xd2, 0x03, 0xc1, 0x58, 0x9f, 0x37, 0x62, 0xca, 0xf7, 0xfb, 0x82, 0x0b, 0x16, 0xd3, 0xc6,
+	0x41, 0x33, 0x7b, 0xd9, 0xee, 0xb2, 0x2f, 0xa2, 0x3e, 0xf3, 0xbb, 0xf5, 0x41, 0xcc, 0x04, 0xc3,
+	0xeb, 0xa9, 0xb4, 0xae, 0xa5, 0xf5, 0x4c, 0x6c, 0xfd, 0xa0, 0xe9, 0x5e, 0x55, 0x4b, 0xfb, 0x83,
+	0xb0, 0xe1, 0x47, 0x11, 0x13, 0xbe, 0x08, 0x59, 0xc4, 0x53, 0xb5, 0x7b, 0xb3, 0x64, 0x63, 0xbf,
+	0x93, 0x44, 0x5b, 0x06, 0x77, 0xd8, 0xee, 0xee, 0x30, 0xb8, 0x59, 0x1a, 0x1c, 0xf5, 0xc2, 0x60,
+	0x3f, 0xf6, 0x33, 0x1b, 0xdc, 0xb1, 0xd4, 0xd0, 0x6e, 0x5b, 0xf8, 0x71, 0x40, 0x85, 0xd2, 0xad,
+	0x96, 0xe8, 0x7a, 0x61, 0x9f, 0xb6, 0xf9, 0x30, 0xbc, 0x51, 0x12, 0x1e, 0x46, 0x07, 0xac, 0xe3,
+	0x57, 0x28, 0x3c, 0x9b, 0x8c, 0xb7, 0x02, 0x0b, 0x9b, 0x54, 0x6c, 0x0f, 0xd7, 0x68, 0xd1, 0xbd,
+	0x7d, 0xca, 0x05, 0x22, 0x4c, 0x45, 0xfe, 0x2e, 0x75, 0xc8, 0x22, 0x59, 0xae, 0xb5, 0xe4, 0xdf,
+	0xde, 0xef, 0x04, 0x9c, 0x1d, 0xea, 0xc7, 0x9d, 0x4f, 0x8f, 0xe3, 0xb9, 0x16, 0xbc, 0x0a, 0xb5,
+	0x81, 0x1f, 0xd0, 0x36, 0x0f, 0x9f, 0xa6, 0xaa, 0xe9, 0xd6, 0xf9, 0xe4, 0xc6, 0x4e, 0xf8, 0x94,
+	0xe2, 0x6b, 0x00, 0xf2, 0x47, 0xc1, 0x3e, 0xa7, 0x91, 0x33, 0x91, 0xac, 0xb9, 0x75, 0xae, 0x25,
+	0x05, 0x4f, 0x92, 0x5b, 0xe8, 0xc0, 0x0c, 0xeb, 0xf5, 0x38, 0x15, 0xce, 0xe4, 0x22, 0x59, 0x9e,
+	0xdc, 0x3a, 0xd7, 0x52, 0xd7, 0xb8, 0x00, 0xd3, 0x7b, 0xfb, 0x34, 0xfe, 0xca, 0x99, 0x92, 0x99,
+	0xa4, 0x17, 0x78, 0x0d, 0x60, 0x10, 0xb3, 0xcf, 0x68, 0x47, 0xb4, 0xc3, 0xae, 0x33, 0x2d, 0x7f,
+	0xaa, 0xa9, 0x3b, 0xdb, 0xdd, 0x8d, 0x0b, 0x6a, 0x3f, 0x2e, 0xfc, 0x58, 0x78, 0xcf, 0x08, 0x5c,
+	0x29, 0xc8, 0x9b, 0x0f, 0x58, 0xc4, 0x29, 0x3e, 0x82, 0xd9, 0x63, 0x84, 0xdc, 0x21, 0x8b, 0x93,
+	0xcb, 0xb3, 0xcd, 0x95, 0xfa, 0x78, 0xa3, 0xd6, 0x33, 0xc4, 0xb2, 0x72, 0x5c, 0x82, 0x97, 0x22,
+	0xfa, 0xa5, 0x68, 0xe7, 0xcb, 0x6d, 0x5d, 0x4c, 0x6e, 0x3f, 0xd6, 0x05, 0x7b, 0xab, 0xf0, 0xca,
+	0x26, 0x15, 0x1f, 0x64, 0x6d, 0x35, 0x0e, 0xfd, 0x4f, 0x04, 0xae, 0x3c, 0x0a, 0xb9, 0x29, 0x18,
+	0xb2, 0xbf, 0x0c, 0x33, 0x03, 0x3f, 0xa6, 0x91, 0x50, 0x1a, 0x75, 0x65, 0x9e, 0xc9, 0xc4, 0xd8,
+	0x33, 0x99, 0x1c, 0x77, 0x26, 0x53, 0xe6, 0x99, 0xe4, 0xf0, 0xfe, 0x4c, 0xc0, 0x2d, 0xca, 0x4d,
+	0xf1, 0xfd, 0x08, 0x5e, 0x34, 0x9e, 0x1e, 0x8d, 0x78, 0xb5, 0x0c, 0xb1, 0x09, 0x27, 0xb7, 0x88,
+	0x35, 0xe8, 0x25, 0xb8, 0xb4, 0x49, 0xc5, 0x13, 0xe9, 0xf9, 0x71, 0x84, 0x7f, 0x20, 0x80, 0x49,
+	0x15, 0x69, 0xe4, 0x19, 0x41, 0xfb, 0x2d, 0xcc, 0x1b, 0x39, 0x29, 0xa4, 0x0f, 0xe0, 0x85, 0xf4,
+	0x21, 0xd6, 0x2c, 0x97, 0xca, 0x58, 0xaa, 0xfa, 0xb5, 0xcc, 0x9a, 0xde, 0x1a, 0xb8, 0x19, 0x9b,
+	0xd2, 0x6e, 0x39, 0xc7, 0x5f, 0x08, 0x5c, 0xcd, 0xba, 0x41, 0x6b, 0xce, 0x08, 0xd1, 0x23, 0x02,
+	0xd7, 0x46, 0xa4, 0xa7, 0xe0, 0xb6, 0x01, 0x4f, 0xbc, 0xb9, 0x35, 0xe7, 0x35, 0x5b, 0xcf, 0x0e,
+	0x49, 0xcd, 0x75, 0xf2, 0x1b, 0x55, 0x74, 0xee, 0xfb, 0x9d, 0xb2, 0x77, 0x83, 0x76, 0x6e, 0x1a,
+	0x79, 0xb6, 0x9c, 0x3b, 0xcc, 0xe9, 0xd8, 0xb9, 0x69, 0x93, 0xb6, 0x76, 0xae, 0xaa, 0x5f, 0xcb,
+	0xac, 0xe9, 0xdd, 0x80, 0xb9, 0x4d, 0x2a, 0x3e, 0x0c, 0xfb, 0x74, 0x67, 0xbc, 0x61, 0x0f, 0x49,
+	0x9a, 0xaa, 0x0a, 0x3d, 0x23, 0xfc, 0xbe, 0x27, 0xb0, 0x60, 0x66, 0xa5, 0x08, 0x3e, 0x84, 0x9a,
+	0x1e, 0x10, 0x34, 0xc3, 0x1b, 0x65, 0x0c, 0x35, 0x85, 0xf3, 0x3d, 0xb5, 0x9a, 0x2d, 0xc5, 0xe6,
+	0xdf, 0x97, 0x60, 0xbe, 0x25, 0x17, 0xdb, 0x49, 0x16, 0x7b, 0xa8, 0xa6, 0x39, 0x3c, 0x24, 0x70,
+	0xd1, 0x98, 0x1b, 0xf0, 0x76, 0x59, 0x12, 0x45, 0x63, 0x86, 0x5b, 0xa1, 0xcf, 0x7a, 0x8b, 0xdf,
+	0xfd, 0xf3, 0xdf, 0xe1, 0x84, 0x8b, 0x4e, 0x32, 0xc4, 0x7c, 0x9d, 0x9c, 0xdd, 0xfd, 0x4c, 0xe7,
+	0x6d, 0xac, 0x7c, 0x83, 0x47, 0x04, 0xe6, 0x4e, 0x34, 0x7a, 0xbc, 0x5b, 0xb6, 0xc7, 0xa8, 0x99,
+	0xc6, 0xbd, 0x77, 0x0a, 0x65, 0x7a, 0x4c, 0xde, 0x75, 0x99, 0xac, 0x83, 0x97, 0xcd, 0x11, 0x8d,
+	0xaf, 0x73, 0x29, 0xc1, 0xe7, 0x44, 0x3e, 0xdd, 0x46, 0x8f, 0xc3, 0xb7, 0x2d, 0x18, 0x16, 0x8d,
+	0x0c, 0x6e, 0xb5, 0x5e, 0xea, 0xad, 0xc8, 0xe4, 0xde, 0x40, 0x6f, 0x04, 0x49, 0x35, 0xba, 0x4a,
+	0xa6, 0x7f, 0xa8, 0xb7, 0x8b, 0xd9, 0xdd, 0xb1, 0x14, 0xcd, 0xc8, 0x69, 0xc5, 0x5d, 0x3f, 0x8d,
+	0x54, 0x61, 0x35, 0x33, 0x4f, 0x9f, 0xc8, 0x9c, 0x0b, 0x74, 0xf2, 0xf8, 0x8c, 0x40, 0x6d, 0xd8,
+	0xfa, 0x71, 0xcd, 0x82, 0xad, 0xd1, 0xdd, 0x5c, 0xcb, 0xa6, 0x5a, 0x4e, 0x53, 0xf5, 0x90, 0x84,
+	0xe6, 0xaf, 0x04, 0x66, 0x33, 0x1d, 0x1d, 0x9b, 0x36, 0x2c, 0xcc, 0x06, 0xea, 0xde, 0xaa, 0xa4,
+	0xa9, 0x00, 0x4e, 0x0f, 0x07, 0x7f, 0x11, 0x98, 0x2f, 0xe8, 0xfa, 0xb8, 0x5e, 0xc1, 0x9e, 0xb9,
+	0x51, 0xc1, 0xad, 0xdc, 0x39, 0xbd, 0xf7, 0x64, 0xc6, 0x77, 0xf1, 0x4e, 0x29, 0xd6, 0xc6, 0x89,
+	0x1e, 0x9b, 0xa0, 0xfe, 0x97, 0xc0, 0xcb, 0x85, 0x9d, 0x1e, 0xdf, 0xad, 0x62, 0xc0, 0xfc, 0xfc,
+	0xe2, 0xde, 0x3f, 0xa5, 0x5a, 0x1d, 0x84, 0x59, 0x56, 0xd1, 0x41, 0x64, 0xfc, 0x72, 0xb2, 0x32,
+	0xfc, 0x2d, 0x75, 0x75, 0xda, 0x16, 0xad, 0x5c, 0x6d, 0x4c, 0x10, 0xae, 0x65, 0xc3, 0xf5, 0xb6,
+	0x64, 0x9e, 0x1b, 0xf8, 0xe0, 0x54, 0xf8, 0xd5, 0xbf, 0xe2, 0xf2, 0x20, 0xfe, 0x54, 0x9e, 0x57,
+	0xb3, 0x80, 0x9d, 0xe7, 0xcd, 0x61, 0xc6, 0xce, 0xf3, 0xb9, 0x61, 0x23, 0x57, 0xc2, 0x78, 0xd4,
+	0x85, 0x1e, 0xd2, 0x55, 0xe0, 0x8f, 0x04, 0xe0, 0x78, 0x9a, 0xc0, 0xb7, 0x2c, 0xa8, 0x9b, 0x93,
+	0x87, 0x6b, 0xdb, 0xa3, 0xbd, 0x9b, 0x32, 0xe9, 0x37, 0xf1, 0xf5, 0x51, 0xdc, 0x75, 0x0f, 0x4f,
+	0xd0, 0x3e, 0x27, 0x70, 0x21, 0x3b, 0x25, 0xa0, 0x15, 0xa7, 0xdc, 0xa4, 0xe3, 0xde, 0xae, 0x26,
+	0x52, 0x74, 0xcd, 0x44, 0x8b, 0xdf, 0x28, 0x3a, 0xd7, 0x8d, 0x3d, 0xf0, 0x3a, 0x6c, 0xb7, 0x64,
+	0x9f, 0xc7, 0xe4, 0xe3, 0x6d, 0x15, 0x11, 0xb0, 0xbe, 0x1f, 0x05, 0x75, 0x16, 0x07, 0x8d, 0x80,
+	0x46, 0xf2, 0x53, 0x85, 0xfa, 0x0e, 0xe2, 0x0f, 0x42, 0x3e, 0xea, 0xd3, 0xc6, 0x3b, 0x99, 0xcb,
+	0x4f, 0x66, 0xa4, 0xea, 0xd6, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, 0xe0, 0x2a, 0x9a, 0xae,
+	0x12, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2164,77 +1914,3 @@ var _ResultStoreDownload_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/resultstore/v2/resultstore_download.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_download.proto", fileDescriptor_resultstore_download_3481b489ba35ace6)
-}
-
-var fileDescriptor_resultstore_download_3481b489ba35ace6 = []byte{
-	// 1043 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xcf, 0x6f, 0xdc, 0x44,
-	0x14, 0xc7, 0x3b, 0xf9, 0x45, 0xf7, 0xa5, 0x85, 0xe6, 0x25, 0x14, 0xd7, 0xb4, 0x25, 0x32, 0x90,
-	0x46, 0xa9, 0xb2, 0x1b, 0xb6, 0x55, 0x69, 0x03, 0x45, 0x25, 0x54, 0x24, 0x91, 0x7a, 0xa8, 0x36,
-	0xe5, 0xc2, 0x65, 0x65, 0x76, 0x67, 0x8d, 0x61, 0xe3, 0xd9, 0x78, 0x26, 0x01, 0x8a, 0x10, 0x12,
-	0xe2, 0x1f, 0x28, 0x11, 0x07, 0x04, 0x27, 0x0e, 0x55, 0x6e, 0x9c, 0x10, 0x57, 0x24, 0xc4, 0x5f,
-	0x00, 0x7f, 0x02, 0x7f, 0x08, 0xf2, 0x78, 0x66, 0xe3, 0x71, 0xbc, 0xeb, 0x71, 0x4e, 0xb9, 0xc5,
-	0xde, 0xf7, 0x9d, 0x79, 0xef, 0x33, 0x5f, 0xfb, 0xbd, 0x18, 0xee, 0x05, 0x8c, 0x05, 0x7d, 0xda,
-	0xe8, 0xd2, 0x03, 0xc1, 0x58, 0x9f, 0x37, 0x62, 0xca, 0xf7, 0xfb, 0x82, 0x0b, 0x16, 0xd3, 0xc6,
-	0x41, 0x33, 0x7b, 0xd9, 0xee, 0xb2, 0x2f, 0xa2, 0x3e, 0xf3, 0xbb, 0xf5, 0x41, 0xcc, 0x04, 0xc3,
-	0xeb, 0xa9, 0xb4, 0xae, 0xa5, 0xf5, 0x4c, 0x6c, 0xfd, 0xa0, 0xe9, 0x5e, 0x55, 0x4b, 0xfb, 0x83,
-	0xb0, 0xe1, 0x47, 0x11, 0x13, 0xbe, 0x08, 0x59, 0xc4, 0x53, 0xb5, 0x7b, 0xb3, 0x64, 0x63, 0xbf,
-	0x93, 0x44, 0x5b, 0x06, 0x77, 0xd8, 0xee, 0xee, 0x30, 0xb8, 0x59, 0x1a, 0x1c, 0xf5, 0xc2, 0x60,
-	0x3f, 0xf6, 0x33, 0x1b, 0xdc, 0xb1, 0xd4, 0xd0, 0x6e, 0x5b, 0xf8, 0x71, 0x40, 0x85, 0xd2, 0xad,
-	0x96, 0xe8, 0x7a, 0x61, 0x9f, 0xb6, 0xf9, 0x30, 0xbc, 0x51, 0x12, 0x1e, 0x46, 0x07, 0xac, 0xe3,
-	0x57, 0x28, 0x3c, 0x9b, 0x8c, 0xb7, 0x02, 0x0b, 0x9b, 0x54, 0x6c, 0x0f, 0xd7, 0x68, 0xd1, 0xbd,
-	0x7d, 0xca, 0x05, 0x22, 0x4c, 0x45, 0xfe, 0x2e, 0x75, 0xc8, 0x22, 0x59, 0xae, 0xb5, 0xe4, 0xdf,
-	0xde, 0xef, 0x04, 0x9c, 0x1d, 0xea, 0xc7, 0x9d, 0x4f, 0x8f, 0xe3, 0xb9, 0x16, 0xbc, 0x0a, 0xb5,
-	0x81, 0x1f, 0xd0, 0x36, 0x0f, 0x9f, 0xa6, 0xaa, 0xe9, 0xd6, 0xf9, 0xe4, 0xc6, 0x4e, 0xf8, 0x94,
-	0xe2, 0x6b, 0x00, 0xf2, 0x47, 0xc1, 0x3e, 0xa7, 0x91, 0x33, 0x91, 0xac, 0xb9, 0x75, 0xae, 0x25,
-	0x05, 0x4f, 0x92, 0x5b, 0xe8, 0xc0, 0x0c, 0xeb, 0xf5, 0x38, 0x15, 0xce, 0xe4, 0x22, 0x59, 0x9e,
-	0xdc, 0x3a, 0xd7, 0x52, 0xd7, 0xb8, 0x00, 0xd3, 0x7b, 0xfb, 0x34, 0xfe, 0xca, 0x99, 0x92, 0x99,
-	0xa4, 0x17, 0x78, 0x0d, 0x60, 0x10, 0xb3, 0xcf, 0x68, 0x47, 0xb4, 0xc3, 0xae, 0x33, 0x2d, 0x7f,
-	0xaa, 0xa9, 0x3b, 0xdb, 0xdd, 0x8d, 0x0b, 0x6a, 0x3f, 0x2e, 0xfc, 0x58, 0x78, 0xcf, 0x08, 0x5c,
-	0x29, 0xc8, 0x9b, 0x0f, 0x58, 0xc4, 0x29, 0x3e, 0x82, 0xd9, 0x63, 0x84, 0xdc, 0x21, 0x8b, 0x93,
-	0xcb, 0xb3, 0xcd, 0x95, 0xfa, 0x78, 0xa3, 0xd6, 0x33, 0xc4, 0xb2, 0x72, 0x5c, 0x82, 0x97, 0x22,
-	0xfa, 0xa5, 0x68, 0xe7, 0xcb, 0x6d, 0x5d, 0x4c, 0x6e, 0x3f, 0xd6, 0x05, 0x7b, 0xab, 0xf0, 0xca,
-	0x26, 0x15, 0x1f, 0x64, 0x6d, 0x35, 0x0e, 0xfd, 0x4f, 0x04, 0xae, 0x3c, 0x0a, 0xb9, 0x29, 0x18,
-	0xb2, 0xbf, 0x0c, 0x33, 0x03, 0x3f, 0xa6, 0x91, 0x50, 0x1a, 0x75, 0x65, 0x9e, 0xc9, 0xc4, 0xd8,
-	0x33, 0x99, 0x1c, 0x77, 0x26, 0x53, 0xe6, 0x99, 0xe4, 0xf0, 0xfe, 0x4c, 0xc0, 0x2d, 0xca, 0x4d,
-	0xf1, 0xfd, 0x08, 0x5e, 0x34, 0x9e, 0x1e, 0x8d, 0x78, 0xb5, 0x0c, 0xb1, 0x09, 0x27, 0xb7, 0x88,
-	0x35, 0xe8, 0x25, 0xb8, 0xb4, 0x49, 0xc5, 0x13, 0xe9, 0xf9, 0x71, 0x84, 0x7f, 0x20, 0x80, 0x49,
-	0x15, 0x69, 0xe4, 0x19, 0x41, 0xfb, 0x2d, 0xcc, 0x1b, 0x39, 0x29, 0xa4, 0x0f, 0xe0, 0x85, 0xf4,
-	0x21, 0xd6, 0x2c, 0x97, 0xca, 0x58, 0xaa, 0xfa, 0xb5, 0xcc, 0x9a, 0xde, 0x1a, 0xb8, 0x19, 0x9b,
-	0xd2, 0x6e, 0x39, 0xc7, 0x5f, 0x08, 0x5c, 0xcd, 0xba, 0x41, 0x6b, 0xce, 0x08, 0xd1, 0x23, 0x02,
-	0xd7, 0x46, 0xa4, 0xa7, 0xe0, 0xb6, 0x01, 0x4f, 0xbc, 0xb9, 0x35, 0xe7, 0x35, 0x5b, 0xcf, 0x0e,
-	0x49, 0xcd, 0x75, 0xf2, 0x1b, 0x55, 0x74, 0xee, 0xfb, 0x9d, 0xb2, 0x77, 0x83, 0x76, 0x6e, 0x1a,
-	0x79, 0xb6, 0x9c, 0x3b, 0xcc, 0xe9, 0xd8, 0xb9, 0x69, 0x93, 0xb6, 0x76, 0xae, 0xaa, 0x5f, 0xcb,
-	0xac, 0xe9, 0xdd, 0x80, 0xb9, 0x4d, 0x2a, 0x3e, 0x0c, 0xfb, 0x74, 0x67, 0xbc, 0x61, 0x0f, 0x49,
-	0x9a, 0xaa, 0x0a, 0x3d, 0x23, 0xfc, 0xbe, 0x27, 0xb0, 0x60, 0x66, 0xa5, 0x08, 0x3e, 0x84, 0x9a,
-	0x1e, 0x10, 0x34, 0xc3, 0x1b, 0x65, 0x0c, 0x35, 0x85, 0xf3, 0x3d, 0xb5, 0x9a, 0x2d, 0xc5, 0xe6,
-	0xdf, 0x97, 0x60, 0xbe, 0x25, 0x17, 0xdb, 0x49, 0x16, 0x7b, 0xa8, 0xa6, 0x39, 0x3c, 0x24, 0x70,
-	0xd1, 0x98, 0x1b, 0xf0, 0x76, 0x59, 0x12, 0x45, 0x63, 0x86, 0x5b, 0xa1, 0xcf, 0x7a, 0x8b, 0xdf,
-	0xfd, 0xf3, 0xdf, 0xe1, 0x84, 0x8b, 0x4e, 0x32, 0xc4, 0x7c, 0x9d, 0x9c, 0xdd, 0xfd, 0x4c, 0xe7,
-	0x6d, 0xac, 0x7c, 0x83, 0x47, 0x04, 0xe6, 0x4e, 0x34, 0x7a, 0xbc, 0x5b, 0xb6, 0xc7, 0xa8, 0x99,
-	0xc6, 0xbd, 0x77, 0x0a, 0x65, 0x7a, 0x4c, 0xde, 0x75, 0x99, 0xac, 0x83, 0x97, 0xcd, 0x11, 0x8d,
-	0xaf, 0x73, 0x29, 0xc1, 0xe7, 0x44, 0x3e, 0xdd, 0x46, 0x8f, 0xc3, 0xb7, 0x2d, 0x18, 0x16, 0x8d,
-	0x0c, 0x6e, 0xb5, 0x5e, 0xea, 0xad, 0xc8, 0xe4, 0xde, 0x40, 0x6f, 0x04, 0x49, 0x35, 0xba, 0x4a,
-	0xa6, 0x7f, 0xa8, 0xb7, 0x8b, 0xd9, 0xdd, 0xb1, 0x14, 0xcd, 0xc8, 0x69, 0xc5, 0x5d, 0x3f, 0x8d,
-	0x54, 0x61, 0x35, 0x33, 0x4f, 0x9f, 0xc8, 0x9c, 0x0b, 0x74, 0xf2, 0xf8, 0x8c, 0x40, 0x6d, 0xd8,
-	0xfa, 0x71, 0xcd, 0x82, 0xad, 0xd1, 0xdd, 0x5c, 0xcb, 0xa6, 0x5a, 0x4e, 0x53, 0xf5, 0x90, 0x84,
-	0xe6, 0xaf, 0x04, 0x66, 0x33, 0x1d, 0x1d, 0x9b, 0x36, 0x2c, 0xcc, 0x06, 0xea, 0xde, 0xaa, 0xa4,
-	0xa9, 0x00, 0x4e, 0x0f, 0x07, 0x7f, 0x11, 0x98, 0x2f, 0xe8, 0xfa, 0xb8, 0x5e, 0xc1, 0x9e, 0xb9,
-	0x51, 0xc1, 0xad, 0xdc, 0x39, 0xbd, 0xf7, 0x64, 0xc6, 0x77, 0xf1, 0x4e, 0x29, 0xd6, 0xc6, 0x89,
-	0x1e, 0x9b, 0xa0, 0xfe, 0x97, 0xc0, 0xcb, 0x85, 0x9d, 0x1e, 0xdf, 0xad, 0x62, 0xc0, 0xfc, 0xfc,
-	0xe2, 0xde, 0x3f, 0xa5, 0x5a, 0x1d, 0x84, 0x59, 0x56, 0xd1, 0x41, 0x64, 0xfc, 0x72, 0xb2, 0x32,
-	0xfc, 0x2d, 0x75, 0x75, 0xda, 0x16, 0xad, 0x5c, 0x6d, 0x4c, 0x10, 0xae, 0x65, 0xc3, 0xf5, 0xb6,
-	0x64, 0x9e, 0x1b, 0xf8, 0xe0, 0x54, 0xf8, 0xd5, 0xbf, 0xe2, 0xf2, 0x20, 0xfe, 0x54, 0x9e, 0x57,
-	0xb3, 0x80, 0x9d, 0xe7, 0xcd, 0x61, 0xc6, 0xce, 0xf3, 0xb9, 0x61, 0x23, 0x57, 0xc2, 0x78, 0xd4,
-	0x85, 0x1e, 0xd2, 0x55, 0xe0, 0x8f, 0x04, 0xe0, 0x78, 0x9a, 0xc0, 0xb7, 0x2c, 0xa8, 0x9b, 0x93,
-	0x87, 0x6b, 0xdb, 0xa3, 0xbd, 0x9b, 0x32, 0xe9, 0x37, 0xf1, 0xf5, 0x51, 0xdc, 0x75, 0x0f, 0x4f,
-	0xd0, 0x3e, 0x27, 0x70, 0x21, 0x3b, 0x25, 0xa0, 0x15, 0xa7, 0xdc, 0xa4, 0xe3, 0xde, 0xae, 0x26,
-	0x52, 0x74, 0xcd, 0x44, 0x8b, 0xdf, 0x28, 0x3a, 0xd7, 0x8d, 0x3d, 0xf0, 0x3a, 0x6c, 0xb7, 0x64,
-	0x9f, 0xc7, 0xe4, 0xe3, 0x6d, 0x15, 0x11, 0xb0, 0xbe, 0x1f, 0x05, 0x75, 0x16, 0x07, 0x8d, 0x80,
-	0x46, 0xf2, 0x53, 0x85, 0xfa, 0x0e, 0xe2, 0x0f, 0x42, 0x3e, 0xea, 0xd3, 0xc6, 0x3b, 0x99, 0xcb,
-	0x4f, 0x66, 0xa4, 0xea, 0xd6, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, 0xe0, 0x2a, 0x9a, 0xae,
-	0x12, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go b/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
index 6a70c7ebc3..cb1d4a523d 100644
--- a/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
+++ b/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/resultstore_file_download.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package resultstore
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request object for GetFile
 type GetFileRequest struct {
@@ -51,16 +51,17 @@ func (m *GetFileRequest) Reset()         { *m = GetFileRequest{} }
 func (m *GetFileRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFileRequest) ProtoMessage()    {}
 func (*GetFileRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_file_download_ebcc3d1484fcd68b, []int{0}
+	return fileDescriptor_8107699981ff9308, []int{0}
 }
+
 func (m *GetFileRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFileRequest.Unmarshal(m, b)
 }
 func (m *GetFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFileRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFileRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFileRequest.Merge(dst, src)
+func (m *GetFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileRequest.Merge(m, src)
 }
 func (m *GetFileRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFileRequest.Size(m)
@@ -105,16 +106,17 @@ func (m *GetFileResponse) Reset()         { *m = GetFileResponse{} }
 func (m *GetFileResponse) String() string { return proto.CompactTextString(m) }
 func (*GetFileResponse) ProtoMessage()    {}
 func (*GetFileResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_file_download_ebcc3d1484fcd68b, []int{1}
+	return fileDescriptor_8107699981ff9308, []int{1}
 }
+
 func (m *GetFileResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFileResponse.Unmarshal(m, b)
 }
 func (m *GetFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFileResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetFileResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFileResponse.Merge(dst, src)
+func (m *GetFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileResponse.Merge(m, src)
 }
 func (m *GetFileResponse) XXX_Size() int {
 	return xxx_messageInfo_GetFileResponse.Size(m)
@@ -157,16 +159,17 @@ func (m *GetFileTailRequest) Reset()         { *m = GetFileTailRequest{} }
 func (m *GetFileTailRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFileTailRequest) ProtoMessage()    {}
 func (*GetFileTailRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_file_download_ebcc3d1484fcd68b, []int{2}
+	return fileDescriptor_8107699981ff9308, []int{2}
 }
+
 func (m *GetFileTailRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFileTailRequest.Unmarshal(m, b)
 }
 func (m *GetFileTailRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFileTailRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFileTailRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFileTailRequest.Merge(dst, src)
+func (m *GetFileTailRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileTailRequest.Merge(m, src)
 }
 func (m *GetFileTailRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFileTailRequest.Size(m)
@@ -211,16 +214,17 @@ func (m *GetFileTailResponse) Reset()         { *m = GetFileTailResponse{} }
 func (m *GetFileTailResponse) String() string { return proto.CompactTextString(m) }
 func (*GetFileTailResponse) ProtoMessage()    {}
 func (*GetFileTailResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_file_download_ebcc3d1484fcd68b, []int{3}
+	return fileDescriptor_8107699981ff9308, []int{3}
 }
+
 func (m *GetFileTailResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFileTailResponse.Unmarshal(m, b)
 }
 func (m *GetFileTailResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFileTailResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetFileTailResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFileTailResponse.Merge(dst, src)
+func (m *GetFileTailResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileTailResponse.Merge(m, src)
 }
 func (m *GetFileTailResponse) XXX_Size() int {
 	return xxx_messageInfo_GetFileTailResponse.Size(m)
@@ -245,6 +249,38 @@ func init() {
 	proto.RegisterType((*GetFileTailResponse)(nil), "google.devtools.resultstore.v2.GetFileTailResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_file_download.proto", fileDescriptor_8107699981ff9308)
+}
+
+var fileDescriptor_8107699981ff9308 = []byte{
+	// 384 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xc1, 0x4a, 0xe3, 0x40,
+	0x18, 0x26, 0xed, 0xb2, 0x4b, 0xa7, 0xcb, 0x6e, 0x99, 0x65, 0x69, 0x28, 0xdb, 0xb5, 0x04, 0x84,
+	0xda, 0xc3, 0x8c, 0xa4, 0x47, 0xd1, 0x83, 0x88, 0x22, 0x08, 0x4a, 0xf4, 0xe4, 0x25, 0x4c, 0xcd,
+	0x24, 0x0c, 0x4c, 0xf3, 0xa7, 0x99, 0x49, 0x3d, 0x48, 0x2f, 0x1e, 0x7c, 0x01, 0xf1, 0x65, 0x7c,
+	0x0d, 0x5f, 0xc1, 0x07, 0x91, 0x99, 0x44, 0x49, 0x0f, 0xd5, 0x7a, 0xf0, 0x36, 0xff, 0x37, 0xff,
+	0xf7, 0xfd, 0x5f, 0xbe, 0xfc, 0x83, 0xf6, 0x12, 0x80, 0x44, 0x72, 0x1a, 0xf1, 0xb9, 0x06, 0x90,
+	0x8a, 0xe6, 0x5c, 0x15, 0x52, 0x2b, 0x0d, 0x39, 0xa7, 0x73, 0xbf, 0x5e, 0x86, 0xb1, 0x90, 0x3c,
+	0x8c, 0xe0, 0x3a, 0x95, 0xc0, 0x22, 0x92, 0xe5, 0xa0, 0x01, 0xff, 0x2f, 0xf9, 0xe4, 0x95, 0x4f,
+	0x6a, 0x04, 0x32, 0xf7, 0x7b, 0xff, 0x2a, 0x7d, 0x96, 0x09, 0xca, 0xd2, 0x14, 0x34, 0xd3, 0x02,
+	0x52, 0x55, 0xb2, 0xbd, 0x09, 0xfa, 0x75, 0xc4, 0xf5, 0xa1, 0x90, 0x3c, 0xe0, 0xb3, 0x82, 0x2b,
+	0x8d, 0x3b, 0xa8, 0x59, 0xe4, 0xc2, 0x75, 0x06, 0xce, 0xb0, 0x15, 0x98, 0x23, 0xde, 0x40, 0xed,
+	0x9c, 0xb3, 0x28, 0x84, 0x38, 0x56, 0x5c, 0xbb, 0x8d, 0x81, 0x33, 0x6c, 0x06, 0xc8, 0x40, 0xa7,
+	0x16, 0xc1, 0x7d, 0x64, 0xab, 0x50, 0x8a, 0xa9, 0xd0, 0x6e, 0xd3, 0xde, 0xb7, 0x0c, 0x72, 0x62,
+	0x00, 0x6f, 0x13, 0xfd, 0x7e, 0x9b, 0xa1, 0x32, 0x48, 0x15, 0xc7, 0x18, 0x7d, 0x8b, 0x98, 0x66,
+	0x76, 0xca, 0xcf, 0xc0, 0x9e, 0xbd, 0x18, 0xe1, 0xaa, 0xed, 0x82, 0x09, 0xf9, 0x75, 0x76, 0xb6,
+	0xd0, 0x9f, 0xa5, 0x39, 0xab, 0x2d, 0xf9, 0x8f, 0x0d, 0xd4, 0x0d, 0x6c, 0x9c, 0xe7, 0x26, 0x4e,
+	0xc3, 0x39, 0xa8, 0xd2, 0xc7, 0x77, 0x0e, 0xfa, 0x51, 0xe9, 0x60, 0x42, 0xde, 0xff, 0x09, 0x64,
+	0x39, 0xe3, 0x1e, 0x5d, 0xbb, 0xbf, 0x34, 0xe7, 0xb9, 0xb7, 0x4f, 0xcf, 0xf7, 0x0d, 0x8c, 0x3b,
+	0x66, 0x23, 0x6e, 0x8a, 0x5c, 0xec, 0x9a, 0x55, 0xa0, 0xa3, 0xc5, 0xb6, 0x83, 0x1f, 0x1c, 0xd4,
+	0xae, 0x7d, 0x10, 0xf6, 0xd7, 0x14, 0xaf, 0xa5, 0xdc, 0x1b, 0x7f, 0x8a, 0x53, 0x99, 0xea, 0x5b,
+	0x53, 0x5d, 0xfc, 0x77, 0xd9, 0x94, 0x66, 0x42, 0xd2, 0xd1, 0x62, 0x7f, 0x86, 0xbc, 0x2b, 0x98,
+	0x7e, 0x20, 0x7c, 0xe6, 0x5c, 0x1e, 0x57, 0x1d, 0x09, 0x48, 0x96, 0x26, 0x04, 0xf2, 0x84, 0x26,
+	0x3c, 0xb5, 0xeb, 0x49, 0xcb, 0x2b, 0x96, 0x09, 0xb5, 0xea, 0x7d, 0xec, 0xd4, 0xca, 0xc9, 0x77,
+	0xcb, 0x1a, 0xbf, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x3d, 0x87, 0x5d, 0x54, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -399,35 +435,3 @@ var _ResultStoreFileDownload_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/devtools/resultstore/v2/resultstore_file_download.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_file_download.proto", fileDescriptor_resultstore_file_download_ebcc3d1484fcd68b)
-}
-
-var fileDescriptor_resultstore_file_download_ebcc3d1484fcd68b = []byte{
-	// 384 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xc1, 0x4a, 0xe3, 0x40,
-	0x18, 0x26, 0xed, 0xb2, 0x4b, 0xa7, 0xcb, 0x6e, 0x99, 0x65, 0x69, 0x28, 0xdb, 0xb5, 0x04, 0x84,
-	0xda, 0xc3, 0x8c, 0xa4, 0x47, 0xd1, 0x83, 0x88, 0x22, 0x08, 0x4a, 0xf4, 0xe4, 0x25, 0x4c, 0xcd,
-	0x24, 0x0c, 0x4c, 0xf3, 0xa7, 0x99, 0x49, 0x3d, 0x48, 0x2f, 0x1e, 0x7c, 0x01, 0xf1, 0x65, 0x7c,
-	0x0d, 0x5f, 0xc1, 0x07, 0x91, 0x99, 0x44, 0x49, 0x0f, 0xd5, 0x7a, 0xf0, 0x36, 0xff, 0x37, 0xff,
-	0xf7, 0xfd, 0x5f, 0xbe, 0xfc, 0x83, 0xf6, 0x12, 0x80, 0x44, 0x72, 0x1a, 0xf1, 0xb9, 0x06, 0x90,
-	0x8a, 0xe6, 0x5c, 0x15, 0x52, 0x2b, 0x0d, 0x39, 0xa7, 0x73, 0xbf, 0x5e, 0x86, 0xb1, 0x90, 0x3c,
-	0x8c, 0xe0, 0x3a, 0x95, 0xc0, 0x22, 0x92, 0xe5, 0xa0, 0x01, 0xff, 0x2f, 0xf9, 0xe4, 0x95, 0x4f,
-	0x6a, 0x04, 0x32, 0xf7, 0x7b, 0xff, 0x2a, 0x7d, 0x96, 0x09, 0xca, 0xd2, 0x14, 0x34, 0xd3, 0x02,
-	0x52, 0x55, 0xb2, 0xbd, 0x09, 0xfa, 0x75, 0xc4, 0xf5, 0xa1, 0x90, 0x3c, 0xe0, 0xb3, 0x82, 0x2b,
-	0x8d, 0x3b, 0xa8, 0x59, 0xe4, 0xc2, 0x75, 0x06, 0xce, 0xb0, 0x15, 0x98, 0x23, 0xde, 0x40, 0xed,
-	0x9c, 0xb3, 0x28, 0x84, 0x38, 0x56, 0x5c, 0xbb, 0x8d, 0x81, 0x33, 0x6c, 0x06, 0xc8, 0x40, 0xa7,
-	0x16, 0xc1, 0x7d, 0x64, 0xab, 0x50, 0x8a, 0xa9, 0xd0, 0x6e, 0xd3, 0xde, 0xb7, 0x0c, 0x72, 0x62,
-	0x00, 0x6f, 0x13, 0xfd, 0x7e, 0x9b, 0xa1, 0x32, 0x48, 0x15, 0xc7, 0x18, 0x7d, 0x8b, 0x98, 0x66,
-	0x76, 0xca, 0xcf, 0xc0, 0x9e, 0xbd, 0x18, 0xe1, 0xaa, 0xed, 0x82, 0x09, 0xf9, 0x75, 0x76, 0xb6,
-	0xd0, 0x9f, 0xa5, 0x39, 0xab, 0x2d, 0xf9, 0x8f, 0x0d, 0xd4, 0x0d, 0x6c, 0x9c, 0xe7, 0x26, 0x4e,
-	0xc3, 0x39, 0xa8, 0xd2, 0xc7, 0x77, 0x0e, 0xfa, 0x51, 0xe9, 0x60, 0x42, 0xde, 0xff, 0x09, 0x64,
-	0x39, 0xe3, 0x1e, 0x5d, 0xbb, 0xbf, 0x34, 0xe7, 0xb9, 0xb7, 0x4f, 0xcf, 0xf7, 0x0d, 0x8c, 0x3b,
-	0x66, 0x23, 0x6e, 0x8a, 0x5c, 0xec, 0x9a, 0x55, 0xa0, 0xa3, 0xc5, 0xb6, 0x83, 0x1f, 0x1c, 0xd4,
-	0xae, 0x7d, 0x10, 0xf6, 0xd7, 0x14, 0xaf, 0xa5, 0xdc, 0x1b, 0x7f, 0x8a, 0x53, 0x99, 0xea, 0x5b,
-	0x53, 0x5d, 0xfc, 0x77, 0xd9, 0x94, 0x66, 0x42, 0xd2, 0xd1, 0x62, 0x7f, 0x86, 0xbc, 0x2b, 0x98,
-	0x7e, 0x20, 0x7c, 0xe6, 0x5c, 0x1e, 0x57, 0x1d, 0x09, 0x48, 0x96, 0x26, 0x04, 0xf2, 0x84, 0x26,
-	0x3c, 0xb5, 0xeb, 0x49, 0xcb, 0x2b, 0x96, 0x09, 0xb5, 0xea, 0x7d, 0xec, 0xd4, 0xca, 0xc9, 0x77,
-	0xcb, 0x1a, 0xbf, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x3d, 0x87, 0x5d, 0x54, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/resultstore/v2/resultstore_upload.pb.go b/googleapis/devtools/resultstore/v2/resultstore_upload.pb.go
index 8a3f950d45..fb38034343 100644
--- a/googleapis/devtools/resultstore/v2/resultstore_upload.pb.go
+++ b/googleapis/devtools/resultstore/v2/resultstore_upload.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/resultstore_upload.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package resultstore
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request passed into CreateInvocation
 type CreateInvocationRequest struct {
@@ -68,16 +68,17 @@ func (m *CreateInvocationRequest) Reset()         { *m = CreateInvocationRequest
 func (m *CreateInvocationRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateInvocationRequest) ProtoMessage()    {}
 func (*CreateInvocationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{0}
+	return fileDescriptor_3c379de3a2f884aa, []int{0}
 }
+
 func (m *CreateInvocationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInvocationRequest.Unmarshal(m, b)
 }
 func (m *CreateInvocationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInvocationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateInvocationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInvocationRequest.Merge(dst, src)
+func (m *CreateInvocationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInvocationRequest.Merge(m, src)
 }
 func (m *CreateInvocationRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateInvocationRequest.Size(m)
@@ -142,16 +143,17 @@ func (m *UpdateInvocationRequest) Reset()         { *m = UpdateInvocationRequest
 func (m *UpdateInvocationRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateInvocationRequest) ProtoMessage()    {}
 func (*UpdateInvocationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{1}
+	return fileDescriptor_3c379de3a2f884aa, []int{1}
 }
+
 func (m *UpdateInvocationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateInvocationRequest.Unmarshal(m, b)
 }
 func (m *UpdateInvocationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateInvocationRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateInvocationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateInvocationRequest.Merge(dst, src)
+func (m *UpdateInvocationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInvocationRequest.Merge(m, src)
 }
 func (m *UpdateInvocationRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateInvocationRequest.Size(m)
@@ -200,16 +202,17 @@ func (m *FinishInvocationRequest) Reset()         { *m = FinishInvocationRequest
 func (m *FinishInvocationRequest) String() string { return proto.CompactTextString(m) }
 func (*FinishInvocationRequest) ProtoMessage()    {}
 func (*FinishInvocationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{2}
+	return fileDescriptor_3c379de3a2f884aa, []int{2}
 }
+
 func (m *FinishInvocationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinishInvocationRequest.Unmarshal(m, b)
 }
 func (m *FinishInvocationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinishInvocationRequest.Marshal(b, m, deterministic)
 }
-func (dst *FinishInvocationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinishInvocationRequest.Merge(dst, src)
+func (m *FinishInvocationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinishInvocationRequest.Merge(m, src)
 }
 func (m *FinishInvocationRequest) XXX_Size() int {
 	return xxx_messageInfo_FinishInvocationRequest.Size(m)
@@ -250,16 +253,17 @@ func (m *FinishInvocationResponse) Reset()         { *m = FinishInvocationRespon
 func (m *FinishInvocationResponse) String() string { return proto.CompactTextString(m) }
 func (*FinishInvocationResponse) ProtoMessage()    {}
 func (*FinishInvocationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{3}
+	return fileDescriptor_3c379de3a2f884aa, []int{3}
 }
+
 func (m *FinishInvocationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinishInvocationResponse.Unmarshal(m, b)
 }
 func (m *FinishInvocationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinishInvocationResponse.Marshal(b, m, deterministic)
 }
-func (dst *FinishInvocationResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinishInvocationResponse.Merge(dst, src)
+func (m *FinishInvocationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinishInvocationResponse.Merge(m, src)
 }
 func (m *FinishInvocationResponse) XXX_Size() int {
 	return xxx_messageInfo_FinishInvocationResponse.Size(m)
@@ -313,16 +317,17 @@ func (m *CreateTargetRequest) Reset()         { *m = CreateTargetRequest{} }
 func (m *CreateTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTargetRequest) ProtoMessage()    {}
 func (*CreateTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{4}
+	return fileDescriptor_3c379de3a2f884aa, []int{4}
 }
+
 func (m *CreateTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTargetRequest.Unmarshal(m, b)
 }
 func (m *CreateTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTargetRequest.Merge(dst, src)
+func (m *CreateTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTargetRequest.Merge(m, src)
 }
 func (m *CreateTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTargetRequest.Size(m)
@@ -387,16 +392,17 @@ func (m *UpdateTargetRequest) Reset()         { *m = UpdateTargetRequest{} }
 func (m *UpdateTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateTargetRequest) ProtoMessage()    {}
 func (*UpdateTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{5}
+	return fileDescriptor_3c379de3a2f884aa, []int{5}
 }
+
 func (m *UpdateTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateTargetRequest.Unmarshal(m, b)
 }
 func (m *UpdateTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateTargetRequest.Merge(dst, src)
+func (m *UpdateTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTargetRequest.Merge(m, src)
 }
 func (m *UpdateTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateTargetRequest.Size(m)
@@ -445,16 +451,17 @@ func (m *FinishTargetRequest) Reset()         { *m = FinishTargetRequest{} }
 func (m *FinishTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*FinishTargetRequest) ProtoMessage()    {}
 func (*FinishTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{6}
+	return fileDescriptor_3c379de3a2f884aa, []int{6}
 }
+
 func (m *FinishTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinishTargetRequest.Unmarshal(m, b)
 }
 func (m *FinishTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinishTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *FinishTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinishTargetRequest.Merge(dst, src)
+func (m *FinishTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinishTargetRequest.Merge(m, src)
 }
 func (m *FinishTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_FinishTargetRequest.Size(m)
@@ -495,16 +502,17 @@ func (m *FinishTargetResponse) Reset()         { *m = FinishTargetResponse{} }
 func (m *FinishTargetResponse) String() string { return proto.CompactTextString(m) }
 func (*FinishTargetResponse) ProtoMessage()    {}
 func (*FinishTargetResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{7}
+	return fileDescriptor_3c379de3a2f884aa, []int{7}
 }
+
 func (m *FinishTargetResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinishTargetResponse.Unmarshal(m, b)
 }
 func (m *FinishTargetResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinishTargetResponse.Marshal(b, m, deterministic)
 }
-func (dst *FinishTargetResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinishTargetResponse.Merge(dst, src)
+func (m *FinishTargetResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinishTargetResponse.Merge(m, src)
 }
 func (m *FinishTargetResponse) XXX_Size() int {
 	return xxx_messageInfo_FinishTargetResponse.Size(m)
@@ -559,16 +567,17 @@ func (m *CreateConfiguredTargetRequest) Reset()         { *m = CreateConfiguredT
 func (m *CreateConfiguredTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateConfiguredTargetRequest) ProtoMessage()    {}
 func (*CreateConfiguredTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{8}
+	return fileDescriptor_3c379de3a2f884aa, []int{8}
 }
+
 func (m *CreateConfiguredTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateConfiguredTargetRequest.Unmarshal(m, b)
 }
 func (m *CreateConfiguredTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateConfiguredTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateConfiguredTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateConfiguredTargetRequest.Merge(dst, src)
+func (m *CreateConfiguredTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateConfiguredTargetRequest.Merge(m, src)
 }
 func (m *CreateConfiguredTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateConfiguredTargetRequest.Size(m)
@@ -634,16 +643,17 @@ func (m *UpdateConfiguredTargetRequest) Reset()         { *m = UpdateConfiguredT
 func (m *UpdateConfiguredTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateConfiguredTargetRequest) ProtoMessage()    {}
 func (*UpdateConfiguredTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{9}
+	return fileDescriptor_3c379de3a2f884aa, []int{9}
 }
+
 func (m *UpdateConfiguredTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateConfiguredTargetRequest.Unmarshal(m, b)
 }
 func (m *UpdateConfiguredTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateConfiguredTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateConfiguredTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateConfiguredTargetRequest.Merge(dst, src)
+func (m *UpdateConfiguredTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateConfiguredTargetRequest.Merge(m, src)
 }
 func (m *UpdateConfiguredTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateConfiguredTargetRequest.Size(m)
@@ -692,16 +702,17 @@ func (m *FinishConfiguredTargetRequest) Reset()         { *m = FinishConfiguredT
 func (m *FinishConfiguredTargetRequest) String() string { return proto.CompactTextString(m) }
 func (*FinishConfiguredTargetRequest) ProtoMessage()    {}
 func (*FinishConfiguredTargetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{10}
+	return fileDescriptor_3c379de3a2f884aa, []int{10}
 }
+
 func (m *FinishConfiguredTargetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinishConfiguredTargetRequest.Unmarshal(m, b)
 }
 func (m *FinishConfiguredTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinishConfiguredTargetRequest.Marshal(b, m, deterministic)
 }
-func (dst *FinishConfiguredTargetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinishConfiguredTargetRequest.Merge(dst, src)
+func (m *FinishConfiguredTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinishConfiguredTargetRequest.Merge(m, src)
 }
 func (m *FinishConfiguredTargetRequest) XXX_Size() int {
 	return xxx_messageInfo_FinishConfiguredTargetRequest.Size(m)
@@ -742,16 +753,17 @@ func (m *FinishConfiguredTargetResponse) Reset()         { *m = FinishConfigured
 func (m *FinishConfiguredTargetResponse) String() string { return proto.CompactTextString(m) }
 func (*FinishConfiguredTargetResponse) ProtoMessage()    {}
 func (*FinishConfiguredTargetResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{11}
+	return fileDescriptor_3c379de3a2f884aa, []int{11}
 }
+
 func (m *FinishConfiguredTargetResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FinishConfiguredTargetResponse.Unmarshal(m, b)
 }
 func (m *FinishConfiguredTargetResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FinishConfiguredTargetResponse.Marshal(b, m, deterministic)
 }
-func (dst *FinishConfiguredTargetResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FinishConfiguredTargetResponse.Merge(dst, src)
+func (m *FinishConfiguredTargetResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FinishConfiguredTargetResponse.Merge(m, src)
 }
 func (m *FinishConfiguredTargetResponse) XXX_Size() int {
 	return xxx_messageInfo_FinishConfiguredTargetResponse.Size(m)
@@ -806,16 +818,17 @@ func (m *CreateActionRequest) Reset()         { *m = CreateActionRequest{} }
 func (m *CreateActionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateActionRequest) ProtoMessage()    {}
 func (*CreateActionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{12}
+	return fileDescriptor_3c379de3a2f884aa, []int{12}
 }
+
 func (m *CreateActionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateActionRequest.Unmarshal(m, b)
 }
 func (m *CreateActionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateActionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateActionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateActionRequest.Merge(dst, src)
+func (m *CreateActionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateActionRequest.Merge(m, src)
 }
 func (m *CreateActionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateActionRequest.Size(m)
@@ -881,16 +894,17 @@ func (m *UpdateActionRequest) Reset()         { *m = UpdateActionRequest{} }
 func (m *UpdateActionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateActionRequest) ProtoMessage()    {}
 func (*UpdateActionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{13}
+	return fileDescriptor_3c379de3a2f884aa, []int{13}
 }
+
 func (m *UpdateActionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateActionRequest.Unmarshal(m, b)
 }
 func (m *UpdateActionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateActionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateActionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateActionRequest.Merge(dst, src)
+func (m *UpdateActionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateActionRequest.Merge(m, src)
 }
 func (m *UpdateActionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateActionRequest.Size(m)
@@ -952,16 +966,17 @@ func (m *CreateConfigurationRequest) Reset()         { *m = CreateConfigurationR
 func (m *CreateConfigurationRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateConfigurationRequest) ProtoMessage()    {}
 func (*CreateConfigurationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{14}
+	return fileDescriptor_3c379de3a2f884aa, []int{14}
 }
+
 func (m *CreateConfigurationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateConfigurationRequest.Unmarshal(m, b)
 }
 func (m *CreateConfigurationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateConfigurationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateConfigurationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateConfigurationRequest.Merge(dst, src)
+func (m *CreateConfigurationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateConfigurationRequest.Merge(m, src)
 }
 func (m *CreateConfigurationRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateConfigurationRequest.Size(m)
@@ -1026,16 +1041,17 @@ func (m *UpdateConfigurationRequest) Reset()         { *m = UpdateConfigurationR
 func (m *UpdateConfigurationRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateConfigurationRequest) ProtoMessage()    {}
 func (*UpdateConfigurationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{15}
+	return fileDescriptor_3c379de3a2f884aa, []int{15}
 }
+
 func (m *UpdateConfigurationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateConfigurationRequest.Unmarshal(m, b)
 }
 func (m *UpdateConfigurationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateConfigurationRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateConfigurationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateConfigurationRequest.Merge(dst, src)
+func (m *UpdateConfigurationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateConfigurationRequest.Merge(m, src)
 }
 func (m *UpdateConfigurationRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateConfigurationRequest.Size(m)
@@ -1095,16 +1111,17 @@ func (m *CreateFileSetRequest) Reset()         { *m = CreateFileSetRequest{} }
 func (m *CreateFileSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateFileSetRequest) ProtoMessage()    {}
 func (*CreateFileSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{16}
+	return fileDescriptor_3c379de3a2f884aa, []int{16}
 }
+
 func (m *CreateFileSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateFileSetRequest.Unmarshal(m, b)
 }
 func (m *CreateFileSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateFileSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateFileSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateFileSetRequest.Merge(dst, src)
+func (m *CreateFileSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateFileSetRequest.Merge(m, src)
 }
 func (m *CreateFileSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateFileSetRequest.Size(m)
@@ -1169,16 +1186,17 @@ func (m *UpdateFileSetRequest) Reset()         { *m = UpdateFileSetRequest{} }
 func (m *UpdateFileSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateFileSetRequest) ProtoMessage()    {}
 func (*UpdateFileSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resultstore_upload_c44d7b55c8a904a0, []int{17}
+	return fileDescriptor_3c379de3a2f884aa, []int{17}
 }
+
 func (m *UpdateFileSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateFileSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateFileSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateFileSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateFileSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateFileSetRequest.Merge(dst, src)
+func (m *UpdateFileSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFileSetRequest.Merge(m, src)
 }
 func (m *UpdateFileSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateFileSetRequest.Size(m)
@@ -1231,6 +1249,99 @@ func init() {
 	proto.RegisterType((*UpdateFileSetRequest)(nil), "google.devtools.resultstore.v2.UpdateFileSetRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_upload.proto", fileDescriptor_3c379de3a2f884aa)
+}
+
+var fileDescriptor_3c379de3a2f884aa = []byte{
+	// 1348 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x99, 0xcf, 0x6f, 0xdc, 0x44,
+	0x14, 0xc7, 0x35, 0xbb, 0x6d, 0x69, 0x5e, 0x12, 0x48, 0x27, 0x51, 0x12, 0x19, 0x92, 0x46, 0x0e,
+	0x82, 0x26, 0x34, 0xeb, 0xe2, 0x84, 0xa6, 0xdd, 0x2a, 0x11, 0x4d, 0x50, 0xda, 0x2d, 0x42, 0x6a,
+	0x37, 0xa9, 0x90, 0x2a, 0x95, 0x95, 0xbb, 0x9e, 0xdd, 0x5a, 0xd9, 0xb5, 0xb7, 0x6b, 0x6f, 0x24,
+	0x40, 0x5c, 0xe0, 0x4f, 0xe0, 0x8a, 0x04, 0x17, 0x38, 0xf2, 0x43, 0xe2, 0x86, 0x38, 0xc1, 0x01,
+	0xce, 0xbd, 0x21, 0x24, 0x04, 0xe2, 0x88, 0x38, 0x72, 0x46, 0x9e, 0x19, 0xef, 0xce, 0xf8, 0xc7,
+	0xda, 0xde, 0xae, 0x72, 0xb3, 0xbd, 0xf3, 0xec, 0xcf, 0x77, 0xde, 0xd7, 0x33, 0xef, 0x79, 0x61,
+	0xbb, 0xe9, 0x38, 0xcd, 0x16, 0xd1, 0x4c, 0x72, 0xe2, 0x39, 0x4e, 0xcb, 0xd5, 0xba, 0xc4, 0xed,
+	0xb5, 0x3c, 0xd7, 0x73, 0xba, 0x44, 0x3b, 0xd1, 0xc5, 0xd3, 0x5a, 0xaf, 0xd3, 0x72, 0x0c, 0xb3,
+	0xd4, 0xe9, 0x3a, 0x9e, 0x83, 0x97, 0x59, 0x60, 0x29, 0x08, 0x2c, 0x09, 0x23, 0x4b, 0x27, 0xba,
+	0xf2, 0x12, 0xbf, 0xb1, 0xd1, 0xb1, 0x34, 0xc3, 0xb6, 0x1d, 0xcf, 0xf0, 0x2c, 0xc7, 0x76, 0x59,
+	0xb4, 0xf2, 0x5a, 0xca, 0x63, 0x8d, 0xba, 0x3f, 0x9a, 0x0f, 0xd6, 0x53, 0x06, 0xd7, 0x1d, 0xbb,
+	0x61, 0x35, 0x7b, 0x5d, 0x43, 0x88, 0xb9, 0x9a, 0x31, 0x86, 0x98, 0x35, 0xcf, 0xe8, 0x36, 0x89,
+	0xc7, 0xe3, 0x36, 0x52, 0xe2, 0x1a, 0x56, 0x8b, 0xd4, 0xdc, 0xfe, 0x70, 0x2d, 0x65, 0xb8, 0x65,
+	0x9f, 0x38, 0x75, 0x91, 0x2b, 0x4d, 0xb8, 0x04, 0xb3, 0xc2, 0x07, 0xd3, 0xb3, 0x47, 0xbd, 0x86,
+	0xd6, 0xb0, 0x48, 0xcb, 0xac, 0xb5, 0x0d, 0xf7, 0x98, 0x8f, 0xb8, 0x18, 0x1e, 0xe1, 0x59, 0x6d,
+	0xe2, 0x7a, 0x46, 0xbb, 0xc3, 0x06, 0xa8, 0x5f, 0x14, 0x60, 0x61, 0xbf, 0x4b, 0x0c, 0x8f, 0x54,
+	0xfa, 0x28, 0x55, 0xf2, 0xa4, 0x47, 0x5c, 0x0f, 0x2f, 0x01, 0x74, 0xd9, 0x61, 0xcd, 0x32, 0x17,
+	0xd1, 0x0a, 0xba, 0x34, 0x51, 0x9d, 0xe0, 0x57, 0x2a, 0x26, 0x5e, 0x85, 0xe9, 0x01, 0xbe, 0x3f,
+	0xa2, 0x40, 0x47, 0x4c, 0x0d, 0x2e, 0x56, 0x4c, 0x7c, 0x07, 0x60, 0x70, 0xbe, 0x58, 0x5c, 0x41,
+	0x97, 0x26, 0xf5, 0xf5, 0xd2, 0x70, 0x6f, 0x94, 0x04, 0x14, 0x21, 0x1a, 0x6b, 0x30, 0x6b, 0xf4,
+	0xbc, 0xc7, 0x4e, 0xd7, 0xfa, 0x80, 0x3d, 0xd3, 0x73, 0x8e, 0x89, 0xbd, 0x78, 0x86, 0x3e, 0x16,
+	0x4b, 0x3f, 0x1d, 0xf9, 0xbf, 0xe0, 0xb7, 0x60, 0xc6, 0xe8, 0x79, 0x4e, 0xad, 0x61, 0xd9, 0x96,
+	0xfb, 0xb8, 0xe6, 0x6b, 0x5f, 0x3c, 0x4b, 0x11, 0x94, 0x00, 0x21, 0x98, 0x98, 0xd2, 0x51, 0x30,
+	0x31, 0xd5, 0xe7, 0xfd, 0x98, 0x03, 0x1a, 0xe2, 0x5f, 0x54, 0x9f, 0x22, 0x58, 0xb8, 0xdf, 0x31,
+	0x63, 0xa7, 0x68, 0x9c, 0xf2, 0x6e, 0xc0, 0x64, 0x8f, 0x3e, 0x86, 0x26, 0x90, 0xca, 0x8a, 0x03,
+	0x3d, 0xf0, 0x73, 0xfc, 0x8e, 0xe1, 0x1e, 0x57, 0x81, 0x0d, 0xf7, 0x8f, 0x93, 0xe6, 0xe6, 0x6c,
+	0xd2, 0xdc, 0xa8, 0xef, 0xc1, 0x02, 0xd3, 0x18, 0x15, 0x85, 0xe1, 0x8c, 0x6d, 0xb4, 0x09, 0xcf,
+	0x38, 0x3d, 0x4e, 0xba, 0x7f, 0x31, 0xf1, 0xfe, 0x6d, 0x58, 0x8c, 0xde, 0xdf, 0xed, 0x38, 0xb6,
+	0x4b, 0x62, 0x1f, 0xb0, 0x03, 0x05, 0x6e, 0xa1, 0x49, 0x7d, 0x23, 0xfb, 0x0c, 0x96, 0x2a, 0x66,
+	0xb5, 0x60, 0x99, 0xea, 0x6f, 0x08, 0x66, 0x99, 0x8f, 0x8f, 0xe8, 0x1b, 0x92, 0xd1, 0xc3, 0xf3,
+	0x70, 0xae, 0x63, 0x74, 0x89, 0xed, 0x71, 0xf3, 0xf2, 0x33, 0xfc, 0x22, 0x4c, 0xb0, 0x37, 0xcd,
+	0x8f, 0x62, 0x22, 0xcf, 0xb3, 0x0b, 0x15, 0x13, 0xef, 0xc2, 0x39, 0x76, 0xcc, 0x73, 0xf4, 0x4a,
+	0x1a, 0x2e, 0x47, 0xe2, 0x51, 0xf9, 0x73, 0xf5, 0x13, 0x82, 0x59, 0xe6, 0x40, 0x59, 0xdc, 0x00,
+	0xa4, 0x38, 0x12, 0xc8, 0xe9, 0x3a, 0xee, 0x01, 0xcc, 0xf2, 0xb7, 0x4a, 0x12, 0x31, 0x16, 0xb7,
+	0x11, 0x98, 0x93, 0xef, 0x3d, 0xc4, 0x69, 0xd7, 0x05, 0xa7, 0xad, 0x65, 0x9b, 0xb1, 0xc0, 0x65,
+	0x9f, 0x14, 0x60, 0x89, 0xb9, 0x6c, 0xbf, 0xbf, 0x3f, 0x8c, 0xcb, 0x6f, 0x6c, 0xc7, 0x11, 0xfc,
+	0xc6, 0x2e, 0x54, 0x4c, 0xfc, 0x10, 0x2e, 0x44, 0xb6, 0x23, 0x9e, 0xac, 0x2b, 0x69, 0xfc, 0x11,
+	0xce, 0x99, 0x7a, 0xe8, 0x4a, 0xfe, 0x44, 0xfe, 0x83, 0x60, 0x89, 0xd9, 0x31, 0x69, 0x16, 0x62,
+	0x89, 0x8b, 0x63, 0x23, 0x3e, 0x5d, 0xdf, 0x9a, 0xb0, 0xc4, 0xbc, 0x95, 0xa4, 0x76, 0x2c, 0x0e,
+	0x7e, 0x1f, 0x96, 0x93, 0x9e, 0x32, 0xc4, 0xcb, 0xfb, 0x82, 0x97, 0x37, 0xf3, 0xce, 0x6c, 0x74,
+	0xed, 0xbc, 0x59, 0xcf, 0xb1, 0xff, 0x0f, 0xf1, 0x32, 0x2b, 0xcf, 0x04, 0x2f, 0xb3, 0x0b, 0x6c,
+	0xed, 0x64, 0xc7, 0x59, 0xd7, 0x4e, 0x8e, 0xc4, 0xa3, 0x9e, 0x65, 0xed, 0x94, 0xc5, 0x0d, 0x40,
+	0x8a, 0x23, 0x81, 0x9c, 0xae, 0x07, 0xff, 0x43, 0xa0, 0xc8, 0x0b, 0x8f, 0x31, 0x9e, 0x4c, 0x25,
+	0xaf, 0x3a, 0x87, 0x30, 0x2d, 0x15, 0xce, 0x5c, 0xe2, 0x46, 0x56, 0x97, 0x31, 0x40, 0xf9, 0x1e,
+	0xf9, 0x85, 0xff, 0x81, 0x40, 0x91, 0xd7, 0x1a, 0x49, 0x78, 0x04, 0xb2, 0x38, 0x06, 0xc8, 0xd3,
+	0x4d, 0xed, 0x5f, 0x08, 0xe6, 0x58, 0x6a, 0x0f, 0xac, 0x16, 0x39, 0x7c, 0xe6, 0xad, 0x64, 0x19,
+	0x26, 0x83, 0x26, 0x64, 0x90, 0xd6, 0x89, 0x06, 0xbb, 0x77, 0xc5, 0xc4, 0x7b, 0x70, 0x3e, 0xf8,
+	0x9d, 0x4b, 0x7b, 0x35, 0x6d, 0xb6, 0x02, 0xb0, 0xe7, 0xf8, 0x5d, 0xf2, 0x8b, 0xfc, 0x05, 0xc1,
+	0x1c, 0x4b, 0x63, 0x48, 0xa4, 0x48, 0x83, 0x46, 0xa4, 0x09, 0xe5, 0xab, 0x30, 0x8e, 0x7c, 0x25,
+	0x2e, 0xd4, 0xfa, 0xf7, 0xf3, 0x70, 0xa1, 0x4a, 0x89, 0x0e, 0x7d, 0xa2, 0xfb, 0xb4, 0xe9, 0xc5,
+	0x9f, 0x21, 0x98, 0x09, 0xf7, 0x51, 0x78, 0x3b, 0xd5, 0x86, 0xf1, 0x9d, 0x97, 0x92, 0xa3, 0x85,
+	0x50, 0x57, 0x3f, 0x7e, 0xfa, 0xf7, 0xa7, 0x85, 0x25, 0xf5, 0x05, 0xb9, 0x9f, 0x74, 0xcb, 0x62,
+	0x6f, 0xf1, 0x2d, 0x82, 0x99, 0x70, 0x0f, 0x93, 0x8e, 0x97, 0xd0, 0xf5, 0xe4, 0xc2, 0xdb, 0xa6,
+	0x78, 0xaf, 0xeb, 0xab, 0x3e, 0xde, 0x87, 0x42, 0xbf, 0xeb, 0xef, 0x5f, 0x3b, 0x02, 0xaf, 0xb6,
+	0xfe, 0x91, 0x84, 0xfc, 0x1d, 0x82, 0x99, 0x70, 0x07, 0x91, 0x8e, 0x9c, 0xd0, 0xd3, 0x28, 0xd7,
+	0xf2, 0x07, 0xb2, 0x6d, 0x57, 0x5d, 0xa7, 0x02, 0x5e, 0x56, 0x2f, 0x52, 0x01, 0x71, 0xd4, 0xac,
+	0xbd, 0x2c, 0xa3, 0x75, 0xfc, 0x39, 0x82, 0x29, 0xb1, 0x0b, 0xc1, 0x9b, 0xd9, 0x1c, 0x20, 0xd5,
+	0x13, 0x4a, 0xc6, 0x32, 0x5e, 0xd5, 0x29, 0xd9, 0x65, 0x55, 0xa5, 0x64, 0xec, 0xf5, 0x0f, 0xb1,
+	0xf1, 0xef, 0x05, 0x6e, 0x39, 0x28, 0xf9, 0xbf, 0x42, 0x30, 0x25, 0xb6, 0x12, 0xe9, 0x84, 0x31,
+	0x8d, 0x47, 0x66, 0xc2, 0xeb, 0x94, 0x70, 0x53, 0x5f, 0xa3, 0x84, 0xfc, 0xdb, 0x45, 0x74, 0x0a,
+	0x03, 0x4a, 0x7f, 0x32, 0x03, 0xd0, 0x6f, 0x10, 0x4c, 0x89, 0x25, 0x7d, 0x3a, 0x68, 0x4c, 0x73,
+	0xa1, 0x6c, 0xe5, 0x0b, 0xe2, 0x29, 0xdf, 0xa2, 0xd8, 0x25, 0x75, 0x2d, 0x21, 0xe5, 0x22, 0xef,
+	0x20, 0xf9, 0xbf, 0x23, 0x98, 0x8f, 0x6f, 0x0e, 0xf0, 0x4e, 0x36, 0x1b, 0x24, 0x14, 0x98, 0x4a,
+	0xee, 0x9a, 0x59, 0xbd, 0x47, 0x15, 0xbc, 0xad, 0x5e, 0x4d, 0xb4, 0x86, 0xa0, 0x41, 0x0b, 0x17,
+	0xd8, 0x6e, 0x39, 0x5a, 0xbe, 0xe3, 0x7f, 0x11, 0xcc, 0xc7, 0x57, 0xfd, 0xe9, 0xf2, 0x86, 0x76,
+	0x0b, 0x23, 0xc8, 0xab, 0x53, 0x79, 0x0f, 0xf5, 0xdb, 0x54, 0x5e, 0xf4, 0x5b, 0xdd, 0xb0, 0x94,
+	0x45, 0xd5, 0xfa, 0x69, 0x8c, 0x11, 0xfc, 0x27, 0x82, 0xf9, 0xf8, 0x92, 0x3c, 0x5d, 0xf0, 0xd0,
+	0x86, 0x41, 0xd9, 0x1d, 0x35, 0x9c, 0xfb, 0xf3, 0x36, 0x95, 0xbf, 0xa7, 0xee, 0xa4, 0xfa, 0x33,
+	0x5e, 0xec, 0xc0, 0xb3, 0x3f, 0xf6, 0x17, 0x2c, 0x56, 0xde, 0x66, 0x5d, 0xb0, 0xa4, 0x5a, 0x5a,
+	0xc9, 0x58, 0x3b, 0xab, 0x77, 0x29, 0xf7, 0x1d, 0xf5, 0xcd, 0x0c, 0xae, 0x8c, 0x25, 0xe7, 0xdf,
+	0x7d, 0xdd, 0x72, 0x50, 0x85, 0xff, 0xdc, 0x5f, 0xce, 0xb2, 0xf2, 0xc7, 0xf4, 0x02, 0x99, 0xf9,
+	0xdf, 0xa5, 0xfc, 0xf7, 0xf4, 0x5b, 0x94, 0x9f, 0x7f, 0x83, 0xce, 0x3b, 0xfd, 0x81, 0x06, 0xba,
+	0xd8, 0x71, 0x19, 0x3f, 0xf4, 0x3b, 0x30, 0xa9, 0x30, 0xc5, 0xe5, 0x7c, 0xeb, 0x86, 0xb4, 0xe3,
+	0xe5, 0xab, 0x81, 0x83, 0xa5, 0x7a, 0xe8, 0x66, 0xc2, 0xd4, 0xb8, 0xe5, 0x50, 0xbd, 0xfc, 0x6b,
+	0xbf, 0xc5, 0xca, 0x49, 0x9f, 0x5c, 0xd8, 0xe7, 0xa5, 0xbf, 0x45, 0xe9, 0x6f, 0xea, 0x57, 0xa4,
+	0x05, 0x21, 0xa9, 0xd0, 0x08, 0x84, 0xf8, 0x29, 0x08, 0x69, 0xf9, 0x12, 0xc1, 0xb4, 0x54, 0x8d,
+	0xe3, 0xad, 0x6c, 0x39, 0x90, 0xeb, 0x5a, 0x25, 0x6b, 0x15, 0xab, 0xbe, 0x41, 0xc9, 0x35, 0x75,
+	0x75, 0xc8, 0xbc, 0xf3, 0x42, 0xd7, 0x2d, 0xf7, 0x6b, 0x65, 0xfc, 0x35, 0x82, 0x69, 0xa9, 0xa0,
+	0x4e, 0xe7, 0x8c, 0xab, 0xbf, 0xb3, 0x73, 0xee, 0x52, 0xce, 0x6b, 0xfa, 0x65, 0xca, 0xd9, 0xff,
+	0x9b, 0x23, 0x66, 0x72, 0x03, 0x5a, 0x7f, 0x76, 0xfb, 0xc0, 0x7b, 0x4f, 0x40, 0xad, 0x3b, 0xed,
+	0x94, 0xa7, 0xdd, 0x45, 0x0f, 0x2a, 0x7c, 0x44, 0xd3, 0x69, 0x19, 0x76, 0xb3, 0xe4, 0x74, 0x9b,
+	0x5a, 0x93, 0xd8, 0xb4, 0x88, 0xe7, 0x7f, 0xa6, 0x18, 0x1d, 0xcb, 0x4d, 0xfa, 0x7f, 0xe4, 0x86,
+	0x70, 0xfa, 0xe8, 0x1c, 0x8d, 0xda, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xa6, 0x1a, 0x3d,
+	0xc4, 0x1a, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -2102,96 +2213,3 @@ var _ResultStoreUpload_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/resultstore/v2/resultstore_upload.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_upload.proto", fileDescriptor_resultstore_upload_c44d7b55c8a904a0)
-}
-
-var fileDescriptor_resultstore_upload_c44d7b55c8a904a0 = []byte{
-	// 1348 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x99, 0xcf, 0x6f, 0xdc, 0x44,
-	0x14, 0xc7, 0x35, 0xbb, 0x6d, 0x69, 0x5e, 0x12, 0x48, 0x27, 0x51, 0x12, 0x19, 0x92, 0x46, 0x0e,
-	0x82, 0x26, 0x34, 0xeb, 0xe2, 0x84, 0xa6, 0xdd, 0x2a, 0x11, 0x4d, 0x50, 0xda, 0x2d, 0x42, 0x6a,
-	0x37, 0xa9, 0x90, 0x2a, 0x95, 0x95, 0xbb, 0x9e, 0xdd, 0x5a, 0xd9, 0xb5, 0xb7, 0x6b, 0x6f, 0x24,
-	0x40, 0x5c, 0xe0, 0x4f, 0xe0, 0x8a, 0x04, 0x17, 0x38, 0xf2, 0x43, 0xe2, 0x86, 0x38, 0xc1, 0x01,
-	0xce, 0xbd, 0x21, 0x24, 0x04, 0xe2, 0x88, 0x38, 0x72, 0x46, 0x9e, 0x19, 0xef, 0xce, 0xf8, 0xc7,
-	0xda, 0xde, 0xae, 0x72, 0xb3, 0xbd, 0xf3, 0xec, 0xcf, 0x77, 0xde, 0xd7, 0x33, 0xef, 0x79, 0x61,
-	0xbb, 0xe9, 0x38, 0xcd, 0x16, 0xd1, 0x4c, 0x72, 0xe2, 0x39, 0x4e, 0xcb, 0xd5, 0xba, 0xc4, 0xed,
-	0xb5, 0x3c, 0xd7, 0x73, 0xba, 0x44, 0x3b, 0xd1, 0xc5, 0xd3, 0x5a, 0xaf, 0xd3, 0x72, 0x0c, 0xb3,
-	0xd4, 0xe9, 0x3a, 0x9e, 0x83, 0x97, 0x59, 0x60, 0x29, 0x08, 0x2c, 0x09, 0x23, 0x4b, 0x27, 0xba,
-	0xf2, 0x12, 0xbf, 0xb1, 0xd1, 0xb1, 0x34, 0xc3, 0xb6, 0x1d, 0xcf, 0xf0, 0x2c, 0xc7, 0x76, 0x59,
-	0xb4, 0xf2, 0x5a, 0xca, 0x63, 0x8d, 0xba, 0x3f, 0x9a, 0x0f, 0xd6, 0x53, 0x06, 0xd7, 0x1d, 0xbb,
-	0x61, 0x35, 0x7b, 0x5d, 0x43, 0x88, 0xb9, 0x9a, 0x31, 0x86, 0x98, 0x35, 0xcf, 0xe8, 0x36, 0x89,
-	0xc7, 0xe3, 0x36, 0x52, 0xe2, 0x1a, 0x56, 0x8b, 0xd4, 0xdc, 0xfe, 0x70, 0x2d, 0x65, 0xb8, 0x65,
-	0x9f, 0x38, 0x75, 0x91, 0x2b, 0x4d, 0xb8, 0x04, 0xb3, 0xc2, 0x07, 0xd3, 0xb3, 0x47, 0xbd, 0x86,
-	0xd6, 0xb0, 0x48, 0xcb, 0xac, 0xb5, 0x0d, 0xf7, 0x98, 0x8f, 0xb8, 0x18, 0x1e, 0xe1, 0x59, 0x6d,
-	0xe2, 0x7a, 0x46, 0xbb, 0xc3, 0x06, 0xa8, 0x5f, 0x14, 0x60, 0x61, 0xbf, 0x4b, 0x0c, 0x8f, 0x54,
-	0xfa, 0x28, 0x55, 0xf2, 0xa4, 0x47, 0x5c, 0x0f, 0x2f, 0x01, 0x74, 0xd9, 0x61, 0xcd, 0x32, 0x17,
-	0xd1, 0x0a, 0xba, 0x34, 0x51, 0x9d, 0xe0, 0x57, 0x2a, 0x26, 0x5e, 0x85, 0xe9, 0x01, 0xbe, 0x3f,
-	0xa2, 0x40, 0x47, 0x4c, 0x0d, 0x2e, 0x56, 0x4c, 0x7c, 0x07, 0x60, 0x70, 0xbe, 0x58, 0x5c, 0x41,
-	0x97, 0x26, 0xf5, 0xf5, 0xd2, 0x70, 0x6f, 0x94, 0x04, 0x14, 0x21, 0x1a, 0x6b, 0x30, 0x6b, 0xf4,
-	0xbc, 0xc7, 0x4e, 0xd7, 0xfa, 0x80, 0x3d, 0xd3, 0x73, 0x8e, 0x89, 0xbd, 0x78, 0x86, 0x3e, 0x16,
-	0x4b, 0x3f, 0x1d, 0xf9, 0xbf, 0xe0, 0xb7, 0x60, 0xc6, 0xe8, 0x79, 0x4e, 0xad, 0x61, 0xd9, 0x96,
-	0xfb, 0xb8, 0xe6, 0x6b, 0x5f, 0x3c, 0x4b, 0x11, 0x94, 0x00, 0x21, 0x98, 0x98, 0xd2, 0x51, 0x30,
-	0x31, 0xd5, 0xe7, 0xfd, 0x98, 0x03, 0x1a, 0xe2, 0x5f, 0x54, 0x9f, 0x22, 0x58, 0xb8, 0xdf, 0x31,
-	0x63, 0xa7, 0x68, 0x9c, 0xf2, 0x6e, 0xc0, 0x64, 0x8f, 0x3e, 0x86, 0x26, 0x90, 0xca, 0x8a, 0x03,
-	0x3d, 0xf0, 0x73, 0xfc, 0x8e, 0xe1, 0x1e, 0x57, 0x81, 0x0d, 0xf7, 0x8f, 0x93, 0xe6, 0xe6, 0x6c,
-	0xd2, 0xdc, 0xa8, 0xef, 0xc1, 0x02, 0xd3, 0x18, 0x15, 0x85, 0xe1, 0x8c, 0x6d, 0xb4, 0x09, 0xcf,
-	0x38, 0x3d, 0x4e, 0xba, 0x7f, 0x31, 0xf1, 0xfe, 0x6d, 0x58, 0x8c, 0xde, 0xdf, 0xed, 0x38, 0xb6,
-	0x4b, 0x62, 0x1f, 0xb0, 0x03, 0x05, 0x6e, 0xa1, 0x49, 0x7d, 0x23, 0xfb, 0x0c, 0x96, 0x2a, 0x66,
-	0xb5, 0x60, 0x99, 0xea, 0x6f, 0x08, 0x66, 0x99, 0x8f, 0x8f, 0xe8, 0x1b, 0x92, 0xd1, 0xc3, 0xf3,
-	0x70, 0xae, 0x63, 0x74, 0x89, 0xed, 0x71, 0xf3, 0xf2, 0x33, 0xfc, 0x22, 0x4c, 0xb0, 0x37, 0xcd,
-	0x8f, 0x62, 0x22, 0xcf, 0xb3, 0x0b, 0x15, 0x13, 0xef, 0xc2, 0x39, 0x76, 0xcc, 0x73, 0xf4, 0x4a,
-	0x1a, 0x2e, 0x47, 0xe2, 0x51, 0xf9, 0x73, 0xf5, 0x13, 0x82, 0x59, 0xe6, 0x40, 0x59, 0xdc, 0x00,
-	0xa4, 0x38, 0x12, 0xc8, 0xe9, 0x3a, 0xee, 0x01, 0xcc, 0xf2, 0xb7, 0x4a, 0x12, 0x31, 0x16, 0xb7,
-	0x11, 0x98, 0x93, 0xef, 0x3d, 0xc4, 0x69, 0xd7, 0x05, 0xa7, 0xad, 0x65, 0x9b, 0xb1, 0xc0, 0x65,
-	0x9f, 0x14, 0x60, 0x89, 0xb9, 0x6c, 0xbf, 0xbf, 0x3f, 0x8c, 0xcb, 0x6f, 0x6c, 0xc7, 0x11, 0xfc,
-	0xc6, 0x2e, 0x54, 0x4c, 0xfc, 0x10, 0x2e, 0x44, 0xb6, 0x23, 0x9e, 0xac, 0x2b, 0x69, 0xfc, 0x11,
-	0xce, 0x99, 0x7a, 0xe8, 0x4a, 0xfe, 0x44, 0xfe, 0x83, 0x60, 0x89, 0xd9, 0x31, 0x69, 0x16, 0x62,
-	0x89, 0x8b, 0x63, 0x23, 0x3e, 0x5d, 0xdf, 0x9a, 0xb0, 0xc4, 0xbc, 0x95, 0xa4, 0x76, 0x2c, 0x0e,
-	0x7e, 0x1f, 0x96, 0x93, 0x9e, 0x32, 0xc4, 0xcb, 0xfb, 0x82, 0x97, 0x37, 0xf3, 0xce, 0x6c, 0x74,
-	0xed, 0xbc, 0x59, 0xcf, 0xb1, 0xff, 0x0f, 0xf1, 0x32, 0x2b, 0xcf, 0x04, 0x2f, 0xb3, 0x0b, 0x6c,
-	0xed, 0x64, 0xc7, 0x59, 0xd7, 0x4e, 0x8e, 0xc4, 0xa3, 0x9e, 0x65, 0xed, 0x94, 0xc5, 0x0d, 0x40,
-	0x8a, 0x23, 0x81, 0x9c, 0xae, 0x07, 0xff, 0x43, 0xa0, 0xc8, 0x0b, 0x8f, 0x31, 0x9e, 0x4c, 0x25,
-	0xaf, 0x3a, 0x87, 0x30, 0x2d, 0x15, 0xce, 0x5c, 0xe2, 0x46, 0x56, 0x97, 0x31, 0x40, 0xf9, 0x1e,
-	0xf9, 0x85, 0xff, 0x81, 0x40, 0x91, 0xd7, 0x1a, 0x49, 0x78, 0x04, 0xb2, 0x38, 0x06, 0xc8, 0xd3,
-	0x4d, 0xed, 0x5f, 0x08, 0xe6, 0x58, 0x6a, 0x0f, 0xac, 0x16, 0x39, 0x7c, 0xe6, 0xad, 0x64, 0x19,
-	0x26, 0x83, 0x26, 0x64, 0x90, 0xd6, 0x89, 0x06, 0xbb, 0x77, 0xc5, 0xc4, 0x7b, 0x70, 0x3e, 0xf8,
-	0x9d, 0x4b, 0x7b, 0x35, 0x6d, 0xb6, 0x02, 0xb0, 0xe7, 0xf8, 0x5d, 0xf2, 0x8b, 0xfc, 0x05, 0xc1,
-	0x1c, 0x4b, 0x63, 0x48, 0xa4, 0x48, 0x83, 0x46, 0xa4, 0x09, 0xe5, 0xab, 0x30, 0x8e, 0x7c, 0x25,
-	0x2e, 0xd4, 0xfa, 0xf7, 0xf3, 0x70, 0xa1, 0x4a, 0x89, 0x0e, 0x7d, 0xa2, 0xfb, 0xb4, 0xe9, 0xc5,
-	0x9f, 0x21, 0x98, 0x09, 0xf7, 0x51, 0x78, 0x3b, 0xd5, 0x86, 0xf1, 0x9d, 0x97, 0x92, 0xa3, 0x85,
-	0x50, 0x57, 0x3f, 0x7e, 0xfa, 0xf7, 0xa7, 0x85, 0x25, 0xf5, 0x05, 0xb9, 0x9f, 0x74, 0xcb, 0x62,
-	0x6f, 0xf1, 0x2d, 0x82, 0x99, 0x70, 0x0f, 0x93, 0x8e, 0x97, 0xd0, 0xf5, 0xe4, 0xc2, 0xdb, 0xa6,
-	0x78, 0xaf, 0xeb, 0xab, 0x3e, 0xde, 0x87, 0x42, 0xbf, 0xeb, 0xef, 0x5f, 0x3b, 0x02, 0xaf, 0xb6,
-	0xfe, 0x91, 0x84, 0xfc, 0x1d, 0x82, 0x99, 0x70, 0x07, 0x91, 0x8e, 0x9c, 0xd0, 0xd3, 0x28, 0xd7,
-	0xf2, 0x07, 0xb2, 0x6d, 0x57, 0x5d, 0xa7, 0x02, 0x5e, 0x56, 0x2f, 0x52, 0x01, 0x71, 0xd4, 0xac,
-	0xbd, 0x2c, 0xa3, 0x75, 0xfc, 0x39, 0x82, 0x29, 0xb1, 0x0b, 0xc1, 0x9b, 0xd9, 0x1c, 0x20, 0xd5,
-	0x13, 0x4a, 0xc6, 0x32, 0x5e, 0xd5, 0x29, 0xd9, 0x65, 0x55, 0xa5, 0x64, 0xec, 0xf5, 0x0f, 0xb1,
-	0xf1, 0xef, 0x05, 0x6e, 0x39, 0x28, 0xf9, 0xbf, 0x42, 0x30, 0x25, 0xb6, 0x12, 0xe9, 0x84, 0x31,
-	0x8d, 0x47, 0x66, 0xc2, 0xeb, 0x94, 0x70, 0x53, 0x5f, 0xa3, 0x84, 0xfc, 0xdb, 0x45, 0x74, 0x0a,
-	0x03, 0x4a, 0x7f, 0x32, 0x03, 0xd0, 0x6f, 0x10, 0x4c, 0x89, 0x25, 0x7d, 0x3a, 0x68, 0x4c, 0x73,
-	0xa1, 0x6c, 0xe5, 0x0b, 0xe2, 0x29, 0xdf, 0xa2, 0xd8, 0x25, 0x75, 0x2d, 0x21, 0xe5, 0x22, 0xef,
-	0x20, 0xf9, 0xbf, 0x23, 0x98, 0x8f, 0x6f, 0x0e, 0xf0, 0x4e, 0x36, 0x1b, 0x24, 0x14, 0x98, 0x4a,
-	0xee, 0x9a, 0x59, 0xbd, 0x47, 0x15, 0xbc, 0xad, 0x5e, 0x4d, 0xb4, 0x86, 0xa0, 0x41, 0x0b, 0x17,
-	0xd8, 0x6e, 0x39, 0x5a, 0xbe, 0xe3, 0x7f, 0x11, 0xcc, 0xc7, 0x57, 0xfd, 0xe9, 0xf2, 0x86, 0x76,
-	0x0b, 0x23, 0xc8, 0xab, 0x53, 0x79, 0x0f, 0xf5, 0xdb, 0x54, 0x5e, 0xf4, 0x5b, 0xdd, 0xb0, 0x94,
-	0x45, 0xd5, 0xfa, 0x69, 0x8c, 0x11, 0xfc, 0x27, 0x82, 0xf9, 0xf8, 0x92, 0x3c, 0x5d, 0xf0, 0xd0,
-	0x86, 0x41, 0xd9, 0x1d, 0x35, 0x9c, 0xfb, 0xf3, 0x36, 0x95, 0xbf, 0xa7, 0xee, 0xa4, 0xfa, 0x33,
-	0x5e, 0xec, 0xc0, 0xb3, 0x3f, 0xf6, 0x17, 0x2c, 0x56, 0xde, 0x66, 0x5d, 0xb0, 0xa4, 0x5a, 0x5a,
-	0xc9, 0x58, 0x3b, 0xab, 0x77, 0x29, 0xf7, 0x1d, 0xf5, 0xcd, 0x0c, 0xae, 0x8c, 0x25, 0xe7, 0xdf,
-	0x7d, 0xdd, 0x72, 0x50, 0x85, 0xff, 0xdc, 0x5f, 0xce, 0xb2, 0xf2, 0xc7, 0xf4, 0x02, 0x99, 0xf9,
-	0xdf, 0xa5, 0xfc, 0xf7, 0xf4, 0x5b, 0x94, 0x9f, 0x7f, 0x83, 0xce, 0x3b, 0xfd, 0x81, 0x06, 0xba,
-	0xd8, 0x71, 0x19, 0x3f, 0xf4, 0x3b, 0x30, 0xa9, 0x30, 0xc5, 0xe5, 0x7c, 0xeb, 0x86, 0xb4, 0xe3,
-	0xe5, 0xab, 0x81, 0x83, 0xa5, 0x7a, 0xe8, 0x66, 0xc2, 0xd4, 0xb8, 0xe5, 0x50, 0xbd, 0xfc, 0x6b,
-	0xbf, 0xc5, 0xca, 0x49, 0x9f, 0x5c, 0xd8, 0xe7, 0xa5, 0xbf, 0x45, 0xe9, 0x6f, 0xea, 0x57, 0xa4,
-	0x05, 0x21, 0xa9, 0xd0, 0x08, 0x84, 0xf8, 0x29, 0x08, 0x69, 0xf9, 0x12, 0xc1, 0xb4, 0x54, 0x8d,
-	0xe3, 0xad, 0x6c, 0x39, 0x90, 0xeb, 0x5a, 0x25, 0x6b, 0x15, 0xab, 0xbe, 0x41, 0xc9, 0x35, 0x75,
-	0x75, 0xc8, 0xbc, 0xf3, 0x42, 0xd7, 0x2d, 0xf7, 0x6b, 0x65, 0xfc, 0x35, 0x82, 0x69, 0xa9, 0xa0,
-	0x4e, 0xe7, 0x8c, 0xab, 0xbf, 0xb3, 0x73, 0xee, 0x52, 0xce, 0x6b, 0xfa, 0x65, 0xca, 0xd9, 0xff,
-	0x9b, 0x23, 0x66, 0x72, 0x03, 0x5a, 0x7f, 0x76, 0xfb, 0xc0, 0x7b, 0x4f, 0x40, 0xad, 0x3b, 0xed,
-	0x94, 0xa7, 0xdd, 0x45, 0x0f, 0x2a, 0x7c, 0x44, 0xd3, 0x69, 0x19, 0x76, 0xb3, 0xe4, 0x74, 0x9b,
-	0x5a, 0x93, 0xd8, 0xb4, 0x88, 0xe7, 0x7f, 0xa6, 0x18, 0x1d, 0xcb, 0x4d, 0xfa, 0x7f, 0xe4, 0x86,
-	0x70, 0xfa, 0xe8, 0x1c, 0x8d, 0xda, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xa6, 0x1a, 0x3d,
-	0xc4, 0x1a, 0x00, 0x00,
-}
diff --git a/googleapis/devtools/resultstore/v2/target.pb.go b/googleapis/devtools/resultstore/v2/target.pb.go
index a2085b88bf..58b17bc59a 100644
--- a/googleapis/devtools/resultstore/v2/target.pb.go
+++ b/googleapis/devtools/resultstore/v2/target.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/target.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // These correspond to the suffix of the rule name. Eg cc_test has type TEST.
 type TargetType int32
@@ -44,6 +47,7 @@ var TargetType_name = map[int32]string{
 	4: "PACKAGE",
 	5: "TEST",
 }
+
 var TargetType_value = map[string]int32{
 	"TARGET_TYPE_UNSPECIFIED": 0,
 	"APPLICATION":             1,
@@ -56,8 +60,9 @@ var TargetType_value = map[string]int32{
 func (x TargetType) String() string {
 	return proto.EnumName(TargetType_name, int32(x))
 }
+
 func (TargetType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_3c0ccbffe81e229a, []int{0}
+	return fileDescriptor_b4e9059e809e996c, []int{0}
 }
 
 // Indicates how big the user indicated the test action was.
@@ -86,6 +91,7 @@ var TestSize_name = map[int32]string{
 	4: "ENORMOUS",
 	5: "OTHER_SIZE",
 }
+
 var TestSize_value = map[string]int32{
 	"TEST_SIZE_UNSPECIFIED": 0,
 	"SMALL":                 1,
@@ -98,8 +104,9 @@ var TestSize_value = map[string]int32{
 func (x TestSize) String() string {
 	return proto.EnumName(TestSize_name, int32(x))
 }
+
 func (TestSize) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_target_3c0ccbffe81e229a, []int{1}
+	return fileDescriptor_b4e9059e809e996c, []int{1}
 }
 
 // Each Target represents data for a given target in a given Invocation.
@@ -142,16 +149,17 @@ func (m *Target) Reset()         { *m = Target{} }
 func (m *Target) String() string { return proto.CompactTextString(m) }
 func (*Target) ProtoMessage()    {}
 func (*Target) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_3c0ccbffe81e229a, []int{0}
+	return fileDescriptor_b4e9059e809e996c, []int{0}
 }
+
 func (m *Target) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target.Unmarshal(m, b)
 }
 func (m *Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target.Marshal(b, m, deterministic)
 }
-func (dst *Target) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target.Merge(dst, src)
+func (m *Target) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target.Merge(m, src)
 }
 func (m *Target) XXX_Size() int {
 	return xxx_messageInfo_Target.Size(m)
@@ -240,16 +248,17 @@ func (m *Target_Id) Reset()         { *m = Target_Id{} }
 func (m *Target_Id) String() string { return proto.CompactTextString(m) }
 func (*Target_Id) ProtoMessage()    {}
 func (*Target_Id) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_3c0ccbffe81e229a, []int{0, 0}
+	return fileDescriptor_b4e9059e809e996c, []int{0, 0}
 }
+
 func (m *Target_Id) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target_Id.Unmarshal(m, b)
 }
 func (m *Target_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target_Id.Marshal(b, m, deterministic)
 }
-func (dst *Target_Id) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target_Id.Merge(dst, src)
+func (m *Target_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_Id.Merge(m, src)
 }
 func (m *Target_Id) XXX_Size() int {
 	return xxx_messageInfo_Target_Id.Size(m)
@@ -295,16 +304,17 @@ func (m *TargetAttributes) Reset()         { *m = TargetAttributes{} }
 func (m *TargetAttributes) String() string { return proto.CompactTextString(m) }
 func (*TargetAttributes) ProtoMessage()    {}
 func (*TargetAttributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_3c0ccbffe81e229a, []int{1}
+	return fileDescriptor_b4e9059e809e996c, []int{1}
 }
+
 func (m *TargetAttributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetAttributes.Unmarshal(m, b)
 }
 func (m *TargetAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetAttributes.Marshal(b, m, deterministic)
 }
-func (dst *TargetAttributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetAttributes.Merge(dst, src)
+func (m *TargetAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetAttributes.Merge(m, src)
 }
 func (m *TargetAttributes) XXX_Size() int {
 	return xxx_messageInfo_TargetAttributes.Size(m)
@@ -349,16 +359,17 @@ func (m *TestAttributes) Reset()         { *m = TestAttributes{} }
 func (m *TestAttributes) String() string { return proto.CompactTextString(m) }
 func (*TestAttributes) ProtoMessage()    {}
 func (*TestAttributes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_target_3c0ccbffe81e229a, []int{2}
+	return fileDescriptor_b4e9059e809e996c, []int{2}
 }
+
 func (m *TestAttributes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestAttributes.Unmarshal(m, b)
 }
 func (m *TestAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestAttributes.Marshal(b, m, deterministic)
 }
-func (dst *TestAttributes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestAttributes.Merge(dst, src)
+func (m *TestAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestAttributes.Merge(m, src)
 }
 func (m *TestAttributes) XXX_Size() int {
 	return xxx_messageInfo_TestAttributes.Size(m)
@@ -377,19 +388,19 @@ func (m *TestAttributes) GetSize() TestSize {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.resultstore.v2.TargetType", TargetType_name, TargetType_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.TestSize", TestSize_name, TestSize_value)
 	proto.RegisterType((*Target)(nil), "google.devtools.resultstore.v2.Target")
 	proto.RegisterType((*Target_Id)(nil), "google.devtools.resultstore.v2.Target.Id")
 	proto.RegisterType((*TargetAttributes)(nil), "google.devtools.resultstore.v2.TargetAttributes")
 	proto.RegisterType((*TestAttributes)(nil), "google.devtools.resultstore.v2.TestAttributes")
-	proto.RegisterEnum("google.devtools.resultstore.v2.TargetType", TargetType_name, TargetType_value)
-	proto.RegisterEnum("google.devtools.resultstore.v2.TestSize", TestSize_name, TestSize_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/target.proto", fileDescriptor_target_3c0ccbffe81e229a)
+	proto.RegisterFile("google/devtools/resultstore/v2/target.proto", fileDescriptor_b4e9059e809e996c)
 }
 
-var fileDescriptor_target_3c0ccbffe81e229a = []byte{
+var fileDescriptor_b4e9059e809e996c = []byte{
 	// 628 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xed, 0x6a, 0xdb, 0x4a,
 	0x10, 0xbd, 0xb2, 0x65, 0x47, 0x1e, 0xe7, 0x3a, 0xba, 0x0b, 0x97, 0xaa, 0x09, 0x14, 0xe3, 0x96,
diff --git a/googleapis/devtools/resultstore/v2/test_suite.pb.go b/googleapis/devtools/resultstore/v2/test_suite.pb.go
index a04dfc70aa..c3334b7e0e 100644
--- a/googleapis/devtools/resultstore/v2/test_suite.pb.go
+++ b/googleapis/devtools/resultstore/v2/test_suite.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/resultstore/v2/test_suite.proto
 
-package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+package resultstore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The result of running a test case.
 type TestCase_Result int32
@@ -54,6 +57,7 @@ var TestCase_Result_name = map[int32]string{
 	5: "SKIPPED",
 	6: "SUPPRESSED",
 }
+
 var TestCase_Result_value = map[string]int32{
 	"RESULT_UNSPECIFIED": 0,
 	"COMPLETED":          1,
@@ -67,8 +71,9 @@ var TestCase_Result_value = map[string]int32{
 func (x TestCase_Result) String() string {
 	return proto.EnumName(TestCase_Result_name, int32(x))
 }
+
 func (TestCase_Result) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_suite_48f943d641146787, []int{2, 0}
+	return fileDescriptor_1eac8f04d5f129ff, []int{2, 0}
 }
 
 // The result of running a test suite, as reported in a <testsuite> element of
@@ -107,16 +112,17 @@ func (m *TestSuite) Reset()         { *m = TestSuite{} }
 func (m *TestSuite) String() string { return proto.CompactTextString(m) }
 func (*TestSuite) ProtoMessage()    {}
 func (*TestSuite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_suite_48f943d641146787, []int{0}
+	return fileDescriptor_1eac8f04d5f129ff, []int{0}
 }
+
 func (m *TestSuite) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestSuite.Unmarshal(m, b)
 }
 func (m *TestSuite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestSuite.Marshal(b, m, deterministic)
 }
-func (dst *TestSuite) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestSuite.Merge(dst, src)
+func (m *TestSuite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestSuite.Merge(m, src)
 }
 func (m *TestSuite) XXX_Size() int {
 	return xxx_messageInfo_TestSuite.Size(m)
@@ -194,16 +200,17 @@ func (m *Test) Reset()         { *m = Test{} }
 func (m *Test) String() string { return proto.CompactTextString(m) }
 func (*Test) ProtoMessage()    {}
 func (*Test) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_suite_48f943d641146787, []int{1}
+	return fileDescriptor_1eac8f04d5f129ff, []int{1}
 }
+
 func (m *Test) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Test.Unmarshal(m, b)
 }
 func (m *Test) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Test.Marshal(b, m, deterministic)
 }
-func (dst *Test) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Test.Merge(dst, src)
+func (m *Test) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Test.Merge(m, src)
 }
 func (m *Test) XXX_Size() int {
 	return xxx_messageInfo_Test.Size(m)
@@ -251,80 +258,14 @@ func (m *Test) GetTestSuite() *TestSuite {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Test) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Test_OneofMarshaler, _Test_OneofUnmarshaler, _Test_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Test) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Test_TestCase)(nil),
 		(*Test_TestSuite)(nil),
 	}
 }
 
-func _Test_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Test)
-	// test_type
-	switch x := m.TestType.(type) {
-	case *Test_TestCase:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TestCase); err != nil {
-			return err
-		}
-	case *Test_TestSuite:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TestSuite); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Test.TestType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Test_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Test)
-	switch tag {
-	case 1: // test_type.test_case
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TestCase)
-		err := b.DecodeMessage(msg)
-		m.TestType = &Test_TestCase{msg}
-		return true, err
-	case 2: // test_type.test_suite
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TestSuite)
-		err := b.DecodeMessage(msg)
-		m.TestType = &Test_TestSuite{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Test_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Test)
-	// test_type
-	switch x := m.TestType.(type) {
-	case *Test_TestCase:
-		s := proto.Size(x.TestCase)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Test_TestSuite:
-		s := proto.Size(x.TestSuite)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The result of running a test case, as reported in a <testcase> element of
 // an XML log.
 type TestCase struct {
@@ -363,16 +304,17 @@ func (m *TestCase) Reset()         { *m = TestCase{} }
 func (m *TestCase) String() string { return proto.CompactTextString(m) }
 func (*TestCase) ProtoMessage()    {}
 func (*TestCase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_suite_48f943d641146787, []int{2}
+	return fileDescriptor_1eac8f04d5f129ff, []int{2}
 }
+
 func (m *TestCase) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestCase.Unmarshal(m, b)
 }
 func (m *TestCase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestCase.Marshal(b, m, deterministic)
 }
-func (dst *TestCase) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestCase.Merge(dst, src)
+func (m *TestCase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestCase.Merge(m, src)
 }
 func (m *TestCase) XXX_Size() int {
 	return xxx_messageInfo_TestCase.Size(m)
@@ -477,16 +419,17 @@ func (m *TestFailure) Reset()         { *m = TestFailure{} }
 func (m *TestFailure) String() string { return proto.CompactTextString(m) }
 func (*TestFailure) ProtoMessage()    {}
 func (*TestFailure) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_suite_48f943d641146787, []int{3}
+	return fileDescriptor_1eac8f04d5f129ff, []int{3}
 }
+
 func (m *TestFailure) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestFailure.Unmarshal(m, b)
 }
 func (m *TestFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestFailure.Marshal(b, m, deterministic)
 }
-func (dst *TestFailure) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestFailure.Merge(dst, src)
+func (m *TestFailure) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestFailure.Merge(m, src)
 }
 func (m *TestFailure) XXX_Size() int {
 	return xxx_messageInfo_TestFailure.Size(m)
@@ -558,16 +501,17 @@ func (m *TestError) Reset()         { *m = TestError{} }
 func (m *TestError) String() string { return proto.CompactTextString(m) }
 func (*TestError) ProtoMessage()    {}
 func (*TestError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_suite_48f943d641146787, []int{4}
+	return fileDescriptor_1eac8f04d5f129ff, []int{4}
 }
+
 func (m *TestError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestError.Unmarshal(m, b)
 }
 func (m *TestError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestError.Marshal(b, m, deterministic)
 }
-func (dst *TestError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestError.Merge(dst, src)
+func (m *TestError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestError.Merge(m, src)
 }
 func (m *TestError) XXX_Size() int {
 	return xxx_messageInfo_TestError.Size(m)
@@ -600,19 +544,19 @@ func (m *TestError) GetStackTrace() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.resultstore.v2.TestCase_Result", TestCase_Result_name, TestCase_Result_value)
 	proto.RegisterType((*TestSuite)(nil), "google.devtools.resultstore.v2.TestSuite")
 	proto.RegisterType((*Test)(nil), "google.devtools.resultstore.v2.Test")
 	proto.RegisterType((*TestCase)(nil), "google.devtools.resultstore.v2.TestCase")
 	proto.RegisterType((*TestFailure)(nil), "google.devtools.resultstore.v2.TestFailure")
 	proto.RegisterType((*TestError)(nil), "google.devtools.resultstore.v2.TestError")
-	proto.RegisterEnum("google.devtools.resultstore.v2.TestCase_Result", TestCase_Result_name, TestCase_Result_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/resultstore/v2/test_suite.proto", fileDescriptor_test_suite_48f943d641146787)
+	proto.RegisterFile("google/devtools/resultstore/v2/test_suite.proto", fileDescriptor_1eac8f04d5f129ff)
 }
 
-var fileDescriptor_test_suite_48f943d641146787 = []byte{
+var fileDescriptor_1eac8f04d5f129ff = []byte{
 	// 671 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x5f, 0x6f, 0xd3, 0x3a,
 	0x18, 0xc6, 0x97, 0xb6, 0xcb, 0x92, 0x37, 0x5b, 0x57, 0xf9, 0x62, 0x8a, 0x76, 0xb4, 0x73, 0xaa,
diff --git a/googleapis/devtools/source/v1/source_context.pb.go b/googleapis/devtools/source/v1/source_context.pb.go
index 1e40993ab7..80f6630e27 100644
--- a/googleapis/devtools/source/v1/source_context.pb.go
+++ b/googleapis/devtools/source/v1/source_context.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/source/v1/source_context.proto
 
-package source // import "google.golang.org/genproto/googleapis/devtools/source/v1"
+package source
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of an Alias.
 type AliasContext_Kind int32
@@ -41,6 +44,7 @@ var AliasContext_Kind_name = map[int32]string{
 	2: "MOVABLE",
 	4: "OTHER",
 }
+
 var AliasContext_Kind_value = map[string]int32{
 	"ANY":     0,
 	"FIXED":   1,
@@ -51,8 +55,9 @@ var AliasContext_Kind_value = map[string]int32{
 func (x AliasContext_Kind) String() string {
 	return proto.EnumName(AliasContext_Kind_name, int32(x))
 }
+
 func (AliasContext_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{2, 0}
+	return fileDescriptor_abda43b4d0b03743, []int{2, 0}
 }
 
 // A SourceContext is a reference to a tree of files. A SourceContext together
@@ -75,16 +80,17 @@ func (m *SourceContext) Reset()         { *m = SourceContext{} }
 func (m *SourceContext) String() string { return proto.CompactTextString(m) }
 func (*SourceContext) ProtoMessage()    {}
 func (*SourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{0}
+	return fileDescriptor_abda43b4d0b03743, []int{0}
 }
+
 func (m *SourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceContext.Unmarshal(m, b)
 }
 func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
 }
-func (dst *SourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceContext.Merge(dst, src)
+func (m *SourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceContext.Merge(m, src)
 }
 func (m *SourceContext) XXX_Size() int {
 	return xxx_messageInfo_SourceContext.Size(m)
@@ -158,9 +164,9 @@ func (m *SourceContext) GetGit() *GitSourceContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SourceContext_OneofMarshaler, _SourceContext_OneofUnmarshaler, _SourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SourceContext_CloudRepo)(nil),
 		(*SourceContext_CloudWorkspace)(nil),
 		(*SourceContext_Gerrit)(nil),
@@ -168,108 +174,6 @@ func (*SourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 	}
 }
 
-func _SourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SourceContext)
-	// context
-	switch x := m.Context.(type) {
-	case *SourceContext_CloudRepo:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudRepo); err != nil {
-			return err
-		}
-	case *SourceContext_CloudWorkspace:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudWorkspace); err != nil {
-			return err
-		}
-	case *SourceContext_Gerrit:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Gerrit); err != nil {
-			return err
-		}
-	case *SourceContext_Git:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Git); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SourceContext.Context has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SourceContext)
-	switch tag {
-	case 1: // context.cloud_repo
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudRepoSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_CloudRepo{msg}
-		return true, err
-	case 2: // context.cloud_workspace
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudWorkspaceSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_CloudWorkspace{msg}
-		return true, err
-	case 3: // context.gerrit
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GerritSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_Gerrit{msg}
-		return true, err
-	case 6: // context.git
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GitSourceContext)
-		err := b.DecodeMessage(msg)
-		m.Context = &SourceContext_Git{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SourceContext)
-	// context
-	switch x := m.Context.(type) {
-	case *SourceContext_CloudRepo:
-		s := proto.Size(x.CloudRepo)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SourceContext_CloudWorkspace:
-		s := proto.Size(x.CloudWorkspace)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SourceContext_Gerrit:
-		s := proto.Size(x.Gerrit)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SourceContext_Git:
-		s := proto.Size(x.Git)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An ExtendedSourceContext is a SourceContext combined with additional
 // details describing the context.
 type ExtendedSourceContext struct {
@@ -286,16 +190,17 @@ func (m *ExtendedSourceContext) Reset()         { *m = ExtendedSourceContext{} }
 func (m *ExtendedSourceContext) String() string { return proto.CompactTextString(m) }
 func (*ExtendedSourceContext) ProtoMessage()    {}
 func (*ExtendedSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{1}
+	return fileDescriptor_abda43b4d0b03743, []int{1}
 }
+
 func (m *ExtendedSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtendedSourceContext.Unmarshal(m, b)
 }
 func (m *ExtendedSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExtendedSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *ExtendedSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtendedSourceContext.Merge(dst, src)
+func (m *ExtendedSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtendedSourceContext.Merge(m, src)
 }
 func (m *ExtendedSourceContext) XXX_Size() int {
 	return xxx_messageInfo_ExtendedSourceContext.Size(m)
@@ -335,16 +240,17 @@ func (m *AliasContext) Reset()         { *m = AliasContext{} }
 func (m *AliasContext) String() string { return proto.CompactTextString(m) }
 func (*AliasContext) ProtoMessage()    {}
 func (*AliasContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{2}
+	return fileDescriptor_abda43b4d0b03743, []int{2}
 }
+
 func (m *AliasContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AliasContext.Unmarshal(m, b)
 }
 func (m *AliasContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AliasContext.Marshal(b, m, deterministic)
 }
-func (dst *AliasContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AliasContext.Merge(dst, src)
+func (m *AliasContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AliasContext.Merge(m, src)
 }
 func (m *AliasContext) XXX_Size() int {
 	return xxx_messageInfo_AliasContext.Size(m)
@@ -391,16 +297,17 @@ func (m *CloudRepoSourceContext) Reset()         { *m = CloudRepoSourceContext{}
 func (m *CloudRepoSourceContext) String() string { return proto.CompactTextString(m) }
 func (*CloudRepoSourceContext) ProtoMessage()    {}
 func (*CloudRepoSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{3}
+	return fileDescriptor_abda43b4d0b03743, []int{3}
 }
+
 func (m *CloudRepoSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudRepoSourceContext.Unmarshal(m, b)
 }
 func (m *CloudRepoSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudRepoSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudRepoSourceContext.Merge(dst, src)
+func (m *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudRepoSourceContext.Merge(m, src)
 }
 func (m *CloudRepoSourceContext) XXX_Size() int {
 	return xxx_messageInfo_CloudRepoSourceContext.Size(m)
@@ -454,6 +361,7 @@ func (m *CloudRepoSourceContext) GetRevisionId() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (m *CloudRepoSourceContext) GetAliasName() string {
 	if x, ok := m.GetRevision().(*CloudRepoSourceContext_AliasName); ok {
 		return x.AliasName
@@ -468,91 +376,15 @@ func (m *CloudRepoSourceContext) GetAliasContext() *AliasContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CloudRepoSourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CloudRepoSourceContext_OneofMarshaler, _CloudRepoSourceContext_OneofUnmarshaler, _CloudRepoSourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CloudRepoSourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CloudRepoSourceContext_RevisionId)(nil),
 		(*CloudRepoSourceContext_AliasName)(nil),
 		(*CloudRepoSourceContext_AliasContext)(nil),
 	}
 }
 
-func _CloudRepoSourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CloudRepoSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *CloudRepoSourceContext_RevisionId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.RevisionId)
-	case *CloudRepoSourceContext_AliasName:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AliasName)
-	case *CloudRepoSourceContext_AliasContext:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AliasContext); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CloudRepoSourceContext.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CloudRepoSourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CloudRepoSourceContext)
-	switch tag {
-	case 2: // revision.revision_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &CloudRepoSourceContext_RevisionId{x}
-		return true, err
-	case 3: // revision.alias_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &CloudRepoSourceContext_AliasName{x}
-		return true, err
-	case 4: // revision.alias_context
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AliasContext)
-		err := b.DecodeMessage(msg)
-		m.Revision = &CloudRepoSourceContext_AliasContext{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CloudRepoSourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CloudRepoSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *CloudRepoSourceContext_RevisionId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RevisionId)))
-		n += len(x.RevisionId)
-	case *CloudRepoSourceContext_AliasName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AliasName)))
-		n += len(x.AliasName)
-	case *CloudRepoSourceContext_AliasContext:
-		s := proto.Size(x.AliasContext)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A CloudWorkspaceSourceContext denotes a workspace at a particular snapshot.
 type CloudWorkspaceSourceContext struct {
 	// The ID of the workspace.
@@ -569,16 +401,17 @@ func (m *CloudWorkspaceSourceContext) Reset()         { *m = CloudWorkspaceSourc
 func (m *CloudWorkspaceSourceContext) String() string { return proto.CompactTextString(m) }
 func (*CloudWorkspaceSourceContext) ProtoMessage()    {}
 func (*CloudWorkspaceSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{4}
+	return fileDescriptor_abda43b4d0b03743, []int{4}
 }
+
 func (m *CloudWorkspaceSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudWorkspaceSourceContext.Unmarshal(m, b)
 }
 func (m *CloudWorkspaceSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudWorkspaceSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *CloudWorkspaceSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudWorkspaceSourceContext.Merge(dst, src)
+func (m *CloudWorkspaceSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudWorkspaceSourceContext.Merge(m, src)
 }
 func (m *CloudWorkspaceSourceContext) XXX_Size() int {
 	return xxx_messageInfo_CloudWorkspaceSourceContext.Size(m)
@@ -628,16 +461,17 @@ func (m *GerritSourceContext) Reset()         { *m = GerritSourceContext{} }
 func (m *GerritSourceContext) String() string { return proto.CompactTextString(m) }
 func (*GerritSourceContext) ProtoMessage()    {}
 func (*GerritSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{5}
+	return fileDescriptor_abda43b4d0b03743, []int{5}
 }
+
 func (m *GerritSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GerritSourceContext.Unmarshal(m, b)
 }
 func (m *GerritSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GerritSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *GerritSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GerritSourceContext.Merge(dst, src)
+func (m *GerritSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GerritSourceContext.Merge(m, src)
 }
 func (m *GerritSourceContext) XXX_Size() int {
 	return xxx_messageInfo_GerritSourceContext.Size(m)
@@ -698,6 +532,7 @@ func (m *GerritSourceContext) GetRevisionId() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (m *GerritSourceContext) GetAliasName() string {
 	if x, ok := m.GetRevision().(*GerritSourceContext_AliasName); ok {
 		return x.AliasName
@@ -712,91 +547,15 @@ func (m *GerritSourceContext) GetAliasContext() *AliasContext {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GerritSourceContext) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GerritSourceContext_OneofMarshaler, _GerritSourceContext_OneofUnmarshaler, _GerritSourceContext_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GerritSourceContext) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GerritSourceContext_RevisionId)(nil),
 		(*GerritSourceContext_AliasName)(nil),
 		(*GerritSourceContext_AliasContext)(nil),
 	}
 }
 
-func _GerritSourceContext_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GerritSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *GerritSourceContext_RevisionId:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.RevisionId)
-	case *GerritSourceContext_AliasName:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AliasName)
-	case *GerritSourceContext_AliasContext:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AliasContext); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GerritSourceContext.Revision has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GerritSourceContext_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GerritSourceContext)
-	switch tag {
-	case 3: // revision.revision_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &GerritSourceContext_RevisionId{x}
-		return true, err
-	case 4: // revision.alias_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Revision = &GerritSourceContext_AliasName{x}
-		return true, err
-	case 5: // revision.alias_context
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AliasContext)
-		err := b.DecodeMessage(msg)
-		m.Revision = &GerritSourceContext_AliasContext{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GerritSourceContext_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GerritSourceContext)
-	// revision
-	switch x := m.Revision.(type) {
-	case *GerritSourceContext_RevisionId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.RevisionId)))
-		n += len(x.RevisionId)
-	case *GerritSourceContext_AliasName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AliasName)))
-		n += len(x.AliasName)
-	case *GerritSourceContext_AliasContext:
-		s := proto.Size(x.AliasContext)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A GitSourceContext denotes a particular revision in a third party Git
 // repository (e.g. GitHub).
 type GitSourceContext struct {
@@ -814,16 +573,17 @@ func (m *GitSourceContext) Reset()         { *m = GitSourceContext{} }
 func (m *GitSourceContext) String() string { return proto.CompactTextString(m) }
 func (*GitSourceContext) ProtoMessage()    {}
 func (*GitSourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{6}
+	return fileDescriptor_abda43b4d0b03743, []int{6}
 }
+
 func (m *GitSourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GitSourceContext.Unmarshal(m, b)
 }
 func (m *GitSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GitSourceContext.Marshal(b, m, deterministic)
 }
-func (dst *GitSourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GitSourceContext.Merge(dst, src)
+func (m *GitSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GitSourceContext.Merge(m, src)
 }
 func (m *GitSourceContext) XXX_Size() int {
 	return xxx_messageInfo_GitSourceContext.Size(m)
@@ -866,16 +626,17 @@ func (m *RepoId) Reset()         { *m = RepoId{} }
 func (m *RepoId) String() string { return proto.CompactTextString(m) }
 func (*RepoId) ProtoMessage()    {}
 func (*RepoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{7}
+	return fileDescriptor_abda43b4d0b03743, []int{7}
 }
+
 func (m *RepoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepoId.Unmarshal(m, b)
 }
 func (m *RepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepoId.Marshal(b, m, deterministic)
 }
-func (dst *RepoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepoId.Merge(dst, src)
+func (m *RepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoId.Merge(m, src)
 }
 func (m *RepoId) XXX_Size() int {
 	return xxx_messageInfo_RepoId.Size(m)
@@ -923,76 +684,14 @@ func (m *RepoId) GetUid() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RepoId) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RepoId_OneofMarshaler, _RepoId_OneofUnmarshaler, _RepoId_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RepoId) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RepoId_ProjectRepoId)(nil),
 		(*RepoId_Uid)(nil),
 	}
 }
 
-func _RepoId_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RepoId)
-	// id
-	switch x := m.Id.(type) {
-	case *RepoId_ProjectRepoId:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProjectRepoId); err != nil {
-			return err
-		}
-	case *RepoId_Uid:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uid)
-	case nil:
-	default:
-		return fmt.Errorf("RepoId.Id has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RepoId_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RepoId)
-	switch tag {
-	case 1: // id.project_repo_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ProjectRepoId)
-		err := b.DecodeMessage(msg)
-		m.Id = &RepoId_ProjectRepoId{msg}
-		return true, err
-	case 2: // id.uid
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Id = &RepoId_Uid{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RepoId_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RepoId)
-	// id
-	switch x := m.Id.(type) {
-	case *RepoId_ProjectRepoId:
-		s := proto.Size(x.ProjectRepoId)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RepoId_Uid:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Uid)))
-		n += len(x.Uid)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Selects a repo using a Google Cloud Platform project ID
 // (e.g. winged-cargo-31) and a repo name within that project.
 type ProjectRepoId struct {
@@ -1009,16 +708,17 @@ func (m *ProjectRepoId) Reset()         { *m = ProjectRepoId{} }
 func (m *ProjectRepoId) String() string { return proto.CompactTextString(m) }
 func (*ProjectRepoId) ProtoMessage()    {}
 func (*ProjectRepoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{8}
+	return fileDescriptor_abda43b4d0b03743, []int{8}
 }
+
 func (m *ProjectRepoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ProjectRepoId.Unmarshal(m, b)
 }
 func (m *ProjectRepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ProjectRepoId.Marshal(b, m, deterministic)
 }
-func (dst *ProjectRepoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ProjectRepoId.Merge(dst, src)
+func (m *ProjectRepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectRepoId.Merge(m, src)
 }
 func (m *ProjectRepoId) XXX_Size() int {
 	return xxx_messageInfo_ProjectRepoId.Size(m)
@@ -1061,16 +761,17 @@ func (m *CloudWorkspaceId) Reset()         { *m = CloudWorkspaceId{} }
 func (m *CloudWorkspaceId) String() string { return proto.CompactTextString(m) }
 func (*CloudWorkspaceId) ProtoMessage()    {}
 func (*CloudWorkspaceId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_95d7fc1394bb1b31, []int{9}
+	return fileDescriptor_abda43b4d0b03743, []int{9}
 }
+
 func (m *CloudWorkspaceId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudWorkspaceId.Unmarshal(m, b)
 }
 func (m *CloudWorkspaceId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudWorkspaceId.Marshal(b, m, deterministic)
 }
-func (dst *CloudWorkspaceId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudWorkspaceId.Merge(dst, src)
+func (m *CloudWorkspaceId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudWorkspaceId.Merge(m, src)
 }
 func (m *CloudWorkspaceId) XXX_Size() int {
 	return xxx_messageInfo_CloudWorkspaceId.Size(m)
@@ -1096,6 +797,7 @@ func (m *CloudWorkspaceId) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.devtools.source.v1.AliasContext_Kind", AliasContext_Kind_name, AliasContext_Kind_value)
 	proto.RegisterType((*SourceContext)(nil), "google.devtools.source.v1.SourceContext")
 	proto.RegisterType((*ExtendedSourceContext)(nil), "google.devtools.source.v1.ExtendedSourceContext")
 	proto.RegisterMapType((map[string]string)(nil), "google.devtools.source.v1.ExtendedSourceContext.LabelsEntry")
@@ -1107,14 +809,13 @@ func init() {
 	proto.RegisterType((*RepoId)(nil), "google.devtools.source.v1.RepoId")
 	proto.RegisterType((*ProjectRepoId)(nil), "google.devtools.source.v1.ProjectRepoId")
 	proto.RegisterType((*CloudWorkspaceId)(nil), "google.devtools.source.v1.CloudWorkspaceId")
-	proto.RegisterEnum("google.devtools.source.v1.AliasContext_Kind", AliasContext_Kind_name, AliasContext_Kind_value)
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/source/v1/source_context.proto", fileDescriptor_source_context_95d7fc1394bb1b31)
+	proto.RegisterFile("google/devtools/source/v1/source_context.proto", fileDescriptor_abda43b4d0b03743)
 }
 
-var fileDescriptor_source_context_95d7fc1394bb1b31 = []byte{
+var fileDescriptor_abda43b4d0b03743 = []byte{
 	// 809 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x4e, 0xdb, 0x4a,
 	0x14, 0x8e, 0x9d, 0x90, 0xe0, 0x13, 0x02, 0xd1, 0xdc, 0x1f, 0x05, 0xb8, 0x08, 0xf0, 0xd5, 0xd5,
diff --git a/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go b/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
index 796b102ee6..3cbdf6c57c 100644
--- a/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
+++ b/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/sourcerepo/v1/sourcerepo.proto
 
-package sourcerepo // import "google.golang.org/genproto/googleapis/devtools/sourcerepo/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+package sourcerepo
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A repository (or repo) is a Git repository storing versioned source content.
 type Repo struct {
@@ -50,16 +50,17 @@ func (m *Repo) Reset()         { *m = Repo{} }
 func (m *Repo) String() string { return proto.CompactTextString(m) }
 func (*Repo) ProtoMessage()    {}
 func (*Repo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sourcerepo_96faf75821b8b3a1, []int{0}
+	return fileDescriptor_0e2c2c58455430a2, []int{0}
 }
+
 func (m *Repo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Repo.Unmarshal(m, b)
 }
 func (m *Repo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Repo.Marshal(b, m, deterministic)
 }
-func (dst *Repo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Repo.Merge(dst, src)
+func (m *Repo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Repo.Merge(m, src)
 }
 func (m *Repo) XXX_Size() int {
 	return xxx_messageInfo_Repo.Size(m)
@@ -121,16 +122,17 @@ func (m *MirrorConfig) Reset()         { *m = MirrorConfig{} }
 func (m *MirrorConfig) String() string { return proto.CompactTextString(m) }
 func (*MirrorConfig) ProtoMessage()    {}
 func (*MirrorConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sourcerepo_96faf75821b8b3a1, []int{1}
+	return fileDescriptor_0e2c2c58455430a2, []int{1}
 }
+
 func (m *MirrorConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MirrorConfig.Unmarshal(m, b)
 }
 func (m *MirrorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MirrorConfig.Marshal(b, m, deterministic)
 }
-func (dst *MirrorConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MirrorConfig.Merge(dst, src)
+func (m *MirrorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MirrorConfig.Merge(m, src)
 }
 func (m *MirrorConfig) XXX_Size() int {
 	return xxx_messageInfo_MirrorConfig.Size(m)
@@ -176,16 +178,17 @@ func (m *GetRepoRequest) Reset()         { *m = GetRepoRequest{} }
 func (m *GetRepoRequest) String() string { return proto.CompactTextString(m) }
 func (*GetRepoRequest) ProtoMessage()    {}
 func (*GetRepoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sourcerepo_96faf75821b8b3a1, []int{2}
+	return fileDescriptor_0e2c2c58455430a2, []int{2}
 }
+
 func (m *GetRepoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetRepoRequest.Unmarshal(m, b)
 }
 func (m *GetRepoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetRepoRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetRepoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetRepoRequest.Merge(dst, src)
+func (m *GetRepoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetRepoRequest.Merge(m, src)
 }
 func (m *GetRepoRequest) XXX_Size() int {
 	return xxx_messageInfo_GetRepoRequest.Size(m)
@@ -224,16 +227,17 @@ func (m *ListReposRequest) Reset()         { *m = ListReposRequest{} }
 func (m *ListReposRequest) String() string { return proto.CompactTextString(m) }
 func (*ListReposRequest) ProtoMessage()    {}
 func (*ListReposRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sourcerepo_96faf75821b8b3a1, []int{3}
+	return fileDescriptor_0e2c2c58455430a2, []int{3}
 }
+
 func (m *ListReposRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReposRequest.Unmarshal(m, b)
 }
 func (m *ListReposRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReposRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListReposRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReposRequest.Merge(dst, src)
+func (m *ListReposRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReposRequest.Merge(m, src)
 }
 func (m *ListReposRequest) XXX_Size() int {
 	return xxx_messageInfo_ListReposRequest.Size(m)
@@ -282,16 +286,17 @@ func (m *ListReposResponse) Reset()         { *m = ListReposResponse{} }
 func (m *ListReposResponse) String() string { return proto.CompactTextString(m) }
 func (*ListReposResponse) ProtoMessage()    {}
 func (*ListReposResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sourcerepo_96faf75821b8b3a1, []int{4}
+	return fileDescriptor_0e2c2c58455430a2, []int{4}
 }
+
 func (m *ListReposResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListReposResponse.Unmarshal(m, b)
 }
 func (m *ListReposResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListReposResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListReposResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListReposResponse.Merge(dst, src)
+func (m *ListReposResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReposResponse.Merge(m, src)
 }
 func (m *ListReposResponse) XXX_Size() int {
 	return xxx_messageInfo_ListReposResponse.Size(m)
@@ -333,16 +338,17 @@ func (m *CreateRepoRequest) Reset()         { *m = CreateRepoRequest{} }
 func (m *CreateRepoRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateRepoRequest) ProtoMessage()    {}
 func (*CreateRepoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sourcerepo_96faf75821b8b3a1, []int{5}
+	return fileDescriptor_0e2c2c58455430a2, []int{5}
 }
+
 func (m *CreateRepoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateRepoRequest.Unmarshal(m, b)
 }
 func (m *CreateRepoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateRepoRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateRepoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateRepoRequest.Merge(dst, src)
+func (m *CreateRepoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateRepoRequest.Merge(m, src)
 }
 func (m *CreateRepoRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateRepoRequest.Size(m)
@@ -381,16 +387,17 @@ func (m *DeleteRepoRequest) Reset()         { *m = DeleteRepoRequest{} }
 func (m *DeleteRepoRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteRepoRequest) ProtoMessage()    {}
 func (*DeleteRepoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sourcerepo_96faf75821b8b3a1, []int{6}
+	return fileDescriptor_0e2c2c58455430a2, []int{6}
 }
+
 func (m *DeleteRepoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteRepoRequest.Unmarshal(m, b)
 }
 func (m *DeleteRepoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteRepoRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteRepoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteRepoRequest.Merge(dst, src)
+func (m *DeleteRepoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteRepoRequest.Merge(m, src)
 }
 func (m *DeleteRepoRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteRepoRequest.Size(m)
@@ -418,6 +425,61 @@ func init() {
 	proto.RegisterType((*DeleteRepoRequest)(nil), "google.devtools.sourcerepo.v1.DeleteRepoRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/devtools/sourcerepo/v1/sourcerepo.proto", fileDescriptor_0e2c2c58455430a2)
+}
+
+var fileDescriptor_0e2c2c58455430a2 = []byte{
+	// 743 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xd3, 0x4a,
+	0x10, 0xd5, 0x36, 0x69, 0x7b, 0x33, 0x4d, 0x6f, 0xdb, 0x95, 0x6e, 0x15, 0xa5, 0x37, 0x55, 0xae,
+	0x7b, 0x29, 0x21, 0x15, 0x36, 0x2d, 0xa0, 0x8a, 0x20, 0x24, 0xd4, 0x82, 0xa2, 0x0a, 0x90, 0xa2,
+	0xb4, 0x4f, 0xbc, 0x44, 0x4e, 0x32, 0x35, 0xa6, 0xb6, 0xd7, 0x78, 0x37, 0x81, 0x80, 0x0a, 0x52,
+	0xa5, 0xbe, 0x23, 0xfa, 0x19, 0x7c, 0x0e, 0xbf, 0xc0, 0x47, 0xf0, 0x88, 0x76, 0x6d, 0x37, 0x4e,
+	0x13, 0x12, 0xbf, 0xed, 0xce, 0x9c, 0x99, 0x73, 0xf6, 0xec, 0x78, 0x0d, 0xba, 0xc5, 0x98, 0xe5,
+	0xa0, 0xd1, 0xc5, 0xbe, 0x60, 0xcc, 0xe1, 0x06, 0x67, 0xbd, 0xa0, 0x83, 0x01, 0xfa, 0xcc, 0xe8,
+	0xef, 0x26, 0x76, 0xba, 0x1f, 0x30, 0xc1, 0x68, 0x29, 0xc4, 0xeb, 0x31, 0x5e, 0x4f, 0x20, 0xfa,
+	0xbb, 0xc5, 0x7f, 0xa3, 0x76, 0xa6, 0x6f, 0x1b, 0xa6, 0xe7, 0x31, 0x61, 0x0a, 0x9b, 0x79, 0x3c,
+	0x2c, 0x2e, 0x6e, 0x46, 0x59, 0xdb, 0x74, 0x65, 0x73, 0xdb, 0x74, 0x5b, 0x3e, 0x73, 0xec, 0xce,
+	0x20, 0xca, 0x17, 0x47, 0xf3, 0x23, 0xb9, 0x8d, 0x28, 0xa7, 0x76, 0xed, 0xde, 0xa9, 0x81, 0xae,
+	0x2f, 0xa2, 0xa4, 0xf6, 0x8d, 0x40, 0xb6, 0x89, 0x3e, 0xa3, 0x14, 0xb2, 0x9e, 0xe9, 0x62, 0x81,
+	0x94, 0x49, 0x25, 0xd7, 0x54, 0x6b, 0x19, 0xe3, 0xf6, 0x47, 0x2c, 0xcc, 0x95, 0x49, 0x25, 0xd3,
+	0x54, 0x6b, 0xba, 0x0a, 0x99, 0x5e, 0xe0, 0x14, 0x32, 0x0a, 0x26, 0x97, 0xb4, 0x01, 0xcb, 0xae,
+	0x1d, 0x04, 0x2c, 0x68, 0x75, 0x98, 0x77, 0x6a, 0x5b, 0x85, 0x6c, 0x99, 0x54, 0x96, 0xf6, 0x76,
+	0xf4, 0xa9, 0x07, 0xd6, 0x5f, 0xa9, 0x9a, 0x43, 0x55, 0xd2, 0xcc, 0xbb, 0x89, 0x9d, 0xd6, 0x81,
+	0x7c, 0x32, 0x1b, 0x73, 0x92, 0x21, 0x67, 0x09, 0xe0, 0x3d, 0xb6, 0xdf, 0x30, 0x76, 0xd6, 0xb2,
+	0xbb, 0x4a, 0x5f, 0xae, 0x99, 0x8b, 0x22, 0x47, 0x5d, 0xaa, 0xc1, 0x72, 0x17, 0x7d, 0x87, 0x0d,
+	0x5a, 0x67, 0x38, 0x90, 0x88, 0x50, 0xee, 0x52, 0x18, 0x7c, 0x81, 0x83, 0xa3, 0xae, 0xf6, 0x3f,
+	0xfc, 0x5d, 0x47, 0x21, 0xcf, 0xde, 0xc4, 0x77, 0x3d, 0xe4, 0x62, 0x92, 0x05, 0x5a, 0x1b, 0x56,
+	0x5f, 0xda, 0x5c, 0xc1, 0xf8, 0x14, 0x1c, 0xdd, 0x80, 0x9c, 0x6f, 0x5a, 0xd8, 0xba, 0xf6, 0x6b,
+	0xbe, 0xf9, 0x97, 0x0c, 0x1c, 0x4b, 0xcf, 0x4a, 0x00, 0x2a, 0x29, 0xd8, 0x19, 0x7a, 0x91, 0x16,
+	0x05, 0x3f, 0x91, 0x01, 0xad, 0x0f, 0x6b, 0x09, 0x0e, 0xee, 0x33, 0x8f, 0x23, 0x7d, 0x04, 0xf3,
+	0xd2, 0x29, 0x5e, 0x20, 0xe5, 0x4c, 0x65, 0x69, 0x6f, 0x6b, 0x86, 0x9b, 0xea, 0x1c, 0x61, 0x05,
+	0xdd, 0x86, 0x15, 0x0f, 0x3f, 0x88, 0x56, 0x82, 0x33, 0x74, 0x68, 0x59, 0x86, 0x1b, 0xd7, 0xbc,
+	0x5d, 0x58, 0x3b, 0x0c, 0xd0, 0x14, 0x98, 0x34, 0x61, 0x1d, 0x16, 0x7c, 0x33, 0x40, 0x4f, 0x44,
+	0xc7, 0x8b, 0x76, 0x74, 0x1f, 0xb2, 0xb2, 0xbb, 0xea, 0x94, 0x52, 0x8e, 0x2a, 0xd0, 0x6e, 0xc3,
+	0xda, 0x33, 0x74, 0x70, 0x94, 0x65, 0x82, 0x85, 0x7b, 0xbf, 0x16, 0x01, 0x8e, 0x55, 0x17, 0x35,
+	0x90, 0x57, 0x04, 0x72, 0xd7, 0xb6, 0x50, 0x63, 0x06, 0xe1, 0xcd, 0x4b, 0x2a, 0xde, 0x4b, 0x5f,
+	0x10, 0x3a, 0xae, 0x6d, 0x5d, 0xfc, 0xf8, 0x79, 0x35, 0x57, 0xa2, 0x1b, 0xf2, 0x0b, 0xfa, 0x24,
+	0x25, 0x3d, 0xf1, 0x03, 0xf6, 0x16, 0x3b, 0x82, 0x1b, 0xd5, 0x73, 0x23, 0xf4, 0xf6, 0x92, 0xc0,
+	0x62, 0x34, 0x36, 0xf4, 0xee, 0x0c, 0x8a, 0xd1, 0xf1, 0x2a, 0xa6, 0xf1, 0x4c, 0xdb, 0x56, 0x22,
+	0xca, 0x74, 0x73, 0x92, 0x88, 0x50, 0x83, 0x51, 0xad, 0x9e, 0xd3, 0xaf, 0x04, 0x60, 0x78, 0x79,
+	0x74, 0xd6, 0x69, 0xc7, 0xee, 0x39, 0x9d, 0x9a, 0x1d, 0xa5, 0xe6, 0x96, 0x56, 0x52, 0x6a, 0xc2,
+	0x49, 0x18, 0x37, 0xa5, 0xa6, 0x2e, 0x9a, 0x7e, 0x06, 0x18, 0x5e, 0xf4, 0x4c, 0x45, 0x63, 0x33,
+	0x51, 0x5c, 0x8f, 0x2b, 0xe2, 0x87, 0x4a, 0x7f, 0x2e, 0x1f, 0xaa, 0xd8, 0x92, 0xea, 0x2c, 0x4b,
+	0x2e, 0x09, 0xe4, 0x8f, 0x51, 0x1c, 0x99, 0x6e, 0x43, 0x3d, 0x7f, 0x54, 0x8b, 0x1b, 0xda, 0xa6,
+	0x2b, 0x29, 0x93, 0xc9, 0x98, 0xf4, 0x9f, 0x1b, 0x98, 0x30, 0xab, 0xd5, 0x14, 0xe7, 0x03, 0xcd,
+	0x50, 0x9c, 0x01, 0x86, 0xda, 0x27, 0xf2, 0xd6, 0x78, 0xa2, 0x6d, 0x8d, 0x54, 0xe9, 0x05, 0x81,
+	0x7c, 0x7d, 0x9a, 0x8e, 0x7a, 0x7a, 0x1d, 0xfb, 0x4a, 0xc7, 0x2e, 0x4d, 0xa3, 0xc3, 0x4a, 0x72,
+	0x7e, 0x27, 0x40, 0x4f, 0x90, 0xab, 0x08, 0x06, 0xae, 0xcd, 0xb9, 0xfc, 0x9b, 0xd0, 0xca, 0x0d,
+	0x9a, 0x71, 0x48, 0x2c, 0xe8, 0x4e, 0x0a, 0x64, 0xf4, 0xe1, 0x3c, 0x55, 0x22, 0x6b, 0xda, 0xc3,
+	0x14, 0x22, 0xc5, 0x58, 0x9b, 0x1a, 0xa9, 0x1e, 0x7c, 0x81, 0xff, 0x3a, 0xcc, 0x9d, 0x3e, 0x31,
+	0x07, 0x2b, 0xc3, 0xc7, 0xa1, 0x21, 0x27, 0xa4, 0x41, 0x5e, 0xd7, 0xa3, 0x0a, 0x8b, 0x39, 0xa6,
+	0x67, 0xe9, 0x2c, 0xb0, 0x0c, 0x0b, 0x3d, 0x35, 0x3f, 0x46, 0x98, 0x32, 0x7d, 0x9b, 0xff, 0xe1,
+	0x17, 0xfd, 0x78, 0xb8, 0x6b, 0x2f, 0xa8, 0x9a, 0xfb, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x31,
+	0x75, 0x14, 0x03, 0xd5, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -719,58 +781,3 @@ var _SourceRepo_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/sourcerepo/v1/sourcerepo.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/devtools/sourcerepo/v1/sourcerepo.proto", fileDescriptor_sourcerepo_96faf75821b8b3a1)
-}
-
-var fileDescriptor_sourcerepo_96faf75821b8b3a1 = []byte{
-	// 743 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xd3, 0x4a,
-	0x10, 0xd5, 0x36, 0x69, 0x7b, 0x33, 0x4d, 0x6f, 0xdb, 0x95, 0x6e, 0x15, 0xa5, 0x37, 0x55, 0xae,
-	0x7b, 0x29, 0x21, 0x15, 0x36, 0x2d, 0xa0, 0x8a, 0x20, 0x24, 0xd4, 0x82, 0xa2, 0x0a, 0x90, 0xa2,
-	0xb4, 0x4f, 0xbc, 0x44, 0x4e, 0x32, 0x35, 0xa6, 0xb6, 0xd7, 0x78, 0x37, 0x81, 0x80, 0x0a, 0x52,
-	0xa5, 0xbe, 0x23, 0xfa, 0x19, 0x7c, 0x0e, 0xbf, 0xc0, 0x47, 0xf0, 0x88, 0x76, 0x6d, 0x37, 0x4e,
-	0x13, 0x12, 0xbf, 0xed, 0xce, 0x9c, 0x99, 0x73, 0xf6, 0xec, 0x78, 0x0d, 0xba, 0xc5, 0x98, 0xe5,
-	0xa0, 0xd1, 0xc5, 0xbe, 0x60, 0xcc, 0xe1, 0x06, 0x67, 0xbd, 0xa0, 0x83, 0x01, 0xfa, 0xcc, 0xe8,
-	0xef, 0x26, 0x76, 0xba, 0x1f, 0x30, 0xc1, 0x68, 0x29, 0xc4, 0xeb, 0x31, 0x5e, 0x4f, 0x20, 0xfa,
-	0xbb, 0xc5, 0x7f, 0xa3, 0x76, 0xa6, 0x6f, 0x1b, 0xa6, 0xe7, 0x31, 0x61, 0x0a, 0x9b, 0x79, 0x3c,
-	0x2c, 0x2e, 0x6e, 0x46, 0x59, 0xdb, 0x74, 0x65, 0x73, 0xdb, 0x74, 0x5b, 0x3e, 0x73, 0xec, 0xce,
-	0x20, 0xca, 0x17, 0x47, 0xf3, 0x23, 0xb9, 0x8d, 0x28, 0xa7, 0x76, 0xed, 0xde, 0xa9, 0x81, 0xae,
-	0x2f, 0xa2, 0xa4, 0xf6, 0x8d, 0x40, 0xb6, 0x89, 0x3e, 0xa3, 0x14, 0xb2, 0x9e, 0xe9, 0x62, 0x81,
-	0x94, 0x49, 0x25, 0xd7, 0x54, 0x6b, 0x19, 0xe3, 0xf6, 0x47, 0x2c, 0xcc, 0x95, 0x49, 0x25, 0xd3,
-	0x54, 0x6b, 0xba, 0x0a, 0x99, 0x5e, 0xe0, 0x14, 0x32, 0x0a, 0x26, 0x97, 0xb4, 0x01, 0xcb, 0xae,
-	0x1d, 0x04, 0x2c, 0x68, 0x75, 0x98, 0x77, 0x6a, 0x5b, 0x85, 0x6c, 0x99, 0x54, 0x96, 0xf6, 0x76,
-	0xf4, 0xa9, 0x07, 0xd6, 0x5f, 0xa9, 0x9a, 0x43, 0x55, 0xd2, 0xcc, 0xbb, 0x89, 0x9d, 0xd6, 0x81,
-	0x7c, 0x32, 0x1b, 0x73, 0x92, 0x21, 0x67, 0x09, 0xe0, 0x3d, 0xb6, 0xdf, 0x30, 0x76, 0xd6, 0xb2,
-	0xbb, 0x4a, 0x5f, 0xae, 0x99, 0x8b, 0x22, 0x47, 0x5d, 0xaa, 0xc1, 0x72, 0x17, 0x7d, 0x87, 0x0d,
-	0x5a, 0x67, 0x38, 0x90, 0x88, 0x50, 0xee, 0x52, 0x18, 0x7c, 0x81, 0x83, 0xa3, 0xae, 0xf6, 0x3f,
-	0xfc, 0x5d, 0x47, 0x21, 0xcf, 0xde, 0xc4, 0x77, 0x3d, 0xe4, 0x62, 0x92, 0x05, 0x5a, 0x1b, 0x56,
-	0x5f, 0xda, 0x5c, 0xc1, 0xf8, 0x14, 0x1c, 0xdd, 0x80, 0x9c, 0x6f, 0x5a, 0xd8, 0xba, 0xf6, 0x6b,
-	0xbe, 0xf9, 0x97, 0x0c, 0x1c, 0x4b, 0xcf, 0x4a, 0x00, 0x2a, 0x29, 0xd8, 0x19, 0x7a, 0x91, 0x16,
-	0x05, 0x3f, 0x91, 0x01, 0xad, 0x0f, 0x6b, 0x09, 0x0e, 0xee, 0x33, 0x8f, 0x23, 0x7d, 0x04, 0xf3,
-	0xd2, 0x29, 0x5e, 0x20, 0xe5, 0x4c, 0x65, 0x69, 0x6f, 0x6b, 0x86, 0x9b, 0xea, 0x1c, 0x61, 0x05,
-	0xdd, 0x86, 0x15, 0x0f, 0x3f, 0x88, 0x56, 0x82, 0x33, 0x74, 0x68, 0x59, 0x86, 0x1b, 0xd7, 0xbc,
-	0x5d, 0x58, 0x3b, 0x0c, 0xd0, 0x14, 0x98, 0x34, 0x61, 0x1d, 0x16, 0x7c, 0x33, 0x40, 0x4f, 0x44,
-	0xc7, 0x8b, 0x76, 0x74, 0x1f, 0xb2, 0xb2, 0xbb, 0xea, 0x94, 0x52, 0x8e, 0x2a, 0xd0, 0x6e, 0xc3,
-	0xda, 0x33, 0x74, 0x70, 0x94, 0x65, 0x82, 0x85, 0x7b, 0xbf, 0x16, 0x01, 0x8e, 0x55, 0x17, 0x35,
-	0x90, 0x57, 0x04, 0x72, 0xd7, 0xb6, 0x50, 0x63, 0x06, 0xe1, 0xcd, 0x4b, 0x2a, 0xde, 0x4b, 0x5f,
-	0x10, 0x3a, 0xae, 0x6d, 0x5d, 0xfc, 0xf8, 0x79, 0x35, 0x57, 0xa2, 0x1b, 0xf2, 0x0b, 0xfa, 0x24,
-	0x25, 0x3d, 0xf1, 0x03, 0xf6, 0x16, 0x3b, 0x82, 0x1b, 0xd5, 0x73, 0x23, 0xf4, 0xf6, 0x92, 0xc0,
-	0x62, 0x34, 0x36, 0xf4, 0xee, 0x0c, 0x8a, 0xd1, 0xf1, 0x2a, 0xa6, 0xf1, 0x4c, 0xdb, 0x56, 0x22,
-	0xca, 0x74, 0x73, 0x92, 0x88, 0x50, 0x83, 0x51, 0xad, 0x9e, 0xd3, 0xaf, 0x04, 0x60, 0x78, 0x79,
-	0x74, 0xd6, 0x69, 0xc7, 0xee, 0x39, 0x9d, 0x9a, 0x1d, 0xa5, 0xe6, 0x96, 0x56, 0x52, 0x6a, 0xc2,
-	0x49, 0x18, 0x37, 0xa5, 0xa6, 0x2e, 0x9a, 0x7e, 0x06, 0x18, 0x5e, 0xf4, 0x4c, 0x45, 0x63, 0x33,
-	0x51, 0x5c, 0x8f, 0x2b, 0xe2, 0x87, 0x4a, 0x7f, 0x2e, 0x1f, 0xaa, 0xd8, 0x92, 0xea, 0x2c, 0x4b,
-	0x2e, 0x09, 0xe4, 0x8f, 0x51, 0x1c, 0x99, 0x6e, 0x43, 0x3d, 0x7f, 0x54, 0x8b, 0x1b, 0xda, 0xa6,
-	0x2b, 0x29, 0x93, 0xc9, 0x98, 0xf4, 0x9f, 0x1b, 0x98, 0x30, 0xab, 0xd5, 0x14, 0xe7, 0x03, 0xcd,
-	0x50, 0x9c, 0x01, 0x86, 0xda, 0x27, 0xf2, 0xd6, 0x78, 0xa2, 0x6d, 0x8d, 0x54, 0xe9, 0x05, 0x81,
-	0x7c, 0x7d, 0x9a, 0x8e, 0x7a, 0x7a, 0x1d, 0xfb, 0x4a, 0xc7, 0x2e, 0x4d, 0xa3, 0xc3, 0x4a, 0x72,
-	0x7e, 0x27, 0x40, 0x4f, 0x90, 0xab, 0x08, 0x06, 0xae, 0xcd, 0xb9, 0xfc, 0x9b, 0xd0, 0xca, 0x0d,
-	0x9a, 0x71, 0x48, 0x2c, 0xe8, 0x4e, 0x0a, 0x64, 0xf4, 0xe1, 0x3c, 0x55, 0x22, 0x6b, 0xda, 0xc3,
-	0x14, 0x22, 0xc5, 0x58, 0x9b, 0x1a, 0xa9, 0x1e, 0x7c, 0x81, 0xff, 0x3a, 0xcc, 0x9d, 0x3e, 0x31,
-	0x07, 0x2b, 0xc3, 0xc7, 0xa1, 0x21, 0x27, 0xa4, 0x41, 0x5e, 0xd7, 0xa3, 0x0a, 0x8b, 0x39, 0xa6,
-	0x67, 0xe9, 0x2c, 0xb0, 0x0c, 0x0b, 0x3d, 0x35, 0x3f, 0x46, 0x98, 0x32, 0x7d, 0x9b, 0xff, 0xe1,
-	0x17, 0xfd, 0x78, 0xb8, 0x6b, 0x2f, 0xa8, 0x9a, 0xfb, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x31,
-	0x75, 0x14, 0x03, 0xd5, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/example/library/v1/library.pb.go b/googleapis/example/library/v1/library.pb.go
index b18fb8046f..39e2a209b5 100644
--- a/googleapis/example/library/v1/library.pb.go
+++ b/googleapis/example/library/v1/library.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/example/library/v1/library.proto
 
-package library // import "google.golang.org/genproto/googleapis/example/library/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package library
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A single book in the library.
 type Book struct {
@@ -46,16 +46,17 @@ func (m *Book) Reset()         { *m = Book{} }
 func (m *Book) String() string { return proto.CompactTextString(m) }
 func (*Book) ProtoMessage()    {}
 func (*Book) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{0}
+	return fileDescriptor_40bd7925372a20e3, []int{0}
 }
+
 func (m *Book) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Book.Unmarshal(m, b)
 }
 func (m *Book) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Book.Marshal(b, m, deterministic)
 }
-func (dst *Book) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Book.Merge(dst, src)
+func (m *Book) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Book.Merge(m, src)
 }
 func (m *Book) XXX_Size() int {
 	return xxx_messageInfo_Book.Size(m)
@@ -111,16 +112,17 @@ func (m *Shelf) Reset()         { *m = Shelf{} }
 func (m *Shelf) String() string { return proto.CompactTextString(m) }
 func (*Shelf) ProtoMessage()    {}
 func (*Shelf) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{1}
+	return fileDescriptor_40bd7925372a20e3, []int{1}
 }
+
 func (m *Shelf) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Shelf.Unmarshal(m, b)
 }
 func (m *Shelf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Shelf.Marshal(b, m, deterministic)
 }
-func (dst *Shelf) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Shelf.Merge(dst, src)
+func (m *Shelf) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Shelf.Merge(m, src)
 }
 func (m *Shelf) XXX_Size() int {
 	return xxx_messageInfo_Shelf.Size(m)
@@ -158,16 +160,17 @@ func (m *CreateShelfRequest) Reset()         { *m = CreateShelfRequest{} }
 func (m *CreateShelfRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateShelfRequest) ProtoMessage()    {}
 func (*CreateShelfRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{2}
+	return fileDescriptor_40bd7925372a20e3, []int{2}
 }
+
 func (m *CreateShelfRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateShelfRequest.Unmarshal(m, b)
 }
 func (m *CreateShelfRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateShelfRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateShelfRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateShelfRequest.Merge(dst, src)
+func (m *CreateShelfRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateShelfRequest.Merge(m, src)
 }
 func (m *CreateShelfRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateShelfRequest.Size(m)
@@ -198,16 +201,17 @@ func (m *GetShelfRequest) Reset()         { *m = GetShelfRequest{} }
 func (m *GetShelfRequest) String() string { return proto.CompactTextString(m) }
 func (*GetShelfRequest) ProtoMessage()    {}
 func (*GetShelfRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{3}
+	return fileDescriptor_40bd7925372a20e3, []int{3}
 }
+
 func (m *GetShelfRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetShelfRequest.Unmarshal(m, b)
 }
 func (m *GetShelfRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetShelfRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetShelfRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetShelfRequest.Merge(dst, src)
+func (m *GetShelfRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetShelfRequest.Merge(m, src)
 }
 func (m *GetShelfRequest) XXX_Size() int {
 	return xxx_messageInfo_GetShelfRequest.Size(m)
@@ -244,16 +248,17 @@ func (m *ListShelvesRequest) Reset()         { *m = ListShelvesRequest{} }
 func (m *ListShelvesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListShelvesRequest) ProtoMessage()    {}
 func (*ListShelvesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{4}
+	return fileDescriptor_40bd7925372a20e3, []int{4}
 }
+
 func (m *ListShelvesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListShelvesRequest.Unmarshal(m, b)
 }
 func (m *ListShelvesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListShelvesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListShelvesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListShelvesRequest.Merge(dst, src)
+func (m *ListShelvesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListShelvesRequest.Merge(m, src)
 }
 func (m *ListShelvesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListShelvesRequest.Size(m)
@@ -297,16 +302,17 @@ func (m *ListShelvesResponse) Reset()         { *m = ListShelvesResponse{} }
 func (m *ListShelvesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListShelvesResponse) ProtoMessage()    {}
 func (*ListShelvesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{5}
+	return fileDescriptor_40bd7925372a20e3, []int{5}
 }
+
 func (m *ListShelvesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListShelvesResponse.Unmarshal(m, b)
 }
 func (m *ListShelvesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListShelvesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListShelvesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListShelvesResponse.Merge(dst, src)
+func (m *ListShelvesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListShelvesResponse.Merge(m, src)
 }
 func (m *ListShelvesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListShelvesResponse.Size(m)
@@ -344,16 +350,17 @@ func (m *DeleteShelfRequest) Reset()         { *m = DeleteShelfRequest{} }
 func (m *DeleteShelfRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteShelfRequest) ProtoMessage()    {}
 func (*DeleteShelfRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{6}
+	return fileDescriptor_40bd7925372a20e3, []int{6}
 }
+
 func (m *DeleteShelfRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteShelfRequest.Unmarshal(m, b)
 }
 func (m *DeleteShelfRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteShelfRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteShelfRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteShelfRequest.Merge(dst, src)
+func (m *DeleteShelfRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteShelfRequest.Merge(m, src)
 }
 func (m *DeleteShelfRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteShelfRequest.Size(m)
@@ -387,16 +394,17 @@ func (m *MergeShelvesRequest) Reset()         { *m = MergeShelvesRequest{} }
 func (m *MergeShelvesRequest) String() string { return proto.CompactTextString(m) }
 func (*MergeShelvesRequest) ProtoMessage()    {}
 func (*MergeShelvesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{7}
+	return fileDescriptor_40bd7925372a20e3, []int{7}
 }
+
 func (m *MergeShelvesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MergeShelvesRequest.Unmarshal(m, b)
 }
 func (m *MergeShelvesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MergeShelvesRequest.Marshal(b, m, deterministic)
 }
-func (dst *MergeShelvesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MergeShelvesRequest.Merge(dst, src)
+func (m *MergeShelvesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MergeShelvesRequest.Merge(m, src)
 }
 func (m *MergeShelvesRequest) XXX_Size() int {
 	return xxx_messageInfo_MergeShelvesRequest.Size(m)
@@ -436,16 +444,17 @@ func (m *CreateBookRequest) Reset()         { *m = CreateBookRequest{} }
 func (m *CreateBookRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateBookRequest) ProtoMessage()    {}
 func (*CreateBookRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{8}
+	return fileDescriptor_40bd7925372a20e3, []int{8}
 }
+
 func (m *CreateBookRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateBookRequest.Unmarshal(m, b)
 }
 func (m *CreateBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateBookRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateBookRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateBookRequest.Merge(dst, src)
+func (m *CreateBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBookRequest.Merge(m, src)
 }
 func (m *CreateBookRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateBookRequest.Size(m)
@@ -483,16 +492,17 @@ func (m *GetBookRequest) Reset()         { *m = GetBookRequest{} }
 func (m *GetBookRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBookRequest) ProtoMessage()    {}
 func (*GetBookRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{9}
+	return fileDescriptor_40bd7925372a20e3, []int{9}
 }
+
 func (m *GetBookRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBookRequest.Unmarshal(m, b)
 }
 func (m *GetBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBookRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetBookRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBookRequest.Merge(dst, src)
+func (m *GetBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBookRequest.Merge(m, src)
 }
 func (m *GetBookRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBookRequest.Size(m)
@@ -531,16 +541,17 @@ func (m *ListBooksRequest) Reset()         { *m = ListBooksRequest{} }
 func (m *ListBooksRequest) String() string { return proto.CompactTextString(m) }
 func (*ListBooksRequest) ProtoMessage()    {}
 func (*ListBooksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{10}
+	return fileDescriptor_40bd7925372a20e3, []int{10}
 }
+
 func (m *ListBooksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBooksRequest.Unmarshal(m, b)
 }
 func (m *ListBooksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBooksRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListBooksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBooksRequest.Merge(dst, src)
+func (m *ListBooksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBooksRequest.Merge(m, src)
 }
 func (m *ListBooksRequest) XXX_Size() int {
 	return xxx_messageInfo_ListBooksRequest.Size(m)
@@ -591,16 +602,17 @@ func (m *ListBooksResponse) Reset()         { *m = ListBooksResponse{} }
 func (m *ListBooksResponse) String() string { return proto.CompactTextString(m) }
 func (*ListBooksResponse) ProtoMessage()    {}
 func (*ListBooksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{11}
+	return fileDescriptor_40bd7925372a20e3, []int{11}
 }
+
 func (m *ListBooksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBooksResponse.Unmarshal(m, b)
 }
 func (m *ListBooksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBooksResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListBooksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBooksResponse.Merge(dst, src)
+func (m *ListBooksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBooksResponse.Merge(m, src)
 }
 func (m *ListBooksResponse) XXX_Size() int {
 	return xxx_messageInfo_ListBooksResponse.Size(m)
@@ -640,16 +652,17 @@ func (m *UpdateBookRequest) Reset()         { *m = UpdateBookRequest{} }
 func (m *UpdateBookRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateBookRequest) ProtoMessage()    {}
 func (*UpdateBookRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{12}
+	return fileDescriptor_40bd7925372a20e3, []int{12}
 }
+
 func (m *UpdateBookRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateBookRequest.Unmarshal(m, b)
 }
 func (m *UpdateBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateBookRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateBookRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateBookRequest.Merge(dst, src)
+func (m *UpdateBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBookRequest.Merge(m, src)
 }
 func (m *UpdateBookRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateBookRequest.Size(m)
@@ -687,16 +700,17 @@ func (m *DeleteBookRequest) Reset()         { *m = DeleteBookRequest{} }
 func (m *DeleteBookRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteBookRequest) ProtoMessage()    {}
 func (*DeleteBookRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{13}
+	return fileDescriptor_40bd7925372a20e3, []int{13}
 }
+
 func (m *DeleteBookRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteBookRequest.Unmarshal(m, b)
 }
 func (m *DeleteBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteBookRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteBookRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteBookRequest.Merge(dst, src)
+func (m *DeleteBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteBookRequest.Merge(m, src)
 }
 func (m *DeleteBookRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteBookRequest.Size(m)
@@ -730,16 +744,17 @@ func (m *MoveBookRequest) Reset()         { *m = MoveBookRequest{} }
 func (m *MoveBookRequest) String() string { return proto.CompactTextString(m) }
 func (*MoveBookRequest) ProtoMessage()    {}
 func (*MoveBookRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_library_1838ee047f1c2e83, []int{14}
+	return fileDescriptor_40bd7925372a20e3, []int{14}
 }
+
 func (m *MoveBookRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MoveBookRequest.Unmarshal(m, b)
 }
 func (m *MoveBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MoveBookRequest.Marshal(b, m, deterministic)
 }
-func (dst *MoveBookRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MoveBookRequest.Merge(dst, src)
+func (m *MoveBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MoveBookRequest.Merge(m, src)
 }
 func (m *MoveBookRequest) XXX_Size() int {
 	return xxx_messageInfo_MoveBookRequest.Size(m)
@@ -782,6 +797,80 @@ func init() {
 	proto.RegisterType((*MoveBookRequest)(nil), "google.example.library.v1.MoveBookRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/example/library/v1/library.proto", fileDescriptor_40bd7925372a20e3)
+}
+
+var fileDescriptor_40bd7925372a20e3 = []byte{
+	// 1041 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4b, 0x53, 0xdb, 0x56,
+	0x14, 0x1e, 0x19, 0xf3, 0x3a, 0xe6, 0x11, 0x2e, 0x94, 0x38, 0x0e, 0x29, 0x46, 0x49, 0x69, 0x30,
+	0x44, 0x9a, 0xd0, 0xa4, 0xe9, 0x28, 0xc3, 0x34, 0x72, 0xd3, 0xc9, 0x74, 0x86, 0x74, 0xa8, 0x69,
+	0x37, 0xdd, 0x78, 0x64, 0x73, 0xb0, 0x35, 0xc8, 0xba, 0x42, 0x12, 0x1e, 0x08, 0xc3, 0xa2, 0xf9,
+	0x07, 0x6d, 0xd6, 0x6d, 0x7f, 0x54, 0x17, 0x9d, 0xf1, 0x2a, 0x8b, 0xae, 0xf2, 0x13, 0xba, 0xea,
+	0xdc, 0x87, 0x40, 0x7e, 0x20, 0x89, 0x66, 0x65, 0xe9, 0xde, 0x73, 0xee, 0x77, 0x1e, 0xdf, 0xf9,
+	0x74, 0x0d, 0x9f, 0xb7, 0x28, 0x6d, 0x39, 0xa8, 0xe3, 0xa9, 0xd5, 0xf1, 0x1c, 0xd4, 0x1d, 0xbb,
+	0xe1, 0x5b, 0xfe, 0x99, 0xde, 0x7d, 0x1c, 0x3d, 0x6a, 0x9e, 0x4f, 0x43, 0x4a, 0xee, 0x08, 0x43,
+	0x4d, 0x1a, 0x6a, 0xd1, 0x6e, 0xf7, 0x71, 0x69, 0x45, 0x9e, 0x61, 0x79, 0xb6, 0x6e, 0xb9, 0x2e,
+	0x0d, 0xad, 0xd0, 0xa6, 0x6e, 0x20, 0x1c, 0x4b, 0xb7, 0x63, 0xbb, 0x4d, 0xc7, 0x46, 0x37, 0x94,
+	0x1b, 0xab, 0xb1, 0x8d, 0x43, 0x1b, 0x9d, 0x83, 0x7a, 0x03, 0xdb, 0x56, 0xd7, 0xa6, 0xbe, 0x34,
+	0xb8, 0x13, 0x33, 0xf0, 0x31, 0xa0, 0x27, 0x7e, 0x13, 0xe5, 0xd6, 0x5d, 0xb9, 0xc5, 0xdf, 0x1a,
+	0x27, 0x87, 0x3a, 0x76, 0xbc, 0x50, 0x86, 0xaa, 0xfe, 0xad, 0x40, 0xbe, 0x4a, 0xe9, 0x11, 0xf9,
+	0x1a, 0xf2, 0xae, 0xd5, 0xc1, 0xa2, 0x52, 0x56, 0x1e, 0x4e, 0x57, 0x37, 0xdf, 0x9b, 0xb9, 0x7f,
+	0xcd, 0xcf, 0xe0, 0xbe, 0x0c, 0xfd, 0x51, 0x94, 0x8a, 0x38, 0xcb, 0xf2, 0xec, 0x40, 0x6b, 0xd2,
+	0x8e, 0xce, 0x5c, 0x6b, 0xdc, 0x91, 0x2c, 0xc3, 0x84, 0x75, 0x12, 0xb6, 0xa9, 0x5f, 0xcc, 0xb1,
+	0x23, 0x6a, 0xf2, 0x8d, 0x2c, 0xc1, 0x78, 0x68, 0x87, 0x0e, 0x16, 0xc7, 0xf8, 0xb2, 0x78, 0x21,
+	0x04, 0xf2, 0x3e, 0x5a, 0x07, 0xc5, 0x7c, 0x59, 0x79, 0x38, 0x55, 0xe3, 0xcf, 0xc6, 0xee, 0x07,
+	0xf3, 0xbb, 0x4c, 0x88, 0x44, 0x0d, 0xda, 0xe8, 0x74, 0x31, 0xd0, 0xcf, 0xd9, 0xc3, 0x61, 0xdd,
+	0x3e, 0xb8, 0xd0, 0x1b, 0x94, 0x1e, 0x05, 0xfa, 0x39, 0xfb, 0x61, 0xef, 0xea, 0x1f, 0x0a, 0x8c,
+	0xef, 0xb3, 0x5d, 0xf2, 0xa2, 0x2f, 0xb5, 0x2d, 0x9e, 0xda, 0x3a, 0x3c, 0x48, 0x01, 0xe2, 0xbe,
+	0x32, 0x37, 0x96, 0x43, 0x1b, 0x3b, 0x28, 0x53, 0x13, 0x2f, 0xc6, 0xce, 0x07, 0xd3, 0xc8, 0x76,
+	0x0c, 0x21, 0xc3, 0x01, 0xab, 0x3f, 0x00, 0xf9, 0xc6, 0x47, 0x2b, 0x44, 0x81, 0x84, 0xc7, 0x27,
+	0x18, 0x84, 0xe4, 0x39, 0x8c, 0x73, 0x13, 0x1e, 0x6d, 0x61, 0xbb, 0xac, 0x5d, 0xcb, 0x25, 0x8d,
+	0xfb, 0x55, 0xc7, 0xde, 0x9b, 0xb9, 0x9a, 0xf0, 0x51, 0x9f, 0xc0, 0xfc, 0x2b, 0x0c, 0xfb, 0xce,
+	0x5b, 0xeb, 0x4b, 0x7e, 0x96, 0x27, 0x3f, 0x29, 0x2b, 0x23, 0xb2, 0x53, 0xf7, 0x80, 0xec, 0xda,
+	0x01, 0x77, 0xeb, 0x62, 0x10, 0x39, 0xde, 0x85, 0x69, 0xcf, 0x6a, 0x61, 0x3d, 0xb0, 0xdf, 0x08,
+	0xef, 0xf1, 0xda, 0x14, 0x5b, 0xd8, 0xb7, 0xdf, 0x20, 0xb9, 0x07, 0xc0, 0x37, 0x43, 0x7a, 0x84,
+	0xae, 0xac, 0x0a, 0x37, 0xff, 0x91, 0x2d, 0xa8, 0x67, 0xb0, 0xd8, 0x77, 0x62, 0xe0, 0x51, 0x37,
+	0x40, 0x62, 0xc0, 0xa4, 0xac, 0x43, 0x51, 0x29, 0x8f, 0x65, 0xc9, 0xae, 0x16, 0x39, 0x90, 0x75,
+	0x98, 0x77, 0xf1, 0x34, 0xac, 0x0f, 0xc1, 0xce, 0xb2, 0xe5, 0xbd, 0x4b, 0xe8, 0x67, 0x40, 0x5e,
+	0xa2, 0x83, 0x03, 0x55, 0xcd, 0x50, 0x85, 0x63, 0x58, 0x7c, 0x8d, 0x7e, 0x0b, 0x07, 0xca, 0x90,
+	0xee, 0x49, 0x9e, 0xc1, 0x2d, 0x1a, 0xb6, 0xd1, 0xaf, 0x8b, 0xde, 0x72, 0xf3, 0xdc, 0x28, 0xf3,
+	0x39, 0x6e, 0xc6, 0x9f, 0xbf, 0x67, 0x90, 0x1e, 0x2c, 0x08, 0x06, 0xf0, 0x31, 0xca, 0x0e, 0xf8,
+	0x15, 0xe4, 0x19, 0xcd, 0x39, 0x48, 0x61, 0x7b, 0x35, 0xa1, 0x88, 0xec, 0x60, 0xc1, 0x10, 0xee,
+	0xa1, 0x6e, 0xc3, 0xdc, 0x2b, 0x0c, 0xe3, 0x70, 0xe5, 0x3e, 0xb8, 0x19, 0x0e, 0x37, 0x21, 0x34,
+	0xe1, 0xb2, 0x30, 0xb7, 0x58, 0x33, 0xd9, 0xca, 0x4d, 0xaa, 0xd2, 0xc7, 0x9f, 0x5c, 0x22, 0x7f,
+	0xc6, 0x06, 0xf9, 0xe3, 0xc3, 0x42, 0x0c, 0x52, 0xb2, 0xe7, 0x29, 0x8c, 0xf3, 0x19, 0x97, 0xdc,
+	0x49, 0x4b, 0xbb, 0x26, 0xac, 0x33, 0x13, 0xe7, 0x10, 0x16, 0x7e, 0xf2, 0x0e, 0x06, 0x9a, 0x71,
+	0xbb, 0x2f, 0x4f, 0x51, 0xc8, 0x8f, 0x6c, 0xc1, 0x53, 0x58, 0x10, 0x04, 0xbd, 0x59, 0x17, 0x1c,
+	0x98, 0x7f, 0x4d, 0xbb, 0x37, 0x73, 0xfa, 0xdf, 0xcc, 0xdc, 0xfe, 0x6d, 0x06, 0xe6, 0x76, 0x45,
+	0x0e, 0xfb, 0xe8, 0x77, 0xed, 0x26, 0x92, 0xb7, 0x0a, 0x14, 0x62, 0x7a, 0x45, 0x1e, 0x25, 0xe4,
+	0x3c, 0xac, 0x6b, 0xa5, 0xd4, 0x51, 0x57, 0xd5, 0x9e, 0x29, 0x64, 0xec, 0xed, 0x5f, 0xff, 0xbc,
+	0xcb, 0x2d, 0xa9, 0x05, 0xf6, 0x61, 0x95, 0xe3, 0x6f, 0x88, 0x1d, 0x72, 0x01, 0x53, 0x91, 0xc0,
+	0x91, 0x4a, 0xc2, 0x89, 0x03, 0x2a, 0x98, 0x01, 0xfd, 0x7e, 0xcf, 0xe4, 0x35, 0xe3, 0xe0, 0xcb,
+	0x64, 0x89, 0x81, 0x9f, 0xb3, 0x85, 0x9d, 0x48, 0xba, 0x2b, 0x17, 0xe4, 0x17, 0x05, 0x0a, 0x31,
+	0x61, 0x4b, 0xac, 0xc1, 0xb0, 0xa4, 0x96, 0xb4, 0xac, 0xe6, 0x82, 0xf1, 0xea, 0x22, 0x0f, 0x66,
+	0x96, 0xc4, 0x2b, 0x41, 0xce, 0xa0, 0x10, 0x13, 0xb8, 0xc4, 0x10, 0x86, 0x85, 0xb0, 0xb4, 0x1c,
+	0x99, 0x47, 0xb7, 0x01, 0xed, 0x5b, 0x76, 0x1b, 0x18, 0x48, 0xbf, 0x32, 0x3a, 0xfd, 0x3f, 0x15,
+	0x98, 0x89, 0x6b, 0x24, 0x49, 0x4a, 0x68, 0x84, 0x98, 0x66, 0x68, 0xc3, 0x4e, 0xcf, 0xfc, 0x84,
+	0xc1, 0x6e, 0x0d, 0xf2, 0x96, 0x07, 0xb6, 0xaa, 0x96, 0x46, 0x05, 0x66, 0x74, 0x18, 0x96, 0xa1,
+	0x54, 0xc8, 0xaf, 0x0a, 0xc0, 0x95, 0xa4, 0x92, 0xad, 0x54, 0x8e, 0xc6, 0xe6, 0xa9, 0x94, 0x36,
+	0xc5, 0xea, 0x93, 0x9e, 0x39, 0xcd, 0x83, 0x63, 0x83, 0xcc, 0x03, 0x52, 0x47, 0x07, 0x24, 0x2e,
+	0x23, 0x06, 0x1f, 0x78, 0x36, 0x38, 0x93, 0x52, 0x74, 0xc9, 0x46, 0x32, 0x67, 0x6f, 0x14, 0xcd,
+	0x66, 0xbc, 0x65, 0x9f, 0x92, 0x95, 0x11, 0x81, 0xc8, 0x4b, 0x51, 0xe5, 0x82, 0x15, 0x66, 0xfa,
+	0x52, 0x52, 0xc9, 0x66, 0x0a, 0x11, 0xe3, 0x5a, 0x5f, 0xda, 0xca, 0x66, 0x2c, 0x39, 0xbb, 0x11,
+	0x8f, 0x6a, 0x85, 0x24, 0x94, 0x87, 0x9c, 0x02, 0x5c, 0x29, 0x61, 0x62, 0xaf, 0x86, 0x04, 0xf3,
+	0x5a, 0x1e, 0x3f, 0x10, 0xd5, 0xa8, 0x24, 0x57, 0xe3, 0x9d, 0x02, 0x70, 0x25, 0xf6, 0x89, 0xd0,
+	0x43, 0xdf, 0x84, 0xf4, 0xc6, 0x7c, 0xd9, 0x33, 0xf3, 0x97, 0x0c, 0xd9, 0x28, 0xad, 0xf1, 0x50,
+	0xd8, 0x82, 0x76, 0x4d, 0x3c, 0x92, 0x28, 0xbf, 0x2b, 0x30, 0x15, 0x69, 0x7c, 0xa2, 0xba, 0x0d,
+	0x7c, 0x08, 0xd2, 0x23, 0x7a, 0x99, 0x38, 0x55, 0xeb, 0xea, 0x5a, 0x52, 0xb5, 0x8c, 0x0e, 0xed,
+	0xb2, 0xe1, 0xaa, 0x1e, 0xc3, 0xbd, 0x26, 0xed, 0x5c, 0x8f, 0x55, 0x9d, 0x91, 0x9f, 0x8c, 0x3d,
+	0xd6, 0x93, 0x3d, 0xe5, 0xe7, 0x17, 0xd2, 0xb4, 0x45, 0x1d, 0xcb, 0x6d, 0x69, 0xd4, 0x6f, 0xe9,
+	0x2d, 0x74, 0x79, 0xc7, 0xf4, 0xab, 0x6b, 0xf2, 0x88, 0xff, 0x53, 0xcf, 0xe5, 0x63, 0x63, 0x82,
+	0x1b, 0x7f, 0xf1, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x38, 0xed, 0x3a, 0x7b, 0x0d, 0x00,
+	0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1227,77 +1316,3 @@ var _LibraryService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/example/library/v1/library.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/example/library/v1/library.proto", fileDescriptor_library_1838ee047f1c2e83)
-}
-
-var fileDescriptor_library_1838ee047f1c2e83 = []byte{
-	// 1041 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4b, 0x53, 0xdb, 0x56,
-	0x14, 0x1e, 0x19, 0xf3, 0x3a, 0xe6, 0x11, 0x2e, 0x94, 0x38, 0x0e, 0x29, 0x46, 0x49, 0x69, 0x30,
-	0x44, 0x9a, 0xd0, 0xa4, 0xe9, 0x28, 0xc3, 0x34, 0x72, 0xd3, 0xc9, 0x74, 0x86, 0x74, 0xa8, 0x69,
-	0x37, 0xdd, 0x78, 0x64, 0x73, 0xb0, 0x35, 0xc8, 0xba, 0x42, 0x12, 0x1e, 0x08, 0xc3, 0xa2, 0xf9,
-	0x07, 0x6d, 0xd6, 0x6d, 0x7f, 0x54, 0x17, 0x9d, 0xf1, 0x2a, 0x8b, 0xae, 0xf2, 0x13, 0xba, 0xea,
-	0xdc, 0x87, 0x40, 0x7e, 0x20, 0x89, 0x66, 0x65, 0xe9, 0xde, 0x73, 0xee, 0x77, 0x1e, 0xdf, 0xf9,
-	0x74, 0x0d, 0x9f, 0xb7, 0x28, 0x6d, 0x39, 0xa8, 0xe3, 0xa9, 0xd5, 0xf1, 0x1c, 0xd4, 0x1d, 0xbb,
-	0xe1, 0x5b, 0xfe, 0x99, 0xde, 0x7d, 0x1c, 0x3d, 0x6a, 0x9e, 0x4f, 0x43, 0x4a, 0xee, 0x08, 0x43,
-	0x4d, 0x1a, 0x6a, 0xd1, 0x6e, 0xf7, 0x71, 0x69, 0x45, 0x9e, 0x61, 0x79, 0xb6, 0x6e, 0xb9, 0x2e,
-	0x0d, 0xad, 0xd0, 0xa6, 0x6e, 0x20, 0x1c, 0x4b, 0xb7, 0x63, 0xbb, 0x4d, 0xc7, 0x46, 0x37, 0x94,
-	0x1b, 0xab, 0xb1, 0x8d, 0x43, 0x1b, 0x9d, 0x83, 0x7a, 0x03, 0xdb, 0x56, 0xd7, 0xa6, 0xbe, 0x34,
-	0xb8, 0x13, 0x33, 0xf0, 0x31, 0xa0, 0x27, 0x7e, 0x13, 0xe5, 0xd6, 0x5d, 0xb9, 0xc5, 0xdf, 0x1a,
-	0x27, 0x87, 0x3a, 0x76, 0xbc, 0x50, 0x86, 0xaa, 0xfe, 0xad, 0x40, 0xbe, 0x4a, 0xe9, 0x11, 0xf9,
-	0x1a, 0xf2, 0xae, 0xd5, 0xc1, 0xa2, 0x52, 0x56, 0x1e, 0x4e, 0x57, 0x37, 0xdf, 0x9b, 0xb9, 0x7f,
-	0xcd, 0xcf, 0xe0, 0xbe, 0x0c, 0xfd, 0x51, 0x94, 0x8a, 0x38, 0xcb, 0xf2, 0xec, 0x40, 0x6b, 0xd2,
-	0x8e, 0xce, 0x5c, 0x6b, 0xdc, 0x91, 0x2c, 0xc3, 0x84, 0x75, 0x12, 0xb6, 0xa9, 0x5f, 0xcc, 0xb1,
-	0x23, 0x6a, 0xf2, 0x8d, 0x2c, 0xc1, 0x78, 0x68, 0x87, 0x0e, 0x16, 0xc7, 0xf8, 0xb2, 0x78, 0x21,
-	0x04, 0xf2, 0x3e, 0x5a, 0x07, 0xc5, 0x7c, 0x59, 0x79, 0x38, 0x55, 0xe3, 0xcf, 0xc6, 0xee, 0x07,
-	0xf3, 0xbb, 0x4c, 0x88, 0x44, 0x0d, 0xda, 0xe8, 0x74, 0x31, 0xd0, 0xcf, 0xd9, 0xc3, 0x61, 0xdd,
-	0x3e, 0xb8, 0xd0, 0x1b, 0x94, 0x1e, 0x05, 0xfa, 0x39, 0xfb, 0x61, 0xef, 0xea, 0x1f, 0x0a, 0x8c,
-	0xef, 0xb3, 0x5d, 0xf2, 0xa2, 0x2f, 0xb5, 0x2d, 0x9e, 0xda, 0x3a, 0x3c, 0x48, 0x01, 0xe2, 0xbe,
-	0x32, 0x37, 0x96, 0x43, 0x1b, 0x3b, 0x28, 0x53, 0x13, 0x2f, 0xc6, 0xce, 0x07, 0xd3, 0xc8, 0x76,
-	0x0c, 0x21, 0xc3, 0x01, 0xab, 0x3f, 0x00, 0xf9, 0xc6, 0x47, 0x2b, 0x44, 0x81, 0x84, 0xc7, 0x27,
-	0x18, 0x84, 0xe4, 0x39, 0x8c, 0x73, 0x13, 0x1e, 0x6d, 0x61, 0xbb, 0xac, 0x5d, 0xcb, 0x25, 0x8d,
-	0xfb, 0x55, 0xc7, 0xde, 0x9b, 0xb9, 0x9a, 0xf0, 0x51, 0x9f, 0xc0, 0xfc, 0x2b, 0x0c, 0xfb, 0xce,
-	0x5b, 0xeb, 0x4b, 0x7e, 0x96, 0x27, 0x3f, 0x29, 0x2b, 0x23, 0xb2, 0x53, 0xf7, 0x80, 0xec, 0xda,
-	0x01, 0x77, 0xeb, 0x62, 0x10, 0x39, 0xde, 0x85, 0x69, 0xcf, 0x6a, 0x61, 0x3d, 0xb0, 0xdf, 0x08,
-	0xef, 0xf1, 0xda, 0x14, 0x5b, 0xd8, 0xb7, 0xdf, 0x20, 0xb9, 0x07, 0xc0, 0x37, 0x43, 0x7a, 0x84,
-	0xae, 0xac, 0x0a, 0x37, 0xff, 0x91, 0x2d, 0xa8, 0x67, 0xb0, 0xd8, 0x77, 0x62, 0xe0, 0x51, 0x37,
-	0x40, 0x62, 0xc0, 0xa4, 0xac, 0x43, 0x51, 0x29, 0x8f, 0x65, 0xc9, 0xae, 0x16, 0x39, 0x90, 0x75,
-	0x98, 0x77, 0xf1, 0x34, 0xac, 0x0f, 0xc1, 0xce, 0xb2, 0xe5, 0xbd, 0x4b, 0xe8, 0x67, 0x40, 0x5e,
-	0xa2, 0x83, 0x03, 0x55, 0xcd, 0x50, 0x85, 0x63, 0x58, 0x7c, 0x8d, 0x7e, 0x0b, 0x07, 0xca, 0x90,
-	0xee, 0x49, 0x9e, 0xc1, 0x2d, 0x1a, 0xb6, 0xd1, 0xaf, 0x8b, 0xde, 0x72, 0xf3, 0xdc, 0x28, 0xf3,
-	0x39, 0x6e, 0xc6, 0x9f, 0xbf, 0x67, 0x90, 0x1e, 0x2c, 0x08, 0x06, 0xf0, 0x31, 0xca, 0x0e, 0xf8,
-	0x15, 0xe4, 0x19, 0xcd, 0x39, 0x48, 0x61, 0x7b, 0x35, 0xa1, 0x88, 0xec, 0x60, 0xc1, 0x10, 0xee,
-	0xa1, 0x6e, 0xc3, 0xdc, 0x2b, 0x0c, 0xe3, 0x70, 0xe5, 0x3e, 0xb8, 0x19, 0x0e, 0x37, 0x21, 0x34,
-	0xe1, 0xb2, 0x30, 0xb7, 0x58, 0x33, 0xd9, 0xca, 0x4d, 0xaa, 0xd2, 0xc7, 0x9f, 0x5c, 0x22, 0x7f,
-	0xc6, 0x06, 0xf9, 0xe3, 0xc3, 0x42, 0x0c, 0x52, 0xb2, 0xe7, 0x29, 0x8c, 0xf3, 0x19, 0x97, 0xdc,
-	0x49, 0x4b, 0xbb, 0x26, 0xac, 0x33, 0x13, 0xe7, 0x10, 0x16, 0x7e, 0xf2, 0x0e, 0x06, 0x9a, 0x71,
-	0xbb, 0x2f, 0x4f, 0x51, 0xc8, 0x8f, 0x6c, 0xc1, 0x53, 0x58, 0x10, 0x04, 0xbd, 0x59, 0x17, 0x1c,
-	0x98, 0x7f, 0x4d, 0xbb, 0x37, 0x73, 0xfa, 0xdf, 0xcc, 0xdc, 0xfe, 0x6d, 0x06, 0xe6, 0x76, 0x45,
-	0x0e, 0xfb, 0xe8, 0x77, 0xed, 0x26, 0x92, 0xb7, 0x0a, 0x14, 0x62, 0x7a, 0x45, 0x1e, 0x25, 0xe4,
-	0x3c, 0xac, 0x6b, 0xa5, 0xd4, 0x51, 0x57, 0xd5, 0x9e, 0x29, 0x64, 0xec, 0xed, 0x5f, 0xff, 0xbc,
-	0xcb, 0x2d, 0xa9, 0x05, 0xf6, 0x61, 0x95, 0xe3, 0x6f, 0x88, 0x1d, 0x72, 0x01, 0x53, 0x91, 0xc0,
-	0x91, 0x4a, 0xc2, 0x89, 0x03, 0x2a, 0x98, 0x01, 0xfd, 0x7e, 0xcf, 0xe4, 0x35, 0xe3, 0xe0, 0xcb,
-	0x64, 0x89, 0x81, 0x9f, 0xb3, 0x85, 0x9d, 0x48, 0xba, 0x2b, 0x17, 0xe4, 0x17, 0x05, 0x0a, 0x31,
-	0x61, 0x4b, 0xac, 0xc1, 0xb0, 0xa4, 0x96, 0xb4, 0xac, 0xe6, 0x82, 0xf1, 0xea, 0x22, 0x0f, 0x66,
-	0x96, 0xc4, 0x2b, 0x41, 0xce, 0xa0, 0x10, 0x13, 0xb8, 0xc4, 0x10, 0x86, 0x85, 0xb0, 0xb4, 0x1c,
-	0x99, 0x47, 0xb7, 0x01, 0xed, 0x5b, 0x76, 0x1b, 0x18, 0x48, 0xbf, 0x32, 0x3a, 0xfd, 0x3f, 0x15,
-	0x98, 0x89, 0x6b, 0x24, 0x49, 0x4a, 0x68, 0x84, 0x98, 0x66, 0x68, 0xc3, 0x4e, 0xcf, 0xfc, 0x84,
-	0xc1, 0x6e, 0x0d, 0xf2, 0x96, 0x07, 0xb6, 0xaa, 0x96, 0x46, 0x05, 0x66, 0x74, 0x18, 0x96, 0xa1,
-	0x54, 0xc8, 0xaf, 0x0a, 0xc0, 0x95, 0xa4, 0x92, 0xad, 0x54, 0x8e, 0xc6, 0xe6, 0xa9, 0x94, 0x36,
-	0xc5, 0xea, 0x93, 0x9e, 0x39, 0xcd, 0x83, 0x63, 0x83, 0xcc, 0x03, 0x52, 0x47, 0x07, 0x24, 0x2e,
-	0x23, 0x06, 0x1f, 0x78, 0x36, 0x38, 0x93, 0x52, 0x74, 0xc9, 0x46, 0x32, 0x67, 0x6f, 0x14, 0xcd,
-	0x66, 0xbc, 0x65, 0x9f, 0x92, 0x95, 0x11, 0x81, 0xc8, 0x4b, 0x51, 0xe5, 0x82, 0x15, 0x66, 0xfa,
-	0x52, 0x52, 0xc9, 0x66, 0x0a, 0x11, 0xe3, 0x5a, 0x5f, 0xda, 0xca, 0x66, 0x2c, 0x39, 0xbb, 0x11,
-	0x8f, 0x6a, 0x85, 0x24, 0x94, 0x87, 0x9c, 0x02, 0x5c, 0x29, 0x61, 0x62, 0xaf, 0x86, 0x04, 0xf3,
-	0x5a, 0x1e, 0x3f, 0x10, 0xd5, 0xa8, 0x24, 0x57, 0xe3, 0x9d, 0x02, 0x70, 0x25, 0xf6, 0x89, 0xd0,
-	0x43, 0xdf, 0x84, 0xf4, 0xc6, 0x7c, 0xd9, 0x33, 0xf3, 0x97, 0x0c, 0xd9, 0x28, 0xad, 0xf1, 0x50,
-	0xd8, 0x82, 0x76, 0x4d, 0x3c, 0x92, 0x28, 0xbf, 0x2b, 0x30, 0x15, 0x69, 0x7c, 0xa2, 0xba, 0x0d,
-	0x7c, 0x08, 0xd2, 0x23, 0x7a, 0x99, 0x38, 0x55, 0xeb, 0xea, 0x5a, 0x52, 0xb5, 0x8c, 0x0e, 0xed,
-	0xb2, 0xe1, 0xaa, 0x1e, 0xc3, 0xbd, 0x26, 0xed, 0x5c, 0x8f, 0x55, 0x9d, 0x91, 0x9f, 0x8c, 0x3d,
-	0xd6, 0x93, 0x3d, 0xe5, 0xe7, 0x17, 0xd2, 0xb4, 0x45, 0x1d, 0xcb, 0x6d, 0x69, 0xd4, 0x6f, 0xe9,
-	0x2d, 0x74, 0x79, 0xc7, 0xf4, 0xab, 0x6b, 0xf2, 0x88, 0xff, 0x53, 0xcf, 0xe5, 0x63, 0x63, 0x82,
-	0x1b, 0x7f, 0xf1, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x38, 0xed, 0x3a, 0x7b, 0x0d, 0x00,
-	0x00,
-}
diff --git a/googleapis/firebase/fcm/connection/v1alpha1/connection_api.pb.go b/googleapis/firebase/fcm/connection/v1alpha1/connection_api.pb.go
index 99a7b60839..4168c34968 100644
--- a/googleapis/firebase/fcm/connection/v1alpha1/connection_api.pb.go
+++ b/googleapis/firebase/fcm/connection/v1alpha1/connection_api.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firebase/fcm/connection/v1alpha1/connection_api.proto
 
-package connection // import "google.golang.org/genproto/googleapis/firebase/fcm/connection/v1alpha1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package connection
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request sent to FCM from the connected client.
 type UpstreamRequest struct {
@@ -41,16 +41,17 @@ func (m *UpstreamRequest) Reset()         { *m = UpstreamRequest{} }
 func (m *UpstreamRequest) String() string { return proto.CompactTextString(m) }
 func (*UpstreamRequest) ProtoMessage()    {}
 func (*UpstreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_connection_api_678fe704a2040da8, []int{0}
+	return fileDescriptor_9af5e8ec6e2d3436, []int{0}
 }
+
 func (m *UpstreamRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpstreamRequest.Unmarshal(m, b)
 }
 func (m *UpstreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpstreamRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpstreamRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpstreamRequest.Merge(dst, src)
+func (m *UpstreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpstreamRequest.Merge(m, src)
 }
 func (m *UpstreamRequest) XXX_Size() int {
 	return xxx_messageInfo_UpstreamRequest.Size(m)
@@ -85,61 +86,13 @@ func (m *UpstreamRequest) GetAck() *Ack {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*UpstreamRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _UpstreamRequest_OneofMarshaler, _UpstreamRequest_OneofUnmarshaler, _UpstreamRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*UpstreamRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*UpstreamRequest_Ack)(nil),
 	}
 }
 
-func _UpstreamRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*UpstreamRequest)
-	// request_type
-	switch x := m.RequestType.(type) {
-	case *UpstreamRequest_Ack:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Ack); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("UpstreamRequest.RequestType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _UpstreamRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*UpstreamRequest)
-	switch tag {
-	case 1: // request_type.ack
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Ack)
-		err := b.DecodeMessage(msg)
-		m.RequestType = &UpstreamRequest_Ack{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _UpstreamRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*UpstreamRequest)
-	// request_type
-	switch x := m.RequestType.(type) {
-	case *UpstreamRequest_Ack:
-		s := proto.Size(x.Ack)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response sent to the connected client from FCM.
 type DownstreamResponse struct {
 	// The type of response FCM is sending to the client.
@@ -156,16 +109,17 @@ func (m *DownstreamResponse) Reset()         { *m = DownstreamResponse{} }
 func (m *DownstreamResponse) String() string { return proto.CompactTextString(m) }
 func (*DownstreamResponse) ProtoMessage()    {}
 func (*DownstreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_connection_api_678fe704a2040da8, []int{1}
+	return fileDescriptor_9af5e8ec6e2d3436, []int{1}
 }
+
 func (m *DownstreamResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DownstreamResponse.Unmarshal(m, b)
 }
 func (m *DownstreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DownstreamResponse.Marshal(b, m, deterministic)
 }
-func (dst *DownstreamResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DownstreamResponse.Merge(dst, src)
+func (m *DownstreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DownstreamResponse.Merge(m, src)
 }
 func (m *DownstreamResponse) XXX_Size() int {
 	return xxx_messageInfo_DownstreamResponse.Size(m)
@@ -200,61 +154,13 @@ func (m *DownstreamResponse) GetMessage() *Message {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DownstreamResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DownstreamResponse_OneofMarshaler, _DownstreamResponse_OneofUnmarshaler, _DownstreamResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DownstreamResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DownstreamResponse_Message)(nil),
 	}
 }
 
-func _DownstreamResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DownstreamResponse)
-	// response_type
-	switch x := m.ResponseType.(type) {
-	case *DownstreamResponse_Message:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Message); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DownstreamResponse.ResponseType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DownstreamResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DownstreamResponse)
-	switch tag {
-	case 1: // response_type.message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &DownstreamResponse_Message{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DownstreamResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DownstreamResponse)
-	// response_type
-	switch x := m.ResponseType.(type) {
-	case *DownstreamResponse_Message:
-		s := proto.Size(x.Message)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Acknowledgement to indicate a client successfully received an FCM message.
 //
 // If a message is not acked, FCM will continously resend the message until
@@ -271,16 +177,17 @@ func (m *Ack) Reset()         { *m = Ack{} }
 func (m *Ack) String() string { return proto.CompactTextString(m) }
 func (*Ack) ProtoMessage()    {}
 func (*Ack) Descriptor() ([]byte, []int) {
-	return fileDescriptor_connection_api_678fe704a2040da8, []int{2}
+	return fileDescriptor_9af5e8ec6e2d3436, []int{2}
 }
+
 func (m *Ack) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Ack.Unmarshal(m, b)
 }
 func (m *Ack) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Ack.Marshal(b, m, deterministic)
 }
-func (dst *Ack) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Ack.Merge(dst, src)
+func (m *Ack) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Ack.Merge(m, src)
 }
 func (m *Ack) XXX_Size() int {
 	return xxx_messageInfo_Ack.Size(m)
@@ -319,16 +226,17 @@ func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
 func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_connection_api_678fe704a2040da8, []int{3}
+	return fileDescriptor_9af5e8ec6e2d3436, []int{3}
 }
+
 func (m *Message) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Message.Unmarshal(m, b)
 }
 func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
 }
-func (dst *Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message.Merge(dst, src)
+func (m *Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Message.Merge(m, src)
 }
 func (m *Message) XXX_Size() int {
 	return xxx_messageInfo_Message.Size(m)
@@ -375,6 +283,43 @@ func init() {
 	proto.RegisterMapType((map[string]string)(nil), "google.firebase.fcm.connection.v1alpha1.Message.DataEntry")
 }
 
+func init() {
+	proto.RegisterFile("google/firebase/fcm/connection/v1alpha1/connection_api.proto", fileDescriptor_9af5e8ec6e2d3436)
+}
+
+var fileDescriptor_9af5e8ec6e2d3436 = []byte{
+	// 453 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xc1, 0x6e, 0x13, 0x31,
+	0x10, 0x86, 0xb3, 0xd9, 0x42, 0x94, 0x09, 0xa5, 0xc8, 0xe2, 0x10, 0xad, 0x40, 0x54, 0x11, 0x12,
+	0x91, 0x40, 0xde, 0x36, 0x1c, 0xa8, 0x1a, 0x0e, 0x24, 0x14, 0xa9, 0x48, 0x80, 0x60, 0x05, 0x17,
+	0x2e, 0xd1, 0xc4, 0x71, 0x16, 0x2b, 0x59, 0xdb, 0xd8, 0x4e, 0x21, 0x57, 0x0e, 0x3c, 0x03, 0xef,
+	0xc0, 0x4b, 0xa2, 0x5d, 0x7b, 0x5b, 0x04, 0x87, 0x6c, 0x6f, 0xf1, 0xcc, 0xff, 0xfd, 0xff, 0x78,
+	0xe2, 0x85, 0xe7, 0xb9, 0x52, 0xf9, 0x9a, 0xa7, 0x4b, 0x61, 0xf8, 0x1c, 0x2d, 0x4f, 0x97, 0xac,
+	0x48, 0x99, 0x92, 0x92, 0x33, 0x27, 0x94, 0x4c, 0x2f, 0x8e, 0x71, 0xad, 0xbf, 0xe0, 0xf1, 0x5f,
+	0xb5, 0x19, 0x6a, 0x41, 0xb5, 0x51, 0x4e, 0x91, 0x47, 0x9e, 0xa6, 0x35, 0x4d, 0x97, 0xac, 0xa0,
+	0x57, 0x4a, 0x5a, 0xd3, 0xc9, 0xbd, 0x10, 0x83, 0x5a, 0xa4, 0x28, 0xa5, 0x72, 0x58, 0xf6, 0xad,
+	0xb7, 0x49, 0x1e, 0x84, 0x6e, 0x75, 0x9a, 0x6f, 0x96, 0xa9, 0x13, 0x05, 0xb7, 0x0e, 0x0b, 0xed,
+	0x05, 0x03, 0x06, 0x07, 0x9f, 0xb4, 0x75, 0x86, 0x63, 0x91, 0xf1, 0xaf, 0x1b, 0x6e, 0x1d, 0x79,
+	0x01, 0x31, 0xb2, 0x55, 0x3f, 0x3a, 0x8c, 0x86, 0xbd, 0xd1, 0x13, 0xda, 0x70, 0x10, 0x3a, 0x61,
+	0xab, 0xf3, 0x56, 0x56, 0xa2, 0xd3, 0xdb, 0x70, 0xcb, 0x78, 0xb3, 0x99, 0xdb, 0x6a, 0x3e, 0xb0,
+	0x40, 0xce, 0xd4, 0x37, 0x59, 0xc7, 0x58, 0xad, 0xa4, 0xe5, 0xe4, 0x0d, 0x74, 0x0a, 0x6e, 0x2d,
+	0xe6, 0x3c, 0x64, 0x1d, 0x35, 0xce, 0x7a, 0xeb, 0xb9, 0xf3, 0x56, 0x56, 0x5b, 0x4c, 0x0f, 0x60,
+	0xdf, 0x04, 0x67, 0x1f, 0xfa, 0x10, 0xe2, 0x09, 0x5b, 0x91, 0xfb, 0x00, 0x41, 0x32, 0x13, 0x8b,
+	0x2a, 0xa8, 0x9b, 0x75, 0x43, 0xe5, 0xf5, 0x62, 0xf0, 0xbb, 0x0d, 0x9d, 0xe0, 0xb6, 0x43, 0x4a,
+	0xc6, 0xd0, 0x63, 0x86, 0xa3, 0xe3, 0xb3, 0x72, 0x89, 0xfd, 0x76, 0x35, 0x73, 0x52, 0xcf, 0x5c,
+	0x6f, 0x98, 0x7e, 0xac, 0x37, 0x9c, 0x81, 0x97, 0x97, 0x85, 0x12, 0xe6, 0xdf, 0xb5, 0x30, 0x01,
+	0x8e, 0x77, 0xc3, 0x5e, 0x5e, 0xc1, 0xef, 0x60, 0x6f, 0x81, 0x0e, 0xfb, 0x7b, 0x87, 0xf1, 0xb0,
+	0x37, 0x3a, 0xbd, 0xee, 0x9a, 0xe8, 0x19, 0x3a, 0x7c, 0x25, 0x9d, 0xd9, 0x66, 0x95, 0x4f, 0xf2,
+	0x0c, 0xba, 0x97, 0x25, 0x72, 0x07, 0xe2, 0x15, 0xdf, 0x86, 0xeb, 0x96, 0x3f, 0xc9, 0x5d, 0xb8,
+	0x71, 0x81, 0xeb, 0x8d, 0xbf, 0x62, 0x37, 0xf3, 0x87, 0xd3, 0xf6, 0x49, 0x34, 0xfa, 0x15, 0xc1,
+	0xfe, 0xcb, 0xcb, 0xa0, 0x89, 0x16, 0xe4, 0x67, 0x04, 0x9d, 0x50, 0x21, 0x27, 0x8d, 0x07, 0xfb,
+	0xe7, 0xc9, 0x25, 0xe3, 0xc6, 0xe4, 0xff, 0xef, 0x68, 0xd0, 0x1a, 0x46, 0x47, 0xd1, 0xf4, 0x47,
+	0x04, 0x8f, 0x99, 0x2a, 0x9a, 0x1a, 0xbd, 0x8f, 0x3e, 0x7f, 0x08, 0xd2, 0x5c, 0xad, 0x51, 0xe6,
+	0x54, 0x99, 0x3c, 0xcd, 0xb9, 0xac, 0xfe, 0x8a, 0xd4, 0xb7, 0x50, 0x0b, 0xbb, 0xf3, 0xfb, 0x1d,
+	0x5f, 0xd5, 0xe6, 0x37, 0x2b, 0xfa, 0xe9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x30, 0x40,
+	0x1a, 0xfc, 0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -502,40 +447,3 @@ var _ConnectionApi_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/firebase/fcm/connection/v1alpha1/connection_api.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/firebase/fcm/connection/v1alpha1/connection_api.proto", fileDescriptor_connection_api_678fe704a2040da8)
-}
-
-var fileDescriptor_connection_api_678fe704a2040da8 = []byte{
-	// 453 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xc1, 0x6e, 0x13, 0x31,
-	0x10, 0x86, 0xb3, 0xd9, 0x42, 0x94, 0x09, 0xa5, 0xc8, 0xe2, 0x10, 0xad, 0x40, 0x54, 0x11, 0x12,
-	0x91, 0x40, 0xde, 0x36, 0x1c, 0xa8, 0x1a, 0x0e, 0x24, 0x14, 0xa9, 0x48, 0x80, 0x60, 0x05, 0x17,
-	0x2e, 0xd1, 0xc4, 0x71, 0x16, 0x2b, 0x59, 0xdb, 0xd8, 0x4e, 0x21, 0x57, 0x0e, 0x3c, 0x03, 0xef,
-	0xc0, 0x4b, 0xa2, 0x5d, 0x7b, 0x5b, 0x04, 0x87, 0x6c, 0x6f, 0xf1, 0xcc, 0xff, 0xfd, 0xff, 0x78,
-	0xe2, 0x85, 0xe7, 0xb9, 0x52, 0xf9, 0x9a, 0xa7, 0x4b, 0x61, 0xf8, 0x1c, 0x2d, 0x4f, 0x97, 0xac,
-	0x48, 0x99, 0x92, 0x92, 0x33, 0x27, 0x94, 0x4c, 0x2f, 0x8e, 0x71, 0xad, 0xbf, 0xe0, 0xf1, 0x5f,
-	0xb5, 0x19, 0x6a, 0x41, 0xb5, 0x51, 0x4e, 0x91, 0x47, 0x9e, 0xa6, 0x35, 0x4d, 0x97, 0xac, 0xa0,
-	0x57, 0x4a, 0x5a, 0xd3, 0xc9, 0xbd, 0x10, 0x83, 0x5a, 0xa4, 0x28, 0xa5, 0x72, 0x58, 0xf6, 0xad,
-	0xb7, 0x49, 0x1e, 0x84, 0x6e, 0x75, 0x9a, 0x6f, 0x96, 0xa9, 0x13, 0x05, 0xb7, 0x0e, 0x0b, 0xed,
-	0x05, 0x03, 0x06, 0x07, 0x9f, 0xb4, 0x75, 0x86, 0x63, 0x91, 0xf1, 0xaf, 0x1b, 0x6e, 0x1d, 0x79,
-	0x01, 0x31, 0xb2, 0x55, 0x3f, 0x3a, 0x8c, 0x86, 0xbd, 0xd1, 0x13, 0xda, 0x70, 0x10, 0x3a, 0x61,
-	0xab, 0xf3, 0x56, 0x56, 0xa2, 0xd3, 0xdb, 0x70, 0xcb, 0x78, 0xb3, 0x99, 0xdb, 0x6a, 0x3e, 0xb0,
-	0x40, 0xce, 0xd4, 0x37, 0x59, 0xc7, 0x58, 0xad, 0xa4, 0xe5, 0xe4, 0x0d, 0x74, 0x0a, 0x6e, 0x2d,
-	0xe6, 0x3c, 0x64, 0x1d, 0x35, 0xce, 0x7a, 0xeb, 0xb9, 0xf3, 0x56, 0x56, 0x5b, 0x4c, 0x0f, 0x60,
-	0xdf, 0x04, 0x67, 0x1f, 0xfa, 0x10, 0xe2, 0x09, 0x5b, 0x91, 0xfb, 0x00, 0x41, 0x32, 0x13, 0x8b,
-	0x2a, 0xa8, 0x9b, 0x75, 0x43, 0xe5, 0xf5, 0x62, 0xf0, 0xbb, 0x0d, 0x9d, 0xe0, 0xb6, 0x43, 0x4a,
-	0xc6, 0xd0, 0x63, 0x86, 0xa3, 0xe3, 0xb3, 0x72, 0x89, 0xfd, 0x76, 0x35, 0x73, 0x52, 0xcf, 0x5c,
-	0x6f, 0x98, 0x7e, 0xac, 0x37, 0x9c, 0x81, 0x97, 0x97, 0x85, 0x12, 0xe6, 0xdf, 0xb5, 0x30, 0x01,
-	0x8e, 0x77, 0xc3, 0x5e, 0x5e, 0xc1, 0xef, 0x60, 0x6f, 0x81, 0x0e, 0xfb, 0x7b, 0x87, 0xf1, 0xb0,
-	0x37, 0x3a, 0xbd, 0xee, 0x9a, 0xe8, 0x19, 0x3a, 0x7c, 0x25, 0x9d, 0xd9, 0x66, 0x95, 0x4f, 0xf2,
-	0x0c, 0xba, 0x97, 0x25, 0x72, 0x07, 0xe2, 0x15, 0xdf, 0x86, 0xeb, 0x96, 0x3f, 0xc9, 0x5d, 0xb8,
-	0x71, 0x81, 0xeb, 0x8d, 0xbf, 0x62, 0x37, 0xf3, 0x87, 0xd3, 0xf6, 0x49, 0x34, 0xfa, 0x15, 0xc1,
-	0xfe, 0xcb, 0xcb, 0xa0, 0x89, 0x16, 0xe4, 0x67, 0x04, 0x9d, 0x50, 0x21, 0x27, 0x8d, 0x07, 0xfb,
-	0xe7, 0xc9, 0x25, 0xe3, 0xc6, 0xe4, 0xff, 0xef, 0x68, 0xd0, 0x1a, 0x46, 0x47, 0xd1, 0xf4, 0x47,
-	0x04, 0x8f, 0x99, 0x2a, 0x9a, 0x1a, 0xbd, 0x8f, 0x3e, 0x7f, 0x08, 0xd2, 0x5c, 0xad, 0x51, 0xe6,
-	0x54, 0x99, 0x3c, 0xcd, 0xb9, 0xac, 0xfe, 0x8a, 0xd4, 0xb7, 0x50, 0x0b, 0xbb, 0xf3, 0xfb, 0x1d,
-	0x5f, 0xd5, 0xe6, 0x37, 0x2b, 0xfa, 0xe9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x30, 0x40,
-	0x1a, 0xfc, 0x03, 0x00, 0x00,
-}
diff --git a/googleapis/firestore/admin/v1/field.pb.go b/googleapis/firestore/admin/v1/field.pb.go
index 1a47eae64f..92f6ab19eb 100644
--- a/googleapis/firestore/admin/v1/field.pb.go
+++ b/googleapis/firestore/admin/v1/field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1/field.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a single field in the database.
 //
@@ -65,16 +68,17 @@ func (m *Field) Reset()         { *m = Field{} }
 func (m *Field) String() string { return proto.CompactTextString(m) }
 func (*Field) ProtoMessage()    {}
 func (*Field) Descriptor() ([]byte, []int) {
-	return fileDescriptor_field_f3c3d86fef574b48, []int{0}
+	return fileDescriptor_a50c2ee90e4658e7, []int{0}
 }
+
 func (m *Field) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Field.Unmarshal(m, b)
 }
 func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Field.Marshal(b, m, deterministic)
 }
-func (dst *Field) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Field.Merge(dst, src)
+func (m *Field) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Field.Merge(m, src)
 }
 func (m *Field) XXX_Size() int {
 	return xxx_messageInfo_Field.Size(m)
@@ -129,16 +133,17 @@ func (m *Field_IndexConfig) Reset()         { *m = Field_IndexConfig{} }
 func (m *Field_IndexConfig) String() string { return proto.CompactTextString(m) }
 func (*Field_IndexConfig) ProtoMessage()    {}
 func (*Field_IndexConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_field_f3c3d86fef574b48, []int{0, 0}
+	return fileDescriptor_a50c2ee90e4658e7, []int{0, 0}
 }
+
 func (m *Field_IndexConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Field_IndexConfig.Unmarshal(m, b)
 }
 func (m *Field_IndexConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Field_IndexConfig.Marshal(b, m, deterministic)
 }
-func (dst *Field_IndexConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Field_IndexConfig.Merge(dst, src)
+func (m *Field_IndexConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Field_IndexConfig.Merge(m, src)
 }
 func (m *Field_IndexConfig) XXX_Size() int {
 	return xxx_messageInfo_Field_IndexConfig.Size(m)
@@ -183,10 +188,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1/field.proto", fileDescriptor_field_f3c3d86fef574b48)
+	proto.RegisterFile("google/firestore/admin/v1/field.proto", fileDescriptor_a50c2ee90e4658e7)
 }
 
-var fileDescriptor_field_f3c3d86fef574b48 = []byte{
+var fileDescriptor_a50c2ee90e4658e7 = []byte{
 	// 352 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x4b, 0xc3, 0x30,
 	0x18, 0xc6, 0x49, 0x37, 0xff, 0x2c, 0x55, 0x0f, 0xc1, 0x43, 0x1d, 0x13, 0x8b, 0x30, 0xd8, 0x41,
diff --git a/googleapis/firestore/admin/v1/firestore_admin.pb.go b/googleapis/firestore/admin/v1/firestore_admin.pb.go
index e96913f824..8de5630c70 100644
--- a/googleapis/firestore/admin/v1/firestore_admin.pb.go
+++ b/googleapis/firestore/admin/v1/firestore_admin.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1/firestore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The request for [FirestoreAdmin.CreateIndex][google.firestore.admin.v1.FirestoreAdmin.CreateIndex].
 type CreateIndexRequest struct {
@@ -43,16 +43,17 @@ func (m *CreateIndexRequest) Reset()         { *m = CreateIndexRequest{} }
 func (m *CreateIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateIndexRequest) ProtoMessage()    {}
 func (*CreateIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{0}
+	return fileDescriptor_1b39559c0814b3d0, []int{0}
 }
+
 func (m *CreateIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateIndexRequest.Unmarshal(m, b)
 }
 func (m *CreateIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateIndexRequest.Merge(dst, src)
+func (m *CreateIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIndexRequest.Merge(m, src)
 }
 func (m *CreateIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateIndexRequest.Size(m)
@@ -99,16 +100,17 @@ func (m *ListIndexesRequest) Reset()         { *m = ListIndexesRequest{} }
 func (m *ListIndexesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesRequest) ProtoMessage()    {}
 func (*ListIndexesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{1}
+	return fileDescriptor_1b39559c0814b3d0, []int{1}
 }
+
 func (m *ListIndexesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesRequest.Unmarshal(m, b)
 }
 func (m *ListIndexesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesRequest.Merge(dst, src)
+func (m *ListIndexesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesRequest.Merge(m, src)
 }
 func (m *ListIndexesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesRequest.Size(m)
@@ -163,16 +165,17 @@ func (m *ListIndexesResponse) Reset()         { *m = ListIndexesResponse{} }
 func (m *ListIndexesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesResponse) ProtoMessage()    {}
 func (*ListIndexesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{2}
+	return fileDescriptor_1b39559c0814b3d0, []int{2}
 }
+
 func (m *ListIndexesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesResponse.Unmarshal(m, b)
 }
 func (m *ListIndexesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesResponse.Merge(dst, src)
+func (m *ListIndexesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesResponse.Merge(m, src)
 }
 func (m *ListIndexesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesResponse.Size(m)
@@ -211,16 +214,17 @@ func (m *GetIndexRequest) Reset()         { *m = GetIndexRequest{} }
 func (m *GetIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIndexRequest) ProtoMessage()    {}
 func (*GetIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{3}
+	return fileDescriptor_1b39559c0814b3d0, []int{3}
 }
+
 func (m *GetIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIndexRequest.Unmarshal(m, b)
 }
 func (m *GetIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIndexRequest.Merge(dst, src)
+func (m *GetIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIndexRequest.Merge(m, src)
 }
 func (m *GetIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIndexRequest.Size(m)
@@ -252,16 +256,17 @@ func (m *DeleteIndexRequest) Reset()         { *m = DeleteIndexRequest{} }
 func (m *DeleteIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteIndexRequest) ProtoMessage()    {}
 func (*DeleteIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{4}
+	return fileDescriptor_1b39559c0814b3d0, []int{4}
 }
+
 func (m *DeleteIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteIndexRequest.Unmarshal(m, b)
 }
 func (m *DeleteIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteIndexRequest.Merge(dst, src)
+func (m *DeleteIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIndexRequest.Merge(m, src)
 }
 func (m *DeleteIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteIndexRequest.Size(m)
@@ -295,16 +300,17 @@ func (m *UpdateFieldRequest) Reset()         { *m = UpdateFieldRequest{} }
 func (m *UpdateFieldRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateFieldRequest) ProtoMessage()    {}
 func (*UpdateFieldRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{5}
+	return fileDescriptor_1b39559c0814b3d0, []int{5}
 }
+
 func (m *UpdateFieldRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateFieldRequest.Unmarshal(m, b)
 }
 func (m *UpdateFieldRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateFieldRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateFieldRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateFieldRequest.Merge(dst, src)
+func (m *UpdateFieldRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFieldRequest.Merge(m, src)
 }
 func (m *UpdateFieldRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateFieldRequest.Size(m)
@@ -343,16 +349,17 @@ func (m *GetFieldRequest) Reset()         { *m = GetFieldRequest{} }
 func (m *GetFieldRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFieldRequest) ProtoMessage()    {}
 func (*GetFieldRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{6}
+	return fileDescriptor_1b39559c0814b3d0, []int{6}
 }
+
 func (m *GetFieldRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFieldRequest.Unmarshal(m, b)
 }
 func (m *GetFieldRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFieldRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFieldRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFieldRequest.Merge(dst, src)
+func (m *GetFieldRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFieldRequest.Merge(m, src)
 }
 func (m *GetFieldRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFieldRequest.Size(m)
@@ -396,16 +403,17 @@ func (m *ListFieldsRequest) Reset()         { *m = ListFieldsRequest{} }
 func (m *ListFieldsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFieldsRequest) ProtoMessage()    {}
 func (*ListFieldsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{7}
+	return fileDescriptor_1b39559c0814b3d0, []int{7}
 }
+
 func (m *ListFieldsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFieldsRequest.Unmarshal(m, b)
 }
 func (m *ListFieldsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFieldsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFieldsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFieldsRequest.Merge(dst, src)
+func (m *ListFieldsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFieldsRequest.Merge(m, src)
 }
 func (m *ListFieldsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFieldsRequest.Size(m)
@@ -460,16 +468,17 @@ func (m *ListFieldsResponse) Reset()         { *m = ListFieldsResponse{} }
 func (m *ListFieldsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFieldsResponse) ProtoMessage()    {}
 func (*ListFieldsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{8}
+	return fileDescriptor_1b39559c0814b3d0, []int{8}
 }
+
 func (m *ListFieldsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFieldsResponse.Unmarshal(m, b)
 }
 func (m *ListFieldsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFieldsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFieldsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFieldsResponse.Merge(dst, src)
+func (m *ListFieldsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFieldsResponse.Merge(m, src)
 }
 func (m *ListFieldsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFieldsResponse.Size(m)
@@ -519,16 +528,17 @@ func (m *ExportDocumentsRequest) Reset()         { *m = ExportDocumentsRequest{}
 func (m *ExportDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsRequest) ProtoMessage()    {}
 func (*ExportDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{9}
+	return fileDescriptor_1b39559c0814b3d0, []int{9}
 }
+
 func (m *ExportDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ExportDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsRequest.Merge(dst, src)
+func (m *ExportDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsRequest.Merge(m, src)
 }
 func (m *ExportDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsRequest.Size(m)
@@ -583,16 +593,17 @@ func (m *ImportDocumentsRequest) Reset()         { *m = ImportDocumentsRequest{}
 func (m *ImportDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportDocumentsRequest) ProtoMessage()    {}
 func (*ImportDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_5cf2286451a3a340, []int{10}
+	return fileDescriptor_1b39559c0814b3d0, []int{10}
 }
+
 func (m *ImportDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ImportDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDocumentsRequest.Merge(dst, src)
+func (m *ImportDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDocumentsRequest.Merge(m, src)
 }
 func (m *ImportDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportDocumentsRequest.Size(m)
@@ -638,6 +649,73 @@ func init() {
 	proto.RegisterType((*ImportDocumentsRequest)(nil), "google.firestore.admin.v1.ImportDocumentsRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/firestore/admin/v1/firestore_admin.proto", fileDescriptor_1b39559c0814b3d0)
+}
+
+var fileDescriptor_1b39559c0814b3d0 = []byte{
+	// 944 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4b, 0x6f, 0x1c, 0x45,
+	0x10, 0x56, 0xaf, 0x1f, 0xc4, 0xb5, 0x60, 0x93, 0x8e, 0xb4, 0x5a, 0x26, 0x58, 0xac, 0x06, 0x19,
+	0xad, 0x56, 0x64, 0x46, 0x6b, 0x24, 0x0b, 0x6d, 0x48, 0x80, 0x38, 0xf6, 0xca, 0x52, 0x22, 0xac,
+	0x0d, 0xc9, 0x01, 0x59, 0x5a, 0x8d, 0x77, 0xda, 0xa3, 0xc6, 0xb3, 0xdd, 0xc3, 0x74, 0x8f, 0xe5,
+	0x04, 0x59, 0x41, 0x48, 0x1c, 0x38, 0x73, 0x45, 0xe2, 0x71, 0xcc, 0x05, 0x0e, 0xfc, 0x01, 0xae,
+	0x5c, 0xf9, 0x0b, 0xfc, 0x10, 0xd4, 0x8f, 0x59, 0xef, 0x2b, 0x33, 0x4b, 0x12, 0x89, 0x5b, 0x4f,
+	0xf5, 0x57, 0x5d, 0x5f, 0x57, 0x75, 0x7d, 0x35, 0xe0, 0x47, 0x9c, 0x47, 0x31, 0xf1, 0x4f, 0x68,
+	0x4a, 0x84, 0xe4, 0x29, 0xf1, 0x83, 0x70, 0x48, 0x99, 0x7f, 0xd6, 0xbe, 0x34, 0xf5, 0xb5, 0xc9,
+	0x4b, 0x52, 0x2e, 0x39, 0x7e, 0xcb, 0x38, 0x78, 0xa3, 0x5d, 0xcf, 0xec, 0x9e, 0xb5, 0x9d, 0xb7,
+	0xed, 0x59, 0x41, 0x42, 0xfd, 0x80, 0x31, 0x2e, 0x03, 0x49, 0x39, 0x13, 0xc6, 0xd1, 0xd9, 0x2a,
+	0x8a, 0x44, 0xe2, 0xb0, 0x1c, 0x46, 0x59, 0x48, 0xce, 0x2d, 0xec, 0x5d, 0x0b, 0x8b, 0x39, 0x8b,
+	0xd2, 0x8c, 0x31, 0xca, 0x22, 0x9f, 0x27, 0x24, 0x9d, 0x08, 0x79, 0xdd, 0x82, 0xf4, 0xd7, 0x71,
+	0x76, 0xe2, 0x93, 0x61, 0x22, 0x1f, 0xdb, 0xcd, 0xc6, 0xf4, 0xa6, 0x66, 0xd1, 0x1f, 0x06, 0xe2,
+	0xd4, 0x20, 0xdc, 0x10, 0xf0, 0x6e, 0x4a, 0x02, 0x49, 0x0e, 0x54, 0xe0, 0x1e, 0xf9, 0x2a, 0x23,
+	0x42, 0xe2, 0x1a, 0xac, 0x26, 0x41, 0x4a, 0x98, 0xac, 0xa3, 0x06, 0x6a, 0xae, 0xf5, 0xec, 0x17,
+	0xde, 0x81, 0x15, 0x4d, 0xb0, 0x5e, 0x69, 0xa0, 0x66, 0x75, 0xbb, 0xe1, 0x3d, 0x37, 0x51, 0x9e,
+	0x39, 0xcf, 0xc0, 0xdd, 0x6f, 0x10, 0xe0, 0x7b, 0x54, 0x48, 0x6d, 0x24, 0xa2, 0x2c, 0x4c, 0x0d,
+	0x56, 0x4f, 0x68, 0x2c, 0x49, 0xaa, 0xe3, 0xac, 0xf5, 0xec, 0x17, 0xbe, 0x0e, 0x6b, 0x49, 0x10,
+	0x91, 0xbe, 0xa0, 0x4f, 0x48, 0x7d, 0xa9, 0x81, 0x9a, 0x2b, 0xbd, 0x2b, 0xca, 0xf0, 0x80, 0x3e,
+	0x21, 0x78, 0x13, 0x40, 0x6f, 0x4a, 0x7e, 0x4a, 0x58, 0x7d, 0x59, 0x3b, 0x6a, 0xf8, 0xe7, 0xca,
+	0xe0, 0x3e, 0x86, 0x6b, 0x13, 0x0c, 0x44, 0xc2, 0x99, 0x20, 0xb8, 0x03, 0xaf, 0x51, 0x63, 0xaa,
+	0xa3, 0xc6, 0xd2, 0x42, 0x77, 0xca, 0x1d, 0xf0, 0x7b, 0xb0, 0xc1, 0xc8, 0xb9, 0xec, 0x8f, 0x85,
+	0x35, 0x7c, 0xdf, 0x50, 0xe6, 0xc3, 0x51, 0xe8, 0x2d, 0xd8, 0xe8, 0x12, 0x39, 0x91, 0x60, 0x0c,
+	0xcb, 0x2c, 0x18, 0x12, 0x7b, 0x6f, 0xbd, 0x76, 0x9b, 0x80, 0xef, 0x92, 0x98, 0x4c, 0x95, 0x62,
+	0x1e, 0xf2, 0x7b, 0x04, 0xf8, 0x61, 0x12, 0x06, 0x92, 0xec, 0xab, 0x7a, 0xe6, 0xd0, 0x1d, 0x58,
+	0xd1, 0xf5, 0xd5, 0xd8, 0xe2, 0x9b, 0x18, 0x3f, 0x03, 0xc7, 0x37, 0xa1, 0x9a, 0xe9, 0xd3, 0xf4,
+	0xc3, 0xb0, 0xb5, 0x75, 0x72, 0xef, 0xfc, 0xed, 0x18, 0x9f, 0xfb, 0x81, 0x38, 0xed, 0x81, 0x81,
+	0xab, 0xb5, 0xbd, 0xdc, 0x04, 0x8f, 0x79, 0x94, 0x9f, 0xc2, 0x55, 0x95, 0x7e, 0x8d, 0xfb, 0x5f,
+	0xea, 0x7f, 0x66, 0x5e, 0x60, 0x4e, 0xc0, 0x96, 0xff, 0x43, 0x15, 0x49, 0x59, 0x16, 0xa8, 0xbe,
+	0xb9, 0xa3, 0xc5, 0x2f, 0x5c, 0xfc, 0xa7, 0x50, 0xdb, 0x3b, 0x4f, 0x78, 0x2a, 0xef, 0xf2, 0x41,
+	0x36, 0x24, 0x4c, 0x8a, 0x82, 0x34, 0xe1, 0x2d, 0x58, 0x1f, 0xf0, 0x38, 0x26, 0x03, 0xd5, 0xe2,
+	0x7d, 0x1a, 0x8a, 0x7a, 0xa5, 0xb1, 0xa4, 0x0e, 0xbd, 0xb4, 0x1e, 0x84, 0x02, 0xb7, 0xe0, 0x2a,
+	0xcf, 0x64, 0x92, 0xc9, 0x7e, 0x96, 0xd2, 0x7e, 0x92, 0x92, 0x13, 0x7a, 0xae, 0x13, 0xb2, 0xd6,
+	0xdb, 0x30, 0x1b, 0x0f, 0x53, 0x7a, 0xa8, 0xcd, 0xee, 0x05, 0xd4, 0x0e, 0x86, 0xaf, 0x9a, 0x40,
+	0x13, 0xde, 0xa4, 0x6c, 0x6e, 0xfc, 0x75, 0x6d, 0x1f, 0x85, 0xdf, 0xfe, 0xee, 0x75, 0x58, 0xdf,
+	0xcf, 0x93, 0xf9, 0xa9, 0xca, 0x25, 0x7e, 0x86, 0xa0, 0x3a, 0x26, 0x3a, 0xf8, 0x46, 0x41, 0xd2,
+	0x67, 0xc5, 0xc9, 0xd9, 0xcc, 0xe1, 0x63, 0xba, 0xe8, 0x7d, 0x96, 0xeb, 0xa2, 0x7b, 0xff, 0xdb,
+	0xbf, 0xff, 0xf9, 0xa1, 0xd2, 0x75, 0x6f, 0x2b, 0x39, 0xfd, 0xda, 0xbc, 0xa8, 0x5b, 0x49, 0xca,
+	0xbf, 0x24, 0x03, 0x29, 0xfc, 0x96, 0x1f, 0x06, 0x32, 0x38, 0x0e, 0x04, 0x51, 0xeb, 0xcb, 0x4b,
+	0x75, 0x53, 0x9e, 0x25, 0xc2, 0x6f, 0x5d, 0xf8, 0xb6, 0xbb, 0x3b, 0x46, 0xba, 0xf0, 0x1f, 0x08,
+	0xaa, 0x63, 0xc2, 0x51, 0x48, 0x76, 0x56, 0xe2, 0x1c, 0x6f, 0x51, 0xb8, 0x79, 0x90, 0xee, 0xbe,
+	0x66, 0xff, 0x09, 0x7e, 0x49, 0xf6, 0xf8, 0x67, 0x04, 0x57, 0x72, 0xd1, 0xc1, 0xad, 0x02, 0x12,
+	0x53, 0xca, 0xe4, 0x94, 0xea, 0xdf, 0x14, 0x45, 0xf5, 0x6a, 0x16, 0x27, 0x98, 0xf3, 0xf3, 0x5b,
+	0x17, 0xf8, 0x47, 0x04, 0xd5, 0x31, 0xc1, 0x2b, 0xcc, 0xec, 0xac, 0x30, 0x3a, 0xb5, 0x19, 0x81,
+	0xda, 0x53, 0x93, 0x2f, 0xa7, 0xd7, 0x7a, 0x59, 0x7a, 0x3f, 0x99, 0x0c, 0xea, 0xae, 0x2f, 0xcb,
+	0xe0, 0xb8, 0xfc, 0x39, 0xa5, 0x1a, 0xe2, 0xee, 0x69, 0x8a, 0x1f, 0xe3, 0x5b, 0x2f, 0x42, 0xd1,
+	0xe8, 0x8f, 0x62, 0xf8, 0x1b, 0x82, 0xea, 0xd8, 0x18, 0x28, 0x4c, 0xe0, 0xec, 0xb8, 0x28, 0xeb,
+	0xa3, 0x9e, 0x26, 0x79, 0x6f, 0x7b, 0x57, 0x93, 0x34, 0xbf, 0x2f, 0x2f, 0x4a, 0xb5, 0x63, 0x27,
+	0xcd, 0xef, 0x08, 0xe0, 0x52, 0x85, 0xf1, 0xfb, 0x25, 0xcd, 0x31, 0x31, 0x2d, 0x9c, 0x1b, 0x0b,
+	0xa2, 0x6d, 0x27, 0x4d, 0x26, 0xf9, 0xbf, 0x77, 0x92, 0xd5, 0xf9, 0x5f, 0x10, 0x6c, 0x4c, 0x09,
+	0x38, 0x6e, 0x17, 0x30, 0x99, 0x2f, 0xf6, 0x65, 0xc9, 0xfe, 0x48, 0x93, 0xdd, 0x71, 0xdb, 0x65,
+	0x2f, 0xe2, 0xa2, 0x43, 0x26, 0x03, 0x74, 0x50, 0x4b, 0x73, 0x9c, 0xd2, 0xf8, 0x42, 0x8e, 0xf3,
+	0xe7, 0xc1, 0x2b, 0xe4, 0x48, 0x87, 0xd3, 0x1c, 0xef, 0xfc, 0x89, 0x60, 0x73, 0xc0, 0x87, 0xcf,
+	0x67, 0x75, 0xe7, 0xda, 0xe4, 0x98, 0x38, 0x54, 0x6d, 0x7d, 0x88, 0xbe, 0xb8, 0x6d, 0x3d, 0x22,
+	0x1e, 0x07, 0x2c, 0xf2, 0x78, 0x1a, 0xf9, 0x11, 0x61, 0xba, 0xe9, 0xed, 0x8f, 0x7d, 0x90, 0x50,
+	0x31, 0xe7, 0x5f, 0xfa, 0xa6, 0x5e, 0xfc, 0x5a, 0x59, 0xee, 0xee, 0xee, 0x3f, 0x78, 0x56, 0x79,
+	0xa7, 0x6b, 0xce, 0xd9, 0x8d, 0x79, 0x16, 0x7a, 0xa3, 0x58, 0x9e, 0x0e, 0xe6, 0x3d, 0x6a, 0xff,
+	0x95, 0x23, 0x8e, 0x34, 0xe2, 0x68, 0x84, 0x38, 0xd2, 0x88, 0xa3, 0x47, 0xed, 0xe3, 0x55, 0x1d,
+	0xf5, 0x83, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xde, 0x49, 0x90, 0x6c, 0x51, 0x0c, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1051,70 +1129,3 @@ var _FirestoreAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/firestore/admin/v1/firestore_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/firestore/admin/v1/firestore_admin.proto", fileDescriptor_firestore_admin_5cf2286451a3a340)
-}
-
-var fileDescriptor_firestore_admin_5cf2286451a3a340 = []byte{
-	// 944 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4b, 0x6f, 0x1c, 0x45,
-	0x10, 0x56, 0xaf, 0x1f, 0xc4, 0xb5, 0x60, 0x93, 0x8e, 0xb4, 0x5a, 0x26, 0x58, 0xac, 0x06, 0x19,
-	0xad, 0x56, 0x64, 0x46, 0x6b, 0x24, 0x0b, 0x6d, 0x48, 0x80, 0x38, 0xf6, 0xca, 0x52, 0x22, 0xac,
-	0x0d, 0xc9, 0x01, 0x59, 0x5a, 0x8d, 0x77, 0xda, 0xa3, 0xc6, 0xb3, 0xdd, 0xc3, 0x74, 0x8f, 0xe5,
-	0x04, 0x59, 0x41, 0x48, 0x1c, 0x38, 0x73, 0x45, 0xe2, 0x71, 0xcc, 0x05, 0x0e, 0xfc, 0x01, 0xae,
-	0x5c, 0xf9, 0x0b, 0xfc, 0x10, 0xd4, 0x8f, 0x59, 0xef, 0x2b, 0x33, 0x4b, 0x12, 0x89, 0x5b, 0x4f,
-	0xf5, 0x57, 0x5d, 0x5f, 0x57, 0x75, 0x7d, 0x35, 0xe0, 0x47, 0x9c, 0x47, 0x31, 0xf1, 0x4f, 0x68,
-	0x4a, 0x84, 0xe4, 0x29, 0xf1, 0x83, 0x70, 0x48, 0x99, 0x7f, 0xd6, 0xbe, 0x34, 0xf5, 0xb5, 0xc9,
-	0x4b, 0x52, 0x2e, 0x39, 0x7e, 0xcb, 0x38, 0x78, 0xa3, 0x5d, 0xcf, 0xec, 0x9e, 0xb5, 0x9d, 0xb7,
-	0xed, 0x59, 0x41, 0x42, 0xfd, 0x80, 0x31, 0x2e, 0x03, 0x49, 0x39, 0x13, 0xc6, 0xd1, 0xd9, 0x2a,
-	0x8a, 0x44, 0xe2, 0xb0, 0x1c, 0x46, 0x59, 0x48, 0xce, 0x2d, 0xec, 0x5d, 0x0b, 0x8b, 0x39, 0x8b,
-	0xd2, 0x8c, 0x31, 0xca, 0x22, 0x9f, 0x27, 0x24, 0x9d, 0x08, 0x79, 0xdd, 0x82, 0xf4, 0xd7, 0x71,
-	0x76, 0xe2, 0x93, 0x61, 0x22, 0x1f, 0xdb, 0xcd, 0xc6, 0xf4, 0xa6, 0x66, 0xd1, 0x1f, 0x06, 0xe2,
-	0xd4, 0x20, 0xdc, 0x10, 0xf0, 0x6e, 0x4a, 0x02, 0x49, 0x0e, 0x54, 0xe0, 0x1e, 0xf9, 0x2a, 0x23,
-	0x42, 0xe2, 0x1a, 0xac, 0x26, 0x41, 0x4a, 0x98, 0xac, 0xa3, 0x06, 0x6a, 0xae, 0xf5, 0xec, 0x17,
-	0xde, 0x81, 0x15, 0x4d, 0xb0, 0x5e, 0x69, 0xa0, 0x66, 0x75, 0xbb, 0xe1, 0x3d, 0x37, 0x51, 0x9e,
-	0x39, 0xcf, 0xc0, 0xdd, 0x6f, 0x10, 0xe0, 0x7b, 0x54, 0x48, 0x6d, 0x24, 0xa2, 0x2c, 0x4c, 0x0d,
-	0x56, 0x4f, 0x68, 0x2c, 0x49, 0xaa, 0xe3, 0xac, 0xf5, 0xec, 0x17, 0xbe, 0x0e, 0x6b, 0x49, 0x10,
-	0x91, 0xbe, 0xa0, 0x4f, 0x48, 0x7d, 0xa9, 0x81, 0x9a, 0x2b, 0xbd, 0x2b, 0xca, 0xf0, 0x80, 0x3e,
-	0x21, 0x78, 0x13, 0x40, 0x6f, 0x4a, 0x7e, 0x4a, 0x58, 0x7d, 0x59, 0x3b, 0x6a, 0xf8, 0xe7, 0xca,
-	0xe0, 0x3e, 0x86, 0x6b, 0x13, 0x0c, 0x44, 0xc2, 0x99, 0x20, 0xb8, 0x03, 0xaf, 0x51, 0x63, 0xaa,
-	0xa3, 0xc6, 0xd2, 0x42, 0x77, 0xca, 0x1d, 0xf0, 0x7b, 0xb0, 0xc1, 0xc8, 0xb9, 0xec, 0x8f, 0x85,
-	0x35, 0x7c, 0xdf, 0x50, 0xe6, 0xc3, 0x51, 0xe8, 0x2d, 0xd8, 0xe8, 0x12, 0x39, 0x91, 0x60, 0x0c,
-	0xcb, 0x2c, 0x18, 0x12, 0x7b, 0x6f, 0xbd, 0x76, 0x9b, 0x80, 0xef, 0x92, 0x98, 0x4c, 0x95, 0x62,
-	0x1e, 0xf2, 0x7b, 0x04, 0xf8, 0x61, 0x12, 0x06, 0x92, 0xec, 0xab, 0x7a, 0xe6, 0xd0, 0x1d, 0x58,
-	0xd1, 0xf5, 0xd5, 0xd8, 0xe2, 0x9b, 0x18, 0x3f, 0x03, 0xc7, 0x37, 0xa1, 0x9a, 0xe9, 0xd3, 0xf4,
-	0xc3, 0xb0, 0xb5, 0x75, 0x72, 0xef, 0xfc, 0xed, 0x18, 0x9f, 0xfb, 0x81, 0x38, 0xed, 0x81, 0x81,
-	0xab, 0xb5, 0xbd, 0xdc, 0x04, 0x8f, 0x79, 0x94, 0x9f, 0xc2, 0x55, 0x95, 0x7e, 0x8d, 0xfb, 0x5f,
-	0xea, 0x7f, 0x66, 0x5e, 0x60, 0x4e, 0xc0, 0x96, 0xff, 0x43, 0x15, 0x49, 0x59, 0x16, 0xa8, 0xbe,
-	0xb9, 0xa3, 0xc5, 0x2f, 0x5c, 0xfc, 0xa7, 0x50, 0xdb, 0x3b, 0x4f, 0x78, 0x2a, 0xef, 0xf2, 0x41,
-	0x36, 0x24, 0x4c, 0x8a, 0x82, 0x34, 0xe1, 0x2d, 0x58, 0x1f, 0xf0, 0x38, 0x26, 0x03, 0xd5, 0xe2,
-	0x7d, 0x1a, 0x8a, 0x7a, 0xa5, 0xb1, 0xa4, 0x0e, 0xbd, 0xb4, 0x1e, 0x84, 0x02, 0xb7, 0xe0, 0x2a,
-	0xcf, 0x64, 0x92, 0xc9, 0x7e, 0x96, 0xd2, 0x7e, 0x92, 0x92, 0x13, 0x7a, 0xae, 0x13, 0xb2, 0xd6,
-	0xdb, 0x30, 0x1b, 0x0f, 0x53, 0x7a, 0xa8, 0xcd, 0xee, 0x05, 0xd4, 0x0e, 0x86, 0xaf, 0x9a, 0x40,
-	0x13, 0xde, 0xa4, 0x6c, 0x6e, 0xfc, 0x75, 0x6d, 0x1f, 0x85, 0xdf, 0xfe, 0xee, 0x75, 0x58, 0xdf,
-	0xcf, 0x93, 0xf9, 0xa9, 0xca, 0x25, 0x7e, 0x86, 0xa0, 0x3a, 0x26, 0x3a, 0xf8, 0x46, 0x41, 0xd2,
-	0x67, 0xc5, 0xc9, 0xd9, 0xcc, 0xe1, 0x63, 0xba, 0xe8, 0x7d, 0x96, 0xeb, 0xa2, 0x7b, 0xff, 0xdb,
-	0xbf, 0xff, 0xf9, 0xa1, 0xd2, 0x75, 0x6f, 0x2b, 0x39, 0xfd, 0xda, 0xbc, 0xa8, 0x5b, 0x49, 0xca,
-	0xbf, 0x24, 0x03, 0x29, 0xfc, 0x96, 0x1f, 0x06, 0x32, 0x38, 0x0e, 0x04, 0x51, 0xeb, 0xcb, 0x4b,
-	0x75, 0x53, 0x9e, 0x25, 0xc2, 0x6f, 0x5d, 0xf8, 0xb6, 0xbb, 0x3b, 0x46, 0xba, 0xf0, 0x1f, 0x08,
-	0xaa, 0x63, 0xc2, 0x51, 0x48, 0x76, 0x56, 0xe2, 0x1c, 0x6f, 0x51, 0xb8, 0x79, 0x90, 0xee, 0xbe,
-	0x66, 0xff, 0x09, 0x7e, 0x49, 0xf6, 0xf8, 0x67, 0x04, 0x57, 0x72, 0xd1, 0xc1, 0xad, 0x02, 0x12,
-	0x53, 0xca, 0xe4, 0x94, 0xea, 0xdf, 0x14, 0x45, 0xf5, 0x6a, 0x16, 0x27, 0x98, 0xf3, 0xf3, 0x5b,
-	0x17, 0xf8, 0x47, 0x04, 0xd5, 0x31, 0xc1, 0x2b, 0xcc, 0xec, 0xac, 0x30, 0x3a, 0xb5, 0x19, 0x81,
-	0xda, 0x53, 0x93, 0x2f, 0xa7, 0xd7, 0x7a, 0x59, 0x7a, 0x3f, 0x99, 0x0c, 0xea, 0xae, 0x2f, 0xcb,
-	0xe0, 0xb8, 0xfc, 0x39, 0xa5, 0x1a, 0xe2, 0xee, 0x69, 0x8a, 0x1f, 0xe3, 0x5b, 0x2f, 0x42, 0xd1,
-	0xe8, 0x8f, 0x62, 0xf8, 0x1b, 0x82, 0xea, 0xd8, 0x18, 0x28, 0x4c, 0xe0, 0xec, 0xb8, 0x28, 0xeb,
-	0xa3, 0x9e, 0x26, 0x79, 0x6f, 0x7b, 0x57, 0x93, 0x34, 0xbf, 0x2f, 0x2f, 0x4a, 0xb5, 0x63, 0x27,
-	0xcd, 0xef, 0x08, 0xe0, 0x52, 0x85, 0xf1, 0xfb, 0x25, 0xcd, 0x31, 0x31, 0x2d, 0x9c, 0x1b, 0x0b,
-	0xa2, 0x6d, 0x27, 0x4d, 0x26, 0xf9, 0xbf, 0x77, 0x92, 0xd5, 0xf9, 0x5f, 0x10, 0x6c, 0x4c, 0x09,
-	0x38, 0x6e, 0x17, 0x30, 0x99, 0x2f, 0xf6, 0x65, 0xc9, 0xfe, 0x48, 0x93, 0xdd, 0x71, 0xdb, 0x65,
-	0x2f, 0xe2, 0xa2, 0x43, 0x26, 0x03, 0x74, 0x50, 0x4b, 0x73, 0x9c, 0xd2, 0xf8, 0x42, 0x8e, 0xf3,
-	0xe7, 0xc1, 0x2b, 0xe4, 0x48, 0x87, 0xd3, 0x1c, 0xef, 0xfc, 0x89, 0x60, 0x73, 0xc0, 0x87, 0xcf,
-	0x67, 0x75, 0xe7, 0xda, 0xe4, 0x98, 0x38, 0x54, 0x6d, 0x7d, 0x88, 0xbe, 0xb8, 0x6d, 0x3d, 0x22,
-	0x1e, 0x07, 0x2c, 0xf2, 0x78, 0x1a, 0xf9, 0x11, 0x61, 0xba, 0xe9, 0xed, 0x8f, 0x7d, 0x90, 0x50,
-	0x31, 0xe7, 0x5f, 0xfa, 0xa6, 0x5e, 0xfc, 0x5a, 0x59, 0xee, 0xee, 0xee, 0x3f, 0x78, 0x56, 0x79,
-	0xa7, 0x6b, 0xce, 0xd9, 0x8d, 0x79, 0x16, 0x7a, 0xa3, 0x58, 0x9e, 0x0e, 0xe6, 0x3d, 0x6a, 0xff,
-	0x95, 0x23, 0x8e, 0x34, 0xe2, 0x68, 0x84, 0x38, 0xd2, 0x88, 0xa3, 0x47, 0xed, 0xe3, 0x55, 0x1d,
-	0xf5, 0x83, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xde, 0x49, 0x90, 0x6c, 0x51, 0x0c, 0x00, 0x00,
-}
diff --git a/googleapis/firestore/admin/v1/index.pb.go b/googleapis/firestore/admin/v1/index.pb.go
index 6b9bd421a9..3403539119 100644
--- a/googleapis/firestore/admin/v1/index.pb.go
+++ b/googleapis/firestore/admin/v1/index.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1/index.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Query Scope defines the scope at which a query is run. This is specified on
 // a StructuredQuery's `from` field.
@@ -36,6 +39,7 @@ var Index_QueryScope_name = map[int32]string{
 	0: "QUERY_SCOPE_UNSPECIFIED",
 	1: "COLLECTION",
 }
+
 var Index_QueryScope_value = map[string]int32{
 	"QUERY_SCOPE_UNSPECIFIED": 0,
 	"COLLECTION":              1,
@@ -44,8 +48,9 @@ var Index_QueryScope_value = map[string]int32{
 func (x Index_QueryScope) String() string {
 	return proto.EnumName(Index_QueryScope_name, int32(x))
 }
+
 func (Index_QueryScope) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_58e7fd4a61be5522, []int{0, 0}
+	return fileDescriptor_8cde9a305041caf2, []int{0, 0}
 }
 
 // The state of an index. During index creation, an index will be in the
@@ -83,6 +88,7 @@ var Index_State_name = map[int32]string{
 	2: "READY",
 	3: "NEEDS_REPAIR",
 }
+
 var Index_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          1,
@@ -93,8 +99,9 @@ var Index_State_value = map[string]int32{
 func (x Index_State) String() string {
 	return proto.EnumName(Index_State_name, int32(x))
 }
+
 func (Index_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_58e7fd4a61be5522, []int{0, 1}
+	return fileDescriptor_8cde9a305041caf2, []int{0, 1}
 }
 
 // The supported orderings.
@@ -114,6 +121,7 @@ var Index_IndexField_Order_name = map[int32]string{
 	1: "ASCENDING",
 	2: "DESCENDING",
 }
+
 var Index_IndexField_Order_value = map[string]int32{
 	"ORDER_UNSPECIFIED": 0,
 	"ASCENDING":         1,
@@ -123,8 +131,9 @@ var Index_IndexField_Order_value = map[string]int32{
 func (x Index_IndexField_Order) String() string {
 	return proto.EnumName(Index_IndexField_Order_name, int32(x))
 }
+
 func (Index_IndexField_Order) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_58e7fd4a61be5522, []int{0, 0, 0}
+	return fileDescriptor_8cde9a305041caf2, []int{0, 0, 0}
 }
 
 // The supported array value configurations.
@@ -141,6 +150,7 @@ var Index_IndexField_ArrayConfig_name = map[int32]string{
 	0: "ARRAY_CONFIG_UNSPECIFIED",
 	1: "CONTAINS",
 }
+
 var Index_IndexField_ArrayConfig_value = map[string]int32{
 	"ARRAY_CONFIG_UNSPECIFIED": 0,
 	"CONTAINS":                 1,
@@ -149,8 +159,9 @@ var Index_IndexField_ArrayConfig_value = map[string]int32{
 func (x Index_IndexField_ArrayConfig) String() string {
 	return proto.EnumName(Index_IndexField_ArrayConfig_name, int32(x))
 }
+
 func (Index_IndexField_ArrayConfig) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_58e7fd4a61be5522, []int{0, 0, 1}
+	return fileDescriptor_8cde9a305041caf2, []int{0, 0, 1}
 }
 
 // Cloud Firestore indexes enable simple and complex queries against
@@ -194,16 +205,17 @@ func (m *Index) Reset()         { *m = Index{} }
 func (m *Index) String() string { return proto.CompactTextString(m) }
 func (*Index) ProtoMessage()    {}
 func (*Index) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_58e7fd4a61be5522, []int{0}
+	return fileDescriptor_8cde9a305041caf2, []int{0}
 }
+
 func (m *Index) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Index.Unmarshal(m, b)
 }
 func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Index.Marshal(b, m, deterministic)
 }
-func (dst *Index) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Index.Merge(dst, src)
+func (m *Index) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index.Merge(m, src)
 }
 func (m *Index) XXX_Size() int {
 	return xxx_messageInfo_Index.Size(m)
@@ -265,16 +277,17 @@ func (m *Index_IndexField) Reset()         { *m = Index_IndexField{} }
 func (m *Index_IndexField) String() string { return proto.CompactTextString(m) }
 func (*Index_IndexField) ProtoMessage()    {}
 func (*Index_IndexField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_58e7fd4a61be5522, []int{0, 0}
+	return fileDescriptor_8cde9a305041caf2, []int{0, 0}
 }
+
 func (m *Index_IndexField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Index_IndexField.Unmarshal(m, b)
 }
 func (m *Index_IndexField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Index_IndexField.Marshal(b, m, deterministic)
 }
-func (dst *Index_IndexField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Index_IndexField.Merge(dst, src)
+func (m *Index_IndexField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index_IndexField.Merge(m, src)
 }
 func (m *Index_IndexField) XXX_Size() int {
 	return xxx_messageInfo_Index_IndexField.Size(m)
@@ -329,84 +342,28 @@ func (m *Index_IndexField) GetArrayConfig() Index_IndexField_ArrayConfig {
 	return Index_IndexField_ARRAY_CONFIG_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Index_IndexField) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Index_IndexField_OneofMarshaler, _Index_IndexField_OneofUnmarshaler, _Index_IndexField_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Index_IndexField) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Index_IndexField_Order_)(nil),
 		(*Index_IndexField_ArrayConfig_)(nil),
 	}
 }
 
-func _Index_IndexField_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Index_IndexField)
-	// value_mode
-	switch x := m.ValueMode.(type) {
-	case *Index_IndexField_Order_:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Order))
-	case *Index_IndexField_ArrayConfig_:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ArrayConfig))
-	case nil:
-	default:
-		return fmt.Errorf("Index_IndexField.ValueMode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Index_IndexField_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Index_IndexField)
-	switch tag {
-	case 2: // value_mode.order
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueMode = &Index_IndexField_Order_{Index_IndexField_Order(x)}
-		return true, err
-	case 3: // value_mode.array_config
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueMode = &Index_IndexField_ArrayConfig_{Index_IndexField_ArrayConfig(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Index_IndexField_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Index_IndexField)
-	// value_mode
-	switch x := m.ValueMode.(type) {
-	case *Index_IndexField_Order_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Order))
-	case *Index_IndexField_ArrayConfig_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ArrayConfig))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
-	proto.RegisterType((*Index)(nil), "google.firestore.admin.v1.Index")
-	proto.RegisterType((*Index_IndexField)(nil), "google.firestore.admin.v1.Index.IndexField")
 	proto.RegisterEnum("google.firestore.admin.v1.Index_QueryScope", Index_QueryScope_name, Index_QueryScope_value)
 	proto.RegisterEnum("google.firestore.admin.v1.Index_State", Index_State_name, Index_State_value)
 	proto.RegisterEnum("google.firestore.admin.v1.Index_IndexField_Order", Index_IndexField_Order_name, Index_IndexField_Order_value)
 	proto.RegisterEnum("google.firestore.admin.v1.Index_IndexField_ArrayConfig", Index_IndexField_ArrayConfig_name, Index_IndexField_ArrayConfig_value)
+	proto.RegisterType((*Index)(nil), "google.firestore.admin.v1.Index")
+	proto.RegisterType((*Index_IndexField)(nil), "google.firestore.admin.v1.Index.IndexField")
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1/index.proto", fileDescriptor_index_58e7fd4a61be5522)
+	proto.RegisterFile("google/firestore/admin/v1/index.proto", fileDescriptor_8cde9a305041caf2)
 }
 
-var fileDescriptor_index_58e7fd4a61be5522 = []byte{
+var fileDescriptor_8cde9a305041caf2 = []byte{
 	// 554 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdf, 0x6a, 0xdb, 0x30,
 	0x14, 0xc6, 0x6b, 0xa7, 0x2e, 0xcb, 0x49, 0x56, 0x3c, 0xc1, 0x98, 0xd7, 0xb5, 0xac, 0x04, 0x36,
diff --git a/googleapis/firestore/admin/v1/location.pb.go b/googleapis/firestore/admin/v1/location.pb.go
index a25c5bc2ac..c1bc082505 100644
--- a/googleapis/firestore/admin/v1/location.pb.go
+++ b/googleapis/firestore/admin/v1/location.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1/location.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The metadata message for [google.cloud.location.Location.metadata][google.cloud.location.Location.metadata].
 type LocationMetadata struct {
@@ -31,16 +34,17 @@ func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
 func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LocationMetadata) ProtoMessage()    {}
 func (*LocationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_d0ba94c897950f24, []int{0}
+	return fileDescriptor_57c72114c0c8faa4, []int{0}
 }
+
 func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
 }
 func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+func (m *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(m, src)
 }
 func (m *LocationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LocationMetadata.Size(m)
@@ -56,10 +60,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1/location.proto", fileDescriptor_location_d0ba94c897950f24)
+	proto.RegisterFile("google/firestore/admin/v1/location.proto", fileDescriptor_57c72114c0c8faa4)
 }
 
-var fileDescriptor_location_d0ba94c897950f24 = []byte{
+var fileDescriptor_57c72114c0c8faa4 = []byte{
 	// 230 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0xcb, 0x2c, 0x4a, 0x2d, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x4f, 0x4c, 0xc9,
diff --git a/googleapis/firestore/admin/v1/operation.pb.go b/googleapis/firestore/admin/v1/operation.pb.go
index b92bf935bd..578ad439b3 100644
--- a/googleapis/firestore/admin/v1/operation.pb.go
+++ b/googleapis/firestore/admin/v1/operation.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1/operation.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes the state of the operation.
 type OperationState int32
@@ -54,6 +57,7 @@ var OperationState_name = map[int32]string{
 	6: "FAILED",
 	7: "CANCELLED",
 }
+
 var OperationState_value = map[string]int32{
 	"OPERATION_STATE_UNSPECIFIED": 0,
 	"INITIALIZING":                1,
@@ -68,8 +72,9 @@ var OperationState_value = map[string]int32{
 func (x OperationState) String() string {
 	return proto.EnumName(OperationState_name, int32(x))
 }
+
 func (OperationState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{0}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{0}
 }
 
 // Specifies how the index is changing.
@@ -89,6 +94,7 @@ var FieldOperationMetadata_IndexConfigDelta_ChangeType_name = map[int32]string{
 	1: "ADD",
 	2: "REMOVE",
 }
+
 var FieldOperationMetadata_IndexConfigDelta_ChangeType_value = map[string]int32{
 	"CHANGE_TYPE_UNSPECIFIED": 0,
 	"ADD":                     1,
@@ -98,8 +104,9 @@ var FieldOperationMetadata_IndexConfigDelta_ChangeType_value = map[string]int32{
 func (x FieldOperationMetadata_IndexConfigDelta_ChangeType) String() string {
 	return proto.EnumName(FieldOperationMetadata_IndexConfigDelta_ChangeType_name, int32(x))
 }
+
 func (FieldOperationMetadata_IndexConfigDelta_ChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{1, 0, 0}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{1, 0, 0}
 }
 
 // Metadata for [google.longrunning.Operation][google.longrunning.Operation] results from
@@ -128,16 +135,17 @@ func (m *IndexOperationMetadata) Reset()         { *m = IndexOperationMetadata{}
 func (m *IndexOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*IndexOperationMetadata) ProtoMessage()    {}
 func (*IndexOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{0}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{0}
 }
+
 func (m *IndexOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IndexOperationMetadata.Unmarshal(m, b)
 }
 func (m *IndexOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IndexOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *IndexOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IndexOperationMetadata.Merge(dst, src)
+func (m *IndexOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IndexOperationMetadata.Merge(m, src)
 }
 func (m *IndexOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_IndexOperationMetadata.Size(m)
@@ -219,16 +227,17 @@ func (m *FieldOperationMetadata) Reset()         { *m = FieldOperationMetadata{}
 func (m *FieldOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*FieldOperationMetadata) ProtoMessage()    {}
 func (*FieldOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{1}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{1}
 }
+
 func (m *FieldOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldOperationMetadata.Unmarshal(m, b)
 }
 func (m *FieldOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *FieldOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldOperationMetadata.Merge(dst, src)
+func (m *FieldOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldOperationMetadata.Merge(m, src)
 }
 func (m *FieldOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_FieldOperationMetadata.Size(m)
@@ -305,16 +314,17 @@ func (m *FieldOperationMetadata_IndexConfigDelta) Reset() {
 func (m *FieldOperationMetadata_IndexConfigDelta) String() string { return proto.CompactTextString(m) }
 func (*FieldOperationMetadata_IndexConfigDelta) ProtoMessage()    {}
 func (*FieldOperationMetadata_IndexConfigDelta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{1, 0}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{1, 0}
 }
+
 func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Unmarshal(m, b)
 }
 func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Marshal(b, m, deterministic)
 }
-func (dst *FieldOperationMetadata_IndexConfigDelta) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Merge(dst, src)
+func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Merge(m, src)
 }
 func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Size() int {
 	return xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Size(m)
@@ -366,16 +376,17 @@ func (m *ExportDocumentsMetadata) Reset()         { *m = ExportDocumentsMetadata
 func (m *ExportDocumentsMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsMetadata) ProtoMessage()    {}
 func (*ExportDocumentsMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{2}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{2}
 }
+
 func (m *ExportDocumentsMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsMetadata.Unmarshal(m, b)
 }
 func (m *ExportDocumentsMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsMetadata.Merge(dst, src)
+func (m *ExportDocumentsMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsMetadata.Merge(m, src)
 }
 func (m *ExportDocumentsMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsMetadata.Size(m)
@@ -462,16 +473,17 @@ func (m *ImportDocumentsMetadata) Reset()         { *m = ImportDocumentsMetadata
 func (m *ImportDocumentsMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImportDocumentsMetadata) ProtoMessage()    {}
 func (*ImportDocumentsMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{3}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{3}
 }
+
 func (m *ImportDocumentsMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDocumentsMetadata.Unmarshal(m, b)
 }
 func (m *ImportDocumentsMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDocumentsMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImportDocumentsMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDocumentsMetadata.Merge(dst, src)
+func (m *ImportDocumentsMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDocumentsMetadata.Merge(m, src)
 }
 func (m *ImportDocumentsMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImportDocumentsMetadata.Size(m)
@@ -546,16 +558,17 @@ func (m *ExportDocumentsResponse) Reset()         { *m = ExportDocumentsResponse
 func (m *ExportDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsResponse) ProtoMessage()    {}
 func (*ExportDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{4}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{4}
 }
+
 func (m *ExportDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsResponse.Unmarshal(m, b)
 }
 func (m *ExportDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsResponse.Merge(dst, src)
+func (m *ExportDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsResponse.Merge(m, src)
 }
 func (m *ExportDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsResponse.Size(m)
@@ -590,16 +603,17 @@ func (m *Progress) Reset()         { *m = Progress{} }
 func (m *Progress) String() string { return proto.CompactTextString(m) }
 func (*Progress) ProtoMessage()    {}
 func (*Progress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_b0b923bddd463673, []int{5}
+	return fileDescriptor_f3b79aaf4866e7e0, []int{5}
 }
+
 func (m *Progress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Progress.Unmarshal(m, b)
 }
 func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
 }
-func (dst *Progress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Progress.Merge(dst, src)
+func (m *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(m, src)
 }
 func (m *Progress) XXX_Size() int {
 	return xxx_messageInfo_Progress.Size(m)
@@ -625,6 +639,8 @@ func (m *Progress) GetCompletedWork() int64 {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.admin.v1.OperationState", OperationState_name, OperationState_value)
+	proto.RegisterEnum("google.firestore.admin.v1.FieldOperationMetadata_IndexConfigDelta_ChangeType", FieldOperationMetadata_IndexConfigDelta_ChangeType_name, FieldOperationMetadata_IndexConfigDelta_ChangeType_value)
 	proto.RegisterType((*IndexOperationMetadata)(nil), "google.firestore.admin.v1.IndexOperationMetadata")
 	proto.RegisterType((*FieldOperationMetadata)(nil), "google.firestore.admin.v1.FieldOperationMetadata")
 	proto.RegisterType((*FieldOperationMetadata_IndexConfigDelta)(nil), "google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta")
@@ -632,15 +648,13 @@ func init() {
 	proto.RegisterType((*ImportDocumentsMetadata)(nil), "google.firestore.admin.v1.ImportDocumentsMetadata")
 	proto.RegisterType((*ExportDocumentsResponse)(nil), "google.firestore.admin.v1.ExportDocumentsResponse")
 	proto.RegisterType((*Progress)(nil), "google.firestore.admin.v1.Progress")
-	proto.RegisterEnum("google.firestore.admin.v1.OperationState", OperationState_name, OperationState_value)
-	proto.RegisterEnum("google.firestore.admin.v1.FieldOperationMetadata_IndexConfigDelta_ChangeType", FieldOperationMetadata_IndexConfigDelta_ChangeType_name, FieldOperationMetadata_IndexConfigDelta_ChangeType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1/operation.proto", fileDescriptor_operation_b0b923bddd463673)
+	proto.RegisterFile("google/firestore/admin/v1/operation.proto", fileDescriptor_f3b79aaf4866e7e0)
 }
 
-var fileDescriptor_operation_b0b923bddd463673 = []byte{
+var fileDescriptor_f3b79aaf4866e7e0 = []byte{
 	// 850 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
 	0x1c, 0xc5, 0x71, 0x92, 0x6e, 0x7e, 0xa5, 0x59, 0x77, 0x40, 0xdb, 0xd0, 0x05, 0x35, 0x0a, 0x5a,
diff --git a/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go b/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
index 1a00742924..2025175c09 100644
--- a/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
+++ b/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta1/firestore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The various possible states for an ongoing Operation.
 type OperationState int32
@@ -61,6 +61,7 @@ var OperationState_name = map[int32]string{
 	6: "FAILED",
 	7: "CANCELLED",
 }
+
 var OperationState_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"INITIALIZING":      1,
@@ -75,8 +76,9 @@ var OperationState_value = map[string]int32{
 func (x OperationState) String() string {
 	return proto.EnumName(OperationState_name, int32(x))
 }
+
 func (OperationState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{0}
+	return fileDescriptor_45deb2e54c3a4296, []int{0}
 }
 
 // The type of index operation.
@@ -93,6 +95,7 @@ var IndexOperationMetadata_OperationType_name = map[int32]string{
 	0: "OPERATION_TYPE_UNSPECIFIED",
 	1: "CREATING_INDEX",
 }
+
 var IndexOperationMetadata_OperationType_value = map[string]int32{
 	"OPERATION_TYPE_UNSPECIFIED": 0,
 	"CREATING_INDEX":             1,
@@ -101,8 +104,9 @@ var IndexOperationMetadata_OperationType_value = map[string]int32{
 func (x IndexOperationMetadata_OperationType) String() string {
 	return proto.EnumName(IndexOperationMetadata_OperationType_name, int32(x))
 }
+
 func (IndexOperationMetadata_OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{0, 0}
+	return fileDescriptor_45deb2e54c3a4296, []int{0, 0}
 }
 
 // Metadata for index operations. This metadata populates
@@ -133,16 +137,17 @@ func (m *IndexOperationMetadata) Reset()         { *m = IndexOperationMetadata{}
 func (m *IndexOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*IndexOperationMetadata) ProtoMessage()    {}
 func (*IndexOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{0}
+	return fileDescriptor_45deb2e54c3a4296, []int{0}
 }
+
 func (m *IndexOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IndexOperationMetadata.Unmarshal(m, b)
 }
 func (m *IndexOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IndexOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *IndexOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IndexOperationMetadata.Merge(dst, src)
+func (m *IndexOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IndexOperationMetadata.Merge(m, src)
 }
 func (m *IndexOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_IndexOperationMetadata.Size(m)
@@ -212,16 +217,17 @@ func (m *Progress) Reset()         { *m = Progress{} }
 func (m *Progress) String() string { return proto.CompactTextString(m) }
 func (*Progress) ProtoMessage()    {}
 func (*Progress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{1}
+	return fileDescriptor_45deb2e54c3a4296, []int{1}
 }
+
 func (m *Progress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Progress.Unmarshal(m, b)
 }
 func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
 }
-func (dst *Progress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Progress.Merge(dst, src)
+func (m *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(m, src)
 }
 func (m *Progress) XXX_Size() int {
 	return xxx_messageInfo_Progress.Size(m)
@@ -263,16 +269,17 @@ func (m *CreateIndexRequest) Reset()         { *m = CreateIndexRequest{} }
 func (m *CreateIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateIndexRequest) ProtoMessage()    {}
 func (*CreateIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{2}
+	return fileDescriptor_45deb2e54c3a4296, []int{2}
 }
+
 func (m *CreateIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateIndexRequest.Unmarshal(m, b)
 }
 func (m *CreateIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateIndexRequest.Merge(dst, src)
+func (m *CreateIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIndexRequest.Merge(m, src)
 }
 func (m *CreateIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateIndexRequest.Size(m)
@@ -311,16 +318,17 @@ func (m *GetIndexRequest) Reset()         { *m = GetIndexRequest{} }
 func (m *GetIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIndexRequest) ProtoMessage()    {}
 func (*GetIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{3}
+	return fileDescriptor_45deb2e54c3a4296, []int{3}
 }
+
 func (m *GetIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIndexRequest.Unmarshal(m, b)
 }
 func (m *GetIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIndexRequest.Merge(dst, src)
+func (m *GetIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIndexRequest.Merge(m, src)
 }
 func (m *GetIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIndexRequest.Size(m)
@@ -357,16 +365,17 @@ func (m *ListIndexesRequest) Reset()         { *m = ListIndexesRequest{} }
 func (m *ListIndexesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesRequest) ProtoMessage()    {}
 func (*ListIndexesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{4}
+	return fileDescriptor_45deb2e54c3a4296, []int{4}
 }
+
 func (m *ListIndexesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesRequest.Unmarshal(m, b)
 }
 func (m *ListIndexesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesRequest.Merge(dst, src)
+func (m *ListIndexesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesRequest.Merge(m, src)
 }
 func (m *ListIndexesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesRequest.Size(m)
@@ -419,16 +428,17 @@ func (m *DeleteIndexRequest) Reset()         { *m = DeleteIndexRequest{} }
 func (m *DeleteIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteIndexRequest) ProtoMessage()    {}
 func (*DeleteIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{5}
+	return fileDescriptor_45deb2e54c3a4296, []int{5}
 }
+
 func (m *DeleteIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteIndexRequest.Unmarshal(m, b)
 }
 func (m *DeleteIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteIndexRequest.Merge(dst, src)
+func (m *DeleteIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIndexRequest.Merge(m, src)
 }
 func (m *DeleteIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteIndexRequest.Size(m)
@@ -461,16 +471,17 @@ func (m *ListIndexesResponse) Reset()         { *m = ListIndexesResponse{} }
 func (m *ListIndexesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesResponse) ProtoMessage()    {}
 func (*ListIndexesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{6}
+	return fileDescriptor_45deb2e54c3a4296, []int{6}
 }
+
 func (m *ListIndexesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesResponse.Unmarshal(m, b)
 }
 func (m *ListIndexesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesResponse.Merge(dst, src)
+func (m *ListIndexesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesResponse.Merge(m, src)
 }
 func (m *ListIndexesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesResponse.Size(m)
@@ -520,16 +531,17 @@ func (m *ExportDocumentsRequest) Reset()         { *m = ExportDocumentsRequest{}
 func (m *ExportDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsRequest) ProtoMessage()    {}
 func (*ExportDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{7}
+	return fileDescriptor_45deb2e54c3a4296, []int{7}
 }
+
 func (m *ExportDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ExportDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsRequest.Merge(dst, src)
+func (m *ExportDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsRequest.Merge(m, src)
 }
 func (m *ExportDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsRequest.Size(m)
@@ -584,16 +596,17 @@ func (m *ImportDocumentsRequest) Reset()         { *m = ImportDocumentsRequest{}
 func (m *ImportDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportDocumentsRequest) ProtoMessage()    {}
 func (*ImportDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{8}
+	return fileDescriptor_45deb2e54c3a4296, []int{8}
 }
+
 func (m *ImportDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ImportDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDocumentsRequest.Merge(dst, src)
+func (m *ImportDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDocumentsRequest.Merge(m, src)
 }
 func (m *ImportDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportDocumentsRequest.Size(m)
@@ -640,16 +653,17 @@ func (m *ExportDocumentsResponse) Reset()         { *m = ExportDocumentsResponse
 func (m *ExportDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsResponse) ProtoMessage()    {}
 func (*ExportDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{9}
+	return fileDescriptor_45deb2e54c3a4296, []int{9}
 }
+
 func (m *ExportDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsResponse.Unmarshal(m, b)
 }
 func (m *ExportDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsResponse.Merge(dst, src)
+func (m *ExportDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsResponse.Merge(m, src)
 }
 func (m *ExportDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsResponse.Size(m)
@@ -693,16 +707,17 @@ func (m *ExportDocumentsMetadata) Reset()         { *m = ExportDocumentsMetadata
 func (m *ExportDocumentsMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsMetadata) ProtoMessage()    {}
 func (*ExportDocumentsMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{10}
+	return fileDescriptor_45deb2e54c3a4296, []int{10}
 }
+
 func (m *ExportDocumentsMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsMetadata.Unmarshal(m, b)
 }
 func (m *ExportDocumentsMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsMetadata.Merge(dst, src)
+func (m *ExportDocumentsMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsMetadata.Merge(m, src)
 }
 func (m *ExportDocumentsMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsMetadata.Size(m)
@@ -788,16 +803,17 @@ func (m *ImportDocumentsMetadata) Reset()         { *m = ImportDocumentsMetadata
 func (m *ImportDocumentsMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImportDocumentsMetadata) ProtoMessage()    {}
 func (*ImportDocumentsMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_aada04317d1f4b2a, []int{11}
+	return fileDescriptor_45deb2e54c3a4296, []int{11}
 }
+
 func (m *ImportDocumentsMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDocumentsMetadata.Unmarshal(m, b)
 }
 func (m *ImportDocumentsMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDocumentsMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImportDocumentsMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDocumentsMetadata.Merge(dst, src)
+func (m *ImportDocumentsMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDocumentsMetadata.Merge(m, src)
 }
 func (m *ImportDocumentsMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImportDocumentsMetadata.Size(m)
@@ -858,6 +874,8 @@ func (m *ImportDocumentsMetadata) GetInputUriPrefix() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.admin.v1beta1.OperationState", OperationState_name, OperationState_value)
+	proto.RegisterEnum("google.firestore.admin.v1beta1.IndexOperationMetadata_OperationType", IndexOperationMetadata_OperationType_name, IndexOperationMetadata_OperationType_value)
 	proto.RegisterType((*IndexOperationMetadata)(nil), "google.firestore.admin.v1beta1.IndexOperationMetadata")
 	proto.RegisterType((*Progress)(nil), "google.firestore.admin.v1beta1.Progress")
 	proto.RegisterType((*CreateIndexRequest)(nil), "google.firestore.admin.v1beta1.CreateIndexRequest")
@@ -870,8 +888,88 @@ func init() {
 	proto.RegisterType((*ExportDocumentsResponse)(nil), "google.firestore.admin.v1beta1.ExportDocumentsResponse")
 	proto.RegisterType((*ExportDocumentsMetadata)(nil), "google.firestore.admin.v1beta1.ExportDocumentsMetadata")
 	proto.RegisterType((*ImportDocumentsMetadata)(nil), "google.firestore.admin.v1beta1.ImportDocumentsMetadata")
-	proto.RegisterEnum("google.firestore.admin.v1beta1.OperationState", OperationState_name, OperationState_value)
-	proto.RegisterEnum("google.firestore.admin.v1beta1.IndexOperationMetadata_OperationType", IndexOperationMetadata_OperationType_name, IndexOperationMetadata_OperationType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/firestore/admin/v1beta1/firestore_admin.proto", fileDescriptor_45deb2e54c3a4296)
+}
+
+var fileDescriptor_45deb2e54c3a4296 = []byte{
+	// 1183 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xdd, 0x6e, 0xe3, 0xc4,
+	0x17, 0xff, 0x3b, 0x69, 0x93, 0xe6, 0xf4, 0x9f, 0x34, 0x9d, 0x85, 0x6c, 0x94, 0xfd, 0x20, 0x32,
+	0x2c, 0x8a, 0x72, 0x61, 0xb3, 0x59, 0x58, 0xb1, 0x5b, 0xa1, 0x55, 0xea, 0x38, 0x95, 0xa5, 0x90,
+	0x46, 0x4e, 0xca, 0x2e, 0x7b, 0x63, 0xb9, 0xc9, 0x34, 0x32, 0x4d, 0x3c, 0xc6, 0x33, 0x81, 0x76,
+	0x51, 0x01, 0xf1, 0x0a, 0xcb, 0x25, 0x37, 0x70, 0x09, 0x12, 0xe2, 0x2d, 0x78, 0x00, 0x1e, 0x00,
+	0x21, 0xf1, 0x10, 0x5c, 0xa2, 0x19, 0xdb, 0xf9, 0xde, 0x75, 0x2b, 0xad, 0x84, 0x90, 0xb8, 0xcb,
+	0x39, 0x73, 0x3e, 0x7e, 0xe7, 0x23, 0xe7, 0x1c, 0xc3, 0xbb, 0x43, 0x42, 0x86, 0x23, 0xac, 0x9e,
+	0x38, 0x3e, 0xa6, 0x8c, 0xf8, 0x58, 0xb5, 0x07, 0x63, 0xc7, 0x55, 0x3f, 0xbb, 0x7b, 0x8c, 0x99,
+	0x7d, 0x77, 0xc6, 0xb7, 0x04, 0x5f, 0xf1, 0x7c, 0xc2, 0x08, 0xba, 0x1d, 0x68, 0x29, 0xd3, 0x57,
+	0x25, 0x78, 0x0d, 0xb5, 0x4a, 0x37, 0x43, 0xab, 0xb6, 0xe7, 0xa8, 0xb6, 0xeb, 0x12, 0x66, 0x33,
+	0x87, 0xb8, 0x34, 0xd0, 0x2e, 0x55, 0x63, 0x7c, 0x3a, 0xee, 0x00, 0x9f, 0x85, 0xb2, 0x6f, 0x86,
+	0xb2, 0x23, 0xe2, 0x0e, 0xfd, 0x89, 0xeb, 0x3a, 0xee, 0x50, 0x25, 0x1e, 0xf6, 0x17, 0x0c, 0xde,
+	0x08, 0x85, 0x04, 0x75, 0x3c, 0x39, 0x51, 0xf1, 0xd8, 0x63, 0xe7, 0xe1, 0xe3, 0x1b, 0xcb, 0x8f,
+	0xcc, 0x19, 0x63, 0xca, 0xec, 0xb1, 0x17, 0x08, 0xc8, 0xbf, 0x26, 0xa1, 0x60, 0x70, 0x97, 0x87,
+	0x91, 0xdd, 0x0f, 0x31, 0xb3, 0x07, 0x36, 0xb3, 0xd1, 0x03, 0x00, 0xca, 0x6c, 0x9f, 0x59, 0x5c,
+	0xa7, 0x28, 0x95, 0xa5, 0xca, 0x76, 0xad, 0xa4, 0x84, 0xc1, 0x47, 0x06, 0x95, 0x5e, 0x64, 0xd0,
+	0xcc, 0x08, 0x69, 0x4e, 0xa3, 0xf7, 0x60, 0x0b, 0xbb, 0x83, 0x40, 0x31, 0x11, 0xab, 0x98, 0xc6,
+	0xee, 0x40, 0xa8, 0xbd, 0x06, 0x9b, 0x22, 0xfc, 0x62, 0xb2, 0x2c, 0x55, 0x32, 0x66, 0x40, 0xa0,
+	0x53, 0xc8, 0x4d, 0x83, 0xb6, 0xd8, 0xb9, 0x87, 0x8b, 0x1b, 0x65, 0xa9, 0x92, 0xab, 0x35, 0x94,
+	0x97, 0x17, 0x42, 0x59, 0x1f, 0x97, 0x32, 0xe5, 0xf4, 0xce, 0x3d, 0x6c, 0x66, 0xc9, 0x3c, 0x89,
+	0x6e, 0x42, 0xa6, 0x6f, 0xbb, 0x7d, 0x3c, 0x1a, 0xe1, 0x41, 0x71, 0xb3, 0x2c, 0x55, 0xb6, 0xcc,
+	0x19, 0x03, 0x1d, 0xc1, 0xee, 0x80, 0xf4, 0x27, 0x63, 0xec, 0x32, 0xcb, 0xf3, 0xc9, 0xd0, 0xc7,
+	0x94, 0x16, 0x53, 0x22, 0xc0, 0x4a, 0x1c, 0x9a, 0x4e, 0x28, 0x6f, 0xe6, 0x23, 0x13, 0x11, 0x47,
+	0xd6, 0x20, 0xbb, 0x00, 0x0a, 0xdd, 0x86, 0xd2, 0x61, 0x47, 0x37, 0xeb, 0x3d, 0xe3, 0xb0, 0x6d,
+	0xf5, 0x3e, 0xee, 0xe8, 0xd6, 0x51, 0xbb, 0xdb, 0xd1, 0x35, 0xa3, 0x69, 0xe8, 0x8d, 0xfc, 0xff,
+	0x10, 0x82, 0x9c, 0x66, 0xea, 0xf5, 0x9e, 0xd1, 0x3e, 0xb0, 0x8c, 0x76, 0x43, 0x7f, 0x92, 0x97,
+	0xe4, 0x27, 0xb0, 0x15, 0x19, 0x44, 0x77, 0x20, 0xf7, 0x39, 0xf1, 0x4f, 0xad, 0x3e, 0x19, 0x7b,
+	0x23, 0xcc, 0xf0, 0x40, 0x94, 0x2f, 0x69, 0x66, 0x39, 0x57, 0x8b, 0x98, 0x53, 0x31, 0x4c, 0x99,
+	0x33, 0xb6, 0xb9, 0x58, 0x62, 0x26, 0xa6, 0x47, 0x4c, 0xd9, 0x01, 0xa4, 0xf9, 0xd8, 0x66, 0x58,
+	0x24, 0xd4, 0xc4, 0x9f, 0x4e, 0x30, 0x65, 0xa8, 0x00, 0x29, 0xcf, 0xf6, 0xb1, 0xcb, 0x84, 0xed,
+	0x8c, 0x19, 0x52, 0x68, 0x2f, 0x2a, 0x62, 0x50, 0xf8, 0x3b, 0x97, 0xaa, 0x52, 0x58, 0x6b, 0xf9,
+	0x0e, 0xec, 0x1c, 0x60, 0xb6, 0xe0, 0x07, 0xc1, 0x86, 0x6b, 0x87, 0x0d, 0x98, 0x31, 0xc5, 0x6f,
+	0xf9, 0x6b, 0x09, 0x50, 0xcb, 0xa1, 0x81, 0x20, 0xa6, 0x71, 0x90, 0x0a, 0x90, 0x3a, 0x71, 0x46,
+	0x0c, 0xfb, 0x02, 0x53, 0xc6, 0x0c, 0x29, 0x74, 0x03, 0x32, 0x9e, 0x3d, 0xc4, 0x16, 0x75, 0x9e,
+	0x61, 0xd1, 0x73, 0x9b, 0xe6, 0x16, 0x67, 0x74, 0x9d, 0x67, 0x18, 0xdd, 0x02, 0x10, 0x8f, 0x8c,
+	0x9c, 0x62, 0x57, 0xb4, 0x5c, 0xc6, 0x14, 0xe2, 0x3d, 0xce, 0x90, 0x2b, 0x80, 0x1a, 0x98, 0xa7,
+	0x31, 0x16, 0xec, 0x97, 0x70, 0x6d, 0x01, 0x2b, 0xf5, 0x88, 0x4b, 0x31, 0x7a, 0x04, 0x69, 0x27,
+	0x60, 0x15, 0xa5, 0x72, 0xf2, 0xf2, 0x99, 0x8a, 0xb4, 0xd0, 0xdb, 0xb0, 0xe3, 0xe2, 0x33, 0x66,
+	0xcd, 0xa1, 0x0c, 0xc2, 0xcb, 0x72, 0x76, 0x67, 0x8a, 0xf4, 0x2b, 0x28, 0xe8, 0x67, 0x1e, 0xf1,
+	0x59, 0x23, 0xec, 0x3b, 0xfa, 0x12, 0xb4, 0xbc, 0x27, 0xfa, 0x64, 0x34, 0xc2, 0x7d, 0xf1, 0x77,
+	0x73, 0x06, 0xb4, 0x98, 0x2c, 0x27, 0xb9, 0xd1, 0x19, 0xd7, 0x18, 0x50, 0x54, 0x85, 0x5d, 0x32,
+	0x61, 0xde, 0x84, 0x59, 0x13, 0xdf, 0xb1, 0x3c, 0x1f, 0x9f, 0x38, 0x67, 0x61, 0x92, 0x76, 0x82,
+	0x87, 0x23, 0xdf, 0xe9, 0x08, 0xb6, 0x7c, 0x01, 0x05, 0x63, 0xfc, 0xaa, 0x01, 0x54, 0x20, 0xef,
+	0xb8, 0x6b, 0xfd, 0xe7, 0x04, 0x7f, 0xe6, 0x5e, 0x87, 0xeb, 0x2b, 0xf1, 0x87, 0x35, 0x58, 0x1b,
+	0x85, 0xb4, 0x3e, 0x8a, 0x3f, 0x92, 0x2b, 0x76, 0xfe, 0xc1, 0x51, 0xf9, 0x18, 0x76, 0x66, 0x43,
+	0x91, 0x32, 0x9b, 0x05, 0x0d, 0x9c, 0xab, 0x29, 0x71, 0x5d, 0x34, 0x9d, 0x34, 0x5d, 0xae, 0x65,
+	0xce, 0x66, 0xab, 0xa0, 0xd1, 0x63, 0x40, 0xd1, 0x64, 0xb3, 0xa2, 0x41, 0x45, 0x45, 0x66, 0xaf,
+	0x32, 0xe3, 0x76, 0x23, 0x1b, 0xd3, 0x5c, 0xa1, 0x43, 0xc8, 0x4d, 0x0d, 0x1f, 0x9f, 0x33, 0x4c,
+	0xc5, 0x78, 0xbd, 0x8a, 0xd1, 0x6c, 0xa4, 0xbf, 0xcf, 0xd5, 0xd7, 0x34, 0x4a, 0xea, 0xd2, 0x9d,
+	0x9a, 0x5e, 0x5f, 0xe3, 0xdf, 0x93, 0x70, 0x7d, 0xa9, 0x55, 0xff, 0xab, 0xf1, 0xbf, 0xa0, 0xc6,
+	0xeb, 0x86, 0x41, 0x7a, 0xdd, 0x30, 0xa8, 0x7e, 0x2b, 0x41, 0x6e, 0x31, 0x3b, 0xe8, 0x75, 0xd8,
+	0xed, 0xf6, 0xea, 0xbd, 0xe5, 0x1d, 0x9b, 0x87, 0xff, 0x1b, 0x6d, 0xa3, 0x67, 0xd4, 0x5b, 0xc6,
+	0x53, 0xa3, 0x7d, 0x90, 0x97, 0x50, 0x0e, 0xa0, 0x63, 0x1e, 0x6a, 0x7a, 0xb7, 0xcb, 0xe9, 0x04,
+	0xa7, 0xb5, 0x7a, 0x5b, 0xd3, 0x5b, 0x2d, 0x4e, 0x27, 0x39, 0xdd, 0x34, 0xda, 0x91, 0xfc, 0x06,
+	0xa7, 0xbb, 0x47, 0x1a, 0x97, 0x6f, 0x1e, 0xb5, 0xf2, 0x9b, 0x08, 0x20, 0xd5, 0xac, 0x1b, 0x2d,
+	0xbd, 0x91, 0x4f, 0xa1, 0x2c, 0x64, 0x42, 0x5d, 0xbd, 0x91, 0x4f, 0xd7, 0xfe, 0x4a, 0x43, 0xae,
+	0x19, 0xe5, 0xa6, 0xce, 0x53, 0x83, 0xbe, 0x97, 0x60, 0x7b, 0x6e, 0xed, 0xa2, 0x5a, 0x5c, 0x0e,
+	0x57, 0x77, 0x74, 0xe9, 0x56, 0xa4, 0x33, 0x77, 0x41, 0xce, 0x9a, 0x43, 0x7e, 0xf4, 0xcd, 0x6f,
+	0x7f, 0x3e, 0x4f, 0x3c, 0x90, 0xdf, 0x99, 0x5e, 0x9f, 0x5f, 0x04, 0x1b, 0xf3, 0x03, 0xcf, 0x27,
+	0x9f, 0xe0, 0x3e, 0xa3, 0x6a, 0x55, 0xe5, 0xcd, 0x7f, 0x6c, 0x53, 0x4c, 0xd5, 0xea, 0x85, 0x1a,
+	0xee, 0x9e, 0x87, 0xe1, 0x69, 0xf6, 0x8b, 0x04, 0xdb, 0x73, 0xbb, 0x2d, 0x1e, 0xe3, 0xea, 0xd2,
+	0x2e, 0xdd, 0xbb, 0x92, 0x4e, 0x30, 0xb8, 0xe5, 0xf7, 0x05, 0xf2, 0x1a, 0xba, 0x32, 0x72, 0xf4,
+	0x9d, 0x04, 0x5b, 0xd1, 0x89, 0x81, 0xd4, 0x38, 0xdf, 0x4b, 0xc7, 0x48, 0xe9, 0x72, 0x3b, 0x7a,
+	0x1d, 0x3c, 0xbe, 0xdb, 0x5e, 0x00, 0x2e, 0xc2, 0xa6, 0x56, 0x2f, 0xd0, 0x73, 0x09, 0xb6, 0xe7,
+	0xee, 0x8a, 0xf8, 0x8c, 0xae, 0x1e, 0x21, 0xa5, 0xc2, 0xca, 0x70, 0xd1, 0xf9, 0x27, 0x41, 0x84,
+	0xaa, 0x7a, 0x75, 0x54, 0x3f, 0x49, 0xb0, 0xb3, 0xb4, 0xfb, 0xd0, 0xfd, 0x38, 0x64, 0xeb, 0x8f,
+	0x8e, 0xb8, 0x9e, 0xac, 0x0b, 0x90, 0x7b, 0xf2, 0xfd, 0x4b, 0x81, 0xbc, 0x78, 0x88, 0x17, 0xbd,
+	0x3c, 0x94, 0xaa, 0x02, 0xed, 0xd2, 0x14, 0x8f, 0x47, 0xbb, 0xfe, 0x42, 0x79, 0xd5, 0x68, 0x9d,
+	0xf1, 0x32, 0xda, 0xfd, 0x9f, 0x25, 0x90, 0xfb, 0x64, 0x1c, 0x83, 0x6f, 0xff, 0xda, 0xe2, 0x78,
+	0xe8, 0xf0, 0xd2, 0x76, 0xa4, 0xa7, 0x5a, 0xa8, 0x36, 0x24, 0x23, 0xdb, 0x1d, 0x2a, 0xc4, 0x1f,
+	0xaa, 0x43, 0xec, 0x8a, 0xc2, 0xab, 0xc1, 0x93, 0xed, 0x39, 0xf4, 0x45, 0x5f, 0x9b, 0x7b, 0x82,
+	0xfa, 0x21, 0xb1, 0x71, 0xa0, 0x35, 0xbb, 0x3f, 0x26, 0xde, 0x3a, 0x08, 0x8c, 0x69, 0x23, 0x32,
+	0x19, 0x28, 0x53, 0x87, 0x8a, 0xf0, 0xa8, 0x7c, 0x74, 0x77, 0x9f, 0xeb, 0x1c, 0xa7, 0x84, 0xf5,
+	0x7b, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xab, 0xb1, 0x04, 0xab, 0x3e, 0x0f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1168,85 +1266,3 @@ var _FirestoreAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/firestore/admin/v1beta1/firestore_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta1/firestore_admin.proto", fileDescriptor_firestore_admin_aada04317d1f4b2a)
-}
-
-var fileDescriptor_firestore_admin_aada04317d1f4b2a = []byte{
-	// 1183 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xdd, 0x6e, 0xe3, 0xc4,
-	0x17, 0xff, 0x3b, 0x69, 0x93, 0xe6, 0xf4, 0x9f, 0x34, 0x9d, 0x85, 0x6c, 0x94, 0xfd, 0x20, 0x32,
-	0x2c, 0x8a, 0x72, 0x61, 0xb3, 0x59, 0x58, 0xb1, 0x5b, 0xa1, 0x55, 0xea, 0x38, 0x95, 0xa5, 0x90,
-	0x46, 0x4e, 0xca, 0x2e, 0x7b, 0x63, 0xb9, 0xc9, 0x34, 0x32, 0x4d, 0x3c, 0xc6, 0x33, 0x81, 0x76,
-	0x51, 0x01, 0xf1, 0x0a, 0xcb, 0x25, 0x37, 0x70, 0x09, 0x12, 0xe2, 0x2d, 0x78, 0x00, 0x1e, 0x00,
-	0x21, 0xf1, 0x10, 0x5c, 0xa2, 0x19, 0xdb, 0xf9, 0xde, 0x75, 0x2b, 0xad, 0x84, 0x90, 0xb8, 0xcb,
-	0x39, 0x73, 0x3e, 0x7e, 0xe7, 0x23, 0xe7, 0x1c, 0xc3, 0xbb, 0x43, 0x42, 0x86, 0x23, 0xac, 0x9e,
-	0x38, 0x3e, 0xa6, 0x8c, 0xf8, 0x58, 0xb5, 0x07, 0x63, 0xc7, 0x55, 0x3f, 0xbb, 0x7b, 0x8c, 0x99,
-	0x7d, 0x77, 0xc6, 0xb7, 0x04, 0x5f, 0xf1, 0x7c, 0xc2, 0x08, 0xba, 0x1d, 0x68, 0x29, 0xd3, 0x57,
-	0x25, 0x78, 0x0d, 0xb5, 0x4a, 0x37, 0x43, 0xab, 0xb6, 0xe7, 0xa8, 0xb6, 0xeb, 0x12, 0x66, 0x33,
-	0x87, 0xb8, 0x34, 0xd0, 0x2e, 0x55, 0x63, 0x7c, 0x3a, 0xee, 0x00, 0x9f, 0x85, 0xb2, 0x6f, 0x86,
-	0xb2, 0x23, 0xe2, 0x0e, 0xfd, 0x89, 0xeb, 0x3a, 0xee, 0x50, 0x25, 0x1e, 0xf6, 0x17, 0x0c, 0xde,
-	0x08, 0x85, 0x04, 0x75, 0x3c, 0x39, 0x51, 0xf1, 0xd8, 0x63, 0xe7, 0xe1, 0xe3, 0x1b, 0xcb, 0x8f,
-	0xcc, 0x19, 0x63, 0xca, 0xec, 0xb1, 0x17, 0x08, 0xc8, 0xbf, 0x26, 0xa1, 0x60, 0x70, 0x97, 0x87,
-	0x91, 0xdd, 0x0f, 0x31, 0xb3, 0x07, 0x36, 0xb3, 0xd1, 0x03, 0x00, 0xca, 0x6c, 0x9f, 0x59, 0x5c,
-	0xa7, 0x28, 0x95, 0xa5, 0xca, 0x76, 0xad, 0xa4, 0x84, 0xc1, 0x47, 0x06, 0x95, 0x5e, 0x64, 0xd0,
-	0xcc, 0x08, 0x69, 0x4e, 0xa3, 0xf7, 0x60, 0x0b, 0xbb, 0x83, 0x40, 0x31, 0x11, 0xab, 0x98, 0xc6,
-	0xee, 0x40, 0xa8, 0xbd, 0x06, 0x9b, 0x22, 0xfc, 0x62, 0xb2, 0x2c, 0x55, 0x32, 0x66, 0x40, 0xa0,
-	0x53, 0xc8, 0x4d, 0x83, 0xb6, 0xd8, 0xb9, 0x87, 0x8b, 0x1b, 0x65, 0xa9, 0x92, 0xab, 0x35, 0x94,
-	0x97, 0x17, 0x42, 0x59, 0x1f, 0x97, 0x32, 0xe5, 0xf4, 0xce, 0x3d, 0x6c, 0x66, 0xc9, 0x3c, 0x89,
-	0x6e, 0x42, 0xa6, 0x6f, 0xbb, 0x7d, 0x3c, 0x1a, 0xe1, 0x41, 0x71, 0xb3, 0x2c, 0x55, 0xb6, 0xcc,
-	0x19, 0x03, 0x1d, 0xc1, 0xee, 0x80, 0xf4, 0x27, 0x63, 0xec, 0x32, 0xcb, 0xf3, 0xc9, 0xd0, 0xc7,
-	0x94, 0x16, 0x53, 0x22, 0xc0, 0x4a, 0x1c, 0x9a, 0x4e, 0x28, 0x6f, 0xe6, 0x23, 0x13, 0x11, 0x47,
-	0xd6, 0x20, 0xbb, 0x00, 0x0a, 0xdd, 0x86, 0xd2, 0x61, 0x47, 0x37, 0xeb, 0x3d, 0xe3, 0xb0, 0x6d,
-	0xf5, 0x3e, 0xee, 0xe8, 0xd6, 0x51, 0xbb, 0xdb, 0xd1, 0x35, 0xa3, 0x69, 0xe8, 0x8d, 0xfc, 0xff,
-	0x10, 0x82, 0x9c, 0x66, 0xea, 0xf5, 0x9e, 0xd1, 0x3e, 0xb0, 0x8c, 0x76, 0x43, 0x7f, 0x92, 0x97,
-	0xe4, 0x27, 0xb0, 0x15, 0x19, 0x44, 0x77, 0x20, 0xf7, 0x39, 0xf1, 0x4f, 0xad, 0x3e, 0x19, 0x7b,
-	0x23, 0xcc, 0xf0, 0x40, 0x94, 0x2f, 0x69, 0x66, 0x39, 0x57, 0x8b, 0x98, 0x53, 0x31, 0x4c, 0x99,
-	0x33, 0xb6, 0xb9, 0x58, 0x62, 0x26, 0xa6, 0x47, 0x4c, 0xd9, 0x01, 0xa4, 0xf9, 0xd8, 0x66, 0x58,
-	0x24, 0xd4, 0xc4, 0x9f, 0x4e, 0x30, 0x65, 0xa8, 0x00, 0x29, 0xcf, 0xf6, 0xb1, 0xcb, 0x84, 0xed,
-	0x8c, 0x19, 0x52, 0x68, 0x2f, 0x2a, 0x62, 0x50, 0xf8, 0x3b, 0x97, 0xaa, 0x52, 0x58, 0x6b, 0xf9,
-	0x0e, 0xec, 0x1c, 0x60, 0xb6, 0xe0, 0x07, 0xc1, 0x86, 0x6b, 0x87, 0x0d, 0x98, 0x31, 0xc5, 0x6f,
-	0xf9, 0x6b, 0x09, 0x50, 0xcb, 0xa1, 0x81, 0x20, 0xa6, 0x71, 0x90, 0x0a, 0x90, 0x3a, 0x71, 0x46,
-	0x0c, 0xfb, 0x02, 0x53, 0xc6, 0x0c, 0x29, 0x74, 0x03, 0x32, 0x9e, 0x3d, 0xc4, 0x16, 0x75, 0x9e,
-	0x61, 0xd1, 0x73, 0x9b, 0xe6, 0x16, 0x67, 0x74, 0x9d, 0x67, 0x18, 0xdd, 0x02, 0x10, 0x8f, 0x8c,
-	0x9c, 0x62, 0x57, 0xb4, 0x5c, 0xc6, 0x14, 0xe2, 0x3d, 0xce, 0x90, 0x2b, 0x80, 0x1a, 0x98, 0xa7,
-	0x31, 0x16, 0xec, 0x97, 0x70, 0x6d, 0x01, 0x2b, 0xf5, 0x88, 0x4b, 0x31, 0x7a, 0x04, 0x69, 0x27,
-	0x60, 0x15, 0xa5, 0x72, 0xf2, 0xf2, 0x99, 0x8a, 0xb4, 0xd0, 0xdb, 0xb0, 0xe3, 0xe2, 0x33, 0x66,
-	0xcd, 0xa1, 0x0c, 0xc2, 0xcb, 0x72, 0x76, 0x67, 0x8a, 0xf4, 0x2b, 0x28, 0xe8, 0x67, 0x1e, 0xf1,
-	0x59, 0x23, 0xec, 0x3b, 0xfa, 0x12, 0xb4, 0xbc, 0x27, 0xfa, 0x64, 0x34, 0xc2, 0x7d, 0xf1, 0x77,
-	0x73, 0x06, 0xb4, 0x98, 0x2c, 0x27, 0xb9, 0xd1, 0x19, 0xd7, 0x18, 0x50, 0x54, 0x85, 0x5d, 0x32,
-	0x61, 0xde, 0x84, 0x59, 0x13, 0xdf, 0xb1, 0x3c, 0x1f, 0x9f, 0x38, 0x67, 0x61, 0x92, 0x76, 0x82,
-	0x87, 0x23, 0xdf, 0xe9, 0x08, 0xb6, 0x7c, 0x01, 0x05, 0x63, 0xfc, 0xaa, 0x01, 0x54, 0x20, 0xef,
-	0xb8, 0x6b, 0xfd, 0xe7, 0x04, 0x7f, 0xe6, 0x5e, 0x87, 0xeb, 0x2b, 0xf1, 0x87, 0x35, 0x58, 0x1b,
-	0x85, 0xb4, 0x3e, 0x8a, 0x3f, 0x92, 0x2b, 0x76, 0xfe, 0xc1, 0x51, 0xf9, 0x18, 0x76, 0x66, 0x43,
-	0x91, 0x32, 0x9b, 0x05, 0x0d, 0x9c, 0xab, 0x29, 0x71, 0x5d, 0x34, 0x9d, 0x34, 0x5d, 0xae, 0x65,
-	0xce, 0x66, 0xab, 0xa0, 0xd1, 0x63, 0x40, 0xd1, 0x64, 0xb3, 0xa2, 0x41, 0x45, 0x45, 0x66, 0xaf,
-	0x32, 0xe3, 0x76, 0x23, 0x1b, 0xd3, 0x5c, 0xa1, 0x43, 0xc8, 0x4d, 0x0d, 0x1f, 0x9f, 0x33, 0x4c,
-	0xc5, 0x78, 0xbd, 0x8a, 0xd1, 0x6c, 0xa4, 0xbf, 0xcf, 0xd5, 0xd7, 0x34, 0x4a, 0xea, 0xd2, 0x9d,
-	0x9a, 0x5e, 0x5f, 0xe3, 0xdf, 0x93, 0x70, 0x7d, 0xa9, 0x55, 0xff, 0xab, 0xf1, 0xbf, 0xa0, 0xc6,
-	0xeb, 0x86, 0x41, 0x7a, 0xdd, 0x30, 0xa8, 0x7e, 0x2b, 0x41, 0x6e, 0x31, 0x3b, 0xe8, 0x75, 0xd8,
-	0xed, 0xf6, 0xea, 0xbd, 0xe5, 0x1d, 0x9b, 0x87, 0xff, 0x1b, 0x6d, 0xa3, 0x67, 0xd4, 0x5b, 0xc6,
-	0x53, 0xa3, 0x7d, 0x90, 0x97, 0x50, 0x0e, 0xa0, 0x63, 0x1e, 0x6a, 0x7a, 0xb7, 0xcb, 0xe9, 0x04,
-	0xa7, 0xb5, 0x7a, 0x5b, 0xd3, 0x5b, 0x2d, 0x4e, 0x27, 0x39, 0xdd, 0x34, 0xda, 0x91, 0xfc, 0x06,
-	0xa7, 0xbb, 0x47, 0x1a, 0x97, 0x6f, 0x1e, 0xb5, 0xf2, 0x9b, 0x08, 0x20, 0xd5, 0xac, 0x1b, 0x2d,
-	0xbd, 0x91, 0x4f, 0xa1, 0x2c, 0x64, 0x42, 0x5d, 0xbd, 0x91, 0x4f, 0xd7, 0xfe, 0x4a, 0x43, 0xae,
-	0x19, 0xe5, 0xa6, 0xce, 0x53, 0x83, 0xbe, 0x97, 0x60, 0x7b, 0x6e, 0xed, 0xa2, 0x5a, 0x5c, 0x0e,
-	0x57, 0x77, 0x74, 0xe9, 0x56, 0xa4, 0x33, 0x77, 0x41, 0xce, 0x9a, 0x43, 0x7e, 0xf4, 0xcd, 0x6f,
-	0x7f, 0x3e, 0x4f, 0x3c, 0x90, 0xdf, 0x99, 0x5e, 0x9f, 0x5f, 0x04, 0x1b, 0xf3, 0x03, 0xcf, 0x27,
-	0x9f, 0xe0, 0x3e, 0xa3, 0x6a, 0x55, 0xe5, 0xcd, 0x7f, 0x6c, 0x53, 0x4c, 0xd5, 0xea, 0x85, 0x1a,
-	0xee, 0x9e, 0x87, 0xe1, 0x69, 0xf6, 0x8b, 0x04, 0xdb, 0x73, 0xbb, 0x2d, 0x1e, 0xe3, 0xea, 0xd2,
-	0x2e, 0xdd, 0xbb, 0x92, 0x4e, 0x30, 0xb8, 0xe5, 0xf7, 0x05, 0xf2, 0x1a, 0xba, 0x32, 0x72, 0xf4,
-	0x9d, 0x04, 0x5b, 0xd1, 0x89, 0x81, 0xd4, 0x38, 0xdf, 0x4b, 0xc7, 0x48, 0xe9, 0x72, 0x3b, 0x7a,
-	0x1d, 0x3c, 0xbe, 0xdb, 0x5e, 0x00, 0x2e, 0xc2, 0xa6, 0x56, 0x2f, 0xd0, 0x73, 0x09, 0xb6, 0xe7,
-	0xee, 0x8a, 0xf8, 0x8c, 0xae, 0x1e, 0x21, 0xa5, 0xc2, 0xca, 0x70, 0xd1, 0xf9, 0x27, 0x41, 0x84,
-	0xaa, 0x7a, 0x75, 0x54, 0x3f, 0x49, 0xb0, 0xb3, 0xb4, 0xfb, 0xd0, 0xfd, 0x38, 0x64, 0xeb, 0x8f,
-	0x8e, 0xb8, 0x9e, 0xac, 0x0b, 0x90, 0x7b, 0xf2, 0xfd, 0x4b, 0x81, 0xbc, 0x78, 0x88, 0x17, 0xbd,
-	0x3c, 0x94, 0xaa, 0x02, 0xed, 0xd2, 0x14, 0x8f, 0x47, 0xbb, 0xfe, 0x42, 0x79, 0xd5, 0x68, 0x9d,
-	0xf1, 0x32, 0xda, 0xfd, 0x9f, 0x25, 0x90, 0xfb, 0x64, 0x1c, 0x83, 0x6f, 0xff, 0xda, 0xe2, 0x78,
-	0xe8, 0xf0, 0xd2, 0x76, 0xa4, 0xa7, 0x5a, 0xa8, 0x36, 0x24, 0x23, 0xdb, 0x1d, 0x2a, 0xc4, 0x1f,
-	0xaa, 0x43, 0xec, 0x8a, 0xc2, 0xab, 0xc1, 0x93, 0xed, 0x39, 0xf4, 0x45, 0x5f, 0x9b, 0x7b, 0x82,
-	0xfa, 0x21, 0xb1, 0x71, 0xa0, 0x35, 0xbb, 0x3f, 0x26, 0xde, 0x3a, 0x08, 0x8c, 0x69, 0x23, 0x32,
-	0x19, 0x28, 0x53, 0x87, 0x8a, 0xf0, 0xa8, 0x7c, 0x74, 0x77, 0x9f, 0xeb, 0x1c, 0xa7, 0x84, 0xf5,
-	0x7b, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xab, 0xb1, 0x04, 0xab, 0x3e, 0x0f, 0x00, 0x00,
-}
diff --git a/googleapis/firestore/admin/v1beta1/index.pb.go b/googleapis/firestore/admin/v1beta1/index.pb.go
index a4648a610d..36ab2f8cfc 100644
--- a/googleapis/firestore/admin/v1beta1/index.pb.go
+++ b/googleapis/firestore/admin/v1beta1/index.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta1/index.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The mode determines how a field is indexed.
 type IndexField_Mode int32
@@ -42,6 +45,7 @@ var IndexField_Mode_name = map[int32]string{
 	3: "DESCENDING",
 	4: "ARRAY_CONTAINS",
 }
+
 var IndexField_Mode_value = map[string]int32{
 	"MODE_UNSPECIFIED": 0,
 	"ASCENDING":        2,
@@ -52,8 +56,9 @@ var IndexField_Mode_value = map[string]int32{
 func (x IndexField_Mode) String() string {
 	return proto.EnumName(IndexField_Mode_name, int32(x))
 }
+
 func (IndexField_Mode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_6cc09157d7fa246c, []int{0, 0}
+	return fileDescriptor_18dcb37b2ab27460, []int{0, 0}
 }
 
 // The state of an index. During index creation, an index will be in the
@@ -88,6 +93,7 @@ var Index_State_name = map[int32]string{
 	2: "READY",
 	5: "ERROR",
 }
+
 var Index_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          3,
@@ -98,8 +104,9 @@ var Index_State_value = map[string]int32{
 func (x Index_State) String() string {
 	return proto.EnumName(Index_State_name, int32(x))
 }
+
 func (Index_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_6cc09157d7fa246c, []int{1, 0}
+	return fileDescriptor_18dcb37b2ab27460, []int{1, 0}
 }
 
 // A field of an index.
@@ -120,16 +127,17 @@ func (m *IndexField) Reset()         { *m = IndexField{} }
 func (m *IndexField) String() string { return proto.CompactTextString(m) }
 func (*IndexField) ProtoMessage()    {}
 func (*IndexField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_6cc09157d7fa246c, []int{0}
+	return fileDescriptor_18dcb37b2ab27460, []int{0}
 }
+
 func (m *IndexField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IndexField.Unmarshal(m, b)
 }
 func (m *IndexField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IndexField.Marshal(b, m, deterministic)
 }
-func (dst *IndexField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IndexField.Merge(dst, src)
+func (m *IndexField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IndexField.Merge(m, src)
 }
 func (m *IndexField) XXX_Size() int {
 	return xxx_messageInfo_IndexField.Size(m)
@@ -175,16 +183,17 @@ func (m *Index) Reset()         { *m = Index{} }
 func (m *Index) String() string { return proto.CompactTextString(m) }
 func (*Index) ProtoMessage()    {}
 func (*Index) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_6cc09157d7fa246c, []int{1}
+	return fileDescriptor_18dcb37b2ab27460, []int{1}
 }
+
 func (m *Index) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Index.Unmarshal(m, b)
 }
 func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Index.Marshal(b, m, deterministic)
 }
-func (dst *Index) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Index.Merge(dst, src)
+func (m *Index) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index.Merge(m, src)
 }
 func (m *Index) XXX_Size() int {
 	return xxx_messageInfo_Index.Size(m)
@@ -224,17 +233,17 @@ func (m *Index) GetState() Index_State {
 }
 
 func init() {
-	proto.RegisterType((*IndexField)(nil), "google.firestore.admin.v1beta1.IndexField")
-	proto.RegisterType((*Index)(nil), "google.firestore.admin.v1beta1.Index")
 	proto.RegisterEnum("google.firestore.admin.v1beta1.IndexField_Mode", IndexField_Mode_name, IndexField_Mode_value)
 	proto.RegisterEnum("google.firestore.admin.v1beta1.Index_State", Index_State_name, Index_State_value)
+	proto.RegisterType((*IndexField)(nil), "google.firestore.admin.v1beta1.IndexField")
+	proto.RegisterType((*Index)(nil), "google.firestore.admin.v1beta1.Index")
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta1/index.proto", fileDescriptor_index_6cc09157d7fa246c)
+	proto.RegisterFile("google/firestore/admin/v1beta1/index.proto", fileDescriptor_18dcb37b2ab27460)
 }
 
-var fileDescriptor_index_6cc09157d7fa246c = []byte{
+var fileDescriptor_18dcb37b2ab27460 = []byte{
 	// 438 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x5d, 0x8b, 0xd3, 0x40,
 	0x14, 0x35, 0x69, 0x52, 0xcc, 0x75, 0xb7, 0xc4, 0x41, 0xa1, 0x88, 0x4a, 0x89, 0x3e, 0x94, 0x15,
diff --git a/googleapis/firestore/admin/v1beta1/location.pb.go b/googleapis/firestore/admin/v1beta1/location.pb.go
index 8ae4a4387a..60535ef787 100644
--- a/googleapis/firestore/admin/v1beta1/location.pb.go
+++ b/googleapis/firestore/admin/v1beta1/location.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta1/location.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta1"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The metadata message for [google.cloud.location.Location.metadata][google.cloud.location.Location.metadata].
 type LocationMetadata struct {
@@ -31,16 +34,17 @@ func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
 func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
 func (*LocationMetadata) ProtoMessage()    {}
 func (*LocationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_location_c0b3dc6e559decde, []int{0}
+	return fileDescriptor_ff83541f567982c1, []int{0}
 }
+
 func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
 }
 func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+func (m *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(m, src)
 }
 func (m *LocationMetadata) XXX_Size() int {
 	return xxx_messageInfo_LocationMetadata.Size(m)
@@ -56,10 +60,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta1/location.proto", fileDescriptor_location_c0b3dc6e559decde)
+	proto.RegisterFile("google/firestore/admin/v1beta1/location.proto", fileDescriptor_ff83541f567982c1)
 }
 
-var fileDescriptor_location_c0b3dc6e559decde = []byte{
+var fileDescriptor_ff83541f567982c1 = []byte{
 	// 218 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x8f, 0x31, 0x4b, 0xc0, 0x30,
 	0x10, 0x85, 0x69, 0x11, 0x87, 0x82, 0x20, 0x9d, 0xa4, 0x88, 0x43, 0x71, 0x35, 0x47, 0x71, 0x74,
diff --git a/googleapis/firestore/admin/v1beta2/field.pb.go b/googleapis/firestore/admin/v1beta2/field.pb.go
index b380814f0f..de861ba78d 100644
--- a/googleapis/firestore/admin/v1beta2/field.pb.go
+++ b/googleapis/firestore/admin/v1beta2/field.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/field.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a single field in the database.
 //
@@ -65,16 +68,17 @@ func (m *Field) Reset()         { *m = Field{} }
 func (m *Field) String() string { return proto.CompactTextString(m) }
 func (*Field) ProtoMessage()    {}
 func (*Field) Descriptor() ([]byte, []int) {
-	return fileDescriptor_field_f272e136f5db2293, []int{0}
+	return fileDescriptor_967ea3483ba729a5, []int{0}
 }
+
 func (m *Field) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Field.Unmarshal(m, b)
 }
 func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Field.Marshal(b, m, deterministic)
 }
-func (dst *Field) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Field.Merge(dst, src)
+func (m *Field) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Field.Merge(m, src)
 }
 func (m *Field) XXX_Size() int {
 	return xxx_messageInfo_Field.Size(m)
@@ -129,16 +133,17 @@ func (m *Field_IndexConfig) Reset()         { *m = Field_IndexConfig{} }
 func (m *Field_IndexConfig) String() string { return proto.CompactTextString(m) }
 func (*Field_IndexConfig) ProtoMessage()    {}
 func (*Field_IndexConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_field_f272e136f5db2293, []int{0, 0}
+	return fileDescriptor_967ea3483ba729a5, []int{0, 0}
 }
+
 func (m *Field_IndexConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Field_IndexConfig.Unmarshal(m, b)
 }
 func (m *Field_IndexConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Field_IndexConfig.Marshal(b, m, deterministic)
 }
-func (dst *Field_IndexConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Field_IndexConfig.Merge(dst, src)
+func (m *Field_IndexConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Field_IndexConfig.Merge(m, src)
 }
 func (m *Field_IndexConfig) XXX_Size() int {
 	return xxx_messageInfo_Field_IndexConfig.Size(m)
@@ -183,10 +188,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta2/field.proto", fileDescriptor_field_f272e136f5db2293)
+	proto.RegisterFile("google/firestore/admin/v1beta2/field.proto", fileDescriptor_967ea3483ba729a5)
 }
 
-var fileDescriptor_field_f272e136f5db2293 = []byte{
+var fileDescriptor_967ea3483ba729a5 = []byte{
 	// 346 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcf, 0x4a, 0xf3, 0x40,
 	0x14, 0xc5, 0x99, 0xb4, 0xdf, 0xa7, 0x9d, 0xa8, 0x8b, 0xc1, 0x45, 0x28, 0x45, 0x4a, 0xb1, 0x50,
diff --git a/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go b/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go
index 51ac15da85..c84c5b9163 100644
--- a/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go
+++ b/googleapis/firestore/admin/v1beta2/firestore_admin.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/firestore_admin.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The request for [FirestoreAdmin.CreateIndex][google.firestore.admin.v1beta2.FirestoreAdmin.CreateIndex].
 type CreateIndexRequest struct {
@@ -43,16 +43,17 @@ func (m *CreateIndexRequest) Reset()         { *m = CreateIndexRequest{} }
 func (m *CreateIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateIndexRequest) ProtoMessage()    {}
 func (*CreateIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{0}
+	return fileDescriptor_d93f4454f4162ee9, []int{0}
 }
+
 func (m *CreateIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateIndexRequest.Unmarshal(m, b)
 }
 func (m *CreateIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateIndexRequest.Merge(dst, src)
+func (m *CreateIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIndexRequest.Merge(m, src)
 }
 func (m *CreateIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateIndexRequest.Size(m)
@@ -99,16 +100,17 @@ func (m *ListIndexesRequest) Reset()         { *m = ListIndexesRequest{} }
 func (m *ListIndexesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesRequest) ProtoMessage()    {}
 func (*ListIndexesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{1}
+	return fileDescriptor_d93f4454f4162ee9, []int{1}
 }
+
 func (m *ListIndexesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesRequest.Unmarshal(m, b)
 }
 func (m *ListIndexesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesRequest.Merge(dst, src)
+func (m *ListIndexesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesRequest.Merge(m, src)
 }
 func (m *ListIndexesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesRequest.Size(m)
@@ -163,16 +165,17 @@ func (m *ListIndexesResponse) Reset()         { *m = ListIndexesResponse{} }
 func (m *ListIndexesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListIndexesResponse) ProtoMessage()    {}
 func (*ListIndexesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{2}
+	return fileDescriptor_d93f4454f4162ee9, []int{2}
 }
+
 func (m *ListIndexesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListIndexesResponse.Unmarshal(m, b)
 }
 func (m *ListIndexesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListIndexesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListIndexesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListIndexesResponse.Merge(dst, src)
+func (m *ListIndexesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesResponse.Merge(m, src)
 }
 func (m *ListIndexesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListIndexesResponse.Size(m)
@@ -211,16 +214,17 @@ func (m *GetIndexRequest) Reset()         { *m = GetIndexRequest{} }
 func (m *GetIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIndexRequest) ProtoMessage()    {}
 func (*GetIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{3}
+	return fileDescriptor_d93f4454f4162ee9, []int{3}
 }
+
 func (m *GetIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIndexRequest.Unmarshal(m, b)
 }
 func (m *GetIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIndexRequest.Merge(dst, src)
+func (m *GetIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIndexRequest.Merge(m, src)
 }
 func (m *GetIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIndexRequest.Size(m)
@@ -252,16 +256,17 @@ func (m *DeleteIndexRequest) Reset()         { *m = DeleteIndexRequest{} }
 func (m *DeleteIndexRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteIndexRequest) ProtoMessage()    {}
 func (*DeleteIndexRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{4}
+	return fileDescriptor_d93f4454f4162ee9, []int{4}
 }
+
 func (m *DeleteIndexRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteIndexRequest.Unmarshal(m, b)
 }
 func (m *DeleteIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteIndexRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteIndexRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteIndexRequest.Merge(dst, src)
+func (m *DeleteIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIndexRequest.Merge(m, src)
 }
 func (m *DeleteIndexRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteIndexRequest.Size(m)
@@ -295,16 +300,17 @@ func (m *UpdateFieldRequest) Reset()         { *m = UpdateFieldRequest{} }
 func (m *UpdateFieldRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateFieldRequest) ProtoMessage()    {}
 func (*UpdateFieldRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{5}
+	return fileDescriptor_d93f4454f4162ee9, []int{5}
 }
+
 func (m *UpdateFieldRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateFieldRequest.Unmarshal(m, b)
 }
 func (m *UpdateFieldRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateFieldRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateFieldRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateFieldRequest.Merge(dst, src)
+func (m *UpdateFieldRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFieldRequest.Merge(m, src)
 }
 func (m *UpdateFieldRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateFieldRequest.Size(m)
@@ -343,16 +349,17 @@ func (m *GetFieldRequest) Reset()         { *m = GetFieldRequest{} }
 func (m *GetFieldRequest) String() string { return proto.CompactTextString(m) }
 func (*GetFieldRequest) ProtoMessage()    {}
 func (*GetFieldRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{6}
+	return fileDescriptor_d93f4454f4162ee9, []int{6}
 }
+
 func (m *GetFieldRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFieldRequest.Unmarshal(m, b)
 }
 func (m *GetFieldRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetFieldRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetFieldRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetFieldRequest.Merge(dst, src)
+func (m *GetFieldRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFieldRequest.Merge(m, src)
 }
 func (m *GetFieldRequest) XXX_Size() int {
 	return xxx_messageInfo_GetFieldRequest.Size(m)
@@ -396,16 +403,17 @@ func (m *ListFieldsRequest) Reset()         { *m = ListFieldsRequest{} }
 func (m *ListFieldsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListFieldsRequest) ProtoMessage()    {}
 func (*ListFieldsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{7}
+	return fileDescriptor_d93f4454f4162ee9, []int{7}
 }
+
 func (m *ListFieldsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFieldsRequest.Unmarshal(m, b)
 }
 func (m *ListFieldsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFieldsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListFieldsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFieldsRequest.Merge(dst, src)
+func (m *ListFieldsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFieldsRequest.Merge(m, src)
 }
 func (m *ListFieldsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListFieldsRequest.Size(m)
@@ -460,16 +468,17 @@ func (m *ListFieldsResponse) Reset()         { *m = ListFieldsResponse{} }
 func (m *ListFieldsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListFieldsResponse) ProtoMessage()    {}
 func (*ListFieldsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{8}
+	return fileDescriptor_d93f4454f4162ee9, []int{8}
 }
+
 func (m *ListFieldsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFieldsResponse.Unmarshal(m, b)
 }
 func (m *ListFieldsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFieldsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListFieldsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFieldsResponse.Merge(dst, src)
+func (m *ListFieldsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFieldsResponse.Merge(m, src)
 }
 func (m *ListFieldsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListFieldsResponse.Size(m)
@@ -519,16 +528,17 @@ func (m *ExportDocumentsRequest) Reset()         { *m = ExportDocumentsRequest{}
 func (m *ExportDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsRequest) ProtoMessage()    {}
 func (*ExportDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{9}
+	return fileDescriptor_d93f4454f4162ee9, []int{9}
 }
+
 func (m *ExportDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ExportDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsRequest.Merge(dst, src)
+func (m *ExportDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsRequest.Merge(m, src)
 }
 func (m *ExportDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsRequest.Size(m)
@@ -583,16 +593,17 @@ func (m *ImportDocumentsRequest) Reset()         { *m = ImportDocumentsRequest{}
 func (m *ImportDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportDocumentsRequest) ProtoMessage()    {}
 func (*ImportDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_admin_549fe3017350a705, []int{10}
+	return fileDescriptor_d93f4454f4162ee9, []int{10}
 }
+
 func (m *ImportDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ImportDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDocumentsRequest.Merge(dst, src)
+func (m *ImportDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDocumentsRequest.Merge(m, src)
 }
 func (m *ImportDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportDocumentsRequest.Size(m)
@@ -638,6 +649,73 @@ func init() {
 	proto.RegisterType((*ImportDocumentsRequest)(nil), "google.firestore.admin.v1beta2.ImportDocumentsRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/firestore/admin/v1beta2/firestore_admin.proto", fileDescriptor_d93f4454f4162ee9)
+}
+
+var fileDescriptor_d93f4454f4162ee9 = []byte{
+	// 940 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcb, 0x6e, 0x1c, 0x45,
+	0x17, 0x56, 0x8d, 0x2f, 0x7f, 0x7c, 0xe6, 0xc7, 0x26, 0x15, 0x69, 0x34, 0xea, 0x10, 0x34, 0x6a,
+	0x30, 0x1a, 0xcd, 0xa2, 0x5b, 0x9e, 0xa0, 0x2c, 0x3c, 0x8a, 0x50, 0x3c, 0xbe, 0x60, 0x08, 0xc2,
+	0x4c, 0x08, 0x48, 0x6c, 0x46, 0xe5, 0x99, 0x72, 0xab, 0x70, 0x4f, 0x55, 0xd3, 0x55, 0x8d, 0x4c,
+	0x22, 0x13, 0xc4, 0x03, 0xb0, 0xe1, 0x0d, 0x58, 0xb0, 0x00, 0x29, 0x6c, 0xd8, 0xb0, 0x62, 0xc1,
+	0x23, 0xf0, 0x0a, 0xbc, 0x01, 0x2f, 0x80, 0xea, 0xd2, 0x73, 0x27, 0xdd, 0x8e, 0x2c, 0xb1, 0xeb,
+	0x3a, 0x75, 0xbe, 0x3a, 0xdf, 0x39, 0x75, 0xea, 0x3b, 0x0d, 0x6f, 0x47, 0x42, 0x44, 0x31, 0x0d,
+	0xcf, 0x58, 0x4a, 0xa5, 0x12, 0x29, 0x0d, 0xc9, 0x70, 0xc4, 0x78, 0xf8, 0xe5, 0xce, 0x29, 0x55,
+	0xa4, 0x3d, 0xb1, 0xf7, 0x8d, 0x3d, 0x48, 0x52, 0xa1, 0x04, 0x7e, 0xdd, 0xa2, 0x82, 0xf1, 0x6e,
+	0x60, 0x77, 0x1d, 0xca, 0x7b, 0xcd, 0x9d, 0x4a, 0x12, 0x16, 0x12, 0xce, 0x85, 0x22, 0x8a, 0x09,
+	0x2e, 0x2d, 0xda, 0x6b, 0x15, 0xc6, 0xa4, 0xf1, 0xb0, 0xa4, 0x2f, 0xe3, 0x43, 0x7a, 0xe1, 0x7c,
+	0xdf, 0x70, 0xbe, 0xb1, 0xe0, 0x51, 0x9a, 0x71, 0xce, 0x78, 0x14, 0x8a, 0x84, 0xa6, 0x33, 0xc1,
+	0x6f, 0x3b, 0x27, 0xb3, 0x3a, 0xcd, 0xce, 0x42, 0x3a, 0x4a, 0xd4, 0x57, 0x6e, 0xb3, 0x31, 0xbf,
+	0x69, 0xa8, 0xf4, 0x47, 0x44, 0x9e, 0x5b, 0x0f, 0x9f, 0x01, 0xee, 0xa6, 0x94, 0x28, 0x7a, 0xac,
+	0x03, 0xf7, 0xe8, 0x17, 0x19, 0x95, 0x0a, 0xd7, 0x60, 0x3d, 0x21, 0x29, 0xe5, 0xaa, 0x8e, 0x1a,
+	0xa8, 0xb9, 0xd1, 0x73, 0x2b, 0xdc, 0x81, 0x35, 0x43, 0xb0, 0x5e, 0x69, 0xa0, 0x66, 0xb5, 0xbd,
+	0x1d, 0xbc, 0xb8, 0x6e, 0x81, 0x3d, 0xd4, 0x62, 0xfc, 0x6f, 0x10, 0xe0, 0x87, 0x4c, 0x2a, 0x63,
+	0xa4, 0xb2, 0x28, 0x56, 0x0d, 0xd6, 0xcf, 0x58, 0xac, 0x68, 0x6a, 0x82, 0x6d, 0xf4, 0xdc, 0x0a,
+	0xdf, 0x86, 0x8d, 0x84, 0x44, 0xb4, 0x2f, 0xd9, 0x13, 0x5a, 0x5f, 0x69, 0xa0, 0xe6, 0x5a, 0xef,
+	0x86, 0x36, 0x3c, 0x62, 0x4f, 0x28, 0xbe, 0x03, 0x60, 0x36, 0x95, 0x38, 0xa7, 0xbc, 0xbe, 0x6a,
+	0x80, 0xc6, 0xfd, 0x63, 0x6d, 0xf0, 0xbf, 0x86, 0x5b, 0x33, 0x0c, 0x64, 0x22, 0xb8, 0xa4, 0xf8,
+	0x1d, 0xf8, 0x1f, 0xb3, 0xa6, 0x3a, 0x6a, 0xac, 0x94, 0x4f, 0x2c, 0x47, 0xe1, 0xb7, 0x60, 0x8b,
+	0xd3, 0x0b, 0xd5, 0x9f, 0x8a, 0x6d, 0x49, 0xbf, 0xa2, 0xcd, 0x27, 0xe3, 0xf8, 0xdb, 0xb0, 0x75,
+	0x44, 0xd5, 0x4c, 0xa9, 0x31, 0xac, 0x72, 0x32, 0xa2, 0x2e, 0x79, 0xf3, 0xed, 0x37, 0x01, 0xef,
+	0xd3, 0x98, 0xce, 0x5d, 0xca, 0x32, 0xcf, 0xef, 0x10, 0xe0, 0xc7, 0xc9, 0x90, 0x28, 0x7a, 0xa8,
+	0x6f, 0x36, 0x77, 0xed, 0xc0, 0x9a, 0xb9, 0x69, 0xe3, 0x5b, 0x22, 0x1d, 0x0b, 0xb6, 0x18, 0xdc,
+	0x81, 0x6a, 0x66, 0x8e, 0x34, 0x7d, 0xe2, 0xae, 0xda, 0xcb, 0x8f, 0xc8, 0x5b, 0xc9, 0x62, 0x3e,
+	0x20, 0xf2, 0xbc, 0x07, 0xd6, 0x5d, 0x7f, 0xbb, 0x0c, 0x67, 0xc8, 0x2c, 0xe3, 0xfd, 0x0c, 0x6e,
+	0xea, 0x8b, 0x30, 0x7e, 0xff, 0x49, 0x27, 0x3c, 0xb5, 0xbd, 0x98, 0x13, 0x70, 0x8d, 0x70, 0x5f,
+	0x47, 0xd2, 0x96, 0xb2, 0x7d, 0x60, 0x13, 0x75, 0xa0, 0xd2, 0x6d, 0xf0, 0x0c, 0x6a, 0x07, 0x17,
+	0x89, 0x48, 0xd5, 0xbe, 0x18, 0x64, 0x23, 0xca, 0x95, 0x7c, 0x41, 0xad, 0xf0, 0x36, 0x6c, 0x0e,
+	0x44, 0x1c, 0xd3, 0x81, 0x7e, 0xf6, 0x7d, 0x36, 0x94, 0xf5, 0x4a, 0x63, 0x45, 0x1f, 0x3a, 0xb1,
+	0x1e, 0x0f, 0x25, 0x6e, 0xc1, 0x4d, 0x91, 0xa9, 0x24, 0x53, 0xfd, 0x2c, 0x65, 0xfd, 0x24, 0xa5,
+	0x67, 0xec, 0xc2, 0x54, 0x65, 0xa3, 0xb7, 0x65, 0x37, 0x1e, 0xa7, 0xec, 0xc4, 0x98, 0xfd, 0x4b,
+	0xa8, 0x1d, 0x8f, 0xae, 0x9b, 0x40, 0x13, 0x5e, 0x65, 0x7c, 0x69, 0xfc, 0x4d, 0x63, 0x1f, 0x87,
+	0x6f, 0xff, 0xfd, 0x7f, 0xd8, 0x3c, 0xcc, 0x2b, 0xfa, 0x40, 0x17, 0x14, 0xff, 0x8a, 0xa0, 0x3a,
+	0x25, 0x44, 0xb8, 0x5d, 0x54, 0xf9, 0x45, 0xd5, 0xf2, 0xee, 0xe4, 0x98, 0x29, 0xc1, 0x0c, 0x3e,
+	0xcc, 0x05, 0xd3, 0xef, 0x7d, 0xfb, 0xe7, 0x5f, 0xdf, 0x57, 0x1e, 0xfa, 0xdd, 0xb1, 0xd8, 0x3e,
+	0xb5, 0x0d, 0x76, 0x3f, 0x49, 0xc5, 0xe7, 0x74, 0xa0, 0x64, 0xd8, 0x0a, 0x87, 0x44, 0x91, 0x53,
+	0x22, 0xa9, 0xfe, 0x9e, 0xa4, 0x77, 0x94, 0x8a, 0x2c, 0x91, 0x61, 0xeb, 0x32, 0x74, 0x2f, 0x7e,
+	0xd7, 0x6a, 0x1a, 0xfe, 0x03, 0x41, 0x75, 0x4a, 0x51, 0x8a, 0x69, 0x2f, 0x0a, 0xa0, 0x77, 0xf7,
+	0x4a, 0x18, 0xdb, 0xa9, 0xfe, 0xfb, 0x26, 0x99, 0x03, 0x7c, 0x1d, 0xc9, 0xe0, 0x5f, 0x10, 0xdc,
+	0xc8, 0x75, 0x09, 0x87, 0x45, 0x74, 0xe6, 0x14, 0xcc, 0x2b, 0x27, 0x96, 0xcb, 0x18, 0xeb, 0xee,
+	0x2a, 0xcf, 0x37, 0xa7, 0x1b, 0xb6, 0x2e, 0xf1, 0x8f, 0x08, 0xaa, 0x53, 0x12, 0x59, 0x5c, 0xf7,
+	0x45, 0x3d, 0xf5, 0x6a, 0x0b, 0x92, 0x76, 0xa0, 0x47, 0x67, 0x4e, 0xb4, 0x75, 0x2d, 0x44, 0x9f,
+	0xdb, 0xd2, 0x1a, 0x9d, 0x28, 0x55, 0xda, 0x69, 0xe9, 0xf4, 0xca, 0xe9, 0x8f, 0xff, 0x9e, 0x61,
+	0xbc, 0x8f, 0xf7, 0x5e, 0x9a, 0xb1, 0x15, 0x30, 0x4d, 0xf8, 0x37, 0x04, 0xd5, 0xa9, 0x89, 0x52,
+	0x5c, 0xd9, 0xc5, 0xf1, 0x53, 0xf4, 0x10, 0x3f, 0x35, 0x74, 0x3f, 0x6a, 0xbf, 0x3b, 0xa1, 0x6b,
+	0x7f, 0x91, 0x5e, 0x96, 0xf4, 0xae, 0x9b, 0x5c, 0xbf, 0x23, 0x80, 0x89, 0xaa, 0xe3, 0x9d, 0x32,
+	0x0f, 0x6b, 0x66, 0x04, 0x79, 0xed, 0xab, 0x40, 0xdc, 0x53, 0x5c, 0x52, 0xfd, 0xab, 0x3f, 0x45,
+	0x37, 0x41, 0x7e, 0x46, 0xb0, 0x35, 0x37, 0x1a, 0xf0, 0xbd, 0x22, 0x4e, 0xcb, 0x67, 0x49, 0xd1,
+	0x2d, 0x3c, 0x30, 0xb4, 0x3b, 0xfe, 0xbd, 0x52, 0x4d, 0x73, 0xb9, 0x4b, 0x67, 0xa3, 0xec, 0xa2,
+	0x96, 0x61, 0x3b, 0x37, 0x47, 0x8a, 0xd9, 0x2e, 0x1f, 0x3c, 0xd7, 0xcd, 0x96, 0x8d, 0xe6, 0xd9,
+	0xee, 0x3d, 0x47, 0xe0, 0x0f, 0xc4, 0xa8, 0x80, 0xdf, 0xde, 0xad, 0xd9, 0xc9, 0x74, 0xa2, 0xc5,
+	0xe1, 0x04, 0x7d, 0xd6, 0x75, 0xb0, 0x48, 0xc4, 0x84, 0x47, 0x81, 0x48, 0xa3, 0x30, 0xa2, 0xdc,
+	0x48, 0x47, 0x68, 0xb7, 0x48, 0xc2, 0xe4, 0xbf, 0xfd, 0xd7, 0x77, 0xcc, 0xea, 0x87, 0xca, 0xea,
+	0x51, 0xf7, 0xf0, 0xd1, 0x4f, 0x95, 0x37, 0x8f, 0xec, 0x61, 0xdd, 0x58, 0x64, 0xc3, 0x60, 0x1c,
+	0x30, 0x30, 0x11, 0x83, 0x4f, 0x76, 0xf6, 0x34, 0xe6, 0x74, 0xdd, 0x9c, 0x7e, 0xf7, 0x9f, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xc9, 0xcc, 0x19, 0xb3, 0xd4, 0x0c, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1051,70 +1129,3 @@ var _FirestoreAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/firestore/admin/v1beta2/firestore_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta2/firestore_admin.proto", fileDescriptor_firestore_admin_549fe3017350a705)
-}
-
-var fileDescriptor_firestore_admin_549fe3017350a705 = []byte{
-	// 940 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcb, 0x6e, 0x1c, 0x45,
-	0x17, 0x56, 0x8d, 0x2f, 0x7f, 0x7c, 0xe6, 0xc7, 0x26, 0x15, 0x69, 0x34, 0xea, 0x10, 0x34, 0x6a,
-	0x30, 0x1a, 0xcd, 0xa2, 0x5b, 0x9e, 0xa0, 0x2c, 0x3c, 0x8a, 0x50, 0x3c, 0xbe, 0x60, 0x08, 0xc2,
-	0x4c, 0x08, 0x48, 0x6c, 0x46, 0xe5, 0x99, 0x72, 0xab, 0x70, 0x4f, 0x55, 0xd3, 0x55, 0x8d, 0x4c,
-	0x22, 0x13, 0xc4, 0x03, 0xb0, 0xe1, 0x0d, 0x58, 0xb0, 0x00, 0x29, 0x6c, 0xd8, 0xb0, 0x62, 0xc1,
-	0x23, 0xf0, 0x0a, 0xbc, 0x01, 0x2f, 0x80, 0xea, 0xd2, 0x73, 0x27, 0xdd, 0x8e, 0x2c, 0xb1, 0xeb,
-	0x3a, 0x75, 0xbe, 0x3a, 0xdf, 0x39, 0x75, 0xea, 0x3b, 0x0d, 0x6f, 0x47, 0x42, 0x44, 0x31, 0x0d,
-	0xcf, 0x58, 0x4a, 0xa5, 0x12, 0x29, 0x0d, 0xc9, 0x70, 0xc4, 0x78, 0xf8, 0xe5, 0xce, 0x29, 0x55,
-	0xa4, 0x3d, 0xb1, 0xf7, 0x8d, 0x3d, 0x48, 0x52, 0xa1, 0x04, 0x7e, 0xdd, 0xa2, 0x82, 0xf1, 0x6e,
-	0x60, 0x77, 0x1d, 0xca, 0x7b, 0xcd, 0x9d, 0x4a, 0x12, 0x16, 0x12, 0xce, 0x85, 0x22, 0x8a, 0x09,
-	0x2e, 0x2d, 0xda, 0x6b, 0x15, 0xc6, 0xa4, 0xf1, 0xb0, 0xa4, 0x2f, 0xe3, 0x43, 0x7a, 0xe1, 0x7c,
-	0xdf, 0x70, 0xbe, 0xb1, 0xe0, 0x51, 0x9a, 0x71, 0xce, 0x78, 0x14, 0x8a, 0x84, 0xa6, 0x33, 0xc1,
-	0x6f, 0x3b, 0x27, 0xb3, 0x3a, 0xcd, 0xce, 0x42, 0x3a, 0x4a, 0xd4, 0x57, 0x6e, 0xb3, 0x31, 0xbf,
-	0x69, 0xa8, 0xf4, 0x47, 0x44, 0x9e, 0x5b, 0x0f, 0x9f, 0x01, 0xee, 0xa6, 0x94, 0x28, 0x7a, 0xac,
-	0x03, 0xf7, 0xe8, 0x17, 0x19, 0x95, 0x0a, 0xd7, 0x60, 0x3d, 0x21, 0x29, 0xe5, 0xaa, 0x8e, 0x1a,
-	0xa8, 0xb9, 0xd1, 0x73, 0x2b, 0xdc, 0x81, 0x35, 0x43, 0xb0, 0x5e, 0x69, 0xa0, 0x66, 0xb5, 0xbd,
-	0x1d, 0xbc, 0xb8, 0x6e, 0x81, 0x3d, 0xd4, 0x62, 0xfc, 0x6f, 0x10, 0xe0, 0x87, 0x4c, 0x2a, 0x63,
-	0xa4, 0xb2, 0x28, 0x56, 0x0d, 0xd6, 0xcf, 0x58, 0xac, 0x68, 0x6a, 0x82, 0x6d, 0xf4, 0xdc, 0x0a,
-	0xdf, 0x86, 0x8d, 0x84, 0x44, 0xb4, 0x2f, 0xd9, 0x13, 0x5a, 0x5f, 0x69, 0xa0, 0xe6, 0x5a, 0xef,
-	0x86, 0x36, 0x3c, 0x62, 0x4f, 0x28, 0xbe, 0x03, 0x60, 0x36, 0x95, 0x38, 0xa7, 0xbc, 0xbe, 0x6a,
-	0x80, 0xc6, 0xfd, 0x63, 0x6d, 0xf0, 0xbf, 0x86, 0x5b, 0x33, 0x0c, 0x64, 0x22, 0xb8, 0xa4, 0xf8,
-	0x1d, 0xf8, 0x1f, 0xb3, 0xa6, 0x3a, 0x6a, 0xac, 0x94, 0x4f, 0x2c, 0x47, 0xe1, 0xb7, 0x60, 0x8b,
-	0xd3, 0x0b, 0xd5, 0x9f, 0x8a, 0x6d, 0x49, 0xbf, 0xa2, 0xcd, 0x27, 0xe3, 0xf8, 0xdb, 0xb0, 0x75,
-	0x44, 0xd5, 0x4c, 0xa9, 0x31, 0xac, 0x72, 0x32, 0xa2, 0x2e, 0x79, 0xf3, 0xed, 0x37, 0x01, 0xef,
-	0xd3, 0x98, 0xce, 0x5d, 0xca, 0x32, 0xcf, 0xef, 0x10, 0xe0, 0xc7, 0xc9, 0x90, 0x28, 0x7a, 0xa8,
-	0x6f, 0x36, 0x77, 0xed, 0xc0, 0x9a, 0xb9, 0x69, 0xe3, 0x5b, 0x22, 0x1d, 0x0b, 0xb6, 0x18, 0xdc,
-	0x81, 0x6a, 0x66, 0x8e, 0x34, 0x7d, 0xe2, 0xae, 0xda, 0xcb, 0x8f, 0xc8, 0x5b, 0xc9, 0x62, 0x3e,
-	0x20, 0xf2, 0xbc, 0x07, 0xd6, 0x5d, 0x7f, 0xbb, 0x0c, 0x67, 0xc8, 0x2c, 0xe3, 0xfd, 0x0c, 0x6e,
-	0xea, 0x8b, 0x30, 0x7e, 0xff, 0x49, 0x27, 0x3c, 0xb5, 0xbd, 0x98, 0x13, 0x70, 0x8d, 0x70, 0x5f,
-	0x47, 0xd2, 0x96, 0xb2, 0x7d, 0x60, 0x13, 0x75, 0xa0, 0xd2, 0x6d, 0xf0, 0x0c, 0x6a, 0x07, 0x17,
-	0x89, 0x48, 0xd5, 0xbe, 0x18, 0x64, 0x23, 0xca, 0x95, 0x7c, 0x41, 0xad, 0xf0, 0x36, 0x6c, 0x0e,
-	0x44, 0x1c, 0xd3, 0x81, 0x7e, 0xf6, 0x7d, 0x36, 0x94, 0xf5, 0x4a, 0x63, 0x45, 0x1f, 0x3a, 0xb1,
-	0x1e, 0x0f, 0x25, 0x6e, 0xc1, 0x4d, 0x91, 0xa9, 0x24, 0x53, 0xfd, 0x2c, 0x65, 0xfd, 0x24, 0xa5,
-	0x67, 0xec, 0xc2, 0x54, 0x65, 0xa3, 0xb7, 0x65, 0x37, 0x1e, 0xa7, 0xec, 0xc4, 0x98, 0xfd, 0x4b,
-	0xa8, 0x1d, 0x8f, 0xae, 0x9b, 0x40, 0x13, 0x5e, 0x65, 0x7c, 0x69, 0xfc, 0x4d, 0x63, 0x1f, 0x87,
-	0x6f, 0xff, 0xfd, 0x7f, 0xd8, 0x3c, 0xcc, 0x2b, 0xfa, 0x40, 0x17, 0x14, 0xff, 0x8a, 0xa0, 0x3a,
-	0x25, 0x44, 0xb8, 0x5d, 0x54, 0xf9, 0x45, 0xd5, 0xf2, 0xee, 0xe4, 0x98, 0x29, 0xc1, 0x0c, 0x3e,
-	0xcc, 0x05, 0xd3, 0xef, 0x7d, 0xfb, 0xe7, 0x5f, 0xdf, 0x57, 0x1e, 0xfa, 0xdd, 0xb1, 0xd8, 0x3e,
-	0xb5, 0x0d, 0x76, 0x3f, 0x49, 0xc5, 0xe7, 0x74, 0xa0, 0x64, 0xd8, 0x0a, 0x87, 0x44, 0x91, 0x53,
-	0x22, 0xa9, 0xfe, 0x9e, 0xa4, 0x77, 0x94, 0x8a, 0x2c, 0x91, 0x61, 0xeb, 0x32, 0x74, 0x2f, 0x7e,
-	0xd7, 0x6a, 0x1a, 0xfe, 0x03, 0x41, 0x75, 0x4a, 0x51, 0x8a, 0x69, 0x2f, 0x0a, 0xa0, 0x77, 0xf7,
-	0x4a, 0x18, 0xdb, 0xa9, 0xfe, 0xfb, 0x26, 0x99, 0x03, 0x7c, 0x1d, 0xc9, 0xe0, 0x5f, 0x10, 0xdc,
-	0xc8, 0x75, 0x09, 0x87, 0x45, 0x74, 0xe6, 0x14, 0xcc, 0x2b, 0x27, 0x96, 0xcb, 0x18, 0xeb, 0xee,
-	0x2a, 0xcf, 0x37, 0xa7, 0x1b, 0xb6, 0x2e, 0xf1, 0x8f, 0x08, 0xaa, 0x53, 0x12, 0x59, 0x5c, 0xf7,
-	0x45, 0x3d, 0xf5, 0x6a, 0x0b, 0x92, 0x76, 0xa0, 0x47, 0x67, 0x4e, 0xb4, 0x75, 0x2d, 0x44, 0x9f,
-	0xdb, 0xd2, 0x1a, 0x9d, 0x28, 0x55, 0xda, 0x69, 0xe9, 0xf4, 0xca, 0xe9, 0x8f, 0xff, 0x9e, 0x61,
-	0xbc, 0x8f, 0xf7, 0x5e, 0x9a, 0xb1, 0x15, 0x30, 0x4d, 0xf8, 0x37, 0x04, 0xd5, 0xa9, 0x89, 0x52,
-	0x5c, 0xd9, 0xc5, 0xf1, 0x53, 0xf4, 0x10, 0x3f, 0x35, 0x74, 0x3f, 0x6a, 0xbf, 0x3b, 0xa1, 0x6b,
-	0x7f, 0x91, 0x5e, 0x96, 0xf4, 0xae, 0x9b, 0x5c, 0xbf, 0x23, 0x80, 0x89, 0xaa, 0xe3, 0x9d, 0x32,
-	0x0f, 0x6b, 0x66, 0x04, 0x79, 0xed, 0xab, 0x40, 0xdc, 0x53, 0x5c, 0x52, 0xfd, 0xab, 0x3f, 0x45,
-	0x37, 0x41, 0x7e, 0x46, 0xb0, 0x35, 0x37, 0x1a, 0xf0, 0xbd, 0x22, 0x4e, 0xcb, 0x67, 0x49, 0xd1,
-	0x2d, 0x3c, 0x30, 0xb4, 0x3b, 0xfe, 0xbd, 0x52, 0x4d, 0x73, 0xb9, 0x4b, 0x67, 0xa3, 0xec, 0xa2,
-	0x96, 0x61, 0x3b, 0x37, 0x47, 0x8a, 0xd9, 0x2e, 0x1f, 0x3c, 0xd7, 0xcd, 0x96, 0x8d, 0xe6, 0xd9,
-	0xee, 0x3d, 0x47, 0xe0, 0x0f, 0xc4, 0xa8, 0x80, 0xdf, 0xde, 0xad, 0xd9, 0xc9, 0x74, 0xa2, 0xc5,
-	0xe1, 0x04, 0x7d, 0xd6, 0x75, 0xb0, 0x48, 0xc4, 0x84, 0x47, 0x81, 0x48, 0xa3, 0x30, 0xa2, 0xdc,
-	0x48, 0x47, 0x68, 0xb7, 0x48, 0xc2, 0xe4, 0xbf, 0xfd, 0xd7, 0x77, 0xcc, 0xea, 0x87, 0xca, 0xea,
-	0x51, 0xf7, 0xf0, 0xd1, 0x4f, 0x95, 0x37, 0x8f, 0xec, 0x61, 0xdd, 0x58, 0x64, 0xc3, 0x60, 0x1c,
-	0x30, 0x30, 0x11, 0x83, 0x4f, 0x76, 0xf6, 0x34, 0xe6, 0x74, 0xdd, 0x9c, 0x7e, 0xf7, 0x9f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xc9, 0xcc, 0x19, 0xb3, 0xd4, 0x0c, 0x00, 0x00,
-}
diff --git a/googleapis/firestore/admin/v1beta2/index.pb.go b/googleapis/firestore/admin/v1beta2/index.pb.go
index 7a4acf8ad6..17d1c46bbf 100644
--- a/googleapis/firestore/admin/v1beta2/index.pb.go
+++ b/googleapis/firestore/admin/v1beta2/index.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/index.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Query Scope defines the scope at which a query is run. This is specified on
 // a StructuredQuery's `from` field.
@@ -36,6 +39,7 @@ var Index_QueryScope_name = map[int32]string{
 	0: "QUERY_SCOPE_UNSPECIFIED",
 	1: "COLLECTION",
 }
+
 var Index_QueryScope_value = map[string]int32{
 	"QUERY_SCOPE_UNSPECIFIED": 0,
 	"COLLECTION":              1,
@@ -44,8 +48,9 @@ var Index_QueryScope_value = map[string]int32{
 func (x Index_QueryScope) String() string {
 	return proto.EnumName(Index_QueryScope_name, int32(x))
 }
+
 func (Index_QueryScope) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_6822d5f85dc4ef3b, []int{0, 0}
+	return fileDescriptor_91374f42b54eaaef, []int{0, 0}
 }
 
 // The state of an index. During index creation, an index will be in the
@@ -83,6 +88,7 @@ var Index_State_name = map[int32]string{
 	2: "READY",
 	3: "NEEDS_REPAIR",
 }
+
 var Index_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          1,
@@ -93,8 +99,9 @@ var Index_State_value = map[string]int32{
 func (x Index_State) String() string {
 	return proto.EnumName(Index_State_name, int32(x))
 }
+
 func (Index_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_6822d5f85dc4ef3b, []int{0, 1}
+	return fileDescriptor_91374f42b54eaaef, []int{0, 1}
 }
 
 // The supported orderings.
@@ -114,6 +121,7 @@ var Index_IndexField_Order_name = map[int32]string{
 	1: "ASCENDING",
 	2: "DESCENDING",
 }
+
 var Index_IndexField_Order_value = map[string]int32{
 	"ORDER_UNSPECIFIED": 0,
 	"ASCENDING":         1,
@@ -123,8 +131,9 @@ var Index_IndexField_Order_value = map[string]int32{
 func (x Index_IndexField_Order) String() string {
 	return proto.EnumName(Index_IndexField_Order_name, int32(x))
 }
+
 func (Index_IndexField_Order) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_6822d5f85dc4ef3b, []int{0, 0, 0}
+	return fileDescriptor_91374f42b54eaaef, []int{0, 0, 0}
 }
 
 // The supported array value configurations.
@@ -141,6 +150,7 @@ var Index_IndexField_ArrayConfig_name = map[int32]string{
 	0: "ARRAY_CONFIG_UNSPECIFIED",
 	1: "CONTAINS",
 }
+
 var Index_IndexField_ArrayConfig_value = map[string]int32{
 	"ARRAY_CONFIG_UNSPECIFIED": 0,
 	"CONTAINS":                 1,
@@ -149,8 +159,9 @@ var Index_IndexField_ArrayConfig_value = map[string]int32{
 func (x Index_IndexField_ArrayConfig) String() string {
 	return proto.EnumName(Index_IndexField_ArrayConfig_name, int32(x))
 }
+
 func (Index_IndexField_ArrayConfig) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_index_6822d5f85dc4ef3b, []int{0, 0, 1}
+	return fileDescriptor_91374f42b54eaaef, []int{0, 0, 1}
 }
 
 // Cloud Firestore indexes enable simple and complex queries against
@@ -194,16 +205,17 @@ func (m *Index) Reset()         { *m = Index{} }
 func (m *Index) String() string { return proto.CompactTextString(m) }
 func (*Index) ProtoMessage()    {}
 func (*Index) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_6822d5f85dc4ef3b, []int{0}
+	return fileDescriptor_91374f42b54eaaef, []int{0}
 }
+
 func (m *Index) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Index.Unmarshal(m, b)
 }
 func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Index.Marshal(b, m, deterministic)
 }
-func (dst *Index) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Index.Merge(dst, src)
+func (m *Index) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index.Merge(m, src)
 }
 func (m *Index) XXX_Size() int {
 	return xxx_messageInfo_Index.Size(m)
@@ -265,16 +277,17 @@ func (m *Index_IndexField) Reset()         { *m = Index_IndexField{} }
 func (m *Index_IndexField) String() string { return proto.CompactTextString(m) }
 func (*Index_IndexField) ProtoMessage()    {}
 func (*Index_IndexField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_index_6822d5f85dc4ef3b, []int{0, 0}
+	return fileDescriptor_91374f42b54eaaef, []int{0, 0}
 }
+
 func (m *Index_IndexField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Index_IndexField.Unmarshal(m, b)
 }
 func (m *Index_IndexField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Index_IndexField.Marshal(b, m, deterministic)
 }
-func (dst *Index_IndexField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Index_IndexField.Merge(dst, src)
+func (m *Index_IndexField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index_IndexField.Merge(m, src)
 }
 func (m *Index_IndexField) XXX_Size() int {
 	return xxx_messageInfo_Index_IndexField.Size(m)
@@ -329,84 +342,28 @@ func (m *Index_IndexField) GetArrayConfig() Index_IndexField_ArrayConfig {
 	return Index_IndexField_ARRAY_CONFIG_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Index_IndexField) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Index_IndexField_OneofMarshaler, _Index_IndexField_OneofUnmarshaler, _Index_IndexField_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Index_IndexField) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Index_IndexField_Order_)(nil),
 		(*Index_IndexField_ArrayConfig_)(nil),
 	}
 }
 
-func _Index_IndexField_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Index_IndexField)
-	// value_mode
-	switch x := m.ValueMode.(type) {
-	case *Index_IndexField_Order_:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Order))
-	case *Index_IndexField_ArrayConfig_:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.ArrayConfig))
-	case nil:
-	default:
-		return fmt.Errorf("Index_IndexField.ValueMode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Index_IndexField_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Index_IndexField)
-	switch tag {
-	case 2: // value_mode.order
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueMode = &Index_IndexField_Order_{Index_IndexField_Order(x)}
-		return true, err
-	case 3: // value_mode.array_config
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueMode = &Index_IndexField_ArrayConfig_{Index_IndexField_ArrayConfig(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Index_IndexField_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Index_IndexField)
-	// value_mode
-	switch x := m.ValueMode.(type) {
-	case *Index_IndexField_Order_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Order))
-	case *Index_IndexField_ArrayConfig_:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.ArrayConfig))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
-	proto.RegisterType((*Index)(nil), "google.firestore.admin.v1beta2.Index")
-	proto.RegisterType((*Index_IndexField)(nil), "google.firestore.admin.v1beta2.Index.IndexField")
 	proto.RegisterEnum("google.firestore.admin.v1beta2.Index_QueryScope", Index_QueryScope_name, Index_QueryScope_value)
 	proto.RegisterEnum("google.firestore.admin.v1beta2.Index_State", Index_State_name, Index_State_value)
 	proto.RegisterEnum("google.firestore.admin.v1beta2.Index_IndexField_Order", Index_IndexField_Order_name, Index_IndexField_Order_value)
 	proto.RegisterEnum("google.firestore.admin.v1beta2.Index_IndexField_ArrayConfig", Index_IndexField_ArrayConfig_name, Index_IndexField_ArrayConfig_value)
+	proto.RegisterType((*Index)(nil), "google.firestore.admin.v1beta2.Index")
+	proto.RegisterType((*Index_IndexField)(nil), "google.firestore.admin.v1beta2.Index.IndexField")
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta2/index.proto", fileDescriptor_index_6822d5f85dc4ef3b)
+	proto.RegisterFile("google/firestore/admin/v1beta2/index.proto", fileDescriptor_91374f42b54eaaef)
 }
 
-var fileDescriptor_index_6822d5f85dc4ef3b = []byte{
+var fileDescriptor_91374f42b54eaaef = []byte{
 	// 545 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x6b, 0xdb, 0x4c,
 	0x10, 0xc6, 0x23, 0x39, 0x0a, 0xaf, 0xc7, 0x7e, 0x83, 0xba, 0x50, 0x2a, 0xd2, 0xb4, 0x18, 0xd1,
diff --git a/googleapis/firestore/admin/v1beta2/operation.pb.go b/googleapis/firestore/admin/v1beta2/operation.pb.go
index 3ee7a5c12a..197239e10f 100644
--- a/googleapis/firestore/admin/v1beta2/operation.pb.go
+++ b/googleapis/firestore/admin/v1beta2/operation.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta2/operation.proto
 
-package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta2"
+package admin
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes the state of the operation.
 type OperationState int32
@@ -54,6 +57,7 @@ var OperationState_name = map[int32]string{
 	6: "FAILED",
 	7: "CANCELLED",
 }
+
 var OperationState_value = map[string]int32{
 	"OPERATION_STATE_UNSPECIFIED": 0,
 	"INITIALIZING":                1,
@@ -68,8 +72,9 @@ var OperationState_value = map[string]int32{
 func (x OperationState) String() string {
 	return proto.EnumName(OperationState_name, int32(x))
 }
+
 func (OperationState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{0}
+	return fileDescriptor_f946ae2a57533608, []int{0}
 }
 
 // Specifies how the index is changing.
@@ -89,6 +94,7 @@ var FieldOperationMetadata_IndexConfigDelta_ChangeType_name = map[int32]string{
 	1: "ADD",
 	2: "REMOVE",
 }
+
 var FieldOperationMetadata_IndexConfigDelta_ChangeType_value = map[string]int32{
 	"CHANGE_TYPE_UNSPECIFIED": 0,
 	"ADD":                     1,
@@ -98,8 +104,9 @@ var FieldOperationMetadata_IndexConfigDelta_ChangeType_value = map[string]int32{
 func (x FieldOperationMetadata_IndexConfigDelta_ChangeType) String() string {
 	return proto.EnumName(FieldOperationMetadata_IndexConfigDelta_ChangeType_name, int32(x))
 }
+
 func (FieldOperationMetadata_IndexConfigDelta_ChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{1, 0, 0}
+	return fileDescriptor_f946ae2a57533608, []int{1, 0, 0}
 }
 
 // Metadata for [google.longrunning.Operation][google.longrunning.Operation] results from
@@ -128,16 +135,17 @@ func (m *IndexOperationMetadata) Reset()         { *m = IndexOperationMetadata{}
 func (m *IndexOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*IndexOperationMetadata) ProtoMessage()    {}
 func (*IndexOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{0}
+	return fileDescriptor_f946ae2a57533608, []int{0}
 }
+
 func (m *IndexOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IndexOperationMetadata.Unmarshal(m, b)
 }
 func (m *IndexOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IndexOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *IndexOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IndexOperationMetadata.Merge(dst, src)
+func (m *IndexOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IndexOperationMetadata.Merge(m, src)
 }
 func (m *IndexOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_IndexOperationMetadata.Size(m)
@@ -219,16 +227,17 @@ func (m *FieldOperationMetadata) Reset()         { *m = FieldOperationMetadata{}
 func (m *FieldOperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*FieldOperationMetadata) ProtoMessage()    {}
 func (*FieldOperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{1}
+	return fileDescriptor_f946ae2a57533608, []int{1}
 }
+
 func (m *FieldOperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldOperationMetadata.Unmarshal(m, b)
 }
 func (m *FieldOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldOperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *FieldOperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldOperationMetadata.Merge(dst, src)
+func (m *FieldOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldOperationMetadata.Merge(m, src)
 }
 func (m *FieldOperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_FieldOperationMetadata.Size(m)
@@ -305,16 +314,17 @@ func (m *FieldOperationMetadata_IndexConfigDelta) Reset() {
 func (m *FieldOperationMetadata_IndexConfigDelta) String() string { return proto.CompactTextString(m) }
 func (*FieldOperationMetadata_IndexConfigDelta) ProtoMessage()    {}
 func (*FieldOperationMetadata_IndexConfigDelta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{1, 0}
+	return fileDescriptor_f946ae2a57533608, []int{1, 0}
 }
+
 func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Unmarshal(m, b)
 }
 func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Marshal(b, m, deterministic)
 }
-func (dst *FieldOperationMetadata_IndexConfigDelta) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Merge(dst, src)
+func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Merge(m, src)
 }
 func (m *FieldOperationMetadata_IndexConfigDelta) XXX_Size() int {
 	return xxx_messageInfo_FieldOperationMetadata_IndexConfigDelta.Size(m)
@@ -366,16 +376,17 @@ func (m *ExportDocumentsMetadata) Reset()         { *m = ExportDocumentsMetadata
 func (m *ExportDocumentsMetadata) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsMetadata) ProtoMessage()    {}
 func (*ExportDocumentsMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{2}
+	return fileDescriptor_f946ae2a57533608, []int{2}
 }
+
 func (m *ExportDocumentsMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsMetadata.Unmarshal(m, b)
 }
 func (m *ExportDocumentsMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsMetadata.Merge(dst, src)
+func (m *ExportDocumentsMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsMetadata.Merge(m, src)
 }
 func (m *ExportDocumentsMetadata) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsMetadata.Size(m)
@@ -462,16 +473,17 @@ func (m *ImportDocumentsMetadata) Reset()         { *m = ImportDocumentsMetadata
 func (m *ImportDocumentsMetadata) String() string { return proto.CompactTextString(m) }
 func (*ImportDocumentsMetadata) ProtoMessage()    {}
 func (*ImportDocumentsMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{3}
+	return fileDescriptor_f946ae2a57533608, []int{3}
 }
+
 func (m *ImportDocumentsMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportDocumentsMetadata.Unmarshal(m, b)
 }
 func (m *ImportDocumentsMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportDocumentsMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ImportDocumentsMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportDocumentsMetadata.Merge(dst, src)
+func (m *ImportDocumentsMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDocumentsMetadata.Merge(m, src)
 }
 func (m *ImportDocumentsMetadata) XXX_Size() int {
 	return xxx_messageInfo_ImportDocumentsMetadata.Size(m)
@@ -546,16 +558,17 @@ func (m *ExportDocumentsResponse) Reset()         { *m = ExportDocumentsResponse
 func (m *ExportDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ExportDocumentsResponse) ProtoMessage()    {}
 func (*ExportDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{4}
+	return fileDescriptor_f946ae2a57533608, []int{4}
 }
+
 func (m *ExportDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportDocumentsResponse.Unmarshal(m, b)
 }
 func (m *ExportDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExportDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportDocumentsResponse.Merge(dst, src)
+func (m *ExportDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDocumentsResponse.Merge(m, src)
 }
 func (m *ExportDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ExportDocumentsResponse.Size(m)
@@ -590,16 +603,17 @@ func (m *Progress) Reset()         { *m = Progress{} }
 func (m *Progress) String() string { return proto.CompactTextString(m) }
 func (*Progress) ProtoMessage()    {}
 func (*Progress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operation_1eae331224aa61a0, []int{5}
+	return fileDescriptor_f946ae2a57533608, []int{5}
 }
+
 func (m *Progress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Progress.Unmarshal(m, b)
 }
 func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
 }
-func (dst *Progress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Progress.Merge(dst, src)
+func (m *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(m, src)
 }
 func (m *Progress) XXX_Size() int {
 	return xxx_messageInfo_Progress.Size(m)
@@ -625,6 +639,8 @@ func (m *Progress) GetCompletedWork() int64 {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.admin.v1beta2.OperationState", OperationState_name, OperationState_value)
+	proto.RegisterEnum("google.firestore.admin.v1beta2.FieldOperationMetadata_IndexConfigDelta_ChangeType", FieldOperationMetadata_IndexConfigDelta_ChangeType_name, FieldOperationMetadata_IndexConfigDelta_ChangeType_value)
 	proto.RegisterType((*IndexOperationMetadata)(nil), "google.firestore.admin.v1beta2.IndexOperationMetadata")
 	proto.RegisterType((*FieldOperationMetadata)(nil), "google.firestore.admin.v1beta2.FieldOperationMetadata")
 	proto.RegisterType((*FieldOperationMetadata_IndexConfigDelta)(nil), "google.firestore.admin.v1beta2.FieldOperationMetadata.IndexConfigDelta")
@@ -632,15 +648,13 @@ func init() {
 	proto.RegisterType((*ImportDocumentsMetadata)(nil), "google.firestore.admin.v1beta2.ImportDocumentsMetadata")
 	proto.RegisterType((*ExportDocumentsResponse)(nil), "google.firestore.admin.v1beta2.ExportDocumentsResponse")
 	proto.RegisterType((*Progress)(nil), "google.firestore.admin.v1beta2.Progress")
-	proto.RegisterEnum("google.firestore.admin.v1beta2.OperationState", OperationState_name, OperationState_value)
-	proto.RegisterEnum("google.firestore.admin.v1beta2.FieldOperationMetadata_IndexConfigDelta_ChangeType", FieldOperationMetadata_IndexConfigDelta_ChangeType_name, FieldOperationMetadata_IndexConfigDelta_ChangeType_value)
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta2/operation.proto", fileDescriptor_operation_1eae331224aa61a0)
+	proto.RegisterFile("google/firestore/admin/v1beta2/operation.proto", fileDescriptor_f946ae2a57533608)
 }
 
-var fileDescriptor_operation_1eae331224aa61a0 = []byte{
+var fileDescriptor_f946ae2a57533608 = []byte{
 	// 858 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
 	0x14, 0xc6, 0x71, 0x92, 0x6e, 0x5e, 0xa9, 0xd7, 0x1d, 0xd0, 0x36, 0xea, 0x22, 0xb6, 0x8a, 0xa8,
diff --git a/googleapis/firestore/v1/common.pb.go b/googleapis/firestore/v1/common.pb.go
index 2ba26db0d7..fc300c8f90 100644
--- a/googleapis/firestore/v1/common.pb.go
+++ b/googleapis/firestore/v1/common.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1/common.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A set of field paths on a document.
 // Used to restrict a get or update operation on a document to a subset of its
@@ -38,16 +41,17 @@ func (m *DocumentMask) Reset()         { *m = DocumentMask{} }
 func (m *DocumentMask) String() string { return proto.CompactTextString(m) }
 func (*DocumentMask) ProtoMessage()    {}
 func (*DocumentMask) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_dddbf67b55d1e5f0, []int{0}
+	return fileDescriptor_b2e1854e17ece251, []int{0}
 }
+
 func (m *DocumentMask) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentMask.Unmarshal(m, b)
 }
 func (m *DocumentMask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentMask.Marshal(b, m, deterministic)
 }
-func (dst *DocumentMask) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentMask.Merge(dst, src)
+func (m *DocumentMask) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentMask.Merge(m, src)
 }
 func (m *DocumentMask) XXX_Size() int {
 	return xxx_messageInfo_DocumentMask.Size(m)
@@ -82,16 +86,17 @@ func (m *Precondition) Reset()         { *m = Precondition{} }
 func (m *Precondition) String() string { return proto.CompactTextString(m) }
 func (*Precondition) ProtoMessage()    {}
 func (*Precondition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_dddbf67b55d1e5f0, []int{1}
+	return fileDescriptor_b2e1854e17ece251, []int{1}
 }
+
 func (m *Precondition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Precondition.Unmarshal(m, b)
 }
 func (m *Precondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Precondition.Marshal(b, m, deterministic)
 }
-func (dst *Precondition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Precondition.Merge(dst, src)
+func (m *Precondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Precondition.Merge(m, src)
 }
 func (m *Precondition) XXX_Size() int {
 	return xxx_messageInfo_Precondition.Size(m)
@@ -139,79 +144,14 @@ func (m *Precondition) GetUpdateTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Precondition) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Precondition_OneofMarshaler, _Precondition_OneofUnmarshaler, _Precondition_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Precondition) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Precondition_Exists)(nil),
 		(*Precondition_UpdateTime)(nil),
 	}
 }
 
-func _Precondition_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Precondition)
-	// condition_type
-	switch x := m.ConditionType.(type) {
-	case *Precondition_Exists:
-		t := uint64(0)
-		if x.Exists {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Precondition_UpdateTime:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UpdateTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Precondition.ConditionType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Precondition_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Precondition)
-	switch tag {
-	case 1: // condition_type.exists
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConditionType = &Precondition_Exists{x != 0}
-		return true, err
-	case 2: // condition_type.update_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConditionType = &Precondition_UpdateTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Precondition_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Precondition)
-	// condition_type
-	switch x := m.ConditionType.(type) {
-	case *Precondition_Exists:
-		n += 1 // tag and wire
-		n += 1
-	case *Precondition_UpdateTime:
-		s := proto.Size(x.UpdateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options for creating a new transaction.
 type TransactionOptions struct {
 	// The mode of the transaction.
@@ -229,16 +169,17 @@ func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
 func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions) ProtoMessage()    {}
 func (*TransactionOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_dddbf67b55d1e5f0, []int{2}
+	return fileDescriptor_b2e1854e17ece251, []int{2}
 }
+
 func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
 }
 func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+func (m *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(m, src)
 }
 func (m *TransactionOptions) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions.Size(m)
@@ -286,80 +227,14 @@ func (m *TransactionOptions) GetReadWrite() *TransactionOptions_ReadWrite {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_OneofMarshaler, _TransactionOptions_OneofUnmarshaler, _TransactionOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadOnly_)(nil),
 		(*TransactionOptions_ReadWrite_)(nil),
 	}
 }
 
-func _TransactionOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadOnly_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadOnly); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadWrite_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadWrite); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions.Mode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions)
-	switch tag {
-	case 2: // mode.read_only
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadOnly)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadOnly_{msg}
-		return true, err
-	case 3: // mode.read_write
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadWrite)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadWrite_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadOnly_:
-		s := proto.Size(x.ReadOnly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadWrite_:
-		s := proto.Size(x.ReadWrite)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options for a transaction that can be used to read and write documents.
 type TransactionOptions_ReadWrite struct {
 	// An optional transaction to retry.
@@ -373,16 +248,17 @@ func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions
 func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
 func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_dddbf67b55d1e5f0, []int{2, 0}
+	return fileDescriptor_b2e1854e17ece251, []int{2, 0}
 }
+
 func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+func (m *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(m, src)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
@@ -417,16 +293,17 @@ func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_
 func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
 func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_dddbf67b55d1e5f0, []int{2, 1}
+	return fileDescriptor_b2e1854e17ece251, []int{2, 1}
 }
+
 func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+func (m *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(m, src)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
@@ -461,61 +338,13 @@ func (m *TransactionOptions_ReadOnly) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions_ReadOnly) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_ReadOnly_OneofMarshaler, _TransactionOptions_ReadOnly_OneofUnmarshaler, _TransactionOptions_ReadOnly_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions_ReadOnly) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadOnly_ReadTime)(nil),
 	}
 }
 
-func _TransactionOptions_ReadOnly_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions_ReadOnly)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *TransactionOptions_ReadOnly_ReadTime:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions_ReadOnly.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions_ReadOnly)
-	switch tag {
-	case 2: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &TransactionOptions_ReadOnly_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_ReadOnly_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions_ReadOnly)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *TransactionOptions_ReadOnly_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*DocumentMask)(nil), "google.firestore.v1.DocumentMask")
 	proto.RegisterType((*Precondition)(nil), "google.firestore.v1.Precondition")
@@ -524,11 +353,9 @@ func init() {
 	proto.RegisterType((*TransactionOptions_ReadOnly)(nil), "google.firestore.v1.TransactionOptions.ReadOnly")
 }
 
-func init() {
-	proto.RegisterFile("google/firestore/v1/common.proto", fileDescriptor_common_dddbf67b55d1e5f0)
-}
+func init() { proto.RegisterFile("google/firestore/v1/common.proto", fileDescriptor_b2e1854e17ece251) }
 
-var fileDescriptor_common_dddbf67b55d1e5f0 = []byte{
+var fileDescriptor_b2e1854e17ece251 = []byte{
 	// 458 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x5f, 0x8b, 0xd3, 0x40,
 	0x10, 0x6f, 0x7a, 0x47, 0x69, 0xa7, 0x45, 0xce, 0x28, 0x5a, 0x83, 0x70, 0xa5, 0x4f, 0x05, 0x61,
diff --git a/googleapis/firestore/v1/document.pb.go b/googleapis/firestore/v1/document.pb.go
index 437d1855e1..a0469108c1 100644
--- a/googleapis/firestore/v1/document.pb.go
+++ b/googleapis/firestore/v1/document.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1/document.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Firestore document.
 //
@@ -75,16 +78,17 @@ func (m *Document) Reset()         { *m = Document{} }
 func (m *Document) String() string { return proto.CompactTextString(m) }
 func (*Document) ProtoMessage()    {}
 func (*Document) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_36dad12edbf1593d, []int{0}
+	return fileDescriptor_8e0f854a5c2f070c, []int{0}
 }
+
 func (m *Document) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Document.Unmarshal(m, b)
 }
 func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
 }
-func (dst *Document) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Document.Merge(dst, src)
+func (m *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(m, src)
 }
 func (m *Document) XXX_Size() int {
 	return xxx_messageInfo_Document.Size(m)
@@ -149,16 +153,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_36dad12edbf1593d, []int{1}
+	return fileDescriptor_8e0f854a5c2f070c, []int{1}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -323,9 +328,9 @@ func (m *Value) GetMapValue() *MapValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_NullValue)(nil),
 		(*Value_BooleanValue)(nil),
 		(*Value_IntegerValue)(nil),
@@ -340,206 +345,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_IntegerValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		b.EncodeVarint(3<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Value_TimestampValue:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case *Value_StringValue:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BytesValue:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BytesValue)
-	case *Value_ReferenceValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ReferenceValue)
-	case *Value_GeoPointValue:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GeoPointValue); err != nil {
-			return err
-		}
-	case *Value_ArrayValue:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ArrayValue); err != nil {
-			return err
-		}
-	case *Value_MapValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MapValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Value.ValueType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 11: // value_type.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 1: // value_type.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_BooleanValue{x != 0}
-		return true, err
-	case 2: // value_type.integer_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_IntegerValue{int64(x)}
-		return true, err
-	case 3: // value_type.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.ValueType = &Value_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 10: // value_type.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_TimestampValue{msg}
-		return true, err
-	case 17: // value_type.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ValueType = &Value_StringValue{x}
-		return true, err
-	case 18: // value_type.bytes_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ValueType = &Value_BytesValue{x}
-		return true, err
-	case 5: // value_type.reference_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ValueType = &Value_ReferenceValue{x}
-		return true, err
-	case 8: // value_type.geo_point_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(latlng.LatLng)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_GeoPointValue{msg}
-		return true, err
-	case 9: // value_type.array_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_ArrayValue{msg}
-		return true, err
-	case 6: // value_type.map_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MapValue)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_MapValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_IntegerValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_StringValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BytesValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BytesValue)))
-		n += len(x.BytesValue)
-	case *Value_ReferenceValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ReferenceValue)))
-		n += len(x.ReferenceValue)
-	case *Value_GeoPointValue:
-		s := proto.Size(x.GeoPointValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ArrayValue:
-		s := proto.Size(x.ArrayValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_MapValue:
-		s := proto.Size(x.MapValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An array value.
 type ArrayValue struct {
 	// Values in the array.
@@ -553,16 +358,17 @@ func (m *ArrayValue) Reset()         { *m = ArrayValue{} }
 func (m *ArrayValue) String() string { return proto.CompactTextString(m) }
 func (*ArrayValue) ProtoMessage()    {}
 func (*ArrayValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_36dad12edbf1593d, []int{2}
+	return fileDescriptor_8e0f854a5c2f070c, []int{2}
 }
+
 func (m *ArrayValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ArrayValue.Unmarshal(m, b)
 }
 func (m *ArrayValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ArrayValue.Marshal(b, m, deterministic)
 }
-func (dst *ArrayValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ArrayValue.Merge(dst, src)
+func (m *ArrayValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayValue.Merge(m, src)
 }
 func (m *ArrayValue) XXX_Size() int {
 	return xxx_messageInfo_ArrayValue.Size(m)
@@ -598,16 +404,17 @@ func (m *MapValue) Reset()         { *m = MapValue{} }
 func (m *MapValue) String() string { return proto.CompactTextString(m) }
 func (*MapValue) ProtoMessage()    {}
 func (*MapValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_36dad12edbf1593d, []int{3}
+	return fileDescriptor_8e0f854a5c2f070c, []int{3}
 }
+
 func (m *MapValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapValue.Unmarshal(m, b)
 }
 func (m *MapValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapValue.Marshal(b, m, deterministic)
 }
-func (dst *MapValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapValue.Merge(dst, src)
+func (m *MapValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapValue.Merge(m, src)
 }
 func (m *MapValue) XXX_Size() int {
 	return xxx_messageInfo_MapValue.Size(m)
@@ -634,11 +441,9 @@ func init() {
 	proto.RegisterMapType((map[string]*Value)(nil), "google.firestore.v1.MapValue.FieldsEntry")
 }
 
-func init() {
-	proto.RegisterFile("google/firestore/v1/document.proto", fileDescriptor_document_36dad12edbf1593d)
-}
+func init() { proto.RegisterFile("google/firestore/v1/document.proto", fileDescriptor_8e0f854a5c2f070c) }
 
-var fileDescriptor_document_36dad12edbf1593d = []byte{
+var fileDescriptor_8e0f854a5c2f070c = []byte{
 	// 650 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x4f, 0x6f, 0xd3, 0x4c,
 	0x10, 0xc6, 0xe3, 0x24, 0x8d, 0x92, 0x71, 0xda, 0xbe, 0xaf, 0x7b, 0x20, 0x44, 0xa0, 0x86, 0x20,
diff --git a/googleapis/firestore/v1/firestore.pb.go b/googleapis/firestore/v1/firestore.pb.go
index 45dd707f3f..62973b08e1 100644
--- a/googleapis/firestore/v1/firestore.pb.go
+++ b/googleapis/firestore/v1/firestore.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1/firestore.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package firestore
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of change.
 type TargetChange_TargetChangeType int32
@@ -61,6 +61,7 @@ var TargetChange_TargetChangeType_name = map[int32]string{
 	3: "CURRENT",
 	4: "RESET",
 }
+
 var TargetChange_TargetChangeType_value = map[string]int32{
 	"NO_CHANGE": 0,
 	"ADD":       1,
@@ -72,8 +73,9 @@ var TargetChange_TargetChangeType_value = map[string]int32{
 func (x TargetChange_TargetChangeType) String() string {
 	return proto.EnumName(TargetChange_TargetChangeType_name, int32(x))
 }
+
 func (TargetChange_TargetChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{20, 0}
+	return fileDescriptor_f56aaf8ee76b5544, []int{20, 0}
 }
 
 // The request for [Firestore.GetDocument][google.firestore.v1.Firestore.GetDocument].
@@ -102,16 +104,17 @@ func (m *GetDocumentRequest) Reset()         { *m = GetDocumentRequest{} }
 func (m *GetDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDocumentRequest) ProtoMessage()    {}
 func (*GetDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{0}
+	return fileDescriptor_f56aaf8ee76b5544, []int{0}
 }
+
 func (m *GetDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDocumentRequest.Unmarshal(m, b)
 }
 func (m *GetDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDocumentRequest.Merge(dst, src)
+func (m *GetDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDocumentRequest.Merge(m, src)
 }
 func (m *GetDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDocumentRequest.Size(m)
@@ -173,76 +176,14 @@ func (m *GetDocumentRequest) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GetDocumentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GetDocumentRequest_OneofMarshaler, _GetDocumentRequest_OneofUnmarshaler, _GetDocumentRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GetDocumentRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GetDocumentRequest_Transaction)(nil),
 		(*GetDocumentRequest_ReadTime)(nil),
 	}
 }
 
-func _GetDocumentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GetDocumentRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *GetDocumentRequest_Transaction:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *GetDocumentRequest_ReadTime:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GetDocumentRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GetDocumentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GetDocumentRequest)
-	switch tag {
-	case 3: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &GetDocumentRequest_Transaction{x}
-		return true, err
-	case 5: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &GetDocumentRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GetDocumentRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GetDocumentRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *GetDocumentRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *GetDocumentRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request for [Firestore.ListDocuments][google.firestore.v1.Firestore.ListDocuments].
 type ListDocumentsRequest struct {
 	// The parent resource name. In the format:
@@ -290,16 +231,17 @@ func (m *ListDocumentsRequest) Reset()         { *m = ListDocumentsRequest{} }
 func (m *ListDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDocumentsRequest) ProtoMessage()    {}
 func (*ListDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{1}
+	return fileDescriptor_f56aaf8ee76b5544, []int{1}
 }
+
 func (m *ListDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ListDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDocumentsRequest.Merge(dst, src)
+func (m *ListDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsRequest.Merge(m, src)
 }
 func (m *ListDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDocumentsRequest.Size(m)
@@ -396,76 +338,14 @@ func (m *ListDocumentsRequest) GetShowMissing() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListDocumentsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListDocumentsRequest_OneofMarshaler, _ListDocumentsRequest_OneofUnmarshaler, _ListDocumentsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListDocumentsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListDocumentsRequest_Transaction)(nil),
 		(*ListDocumentsRequest_ReadTime)(nil),
 	}
 }
 
-func _ListDocumentsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *ListDocumentsRequest_Transaction:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *ListDocumentsRequest_ReadTime:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ListDocumentsRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListDocumentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListDocumentsRequest)
-	switch tag {
-	case 8: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &ListDocumentsRequest_Transaction{x}
-		return true, err
-	case 10: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &ListDocumentsRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListDocumentsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *ListDocumentsRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *ListDocumentsRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Firestore.ListDocuments][google.firestore.v1.Firestore.ListDocuments].
 type ListDocumentsResponse struct {
 	// The Documents found.
@@ -481,16 +361,17 @@ func (m *ListDocumentsResponse) Reset()         { *m = ListDocumentsResponse{} }
 func (m *ListDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDocumentsResponse) ProtoMessage()    {}
 func (*ListDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{2}
+	return fileDescriptor_f56aaf8ee76b5544, []int{2}
 }
+
 func (m *ListDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDocumentsResponse.Unmarshal(m, b)
 }
 func (m *ListDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDocumentsResponse.Merge(dst, src)
+func (m *ListDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsResponse.Merge(m, src)
 }
 func (m *ListDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDocumentsResponse.Size(m)
@@ -543,16 +424,17 @@ func (m *CreateDocumentRequest) Reset()         { *m = CreateDocumentRequest{} }
 func (m *CreateDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDocumentRequest) ProtoMessage()    {}
 func (*CreateDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{3}
+	return fileDescriptor_f56aaf8ee76b5544, []int{3}
 }
+
 func (m *CreateDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDocumentRequest.Unmarshal(m, b)
 }
 func (m *CreateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDocumentRequest.Merge(dst, src)
+func (m *CreateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDocumentRequest.Merge(m, src)
 }
 func (m *CreateDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDocumentRequest.Size(m)
@@ -628,16 +510,17 @@ func (m *UpdateDocumentRequest) Reset()         { *m = UpdateDocumentRequest{} }
 func (m *UpdateDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDocumentRequest) ProtoMessage()    {}
 func (*UpdateDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{4}
+	return fileDescriptor_f56aaf8ee76b5544, []int{4}
 }
+
 func (m *UpdateDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDocumentRequest.Unmarshal(m, b)
 }
 func (m *UpdateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDocumentRequest.Merge(dst, src)
+func (m *UpdateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDocumentRequest.Merge(m, src)
 }
 func (m *UpdateDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDocumentRequest.Size(m)
@@ -693,16 +576,17 @@ func (m *DeleteDocumentRequest) Reset()         { *m = DeleteDocumentRequest{} }
 func (m *DeleteDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDocumentRequest) ProtoMessage()    {}
 func (*DeleteDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{5}
+	return fileDescriptor_f56aaf8ee76b5544, []int{5}
 }
+
 func (m *DeleteDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDocumentRequest.Unmarshal(m, b)
 }
 func (m *DeleteDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDocumentRequest.Merge(dst, src)
+func (m *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDocumentRequest.Merge(m, src)
 }
 func (m *DeleteDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDocumentRequest.Size(m)
@@ -759,16 +643,17 @@ func (m *BatchGetDocumentsRequest) Reset()         { *m = BatchGetDocumentsReque
 func (m *BatchGetDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchGetDocumentsRequest) ProtoMessage()    {}
 func (*BatchGetDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{6}
+	return fileDescriptor_f56aaf8ee76b5544, []int{6}
 }
+
 func (m *BatchGetDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetDocumentsRequest.Unmarshal(m, b)
 }
 func (m *BatchGetDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetDocumentsRequest.Merge(dst, src)
+func (m *BatchGetDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetDocumentsRequest.Merge(m, src)
 }
 func (m *BatchGetDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchGetDocumentsRequest.Size(m)
@@ -850,95 +735,15 @@ func (m *BatchGetDocumentsRequest) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchGetDocumentsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchGetDocumentsRequest_OneofMarshaler, _BatchGetDocumentsRequest_OneofUnmarshaler, _BatchGetDocumentsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchGetDocumentsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchGetDocumentsRequest_Transaction)(nil),
 		(*BatchGetDocumentsRequest_NewTransaction)(nil),
 		(*BatchGetDocumentsRequest_ReadTime)(nil),
 	}
 }
 
-func _BatchGetDocumentsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchGetDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *BatchGetDocumentsRequest_Transaction:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *BatchGetDocumentsRequest_NewTransaction:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NewTransaction); err != nil {
-			return err
-		}
-	case *BatchGetDocumentsRequest_ReadTime:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchGetDocumentsRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchGetDocumentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchGetDocumentsRequest)
-	switch tag {
-	case 4: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &BatchGetDocumentsRequest_Transaction{x}
-		return true, err
-	case 5: // consistency_selector.new_transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &BatchGetDocumentsRequest_NewTransaction{msg}
-		return true, err
-	case 7: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &BatchGetDocumentsRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchGetDocumentsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchGetDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *BatchGetDocumentsRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *BatchGetDocumentsRequest_NewTransaction:
-		s := proto.Size(x.NewTransaction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BatchGetDocumentsRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The streamed response for [Firestore.BatchGetDocuments][google.firestore.v1.Firestore.BatchGetDocuments].
 type BatchGetDocumentsResponse struct {
 	// A single result.
@@ -966,16 +771,17 @@ func (m *BatchGetDocumentsResponse) Reset()         { *m = BatchGetDocumentsResp
 func (m *BatchGetDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchGetDocumentsResponse) ProtoMessage()    {}
 func (*BatchGetDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{7}
+	return fileDescriptor_f56aaf8ee76b5544, []int{7}
 }
+
 func (m *BatchGetDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetDocumentsResponse.Unmarshal(m, b)
 }
 func (m *BatchGetDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetDocumentsResponse.Merge(dst, src)
+func (m *BatchGetDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetDocumentsResponse.Merge(m, src)
 }
 func (m *BatchGetDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchGetDocumentsResponse.Size(m)
@@ -1037,76 +843,14 @@ func (m *BatchGetDocumentsResponse) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchGetDocumentsResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchGetDocumentsResponse_OneofMarshaler, _BatchGetDocumentsResponse_OneofUnmarshaler, _BatchGetDocumentsResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchGetDocumentsResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchGetDocumentsResponse_Found)(nil),
 		(*BatchGetDocumentsResponse_Missing)(nil),
 	}
 }
 
-func _BatchGetDocumentsResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchGetDocumentsResponse)
-	// result
-	switch x := m.Result.(type) {
-	case *BatchGetDocumentsResponse_Found:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Found); err != nil {
-			return err
-		}
-	case *BatchGetDocumentsResponse_Missing:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Missing)
-	case nil:
-	default:
-		return fmt.Errorf("BatchGetDocumentsResponse.Result has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchGetDocumentsResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchGetDocumentsResponse)
-	switch tag {
-	case 1: // result.found
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Document)
-		err := b.DecodeMessage(msg)
-		m.Result = &BatchGetDocumentsResponse_Found{msg}
-		return true, err
-	case 2: // result.missing
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Result = &BatchGetDocumentsResponse_Missing{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchGetDocumentsResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchGetDocumentsResponse)
-	// result
-	switch x := m.Result.(type) {
-	case *BatchGetDocumentsResponse_Found:
-		s := proto.Size(x.Found)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BatchGetDocumentsResponse_Missing:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Missing)))
-		n += len(x.Missing)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request for [Firestore.BeginTransaction][google.firestore.v1.Firestore.BeginTransaction].
 type BeginTransactionRequest struct {
 	// The database name. In the format:
@@ -1124,16 +868,17 @@ func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest
 func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionRequest) ProtoMessage()    {}
 func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{8}
+	return fileDescriptor_f56aaf8ee76b5544, []int{8}
 }
+
 func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
 }
 func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+func (m *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(m, src)
 }
 func (m *BeginTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionRequest.Size(m)
@@ -1171,16 +916,17 @@ func (m *BeginTransactionResponse) Reset()         { *m = BeginTransactionRespon
 func (m *BeginTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionResponse) ProtoMessage()    {}
 func (*BeginTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{9}
+	return fileDescriptor_f56aaf8ee76b5544, []int{9}
 }
+
 func (m *BeginTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionResponse.Unmarshal(m, b)
 }
 func (m *BeginTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionResponse.Merge(dst, src)
+func (m *BeginTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionResponse.Merge(m, src)
 }
 func (m *BeginTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionResponse.Size(m)
@@ -1218,16 +964,17 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{10}
+	return fileDescriptor_f56aaf8ee76b5544, []int{10}
 }
+
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(dst, src)
+func (m *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(m, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -1277,16 +1024,17 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{11}
+	return fileDescriptor_f56aaf8ee76b5544, []int{11}
 }
+
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(dst, src)
+func (m *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(m, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -1327,16 +1075,17 @@ func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
 func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackRequest) ProtoMessage()    {}
 func (*RollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{12}
+	return fileDescriptor_f56aaf8ee76b5544, []int{12}
 }
+
 func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
 }
 func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+func (m *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(m, src)
 }
 func (m *RollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackRequest.Size(m)
@@ -1392,16 +1141,17 @@ func (m *RunQueryRequest) Reset()         { *m = RunQueryRequest{} }
 func (m *RunQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*RunQueryRequest) ProtoMessage()    {}
 func (*RunQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{13}
+	return fileDescriptor_f56aaf8ee76b5544, []int{13}
 }
+
 func (m *RunQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryRequest.Unmarshal(m, b)
 }
 func (m *RunQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryRequest.Merge(dst, src)
+func (m *RunQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryRequest.Merge(m, src)
 }
 func (m *RunQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_RunQueryRequest.Size(m)
@@ -1493,9 +1243,9 @@ func (m *RunQueryRequest) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RunQueryRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RunQueryRequest_OneofMarshaler, _RunQueryRequest_OneofUnmarshaler, _RunQueryRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RunQueryRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RunQueryRequest_StructuredQuery)(nil),
 		(*RunQueryRequest_Transaction)(nil),
 		(*RunQueryRequest_NewTransaction)(nil),
@@ -1503,116 +1253,6 @@ func (*RunQueryRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffe
 	}
 }
 
-func _RunQueryRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_StructuredQuery:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredQuery); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RunQueryRequest.QueryType has unexpected type %T", x)
-	}
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *RunQueryRequest_Transaction:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *RunQueryRequest_NewTransaction:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NewTransaction); err != nil {
-			return err
-		}
-	case *RunQueryRequest_ReadTime:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RunQueryRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RunQueryRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RunQueryRequest)
-	switch tag {
-	case 2: // query_type.structured_query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &RunQueryRequest_StructuredQuery{msg}
-		return true, err
-	case 5: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &RunQueryRequest_Transaction{x}
-		return true, err
-	case 6: // consistency_selector.new_transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &RunQueryRequest_NewTransaction{msg}
-		return true, err
-	case 7: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &RunQueryRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_StructuredQuery:
-		s := proto.Size(x.StructuredQuery)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *RunQueryRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *RunQueryRequest_NewTransaction:
-		s := proto.Size(x.NewTransaction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RunQueryRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Firestore.RunQuery][google.firestore.v1.Firestore.RunQuery].
 type RunQueryResponse struct {
 	// The transaction that was started as part of this request.
@@ -1643,16 +1283,17 @@ func (m *RunQueryResponse) Reset()         { *m = RunQueryResponse{} }
 func (m *RunQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*RunQueryResponse) ProtoMessage()    {}
 func (*RunQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{14}
+	return fileDescriptor_f56aaf8ee76b5544, []int{14}
 }
+
 func (m *RunQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryResponse.Unmarshal(m, b)
 }
 func (m *RunQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryResponse.Merge(dst, src)
+func (m *RunQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryResponse.Merge(m, src)
 }
 func (m *RunQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_RunQueryResponse.Size(m)
@@ -1743,16 +1384,17 @@ func (m *WriteRequest) Reset()         { *m = WriteRequest{} }
 func (m *WriteRequest) String() string { return proto.CompactTextString(m) }
 func (*WriteRequest) ProtoMessage()    {}
 func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{15}
+	return fileDescriptor_f56aaf8ee76b5544, []int{15}
 }
+
 func (m *WriteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteRequest.Unmarshal(m, b)
 }
 func (m *WriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteRequest.Marshal(b, m, deterministic)
 }
-func (dst *WriteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteRequest.Merge(dst, src)
+func (m *WriteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteRequest.Merge(m, src)
 }
 func (m *WriteRequest) XXX_Size() int {
 	return xxx_messageInfo_WriteRequest.Size(m)
@@ -1824,16 +1466,17 @@ func (m *WriteResponse) Reset()         { *m = WriteResponse{} }
 func (m *WriteResponse) String() string { return proto.CompactTextString(m) }
 func (*WriteResponse) ProtoMessage()    {}
 func (*WriteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{16}
+	return fileDescriptor_f56aaf8ee76b5544, []int{16}
 }
+
 func (m *WriteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteResponse.Unmarshal(m, b)
 }
 func (m *WriteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteResponse.Marshal(b, m, deterministic)
 }
-func (dst *WriteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteResponse.Merge(dst, src)
+func (m *WriteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResponse.Merge(m, src)
 }
 func (m *WriteResponse) XXX_Size() int {
 	return xxx_messageInfo_WriteResponse.Size(m)
@@ -1894,16 +1537,17 @@ func (m *ListenRequest) Reset()         { *m = ListenRequest{} }
 func (m *ListenRequest) String() string { return proto.CompactTextString(m) }
 func (*ListenRequest) ProtoMessage()    {}
 func (*ListenRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{17}
+	return fileDescriptor_f56aaf8ee76b5544, []int{17}
 }
+
 func (m *ListenRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListenRequest.Unmarshal(m, b)
 }
 func (m *ListenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListenRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListenRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListenRequest.Merge(dst, src)
+func (m *ListenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListenRequest.Merge(m, src)
 }
 func (m *ListenRequest) XXX_Size() int {
 	return xxx_messageInfo_ListenRequest.Size(m)
@@ -1965,75 +1609,14 @@ func (m *ListenRequest) GetLabels() map[string]string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListenRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListenRequest_OneofMarshaler, _ListenRequest_OneofUnmarshaler, _ListenRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListenRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListenRequest_AddTarget)(nil),
 		(*ListenRequest_RemoveTarget)(nil),
 	}
 }
 
-func _ListenRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListenRequest)
-	// target_change
-	switch x := m.TargetChange.(type) {
-	case *ListenRequest_AddTarget:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AddTarget); err != nil {
-			return err
-		}
-	case *ListenRequest_RemoveTarget:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RemoveTarget))
-	case nil:
-	default:
-		return fmt.Errorf("ListenRequest.TargetChange has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListenRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListenRequest)
-	switch tag {
-	case 2: // target_change.add_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Target)
-		err := b.DecodeMessage(msg)
-		m.TargetChange = &ListenRequest_AddTarget{msg}
-		return true, err
-	case 3: // target_change.remove_target
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TargetChange = &ListenRequest_RemoveTarget{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListenRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListenRequest)
-	// target_change
-	switch x := m.TargetChange.(type) {
-	case *ListenRequest_AddTarget:
-		s := proto.Size(x.AddTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenRequest_RemoveTarget:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.RemoveTarget))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Firestore.Listen][google.firestore.v1.Firestore.Listen].
 type ListenResponse struct {
 	// The supported responses.
@@ -2054,16 +1637,17 @@ func (m *ListenResponse) Reset()         { *m = ListenResponse{} }
 func (m *ListenResponse) String() string { return proto.CompactTextString(m) }
 func (*ListenResponse) ProtoMessage()    {}
 func (*ListenResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{18}
+	return fileDescriptor_f56aaf8ee76b5544, []int{18}
 }
+
 func (m *ListenResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListenResponse.Unmarshal(m, b)
 }
 func (m *ListenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListenResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListenResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListenResponse.Merge(dst, src)
+func (m *ListenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListenResponse.Merge(m, src)
 }
 func (m *ListenResponse) XXX_Size() int {
 	return xxx_messageInfo_ListenResponse.Size(m)
@@ -2150,9 +1734,9 @@ func (m *ListenResponse) GetFilter() *ExistenceFilter {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListenResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListenResponse_OneofMarshaler, _ListenResponse_OneofUnmarshaler, _ListenResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListenResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListenResponse_TargetChange)(nil),
 		(*ListenResponse_DocumentChange)(nil),
 		(*ListenResponse_DocumentDelete)(nil),
@@ -2161,126 +1745,6 @@ func (*ListenResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _ListenResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListenResponse)
-	// response_type
-	switch x := m.ResponseType.(type) {
-	case *ListenResponse_TargetChange:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetChange); err != nil {
-			return err
-		}
-	case *ListenResponse_DocumentChange:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DocumentChange); err != nil {
-			return err
-		}
-	case *ListenResponse_DocumentDelete:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DocumentDelete); err != nil {
-			return err
-		}
-	case *ListenResponse_DocumentRemove:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DocumentRemove); err != nil {
-			return err
-		}
-	case *ListenResponse_Filter:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Filter); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ListenResponse.ResponseType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListenResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListenResponse)
-	switch tag {
-	case 2: // response_type.target_change
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TargetChange)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_TargetChange{msg}
-		return true, err
-	case 3: // response_type.document_change
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentChange)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_DocumentChange{msg}
-		return true, err
-	case 4: // response_type.document_delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentDelete)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_DocumentDelete{msg}
-		return true, err
-	case 6: // response_type.document_remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentRemove)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_DocumentRemove{msg}
-		return true, err
-	case 5: // response_type.filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExistenceFilter)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_Filter{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListenResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListenResponse)
-	// response_type
-	switch x := m.ResponseType.(type) {
-	case *ListenResponse_TargetChange:
-		s := proto.Size(x.TargetChange)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_DocumentChange:
-		s := proto.Size(x.DocumentChange)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_DocumentDelete:
-		s := proto.Size(x.DocumentDelete)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_DocumentRemove:
-		s := proto.Size(x.DocumentRemove)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_Filter:
-		s := proto.Size(x.Filter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A specification of a set of documents to listen to.
 type Target struct {
 	// The type of target to listen to.
@@ -2318,16 +1782,17 @@ func (m *Target) Reset()         { *m = Target{} }
 func (m *Target) String() string { return proto.CompactTextString(m) }
 func (*Target) ProtoMessage()    {}
 func (*Target) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{19}
+	return fileDescriptor_f56aaf8ee76b5544, []int{19}
 }
+
 func (m *Target) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target.Unmarshal(m, b)
 }
 func (m *Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target.Marshal(b, m, deterministic)
 }
-func (dst *Target) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target.Merge(dst, src)
+func (m *Target) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target.Merge(m, src)
 }
 func (m *Target) XXX_Size() int {
 	return xxx_messageInfo_Target.Size(m)
@@ -2426,9 +1891,9 @@ func (m *Target) GetOnce() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Target) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Target_OneofMarshaler, _Target_OneofUnmarshaler, _Target_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Target) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Target_Query)(nil),
 		(*Target_Documents)(nil),
 		(*Target_ResumeToken)(nil),
@@ -2436,116 +1901,6 @@ func (*Target) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Target_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Target)
-	// target_type
-	switch x := m.TargetType.(type) {
-	case *Target_Query:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Query); err != nil {
-			return err
-		}
-	case *Target_Documents:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Documents); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Target.TargetType has unexpected type %T", x)
-	}
-	// resume_type
-	switch x := m.ResumeType.(type) {
-	case *Target_ResumeToken:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ResumeToken)
-	case *Target_ReadTime:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Target.ResumeType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Target_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Target)
-	switch tag {
-	case 2: // target_type.query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Target_QueryTarget)
-		err := b.DecodeMessage(msg)
-		m.TargetType = &Target_Query{msg}
-		return true, err
-	case 3: // target_type.documents
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Target_DocumentsTarget)
-		err := b.DecodeMessage(msg)
-		m.TargetType = &Target_Documents{msg}
-		return true, err
-	case 4: // resume_type.resume_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ResumeType = &Target_ResumeToken{x}
-		return true, err
-	case 11: // resume_type.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ResumeType = &Target_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Target_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Target)
-	// target_type
-	switch x := m.TargetType.(type) {
-	case *Target_Query:
-		s := proto.Size(x.Query)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Target_Documents:
-		s := proto.Size(x.Documents)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// resume_type
-	switch x := m.ResumeType.(type) {
-	case *Target_ResumeToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ResumeToken)))
-		n += len(x.ResumeToken)
-	case *Target_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A target specified by a set of documents names.
 type Target_DocumentsTarget struct {
 	// The names of the documents to retrieve. In the format:
@@ -2562,16 +1917,17 @@ func (m *Target_DocumentsTarget) Reset()         { *m = Target_DocumentsTarget{}
 func (m *Target_DocumentsTarget) String() string { return proto.CompactTextString(m) }
 func (*Target_DocumentsTarget) ProtoMessage()    {}
 func (*Target_DocumentsTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{19, 0}
+	return fileDescriptor_f56aaf8ee76b5544, []int{19, 0}
 }
+
 func (m *Target_DocumentsTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target_DocumentsTarget.Unmarshal(m, b)
 }
 func (m *Target_DocumentsTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target_DocumentsTarget.Marshal(b, m, deterministic)
 }
-func (dst *Target_DocumentsTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target_DocumentsTarget.Merge(dst, src)
+func (m *Target_DocumentsTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_DocumentsTarget.Merge(m, src)
 }
 func (m *Target_DocumentsTarget) XXX_Size() int {
 	return xxx_messageInfo_Target_DocumentsTarget.Size(m)
@@ -2612,16 +1968,17 @@ func (m *Target_QueryTarget) Reset()         { *m = Target_QueryTarget{} }
 func (m *Target_QueryTarget) String() string { return proto.CompactTextString(m) }
 func (*Target_QueryTarget) ProtoMessage()    {}
 func (*Target_QueryTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{19, 1}
+	return fileDescriptor_f56aaf8ee76b5544, []int{19, 1}
 }
+
 func (m *Target_QueryTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target_QueryTarget.Unmarshal(m, b)
 }
 func (m *Target_QueryTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target_QueryTarget.Marshal(b, m, deterministic)
 }
-func (dst *Target_QueryTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target_QueryTarget.Merge(dst, src)
+func (m *Target_QueryTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_QueryTarget.Merge(m, src)
 }
 func (m *Target_QueryTarget) XXX_Size() int {
 	return xxx_messageInfo_Target_QueryTarget.Size(m)
@@ -2663,61 +2020,13 @@ func (m *Target_QueryTarget) GetStructuredQuery() *StructuredQuery {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Target_QueryTarget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Target_QueryTarget_OneofMarshaler, _Target_QueryTarget_OneofUnmarshaler, _Target_QueryTarget_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Target_QueryTarget) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Target_QueryTarget_StructuredQuery)(nil),
 	}
 }
 
-func _Target_QueryTarget_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Target_QueryTarget)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *Target_QueryTarget_StructuredQuery:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredQuery); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Target_QueryTarget.QueryType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Target_QueryTarget_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Target_QueryTarget)
-	switch tag {
-	case 2: // query_type.structured_query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &Target_QueryTarget_StructuredQuery{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Target_QueryTarget_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Target_QueryTarget)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *Target_QueryTarget_StructuredQuery:
-		s := proto.Size(x.StructuredQuery)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Targets being watched have changed.
 type TargetChange struct {
 	// The type of change that occurred.
@@ -2759,16 +2068,17 @@ func (m *TargetChange) Reset()         { *m = TargetChange{} }
 func (m *TargetChange) String() string { return proto.CompactTextString(m) }
 func (*TargetChange) ProtoMessage()    {}
 func (*TargetChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{20}
+	return fileDescriptor_f56aaf8ee76b5544, []int{20}
 }
+
 func (m *TargetChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetChange.Unmarshal(m, b)
 }
 func (m *TargetChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetChange.Marshal(b, m, deterministic)
 }
-func (dst *TargetChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetChange.Merge(dst, src)
+func (m *TargetChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetChange.Merge(m, src)
 }
 func (m *TargetChange) XXX_Size() int {
 	return xxx_messageInfo_TargetChange.Size(m)
@@ -2835,16 +2145,17 @@ func (m *ListCollectionIdsRequest) Reset()         { *m = ListCollectionIdsReque
 func (m *ListCollectionIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCollectionIdsRequest) ProtoMessage()    {}
 func (*ListCollectionIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{21}
+	return fileDescriptor_f56aaf8ee76b5544, []int{21}
 }
+
 func (m *ListCollectionIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCollectionIdsRequest.Unmarshal(m, b)
 }
 func (m *ListCollectionIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCollectionIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCollectionIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCollectionIdsRequest.Merge(dst, src)
+func (m *ListCollectionIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCollectionIdsRequest.Merge(m, src)
 }
 func (m *ListCollectionIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCollectionIdsRequest.Size(m)
@@ -2891,16 +2202,17 @@ func (m *ListCollectionIdsResponse) Reset()         { *m = ListCollectionIdsResp
 func (m *ListCollectionIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCollectionIdsResponse) ProtoMessage()    {}
 func (*ListCollectionIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_e04b661bc0002f16, []int{22}
+	return fileDescriptor_f56aaf8ee76b5544, []int{22}
 }
+
 func (m *ListCollectionIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCollectionIdsResponse.Unmarshal(m, b)
 }
 func (m *ListCollectionIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCollectionIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCollectionIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCollectionIdsResponse.Merge(dst, src)
+func (m *ListCollectionIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCollectionIdsResponse.Merge(m, src)
 }
 func (m *ListCollectionIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCollectionIdsResponse.Size(m)
@@ -2926,6 +2238,7 @@ func (m *ListCollectionIdsResponse) GetNextPageToken() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.v1.TargetChange_TargetChangeType", TargetChange_TargetChangeType_name, TargetChange_TargetChangeType_value)
 	proto.RegisterType((*GetDocumentRequest)(nil), "google.firestore.v1.GetDocumentRequest")
 	proto.RegisterType((*ListDocumentsRequest)(nil), "google.firestore.v1.ListDocumentsRequest")
 	proto.RegisterType((*ListDocumentsResponse)(nil), "google.firestore.v1.ListDocumentsResponse")
@@ -2953,7 +2266,151 @@ func init() {
 	proto.RegisterType((*TargetChange)(nil), "google.firestore.v1.TargetChange")
 	proto.RegisterType((*ListCollectionIdsRequest)(nil), "google.firestore.v1.ListCollectionIdsRequest")
 	proto.RegisterType((*ListCollectionIdsResponse)(nil), "google.firestore.v1.ListCollectionIdsResponse")
-	proto.RegisterEnum("google.firestore.v1.TargetChange_TargetChangeType", TargetChange_TargetChangeType_name, TargetChange_TargetChangeType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/firestore/v1/firestore.proto", fileDescriptor_f56aaf8ee76b5544)
+}
+
+var fileDescriptor_f56aaf8ee76b5544 = []byte{
+	// 2188 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
+	0x15, 0xd7, 0x50, 0x1f, 0x96, 0x9e, 0x3e, 0xac, 0x9d, 0xe6, 0x43, 0x51, 0x36, 0x58, 0x87, 0x6e,
+	0x1a, 0x57, 0xed, 0x4a, 0xb1, 0x8b, 0xb4, 0x89, 0x9d, 0xed, 0x26, 0xb6, 0x95, 0xc8, 0x5d, 0xc7,
+	0xc9, 0xd2, 0xde, 0x14, 0x58, 0x04, 0x50, 0x69, 0x72, 0xa2, 0x70, 0x2d, 0x91, 0x5c, 0x92, 0xb2,
+	0xa3, 0xdd, 0xfa, 0xd0, 0x0f, 0xf4, 0x52, 0xb4, 0x7b, 0xe8, 0xa2, 0x28, 0xb0, 0x97, 0xa2, 0xe8,
+	0x61, 0xd1, 0x4b, 0x81, 0xde, 0x0a, 0xf4, 0x2f, 0xe8, 0xad, 0x58, 0x74, 0xaf, 0xbd, 0xb4, 0xe8,
+	0x1f, 0xd1, 0x43, 0x0b, 0xce, 0x0c, 0x29, 0x92, 0xa2, 0xbe, 0x9c, 0xa0, 0x37, 0xcd, 0xe3, 0x9b,
+	0x37, 0xbf, 0xf7, 0x39, 0x6f, 0x9e, 0x60, 0xb9, 0x63, 0x18, 0x9d, 0x2e, 0x69, 0x3c, 0xd3, 0x2c,
+	0x62, 0x3b, 0x86, 0x45, 0x1a, 0xc7, 0xab, 0xc3, 0x45, 0xdd, 0xb4, 0x0c, 0xc7, 0xc0, 0x5f, 0x61,
+	0x4c, 0xf5, 0x21, 0xfd, 0x78, 0xb5, 0xfa, 0x3a, 0xdf, 0x29, 0x9b, 0x5a, 0x43, 0xd6, 0x75, 0xc3,
+	0x91, 0x1d, 0xcd, 0xd0, 0x6d, 0xb6, 0xa5, 0xba, 0x14, 0x27, 0x57, 0x31, 0x7a, 0x3d, 0x43, 0xe7,
+	0x1c, 0x62, 0x1c, 0x87, 0x6a, 0x28, 0xfd, 0x1e, 0xd1, 0x1d, 0xce, 0xf3, 0x46, 0x1c, 0xcf, 0x87,
+	0x7d, 0x62, 0x0d, 0x26, 0x31, 0x9c, 0x58, 0x9a, 0xc3, 0xa1, 0x57, 0x2f, 0x73, 0x06, 0xba, 0x3a,
+	0xec, 0x3f, 0x6b, 0x90, 0x9e, 0xe9, 0x44, 0x77, 0xfb, 0x1f, 0x1d, 0xad, 0x47, 0x6c, 0x47, 0xee,
+	0x99, 0x9c, 0xe1, 0x22, 0x67, 0xb0, 0x4c, 0xa5, 0x61, 0x3b, 0xb2, 0xd3, 0xe7, 0xea, 0x89, 0x5f,
+	0x22, 0xc0, 0x0f, 0x88, 0xb3, 0xcd, 0xe1, 0x4a, 0xe4, 0xc3, 0x3e, 0xb1, 0x1d, 0x8c, 0x21, 0xa5,
+	0xcb, 0x3d, 0x52, 0x41, 0x4b, 0x68, 0x25, 0x27, 0xd1, 0xdf, 0xf8, 0x26, 0xa4, 0x7a, 0xb2, 0x7d,
+	0x54, 0x11, 0x96, 0xd0, 0x4a, 0x7e, 0xed, 0x6a, 0x3d, 0xc6, 0x96, 0x75, 0x4f, 0xce, 0x43, 0xd9,
+	0x3e, 0x92, 0x28, 0x3b, 0x16, 0x21, 0xef, 0x58, 0xb2, 0x6e, 0xcb, 0x8a, 0x6b, 0xd6, 0x4a, 0x72,
+	0x09, 0xad, 0x14, 0x5a, 0x09, 0x29, 0x48, 0xc4, 0xb7, 0x21, 0x67, 0x11, 0x59, 0x6d, 0xbb, 0xb0,
+	0x2b, 0x69, 0x2a, 0xbf, 0xea, 0xc9, 0xf7, 0x74, 0xaa, 0x1f, 0x78, 0x3a, 0xb5, 0x12, 0x52, 0xd6,
+	0x65, 0x77, 0x09, 0x9b, 0x17, 0xe0, 0x9c, 0x62, 0xe8, 0xb6, 0x66, 0x3b, 0x44, 0x57, 0x06, 0x6d,
+	0x9b, 0x74, 0x89, 0xe2, 0x18, 0x96, 0xf8, 0x1f, 0x01, 0xce, 0xed, 0x6a, 0xb6, 0xaf, 0x99, 0xed,
+	0xa9, 0x76, 0x01, 0x32, 0xa6, 0x6c, 0x11, 0xdd, 0xe1, 0xca, 0xf1, 0x15, 0x5e, 0x86, 0xa2, 0x62,
+	0x74, 0xdd, 0xdd, 0x9a, 0xa1, 0xb7, 0x35, 0x95, 0xea, 0x99, 0x93, 0x0a, 0x43, 0xe2, 0x8e, 0x8a,
+	0x2f, 0x43, 0xce, 0x94, 0x3b, 0xa4, 0x6d, 0x6b, 0x1f, 0x11, 0xaa, 0x4a, 0x5a, 0xca, 0xba, 0x84,
+	0x7d, 0xed, 0x23, 0x82, 0xaf, 0x00, 0xd0, 0x8f, 0x8e, 0x71, 0x44, 0xf4, 0x4a, 0x8a, 0x6e, 0xa7,
+	0xec, 0x07, 0x2e, 0x01, 0x5f, 0x82, 0xac, 0x61, 0xa9, 0xc4, 0x6a, 0x1f, 0x0e, 0x2a, 0x19, 0xfa,
+	0x71, 0x81, 0xae, 0x37, 0x07, 0xbe, 0x69, 0x17, 0x5e, 0xca, 0xb4, 0xd9, 0xa9, 0xa6, 0x85, 0x79,
+	0x4c, 0x8b, 0xaf, 0x42, 0xc1, 0x7e, 0x6e, 0x9c, 0xb4, 0x7b, 0x9a, 0x6d, 0x6b, 0x7a, 0xa7, 0x52,
+	0x58, 0x42, 0x2b, 0x59, 0x29, 0xef, 0xd2, 0x1e, 0x32, 0xd2, 0x58, 0xeb, 0xff, 0x10, 0xce, 0x47,
+	0x8c, 0x6f, 0x9b, 0x86, 0x6e, 0x13, 0xbc, 0x01, 0x39, 0x2f, 0x35, 0xec, 0x0a, 0x5a, 0x4a, 0xae,
+	0xe4, 0xd7, 0xae, 0x4c, 0x54, 0x57, 0x1a, 0xf2, 0xe3, 0xaf, 0xc1, 0xa2, 0x4e, 0x5e, 0x38, 0xed,
+	0x80, 0x95, 0x99, 0x93, 0x8a, 0x2e, 0xf9, 0xb1, 0x67, 0x69, 0xf1, 0xdf, 0x08, 0xce, 0x6f, 0x59,
+	0x44, 0x76, 0x48, 0x34, 0xae, 0x5f, 0xca, 0xf9, 0x6f, 0x40, 0xde, 0xc3, 0xe2, 0xb2, 0x24, 0x29,
+	0x0b, 0x78, 0xa4, 0x1d, 0x15, 0xdf, 0x86, 0xac, 0xb7, 0xa2, 0xee, 0x9f, 0xaa, 0x9b, 0xcf, 0xee,
+	0x47, 0x40, 0x7a, 0xae, 0x08, 0x10, 0x3f, 0x13, 0xe0, 0xfc, 0x7b, 0xa6, 0x1a, 0xa3, 0x69, 0x10,
+	0x0b, 0x9a, 0x0f, 0xcb, 0x26, 0xe4, 0xfb, 0x54, 0x66, 0x7b, 0xbe, 0x7c, 0x07, 0xb6, 0xcb, 0xfd,
+	0xed, 0xeb, 0x93, 0x9c, 0x2f, 0xa2, 0x77, 0xa1, 0xac, 0xf4, 0x2d, 0xd7, 0x25, 0xed, 0x88, 0x25,
+	0xe3, 0x45, 0x3c, 0xb6, 0x88, 0x62, 0xe8, 0xaa, 0xe6, 0x7a, 0x48, 0x5a, 0xe4, 0x5b, 0x3d, 0xb9,
+	0xe2, 0x00, 0xce, 0x6f, 0x93, 0x2e, 0x19, 0x35, 0x4e, 0x5c, 0x79, 0x8b, 0x3b, 0x5a, 0x38, 0xf3,
+	0xd1, 0x5f, 0x0a, 0x50, 0xd9, 0x94, 0x1d, 0xe5, 0x79, 0xa0, 0xb8, 0xfa, 0x25, 0xa8, 0x0a, 0x59,
+	0x55, 0x76, 0xe4, 0x43, 0xd9, 0xf6, 0x20, 0xf8, 0x6b, 0xfc, 0x7a, 0x30, 0x41, 0x84, 0xa5, 0xa4,
+	0x5b, 0x43, 0x86, 0x19, 0x70, 0x46, 0xb3, 0x46, 0x0a, 0x45, 0x2a, 0xae, 0x50, 0x48, 0x6e, 0x72,
+	0x9d, 0xb4, 0x83, 0x7c, 0x2c, 0x18, 0xaf, 0xc7, 0x9e, 0x72, 0x30, 0xe4, 0x7b, 0x64, 0xd2, 0x0b,
+	0xb3, 0x95, 0x90, 0x4a, 0x3a, 0x39, 0x39, 0x18, 0x57, 0x7c, 0x16, 0x5e, 0x49, 0x5d, 0xff, 0x02,
+	0xc1, 0xa5, 0x18, 0xc3, 0xf2, 0xf2, 0x72, 0x13, 0xd2, 0xcf, 0x8c, 0xbe, 0xae, 0xce, 0x14, 0xf2,
+	0xad, 0x84, 0xc4, 0xb8, 0x71, 0x15, 0x16, 0xbc, 0x22, 0x47, 0x13, 0xbf, 0x95, 0x90, 0x3c, 0x02,
+	0x5e, 0x8a, 0xb9, 0xbf, 0xc2, 0x96, 0xfb, 0x4e, 0x50, 0xcb, 0xd4, 0x34, 0x2d, 0x03, 0x3a, 0x66,
+	0x21, 0x63, 0x11, 0xbb, 0xdf, 0x75, 0xc4, 0x17, 0x70, 0x71, 0x93, 0x74, 0x34, 0x3d, 0x60, 0xbc,
+	0x59, 0x82, 0xe5, 0x1e, 0x2c, 0x18, 0xcc, 0xf8, 0x3c, 0x54, 0x67, 0xf5, 0x95, 0xe4, 0xed, 0x13,
+	0xef, 0x40, 0x65, 0xf4, 0x64, 0x6e, 0xcd, 0x88, 0xea, 0x68, 0x44, 0x75, 0xf1, 0x47, 0x08, 0x8a,
+	0x5b, 0x46, 0xaf, 0xa7, 0x39, 0xb3, 0xc0, 0x5d, 0x83, 0x0c, 0x6d, 0x69, 0x58, 0x60, 0x07, 0xac,
+	0x14, 0x42, 0xfb, 0x7d, 0x97, 0x45, 0xe2, 0x9c, 0xd3, 0xcd, 0x2f, 0x7e, 0x8a, 0xa0, 0xe4, 0x61,
+	0xe0, 0xc0, 0x9b, 0x50, 0xa4, 0xdb, 0xdb, 0xcc, 0xbc, 0xde, 0x4d, 0xb3, 0x34, 0xe1, 0x3c, 0xca,
+	0x28, 0x15, 0x4e, 0x86, 0x0b, 0x1b, 0x6f, 0x40, 0x5e, 0xa1, 0x82, 0x99, 0x6b, 0x85, 0xa9, 0xae,
+	0x05, 0xc6, 0xee, 0x12, 0xc4, 0x47, 0xb0, 0x28, 0x19, 0xdd, 0xee, 0xa1, 0xac, 0x1c, 0xcd, 0x62,
+	0x9b, 0x88, 0x9e, 0xc2, 0xa8, 0x9e, 0x7f, 0x17, 0x60, 0x51, 0xea, 0xeb, 0xef, 0xba, 0x5d, 0xe3,
+	0xb4, 0xfb, 0xec, 0x5d, 0x28, 0xdb, 0x8e, 0xd5, 0x57, 0x9c, 0xbe, 0x45, 0xd4, 0x36, 0x6d, 0x34,
+	0x39, 0xfc, 0xaf, 0xc6, 0xda, 0x60, 0xdf, 0x67, 0xa6, 0xe2, 0x5b, 0x09, 0x69, 0xd1, 0x0e, 0x93,
+	0xa2, 0x35, 0x24, 0x4d, 0x6b, 0x08, 0x9a, 0x5a, 0x43, 0x32, 0xf3, 0xd5, 0x10, 0xf4, 0xb2, 0x35,
+	0x04, 0x05, 0xf2, 0xab, 0x00, 0x40, 0x55, 0x6f, 0x3b, 0x03, 0x73, 0x7c, 0x45, 0xf9, 0x1b, 0x82,
+	0xf2, 0xd0, 0xae, 0xf1, 0xa1, 0x3f, 0xea, 0x8e, 0x97, 0xb9, 0x60, 0x43, 0x05, 0x23, 0x39, 0x7b,
+	0xc1, 0xc0, 0xd7, 0x61, 0xd1, 0x3e, 0xd2, 0x4c, 0x93, 0xa8, 0x7e, 0x64, 0xa7, 0x68, 0x13, 0x5a,
+	0xe2, 0x64, 0x1e, 0xb9, 0xe2, 0x6f, 0x05, 0x28, 0xf0, 0xb8, 0x9e, 0x1e, 0x7a, 0x97, 0x21, 0x67,
+	0x3b, 0x16, 0x91, 0x7b, 0xc3, 0xc6, 0x27, 0xcb, 0x08, 0x3b, 0x6a, 0x20, 0x67, 0x93, 0x33, 0xe7,
+	0xac, 0xdb, 0x38, 0x32, 0x81, 0xc3, 0x56, 0xb8, 0x20, 0xe5, 0x19, 0x8d, 0x35, 0xc3, 0x4d, 0xc8,
+	0x74, 0xe5, 0x43, 0xd2, 0xb5, 0x2b, 0x69, 0x2a, 0xf6, 0xcd, 0x49, 0xa9, 0x49, 0x55, 0xa8, 0xef,
+	0x52, 0xfe, 0xa6, 0xee, 0x58, 0x03, 0x89, 0x6f, 0xae, 0xde, 0x86, 0x7c, 0x80, 0x8c, 0xcb, 0x90,
+	0x3c, 0x22, 0x03, 0xae, 0xa0, 0xfb, 0x13, 0x9f, 0x83, 0xf4, 0xb1, 0xdc, 0xed, 0x13, 0xae, 0x17,
+	0x5b, 0xac, 0x0b, 0xb7, 0x90, 0x7b, 0x91, 0x14, 0xbd, 0xd4, 0x67, 0x3e, 0x0f, 0xd9, 0x01, 0x45,
+	0xec, 0x10, 0xd5, 0x49, 0x88, 0xd3, 0x29, 0x52, 0x75, 0x92, 0xaf, 0xa2, 0xea, 0xa4, 0xe6, 0xaa,
+	0x3a, 0xbf, 0x17, 0xa0, 0xb8, 0x4b, 0x43, 0x7c, 0x16, 0xcf, 0xdf, 0x01, 0x90, 0x55, 0xb5, 0xed,
+	0xc8, 0x56, 0x87, 0x78, 0xdd, 0xce, 0xe5, 0xf8, 0x54, 0xa5, 0x2c, 0xad, 0x84, 0x94, 0x93, 0x55,
+	0x95, 0x2d, 0xf0, 0x35, 0x28, 0x5a, 0xa4, 0x67, 0x1c, 0x13, 0x4f, 0x00, 0x7d, 0x10, 0xb5, 0x12,
+	0x52, 0x81, 0x91, 0x39, 0xdb, 0x7d, 0xdf, 0xd5, 0x29, 0x6a, 0x8f, 0x7a, 0xec, 0x01, 0x21, 0xd0,
+	0xaf, 0xd8, 0xd7, 0x9b, 0x8b, 0x50, 0x64, 0x10, 0xdb, 0xca, 0x73, 0x59, 0xef, 0x10, 0xf1, 0xb3,
+	0x24, 0x94, 0xbc, 0x13, 0xb9, 0xf7, 0x5b, 0x11, 0x9e, 0x89, 0xcd, 0x1f, 0x53, 0x6d, 0x8b, 0x32,
+	0xba, 0x0a, 0x3b, 0x81, 0x35, 0xde, 0x83, 0x45, 0xff, 0x9d, 0xc0, 0x65, 0xb1, 0x24, 0x5f, 0x9e,
+	0x58, 0x20, 0x7c, 0x69, 0x25, 0x35, 0x44, 0x09, 0xc9, 0x53, 0x69, 0x3f, 0xcb, 0x83, 0x62, 0xb2,
+	0x3c, 0xd6, 0xfa, 0x06, 0xe5, 0x31, 0x4a, 0x48, 0x1e, 0xf3, 0x14, 0xaf, 0xd2, 0x93, 0xe5, 0x49,
+	0x94, 0x35, 0x28, 0x8f, 0x51, 0xf0, 0x77, 0x21, 0xf3, 0x4c, 0xeb, 0x3a, 0xc4, 0xe2, 0x0d, 0x63,
+	0xfc, 0x15, 0xd3, 0x7c, 0xc1, 0x2a, 0x2f, 0xb9, 0x4f, 0x79, 0x5b, 0x09, 0x89, 0xef, 0x72, 0xbd,
+	0x63, 0x71, 0x2f, 0xd0, 0x4a, 0x2d, 0xfe, 0x37, 0x09, 0x19, 0x1e, 0x3c, 0x6f, 0x43, 0x3a, 0x78,
+	0x7b, 0x5d, 0x9f, 0xe0, 0x8d, 0x3a, 0xad, 0xe0, 0x7e, 0xa0, 0xb2, 0x7d, 0xf8, 0x9d, 0x60, 0x3f,
+	0xcd, 0xdc, 0xf0, 0x8d, 0x49, 0x42, 0xfc, 0x9e, 0x72, 0x18, 0xf1, 0xc3, 0xf6, 0x7b, 0x19, 0x0a,
+	0x6e, 0x6e, 0xf7, 0x82, 0x6f, 0x7c, 0x7a, 0x09, 0x32, 0x2a, 0x2b, 0x03, 0xa1, 0x0b, 0x2b, 0x3f,
+	0xcf, 0x85, 0xe5, 0x56, 0x20, 0x1e, 0x83, 0x9a, 0x4a, 0x8d, 0x99, 0x96, 0xb2, 0x8c, 0xb0, 0xa3,
+	0xba, 0x8f, 0x16, 0x43, 0x57, 0x98, 0xaf, 0xb2, 0x12, 0xfd, 0x5d, 0x6d, 0xc0, 0x62, 0x04, 0xf0,
+	0xe4, 0x07, 0x44, 0xf5, 0x67, 0x08, 0xf2, 0x01, 0x3b, 0xfd, 0x1f, 0x1b, 0x88, 0xc8, 0x6d, 0x5c,
+	0x84, 0x3c, 0x57, 0xd5, 0x5b, 0x7a, 0x96, 0x75, 0x23, 0xe0, 0x5f, 0x02, 0x14, 0x82, 0x39, 0x86,
+	0x7f, 0x00, 0x38, 0x94, 0x9d, 0x94, 0x8d, 0x62, 0x2e, 0xad, 0xad, 0x4d, 0x4d, 0xd1, 0xd0, 0xe2,
+	0x60, 0x60, 0x12, 0xa9, 0xec, 0x44, 0x28, 0xf8, 0x0a, 0x80, 0x6f, 0x7b, 0x66, 0xb8, 0xb4, 0x94,
+	0xf3, 0x8c, 0x6f, 0xe3, 0x15, 0x48, 0x2b, 0x72, 0xdf, 0xf6, 0x52, 0x19, 0x7b, 0x67, 0x5a, 0xa6,
+	0x52, 0xdf, 0xa7, 0x13, 0x35, 0x89, 0x31, 0xb8, 0x37, 0xc5, 0x68, 0x90, 0x84, 0x43, 0x24, 0xd4,
+	0x00, 0x64, 0x66, 0x6f, 0x00, 0xc4, 0x3d, 0x28, 0x47, 0x55, 0xc1, 0x45, 0xc8, 0xed, 0x3d, 0x6a,
+	0x6f, 0xb5, 0xee, 0xed, 0x3d, 0x68, 0x96, 0x13, 0x78, 0x01, 0x92, 0xf7, 0xb6, 0xb7, 0xcb, 0x08,
+	0x03, 0x64, 0xa4, 0xe6, 0xc3, 0x47, 0x4f, 0x9a, 0x65, 0x01, 0xe7, 0x61, 0x61, 0xeb, 0x3d, 0x49,
+	0x6a, 0xee, 0x1d, 0x94, 0x93, 0x38, 0x07, 0x69, 0xa9, 0xb9, 0xdf, 0x3c, 0x28, 0xa7, 0x44, 0x1d,
+	0x2a, 0x6e, 0x19, 0xdc, 0x0a, 0x8c, 0x39, 0xa6, 0x0e, 0xca, 0x42, 0x33, 0x30, 0x61, 0xe2, 0x0c,
+	0x2c, 0x19, 0x99, 0x81, 0x89, 0x1f, 0xc0, 0xa5, 0x98, 0xf3, 0x78, 0x05, 0xbe, 0x06, 0xa5, 0xd0,
+	0x10, 0x86, 0xb5, 0xed, 0x39, 0xa9, 0x18, 0x9c, 0xc2, 0xcc, 0x3c, 0x05, 0x5a, 0xfb, 0x29, 0x86,
+	0xdc, 0x7d, 0x2f, 0x22, 0xf0, 0x27, 0x08, 0xf2, 0x81, 0x27, 0x23, 0x8e, 0xaf, 0x24, 0xa3, 0xa3,
+	0xd0, 0xea, 0xe4, 0xae, 0x4e, 0xbc, 0xf5, 0xe3, 0x2f, 0xfe, 0xf9, 0x2b, 0x61, 0x0d, 0xdf, 0x68,
+	0x1c, 0xaf, 0x36, 0x3e, 0xd6, 0xe5, 0x1e, 0x79, 0xcb, 0xb4, 0x8c, 0x0f, 0x88, 0xe2, 0xd8, 0x8d,
+	0x5a, 0xc3, 0xbb, 0x69, 0xe9, 0x6f, 0x2f, 0x09, 0x1b, 0xb5, 0x46, 0xad, 0x76, 0x8a, 0xff, 0x84,
+	0xd8, 0x55, 0xed, 0x27, 0x30, 0xfe, 0xfa, 0xd8, 0x9b, 0x31, 0x3a, 0x42, 0xa8, 0xd6, 0x66, 0x61,
+	0x65, 0x76, 0x15, 0xbf, 0x47, 0x21, 0x6e, 0xe3, 0x4d, 0x0a, 0x91, 0x79, 0x71, 0x46, 0x90, 0x8d,
+	0x8f, 0x43, 0x1e, 0x39, 0xc5, 0x7f, 0x74, 0x1f, 0x5b, 0xa1, 0xd1, 0x1a, 0x8e, 0x87, 0x12, 0x3b,
+	0x7f, 0x9b, 0x66, 0x4c, 0x89, 0x22, 0xdd, 0x15, 0xef, 0xce, 0x87, 0x74, 0x14, 0xe7, 0xfa, 0xb0,
+	0xd9, 0xfe, 0x1c, 0x41, 0x29, 0x3c, 0x22, 0x1b, 0x83, 0x38, 0x76, 0x8e, 0x36, 0x0d, 0xf1, 0x3b,
+	0x14, 0x71, 0x73, 0xed, 0x36, 0x45, 0xec, 0x4f, 0xfd, 0xe7, 0x88, 0x83, 0x00, 0xd4, 0x5f, 0x22,
+	0x28, 0x85, 0x07, 0x56, 0x63, 0xa0, 0xc6, 0x4e, 0xb5, 0xaa, 0x17, 0x46, 0x4a, 0x48, 0xb3, 0x67,
+	0x3a, 0x03, 0x2f, 0x44, 0x6b, 0xf3, 0x87, 0xe8, 0x9f, 0x11, 0xbc, 0x36, 0x32, 0x6c, 0xc1, 0xf1,
+	0xbd, 0xfa, 0xb8, 0x69, 0x57, 0xb5, 0x3e, 0x2b, 0x3b, 0x0f, 0xd7, 0x2d, 0x0a, 0xf7, 0x2d, 0xf1,
+	0x16, 0x33, 0x29, 0x87, 0x37, 0x06, 0xf2, 0xe9, 0x10, 0xf3, 0xfa, 0x21, 0x17, 0xb9, 0x8e, 0x6a,
+	0x37, 0x10, 0xfe, 0x0b, 0x82, 0x72, 0x74, 0xb2, 0x81, 0xbf, 0x19, 0x8f, 0x25, 0x7e, 0xf4, 0x52,
+	0x7d, 0x73, 0x46, 0x6e, 0x0e, 0x9c, 0xc7, 0x02, 0x8f, 0xde, 0x79, 0x80, 0x47, 0x24, 0xae, 0xa3,
+	0x1a, 0xfe, 0x14, 0x41, 0x86, 0x4d, 0x35, 0xb0, 0x18, 0x9f, 0x60, 0xc1, 0xb1, 0x4b, 0x75, 0x79,
+	0x22, 0x0f, 0x07, 0x78, 0x8f, 0x02, 0xdc, 0x10, 0xbf, 0x3d, 0x2f, 0x40, 0xf6, 0xc0, 0x70, 0x61,
+	0xfd, 0x02, 0x41, 0xd6, 0x1b, 0x6b, 0xe0, 0xf8, 0x56, 0x20, 0x32, 0xf5, 0x18, 0x1b, 0x96, 0x67,
+	0xf6, 0xb3, 0xc5, 0x0f, 0x70, 0xf1, 0xfc, 0xc3, 0xc5, 0xc3, 0x1f, 0xef, 0xe3, 0xf0, 0x84, 0x67,
+	0x26, 0xd5, 0x6b, 0x53, 0xb8, 0xb8, 0xb1, 0x7e, 0x82, 0x28, 0xbe, 0x53, 0x6e, 0xad, 0x19, 0x8b,
+	0xd1, 0xe9, 0xba, 0xc5, 0x05, 0xad, 0xa3, 0xda, 0xfb, 0x77, 0xc5, 0x8d, 0xf9, 0x6b, 0x6e, 0x50,
+	0xc2, 0x0d, 0xe4, 0x06, 0x42, 0x9a, 0x3e, 0x16, 0xf1, 0xd5, 0xa9, 0x6f, 0xe4, 0xaa, 0x38, 0xf1,
+	0xad, 0xc9, 0x14, 0xbb, 0x4b, 0xf5, 0x5a, 0x17, 0x6f, 0xce, 0x6b, 0x77, 0xfa, 0x4a, 0x5d, 0x47,
+	0xb5, 0x15, 0x74, 0x03, 0xe1, 0xdf, 0x20, 0xc8, 0xb0, 0x17, 0xd4, 0x98, 0xf8, 0x0c, 0x3d, 0xe8,
+	0xc6, 0xc4, 0x67, 0xf8, 0x09, 0x76, 0xf6, 0xf8, 0xec, 0x52, 0x39, 0x1e, 0xb4, 0x9f, 0x0b, 0xf0,
+	0xda, 0x48, 0x97, 0x31, 0xa6, 0x6a, 0x8d, 0xeb, 0x7e, 0xaa, 0xf5, 0x59, 0xd9, 0x39, 0xf6, 0x5f,
+	0xb3, 0x70, 0xf9, 0x04, 0x89, 0x6f, 0xcf, 0x17, 0x2f, 0xdd, 0xa8, 0x48, 0x37, 0x70, 0x76, 0xc4,
+	0xed, 0x33, 0x04, 0x4e, 0x9c, 0xa8, 0xcd, 0xcf, 0x11, 0x5c, 0x54, 0x8c, 0x5e, 0x9c, 0x3a, 0x9b,
+	0x25, 0xbf, 0x3f, 0x7a, 0xec, 0xe6, 0xe6, 0x63, 0xf4, 0xfe, 0x1d, 0xce, 0xd6, 0x31, 0xba, 0xb2,
+	0xde, 0xa9, 0x1b, 0x56, 0xa7, 0xd1, 0x21, 0x3a, 0xcd, 0xdc, 0x06, 0xfb, 0x24, 0x9b, 0x9a, 0x1d,
+	0xfa, 0x9b, 0x7a, 0xc3, 0x5f, 0xfc, 0x4e, 0x48, 0x3d, 0xd8, 0xba, 0xbf, 0xff, 0x07, 0xe1, 0xd2,
+	0x03, 0x26, 0x65, 0xab, 0x6b, 0xf4, 0xd5, 0xba, 0x7f, 0x48, 0xfd, 0xc9, 0xea, 0x5f, 0xbd, 0x6f,
+	0x4f, 0xe9, 0xb7, 0xa7, 0xfe, 0xb7, 0xa7, 0x4f, 0x56, 0x0f, 0x33, 0xf4, 0x9c, 0x6f, 0xfd, 0x2f,
+	0x00, 0x00, 0xff, 0xff, 0x03, 0x8c, 0x0d, 0x98, 0xcc, 0x1f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3574,148 +3031,3 @@ var _Firestore_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/firestore/v1/firestore.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/firestore/v1/firestore.proto", fileDescriptor_firestore_e04b661bc0002f16)
-}
-
-var fileDescriptor_firestore_e04b661bc0002f16 = []byte{
-	// 2188 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
-	0x15, 0xd7, 0x50, 0x1f, 0x96, 0x9e, 0x3e, 0xac, 0x9d, 0xe6, 0x43, 0x51, 0x36, 0x58, 0x87, 0x6e,
-	0x1a, 0x57, 0xed, 0x4a, 0xb1, 0x8b, 0xb4, 0x89, 0x9d, 0xed, 0x26, 0xb6, 0x95, 0xc8, 0x5d, 0xc7,
-	0xc9, 0xd2, 0xde, 0x14, 0x58, 0x04, 0x50, 0x69, 0x72, 0xa2, 0x70, 0x2d, 0x91, 0x5c, 0x92, 0xb2,
-	0xa3, 0xdd, 0xfa, 0xd0, 0x0f, 0xf4, 0x52, 0xb4, 0x7b, 0xe8, 0xa2, 0x28, 0xb0, 0x97, 0xa2, 0xe8,
-	0x61, 0xd1, 0x4b, 0x81, 0xde, 0x0a, 0xf4, 0x2f, 0xe8, 0xad, 0x58, 0x74, 0xaf, 0xbd, 0xb4, 0xe8,
-	0x1f, 0xd1, 0x43, 0x0b, 0xce, 0x0c, 0x29, 0x92, 0xa2, 0xbe, 0x9c, 0xa0, 0x37, 0xcd, 0xe3, 0x9b,
-	0x37, 0xbf, 0xf7, 0x39, 0x6f, 0x9e, 0x60, 0xb9, 0x63, 0x18, 0x9d, 0x2e, 0x69, 0x3c, 0xd3, 0x2c,
-	0x62, 0x3b, 0x86, 0x45, 0x1a, 0xc7, 0xab, 0xc3, 0x45, 0xdd, 0xb4, 0x0c, 0xc7, 0xc0, 0x5f, 0x61,
-	0x4c, 0xf5, 0x21, 0xfd, 0x78, 0xb5, 0xfa, 0x3a, 0xdf, 0x29, 0x9b, 0x5a, 0x43, 0xd6, 0x75, 0xc3,
-	0x91, 0x1d, 0xcd, 0xd0, 0x6d, 0xb6, 0xa5, 0xba, 0x14, 0x27, 0x57, 0x31, 0x7a, 0x3d, 0x43, 0xe7,
-	0x1c, 0x62, 0x1c, 0x87, 0x6a, 0x28, 0xfd, 0x1e, 0xd1, 0x1d, 0xce, 0xf3, 0x46, 0x1c, 0xcf, 0x87,
-	0x7d, 0x62, 0x0d, 0x26, 0x31, 0x9c, 0x58, 0x9a, 0xc3, 0xa1, 0x57, 0x2f, 0x73, 0x06, 0xba, 0x3a,
-	0xec, 0x3f, 0x6b, 0x90, 0x9e, 0xe9, 0x44, 0x77, 0xfb, 0x1f, 0x1d, 0xad, 0x47, 0x6c, 0x47, 0xee,
-	0x99, 0x9c, 0xe1, 0x22, 0x67, 0xb0, 0x4c, 0xa5, 0x61, 0x3b, 0xb2, 0xd3, 0xe7, 0xea, 0x89, 0x5f,
-	0x22, 0xc0, 0x0f, 0x88, 0xb3, 0xcd, 0xe1, 0x4a, 0xe4, 0xc3, 0x3e, 0xb1, 0x1d, 0x8c, 0x21, 0xa5,
-	0xcb, 0x3d, 0x52, 0x41, 0x4b, 0x68, 0x25, 0x27, 0xd1, 0xdf, 0xf8, 0x26, 0xa4, 0x7a, 0xb2, 0x7d,
-	0x54, 0x11, 0x96, 0xd0, 0x4a, 0x7e, 0xed, 0x6a, 0x3d, 0xc6, 0x96, 0x75, 0x4f, 0xce, 0x43, 0xd9,
-	0x3e, 0x92, 0x28, 0x3b, 0x16, 0x21, 0xef, 0x58, 0xb2, 0x6e, 0xcb, 0x8a, 0x6b, 0xd6, 0x4a, 0x72,
-	0x09, 0xad, 0x14, 0x5a, 0x09, 0x29, 0x48, 0xc4, 0xb7, 0x21, 0x67, 0x11, 0x59, 0x6d, 0xbb, 0xb0,
-	0x2b, 0x69, 0x2a, 0xbf, 0xea, 0xc9, 0xf7, 0x74, 0xaa, 0x1f, 0x78, 0x3a, 0xb5, 0x12, 0x52, 0xd6,
-	0x65, 0x77, 0x09, 0x9b, 0x17, 0xe0, 0x9c, 0x62, 0xe8, 0xb6, 0x66, 0x3b, 0x44, 0x57, 0x06, 0x6d,
-	0x9b, 0x74, 0x89, 0xe2, 0x18, 0x96, 0xf8, 0x1f, 0x01, 0xce, 0xed, 0x6a, 0xb6, 0xaf, 0x99, 0xed,
-	0xa9, 0x76, 0x01, 0x32, 0xa6, 0x6c, 0x11, 0xdd, 0xe1, 0xca, 0xf1, 0x15, 0x5e, 0x86, 0xa2, 0x62,
-	0x74, 0xdd, 0xdd, 0x9a, 0xa1, 0xb7, 0x35, 0x95, 0xea, 0x99, 0x93, 0x0a, 0x43, 0xe2, 0x8e, 0x8a,
-	0x2f, 0x43, 0xce, 0x94, 0x3b, 0xa4, 0x6d, 0x6b, 0x1f, 0x11, 0xaa, 0x4a, 0x5a, 0xca, 0xba, 0x84,
-	0x7d, 0xed, 0x23, 0x82, 0xaf, 0x00, 0xd0, 0x8f, 0x8e, 0x71, 0x44, 0xf4, 0x4a, 0x8a, 0x6e, 0xa7,
-	0xec, 0x07, 0x2e, 0x01, 0x5f, 0x82, 0xac, 0x61, 0xa9, 0xc4, 0x6a, 0x1f, 0x0e, 0x2a, 0x19, 0xfa,
-	0x71, 0x81, 0xae, 0x37, 0x07, 0xbe, 0x69, 0x17, 0x5e, 0xca, 0xb4, 0xd9, 0xa9, 0xa6, 0x85, 0x79,
-	0x4c, 0x8b, 0xaf, 0x42, 0xc1, 0x7e, 0x6e, 0x9c, 0xb4, 0x7b, 0x9a, 0x6d, 0x6b, 0x7a, 0xa7, 0x52,
-	0x58, 0x42, 0x2b, 0x59, 0x29, 0xef, 0xd2, 0x1e, 0x32, 0xd2, 0x58, 0xeb, 0xff, 0x10, 0xce, 0x47,
-	0x8c, 0x6f, 0x9b, 0x86, 0x6e, 0x13, 0xbc, 0x01, 0x39, 0x2f, 0x35, 0xec, 0x0a, 0x5a, 0x4a, 0xae,
-	0xe4, 0xd7, 0xae, 0x4c, 0x54, 0x57, 0x1a, 0xf2, 0xe3, 0xaf, 0xc1, 0xa2, 0x4e, 0x5e, 0x38, 0xed,
-	0x80, 0x95, 0x99, 0x93, 0x8a, 0x2e, 0xf9, 0xb1, 0x67, 0x69, 0xf1, 0xdf, 0x08, 0xce, 0x6f, 0x59,
-	0x44, 0x76, 0x48, 0x34, 0xae, 0x5f, 0xca, 0xf9, 0x6f, 0x40, 0xde, 0xc3, 0xe2, 0xb2, 0x24, 0x29,
-	0x0b, 0x78, 0xa4, 0x1d, 0x15, 0xdf, 0x86, 0xac, 0xb7, 0xa2, 0xee, 0x9f, 0xaa, 0x9b, 0xcf, 0xee,
-	0x47, 0x40, 0x7a, 0xae, 0x08, 0x10, 0x3f, 0x13, 0xe0, 0xfc, 0x7b, 0xa6, 0x1a, 0xa3, 0x69, 0x10,
-	0x0b, 0x9a, 0x0f, 0xcb, 0x26, 0xe4, 0xfb, 0x54, 0x66, 0x7b, 0xbe, 0x7c, 0x07, 0xb6, 0xcb, 0xfd,
-	0xed, 0xeb, 0x93, 0x9c, 0x2f, 0xa2, 0x77, 0xa1, 0xac, 0xf4, 0x2d, 0xd7, 0x25, 0xed, 0x88, 0x25,
-	0xe3, 0x45, 0x3c, 0xb6, 0x88, 0x62, 0xe8, 0xaa, 0xe6, 0x7a, 0x48, 0x5a, 0xe4, 0x5b, 0x3d, 0xb9,
-	0xe2, 0x00, 0xce, 0x6f, 0x93, 0x2e, 0x19, 0x35, 0x4e, 0x5c, 0x79, 0x8b, 0x3b, 0x5a, 0x38, 0xf3,
-	0xd1, 0x5f, 0x0a, 0x50, 0xd9, 0x94, 0x1d, 0xe5, 0x79, 0xa0, 0xb8, 0xfa, 0x25, 0xa8, 0x0a, 0x59,
-	0x55, 0x76, 0xe4, 0x43, 0xd9, 0xf6, 0x20, 0xf8, 0x6b, 0xfc, 0x7a, 0x30, 0x41, 0x84, 0xa5, 0xa4,
-	0x5b, 0x43, 0x86, 0x19, 0x70, 0x46, 0xb3, 0x46, 0x0a, 0x45, 0x2a, 0xae, 0x50, 0x48, 0x6e, 0x72,
-	0x9d, 0xb4, 0x83, 0x7c, 0x2c, 0x18, 0xaf, 0xc7, 0x9e, 0x72, 0x30, 0xe4, 0x7b, 0x64, 0xd2, 0x0b,
-	0xb3, 0x95, 0x90, 0x4a, 0x3a, 0x39, 0x39, 0x18, 0x57, 0x7c, 0x16, 0x5e, 0x49, 0x5d, 0xff, 0x02,
-	0xc1, 0xa5, 0x18, 0xc3, 0xf2, 0xf2, 0x72, 0x13, 0xd2, 0xcf, 0x8c, 0xbe, 0xae, 0xce, 0x14, 0xf2,
-	0xad, 0x84, 0xc4, 0xb8, 0x71, 0x15, 0x16, 0xbc, 0x22, 0x47, 0x13, 0xbf, 0x95, 0x90, 0x3c, 0x02,
-	0x5e, 0x8a, 0xb9, 0xbf, 0xc2, 0x96, 0xfb, 0x4e, 0x50, 0xcb, 0xd4, 0x34, 0x2d, 0x03, 0x3a, 0x66,
-	0x21, 0x63, 0x11, 0xbb, 0xdf, 0x75, 0xc4, 0x17, 0x70, 0x71, 0x93, 0x74, 0x34, 0x3d, 0x60, 0xbc,
-	0x59, 0x82, 0xe5, 0x1e, 0x2c, 0x18, 0xcc, 0xf8, 0x3c, 0x54, 0x67, 0xf5, 0x95, 0xe4, 0xed, 0x13,
-	0xef, 0x40, 0x65, 0xf4, 0x64, 0x6e, 0xcd, 0x88, 0xea, 0x68, 0x44, 0x75, 0xf1, 0x47, 0x08, 0x8a,
-	0x5b, 0x46, 0xaf, 0xa7, 0x39, 0xb3, 0xc0, 0x5d, 0x83, 0x0c, 0x6d, 0x69, 0x58, 0x60, 0x07, 0xac,
-	0x14, 0x42, 0xfb, 0x7d, 0x97, 0x45, 0xe2, 0x9c, 0xd3, 0xcd, 0x2f, 0x7e, 0x8a, 0xa0, 0xe4, 0x61,
-	0xe0, 0xc0, 0x9b, 0x50, 0xa4, 0xdb, 0xdb, 0xcc, 0xbc, 0xde, 0x4d, 0xb3, 0x34, 0xe1, 0x3c, 0xca,
-	0x28, 0x15, 0x4e, 0x86, 0x0b, 0x1b, 0x6f, 0x40, 0x5e, 0xa1, 0x82, 0x99, 0x6b, 0x85, 0xa9, 0xae,
-	0x05, 0xc6, 0xee, 0x12, 0xc4, 0x47, 0xb0, 0x28, 0x19, 0xdd, 0xee, 0xa1, 0xac, 0x1c, 0xcd, 0x62,
-	0x9b, 0x88, 0x9e, 0xc2, 0xa8, 0x9e, 0x7f, 0x17, 0x60, 0x51, 0xea, 0xeb, 0xef, 0xba, 0x5d, 0xe3,
-	0xb4, 0xfb, 0xec, 0x5d, 0x28, 0xdb, 0x8e, 0xd5, 0x57, 0x9c, 0xbe, 0x45, 0xd4, 0x36, 0x6d, 0x34,
-	0x39, 0xfc, 0xaf, 0xc6, 0xda, 0x60, 0xdf, 0x67, 0xa6, 0xe2, 0x5b, 0x09, 0x69, 0xd1, 0x0e, 0x93,
-	0xa2, 0x35, 0x24, 0x4d, 0x6b, 0x08, 0x9a, 0x5a, 0x43, 0x32, 0xf3, 0xd5, 0x10, 0xf4, 0xb2, 0x35,
-	0x04, 0x05, 0xf2, 0xab, 0x00, 0x40, 0x55, 0x6f, 0x3b, 0x03, 0x73, 0x7c, 0x45, 0xf9, 0x1b, 0x82,
-	0xf2, 0xd0, 0xae, 0xf1, 0xa1, 0x3f, 0xea, 0x8e, 0x97, 0xb9, 0x60, 0x43, 0x05, 0x23, 0x39, 0x7b,
-	0xc1, 0xc0, 0xd7, 0x61, 0xd1, 0x3e, 0xd2, 0x4c, 0x93, 0xa8, 0x7e, 0x64, 0xa7, 0x68, 0x13, 0x5a,
-	0xe2, 0x64, 0x1e, 0xb9, 0xe2, 0x6f, 0x05, 0x28, 0xf0, 0xb8, 0x9e, 0x1e, 0x7a, 0x97, 0x21, 0x67,
-	0x3b, 0x16, 0x91, 0x7b, 0xc3, 0xc6, 0x27, 0xcb, 0x08, 0x3b, 0x6a, 0x20, 0x67, 0x93, 0x33, 0xe7,
-	0xac, 0xdb, 0x38, 0x32, 0x81, 0xc3, 0x56, 0xb8, 0x20, 0xe5, 0x19, 0x8d, 0x35, 0xc3, 0x4d, 0xc8,
-	0x74, 0xe5, 0x43, 0xd2, 0xb5, 0x2b, 0x69, 0x2a, 0xf6, 0xcd, 0x49, 0xa9, 0x49, 0x55, 0xa8, 0xef,
-	0x52, 0xfe, 0xa6, 0xee, 0x58, 0x03, 0x89, 0x6f, 0xae, 0xde, 0x86, 0x7c, 0x80, 0x8c, 0xcb, 0x90,
-	0x3c, 0x22, 0x03, 0xae, 0xa0, 0xfb, 0x13, 0x9f, 0x83, 0xf4, 0xb1, 0xdc, 0xed, 0x13, 0xae, 0x17,
-	0x5b, 0xac, 0x0b, 0xb7, 0x90, 0x7b, 0x91, 0x14, 0xbd, 0xd4, 0x67, 0x3e, 0x0f, 0xd9, 0x01, 0x45,
-	0xec, 0x10, 0xd5, 0x49, 0x88, 0xd3, 0x29, 0x52, 0x75, 0x92, 0xaf, 0xa2, 0xea, 0xa4, 0xe6, 0xaa,
-	0x3a, 0xbf, 0x17, 0xa0, 0xb8, 0x4b, 0x43, 0x7c, 0x16, 0xcf, 0xdf, 0x01, 0x90, 0x55, 0xb5, 0xed,
-	0xc8, 0x56, 0x87, 0x78, 0xdd, 0xce, 0xe5, 0xf8, 0x54, 0xa5, 0x2c, 0xad, 0x84, 0x94, 0x93, 0x55,
-	0x95, 0x2d, 0xf0, 0x35, 0x28, 0x5a, 0xa4, 0x67, 0x1c, 0x13, 0x4f, 0x00, 0x7d, 0x10, 0xb5, 0x12,
-	0x52, 0x81, 0x91, 0x39, 0xdb, 0x7d, 0xdf, 0xd5, 0x29, 0x6a, 0x8f, 0x7a, 0xec, 0x01, 0x21, 0xd0,
-	0xaf, 0xd8, 0xd7, 0x9b, 0x8b, 0x50, 0x64, 0x10, 0xdb, 0xca, 0x73, 0x59, 0xef, 0x10, 0xf1, 0xb3,
-	0x24, 0x94, 0xbc, 0x13, 0xb9, 0xf7, 0x5b, 0x11, 0x9e, 0x89, 0xcd, 0x1f, 0x53, 0x6d, 0x8b, 0x32,
-	0xba, 0x0a, 0x3b, 0x81, 0x35, 0xde, 0x83, 0x45, 0xff, 0x9d, 0xc0, 0x65, 0xb1, 0x24, 0x5f, 0x9e,
-	0x58, 0x20, 0x7c, 0x69, 0x25, 0x35, 0x44, 0x09, 0xc9, 0x53, 0x69, 0x3f, 0xcb, 0x83, 0x62, 0xb2,
-	0x3c, 0xd6, 0xfa, 0x06, 0xe5, 0x31, 0x4a, 0x48, 0x1e, 0xf3, 0x14, 0xaf, 0xd2, 0x93, 0xe5, 0x49,
-	0x94, 0x35, 0x28, 0x8f, 0x51, 0xf0, 0x77, 0x21, 0xf3, 0x4c, 0xeb, 0x3a, 0xc4, 0xe2, 0x0d, 0x63,
-	0xfc, 0x15, 0xd3, 0x7c, 0xc1, 0x2a, 0x2f, 0xb9, 0x4f, 0x79, 0x5b, 0x09, 0x89, 0xef, 0x72, 0xbd,
-	0x63, 0x71, 0x2f, 0xd0, 0x4a, 0x2d, 0xfe, 0x37, 0x09, 0x19, 0x1e, 0x3c, 0x6f, 0x43, 0x3a, 0x78,
-	0x7b, 0x5d, 0x9f, 0xe0, 0x8d, 0x3a, 0xad, 0xe0, 0x7e, 0xa0, 0xb2, 0x7d, 0xf8, 0x9d, 0x60, 0x3f,
-	0xcd, 0xdc, 0xf0, 0x8d, 0x49, 0x42, 0xfc, 0x9e, 0x72, 0x18, 0xf1, 0xc3, 0xf6, 0x7b, 0x19, 0x0a,
-	0x6e, 0x6e, 0xf7, 0x82, 0x6f, 0x7c, 0x7a, 0x09, 0x32, 0x2a, 0x2b, 0x03, 0xa1, 0x0b, 0x2b, 0x3f,
-	0xcf, 0x85, 0xe5, 0x56, 0x20, 0x1e, 0x83, 0x9a, 0x4a, 0x8d, 0x99, 0x96, 0xb2, 0x8c, 0xb0, 0xa3,
-	0xba, 0x8f, 0x16, 0x43, 0x57, 0x98, 0xaf, 0xb2, 0x12, 0xfd, 0x5d, 0x6d, 0xc0, 0x62, 0x04, 0xf0,
-	0xe4, 0x07, 0x44, 0xf5, 0x67, 0x08, 0xf2, 0x01, 0x3b, 0xfd, 0x1f, 0x1b, 0x88, 0xc8, 0x6d, 0x5c,
-	0x84, 0x3c, 0x57, 0xd5, 0x5b, 0x7a, 0x96, 0x75, 0x23, 0xe0, 0x5f, 0x02, 0x14, 0x82, 0x39, 0x86,
-	0x7f, 0x00, 0x38, 0x94, 0x9d, 0x94, 0x8d, 0x62, 0x2e, 0xad, 0xad, 0x4d, 0x4d, 0xd1, 0xd0, 0xe2,
-	0x60, 0x60, 0x12, 0xa9, 0xec, 0x44, 0x28, 0xf8, 0x0a, 0x80, 0x6f, 0x7b, 0x66, 0xb8, 0xb4, 0x94,
-	0xf3, 0x8c, 0x6f, 0xe3, 0x15, 0x48, 0x2b, 0x72, 0xdf, 0xf6, 0x52, 0x19, 0x7b, 0x67, 0x5a, 0xa6,
-	0x52, 0xdf, 0xa7, 0x13, 0x35, 0x89, 0x31, 0xb8, 0x37, 0xc5, 0x68, 0x90, 0x84, 0x43, 0x24, 0xd4,
-	0x00, 0x64, 0x66, 0x6f, 0x00, 0xc4, 0x3d, 0x28, 0x47, 0x55, 0xc1, 0x45, 0xc8, 0xed, 0x3d, 0x6a,
-	0x6f, 0xb5, 0xee, 0xed, 0x3d, 0x68, 0x96, 0x13, 0x78, 0x01, 0x92, 0xf7, 0xb6, 0xb7, 0xcb, 0x08,
-	0x03, 0x64, 0xa4, 0xe6, 0xc3, 0x47, 0x4f, 0x9a, 0x65, 0x01, 0xe7, 0x61, 0x61, 0xeb, 0x3d, 0x49,
-	0x6a, 0xee, 0x1d, 0x94, 0x93, 0x38, 0x07, 0x69, 0xa9, 0xb9, 0xdf, 0x3c, 0x28, 0xa7, 0x44, 0x1d,
-	0x2a, 0x6e, 0x19, 0xdc, 0x0a, 0x8c, 0x39, 0xa6, 0x0e, 0xca, 0x42, 0x33, 0x30, 0x61, 0xe2, 0x0c,
-	0x2c, 0x19, 0x99, 0x81, 0x89, 0x1f, 0xc0, 0xa5, 0x98, 0xf3, 0x78, 0x05, 0xbe, 0x06, 0xa5, 0xd0,
-	0x10, 0x86, 0xb5, 0xed, 0x39, 0xa9, 0x18, 0x9c, 0xc2, 0xcc, 0x3c, 0x05, 0x5a, 0xfb, 0x29, 0x86,
-	0xdc, 0x7d, 0x2f, 0x22, 0xf0, 0x27, 0x08, 0xf2, 0x81, 0x27, 0x23, 0x8e, 0xaf, 0x24, 0xa3, 0xa3,
-	0xd0, 0xea, 0xe4, 0xae, 0x4e, 0xbc, 0xf5, 0xe3, 0x2f, 0xfe, 0xf9, 0x2b, 0x61, 0x0d, 0xdf, 0x68,
-	0x1c, 0xaf, 0x36, 0x3e, 0xd6, 0xe5, 0x1e, 0x79, 0xcb, 0xb4, 0x8c, 0x0f, 0x88, 0xe2, 0xd8, 0x8d,
-	0x5a, 0xc3, 0xbb, 0x69, 0xe9, 0x6f, 0x2f, 0x09, 0x1b, 0xb5, 0x46, 0xad, 0x76, 0x8a, 0xff, 0x84,
-	0xd8, 0x55, 0xed, 0x27, 0x30, 0xfe, 0xfa, 0xd8, 0x9b, 0x31, 0x3a, 0x42, 0xa8, 0xd6, 0x66, 0x61,
-	0x65, 0x76, 0x15, 0xbf, 0x47, 0x21, 0x6e, 0xe3, 0x4d, 0x0a, 0x91, 0x79, 0x71, 0x46, 0x90, 0x8d,
-	0x8f, 0x43, 0x1e, 0x39, 0xc5, 0x7f, 0x74, 0x1f, 0x5b, 0xa1, 0xd1, 0x1a, 0x8e, 0x87, 0x12, 0x3b,
-	0x7f, 0x9b, 0x66, 0x4c, 0x89, 0x22, 0xdd, 0x15, 0xef, 0xce, 0x87, 0x74, 0x14, 0xe7, 0xfa, 0xb0,
-	0xd9, 0xfe, 0x1c, 0x41, 0x29, 0x3c, 0x22, 0x1b, 0x83, 0x38, 0x76, 0x8e, 0x36, 0x0d, 0xf1, 0x3b,
-	0x14, 0x71, 0x73, 0xed, 0x36, 0x45, 0xec, 0x4f, 0xfd, 0xe7, 0x88, 0x83, 0x00, 0xd4, 0x5f, 0x22,
-	0x28, 0x85, 0x07, 0x56, 0x63, 0xa0, 0xc6, 0x4e, 0xb5, 0xaa, 0x17, 0x46, 0x4a, 0x48, 0xb3, 0x67,
-	0x3a, 0x03, 0x2f, 0x44, 0x6b, 0xf3, 0x87, 0xe8, 0x9f, 0x11, 0xbc, 0x36, 0x32, 0x6c, 0xc1, 0xf1,
-	0xbd, 0xfa, 0xb8, 0x69, 0x57, 0xb5, 0x3e, 0x2b, 0x3b, 0x0f, 0xd7, 0x2d, 0x0a, 0xf7, 0x2d, 0xf1,
-	0x16, 0x33, 0x29, 0x87, 0x37, 0x06, 0xf2, 0xe9, 0x10, 0xf3, 0xfa, 0x21, 0x17, 0xb9, 0x8e, 0x6a,
-	0x37, 0x10, 0xfe, 0x0b, 0x82, 0x72, 0x74, 0xb2, 0x81, 0xbf, 0x19, 0x8f, 0x25, 0x7e, 0xf4, 0x52,
-	0x7d, 0x73, 0x46, 0x6e, 0x0e, 0x9c, 0xc7, 0x02, 0x8f, 0xde, 0x79, 0x80, 0x47, 0x24, 0xae, 0xa3,
-	0x1a, 0xfe, 0x14, 0x41, 0x86, 0x4d, 0x35, 0xb0, 0x18, 0x9f, 0x60, 0xc1, 0xb1, 0x4b, 0x75, 0x79,
-	0x22, 0x0f, 0x07, 0x78, 0x8f, 0x02, 0xdc, 0x10, 0xbf, 0x3d, 0x2f, 0x40, 0xf6, 0xc0, 0x70, 0x61,
-	0xfd, 0x02, 0x41, 0xd6, 0x1b, 0x6b, 0xe0, 0xf8, 0x56, 0x20, 0x32, 0xf5, 0x18, 0x1b, 0x96, 0x67,
-	0xf6, 0xb3, 0xc5, 0x0f, 0x70, 0xf1, 0xfc, 0xc3, 0xc5, 0xc3, 0x1f, 0xef, 0xe3, 0xf0, 0x84, 0x67,
-	0x26, 0xd5, 0x6b, 0x53, 0xb8, 0xb8, 0xb1, 0x7e, 0x82, 0x28, 0xbe, 0x53, 0x6e, 0xad, 0x19, 0x8b,
-	0xd1, 0xe9, 0xba, 0xc5, 0x05, 0xad, 0xa3, 0xda, 0xfb, 0x77, 0xc5, 0x8d, 0xf9, 0x6b, 0x6e, 0x50,
-	0xc2, 0x0d, 0xe4, 0x06, 0x42, 0x9a, 0x3e, 0x16, 0xf1, 0xd5, 0xa9, 0x6f, 0xe4, 0xaa, 0x38, 0xf1,
-	0xad, 0xc9, 0x14, 0xbb, 0x4b, 0xf5, 0x5a, 0x17, 0x6f, 0xce, 0x6b, 0x77, 0xfa, 0x4a, 0x5d, 0x47,
-	0xb5, 0x15, 0x74, 0x03, 0xe1, 0xdf, 0x20, 0xc8, 0xb0, 0x17, 0xd4, 0x98, 0xf8, 0x0c, 0x3d, 0xe8,
-	0xc6, 0xc4, 0x67, 0xf8, 0x09, 0x76, 0xf6, 0xf8, 0xec, 0x52, 0x39, 0x1e, 0xb4, 0x9f, 0x0b, 0xf0,
-	0xda, 0x48, 0x97, 0x31, 0xa6, 0x6a, 0x8d, 0xeb, 0x7e, 0xaa, 0xf5, 0x59, 0xd9, 0x39, 0xf6, 0x5f,
-	0xb3, 0x70, 0xf9, 0x04, 0x89, 0x6f, 0xcf, 0x17, 0x2f, 0xdd, 0xa8, 0x48, 0x37, 0x70, 0x76, 0xc4,
-	0xed, 0x33, 0x04, 0x4e, 0x9c, 0xa8, 0xcd, 0xcf, 0x11, 0x5c, 0x54, 0x8c, 0x5e, 0x9c, 0x3a, 0x9b,
-	0x25, 0xbf, 0x3f, 0x7a, 0xec, 0xe6, 0xe6, 0x63, 0xf4, 0xfe, 0x1d, 0xce, 0xd6, 0x31, 0xba, 0xb2,
-	0xde, 0xa9, 0x1b, 0x56, 0xa7, 0xd1, 0x21, 0x3a, 0xcd, 0xdc, 0x06, 0xfb, 0x24, 0x9b, 0x9a, 0x1d,
-	0xfa, 0x9b, 0x7a, 0xc3, 0x5f, 0xfc, 0x4e, 0x48, 0x3d, 0xd8, 0xba, 0xbf, 0xff, 0x07, 0xe1, 0xd2,
-	0x03, 0x26, 0x65, 0xab, 0x6b, 0xf4, 0xd5, 0xba, 0x7f, 0x48, 0xfd, 0xc9, 0xea, 0x5f, 0xbd, 0x6f,
-	0x4f, 0xe9, 0xb7, 0xa7, 0xfe, 0xb7, 0xa7, 0x4f, 0x56, 0x0f, 0x33, 0xf4, 0x9c, 0x6f, 0xfd, 0x2f,
-	0x00, 0x00, 0xff, 0xff, 0x03, 0x8c, 0x0d, 0x98, 0xcc, 0x1f, 0x00, 0x00,
-}
diff --git a/googleapis/firestore/v1/query.pb.go b/googleapis/firestore/v1/query.pb.go
index 1043040500..3ff54e1b9e 100644
--- a/googleapis/firestore/v1/query.pb.go
+++ b/googleapis/firestore/v1/query.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1/query.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A sort direction.
 type StructuredQuery_Direction int32
@@ -37,6 +40,7 @@ var StructuredQuery_Direction_name = map[int32]string{
 	1: "ASCENDING",
 	2: "DESCENDING",
 }
+
 var StructuredQuery_Direction_value = map[string]int32{
 	"DIRECTION_UNSPECIFIED": 0,
 	"ASCENDING":             1,
@@ -46,8 +50,9 @@ var StructuredQuery_Direction_value = map[string]int32{
 func (x StructuredQuery_Direction) String() string {
 	return proto.EnumName(StructuredQuery_Direction_name, int32(x))
 }
+
 func (StructuredQuery_Direction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 0}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 0}
 }
 
 // A composite filter operator.
@@ -64,6 +69,7 @@ var StructuredQuery_CompositeFilter_Operator_name = map[int32]string{
 	0: "OPERATOR_UNSPECIFIED",
 	1: "AND",
 }
+
 var StructuredQuery_CompositeFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED": 0,
 	"AND":                  1,
@@ -72,8 +78,9 @@ var StructuredQuery_CompositeFilter_Operator_value = map[string]int32{
 func (x StructuredQuery_CompositeFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_CompositeFilter_Operator_name, int32(x))
 }
+
 func (StructuredQuery_CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 2, 0}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 2, 0}
 }
 
 // A field filter operator.
@@ -106,6 +113,7 @@ var StructuredQuery_FieldFilter_Operator_name = map[int32]string{
 	5: "EQUAL",
 	7: "ARRAY_CONTAINS",
 }
+
 var StructuredQuery_FieldFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED":  0,
 	"LESS_THAN":             1,
@@ -119,8 +127,9 @@ var StructuredQuery_FieldFilter_Operator_value = map[string]int32{
 func (x StructuredQuery_FieldFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_FieldFilter_Operator_name, int32(x))
 }
+
 func (StructuredQuery_FieldFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 3, 0}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 3, 0}
 }
 
 // A unary operator.
@@ -140,6 +149,7 @@ var StructuredQuery_UnaryFilter_Operator_name = map[int32]string{
 	2: "IS_NAN",
 	3: "IS_NULL",
 }
+
 var StructuredQuery_UnaryFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED": 0,
 	"IS_NAN":               2,
@@ -149,8 +159,9 @@ var StructuredQuery_UnaryFilter_Operator_value = map[string]int32{
 func (x StructuredQuery_UnaryFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_UnaryFilter_Operator_name, int32(x))
 }
+
 func (StructuredQuery_UnaryFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 4, 0}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 4, 0}
 }
 
 // A Firestore query.
@@ -203,16 +214,17 @@ func (m *StructuredQuery) Reset()         { *m = StructuredQuery{} }
 func (m *StructuredQuery) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery) ProtoMessage()    {}
 func (*StructuredQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0}
 }
+
 func (m *StructuredQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery.Unmarshal(m, b)
 }
 func (m *StructuredQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery.Merge(dst, src)
+func (m *StructuredQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery.Merge(m, src)
 }
 func (m *StructuredQuery) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery.Size(m)
@@ -297,16 +309,17 @@ func (m *StructuredQuery_CollectionSelector) Reset()         { *m = StructuredQu
 func (m *StructuredQuery_CollectionSelector) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_CollectionSelector) ProtoMessage()    {}
 func (*StructuredQuery_CollectionSelector) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 0}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 0}
 }
+
 func (m *StructuredQuery_CollectionSelector) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_CollectionSelector.Unmarshal(m, b)
 }
 func (m *StructuredQuery_CollectionSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_CollectionSelector.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_CollectionSelector) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_CollectionSelector.Merge(dst, src)
+func (m *StructuredQuery_CollectionSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_CollectionSelector.Merge(m, src)
 }
 func (m *StructuredQuery_CollectionSelector) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_CollectionSelector.Size(m)
@@ -349,16 +362,17 @@ func (m *StructuredQuery_Filter) Reset()         { *m = StructuredQuery_Filter{}
 func (m *StructuredQuery_Filter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_Filter) ProtoMessage()    {}
 func (*StructuredQuery_Filter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 1}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 1}
 }
+
 func (m *StructuredQuery_Filter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_Filter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_Filter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_Filter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_Filter.Merge(dst, src)
+func (m *StructuredQuery_Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Filter.Merge(m, src)
 }
 func (m *StructuredQuery_Filter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_Filter.Size(m)
@@ -419,99 +433,15 @@ func (m *StructuredQuery_Filter) GetUnaryFilter() *StructuredQuery_UnaryFilter {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StructuredQuery_Filter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StructuredQuery_Filter_OneofMarshaler, _StructuredQuery_Filter_OneofUnmarshaler, _StructuredQuery_Filter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StructuredQuery_Filter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StructuredQuery_Filter_CompositeFilter)(nil),
 		(*StructuredQuery_Filter_FieldFilter)(nil),
 		(*StructuredQuery_Filter_UnaryFilter)(nil),
 	}
 }
 
-func _StructuredQuery_Filter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StructuredQuery_Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *StructuredQuery_Filter_CompositeFilter:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CompositeFilter); err != nil {
-			return err
-		}
-	case *StructuredQuery_Filter_FieldFilter:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FieldFilter); err != nil {
-			return err
-		}
-	case *StructuredQuery_Filter_UnaryFilter:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UnaryFilter); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StructuredQuery_Filter.FilterType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StructuredQuery_Filter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StructuredQuery_Filter)
-	switch tag {
-	case 1: // filter_type.composite_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_CompositeFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &StructuredQuery_Filter_CompositeFilter{msg}
-		return true, err
-	case 2: // filter_type.field_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_FieldFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &StructuredQuery_Filter_FieldFilter{msg}
-		return true, err
-	case 3: // filter_type.unary_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_UnaryFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &StructuredQuery_Filter_UnaryFilter{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StructuredQuery_Filter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StructuredQuery_Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *StructuredQuery_Filter_CompositeFilter:
-		s := proto.Size(x.CompositeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StructuredQuery_Filter_FieldFilter:
-		s := proto.Size(x.FieldFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StructuredQuery_Filter_UnaryFilter:
-		s := proto.Size(x.UnaryFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A filter that merges multiple other filters using the given operator.
 type StructuredQuery_CompositeFilter struct {
 	// The operator for combining multiple filters.
@@ -528,16 +458,17 @@ func (m *StructuredQuery_CompositeFilter) Reset()         { *m = StructuredQuery
 func (m *StructuredQuery_CompositeFilter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_CompositeFilter) ProtoMessage()    {}
 func (*StructuredQuery_CompositeFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 2}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 2}
 }
+
 func (m *StructuredQuery_CompositeFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_CompositeFilter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_CompositeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_CompositeFilter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_CompositeFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_CompositeFilter.Merge(dst, src)
+func (m *StructuredQuery_CompositeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_CompositeFilter.Merge(m, src)
 }
 func (m *StructuredQuery_CompositeFilter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_CompositeFilter.Size(m)
@@ -579,16 +510,17 @@ func (m *StructuredQuery_FieldFilter) Reset()         { *m = StructuredQuery_Fie
 func (m *StructuredQuery_FieldFilter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_FieldFilter) ProtoMessage()    {}
 func (*StructuredQuery_FieldFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 3}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 3}
 }
+
 func (m *StructuredQuery_FieldFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_FieldFilter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_FieldFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_FieldFilter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_FieldFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_FieldFilter.Merge(dst, src)
+func (m *StructuredQuery_FieldFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_FieldFilter.Merge(m, src)
 }
 func (m *StructuredQuery_FieldFilter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_FieldFilter.Size(m)
@@ -638,16 +570,17 @@ func (m *StructuredQuery_UnaryFilter) Reset()         { *m = StructuredQuery_Una
 func (m *StructuredQuery_UnaryFilter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_UnaryFilter) ProtoMessage()    {}
 func (*StructuredQuery_UnaryFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 4}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 4}
 }
+
 func (m *StructuredQuery_UnaryFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_UnaryFilter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_UnaryFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_UnaryFilter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_UnaryFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_UnaryFilter.Merge(dst, src)
+func (m *StructuredQuery_UnaryFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_UnaryFilter.Merge(m, src)
 }
 func (m *StructuredQuery_UnaryFilter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_UnaryFilter.Size(m)
@@ -689,61 +622,13 @@ func (m *StructuredQuery_UnaryFilter) GetField() *StructuredQuery_FieldReference
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StructuredQuery_UnaryFilter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StructuredQuery_UnaryFilter_OneofMarshaler, _StructuredQuery_UnaryFilter_OneofUnmarshaler, _StructuredQuery_UnaryFilter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StructuredQuery_UnaryFilter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StructuredQuery_UnaryFilter_Field)(nil),
 	}
 }
 
-func _StructuredQuery_UnaryFilter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StructuredQuery_UnaryFilter)
-	// operand_type
-	switch x := m.OperandType.(type) {
-	case *StructuredQuery_UnaryFilter_Field:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Field); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StructuredQuery_UnaryFilter.OperandType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StructuredQuery_UnaryFilter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StructuredQuery_UnaryFilter)
-	switch tag {
-	case 2: // operand_type.field
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_FieldReference)
-		err := b.DecodeMessage(msg)
-		m.OperandType = &StructuredQuery_UnaryFilter_Field{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StructuredQuery_UnaryFilter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StructuredQuery_UnaryFilter)
-	// operand_type
-	switch x := m.OperandType.(type) {
-	case *StructuredQuery_UnaryFilter_Field:
-		s := proto.Size(x.Field)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A reference to a field, such as `max(messages.time) as max_time`.
 type StructuredQuery_FieldReference struct {
 	FieldPath            string   `protobuf:"bytes,2,opt,name=field_path,json=fieldPath,proto3" json:"field_path,omitempty"`
@@ -756,16 +641,17 @@ func (m *StructuredQuery_FieldReference) Reset()         { *m = StructuredQuery_
 func (m *StructuredQuery_FieldReference) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_FieldReference) ProtoMessage()    {}
 func (*StructuredQuery_FieldReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 5}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 5}
 }
+
 func (m *StructuredQuery_FieldReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_FieldReference.Unmarshal(m, b)
 }
 func (m *StructuredQuery_FieldReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_FieldReference.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_FieldReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_FieldReference.Merge(dst, src)
+func (m *StructuredQuery_FieldReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_FieldReference.Merge(m, src)
 }
 func (m *StructuredQuery_FieldReference) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_FieldReference.Size(m)
@@ -798,16 +684,17 @@ func (m *StructuredQuery_Order) Reset()         { *m = StructuredQuery_Order{} }
 func (m *StructuredQuery_Order) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_Order) ProtoMessage()    {}
 func (*StructuredQuery_Order) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 6}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 6}
 }
+
 func (m *StructuredQuery_Order) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_Order.Unmarshal(m, b)
 }
 func (m *StructuredQuery_Order) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_Order.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_Order) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_Order.Merge(dst, src)
+func (m *StructuredQuery_Order) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Order.Merge(m, src)
 }
 func (m *StructuredQuery_Order) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_Order.Size(m)
@@ -848,16 +735,17 @@ func (m *StructuredQuery_Projection) Reset()         { *m = StructuredQuery_Proj
 func (m *StructuredQuery_Projection) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_Projection) ProtoMessage()    {}
 func (*StructuredQuery_Projection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{0, 7}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{0, 7}
 }
+
 func (m *StructuredQuery_Projection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_Projection.Unmarshal(m, b)
 }
 func (m *StructuredQuery_Projection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_Projection.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_Projection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_Projection.Merge(dst, src)
+func (m *StructuredQuery_Projection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Projection.Merge(m, src)
 }
 func (m *StructuredQuery_Projection) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_Projection.Size(m)
@@ -894,16 +782,17 @@ func (m *Cursor) Reset()         { *m = Cursor{} }
 func (m *Cursor) String() string { return proto.CompactTextString(m) }
 func (*Cursor) ProtoMessage()    {}
 func (*Cursor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_24e5c79c1727d2c0, []int{1}
+	return fileDescriptor_45ff6dfb507a4c5e, []int{1}
 }
+
 func (m *Cursor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cursor.Unmarshal(m, b)
 }
 func (m *Cursor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cursor.Marshal(b, m, deterministic)
 }
-func (dst *Cursor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cursor.Merge(dst, src)
+func (m *Cursor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cursor.Merge(m, src)
 }
 func (m *Cursor) XXX_Size() int {
 	return xxx_messageInfo_Cursor.Size(m)
@@ -929,6 +818,10 @@ func (m *Cursor) GetBefore() bool {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.v1.StructuredQuery_Direction", StructuredQuery_Direction_name, StructuredQuery_Direction_value)
+	proto.RegisterEnum("google.firestore.v1.StructuredQuery_CompositeFilter_Operator", StructuredQuery_CompositeFilter_Operator_name, StructuredQuery_CompositeFilter_Operator_value)
+	proto.RegisterEnum("google.firestore.v1.StructuredQuery_FieldFilter_Operator", StructuredQuery_FieldFilter_Operator_name, StructuredQuery_FieldFilter_Operator_value)
+	proto.RegisterEnum("google.firestore.v1.StructuredQuery_UnaryFilter_Operator", StructuredQuery_UnaryFilter_Operator_name, StructuredQuery_UnaryFilter_Operator_value)
 	proto.RegisterType((*StructuredQuery)(nil), "google.firestore.v1.StructuredQuery")
 	proto.RegisterType((*StructuredQuery_CollectionSelector)(nil), "google.firestore.v1.StructuredQuery.CollectionSelector")
 	proto.RegisterType((*StructuredQuery_Filter)(nil), "google.firestore.v1.StructuredQuery.Filter")
@@ -939,17 +832,11 @@ func init() {
 	proto.RegisterType((*StructuredQuery_Order)(nil), "google.firestore.v1.StructuredQuery.Order")
 	proto.RegisterType((*StructuredQuery_Projection)(nil), "google.firestore.v1.StructuredQuery.Projection")
 	proto.RegisterType((*Cursor)(nil), "google.firestore.v1.Cursor")
-	proto.RegisterEnum("google.firestore.v1.StructuredQuery_Direction", StructuredQuery_Direction_name, StructuredQuery_Direction_value)
-	proto.RegisterEnum("google.firestore.v1.StructuredQuery_CompositeFilter_Operator", StructuredQuery_CompositeFilter_Operator_name, StructuredQuery_CompositeFilter_Operator_value)
-	proto.RegisterEnum("google.firestore.v1.StructuredQuery_FieldFilter_Operator", StructuredQuery_FieldFilter_Operator_name, StructuredQuery_FieldFilter_Operator_value)
-	proto.RegisterEnum("google.firestore.v1.StructuredQuery_UnaryFilter_Operator", StructuredQuery_UnaryFilter_Operator_name, StructuredQuery_UnaryFilter_Operator_value)
 }
 
-func init() {
-	proto.RegisterFile("google/firestore/v1/query.proto", fileDescriptor_query_24e5c79c1727d2c0)
-}
+func init() { proto.RegisterFile("google/firestore/v1/query.proto", fileDescriptor_45ff6dfb507a4c5e) }
 
-var fileDescriptor_query_24e5c79c1727d2c0 = []byte{
+var fileDescriptor_45ff6dfb507a4c5e = []byte{
 	// 976 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x6e, 0xe3, 0xc4,
 	0x17, 0xaf, 0x9d, 0xe6, 0xeb, 0xa4, 0x4d, 0xad, 0xf9, 0xff, 0x59, 0xb2, 0xe6, 0xab, 0x0a, 0x17,
diff --git a/googleapis/firestore/v1/write.pb.go b/googleapis/firestore/v1/write.pb.go
index 6ac7544234..b23cb08f7a 100644
--- a/googleapis/firestore/v1/write.pb.go
+++ b/googleapis/firestore/v1/write.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1/write.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A value that is calculated by the server.
 type DocumentTransform_FieldTransform_ServerValue int32
@@ -35,6 +38,7 @@ var DocumentTransform_FieldTransform_ServerValue_name = map[int32]string{
 	0: "SERVER_VALUE_UNSPECIFIED",
 	1: "REQUEST_TIME",
 }
+
 var DocumentTransform_FieldTransform_ServerValue_value = map[string]int32{
 	"SERVER_VALUE_UNSPECIFIED": 0,
 	"REQUEST_TIME":             1,
@@ -43,8 +47,9 @@ var DocumentTransform_FieldTransform_ServerValue_value = map[string]int32{
 func (x DocumentTransform_FieldTransform_ServerValue) String() string {
 	return proto.EnumName(DocumentTransform_FieldTransform_ServerValue_name, int32(x))
 }
+
 func (DocumentTransform_FieldTransform_ServerValue) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{1, 0, 0}
+	return fileDescriptor_5c77c99aae0973dc, []int{1, 0, 0}
 }
 
 // A write on a document.
@@ -80,16 +85,17 @@ func (m *Write) Reset()         { *m = Write{} }
 func (m *Write) String() string { return proto.CompactTextString(m) }
 func (*Write) ProtoMessage()    {}
 func (*Write) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{0}
+	return fileDescriptor_5c77c99aae0973dc, []int{0}
 }
+
 func (m *Write) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Write.Unmarshal(m, b)
 }
 func (m *Write) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Write.Marshal(b, m, deterministic)
 }
-func (dst *Write) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Write.Merge(dst, src)
+func (m *Write) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Write.Merge(m, src)
 }
 func (m *Write) XXX_Size() int {
 	return xxx_messageInfo_Write.Size(m)
@@ -164,95 +170,15 @@ func (m *Write) GetCurrentDocument() *Precondition {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Write) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Write_OneofMarshaler, _Write_OneofUnmarshaler, _Write_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Write) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Write_Update)(nil),
 		(*Write_Delete)(nil),
 		(*Write_Transform)(nil),
 	}
 }
 
-func _Write_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Write)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Write_Update:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *Write_Delete:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Delete)
-	case *Write_Transform:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Transform); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Write.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Write_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Write)
-	switch tag {
-	case 1: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Document)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Write_Update{msg}
-		return true, err
-	case 2: // operation.delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &Write_Delete{x}
-		return true, err
-	case 6: // operation.transform
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentTransform)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Write_Transform{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Write_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Write)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Write_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Write_Delete:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Delete)))
-		n += len(x.Delete)
-	case *Write_Transform:
-		s := proto.Size(x.Transform)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A transformation of a document.
 type DocumentTransform struct {
 	// The name of the document to transform.
@@ -270,16 +196,17 @@ func (m *DocumentTransform) Reset()         { *m = DocumentTransform{} }
 func (m *DocumentTransform) String() string { return proto.CompactTextString(m) }
 func (*DocumentTransform) ProtoMessage()    {}
 func (*DocumentTransform) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{1}
+	return fileDescriptor_5c77c99aae0973dc, []int{1}
 }
+
 func (m *DocumentTransform) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentTransform.Unmarshal(m, b)
 }
 func (m *DocumentTransform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentTransform.Marshal(b, m, deterministic)
 }
-func (dst *DocumentTransform) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentTransform.Merge(dst, src)
+func (m *DocumentTransform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentTransform.Merge(m, src)
 }
 func (m *DocumentTransform) XXX_Size() int {
 	return xxx_messageInfo_DocumentTransform.Size(m)
@@ -328,16 +255,17 @@ func (m *DocumentTransform_FieldTransform) Reset()         { *m = DocumentTransf
 func (m *DocumentTransform_FieldTransform) String() string { return proto.CompactTextString(m) }
 func (*DocumentTransform_FieldTransform) ProtoMessage()    {}
 func (*DocumentTransform_FieldTransform) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{1, 0}
+	return fileDescriptor_5c77c99aae0973dc, []int{1, 0}
 }
+
 func (m *DocumentTransform_FieldTransform) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentTransform_FieldTransform.Unmarshal(m, b)
 }
 func (m *DocumentTransform_FieldTransform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentTransform_FieldTransform.Marshal(b, m, deterministic)
 }
-func (dst *DocumentTransform_FieldTransform) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentTransform_FieldTransform.Merge(dst, src)
+func (m *DocumentTransform_FieldTransform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentTransform_FieldTransform.Merge(m, src)
 }
 func (m *DocumentTransform_FieldTransform) XXX_Size() int {
 	return xxx_messageInfo_DocumentTransform_FieldTransform.Size(m)
@@ -448,9 +376,9 @@ func (m *DocumentTransform_FieldTransform) GetRemoveAllFromArray() *ArrayValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DocumentTransform_FieldTransform) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DocumentTransform_FieldTransform_OneofMarshaler, _DocumentTransform_FieldTransform_OneofUnmarshaler, _DocumentTransform_FieldTransform_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DocumentTransform_FieldTransform) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DocumentTransform_FieldTransform_SetToServerValue)(nil),
 		(*DocumentTransform_FieldTransform_Increment)(nil),
 		(*DocumentTransform_FieldTransform_Maximum)(nil),
@@ -460,139 +388,6 @@ func (*DocumentTransform_FieldTransform) XXX_OneofFuncs() (func(msg proto.Messag
 	}
 }
 
-func _DocumentTransform_FieldTransform_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DocumentTransform_FieldTransform)
-	// transform_type
-	switch x := m.TransformType.(type) {
-	case *DocumentTransform_FieldTransform_SetToServerValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SetToServerValue))
-	case *DocumentTransform_FieldTransform_Increment:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Increment); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_Maximum:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Maximum); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_Minimum:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Minimum); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_AppendMissingElements:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppendMissingElements); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_RemoveAllFromArray:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RemoveAllFromArray); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DocumentTransform_FieldTransform.TransformType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DocumentTransform_FieldTransform_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DocumentTransform_FieldTransform)
-	switch tag {
-	case 2: // transform_type.set_to_server_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TransformType = &DocumentTransform_FieldTransform_SetToServerValue{DocumentTransform_FieldTransform_ServerValue(x)}
-		return true, err
-	case 3: // transform_type.increment
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_Increment{msg}
-		return true, err
-	case 4: // transform_type.maximum
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_Maximum{msg}
-		return true, err
-	case 5: // transform_type.minimum
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_Minimum{msg}
-		return true, err
-	case 6: // transform_type.append_missing_elements
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_AppendMissingElements{msg}
-		return true, err
-	case 7: // transform_type.remove_all_from_array
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_RemoveAllFromArray{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DocumentTransform_FieldTransform_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DocumentTransform_FieldTransform)
-	// transform_type
-	switch x := m.TransformType.(type) {
-	case *DocumentTransform_FieldTransform_SetToServerValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.SetToServerValue))
-	case *DocumentTransform_FieldTransform_Increment:
-		s := proto.Size(x.Increment)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_Maximum:
-		s := proto.Size(x.Maximum)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_Minimum:
-		s := proto.Size(x.Minimum)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_AppendMissingElements:
-		s := proto.Size(x.AppendMissingElements)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_RemoveAllFromArray:
-		s := proto.Size(x.RemoveAllFromArray)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The result of applying a write.
 type WriteResult struct {
 	// The last update time of the document after applying the write. Not set
@@ -613,16 +408,17 @@ func (m *WriteResult) Reset()         { *m = WriteResult{} }
 func (m *WriteResult) String() string { return proto.CompactTextString(m) }
 func (*WriteResult) ProtoMessage()    {}
 func (*WriteResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{2}
+	return fileDescriptor_5c77c99aae0973dc, []int{2}
 }
+
 func (m *WriteResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteResult.Unmarshal(m, b)
 }
 func (m *WriteResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteResult.Marshal(b, m, deterministic)
 }
-func (dst *WriteResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteResult.Merge(dst, src)
+func (m *WriteResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResult.Merge(m, src)
 }
 func (m *WriteResult) XXX_Size() int {
 	return xxx_messageInfo_WriteResult.Size(m)
@@ -672,16 +468,17 @@ func (m *DocumentChange) Reset()         { *m = DocumentChange{} }
 func (m *DocumentChange) String() string { return proto.CompactTextString(m) }
 func (*DocumentChange) ProtoMessage()    {}
 func (*DocumentChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{3}
+	return fileDescriptor_5c77c99aae0973dc, []int{3}
 }
+
 func (m *DocumentChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentChange.Unmarshal(m, b)
 }
 func (m *DocumentChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentChange.Marshal(b, m, deterministic)
 }
-func (dst *DocumentChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentChange.Merge(dst, src)
+func (m *DocumentChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentChange.Merge(m, src)
 }
 func (m *DocumentChange) XXX_Size() int {
 	return xxx_messageInfo_DocumentChange.Size(m)
@@ -738,16 +535,17 @@ func (m *DocumentDelete) Reset()         { *m = DocumentDelete{} }
 func (m *DocumentDelete) String() string { return proto.CompactTextString(m) }
 func (*DocumentDelete) ProtoMessage()    {}
 func (*DocumentDelete) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{4}
+	return fileDescriptor_5c77c99aae0973dc, []int{4}
 }
+
 func (m *DocumentDelete) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentDelete.Unmarshal(m, b)
 }
 func (m *DocumentDelete) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentDelete.Marshal(b, m, deterministic)
 }
-func (dst *DocumentDelete) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentDelete.Merge(dst, src)
+func (m *DocumentDelete) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentDelete.Merge(m, src)
 }
 func (m *DocumentDelete) XXX_Size() int {
 	return xxx_messageInfo_DocumentDelete.Size(m)
@@ -805,16 +603,17 @@ func (m *DocumentRemove) Reset()         { *m = DocumentRemove{} }
 func (m *DocumentRemove) String() string { return proto.CompactTextString(m) }
 func (*DocumentRemove) ProtoMessage()    {}
 func (*DocumentRemove) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{5}
+	return fileDescriptor_5c77c99aae0973dc, []int{5}
 }
+
 func (m *DocumentRemove) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentRemove.Unmarshal(m, b)
 }
 func (m *DocumentRemove) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentRemove.Marshal(b, m, deterministic)
 }
-func (dst *DocumentRemove) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentRemove.Merge(dst, src)
+func (m *DocumentRemove) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentRemove.Merge(m, src)
 }
 func (m *DocumentRemove) XXX_Size() int {
 	return xxx_messageInfo_DocumentRemove.Size(m)
@@ -864,16 +663,17 @@ func (m *ExistenceFilter) Reset()         { *m = ExistenceFilter{} }
 func (m *ExistenceFilter) String() string { return proto.CompactTextString(m) }
 func (*ExistenceFilter) ProtoMessage()    {}
 func (*ExistenceFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_e73df969af87efc4, []int{6}
+	return fileDescriptor_5c77c99aae0973dc, []int{6}
 }
+
 func (m *ExistenceFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExistenceFilter.Unmarshal(m, b)
 }
 func (m *ExistenceFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExistenceFilter.Marshal(b, m, deterministic)
 }
-func (dst *ExistenceFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExistenceFilter.Merge(dst, src)
+func (m *ExistenceFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExistenceFilter.Merge(m, src)
 }
 func (m *ExistenceFilter) XXX_Size() int {
 	return xxx_messageInfo_ExistenceFilter.Size(m)
@@ -899,6 +699,7 @@ func (m *ExistenceFilter) GetCount() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.v1.DocumentTransform_FieldTransform_ServerValue", DocumentTransform_FieldTransform_ServerValue_name, DocumentTransform_FieldTransform_ServerValue_value)
 	proto.RegisterType((*Write)(nil), "google.firestore.v1.Write")
 	proto.RegisterType((*DocumentTransform)(nil), "google.firestore.v1.DocumentTransform")
 	proto.RegisterType((*DocumentTransform_FieldTransform)(nil), "google.firestore.v1.DocumentTransform.FieldTransform")
@@ -907,14 +708,11 @@ func init() {
 	proto.RegisterType((*DocumentDelete)(nil), "google.firestore.v1.DocumentDelete")
 	proto.RegisterType((*DocumentRemove)(nil), "google.firestore.v1.DocumentRemove")
 	proto.RegisterType((*ExistenceFilter)(nil), "google.firestore.v1.ExistenceFilter")
-	proto.RegisterEnum("google.firestore.v1.DocumentTransform_FieldTransform_ServerValue", DocumentTransform_FieldTransform_ServerValue_name, DocumentTransform_FieldTransform_ServerValue_value)
 }
 
-func init() {
-	proto.RegisterFile("google/firestore/v1/write.proto", fileDescriptor_write_e73df969af87efc4)
-}
+func init() { proto.RegisterFile("google/firestore/v1/write.proto", fileDescriptor_5c77c99aae0973dc) }
 
-var fileDescriptor_write_e73df969af87efc4 = []byte{
+var fileDescriptor_5c77c99aae0973dc = []byte{
 	// 853 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x41, 0x6f, 0xe3, 0x44,
 	0x14, 0x6e, 0xd2, 0x26, 0x5b, 0xbf, 0xa0, 0xd6, 0x3b, 0xcb, 0x6a, 0x4d, 0xd8, 0x6a, 0x43, 0x0e,
diff --git a/googleapis/firestore/v1beta1/common.pb.go b/googleapis/firestore/v1beta1/common.pb.go
index 98051d9583..e11417f5f7 100644
--- a/googleapis/firestore/v1beta1/common.pb.go
+++ b/googleapis/firestore/v1beta1/common.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/common.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A set of field paths on a document.
 // Used to restrict a get or update operation on a document to a subset of its
@@ -38,16 +41,17 @@ func (m *DocumentMask) Reset()         { *m = DocumentMask{} }
 func (m *DocumentMask) String() string { return proto.CompactTextString(m) }
 func (*DocumentMask) ProtoMessage()    {}
 func (*DocumentMask) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_33e7705eedc91e86, []int{0}
+	return fileDescriptor_bfe8bb60f36bcae9, []int{0}
 }
+
 func (m *DocumentMask) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentMask.Unmarshal(m, b)
 }
 func (m *DocumentMask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentMask.Marshal(b, m, deterministic)
 }
-func (dst *DocumentMask) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentMask.Merge(dst, src)
+func (m *DocumentMask) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentMask.Merge(m, src)
 }
 func (m *DocumentMask) XXX_Size() int {
 	return xxx_messageInfo_DocumentMask.Size(m)
@@ -82,16 +86,17 @@ func (m *Precondition) Reset()         { *m = Precondition{} }
 func (m *Precondition) String() string { return proto.CompactTextString(m) }
 func (*Precondition) ProtoMessage()    {}
 func (*Precondition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_33e7705eedc91e86, []int{1}
+	return fileDescriptor_bfe8bb60f36bcae9, []int{1}
 }
+
 func (m *Precondition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Precondition.Unmarshal(m, b)
 }
 func (m *Precondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Precondition.Marshal(b, m, deterministic)
 }
-func (dst *Precondition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Precondition.Merge(dst, src)
+func (m *Precondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Precondition.Merge(m, src)
 }
 func (m *Precondition) XXX_Size() int {
 	return xxx_messageInfo_Precondition.Size(m)
@@ -139,79 +144,14 @@ func (m *Precondition) GetUpdateTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Precondition) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Precondition_OneofMarshaler, _Precondition_OneofUnmarshaler, _Precondition_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Precondition) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Precondition_Exists)(nil),
 		(*Precondition_UpdateTime)(nil),
 	}
 }
 
-func _Precondition_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Precondition)
-	// condition_type
-	switch x := m.ConditionType.(type) {
-	case *Precondition_Exists:
-		t := uint64(0)
-		if x.Exists {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Precondition_UpdateTime:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UpdateTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Precondition.ConditionType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Precondition_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Precondition)
-	switch tag {
-	case 1: // condition_type.exists
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ConditionType = &Precondition_Exists{x != 0}
-		return true, err
-	case 2: // condition_type.update_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConditionType = &Precondition_UpdateTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Precondition_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Precondition)
-	// condition_type
-	switch x := m.ConditionType.(type) {
-	case *Precondition_Exists:
-		n += 1 // tag and wire
-		n += 1
-	case *Precondition_UpdateTime:
-		s := proto.Size(x.UpdateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options for creating a new transaction.
 type TransactionOptions struct {
 	// The mode of the transaction.
@@ -229,16 +169,17 @@ func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
 func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions) ProtoMessage()    {}
 func (*TransactionOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_33e7705eedc91e86, []int{2}
+	return fileDescriptor_bfe8bb60f36bcae9, []int{2}
 }
+
 func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
 }
 func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+func (m *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(m, src)
 }
 func (m *TransactionOptions) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions.Size(m)
@@ -286,80 +227,14 @@ func (m *TransactionOptions) GetReadWrite() *TransactionOptions_ReadWrite {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_OneofMarshaler, _TransactionOptions_OneofUnmarshaler, _TransactionOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadOnly_)(nil),
 		(*TransactionOptions_ReadWrite_)(nil),
 	}
 }
 
-func _TransactionOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadOnly_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadOnly); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadWrite_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadWrite); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions.Mode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions)
-	switch tag {
-	case 2: // mode.read_only
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadOnly)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadOnly_{msg}
-		return true, err
-	case 3: // mode.read_write
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadWrite)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadWrite_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadOnly_:
-		s := proto.Size(x.ReadOnly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadWrite_:
-		s := proto.Size(x.ReadWrite)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Options for a transaction that can be used to read and write documents.
 type TransactionOptions_ReadWrite struct {
 	// An optional transaction to retry.
@@ -373,16 +248,17 @@ func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions
 func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
 func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_33e7705eedc91e86, []int{2, 0}
+	return fileDescriptor_bfe8bb60f36bcae9, []int{2, 0}
 }
+
 func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+func (m *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(m, src)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
@@ -417,16 +293,17 @@ func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_
 func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
 func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_33e7705eedc91e86, []int{2, 1}
+	return fileDescriptor_bfe8bb60f36bcae9, []int{2, 1}
 }
+
 func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+func (m *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(m, src)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
@@ -461,61 +338,13 @@ func (m *TransactionOptions_ReadOnly) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions_ReadOnly) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_ReadOnly_OneofMarshaler, _TransactionOptions_ReadOnly_OneofUnmarshaler, _TransactionOptions_ReadOnly_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions_ReadOnly) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadOnly_ReadTime)(nil),
 	}
 }
 
-func _TransactionOptions_ReadOnly_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions_ReadOnly)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *TransactionOptions_ReadOnly_ReadTime:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions_ReadOnly.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions_ReadOnly)
-	switch tag {
-	case 2: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &TransactionOptions_ReadOnly_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_ReadOnly_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions_ReadOnly)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *TransactionOptions_ReadOnly_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*DocumentMask)(nil), "google.firestore.v1beta1.DocumentMask")
 	proto.RegisterType((*Precondition)(nil), "google.firestore.v1beta1.Precondition")
@@ -525,10 +354,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/v1beta1/common.proto", fileDescriptor_common_33e7705eedc91e86)
+	proto.RegisterFile("google/firestore/v1beta1/common.proto", fileDescriptor_bfe8bb60f36bcae9)
 }
 
-var fileDescriptor_common_33e7705eedc91e86 = []byte{
+var fileDescriptor_bfe8bb60f36bcae9 = []byte{
 	// 470 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xe1, 0x8a, 0xd3, 0x40,
 	0x10, 0xc7, 0x9b, 0xde, 0x71, 0xb4, 0xd3, 0x22, 0x67, 0x10, 0x09, 0xe1, 0xf0, 0x8e, 0x82, 0x50,
diff --git a/googleapis/firestore/v1beta1/document.pb.go b/googleapis/firestore/v1beta1/document.pb.go
index de0a6520f0..e99f012abb 100644
--- a/googleapis/firestore/v1beta1/document.pb.go
+++ b/googleapis/firestore/v1beta1/document.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/document.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Firestore document.
 //
@@ -75,16 +78,17 @@ func (m *Document) Reset()         { *m = Document{} }
 func (m *Document) String() string { return proto.CompactTextString(m) }
 func (*Document) ProtoMessage()    {}
 func (*Document) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_8735c50e5ee5c345, []int{0}
+	return fileDescriptor_1522b475188e04d0, []int{0}
 }
+
 func (m *Document) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Document.Unmarshal(m, b)
 }
 func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
 }
-func (dst *Document) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Document.Merge(dst, src)
+func (m *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(m, src)
 }
 func (m *Document) XXX_Size() int {
 	return xxx_messageInfo_Document.Size(m)
@@ -149,16 +153,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_8735c50e5ee5c345, []int{1}
+	return fileDescriptor_1522b475188e04d0, []int{1}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -323,9 +328,9 @@ func (m *Value) GetMapValue() *MapValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_NullValue)(nil),
 		(*Value_BooleanValue)(nil),
 		(*Value_IntegerValue)(nil),
@@ -340,206 +345,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_IntegerValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		b.EncodeVarint(3<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *Value_TimestampValue:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case *Value_StringValue:
-		b.EncodeVarint(17<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BytesValue:
-		b.EncodeVarint(18<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BytesValue)
-	case *Value_ReferenceValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ReferenceValue)
-	case *Value_GeoPointValue:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GeoPointValue); err != nil {
-			return err
-		}
-	case *Value_ArrayValue:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ArrayValue); err != nil {
-			return err
-		}
-	case *Value_MapValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MapValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Value.ValueType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 11: // value_type.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_NullValue{_struct.NullValue(x)}
-		return true, err
-	case 1: // value_type.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_BooleanValue{x != 0}
-		return true, err
-	case 2: // value_type.integer_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ValueType = &Value_IntegerValue{int64(x)}
-		return true, err
-	case 3: // value_type.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.ValueType = &Value_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 10: // value_type.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_TimestampValue{msg}
-		return true, err
-	case 17: // value_type.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ValueType = &Value_StringValue{x}
-		return true, err
-	case 18: // value_type.bytes_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ValueType = &Value_BytesValue{x}
-		return true, err
-	case 5: // value_type.reference_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ValueType = &Value_ReferenceValue{x}
-		return true, err
-	case 8: // value_type.geo_point_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(latlng.LatLng)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_GeoPointValue{msg}
-		return true, err
-	case 9: // value_type.array_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_ArrayValue{msg}
-		return true, err
-	case 6: // value_type.map_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(MapValue)
-		err := b.DecodeMessage(msg)
-		m.ValueType = &Value_MapValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// value_type
-	switch x := m.ValueType.(type) {
-	case *Value_NullValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Value_BooleanValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_IntegerValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IntegerValue))
-	case *Value_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_StringValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BytesValue:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BytesValue)))
-		n += len(x.BytesValue)
-	case *Value_ReferenceValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ReferenceValue)))
-		n += len(x.ReferenceValue)
-	case *Value_GeoPointValue:
-		s := proto.Size(x.GeoPointValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ArrayValue:
-		s := proto.Size(x.ArrayValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_MapValue:
-		s := proto.Size(x.MapValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An array value.
 type ArrayValue struct {
 	// Values in the array.
@@ -553,16 +358,17 @@ func (m *ArrayValue) Reset()         { *m = ArrayValue{} }
 func (m *ArrayValue) String() string { return proto.CompactTextString(m) }
 func (*ArrayValue) ProtoMessage()    {}
 func (*ArrayValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_8735c50e5ee5c345, []int{2}
+	return fileDescriptor_1522b475188e04d0, []int{2}
 }
+
 func (m *ArrayValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ArrayValue.Unmarshal(m, b)
 }
 func (m *ArrayValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ArrayValue.Marshal(b, m, deterministic)
 }
-func (dst *ArrayValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ArrayValue.Merge(dst, src)
+func (m *ArrayValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayValue.Merge(m, src)
 }
 func (m *ArrayValue) XXX_Size() int {
 	return xxx_messageInfo_ArrayValue.Size(m)
@@ -598,16 +404,17 @@ func (m *MapValue) Reset()         { *m = MapValue{} }
 func (m *MapValue) String() string { return proto.CompactTextString(m) }
 func (*MapValue) ProtoMessage()    {}
 func (*MapValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_document_8735c50e5ee5c345, []int{3}
+	return fileDescriptor_1522b475188e04d0, []int{3}
 }
+
 func (m *MapValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapValue.Unmarshal(m, b)
 }
 func (m *MapValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapValue.Marshal(b, m, deterministic)
 }
-func (dst *MapValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapValue.Merge(dst, src)
+func (m *MapValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapValue.Merge(m, src)
 }
 func (m *MapValue) XXX_Size() int {
 	return xxx_messageInfo_MapValue.Size(m)
@@ -635,10 +442,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/v1beta1/document.proto", fileDescriptor_document_8735c50e5ee5c345)
+	proto.RegisterFile("google/firestore/v1beta1/document.proto", fileDescriptor_1522b475188e04d0)
 }
 
-var fileDescriptor_document_8735c50e5ee5c345 = []byte{
+var fileDescriptor_1522b475188e04d0 = []byte{
 	// 655 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xd3, 0x4e,
 	0x10, 0xc7, 0xe3, 0x24, 0x8d, 0x92, 0x71, 0xda, 0xfe, 0x7e, 0xe6, 0x12, 0x45, 0x15, 0x0d, 0x01,
diff --git a/googleapis/firestore/v1beta1/firestore.pb.go b/googleapis/firestore/v1beta1/firestore.pb.go
index 561b856858..1f8fd0977f 100644
--- a/googleapis/firestore/v1beta1/firestore.pb.go
+++ b/googleapis/firestore/v1beta1/firestore.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/firestore.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package firestore
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of change.
 type TargetChange_TargetChangeType int32
@@ -61,6 +61,7 @@ var TargetChange_TargetChangeType_name = map[int32]string{
 	3: "CURRENT",
 	4: "RESET",
 }
+
 var TargetChange_TargetChangeType_value = map[string]int32{
 	"NO_CHANGE": 0,
 	"ADD":       1,
@@ -72,8 +73,9 @@ var TargetChange_TargetChangeType_value = map[string]int32{
 func (x TargetChange_TargetChangeType) String() string {
 	return proto.EnumName(TargetChange_TargetChangeType_name, int32(x))
 }
+
 func (TargetChange_TargetChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{20, 0}
+	return fileDescriptor_9bc8b30a28454f4b, []int{20, 0}
 }
 
 // The request for [Firestore.GetDocument][google.firestore.v1beta1.Firestore.GetDocument].
@@ -102,16 +104,17 @@ func (m *GetDocumentRequest) Reset()         { *m = GetDocumentRequest{} }
 func (m *GetDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDocumentRequest) ProtoMessage()    {}
 func (*GetDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{0}
+	return fileDescriptor_9bc8b30a28454f4b, []int{0}
 }
+
 func (m *GetDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDocumentRequest.Unmarshal(m, b)
 }
 func (m *GetDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDocumentRequest.Merge(dst, src)
+func (m *GetDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDocumentRequest.Merge(m, src)
 }
 func (m *GetDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDocumentRequest.Size(m)
@@ -173,76 +176,14 @@ func (m *GetDocumentRequest) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GetDocumentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _GetDocumentRequest_OneofMarshaler, _GetDocumentRequest_OneofUnmarshaler, _GetDocumentRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*GetDocumentRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*GetDocumentRequest_Transaction)(nil),
 		(*GetDocumentRequest_ReadTime)(nil),
 	}
 }
 
-func _GetDocumentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*GetDocumentRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *GetDocumentRequest_Transaction:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *GetDocumentRequest_ReadTime:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("GetDocumentRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _GetDocumentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*GetDocumentRequest)
-	switch tag {
-	case 3: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &GetDocumentRequest_Transaction{x}
-		return true, err
-	case 5: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &GetDocumentRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _GetDocumentRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*GetDocumentRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *GetDocumentRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *GetDocumentRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request for [Firestore.ListDocuments][google.firestore.v1beta1.Firestore.ListDocuments].
 type ListDocumentsRequest struct {
 	// The parent resource name. In the format:
@@ -290,16 +231,17 @@ func (m *ListDocumentsRequest) Reset()         { *m = ListDocumentsRequest{} }
 func (m *ListDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDocumentsRequest) ProtoMessage()    {}
 func (*ListDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{1}
+	return fileDescriptor_9bc8b30a28454f4b, []int{1}
 }
+
 func (m *ListDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDocumentsRequest.Unmarshal(m, b)
 }
 func (m *ListDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDocumentsRequest.Merge(dst, src)
+func (m *ListDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsRequest.Merge(m, src)
 }
 func (m *ListDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDocumentsRequest.Size(m)
@@ -396,76 +338,14 @@ func (m *ListDocumentsRequest) GetShowMissing() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListDocumentsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListDocumentsRequest_OneofMarshaler, _ListDocumentsRequest_OneofUnmarshaler, _ListDocumentsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListDocumentsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListDocumentsRequest_Transaction)(nil),
 		(*ListDocumentsRequest_ReadTime)(nil),
 	}
 }
 
-func _ListDocumentsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *ListDocumentsRequest_Transaction:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *ListDocumentsRequest_ReadTime:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ListDocumentsRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListDocumentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListDocumentsRequest)
-	switch tag {
-	case 8: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &ListDocumentsRequest_Transaction{x}
-		return true, err
-	case 10: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &ListDocumentsRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListDocumentsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *ListDocumentsRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *ListDocumentsRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Firestore.ListDocuments][google.firestore.v1beta1.Firestore.ListDocuments].
 type ListDocumentsResponse struct {
 	// The Documents found.
@@ -481,16 +361,17 @@ func (m *ListDocumentsResponse) Reset()         { *m = ListDocumentsResponse{} }
 func (m *ListDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDocumentsResponse) ProtoMessage()    {}
 func (*ListDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{2}
+	return fileDescriptor_9bc8b30a28454f4b, []int{2}
 }
+
 func (m *ListDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDocumentsResponse.Unmarshal(m, b)
 }
 func (m *ListDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDocumentsResponse.Merge(dst, src)
+func (m *ListDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsResponse.Merge(m, src)
 }
 func (m *ListDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDocumentsResponse.Size(m)
@@ -543,16 +424,17 @@ func (m *CreateDocumentRequest) Reset()         { *m = CreateDocumentRequest{} }
 func (m *CreateDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDocumentRequest) ProtoMessage()    {}
 func (*CreateDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{3}
+	return fileDescriptor_9bc8b30a28454f4b, []int{3}
 }
+
 func (m *CreateDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDocumentRequest.Unmarshal(m, b)
 }
 func (m *CreateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDocumentRequest.Merge(dst, src)
+func (m *CreateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDocumentRequest.Merge(m, src)
 }
 func (m *CreateDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDocumentRequest.Size(m)
@@ -628,16 +510,17 @@ func (m *UpdateDocumentRequest) Reset()         { *m = UpdateDocumentRequest{} }
 func (m *UpdateDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDocumentRequest) ProtoMessage()    {}
 func (*UpdateDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{4}
+	return fileDescriptor_9bc8b30a28454f4b, []int{4}
 }
+
 func (m *UpdateDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDocumentRequest.Unmarshal(m, b)
 }
 func (m *UpdateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDocumentRequest.Merge(dst, src)
+func (m *UpdateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDocumentRequest.Merge(m, src)
 }
 func (m *UpdateDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDocumentRequest.Size(m)
@@ -693,16 +576,17 @@ func (m *DeleteDocumentRequest) Reset()         { *m = DeleteDocumentRequest{} }
 func (m *DeleteDocumentRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDocumentRequest) ProtoMessage()    {}
 func (*DeleteDocumentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{5}
+	return fileDescriptor_9bc8b30a28454f4b, []int{5}
 }
+
 func (m *DeleteDocumentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDocumentRequest.Unmarshal(m, b)
 }
 func (m *DeleteDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDocumentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDocumentRequest.Merge(dst, src)
+func (m *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDocumentRequest.Merge(m, src)
 }
 func (m *DeleteDocumentRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDocumentRequest.Size(m)
@@ -759,16 +643,17 @@ func (m *BatchGetDocumentsRequest) Reset()         { *m = BatchGetDocumentsReque
 func (m *BatchGetDocumentsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchGetDocumentsRequest) ProtoMessage()    {}
 func (*BatchGetDocumentsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{6}
+	return fileDescriptor_9bc8b30a28454f4b, []int{6}
 }
+
 func (m *BatchGetDocumentsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetDocumentsRequest.Unmarshal(m, b)
 }
 func (m *BatchGetDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetDocumentsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetDocumentsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetDocumentsRequest.Merge(dst, src)
+func (m *BatchGetDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetDocumentsRequest.Merge(m, src)
 }
 func (m *BatchGetDocumentsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchGetDocumentsRequest.Size(m)
@@ -850,95 +735,15 @@ func (m *BatchGetDocumentsRequest) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchGetDocumentsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchGetDocumentsRequest_OneofMarshaler, _BatchGetDocumentsRequest_OneofUnmarshaler, _BatchGetDocumentsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchGetDocumentsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchGetDocumentsRequest_Transaction)(nil),
 		(*BatchGetDocumentsRequest_NewTransaction)(nil),
 		(*BatchGetDocumentsRequest_ReadTime)(nil),
 	}
 }
 
-func _BatchGetDocumentsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchGetDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *BatchGetDocumentsRequest_Transaction:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *BatchGetDocumentsRequest_NewTransaction:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NewTransaction); err != nil {
-			return err
-		}
-	case *BatchGetDocumentsRequest_ReadTime:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("BatchGetDocumentsRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchGetDocumentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchGetDocumentsRequest)
-	switch tag {
-	case 4: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &BatchGetDocumentsRequest_Transaction{x}
-		return true, err
-	case 5: // consistency_selector.new_transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &BatchGetDocumentsRequest_NewTransaction{msg}
-		return true, err
-	case 7: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &BatchGetDocumentsRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchGetDocumentsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchGetDocumentsRequest)
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *BatchGetDocumentsRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *BatchGetDocumentsRequest_NewTransaction:
-		s := proto.Size(x.NewTransaction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BatchGetDocumentsRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The streamed response for [Firestore.BatchGetDocuments][google.firestore.v1beta1.Firestore.BatchGetDocuments].
 type BatchGetDocumentsResponse struct {
 	// A single result.
@@ -966,16 +771,17 @@ func (m *BatchGetDocumentsResponse) Reset()         { *m = BatchGetDocumentsResp
 func (m *BatchGetDocumentsResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchGetDocumentsResponse) ProtoMessage()    {}
 func (*BatchGetDocumentsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{7}
+	return fileDescriptor_9bc8b30a28454f4b, []int{7}
 }
+
 func (m *BatchGetDocumentsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetDocumentsResponse.Unmarshal(m, b)
 }
 func (m *BatchGetDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetDocumentsResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetDocumentsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetDocumentsResponse.Merge(dst, src)
+func (m *BatchGetDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetDocumentsResponse.Merge(m, src)
 }
 func (m *BatchGetDocumentsResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchGetDocumentsResponse.Size(m)
@@ -1037,76 +843,14 @@ func (m *BatchGetDocumentsResponse) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*BatchGetDocumentsResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _BatchGetDocumentsResponse_OneofMarshaler, _BatchGetDocumentsResponse_OneofUnmarshaler, _BatchGetDocumentsResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*BatchGetDocumentsResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*BatchGetDocumentsResponse_Found)(nil),
 		(*BatchGetDocumentsResponse_Missing)(nil),
 	}
 }
 
-func _BatchGetDocumentsResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*BatchGetDocumentsResponse)
-	// result
-	switch x := m.Result.(type) {
-	case *BatchGetDocumentsResponse_Found:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Found); err != nil {
-			return err
-		}
-	case *BatchGetDocumentsResponse_Missing:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Missing)
-	case nil:
-	default:
-		return fmt.Errorf("BatchGetDocumentsResponse.Result has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _BatchGetDocumentsResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*BatchGetDocumentsResponse)
-	switch tag {
-	case 1: // result.found
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Document)
-		err := b.DecodeMessage(msg)
-		m.Result = &BatchGetDocumentsResponse_Found{msg}
-		return true, err
-	case 2: // result.missing
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Result = &BatchGetDocumentsResponse_Missing{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _BatchGetDocumentsResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*BatchGetDocumentsResponse)
-	// result
-	switch x := m.Result.(type) {
-	case *BatchGetDocumentsResponse_Found:
-		s := proto.Size(x.Found)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *BatchGetDocumentsResponse_Missing:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Missing)))
-		n += len(x.Missing)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request for [Firestore.BeginTransaction][google.firestore.v1beta1.Firestore.BeginTransaction].
 type BeginTransactionRequest struct {
 	// The database name. In the format:
@@ -1124,16 +868,17 @@ func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest
 func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionRequest) ProtoMessage()    {}
 func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{8}
+	return fileDescriptor_9bc8b30a28454f4b, []int{8}
 }
+
 func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
 }
 func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+func (m *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(m, src)
 }
 func (m *BeginTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionRequest.Size(m)
@@ -1171,16 +916,17 @@ func (m *BeginTransactionResponse) Reset()         { *m = BeginTransactionRespon
 func (m *BeginTransactionResponse) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionResponse) ProtoMessage()    {}
 func (*BeginTransactionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{9}
+	return fileDescriptor_9bc8b30a28454f4b, []int{9}
 }
+
 func (m *BeginTransactionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionResponse.Unmarshal(m, b)
 }
 func (m *BeginTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionResponse.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionResponse.Merge(dst, src)
+func (m *BeginTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionResponse.Merge(m, src)
 }
 func (m *BeginTransactionResponse) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionResponse.Size(m)
@@ -1218,16 +964,17 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{10}
+	return fileDescriptor_9bc8b30a28454f4b, []int{10}
 }
+
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(dst, src)
+func (m *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(m, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -1277,16 +1024,17 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{11}
+	return fileDescriptor_9bc8b30a28454f4b, []int{11}
 }
+
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(dst, src)
+func (m *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(m, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -1327,16 +1075,17 @@ func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
 func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackRequest) ProtoMessage()    {}
 func (*RollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{12}
+	return fileDescriptor_9bc8b30a28454f4b, []int{12}
 }
+
 func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
 }
 func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+func (m *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(m, src)
 }
 func (m *RollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackRequest.Size(m)
@@ -1392,16 +1141,17 @@ func (m *RunQueryRequest) Reset()         { *m = RunQueryRequest{} }
 func (m *RunQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*RunQueryRequest) ProtoMessage()    {}
 func (*RunQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{13}
+	return fileDescriptor_9bc8b30a28454f4b, []int{13}
 }
+
 func (m *RunQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryRequest.Unmarshal(m, b)
 }
 func (m *RunQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryRequest.Merge(dst, src)
+func (m *RunQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryRequest.Merge(m, src)
 }
 func (m *RunQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_RunQueryRequest.Size(m)
@@ -1493,9 +1243,9 @@ func (m *RunQueryRequest) GetReadTime() *timestamp.Timestamp {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RunQueryRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RunQueryRequest_OneofMarshaler, _RunQueryRequest_OneofUnmarshaler, _RunQueryRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RunQueryRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RunQueryRequest_StructuredQuery)(nil),
 		(*RunQueryRequest_Transaction)(nil),
 		(*RunQueryRequest_NewTransaction)(nil),
@@ -1503,116 +1253,6 @@ func (*RunQueryRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffe
 	}
 }
 
-func _RunQueryRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_StructuredQuery:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredQuery); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RunQueryRequest.QueryType has unexpected type %T", x)
-	}
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *RunQueryRequest_Transaction:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Transaction)
-	case *RunQueryRequest_NewTransaction:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NewTransaction); err != nil {
-			return err
-		}
-	case *RunQueryRequest_ReadTime:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RunQueryRequest.ConsistencySelector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RunQueryRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RunQueryRequest)
-	switch tag {
-	case 2: // query_type.structured_query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &RunQueryRequest_StructuredQuery{msg}
-		return true, err
-	case 5: // consistency_selector.transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ConsistencySelector = &RunQueryRequest_Transaction{x}
-		return true, err
-	case 6: // consistency_selector.new_transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &RunQueryRequest_NewTransaction{msg}
-		return true, err
-	case 7: // consistency_selector.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ConsistencySelector = &RunQueryRequest_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RunQueryRequest)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *RunQueryRequest_StructuredQuery:
-		s := proto.Size(x.StructuredQuery)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// consistency_selector
-	switch x := m.ConsistencySelector.(type) {
-	case *RunQueryRequest_Transaction:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Transaction)))
-		n += len(x.Transaction)
-	case *RunQueryRequest_NewTransaction:
-		s := proto.Size(x.NewTransaction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RunQueryRequest_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Firestore.RunQuery][google.firestore.v1beta1.Firestore.RunQuery].
 type RunQueryResponse struct {
 	// The transaction that was started as part of this request.
@@ -1643,16 +1283,17 @@ func (m *RunQueryResponse) Reset()         { *m = RunQueryResponse{} }
 func (m *RunQueryResponse) String() string { return proto.CompactTextString(m) }
 func (*RunQueryResponse) ProtoMessage()    {}
 func (*RunQueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{14}
+	return fileDescriptor_9bc8b30a28454f4b, []int{14}
 }
+
 func (m *RunQueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunQueryResponse.Unmarshal(m, b)
 }
 func (m *RunQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunQueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *RunQueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunQueryResponse.Merge(dst, src)
+func (m *RunQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryResponse.Merge(m, src)
 }
 func (m *RunQueryResponse) XXX_Size() int {
 	return xxx_messageInfo_RunQueryResponse.Size(m)
@@ -1743,16 +1384,17 @@ func (m *WriteRequest) Reset()         { *m = WriteRequest{} }
 func (m *WriteRequest) String() string { return proto.CompactTextString(m) }
 func (*WriteRequest) ProtoMessage()    {}
 func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{15}
+	return fileDescriptor_9bc8b30a28454f4b, []int{15}
 }
+
 func (m *WriteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteRequest.Unmarshal(m, b)
 }
 func (m *WriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteRequest.Marshal(b, m, deterministic)
 }
-func (dst *WriteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteRequest.Merge(dst, src)
+func (m *WriteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteRequest.Merge(m, src)
 }
 func (m *WriteRequest) XXX_Size() int {
 	return xxx_messageInfo_WriteRequest.Size(m)
@@ -1824,16 +1466,17 @@ func (m *WriteResponse) Reset()         { *m = WriteResponse{} }
 func (m *WriteResponse) String() string { return proto.CompactTextString(m) }
 func (*WriteResponse) ProtoMessage()    {}
 func (*WriteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{16}
+	return fileDescriptor_9bc8b30a28454f4b, []int{16}
 }
+
 func (m *WriteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteResponse.Unmarshal(m, b)
 }
 func (m *WriteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteResponse.Marshal(b, m, deterministic)
 }
-func (dst *WriteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteResponse.Merge(dst, src)
+func (m *WriteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResponse.Merge(m, src)
 }
 func (m *WriteResponse) XXX_Size() int {
 	return xxx_messageInfo_WriteResponse.Size(m)
@@ -1894,16 +1537,17 @@ func (m *ListenRequest) Reset()         { *m = ListenRequest{} }
 func (m *ListenRequest) String() string { return proto.CompactTextString(m) }
 func (*ListenRequest) ProtoMessage()    {}
 func (*ListenRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{17}
+	return fileDescriptor_9bc8b30a28454f4b, []int{17}
 }
+
 func (m *ListenRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListenRequest.Unmarshal(m, b)
 }
 func (m *ListenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListenRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListenRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListenRequest.Merge(dst, src)
+func (m *ListenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListenRequest.Merge(m, src)
 }
 func (m *ListenRequest) XXX_Size() int {
 	return xxx_messageInfo_ListenRequest.Size(m)
@@ -1965,75 +1609,14 @@ func (m *ListenRequest) GetLabels() map[string]string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListenRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListenRequest_OneofMarshaler, _ListenRequest_OneofUnmarshaler, _ListenRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListenRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListenRequest_AddTarget)(nil),
 		(*ListenRequest_RemoveTarget)(nil),
 	}
 }
 
-func _ListenRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListenRequest)
-	// target_change
-	switch x := m.TargetChange.(type) {
-	case *ListenRequest_AddTarget:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AddTarget); err != nil {
-			return err
-		}
-	case *ListenRequest_RemoveTarget:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RemoveTarget))
-	case nil:
-	default:
-		return fmt.Errorf("ListenRequest.TargetChange has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListenRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListenRequest)
-	switch tag {
-	case 2: // target_change.add_target
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Target)
-		err := b.DecodeMessage(msg)
-		m.TargetChange = &ListenRequest_AddTarget{msg}
-		return true, err
-	case 3: // target_change.remove_target
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TargetChange = &ListenRequest_RemoveTarget{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListenRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListenRequest)
-	// target_change
-	switch x := m.TargetChange.(type) {
-	case *ListenRequest_AddTarget:
-		s := proto.Size(x.AddTarget)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenRequest_RemoveTarget:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.RemoveTarget))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Firestore.Listen][google.firestore.v1beta1.Firestore.Listen].
 type ListenResponse struct {
 	// The supported responses.
@@ -2054,16 +1637,17 @@ func (m *ListenResponse) Reset()         { *m = ListenResponse{} }
 func (m *ListenResponse) String() string { return proto.CompactTextString(m) }
 func (*ListenResponse) ProtoMessage()    {}
 func (*ListenResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{18}
+	return fileDescriptor_9bc8b30a28454f4b, []int{18}
 }
+
 func (m *ListenResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListenResponse.Unmarshal(m, b)
 }
 func (m *ListenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListenResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListenResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListenResponse.Merge(dst, src)
+func (m *ListenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListenResponse.Merge(m, src)
 }
 func (m *ListenResponse) XXX_Size() int {
 	return xxx_messageInfo_ListenResponse.Size(m)
@@ -2150,9 +1734,9 @@ func (m *ListenResponse) GetFilter() *ExistenceFilter {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListenResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListenResponse_OneofMarshaler, _ListenResponse_OneofUnmarshaler, _ListenResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListenResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListenResponse_TargetChange)(nil),
 		(*ListenResponse_DocumentChange)(nil),
 		(*ListenResponse_DocumentDelete)(nil),
@@ -2161,126 +1745,6 @@ func (*ListenResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _ListenResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListenResponse)
-	// response_type
-	switch x := m.ResponseType.(type) {
-	case *ListenResponse_TargetChange:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TargetChange); err != nil {
-			return err
-		}
-	case *ListenResponse_DocumentChange:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DocumentChange); err != nil {
-			return err
-		}
-	case *ListenResponse_DocumentDelete:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DocumentDelete); err != nil {
-			return err
-		}
-	case *ListenResponse_DocumentRemove:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DocumentRemove); err != nil {
-			return err
-		}
-	case *ListenResponse_Filter:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Filter); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ListenResponse.ResponseType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListenResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListenResponse)
-	switch tag {
-	case 2: // response_type.target_change
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TargetChange)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_TargetChange{msg}
-		return true, err
-	case 3: // response_type.document_change
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentChange)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_DocumentChange{msg}
-		return true, err
-	case 4: // response_type.document_delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentDelete)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_DocumentDelete{msg}
-		return true, err
-	case 6: // response_type.document_remove
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentRemove)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_DocumentRemove{msg}
-		return true, err
-	case 5: // response_type.filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExistenceFilter)
-		err := b.DecodeMessage(msg)
-		m.ResponseType = &ListenResponse_Filter{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListenResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListenResponse)
-	// response_type
-	switch x := m.ResponseType.(type) {
-	case *ListenResponse_TargetChange:
-		s := proto.Size(x.TargetChange)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_DocumentChange:
-		s := proto.Size(x.DocumentChange)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_DocumentDelete:
-		s := proto.Size(x.DocumentDelete)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_DocumentRemove:
-		s := proto.Size(x.DocumentRemove)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ListenResponse_Filter:
-		s := proto.Size(x.Filter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A specification of a set of documents to listen to.
 type Target struct {
 	// The type of target to listen to.
@@ -2318,16 +1782,17 @@ func (m *Target) Reset()         { *m = Target{} }
 func (m *Target) String() string { return proto.CompactTextString(m) }
 func (*Target) ProtoMessage()    {}
 func (*Target) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{19}
+	return fileDescriptor_9bc8b30a28454f4b, []int{19}
 }
+
 func (m *Target) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target.Unmarshal(m, b)
 }
 func (m *Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target.Marshal(b, m, deterministic)
 }
-func (dst *Target) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target.Merge(dst, src)
+func (m *Target) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target.Merge(m, src)
 }
 func (m *Target) XXX_Size() int {
 	return xxx_messageInfo_Target.Size(m)
@@ -2426,9 +1891,9 @@ func (m *Target) GetOnce() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Target) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Target_OneofMarshaler, _Target_OneofUnmarshaler, _Target_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Target) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Target_Query)(nil),
 		(*Target_Documents)(nil),
 		(*Target_ResumeToken)(nil),
@@ -2436,116 +1901,6 @@ func (*Target) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Target_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Target)
-	// target_type
-	switch x := m.TargetType.(type) {
-	case *Target_Query:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Query); err != nil {
-			return err
-		}
-	case *Target_Documents:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Documents); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Target.TargetType has unexpected type %T", x)
-	}
-	// resume_type
-	switch x := m.ResumeType.(type) {
-	case *Target_ResumeToken:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ResumeToken)
-	case *Target_ReadTime:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Target.ResumeType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Target_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Target)
-	switch tag {
-	case 2: // target_type.query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Target_QueryTarget)
-		err := b.DecodeMessage(msg)
-		m.TargetType = &Target_Query{msg}
-		return true, err
-	case 3: // target_type.documents
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Target_DocumentsTarget)
-		err := b.DecodeMessage(msg)
-		m.TargetType = &Target_Documents{msg}
-		return true, err
-	case 4: // resume_type.resume_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ResumeType = &Target_ResumeToken{x}
-		return true, err
-	case 11: // resume_type.read_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.ResumeType = &Target_ReadTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Target_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Target)
-	// target_type
-	switch x := m.TargetType.(type) {
-	case *Target_Query:
-		s := proto.Size(x.Query)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Target_Documents:
-		s := proto.Size(x.Documents)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// resume_type
-	switch x := m.ResumeType.(type) {
-	case *Target_ResumeToken:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ResumeToken)))
-		n += len(x.ResumeToken)
-	case *Target_ReadTime:
-		s := proto.Size(x.ReadTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A target specified by a set of documents names.
 type Target_DocumentsTarget struct {
 	// The names of the documents to retrieve. In the format:
@@ -2562,16 +1917,17 @@ func (m *Target_DocumentsTarget) Reset()         { *m = Target_DocumentsTarget{}
 func (m *Target_DocumentsTarget) String() string { return proto.CompactTextString(m) }
 func (*Target_DocumentsTarget) ProtoMessage()    {}
 func (*Target_DocumentsTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{19, 0}
+	return fileDescriptor_9bc8b30a28454f4b, []int{19, 0}
 }
+
 func (m *Target_DocumentsTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target_DocumentsTarget.Unmarshal(m, b)
 }
 func (m *Target_DocumentsTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target_DocumentsTarget.Marshal(b, m, deterministic)
 }
-func (dst *Target_DocumentsTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target_DocumentsTarget.Merge(dst, src)
+func (m *Target_DocumentsTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_DocumentsTarget.Merge(m, src)
 }
 func (m *Target_DocumentsTarget) XXX_Size() int {
 	return xxx_messageInfo_Target_DocumentsTarget.Size(m)
@@ -2612,16 +1968,17 @@ func (m *Target_QueryTarget) Reset()         { *m = Target_QueryTarget{} }
 func (m *Target_QueryTarget) String() string { return proto.CompactTextString(m) }
 func (*Target_QueryTarget) ProtoMessage()    {}
 func (*Target_QueryTarget) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{19, 1}
+	return fileDescriptor_9bc8b30a28454f4b, []int{19, 1}
 }
+
 func (m *Target_QueryTarget) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Target_QueryTarget.Unmarshal(m, b)
 }
 func (m *Target_QueryTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Target_QueryTarget.Marshal(b, m, deterministic)
 }
-func (dst *Target_QueryTarget) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Target_QueryTarget.Merge(dst, src)
+func (m *Target_QueryTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_QueryTarget.Merge(m, src)
 }
 func (m *Target_QueryTarget) XXX_Size() int {
 	return xxx_messageInfo_Target_QueryTarget.Size(m)
@@ -2663,61 +2020,13 @@ func (m *Target_QueryTarget) GetStructuredQuery() *StructuredQuery {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Target_QueryTarget) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Target_QueryTarget_OneofMarshaler, _Target_QueryTarget_OneofUnmarshaler, _Target_QueryTarget_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Target_QueryTarget) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Target_QueryTarget_StructuredQuery)(nil),
 	}
 }
 
-func _Target_QueryTarget_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Target_QueryTarget)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *Target_QueryTarget_StructuredQuery:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructuredQuery); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Target_QueryTarget.QueryType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Target_QueryTarget_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Target_QueryTarget)
-	switch tag {
-	case 2: // query_type.structured_query
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery)
-		err := b.DecodeMessage(msg)
-		m.QueryType = &Target_QueryTarget_StructuredQuery{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Target_QueryTarget_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Target_QueryTarget)
-	// query_type
-	switch x := m.QueryType.(type) {
-	case *Target_QueryTarget_StructuredQuery:
-		s := proto.Size(x.StructuredQuery)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Targets being watched have changed.
 type TargetChange struct {
 	// The type of change that occurred.
@@ -2759,16 +2068,17 @@ func (m *TargetChange) Reset()         { *m = TargetChange{} }
 func (m *TargetChange) String() string { return proto.CompactTextString(m) }
 func (*TargetChange) ProtoMessage()    {}
 func (*TargetChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{20}
+	return fileDescriptor_9bc8b30a28454f4b, []int{20}
 }
+
 func (m *TargetChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TargetChange.Unmarshal(m, b)
 }
 func (m *TargetChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TargetChange.Marshal(b, m, deterministic)
 }
-func (dst *TargetChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetChange.Merge(dst, src)
+func (m *TargetChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetChange.Merge(m, src)
 }
 func (m *TargetChange) XXX_Size() int {
 	return xxx_messageInfo_TargetChange.Size(m)
@@ -2835,16 +2145,17 @@ func (m *ListCollectionIdsRequest) Reset()         { *m = ListCollectionIdsReque
 func (m *ListCollectionIdsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCollectionIdsRequest) ProtoMessage()    {}
 func (*ListCollectionIdsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{21}
+	return fileDescriptor_9bc8b30a28454f4b, []int{21}
 }
+
 func (m *ListCollectionIdsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCollectionIdsRequest.Unmarshal(m, b)
 }
 func (m *ListCollectionIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCollectionIdsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCollectionIdsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCollectionIdsRequest.Merge(dst, src)
+func (m *ListCollectionIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCollectionIdsRequest.Merge(m, src)
 }
 func (m *ListCollectionIdsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCollectionIdsRequest.Size(m)
@@ -2891,16 +2202,17 @@ func (m *ListCollectionIdsResponse) Reset()         { *m = ListCollectionIdsResp
 func (m *ListCollectionIdsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCollectionIdsResponse) ProtoMessage()    {}
 func (*ListCollectionIdsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_firestore_d225c1066b9de1b1, []int{22}
+	return fileDescriptor_9bc8b30a28454f4b, []int{22}
 }
+
 func (m *ListCollectionIdsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCollectionIdsResponse.Unmarshal(m, b)
 }
 func (m *ListCollectionIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCollectionIdsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCollectionIdsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCollectionIdsResponse.Merge(dst, src)
+func (m *ListCollectionIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCollectionIdsResponse.Merge(m, src)
 }
 func (m *ListCollectionIdsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCollectionIdsResponse.Size(m)
@@ -2926,6 +2238,7 @@ func (m *ListCollectionIdsResponse) GetNextPageToken() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.v1beta1.TargetChange_TargetChangeType", TargetChange_TargetChangeType_name, TargetChange_TargetChangeType_value)
 	proto.RegisterType((*GetDocumentRequest)(nil), "google.firestore.v1beta1.GetDocumentRequest")
 	proto.RegisterType((*ListDocumentsRequest)(nil), "google.firestore.v1beta1.ListDocumentsRequest")
 	proto.RegisterType((*ListDocumentsResponse)(nil), "google.firestore.v1beta1.ListDocumentsResponse")
@@ -2953,7 +2266,153 @@ func init() {
 	proto.RegisterType((*TargetChange)(nil), "google.firestore.v1beta1.TargetChange")
 	proto.RegisterType((*ListCollectionIdsRequest)(nil), "google.firestore.v1beta1.ListCollectionIdsRequest")
 	proto.RegisterType((*ListCollectionIdsResponse)(nil), "google.firestore.v1beta1.ListCollectionIdsResponse")
-	proto.RegisterEnum("google.firestore.v1beta1.TargetChange_TargetChangeType", TargetChange_TargetChangeType_name, TargetChange_TargetChangeType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/firestore/v1beta1/firestore.proto", fileDescriptor_9bc8b30a28454f4b)
+}
+
+var fileDescriptor_9bc8b30a28454f4b = []byte{
+	// 2214 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5a, 0xcd, 0x8f, 0x1b, 0x49,
+	0x15, 0x77, 0xb5, 0x3f, 0xc6, 0x7e, 0xfe, 0x18, 0x6f, 0x91, 0x64, 0x1d, 0x27, 0x4b, 0x86, 0x5e,
+	0x92, 0x18, 0x6b, 0x65, 0x27, 0x13, 0xa1, 0xb0, 0x0e, 0x59, 0x92, 0x99, 0xf1, 0x8c, 0x27, 0x24,
+	0x33, 0x93, 0x9e, 0xd9, 0x44, 0x5a, 0x45, 0xb2, 0x7a, 0xba, 0x2b, 0x4e, 0xef, 0xd8, 0xdd, 0xde,
+	0xee, 0x76, 0x66, 0x67, 0x57, 0x83, 0x80, 0x03, 0x1c, 0x90, 0xf6, 0xc2, 0x01, 0xf6, 0x02, 0x08,
+	0x0e, 0x48, 0x7b, 0x80, 0x0b, 0x12, 0x17, 0x84, 0xc4, 0x6d, 0x05, 0x47, 0x24, 0x84, 0xc4, 0x01,
+	0x0e, 0x9c, 0xb8, 0x21, 0xf1, 0x07, 0xa0, 0xae, 0xaa, 0x6e, 0x77, 0xb7, 0xbf, 0xda, 0x9e, 0x68,
+	0x6f, 0x5d, 0xcf, 0xaf, 0x5e, 0xbd, 0x8f, 0xdf, 0x7b, 0xf5, 0xea, 0xcd, 0x40, 0xa5, 0x63, 0x18,
+	0x9d, 0x2e, 0xa9, 0x3f, 0xd7, 0x4c, 0x62, 0xd9, 0x86, 0x49, 0xea, 0x2f, 0x6f, 0x1e, 0x12, 0x5b,
+	0xbe, 0x39, 0xa4, 0xd4, 0xfa, 0xa6, 0x61, 0x1b, 0xb8, 0xc4, 0x38, 0x6b, 0x43, 0x3a, 0xe7, 0x2c,
+	0x5f, 0xe6, 0x32, 0xe4, 0xbe, 0x56, 0x97, 0x75, 0xdd, 0xb0, 0x65, 0x5b, 0x33, 0x74, 0x8b, 0xed,
+	0x2b, 0x5f, 0x9d, 0x78, 0x82, 0x62, 0xf4, 0x7a, 0x86, 0xce, 0xd9, 0xae, 0x4f, 0x64, 0x53, 0x0d,
+	0x65, 0xd0, 0x23, 0xba, 0xcd, 0x19, 0xbf, 0x3a, 0x91, 0xf1, 0x83, 0x01, 0x31, 0x4f, 0x66, 0x72,
+	0x1d, 0x9b, 0x9a, 0xcd, 0x6d, 0x2a, 0x5f, 0xe2, 0x5c, 0x74, 0x75, 0x38, 0x78, 0x5e, 0x27, 0xbd,
+	0xbe, 0xed, 0x8a, 0xb8, 0x12, 0xfe, 0xd1, 0xd6, 0x7a, 0xc4, 0xb2, 0xe5, 0x5e, 0x9f, 0x33, 0xbc,
+	0xce, 0x19, 0xcc, 0xbe, 0x52, 0xb7, 0x6c, 0xd9, 0x1e, 0x70, 0x93, 0xc5, 0x7f, 0x20, 0xc0, 0x5b,
+	0xc4, 0xde, 0xe0, 0x8a, 0x4b, 0xe4, 0x83, 0x01, 0xb1, 0x6c, 0x8c, 0x21, 0xa1, 0xcb, 0x3d, 0x52,
+	0x42, 0x2b, 0xa8, 0x92, 0x91, 0xe8, 0x37, 0x6e, 0x40, 0xa2, 0x27, 0x5b, 0x47, 0x25, 0x61, 0x05,
+	0x55, 0xb2, 0xab, 0xd7, 0x6a, 0x93, 0x9c, 0x5c, 0x73, 0x85, 0x3d, 0x92, 0xad, 0x23, 0x89, 0xee,
+	0xc1, 0x22, 0x64, 0x6d, 0x53, 0xd6, 0x2d, 0x59, 0x71, 0xfc, 0x5d, 0x8a, 0xaf, 0xa0, 0x4a, 0xae,
+	0x15, 0x93, 0xfc, 0x44, 0xfc, 0x36, 0x64, 0x4c, 0x22, 0xab, 0x6d, 0x47, 0xf7, 0x52, 0x92, 0x1e,
+	0x52, 0x76, 0x0f, 0x71, 0x0d, 0xab, 0x1d, 0xb8, 0x86, 0xb5, 0x62, 0x52, 0xda, 0x61, 0x77, 0x08,
+	0x6b, 0x17, 0xe0, 0x9c, 0x62, 0xe8, 0x96, 0x66, 0xd9, 0x44, 0x57, 0x4e, 0xda, 0x16, 0xe9, 0x12,
+	0xc5, 0x36, 0x4c, 0xf1, 0xbb, 0x71, 0x38, 0xf7, 0x50, 0xb3, 0x3c, 0xf3, 0x2c, 0xd7, 0xbe, 0x0b,
+	0x90, 0xea, 0xcb, 0x26, 0xd1, 0x6d, 0x6e, 0x21, 0x5f, 0xe1, 0x37, 0x21, 0xaf, 0x18, 0x5d, 0x67,
+	0xb7, 0x66, 0xe8, 0x6d, 0x4d, 0xa5, 0xc6, 0x66, 0xa4, 0xdc, 0x90, 0xb8, 0xad, 0xe2, 0x4b, 0x90,
+	0xe9, 0xcb, 0x1d, 0xd2, 0xb6, 0xb4, 0x8f, 0x08, 0x35, 0x25, 0x29, 0xa5, 0x1d, 0xc2, 0xbe, 0xf6,
+	0x11, 0xc1, 0x6f, 0x00, 0xd0, 0x1f, 0x6d, 0xe3, 0x88, 0xe8, 0xa5, 0x04, 0xdd, 0x4e, 0xd9, 0x0f,
+	0x1c, 0x02, 0xbe, 0x08, 0x69, 0xc3, 0x54, 0x89, 0xd9, 0x3e, 0x3c, 0x29, 0xa5, 0xe8, 0x8f, 0x4b,
+	0x74, 0xbd, 0x76, 0xe2, 0xf9, 0x77, 0xe9, 0xec, 0xfe, 0x4d, 0xcf, 0xf4, 0x2f, 0xcc, 0xe3, 0x5f,
+	0xfc, 0x15, 0xc8, 0x59, 0x2f, 0x8c, 0xe3, 0x76, 0x4f, 0xb3, 0x2c, 0x4d, 0xef, 0x94, 0x72, 0x2b,
+	0xa8, 0x92, 0x96, 0xb2, 0x0e, 0xed, 0x11, 0x23, 0x4d, 0x0c, 0xc1, 0xf7, 0x10, 0x9c, 0x0f, 0x85,
+	0xc0, 0xea, 0x1b, 0xba, 0x45, 0xf0, 0x3d, 0xc8, 0xb8, 0xf9, 0x62, 0x95, 0xd0, 0x4a, 0xbc, 0x92,
+	0x5d, 0x15, 0x67, 0x1b, 0x2d, 0x0d, 0x37, 0xe1, 0x6b, 0xb0, 0xac, 0x93, 0x0f, 0xed, 0xb6, 0xcf,
+	0xe1, 0x2c, 0x5e, 0x79, 0x87, 0xbc, 0xe7, 0x3a, 0x5d, 0xfc, 0x2f, 0x82, 0xf3, 0xeb, 0x26, 0x91,
+	0x6d, 0x12, 0xc6, 0xf9, 0x99, 0x70, 0x70, 0x05, 0xb2, 0xae, 0x2e, 0x0e, 0x4b, 0x9c, 0xb2, 0x80,
+	0x4b, 0xda, 0x56, 0xf1, 0x3b, 0x90, 0x76, 0x57, 0x14, 0x09, 0xd1, 0x0c, 0xf4, 0xf6, 0x78, 0x88,
+	0x48, 0xce, 0x8f, 0x08, 0xf1, 0xb7, 0x02, 0x9c, 0x7f, 0xb7, 0xaf, 0x8e, 0xb1, 0xd9, 0xaf, 0x15,
+	0x5a, 0x40, 0xab, 0x2d, 0xc8, 0x0e, 0xa8, 0xe0, 0xf6, 0x02, 0xe5, 0x00, 0xd8, 0x56, 0xe7, 0xdb,
+	0x33, 0x2f, 0xbe, 0x00, 0xe0, 0x1f, 0x43, 0x51, 0x19, 0x98, 0x4e, 0xac, 0xda, 0x21, 0x17, 0x4f,
+	0x91, 0xb3, 0x67, 0x12, 0xc5, 0xd0, 0x55, 0xcd, 0x89, 0x9f, 0xb4, 0xcc, 0xf7, 0xbb, 0xc2, 0xc5,
+	0xef, 0xc0, 0xf9, 0x0d, 0xd2, 0x25, 0xa3, 0x0e, 0x1b, 0x57, 0x0c, 0xc7, 0x9d, 0x2f, 0x9c, 0xed,
+	0xfc, 0x7f, 0x09, 0x50, 0x5a, 0x93, 0x6d, 0xe5, 0x85, 0xaf, 0x1e, 0x7b, 0x05, 0xab, 0x0c, 0x69,
+	0x55, 0xb6, 0xe5, 0x43, 0xd9, 0x72, 0xf5, 0xf0, 0xd6, 0xf8, 0xb2, 0x3f, 0x91, 0x84, 0x95, 0xb8,
+	0x53, 0x71, 0x86, 0x49, 0x72, 0x16, 0x2f, 0x87, 0xca, 0x4a, 0x62, 0x5c, 0x59, 0x79, 0xea, 0x24,
+	0xe1, 0x71, 0xdb, 0xcf, 0xc7, 0xf0, 0xfa, 0xd6, 0xe4, 0xa3, 0x0e, 0x86, 0xcc, 0xbb, 0x7d, 0x7a,
+	0x03, 0xb7, 0x62, 0x52, 0x41, 0x27, 0xc7, 0x07, 0x93, 0xea, 0xd5, 0xd2, 0x2b, 0xb9, 0x0f, 0xfe,
+	0x8e, 0xe0, 0xe2, 0x18, 0x17, 0xf3, 0x82, 0xd4, 0x80, 0xe4, 0x73, 0x63, 0xa0, 0xab, 0xd1, 0xb3,
+	0xa2, 0x15, 0x93, 0xd8, 0x16, 0x5c, 0x86, 0x25, 0xb7, 0x38, 0xd2, 0x52, 0xd1, 0x8a, 0x49, 0x2e,
+	0x01, 0xaf, 0x8c, 0xb9, 0xfc, 0x82, 0x3e, 0xbc, 0xed, 0x37, 0x35, 0x31, 0xcb, 0x54, 0x9f, 0xa1,
+	0x69, 0x48, 0x99, 0xc4, 0x1a, 0x74, 0x6d, 0xf1, 0x14, 0x5e, 0x5f, 0x23, 0x1d, 0x4d, 0xf7, 0x79,
+	0x30, 0x0a, 0x76, 0x36, 0x61, 0xc9, 0x60, 0x11, 0xe0, 0xf0, 0x9d, 0x2b, 0x6a, 0x92, 0xbb, 0x59,
+	0xfc, 0x26, 0x94, 0x46, 0x8f, 0xe7, 0x7e, 0x0d, 0xd9, 0x8f, 0x46, 0xec, 0x17, 0x7f, 0x80, 0x20,
+	0xbf, 0x6e, 0xf4, 0x7a, 0x9a, 0x1d, 0x45, 0xe7, 0xdb, 0x90, 0xa2, 0x9d, 0x11, 0x03, 0x7b, 0x76,
+	0xf5, 0xca, 0x64, 0x95, 0x9f, 0x3a, 0x7c, 0x12, 0x67, 0x9f, 0x1d, 0x08, 0xf1, 0x53, 0x04, 0x05,
+	0x57, 0x11, 0xae, 0xfd, 0x03, 0xc8, 0xd3, 0xed, 0x6d, 0xe6, 0x68, 0xf7, 0xaa, 0xba, 0x3a, 0xeb,
+	0x50, 0xca, 0x2d, 0xe5, 0x8e, 0x87, 0x0b, 0x0b, 0xdf, 0x81, 0xac, 0x42, 0xa5, 0xb3, 0x48, 0x0b,
+	0x33, 0x23, 0x0d, 0x8c, 0xdd, 0x21, 0x88, 0xbb, 0xb0, 0x2c, 0x19, 0xdd, 0xee, 0xa1, 0xac, 0x1c,
+	0x45, 0xf1, 0x52, 0xc8, 0x58, 0x61, 0xd4, 0xd8, 0x7f, 0x0a, 0xb0, 0x2c, 0x0d, 0xf4, 0xc7, 0x4e,
+	0x2f, 0x3a, 0xeb, 0x42, 0x7c, 0x02, 0x45, 0xcb, 0x36, 0x07, 0x8a, 0x3d, 0x30, 0x89, 0xda, 0xa6,
+	0xed, 0x2b, 0x57, 0xff, 0x6b, 0x93, 0x1d, 0xb1, 0xef, 0xed, 0xa0, 0x67, 0xb4, 0x62, 0xd2, 0xb2,
+	0x15, 0x24, 0x85, 0x2b, 0x4c, 0x92, 0x56, 0x18, 0x34, 0xb3, 0xc2, 0xa4, 0x16, 0xa8, 0x30, 0xe8,
+	0xac, 0x15, 0x06, 0xf9, 0x12, 0x2f, 0x07, 0x40, 0x9d, 0xd0, 0xb6, 0x4f, 0xfa, 0x93, 0xeb, 0xcd,
+	0xdf, 0x10, 0x14, 0x87, 0x1e, 0x1e, 0x9f, 0x0e, 0xa3, 0x81, 0x39, 0xf3, 0x0d, 0x1d, 0x28, 0x27,
+	0xf1, 0xe8, 0xe5, 0x04, 0x5f, 0x87, 0x65, 0xeb, 0x48, 0xeb, 0xf7, 0x89, 0xea, 0xa1, 0x3d, 0x41,
+	0xfb, 0xdb, 0x02, 0x27, 0x73, 0x20, 0x8b, 0x9f, 0x09, 0x90, 0xe3, 0x30, 0x9f, 0x8d, 0xc4, 0x4b,
+	0x90, 0xb1, 0x6c, 0x93, 0xc8, 0xbd, 0x61, 0x23, 0x95, 0x66, 0x84, 0x6d, 0xd5, 0x97, 0xcc, 0xf1,
+	0xf9, 0x92, 0xd9, 0xe9, 0x49, 0x99, 0xd4, 0x61, 0xab, 0x9d, 0x93, 0xb2, 0x8c, 0xc6, 0x9a, 0xed,
+	0x07, 0x90, 0xea, 0xca, 0x87, 0xa4, 0x6b, 0x95, 0x92, 0x54, 0xf6, 0xea, 0xcc, 0x9c, 0xa5, 0xc6,
+	0xd4, 0x1e, 0xd2, 0x4d, 0x4d, 0xdd, 0x36, 0x4f, 0x24, 0x2e, 0xa1, 0xfc, 0x36, 0x64, 0x7d, 0x64,
+	0x5c, 0x84, 0xf8, 0x11, 0x39, 0xe1, 0xa6, 0x3a, 0x9f, 0xf8, 0x1c, 0x24, 0x5f, 0xca, 0xdd, 0x01,
+	0xe1, 0x16, 0xb2, 0x45, 0x43, 0xf8, 0x06, 0x72, 0x6e, 0x9d, 0xbc, 0x5b, 0x13, 0x18, 0x04, 0x02,
+	0x1e, 0x41, 0x21, 0x8f, 0x84, 0x0d, 0x13, 0xc6, 0x19, 0x16, 0xaa, 0x49, 0xf1, 0x57, 0x56, 0x93,
+	0x12, 0x73, 0xd5, 0xa4, 0xdf, 0x08, 0x90, 0x7f, 0x48, 0x61, 0x1f, 0x05, 0x08, 0xf7, 0x01, 0x64,
+	0x55, 0x6d, 0xdb, 0xb2, 0xd9, 0x21, 0x6e, 0xbb, 0xb4, 0x32, 0x25, 0x87, 0x29, 0x5f, 0x2b, 0x26,
+	0x65, 0x64, 0x55, 0x65, 0x0b, 0x7c, 0x15, 0xf2, 0x26, 0xe9, 0x19, 0x2f, 0x89, 0x2b, 0x85, 0xbe,
+	0xbf, 0x5a, 0x31, 0x29, 0xc7, 0xc8, 0x9c, 0xed, 0xdb, 0x5e, 0xe4, 0x13, 0xd4, 0x33, 0xb7, 0x26,
+	0x9f, 0x12, 0x50, 0xff, 0x15, 0x87, 0x7e, 0x6d, 0x19, 0xf2, 0x4c, 0xcf, 0xb6, 0xf2, 0x42, 0xd6,
+	0x3b, 0x44, 0xfc, 0x5d, 0x1c, 0x0a, 0xee, 0x89, 0x1c, 0x0c, 0x8f, 0x42, 0x3c, 0xb3, 0xfb, 0x48,
+	0x66, 0xe4, 0x3a, 0xe5, 0x76, 0x4c, 0xb7, 0x7d, 0x6b, 0xbc, 0x0f, 0xcb, 0xde, 0xab, 0x84, 0x0b,
+	0x64, 0x25, 0xa0, 0x32, 0xbb, 0x86, 0x78, 0x22, 0x0b, 0x6a, 0x80, 0x12, 0x10, 0xaa, 0xd2, 0x26,
+	0x99, 0x03, 0x25, 0x82, 0x50, 0xd6, 0x54, 0xfb, 0x85, 0x32, 0x4a, 0x40, 0x28, 0x8b, 0x1e, 0xaf,
+	0xeb, 0x11, 0x84, 0x4a, 0x94, 0xdf, 0x2f, 0x94, 0x51, 0xf0, 0x3a, 0xa4, 0x9e, 0x6b, 0x5d, 0x9b,
+	0x98, 0xbc, 0x0b, 0x9d, 0x72, 0x3d, 0x35, 0x3f, 0x64, 0x05, 0x9b, 0x6c, 0xd2, 0x0d, 0xad, 0x98,
+	0xc4, 0xb7, 0x3a, 0x61, 0x33, 0x79, 0x78, 0x68, 0x81, 0x17, 0x3f, 0x49, 0x40, 0x8a, 0x43, 0x6b,
+	0x03, 0x92, 0xfe, 0xeb, 0xef, 0xad, 0x59, 0x61, 0xaa, 0xd1, 0xea, 0xef, 0x61, 0x99, 0x6d, 0xc6,
+	0x7b, 0xfe, 0x9e, 0x9d, 0xc5, 0xe7, 0xc6, 0x4c, 0x49, 0x5e, 0xcb, 0x3a, 0xcc, 0x8c, 0x61, 0x9f,
+	0xff, 0x26, 0xe4, 0x9c, 0x6a, 0xd0, 0xf3, 0x8f, 0x1e, 0xe8, 0x55, 0xca, 0xa8, 0xac, 0x70, 0x04,
+	0x6e, 0xbc, 0xec, 0x3c, 0x37, 0x9e, 0x53, 0xb3, 0x38, 0x4c, 0x35, 0x95, 0xfa, 0x36, 0x29, 0xa5,
+	0x19, 0x61, 0x5b, 0x75, 0x9e, 0x48, 0x86, 0xae, 0xb0, 0xf8, 0xa5, 0x25, 0xfa, 0x5d, 0xae, 0xc3,
+	0x72, 0x48, 0xe1, 0xe9, 0x2f, 0x95, 0xf2, 0x8f, 0x10, 0x64, 0x7d, 0xce, 0xfa, 0xa2, 0x7b, 0x91,
+	0xd0, 0x9d, 0x9e, 0x87, 0x2c, 0xb7, 0xd7, 0x5d, 0xba, 0xee, 0x75, 0x00, 0xf1, 0x1f, 0x01, 0x72,
+	0xfe, 0x34, 0xc4, 0x04, 0x70, 0x20, 0x8b, 0x29, 0x1b, 0x55, 0xbc, 0xb0, 0x7a, 0x3b, 0x5a, 0x2a,
+	0x07, 0x16, 0x07, 0x27, 0x7d, 0x22, 0x15, 0xed, 0x10, 0x05, 0xbf, 0x01, 0xe0, 0x45, 0x81, 0xb9,
+	0x30, 0x29, 0x65, 0xdc, 0x30, 0x58, 0xb8, 0x02, 0x49, 0x45, 0x1e, 0x58, 0x6e, 0xca, 0x63, 0xf7,
+	0x60, 0xb3, 0xaf, 0xd4, 0xf6, 0xe9, 0xdc, 0x4f, 0x62, 0x0c, 0xce, 0x2d, 0x33, 0x0a, 0x97, 0x20,
+	0x58, 0x02, 0x6d, 0x44, 0x2a, 0x7a, 0x1b, 0x21, 0xee, 0x40, 0x31, 0x6c, 0x0a, 0xce, 0x43, 0x66,
+	0x67, 0xb7, 0xbd, 0xde, 0xba, 0xbf, 0xb3, 0xd5, 0x2c, 0xc6, 0xf0, 0x12, 0xc4, 0xef, 0x6f, 0x6c,
+	0x14, 0x11, 0x06, 0x48, 0x49, 0xcd, 0x47, 0xbb, 0x4f, 0x9a, 0x45, 0x01, 0x67, 0x61, 0x69, 0xfd,
+	0x5d, 0x49, 0x6a, 0xee, 0x1c, 0x14, 0xe3, 0x38, 0x03, 0x49, 0xa9, 0xb9, 0xdf, 0x3c, 0x28, 0x26,
+	0x44, 0x1d, 0x4a, 0x4e, 0xcd, 0x5c, 0xf7, 0x0d, 0x5f, 0x66, 0x4e, 0xf2, 0x02, 0x43, 0x3a, 0x61,
+	0xea, 0x90, 0x2e, 0x1e, 0x1a, 0xd2, 0x89, 0xef, 0xc3, 0xc5, 0x31, 0xe7, 0xf1, 0x72, 0x7d, 0x15,
+	0x0a, 0x81, 0xd1, 0x10, 0x7b, 0x10, 0x64, 0xa4, 0xbc, 0x7f, 0x36, 0x14, 0x79, 0x36, 0xb5, 0xfa,
+	0xf9, 0x97, 0x20, 0xb3, 0xe9, 0xc2, 0x02, 0xff, 0x0c, 0x41, 0xd6, 0xf7, 0x36, 0xc5, 0x53, 0xaa,
+	0xcb, 0xe8, 0xd4, 0xb6, 0x1c, 0xa1, 0x4b, 0x14, 0xef, 0x7e, 0xff, 0xaf, 0xff, 0xfe, 0xb1, 0x70,
+	0x1b, 0x7f, 0xdd, 0x9b, 0x32, 0x7f, 0xac, 0xcb, 0x3d, 0x72, 0xb7, 0x6f, 0x1a, 0xef, 0x13, 0xc5,
+	0xb6, 0xea, 0xd5, 0xba, 0x7b, 0x5f, 0xd3, 0x6f, 0x37, 0x3b, 0xeb, 0xd5, 0x7a, 0xb5, 0x7a, 0x8a,
+	0xff, 0x84, 0xd8, 0x85, 0xef, 0x65, 0x36, 0xae, 0x4d, 0xbf, 0x5a, 0xc3, 0x93, 0x8c, 0x72, 0x3d,
+	0x32, 0x3f, 0x73, 0xb8, 0xb8, 0x4b, 0x35, 0xde, 0xc6, 0x5b, 0x43, 0x8d, 0x59, 0x8c, 0x23, 0xea,
+	0x5c, 0xff, 0x38, 0x10, 0xaf, 0x53, 0xfc, 0x47, 0xe7, 0x91, 0x17, 0x18, 0x07, 0xe2, 0x29, 0x4a,
+	0x8d, 0x1d, 0x1c, 0x46, 0x72, 0xf5, 0x53, 0xaa, 0xf8, 0x63, 0xb1, 0xb9, 0x80, 0xe2, 0xa3, 0x6a,
+	0x37, 0x86, 0xfd, 0xfd, 0xef, 0x11, 0x14, 0x82, 0xb3, 0xbd, 0x69, 0x06, 0x8c, 0x9d, 0x02, 0x46,
+	0x32, 0x60, 0x8f, 0x1a, 0xf0, 0x60, 0xf5, 0x9d, 0xa1, 0x01, 0xde, 0x5f, 0x38, 0xe6, 0x00, 0x8d,
+	0x4f, 0xf3, 0x9f, 0x22, 0x28, 0x04, 0x87, 0x6c, 0xd3, 0x34, 0x1f, 0x3b, 0x8e, 0x2b, 0x5f, 0x18,
+	0xa9, 0x41, 0xcd, 0x5e, 0xdf, 0x3e, 0x71, 0x91, 0x5d, 0x5d, 0x10, 0xd9, 0x9f, 0x23, 0x78, 0x6d,
+	0x64, 0x36, 0x84, 0xa7, 0x3c, 0x19, 0x26, 0xcd, 0xea, 0xca, 0xb7, 0xe6, 0xda, 0xc3, 0x51, 0xde,
+	0xa2, 0xda, 0xaf, 0x89, 0x77, 0x7d, 0xbe, 0xe6, 0xda, 0x4e, 0xb0, 0xe0, 0x74, 0x68, 0x42, 0xe3,
+	0x90, 0xcb, 0x6d, 0xa0, 0xea, 0x0d, 0x84, 0xff, 0x82, 0xa0, 0x18, 0x9e, 0xc6, 0xe0, 0x9b, 0x53,
+	0xb4, 0x1a, 0x3f, 0x38, 0x2a, 0xaf, 0xce, 0xb3, 0x85, 0xdb, 0xc1, 0x31, 0xe3, 0x07, 0xfd, 0x3c,
+	0x76, 0x84, 0xc4, 0x36, 0x50, 0x15, 0xff, 0x0a, 0x41, 0x8a, 0xcd, 0x64, 0xf0, 0xf5, 0x29, 0x69,
+	0xea, 0x1f, 0x1f, 0x95, 0x2b, 0xb3, 0x19, 0xb9, 0xbe, 0x9b, 0x54, 0xdf, 0x7b, 0xe2, 0x9d, 0x85,
+	0xf4, 0x65, 0x4f, 0x21, 0x47, 0xcb, 0x9f, 0x20, 0x48, 0xbb, 0xe3, 0x19, 0x3c, 0xa5, 0x0f, 0x09,
+	0x8d, 0x70, 0x26, 0xa2, 0xf9, 0x6c, 0x78, 0x30, 0xf9, 0x29, 0x8e, 0x66, 0xff, 0x73, 0x34, 0xe3,
+	0x43, 0x88, 0xa9, 0x9a, 0x05, 0x47, 0x41, 0xe5, 0x6a, 0x14, 0x56, 0xee, 0xc5, 0x4f, 0x10, 0x55,
+	0xf7, 0x87, 0xc8, 0xef, 0xc7, 0x88, 0xc5, 0xee, 0xb4, 0x61, 0x72, 0x71, 0x0d, 0x54, 0x7d, 0xaf,
+	0x29, 0xde, 0x5b, 0xb0, 0xce, 0xfb, 0xc5, 0xdc, 0x40, 0x0e, 0x6c, 0x92, 0xf4, 0xd5, 0x8b, 0xaf,
+	0x45, 0x7b, 0xf6, 0x97, 0xaf, 0xcf, 0x7e, 0x3e, 0x33, 0x6b, 0x9b, 0xd4, 0xd8, 0x6f, 0x89, 0x8d,
+	0x85, 0x62, 0x43, 0x5f, 0xdf, 0x0d, 0x54, 0xad, 0xa0, 0x1b, 0x08, 0xff, 0x1a, 0x41, 0x8a, 0xbd,
+	0x07, 0xa7, 0x81, 0x3b, 0xf0, 0x46, 0x9d, 0x06, 0xee, 0xe0, 0xd3, 0xf2, 0x8c, 0xe0, 0xee, 0x52,
+	0x61, 0xae, 0xa6, 0x3f, 0x17, 0xe0, 0xb5, 0x91, 0xae, 0x68, 0x5a, 0x7d, 0x9c, 0xd4, 0xb2, 0x95,
+	0x6f, 0xcd, 0xb5, 0x87, 0x9b, 0xf2, 0x0b, 0x86, 0xb0, 0x4f, 0x91, 0xb8, 0xb1, 0x00, 0xc2, 0xba,
+	0x61, 0xb9, 0x0e, 0xd4, 0x76, 0xc4, 0xed, 0x45, 0xa1, 0x36, 0x4e, 0xde, 0xda, 0x1f, 0x10, 0x5c,
+	0x56, 0x8c, 0xde, 0x44, 0xeb, 0xd6, 0x0a, 0x5e, 0xa3, 0xb7, 0xe7, 0x24, 0xfb, 0x1e, 0x7a, 0xef,
+	0x3e, 0xe7, 0xed, 0x18, 0x5d, 0x59, 0xef, 0xd4, 0x0c, 0xb3, 0x53, 0xef, 0x10, 0x9d, 0x96, 0x82,
+	0x3a, 0xfb, 0x49, 0xee, 0x6b, 0xd6, 0xe8, 0xbf, 0x06, 0xdc, 0xf1, 0x28, 0xbf, 0x14, 0x12, 0x5b,
+	0xeb, 0x9b, 0xfb, 0x9f, 0x09, 0x5f, 0xde, 0x62, 0xa2, 0xd6, 0xbb, 0xc6, 0x40, 0xad, 0x79, 0x27,
+	0xd5, 0x9e, 0xdc, 0x5c, 0x73, 0x76, 0xfc, 0xd9, 0x65, 0x78, 0x46, 0x19, 0x9e, 0x79, 0x0c, 0xcf,
+	0x9e, 0x30, 0x91, 0x87, 0x29, 0x7a, 0xec, 0xad, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x53, 0x38,
+	0xf0, 0x00, 0x68, 0x21, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3574,150 +3033,3 @@ var _Firestore_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/firestore/v1beta1/firestore.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/firestore/v1beta1/firestore.proto", fileDescriptor_firestore_d225c1066b9de1b1)
-}
-
-var fileDescriptor_firestore_d225c1066b9de1b1 = []byte{
-	// 2214 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5a, 0xcd, 0x8f, 0x1b, 0x49,
-	0x15, 0x77, 0xb5, 0x3f, 0xc6, 0x7e, 0xfe, 0x18, 0x6f, 0x91, 0x64, 0x1d, 0x27, 0x4b, 0x86, 0x5e,
-	0x92, 0x18, 0x6b, 0x65, 0x27, 0x13, 0xa1, 0xb0, 0x0e, 0x59, 0x92, 0x99, 0xf1, 0x8c, 0x27, 0x24,
-	0x33, 0x93, 0x9e, 0xd9, 0x44, 0x5a, 0x45, 0xb2, 0x7a, 0xba, 0x2b, 0x4e, 0xef, 0xd8, 0xdd, 0xde,
-	0xee, 0x76, 0x66, 0x67, 0x57, 0x83, 0x80, 0x03, 0x1c, 0x90, 0xf6, 0xc2, 0x01, 0xf6, 0x02, 0x08,
-	0x0e, 0x48, 0x7b, 0x80, 0x0b, 0x12, 0x17, 0x84, 0xc4, 0x6d, 0x05, 0x47, 0x24, 0x84, 0xc4, 0x01,
-	0x0e, 0x9c, 0xb8, 0x21, 0xf1, 0x07, 0xa0, 0xae, 0xaa, 0x6e, 0x77, 0xb7, 0xbf, 0xda, 0x9e, 0x68,
-	0x6f, 0x5d, 0xcf, 0xaf, 0x5e, 0xbd, 0x8f, 0xdf, 0x7b, 0xf5, 0xea, 0xcd, 0x40, 0xa5, 0x63, 0x18,
-	0x9d, 0x2e, 0xa9, 0x3f, 0xd7, 0x4c, 0x62, 0xd9, 0x86, 0x49, 0xea, 0x2f, 0x6f, 0x1e, 0x12, 0x5b,
-	0xbe, 0x39, 0xa4, 0xd4, 0xfa, 0xa6, 0x61, 0x1b, 0xb8, 0xc4, 0x38, 0x6b, 0x43, 0x3a, 0xe7, 0x2c,
-	0x5f, 0xe6, 0x32, 0xe4, 0xbe, 0x56, 0x97, 0x75, 0xdd, 0xb0, 0x65, 0x5b, 0x33, 0x74, 0x8b, 0xed,
-	0x2b, 0x5f, 0x9d, 0x78, 0x82, 0x62, 0xf4, 0x7a, 0x86, 0xce, 0xd9, 0xae, 0x4f, 0x64, 0x53, 0x0d,
-	0x65, 0xd0, 0x23, 0xba, 0xcd, 0x19, 0xbf, 0x3a, 0x91, 0xf1, 0x83, 0x01, 0x31, 0x4f, 0x66, 0x72,
-	0x1d, 0x9b, 0x9a, 0xcd, 0x6d, 0x2a, 0x5f, 0xe2, 0x5c, 0x74, 0x75, 0x38, 0x78, 0x5e, 0x27, 0xbd,
-	0xbe, 0xed, 0x8a, 0xb8, 0x12, 0xfe, 0xd1, 0xd6, 0x7a, 0xc4, 0xb2, 0xe5, 0x5e, 0x9f, 0x33, 0xbc,
-	0xce, 0x19, 0xcc, 0xbe, 0x52, 0xb7, 0x6c, 0xd9, 0x1e, 0x70, 0x93, 0xc5, 0x7f, 0x20, 0xc0, 0x5b,
-	0xc4, 0xde, 0xe0, 0x8a, 0x4b, 0xe4, 0x83, 0x01, 0xb1, 0x6c, 0x8c, 0x21, 0xa1, 0xcb, 0x3d, 0x52,
-	0x42, 0x2b, 0xa8, 0x92, 0x91, 0xe8, 0x37, 0x6e, 0x40, 0xa2, 0x27, 0x5b, 0x47, 0x25, 0x61, 0x05,
-	0x55, 0xb2, 0xab, 0xd7, 0x6a, 0x93, 0x9c, 0x5c, 0x73, 0x85, 0x3d, 0x92, 0xad, 0x23, 0x89, 0xee,
-	0xc1, 0x22, 0x64, 0x6d, 0x53, 0xd6, 0x2d, 0x59, 0x71, 0xfc, 0x5d, 0x8a, 0xaf, 0xa0, 0x4a, 0xae,
-	0x15, 0x93, 0xfc, 0x44, 0xfc, 0x36, 0x64, 0x4c, 0x22, 0xab, 0x6d, 0x47, 0xf7, 0x52, 0x92, 0x1e,
-	0x52, 0x76, 0x0f, 0x71, 0x0d, 0xab, 0x1d, 0xb8, 0x86, 0xb5, 0x62, 0x52, 0xda, 0x61, 0x77, 0x08,
-	0x6b, 0x17, 0xe0, 0x9c, 0x62, 0xe8, 0x96, 0x66, 0xd9, 0x44, 0x57, 0x4e, 0xda, 0x16, 0xe9, 0x12,
-	0xc5, 0x36, 0x4c, 0xf1, 0xbb, 0x71, 0x38, 0xf7, 0x50, 0xb3, 0x3c, 0xf3, 0x2c, 0xd7, 0xbe, 0x0b,
-	0x90, 0xea, 0xcb, 0x26, 0xd1, 0x6d, 0x6e, 0x21, 0x5f, 0xe1, 0x37, 0x21, 0xaf, 0x18, 0x5d, 0x67,
-	0xb7, 0x66, 0xe8, 0x6d, 0x4d, 0xa5, 0xc6, 0x66, 0xa4, 0xdc, 0x90, 0xb8, 0xad, 0xe2, 0x4b, 0x90,
-	0xe9, 0xcb, 0x1d, 0xd2, 0xb6, 0xb4, 0x8f, 0x08, 0x35, 0x25, 0x29, 0xa5, 0x1d, 0xc2, 0xbe, 0xf6,
-	0x11, 0xc1, 0x6f, 0x00, 0xd0, 0x1f, 0x6d, 0xe3, 0x88, 0xe8, 0xa5, 0x04, 0xdd, 0x4e, 0xd9, 0x0f,
-	0x1c, 0x02, 0xbe, 0x08, 0x69, 0xc3, 0x54, 0x89, 0xd9, 0x3e, 0x3c, 0x29, 0xa5, 0xe8, 0x8f, 0x4b,
-	0x74, 0xbd, 0x76, 0xe2, 0xf9, 0x77, 0xe9, 0xec, 0xfe, 0x4d, 0xcf, 0xf4, 0x2f, 0xcc, 0xe3, 0x5f,
-	0xfc, 0x15, 0xc8, 0x59, 0x2f, 0x8c, 0xe3, 0x76, 0x4f, 0xb3, 0x2c, 0x4d, 0xef, 0x94, 0x72, 0x2b,
-	0xa8, 0x92, 0x96, 0xb2, 0x0e, 0xed, 0x11, 0x23, 0x4d, 0x0c, 0xc1, 0xf7, 0x10, 0x9c, 0x0f, 0x85,
-	0xc0, 0xea, 0x1b, 0xba, 0x45, 0xf0, 0x3d, 0xc8, 0xb8, 0xf9, 0x62, 0x95, 0xd0, 0x4a, 0xbc, 0x92,
-	0x5d, 0x15, 0x67, 0x1b, 0x2d, 0x0d, 0x37, 0xe1, 0x6b, 0xb0, 0xac, 0x93, 0x0f, 0xed, 0xb6, 0xcf,
-	0xe1, 0x2c, 0x5e, 0x79, 0x87, 0xbc, 0xe7, 0x3a, 0x5d, 0xfc, 0x2f, 0x82, 0xf3, 0xeb, 0x26, 0x91,
-	0x6d, 0x12, 0xc6, 0xf9, 0x99, 0x70, 0x70, 0x05, 0xb2, 0xae, 0x2e, 0x0e, 0x4b, 0x9c, 0xb2, 0x80,
-	0x4b, 0xda, 0x56, 0xf1, 0x3b, 0x90, 0x76, 0x57, 0x14, 0x09, 0xd1, 0x0c, 0xf4, 0xf6, 0x78, 0x88,
-	0x48, 0xce, 0x8f, 0x08, 0xf1, 0xb7, 0x02, 0x9c, 0x7f, 0xb7, 0xaf, 0x8e, 0xb1, 0xd9, 0xaf, 0x15,
-	0x5a, 0x40, 0xab, 0x2d, 0xc8, 0x0e, 0xa8, 0xe0, 0xf6, 0x02, 0xe5, 0x00, 0xd8, 0x56, 0xe7, 0xdb,
-	0x33, 0x2f, 0xbe, 0x00, 0xe0, 0x1f, 0x43, 0x51, 0x19, 0x98, 0x4e, 0xac, 0xda, 0x21, 0x17, 0x4f,
-	0x91, 0xb3, 0x67, 0x12, 0xc5, 0xd0, 0x55, 0xcd, 0x89, 0x9f, 0xb4, 0xcc, 0xf7, 0xbb, 0xc2, 0xc5,
-	0xef, 0xc0, 0xf9, 0x0d, 0xd2, 0x25, 0xa3, 0x0e, 0x1b, 0x57, 0x0c, 0xc7, 0x9d, 0x2f, 0x9c, 0xed,
-	0xfc, 0x7f, 0x09, 0x50, 0x5a, 0x93, 0x6d, 0xe5, 0x85, 0xaf, 0x1e, 0x7b, 0x05, 0xab, 0x0c, 0x69,
-	0x55, 0xb6, 0xe5, 0x43, 0xd9, 0x72, 0xf5, 0xf0, 0xd6, 0xf8, 0xb2, 0x3f, 0x91, 0x84, 0x95, 0xb8,
-	0x53, 0x71, 0x86, 0x49, 0x72, 0x16, 0x2f, 0x87, 0xca, 0x4a, 0x62, 0x5c, 0x59, 0x79, 0xea, 0x24,
-	0xe1, 0x71, 0xdb, 0xcf, 0xc7, 0xf0, 0xfa, 0xd6, 0xe4, 0xa3, 0x0e, 0x86, 0xcc, 0xbb, 0x7d, 0x7a,
-	0x03, 0xb7, 0x62, 0x52, 0x41, 0x27, 0xc7, 0x07, 0x93, 0xea, 0xd5, 0xd2, 0x2b, 0xb9, 0x0f, 0xfe,
-	0x8e, 0xe0, 0xe2, 0x18, 0x17, 0xf3, 0x82, 0xd4, 0x80, 0xe4, 0x73, 0x63, 0xa0, 0xab, 0xd1, 0xb3,
-	0xa2, 0x15, 0x93, 0xd8, 0x16, 0x5c, 0x86, 0x25, 0xb7, 0x38, 0xd2, 0x52, 0xd1, 0x8a, 0x49, 0x2e,
-	0x01, 0xaf, 0x8c, 0xb9, 0xfc, 0x82, 0x3e, 0xbc, 0xed, 0x37, 0x35, 0x31, 0xcb, 0x54, 0x9f, 0xa1,
-	0x69, 0x48, 0x99, 0xc4, 0x1a, 0x74, 0x6d, 0xf1, 0x14, 0x5e, 0x5f, 0x23, 0x1d, 0x4d, 0xf7, 0x79,
-	0x30, 0x0a, 0x76, 0x36, 0x61, 0xc9, 0x60, 0x11, 0xe0, 0xf0, 0x9d, 0x2b, 0x6a, 0x92, 0xbb, 0x59,
-	0xfc, 0x26, 0x94, 0x46, 0x8f, 0xe7, 0x7e, 0x0d, 0xd9, 0x8f, 0x46, 0xec, 0x17, 0x7f, 0x80, 0x20,
-	0xbf, 0x6e, 0xf4, 0x7a, 0x9a, 0x1d, 0x45, 0xe7, 0xdb, 0x90, 0xa2, 0x9d, 0x11, 0x03, 0x7b, 0x76,
-	0xf5, 0xca, 0x64, 0x95, 0x9f, 0x3a, 0x7c, 0x12, 0x67, 0x9f, 0x1d, 0x08, 0xf1, 0x53, 0x04, 0x05,
-	0x57, 0x11, 0xae, 0xfd, 0x03, 0xc8, 0xd3, 0xed, 0x6d, 0xe6, 0x68, 0xf7, 0xaa, 0xba, 0x3a, 0xeb,
-	0x50, 0xca, 0x2d, 0xe5, 0x8e, 0x87, 0x0b, 0x0b, 0xdf, 0x81, 0xac, 0x42, 0xa5, 0xb3, 0x48, 0x0b,
-	0x33, 0x23, 0x0d, 0x8c, 0xdd, 0x21, 0x88, 0xbb, 0xb0, 0x2c, 0x19, 0xdd, 0xee, 0xa1, 0xac, 0x1c,
-	0x45, 0xf1, 0x52, 0xc8, 0x58, 0x61, 0xd4, 0xd8, 0x7f, 0x0a, 0xb0, 0x2c, 0x0d, 0xf4, 0xc7, 0x4e,
-	0x2f, 0x3a, 0xeb, 0x42, 0x7c, 0x02, 0x45, 0xcb, 0x36, 0x07, 0x8a, 0x3d, 0x30, 0x89, 0xda, 0xa6,
-	0xed, 0x2b, 0x57, 0xff, 0x6b, 0x93, 0x1d, 0xb1, 0xef, 0xed, 0xa0, 0x67, 0xb4, 0x62, 0xd2, 0xb2,
-	0x15, 0x24, 0x85, 0x2b, 0x4c, 0x92, 0x56, 0x18, 0x34, 0xb3, 0xc2, 0xa4, 0x16, 0xa8, 0x30, 0xe8,
-	0xac, 0x15, 0x06, 0xf9, 0x12, 0x2f, 0x07, 0x40, 0x9d, 0xd0, 0xb6, 0x4f, 0xfa, 0x93, 0xeb, 0xcd,
-	0xdf, 0x10, 0x14, 0x87, 0x1e, 0x1e, 0x9f, 0x0e, 0xa3, 0x81, 0x39, 0xf3, 0x0d, 0x1d, 0x28, 0x27,
-	0xf1, 0xe8, 0xe5, 0x04, 0x5f, 0x87, 0x65, 0xeb, 0x48, 0xeb, 0xf7, 0x89, 0xea, 0xa1, 0x3d, 0x41,
-	0xfb, 0xdb, 0x02, 0x27, 0x73, 0x20, 0x8b, 0x9f, 0x09, 0x90, 0xe3, 0x30, 0x9f, 0x8d, 0xc4, 0x4b,
-	0x90, 0xb1, 0x6c, 0x93, 0xc8, 0xbd, 0x61, 0x23, 0x95, 0x66, 0x84, 0x6d, 0xd5, 0x97, 0xcc, 0xf1,
-	0xf9, 0x92, 0xd9, 0xe9, 0x49, 0x99, 0xd4, 0x61, 0xab, 0x9d, 0x93, 0xb2, 0x8c, 0xc6, 0x9a, 0xed,
-	0x07, 0x90, 0xea, 0xca, 0x87, 0xa4, 0x6b, 0x95, 0x92, 0x54, 0xf6, 0xea, 0xcc, 0x9c, 0xa5, 0xc6,
-	0xd4, 0x1e, 0xd2, 0x4d, 0x4d, 0xdd, 0x36, 0x4f, 0x24, 0x2e, 0xa1, 0xfc, 0x36, 0x64, 0x7d, 0x64,
-	0x5c, 0x84, 0xf8, 0x11, 0x39, 0xe1, 0xa6, 0x3a, 0x9f, 0xf8, 0x1c, 0x24, 0x5f, 0xca, 0xdd, 0x01,
-	0xe1, 0x16, 0xb2, 0x45, 0x43, 0xf8, 0x06, 0x72, 0x6e, 0x9d, 0xbc, 0x5b, 0x13, 0x18, 0x04, 0x02,
-	0x1e, 0x41, 0x21, 0x8f, 0x84, 0x0d, 0x13, 0xc6, 0x19, 0x16, 0xaa, 0x49, 0xf1, 0x57, 0x56, 0x93,
-	0x12, 0x73, 0xd5, 0xa4, 0xdf, 0x08, 0x90, 0x7f, 0x48, 0x61, 0x1f, 0x05, 0x08, 0xf7, 0x01, 0x64,
-	0x55, 0x6d, 0xdb, 0xb2, 0xd9, 0x21, 0x6e, 0xbb, 0xb4, 0x32, 0x25, 0x87, 0x29, 0x5f, 0x2b, 0x26,
-	0x65, 0x64, 0x55, 0x65, 0x0b, 0x7c, 0x15, 0xf2, 0x26, 0xe9, 0x19, 0x2f, 0x89, 0x2b, 0x85, 0xbe,
-	0xbf, 0x5a, 0x31, 0x29, 0xc7, 0xc8, 0x9c, 0xed, 0xdb, 0x5e, 0xe4, 0x13, 0xd4, 0x33, 0xb7, 0x26,
-	0x9f, 0x12, 0x50, 0xff, 0x15, 0x87, 0x7e, 0x6d, 0x19, 0xf2, 0x4c, 0xcf, 0xb6, 0xf2, 0x42, 0xd6,
-	0x3b, 0x44, 0xfc, 0x5d, 0x1c, 0x0a, 0xee, 0x89, 0x1c, 0x0c, 0x8f, 0x42, 0x3c, 0xb3, 0xfb, 0x48,
-	0x66, 0xe4, 0x3a, 0xe5, 0x76, 0x4c, 0xb7, 0x7d, 0x6b, 0xbc, 0x0f, 0xcb, 0xde, 0xab, 0x84, 0x0b,
-	0x64, 0x25, 0xa0, 0x32, 0xbb, 0x86, 0x78, 0x22, 0x0b, 0x6a, 0x80, 0x12, 0x10, 0xaa, 0xd2, 0x26,
-	0x99, 0x03, 0x25, 0x82, 0x50, 0xd6, 0x54, 0xfb, 0x85, 0x32, 0x4a, 0x40, 0x28, 0x8b, 0x1e, 0xaf,
-	0xeb, 0x11, 0x84, 0x4a, 0x94, 0xdf, 0x2f, 0x94, 0x51, 0xf0, 0x3a, 0xa4, 0x9e, 0x6b, 0x5d, 0x9b,
-	0x98, 0xbc, 0x0b, 0x9d, 0x72, 0x3d, 0x35, 0x3f, 0x64, 0x05, 0x9b, 0x6c, 0xd2, 0x0d, 0xad, 0x98,
-	0xc4, 0xb7, 0x3a, 0x61, 0x33, 0x79, 0x78, 0x68, 0x81, 0x17, 0x3f, 0x49, 0x40, 0x8a, 0x43, 0x6b,
-	0x03, 0x92, 0xfe, 0xeb, 0xef, 0xad, 0x59, 0x61, 0xaa, 0xd1, 0xea, 0xef, 0x61, 0x99, 0x6d, 0xc6,
-	0x7b, 0xfe, 0x9e, 0x9d, 0xc5, 0xe7, 0xc6, 0x4c, 0x49, 0x5e, 0xcb, 0x3a, 0xcc, 0x8c, 0x61, 0x9f,
-	0xff, 0x26, 0xe4, 0x9c, 0x6a, 0xd0, 0xf3, 0x8f, 0x1e, 0xe8, 0x55, 0xca, 0xa8, 0xac, 0x70, 0x04,
-	0x6e, 0xbc, 0xec, 0x3c, 0x37, 0x9e, 0x53, 0xb3, 0x38, 0x4c, 0x35, 0x95, 0xfa, 0x36, 0x29, 0xa5,
-	0x19, 0x61, 0x5b, 0x75, 0x9e, 0x48, 0x86, 0xae, 0xb0, 0xf8, 0xa5, 0x25, 0xfa, 0x5d, 0xae, 0xc3,
-	0x72, 0x48, 0xe1, 0xe9, 0x2f, 0x95, 0xf2, 0x8f, 0x10, 0x64, 0x7d, 0xce, 0xfa, 0xa2, 0x7b, 0x91,
-	0xd0, 0x9d, 0x9e, 0x87, 0x2c, 0xb7, 0xd7, 0x5d, 0xba, 0xee, 0x75, 0x00, 0xf1, 0x1f, 0x01, 0x72,
-	0xfe, 0x34, 0xc4, 0x04, 0x70, 0x20, 0x8b, 0x29, 0x1b, 0x55, 0xbc, 0xb0, 0x7a, 0x3b, 0x5a, 0x2a,
-	0x07, 0x16, 0x07, 0x27, 0x7d, 0x22, 0x15, 0xed, 0x10, 0x05, 0xbf, 0x01, 0xe0, 0x45, 0x81, 0xb9,
-	0x30, 0x29, 0x65, 0xdc, 0x30, 0x58, 0xb8, 0x02, 0x49, 0x45, 0x1e, 0x58, 0x6e, 0xca, 0x63, 0xf7,
-	0x60, 0xb3, 0xaf, 0xd4, 0xf6, 0xe9, 0xdc, 0x4f, 0x62, 0x0c, 0xce, 0x2d, 0x33, 0x0a, 0x97, 0x20,
-	0x58, 0x02, 0x6d, 0x44, 0x2a, 0x7a, 0x1b, 0x21, 0xee, 0x40, 0x31, 0x6c, 0x0a, 0xce, 0x43, 0x66,
-	0x67, 0xb7, 0xbd, 0xde, 0xba, 0xbf, 0xb3, 0xd5, 0x2c, 0xc6, 0xf0, 0x12, 0xc4, 0xef, 0x6f, 0x6c,
-	0x14, 0x11, 0x06, 0x48, 0x49, 0xcd, 0x47, 0xbb, 0x4f, 0x9a, 0x45, 0x01, 0x67, 0x61, 0x69, 0xfd,
-	0x5d, 0x49, 0x6a, 0xee, 0x1c, 0x14, 0xe3, 0x38, 0x03, 0x49, 0xa9, 0xb9, 0xdf, 0x3c, 0x28, 0x26,
-	0x44, 0x1d, 0x4a, 0x4e, 0xcd, 0x5c, 0xf7, 0x0d, 0x5f, 0x66, 0x4e, 0xf2, 0x02, 0x43, 0x3a, 0x61,
-	0xea, 0x90, 0x2e, 0x1e, 0x1a, 0xd2, 0x89, 0xef, 0xc3, 0xc5, 0x31, 0xe7, 0xf1, 0x72, 0x7d, 0x15,
-	0x0a, 0x81, 0xd1, 0x10, 0x7b, 0x10, 0x64, 0xa4, 0xbc, 0x7f, 0x36, 0x14, 0x79, 0x36, 0xb5, 0xfa,
-	0xf9, 0x97, 0x20, 0xb3, 0xe9, 0xc2, 0x02, 0xff, 0x0c, 0x41, 0xd6, 0xf7, 0x36, 0xc5, 0x53, 0xaa,
-	0xcb, 0xe8, 0xd4, 0xb6, 0x1c, 0xa1, 0x4b, 0x14, 0xef, 0x7e, 0xff, 0xaf, 0xff, 0xfe, 0xb1, 0x70,
-	0x1b, 0x7f, 0xdd, 0x9b, 0x32, 0x7f, 0xac, 0xcb, 0x3d, 0x72, 0xb7, 0x6f, 0x1a, 0xef, 0x13, 0xc5,
-	0xb6, 0xea, 0xd5, 0xba, 0x7b, 0x5f, 0xd3, 0x6f, 0x37, 0x3b, 0xeb, 0xd5, 0x7a, 0xb5, 0x7a, 0x8a,
-	0xff, 0x84, 0xd8, 0x85, 0xef, 0x65, 0x36, 0xae, 0x4d, 0xbf, 0x5a, 0xc3, 0x93, 0x8c, 0x72, 0x3d,
-	0x32, 0x3f, 0x73, 0xb8, 0xb8, 0x4b, 0x35, 0xde, 0xc6, 0x5b, 0x43, 0x8d, 0x59, 0x8c, 0x23, 0xea,
-	0x5c, 0xff, 0x38, 0x10, 0xaf, 0x53, 0xfc, 0x47, 0xe7, 0x91, 0x17, 0x18, 0x07, 0xe2, 0x29, 0x4a,
-	0x8d, 0x1d, 0x1c, 0x46, 0x72, 0xf5, 0x53, 0xaa, 0xf8, 0x63, 0xb1, 0xb9, 0x80, 0xe2, 0xa3, 0x6a,
-	0x37, 0x86, 0xfd, 0xfd, 0xef, 0x11, 0x14, 0x82, 0xb3, 0xbd, 0x69, 0x06, 0x8c, 0x9d, 0x02, 0x46,
-	0x32, 0x60, 0x8f, 0x1a, 0xf0, 0x60, 0xf5, 0x9d, 0xa1, 0x01, 0xde, 0x5f, 0x38, 0xe6, 0x00, 0x8d,
-	0x4f, 0xf3, 0x9f, 0x22, 0x28, 0x04, 0x87, 0x6c, 0xd3, 0x34, 0x1f, 0x3b, 0x8e, 0x2b, 0x5f, 0x18,
-	0xa9, 0x41, 0xcd, 0x5e, 0xdf, 0x3e, 0x71, 0x91, 0x5d, 0x5d, 0x10, 0xd9, 0x9f, 0x23, 0x78, 0x6d,
-	0x64, 0x36, 0x84, 0xa7, 0x3c, 0x19, 0x26, 0xcd, 0xea, 0xca, 0xb7, 0xe6, 0xda, 0xc3, 0x51, 0xde,
-	0xa2, 0xda, 0xaf, 0x89, 0x77, 0x7d, 0xbe, 0xe6, 0xda, 0x4e, 0xb0, 0xe0, 0x74, 0x68, 0x42, 0xe3,
-	0x90, 0xcb, 0x6d, 0xa0, 0xea, 0x0d, 0x84, 0xff, 0x82, 0xa0, 0x18, 0x9e, 0xc6, 0xe0, 0x9b, 0x53,
-	0xb4, 0x1a, 0x3f, 0x38, 0x2a, 0xaf, 0xce, 0xb3, 0x85, 0xdb, 0xc1, 0x31, 0xe3, 0x07, 0xfd, 0x3c,
-	0x76, 0x84, 0xc4, 0x36, 0x50, 0x15, 0xff, 0x0a, 0x41, 0x8a, 0xcd, 0x64, 0xf0, 0xf5, 0x29, 0x69,
-	0xea, 0x1f, 0x1f, 0x95, 0x2b, 0xb3, 0x19, 0xb9, 0xbe, 0x9b, 0x54, 0xdf, 0x7b, 0xe2, 0x9d, 0x85,
-	0xf4, 0x65, 0x4f, 0x21, 0x47, 0xcb, 0x9f, 0x20, 0x48, 0xbb, 0xe3, 0x19, 0x3c, 0xa5, 0x0f, 0x09,
-	0x8d, 0x70, 0x26, 0xa2, 0xf9, 0x6c, 0x78, 0x30, 0xf9, 0x29, 0x8e, 0x66, 0xff, 0x73, 0x34, 0xe3,
-	0x43, 0x88, 0xa9, 0x9a, 0x05, 0x47, 0x41, 0xe5, 0x6a, 0x14, 0x56, 0xee, 0xc5, 0x4f, 0x10, 0x55,
-	0xf7, 0x87, 0xc8, 0xef, 0xc7, 0x88, 0xc5, 0xee, 0xb4, 0x61, 0x72, 0x71, 0x0d, 0x54, 0x7d, 0xaf,
-	0x29, 0xde, 0x5b, 0xb0, 0xce, 0xfb, 0xc5, 0xdc, 0x40, 0x0e, 0x6c, 0x92, 0xf4, 0xd5, 0x8b, 0xaf,
-	0x45, 0x7b, 0xf6, 0x97, 0xaf, 0xcf, 0x7e, 0x3e, 0x33, 0x6b, 0x9b, 0xd4, 0xd8, 0x6f, 0x89, 0x8d,
-	0x85, 0x62, 0x43, 0x5f, 0xdf, 0x0d, 0x54, 0xad, 0xa0, 0x1b, 0x08, 0xff, 0x1a, 0x41, 0x8a, 0xbd,
-	0x07, 0xa7, 0x81, 0x3b, 0xf0, 0x46, 0x9d, 0x06, 0xee, 0xe0, 0xd3, 0xf2, 0x8c, 0xe0, 0xee, 0x52,
-	0x61, 0xae, 0xa6, 0x3f, 0x17, 0xe0, 0xb5, 0x91, 0xae, 0x68, 0x5a, 0x7d, 0x9c, 0xd4, 0xb2, 0x95,
-	0x6f, 0xcd, 0xb5, 0x87, 0x9b, 0xf2, 0x0b, 0x86, 0xb0, 0x4f, 0x91, 0xb8, 0xb1, 0x00, 0xc2, 0xba,
-	0x61, 0xb9, 0x0e, 0xd4, 0x76, 0xc4, 0xed, 0x45, 0xa1, 0x36, 0x4e, 0xde, 0xda, 0x1f, 0x10, 0x5c,
-	0x56, 0x8c, 0xde, 0x44, 0xeb, 0xd6, 0x0a, 0x5e, 0xa3, 0xb7, 0xe7, 0x24, 0xfb, 0x1e, 0x7a, 0xef,
-	0x3e, 0xe7, 0xed, 0x18, 0x5d, 0x59, 0xef, 0xd4, 0x0c, 0xb3, 0x53, 0xef, 0x10, 0x9d, 0x96, 0x82,
-	0x3a, 0xfb, 0x49, 0xee, 0x6b, 0xd6, 0xe8, 0xbf, 0x06, 0xdc, 0xf1, 0x28, 0xbf, 0x14, 0x12, 0x5b,
-	0xeb, 0x9b, 0xfb, 0x9f, 0x09, 0x5f, 0xde, 0x62, 0xa2, 0xd6, 0xbb, 0xc6, 0x40, 0xad, 0x79, 0x27,
-	0xd5, 0x9e, 0xdc, 0x5c, 0x73, 0x76, 0xfc, 0xd9, 0x65, 0x78, 0x46, 0x19, 0x9e, 0x79, 0x0c, 0xcf,
-	0x9e, 0x30, 0x91, 0x87, 0x29, 0x7a, 0xec, 0xad, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x53, 0x38,
-	0xf0, 0x00, 0x68, 0x21, 0x00, 0x00,
-}
diff --git a/googleapis/firestore/v1beta1/query.pb.go b/googleapis/firestore/v1beta1/query.pb.go
index aa053f1723..704da008b7 100644
--- a/googleapis/firestore/v1beta1/query.pb.go
+++ b/googleapis/firestore/v1beta1/query.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/query.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A sort direction.
 type StructuredQuery_Direction int32
@@ -37,6 +40,7 @@ var StructuredQuery_Direction_name = map[int32]string{
 	1: "ASCENDING",
 	2: "DESCENDING",
 }
+
 var StructuredQuery_Direction_value = map[string]int32{
 	"DIRECTION_UNSPECIFIED": 0,
 	"ASCENDING":             1,
@@ -46,8 +50,9 @@ var StructuredQuery_Direction_value = map[string]int32{
 func (x StructuredQuery_Direction) String() string {
 	return proto.EnumName(StructuredQuery_Direction_name, int32(x))
 }
+
 func (StructuredQuery_Direction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 0}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 0}
 }
 
 // A composite filter operator.
@@ -64,6 +69,7 @@ var StructuredQuery_CompositeFilter_Operator_name = map[int32]string{
 	0: "OPERATOR_UNSPECIFIED",
 	1: "AND",
 }
+
 var StructuredQuery_CompositeFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED": 0,
 	"AND":                  1,
@@ -72,8 +78,9 @@ var StructuredQuery_CompositeFilter_Operator_value = map[string]int32{
 func (x StructuredQuery_CompositeFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_CompositeFilter_Operator_name, int32(x))
 }
+
 func (StructuredQuery_CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 2, 0}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 2, 0}
 }
 
 // A field filter operator.
@@ -106,6 +113,7 @@ var StructuredQuery_FieldFilter_Operator_name = map[int32]string{
 	5: "EQUAL",
 	7: "ARRAY_CONTAINS",
 }
+
 var StructuredQuery_FieldFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED":  0,
 	"LESS_THAN":             1,
@@ -119,8 +127,9 @@ var StructuredQuery_FieldFilter_Operator_value = map[string]int32{
 func (x StructuredQuery_FieldFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_FieldFilter_Operator_name, int32(x))
 }
+
 func (StructuredQuery_FieldFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 3, 0}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 3, 0}
 }
 
 // A unary operator.
@@ -140,6 +149,7 @@ var StructuredQuery_UnaryFilter_Operator_name = map[int32]string{
 	2: "IS_NAN",
 	3: "IS_NULL",
 }
+
 var StructuredQuery_UnaryFilter_Operator_value = map[string]int32{
 	"OPERATOR_UNSPECIFIED": 0,
 	"IS_NAN":               2,
@@ -149,8 +159,9 @@ var StructuredQuery_UnaryFilter_Operator_value = map[string]int32{
 func (x StructuredQuery_UnaryFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_UnaryFilter_Operator_name, int32(x))
 }
+
 func (StructuredQuery_UnaryFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 5, 0}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 5, 0}
 }
 
 // A Firestore query.
@@ -203,16 +214,17 @@ func (m *StructuredQuery) Reset()         { *m = StructuredQuery{} }
 func (m *StructuredQuery) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery) ProtoMessage()    {}
 func (*StructuredQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0}
 }
+
 func (m *StructuredQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery.Unmarshal(m, b)
 }
 func (m *StructuredQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery.Merge(dst, src)
+func (m *StructuredQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery.Merge(m, src)
 }
 func (m *StructuredQuery) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery.Size(m)
@@ -297,16 +309,17 @@ func (m *StructuredQuery_CollectionSelector) Reset()         { *m = StructuredQu
 func (m *StructuredQuery_CollectionSelector) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_CollectionSelector) ProtoMessage()    {}
 func (*StructuredQuery_CollectionSelector) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 0}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 0}
 }
+
 func (m *StructuredQuery_CollectionSelector) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_CollectionSelector.Unmarshal(m, b)
 }
 func (m *StructuredQuery_CollectionSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_CollectionSelector.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_CollectionSelector) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_CollectionSelector.Merge(dst, src)
+func (m *StructuredQuery_CollectionSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_CollectionSelector.Merge(m, src)
 }
 func (m *StructuredQuery_CollectionSelector) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_CollectionSelector.Size(m)
@@ -349,16 +362,17 @@ func (m *StructuredQuery_Filter) Reset()         { *m = StructuredQuery_Filter{}
 func (m *StructuredQuery_Filter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_Filter) ProtoMessage()    {}
 func (*StructuredQuery_Filter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 1}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 1}
 }
+
 func (m *StructuredQuery_Filter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_Filter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_Filter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_Filter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_Filter.Merge(dst, src)
+func (m *StructuredQuery_Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Filter.Merge(m, src)
 }
 func (m *StructuredQuery_Filter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_Filter.Size(m)
@@ -419,99 +433,15 @@ func (m *StructuredQuery_Filter) GetUnaryFilter() *StructuredQuery_UnaryFilter {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StructuredQuery_Filter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StructuredQuery_Filter_OneofMarshaler, _StructuredQuery_Filter_OneofUnmarshaler, _StructuredQuery_Filter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StructuredQuery_Filter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StructuredQuery_Filter_CompositeFilter)(nil),
 		(*StructuredQuery_Filter_FieldFilter)(nil),
 		(*StructuredQuery_Filter_UnaryFilter)(nil),
 	}
 }
 
-func _StructuredQuery_Filter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StructuredQuery_Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *StructuredQuery_Filter_CompositeFilter:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CompositeFilter); err != nil {
-			return err
-		}
-	case *StructuredQuery_Filter_FieldFilter:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FieldFilter); err != nil {
-			return err
-		}
-	case *StructuredQuery_Filter_UnaryFilter:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.UnaryFilter); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StructuredQuery_Filter.FilterType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StructuredQuery_Filter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StructuredQuery_Filter)
-	switch tag {
-	case 1: // filter_type.composite_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_CompositeFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &StructuredQuery_Filter_CompositeFilter{msg}
-		return true, err
-	case 2: // filter_type.field_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_FieldFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &StructuredQuery_Filter_FieldFilter{msg}
-		return true, err
-	case 3: // filter_type.unary_filter
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_UnaryFilter)
-		err := b.DecodeMessage(msg)
-		m.FilterType = &StructuredQuery_Filter_UnaryFilter{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StructuredQuery_Filter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StructuredQuery_Filter)
-	// filter_type
-	switch x := m.FilterType.(type) {
-	case *StructuredQuery_Filter_CompositeFilter:
-		s := proto.Size(x.CompositeFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StructuredQuery_Filter_FieldFilter:
-		s := proto.Size(x.FieldFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StructuredQuery_Filter_UnaryFilter:
-		s := proto.Size(x.UnaryFilter)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A filter that merges multiple other filters using the given operator.
 type StructuredQuery_CompositeFilter struct {
 	// The operator for combining multiple filters.
@@ -528,16 +458,17 @@ func (m *StructuredQuery_CompositeFilter) Reset()         { *m = StructuredQuery
 func (m *StructuredQuery_CompositeFilter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_CompositeFilter) ProtoMessage()    {}
 func (*StructuredQuery_CompositeFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 2}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 2}
 }
+
 func (m *StructuredQuery_CompositeFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_CompositeFilter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_CompositeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_CompositeFilter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_CompositeFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_CompositeFilter.Merge(dst, src)
+func (m *StructuredQuery_CompositeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_CompositeFilter.Merge(m, src)
 }
 func (m *StructuredQuery_CompositeFilter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_CompositeFilter.Size(m)
@@ -579,16 +510,17 @@ func (m *StructuredQuery_FieldFilter) Reset()         { *m = StructuredQuery_Fie
 func (m *StructuredQuery_FieldFilter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_FieldFilter) ProtoMessage()    {}
 func (*StructuredQuery_FieldFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 3}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 3}
 }
+
 func (m *StructuredQuery_FieldFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_FieldFilter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_FieldFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_FieldFilter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_FieldFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_FieldFilter.Merge(dst, src)
+func (m *StructuredQuery_FieldFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_FieldFilter.Merge(m, src)
 }
 func (m *StructuredQuery_FieldFilter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_FieldFilter.Size(m)
@@ -636,16 +568,17 @@ func (m *StructuredQuery_Projection) Reset()         { *m = StructuredQuery_Proj
 func (m *StructuredQuery_Projection) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_Projection) ProtoMessage()    {}
 func (*StructuredQuery_Projection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 4}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 4}
 }
+
 func (m *StructuredQuery_Projection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_Projection.Unmarshal(m, b)
 }
 func (m *StructuredQuery_Projection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_Projection.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_Projection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_Projection.Merge(dst, src)
+func (m *StructuredQuery_Projection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Projection.Merge(m, src)
 }
 func (m *StructuredQuery_Projection) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_Projection.Size(m)
@@ -681,16 +614,17 @@ func (m *StructuredQuery_UnaryFilter) Reset()         { *m = StructuredQuery_Una
 func (m *StructuredQuery_UnaryFilter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_UnaryFilter) ProtoMessage()    {}
 func (*StructuredQuery_UnaryFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 5}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 5}
 }
+
 func (m *StructuredQuery_UnaryFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_UnaryFilter.Unmarshal(m, b)
 }
 func (m *StructuredQuery_UnaryFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_UnaryFilter.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_UnaryFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_UnaryFilter.Merge(dst, src)
+func (m *StructuredQuery_UnaryFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_UnaryFilter.Merge(m, src)
 }
 func (m *StructuredQuery_UnaryFilter) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_UnaryFilter.Size(m)
@@ -732,61 +666,13 @@ func (m *StructuredQuery_UnaryFilter) GetField() *StructuredQuery_FieldReference
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StructuredQuery_UnaryFilter) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StructuredQuery_UnaryFilter_OneofMarshaler, _StructuredQuery_UnaryFilter_OneofUnmarshaler, _StructuredQuery_UnaryFilter_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StructuredQuery_UnaryFilter) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StructuredQuery_UnaryFilter_Field)(nil),
 	}
 }
 
-func _StructuredQuery_UnaryFilter_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StructuredQuery_UnaryFilter)
-	// operand_type
-	switch x := m.OperandType.(type) {
-	case *StructuredQuery_UnaryFilter_Field:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Field); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StructuredQuery_UnaryFilter.OperandType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StructuredQuery_UnaryFilter_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StructuredQuery_UnaryFilter)
-	switch tag {
-	case 2: // operand_type.field
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StructuredQuery_FieldReference)
-		err := b.DecodeMessage(msg)
-		m.OperandType = &StructuredQuery_UnaryFilter_Field{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StructuredQuery_UnaryFilter_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StructuredQuery_UnaryFilter)
-	// operand_type
-	switch x := m.OperandType.(type) {
-	case *StructuredQuery_UnaryFilter_Field:
-		s := proto.Size(x.Field)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An order on a field.
 type StructuredQuery_Order struct {
 	// The field to order by.
@@ -802,16 +688,17 @@ func (m *StructuredQuery_Order) Reset()         { *m = StructuredQuery_Order{} }
 func (m *StructuredQuery_Order) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_Order) ProtoMessage()    {}
 func (*StructuredQuery_Order) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 6}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 6}
 }
+
 func (m *StructuredQuery_Order) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_Order.Unmarshal(m, b)
 }
 func (m *StructuredQuery_Order) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_Order.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_Order) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_Order.Merge(dst, src)
+func (m *StructuredQuery_Order) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Order.Merge(m, src)
 }
 func (m *StructuredQuery_Order) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_Order.Size(m)
@@ -848,16 +735,17 @@ func (m *StructuredQuery_FieldReference) Reset()         { *m = StructuredQuery_
 func (m *StructuredQuery_FieldReference) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_FieldReference) ProtoMessage()    {}
 func (*StructuredQuery_FieldReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{0, 7}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{0, 7}
 }
+
 func (m *StructuredQuery_FieldReference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructuredQuery_FieldReference.Unmarshal(m, b)
 }
 func (m *StructuredQuery_FieldReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructuredQuery_FieldReference.Marshal(b, m, deterministic)
 }
-func (dst *StructuredQuery_FieldReference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructuredQuery_FieldReference.Merge(dst, src)
+func (m *StructuredQuery_FieldReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_FieldReference.Merge(m, src)
 }
 func (m *StructuredQuery_FieldReference) XXX_Size() int {
 	return xxx_messageInfo_StructuredQuery_FieldReference.Size(m)
@@ -894,16 +782,17 @@ func (m *Cursor) Reset()         { *m = Cursor{} }
 func (m *Cursor) String() string { return proto.CompactTextString(m) }
 func (*Cursor) ProtoMessage()    {}
 func (*Cursor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_849f012e957b5105, []int{1}
+	return fileDescriptor_1ae4429ffd6f5a03, []int{1}
 }
+
 func (m *Cursor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Cursor.Unmarshal(m, b)
 }
 func (m *Cursor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Cursor.Marshal(b, m, deterministic)
 }
-func (dst *Cursor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Cursor.Merge(dst, src)
+func (m *Cursor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cursor.Merge(m, src)
 }
 func (m *Cursor) XXX_Size() int {
 	return xxx_messageInfo_Cursor.Size(m)
@@ -929,6 +818,10 @@ func (m *Cursor) GetBefore() bool {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_Direction", StructuredQuery_Direction_name, StructuredQuery_Direction_value)
+	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_CompositeFilter_Operator", StructuredQuery_CompositeFilter_Operator_name, StructuredQuery_CompositeFilter_Operator_value)
+	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_FieldFilter_Operator", StructuredQuery_FieldFilter_Operator_name, StructuredQuery_FieldFilter_Operator_value)
+	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_UnaryFilter_Operator", StructuredQuery_UnaryFilter_Operator_name, StructuredQuery_UnaryFilter_Operator_value)
 	proto.RegisterType((*StructuredQuery)(nil), "google.firestore.v1beta1.StructuredQuery")
 	proto.RegisterType((*StructuredQuery_CollectionSelector)(nil), "google.firestore.v1beta1.StructuredQuery.CollectionSelector")
 	proto.RegisterType((*StructuredQuery_Filter)(nil), "google.firestore.v1beta1.StructuredQuery.Filter")
@@ -939,17 +832,13 @@ func init() {
 	proto.RegisterType((*StructuredQuery_Order)(nil), "google.firestore.v1beta1.StructuredQuery.Order")
 	proto.RegisterType((*StructuredQuery_FieldReference)(nil), "google.firestore.v1beta1.StructuredQuery.FieldReference")
 	proto.RegisterType((*Cursor)(nil), "google.firestore.v1beta1.Cursor")
-	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_Direction", StructuredQuery_Direction_name, StructuredQuery_Direction_value)
-	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_CompositeFilter_Operator", StructuredQuery_CompositeFilter_Operator_name, StructuredQuery_CompositeFilter_Operator_value)
-	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_FieldFilter_Operator", StructuredQuery_FieldFilter_Operator_name, StructuredQuery_FieldFilter_Operator_value)
-	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_UnaryFilter_Operator", StructuredQuery_UnaryFilter_Operator_name, StructuredQuery_UnaryFilter_Operator_value)
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/v1beta1/query.proto", fileDescriptor_query_849f012e957b5105)
+	proto.RegisterFile("google/firestore/v1beta1/query.proto", fileDescriptor_1ae4429ffd6f5a03)
 }
 
-var fileDescriptor_query_849f012e957b5105 = []byte{
+var fileDescriptor_1ae4429ffd6f5a03 = []byte{
 	// 984 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0xc7, 0x6b, 0xa7, 0xf9, 0x3a, 0x69, 0xd3, 0x30, 0x82, 0x95, 0x09, 0xcb, 0x52, 0x05, 0xa4,
diff --git a/googleapis/firestore/v1beta1/write.pb.go b/googleapis/firestore/v1beta1/write.pb.go
index 459574184f..5177cd6053 100644
--- a/googleapis/firestore/v1beta1/write.pb.go
+++ b/googleapis/firestore/v1beta1/write.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/write.proto
 
-package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
+package firestore
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A value that is calculated by the server.
 type DocumentTransform_FieldTransform_ServerValue int32
@@ -35,6 +38,7 @@ var DocumentTransform_FieldTransform_ServerValue_name = map[int32]string{
 	0: "SERVER_VALUE_UNSPECIFIED",
 	1: "REQUEST_TIME",
 }
+
 var DocumentTransform_FieldTransform_ServerValue_value = map[string]int32{
 	"SERVER_VALUE_UNSPECIFIED": 0,
 	"REQUEST_TIME":             1,
@@ -43,8 +47,9 @@ var DocumentTransform_FieldTransform_ServerValue_value = map[string]int32{
 func (x DocumentTransform_FieldTransform_ServerValue) String() string {
 	return proto.EnumName(DocumentTransform_FieldTransform_ServerValue_name, int32(x))
 }
+
 func (DocumentTransform_FieldTransform_ServerValue) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{1, 0, 0}
+	return fileDescriptor_4c92377d80e15b52, []int{1, 0, 0}
 }
 
 // A write on a document.
@@ -80,16 +85,17 @@ func (m *Write) Reset()         { *m = Write{} }
 func (m *Write) String() string { return proto.CompactTextString(m) }
 func (*Write) ProtoMessage()    {}
 func (*Write) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{0}
+	return fileDescriptor_4c92377d80e15b52, []int{0}
 }
+
 func (m *Write) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Write.Unmarshal(m, b)
 }
 func (m *Write) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Write.Marshal(b, m, deterministic)
 }
-func (dst *Write) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Write.Merge(dst, src)
+func (m *Write) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Write.Merge(m, src)
 }
 func (m *Write) XXX_Size() int {
 	return xxx_messageInfo_Write.Size(m)
@@ -164,95 +170,15 @@ func (m *Write) GetCurrentDocument() *Precondition {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Write) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Write_OneofMarshaler, _Write_OneofUnmarshaler, _Write_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Write) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Write_Update)(nil),
 		(*Write_Delete)(nil),
 		(*Write_Transform)(nil),
 	}
 }
 
-func _Write_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Write)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Write_Update:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *Write_Delete:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Delete)
-	case *Write_Transform:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Transform); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Write.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Write_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Write)
-	switch tag {
-	case 1: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Document)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Write_Update{msg}
-		return true, err
-	case 2: // operation.delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Operation = &Write_Delete{x}
-		return true, err
-	case 6: // operation.transform
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentTransform)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Write_Transform{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Write_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Write)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Write_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Write_Delete:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Delete)))
-		n += len(x.Delete)
-	case *Write_Transform:
-		s := proto.Size(x.Transform)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A transformation of a document.
 type DocumentTransform struct {
 	// The name of the document to transform.
@@ -270,16 +196,17 @@ func (m *DocumentTransform) Reset()         { *m = DocumentTransform{} }
 func (m *DocumentTransform) String() string { return proto.CompactTextString(m) }
 func (*DocumentTransform) ProtoMessage()    {}
 func (*DocumentTransform) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{1}
+	return fileDescriptor_4c92377d80e15b52, []int{1}
 }
+
 func (m *DocumentTransform) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentTransform.Unmarshal(m, b)
 }
 func (m *DocumentTransform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentTransform.Marshal(b, m, deterministic)
 }
-func (dst *DocumentTransform) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentTransform.Merge(dst, src)
+func (m *DocumentTransform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentTransform.Merge(m, src)
 }
 func (m *DocumentTransform) XXX_Size() int {
 	return xxx_messageInfo_DocumentTransform.Size(m)
@@ -328,16 +255,17 @@ func (m *DocumentTransform_FieldTransform) Reset()         { *m = DocumentTransf
 func (m *DocumentTransform_FieldTransform) String() string { return proto.CompactTextString(m) }
 func (*DocumentTransform_FieldTransform) ProtoMessage()    {}
 func (*DocumentTransform_FieldTransform) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{1, 0}
+	return fileDescriptor_4c92377d80e15b52, []int{1, 0}
 }
+
 func (m *DocumentTransform_FieldTransform) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentTransform_FieldTransform.Unmarshal(m, b)
 }
 func (m *DocumentTransform_FieldTransform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentTransform_FieldTransform.Marshal(b, m, deterministic)
 }
-func (dst *DocumentTransform_FieldTransform) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentTransform_FieldTransform.Merge(dst, src)
+func (m *DocumentTransform_FieldTransform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentTransform_FieldTransform.Merge(m, src)
 }
 func (m *DocumentTransform_FieldTransform) XXX_Size() int {
 	return xxx_messageInfo_DocumentTransform_FieldTransform.Size(m)
@@ -448,9 +376,9 @@ func (m *DocumentTransform_FieldTransform) GetRemoveAllFromArray() *ArrayValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DocumentTransform_FieldTransform) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DocumentTransform_FieldTransform_OneofMarshaler, _DocumentTransform_FieldTransform_OneofUnmarshaler, _DocumentTransform_FieldTransform_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DocumentTransform_FieldTransform) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DocumentTransform_FieldTransform_SetToServerValue)(nil),
 		(*DocumentTransform_FieldTransform_Increment)(nil),
 		(*DocumentTransform_FieldTransform_Maximum)(nil),
@@ -460,139 +388,6 @@ func (*DocumentTransform_FieldTransform) XXX_OneofFuncs() (func(msg proto.Messag
 	}
 }
 
-func _DocumentTransform_FieldTransform_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DocumentTransform_FieldTransform)
-	// transform_type
-	switch x := m.TransformType.(type) {
-	case *DocumentTransform_FieldTransform_SetToServerValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.SetToServerValue))
-	case *DocumentTransform_FieldTransform_Increment:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Increment); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_Maximum:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Maximum); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_Minimum:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Minimum); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_AppendMissingElements:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AppendMissingElements); err != nil {
-			return err
-		}
-	case *DocumentTransform_FieldTransform_RemoveAllFromArray:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RemoveAllFromArray); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DocumentTransform_FieldTransform.TransformType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DocumentTransform_FieldTransform_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DocumentTransform_FieldTransform)
-	switch tag {
-	case 2: // transform_type.set_to_server_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TransformType = &DocumentTransform_FieldTransform_SetToServerValue{DocumentTransform_FieldTransform_ServerValue(x)}
-		return true, err
-	case 3: // transform_type.increment
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_Increment{msg}
-		return true, err
-	case 4: // transform_type.maximum
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_Maximum{msg}
-		return true, err
-	case 5: // transform_type.minimum
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Value)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_Minimum{msg}
-		return true, err
-	case 6: // transform_type.append_missing_elements
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_AppendMissingElements{msg}
-		return true, err
-	case 7: // transform_type.remove_all_from_array
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ArrayValue)
-		err := b.DecodeMessage(msg)
-		m.TransformType = &DocumentTransform_FieldTransform_RemoveAllFromArray{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DocumentTransform_FieldTransform_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DocumentTransform_FieldTransform)
-	// transform_type
-	switch x := m.TransformType.(type) {
-	case *DocumentTransform_FieldTransform_SetToServerValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.SetToServerValue))
-	case *DocumentTransform_FieldTransform_Increment:
-		s := proto.Size(x.Increment)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_Maximum:
-		s := proto.Size(x.Maximum)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_Minimum:
-		s := proto.Size(x.Minimum)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_AppendMissingElements:
-		s := proto.Size(x.AppendMissingElements)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DocumentTransform_FieldTransform_RemoveAllFromArray:
-		s := proto.Size(x.RemoveAllFromArray)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The result of applying a write.
 type WriteResult struct {
 	// The last update time of the document after applying the write. Not set
@@ -613,16 +408,17 @@ func (m *WriteResult) Reset()         { *m = WriteResult{} }
 func (m *WriteResult) String() string { return proto.CompactTextString(m) }
 func (*WriteResult) ProtoMessage()    {}
 func (*WriteResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{2}
+	return fileDescriptor_4c92377d80e15b52, []int{2}
 }
+
 func (m *WriteResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteResult.Unmarshal(m, b)
 }
 func (m *WriteResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteResult.Marshal(b, m, deterministic)
 }
-func (dst *WriteResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteResult.Merge(dst, src)
+func (m *WriteResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResult.Merge(m, src)
 }
 func (m *WriteResult) XXX_Size() int {
 	return xxx_messageInfo_WriteResult.Size(m)
@@ -672,16 +468,17 @@ func (m *DocumentChange) Reset()         { *m = DocumentChange{} }
 func (m *DocumentChange) String() string { return proto.CompactTextString(m) }
 func (*DocumentChange) ProtoMessage()    {}
 func (*DocumentChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{3}
+	return fileDescriptor_4c92377d80e15b52, []int{3}
 }
+
 func (m *DocumentChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentChange.Unmarshal(m, b)
 }
 func (m *DocumentChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentChange.Marshal(b, m, deterministic)
 }
-func (dst *DocumentChange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentChange.Merge(dst, src)
+func (m *DocumentChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentChange.Merge(m, src)
 }
 func (m *DocumentChange) XXX_Size() int {
 	return xxx_messageInfo_DocumentChange.Size(m)
@@ -738,16 +535,17 @@ func (m *DocumentDelete) Reset()         { *m = DocumentDelete{} }
 func (m *DocumentDelete) String() string { return proto.CompactTextString(m) }
 func (*DocumentDelete) ProtoMessage()    {}
 func (*DocumentDelete) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{4}
+	return fileDescriptor_4c92377d80e15b52, []int{4}
 }
+
 func (m *DocumentDelete) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentDelete.Unmarshal(m, b)
 }
 func (m *DocumentDelete) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentDelete.Marshal(b, m, deterministic)
 }
-func (dst *DocumentDelete) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentDelete.Merge(dst, src)
+func (m *DocumentDelete) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentDelete.Merge(m, src)
 }
 func (m *DocumentDelete) XXX_Size() int {
 	return xxx_messageInfo_DocumentDelete.Size(m)
@@ -805,16 +603,17 @@ func (m *DocumentRemove) Reset()         { *m = DocumentRemove{} }
 func (m *DocumentRemove) String() string { return proto.CompactTextString(m) }
 func (*DocumentRemove) ProtoMessage()    {}
 func (*DocumentRemove) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{5}
+	return fileDescriptor_4c92377d80e15b52, []int{5}
 }
+
 func (m *DocumentRemove) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentRemove.Unmarshal(m, b)
 }
 func (m *DocumentRemove) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentRemove.Marshal(b, m, deterministic)
 }
-func (dst *DocumentRemove) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentRemove.Merge(dst, src)
+func (m *DocumentRemove) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentRemove.Merge(m, src)
 }
 func (m *DocumentRemove) XXX_Size() int {
 	return xxx_messageInfo_DocumentRemove.Size(m)
@@ -864,16 +663,17 @@ func (m *ExistenceFilter) Reset()         { *m = ExistenceFilter{} }
 func (m *ExistenceFilter) String() string { return proto.CompactTextString(m) }
 func (*ExistenceFilter) ProtoMessage()    {}
 func (*ExistenceFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_write_514106e2c3bd8657, []int{6}
+	return fileDescriptor_4c92377d80e15b52, []int{6}
 }
+
 func (m *ExistenceFilter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExistenceFilter.Unmarshal(m, b)
 }
 func (m *ExistenceFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExistenceFilter.Marshal(b, m, deterministic)
 }
-func (dst *ExistenceFilter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExistenceFilter.Merge(dst, src)
+func (m *ExistenceFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExistenceFilter.Merge(m, src)
 }
 func (m *ExistenceFilter) XXX_Size() int {
 	return xxx_messageInfo_ExistenceFilter.Size(m)
@@ -899,6 +699,7 @@ func (m *ExistenceFilter) GetCount() int32 {
 }
 
 func init() {
+	proto.RegisterEnum("google.firestore.v1beta1.DocumentTransform_FieldTransform_ServerValue", DocumentTransform_FieldTransform_ServerValue_name, DocumentTransform_FieldTransform_ServerValue_value)
 	proto.RegisterType((*Write)(nil), "google.firestore.v1beta1.Write")
 	proto.RegisterType((*DocumentTransform)(nil), "google.firestore.v1beta1.DocumentTransform")
 	proto.RegisterType((*DocumentTransform_FieldTransform)(nil), "google.firestore.v1beta1.DocumentTransform.FieldTransform")
@@ -907,14 +708,13 @@ func init() {
 	proto.RegisterType((*DocumentDelete)(nil), "google.firestore.v1beta1.DocumentDelete")
 	proto.RegisterType((*DocumentRemove)(nil), "google.firestore.v1beta1.DocumentRemove")
 	proto.RegisterType((*ExistenceFilter)(nil), "google.firestore.v1beta1.ExistenceFilter")
-	proto.RegisterEnum("google.firestore.v1beta1.DocumentTransform_FieldTransform_ServerValue", DocumentTransform_FieldTransform_ServerValue_name, DocumentTransform_FieldTransform_ServerValue_value)
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/v1beta1/write.proto", fileDescriptor_write_514106e2c3bd8657)
+	proto.RegisterFile("google/firestore/v1beta1/write.proto", fileDescriptor_4c92377d80e15b52)
 }
 
-var fileDescriptor_write_514106e2c3bd8657 = []byte{
+var fileDescriptor_4c92377d80e15b52 = []byte{
 	// 867 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0x6e, 0xd2, 0x26, 0xdb, 0x9c, 0xa0, 0xd6, 0x3b, 0xb0, 0xc2, 0x0a, 0x5d, 0xb6, 0x8a, 0x16,
diff --git a/googleapis/genomics/v1/annotations.pb.go b/googleapis/genomics/v1/annotations.pb.go
index 8ad87b92c2..54a34a5de0 100644
--- a/googleapis/genomics/v1/annotations.pb.go
+++ b/googleapis/genomics/v1/annotations.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/annotations.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // When an [Annotation][google.genomics.v1.Annotation] or
 // [AnnotationSet][google.genomics.v1.AnnotationSet] is created, if `type` is
@@ -59,6 +59,7 @@ var AnnotationType_name = map[int32]string{
 	3: "GENE",
 	4: "TRANSCRIPT",
 }
+
 var AnnotationType_value = map[string]int32{
 	"ANNOTATION_TYPE_UNSPECIFIED": 0,
 	"GENERIC":                     1,
@@ -70,8 +71,9 @@ var AnnotationType_value = map[string]int32{
 func (x AnnotationType) String() string {
 	return proto.EnumName(AnnotationType_name, int32(x))
 }
+
 func (AnnotationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{0}
+	return fileDescriptor_4c5f02d3172d33a8, []int{0}
 }
 
 type VariantAnnotation_Type int32
@@ -108,6 +110,7 @@ var VariantAnnotation_Type_name = map[int32]string{
 	6: "STRUCTURAL",
 	7: "CNV",
 }
+
 var VariantAnnotation_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"TYPE_OTHER":       1,
@@ -122,8 +125,9 @@ var VariantAnnotation_Type_value = map[string]int32{
 func (x VariantAnnotation_Type) String() string {
 	return proto.EnumName(VariantAnnotation_Type_name, int32(x))
 }
+
 func (VariantAnnotation_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{2, 0}
+	return fileDescriptor_4c5f02d3172d33a8, []int{2, 0}
 }
 
 type VariantAnnotation_Effect int32
@@ -170,6 +174,7 @@ var VariantAnnotation_Effect_name = map[int32]string{
 	7: "STOP_LOSS",
 	8: "SPLICE_SITE_DISRUPTION",
 }
+
 var VariantAnnotation_Effect_value = map[string]int32{
 	"EFFECT_UNSPECIFIED":     0,
 	"EFFECT_OTHER":           1,
@@ -185,8 +190,9 @@ var VariantAnnotation_Effect_value = map[string]int32{
 func (x VariantAnnotation_Effect) String() string {
 	return proto.EnumName(VariantAnnotation_Effect_name, int32(x))
 }
+
 func (VariantAnnotation_Effect) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{2, 1}
+	return fileDescriptor_4c5f02d3172d33a8, []int{2, 1}
 }
 
 type VariantAnnotation_ClinicalSignificance int32
@@ -229,6 +235,7 @@ var VariantAnnotation_ClinicalSignificance_name = map[int32]string{
 	12: "PROTECTIVE",
 	13: "MULTIPLE_REPORTED",
 }
+
 var VariantAnnotation_ClinicalSignificance_value = map[string]int32{
 	"CLINICAL_SIGNIFICANCE_UNSPECIFIED": 0,
 	"CLINICAL_SIGNIFICANCE_OTHER":       1,
@@ -249,8 +256,9 @@ var VariantAnnotation_ClinicalSignificance_value = map[string]int32{
 func (x VariantAnnotation_ClinicalSignificance) String() string {
 	return proto.EnumName(VariantAnnotation_ClinicalSignificance_name, int32(x))
 }
+
 func (VariantAnnotation_ClinicalSignificance) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{2, 2}
+	return fileDescriptor_4c5f02d3172d33a8, []int{2, 2}
 }
 
 // An annotation set is a logical grouping of annotations that share consistent
@@ -283,16 +291,17 @@ func (m *AnnotationSet) Reset()         { *m = AnnotationSet{} }
 func (m *AnnotationSet) String() string { return proto.CompactTextString(m) }
 func (*AnnotationSet) ProtoMessage()    {}
 func (*AnnotationSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{0}
+	return fileDescriptor_4c5f02d3172d33a8, []int{0}
 }
+
 func (m *AnnotationSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnnotationSet.Unmarshal(m, b)
 }
 func (m *AnnotationSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnnotationSet.Marshal(b, m, deterministic)
 }
-func (dst *AnnotationSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnnotationSet.Merge(dst, src)
+func (m *AnnotationSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationSet.Merge(m, src)
 }
 func (m *AnnotationSet) XXX_Size() int {
 	return xxx_messageInfo_AnnotationSet.Size(m)
@@ -397,16 +406,17 @@ func (m *Annotation) Reset()         { *m = Annotation{} }
 func (m *Annotation) String() string { return proto.CompactTextString(m) }
 func (*Annotation) ProtoMessage()    {}
 func (*Annotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{1}
+	return fileDescriptor_4c5f02d3172d33a8, []int{1}
 }
+
 func (m *Annotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Annotation.Unmarshal(m, b)
 }
 func (m *Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Annotation.Marshal(b, m, deterministic)
 }
-func (dst *Annotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Annotation.Merge(dst, src)
+func (m *Annotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Annotation.Merge(m, src)
 }
 func (m *Annotation) XXX_Size() int {
 	return xxx_messageInfo_Annotation.Size(m)
@@ -524,80 +534,14 @@ func (m *Annotation) GetInfo() map[string]*_struct.ListValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Annotation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Annotation_OneofMarshaler, _Annotation_OneofUnmarshaler, _Annotation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Annotation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Annotation_Variant)(nil),
 		(*Annotation_Transcript)(nil),
 	}
 }
 
-func _Annotation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Annotation)
-	// value
-	switch x := m.Value.(type) {
-	case *Annotation_Variant:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Variant); err != nil {
-			return err
-		}
-	case *Annotation_Transcript:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Transcript); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Annotation.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Annotation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Annotation)
-	switch tag {
-	case 10: // value.variant
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(VariantAnnotation)
-		err := b.DecodeMessage(msg)
-		m.Value = &Annotation_Variant{msg}
-		return true, err
-	case 11: // value.transcript
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Transcript)
-		err := b.DecodeMessage(msg)
-		m.Value = &Annotation_Transcript{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Annotation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Annotation)
-	// value
-	switch x := m.Value.(type) {
-	case *Annotation_Variant:
-		s := proto.Size(x.Variant)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Annotation_Transcript:
-		s := proto.Size(x.Transcript)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 type VariantAnnotation struct {
 	// Type has been adapted from ClinVar's list of variant types.
 	Type VariantAnnotation_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.genomics.v1.VariantAnnotation_Type" json:"type,omitempty"`
@@ -630,16 +574,17 @@ func (m *VariantAnnotation) Reset()         { *m = VariantAnnotation{} }
 func (m *VariantAnnotation) String() string { return proto.CompactTextString(m) }
 func (*VariantAnnotation) ProtoMessage()    {}
 func (*VariantAnnotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{2}
+	return fileDescriptor_4c5f02d3172d33a8, []int{2}
 }
+
 func (m *VariantAnnotation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VariantAnnotation.Unmarshal(m, b)
 }
 func (m *VariantAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VariantAnnotation.Marshal(b, m, deterministic)
 }
-func (dst *VariantAnnotation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VariantAnnotation.Merge(dst, src)
+func (m *VariantAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantAnnotation.Merge(m, src)
 }
 func (m *VariantAnnotation) XXX_Size() int {
 	return xxx_messageInfo_VariantAnnotation.Size(m)
@@ -719,16 +664,17 @@ func (m *VariantAnnotation_ClinicalCondition) Reset()         { *m = VariantAnno
 func (m *VariantAnnotation_ClinicalCondition) String() string { return proto.CompactTextString(m) }
 func (*VariantAnnotation_ClinicalCondition) ProtoMessage()    {}
 func (*VariantAnnotation_ClinicalCondition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{2, 0}
+	return fileDescriptor_4c5f02d3172d33a8, []int{2, 0}
 }
+
 func (m *VariantAnnotation_ClinicalCondition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VariantAnnotation_ClinicalCondition.Unmarshal(m, b)
 }
 func (m *VariantAnnotation_ClinicalCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VariantAnnotation_ClinicalCondition.Marshal(b, m, deterministic)
 }
-func (dst *VariantAnnotation_ClinicalCondition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VariantAnnotation_ClinicalCondition.Merge(dst, src)
+func (m *VariantAnnotation_ClinicalCondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantAnnotation_ClinicalCondition.Merge(m, src)
 }
 func (m *VariantAnnotation_ClinicalCondition) XXX_Size() int {
 	return xxx_messageInfo_VariantAnnotation_ClinicalCondition.Size(m)
@@ -810,16 +756,17 @@ func (m *Transcript) Reset()         { *m = Transcript{} }
 func (m *Transcript) String() string { return proto.CompactTextString(m) }
 func (*Transcript) ProtoMessage()    {}
 func (*Transcript) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{3}
+	return fileDescriptor_4c5f02d3172d33a8, []int{3}
 }
+
 func (m *Transcript) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Transcript.Unmarshal(m, b)
 }
 func (m *Transcript) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Transcript.Marshal(b, m, deterministic)
 }
-func (dst *Transcript) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Transcript.Merge(dst, src)
+func (m *Transcript) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transcript.Merge(m, src)
 }
 func (m *Transcript) XXX_Size() int {
 	return xxx_messageInfo_Transcript.Size(m)
@@ -883,16 +830,17 @@ func (m *Transcript_Exon) Reset()         { *m = Transcript_Exon{} }
 func (m *Transcript_Exon) String() string { return proto.CompactTextString(m) }
 func (*Transcript_Exon) ProtoMessage()    {}
 func (*Transcript_Exon) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{3, 0}
+	return fileDescriptor_4c5f02d3172d33a8, []int{3, 0}
 }
+
 func (m *Transcript_Exon) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Transcript_Exon.Unmarshal(m, b)
 }
 func (m *Transcript_Exon) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Transcript_Exon.Marshal(b, m, deterministic)
 }
-func (dst *Transcript_Exon) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Transcript_Exon.Merge(dst, src)
+func (m *Transcript_Exon) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transcript_Exon.Merge(m, src)
 }
 func (m *Transcript_Exon) XXX_Size() int {
 	return xxx_messageInfo_Transcript_Exon.Size(m)
@@ -942,16 +890,17 @@ func (m *Transcript_CodingSequence) Reset()         { *m = Transcript_CodingSequ
 func (m *Transcript_CodingSequence) String() string { return proto.CompactTextString(m) }
 func (*Transcript_CodingSequence) ProtoMessage()    {}
 func (*Transcript_CodingSequence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{3, 1}
+	return fileDescriptor_4c5f02d3172d33a8, []int{3, 1}
 }
+
 func (m *Transcript_CodingSequence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Transcript_CodingSequence.Unmarshal(m, b)
 }
 func (m *Transcript_CodingSequence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Transcript_CodingSequence.Marshal(b, m, deterministic)
 }
-func (dst *Transcript_CodingSequence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Transcript_CodingSequence.Merge(dst, src)
+func (m *Transcript_CodingSequence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transcript_CodingSequence.Merge(m, src)
 }
 func (m *Transcript_CodingSequence) XXX_Size() int {
 	return xxx_messageInfo_Transcript_CodingSequence.Size(m)
@@ -990,16 +939,17 @@ func (m *ExternalId) Reset()         { *m = ExternalId{} }
 func (m *ExternalId) String() string { return proto.CompactTextString(m) }
 func (*ExternalId) ProtoMessage()    {}
 func (*ExternalId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{4}
+	return fileDescriptor_4c5f02d3172d33a8, []int{4}
 }
+
 func (m *ExternalId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExternalId.Unmarshal(m, b)
 }
 func (m *ExternalId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExternalId.Marshal(b, m, deterministic)
 }
-func (dst *ExternalId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExternalId.Merge(dst, src)
+func (m *ExternalId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExternalId.Merge(m, src)
 }
 func (m *ExternalId) XXX_Size() int {
 	return xxx_messageInfo_ExternalId.Size(m)
@@ -1036,16 +986,17 @@ func (m *CreateAnnotationSetRequest) Reset()         { *m = CreateAnnotationSetR
 func (m *CreateAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAnnotationSetRequest) ProtoMessage()    {}
 func (*CreateAnnotationSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{5}
+	return fileDescriptor_4c5f02d3172d33a8, []int{5}
 }
+
 func (m *CreateAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAnnotationSetRequest.Unmarshal(m, b)
 }
 func (m *CreateAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAnnotationSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAnnotationSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAnnotationSetRequest.Merge(dst, src)
+func (m *CreateAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAnnotationSetRequest.Merge(m, src)
 }
 func (m *CreateAnnotationSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAnnotationSetRequest.Size(m)
@@ -1075,16 +1026,17 @@ func (m *GetAnnotationSetRequest) Reset()         { *m = GetAnnotationSetRequest
 func (m *GetAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAnnotationSetRequest) ProtoMessage()    {}
 func (*GetAnnotationSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{6}
+	return fileDescriptor_4c5f02d3172d33a8, []int{6}
 }
+
 func (m *GetAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAnnotationSetRequest.Unmarshal(m, b)
 }
 func (m *GetAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAnnotationSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAnnotationSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAnnotationSetRequest.Merge(dst, src)
+func (m *GetAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAnnotationSetRequest.Merge(m, src)
 }
 func (m *GetAnnotationSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAnnotationSetRequest.Size(m)
@@ -1122,16 +1074,17 @@ func (m *UpdateAnnotationSetRequest) Reset()         { *m = UpdateAnnotationSetR
 func (m *UpdateAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateAnnotationSetRequest) ProtoMessage()    {}
 func (*UpdateAnnotationSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{7}
+	return fileDescriptor_4c5f02d3172d33a8, []int{7}
 }
+
 func (m *UpdateAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateAnnotationSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateAnnotationSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateAnnotationSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateAnnotationSetRequest.Merge(dst, src)
+func (m *UpdateAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAnnotationSetRequest.Merge(m, src)
 }
 func (m *UpdateAnnotationSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateAnnotationSetRequest.Size(m)
@@ -1175,16 +1128,17 @@ func (m *DeleteAnnotationSetRequest) Reset()         { *m = DeleteAnnotationSetR
 func (m *DeleteAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAnnotationSetRequest) ProtoMessage()    {}
 func (*DeleteAnnotationSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{8}
+	return fileDescriptor_4c5f02d3172d33a8, []int{8}
 }
+
 func (m *DeleteAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAnnotationSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAnnotationSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAnnotationSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAnnotationSetRequest.Merge(dst, src)
+func (m *DeleteAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAnnotationSetRequest.Merge(m, src)
 }
 func (m *DeleteAnnotationSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAnnotationSetRequest.Size(m)
@@ -1231,16 +1185,17 @@ func (m *SearchAnnotationSetsRequest) Reset()         { *m = SearchAnnotationSet
 func (m *SearchAnnotationSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchAnnotationSetsRequest) ProtoMessage()    {}
 func (*SearchAnnotationSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{9}
+	return fileDescriptor_4c5f02d3172d33a8, []int{9}
 }
+
 func (m *SearchAnnotationSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAnnotationSetsRequest.Unmarshal(m, b)
 }
 func (m *SearchAnnotationSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAnnotationSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchAnnotationSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAnnotationSetsRequest.Merge(dst, src)
+func (m *SearchAnnotationSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationSetsRequest.Merge(m, src)
 }
 func (m *SearchAnnotationSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchAnnotationSetsRequest.Size(m)
@@ -1309,16 +1264,17 @@ func (m *SearchAnnotationSetsResponse) Reset()         { *m = SearchAnnotationSe
 func (m *SearchAnnotationSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchAnnotationSetsResponse) ProtoMessage()    {}
 func (*SearchAnnotationSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{10}
+	return fileDescriptor_4c5f02d3172d33a8, []int{10}
 }
+
 func (m *SearchAnnotationSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAnnotationSetsResponse.Unmarshal(m, b)
 }
 func (m *SearchAnnotationSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAnnotationSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchAnnotationSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAnnotationSetsResponse.Merge(dst, src)
+func (m *SearchAnnotationSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationSetsResponse.Merge(m, src)
 }
 func (m *SearchAnnotationSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchAnnotationSetsResponse.Size(m)
@@ -1355,16 +1311,17 @@ func (m *CreateAnnotationRequest) Reset()         { *m = CreateAnnotationRequest
 func (m *CreateAnnotationRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAnnotationRequest) ProtoMessage()    {}
 func (*CreateAnnotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{11}
+	return fileDescriptor_4c5f02d3172d33a8, []int{11}
 }
+
 func (m *CreateAnnotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAnnotationRequest.Unmarshal(m, b)
 }
 func (m *CreateAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAnnotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAnnotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAnnotationRequest.Merge(dst, src)
+func (m *CreateAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAnnotationRequest.Merge(m, src)
 }
 func (m *CreateAnnotationRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAnnotationRequest.Size(m)
@@ -1403,16 +1360,17 @@ func (m *BatchCreateAnnotationsRequest) Reset()         { *m = BatchCreateAnnota
 func (m *BatchCreateAnnotationsRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateAnnotationsRequest) ProtoMessage()    {}
 func (*BatchCreateAnnotationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{12}
+	return fileDescriptor_4c5f02d3172d33a8, []int{12}
 }
+
 func (m *BatchCreateAnnotationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateAnnotationsRequest.Unmarshal(m, b)
 }
 func (m *BatchCreateAnnotationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateAnnotationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateAnnotationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateAnnotationsRequest.Merge(dst, src)
+func (m *BatchCreateAnnotationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateAnnotationsRequest.Merge(m, src)
 }
 func (m *BatchCreateAnnotationsRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateAnnotationsRequest.Size(m)
@@ -1450,16 +1408,17 @@ func (m *BatchCreateAnnotationsResponse) Reset()         { *m = BatchCreateAnnot
 func (m *BatchCreateAnnotationsResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateAnnotationsResponse) ProtoMessage()    {}
 func (*BatchCreateAnnotationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{13}
+	return fileDescriptor_4c5f02d3172d33a8, []int{13}
 }
+
 func (m *BatchCreateAnnotationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateAnnotationsResponse.Unmarshal(m, b)
 }
 func (m *BatchCreateAnnotationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateAnnotationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateAnnotationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateAnnotationsResponse.Merge(dst, src)
+func (m *BatchCreateAnnotationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateAnnotationsResponse.Merge(m, src)
 }
 func (m *BatchCreateAnnotationsResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateAnnotationsResponse.Size(m)
@@ -1491,16 +1450,17 @@ func (m *BatchCreateAnnotationsResponse_Entry) Reset()         { *m = BatchCreat
 func (m *BatchCreateAnnotationsResponse_Entry) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateAnnotationsResponse_Entry) ProtoMessage()    {}
 func (*BatchCreateAnnotationsResponse_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{13, 0}
+	return fileDescriptor_4c5f02d3172d33a8, []int{13, 0}
 }
+
 func (m *BatchCreateAnnotationsResponse_Entry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Unmarshal(m, b)
 }
 func (m *BatchCreateAnnotationsResponse_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Marshal(b, m, deterministic)
 }
-func (dst *BatchCreateAnnotationsResponse_Entry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Merge(dst, src)
+func (m *BatchCreateAnnotationsResponse_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Merge(m, src)
 }
 func (m *BatchCreateAnnotationsResponse_Entry) XXX_Size() int {
 	return xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Size(m)
@@ -1537,16 +1497,17 @@ func (m *GetAnnotationRequest) Reset()         { *m = GetAnnotationRequest{} }
 func (m *GetAnnotationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAnnotationRequest) ProtoMessage()    {}
 func (*GetAnnotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{14}
+	return fileDescriptor_4c5f02d3172d33a8, []int{14}
 }
+
 func (m *GetAnnotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAnnotationRequest.Unmarshal(m, b)
 }
 func (m *GetAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAnnotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAnnotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAnnotationRequest.Merge(dst, src)
+func (m *GetAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAnnotationRequest.Merge(m, src)
 }
 func (m *GetAnnotationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAnnotationRequest.Size(m)
@@ -1585,16 +1546,17 @@ func (m *UpdateAnnotationRequest) Reset()         { *m = UpdateAnnotationRequest
 func (m *UpdateAnnotationRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateAnnotationRequest) ProtoMessage()    {}
 func (*UpdateAnnotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{15}
+	return fileDescriptor_4c5f02d3172d33a8, []int{15}
 }
+
 func (m *UpdateAnnotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateAnnotationRequest.Unmarshal(m, b)
 }
 func (m *UpdateAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateAnnotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateAnnotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateAnnotationRequest.Merge(dst, src)
+func (m *UpdateAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAnnotationRequest.Merge(m, src)
 }
 func (m *UpdateAnnotationRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateAnnotationRequest.Size(m)
@@ -1638,16 +1600,17 @@ func (m *DeleteAnnotationRequest) Reset()         { *m = DeleteAnnotationRequest
 func (m *DeleteAnnotationRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAnnotationRequest) ProtoMessage()    {}
 func (*DeleteAnnotationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{16}
+	return fileDescriptor_4c5f02d3172d33a8, []int{16}
 }
+
 func (m *DeleteAnnotationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAnnotationRequest.Unmarshal(m, b)
 }
 func (m *DeleteAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAnnotationRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAnnotationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAnnotationRequest.Merge(dst, src)
+func (m *DeleteAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAnnotationRequest.Merge(m, src)
 }
 func (m *DeleteAnnotationRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAnnotationRequest.Size(m)
@@ -1703,16 +1666,17 @@ func (m *SearchAnnotationsRequest) Reset()         { *m = SearchAnnotationsReque
 func (m *SearchAnnotationsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchAnnotationsRequest) ProtoMessage()    {}
 func (*SearchAnnotationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{17}
+	return fileDescriptor_4c5f02d3172d33a8, []int{17}
 }
+
 func (m *SearchAnnotationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAnnotationsRequest.Unmarshal(m, b)
 }
 func (m *SearchAnnotationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAnnotationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchAnnotationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAnnotationsRequest.Merge(dst, src)
+func (m *SearchAnnotationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationsRequest.Merge(m, src)
 }
 func (m *SearchAnnotationsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchAnnotationsRequest.Size(m)
@@ -1795,72 +1759,14 @@ func (m *SearchAnnotationsRequest) GetPageSize() int32 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SearchAnnotationsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SearchAnnotationsRequest_OneofMarshaler, _SearchAnnotationsRequest_OneofUnmarshaler, _SearchAnnotationsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SearchAnnotationsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SearchAnnotationsRequest_ReferenceId)(nil),
 		(*SearchAnnotationsRequest_ReferenceName)(nil),
 	}
 }
 
-func _SearchAnnotationsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SearchAnnotationsRequest)
-	// reference
-	switch x := m.Reference.(type) {
-	case *SearchAnnotationsRequest_ReferenceId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ReferenceId)
-	case *SearchAnnotationsRequest_ReferenceName:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ReferenceName)
-	case nil:
-	default:
-		return fmt.Errorf("SearchAnnotationsRequest.Reference has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SearchAnnotationsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SearchAnnotationsRequest)
-	switch tag {
-	case 2: // reference.reference_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Reference = &SearchAnnotationsRequest_ReferenceId{x}
-		return true, err
-	case 3: // reference.reference_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Reference = &SearchAnnotationsRequest_ReferenceName{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SearchAnnotationsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SearchAnnotationsRequest)
-	// reference
-	switch x := m.Reference.(type) {
-	case *SearchAnnotationsRequest_ReferenceId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ReferenceId)))
-		n += len(x.ReferenceId)
-	case *SearchAnnotationsRequest_ReferenceName:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ReferenceName)))
-		n += len(x.ReferenceName)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 type SearchAnnotationsResponse struct {
 	// The matching annotations.
 	Annotations []*Annotation `protobuf:"bytes,1,rep,name=annotations,proto3" json:"annotations,omitempty"`
@@ -1877,16 +1783,17 @@ func (m *SearchAnnotationsResponse) Reset()         { *m = SearchAnnotationsResp
 func (m *SearchAnnotationsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchAnnotationsResponse) ProtoMessage()    {}
 func (*SearchAnnotationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_annotations_257ef94ec8d5dfc4, []int{18}
+	return fileDescriptor_4c5f02d3172d33a8, []int{18}
 }
+
 func (m *SearchAnnotationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchAnnotationsResponse.Unmarshal(m, b)
 }
 func (m *SearchAnnotationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchAnnotationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchAnnotationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchAnnotationsResponse.Merge(dst, src)
+func (m *SearchAnnotationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationsResponse.Merge(m, src)
 }
 func (m *SearchAnnotationsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchAnnotationsResponse.Size(m)
@@ -1912,6 +1819,10 @@ func (m *SearchAnnotationsResponse) GetNextPageToken() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.genomics.v1.AnnotationType", AnnotationType_name, AnnotationType_value)
+	proto.RegisterEnum("google.genomics.v1.VariantAnnotation_Type", VariantAnnotation_Type_name, VariantAnnotation_Type_value)
+	proto.RegisterEnum("google.genomics.v1.VariantAnnotation_Effect", VariantAnnotation_Effect_name, VariantAnnotation_Effect_value)
+	proto.RegisterEnum("google.genomics.v1.VariantAnnotation_ClinicalSignificance", VariantAnnotation_ClinicalSignificance_name, VariantAnnotation_ClinicalSignificance_value)
 	proto.RegisterType((*AnnotationSet)(nil), "google.genomics.v1.AnnotationSet")
 	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.AnnotationSet.InfoEntry")
 	proto.RegisterType((*Annotation)(nil), "google.genomics.v1.Annotation")
@@ -1937,10 +1848,151 @@ func init() {
 	proto.RegisterType((*DeleteAnnotationRequest)(nil), "google.genomics.v1.DeleteAnnotationRequest")
 	proto.RegisterType((*SearchAnnotationsRequest)(nil), "google.genomics.v1.SearchAnnotationsRequest")
 	proto.RegisterType((*SearchAnnotationsResponse)(nil), "google.genomics.v1.SearchAnnotationsResponse")
-	proto.RegisterEnum("google.genomics.v1.AnnotationType", AnnotationType_name, AnnotationType_value)
-	proto.RegisterEnum("google.genomics.v1.VariantAnnotation_Type", VariantAnnotation_Type_name, VariantAnnotation_Type_value)
-	proto.RegisterEnum("google.genomics.v1.VariantAnnotation_Effect", VariantAnnotation_Effect_name, VariantAnnotation_Effect_value)
-	proto.RegisterEnum("google.genomics.v1.VariantAnnotation_ClinicalSignificance", VariantAnnotation_ClinicalSignificance_name, VariantAnnotation_ClinicalSignificance_value)
+}
+
+func init() {
+	proto.RegisterFile("google/genomics/v1/annotations.proto", fileDescriptor_4c5f02d3172d33a8)
+}
+
+var fileDescriptor_4c5f02d3172d33a8 = []byte{
+	// 2188 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
+	0x15, 0x0f, 0xf5, 0x69, 0x3f, 0xd9, 0x32, 0x3d, 0xf1, 0xda, 0x5a, 0x39, 0x1f, 0x0e, 0xf3, 0x65,
+	0xb8, 0x89, 0xbc, 0x51, 0x80, 0x36, 0x75, 0xda, 0x74, 0x65, 0x9a, 0xb6, 0xa7, 0xab, 0x50, 0xc2,
+	0x90, 0x72, 0xe1, 0x5e, 0x08, 0x86, 0x1a, 0x7b, 0x89, 0xd8, 0x94, 0x4a, 0xd2, 0x6e, 0xbc, 0xc5,
+	0x02, 0x8b, 0xc5, 0x16, 0x3d, 0xf5, 0xb2, 0xbb, 0xf7, 0x5e, 0x0a, 0xb4, 0xff, 0x43, 0x2f, 0x05,
+	0x7a, 0x6f, 0x0f, 0x45, 0xff, 0x83, 0x5e, 0xf6, 0xda, 0x53, 0x81, 0x5e, 0x8a, 0x19, 0x92, 0x12,
+	0x45, 0x51, 0xb6, 0xdc, 0x00, 0xbd, 0x71, 0xde, 0xbc, 0xf7, 0xe6, 0x37, 0xbf, 0x99, 0xf7, 0x31,
+	0x12, 0x3c, 0x38, 0xee, 0xf5, 0x8e, 0x4f, 0xe8, 0xe6, 0x31, 0x75, 0x7a, 0xa7, 0xb6, 0xe5, 0x6d,
+	0x9e, 0x3f, 0xdb, 0x34, 0x1d, 0xa7, 0xe7, 0x9b, 0xbe, 0xdd, 0x73, 0xbc, 0x5a, 0xdf, 0xed, 0xf9,
+	0x3d, 0x84, 0x02, 0xad, 0x5a, 0xa4, 0x55, 0x3b, 0x7f, 0x56, 0xbd, 0x15, 0x5a, 0x9a, 0x7d, 0x7b,
+	0xdc, 0xa2, 0xba, 0x1a, 0xce, 0xf2, 0xd1, 0x9b, 0xb3, 0xa3, 0x4d, 0x7a, 0xda, 0xf7, 0x2f, 0xc2,
+	0xc9, 0xb5, 0xe4, 0xe4, 0x91, 0x4d, 0x4f, 0xba, 0xc6, 0xa9, 0xe9, 0xbd, 0x0d, 0x35, 0x6e, 0x25,
+	0x35, 0x3c, 0xdf, 0x3d, 0xb3, 0xfc, 0x70, 0xf6, 0x4e, 0x72, 0xf6, 0x97, 0xae, 0xd9, 0xef, 0x53,
+	0x37, 0x5a, 0x7c, 0x25, 0x9c, 0x77, 0xfb, 0xd6, 0xa6, 0xe7, 0x9b, 0xfe, 0x59, 0x38, 0x21, 0x7d,
+	0x97, 0x81, 0xf9, 0xc6, 0x00, 0xab, 0x46, 0x7d, 0x54, 0x86, 0x8c, 0xdd, 0xad, 0x08, 0x6b, 0xc2,
+	0xfa, 0x2c, 0xc9, 0xd8, 0x5d, 0x74, 0x1b, 0xa0, 0x6b, 0xfa, 0xa6, 0x47, 0x7d, 0xc3, 0xee, 0x56,
+	0x32, 0x5c, 0x3e, 0x1b, 0x4a, 0x70, 0x17, 0xad, 0x83, 0xe8, 0xd2, 0x23, 0xea, 0x52, 0xc7, 0xa2,
+	0x46, 0xa8, 0x94, 0xe5, 0x4a, 0xe5, 0x81, 0x5c, 0xe3, 0x9a, 0x08, 0x72, 0x8e, 0x79, 0x4a, 0x2b,
+	0x39, 0x3e, 0xcb, 0xbf, 0x99, 0x73, 0xaf, 0x77, 0xe6, 0x5a, 0xd4, 0x38, 0x73, 0xed, 0x4a, 0x3e,
+	0x70, 0x1e, 0x48, 0x3a, 0xae, 0x8d, 0xbe, 0x0f, 0x39, 0xff, 0xa2, 0x4f, 0x2b, 0x85, 0x35, 0x61,
+	0xbd, 0x5c, 0x97, 0x6a, 0xe3, 0xa4, 0xd7, 0x86, 0xe0, 0xf5, 0x8b, 0x3e, 0x25, 0x5c, 0x1f, 0xfd,
+	0x04, 0x72, 0xb6, 0x73, 0xd4, 0xab, 0x2c, 0xae, 0x65, 0xd7, 0x4b, 0xf5, 0xef, 0x5d, 0x6e, 0xa7,
+	0x51, 0xbf, 0x86, 0x9d, 0xa3, 0x9e, 0xe2, 0xf8, 0xee, 0x05, 0xe1, 0x86, 0x55, 0x0d, 0x66, 0x07,
+	0x22, 0x24, 0x42, 0xf6, 0x2d, 0xbd, 0x08, 0x29, 0x61, 0x9f, 0xe8, 0x23, 0xc8, 0x9f, 0x9b, 0x27,
+	0x67, 0x94, 0xd3, 0x51, 0xaa, 0x57, 0xa3, 0x05, 0x22, 0xfa, 0x6b, 0x4d, 0xdb, 0xf3, 0x0f, 0x98,
+	0x06, 0x09, 0x14, 0xb7, 0x32, 0x2f, 0x04, 0xe9, 0xaf, 0x39, 0x80, 0xe1, 0xb2, 0x63, 0x44, 0x6f,
+	0xc0, 0xe2, 0xf0, 0xd6, 0x18, 0x23, 0x7c, 0x2f, 0x98, 0x71, 0xb4, 0x31, 0x2e, 0xb3, 0x31, 0x2e,
+	0xef, 0xc1, 0xdc, 0xf0, 0x24, 0xec, 0x6e, 0xc8, 0x73, 0x69, 0x20, 0xc3, 0x5d, 0xf4, 0x10, 0x86,
+	0x87, 0x62, 0x70, 0x07, 0x01, 0xe5, 0xf3, 0x03, 0xa9, 0xca, 0x3c, 0x2d, 0x41, 0xde, 0xf3, 0x4d,
+	0xd7, 0xe7, 0xbc, 0x67, 0x49, 0x30, 0x60, 0x34, 0x50, 0xa7, 0x5b, 0x29, 0x72, 0x19, 0xfb, 0x0c,
+	0xdc, 0x9d, 0x53, 0xd7, 0xa3, 0x86, 0xe7, 0xbb, 0xa6, 0xd3, 0xad, 0xcc, 0xac, 0x09, 0xeb, 0x33,
+	0xcc, 0x1d, 0x97, 0x6a, 0x5c, 0x38, 0x38, 0xc5, 0xd9, 0x6b, 0x9e, 0x62, 0x03, 0x8a, 0xe7, 0xa6,
+	0x6b, 0x9b, 0x8e, 0x5f, 0x01, 0xce, 0xf3, 0xc3, 0x34, 0xd3, 0x83, 0x40, 0x65, 0xe8, 0x61, 0xff,
+	0x06, 0x89, 0xec, 0xd0, 0xc7, 0x00, 0x0c, 0x83, 0x67, 0xb9, 0x76, 0xdf, 0xaf, 0x94, 0xb8, 0x97,
+	0x3b, 0x69, 0x5e, 0xf4, 0x81, 0xd6, 0xfe, 0x0d, 0x12, 0xb3, 0x41, 0x3f, 0x0a, 0xaf, 0xd2, 0x1c,
+	0xbf, 0x4a, 0xeb, 0x97, 0x83, 0xff, 0xbf, 0xdc, 0xa3, 0xed, 0x62, 0x68, 0x25, 0xfd, 0x67, 0x16,
+	0x16, 0xc7, 0xb6, 0x8f, 0x5e, 0x85, 0x74, 0x0b, 0x9c, 0xee, 0x8d, 0xa9, 0x38, 0xab, 0xc5, 0x68,
+	0xdf, 0x81, 0x02, 0x3d, 0x3a, 0xa2, 0x96, 0xcf, 0x51, 0x95, 0xeb, 0x4f, 0xa6, 0xf3, 0xa0, 0x70,
+	0x1b, 0x12, 0xda, 0xa2, 0xc7, 0xb0, 0x60, 0x9e, 0xf8, 0xd4, 0x75, 0x4c, 0x9f, 0x1a, 0x6f, 0x4c,
+	0x8f, 0x7a, 0x51, 0x5a, 0x18, 0x88, 0xb7, 0x99, 0x14, 0xad, 0x40, 0xf1, 0x98, 0x3a, 0xb1, 0x1b,
+	0x5b, 0x60, 0xc3, 0xe0, 0xb2, 0x0e, 0xcf, 0xc1, 0xb0, 0xbb, 0x5e, 0x25, 0xbf, 0x96, 0x65, 0x97,
+	0x75, 0x28, 0xc5, 0x5d, 0x0f, 0xfd, 0x0c, 0xc0, 0xea, 0x39, 0x5d, 0x9b, 0xe7, 0xda, 0x4a, 0x81,
+	0x1f, 0xd3, 0x0f, 0xa6, 0x83, 0x2c, 0x9f, 0xd8, 0x8e, 0x6d, 0x99, 0x27, 0x72, 0x64, 0x4f, 0x62,
+	0xae, 0x50, 0x0f, 0x3e, 0xb0, 0x42, 0x05, 0xc3, 0xb3, 0x8f, 0x1d, 0xfb, 0xc8, 0xb6, 0x4c, 0xc7,
+	0xa2, 0x3c, 0x02, 0xca, 0xf5, 0xad, 0xeb, 0xad, 0xa1, 0xc5, 0x3c, 0x90, 0x25, 0x2b, 0x45, 0x5a,
+	0xfd, 0xbd, 0x00, 0x8b, 0x63, 0x90, 0x58, 0x30, 0xb2, 0x48, 0xf5, 0x2a, 0x02, 0xdf, 0x7d, 0x30,
+	0x40, 0x0d, 0x98, 0xa3, 0xef, 0x38, 0x8f, 0x27, 0x9c, 0x9a, 0x0c, 0xdf, 0x77, 0xea, 0xd5, 0x56,
+	0x42, 0x3d, 0xdc, 0x25, 0x25, 0x3a, 0xf8, 0xf6, 0x58, 0xee, 0xb5, 0x7a, 0x8e, 0x45, 0xfb, 0xb1,
+	0x9c, 0x3d, 0x1b, 0x4a, 0x70, 0x97, 0x9d, 0x4b, 0xef, 0xd4, 0x3e, 0x8d, 0x9d, 0x0b, 0x1b, 0xe2,
+	0xae, 0xf4, 0x39, 0xe4, 0xd8, 0x6d, 0x41, 0x4b, 0x20, 0xea, 0x87, 0x6d, 0xc5, 0xe8, 0xa8, 0x5a,
+	0x5b, 0x91, 0xf1, 0x2e, 0x56, 0x76, 0xc4, 0x1b, 0xa8, 0x0c, 0xc0, 0xa5, 0x2d, 0x7d, 0x5f, 0x21,
+	0xa2, 0x80, 0xe6, 0x61, 0x16, 0xab, 0x9a, 0x42, 0x74, 0xdc, 0x52, 0xc5, 0x0c, 0x9a, 0x83, 0x99,
+	0x1d, 0xa5, 0xa9, 0xf0, 0x51, 0x16, 0x89, 0x30, 0xa7, 0x75, 0xb6, 0x35, 0x1d, 0xeb, 0x1d, 0x2e,
+	0xc9, 0xa1, 0x22, 0x64, 0x35, 0xb5, 0x2d, 0xe6, 0x99, 0x1f, 0x4d, 0x27, 0x1d, 0x59, 0xef, 0x90,
+	0x46, 0x53, 0x2c, 0xb0, 0x09, 0x59, 0x3d, 0x10, 0x8b, 0xd2, 0x5f, 0x04, 0x28, 0x04, 0x77, 0x0d,
+	0x2d, 0x03, 0x52, 0x76, 0x77, 0x15, 0x59, 0x4f, 0x60, 0x10, 0x61, 0x2e, 0x94, 0x47, 0x28, 0xca,
+	0x00, 0xbb, 0xa4, 0xf1, 0x5a, 0xd1, 0xf6, 0xf1, 0xae, 0x2e, 0x66, 0x50, 0x15, 0x96, 0xf9, 0xd8,
+	0x68, 0x13, 0x45, 0x53, 0xc8, 0x01, 0x56, 0xf7, 0x0c, 0xac, 0xee, 0x28, 0x4d, 0x31, 0x8b, 0x10,
+	0x94, 0xb5, 0x43, 0xb5, 0xa5, 0x1e, 0xbe, 0x6e, 0x75, 0x34, 0x83, 0xa1, 0xc9, 0xa1, 0x0f, 0x60,
+	0x51, 0x6d, 0xa9, 0x09, 0x71, 0x9e, 0x6d, 0x4e, 0xd3, 0x5b, 0x6d, 0x63, 0xaf, 0x81, 0x55, 0xb1,
+	0x30, 0x18, 0x36, 0x5b, 0x9a, 0x26, 0x16, 0xd9, 0x22, 0x5a, 0xbb, 0x89, 0x65, 0xc5, 0xd0, 0xb0,
+	0xae, 0x18, 0x3b, 0x58, 0x23, 0x9d, 0x36, 0xdf, 0xe7, 0x8c, 0xf4, 0xe7, 0x0c, 0x2c, 0xa5, 0x5d,
+	0x0d, 0xf4, 0x10, 0xee, 0xc9, 0x4d, 0xac, 0x62, 0xb9, 0xd1, 0x34, 0x34, 0xbc, 0xa7, 0xe2, 0x5d,
+	0x2c, 0x37, 0x54, 0x39, 0x49, 0xf3, 0x5d, 0x58, 0x4d, 0x57, 0x8b, 0xf1, 0xde, 0x51, 0x65, 0x85,
+	0xe8, 0x0c, 0x5a, 0x06, 0x01, 0x14, 0xb6, 0x15, 0x15, 0xef, 0x31, 0xd6, 0x17, 0x61, 0xbe, 0x89,
+	0x3f, 0x51, 0x9a, 0x87, 0x46, 0x28, 0xe2, 0xfb, 0x0b, 0x45, 0xed, 0x86, 0xbe, 0xdf, 0xda, 0x53,
+	0x54, 0x2c, 0x07, 0x87, 0x10, 0x1b, 0x17, 0x98, 0xe5, 0x0e, 0xe9, 0xec, 0x19, 0x44, 0xd1, 0xda,
+	0x2d, 0x55, 0x53, 0xc4, 0x22, 0x3b, 0x83, 0x7d, 0xac, 0xe9, 0x2d, 0xb9, 0xf5, 0xba, 0xdd, 0xd0,
+	0xf1, 0x36, 0x6e, 0x62, 0xfd, 0x50, 0x9c, 0x41, 0x2b, 0x70, 0x53, 0x6e, 0xa9, 0xbb, 0x0a, 0xd1,
+	0x0c, 0x4d, 0x51, 0x35, 0xac, 0xe3, 0x03, 0x36, 0x31, 0x8b, 0x16, 0xa0, 0x44, 0xb0, 0xf6, 0x89,
+	0xb1, 0xdb, 0x90, 0xf5, 0x16, 0x11, 0x81, 0x09, 0x1a, 0x9a, 0xd6, 0x92, 0x71, 0x83, 0x73, 0x53,
+	0xe2, 0xab, 0x92, 0x96, 0xae, 0xc8, 0x3a, 0x3e, 0x50, 0xc4, 0x39, 0x06, 0xee, 0x75, 0xa7, 0xa9,
+	0xe3, 0x76, 0x53, 0x31, 0x88, 0xd2, 0x6e, 0x11, 0x5d, 0xd9, 0x11, 0xe7, 0xa5, 0x7f, 0x64, 0x00,
+	0x86, 0x69, 0x3b, 0x9e, 0x47, 0x84, 0x91, 0x3c, 0xf2, 0x43, 0xc8, 0xd3, 0x77, 0x2c, 0x37, 0x04,
+	0x31, 0x72, 0xff, 0xf2, 0xf4, 0x5f, 0x53, 0xde, 0xf5, 0x1c, 0x12, 0x58, 0xa0, 0x03, 0x58, 0xb0,
+	0x7a, 0x5d, 0xdb, 0x39, 0x36, 0x3c, 0xfa, 0x8b, 0x33, 0x56, 0x1f, 0x79, 0x9c, 0x94, 0xea, 0x4f,
+	0xaf, 0x70, 0x22, 0x73, 0x2b, 0x2d, 0x34, 0x22, 0x65, 0x6b, 0x64, 0x5c, 0x35, 0x21, 0xc7, 0x96,
+	0x19, 0x16, 0x5a, 0x21, 0xa5, 0xd0, 0x66, 0x86, 0x85, 0xf6, 0x19, 0xe4, 0x8f, 0xdc, 0xa8, 0xde,
+	0x97, 0xea, 0xab, 0x63, 0x75, 0x02, 0x3b, 0xfe, 0xf3, 0x7a, 0x58, 0x28, 0xb8, 0x66, 0xf5, 0x05,
+	0x94, 0x47, 0x41, 0x4c, 0xbb, 0x98, 0xf4, 0x63, 0x80, 0x61, 0xca, 0x40, 0x77, 0xa1, 0x14, 0x76,
+	0x68, 0xbc, 0x5f, 0x08, 0xa8, 0x0d, 0x9b, 0x36, 0xde, 0x2c, 0x04, 0x6d, 0x4c, 0x26, 0x6a, 0x63,
+	0xa4, 0x23, 0xa8, 0xca, 0x2e, 0x35, 0x7d, 0x3a, 0xd2, 0x61, 0x11, 0x86, 0xc2, 0xf3, 0xd1, 0x3e,
+	0x94, 0x47, 0x9b, 0x1c, 0xee, 0xb1, 0x54, 0xbf, 0x77, 0x65, 0x8f, 0x46, 0xe6, 0x47, 0x9a, 0x20,
+	0x49, 0x81, 0x95, 0x3d, 0xea, 0xa7, 0x2e, 0x92, 0xda, 0x49, 0x09, 0xa9, 0x9d, 0x94, 0xf4, 0x37,
+	0x01, 0xaa, 0x9d, 0x7e, 0x77, 0x12, 0xde, 0x6b, 0xb8, 0x4a, 0xd9, 0x5b, 0xe6, 0x7f, 0xdb, 0x1b,
+	0x7a, 0x09, 0xa5, 0x33, 0x8e, 0x89, 0xbf, 0x00, 0xc2, 0x53, 0x1f, 0xef, 0x0e, 0x76, 0xd9, 0x23,
+	0xe1, 0xb5, 0xe9, 0xbd, 0x25, 0x10, 0xa8, 0xb3, 0x6f, 0x69, 0x1f, 0xaa, 0x3b, 0xf4, 0x84, 0xbe,
+	0xff, 0x86, 0xa4, 0x7f, 0x09, 0xb0, 0xaa, 0x51, 0xd3, 0xb5, 0x3e, 0x1d, 0x71, 0xe5, 0x45, 0xbe,
+	0xee, 0x42, 0x69, 0xf8, 0x34, 0x88, 0x0a, 0x14, 0x0c, 0xde, 0x06, 0x5e, 0xea, 0xe3, 0x20, 0x73,
+	0xe9, 0xe3, 0x20, 0xde, 0xd0, 0xbe, 0x80, 0x3c, 0x6b, 0x48, 0xbc, 0x4a, 0x6e, 0x2d, 0x3b, 0x65,
+	0xe3, 0x18, 0x18, 0xb0, 0xd2, 0xd6, 0x37, 0x8f, 0xa9, 0xe1, 0xf7, 0xde, 0x52, 0x27, 0x7a, 0x56,
+	0x30, 0x89, 0xce, 0x04, 0x68, 0x15, 0xf8, 0xc0, 0xf0, 0xec, 0xcf, 0x82, 0xb7, 0x45, 0x9e, 0xcc,
+	0x30, 0x81, 0x66, 0x7f, 0x46, 0xa5, 0xaf, 0x05, 0xb8, 0x95, 0xbe, 0x69, 0xaf, 0xdf, 0x73, 0x3c,
+	0x8a, 0x7e, 0x0a, 0x0b, 0xa3, 0x0c, 0x06, 0x3b, 0x9f, 0xea, 0x9c, 0xcb, 0x23, 0x14, 0x7b, 0xe8,
+	0x11, 0x2c, 0x38, 0xf4, 0x9d, 0x6f, 0xc4, 0xd0, 0x06, 0xfc, 0xcc, 0x33, 0x71, 0x3b, 0x42, 0x2c,
+	0x1d, 0xc2, 0x4a, 0x32, 0xa8, 0xa2, 0x43, 0x78, 0x05, 0x30, 0x74, 0x1a, 0x46, 0xd3, 0x9d, 0xcb,
+	0x91, 0x90, 0x98, 0x85, 0xf4, 0x85, 0x00, 0xb7, 0xb7, 0x4d, 0xdf, 0xfa, 0x34, 0xb9, 0xc0, 0xe0,
+	0x98, 0x3f, 0x86, 0x52, 0xec, 0x39, 0x1b, 0x6e, 0xf6, 0xaa, 0x25, 0xe2, 0x26, 0xec, 0x3c, 0xdc,
+	0xc0, 0x59, 0xec, 0x0d, 0x19, 0x4a, 0x70, 0x57, 0xfa, 0x4e, 0x80, 0x3b, 0x93, 0x20, 0x84, 0xa4,
+	0x13, 0x28, 0x52, 0xc7, 0x77, 0x6d, 0x1a, 0xad, 0xff, 0x22, 0x6d, 0xfd, 0xcb, 0x9d, 0xd4, 0x82,
+	0xce, 0x3c, 0x72, 0x54, 0xf5, 0x20, 0x1f, 0x34, 0xe6, 0x1b, 0x50, 0x08, 0x1e, 0xc5, 0x21, 0x7d,
+	0x28, 0xf2, 0xed, 0xf6, 0xad, 0x9a, 0xc6, 0x67, 0x48, 0xa8, 0x91, 0xa0, 0x3b, 0x73, 0x6d, 0xba,
+	0x5f, 0xc2, 0xd2, 0x48, 0xda, 0x8a, 0x48, 0xbe, 0x0f, 0xb1, 0x1c, 0x30, 0x8c, 0xc9, 0xb9, 0xa1,
+	0x10, 0x77, 0xa5, 0x3f, 0x09, 0xb0, 0x92, 0x4c, 0x56, 0xd7, 0x71, 0xf0, 0xbe, 0xe8, 0xdf, 0x2f,
+	0x31, 0xbd, 0x82, 0x95, 0x64, 0x62, 0xba, 0xd6, 0xee, 0x7f, 0x93, 0x81, 0x4a, 0x32, 0x32, 0x07,
+	0x97, 0xf4, 0x09, 0xa0, 0xb1, 0xbc, 0x16, 0xa5, 0x24, 0x31, 0x91, 0xd8, 0x3c, 0x74, 0x3f, 0xf1,
+	0x56, 0xe6, 0x57, 0x72, 0xff, 0xc6, 0xe8, 0x6b, 0xf9, 0xf1, 0xd8, 0x6b, 0x39, 0x1b, 0xaa, 0x4d,
+	0x7a, 0x2f, 0xe7, 0x52, 0x2a, 0x6b, 0x7e, 0x58, 0xc6, 0x47, 0xd3, 0x52, 0xe1, 0xd2, 0xb4, 0x54,
+	0x1c, 0x4d, 0x4b, 0xdb, 0x25, 0x98, 0x1d, 0x2c, 0x2a, 0xfd, 0x5a, 0x80, 0x0f, 0x53, 0x98, 0x08,
+	0x63, 0xe5, 0xfd, 0xe3, 0x75, 0xca, 0xb4, 0xb4, 0x41, 0xa1, 0x3c, 0x9a, 0x80, 0x59, 0x5f, 0xda,
+	0x50, 0xd5, 0x96, 0xce, 0x7b, 0x39, 0x23, 0xe5, 0x7d, 0x50, 0x82, 0xe2, 0x9e, 0xa2, 0x2a, 0x04,
+	0xcb, 0xa2, 0xc0, 0x06, 0x07, 0x0d, 0x82, 0x1b, 0x2a, 0xeb, 0xc9, 0x67, 0x20, 0xc7, 0x66, 0xc4,
+	0x2c, 0x7f, 0x43, 0x90, 0x86, 0xaa, 0xc9, 0x04, 0xb7, 0x75, 0x31, 0x57, 0xff, 0x6a, 0x1e, 0x6e,
+	0xc6, 0xf3, 0xa8, 0x7b, 0x6e, 0x5b, 0xf4, 0xe0, 0x19, 0xfa, 0x56, 0x80, 0x9b, 0x29, 0xbd, 0x06,
+	0xaa, 0xa5, 0xed, 0x75, 0x72, 0x53, 0x52, 0xbd, 0x3a, 0x71, 0x4b, 0x1b, 0x5f, 0xfe, 0xfd, 0x9f,
+	0xdf, 0x64, 0x1e, 0x48, 0x28, 0xf1, 0x73, 0x20, 0xf5, 0xbd, 0xad, 0x44, 0xd5, 0x47, 0x5f, 0x0b,
+	0x20, 0x26, 0x5b, 0x13, 0x94, 0xfa, 0x23, 0xd4, 0x84, 0x06, 0x66, 0x1a, 0x40, 0x35, 0x0e, 0x68,
+	0x1d, 0x3d, 0x1a, 0x07, 0xb4, 0xf9, 0xab, 0xb1, 0x48, 0xf8, 0x1c, 0xfd, 0x51, 0x80, 0x9b, 0x29,
+	0x7d, 0x4e, 0x3a, 0x57, 0x93, 0x1b, 0xa2, 0x69, 0xa0, 0xbd, 0xe2, 0xd0, 0x5e, 0x54, 0xa7, 0x84,
+	0x36, 0xc6, 0xdf, 0x6f, 0x05, 0xb8, 0x99, 0xd2, 0xc1, 0xa4, 0x43, 0x9d, 0xdc, 0xea, 0x54, 0x97,
+	0xc7, 0xf2, 0x92, 0x72, 0xda, 0xf7, 0x2f, 0x22, 0xea, 0x36, 0xa6, 0xa5, 0xee, 0x77, 0x02, 0x2c,
+	0xa5, 0x75, 0x04, 0x68, 0x33, 0x0d, 0xd0, 0x25, 0x0d, 0x53, 0xf5, 0xa3, 0xe9, 0x0d, 0x82, 0x58,
+	0x96, 0x1e, 0x70, 0xac, 0x77, 0xa4, 0x0f, 0x53, 0xb0, 0x7a, 0xdc, 0x70, 0x4b, 0xd8, 0x40, 0x5f,
+	0x09, 0x20, 0x26, 0xef, 0x77, 0xfa, 0x8d, 0x9b, 0xd0, 0x45, 0x54, 0xaf, 0x48, 0x0f, 0xd2, 0x7d,
+	0x8e, 0xe3, 0xb6, 0xb4, 0x90, 0xc0, 0xb1, 0x15, 0xaf, 0x0e, 0x7f, 0x10, 0x60, 0x39, 0xbd, 0x04,
+	0xa3, 0x67, 0xd7, 0x29, 0xd7, 0x01, 0xa4, 0xfa, 0xf5, 0x2b, 0xbc, 0xf4, 0x88, 0xc3, 0x5c, 0x93,
+	0x56, 0x93, 0x30, 0xdf, 0x0c, 0xed, 0x18, 0x61, 0x5f, 0x0a, 0x30, 0x3f, 0x12, 0x7c, 0x68, 0xfd,
+	0xca, 0xf8, 0x9c, 0x96, 0xaa, 0xc7, 0x1c, 0xc3, 0x3d, 0x74, 0x37, 0x81, 0x61, 0xe4, 0x6e, 0xb1,
+	0x7b, 0xf5, 0xad, 0x00, 0x62, 0x32, 0xd2, 0xd2, 0x4f, 0x6d, 0x42, 0xcd, 0xbf, 0x12, 0xca, 0x73,
+	0x0e, 0xe5, 0x69, 0xf5, 0x2a, 0x28, 0x23, 0xa7, 0xf8, 0x85, 0x00, 0x62, 0x32, 0xaa, 0xd2, 0x61,
+	0x4d, 0xa8, 0xe6, 0x13, 0x03, 0x2f, 0x64, 0x66, 0xe3, 0x4a, 0x66, 0xbe, 0x11, 0x60, 0x71, 0xac,
+	0xbe, 0xa1, 0x27, 0xd3, 0x44, 0xcf, 0xe0, 0xfa, 0x3c, 0x9d, 0x52, 0x3b, 0xbc, 0x39, 0xf7, 0x38,
+	0xb6, 0x55, 0x69, 0x39, 0x89, 0x6d, 0x10, 0x65, 0xdb, 0x6f, 0x61, 0xd9, 0xea, 0x9d, 0xa6, 0xb8,
+	0xdd, 0x16, 0x63, 0x1e, 0xdb, 0x6c, 0xcf, 0x6d, 0xe1, 0xe7, 0x5b, 0x91, 0x5e, 0xef, 0xc4, 0x74,
+	0x8e, 0x6b, 0x3d, 0xf7, 0x78, 0xf3, 0x98, 0x3a, 0x9c, 0x91, 0xcd, 0x60, 0xca, 0xec, 0xdb, 0x5e,
+	0xfc, 0x6f, 0xa6, 0x97, 0xd1, 0xf7, 0xbf, 0x05, 0xe1, 0x4d, 0x81, 0x6b, 0x3e, 0xff, 0x6f, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xf4, 0x94, 0x75, 0x44, 0x8f, 0x1a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2486,148 +2538,3 @@ var _AnnotationServiceV1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/genomics/v1/annotations.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/genomics/v1/annotations.proto", fileDescriptor_annotations_257ef94ec8d5dfc4)
-}
-
-var fileDescriptor_annotations_257ef94ec8d5dfc4 = []byte{
-	// 2188 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
-	0x15, 0x0f, 0xf5, 0x69, 0x3f, 0xd9, 0x32, 0x3d, 0xf1, 0xda, 0x5a, 0x39, 0x1f, 0x0e, 0xf3, 0x65,
-	0xb8, 0x89, 0xbc, 0x51, 0x80, 0x36, 0x75, 0xda, 0x74, 0x65, 0x9a, 0xb6, 0xa7, 0xab, 0x50, 0xc2,
-	0x90, 0x72, 0xe1, 0x5e, 0x08, 0x86, 0x1a, 0x7b, 0x89, 0xd8, 0x94, 0x4a, 0xd2, 0x6e, 0xbc, 0xc5,
-	0x02, 0x8b, 0xc5, 0x16, 0x3d, 0xf5, 0xb2, 0xbb, 0xf7, 0x5e, 0x0a, 0xb4, 0xff, 0x43, 0x2f, 0x05,
-	0x7a, 0x6f, 0x0f, 0x45, 0xff, 0x83, 0x5e, 0xf6, 0xda, 0x53, 0x81, 0x5e, 0x8a, 0x19, 0x92, 0x12,
-	0x45, 0x51, 0xb6, 0xdc, 0x00, 0xbd, 0x71, 0xde, 0xbc, 0xf7, 0xe6, 0x37, 0xbf, 0x99, 0xf7, 0x31,
-	0x12, 0x3c, 0x38, 0xee, 0xf5, 0x8e, 0x4f, 0xe8, 0xe6, 0x31, 0x75, 0x7a, 0xa7, 0xb6, 0xe5, 0x6d,
-	0x9e, 0x3f, 0xdb, 0x34, 0x1d, 0xa7, 0xe7, 0x9b, 0xbe, 0xdd, 0x73, 0xbc, 0x5a, 0xdf, 0xed, 0xf9,
-	0x3d, 0x84, 0x02, 0xad, 0x5a, 0xa4, 0x55, 0x3b, 0x7f, 0x56, 0xbd, 0x15, 0x5a, 0x9a, 0x7d, 0x7b,
-	0xdc, 0xa2, 0xba, 0x1a, 0xce, 0xf2, 0xd1, 0x9b, 0xb3, 0xa3, 0x4d, 0x7a, 0xda, 0xf7, 0x2f, 0xc2,
-	0xc9, 0xb5, 0xe4, 0xe4, 0x91, 0x4d, 0x4f, 0xba, 0xc6, 0xa9, 0xe9, 0xbd, 0x0d, 0x35, 0x6e, 0x25,
-	0x35, 0x3c, 0xdf, 0x3d, 0xb3, 0xfc, 0x70, 0xf6, 0x4e, 0x72, 0xf6, 0x97, 0xae, 0xd9, 0xef, 0x53,
-	0x37, 0x5a, 0x7c, 0x25, 0x9c, 0x77, 0xfb, 0xd6, 0xa6, 0xe7, 0x9b, 0xfe, 0x59, 0x38, 0x21, 0x7d,
-	0x97, 0x81, 0xf9, 0xc6, 0x00, 0xab, 0x46, 0x7d, 0x54, 0x86, 0x8c, 0xdd, 0xad, 0x08, 0x6b, 0xc2,
-	0xfa, 0x2c, 0xc9, 0xd8, 0x5d, 0x74, 0x1b, 0xa0, 0x6b, 0xfa, 0xa6, 0x47, 0x7d, 0xc3, 0xee, 0x56,
-	0x32, 0x5c, 0x3e, 0x1b, 0x4a, 0x70, 0x17, 0xad, 0x83, 0xe8, 0xd2, 0x23, 0xea, 0x52, 0xc7, 0xa2,
-	0x46, 0xa8, 0x94, 0xe5, 0x4a, 0xe5, 0x81, 0x5c, 0xe3, 0x9a, 0x08, 0x72, 0x8e, 0x79, 0x4a, 0x2b,
-	0x39, 0x3e, 0xcb, 0xbf, 0x99, 0x73, 0xaf, 0x77, 0xe6, 0x5a, 0xd4, 0x38, 0x73, 0xed, 0x4a, 0x3e,
-	0x70, 0x1e, 0x48, 0x3a, 0xae, 0x8d, 0xbe, 0x0f, 0x39, 0xff, 0xa2, 0x4f, 0x2b, 0x85, 0x35, 0x61,
-	0xbd, 0x5c, 0x97, 0x6a, 0xe3, 0xa4, 0xd7, 0x86, 0xe0, 0xf5, 0x8b, 0x3e, 0x25, 0x5c, 0x1f, 0xfd,
-	0x04, 0x72, 0xb6, 0x73, 0xd4, 0xab, 0x2c, 0xae, 0x65, 0xd7, 0x4b, 0xf5, 0xef, 0x5d, 0x6e, 0xa7,
-	0x51, 0xbf, 0x86, 0x9d, 0xa3, 0x9e, 0xe2, 0xf8, 0xee, 0x05, 0xe1, 0x86, 0x55, 0x0d, 0x66, 0x07,
-	0x22, 0x24, 0x42, 0xf6, 0x2d, 0xbd, 0x08, 0x29, 0x61, 0x9f, 0xe8, 0x23, 0xc8, 0x9f, 0x9b, 0x27,
-	0x67, 0x94, 0xd3, 0x51, 0xaa, 0x57, 0xa3, 0x05, 0x22, 0xfa, 0x6b, 0x4d, 0xdb, 0xf3, 0x0f, 0x98,
-	0x06, 0x09, 0x14, 0xb7, 0x32, 0x2f, 0x04, 0xe9, 0xaf, 0x39, 0x80, 0xe1, 0xb2, 0x63, 0x44, 0x6f,
-	0xc0, 0xe2, 0xf0, 0xd6, 0x18, 0x23, 0x7c, 0x2f, 0x98, 0x71, 0xb4, 0x31, 0x2e, 0xb3, 0x31, 0x2e,
-	0xef, 0xc1, 0xdc, 0xf0, 0x24, 0xec, 0x6e, 0xc8, 0x73, 0x69, 0x20, 0xc3, 0x5d, 0xf4, 0x10, 0x86,
-	0x87, 0x62, 0x70, 0x07, 0x01, 0xe5, 0xf3, 0x03, 0xa9, 0xca, 0x3c, 0x2d, 0x41, 0xde, 0xf3, 0x4d,
-	0xd7, 0xe7, 0xbc, 0x67, 0x49, 0x30, 0x60, 0x34, 0x50, 0xa7, 0x5b, 0x29, 0x72, 0x19, 0xfb, 0x0c,
-	0xdc, 0x9d, 0x53, 0xd7, 0xa3, 0x86, 0xe7, 0xbb, 0xa6, 0xd3, 0xad, 0xcc, 0xac, 0x09, 0xeb, 0x33,
-	0xcc, 0x1d, 0x97, 0x6a, 0x5c, 0x38, 0x38, 0xc5, 0xd9, 0x6b, 0x9e, 0x62, 0x03, 0x8a, 0xe7, 0xa6,
-	0x6b, 0x9b, 0x8e, 0x5f, 0x01, 0xce, 0xf3, 0xc3, 0x34, 0xd3, 0x83, 0x40, 0x65, 0xe8, 0x61, 0xff,
-	0x06, 0x89, 0xec, 0xd0, 0xc7, 0x00, 0x0c, 0x83, 0x67, 0xb9, 0x76, 0xdf, 0xaf, 0x94, 0xb8, 0x97,
-	0x3b, 0x69, 0x5e, 0xf4, 0x81, 0xd6, 0xfe, 0x0d, 0x12, 0xb3, 0x41, 0x3f, 0x0a, 0xaf, 0xd2, 0x1c,
-	0xbf, 0x4a, 0xeb, 0x97, 0x83, 0xff, 0xbf, 0xdc, 0xa3, 0xed, 0x62, 0x68, 0x25, 0xfd, 0x67, 0x16,
-	0x16, 0xc7, 0xb6, 0x8f, 0x5e, 0x85, 0x74, 0x0b, 0x9c, 0xee, 0x8d, 0xa9, 0x38, 0xab, 0xc5, 0x68,
-	0xdf, 0x81, 0x02, 0x3d, 0x3a, 0xa2, 0x96, 0xcf, 0x51, 0x95, 0xeb, 0x4f, 0xa6, 0xf3, 0xa0, 0x70,
-	0x1b, 0x12, 0xda, 0xa2, 0xc7, 0xb0, 0x60, 0x9e, 0xf8, 0xd4, 0x75, 0x4c, 0x9f, 0x1a, 0x6f, 0x4c,
-	0x8f, 0x7a, 0x51, 0x5a, 0x18, 0x88, 0xb7, 0x99, 0x14, 0xad, 0x40, 0xf1, 0x98, 0x3a, 0xb1, 0x1b,
-	0x5b, 0x60, 0xc3, 0xe0, 0xb2, 0x0e, 0xcf, 0xc1, 0xb0, 0xbb, 0x5e, 0x25, 0xbf, 0x96, 0x65, 0x97,
-	0x75, 0x28, 0xc5, 0x5d, 0x0f, 0xfd, 0x0c, 0xc0, 0xea, 0x39, 0x5d, 0x9b, 0xe7, 0xda, 0x4a, 0x81,
-	0x1f, 0xd3, 0x0f, 0xa6, 0x83, 0x2c, 0x9f, 0xd8, 0x8e, 0x6d, 0x99, 0x27, 0x72, 0x64, 0x4f, 0x62,
-	0xae, 0x50, 0x0f, 0x3e, 0xb0, 0x42, 0x05, 0xc3, 0xb3, 0x8f, 0x1d, 0xfb, 0xc8, 0xb6, 0x4c, 0xc7,
-	0xa2, 0x3c, 0x02, 0xca, 0xf5, 0xad, 0xeb, 0xad, 0xa1, 0xc5, 0x3c, 0x90, 0x25, 0x2b, 0x45, 0x5a,
-	0xfd, 0xbd, 0x00, 0x8b, 0x63, 0x90, 0x58, 0x30, 0xb2, 0x48, 0xf5, 0x2a, 0x02, 0xdf, 0x7d, 0x30,
-	0x40, 0x0d, 0x98, 0xa3, 0xef, 0x38, 0x8f, 0x27, 0x9c, 0x9a, 0x0c, 0xdf, 0x77, 0xea, 0xd5, 0x56,
-	0x42, 0x3d, 0xdc, 0x25, 0x25, 0x3a, 0xf8, 0xf6, 0x58, 0xee, 0xb5, 0x7a, 0x8e, 0x45, 0xfb, 0xb1,
-	0x9c, 0x3d, 0x1b, 0x4a, 0x70, 0x97, 0x9d, 0x4b, 0xef, 0xd4, 0x3e, 0x8d, 0x9d, 0x0b, 0x1b, 0xe2,
-	0xae, 0xf4, 0x39, 0xe4, 0xd8, 0x6d, 0x41, 0x4b, 0x20, 0xea, 0x87, 0x6d, 0xc5, 0xe8, 0xa8, 0x5a,
-	0x5b, 0x91, 0xf1, 0x2e, 0x56, 0x76, 0xc4, 0x1b, 0xa8, 0x0c, 0xc0, 0xa5, 0x2d, 0x7d, 0x5f, 0x21,
-	0xa2, 0x80, 0xe6, 0x61, 0x16, 0xab, 0x9a, 0x42, 0x74, 0xdc, 0x52, 0xc5, 0x0c, 0x9a, 0x83, 0x99,
-	0x1d, 0xa5, 0xa9, 0xf0, 0x51, 0x16, 0x89, 0x30, 0xa7, 0x75, 0xb6, 0x35, 0x1d, 0xeb, 0x1d, 0x2e,
-	0xc9, 0xa1, 0x22, 0x64, 0x35, 0xb5, 0x2d, 0xe6, 0x99, 0x1f, 0x4d, 0x27, 0x1d, 0x59, 0xef, 0x90,
-	0x46, 0x53, 0x2c, 0xb0, 0x09, 0x59, 0x3d, 0x10, 0x8b, 0xd2, 0x5f, 0x04, 0x28, 0x04, 0x77, 0x0d,
-	0x2d, 0x03, 0x52, 0x76, 0x77, 0x15, 0x59, 0x4f, 0x60, 0x10, 0x61, 0x2e, 0x94, 0x47, 0x28, 0xca,
-	0x00, 0xbb, 0xa4, 0xf1, 0x5a, 0xd1, 0xf6, 0xf1, 0xae, 0x2e, 0x66, 0x50, 0x15, 0x96, 0xf9, 0xd8,
-	0x68, 0x13, 0x45, 0x53, 0xc8, 0x01, 0x56, 0xf7, 0x0c, 0xac, 0xee, 0x28, 0x4d, 0x31, 0x8b, 0x10,
-	0x94, 0xb5, 0x43, 0xb5, 0xa5, 0x1e, 0xbe, 0x6e, 0x75, 0x34, 0x83, 0xa1, 0xc9, 0xa1, 0x0f, 0x60,
-	0x51, 0x6d, 0xa9, 0x09, 0x71, 0x9e, 0x6d, 0x4e, 0xd3, 0x5b, 0x6d, 0x63, 0xaf, 0x81, 0x55, 0xb1,
-	0x30, 0x18, 0x36, 0x5b, 0x9a, 0x26, 0x16, 0xd9, 0x22, 0x5a, 0xbb, 0x89, 0x65, 0xc5, 0xd0, 0xb0,
-	0xae, 0x18, 0x3b, 0x58, 0x23, 0x9d, 0x36, 0xdf, 0xe7, 0x8c, 0xf4, 0xe7, 0x0c, 0x2c, 0xa5, 0x5d,
-	0x0d, 0xf4, 0x10, 0xee, 0xc9, 0x4d, 0xac, 0x62, 0xb9, 0xd1, 0x34, 0x34, 0xbc, 0xa7, 0xe2, 0x5d,
-	0x2c, 0x37, 0x54, 0x39, 0x49, 0xf3, 0x5d, 0x58, 0x4d, 0x57, 0x8b, 0xf1, 0xde, 0x51, 0x65, 0x85,
-	0xe8, 0x0c, 0x5a, 0x06, 0x01, 0x14, 0xb6, 0x15, 0x15, 0xef, 0x31, 0xd6, 0x17, 0x61, 0xbe, 0x89,
-	0x3f, 0x51, 0x9a, 0x87, 0x46, 0x28, 0xe2, 0xfb, 0x0b, 0x45, 0xed, 0x86, 0xbe, 0xdf, 0xda, 0x53,
-	0x54, 0x2c, 0x07, 0x87, 0x10, 0x1b, 0x17, 0x98, 0xe5, 0x0e, 0xe9, 0xec, 0x19, 0x44, 0xd1, 0xda,
-	0x2d, 0x55, 0x53, 0xc4, 0x22, 0x3b, 0x83, 0x7d, 0xac, 0xe9, 0x2d, 0xb9, 0xf5, 0xba, 0xdd, 0xd0,
-	0xf1, 0x36, 0x6e, 0x62, 0xfd, 0x50, 0x9c, 0x41, 0x2b, 0x70, 0x53, 0x6e, 0xa9, 0xbb, 0x0a, 0xd1,
-	0x0c, 0x4d, 0x51, 0x35, 0xac, 0xe3, 0x03, 0x36, 0x31, 0x8b, 0x16, 0xa0, 0x44, 0xb0, 0xf6, 0x89,
-	0xb1, 0xdb, 0x90, 0xf5, 0x16, 0x11, 0x81, 0x09, 0x1a, 0x9a, 0xd6, 0x92, 0x71, 0x83, 0x73, 0x53,
-	0xe2, 0xab, 0x92, 0x96, 0xae, 0xc8, 0x3a, 0x3e, 0x50, 0xc4, 0x39, 0x06, 0xee, 0x75, 0xa7, 0xa9,
-	0xe3, 0x76, 0x53, 0x31, 0x88, 0xd2, 0x6e, 0x11, 0x5d, 0xd9, 0x11, 0xe7, 0xa5, 0x7f, 0x64, 0x00,
-	0x86, 0x69, 0x3b, 0x9e, 0x47, 0x84, 0x91, 0x3c, 0xf2, 0x43, 0xc8, 0xd3, 0x77, 0x2c, 0x37, 0x04,
-	0x31, 0x72, 0xff, 0xf2, 0xf4, 0x5f, 0x53, 0xde, 0xf5, 0x1c, 0x12, 0x58, 0xa0, 0x03, 0x58, 0xb0,
-	0x7a, 0x5d, 0xdb, 0x39, 0x36, 0x3c, 0xfa, 0x8b, 0x33, 0x56, 0x1f, 0x79, 0x9c, 0x94, 0xea, 0x4f,
-	0xaf, 0x70, 0x22, 0x73, 0x2b, 0x2d, 0x34, 0x22, 0x65, 0x6b, 0x64, 0x5c, 0x35, 0x21, 0xc7, 0x96,
-	0x19, 0x16, 0x5a, 0x21, 0xa5, 0xd0, 0x66, 0x86, 0x85, 0xf6, 0x19, 0xe4, 0x8f, 0xdc, 0xa8, 0xde,
-	0x97, 0xea, 0xab, 0x63, 0x75, 0x02, 0x3b, 0xfe, 0xf3, 0x7a, 0x58, 0x28, 0xb8, 0x66, 0xf5, 0x05,
-	0x94, 0x47, 0x41, 0x4c, 0xbb, 0x98, 0xf4, 0x63, 0x80, 0x61, 0xca, 0x40, 0x77, 0xa1, 0x14, 0x76,
-	0x68, 0xbc, 0x5f, 0x08, 0xa8, 0x0d, 0x9b, 0x36, 0xde, 0x2c, 0x04, 0x6d, 0x4c, 0x26, 0x6a, 0x63,
-	0xa4, 0x23, 0xa8, 0xca, 0x2e, 0x35, 0x7d, 0x3a, 0xd2, 0x61, 0x11, 0x86, 0xc2, 0xf3, 0xd1, 0x3e,
-	0x94, 0x47, 0x9b, 0x1c, 0xee, 0xb1, 0x54, 0xbf, 0x77, 0x65, 0x8f, 0x46, 0xe6, 0x47, 0x9a, 0x20,
-	0x49, 0x81, 0x95, 0x3d, 0xea, 0xa7, 0x2e, 0x92, 0xda, 0x49, 0x09, 0xa9, 0x9d, 0x94, 0xf4, 0x37,
-	0x01, 0xaa, 0x9d, 0x7e, 0x77, 0x12, 0xde, 0x6b, 0xb8, 0x4a, 0xd9, 0x5b, 0xe6, 0x7f, 0xdb, 0x1b,
-	0x7a, 0x09, 0xa5, 0x33, 0x8e, 0x89, 0xbf, 0x00, 0xc2, 0x53, 0x1f, 0xef, 0x0e, 0x76, 0xd9, 0x23,
-	0xe1, 0xb5, 0xe9, 0xbd, 0x25, 0x10, 0xa8, 0xb3, 0x6f, 0x69, 0x1f, 0xaa, 0x3b, 0xf4, 0x84, 0xbe,
-	0xff, 0x86, 0xa4, 0x7f, 0x09, 0xb0, 0xaa, 0x51, 0xd3, 0xb5, 0x3e, 0x1d, 0x71, 0xe5, 0x45, 0xbe,
-	0xee, 0x42, 0x69, 0xf8, 0x34, 0x88, 0x0a, 0x14, 0x0c, 0xde, 0x06, 0x5e, 0xea, 0xe3, 0x20, 0x73,
-	0xe9, 0xe3, 0x20, 0xde, 0xd0, 0xbe, 0x80, 0x3c, 0x6b, 0x48, 0xbc, 0x4a, 0x6e, 0x2d, 0x3b, 0x65,
-	0xe3, 0x18, 0x18, 0xb0, 0xd2, 0xd6, 0x37, 0x8f, 0xa9, 0xe1, 0xf7, 0xde, 0x52, 0x27, 0x7a, 0x56,
-	0x30, 0x89, 0xce, 0x04, 0x68, 0x15, 0xf8, 0xc0, 0xf0, 0xec, 0xcf, 0x82, 0xb7, 0x45, 0x9e, 0xcc,
-	0x30, 0x81, 0x66, 0x7f, 0x46, 0xa5, 0xaf, 0x05, 0xb8, 0x95, 0xbe, 0x69, 0xaf, 0xdf, 0x73, 0x3c,
-	0x8a, 0x7e, 0x0a, 0x0b, 0xa3, 0x0c, 0x06, 0x3b, 0x9f, 0xea, 0x9c, 0xcb, 0x23, 0x14, 0x7b, 0xe8,
-	0x11, 0x2c, 0x38, 0xf4, 0x9d, 0x6f, 0xc4, 0xd0, 0x06, 0xfc, 0xcc, 0x33, 0x71, 0x3b, 0x42, 0x2c,
-	0x1d, 0xc2, 0x4a, 0x32, 0xa8, 0xa2, 0x43, 0x78, 0x05, 0x30, 0x74, 0x1a, 0x46, 0xd3, 0x9d, 0xcb,
-	0x91, 0x90, 0x98, 0x85, 0xf4, 0x85, 0x00, 0xb7, 0xb7, 0x4d, 0xdf, 0xfa, 0x34, 0xb9, 0xc0, 0xe0,
-	0x98, 0x3f, 0x86, 0x52, 0xec, 0x39, 0x1b, 0x6e, 0xf6, 0xaa, 0x25, 0xe2, 0x26, 0xec, 0x3c, 0xdc,
-	0xc0, 0x59, 0xec, 0x0d, 0x19, 0x4a, 0x70, 0x57, 0xfa, 0x4e, 0x80, 0x3b, 0x93, 0x20, 0x84, 0xa4,
-	0x13, 0x28, 0x52, 0xc7, 0x77, 0x6d, 0x1a, 0xad, 0xff, 0x22, 0x6d, 0xfd, 0xcb, 0x9d, 0xd4, 0x82,
-	0xce, 0x3c, 0x72, 0x54, 0xf5, 0x20, 0x1f, 0x34, 0xe6, 0x1b, 0x50, 0x08, 0x1e, 0xc5, 0x21, 0x7d,
-	0x28, 0xf2, 0xed, 0xf6, 0xad, 0x9a, 0xc6, 0x67, 0x48, 0xa8, 0x91, 0xa0, 0x3b, 0x73, 0x6d, 0xba,
-	0x5f, 0xc2, 0xd2, 0x48, 0xda, 0x8a, 0x48, 0xbe, 0x0f, 0xb1, 0x1c, 0x30, 0x8c, 0xc9, 0xb9, 0xa1,
-	0x10, 0x77, 0xa5, 0x3f, 0x09, 0xb0, 0x92, 0x4c, 0x56, 0xd7, 0x71, 0xf0, 0xbe, 0xe8, 0xdf, 0x2f,
-	0x31, 0xbd, 0x82, 0x95, 0x64, 0x62, 0xba, 0xd6, 0xee, 0x7f, 0x93, 0x81, 0x4a, 0x32, 0x32, 0x07,
-	0x97, 0xf4, 0x09, 0xa0, 0xb1, 0xbc, 0x16, 0xa5, 0x24, 0x31, 0x91, 0xd8, 0x3c, 0x74, 0x3f, 0xf1,
-	0x56, 0xe6, 0x57, 0x72, 0xff, 0xc6, 0xe8, 0x6b, 0xf9, 0xf1, 0xd8, 0x6b, 0x39, 0x1b, 0xaa, 0x4d,
-	0x7a, 0x2f, 0xe7, 0x52, 0x2a, 0x6b, 0x7e, 0x58, 0xc6, 0x47, 0xd3, 0x52, 0xe1, 0xd2, 0xb4, 0x54,
-	0x1c, 0x4d, 0x4b, 0xdb, 0x25, 0x98, 0x1d, 0x2c, 0x2a, 0xfd, 0x5a, 0x80, 0x0f, 0x53, 0x98, 0x08,
-	0x63, 0xe5, 0xfd, 0xe3, 0x75, 0xca, 0xb4, 0xb4, 0x41, 0xa1, 0x3c, 0x9a, 0x80, 0x59, 0x5f, 0xda,
-	0x50, 0xd5, 0x96, 0xce, 0x7b, 0x39, 0x23, 0xe5, 0x7d, 0x50, 0x82, 0xe2, 0x9e, 0xa2, 0x2a, 0x04,
-	0xcb, 0xa2, 0xc0, 0x06, 0x07, 0x0d, 0x82, 0x1b, 0x2a, 0xeb, 0xc9, 0x67, 0x20, 0xc7, 0x66, 0xc4,
-	0x2c, 0x7f, 0x43, 0x90, 0x86, 0xaa, 0xc9, 0x04, 0xb7, 0x75, 0x31, 0x57, 0xff, 0x6a, 0x1e, 0x6e,
-	0xc6, 0xf3, 0xa8, 0x7b, 0x6e, 0x5b, 0xf4, 0xe0, 0x19, 0xfa, 0x56, 0x80, 0x9b, 0x29, 0xbd, 0x06,
-	0xaa, 0xa5, 0xed, 0x75, 0x72, 0x53, 0x52, 0xbd, 0x3a, 0x71, 0x4b, 0x1b, 0x5f, 0xfe, 0xfd, 0x9f,
-	0xdf, 0x64, 0x1e, 0x48, 0x28, 0xf1, 0x73, 0x20, 0xf5, 0xbd, 0xad, 0x44, 0xd5, 0x47, 0x5f, 0x0b,
-	0x20, 0x26, 0x5b, 0x13, 0x94, 0xfa, 0x23, 0xd4, 0x84, 0x06, 0x66, 0x1a, 0x40, 0x35, 0x0e, 0x68,
-	0x1d, 0x3d, 0x1a, 0x07, 0xb4, 0xf9, 0xab, 0xb1, 0x48, 0xf8, 0x1c, 0xfd, 0x51, 0x80, 0x9b, 0x29,
-	0x7d, 0x4e, 0x3a, 0x57, 0x93, 0x1b, 0xa2, 0x69, 0xa0, 0xbd, 0xe2, 0xd0, 0x5e, 0x54, 0xa7, 0x84,
-	0x36, 0xc6, 0xdf, 0x6f, 0x05, 0xb8, 0x99, 0xd2, 0xc1, 0xa4, 0x43, 0x9d, 0xdc, 0xea, 0x54, 0x97,
-	0xc7, 0xf2, 0x92, 0x72, 0xda, 0xf7, 0x2f, 0x22, 0xea, 0x36, 0xa6, 0xa5, 0xee, 0x77, 0x02, 0x2c,
-	0xa5, 0x75, 0x04, 0x68, 0x33, 0x0d, 0xd0, 0x25, 0x0d, 0x53, 0xf5, 0xa3, 0xe9, 0x0d, 0x82, 0x58,
-	0x96, 0x1e, 0x70, 0xac, 0x77, 0xa4, 0x0f, 0x53, 0xb0, 0x7a, 0xdc, 0x70, 0x4b, 0xd8, 0x40, 0x5f,
-	0x09, 0x20, 0x26, 0xef, 0x77, 0xfa, 0x8d, 0x9b, 0xd0, 0x45, 0x54, 0xaf, 0x48, 0x0f, 0xd2, 0x7d,
-	0x8e, 0xe3, 0xb6, 0xb4, 0x90, 0xc0, 0xb1, 0x15, 0xaf, 0x0e, 0x7f, 0x10, 0x60, 0x39, 0xbd, 0x04,
-	0xa3, 0x67, 0xd7, 0x29, 0xd7, 0x01, 0xa4, 0xfa, 0xf5, 0x2b, 0xbc, 0xf4, 0x88, 0xc3, 0x5c, 0x93,
-	0x56, 0x93, 0x30, 0xdf, 0x0c, 0xed, 0x18, 0x61, 0x5f, 0x0a, 0x30, 0x3f, 0x12, 0x7c, 0x68, 0xfd,
-	0xca, 0xf8, 0x9c, 0x96, 0xaa, 0xc7, 0x1c, 0xc3, 0x3d, 0x74, 0x37, 0x81, 0x61, 0xe4, 0x6e, 0xb1,
-	0x7b, 0xf5, 0xad, 0x00, 0x62, 0x32, 0xd2, 0xd2, 0x4f, 0x6d, 0x42, 0xcd, 0xbf, 0x12, 0xca, 0x73,
-	0x0e, 0xe5, 0x69, 0xf5, 0x2a, 0x28, 0x23, 0xa7, 0xf8, 0x85, 0x00, 0x62, 0x32, 0xaa, 0xd2, 0x61,
-	0x4d, 0xa8, 0xe6, 0x13, 0x03, 0x2f, 0x64, 0x66, 0xe3, 0x4a, 0x66, 0xbe, 0x11, 0x60, 0x71, 0xac,
-	0xbe, 0xa1, 0x27, 0xd3, 0x44, 0xcf, 0xe0, 0xfa, 0x3c, 0x9d, 0x52, 0x3b, 0xbc, 0x39, 0xf7, 0x38,
-	0xb6, 0x55, 0x69, 0x39, 0x89, 0x6d, 0x10, 0x65, 0xdb, 0x6f, 0x61, 0xd9, 0xea, 0x9d, 0xa6, 0xb8,
-	0xdd, 0x16, 0x63, 0x1e, 0xdb, 0x6c, 0xcf, 0x6d, 0xe1, 0xe7, 0x5b, 0x91, 0x5e, 0xef, 0xc4, 0x74,
-	0x8e, 0x6b, 0x3d, 0xf7, 0x78, 0xf3, 0x98, 0x3a, 0x9c, 0x91, 0xcd, 0x60, 0xca, 0xec, 0xdb, 0x5e,
-	0xfc, 0x6f, 0xa6, 0x97, 0xd1, 0xf7, 0xbf, 0x05, 0xe1, 0x4d, 0x81, 0x6b, 0x3e, 0xff, 0x6f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xf4, 0x94, 0x75, 0x44, 0x8f, 0x1a, 0x00, 0x00,
-}
diff --git a/googleapis/genomics/v1/cigar.pb.go b/googleapis/genomics/v1/cigar.pb.go
index 012ec9067b..a64fc5a124 100644
--- a/googleapis/genomics/v1/cigar.pb.go
+++ b/googleapis/genomics/v1/cigar.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/cigar.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes the different types of CIGAR alignment operations that exist.
 // Used wherever CIGAR alignments are used.
@@ -83,6 +86,7 @@ var CigarUnit_Operation_name = map[int32]string{
 	8: "SEQUENCE_MATCH",
 	9: "SEQUENCE_MISMATCH",
 }
+
 var CigarUnit_Operation_value = map[string]int32{
 	"OPERATION_UNSPECIFIED": 0,
 	"ALIGNMENT_MATCH":       1,
@@ -99,8 +103,9 @@ var CigarUnit_Operation_value = map[string]int32{
 func (x CigarUnit_Operation) String() string {
 	return proto.EnumName(CigarUnit_Operation_name, int32(x))
 }
+
 func (CigarUnit_Operation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_cigar_2258d7e5d1ecd4a5, []int{0, 0}
+	return fileDescriptor_353bda9a6ec457b8, []int{0, 0}
 }
 
 // A single CIGAR operation.
@@ -122,16 +127,17 @@ func (m *CigarUnit) Reset()         { *m = CigarUnit{} }
 func (m *CigarUnit) String() string { return proto.CompactTextString(m) }
 func (*CigarUnit) ProtoMessage()    {}
 func (*CigarUnit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cigar_2258d7e5d1ecd4a5, []int{0}
+	return fileDescriptor_353bda9a6ec457b8, []int{0}
 }
+
 func (m *CigarUnit) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CigarUnit.Unmarshal(m, b)
 }
 func (m *CigarUnit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CigarUnit.Marshal(b, m, deterministic)
 }
-func (dst *CigarUnit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CigarUnit.Merge(dst, src)
+func (m *CigarUnit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CigarUnit.Merge(m, src)
 }
 func (m *CigarUnit) XXX_Size() int {
 	return xxx_messageInfo_CigarUnit.Size(m)
@@ -164,15 +170,13 @@ func (m *CigarUnit) GetReferenceSequence() string {
 }
 
 func init() {
-	proto.RegisterType((*CigarUnit)(nil), "google.genomics.v1.CigarUnit")
 	proto.RegisterEnum("google.genomics.v1.CigarUnit_Operation", CigarUnit_Operation_name, CigarUnit_Operation_value)
+	proto.RegisterType((*CigarUnit)(nil), "google.genomics.v1.CigarUnit")
 }
 
-func init() {
-	proto.RegisterFile("google/genomics/v1/cigar.proto", fileDescriptor_cigar_2258d7e5d1ecd4a5)
-}
+func init() { proto.RegisterFile("google/genomics/v1/cigar.proto", fileDescriptor_353bda9a6ec457b8) }
 
-var fileDescriptor_cigar_2258d7e5d1ecd4a5 = []byte{
+var fileDescriptor_353bda9a6ec457b8 = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xcf, 0x0e, 0x93, 0x30,
 	0x1c, 0xb6, 0x63, 0x6e, 0xe3, 0x97, 0xb8, 0x75, 0x35, 0x33, 0xd3, 0x18, 0xb3, 0xec, 0xe2, 0x3c,
diff --git a/googleapis/genomics/v1/datasets.pb.go b/googleapis/genomics/v1/datasets.pb.go
index 90925d698b..b2d91b4740 100644
--- a/googleapis/genomics/v1/datasets.pb.go
+++ b/googleapis/genomics/v1/datasets.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/datasets.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A Dataset is a collection of genomic data.
 //
@@ -50,16 +50,17 @@ func (m *Dataset) Reset()         { *m = Dataset{} }
 func (m *Dataset) String() string { return proto.CompactTextString(m) }
 func (*Dataset) ProtoMessage()    {}
 func (*Dataset) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{0}
+	return fileDescriptor_ddd0efa223187e29, []int{0}
 }
+
 func (m *Dataset) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Dataset.Unmarshal(m, b)
 }
 func (m *Dataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Dataset.Marshal(b, m, deterministic)
 }
-func (dst *Dataset) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Dataset.Merge(dst, src)
+func (m *Dataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dataset.Merge(m, src)
 }
 func (m *Dataset) XXX_Size() int {
 	return xxx_messageInfo_Dataset.Size(m)
@@ -118,16 +119,17 @@ func (m *ListDatasetsRequest) Reset()         { *m = ListDatasetsRequest{} }
 func (m *ListDatasetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDatasetsRequest) ProtoMessage()    {}
 func (*ListDatasetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{1}
+	return fileDescriptor_ddd0efa223187e29, []int{1}
 }
+
 func (m *ListDatasetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatasetsRequest.Unmarshal(m, b)
 }
 func (m *ListDatasetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatasetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDatasetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatasetsRequest.Merge(dst, src)
+func (m *ListDatasetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsRequest.Merge(m, src)
 }
 func (m *ListDatasetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDatasetsRequest.Size(m)
@@ -176,16 +178,17 @@ func (m *ListDatasetsResponse) Reset()         { *m = ListDatasetsResponse{} }
 func (m *ListDatasetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDatasetsResponse) ProtoMessage()    {}
 func (*ListDatasetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{2}
+	return fileDescriptor_ddd0efa223187e29, []int{2}
 }
+
 func (m *ListDatasetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatasetsResponse.Unmarshal(m, b)
 }
 func (m *ListDatasetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatasetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDatasetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatasetsResponse.Merge(dst, src)
+func (m *ListDatasetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsResponse.Merge(m, src)
 }
 func (m *ListDatasetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDatasetsResponse.Size(m)
@@ -222,16 +225,17 @@ func (m *CreateDatasetRequest) Reset()         { *m = CreateDatasetRequest{} }
 func (m *CreateDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDatasetRequest) ProtoMessage()    {}
 func (*CreateDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{3}
+	return fileDescriptor_ddd0efa223187e29, []int{3}
 }
+
 func (m *CreateDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDatasetRequest.Unmarshal(m, b)
 }
 func (m *CreateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDatasetRequest.Merge(dst, src)
+func (m *CreateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatasetRequest.Merge(m, src)
 }
 func (m *CreateDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDatasetRequest.Size(m)
@@ -268,16 +272,17 @@ func (m *UpdateDatasetRequest) Reset()         { *m = UpdateDatasetRequest{} }
 func (m *UpdateDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDatasetRequest) ProtoMessage()    {}
 func (*UpdateDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{4}
+	return fileDescriptor_ddd0efa223187e29, []int{4}
 }
+
 func (m *UpdateDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDatasetRequest.Unmarshal(m, b)
 }
 func (m *UpdateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDatasetRequest.Merge(dst, src)
+func (m *UpdateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDatasetRequest.Merge(m, src)
 }
 func (m *UpdateDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDatasetRequest.Size(m)
@@ -321,16 +326,17 @@ func (m *DeleteDatasetRequest) Reset()         { *m = DeleteDatasetRequest{} }
 func (m *DeleteDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDatasetRequest) ProtoMessage()    {}
 func (*DeleteDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{5}
+	return fileDescriptor_ddd0efa223187e29, []int{5}
 }
+
 func (m *DeleteDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDatasetRequest.Unmarshal(m, b)
 }
 func (m *DeleteDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDatasetRequest.Merge(dst, src)
+func (m *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDatasetRequest.Merge(m, src)
 }
 func (m *DeleteDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDatasetRequest.Size(m)
@@ -360,16 +366,17 @@ func (m *UndeleteDatasetRequest) Reset()         { *m = UndeleteDatasetRequest{}
 func (m *UndeleteDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*UndeleteDatasetRequest) ProtoMessage()    {}
 func (*UndeleteDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{6}
+	return fileDescriptor_ddd0efa223187e29, []int{6}
 }
+
 func (m *UndeleteDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeleteDatasetRequest.Unmarshal(m, b)
 }
 func (m *UndeleteDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeleteDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UndeleteDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeleteDatasetRequest.Merge(dst, src)
+func (m *UndeleteDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteDatasetRequest.Merge(m, src)
 }
 func (m *UndeleteDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_UndeleteDatasetRequest.Size(m)
@@ -399,16 +406,17 @@ func (m *GetDatasetRequest) Reset()         { *m = GetDatasetRequest{} }
 func (m *GetDatasetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDatasetRequest) ProtoMessage()    {}
 func (*GetDatasetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_datasets_17c76b380aa3a6d9, []int{7}
+	return fileDescriptor_ddd0efa223187e29, []int{7}
 }
+
 func (m *GetDatasetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDatasetRequest.Unmarshal(m, b)
 }
 func (m *GetDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDatasetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDatasetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDatasetRequest.Merge(dst, src)
+func (m *GetDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatasetRequest.Merge(m, src)
 }
 func (m *GetDatasetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDatasetRequest.Size(m)
@@ -437,6 +445,62 @@ func init() {
 	proto.RegisterType((*GetDatasetRequest)(nil), "google.genomics.v1.GetDatasetRequest")
 }
 
+func init() { proto.RegisterFile("google/genomics/v1/datasets.proto", fileDescriptor_ddd0efa223187e29) }
+
+var fileDescriptor_ddd0efa223187e29 = []byte{
+	// 786 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xd1, 0x4e, 0x13, 0x4d,
+	0x14, 0xce, 0x16, 0xfe, 0x1f, 0x7a, 0xa0, 0xa0, 0x63, 0xc5, 0xda, 0x8a, 0x96, 0x8d, 0x42, 0xad,
+	0xba, 0x4d, 0x6b, 0x08, 0x49, 0x89, 0x37, 0x88, 0x12, 0x12, 0x49, 0x9a, 0x02, 0x5e, 0x78, 0xd3,
+	0x0c, 0xdd, 0xa1, 0x8e, 0x74, 0x77, 0xd6, 0x9d, 0x29, 0x28, 0xc8, 0x0d, 0x77, 0x5c, 0xfb, 0x00,
+	0x26, 0xde, 0xf9, 0x3c, 0xbe, 0x82, 0x0f, 0xe1, 0xa5, 0x99, 0xd9, 0xd9, 0x76, 0xdb, 0x2e, 0x05,
+	0x8c, 0x77, 0xdb, 0x73, 0xbe, 0x73, 0xbe, 0xef, 0xcc, 0xf9, 0x76, 0xba, 0xb0, 0xd0, 0x62, 0xac,
+	0xd5, 0x26, 0xa5, 0x16, 0x71, 0x99, 0x43, 0x9b, 0xbc, 0x74, 0x58, 0x2e, 0xd9, 0x58, 0x60, 0x4e,
+	0x04, 0xb7, 0x3c, 0x9f, 0x09, 0x86, 0x50, 0x00, 0xb1, 0x42, 0x88, 0x75, 0x58, 0xce, 0xde, 0xd3,
+	0x65, 0xd8, 0xa3, 0x25, 0xec, 0xba, 0x4c, 0x60, 0x41, 0x99, 0xab, 0x2b, 0xb2, 0xf7, 0x75, 0x96,
+	0x62, 0x47, 0xf6, 0xa3, 0xd8, 0x69, 0x78, 0xac, 0x4d, 0x9b, 0x9f, 0x75, 0x3e, 0xdb, 0x9f, 0xef,
+	0xcb, 0xe5, 0x74, 0x4e, 0xfd, 0xda, 0xeb, 0xec, 0x97, 0x88, 0xe3, 0x89, 0x30, 0x99, 0x1f, 0x4c,
+	0xee, 0x53, 0xd2, 0xb6, 0x1b, 0x0e, 0xe6, 0x07, 0x1a, 0xf1, 0x60, 0x10, 0x21, 0xa8, 0x43, 0xb8,
+	0xc0, 0x8e, 0x17, 0x00, 0xcc, 0x73, 0x03, 0x26, 0xd6, 0x83, 0x01, 0xd1, 0x0c, 0x24, 0xa8, 0x9d,
+	0x31, 0xf2, 0x46, 0x21, 0x59, 0x4f, 0x50, 0x1b, 0xcd, 0x03, 0x78, 0x3e, 0xfb, 0x40, 0x9a, 0xa2,
+	0x41, 0xed, 0x4c, 0x42, 0xc5, 0x93, 0x3a, 0xb2, 0x69, 0x23, 0x04, 0xe3, 0x2e, 0x76, 0x48, 0x66,
+	0x4c, 0x25, 0xd4, 0x33, 0x5a, 0x85, 0xa9, 0xa6, 0x4f, 0xb0, 0x20, 0x0d, 0x49, 0x94, 0x19, 0xcf,
+	0x1b, 0x85, 0xa9, 0x4a, 0xd6, 0xd2, 0x47, 0x16, 0xaa, 0xb0, 0x76, 0x42, 0x15, 0x75, 0x08, 0xe0,
+	0x32, 0x60, 0x7a, 0x70, 0xeb, 0x0d, 0xe5, 0x42, 0xcb, 0xe1, 0x75, 0xf2, 0xb1, 0x43, 0xb8, 0x18,
+	0x90, 0x61, 0x0c, 0xca, 0xc8, 0x41, 0xd2, 0xc3, 0x2d, 0xd2, 0xe0, 0xf4, 0x98, 0x28, 0x91, 0xff,
+	0xd5, 0x27, 0x65, 0x60, 0x9b, 0x1e, 0x13, 0x55, 0x2b, 0x93, 0x82, 0x1d, 0x10, 0x57, 0x2b, 0x55,
+	0xf0, 0x1d, 0x19, 0x30, 0x8f, 0x20, 0xdd, 0xcf, 0xc8, 0x3d, 0xe6, 0x72, 0x82, 0x56, 0x60, 0x32,
+	0xdc, 0x7a, 0xc6, 0xc8, 0x8f, 0x15, 0xa6, 0x2a, 0x39, 0x6b, 0x78, 0xed, 0x96, 0xae, 0xab, 0x77,
+	0xc1, 0x68, 0x11, 0x66, 0x5d, 0xf2, 0x49, 0x34, 0x22, 0xa4, 0xc1, 0xb9, 0xa5, 0x64, 0xb8, 0xd6,
+	0x25, 0xde, 0x82, 0xf4, 0x4b, 0x35, 0x78, 0xd8, 0x42, 0xcf, 0xba, 0x0c, 0x13, 0xba, 0x97, 0x1a,
+	0xf4, 0x12, 0xde, 0x10, 0x6b, 0xfe, 0x30, 0x20, 0xbd, 0xeb, 0xd9, 0xc3, 0xfd, 0xe6, 0x01, 0x34,
+	0x26, 0x72, 0x76, 0x3a, 0xb2, 0x69, 0x47, 0xe9, 0x12, 0x57, 0xa7, 0x93, 0x5b, 0xee, 0x28, 0x36,
+	0x65, 0x35, 0x75, 0xac, 0x71, 0x5b, 0x7e, 0x2d, 0xdd, 0xb8, 0x85, 0xf9, 0x41, 0x1d, 0x02, 0xb8,
+	0x7c, 0x36, 0x97, 0x21, 0xbd, 0x4e, 0xda, 0xe4, 0x9a, 0x52, 0xcd, 0x15, 0x98, 0xdb, 0x75, 0xed,
+	0xbf, 0x28, 0xac, 0xc0, 0xcd, 0x0d, 0x22, 0xae, 0x55, 0x53, 0xf9, 0x96, 0x84, 0x1b, 0xba, 0x62,
+	0x9b, 0xf8, 0x87, 0xb4, 0x49, 0xde, 0x96, 0xd1, 0x11, 0x4c, 0x47, 0xcd, 0x82, 0x96, 0xe2, 0xce,
+	0x2a, 0xc6, 0xc0, 0xd9, 0xc2, 0xe5, 0xc0, 0xc0, 0x77, 0x66, 0xfa, 0xec, 0xe7, 0xaf, 0xaf, 0x89,
+	0x19, 0x34, 0x1d, 0xbd, 0x77, 0x50, 0x07, 0x52, 0x7d, 0x66, 0x41, 0xb1, 0x0d, 0xe3, 0xfc, 0x94,
+	0x1d, 0xb5, 0x4f, 0x73, 0x5e, 0xb1, 0xdd, 0x31, 0xfb, 0xd8, 0xaa, 0xdd, 0x2d, 0x73, 0x80, 0xde,
+	0xc1, 0xa1, 0x47, 0x71, 0x9d, 0x86, 0x0e, 0x76, 0x34, 0xe1, 0x82, 0x22, 0xcc, 0xa1, 0xbb, 0x51,
+	0xc2, 0xd2, 0x49, 0x6f, 0x13, 0xa7, 0xe8, 0xcc, 0x80, 0x54, 0x9f, 0x93, 0xe3, 0x87, 0x8d, 0x33,
+	0xfb, 0x68, 0xee, 0xa2, 0xe2, 0x7e, 0x58, 0xb9, 0x98, 0xbb, 0x37, 0xb9, 0x80, 0x54, 0x9f, 0x45,
+	0xe3, 0x35, 0xc4, 0xb9, 0x38, 0x3b, 0x37, 0xf4, 0x16, 0xbc, 0x92, 0x17, 0x76, 0x38, 0x7a, 0x71,
+	0xc4, 0xe8, 0xe7, 0x06, 0xcc, 0x0e, 0x58, 0x1c, 0x15, 0x63, 0x87, 0x8f, 0x7d, 0x0f, 0x46, 0x8f,
+	0xff, 0x4c, 0xf1, 0x2f, 0x99, 0xe6, 0xc5, 0xe3, 0x77, 0x74, 0xdb, 0xaa, 0x51, 0x44, 0x5f, 0x60,
+	0x7a, 0x9b, 0x88, 0x4d, 0xec, 0xd4, 0xd4, 0x9f, 0x11, 0x32, 0xc3, 0xde, 0x14, 0x3b, 0xb2, 0x6d,
+	0x34, 0x19, 0xf2, 0xdf, 0x1e, 0xc0, 0x04, 0x59, 0xb3, 0xac, 0x98, 0x9f, 0x98, 0x8b, 0x92, 0xf9,
+	0xc4, 0x27, 0x9c, 0x75, 0xfc, 0x26, 0x79, 0xd1, 0xd5, 0x50, 0x3c, 0xad, 0xf2, 0x48, 0x37, 0xcd,
+	0xbe, 0x31, 0x8a, 0x7d, 0xe3, 0x9f, 0xb2, 0xb7, 0x06, 0xd8, 0xbf, 0x1b, 0x80, 0x76, 0x08, 0x57,
+	0x41, 0xe2, 0x3b, 0x94, 0x73, 0xf9, 0x5f, 0xde, 0xf3, 0x80, 0x26, 0x18, 0x86, 0x84, 0x52, 0x1e,
+	0x5f, 0x01, 0xa9, 0x5f, 0xf8, 0x15, 0x25, 0xaf, 0x6c, 0x3e, 0xbd, 0x58, 0x9e, 0x18, 0xaa, 0xae,
+	0x1a, 0xc5, 0xb5, 0xf7, 0x30, 0xd7, 0x64, 0x4e, 0xcc, 0xc6, 0xd7, 0x52, 0xe1, 0xad, 0x52, 0x93,
+	0x0e, 0xac, 0x19, 0xef, 0xaa, 0x21, 0x88, 0xb5, 0xb1, 0xdb, 0xb2, 0x98, 0xdf, 0x92, 0x9f, 0x37,
+	0xca, 0x9f, 0xa5, 0x20, 0x85, 0x3d, 0xca, 0xa3, 0x9f, 0x3c, 0xab, 0xe1, 0xf3, 0x6f, 0xc3, 0xd8,
+	0xfb, 0x5f, 0x21, 0x9f, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x87, 0x48, 0x07, 0xbb, 0x1b, 0x09,
+	0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -900,61 +964,3 @@ var _DatasetServiceV1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/genomics/v1/datasets.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/genomics/v1/datasets.proto", fileDescriptor_datasets_17c76b380aa3a6d9)
-}
-
-var fileDescriptor_datasets_17c76b380aa3a6d9 = []byte{
-	// 786 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xd1, 0x4e, 0x13, 0x4d,
-	0x14, 0xce, 0x16, 0xfe, 0x1f, 0x7a, 0xa0, 0xa0, 0x63, 0xc5, 0xda, 0x8a, 0x96, 0x8d, 0x42, 0xad,
-	0xba, 0x4d, 0x6b, 0x08, 0x49, 0x89, 0x37, 0x88, 0x12, 0x12, 0x49, 0x9a, 0x02, 0x5e, 0x78, 0xd3,
-	0x0c, 0xdd, 0xa1, 0x8e, 0x74, 0x77, 0xd6, 0x9d, 0x29, 0x28, 0xc8, 0x0d, 0x77, 0x5c, 0xfb, 0x00,
-	0x26, 0xde, 0xf9, 0x3c, 0xbe, 0x82, 0x0f, 0xe1, 0xa5, 0x99, 0xd9, 0xd9, 0x76, 0xdb, 0x2e, 0x05,
-	0x8c, 0x77, 0xdb, 0x73, 0xbe, 0x73, 0xbe, 0xef, 0xcc, 0xf9, 0x76, 0xba, 0xb0, 0xd0, 0x62, 0xac,
-	0xd5, 0x26, 0xa5, 0x16, 0x71, 0x99, 0x43, 0x9b, 0xbc, 0x74, 0x58, 0x2e, 0xd9, 0x58, 0x60, 0x4e,
-	0x04, 0xb7, 0x3c, 0x9f, 0x09, 0x86, 0x50, 0x00, 0xb1, 0x42, 0x88, 0x75, 0x58, 0xce, 0xde, 0xd3,
-	0x65, 0xd8, 0xa3, 0x25, 0xec, 0xba, 0x4c, 0x60, 0x41, 0x99, 0xab, 0x2b, 0xb2, 0xf7, 0x75, 0x96,
-	0x62, 0x47, 0xf6, 0xa3, 0xd8, 0x69, 0x78, 0xac, 0x4d, 0x9b, 0x9f, 0x75, 0x3e, 0xdb, 0x9f, 0xef,
-	0xcb, 0xe5, 0x74, 0x4e, 0xfd, 0xda, 0xeb, 0xec, 0x97, 0x88, 0xe3, 0x89, 0x30, 0x99, 0x1f, 0x4c,
-	0xee, 0x53, 0xd2, 0xb6, 0x1b, 0x0e, 0xe6, 0x07, 0x1a, 0xf1, 0x60, 0x10, 0x21, 0xa8, 0x43, 0xb8,
-	0xc0, 0x8e, 0x17, 0x00, 0xcc, 0x73, 0x03, 0x26, 0xd6, 0x83, 0x01, 0xd1, 0x0c, 0x24, 0xa8, 0x9d,
-	0x31, 0xf2, 0x46, 0x21, 0x59, 0x4f, 0x50, 0x1b, 0xcd, 0x03, 0x78, 0x3e, 0xfb, 0x40, 0x9a, 0xa2,
-	0x41, 0xed, 0x4c, 0x42, 0xc5, 0x93, 0x3a, 0xb2, 0x69, 0x23, 0x04, 0xe3, 0x2e, 0x76, 0x48, 0x66,
-	0x4c, 0x25, 0xd4, 0x33, 0x5a, 0x85, 0xa9, 0xa6, 0x4f, 0xb0, 0x20, 0x0d, 0x49, 0x94, 0x19, 0xcf,
-	0x1b, 0x85, 0xa9, 0x4a, 0xd6, 0xd2, 0x47, 0x16, 0xaa, 0xb0, 0x76, 0x42, 0x15, 0x75, 0x08, 0xe0,
-	0x32, 0x60, 0x7a, 0x70, 0xeb, 0x0d, 0xe5, 0x42, 0xcb, 0xe1, 0x75, 0xf2, 0xb1, 0x43, 0xb8, 0x18,
-	0x90, 0x61, 0x0c, 0xca, 0xc8, 0x41, 0xd2, 0xc3, 0x2d, 0xd2, 0xe0, 0xf4, 0x98, 0x28, 0x91, 0xff,
-	0xd5, 0x27, 0x65, 0x60, 0x9b, 0x1e, 0x13, 0x55, 0x2b, 0x93, 0x82, 0x1d, 0x10, 0x57, 0x2b, 0x55,
-	0xf0, 0x1d, 0x19, 0x30, 0x8f, 0x20, 0xdd, 0xcf, 0xc8, 0x3d, 0xe6, 0x72, 0x82, 0x56, 0x60, 0x32,
-	0xdc, 0x7a, 0xc6, 0xc8, 0x8f, 0x15, 0xa6, 0x2a, 0x39, 0x6b, 0x78, 0xed, 0x96, 0xae, 0xab, 0x77,
-	0xc1, 0x68, 0x11, 0x66, 0x5d, 0xf2, 0x49, 0x34, 0x22, 0xa4, 0xc1, 0xb9, 0xa5, 0x64, 0xb8, 0xd6,
-	0x25, 0xde, 0x82, 0xf4, 0x4b, 0x35, 0x78, 0xd8, 0x42, 0xcf, 0xba, 0x0c, 0x13, 0xba, 0x97, 0x1a,
-	0xf4, 0x12, 0xde, 0x10, 0x6b, 0xfe, 0x30, 0x20, 0xbd, 0xeb, 0xd9, 0xc3, 0xfd, 0xe6, 0x01, 0x34,
-	0x26, 0x72, 0x76, 0x3a, 0xb2, 0x69, 0x47, 0xe9, 0x12, 0x57, 0xa7, 0x93, 0x5b, 0xee, 0x28, 0x36,
-	0x65, 0x35, 0x75, 0xac, 0x71, 0x5b, 0x7e, 0x2d, 0xdd, 0xb8, 0x85, 0xf9, 0x41, 0x1d, 0x02, 0xb8,
-	0x7c, 0x36, 0x97, 0x21, 0xbd, 0x4e, 0xda, 0xe4, 0x9a, 0x52, 0xcd, 0x15, 0x98, 0xdb, 0x75, 0xed,
-	0xbf, 0x28, 0xac, 0xc0, 0xcd, 0x0d, 0x22, 0xae, 0x55, 0x53, 0xf9, 0x96, 0x84, 0x1b, 0xba, 0x62,
-	0x9b, 0xf8, 0x87, 0xb4, 0x49, 0xde, 0x96, 0xd1, 0x11, 0x4c, 0x47, 0xcd, 0x82, 0x96, 0xe2, 0xce,
-	0x2a, 0xc6, 0xc0, 0xd9, 0xc2, 0xe5, 0xc0, 0xc0, 0x77, 0x66, 0xfa, 0xec, 0xe7, 0xaf, 0xaf, 0x89,
-	0x19, 0x34, 0x1d, 0xbd, 0x77, 0x50, 0x07, 0x52, 0x7d, 0x66, 0x41, 0xb1, 0x0d, 0xe3, 0xfc, 0x94,
-	0x1d, 0xb5, 0x4f, 0x73, 0x5e, 0xb1, 0xdd, 0x31, 0xfb, 0xd8, 0xaa, 0xdd, 0x2d, 0x73, 0x80, 0xde,
-	0xc1, 0xa1, 0x47, 0x71, 0x9d, 0x86, 0x0e, 0x76, 0x34, 0xe1, 0x82, 0x22, 0xcc, 0xa1, 0xbb, 0x51,
-	0xc2, 0xd2, 0x49, 0x6f, 0x13, 0xa7, 0xe8, 0xcc, 0x80, 0x54, 0x9f, 0x93, 0xe3, 0x87, 0x8d, 0x33,
-	0xfb, 0x68, 0xee, 0xa2, 0xe2, 0x7e, 0x58, 0xb9, 0x98, 0xbb, 0x37, 0xb9, 0x80, 0x54, 0x9f, 0x45,
-	0xe3, 0x35, 0xc4, 0xb9, 0x38, 0x3b, 0x37, 0xf4, 0x16, 0xbc, 0x92, 0x17, 0x76, 0x38, 0x7a, 0x71,
-	0xc4, 0xe8, 0xe7, 0x06, 0xcc, 0x0e, 0x58, 0x1c, 0x15, 0x63, 0x87, 0x8f, 0x7d, 0x0f, 0x46, 0x8f,
-	0xff, 0x4c, 0xf1, 0x2f, 0x99, 0xe6, 0xc5, 0xe3, 0x77, 0x74, 0xdb, 0xaa, 0x51, 0x44, 0x5f, 0x60,
-	0x7a, 0x9b, 0x88, 0x4d, 0xec, 0xd4, 0xd4, 0x9f, 0x11, 0x32, 0xc3, 0xde, 0x14, 0x3b, 0xb2, 0x6d,
-	0x34, 0x19, 0xf2, 0xdf, 0x1e, 0xc0, 0x04, 0x59, 0xb3, 0xac, 0x98, 0x9f, 0x98, 0x8b, 0x92, 0xf9,
-	0xc4, 0x27, 0x9c, 0x75, 0xfc, 0x26, 0x79, 0xd1, 0xd5, 0x50, 0x3c, 0xad, 0xf2, 0x48, 0x37, 0xcd,
-	0xbe, 0x31, 0x8a, 0x7d, 0xe3, 0x9f, 0xb2, 0xb7, 0x06, 0xd8, 0xbf, 0x1b, 0x80, 0x76, 0x08, 0x57,
-	0x41, 0xe2, 0x3b, 0x94, 0x73, 0xf9, 0x5f, 0xde, 0xf3, 0x80, 0x26, 0x18, 0x86, 0x84, 0x52, 0x1e,
-	0x5f, 0x01, 0xa9, 0x5f, 0xf8, 0x15, 0x25, 0xaf, 0x6c, 0x3e, 0xbd, 0x58, 0x9e, 0x18, 0xaa, 0xae,
-	0x1a, 0xc5, 0xb5, 0xf7, 0x30, 0xd7, 0x64, 0x4e, 0xcc, 0xc6, 0xd7, 0x52, 0xe1, 0xad, 0x52, 0x93,
-	0x0e, 0xac, 0x19, 0xef, 0xaa, 0x21, 0x88, 0xb5, 0xb1, 0xdb, 0xb2, 0x98, 0xdf, 0x92, 0x9f, 0x37,
-	0xca, 0x9f, 0xa5, 0x20, 0x85, 0x3d, 0xca, 0xa3, 0x9f, 0x3c, 0xab, 0xe1, 0xf3, 0x6f, 0xc3, 0xd8,
-	0xfb, 0x5f, 0x21, 0x9f, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x87, 0x48, 0x07, 0xbb, 0x1b, 0x09,
-	0x00, 0x00,
-}
diff --git a/googleapis/genomics/v1/operations.pb.go b/googleapis/genomics/v1/operations.pb.go
index e86c89fdb4..d21acd7250 100644
--- a/googleapis/genomics/v1/operations.pb.go
+++ b/googleapis/genomics/v1/operations.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/operations.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Metadata describing an [Operation][google.longrunning.Operation].
 type OperationMetadata struct {
@@ -56,16 +59,17 @@ func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
 func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
 func (*OperationMetadata) ProtoMessage()    {}
 func (*OperationMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_74a16f9c10fa9d67, []int{0}
+	return fileDescriptor_ab6c330828363542, []int{0}
 }
+
 func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
 }
 func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
 }
-func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+func (m *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(m, src)
 }
 func (m *OperationMetadata) XXX_Size() int {
 	return xxx_messageInfo_OperationMetadata.Size(m)
@@ -157,16 +161,17 @@ func (m *OperationEvent) Reset()         { *m = OperationEvent{} }
 func (m *OperationEvent) String() string { return proto.CompactTextString(m) }
 func (*OperationEvent) ProtoMessage()    {}
 func (*OperationEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_74a16f9c10fa9d67, []int{1}
+	return fileDescriptor_ab6c330828363542, []int{1}
 }
+
 func (m *OperationEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationEvent.Unmarshal(m, b)
 }
 func (m *OperationEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationEvent.Marshal(b, m, deterministic)
 }
-func (dst *OperationEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationEvent.Merge(dst, src)
+func (m *OperationEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationEvent.Merge(m, src)
 }
 func (m *OperationEvent) XXX_Size() int {
 	return xxx_messageInfo_OperationEvent.Size(m)
@@ -205,10 +210,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/genomics/v1/operations.proto", fileDescriptor_operations_74a16f9c10fa9d67)
+	proto.RegisterFile("google/genomics/v1/operations.proto", fileDescriptor_ab6c330828363542)
 }
 
-var fileDescriptor_operations_74a16f9c10fa9d67 = []byte{
+var fileDescriptor_ab6c330828363542 = []byte{
 	// 456 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x41, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0xe5, 0x76, 0x6b, 0x9b, 0x17, 0x89, 0x0d, 0x6b, 0x42, 0xa1, 0x80, 0xa8, 0xca, 0xa5,
diff --git a/googleapis/genomics/v1/position.pb.go b/googleapis/genomics/v1/position.pb.go
index 95f749438a..5c9cef7b1e 100644
--- a/googleapis/genomics/v1/position.pb.go
+++ b/googleapis/genomics/v1/position.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/position.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An abstraction for referring to a genomic position, in relation to some
 // already known reference. For now, represents a genomic position as a
@@ -40,16 +43,17 @@ func (m *Position) Reset()         { *m = Position{} }
 func (m *Position) String() string { return proto.CompactTextString(m) }
 func (*Position) ProtoMessage()    {}
 func (*Position) Descriptor() ([]byte, []int) {
-	return fileDescriptor_position_a77d4b065ce2a236, []int{0}
+	return fileDescriptor_8dcb4638f9813bab, []int{0}
 }
+
 func (m *Position) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Position.Unmarshal(m, b)
 }
 func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
 }
-func (dst *Position) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Position.Merge(dst, src)
+func (m *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(m, src)
 }
 func (m *Position) XXX_Size() int {
 	return xxx_messageInfo_Position.Size(m)
@@ -85,11 +89,9 @@ func init() {
 	proto.RegisterType((*Position)(nil), "google.genomics.v1.Position")
 }
 
-func init() {
-	proto.RegisterFile("google/genomics/v1/position.proto", fileDescriptor_position_a77d4b065ce2a236)
-}
+func init() { proto.RegisterFile("google/genomics/v1/position.proto", fileDescriptor_8dcb4638f9813bab) }
 
-var fileDescriptor_position_a77d4b065ce2a236 = []byte{
+var fileDescriptor_8dcb4638f9813bab = []byte{
 	// 223 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x41, 0x4b, 0x03, 0x31,
 	0x14, 0x84, 0x89, 0x05, 0x59, 0x03, 0xf5, 0xb0, 0x07, 0x59, 0x8a, 0x87, 0x55, 0x10, 0xf6, 0x94,
diff --git a/googleapis/genomics/v1/range.pb.go b/googleapis/genomics/v1/range.pb.go
index e9baeca4f2..1abd6fe321 100644
--- a/googleapis/genomics/v1/range.pb.go
+++ b/googleapis/genomics/v1/range.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/range.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A 0-based half-open genomic coordinate range for search requests.
 type Range struct {
@@ -37,16 +40,17 @@ func (m *Range) Reset()         { *m = Range{} }
 func (m *Range) String() string { return proto.CompactTextString(m) }
 func (*Range) ProtoMessage()    {}
 func (*Range) Descriptor() ([]byte, []int) {
-	return fileDescriptor_range_b9d65b625aacf976, []int{0}
+	return fileDescriptor_296c87a77538e516, []int{0}
 }
+
 func (m *Range) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Range.Unmarshal(m, b)
 }
 func (m *Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Range.Marshal(b, m, deterministic)
 }
-func (dst *Range) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Range.Merge(dst, src)
+func (m *Range) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Range.Merge(m, src)
 }
 func (m *Range) XXX_Size() int {
 	return xxx_messageInfo_Range.Size(m)
@@ -82,11 +86,9 @@ func init() {
 	proto.RegisterType((*Range)(nil), "google.genomics.v1.Range")
 }
 
-func init() {
-	proto.RegisterFile("google/genomics/v1/range.proto", fileDescriptor_range_b9d65b625aacf976)
-}
+func init() { proto.RegisterFile("google/genomics/v1/range.proto", fileDescriptor_296c87a77538e516) }
 
-var fileDescriptor_range_b9d65b625aacf976 = []byte{
+var fileDescriptor_296c87a77538e516 = []byte{
 	// 209 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x4f, 0x4d, 0x4b, 0xc4, 0x30,
 	0x10, 0x25, 0x96, 0x15, 0x0c, 0x28, 0x12, 0x44, 0x8a, 0x88, 0x2c, 0x82, 0xb0, 0xa7, 0x84, 0xe2,
diff --git a/googleapis/genomics/v1/readalignment.pb.go b/googleapis/genomics/v1/readalignment.pb.go
index 17aff05aa0..9a699b2746 100644
--- a/googleapis/genomics/v1/readalignment.pb.go
+++ b/googleapis/genomics/v1/readalignment.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readalignment.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A linear alignment can be represented by one CIGAR string. Describes the
 // mapped position and local alignment of the read to the reference.
@@ -43,16 +46,17 @@ func (m *LinearAlignment) Reset()         { *m = LinearAlignment{} }
 func (m *LinearAlignment) String() string { return proto.CompactTextString(m) }
 func (*LinearAlignment) ProtoMessage()    {}
 func (*LinearAlignment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_readalignment_631bd8edb248b735, []int{0}
+	return fileDescriptor_5882c5c7543d07e3, []int{0}
 }
+
 func (m *LinearAlignment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LinearAlignment.Unmarshal(m, b)
 }
 func (m *LinearAlignment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LinearAlignment.Marshal(b, m, deterministic)
 }
-func (dst *LinearAlignment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LinearAlignment.Merge(dst, src)
+func (m *LinearAlignment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LinearAlignment.Merge(m, src)
 }
 func (m *LinearAlignment) XXX_Size() int {
 	return xxx_messageInfo_LinearAlignment.Size(m)
@@ -249,16 +253,17 @@ func (m *Read) Reset()         { *m = Read{} }
 func (m *Read) String() string { return proto.CompactTextString(m) }
 func (*Read) ProtoMessage()    {}
 func (*Read) Descriptor() ([]byte, []int) {
-	return fileDescriptor_readalignment_631bd8edb248b735, []int{1}
+	return fileDescriptor_5882c5c7543d07e3, []int{1}
 }
+
 func (m *Read) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Read.Unmarshal(m, b)
 }
 func (m *Read) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Read.Marshal(b, m, deterministic)
 }
-func (dst *Read) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Read.Merge(dst, src)
+func (m *Read) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Read.Merge(m, src)
 }
 func (m *Read) XXX_Size() int {
 	return xxx_messageInfo_Read.Size(m)
@@ -395,10 +400,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/genomics/v1/readalignment.proto", fileDescriptor_readalignment_631bd8edb248b735)
+	proto.RegisterFile("google/genomics/v1/readalignment.proto", fileDescriptor_5882c5c7543d07e3)
 }
 
-var fileDescriptor_readalignment_631bd8edb248b735 = []byte{
+var fileDescriptor_5882c5c7543d07e3 = []byte{
 	// 683 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcd, 0x4e, 0xdb, 0x4a,
 	0x14, 0xc7, 0xe5, 0x84, 0x70, 0xc9, 0x09, 0x24, 0x61, 0xae, 0xc4, 0xf5, 0x8d, 0xb8, 0xb7, 0x21,
diff --git a/googleapis/genomics/v1/readgroup.pb.go b/googleapis/genomics/v1/readgroup.pb.go
index 800691a317..5d12e0bfa3 100644
--- a/googleapis/genomics/v1/readgroup.pb.go
+++ b/googleapis/genomics/v1/readgroup.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readgroup.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A read group is all the data that's processed the same way by the sequencer.
 type ReadGroup struct {
@@ -58,16 +61,17 @@ func (m *ReadGroup) Reset()         { *m = ReadGroup{} }
 func (m *ReadGroup) String() string { return proto.CompactTextString(m) }
 func (*ReadGroup) ProtoMessage()    {}
 func (*ReadGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_readgroup_f15cee86d9a45532, []int{0}
+	return fileDescriptor_78f10e430d3182d6, []int{0}
 }
+
 func (m *ReadGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadGroup.Unmarshal(m, b)
 }
 func (m *ReadGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadGroup.Marshal(b, m, deterministic)
 }
-func (dst *ReadGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadGroup.Merge(dst, src)
+func (m *ReadGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroup.Merge(m, src)
 }
 func (m *ReadGroup) XXX_Size() int {
 	return xxx_messageInfo_ReadGroup.Size(m)
@@ -172,16 +176,17 @@ func (m *ReadGroup_Experiment) Reset()         { *m = ReadGroup_Experiment{} }
 func (m *ReadGroup_Experiment) String() string { return proto.CompactTextString(m) }
 func (*ReadGroup_Experiment) ProtoMessage()    {}
 func (*ReadGroup_Experiment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_readgroup_f15cee86d9a45532, []int{0, 0}
+	return fileDescriptor_78f10e430d3182d6, []int{0, 0}
 }
+
 func (m *ReadGroup_Experiment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadGroup_Experiment.Unmarshal(m, b)
 }
 func (m *ReadGroup_Experiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadGroup_Experiment.Marshal(b, m, deterministic)
 }
-func (dst *ReadGroup_Experiment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadGroup_Experiment.Merge(dst, src)
+func (m *ReadGroup_Experiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroup_Experiment.Merge(m, src)
 }
 func (m *ReadGroup_Experiment) XXX_Size() int {
 	return xxx_messageInfo_ReadGroup_Experiment.Size(m)
@@ -242,16 +247,17 @@ func (m *ReadGroup_Program) Reset()         { *m = ReadGroup_Program{} }
 func (m *ReadGroup_Program) String() string { return proto.CompactTextString(m) }
 func (*ReadGroup_Program) ProtoMessage()    {}
 func (*ReadGroup_Program) Descriptor() ([]byte, []int) {
-	return fileDescriptor_readgroup_f15cee86d9a45532, []int{0, 1}
+	return fileDescriptor_78f10e430d3182d6, []int{0, 1}
 }
+
 func (m *ReadGroup_Program) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadGroup_Program.Unmarshal(m, b)
 }
 func (m *ReadGroup_Program) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadGroup_Program.Marshal(b, m, deterministic)
 }
-func (dst *ReadGroup_Program) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadGroup_Program.Merge(dst, src)
+func (m *ReadGroup_Program) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroup_Program.Merge(m, src)
 }
 func (m *ReadGroup_Program) XXX_Size() int {
 	return xxx_messageInfo_ReadGroup_Program.Size(m)
@@ -304,11 +310,9 @@ func init() {
 	proto.RegisterType((*ReadGroup_Program)(nil), "google.genomics.v1.ReadGroup.Program")
 }
 
-func init() {
-	proto.RegisterFile("google/genomics/v1/readgroup.proto", fileDescriptor_readgroup_f15cee86d9a45532)
-}
+func init() { proto.RegisterFile("google/genomics/v1/readgroup.proto", fileDescriptor_78f10e430d3182d6) }
 
-var fileDescriptor_readgroup_f15cee86d9a45532 = []byte{
+var fileDescriptor_78f10e430d3182d6 = []byte{
 	// 585 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xcb, 0x6e, 0xd4, 0x30,
 	0x14, 0x55, 0xa6, 0xcf, 0xb9, 0xd3, 0xc7, 0x60, 0x04, 0x8a, 0x06, 0x90, 0x86, 0x22, 0x60, 0x10,
diff --git a/googleapis/genomics/v1/readgroupset.pb.go b/googleapis/genomics/v1/readgroupset.pb.go
index ceb0c46b86..11515e3d68 100644
--- a/googleapis/genomics/v1/readgroupset.pb.go
+++ b/googleapis/genomics/v1/readgroupset.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readgroupset.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
+package genomics
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A read group set is a logical collection of read groups, which are
 // collections of reads produced by a sequencer. A read group set typically
@@ -57,16 +60,17 @@ func (m *ReadGroupSet) Reset()         { *m = ReadGroupSet{} }
 func (m *ReadGroupSet) String() string { return proto.CompactTextString(m) }
 func (*ReadGroupSet) ProtoMessage()    {}
 func (*ReadGroupSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_readgroupset_b9edcdfdbb1584f9, []int{0}
+	return fileDescriptor_976a96d3fd28f245, []int{0}
 }
+
 func (m *ReadGroupSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadGroupSet.Unmarshal(m, b)
 }
 func (m *ReadGroupSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadGroupSet.Marshal(b, m, deterministic)
 }
-func (dst *ReadGroupSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadGroupSet.Merge(dst, src)
+func (m *ReadGroupSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroupSet.Merge(m, src)
 }
 func (m *ReadGroupSet) XXX_Size() int {
 	return xxx_messageInfo_ReadGroupSet.Size(m)
@@ -132,10 +136,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/genomics/v1/readgroupset.proto", fileDescriptor_readgroupset_b9edcdfdbb1584f9)
+	proto.RegisterFile("google/genomics/v1/readgroupset.proto", fileDescriptor_976a96d3fd28f245)
 }
 
-var fileDescriptor_readgroupset_b9edcdfdbb1584f9 = []byte{
+var fileDescriptor_976a96d3fd28f245 = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x8b, 0xdb, 0x30,
 	0x10, 0xc5, 0xb1, 0xf3, 0xa7, 0xcd, 0xa4, 0x84, 0x54, 0x87, 0x62, 0x4c, 0x03, 0x21, 0x50, 0x08,
diff --git a/googleapis/genomics/v1/reads.pb.go b/googleapis/genomics/v1/reads.pb.go
index 5e6a7e20d7..3c079c29df 100644
--- a/googleapis/genomics/v1/reads.pb.go
+++ b/googleapis/genomics/v1/reads.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/reads.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type ImportReadGroupSetsRequest_PartitionStrategy int32
 
@@ -51,6 +51,7 @@ var ImportReadGroupSetsRequest_PartitionStrategy_name = map[int32]string{
 	1: "PER_FILE_PER_SAMPLE",
 	2: "MERGE_ALL",
 }
+
 var ImportReadGroupSetsRequest_PartitionStrategy_value = map[string]int32{
 	"PARTITION_STRATEGY_UNSPECIFIED": 0,
 	"PER_FILE_PER_SAMPLE":            1,
@@ -60,8 +61,9 @@ var ImportReadGroupSetsRequest_PartitionStrategy_value = map[string]int32{
 func (x ImportReadGroupSetsRequest_PartitionStrategy) String() string {
 	return proto.EnumName(ImportReadGroupSetsRequest_PartitionStrategy_name, int32(x))
 }
+
 func (ImportReadGroupSetsRequest_PartitionStrategy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{2, 0}
+	return fileDescriptor_6b02d5d0c80a106c, []int{2, 0}
 }
 
 // The read group set search request.
@@ -88,16 +90,17 @@ func (m *SearchReadGroupSetsRequest) Reset()         { *m = SearchReadGroupSetsR
 func (m *SearchReadGroupSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchReadGroupSetsRequest) ProtoMessage()    {}
 func (*SearchReadGroupSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{0}
+	return fileDescriptor_6b02d5d0c80a106c, []int{0}
 }
+
 func (m *SearchReadGroupSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReadGroupSetsRequest.Unmarshal(m, b)
 }
 func (m *SearchReadGroupSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReadGroupSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchReadGroupSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReadGroupSetsRequest.Merge(dst, src)
+func (m *SearchReadGroupSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadGroupSetsRequest.Merge(m, src)
 }
 func (m *SearchReadGroupSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchReadGroupSetsRequest.Size(m)
@@ -153,16 +156,17 @@ func (m *SearchReadGroupSetsResponse) Reset()         { *m = SearchReadGroupSets
 func (m *SearchReadGroupSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchReadGroupSetsResponse) ProtoMessage()    {}
 func (*SearchReadGroupSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{1}
+	return fileDescriptor_6b02d5d0c80a106c, []int{1}
 }
+
 func (m *SearchReadGroupSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReadGroupSetsResponse.Unmarshal(m, b)
 }
 func (m *SearchReadGroupSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReadGroupSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchReadGroupSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReadGroupSetsResponse.Merge(dst, src)
+func (m *SearchReadGroupSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadGroupSetsResponse.Merge(m, src)
 }
 func (m *SearchReadGroupSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchReadGroupSetsResponse.Size(m)
@@ -220,16 +224,17 @@ func (m *ImportReadGroupSetsRequest) Reset()         { *m = ImportReadGroupSetsR
 func (m *ImportReadGroupSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportReadGroupSetsRequest) ProtoMessage()    {}
 func (*ImportReadGroupSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{2}
+	return fileDescriptor_6b02d5d0c80a106c, []int{2}
 }
+
 func (m *ImportReadGroupSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportReadGroupSetsRequest.Unmarshal(m, b)
 }
 func (m *ImportReadGroupSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportReadGroupSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportReadGroupSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportReadGroupSetsRequest.Merge(dst, src)
+func (m *ImportReadGroupSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportReadGroupSetsRequest.Merge(m, src)
 }
 func (m *ImportReadGroupSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportReadGroupSetsRequest.Size(m)
@@ -281,16 +286,17 @@ func (m *ImportReadGroupSetsResponse) Reset()         { *m = ImportReadGroupSets
 func (m *ImportReadGroupSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportReadGroupSetsResponse) ProtoMessage()    {}
 func (*ImportReadGroupSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{3}
+	return fileDescriptor_6b02d5d0c80a106c, []int{3}
 }
+
 func (m *ImportReadGroupSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportReadGroupSetsResponse.Unmarshal(m, b)
 }
 func (m *ImportReadGroupSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportReadGroupSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportReadGroupSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportReadGroupSetsResponse.Merge(dst, src)
+func (m *ImportReadGroupSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportReadGroupSetsResponse.Merge(m, src)
 }
 func (m *ImportReadGroupSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportReadGroupSetsResponse.Size(m)
@@ -333,16 +339,17 @@ func (m *ExportReadGroupSetRequest) Reset()         { *m = ExportReadGroupSetReq
 func (m *ExportReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportReadGroupSetRequest) ProtoMessage()    {}
 func (*ExportReadGroupSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{4}
+	return fileDescriptor_6b02d5d0c80a106c, []int{4}
 }
+
 func (m *ExportReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportReadGroupSetRequest.Unmarshal(m, b)
 }
 func (m *ExportReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportReadGroupSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportReadGroupSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportReadGroupSetRequest.Merge(dst, src)
+func (m *ExportReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportReadGroupSetRequest.Merge(m, src)
 }
 func (m *ExportReadGroupSetRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportReadGroupSetRequest.Size(m)
@@ -405,16 +412,17 @@ func (m *UpdateReadGroupSetRequest) Reset()         { *m = UpdateReadGroupSetReq
 func (m *UpdateReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateReadGroupSetRequest) ProtoMessage()    {}
 func (*UpdateReadGroupSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{5}
+	return fileDescriptor_6b02d5d0c80a106c, []int{5}
 }
+
 func (m *UpdateReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateReadGroupSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateReadGroupSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateReadGroupSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateReadGroupSetRequest.Merge(dst, src)
+func (m *UpdateReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateReadGroupSetRequest.Merge(m, src)
 }
 func (m *UpdateReadGroupSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateReadGroupSetRequest.Size(m)
@@ -459,16 +467,17 @@ func (m *DeleteReadGroupSetRequest) Reset()         { *m = DeleteReadGroupSetReq
 func (m *DeleteReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteReadGroupSetRequest) ProtoMessage()    {}
 func (*DeleteReadGroupSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{6}
+	return fileDescriptor_6b02d5d0c80a106c, []int{6}
 }
+
 func (m *DeleteReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteReadGroupSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteReadGroupSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteReadGroupSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteReadGroupSetRequest.Merge(dst, src)
+func (m *DeleteReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteReadGroupSetRequest.Merge(m, src)
 }
 func (m *DeleteReadGroupSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteReadGroupSetRequest.Size(m)
@@ -498,16 +507,17 @@ func (m *GetReadGroupSetRequest) Reset()         { *m = GetReadGroupSetRequest{}
 func (m *GetReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetReadGroupSetRequest) ProtoMessage()    {}
 func (*GetReadGroupSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{7}
+	return fileDescriptor_6b02d5d0c80a106c, []int{7}
 }
+
 func (m *GetReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetReadGroupSetRequest.Unmarshal(m, b)
 }
 func (m *GetReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetReadGroupSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetReadGroupSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetReadGroupSetRequest.Merge(dst, src)
+func (m *GetReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReadGroupSetRequest.Merge(m, src)
 }
 func (m *GetReadGroupSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetReadGroupSetRequest.Size(m)
@@ -562,16 +572,17 @@ func (m *ListCoverageBucketsRequest) Reset()         { *m = ListCoverageBucketsR
 func (m *ListCoverageBucketsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListCoverageBucketsRequest) ProtoMessage()    {}
 func (*ListCoverageBucketsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{8}
+	return fileDescriptor_6b02d5d0c80a106c, []int{8}
 }
+
 func (m *ListCoverageBucketsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCoverageBucketsRequest.Unmarshal(m, b)
 }
 func (m *ListCoverageBucketsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCoverageBucketsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListCoverageBucketsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCoverageBucketsRequest.Merge(dst, src)
+func (m *ListCoverageBucketsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCoverageBucketsRequest.Merge(m, src)
 }
 func (m *ListCoverageBucketsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListCoverageBucketsRequest.Size(m)
@@ -648,16 +659,17 @@ func (m *CoverageBucket) Reset()         { *m = CoverageBucket{} }
 func (m *CoverageBucket) String() string { return proto.CompactTextString(m) }
 func (*CoverageBucket) ProtoMessage()    {}
 func (*CoverageBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{9}
+	return fileDescriptor_6b02d5d0c80a106c, []int{9}
 }
+
 func (m *CoverageBucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoverageBucket.Unmarshal(m, b)
 }
 func (m *CoverageBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CoverageBucket.Marshal(b, m, deterministic)
 }
-func (dst *CoverageBucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CoverageBucket.Merge(dst, src)
+func (m *CoverageBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CoverageBucket.Merge(m, src)
 }
 func (m *CoverageBucket) XXX_Size() int {
 	return xxx_messageInfo_CoverageBucket.Size(m)
@@ -706,16 +718,17 @@ func (m *ListCoverageBucketsResponse) Reset()         { *m = ListCoverageBuckets
 func (m *ListCoverageBucketsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListCoverageBucketsResponse) ProtoMessage()    {}
 func (*ListCoverageBucketsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{10}
+	return fileDescriptor_6b02d5d0c80a106c, []int{10}
 }
+
 func (m *ListCoverageBucketsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListCoverageBucketsResponse.Unmarshal(m, b)
 }
 func (m *ListCoverageBucketsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListCoverageBucketsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListCoverageBucketsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListCoverageBucketsResponse.Merge(dst, src)
+func (m *ListCoverageBucketsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCoverageBucketsResponse.Merge(m, src)
 }
 func (m *ListCoverageBucketsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListCoverageBucketsResponse.Size(m)
@@ -784,16 +797,17 @@ func (m *SearchReadsRequest) Reset()         { *m = SearchReadsRequest{} }
 func (m *SearchReadsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchReadsRequest) ProtoMessage()    {}
 func (*SearchReadsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{11}
+	return fileDescriptor_6b02d5d0c80a106c, []int{11}
 }
+
 func (m *SearchReadsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReadsRequest.Unmarshal(m, b)
 }
 func (m *SearchReadsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReadsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchReadsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReadsRequest.Merge(dst, src)
+func (m *SearchReadsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadsRequest.Merge(m, src)
 }
 func (m *SearchReadsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchReadsRequest.Size(m)
@@ -873,16 +887,17 @@ func (m *SearchReadsResponse) Reset()         { *m = SearchReadsResponse{} }
 func (m *SearchReadsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchReadsResponse) ProtoMessage()    {}
 func (*SearchReadsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{12}
+	return fileDescriptor_6b02d5d0c80a106c, []int{12}
 }
+
 func (m *SearchReadsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReadsResponse.Unmarshal(m, b)
 }
 func (m *SearchReadsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReadsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchReadsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReadsResponse.Merge(dst, src)
+func (m *SearchReadsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadsResponse.Merge(m, src)
 }
 func (m *SearchReadsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchReadsResponse.Size(m)
@@ -955,16 +970,17 @@ func (m *StreamReadsRequest) Reset()         { *m = StreamReadsRequest{} }
 func (m *StreamReadsRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamReadsRequest) ProtoMessage()    {}
 func (*StreamReadsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{13}
+	return fileDescriptor_6b02d5d0c80a106c, []int{13}
 }
+
 func (m *StreamReadsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamReadsRequest.Unmarshal(m, b)
 }
 func (m *StreamReadsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamReadsRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamReadsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamReadsRequest.Merge(dst, src)
+func (m *StreamReadsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamReadsRequest.Merge(m, src)
 }
 func (m *StreamReadsRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamReadsRequest.Size(m)
@@ -1035,16 +1051,17 @@ func (m *StreamReadsResponse) Reset()         { *m = StreamReadsResponse{} }
 func (m *StreamReadsResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamReadsResponse) ProtoMessage()    {}
 func (*StreamReadsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_reads_fd372a563c554464, []int{14}
+	return fileDescriptor_6b02d5d0c80a106c, []int{14}
 }
+
 func (m *StreamReadsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamReadsResponse.Unmarshal(m, b)
 }
 func (m *StreamReadsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamReadsResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamReadsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamReadsResponse.Merge(dst, src)
+func (m *StreamReadsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamReadsResponse.Merge(m, src)
 }
 func (m *StreamReadsResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamReadsResponse.Size(m)
@@ -1063,6 +1080,7 @@ func (m *StreamReadsResponse) GetAlignments() []*Read {
 }
 
 func init() {
+	proto.RegisterEnum("google.genomics.v1.ImportReadGroupSetsRequest_PartitionStrategy", ImportReadGroupSetsRequest_PartitionStrategy_name, ImportReadGroupSetsRequest_PartitionStrategy_value)
 	proto.RegisterType((*SearchReadGroupSetsRequest)(nil), "google.genomics.v1.SearchReadGroupSetsRequest")
 	proto.RegisterType((*SearchReadGroupSetsResponse)(nil), "google.genomics.v1.SearchReadGroupSetsResponse")
 	proto.RegisterType((*ImportReadGroupSetsRequest)(nil), "google.genomics.v1.ImportReadGroupSetsRequest")
@@ -1078,7 +1096,96 @@ func init() {
 	proto.RegisterType((*SearchReadsResponse)(nil), "google.genomics.v1.SearchReadsResponse")
 	proto.RegisterType((*StreamReadsRequest)(nil), "google.genomics.v1.StreamReadsRequest")
 	proto.RegisterType((*StreamReadsResponse)(nil), "google.genomics.v1.StreamReadsResponse")
-	proto.RegisterEnum("google.genomics.v1.ImportReadGroupSetsRequest_PartitionStrategy", ImportReadGroupSetsRequest_PartitionStrategy_name, ImportReadGroupSetsRequest_PartitionStrategy_value)
+}
+
+func init() { proto.RegisterFile("google/genomics/v1/reads.proto", fileDescriptor_6b02d5d0c80a106c) }
+
+var fileDescriptor_6b02d5d0c80a106c = []byte{
+	// 1333 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0xc5,
+	0x17, 0xff, 0x8e, 0x1d, 0xb7, 0xcd, 0x73, 0x93, 0x38, 0xe3, 0x7e, 0x8b, 0xe3, 0x90, 0x36, 0x6c,
+	0x69, 0x1b, 0x02, 0xb5, 0x89, 0x11, 0x2a, 0x4a, 0x85, 0x44, 0xda, 0x3a, 0xc1, 0x28, 0x69, 0xad,
+	0x75, 0x02, 0x82, 0xcb, 0x6a, 0x62, 0x4f, 0xb6, 0x4b, 0xec, 0xdd, 0x65, 0x66, 0x9c, 0xfe, 0x52,
+	0x2f, 0xbd, 0x81, 0x04, 0x1c, 0x10, 0x27, 0xae, 0x5c, 0x39, 0x22, 0xfe, 0x08, 0x4e, 0x88, 0x0b,
+	0x7f, 0x00, 0xe2, 0x0f, 0xe0, 0xc4, 0x11, 0xcd, 0xec, 0x6e, 0xbc, 0xeb, 0x9d, 0x6d, 0x1c, 0x55,
+	0xe2, 0xb6, 0xfb, 0xe6, 0xb3, 0x6f, 0x3e, 0xef, 0xf7, 0x5b, 0xb8, 0x64, 0x7b, 0x9e, 0xdd, 0xa7,
+	0x75, 0x9b, 0xba, 0xde, 0xc0, 0xe9, 0xf2, 0xfa, 0xd1, 0x5a, 0x9d, 0x51, 0xd2, 0xe3, 0x35, 0x9f,
+	0x79, 0xc2, 0xc3, 0x38, 0x38, 0xaf, 0x45, 0xe7, 0xb5, 0xa3, 0xb5, 0xea, 0xab, 0xe1, 0x37, 0xc4,
+	0x77, 0xea, 0xc4, 0x75, 0x3d, 0x41, 0x84, 0xe3, 0xb9, 0xe1, 0x17, 0x55, 0xad, 0x46, 0xe2, 0xda,
+	0x34, 0x3c, 0xbf, 0x96, 0x71, 0x23, 0xe9, 0x3b, 0xb6, 0x3b, 0xa0, 0xae, 0x08, 0x71, 0x57, 0x33,
+	0x70, 0x36, 0xf3, 0x86, 0x3e, 0xa7, 0x11, 0xec, 0x4a, 0x08, 0xeb, 0x7b, 0xae, 0xcd, 0x86, 0xae,
+	0xeb, 0xb8, 0x76, 0xdd, 0xf3, 0x29, 0x4b, 0x70, 0x5a, 0x0c, 0x41, 0xea, 0x6d, 0x7f, 0x78, 0x50,
+	0xa7, 0x03, 0x5f, 0x3c, 0x0e, 0x0f, 0x97, 0xc7, 0x0f, 0x0f, 0x1c, 0xda, 0xef, 0x59, 0x03, 0xc2,
+	0x0f, 0x03, 0x84, 0xf1, 0x35, 0x82, 0x6a, 0x87, 0x12, 0xd6, 0x7d, 0x60, 0x52, 0xd2, 0xdb, 0x92,
+	0x04, 0x3a, 0x54, 0x70, 0x93, 0x7e, 0x31, 0xa4, 0x5c, 0xe0, 0xcb, 0x50, 0xec, 0x11, 0x41, 0x38,
+	0x15, 0x96, 0xd3, 0xe3, 0x15, 0xb4, 0x9c, 0x5f, 0x99, 0x36, 0x21, 0x14, 0xb5, 0x7a, 0x1c, 0x63,
+	0x98, 0x72, 0xc9, 0x80, 0x56, 0xf2, 0xcb, 0x68, 0x65, 0xda, 0x54, 0xcf, 0x78, 0x09, 0xc0, 0x27,
+	0x36, 0xb5, 0x84, 0x77, 0x48, 0xdd, 0x4a, 0x4e, 0x9d, 0x4c, 0x4b, 0xc9, 0xae, 0x14, 0xe0, 0x45,
+	0x50, 0x2f, 0x16, 0x77, 0x9e, 0xd0, 0xca, 0xd4, 0x32, 0x5a, 0x29, 0x98, 0xe7, 0xa4, 0xa0, 0xe3,
+	0x3c, 0xa1, 0xc6, 0xb7, 0x08, 0x16, 0xb5, 0x7c, 0xb8, 0xef, 0xb9, 0x9c, 0xe2, 0x0f, 0x61, 0x4e,
+	0x7a, 0xca, 0x52, 0xae, 0xb2, 0x38, 0x15, 0x01, 0xa9, 0x62, 0x63, 0xb9, 0x96, 0x0e, 0x67, 0x2d,
+	0xae, 0xc3, 0x9c, 0x61, 0x71, 0x8d, 0xf8, 0x1a, 0xcc, 0xb9, 0xf4, 0x91, 0xb0, 0x52, 0x54, 0x67,
+	0xa4, 0xb8, 0x1d, 0xd1, 0x35, 0xfe, 0xc8, 0x41, 0xb5, 0x35, 0xf0, 0x3d, 0x26, 0xb4, 0x1e, 0x5a,
+	0x02, 0x18, 0x79, 0xa8, 0x82, 0x02, 0x63, 0x8f, 0x1d, 0x84, 0x57, 0xa0, 0xc4, 0xe8, 0x01, 0x65,
+	0xd4, 0xed, 0x52, 0x2b, 0x04, 0x4d, 0x29, 0xd0, 0xec, 0xb1, 0xbc, 0xa3, 0x90, 0x97, 0xa1, 0xc8,
+	0xbd, 0x21, 0xeb, 0x52, 0x6b, 0xc8, 0x1c, 0x5e, 0xc9, 0x05, 0xae, 0x0e, 0x44, 0x7b, 0xcc, 0xe1,
+	0xd8, 0x03, 0xec, 0x13, 0x26, 0x1c, 0x19, 0x7d, 0x8b, 0x0b, 0x46, 0x04, 0xb5, 0x1f, 0x57, 0x0a,
+	0xcb, 0x68, 0x65, 0xb6, 0xf1, 0x81, 0xce, 0xfa, 0x6c, 0xd6, 0xb5, 0x76, 0xa4, 0xa8, 0x13, 0xea,
+	0x31, 0xe7, 0xfd, 0x71, 0x91, 0x61, 0xc1, 0x7c, 0x0a, 0x87, 0x0d, 0xb8, 0xd4, 0xde, 0x30, 0x77,
+	0x5b, 0xbb, 0xad, 0xfb, 0xf7, 0xac, 0xce, 0xae, 0xb9, 0xb1, 0xdb, 0xdc, 0xfa, 0xd4, 0xda, 0xbb,
+	0xd7, 0x69, 0x37, 0xef, 0xb4, 0x36, 0x5b, 0xcd, 0xbb, 0xa5, 0xff, 0xe1, 0x57, 0xa0, 0xdc, 0x6e,
+	0x9a, 0xd6, 0x66, 0x6b, 0xbb, 0x69, 0xc9, 0x87, 0xce, 0xc6, 0x4e, 0x7b, 0xbb, 0x59, 0x42, 0x78,
+	0x06, 0xa6, 0x77, 0x9a, 0xe6, 0x56, 0xd3, 0xda, 0xd8, 0xde, 0x2e, 0xe5, 0x8c, 0x8f, 0x60, 0x51,
+	0xcb, 0x31, 0x8c, 0xf5, 0x9b, 0x80, 0x93, 0xb1, 0x8e, 0xe5, 0xe0, 0x5c, 0x3c, 0x98, 0xad, 0x1e,
+	0x37, 0x7e, 0x42, 0xb0, 0xd0, 0x7c, 0x34, 0xae, 0x2c, 0x16, 0x25, 0x9f, 0x79, 0x9f, 0xd3, 0x6e,
+	0x3c, 0x4a, 0xa1, 0xa4, 0xd5, 0x93, 0xc7, 0x54, 0x7d, 0x2b, 0x7d, 0x1f, 0x65, 0x6c, 0x20, 0xd9,
+	0x63, 0x0e, 0x7e, 0x03, 0xe6, 0x53, 0x44, 0xc2, 0x8c, 0x9f, 0x4d, 0xf2, 0xc0, 0xd7, 0x65, 0x7e,
+	0x46, 0xf1, 0x96, 0xd5, 0xc0, 0x2b, 0x53, 0x8a, 0xf0, 0x28, 0xdc, 0xf7, 0xa4, 0xd4, 0xf8, 0x15,
+	0xc1, 0xc2, 0x9e, 0xdf, 0x23, 0x82, 0xea, 0xf8, 0x6a, 0x6f, 0x44, 0xda, 0x1b, 0x37, 0x61, 0x36,
+	0x09, 0x55, 0xfc, 0x27, 0x29, 0x88, 0xf3, 0x71, 0x4d, 0xf8, 0x16, 0x14, 0x87, 0x8a, 0x8f, 0x6a,
+	0x0f, 0xca, 0xbc, 0x62, 0xa3, 0x1a, 0x29, 0x89, 0x3a, 0x48, 0x6d, 0x53, 0x76, 0x90, 0x1d, 0xc2,
+	0x0f, 0x4d, 0x08, 0xe0, 0xf2, 0xd9, 0xd8, 0x84, 0x85, 0xbb, 0xb4, 0x4f, 0x5f, 0xd6, 0x18, 0xe3,
+	0x0e, 0x5c, 0xdc, 0xa2, 0xe2, 0x25, 0x95, 0x3c, 0xcf, 0x41, 0x75, 0xdb, 0xe1, 0xe2, 0x8e, 0x77,
+	0x44, 0x19, 0xb1, 0xe9, 0xed, 0x61, 0xf7, 0x30, 0x56, 0xb1, 0xa7, 0xf0, 0xed, 0x55, 0x98, 0x4d,
+	0x46, 0x33, 0x8c, 0xfa, 0x4c, 0x22, 0x98, 0xf8, 0x02, 0x14, 0xb8, 0x20, 0x4c, 0xa8, 0xca, 0xce,
+	0x9b, 0xc1, 0x0b, 0x2e, 0x41, 0x9e, 0xba, 0x3d, 0x55, 0xa0, 0x79, 0x53, 0x3e, 0xe2, 0x1a, 0x94,
+	0x05, 0x61, 0x36, 0x15, 0xd6, 0xbe, 0xa2, 0x64, 0x3d, 0x74, 0x7a, 0xe2, 0x41, 0xe5, 0x8c, 0x42,
+	0xcc, 0x07, 0x47, 0x01, 0xd9, 0x4f, 0xe4, 0xc1, 0x58, 0x23, 0x3d, 0xfb, 0xc2, 0x46, 0x7a, 0x6e,
+	0xac, 0x91, 0x1e, 0xc0, 0x6c, 0xd2, 0x7e, 0x5c, 0x87, 0x82, 0x1a, 0x56, 0xca, 0xd6, 0x62, 0x63,
+	0x41, 0x9b, 0x1f, 0x12, 0x60, 0x06, 0x38, 0x7c, 0x05, 0x66, 0x06, 0x94, 0xb8, 0x56, 0x37, 0xd4,
+	0xa3, 0x12, 0x2b, 0x67, 0x9e, 0x97, 0xc2, 0x48, 0xb7, 0xf1, 0x0b, 0x82, 0x45, 0xad, 0xb3, 0xc3,
+	0x22, 0x7e, 0x0d, 0xce, 0x27, 0x8c, 0x45, 0xca, 0xd8, 0xe2, 0x7e, 0xcc, 0xcc, 0x1d, 0x28, 0x45,
+	0x57, 0x84, 0x8e, 0x09, 0xda, 0x5f, 0xb1, 0x61, 0xe8, 0x38, 0x26, 0x6f, 0x32, 0xe7, 0xba, 0xc9,
+	0x9b, 0x75, 0x8d, 0x3d, 0xaf, 0x6b, 0xec, 0x7f, 0x23, 0xc0, 0xa3, 0x51, 0x73, 0x9c, 0x1e, 0xa7,
+	0xe9, 0x3a, 0xf8, 0xf5, 0x44, 0xf1, 0x49, 0x60, 0x41, 0x01, 0x47, 0xa5, 0x25, 0x51, 0xe9, 0x34,
+	0x3a, 0xfb, 0xc2, 0x34, 0x3a, 0xa7, 0x49, 0xa3, 0xe9, 0x51, 0x1a, 0x25, 0xd3, 0x22, 0x7f, 0xaa,
+	0xf9, 0xfa, 0x10, 0xca, 0x09, 0x9b, 0xc3, 0x28, 0xbd, 0x07, 0x70, 0xbc, 0xa4, 0x44, 0x13, 0xb5,
+	0x92, 0xd5, 0x40, 0xcc, 0x18, 0x76, 0xe2, 0x31, 0xfa, 0x97, 0xf4, 0xb6, 0x60, 0x94, 0x0c, 0x12,
+	0xde, 0x3e, 0xa1, 0x31, 0x6b, 0x6b, 0x35, 0xf7, 0x5f, 0xd4, 0xaa, 0xc4, 0x3d, 0x20, 0xac, 0xa7,
+	0xaa, 0xb3, 0x60, 0x06, 0x2f, 0x32, 0x9b, 0x85, 0x27, 0x48, 0xdf, 0x52, 0xaf, 0x5c, 0xc5, 0xb1,
+	0x60, 0x16, 0x95, 0xac, 0xa3, 0x44, 0xc6, 0x7d, 0x28, 0x27, 0xec, 0x7c, 0x59, 0x0f, 0x37, 0xbe,
+	0x47, 0x70, 0x21, 0xd0, 0xe8, 0xb8, 0xb6, 0x3c, 0xed, 0x50, 0x76, 0xe4, 0x74, 0x29, 0x7e, 0x06,
+	0xc5, 0xd8, 0x4d, 0xf8, 0x9a, 0x4e, 0x5b, 0xda, 0xe5, 0xd5, 0xeb, 0x27, 0xe2, 0x02, 0xca, 0xc6,
+	0xe2, 0xf3, 0xdf, 0xff, 0xfc, 0x2e, 0xf7, 0x7f, 0xa3, 0x74, 0xbc, 0x39, 0xaf, 0x73, 0x05, 0x5b,
+	0x47, 0xab, 0x6f, 0xa3, 0xc6, 0x6f, 0xd3, 0x30, 0x13, 0xa3, 0xf3, 0xf1, 0x1a, 0xfe, 0x12, 0x41,
+	0x59, 0x33, 0xd0, 0x71, 0xed, 0x74, 0xdb, 0x49, 0x75, 0x29, 0xc2, 0xc7, 0x36, 0xdf, 0xda, 0xfd,
+	0x68, 0xf3, 0x35, 0xae, 0x28, 0x5e, 0x4b, 0x46, 0x65, 0x7c, 0x6f, 0xe6, 0xeb, 0x8e, 0x52, 0xba,
+	0x8e, 0x56, 0xf1, 0x0f, 0x08, 0x70, 0x7a, 0x1f, 0xc0, 0x37, 0x74, 0x54, 0x32, 0xf7, 0x86, 0x93,
+	0x98, 0xdc, 0x54, 0x4c, 0xd6, 0x8c, 0xb7, 0x52, 0x4c, 0xea, 0x4f, 0x53, 0x79, 0xfb, 0x6c, 0x3d,
+	0xd8, 0x28, 0x42, 0x76, 0x65, 0xcd, 0x9a, 0xab, 0xf7, 0x54, 0xf6, 0x7e, 0x5e, 0xad, 0x4f, 0x8c,
+	0x0f, 0x63, 0x9a, 0xed, 0xbb, 0x3a, 0x57, 0x9f, 0x49, 0x76, 0x3f, 0x22, 0xc0, 0xe9, 0xdd, 0x44,
+	0xef, 0xbb, 0xcc, 0x1d, 0xa6, 0x7a, 0xe2, 0x02, 0x62, 0xbc, 0xaf, 0xc8, 0xdc, 0x6c, 0x5c, 0x9d,
+	0xcc, 0x7d, 0x63, 0x7b, 0x0e, 0xfe, 0x0a, 0x01, 0x4e, 0x6f, 0x1d, 0x7a, 0x9a, 0x99, 0xdb, 0x49,
+	0xf5, 0x62, 0x6a, 0xc5, 0x69, 0xca, 0x3f, 0x28, 0xe3, 0x86, 0x22, 0x77, 0x7d, 0x75, 0x32, 0x72,
+	0xf8, 0x1b, 0x04, 0x73, 0x63, 0xab, 0x0b, 0x5e, 0xd5, 0x31, 0xd1, 0xef, 0x37, 0x13, 0x78, 0x2b,
+	0x24, 0x84, 0x27, 0x24, 0xf4, 0x33, 0x82, 0xb2, 0x66, 0x30, 0xeb, 0x53, 0x2c, 0x7b, 0x5d, 0xd2,
+	0xa7, 0xd8, 0x0b, 0x26, 0x7e, 0x14, 0x55, 0xfc, 0xee, 0x44, 0x3c, 0xeb, 0xd1, 0xf8, 0x0e, 0x27,
+	0x3f, 0x7e, 0x0a, 0xc5, 0xd8, 0x84, 0xca, 0xe8, 0x6a, 0xa9, 0xb1, 0x9d, 0xd1, 0xd5, 0xd2, 0xa3,
+	0x4e, 0xd3, 0xd5, 0x46, 0x99, 0x7f, 0x9b, 0xc2, 0xc5, 0xae, 0x37, 0xd0, 0xa8, 0xba, 0x0d, 0x4a,
+	0x4b, 0x5b, 0xe6, 0x48, 0x1b, 0x7d, 0xb6, 0x1e, 0x21, 0xbc, 0x3e, 0x71, 0xed, 0x9a, 0xc7, 0x6c,
+	0xf9, 0x33, 0xaf, 0x32, 0xa8, 0x1e, 0x1c, 0x11, 0xdf, 0xe1, 0xf1, 0x1f, 0xfc, 0x5b, 0xd1, 0xf3,
+	0x3f, 0x08, 0xed, 0x9f, 0x51, 0xc8, 0x77, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x9b, 0xce,
+	0x6e, 0xa3, 0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1658,95 +1765,3 @@ var _ReadServiceV1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/genomics/v1/reads.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/genomics/v1/reads.proto", fileDescriptor_reads_fd372a563c554464)
-}
-
-var fileDescriptor_reads_fd372a563c554464 = []byte{
-	// 1333 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0xc5,
-	0x17, 0xff, 0x8e, 0x1d, 0xb7, 0xcd, 0x73, 0x93, 0x38, 0xe3, 0x7e, 0x8b, 0xe3, 0x90, 0x36, 0x6c,
-	0x69, 0x1b, 0x02, 0xb5, 0x89, 0x11, 0x2a, 0x4a, 0x85, 0x44, 0xda, 0x3a, 0xc1, 0x28, 0x69, 0xad,
-	0x75, 0x02, 0x82, 0xcb, 0x6a, 0x62, 0x4f, 0xb6, 0x4b, 0xec, 0xdd, 0x65, 0x66, 0x9c, 0xfe, 0x52,
-	0x2f, 0xbd, 0x81, 0x04, 0x1c, 0x10, 0x27, 0xae, 0x5c, 0x39, 0x22, 0xfe, 0x08, 0x4e, 0x88, 0x0b,
-	0x7f, 0x00, 0xe2, 0x0f, 0xe0, 0xc4, 0x11, 0xcd, 0xec, 0x6e, 0xbc, 0xeb, 0x9d, 0x6d, 0x1c, 0x55,
-	0xe2, 0xb6, 0xfb, 0xe6, 0xb3, 0x6f, 0x3e, 0xef, 0xf7, 0x5b, 0xb8, 0x64, 0x7b, 0x9e, 0xdd, 0xa7,
-	0x75, 0x9b, 0xba, 0xde, 0xc0, 0xe9, 0xf2, 0xfa, 0xd1, 0x5a, 0x9d, 0x51, 0xd2, 0xe3, 0x35, 0x9f,
-	0x79, 0xc2, 0xc3, 0x38, 0x38, 0xaf, 0x45, 0xe7, 0xb5, 0xa3, 0xb5, 0xea, 0xab, 0xe1, 0x37, 0xc4,
-	0x77, 0xea, 0xc4, 0x75, 0x3d, 0x41, 0x84, 0xe3, 0xb9, 0xe1, 0x17, 0x55, 0xad, 0x46, 0xe2, 0xda,
-	0x34, 0x3c, 0xbf, 0x96, 0x71, 0x23, 0xe9, 0x3b, 0xb6, 0x3b, 0xa0, 0xae, 0x08, 0x71, 0x57, 0x33,
-	0x70, 0x36, 0xf3, 0x86, 0x3e, 0xa7, 0x11, 0xec, 0x4a, 0x08, 0xeb, 0x7b, 0xae, 0xcd, 0x86, 0xae,
-	0xeb, 0xb8, 0x76, 0xdd, 0xf3, 0x29, 0x4b, 0x70, 0x5a, 0x0c, 0x41, 0xea, 0x6d, 0x7f, 0x78, 0x50,
-	0xa7, 0x03, 0x5f, 0x3c, 0x0e, 0x0f, 0x97, 0xc7, 0x0f, 0x0f, 0x1c, 0xda, 0xef, 0x59, 0x03, 0xc2,
-	0x0f, 0x03, 0x84, 0xf1, 0x35, 0x82, 0x6a, 0x87, 0x12, 0xd6, 0x7d, 0x60, 0x52, 0xd2, 0xdb, 0x92,
-	0x04, 0x3a, 0x54, 0x70, 0x93, 0x7e, 0x31, 0xa4, 0x5c, 0xe0, 0xcb, 0x50, 0xec, 0x11, 0x41, 0x38,
-	0x15, 0x96, 0xd3, 0xe3, 0x15, 0xb4, 0x9c, 0x5f, 0x99, 0x36, 0x21, 0x14, 0xb5, 0x7a, 0x1c, 0x63,
-	0x98, 0x72, 0xc9, 0x80, 0x56, 0xf2, 0xcb, 0x68, 0x65, 0xda, 0x54, 0xcf, 0x78, 0x09, 0xc0, 0x27,
-	0x36, 0xb5, 0x84, 0x77, 0x48, 0xdd, 0x4a, 0x4e, 0x9d, 0x4c, 0x4b, 0xc9, 0xae, 0x14, 0xe0, 0x45,
-	0x50, 0x2f, 0x16, 0x77, 0x9e, 0xd0, 0xca, 0xd4, 0x32, 0x5a, 0x29, 0x98, 0xe7, 0xa4, 0xa0, 0xe3,
-	0x3c, 0xa1, 0xc6, 0xb7, 0x08, 0x16, 0xb5, 0x7c, 0xb8, 0xef, 0xb9, 0x9c, 0xe2, 0x0f, 0x61, 0x4e,
-	0x7a, 0xca, 0x52, 0xae, 0xb2, 0x38, 0x15, 0x01, 0xa9, 0x62, 0x63, 0xb9, 0x96, 0x0e, 0x67, 0x2d,
-	0xae, 0xc3, 0x9c, 0x61, 0x71, 0x8d, 0xf8, 0x1a, 0xcc, 0xb9, 0xf4, 0x91, 0xb0, 0x52, 0x54, 0x67,
-	0xa4, 0xb8, 0x1d, 0xd1, 0x35, 0xfe, 0xc8, 0x41, 0xb5, 0x35, 0xf0, 0x3d, 0x26, 0xb4, 0x1e, 0x5a,
-	0x02, 0x18, 0x79, 0xa8, 0x82, 0x02, 0x63, 0x8f, 0x1d, 0x84, 0x57, 0xa0, 0xc4, 0xe8, 0x01, 0x65,
-	0xd4, 0xed, 0x52, 0x2b, 0x04, 0x4d, 0x29, 0xd0, 0xec, 0xb1, 0xbc, 0xa3, 0x90, 0x97, 0xa1, 0xc8,
-	0xbd, 0x21, 0xeb, 0x52, 0x6b, 0xc8, 0x1c, 0x5e, 0xc9, 0x05, 0xae, 0x0e, 0x44, 0x7b, 0xcc, 0xe1,
-	0xd8, 0x03, 0xec, 0x13, 0x26, 0x1c, 0x19, 0x7d, 0x8b, 0x0b, 0x46, 0x04, 0xb5, 0x1f, 0x57, 0x0a,
-	0xcb, 0x68, 0x65, 0xb6, 0xf1, 0x81, 0xce, 0xfa, 0x6c, 0xd6, 0xb5, 0x76, 0xa4, 0xa8, 0x13, 0xea,
-	0x31, 0xe7, 0xfd, 0x71, 0x91, 0x61, 0xc1, 0x7c, 0x0a, 0x87, 0x0d, 0xb8, 0xd4, 0xde, 0x30, 0x77,
-	0x5b, 0xbb, 0xad, 0xfb, 0xf7, 0xac, 0xce, 0xae, 0xb9, 0xb1, 0xdb, 0xdc, 0xfa, 0xd4, 0xda, 0xbb,
-	0xd7, 0x69, 0x37, 0xef, 0xb4, 0x36, 0x5b, 0xcd, 0xbb, 0xa5, 0xff, 0xe1, 0x57, 0xa0, 0xdc, 0x6e,
-	0x9a, 0xd6, 0x66, 0x6b, 0xbb, 0x69, 0xc9, 0x87, 0xce, 0xc6, 0x4e, 0x7b, 0xbb, 0x59, 0x42, 0x78,
-	0x06, 0xa6, 0x77, 0x9a, 0xe6, 0x56, 0xd3, 0xda, 0xd8, 0xde, 0x2e, 0xe5, 0x8c, 0x8f, 0x60, 0x51,
-	0xcb, 0x31, 0x8c, 0xf5, 0x9b, 0x80, 0x93, 0xb1, 0x8e, 0xe5, 0xe0, 0x5c, 0x3c, 0x98, 0xad, 0x1e,
-	0x37, 0x7e, 0x42, 0xb0, 0xd0, 0x7c, 0x34, 0xae, 0x2c, 0x16, 0x25, 0x9f, 0x79, 0x9f, 0xd3, 0x6e,
-	0x3c, 0x4a, 0xa1, 0xa4, 0xd5, 0x93, 0xc7, 0x54, 0x7d, 0x2b, 0x7d, 0x1f, 0x65, 0x6c, 0x20, 0xd9,
-	0x63, 0x0e, 0x7e, 0x03, 0xe6, 0x53, 0x44, 0xc2, 0x8c, 0x9f, 0x4d, 0xf2, 0xc0, 0xd7, 0x65, 0x7e,
-	0x46, 0xf1, 0x96, 0xd5, 0xc0, 0x2b, 0x53, 0x8a, 0xf0, 0x28, 0xdc, 0xf7, 0xa4, 0xd4, 0xf8, 0x15,
-	0xc1, 0xc2, 0x9e, 0xdf, 0x23, 0x82, 0xea, 0xf8, 0x6a, 0x6f, 0x44, 0xda, 0x1b, 0x37, 0x61, 0x36,
-	0x09, 0x55, 0xfc, 0x27, 0x29, 0x88, 0xf3, 0x71, 0x4d, 0xf8, 0x16, 0x14, 0x87, 0x8a, 0x8f, 0x6a,
-	0x0f, 0xca, 0xbc, 0x62, 0xa3, 0x1a, 0x29, 0x89, 0x3a, 0x48, 0x6d, 0x53, 0x76, 0x90, 0x1d, 0xc2,
-	0x0f, 0x4d, 0x08, 0xe0, 0xf2, 0xd9, 0xd8, 0x84, 0x85, 0xbb, 0xb4, 0x4f, 0x5f, 0xd6, 0x18, 0xe3,
-	0x0e, 0x5c, 0xdc, 0xa2, 0xe2, 0x25, 0x95, 0x3c, 0xcf, 0x41, 0x75, 0xdb, 0xe1, 0xe2, 0x8e, 0x77,
-	0x44, 0x19, 0xb1, 0xe9, 0xed, 0x61, 0xf7, 0x30, 0x56, 0xb1, 0xa7, 0xf0, 0xed, 0x55, 0x98, 0x4d,
-	0x46, 0x33, 0x8c, 0xfa, 0x4c, 0x22, 0x98, 0xf8, 0x02, 0x14, 0xb8, 0x20, 0x4c, 0xa8, 0xca, 0xce,
-	0x9b, 0xc1, 0x0b, 0x2e, 0x41, 0x9e, 0xba, 0x3d, 0x55, 0xa0, 0x79, 0x53, 0x3e, 0xe2, 0x1a, 0x94,
-	0x05, 0x61, 0x36, 0x15, 0xd6, 0xbe, 0xa2, 0x64, 0x3d, 0x74, 0x7a, 0xe2, 0x41, 0xe5, 0x8c, 0x42,
-	0xcc, 0x07, 0x47, 0x01, 0xd9, 0x4f, 0xe4, 0xc1, 0x58, 0x23, 0x3d, 0xfb, 0xc2, 0x46, 0x7a, 0x6e,
-	0xac, 0x91, 0x1e, 0xc0, 0x6c, 0xd2, 0x7e, 0x5c, 0x87, 0x82, 0x1a, 0x56, 0xca, 0xd6, 0x62, 0x63,
-	0x41, 0x9b, 0x1f, 0x12, 0x60, 0x06, 0x38, 0x7c, 0x05, 0x66, 0x06, 0x94, 0xb8, 0x56, 0x37, 0xd4,
-	0xa3, 0x12, 0x2b, 0x67, 0x9e, 0x97, 0xc2, 0x48, 0xb7, 0xf1, 0x0b, 0x82, 0x45, 0xad, 0xb3, 0xc3,
-	0x22, 0x7e, 0x0d, 0xce, 0x27, 0x8c, 0x45, 0xca, 0xd8, 0xe2, 0x7e, 0xcc, 0xcc, 0x1d, 0x28, 0x45,
-	0x57, 0x84, 0x8e, 0x09, 0xda, 0x5f, 0xb1, 0x61, 0xe8, 0x38, 0x26, 0x6f, 0x32, 0xe7, 0xba, 0xc9,
-	0x9b, 0x75, 0x8d, 0x3d, 0xaf, 0x6b, 0xec, 0x7f, 0x23, 0xc0, 0xa3, 0x51, 0x73, 0x9c, 0x1e, 0xa7,
-	0xe9, 0x3a, 0xf8, 0xf5, 0x44, 0xf1, 0x49, 0x60, 0x41, 0x01, 0x47, 0xa5, 0x25, 0x51, 0xe9, 0x34,
-	0x3a, 0xfb, 0xc2, 0x34, 0x3a, 0xa7, 0x49, 0xa3, 0xe9, 0x51, 0x1a, 0x25, 0xd3, 0x22, 0x7f, 0xaa,
-	0xf9, 0xfa, 0x10, 0xca, 0x09, 0x9b, 0xc3, 0x28, 0xbd, 0x07, 0x70, 0xbc, 0xa4, 0x44, 0x13, 0xb5,
-	0x92, 0xd5, 0x40, 0xcc, 0x18, 0x76, 0xe2, 0x31, 0xfa, 0x97, 0xf4, 0xb6, 0x60, 0x94, 0x0c, 0x12,
-	0xde, 0x3e, 0xa1, 0x31, 0x6b, 0x6b, 0x35, 0xf7, 0x5f, 0xd4, 0xaa, 0xc4, 0x3d, 0x20, 0xac, 0xa7,
-	0xaa, 0xb3, 0x60, 0x06, 0x2f, 0x32, 0x9b, 0x85, 0x27, 0x48, 0xdf, 0x52, 0xaf, 0x5c, 0xc5, 0xb1,
-	0x60, 0x16, 0x95, 0xac, 0xa3, 0x44, 0xc6, 0x7d, 0x28, 0x27, 0xec, 0x7c, 0x59, 0x0f, 0x37, 0xbe,
-	0x47, 0x70, 0x21, 0xd0, 0xe8, 0xb8, 0xb6, 0x3c, 0xed, 0x50, 0x76, 0xe4, 0x74, 0x29, 0x7e, 0x06,
-	0xc5, 0xd8, 0x4d, 0xf8, 0x9a, 0x4e, 0x5b, 0xda, 0xe5, 0xd5, 0xeb, 0x27, 0xe2, 0x02, 0xca, 0xc6,
-	0xe2, 0xf3, 0xdf, 0xff, 0xfc, 0x2e, 0xf7, 0x7f, 0xa3, 0x74, 0xbc, 0x39, 0xaf, 0x73, 0x05, 0x5b,
-	0x47, 0xab, 0x6f, 0xa3, 0xc6, 0x6f, 0xd3, 0x30, 0x13, 0xa3, 0xf3, 0xf1, 0x1a, 0xfe, 0x12, 0x41,
-	0x59, 0x33, 0xd0, 0x71, 0xed, 0x74, 0xdb, 0x49, 0x75, 0x29, 0xc2, 0xc7, 0x36, 0xdf, 0xda, 0xfd,
-	0x68, 0xf3, 0x35, 0xae, 0x28, 0x5e, 0x4b, 0x46, 0x65, 0x7c, 0x6f, 0xe6, 0xeb, 0x8e, 0x52, 0xba,
-	0x8e, 0x56, 0xf1, 0x0f, 0x08, 0x70, 0x7a, 0x1f, 0xc0, 0x37, 0x74, 0x54, 0x32, 0xf7, 0x86, 0x93,
-	0x98, 0xdc, 0x54, 0x4c, 0xd6, 0x8c, 0xb7, 0x52, 0x4c, 0xea, 0x4f, 0x53, 0x79, 0xfb, 0x6c, 0x3d,
-	0xd8, 0x28, 0x42, 0x76, 0x65, 0xcd, 0x9a, 0xab, 0xf7, 0x54, 0xf6, 0x7e, 0x5e, 0xad, 0x4f, 0x8c,
-	0x0f, 0x63, 0x9a, 0xed, 0xbb, 0x3a, 0x57, 0x9f, 0x49, 0x76, 0x3f, 0x22, 0xc0, 0xe9, 0xdd, 0x44,
-	0xef, 0xbb, 0xcc, 0x1d, 0xa6, 0x7a, 0xe2, 0x02, 0x62, 0xbc, 0xaf, 0xc8, 0xdc, 0x6c, 0x5c, 0x9d,
-	0xcc, 0x7d, 0x63, 0x7b, 0x0e, 0xfe, 0x0a, 0x01, 0x4e, 0x6f, 0x1d, 0x7a, 0x9a, 0x99, 0xdb, 0x49,
-	0xf5, 0x62, 0x6a, 0xc5, 0x69, 0xca, 0x3f, 0x28, 0xe3, 0x86, 0x22, 0x77, 0x7d, 0x75, 0x32, 0x72,
-	0xf8, 0x1b, 0x04, 0x73, 0x63, 0xab, 0x0b, 0x5e, 0xd5, 0x31, 0xd1, 0xef, 0x37, 0x13, 0x78, 0x2b,
-	0x24, 0x84, 0x27, 0x24, 0xf4, 0x33, 0x82, 0xb2, 0x66, 0x30, 0xeb, 0x53, 0x2c, 0x7b, 0x5d, 0xd2,
-	0xa7, 0xd8, 0x0b, 0x26, 0x7e, 0x14, 0x55, 0xfc, 0xee, 0x44, 0x3c, 0xeb, 0xd1, 0xf8, 0x0e, 0x27,
-	0x3f, 0x7e, 0x0a, 0xc5, 0xd8, 0x84, 0xca, 0xe8, 0x6a, 0xa9, 0xb1, 0x9d, 0xd1, 0xd5, 0xd2, 0xa3,
-	0x4e, 0xd3, 0xd5, 0x46, 0x99, 0x7f, 0x9b, 0xc2, 0xc5, 0xae, 0x37, 0xd0, 0xa8, 0xba, 0x0d, 0x4a,
-	0x4b, 0x5b, 0xe6, 0x48, 0x1b, 0x7d, 0xb6, 0x1e, 0x21, 0xbc, 0x3e, 0x71, 0xed, 0x9a, 0xc7, 0x6c,
-	0xf9, 0x33, 0xaf, 0x32, 0xa8, 0x1e, 0x1c, 0x11, 0xdf, 0xe1, 0xf1, 0x1f, 0xfc, 0x5b, 0xd1, 0xf3,
-	0x3f, 0x08, 0xed, 0x9f, 0x51, 0xc8, 0x77, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x9b, 0xce,
-	0x6e, 0xa3, 0x10, 0x00, 0x00,
-}
diff --git a/googleapis/genomics/v1/references.pb.go b/googleapis/genomics/v1/references.pb.go
index 744adddabc..cb8b5f8c2d 100644
--- a/googleapis/genomics/v1/references.pb.go
+++ b/googleapis/genomics/v1/references.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/references.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package genomics
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A reference is a canonical assembled DNA sequence, intended to act as a
 // reference coordinate space for other genomic annotations. A single reference
@@ -59,16 +59,17 @@ func (m *Reference) Reset()         { *m = Reference{} }
 func (m *Reference) String() string { return proto.CompactTextString(m) }
 func (*Reference) ProtoMessage()    {}
 func (*Reference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{0}
+	return fileDescriptor_008bb4c9c386df7c, []int{0}
 }
+
 func (m *Reference) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Reference.Unmarshal(m, b)
 }
 func (m *Reference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Reference.Marshal(b, m, deterministic)
 }
-func (dst *Reference) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Reference.Merge(dst, src)
+func (m *Reference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Reference.Merge(m, src)
 }
 func (m *Reference) XXX_Size() int {
 	return xxx_messageInfo_Reference.Size(m)
@@ -172,16 +173,17 @@ func (m *ReferenceSet) Reset()         { *m = ReferenceSet{} }
 func (m *ReferenceSet) String() string { return proto.CompactTextString(m) }
 func (*ReferenceSet) ProtoMessage()    {}
 func (*ReferenceSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{1}
+	return fileDescriptor_008bb4c9c386df7c, []int{1}
 }
+
 func (m *ReferenceSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReferenceSet.Unmarshal(m, b)
 }
 func (m *ReferenceSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReferenceSet.Marshal(b, m, deterministic)
 }
-func (dst *ReferenceSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReferenceSet.Merge(dst, src)
+func (m *ReferenceSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceSet.Merge(m, src)
 }
 func (m *ReferenceSet) XXX_Size() int {
 	return xxx_messageInfo_ReferenceSet.Size(m)
@@ -276,16 +278,17 @@ func (m *SearchReferenceSetsRequest) Reset()         { *m = SearchReferenceSetsR
 func (m *SearchReferenceSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchReferenceSetsRequest) ProtoMessage()    {}
 func (*SearchReferenceSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{2}
+	return fileDescriptor_008bb4c9c386df7c, []int{2}
 }
+
 func (m *SearchReferenceSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReferenceSetsRequest.Unmarshal(m, b)
 }
 func (m *SearchReferenceSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReferenceSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchReferenceSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReferenceSetsRequest.Merge(dst, src)
+func (m *SearchReferenceSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferenceSetsRequest.Merge(m, src)
 }
 func (m *SearchReferenceSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchReferenceSetsRequest.Size(m)
@@ -347,16 +350,17 @@ func (m *SearchReferenceSetsResponse) Reset()         { *m = SearchReferenceSets
 func (m *SearchReferenceSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchReferenceSetsResponse) ProtoMessage()    {}
 func (*SearchReferenceSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{3}
+	return fileDescriptor_008bb4c9c386df7c, []int{3}
 }
+
 func (m *SearchReferenceSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReferenceSetsResponse.Unmarshal(m, b)
 }
 func (m *SearchReferenceSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReferenceSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchReferenceSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReferenceSetsResponse.Merge(dst, src)
+func (m *SearchReferenceSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferenceSetsResponse.Merge(m, src)
 }
 func (m *SearchReferenceSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchReferenceSetsResponse.Size(m)
@@ -393,16 +397,17 @@ func (m *GetReferenceSetRequest) Reset()         { *m = GetReferenceSetRequest{}
 func (m *GetReferenceSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetReferenceSetRequest) ProtoMessage()    {}
 func (*GetReferenceSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{4}
+	return fileDescriptor_008bb4c9c386df7c, []int{4}
 }
+
 func (m *GetReferenceSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetReferenceSetRequest.Unmarshal(m, b)
 }
 func (m *GetReferenceSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetReferenceSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetReferenceSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetReferenceSetRequest.Merge(dst, src)
+func (m *GetReferenceSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceSetRequest.Merge(m, src)
 }
 func (m *GetReferenceSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetReferenceSetRequest.Size(m)
@@ -447,16 +452,17 @@ func (m *SearchReferencesRequest) Reset()         { *m = SearchReferencesRequest
 func (m *SearchReferencesRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchReferencesRequest) ProtoMessage()    {}
 func (*SearchReferencesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{5}
+	return fileDescriptor_008bb4c9c386df7c, []int{5}
 }
+
 func (m *SearchReferencesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReferencesRequest.Unmarshal(m, b)
 }
 func (m *SearchReferencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReferencesRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchReferencesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReferencesRequest.Merge(dst, src)
+func (m *SearchReferencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferencesRequest.Merge(m, src)
 }
 func (m *SearchReferencesRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchReferencesRequest.Size(m)
@@ -518,16 +524,17 @@ func (m *SearchReferencesResponse) Reset()         { *m = SearchReferencesRespon
 func (m *SearchReferencesResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchReferencesResponse) ProtoMessage()    {}
 func (*SearchReferencesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{6}
+	return fileDescriptor_008bb4c9c386df7c, []int{6}
 }
+
 func (m *SearchReferencesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchReferencesResponse.Unmarshal(m, b)
 }
 func (m *SearchReferencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchReferencesResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchReferencesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchReferencesResponse.Merge(dst, src)
+func (m *SearchReferencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferencesResponse.Merge(m, src)
 }
 func (m *SearchReferencesResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchReferencesResponse.Size(m)
@@ -564,16 +571,17 @@ func (m *GetReferenceRequest) Reset()         { *m = GetReferenceRequest{} }
 func (m *GetReferenceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetReferenceRequest) ProtoMessage()    {}
 func (*GetReferenceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{7}
+	return fileDescriptor_008bb4c9c386df7c, []int{7}
 }
+
 func (m *GetReferenceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetReferenceRequest.Unmarshal(m, b)
 }
 func (m *GetReferenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetReferenceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetReferenceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetReferenceRequest.Merge(dst, src)
+func (m *GetReferenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceRequest.Merge(m, src)
 }
 func (m *GetReferenceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetReferenceRequest.Size(m)
@@ -616,16 +624,17 @@ func (m *ListBasesRequest) Reset()         { *m = ListBasesRequest{} }
 func (m *ListBasesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListBasesRequest) ProtoMessage()    {}
 func (*ListBasesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{8}
+	return fileDescriptor_008bb4c9c386df7c, []int{8}
 }
+
 func (m *ListBasesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBasesRequest.Unmarshal(m, b)
 }
 func (m *ListBasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBasesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListBasesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBasesRequest.Merge(dst, src)
+func (m *ListBasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBasesRequest.Merge(m, src)
 }
 func (m *ListBasesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListBasesRequest.Size(m)
@@ -691,16 +700,17 @@ func (m *ListBasesResponse) Reset()         { *m = ListBasesResponse{} }
 func (m *ListBasesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListBasesResponse) ProtoMessage()    {}
 func (*ListBasesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_references_4bc5034e4d222e4d, []int{9}
+	return fileDescriptor_008bb4c9c386df7c, []int{9}
 }
+
 func (m *ListBasesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListBasesResponse.Unmarshal(m, b)
 }
 func (m *ListBasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListBasesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListBasesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListBasesResponse.Merge(dst, src)
+func (m *ListBasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBasesResponse.Merge(m, src)
 }
 func (m *ListBasesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListBasesResponse.Size(m)
@@ -745,6 +755,68 @@ func init() {
 	proto.RegisterType((*ListBasesResponse)(nil), "google.genomics.v1.ListBasesResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/genomics/v1/references.proto", fileDescriptor_008bb4c9c386df7c)
+}
+
+var fileDescriptor_008bb4c9c386df7c = []byte{
+	// 851 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0xd6, 0x78, 0x63, 0x37, 0x7e, 0x76, 0x12, 0xf7, 0x15, 0xc2, 0xca, 0x25, 0xd4, 0x6c, 0x9a,
+	0x62, 0x35, 0x95, 0x57, 0x29, 0x42, 0x42, 0x45, 0x1c, 0xc8, 0xa5, 0x8a, 0xc4, 0x21, 0xda, 0x14,
+	0x0e, 0x5c, 0x56, 0x9b, 0xdd, 0x89, 0x33, 0x34, 0xde, 0x31, 0x3b, 0x93, 0xa8, 0xb4, 0xca, 0x01,
+	0x24, 0x8e, 0xc0, 0x81, 0x0b, 0x88, 0xdf, 0xc2, 0x89, 0x9f, 0xc0, 0x09, 0x71, 0xe5, 0x47, 0x70,
+	0x44, 0x33, 0x3b, 0xbb, 0x1e, 0xaf, 0x97, 0xd8, 0x52, 0xb9, 0xed, 0x7c, 0xf3, 0xe6, 0xcd, 0xf7,
+	0x7d, 0x6f, 0xde, 0xec, 0xc0, 0xee, 0x98, 0xf3, 0xf1, 0x05, 0xf5, 0xc7, 0x34, 0xe5, 0x13, 0x16,
+	0x0b, 0xff, 0xea, 0xc0, 0xcf, 0xe8, 0x19, 0xcd, 0x68, 0x1a, 0x53, 0x31, 0x9a, 0x66, 0x5c, 0x72,
+	0xc4, 0x3c, 0x68, 0x54, 0x04, 0x8d, 0xae, 0x0e, 0xfa, 0x6f, 0x9b, 0x85, 0xd1, 0x94, 0xf9, 0x51,
+	0x9a, 0x72, 0x19, 0x49, 0xc6, 0x53, 0xb3, 0xc2, 0xfb, 0x93, 0x40, 0x3b, 0x28, 0xd2, 0xe0, 0x26,
+	0x34, 0x58, 0xe2, 0x92, 0x01, 0x19, 0xb6, 0x83, 0x06, 0x4b, 0x70, 0x1b, 0x5a, 0x17, 0x34, 0x1d,
+	0xcb, 0x73, 0xb7, 0x31, 0x20, 0x43, 0x27, 0x30, 0x23, 0x1c, 0x40, 0x67, 0x92, 0x7c, 0x10, 0x9f,
+	0xd3, 0xf8, 0xb9, 0xb8, 0x9c, 0xb8, 0x8e, 0x5e, 0x60, 0x43, 0x88, 0xb0, 0x96, 0x46, 0x13, 0xea,
+	0xae, 0xe9, 0x29, 0xfd, 0x8d, 0x3b, 0x00, 0x82, 0x5f, 0x66, 0x31, 0x0d, 0x2f, 0x33, 0xe6, 0x36,
+	0xf5, 0x4c, 0x3b, 0x47, 0x3e, 0xcb, 0x18, 0xee, 0xc3, 0x6d, 0x33, 0x1d, 0xc5, 0x31, 0x15, 0x42,
+	0xb1, 0x74, 0x5b, 0x03, 0x67, 0xd8, 0x0e, 0x7a, 0xf9, 0xc4, 0x27, 0x25, 0x8e, 0x1e, 0x6c, 0xa4,
+	0xf1, 0x29, 0x0b, 0x65, 0xf4, 0x82, 0xa7, 0x21, 0x4b, 0xdc, 0x5b, 0x03, 0x32, 0x6c, 0x06, 0x1d,
+	0x05, 0x3e, 0x53, 0xd8, 0x51, 0xe2, 0xfd, 0xdc, 0x80, 0x6e, 0xa9, 0xed, 0x84, 0xca, 0x05, 0x79,
+	0xbb, 0xb0, 0x51, 0x5a, 0x18, 0xb2, 0x44, 0xb8, 0x0d, 0xbd, 0x5b, 0xb7, 0x04, 0x8f, 0x12, 0xb1,
+	0x82, 0xd6, 0x05, 0x2e, 0x6b, 0x0b, 0x5c, 0x54, 0x96, 0x84, 0x8a, 0x38, 0x63, 0x53, 0xe5, 0xbe,
+	0x11, 0x6f, 0x43, 0x78, 0x0f, 0x3a, 0x91, 0x10, 0x74, 0x72, 0x7a, 0xf1, 0xb5, 0xca, 0xd1, 0xd2,
+	0x11, 0x50, 0x40, 0x47, 0x49, 0xc5, 0xbe, 0x5b, 0x2b, 0xd9, 0xb7, 0x5e, 0x6f, 0x9f, 0xf7, 0x1b,
+	0x81, 0xfe, 0x09, 0x8d, 0xb2, 0xf8, 0xdc, 0x36, 0x48, 0x04, 0xf4, 0xab, 0x4b, 0x2a, 0x24, 0x7a,
+	0xd0, 0xb5, 0x04, 0x0a, 0x97, 0xe4, 0xbe, 0xd8, 0x18, 0xbe, 0x03, 0x60, 0x6d, 0x94, 0x3b, 0x67,
+	0x21, 0x55, 0x3d, 0x4e, 0x9d, 0x9e, 0x69, 0x34, 0xa6, 0xa1, 0xe4, 0xcf, 0x69, 0x6a, 0x0e, 0x4a,
+	0x5b, 0x21, 0xcf, 0x14, 0x80, 0x77, 0x41, 0x0f, 0x42, 0xc1, 0x5e, 0x52, 0xed, 0x57, 0x33, 0x58,
+	0x57, 0xc0, 0x09, 0x7b, 0x49, 0xbd, 0x1f, 0x08, 0xdc, 0xad, 0xe5, 0x2f, 0xa6, 0x3c, 0x15, 0x14,
+	0x9f, 0xc2, 0xe6, 0xac, 0xb2, 0x82, 0xca, 0x5c, 0x42, 0xe7, 0xf1, 0x60, 0xb4, 0xd8, 0x21, 0x23,
+	0x3b, 0x45, 0x30, 0x3b, 0x11, 0x2a, 0x21, 0x3e, 0x80, 0xad, 0x94, 0xbe, 0x90, 0xa1, 0xc5, 0xb4,
+	0xa1, 0x99, 0x6e, 0x28, 0xf8, 0xb8, 0x60, 0xeb, 0x1d, 0xc2, 0xf6, 0x53, 0x2a, 0xe7, 0x32, 0x19,
+	0x2f, 0x87, 0xd0, 0x9b, 0xa3, 0x12, 0x96, 0x47, 0x70, 0xd3, 0xde, 0xea, 0x28, 0xf1, 0x7e, 0x27,
+	0xf0, 0x56, 0x45, 0xd4, 0xff, 0x5a, 0x91, 0x3a, 0x26, 0x4e, 0x1d, 0x93, 0xd7, 0x2a, 0xcd, 0x37,
+	0x04, 0xdc, 0x45, 0x15, 0xa6, 0x2e, 0x1f, 0x03, 0xcc, 0x2e, 0x2d, 0x53, 0x93, 0x9d, 0x1b, 0x6b,
+	0x12, 0x58, 0x0b, 0x56, 0xae, 0xc6, 0x87, 0x70, 0xc7, 0xae, 0x46, 0x61, 0xe2, 0xbb, 0xd0, 0xb5,
+	0xfb, 0xdd, 0x94, 0xa1, 0x63, 0xb5, 0xbb, 0xf7, 0x0b, 0x81, 0xde, 0xa7, 0x4c, 0xc8, 0xc3, 0x48,
+	0xcc, 0xcc, 0x5f, 0xbe, 0x0e, 0xdf, 0x80, 0xa6, 0x90, 0x51, 0x26, 0xcd, 0x45, 0x99, 0x0f, 0xb0,
+	0x07, 0x0e, 0x4d, 0x73, 0x93, 0x9d, 0x40, 0x7d, 0xbe, 0x96, 0xb3, 0x1c, 0x6e, 0x5b, 0xd4, 0x8c,
+	0xa3, 0xdb, 0xd0, 0xe2, 0x67, 0x67, 0x82, 0x4a, 0xcd, 0xca, 0x09, 0xcc, 0x08, 0xfb, 0xb0, 0x2e,
+	0x14, 0xfd, 0x34, 0xa6, 0xc6, 0xa3, 0x72, 0x5c, 0x67, 0xa3, 0x53, 0x63, 0xe3, 0xe3, 0xbf, 0x9a,
+	0x80, 0xd6, 0x91, 0xce, 0xae, 0x58, 0x4c, 0x3f, 0x3f, 0xc0, 0x5f, 0x09, 0xdc, 0xa9, 0x69, 0x3e,
+	0x1c, 0xd5, 0x15, 0xf2, 0xbf, 0x6f, 0x99, 0xbe, 0xbf, 0x72, 0x7c, 0xae, 0xd5, 0xdb, 0xfd, 0xf6,
+	0x8f, 0xbf, 0x7f, 0x6a, 0xec, 0x78, 0xee, 0xfc, 0xcf, 0x8f, 0x4a, 0xe1, 0x0b, 0xbd, 0xec, 0x09,
+	0x79, 0x88, 0xdf, 0x13, 0xd8, 0xaa, 0xb4, 0x22, 0x3e, 0xac, 0xdb, 0xa9, 0xbe, 0x5f, 0xfb, 0x4b,
+	0xaf, 0x08, 0xef, 0x91, 0xa6, 0xf1, 0x00, 0xef, 0x2f, 0xd2, 0x78, 0x55, 0x6d, 0xb0, 0x6b, 0xfc,
+	0x91, 0x40, 0xaf, 0xda, 0x0f, 0xb8, 0xbf, 0x82, 0xf4, 0xd2, 0xa7, 0x47, 0xab, 0x05, 0x1b, 0x93,
+	0x06, 0x9a, 0x5d, 0xdf, 0x7b, 0x73, 0x9e, 0x9d, 0xe5, 0xd0, 0x35, 0x74, 0x6d, 0xed, 0xf8, 0xde,
+	0x32, 0x77, 0x0a, 0x22, 0x37, 0x77, 0xaa, 0xb7, 0xa7, 0x77, 0xbe, 0x87, 0x3b, 0x95, 0x9d, 0x5f,
+	0xd9, 0xcd, 0x73, 0x8d, 0xdf, 0x11, 0x68, 0x97, 0xe7, 0x18, 0xef, 0xd7, 0xe5, 0xac, 0x76, 0x60,
+	0x7f, 0x6f, 0x49, 0x94, 0xd1, 0xbe, 0xaf, 0x19, 0xec, 0xe1, 0xee, 0x8d, 0x0c, 0xfc, 0x53, 0xb5,
+	0xe8, 0xf0, 0x4b, 0xd8, 0x8e, 0xf9, 0xa4, 0x26, 0xf1, 0xe1, 0xd6, 0xcc, 0xd6, 0x63, 0xf5, 0x4a,
+	0x3a, 0x26, 0x5f, 0x3c, 0x29, 0xc2, 0xf8, 0x45, 0x94, 0x8e, 0x47, 0x3c, 0x1b, 0xab, 0x97, 0x98,
+	0x7e, 0x43, 0xf9, 0xf9, 0x54, 0x34, 0x65, 0xc2, 0x7e, 0x9d, 0x7d, 0x54, 0x7c, 0xff, 0x43, 0xc8,
+	0x69, 0x4b, 0x47, 0xbe, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x9f, 0xb6, 0x11, 0xc6,
+	0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1028,65 +1100,3 @@ var _ReferenceServiceV1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/genomics/v1/references.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/genomics/v1/references.proto", fileDescriptor_references_4bc5034e4d222e4d)
-}
-
-var fileDescriptor_references_4bc5034e4d222e4d = []byte{
-	// 851 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x6f, 0x1b, 0x45,
-	0x14, 0xd6, 0x78, 0x63, 0x37, 0x7e, 0x76, 0x12, 0xf7, 0x15, 0xc2, 0xca, 0x25, 0xd4, 0x6c, 0x9a,
-	0x62, 0x35, 0x95, 0x57, 0x29, 0x42, 0x42, 0x45, 0x1c, 0xc8, 0xa5, 0x8a, 0xc4, 0x21, 0xda, 0x14,
-	0x0e, 0x5c, 0x56, 0x9b, 0xdd, 0x89, 0x33, 0x34, 0xde, 0x31, 0x3b, 0x93, 0xa8, 0xb4, 0xca, 0x01,
-	0x24, 0x8e, 0xc0, 0x81, 0x0b, 0x88, 0xdf, 0xc2, 0x89, 0x9f, 0xc0, 0x09, 0x71, 0xe5, 0x47, 0x70,
-	0x44, 0x33, 0x3b, 0xbb, 0x1e, 0xaf, 0x97, 0xd8, 0x52, 0xb9, 0xed, 0x7c, 0xf3, 0xe6, 0xcd, 0xf7,
-	0x7d, 0x6f, 0xde, 0xec, 0xc0, 0xee, 0x98, 0xf3, 0xf1, 0x05, 0xf5, 0xc7, 0x34, 0xe5, 0x13, 0x16,
-	0x0b, 0xff, 0xea, 0xc0, 0xcf, 0xe8, 0x19, 0xcd, 0x68, 0x1a, 0x53, 0x31, 0x9a, 0x66, 0x5c, 0x72,
-	0xc4, 0x3c, 0x68, 0x54, 0x04, 0x8d, 0xae, 0x0e, 0xfa, 0x6f, 0x9b, 0x85, 0xd1, 0x94, 0xf9, 0x51,
-	0x9a, 0x72, 0x19, 0x49, 0xc6, 0x53, 0xb3, 0xc2, 0xfb, 0x93, 0x40, 0x3b, 0x28, 0xd2, 0xe0, 0x26,
-	0x34, 0x58, 0xe2, 0x92, 0x01, 0x19, 0xb6, 0x83, 0x06, 0x4b, 0x70, 0x1b, 0x5a, 0x17, 0x34, 0x1d,
-	0xcb, 0x73, 0xb7, 0x31, 0x20, 0x43, 0x27, 0x30, 0x23, 0x1c, 0x40, 0x67, 0x92, 0x7c, 0x10, 0x9f,
-	0xd3, 0xf8, 0xb9, 0xb8, 0x9c, 0xb8, 0x8e, 0x5e, 0x60, 0x43, 0x88, 0xb0, 0x96, 0x46, 0x13, 0xea,
-	0xae, 0xe9, 0x29, 0xfd, 0x8d, 0x3b, 0x00, 0x82, 0x5f, 0x66, 0x31, 0x0d, 0x2f, 0x33, 0xe6, 0x36,
-	0xf5, 0x4c, 0x3b, 0x47, 0x3e, 0xcb, 0x18, 0xee, 0xc3, 0x6d, 0x33, 0x1d, 0xc5, 0x31, 0x15, 0x42,
-	0xb1, 0x74, 0x5b, 0x03, 0x67, 0xd8, 0x0e, 0x7a, 0xf9, 0xc4, 0x27, 0x25, 0x8e, 0x1e, 0x6c, 0xa4,
-	0xf1, 0x29, 0x0b, 0x65, 0xf4, 0x82, 0xa7, 0x21, 0x4b, 0xdc, 0x5b, 0x03, 0x32, 0x6c, 0x06, 0x1d,
-	0x05, 0x3e, 0x53, 0xd8, 0x51, 0xe2, 0xfd, 0xdc, 0x80, 0x6e, 0xa9, 0xed, 0x84, 0xca, 0x05, 0x79,
-	0xbb, 0xb0, 0x51, 0x5a, 0x18, 0xb2, 0x44, 0xb8, 0x0d, 0xbd, 0x5b, 0xb7, 0x04, 0x8f, 0x12, 0xb1,
-	0x82, 0xd6, 0x05, 0x2e, 0x6b, 0x0b, 0x5c, 0x54, 0x96, 0x84, 0x8a, 0x38, 0x63, 0x53, 0xe5, 0xbe,
-	0x11, 0x6f, 0x43, 0x78, 0x0f, 0x3a, 0x91, 0x10, 0x74, 0x72, 0x7a, 0xf1, 0xb5, 0xca, 0xd1, 0xd2,
-	0x11, 0x50, 0x40, 0x47, 0x49, 0xc5, 0xbe, 0x5b, 0x2b, 0xd9, 0xb7, 0x5e, 0x6f, 0x9f, 0xf7, 0x1b,
-	0x81, 0xfe, 0x09, 0x8d, 0xb2, 0xf8, 0xdc, 0x36, 0x48, 0x04, 0xf4, 0xab, 0x4b, 0x2a, 0x24, 0x7a,
-	0xd0, 0xb5, 0x04, 0x0a, 0x97, 0xe4, 0xbe, 0xd8, 0x18, 0xbe, 0x03, 0x60, 0x6d, 0x94, 0x3b, 0x67,
-	0x21, 0x55, 0x3d, 0x4e, 0x9d, 0x9e, 0x69, 0x34, 0xa6, 0xa1, 0xe4, 0xcf, 0x69, 0x6a, 0x0e, 0x4a,
-	0x5b, 0x21, 0xcf, 0x14, 0x80, 0x77, 0x41, 0x0f, 0x42, 0xc1, 0x5e, 0x52, 0xed, 0x57, 0x33, 0x58,
-	0x57, 0xc0, 0x09, 0x7b, 0x49, 0xbd, 0x1f, 0x08, 0xdc, 0xad, 0xe5, 0x2f, 0xa6, 0x3c, 0x15, 0x14,
-	0x9f, 0xc2, 0xe6, 0xac, 0xb2, 0x82, 0xca, 0x5c, 0x42, 0xe7, 0xf1, 0x60, 0xb4, 0xd8, 0x21, 0x23,
-	0x3b, 0x45, 0x30, 0x3b, 0x11, 0x2a, 0x21, 0x3e, 0x80, 0xad, 0x94, 0xbe, 0x90, 0xa1, 0xc5, 0xb4,
-	0xa1, 0x99, 0x6e, 0x28, 0xf8, 0xb8, 0x60, 0xeb, 0x1d, 0xc2, 0xf6, 0x53, 0x2a, 0xe7, 0x32, 0x19,
-	0x2f, 0x87, 0xd0, 0x9b, 0xa3, 0x12, 0x96, 0x47, 0x70, 0xd3, 0xde, 0xea, 0x28, 0xf1, 0x7e, 0x27,
-	0xf0, 0x56, 0x45, 0xd4, 0xff, 0x5a, 0x91, 0x3a, 0x26, 0x4e, 0x1d, 0x93, 0xd7, 0x2a, 0xcd, 0x37,
-	0x04, 0xdc, 0x45, 0x15, 0xa6, 0x2e, 0x1f, 0x03, 0xcc, 0x2e, 0x2d, 0x53, 0x93, 0x9d, 0x1b, 0x6b,
-	0x12, 0x58, 0x0b, 0x56, 0xae, 0xc6, 0x87, 0x70, 0xc7, 0xae, 0x46, 0x61, 0xe2, 0xbb, 0xd0, 0xb5,
-	0xfb, 0xdd, 0x94, 0xa1, 0x63, 0xb5, 0xbb, 0xf7, 0x0b, 0x81, 0xde, 0xa7, 0x4c, 0xc8, 0xc3, 0x48,
-	0xcc, 0xcc, 0x5f, 0xbe, 0x0e, 0xdf, 0x80, 0xa6, 0x90, 0x51, 0x26, 0xcd, 0x45, 0x99, 0x0f, 0xb0,
-	0x07, 0x0e, 0x4d, 0x73, 0x93, 0x9d, 0x40, 0x7d, 0xbe, 0x96, 0xb3, 0x1c, 0x6e, 0x5b, 0xd4, 0x8c,
-	0xa3, 0xdb, 0xd0, 0xe2, 0x67, 0x67, 0x82, 0x4a, 0xcd, 0xca, 0x09, 0xcc, 0x08, 0xfb, 0xb0, 0x2e,
-	0x14, 0xfd, 0x34, 0xa6, 0xc6, 0xa3, 0x72, 0x5c, 0x67, 0xa3, 0x53, 0x63, 0xe3, 0xe3, 0xbf, 0x9a,
-	0x80, 0xd6, 0x91, 0xce, 0xae, 0x58, 0x4c, 0x3f, 0x3f, 0xc0, 0x5f, 0x09, 0xdc, 0xa9, 0x69, 0x3e,
-	0x1c, 0xd5, 0x15, 0xf2, 0xbf, 0x6f, 0x99, 0xbe, 0xbf, 0x72, 0x7c, 0xae, 0xd5, 0xdb, 0xfd, 0xf6,
-	0x8f, 0xbf, 0x7f, 0x6a, 0xec, 0x78, 0xee, 0xfc, 0xcf, 0x8f, 0x4a, 0xe1, 0x0b, 0xbd, 0xec, 0x09,
-	0x79, 0x88, 0xdf, 0x13, 0xd8, 0xaa, 0xb4, 0x22, 0x3e, 0xac, 0xdb, 0xa9, 0xbe, 0x5f, 0xfb, 0x4b,
-	0xaf, 0x08, 0xef, 0x91, 0xa6, 0xf1, 0x00, 0xef, 0x2f, 0xd2, 0x78, 0x55, 0x6d, 0xb0, 0x6b, 0xfc,
-	0x91, 0x40, 0xaf, 0xda, 0x0f, 0xb8, 0xbf, 0x82, 0xf4, 0xd2, 0xa7, 0x47, 0xab, 0x05, 0x1b, 0x93,
-	0x06, 0x9a, 0x5d, 0xdf, 0x7b, 0x73, 0x9e, 0x9d, 0xe5, 0xd0, 0x35, 0x74, 0x6d, 0xed, 0xf8, 0xde,
-	0x32, 0x77, 0x0a, 0x22, 0x37, 0x77, 0xaa, 0xb7, 0xa7, 0x77, 0xbe, 0x87, 0x3b, 0x95, 0x9d, 0x5f,
-	0xd9, 0xcd, 0x73, 0x8d, 0xdf, 0x11, 0x68, 0x97, 0xe7, 0x18, 0xef, 0xd7, 0xe5, 0xac, 0x76, 0x60,
-	0x7f, 0x6f, 0x49, 0x94, 0xd1, 0xbe, 0xaf, 0x19, 0xec, 0xe1, 0xee, 0x8d, 0x0c, 0xfc, 0x53, 0xb5,
-	0xe8, 0xf0, 0x4b, 0xd8, 0x8e, 0xf9, 0xa4, 0x26, 0xf1, 0xe1, 0xd6, 0xcc, 0xd6, 0x63, 0xf5, 0x4a,
-	0x3a, 0x26, 0x5f, 0x3c, 0x29, 0xc2, 0xf8, 0x45, 0x94, 0x8e, 0x47, 0x3c, 0x1b, 0xab, 0x97, 0x98,
-	0x7e, 0x43, 0xf9, 0xf9, 0x54, 0x34, 0x65, 0xc2, 0x7e, 0x9d, 0x7d, 0x54, 0x7c, 0xff, 0x43, 0xc8,
-	0x69, 0x4b, 0x47, 0xbe, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x9f, 0xb6, 0x11, 0xc6,
-	0x09, 0x00, 0x00,
-}
diff --git a/googleapis/genomics/v1/variants.pb.go b/googleapis/genomics/v1/variants.pb.go
index ab9a130bfd..f3cfa38ee9 100644
--- a/googleapis/genomics/v1/variants.pb.go
+++ b/googleapis/genomics/v1/variants.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/variants.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package genomics
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Operations to be performed during import on Variant info fields.
 // These operations are set for each info field in the info_merge_config
@@ -51,6 +51,7 @@ var InfoMergeOperation_name = map[int32]string{
 	1: "IGNORE_NEW",
 	2: "MOVE_TO_CALLS",
 }
+
 var InfoMergeOperation_value = map[string]int32{
 	"INFO_MERGE_OPERATION_UNSPECIFIED": 0,
 	"IGNORE_NEW":                       1,
@@ -60,8 +61,9 @@ var InfoMergeOperation_value = map[string]int32{
 func (x InfoMergeOperation) String() string {
 	return proto.EnumName(InfoMergeOperation_name, int32(x))
 }
+
 func (InfoMergeOperation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{0}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{0}
 }
 
 type VariantSetMetadata_Type int32
@@ -83,6 +85,7 @@ var VariantSetMetadata_Type_name = map[int32]string{
 	4: "CHARACTER",
 	5: "STRING",
 }
+
 var VariantSetMetadata_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"INTEGER":          1,
@@ -95,8 +98,9 @@ var VariantSetMetadata_Type_value = map[string]int32{
 func (x VariantSetMetadata_Type) String() string {
 	return proto.EnumName(VariantSetMetadata_Type_name, int32(x))
 }
+
 func (VariantSetMetadata_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{0, 0}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{0, 0}
 }
 
 type ImportVariantsRequest_Format int32
@@ -116,6 +120,7 @@ var ImportVariantsRequest_Format_name = map[int32]string{
 	1: "FORMAT_VCF",
 	2: "FORMAT_COMPLETE_GENOMICS",
 }
+
 var ImportVariantsRequest_Format_value = map[string]int32{
 	"FORMAT_UNSPECIFIED":       0,
 	"FORMAT_VCF":               1,
@@ -125,8 +130,9 @@ var ImportVariantsRequest_Format_value = map[string]int32{
 func (x ImportVariantsRequest_Format) String() string {
 	return proto.EnumName(ImportVariantsRequest_Format_name, int32(x))
 }
+
 func (ImportVariantsRequest_Format) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{6, 0}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{6, 0}
 }
 
 type ExportVariantSetRequest_Format int32
@@ -141,6 +147,7 @@ var ExportVariantSetRequest_Format_name = map[int32]string{
 	0: "FORMAT_UNSPECIFIED",
 	1: "FORMAT_BIGQUERY",
 }
+
 var ExportVariantSetRequest_Format_value = map[string]int32{
 	"FORMAT_UNSPECIFIED": 0,
 	"FORMAT_BIGQUERY":    1,
@@ -149,8 +156,9 @@ var ExportVariantSetRequest_Format_value = map[string]int32{
 func (x ExportVariantSetRequest_Format) String() string {
 	return proto.EnumName(ExportVariantSetRequest_Format_name, int32(x))
 }
+
 func (ExportVariantSetRequest_Format) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{9, 0}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{9, 0}
 }
 
 // Metadata describes a single piece of variant call metadata.
@@ -186,16 +194,17 @@ func (m *VariantSetMetadata) Reset()         { *m = VariantSetMetadata{} }
 func (m *VariantSetMetadata) String() string { return proto.CompactTextString(m) }
 func (*VariantSetMetadata) ProtoMessage()    {}
 func (*VariantSetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{0}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{0}
 }
+
 func (m *VariantSetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VariantSetMetadata.Unmarshal(m, b)
 }
 func (m *VariantSetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VariantSetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *VariantSetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VariantSetMetadata.Merge(dst, src)
+func (m *VariantSetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantSetMetadata.Merge(m, src)
 }
 func (m *VariantSetMetadata) XXX_Size() int {
 	return xxx_messageInfo_VariantSetMetadata.Size(m)
@@ -294,16 +303,17 @@ func (m *VariantSet) Reset()         { *m = VariantSet{} }
 func (m *VariantSet) String() string { return proto.CompactTextString(m) }
 func (*VariantSet) ProtoMessage()    {}
 func (*VariantSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{1}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{1}
 }
+
 func (m *VariantSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VariantSet.Unmarshal(m, b)
 }
 func (m *VariantSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VariantSet.Marshal(b, m, deterministic)
 }
-func (dst *VariantSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VariantSet.Merge(dst, src)
+func (m *VariantSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantSet.Merge(m, src)
 }
 func (m *VariantSet) XXX_Size() int {
 	return xxx_messageInfo_VariantSet.Size(m)
@@ -421,16 +431,17 @@ func (m *Variant) Reset()         { *m = Variant{} }
 func (m *Variant) String() string { return proto.CompactTextString(m) }
 func (*Variant) ProtoMessage()    {}
 func (*Variant) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{2}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{2}
 }
+
 func (m *Variant) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Variant.Unmarshal(m, b)
 }
 func (m *Variant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Variant.Marshal(b, m, deterministic)
 }
-func (dst *Variant) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Variant.Merge(dst, src)
+func (m *Variant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Variant.Merge(m, src)
 }
 func (m *Variant) XXX_Size() int {
 	return xxx_messageInfo_Variant.Size(m)
@@ -579,16 +590,17 @@ func (m *VariantCall) Reset()         { *m = VariantCall{} }
 func (m *VariantCall) String() string { return proto.CompactTextString(m) }
 func (*VariantCall) ProtoMessage()    {}
 func (*VariantCall) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{3}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{3}
 }
+
 func (m *VariantCall) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VariantCall.Unmarshal(m, b)
 }
 func (m *VariantCall) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VariantCall.Marshal(b, m, deterministic)
 }
-func (dst *VariantCall) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VariantCall.Merge(dst, src)
+func (m *VariantCall) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantCall.Merge(m, src)
 }
 func (m *VariantCall) XXX_Size() int {
 	return xxx_messageInfo_VariantCall.Size(m)
@@ -673,16 +685,17 @@ func (m *CallSet) Reset()         { *m = CallSet{} }
 func (m *CallSet) String() string { return proto.CompactTextString(m) }
 func (*CallSet) ProtoMessage()    {}
 func (*CallSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{4}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{4}
 }
+
 func (m *CallSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CallSet.Unmarshal(m, b)
 }
 func (m *CallSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CallSet.Marshal(b, m, deterministic)
 }
-func (dst *CallSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CallSet.Merge(dst, src)
+func (m *CallSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallSet.Merge(m, src)
 }
 func (m *CallSet) XXX_Size() int {
 	return xxx_messageInfo_CallSet.Size(m)
@@ -752,16 +765,17 @@ func (m *ReferenceBound) Reset()         { *m = ReferenceBound{} }
 func (m *ReferenceBound) String() string { return proto.CompactTextString(m) }
 func (*ReferenceBound) ProtoMessage()    {}
 func (*ReferenceBound) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{5}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{5}
 }
+
 func (m *ReferenceBound) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReferenceBound.Unmarshal(m, b)
 }
 func (m *ReferenceBound) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReferenceBound.Marshal(b, m, deterministic)
 }
-func (dst *ReferenceBound) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReferenceBound.Merge(dst, src)
+func (m *ReferenceBound) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceBound.Merge(m, src)
 }
 func (m *ReferenceBound) XXX_Size() int {
 	return xxx_messageInfo_ReferenceBound.Size(m)
@@ -820,16 +834,17 @@ func (m *ImportVariantsRequest) Reset()         { *m = ImportVariantsRequest{} }
 func (m *ImportVariantsRequest) String() string { return proto.CompactTextString(m) }
 func (*ImportVariantsRequest) ProtoMessage()    {}
 func (*ImportVariantsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{6}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{6}
 }
+
 func (m *ImportVariantsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportVariantsRequest.Unmarshal(m, b)
 }
 func (m *ImportVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportVariantsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ImportVariantsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportVariantsRequest.Merge(dst, src)
+func (m *ImportVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportVariantsRequest.Merge(m, src)
 }
 func (m *ImportVariantsRequest) XXX_Size() int {
 	return xxx_messageInfo_ImportVariantsRequest.Size(m)
@@ -888,16 +903,17 @@ func (m *ImportVariantsResponse) Reset()         { *m = ImportVariantsResponse{}
 func (m *ImportVariantsResponse) String() string { return proto.CompactTextString(m) }
 func (*ImportVariantsResponse) ProtoMessage()    {}
 func (*ImportVariantsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{7}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{7}
 }
+
 func (m *ImportVariantsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportVariantsResponse.Unmarshal(m, b)
 }
 func (m *ImportVariantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportVariantsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ImportVariantsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportVariantsResponse.Merge(dst, src)
+func (m *ImportVariantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportVariantsResponse.Merge(m, src)
 }
 func (m *ImportVariantsResponse) XXX_Size() int {
 	return xxx_messageInfo_ImportVariantsResponse.Size(m)
@@ -928,16 +944,17 @@ func (m *CreateVariantSetRequest) Reset()         { *m = CreateVariantSetRequest
 func (m *CreateVariantSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateVariantSetRequest) ProtoMessage()    {}
 func (*CreateVariantSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{8}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{8}
 }
+
 func (m *CreateVariantSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateVariantSetRequest.Unmarshal(m, b)
 }
 func (m *CreateVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateVariantSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateVariantSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateVariantSetRequest.Merge(dst, src)
+func (m *CreateVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVariantSetRequest.Merge(m, src)
 }
 func (m *CreateVariantSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateVariantSetRequest.Size(m)
@@ -985,16 +1002,17 @@ func (m *ExportVariantSetRequest) Reset()         { *m = ExportVariantSetRequest
 func (m *ExportVariantSetRequest) String() string { return proto.CompactTextString(m) }
 func (*ExportVariantSetRequest) ProtoMessage()    {}
 func (*ExportVariantSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{9}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{9}
 }
+
 func (m *ExportVariantSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExportVariantSetRequest.Unmarshal(m, b)
 }
 func (m *ExportVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExportVariantSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExportVariantSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExportVariantSetRequest.Merge(dst, src)
+func (m *ExportVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportVariantSetRequest.Merge(m, src)
 }
 func (m *ExportVariantSetRequest) XXX_Size() int {
 	return xxx_messageInfo_ExportVariantSetRequest.Size(m)
@@ -1060,16 +1078,17 @@ func (m *GetVariantSetRequest) Reset()         { *m = GetVariantSetRequest{} }
 func (m *GetVariantSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVariantSetRequest) ProtoMessage()    {}
 func (*GetVariantSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{10}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{10}
 }
+
 func (m *GetVariantSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVariantSetRequest.Unmarshal(m, b)
 }
 func (m *GetVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVariantSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVariantSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVariantSetRequest.Merge(dst, src)
+func (m *GetVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVariantSetRequest.Merge(m, src)
 }
 func (m *GetVariantSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVariantSetRequest.Size(m)
@@ -1108,16 +1127,17 @@ func (m *SearchVariantSetsRequest) Reset()         { *m = SearchVariantSetsReque
 func (m *SearchVariantSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchVariantSetsRequest) ProtoMessage()    {}
 func (*SearchVariantSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{11}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{11}
 }
+
 func (m *SearchVariantSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchVariantSetsRequest.Unmarshal(m, b)
 }
 func (m *SearchVariantSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchVariantSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchVariantSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchVariantSetsRequest.Merge(dst, src)
+func (m *SearchVariantSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantSetsRequest.Merge(m, src)
 }
 func (m *SearchVariantSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchVariantSetsRequest.Size(m)
@@ -1166,16 +1186,17 @@ func (m *SearchVariantSetsResponse) Reset()         { *m = SearchVariantSetsResp
 func (m *SearchVariantSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchVariantSetsResponse) ProtoMessage()    {}
 func (*SearchVariantSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{12}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{12}
 }
+
 func (m *SearchVariantSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchVariantSetsResponse.Unmarshal(m, b)
 }
 func (m *SearchVariantSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchVariantSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchVariantSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchVariantSetsResponse.Merge(dst, src)
+func (m *SearchVariantSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantSetsResponse.Merge(m, src)
 }
 func (m *SearchVariantSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchVariantSetsResponse.Size(m)
@@ -1213,16 +1234,17 @@ func (m *DeleteVariantSetRequest) Reset()         { *m = DeleteVariantSetRequest
 func (m *DeleteVariantSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteVariantSetRequest) ProtoMessage()    {}
 func (*DeleteVariantSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{13}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{13}
 }
+
 func (m *DeleteVariantSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteVariantSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteVariantSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteVariantSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteVariantSetRequest.Merge(dst, src)
+func (m *DeleteVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVariantSetRequest.Merge(m, src)
 }
 func (m *DeleteVariantSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteVariantSetRequest.Size(m)
@@ -1264,16 +1286,17 @@ func (m *UpdateVariantSetRequest) Reset()         { *m = UpdateVariantSetRequest
 func (m *UpdateVariantSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateVariantSetRequest) ProtoMessage()    {}
 func (*UpdateVariantSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{14}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{14}
 }
+
 func (m *UpdateVariantSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateVariantSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateVariantSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateVariantSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateVariantSetRequest.Merge(dst, src)
+func (m *UpdateVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVariantSetRequest.Merge(m, src)
 }
 func (m *UpdateVariantSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateVariantSetRequest.Size(m)
@@ -1346,16 +1369,17 @@ func (m *SearchVariantsRequest) Reset()         { *m = SearchVariantsRequest{} }
 func (m *SearchVariantsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchVariantsRequest) ProtoMessage()    {}
 func (*SearchVariantsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{15}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{15}
 }
+
 func (m *SearchVariantsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchVariantsRequest.Unmarshal(m, b)
 }
 func (m *SearchVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchVariantsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchVariantsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchVariantsRequest.Merge(dst, src)
+func (m *SearchVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantsRequest.Merge(m, src)
 }
 func (m *SearchVariantsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchVariantsRequest.Size(m)
@@ -1446,16 +1470,17 @@ func (m *SearchVariantsResponse) Reset()         { *m = SearchVariantsResponse{}
 func (m *SearchVariantsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchVariantsResponse) ProtoMessage()    {}
 func (*SearchVariantsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{16}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{16}
 }
+
 func (m *SearchVariantsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchVariantsResponse.Unmarshal(m, b)
 }
 func (m *SearchVariantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchVariantsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchVariantsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchVariantsResponse.Merge(dst, src)
+func (m *SearchVariantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantsResponse.Merge(m, src)
 }
 func (m *SearchVariantsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchVariantsResponse.Size(m)
@@ -1492,16 +1517,17 @@ func (m *CreateVariantRequest) Reset()         { *m = CreateVariantRequest{} }
 func (m *CreateVariantRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateVariantRequest) ProtoMessage()    {}
 func (*CreateVariantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{17}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{17}
 }
+
 func (m *CreateVariantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateVariantRequest.Unmarshal(m, b)
 }
 func (m *CreateVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateVariantRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateVariantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateVariantRequest.Merge(dst, src)
+func (m *CreateVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVariantRequest.Merge(m, src)
 }
 func (m *CreateVariantRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateVariantRequest.Size(m)
@@ -1538,16 +1564,17 @@ func (m *UpdateVariantRequest) Reset()         { *m = UpdateVariantRequest{} }
 func (m *UpdateVariantRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateVariantRequest) ProtoMessage()    {}
 func (*UpdateVariantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{18}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{18}
 }
+
 func (m *UpdateVariantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateVariantRequest.Unmarshal(m, b)
 }
 func (m *UpdateVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateVariantRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateVariantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateVariantRequest.Merge(dst, src)
+func (m *UpdateVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVariantRequest.Merge(m, src)
 }
 func (m *UpdateVariantRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateVariantRequest.Size(m)
@@ -1591,16 +1618,17 @@ func (m *DeleteVariantRequest) Reset()         { *m = DeleteVariantRequest{} }
 func (m *DeleteVariantRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteVariantRequest) ProtoMessage()    {}
 func (*DeleteVariantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{19}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{19}
 }
+
 func (m *DeleteVariantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteVariantRequest.Unmarshal(m, b)
 }
 func (m *DeleteVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteVariantRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteVariantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteVariantRequest.Merge(dst, src)
+func (m *DeleteVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVariantRequest.Merge(m, src)
 }
 func (m *DeleteVariantRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteVariantRequest.Size(m)
@@ -1630,16 +1658,17 @@ func (m *GetVariantRequest) Reset()         { *m = GetVariantRequest{} }
 func (m *GetVariantRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVariantRequest) ProtoMessage()    {}
 func (*GetVariantRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{20}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{20}
 }
+
 func (m *GetVariantRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetVariantRequest.Unmarshal(m, b)
 }
 func (m *GetVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetVariantRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetVariantRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetVariantRequest.Merge(dst, src)
+func (m *GetVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVariantRequest.Merge(m, src)
 }
 func (m *GetVariantRequest) XXX_Size() int {
 	return xxx_messageInfo_GetVariantRequest.Size(m)
@@ -1674,16 +1703,17 @@ func (m *MergeVariantsRequest) Reset()         { *m = MergeVariantsRequest{} }
 func (m *MergeVariantsRequest) String() string { return proto.CompactTextString(m) }
 func (*MergeVariantsRequest) ProtoMessage()    {}
 func (*MergeVariantsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{21}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{21}
 }
+
 func (m *MergeVariantsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MergeVariantsRequest.Unmarshal(m, b)
 }
 func (m *MergeVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MergeVariantsRequest.Marshal(b, m, deterministic)
 }
-func (dst *MergeVariantsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MergeVariantsRequest.Merge(dst, src)
+func (m *MergeVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MergeVariantsRequest.Merge(m, src)
 }
 func (m *MergeVariantsRequest) XXX_Size() int {
 	return xxx_messageInfo_MergeVariantsRequest.Size(m)
@@ -1739,16 +1769,17 @@ func (m *SearchCallSetsRequest) Reset()         { *m = SearchCallSetsRequest{} }
 func (m *SearchCallSetsRequest) String() string { return proto.CompactTextString(m) }
 func (*SearchCallSetsRequest) ProtoMessage()    {}
 func (*SearchCallSetsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{22}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{22}
 }
+
 func (m *SearchCallSetsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchCallSetsRequest.Unmarshal(m, b)
 }
 func (m *SearchCallSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchCallSetsRequest.Marshal(b, m, deterministic)
 }
-func (dst *SearchCallSetsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchCallSetsRequest.Merge(dst, src)
+func (m *SearchCallSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchCallSetsRequest.Merge(m, src)
 }
 func (m *SearchCallSetsRequest) XXX_Size() int {
 	return xxx_messageInfo_SearchCallSetsRequest.Size(m)
@@ -1804,16 +1835,17 @@ func (m *SearchCallSetsResponse) Reset()         { *m = SearchCallSetsResponse{}
 func (m *SearchCallSetsResponse) String() string { return proto.CompactTextString(m) }
 func (*SearchCallSetsResponse) ProtoMessage()    {}
 func (*SearchCallSetsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{23}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{23}
 }
+
 func (m *SearchCallSetsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SearchCallSetsResponse.Unmarshal(m, b)
 }
 func (m *SearchCallSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SearchCallSetsResponse.Marshal(b, m, deterministic)
 }
-func (dst *SearchCallSetsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SearchCallSetsResponse.Merge(dst, src)
+func (m *SearchCallSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchCallSetsResponse.Merge(m, src)
 }
 func (m *SearchCallSetsResponse) XXX_Size() int {
 	return xxx_messageInfo_SearchCallSetsResponse.Size(m)
@@ -1850,16 +1882,17 @@ func (m *CreateCallSetRequest) Reset()         { *m = CreateCallSetRequest{} }
 func (m *CreateCallSetRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateCallSetRequest) ProtoMessage()    {}
 func (*CreateCallSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{24}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{24}
 }
+
 func (m *CreateCallSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateCallSetRequest.Unmarshal(m, b)
 }
 func (m *CreateCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateCallSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateCallSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateCallSetRequest.Merge(dst, src)
+func (m *CreateCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCallSetRequest.Merge(m, src)
 }
 func (m *CreateCallSetRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateCallSetRequest.Size(m)
@@ -1896,16 +1929,17 @@ func (m *UpdateCallSetRequest) Reset()         { *m = UpdateCallSetRequest{} }
 func (m *UpdateCallSetRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateCallSetRequest) ProtoMessage()    {}
 func (*UpdateCallSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{25}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{25}
 }
+
 func (m *UpdateCallSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateCallSetRequest.Unmarshal(m, b)
 }
 func (m *UpdateCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateCallSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateCallSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateCallSetRequest.Merge(dst, src)
+func (m *UpdateCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCallSetRequest.Merge(m, src)
 }
 func (m *UpdateCallSetRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateCallSetRequest.Size(m)
@@ -1949,16 +1983,17 @@ func (m *DeleteCallSetRequest) Reset()         { *m = DeleteCallSetRequest{} }
 func (m *DeleteCallSetRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteCallSetRequest) ProtoMessage()    {}
 func (*DeleteCallSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{26}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{26}
 }
+
 func (m *DeleteCallSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteCallSetRequest.Unmarshal(m, b)
 }
 func (m *DeleteCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteCallSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteCallSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteCallSetRequest.Merge(dst, src)
+func (m *DeleteCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteCallSetRequest.Merge(m, src)
 }
 func (m *DeleteCallSetRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteCallSetRequest.Size(m)
@@ -1988,16 +2023,17 @@ func (m *GetCallSetRequest) Reset()         { *m = GetCallSetRequest{} }
 func (m *GetCallSetRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCallSetRequest) ProtoMessage()    {}
 func (*GetCallSetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{27}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{27}
 }
+
 func (m *GetCallSetRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetCallSetRequest.Unmarshal(m, b)
 }
 func (m *GetCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetCallSetRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetCallSetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetCallSetRequest.Merge(dst, src)
+func (m *GetCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCallSetRequest.Merge(m, src)
 }
 func (m *GetCallSetRequest) XXX_Size() int {
 	return xxx_messageInfo_GetCallSetRequest.Size(m)
@@ -2043,16 +2079,17 @@ func (m *StreamVariantsRequest) Reset()         { *m = StreamVariantsRequest{} }
 func (m *StreamVariantsRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamVariantsRequest) ProtoMessage()    {}
 func (*StreamVariantsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{28}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{28}
 }
+
 func (m *StreamVariantsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamVariantsRequest.Unmarshal(m, b)
 }
 func (m *StreamVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamVariantsRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamVariantsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamVariantsRequest.Merge(dst, src)
+func (m *StreamVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamVariantsRequest.Merge(m, src)
 }
 func (m *StreamVariantsRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamVariantsRequest.Size(m)
@@ -2116,16 +2153,17 @@ func (m *StreamVariantsResponse) Reset()         { *m = StreamVariantsResponse{}
 func (m *StreamVariantsResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamVariantsResponse) ProtoMessage()    {}
 func (*StreamVariantsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_variants_b9a43810f0f9306f, []int{29}
+	return fileDescriptor_c2de6f9e5b6e8ed2, []int{29}
 }
+
 func (m *StreamVariantsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamVariantsResponse.Unmarshal(m, b)
 }
 func (m *StreamVariantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamVariantsResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamVariantsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamVariantsResponse.Merge(dst, src)
+func (m *StreamVariantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamVariantsResponse.Merge(m, src)
 }
 func (m *StreamVariantsResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamVariantsResponse.Size(m)
@@ -2144,6 +2182,10 @@ func (m *StreamVariantsResponse) GetVariants() []*Variant {
 }
 
 func init() {
+	proto.RegisterEnum("google.genomics.v1.InfoMergeOperation", InfoMergeOperation_name, InfoMergeOperation_value)
+	proto.RegisterEnum("google.genomics.v1.VariantSetMetadata_Type", VariantSetMetadata_Type_name, VariantSetMetadata_Type_value)
+	proto.RegisterEnum("google.genomics.v1.ImportVariantsRequest_Format", ImportVariantsRequest_Format_name, ImportVariantsRequest_Format_value)
+	proto.RegisterEnum("google.genomics.v1.ExportVariantSetRequest_Format", ExportVariantSetRequest_Format_name, ExportVariantSetRequest_Format_value)
 	proto.RegisterType((*VariantSetMetadata)(nil), "google.genomics.v1.VariantSetMetadata")
 	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.VariantSetMetadata.InfoEntry")
 	proto.RegisterType((*VariantSet)(nil), "google.genomics.v1.VariantSet")
@@ -2180,10 +2222,159 @@ func init() {
 	proto.RegisterType((*GetCallSetRequest)(nil), "google.genomics.v1.GetCallSetRequest")
 	proto.RegisterType((*StreamVariantsRequest)(nil), "google.genomics.v1.StreamVariantsRequest")
 	proto.RegisterType((*StreamVariantsResponse)(nil), "google.genomics.v1.StreamVariantsResponse")
-	proto.RegisterEnum("google.genomics.v1.InfoMergeOperation", InfoMergeOperation_name, InfoMergeOperation_value)
-	proto.RegisterEnum("google.genomics.v1.VariantSetMetadata_Type", VariantSetMetadata_Type_name, VariantSetMetadata_Type_value)
-	proto.RegisterEnum("google.genomics.v1.ImportVariantsRequest_Format", ImportVariantsRequest_Format_name, ImportVariantsRequest_Format_value)
-	proto.RegisterEnum("google.genomics.v1.ExportVariantSetRequest_Format", ExportVariantSetRequest_Format_name, ExportVariantSetRequest_Format_value)
+}
+
+func init() { proto.RegisterFile("google/genomics/v1/variants.proto", fileDescriptor_c2de6f9e5b6e8ed2) }
+
+var fileDescriptor_c2de6f9e5b6e8ed2 = []byte{
+	// 2348 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xdd, 0x6e, 0x1b, 0xc7,
+	0xf5, 0xff, 0xef, 0x92, 0x94, 0xc8, 0x43, 0x91, 0x5a, 0x4f, 0x14, 0x69, 0x43, 0x7f, 0xc9, 0xfb,
+	0xb7, 0x1d, 0x45, 0x75, 0x45, 0x9b, 0x81, 0xd3, 0x54, 0x49, 0x6a, 0x48, 0x34, 0xa5, 0xb0, 0x90,
+	0x48, 0x65, 0x45, 0xbb, 0x75, 0x80, 0x82, 0x58, 0x91, 0x23, 0x7a, 0x6d, 0x72, 0x97, 0xde, 0x5d,
+	0xaa, 0x96, 0x0d, 0x5f, 0x34, 0xfd, 0x42, 0x80, 0x02, 0x05, 0x1a, 0xa0, 0x57, 0xbd, 0xed, 0x45,
+	0xd1, 0xa2, 0x6f, 0xe0, 0x37, 0x68, 0x7b, 0x53, 0xf4, 0x0d, 0xfa, 0x10, 0xbd, 0x2c, 0x66, 0x76,
+	0x66, 0xb9, 0xbb, 0x1c, 0xae, 0x28, 0x07, 0x09, 0x7a, 0xc7, 0x39, 0x73, 0x66, 0xce, 0xd7, 0xef,
+	0x9c, 0x39, 0x67, 0x25, 0xb8, 0xd6, 0xb3, 0xed, 0x5e, 0x1f, 0x97, 0x7b, 0xd8, 0xb2, 0x07, 0x66,
+	0xc7, 0x2d, 0x9f, 0xdc, 0x29, 0x9f, 0x18, 0x8e, 0x69, 0x58, 0x9e, 0xbb, 0x31, 0x74, 0x6c, 0xcf,
+	0x46, 0xc8, 0x67, 0xd9, 0xe0, 0x2c, 0x1b, 0x27, 0x77, 0x4a, 0x97, 0xd8, 0x31, 0x63, 0x68, 0x96,
+	0x0d, 0xcb, 0xb2, 0x3d, 0xc3, 0x33, 0x6d, 0x8b, 0x9d, 0x28, 0xfd, 0x3f, 0xdb, 0xed, 0xdb, 0x56,
+	0xcf, 0x19, 0x59, 0x96, 0x69, 0xf5, 0xca, 0xf6, 0x10, 0x3b, 0x11, 0xa6, 0x8b, 0x8c, 0x89, 0xae,
+	0x8e, 0x46, 0xc7, 0x65, 0x3c, 0x18, 0x7a, 0xa7, 0x6c, 0x73, 0x35, 0xbe, 0x79, 0x6c, 0xe2, 0x7e,
+	0xb7, 0x3d, 0x30, 0xdc, 0xa7, 0x8c, 0xe3, 0x52, 0x9c, 0xc3, 0xf5, 0x9c, 0x51, 0xc7, 0xf3, 0x77,
+	0xb5, 0xd7, 0x29, 0x40, 0x0f, 0x7d, 0x33, 0x0e, 0xb1, 0xb7, 0x8f, 0x3d, 0xa3, 0x6b, 0x78, 0x06,
+	0x52, 0x20, 0xf5, 0x14, 0x9f, 0xaa, 0xd2, 0xaa, 0xb4, 0x96, 0xd3, 0xc9, 0x4f, 0xb4, 0x04, 0x99,
+	0x13, 0xa3, 0x3f, 0xc2, 0xaa, 0x4c, 0x69, 0xfe, 0x02, 0x15, 0x41, 0x36, 0xbb, 0x6a, 0x9a, 0x92,
+	0x64, 0xb3, 0x8b, 0xee, 0x41, 0xda, 0x3b, 0x1d, 0x62, 0x35, 0xb3, 0x2a, 0xad, 0x15, 0x2b, 0xdf,
+	0xd9, 0x98, 0xf4, 0xc8, 0xc6, 0xa4, 0xb4, 0x8d, 0xd6, 0xe9, 0x10, 0xeb, 0xf4, 0x20, 0x5a, 0x86,
+	0x39, 0x6b, 0x34, 0x38, 0xc2, 0x8e, 0x9a, 0xa5, 0x97, 0xb2, 0x15, 0x5a, 0x85, 0x7c, 0x17, 0xbb,
+	0x1d, 0xc7, 0x1c, 0x12, 0xd7, 0xa8, 0xf3, 0x74, 0x33, 0x4c, 0x42, 0xf7, 0x21, 0x6d, 0x5a, 0xc7,
+	0xb6, 0x9a, 0x5a, 0x4d, 0xad, 0xe5, 0x2b, 0xb7, 0x67, 0x14, 0x5d, 0xb7, 0x8e, 0xed, 0x9a, 0xe5,
+	0x39, 0xa7, 0x3a, 0x3d, 0x5d, 0x3a, 0x84, 0x5c, 0x40, 0x12, 0x78, 0xe1, 0x76, 0xd8, 0x0b, 0xf9,
+	0x4a, 0x89, 0x4b, 0xe1, 0xce, 0xdd, 0xd8, 0x33, 0x5d, 0xef, 0x21, 0xe1, 0x60, 0x1e, 0xda, 0x94,
+	0x3f, 0x94, 0xb4, 0x47, 0x90, 0x26, 0x26, 0xa2, 0x25, 0x50, 0x5a, 0x8f, 0x0e, 0x6a, 0xed, 0x07,
+	0x8d, 0xc3, 0x83, 0x5a, 0xb5, 0xbe, 0x53, 0xaf, 0xdd, 0x57, 0xfe, 0x0f, 0xe5, 0x61, 0xbe, 0xde,
+	0x68, 0xd5, 0x76, 0x6b, 0xba, 0x22, 0xa1, 0x1c, 0x64, 0x76, 0xf6, 0x9a, 0x5b, 0x2d, 0x45, 0x46,
+	0x59, 0x48, 0xef, 0xec, 0x6d, 0xed, 0x2a, 0x29, 0x54, 0x80, 0x5c, 0xf5, 0xd3, 0x2d, 0x7d, 0xab,
+	0xda, 0xaa, 0xe9, 0x4a, 0x1a, 0x01, 0xcc, 0x1d, 0xb6, 0xf4, 0x7a, 0x63, 0x57, 0xc9, 0x68, 0x7f,
+	0x95, 0x01, 0xc6, 0x66, 0xa1, 0xcb, 0x00, 0xc4, 0x2c, 0x17, 0x7b, 0x6d, 0xb3, 0xcb, 0x14, 0xcf,
+	0x31, 0x4a, 0xbd, 0xcb, 0xc2, 0x25, 0x07, 0xe1, 0x5a, 0x03, 0xc5, 0xc1, 0xc7, 0xd8, 0xc1, 0x56,
+	0x07, 0xb7, 0xd9, 0xa1, 0x39, 0xba, 0x5b, 0x0c, 0xe8, 0x87, 0xf4, 0xe4, 0x7e, 0x98, 0xf3, 0xc8,
+	0x1e, 0x59, 0x5d, 0x57, 0xcd, 0x50, 0x4f, 0x6b, 0x22, 0x4f, 0xeb, 0x9c, 0x77, 0x9b, 0xb0, 0xea,
+	0x8b, 0x4e, 0x64, 0xed, 0xa2, 0x6d, 0xc8, 0x0e, 0x58, 0x08, 0xd4, 0x34, 0xbd, 0xe6, 0xe6, 0x6c,
+	0x01, 0xd3, 0x83, 0x73, 0x08, 0x41, 0xda, 0x32, 0x06, 0x98, 0x61, 0x81, 0xfe, 0x8e, 0xc3, 0x24,
+	0x3b, 0x01, 0x13, 0xed, 0xcb, 0x34, 0xcc, 0xb3, 0x6b, 0xd1, 0x75, 0x28, 0xb2, 0x14, 0xe6, 0xc6,
+	0x2f, 0xd2, 0x03, 0x0b, 0x27, 0x81, 0x5c, 0x81, 0xd3, 0x96, 0x20, 0x43, 0x64, 0xb9, 0x14, 0x69,
+	0x39, 0xdd, 0x5f, 0x20, 0x15, 0xe6, 0x3b, 0x0e, 0x36, 0x3c, 0xdc, 0x55, 0x17, 0x56, 0xa5, 0xb5,
+	0x94, 0xce, 0x97, 0xe8, 0x06, 0x8c, 0x9d, 0xd9, 0xa6, 0x1a, 0x17, 0xe9, 0x5d, 0x85, 0x80, 0xda,
+	0x20, 0xaa, 0x2f, 0x41, 0xc6, 0xf5, 0x0c, 0xc7, 0x53, 0x15, 0x7a, 0xdc, 0x5f, 0x10, 0x08, 0x62,
+	0xab, 0xab, 0x16, 0x28, 0x8d, 0xfc, 0x44, 0xef, 0xc2, 0x62, 0x28, 0x12, 0x86, 0x8b, 0xdd, 0x89,
+	0x90, 0x6d, 0x13, 0x2a, 0x61, 0x34, 0xfa, 0x1e, 0x76, 0x2c, 0xc3, 0xe3, 0x8c, 0xf3, 0x54, 0xe3,
+	0x62, 0x40, 0xf6, 0x19, 0x55, 0x98, 0x7f, 0x36, 0x32, 0xfa, 0xa6, 0x77, 0x4a, 0x1d, 0x26, 0xe9,
+	0x7c, 0x49, 0xb2, 0xf1, 0xd8, 0x24, 0xcc, 0x6a, 0x8e, 0x9e, 0x64, 0x2b, 0xf4, 0x7d, 0x96, 0x6b,
+	0x40, 0x43, 0x77, 0x23, 0x21, 0x74, 0xf1, 0x04, 0x43, 0x77, 0x21, 0xd3, 0x31, 0xfa, 0x7d, 0x57,
+	0xcd, 0xd3, 0xb3, 0x57, 0x13, 0xce, 0x56, 0x8d, 0x7e, 0x5f, 0xf7, 0xb9, 0xbf, 0x99, 0xbc, 0xfc,
+	0x87, 0x0c, 0xf9, 0x90, 0x2c, 0x74, 0x05, 0xf2, 0x44, 0x1a, 0x07, 0x83, 0x8f, 0x9e, 0x1c, 0x21,
+	0xf9, 0x48, 0xd0, 0xa0, 0x10, 0xec, 0xd3, 0x40, 0xe6, 0x7c, 0x7c, 0x31, 0x0e, 0x1a, 0xc6, 0x12,
+	0x64, 0x89, 0x29, 0xb4, 0x0a, 0x12, 0x77, 0x67, 0xf4, 0x60, 0x4d, 0xf6, 0x86, 0x8f, 0x89, 0xcb,
+	0xb1, 0x47, 0x2b, 0x64, 0x4e, 0x0f, 0xd6, 0xa8, 0x0c, 0x6f, 0x71, 0xbe, 0x76, 0xdf, 0x7c, 0x8a,
+	0xfb, 0xe6, 0x63, 0xdb, 0x26, 0xd9, 0x98, 0x5a, 0x93, 0x74, 0xc4, 0xb7, 0xf6, 0x82, 0x1d, 0xf4,
+	0x09, 0x8b, 0x81, 0x4c, 0xfd, 0xf8, 0xde, 0x19, 0x7e, 0xfc, 0x76, 0x0a, 0xdd, 0x1f, 0x64, 0x98,
+	0xaf, 0xfa, 0xce, 0x60, 0x69, 0x23, 0x05, 0x69, 0xc3, 0xd3, 0x55, 0x0e, 0xa5, 0xeb, 0x45, 0xc8,
+	0xb9, 0xc6, 0x60, 0xd8, 0xc7, 0xc4, 0xdd, 0x7e, 0x1e, 0x67, 0x7d, 0x42, 0xbd, 0x8b, 0x6e, 0xc2,
+	0x62, 0x34, 0x3b, 0x5d, 0xea, 0x8d, 0x9c, 0x5e, 0x08, 0xa7, 0x67, 0x24, 0xf3, 0x32, 0xd1, 0xcc,
+	0xe3, 0x30, 0x4d, 0x4f, 0x87, 0x29, 0xd3, 0xf6, 0xdb, 0x71, 0xcf, 0x8f, 0xa1, 0x18, 0x2d, 0x8c,
+	0x82, 0xda, 0x20, 0x89, 0x6a, 0xc3, 0x55, 0xc8, 0x8f, 0x86, 0x43, 0xec, 0xf8, 0x95, 0x97, 0x0a,
+	0x4d, 0xe9, 0x40, 0x49, 0xf4, 0x1e, 0xed, 0x37, 0x69, 0x78, 0xbb, 0x3e, 0x18, 0xda, 0x8e, 0xc7,
+	0x62, 0xee, 0xea, 0xf8, 0xd9, 0x08, 0xbb, 0xa2, 0x1a, 0x27, 0x09, 0x6a, 0xdc, 0x55, 0xc8, 0xbb,
+	0xf6, 0xc8, 0xe9, 0xe0, 0xf6, 0xc8, 0x31, 0x5d, 0x8a, 0xa9, 0x9c, 0x0e, 0x3e, 0xe9, 0x81, 0x63,
+	0xba, 0xe8, 0x53, 0x98, 0x3b, 0xb6, 0x9d, 0x81, 0xe1, 0xa9, 0x29, 0xfa, 0xb4, 0x0b, 0xdf, 0x57,
+	0xa1, 0x06, 0x1b, 0x3b, 0xf4, 0x9c, 0xce, 0xce, 0xa3, 0x4d, 0x78, 0xc7, 0x22, 0xbf, 0xfa, 0xe6,
+	0x0b, 0xdc, 0x8e, 0x1a, 0xef, 0xd2, 0x00, 0x66, 0xf5, 0x95, 0x80, 0x41, 0x0f, 0xbb, 0xc1, 0x45,
+	0x4f, 0xe0, 0x02, 0x89, 0x4e, 0x7b, 0x80, 0x9d, 0x1e, 0x6e, 0x77, 0x6c, 0xeb, 0xd8, 0xec, 0x51,
+	0x50, 0xe4, 0x2b, 0x3f, 0x98, 0x5d, 0x21, 0x12, 0xd8, 0x7d, 0x72, 0x43, 0x95, 0x5e, 0xe0, 0x87,
+	0x7d, 0xd1, 0x8c, 0x52, 0x4b, 0x4f, 0x60, 0x49, 0xc4, 0x28, 0x00, 0xc3, 0xc7, 0x61, 0x30, 0x14,
+	0xc5, 0x2f, 0x59, 0x70, 0x55, 0x93, 0xb7, 0x77, 0x61, 0x60, 0x34, 0x60, 0xce, 0xf7, 0x12, 0x5a,
+	0x06, 0xb4, 0xd3, 0xd4, 0xf7, 0xb7, 0x5a, 0xb1, 0x26, 0xa1, 0x08, 0xc0, 0xe8, 0x0f, 0xab, 0x3b,
+	0x8a, 0x84, 0x2e, 0x81, 0xca, 0xd6, 0xd5, 0xe6, 0xfe, 0xc1, 0x5e, 0xad, 0x55, 0x6b, 0xef, 0xd6,
+	0x1a, 0xcd, 0xfd, 0x7a, 0xf5, 0x50, 0x91, 0xb5, 0x4d, 0x58, 0x8e, 0x9b, 0xee, 0x0e, 0x6d, 0xcb,
+	0x25, 0x0f, 0xe4, 0x42, 0xa8, 0xc4, 0xb9, 0xaa, 0xe4, 0x47, 0x3a, 0xa8, 0x71, 0xae, 0xf6, 0x39,
+	0xac, 0x54, 0x69, 0xfe, 0x8c, 0x1f, 0x5f, 0x8e, 0xa5, 0x7b, 0x90, 0x0f, 0x61, 0x89, 0xba, 0x20,
+	0x5f, 0xb9, 0x92, 0xfc, 0x70, 0xeb, 0x30, 0x06, 0x9a, 0xf6, 0x2f, 0x19, 0x56, 0x6a, 0xcf, 0x43,
+	0x8a, 0x85, 0x2e, 0x9f, 0x0d, 0xa8, 0x71, 0xfd, 0xe5, 0xb8, 0xfe, 0xa4, 0x05, 0x1a, 0x3a, 0xf6,
+	0x13, 0xdc, 0xa1, 0x77, 0xa4, 0xfc, 0x1a, 0xce, 0x28, 0xf5, 0x2e, 0xfa, 0x61, 0x00, 0xe4, 0x34,
+	0x8d, 0x56, 0x45, 0xa4, 0xfe, 0x14, 0x1d, 0xe3, 0x50, 0x7e, 0x0f, 0x94, 0x23, 0xb3, 0xf7, 0x6c,
+	0x84, 0x9d, 0xd3, 0x36, 0x6b, 0xb2, 0x58, 0x5d, 0x5f, 0xe4, 0xf4, 0xfb, 0x3e, 0x99, 0x24, 0x7a,
+	0xc0, 0xea, 0x19, 0x47, 0x7d, 0xcc, 0x1e, 0xed, 0x02, 0xa7, 0xb6, 0x08, 0x51, 0xbb, 0x7b, 0x26,
+	0x10, 0xde, 0x82, 0x45, 0x46, 0xdf, 0xae, 0xef, 0x7e, 0xf6, 0xa0, 0xa6, 0x3f, 0x52, 0x24, 0xed,
+	0x63, 0x58, 0xda, 0xc5, 0x6f, 0xea, 0x53, 0xed, 0xa7, 0xa0, 0x1e, 0x62, 0xc3, 0xe9, 0x3c, 0x1e,
+	0x5f, 0x10, 0x94, 0x8f, 0xab, 0x90, 0x1f, 0x37, 0x94, 0x01, 0x5c, 0x82, 0x8e, 0xd2, 0x77, 0xb7,
+	0xd1, 0xc3, 0x6d, 0xcf, 0x7e, 0x8a, 0x2d, 0x56, 0xdc, 0x73, 0x84, 0xd2, 0x22, 0x04, 0x52, 0xe1,
+	0xe9, 0xb6, 0x6b, 0xbe, 0xc0, 0x34, 0x18, 0x19, 0x3d, 0x4b, 0x08, 0x87, 0xe6, 0x0b, 0xac, 0xfd,
+	0x4a, 0x82, 0x77, 0x04, 0x92, 0x19, 0x54, 0xb7, 0x60, 0x21, 0xa4, 0xbc, 0x2f, 0xfb, 0x6c, 0xb8,
+	0xe5, 0xc7, 0xa6, 0xb9, 0xe4, 0x09, 0xb1, 0xf0, 0x73, 0xaf, 0x3d, 0xa1, 0x61, 0x81, 0x90, 0x0f,
+	0xb8, 0x96, 0xda, 0x3d, 0x58, 0xb9, 0x8f, 0xfb, 0x58, 0x84, 0xf9, 0xd9, 0x5c, 0xf8, 0x5a, 0x82,
+	0x95, 0x07, 0xc3, 0xae, 0xf1, 0xc6, 0x37, 0xc4, 0x73, 0x4b, 0x3e, 0x6f, 0x6e, 0xa1, 0x8f, 0xc8,
+	0x1b, 0x41, 0x34, 0xa0, 0xc3, 0x1f, 0xc5, 0xa1, 0xe8, 0x61, 0xda, 0x21, 0xf3, 0xe1, 0xbe, 0xe1,
+	0x3e, 0x25, 0xef, 0x07, 0x61, 0x27, 0xbf, 0xb5, 0xbf, 0xc8, 0xf0, 0x76, 0x24, 0x12, 0x01, 0x00,
+	0x04, 0xaf, 0xb0, 0x24, 0x7a, 0x85, 0xaf, 0x8d, 0xa3, 0x15, 0x7a, 0xe6, 0xb9, 0x4d, 0x0d, 0xbf,
+	0x39, 0x8f, 0xe6, 0x6e, 0x6a, 0x22, 0x77, 0x27, 0x9f, 0xc3, 0x74, 0x62, 0xab, 0x9c, 0x11, 0xb4,
+	0xca, 0x73, 0xe3, 0x56, 0x39, 0x8a, 0xcd, 0xf9, 0x44, 0x6c, 0x66, 0xa3, 0xd8, 0x24, 0x9b, 0x03,
+	0xe3, 0x79, 0xdb, 0xef, 0x55, 0x73, 0xfe, 0xe6, 0xc0, 0x78, 0x4e, 0xfa, 0x05, 0x57, 0x3b, 0x85,
+	0xe5, 0xb8, 0xb7, 0x18, 0x68, 0xbf, 0x07, 0x59, 0xfe, 0x55, 0x80, 0x01, 0xf6, 0x62, 0x42, 0x0c,
+	0xf5, 0x80, 0x79, 0x66, 0xa8, 0xee, 0xc3, 0x52, 0xa4, 0x3c, 0xf3, 0x38, 0xdd, 0x85, 0x79, 0x76,
+	0x17, 0xab, 0xcb, 0x89, 0x72, 0x39, 0xaf, 0xf6, 0x27, 0x09, 0x96, 0x22, 0xc0, 0xe5, 0xf7, 0x5d,
+	0x06, 0x0e, 0xae, 0xd0, 0x24, 0xc9, 0x28, 0xf5, 0x6e, 0x58, 0x9c, 0x3c, 0xbb, 0xb8, 0x38, 0x48,
+	0x53, 0xe7, 0x02, 0xe9, 0x5d, 0x58, 0x8a, 0x64, 0xe9, 0x6c, 0xaa, 0x6a, 0x15, 0xb8, 0x30, 0x2e,
+	0x8e, 0x33, 0x9e, 0xf9, 0x9b, 0x0c, 0x4b, 0xf4, 0xb9, 0x7e, 0xb3, 0x76, 0x2a, 0x8c, 0x02, 0xf9,
+	0x3c, 0x28, 0x30, 0x45, 0x0d, 0x8e, 0xff, 0x45, 0xe3, 0x13, 0xd1, 0x0d, 0x22, 0x1d, 0xff, 0x07,
+	0xfb, 0x9b, 0xdf, 0x4a, 0xbc, 0xbc, 0xb0, 0x7e, 0xfb, 0xdc, 0xe5, 0x45, 0x34, 0x3d, 0x44, 0xd3,
+	0x3b, 0x95, 0x98, 0xde, 0xe9, 0xd8, 0xd3, 0xf3, 0x82, 0x67, 0xf0, 0x58, 0x21, 0x96, 0xc1, 0x1f,
+	0x42, 0x8e, 0x57, 0xa9, 0xc4, 0x14, 0x66, 0x07, 0xf5, 0x2c, 0xab, 0x5f, 0xb3, 0xa7, 0x70, 0x83,
+	0xa7, 0x30, 0xbf, 0x82, 0xf9, 0xe2, 0x03, 0xc8, 0x72, 0xc9, 0x49, 0x39, 0xcc, 0x4f, 0xcd, 0x33,
+	0xc1, 0xda, 0x9f, 0x83, 0x1c, 0x8e, 0x5d, 0x18, 0x9b, 0x67, 0xa5, 0xf8, 0x3c, 0x1b, 0x16, 0x28,
+	0xcf, 0x2e, 0xf0, 0xeb, 0x65, 0xf1, 0x07, 0x3c, 0x8b, 0xcf, 0xa7, 0xac, 0xf6, 0x3e, 0x4d, 0xe3,
+	0x73, 0x1e, 0xfa, 0x3b, 0x01, 0x9e, 0xe7, 0x60, 0x63, 0x10, 0x4f, 0xe4, 0x68, 0x9b, 0x28, 0xc5,
+	0xdb, 0xc4, 0xc9, 0x3c, 0x97, 0x67, 0xe8, 0x46, 0xbf, 0xe9, 0x17, 0x4d, 0xfb, 0x0c, 0x96, 0xe3,
+	0xe6, 0x7c, 0xcd, 0x87, 0x67, 0xfd, 0x27, 0x80, 0x26, 0x93, 0x17, 0x5d, 0x87, 0xd5, 0x7a, 0x63,
+	0xa7, 0xd9, 0xde, 0xaf, 0xe9, 0xbb, 0xb5, 0x76, 0xf3, 0xa0, 0xa6, 0x6f, 0xb5, 0xea, 0xcd, 0xc6,
+	0xe4, 0x54, 0x52, 0xdf, 0x6d, 0x34, 0xf5, 0x5a, 0xbb, 0x51, 0xfb, 0x91, 0x22, 0xa1, 0x0b, 0x50,
+	0xd8, 0x6f, 0x3e, 0xac, 0xb5, 0x5b, 0xcd, 0x76, 0x75, 0x6b, 0x6f, 0xef, 0x50, 0x91, 0x2b, 0x7f,
+	0x94, 0x60, 0xc5, 0x57, 0xd9, 0xb4, 0x7a, 0x41, 0xeb, 0xe2, 0x9c, 0x98, 0x1d, 0x8c, 0xbe, 0x94,
+	0xa0, 0x18, 0x35, 0x07, 0x09, 0xbf, 0x63, 0x08, 0x23, 0x58, 0x5a, 0x9f, 0x85, 0xd5, 0xf7, 0x8e,
+	0x76, 0xe5, 0x8b, 0x7f, 0xfe, 0xfb, 0x2b, 0x59, 0xd5, 0xde, 0x0a, 0x7f, 0xb6, 0xdf, 0x74, 0x29,
+	0xf3, 0xa6, 0xb4, 0x7e, 0x5b, 0xaa, 0xbc, 0x46, 0xa0, 0x44, 0xd5, 0x7b, 0x78, 0x07, 0xbd, 0x80,
+	0x62, 0x74, 0x8e, 0x12, 0xeb, 0x27, 0x1c, 0x33, 0x4b, 0x97, 0x39, 0x6b, 0xe8, 0xeb, 0xfe, 0x46,
+	0xe0, 0xe1, 0x29, 0x2a, 0x99, 0xf4, 0xaa, 0x4d, 0x69, 0x1d, 0xfd, 0x52, 0x02, 0x25, 0x3e, 0x88,
+	0x21, 0xe1, 0x17, 0xf5, 0x29, 0xe3, 0x5a, 0xe9, 0x8c, 0xee, 0x51, 0xbb, 0x4e, 0x35, 0xb8, 0xa2,
+	0x2d, 0x86, 0x35, 0xc0, 0x9e, 0xbb, 0x19, 0xee, 0x44, 0xd1, 0xef, 0x24, 0x50, 0xe2, 0xf3, 0x90,
+	0x58, 0x8f, 0x29, 0x53, 0xd3, 0x59, 0x8e, 0xa8, 0x50, 0x35, 0x6e, 0x69, 0xef, 0xc6, 0xd4, 0x28,
+	0xbf, 0x8c, 0x66, 0xe0, 0xab, 0x4d, 0xfc, 0x9c, 0x3b, 0xe7, 0xe7, 0x12, 0x14, 0x22, 0x13, 0x0f,
+	0x5a, 0x13, 0x69, 0x24, 0x1a, 0x8a, 0xce, 0x74, 0xcb, 0x1a, 0xd5, 0x47, 0x43, 0xab, 0x67, 0xe9,
+	0x83, 0xbe, 0x92, 0xe0, 0xc2, 0xc4, 0xfc, 0x82, 0x6e, 0x09, 0x71, 0x39, 0x65, 0xc0, 0x2a, 0x7d,
+	0x77, 0x46, 0x6e, 0x06, 0xe4, 0x6b, 0x54, 0xb9, 0x8b, 0xda, 0x72, 0x5c, 0x39, 0x97, 0x1e, 0x21,
+	0xbe, 0xf9, 0x99, 0x04, 0x4a, 0x7c, 0x9a, 0x11, 0x07, 0x6c, 0xca, 0xcc, 0x53, 0x5a, 0x9e, 0x28,
+	0xe5, 0xb5, 0xc1, 0xd0, 0x3b, 0xe5, 0x9e, 0x59, 0x3f, 0xdb, 0x33, 0xbf, 0x97, 0x40, 0x89, 0xcf,
+	0x43, 0x62, 0x1d, 0xa6, 0x4c, 0x4d, 0x67, 0x46, 0xe9, 0x2e, 0xd5, 0xa5, 0x5c, 0x39, 0x53, 0x97,
+	0x28, 0x9a, 0x7f, 0x4d, 0x4a, 0x4e, 0xa4, 0x75, 0x9f, 0x52, 0x72, 0x44, 0xc3, 0xd0, 0x94, 0x92,
+	0x23, 0x9c, 0x04, 0xc4, 0xf9, 0x1d, 0x0a, 0xd3, 0x08, 0x0a, 0x91, 0xc4, 0x15, 0x23, 0x58, 0xd4,
+	0xeb, 0x97, 0x92, 0x2a, 0xbb, 0x76, 0x99, 0xca, 0x5d, 0xd1, 0x16, 0x22, 0x75, 0x25, 0xe8, 0xc0,
+	0xbf, 0x90, 0xa0, 0x10, 0xf1, 0xb9, 0x58, 0xae, 0x68, 0x26, 0x48, 0x96, 0xbb, 0x4e, 0xe5, 0x5e,
+	0xaf, 0xbc, 0x13, 0xb1, 0xf7, 0xe5, 0xb8, 0xcb, 0x7e, 0x35, 0x56, 0xc2, 0x83, 0x42, 0x04, 0x7b,
+	0x62, 0x1d, 0x44, 0xcd, 0xfe, 0x54, 0x6c, 0xb2, 0xc4, 0x58, 0x9f, 0x2e, 0x1e, 0xb9, 0x00, 0xe3,
+	0x82, 0x80, 0x6e, 0x24, 0x17, 0x8c, 0x99, 0x6c, 0x66, 0x42, 0x51, 0x82, 0xd0, 0x21, 0x14, 0x22,
+	0x4d, 0xba, 0xd8, 0x54, 0x51, 0x1f, 0x3f, 0xd5, 0x54, 0x1e, 0x61, 0x14, 0x89, 0x30, 0x1d, 0x19,
+	0x08, 0xb0, 0xc6, 0x10, 0xe7, 0xbd, 0x6d, 0x12, 0xc4, 0x63, 0x0d, 0x79, 0x12, 0xc4, 0xe3, 0xad,
+	0x72, 0x14, 0xe2, 0x74, 0x52, 0x8e, 0x56, 0xa2, 0x13, 0x0e, 0x71, 0xfe, 0x37, 0x81, 0x04, 0x88,
+	0x47, 0x1b, 0xbb, 0x52, 0x52, 0x23, 0x1a, 0xc8, 0x5d, 0x08, 0xcb, 0xdd, 0x0c, 0x7a, 0x59, 0xf4,
+	0x8b, 0x00, 0xe3, 0x89, 0x82, 0x45, 0x3d, 0x73, 0xb2, 0xe0, 0x5b, 0x54, 0xf0, 0xcd, 0x4a, 0x29,
+	0x62, 0xf0, 0xcb, 0x50, 0x0f, 0xf8, 0x2a, 0xa4, 0xc6, 0x88, 0xa3, 0x3c, 0x51, 0x0b, 0x51, 0x33,
+	0x3c, 0x35, 0xf4, 0x1a, 0x55, 0xe0, 0xd2, 0x7a, 0x82, 0x02, 0xc8, 0xa3, 0x30, 0xe7, 0x32, 0xa7,
+	0xc1, 0xfc, 0x3c, 0x66, 0x33, 0xa9, 0x28, 0x41, 0xea, 0xf6, 0x63, 0x58, 0xee, 0xd8, 0x03, 0xc1,
+	0x2d, 0xdb, 0x05, 0x8e, 0xeb, 0x03, 0x62, 0xcb, 0x81, 0xf4, 0xf9, 0x26, 0x67, 0xb2, 0xfb, 0x86,
+	0xd5, 0xdb, 0xb0, 0x9d, 0x5e, 0xb9, 0x87, 0x2d, 0x6a, 0x69, 0xd9, 0xdf, 0x32, 0x86, 0xa6, 0x1b,
+	0xfe, 0x4f, 0x8b, 0x8f, 0xf8, 0xef, 0xff, 0x48, 0xd2, 0xd1, 0x1c, 0xe5, 0x7c, 0xff, 0xbf, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0x7e, 0x5e, 0x37, 0xc0, 0x92, 0x21, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3329,158 +3520,3 @@ var _VariantServiceV1_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/genomics/v1/variants.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/genomics/v1/variants.proto", fileDescriptor_variants_b9a43810f0f9306f)
-}
-
-var fileDescriptor_variants_b9a43810f0f9306f = []byte{
-	// 2348 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xdd, 0x6e, 0x1b, 0xc7,
-	0xf5, 0xff, 0xef, 0x92, 0x94, 0xc8, 0x43, 0x91, 0x5a, 0x4f, 0x14, 0x69, 0x43, 0x7f, 0xc9, 0xfb,
-	0xb7, 0x1d, 0x45, 0x75, 0x45, 0x9b, 0x81, 0xd3, 0x54, 0x49, 0x6a, 0x48, 0x34, 0xa5, 0xb0, 0x90,
-	0x48, 0x65, 0x45, 0xbb, 0x75, 0x80, 0x82, 0x58, 0x91, 0x23, 0x7a, 0x6d, 0x72, 0x97, 0xde, 0x5d,
-	0xaa, 0x96, 0x0d, 0x5f, 0x34, 0xfd, 0x42, 0x80, 0x02, 0x05, 0x1a, 0xa0, 0x57, 0xbd, 0xed, 0x45,
-	0xd1, 0xa2, 0x6f, 0xe0, 0x37, 0x68, 0x7b, 0x53, 0xf4, 0x0d, 0xfa, 0x10, 0xbd, 0x2c, 0x66, 0x76,
-	0x66, 0xb9, 0xbb, 0x1c, 0xae, 0x28, 0x07, 0x09, 0x7a, 0xc7, 0x39, 0x73, 0x66, 0xce, 0xd7, 0xef,
-	0x9c, 0x39, 0x67, 0x25, 0xb8, 0xd6, 0xb3, 0xed, 0x5e, 0x1f, 0x97, 0x7b, 0xd8, 0xb2, 0x07, 0x66,
-	0xc7, 0x2d, 0x9f, 0xdc, 0x29, 0x9f, 0x18, 0x8e, 0x69, 0x58, 0x9e, 0xbb, 0x31, 0x74, 0x6c, 0xcf,
-	0x46, 0xc8, 0x67, 0xd9, 0xe0, 0x2c, 0x1b, 0x27, 0x77, 0x4a, 0x97, 0xd8, 0x31, 0x63, 0x68, 0x96,
-	0x0d, 0xcb, 0xb2, 0x3d, 0xc3, 0x33, 0x6d, 0x8b, 0x9d, 0x28, 0xfd, 0x3f, 0xdb, 0xed, 0xdb, 0x56,
-	0xcf, 0x19, 0x59, 0x96, 0x69, 0xf5, 0xca, 0xf6, 0x10, 0x3b, 0x11, 0xa6, 0x8b, 0x8c, 0x89, 0xae,
-	0x8e, 0x46, 0xc7, 0x65, 0x3c, 0x18, 0x7a, 0xa7, 0x6c, 0x73, 0x35, 0xbe, 0x79, 0x6c, 0xe2, 0x7e,
-	0xb7, 0x3d, 0x30, 0xdc, 0xa7, 0x8c, 0xe3, 0x52, 0x9c, 0xc3, 0xf5, 0x9c, 0x51, 0xc7, 0xf3, 0x77,
-	0xb5, 0xd7, 0x29, 0x40, 0x0f, 0x7d, 0x33, 0x0e, 0xb1, 0xb7, 0x8f, 0x3d, 0xa3, 0x6b, 0x78, 0x06,
-	0x52, 0x20, 0xf5, 0x14, 0x9f, 0xaa, 0xd2, 0xaa, 0xb4, 0x96, 0xd3, 0xc9, 0x4f, 0xb4, 0x04, 0x99,
-	0x13, 0xa3, 0x3f, 0xc2, 0xaa, 0x4c, 0x69, 0xfe, 0x02, 0x15, 0x41, 0x36, 0xbb, 0x6a, 0x9a, 0x92,
-	0x64, 0xb3, 0x8b, 0xee, 0x41, 0xda, 0x3b, 0x1d, 0x62, 0x35, 0xb3, 0x2a, 0xad, 0x15, 0x2b, 0xdf,
-	0xd9, 0x98, 0xf4, 0xc8, 0xc6, 0xa4, 0xb4, 0x8d, 0xd6, 0xe9, 0x10, 0xeb, 0xf4, 0x20, 0x5a, 0x86,
-	0x39, 0x6b, 0x34, 0x38, 0xc2, 0x8e, 0x9a, 0xa5, 0x97, 0xb2, 0x15, 0x5a, 0x85, 0x7c, 0x17, 0xbb,
-	0x1d, 0xc7, 0x1c, 0x12, 0xd7, 0xa8, 0xf3, 0x74, 0x33, 0x4c, 0x42, 0xf7, 0x21, 0x6d, 0x5a, 0xc7,
-	0xb6, 0x9a, 0x5a, 0x4d, 0xad, 0xe5, 0x2b, 0xb7, 0x67, 0x14, 0x5d, 0xb7, 0x8e, 0xed, 0x9a, 0xe5,
-	0x39, 0xa7, 0x3a, 0x3d, 0x5d, 0x3a, 0x84, 0x5c, 0x40, 0x12, 0x78, 0xe1, 0x76, 0xd8, 0x0b, 0xf9,
-	0x4a, 0x89, 0x4b, 0xe1, 0xce, 0xdd, 0xd8, 0x33, 0x5d, 0xef, 0x21, 0xe1, 0x60, 0x1e, 0xda, 0x94,
-	0x3f, 0x94, 0xb4, 0x47, 0x90, 0x26, 0x26, 0xa2, 0x25, 0x50, 0x5a, 0x8f, 0x0e, 0x6a, 0xed, 0x07,
-	0x8d, 0xc3, 0x83, 0x5a, 0xb5, 0xbe, 0x53, 0xaf, 0xdd, 0x57, 0xfe, 0x0f, 0xe5, 0x61, 0xbe, 0xde,
-	0x68, 0xd5, 0x76, 0x6b, 0xba, 0x22, 0xa1, 0x1c, 0x64, 0x76, 0xf6, 0x9a, 0x5b, 0x2d, 0x45, 0x46,
-	0x59, 0x48, 0xef, 0xec, 0x6d, 0xed, 0x2a, 0x29, 0x54, 0x80, 0x5c, 0xf5, 0xd3, 0x2d, 0x7d, 0xab,
-	0xda, 0xaa, 0xe9, 0x4a, 0x1a, 0x01, 0xcc, 0x1d, 0xb6, 0xf4, 0x7a, 0x63, 0x57, 0xc9, 0x68, 0x7f,
-	0x95, 0x01, 0xc6, 0x66, 0xa1, 0xcb, 0x00, 0xc4, 0x2c, 0x17, 0x7b, 0x6d, 0xb3, 0xcb, 0x14, 0xcf,
-	0x31, 0x4a, 0xbd, 0xcb, 0xc2, 0x25, 0x07, 0xe1, 0x5a, 0x03, 0xc5, 0xc1, 0xc7, 0xd8, 0xc1, 0x56,
-	0x07, 0xb7, 0xd9, 0xa1, 0x39, 0xba, 0x5b, 0x0c, 0xe8, 0x87, 0xf4, 0xe4, 0x7e, 0x98, 0xf3, 0xc8,
-	0x1e, 0x59, 0x5d, 0x57, 0xcd, 0x50, 0x4f, 0x6b, 0x22, 0x4f, 0xeb, 0x9c, 0x77, 0x9b, 0xb0, 0xea,
-	0x8b, 0x4e, 0x64, 0xed, 0xa2, 0x6d, 0xc8, 0x0e, 0x58, 0x08, 0xd4, 0x34, 0xbd, 0xe6, 0xe6, 0x6c,
-	0x01, 0xd3, 0x83, 0x73, 0x08, 0x41, 0xda, 0x32, 0x06, 0x98, 0x61, 0x81, 0xfe, 0x8e, 0xc3, 0x24,
-	0x3b, 0x01, 0x13, 0xed, 0xcb, 0x34, 0xcc, 0xb3, 0x6b, 0xd1, 0x75, 0x28, 0xb2, 0x14, 0xe6, 0xc6,
-	0x2f, 0xd2, 0x03, 0x0b, 0x27, 0x81, 0x5c, 0x81, 0xd3, 0x96, 0x20, 0x43, 0x64, 0xb9, 0x14, 0x69,
-	0x39, 0xdd, 0x5f, 0x20, 0x15, 0xe6, 0x3b, 0x0e, 0x36, 0x3c, 0xdc, 0x55, 0x17, 0x56, 0xa5, 0xb5,
-	0x94, 0xce, 0x97, 0xe8, 0x06, 0x8c, 0x9d, 0xd9, 0xa6, 0x1a, 0x17, 0xe9, 0x5d, 0x85, 0x80, 0xda,
-	0x20, 0xaa, 0x2f, 0x41, 0xc6, 0xf5, 0x0c, 0xc7, 0x53, 0x15, 0x7a, 0xdc, 0x5f, 0x10, 0x08, 0x62,
-	0xab, 0xab, 0x16, 0x28, 0x8d, 0xfc, 0x44, 0xef, 0xc2, 0x62, 0x28, 0x12, 0x86, 0x8b, 0xdd, 0x89,
-	0x90, 0x6d, 0x13, 0x2a, 0x61, 0x34, 0xfa, 0x1e, 0x76, 0x2c, 0xc3, 0xe3, 0x8c, 0xf3, 0x54, 0xe3,
-	0x62, 0x40, 0xf6, 0x19, 0x55, 0x98, 0x7f, 0x36, 0x32, 0xfa, 0xa6, 0x77, 0x4a, 0x1d, 0x26, 0xe9,
-	0x7c, 0x49, 0xb2, 0xf1, 0xd8, 0x24, 0xcc, 0x6a, 0x8e, 0x9e, 0x64, 0x2b, 0xf4, 0x7d, 0x96, 0x6b,
-	0x40, 0x43, 0x77, 0x23, 0x21, 0x74, 0xf1, 0x04, 0x43, 0x77, 0x21, 0xd3, 0x31, 0xfa, 0x7d, 0x57,
-	0xcd, 0xd3, 0xb3, 0x57, 0x13, 0xce, 0x56, 0x8d, 0x7e, 0x5f, 0xf7, 0xb9, 0xbf, 0x99, 0xbc, 0xfc,
-	0x87, 0x0c, 0xf9, 0x90, 0x2c, 0x74, 0x05, 0xf2, 0x44, 0x1a, 0x07, 0x83, 0x8f, 0x9e, 0x1c, 0x21,
-	0xf9, 0x48, 0xd0, 0xa0, 0x10, 0xec, 0xd3, 0x40, 0xe6, 0x7c, 0x7c, 0x31, 0x0e, 0x1a, 0xc6, 0x12,
-	0x64, 0x89, 0x29, 0xb4, 0x0a, 0x12, 0x77, 0x67, 0xf4, 0x60, 0x4d, 0xf6, 0x86, 0x8f, 0x89, 0xcb,
-	0xb1, 0x47, 0x2b, 0x64, 0x4e, 0x0f, 0xd6, 0xa8, 0x0c, 0x6f, 0x71, 0xbe, 0x76, 0xdf, 0x7c, 0x8a,
-	0xfb, 0xe6, 0x63, 0xdb, 0x26, 0xd9, 0x98, 0x5a, 0x93, 0x74, 0xc4, 0xb7, 0xf6, 0x82, 0x1d, 0xf4,
-	0x09, 0x8b, 0x81, 0x4c, 0xfd, 0xf8, 0xde, 0x19, 0x7e, 0xfc, 0x76, 0x0a, 0xdd, 0x1f, 0x64, 0x98,
-	0xaf, 0xfa, 0xce, 0x60, 0x69, 0x23, 0x05, 0x69, 0xc3, 0xd3, 0x55, 0x0e, 0xa5, 0xeb, 0x45, 0xc8,
-	0xb9, 0xc6, 0x60, 0xd8, 0xc7, 0xc4, 0xdd, 0x7e, 0x1e, 0x67, 0x7d, 0x42, 0xbd, 0x8b, 0x6e, 0xc2,
-	0x62, 0x34, 0x3b, 0x5d, 0xea, 0x8d, 0x9c, 0x5e, 0x08, 0xa7, 0x67, 0x24, 0xf3, 0x32, 0xd1, 0xcc,
-	0xe3, 0x30, 0x4d, 0x4f, 0x87, 0x29, 0xd3, 0xf6, 0xdb, 0x71, 0xcf, 0x8f, 0xa1, 0x18, 0x2d, 0x8c,
-	0x82, 0xda, 0x20, 0x89, 0x6a, 0xc3, 0x55, 0xc8, 0x8f, 0x86, 0x43, 0xec, 0xf8, 0x95, 0x97, 0x0a,
-	0x4d, 0xe9, 0x40, 0x49, 0xf4, 0x1e, 0xed, 0x37, 0x69, 0x78, 0xbb, 0x3e, 0x18, 0xda, 0x8e, 0xc7,
-	0x62, 0xee, 0xea, 0xf8, 0xd9, 0x08, 0xbb, 0xa2, 0x1a, 0x27, 0x09, 0x6a, 0xdc, 0x55, 0xc8, 0xbb,
-	0xf6, 0xc8, 0xe9, 0xe0, 0xf6, 0xc8, 0x31, 0x5d, 0x8a, 0xa9, 0x9c, 0x0e, 0x3e, 0xe9, 0x81, 0x63,
-	0xba, 0xe8, 0x53, 0x98, 0x3b, 0xb6, 0x9d, 0x81, 0xe1, 0xa9, 0x29, 0xfa, 0xb4, 0x0b, 0xdf, 0x57,
-	0xa1, 0x06, 0x1b, 0x3b, 0xf4, 0x9c, 0xce, 0xce, 0xa3, 0x4d, 0x78, 0xc7, 0x22, 0xbf, 0xfa, 0xe6,
-	0x0b, 0xdc, 0x8e, 0x1a, 0xef, 0xd2, 0x00, 0x66, 0xf5, 0x95, 0x80, 0x41, 0x0f, 0xbb, 0xc1, 0x45,
-	0x4f, 0xe0, 0x02, 0x89, 0x4e, 0x7b, 0x80, 0x9d, 0x1e, 0x6e, 0x77, 0x6c, 0xeb, 0xd8, 0xec, 0x51,
-	0x50, 0xe4, 0x2b, 0x3f, 0x98, 0x5d, 0x21, 0x12, 0xd8, 0x7d, 0x72, 0x43, 0x95, 0x5e, 0xe0, 0x87,
-	0x7d, 0xd1, 0x8c, 0x52, 0x4b, 0x4f, 0x60, 0x49, 0xc4, 0x28, 0x00, 0xc3, 0xc7, 0x61, 0x30, 0x14,
-	0xc5, 0x2f, 0x59, 0x70, 0x55, 0x93, 0xb7, 0x77, 0x61, 0x60, 0x34, 0x60, 0xce, 0xf7, 0x12, 0x5a,
-	0x06, 0xb4, 0xd3, 0xd4, 0xf7, 0xb7, 0x5a, 0xb1, 0x26, 0xa1, 0x08, 0xc0, 0xe8, 0x0f, 0xab, 0x3b,
-	0x8a, 0x84, 0x2e, 0x81, 0xca, 0xd6, 0xd5, 0xe6, 0xfe, 0xc1, 0x5e, 0xad, 0x55, 0x6b, 0xef, 0xd6,
-	0x1a, 0xcd, 0xfd, 0x7a, 0xf5, 0x50, 0x91, 0xb5, 0x4d, 0x58, 0x8e, 0x9b, 0xee, 0x0e, 0x6d, 0xcb,
-	0x25, 0x0f, 0xe4, 0x42, 0xa8, 0xc4, 0xb9, 0xaa, 0xe4, 0x47, 0x3a, 0xa8, 0x71, 0xae, 0xf6, 0x39,
-	0xac, 0x54, 0x69, 0xfe, 0x8c, 0x1f, 0x5f, 0x8e, 0xa5, 0x7b, 0x90, 0x0f, 0x61, 0x89, 0xba, 0x20,
-	0x5f, 0xb9, 0x92, 0xfc, 0x70, 0xeb, 0x30, 0x06, 0x9a, 0xf6, 0x2f, 0x19, 0x56, 0x6a, 0xcf, 0x43,
-	0x8a, 0x85, 0x2e, 0x9f, 0x0d, 0xa8, 0x71, 0xfd, 0xe5, 0xb8, 0xfe, 0xa4, 0x05, 0x1a, 0x3a, 0xf6,
-	0x13, 0xdc, 0xa1, 0x77, 0xa4, 0xfc, 0x1a, 0xce, 0x28, 0xf5, 0x2e, 0xfa, 0x61, 0x00, 0xe4, 0x34,
-	0x8d, 0x56, 0x45, 0xa4, 0xfe, 0x14, 0x1d, 0xe3, 0x50, 0x7e, 0x0f, 0x94, 0x23, 0xb3, 0xf7, 0x6c,
-	0x84, 0x9d, 0xd3, 0x36, 0x6b, 0xb2, 0x58, 0x5d, 0x5f, 0xe4, 0xf4, 0xfb, 0x3e, 0x99, 0x24, 0x7a,
-	0xc0, 0xea, 0x19, 0x47, 0x7d, 0xcc, 0x1e, 0xed, 0x02, 0xa7, 0xb6, 0x08, 0x51, 0xbb, 0x7b, 0x26,
-	0x10, 0xde, 0x82, 0x45, 0x46, 0xdf, 0xae, 0xef, 0x7e, 0xf6, 0xa0, 0xa6, 0x3f, 0x52, 0x24, 0xed,
-	0x63, 0x58, 0xda, 0xc5, 0x6f, 0xea, 0x53, 0xed, 0xa7, 0xa0, 0x1e, 0x62, 0xc3, 0xe9, 0x3c, 0x1e,
-	0x5f, 0x10, 0x94, 0x8f, 0xab, 0x90, 0x1f, 0x37, 0x94, 0x01, 0x5c, 0x82, 0x8e, 0xd2, 0x77, 0xb7,
-	0xd1, 0xc3, 0x6d, 0xcf, 0x7e, 0x8a, 0x2d, 0x56, 0xdc, 0x73, 0x84, 0xd2, 0x22, 0x04, 0x52, 0xe1,
-	0xe9, 0xb6, 0x6b, 0xbe, 0xc0, 0x34, 0x18, 0x19, 0x3d, 0x4b, 0x08, 0x87, 0xe6, 0x0b, 0xac, 0xfd,
-	0x4a, 0x82, 0x77, 0x04, 0x92, 0x19, 0x54, 0xb7, 0x60, 0x21, 0xa4, 0xbc, 0x2f, 0xfb, 0x6c, 0xb8,
-	0xe5, 0xc7, 0xa6, 0xb9, 0xe4, 0x09, 0xb1, 0xf0, 0x73, 0xaf, 0x3d, 0xa1, 0x61, 0x81, 0x90, 0x0f,
-	0xb8, 0x96, 0xda, 0x3d, 0x58, 0xb9, 0x8f, 0xfb, 0x58, 0x84, 0xf9, 0xd9, 0x5c, 0xf8, 0x5a, 0x82,
-	0x95, 0x07, 0xc3, 0xae, 0xf1, 0xc6, 0x37, 0xc4, 0x73, 0x4b, 0x3e, 0x6f, 0x6e, 0xa1, 0x8f, 0xc8,
-	0x1b, 0x41, 0x34, 0xa0, 0xc3, 0x1f, 0xc5, 0xa1, 0xe8, 0x61, 0xda, 0x21, 0xf3, 0xe1, 0xbe, 0xe1,
-	0x3e, 0x25, 0xef, 0x07, 0x61, 0x27, 0xbf, 0xb5, 0xbf, 0xc8, 0xf0, 0x76, 0x24, 0x12, 0x01, 0x00,
-	0x04, 0xaf, 0xb0, 0x24, 0x7a, 0x85, 0xaf, 0x8d, 0xa3, 0x15, 0x7a, 0xe6, 0xb9, 0x4d, 0x0d, 0xbf,
-	0x39, 0x8f, 0xe6, 0x6e, 0x6a, 0x22, 0x77, 0x27, 0x9f, 0xc3, 0x74, 0x62, 0xab, 0x9c, 0x11, 0xb4,
-	0xca, 0x73, 0xe3, 0x56, 0x39, 0x8a, 0xcd, 0xf9, 0x44, 0x6c, 0x66, 0xa3, 0xd8, 0x24, 0x9b, 0x03,
-	0xe3, 0x79, 0xdb, 0xef, 0x55, 0x73, 0xfe, 0xe6, 0xc0, 0x78, 0x4e, 0xfa, 0x05, 0x57, 0x3b, 0x85,
-	0xe5, 0xb8, 0xb7, 0x18, 0x68, 0xbf, 0x07, 0x59, 0xfe, 0x55, 0x80, 0x01, 0xf6, 0x62, 0x42, 0x0c,
-	0xf5, 0x80, 0x79, 0x66, 0xa8, 0xee, 0xc3, 0x52, 0xa4, 0x3c, 0xf3, 0x38, 0xdd, 0x85, 0x79, 0x76,
-	0x17, 0xab, 0xcb, 0x89, 0x72, 0x39, 0xaf, 0xf6, 0x27, 0x09, 0x96, 0x22, 0xc0, 0xe5, 0xf7, 0x5d,
-	0x06, 0x0e, 0xae, 0xd0, 0x24, 0xc9, 0x28, 0xf5, 0x6e, 0x58, 0x9c, 0x3c, 0xbb, 0xb8, 0x38, 0x48,
-	0x53, 0xe7, 0x02, 0xe9, 0x5d, 0x58, 0x8a, 0x64, 0xe9, 0x6c, 0xaa, 0x6a, 0x15, 0xb8, 0x30, 0x2e,
-	0x8e, 0x33, 0x9e, 0xf9, 0x9b, 0x0c, 0x4b, 0xf4, 0xb9, 0x7e, 0xb3, 0x76, 0x2a, 0x8c, 0x02, 0xf9,
-	0x3c, 0x28, 0x30, 0x45, 0x0d, 0x8e, 0xff, 0x45, 0xe3, 0x13, 0xd1, 0x0d, 0x22, 0x1d, 0xff, 0x07,
-	0xfb, 0x9b, 0xdf, 0x4a, 0xbc, 0xbc, 0xb0, 0x7e, 0xfb, 0xdc, 0xe5, 0x45, 0x34, 0x3d, 0x44, 0xd3,
-	0x3b, 0x95, 0x98, 0xde, 0xe9, 0xd8, 0xd3, 0xf3, 0x82, 0x67, 0xf0, 0x58, 0x21, 0x96, 0xc1, 0x1f,
-	0x42, 0x8e, 0x57, 0xa9, 0xc4, 0x14, 0x66, 0x07, 0xf5, 0x2c, 0xab, 0x5f, 0xb3, 0xa7, 0x70, 0x83,
-	0xa7, 0x30, 0xbf, 0x82, 0xf9, 0xe2, 0x03, 0xc8, 0x72, 0xc9, 0x49, 0x39, 0xcc, 0x4f, 0xcd, 0x33,
-	0xc1, 0xda, 0x9f, 0x83, 0x1c, 0x8e, 0x5d, 0x18, 0x9b, 0x67, 0xa5, 0xf8, 0x3c, 0x1b, 0x16, 0x28,
-	0xcf, 0x2e, 0xf0, 0xeb, 0x65, 0xf1, 0x07, 0x3c, 0x8b, 0xcf, 0xa7, 0xac, 0xf6, 0x3e, 0x4d, 0xe3,
-	0x73, 0x1e, 0xfa, 0x3b, 0x01, 0x9e, 0xe7, 0x60, 0x63, 0x10, 0x4f, 0xe4, 0x68, 0x9b, 0x28, 0xc5,
-	0xdb, 0xc4, 0xc9, 0x3c, 0x97, 0x67, 0xe8, 0x46, 0xbf, 0xe9, 0x17, 0x4d, 0xfb, 0x0c, 0x96, 0xe3,
-	0xe6, 0x7c, 0xcd, 0x87, 0x67, 0xfd, 0x27, 0x80, 0x26, 0x93, 0x17, 0x5d, 0x87, 0xd5, 0x7a, 0x63,
-	0xa7, 0xd9, 0xde, 0xaf, 0xe9, 0xbb, 0xb5, 0x76, 0xf3, 0xa0, 0xa6, 0x6f, 0xb5, 0xea, 0xcd, 0xc6,
-	0xe4, 0x54, 0x52, 0xdf, 0x6d, 0x34, 0xf5, 0x5a, 0xbb, 0x51, 0xfb, 0x91, 0x22, 0xa1, 0x0b, 0x50,
-	0xd8, 0x6f, 0x3e, 0xac, 0xb5, 0x5b, 0xcd, 0x76, 0x75, 0x6b, 0x6f, 0xef, 0x50, 0x91, 0x2b, 0x7f,
-	0x94, 0x60, 0xc5, 0x57, 0xd9, 0xb4, 0x7a, 0x41, 0xeb, 0xe2, 0x9c, 0x98, 0x1d, 0x8c, 0xbe, 0x94,
-	0xa0, 0x18, 0x35, 0x07, 0x09, 0xbf, 0x63, 0x08, 0x23, 0x58, 0x5a, 0x9f, 0x85, 0xd5, 0xf7, 0x8e,
-	0x76, 0xe5, 0x8b, 0x7f, 0xfe, 0xfb, 0x2b, 0x59, 0xd5, 0xde, 0x0a, 0x7f, 0xb6, 0xdf, 0x74, 0x29,
-	0xf3, 0xa6, 0xb4, 0x7e, 0x5b, 0xaa, 0xbc, 0x46, 0xa0, 0x44, 0xd5, 0x7b, 0x78, 0x07, 0xbd, 0x80,
-	0x62, 0x74, 0x8e, 0x12, 0xeb, 0x27, 0x1c, 0x33, 0x4b, 0x97, 0x39, 0x6b, 0xe8, 0xeb, 0xfe, 0x46,
-	0xe0, 0xe1, 0x29, 0x2a, 0x99, 0xf4, 0xaa, 0x4d, 0x69, 0x1d, 0xfd, 0x52, 0x02, 0x25, 0x3e, 0x88,
-	0x21, 0xe1, 0x17, 0xf5, 0x29, 0xe3, 0x5a, 0xe9, 0x8c, 0xee, 0x51, 0xbb, 0x4e, 0x35, 0xb8, 0xa2,
-	0x2d, 0x86, 0x35, 0xc0, 0x9e, 0xbb, 0x19, 0xee, 0x44, 0xd1, 0xef, 0x24, 0x50, 0xe2, 0xf3, 0x90,
-	0x58, 0x8f, 0x29, 0x53, 0xd3, 0x59, 0x8e, 0xa8, 0x50, 0x35, 0x6e, 0x69, 0xef, 0xc6, 0xd4, 0x28,
-	0xbf, 0x8c, 0x66, 0xe0, 0xab, 0x4d, 0xfc, 0x9c, 0x3b, 0xe7, 0xe7, 0x12, 0x14, 0x22, 0x13, 0x0f,
-	0x5a, 0x13, 0x69, 0x24, 0x1a, 0x8a, 0xce, 0x74, 0xcb, 0x1a, 0xd5, 0x47, 0x43, 0xab, 0x67, 0xe9,
-	0x83, 0xbe, 0x92, 0xe0, 0xc2, 0xc4, 0xfc, 0x82, 0x6e, 0x09, 0x71, 0x39, 0x65, 0xc0, 0x2a, 0x7d,
-	0x77, 0x46, 0x6e, 0x06, 0xe4, 0x6b, 0x54, 0xb9, 0x8b, 0xda, 0x72, 0x5c, 0x39, 0x97, 0x1e, 0x21,
-	0xbe, 0xf9, 0x99, 0x04, 0x4a, 0x7c, 0x9a, 0x11, 0x07, 0x6c, 0xca, 0xcc, 0x53, 0x5a, 0x9e, 0x28,
-	0xe5, 0xb5, 0xc1, 0xd0, 0x3b, 0xe5, 0x9e, 0x59, 0x3f, 0xdb, 0x33, 0xbf, 0x97, 0x40, 0x89, 0xcf,
-	0x43, 0x62, 0x1d, 0xa6, 0x4c, 0x4d, 0x67, 0x46, 0xe9, 0x2e, 0xd5, 0xa5, 0x5c, 0x39, 0x53, 0x97,
-	0x28, 0x9a, 0x7f, 0x4d, 0x4a, 0x4e, 0xa4, 0x75, 0x9f, 0x52, 0x72, 0x44, 0xc3, 0xd0, 0x94, 0x92,
-	0x23, 0x9c, 0x04, 0xc4, 0xf9, 0x1d, 0x0a, 0xd3, 0x08, 0x0a, 0x91, 0xc4, 0x15, 0x23, 0x58, 0xd4,
-	0xeb, 0x97, 0x92, 0x2a, 0xbb, 0x76, 0x99, 0xca, 0x5d, 0xd1, 0x16, 0x22, 0x75, 0x25, 0xe8, 0xc0,
-	0xbf, 0x90, 0xa0, 0x10, 0xf1, 0xb9, 0x58, 0xae, 0x68, 0x26, 0x48, 0x96, 0xbb, 0x4e, 0xe5, 0x5e,
-	0xaf, 0xbc, 0x13, 0xb1, 0xf7, 0xe5, 0xb8, 0xcb, 0x7e, 0x35, 0x56, 0xc2, 0x83, 0x42, 0x04, 0x7b,
-	0x62, 0x1d, 0x44, 0xcd, 0xfe, 0x54, 0x6c, 0xb2, 0xc4, 0x58, 0x9f, 0x2e, 0x1e, 0xb9, 0x00, 0xe3,
-	0x82, 0x80, 0x6e, 0x24, 0x17, 0x8c, 0x99, 0x6c, 0x66, 0x42, 0x51, 0x82, 0xd0, 0x21, 0x14, 0x22,
-	0x4d, 0xba, 0xd8, 0x54, 0x51, 0x1f, 0x3f, 0xd5, 0x54, 0x1e, 0x61, 0x14, 0x89, 0x30, 0x1d, 0x19,
-	0x08, 0xb0, 0xc6, 0x10, 0xe7, 0xbd, 0x6d, 0x12, 0xc4, 0x63, 0x0d, 0x79, 0x12, 0xc4, 0xe3, 0xad,
-	0x72, 0x14, 0xe2, 0x74, 0x52, 0x8e, 0x56, 0xa2, 0x13, 0x0e, 0x71, 0xfe, 0x37, 0x81, 0x04, 0x88,
-	0x47, 0x1b, 0xbb, 0x52, 0x52, 0x23, 0x1a, 0xc8, 0x5d, 0x08, 0xcb, 0xdd, 0x0c, 0x7a, 0x59, 0xf4,
-	0x8b, 0x00, 0xe3, 0x89, 0x82, 0x45, 0x3d, 0x73, 0xb2, 0xe0, 0x5b, 0x54, 0xf0, 0xcd, 0x4a, 0x29,
-	0x62, 0xf0, 0xcb, 0x50, 0x0f, 0xf8, 0x2a, 0xa4, 0xc6, 0x88, 0xa3, 0x3c, 0x51, 0x0b, 0x51, 0x33,
-	0x3c, 0x35, 0xf4, 0x1a, 0x55, 0xe0, 0xd2, 0x7a, 0x82, 0x02, 0xc8, 0xa3, 0x30, 0xe7, 0x32, 0xa7,
-	0xc1, 0xfc, 0x3c, 0x66, 0x33, 0xa9, 0x28, 0x41, 0xea, 0xf6, 0x63, 0x58, 0xee, 0xd8, 0x03, 0xc1,
-	0x2d, 0xdb, 0x05, 0x8e, 0xeb, 0x03, 0x62, 0xcb, 0x81, 0xf4, 0xf9, 0x26, 0x67, 0xb2, 0xfb, 0x86,
-	0xd5, 0xdb, 0xb0, 0x9d, 0x5e, 0xb9, 0x87, 0x2d, 0x6a, 0x69, 0xd9, 0xdf, 0x32, 0x86, 0xa6, 0x1b,
-	0xfe, 0x4f, 0x8b, 0x8f, 0xf8, 0xef, 0xff, 0x48, 0xd2, 0xd1, 0x1c, 0xe5, 0x7c, 0xff, 0xbf, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x7e, 0x5e, 0x37, 0xc0, 0x92, 0x21, 0x00, 0x00,
-}
diff --git a/googleapis/genomics/v1alpha2/pipelines.pb.go b/googleapis/genomics/v1alpha2/pipelines.pb.go
index ff7089afce..533292f6af 100644
--- a/googleapis/genomics/v1alpha2/pipelines.pb.go
+++ b/googleapis/genomics/v1alpha2/pipelines.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1alpha2/pipelines.proto
 
-package genomics // import "google.golang.org/genproto/googleapis/genomics/v1alpha2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import code "google.golang.org/genproto/googleapis/rpc/code"
+package genomics
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	code "google.golang.org/genproto/googleapis/rpc/code"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The types of disks that may be attached to VMs.
 type PipelineResources_Disk_Type int32
@@ -52,6 +52,7 @@ var PipelineResources_Disk_Type_name = map[int32]string{
 	2: "PERSISTENT_SSD",
 	3: "LOCAL_SSD",
 }
+
 var PipelineResources_Disk_Type_value = map[string]int32{
 	"TYPE_UNSPECIFIED": 0,
 	"PERSISTENT_HDD":   1,
@@ -62,8 +63,9 @@ var PipelineResources_Disk_Type_value = map[string]int32{
 func (x PipelineResources_Disk_Type) String() string {
 	return proto.EnumName(PipelineResources_Disk_Type_name, int32(x))
 }
+
 func (PipelineResources_Disk_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{16, 0, 0}
+	return fileDescriptor_72a0789107b705b0, []int{16, 0, 0}
 }
 
 // Describes a Compute Engine resource that is being managed by a running
@@ -86,16 +88,17 @@ func (m *ComputeEngine) Reset()         { *m = ComputeEngine{} }
 func (m *ComputeEngine) String() string { return proto.CompactTextString(m) }
 func (*ComputeEngine) ProtoMessage()    {}
 func (*ComputeEngine) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{0}
+	return fileDescriptor_72a0789107b705b0, []int{0}
 }
+
 func (m *ComputeEngine) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ComputeEngine.Unmarshal(m, b)
 }
 func (m *ComputeEngine) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ComputeEngine.Marshal(b, m, deterministic)
 }
-func (dst *ComputeEngine) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ComputeEngine.Merge(dst, src)
+func (m *ComputeEngine) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComputeEngine.Merge(m, src)
 }
 func (m *ComputeEngine) XXX_Size() int {
 	return xxx_messageInfo_ComputeEngine.Size(m)
@@ -149,16 +152,17 @@ func (m *RuntimeMetadata) Reset()         { *m = RuntimeMetadata{} }
 func (m *RuntimeMetadata) String() string { return proto.CompactTextString(m) }
 func (*RuntimeMetadata) ProtoMessage()    {}
 func (*RuntimeMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{1}
+	return fileDescriptor_72a0789107b705b0, []int{1}
 }
+
 func (m *RuntimeMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RuntimeMetadata.Unmarshal(m, b)
 }
 func (m *RuntimeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RuntimeMetadata.Marshal(b, m, deterministic)
 }
-func (dst *RuntimeMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RuntimeMetadata.Merge(dst, src)
+func (m *RuntimeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RuntimeMetadata.Merge(m, src)
 }
 func (m *RuntimeMetadata) XXX_Size() int {
 	return xxx_messageInfo_RuntimeMetadata.Size(m)
@@ -224,16 +228,17 @@ func (m *Pipeline) Reset()         { *m = Pipeline{} }
 func (m *Pipeline) String() string { return proto.CompactTextString(m) }
 func (*Pipeline) ProtoMessage()    {}
 func (*Pipeline) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{2}
+	return fileDescriptor_72a0789107b705b0, []int{2}
 }
+
 func (m *Pipeline) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Pipeline.Unmarshal(m, b)
 }
 func (m *Pipeline) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Pipeline.Marshal(b, m, deterministic)
 }
-func (dst *Pipeline) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Pipeline.Merge(dst, src)
+func (m *Pipeline) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Pipeline.Merge(m, src)
 }
 func (m *Pipeline) XXX_Size() int {
 	return xxx_messageInfo_Pipeline.Size(m)
@@ -317,61 +322,13 @@ func (m *Pipeline) GetPipelineId() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Pipeline) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Pipeline_OneofMarshaler, _Pipeline_OneofUnmarshaler, _Pipeline_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Pipeline) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Pipeline_Docker)(nil),
 	}
 }
 
-func _Pipeline_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Pipeline)
-	// executor
-	switch x := m.Executor.(type) {
-	case *Pipeline_Docker:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Docker); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Pipeline.Executor has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Pipeline_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Pipeline)
-	switch tag {
-	case 5: // executor.docker
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DockerExecutor)
-		err := b.DecodeMessage(msg)
-		m.Executor = &Pipeline_Docker{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Pipeline_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Pipeline)
-	// executor
-	switch x := m.Executor.(type) {
-	case *Pipeline_Docker:
-		s := proto.Size(x.Docker)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request to create a pipeline. The pipeline field here should not have
 // `pipelineId` populated, as that will be populated by the server.
 type CreatePipelineRequest struct {
@@ -386,16 +343,17 @@ func (m *CreatePipelineRequest) Reset()         { *m = CreatePipelineRequest{} }
 func (m *CreatePipelineRequest) String() string { return proto.CompactTextString(m) }
 func (*CreatePipelineRequest) ProtoMessage()    {}
 func (*CreatePipelineRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{3}
+	return fileDescriptor_72a0789107b705b0, []int{3}
 }
+
 func (m *CreatePipelineRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreatePipelineRequest.Unmarshal(m, b)
 }
 func (m *CreatePipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreatePipelineRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreatePipelineRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreatePipelineRequest.Merge(dst, src)
+func (m *CreatePipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreatePipelineRequest.Merge(m, src)
 }
 func (m *CreatePipelineRequest) XXX_Size() int {
 	return xxx_messageInfo_CreatePipelineRequest.Size(m)
@@ -467,16 +425,17 @@ func (m *RunPipelineArgs) Reset()         { *m = RunPipelineArgs{} }
 func (m *RunPipelineArgs) String() string { return proto.CompactTextString(m) }
 func (*RunPipelineArgs) ProtoMessage()    {}
 func (*RunPipelineArgs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{4}
+	return fileDescriptor_72a0789107b705b0, []int{4}
 }
+
 func (m *RunPipelineArgs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunPipelineArgs.Unmarshal(m, b)
 }
 func (m *RunPipelineArgs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunPipelineArgs.Marshal(b, m, deterministic)
 }
-func (dst *RunPipelineArgs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunPipelineArgs.Merge(dst, src)
+func (m *RunPipelineArgs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunPipelineArgs.Merge(m, src)
 }
 func (m *RunPipelineArgs) XXX_Size() int {
 	return xxx_messageInfo_RunPipelineArgs.Size(m)
@@ -573,16 +532,17 @@ func (m *RunPipelineRequest) Reset()         { *m = RunPipelineRequest{} }
 func (m *RunPipelineRequest) String() string { return proto.CompactTextString(m) }
 func (*RunPipelineRequest) ProtoMessage()    {}
 func (*RunPipelineRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{5}
+	return fileDescriptor_72a0789107b705b0, []int{5}
 }
+
 func (m *RunPipelineRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RunPipelineRequest.Unmarshal(m, b)
 }
 func (m *RunPipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RunPipelineRequest.Marshal(b, m, deterministic)
 }
-func (dst *RunPipelineRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RunPipelineRequest.Merge(dst, src)
+func (m *RunPipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunPipelineRequest.Merge(m, src)
 }
 func (m *RunPipelineRequest) XXX_Size() int {
 	return xxx_messageInfo_RunPipelineRequest.Size(m)
@@ -637,76 +597,14 @@ func (m *RunPipelineRequest) GetPipelineArgs() *RunPipelineArgs {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RunPipelineRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RunPipelineRequest_OneofMarshaler, _RunPipelineRequest_OneofUnmarshaler, _RunPipelineRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RunPipelineRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RunPipelineRequest_PipelineId)(nil),
 		(*RunPipelineRequest_EphemeralPipeline)(nil),
 	}
 }
 
-func _RunPipelineRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RunPipelineRequest)
-	// pipeline
-	switch x := m.Pipeline.(type) {
-	case *RunPipelineRequest_PipelineId:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.PipelineId)
-	case *RunPipelineRequest_EphemeralPipeline:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EphemeralPipeline); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RunPipelineRequest.Pipeline has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RunPipelineRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RunPipelineRequest)
-	switch tag {
-	case 1: // pipeline.pipeline_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Pipeline = &RunPipelineRequest_PipelineId{x}
-		return true, err
-	case 2: // pipeline.ephemeral_pipeline
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Pipeline)
-		err := b.DecodeMessage(msg)
-		m.Pipeline = &RunPipelineRequest_EphemeralPipeline{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RunPipelineRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RunPipelineRequest)
-	// pipeline
-	switch x := m.Pipeline.(type) {
-	case *RunPipelineRequest_PipelineId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.PipelineId)))
-		n += len(x.PipelineId)
-	case *RunPipelineRequest_EphemeralPipeline:
-		s := proto.Size(x.EphemeralPipeline)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A request to get a saved pipeline by id.
 type GetPipelineRequest struct {
 	// Caller must have READ access to the project in which this pipeline
@@ -721,16 +619,17 @@ func (m *GetPipelineRequest) Reset()         { *m = GetPipelineRequest{} }
 func (m *GetPipelineRequest) String() string { return proto.CompactTextString(m) }
 func (*GetPipelineRequest) ProtoMessage()    {}
 func (*GetPipelineRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{6}
+	return fileDescriptor_72a0789107b705b0, []int{6}
 }
+
 func (m *GetPipelineRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPipelineRequest.Unmarshal(m, b)
 }
 func (m *GetPipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetPipelineRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetPipelineRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetPipelineRequest.Merge(dst, src)
+func (m *GetPipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPipelineRequest.Merge(m, src)
 }
 func (m *GetPipelineRequest) XXX_Size() int {
 	return xxx_messageInfo_GetPipelineRequest.Size(m)
@@ -777,16 +676,17 @@ func (m *ListPipelinesRequest) Reset()         { *m = ListPipelinesRequest{} }
 func (m *ListPipelinesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListPipelinesRequest) ProtoMessage()    {}
 func (*ListPipelinesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{7}
+	return fileDescriptor_72a0789107b705b0, []int{7}
 }
+
 func (m *ListPipelinesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListPipelinesRequest.Unmarshal(m, b)
 }
 func (m *ListPipelinesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListPipelinesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListPipelinesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListPipelinesRequest.Merge(dst, src)
+func (m *ListPipelinesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPipelinesRequest.Merge(m, src)
 }
 func (m *ListPipelinesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListPipelinesRequest.Size(m)
@@ -844,16 +744,17 @@ func (m *ListPipelinesResponse) Reset()         { *m = ListPipelinesResponse{} }
 func (m *ListPipelinesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListPipelinesResponse) ProtoMessage()    {}
 func (*ListPipelinesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{8}
+	return fileDescriptor_72a0789107b705b0, []int{8}
 }
+
 func (m *ListPipelinesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListPipelinesResponse.Unmarshal(m, b)
 }
 func (m *ListPipelinesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListPipelinesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListPipelinesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListPipelinesResponse.Merge(dst, src)
+func (m *ListPipelinesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPipelinesResponse.Merge(m, src)
 }
 func (m *ListPipelinesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListPipelinesResponse.Size(m)
@@ -892,16 +793,17 @@ func (m *DeletePipelineRequest) Reset()         { *m = DeletePipelineRequest{} }
 func (m *DeletePipelineRequest) String() string { return proto.CompactTextString(m) }
 func (*DeletePipelineRequest) ProtoMessage()    {}
 func (*DeletePipelineRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{9}
+	return fileDescriptor_72a0789107b705b0, []int{9}
 }
+
 func (m *DeletePipelineRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeletePipelineRequest.Unmarshal(m, b)
 }
 func (m *DeletePipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeletePipelineRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeletePipelineRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeletePipelineRequest.Merge(dst, src)
+func (m *DeletePipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePipelineRequest.Merge(m, src)
 }
 func (m *DeletePipelineRequest) XXX_Size() int {
 	return xxx_messageInfo_DeletePipelineRequest.Size(m)
@@ -934,16 +836,17 @@ func (m *GetControllerConfigRequest) Reset()         { *m = GetControllerConfigR
 func (m *GetControllerConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetControllerConfigRequest) ProtoMessage()    {}
 func (*GetControllerConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{10}
+	return fileDescriptor_72a0789107b705b0, []int{10}
 }
+
 func (m *GetControllerConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetControllerConfigRequest.Unmarshal(m, b)
 }
 func (m *GetControllerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetControllerConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetControllerConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetControllerConfigRequest.Merge(dst, src)
+func (m *GetControllerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetControllerConfigRequest.Merge(m, src)
 }
 func (m *GetControllerConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetControllerConfigRequest.Size(m)
@@ -989,16 +892,17 @@ func (m *ControllerConfig) Reset()         { *m = ControllerConfig{} }
 func (m *ControllerConfig) String() string { return proto.CompactTextString(m) }
 func (*ControllerConfig) ProtoMessage()    {}
 func (*ControllerConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{11}
+	return fileDescriptor_72a0789107b705b0, []int{11}
 }
+
 func (m *ControllerConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ControllerConfig.Unmarshal(m, b)
 }
 func (m *ControllerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ControllerConfig.Marshal(b, m, deterministic)
 }
-func (dst *ControllerConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ControllerConfig.Merge(dst, src)
+func (m *ControllerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerConfig.Merge(m, src)
 }
 func (m *ControllerConfig) XXX_Size() int {
 	return xxx_messageInfo_ControllerConfig.Size(m)
@@ -1076,16 +980,17 @@ func (m *ControllerConfig_RepeatedString) Reset()         { *m = ControllerConfi
 func (m *ControllerConfig_RepeatedString) String() string { return proto.CompactTextString(m) }
 func (*ControllerConfig_RepeatedString) ProtoMessage()    {}
 func (*ControllerConfig_RepeatedString) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{11, 0}
+	return fileDescriptor_72a0789107b705b0, []int{11, 0}
 }
+
 func (m *ControllerConfig_RepeatedString) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ControllerConfig_RepeatedString.Unmarshal(m, b)
 }
 func (m *ControllerConfig_RepeatedString) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ControllerConfig_RepeatedString.Marshal(b, m, deterministic)
 }
-func (dst *ControllerConfig_RepeatedString) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ControllerConfig_RepeatedString.Merge(dst, src)
+func (m *ControllerConfig_RepeatedString) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerConfig_RepeatedString.Merge(m, src)
 }
 func (m *ControllerConfig_RepeatedString) XXX_Size() int {
 	return xxx_messageInfo_ControllerConfig_RepeatedString.Size(m)
@@ -1119,16 +1024,17 @@ func (m *TimestampEvent) Reset()         { *m = TimestampEvent{} }
 func (m *TimestampEvent) String() string { return proto.CompactTextString(m) }
 func (*TimestampEvent) ProtoMessage()    {}
 func (*TimestampEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{12}
+	return fileDescriptor_72a0789107b705b0, []int{12}
 }
+
 func (m *TimestampEvent) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampEvent.Unmarshal(m, b)
 }
 func (m *TimestampEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimestampEvent.Marshal(b, m, deterministic)
 }
-func (dst *TimestampEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimestampEvent.Merge(dst, src)
+func (m *TimestampEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampEvent.Merge(m, src)
 }
 func (m *TimestampEvent) XXX_Size() int {
 	return xxx_messageInfo_TimestampEvent.Size(m)
@@ -1170,16 +1076,17 @@ func (m *SetOperationStatusRequest) Reset()         { *m = SetOperationStatusReq
 func (m *SetOperationStatusRequest) String() string { return proto.CompactTextString(m) }
 func (*SetOperationStatusRequest) ProtoMessage()    {}
 func (*SetOperationStatusRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{13}
+	return fileDescriptor_72a0789107b705b0, []int{13}
 }
+
 func (m *SetOperationStatusRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetOperationStatusRequest.Unmarshal(m, b)
 }
 func (m *SetOperationStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetOperationStatusRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetOperationStatusRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetOperationStatusRequest.Merge(dst, src)
+func (m *SetOperationStatusRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetOperationStatusRequest.Merge(m, src)
 }
 func (m *SetOperationStatusRequest) XXX_Size() int {
 	return xxx_messageInfo_SetOperationStatusRequest.Size(m)
@@ -1248,16 +1155,17 @@ func (m *ServiceAccount) Reset()         { *m = ServiceAccount{} }
 func (m *ServiceAccount) String() string { return proto.CompactTextString(m) }
 func (*ServiceAccount) ProtoMessage()    {}
 func (*ServiceAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{14}
+	return fileDescriptor_72a0789107b705b0, []int{14}
 }
+
 func (m *ServiceAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServiceAccount.Unmarshal(m, b)
 }
 func (m *ServiceAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServiceAccount.Marshal(b, m, deterministic)
 }
-func (dst *ServiceAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceAccount.Merge(dst, src)
+func (m *ServiceAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceAccount.Merge(m, src)
 }
 func (m *ServiceAccount) XXX_Size() int {
 	return xxx_messageInfo_ServiceAccount.Size(m)
@@ -1302,16 +1210,17 @@ func (m *LoggingOptions) Reset()         { *m = LoggingOptions{} }
 func (m *LoggingOptions) String() string { return proto.CompactTextString(m) }
 func (*LoggingOptions) ProtoMessage()    {}
 func (*LoggingOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{15}
+	return fileDescriptor_72a0789107b705b0, []int{15}
 }
+
 func (m *LoggingOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LoggingOptions.Unmarshal(m, b)
 }
 func (m *LoggingOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LoggingOptions.Marshal(b, m, deterministic)
 }
-func (dst *LoggingOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LoggingOptions.Merge(dst, src)
+func (m *LoggingOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoggingOptions.Merge(m, src)
 }
 func (m *LoggingOptions) XXX_Size() int {
 	return xxx_messageInfo_LoggingOptions.Size(m)
@@ -1367,16 +1276,17 @@ func (m *PipelineResources) Reset()         { *m = PipelineResources{} }
 func (m *PipelineResources) String() string { return proto.CompactTextString(m) }
 func (*PipelineResources) ProtoMessage()    {}
 func (*PipelineResources) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{16}
+	return fileDescriptor_72a0789107b705b0, []int{16}
 }
+
 func (m *PipelineResources) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PipelineResources.Unmarshal(m, b)
 }
 func (m *PipelineResources) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PipelineResources.Marshal(b, m, deterministic)
 }
-func (dst *PipelineResources) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PipelineResources.Merge(dst, src)
+func (m *PipelineResources) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineResources.Merge(m, src)
 }
 func (m *PipelineResources) XXX_Size() int {
 	return xxx_messageInfo_PipelineResources.Size(m)
@@ -1472,16 +1382,17 @@ func (m *PipelineResources_Disk) Reset()         { *m = PipelineResources_Disk{}
 func (m *PipelineResources_Disk) String() string { return proto.CompactTextString(m) }
 func (*PipelineResources_Disk) ProtoMessage()    {}
 func (*PipelineResources_Disk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{16, 0}
+	return fileDescriptor_72a0789107b705b0, []int{16, 0}
 }
+
 func (m *PipelineResources_Disk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PipelineResources_Disk.Unmarshal(m, b)
 }
 func (m *PipelineResources_Disk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PipelineResources_Disk.Marshal(b, m, deterministic)
 }
-func (dst *PipelineResources_Disk) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PipelineResources_Disk.Merge(dst, src)
+func (m *PipelineResources_Disk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineResources_Disk.Merge(m, src)
 }
 func (m *PipelineResources_Disk) XXX_Size() int {
 	return xxx_messageInfo_PipelineResources_Disk.Size(m)
@@ -1649,16 +1560,17 @@ func (m *PipelineParameter) Reset()         { *m = PipelineParameter{} }
 func (m *PipelineParameter) String() string { return proto.CompactTextString(m) }
 func (*PipelineParameter) ProtoMessage()    {}
 func (*PipelineParameter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{17}
+	return fileDescriptor_72a0789107b705b0, []int{17}
 }
+
 func (m *PipelineParameter) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PipelineParameter.Unmarshal(m, b)
 }
 func (m *PipelineParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PipelineParameter.Marshal(b, m, deterministic)
 }
-func (dst *PipelineParameter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PipelineParameter.Merge(dst, src)
+func (m *PipelineParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineParameter.Merge(m, src)
 }
 func (m *PipelineParameter) XXX_Size() int {
 	return xxx_messageInfo_PipelineParameter.Size(m)
@@ -1717,16 +1629,17 @@ func (m *PipelineParameter_LocalCopy) Reset()         { *m = PipelineParameter_L
 func (m *PipelineParameter_LocalCopy) String() string { return proto.CompactTextString(m) }
 func (*PipelineParameter_LocalCopy) ProtoMessage()    {}
 func (*PipelineParameter_LocalCopy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{17, 0}
+	return fileDescriptor_72a0789107b705b0, []int{17, 0}
 }
+
 func (m *PipelineParameter_LocalCopy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PipelineParameter_LocalCopy.Unmarshal(m, b)
 }
 func (m *PipelineParameter_LocalCopy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PipelineParameter_LocalCopy.Marshal(b, m, deterministic)
 }
-func (dst *PipelineParameter_LocalCopy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PipelineParameter_LocalCopy.Merge(dst, src)
+func (m *PipelineParameter_LocalCopy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineParameter_LocalCopy.Merge(m, src)
 }
 func (m *PipelineParameter_LocalCopy) XXX_Size() int {
 	return xxx_messageInfo_PipelineParameter_LocalCopy.Size(m)
@@ -1774,16 +1687,17 @@ func (m *DockerExecutor) Reset()         { *m = DockerExecutor{} }
 func (m *DockerExecutor) String() string { return proto.CompactTextString(m) }
 func (*DockerExecutor) ProtoMessage()    {}
 func (*DockerExecutor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pipelines_64ae929b596fc0b5, []int{18}
+	return fileDescriptor_72a0789107b705b0, []int{18}
 }
+
 func (m *DockerExecutor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DockerExecutor.Unmarshal(m, b)
 }
 func (m *DockerExecutor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DockerExecutor.Marshal(b, m, deterministic)
 }
-func (dst *DockerExecutor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DockerExecutor.Merge(dst, src)
+func (m *DockerExecutor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerExecutor.Merge(m, src)
 }
 func (m *DockerExecutor) XXX_Size() int {
 	return xxx_messageInfo_DockerExecutor.Size(m)
@@ -1809,6 +1723,7 @@ func (m *DockerExecutor) GetCmd() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.genomics.v1alpha2.PipelineResources_Disk_Type", PipelineResources_Disk_Type_name, PipelineResources_Disk_Type_value)
 	proto.RegisterType((*ComputeEngine)(nil), "google.genomics.v1alpha2.ComputeEngine")
 	proto.RegisterType((*RuntimeMetadata)(nil), "google.genomics.v1alpha2.RuntimeMetadata")
 	proto.RegisterType((*Pipeline)(nil), "google.genomics.v1alpha2.Pipeline")
@@ -1838,7 +1753,144 @@ func init() {
 	proto.RegisterType((*PipelineParameter)(nil), "google.genomics.v1alpha2.PipelineParameter")
 	proto.RegisterType((*PipelineParameter_LocalCopy)(nil), "google.genomics.v1alpha2.PipelineParameter.LocalCopy")
 	proto.RegisterType((*DockerExecutor)(nil), "google.genomics.v1alpha2.DockerExecutor")
-	proto.RegisterEnum("google.genomics.v1alpha2.PipelineResources_Disk_Type", PipelineResources_Disk_Type_name, PipelineResources_Disk_Type_value)
+}
+
+func init() {
+	proto.RegisterFile("google/genomics/v1alpha2/pipelines.proto", fileDescriptor_72a0789107b705b0)
+}
+
+var fileDescriptor_72a0789107b705b0 = []byte{
+	// 2065 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x73, 0xdb, 0xc8,
+	0xd1, 0x36, 0x28, 0x4a, 0x22, 0x9a, 0x12, 0x45, 0xcf, 0xda, 0x6b, 0x9a, 0xf6, 0xbe, 0xb6, 0xe1,
+	0x37, 0xbb, 0xb2, 0x9c, 0x22, 0x63, 0x79, 0x9d, 0xc8, 0x4a, 0xd5, 0xd6, 0x4a, 0x14, 0x2d, 0xb1,
+	0x22, 0x4b, 0x0c, 0xa8, 0x55, 0xbe, 0x0e, 0xa8, 0x11, 0x38, 0x82, 0xb0, 0x02, 0x30, 0x08, 0x06,
+	0x50, 0x59, 0x4e, 0x25, 0x55, 0x49, 0xe5, 0x90, 0xda, 0x4a, 0x2e, 0xc9, 0xfe, 0x88, 0x5c, 0x72,
+	0xcc, 0xcf, 0xc8, 0x29, 0xa7, 0x9c, 0x72, 0xc9, 0x21, 0x3f, 0x21, 0xb9, 0xa5, 0x66, 0x06, 0x03,
+	0x82, 0x1f, 0x92, 0xc8, 0xaa, 0x54, 0x6e, 0x33, 0x3d, 0xdd, 0x0f, 0x9e, 0xe9, 0xe9, 0xe9, 0xe9,
+	0x06, 0xac, 0x3a, 0x94, 0x3a, 0x1e, 0x69, 0x3a, 0x24, 0xa0, 0xbe, 0x6b, 0xb3, 0xe6, 0xc5, 0x0b,
+	0xec, 0x85, 0x67, 0x78, 0xbd, 0x19, 0xba, 0x21, 0xf1, 0xdc, 0x80, 0xb0, 0x46, 0x18, 0xd1, 0x98,
+	0xa2, 0x9a, 0xd4, 0x6c, 0x28, 0xcd, 0x86, 0xd2, 0xac, 0x3f, 0x4c, 0x31, 0x70, 0xe8, 0x36, 0x71,
+	0x10, 0xd0, 0x18, 0xc7, 0x2e, 0x0d, 0x52, 0xbb, 0xfa, 0xd3, 0x74, 0xd5, 0xa3, 0x81, 0x13, 0x25,
+	0x41, 0xe0, 0x06, 0x4e, 0x93, 0x86, 0x24, 0x1a, 0x52, 0xfa, 0xbf, 0x54, 0x49, 0xcc, 0x4e, 0x92,
+	0xd3, 0x66, 0x3f, 0x91, 0x0a, 0xe9, 0xfa, 0x83, 0xd1, 0x75, 0xe2, 0x87, 0xf1, 0x65, 0xba, 0xf8,
+	0x68, 0x74, 0x31, 0x76, 0x7d, 0xc2, 0x62, 0xec, 0x87, 0xa9, 0xc2, 0xdd, 0x54, 0x21, 0x0a, 0xed,
+	0xa6, 0x4d, 0xfb, 0x44, 0x8a, 0x8d, 0xaf, 0x34, 0x58, 0x6e, 0x51, 0x3f, 0x4c, 0x62, 0xd2, 0x0e,
+	0x1c, 0x37, 0x20, 0xe8, 0x29, 0x2c, 0xbb, 0x01, 0x8b, 0x71, 0x60, 0x13, 0x2b, 0xc0, 0x3e, 0xa9,
+	0x69, 0x8f, 0xb5, 0x55, 0xdd, 0x5c, 0x52, 0xc2, 0x03, 0xec, 0x13, 0x84, 0xa0, 0xf8, 0x9e, 0x06,
+	0xa4, 0x56, 0x10, 0x6b, 0x62, 0x8c, 0x9e, 0xc0, 0x92, 0x8f, 0xed, 0x33, 0x37, 0x20, 0x56, 0x7c,
+	0x19, 0x92, 0xda, 0x9c, 0x58, 0x2b, 0xa7, 0xb2, 0xa3, 0xcb, 0x90, 0xa0, 0x8f, 0x00, 0xfa, 0x2e,
+	0x3b, 0x17, 0xb8, 0xac, 0x56, 0x7c, 0x3c, 0xb7, 0xaa, 0x9b, 0x3a, 0x97, 0x70, 0x50, 0x66, 0x60,
+	0x58, 0x31, 0x93, 0x80, 0x33, 0x7f, 0x4b, 0x62, 0xdc, 0xc7, 0x31, 0x46, 0x07, 0x50, 0xb1, 0x25,
+	0x3d, 0x8b, 0x08, 0x7e, 0x82, 0x4e, 0x79, 0xfd, 0x93, 0xc6, 0x55, 0x47, 0xd1, 0x18, 0xda, 0x8e,
+	0xb9, 0x6c, 0xe7, 0xa7, 0xc6, 0x5f, 0xe6, 0xa0, 0xd4, 0x4d, 0x4f, 0x95, 0xd3, 0x09, 0x23, 0xfa,
+	0x25, 0xb1, 0x63, 0xcb, 0xed, 0xa7, 0xfb, 0xd4, 0x53, 0x49, 0xa7, 0xcf, 0x37, 0x29, 0x1c, 0x90,
+	0x6e, 0x92, 0x8f, 0xd1, 0x63, 0x28, 0xf7, 0x09, 0xb3, 0x23, 0x37, 0xe4, 0x27, 0xa3, 0xf6, 0x98,
+	0x13, 0xa1, 0x63, 0xa8, 0xba, 0x41, 0x98, 0xc4, 0x56, 0x88, 0x23, 0xec, 0x93, 0x98, 0x44, 0xac,
+	0x56, 0x7a, 0x3c, 0xb7, 0x5a, 0x5e, 0x7f, 0x7e, 0x35, 0x67, 0x45, 0xa9, 0xab, 0x6c, 0xcc, 0x15,
+	0x01, 0x92, 0xcd, 0x19, 0xfa, 0x21, 0xdc, 0xa6, 0x49, 0x3c, 0x02, 0xac, 0xcf, 0x0e, 0x5c, 0x95,
+	0x28, 0x39, 0xe4, 0x6d, 0x58, 0xe8, 0x53, 0xfb, 0x9c, 0x44, 0xb5, 0x79, 0xe1, 0xdb, 0xd5, 0xab,
+	0xe1, 0x76, 0x84, 0x5e, 0xfb, 0x1d, 0xb1, 0x93, 0x98, 0x46, 0x7b, 0xb7, 0xcc, 0xd4, 0x12, 0x75,
+	0x40, 0x8f, 0x08, 0xa3, 0x49, 0x64, 0x13, 0x56, 0x5b, 0x10, 0x30, 0x53, 0xb0, 0x32, 0x95, 0x89,
+	0x39, 0xb0, 0x46, 0x8f, 0xa0, 0xac, 0xee, 0x1d, 0x3f, 0x96, 0x45, 0xe1, 0x62, 0x50, 0xa2, 0x4e,
+	0x7f, 0x1b, 0xa0, 0x44, 0x52, 0x06, 0xc6, 0x0f, 0xe0, 0x6e, 0x2b, 0x22, 0x38, 0x26, 0x03, 0xc8,
+	0x9f, 0x26, 0x84, 0xc5, 0xe8, 0x33, 0x28, 0x29, 0x93, 0x34, 0x64, 0x8c, 0x29, 0xf8, 0x64, 0x36,
+	0xc6, 0x9f, 0x17, 0x44, 0x30, 0xaa, 0x95, 0xad, 0xc8, 0x61, 0x37, 0xc5, 0xcb, 0x5b, 0x58, 0x10,
+	0x87, 0xc6, 0x6a, 0x05, 0x71, 0x2c, 0xaf, 0xae, 0xfe, 0xe0, 0x08, 0x72, 0xa3, 0x23, 0xec, 0xda,
+	0x41, 0x1c, 0x5d, 0x9a, 0x29, 0x08, 0xea, 0xc2, 0xa2, 0x3c, 0x2a, 0x56, 0x9b, 0x13, 0x78, 0xdf,
+	0x9e, 0x1e, 0xef, 0x50, 0x1a, 0x4a, 0x40, 0x05, 0x83, 0xbe, 0x0f, 0x2b, 0x8c, 0x44, 0x17, 0xae,
+	0x4d, 0x2c, 0x6c, 0xdb, 0x34, 0x09, 0xe2, 0x5a, 0xf1, 0xa6, 0x13, 0xef, 0x49, 0x83, 0x2d, 0xa9,
+	0x6f, 0x56, 0xd8, 0xd0, 0x1c, 0x3d, 0x00, 0xdd, 0xf6, 0x5c, 0x12, 0x08, 0x8f, 0xcc, 0x0b, 0x8f,
+	0x94, 0xa4, 0xa0, 0xd3, 0xff, 0x6f, 0x06, 0xc5, 0x36, 0x2c, 0x7a, 0xd4, 0x71, 0xdc, 0xc0, 0x11,
+	0x01, 0x71, 0x2d, 0xe5, 0x7d, 0xa9, 0x78, 0x28, 0xee, 0x23, 0x33, 0x95, 0x21, 0x3a, 0x81, 0x27,
+	0xe7, 0x84, 0x84, 0xd6, 0x85, 0x6f, 0x61, 0xcf, 0xbd, 0x20, 0x16, 0x0d, 0xac, 0x53, 0xec, 0x7a,
+	0x49, 0x44, 0x2c, 0x95, 0x6b, 0x6b, 0x25, 0x81, 0x7e, 0x5f, 0xa1, 0xab, 0x7c, 0xda, 0xd8, 0x49,
+	0x15, 0xcc, 0x87, 0x1c, 0xe3, 0xd8, 0xdf, 0xe2, 0x08, 0x87, 0xc1, 0x1b, 0x69, 0xaf, 0x56, 0x79,
+	0x0c, 0x78, 0xf8, 0x84, 0x78, 0xea, 0x6a, 0xce, 0x10, 0x03, 0xfb, 0xc2, 0x2e, 0x8d, 0x01, 0x09,
+	0x52, 0x7f, 0x0d, 0xe5, 0x5c, 0x68, 0xa0, 0x2a, 0xcc, 0x9d, 0x93, 0xcb, 0x34, 0xf2, 0xf8, 0x10,
+	0xdd, 0x81, 0xf9, 0x0b, 0xec, 0x25, 0x2a, 0x49, 0xc9, 0xc9, 0x66, 0x61, 0x43, 0xab, 0x6f, 0xc2,
+	0x52, 0x3e, 0x0a, 0x66, 0xb2, 0x7d, 0x0d, 0xe5, 0x1c, 0x9b, 0x59, 0x4c, 0x8d, 0x7f, 0x6a, 0x80,
+	0x72, 0x3b, 0x53, 0xd7, 0xf1, 0xc9, 0xf0, 0xa5, 0x16, 0x50, 0x7b, 0xb7, 0xf2, 0xd7, 0x1a, 0xf5,
+	0x00, 0x91, 0xf0, 0x8c, 0xf8, 0x24, 0xc2, 0x9e, 0x95, 0xdd, 0xdd, 0xc2, 0xb4, 0x77, 0x77, 0xef,
+	0x96, 0x79, 0x3b, 0xb3, 0xcf, 0x52, 0xfc, 0x01, 0x2c, 0x67, 0xdf, 0xc5, 0x91, 0xc3, 0x44, 0xc6,
+	0x2e, 0xaf, 0x3f, 0x9b, 0xfa, 0x58, 0xcc, 0xa5, 0x30, 0x37, 0xe3, 0xb9, 0x27, 0x4b, 0x11, 0xaf,
+	0x00, 0xed, 0x92, 0x78, 0x74, 0xa7, 0x8f, 0x26, 0xec, 0x34, 0xbf, 0x4f, 0xe3, 0xf7, 0x1a, 0xdc,
+	0xd9, 0x77, 0x59, 0x66, 0xc8, 0x94, 0xe5, 0x0d, 0xe9, 0xe5, 0x11, 0x94, 0xf9, 0x13, 0x64, 0x85,
+	0x11, 0x39, 0x75, 0xdf, 0xa5, 0x9e, 0x07, 0x2e, 0xea, 0x0a, 0x09, 0xbf, 0x8b, 0x21, 0x76, 0x88,
+	0xc5, 0xdc, 0xf7, 0xf2, 0xf5, 0x9d, 0x37, 0x4b, 0x5c, 0xd0, 0x73, 0xdf, 0xcb, 0xb7, 0x8e, 0x2f,
+	0xc6, 0xf4, 0x9c, 0x04, 0xe2, 0xda, 0x73, 0x70, 0xec, 0x90, 0x23, 0x2e, 0x30, 0x7e, 0xa9, 0xc1,
+	0xdd, 0x11, 0x52, 0x2c, 0xa4, 0x01, 0x23, 0xe8, 0x73, 0xd0, 0xb3, 0x32, 0xa8, 0xa6, 0x89, 0xa0,
+	0x9e, 0x26, 0x93, 0x0e, 0x8c, 0xd0, 0xc7, 0xb0, 0x12, 0x90, 0x77, 0xfc, 0xdd, 0xca, 0xbe, 0x2f,
+	0xc9, 0x2f, 0x73, 0x71, 0x37, 0xe3, 0xb0, 0x01, 0x77, 0x77, 0x88, 0x47, 0xc6, 0x73, 0xf9, 0x8d,
+	0x2e, 0xfd, 0x12, 0xea, 0xbb, 0x24, 0x6e, 0xd1, 0x20, 0x8e, 0xa8, 0xe7, 0x91, 0xa8, 0x45, 0x83,
+	0x53, 0xd7, 0x19, 0xc4, 0xde, 0x52, 0x56, 0x6c, 0x0d, 0xec, 0xcb, 0x99, 0xac, 0xd3, 0x47, 0xcf,
+	0xa0, 0x7a, 0x81, 0x3d, 0xb7, 0x2f, 0x75, 0x06, 0x1c, 0x8b, 0xe6, 0xca, 0x40, 0x2e, 0x59, 0xfe,
+	0x6d, 0x01, 0xaa, 0xa3, 0x5f, 0xe2, 0xf7, 0xc1, 0xf5, 0xb1, 0xa3, 0x8a, 0x25, 0x39, 0xe1, 0xf7,
+	0xc6, 0xf6, 0xfb, 0xe9, 0x66, 0xf9, 0x10, 0x3d, 0x86, 0x25, 0xc7, 0x66, 0x96, 0x47, 0x1d, 0x2b,
+	0xc4, 0xf1, 0x59, 0x5a, 0x3f, 0x80, 0x63, 0xb3, 0x7d, 0xea, 0x74, 0x71, 0x7c, 0x36, 0x56, 0x45,
+	0x15, 0xc7, 0xab, 0xa8, 0x3d, 0x28, 0x5e, 0xe0, 0x88, 0xd5, 0xe6, 0xc5, 0x61, 0x7c, 0x7a, 0x5d,
+	0x25, 0x34, 0x4c, 0xb3, 0x71, 0x8c, 0xa3, 0x34, 0xc1, 0x08, 0x04, 0xf4, 0x3d, 0x98, 0xe7, 0xd5,
+	0x17, 0x4f, 0xce, 0x37, 0x24, 0xab, 0x31, 0xa8, 0x1d, 0x6e, 0x27, 0xb1, 0x24, 0x06, 0xfa, 0x09,
+	0x94, 0xf9, 0xde, 0x54, 0xbe, 0x5f, 0x14, 0x90, 0x9b, 0x33, 0x40, 0xee, 0xda, 0xac, 0x27, 0x8d,
+	0x25, 0x2e, 0x77, 0x4b, 0x2a, 0x40, 0x5f, 0x80, 0x2e, 0xc0, 0xdd, 0xe0, 0x5c, 0x95, 0x53, 0x1b,
+	0x33, 0x42, 0x73, 0x53, 0x09, 0x5c, 0x72, 0xd2, 0x69, 0x7d, 0x15, 0x2a, 0x26, 0x09, 0x79, 0xfd,
+	0xd0, 0xef, 0xc5, 0x11, 0x7f, 0x24, 0x3e, 0x84, 0x05, 0x91, 0xcc, 0x64, 0xac, 0xeb, 0x66, 0x3a,
+	0xab, 0x7f, 0x07, 0xf4, 0xcc, 0x7b, 0x33, 0xe5, 0xd2, 0x0d, 0x80, 0x81, 0xaf, 0x66, 0xb2, 0x7c,
+	0x07, 0x2b, 0x23, 0x2e, 0x99, 0x60, 0x7e, 0x98, 0x37, 0x2f, 0xaf, 0xbf, 0x9e, 0xc1, 0x29, 0xc3,
+	0x3b, 0xcf, 0x7f, 0xf9, 0x02, 0x96, 0x87, 0x3c, 0xf6, 0x3f, 0xfa, 0xae, 0xe1, 0x41, 0xe5, 0x48,
+	0xf5, 0x2d, 0xed, 0x0b, 0x12, 0xc4, 0xa3, 0xf5, 0xb6, 0x36, 0x5e, 0x6f, 0x6f, 0x80, 0x9e, 0xf5,
+	0x3a, 0x29, 0x99, 0xfa, 0xd8, 0xeb, 0x9d, 0xa1, 0x9a, 0x03, 0x65, 0xe3, 0xeb, 0x02, 0xdc, 0xef,
+	0x91, 0xf8, 0x50, 0xe5, 0x81, 0x5e, 0x8c, 0xe3, 0x84, 0xcd, 0x90, 0x35, 0x7a, 0x50, 0xcd, 0xd0,
+	0x2c, 0xc2, 0xf9, 0xaa, 0xd2, 0xef, 0x9a, 0xea, 0x64, 0x78, 0x83, 0xe6, 0x4a, 0x3c, 0x34, 0x67,
+	0xa8, 0x09, 0x40, 0xa2, 0x88, 0x46, 0x16, 0xef, 0xd2, 0x44, 0x82, 0xa8, 0xac, 0x57, 0x15, 0x5c,
+	0x14, 0xda, 0x8d, 0x16, 0xed, 0x13, 0x53, 0x17, 0x3a, 0x7c, 0xc8, 0x1b, 0x36, 0x69, 0xe0, 0x13,
+	0xc6, 0x78, 0x0e, 0x92, 0x29, 0x63, 0x49, 0x08, 0xdf, 0x4a, 0xd9, 0xc4, 0x04, 0x37, 0x3f, 0x39,
+	0xc1, 0x7d, 0x06, 0x95, 0xe1, 0xa2, 0x8f, 0x87, 0x28, 0xf1, 0xb1, 0xeb, 0xa9, 0xec, 0x26, 0x26,
+	0xfc, 0xa6, 0x30, 0x9b, 0x86, 0x44, 0xee, 0x59, 0x37, 0xd3, 0x99, 0xf1, 0x1c, 0x2a, 0xc3, 0x15,
+	0x18, 0xba, 0x0f, 0xfc, 0xc6, 0xc9, 0x8c, 0x27, 0x21, 0x16, 0x1d, 0x9b, 0xf1, 0x74, 0x67, 0xfc,
+	0xbd, 0x08, 0xb7, 0xc7, 0x0a, 0x3f, 0xb4, 0x06, 0xb7, 0x7d, 0x37, 0x70, 0xfd, 0xc4, 0xb7, 0xec,
+	0x30, 0xb1, 0x6c, 0x1a, 0x89, 0xfb, 0xc8, 0x5f, 0xb4, 0x95, 0x74, 0xa1, 0x15, 0x26, 0x2d, 0x2e,
+	0xe6, 0x11, 0x12, 0x46, 0x84, 0xf7, 0xc2, 0xee, 0x89, 0x27, 0xc3, 0xb1, 0x64, 0xe6, 0x45, 0xe8,
+	0xff, 0xa1, 0xa2, 0xd0, 0x22, 0xec, 0x5b, 0xce, 0x89, 0xf0, 0xaa, 0x66, 0x2e, 0xa5, 0x52, 0x13,
+	0xfb, 0xbb, 0x27, 0xe8, 0x8d, 0xca, 0x85, 0x45, 0x71, 0x82, 0xdf, 0x9a, 0xa1, 0x50, 0x15, 0xc9,
+	0x50, 0xa5, 0xc1, 0x3b, 0x30, 0xcf, 0xdb, 0x61, 0x99, 0x9e, 0x75, 0x53, 0x4e, 0xd0, 0x33, 0xb8,
+	0x7d, 0x42, 0x69, 0x6c, 0x89, 0xf6, 0x97, 0x3f, 0xd0, 0x9c, 0xc6, 0x82, 0xd8, 0x51, 0x85, 0x2f,
+	0x70, 0x04, 0xfe, 0x4e, 0xef, 0x9e, 0xf0, 0x97, 0x3a, 0xa0, 0x16, 0xee, 0xf7, 0x23, 0xc2, 0x98,
+	0xa8, 0x76, 0x4b, 0xa6, 0x1e, 0xd0, 0x2d, 0x29, 0xa8, 0xff, 0xa9, 0x00, 0x45, 0xae, 0x9d, 0xb5,
+	0xa7, 0x5a, 0xae, 0x3d, 0xed, 0x40, 0x51, 0xbc, 0x1a, 0x05, 0x11, 0x36, 0xaf, 0x66, 0xdd, 0x43,
+	0x83, 0xbf, 0x2f, 0xa6, 0x80, 0x40, 0xf7, 0x60, 0x51, 0xf1, 0x94, 0xb5, 0xc4, 0x02, 0x93, 0xfc,
+	0xf8, 0xb9, 0x0b, 0x9b, 0x34, 0xd0, 0xd2, 0x19, 0x7f, 0xa5, 0x71, 0x12, 0x53, 0xab, 0x2f, 0xde,
+	0x70, 0xb1, 0xb9, 0x92, 0x09, 0x5c, 0x24, 0x5f, 0x75, 0xae, 0xe0, 0xf3, 0x78, 0xb2, 0x42, 0xea,
+	0x06, 0xb1, 0xa8, 0xb4, 0x75, 0x13, 0x84, 0xa8, 0xcb, 0x25, 0x46, 0x0f, 0x8a, 0xe2, 0x81, 0xbb,
+	0x03, 0xd5, 0xa3, 0x1f, 0x75, 0xdb, 0xd6, 0x17, 0x07, 0xbd, 0x6e, 0xbb, 0xd5, 0x79, 0xd3, 0x69,
+	0xef, 0x54, 0x6f, 0x21, 0x04, 0x95, 0x6e, 0xdb, 0xec, 0x75, 0x7a, 0x47, 0xed, 0x83, 0x23, 0x6b,
+	0x6f, 0x67, 0xa7, 0xaa, 0x8d, 0xc8, 0x7a, 0xbd, 0x9d, 0x6a, 0x01, 0x2d, 0x83, 0xbe, 0x7f, 0xd8,
+	0xda, 0xda, 0x17, 0xd3, 0x39, 0xe3, 0xdf, 0xda, 0x20, 0xc2, 0xb2, 0xa6, 0x77, 0xa2, 0xf3, 0x46,
+	0x72, 0x4d, 0x61, 0x3c, 0xd7, 0x3c, 0x85, 0xe5, 0x3e, 0x39, 0xc5, 0x89, 0x17, 0x5b, 0x32, 0xf9,
+	0xc9, 0x8e, 0x67, 0x29, 0x15, 0x1e, 0x73, 0x19, 0x3a, 0x02, 0xf0, 0xa8, 0x8d, 0x3d, 0xcb, 0xa6,
+	0xe1, 0x65, 0xda, 0xf6, 0xbc, 0x9a, 0xa1, 0x43, 0x6f, 0xec, 0x73, 0xeb, 0x16, 0x0d, 0x2f, 0x4d,
+	0xdd, 0x53, 0xc3, 0xfa, 0x4b, 0xd0, 0x33, 0x39, 0x67, 0x9f, 0xbb, 0x4c, 0x62, 0xcc, 0x65, 0x3c,
+	0xb8, 0xd4, 0xdf, 0x0a, 0x3e, 0x36, 0xb6, 0xa0, 0x32, 0xdc, 0xb1, 0xf3, 0xe0, 0x12, 0xb5, 0x49,
+	0xfe, 0xd7, 0x8e, 0x2e, 0x24, 0xe2, 0xbf, 0xce, 0x58, 0xc5, 0xb2, 0xfe, 0x9b, 0xd2, 0xc0, 0x7d,
+	0xec, 0xf8, 0xc5, 0x96, 0x20, 0x8d, 0x7e, 0xab, 0x41, 0x65, 0xb8, 0xef, 0x46, 0xcd, 0x6b, 0x5e,
+	0x80, 0x49, 0x1d, 0x7a, 0x7d, 0x8a, 0x2a, 0xd2, 0xf8, 0xc6, 0xaf, 0xfe, 0xfa, 0x8f, 0x3f, 0x14,
+	0x1e, 0x19, 0x1f, 0x4c, 0xf8, 0x27, 0xb7, 0x99, 0x55, 0xe2, 0xe8, 0x17, 0x50, 0xce, 0x95, 0xed,
+	0xe8, 0x9b, 0x53, 0x55, 0xf7, 0x8a, 0xc7, 0x47, 0x4a, 0x3b, 0xf7, 0x77, 0xae, 0x91, 0x3d, 0x0a,
+	0x86, 0x21, 0x28, 0x3c, 0x34, 0xee, 0x4d, 0xa2, 0x10, 0x25, 0xc1, 0xa6, 0xb6, 0x86, 0xbe, 0xd2,
+	0xa0, 0x9c, 0x6b, 0x05, 0xae, 0x23, 0x30, 0xde, 0x31, 0x4c, 0xe5, 0x88, 0x67, 0x82, 0xc5, 0x53,
+	0xf4, 0x64, 0x02, 0x8b, 0xe6, 0xcf, 0x72, 0xd5, 0xf1, 0xcf, 0xd1, 0xef, 0x34, 0x58, 0x1e, 0x2a,
+	0xe5, 0x51, 0xe3, 0x9a, 0x5e, 0x79, 0x42, 0x23, 0x52, 0x6f, 0x4e, 0xad, 0x2f, 0x7b, 0x04, 0xe3,
+	0x81, 0x60, 0x77, 0x17, 0x4d, 0x3a, 0x26, 0xf4, 0x6b, 0x0d, 0x2a, 0xc3, 0x75, 0xfd, 0x75, 0xb1,
+	0x32, 0xb1, 0x03, 0xa8, 0x7f, 0x38, 0xf6, 0xa2, 0xb7, 0xfd, 0x30, 0xbe, 0x54, 0x6e, 0x59, 0x9b,
+	0xc2, 0x2d, 0x7f, 0xd4, 0xe0, 0x83, 0x09, 0x4d, 0x02, 0xfa, 0xf4, 0xda, 0xb3, 0xba, 0xa2, 0xa7,
+	0xa8, 0xaf, 0x4d, 0x5f, 0xef, 0x18, 0x4d, 0x41, 0xf2, 0x19, 0xfa, 0x64, 0x52, 0x04, 0x39, 0x13,
+	0x28, 0x7d, 0xad, 0x01, 0x1a, 0x2f, 0x4c, 0xd0, 0xcb, 0xeb, 0xfe, 0xd2, 0x5c, 0x51, 0xc6, 0x5c,
+	0xe9, 0xb9, 0x17, 0x82, 0xd4, 0xf3, 0xfa, 0xc7, 0x93, 0x48, 0xb1, 0x31, 0xb8, 0x4d, 0x6d, 0x6d,
+	0x3b, 0x84, 0x7b, 0x36, 0xf5, 0x27, 0x91, 0xd8, 0xae, 0x64, 0x31, 0xd1, 0xe5, 0x9f, 0xe9, 0x6a,
+	0x3f, 0xfe, 0x5c, 0xa9, 0x51, 0x0f, 0x07, 0x4e, 0x83, 0x46, 0x4e, 0xd3, 0x21, 0x81, 0x20, 0xd1,
+	0x94, 0x4b, 0x38, 0x74, 0xd9, 0xf8, 0x3f, 0xf7, 0xef, 0x2a, 0xc9, 0xbf, 0x34, 0xed, 0x64, 0x41,
+	0xe8, 0xbf, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x13, 0x10, 0x96, 0x1d, 0xa2, 0x17, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2164,141 +2216,3 @@ var _PipelinesV1Alpha2_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/genomics/v1alpha2/pipelines.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/genomics/v1alpha2/pipelines.proto", fileDescriptor_pipelines_64ae929b596fc0b5)
-}
-
-var fileDescriptor_pipelines_64ae929b596fc0b5 = []byte{
-	// 2065 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x73, 0xdb, 0xc8,
-	0xd1, 0x36, 0x28, 0x4a, 0x22, 0x9a, 0x12, 0x45, 0xcf, 0xda, 0x6b, 0x9a, 0xf6, 0xbe, 0xb6, 0xe1,
-	0x37, 0xbb, 0xb2, 0x9c, 0x22, 0x63, 0x79, 0x9d, 0xc8, 0x4a, 0xd5, 0xd6, 0x4a, 0x14, 0x2d, 0xb1,
-	0x22, 0x4b, 0x0c, 0xa8, 0x55, 0xbe, 0x0e, 0xa8, 0x11, 0x38, 0x82, 0xb0, 0x02, 0x30, 0x08, 0x06,
-	0x50, 0x59, 0x4e, 0x25, 0x55, 0x49, 0xe5, 0x90, 0xda, 0x4a, 0x2e, 0xc9, 0xfe, 0x88, 0x5c, 0x72,
-	0xcc, 0xcf, 0xc8, 0x29, 0xa7, 0x9c, 0x72, 0xc9, 0x21, 0x3f, 0x21, 0xb9, 0xa5, 0x66, 0x06, 0x03,
-	0x82, 0x1f, 0x92, 0xc8, 0xaa, 0x54, 0x6e, 0x33, 0x3d, 0xdd, 0x0f, 0x9e, 0xe9, 0xe9, 0xe9, 0xe9,
-	0x06, 0xac, 0x3a, 0x94, 0x3a, 0x1e, 0x69, 0x3a, 0x24, 0xa0, 0xbe, 0x6b, 0xb3, 0xe6, 0xc5, 0x0b,
-	0xec, 0x85, 0x67, 0x78, 0xbd, 0x19, 0xba, 0x21, 0xf1, 0xdc, 0x80, 0xb0, 0x46, 0x18, 0xd1, 0x98,
-	0xa2, 0x9a, 0xd4, 0x6c, 0x28, 0xcd, 0x86, 0xd2, 0xac, 0x3f, 0x4c, 0x31, 0x70, 0xe8, 0x36, 0x71,
-	0x10, 0xd0, 0x18, 0xc7, 0x2e, 0x0d, 0x52, 0xbb, 0xfa, 0xd3, 0x74, 0xd5, 0xa3, 0x81, 0x13, 0x25,
-	0x41, 0xe0, 0x06, 0x4e, 0x93, 0x86, 0x24, 0x1a, 0x52, 0xfa, 0xbf, 0x54, 0x49, 0xcc, 0x4e, 0x92,
-	0xd3, 0x66, 0x3f, 0x91, 0x0a, 0xe9, 0xfa, 0x83, 0xd1, 0x75, 0xe2, 0x87, 0xf1, 0x65, 0xba, 0xf8,
-	0x68, 0x74, 0x31, 0x76, 0x7d, 0xc2, 0x62, 0xec, 0x87, 0xa9, 0xc2, 0xdd, 0x54, 0x21, 0x0a, 0xed,
-	0xa6, 0x4d, 0xfb, 0x44, 0x8a, 0x8d, 0xaf, 0x34, 0x58, 0x6e, 0x51, 0x3f, 0x4c, 0x62, 0xd2, 0x0e,
-	0x1c, 0x37, 0x20, 0xe8, 0x29, 0x2c, 0xbb, 0x01, 0x8b, 0x71, 0x60, 0x13, 0x2b, 0xc0, 0x3e, 0xa9,
-	0x69, 0x8f, 0xb5, 0x55, 0xdd, 0x5c, 0x52, 0xc2, 0x03, 0xec, 0x13, 0x84, 0xa0, 0xf8, 0x9e, 0x06,
-	0xa4, 0x56, 0x10, 0x6b, 0x62, 0x8c, 0x9e, 0xc0, 0x92, 0x8f, 0xed, 0x33, 0x37, 0x20, 0x56, 0x7c,
-	0x19, 0x92, 0xda, 0x9c, 0x58, 0x2b, 0xa7, 0xb2, 0xa3, 0xcb, 0x90, 0xa0, 0x8f, 0x00, 0xfa, 0x2e,
-	0x3b, 0x17, 0xb8, 0xac, 0x56, 0x7c, 0x3c, 0xb7, 0xaa, 0x9b, 0x3a, 0x97, 0x70, 0x50, 0x66, 0x60,
-	0x58, 0x31, 0x93, 0x80, 0x33, 0x7f, 0x4b, 0x62, 0xdc, 0xc7, 0x31, 0x46, 0x07, 0x50, 0xb1, 0x25,
-	0x3d, 0x8b, 0x08, 0x7e, 0x82, 0x4e, 0x79, 0xfd, 0x93, 0xc6, 0x55, 0x47, 0xd1, 0x18, 0xda, 0x8e,
-	0xb9, 0x6c, 0xe7, 0xa7, 0xc6, 0x5f, 0xe6, 0xa0, 0xd4, 0x4d, 0x4f, 0x95, 0xd3, 0x09, 0x23, 0xfa,
-	0x25, 0xb1, 0x63, 0xcb, 0xed, 0xa7, 0xfb, 0xd4, 0x53, 0x49, 0xa7, 0xcf, 0x37, 0x29, 0x1c, 0x90,
-	0x6e, 0x92, 0x8f, 0xd1, 0x63, 0x28, 0xf7, 0x09, 0xb3, 0x23, 0x37, 0xe4, 0x27, 0xa3, 0xf6, 0x98,
-	0x13, 0xa1, 0x63, 0xa8, 0xba, 0x41, 0x98, 0xc4, 0x56, 0x88, 0x23, 0xec, 0x93, 0x98, 0x44, 0xac,
-	0x56, 0x7a, 0x3c, 0xb7, 0x5a, 0x5e, 0x7f, 0x7e, 0x35, 0x67, 0x45, 0xa9, 0xab, 0x6c, 0xcc, 0x15,
-	0x01, 0x92, 0xcd, 0x19, 0xfa, 0x21, 0xdc, 0xa6, 0x49, 0x3c, 0x02, 0xac, 0xcf, 0x0e, 0x5c, 0x95,
-	0x28, 0x39, 0xe4, 0x6d, 0x58, 0xe8, 0x53, 0xfb, 0x9c, 0x44, 0xb5, 0x79, 0xe1, 0xdb, 0xd5, 0xab,
-	0xe1, 0x76, 0x84, 0x5e, 0xfb, 0x1d, 0xb1, 0x93, 0x98, 0x46, 0x7b, 0xb7, 0xcc, 0xd4, 0x12, 0x75,
-	0x40, 0x8f, 0x08, 0xa3, 0x49, 0x64, 0x13, 0x56, 0x5b, 0x10, 0x30, 0x53, 0xb0, 0x32, 0x95, 0x89,
-	0x39, 0xb0, 0x46, 0x8f, 0xa0, 0xac, 0xee, 0x1d, 0x3f, 0x96, 0x45, 0xe1, 0x62, 0x50, 0xa2, 0x4e,
-	0x7f, 0x1b, 0xa0, 0x44, 0x52, 0x06, 0xc6, 0x0f, 0xe0, 0x6e, 0x2b, 0x22, 0x38, 0x26, 0x03, 0xc8,
-	0x9f, 0x26, 0x84, 0xc5, 0xe8, 0x33, 0x28, 0x29, 0x93, 0x34, 0x64, 0x8c, 0x29, 0xf8, 0x64, 0x36,
-	0xc6, 0x9f, 0x17, 0x44, 0x30, 0xaa, 0x95, 0xad, 0xc8, 0x61, 0x37, 0xc5, 0xcb, 0x5b, 0x58, 0x10,
-	0x87, 0xc6, 0x6a, 0x05, 0x71, 0x2c, 0xaf, 0xae, 0xfe, 0xe0, 0x08, 0x72, 0xa3, 0x23, 0xec, 0xda,
-	0x41, 0x1c, 0x5d, 0x9a, 0x29, 0x08, 0xea, 0xc2, 0xa2, 0x3c, 0x2a, 0x56, 0x9b, 0x13, 0x78, 0xdf,
-	0x9e, 0x1e, 0xef, 0x50, 0x1a, 0x4a, 0x40, 0x05, 0x83, 0xbe, 0x0f, 0x2b, 0x8c, 0x44, 0x17, 0xae,
-	0x4d, 0x2c, 0x6c, 0xdb, 0x34, 0x09, 0xe2, 0x5a, 0xf1, 0xa6, 0x13, 0xef, 0x49, 0x83, 0x2d, 0xa9,
-	0x6f, 0x56, 0xd8, 0xd0, 0x1c, 0x3d, 0x00, 0xdd, 0xf6, 0x5c, 0x12, 0x08, 0x8f, 0xcc, 0x0b, 0x8f,
-	0x94, 0xa4, 0xa0, 0xd3, 0xff, 0x6f, 0x06, 0xc5, 0x36, 0x2c, 0x7a, 0xd4, 0x71, 0xdc, 0xc0, 0x11,
-	0x01, 0x71, 0x2d, 0xe5, 0x7d, 0xa9, 0x78, 0x28, 0xee, 0x23, 0x33, 0x95, 0x21, 0x3a, 0x81, 0x27,
-	0xe7, 0x84, 0x84, 0xd6, 0x85, 0x6f, 0x61, 0xcf, 0xbd, 0x20, 0x16, 0x0d, 0xac, 0x53, 0xec, 0x7a,
-	0x49, 0x44, 0x2c, 0x95, 0x6b, 0x6b, 0x25, 0x81, 0x7e, 0x5f, 0xa1, 0xab, 0x7c, 0xda, 0xd8, 0x49,
-	0x15, 0xcc, 0x87, 0x1c, 0xe3, 0xd8, 0xdf, 0xe2, 0x08, 0x87, 0xc1, 0x1b, 0x69, 0xaf, 0x56, 0x79,
-	0x0c, 0x78, 0xf8, 0x84, 0x78, 0xea, 0x6a, 0xce, 0x10, 0x03, 0xfb, 0xc2, 0x2e, 0x8d, 0x01, 0x09,
-	0x52, 0x7f, 0x0d, 0xe5, 0x5c, 0x68, 0xa0, 0x2a, 0xcc, 0x9d, 0x93, 0xcb, 0x34, 0xf2, 0xf8, 0x10,
-	0xdd, 0x81, 0xf9, 0x0b, 0xec, 0x25, 0x2a, 0x49, 0xc9, 0xc9, 0x66, 0x61, 0x43, 0xab, 0x6f, 0xc2,
-	0x52, 0x3e, 0x0a, 0x66, 0xb2, 0x7d, 0x0d, 0xe5, 0x1c, 0x9b, 0x59, 0x4c, 0x8d, 0x7f, 0x6a, 0x80,
-	0x72, 0x3b, 0x53, 0xd7, 0xf1, 0xc9, 0xf0, 0xa5, 0x16, 0x50, 0x7b, 0xb7, 0xf2, 0xd7, 0x1a, 0xf5,
-	0x00, 0x91, 0xf0, 0x8c, 0xf8, 0x24, 0xc2, 0x9e, 0x95, 0xdd, 0xdd, 0xc2, 0xb4, 0x77, 0x77, 0xef,
-	0x96, 0x79, 0x3b, 0xb3, 0xcf, 0x52, 0xfc, 0x01, 0x2c, 0x67, 0xdf, 0xc5, 0x91, 0xc3, 0x44, 0xc6,
-	0x2e, 0xaf, 0x3f, 0x9b, 0xfa, 0x58, 0xcc, 0xa5, 0x30, 0x37, 0xe3, 0xb9, 0x27, 0x4b, 0x11, 0xaf,
-	0x00, 0xed, 0x92, 0x78, 0x74, 0xa7, 0x8f, 0x26, 0xec, 0x34, 0xbf, 0x4f, 0xe3, 0xf7, 0x1a, 0xdc,
-	0xd9, 0x77, 0x59, 0x66, 0xc8, 0x94, 0xe5, 0x0d, 0xe9, 0xe5, 0x11, 0x94, 0xf9, 0x13, 0x64, 0x85,
-	0x11, 0x39, 0x75, 0xdf, 0xa5, 0x9e, 0x07, 0x2e, 0xea, 0x0a, 0x09, 0xbf, 0x8b, 0x21, 0x76, 0x88,
-	0xc5, 0xdc, 0xf7, 0xf2, 0xf5, 0x9d, 0x37, 0x4b, 0x5c, 0xd0, 0x73, 0xdf, 0xcb, 0xb7, 0x8e, 0x2f,
-	0xc6, 0xf4, 0x9c, 0x04, 0xe2, 0xda, 0x73, 0x70, 0xec, 0x90, 0x23, 0x2e, 0x30, 0x7e, 0xa9, 0xc1,
-	0xdd, 0x11, 0x52, 0x2c, 0xa4, 0x01, 0x23, 0xe8, 0x73, 0xd0, 0xb3, 0x32, 0xa8, 0xa6, 0x89, 0xa0,
-	0x9e, 0x26, 0x93, 0x0e, 0x8c, 0xd0, 0xc7, 0xb0, 0x12, 0x90, 0x77, 0xfc, 0xdd, 0xca, 0xbe, 0x2f,
-	0xc9, 0x2f, 0x73, 0x71, 0x37, 0xe3, 0xb0, 0x01, 0x77, 0x77, 0x88, 0x47, 0xc6, 0x73, 0xf9, 0x8d,
-	0x2e, 0xfd, 0x12, 0xea, 0xbb, 0x24, 0x6e, 0xd1, 0x20, 0x8e, 0xa8, 0xe7, 0x91, 0xa8, 0x45, 0x83,
-	0x53, 0xd7, 0x19, 0xc4, 0xde, 0x52, 0x56, 0x6c, 0x0d, 0xec, 0xcb, 0x99, 0xac, 0xd3, 0x47, 0xcf,
-	0xa0, 0x7a, 0x81, 0x3d, 0xb7, 0x2f, 0x75, 0x06, 0x1c, 0x8b, 0xe6, 0xca, 0x40, 0x2e, 0x59, 0xfe,
-	0x6d, 0x01, 0xaa, 0xa3, 0x5f, 0xe2, 0xf7, 0xc1, 0xf5, 0xb1, 0xa3, 0x8a, 0x25, 0x39, 0xe1, 0xf7,
-	0xc6, 0xf6, 0xfb, 0xe9, 0x66, 0xf9, 0x10, 0x3d, 0x86, 0x25, 0xc7, 0x66, 0x96, 0x47, 0x1d, 0x2b,
-	0xc4, 0xf1, 0x59, 0x5a, 0x3f, 0x80, 0x63, 0xb3, 0x7d, 0xea, 0x74, 0x71, 0x7c, 0x36, 0x56, 0x45,
-	0x15, 0xc7, 0xab, 0xa8, 0x3d, 0x28, 0x5e, 0xe0, 0x88, 0xd5, 0xe6, 0xc5, 0x61, 0x7c, 0x7a, 0x5d,
-	0x25, 0x34, 0x4c, 0xb3, 0x71, 0x8c, 0xa3, 0x34, 0xc1, 0x08, 0x04, 0xf4, 0x3d, 0x98, 0xe7, 0xd5,
-	0x17, 0x4f, 0xce, 0x37, 0x24, 0xab, 0x31, 0xa8, 0x1d, 0x6e, 0x27, 0xb1, 0x24, 0x06, 0xfa, 0x09,
-	0x94, 0xf9, 0xde, 0x54, 0xbe, 0x5f, 0x14, 0x90, 0x9b, 0x33, 0x40, 0xee, 0xda, 0xac, 0x27, 0x8d,
-	0x25, 0x2e, 0x77, 0x4b, 0x2a, 0x40, 0x5f, 0x80, 0x2e, 0xc0, 0xdd, 0xe0, 0x5c, 0x95, 0x53, 0x1b,
-	0x33, 0x42, 0x73, 0x53, 0x09, 0x5c, 0x72, 0xd2, 0x69, 0x7d, 0x15, 0x2a, 0x26, 0x09, 0x79, 0xfd,
-	0xd0, 0xef, 0xc5, 0x11, 0x7f, 0x24, 0x3e, 0x84, 0x05, 0x91, 0xcc, 0x64, 0xac, 0xeb, 0x66, 0x3a,
-	0xab, 0x7f, 0x07, 0xf4, 0xcc, 0x7b, 0x33, 0xe5, 0xd2, 0x0d, 0x80, 0x81, 0xaf, 0x66, 0xb2, 0x7c,
-	0x07, 0x2b, 0x23, 0x2e, 0x99, 0x60, 0x7e, 0x98, 0x37, 0x2f, 0xaf, 0xbf, 0x9e, 0xc1, 0x29, 0xc3,
-	0x3b, 0xcf, 0x7f, 0xf9, 0x02, 0x96, 0x87, 0x3c, 0xf6, 0x3f, 0xfa, 0xae, 0xe1, 0x41, 0xe5, 0x48,
-	0xf5, 0x2d, 0xed, 0x0b, 0x12, 0xc4, 0xa3, 0xf5, 0xb6, 0x36, 0x5e, 0x6f, 0x6f, 0x80, 0x9e, 0xf5,
-	0x3a, 0x29, 0x99, 0xfa, 0xd8, 0xeb, 0x9d, 0xa1, 0x9a, 0x03, 0x65, 0xe3, 0xeb, 0x02, 0xdc, 0xef,
-	0x91, 0xf8, 0x50, 0xe5, 0x81, 0x5e, 0x8c, 0xe3, 0x84, 0xcd, 0x90, 0x35, 0x7a, 0x50, 0xcd, 0xd0,
-	0x2c, 0xc2, 0xf9, 0xaa, 0xd2, 0xef, 0x9a, 0xea, 0x64, 0x78, 0x83, 0xe6, 0x4a, 0x3c, 0x34, 0x67,
-	0xa8, 0x09, 0x40, 0xa2, 0x88, 0x46, 0x16, 0xef, 0xd2, 0x44, 0x82, 0xa8, 0xac, 0x57, 0x15, 0x5c,
-	0x14, 0xda, 0x8d, 0x16, 0xed, 0x13, 0x53, 0x17, 0x3a, 0x7c, 0xc8, 0x1b, 0x36, 0x69, 0xe0, 0x13,
-	0xc6, 0x78, 0x0e, 0x92, 0x29, 0x63, 0x49, 0x08, 0xdf, 0x4a, 0xd9, 0xc4, 0x04, 0x37, 0x3f, 0x39,
-	0xc1, 0x7d, 0x06, 0x95, 0xe1, 0xa2, 0x8f, 0x87, 0x28, 0xf1, 0xb1, 0xeb, 0xa9, 0xec, 0x26, 0x26,
-	0xfc, 0xa6, 0x30, 0x9b, 0x86, 0x44, 0xee, 0x59, 0x37, 0xd3, 0x99, 0xf1, 0x1c, 0x2a, 0xc3, 0x15,
-	0x18, 0xba, 0x0f, 0xfc, 0xc6, 0xc9, 0x8c, 0x27, 0x21, 0x16, 0x1d, 0x9b, 0xf1, 0x74, 0x67, 0xfc,
-	0xbd, 0x08, 0xb7, 0xc7, 0x0a, 0x3f, 0xb4, 0x06, 0xb7, 0x7d, 0x37, 0x70, 0xfd, 0xc4, 0xb7, 0xec,
-	0x30, 0xb1, 0x6c, 0x1a, 0x89, 0xfb, 0xc8, 0x5f, 0xb4, 0x95, 0x74, 0xa1, 0x15, 0x26, 0x2d, 0x2e,
-	0xe6, 0x11, 0x12, 0x46, 0x84, 0xf7, 0xc2, 0xee, 0x89, 0x27, 0xc3, 0xb1, 0x64, 0xe6, 0x45, 0xe8,
-	0xff, 0xa1, 0xa2, 0xd0, 0x22, 0xec, 0x5b, 0xce, 0x89, 0xf0, 0xaa, 0x66, 0x2e, 0xa5, 0x52, 0x13,
-	0xfb, 0xbb, 0x27, 0xe8, 0x8d, 0xca, 0x85, 0x45, 0x71, 0x82, 0xdf, 0x9a, 0xa1, 0x50, 0x15, 0xc9,
-	0x50, 0xa5, 0xc1, 0x3b, 0x30, 0xcf, 0xdb, 0x61, 0x99, 0x9e, 0x75, 0x53, 0x4e, 0xd0, 0x33, 0xb8,
-	0x7d, 0x42, 0x69, 0x6c, 0x89, 0xf6, 0x97, 0x3f, 0xd0, 0x9c, 0xc6, 0x82, 0xd8, 0x51, 0x85, 0x2f,
-	0x70, 0x04, 0xfe, 0x4e, 0xef, 0x9e, 0xf0, 0x97, 0x3a, 0xa0, 0x16, 0xee, 0xf7, 0x23, 0xc2, 0x98,
-	0xa8, 0x76, 0x4b, 0xa6, 0x1e, 0xd0, 0x2d, 0x29, 0xa8, 0xff, 0xa9, 0x00, 0x45, 0xae, 0x9d, 0xb5,
-	0xa7, 0x5a, 0xae, 0x3d, 0xed, 0x40, 0x51, 0xbc, 0x1a, 0x05, 0x11, 0x36, 0xaf, 0x66, 0xdd, 0x43,
-	0x83, 0xbf, 0x2f, 0xa6, 0x80, 0x40, 0xf7, 0x60, 0x51, 0xf1, 0x94, 0xb5, 0xc4, 0x02, 0x93, 0xfc,
-	0xf8, 0xb9, 0x0b, 0x9b, 0x34, 0xd0, 0xd2, 0x19, 0x7f, 0xa5, 0x71, 0x12, 0x53, 0xab, 0x2f, 0xde,
-	0x70, 0xb1, 0xb9, 0x92, 0x09, 0x5c, 0x24, 0x5f, 0x75, 0xae, 0xe0, 0xf3, 0x78, 0xb2, 0x42, 0xea,
-	0x06, 0xb1, 0xa8, 0xb4, 0x75, 0x13, 0x84, 0xa8, 0xcb, 0x25, 0x46, 0x0f, 0x8a, 0xe2, 0x81, 0xbb,
-	0x03, 0xd5, 0xa3, 0x1f, 0x75, 0xdb, 0xd6, 0x17, 0x07, 0xbd, 0x6e, 0xbb, 0xd5, 0x79, 0xd3, 0x69,
-	0xef, 0x54, 0x6f, 0x21, 0x04, 0x95, 0x6e, 0xdb, 0xec, 0x75, 0x7a, 0x47, 0xed, 0x83, 0x23, 0x6b,
-	0x6f, 0x67, 0xa7, 0xaa, 0x8d, 0xc8, 0x7a, 0xbd, 0x9d, 0x6a, 0x01, 0x2d, 0x83, 0xbe, 0x7f, 0xd8,
-	0xda, 0xda, 0x17, 0xd3, 0x39, 0xe3, 0xdf, 0xda, 0x20, 0xc2, 0xb2, 0xa6, 0x77, 0xa2, 0xf3, 0x46,
-	0x72, 0x4d, 0x61, 0x3c, 0xd7, 0x3c, 0x85, 0xe5, 0x3e, 0x39, 0xc5, 0x89, 0x17, 0x5b, 0x32, 0xf9,
-	0xc9, 0x8e, 0x67, 0x29, 0x15, 0x1e, 0x73, 0x19, 0x3a, 0x02, 0xf0, 0xa8, 0x8d, 0x3d, 0xcb, 0xa6,
-	0xe1, 0x65, 0xda, 0xf6, 0xbc, 0x9a, 0xa1, 0x43, 0x6f, 0xec, 0x73, 0xeb, 0x16, 0x0d, 0x2f, 0x4d,
-	0xdd, 0x53, 0xc3, 0xfa, 0x4b, 0xd0, 0x33, 0x39, 0x67, 0x9f, 0xbb, 0x4c, 0x62, 0xcc, 0x65, 0x3c,
-	0xb8, 0xd4, 0xdf, 0x0a, 0x3e, 0x36, 0xb6, 0xa0, 0x32, 0xdc, 0xb1, 0xf3, 0xe0, 0x12, 0xb5, 0x49,
-	0xfe, 0xd7, 0x8e, 0x2e, 0x24, 0xe2, 0xbf, 0xce, 0x58, 0xc5, 0xb2, 0xfe, 0x9b, 0xd2, 0xc0, 0x7d,
-	0xec, 0xf8, 0xc5, 0x96, 0x20, 0x8d, 0x7e, 0xab, 0x41, 0x65, 0xb8, 0xef, 0x46, 0xcd, 0x6b, 0x5e,
-	0x80, 0x49, 0x1d, 0x7a, 0x7d, 0x8a, 0x2a, 0xd2, 0xf8, 0xc6, 0xaf, 0xfe, 0xfa, 0x8f, 0x3f, 0x14,
-	0x1e, 0x19, 0x1f, 0x4c, 0xf8, 0x27, 0xb7, 0x99, 0x55, 0xe2, 0xe8, 0x17, 0x50, 0xce, 0x95, 0xed,
-	0xe8, 0x9b, 0x53, 0x55, 0xf7, 0x8a, 0xc7, 0x47, 0x4a, 0x3b, 0xf7, 0x77, 0xae, 0x91, 0x3d, 0x0a,
-	0x86, 0x21, 0x28, 0x3c, 0x34, 0xee, 0x4d, 0xa2, 0x10, 0x25, 0xc1, 0xa6, 0xb6, 0x86, 0xbe, 0xd2,
-	0xa0, 0x9c, 0x6b, 0x05, 0xae, 0x23, 0x30, 0xde, 0x31, 0x4c, 0xe5, 0x88, 0x67, 0x82, 0xc5, 0x53,
-	0xf4, 0x64, 0x02, 0x8b, 0xe6, 0xcf, 0x72, 0xd5, 0xf1, 0xcf, 0xd1, 0xef, 0x34, 0x58, 0x1e, 0x2a,
-	0xe5, 0x51, 0xe3, 0x9a, 0x5e, 0x79, 0x42, 0x23, 0x52, 0x6f, 0x4e, 0xad, 0x2f, 0x7b, 0x04, 0xe3,
-	0x81, 0x60, 0x77, 0x17, 0x4d, 0x3a, 0x26, 0xf4, 0x6b, 0x0d, 0x2a, 0xc3, 0x75, 0xfd, 0x75, 0xb1,
-	0x32, 0xb1, 0x03, 0xa8, 0x7f, 0x38, 0xf6, 0xa2, 0xb7, 0xfd, 0x30, 0xbe, 0x54, 0x6e, 0x59, 0x9b,
-	0xc2, 0x2d, 0x7f, 0xd4, 0xe0, 0x83, 0x09, 0x4d, 0x02, 0xfa, 0xf4, 0xda, 0xb3, 0xba, 0xa2, 0xa7,
-	0xa8, 0xaf, 0x4d, 0x5f, 0xef, 0x18, 0x4d, 0x41, 0xf2, 0x19, 0xfa, 0x64, 0x52, 0x04, 0x39, 0x13,
-	0x28, 0x7d, 0xad, 0x01, 0x1a, 0x2f, 0x4c, 0xd0, 0xcb, 0xeb, 0xfe, 0xd2, 0x5c, 0x51, 0xc6, 0x5c,
-	0xe9, 0xb9, 0x17, 0x82, 0xd4, 0xf3, 0xfa, 0xc7, 0x93, 0x48, 0xb1, 0x31, 0xb8, 0x4d, 0x6d, 0x6d,
-	0x3b, 0x84, 0x7b, 0x36, 0xf5, 0x27, 0x91, 0xd8, 0xae, 0x64, 0x31, 0xd1, 0xe5, 0x9f, 0xe9, 0x6a,
-	0x3f, 0xfe, 0x5c, 0xa9, 0x51, 0x0f, 0x07, 0x4e, 0x83, 0x46, 0x4e, 0xd3, 0x21, 0x81, 0x20, 0xd1,
-	0x94, 0x4b, 0x38, 0x74, 0xd9, 0xf8, 0x3f, 0xf7, 0xef, 0x2a, 0xc9, 0xbf, 0x34, 0xed, 0x64, 0x41,
-	0xe8, 0xbf, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x13, 0x10, 0x96, 0x1d, 0xa2, 0x17, 0x00,
-	0x00,
-}
diff --git a/googleapis/home/graph/v1/device.pb.go b/googleapis/home/graph/v1/device.pb.go
index 92e83f40a9..bc935238df 100644
--- a/googleapis/home/graph/v1/device.pb.go
+++ b/googleapis/home/graph/v1/device.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/home/graph/v1/device.proto
 
-package graph // import "google.golang.org/genproto/googleapis/home/graph/v1"
+package graph
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Third-party partner's device definition.
 type Device struct {
@@ -55,16 +58,17 @@ func (m *Device) Reset()         { *m = Device{} }
 func (m *Device) String() string { return proto.CompactTextString(m) }
 func (*Device) ProtoMessage()    {}
 func (*Device) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_0de6da35c00d86c7, []int{0}
+	return fileDescriptor_1729f8e53993f499, []int{0}
 }
+
 func (m *Device) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Device.Unmarshal(m, b)
 }
 func (m *Device) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Device.Marshal(b, m, deterministic)
 }
-func (dst *Device) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Device.Merge(dst, src)
+func (m *Device) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device.Merge(m, src)
 }
 func (m *Device) XXX_Size() int {
 	return xxx_messageInfo_Device.Size(m)
@@ -163,16 +167,17 @@ func (m *DeviceNames) Reset()         { *m = DeviceNames{} }
 func (m *DeviceNames) String() string { return proto.CompactTextString(m) }
 func (*DeviceNames) ProtoMessage()    {}
 func (*DeviceNames) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_0de6da35c00d86c7, []int{1}
+	return fileDescriptor_1729f8e53993f499, []int{1}
 }
+
 func (m *DeviceNames) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceNames.Unmarshal(m, b)
 }
 func (m *DeviceNames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceNames.Marshal(b, m, deterministic)
 }
-func (dst *DeviceNames) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceNames.Merge(dst, src)
+func (m *DeviceNames) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceNames.Merge(m, src)
 }
 func (m *DeviceNames) XXX_Size() int {
 	return xxx_messageInfo_DeviceNames.Size(m)
@@ -223,16 +228,17 @@ func (m *DeviceInfo) Reset()         { *m = DeviceInfo{} }
 func (m *DeviceInfo) String() string { return proto.CompactTextString(m) }
 func (*DeviceInfo) ProtoMessage()    {}
 func (*DeviceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_0de6da35c00d86c7, []int{2}
+	return fileDescriptor_1729f8e53993f499, []int{2}
 }
+
 func (m *DeviceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeviceInfo.Unmarshal(m, b)
 }
 func (m *DeviceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeviceInfo.Marshal(b, m, deterministic)
 }
-func (dst *DeviceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeviceInfo.Merge(dst, src)
+func (m *DeviceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceInfo.Merge(m, src)
 }
 func (m *DeviceInfo) XXX_Size() int {
 	return xxx_messageInfo_DeviceInfo.Size(m)
@@ -277,11 +283,9 @@ func init() {
 	proto.RegisterType((*DeviceInfo)(nil), "google.home.graph.v1.DeviceInfo")
 }
 
-func init() {
-	proto.RegisterFile("google/home/graph/v1/device.proto", fileDescriptor_device_0de6da35c00d86c7)
-}
+func init() { proto.RegisterFile("google/home/graph/v1/device.proto", fileDescriptor_1729f8e53993f499) }
 
-var fileDescriptor_device_0de6da35c00d86c7 = []byte{
+var fileDescriptor_1729f8e53993f499 = []byte{
 	// 470 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xc1, 0x6f, 0xd4, 0x3c,
 	0x10, 0xc5, 0x95, 0xdd, 0xed, 0x7e, 0x9b, 0xd9, 0xb6, 0x9f, 0xb0, 0x2a, 0xb0, 0xa0, 0x88, 0x74,
diff --git a/googleapis/home/graph/v1/homegraph.pb.go b/googleapis/home/graph/v1/homegraph.pb.go
index f35341ae20..8d7473d23e 100644
--- a/googleapis/home/graph/v1/homegraph.pb.go
+++ b/googleapis/home/graph/v1/homegraph.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/home/graph/v1/homegraph.proto
 
-package graph // import "google.golang.org/genproto/googleapis/home/graph/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package graph
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request type for RequestSyncDevices call.
 type RequestSyncDevicesRequest struct {
@@ -44,16 +44,17 @@ func (m *RequestSyncDevicesRequest) Reset()         { *m = RequestSyncDevicesReq
 func (m *RequestSyncDevicesRequest) String() string { return proto.CompactTextString(m) }
 func (*RequestSyncDevicesRequest) ProtoMessage()    {}
 func (*RequestSyncDevicesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{0}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{0}
 }
+
 func (m *RequestSyncDevicesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestSyncDevicesRequest.Unmarshal(m, b)
 }
 func (m *RequestSyncDevicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestSyncDevicesRequest.Marshal(b, m, deterministic)
 }
-func (dst *RequestSyncDevicesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestSyncDevicesRequest.Merge(dst, src)
+func (m *RequestSyncDevicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestSyncDevicesRequest.Merge(m, src)
 }
 func (m *RequestSyncDevicesRequest) XXX_Size() int {
 	return xxx_messageInfo_RequestSyncDevicesRequest.Size(m)
@@ -90,16 +91,17 @@ func (m *RequestSyncDevicesResponse) Reset()         { *m = RequestSyncDevicesRe
 func (m *RequestSyncDevicesResponse) String() string { return proto.CompactTextString(m) }
 func (*RequestSyncDevicesResponse) ProtoMessage()    {}
 func (*RequestSyncDevicesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{1}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{1}
 }
+
 func (m *RequestSyncDevicesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestSyncDevicesResponse.Unmarshal(m, b)
 }
 func (m *RequestSyncDevicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestSyncDevicesResponse.Marshal(b, m, deterministic)
 }
-func (dst *RequestSyncDevicesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestSyncDevicesResponse.Merge(dst, src)
+func (m *RequestSyncDevicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestSyncDevicesResponse.Merge(m, src)
 }
 func (m *RequestSyncDevicesResponse) XXX_Size() int {
 	return xxx_messageInfo_RequestSyncDevicesResponse.Size(m)
@@ -185,16 +187,17 @@ func (m *ReportStateAndNotificationRequest) Reset()         { *m = ReportStateAn
 func (m *ReportStateAndNotificationRequest) String() string { return proto.CompactTextString(m) }
 func (*ReportStateAndNotificationRequest) ProtoMessage()    {}
 func (*ReportStateAndNotificationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{2}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{2}
 }
+
 func (m *ReportStateAndNotificationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportStateAndNotificationRequest.Unmarshal(m, b)
 }
 func (m *ReportStateAndNotificationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportStateAndNotificationRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReportStateAndNotificationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportStateAndNotificationRequest.Merge(dst, src)
+func (m *ReportStateAndNotificationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportStateAndNotificationRequest.Merge(m, src)
 }
 func (m *ReportStateAndNotificationRequest) XXX_Size() int {
 	return xxx_messageInfo_ReportStateAndNotificationRequest.Size(m)
@@ -253,16 +256,17 @@ func (m *ReportStateAndNotificationResponse) Reset()         { *m = ReportStateA
 func (m *ReportStateAndNotificationResponse) String() string { return proto.CompactTextString(m) }
 func (*ReportStateAndNotificationResponse) ProtoMessage()    {}
 func (*ReportStateAndNotificationResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{3}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{3}
 }
+
 func (m *ReportStateAndNotificationResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportStateAndNotificationResponse.Unmarshal(m, b)
 }
 func (m *ReportStateAndNotificationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportStateAndNotificationResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReportStateAndNotificationResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportStateAndNotificationResponse.Merge(dst, src)
+func (m *ReportStateAndNotificationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportStateAndNotificationResponse.Merge(m, src)
 }
 func (m *ReportStateAndNotificationResponse) XXX_Size() int {
 	return xxx_messageInfo_ReportStateAndNotificationResponse.Size(m)
@@ -293,16 +297,17 @@ func (m *StateAndNotificationPayload) Reset()         { *m = StateAndNotificatio
 func (m *StateAndNotificationPayload) String() string { return proto.CompactTextString(m) }
 func (*StateAndNotificationPayload) ProtoMessage()    {}
 func (*StateAndNotificationPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{4}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{4}
 }
+
 func (m *StateAndNotificationPayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StateAndNotificationPayload.Unmarshal(m, b)
 }
 func (m *StateAndNotificationPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StateAndNotificationPayload.Marshal(b, m, deterministic)
 }
-func (dst *StateAndNotificationPayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StateAndNotificationPayload.Merge(dst, src)
+func (m *StateAndNotificationPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StateAndNotificationPayload.Merge(m, src)
 }
 func (m *StateAndNotificationPayload) XXX_Size() int {
 	return xxx_messageInfo_StateAndNotificationPayload.Size(m)
@@ -335,16 +340,17 @@ func (m *ReportStateAndNotificationDevice) Reset()         { *m = ReportStateAnd
 func (m *ReportStateAndNotificationDevice) String() string { return proto.CompactTextString(m) }
 func (*ReportStateAndNotificationDevice) ProtoMessage()    {}
 func (*ReportStateAndNotificationDevice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{5}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{5}
 }
+
 func (m *ReportStateAndNotificationDevice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReportStateAndNotificationDevice.Unmarshal(m, b)
 }
 func (m *ReportStateAndNotificationDevice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReportStateAndNotificationDevice.Marshal(b, m, deterministic)
 }
-func (dst *ReportStateAndNotificationDevice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReportStateAndNotificationDevice.Merge(dst, src)
+func (m *ReportStateAndNotificationDevice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportStateAndNotificationDevice.Merge(m, src)
 }
 func (m *ReportStateAndNotificationDevice) XXX_Size() int {
 	return xxx_messageInfo_ReportStateAndNotificationDevice.Size(m)
@@ -384,16 +390,17 @@ func (m *DeleteAgentUserRequest) Reset()         { *m = DeleteAgentUserRequest{}
 func (m *DeleteAgentUserRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAgentUserRequest) ProtoMessage()    {}
 func (*DeleteAgentUserRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{6}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{6}
 }
+
 func (m *DeleteAgentUserRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAgentUserRequest.Unmarshal(m, b)
 }
 func (m *DeleteAgentUserRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAgentUserRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAgentUserRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAgentUserRequest.Merge(dst, src)
+func (m *DeleteAgentUserRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAgentUserRequest.Merge(m, src)
 }
 func (m *DeleteAgentUserRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAgentUserRequest.Size(m)
@@ -440,16 +447,17 @@ func (m *QueryRequest) Reset()         { *m = QueryRequest{} }
 func (m *QueryRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryRequest) ProtoMessage()    {}
 func (*QueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{7}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{7}
 }
+
 func (m *QueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryRequest.Unmarshal(m, b)
 }
 func (m *QueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *QueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryRequest.Merge(dst, src)
+func (m *QueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRequest.Merge(m, src)
 }
 func (m *QueryRequest) XXX_Size() int {
 	return xxx_messageInfo_QueryRequest.Size(m)
@@ -494,16 +502,17 @@ func (m *QueryRequestInput) Reset()         { *m = QueryRequestInput{} }
 func (m *QueryRequestInput) String() string { return proto.CompactTextString(m) }
 func (*QueryRequestInput) ProtoMessage()    {}
 func (*QueryRequestInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{8}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{8}
 }
+
 func (m *QueryRequestInput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryRequestInput.Unmarshal(m, b)
 }
 func (m *QueryRequestInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryRequestInput.Marshal(b, m, deterministic)
 }
-func (dst *QueryRequestInput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryRequestInput.Merge(dst, src)
+func (m *QueryRequestInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRequestInput.Merge(m, src)
 }
 func (m *QueryRequestInput) XXX_Size() int {
 	return xxx_messageInfo_QueryRequestInput.Size(m)
@@ -534,16 +543,17 @@ func (m *QueryRequestPayload) Reset()         { *m = QueryRequestPayload{} }
 func (m *QueryRequestPayload) String() string { return proto.CompactTextString(m) }
 func (*QueryRequestPayload) ProtoMessage()    {}
 func (*QueryRequestPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{9}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{9}
 }
+
 func (m *QueryRequestPayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryRequestPayload.Unmarshal(m, b)
 }
 func (m *QueryRequestPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryRequestPayload.Marshal(b, m, deterministic)
 }
-func (dst *QueryRequestPayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryRequestPayload.Merge(dst, src)
+func (m *QueryRequestPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRequestPayload.Merge(m, src)
 }
 func (m *QueryRequestPayload) XXX_Size() int {
 	return xxx_messageInfo_QueryRequestPayload.Size(m)
@@ -574,16 +584,17 @@ func (m *AgentDeviceId) Reset()         { *m = AgentDeviceId{} }
 func (m *AgentDeviceId) String() string { return proto.CompactTextString(m) }
 func (*AgentDeviceId) ProtoMessage()    {}
 func (*AgentDeviceId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{10}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{10}
 }
+
 func (m *AgentDeviceId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AgentDeviceId.Unmarshal(m, b)
 }
 func (m *AgentDeviceId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AgentDeviceId.Marshal(b, m, deterministic)
 }
-func (dst *AgentDeviceId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AgentDeviceId.Merge(dst, src)
+func (m *AgentDeviceId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AgentDeviceId.Merge(m, src)
 }
 func (m *AgentDeviceId) XXX_Size() int {
 	return xxx_messageInfo_AgentDeviceId.Size(m)
@@ -618,16 +629,17 @@ func (m *QueryResponse) Reset()         { *m = QueryResponse{} }
 func (m *QueryResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryResponse) ProtoMessage()    {}
 func (*QueryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{11}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{11}
 }
+
 func (m *QueryResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryResponse.Unmarshal(m, b)
 }
 func (m *QueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryResponse.Marshal(b, m, deterministic)
 }
-func (dst *QueryResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryResponse.Merge(dst, src)
+func (m *QueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResponse.Merge(m, src)
 }
 func (m *QueryResponse) XXX_Size() int {
 	return xxx_messageInfo_QueryResponse.Size(m)
@@ -666,16 +678,17 @@ func (m *QueryResponsePayload) Reset()         { *m = QueryResponsePayload{} }
 func (m *QueryResponsePayload) String() string { return proto.CompactTextString(m) }
 func (*QueryResponsePayload) ProtoMessage()    {}
 func (*QueryResponsePayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{12}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{12}
 }
+
 func (m *QueryResponsePayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryResponsePayload.Unmarshal(m, b)
 }
 func (m *QueryResponsePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryResponsePayload.Marshal(b, m, deterministic)
 }
-func (dst *QueryResponsePayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryResponsePayload.Merge(dst, src)
+func (m *QueryResponsePayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResponsePayload.Merge(m, src)
 }
 func (m *QueryResponsePayload) XXX_Size() int {
 	return xxx_messageInfo_QueryResponsePayload.Size(m)
@@ -711,16 +724,17 @@ func (m *SyncRequest) Reset()         { *m = SyncRequest{} }
 func (m *SyncRequest) String() string { return proto.CompactTextString(m) }
 func (*SyncRequest) ProtoMessage()    {}
 func (*SyncRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{13}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{13}
 }
+
 func (m *SyncRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SyncRequest.Unmarshal(m, b)
 }
 func (m *SyncRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SyncRequest.Marshal(b, m, deterministic)
 }
-func (dst *SyncRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SyncRequest.Merge(dst, src)
+func (m *SyncRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SyncRequest.Merge(m, src)
 }
 func (m *SyncRequest) XXX_Size() int {
 	return xxx_messageInfo_SyncRequest.Size(m)
@@ -794,16 +808,17 @@ func (m *SyncResponse) Reset()         { *m = SyncResponse{} }
 func (m *SyncResponse) String() string { return proto.CompactTextString(m) }
 func (*SyncResponse) ProtoMessage()    {}
 func (*SyncResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{14}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{14}
 }
+
 func (m *SyncResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SyncResponse.Unmarshal(m, b)
 }
 func (m *SyncResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SyncResponse.Marshal(b, m, deterministic)
 }
-func (dst *SyncResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SyncResponse.Merge(dst, src)
+func (m *SyncResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SyncResponse.Merge(m, src)
 }
 func (m *SyncResponse) XXX_Size() int {
 	return xxx_messageInfo_SyncResponse.Size(m)
@@ -843,16 +858,17 @@ func (m *SyncResponsePayload) Reset()         { *m = SyncResponsePayload{} }
 func (m *SyncResponsePayload) String() string { return proto.CompactTextString(m) }
 func (*SyncResponsePayload) ProtoMessage()    {}
 func (*SyncResponsePayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_homegraph_b39498a40939fff1, []int{15}
+	return fileDescriptor_7c06ecdbcb0515e5, []int{15}
 }
+
 func (m *SyncResponsePayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SyncResponsePayload.Unmarshal(m, b)
 }
 func (m *SyncResponsePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SyncResponsePayload.Marshal(b, m, deterministic)
 }
-func (dst *SyncResponsePayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SyncResponsePayload.Merge(dst, src)
+func (m *SyncResponsePayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SyncResponsePayload.Merge(m, src)
 }
 func (m *SyncResponsePayload) XXX_Size() int {
 	return xxx_messageInfo_SyncResponsePayload.Size(m)
@@ -897,6 +913,69 @@ func init() {
 	proto.RegisterType((*SyncResponsePayload)(nil), "google.home.graph.v1.SyncResponsePayload")
 }
 
+func init() {
+	proto.RegisterFile("google/home/graph/v1/homegraph.proto", fileDescriptor_7c06ecdbcb0515e5)
+}
+
+var fileDescriptor_7c06ecdbcb0515e5 = []byte{
+	// 879 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x8f, 0xdb, 0x44,
+	0x14, 0x97, 0x93, 0x66, 0xb7, 0x7d, 0xd9, 0xd0, 0x76, 0x76, 0xd9, 0xba, 0xd9, 0x20, 0x92, 0x59,
+	0x54, 0xd2, 0x00, 0x36, 0x09, 0x52, 0x5b, 0x16, 0xad, 0xd0, 0x76, 0xb7, 0x82, 0x08, 0x09, 0xa5,
+	0x4e, 0x57, 0x42, 0x70, 0x88, 0xdc, 0x78, 0xd6, 0x35, 0x4d, 0x3c, 0x5e, 0xcf, 0x38, 0x28, 0x42,
+	0x5c, 0xfa, 0x11, 0xe0, 0xc8, 0x77, 0xe1, 0xc0, 0x57, 0xe0, 0xc4, 0x9d, 0xcf, 0xc0, 0xb9, 0x9a,
+	0x19, 0x7b, 0xf3, 0xc7, 0x4e, 0xe2, 0x4a, 0x7b, 0xf3, 0xcc, 0xfb, 0xbd, 0xdf, 0x7b, 0x6f, 0xde,
+	0x6f, 0xde, 0x18, 0x3e, 0x72, 0x29, 0x75, 0x47, 0xc4, 0x7c, 0x45, 0xc7, 0xc4, 0x74, 0x43, 0x3b,
+	0x78, 0x65, 0x4e, 0xda, 0x72, 0x25, 0x17, 0x46, 0x10, 0x52, 0x4e, 0xd1, 0x9e, 0x42, 0x19, 0x62,
+	0xdf, 0x50, 0x86, 0x49, 0xbb, 0x5a, 0x8b, 0x7d, 0xed, 0xc0, 0x33, 0x6d, 0xdf, 0xa7, 0xdc, 0xe6,
+	0x1e, 0xf5, 0x99, 0xf2, 0xa9, 0x36, 0x32, 0x99, 0x1d, 0x32, 0xf1, 0x86, 0x24, 0x86, 0x1c, 0xc4,
+	0x10, 0xb9, 0x7a, 0x19, 0x5d, 0x98, 0x64, 0x1c, 0xf0, 0x69, 0x6c, 0xac, 0x2d, 0x1b, 0x19, 0x0f,
+	0xa3, 0x21, 0x57, 0x56, 0x7c, 0x0e, 0xf7, 0x2d, 0x72, 0x19, 0x11, 0xc6, 0xfb, 0x53, 0x7f, 0x78,
+	0x26, 0x59, 0x59, 0xbc, 0x83, 0x30, 0x54, 0x6c, 0x97, 0xf8, 0x7c, 0x10, 0x31, 0x12, 0x0e, 0x3c,
+	0x47, 0xd7, 0xea, 0x5a, 0xf3, 0x96, 0x55, 0x96, 0x9b, 0xe7, 0x8c, 0x84, 0x5d, 0x07, 0xed, 0x41,
+	0xc9, 0x66, 0x53, 0x7f, 0xa8, 0x17, 0xea, 0x5a, 0xf3, 0xa6, 0xa5, 0x16, 0xb8, 0x06, 0xd5, 0x2c,
+	0x5a, 0x16, 0x50, 0x9f, 0x11, 0xfc, 0xbf, 0x06, 0x0d, 0x8b, 0x04, 0x34, 0xe4, 0x7d, 0x6e, 0x73,
+	0x72, 0xe2, 0x3b, 0xdf, 0x53, 0xee, 0x5d, 0x78, 0x43, 0x59, 0x78, 0x12, 0xfd, 0x03, 0x80, 0x50,
+	0x7d, 0xce, 0x42, 0xdf, 0x8a, 0x77, 0xba, 0x0e, 0xba, 0x0f, 0x37, 0xc9, 0x44, 0x24, 0xe7, 0x39,
+	0xfa, 0x0d, 0x69, 0xdc, 0x96, 0xeb, 0xae, 0x93, 0xce, 0xbb, 0x90, 0xce, 0xfb, 0x01, 0xdc, 0xbe,
+	0xa0, 0xa3, 0x11, 0xfd, 0x65, 0x10, 0x05, 0x03, 0x4e, 0x5f, 0x13, 0x5f, 0x2f, 0x49, 0x54, 0x45,
+	0x6d, 0x9f, 0x07, 0x2f, 0xc4, 0x26, 0xfa, 0x0e, 0xb6, 0x03, 0x7b, 0x3a, 0xa2, 0xb6, 0xa3, 0x17,
+	0xeb, 0x5a, 0xb3, 0xdc, 0x69, 0x1b, 0x59, 0x4d, 0x34, 0xb2, 0x2a, 0xe9, 0x29, 0x47, 0x2b, 0x61,
+	0xc0, 0xa7, 0x80, 0xd7, 0xd5, 0xad, 0x8e, 0x67, 0x43, 0xe1, 0x98, 0xc2, 0xc1, 0x9a, 0x60, 0xa8,
+	0x07, 0xdb, 0x4a, 0x1c, 0x4c, 0xba, 0x96, 0x3b, 0x8f, 0xb2, 0x13, 0x5e, 0x9d, 0x88, 0x6a, 0x97,
+	0x95, 0xd0, 0xe0, 0xdf, 0x35, 0xa8, 0x6f, 0x42, 0x23, 0x13, 0xb6, 0x98, 0xb0, 0x26, 0x51, 0xef,
+	0x25, 0x51, 0x13, 0xdd, 0x19, 0x7d, 0xa9, 0x3b, 0x2b, 0x86, 0xa1, 0x63, 0xa8, 0xf8, 0x73, 0x34,
+	0x4c, 0x36, 0x69, 0x8d, 0xdf, 0x22, 0x1a, 0xff, 0x04, 0xfb, 0x67, 0x64, 0x44, 0x38, 0x39, 0x49,
+	0x9a, 0x9a, 0x53, 0x37, 0x39, 0xc4, 0x21, 0x2a, 0xde, 0x79, 0x1e, 0x91, 0x70, 0x7a, 0x7d, 0x9c,
+	0xe8, 0x6b, 0xd8, 0xf2, 0xfc, 0x20, 0xe2, 0x4c, 0x2f, 0xd6, 0x8b, 0xcd, 0x72, 0xe7, 0xe3, 0xec,
+	0xb6, 0xcc, 0x87, 0xed, 0x0a, 0xbc, 0x15, 0xbb, 0xe1, 0x1f, 0xe0, 0x6e, 0xca, 0x88, 0x4e, 0x67,
+	0xf2, 0x54, 0xe7, 0xfe, 0x70, 0x33, 0x6d, 0x4a, 0x96, 0x2f, 0x60, 0x37, 0xc3, 0x8e, 0x8e, 0xe7,
+	0x95, 0x24, 0x52, 0x3e, 0xcc, 0xe6, 0x96, 0x1d, 0x50, 0x32, 0xe8, 0x3a, 0x33, 0xd9, 0x7c, 0x08,
+	0x95, 0x05, 0x0b, 0x7a, 0x0f, 0x0a, 0x57, 0x87, 0x57, 0xf0, 0x1c, 0xcc, 0xa1, 0x12, 0x87, 0xcd,
+	0x25, 0x7c, 0x74, 0x36, 0xab, 0x55, 0x69, 0xa5, 0xb5, 0xb6, 0x56, 0x45, 0x9a, 0x2a, 0xf6, 0x2f,
+	0x0d, 0xf6, 0xb2, 0x10, 0xe8, 0xf9, 0x72, 0xb9, 0x8f, 0xf3, 0xd3, 0x1b, 0xf1, 0x88, 0x7b, 0xe6,
+	0xf3, 0x70, 0x7a, 0x75, 0x04, 0xd5, 0x3e, 0xec, 0xcc, 0x1b, 0xd0, 0x1d, 0x28, 0xbe, 0x26, 0xd3,
+	0xb8, 0x32, 0xf1, 0x89, 0x3e, 0x83, 0xd2, 0xc4, 0x1e, 0x45, 0x64, 0x93, 0xfa, 0x15, 0xea, 0xa8,
+	0xf0, 0x44, 0xc3, 0x3d, 0x28, 0x8b, 0xa1, 0x7a, 0x8d, 0x72, 0x0f, 0x61, 0x47, 0x31, 0xe6, 0xeb,
+	0xc3, 0xe9, 0x72, 0x1f, 0x56, 0x68, 0x6e, 0x9e, 0x33, 0xd5, 0x86, 0x4b, 0xd8, 0xcd, 0xb0, 0xe7,
+	0x7a, 0x72, 0x1e, 0xcd, 0x1a, 0x55, 0x90, 0x8d, 0xaa, 0x65, 0xc7, 0x5f, 0x9a, 0x63, 0x9d, 0x7f,
+	0x4b, 0xb0, 0xfb, 0x2d, 0x1d, 0x93, 0x6f, 0x04, 0xe0, 0x24, 0xf0, 0xfa, 0x24, 0x94, 0xa3, 0xeb,
+	0x4f, 0x0d, 0x50, 0xfa, 0xb5, 0x42, 0xe6, 0xaa, 0xb9, 0xb9, 0xe2, 0xb9, 0xac, 0x7e, 0x9e, 0xdf,
+	0x21, 0x7e, 0x08, 0xf1, 0x9b, 0x7f, 0xfe, 0xfb, 0xa3, 0x50, 0xc3, 0xf7, 0x66, 0x4f, 0x3a, 0x3b,
+	0x0a, 0x67, 0xf8, 0x23, 0xad, 0x85, 0xfe, 0xd6, 0xc4, 0x5b, 0xba, 0x6a, 0xfa, 0xa2, 0xc7, 0xef,
+	0x3a, 0xdd, 0x93, 0x6c, 0x9f, 0xbc, 0xbb, 0x63, 0x9c, 0x75, 0x5b, 0x66, 0xfd, 0x09, 0x7e, 0xb0,
+	0x98, 0xf5, 0x2a, 0x3f, 0x51, 0xc4, 0x1b, 0x0d, 0x6e, 0x2f, 0x8d, 0x6b, 0xf4, 0xe9, 0xaa, 0xae,
+	0x65, 0x4d, 0xf5, 0xea, 0x7e, 0xea, 0x66, 0x3c, 0x13, 0x3f, 0x39, 0xf8, 0xa1, 0x4c, 0xe6, 0xb0,
+	0xd5, 0x10, 0xc9, 0xfc, 0xba, 0xa0, 0x9d, 0xe3, 0x2b, 0xd1, 0x30, 0xb3, 0xd5, 0xfa, 0x0d, 0xf9,
+	0x50, 0x92, 0x77, 0x17, 0xe1, 0xcd, 0x33, 0xb2, 0x7a, 0x98, 0xe3, 0xf2, 0xe3, 0x9a, 0x0c, 0xbe,
+	0x8f, 0xef, 0xce, 0x9f, 0xc4, 0xa5, 0x80, 0x88, 0xa2, 0x7f, 0x86, 0x1b, 0xa2, 0x89, 0xa8, 0xb1,
+	0xee, 0x7a, 0xa8, 0x68, 0x78, 0xf3, 0x0d, 0xc2, 0x07, 0x32, 0xd8, 0xfb, 0xf8, 0xce, 0x7c, 0x30,
+	0xa6, 0x54, 0xf2, 0x94, 0x82, 0x3e, 0xa4, 0xe3, 0x4c, 0x96, 0xa7, 0x7a, 0x86, 0xe8, 0x7b, 0xe2,
+	0x14, 0x7f, 0xfc, 0x32, 0xc6, 0xbb, 0x74, 0x64, 0xfb, 0xae, 0x41, 0x43, 0xd7, 0x74, 0x89, 0x2f,
+	0x4f, 0xd8, 0x54, 0x26, 0x3b, 0xf0, 0xd8, 0xe2, 0xaf, 0xe7, 0x57, 0xf2, 0xe3, 0xe5, 0x96, 0x44,
+	0x7d, 0xf1, 0x36, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x87, 0x36, 0x9c, 0xf9, 0x0a, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1194,66 +1273,3 @@ var _HomeGraphApiService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/home/graph/v1/homegraph.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/home/graph/v1/homegraph.proto", fileDescriptor_homegraph_b39498a40939fff1)
-}
-
-var fileDescriptor_homegraph_b39498a40939fff1 = []byte{
-	// 879 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x8f, 0xdb, 0x44,
-	0x14, 0x97, 0x93, 0x66, 0xb7, 0x7d, 0xd9, 0xd0, 0x76, 0x76, 0xd9, 0xba, 0xd9, 0x20, 0x92, 0x59,
-	0x54, 0xd2, 0x00, 0x36, 0x09, 0x52, 0x5b, 0x16, 0xad, 0xd0, 0x76, 0xb7, 0x82, 0x08, 0x09, 0xa5,
-	0x4e, 0x57, 0x42, 0x70, 0x88, 0xdc, 0x78, 0xd6, 0x35, 0x4d, 0x3c, 0x5e, 0xcf, 0x38, 0x28, 0x42,
-	0x5c, 0xfa, 0x11, 0xe0, 0xc8, 0x77, 0xe1, 0xc0, 0x57, 0xe0, 0xc4, 0x9d, 0xcf, 0xc0, 0xb9, 0x9a,
-	0x19, 0x7b, 0xf3, 0xc7, 0x4e, 0xe2, 0x4a, 0x7b, 0xf3, 0xcc, 0xfb, 0xbd, 0xdf, 0x7b, 0x6f, 0xde,
-	0x6f, 0xde, 0x18, 0x3e, 0x72, 0x29, 0x75, 0x47, 0xc4, 0x7c, 0x45, 0xc7, 0xc4, 0x74, 0x43, 0x3b,
-	0x78, 0x65, 0x4e, 0xda, 0x72, 0x25, 0x17, 0x46, 0x10, 0x52, 0x4e, 0xd1, 0x9e, 0x42, 0x19, 0x62,
-	0xdf, 0x50, 0x86, 0x49, 0xbb, 0x5a, 0x8b, 0x7d, 0xed, 0xc0, 0x33, 0x6d, 0xdf, 0xa7, 0xdc, 0xe6,
-	0x1e, 0xf5, 0x99, 0xf2, 0xa9, 0x36, 0x32, 0x99, 0x1d, 0x32, 0xf1, 0x86, 0x24, 0x86, 0x1c, 0xc4,
-	0x10, 0xb9, 0x7a, 0x19, 0x5d, 0x98, 0x64, 0x1c, 0xf0, 0x69, 0x6c, 0xac, 0x2d, 0x1b, 0x19, 0x0f,
-	0xa3, 0x21, 0x57, 0x56, 0x7c, 0x0e, 0xf7, 0x2d, 0x72, 0x19, 0x11, 0xc6, 0xfb, 0x53, 0x7f, 0x78,
-	0x26, 0x59, 0x59, 0xbc, 0x83, 0x30, 0x54, 0x6c, 0x97, 0xf8, 0x7c, 0x10, 0x31, 0x12, 0x0e, 0x3c,
-	0x47, 0xd7, 0xea, 0x5a, 0xf3, 0x96, 0x55, 0x96, 0x9b, 0xe7, 0x8c, 0x84, 0x5d, 0x07, 0xed, 0x41,
-	0xc9, 0x66, 0x53, 0x7f, 0xa8, 0x17, 0xea, 0x5a, 0xf3, 0xa6, 0xa5, 0x16, 0xb8, 0x06, 0xd5, 0x2c,
-	0x5a, 0x16, 0x50, 0x9f, 0x11, 0xfc, 0xbf, 0x06, 0x0d, 0x8b, 0x04, 0x34, 0xe4, 0x7d, 0x6e, 0x73,
-	0x72, 0xe2, 0x3b, 0xdf, 0x53, 0xee, 0x5d, 0x78, 0x43, 0x59, 0x78, 0x12, 0xfd, 0x03, 0x80, 0x50,
-	0x7d, 0xce, 0x42, 0xdf, 0x8a, 0x77, 0xba, 0x0e, 0xba, 0x0f, 0x37, 0xc9, 0x44, 0x24, 0xe7, 0x39,
-	0xfa, 0x0d, 0x69, 0xdc, 0x96, 0xeb, 0xae, 0x93, 0xce, 0xbb, 0x90, 0xce, 0xfb, 0x01, 0xdc, 0xbe,
-	0xa0, 0xa3, 0x11, 0xfd, 0x65, 0x10, 0x05, 0x03, 0x4e, 0x5f, 0x13, 0x5f, 0x2f, 0x49, 0x54, 0x45,
-	0x6d, 0x9f, 0x07, 0x2f, 0xc4, 0x26, 0xfa, 0x0e, 0xb6, 0x03, 0x7b, 0x3a, 0xa2, 0xb6, 0xa3, 0x17,
-	0xeb, 0x5a, 0xb3, 0xdc, 0x69, 0x1b, 0x59, 0x4d, 0x34, 0xb2, 0x2a, 0xe9, 0x29, 0x47, 0x2b, 0x61,
-	0xc0, 0xa7, 0x80, 0xd7, 0xd5, 0xad, 0x8e, 0x67, 0x43, 0xe1, 0x98, 0xc2, 0xc1, 0x9a, 0x60, 0xa8,
-	0x07, 0xdb, 0x4a, 0x1c, 0x4c, 0xba, 0x96, 0x3b, 0x8f, 0xb2, 0x13, 0x5e, 0x9d, 0x88, 0x6a, 0x97,
-	0x95, 0xd0, 0xe0, 0xdf, 0x35, 0xa8, 0x6f, 0x42, 0x23, 0x13, 0xb6, 0x98, 0xb0, 0x26, 0x51, 0xef,
-	0x25, 0x51, 0x13, 0xdd, 0x19, 0x7d, 0xa9, 0x3b, 0x2b, 0x86, 0xa1, 0x63, 0xa8, 0xf8, 0x73, 0x34,
-	0x4c, 0x36, 0x69, 0x8d, 0xdf, 0x22, 0x1a, 0xff, 0x04, 0xfb, 0x67, 0x64, 0x44, 0x38, 0x39, 0x49,
-	0x9a, 0x9a, 0x53, 0x37, 0x39, 0xc4, 0x21, 0x2a, 0xde, 0x79, 0x1e, 0x91, 0x70, 0x7a, 0x7d, 0x9c,
-	0xe8, 0x6b, 0xd8, 0xf2, 0xfc, 0x20, 0xe2, 0x4c, 0x2f, 0xd6, 0x8b, 0xcd, 0x72, 0xe7, 0xe3, 0xec,
-	0xb6, 0xcc, 0x87, 0xed, 0x0a, 0xbc, 0x15, 0xbb, 0xe1, 0x1f, 0xe0, 0x6e, 0xca, 0x88, 0x4e, 0x67,
-	0xf2, 0x54, 0xe7, 0xfe, 0x70, 0x33, 0x6d, 0x4a, 0x96, 0x2f, 0x60, 0x37, 0xc3, 0x8e, 0x8e, 0xe7,
-	0x95, 0x24, 0x52, 0x3e, 0xcc, 0xe6, 0x96, 0x1d, 0x50, 0x32, 0xe8, 0x3a, 0x33, 0xd9, 0x7c, 0x08,
-	0x95, 0x05, 0x0b, 0x7a, 0x0f, 0x0a, 0x57, 0x87, 0x57, 0xf0, 0x1c, 0xcc, 0xa1, 0x12, 0x87, 0xcd,
-	0x25, 0x7c, 0x74, 0x36, 0xab, 0x55, 0x69, 0xa5, 0xb5, 0xb6, 0x56, 0x45, 0x9a, 0x2a, 0xf6, 0x2f,
-	0x0d, 0xf6, 0xb2, 0x10, 0xe8, 0xf9, 0x72, 0xb9, 0x8f, 0xf3, 0xd3, 0x1b, 0xf1, 0x88, 0x7b, 0xe6,
-	0xf3, 0x70, 0x7a, 0x75, 0x04, 0xd5, 0x3e, 0xec, 0xcc, 0x1b, 0xd0, 0x1d, 0x28, 0xbe, 0x26, 0xd3,
-	0xb8, 0x32, 0xf1, 0x89, 0x3e, 0x83, 0xd2, 0xc4, 0x1e, 0x45, 0x64, 0x93, 0xfa, 0x15, 0xea, 0xa8,
-	0xf0, 0x44, 0xc3, 0x3d, 0x28, 0x8b, 0xa1, 0x7a, 0x8d, 0x72, 0x0f, 0x61, 0x47, 0x31, 0xe6, 0xeb,
-	0xc3, 0xe9, 0x72, 0x1f, 0x56, 0x68, 0x6e, 0x9e, 0x33, 0xd5, 0x86, 0x4b, 0xd8, 0xcd, 0xb0, 0xe7,
-	0x7a, 0x72, 0x1e, 0xcd, 0x1a, 0x55, 0x90, 0x8d, 0xaa, 0x65, 0xc7, 0x5f, 0x9a, 0x63, 0x9d, 0x7f,
-	0x4b, 0xb0, 0xfb, 0x2d, 0x1d, 0x93, 0x6f, 0x04, 0xe0, 0x24, 0xf0, 0xfa, 0x24, 0x94, 0xa3, 0xeb,
-	0x4f, 0x0d, 0x50, 0xfa, 0xb5, 0x42, 0xe6, 0xaa, 0xb9, 0xb9, 0xe2, 0xb9, 0xac, 0x7e, 0x9e, 0xdf,
-	0x21, 0x7e, 0x08, 0xf1, 0x9b, 0x7f, 0xfe, 0xfb, 0xa3, 0x50, 0xc3, 0xf7, 0x66, 0x4f, 0x3a, 0x3b,
-	0x0a, 0x67, 0xf8, 0x23, 0xad, 0x85, 0xfe, 0xd6, 0xc4, 0x5b, 0xba, 0x6a, 0xfa, 0xa2, 0xc7, 0xef,
-	0x3a, 0xdd, 0x93, 0x6c, 0x9f, 0xbc, 0xbb, 0x63, 0x9c, 0x75, 0x5b, 0x66, 0xfd, 0x09, 0x7e, 0xb0,
-	0x98, 0xf5, 0x2a, 0x3f, 0x51, 0xc4, 0x1b, 0x0d, 0x6e, 0x2f, 0x8d, 0x6b, 0xf4, 0xe9, 0xaa, 0xae,
-	0x65, 0x4d, 0xf5, 0xea, 0x7e, 0xea, 0x66, 0x3c, 0x13, 0x3f, 0x39, 0xf8, 0xa1, 0x4c, 0xe6, 0xb0,
-	0xd5, 0x10, 0xc9, 0xfc, 0xba, 0xa0, 0x9d, 0xe3, 0x2b, 0xd1, 0x30, 0xb3, 0xd5, 0xfa, 0x0d, 0xf9,
-	0x50, 0x92, 0x77, 0x17, 0xe1, 0xcd, 0x33, 0xb2, 0x7a, 0x98, 0xe3, 0xf2, 0xe3, 0x9a, 0x0c, 0xbe,
-	0x8f, 0xef, 0xce, 0x9f, 0xc4, 0xa5, 0x80, 0x88, 0xa2, 0x7f, 0x86, 0x1b, 0xa2, 0x89, 0xa8, 0xb1,
-	0xee, 0x7a, 0xa8, 0x68, 0x78, 0xf3, 0x0d, 0xc2, 0x07, 0x32, 0xd8, 0xfb, 0xf8, 0xce, 0x7c, 0x30,
-	0xa6, 0x54, 0xf2, 0x94, 0x82, 0x3e, 0xa4, 0xe3, 0x4c, 0x96, 0xa7, 0x7a, 0x86, 0xe8, 0x7b, 0xe2,
-	0x14, 0x7f, 0xfc, 0x32, 0xc6, 0xbb, 0x74, 0x64, 0xfb, 0xae, 0x41, 0x43, 0xd7, 0x74, 0x89, 0x2f,
-	0x4f, 0xd8, 0x54, 0x26, 0x3b, 0xf0, 0xd8, 0xe2, 0xaf, 0xe7, 0x57, 0xf2, 0xe3, 0xe5, 0x96, 0x44,
-	0x7d, 0xf1, 0x36, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x87, 0x36, 0x9c, 0xf9, 0x0a, 0x00, 0x00,
-}
diff --git a/googleapis/iam/admin/v1/iam.pb.go b/googleapis/iam/admin/v1/iam.pb.go
index fad9db5ae3..4805efebbf 100644
--- a/googleapis/iam/admin/v1/iam.pb.go
+++ b/googleapis/iam/admin/v1/iam.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/admin/v1/iam.proto
 
-package admin // import "google.golang.org/genproto/googleapis/iam/admin/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package admin
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Supported key algorithms.
 type ServiceAccountKeyAlgorithm int32
@@ -45,6 +45,7 @@ var ServiceAccountKeyAlgorithm_name = map[int32]string{
 	1: "KEY_ALG_RSA_1024",
 	2: "KEY_ALG_RSA_2048",
 }
+
 var ServiceAccountKeyAlgorithm_value = map[string]int32{
 	"KEY_ALG_UNSPECIFIED": 0,
 	"KEY_ALG_RSA_1024":    1,
@@ -54,8 +55,9 @@ var ServiceAccountKeyAlgorithm_value = map[string]int32{
 func (x ServiceAccountKeyAlgorithm) String() string {
 	return proto.EnumName(ServiceAccountKeyAlgorithm_name, int32(x))
 }
+
 func (ServiceAccountKeyAlgorithm) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{0}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{0}
 }
 
 // Supported private key output formats.
@@ -77,6 +79,7 @@ var ServiceAccountPrivateKeyType_name = map[int32]string{
 	1: "TYPE_PKCS12_FILE",
 	2: "TYPE_GOOGLE_CREDENTIALS_FILE",
 }
+
 var ServiceAccountPrivateKeyType_value = map[string]int32{
 	"TYPE_UNSPECIFIED":             0,
 	"TYPE_PKCS12_FILE":             1,
@@ -86,8 +89,9 @@ var ServiceAccountPrivateKeyType_value = map[string]int32{
 func (x ServiceAccountPrivateKeyType) String() string {
 	return proto.EnumName(ServiceAccountPrivateKeyType_name, int32(x))
 }
+
 func (ServiceAccountPrivateKeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{1}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{1}
 }
 
 // Supported public key output formats.
@@ -107,6 +111,7 @@ var ServiceAccountPublicKeyType_name = map[int32]string{
 	1: "TYPE_X509_PEM_FILE",
 	2: "TYPE_RAW_PUBLIC_KEY",
 }
+
 var ServiceAccountPublicKeyType_value = map[string]int32{
 	"TYPE_NONE":           0,
 	"TYPE_X509_PEM_FILE":  1,
@@ -116,8 +121,9 @@ var ServiceAccountPublicKeyType_value = map[string]int32{
 func (x ServiceAccountPublicKeyType) String() string {
 	return proto.EnumName(ServiceAccountPublicKeyType_name, int32(x))
 }
+
 func (ServiceAccountPublicKeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{2}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{2}
 }
 
 // A view for Role objects.
@@ -135,6 +141,7 @@ var RoleView_name = map[int32]string{
 	0: "BASIC",
 	1: "FULL",
 }
+
 var RoleView_value = map[string]int32{
 	"BASIC": 0,
 	"FULL":  1,
@@ -143,8 +150,9 @@ var RoleView_value = map[string]int32{
 func (x RoleView) String() string {
 	return proto.EnumName(RoleView_name, int32(x))
 }
+
 func (RoleView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{3}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{3}
 }
 
 // `KeyType` filters to selectively retrieve certain varieties
@@ -166,6 +174,7 @@ var ListServiceAccountKeysRequest_KeyType_name = map[int32]string{
 	1: "USER_MANAGED",
 	2: "SYSTEM_MANAGED",
 }
+
 var ListServiceAccountKeysRequest_KeyType_value = map[string]int32{
 	"KEY_TYPE_UNSPECIFIED": 0,
 	"USER_MANAGED":         1,
@@ -175,8 +184,9 @@ var ListServiceAccountKeysRequest_KeyType_value = map[string]int32{
 func (x ListServiceAccountKeysRequest_KeyType) String() string {
 	return proto.EnumName(ListServiceAccountKeysRequest_KeyType_name, int32(x))
 }
+
 func (ListServiceAccountKeysRequest_KeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{6, 0}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{6, 0}
 }
 
 // A stage representing a role's lifecycle phase.
@@ -206,6 +216,7 @@ var Role_RoleLaunchStage_name = map[int32]string{
 	5: "DISABLED",
 	6: "EAP",
 }
+
 var Role_RoleLaunchStage_value = map[string]int32{
 	"ALPHA":      0,
 	"BETA":       1,
@@ -218,8 +229,9 @@ var Role_RoleLaunchStage_value = map[string]int32{
 func (x Role_RoleLaunchStage) String() string {
 	return proto.EnumName(Role_RoleLaunchStage_name, int32(x))
 }
+
 func (Role_RoleLaunchStage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{16, 0}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{16, 0}
 }
 
 // A stage representing a permission's lifecycle phase.
@@ -242,6 +254,7 @@ var Permission_PermissionLaunchStage_name = map[int32]string{
 	2: "GA",
 	3: "DEPRECATED",
 }
+
 var Permission_PermissionLaunchStage_value = map[string]int32{
 	"ALPHA":      0,
 	"BETA":       1,
@@ -252,8 +265,9 @@ var Permission_PermissionLaunchStage_value = map[string]int32{
 func (x Permission_PermissionLaunchStage) String() string {
 	return proto.EnumName(Permission_PermissionLaunchStage_name, int32(x))
 }
+
 func (Permission_PermissionLaunchStage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{26, 0}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{26, 0}
 }
 
 // The state of the permission with regards to custom roles.
@@ -273,6 +287,7 @@ var Permission_CustomRolesSupportLevel_name = map[int32]string{
 	1: "TESTING",
 	2: "NOT_SUPPORTED",
 }
+
 var Permission_CustomRolesSupportLevel_value = map[string]int32{
 	"SUPPORTED":     0,
 	"TESTING":       1,
@@ -282,8 +297,9 @@ var Permission_CustomRolesSupportLevel_value = map[string]int32{
 func (x Permission_CustomRolesSupportLevel) String() string {
 	return proto.EnumName(Permission_CustomRolesSupportLevel_name, int32(x))
 }
+
 func (Permission_CustomRolesSupportLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{26, 1}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{26, 1}
 }
 
 // A service account in the Identity and Access Management API.
@@ -338,16 +354,17 @@ func (m *ServiceAccount) Reset()         { *m = ServiceAccount{} }
 func (m *ServiceAccount) String() string { return proto.CompactTextString(m) }
 func (*ServiceAccount) ProtoMessage()    {}
 func (*ServiceAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{0}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{0}
 }
+
 func (m *ServiceAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServiceAccount.Unmarshal(m, b)
 }
 func (m *ServiceAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServiceAccount.Marshal(b, m, deterministic)
 }
-func (dst *ServiceAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceAccount.Merge(dst, src)
+func (m *ServiceAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceAccount.Merge(m, src)
 }
 func (m *ServiceAccount) XXX_Size() int {
 	return xxx_messageInfo_ServiceAccount.Size(m)
@@ -430,16 +447,17 @@ func (m *CreateServiceAccountRequest) Reset()         { *m = CreateServiceAccoun
 func (m *CreateServiceAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateServiceAccountRequest) ProtoMessage()    {}
 func (*CreateServiceAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{1}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{1}
 }
+
 func (m *CreateServiceAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateServiceAccountRequest.Unmarshal(m, b)
 }
 func (m *CreateServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateServiceAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateServiceAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateServiceAccountRequest.Merge(dst, src)
+func (m *CreateServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceAccountRequest.Merge(m, src)
 }
 func (m *CreateServiceAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateServiceAccountRequest.Size(m)
@@ -493,16 +511,17 @@ func (m *ListServiceAccountsRequest) Reset()         { *m = ListServiceAccountsR
 func (m *ListServiceAccountsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListServiceAccountsRequest) ProtoMessage()    {}
 func (*ListServiceAccountsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{2}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{2}
 }
+
 func (m *ListServiceAccountsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceAccountsRequest.Unmarshal(m, b)
 }
 func (m *ListServiceAccountsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceAccountsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceAccountsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceAccountsRequest.Merge(dst, src)
+func (m *ListServiceAccountsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountsRequest.Merge(m, src)
 }
 func (m *ListServiceAccountsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListServiceAccountsRequest.Size(m)
@@ -551,16 +570,17 @@ func (m *ListServiceAccountsResponse) Reset()         { *m = ListServiceAccounts
 func (m *ListServiceAccountsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListServiceAccountsResponse) ProtoMessage()    {}
 func (*ListServiceAccountsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{3}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{3}
 }
+
 func (m *ListServiceAccountsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceAccountsResponse.Unmarshal(m, b)
 }
 func (m *ListServiceAccountsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceAccountsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceAccountsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceAccountsResponse.Merge(dst, src)
+func (m *ListServiceAccountsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountsResponse.Merge(m, src)
 }
 func (m *ListServiceAccountsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListServiceAccountsResponse.Size(m)
@@ -602,16 +622,17 @@ func (m *GetServiceAccountRequest) Reset()         { *m = GetServiceAccountReque
 func (m *GetServiceAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServiceAccountRequest) ProtoMessage()    {}
 func (*GetServiceAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{4}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{4}
 }
+
 func (m *GetServiceAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServiceAccountRequest.Unmarshal(m, b)
 }
 func (m *GetServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServiceAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServiceAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServiceAccountRequest.Merge(dst, src)
+func (m *GetServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceAccountRequest.Merge(m, src)
 }
 func (m *GetServiceAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServiceAccountRequest.Size(m)
@@ -646,16 +667,17 @@ func (m *DeleteServiceAccountRequest) Reset()         { *m = DeleteServiceAccoun
 func (m *DeleteServiceAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteServiceAccountRequest) ProtoMessage()    {}
 func (*DeleteServiceAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{5}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{5}
 }
+
 func (m *DeleteServiceAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteServiceAccountRequest.Unmarshal(m, b)
 }
 func (m *DeleteServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteServiceAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteServiceAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteServiceAccountRequest.Merge(dst, src)
+func (m *DeleteServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceAccountRequest.Merge(m, src)
 }
 func (m *DeleteServiceAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteServiceAccountRequest.Size(m)
@@ -695,16 +717,17 @@ func (m *ListServiceAccountKeysRequest) Reset()         { *m = ListServiceAccoun
 func (m *ListServiceAccountKeysRequest) String() string { return proto.CompactTextString(m) }
 func (*ListServiceAccountKeysRequest) ProtoMessage()    {}
 func (*ListServiceAccountKeysRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{6}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{6}
 }
+
 func (m *ListServiceAccountKeysRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceAccountKeysRequest.Unmarshal(m, b)
 }
 func (m *ListServiceAccountKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceAccountKeysRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceAccountKeysRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceAccountKeysRequest.Merge(dst, src)
+func (m *ListServiceAccountKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountKeysRequest.Merge(m, src)
 }
 func (m *ListServiceAccountKeysRequest) XXX_Size() int {
 	return xxx_messageInfo_ListServiceAccountKeysRequest.Size(m)
@@ -742,16 +765,17 @@ func (m *ListServiceAccountKeysResponse) Reset()         { *m = ListServiceAccou
 func (m *ListServiceAccountKeysResponse) String() string { return proto.CompactTextString(m) }
 func (*ListServiceAccountKeysResponse) ProtoMessage()    {}
 func (*ListServiceAccountKeysResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{7}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{7}
 }
+
 func (m *ListServiceAccountKeysResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListServiceAccountKeysResponse.Unmarshal(m, b)
 }
 func (m *ListServiceAccountKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListServiceAccountKeysResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListServiceAccountKeysResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListServiceAccountKeysResponse.Merge(dst, src)
+func (m *ListServiceAccountKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountKeysResponse.Merge(m, src)
 }
 func (m *ListServiceAccountKeysResponse) XXX_Size() int {
 	return xxx_messageInfo_ListServiceAccountKeysResponse.Size(m)
@@ -790,16 +814,17 @@ func (m *GetServiceAccountKeyRequest) Reset()         { *m = GetServiceAccountKe
 func (m *GetServiceAccountKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetServiceAccountKeyRequest) ProtoMessage()    {}
 func (*GetServiceAccountKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{8}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{8}
 }
+
 func (m *GetServiceAccountKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetServiceAccountKeyRequest.Unmarshal(m, b)
 }
 func (m *GetServiceAccountKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetServiceAccountKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetServiceAccountKeyRequest.Merge(dst, src)
+func (m *GetServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceAccountKeyRequest.Merge(m, src)
 }
 func (m *GetServiceAccountKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetServiceAccountKeyRequest.Size(m)
@@ -876,16 +901,17 @@ func (m *ServiceAccountKey) Reset()         { *m = ServiceAccountKey{} }
 func (m *ServiceAccountKey) String() string { return proto.CompactTextString(m) }
 func (*ServiceAccountKey) ProtoMessage()    {}
 func (*ServiceAccountKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{9}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{9}
 }
+
 func (m *ServiceAccountKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServiceAccountKey.Unmarshal(m, b)
 }
 func (m *ServiceAccountKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServiceAccountKey.Marshal(b, m, deterministic)
 }
-func (dst *ServiceAccountKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceAccountKey.Merge(dst, src)
+func (m *ServiceAccountKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceAccountKey.Merge(m, src)
 }
 func (m *ServiceAccountKey) XXX_Size() int {
 	return xxx_messageInfo_ServiceAccountKey.Size(m)
@@ -969,16 +995,17 @@ func (m *CreateServiceAccountKeyRequest) Reset()         { *m = CreateServiceAcc
 func (m *CreateServiceAccountKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateServiceAccountKeyRequest) ProtoMessage()    {}
 func (*CreateServiceAccountKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{10}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{10}
 }
+
 func (m *CreateServiceAccountKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateServiceAccountKeyRequest.Unmarshal(m, b)
 }
 func (m *CreateServiceAccountKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateServiceAccountKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateServiceAccountKeyRequest.Merge(dst, src)
+func (m *CreateServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceAccountKeyRequest.Merge(m, src)
 }
 func (m *CreateServiceAccountKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateServiceAccountKeyRequest.Size(m)
@@ -1027,16 +1054,17 @@ func (m *DeleteServiceAccountKeyRequest) Reset()         { *m = DeleteServiceAcc
 func (m *DeleteServiceAccountKeyRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteServiceAccountKeyRequest) ProtoMessage()    {}
 func (*DeleteServiceAccountKeyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{11}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{11}
 }
+
 func (m *DeleteServiceAccountKeyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteServiceAccountKeyRequest.Unmarshal(m, b)
 }
 func (m *DeleteServiceAccountKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteServiceAccountKeyRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteServiceAccountKeyRequest.Merge(dst, src)
+func (m *DeleteServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceAccountKeyRequest.Merge(m, src)
 }
 func (m *DeleteServiceAccountKeyRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteServiceAccountKeyRequest.Size(m)
@@ -1073,16 +1101,17 @@ func (m *SignBlobRequest) Reset()         { *m = SignBlobRequest{} }
 func (m *SignBlobRequest) String() string { return proto.CompactTextString(m) }
 func (*SignBlobRequest) ProtoMessage()    {}
 func (*SignBlobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{12}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{12}
 }
+
 func (m *SignBlobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignBlobRequest.Unmarshal(m, b)
 }
 func (m *SignBlobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignBlobRequest.Marshal(b, m, deterministic)
 }
-func (dst *SignBlobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignBlobRequest.Merge(dst, src)
+func (m *SignBlobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignBlobRequest.Merge(m, src)
 }
 func (m *SignBlobRequest) XXX_Size() int {
 	return xxx_messageInfo_SignBlobRequest.Size(m)
@@ -1122,16 +1151,17 @@ func (m *SignBlobResponse) Reset()         { *m = SignBlobResponse{} }
 func (m *SignBlobResponse) String() string { return proto.CompactTextString(m) }
 func (*SignBlobResponse) ProtoMessage()    {}
 func (*SignBlobResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{13}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{13}
 }
+
 func (m *SignBlobResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignBlobResponse.Unmarshal(m, b)
 }
 func (m *SignBlobResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignBlobResponse.Marshal(b, m, deterministic)
 }
-func (dst *SignBlobResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignBlobResponse.Merge(dst, src)
+func (m *SignBlobResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignBlobResponse.Merge(m, src)
 }
 func (m *SignBlobResponse) XXX_Size() int {
 	return xxx_messageInfo_SignBlobResponse.Size(m)
@@ -1175,16 +1205,17 @@ func (m *SignJwtRequest) Reset()         { *m = SignJwtRequest{} }
 func (m *SignJwtRequest) String() string { return proto.CompactTextString(m) }
 func (*SignJwtRequest) ProtoMessage()    {}
 func (*SignJwtRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{14}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{14}
 }
+
 func (m *SignJwtRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignJwtRequest.Unmarshal(m, b)
 }
 func (m *SignJwtRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignJwtRequest.Marshal(b, m, deterministic)
 }
-func (dst *SignJwtRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignJwtRequest.Merge(dst, src)
+func (m *SignJwtRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignJwtRequest.Merge(m, src)
 }
 func (m *SignJwtRequest) XXX_Size() int {
 	return xxx_messageInfo_SignJwtRequest.Size(m)
@@ -1224,16 +1255,17 @@ func (m *SignJwtResponse) Reset()         { *m = SignJwtResponse{} }
 func (m *SignJwtResponse) String() string { return proto.CompactTextString(m) }
 func (*SignJwtResponse) ProtoMessage()    {}
 func (*SignJwtResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{15}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{15}
 }
+
 func (m *SignJwtResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignJwtResponse.Unmarshal(m, b)
 }
 func (m *SignJwtResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignJwtResponse.Marshal(b, m, deterministic)
 }
-func (dst *SignJwtResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignJwtResponse.Merge(dst, src)
+func (m *SignJwtResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignJwtResponse.Merge(m, src)
 }
 func (m *SignJwtResponse) XXX_Size() int {
 	return xxx_messageInfo_SignJwtResponse.Size(m)
@@ -1291,16 +1323,17 @@ func (m *Role) Reset()         { *m = Role{} }
 func (m *Role) String() string { return proto.CompactTextString(m) }
 func (*Role) ProtoMessage()    {}
 func (*Role) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{16}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{16}
 }
+
 func (m *Role) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Role.Unmarshal(m, b)
 }
 func (m *Role) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Role.Marshal(b, m, deterministic)
 }
-func (dst *Role) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Role.Merge(dst, src)
+func (m *Role) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Role.Merge(m, src)
 }
 func (m *Role) XXX_Size() int {
 	return xxx_messageInfo_Role.Size(m)
@@ -1383,16 +1416,17 @@ func (m *QueryGrantableRolesRequest) Reset()         { *m = QueryGrantableRolesR
 func (m *QueryGrantableRolesRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryGrantableRolesRequest) ProtoMessage()    {}
 func (*QueryGrantableRolesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{17}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{17}
 }
+
 func (m *QueryGrantableRolesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryGrantableRolesRequest.Unmarshal(m, b)
 }
 func (m *QueryGrantableRolesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryGrantableRolesRequest.Marshal(b, m, deterministic)
 }
-func (dst *QueryGrantableRolesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryGrantableRolesRequest.Merge(dst, src)
+func (m *QueryGrantableRolesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryGrantableRolesRequest.Merge(m, src)
 }
 func (m *QueryGrantableRolesRequest) XXX_Size() int {
 	return xxx_messageInfo_QueryGrantableRolesRequest.Size(m)
@@ -1447,16 +1481,17 @@ func (m *QueryGrantableRolesResponse) Reset()         { *m = QueryGrantableRoles
 func (m *QueryGrantableRolesResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryGrantableRolesResponse) ProtoMessage()    {}
 func (*QueryGrantableRolesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{18}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{18}
 }
+
 func (m *QueryGrantableRolesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryGrantableRolesResponse.Unmarshal(m, b)
 }
 func (m *QueryGrantableRolesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryGrantableRolesResponse.Marshal(b, m, deterministic)
 }
-func (dst *QueryGrantableRolesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryGrantableRolesResponse.Merge(dst, src)
+func (m *QueryGrantableRolesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryGrantableRolesResponse.Merge(m, src)
 }
 func (m *QueryGrantableRolesResponse) XXX_Size() int {
 	return xxx_messageInfo_QueryGrantableRolesResponse.Size(m)
@@ -1505,16 +1540,17 @@ func (m *ListRolesRequest) Reset()         { *m = ListRolesRequest{} }
 func (m *ListRolesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListRolesRequest) ProtoMessage()    {}
 func (*ListRolesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{19}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{19}
 }
+
 func (m *ListRolesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListRolesRequest.Unmarshal(m, b)
 }
 func (m *ListRolesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListRolesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListRolesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListRolesRequest.Merge(dst, src)
+func (m *ListRolesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListRolesRequest.Merge(m, src)
 }
 func (m *ListRolesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListRolesRequest.Size(m)
@@ -1576,16 +1612,17 @@ func (m *ListRolesResponse) Reset()         { *m = ListRolesResponse{} }
 func (m *ListRolesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListRolesResponse) ProtoMessage()    {}
 func (*ListRolesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{20}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{20}
 }
+
 func (m *ListRolesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListRolesResponse.Unmarshal(m, b)
 }
 func (m *ListRolesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListRolesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListRolesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListRolesResponse.Merge(dst, src)
+func (m *ListRolesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListRolesResponse.Merge(m, src)
 }
 func (m *ListRolesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListRolesResponse.Size(m)
@@ -1626,16 +1663,17 @@ func (m *GetRoleRequest) Reset()         { *m = GetRoleRequest{} }
 func (m *GetRoleRequest) String() string { return proto.CompactTextString(m) }
 func (*GetRoleRequest) ProtoMessage()    {}
 func (*GetRoleRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{21}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{21}
 }
+
 func (m *GetRoleRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetRoleRequest.Unmarshal(m, b)
 }
 func (m *GetRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetRoleRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetRoleRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetRoleRequest.Merge(dst, src)
+func (m *GetRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetRoleRequest.Merge(m, src)
 }
 func (m *GetRoleRequest) XXX_Size() int {
 	return xxx_messageInfo_GetRoleRequest.Size(m)
@@ -1672,16 +1710,17 @@ func (m *CreateRoleRequest) Reset()         { *m = CreateRoleRequest{} }
 func (m *CreateRoleRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateRoleRequest) ProtoMessage()    {}
 func (*CreateRoleRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{22}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{22}
 }
+
 func (m *CreateRoleRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateRoleRequest.Unmarshal(m, b)
 }
 func (m *CreateRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateRoleRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateRoleRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateRoleRequest.Merge(dst, src)
+func (m *CreateRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateRoleRequest.Merge(m, src)
 }
 func (m *CreateRoleRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateRoleRequest.Size(m)
@@ -1733,16 +1772,17 @@ func (m *UpdateRoleRequest) Reset()         { *m = UpdateRoleRequest{} }
 func (m *UpdateRoleRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateRoleRequest) ProtoMessage()    {}
 func (*UpdateRoleRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{23}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{23}
 }
+
 func (m *UpdateRoleRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateRoleRequest.Unmarshal(m, b)
 }
 func (m *UpdateRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateRoleRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateRoleRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateRoleRequest.Merge(dst, src)
+func (m *UpdateRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateRoleRequest.Merge(m, src)
 }
 func (m *UpdateRoleRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateRoleRequest.Size(m)
@@ -1791,16 +1831,17 @@ func (m *DeleteRoleRequest) Reset()         { *m = DeleteRoleRequest{} }
 func (m *DeleteRoleRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteRoleRequest) ProtoMessage()    {}
 func (*DeleteRoleRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{24}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{24}
 }
+
 func (m *DeleteRoleRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteRoleRequest.Unmarshal(m, b)
 }
 func (m *DeleteRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteRoleRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteRoleRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteRoleRequest.Merge(dst, src)
+func (m *DeleteRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteRoleRequest.Merge(m, src)
 }
 func (m *DeleteRoleRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteRoleRequest.Size(m)
@@ -1842,16 +1883,17 @@ func (m *UndeleteRoleRequest) Reset()         { *m = UndeleteRoleRequest{} }
 func (m *UndeleteRoleRequest) String() string { return proto.CompactTextString(m) }
 func (*UndeleteRoleRequest) ProtoMessage()    {}
 func (*UndeleteRoleRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{25}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{25}
 }
+
 func (m *UndeleteRoleRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UndeleteRoleRequest.Unmarshal(m, b)
 }
 func (m *UndeleteRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UndeleteRoleRequest.Marshal(b, m, deterministic)
 }
-func (dst *UndeleteRoleRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UndeleteRoleRequest.Merge(dst, src)
+func (m *UndeleteRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteRoleRequest.Merge(m, src)
 }
 func (m *UndeleteRoleRequest) XXX_Size() int {
 	return xxx_messageInfo_UndeleteRoleRequest.Size(m)
@@ -1899,16 +1941,17 @@ func (m *Permission) Reset()         { *m = Permission{} }
 func (m *Permission) String() string { return proto.CompactTextString(m) }
 func (*Permission) ProtoMessage()    {}
 func (*Permission) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{26}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{26}
 }
+
 func (m *Permission) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Permission.Unmarshal(m, b)
 }
 func (m *Permission) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Permission.Marshal(b, m, deterministic)
 }
-func (dst *Permission) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Permission.Merge(dst, src)
+func (m *Permission) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Permission.Merge(m, src)
 }
 func (m *Permission) XXX_Size() int {
 	return xxx_messageInfo_Permission.Size(m)
@@ -1984,16 +2027,17 @@ func (m *QueryTestablePermissionsRequest) Reset()         { *m = QueryTestablePe
 func (m *QueryTestablePermissionsRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryTestablePermissionsRequest) ProtoMessage()    {}
 func (*QueryTestablePermissionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{27}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{27}
 }
+
 func (m *QueryTestablePermissionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryTestablePermissionsRequest.Unmarshal(m, b)
 }
 func (m *QueryTestablePermissionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryTestablePermissionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *QueryTestablePermissionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryTestablePermissionsRequest.Merge(dst, src)
+func (m *QueryTestablePermissionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryTestablePermissionsRequest.Merge(m, src)
 }
 func (m *QueryTestablePermissionsRequest) XXX_Size() int {
 	return xxx_messageInfo_QueryTestablePermissionsRequest.Size(m)
@@ -2041,16 +2085,17 @@ func (m *QueryTestablePermissionsResponse) Reset()         { *m = QueryTestableP
 func (m *QueryTestablePermissionsResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryTestablePermissionsResponse) ProtoMessage()    {}
 func (*QueryTestablePermissionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_153c5ceb8e95593c, []int{28}
+	return fileDescriptor_8ffbc3f16f9a3a9d, []int{28}
 }
+
 func (m *QueryTestablePermissionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryTestablePermissionsResponse.Unmarshal(m, b)
 }
 func (m *QueryTestablePermissionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryTestablePermissionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *QueryTestablePermissionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryTestablePermissionsResponse.Merge(dst, src)
+func (m *QueryTestablePermissionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryTestablePermissionsResponse.Merge(m, src)
 }
 func (m *QueryTestablePermissionsResponse) XXX_Size() int {
 	return xxx_messageInfo_QueryTestablePermissionsResponse.Size(m)
@@ -2076,6 +2121,14 @@ func (m *QueryTestablePermissionsResponse) GetNextPageToken() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.iam.admin.v1.ServiceAccountKeyAlgorithm", ServiceAccountKeyAlgorithm_name, ServiceAccountKeyAlgorithm_value)
+	proto.RegisterEnum("google.iam.admin.v1.ServiceAccountPrivateKeyType", ServiceAccountPrivateKeyType_name, ServiceAccountPrivateKeyType_value)
+	proto.RegisterEnum("google.iam.admin.v1.ServiceAccountPublicKeyType", ServiceAccountPublicKeyType_name, ServiceAccountPublicKeyType_value)
+	proto.RegisterEnum("google.iam.admin.v1.RoleView", RoleView_name, RoleView_value)
+	proto.RegisterEnum("google.iam.admin.v1.ListServiceAccountKeysRequest_KeyType", ListServiceAccountKeysRequest_KeyType_name, ListServiceAccountKeysRequest_KeyType_value)
+	proto.RegisterEnum("google.iam.admin.v1.Role_RoleLaunchStage", Role_RoleLaunchStage_name, Role_RoleLaunchStage_value)
+	proto.RegisterEnum("google.iam.admin.v1.Permission_PermissionLaunchStage", Permission_PermissionLaunchStage_name, Permission_PermissionLaunchStage_value)
+	proto.RegisterEnum("google.iam.admin.v1.Permission_CustomRolesSupportLevel", Permission_CustomRolesSupportLevel_name, Permission_CustomRolesSupportLevel_value)
 	proto.RegisterType((*ServiceAccount)(nil), "google.iam.admin.v1.ServiceAccount")
 	proto.RegisterType((*CreateServiceAccountRequest)(nil), "google.iam.admin.v1.CreateServiceAccountRequest")
 	proto.RegisterType((*ListServiceAccountsRequest)(nil), "google.iam.admin.v1.ListServiceAccountsRequest")
@@ -2105,14 +2158,164 @@ func init() {
 	proto.RegisterType((*Permission)(nil), "google.iam.admin.v1.Permission")
 	proto.RegisterType((*QueryTestablePermissionsRequest)(nil), "google.iam.admin.v1.QueryTestablePermissionsRequest")
 	proto.RegisterType((*QueryTestablePermissionsResponse)(nil), "google.iam.admin.v1.QueryTestablePermissionsResponse")
-	proto.RegisterEnum("google.iam.admin.v1.ServiceAccountKeyAlgorithm", ServiceAccountKeyAlgorithm_name, ServiceAccountKeyAlgorithm_value)
-	proto.RegisterEnum("google.iam.admin.v1.ServiceAccountPrivateKeyType", ServiceAccountPrivateKeyType_name, ServiceAccountPrivateKeyType_value)
-	proto.RegisterEnum("google.iam.admin.v1.ServiceAccountPublicKeyType", ServiceAccountPublicKeyType_name, ServiceAccountPublicKeyType_value)
-	proto.RegisterEnum("google.iam.admin.v1.RoleView", RoleView_name, RoleView_value)
-	proto.RegisterEnum("google.iam.admin.v1.ListServiceAccountKeysRequest_KeyType", ListServiceAccountKeysRequest_KeyType_name, ListServiceAccountKeysRequest_KeyType_value)
-	proto.RegisterEnum("google.iam.admin.v1.Role_RoleLaunchStage", Role_RoleLaunchStage_name, Role_RoleLaunchStage_value)
-	proto.RegisterEnum("google.iam.admin.v1.Permission_PermissionLaunchStage", Permission_PermissionLaunchStage_name, Permission_PermissionLaunchStage_value)
-	proto.RegisterEnum("google.iam.admin.v1.Permission_CustomRolesSupportLevel", Permission_CustomRolesSupportLevel_name, Permission_CustomRolesSupportLevel_value)
+}
+
+func init() { proto.RegisterFile("google/iam/admin/v1/iam.proto", fileDescriptor_8ffbc3f16f9a3a9d) }
+
+var fileDescriptor_8ffbc3f16f9a3a9d = []byte{
+	// 2430 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5a, 0x4f, 0x73, 0xdb, 0xc6,
+	0x15, 0x37, 0x28, 0xea, 0x0f, 0x9f, 0x24, 0x0a, 0x5a, 0xc9, 0x16, 0x4b, 0x59, 0xb6, 0xb2, 0xb5,
+	0x1d, 0x99, 0xb5, 0x45, 0x89, 0x96, 0x6b, 0x57, 0x1e, 0x27, 0xa5, 0x44, 0x9a, 0xa1, 0x45, 0xcb,
+	0x2c, 0x48, 0x35, 0x71, 0xff, 0x0c, 0x06, 0x22, 0x56, 0x34, 0x22, 0x10, 0x80, 0x01, 0x50, 0x2a,
+	0x9d, 0x49, 0x67, 0xda, 0x43, 0x2f, 0x99, 0x76, 0xda, 0x49, 0x0e, 0x39, 0xa5, 0x33, 0xbd, 0xb4,
+	0xb7, 0x5e, 0x3a, 0xd3, 0x69, 0x27, 0xdf, 0xa0, 0xc7, 0x1e, 0xfa, 0x05, 0x32, 0xd3, 0xaf, 0xd0,
+	0x63, 0x67, 0x17, 0x80, 0x08, 0x92, 0x00, 0x04, 0x39, 0x69, 0x2f, 0x1a, 0xec, 0xfb, 0xfb, 0xdb,
+	0xb7, 0xbb, 0x6f, 0xdf, 0x3e, 0x0a, 0x56, 0xda, 0xba, 0xde, 0x56, 0x49, 0x5e, 0x91, 0x3a, 0x79,
+	0x49, 0xee, 0x28, 0x5a, 0xfe, 0x64, 0x93, 0x0e, 0xd6, 0x0d, 0x53, 0xb7, 0x75, 0xb4, 0xe0, 0xb0,
+	0xd7, 0x29, 0x85, 0xb1, 0xd7, 0x4f, 0x36, 0xb3, 0x57, 0x5d, 0x1d, 0xc9, 0x50, 0xf2, 0x92, 0xa6,
+	0xe9, 0xb6, 0x64, 0x2b, 0xba, 0x66, 0x39, 0x2a, 0xd9, 0x6b, 0x3e, 0x8b, 0x8e, 0x2d, 0xd1, 0xd0,
+	0x55, 0xa5, 0xd5, 0x73, 0xf9, 0xd9, 0x41, 0xfe, 0x00, 0x6f, 0xd9, 0xe5, 0xb1, 0xd1, 0x61, 0xf7,
+	0x28, 0x4f, 0x3a, 0x86, 0xed, 0x31, 0x57, 0x87, 0x99, 0x47, 0x0a, 0x51, 0x65, 0xb1, 0x23, 0x59,
+	0xc7, 0xae, 0xc4, 0xf5, 0x61, 0x09, 0x5b, 0xe9, 0x10, 0xcb, 0x96, 0x3a, 0x86, 0x23, 0x80, 0xff,
+	0xc5, 0x41, 0xba, 0x41, 0xcc, 0x13, 0xa5, 0x45, 0x8a, 0xad, 0x96, 0xde, 0xd5, 0x6c, 0x84, 0x20,
+	0xa9, 0x49, 0x1d, 0x92, 0xe1, 0x56, 0xb9, 0xb5, 0x94, 0xc0, 0xbe, 0xd1, 0x0a, 0x80, 0x61, 0xea,
+	0x1f, 0x92, 0x96, 0x2d, 0x2a, 0x72, 0x26, 0xc1, 0x38, 0x29, 0x97, 0x52, 0x95, 0xd1, 0x32, 0xa4,
+	0xba, 0x9a, 0xf2, 0xaa, 0x4b, 0x28, 0x37, 0xc9, 0xb8, 0x53, 0x0e, 0xa1, 0x2a, 0xa3, 0x45, 0x18,
+	0x27, 0x1d, 0x49, 0x51, 0x33, 0xe3, 0x8c, 0xe1, 0x0c, 0xd0, 0x5b, 0x30, 0x23, 0x2b, 0x96, 0xa1,
+	0x4a, 0x3d, 0x91, 0x79, 0x9b, 0x60, 0xcc, 0x69, 0x97, 0xb6, 0x4f, 0x9d, 0x22, 0x48, 0x12, 0x5b,
+	0x6a, 0x67, 0x26, 0x57, 0xb9, 0xb5, 0x19, 0x81, 0x7d, 0xa3, 0x35, 0xe0, 0x75, 0xa9, 0x6b, 0xbf,
+	0x2c, 0x88, 0x2d, 0x55, 0x21, 0x1a, 0x83, 0x93, 0x62, 0xaa, 0x69, 0x87, 0xbe, 0xcb, 0xc8, 0x55,
+	0x19, 0x7f, 0xc1, 0xc1, 0xf2, 0xae, 0x49, 0x24, 0x9b, 0x0c, 0xce, 0x4f, 0x20, 0xaf, 0xba, 0xc4,
+	0x0a, 0x9d, 0xa6, 0xe4, 0x48, 0xf9, 0xa6, 0xe9, 0x52, 0xaa, 0x32, 0xaa, 0xc1, 0x9c, 0xe5, 0xd8,
+	0x12, 0x5d, 0x62, 0x66, 0x6c, 0x95, 0x5b, 0x9b, 0x2e, 0x7c, 0x7b, 0x3d, 0x60, 0x57, 0xac, 0x0f,
+	0xf9, 0x4d, 0x5b, 0x03, 0x63, 0xac, 0x42, 0xb6, 0xa6, 0x58, 0xf6, 0xa0, 0x94, 0x15, 0x05, 0x6f,
+	0x19, 0x52, 0x86, 0xd4, 0x26, 0xa2, 0xa5, 0xbc, 0x26, 0x0c, 0xdd, 0xb8, 0x30, 0x45, 0x09, 0x0d,
+	0xe5, 0xb5, 0xb3, 0x44, 0x94, 0x69, 0xeb, 0xc7, 0x44, 0x63, 0xb8, 0xe8, 0x12, 0x49, 0x6d, 0xd2,
+	0xa4, 0x04, 0xfc, 0x2b, 0x0e, 0x96, 0x03, 0xdd, 0x59, 0x86, 0xae, 0x59, 0x04, 0xbd, 0x0b, 0x53,
+	0xee, 0x9c, 0xac, 0x0c, 0xb7, 0x3a, 0x16, 0x77, 0x52, 0x67, 0x4a, 0xe8, 0x16, 0xcc, 0x69, 0xe4,
+	0x67, 0xb6, 0xe8, 0x03, 0xe1, 0x04, 0x70, 0x96, 0x92, 0xeb, 0x67, 0x40, 0xd6, 0x21, 0x53, 0x21,
+	0x76, 0xec, 0x35, 0xc1, 0x9b, 0xb0, 0x5c, 0x22, 0x2a, 0xb9, 0xc0, 0x32, 0xd2, 0x4d, 0xbd, 0x32,
+	0x3a, 0xd7, 0x3d, 0xd2, 0x8b, 0x8c, 0xee, 0xfb, 0x90, 0x3a, 0x26, 0x3d, 0xd1, 0xee, 0x19, 0xc4,
+	0xca, 0x24, 0x56, 0xc7, 0xd6, 0xd2, 0x85, 0xed, 0xc0, 0x10, 0x44, 0x9a, 0x5e, 0xdf, 0x23, 0xbd,
+	0x66, 0xcf, 0x20, 0xc2, 0xd4, 0xb1, 0xf3, 0x61, 0xe1, 0x2a, 0x4c, 0xba, 0x44, 0x94, 0x81, 0xc5,
+	0xbd, 0xf2, 0x0b, 0xb1, 0xf9, 0xa2, 0x5e, 0x16, 0x0f, 0xf6, 0x1b, 0xf5, 0xf2, 0x6e, 0xf5, 0x49,
+	0xb5, 0x5c, 0xe2, 0x2f, 0x21, 0x1e, 0x66, 0x0e, 0x1a, 0x65, 0x41, 0x7c, 0x56, 0xdc, 0x2f, 0x56,
+	0xca, 0x25, 0x9e, 0x43, 0x08, 0xd2, 0x8d, 0x17, 0x8d, 0x66, 0xf9, 0xd9, 0x19, 0x2d, 0x81, 0x7f,
+	0x02, 0xd7, 0xc2, 0xbc, 0xbb, 0xeb, 0xb8, 0x0d, 0xc9, 0x63, 0xd2, 0xf3, 0xd6, 0xf0, 0x56, 0x8c,
+	0x35, 0xdc, 0x23, 0x3d, 0x81, 0xe9, 0xe0, 0x4f, 0x38, 0x58, 0x1e, 0x59, 0x1b, 0xca, 0x8e, 0x88,
+	0xda, 0x07, 0x30, 0x67, 0x74, 0x0f, 0x55, 0xa5, 0x25, 0x7a, 0xc1, 0x63, 0xcb, 0x9e, 0x2e, 0x6c,
+	0xc4, 0x70, 0x5d, 0x67, 0x9a, 0x5e, 0xc4, 0x66, 0x0d, 0xff, 0x10, 0xff, 0x7d, 0x0c, 0xe6, 0x47,
+	0xa0, 0x04, 0x62, 0xf8, 0x31, 0xf0, 0x86, 0xa9, 0x9c, 0x48, 0x36, 0x19, 0x06, 0xb1, 0x19, 0x07,
+	0x84, 0xa3, 0xea, 0xa1, 0x48, 0x1b, 0x03, 0x63, 0xd4, 0x84, 0x59, 0x6a, 0x54, 0x52, 0xdb, 0xba,
+	0xa9, 0xd8, 0x2f, 0x3b, 0x99, 0x29, 0x66, 0x39, 0x1f, 0x2f, 0xb2, 0x45, 0x4f, 0x4d, 0x98, 0x39,
+	0xf6, 0x8d, 0x68, 0x1e, 0xf3, 0x43, 0x96, 0x25, 0x5b, 0x62, 0x67, 0x76, 0xc6, 0xef, 0xbf, 0x24,
+	0xd9, 0x12, 0x3d, 0x57, 0xbe, 0x00, 0x33, 0x41, 0x27, 0x21, 0xf6, 0xc3, 0xc5, 0xe4, 0x4a, 0xc0,
+	0x9f, 0x48, 0xaa, 0x22, 0x8b, 0xd2, 0x91, 0x4d, 0x4c, 0x91, 0x26, 0x7a, 0x96, 0x8a, 0xa7, 0x0b,
+	0x59, 0x0f, 0xaa, 0x77, 0x0b, 0xac, 0x37, 0xbd, 0x5b, 0x40, 0x48, 0x33, 0x9d, 0x22, 0x55, 0xa1,
+	0x44, 0xf4, 0x04, 0xe6, 0x1d, 0x2b, 0x87, 0xe4, 0x48, 0x37, 0x89, 0x63, 0x66, 0xfc, 0x5c, 0x33,
+	0x73, 0x4c, 0x69, 0x87, 0xe9, 0x50, 0x2a, 0xfe, 0x37, 0x07, 0xd7, 0x82, 0xb2, 0xef, 0x39, 0xbb,
+	0xe9, 0xff, 0xbb, 0x92, 0x63, 0xdf, 0xc0, 0x4a, 0xe2, 0x2d, 0xb8, 0x16, 0x94, 0x9f, 0xa2, 0x27,
+	0x8a, 0xab, 0x30, 0xd7, 0x50, 0xda, 0xda, 0x8e, 0xaa, 0x1f, 0x46, 0xc5, 0x03, 0xc3, 0xec, 0x61,
+	0xcf, 0x26, 0x96, 0x68, 0xeb, 0xa2, 0xa5, 0xb4, 0x9d, 0x94, 0x3a, 0x23, 0x4c, 0x33, 0x62, 0x53,
+	0xa7, 0x26, 0x70, 0x05, 0xf8, 0xbe, 0x29, 0x37, 0x0b, 0x5c, 0x86, 0x09, 0x3a, 0x55, 0x45, 0x76,
+	0xad, 0x8d, 0x1f, 0x93, 0x5e, 0x55, 0x46, 0x57, 0x21, 0x45, 0xad, 0x48, 0x76, 0xd7, 0x24, 0xae,
+	0xa9, 0x3e, 0x01, 0xbf, 0x03, 0x69, 0x6a, 0xe8, 0xe9, 0x69, 0xe4, 0x1d, 0x99, 0x81, 0x49, 0x43,
+	0xea, 0xa9, 0xba, 0xe4, 0x5d, 0x90, 0xde, 0x10, 0x57, 0x9c, 0x39, 0x31, 0xfd, 0x68, 0x1c, 0x2b,
+	0x00, 0xd4, 0x2d, 0x91, 0xc5, 0x0f, 0x4f, 0x6d, 0xef, 0x9e, 0x75, 0x28, 0x4f, 0x4f, 0x6d, 0xfc,
+	0x8f, 0x04, 0x24, 0x05, 0x5d, 0x25, 0x81, 0xfe, 0x17, 0x61, 0xdc, 0x56, 0x6c, 0x95, 0xb8, 0x6a,
+	0xce, 0x00, 0xad, 0xc2, 0xb4, 0x4c, 0xac, 0x96, 0xa9, 0x18, 0xb4, 0xf2, 0x72, 0xaf, 0x3f, 0x3f,
+	0x09, 0x6d, 0xc2, 0xa2, 0xa2, 0xb5, 0xd4, 0xae, 0x4c, 0x64, 0xd1, 0x20, 0x66, 0x47, 0xb1, 0x2c,
+	0x5a, 0xa3, 0x65, 0x26, 0x57, 0xc7, 0xd6, 0x52, 0xc2, 0x82, 0xc7, 0xab, 0xf7, 0x59, 0xe8, 0x5d,
+	0x18, 0xb7, 0x6c, 0xa9, 0x4d, 0xdc, 0x23, 0x7f, 0x3b, 0x70, 0xa3, 0x50, 0xa0, 0xec, 0x4f, 0x4d,
+	0xea, 0x6a, 0xad, 0x97, 0x0d, 0xaa, 0x20, 0x38, 0x7a, 0x67, 0x15, 0x4c, 0xca, 0x57, 0xc1, 0x64,
+	0x60, 0x52, 0x66, 0xfb, 0x45, 0xce, 0x4c, 0xaf, 0x72, 0x6b, 0x53, 0x82, 0x37, 0xc4, 0x07, 0x30,
+	0x37, 0x64, 0x07, 0xa5, 0x60, 0xbc, 0x58, 0xab, 0xbf, 0x57, 0xe4, 0x2f, 0xa1, 0x29, 0x48, 0xee,
+	0x94, 0x9b, 0x45, 0x9e, 0x43, 0x13, 0x90, 0xa8, 0x14, 0xf9, 0x04, 0x4a, 0x03, 0x94, 0xca, 0x75,
+	0xa1, 0xbc, 0x5b, 0x6c, 0x96, 0x4b, 0x7c, 0x12, 0xcd, 0xc0, 0x54, 0xa9, 0xda, 0x28, 0xee, 0xd4,
+	0xca, 0x25, 0x7e, 0x1c, 0x4d, 0xc2, 0x58, 0xb9, 0x58, 0xe7, 0x27, 0xf0, 0xdf, 0x38, 0xc8, 0xfe,
+	0xa0, 0x4b, 0xcc, 0x5e, 0xc5, 0x94, 0x34, 0x5b, 0x3a, 0x54, 0x09, 0xf5, 0x72, 0x76, 0x15, 0xde,
+	0x01, 0x74, 0xd4, 0x55, 0x55, 0xd1, 0x24, 0x96, 0xde, 0x35, 0x5b, 0x44, 0xf4, 0x45, 0x9c, 0xa7,
+	0x1c, 0xc1, 0x65, 0xb0, 0x9a, 0x6c, 0x13, 0x92, 0x27, 0x0a, 0x39, 0x75, 0x0f, 0xe5, 0x4a, 0x68,
+	0x44, 0x7e, 0xa8, 0x90, 0x53, 0x81, 0x89, 0x0e, 0x56, 0x2d, 0x63, 0x91, 0x55, 0x4b, 0x72, 0xb8,
+	0x6a, 0x39, 0x81, 0xe5, 0x40, 0xe8, 0xee, 0xf6, 0xca, 0xc3, 0xb8, 0x49, 0x09, 0xee, 0x6d, 0xf7,
+	0xad, 0x50, 0x38, 0x82, 0x23, 0x17, 0xbb, 0x48, 0xf9, 0x92, 0x03, 0x9e, 0x5e, 0xb4, 0x03, 0x91,
+	0xba, 0x02, 0x13, 0x86, 0x64, 0x12, 0xcd, 0x76, 0xa3, 0xe3, 0x8e, 0xbe, 0x4e, 0x59, 0x76, 0x16,
+	0xcf, 0x64, 0xfc, 0x78, 0xbe, 0x05, 0x33, 0xd6, 0x4b, 0xfd, 0x54, 0xf4, 0x76, 0xd1, 0x04, 0xdb,
+	0x45, 0xd3, 0x94, 0x56, 0x72, 0x77, 0x92, 0x0a, 0xf3, 0x3e, 0xf4, 0xff, 0xeb, 0x60, 0xdd, 0x80,
+	0x74, 0x85, 0x30, 0x67, 0x51, 0x19, 0xcf, 0x82, 0x79, 0xe7, 0x42, 0xf0, 0x0b, 0x86, 0x85, 0x74,
+	0x09, 0x26, 0x29, 0x86, 0x7e, 0x15, 0x3e, 0x41, 0x87, 0x55, 0x19, 0xdd, 0x85, 0x24, 0xfd, 0x72,
+	0xeb, 0xee, 0x88, 0x39, 0x30, 0x31, 0xfc, 0x29, 0x07, 0xf3, 0x07, 0x86, 0x3c, 0xe4, 0x35, 0x28,
+	0xad, 0x78, 0x86, 0x13, 0xb1, 0x0c, 0xa3, 0x47, 0x30, 0xdd, 0x65, 0x76, 0xd9, 0x6b, 0xcb, 0x85,
+	0x33, 0x7a, 0x43, 0x3e, 0xa1, 0x0f, 0xb2, 0x67, 0x92, 0x75, 0x2c, 0x80, 0x23, 0x4e, 0xbf, 0xf1,
+	0x23, 0x98, 0x77, 0x56, 0xea, 0x3c, 0x50, 0x5e, 0xfe, 0x48, 0xf4, 0xf3, 0x07, 0x7e, 0x0c, 0x0b,
+	0x07, 0x9a, 0xfc, 0xc6, 0xea, 0x5f, 0x8d, 0x01, 0xf4, 0x73, 0xdc, 0x37, 0x9a, 0x61, 0x1f, 0x40,
+	0x46, 0xd7, 0xd4, 0x9e, 0xa8, 0x68, 0xa2, 0x61, 0x12, 0x99, 0x1c, 0x29, 0x34, 0xc3, 0x3b, 0x7b,
+	0x2e, 0xc9, 0x36, 0xe9, 0x65, 0xca, 0xaf, 0x6a, 0xf5, 0x33, 0x2e, 0xdb, 0xa1, 0x68, 0xcf, 0xcb,
+	0xb3, 0xe3, 0xec, 0x14, 0xdc, 0x0f, 0x0c, 0x7e, 0x1f, 0xb4, 0xef, 0x33, 0x20, 0xe7, 0xda, 0x90,
+	0x6d, 0x75, 0x2d, 0x5b, 0xef, 0x38, 0x9e, 0x45, 0xab, 0x6b, 0x18, 0xba, 0x69, 0x8b, 0x2a, 0x39,
+	0x21, 0x2a, 0x3b, 0x2c, 0xe9, 0xc2, 0x83, 0xf3, 0x3c, 0xec, 0x32, 0x0b, 0x0c, 0x5d, 0xc3, 0xd1,
+	0xaf, 0x51, 0x75, 0x61, 0xa9, 0x15, 0xcc, 0xc0, 0x25, 0xb8, 0x1c, 0x88, 0xea, 0x22, 0x19, 0x7c,
+	0x0c, 0xbf, 0x07, 0x4b, 0x21, 0x9e, 0xd1, 0x2c, 0xa4, 0x1a, 0x07, 0xf5, 0xfa, 0x73, 0xa1, 0xc9,
+	0x9e, 0x0b, 0xd3, 0x30, 0xd9, 0x2c, 0x37, 0x9a, 0xd5, 0xfd, 0x0a, 0xcf, 0xa1, 0x79, 0x98, 0xdd,
+	0x7f, 0xde, 0x14, 0xfb, 0xfc, 0x04, 0x2d, 0xe5, 0xaf, 0xb3, 0xcc, 0xd9, 0xa4, 0x15, 0xda, 0xa1,
+	0x4a, 0x7c, 0xf7, 0xda, 0x9b, 0x65, 0xfe, 0xaf, 0xf3, 0xf8, 0xfc, 0x35, 0x07, 0xab, 0xe1, 0x68,
+	0xdc, 0xfc, 0x54, 0x84, 0x69, 0xff, 0xbd, 0xec, 0x64, 0xa9, 0xeb, 0xe7, 0xac, 0x94, 0xe0, 0xd7,
+	0x89, 0x9b, 0xb1, 0x72, 0x12, 0x64, 0xc3, 0xeb, 0x3b, 0xb4, 0x04, 0x0b, 0xf4, 0x91, 0x56, 0xac,
+	0x55, 0x86, 0xde, 0x68, 0x8b, 0xc0, 0x7b, 0x0c, 0xa1, 0x51, 0x14, 0x37, 0x37, 0x0a, 0x5b, 0x3c,
+	0x37, 0x4c, 0x2d, 0x6c, 0x6c, 0x3d, 0xe4, 0x13, 0x39, 0x15, 0xae, 0x46, 0x15, 0xa7, 0x54, 0x2b,
+	0xe0, 0x15, 0xe8, 0x51, 0xeb, 0x7b, 0xbb, 0x8d, 0xcd, 0x82, 0xf8, 0xa4, 0x5a, 0x2b, 0xf3, 0x1c,
+	0x5a, 0x85, 0xab, 0x8c, 0x5a, 0x79, 0xfe, 0xbc, 0x52, 0x2b, 0x8b, 0xbb, 0x42, 0xb9, 0x54, 0xde,
+	0x6f, 0x56, 0x8b, 0xb5, 0x86, 0x23, 0x91, 0xc8, 0xfd, 0x14, 0x96, 0x23, 0x5e, 0x56, 0x74, 0xf3,
+	0x30, 0x03, 0xfb, 0xcf, 0xf7, 0xcb, 0xfc, 0x25, 0x74, 0x05, 0x10, 0x1b, 0x7e, 0x70, 0x7f, 0xe3,
+	0x7b, 0x62, 0xbd, 0xfc, 0xcc, 0xf3, 0xb3, 0x04, 0x0b, 0x8c, 0x2e, 0x14, 0xdf, 0x17, 0xeb, 0x07,
+	0x3b, 0xb5, 0xea, 0xae, 0xb8, 0x57, 0x7e, 0xc1, 0x27, 0x72, 0xd7, 0x61, 0xca, 0xbb, 0x84, 0xe8,
+	0x86, 0xde, 0x29, 0x36, 0xaa, 0xbb, 0xce, 0x86, 0x7e, 0x72, 0x50, 0xab, 0xf1, 0x5c, 0xe1, 0xf3,
+	0x2c, 0x8c, 0x55, 0x8b, 0xcf, 0xd0, 0x1f, 0x39, 0x58, 0x08, 0xe8, 0x32, 0xa0, 0x7c, 0xcc, 0x87,
+	0xb4, 0xb7, 0x37, 0xb3, 0x1b, 0xf1, 0x15, 0x9c, 0xed, 0x83, 0xef, 0xfe, 0xf2, 0x9f, 0x5f, 0x7d,
+	0x9a, 0x78, 0x1b, 0xdd, 0xcc, 0x9f, 0x6c, 0xe6, 0x3f, 0xa2, 0x5b, 0xf9, 0xb1, 0xdb, 0xa0, 0xb2,
+	0xf2, 0xb9, 0x8f, 0xf3, 0xd6, 0x10, 0xa2, 0xcf, 0x39, 0x98, 0x1f, 0x79, 0xeb, 0xa2, 0xbb, 0x81,
+	0x6e, 0xc3, 0xfa, 0x15, 0xd9, 0x38, 0x2d, 0x12, 0x9c, 0x67, 0xc0, 0x6e, 0xa3, 0xb7, 0x83, 0x80,
+	0x0d, 0xe3, 0xca, 0xe7, 0x3e, 0x46, 0xbf, 0xe7, 0x60, 0x31, 0xe8, 0xed, 0x84, 0x82, 0x83, 0x12,
+	0xd1, 0xe4, 0x8a, 0x07, 0x70, 0x83, 0x01, 0xcc, 0xe1, 0x78, 0x91, 0xdb, 0xe6, 0x72, 0xe8, 0x33,
+	0x0e, 0x16, 0x9d, 0x6b, 0x75, 0x08, 0x61, 0x1c, 0x7f, 0xf1, 0x40, 0x15, 0x18, 0xa8, 0x3b, 0xd9,
+	0xb8, 0x51, 0xa3, 0xb0, 0x7e, 0xc7, 0xc1, 0x62, 0xd0, 0x5b, 0x2c, 0x24, 0x70, 0x11, 0x6d, 0xa5,
+	0xec, 0x95, 0x91, 0xab, 0xbc, 0xdc, 0x31, 0xec, 0x9e, 0xb7, 0x98, 0xb9, 0xd8, 0x8b, 0xf9, 0x57,
+	0x0e, 0xae, 0x04, 0xb7, 0x6c, 0x50, 0xe1, 0xe2, 0xdd, 0xa5, 0xec, 0xbd, 0x0b, 0xe9, 0xb8, 0x47,
+	0x63, 0x8b, 0x81, 0x5e, 0x47, 0x77, 0x62, 0x82, 0xce, 0x1f, 0x53, 0x78, 0x7f, 0xe2, 0x60, 0x31,
+	0xa8, 0x1b, 0x14, 0x12, 0xcd, 0x88, 0xc6, 0x51, 0x36, 0x66, 0x1b, 0x0a, 0x7f, 0x97, 0x01, 0xdd,
+	0x40, 0xeb, 0xf1, 0x80, 0x32, 0x9c, 0x34, 0xc8, 0x7f, 0xe6, 0x60, 0x29, 0xa4, 0xdb, 0x80, 0xee,
+	0xc5, 0x3e, 0x34, 0x6f, 0x00, 0xf8, 0x01, 0x03, 0xbc, 0x89, 0x2f, 0x14, 0x59, 0xba, 0x55, 0xbf,
+	0xe0, 0x60, 0x29, 0xa4, 0x6d, 0x10, 0x82, 0x38, 0xba, 0xc9, 0x10, 0xba, 0x61, 0xdd, 0x90, 0xe6,
+	0x2e, 0x1a, 0xd2, 0xcf, 0x38, 0x98, 0xf2, 0xda, 0x0a, 0xe8, 0x46, 0x70, 0x38, 0x06, 0x1b, 0x18,
+	0xd9, 0x9b, 0xe7, 0x48, 0xb9, 0xbb, 0xf1, 0x11, 0x43, 0x74, 0x1f, 0x6f, 0xc4, 0x3d, 0xd9, 0x96,
+	0x6b, 0x81, 0xc6, 0xed, 0xb7, 0x1c, 0x4c, 0xba, 0x4d, 0x86, 0xb0, 0x64, 0x33, 0xd0, 0xc2, 0xc8,
+	0xde, 0x88, 0x16, 0x72, 0x31, 0x6d, 0x33, 0x4c, 0x5b, 0x38, 0x7f, 0x11, 0x4c, 0x4f, 0x4f, 0x6d,
+	0x0a, 0xe9, 0x13, 0x0e, 0x66, 0x2a, 0xc4, 0xae, 0x4a, 0x9d, 0x3a, 0xfb, 0xe5, 0x06, 0x61, 0xbf,
+	0x4b, 0xe7, 0x64, 0x9c, 0x31, 0x3d, 0x58, 0x97, 0x87, 0x64, 0x1c, 0x2e, 0xfe, 0x3e, 0xc3, 0xb1,
+	0x8d, 0x1f, 0x32, 0x1c, 0x5e, 0x61, 0x76, 0x0e, 0x96, 0xb6, 0xdf, 0xf9, 0x6f, 0x38, 0x98, 0x69,
+	0x44, 0xa1, 0x69, 0xc4, 0x47, 0xb3, 0xcb, 0xd0, 0x3c, 0xbe, 0x18, 0x1a, 0xcb, 0x67, 0x9f, 0x86,
+	0xe7, 0x2f, 0x1c, 0x20, 0x5a, 0xf6, 0x51, 0xa2, 0xaf, 0x54, 0x5b, 0x1b, 0x72, 0x39, 0x2a, 0xe2,
+	0x81, 0xbb, 0x1d, 0x43, 0xd2, 0x5d, 0xc6, 0x2a, 0x03, 0xbc, 0x8b, 0xdf, 0xb9, 0x08, 0x60, 0x7b,
+	0xc4, 0x1e, 0x85, 0xfd, 0x07, 0x0e, 0x16, 0x02, 0x5a, 0x0f, 0x21, 0x95, 0x4c, 0x78, 0x7f, 0x25,
+	0xa4, 0x92, 0x89, 0xe8, 0x6a, 0xe0, 0x35, 0x36, 0x0b, 0x8c, 0x57, 0xe8, 0x2c, 0xd8, 0x23, 0x66,
+	0xfb, 0xd5, 0xa8, 0x38, 0x05, 0xd9, 0x81, 0xd4, 0xd9, 0x3b, 0x1f, 0xdd, 0x0c, 0xbd, 0x1a, 0x06,
+	0xf0, 0xdc, 0x3a, 0x4f, 0xcc, 0x45, 0x31, 0xcf, 0x50, 0x4c, 0xa3, 0xd4, 0x19, 0x0a, 0x44, 0x60,
+	0xd2, 0x7d, 0xe8, 0x87, 0x9c, 0xbd, 0xc1, 0x36, 0x40, 0x36, 0xfc, 0x15, 0x8d, 0xb3, 0xcc, 0xfa,
+	0x22, 0x42, 0xfd, 0x03, 0xc7, 0x7c, 0xd0, 0xd4, 0xf3, 0x73, 0x80, 0x7e, 0xa7, 0x00, 0xdd, 0x8a,
+	0xc8, 0xdf, 0x31, 0x9d, 0xb9, 0xa5, 0x21, 0xc6, 0xcc, 0x99, 0xd3, 0x62, 0x78, 0xac, 0x9b, 0x6d,
+	0x49, 0x53, 0x5e, 0x3b, 0xbf, 0xd4, 0xd2, 0xd4, 0x6c, 0x7a, 0x51, 0xfd, 0x05, 0x07, 0xd0, 0x6f,
+	0x1a, 0x84, 0x00, 0x18, 0xe9, 0x2a, 0x44, 0x01, 0x70, 0x2b, 0xac, 0x02, 0xee, 0xcf, 0x76, 0xc8,
+	0x7d, 0xde, 0x9b, 0xfd, 0xb6, 0xd3, 0x5f, 0xf8, 0x08, 0xa0, 0xdf, 0x22, 0x08, 0x81, 0x30, 0xd2,
+	0x43, 0x88, 0x82, 0x90, 0x63, 0x10, 0x6e, 0xe4, 0x62, 0x40, 0x60, 0x19, 0xcd, 0xdf, 0x63, 0x18,
+	0x3c, 0xac, 0xfd, 0x10, 0x8c, 0xb6, 0x21, 0xa2, 0x10, 0xb8, 0x37, 0x11, 0xfe, 0x4e, 0x8c, 0x20,
+	0x74, 0x5d, 0xd3, 0x74, 0x39, 0xbe, 0xe4, 0x20, 0x13, 0xf6, 0x78, 0x44, 0x5b, 0xe1, 0xa7, 0x2b,
+	0xfc, 0xe5, 0x9b, 0xbd, 0x7f, 0x41, 0x2d, 0xf7, 0x48, 0xdc, 0x63, 0x33, 0xb8, 0x8b, 0xd7, 0xd8,
+	0xcf, 0xf4, 0xbe, 0x7c, 0xf1, 0x2a, 0x44, 0x73, 0x9b, 0xcb, 0xed, 0x1c, 0xc2, 0x52, 0x4b, 0xef,
+	0x04, 0x39, 0xdc, 0x99, 0xa2, 0x69, 0x87, 0x5e, 0xd7, 0x75, 0xee, 0x47, 0x0f, 0x5d, 0x81, 0xb6,
+	0xae, 0x4a, 0x5a, 0x7b, 0x5d, 0x37, 0xdb, 0xf9, 0x36, 0xd1, 0xd8, 0x65, 0x9e, 0x77, 0x58, 0x92,
+	0xa1, 0x58, 0x03, 0xff, 0x95, 0xf0, 0x88, 0x7d, 0xfc, 0x87, 0xe3, 0x0e, 0x27, 0x98, 0xdc, 0xbd,
+	0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x75, 0xcc, 0x0e, 0xa5, 0xbc, 0x20, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2969,161 +3172,3 @@ var _IAM_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/iam/admin/v1/iam.proto",
 }
-
-func init() { proto.RegisterFile("google/iam/admin/v1/iam.proto", fileDescriptor_iam_153c5ceb8e95593c) }
-
-var fileDescriptor_iam_153c5ceb8e95593c = []byte{
-	// 2430 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5a, 0x4f, 0x73, 0xdb, 0xc6,
-	0x15, 0x37, 0x28, 0xea, 0x0f, 0x9f, 0x24, 0x0a, 0x5a, 0xc9, 0x16, 0x4b, 0x59, 0xb6, 0xb2, 0xb5,
-	0x1d, 0x99, 0xb5, 0x45, 0x89, 0x96, 0x6b, 0x57, 0x1e, 0x27, 0xa5, 0x44, 0x9a, 0xa1, 0x45, 0xcb,
-	0x2c, 0x48, 0x35, 0x71, 0xff, 0x0c, 0x06, 0x22, 0x56, 0x34, 0x22, 0x10, 0x80, 0x01, 0x50, 0x2a,
-	0x9d, 0x49, 0x67, 0xda, 0x43, 0x2f, 0x99, 0x76, 0xda, 0x49, 0x0e, 0x39, 0xa5, 0x33, 0xbd, 0xb4,
-	0xb7, 0x5e, 0x3a, 0xd3, 0x69, 0x27, 0xdf, 0xa0, 0xc7, 0x1e, 0xfa, 0x05, 0x32, 0xd3, 0xaf, 0xd0,
-	0x63, 0x67, 0x17, 0x80, 0x08, 0x92, 0x00, 0x04, 0x39, 0x69, 0x2f, 0x1a, 0xec, 0xfb, 0xfb, 0xdb,
-	0xb7, 0xbb, 0x6f, 0xdf, 0x3e, 0x0a, 0x56, 0xda, 0xba, 0xde, 0x56, 0x49, 0x5e, 0x91, 0x3a, 0x79,
-	0x49, 0xee, 0x28, 0x5a, 0xfe, 0x64, 0x93, 0x0e, 0xd6, 0x0d, 0x53, 0xb7, 0x75, 0xb4, 0xe0, 0xb0,
-	0xd7, 0x29, 0x85, 0xb1, 0xd7, 0x4f, 0x36, 0xb3, 0x57, 0x5d, 0x1d, 0xc9, 0x50, 0xf2, 0x92, 0xa6,
-	0xe9, 0xb6, 0x64, 0x2b, 0xba, 0x66, 0x39, 0x2a, 0xd9, 0x6b, 0x3e, 0x8b, 0x8e, 0x2d, 0xd1, 0xd0,
-	0x55, 0xa5, 0xd5, 0x73, 0xf9, 0xd9, 0x41, 0xfe, 0x00, 0x6f, 0xd9, 0xe5, 0xb1, 0xd1, 0x61, 0xf7,
-	0x28, 0x4f, 0x3a, 0x86, 0xed, 0x31, 0x57, 0x87, 0x99, 0x47, 0x0a, 0x51, 0x65, 0xb1, 0x23, 0x59,
-	0xc7, 0xae, 0xc4, 0xf5, 0x61, 0x09, 0x5b, 0xe9, 0x10, 0xcb, 0x96, 0x3a, 0x86, 0x23, 0x80, 0xff,
-	0xc5, 0x41, 0xba, 0x41, 0xcc, 0x13, 0xa5, 0x45, 0x8a, 0xad, 0x96, 0xde, 0xd5, 0x6c, 0x84, 0x20,
-	0xa9, 0x49, 0x1d, 0x92, 0xe1, 0x56, 0xb9, 0xb5, 0x94, 0xc0, 0xbe, 0xd1, 0x0a, 0x80, 0x61, 0xea,
-	0x1f, 0x92, 0x96, 0x2d, 0x2a, 0x72, 0x26, 0xc1, 0x38, 0x29, 0x97, 0x52, 0x95, 0xd1, 0x32, 0xa4,
-	0xba, 0x9a, 0xf2, 0xaa, 0x4b, 0x28, 0x37, 0xc9, 0xb8, 0x53, 0x0e, 0xa1, 0x2a, 0xa3, 0x45, 0x18,
-	0x27, 0x1d, 0x49, 0x51, 0x33, 0xe3, 0x8c, 0xe1, 0x0c, 0xd0, 0x5b, 0x30, 0x23, 0x2b, 0x96, 0xa1,
-	0x4a, 0x3d, 0x91, 0x79, 0x9b, 0x60, 0xcc, 0x69, 0x97, 0xb6, 0x4f, 0x9d, 0x22, 0x48, 0x12, 0x5b,
-	0x6a, 0x67, 0x26, 0x57, 0xb9, 0xb5, 0x19, 0x81, 0x7d, 0xa3, 0x35, 0xe0, 0x75, 0xa9, 0x6b, 0xbf,
-	0x2c, 0x88, 0x2d, 0x55, 0x21, 0x1a, 0x83, 0x93, 0x62, 0xaa, 0x69, 0x87, 0xbe, 0xcb, 0xc8, 0x55,
-	0x19, 0x7f, 0xc1, 0xc1, 0xf2, 0xae, 0x49, 0x24, 0x9b, 0x0c, 0xce, 0x4f, 0x20, 0xaf, 0xba, 0xc4,
-	0x0a, 0x9d, 0xa6, 0xe4, 0x48, 0xf9, 0xa6, 0xe9, 0x52, 0xaa, 0x32, 0xaa, 0xc1, 0x9c, 0xe5, 0xd8,
-	0x12, 0x5d, 0x62, 0x66, 0x6c, 0x95, 0x5b, 0x9b, 0x2e, 0x7c, 0x7b, 0x3d, 0x60, 0x57, 0xac, 0x0f,
-	0xf9, 0x4d, 0x5b, 0x03, 0x63, 0xac, 0x42, 0xb6, 0xa6, 0x58, 0xf6, 0xa0, 0x94, 0x15, 0x05, 0x6f,
-	0x19, 0x52, 0x86, 0xd4, 0x26, 0xa2, 0xa5, 0xbc, 0x26, 0x0c, 0xdd, 0xb8, 0x30, 0x45, 0x09, 0x0d,
-	0xe5, 0xb5, 0xb3, 0x44, 0x94, 0x69, 0xeb, 0xc7, 0x44, 0x63, 0xb8, 0xe8, 0x12, 0x49, 0x6d, 0xd2,
-	0xa4, 0x04, 0xfc, 0x2b, 0x0e, 0x96, 0x03, 0xdd, 0x59, 0x86, 0xae, 0x59, 0x04, 0xbd, 0x0b, 0x53,
-	0xee, 0x9c, 0xac, 0x0c, 0xb7, 0x3a, 0x16, 0x77, 0x52, 0x67, 0x4a, 0xe8, 0x16, 0xcc, 0x69, 0xe4,
-	0x67, 0xb6, 0xe8, 0x03, 0xe1, 0x04, 0x70, 0x96, 0x92, 0xeb, 0x67, 0x40, 0xd6, 0x21, 0x53, 0x21,
-	0x76, 0xec, 0x35, 0xc1, 0x9b, 0xb0, 0x5c, 0x22, 0x2a, 0xb9, 0xc0, 0x32, 0xd2, 0x4d, 0xbd, 0x32,
-	0x3a, 0xd7, 0x3d, 0xd2, 0x8b, 0x8c, 0xee, 0xfb, 0x90, 0x3a, 0x26, 0x3d, 0xd1, 0xee, 0x19, 0xc4,
-	0xca, 0x24, 0x56, 0xc7, 0xd6, 0xd2, 0x85, 0xed, 0xc0, 0x10, 0x44, 0x9a, 0x5e, 0xdf, 0x23, 0xbd,
-	0x66, 0xcf, 0x20, 0xc2, 0xd4, 0xb1, 0xf3, 0x61, 0xe1, 0x2a, 0x4c, 0xba, 0x44, 0x94, 0x81, 0xc5,
-	0xbd, 0xf2, 0x0b, 0xb1, 0xf9, 0xa2, 0x5e, 0x16, 0x0f, 0xf6, 0x1b, 0xf5, 0xf2, 0x6e, 0xf5, 0x49,
-	0xb5, 0x5c, 0xe2, 0x2f, 0x21, 0x1e, 0x66, 0x0e, 0x1a, 0x65, 0x41, 0x7c, 0x56, 0xdc, 0x2f, 0x56,
-	0xca, 0x25, 0x9e, 0x43, 0x08, 0xd2, 0x8d, 0x17, 0x8d, 0x66, 0xf9, 0xd9, 0x19, 0x2d, 0x81, 0x7f,
-	0x02, 0xd7, 0xc2, 0xbc, 0xbb, 0xeb, 0xb8, 0x0d, 0xc9, 0x63, 0xd2, 0xf3, 0xd6, 0xf0, 0x56, 0x8c,
-	0x35, 0xdc, 0x23, 0x3d, 0x81, 0xe9, 0xe0, 0x4f, 0x38, 0x58, 0x1e, 0x59, 0x1b, 0xca, 0x8e, 0x88,
-	0xda, 0x07, 0x30, 0x67, 0x74, 0x0f, 0x55, 0xa5, 0x25, 0x7a, 0xc1, 0x63, 0xcb, 0x9e, 0x2e, 0x6c,
-	0xc4, 0x70, 0x5d, 0x67, 0x9a, 0x5e, 0xc4, 0x66, 0x0d, 0xff, 0x10, 0xff, 0x7d, 0x0c, 0xe6, 0x47,
-	0xa0, 0x04, 0x62, 0xf8, 0x31, 0xf0, 0x86, 0xa9, 0x9c, 0x48, 0x36, 0x19, 0x06, 0xb1, 0x19, 0x07,
-	0x84, 0xa3, 0xea, 0xa1, 0x48, 0x1b, 0x03, 0x63, 0xd4, 0x84, 0x59, 0x6a, 0x54, 0x52, 0xdb, 0xba,
-	0xa9, 0xd8, 0x2f, 0x3b, 0x99, 0x29, 0x66, 0x39, 0x1f, 0x2f, 0xb2, 0x45, 0x4f, 0x4d, 0x98, 0x39,
-	0xf6, 0x8d, 0x68, 0x1e, 0xf3, 0x43, 0x96, 0x25, 0x5b, 0x62, 0x67, 0x76, 0xc6, 0xef, 0xbf, 0x24,
-	0xd9, 0x12, 0x3d, 0x57, 0xbe, 0x00, 0x33, 0x41, 0x27, 0x21, 0xf6, 0xc3, 0xc5, 0xe4, 0x4a, 0xc0,
-	0x9f, 0x48, 0xaa, 0x22, 0x8b, 0xd2, 0x91, 0x4d, 0x4c, 0x91, 0x26, 0x7a, 0x96, 0x8a, 0xa7, 0x0b,
-	0x59, 0x0f, 0xaa, 0x77, 0x0b, 0xac, 0x37, 0xbd, 0x5b, 0x40, 0x48, 0x33, 0x9d, 0x22, 0x55, 0xa1,
-	0x44, 0xf4, 0x04, 0xe6, 0x1d, 0x2b, 0x87, 0xe4, 0x48, 0x37, 0x89, 0x63, 0x66, 0xfc, 0x5c, 0x33,
-	0x73, 0x4c, 0x69, 0x87, 0xe9, 0x50, 0x2a, 0xfe, 0x37, 0x07, 0xd7, 0x82, 0xb2, 0xef, 0x39, 0xbb,
-	0xe9, 0xff, 0xbb, 0x92, 0x63, 0xdf, 0xc0, 0x4a, 0xe2, 0x2d, 0xb8, 0x16, 0x94, 0x9f, 0xa2, 0x27,
-	0x8a, 0xab, 0x30, 0xd7, 0x50, 0xda, 0xda, 0x8e, 0xaa, 0x1f, 0x46, 0xc5, 0x03, 0xc3, 0xec, 0x61,
-	0xcf, 0x26, 0x96, 0x68, 0xeb, 0xa2, 0xa5, 0xb4, 0x9d, 0x94, 0x3a, 0x23, 0x4c, 0x33, 0x62, 0x53,
-	0xa7, 0x26, 0x70, 0x05, 0xf8, 0xbe, 0x29, 0x37, 0x0b, 0x5c, 0x86, 0x09, 0x3a, 0x55, 0x45, 0x76,
-	0xad, 0x8d, 0x1f, 0x93, 0x5e, 0x55, 0x46, 0x57, 0x21, 0x45, 0xad, 0x48, 0x76, 0xd7, 0x24, 0xae,
-	0xa9, 0x3e, 0x01, 0xbf, 0x03, 0x69, 0x6a, 0xe8, 0xe9, 0x69, 0xe4, 0x1d, 0x99, 0x81, 0x49, 0x43,
-	0xea, 0xa9, 0xba, 0xe4, 0x5d, 0x90, 0xde, 0x10, 0x57, 0x9c, 0x39, 0x31, 0xfd, 0x68, 0x1c, 0x2b,
-	0x00, 0xd4, 0x2d, 0x91, 0xc5, 0x0f, 0x4f, 0x6d, 0xef, 0x9e, 0x75, 0x28, 0x4f, 0x4f, 0x6d, 0xfc,
-	0x8f, 0x04, 0x24, 0x05, 0x5d, 0x25, 0x81, 0xfe, 0x17, 0x61, 0xdc, 0x56, 0x6c, 0x95, 0xb8, 0x6a,
-	0xce, 0x00, 0xad, 0xc2, 0xb4, 0x4c, 0xac, 0x96, 0xa9, 0x18, 0xb4, 0xf2, 0x72, 0xaf, 0x3f, 0x3f,
-	0x09, 0x6d, 0xc2, 0xa2, 0xa2, 0xb5, 0xd4, 0xae, 0x4c, 0x64, 0xd1, 0x20, 0x66, 0x47, 0xb1, 0x2c,
-	0x5a, 0xa3, 0x65, 0x26, 0x57, 0xc7, 0xd6, 0x52, 0xc2, 0x82, 0xc7, 0xab, 0xf7, 0x59, 0xe8, 0x5d,
-	0x18, 0xb7, 0x6c, 0xa9, 0x4d, 0xdc, 0x23, 0x7f, 0x3b, 0x70, 0xa3, 0x50, 0xa0, 0xec, 0x4f, 0x4d,
-	0xea, 0x6a, 0xad, 0x97, 0x0d, 0xaa, 0x20, 0x38, 0x7a, 0x67, 0x15, 0x4c, 0xca, 0x57, 0xc1, 0x64,
-	0x60, 0x52, 0x66, 0xfb, 0x45, 0xce, 0x4c, 0xaf, 0x72, 0x6b, 0x53, 0x82, 0x37, 0xc4, 0x07, 0x30,
-	0x37, 0x64, 0x07, 0xa5, 0x60, 0xbc, 0x58, 0xab, 0xbf, 0x57, 0xe4, 0x2f, 0xa1, 0x29, 0x48, 0xee,
-	0x94, 0x9b, 0x45, 0x9e, 0x43, 0x13, 0x90, 0xa8, 0x14, 0xf9, 0x04, 0x4a, 0x03, 0x94, 0xca, 0x75,
-	0xa1, 0xbc, 0x5b, 0x6c, 0x96, 0x4b, 0x7c, 0x12, 0xcd, 0xc0, 0x54, 0xa9, 0xda, 0x28, 0xee, 0xd4,
-	0xca, 0x25, 0x7e, 0x1c, 0x4d, 0xc2, 0x58, 0xb9, 0x58, 0xe7, 0x27, 0xf0, 0xdf, 0x38, 0xc8, 0xfe,
-	0xa0, 0x4b, 0xcc, 0x5e, 0xc5, 0x94, 0x34, 0x5b, 0x3a, 0x54, 0x09, 0xf5, 0x72, 0x76, 0x15, 0xde,
-	0x01, 0x74, 0xd4, 0x55, 0x55, 0xd1, 0x24, 0x96, 0xde, 0x35, 0x5b, 0x44, 0xf4, 0x45, 0x9c, 0xa7,
-	0x1c, 0xc1, 0x65, 0xb0, 0x9a, 0x6c, 0x13, 0x92, 0x27, 0x0a, 0x39, 0x75, 0x0f, 0xe5, 0x4a, 0x68,
-	0x44, 0x7e, 0xa8, 0x90, 0x53, 0x81, 0x89, 0x0e, 0x56, 0x2d, 0x63, 0x91, 0x55, 0x4b, 0x72, 0xb8,
-	0x6a, 0x39, 0x81, 0xe5, 0x40, 0xe8, 0xee, 0xf6, 0xca, 0xc3, 0xb8, 0x49, 0x09, 0xee, 0x6d, 0xf7,
-	0xad, 0x50, 0x38, 0x82, 0x23, 0x17, 0xbb, 0x48, 0xf9, 0x92, 0x03, 0x9e, 0x5e, 0xb4, 0x03, 0x91,
-	0xba, 0x02, 0x13, 0x86, 0x64, 0x12, 0xcd, 0x76, 0xa3, 0xe3, 0x8e, 0xbe, 0x4e, 0x59, 0x76, 0x16,
-	0xcf, 0x64, 0xfc, 0x78, 0xbe, 0x05, 0x33, 0xd6, 0x4b, 0xfd, 0x54, 0xf4, 0x76, 0xd1, 0x04, 0xdb,
-	0x45, 0xd3, 0x94, 0x56, 0x72, 0x77, 0x92, 0x0a, 0xf3, 0x3e, 0xf4, 0xff, 0xeb, 0x60, 0xdd, 0x80,
-	0x74, 0x85, 0x30, 0x67, 0x51, 0x19, 0xcf, 0x82, 0x79, 0xe7, 0x42, 0xf0, 0x0b, 0x86, 0x85, 0x74,
-	0x09, 0x26, 0x29, 0x86, 0x7e, 0x15, 0x3e, 0x41, 0x87, 0x55, 0x19, 0xdd, 0x85, 0x24, 0xfd, 0x72,
-	0xeb, 0xee, 0x88, 0x39, 0x30, 0x31, 0xfc, 0x29, 0x07, 0xf3, 0x07, 0x86, 0x3c, 0xe4, 0x35, 0x28,
-	0xad, 0x78, 0x86, 0x13, 0xb1, 0x0c, 0xa3, 0x47, 0x30, 0xdd, 0x65, 0x76, 0xd9, 0x6b, 0xcb, 0x85,
-	0x33, 0x7a, 0x43, 0x3e, 0xa1, 0x0f, 0xb2, 0x67, 0x92, 0x75, 0x2c, 0x80, 0x23, 0x4e, 0xbf, 0xf1,
-	0x23, 0x98, 0x77, 0x56, 0xea, 0x3c, 0x50, 0x5e, 0xfe, 0x48, 0xf4, 0xf3, 0x07, 0x7e, 0x0c, 0x0b,
-	0x07, 0x9a, 0xfc, 0xc6, 0xea, 0x5f, 0x8d, 0x01, 0xf4, 0x73, 0xdc, 0x37, 0x9a, 0x61, 0x1f, 0x40,
-	0x46, 0xd7, 0xd4, 0x9e, 0xa8, 0x68, 0xa2, 0x61, 0x12, 0x99, 0x1c, 0x29, 0x34, 0xc3, 0x3b, 0x7b,
-	0x2e, 0xc9, 0x36, 0xe9, 0x65, 0xca, 0xaf, 0x6a, 0xf5, 0x33, 0x2e, 0xdb, 0xa1, 0x68, 0xcf, 0xcb,
-	0xb3, 0xe3, 0xec, 0x14, 0xdc, 0x0f, 0x0c, 0x7e, 0x1f, 0xb4, 0xef, 0x33, 0x20, 0xe7, 0xda, 0x90,
-	0x6d, 0x75, 0x2d, 0x5b, 0xef, 0x38, 0x9e, 0x45, 0xab, 0x6b, 0x18, 0xba, 0x69, 0x8b, 0x2a, 0x39,
-	0x21, 0x2a, 0x3b, 0x2c, 0xe9, 0xc2, 0x83, 0xf3, 0x3c, 0xec, 0x32, 0x0b, 0x0c, 0x5d, 0xc3, 0xd1,
-	0xaf, 0x51, 0x75, 0x61, 0xa9, 0x15, 0xcc, 0xc0, 0x25, 0xb8, 0x1c, 0x88, 0xea, 0x22, 0x19, 0x7c,
-	0x0c, 0xbf, 0x07, 0x4b, 0x21, 0x9e, 0xd1, 0x2c, 0xa4, 0x1a, 0x07, 0xf5, 0xfa, 0x73, 0xa1, 0xc9,
-	0x9e, 0x0b, 0xd3, 0x30, 0xd9, 0x2c, 0x37, 0x9a, 0xd5, 0xfd, 0x0a, 0xcf, 0xa1, 0x79, 0x98, 0xdd,
-	0x7f, 0xde, 0x14, 0xfb, 0xfc, 0x04, 0x2d, 0xe5, 0xaf, 0xb3, 0xcc, 0xd9, 0xa4, 0x15, 0xda, 0xa1,
-	0x4a, 0x7c, 0xf7, 0xda, 0x9b, 0x65, 0xfe, 0xaf, 0xf3, 0xf8, 0xfc, 0x35, 0x07, 0xab, 0xe1, 0x68,
-	0xdc, 0xfc, 0x54, 0x84, 0x69, 0xff, 0xbd, 0xec, 0x64, 0xa9, 0xeb, 0xe7, 0xac, 0x94, 0xe0, 0xd7,
-	0x89, 0x9b, 0xb1, 0x72, 0x12, 0x64, 0xc3, 0xeb, 0x3b, 0xb4, 0x04, 0x0b, 0xf4, 0x91, 0x56, 0xac,
-	0x55, 0x86, 0xde, 0x68, 0x8b, 0xc0, 0x7b, 0x0c, 0xa1, 0x51, 0x14, 0x37, 0x37, 0x0a, 0x5b, 0x3c,
-	0x37, 0x4c, 0x2d, 0x6c, 0x6c, 0x3d, 0xe4, 0x13, 0x39, 0x15, 0xae, 0x46, 0x15, 0xa7, 0x54, 0x2b,
-	0xe0, 0x15, 0xe8, 0x51, 0xeb, 0x7b, 0xbb, 0x8d, 0xcd, 0x82, 0xf8, 0xa4, 0x5a, 0x2b, 0xf3, 0x1c,
-	0x5a, 0x85, 0xab, 0x8c, 0x5a, 0x79, 0xfe, 0xbc, 0x52, 0x2b, 0x8b, 0xbb, 0x42, 0xb9, 0x54, 0xde,
-	0x6f, 0x56, 0x8b, 0xb5, 0x86, 0x23, 0x91, 0xc8, 0xfd, 0x14, 0x96, 0x23, 0x5e, 0x56, 0x74, 0xf3,
-	0x30, 0x03, 0xfb, 0xcf, 0xf7, 0xcb, 0xfc, 0x25, 0x74, 0x05, 0x10, 0x1b, 0x7e, 0x70, 0x7f, 0xe3,
-	0x7b, 0x62, 0xbd, 0xfc, 0xcc, 0xf3, 0xb3, 0x04, 0x0b, 0x8c, 0x2e, 0x14, 0xdf, 0x17, 0xeb, 0x07,
-	0x3b, 0xb5, 0xea, 0xae, 0xb8, 0x57, 0x7e, 0xc1, 0x27, 0x72, 0xd7, 0x61, 0xca, 0xbb, 0x84, 0xe8,
-	0x86, 0xde, 0x29, 0x36, 0xaa, 0xbb, 0xce, 0x86, 0x7e, 0x72, 0x50, 0xab, 0xf1, 0x5c, 0xe1, 0xf3,
-	0x2c, 0x8c, 0x55, 0x8b, 0xcf, 0xd0, 0x1f, 0x39, 0x58, 0x08, 0xe8, 0x32, 0xa0, 0x7c, 0xcc, 0x87,
-	0xb4, 0xb7, 0x37, 0xb3, 0x1b, 0xf1, 0x15, 0x9c, 0xed, 0x83, 0xef, 0xfe, 0xf2, 0x9f, 0x5f, 0x7d,
-	0x9a, 0x78, 0x1b, 0xdd, 0xcc, 0x9f, 0x6c, 0xe6, 0x3f, 0xa2, 0x5b, 0xf9, 0xb1, 0xdb, 0xa0, 0xb2,
-	0xf2, 0xb9, 0x8f, 0xf3, 0xd6, 0x10, 0xa2, 0xcf, 0x39, 0x98, 0x1f, 0x79, 0xeb, 0xa2, 0xbb, 0x81,
-	0x6e, 0xc3, 0xfa, 0x15, 0xd9, 0x38, 0x2d, 0x12, 0x9c, 0x67, 0xc0, 0x6e, 0xa3, 0xb7, 0x83, 0x80,
-	0x0d, 0xe3, 0xca, 0xe7, 0x3e, 0x46, 0xbf, 0xe7, 0x60, 0x31, 0xe8, 0xed, 0x84, 0x82, 0x83, 0x12,
-	0xd1, 0xe4, 0x8a, 0x07, 0x70, 0x83, 0x01, 0xcc, 0xe1, 0x78, 0x91, 0xdb, 0xe6, 0x72, 0xe8, 0x33,
-	0x0e, 0x16, 0x9d, 0x6b, 0x75, 0x08, 0x61, 0x1c, 0x7f, 0xf1, 0x40, 0x15, 0x18, 0xa8, 0x3b, 0xd9,
-	0xb8, 0x51, 0xa3, 0xb0, 0x7e, 0xc7, 0xc1, 0x62, 0xd0, 0x5b, 0x2c, 0x24, 0x70, 0x11, 0x6d, 0xa5,
-	0xec, 0x95, 0x91, 0xab, 0xbc, 0xdc, 0x31, 0xec, 0x9e, 0xb7, 0x98, 0xb9, 0xd8, 0x8b, 0xf9, 0x57,
-	0x0e, 0xae, 0x04, 0xb7, 0x6c, 0x50, 0xe1, 0xe2, 0xdd, 0xa5, 0xec, 0xbd, 0x0b, 0xe9, 0xb8, 0x47,
-	0x63, 0x8b, 0x81, 0x5e, 0x47, 0x77, 0x62, 0x82, 0xce, 0x1f, 0x53, 0x78, 0x7f, 0xe2, 0x60, 0x31,
-	0xa8, 0x1b, 0x14, 0x12, 0xcd, 0x88, 0xc6, 0x51, 0x36, 0x66, 0x1b, 0x0a, 0x7f, 0x97, 0x01, 0xdd,
-	0x40, 0xeb, 0xf1, 0x80, 0x32, 0x9c, 0x34, 0xc8, 0x7f, 0xe6, 0x60, 0x29, 0xa4, 0xdb, 0x80, 0xee,
-	0xc5, 0x3e, 0x34, 0x6f, 0x00, 0xf8, 0x01, 0x03, 0xbc, 0x89, 0x2f, 0x14, 0x59, 0xba, 0x55, 0xbf,
-	0xe0, 0x60, 0x29, 0xa4, 0x6d, 0x10, 0x82, 0x38, 0xba, 0xc9, 0x10, 0xba, 0x61, 0xdd, 0x90, 0xe6,
-	0x2e, 0x1a, 0xd2, 0xcf, 0x38, 0x98, 0xf2, 0xda, 0x0a, 0xe8, 0x46, 0x70, 0x38, 0x06, 0x1b, 0x18,
-	0xd9, 0x9b, 0xe7, 0x48, 0xb9, 0xbb, 0xf1, 0x11, 0x43, 0x74, 0x1f, 0x6f, 0xc4, 0x3d, 0xd9, 0x96,
-	0x6b, 0x81, 0xc6, 0xed, 0xb7, 0x1c, 0x4c, 0xba, 0x4d, 0x86, 0xb0, 0x64, 0x33, 0xd0, 0xc2, 0xc8,
-	0xde, 0x88, 0x16, 0x72, 0x31, 0x6d, 0x33, 0x4c, 0x5b, 0x38, 0x7f, 0x11, 0x4c, 0x4f, 0x4f, 0x6d,
-	0x0a, 0xe9, 0x13, 0x0e, 0x66, 0x2a, 0xc4, 0xae, 0x4a, 0x9d, 0x3a, 0xfb, 0xe5, 0x06, 0x61, 0xbf,
-	0x4b, 0xe7, 0x64, 0x9c, 0x31, 0x3d, 0x58, 0x97, 0x87, 0x64, 0x1c, 0x2e, 0xfe, 0x3e, 0xc3, 0xb1,
-	0x8d, 0x1f, 0x32, 0x1c, 0x5e, 0x61, 0x76, 0x0e, 0x96, 0xb6, 0xdf, 0xf9, 0x6f, 0x38, 0x98, 0x69,
-	0x44, 0xa1, 0x69, 0xc4, 0x47, 0xb3, 0xcb, 0xd0, 0x3c, 0xbe, 0x18, 0x1a, 0xcb, 0x67, 0x9f, 0x86,
-	0xe7, 0x2f, 0x1c, 0x20, 0x5a, 0xf6, 0x51, 0xa2, 0xaf, 0x54, 0x5b, 0x1b, 0x72, 0x39, 0x2a, 0xe2,
-	0x81, 0xbb, 0x1d, 0x43, 0xd2, 0x5d, 0xc6, 0x2a, 0x03, 0xbc, 0x8b, 0xdf, 0xb9, 0x08, 0x60, 0x7b,
-	0xc4, 0x1e, 0x85, 0xfd, 0x07, 0x0e, 0x16, 0x02, 0x5a, 0x0f, 0x21, 0x95, 0x4c, 0x78, 0x7f, 0x25,
-	0xa4, 0x92, 0x89, 0xe8, 0x6a, 0xe0, 0x35, 0x36, 0x0b, 0x8c, 0x57, 0xe8, 0x2c, 0xd8, 0x23, 0x66,
-	0xfb, 0xd5, 0xa8, 0x38, 0x05, 0xd9, 0x81, 0xd4, 0xd9, 0x3b, 0x1f, 0xdd, 0x0c, 0xbd, 0x1a, 0x06,
-	0xf0, 0xdc, 0x3a, 0x4f, 0xcc, 0x45, 0x31, 0xcf, 0x50, 0x4c, 0xa3, 0xd4, 0x19, 0x0a, 0x44, 0x60,
-	0xd2, 0x7d, 0xe8, 0x87, 0x9c, 0xbd, 0xc1, 0x36, 0x40, 0x36, 0xfc, 0x15, 0x8d, 0xb3, 0xcc, 0xfa,
-	0x22, 0x42, 0xfd, 0x03, 0xc7, 0x7c, 0xd0, 0xd4, 0xf3, 0x73, 0x80, 0x7e, 0xa7, 0x00, 0xdd, 0x8a,
-	0xc8, 0xdf, 0x31, 0x9d, 0xb9, 0xa5, 0x21, 0xc6, 0xcc, 0x99, 0xd3, 0x62, 0x78, 0xac, 0x9b, 0x6d,
-	0x49, 0x53, 0x5e, 0x3b, 0xbf, 0xd4, 0xd2, 0xd4, 0x6c, 0x7a, 0x51, 0xfd, 0x05, 0x07, 0xd0, 0x6f,
-	0x1a, 0x84, 0x00, 0x18, 0xe9, 0x2a, 0x44, 0x01, 0x70, 0x2b, 0xac, 0x02, 0xee, 0xcf, 0x76, 0xc8,
-	0x7d, 0xde, 0x9b, 0xfd, 0xb6, 0xd3, 0x5f, 0xf8, 0x08, 0xa0, 0xdf, 0x22, 0x08, 0x81, 0x30, 0xd2,
-	0x43, 0x88, 0x82, 0x90, 0x63, 0x10, 0x6e, 0xe4, 0x62, 0x40, 0x60, 0x19, 0xcd, 0xdf, 0x63, 0x18,
-	0x3c, 0xac, 0xfd, 0x10, 0x8c, 0xb6, 0x21, 0xa2, 0x10, 0xb8, 0x37, 0x11, 0xfe, 0x4e, 0x8c, 0x20,
-	0x74, 0x5d, 0xd3, 0x74, 0x39, 0xbe, 0xe4, 0x20, 0x13, 0xf6, 0x78, 0x44, 0x5b, 0xe1, 0xa7, 0x2b,
-	0xfc, 0xe5, 0x9b, 0xbd, 0x7f, 0x41, 0x2d, 0xf7, 0x48, 0xdc, 0x63, 0x33, 0xb8, 0x8b, 0xd7, 0xd8,
-	0xcf, 0xf4, 0xbe, 0x7c, 0xf1, 0x2a, 0x44, 0x73, 0x9b, 0xcb, 0xed, 0x1c, 0xc2, 0x52, 0x4b, 0xef,
-	0x04, 0x39, 0xdc, 0x99, 0xa2, 0x69, 0x87, 0x5e, 0xd7, 0x75, 0xee, 0x47, 0x0f, 0x5d, 0x81, 0xb6,
-	0xae, 0x4a, 0x5a, 0x7b, 0x5d, 0x37, 0xdb, 0xf9, 0x36, 0xd1, 0xd8, 0x65, 0x9e, 0x77, 0x58, 0x92,
-	0xa1, 0x58, 0x03, 0xff, 0x95, 0xf0, 0x88, 0x7d, 0xfc, 0x87, 0xe3, 0x0e, 0x27, 0x98, 0xdc, 0xbd,
-	0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x75, 0xcc, 0x0e, 0xa5, 0xbc, 0x20, 0x00, 0x00,
-}
diff --git a/googleapis/iam/credentials/v1/common.pb.go b/googleapis/iam/credentials/v1/common.pb.go
index cbd5192dd7..dc94662309 100644
--- a/googleapis/iam/credentials/v1/common.pb.go
+++ b/googleapis/iam/credentials/v1/common.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/credentials/v1/common.proto
 
-package credentials // import "google.golang.org/genproto/googleapis/iam/credentials/v1"
+package credentials
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type GenerateAccessTokenRequest struct {
 	// The resource name of the service account for which the credentials
@@ -54,16 +57,17 @@ func (m *GenerateAccessTokenRequest) Reset()         { *m = GenerateAccessTokenR
 func (m *GenerateAccessTokenRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateAccessTokenRequest) ProtoMessage()    {}
 func (*GenerateAccessTokenRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{0}
+	return fileDescriptor_e91212214ea1422e, []int{0}
 }
+
 func (m *GenerateAccessTokenRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateAccessTokenRequest.Unmarshal(m, b)
 }
 func (m *GenerateAccessTokenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateAccessTokenRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateAccessTokenRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateAccessTokenRequest.Merge(dst, src)
+func (m *GenerateAccessTokenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateAccessTokenRequest.Merge(m, src)
 }
 func (m *GenerateAccessTokenRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateAccessTokenRequest.Size(m)
@@ -117,16 +121,17 @@ func (m *GenerateAccessTokenResponse) Reset()         { *m = GenerateAccessToken
 func (m *GenerateAccessTokenResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateAccessTokenResponse) ProtoMessage()    {}
 func (*GenerateAccessTokenResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{1}
+	return fileDescriptor_e91212214ea1422e, []int{1}
 }
+
 func (m *GenerateAccessTokenResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateAccessTokenResponse.Unmarshal(m, b)
 }
 func (m *GenerateAccessTokenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateAccessTokenResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateAccessTokenResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateAccessTokenResponse.Merge(dst, src)
+func (m *GenerateAccessTokenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateAccessTokenResponse.Merge(m, src)
 }
 func (m *GenerateAccessTokenResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateAccessTokenResponse.Size(m)
@@ -177,16 +182,17 @@ func (m *SignBlobRequest) Reset()         { *m = SignBlobRequest{} }
 func (m *SignBlobRequest) String() string { return proto.CompactTextString(m) }
 func (*SignBlobRequest) ProtoMessage()    {}
 func (*SignBlobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{2}
+	return fileDescriptor_e91212214ea1422e, []int{2}
 }
+
 func (m *SignBlobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignBlobRequest.Unmarshal(m, b)
 }
 func (m *SignBlobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignBlobRequest.Marshal(b, m, deterministic)
 }
-func (dst *SignBlobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignBlobRequest.Merge(dst, src)
+func (m *SignBlobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignBlobRequest.Merge(m, src)
 }
 func (m *SignBlobRequest) XXX_Size() int {
 	return xxx_messageInfo_SignBlobRequest.Size(m)
@@ -232,16 +238,17 @@ func (m *SignBlobResponse) Reset()         { *m = SignBlobResponse{} }
 func (m *SignBlobResponse) String() string { return proto.CompactTextString(m) }
 func (*SignBlobResponse) ProtoMessage()    {}
 func (*SignBlobResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{3}
+	return fileDescriptor_e91212214ea1422e, []int{3}
 }
+
 func (m *SignBlobResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignBlobResponse.Unmarshal(m, b)
 }
 func (m *SignBlobResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignBlobResponse.Marshal(b, m, deterministic)
 }
-func (dst *SignBlobResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignBlobResponse.Merge(dst, src)
+func (m *SignBlobResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignBlobResponse.Merge(m, src)
 }
 func (m *SignBlobResponse) XXX_Size() int {
 	return xxx_messageInfo_SignBlobResponse.Size(m)
@@ -292,16 +299,17 @@ func (m *SignJwtRequest) Reset()         { *m = SignJwtRequest{} }
 func (m *SignJwtRequest) String() string { return proto.CompactTextString(m) }
 func (*SignJwtRequest) ProtoMessage()    {}
 func (*SignJwtRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{4}
+	return fileDescriptor_e91212214ea1422e, []int{4}
 }
+
 func (m *SignJwtRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignJwtRequest.Unmarshal(m, b)
 }
 func (m *SignJwtRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignJwtRequest.Marshal(b, m, deterministic)
 }
-func (dst *SignJwtRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignJwtRequest.Merge(dst, src)
+func (m *SignJwtRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignJwtRequest.Merge(m, src)
 }
 func (m *SignJwtRequest) XXX_Size() int {
 	return xxx_messageInfo_SignJwtRequest.Size(m)
@@ -347,16 +355,17 @@ func (m *SignJwtResponse) Reset()         { *m = SignJwtResponse{} }
 func (m *SignJwtResponse) String() string { return proto.CompactTextString(m) }
 func (*SignJwtResponse) ProtoMessage()    {}
 func (*SignJwtResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{5}
+	return fileDescriptor_e91212214ea1422e, []int{5}
 }
+
 func (m *SignJwtResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignJwtResponse.Unmarshal(m, b)
 }
 func (m *SignJwtResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SignJwtResponse.Marshal(b, m, deterministic)
 }
-func (dst *SignJwtResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SignJwtResponse.Merge(dst, src)
+func (m *SignJwtResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignJwtResponse.Merge(m, src)
 }
 func (m *SignJwtResponse) XXX_Size() int {
 	return xxx_messageInfo_SignJwtResponse.Size(m)
@@ -411,16 +420,17 @@ func (m *GenerateIdTokenRequest) Reset()         { *m = GenerateIdTokenRequest{}
 func (m *GenerateIdTokenRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateIdTokenRequest) ProtoMessage()    {}
 func (*GenerateIdTokenRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{6}
+	return fileDescriptor_e91212214ea1422e, []int{6}
 }
+
 func (m *GenerateIdTokenRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateIdTokenRequest.Unmarshal(m, b)
 }
 func (m *GenerateIdTokenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateIdTokenRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateIdTokenRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateIdTokenRequest.Merge(dst, src)
+func (m *GenerateIdTokenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateIdTokenRequest.Merge(m, src)
 }
 func (m *GenerateIdTokenRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateIdTokenRequest.Size(m)
@@ -471,16 +481,17 @@ func (m *GenerateIdTokenResponse) Reset()         { *m = GenerateIdTokenResponse
 func (m *GenerateIdTokenResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateIdTokenResponse) ProtoMessage()    {}
 func (*GenerateIdTokenResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{7}
+	return fileDescriptor_e91212214ea1422e, []int{7}
 }
+
 func (m *GenerateIdTokenResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateIdTokenResponse.Unmarshal(m, b)
 }
 func (m *GenerateIdTokenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateIdTokenResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateIdTokenResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateIdTokenResponse.Merge(dst, src)
+func (m *GenerateIdTokenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateIdTokenResponse.Merge(m, src)
 }
 func (m *GenerateIdTokenResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateIdTokenResponse.Size(m)
@@ -565,16 +576,17 @@ func (m *GenerateIdentityBindingAccessTokenRequest) Reset() {
 func (m *GenerateIdentityBindingAccessTokenRequest) String() string { return proto.CompactTextString(m) }
 func (*GenerateIdentityBindingAccessTokenRequest) ProtoMessage()    {}
 func (*GenerateIdentityBindingAccessTokenRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{8}
+	return fileDescriptor_e91212214ea1422e, []int{8}
 }
+
 func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Unmarshal(m, b)
 }
 func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Marshal(b, m, deterministic)
 }
-func (dst *GenerateIdentityBindingAccessTokenRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Merge(dst, src)
+func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Merge(m, src)
 }
 func (m *GenerateIdentityBindingAccessTokenRequest) XXX_Size() int {
 	return xxx_messageInfo_GenerateIdentityBindingAccessTokenRequest.Size(m)
@@ -625,16 +637,17 @@ func (m *GenerateIdentityBindingAccessTokenResponse) String() string {
 }
 func (*GenerateIdentityBindingAccessTokenResponse) ProtoMessage() {}
 func (*GenerateIdentityBindingAccessTokenResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_f41ae9f35d063a8f, []int{9}
+	return fileDescriptor_e91212214ea1422e, []int{9}
 }
+
 func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Unmarshal(m, b)
 }
 func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Marshal(b, m, deterministic)
 }
-func (dst *GenerateIdentityBindingAccessTokenResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Merge(dst, src)
+func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Merge(m, src)
 }
 func (m *GenerateIdentityBindingAccessTokenResponse) XXX_Size() int {
 	return xxx_messageInfo_GenerateIdentityBindingAccessTokenResponse.Size(m)
@@ -673,10 +686,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/iam/credentials/v1/common.proto", fileDescriptor_common_f41ae9f35d063a8f)
+	proto.RegisterFile("google/iam/credentials/v1/common.proto", fileDescriptor_e91212214ea1422e)
 }
 
-var fileDescriptor_common_f41ae9f35d063a8f = []byte{
+var fileDescriptor_e91212214ea1422e = []byte{
 	// 563 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0x96, 0x93, 0xa6, 0x8d, 0x27, 0x01, 0x2a, 0xab, 0x80, 0x13, 0x7e, 0x1a, 0x5c, 0x09, 0x05,
diff --git a/googleapis/iam/credentials/v1/iamcredentials.pb.go b/googleapis/iam/credentials/v1/iamcredentials.pb.go
index c0ab0f43e7..81b7c20170 100644
--- a/googleapis/iam/credentials/v1/iamcredentials.pb.go
+++ b/googleapis/iam/credentials/v1/iamcredentials.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/credentials/v1/iamcredentials.proto
 
-package credentials // import "google.golang.org/genproto/googleapis/iam/credentials/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package credentials
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,43 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+func init() {
+	proto.RegisterFile("google/iam/credentials/v1/iamcredentials.proto", fileDescriptor_ad032f4dbfa7437c)
+}
+
+var fileDescriptor_ad032f4dbfa7437c = []byte{
+	// 443 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0xaa, 0xd4, 0x30,
+	0x18, 0xc5, 0xc9, 0x5d, 0x78, 0x25, 0x0b, 0x85, 0xde, 0x95, 0x83, 0xab, 0x0a, 0x82, 0x15, 0x1a,
+	0x67, 0x74, 0x14, 0x3a, 0x0a, 0x4e, 0x1d, 0x95, 0x29, 0x88, 0x83, 0x7f, 0x36, 0xee, 0x32, 0x69,
+	0x08, 0xd1, 0x36, 0x5f, 0x6d, 0x32, 0x33, 0x88, 0xb8, 0x11, 0x04, 0xf7, 0x6e, 0x5d, 0xf8, 0x20,
+	0x3e, 0x82, 0x3b, 0x5f, 0xc1, 0x9d, 0x2f, 0xe0, 0x52, 0xd2, 0xa6, 0x4c, 0xc5, 0xa9, 0xb6, 0xdc,
+	0x65, 0xd3, 0x73, 0xce, 0xf7, 0x3b, 0x24, 0x7c, 0x38, 0x14, 0x00, 0x22, 0xe3, 0x44, 0xd2, 0x9c,
+	0xb0, 0x92, 0xa7, 0x5c, 0x19, 0x49, 0x33, 0x4d, 0xb6, 0x63, 0x7b, 0xd4, 0x3a, 0x09, 0x8b, 0x12,
+	0x0c, 0x78, 0x17, 0x6a, 0x7d, 0x28, 0x69, 0x1e, 0xb6, 0xff, 0x6e, 0xc7, 0xa3, 0x8b, 0x2e, 0x8a,
+	0x16, 0x92, 0x50, 0xa5, 0xc0, 0x50, 0x23, 0x41, 0x39, 0xe3, 0xe8, 0x72, 0xf7, 0x20, 0x06, 0x79,
+	0x0e, 0xaa, 0xd6, 0x4d, 0x7e, 0x1e, 0xe3, 0x73, 0xcb, 0xf9, 0xa3, 0x7b, 0x7b, 0x89, 0xf7, 0x0d,
+	0xe1, 0x93, 0x87, 0x5c, 0xf1, 0x92, 0x1a, 0x3e, 0x67, 0x8c, 0x6b, 0xfd, 0x0c, 0x5e, 0x71, 0xe5,
+	0x4d, 0xc3, 0x4e, 0x98, 0xf0, 0x80, 0xfe, 0x09, 0x7f, 0xbd, 0xe1, 0xda, 0x8c, 0x6e, 0x0e, 0xb5,
+	0xe9, 0x02, 0x94, 0xe6, 0xfe, 0x83, 0xf7, 0xdf, 0x7f, 0x7c, 0x3a, 0xba, 0xeb, 0xcf, 0x2c, 0xf3,
+	0x5b, 0x45, 0x73, 0x7e, 0xa7, 0x28, 0xe1, 0x25, 0x67, 0x46, 0x93, 0x80, 0x68, 0x5e, 0x6e, 0x25,
+	0xb3, 0x46, 0xd8, 0x28, 0x7b, 0xf2, 0x2e, 0x12, 0x7f, 0x87, 0x45, 0x28, 0xf0, 0xbe, 0x22, 0x7c,
+	0xbe, 0x99, 0xb3, 0x4c, 0xeb, 0x2a, 0xe3, 0x1e, 0x4c, 0x4e, 0xdb, 0xd4, 0x98, 0x0c, 0xb1, 0xb8,
+	0x0a, 0x71, 0x55, 0xe1, 0xb6, 0x7f, 0x6b, 0x68, 0x05, 0x17, 0x64, 0xf1, 0xbf, 0x20, 0x7c, 0xf6,
+	0xa9, 0x14, 0x2a, 0xce, 0x60, 0xed, 0x05, 0xff, 0x80, 0x68, 0x44, 0x0d, 0xf0, 0xd5, 0x5e, 0x5a,
+	0x47, 0x3a, 0xab, 0x48, 0xa7, 0xfe, 0xb5, 0xbe, 0xa4, 0xda, 0x25, 0x58, 0xc4, 0xcf, 0x08, 0x1f,
+	0xdb, 0xc4, 0x64, 0x67, 0xbc, 0x2b, 0xff, 0x99, 0x9a, 0xec, 0x4c, 0x03, 0x18, 0xf4, 0x91, 0x3a,
+	0xbe, 0xa8, 0xe2, 0xbb, 0xe1, 0x93, 0x21, 0x7c, 0xc9, 0xce, 0x58, 0xbc, 0x8f, 0x47, 0xd8, 0xdf,
+	0xdf, 0x90, 0x1d, 0x62, 0xde, 0xc4, 0x52, 0xa5, 0x52, 0x89, 0xf6, 0xf3, 0x5e, 0xf4, 0xba, 0xe0,
+	0x2e, 0x7b, 0x53, 0xea, 0xfe, 0x29, 0x53, 0x5c, 0xdf, 0xe7, 0x55, 0xdf, 0xc7, 0x7e, 0x32, 0xfc,
+	0xe5, 0x74, 0x65, 0x47, 0x28, 0x88, 0x3f, 0x20, 0x7c, 0x89, 0x41, 0xde, 0x30, 0xb2, 0x0c, 0x36,
+	0xe9, 0x01, 0xd2, 0xf8, 0xe4, 0xcf, 0x95, 0xb0, 0xb2, 0xab, 0x62, 0x85, 0x5e, 0x2c, 0x9c, 0x4f,
+	0x40, 0x46, 0x95, 0x08, 0xa1, 0x14, 0x44, 0x70, 0x55, 0x2d, 0x12, 0x52, 0xff, 0xa2, 0x85, 0xd4,
+	0x07, 0x76, 0xce, 0xac, 0xf5, 0xf9, 0x0b, 0xa1, 0xf5, 0x99, 0xca, 0x73, 0xfd, 0x77, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x2e, 0x2e, 0xa2, 0x0d, 0x0f, 0x05, 0x00, 0x00,
+}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -239,39 +275,3 @@ var _IAMCredentials_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/iam/credentials/v1/iamcredentials.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/iam/credentials/v1/iamcredentials.proto", fileDescriptor_iamcredentials_03d0b597c179fd49)
-}
-
-var fileDescriptor_iamcredentials_03d0b597c179fd49 = []byte{
-	// 443 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0xaa, 0xd4, 0x30,
-	0x18, 0xc5, 0xc9, 0x5d, 0x78, 0x25, 0x0b, 0x85, 0xde, 0x95, 0x83, 0xab, 0x0a, 0x82, 0x15, 0x1a,
-	0x67, 0x74, 0x14, 0x3a, 0x0a, 0x4e, 0x1d, 0x95, 0x29, 0x88, 0x83, 0x7f, 0x36, 0xee, 0x32, 0x69,
-	0x08, 0xd1, 0x36, 0x5f, 0x6d, 0x32, 0x33, 0x88, 0xb8, 0x11, 0x04, 0xf7, 0x6e, 0x5d, 0xf8, 0x20,
-	0x3e, 0x82, 0x3b, 0x5f, 0xc1, 0x9d, 0x2f, 0xe0, 0x52, 0xd2, 0xa6, 0x4c, 0xc5, 0xa9, 0xb6, 0xdc,
-	0x65, 0xd3, 0x73, 0xce, 0xf7, 0x3b, 0x24, 0x7c, 0x38, 0x14, 0x00, 0x22, 0xe3, 0x44, 0xd2, 0x9c,
-	0xb0, 0x92, 0xa7, 0x5c, 0x19, 0x49, 0x33, 0x4d, 0xb6, 0x63, 0x7b, 0xd4, 0x3a, 0x09, 0x8b, 0x12,
-	0x0c, 0x78, 0x17, 0x6a, 0x7d, 0x28, 0x69, 0x1e, 0xb6, 0xff, 0x6e, 0xc7, 0xa3, 0x8b, 0x2e, 0x8a,
-	0x16, 0x92, 0x50, 0xa5, 0xc0, 0x50, 0x23, 0x41, 0x39, 0xe3, 0xe8, 0x72, 0xf7, 0x20, 0x06, 0x79,
-	0x0e, 0xaa, 0xd6, 0x4d, 0x7e, 0x1e, 0xe3, 0x73, 0xcb, 0xf9, 0xa3, 0x7b, 0x7b, 0x89, 0xf7, 0x0d,
-	0xe1, 0x93, 0x87, 0x5c, 0xf1, 0x92, 0x1a, 0x3e, 0x67, 0x8c, 0x6b, 0xfd, 0x0c, 0x5e, 0x71, 0xe5,
-	0x4d, 0xc3, 0x4e, 0x98, 0xf0, 0x80, 0xfe, 0x09, 0x7f, 0xbd, 0xe1, 0xda, 0x8c, 0x6e, 0x0e, 0xb5,
-	0xe9, 0x02, 0x94, 0xe6, 0xfe, 0x83, 0xf7, 0xdf, 0x7f, 0x7c, 0x3a, 0xba, 0xeb, 0xcf, 0x2c, 0xf3,
-	0x5b, 0x45, 0x73, 0x7e, 0xa7, 0x28, 0xe1, 0x25, 0x67, 0x46, 0x93, 0x80, 0x68, 0x5e, 0x6e, 0x25,
-	0xb3, 0x46, 0xd8, 0x28, 0x7b, 0xf2, 0x2e, 0x12, 0x7f, 0x87, 0x45, 0x28, 0xf0, 0xbe, 0x22, 0x7c,
-	0xbe, 0x99, 0xb3, 0x4c, 0xeb, 0x2a, 0xe3, 0x1e, 0x4c, 0x4e, 0xdb, 0xd4, 0x98, 0x0c, 0xb1, 0xb8,
-	0x0a, 0x71, 0x55, 0xe1, 0xb6, 0x7f, 0x6b, 0x68, 0x05, 0x17, 0x64, 0xf1, 0xbf, 0x20, 0x7c, 0xf6,
-	0xa9, 0x14, 0x2a, 0xce, 0x60, 0xed, 0x05, 0xff, 0x80, 0x68, 0x44, 0x0d, 0xf0, 0xd5, 0x5e, 0x5a,
-	0x47, 0x3a, 0xab, 0x48, 0xa7, 0xfe, 0xb5, 0xbe, 0xa4, 0xda, 0x25, 0x58, 0xc4, 0xcf, 0x08, 0x1f,
-	0xdb, 0xc4, 0x64, 0x67, 0xbc, 0x2b, 0xff, 0x99, 0x9a, 0xec, 0x4c, 0x03, 0x18, 0xf4, 0x91, 0x3a,
-	0xbe, 0xa8, 0xe2, 0xbb, 0xe1, 0x93, 0x21, 0x7c, 0xc9, 0xce, 0x58, 0xbc, 0x8f, 0x47, 0xd8, 0xdf,
-	0xdf, 0x90, 0x1d, 0x62, 0xde, 0xc4, 0x52, 0xa5, 0x52, 0x89, 0xf6, 0xf3, 0x5e, 0xf4, 0xba, 0xe0,
-	0x2e, 0x7b, 0x53, 0xea, 0xfe, 0x29, 0x53, 0x5c, 0xdf, 0xe7, 0x55, 0xdf, 0xc7, 0x7e, 0x32, 0xfc,
-	0xe5, 0x74, 0x65, 0x47, 0x28, 0x88, 0x3f, 0x20, 0x7c, 0x89, 0x41, 0xde, 0x30, 0xb2, 0x0c, 0x36,
-	0xe9, 0x01, 0xd2, 0xf8, 0xe4, 0xcf, 0x95, 0xb0, 0xb2, 0xab, 0x62, 0x85, 0x5e, 0x2c, 0x9c, 0x4f,
-	0x40, 0x46, 0x95, 0x08, 0xa1, 0x14, 0x44, 0x70, 0x55, 0x2d, 0x12, 0x52, 0xff, 0xa2, 0x85, 0xd4,
-	0x07, 0x76, 0xce, 0xac, 0xf5, 0xf9, 0x0b, 0xa1, 0xf5, 0x99, 0xca, 0x73, 0xfd, 0x77, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x2e, 0x2e, 0xa2, 0x0d, 0x0f, 0x05, 0x00, 0x00,
-}
diff --git a/googleapis/iam/v1/iam_policy.pb.go b/googleapis/iam/v1/iam_policy.pb.go
index 1207018c0c..a865f35d6e 100644
--- a/googleapis/iam/v1/iam_policy.pb.go
+++ b/googleapis/iam/v1/iam_policy.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/iam_policy.proto
 
-package iam // import "google.golang.org/genproto/googleapis/iam/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package iam
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request message for `SetIamPolicy` method.
 type SetIamPolicyRequest struct {
@@ -43,16 +43,17 @@ func (m *SetIamPolicyRequest) Reset()         { *m = SetIamPolicyRequest{} }
 func (m *SetIamPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*SetIamPolicyRequest) ProtoMessage()    {}
 func (*SetIamPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_policy_b56603532236728f, []int{0}
+	return fileDescriptor_d2728eb97d748a32, []int{0}
 }
+
 func (m *SetIamPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetIamPolicyRequest.Unmarshal(m, b)
 }
 func (m *SetIamPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SetIamPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *SetIamPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetIamPolicyRequest.Merge(dst, src)
+func (m *SetIamPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetIamPolicyRequest.Merge(m, src)
 }
 func (m *SetIamPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_SetIamPolicyRequest.Size(m)
@@ -91,16 +92,17 @@ func (m *GetIamPolicyRequest) Reset()         { *m = GetIamPolicyRequest{} }
 func (m *GetIamPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetIamPolicyRequest) ProtoMessage()    {}
 func (*GetIamPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_policy_b56603532236728f, []int{1}
+	return fileDescriptor_d2728eb97d748a32, []int{1}
 }
+
 func (m *GetIamPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetIamPolicyRequest.Unmarshal(m, b)
 }
 func (m *GetIamPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetIamPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetIamPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetIamPolicyRequest.Merge(dst, src)
+func (m *GetIamPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIamPolicyRequest.Merge(m, src)
 }
 func (m *GetIamPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetIamPolicyRequest.Size(m)
@@ -137,16 +139,17 @@ func (m *TestIamPermissionsRequest) Reset()         { *m = TestIamPermissionsReq
 func (m *TestIamPermissionsRequest) String() string { return proto.CompactTextString(m) }
 func (*TestIamPermissionsRequest) ProtoMessage()    {}
 func (*TestIamPermissionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_policy_b56603532236728f, []int{2}
+	return fileDescriptor_d2728eb97d748a32, []int{2}
 }
+
 func (m *TestIamPermissionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestIamPermissionsRequest.Unmarshal(m, b)
 }
 func (m *TestIamPermissionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestIamPermissionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *TestIamPermissionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestIamPermissionsRequest.Merge(dst, src)
+func (m *TestIamPermissionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestIamPermissionsRequest.Merge(m, src)
 }
 func (m *TestIamPermissionsRequest) XXX_Size() int {
 	return xxx_messageInfo_TestIamPermissionsRequest.Size(m)
@@ -185,16 +188,17 @@ func (m *TestIamPermissionsResponse) Reset()         { *m = TestIamPermissionsRe
 func (m *TestIamPermissionsResponse) String() string { return proto.CompactTextString(m) }
 func (*TestIamPermissionsResponse) ProtoMessage()    {}
 func (*TestIamPermissionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_iam_policy_b56603532236728f, []int{3}
+	return fileDescriptor_d2728eb97d748a32, []int{3}
 }
+
 func (m *TestIamPermissionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TestIamPermissionsResponse.Unmarshal(m, b)
 }
 func (m *TestIamPermissionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TestIamPermissionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *TestIamPermissionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TestIamPermissionsResponse.Merge(dst, src)
+func (m *TestIamPermissionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestIamPermissionsResponse.Merge(m, src)
 }
 func (m *TestIamPermissionsResponse) XXX_Size() int {
 	return xxx_messageInfo_TestIamPermissionsResponse.Size(m)
@@ -219,6 +223,39 @@ func init() {
 	proto.RegisterType((*TestIamPermissionsResponse)(nil), "google.iam.v1.TestIamPermissionsResponse")
 }
 
+func init() { proto.RegisterFile("google/iam/v1/iam_policy.proto", fileDescriptor_d2728eb97d748a32) }
+
+var fileDescriptor_d2728eb97d748a32 = []byte{
+	// 419 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0xcf, 0x4c, 0xcc, 0xd5, 0x2f, 0x33, 0x04, 0x51, 0xf1, 0x05, 0xf9, 0x39, 0x99,
+	0xc9, 0x95, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xbc, 0x10, 0x79, 0xbd, 0xcc, 0xc4, 0x5c,
+	0xbd, 0x32, 0x43, 0x29, 0x49, 0xa8, 0xf2, 0xc4, 0x82, 0x4c, 0xfd, 0xa2, 0xd4, 0xe2, 0xfc, 0xd2,
+	0xa2, 0xe4, 0x54, 0x88, 0x4a, 0x29, 0x29, 0x54, 0x93, 0x90, 0x4d, 0x91, 0x92, 0x41, 0xd2, 0x96,
+	0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99, 0x9f, 0x57, 0x0c, 0x91, 0x55, 0x4a, 0xe0, 0x12,
+	0x0e, 0x4e, 0x2d, 0xf1, 0x4c, 0xcc, 0x0d, 0x00, 0xeb, 0x09, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e,
+	0x11, 0x92, 0xe2, 0xe2, 0x80, 0x59, 0x21, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe7, 0x0b,
+	0xe9, 0x72, 0xb1, 0x41, 0x2c, 0x90, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x36, 0x12, 0xd5, 0x43, 0x71,
+	0xa7, 0x1e, 0xd4, 0x24, 0xa8, 0x22, 0x25, 0x43, 0x2e, 0x61, 0x77, 0xd2, 0x6c, 0x50, 0x8a, 0xe4,
+	0x92, 0x0c, 0x49, 0x2d, 0x06, 0xeb, 0x49, 0x2d, 0xca, 0xcd, 0x2c, 0x2e, 0x06, 0x39, 0x98, 0x18,
+	0xa7, 0x29, 0x70, 0x71, 0x17, 0x20, 0x74, 0x48, 0x30, 0x29, 0x30, 0x6b, 0x70, 0x06, 0x21, 0x0b,
+	0x29, 0xd9, 0x71, 0x49, 0x61, 0x33, 0xba, 0xb8, 0x20, 0x3f, 0xaf, 0x18, 0x43, 0x3f, 0x23, 0x86,
+	0x7e, 0xa3, 0x29, 0xcc, 0x5c, 0x9c, 0x9e, 0x8e, 0xbe, 0x10, 0xbf, 0x08, 0x95, 0x70, 0xf1, 0x20,
+	0x87, 0x9e, 0x90, 0x12, 0x5a, 0x50, 0x60, 0x09, 0x5a, 0x29, 0xec, 0xc1, 0xa5, 0xa4, 0xd9, 0x74,
+	0xf9, 0xc9, 0x64, 0x26, 0x65, 0x25, 0x39, 0x50, 0x04, 0x56, 0xc3, 0x7c, 0x64, 0xab, 0xa5, 0x55,
+	0x6b, 0x55, 0x8c, 0x64, 0x8a, 0x15, 0xa3, 0x16, 0xc8, 0x56, 0x77, 0x7c, 0xb6, 0xba, 0x53, 0xc5,
+	0xd6, 0x74, 0x34, 0x5b, 0x67, 0x31, 0x72, 0x09, 0x61, 0x06, 0x9d, 0x90, 0x06, 0x9a, 0xc1, 0x38,
+	0x23, 0x4e, 0x4a, 0x93, 0x08, 0x95, 0x90, 0x78, 0x50, 0xd2, 0x07, 0x3b, 0x4b, 0x53, 0x49, 0x05,
+	0xd3, 0x59, 0x25, 0x18, 0xba, 0xac, 0x18, 0xb5, 0x9c, 0xda, 0x18, 0xb9, 0x04, 0x93, 0xf3, 0x73,
+	0x51, 0x6d, 0x70, 0xe2, 0x83, 0x7b, 0x20, 0x00, 0x94, 0xd8, 0x03, 0x18, 0xa3, 0x0c, 0xa0, 0x0a,
+	0xd2, 0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5, 0xf2, 0x8b, 0xd2, 0xf5, 0xd3, 0x53, 0xf3, 0xc0, 0x59,
+	0x41, 0x1f, 0x22, 0x95, 0x58, 0x90, 0x59, 0x0c, 0xcd, 0x47, 0xd6, 0x99, 0x89, 0xb9, 0x3f, 0x18,
+	0x19, 0x57, 0x31, 0x09, 0xbb, 0x43, 0x74, 0x39, 0xe7, 0xe4, 0x97, 0xa6, 0xe8, 0x79, 0x26, 0xe6,
+	0xea, 0x85, 0x19, 0x9e, 0x82, 0x89, 0xc6, 0x80, 0x45, 0x63, 0x3c, 0x13, 0x73, 0x63, 0xc2, 0x0c,
+	0x93, 0xd8, 0xc0, 0x66, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xba, 0x05, 0xa3, 0xc3, 0xdc,
+	0x03, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -380,38 +417,3 @@ var _IAMPolicy_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/iam/v1/iam_policy.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/iam/v1/iam_policy.proto", fileDescriptor_iam_policy_b56603532236728f)
-}
-
-var fileDescriptor_iam_policy_b56603532236728f = []byte{
-	// 419 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0xcf, 0x4c, 0xcc, 0xd5, 0x2f, 0x33, 0x04, 0x51, 0xf1, 0x05, 0xf9, 0x39, 0x99,
-	0xc9, 0x95, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xbc, 0x10, 0x79, 0xbd, 0xcc, 0xc4, 0x5c,
-	0xbd, 0x32, 0x43, 0x29, 0x49, 0xa8, 0xf2, 0xc4, 0x82, 0x4c, 0xfd, 0xa2, 0xd4, 0xe2, 0xfc, 0xd2,
-	0xa2, 0xe4, 0x54, 0x88, 0x4a, 0x29, 0x29, 0x54, 0x93, 0x90, 0x4d, 0x91, 0x92, 0x41, 0xd2, 0x96,
-	0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99, 0x9f, 0x57, 0x0c, 0x91, 0x55, 0x4a, 0xe0, 0x12,
-	0x0e, 0x4e, 0x2d, 0xf1, 0x4c, 0xcc, 0x0d, 0x00, 0xeb, 0x09, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e,
-	0x11, 0x92, 0xe2, 0xe2, 0x80, 0x59, 0x21, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe7, 0x0b,
-	0xe9, 0x72, 0xb1, 0x41, 0x2c, 0x90, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x36, 0x12, 0xd5, 0x43, 0x71,
-	0xa7, 0x1e, 0xd4, 0x24, 0xa8, 0x22, 0x25, 0x43, 0x2e, 0x61, 0x77, 0xd2, 0x6c, 0x50, 0x8a, 0xe4,
-	0x92, 0x0c, 0x49, 0x2d, 0x06, 0xeb, 0x49, 0x2d, 0xca, 0xcd, 0x2c, 0x2e, 0x06, 0x39, 0x98, 0x18,
-	0xa7, 0x29, 0x70, 0x71, 0x17, 0x20, 0x74, 0x48, 0x30, 0x29, 0x30, 0x6b, 0x70, 0x06, 0x21, 0x0b,
-	0x29, 0xd9, 0x71, 0x49, 0x61, 0x33, 0xba, 0xb8, 0x20, 0x3f, 0xaf, 0x18, 0x43, 0x3f, 0x23, 0x86,
-	0x7e, 0xa3, 0x29, 0xcc, 0x5c, 0x9c, 0x9e, 0x8e, 0xbe, 0x10, 0xbf, 0x08, 0x95, 0x70, 0xf1, 0x20,
-	0x87, 0x9e, 0x90, 0x12, 0x5a, 0x50, 0x60, 0x09, 0x5a, 0x29, 0xec, 0xc1, 0xa5, 0xa4, 0xd9, 0x74,
-	0xf9, 0xc9, 0x64, 0x26, 0x65, 0x25, 0x39, 0x50, 0x04, 0x56, 0xc3, 0x7c, 0x64, 0xab, 0xa5, 0x55,
-	0x6b, 0x55, 0x8c, 0x64, 0x8a, 0x15, 0xa3, 0x16, 0xc8, 0x56, 0x77, 0x7c, 0xb6, 0xba, 0x53, 0xc5,
-	0xd6, 0x74, 0x34, 0x5b, 0x67, 0x31, 0x72, 0x09, 0x61, 0x06, 0x9d, 0x90, 0x06, 0x9a, 0xc1, 0x38,
-	0x23, 0x4e, 0x4a, 0x93, 0x08, 0x95, 0x90, 0x78, 0x50, 0xd2, 0x07, 0x3b, 0x4b, 0x53, 0x49, 0x05,
-	0xd3, 0x59, 0x25, 0x18, 0xba, 0xac, 0x18, 0xb5, 0x9c, 0xda, 0x18, 0xb9, 0x04, 0x93, 0xf3, 0x73,
-	0x51, 0x6d, 0x70, 0xe2, 0x83, 0x7b, 0x20, 0x00, 0x94, 0xd8, 0x03, 0x18, 0xa3, 0x0c, 0xa0, 0x0a,
-	0xd2, 0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5, 0xf2, 0x8b, 0xd2, 0xf5, 0xd3, 0x53, 0xf3, 0xc0, 0x59,
-	0x41, 0x1f, 0x22, 0x95, 0x58, 0x90, 0x59, 0x0c, 0xcd, 0x47, 0xd6, 0x99, 0x89, 0xb9, 0x3f, 0x18,
-	0x19, 0x57, 0x31, 0x09, 0xbb, 0x43, 0x74, 0x39, 0xe7, 0xe4, 0x97, 0xa6, 0xe8, 0x79, 0x26, 0xe6,
-	0xea, 0x85, 0x19, 0x9e, 0x82, 0x89, 0xc6, 0x80, 0x45, 0x63, 0x3c, 0x13, 0x73, 0x63, 0xc2, 0x0c,
-	0x93, 0xd8, 0xc0, 0x66, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xba, 0x05, 0xa3, 0xc3, 0xdc,
-	0x03, 0x00, 0x00,
-}
diff --git a/googleapis/iam/v1/logging/audit_data.pb.go b/googleapis/iam/v1/logging/audit_data.pb.go
index a60eb17b82..2dafa31570 100644
--- a/googleapis/iam/v1/logging/audit_data.pb.go
+++ b/googleapis/iam/v1/logging/audit_data.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/logging/audit_data.proto
 
-package logging // import "google.golang.org/genproto/googleapis/iam/v1/logging"
+package logging
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Audit log information specific to Cloud IAM. This message is serialized
 // as an `Any` type in the `ServiceData` message of an
@@ -35,16 +38,17 @@ func (m *AuditData) Reset()         { *m = AuditData{} }
 func (m *AuditData) String() string { return proto.CompactTextString(m) }
 func (*AuditData) ProtoMessage()    {}
 func (*AuditData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_audit_data_25c24f9d71f1cfd7, []int{0}
+	return fileDescriptor_fe22f7c00ab4acd5, []int{0}
 }
+
 func (m *AuditData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuditData.Unmarshal(m, b)
 }
 func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
 }
-func (dst *AuditData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuditData.Merge(dst, src)
+func (m *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(m, src)
 }
 func (m *AuditData) XXX_Size() int {
 	return xxx_messageInfo_AuditData.Size(m)
@@ -67,10 +71,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/iam/v1/logging/audit_data.proto", fileDescriptor_audit_data_25c24f9d71f1cfd7)
+	proto.RegisterFile("google/iam/v1/logging/audit_data.proto", fileDescriptor_fe22f7c00ab4acd5)
 }
 
-var fileDescriptor_audit_data_25c24f9d71f1cfd7 = []byte{
+var fileDescriptor_fe22f7c00ab4acd5 = []byte{
 	// 236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4a, 0x04, 0x31,
 	0x10, 0x86, 0xd9, 0x2b, 0x04, 0x73, 0x62, 0x71, 0x20, 0x68, 0xb4, 0x10, 0x0b, 0xb1, 0x9a, 0xb0,
diff --git a/googleapis/iam/v1/policy.pb.go b/googleapis/iam/v1/policy.pb.go
index 9100ef9c20..16301673f8 100644
--- a/googleapis/iam/v1/policy.pb.go
+++ b/googleapis/iam/v1/policy.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/policy.proto
 
-package iam // import "google.golang.org/genproto/googleapis/iam/v1"
+package iam
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import expr "google.golang.org/genproto/googleapis/type/expr"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	expr "google.golang.org/genproto/googleapis/type/expr"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The type of action performed on a Binding in a policy.
 type BindingDelta_Action int32
@@ -37,6 +40,7 @@ var BindingDelta_Action_name = map[int32]string{
 	1: "ADD",
 	2: "REMOVE",
 }
+
 var BindingDelta_Action_value = map[string]int32{
 	"ACTION_UNSPECIFIED": 0,
 	"ADD":                1,
@@ -46,8 +50,9 @@ var BindingDelta_Action_value = map[string]int32{
 func (x BindingDelta_Action) String() string {
 	return proto.EnumName(BindingDelta_Action_name, int32(x))
 }
+
 func (BindingDelta_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_178c0196ea84d022, []int{3, 0}
+	return fileDescriptor_a3cd40b8a66b2a99, []int{3, 0}
 }
 
 // The type of action performed on an audit configuration in a policy.
@@ -67,6 +72,7 @@ var AuditConfigDelta_Action_name = map[int32]string{
 	1: "ADD",
 	2: "REMOVE",
 }
+
 var AuditConfigDelta_Action_value = map[string]int32{
 	"ACTION_UNSPECIFIED": 0,
 	"ADD":                1,
@@ -76,8 +82,9 @@ var AuditConfigDelta_Action_value = map[string]int32{
 func (x AuditConfigDelta_Action) String() string {
 	return proto.EnumName(AuditConfigDelta_Action_name, int32(x))
 }
+
 func (AuditConfigDelta_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_policy_178c0196ea84d022, []int{4, 0}
+	return fileDescriptor_a3cd40b8a66b2a99, []int{4, 0}
 }
 
 // Defines an Identity and Access Management (IAM) policy. It is used to
@@ -151,16 +158,17 @@ func (m *Policy) Reset()         { *m = Policy{} }
 func (m *Policy) String() string { return proto.CompactTextString(m) }
 func (*Policy) ProtoMessage()    {}
 func (*Policy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_178c0196ea84d022, []int{0}
+	return fileDescriptor_a3cd40b8a66b2a99, []int{0}
 }
+
 func (m *Policy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Policy.Unmarshal(m, b)
 }
 func (m *Policy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Policy.Marshal(b, m, deterministic)
 }
-func (dst *Policy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Policy.Merge(dst, src)
+func (m *Policy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Policy.Merge(m, src)
 }
 func (m *Policy) XXX_Size() int {
 	return xxx_messageInfo_Policy.Size(m)
@@ -236,16 +244,17 @@ func (m *Binding) Reset()         { *m = Binding{} }
 func (m *Binding) String() string { return proto.CompactTextString(m) }
 func (*Binding) ProtoMessage()    {}
 func (*Binding) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_178c0196ea84d022, []int{1}
+	return fileDescriptor_a3cd40b8a66b2a99, []int{1}
 }
+
 func (m *Binding) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Binding.Unmarshal(m, b)
 }
 func (m *Binding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Binding.Marshal(b, m, deterministic)
 }
-func (dst *Binding) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Binding.Merge(dst, src)
+func (m *Binding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Binding.Merge(m, src)
 }
 func (m *Binding) XXX_Size() int {
 	return xxx_messageInfo_Binding.Size(m)
@@ -292,16 +301,17 @@ func (m *PolicyDelta) Reset()         { *m = PolicyDelta{} }
 func (m *PolicyDelta) String() string { return proto.CompactTextString(m) }
 func (*PolicyDelta) ProtoMessage()    {}
 func (*PolicyDelta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_178c0196ea84d022, []int{2}
+	return fileDescriptor_a3cd40b8a66b2a99, []int{2}
 }
+
 func (m *PolicyDelta) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolicyDelta.Unmarshal(m, b)
 }
 func (m *PolicyDelta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolicyDelta.Marshal(b, m, deterministic)
 }
-func (dst *PolicyDelta) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolicyDelta.Merge(dst, src)
+func (m *PolicyDelta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyDelta.Merge(m, src)
 }
 func (m *PolicyDelta) XXX_Size() int {
 	return xxx_messageInfo_PolicyDelta.Size(m)
@@ -352,16 +362,17 @@ func (m *BindingDelta) Reset()         { *m = BindingDelta{} }
 func (m *BindingDelta) String() string { return proto.CompactTextString(m) }
 func (*BindingDelta) ProtoMessage()    {}
 func (*BindingDelta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_178c0196ea84d022, []int{3}
+	return fileDescriptor_a3cd40b8a66b2a99, []int{3}
 }
+
 func (m *BindingDelta) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BindingDelta.Unmarshal(m, b)
 }
 func (m *BindingDelta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BindingDelta.Marshal(b, m, deterministic)
 }
-func (dst *BindingDelta) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BindingDelta.Merge(dst, src)
+func (m *BindingDelta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BindingDelta.Merge(m, src)
 }
 func (m *BindingDelta) XXX_Size() int {
 	return xxx_messageInfo_BindingDelta.Size(m)
@@ -428,16 +439,17 @@ func (m *AuditConfigDelta) Reset()         { *m = AuditConfigDelta{} }
 func (m *AuditConfigDelta) String() string { return proto.CompactTextString(m) }
 func (*AuditConfigDelta) ProtoMessage()    {}
 func (*AuditConfigDelta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_policy_178c0196ea84d022, []int{4}
+	return fileDescriptor_a3cd40b8a66b2a99, []int{4}
 }
+
 func (m *AuditConfigDelta) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuditConfigDelta.Unmarshal(m, b)
 }
 func (m *AuditConfigDelta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AuditConfigDelta.Marshal(b, m, deterministic)
 }
-func (dst *AuditConfigDelta) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AuditConfigDelta.Merge(dst, src)
+func (m *AuditConfigDelta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditConfigDelta.Merge(m, src)
 }
 func (m *AuditConfigDelta) XXX_Size() int {
 	return xxx_messageInfo_AuditConfigDelta.Size(m)
@@ -477,18 +489,18 @@ func (m *AuditConfigDelta) GetLogType() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.iam.v1.BindingDelta_Action", BindingDelta_Action_name, BindingDelta_Action_value)
+	proto.RegisterEnum("google.iam.v1.AuditConfigDelta_Action", AuditConfigDelta_Action_name, AuditConfigDelta_Action_value)
 	proto.RegisterType((*Policy)(nil), "google.iam.v1.Policy")
 	proto.RegisterType((*Binding)(nil), "google.iam.v1.Binding")
 	proto.RegisterType((*PolicyDelta)(nil), "google.iam.v1.PolicyDelta")
 	proto.RegisterType((*BindingDelta)(nil), "google.iam.v1.BindingDelta")
 	proto.RegisterType((*AuditConfigDelta)(nil), "google.iam.v1.AuditConfigDelta")
-	proto.RegisterEnum("google.iam.v1.BindingDelta_Action", BindingDelta_Action_name, BindingDelta_Action_value)
-	proto.RegisterEnum("google.iam.v1.AuditConfigDelta_Action", AuditConfigDelta_Action_name, AuditConfigDelta_Action_value)
 }
 
-func init() { proto.RegisterFile("google/iam/v1/policy.proto", fileDescriptor_policy_178c0196ea84d022) }
+func init() { proto.RegisterFile("google/iam/v1/policy.proto", fileDescriptor_a3cd40b8a66b2a99) }
 
-var fileDescriptor_policy_178c0196ea84d022 = []byte{
+var fileDescriptor_a3cd40b8a66b2a99 = []byte{
 	// 550 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0xae, 0xd2, 0x4e,
 	0x14, 0xc7, 0x7f, 0x03, 0xfc, 0xca, 0xe5, 0x70, 0x2f, 0xc2, 0xdc, 0x84, 0x54, 0x34, 0x91, 0x74,
diff --git a/googleapis/logging/type/http_request.pb.go b/googleapis/logging/type/http_request.pb.go
index 2645d3b3c3..9c7cde0580 100644
--- a/googleapis/logging/type/http_request.pb.go
+++ b/googleapis/logging/type/http_request.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/type/http_request.proto
 
-package ltype // import "google.golang.org/genproto/googleapis/logging/type"
+package ltype
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A common proto for logging HTTP requests. Only contains semantics
 // defined by the HTTP specification. Product-specific logging
@@ -79,16 +82,17 @@ func (m *HttpRequest) Reset()         { *m = HttpRequest{} }
 func (m *HttpRequest) String() string { return proto.CompactTextString(m) }
 func (*HttpRequest) ProtoMessage()    {}
 func (*HttpRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_http_request_d38264e6a7ae2dc7, []int{0}
+	return fileDescriptor_ea45f4ec7ed7b641, []int{0}
 }
+
 func (m *HttpRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpRequest.Unmarshal(m, b)
 }
 func (m *HttpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpRequest.Marshal(b, m, deterministic)
 }
-func (dst *HttpRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpRequest.Merge(dst, src)
+func (m *HttpRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpRequest.Merge(m, src)
 }
 func (m *HttpRequest) XXX_Size() int {
 	return xxx_messageInfo_HttpRequest.Size(m)
@@ -209,10 +213,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/logging/type/http_request.proto", fileDescriptor_http_request_d38264e6a7ae2dc7)
+	proto.RegisterFile("google/logging/type/http_request.proto", fileDescriptor_ea45f4ec7ed7b641)
 }
 
-var fileDescriptor_http_request_d38264e6a7ae2dc7 = []byte{
+var fileDescriptor_ea45f4ec7ed7b641 = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x5b, 0x6b, 0x14, 0x31,
 	0x18, 0x86, 0x99, 0x1e, 0xf6, 0x90, 0x3d, 0x58, 0x22, 0x68, 0xba, 0x6a, 0x5d, 0x2b, 0xca, 0x5c,
diff --git a/googleapis/logging/type/log_severity.pb.go b/googleapis/logging/type/log_severity.pb.go
index 9a4464d853..727ff367fd 100644
--- a/googleapis/logging/type/log_severity.pb.go
+++ b/googleapis/logging/type/log_severity.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/type/log_severity.proto
 
-package ltype // import "google.golang.org/genproto/googleapis/logging/type"
+package ltype
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The severity of the event described in a log entry, expressed as one of the
 // standard severity levels listed below.  For your reference, the levels are
@@ -69,6 +72,7 @@ var LogSeverity_name = map[int32]string{
 	700: "ALERT",
 	800: "EMERGENCY",
 }
+
 var LogSeverity_value = map[string]int32{
 	"DEFAULT":   0,
 	"DEBUG":     100,
@@ -84,8 +88,9 @@ var LogSeverity_value = map[string]int32{
 func (x LogSeverity) String() string {
 	return proto.EnumName(LogSeverity_name, int32(x))
 }
+
 func (LogSeverity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_log_severity_03d6cc62dd9e1ef9, []int{0}
+	return fileDescriptor_80f950dcc0b66556, []int{0}
 }
 
 func init() {
@@ -93,10 +98,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/logging/type/log_severity.proto", fileDescriptor_log_severity_03d6cc62dd9e1ef9)
+	proto.RegisterFile("google/logging/type/log_severity.proto", fileDescriptor_80f950dcc0b66556)
 }
 
-var fileDescriptor_log_severity_03d6cc62dd9e1ef9 = []byte{
+var fileDescriptor_80f950dcc0b66556 = []byte{
 	// 309 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0xcf, 0xc9, 0x4f, 0x4f, 0xcf, 0xcc, 0x4b, 0xd7, 0x2f, 0xa9, 0x2c, 0x00, 0x73,
diff --git a/googleapis/logging/v2/log_entry.pb.go b/googleapis/logging/v2/log_entry.pb.go
index d4c792da01..3c01a7dcaf 100644
--- a/googleapis/logging/v2/log_entry.pb.go
+++ b/googleapis/logging/v2/log_entry.pb.go
@@ -1,17 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/log_entry.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import _type "google.golang.org/genproto/googleapis/logging/type"
+package logging
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	_type "google.golang.org/genproto/googleapis/logging/type"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -22,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An individual entry in a log.
 type LogEntry struct {
@@ -129,16 +132,17 @@ func (m *LogEntry) Reset()         { *m = LogEntry{} }
 func (m *LogEntry) String() string { return proto.CompactTextString(m) }
 func (*LogEntry) ProtoMessage()    {}
 func (*LogEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_log_entry_8cde5d9d784a97a7, []int{0}
+	return fileDescriptor_8ba2017251165146, []int{0}
 }
+
 func (m *LogEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogEntry.Unmarshal(m, b)
 }
 func (m *LogEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogEntry.Marshal(b, m, deterministic)
 }
-func (dst *LogEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogEntry.Merge(dst, src)
+func (m *LogEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntry.Merge(m, src)
 }
 func (m *LogEntry) XXX_Size() int {
 	return xxx_messageInfo_LogEntry.Size(m)
@@ -297,95 +301,15 @@ func (m *LogEntry) GetSourceLocation() *LogEntrySourceLocation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LogEntry) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LogEntry_OneofMarshaler, _LogEntry_OneofUnmarshaler, _LogEntry_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LogEntry) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LogEntry_ProtoPayload)(nil),
 		(*LogEntry_TextPayload)(nil),
 		(*LogEntry_JsonPayload)(nil),
 	}
 }
 
-func _LogEntry_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LogEntry)
-	// payload
-	switch x := m.Payload.(type) {
-	case *LogEntry_ProtoPayload:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ProtoPayload); err != nil {
-			return err
-		}
-	case *LogEntry_TextPayload:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.TextPayload)
-	case *LogEntry_JsonPayload:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JsonPayload); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LogEntry.Payload has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LogEntry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LogEntry)
-	switch tag {
-	case 2: // payload.proto_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Payload = &LogEntry_ProtoPayload{msg}
-		return true, err
-	case 3: // payload.text_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Payload = &LogEntry_TextPayload{x}
-		return true, err
-	case 6: // payload.json_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.Struct)
-		err := b.DecodeMessage(msg)
-		m.Payload = &LogEntry_JsonPayload{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LogEntry_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LogEntry)
-	// payload
-	switch x := m.Payload.(type) {
-	case *LogEntry_ProtoPayload:
-		s := proto.Size(x.ProtoPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LogEntry_TextPayload:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TextPayload)))
-		n += len(x.TextPayload)
-	case *LogEntry_JsonPayload:
-		s := proto.Size(x.JsonPayload)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Additional information about a potentially long-running operation with which
 // a log entry is associated.
 type LogEntryOperation struct {
@@ -409,16 +333,17 @@ func (m *LogEntryOperation) Reset()         { *m = LogEntryOperation{} }
 func (m *LogEntryOperation) String() string { return proto.CompactTextString(m) }
 func (*LogEntryOperation) ProtoMessage()    {}
 func (*LogEntryOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_log_entry_8cde5d9d784a97a7, []int{1}
+	return fileDescriptor_8ba2017251165146, []int{1}
 }
+
 func (m *LogEntryOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogEntryOperation.Unmarshal(m, b)
 }
 func (m *LogEntryOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogEntryOperation.Marshal(b, m, deterministic)
 }
-func (dst *LogEntryOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogEntryOperation.Merge(dst, src)
+func (m *LogEntryOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntryOperation.Merge(m, src)
 }
 func (m *LogEntryOperation) XXX_Size() int {
 	return xxx_messageInfo_LogEntryOperation.Size(m)
@@ -482,16 +407,17 @@ func (m *LogEntrySourceLocation) Reset()         { *m = LogEntrySourceLocation{}
 func (m *LogEntrySourceLocation) String() string { return proto.CompactTextString(m) }
 func (*LogEntrySourceLocation) ProtoMessage()    {}
 func (*LogEntrySourceLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_log_entry_8cde5d9d784a97a7, []int{2}
+	return fileDescriptor_8ba2017251165146, []int{2}
 }
+
 func (m *LogEntrySourceLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogEntrySourceLocation.Unmarshal(m, b)
 }
 func (m *LogEntrySourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogEntrySourceLocation.Marshal(b, m, deterministic)
 }
-func (dst *LogEntrySourceLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogEntrySourceLocation.Merge(dst, src)
+func (m *LogEntrySourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntrySourceLocation.Merge(m, src)
 }
 func (m *LogEntrySourceLocation) XXX_Size() int {
 	return xxx_messageInfo_LogEntrySourceLocation.Size(m)
@@ -530,11 +456,9 @@ func init() {
 	proto.RegisterType((*LogEntrySourceLocation)(nil), "google.logging.v2.LogEntrySourceLocation")
 }
 
-func init() {
-	proto.RegisterFile("google/logging/v2/log_entry.proto", fileDescriptor_log_entry_8cde5d9d784a97a7)
-}
+func init() { proto.RegisterFile("google/logging/v2/log_entry.proto", fileDescriptor_8ba2017251165146) }
 
-var fileDescriptor_log_entry_8cde5d9d784a97a7 = []byte{
+var fileDescriptor_8ba2017251165146 = []byte{
 	// 772 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0xdd, 0x8e, 0xdb, 0x44,
 	0x14, 0xae, 0x93, 0xb2, 0x71, 0x26, 0xd9, 0x6d, 0x77, 0x54, 0x1a, 0x6f, 0x5a, 0x20, 0x6c, 0xf9,
diff --git a/googleapis/logging/v2/logging.pb.go b/googleapis/logging/v2/logging.pb.go
index 353442738b..3d5b9aaa91 100644
--- a/googleapis/logging/v2/logging.pb.go
+++ b/googleapis/logging/v2/logging.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package logging
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The parameters to DeleteLog.
 type DeleteLogRequest struct {
@@ -53,16 +53,17 @@ func (m *DeleteLogRequest) Reset()         { *m = DeleteLogRequest{} }
 func (m *DeleteLogRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteLogRequest) ProtoMessage()    {}
 func (*DeleteLogRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{0}
+	return fileDescriptor_6a8ba408154557e4, []int{0}
 }
+
 func (m *DeleteLogRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteLogRequest.Unmarshal(m, b)
 }
 func (m *DeleteLogRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteLogRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteLogRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteLogRequest.Merge(dst, src)
+func (m *DeleteLogRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteLogRequest.Merge(m, src)
 }
 func (m *DeleteLogRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteLogRequest.Size(m)
@@ -157,16 +158,17 @@ func (m *WriteLogEntriesRequest) Reset()         { *m = WriteLogEntriesRequest{}
 func (m *WriteLogEntriesRequest) String() string { return proto.CompactTextString(m) }
 func (*WriteLogEntriesRequest) ProtoMessage()    {}
 func (*WriteLogEntriesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{1}
+	return fileDescriptor_6a8ba408154557e4, []int{1}
 }
+
 func (m *WriteLogEntriesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteLogEntriesRequest.Unmarshal(m, b)
 }
 func (m *WriteLogEntriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteLogEntriesRequest.Marshal(b, m, deterministic)
 }
-func (dst *WriteLogEntriesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteLogEntriesRequest.Merge(dst, src)
+func (m *WriteLogEntriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteLogEntriesRequest.Merge(m, src)
 }
 func (m *WriteLogEntriesRequest) XXX_Size() int {
 	return xxx_messageInfo_WriteLogEntriesRequest.Size(m)
@@ -231,16 +233,17 @@ func (m *WriteLogEntriesResponse) Reset()         { *m = WriteLogEntriesResponse
 func (m *WriteLogEntriesResponse) String() string { return proto.CompactTextString(m) }
 func (*WriteLogEntriesResponse) ProtoMessage()    {}
 func (*WriteLogEntriesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{2}
+	return fileDescriptor_6a8ba408154557e4, []int{2}
 }
+
 func (m *WriteLogEntriesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteLogEntriesResponse.Unmarshal(m, b)
 }
 func (m *WriteLogEntriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteLogEntriesResponse.Marshal(b, m, deterministic)
 }
-func (dst *WriteLogEntriesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteLogEntriesResponse.Merge(dst, src)
+func (m *WriteLogEntriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteLogEntriesResponse.Merge(m, src)
 }
 func (m *WriteLogEntriesResponse) XXX_Size() int {
 	return xxx_messageInfo_WriteLogEntriesResponse.Size(m)
@@ -269,16 +272,17 @@ func (m *WriteLogEntriesPartialErrors) Reset()         { *m = WriteLogEntriesPar
 func (m *WriteLogEntriesPartialErrors) String() string { return proto.CompactTextString(m) }
 func (*WriteLogEntriesPartialErrors) ProtoMessage()    {}
 func (*WriteLogEntriesPartialErrors) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{3}
+	return fileDescriptor_6a8ba408154557e4, []int{3}
 }
+
 func (m *WriteLogEntriesPartialErrors) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WriteLogEntriesPartialErrors.Unmarshal(m, b)
 }
 func (m *WriteLogEntriesPartialErrors) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WriteLogEntriesPartialErrors.Marshal(b, m, deterministic)
 }
-func (dst *WriteLogEntriesPartialErrors) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteLogEntriesPartialErrors.Merge(dst, src)
+func (m *WriteLogEntriesPartialErrors) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteLogEntriesPartialErrors.Merge(m, src)
 }
 func (m *WriteLogEntriesPartialErrors) XXX_Size() int {
 	return xxx_messageInfo_WriteLogEntriesPartialErrors.Size(m)
@@ -347,16 +351,17 @@ func (m *ListLogEntriesRequest) Reset()         { *m = ListLogEntriesRequest{} }
 func (m *ListLogEntriesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListLogEntriesRequest) ProtoMessage()    {}
 func (*ListLogEntriesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{4}
+	return fileDescriptor_6a8ba408154557e4, []int{4}
 }
+
 func (m *ListLogEntriesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLogEntriesRequest.Unmarshal(m, b)
 }
 func (m *ListLogEntriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLogEntriesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListLogEntriesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLogEntriesRequest.Merge(dst, src)
+func (m *ListLogEntriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogEntriesRequest.Merge(m, src)
 }
 func (m *ListLogEntriesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListLogEntriesRequest.Size(m)
@@ -436,16 +441,17 @@ func (m *ListLogEntriesResponse) Reset()         { *m = ListLogEntriesResponse{}
 func (m *ListLogEntriesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListLogEntriesResponse) ProtoMessage()    {}
 func (*ListLogEntriesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{5}
+	return fileDescriptor_6a8ba408154557e4, []int{5}
 }
+
 func (m *ListLogEntriesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLogEntriesResponse.Unmarshal(m, b)
 }
 func (m *ListLogEntriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLogEntriesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListLogEntriesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLogEntriesResponse.Merge(dst, src)
+func (m *ListLogEntriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogEntriesResponse.Merge(m, src)
 }
 func (m *ListLogEntriesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListLogEntriesResponse.Size(m)
@@ -492,16 +498,17 @@ func (m *ListMonitoredResourceDescriptorsRequest) Reset() {
 func (m *ListMonitoredResourceDescriptorsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsRequest) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{6}
+	return fileDescriptor_6a8ba408154557e4, []int{6}
 }
+
 func (m *ListMonitoredResourceDescriptorsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Unmarshal(m, b)
 }
 func (m *ListMonitoredResourceDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(dst, src)
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(m, src)
 }
 func (m *ListMonitoredResourceDescriptorsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Size(m)
@@ -545,16 +552,17 @@ func (m *ListMonitoredResourceDescriptorsResponse) Reset() {
 func (m *ListMonitoredResourceDescriptorsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsResponse) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{7}
+	return fileDescriptor_6a8ba408154557e4, []int{7}
 }
+
 func (m *ListMonitoredResourceDescriptorsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Unmarshal(m, b)
 }
 func (m *ListMonitoredResourceDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(dst, src)
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(m, src)
 }
 func (m *ListMonitoredResourceDescriptorsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Size(m)
@@ -606,16 +614,17 @@ func (m *ListLogsRequest) Reset()         { *m = ListLogsRequest{} }
 func (m *ListLogsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListLogsRequest) ProtoMessage()    {}
 func (*ListLogsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{8}
+	return fileDescriptor_6a8ba408154557e4, []int{8}
 }
+
 func (m *ListLogsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLogsRequest.Unmarshal(m, b)
 }
 func (m *ListLogsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLogsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListLogsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLogsRequest.Merge(dst, src)
+func (m *ListLogsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogsRequest.Merge(m, src)
 }
 func (m *ListLogsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListLogsRequest.Size(m)
@@ -666,16 +675,17 @@ func (m *ListLogsResponse) Reset()         { *m = ListLogsResponse{} }
 func (m *ListLogsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListLogsResponse) ProtoMessage()    {}
 func (*ListLogsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_edbca3a2edcc1759, []int{9}
+	return fileDescriptor_6a8ba408154557e4, []int{9}
 }
+
 func (m *ListLogsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLogsResponse.Unmarshal(m, b)
 }
 func (m *ListLogsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLogsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListLogsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLogsResponse.Merge(dst, src)
+func (m *ListLogsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogsResponse.Merge(m, src)
 }
 func (m *ListLogsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListLogsResponse.Size(m)
@@ -715,6 +725,81 @@ func init() {
 	proto.RegisterType((*ListLogsResponse)(nil), "google.logging.v2.ListLogsResponse")
 }
 
+func init() { proto.RegisterFile("google/logging/v2/logging.proto", fileDescriptor_6a8ba408154557e4) }
+
+var fileDescriptor_6a8ba408154557e4 = []byte{
+	// 1093 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0xdc, 0x44,
+	0x14, 0xd7, 0x6c, 0x9a, 0xcd, 0xee, 0x84, 0x26, 0xdb, 0x69, 0xb3, 0x71, 0x77, 0x93, 0x66, 0xb3,
+	0xab, 0x90, 0x8d, 0x25, 0x6c, 0x69, 0x51, 0xa5, 0x36, 0x55, 0x0f, 0xa4, 0x8d, 0x10, 0x52, 0x8a,
+	0x22, 0x07, 0x52, 0x29, 0x8a, 0xb4, 0x72, 0xec, 0x89, 0x35, 0xd4, 0xeb, 0x31, 0x33, 0xe3, 0x94,
+	0x0d, 0xea, 0xa5, 0x07, 0xbe, 0x00, 0x17, 0xb8, 0x21, 0x6e, 0x70, 0xe0, 0x5b, 0x70, 0xe1, 0x08,
+	0x17, 0x3e, 0x40, 0x6f, 0x9c, 0xb8, 0x71, 0x03, 0x79, 0x66, 0xec, 0x78, 0xff, 0x34, 0x49, 0xb9,
+	0x79, 0xde, 0xfb, 0xcd, 0xbc, 0xf7, 0x7b, 0xf3, 0x7b, 0x6f, 0x0c, 0xd7, 0x02, 0x4a, 0x83, 0x10,
+	0xdb, 0x21, 0x0d, 0x02, 0x12, 0x05, 0xf6, 0x59, 0x2f, 0xfb, 0xb4, 0x62, 0x46, 0x05, 0x45, 0xb7,
+	0x14, 0xc0, 0xca, 0xac, 0x67, 0xbd, 0xc6, 0x8a, 0xde, 0xe3, 0xc6, 0xc4, 0x76, 0xa3, 0x88, 0x0a,
+	0x57, 0x10, 0x1a, 0x71, 0xb5, 0xa1, 0xd1, 0x29, 0x78, 0x07, 0x34, 0x22, 0x82, 0x32, 0xec, 0xf7,
+	0x19, 0xe6, 0x34, 0x61, 0x1e, 0xd6, 0xa0, 0xf5, 0xa9, 0x61, 0xfb, 0x38, 0x12, 0x6c, 0xa8, 0x21,
+	0xf7, 0x34, 0x44, 0xae, 0x4e, 0x92, 0x53, 0xdb, 0x4f, 0x98, 0x0c, 0xa4, 0xfd, 0xcd, 0x71, 0x3f,
+	0x1e, 0xc4, 0x22, 0xdb, 0xbc, 0x36, 0xee, 0x14, 0x64, 0x80, 0xb9, 0x70, 0x07, 0xb1, 0x06, 0x2c,
+	0x6b, 0x00, 0x8b, 0x3d, 0x9b, 0x0b, 0x57, 0x24, 0x3a, 0xfd, 0xf6, 0x07, 0xb0, 0xf6, 0x14, 0x87,
+	0x58, 0xe0, 0x3d, 0x1a, 0x38, 0xf8, 0xcb, 0x04, 0x73, 0x81, 0xee, 0xc2, 0x4a, 0x9a, 0x5d, 0xe4,
+	0x0e, 0xb0, 0x01, 0x5a, 0xa0, 0x5b, 0x75, 0xe6, 0x42, 0x1a, 0x7c, 0xea, 0x0e, 0x70, 0xfb, 0xef,
+	0x12, 0xac, 0x3f, 0x67, 0x44, 0xc2, 0x77, 0x23, 0xc1, 0x08, 0xe6, 0x57, 0xef, 0x42, 0x0f, 0x61,
+	0x25, 0x2b, 0x88, 0x51, 0x6a, 0x81, 0xee, 0x7c, 0x6f, 0xd5, 0xd2, 0x75, 0x76, 0x63, 0x62, 0x3d,
+	0xcb, 0xca, 0xe6, 0x68, 0x90, 0x93, 0xc3, 0xd1, 0x33, 0x58, 0x0e, 0xdd, 0x13, 0x1c, 0x72, 0x63,
+	0xa6, 0x35, 0xd3, 0x9d, 0xef, 0xdd, 0xb7, 0x26, 0x2e, 0xc8, 0x9a, 0x9e, 0x90, 0xb5, 0x27, 0xf7,
+	0xa5, 0xc6, 0xa1, 0xa3, 0x0f, 0x41, 0xf7, 0xe1, 0x1c, 0x56, 0x28, 0xe3, 0x86, 0x3c, 0xaf, 0x39,
+	0xe5, 0x3c, 0x7d, 0xd4, 0xd0, 0xc9, 0xb0, 0x68, 0x13, 0x2e, 0xc6, 0x2e, 0x13, 0xc4, 0x0d, 0xfb,
+	0x3c, 0xf1, 0x3c, 0xcc, 0xb9, 0x31, 0xdb, 0x02, 0xdd, 0x8a, 0xb3, 0xa0, 0xcd, 0x07, 0xca, 0x8a,
+	0x96, 0xe1, 0x9c, 0xcf, 0x86, 0x7d, 0x96, 0x44, 0x46, 0x59, 0x02, 0xca, 0x3e, 0x1b, 0x3a, 0x49,
+	0xd4, 0x78, 0x08, 0xe7, 0x0b, 0xf9, 0xa0, 0x1a, 0x9c, 0x79, 0x81, 0x87, 0xba, 0x4e, 0xe9, 0x27,
+	0xba, 0x03, 0x67, 0xcf, 0xdc, 0x30, 0x51, 0x05, 0xaa, 0x3a, 0x6a, 0xb1, 0x5d, 0x7a, 0x00, 0xda,
+	0x77, 0xe1, 0xf2, 0x04, 0x43, 0x1e, 0xd3, 0x88, 0xe3, 0xf6, 0x1b, 0x00, 0x57, 0xc6, 0x7c, 0xfb,
+	0x2a, 0xa1, 0x5d, 0xc6, 0x28, 0xe3, 0x68, 0x00, 0x6b, 0xb9, 0xd0, 0xfa, 0x58, 0xda, 0x0c, 0x20,
+	0x89, 0x3f, 0xb9, 0xba, 0x90, 0x23, 0x47, 0xe5, 0x55, 0x51, 0x4b, 0x55, 0xa0, 0x85, 0x70, 0xc4,
+	0xd8, 0xf8, 0x1c, 0xde, 0x9e, 0x02, 0x2b, 0xb2, 0x9d, 0x55, 0x6c, 0xbb, 0x45, 0xb6, 0xf3, 0x3d,
+	0x94, 0x25, 0xc3, 0x62, 0xcf, 0x3a, 0x90, 0xfa, 0x2c, 0x56, 0xe0, 0x77, 0x00, 0x97, 0xf6, 0x08,
+	0x17, 0x93, 0xa2, 0xeb, 0xc0, 0xf9, 0x98, 0xd1, 0x2f, 0xb0, 0x27, 0xfa, 0xc4, 0x57, 0xd4, 0xaa,
+	0x3b, 0x25, 0x03, 0x38, 0x50, 0x9b, 0x3f, 0xf1, 0x39, 0xda, 0x80, 0x0b, 0x99, 0x9e, 0xa4, 0x3c,
+	0xb9, 0x51, 0x49, 0x71, 0xce, 0xcd, 0xcc, 0x9a, 0x8a, 0x94, 0xa3, 0x3a, 0x2c, 0x9f, 0x92, 0x50,
+	0x60, 0xa6, 0xaf, 0x40, 0xaf, 0x52, 0x61, 0x53, 0xe6, 0x63, 0xd6, 0x3f, 0x19, 0x1a, 0x33, 0x4a,
+	0xd8, 0x72, 0xbd, 0x33, 0x44, 0x4d, 0x58, 0x8d, 0xdd, 0x00, 0xf7, 0x39, 0x39, 0xc7, 0xc6, 0x0d,
+	0x49, 0xaf, 0x92, 0x1a, 0x0e, 0xc8, 0x39, 0x46, 0xab, 0x10, 0x4a, 0xa7, 0xa0, 0x2f, 0x70, 0x24,
+	0xf5, 0x52, 0x75, 0x24, 0xfc, 0xb3, 0xd4, 0xd0, 0x7e, 0x09, 0xeb, 0xe3, 0x9c, 0xd4, 0xad, 0x16,
+	0x45, 0x0a, 0xde, 0x41, 0xa4, 0xef, 0xc3, 0xc5, 0x08, 0x7f, 0x25, 0xfa, 0x85, 0xa0, 0x8a, 0xc8,
+	0xcd, 0xd4, 0xbc, 0x9f, 0x07, 0xc6, 0x70, 0x33, 0x0d, 0x3c, 0xd1, 0x75, 0x4f, 0x31, 0xf7, 0x18,
+	0x89, 0x05, 0x65, 0x79, 0x79, 0x47, 0xf8, 0x81, 0x4b, 0xf9, 0x95, 0xc6, 0xf9, 0xfd, 0x02, 0x60,
+	0xf7, 0xea, 0x38, 0x9a, 0xf2, 0x11, 0xbc, 0x93, 0x5f, 0x91, 0x7f, 0xe1, 0xd7, 0xfc, 0x37, 0x2f,
+	0x9d, 0x16, 0x17, 0xe7, 0x39, 0xb7, 0xd9, 0x64, 0x8c, 0x77, 0xa8, 0xcb, 0xa2, 0xbe, 0x90, 0x9c,
+	0x7f, 0x1d, 0x96, 0x63, 0x97, 0xe1, 0x48, 0xe8, 0x4e, 0xd5, 0xab, 0xd1, 0xba, 0x94, 0x2e, 0xad,
+	0xcb, 0xcc, 0x78, 0x5d, 0x9e, 0xc3, 0xda, 0x45, 0x18, 0x4d, 0xbf, 0x09, 0xab, 0xd9, 0xec, 0x54,
+	0x83, 0xae, 0xea, 0x54, 0xf4, 0xf0, 0xbc, 0x76, 0xfe, 0xbd, 0x3f, 0xe7, 0x60, 0x6d, 0x4f, 0x09,
+	0xe4, 0x00, 0xb3, 0x33, 0xe2, 0xe1, 0xc3, 0x1e, 0xfa, 0x0b, 0xc0, 0x6a, 0x3e, 0xe0, 0x51, 0x67,
+	0x8a, 0x90, 0xc6, 0xc7, 0x7f, 0xa3, 0x9e, 0x81, 0xb2, 0xd7, 0xc4, 0xda, 0x4d, 0x9f, 0x9a, 0xf6,
+	0x0f, 0xe0, 0xf5, 0x1f, 0x6f, 0xbe, 0x2d, 0x7d, 0x0f, 0xcc, 0x56, 0xfa, 0x80, 0x7d, 0x9d, 0x65,
+	0xfc, 0x58, 0xb7, 0x1a, 0xb7, 0xcd, 0xf4, 0x55, 0xe3, 0xb6, 0xf9, 0xea, 0x68, 0xd3, 0xdc, 0x18,
+	0xc5, 0x50, 0x16, 0xb8, 0x11, 0x39, 0x57, 0x4f, 0x67, 0x01, 0xb8, 0x6e, 0xae, 0x8d, 0x02, 0x4f,
+	0x69, 0xe8, 0x63, 0x56, 0x84, 0x6c, 0x99, 0x9b, 0xa3, 0x90, 0x13, 0x12, 0x86, 0x24, 0x0a, 0x3e,
+	0xf2, 0x3c, 0x9a, 0x44, 0xc5, 0xb0, 0xe8, 0x1b, 0x00, 0x17, 0xc7, 0x86, 0x18, 0xda, 0xba, 0xf6,
+	0x8b, 0xd1, 0x30, 0xaf, 0x03, 0xd5, 0xa3, 0x77, 0x45, 0x16, 0xa3, 0xde, 0xbe, 0x95, 0xe6, 0xa6,
+	0x5b, 0x70, 0xfb, 0x65, 0x0a, 0xde, 0x06, 0x26, 0x7a, 0x0d, 0xe0, 0xc2, 0x68, 0x77, 0xa3, 0xee,
+	0xb4, 0x26, 0x9e, 0x36, 0xd4, 0x1a, 0x5b, 0xd7, 0x40, 0xea, 0x2c, 0x9a, 0x32, 0x8b, 0xa5, 0x76,
+	0xad, 0x98, 0x45, 0x48, 0xb8, 0x48, 0x93, 0xf8, 0x15, 0xc0, 0xd6, 0x55, 0x1d, 0x88, 0xb6, 0xdf,
+	0x12, 0xec, 0x1a, 0xe3, 0xa1, 0xf1, 0xe8, 0x7f, 0xed, 0xd5, 0xa9, 0x77, 0x65, 0xea, 0x6d, 0x24,
+	0xc5, 0x34, 0xb8, 0x2c, 0xc5, 0x7f, 0x01, 0xac, 0x64, 0x2d, 0x83, 0xda, 0x6f, 0x2f, 0x4e, 0x9e,
+	0x57, 0xe7, 0x52, 0x8c, 0x8e, 0xff, 0x93, 0x92, 0xf3, 0x8f, 0x00, 0x2d, 0x49, 0x79, 0xa9, 0xd6,
+	0x7e, 0x6c, 0xda, 0xe6, 0x2b, 0xa9, 0xa7, 0xa3, 0x7b, 0x68, 0xa5, 0xe8, 0xb8, 0x50, 0xb9, 0xf6,
+	0x77, 0xd0, 0x7a, 0xd1, 0x3f, 0xa6, 0x70, 0x0d, 0x5a, 0x45, 0xcd, 0x22, 0x28, 0x57, 0xb7, 0x76,
+	0x6f, 0xa0, 0x4e, 0xd1, 0x3d, 0xa1, 0x6c, 0x05, 0xdb, 0xf9, 0x0e, 0xc0, 0x25, 0x8f, 0x0e, 0x26,
+	0x69, 0xed, 0xbc, 0xa7, 0x3b, 0x7e, 0x3f, 0xed, 0xd5, 0x7d, 0x70, 0xf4, 0x40, 0x43, 0x02, 0x1a,
+	0xba, 0x51, 0x60, 0x51, 0x16, 0xd8, 0x01, 0x8e, 0x64, 0x27, 0xdb, 0xca, 0xe5, 0xc6, 0x84, 0x17,
+	0x7e, 0x44, 0x1f, 0xe9, 0xcf, 0x7f, 0x00, 0xf8, 0xb9, 0xb4, 0xfc, 0xb1, 0xda, 0xfd, 0x24, 0xa4,
+	0x89, 0x6f, 0xe9, 0xa3, 0xad, 0xc3, 0xde, 0x6f, 0x99, 0xe7, 0x58, 0x7a, 0x8e, 0xb5, 0xe7, 0xf8,
+	0xb0, 0x77, 0x52, 0x96, 0x67, 0x7f, 0xf8, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xec, 0x91,
+	0x2d, 0x5a, 0x0b, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -952,80 +1037,3 @@ var _LoggingServiceV2_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/logging/v2/logging.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/logging/v2/logging.proto", fileDescriptor_logging_edbca3a2edcc1759)
-}
-
-var fileDescriptor_logging_edbca3a2edcc1759 = []byte{
-	// 1093 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0xdc, 0x44,
-	0x14, 0xd7, 0x6c, 0x9a, 0xcd, 0xee, 0x84, 0x26, 0xdb, 0x69, 0xb3, 0x71, 0x77, 0x93, 0x66, 0xb3,
-	0xab, 0x90, 0x8d, 0x25, 0x6c, 0x69, 0x51, 0xa5, 0x36, 0x55, 0x0f, 0xa4, 0x8d, 0x10, 0x52, 0x8a,
-	0x22, 0x07, 0x52, 0x29, 0x8a, 0xb4, 0x72, 0xec, 0x89, 0x35, 0xd4, 0xeb, 0x31, 0x33, 0xe3, 0x94,
-	0x0d, 0xea, 0xa5, 0x07, 0xbe, 0x00, 0x17, 0xb8, 0x21, 0x6e, 0x70, 0xe0, 0x5b, 0x70, 0xe1, 0x08,
-	0x17, 0x3e, 0x40, 0x6f, 0x9c, 0xb8, 0x71, 0x03, 0x79, 0x66, 0xec, 0x78, 0xff, 0x34, 0x49, 0xb9,
-	0x79, 0xde, 0xfb, 0xcd, 0xbc, 0xf7, 0x7b, 0xf3, 0x7b, 0x6f, 0x0c, 0xd7, 0x02, 0x4a, 0x83, 0x10,
-	0xdb, 0x21, 0x0d, 0x02, 0x12, 0x05, 0xf6, 0x59, 0x2f, 0xfb, 0xb4, 0x62, 0x46, 0x05, 0x45, 0xb7,
-	0x14, 0xc0, 0xca, 0xac, 0x67, 0xbd, 0xc6, 0x8a, 0xde, 0xe3, 0xc6, 0xc4, 0x76, 0xa3, 0x88, 0x0a,
-	0x57, 0x10, 0x1a, 0x71, 0xb5, 0xa1, 0xd1, 0x29, 0x78, 0x07, 0x34, 0x22, 0x82, 0x32, 0xec, 0xf7,
-	0x19, 0xe6, 0x34, 0x61, 0x1e, 0xd6, 0xa0, 0xf5, 0xa9, 0x61, 0xfb, 0x38, 0x12, 0x6c, 0xa8, 0x21,
-	0xf7, 0x34, 0x44, 0xae, 0x4e, 0x92, 0x53, 0xdb, 0x4f, 0x98, 0x0c, 0xa4, 0xfd, 0xcd, 0x71, 0x3f,
-	0x1e, 0xc4, 0x22, 0xdb, 0xbc, 0x36, 0xee, 0x14, 0x64, 0x80, 0xb9, 0x70, 0x07, 0xb1, 0x06, 0x2c,
-	0x6b, 0x00, 0x8b, 0x3d, 0x9b, 0x0b, 0x57, 0x24, 0x3a, 0xfd, 0xf6, 0x07, 0xb0, 0xf6, 0x14, 0x87,
-	0x58, 0xe0, 0x3d, 0x1a, 0x38, 0xf8, 0xcb, 0x04, 0x73, 0x81, 0xee, 0xc2, 0x4a, 0x9a, 0x5d, 0xe4,
-	0x0e, 0xb0, 0x01, 0x5a, 0xa0, 0x5b, 0x75, 0xe6, 0x42, 0x1a, 0x7c, 0xea, 0x0e, 0x70, 0xfb, 0xef,
-	0x12, 0xac, 0x3f, 0x67, 0x44, 0xc2, 0x77, 0x23, 0xc1, 0x08, 0xe6, 0x57, 0xef, 0x42, 0x0f, 0x61,
-	0x25, 0x2b, 0x88, 0x51, 0x6a, 0x81, 0xee, 0x7c, 0x6f, 0xd5, 0xd2, 0x75, 0x76, 0x63, 0x62, 0x3d,
-	0xcb, 0xca, 0xe6, 0x68, 0x90, 0x93, 0xc3, 0xd1, 0x33, 0x58, 0x0e, 0xdd, 0x13, 0x1c, 0x72, 0x63,
-	0xa6, 0x35, 0xd3, 0x9d, 0xef, 0xdd, 0xb7, 0x26, 0x2e, 0xc8, 0x9a, 0x9e, 0x90, 0xb5, 0x27, 0xf7,
-	0xa5, 0xc6, 0xa1, 0xa3, 0x0f, 0x41, 0xf7, 0xe1, 0x1c, 0x56, 0x28, 0xe3, 0x86, 0x3c, 0xaf, 0x39,
-	0xe5, 0x3c, 0x7d, 0xd4, 0xd0, 0xc9, 0xb0, 0x68, 0x13, 0x2e, 0xc6, 0x2e, 0x13, 0xc4, 0x0d, 0xfb,
-	0x3c, 0xf1, 0x3c, 0xcc, 0xb9, 0x31, 0xdb, 0x02, 0xdd, 0x8a, 0xb3, 0xa0, 0xcd, 0x07, 0xca, 0x8a,
-	0x96, 0xe1, 0x9c, 0xcf, 0x86, 0x7d, 0x96, 0x44, 0x46, 0x59, 0x02, 0xca, 0x3e, 0x1b, 0x3a, 0x49,
-	0xd4, 0x78, 0x08, 0xe7, 0x0b, 0xf9, 0xa0, 0x1a, 0x9c, 0x79, 0x81, 0x87, 0xba, 0x4e, 0xe9, 0x27,
-	0xba, 0x03, 0x67, 0xcf, 0xdc, 0x30, 0x51, 0x05, 0xaa, 0x3a, 0x6a, 0xb1, 0x5d, 0x7a, 0x00, 0xda,
-	0x77, 0xe1, 0xf2, 0x04, 0x43, 0x1e, 0xd3, 0x88, 0xe3, 0xf6, 0x1b, 0x00, 0x57, 0xc6, 0x7c, 0xfb,
-	0x2a, 0xa1, 0x5d, 0xc6, 0x28, 0xe3, 0x68, 0x00, 0x6b, 0xb9, 0xd0, 0xfa, 0x58, 0xda, 0x0c, 0x20,
-	0x89, 0x3f, 0xb9, 0xba, 0x90, 0x23, 0x47, 0xe5, 0x55, 0x51, 0x4b, 0x55, 0xa0, 0x85, 0x70, 0xc4,
-	0xd8, 0xf8, 0x1c, 0xde, 0x9e, 0x02, 0x2b, 0xb2, 0x9d, 0x55, 0x6c, 0xbb, 0x45, 0xb6, 0xf3, 0x3d,
-	0x94, 0x25, 0xc3, 0x62, 0xcf, 0x3a, 0x90, 0xfa, 0x2c, 0x56, 0xe0, 0x77, 0x00, 0x97, 0xf6, 0x08,
-	0x17, 0x93, 0xa2, 0xeb, 0xc0, 0xf9, 0x98, 0xd1, 0x2f, 0xb0, 0x27, 0xfa, 0xc4, 0x57, 0xd4, 0xaa,
-	0x3b, 0x25, 0x03, 0x38, 0x50, 0x9b, 0x3f, 0xf1, 0x39, 0xda, 0x80, 0x0b, 0x99, 0x9e, 0xa4, 0x3c,
-	0xb9, 0x51, 0x49, 0x71, 0xce, 0xcd, 0xcc, 0x9a, 0x8a, 0x94, 0xa3, 0x3a, 0x2c, 0x9f, 0x92, 0x50,
-	0x60, 0xa6, 0xaf, 0x40, 0xaf, 0x52, 0x61, 0x53, 0xe6, 0x63, 0xd6, 0x3f, 0x19, 0x1a, 0x33, 0x4a,
-	0xd8, 0x72, 0xbd, 0x33, 0x44, 0x4d, 0x58, 0x8d, 0xdd, 0x00, 0xf7, 0x39, 0x39, 0xc7, 0xc6, 0x0d,
-	0x49, 0xaf, 0x92, 0x1a, 0x0e, 0xc8, 0x39, 0x46, 0xab, 0x10, 0x4a, 0xa7, 0xa0, 0x2f, 0x70, 0x24,
-	0xf5, 0x52, 0x75, 0x24, 0xfc, 0xb3, 0xd4, 0xd0, 0x7e, 0x09, 0xeb, 0xe3, 0x9c, 0xd4, 0xad, 0x16,
-	0x45, 0x0a, 0xde, 0x41, 0xa4, 0xef, 0xc3, 0xc5, 0x08, 0x7f, 0x25, 0xfa, 0x85, 0xa0, 0x8a, 0xc8,
-	0xcd, 0xd4, 0xbc, 0x9f, 0x07, 0xc6, 0x70, 0x33, 0x0d, 0x3c, 0xd1, 0x75, 0x4f, 0x31, 0xf7, 0x18,
-	0x89, 0x05, 0x65, 0x79, 0x79, 0x47, 0xf8, 0x81, 0x4b, 0xf9, 0x95, 0xc6, 0xf9, 0xfd, 0x02, 0x60,
-	0xf7, 0xea, 0x38, 0x9a, 0xf2, 0x11, 0xbc, 0x93, 0x5f, 0x91, 0x7f, 0xe1, 0xd7, 0xfc, 0x37, 0x2f,
-	0x9d, 0x16, 0x17, 0xe7, 0x39, 0xb7, 0xd9, 0x64, 0x8c, 0x77, 0xa8, 0xcb, 0xa2, 0xbe, 0x90, 0x9c,
-	0x7f, 0x1d, 0x96, 0x63, 0x97, 0xe1, 0x48, 0xe8, 0x4e, 0xd5, 0xab, 0xd1, 0xba, 0x94, 0x2e, 0xad,
-	0xcb, 0xcc, 0x78, 0x5d, 0x9e, 0xc3, 0xda, 0x45, 0x18, 0x4d, 0xbf, 0x09, 0xab, 0xd9, 0xec, 0x54,
-	0x83, 0xae, 0xea, 0x54, 0xf4, 0xf0, 0xbc, 0x76, 0xfe, 0xbd, 0x3f, 0xe7, 0x60, 0x6d, 0x4f, 0x09,
-	0xe4, 0x00, 0xb3, 0x33, 0xe2, 0xe1, 0xc3, 0x1e, 0xfa, 0x0b, 0xc0, 0x6a, 0x3e, 0xe0, 0x51, 0x67,
-	0x8a, 0x90, 0xc6, 0xc7, 0x7f, 0xa3, 0x9e, 0x81, 0xb2, 0xd7, 0xc4, 0xda, 0x4d, 0x9f, 0x9a, 0xf6,
-	0x0f, 0xe0, 0xf5, 0x1f, 0x6f, 0xbe, 0x2d, 0x7d, 0x0f, 0xcc, 0x56, 0xfa, 0x80, 0x7d, 0x9d, 0x65,
-	0xfc, 0x58, 0xb7, 0x1a, 0xb7, 0xcd, 0xf4, 0x55, 0xe3, 0xb6, 0xf9, 0xea, 0x68, 0xd3, 0xdc, 0x18,
-	0xc5, 0x50, 0x16, 0xb8, 0x11, 0x39, 0x57, 0x4f, 0x67, 0x01, 0xb8, 0x6e, 0xae, 0x8d, 0x02, 0x4f,
-	0x69, 0xe8, 0x63, 0x56, 0x84, 0x6c, 0x99, 0x9b, 0xa3, 0x90, 0x13, 0x12, 0x86, 0x24, 0x0a, 0x3e,
-	0xf2, 0x3c, 0x9a, 0x44, 0xc5, 0xb0, 0xe8, 0x1b, 0x00, 0x17, 0xc7, 0x86, 0x18, 0xda, 0xba, 0xf6,
-	0x8b, 0xd1, 0x30, 0xaf, 0x03, 0xd5, 0xa3, 0x77, 0x45, 0x16, 0xa3, 0xde, 0xbe, 0x95, 0xe6, 0xa6,
-	0x5b, 0x70, 0xfb, 0x65, 0x0a, 0xde, 0x06, 0x26, 0x7a, 0x0d, 0xe0, 0xc2, 0x68, 0x77, 0xa3, 0xee,
-	0xb4, 0x26, 0x9e, 0x36, 0xd4, 0x1a, 0x5b, 0xd7, 0x40, 0xea, 0x2c, 0x9a, 0x32, 0x8b, 0xa5, 0x76,
-	0xad, 0x98, 0x45, 0x48, 0xb8, 0x48, 0x93, 0xf8, 0x15, 0xc0, 0xd6, 0x55, 0x1d, 0x88, 0xb6, 0xdf,
-	0x12, 0xec, 0x1a, 0xe3, 0xa1, 0xf1, 0xe8, 0x7f, 0xed, 0xd5, 0xa9, 0x77, 0x65, 0xea, 0x6d, 0x24,
-	0xc5, 0x34, 0xb8, 0x2c, 0xc5, 0x7f, 0x01, 0xac, 0x64, 0x2d, 0x83, 0xda, 0x6f, 0x2f, 0x4e, 0x9e,
-	0x57, 0xe7, 0x52, 0x8c, 0x8e, 0xff, 0x93, 0x92, 0xf3, 0x8f, 0x00, 0x2d, 0x49, 0x79, 0xa9, 0xd6,
-	0x7e, 0x6c, 0xda, 0xe6, 0x2b, 0xa9, 0xa7, 0xa3, 0x7b, 0x68, 0xa5, 0xe8, 0xb8, 0x50, 0xb9, 0xf6,
-	0x77, 0xd0, 0x7a, 0xd1, 0x3f, 0xa6, 0x70, 0x0d, 0x5a, 0x45, 0xcd, 0x22, 0x28, 0x57, 0xb7, 0x76,
-	0x6f, 0xa0, 0x4e, 0xd1, 0x3d, 0xa1, 0x6c, 0x05, 0xdb, 0xf9, 0x0e, 0xc0, 0x25, 0x8f, 0x0e, 0x26,
-	0x69, 0xed, 0xbc, 0xa7, 0x3b, 0x7e, 0x3f, 0xed, 0xd5, 0x7d, 0x70, 0xf4, 0x40, 0x43, 0x02, 0x1a,
-	0xba, 0x51, 0x60, 0x51, 0x16, 0xd8, 0x01, 0x8e, 0x64, 0x27, 0xdb, 0xca, 0xe5, 0xc6, 0x84, 0x17,
-	0x7e, 0x44, 0x1f, 0xe9, 0xcf, 0x7f, 0x00, 0xf8, 0xb9, 0xb4, 0xfc, 0xb1, 0xda, 0xfd, 0x24, 0xa4,
-	0x89, 0x6f, 0xe9, 0xa3, 0xad, 0xc3, 0xde, 0x6f, 0x99, 0xe7, 0x58, 0x7a, 0x8e, 0xb5, 0xe7, 0xf8,
-	0xb0, 0x77, 0x52, 0x96, 0x67, 0x7f, 0xf8, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xec, 0x91,
-	0x2d, 0x5a, 0x0b, 0x00, 0x00,
-}
diff --git a/googleapis/logging/v2/logging_config.pb.go b/googleapis/logging/v2/logging_config.pb.go
index 76f6131b76..d2c4fbe5f9 100644
--- a/googleapis/logging/v2/logging_config.pb.go
+++ b/googleapis/logging/v2/logging_config.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging_config.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package logging
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Available log entry formats. Log entries can be written to
 // Logging in either format and can be exported in either format.
@@ -46,6 +46,7 @@ var LogSink_VersionFormat_name = map[int32]string{
 	1: "V2",
 	2: "V1",
 }
+
 var LogSink_VersionFormat_value = map[string]int32{
 	"VERSION_FORMAT_UNSPECIFIED": 0,
 	"V2":                         1,
@@ -55,8 +56,9 @@ var LogSink_VersionFormat_value = map[string]int32{
 func (x LogSink_VersionFormat) String() string {
 	return proto.EnumName(LogSink_VersionFormat_name, int32(x))
 }
+
 func (LogSink_VersionFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{0, 0}
+	return fileDescriptor_775871f9b2cdbeb8, []int{0, 0}
 }
 
 // Describes a sink used to export log entries to one of the following
@@ -134,16 +136,17 @@ func (m *LogSink) Reset()         { *m = LogSink{} }
 func (m *LogSink) String() string { return proto.CompactTextString(m) }
 func (*LogSink) ProtoMessage()    {}
 func (*LogSink) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{0}
+	return fileDescriptor_775871f9b2cdbeb8, []int{0}
 }
+
 func (m *LogSink) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogSink.Unmarshal(m, b)
 }
 func (m *LogSink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogSink.Marshal(b, m, deterministic)
 }
-func (dst *LogSink) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogSink.Merge(dst, src)
+func (m *LogSink) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogSink.Merge(m, src)
 }
 func (m *LogSink) XXX_Size() int {
 	return xxx_messageInfo_LogSink.Size(m)
@@ -240,16 +243,17 @@ func (m *ListSinksRequest) Reset()         { *m = ListSinksRequest{} }
 func (m *ListSinksRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSinksRequest) ProtoMessage()    {}
 func (*ListSinksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{1}
+	return fileDescriptor_775871f9b2cdbeb8, []int{1}
 }
+
 func (m *ListSinksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSinksRequest.Unmarshal(m, b)
 }
 func (m *ListSinksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSinksRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSinksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSinksRequest.Merge(dst, src)
+func (m *ListSinksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSinksRequest.Merge(m, src)
 }
 func (m *ListSinksRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSinksRequest.Size(m)
@@ -298,16 +302,17 @@ func (m *ListSinksResponse) Reset()         { *m = ListSinksResponse{} }
 func (m *ListSinksResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSinksResponse) ProtoMessage()    {}
 func (*ListSinksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{2}
+	return fileDescriptor_775871f9b2cdbeb8, []int{2}
 }
+
 func (m *ListSinksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSinksResponse.Unmarshal(m, b)
 }
 func (m *ListSinksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSinksResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSinksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSinksResponse.Merge(dst, src)
+func (m *ListSinksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSinksResponse.Merge(m, src)
 }
 func (m *ListSinksResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSinksResponse.Size(m)
@@ -352,16 +357,17 @@ func (m *GetSinkRequest) Reset()         { *m = GetSinkRequest{} }
 func (m *GetSinkRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSinkRequest) ProtoMessage()    {}
 func (*GetSinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{3}
+	return fileDescriptor_775871f9b2cdbeb8, []int{3}
 }
+
 func (m *GetSinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSinkRequest.Unmarshal(m, b)
 }
 func (m *GetSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSinkRequest.Merge(dst, src)
+func (m *GetSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSinkRequest.Merge(m, src)
 }
 func (m *GetSinkRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSinkRequest.Size(m)
@@ -415,16 +421,17 @@ func (m *CreateSinkRequest) Reset()         { *m = CreateSinkRequest{} }
 func (m *CreateSinkRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSinkRequest) ProtoMessage()    {}
 func (*CreateSinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{4}
+	return fileDescriptor_775871f9b2cdbeb8, []int{4}
 }
+
 func (m *CreateSinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSinkRequest.Unmarshal(m, b)
 }
 func (m *CreateSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSinkRequest.Merge(dst, src)
+func (m *CreateSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSinkRequest.Merge(m, src)
 }
 func (m *CreateSinkRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSinkRequest.Size(m)
@@ -508,16 +515,17 @@ func (m *UpdateSinkRequest) Reset()         { *m = UpdateSinkRequest{} }
 func (m *UpdateSinkRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSinkRequest) ProtoMessage()    {}
 func (*UpdateSinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{5}
+	return fileDescriptor_775871f9b2cdbeb8, []int{5}
 }
+
 func (m *UpdateSinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSinkRequest.Unmarshal(m, b)
 }
 func (m *UpdateSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSinkRequest.Merge(dst, src)
+func (m *UpdateSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSinkRequest.Merge(m, src)
 }
 func (m *UpdateSinkRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSinkRequest.Size(m)
@@ -577,16 +585,17 @@ func (m *DeleteSinkRequest) Reset()         { *m = DeleteSinkRequest{} }
 func (m *DeleteSinkRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSinkRequest) ProtoMessage()    {}
 func (*DeleteSinkRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{6}
+	return fileDescriptor_775871f9b2cdbeb8, []int{6}
 }
+
 func (m *DeleteSinkRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSinkRequest.Unmarshal(m, b)
 }
 func (m *DeleteSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSinkRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSinkRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSinkRequest.Merge(dst, src)
+func (m *DeleteSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSinkRequest.Merge(m, src)
 }
 func (m *DeleteSinkRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSinkRequest.Size(m)
@@ -641,16 +650,17 @@ func (m *LogExclusion) Reset()         { *m = LogExclusion{} }
 func (m *LogExclusion) String() string { return proto.CompactTextString(m) }
 func (*LogExclusion) ProtoMessage()    {}
 func (*LogExclusion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{7}
+	return fileDescriptor_775871f9b2cdbeb8, []int{7}
 }
+
 func (m *LogExclusion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogExclusion.Unmarshal(m, b)
 }
 func (m *LogExclusion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogExclusion.Marshal(b, m, deterministic)
 }
-func (dst *LogExclusion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogExclusion.Merge(dst, src)
+func (m *LogExclusion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogExclusion.Merge(m, src)
 }
 func (m *LogExclusion) XXX_Size() int {
 	return xxx_messageInfo_LogExclusion.Size(m)
@@ -716,16 +726,17 @@ func (m *ListExclusionsRequest) Reset()         { *m = ListExclusionsRequest{} }
 func (m *ListExclusionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListExclusionsRequest) ProtoMessage()    {}
 func (*ListExclusionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{8}
+	return fileDescriptor_775871f9b2cdbeb8, []int{8}
 }
+
 func (m *ListExclusionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListExclusionsRequest.Unmarshal(m, b)
 }
 func (m *ListExclusionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListExclusionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListExclusionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListExclusionsRequest.Merge(dst, src)
+func (m *ListExclusionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListExclusionsRequest.Merge(m, src)
 }
 func (m *ListExclusionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListExclusionsRequest.Size(m)
@@ -774,16 +785,17 @@ func (m *ListExclusionsResponse) Reset()         { *m = ListExclusionsResponse{}
 func (m *ListExclusionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListExclusionsResponse) ProtoMessage()    {}
 func (*ListExclusionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{9}
+	return fileDescriptor_775871f9b2cdbeb8, []int{9}
 }
+
 func (m *ListExclusionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListExclusionsResponse.Unmarshal(m, b)
 }
 func (m *ListExclusionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListExclusionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListExclusionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListExclusionsResponse.Merge(dst, src)
+func (m *ListExclusionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListExclusionsResponse.Merge(m, src)
 }
 func (m *ListExclusionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListExclusionsResponse.Size(m)
@@ -828,16 +840,17 @@ func (m *GetExclusionRequest) Reset()         { *m = GetExclusionRequest{} }
 func (m *GetExclusionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetExclusionRequest) ProtoMessage()    {}
 func (*GetExclusionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{10}
+	return fileDescriptor_775871f9b2cdbeb8, []int{10}
 }
+
 func (m *GetExclusionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetExclusionRequest.Unmarshal(m, b)
 }
 func (m *GetExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetExclusionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetExclusionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetExclusionRequest.Merge(dst, src)
+func (m *GetExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetExclusionRequest.Merge(m, src)
 }
 func (m *GetExclusionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetExclusionRequest.Size(m)
@@ -878,16 +891,17 @@ func (m *CreateExclusionRequest) Reset()         { *m = CreateExclusionRequest{}
 func (m *CreateExclusionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateExclusionRequest) ProtoMessage()    {}
 func (*CreateExclusionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{11}
+	return fileDescriptor_775871f9b2cdbeb8, []int{11}
 }
+
 func (m *CreateExclusionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateExclusionRequest.Unmarshal(m, b)
 }
 func (m *CreateExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateExclusionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateExclusionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateExclusionRequest.Merge(dst, src)
+func (m *CreateExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateExclusionRequest.Merge(m, src)
 }
 func (m *CreateExclusionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateExclusionRequest.Size(m)
@@ -944,16 +958,17 @@ func (m *UpdateExclusionRequest) Reset()         { *m = UpdateExclusionRequest{}
 func (m *UpdateExclusionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateExclusionRequest) ProtoMessage()    {}
 func (*UpdateExclusionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{12}
+	return fileDescriptor_775871f9b2cdbeb8, []int{12}
 }
+
 func (m *UpdateExclusionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateExclusionRequest.Unmarshal(m, b)
 }
 func (m *UpdateExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateExclusionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateExclusionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateExclusionRequest.Merge(dst, src)
+func (m *UpdateExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateExclusionRequest.Merge(m, src)
 }
 func (m *UpdateExclusionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateExclusionRequest.Size(m)
@@ -1005,16 +1020,17 @@ func (m *DeleteExclusionRequest) Reset()         { *m = DeleteExclusionRequest{}
 func (m *DeleteExclusionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteExclusionRequest) ProtoMessage()    {}
 func (*DeleteExclusionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_config_eaca28b770adee30, []int{13}
+	return fileDescriptor_775871f9b2cdbeb8, []int{13}
 }
+
 func (m *DeleteExclusionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteExclusionRequest.Unmarshal(m, b)
 }
 func (m *DeleteExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteExclusionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteExclusionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteExclusionRequest.Merge(dst, src)
+func (m *DeleteExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteExclusionRequest.Merge(m, src)
 }
 func (m *DeleteExclusionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteExclusionRequest.Size(m)
@@ -1033,6 +1049,7 @@ func (m *DeleteExclusionRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.logging.v2.LogSink_VersionFormat", LogSink_VersionFormat_name, LogSink_VersionFormat_value)
 	proto.RegisterType((*LogSink)(nil), "google.logging.v2.LogSink")
 	proto.RegisterType((*ListSinksRequest)(nil), "google.logging.v2.ListSinksRequest")
 	proto.RegisterType((*ListSinksResponse)(nil), "google.logging.v2.ListSinksResponse")
@@ -1047,7 +1064,105 @@ func init() {
 	proto.RegisterType((*CreateExclusionRequest)(nil), "google.logging.v2.CreateExclusionRequest")
 	proto.RegisterType((*UpdateExclusionRequest)(nil), "google.logging.v2.UpdateExclusionRequest")
 	proto.RegisterType((*DeleteExclusionRequest)(nil), "google.logging.v2.DeleteExclusionRequest")
-	proto.RegisterEnum("google.logging.v2.LogSink_VersionFormat", LogSink_VersionFormat_name, LogSink_VersionFormat_value)
+}
+
+func init() {
+	proto.RegisterFile("google/logging/v2/logging_config.proto", fileDescriptor_775871f9b2cdbeb8)
+}
+
+var fileDescriptor_775871f9b2cdbeb8 = []byte{
+	// 1446 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0xdc, 0x44,
+	0x14, 0xc6, 0xde, 0x36, 0xcd, 0xbe, 0xb4, 0xf9, 0x31, 0xa5, 0xcb, 0xe2, 0xf4, 0xc7, 0xd6, 0x0d,
+	0x69, 0x76, 0x29, 0xbb, 0xad, 0xa9, 0x10, 0xb4, 0xaa, 0xaa, 0x36, 0x4d, 0xaa, 0x48, 0x69, 0x1b,
+	0x6d, 0xda, 0x20, 0x45, 0x95, 0x8c, 0xb3, 0x3b, 0x6b, 0x86, 0x78, 0xed, 0xad, 0xed, 0x0d, 0x6d,
+	0x51, 0x0f, 0x70, 0xe1, 0x0c, 0xf4, 0xc2, 0x81, 0x0a, 0x4e, 0x20, 0x0e, 0xf0, 0x2f, 0x70, 0x41,
+	0x20, 0xc4, 0xad, 0x77, 0x4e, 0xfc, 0x03, 0x9c, 0xe0, 0x84, 0x90, 0xc7, 0xe3, 0xf5, 0xd8, 0xeb,
+	0x75, 0x66, 0x85, 0xe0, 0x54, 0xfb, 0xbd, 0xef, 0xed, 0xbc, 0xf9, 0xfc, 0xcd, 0x37, 0x2f, 0x85,
+	0x45, 0xd3, 0x71, 0x4c, 0x0b, 0x37, 0x2c, 0xc7, 0x34, 0x89, 0x6d, 0x36, 0xf6, 0xb4, 0xe8, 0x51,
+	0x6f, 0x39, 0x76, 0x87, 0x98, 0xf5, 0x9e, 0xeb, 0xf8, 0x0e, 0x9a, 0x0b, 0x71, 0x75, 0x96, 0xac,
+	0xef, 0x69, 0xca, 0x71, 0x56, 0x6a, 0xf4, 0x48, 0xc3, 0xb0, 0x6d, 0xc7, 0x37, 0x7c, 0xe2, 0xd8,
+	0x5e, 0x58, 0xa0, 0xcc, 0xb3, 0x2c, 0x7d, 0xdb, 0xe9, 0x77, 0x1a, 0xb8, 0xdb, 0xf3, 0x1f, 0xb1,
+	0x64, 0x25, 0x9d, 0xec, 0x10, 0x6c, 0xb5, 0xf5, 0xae, 0xe1, 0xed, 0x32, 0xc4, 0xa9, 0x34, 0xc2,
+	0x27, 0x5d, 0xec, 0xf9, 0x46, 0xb7, 0x17, 0x02, 0xd4, 0x9f, 0x0b, 0x70, 0x68, 0xdd, 0x31, 0x37,
+	0x89, 0xbd, 0x8b, 0x10, 0x1c, 0xb0, 0x8d, 0x2e, 0x2e, 0x4b, 0x15, 0x69, 0xa9, 0xd8, 0xa4, 0xcf,
+	0xa8, 0x02, 0x53, 0x6d, 0xec, 0xf9, 0xc4, 0xa6, 0x5d, 0x95, 0x0b, 0x34, 0xc5, 0x87, 0x50, 0x09,
+	0x26, 0x3a, 0xc4, 0xf2, 0xb1, 0x5b, 0x3e, 0x48, 0x93, 0xec, 0x0d, 0xbd, 0x03, 0xc7, 0x9c, 0xbe,
+	0xdf, 0xeb, 0xfb, 0xfa, 0x1e, 0x76, 0x3d, 0xe2, 0xd8, 0x7a, 0xc7, 0x71, 0xbb, 0x86, 0x5f, 0x9e,
+	0xa8, 0x48, 0x4b, 0xd3, 0xda, 0x52, 0x7d, 0x88, 0x8a, 0x3a, 0x6b, 0xa4, 0xbe, 0x15, 0x16, 0xac,
+	0x52, 0xfc, 0x75, 0xb9, 0x2c, 0x35, 0x8f, 0x86, 0x3f, 0x95, 0x48, 0xa0, 0xb3, 0x30, 0xf3, 0xbe,
+	0x4b, 0x7c, 0xec, 0xea, 0xa4, 0x8d, 0x6d, 0x9f, 0xf8, 0x8f, 0xca, 0x93, 0xb4, 0x85, 0xe9, 0x30,
+	0xbc, 0xc6, 0xa2, 0xa8, 0x0a, 0xb3, 0xc4, 0x6e, 0x59, 0xfd, 0x36, 0xd6, 0x5b, 0xef, 0x12, 0xab,
+	0xed, 0x62, 0xbb, 0x5c, 0xac, 0x48, 0x4b, 0x93, 0xcd, 0x19, 0x16, 0x5f, 0x66, 0x61, 0x74, 0x05,
+	0xc0, 0xf3, 0x0d, 0xd7, 0xd7, 0x03, 0xa2, 0xca, 0x50, 0x91, 0x96, 0xa6, 0x34, 0x25, 0x6a, 0x35,
+	0x62, 0xb1, 0x7e, 0x37, 0x62, 0x91, 0x36, 0x57, 0xa4, 0x15, 0x41, 0x0c, 0xbd, 0x05, 0x93, 0xd8,
+	0x6e, 0x87, 0xc5, 0x53, 0x42, 0xc5, 0x87, 0xb0, 0xdd, 0x0e, 0x22, 0xea, 0x55, 0x38, 0x92, 0xdc,
+	0xde, 0x49, 0x50, 0xb6, 0x56, 0x9a, 0x9b, 0x6b, 0x77, 0x6e, 0xeb, 0xab, 0x77, 0x9a, 0xb7, 0xae,
+	0xdd, 0xd5, 0xef, 0xdd, 0xde, 0xdc, 0x58, 0x59, 0x5e, 0x5b, 0x5d, 0x5b, 0xb9, 0x31, 0xfb, 0x02,
+	0x9a, 0x00, 0x79, 0x4b, 0x9b, 0x95, 0xe8, 0xbf, 0x17, 0x66, 0x65, 0xb5, 0x03, 0xb3, 0xeb, 0xc4,
+	0xf3, 0x03, 0x06, 0xbd, 0x26, 0x7e, 0xd0, 0xc7, 0x9e, 0x1f, 0x7c, 0x9c, 0x9e, 0xe1, 0x62, 0xdb,
+	0x67, 0x1f, 0x95, 0xbd, 0xa1, 0x13, 0x00, 0x3d, 0xc3, 0xc4, 0xba, 0xef, 0xec, 0x62, 0xbb, 0x2c,
+	0xd3, 0x5c, 0x31, 0x88, 0xdc, 0x0d, 0x02, 0x68, 0x1e, 0xe8, 0x8b, 0xee, 0x91, 0xc7, 0x98, 0x7e,
+	0xf3, 0x83, 0xcd, 0xc9, 0x20, 0xb0, 0x49, 0x1e, 0x63, 0xb5, 0x0b, 0x73, 0xdc, 0x3a, 0x5e, 0xcf,
+	0xb1, 0x3d, 0x8c, 0xce, 0xc3, 0x41, 0x2f, 0x08, 0x94, 0xa5, 0x4a, 0x81, 0xdf, 0xf5, 0xf0, 0xd7,
+	0x6d, 0x86, 0x40, 0xb4, 0x08, 0x33, 0x36, 0x7e, 0xe8, 0xeb, 0x43, 0x7d, 0x1c, 0x09, 0xc2, 0x1b,
+	0x51, 0x2f, 0xea, 0x6b, 0x30, 0x7d, 0x13, 0xd3, 0xd5, 0xa2, 0x4d, 0xcd, 0x43, 0x31, 0xf8, 0x09,
+	0x9d, 0x13, 0xeb, 0x64, 0x10, 0xb8, 0x6d, 0x74, 0xb1, 0xfa, 0x89, 0x04, 0x73, 0xcb, 0x2e, 0x36,
+	0x7c, 0xcc, 0x97, 0x8c, 0xe2, 0xa1, 0x0e, 0x07, 0x82, 0x4a, 0xba, 0x72, 0x7e, 0xd7, 0x14, 0x87,
+	0x2e, 0x42, 0xa9, 0x6f, 0x93, 0x07, 0x7d, 0xac, 0xa7, 0x95, 0x57, 0xa0, 0x7a, 0x7a, 0x31, 0xcc,
+	0xbe, 0x9d, 0xd0, 0x9f, 0xfa, 0x5c, 0x82, 0xb9, 0x7b, 0xbd, 0x76, 0xaa, 0xa7, 0xbc, 0x6d, 0xfc,
+	0x3f, 0x8d, 0xa1, 0xcb, 0x30, 0xd5, 0xa7, 0x7d, 0x51, 0xcf, 0x28, 0x1f, 0x18, 0xa1, 0xd8, 0xd5,
+	0xc0, 0x56, 0x6e, 0x19, 0xde, 0x6e, 0x13, 0x42, 0x78, 0xf0, 0xac, 0x9e, 0x87, 0xb9, 0x1b, 0xd8,
+	0xc2, 0xe2, 0x9b, 0x52, 0x1f, 0xc2, 0xe1, 0x75, 0xc7, 0x5c, 0x79, 0xd8, 0xb2, 0xfa, 0x81, 0xce,
+	0x73, 0x0c, 0xa7, 0xe5, 0x92, 0x1e, 0x35, 0x1c, 0x79, 0x60, 0x38, 0x51, 0x88, 0x33, 0x9c, 0x42,
+	0xc2, 0x70, 0x14, 0x98, 0x6c, 0x13, 0xcf, 0xd8, 0xb1, 0x70, 0x9b, 0xee, 0x64, 0xb2, 0x39, 0x78,
+	0x57, 0x77, 0xe1, 0x58, 0xa0, 0xd9, 0xc1, 0xd2, 0xff, 0xe9, 0x01, 0xf9, 0x50, 0x82, 0x52, 0x7a,
+	0x35, 0x76, 0x4c, 0xae, 0x02, 0xe0, 0x41, 0x94, 0x9d, 0x95, 0x53, 0xd9, 0x1f, 0x77, 0x50, 0xdd,
+	0xe4, 0x4a, 0x84, 0x4f, 0x4d, 0x15, 0x8e, 0xde, 0xc4, 0x71, 0x07, 0xd1, 0x76, 0x33, 0x18, 0x57,
+	0x1d, 0x28, 0x85, 0x07, 0x66, 0x08, 0x3d, 0x8a, 0x9c, 0x2b, 0x50, 0x1c, 0xb4, 0xc4, 0x14, 0xba,
+	0xef, 0x26, 0xe2, 0x0a, 0xf5, 0x1b, 0x09, 0x4a, 0xe1, 0x71, 0x10, 0xe9, 0xef, 0x5f, 0xae, 0x96,
+	0xd6, 0x78, 0x61, 0x2c, 0x8d, 0x9f, 0x83, 0x52, 0xa8, 0x71, 0x91, 0x4e, 0xb5, 0xa7, 0x2f, 0xc3,
+	0xcc, 0x32, 0xbd, 0xee, 0x37, 0xb1, 0xbb, 0x47, 0x5a, 0x78, 0x4b, 0x43, 0x1f, 0xcb, 0x50, 0x1c,
+	0xd8, 0x25, 0x3a, 0x93, 0xd5, 0x78, 0xca, 0xb4, 0x95, 0x85, 0x7c, 0x50, 0x28, 0x25, 0xf5, 0x3b,
+	0xe9, 0xa3, 0xe7, 0xbf, 0x7f, 0x26, 0x7f, 0x2d, 0xa1, 0x52, 0x30, 0x6e, 0x7c, 0x10, 0x7e, 0x9b,
+	0x2b, 0xb5, 0x46, 0xed, 0x49, 0x83, 0x3a, 0xec, 0xf6, 0x29, 0x74, 0x82, 0xcf, 0xf4, 0x5c, 0xe7,
+	0x3d, 0xdc, 0xf2, 0xbd, 0x18, 0xb0, 0x80, 0x54, 0x1e, 0xe0, 0xb8, 0xa6, 0x61, 0x93, 0xc7, 0xe1,
+	0xfc, 0x11, 0xa3, 0x4e, 0xa2, 0xe3, 0x3c, 0xaa, 0xe3, 0x58, 0x6d, 0xec, 0x72, 0xf9, 0x45, 0xb4,
+	0xc0, 0xe7, 0x77, 0x88, 0x65, 0x11, 0xdb, 0xbc, 0xd6, 0x6a, 0x39, 0x7d, 0x9b, 0x5b, 0x0d, 0x7d,
+	0x2a, 0xc3, 0x21, 0xe6, 0xe4, 0xe8, 0x74, 0xc6, 0x16, 0x93, 0x2e, 0xaf, 0xe4, 0x78, 0x9e, 0xfa,
+	0x53, 0xb8, 0xf7, 0x1f, 0x24, 0x34, 0x4f, 0x97, 0x1e, 0x58, 0x4e, 0xb0, 0xfd, 0x70, 0xb9, 0x46,
+	0xed, 0xc9, 0x60, 0x7f, 0x71, 0x3a, 0xe6, 0x20, 0x46, 0x55, 0xd1, 0xd9, 0x14, 0x2a, 0x45, 0x44,
+	0x0c, 0x3d, 0x83, 0x4e, 0xa7, 0xa0, 0x03, 0x36, 0x62, 0xd0, 0xab, 0xa8, 0x9a, 0x02, 0x0d, 0x51,
+	0x32, 0x00, 0xa3, 0x2f, 0x64, 0x80, 0xf8, 0xba, 0x42, 0x59, 0x9f, 0x7e, 0xe8, 0x36, 0xcb, 0xa5,
+	0xe6, 0xd7, 0x90, 0x9a, 0x1f, 0x25, 0x75, 0x84, 0x2c, 0x2e, 0xd1, 0x0b, 0x63, 0xfb, 0x15, 0x35,
+	0x5f, 0x1c, 0x0c, 0x56, 0x53, 0x05, 0x24, 0xc2, 0xb0, 0x0b, 0x6a, 0xae, 0x50, 0x18, 0xea, 0x9c,
+	0x2a, 0x24, 0x97, 0x10, 0x8d, 0xfe, 0x28, 0x00, 0xc4, 0x57, 0x67, 0x26, 0x3f, 0x43, 0x37, 0x6b,
+	0x2e, 0x3f, 0x5f, 0x16, 0x28, 0x3f, 0x9f, 0x17, 0x94, 0x3c, 0xe9, 0x44, 0xbb, 0x57, 0x04, 0x04,
+	0xc4, 0xb0, 0x0d, 0x45, 0x54, 0x46, 0xac, 0xa0, 0xaa, 0xec, 0x2f, 0x26, 0x06, 0xbd, 0xa0, 0x88,
+	0x4b, 0x2a, 0x6a, 0x5d, 0x1b, 0xa3, 0x75, 0x6d, 0xdc, 0xd6, 0x35, 0xf1, 0xd6, 0xb5, 0x71, 0x5b,
+	0x47, 0x4f, 0x65, 0x80, 0x78, 0xb2, 0xc8, 0xfc, 0xe6, 0x43, 0x83, 0x87, 0x52, 0x1a, 0x72, 0xf4,
+	0x95, 0xe0, 0x2f, 0xa5, 0xd8, 0x2a, 0x6a, 0xf9, 0x56, 0x51, 0x13, 0xb2, 0x8a, 0x9a, 0xb8, 0x55,
+	0xd4, 0x44, 0xac, 0xa2, 0x36, 0x86, 0x55, 0x7c, 0x2f, 0xc3, 0x74, 0x72, 0xac, 0x40, 0x4b, 0x23,
+	0x6e, 0x8a, 0xa1, 0x39, 0x47, 0xa9, 0x0a, 0x20, 0xd9, 0xc5, 0x92, 0x36, 0x57, 0xde, 0x41, 0xe2,
+	0x49, 0x24, 0x7d, 0x79, 0xf0, 0x06, 0xc2, 0xa1, 0x22, 0x73, 0x1d, 0xe5, 0x1f, 0x1c, 0x34, 0x32,
+	0xd7, 0x61, 0xfb, 0xe0, 0x40, 0x91, 0xb9, 0x8e, 0x76, 0x0f, 0x6e, 0x58, 0xfa, 0x4a, 0x86, 0xc3,
+	0xfc, 0x14, 0x84, 0x16, 0xb3, 0xaf, 0x9d, 0xf4, 0xe5, 0xae, 0xec, 0x37, 0x5f, 0x0c, 0x71, 0x34,
+	0x10, 0x54, 0xbc, 0x3a, 0x7f, 0x01, 0xa5, 0x05, 0x95, 0x44, 0x45, 0x1c, 0x65, 0x0a, 0x2a, 0x09,
+	0x8d, 0x38, 0x4a, 0x09, 0x2a, 0x09, 0x8a, 0x38, 0x1a, 0x21, 0xa8, 0x04, 0x18, 0xfd, 0x26, 0xc3,
+	0x4c, 0x6a, 0xfc, 0x43, 0xd5, 0x91, 0xb7, 0xd0, 0xf8, 0x4c, 0xfd, 0x1d, 0x32, 0xf5, 0xa7, 0xa4,
+	0xe6, 0xa9, 0xe9, 0x52, 0x3c, 0xb0, 0x6d, 0x37, 0x54, 0x01, 0x61, 0xf1, 0x05, 0x17, 0x55, 0x51,
+	0x8d, 0xf1, 0x55, 0x75, 0x75, 0x7f, 0xb9, 0xf1, 0xf8, 0x37, 0x54, 0x71, 0xe5, 0x71, 0x75, 0x94,
+	0xe0, 0xd4, 0xb4, 0x9b, 0x49, 0x70, 0xf6, 0x44, 0x3c, 0x06, 0xc1, 0x5a, 0x9e, 0x14, 0x13, 0x04,
+	0x6b, 0x02, 0xaa, 0x4c, 0x10, 0xac, 0x89, 0x0a, 0x34, 0x41, 0xb0, 0xb6, 0xbf, 0x56, 0x13, 0x04,
+	0x6b, 0xe2, 0xb2, 0xe5, 0x09, 0x7e, 0x26, 0xc3, 0x4c, 0x6a, 0x48, 0xcf, 0x24, 0x38, 0x7b, 0x90,
+	0x17, 0xbe, 0x38, 0x46, 0x1d, 0xf1, 0x9a, 0xd0, 0x11, 0xaf, 0x89, 0x1f, 0xf1, 0x9a, 0xc8, 0x11,
+	0xaf, 0x89, 0x73, 0x75, 0xfd, 0x99, 0x04, 0xc7, 0x5a, 0x4e, 0x77, 0x98, 0x92, 0xeb, 0x68, 0x3d,
+	0x7c, 0x0e, 0xff, 0x68, 0xd9, 0x08, 0x08, 0xd8, 0x90, 0xb6, 0xdf, 0x64, 0x40, 0xd3, 0xb1, 0x0c,
+	0xdb, 0xac, 0x3b, 0xae, 0xd9, 0x30, 0xb1, 0x4d, 0xe9, 0x69, 0x84, 0x29, 0xa3, 0x47, 0x3c, 0xee,
+	0xff, 0x3a, 0x2f, 0xb3, 0xc7, 0xbf, 0x24, 0xe9, 0x5b, 0xf9, 0xa5, 0x9b, 0x61, 0xf5, 0xb2, 0xe5,
+	0xf4, 0xdb, 0x75, 0xb6, 0x40, 0x7d, 0x4b, 0xfb, 0x25, 0xca, 0xdc, 0xa7, 0x99, 0xfb, 0x2c, 0x73,
+	0x7f, 0x4b, 0xdb, 0x99, 0xa0, 0xbf, 0xfd, 0xfa, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9e, 0xb0,
+	0x58, 0x3e, 0x46, 0x15, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1456,102 +1571,3 @@ var _ConfigServiceV2_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/logging/v2/logging_config.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/logging/v2/logging_config.proto", fileDescriptor_logging_config_eaca28b770adee30)
-}
-
-var fileDescriptor_logging_config_eaca28b770adee30 = []byte{
-	// 1446 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0xdc, 0x44,
-	0x14, 0xc6, 0xde, 0x36, 0xcd, 0xbe, 0xb4, 0xf9, 0x31, 0xa5, 0xcb, 0xe2, 0xf4, 0xc7, 0xd6, 0x0d,
-	0x69, 0x76, 0x29, 0xbb, 0xad, 0xa9, 0x10, 0xb4, 0xaa, 0xaa, 0x36, 0x4d, 0xaa, 0x48, 0x69, 0x1b,
-	0x6d, 0xda, 0x20, 0x45, 0x95, 0x8c, 0xb3, 0x3b, 0x6b, 0x86, 0x78, 0xed, 0xad, 0xed, 0x0d, 0x6d,
-	0x51, 0x0f, 0x70, 0xe1, 0x0c, 0xf4, 0xc2, 0x81, 0x0a, 0x4e, 0x20, 0x0e, 0xf0, 0x2f, 0x70, 0x41,
-	0x20, 0xc4, 0xad, 0x77, 0x4e, 0xfc, 0x03, 0x9c, 0xe0, 0x84, 0x90, 0xc7, 0xe3, 0xf5, 0xd8, 0xeb,
-	0x75, 0x66, 0x85, 0xe0, 0x54, 0xfb, 0xbd, 0xef, 0xed, 0xbc, 0xf9, 0xfc, 0xcd, 0x37, 0x2f, 0x85,
-	0x45, 0xd3, 0x71, 0x4c, 0x0b, 0x37, 0x2c, 0xc7, 0x34, 0x89, 0x6d, 0x36, 0xf6, 0xb4, 0xe8, 0x51,
-	0x6f, 0x39, 0x76, 0x87, 0x98, 0xf5, 0x9e, 0xeb, 0xf8, 0x0e, 0x9a, 0x0b, 0x71, 0x75, 0x96, 0xac,
-	0xef, 0x69, 0xca, 0x71, 0x56, 0x6a, 0xf4, 0x48, 0xc3, 0xb0, 0x6d, 0xc7, 0x37, 0x7c, 0xe2, 0xd8,
-	0x5e, 0x58, 0xa0, 0xcc, 0xb3, 0x2c, 0x7d, 0xdb, 0xe9, 0x77, 0x1a, 0xb8, 0xdb, 0xf3, 0x1f, 0xb1,
-	0x64, 0x25, 0x9d, 0xec, 0x10, 0x6c, 0xb5, 0xf5, 0xae, 0xe1, 0xed, 0x32, 0xc4, 0xa9, 0x34, 0xc2,
-	0x27, 0x5d, 0xec, 0xf9, 0x46, 0xb7, 0x17, 0x02, 0xd4, 0x9f, 0x0b, 0x70, 0x68, 0xdd, 0x31, 0x37,
-	0x89, 0xbd, 0x8b, 0x10, 0x1c, 0xb0, 0x8d, 0x2e, 0x2e, 0x4b, 0x15, 0x69, 0xa9, 0xd8, 0xa4, 0xcf,
-	0xa8, 0x02, 0x53, 0x6d, 0xec, 0xf9, 0xc4, 0xa6, 0x5d, 0x95, 0x0b, 0x34, 0xc5, 0x87, 0x50, 0x09,
-	0x26, 0x3a, 0xc4, 0xf2, 0xb1, 0x5b, 0x3e, 0x48, 0x93, 0xec, 0x0d, 0xbd, 0x03, 0xc7, 0x9c, 0xbe,
-	0xdf, 0xeb, 0xfb, 0xfa, 0x1e, 0x76, 0x3d, 0xe2, 0xd8, 0x7a, 0xc7, 0x71, 0xbb, 0x86, 0x5f, 0x9e,
-	0xa8, 0x48, 0x4b, 0xd3, 0xda, 0x52, 0x7d, 0x88, 0x8a, 0x3a, 0x6b, 0xa4, 0xbe, 0x15, 0x16, 0xac,
-	0x52, 0xfc, 0x75, 0xb9, 0x2c, 0x35, 0x8f, 0x86, 0x3f, 0x95, 0x48, 0xa0, 0xb3, 0x30, 0xf3, 0xbe,
-	0x4b, 0x7c, 0xec, 0xea, 0xa4, 0x8d, 0x6d, 0x9f, 0xf8, 0x8f, 0xca, 0x93, 0xb4, 0x85, 0xe9, 0x30,
-	0xbc, 0xc6, 0xa2, 0xa8, 0x0a, 0xb3, 0xc4, 0x6e, 0x59, 0xfd, 0x36, 0xd6, 0x5b, 0xef, 0x12, 0xab,
-	0xed, 0x62, 0xbb, 0x5c, 0xac, 0x48, 0x4b, 0x93, 0xcd, 0x19, 0x16, 0x5f, 0x66, 0x61, 0x74, 0x05,
-	0xc0, 0xf3, 0x0d, 0xd7, 0xd7, 0x03, 0xa2, 0xca, 0x50, 0x91, 0x96, 0xa6, 0x34, 0x25, 0x6a, 0x35,
-	0x62, 0xb1, 0x7e, 0x37, 0x62, 0x91, 0x36, 0x57, 0xa4, 0x15, 0x41, 0x0c, 0xbd, 0x05, 0x93, 0xd8,
-	0x6e, 0x87, 0xc5, 0x53, 0x42, 0xc5, 0x87, 0xb0, 0xdd, 0x0e, 0x22, 0xea, 0x55, 0x38, 0x92, 0xdc,
-	0xde, 0x49, 0x50, 0xb6, 0x56, 0x9a, 0x9b, 0x6b, 0x77, 0x6e, 0xeb, 0xab, 0x77, 0x9a, 0xb7, 0xae,
-	0xdd, 0xd5, 0xef, 0xdd, 0xde, 0xdc, 0x58, 0x59, 0x5e, 0x5b, 0x5d, 0x5b, 0xb9, 0x31, 0xfb, 0x02,
-	0x9a, 0x00, 0x79, 0x4b, 0x9b, 0x95, 0xe8, 0xbf, 0x17, 0x66, 0x65, 0xb5, 0x03, 0xb3, 0xeb, 0xc4,
-	0xf3, 0x03, 0x06, 0xbd, 0x26, 0x7e, 0xd0, 0xc7, 0x9e, 0x1f, 0x7c, 0x9c, 0x9e, 0xe1, 0x62, 0xdb,
-	0x67, 0x1f, 0x95, 0xbd, 0xa1, 0x13, 0x00, 0x3d, 0xc3, 0xc4, 0xba, 0xef, 0xec, 0x62, 0xbb, 0x2c,
-	0xd3, 0x5c, 0x31, 0x88, 0xdc, 0x0d, 0x02, 0x68, 0x1e, 0xe8, 0x8b, 0xee, 0x91, 0xc7, 0x98, 0x7e,
-	0xf3, 0x83, 0xcd, 0xc9, 0x20, 0xb0, 0x49, 0x1e, 0x63, 0xb5, 0x0b, 0x73, 0xdc, 0x3a, 0x5e, 0xcf,
-	0xb1, 0x3d, 0x8c, 0xce, 0xc3, 0x41, 0x2f, 0x08, 0x94, 0xa5, 0x4a, 0x81, 0xdf, 0xf5, 0xf0, 0xd7,
-	0x6d, 0x86, 0x40, 0xb4, 0x08, 0x33, 0x36, 0x7e, 0xe8, 0xeb, 0x43, 0x7d, 0x1c, 0x09, 0xc2, 0x1b,
-	0x51, 0x2f, 0xea, 0x6b, 0x30, 0x7d, 0x13, 0xd3, 0xd5, 0xa2, 0x4d, 0xcd, 0x43, 0x31, 0xf8, 0x09,
-	0x9d, 0x13, 0xeb, 0x64, 0x10, 0xb8, 0x6d, 0x74, 0xb1, 0xfa, 0x89, 0x04, 0x73, 0xcb, 0x2e, 0x36,
-	0x7c, 0xcc, 0x97, 0x8c, 0xe2, 0xa1, 0x0e, 0x07, 0x82, 0x4a, 0xba, 0x72, 0x7e, 0xd7, 0x14, 0x87,
-	0x2e, 0x42, 0xa9, 0x6f, 0x93, 0x07, 0x7d, 0xac, 0xa7, 0x95, 0x57, 0xa0, 0x7a, 0x7a, 0x31, 0xcc,
-	0xbe, 0x9d, 0xd0, 0x9f, 0xfa, 0x5c, 0x82, 0xb9, 0x7b, 0xbd, 0x76, 0xaa, 0xa7, 0xbc, 0x6d, 0xfc,
-	0x3f, 0x8d, 0xa1, 0xcb, 0x30, 0xd5, 0xa7, 0x7d, 0x51, 0xcf, 0x28, 0x1f, 0x18, 0xa1, 0xd8, 0xd5,
-	0xc0, 0x56, 0x6e, 0x19, 0xde, 0x6e, 0x13, 0x42, 0x78, 0xf0, 0xac, 0x9e, 0x87, 0xb9, 0x1b, 0xd8,
-	0xc2, 0xe2, 0x9b, 0x52, 0x1f, 0xc2, 0xe1, 0x75, 0xc7, 0x5c, 0x79, 0xd8, 0xb2, 0xfa, 0x81, 0xce,
-	0x73, 0x0c, 0xa7, 0xe5, 0x92, 0x1e, 0x35, 0x1c, 0x79, 0x60, 0x38, 0x51, 0x88, 0x33, 0x9c, 0x42,
-	0xc2, 0x70, 0x14, 0x98, 0x6c, 0x13, 0xcf, 0xd8, 0xb1, 0x70, 0x9b, 0xee, 0x64, 0xb2, 0x39, 0x78,
-	0x57, 0x77, 0xe1, 0x58, 0xa0, 0xd9, 0xc1, 0xd2, 0xff, 0xe9, 0x01, 0xf9, 0x50, 0x82, 0x52, 0x7a,
-	0x35, 0x76, 0x4c, 0xae, 0x02, 0xe0, 0x41, 0x94, 0x9d, 0x95, 0x53, 0xd9, 0x1f, 0x77, 0x50, 0xdd,
-	0xe4, 0x4a, 0x84, 0x4f, 0x4d, 0x15, 0x8e, 0xde, 0xc4, 0x71, 0x07, 0xd1, 0x76, 0x33, 0x18, 0x57,
-	0x1d, 0x28, 0x85, 0x07, 0x66, 0x08, 0x3d, 0x8a, 0x9c, 0x2b, 0x50, 0x1c, 0xb4, 0xc4, 0x14, 0xba,
-	0xef, 0x26, 0xe2, 0x0a, 0xf5, 0x1b, 0x09, 0x4a, 0xe1, 0x71, 0x10, 0xe9, 0xef, 0x5f, 0xae, 0x96,
-	0xd6, 0x78, 0x61, 0x2c, 0x8d, 0x9f, 0x83, 0x52, 0xa8, 0x71, 0x91, 0x4e, 0xb5, 0xa7, 0x2f, 0xc3,
-	0xcc, 0x32, 0xbd, 0xee, 0x37, 0xb1, 0xbb, 0x47, 0x5a, 0x78, 0x4b, 0x43, 0x1f, 0xcb, 0x50, 0x1c,
-	0xd8, 0x25, 0x3a, 0x93, 0xd5, 0x78, 0xca, 0xb4, 0x95, 0x85, 0x7c, 0x50, 0x28, 0x25, 0xf5, 0x3b,
-	0xe9, 0xa3, 0xe7, 0xbf, 0x7f, 0x26, 0x7f, 0x2d, 0xa1, 0x52, 0x30, 0x6e, 0x7c, 0x10, 0x7e, 0x9b,
-	0x2b, 0xb5, 0x46, 0xed, 0x49, 0x83, 0x3a, 0xec, 0xf6, 0x29, 0x74, 0x82, 0xcf, 0xf4, 0x5c, 0xe7,
-	0x3d, 0xdc, 0xf2, 0xbd, 0x18, 0xb0, 0x80, 0x54, 0x1e, 0xe0, 0xb8, 0xa6, 0x61, 0x93, 0xc7, 0xe1,
-	0xfc, 0x11, 0xa3, 0x4e, 0xa2, 0xe3, 0x3c, 0xaa, 0xe3, 0x58, 0x6d, 0xec, 0x72, 0xf9, 0x45, 0xb4,
-	0xc0, 0xe7, 0x77, 0x88, 0x65, 0x11, 0xdb, 0xbc, 0xd6, 0x6a, 0x39, 0x7d, 0x9b, 0x5b, 0x0d, 0x7d,
-	0x2a, 0xc3, 0x21, 0xe6, 0xe4, 0xe8, 0x74, 0xc6, 0x16, 0x93, 0x2e, 0xaf, 0xe4, 0x78, 0x9e, 0xfa,
-	0x53, 0xb8, 0xf7, 0x1f, 0x24, 0x34, 0x4f, 0x97, 0x1e, 0x58, 0x4e, 0xb0, 0xfd, 0x70, 0xb9, 0x46,
-	0xed, 0xc9, 0x60, 0x7f, 0x71, 0x3a, 0xe6, 0x20, 0x46, 0x55, 0xd1, 0xd9, 0x14, 0x2a, 0x45, 0x44,
-	0x0c, 0x3d, 0x83, 0x4e, 0xa7, 0xa0, 0x03, 0x36, 0x62, 0xd0, 0xab, 0xa8, 0x9a, 0x02, 0x0d, 0x51,
-	0x32, 0x00, 0xa3, 0x2f, 0x64, 0x80, 0xf8, 0xba, 0x42, 0x59, 0x9f, 0x7e, 0xe8, 0x36, 0xcb, 0xa5,
-	0xe6, 0xd7, 0x90, 0x9a, 0x1f, 0x25, 0x75, 0x84, 0x2c, 0x2e, 0xd1, 0x0b, 0x63, 0xfb, 0x15, 0x35,
-	0x5f, 0x1c, 0x0c, 0x56, 0x53, 0x05, 0x24, 0xc2, 0xb0, 0x0b, 0x6a, 0xae, 0x50, 0x18, 0xea, 0x9c,
-	0x2a, 0x24, 0x97, 0x10, 0x8d, 0xfe, 0x28, 0x00, 0xc4, 0x57, 0x67, 0x26, 0x3f, 0x43, 0x37, 0x6b,
-	0x2e, 0x3f, 0x5f, 0x16, 0x28, 0x3f, 0x9f, 0x17, 0x94, 0x3c, 0xe9, 0x44, 0xbb, 0x57, 0x04, 0x04,
-	0xc4, 0xb0, 0x0d, 0x45, 0x54, 0x46, 0xac, 0xa0, 0xaa, 0xec, 0x2f, 0x26, 0x06, 0xbd, 0xa0, 0x88,
-	0x4b, 0x2a, 0x6a, 0x5d, 0x1b, 0xa3, 0x75, 0x6d, 0xdc, 0xd6, 0x35, 0xf1, 0xd6, 0xb5, 0x71, 0x5b,
-	0x47, 0x4f, 0x65, 0x80, 0x78, 0xb2, 0xc8, 0xfc, 0xe6, 0x43, 0x83, 0x87, 0x52, 0x1a, 0x72, 0xf4,
-	0x95, 0xe0, 0x2f, 0xa5, 0xd8, 0x2a, 0x6a, 0xf9, 0x56, 0x51, 0x13, 0xb2, 0x8a, 0x9a, 0xb8, 0x55,
-	0xd4, 0x44, 0xac, 0xa2, 0x36, 0x86, 0x55, 0x7c, 0x2f, 0xc3, 0x74, 0x72, 0xac, 0x40, 0x4b, 0x23,
-	0x6e, 0x8a, 0xa1, 0x39, 0x47, 0xa9, 0x0a, 0x20, 0xd9, 0xc5, 0x92, 0x36, 0x57, 0xde, 0x41, 0xe2,
-	0x49, 0x24, 0x7d, 0x79, 0xf0, 0x06, 0xc2, 0xa1, 0x22, 0x73, 0x1d, 0xe5, 0x1f, 0x1c, 0x34, 0x32,
-	0xd7, 0x61, 0xfb, 0xe0, 0x40, 0x91, 0xb9, 0x8e, 0x76, 0x0f, 0x6e, 0x58, 0xfa, 0x4a, 0x86, 0xc3,
-	0xfc, 0x14, 0x84, 0x16, 0xb3, 0xaf, 0x9d, 0xf4, 0xe5, 0xae, 0xec, 0x37, 0x5f, 0x0c, 0x71, 0x34,
-	0x10, 0x54, 0xbc, 0x3a, 0x7f, 0x01, 0xa5, 0x05, 0x95, 0x44, 0x45, 0x1c, 0x65, 0x0a, 0x2a, 0x09,
-	0x8d, 0x38, 0x4a, 0x09, 0x2a, 0x09, 0x8a, 0x38, 0x1a, 0x21, 0xa8, 0x04, 0x18, 0xfd, 0x26, 0xc3,
-	0x4c, 0x6a, 0xfc, 0x43, 0xd5, 0x91, 0xb7, 0xd0, 0xf8, 0x4c, 0xfd, 0x1d, 0x32, 0xf5, 0xa7, 0xa4,
-	0xe6, 0xa9, 0xe9, 0x52, 0x3c, 0xb0, 0x6d, 0x37, 0x54, 0x01, 0x61, 0xf1, 0x05, 0x17, 0x55, 0x51,
-	0x8d, 0xf1, 0x55, 0x75, 0x75, 0x7f, 0xb9, 0xf1, 0xf8, 0x37, 0x54, 0x71, 0xe5, 0x71, 0x75, 0x94,
-	0xe0, 0xd4, 0xb4, 0x9b, 0x49, 0x70, 0xf6, 0x44, 0x3c, 0x06, 0xc1, 0x5a, 0x9e, 0x14, 0x13, 0x04,
-	0x6b, 0x02, 0xaa, 0x4c, 0x10, 0xac, 0x89, 0x0a, 0x34, 0x41, 0xb0, 0xb6, 0xbf, 0x56, 0x13, 0x04,
-	0x6b, 0xe2, 0xb2, 0xe5, 0x09, 0x7e, 0x26, 0xc3, 0x4c, 0x6a, 0x48, 0xcf, 0x24, 0x38, 0x7b, 0x90,
-	0x17, 0xbe, 0x38, 0x46, 0x1d, 0xf1, 0x9a, 0xd0, 0x11, 0xaf, 0x89, 0x1f, 0xf1, 0x9a, 0xc8, 0x11,
-	0xaf, 0x89, 0x73, 0x75, 0xfd, 0x99, 0x04, 0xc7, 0x5a, 0x4e, 0x77, 0x98, 0x92, 0xeb, 0x68, 0x3d,
-	0x7c, 0x0e, 0xff, 0x68, 0xd9, 0x08, 0x08, 0xd8, 0x90, 0xb6, 0xdf, 0x64, 0x40, 0xd3, 0xb1, 0x0c,
-	0xdb, 0xac, 0x3b, 0xae, 0xd9, 0x30, 0xb1, 0x4d, 0xe9, 0x69, 0x84, 0x29, 0xa3, 0x47, 0x3c, 0xee,
-	0xff, 0x3a, 0x2f, 0xb3, 0xc7, 0xbf, 0x24, 0xe9, 0x5b, 0xf9, 0xa5, 0x9b, 0x61, 0xf5, 0xb2, 0xe5,
-	0xf4, 0xdb, 0x75, 0xb6, 0x40, 0x7d, 0x4b, 0xfb, 0x25, 0xca, 0xdc, 0xa7, 0x99, 0xfb, 0x2c, 0x73,
-	0x7f, 0x4b, 0xdb, 0x99, 0xa0, 0xbf, 0xfd, 0xfa, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9e, 0xb0,
-	0x58, 0x3e, 0x46, 0x15, 0x00, 0x00,
-}
diff --git a/googleapis/logging/v2/logging_metrics.pb.go b/googleapis/logging/v2/logging_metrics.pb.go
index d7bd81a07a..93b6dd3f17 100644
--- a/googleapis/logging/v2/logging_metrics.pb.go
+++ b/googleapis/logging/v2/logging_metrics.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging_metrics.proto
 
-package logging // import "google.golang.org/genproto/googleapis/logging/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import distribution "google.golang.org/genproto/googleapis/api/distribution"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+package logging
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	distribution "google.golang.org/genproto/googleapis/api/distribution"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	_ "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Logging API version.
 type LogMetric_ApiVersion int32
@@ -43,6 +43,7 @@ var LogMetric_ApiVersion_name = map[int32]string{
 	0: "V2",
 	1: "V1",
 }
+
 var LogMetric_ApiVersion_value = map[string]int32{
 	"V2": 0,
 	"V1": 1,
@@ -51,8 +52,9 @@ var LogMetric_ApiVersion_value = map[string]int32{
 func (x LogMetric_ApiVersion) String() string {
 	return proto.EnumName(LogMetric_ApiVersion_name, int32(x))
 }
+
 func (LogMetric_ApiVersion) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{0, 0}
+	return fileDescriptor_25f112b6cac96ff1, []int{0, 0}
 }
 
 // Describes a logs-based metric.  The value of the metric is the
@@ -162,16 +164,17 @@ func (m *LogMetric) Reset()         { *m = LogMetric{} }
 func (m *LogMetric) String() string { return proto.CompactTextString(m) }
 func (*LogMetric) ProtoMessage()    {}
 func (*LogMetric) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{0}
+	return fileDescriptor_25f112b6cac96ff1, []int{0}
 }
+
 func (m *LogMetric) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogMetric.Unmarshal(m, b)
 }
 func (m *LogMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogMetric.Marshal(b, m, deterministic)
 }
-func (dst *LogMetric) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogMetric.Merge(dst, src)
+func (m *LogMetric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogMetric.Merge(m, src)
 }
 func (m *LogMetric) XXX_Size() int {
 	return xxx_messageInfo_LogMetric.Size(m)
@@ -263,16 +266,17 @@ func (m *ListLogMetricsRequest) Reset()         { *m = ListLogMetricsRequest{} }
 func (m *ListLogMetricsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListLogMetricsRequest) ProtoMessage()    {}
 func (*ListLogMetricsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{1}
+	return fileDescriptor_25f112b6cac96ff1, []int{1}
 }
+
 func (m *ListLogMetricsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLogMetricsRequest.Unmarshal(m, b)
 }
 func (m *ListLogMetricsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLogMetricsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListLogMetricsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLogMetricsRequest.Merge(dst, src)
+func (m *ListLogMetricsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogMetricsRequest.Merge(m, src)
 }
 func (m *ListLogMetricsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListLogMetricsRequest.Size(m)
@@ -321,16 +325,17 @@ func (m *ListLogMetricsResponse) Reset()         { *m = ListLogMetricsResponse{}
 func (m *ListLogMetricsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListLogMetricsResponse) ProtoMessage()    {}
 func (*ListLogMetricsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{2}
+	return fileDescriptor_25f112b6cac96ff1, []int{2}
 }
+
 func (m *ListLogMetricsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListLogMetricsResponse.Unmarshal(m, b)
 }
 func (m *ListLogMetricsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListLogMetricsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListLogMetricsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListLogMetricsResponse.Merge(dst, src)
+func (m *ListLogMetricsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogMetricsResponse.Merge(m, src)
 }
 func (m *ListLogMetricsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListLogMetricsResponse.Size(m)
@@ -370,16 +375,17 @@ func (m *GetLogMetricRequest) Reset()         { *m = GetLogMetricRequest{} }
 func (m *GetLogMetricRequest) String() string { return proto.CompactTextString(m) }
 func (*GetLogMetricRequest) ProtoMessage()    {}
 func (*GetLogMetricRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{3}
+	return fileDescriptor_25f112b6cac96ff1, []int{3}
 }
+
 func (m *GetLogMetricRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetLogMetricRequest.Unmarshal(m, b)
 }
 func (m *GetLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetLogMetricRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetLogMetricRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetLogMetricRequest.Merge(dst, src)
+func (m *GetLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLogMetricRequest.Merge(m, src)
 }
 func (m *GetLogMetricRequest) XXX_Size() int {
 	return xxx_messageInfo_GetLogMetricRequest.Size(m)
@@ -417,16 +423,17 @@ func (m *CreateLogMetricRequest) Reset()         { *m = CreateLogMetricRequest{}
 func (m *CreateLogMetricRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateLogMetricRequest) ProtoMessage()    {}
 func (*CreateLogMetricRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{4}
+	return fileDescriptor_25f112b6cac96ff1, []int{4}
 }
+
 func (m *CreateLogMetricRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateLogMetricRequest.Unmarshal(m, b)
 }
 func (m *CreateLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateLogMetricRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateLogMetricRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateLogMetricRequest.Merge(dst, src)
+func (m *CreateLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateLogMetricRequest.Merge(m, src)
 }
 func (m *CreateLogMetricRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateLogMetricRequest.Size(m)
@@ -472,16 +479,17 @@ func (m *UpdateLogMetricRequest) Reset()         { *m = UpdateLogMetricRequest{}
 func (m *UpdateLogMetricRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateLogMetricRequest) ProtoMessage()    {}
 func (*UpdateLogMetricRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{5}
+	return fileDescriptor_25f112b6cac96ff1, []int{5}
 }
+
 func (m *UpdateLogMetricRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateLogMetricRequest.Unmarshal(m, b)
 }
 func (m *UpdateLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateLogMetricRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateLogMetricRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateLogMetricRequest.Merge(dst, src)
+func (m *UpdateLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateLogMetricRequest.Merge(m, src)
 }
 func (m *UpdateLogMetricRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateLogMetricRequest.Size(m)
@@ -521,16 +529,17 @@ func (m *DeleteLogMetricRequest) Reset()         { *m = DeleteLogMetricRequest{}
 func (m *DeleteLogMetricRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteLogMetricRequest) ProtoMessage()    {}
 func (*DeleteLogMetricRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_logging_metrics_29fe293c1106d204, []int{6}
+	return fileDescriptor_25f112b6cac96ff1, []int{6}
 }
+
 func (m *DeleteLogMetricRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteLogMetricRequest.Unmarshal(m, b)
 }
 func (m *DeleteLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteLogMetricRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteLogMetricRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteLogMetricRequest.Merge(dst, src)
+func (m *DeleteLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteLogMetricRequest.Merge(m, src)
 }
 func (m *DeleteLogMetricRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteLogMetricRequest.Size(m)
@@ -549,6 +558,7 @@ func (m *DeleteLogMetricRequest) GetMetricName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.logging.v2.LogMetric_ApiVersion", LogMetric_ApiVersion_name, LogMetric_ApiVersion_value)
 	proto.RegisterType((*LogMetric)(nil), "google.logging.v2.LogMetric")
 	proto.RegisterMapType((map[string]string)(nil), "google.logging.v2.LogMetric.LabelExtractorsEntry")
 	proto.RegisterType((*ListLogMetricsRequest)(nil), "google.logging.v2.ListLogMetricsRequest")
@@ -557,7 +567,68 @@ func init() {
 	proto.RegisterType((*CreateLogMetricRequest)(nil), "google.logging.v2.CreateLogMetricRequest")
 	proto.RegisterType((*UpdateLogMetricRequest)(nil), "google.logging.v2.UpdateLogMetricRequest")
 	proto.RegisterType((*DeleteLogMetricRequest)(nil), "google.logging.v2.DeleteLogMetricRequest")
-	proto.RegisterEnum("google.logging.v2.LogMetric_ApiVersion", LogMetric_ApiVersion_name, LogMetric_ApiVersion_value)
+}
+
+func init() {
+	proto.RegisterFile("google/logging/v2/logging_metrics.proto", fileDescriptor_25f112b6cac96ff1)
+}
+
+var fileDescriptor_25f112b6cac96ff1 = []byte{
+	// 861 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
+	0x14, 0x67, 0x9c, 0xc4, 0x69, 0x5e, 0x68, 0xec, 0x4e, 0x5b, 0xd7, 0x72, 0x53, 0xc5, 0xec, 0x21,
+	0x71, 0x73, 0xd8, 0xa5, 0x0b, 0x8a, 0x4a, 0x11, 0x07, 0xdc, 0x44, 0x15, 0x52, 0x0a, 0x91, 0x0b,
+	0x3e, 0xa0, 0x48, 0xab, 0xb1, 0xfd, 0xb2, 0x1a, 0xbc, 0xbb, 0xb3, 0xec, 0x8c, 0xad, 0xa4, 0xa8,
+	0x17, 0xd4, 0x1b, 0x12, 0x07, 0xf8, 0x00, 0x1c, 0xb8, 0xf1, 0x51, 0xb8, 0xc2, 0x47, 0xe0, 0x43,
+	0x70, 0x44, 0x3b, 0x3b, 0xeb, 0x6c, 0xed, 0x25, 0x8e, 0x72, 0xca, 0xcc, 0xfb, 0xfd, 0xde, 0xfc,
+	0x7e, 0xef, 0x8f, 0x63, 0xc3, 0x9e, 0x2f, 0x84, 0x1f, 0xa0, 0x13, 0x08, 0xdf, 0xe7, 0x91, 0xef,
+	0x4c, 0xdd, 0xfc, 0xe8, 0x85, 0xa8, 0x12, 0x3e, 0x94, 0x76, 0x9c, 0x08, 0x25, 0xe8, 0x9d, 0x8c,
+	0x68, 0x1b, 0xd4, 0x9e, 0xba, 0xad, 0x6d, 0x93, 0xcb, 0x62, 0xee, 0xb0, 0x28, 0x12, 0x8a, 0x29,
+	0x2e, 0x22, 0x93, 0xd0, 0x7a, 0x54, 0x40, 0x47, 0x5c, 0xaa, 0x84, 0x0f, 0x26, 0x29, 0x6e, 0xe0,
+	0x07, 0x05, 0x38, 0x53, 0x32, 0xc0, 0x43, 0x03, 0xe8, 0xdb, 0x60, 0x72, 0xe6, 0x60, 0x18, 0xab,
+	0x0b, 0x03, 0xb6, 0xe7, 0xc1, 0x33, 0x8e, 0xc1, 0xc8, 0x0b, 0x99, 0x1c, 0x1b, 0xc6, 0xce, 0x3c,
+	0x43, 0xf1, 0x10, 0xa5, 0x62, 0x61, 0x9c, 0x11, 0xac, 0xdf, 0x57, 0x61, 0xe3, 0x58, 0xf8, 0x2f,
+	0xb5, 0x26, 0xa5, 0xb0, 0x1a, 0xb1, 0x10, 0x9b, 0xa4, 0x4d, 0x3a, 0x1b, 0x3d, 0x7d, 0xa6, 0x6d,
+	0xd8, 0x1c, 0xa1, 0x1c, 0x26, 0x3c, 0x4e, 0xfd, 0x36, 0x2b, 0x1a, 0x2a, 0x86, 0x68, 0x03, 0xaa,
+	0x67, 0x3c, 0x50, 0x98, 0x34, 0x57, 0x34, 0x68, 0x6e, 0xf4, 0x0b, 0xb8, 0x93, 0xd5, 0xe2, 0xe5,
+	0x6c, 0x91, 0x34, 0xd7, 0xda, 0xa4, 0xb3, 0xe9, 0x6e, 0xdb, 0xa6, 0x81, 0x2c, 0xe6, 0x76, 0x26,
+	0x7e, 0x38, 0xe3, 0xf4, 0xea, 0xe1, 0x5c, 0x84, 0xee, 0x41, 0x6d, 0xca, 0x82, 0x09, 0x7a, 0x78,
+	0xae, 0x12, 0x36, 0x4c, 0x1f, 0xaa, 0x6a, 0xad, 0x2d, 0x1d, 0x3e, 0xca, 0xa3, 0xf4, 0x14, 0xea,
+	0x01, 0x1b, 0x60, 0x70, 0x49, 0x94, 0xcd, 0xf5, 0xf6, 0x4a, 0x67, 0xd3, 0x7d, 0x62, 0x2f, 0xcc,
+	0xcc, 0x9e, 0x55, 0x6e, 0x1f, 0xa7, 0x49, 0xb3, 0x67, 0xe4, 0x51, 0xa4, 0x92, 0x8b, 0x5e, 0x2d,
+	0x78, 0x37, 0x4a, 0x5f, 0xc2, 0xd6, 0x60, 0x32, 0x1c, 0xa3, 0xf2, 0x84, 0x2e, 0x5d, 0x36, 0x6f,
+	0xe9, 0x72, 0x76, 0x8b, 0xe5, 0x1c, 0x16, 0xc7, 0xdb, 0xd5, 0xf4, 0xaf, 0x32, 0x76, 0xef, 0xf6,
+	0xa0, 0x78, 0xa5, 0x47, 0xb0, 0x3e, 0xc5, 0x44, 0xa6, 0x6d, 0x5d, 0x6d, 0x93, 0xce, 0x96, 0xbb,
+	0x77, 0xa5, 0xc7, 0xcf, 0x63, 0xde, 0xcf, 0xe8, 0xdd, 0x4a, 0x93, 0xf4, 0xf2, 0xdc, 0x56, 0x17,
+	0xee, 0x95, 0xd9, 0xa7, 0x75, 0x58, 0x19, 0xe3, 0x85, 0x19, 0x66, 0x7a, 0xa4, 0xf7, 0x60, 0x4d,
+	0xf7, 0xcb, 0x4c, 0x31, 0xbb, 0x3c, 0xab, 0x3c, 0x25, 0xd6, 0x36, 0xc0, 0xe5, 0xf3, 0xb4, 0x0a,
+	0x95, 0xbe, 0x5b, 0x7f, 0x4f, 0xff, 0x7d, 0x52, 0x27, 0xd6, 0x18, 0xee, 0x1f, 0x73, 0xa9, 0x66,
+	0x56, 0x64, 0x0f, 0xbf, 0x9f, 0xa0, 0x54, 0xe9, 0xe8, 0x63, 0x96, 0x60, 0xa4, 0x8c, 0x8a, 0xb9,
+	0xd1, 0x47, 0x00, 0x31, 0xf3, 0xd1, 0x53, 0x62, 0x8c, 0xf9, 0xce, 0x6c, 0xa4, 0x91, 0xaf, 0xd3,
+	0x00, 0x7d, 0x08, 0xfa, 0xe2, 0x49, 0xfe, 0x1a, 0xf5, 0xd2, 0xac, 0xf5, 0x6e, 0xa5, 0x81, 0x57,
+	0xfc, 0x35, 0x5a, 0xe7, 0xd0, 0x98, 0x17, 0x93, 0xb1, 0x88, 0x24, 0xd2, 0x03, 0x58, 0x37, 0x1f,
+	0xc3, 0x26, 0xd1, 0x33, 0xdd, 0xbe, 0xaa, 0x5f, 0xbd, 0x9c, 0x4c, 0x77, 0xa1, 0x16, 0xe1, 0xb9,
+	0xf2, 0x16, 0x2c, 0xdd, 0x4e, 0xc3, 0x27, 0xb9, 0x2d, 0xeb, 0x00, 0xee, 0xbe, 0xc0, 0x4b, 0xe1,
+	0xbc, 0xc8, 0x1d, 0xd8, 0x34, 0x7b, 0x5c, 0xf8, 0x70, 0x40, 0x16, 0xfa, 0x92, 0x85, 0x68, 0x9d,
+	0x41, 0xe3, 0x79, 0x82, 0x4c, 0xe1, 0x42, 0xea, 0xff, 0xf5, 0xe7, 0x63, 0xa8, 0x66, 0xf9, 0xda,
+	0xc8, 0xb2, 0x42, 0x0c, 0xd7, 0x12, 0xd0, 0xf8, 0x26, 0x1e, 0x95, 0xe9, 0x2c, 0xb3, 0x78, 0x43,
+	0xc1, 0x4f, 0xa0, 0x71, 0x88, 0x01, 0xde, 0x40, 0xd0, 0xfd, 0x7b, 0x0d, 0xea, 0x66, 0x7e, 0xaf,
+	0x30, 0x99, 0xf2, 0x21, 0xf6, 0x5d, 0xfa, 0x33, 0x81, 0xad, 0x77, 0x67, 0x4b, 0x3b, 0x65, 0x46,
+	0xca, 0x76, 0xad, 0xf5, 0xf8, 0x1a, 0xcc, 0x6c, 0x51, 0xac, 0xbd, 0x1f, 0xff, 0xfa, 0xe7, 0xd7,
+	0xca, 0x07, 0x74, 0x27, 0xfd, 0x0f, 0xfe, 0x43, 0xd6, 0xf3, 0xcf, 0xe2, 0x44, 0x7c, 0x87, 0x43,
+	0x25, 0x9d, 0xfd, 0x37, 0x4e, 0xbe, 0x19, 0x6f, 0x09, 0xbc, 0x5f, 0x1c, 0x39, 0xdd, 0x2d, 0x11,
+	0x29, 0xd9, 0x89, 0xd6, 0x95, 0xfd, 0xb3, 0x6c, 0xad, 0xdf, 0xa1, 0xbb, 0x5a, 0xbf, 0xd0, 0xa8,
+	0x82, 0x89, 0xdc, 0x83, 0xb3, 0xff, 0x86, 0xfe, 0x44, 0xa0, 0x36, 0xb7, 0x41, 0xb4, 0xac, 0xdc,
+	0xf2, 0x2d, 0x5b, 0x62, 0xc6, 0xd1, 0x66, 0x1e, 0x5b, 0xcb, 0x9a, 0xf1, 0xcc, 0x4c, 0x9d, 0xfe,
+	0x42, 0xa0, 0x36, 0xb7, 0x67, 0xa5, 0x6e, 0xca, 0x77, 0x71, 0x89, 0x9b, 0x03, 0xed, 0xe6, 0xc3,
+	0xd6, 0x35, 0x5b, 0x33, 0x33, 0xf5, 0x96, 0x40, 0x6d, 0x6e, 0x17, 0x4b, 0x4d, 0x95, 0xef, 0x6b,
+	0xab, 0x91, 0x53, 0xf3, 0x6f, 0x42, 0xfb, 0x28, 0xfd, 0x22, 0xcd, 0x27, 0xb5, 0x7f, 0x4d, 0x3b,
+	0xdd, 0xdf, 0x08, 0xdc, 0x1f, 0x8a, 0x70, 0x51, 0xb8, 0x7b, 0xf7, 0x38, 0x3b, 0x9b, 0x5d, 0x3c,
+	0x49, 0x75, 0x4e, 0xc8, 0xb7, 0x4f, 0x0d, 0xd3, 0x17, 0x01, 0x8b, 0x7c, 0x5b, 0x24, 0xbe, 0xe3,
+	0x63, 0xa4, 0x5d, 0x38, 0x19, 0xc4, 0x62, 0x2e, 0x0b, 0xbf, 0x38, 0x3e, 0x35, 0xc7, 0x7f, 0x09,
+	0xf9, 0xa3, 0xf2, 0xe0, 0x45, 0x96, 0xfd, 0x3c, 0x10, 0x93, 0x91, 0x6d, 0x14, 0xec, 0xbe, 0xfb,
+	0x67, 0x8e, 0x9c, 0x6a, 0xe4, 0xd4, 0x20, 0xa7, 0x7d, 0x77, 0x50, 0xd5, 0x6f, 0x7f, 0xf4, 0x5f,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0x84, 0x19, 0x3d, 0xcc, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -773,65 +844,3 @@ var _MetricsServiceV2_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/logging/v2/logging_metrics.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/logging/v2/logging_metrics.proto", fileDescriptor_logging_metrics_29fe293c1106d204)
-}
-
-var fileDescriptor_logging_metrics_29fe293c1106d204 = []byte{
-	// 861 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0x9c, 0xc4, 0x69, 0x5e, 0x68, 0xec, 0x4e, 0x5b, 0xd7, 0x72, 0x53, 0xc5, 0xec, 0x21,
-	0x71, 0x73, 0xd8, 0xa5, 0x0b, 0x8a, 0x4a, 0x11, 0x07, 0xdc, 0x44, 0x15, 0x52, 0x0a, 0x91, 0x0b,
-	0x3e, 0xa0, 0x48, 0xab, 0xb1, 0xfd, 0xb2, 0x1a, 0xbc, 0xbb, 0xb3, 0xec, 0x8c, 0xad, 0xa4, 0xa8,
-	0x17, 0xd4, 0x1b, 0x12, 0x07, 0xf8, 0x00, 0x1c, 0xb8, 0xf1, 0x51, 0xb8, 0xc2, 0x47, 0xe0, 0x43,
-	0x70, 0x44, 0x3b, 0x3b, 0xeb, 0x6c, 0xed, 0x25, 0x8e, 0x72, 0xca, 0xcc, 0xfb, 0xfd, 0xde, 0xfc,
-	0x7e, 0xef, 0x8f, 0x63, 0xc3, 0x9e, 0x2f, 0x84, 0x1f, 0xa0, 0x13, 0x08, 0xdf, 0xe7, 0x91, 0xef,
-	0x4c, 0xdd, 0xfc, 0xe8, 0x85, 0xa8, 0x12, 0x3e, 0x94, 0x76, 0x9c, 0x08, 0x25, 0xe8, 0x9d, 0x8c,
-	0x68, 0x1b, 0xd4, 0x9e, 0xba, 0xad, 0x6d, 0x93, 0xcb, 0x62, 0xee, 0xb0, 0x28, 0x12, 0x8a, 0x29,
-	0x2e, 0x22, 0x93, 0xd0, 0x7a, 0x54, 0x40, 0x47, 0x5c, 0xaa, 0x84, 0x0f, 0x26, 0x29, 0x6e, 0xe0,
-	0x07, 0x05, 0x38, 0x53, 0x32, 0xc0, 0x43, 0x03, 0xe8, 0xdb, 0x60, 0x72, 0xe6, 0x60, 0x18, 0xab,
-	0x0b, 0x03, 0xb6, 0xe7, 0xc1, 0x33, 0x8e, 0xc1, 0xc8, 0x0b, 0x99, 0x1c, 0x1b, 0xc6, 0xce, 0x3c,
-	0x43, 0xf1, 0x10, 0xa5, 0x62, 0x61, 0x9c, 0x11, 0xac, 0xdf, 0x57, 0x61, 0xe3, 0x58, 0xf8, 0x2f,
-	0xb5, 0x26, 0xa5, 0xb0, 0x1a, 0xb1, 0x10, 0x9b, 0xa4, 0x4d, 0x3a, 0x1b, 0x3d, 0x7d, 0xa6, 0x6d,
-	0xd8, 0x1c, 0xa1, 0x1c, 0x26, 0x3c, 0x4e, 0xfd, 0x36, 0x2b, 0x1a, 0x2a, 0x86, 0x68, 0x03, 0xaa,
-	0x67, 0x3c, 0x50, 0x98, 0x34, 0x57, 0x34, 0x68, 0x6e, 0xf4, 0x0b, 0xb8, 0x93, 0xd5, 0xe2, 0xe5,
-	0x6c, 0x91, 0x34, 0xd7, 0xda, 0xa4, 0xb3, 0xe9, 0x6e, 0xdb, 0xa6, 0x81, 0x2c, 0xe6, 0x76, 0x26,
-	0x7e, 0x38, 0xe3, 0xf4, 0xea, 0xe1, 0x5c, 0x84, 0xee, 0x41, 0x6d, 0xca, 0x82, 0x09, 0x7a, 0x78,
-	0xae, 0x12, 0x36, 0x4c, 0x1f, 0xaa, 0x6a, 0xad, 0x2d, 0x1d, 0x3e, 0xca, 0xa3, 0xf4, 0x14, 0xea,
-	0x01, 0x1b, 0x60, 0x70, 0x49, 0x94, 0xcd, 0xf5, 0xf6, 0x4a, 0x67, 0xd3, 0x7d, 0x62, 0x2f, 0xcc,
-	0xcc, 0x9e, 0x55, 0x6e, 0x1f, 0xa7, 0x49, 0xb3, 0x67, 0xe4, 0x51, 0xa4, 0x92, 0x8b, 0x5e, 0x2d,
-	0x78, 0x37, 0x4a, 0x5f, 0xc2, 0xd6, 0x60, 0x32, 0x1c, 0xa3, 0xf2, 0x84, 0x2e, 0x5d, 0x36, 0x6f,
-	0xe9, 0x72, 0x76, 0x8b, 0xe5, 0x1c, 0x16, 0xc7, 0xdb, 0xd5, 0xf4, 0xaf, 0x32, 0x76, 0xef, 0xf6,
-	0xa0, 0x78, 0xa5, 0x47, 0xb0, 0x3e, 0xc5, 0x44, 0xa6, 0x6d, 0x5d, 0x6d, 0x93, 0xce, 0x96, 0xbb,
-	0x77, 0xa5, 0xc7, 0xcf, 0x63, 0xde, 0xcf, 0xe8, 0xdd, 0x4a, 0x93, 0xf4, 0xf2, 0xdc, 0x56, 0x17,
-	0xee, 0x95, 0xd9, 0xa7, 0x75, 0x58, 0x19, 0xe3, 0x85, 0x19, 0x66, 0x7a, 0xa4, 0xf7, 0x60, 0x4d,
-	0xf7, 0xcb, 0x4c, 0x31, 0xbb, 0x3c, 0xab, 0x3c, 0x25, 0xd6, 0x36, 0xc0, 0xe5, 0xf3, 0xb4, 0x0a,
-	0x95, 0xbe, 0x5b, 0x7f, 0x4f, 0xff, 0x7d, 0x52, 0x27, 0xd6, 0x18, 0xee, 0x1f, 0x73, 0xa9, 0x66,
-	0x56, 0x64, 0x0f, 0xbf, 0x9f, 0xa0, 0x54, 0xe9, 0xe8, 0x63, 0x96, 0x60, 0xa4, 0x8c, 0x8a, 0xb9,
-	0xd1, 0x47, 0x00, 0x31, 0xf3, 0xd1, 0x53, 0x62, 0x8c, 0xf9, 0xce, 0x6c, 0xa4, 0x91, 0xaf, 0xd3,
-	0x00, 0x7d, 0x08, 0xfa, 0xe2, 0x49, 0xfe, 0x1a, 0xf5, 0xd2, 0xac, 0xf5, 0x6e, 0xa5, 0x81, 0x57,
-	0xfc, 0x35, 0x5a, 0xe7, 0xd0, 0x98, 0x17, 0x93, 0xb1, 0x88, 0x24, 0xd2, 0x03, 0x58, 0x37, 0x1f,
-	0xc3, 0x26, 0xd1, 0x33, 0xdd, 0xbe, 0xaa, 0x5f, 0xbd, 0x9c, 0x4c, 0x77, 0xa1, 0x16, 0xe1, 0xb9,
-	0xf2, 0x16, 0x2c, 0xdd, 0x4e, 0xc3, 0x27, 0xb9, 0x2d, 0xeb, 0x00, 0xee, 0xbe, 0xc0, 0x4b, 0xe1,
-	0xbc, 0xc8, 0x1d, 0xd8, 0x34, 0x7b, 0x5c, 0xf8, 0x70, 0x40, 0x16, 0xfa, 0x92, 0x85, 0x68, 0x9d,
-	0x41, 0xe3, 0x79, 0x82, 0x4c, 0xe1, 0x42, 0xea, 0xff, 0xf5, 0xe7, 0x63, 0xa8, 0x66, 0xf9, 0xda,
-	0xc8, 0xb2, 0x42, 0x0c, 0xd7, 0x12, 0xd0, 0xf8, 0x26, 0x1e, 0x95, 0xe9, 0x2c, 0xb3, 0x78, 0x43,
-	0xc1, 0x4f, 0xa0, 0x71, 0x88, 0x01, 0xde, 0x40, 0xd0, 0xfd, 0x7b, 0x0d, 0xea, 0x66, 0x7e, 0xaf,
-	0x30, 0x99, 0xf2, 0x21, 0xf6, 0x5d, 0xfa, 0x33, 0x81, 0xad, 0x77, 0x67, 0x4b, 0x3b, 0x65, 0x46,
-	0xca, 0x76, 0xad, 0xf5, 0xf8, 0x1a, 0xcc, 0x6c, 0x51, 0xac, 0xbd, 0x1f, 0xff, 0xfa, 0xe7, 0xd7,
-	0xca, 0x07, 0x74, 0x27, 0xfd, 0x0f, 0xfe, 0x43, 0xd6, 0xf3, 0xcf, 0xe2, 0x44, 0x7c, 0x87, 0x43,
-	0x25, 0x9d, 0xfd, 0x37, 0x4e, 0xbe, 0x19, 0x6f, 0x09, 0xbc, 0x5f, 0x1c, 0x39, 0xdd, 0x2d, 0x11,
-	0x29, 0xd9, 0x89, 0xd6, 0x95, 0xfd, 0xb3, 0x6c, 0xad, 0xdf, 0xa1, 0xbb, 0x5a, 0xbf, 0xd0, 0xa8,
-	0x82, 0x89, 0xdc, 0x83, 0xb3, 0xff, 0x86, 0xfe, 0x44, 0xa0, 0x36, 0xb7, 0x41, 0xb4, 0xac, 0xdc,
-	0xf2, 0x2d, 0x5b, 0x62, 0xc6, 0xd1, 0x66, 0x1e, 0x5b, 0xcb, 0x9a, 0xf1, 0xcc, 0x4c, 0x9d, 0xfe,
-	0x42, 0xa0, 0x36, 0xb7, 0x67, 0xa5, 0x6e, 0xca, 0x77, 0x71, 0x89, 0x9b, 0x03, 0xed, 0xe6, 0xc3,
-	0xd6, 0x35, 0x5b, 0x33, 0x33, 0xf5, 0x96, 0x40, 0x6d, 0x6e, 0x17, 0x4b, 0x4d, 0x95, 0xef, 0x6b,
-	0xab, 0x91, 0x53, 0xf3, 0x6f, 0x42, 0xfb, 0x28, 0xfd, 0x22, 0xcd, 0x27, 0xb5, 0x7f, 0x4d, 0x3b,
-	0xdd, 0xdf, 0x08, 0xdc, 0x1f, 0x8a, 0x70, 0x51, 0xb8, 0x7b, 0xf7, 0x38, 0x3b, 0x9b, 0x5d, 0x3c,
-	0x49, 0x75, 0x4e, 0xc8, 0xb7, 0x4f, 0x0d, 0xd3, 0x17, 0x01, 0x8b, 0x7c, 0x5b, 0x24, 0xbe, 0xe3,
-	0x63, 0xa4, 0x5d, 0x38, 0x19, 0xc4, 0x62, 0x2e, 0x0b, 0xbf, 0x38, 0x3e, 0x35, 0xc7, 0x7f, 0x09,
-	0xf9, 0xa3, 0xf2, 0xe0, 0x45, 0x96, 0xfd, 0x3c, 0x10, 0x93, 0x91, 0x6d, 0x14, 0xec, 0xbe, 0xfb,
-	0x67, 0x8e, 0x9c, 0x6a, 0xe4, 0xd4, 0x20, 0xa7, 0x7d, 0x77, 0x50, 0xd5, 0x6f, 0x7f, 0xf4, 0x5f,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0x84, 0x19, 0x3d, 0xcc, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/longrunning/operations.pb.go b/googleapis/longrunning/operations.pb.go
index b725657e20..923e828ea7 100644
--- a/googleapis/longrunning/operations.pb.go
+++ b/googleapis/longrunning/operations.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/longrunning/operations.proto
 
-package longrunning // import "google.golang.org/genproto/googleapis/longrunning"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-import any "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package longrunning
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	any "github.com/golang/protobuf/ptypes/any"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // This resource represents a long-running operation that is the result of a
 // network API call.
@@ -62,16 +62,17 @@ func (m *Operation) Reset()         { *m = Operation{} }
 func (m *Operation) String() string { return proto.CompactTextString(m) }
 func (*Operation) ProtoMessage()    {}
 func (*Operation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{0}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{0}
 }
+
 func (m *Operation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Operation.Unmarshal(m, b)
 }
 func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
 }
-func (dst *Operation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Operation.Merge(dst, src)
+func (m *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(m, src)
 }
 func (m *Operation) XXX_Size() int {
 	return xxx_messageInfo_Operation.Size(m)
@@ -140,80 +141,14 @@ func (m *Operation) GetResponse() *any.Any {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Operation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Operation_OneofMarshaler, _Operation_OneofUnmarshaler, _Operation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Operation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Operation_Error)(nil),
 		(*Operation_Response)(nil),
 	}
 }
 
-func _Operation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Operation)
-	// result
-	switch x := m.Result.(type) {
-	case *Operation_Error:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Error); err != nil {
-			return err
-		}
-	case *Operation_Response:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Response); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Operation.Result has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Operation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Operation)
-	switch tag {
-	case 4: // result.error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(status.Status)
-		err := b.DecodeMessage(msg)
-		m.Result = &Operation_Error{msg}
-		return true, err
-	case 5: // result.response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(any.Any)
-		err := b.DecodeMessage(msg)
-		m.Result = &Operation_Response{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Operation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Operation)
-	// result
-	switch x := m.Result.(type) {
-	case *Operation_Error:
-		s := proto.Size(x.Error)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Operation_Response:
-		s := proto.Size(x.Response)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request message for [Operations.GetOperation][google.longrunning.Operations.GetOperation].
 type GetOperationRequest struct {
 	// The name of the operation resource.
@@ -227,16 +162,17 @@ func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
 func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*GetOperationRequest) ProtoMessage()    {}
 func (*GetOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{1}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{1}
 }
+
 func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
 }
 func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+func (m *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(m, src)
 }
 func (m *GetOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_GetOperationRequest.Size(m)
@@ -273,16 +209,17 @@ func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
 func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsRequest) ProtoMessage()    {}
 func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{2}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{2}
 }
+
 func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
 }
 func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+func (m *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(m, src)
 }
 func (m *ListOperationsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsRequest.Size(m)
@@ -336,16 +273,17 @@ func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{}
 func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListOperationsResponse) ProtoMessage()    {}
 func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{3}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{3}
 }
+
 func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
 }
 func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+func (m *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(m, src)
 }
 func (m *ListOperationsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListOperationsResponse.Size(m)
@@ -383,16 +321,17 @@ func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{}
 func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelOperationRequest) ProtoMessage()    {}
 func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{4}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{4}
 }
+
 func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
 }
 func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+func (m *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(m, src)
 }
 func (m *CancelOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelOperationRequest.Size(m)
@@ -423,16 +362,17 @@ func (m *DeleteOperationRequest) Reset()         { *m = DeleteOperationRequest{}
 func (m *DeleteOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteOperationRequest) ProtoMessage()    {}
 func (*DeleteOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{5}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{5}
 }
+
 func (m *DeleteOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteOperationRequest.Unmarshal(m, b)
 }
 func (m *DeleteOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteOperationRequest.Merge(dst, src)
+func (m *DeleteOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteOperationRequest.Merge(m, src)
 }
 func (m *DeleteOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteOperationRequest.Size(m)
@@ -467,16 +407,17 @@ func (m *WaitOperationRequest) Reset()         { *m = WaitOperationRequest{} }
 func (m *WaitOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*WaitOperationRequest) ProtoMessage()    {}
 func (*WaitOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{6}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{6}
 }
+
 func (m *WaitOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WaitOperationRequest.Unmarshal(m, b)
 }
 func (m *WaitOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_WaitOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *WaitOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WaitOperationRequest.Merge(dst, src)
+func (m *WaitOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WaitOperationRequest.Merge(m, src)
 }
 func (m *WaitOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_WaitOperationRequest.Size(m)
@@ -539,16 +480,17 @@ func (m *OperationInfo) Reset()         { *m = OperationInfo{} }
 func (m *OperationInfo) String() string { return proto.CompactTextString(m) }
 func (*OperationInfo) ProtoMessage()    {}
 func (*OperationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_operations_6d5856629ff294fa, []int{7}
+	return fileDescriptor_bff5d3ff9032d7eb, []int{7}
 }
+
 func (m *OperationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationInfo.Unmarshal(m, b)
 }
 func (m *OperationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationInfo.Marshal(b, m, deterministic)
 }
-func (dst *OperationInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationInfo.Merge(dst, src)
+func (m *OperationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationInfo.Merge(m, src)
 }
 func (m *OperationInfo) XXX_Size() int {
 	return xxx_messageInfo_OperationInfo.Size(m)
@@ -578,7 +520,7 @@ var E_OperationInfo = &proto.ExtensionDesc{
 	ExtensionType: (*OperationInfo)(nil),
 	Field:         1049,
 	Name:          "google.longrunning.operation_info",
-	Tag:           "bytes,1049,opt,name=operation_info,json=operationInfo",
+	Tag:           "bytes,1049,opt,name=operation_info",
 	Filename:      "google/longrunning/operations.proto",
 }
 
@@ -594,6 +536,61 @@ func init() {
 	proto.RegisterExtension(E_OperationInfo)
 }
 
+func init() {
+	proto.RegisterFile("google/longrunning/operations.proto", fileDescriptor_bff5d3ff9032d7eb)
+}
+
+var fileDescriptor_bff5d3ff9032d7eb = []byte{
+	// 741 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x4e, 0x13, 0x51,
+	0x14, 0x66, 0x4a, 0xc1, 0xf6, 0x40, 0x69, 0x72, 0x85, 0x52, 0x8a, 0x60, 0x1d, 0x8c, 0x96, 0x86,
+	0xcc, 0x68, 0xd9, 0x61, 0x58, 0x88, 0x18, 0x30, 0xc1, 0x40, 0x06, 0x12, 0x23, 0x31, 0x69, 0x86,
+	0xf6, 0x30, 0x4e, 0x6c, 0xef, 0x1d, 0xef, 0xdc, 0x51, 0x8a, 0x21, 0x44, 0x17, 0xbe, 0x80, 0x0b,
+	0xe3, 0x2b, 0xf8, 0x28, 0x6e, 0x5c, 0xf8, 0x0a, 0x2e, 0x7c, 0x04, 0x97, 0x66, 0xee, 0xcc, 0xb4,
+	0x43, 0x3b, 0xc5, 0xee, 0xe6, 0x9e, 0xf3, 0xdd, 0xef, 0x3b, 0x3f, 0xdf, 0x6d, 0x61, 0xc5, 0x62,
+	0xcc, 0x6a, 0xa1, 0xde, 0x62, 0xd4, 0xe2, 0x1e, 0xa5, 0x36, 0xb5, 0x74, 0xe6, 0x20, 0x37, 0x85,
+	0xcd, 0xa8, 0xab, 0x39, 0x9c, 0x09, 0x46, 0x48, 0x00, 0xd2, 0x62, 0xa0, 0xd2, 0xad, 0xf0, 0xa2,
+	0xe9, 0xd8, 0xba, 0x49, 0x29, 0x13, 0xf1, 0x1b, 0xa5, 0x85, 0x30, 0x2b, 0x4f, 0x27, 0xde, 0xa9,
+	0x6e, 0xd2, 0x4e, 0x98, 0x5a, 0xee, 0x4f, 0x35, 0xbd, 0x40, 0x2d, 0xcc, 0x2f, 0xf6, 0xe7, 0xb1,
+	0xed, 0x88, 0xe8, 0xf2, 0x7c, 0x98, 0xe4, 0x4e, 0x43, 0x77, 0x85, 0x29, 0xbc, 0x48, 0xb0, 0x3c,
+	0xc0, 0x8a, 0x6e, 0x83, 0xdb, 0x8e, 0x60, 0x3c, 0x40, 0xa8, 0x3f, 0x15, 0xc8, 0xee, 0x47, 0x9d,
+	0x11, 0x02, 0x69, 0x6a, 0xb6, 0xb1, 0xa8, 0x94, 0x95, 0x4a, 0xd6, 0x90, 0xdf, 0xe4, 0x01, 0x64,
+	0xda, 0x28, 0xcc, 0xa6, 0x29, 0xcc, 0x62, 0xaa, 0xac, 0x54, 0xa6, 0x6a, 0xb3, 0x5a, 0xd8, 0x79,
+	0x44, 0xab, 0x3d, 0xa6, 0x1d, 0xa3, 0x8b, 0xf2, 0x59, 0x9a, 0x8c, 0x62, 0x71, 0xbc, 0xac, 0x54,
+	0x32, 0x86, 0xfc, 0x26, 0x55, 0x98, 0x40, 0xce, 0x19, 0x2f, 0xa6, 0x25, 0x05, 0x89, 0x28, 0xb8,
+	0xd3, 0xd0, 0x0e, 0x65, 0xc9, 0xbb, 0x63, 0x46, 0x00, 0x21, 0x35, 0xc8, 0x70, 0x74, 0x1d, 0x46,
+	0x5d, 0x2c, 0x4e, 0x0c, 0x57, 0xdc, 0x1d, 0x33, 0xba, 0xb8, 0xad, 0x0c, 0x4c, 0x72, 0x74, 0xbd,
+	0x96, 0x50, 0x57, 0xe1, 0xe6, 0x0e, 0x8a, 0x6e, 0x4f, 0x06, 0xbe, 0xf5, 0xd0, 0x15, 0x49, 0xad,
+	0xa9, 0x97, 0x30, 0xb7, 0x67, 0xbb, 0x3d, 0xac, 0xdb, 0x0f, 0x4e, 0xc7, 0xe6, 0x50, 0x80, 0xc9,
+	0x53, 0xbb, 0x25, 0x90, 0x87, 0x14, 0xe1, 0x89, 0x2c, 0x42, 0xd6, 0x31, 0x2d, 0xac, 0xbb, 0xf6,
+	0x39, 0xca, 0x01, 0x4d, 0x18, 0x19, 0x3f, 0x70, 0x68, 0x9f, 0x23, 0x59, 0x02, 0x90, 0x49, 0xc1,
+	0xde, 0x20, 0x95, 0x03, 0xc9, 0x1a, 0x12, 0x7e, 0xe4, 0x07, 0xd4, 0x4b, 0x28, 0xf4, 0x17, 0x10,
+	0xf4, 0x43, 0x36, 0x01, 0x7a, 0x86, 0x2b, 0x2a, 0xe5, 0xf1, 0xca, 0x54, 0x6d, 0x49, 0x1b, 0x74,
+	0x9c, 0xd6, 0x6b, 0x34, 0x76, 0x81, 0xdc, 0x83, 0x3c, 0xc5, 0x33, 0x51, 0x8f, 0x89, 0xa7, 0xa4,
+	0x78, 0xce, 0x0f, 0x1f, 0x74, 0x0b, 0x58, 0x83, 0xc2, 0x13, 0x93, 0x36, 0xb0, 0x35, 0xd2, 0xbc,
+	0xd6, 0xa0, 0xb0, 0x8d, 0x2d, 0x14, 0x38, 0x12, 0xba, 0x0e, 0xb3, 0x2f, 0x4c, 0x7b, 0xa4, 0x4d,
+	0x90, 0x75, 0xb8, 0x21, 0xec, 0x36, 0x32, 0x4f, 0x84, 0x1e, 0x5b, 0x18, 0xd8, 0xf8, 0x76, 0xf8,
+	0x20, 0x8c, 0x08, 0xa9, 0xbe, 0x84, 0x5c, 0x97, 0xfc, 0x19, 0x3d, 0x65, 0x64, 0x05, 0x72, 0x91,
+	0x21, 0xea, 0xa2, 0xe3, 0x44, 0x12, 0xd3, 0x51, 0xf0, 0xa8, 0xe3, 0xa0, 0x0f, 0x8a, 0x9c, 0x1a,
+	0x80, 0x82, 0xc1, 0x4c, 0x47, 0x41, 0x1f, 0x54, 0xfb, 0x93, 0x06, 0xe8, 0x6d, 0x85, 0x7c, 0x56,
+	0x60, 0xe6, 0xea, 0xa2, 0xc8, 0x6a, 0xd2, 0x32, 0x12, 0xdd, 0x54, 0xaa, 0x8e, 0x02, 0x0d, 0x2a,
+	0x54, 0x97, 0x3e, 0xfd, 0xfa, 0xfd, 0x25, 0x35, 0x4f, 0xe6, 0xf4, 0x77, 0x0f, 0xf5, 0x0f, 0xfe,
+	0x6c, 0x36, 0x7b, 0x6b, 0xbd, 0x20, 0x67, 0x30, 0x1d, 0x37, 0x37, 0xb9, 0x9f, 0x44, 0x9d, 0x60,
+	0xff, 0xd2, 0xf5, 0xde, 0x51, 0xcb, 0x52, 0xb6, 0x44, 0x8a, 0x49, 0xb2, 0x7a, 0xb5, 0x7a, 0x41,
+	0xde, 0x43, 0xbe, 0x6f, 0xf7, 0x24, 0xb1, 0xaf, 0x64, 0x83, 0x94, 0x0a, 0x03, 0xfb, 0x7c, 0xea,
+	0xff, 0x80, 0x45, 0xc2, 0xd5, 0xe1, 0xc2, 0x1f, 0x15, 0xc8, 0xf7, 0x79, 0x34, 0x59, 0x39, 0xd9,
+	0xc8, 0x43, 0x95, 0xab, 0x52, 0xf9, 0xae, 0x7a, 0x7b, 0x98, 0xf2, 0x46, 0x43, 0x12, 0x6e, 0x28,
+	0x55, 0x72, 0x0c, 0xb9, 0x2b, 0x56, 0x26, 0x95, 0xa4, 0x02, 0x92, 0xdc, 0xfe, 0xbf, 0xc1, 0x8f,
+	0x6d, 0xd8, 0x30, 0xd3, 0xd5, 0xad, 0xdb, 0xbe, 0x8d, 0x97, 0x07, 0x2a, 0x7e, 0x8e, 0xe2, 0x35,
+	0x6b, 0xee, 0x3b, 0xc1, 0xaf, 0xc1, 0xb7, 0x8c, 0x7c, 0x22, 0x77, 0xae, 0x65, 0xf6, 0x1f, 0x84,
+	0x91, 0x63, 0xf1, 0xe3, 0xd6, 0x57, 0x05, 0x0a, 0x0d, 0xd6, 0x4e, 0xb8, 0xb7, 0x95, 0xef, 0x79,
+	0xf1, 0xc0, 0x57, 0x3d, 0x50, 0x8e, 0x37, 0x43, 0x98, 0xc5, 0x5a, 0x26, 0xb5, 0x34, 0xc6, 0x2d,
+	0xdd, 0x42, 0x2a, 0x6b, 0xd2, 0x83, 0x94, 0xe9, 0xd8, 0x6e, 0xfc, 0x3f, 0xf2, 0x51, 0xec, 0xfb,
+	0xaf, 0xa2, 0x7c, 0x4f, 0x91, 0x9d, 0x80, 0x62, 0x8f, 0x51, 0xcb, 0x08, 0xe2, 0x3f, 0xa2, 0xe0,
+	0xab, 0x58, 0xf0, 0x64, 0x52, 0xd2, 0xae, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x06, 0x86, 0x63,
+	0xe5, 0x79, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -869,58 +866,3 @@ var _Operations_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/longrunning/operations.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/longrunning/operations.proto", fileDescriptor_operations_6d5856629ff294fa)
-}
-
-var fileDescriptor_operations_6d5856629ff294fa = []byte{
-	// 741 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x4e, 0x13, 0x51,
-	0x14, 0x66, 0x4a, 0xc1, 0xf6, 0x40, 0x69, 0x72, 0x85, 0x52, 0x8a, 0x60, 0x1d, 0x8c, 0x96, 0x86,
-	0xcc, 0x68, 0xd9, 0x61, 0x58, 0x88, 0x18, 0x30, 0xc1, 0x40, 0x06, 0x12, 0x23, 0x31, 0x69, 0x86,
-	0xf6, 0x30, 0x4e, 0x6c, 0xef, 0x1d, 0xef, 0xdc, 0x51, 0x8a, 0x21, 0x44, 0x17, 0xbe, 0x80, 0x0b,
-	0xe3, 0x2b, 0xf8, 0x28, 0x6e, 0x5c, 0xf8, 0x0a, 0x2e, 0x7c, 0x04, 0x97, 0x66, 0xee, 0xcc, 0xb4,
-	0x43, 0x3b, 0xc5, 0xee, 0xe6, 0x9e, 0xf3, 0xdd, 0xef, 0x3b, 0x3f, 0xdf, 0x6d, 0x61, 0xc5, 0x62,
-	0xcc, 0x6a, 0xa1, 0xde, 0x62, 0xd4, 0xe2, 0x1e, 0xa5, 0x36, 0xb5, 0x74, 0xe6, 0x20, 0x37, 0x85,
-	0xcd, 0xa8, 0xab, 0x39, 0x9c, 0x09, 0x46, 0x48, 0x00, 0xd2, 0x62, 0xa0, 0xd2, 0xad, 0xf0, 0xa2,
-	0xe9, 0xd8, 0xba, 0x49, 0x29, 0x13, 0xf1, 0x1b, 0xa5, 0x85, 0x30, 0x2b, 0x4f, 0x27, 0xde, 0xa9,
-	0x6e, 0xd2, 0x4e, 0x98, 0x5a, 0xee, 0x4f, 0x35, 0xbd, 0x40, 0x2d, 0xcc, 0x2f, 0xf6, 0xe7, 0xb1,
-	0xed, 0x88, 0xe8, 0xf2, 0x7c, 0x98, 0xe4, 0x4e, 0x43, 0x77, 0x85, 0x29, 0xbc, 0x48, 0xb0, 0x3c,
-	0xc0, 0x8a, 0x6e, 0x83, 0xdb, 0x8e, 0x60, 0x3c, 0x40, 0xa8, 0x3f, 0x15, 0xc8, 0xee, 0x47, 0x9d,
-	0x11, 0x02, 0x69, 0x6a, 0xb6, 0xb1, 0xa8, 0x94, 0x95, 0x4a, 0xd6, 0x90, 0xdf, 0xe4, 0x01, 0x64,
-	0xda, 0x28, 0xcc, 0xa6, 0x29, 0xcc, 0x62, 0xaa, 0xac, 0x54, 0xa6, 0x6a, 0xb3, 0x5a, 0xd8, 0x79,
-	0x44, 0xab, 0x3d, 0xa6, 0x1d, 0xa3, 0x8b, 0xf2, 0x59, 0x9a, 0x8c, 0x62, 0x71, 0xbc, 0xac, 0x54,
-	0x32, 0x86, 0xfc, 0x26, 0x55, 0x98, 0x40, 0xce, 0x19, 0x2f, 0xa6, 0x25, 0x05, 0x89, 0x28, 0xb8,
-	0xd3, 0xd0, 0x0e, 0x65, 0xc9, 0xbb, 0x63, 0x46, 0x00, 0x21, 0x35, 0xc8, 0x70, 0x74, 0x1d, 0x46,
-	0x5d, 0x2c, 0x4e, 0x0c, 0x57, 0xdc, 0x1d, 0x33, 0xba, 0xb8, 0xad, 0x0c, 0x4c, 0x72, 0x74, 0xbd,
-	0x96, 0x50, 0x57, 0xe1, 0xe6, 0x0e, 0x8a, 0x6e, 0x4f, 0x06, 0xbe, 0xf5, 0xd0, 0x15, 0x49, 0xad,
-	0xa9, 0x97, 0x30, 0xb7, 0x67, 0xbb, 0x3d, 0xac, 0xdb, 0x0f, 0x4e, 0xc7, 0xe6, 0x50, 0x80, 0xc9,
-	0x53, 0xbb, 0x25, 0x90, 0x87, 0x14, 0xe1, 0x89, 0x2c, 0x42, 0xd6, 0x31, 0x2d, 0xac, 0xbb, 0xf6,
-	0x39, 0xca, 0x01, 0x4d, 0x18, 0x19, 0x3f, 0x70, 0x68, 0x9f, 0x23, 0x59, 0x02, 0x90, 0x49, 0xc1,
-	0xde, 0x20, 0x95, 0x03, 0xc9, 0x1a, 0x12, 0x7e, 0xe4, 0x07, 0xd4, 0x4b, 0x28, 0xf4, 0x17, 0x10,
-	0xf4, 0x43, 0x36, 0x01, 0x7a, 0x86, 0x2b, 0x2a, 0xe5, 0xf1, 0xca, 0x54, 0x6d, 0x49, 0x1b, 0x74,
-	0x9c, 0xd6, 0x6b, 0x34, 0x76, 0x81, 0xdc, 0x83, 0x3c, 0xc5, 0x33, 0x51, 0x8f, 0x89, 0xa7, 0xa4,
-	0x78, 0xce, 0x0f, 0x1f, 0x74, 0x0b, 0x58, 0x83, 0xc2, 0x13, 0x93, 0x36, 0xb0, 0x35, 0xd2, 0xbc,
-	0xd6, 0xa0, 0xb0, 0x8d, 0x2d, 0x14, 0x38, 0x12, 0xba, 0x0e, 0xb3, 0x2f, 0x4c, 0x7b, 0xa4, 0x4d,
-	0x90, 0x75, 0xb8, 0x21, 0xec, 0x36, 0x32, 0x4f, 0x84, 0x1e, 0x5b, 0x18, 0xd8, 0xf8, 0x76, 0xf8,
-	0x20, 0x8c, 0x08, 0xa9, 0xbe, 0x84, 0x5c, 0x97, 0xfc, 0x19, 0x3d, 0x65, 0x64, 0x05, 0x72, 0x91,
-	0x21, 0xea, 0xa2, 0xe3, 0x44, 0x12, 0xd3, 0x51, 0xf0, 0xa8, 0xe3, 0xa0, 0x0f, 0x8a, 0x9c, 0x1a,
-	0x80, 0x82, 0xc1, 0x4c, 0x47, 0x41, 0x1f, 0x54, 0xfb, 0x93, 0x06, 0xe8, 0x6d, 0x85, 0x7c, 0x56,
-	0x60, 0xe6, 0xea, 0xa2, 0xc8, 0x6a, 0xd2, 0x32, 0x12, 0xdd, 0x54, 0xaa, 0x8e, 0x02, 0x0d, 0x2a,
-	0x54, 0x97, 0x3e, 0xfd, 0xfa, 0xfd, 0x25, 0x35, 0x4f, 0xe6, 0xf4, 0x77, 0x0f, 0xf5, 0x0f, 0xfe,
-	0x6c, 0x36, 0x7b, 0x6b, 0xbd, 0x20, 0x67, 0x30, 0x1d, 0x37, 0x37, 0xb9, 0x9f, 0x44, 0x9d, 0x60,
-	0xff, 0xd2, 0xf5, 0xde, 0x51, 0xcb, 0x52, 0xb6, 0x44, 0x8a, 0x49, 0xb2, 0x7a, 0xb5, 0x7a, 0x41,
-	0xde, 0x43, 0xbe, 0x6f, 0xf7, 0x24, 0xb1, 0xaf, 0x64, 0x83, 0x94, 0x0a, 0x03, 0xfb, 0x7c, 0xea,
-	0xff, 0x80, 0x45, 0xc2, 0xd5, 0xe1, 0xc2, 0x1f, 0x15, 0xc8, 0xf7, 0x79, 0x34, 0x59, 0x39, 0xd9,
-	0xc8, 0x43, 0x95, 0xab, 0x52, 0xf9, 0xae, 0x7a, 0x7b, 0x98, 0xf2, 0x46, 0x43, 0x12, 0x6e, 0x28,
-	0x55, 0x72, 0x0c, 0xb9, 0x2b, 0x56, 0x26, 0x95, 0xa4, 0x02, 0x92, 0xdc, 0xfe, 0xbf, 0xc1, 0x8f,
-	0x6d, 0xd8, 0x30, 0xd3, 0xd5, 0xad, 0xdb, 0xbe, 0x8d, 0x97, 0x07, 0x2a, 0x7e, 0x8e, 0xe2, 0x35,
-	0x6b, 0xee, 0x3b, 0xc1, 0xaf, 0xc1, 0xb7, 0x8c, 0x7c, 0x22, 0x77, 0xae, 0x65, 0xf6, 0x1f, 0x84,
-	0x91, 0x63, 0xf1, 0xe3, 0xd6, 0x57, 0x05, 0x0a, 0x0d, 0xd6, 0x4e, 0xb8, 0xb7, 0x95, 0xef, 0x79,
-	0xf1, 0xc0, 0x57, 0x3d, 0x50, 0x8e, 0x37, 0x43, 0x98, 0xc5, 0x5a, 0x26, 0xb5, 0x34, 0xc6, 0x2d,
-	0xdd, 0x42, 0x2a, 0x6b, 0xd2, 0x83, 0x94, 0xe9, 0xd8, 0x6e, 0xfc, 0x3f, 0xf2, 0x51, 0xec, 0xfb,
-	0xaf, 0xa2, 0x7c, 0x4f, 0x91, 0x9d, 0x80, 0x62, 0x8f, 0x51, 0xcb, 0x08, 0xe2, 0x3f, 0xa2, 0xe0,
-	0xab, 0x58, 0xf0, 0x64, 0x52, 0xd2, 0xae, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x06, 0x86, 0x63,
-	0xe5, 0x79, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/monitoring/v3/alert.pb.go b/googleapis/monitoring/v3/alert.pb.go
index a2af65cbad..311f4b3c16 100644
--- a/googleapis/monitoring/v3/alert.pb.go
+++ b/googleapis/monitoring/v3/alert.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/alert.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Operators for combining conditions.
 type AlertPolicy_ConditionCombinerType int32
@@ -47,6 +50,7 @@ var AlertPolicy_ConditionCombinerType_name = map[int32]string{
 	2: "OR",
 	3: "AND_WITH_MATCHING_RESOURCE",
 }
+
 var AlertPolicy_ConditionCombinerType_value = map[string]int32{
 	"COMBINE_UNSPECIFIED":        0,
 	"AND":                        1,
@@ -57,8 +61,9 @@ var AlertPolicy_ConditionCombinerType_value = map[string]int32{
 func (x AlertPolicy_ConditionCombinerType) String() string {
 	return proto.EnumName(AlertPolicy_ConditionCombinerType_name, int32(x))
 }
+
 func (AlertPolicy_ConditionCombinerType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_alert_9493c79d6a8e0cc9, []int{0, 0}
+	return fileDescriptor_014ef0e1a0f00a00, []int{0, 0}
 }
 
 // A description of the conditions under which some aspect of your system is
@@ -136,16 +141,17 @@ func (m *AlertPolicy) Reset()         { *m = AlertPolicy{} }
 func (m *AlertPolicy) String() string { return proto.CompactTextString(m) }
 func (*AlertPolicy) ProtoMessage()    {}
 func (*AlertPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_9493c79d6a8e0cc9, []int{0}
+	return fileDescriptor_014ef0e1a0f00a00, []int{0}
 }
+
 func (m *AlertPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlertPolicy.Unmarshal(m, b)
 }
 func (m *AlertPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlertPolicy.Marshal(b, m, deterministic)
 }
-func (dst *AlertPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlertPolicy.Merge(dst, src)
+func (m *AlertPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy.Merge(m, src)
 }
 func (m *AlertPolicy) XXX_Size() int {
 	return xxx_messageInfo_AlertPolicy.Size(m)
@@ -247,16 +253,17 @@ func (m *AlertPolicy_Documentation) Reset()         { *m = AlertPolicy_Documenta
 func (m *AlertPolicy_Documentation) String() string { return proto.CompactTextString(m) }
 func (*AlertPolicy_Documentation) ProtoMessage()    {}
 func (*AlertPolicy_Documentation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_9493c79d6a8e0cc9, []int{0, 0}
+	return fileDescriptor_014ef0e1a0f00a00, []int{0, 0}
 }
+
 func (m *AlertPolicy_Documentation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlertPolicy_Documentation.Unmarshal(m, b)
 }
 func (m *AlertPolicy_Documentation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlertPolicy_Documentation.Marshal(b, m, deterministic)
 }
-func (dst *AlertPolicy_Documentation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlertPolicy_Documentation.Merge(dst, src)
+func (m *AlertPolicy_Documentation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Documentation.Merge(m, src)
 }
 func (m *AlertPolicy_Documentation) XXX_Size() int {
 	return xxx_messageInfo_AlertPolicy_Documentation.Size(m)
@@ -330,16 +337,17 @@ func (m *AlertPolicy_Condition) Reset()         { *m = AlertPolicy_Condition{} }
 func (m *AlertPolicy_Condition) String() string { return proto.CompactTextString(m) }
 func (*AlertPolicy_Condition) ProtoMessage()    {}
 func (*AlertPolicy_Condition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_9493c79d6a8e0cc9, []int{0, 1}
+	return fileDescriptor_014ef0e1a0f00a00, []int{0, 1}
 }
+
 func (m *AlertPolicy_Condition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlertPolicy_Condition.Unmarshal(m, b)
 }
 func (m *AlertPolicy_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlertPolicy_Condition.Marshal(b, m, deterministic)
 }
-func (dst *AlertPolicy_Condition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlertPolicy_Condition.Merge(dst, src)
+func (m *AlertPolicy_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition.Merge(m, src)
 }
 func (m *AlertPolicy_Condition) XXX_Size() int {
 	return xxx_messageInfo_AlertPolicy_Condition.Size(m)
@@ -401,80 +409,14 @@ func (m *AlertPolicy_Condition) GetConditionAbsent() *AlertPolicy_Condition_Metr
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AlertPolicy_Condition) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AlertPolicy_Condition_OneofMarshaler, _AlertPolicy_Condition_OneofUnmarshaler, _AlertPolicy_Condition_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AlertPolicy_Condition) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AlertPolicy_Condition_ConditionThreshold)(nil),
 		(*AlertPolicy_Condition_ConditionAbsent)(nil),
 	}
 }
 
-func _AlertPolicy_Condition_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AlertPolicy_Condition)
-	// condition
-	switch x := m.Condition.(type) {
-	case *AlertPolicy_Condition_ConditionThreshold:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConditionThreshold); err != nil {
-			return err
-		}
-	case *AlertPolicy_Condition_ConditionAbsent:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ConditionAbsent); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AlertPolicy_Condition.Condition has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AlertPolicy_Condition_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AlertPolicy_Condition)
-	switch tag {
-	case 1: // condition.condition_threshold
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AlertPolicy_Condition_MetricThreshold)
-		err := b.DecodeMessage(msg)
-		m.Condition = &AlertPolicy_Condition_ConditionThreshold{msg}
-		return true, err
-	case 2: // condition.condition_absent
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AlertPolicy_Condition_MetricAbsence)
-		err := b.DecodeMessage(msg)
-		m.Condition = &AlertPolicy_Condition_ConditionAbsent{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AlertPolicy_Condition_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AlertPolicy_Condition)
-	// condition
-	switch x := m.Condition.(type) {
-	case *AlertPolicy_Condition_ConditionThreshold:
-		s := proto.Size(x.ConditionThreshold)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AlertPolicy_Condition_ConditionAbsent:
-		s := proto.Size(x.ConditionAbsent)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Specifies how many time series must fail a predicate to trigger a
 // condition. If not specified, then a `{count: 1}` trigger is used.
 type AlertPolicy_Condition_Trigger struct {
@@ -493,16 +435,17 @@ func (m *AlertPolicy_Condition_Trigger) Reset()         { *m = AlertPolicy_Condi
 func (m *AlertPolicy_Condition_Trigger) String() string { return proto.CompactTextString(m) }
 func (*AlertPolicy_Condition_Trigger) ProtoMessage()    {}
 func (*AlertPolicy_Condition_Trigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_9493c79d6a8e0cc9, []int{0, 1, 0}
+	return fileDescriptor_014ef0e1a0f00a00, []int{0, 1, 0}
 }
+
 func (m *AlertPolicy_Condition_Trigger) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlertPolicy_Condition_Trigger.Unmarshal(m, b)
 }
 func (m *AlertPolicy_Condition_Trigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlertPolicy_Condition_Trigger.Marshal(b, m, deterministic)
 }
-func (dst *AlertPolicy_Condition_Trigger) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlertPolicy_Condition_Trigger.Merge(dst, src)
+func (m *AlertPolicy_Condition_Trigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition_Trigger.Merge(m, src)
 }
 func (m *AlertPolicy_Condition_Trigger) XXX_Size() int {
 	return xxx_messageInfo_AlertPolicy_Condition_Trigger.Size(m)
@@ -550,70 +493,14 @@ func (m *AlertPolicy_Condition_Trigger) GetPercent() float64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AlertPolicy_Condition_Trigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AlertPolicy_Condition_Trigger_OneofMarshaler, _AlertPolicy_Condition_Trigger_OneofUnmarshaler, _AlertPolicy_Condition_Trigger_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AlertPolicy_Condition_Trigger) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AlertPolicy_Condition_Trigger_Count)(nil),
 		(*AlertPolicy_Condition_Trigger_Percent)(nil),
 	}
 }
 
-func _AlertPolicy_Condition_Trigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AlertPolicy_Condition_Trigger)
-	// type
-	switch x := m.Type.(type) {
-	case *AlertPolicy_Condition_Trigger_Count:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Count))
-	case *AlertPolicy_Condition_Trigger_Percent:
-		b.EncodeVarint(2<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.Percent))
-	case nil:
-	default:
-		return fmt.Errorf("AlertPolicy_Condition_Trigger.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AlertPolicy_Condition_Trigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AlertPolicy_Condition_Trigger)
-	switch tag {
-	case 1: // type.count
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &AlertPolicy_Condition_Trigger_Count{int32(x)}
-		return true, err
-	case 2: // type.percent
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Type = &AlertPolicy_Condition_Trigger_Percent{math.Float64frombits(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AlertPolicy_Condition_Trigger_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AlertPolicy_Condition_Trigger)
-	// type
-	switch x := m.Type.(type) {
-	case *AlertPolicy_Condition_Trigger_Count:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Count))
-	case *AlertPolicy_Condition_Trigger_Percent:
-		n += 1 // tag and wire
-		n += 8
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A condition type that compares a collection of time series
 // against a threshold.
 type AlertPolicy_Condition_MetricThreshold struct {
@@ -708,16 +595,17 @@ func (m *AlertPolicy_Condition_MetricThreshold) Reset()         { *m = AlertPoli
 func (m *AlertPolicy_Condition_MetricThreshold) String() string { return proto.CompactTextString(m) }
 func (*AlertPolicy_Condition_MetricThreshold) ProtoMessage()    {}
 func (*AlertPolicy_Condition_MetricThreshold) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_9493c79d6a8e0cc9, []int{0, 1, 1}
+	return fileDescriptor_014ef0e1a0f00a00, []int{0, 1, 1}
 }
+
 func (m *AlertPolicy_Condition_MetricThreshold) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Unmarshal(m, b)
 }
 func (m *AlertPolicy_Condition_MetricThreshold) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Marshal(b, m, deterministic)
 }
-func (dst *AlertPolicy_Condition_MetricThreshold) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Merge(dst, src)
+func (m *AlertPolicy_Condition_MetricThreshold) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Merge(m, src)
 }
 func (m *AlertPolicy_Condition_MetricThreshold) XXX_Size() int {
 	return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Size(m)
@@ -835,16 +723,17 @@ func (m *AlertPolicy_Condition_MetricAbsence) Reset()         { *m = AlertPolicy
 func (m *AlertPolicy_Condition_MetricAbsence) String() string { return proto.CompactTextString(m) }
 func (*AlertPolicy_Condition_MetricAbsence) ProtoMessage()    {}
 func (*AlertPolicy_Condition_MetricAbsence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_9493c79d6a8e0cc9, []int{0, 1, 2}
+	return fileDescriptor_014ef0e1a0f00a00, []int{0, 1, 2}
 }
+
 func (m *AlertPolicy_Condition_MetricAbsence) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Unmarshal(m, b)
 }
 func (m *AlertPolicy_Condition_MetricAbsence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Marshal(b, m, deterministic)
 }
-func (dst *AlertPolicy_Condition_MetricAbsence) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Merge(dst, src)
+func (m *AlertPolicy_Condition_MetricAbsence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Merge(m, src)
 }
 func (m *AlertPolicy_Condition_MetricAbsence) XXX_Size() int {
 	return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Size(m)
@@ -884,6 +773,7 @@ func (m *AlertPolicy_Condition_MetricAbsence) GetTrigger() *AlertPolicy_Conditio
 }
 
 func init() {
+	proto.RegisterEnum("google.monitoring.v3.AlertPolicy_ConditionCombinerType", AlertPolicy_ConditionCombinerType_name, AlertPolicy_ConditionCombinerType_value)
 	proto.RegisterType((*AlertPolicy)(nil), "google.monitoring.v3.AlertPolicy")
 	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.AlertPolicy.UserLabelsEntry")
 	proto.RegisterType((*AlertPolicy_Documentation)(nil), "google.monitoring.v3.AlertPolicy.Documentation")
@@ -891,14 +781,11 @@ func init() {
 	proto.RegisterType((*AlertPolicy_Condition_Trigger)(nil), "google.monitoring.v3.AlertPolicy.Condition.Trigger")
 	proto.RegisterType((*AlertPolicy_Condition_MetricThreshold)(nil), "google.monitoring.v3.AlertPolicy.Condition.MetricThreshold")
 	proto.RegisterType((*AlertPolicy_Condition_MetricAbsence)(nil), "google.monitoring.v3.AlertPolicy.Condition.MetricAbsence")
-	proto.RegisterEnum("google.monitoring.v3.AlertPolicy_ConditionCombinerType", AlertPolicy_ConditionCombinerType_name, AlertPolicy_ConditionCombinerType_value)
 }
 
-func init() {
-	proto.RegisterFile("google/monitoring/v3/alert.proto", fileDescriptor_alert_9493c79d6a8e0cc9)
-}
+func init() { proto.RegisterFile("google/monitoring/v3/alert.proto", fileDescriptor_014ef0e1a0f00a00) }
 
-var fileDescriptor_alert_9493c79d6a8e0cc9 = []byte{
+var fileDescriptor_014ef0e1a0f00a00 = []byte{
 	// 941 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xeb, 0x6e, 0xe3, 0x44,
 	0x14, 0xae, 0x93, 0xe6, 0x76, 0xd2, 0x36, 0xd9, 0xd9, 0xee, 0xae, 0x31, 0x68, 0x95, 0xae, 0x90,
diff --git a/googleapis/monitoring/v3/alert_service.pb.go b/googleapis/monitoring/v3/alert_service.pb.go
index b1f27ca33f..7f102f0ad6 100644
--- a/googleapis/monitoring/v3/alert_service.pb.go
+++ b/googleapis/monitoring/v3/alert_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/alert_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package monitoring
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The protocol for the `CreateAlertPolicy` request.
 type CreateAlertPolicyRequest struct {
@@ -50,16 +50,17 @@ func (m *CreateAlertPolicyRequest) Reset()         { *m = CreateAlertPolicyReque
 func (m *CreateAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateAlertPolicyRequest) ProtoMessage()    {}
 func (*CreateAlertPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_service_d83b47a0e5c8ce7d, []int{0}
+	return fileDescriptor_c45362b2a456d1bf, []int{0}
 }
+
 func (m *CreateAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateAlertPolicyRequest.Unmarshal(m, b)
 }
 func (m *CreateAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateAlertPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateAlertPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateAlertPolicyRequest.Merge(dst, src)
+func (m *CreateAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAlertPolicyRequest.Merge(m, src)
 }
 func (m *CreateAlertPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateAlertPolicyRequest.Size(m)
@@ -99,16 +100,17 @@ func (m *GetAlertPolicyRequest) Reset()         { *m = GetAlertPolicyRequest{} }
 func (m *GetAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAlertPolicyRequest) ProtoMessage()    {}
 func (*GetAlertPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_service_d83b47a0e5c8ce7d, []int{1}
+	return fileDescriptor_c45362b2a456d1bf, []int{1}
 }
+
 func (m *GetAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAlertPolicyRequest.Unmarshal(m, b)
 }
 func (m *GetAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAlertPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetAlertPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAlertPolicyRequest.Merge(dst, src)
+func (m *GetAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAlertPolicyRequest.Merge(m, src)
 }
 func (m *GetAlertPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAlertPolicyRequest.Size(m)
@@ -166,16 +168,17 @@ func (m *ListAlertPoliciesRequest) Reset()         { *m = ListAlertPoliciesReque
 func (m *ListAlertPoliciesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListAlertPoliciesRequest) ProtoMessage()    {}
 func (*ListAlertPoliciesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_service_d83b47a0e5c8ce7d, []int{2}
+	return fileDescriptor_c45362b2a456d1bf, []int{2}
 }
+
 func (m *ListAlertPoliciesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAlertPoliciesRequest.Unmarshal(m, b)
 }
 func (m *ListAlertPoliciesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAlertPoliciesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListAlertPoliciesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAlertPoliciesRequest.Merge(dst, src)
+func (m *ListAlertPoliciesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAlertPoliciesRequest.Merge(m, src)
 }
 func (m *ListAlertPoliciesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListAlertPoliciesRequest.Size(m)
@@ -238,16 +241,17 @@ func (m *ListAlertPoliciesResponse) Reset()         { *m = ListAlertPoliciesResp
 func (m *ListAlertPoliciesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListAlertPoliciesResponse) ProtoMessage()    {}
 func (*ListAlertPoliciesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_service_d83b47a0e5c8ce7d, []int{3}
+	return fileDescriptor_c45362b2a456d1bf, []int{3}
 }
+
 func (m *ListAlertPoliciesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListAlertPoliciesResponse.Unmarshal(m, b)
 }
 func (m *ListAlertPoliciesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListAlertPoliciesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListAlertPoliciesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListAlertPoliciesResponse.Merge(dst, src)
+func (m *ListAlertPoliciesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAlertPoliciesResponse.Merge(m, src)
 }
 func (m *ListAlertPoliciesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListAlertPoliciesResponse.Size(m)
@@ -310,16 +314,17 @@ func (m *UpdateAlertPolicyRequest) Reset()         { *m = UpdateAlertPolicyReque
 func (m *UpdateAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateAlertPolicyRequest) ProtoMessage()    {}
 func (*UpdateAlertPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_service_d83b47a0e5c8ce7d, []int{4}
+	return fileDescriptor_c45362b2a456d1bf, []int{4}
 }
+
 func (m *UpdateAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateAlertPolicyRequest.Unmarshal(m, b)
 }
 func (m *UpdateAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateAlertPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateAlertPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateAlertPolicyRequest.Merge(dst, src)
+func (m *UpdateAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAlertPolicyRequest.Merge(m, src)
 }
 func (m *UpdateAlertPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateAlertPolicyRequest.Size(m)
@@ -361,16 +366,17 @@ func (m *DeleteAlertPolicyRequest) Reset()         { *m = DeleteAlertPolicyReque
 func (m *DeleteAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteAlertPolicyRequest) ProtoMessage()    {}
 func (*DeleteAlertPolicyRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_alert_service_d83b47a0e5c8ce7d, []int{5}
+	return fileDescriptor_c45362b2a456d1bf, []int{5}
 }
+
 func (m *DeleteAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteAlertPolicyRequest.Unmarshal(m, b)
 }
 func (m *DeleteAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteAlertPolicyRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteAlertPolicyRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteAlertPolicyRequest.Merge(dst, src)
+func (m *DeleteAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAlertPolicyRequest.Merge(m, src)
 }
 func (m *DeleteAlertPolicyRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteAlertPolicyRequest.Size(m)
@@ -397,6 +403,55 @@ func init() {
 	proto.RegisterType((*DeleteAlertPolicyRequest)(nil), "google.monitoring.v3.DeleteAlertPolicyRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/monitoring/v3/alert_service.proto", fileDescriptor_c45362b2a456d1bf)
+}
+
+var fileDescriptor_c45362b2a456d1bf = []byte{
+	// 656 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x41, 0x6f, 0xd3, 0x4c,
+	0x10, 0x95, 0x93, 0x36, 0x5f, 0xbb, 0xfd, 0x5a, 0x94, 0x15, 0x54, 0xae, 0x0b, 0x52, 0x30, 0x2a,
+	0x54, 0xad, 0xb0, 0xa5, 0xf8, 0x04, 0x15, 0x48, 0xa4, 0x85, 0xf6, 0x40, 0xa5, 0x28, 0x85, 0x1e,
+	0x50, 0xa4, 0x68, 0x93, 0x4c, 0xac, 0x25, 0x8e, 0xd7, 0x78, 0x37, 0x11, 0x29, 0xea, 0x85, 0x23,
+	0x12, 0xe2, 0xc0, 0x99, 0x03, 0x47, 0x38, 0x20, 0x7e, 0x07, 0x57, 0xfe, 0x02, 0x3f, 0x04, 0x79,
+	0xed, 0x34, 0x76, 0x6d, 0xab, 0x16, 0xb7, 0xcc, 0xce, 0xdb, 0x99, 0xb7, 0x6f, 0xde, 0x38, 0x68,
+	0xdb, 0x66, 0xcc, 0x76, 0xc0, 0x1c, 0x31, 0x97, 0x0a, 0xe6, 0x53, 0xd7, 0x36, 0x27, 0x96, 0x49,
+	0x1c, 0xf0, 0x45, 0x87, 0x83, 0x3f, 0xa1, 0x3d, 0x30, 0x3c, 0x9f, 0x09, 0x86, 0xaf, 0x87, 0x48,
+	0x63, 0x8e, 0x34, 0x26, 0x96, 0x76, 0x33, 0xba, 0x4f, 0x3c, 0x6a, 0x12, 0xd7, 0x65, 0x82, 0x08,
+	0xca, 0x5c, 0x1e, 0xde, 0xd1, 0x6a, 0xf9, 0xd5, 0x23, 0xc4, 0x66, 0x84, 0x90, 0x51, 0x77, 0x3c,
+	0x30, 0x61, 0xe4, 0x89, 0xe9, 0xa5, 0xeb, 0x17, 0xc9, 0x01, 0x05, 0xa7, 0xdf, 0x19, 0x11, 0x3e,
+	0x0c, 0x11, 0xba, 0x40, 0xea, 0xbe, 0x0f, 0x44, 0xc0, 0x93, 0xa0, 0x66, 0x93, 0x39, 0xb4, 0x37,
+	0x6d, 0xc1, 0x9b, 0x31, 0x70, 0x81, 0x31, 0x5a, 0x70, 0xc9, 0x08, 0xd4, 0x72, 0x4d, 0xd9, 0x5e,
+	0x6e, 0xc9, 0xdf, 0xf8, 0x00, 0xfd, 0x1f, 0xbe, 0xcd, 0x93, 0x50, 0xb5, 0x54, 0x53, 0xb6, 0x57,
+	0xea, 0xb7, 0x8d, 0xac, 0xb7, 0x19, 0xf1, 0x9a, 0x2b, 0x64, 0x1e, 0xe8, 0xbb, 0xe8, 0xc6, 0x21,
+	0x88, 0x62, 0x2d, 0xf5, 0x2f, 0x0a, 0x52, 0x9f, 0x53, 0x1e, 0x83, 0x53, 0xe0, 0x97, 0x2f, 0x2c,
+	0xc4, 0x38, 0xae, 0xa3, 0xca, 0x80, 0x3a, 0x02, 0x7c, 0x75, 0x51, 0x9e, 0x46, 0x11, 0xde, 0x40,
+	0x4b, 0xcc, 0xef, 0x83, 0xdf, 0xe9, 0x4e, 0xd5, 0x8a, 0xcc, 0xfc, 0x27, 0xe3, 0xc6, 0x14, 0x6f,
+	0xa2, 0x65, 0x8f, 0xd8, 0xd0, 0xe1, 0xf4, 0x0c, 0xe4, 0x9b, 0x16, 0x5b, 0x4b, 0xc1, 0xc1, 0x09,
+	0x3d, 0x03, 0x7c, 0x0b, 0x21, 0x99, 0x14, 0x6c, 0x08, 0x6e, 0x44, 0x4d, 0xc2, 0x5f, 0x04, 0x07,
+	0xfa, 0x47, 0x05, 0x6d, 0x64, 0xf0, 0xe3, 0x1e, 0x73, 0x39, 0xe0, 0x23, 0xb4, 0x16, 0x13, 0x8c,
+	0x02, 0x57, 0xcb, 0xb5, 0x72, 0x31, 0xc9, 0x56, 0x49, 0xbc, 0x22, 0xbe, 0x8b, 0xae, 0xb9, 0xf0,
+	0x56, 0x74, 0x62, 0x5c, 0x4a, 0x92, 0xcb, 0x6a, 0x70, 0xdc, 0xbc, 0xe0, 0x13, 0xe8, 0xf5, 0xd2,
+	0xeb, 0x67, 0xcf, 0x74, 0x0f, 0xad, 0x8c, 0x65, 0x4e, 0x9a, 0x20, 0x1a, 0x9f, 0x36, 0xe3, 0x32,
+	0xf3, 0x89, 0xf1, 0x2c, 0xf0, 0xc9, 0x31, 0xe1, 0xc3, 0x16, 0x0a, 0xe1, 0xc1, 0xef, 0xd4, 0xf0,
+	0xcb, 0xff, 0x34, 0x7c, 0x03, 0xa9, 0x07, 0xe0, 0x40, 0x51, 0xcb, 0xd5, 0x7f, 0x54, 0x10, 0x8e,
+	0x41, 0x4f, 0xc2, 0xa5, 0xc2, 0x5f, 0x15, 0x54, 0x4d, 0xc9, 0x8e, 0x8d, 0x6c, 0x32, 0x79, 0xfe,
+	0xd1, 0xcc, 0xc2, 0xf8, 0x70, 0x9e, 0xfa, 0xee, 0xfb, 0xdf, 0x7f, 0x3e, 0x97, 0xb6, 0xf0, 0x9d,
+	0x60, 0x11, 0xdf, 0x05, 0x04, 0x1f, 0x79, 0x3e, 0x7b, 0x0d, 0x3d, 0xc1, 0xcd, 0x9d, 0x73, 0x33,
+	0x39, 0xb2, 0x4f, 0x0a, 0x5a, 0x4b, 0x1a, 0x1d, 0xef, 0x66, 0x37, 0xcc, 0x5c, 0x07, 0xed, 0x6a,
+	0x69, 0xf5, 0xfb, 0x92, 0xcf, 0x3d, 0xbc, 0x95, 0xc5, 0x27, 0x49, 0xc7, 0xdc, 0x39, 0x97, 0xaa,
+	0xa5, 0x16, 0x3e, 0x4f, 0xb5, 0xbc, 0x2f, 0x43, 0x11, 0x5e, 0x0f, 0x24, 0x2f, 0x4b, 0x2f, 0xa2,
+	0xd3, 0xc3, 0x84, 0xad, 0xf0, 0x07, 0x05, 0x55, 0x53, 0x0e, 0xc9, 0xe3, 0x98, 0x67, 0x25, 0x6d,
+	0x3d, 0x65, 0xea, 0xa7, 0xc1, 0x97, 0x71, 0x26, 0xd8, 0x4e, 0x41, 0xc1, 0x7e, 0x2a, 0xa8, 0x9a,
+	0xda, 0xa6, 0x3c, 0x32, 0x79, 0x6b, 0x57, 0x44, 0xb0, 0x23, 0xc9, 0xab, 0x51, 0xaf, 0x4b, 0x5e,
+	0x71, 0x41, 0x8c, 0xab, 0x48, 0x26, 0xf5, 0x6b, 0x7c, 0x53, 0x90, 0xda, 0x63, 0xa3, 0xcc, 0x96,
+	0x8d, 0xaa, 0xec, 0x19, 0x2d, 0x51, 0x33, 0x90, 0xa6, 0xa9, 0xbc, 0x7a, 0x1c, 0x41, 0x6d, 0xe6,
+	0x10, 0xd7, 0x36, 0x98, 0x6f, 0x9b, 0x36, 0xb8, 0x52, 0x38, 0x33, 0x4c, 0x11, 0x8f, 0xf2, 0xe4,
+	0xbf, 0xd0, 0xde, 0x3c, 0xfa, 0x5e, 0xd2, 0x0e, 0xc3, 0x02, 0xfb, 0x0e, 0x1b, 0xf7, 0x8d, 0xe3,
+	0x79, 0xc7, 0x53, 0xeb, 0xd7, 0x2c, 0xd9, 0x96, 0xc9, 0xf6, 0x3c, 0xd9, 0x3e, 0xb5, 0xba, 0x15,
+	0xd9, 0xc4, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x1f, 0xe6, 0xf0, 0x47, 0x07, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -616,52 +671,3 @@ var _AlertPolicyService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/monitoring/v3/alert_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/monitoring/v3/alert_service.proto", fileDescriptor_alert_service_d83b47a0e5c8ce7d)
-}
-
-var fileDescriptor_alert_service_d83b47a0e5c8ce7d = []byte{
-	// 656 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x41, 0x6f, 0xd3, 0x4c,
-	0x10, 0x95, 0x93, 0x36, 0x5f, 0xbb, 0xfd, 0x5a, 0x94, 0x15, 0x54, 0xae, 0x0b, 0x52, 0x30, 0x2a,
-	0x54, 0xad, 0xb0, 0xa5, 0xf8, 0x04, 0x15, 0x48, 0xa4, 0x85, 0xf6, 0x40, 0xa5, 0x28, 0x85, 0x1e,
-	0x50, 0xa4, 0x68, 0x93, 0x4c, 0xac, 0x25, 0x8e, 0xd7, 0x78, 0x37, 0x11, 0x29, 0xea, 0x85, 0x23,
-	0x12, 0xe2, 0xc0, 0x99, 0x03, 0x47, 0x38, 0x20, 0x7e, 0x07, 0x57, 0xfe, 0x02, 0x3f, 0x04, 0x79,
-	0xed, 0x34, 0x76, 0x6d, 0xab, 0x16, 0xb7, 0xcc, 0xce, 0xdb, 0x99, 0xb7, 0x6f, 0xde, 0x38, 0x68,
-	0xdb, 0x66, 0xcc, 0x76, 0xc0, 0x1c, 0x31, 0x97, 0x0a, 0xe6, 0x53, 0xd7, 0x36, 0x27, 0x96, 0x49,
-	0x1c, 0xf0, 0x45, 0x87, 0x83, 0x3f, 0xa1, 0x3d, 0x30, 0x3c, 0x9f, 0x09, 0x86, 0xaf, 0x87, 0x48,
-	0x63, 0x8e, 0x34, 0x26, 0x96, 0x76, 0x33, 0xba, 0x4f, 0x3c, 0x6a, 0x12, 0xd7, 0x65, 0x82, 0x08,
-	0xca, 0x5c, 0x1e, 0xde, 0xd1, 0x6a, 0xf9, 0xd5, 0x23, 0xc4, 0x66, 0x84, 0x90, 0x51, 0x77, 0x3c,
-	0x30, 0x61, 0xe4, 0x89, 0xe9, 0xa5, 0xeb, 0x17, 0xc9, 0x01, 0x05, 0xa7, 0xdf, 0x19, 0x11, 0x3e,
-	0x0c, 0x11, 0xba, 0x40, 0xea, 0xbe, 0x0f, 0x44, 0xc0, 0x93, 0xa0, 0x66, 0x93, 0x39, 0xb4, 0x37,
-	0x6d, 0xc1, 0x9b, 0x31, 0x70, 0x81, 0x31, 0x5a, 0x70, 0xc9, 0x08, 0xd4, 0x72, 0x4d, 0xd9, 0x5e,
-	0x6e, 0xc9, 0xdf, 0xf8, 0x00, 0xfd, 0x1f, 0xbe, 0xcd, 0x93, 0x50, 0xb5, 0x54, 0x53, 0xb6, 0x57,
-	0xea, 0xb7, 0x8d, 0xac, 0xb7, 0x19, 0xf1, 0x9a, 0x2b, 0x64, 0x1e, 0xe8, 0xbb, 0xe8, 0xc6, 0x21,
-	0x88, 0x62, 0x2d, 0xf5, 0x2f, 0x0a, 0x52, 0x9f, 0x53, 0x1e, 0x83, 0x53, 0xe0, 0x97, 0x2f, 0x2c,
-	0xc4, 0x38, 0xae, 0xa3, 0xca, 0x80, 0x3a, 0x02, 0x7c, 0x75, 0x51, 0x9e, 0x46, 0x11, 0xde, 0x40,
-	0x4b, 0xcc, 0xef, 0x83, 0xdf, 0xe9, 0x4e, 0xd5, 0x8a, 0xcc, 0xfc, 0x27, 0xe3, 0xc6, 0x14, 0x6f,
-	0xa2, 0x65, 0x8f, 0xd8, 0xd0, 0xe1, 0xf4, 0x0c, 0xe4, 0x9b, 0x16, 0x5b, 0x4b, 0xc1, 0xc1, 0x09,
-	0x3d, 0x03, 0x7c, 0x0b, 0x21, 0x99, 0x14, 0x6c, 0x08, 0x6e, 0x44, 0x4d, 0xc2, 0x5f, 0x04, 0x07,
-	0xfa, 0x47, 0x05, 0x6d, 0x64, 0xf0, 0xe3, 0x1e, 0x73, 0x39, 0xe0, 0x23, 0xb4, 0x16, 0x13, 0x8c,
-	0x02, 0x57, 0xcb, 0xb5, 0x72, 0x31, 0xc9, 0x56, 0x49, 0xbc, 0x22, 0xbe, 0x8b, 0xae, 0xb9, 0xf0,
-	0x56, 0x74, 0x62, 0x5c, 0x4a, 0x92, 0xcb, 0x6a, 0x70, 0xdc, 0xbc, 0xe0, 0x13, 0xe8, 0xf5, 0xd2,
-	0xeb, 0x67, 0xcf, 0x74, 0x0f, 0xad, 0x8c, 0x65, 0x4e, 0x9a, 0x20, 0x1a, 0x9f, 0x36, 0xe3, 0x32,
-	0xf3, 0x89, 0xf1, 0x2c, 0xf0, 0xc9, 0x31, 0xe1, 0xc3, 0x16, 0x0a, 0xe1, 0xc1, 0xef, 0xd4, 0xf0,
-	0xcb, 0xff, 0x34, 0x7c, 0x03, 0xa9, 0x07, 0xe0, 0x40, 0x51, 0xcb, 0xd5, 0x7f, 0x54, 0x10, 0x8e,
-	0x41, 0x4f, 0xc2, 0xa5, 0xc2, 0x5f, 0x15, 0x54, 0x4d, 0xc9, 0x8e, 0x8d, 0x6c, 0x32, 0x79, 0xfe,
-	0xd1, 0xcc, 0xc2, 0xf8, 0x70, 0x9e, 0xfa, 0xee, 0xfb, 0xdf, 0x7f, 0x3e, 0x97, 0xb6, 0xf0, 0x9d,
-	0x60, 0x11, 0xdf, 0x05, 0x04, 0x1f, 0x79, 0x3e, 0x7b, 0x0d, 0x3d, 0xc1, 0xcd, 0x9d, 0x73, 0x33,
-	0x39, 0xb2, 0x4f, 0x0a, 0x5a, 0x4b, 0x1a, 0x1d, 0xef, 0x66, 0x37, 0xcc, 0x5c, 0x07, 0xed, 0x6a,
-	0x69, 0xf5, 0xfb, 0x92, 0xcf, 0x3d, 0xbc, 0x95, 0xc5, 0x27, 0x49, 0xc7, 0xdc, 0x39, 0x97, 0xaa,
-	0xa5, 0x16, 0x3e, 0x4f, 0xb5, 0xbc, 0x2f, 0x43, 0x11, 0x5e, 0x0f, 0x24, 0x2f, 0x4b, 0x2f, 0xa2,
-	0xd3, 0xc3, 0x84, 0xad, 0xf0, 0x07, 0x05, 0x55, 0x53, 0x0e, 0xc9, 0xe3, 0x98, 0x67, 0x25, 0x6d,
-	0x3d, 0x65, 0xea, 0xa7, 0xc1, 0x97, 0x71, 0x26, 0xd8, 0x4e, 0x41, 0xc1, 0x7e, 0x2a, 0xa8, 0x9a,
-	0xda, 0xa6, 0x3c, 0x32, 0x79, 0x6b, 0x57, 0x44, 0xb0, 0x23, 0xc9, 0xab, 0x51, 0xaf, 0x4b, 0x5e,
-	0x71, 0x41, 0x8c, 0xab, 0x48, 0x26, 0xf5, 0x6b, 0x7c, 0x53, 0x90, 0xda, 0x63, 0xa3, 0xcc, 0x96,
-	0x8d, 0xaa, 0xec, 0x19, 0x2d, 0x51, 0x33, 0x90, 0xa6, 0xa9, 0xbc, 0x7a, 0x1c, 0x41, 0x6d, 0xe6,
-	0x10, 0xd7, 0x36, 0x98, 0x6f, 0x9b, 0x36, 0xb8, 0x52, 0x38, 0x33, 0x4c, 0x11, 0x8f, 0xf2, 0xe4,
-	0xbf, 0xd0, 0xde, 0x3c, 0xfa, 0x5e, 0xd2, 0x0e, 0xc3, 0x02, 0xfb, 0x0e, 0x1b, 0xf7, 0x8d, 0xe3,
-	0x79, 0xc7, 0x53, 0xeb, 0xd7, 0x2c, 0xd9, 0x96, 0xc9, 0xf6, 0x3c, 0xd9, 0x3e, 0xb5, 0xba, 0x15,
-	0xd9, 0xc4, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x1f, 0xe6, 0xf0, 0x47, 0x07, 0x00, 0x00,
-}
diff --git a/googleapis/monitoring/v3/common.pb.go b/googleapis/monitoring/v3/common.pb.go
index 33b29999c2..5f2ef318fa 100644
--- a/googleapis/monitoring/v3/common.pb.go
+++ b/googleapis/monitoring/v3/common.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/common.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import distribution "google.golang.org/genproto/googleapis/api/distribution"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	distribution "google.golang.org/genproto/googleapis/api/distribution"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies an ordering relationship on two arguments, here called left and
 // right.
@@ -52,6 +55,7 @@ var ComparisonType_name = map[int32]string{
 	5: "COMPARISON_EQ",
 	6: "COMPARISON_NE",
 }
+
 var ComparisonType_value = map[string]int32{
 	"COMPARISON_UNSPECIFIED": 0,
 	"COMPARISON_GT":          1,
@@ -65,8 +69,9 @@ var ComparisonType_value = map[string]int32{
 func (x ComparisonType) String() string {
 	return proto.EnumName(ComparisonType_name, int32(x))
 }
+
 func (ComparisonType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_a64b14621f6e1d51, []int{0}
+	return fileDescriptor_013c57c1dcbb8d65, []int{0}
 }
 
 // The tier of service for a Workspace. Please see the
@@ -97,6 +102,7 @@ var ServiceTier_name = map[int32]string{
 	1: "SERVICE_TIER_BASIC",
 	2: "SERVICE_TIER_PREMIUM",
 }
+
 var ServiceTier_value = map[string]int32{
 	"SERVICE_TIER_UNSPECIFIED": 0,
 	"SERVICE_TIER_BASIC":       1,
@@ -106,8 +112,9 @@ var ServiceTier_value = map[string]int32{
 func (x ServiceTier) String() string {
 	return proto.EnumName(ServiceTier_name, int32(x))
 }
+
 func (ServiceTier) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_a64b14621f6e1d51, []int{1}
+	return fileDescriptor_013c57c1dcbb8d65, []int{1}
 }
 
 // The Aligner describes how to bring the data points in a single
@@ -268,6 +275,7 @@ var Aggregation_Aligner_name = map[int32]string{
 	21: "ALIGN_PERCENTILE_05",
 	23: "ALIGN_PERCENT_CHANGE",
 }
+
 var Aggregation_Aligner_value = map[string]int32{
 	"ALIGN_NONE":           0,
 	"ALIGN_DELTA":          1,
@@ -293,8 +301,9 @@ var Aggregation_Aligner_value = map[string]int32{
 func (x Aggregation_Aligner) String() string {
 	return proto.EnumName(Aggregation_Aligner_name, int32(x))
 }
+
 func (Aggregation_Aligner) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_a64b14621f6e1d51, []int{2, 0}
+	return fileDescriptor_013c57c1dcbb8d65, []int{2, 0}
 }
 
 // A Reducer describes how to aggregate data points from multiple
@@ -390,6 +399,7 @@ var Aggregation_Reducer_name = map[int32]string{
 	11: "REDUCE_PERCENTILE_50",
 	12: "REDUCE_PERCENTILE_05",
 }
+
 var Aggregation_Reducer_value = map[string]int32{
 	"REDUCE_NONE":          0,
 	"REDUCE_MEAN":          1,
@@ -410,8 +420,9 @@ var Aggregation_Reducer_value = map[string]int32{
 func (x Aggregation_Reducer) String() string {
 	return proto.EnumName(Aggregation_Reducer_name, int32(x))
 }
+
 func (Aggregation_Reducer) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_a64b14621f6e1d51, []int{2, 1}
+	return fileDescriptor_013c57c1dcbb8d65, []int{2, 1}
 }
 
 // A single strongly-typed value.
@@ -434,16 +445,17 @@ func (m *TypedValue) Reset()         { *m = TypedValue{} }
 func (m *TypedValue) String() string { return proto.CompactTextString(m) }
 func (*TypedValue) ProtoMessage()    {}
 func (*TypedValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_a64b14621f6e1d51, []int{0}
+	return fileDescriptor_013c57c1dcbb8d65, []int{0}
 }
+
 func (m *TypedValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TypedValue.Unmarshal(m, b)
 }
 func (m *TypedValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TypedValue.Marshal(b, m, deterministic)
 }
-func (dst *TypedValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TypedValue.Merge(dst, src)
+func (m *TypedValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TypedValue.Merge(m, src)
 }
 func (m *TypedValue) XXX_Size() int {
 	return xxx_messageInfo_TypedValue.Size(m)
@@ -530,9 +542,9 @@ func (m *TypedValue) GetDistributionValue() *distribution.Distribution {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TypedValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TypedValue_OneofMarshaler, _TypedValue_OneofUnmarshaler, _TypedValue_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TypedValue) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TypedValue_BoolValue)(nil),
 		(*TypedValue_Int64Value)(nil),
 		(*TypedValue_DoubleValue)(nil),
@@ -541,111 +553,6 @@ func (*TypedValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 	}
 }
 
-func _TypedValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TypedValue)
-	// value
-	switch x := m.Value.(type) {
-	case *TypedValue_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *TypedValue_Int64Value:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Value))
-	case *TypedValue_DoubleValue:
-		b.EncodeVarint(3<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.DoubleValue))
-	case *TypedValue_StringValue:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *TypedValue_DistributionValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DistributionValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TypedValue.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TypedValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TypedValue)
-	switch tag {
-	case 1: // value.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &TypedValue_BoolValue{x != 0}
-		return true, err
-	case 2: // value.int64_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &TypedValue_Int64Value{int64(x)}
-		return true, err
-	case 3: // value.double_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Value = &TypedValue_DoubleValue{math.Float64frombits(x)}
-		return true, err
-	case 4: // value.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Value = &TypedValue_StringValue{x}
-		return true, err
-	case 5: // value.distribution_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(distribution.Distribution)
-		err := b.DecodeMessage(msg)
-		m.Value = &TypedValue_DistributionValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TypedValue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TypedValue)
-	// value
-	switch x := m.Value.(type) {
-	case *TypedValue_BoolValue:
-		n += 1 // tag and wire
-		n += 1
-	case *TypedValue_Int64Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Value))
-	case *TypedValue_DoubleValue:
-		n += 1 // tag and wire
-		n += 8
-	case *TypedValue_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *TypedValue_DistributionValue:
-		s := proto.Size(x.DistributionValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A time interval extending just after a start time through an end time.
 // If the start time is the same as the end time, then the interval
 // represents a single point in time.
@@ -665,16 +572,17 @@ func (m *TimeInterval) Reset()         { *m = TimeInterval{} }
 func (m *TimeInterval) String() string { return proto.CompactTextString(m) }
 func (*TimeInterval) ProtoMessage()    {}
 func (*TimeInterval) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_a64b14621f6e1d51, []int{1}
+	return fileDescriptor_013c57c1dcbb8d65, []int{1}
 }
+
 func (m *TimeInterval) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeInterval.Unmarshal(m, b)
 }
 func (m *TimeInterval) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeInterval.Marshal(b, m, deterministic)
 }
-func (dst *TimeInterval) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeInterval.Merge(dst, src)
+func (m *TimeInterval) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeInterval.Merge(m, src)
 }
 func (m *TimeInterval) XXX_Size() int {
 	return xxx_messageInfo_TimeInterval.Size(m)
@@ -763,16 +671,17 @@ func (m *Aggregation) Reset()         { *m = Aggregation{} }
 func (m *Aggregation) String() string { return proto.CompactTextString(m) }
 func (*Aggregation) ProtoMessage()    {}
 func (*Aggregation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_a64b14621f6e1d51, []int{2}
+	return fileDescriptor_013c57c1dcbb8d65, []int{2}
 }
+
 func (m *Aggregation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Aggregation.Unmarshal(m, b)
 }
 func (m *Aggregation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Aggregation.Marshal(b, m, deterministic)
 }
-func (dst *Aggregation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Aggregation.Merge(dst, src)
+func (m *Aggregation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aggregation.Merge(m, src)
 }
 func (m *Aggregation) XXX_Size() int {
 	return xxx_messageInfo_Aggregation.Size(m)
@@ -812,20 +721,18 @@ func (m *Aggregation) GetGroupByFields() []string {
 }
 
 func init() {
-	proto.RegisterType((*TypedValue)(nil), "google.monitoring.v3.TypedValue")
-	proto.RegisterType((*TimeInterval)(nil), "google.monitoring.v3.TimeInterval")
-	proto.RegisterType((*Aggregation)(nil), "google.monitoring.v3.Aggregation")
 	proto.RegisterEnum("google.monitoring.v3.ComparisonType", ComparisonType_name, ComparisonType_value)
 	proto.RegisterEnum("google.monitoring.v3.ServiceTier", ServiceTier_name, ServiceTier_value)
 	proto.RegisterEnum("google.monitoring.v3.Aggregation_Aligner", Aggregation_Aligner_name, Aggregation_Aligner_value)
 	proto.RegisterEnum("google.monitoring.v3.Aggregation_Reducer", Aggregation_Reducer_name, Aggregation_Reducer_value)
+	proto.RegisterType((*TypedValue)(nil), "google.monitoring.v3.TypedValue")
+	proto.RegisterType((*TimeInterval)(nil), "google.monitoring.v3.TimeInterval")
+	proto.RegisterType((*Aggregation)(nil), "google.monitoring.v3.Aggregation")
 }
 
-func init() {
-	proto.RegisterFile("google/monitoring/v3/common.proto", fileDescriptor_common_a64b14621f6e1d51)
-}
+func init() { proto.RegisterFile("google/monitoring/v3/common.proto", fileDescriptor_013c57c1dcbb8d65) }
 
-var fileDescriptor_common_a64b14621f6e1d51 = []byte{
+var fileDescriptor_013c57c1dcbb8d65 = []byte{
 	// 957 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xc1, 0x6e, 0xe3, 0x44,
 	0x18, 0xc7, 0xe3, 0x64, 0xdb, 0x34, 0x9f, 0xdb, 0x66, 0x3a, 0xdb, 0xed, 0x86, 0x68, 0x61, 0xb3,
diff --git a/googleapis/monitoring/v3/dropped_labels.pb.go b/googleapis/monitoring/v3/dropped_labels.pb.go
index f63335702f..f69db89c8b 100644
--- a/googleapis/monitoring/v3/dropped_labels.pb.go
+++ b/googleapis/monitoring/v3/dropped_labels.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/dropped_labels.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A set of (label, value) pairs which were dropped during aggregation, attached
 // to google.api.Distribution.Exemplars in google.api.Distribution values during
@@ -46,16 +49,17 @@ func (m *DroppedLabels) Reset()         { *m = DroppedLabels{} }
 func (m *DroppedLabels) String() string { return proto.CompactTextString(m) }
 func (*DroppedLabels) ProtoMessage()    {}
 func (*DroppedLabels) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dropped_labels_1340d25b5d2a29b0, []int{0}
+	return fileDescriptor_15749142c06d7f43, []int{0}
 }
+
 func (m *DroppedLabels) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DroppedLabels.Unmarshal(m, b)
 }
 func (m *DroppedLabels) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DroppedLabels.Marshal(b, m, deterministic)
 }
-func (dst *DroppedLabels) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DroppedLabels.Merge(dst, src)
+func (m *DroppedLabels) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DroppedLabels.Merge(m, src)
 }
 func (m *DroppedLabels) XXX_Size() int {
 	return xxx_messageInfo_DroppedLabels.Size(m)
@@ -79,10 +83,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/monitoring/v3/dropped_labels.proto", fileDescriptor_dropped_labels_1340d25b5d2a29b0)
+	proto.RegisterFile("google/monitoring/v3/dropped_labels.proto", fileDescriptor_15749142c06d7f43)
 }
 
-var fileDescriptor_dropped_labels_1340d25b5d2a29b0 = []byte{
+var fileDescriptor_15749142c06d7f43 = []byte{
 	// 235 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x31, 0x4b, 0x43, 0x31,
 	0x10, 0xc7, 0x49, 0x4b, 0x05, 0x4f, 0x04, 0x09, 0x1d, 0x42, 0x71, 0x28, 0x4e, 0x75, 0xb9, 0x80,
diff --git a/googleapis/monitoring/v3/group.pb.go b/googleapis/monitoring/v3/group.pb.go
index 014ab233df..6ac567171b 100644
--- a/googleapis/monitoring/v3/group.pb.go
+++ b/googleapis/monitoring/v3/group.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/group.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The description of a dynamic collection of monitored resources. Each group
 // has a filter that is matched against monitored resources and their associated
@@ -72,16 +75,17 @@ func (m *Group) Reset()         { *m = Group{} }
 func (m *Group) String() string { return proto.CompactTextString(m) }
 func (*Group) ProtoMessage()    {}
 func (*Group) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_cf79a7f2e933706a, []int{0}
+	return fileDescriptor_907e30c1f087271d, []int{0}
 }
+
 func (m *Group) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Group.Unmarshal(m, b)
 }
 func (m *Group) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Group.Marshal(b, m, deterministic)
 }
-func (dst *Group) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Group.Merge(dst, src)
+func (m *Group) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Group.Merge(m, src)
 }
 func (m *Group) XXX_Size() int {
 	return xxx_messageInfo_Group.Size(m)
@@ -131,11 +135,9 @@ func init() {
 	proto.RegisterType((*Group)(nil), "google.monitoring.v3.Group")
 }
 
-func init() {
-	proto.RegisterFile("google/monitoring/v3/group.proto", fileDescriptor_group_cf79a7f2e933706a)
-}
+func init() { proto.RegisterFile("google/monitoring/v3/group.proto", fileDescriptor_907e30c1f087271d) }
 
-var fileDescriptor_group_cf79a7f2e933706a = []byte{
+var fileDescriptor_907e30c1f087271d = []byte{
 	// 261 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x4a, 0x2b, 0x31,
 	0x14, 0x87, 0x49, 0xef, 0xed, 0x60, 0x4f, 0x5d, 0x0d, 0x22, 0x83, 0x20, 0x8e, 0xae, 0xba, 0xca,
diff --git a/googleapis/monitoring/v3/group_service.pb.go b/googleapis/monitoring/v3/group_service.pb.go
index 40e6309a02..fb8034ed21 100644
--- a/googleapis/monitoring/v3/group_service.pb.go
+++ b/googleapis/monitoring/v3/group_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/group_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+package monitoring
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The `ListGroup` request.
 type ListGroupsRequest struct {
@@ -55,16 +55,17 @@ func (m *ListGroupsRequest) Reset()         { *m = ListGroupsRequest{} }
 func (m *ListGroupsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListGroupsRequest) ProtoMessage()    {}
 func (*ListGroupsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{0}
+	return fileDescriptor_21ad21d0ed55c55a, []int{0}
 }
+
 func (m *ListGroupsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGroupsRequest.Unmarshal(m, b)
 }
 func (m *ListGroupsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGroupsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListGroupsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGroupsRequest.Merge(dst, src)
+func (m *ListGroupsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupsRequest.Merge(m, src)
 }
 func (m *ListGroupsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListGroupsRequest.Size(m)
@@ -146,87 +147,15 @@ func (m *ListGroupsRequest) GetPageToken() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ListGroupsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ListGroupsRequest_OneofMarshaler, _ListGroupsRequest_OneofUnmarshaler, _ListGroupsRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ListGroupsRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ListGroupsRequest_ChildrenOfGroup)(nil),
 		(*ListGroupsRequest_AncestorsOfGroup)(nil),
 		(*ListGroupsRequest_DescendantsOfGroup)(nil),
 	}
 }
 
-func _ListGroupsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ListGroupsRequest)
-	// filter
-	switch x := m.Filter.(type) {
-	case *ListGroupsRequest_ChildrenOfGroup:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ChildrenOfGroup)
-	case *ListGroupsRequest_AncestorsOfGroup:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.AncestorsOfGroup)
-	case *ListGroupsRequest_DescendantsOfGroup:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.DescendantsOfGroup)
-	case nil:
-	default:
-		return fmt.Errorf("ListGroupsRequest.Filter has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ListGroupsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ListGroupsRequest)
-	switch tag {
-	case 2: // filter.children_of_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &ListGroupsRequest_ChildrenOfGroup{x}
-		return true, err
-	case 3: // filter.ancestors_of_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &ListGroupsRequest_AncestorsOfGroup{x}
-		return true, err
-	case 4: // filter.descendants_of_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Filter = &ListGroupsRequest_DescendantsOfGroup{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ListGroupsRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ListGroupsRequest)
-	// filter
-	switch x := m.Filter.(type) {
-	case *ListGroupsRequest_ChildrenOfGroup:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.ChildrenOfGroup)))
-		n += len(x.ChildrenOfGroup)
-	case *ListGroupsRequest_AncestorsOfGroup:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.AncestorsOfGroup)))
-		n += len(x.AncestorsOfGroup)
-	case *ListGroupsRequest_DescendantsOfGroup:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.DescendantsOfGroup)))
-		n += len(x.DescendantsOfGroup)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The `ListGroups` response.
 type ListGroupsResponse struct {
 	// The groups that match the specified filters.
@@ -244,16 +173,17 @@ func (m *ListGroupsResponse) Reset()         { *m = ListGroupsResponse{} }
 func (m *ListGroupsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListGroupsResponse) ProtoMessage()    {}
 func (*ListGroupsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{1}
+	return fileDescriptor_21ad21d0ed55c55a, []int{1}
 }
+
 func (m *ListGroupsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGroupsResponse.Unmarshal(m, b)
 }
 func (m *ListGroupsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGroupsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListGroupsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGroupsResponse.Merge(dst, src)
+func (m *ListGroupsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupsResponse.Merge(m, src)
 }
 func (m *ListGroupsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListGroupsResponse.Size(m)
@@ -292,16 +222,17 @@ func (m *GetGroupRequest) Reset()         { *m = GetGroupRequest{} }
 func (m *GetGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGroupRequest) ProtoMessage()    {}
 func (*GetGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{2}
+	return fileDescriptor_21ad21d0ed55c55a, []int{2}
 }
+
 func (m *GetGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGroupRequest.Unmarshal(m, b)
 }
 func (m *GetGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGroupRequest.Merge(dst, src)
+func (m *GetGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGroupRequest.Merge(m, src)
 }
 func (m *GetGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGroupRequest.Size(m)
@@ -338,16 +269,17 @@ func (m *CreateGroupRequest) Reset()         { *m = CreateGroupRequest{} }
 func (m *CreateGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateGroupRequest) ProtoMessage()    {}
 func (*CreateGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{3}
+	return fileDescriptor_21ad21d0ed55c55a, []int{3}
 }
+
 func (m *CreateGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateGroupRequest.Unmarshal(m, b)
 }
 func (m *CreateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateGroupRequest.Merge(dst, src)
+func (m *CreateGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateGroupRequest.Merge(m, src)
 }
 func (m *CreateGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateGroupRequest.Size(m)
@@ -395,16 +327,17 @@ func (m *UpdateGroupRequest) Reset()         { *m = UpdateGroupRequest{} }
 func (m *UpdateGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateGroupRequest) ProtoMessage()    {}
 func (*UpdateGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{4}
+	return fileDescriptor_21ad21d0ed55c55a, []int{4}
 }
+
 func (m *UpdateGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateGroupRequest.Unmarshal(m, b)
 }
 func (m *UpdateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateGroupRequest.Merge(dst, src)
+func (m *UpdateGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateGroupRequest.Merge(m, src)
 }
 func (m *UpdateGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateGroupRequest.Size(m)
@@ -443,16 +376,17 @@ func (m *DeleteGroupRequest) Reset()         { *m = DeleteGroupRequest{} }
 func (m *DeleteGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteGroupRequest) ProtoMessage()    {}
 func (*DeleteGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{5}
+	return fileDescriptor_21ad21d0ed55c55a, []int{5}
 }
+
 func (m *DeleteGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteGroupRequest.Unmarshal(m, b)
 }
 func (m *DeleteGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteGroupRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteGroupRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteGroupRequest.Merge(dst, src)
+func (m *DeleteGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteGroupRequest.Merge(m, src)
 }
 func (m *DeleteGroupRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteGroupRequest.Size(m)
@@ -503,16 +437,17 @@ func (m *ListGroupMembersRequest) Reset()         { *m = ListGroupMembersRequest
 func (m *ListGroupMembersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListGroupMembersRequest) ProtoMessage()    {}
 func (*ListGroupMembersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{6}
+	return fileDescriptor_21ad21d0ed55c55a, []int{6}
 }
+
 func (m *ListGroupMembersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGroupMembersRequest.Unmarshal(m, b)
 }
 func (m *ListGroupMembersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGroupMembersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListGroupMembersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGroupMembersRequest.Merge(dst, src)
+func (m *ListGroupMembersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupMembersRequest.Merge(m, src)
 }
 func (m *ListGroupMembersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListGroupMembersRequest.Size(m)
@@ -577,16 +512,17 @@ func (m *ListGroupMembersResponse) Reset()         { *m = ListGroupMembersRespon
 func (m *ListGroupMembersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListGroupMembersResponse) ProtoMessage()    {}
 func (*ListGroupMembersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_group_service_990a70a97332ba2c, []int{7}
+	return fileDescriptor_21ad21d0ed55c55a, []int{7}
 }
+
 func (m *ListGroupMembersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListGroupMembersResponse.Unmarshal(m, b)
 }
 func (m *ListGroupMembersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListGroupMembersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListGroupMembersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListGroupMembersResponse.Merge(dst, src)
+func (m *ListGroupMembersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupMembersResponse.Merge(m, src)
 }
 func (m *ListGroupMembersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListGroupMembersResponse.Size(m)
@@ -629,6 +565,66 @@ func init() {
 	proto.RegisterType((*ListGroupMembersResponse)(nil), "google.monitoring.v3.ListGroupMembersResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/monitoring/v3/group_service.proto", fileDescriptor_21ad21d0ed55c55a)
+}
+
+var fileDescriptor_21ad21d0ed55c55a = []byte{
+	// 826 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x4c,
+	0x10, 0x7e, 0xdd, 0xa4, 0x69, 0xb2, 0x69, 0xd5, 0x76, 0x55, 0xf5, 0x8d, 0xdc, 0x0f, 0x05, 0xf7,
+	0x83, 0xa8, 0x50, 0x5b, 0x24, 0x07, 0x24, 0x10, 0x3d, 0xb4, 0xa0, 0x82, 0x44, 0xd5, 0xca, 0x2d,
+	0x3d, 0xa0, 0x4a, 0x91, 0x9b, 0x4c, 0x8c, 0xc1, 0xde, 0x35, 0xf6, 0x26, 0xd0, 0xa2, 0x4a, 0x80,
+	0xc4, 0x81, 0x33, 0x37, 0x6e, 0x1c, 0xe1, 0x2f, 0x70, 0xe2, 0xca, 0x95, 0xbf, 0xc0, 0xff, 0x00,
+	0x79, 0xbd, 0x9b, 0x38, 0x9f, 0xed, 0x85, 0x5b, 0xb2, 0xf3, 0x8c, 0x9f, 0x67, 0x66, 0x9f, 0x99,
+	0x45, 0x25, 0x9b, 0x52, 0xdb, 0x05, 0xc3, 0xa3, 0xc4, 0x61, 0x34, 0x70, 0x88, 0x6d, 0xb4, 0x2a,
+	0x86, 0x1d, 0xd0, 0xa6, 0x5f, 0x0d, 0x21, 0x68, 0x39, 0x35, 0xd0, 0xfd, 0x80, 0x32, 0x8a, 0xe7,
+	0x62, 0xa4, 0xde, 0x41, 0xea, 0xad, 0x8a, 0xba, 0x28, 0xf2, 0x2d, 0xdf, 0x31, 0x2c, 0x42, 0x28,
+	0xb3, 0x98, 0x43, 0x49, 0x18, 0xe7, 0xa8, 0x2b, 0x89, 0xa8, 0xc8, 0x83, 0x7a, 0x35, 0x80, 0x90,
+	0x36, 0x03, 0xf9, 0x61, 0xf5, 0xda, 0x40, 0x09, 0x35, 0xea, 0x79, 0x94, 0x08, 0x48, 0x71, 0xb8,
+	0x4a, 0x81, 0x58, 0x10, 0x08, 0xfe, 0xef, 0xb4, 0xd9, 0x30, 0xc0, 0xf3, 0xd9, 0x59, 0x1c, 0xd4,
+	0xfe, 0x28, 0x68, 0xf6, 0xb1, 0x13, 0xb2, 0xdd, 0x28, 0x21, 0x34, 0xe1, 0x65, 0x13, 0x42, 0x86,
+	0x31, 0x4a, 0x13, 0xcb, 0x83, 0xc2, 0x44, 0x51, 0x29, 0xe5, 0x4c, 0xfe, 0x1b, 0xdf, 0x44, 0xb3,
+	0xb5, 0x67, 0x8e, 0x5b, 0x0f, 0x80, 0x54, 0x69, 0xa3, 0xca, 0x19, 0x0a, 0x63, 0x11, 0xe0, 0xe1,
+	0x7f, 0xe6, 0xb4, 0x0c, 0xed, 0x37, 0xf8, 0x97, 0xb0, 0x8e, 0xb0, 0x45, 0x6a, 0x10, 0x32, 0x1a,
+	0x84, 0x1d, 0x78, 0x4a, 0xc0, 0x67, 0xda, 0x31, 0x89, 0x2f, 0xa3, 0xb9, 0x3a, 0x84, 0x35, 0x20,
+	0x75, 0x8b, 0xb0, 0x44, 0x46, 0x5a, 0x64, 0xe0, 0x44, 0x54, 0xe6, 0x2c, 0xa0, 0x9c, 0x6f, 0xd9,
+	0x50, 0x0d, 0x9d, 0x73, 0x28, 0x8c, 0x17, 0x95, 0xd2, 0xb8, 0x99, 0x8d, 0x0e, 0x0e, 0x9d, 0x73,
+	0xc0, 0x4b, 0x08, 0xf1, 0x20, 0xa3, 0x2f, 0x80, 0x14, 0x32, 0xbc, 0x10, 0x0e, 0x3f, 0x8a, 0x0e,
+	0xb6, 0xb3, 0x28, 0xd3, 0x70, 0x5c, 0x06, 0x81, 0x46, 0x11, 0x4e, 0x36, 0x20, 0xf4, 0x29, 0x09,
+	0x01, 0xdf, 0x42, 0xe3, 0xb1, 0x00, 0xa5, 0x98, 0x2a, 0xe5, 0xcb, 0x0b, 0xfa, 0xa0, 0x2b, 0xd6,
+	0x79, 0x92, 0x19, 0x23, 0xf1, 0x3a, 0x9a, 0x26, 0xf0, 0x9a, 0x55, 0x13, 0xb4, 0xbc, 0x3d, 0xe6,
+	0x54, 0x74, 0x7c, 0x20, 0xa9, 0xb5, 0x35, 0x34, 0xbd, 0x0b, 0x31, 0x5f, 0x6f, 0xbf, 0x53, 0x9d,
+	0x7e, 0x6b, 0x6f, 0x15, 0x84, 0x77, 0x02, 0xb0, 0x18, 0x0c, 0x84, 0xa6, 0x13, 0x57, 0xd3, 0x16,
+	0x1b, 0xf1, 0x5d, 0x4d, 0xec, 0x0a, 0x9a, 0x6a, 0x59, 0xae, 0x53, 0xb7, 0x18, 0x54, 0x29, 0x71,
+	0xcf, 0x38, 0x75, 0xd6, 0x9c, 0x94, 0x87, 0xfb, 0xc4, 0x3d, 0xd3, 0x5c, 0x84, 0x9f, 0xf8, 0xf5,
+	0x5e, 0x05, 0xff, 0x8a, 0xad, 0x84, 0xf0, 0x7d, 0x70, 0x61, 0x48, 0xbd, 0xc9, 0xd6, 0xfc, 0x50,
+	0xd0, 0xff, 0xed, 0x3b, 0xdb, 0x03, 0xef, 0x14, 0x82, 0x91, 0xd6, 0xed, 0x32, 0x4a, 0x6a, 0xa4,
+	0x51, 0xd2, 0x3d, 0x46, 0xc1, 0xf3, 0xd2, 0x28, 0xdc, 0x61, 0x39, 0x53, 0xfc, 0xc3, 0x5b, 0x28,
+	0xeb, 0x10, 0x06, 0x41, 0xcb, 0x72, 0xb9, 0xbb, 0xf2, 0x65, 0x6d, 0x70, 0x23, 0x8e, 0x1c, 0x0f,
+	0x1e, 0x09, 0xa4, 0xd9, 0xce, 0xd1, 0x3e, 0x2b, 0xa8, 0xd0, 0x5f, 0x83, 0x70, 0xdf, 0x6d, 0x34,
+	0xe1, 0xc5, 0x47, 0xc2, 0x7f, 0x4b, 0xf2, 0xdb, 0x96, 0xef, 0xe8, 0x7b, 0x72, 0x5d, 0x98, 0x62,
+	0x5b, 0x98, 0x12, 0x7d, 0x55, 0x0f, 0x46, 0x45, 0x33, 0xca, 0x2c, 0x37, 0xd9, 0x92, 0x1c, 0x3f,
+	0x89, 0x7a, 0x52, 0xfe, 0x9e, 0x41, 0x93, 0x5c, 0xd8, 0x61, 0xbc, 0xe7, 0xf0, 0x07, 0x05, 0xa1,
+	0xce, 0x94, 0xe0, 0xeb, 0x83, 0x4b, 0xed, 0x5b, 0x24, 0x6a, 0xe9, 0x72, 0x60, 0x5c, 0xb2, 0xb6,
+	0xfa, 0xfe, 0xd7, 0xef, 0x4f, 0x63, 0xcb, 0x78, 0x31, 0x5a, 0x5f, 0x6f, 0xa2, 0x6b, 0xbb, 0xe7,
+	0x07, 0xf4, 0x39, 0xd4, 0x58, 0x68, 0x6c, 0x5c, 0xc4, 0x0b, 0x2d, 0xc4, 0x2d, 0x94, 0x95, 0xb3,
+	0x83, 0xd7, 0x86, 0x18, 0xaf, 0x7b, 0xb6, 0xd4, 0x51, 0xfe, 0xd4, 0xd6, 0x39, 0x6b, 0x11, 0x2f,
+	0x0f, 0x62, 0x15, 0xa4, 0xc6, 0xc6, 0x05, 0x7e, 0xa7, 0xa0, 0x7c, 0x62, 0x18, 0xf1, 0x90, 0xba,
+	0xfa, 0xe7, 0x75, 0x34, 0xfd, 0x0d, 0x4e, 0xbf, 0xa6, 0x8d, 0x2c, 0xfa, 0x8e, 0x18, 0xa2, 0x8f,
+	0x0a, 0xca, 0x27, 0xc6, 0x71, 0x98, 0x86, 0xfe, 0x89, 0x1d, 0xad, 0xa1, 0xc2, 0x35, 0x6c, 0xaa,
+	0xab, 0x5c, 0x43, 0xfc, 0x70, 0x0c, 0x6d, 0x84, 0xd4, 0xf2, 0x0a, 0xe5, 0x13, 0xb3, 0x3a, 0x4c,
+	0x4a, 0xff, 0x38, 0xab, 0xf3, 0x12, 0x29, 0x5f, 0x23, 0xfd, 0x41, 0xf4, 0x1a, 0xc9, 0x8b, 0xd8,
+	0xb8, 0xec, 0x22, 0xbe, 0x28, 0x68, 0xa6, 0x77, 0x6c, 0xf0, 0xe6, 0x25, 0x2e, 0xeb, 0x5e, 0x11,
+	0xaa, 0x7e, 0x55, 0xb8, 0xb0, 0xa6, 0xce, 0xb5, 0x95, 0xf0, 0xfa, 0x68, 0x6d, 0x86, 0x18, 0xc2,
+	0xed, 0xaf, 0x0a, 0x2a, 0xd4, 0xa8, 0x37, 0x90, 0x65, 0x7b, 0x36, 0x39, 0x57, 0x07, 0x51, 0x13,
+	0x0e, 0x94, 0xa7, 0x5b, 0x02, 0x6a, 0x53, 0xd7, 0x22, 0xb6, 0x4e, 0x03, 0xdb, 0xb0, 0x81, 0xf0,
+	0x16, 0x19, 0x71, 0xc8, 0xf2, 0x9d, 0xb0, 0xfb, 0x8d, 0xbf, 0xdb, 0xf9, 0xf7, 0x6d, 0x4c, 0xdd,
+	0x8d, 0x3f, 0xb0, 0xe3, 0xd2, 0x66, 0x5d, 0x2e, 0x88, 0x88, 0xf1, 0xb8, 0xf2, 0x53, 0x06, 0x4f,
+	0x78, 0xf0, 0xa4, 0x13, 0x3c, 0x39, 0xae, 0x9c, 0x66, 0x38, 0x49, 0xe5, 0x6f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x86, 0x94, 0xf2, 0xde, 0xed, 0x08, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -879,63 +875,3 @@ var _GroupService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/monitoring/v3/group_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/monitoring/v3/group_service.proto", fileDescriptor_group_service_990a70a97332ba2c)
-}
-
-var fileDescriptor_group_service_990a70a97332ba2c = []byte{
-	// 826 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x4c,
-	0x10, 0x7e, 0xdd, 0xa4, 0x69, 0xb2, 0x69, 0xd5, 0x76, 0x55, 0xf5, 0x8d, 0xdc, 0x0f, 0x05, 0xf7,
-	0x83, 0xa8, 0x50, 0x5b, 0x24, 0x07, 0x24, 0x10, 0x3d, 0xb4, 0xa0, 0x82, 0x44, 0xd5, 0xca, 0x2d,
-	0x3d, 0xa0, 0x4a, 0x91, 0x9b, 0x4c, 0x8c, 0xc1, 0xde, 0x35, 0xf6, 0x26, 0xd0, 0xa2, 0x4a, 0x80,
-	0xc4, 0x81, 0x33, 0x37, 0x6e, 0x1c, 0xe1, 0x2f, 0x70, 0xe2, 0xca, 0x95, 0xbf, 0xc0, 0xff, 0x00,
-	0x79, 0xbd, 0x9b, 0x38, 0x9f, 0xed, 0x85, 0x5b, 0xb2, 0xf3, 0x8c, 0x9f, 0x67, 0x66, 0x9f, 0x99,
-	0x45, 0x25, 0x9b, 0x52, 0xdb, 0x05, 0xc3, 0xa3, 0xc4, 0x61, 0x34, 0x70, 0x88, 0x6d, 0xb4, 0x2a,
-	0x86, 0x1d, 0xd0, 0xa6, 0x5f, 0x0d, 0x21, 0x68, 0x39, 0x35, 0xd0, 0xfd, 0x80, 0x32, 0x8a, 0xe7,
-	0x62, 0xa4, 0xde, 0x41, 0xea, 0xad, 0x8a, 0xba, 0x28, 0xf2, 0x2d, 0xdf, 0x31, 0x2c, 0x42, 0x28,
-	0xb3, 0x98, 0x43, 0x49, 0x18, 0xe7, 0xa8, 0x2b, 0x89, 0xa8, 0xc8, 0x83, 0x7a, 0x35, 0x80, 0x90,
-	0x36, 0x03, 0xf9, 0x61, 0xf5, 0xda, 0x40, 0x09, 0x35, 0xea, 0x79, 0x94, 0x08, 0x48, 0x71, 0xb8,
-	0x4a, 0x81, 0x58, 0x10, 0x08, 0xfe, 0xef, 0xb4, 0xd9, 0x30, 0xc0, 0xf3, 0xd9, 0x59, 0x1c, 0xd4,
-	0xfe, 0x28, 0x68, 0xf6, 0xb1, 0x13, 0xb2, 0xdd, 0x28, 0x21, 0x34, 0xe1, 0x65, 0x13, 0x42, 0x86,
-	0x31, 0x4a, 0x13, 0xcb, 0x83, 0xc2, 0x44, 0x51, 0x29, 0xe5, 0x4c, 0xfe, 0x1b, 0xdf, 0x44, 0xb3,
-	0xb5, 0x67, 0x8e, 0x5b, 0x0f, 0x80, 0x54, 0x69, 0xa3, 0xca, 0x19, 0x0a, 0x63, 0x11, 0xe0, 0xe1,
-	0x7f, 0xe6, 0xb4, 0x0c, 0xed, 0x37, 0xf8, 0x97, 0xb0, 0x8e, 0xb0, 0x45, 0x6a, 0x10, 0x32, 0x1a,
-	0x84, 0x1d, 0x78, 0x4a, 0xc0, 0x67, 0xda, 0x31, 0x89, 0x2f, 0xa3, 0xb9, 0x3a, 0x84, 0x35, 0x20,
-	0x75, 0x8b, 0xb0, 0x44, 0x46, 0x5a, 0x64, 0xe0, 0x44, 0x54, 0xe6, 0x2c, 0xa0, 0x9c, 0x6f, 0xd9,
-	0x50, 0x0d, 0x9d, 0x73, 0x28, 0x8c, 0x17, 0x95, 0xd2, 0xb8, 0x99, 0x8d, 0x0e, 0x0e, 0x9d, 0x73,
-	0xc0, 0x4b, 0x08, 0xf1, 0x20, 0xa3, 0x2f, 0x80, 0x14, 0x32, 0xbc, 0x10, 0x0e, 0x3f, 0x8a, 0x0e,
-	0xb6, 0xb3, 0x28, 0xd3, 0x70, 0x5c, 0x06, 0x81, 0x46, 0x11, 0x4e, 0x36, 0x20, 0xf4, 0x29, 0x09,
-	0x01, 0xdf, 0x42, 0xe3, 0xb1, 0x00, 0xa5, 0x98, 0x2a, 0xe5, 0xcb, 0x0b, 0xfa, 0xa0, 0x2b, 0xd6,
-	0x79, 0x92, 0x19, 0x23, 0xf1, 0x3a, 0x9a, 0x26, 0xf0, 0x9a, 0x55, 0x13, 0xb4, 0xbc, 0x3d, 0xe6,
-	0x54, 0x74, 0x7c, 0x20, 0xa9, 0xb5, 0x35, 0x34, 0xbd, 0x0b, 0x31, 0x5f, 0x6f, 0xbf, 0x53, 0x9d,
-	0x7e, 0x6b, 0x6f, 0x15, 0x84, 0x77, 0x02, 0xb0, 0x18, 0x0c, 0x84, 0xa6, 0x13, 0x57, 0xd3, 0x16,
-	0x1b, 0xf1, 0x5d, 0x4d, 0xec, 0x0a, 0x9a, 0x6a, 0x59, 0xae, 0x53, 0xb7, 0x18, 0x54, 0x29, 0x71,
-	0xcf, 0x38, 0x75, 0xd6, 0x9c, 0x94, 0x87, 0xfb, 0xc4, 0x3d, 0xd3, 0x5c, 0x84, 0x9f, 0xf8, 0xf5,
-	0x5e, 0x05, 0xff, 0x8a, 0xad, 0x84, 0xf0, 0x7d, 0x70, 0x61, 0x48, 0xbd, 0xc9, 0xd6, 0xfc, 0x50,
-	0xd0, 0xff, 0xed, 0x3b, 0xdb, 0x03, 0xef, 0x14, 0x82, 0x91, 0xd6, 0xed, 0x32, 0x4a, 0x6a, 0xa4,
-	0x51, 0xd2, 0x3d, 0x46, 0xc1, 0xf3, 0xd2, 0x28, 0xdc, 0x61, 0x39, 0x53, 0xfc, 0xc3, 0x5b, 0x28,
-	0xeb, 0x10, 0x06, 0x41, 0xcb, 0x72, 0xb9, 0xbb, 0xf2, 0x65, 0x6d, 0x70, 0x23, 0x8e, 0x1c, 0x0f,
-	0x1e, 0x09, 0xa4, 0xd9, 0xce, 0xd1, 0x3e, 0x2b, 0xa8, 0xd0, 0x5f, 0x83, 0x70, 0xdf, 0x6d, 0x34,
-	0xe1, 0xc5, 0x47, 0xc2, 0x7f, 0x4b, 0xf2, 0xdb, 0x96, 0xef, 0xe8, 0x7b, 0x72, 0x5d, 0x98, 0x62,
-	0x5b, 0x98, 0x12, 0x7d, 0x55, 0x0f, 0x46, 0x45, 0x33, 0xca, 0x2c, 0x37, 0xd9, 0x92, 0x1c, 0x3f,
-	0x89, 0x7a, 0x52, 0xfe, 0x9e, 0x41, 0x93, 0x5c, 0xd8, 0x61, 0xbc, 0xe7, 0xf0, 0x07, 0x05, 0xa1,
-	0xce, 0x94, 0xe0, 0xeb, 0x83, 0x4b, 0xed, 0x5b, 0x24, 0x6a, 0xe9, 0x72, 0x60, 0x5c, 0xb2, 0xb6,
-	0xfa, 0xfe, 0xd7, 0xef, 0x4f, 0x63, 0xcb, 0x78, 0x31, 0x5a, 0x5f, 0x6f, 0xa2, 0x6b, 0xbb, 0xe7,
-	0x07, 0xf4, 0x39, 0xd4, 0x58, 0x68, 0x6c, 0x5c, 0xc4, 0x0b, 0x2d, 0xc4, 0x2d, 0x94, 0x95, 0xb3,
-	0x83, 0xd7, 0x86, 0x18, 0xaf, 0x7b, 0xb6, 0xd4, 0x51, 0xfe, 0xd4, 0xd6, 0x39, 0x6b, 0x11, 0x2f,
-	0x0f, 0x62, 0x15, 0xa4, 0xc6, 0xc6, 0x05, 0x7e, 0xa7, 0xa0, 0x7c, 0x62, 0x18, 0xf1, 0x90, 0xba,
-	0xfa, 0xe7, 0x75, 0x34, 0xfd, 0x0d, 0x4e, 0xbf, 0xa6, 0x8d, 0x2c, 0xfa, 0x8e, 0x18, 0xa2, 0x8f,
-	0x0a, 0xca, 0x27, 0xc6, 0x71, 0x98, 0x86, 0xfe, 0x89, 0x1d, 0xad, 0xa1, 0xc2, 0x35, 0x6c, 0xaa,
-	0xab, 0x5c, 0x43, 0xfc, 0x70, 0x0c, 0x6d, 0x84, 0xd4, 0xf2, 0x0a, 0xe5, 0x13, 0xb3, 0x3a, 0x4c,
-	0x4a, 0xff, 0x38, 0xab, 0xf3, 0x12, 0x29, 0x5f, 0x23, 0xfd, 0x41, 0xf4, 0x1a, 0xc9, 0x8b, 0xd8,
-	0xb8, 0xec, 0x22, 0xbe, 0x28, 0x68, 0xa6, 0x77, 0x6c, 0xf0, 0xe6, 0x25, 0x2e, 0xeb, 0x5e, 0x11,
-	0xaa, 0x7e, 0x55, 0xb8, 0xb0, 0xa6, 0xce, 0xb5, 0x95, 0xf0, 0xfa, 0x68, 0x6d, 0x86, 0x18, 0xc2,
-	0xed, 0xaf, 0x0a, 0x2a, 0xd4, 0xa8, 0x37, 0x90, 0x65, 0x7b, 0x36, 0x39, 0x57, 0x07, 0x51, 0x13,
-	0x0e, 0x94, 0xa7, 0x5b, 0x02, 0x6a, 0x53, 0xd7, 0x22, 0xb6, 0x4e, 0x03, 0xdb, 0xb0, 0x81, 0xf0,
-	0x16, 0x19, 0x71, 0xc8, 0xf2, 0x9d, 0xb0, 0xfb, 0x8d, 0xbf, 0xdb, 0xf9, 0xf7, 0x6d, 0x4c, 0xdd,
-	0x8d, 0x3f, 0xb0, 0xe3, 0xd2, 0x66, 0x5d, 0x2e, 0x88, 0x88, 0xf1, 0xb8, 0xf2, 0x53, 0x06, 0x4f,
-	0x78, 0xf0, 0xa4, 0x13, 0x3c, 0x39, 0xae, 0x9c, 0x66, 0x38, 0x49, 0xe5, 0x6f, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x86, 0x94, 0xf2, 0xde, 0xed, 0x08, 0x00, 0x00,
-}
diff --git a/googleapis/monitoring/v3/metric.pb.go b/googleapis/monitoring/v3/metric.pb.go
index bf80222e31..03d63f5110 100644
--- a/googleapis/monitoring/v3/metric.pb.go
+++ b/googleapis/monitoring/v3/metric.pb.go
@@ -1,15 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/metric.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/label"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	_ "google.golang.org/genproto/googleapis/api/label"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +23,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A single data point in a time series.
 type Point struct {
@@ -44,16 +47,17 @@ func (m *Point) Reset()         { *m = Point{} }
 func (m *Point) String() string { return proto.CompactTextString(m) }
 func (*Point) ProtoMessage()    {}
 func (*Point) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_640ded4d066f50b5, []int{0}
+	return fileDescriptor_c76199a3d2c4c21e, []int{0}
 }
+
 func (m *Point) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Point.Unmarshal(m, b)
 }
 func (m *Point) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Point.Marshal(b, m, deterministic)
 }
-func (dst *Point) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Point.Merge(dst, src)
+func (m *Point) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Point.Merge(m, src)
 }
 func (m *Point) XXX_Size() int {
 	return xxx_messageInfo_Point.Size(m)
@@ -128,16 +132,17 @@ func (m *TimeSeries) Reset()         { *m = TimeSeries{} }
 func (m *TimeSeries) String() string { return proto.CompactTextString(m) }
 func (*TimeSeries) ProtoMessage()    {}
 func (*TimeSeries) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_640ded4d066f50b5, []int{1}
+	return fileDescriptor_c76199a3d2c4c21e, []int{1}
 }
+
 func (m *TimeSeries) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeSeries.Unmarshal(m, b)
 }
 func (m *TimeSeries) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeSeries.Marshal(b, m, deterministic)
 }
-func (dst *TimeSeries) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeSeries.Merge(dst, src)
+func (m *TimeSeries) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeSeries.Merge(m, src)
 }
 func (m *TimeSeries) XXX_Size() int {
 	return xxx_messageInfo_TimeSeries.Size(m)
@@ -195,11 +200,9 @@ func init() {
 	proto.RegisterType((*TimeSeries)(nil), "google.monitoring.v3.TimeSeries")
 }
 
-func init() {
-	proto.RegisterFile("google/monitoring/v3/metric.proto", fileDescriptor_metric_640ded4d066f50b5)
-}
+func init() { proto.RegisterFile("google/monitoring/v3/metric.proto", fileDescriptor_c76199a3d2c4c21e) }
 
-var fileDescriptor_metric_640ded4d066f50b5 = []byte{
+var fileDescriptor_c76199a3d2c4c21e = []byte{
 	// 441 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x51, 0xab, 0xd3, 0x30,
 	0x14, 0xc7, 0xe9, 0xae, 0x9b, 0x33, 0x03, 0x1f, 0x82, 0x68, 0x99, 0x0a, 0x73, 0xa2, 0x0e, 0x1f,
diff --git a/googleapis/monitoring/v3/metric_service.pb.go b/googleapis/monitoring/v3/metric_service.pb.go
index 730d28500a..69502b5171 100644
--- a/googleapis/monitoring/v3/metric_service.pb.go
+++ b/googleapis/monitoring/v3/metric_service.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/metric_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import metric "google.golang.org/genproto/googleapis/api/metric"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package monitoring
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	metric "google.golang.org/genproto/googleapis/api/metric"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Controls which fields are returned by `ListTimeSeries`.
 type ListTimeSeriesRequest_TimeSeriesView int32
@@ -45,6 +45,7 @@ var ListTimeSeriesRequest_TimeSeriesView_name = map[int32]string{
 	0: "FULL",
 	1: "HEADERS",
 }
+
 var ListTimeSeriesRequest_TimeSeriesView_value = map[string]int32{
 	"FULL":    0,
 	"HEADERS": 1,
@@ -53,8 +54,9 @@ var ListTimeSeriesRequest_TimeSeriesView_value = map[string]int32{
 func (x ListTimeSeriesRequest_TimeSeriesView) String() string {
 	return proto.EnumName(ListTimeSeriesRequest_TimeSeriesView_name, int32(x))
 }
+
 func (ListTimeSeriesRequest_TimeSeriesView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{8, 0}
+	return fileDescriptor_7b3d47b45a293957, []int{8, 0}
 }
 
 // The `ListMonitoredResourceDescriptors` request.
@@ -87,16 +89,17 @@ func (m *ListMonitoredResourceDescriptorsRequest) Reset() {
 func (m *ListMonitoredResourceDescriptorsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsRequest) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{0}
+	return fileDescriptor_7b3d47b45a293957, []int{0}
 }
+
 func (m *ListMonitoredResourceDescriptorsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Unmarshal(m, b)
 }
 func (m *ListMonitoredResourceDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(dst, src)
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(m, src)
 }
 func (m *ListMonitoredResourceDescriptorsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Size(m)
@@ -155,16 +158,17 @@ func (m *ListMonitoredResourceDescriptorsResponse) Reset() {
 func (m *ListMonitoredResourceDescriptorsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsResponse) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{1}
+	return fileDescriptor_7b3d47b45a293957, []int{1}
 }
+
 func (m *ListMonitoredResourceDescriptorsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Unmarshal(m, b)
 }
 func (m *ListMonitoredResourceDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(dst, src)
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(m, src)
 }
 func (m *ListMonitoredResourceDescriptorsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Size(m)
@@ -205,16 +209,17 @@ func (m *GetMonitoredResourceDescriptorRequest) Reset()         { *m = GetMonito
 func (m *GetMonitoredResourceDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMonitoredResourceDescriptorRequest) ProtoMessage()    {}
 func (*GetMonitoredResourceDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{2}
+	return fileDescriptor_7b3d47b45a293957, []int{2}
 }
+
 func (m *GetMonitoredResourceDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Unmarshal(m, b)
 }
 func (m *GetMonitoredResourceDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetMonitoredResourceDescriptorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Merge(dst, src)
+func (m *GetMonitoredResourceDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Merge(m, src)
 }
 func (m *GetMonitoredResourceDescriptorRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Size(m)
@@ -261,16 +266,17 @@ func (m *ListMetricDescriptorsRequest) Reset()         { *m = ListMetricDescript
 func (m *ListMetricDescriptorsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListMetricDescriptorsRequest) ProtoMessage()    {}
 func (*ListMetricDescriptorsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{3}
+	return fileDescriptor_7b3d47b45a293957, []int{3}
 }
+
 func (m *ListMetricDescriptorsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMetricDescriptorsRequest.Unmarshal(m, b)
 }
 func (m *ListMetricDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMetricDescriptorsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListMetricDescriptorsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMetricDescriptorsRequest.Merge(dst, src)
+func (m *ListMetricDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMetricDescriptorsRequest.Merge(m, src)
 }
 func (m *ListMetricDescriptorsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListMetricDescriptorsRequest.Size(m)
@@ -327,16 +333,17 @@ func (m *ListMetricDescriptorsResponse) Reset()         { *m = ListMetricDescrip
 func (m *ListMetricDescriptorsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListMetricDescriptorsResponse) ProtoMessage()    {}
 func (*ListMetricDescriptorsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{4}
+	return fileDescriptor_7b3d47b45a293957, []int{4}
 }
+
 func (m *ListMetricDescriptorsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListMetricDescriptorsResponse.Unmarshal(m, b)
 }
 func (m *ListMetricDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListMetricDescriptorsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListMetricDescriptorsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListMetricDescriptorsResponse.Merge(dst, src)
+func (m *ListMetricDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMetricDescriptorsResponse.Merge(m, src)
 }
 func (m *ListMetricDescriptorsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListMetricDescriptorsResponse.Size(m)
@@ -377,16 +384,17 @@ func (m *GetMetricDescriptorRequest) Reset()         { *m = GetMetricDescriptorR
 func (m *GetMetricDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMetricDescriptorRequest) ProtoMessage()    {}
 func (*GetMetricDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{5}
+	return fileDescriptor_7b3d47b45a293957, []int{5}
 }
+
 func (m *GetMetricDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMetricDescriptorRequest.Unmarshal(m, b)
 }
 func (m *GetMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMetricDescriptorRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetMetricDescriptorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMetricDescriptorRequest.Merge(dst, src)
+func (m *GetMetricDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMetricDescriptorRequest.Merge(m, src)
 }
 func (m *GetMetricDescriptorRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMetricDescriptorRequest.Size(m)
@@ -421,16 +429,17 @@ func (m *CreateMetricDescriptorRequest) Reset()         { *m = CreateMetricDescr
 func (m *CreateMetricDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateMetricDescriptorRequest) ProtoMessage()    {}
 func (*CreateMetricDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{6}
+	return fileDescriptor_7b3d47b45a293957, []int{6}
 }
+
 func (m *CreateMetricDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateMetricDescriptorRequest.Unmarshal(m, b)
 }
 func (m *CreateMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateMetricDescriptorRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateMetricDescriptorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateMetricDescriptorRequest.Merge(dst, src)
+func (m *CreateMetricDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateMetricDescriptorRequest.Merge(m, src)
 }
 func (m *CreateMetricDescriptorRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateMetricDescriptorRequest.Size(m)
@@ -471,16 +480,17 @@ func (m *DeleteMetricDescriptorRequest) Reset()         { *m = DeleteMetricDescr
 func (m *DeleteMetricDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteMetricDescriptorRequest) ProtoMessage()    {}
 func (*DeleteMetricDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{7}
+	return fileDescriptor_7b3d47b45a293957, []int{7}
 }
+
 func (m *DeleteMetricDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteMetricDescriptorRequest.Unmarshal(m, b)
 }
 func (m *DeleteMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteMetricDescriptorRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteMetricDescriptorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteMetricDescriptorRequest.Merge(dst, src)
+func (m *DeleteMetricDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteMetricDescriptorRequest.Merge(m, src)
 }
 func (m *DeleteMetricDescriptorRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteMetricDescriptorRequest.Size(m)
@@ -543,16 +553,17 @@ func (m *ListTimeSeriesRequest) Reset()         { *m = ListTimeSeriesRequest{} }
 func (m *ListTimeSeriesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTimeSeriesRequest) ProtoMessage()    {}
 func (*ListTimeSeriesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{8}
+	return fileDescriptor_7b3d47b45a293957, []int{8}
 }
+
 func (m *ListTimeSeriesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTimeSeriesRequest.Unmarshal(m, b)
 }
 func (m *ListTimeSeriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTimeSeriesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTimeSeriesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTimeSeriesRequest.Merge(dst, src)
+func (m *ListTimeSeriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTimeSeriesRequest.Merge(m, src)
 }
 func (m *ListTimeSeriesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTimeSeriesRequest.Size(m)
@@ -639,16 +650,17 @@ func (m *ListTimeSeriesResponse) Reset()         { *m = ListTimeSeriesResponse{}
 func (m *ListTimeSeriesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTimeSeriesResponse) ProtoMessage()    {}
 func (*ListTimeSeriesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{9}
+	return fileDescriptor_7b3d47b45a293957, []int{9}
 }
+
 func (m *ListTimeSeriesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTimeSeriesResponse.Unmarshal(m, b)
 }
 func (m *ListTimeSeriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTimeSeriesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTimeSeriesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTimeSeriesResponse.Merge(dst, src)
+func (m *ListTimeSeriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTimeSeriesResponse.Merge(m, src)
 }
 func (m *ListTimeSeriesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTimeSeriesResponse.Size(m)
@@ -700,16 +712,17 @@ func (m *CreateTimeSeriesRequest) Reset()         { *m = CreateTimeSeriesRequest
 func (m *CreateTimeSeriesRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTimeSeriesRequest) ProtoMessage()    {}
 func (*CreateTimeSeriesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{10}
+	return fileDescriptor_7b3d47b45a293957, []int{10}
 }
+
 func (m *CreateTimeSeriesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTimeSeriesRequest.Unmarshal(m, b)
 }
 func (m *CreateTimeSeriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTimeSeriesRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTimeSeriesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTimeSeriesRequest.Merge(dst, src)
+func (m *CreateTimeSeriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTimeSeriesRequest.Merge(m, src)
 }
 func (m *CreateTimeSeriesRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTimeSeriesRequest.Size(m)
@@ -752,16 +765,17 @@ func (m *CreateTimeSeriesError) Reset()         { *m = CreateTimeSeriesError{} }
 func (m *CreateTimeSeriesError) String() string { return proto.CompactTextString(m) }
 func (*CreateTimeSeriesError) ProtoMessage()    {}
 func (*CreateTimeSeriesError) Descriptor() ([]byte, []int) {
-	return fileDescriptor_metric_service_1409540f97d9ae0c, []int{11}
+	return fileDescriptor_7b3d47b45a293957, []int{11}
 }
+
 func (m *CreateTimeSeriesError) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTimeSeriesError.Unmarshal(m, b)
 }
 func (m *CreateTimeSeriesError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTimeSeriesError.Marshal(b, m, deterministic)
 }
-func (dst *CreateTimeSeriesError) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTimeSeriesError.Merge(dst, src)
+func (m *CreateTimeSeriesError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTimeSeriesError.Merge(m, src)
 }
 func (m *CreateTimeSeriesError) XXX_Size() int {
 	return xxx_messageInfo_CreateTimeSeriesError.Size(m)
@@ -787,6 +801,7 @@ func (m *CreateTimeSeriesError) GetStatus() *status.Status {
 }
 
 func init() {
+	proto.RegisterEnum("google.monitoring.v3.ListTimeSeriesRequest_TimeSeriesView", ListTimeSeriesRequest_TimeSeriesView_name, ListTimeSeriesRequest_TimeSeriesView_value)
 	proto.RegisterType((*ListMonitoredResourceDescriptorsRequest)(nil), "google.monitoring.v3.ListMonitoredResourceDescriptorsRequest")
 	proto.RegisterType((*ListMonitoredResourceDescriptorsResponse)(nil), "google.monitoring.v3.ListMonitoredResourceDescriptorsResponse")
 	proto.RegisterType((*GetMonitoredResourceDescriptorRequest)(nil), "google.monitoring.v3.GetMonitoredResourceDescriptorRequest")
@@ -799,7 +814,80 @@ func init() {
 	proto.RegisterType((*ListTimeSeriesResponse)(nil), "google.monitoring.v3.ListTimeSeriesResponse")
 	proto.RegisterType((*CreateTimeSeriesRequest)(nil), "google.monitoring.v3.CreateTimeSeriesRequest")
 	proto.RegisterType((*CreateTimeSeriesError)(nil), "google.monitoring.v3.CreateTimeSeriesError")
-	proto.RegisterEnum("google.monitoring.v3.ListTimeSeriesRequest_TimeSeriesView", ListTimeSeriesRequest_TimeSeriesView_name, ListTimeSeriesRequest_TimeSeriesView_value)
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/metric_service.proto", fileDescriptor_7b3d47b45a293957)
+}
+
+var fileDescriptor_7b3d47b45a293957 = []byte{
+	// 1049 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
+	0x14, 0x67, 0xe2, 0x34, 0x71, 0x9e, 0xd5, 0xd4, 0x9d, 0xb6, 0xae, 0xd9, 0x26, 0x95, 0xbb, 0xa8,
+	0xc4, 0x75, 0xcb, 0x6e, 0x65, 0x57, 0x1c, 0x92, 0x26, 0x52, 0xfe, 0x51, 0x2a, 0x02, 0x8a, 0xd6,
+	0x25, 0x87, 0x2a, 0x92, 0xb5, 0xb1, 0xa7, 0xab, 0x01, 0xef, 0xce, 0x32, 0x3b, 0x76, 0x9b, 0xa2,
+	0x70, 0xe0, 0xd0, 0x3b, 0x02, 0x24, 0xf8, 0x0a, 0x39, 0x80, 0xf8, 0x0a, 0x88, 0x13, 0x57, 0xce,
+	0xdc, 0xf8, 0x0a, 0xdc, 0xd1, 0xce, 0xee, 0xc6, 0xf6, 0x7a, 0x77, 0x6d, 0x73, 0xe9, 0xcd, 0x3b,
+	0xef, 0xcd, 0x7b, 0xbf, 0xf7, 0x9b, 0x79, 0xef, 0x37, 0x86, 0x7b, 0x16, 0x63, 0x56, 0x97, 0xe8,
+	0x36, 0x73, 0xa8, 0x60, 0x9c, 0x3a, 0x96, 0xde, 0x6f, 0xe8, 0x36, 0x11, 0x9c, 0xb6, 0x5b, 0x1e,
+	0xe1, 0x7d, 0xda, 0x26, 0x9a, 0xcb, 0x99, 0x60, 0xf8, 0x7a, 0xe0, 0xaa, 0x0d, 0x5c, 0xb5, 0x7e,
+	0x43, 0x59, 0x09, 0x03, 0x98, 0x2e, 0xd5, 0x4d, 0xc7, 0x61, 0xc2, 0x14, 0x94, 0x39, 0x5e, 0xb0,
+	0x47, 0xb9, 0x39, 0x64, 0x0d, 0x82, 0x86, 0x86, 0xf7, 0x86, 0x0d, 0x41, 0x40, 0xd2, 0x69, 0x71,
+	0xe2, 0xb1, 0x1e, 0x8f, 0x32, 0x2a, 0x77, 0x12, 0xc1, 0xb5, 0x99, 0x6d, 0x33, 0x27, 0xd3, 0x65,
+	0x24, 0xd5, 0xed, 0xd0, 0x45, 0x7e, 0x9d, 0xf4, 0x5e, 0xe8, 0x9d, 0x1e, 0x97, 0x20, 0x43, 0xfb,
+	0xad, 0xb8, 0x9d, 0xd8, 0xae, 0x38, 0x8d, 0x15, 0xc0, 0xdd, 0xb6, 0xee, 0x09, 0x53, 0xf4, 0xc2,
+	0xca, 0xd4, 0xef, 0x10, 0xac, 0x1d, 0x50, 0x4f, 0x7c, 0x1a, 0x81, 0x37, 0x42, 0xec, 0x7b, 0xc4,
+	0x6b, 0x73, 0xea, 0x0a, 0xc6, 0x3d, 0x83, 0x7c, 0xd5, 0x23, 0x9e, 0xc0, 0x18, 0xe6, 0x1d, 0xd3,
+	0x26, 0xe5, 0x4b, 0x15, 0x54, 0x5d, 0x32, 0xe4, 0x6f, 0x5c, 0x82, 0x85, 0x17, 0xb4, 0x2b, 0x08,
+	0x2f, 0xcf, 0xc9, 0xd5, 0xf0, 0x0b, 0xdf, 0x82, 0x25, 0xd7, 0xb4, 0x48, 0xcb, 0xa3, 0xaf, 0x49,
+	0x39, 0x57, 0x41, 0xd5, 0x4b, 0x46, 0xde, 0x5f, 0x68, 0xd2, 0xd7, 0x04, 0xaf, 0x02, 0x48, 0xa3,
+	0x60, 0x5f, 0x12, 0xa7, 0x3c, 0x2f, 0x37, 0x4a, 0xf7, 0x67, 0xfe, 0x82, 0xfa, 0x0b, 0x82, 0xea,
+	0x64, 0x4c, 0x9e, 0xcb, 0x1c, 0x8f, 0xe0, 0xe7, 0x70, 0x3d, 0xa2, 0xbb, 0xd5, 0x19, 0xd8, 0xcb,
+	0xa8, 0x92, 0xab, 0x16, 0xea, 0x6b, 0x5a, 0x78, 0xda, 0xa6, 0x4b, 0xb5, 0x8c, 0x78, 0xc6, 0x35,
+	0x3e, 0x9e, 0x03, 0xbf, 0x0f, 0x57, 0x1c, 0xf2, 0x4a, 0xb4, 0x86, 0xc0, 0x06, 0x55, 0x5e, 0xf6,
+	0x97, 0x0f, 0x2f, 0x00, 0x6f, 0xc0, 0xdd, 0x27, 0x24, 0x0b, 0x6e, 0x9c, 0xc1, 0xdc, 0x80, 0x41,
+	0xf5, 0x0d, 0x82, 0x15, 0x59, 0xad, 0x3c, 0xec, 0xb7, 0x48, 0xfb, 0x0f, 0x08, 0x56, 0x53, 0x80,
+	0x84, 0x5c, 0x7f, 0x02, 0x38, 0x6c, 0xa9, 0x71, 0xa6, 0x57, 0x46, 0x98, 0x8e, 0x85, 0x30, 0xae,
+	0xda, 0xf1, 0xa0, 0x53, 0x93, 0xfb, 0x10, 0x14, 0x9f, 0xdc, 0x78, 0xc4, 0x0c, 0x46, 0xbf, 0x81,
+	0xd5, 0x5d, 0x4e, 0x4c, 0x41, 0x66, 0xd8, 0x84, 0x9f, 0xc2, 0xd5, 0xb1, 0xda, 0x24, 0xa0, 0x49,
+	0xa5, 0x15, 0xe3, 0xa5, 0xa9, 0x0d, 0x58, 0xdd, 0x23, 0x5d, 0x32, 0x53, 0x7e, 0xf5, 0xa7, 0x1c,
+	0xdc, 0xf0, 0xd9, 0x7f, 0x46, 0x6d, 0xd2, 0x24, 0x9c, 0x92, 0xb1, 0xf3, 0x87, 0x29, 0xce, 0x7f,
+	0x0b, 0xf2, 0xd4, 0x11, 0x84, 0xf7, 0xcd, 0xae, 0x3c, 0xe0, 0x42, 0x5d, 0xd5, 0x92, 0xe6, 0x9d,
+	0xe6, 0xa7, 0x79, 0x1a, 0x7a, 0x1a, 0x17, 0x7b, 0xf0, 0x2e, 0x14, 0x4c, 0xcb, 0xe2, 0xc4, 0x92,
+	0x93, 0x45, 0x5e, 0xb9, 0x42, 0xfd, 0x4e, 0x72, 0x88, 0xed, 0x81, 0xa3, 0x31, 0xbc, 0x0b, 0xbf,
+	0x0b, 0x79, 0xc6, 0x3b, 0x84, 0xb7, 0x4e, 0x4e, 0xcb, 0x0b, 0x12, 0xde, 0xa2, 0xfc, 0xde, 0x39,
+	0xc5, 0x9f, 0xc1, 0x7c, 0x9f, 0x92, 0x97, 0xe5, 0xc5, 0x0a, 0xaa, 0x2e, 0xd7, 0xd7, 0x93, 0x03,
+	0x27, 0xd2, 0xa0, 0x0d, 0x56, 0x8e, 0x28, 0x79, 0x69, 0xc8, 0x38, 0xa3, 0xf7, 0x3d, 0x9f, 0x79,
+	0xdf, 0x97, 0xe2, 0xf7, 0x7d, 0x0d, 0x96, 0x47, 0x63, 0xe2, 0x3c, 0xcc, 0x7f, 0xf4, 0xf9, 0xc1,
+	0x41, 0xf1, 0x1d, 0x5c, 0x80, 0xc5, 0x8f, 0xf7, 0xb7, 0xf7, 0xf6, 0x8d, 0x66, 0x11, 0xa9, 0xbf,
+	0x23, 0x28, 0xc5, 0x31, 0x85, 0x1d, 0xb1, 0x0d, 0x05, 0x41, 0x6d, 0xe2, 0x4b, 0x0c, 0x25, 0x51,
+	0x2b, 0x54, 0xd2, 0x29, 0x0f, 0xb7, 0x83, 0xb8, 0xf8, 0x3d, 0x6d, 0x1f, 0xe0, 0x4d, 0x28, 0x92,
+	0x57, 0xa4, 0xdd, 0xf3, 0x29, 0x6e, 0x11, 0xce, 0xfd, 0xd6, 0xcb, 0xc9, 0x7c, 0x38, 0xca, 0xc7,
+	0xdd, 0xb6, 0xd6, 0x94, 0xd3, 0xdd, 0xb8, 0x72, 0xe1, 0xbb, 0x2f, 0x5d, 0x55, 0x17, 0x6e, 0x06,
+	0x4d, 0x91, 0x7e, 0xc1, 0x86, 0xdb, 0x21, 0x56, 0xd8, 0xdc, 0xec, 0x85, 0xf9, 0x83, 0xed, 0x46,
+	0x3c, 0xa5, 0x04, 0x33, 0xce, 0x1a, 0x9a, 0x99, 0xb5, 0x1a, 0x2c, 0x04, 0x3a, 0x16, 0xf6, 0x68,
+	0x12, 0x07, 0xa1, 0x47, 0xfd, 0x5f, 0x80, 0xcb, 0x41, 0x2b, 0x36, 0x83, 0x97, 0x00, 0xfe, 0x1b,
+	0x41, 0x65, 0x92, 0xc2, 0xe0, 0xcd, 0xf4, 0xdb, 0x39, 0x85, 0x5a, 0x2a, 0x5b, 0xff, 0x77, 0x7b,
+	0x70, 0xb5, 0xd4, 0xf5, 0x6f, 0xff, 0xfa, 0xe7, 0xfb, 0xb9, 0x47, 0xb8, 0xee, 0xbf, 0x04, 0xbe,
+	0xf6, 0x0f, 0x65, 0xd3, 0xe5, 0xec, 0x0b, 0xd2, 0x16, 0x9e, 0x5e, 0x3b, 0x1b, 0xbc, 0x36, 0x92,
+	0xa0, 0xff, 0x81, 0xe0, 0x76, 0xb6, 0x22, 0xe1, 0x8d, 0x64, 0x78, 0x53, 0xe9, 0x98, 0x32, 0xad,
+	0xac, 0xaa, 0x8f, 0x65, 0x11, 0x1f, 0xe2, 0x47, 0x49, 0x45, 0x64, 0xd6, 0xa0, 0xd7, 0xce, 0xf0,
+	0x6f, 0x28, 0x98, 0x89, 0x63, 0x8a, 0x84, 0xeb, 0x19, 0xe4, 0xa6, 0xe8, 0xa8, 0xd2, 0x98, 0x69,
+	0x4f, 0x78, 0x0a, 0xba, 0x2c, 0xe0, 0x1e, 0x5e, 0x4b, 0x39, 0x85, 0x31, 0x64, 0x3f, 0x23, 0xb8,
+	0x96, 0xa0, 0x57, 0xf8, 0x61, 0x3a, 0xdf, 0xc9, 0x2a, 0xa1, 0x64, 0xca, 0x8e, 0x5a, 0x97, 0xc0,
+	0x1e, 0xe0, 0x5a, 0x32, 0xb3, 0x71, 0x5c, 0x7a, 0xad, 0x76, 0x86, 0x7f, 0x45, 0x50, 0x4a, 0x56,
+	0x46, 0x9c, 0x42, 0x4e, 0xa6, 0x8e, 0x4e, 0x40, 0xb8, 0x23, 0x11, 0x3e, 0x56, 0xa7, 0xa5, 0x6e,
+	0x7d, 0x5c, 0x80, 0x7d, 0x36, 0x4b, 0xc9, 0x5a, 0x9a, 0x86, 0x38, 0x53, 0x79, 0x95, 0x52, 0xb4,
+	0x29, 0x7a, 0x25, 0x6b, 0xfb, 0xfe, 0x2b, 0x39, 0x62, 0xb3, 0x36, 0x0b, 0x9b, 0x3f, 0x22, 0x58,
+	0x1e, 0x95, 0x05, 0x7c, 0x7f, 0x06, 0x41, 0x53, 0x1e, 0x4c, 0xe7, 0x1c, 0x5e, 0xc4, 0xaa, 0x44,
+	0xa8, 0xe2, 0x4a, 0x32, 0x9b, 0x43, 0xa3, 0xf1, 0x0d, 0x82, 0x62, 0x7c, 0xee, 0xe2, 0x0f, 0xb2,
+	0xce, 0x77, 0x1c, 0x5b, 0x1a, 0x4f, 0xf7, 0x25, 0x8a, 0xbb, 0xea, 0x44, 0x14, 0xeb, 0xa8, 0xb6,
+	0x73, 0x8e, 0xa0, 0xdc, 0x66, 0x76, 0x62, 0xe6, 0x1d, 0x3c, 0x32, 0x91, 0x0f, 0xfd, 0x34, 0x87,
+	0xe8, 0xf9, 0x56, 0xe8, 0x6b, 0xb1, 0xae, 0xe9, 0x58, 0x1a, 0xe3, 0x96, 0x6e, 0x11, 0x47, 0x82,
+	0xd0, 0x03, 0x93, 0xe9, 0x52, 0x6f, 0xf4, 0x6f, 0xd2, 0xc6, 0xe0, 0xeb, 0x7c, 0x4e, 0x79, 0x12,
+	0x04, 0xd8, 0xed, 0xb2, 0x5e, 0x27, 0x1a, 0x4d, 0x7e, 0xca, 0xa3, 0xc6, 0x9f, 0x91, 0xf1, 0x58,
+	0x1a, 0x8f, 0x07, 0xc6, 0xe3, 0xa3, 0xc6, 0xc9, 0x82, 0x4c, 0xd2, 0xf8, 0x2f, 0x00, 0x00, 0xff,
+	0xff, 0x79, 0x2b, 0x3b, 0x90, 0x4a, 0x0e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1142,77 +1230,3 @@ var _MetricService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/monitoring/v3/metric_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/monitoring/v3/metric_service.proto", fileDescriptor_metric_service_1409540f97d9ae0c)
-}
-
-var fileDescriptor_metric_service_1409540f97d9ae0c = []byte{
-	// 1049 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0xe2, 0x34, 0x71, 0x9e, 0xd5, 0xd4, 0x9d, 0xb6, 0xae, 0xd9, 0x26, 0x95, 0xbb, 0xa8,
-	0xc4, 0x75, 0xcb, 0x6e, 0x65, 0x57, 0x1c, 0x92, 0x26, 0x52, 0xfe, 0x51, 0x2a, 0x02, 0x8a, 0xd6,
-	0x25, 0x87, 0x2a, 0x92, 0xb5, 0xb1, 0xa7, 0xab, 0x01, 0xef, 0xce, 0x32, 0x3b, 0x76, 0x9b, 0xa2,
-	0x70, 0xe0, 0xd0, 0x3b, 0x02, 0x24, 0xf8, 0x0a, 0x39, 0x80, 0xf8, 0x0a, 0x88, 0x13, 0x57, 0xce,
-	0xdc, 0xf8, 0x0a, 0xdc, 0xd1, 0xce, 0xee, 0xc6, 0xf6, 0x7a, 0x77, 0x6d, 0x73, 0xe9, 0xcd, 0x3b,
-	0xef, 0xcd, 0x7b, 0xbf, 0xf7, 0x9b, 0x79, 0xef, 0x37, 0x86, 0x7b, 0x16, 0x63, 0x56, 0x97, 0xe8,
-	0x36, 0x73, 0xa8, 0x60, 0x9c, 0x3a, 0x96, 0xde, 0x6f, 0xe8, 0x36, 0x11, 0x9c, 0xb6, 0x5b, 0x1e,
-	0xe1, 0x7d, 0xda, 0x26, 0x9a, 0xcb, 0x99, 0x60, 0xf8, 0x7a, 0xe0, 0xaa, 0x0d, 0x5c, 0xb5, 0x7e,
-	0x43, 0x59, 0x09, 0x03, 0x98, 0x2e, 0xd5, 0x4d, 0xc7, 0x61, 0xc2, 0x14, 0x94, 0x39, 0x5e, 0xb0,
-	0x47, 0xb9, 0x39, 0x64, 0x0d, 0x82, 0x86, 0x86, 0xf7, 0x86, 0x0d, 0x41, 0x40, 0xd2, 0x69, 0x71,
-	0xe2, 0xb1, 0x1e, 0x8f, 0x32, 0x2a, 0x77, 0x12, 0xc1, 0xb5, 0x99, 0x6d, 0x33, 0x27, 0xd3, 0x65,
-	0x24, 0xd5, 0xed, 0xd0, 0x45, 0x7e, 0x9d, 0xf4, 0x5e, 0xe8, 0x9d, 0x1e, 0x97, 0x20, 0x43, 0xfb,
-	0xad, 0xb8, 0x9d, 0xd8, 0xae, 0x38, 0x8d, 0x15, 0xc0, 0xdd, 0xb6, 0xee, 0x09, 0x53, 0xf4, 0xc2,
-	0xca, 0xd4, 0xef, 0x10, 0xac, 0x1d, 0x50, 0x4f, 0x7c, 0x1a, 0x81, 0x37, 0x42, 0xec, 0x7b, 0xc4,
-	0x6b, 0x73, 0xea, 0x0a, 0xc6, 0x3d, 0x83, 0x7c, 0xd5, 0x23, 0x9e, 0xc0, 0x18, 0xe6, 0x1d, 0xd3,
-	0x26, 0xe5, 0x4b, 0x15, 0x54, 0x5d, 0x32, 0xe4, 0x6f, 0x5c, 0x82, 0x85, 0x17, 0xb4, 0x2b, 0x08,
-	0x2f, 0xcf, 0xc9, 0xd5, 0xf0, 0x0b, 0xdf, 0x82, 0x25, 0xd7, 0xb4, 0x48, 0xcb, 0xa3, 0xaf, 0x49,
-	0x39, 0x57, 0x41, 0xd5, 0x4b, 0x46, 0xde, 0x5f, 0x68, 0xd2, 0xd7, 0x04, 0xaf, 0x02, 0x48, 0xa3,
-	0x60, 0x5f, 0x12, 0xa7, 0x3c, 0x2f, 0x37, 0x4a, 0xf7, 0x67, 0xfe, 0x82, 0xfa, 0x0b, 0x82, 0xea,
-	0x64, 0x4c, 0x9e, 0xcb, 0x1c, 0x8f, 0xe0, 0xe7, 0x70, 0x3d, 0xa2, 0xbb, 0xd5, 0x19, 0xd8, 0xcb,
-	0xa8, 0x92, 0xab, 0x16, 0xea, 0x6b, 0x5a, 0x78, 0xda, 0xa6, 0x4b, 0xb5, 0x8c, 0x78, 0xc6, 0x35,
-	0x3e, 0x9e, 0x03, 0xbf, 0x0f, 0x57, 0x1c, 0xf2, 0x4a, 0xb4, 0x86, 0xc0, 0x06, 0x55, 0x5e, 0xf6,
-	0x97, 0x0f, 0x2f, 0x00, 0x6f, 0xc0, 0xdd, 0x27, 0x24, 0x0b, 0x6e, 0x9c, 0xc1, 0xdc, 0x80, 0x41,
-	0xf5, 0x0d, 0x82, 0x15, 0x59, 0xad, 0x3c, 0xec, 0xb7, 0x48, 0xfb, 0x0f, 0x08, 0x56, 0x53, 0x80,
-	0x84, 0x5c, 0x7f, 0x02, 0x38, 0x6c, 0xa9, 0x71, 0xa6, 0x57, 0x46, 0x98, 0x8e, 0x85, 0x30, 0xae,
-	0xda, 0xf1, 0xa0, 0x53, 0x93, 0xfb, 0x10, 0x14, 0x9f, 0xdc, 0x78, 0xc4, 0x0c, 0x46, 0xbf, 0x81,
-	0xd5, 0x5d, 0x4e, 0x4c, 0x41, 0x66, 0xd8, 0x84, 0x9f, 0xc2, 0xd5, 0xb1, 0xda, 0x24, 0xa0, 0x49,
-	0xa5, 0x15, 0xe3, 0xa5, 0xa9, 0x0d, 0x58, 0xdd, 0x23, 0x5d, 0x32, 0x53, 0x7e, 0xf5, 0xa7, 0x1c,
-	0xdc, 0xf0, 0xd9, 0x7f, 0x46, 0x6d, 0xd2, 0x24, 0x9c, 0x92, 0xb1, 0xf3, 0x87, 0x29, 0xce, 0x7f,
-	0x0b, 0xf2, 0xd4, 0x11, 0x84, 0xf7, 0xcd, 0xae, 0x3c, 0xe0, 0x42, 0x5d, 0xd5, 0x92, 0xe6, 0x9d,
-	0xe6, 0xa7, 0x79, 0x1a, 0x7a, 0x1a, 0x17, 0x7b, 0xf0, 0x2e, 0x14, 0x4c, 0xcb, 0xe2, 0xc4, 0x92,
-	0x93, 0x45, 0x5e, 0xb9, 0x42, 0xfd, 0x4e, 0x72, 0x88, 0xed, 0x81, 0xa3, 0x31, 0xbc, 0x0b, 0xbf,
-	0x0b, 0x79, 0xc6, 0x3b, 0x84, 0xb7, 0x4e, 0x4e, 0xcb, 0x0b, 0x12, 0xde, 0xa2, 0xfc, 0xde, 0x39,
-	0xc5, 0x9f, 0xc1, 0x7c, 0x9f, 0x92, 0x97, 0xe5, 0xc5, 0x0a, 0xaa, 0x2e, 0xd7, 0xd7, 0x93, 0x03,
-	0x27, 0xd2, 0xa0, 0x0d, 0x56, 0x8e, 0x28, 0x79, 0x69, 0xc8, 0x38, 0xa3, 0xf7, 0x3d, 0x9f, 0x79,
-	0xdf, 0x97, 0xe2, 0xf7, 0x7d, 0x0d, 0x96, 0x47, 0x63, 0xe2, 0x3c, 0xcc, 0x7f, 0xf4, 0xf9, 0xc1,
-	0x41, 0xf1, 0x1d, 0x5c, 0x80, 0xc5, 0x8f, 0xf7, 0xb7, 0xf7, 0xf6, 0x8d, 0x66, 0x11, 0xa9, 0xbf,
-	0x23, 0x28, 0xc5, 0x31, 0x85, 0x1d, 0xb1, 0x0d, 0x05, 0x41, 0x6d, 0xe2, 0x4b, 0x0c, 0x25, 0x51,
-	0x2b, 0x54, 0xd2, 0x29, 0x0f, 0xb7, 0x83, 0xb8, 0xf8, 0x3d, 0x6d, 0x1f, 0xe0, 0x4d, 0x28, 0x92,
-	0x57, 0xa4, 0xdd, 0xf3, 0x29, 0x6e, 0x11, 0xce, 0xfd, 0xd6, 0xcb, 0xc9, 0x7c, 0x38, 0xca, 0xc7,
-	0xdd, 0xb6, 0xd6, 0x94, 0xd3, 0xdd, 0xb8, 0x72, 0xe1, 0xbb, 0x2f, 0x5d, 0x55, 0x17, 0x6e, 0x06,
-	0x4d, 0x91, 0x7e, 0xc1, 0x86, 0xdb, 0x21, 0x56, 0xd8, 0xdc, 0xec, 0x85, 0xf9, 0x83, 0xed, 0x46,
-	0x3c, 0xa5, 0x04, 0x33, 0xce, 0x1a, 0x9a, 0x99, 0xb5, 0x1a, 0x2c, 0x04, 0x3a, 0x16, 0xf6, 0x68,
-	0x12, 0x07, 0xa1, 0x47, 0xfd, 0x5f, 0x80, 0xcb, 0x41, 0x2b, 0x36, 0x83, 0x97, 0x00, 0xfe, 0x1b,
-	0x41, 0x65, 0x92, 0xc2, 0xe0, 0xcd, 0xf4, 0xdb, 0x39, 0x85, 0x5a, 0x2a, 0x5b, 0xff, 0x77, 0x7b,
-	0x70, 0xb5, 0xd4, 0xf5, 0x6f, 0xff, 0xfa, 0xe7, 0xfb, 0xb9, 0x47, 0xb8, 0xee, 0xbf, 0x04, 0xbe,
-	0xf6, 0x0f, 0x65, 0xd3, 0xe5, 0xec, 0x0b, 0xd2, 0x16, 0x9e, 0x5e, 0x3b, 0x1b, 0xbc, 0x36, 0x92,
-	0xa0, 0xff, 0x81, 0xe0, 0x76, 0xb6, 0x22, 0xe1, 0x8d, 0x64, 0x78, 0x53, 0xe9, 0x98, 0x32, 0xad,
-	0xac, 0xaa, 0x8f, 0x65, 0x11, 0x1f, 0xe2, 0x47, 0x49, 0x45, 0x64, 0xd6, 0xa0, 0xd7, 0xce, 0xf0,
-	0x6f, 0x28, 0x98, 0x89, 0x63, 0x8a, 0x84, 0xeb, 0x19, 0xe4, 0xa6, 0xe8, 0xa8, 0xd2, 0x98, 0x69,
-	0x4f, 0x78, 0x0a, 0xba, 0x2c, 0xe0, 0x1e, 0x5e, 0x4b, 0x39, 0x85, 0x31, 0x64, 0x3f, 0x23, 0xb8,
-	0x96, 0xa0, 0x57, 0xf8, 0x61, 0x3a, 0xdf, 0xc9, 0x2a, 0xa1, 0x64, 0xca, 0x8e, 0x5a, 0x97, 0xc0,
-	0x1e, 0xe0, 0x5a, 0x32, 0xb3, 0x71, 0x5c, 0x7a, 0xad, 0x76, 0x86, 0x7f, 0x45, 0x50, 0x4a, 0x56,
-	0x46, 0x9c, 0x42, 0x4e, 0xa6, 0x8e, 0x4e, 0x40, 0xb8, 0x23, 0x11, 0x3e, 0x56, 0xa7, 0xa5, 0x6e,
-	0x7d, 0x5c, 0x80, 0x7d, 0x36, 0x4b, 0xc9, 0x5a, 0x9a, 0x86, 0x38, 0x53, 0x79, 0x95, 0x52, 0xb4,
-	0x29, 0x7a, 0x25, 0x6b, 0xfb, 0xfe, 0x2b, 0x39, 0x62, 0xb3, 0x36, 0x0b, 0x9b, 0x3f, 0x22, 0x58,
-	0x1e, 0x95, 0x05, 0x7c, 0x7f, 0x06, 0x41, 0x53, 0x1e, 0x4c, 0xe7, 0x1c, 0x5e, 0xc4, 0xaa, 0x44,
-	0xa8, 0xe2, 0x4a, 0x32, 0x9b, 0x43, 0xa3, 0xf1, 0x0d, 0x82, 0x62, 0x7c, 0xee, 0xe2, 0x0f, 0xb2,
-	0xce, 0x77, 0x1c, 0x5b, 0x1a, 0x4f, 0xf7, 0x25, 0x8a, 0xbb, 0xea, 0x44, 0x14, 0xeb, 0xa8, 0xb6,
-	0x73, 0x8e, 0xa0, 0xdc, 0x66, 0x76, 0x62, 0xe6, 0x1d, 0x3c, 0x32, 0x91, 0x0f, 0xfd, 0x34, 0x87,
-	0xe8, 0xf9, 0x56, 0xe8, 0x6b, 0xb1, 0xae, 0xe9, 0x58, 0x1a, 0xe3, 0x96, 0x6e, 0x11, 0x47, 0x82,
-	0xd0, 0x03, 0x93, 0xe9, 0x52, 0x6f, 0xf4, 0x6f, 0xd2, 0xc6, 0xe0, 0xeb, 0x7c, 0x4e, 0x79, 0x12,
-	0x04, 0xd8, 0xed, 0xb2, 0x5e, 0x27, 0x1a, 0x4d, 0x7e, 0xca, 0xa3, 0xc6, 0x9f, 0x91, 0xf1, 0x58,
-	0x1a, 0x8f, 0x07, 0xc6, 0xe3, 0xa3, 0xc6, 0xc9, 0x82, 0x4c, 0xd2, 0xf8, 0x2f, 0x00, 0x00, 0xff,
-	0xff, 0x79, 0x2b, 0x3b, 0x90, 0x4a, 0x0e, 0x00, 0x00,
-}
diff --git a/googleapis/monitoring/v3/mutation_record.pb.go b/googleapis/monitoring/v3/mutation_record.pb.go
index a8885a5051..95c3fd93b0 100644
--- a/googleapis/monitoring/v3/mutation_record.pb.go
+++ b/googleapis/monitoring/v3/mutation_record.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/mutation_record.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes a change made to a configuration.
 type MutationRecord struct {
@@ -34,16 +37,17 @@ func (m *MutationRecord) Reset()         { *m = MutationRecord{} }
 func (m *MutationRecord) String() string { return proto.CompactTextString(m) }
 func (*MutationRecord) ProtoMessage()    {}
 func (*MutationRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutation_record_909f578c988d9451, []int{0}
+	return fileDescriptor_83c24e690bdb9101, []int{0}
 }
+
 func (m *MutationRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MutationRecord.Unmarshal(m, b)
 }
 func (m *MutationRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MutationRecord.Marshal(b, m, deterministic)
 }
-func (dst *MutationRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MutationRecord.Merge(dst, src)
+func (m *MutationRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutationRecord.Merge(m, src)
 }
 func (m *MutationRecord) XXX_Size() int {
 	return xxx_messageInfo_MutationRecord.Size(m)
@@ -73,10 +77,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/monitoring/v3/mutation_record.proto", fileDescriptor_mutation_record_909f578c988d9451)
+	proto.RegisterFile("google/monitoring/v3/mutation_record.proto", fileDescriptor_83c24e690bdb9101)
 }
 
-var fileDescriptor_mutation_record_909f578c988d9451 = []byte{
+var fileDescriptor_83c24e690bdb9101 = []byte{
 	// 251 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33,
diff --git a/googleapis/monitoring/v3/notification.pb.go b/googleapis/monitoring/v3/notification.pb.go
index e9460c4422..d0a29667ae 100644
--- a/googleapis/monitoring/v3/notification.pb.go
+++ b/googleapis/monitoring/v3/notification.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/notification.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import label "google.golang.org/genproto/googleapis/api/label"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	label "google.golang.org/genproto/googleapis/api/label"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates whether the channel has been verified or not. It is illegal
 // to specify this field in a
@@ -50,6 +53,7 @@ var NotificationChannel_VerificationStatus_name = map[int32]string{
 	1: "UNVERIFIED",
 	2: "VERIFIED",
 }
+
 var NotificationChannel_VerificationStatus_value = map[string]int32{
 	"VERIFICATION_STATUS_UNSPECIFIED": 0,
 	"UNVERIFIED":                      1,
@@ -59,8 +63,9 @@ var NotificationChannel_VerificationStatus_value = map[string]int32{
 func (x NotificationChannel_VerificationStatus) String() string {
 	return proto.EnumName(NotificationChannel_VerificationStatus_name, int32(x))
 }
+
 func (NotificationChannel_VerificationStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_notification_bcd7cd313cd7d38f, []int{1, 0}
+	return fileDescriptor_4399f1e4bc1a75ef, []int{1, 0}
 }
 
 // A description of a notification channel. The descriptor includes
@@ -99,16 +104,17 @@ func (m *NotificationChannelDescriptor) Reset()         { *m = NotificationChann
 func (m *NotificationChannelDescriptor) String() string { return proto.CompactTextString(m) }
 func (*NotificationChannelDescriptor) ProtoMessage()    {}
 func (*NotificationChannelDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_bcd7cd313cd7d38f, []int{0}
+	return fileDescriptor_4399f1e4bc1a75ef, []int{0}
 }
+
 func (m *NotificationChannelDescriptor) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NotificationChannelDescriptor.Unmarshal(m, b)
 }
 func (m *NotificationChannelDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NotificationChannelDescriptor.Marshal(b, m, deterministic)
 }
-func (dst *NotificationChannelDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NotificationChannelDescriptor.Merge(dst, src)
+func (m *NotificationChannelDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NotificationChannelDescriptor.Merge(m, src)
 }
 func (m *NotificationChannelDescriptor) XXX_Size() int {
 	return xxx_messageInfo_NotificationChannelDescriptor.Size(m)
@@ -239,16 +245,17 @@ func (m *NotificationChannel) Reset()         { *m = NotificationChannel{} }
 func (m *NotificationChannel) String() string { return proto.CompactTextString(m) }
 func (*NotificationChannel) ProtoMessage()    {}
 func (*NotificationChannel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_bcd7cd313cd7d38f, []int{1}
+	return fileDescriptor_4399f1e4bc1a75ef, []int{1}
 }
+
 func (m *NotificationChannel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NotificationChannel.Unmarshal(m, b)
 }
 func (m *NotificationChannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NotificationChannel.Marshal(b, m, deterministic)
 }
-func (dst *NotificationChannel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NotificationChannel.Merge(dst, src)
+func (m *NotificationChannel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NotificationChannel.Merge(m, src)
 }
 func (m *NotificationChannel) XXX_Size() int {
 	return xxx_messageInfo_NotificationChannel.Size(m)
@@ -316,18 +323,18 @@ func (m *NotificationChannel) GetEnabled() *wrappers.BoolValue {
 }
 
 func init() {
+	proto.RegisterEnum("google.monitoring.v3.NotificationChannel_VerificationStatus", NotificationChannel_VerificationStatus_name, NotificationChannel_VerificationStatus_value)
 	proto.RegisterType((*NotificationChannelDescriptor)(nil), "google.monitoring.v3.NotificationChannelDescriptor")
 	proto.RegisterType((*NotificationChannel)(nil), "google.monitoring.v3.NotificationChannel")
 	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.NotificationChannel.LabelsEntry")
 	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.NotificationChannel.UserLabelsEntry")
-	proto.RegisterEnum("google.monitoring.v3.NotificationChannel_VerificationStatus", NotificationChannel_VerificationStatus_name, NotificationChannel_VerificationStatus_value)
 }
 
 func init() {
-	proto.RegisterFile("google/monitoring/v3/notification.proto", fileDescriptor_notification_bcd7cd313cd7d38f)
+	proto.RegisterFile("google/monitoring/v3/notification.proto", fileDescriptor_4399f1e4bc1a75ef)
 }
 
-var fileDescriptor_notification_bcd7cd313cd7d38f = []byte{
+var fileDescriptor_4399f1e4bc1a75ef = []byte{
 	// 602 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x6d, 0x6b, 0xdb, 0x3c,
 	0x14, 0x7d, 0x9c, 0x34, 0x7d, 0x5a, 0xb9, 0xa4, 0x9d, 0x5a, 0x86, 0xf1, 0xde, 0xd2, 0xee, 0xc3,
diff --git a/googleapis/monitoring/v3/notification_service.pb.go b/googleapis/monitoring/v3/notification_service.pb.go
index 58b8b97583..9914932323 100644
--- a/googleapis/monitoring/v3/notification_service.pb.go
+++ b/googleapis/monitoring/v3/notification_service.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/notification_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package monitoring
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The `ListNotificationChannelDescriptors` request.
 type ListNotificationChannelDescriptorsRequest struct {
@@ -59,16 +59,17 @@ func (m *ListNotificationChannelDescriptorsRequest) Reset() {
 func (m *ListNotificationChannelDescriptorsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNotificationChannelDescriptorsRequest) ProtoMessage()    {}
 func (*ListNotificationChannelDescriptorsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{0}
+	return fileDescriptor_7e2bcd7194b305fe, []int{0}
 }
+
 func (m *ListNotificationChannelDescriptorsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Unmarshal(m, b)
 }
 func (m *ListNotificationChannelDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNotificationChannelDescriptorsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Merge(dst, src)
+func (m *ListNotificationChannelDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Merge(m, src)
 }
 func (m *ListNotificationChannelDescriptorsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Size(m)
@@ -123,16 +124,17 @@ func (m *ListNotificationChannelDescriptorsResponse) String() string {
 }
 func (*ListNotificationChannelDescriptorsResponse) ProtoMessage() {}
 func (*ListNotificationChannelDescriptorsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{1}
+	return fileDescriptor_7e2bcd7194b305fe, []int{1}
 }
+
 func (m *ListNotificationChannelDescriptorsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Unmarshal(m, b)
 }
 func (m *ListNotificationChannelDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNotificationChannelDescriptorsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Merge(dst, src)
+func (m *ListNotificationChannelDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Merge(m, src)
 }
 func (m *ListNotificationChannelDescriptorsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Size(m)
@@ -173,16 +175,17 @@ func (m *GetNotificationChannelDescriptorRequest) Reset() {
 func (m *GetNotificationChannelDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetNotificationChannelDescriptorRequest) ProtoMessage()    {}
 func (*GetNotificationChannelDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{2}
+	return fileDescriptor_7e2bcd7194b305fe, []int{2}
 }
+
 func (m *GetNotificationChannelDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Unmarshal(m, b)
 }
 func (m *GetNotificationChannelDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNotificationChannelDescriptorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNotificationChannelDescriptorRequest.Merge(dst, src)
+func (m *GetNotificationChannelDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelDescriptorRequest.Merge(m, src)
 }
 func (m *GetNotificationChannelDescriptorRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Size(m)
@@ -222,16 +225,17 @@ func (m *CreateNotificationChannelRequest) Reset()         { *m = CreateNotifica
 func (m *CreateNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateNotificationChannelRequest) ProtoMessage()    {}
 func (*CreateNotificationChannelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{3}
+	return fileDescriptor_7e2bcd7194b305fe, []int{3}
 }
+
 func (m *CreateNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateNotificationChannelRequest.Unmarshal(m, b)
 }
 func (m *CreateNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateNotificationChannelRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateNotificationChannelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateNotificationChannelRequest.Merge(dst, src)
+func (m *CreateNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNotificationChannelRequest.Merge(m, src)
 }
 func (m *CreateNotificationChannelRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateNotificationChannelRequest.Size(m)
@@ -296,16 +300,17 @@ func (m *ListNotificationChannelsRequest) Reset()         { *m = ListNotificatio
 func (m *ListNotificationChannelsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListNotificationChannelsRequest) ProtoMessage()    {}
 func (*ListNotificationChannelsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{4}
+	return fileDescriptor_7e2bcd7194b305fe, []int{4}
 }
+
 func (m *ListNotificationChannelsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotificationChannelsRequest.Unmarshal(m, b)
 }
 func (m *ListNotificationChannelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotificationChannelsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListNotificationChannelsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotificationChannelsRequest.Merge(dst, src)
+func (m *ListNotificationChannelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelsRequest.Merge(m, src)
 }
 func (m *ListNotificationChannelsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListNotificationChannelsRequest.Size(m)
@@ -369,16 +374,17 @@ func (m *ListNotificationChannelsResponse) Reset()         { *m = ListNotificati
 func (m *ListNotificationChannelsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListNotificationChannelsResponse) ProtoMessage()    {}
 func (*ListNotificationChannelsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{5}
+	return fileDescriptor_7e2bcd7194b305fe, []int{5}
 }
+
 func (m *ListNotificationChannelsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListNotificationChannelsResponse.Unmarshal(m, b)
 }
 func (m *ListNotificationChannelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListNotificationChannelsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListNotificationChannelsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListNotificationChannelsResponse.Merge(dst, src)
+func (m *ListNotificationChannelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelsResponse.Merge(m, src)
 }
 func (m *ListNotificationChannelsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListNotificationChannelsResponse.Size(m)
@@ -417,16 +423,17 @@ func (m *GetNotificationChannelRequest) Reset()         { *m = GetNotificationCh
 func (m *GetNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
 func (*GetNotificationChannelRequest) ProtoMessage()    {}
 func (*GetNotificationChannelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{6}
+	return fileDescriptor_7e2bcd7194b305fe, []int{6}
 }
+
 func (m *GetNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNotificationChannelRequest.Unmarshal(m, b)
 }
 func (m *GetNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNotificationChannelRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNotificationChannelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNotificationChannelRequest.Merge(dst, src)
+func (m *GetNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelRequest.Merge(m, src)
 }
 func (m *GetNotificationChannelRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNotificationChannelRequest.Size(m)
@@ -462,16 +469,17 @@ func (m *UpdateNotificationChannelRequest) Reset()         { *m = UpdateNotifica
 func (m *UpdateNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateNotificationChannelRequest) ProtoMessage()    {}
 func (*UpdateNotificationChannelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{7}
+	return fileDescriptor_7e2bcd7194b305fe, []int{7}
 }
+
 func (m *UpdateNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateNotificationChannelRequest.Unmarshal(m, b)
 }
 func (m *UpdateNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateNotificationChannelRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateNotificationChannelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateNotificationChannelRequest.Merge(dst, src)
+func (m *UpdateNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNotificationChannelRequest.Merge(m, src)
 }
 func (m *UpdateNotificationChannelRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateNotificationChannelRequest.Size(m)
@@ -515,16 +523,17 @@ func (m *DeleteNotificationChannelRequest) Reset()         { *m = DeleteNotifica
 func (m *DeleteNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteNotificationChannelRequest) ProtoMessage()    {}
 func (*DeleteNotificationChannelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{8}
+	return fileDescriptor_7e2bcd7194b305fe, []int{8}
 }
+
 func (m *DeleteNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteNotificationChannelRequest.Unmarshal(m, b)
 }
 func (m *DeleteNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteNotificationChannelRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteNotificationChannelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteNotificationChannelRequest.Merge(dst, src)
+func (m *DeleteNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNotificationChannelRequest.Merge(m, src)
 }
 func (m *DeleteNotificationChannelRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteNotificationChannelRequest.Size(m)
@@ -566,16 +575,17 @@ func (m *SendNotificationChannelVerificationCodeRequest) String() string {
 }
 func (*SendNotificationChannelVerificationCodeRequest) ProtoMessage() {}
 func (*SendNotificationChannelVerificationCodeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{9}
+	return fileDescriptor_7e2bcd7194b305fe, []int{9}
 }
+
 func (m *SendNotificationChannelVerificationCodeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Unmarshal(m, b)
 }
 func (m *SendNotificationChannelVerificationCodeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Marshal(b, m, deterministic)
 }
-func (dst *SendNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Merge(dst, src)
+func (m *SendNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Merge(m, src)
 }
 func (m *SendNotificationChannelVerificationCodeRequest) XXX_Size() int {
 	return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Size(m)
@@ -622,16 +632,17 @@ func (m *GetNotificationChannelVerificationCodeRequest) String() string {
 }
 func (*GetNotificationChannelVerificationCodeRequest) ProtoMessage() {}
 func (*GetNotificationChannelVerificationCodeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{10}
+	return fileDescriptor_7e2bcd7194b305fe, []int{10}
 }
+
 func (m *GetNotificationChannelVerificationCodeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Unmarshal(m, b)
 }
 func (m *GetNotificationChannelVerificationCodeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Merge(dst, src)
+func (m *GetNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Merge(m, src)
 }
 func (m *GetNotificationChannelVerificationCodeRequest) XXX_Size() int {
 	return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Size(m)
@@ -680,16 +691,17 @@ func (m *GetNotificationChannelVerificationCodeResponse) String() string {
 }
 func (*GetNotificationChannelVerificationCodeResponse) ProtoMessage() {}
 func (*GetNotificationChannelVerificationCodeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{11}
+	return fileDescriptor_7e2bcd7194b305fe, []int{11}
 }
+
 func (m *GetNotificationChannelVerificationCodeResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Unmarshal(m, b)
 }
 func (m *GetNotificationChannelVerificationCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetNotificationChannelVerificationCodeResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Merge(dst, src)
+func (m *GetNotificationChannelVerificationCodeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Merge(m, src)
 }
 func (m *GetNotificationChannelVerificationCodeResponse) XXX_Size() int {
 	return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Size(m)
@@ -735,16 +747,17 @@ func (m *VerifyNotificationChannelRequest) Reset()         { *m = VerifyNotifica
 func (m *VerifyNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
 func (*VerifyNotificationChannelRequest) ProtoMessage()    {}
 func (*VerifyNotificationChannelRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_notification_service_82acdfb78337ea2a, []int{12}
+	return fileDescriptor_7e2bcd7194b305fe, []int{12}
 }
+
 func (m *VerifyNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VerifyNotificationChannelRequest.Unmarshal(m, b)
 }
 func (m *VerifyNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VerifyNotificationChannelRequest.Marshal(b, m, deterministic)
 }
-func (dst *VerifyNotificationChannelRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VerifyNotificationChannelRequest.Merge(dst, src)
+func (m *VerifyNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VerifyNotificationChannelRequest.Merge(m, src)
 }
 func (m *VerifyNotificationChannelRequest) XXX_Size() int {
 	return xxx_messageInfo_VerifyNotificationChannelRequest.Size(m)
@@ -785,6 +798,78 @@ func init() {
 	proto.RegisterType((*VerifyNotificationChannelRequest)(nil), "google.monitoring.v3.VerifyNotificationChannelRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/monitoring/v3/notification_service.proto", fileDescriptor_7e2bcd7194b305fe)
+}
+
+var fileDescriptor_7e2bcd7194b305fe = []byte{
+	// 1020 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x41, 0x6f, 0xdc, 0x44,
+	0x14, 0xd6, 0xec, 0x26, 0x69, 0xfa, 0x22, 0x04, 0x9a, 0x86, 0xc8, 0xd9, 0xb6, 0xaa, 0xe5, 0x43,
+	0x93, 0xae, 0x8a, 0x2d, 0xad, 0x4b, 0x84, 0x52, 0x52, 0xda, 0x64, 0xdb, 0x22, 0x48, 0x51, 0xb4,
+	0x29, 0x91, 0x40, 0x11, 0x2b, 0xc7, 0x9e, 0x35, 0x26, 0xbb, 0x33, 0xc6, 0x33, 0x1b, 0x35, 0xad,
+	0x2a, 0x15, 0xfe, 0x02, 0xfc, 0x01, 0x24, 0x4e, 0x3d, 0x20, 0xce, 0xa0, 0x72, 0x46, 0x5c, 0x11,
+	0x5c, 0xb9, 0xc0, 0xff, 0x40, 0x1e, 0xcf, 0x66, 0x37, 0x9b, 0xf1, 0xae, 0xdd, 0xf6, 0xe6, 0x99,
+	0x37, 0xf3, 0xde, 0xf7, 0xbe, 0xf7, 0xf9, 0x3d, 0x1b, 0x9c, 0x90, 0xb1, 0xb0, 0x4b, 0x9c, 0x1e,
+	0xa3, 0x91, 0x60, 0x49, 0x44, 0x43, 0xe7, 0xc8, 0x75, 0x28, 0x13, 0x51, 0x27, 0xf2, 0x3d, 0x11,
+	0x31, 0xda, 0xe6, 0x24, 0x39, 0x8a, 0x7c, 0x62, 0xc7, 0x09, 0x13, 0x0c, 0x2f, 0x66, 0x17, 0xec,
+	0xe1, 0x05, 0xfb, 0xc8, 0xad, 0x5d, 0x52, 0x6e, 0xbc, 0x38, 0x72, 0x3c, 0x4a, 0x99, 0x90, 0x57,
+	0x79, 0x76, 0xa7, 0xb6, 0x32, 0x35, 0x88, 0x3a, 0x78, 0x51, 0x1d, 0x94, 0xab, 0x83, 0x7e, 0xc7,
+	0x21, 0xbd, 0x58, 0x1c, 0x2b, 0xa3, 0x39, 0x6e, 0xec, 0x44, 0xa4, 0x1b, 0xb4, 0x7b, 0x1e, 0x3f,
+	0x54, 0x27, 0x2e, 0x8d, 0x9f, 0xe0, 0x22, 0xe9, 0xfb, 0x42, 0x59, 0xaf, 0x8c, 0x5b, 0x45, 0xd4,
+	0x23, 0x5c, 0x78, 0xbd, 0x38, 0x3b, 0x60, 0x3d, 0x81, 0x6b, 0xdb, 0x11, 0x17, 0x9f, 0x8c, 0xe0,
+	0xda, 0xfa, 0xd2, 0xa3, 0x94, 0x74, 0x9b, 0x84, 0xfb, 0x49, 0x14, 0x0b, 0x96, 0xf0, 0x16, 0xf9,
+	0xba, 0x4f, 0xb8, 0xc0, 0x18, 0x66, 0xa8, 0xd7, 0x23, 0xc6, 0x8c, 0x89, 0x56, 0xcf, 0xb7, 0xe4,
+	0x33, 0xbe, 0x08, 0xe7, 0x63, 0x2f, 0x24, 0x6d, 0x1e, 0x3d, 0x26, 0x46, 0xc5, 0x44, 0xab, 0xb3,
+	0xad, 0xf9, 0x74, 0x63, 0x37, 0x7a, 0x4c, 0xf0, 0x65, 0x00, 0x69, 0x14, 0xec, 0x90, 0x50, 0xa3,
+	0x2a, 0xaf, 0xc9, 0xe3, 0x0f, 0xd3, 0x0d, 0xeb, 0x17, 0x04, 0xf5, 0x22, 0xd1, 0x79, 0xcc, 0x28,
+	0x27, 0x38, 0x80, 0x0b, 0x7e, 0x66, 0x6d, 0x07, 0x43, 0xb3, 0x81, 0xcc, 0xea, 0xea, 0x42, 0xc3,
+	0xb5, 0x75, 0x45, 0xb2, 0x27, 0xba, 0x6e, 0x61, 0xff, 0x4c, 0x34, 0x7c, 0x15, 0xde, 0xa4, 0xe4,
+	0x91, 0x68, 0x8f, 0x00, 0xaf, 0x48, 0xe0, 0x6f, 0xa4, 0xdb, 0x3b, 0x27, 0xe0, 0x37, 0x60, 0xe5,
+	0x3e, 0x99, 0x0c, 0x7d, 0x9c, 0xb7, 0xea, 0x90, 0x37, 0xeb, 0x7b, 0x04, 0xe6, 0x56, 0x42, 0x3c,
+	0x41, 0x34, 0x2e, 0x26, 0x5c, 0xc4, 0xfb, 0xb0, 0x78, 0x4a, 0xaa, 0x2a, 0x05, 0x09, 0x72, 0xa1,
+	0x71, 0xad, 0x30, 0x0d, 0xad, 0x0b, 0xf4, 0xec, 0xa6, 0xf5, 0x23, 0x82, 0x2b, 0x39, 0x25, 0x39,
+	0x23, 0x83, 0xd9, 0x11, 0x54, 0x4b, 0x30, 0xd7, 0x89, 0xba, 0x82, 0x24, 0xc6, 0x9c, 0xdc, 0x55,
+	0x2b, 0xbc, 0x0c, 0xf3, 0x2c, 0x09, 0x48, 0xd2, 0x3e, 0x38, 0x36, 0xce, 0x49, 0xcb, 0x39, 0xb9,
+	0xde, 0x3c, 0x3e, 0xad, 0x9c, 0xea, 0x44, 0xe5, 0xcc, 0x8c, 0x2b, 0xe7, 0x39, 0x02, 0x33, 0x1f,
+	0xa6, 0xd2, 0xcb, 0x17, 0xf0, 0xb6, 0x8e, 0x29, 0x6e, 0x54, 0xa5, 0x62, 0x4a, 0x50, 0xb5, 0xa8,
+	0xa1, 0xaa, 0xb8, 0x52, 0x5c, 0xb8, 0xac, 0x57, 0xca, 0x24, 0x7d, 0xbc, 0x40, 0x60, 0x7e, 0x1a,
+	0x07, 0x93, 0xf5, 0x71, 0x13, 0x16, 0xfa, 0xf2, 0x8c, 0xec, 0x08, 0x4a, 0x02, 0xb5, 0x41, 0x5e,
+	0x83, 0x97, 0xde, 0xbe, 0x97, 0x36, 0x8d, 0x07, 0x1e, 0x3f, 0x6c, 0x41, 0x76, 0x3c, 0x7d, 0xce,
+	0x15, 0x52, 0xf5, 0xb5, 0x08, 0x69, 0x1b, 0xcc, 0x26, 0xe9, 0x92, 0xd2, 0xf2, 0x5e, 0x84, 0xd9,
+	0x0e, 0x4b, 0xfc, 0x4c, 0x5d, 0xf3, 0xad, 0x6c, 0x61, 0x35, 0xc1, 0xde, 0x25, 0x34, 0xd0, 0xf8,
+	0xda, 0x23, 0xc9, 0x70, 0x8b, 0x05, 0x64, 0xdc, 0x37, 0x1a, 0xe1, 0xf4, 0x19, 0x82, 0x77, 0xf4,
+	0x95, 0x28, 0xe1, 0x25, 0x25, 0x9d, 0x3c, 0x8a, 0xa3, 0x84, 0xb4, 0xd3, 0x66, 0x9a, 0x4b, 0xfa,
+	0xc3, 0x41, 0xa7, 0x6d, 0x41, 0x76, 0x3c, 0xdd, 0xb0, 0xbe, 0x41, 0x60, 0x17, 0x85, 0xa0, 0x64,
+	0x8c, 0x61, 0xc6, 0x67, 0xc1, 0x09, 0x86, 0xf4, 0xf9, 0xd5, 0x30, 0x7c, 0x04, 0xa6, 0x0c, 0x76,
+	0x5c, 0xa0, 0x34, 0xa3, 0x89, 0x0f, 0x80, 0x54, 0x86, 0x40, 0x1a, 0xbf, 0xbe, 0x05, 0x35, 0x8d,
+	0x9b, 0xdd, 0x6c, 0x7e, 0xe2, 0xff, 0x10, 0x58, 0xd3, 0x3b, 0x3c, 0xfe, 0x40, 0x2f, 0xb6, 0xc2,
+	0x93, 0xa9, 0x76, 0xfb, 0xe5, 0x1d, 0x64, 0x2c, 0x5b, 0xef, 0x7f, 0xfb, 0xe7, 0xbf, 0xdf, 0x55,
+	0xd6, 0xf0, 0x8d, 0x74, 0x4c, 0x3f, 0x49, 0xf3, 0xdd, 0x88, 0x13, 0xf6, 0x15, 0xf1, 0x05, 0x77,
+	0xea, 0x4f, 0x1d, 0x3a, 0x39, 0x81, 0xbf, 0x11, 0x98, 0xd3, 0xa6, 0x01, 0xde, 0xd0, 0x83, 0x2c,
+	0x38, 0x45, 0x6a, 0x2f, 0x33, 0xe1, 0xac, 0x5b, 0x32, 0xad, 0xf7, 0xf0, 0x9a, 0x2e, 0xad, 0x29,
+	0x59, 0x39, 0xf5, 0xa7, 0xf8, 0x05, 0x02, 0x23, 0xaf, 0xd1, 0xe2, 0x77, 0x4b, 0xb1, 0x7e, 0x52,
+	0xac, 0xb5, 0xb2, 0xd7, 0x54, 0x89, 0x1a, 0x32, 0x97, 0xeb, 0xb8, 0x5e, 0xb8, 0x44, 0x1c, 0xff,
+	0x84, 0x60, 0x49, 0x4f, 0x30, 0x76, 0xcb, 0x94, 0x63, 0x80, 0xbd, 0x78, 0x5b, 0xb4, 0x6e, 0x48,
+	0xb8, 0x36, 0xbe, 0x5e, 0x94, 0x7a, 0x49, 0xf8, 0xef, 0x08, 0x96, 0x73, 0xbf, 0x0b, 0x70, 0x0e,
+	0x75, 0xd3, 0x3e, 0x24, 0xca, 0xc0, 0xfe, 0x50, 0xc2, 0xde, 0xb4, 0x4a, 0xb0, 0xbc, 0xae, 0x1d,
+	0x24, 0xf8, 0x1f, 0x04, 0xcb, 0xb9, 0x23, 0x2c, 0x2f, 0x95, 0x69, 0x33, 0xaf, 0x4c, 0x2a, 0x6d,
+	0x99, 0xca, 0x67, 0x8d, 0x3b, 0x59, 0x2a, 0x1a, 0x8c, 0x76, 0xc1, 0xb2, 0xe4, 0x64, 0xf8, 0x03,
+	0x82, 0xe5, 0xdc, 0x29, 0x97, 0x97, 0xe1, 0xb4, 0xb1, 0x58, 0x5b, 0x3a, 0xd3, 0xc7, 0xef, 0xa6,
+	0xbf, 0x04, 0x03, 0x41, 0xd5, 0xcb, 0x09, 0xea, 0x2f, 0x04, 0x2b, 0x05, 0x67, 0x27, 0x6e, 0xea,
+	0x11, 0x97, 0x1b, 0xbd, 0xb9, 0xf8, 0xb7, 0x25, 0xfe, 0x7b, 0xd6, 0x9d, 0x32, 0xf8, 0xd7, 0x39,
+	0xa1, 0xc1, 0x78, 0xa4, 0x75, 0x54, 0xc7, 0xcf, 0x2a, 0x70, 0xb5, 0xd8, 0x24, 0xc5, 0x5b, 0x65,
+	0xde, 0xf4, 0xbc, 0xac, 0x9a, 0xaf, 0xe6, 0x44, 0xf5, 0xb0, 0x8f, 0x25, 0x07, 0x77, 0xad, 0xdb,
+	0xa5, 0x38, 0x08, 0x89, 0xd0, 0x51, 0xf0, 0x1b, 0x82, 0xe5, 0xdc, 0x49, 0x9e, 0x27, 0xbf, 0x69,
+	0xa3, 0xbf, 0xcc, 0x0b, 0xa6, 0xa6, 0x8b, 0xe5, 0x96, 0xca, 0xe6, 0x48, 0x22, 0x58, 0x47, 0xf5,
+	0xcd, 0x9f, 0x11, 0x18, 0x3e, 0xeb, 0x69, 0x03, 0x6e, 0x1a, 0xa3, 0x11, 0xd5, 0x07, 0xc5, 0x4e,
+	0xaa, 0xa8, 0x1d, 0xf4, 0xf9, 0x2d, 0x75, 0x23, 0x64, 0x5d, 0x8f, 0x86, 0x36, 0x4b, 0x42, 0x27,
+	0x24, 0x54, 0xea, 0x4d, 0xfd, 0xdd, 0x7b, 0x71, 0xc4, 0x4f, 0xff, 0x7c, 0xdf, 0x1c, 0xae, 0x9e,
+	0x57, 0x6a, 0xf7, 0x33, 0x07, 0x5b, 0x5d, 0xd6, 0x0f, 0xec, 0x07, 0xc3, 0xc0, 0x7b, 0xee, 0x1f,
+	0x03, 0xe3, 0xbe, 0x34, 0xee, 0x0f, 0x8d, 0xfb, 0x7b, 0xee, 0xc1, 0x9c, 0x0c, 0xe2, 0xfe, 0x1f,
+	0x00, 0x00, 0xff, 0xff, 0x57, 0x01, 0xd1, 0x1c, 0x45, 0x10, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1235,75 +1320,3 @@ var _NotificationChannelService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/monitoring/v3/notification_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/monitoring/v3/notification_service.proto", fileDescriptor_notification_service_82acdfb78337ea2a)
-}
-
-var fileDescriptor_notification_service_82acdfb78337ea2a = []byte{
-	// 1020 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x41, 0x6f, 0xdc, 0x44,
-	0x14, 0xd6, 0xec, 0x26, 0x69, 0xfa, 0x22, 0x04, 0x9a, 0x86, 0xc8, 0xd9, 0xb6, 0xaa, 0xe5, 0x43,
-	0x93, 0xae, 0x8a, 0x2d, 0xad, 0x4b, 0x84, 0x52, 0x52, 0xda, 0x64, 0xdb, 0x22, 0x48, 0x51, 0xb4,
-	0x29, 0x91, 0x40, 0x11, 0x2b, 0xc7, 0x9e, 0x35, 0x26, 0xbb, 0x33, 0xc6, 0x33, 0x1b, 0x35, 0xad,
-	0x2a, 0x15, 0xfe, 0x02, 0xfc, 0x01, 0x24, 0x4e, 0x3d, 0x20, 0xce, 0xa0, 0x72, 0x46, 0x5c, 0x11,
-	0x5c, 0xb9, 0xc0, 0xff, 0x40, 0x1e, 0xcf, 0x66, 0x37, 0x9b, 0xf1, 0xae, 0xdd, 0xf6, 0xe6, 0x99,
-	0x37, 0xf3, 0xde, 0xf7, 0xbe, 0xf7, 0xf9, 0x3d, 0x1b, 0x9c, 0x90, 0xb1, 0xb0, 0x4b, 0x9c, 0x1e,
-	0xa3, 0x91, 0x60, 0x49, 0x44, 0x43, 0xe7, 0xc8, 0x75, 0x28, 0x13, 0x51, 0x27, 0xf2, 0x3d, 0x11,
-	0x31, 0xda, 0xe6, 0x24, 0x39, 0x8a, 0x7c, 0x62, 0xc7, 0x09, 0x13, 0x0c, 0x2f, 0x66, 0x17, 0xec,
-	0xe1, 0x05, 0xfb, 0xc8, 0xad, 0x5d, 0x52, 0x6e, 0xbc, 0x38, 0x72, 0x3c, 0x4a, 0x99, 0x90, 0x57,
-	0x79, 0x76, 0xa7, 0xb6, 0x32, 0x35, 0x88, 0x3a, 0x78, 0x51, 0x1d, 0x94, 0xab, 0x83, 0x7e, 0xc7,
-	0x21, 0xbd, 0x58, 0x1c, 0x2b, 0xa3, 0x39, 0x6e, 0xec, 0x44, 0xa4, 0x1b, 0xb4, 0x7b, 0x1e, 0x3f,
-	0x54, 0x27, 0x2e, 0x8d, 0x9f, 0xe0, 0x22, 0xe9, 0xfb, 0x42, 0x59, 0xaf, 0x8c, 0x5b, 0x45, 0xd4,
-	0x23, 0x5c, 0x78, 0xbd, 0x38, 0x3b, 0x60, 0x3d, 0x81, 0x6b, 0xdb, 0x11, 0x17, 0x9f, 0x8c, 0xe0,
-	0xda, 0xfa, 0xd2, 0xa3, 0x94, 0x74, 0x9b, 0x84, 0xfb, 0x49, 0x14, 0x0b, 0x96, 0xf0, 0x16, 0xf9,
-	0xba, 0x4f, 0xb8, 0xc0, 0x18, 0x66, 0xa8, 0xd7, 0x23, 0xc6, 0x8c, 0x89, 0x56, 0xcf, 0xb7, 0xe4,
-	0x33, 0xbe, 0x08, 0xe7, 0x63, 0x2f, 0x24, 0x6d, 0x1e, 0x3d, 0x26, 0x46, 0xc5, 0x44, 0xab, 0xb3,
-	0xad, 0xf9, 0x74, 0x63, 0x37, 0x7a, 0x4c, 0xf0, 0x65, 0x00, 0x69, 0x14, 0xec, 0x90, 0x50, 0xa3,
-	0x2a, 0xaf, 0xc9, 0xe3, 0x0f, 0xd3, 0x0d, 0xeb, 0x17, 0x04, 0xf5, 0x22, 0xd1, 0x79, 0xcc, 0x28,
-	0x27, 0x38, 0x80, 0x0b, 0x7e, 0x66, 0x6d, 0x07, 0x43, 0xb3, 0x81, 0xcc, 0xea, 0xea, 0x42, 0xc3,
-	0xb5, 0x75, 0x45, 0xb2, 0x27, 0xba, 0x6e, 0x61, 0xff, 0x4c, 0x34, 0x7c, 0x15, 0xde, 0xa4, 0xe4,
-	0x91, 0x68, 0x8f, 0x00, 0xaf, 0x48, 0xe0, 0x6f, 0xa4, 0xdb, 0x3b, 0x27, 0xe0, 0x37, 0x60, 0xe5,
-	0x3e, 0x99, 0x0c, 0x7d, 0x9c, 0xb7, 0xea, 0x90, 0x37, 0xeb, 0x7b, 0x04, 0xe6, 0x56, 0x42, 0x3c,
-	0x41, 0x34, 0x2e, 0x26, 0x5c, 0xc4, 0xfb, 0xb0, 0x78, 0x4a, 0xaa, 0x2a, 0x05, 0x09, 0x72, 0xa1,
-	0x71, 0xad, 0x30, 0x0d, 0xad, 0x0b, 0xf4, 0xec, 0xa6, 0xf5, 0x23, 0x82, 0x2b, 0x39, 0x25, 0x39,
-	0x23, 0x83, 0xd9, 0x11, 0x54, 0x4b, 0x30, 0xd7, 0x89, 0xba, 0x82, 0x24, 0xc6, 0x9c, 0xdc, 0x55,
-	0x2b, 0xbc, 0x0c, 0xf3, 0x2c, 0x09, 0x48, 0xd2, 0x3e, 0x38, 0x36, 0xce, 0x49, 0xcb, 0x39, 0xb9,
-	0xde, 0x3c, 0x3e, 0xad, 0x9c, 0xea, 0x44, 0xe5, 0xcc, 0x8c, 0x2b, 0xe7, 0x39, 0x02, 0x33, 0x1f,
-	0xa6, 0xd2, 0xcb, 0x17, 0xf0, 0xb6, 0x8e, 0x29, 0x6e, 0x54, 0xa5, 0x62, 0x4a, 0x50, 0xb5, 0xa8,
-	0xa1, 0xaa, 0xb8, 0x52, 0x5c, 0xb8, 0xac, 0x57, 0xca, 0x24, 0x7d, 0xbc, 0x40, 0x60, 0x7e, 0x1a,
-	0x07, 0x93, 0xf5, 0x71, 0x13, 0x16, 0xfa, 0xf2, 0x8c, 0xec, 0x08, 0x4a, 0x02, 0xb5, 0x41, 0x5e,
-	0x83, 0x97, 0xde, 0xbe, 0x97, 0x36, 0x8d, 0x07, 0x1e, 0x3f, 0x6c, 0x41, 0x76, 0x3c, 0x7d, 0xce,
-	0x15, 0x52, 0xf5, 0xb5, 0x08, 0x69, 0x1b, 0xcc, 0x26, 0xe9, 0x92, 0xd2, 0xf2, 0x5e, 0x84, 0xd9,
-	0x0e, 0x4b, 0xfc, 0x4c, 0x5d, 0xf3, 0xad, 0x6c, 0x61, 0x35, 0xc1, 0xde, 0x25, 0x34, 0xd0, 0xf8,
-	0xda, 0x23, 0xc9, 0x70, 0x8b, 0x05, 0x64, 0xdc, 0x37, 0x1a, 0xe1, 0xf4, 0x19, 0x82, 0x77, 0xf4,
-	0x95, 0x28, 0xe1, 0x25, 0x25, 0x9d, 0x3c, 0x8a, 0xa3, 0x84, 0xb4, 0xd3, 0x66, 0x9a, 0x4b, 0xfa,
-	0xc3, 0x41, 0xa7, 0x6d, 0x41, 0x76, 0x3c, 0xdd, 0xb0, 0xbe, 0x41, 0x60, 0x17, 0x85, 0xa0, 0x64,
-	0x8c, 0x61, 0xc6, 0x67, 0xc1, 0x09, 0x86, 0xf4, 0xf9, 0xd5, 0x30, 0x7c, 0x04, 0xa6, 0x0c, 0x76,
-	0x5c, 0xa0, 0x34, 0xa3, 0x89, 0x0f, 0x80, 0x54, 0x86, 0x40, 0x1a, 0xbf, 0xbe, 0x05, 0x35, 0x8d,
-	0x9b, 0xdd, 0x6c, 0x7e, 0xe2, 0xff, 0x10, 0x58, 0xd3, 0x3b, 0x3c, 0xfe, 0x40, 0x2f, 0xb6, 0xc2,
-	0x93, 0xa9, 0x76, 0xfb, 0xe5, 0x1d, 0x64, 0x2c, 0x5b, 0xef, 0x7f, 0xfb, 0xe7, 0xbf, 0xdf, 0x55,
-	0xd6, 0xf0, 0x8d, 0x74, 0x4c, 0x3f, 0x49, 0xf3, 0xdd, 0x88, 0x13, 0xf6, 0x15, 0xf1, 0x05, 0x77,
-	0xea, 0x4f, 0x1d, 0x3a, 0x39, 0x81, 0xbf, 0x11, 0x98, 0xd3, 0xa6, 0x01, 0xde, 0xd0, 0x83, 0x2c,
-	0x38, 0x45, 0x6a, 0x2f, 0x33, 0xe1, 0xac, 0x5b, 0x32, 0xad, 0xf7, 0xf0, 0x9a, 0x2e, 0xad, 0x29,
-	0x59, 0x39, 0xf5, 0xa7, 0xf8, 0x05, 0x02, 0x23, 0xaf, 0xd1, 0xe2, 0x77, 0x4b, 0xb1, 0x7e, 0x52,
-	0xac, 0xb5, 0xb2, 0xd7, 0x54, 0x89, 0x1a, 0x32, 0x97, 0xeb, 0xb8, 0x5e, 0xb8, 0x44, 0x1c, 0xff,
-	0x84, 0x60, 0x49, 0x4f, 0x30, 0x76, 0xcb, 0x94, 0x63, 0x80, 0xbd, 0x78, 0x5b, 0xb4, 0x6e, 0x48,
-	0xb8, 0x36, 0xbe, 0x5e, 0x94, 0x7a, 0x49, 0xf8, 0xef, 0x08, 0x96, 0x73, 0xbf, 0x0b, 0x70, 0x0e,
-	0x75, 0xd3, 0x3e, 0x24, 0xca, 0xc0, 0xfe, 0x50, 0xc2, 0xde, 0xb4, 0x4a, 0xb0, 0xbc, 0xae, 0x1d,
-	0x24, 0xf8, 0x1f, 0x04, 0xcb, 0xb9, 0x23, 0x2c, 0x2f, 0x95, 0x69, 0x33, 0xaf, 0x4c, 0x2a, 0x6d,
-	0x99, 0xca, 0x67, 0x8d, 0x3b, 0x59, 0x2a, 0x1a, 0x8c, 0x76, 0xc1, 0xb2, 0xe4, 0x64, 0xf8, 0x03,
-	0x82, 0xe5, 0xdc, 0x29, 0x97, 0x97, 0xe1, 0xb4, 0xb1, 0x58, 0x5b, 0x3a, 0xd3, 0xc7, 0xef, 0xa6,
-	0xbf, 0x04, 0x03, 0x41, 0xd5, 0xcb, 0x09, 0xea, 0x2f, 0x04, 0x2b, 0x05, 0x67, 0x27, 0x6e, 0xea,
-	0x11, 0x97, 0x1b, 0xbd, 0xb9, 0xf8, 0xb7, 0x25, 0xfe, 0x7b, 0xd6, 0x9d, 0x32, 0xf8, 0xd7, 0x39,
-	0xa1, 0xc1, 0x78, 0xa4, 0x75, 0x54, 0xc7, 0xcf, 0x2a, 0x70, 0xb5, 0xd8, 0x24, 0xc5, 0x5b, 0x65,
-	0xde, 0xf4, 0xbc, 0xac, 0x9a, 0xaf, 0xe6, 0x44, 0xf5, 0xb0, 0x8f, 0x25, 0x07, 0x77, 0xad, 0xdb,
-	0xa5, 0x38, 0x08, 0x89, 0xd0, 0x51, 0xf0, 0x1b, 0x82, 0xe5, 0xdc, 0x49, 0x9e, 0x27, 0xbf, 0x69,
-	0xa3, 0xbf, 0xcc, 0x0b, 0xa6, 0xa6, 0x8b, 0xe5, 0x96, 0xca, 0xe6, 0x48, 0x22, 0x58, 0x47, 0xf5,
-	0xcd, 0x9f, 0x11, 0x18, 0x3e, 0xeb, 0x69, 0x03, 0x6e, 0x1a, 0xa3, 0x11, 0xd5, 0x07, 0xc5, 0x4e,
-	0xaa, 0xa8, 0x1d, 0xf4, 0xf9, 0x2d, 0x75, 0x23, 0x64, 0x5d, 0x8f, 0x86, 0x36, 0x4b, 0x42, 0x27,
-	0x24, 0x54, 0xea, 0x4d, 0xfd, 0xdd, 0x7b, 0x71, 0xc4, 0x4f, 0xff, 0x7c, 0xdf, 0x1c, 0xae, 0x9e,
-	0x57, 0x6a, 0xf7, 0x33, 0x07, 0x5b, 0x5d, 0xd6, 0x0f, 0xec, 0x07, 0xc3, 0xc0, 0x7b, 0xee, 0x1f,
-	0x03, 0xe3, 0xbe, 0x34, 0xee, 0x0f, 0x8d, 0xfb, 0x7b, 0xee, 0xc1, 0x9c, 0x0c, 0xe2, 0xfe, 0x1f,
-	0x00, 0x00, 0xff, 0xff, 0x57, 0x01, 0xd1, 0x1c, 0x45, 0x10, 0x00, 0x00,
-}
diff --git a/googleapis/monitoring/v3/span_context.pb.go b/googleapis/monitoring/v3/span_context.pb.go
index 68740c9bfb..8ba8246b2e 100644
--- a/googleapis/monitoring/v3/span_context.pb.go
+++ b/googleapis/monitoring/v3/span_context.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/span_context.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The context of a span, attached to google.api.Distribution.Exemplars
 // in google.api.Distribution values during aggregation.
@@ -43,16 +46,17 @@ func (m *SpanContext) Reset()         { *m = SpanContext{} }
 func (m *SpanContext) String() string { return proto.CompactTextString(m) }
 func (*SpanContext) ProtoMessage()    {}
 func (*SpanContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_span_context_4c30f2e57596ce1c, []int{0}
+	return fileDescriptor_933032e252f1c5e4, []int{0}
 }
+
 func (m *SpanContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SpanContext.Unmarshal(m, b)
 }
 func (m *SpanContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SpanContext.Marshal(b, m, deterministic)
 }
-func (dst *SpanContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpanContext.Merge(dst, src)
+func (m *SpanContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpanContext.Merge(m, src)
 }
 func (m *SpanContext) XXX_Size() int {
 	return xxx_messageInfo_SpanContext.Size(m)
@@ -75,10 +79,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/monitoring/v3/span_context.proto", fileDescriptor_span_context_4c30f2e57596ce1c)
+	proto.RegisterFile("google/monitoring/v3/span_context.proto", fileDescriptor_933032e252f1c5e4)
 }
 
-var fileDescriptor_span_context_4c30f2e57596ce1c = []byte{
+var fileDescriptor_933032e252f1c5e4 = []byte{
 	// 197 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4f, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33,
diff --git a/googleapis/monitoring/v3/uptime.pb.go b/googleapis/monitoring/v3/uptime.pb.go
index 794918e3f1..0b73571b8f 100644
--- a/googleapis/monitoring/v3/uptime.pb.go
+++ b/googleapis/monitoring/v3/uptime.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/uptime.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+package monitoring
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The regions from which an uptime check can be run.
 type UptimeCheckRegion int32
@@ -46,6 +49,7 @@ var UptimeCheckRegion_name = map[int32]string{
 	3: "SOUTH_AMERICA",
 	4: "ASIA_PACIFIC",
 }
+
 var UptimeCheckRegion_value = map[string]int32{
 	"REGION_UNSPECIFIED": 0,
 	"USA":                1,
@@ -57,8 +61,9 @@ var UptimeCheckRegion_value = map[string]int32{
 func (x UptimeCheckRegion) String() string {
 	return proto.EnumName(UptimeCheckRegion_name, int32(x))
 }
+
 func (UptimeCheckRegion) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{0}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{0}
 }
 
 // The supported resource types that can be used as values of
@@ -83,6 +88,7 @@ var GroupResourceType_name = map[int32]string{
 	1: "INSTANCE",
 	2: "AWS_ELB_LOAD_BALANCER",
 }
+
 var GroupResourceType_value = map[string]int32{
 	"RESOURCE_TYPE_UNSPECIFIED": 0,
 	"INSTANCE":                  1,
@@ -92,8 +98,9 @@ var GroupResourceType_value = map[string]int32{
 func (x GroupResourceType) String() string {
 	return proto.EnumName(GroupResourceType_name, int32(x))
 }
+
 func (GroupResourceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{1}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{1}
 }
 
 // An internal checker allows uptime checks to run on private/internal GCP
@@ -129,16 +136,17 @@ func (m *InternalChecker) Reset()         { *m = InternalChecker{} }
 func (m *InternalChecker) String() string { return proto.CompactTextString(m) }
 func (*InternalChecker) ProtoMessage()    {}
 func (*InternalChecker) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{0}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{0}
 }
+
 func (m *InternalChecker) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InternalChecker.Unmarshal(m, b)
 }
 func (m *InternalChecker) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InternalChecker.Marshal(b, m, deterministic)
 }
-func (dst *InternalChecker) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InternalChecker.Merge(dst, src)
+func (m *InternalChecker) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InternalChecker.Merge(m, src)
 }
 func (m *InternalChecker) XXX_Size() int {
 	return xxx_messageInfo_InternalChecker.Size(m)
@@ -251,16 +259,17 @@ func (m *UptimeCheckConfig) Reset()         { *m = UptimeCheckConfig{} }
 func (m *UptimeCheckConfig) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckConfig) ProtoMessage()    {}
 func (*UptimeCheckConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{1}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{1}
 }
+
 func (m *UptimeCheckConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UptimeCheckConfig.Unmarshal(m, b)
 }
 func (m *UptimeCheckConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UptimeCheckConfig.Marshal(b, m, deterministic)
 }
-func (dst *UptimeCheckConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UptimeCheckConfig.Merge(dst, src)
+func (m *UptimeCheckConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig.Merge(m, src)
 }
 func (m *UptimeCheckConfig) XXX_Size() int {
 	return xxx_messageInfo_UptimeCheckConfig.Size(m)
@@ -401,9 +410,9 @@ func (m *UptimeCheckConfig) GetInternalCheckers() []*InternalChecker {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*UptimeCheckConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _UptimeCheckConfig_OneofMarshaler, _UptimeCheckConfig_OneofUnmarshaler, _UptimeCheckConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*UptimeCheckConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*UptimeCheckConfig_MonitoredResource)(nil),
 		(*UptimeCheckConfig_ResourceGroup_)(nil),
 		(*UptimeCheckConfig_HttpCheck_)(nil),
@@ -411,120 +420,6 @@ func (*UptimeCheckConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf
 	}
 }
 
-func _UptimeCheckConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*UptimeCheckConfig)
-	// resource
-	switch x := m.Resource.(type) {
-	case *UptimeCheckConfig_MonitoredResource:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MonitoredResource); err != nil {
-			return err
-		}
-	case *UptimeCheckConfig_ResourceGroup_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ResourceGroup); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("UptimeCheckConfig.Resource has unexpected type %T", x)
-	}
-	// check_request_type
-	switch x := m.CheckRequestType.(type) {
-	case *UptimeCheckConfig_HttpCheck_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HttpCheck); err != nil {
-			return err
-		}
-	case *UptimeCheckConfig_TcpCheck_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TcpCheck); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("UptimeCheckConfig.CheckRequestType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _UptimeCheckConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*UptimeCheckConfig)
-	switch tag {
-	case 3: // resource.monitored_resource
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(monitoredres.MonitoredResource)
-		err := b.DecodeMessage(msg)
-		m.Resource = &UptimeCheckConfig_MonitoredResource{msg}
-		return true, err
-	case 4: // resource.resource_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UptimeCheckConfig_ResourceGroup)
-		err := b.DecodeMessage(msg)
-		m.Resource = &UptimeCheckConfig_ResourceGroup_{msg}
-		return true, err
-	case 5: // check_request_type.http_check
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UptimeCheckConfig_HttpCheck)
-		err := b.DecodeMessage(msg)
-		m.CheckRequestType = &UptimeCheckConfig_HttpCheck_{msg}
-		return true, err
-	case 6: // check_request_type.tcp_check
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UptimeCheckConfig_TcpCheck)
-		err := b.DecodeMessage(msg)
-		m.CheckRequestType = &UptimeCheckConfig_TcpCheck_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _UptimeCheckConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*UptimeCheckConfig)
-	// resource
-	switch x := m.Resource.(type) {
-	case *UptimeCheckConfig_MonitoredResource:
-		s := proto.Size(x.MonitoredResource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UptimeCheckConfig_ResourceGroup_:
-		s := proto.Size(x.ResourceGroup)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// check_request_type
-	switch x := m.CheckRequestType.(type) {
-	case *UptimeCheckConfig_HttpCheck_:
-		s := proto.Size(x.HttpCheck)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *UptimeCheckConfig_TcpCheck_:
-		s := proto.Size(x.TcpCheck)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The resource submessage for group checks. It can be used instead of a
 // monitored resource, when multiple resources are being monitored.
 type UptimeCheckConfig_ResourceGroup struct {
@@ -542,16 +437,17 @@ func (m *UptimeCheckConfig_ResourceGroup) Reset()         { *m = UptimeCheckConf
 func (m *UptimeCheckConfig_ResourceGroup) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckConfig_ResourceGroup) ProtoMessage()    {}
 func (*UptimeCheckConfig_ResourceGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{1, 0}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{1, 0}
 }
+
 func (m *UptimeCheckConfig_ResourceGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Unmarshal(m, b)
 }
 func (m *UptimeCheckConfig_ResourceGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Marshal(b, m, deterministic)
 }
-func (dst *UptimeCheckConfig_ResourceGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Merge(dst, src)
+func (m *UptimeCheckConfig_ResourceGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Merge(m, src)
 }
 func (m *UptimeCheckConfig_ResourceGroup) XXX_Size() int {
 	return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Size(m)
@@ -616,16 +512,17 @@ func (m *UptimeCheckConfig_HttpCheck) Reset()         { *m = UptimeCheckConfig_H
 func (m *UptimeCheckConfig_HttpCheck) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckConfig_HttpCheck) ProtoMessage()    {}
 func (*UptimeCheckConfig_HttpCheck) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{1, 1}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{1, 1}
 }
+
 func (m *UptimeCheckConfig_HttpCheck) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Unmarshal(m, b)
 }
 func (m *UptimeCheckConfig_HttpCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Marshal(b, m, deterministic)
 }
-func (dst *UptimeCheckConfig_HttpCheck) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UptimeCheckConfig_HttpCheck.Merge(dst, src)
+func (m *UptimeCheckConfig_HttpCheck) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_HttpCheck.Merge(m, src)
 }
 func (m *UptimeCheckConfig_HttpCheck) XXX_Size() int {
 	return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Size(m)
@@ -699,16 +596,17 @@ func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) String() string {
 }
 func (*UptimeCheckConfig_HttpCheck_BasicAuthentication) ProtoMessage() {}
 func (*UptimeCheckConfig_HttpCheck_BasicAuthentication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{1, 1, 0}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{1, 1, 0}
 }
+
 func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Unmarshal(m, b)
 }
 func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Marshal(b, m, deterministic)
 }
-func (dst *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Merge(dst, src)
+func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Merge(m, src)
 }
 func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Size() int {
 	return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Size(m)
@@ -748,16 +646,17 @@ func (m *UptimeCheckConfig_TcpCheck) Reset()         { *m = UptimeCheckConfig_Tc
 func (m *UptimeCheckConfig_TcpCheck) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckConfig_TcpCheck) ProtoMessage()    {}
 func (*UptimeCheckConfig_TcpCheck) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{1, 2}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{1, 2}
 }
+
 func (m *UptimeCheckConfig_TcpCheck) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Unmarshal(m, b)
 }
 func (m *UptimeCheckConfig_TcpCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Marshal(b, m, deterministic)
 }
-func (dst *UptimeCheckConfig_TcpCheck) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UptimeCheckConfig_TcpCheck.Merge(dst, src)
+func (m *UptimeCheckConfig_TcpCheck) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_TcpCheck.Merge(m, src)
 }
 func (m *UptimeCheckConfig_TcpCheck) XXX_Size() int {
 	return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Size(m)
@@ -789,16 +688,17 @@ func (m *UptimeCheckConfig_ContentMatcher) Reset()         { *m = UptimeCheckCon
 func (m *UptimeCheckConfig_ContentMatcher) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckConfig_ContentMatcher) ProtoMessage()    {}
 func (*UptimeCheckConfig_ContentMatcher) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{1, 3}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{1, 3}
 }
+
 func (m *UptimeCheckConfig_ContentMatcher) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Unmarshal(m, b)
 }
 func (m *UptimeCheckConfig_ContentMatcher) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Marshal(b, m, deterministic)
 }
-func (dst *UptimeCheckConfig_ContentMatcher) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Merge(dst, src)
+func (m *UptimeCheckConfig_ContentMatcher) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Merge(m, src)
 }
 func (m *UptimeCheckConfig_ContentMatcher) XXX_Size() int {
 	return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Size(m)
@@ -840,16 +740,17 @@ func (m *UptimeCheckIp) Reset()         { *m = UptimeCheckIp{} }
 func (m *UptimeCheckIp) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckIp) ProtoMessage()    {}
 func (*UptimeCheckIp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_bdbf1570f8b9a7cb, []int{2}
+	return fileDescriptor_7ca0e36dfc8221d8, []int{2}
 }
+
 func (m *UptimeCheckIp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UptimeCheckIp.Unmarshal(m, b)
 }
 func (m *UptimeCheckIp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UptimeCheckIp.Marshal(b, m, deterministic)
 }
-func (dst *UptimeCheckIp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UptimeCheckIp.Merge(dst, src)
+func (m *UptimeCheckIp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckIp.Merge(m, src)
 }
 func (m *UptimeCheckIp) XXX_Size() int {
 	return xxx_messageInfo_UptimeCheckIp.Size(m)
@@ -882,6 +783,8 @@ func (m *UptimeCheckIp) GetIpAddress() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.monitoring.v3.UptimeCheckRegion", UptimeCheckRegion_name, UptimeCheckRegion_value)
+	proto.RegisterEnum("google.monitoring.v3.GroupResourceType", GroupResourceType_name, GroupResourceType_value)
 	proto.RegisterType((*InternalChecker)(nil), "google.monitoring.v3.InternalChecker")
 	proto.RegisterType((*UptimeCheckConfig)(nil), "google.monitoring.v3.UptimeCheckConfig")
 	proto.RegisterType((*UptimeCheckConfig_ResourceGroup)(nil), "google.monitoring.v3.UptimeCheckConfig.ResourceGroup")
@@ -891,15 +794,11 @@ func init() {
 	proto.RegisterType((*UptimeCheckConfig_TcpCheck)(nil), "google.monitoring.v3.UptimeCheckConfig.TcpCheck")
 	proto.RegisterType((*UptimeCheckConfig_ContentMatcher)(nil), "google.monitoring.v3.UptimeCheckConfig.ContentMatcher")
 	proto.RegisterType((*UptimeCheckIp)(nil), "google.monitoring.v3.UptimeCheckIp")
-	proto.RegisterEnum("google.monitoring.v3.UptimeCheckRegion", UptimeCheckRegion_name, UptimeCheckRegion_value)
-	proto.RegisterEnum("google.monitoring.v3.GroupResourceType", GroupResourceType_name, GroupResourceType_value)
 }
 
-func init() {
-	proto.RegisterFile("google/monitoring/v3/uptime.proto", fileDescriptor_uptime_bdbf1570f8b9a7cb)
-}
+func init() { proto.RegisterFile("google/monitoring/v3/uptime.proto", fileDescriptor_7ca0e36dfc8221d8) }
 
-var fileDescriptor_uptime_bdbf1570f8b9a7cb = []byte{
+var fileDescriptor_7ca0e36dfc8221d8 = []byte{
 	// 1036 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xed, 0x6e, 0xe3, 0x44,
 	0x17, 0xae, 0x9b, 0x36, 0x1f, 0x27, 0xfd, 0x70, 0xe7, 0xed, 0x0b, 0x6e, 0xa4, 0x2e, 0xdd, 0x22,
diff --git a/googleapis/monitoring/v3/uptime_service.pb.go b/googleapis/monitoring/v3/uptime_service.pb.go
index b29c7713ae..12109ab3c0 100644
--- a/googleapis/monitoring/v3/uptime_service.pb.go
+++ b/googleapis/monitoring/v3/uptime_service.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/uptime_service.proto
 
-package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package monitoring
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The protocol for the `ListUptimeCheckConfigs` request.
 type ListUptimeCheckConfigsRequest struct {
@@ -49,16 +49,17 @@ func (m *ListUptimeCheckConfigsRequest) Reset()         { *m = ListUptimeCheckCo
 func (m *ListUptimeCheckConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListUptimeCheckConfigsRequest) ProtoMessage()    {}
 func (*ListUptimeCheckConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{0}
+	return fileDescriptor_6222dd2aa0db8eee, []int{0}
 }
+
 func (m *ListUptimeCheckConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListUptimeCheckConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListUptimeCheckConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListUptimeCheckConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListUptimeCheckConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListUptimeCheckConfigsRequest.Merge(dst, src)
+func (m *ListUptimeCheckConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckConfigsRequest.Merge(m, src)
 }
 func (m *ListUptimeCheckConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListUptimeCheckConfigsRequest.Size(m)
@@ -112,16 +113,17 @@ func (m *ListUptimeCheckConfigsResponse) Reset()         { *m = ListUptimeCheckC
 func (m *ListUptimeCheckConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListUptimeCheckConfigsResponse) ProtoMessage()    {}
 func (*ListUptimeCheckConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{1}
+	return fileDescriptor_6222dd2aa0db8eee, []int{1}
 }
+
 func (m *ListUptimeCheckConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListUptimeCheckConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListUptimeCheckConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListUptimeCheckConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListUptimeCheckConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListUptimeCheckConfigsResponse.Merge(dst, src)
+func (m *ListUptimeCheckConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckConfigsResponse.Merge(m, src)
 }
 func (m *ListUptimeCheckConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListUptimeCheckConfigsResponse.Size(m)
@@ -167,16 +169,17 @@ func (m *GetUptimeCheckConfigRequest) Reset()         { *m = GetUptimeCheckConfi
 func (m *GetUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetUptimeCheckConfigRequest) ProtoMessage()    {}
 func (*GetUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{2}
+	return fileDescriptor_6222dd2aa0db8eee, []int{2}
 }
+
 func (m *GetUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUptimeCheckConfigRequest.Unmarshal(m, b)
 }
 func (m *GetUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetUptimeCheckConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetUptimeCheckConfigRequest.Merge(dst, src)
+func (m *GetUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUptimeCheckConfigRequest.Merge(m, src)
 }
 func (m *GetUptimeCheckConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetUptimeCheckConfigRequest.Size(m)
@@ -210,16 +213,17 @@ func (m *CreateUptimeCheckConfigRequest) Reset()         { *m = CreateUptimeChec
 func (m *CreateUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateUptimeCheckConfigRequest) ProtoMessage()    {}
 func (*CreateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{3}
+	return fileDescriptor_6222dd2aa0db8eee, []int{3}
 }
+
 func (m *CreateUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateUptimeCheckConfigRequest.Unmarshal(m, b)
 }
 func (m *CreateUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateUptimeCheckConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateUptimeCheckConfigRequest.Merge(dst, src)
+func (m *CreateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateUptimeCheckConfigRequest.Merge(m, src)
 }
 func (m *CreateUptimeCheckConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateUptimeCheckConfigRequest.Size(m)
@@ -272,16 +276,17 @@ func (m *UpdateUptimeCheckConfigRequest) Reset()         { *m = UpdateUptimeChec
 func (m *UpdateUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateUptimeCheckConfigRequest) ProtoMessage()    {}
 func (*UpdateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{4}
+	return fileDescriptor_6222dd2aa0db8eee, []int{4}
 }
+
 func (m *UpdateUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Unmarshal(m, b)
 }
 func (m *UpdateUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateUptimeCheckConfigRequest.Merge(dst, src)
+func (m *UpdateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateUptimeCheckConfigRequest.Merge(m, src)
 }
 func (m *UpdateUptimeCheckConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Size(m)
@@ -320,16 +325,17 @@ func (m *DeleteUptimeCheckConfigRequest) Reset()         { *m = DeleteUptimeChec
 func (m *DeleteUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteUptimeCheckConfigRequest) ProtoMessage()    {}
 func (*DeleteUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{5}
+	return fileDescriptor_6222dd2aa0db8eee, []int{5}
 }
+
 func (m *DeleteUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Unmarshal(m, b)
 }
 func (m *DeleteUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteUptimeCheckConfigRequest.Merge(dst, src)
+func (m *DeleteUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteUptimeCheckConfigRequest.Merge(m, src)
 }
 func (m *DeleteUptimeCheckConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Size(m)
@@ -369,16 +375,17 @@ func (m *ListUptimeCheckIpsRequest) Reset()         { *m = ListUptimeCheckIpsReq
 func (m *ListUptimeCheckIpsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListUptimeCheckIpsRequest) ProtoMessage()    {}
 func (*ListUptimeCheckIpsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{6}
+	return fileDescriptor_6222dd2aa0db8eee, []int{6}
 }
+
 func (m *ListUptimeCheckIpsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListUptimeCheckIpsRequest.Unmarshal(m, b)
 }
 func (m *ListUptimeCheckIpsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListUptimeCheckIpsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListUptimeCheckIpsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListUptimeCheckIpsRequest.Merge(dst, src)
+func (m *ListUptimeCheckIpsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckIpsRequest.Merge(m, src)
 }
 func (m *ListUptimeCheckIpsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListUptimeCheckIpsRequest.Size(m)
@@ -424,16 +431,17 @@ func (m *ListUptimeCheckIpsResponse) Reset()         { *m = ListUptimeCheckIpsRe
 func (m *ListUptimeCheckIpsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListUptimeCheckIpsResponse) ProtoMessage()    {}
 func (*ListUptimeCheckIpsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_uptime_service_d74c53bfae98dff8, []int{7}
+	return fileDescriptor_6222dd2aa0db8eee, []int{7}
 }
+
 func (m *ListUptimeCheckIpsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListUptimeCheckIpsResponse.Unmarshal(m, b)
 }
 func (m *ListUptimeCheckIpsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListUptimeCheckIpsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListUptimeCheckIpsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListUptimeCheckIpsResponse.Merge(dst, src)
+func (m *ListUptimeCheckIpsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckIpsResponse.Merge(m, src)
 }
 func (m *ListUptimeCheckIpsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListUptimeCheckIpsResponse.Size(m)
@@ -469,6 +477,61 @@ func init() {
 	proto.RegisterType((*ListUptimeCheckIpsResponse)(nil), "google.monitoring.v3.ListUptimeCheckIpsResponse")
 }
 
+func init() {
+	proto.RegisterFile("google/monitoring/v3/uptime_service.proto", fileDescriptor_6222dd2aa0db8eee)
+}
+
+var fileDescriptor_6222dd2aa0db8eee = []byte{
+	// 747 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0xd3, 0x4a,
+	0x14, 0xd6, 0x24, 0xbd, 0x55, 0x7b, 0xaa, 0x7b, 0x2f, 0x0c, 0x51, 0x1b, 0x5c, 0x1a, 0x05, 0x23,
+	0x41, 0x89, 0x90, 0x4d, 0x93, 0xae, 0xa8, 0xa8, 0x44, 0x03, 0x54, 0x95, 0xa8, 0x54, 0xa5, 0xb4,
+	0x15, 0x50, 0x29, 0x72, 0xd3, 0xa9, 0x31, 0x49, 0x3c, 0xc6, 0x33, 0xae, 0xa0, 0xa8, 0x1b, 0xde,
+	0x00, 0x75, 0xc9, 0x9e, 0x45, 0x1f, 0x00, 0xd6, 0xb0, 0x41, 0x62, 0x8b, 0x78, 0x03, 0x1e, 0x04,
+	0x79, 0x3c, 0x26, 0x7f, 0x63, 0xe3, 0x88, 0x5d, 0x3c, 0xe7, 0xcc, 0x39, 0xdf, 0xf9, 0xfc, 0x9d,
+	0x2f, 0x86, 0x9b, 0x36, 0xa5, 0x76, 0x87, 0x98, 0x5d, 0xea, 0x3a, 0x9c, 0xfa, 0x8e, 0x6b, 0x9b,
+	0xc7, 0x35, 0x33, 0xf0, 0xb8, 0xd3, 0x25, 0x4d, 0x46, 0xfc, 0x63, 0xa7, 0x45, 0x0c, 0xcf, 0xa7,
+	0x9c, 0xe2, 0x42, 0x94, 0x6a, 0xf4, 0x52, 0x8d, 0xe3, 0x9a, 0x76, 0x45, 0x16, 0xb0, 0x3c, 0xc7,
+	0xb4, 0x5c, 0x97, 0x72, 0x8b, 0x3b, 0xd4, 0x65, 0xd1, 0x1d, 0xed, 0x6a, 0x4a, 0x79, 0x99, 0x32,
+	0x2f, 0x53, 0xc4, 0xd3, 0x41, 0x70, 0x64, 0x92, 0xae, 0xc7, 0x5f, 0xcb, 0x60, 0x79, 0x38, 0x78,
+	0xe4, 0x90, 0xce, 0x61, 0xb3, 0x6b, 0xb1, 0x76, 0x94, 0xa1, 0x33, 0x58, 0x78, 0xe4, 0x30, 0xbe,
+	0x23, 0x4a, 0xd6, 0x9f, 0x93, 0x56, 0xbb, 0x4e, 0xdd, 0x23, 0xc7, 0x66, 0x0d, 0xf2, 0x32, 0x20,
+	0x8c, 0xe3, 0x59, 0x98, 0xf4, 0x2c, 0x9f, 0xb8, 0xbc, 0x88, 0xca, 0x68, 0x71, 0xba, 0x21, 0x9f,
+	0xf0, 0x3c, 0x4c, 0x7b, 0x96, 0x4d, 0x9a, 0xcc, 0x39, 0x21, 0xc5, 0x7c, 0x19, 0x2d, 0xfe, 0xd3,
+	0x98, 0x0a, 0x0f, 0xb6, 0x9d, 0x13, 0x82, 0x17, 0x00, 0x44, 0x90, 0xd3, 0x36, 0x71, 0x8b, 0x13,
+	0xe2, 0xa2, 0x48, 0x7f, 0x1c, 0x1e, 0xe8, 0x5f, 0x10, 0x94, 0x92, 0xba, 0x32, 0x8f, 0xba, 0x8c,
+	0xe0, 0x27, 0x50, 0x90, 0x2c, 0xb6, 0xc2, 0x70, 0xb3, 0x15, 0xc5, 0x8b, 0xa8, 0x9c, 0x5f, 0x9c,
+	0xa9, 0xde, 0x30, 0x54, 0x64, 0x1a, 0x23, 0xf5, 0x1a, 0x38, 0x18, 0x69, 0x81, 0xaf, 0xc3, 0xff,
+	0x2e, 0x79, 0xc5, 0x9b, 0x7d, 0x08, 0x73, 0x02, 0xe1, 0xbf, 0xe1, 0xf1, 0x56, 0x8c, 0x32, 0x1c,
+	0x82, 0x53, 0x6e, 0x75, 0xfa, 0x47, 0x9c, 0x16, 0x27, 0xe1, 0x8c, 0xfa, 0x12, 0xcc, 0xaf, 0x93,
+	0xd1, 0x11, 0x62, 0xde, 0x30, 0x4c, 0xb8, 0x56, 0x97, 0x48, 0xd6, 0xc4, 0x6f, 0xfd, 0x1d, 0x82,
+	0x52, 0xdd, 0x27, 0x16, 0x27, 0x89, 0xd7, 0x92, 0xe8, 0xde, 0x83, 0x4b, 0x0a, 0x3e, 0x04, 0xf0,
+	0x31, 0xe8, 0xb8, 0x38, 0x42, 0x87, 0xfe, 0x11, 0x41, 0x69, 0xc7, 0x3b, 0x4c, 0xc3, 0xb4, 0x02,
+	0x33, 0x81, 0xc8, 0x10, 0xc2, 0x91, 0x3d, 0xb5, 0xb8, 0x67, 0xac, 0x2d, 0xe3, 0x61, 0xa8, 0xad,
+	0x4d, 0x8b, 0xb5, 0x1b, 0x10, 0xa5, 0x87, 0xbf, 0x93, 0x80, 0xe7, 0xff, 0x1a, 0xf8, 0x32, 0x94,
+	0xee, 0x93, 0x0e, 0x49, 0xc1, 0xad, 0x7a, 0x05, 0x7b, 0x70, 0x79, 0x48, 0x79, 0x1b, 0xde, 0x6f,
+	0xad, 0x0f, 0x68, 0x3a, 0x97, 0xaa, 0xe9, 0xfc, 0xb0, 0xa6, 0xcf, 0x10, 0x68, 0xaa, 0xca, 0x52,
+	0xcf, 0x9b, 0x70, 0x61, 0x80, 0x06, 0xc7, 0x8b, 0xb5, 0x7c, 0xed, 0x8f, 0x1c, 0x6c, 0x78, 0x8d,
+	0xff, 0x82, 0x81, 0xb2, 0x59, 0x35, 0x5c, 0xfd, 0x3a, 0x05, 0xb8, 0xaf, 0xd2, 0x76, 0xe4, 0x48,
+	0xf8, 0x13, 0x82, 0x59, 0xf5, 0x02, 0xe2, 0x9a, 0x1a, 0x4e, 0xaa, 0x49, 0x68, 0xcb, 0xe3, 0x5d,
+	0x8a, 0x38, 0xd1, 0xab, 0x6f, 0xbf, 0xff, 0x3c, 0xcb, 0xdd, 0xc2, 0x95, 0xd0, 0xd4, 0xde, 0x44,
+	0x42, 0xbf, 0xeb, 0xf9, 0xf4, 0x05, 0x69, 0x71, 0x66, 0x56, 0x4e, 0x4d, 0xc5, 0xf2, 0x7e, 0x40,
+	0x50, 0x50, 0xad, 0x1d, 0x5e, 0x52, 0x43, 0x48, 0x59, 0x51, 0x2d, 0xab, 0xfa, 0x86, 0x80, 0x86,
+	0x3a, 0xea, 0x83, 0xa9, 0x40, 0x69, 0x56, 0x4e, 0xf1, 0x67, 0x04, 0x73, 0x09, 0xbb, 0x8e, 0x13,
+	0xe8, 0x4a, 0xb7, 0x86, 0xec, 0x70, 0xd7, 0x05, 0xdc, 0x7b, 0xfa, 0x18, 0xbc, 0xde, 0x51, 0x2d,
+	0x29, 0xfe, 0x81, 0x60, 0x2e, 0xc1, 0x1b, 0x92, 0x66, 0x48, 0xb7, 0x92, 0xec, 0x33, 0x3c, 0x13,
+	0x33, 0xec, 0x54, 0x57, 0xc5, 0x0c, 0x0a, 0x70, 0x46, 0xa6, 0xd7, 0xa0, 0x9e, 0xeb, 0x3d, 0x82,
+	0xb9, 0x04, 0xef, 0x48, 0x9a, 0x2b, 0xdd, 0x6a, 0xb4, 0xd9, 0x11, 0x37, 0x7c, 0x10, 0xfe, 0x0d,
+	0xc7, 0xca, 0xa9, 0x8c, 0xa3, 0x9c, 0x33, 0x04, 0x78, 0xd4, 0x49, 0xb0, 0x99, 0x69, 0xc7, 0x7a,
+	0x6e, 0xa6, 0xdd, 0xce, 0x7e, 0x41, 0x2e, 0xa4, 0x26, 0xd0, 0x16, 0x30, 0xee, 0x7d, 0x65, 0xc4,
+	0x39, 0x6b, 0xe7, 0x08, 0x8a, 0x2d, 0xda, 0x55, 0xd6, 0x5c, 0x93, 0x1e, 0x23, 0xed, 0x65, 0x2b,
+	0xe4, 0x60, 0x0b, 0x3d, 0x5d, 0x95, 0xb9, 0x36, 0xed, 0x58, 0xae, 0x6d, 0x50, 0xdf, 0x36, 0x6d,
+	0xe2, 0x0a, 0x86, 0xcc, 0x28, 0x64, 0x79, 0x0e, 0x1b, 0xfc, 0xb8, 0x59, 0xe9, 0x3d, 0x9d, 0xe7,
+	0xb4, 0xf5, 0xa8, 0x40, 0xbd, 0x43, 0x83, 0x43, 0x63, 0xb3, 0xd7, 0x72, 0xb7, 0xf6, 0x2d, 0x0e,
+	0xee, 0x8b, 0xe0, 0x7e, 0x2f, 0xb8, 0xbf, 0x5b, 0x3b, 0x98, 0x14, 0x4d, 0x6a, 0xbf, 0x02, 0x00,
+	0x00, 0xff, 0xff, 0x27, 0xb8, 0x65, 0x92, 0x9f, 0x09, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -729,58 +792,3 @@ var _UptimeCheckService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/monitoring/v3/uptime_service.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/monitoring/v3/uptime_service.proto", fileDescriptor_uptime_service_d74c53bfae98dff8)
-}
-
-var fileDescriptor_uptime_service_d74c53bfae98dff8 = []byte{
-	// 747 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0xd3, 0x4a,
-	0x14, 0xd6, 0x24, 0xbd, 0x55, 0x7b, 0xaa, 0x7b, 0x2f, 0x0c, 0x51, 0x1b, 0x5c, 0x1a, 0x05, 0x23,
-	0x41, 0x89, 0x90, 0x4d, 0x93, 0xae, 0xa8, 0xa8, 0x44, 0x03, 0x54, 0x95, 0xa8, 0x54, 0xa5, 0xb4,
-	0x15, 0x50, 0x29, 0x72, 0xd3, 0xa9, 0x31, 0x49, 0x3c, 0xc6, 0x33, 0xae, 0xa0, 0xa8, 0x1b, 0xde,
-	0x00, 0x75, 0xc9, 0x9e, 0x45, 0x1f, 0x00, 0xd6, 0xb0, 0x41, 0x62, 0x8b, 0x78, 0x03, 0x1e, 0x04,
-	0x79, 0x3c, 0x26, 0x7f, 0x63, 0xe3, 0x88, 0x5d, 0x3c, 0xe7, 0xcc, 0x39, 0xdf, 0xf9, 0xfc, 0x9d,
-	0x2f, 0x86, 0x9b, 0x36, 0xa5, 0x76, 0x87, 0x98, 0x5d, 0xea, 0x3a, 0x9c, 0xfa, 0x8e, 0x6b, 0x9b,
-	0xc7, 0x35, 0x33, 0xf0, 0xb8, 0xd3, 0x25, 0x4d, 0x46, 0xfc, 0x63, 0xa7, 0x45, 0x0c, 0xcf, 0xa7,
-	0x9c, 0xe2, 0x42, 0x94, 0x6a, 0xf4, 0x52, 0x8d, 0xe3, 0x9a, 0x76, 0x45, 0x16, 0xb0, 0x3c, 0xc7,
-	0xb4, 0x5c, 0x97, 0x72, 0x8b, 0x3b, 0xd4, 0x65, 0xd1, 0x1d, 0xed, 0x6a, 0x4a, 0x79, 0x99, 0x32,
-	0x2f, 0x53, 0xc4, 0xd3, 0x41, 0x70, 0x64, 0x92, 0xae, 0xc7, 0x5f, 0xcb, 0x60, 0x79, 0x38, 0x78,
-	0xe4, 0x90, 0xce, 0x61, 0xb3, 0x6b, 0xb1, 0x76, 0x94, 0xa1, 0x33, 0x58, 0x78, 0xe4, 0x30, 0xbe,
-	0x23, 0x4a, 0xd6, 0x9f, 0x93, 0x56, 0xbb, 0x4e, 0xdd, 0x23, 0xc7, 0x66, 0x0d, 0xf2, 0x32, 0x20,
-	0x8c, 0xe3, 0x59, 0x98, 0xf4, 0x2c, 0x9f, 0xb8, 0xbc, 0x88, 0xca, 0x68, 0x71, 0xba, 0x21, 0x9f,
-	0xf0, 0x3c, 0x4c, 0x7b, 0x96, 0x4d, 0x9a, 0xcc, 0x39, 0x21, 0xc5, 0x7c, 0x19, 0x2d, 0xfe, 0xd3,
-	0x98, 0x0a, 0x0f, 0xb6, 0x9d, 0x13, 0x82, 0x17, 0x00, 0x44, 0x90, 0xd3, 0x36, 0x71, 0x8b, 0x13,
-	0xe2, 0xa2, 0x48, 0x7f, 0x1c, 0x1e, 0xe8, 0x5f, 0x10, 0x94, 0x92, 0xba, 0x32, 0x8f, 0xba, 0x8c,
-	0xe0, 0x27, 0x50, 0x90, 0x2c, 0xb6, 0xc2, 0x70, 0xb3, 0x15, 0xc5, 0x8b, 0xa8, 0x9c, 0x5f, 0x9c,
-	0xa9, 0xde, 0x30, 0x54, 0x64, 0x1a, 0x23, 0xf5, 0x1a, 0x38, 0x18, 0x69, 0x81, 0xaf, 0xc3, 0xff,
-	0x2e, 0x79, 0xc5, 0x9b, 0x7d, 0x08, 0x73, 0x02, 0xe1, 0xbf, 0xe1, 0xf1, 0x56, 0x8c, 0x32, 0x1c,
-	0x82, 0x53, 0x6e, 0x75, 0xfa, 0x47, 0x9c, 0x16, 0x27, 0xe1, 0x8c, 0xfa, 0x12, 0xcc, 0xaf, 0x93,
-	0xd1, 0x11, 0x62, 0xde, 0x30, 0x4c, 0xb8, 0x56, 0x97, 0x48, 0xd6, 0xc4, 0x6f, 0xfd, 0x1d, 0x82,
-	0x52, 0xdd, 0x27, 0x16, 0x27, 0x89, 0xd7, 0x92, 0xe8, 0xde, 0x83, 0x4b, 0x0a, 0x3e, 0x04, 0xf0,
-	0x31, 0xe8, 0xb8, 0x38, 0x42, 0x87, 0xfe, 0x11, 0x41, 0x69, 0xc7, 0x3b, 0x4c, 0xc3, 0xb4, 0x02,
-	0x33, 0x81, 0xc8, 0x10, 0xc2, 0x91, 0x3d, 0xb5, 0xb8, 0x67, 0xac, 0x2d, 0xe3, 0x61, 0xa8, 0xad,
-	0x4d, 0x8b, 0xb5, 0x1b, 0x10, 0xa5, 0x87, 0xbf, 0x93, 0x80, 0xe7, 0xff, 0x1a, 0xf8, 0x32, 0x94,
-	0xee, 0x93, 0x0e, 0x49, 0xc1, 0xad, 0x7a, 0x05, 0x7b, 0x70, 0x79, 0x48, 0x79, 0x1b, 0xde, 0x6f,
-	0xad, 0x0f, 0x68, 0x3a, 0x97, 0xaa, 0xe9, 0xfc, 0xb0, 0xa6, 0xcf, 0x10, 0x68, 0xaa, 0xca, 0x52,
-	0xcf, 0x9b, 0x70, 0x61, 0x80, 0x06, 0xc7, 0x8b, 0xb5, 0x7c, 0xed, 0x8f, 0x1c, 0x6c, 0x78, 0x8d,
-	0xff, 0x82, 0x81, 0xb2, 0x59, 0x35, 0x5c, 0xfd, 0x3a, 0x05, 0xb8, 0xaf, 0xd2, 0x76, 0xe4, 0x48,
-	0xf8, 0x13, 0x82, 0x59, 0xf5, 0x02, 0xe2, 0x9a, 0x1a, 0x4e, 0xaa, 0x49, 0x68, 0xcb, 0xe3, 0x5d,
-	0x8a, 0x38, 0xd1, 0xab, 0x6f, 0xbf, 0xff, 0x3c, 0xcb, 0xdd, 0xc2, 0x95, 0xd0, 0xd4, 0xde, 0x44,
-	0x42, 0xbf, 0xeb, 0xf9, 0xf4, 0x05, 0x69, 0x71, 0x66, 0x56, 0x4e, 0x4d, 0xc5, 0xf2, 0x7e, 0x40,
-	0x50, 0x50, 0xad, 0x1d, 0x5e, 0x52, 0x43, 0x48, 0x59, 0x51, 0x2d, 0xab, 0xfa, 0x86, 0x80, 0x86,
-	0x3a, 0xea, 0x83, 0xa9, 0x40, 0x69, 0x56, 0x4e, 0xf1, 0x67, 0x04, 0x73, 0x09, 0xbb, 0x8e, 0x13,
-	0xe8, 0x4a, 0xb7, 0x86, 0xec, 0x70, 0xd7, 0x05, 0xdc, 0x7b, 0xfa, 0x18, 0xbc, 0xde, 0x51, 0x2d,
-	0x29, 0xfe, 0x81, 0x60, 0x2e, 0xc1, 0x1b, 0x92, 0x66, 0x48, 0xb7, 0x92, 0xec, 0x33, 0x3c, 0x13,
-	0x33, 0xec, 0x54, 0x57, 0xc5, 0x0c, 0x0a, 0x70, 0x46, 0xa6, 0xd7, 0xa0, 0x9e, 0xeb, 0x3d, 0x82,
-	0xb9, 0x04, 0xef, 0x48, 0x9a, 0x2b, 0xdd, 0x6a, 0xb4, 0xd9, 0x11, 0x37, 0x7c, 0x10, 0xfe, 0x0d,
-	0xc7, 0xca, 0xa9, 0x8c, 0xa3, 0x9c, 0x33, 0x04, 0x78, 0xd4, 0x49, 0xb0, 0x99, 0x69, 0xc7, 0x7a,
-	0x6e, 0xa6, 0xdd, 0xce, 0x7e, 0x41, 0x2e, 0xa4, 0x26, 0xd0, 0x16, 0x30, 0xee, 0x7d, 0x65, 0xc4,
-	0x39, 0x6b, 0xe7, 0x08, 0x8a, 0x2d, 0xda, 0x55, 0xd6, 0x5c, 0x93, 0x1e, 0x23, 0xed, 0x65, 0x2b,
-	0xe4, 0x60, 0x0b, 0x3d, 0x5d, 0x95, 0xb9, 0x36, 0xed, 0x58, 0xae, 0x6d, 0x50, 0xdf, 0x36, 0x6d,
-	0xe2, 0x0a, 0x86, 0xcc, 0x28, 0x64, 0x79, 0x0e, 0x1b, 0xfc, 0xb8, 0x59, 0xe9, 0x3d, 0x9d, 0xe7,
-	0xb4, 0xf5, 0xa8, 0x40, 0xbd, 0x43, 0x83, 0x43, 0x63, 0xb3, 0xd7, 0x72, 0xb7, 0xf6, 0x2d, 0x0e,
-	0xee, 0x8b, 0xe0, 0x7e, 0x2f, 0xb8, 0xbf, 0x5b, 0x3b, 0x98, 0x14, 0x4d, 0x6a, 0xbf, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0x27, 0xb8, 0x65, 0x92, 0x9f, 0x09, 0x00, 0x00,
-}
diff --git a/googleapis/privacy/dlp/v2/dlp.pb.go b/googleapis/privacy/dlp/v2/dlp.pb.go
index b7bdf13d4e..f8fe7046f0 100644
--- a/googleapis/privacy/dlp/v2/dlp.pb.go
+++ b/googleapis/privacy/dlp/v2/dlp.pb.go
@@ -1,23 +1,23 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/privacy/dlp/v2/dlp.proto
 
-package dlp // import "google.golang.org/genproto/googleapis/privacy/dlp/v2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import date "google.golang.org/genproto/googleapis/type/date"
-import dayofweek "google.golang.org/genproto/googleapis/type/dayofweek"
-import timeofday "google.golang.org/genproto/googleapis/type/timeofday"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package dlp
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	date "google.golang.org/genproto/googleapis/type/date"
+	dayofweek "google.golang.org/genproto/googleapis/type/dayofweek"
+	timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -30,7 +30,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Options describing which parts of the provided content should be scanned.
 type ContentOption int32
@@ -49,6 +49,7 @@ var ContentOption_name = map[int32]string{
 	1: "CONTENT_TEXT",
 	2: "CONTENT_IMAGE",
 }
+
 var ContentOption_value = map[string]int32{
 	"CONTENT_UNSPECIFIED": 0,
 	"CONTENT_TEXT":        1,
@@ -58,8 +59,9 @@ var ContentOption_value = map[string]int32{
 func (x ContentOption) String() string {
 	return proto.EnumName(ContentOption_name, int32(x))
 }
+
 func (ContentOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{0}
 }
 
 // Type of the match which can be applied to different ways of matching, like
@@ -96,6 +98,7 @@ var MatchingType_name = map[int32]string{
 	2: "MATCHING_TYPE_PARTIAL_MATCH",
 	3: "MATCHING_TYPE_INVERSE_MATCH",
 }
+
 var MatchingType_value = map[string]int32{
 	"MATCHING_TYPE_UNSPECIFIED":   0,
 	"MATCHING_TYPE_FULL_MATCH":    1,
@@ -106,8 +109,9 @@ var MatchingType_value = map[string]int32{
 func (x MatchingType) String() string {
 	return proto.EnumName(MatchingType_name, int32(x))
 }
+
 func (MatchingType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{1}
 }
 
 // Parts of the APIs which use certain infoTypes.
@@ -126,6 +130,7 @@ var InfoTypeSupportedBy_name = map[int32]string{
 	1: "INSPECT",
 	2: "RISK_ANALYSIS",
 }
+
 var InfoTypeSupportedBy_value = map[string]int32{
 	"ENUM_TYPE_UNSPECIFIED": 0,
 	"INSPECT":               1,
@@ -135,8 +140,9 @@ var InfoTypeSupportedBy_value = map[string]int32{
 func (x InfoTypeSupportedBy) String() string {
 	return proto.EnumName(InfoTypeSupportedBy_name, int32(x))
 }
+
 func (InfoTypeSupportedBy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{2}
+	return fileDescriptor_6872a91dcb80f8dc, []int{2}
 }
 
 // Operators available for comparing the value of fields.
@@ -170,6 +176,7 @@ var RelationalOperator_name = map[int32]string{
 	6: "LESS_THAN_OR_EQUALS",
 	7: "EXISTS",
 }
+
 var RelationalOperator_value = map[string]int32{
 	"RELATIONAL_OPERATOR_UNSPECIFIED": 0,
 	"EQUAL_TO":                        1,
@@ -184,8 +191,9 @@ var RelationalOperator_value = map[string]int32{
 func (x RelationalOperator) String() string {
 	return proto.EnumName(RelationalOperator_name, int32(x))
 }
+
 func (RelationalOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{3}
+	return fileDescriptor_6872a91dcb80f8dc, []int{3}
 }
 
 // An enum to represent the various type of DLP jobs.
@@ -204,6 +212,7 @@ var DlpJobType_name = map[int32]string{
 	1: "INSPECT_JOB",
 	2: "RISK_ANALYSIS_JOB",
 }
+
 var DlpJobType_value = map[string]int32{
 	"DLP_JOB_TYPE_UNSPECIFIED": 0,
 	"INSPECT_JOB":              1,
@@ -213,8 +222,9 @@ var DlpJobType_value = map[string]int32{
 func (x DlpJobType) String() string {
 	return proto.EnumName(DlpJobType_name, int32(x))
 }
+
 func (DlpJobType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{4}
+	return fileDescriptor_6872a91dcb80f8dc, []int{4}
 }
 
 // State of a StoredInfoType version.
@@ -242,6 +252,7 @@ var StoredInfoTypeState_name = map[int32]string{
 	3: "FAILED",
 	4: "INVALID",
 }
+
 var StoredInfoTypeState_value = map[string]int32{
 	"STORED_INFO_TYPE_STATE_UNSPECIFIED": 0,
 	"PENDING":                            1,
@@ -253,8 +264,9 @@ var StoredInfoTypeState_value = map[string]int32{
 func (x StoredInfoTypeState) String() string {
 	return proto.EnumName(StoredInfoTypeState_name, int32(x))
 }
+
 func (StoredInfoTypeState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{5}
+	return fileDescriptor_6872a91dcb80f8dc, []int{5}
 }
 
 type ByteContentItem_BytesType int32
@@ -278,6 +290,7 @@ var ByteContentItem_BytesType_name = map[int32]string{
 	4: "IMAGE_SVG",
 	5: "TEXT_UTF8",
 }
+
 var ByteContentItem_BytesType_value = map[string]int32{
 	"BYTES_TYPE_UNSPECIFIED": 0,
 	"IMAGE":                  6,
@@ -291,8 +304,9 @@ var ByteContentItem_BytesType_value = map[string]int32{
 func (x ByteContentItem_BytesType) String() string {
 	return proto.EnumName(ByteContentItem_BytesType_name, int32(x))
 }
+
 func (ByteContentItem_BytesType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{5, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{5, 0}
 }
 
 // Predefined schemas for storing findings.
@@ -321,6 +335,7 @@ var OutputStorageConfig_OutputSchema_name = map[int32]string{
 	4: "BIG_QUERY_COLUMNS",
 	5: "ALL_COLUMNS",
 }
+
 var OutputStorageConfig_OutputSchema_value = map[string]int32{
 	"OUTPUT_SCHEMA_UNSPECIFIED": 0,
 	"BASIC_COLUMNS":             1,
@@ -333,8 +348,9 @@ var OutputStorageConfig_OutputSchema_value = map[string]int32{
 func (x OutputStorageConfig_OutputSchema) String() string {
 	return proto.EnumName(OutputStorageConfig_OutputSchema_name, int32(x))
 }
+
 func (OutputStorageConfig_OutputSchema) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{27, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{27, 0}
 }
 
 type TimePartConfig_TimePart int32
@@ -364,6 +380,7 @@ var TimePartConfig_TimePart_name = map[int32]string{
 	5: "WEEK_OF_YEAR",
 	6: "HOUR_OF_DAY",
 }
+
 var TimePartConfig_TimePart_value = map[string]int32{
 	"TIME_PART_UNSPECIFIED": 0,
 	"YEAR":                  1,
@@ -377,8 +394,9 @@ var TimePartConfig_TimePart_value = map[string]int32{
 func (x TimePartConfig_TimePart) String() string {
 	return proto.EnumName(TimePartConfig_TimePart_name, int32(x))
 }
+
 func (TimePartConfig_TimePart) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{44, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{44, 0}
 }
 
 type CharsToIgnore_CommonCharsToIgnore int32
@@ -405,6 +423,7 @@ var CharsToIgnore_CommonCharsToIgnore_name = map[int32]string{
 	4: "PUNCTUATION",
 	5: "WHITESPACE",
 }
+
 var CharsToIgnore_CommonCharsToIgnore_value = map[string]int32{
 	"COMMON_CHARS_TO_IGNORE_UNSPECIFIED": 0,
 	"NUMERIC":                            1,
@@ -417,8 +436,9 @@ var CharsToIgnore_CommonCharsToIgnore_value = map[string]int32{
 func (x CharsToIgnore_CommonCharsToIgnore) String() string {
 	return proto.EnumName(CharsToIgnore_CommonCharsToIgnore_name, int32(x))
 }
+
 func (CharsToIgnore_CommonCharsToIgnore) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{50, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{50, 0}
 }
 
 // These are commonly used subsets of the alphabet that the FFX mode
@@ -445,6 +465,7 @@ var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name = map[int32]string{
 	3: "UPPER_CASE_ALPHA_NUMERIC",
 	4: "ALPHA_NUMERIC",
 }
+
 var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value = map[string]int32{
 	"FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED": 0,
 	"NUMERIC":                                1,
@@ -456,8 +477,9 @@ var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value = map[string]int32{
 func (x CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) String() string {
 	return proto.EnumName(CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, int32(x))
 }
+
 func (CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{54, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{54, 0}
 }
 
 type RecordCondition_Expressions_LogicalOperator int32
@@ -471,6 +493,7 @@ var RecordCondition_Expressions_LogicalOperator_name = map[int32]string{
 	0: "LOGICAL_OPERATOR_UNSPECIFIED",
 	1: "AND",
 }
+
 var RecordCondition_Expressions_LogicalOperator_value = map[string]int32{
 	"LOGICAL_OPERATOR_UNSPECIFIED": 0,
 	"AND":                          1,
@@ -479,8 +502,9 @@ var RecordCondition_Expressions_LogicalOperator_value = map[string]int32{
 func (x RecordCondition_Expressions_LogicalOperator) String() string {
 	return proto.EnumName(RecordCondition_Expressions_LogicalOperator_name, int32(x))
 }
+
 func (RecordCondition_Expressions_LogicalOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{64, 2, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{64, 2, 0}
 }
 
 // Possible outcomes of transformations.
@@ -497,6 +521,7 @@ var TransformationSummary_TransformationResultCode_name = map[int32]string{
 	1: "SUCCESS",
 	2: "ERROR",
 }
+
 var TransformationSummary_TransformationResultCode_value = map[string]int32{
 	"TRANSFORMATION_RESULT_CODE_UNSPECIFIED": 0,
 	"SUCCESS":                                1,
@@ -506,8 +531,9 @@ var TransformationSummary_TransformationResultCode_value = map[string]int32{
 func (x TransformationSummary_TransformationResultCode) String() string {
 	return proto.EnumName(TransformationSummary_TransformationResultCode_name, int32(x))
 }
+
 func (TransformationSummary_TransformationResultCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{66, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{66, 0}
 }
 
 // Whether the trigger is currently active. If PAUSED or CANCELLED, no jobs
@@ -532,6 +558,7 @@ var JobTrigger_Status_name = map[int32]string{
 	2: "PAUSED",
 	3: "CANCELLED",
 }
+
 var JobTrigger_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"HEALTHY":            1,
@@ -542,8 +569,9 @@ var JobTrigger_Status_value = map[string]int32{
 func (x JobTrigger_Status) String() string {
 	return proto.EnumName(JobTrigger_Status_name, int32(x))
 }
+
 func (JobTrigger_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{71, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{71, 0}
 }
 
 type DlpJob_JobState int32
@@ -570,6 +598,7 @@ var DlpJob_JobState_name = map[int32]string{
 	4: "CANCELED",
 	5: "FAILED",
 }
+
 var DlpJob_JobState_value = map[string]int32{
 	"JOB_STATE_UNSPECIFIED": 0,
 	"PENDING":               1,
@@ -582,8 +611,9 @@ var DlpJob_JobState_value = map[string]int32{
 func (x DlpJob_JobState) String() string {
 	return proto.EnumName(DlpJob_JobState_name, int32(x))
 }
+
 func (DlpJob_JobState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{88, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{88, 0}
 }
 
 // List of exclude infoTypes.
@@ -606,16 +636,17 @@ func (m *ExcludeInfoTypes) Reset()         { *m = ExcludeInfoTypes{} }
 func (m *ExcludeInfoTypes) String() string { return proto.CompactTextString(m) }
 func (*ExcludeInfoTypes) ProtoMessage()    {}
 func (*ExcludeInfoTypes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{0}
 }
+
 func (m *ExcludeInfoTypes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExcludeInfoTypes.Unmarshal(m, b)
 }
 func (m *ExcludeInfoTypes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExcludeInfoTypes.Marshal(b, m, deterministic)
 }
-func (dst *ExcludeInfoTypes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExcludeInfoTypes.Merge(dst, src)
+func (m *ExcludeInfoTypes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExcludeInfoTypes.Merge(m, src)
 }
 func (m *ExcludeInfoTypes) XXX_Size() int {
 	return xxx_messageInfo_ExcludeInfoTypes.Size(m)
@@ -652,16 +683,17 @@ func (m *ExclusionRule) Reset()         { *m = ExclusionRule{} }
 func (m *ExclusionRule) String() string { return proto.CompactTextString(m) }
 func (*ExclusionRule) ProtoMessage()    {}
 func (*ExclusionRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{1}
 }
+
 func (m *ExclusionRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExclusionRule.Unmarshal(m, b)
 }
 func (m *ExclusionRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExclusionRule.Marshal(b, m, deterministic)
 }
-func (dst *ExclusionRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExclusionRule.Merge(dst, src)
+func (m *ExclusionRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExclusionRule.Merge(m, src)
 }
 func (m *ExclusionRule) XXX_Size() int {
 	return xxx_messageInfo_ExclusionRule.Size(m)
@@ -729,99 +761,15 @@ func (m *ExclusionRule) GetMatchingType() MatchingType {
 	return MatchingType_MATCHING_TYPE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ExclusionRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ExclusionRule_OneofMarshaler, _ExclusionRule_OneofUnmarshaler, _ExclusionRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ExclusionRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ExclusionRule_Dictionary)(nil),
 		(*ExclusionRule_Regex)(nil),
 		(*ExclusionRule_ExcludeInfoTypes)(nil),
 	}
 }
 
-func _ExclusionRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ExclusionRule)
-	// type
-	switch x := m.Type.(type) {
-	case *ExclusionRule_Dictionary:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Dictionary); err != nil {
-			return err
-		}
-	case *ExclusionRule_Regex:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Regex); err != nil {
-			return err
-		}
-	case *ExclusionRule_ExcludeInfoTypes:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExcludeInfoTypes); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ExclusionRule.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ExclusionRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ExclusionRule)
-	switch tag {
-	case 1: // type.dictionary
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Dictionary)
-		err := b.DecodeMessage(msg)
-		m.Type = &ExclusionRule_Dictionary{msg}
-		return true, err
-	case 2: // type.regex
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Regex)
-		err := b.DecodeMessage(msg)
-		m.Type = &ExclusionRule_Regex{msg}
-		return true, err
-	case 3: // type.exclude_info_types
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExcludeInfoTypes)
-		err := b.DecodeMessage(msg)
-		m.Type = &ExclusionRule_ExcludeInfoTypes{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ExclusionRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ExclusionRule)
-	// type
-	switch x := m.Type.(type) {
-	case *ExclusionRule_Dictionary:
-		s := proto.Size(x.Dictionary)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExclusionRule_Regex:
-		s := proto.Size(x.Regex)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ExclusionRule_ExcludeInfoTypes:
-		s := proto.Size(x.ExcludeInfoTypes)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A single inspection rule to be applied to infoTypes, specified in
 // `InspectionRuleSet`.
 type InspectionRule struct {
@@ -838,16 +786,17 @@ func (m *InspectionRule) Reset()         { *m = InspectionRule{} }
 func (m *InspectionRule) String() string { return proto.CompactTextString(m) }
 func (*InspectionRule) ProtoMessage()    {}
 func (*InspectionRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{2}
+	return fileDescriptor_6872a91dcb80f8dc, []int{2}
 }
+
 func (m *InspectionRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectionRule.Unmarshal(m, b)
 }
 func (m *InspectionRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectionRule.Marshal(b, m, deterministic)
 }
-func (dst *InspectionRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectionRule.Merge(dst, src)
+func (m *InspectionRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectionRule.Merge(m, src)
 }
 func (m *InspectionRule) XXX_Size() int {
 	return xxx_messageInfo_InspectionRule.Size(m)
@@ -895,80 +844,14 @@ func (m *InspectionRule) GetExclusionRule() *ExclusionRule {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*InspectionRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _InspectionRule_OneofMarshaler, _InspectionRule_OneofUnmarshaler, _InspectionRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*InspectionRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*InspectionRule_HotwordRule)(nil),
 		(*InspectionRule_ExclusionRule)(nil),
 	}
 }
 
-func _InspectionRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*InspectionRule)
-	// type
-	switch x := m.Type.(type) {
-	case *InspectionRule_HotwordRule:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotwordRule); err != nil {
-			return err
-		}
-	case *InspectionRule_ExclusionRule:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExclusionRule); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("InspectionRule.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _InspectionRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*InspectionRule)
-	switch tag {
-	case 1: // type.hotword_rule
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_DetectionRule_HotwordRule)
-		err := b.DecodeMessage(msg)
-		m.Type = &InspectionRule_HotwordRule{msg}
-		return true, err
-	case 2: // type.exclusion_rule
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ExclusionRule)
-		err := b.DecodeMessage(msg)
-		m.Type = &InspectionRule_ExclusionRule{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _InspectionRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*InspectionRule)
-	// type
-	switch x := m.Type.(type) {
-	case *InspectionRule_HotwordRule:
-		s := proto.Size(x.HotwordRule)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *InspectionRule_ExclusionRule:
-		s := proto.Size(x.ExclusionRule)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Rule set for modifying a set of infoTypes to alter behavior under certain
 // circumstances, depending on the specific details of the rules within the set.
 type InspectionRuleSet struct {
@@ -985,16 +868,17 @@ func (m *InspectionRuleSet) Reset()         { *m = InspectionRuleSet{} }
 func (m *InspectionRuleSet) String() string { return proto.CompactTextString(m) }
 func (*InspectionRuleSet) ProtoMessage()    {}
 func (*InspectionRuleSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{3}
+	return fileDescriptor_6872a91dcb80f8dc, []int{3}
 }
+
 func (m *InspectionRuleSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectionRuleSet.Unmarshal(m, b)
 }
 func (m *InspectionRuleSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectionRuleSet.Marshal(b, m, deterministic)
 }
-func (dst *InspectionRuleSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectionRuleSet.Merge(dst, src)
+func (m *InspectionRuleSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectionRuleSet.Merge(m, src)
 }
 func (m *InspectionRuleSet) XXX_Size() int {
 	return xxx_messageInfo_InspectionRuleSet.Size(m)
@@ -1065,16 +949,17 @@ func (m *InspectConfig) Reset()         { *m = InspectConfig{} }
 func (m *InspectConfig) String() string { return proto.CompactTextString(m) }
 func (*InspectConfig) ProtoMessage()    {}
 func (*InspectConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{4}
+	return fileDescriptor_6872a91dcb80f8dc, []int{4}
 }
+
 func (m *InspectConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectConfig.Unmarshal(m, b)
 }
 func (m *InspectConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectConfig.Marshal(b, m, deterministic)
 }
-func (dst *InspectConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectConfig.Merge(dst, src)
+func (m *InspectConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectConfig.Merge(m, src)
 }
 func (m *InspectConfig) XXX_Size() int {
 	return xxx_messageInfo_InspectConfig.Size(m)
@@ -1162,16 +1047,17 @@ func (m *InspectConfig_FindingLimits) Reset()         { *m = InspectConfig_Findi
 func (m *InspectConfig_FindingLimits) String() string { return proto.CompactTextString(m) }
 func (*InspectConfig_FindingLimits) ProtoMessage()    {}
 func (*InspectConfig_FindingLimits) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{4, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{4, 0}
 }
+
 func (m *InspectConfig_FindingLimits) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectConfig_FindingLimits.Unmarshal(m, b)
 }
 func (m *InspectConfig_FindingLimits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectConfig_FindingLimits.Marshal(b, m, deterministic)
 }
-func (dst *InspectConfig_FindingLimits) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectConfig_FindingLimits.Merge(dst, src)
+func (m *InspectConfig_FindingLimits) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectConfig_FindingLimits.Merge(m, src)
 }
 func (m *InspectConfig_FindingLimits) XXX_Size() int {
 	return xxx_messageInfo_InspectConfig_FindingLimits.Size(m)
@@ -1224,16 +1110,17 @@ func (m *InspectConfig_FindingLimits_InfoTypeLimit) Reset() {
 func (m *InspectConfig_FindingLimits_InfoTypeLimit) String() string { return proto.CompactTextString(m) }
 func (*InspectConfig_FindingLimits_InfoTypeLimit) ProtoMessage()    {}
 func (*InspectConfig_FindingLimits_InfoTypeLimit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{4, 0, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{4, 0, 0}
 }
+
 func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Unmarshal(m, b)
 }
 func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Marshal(b, m, deterministic)
 }
-func (dst *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Merge(dst, src)
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Merge(m, src)
 }
 func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Size() int {
 	return xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Size(m)
@@ -1273,16 +1160,17 @@ func (m *ByteContentItem) Reset()         { *m = ByteContentItem{} }
 func (m *ByteContentItem) String() string { return proto.CompactTextString(m) }
 func (*ByteContentItem) ProtoMessage()    {}
 func (*ByteContentItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{5}
+	return fileDescriptor_6872a91dcb80f8dc, []int{5}
 }
+
 func (m *ByteContentItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ByteContentItem.Unmarshal(m, b)
 }
 func (m *ByteContentItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ByteContentItem.Marshal(b, m, deterministic)
 }
-func (dst *ByteContentItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ByteContentItem.Merge(dst, src)
+func (m *ByteContentItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ByteContentItem.Merge(m, src)
 }
 func (m *ByteContentItem) XXX_Size() int {
 	return xxx_messageInfo_ByteContentItem.Size(m)
@@ -1325,16 +1213,17 @@ func (m *ContentItem) Reset()         { *m = ContentItem{} }
 func (m *ContentItem) String() string { return proto.CompactTextString(m) }
 func (*ContentItem) ProtoMessage()    {}
 func (*ContentItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{6}
+	return fileDescriptor_6872a91dcb80f8dc, []int{6}
 }
+
 func (m *ContentItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContentItem.Unmarshal(m, b)
 }
 func (m *ContentItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContentItem.Marshal(b, m, deterministic)
 }
-func (dst *ContentItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContentItem.Merge(dst, src)
+func (m *ContentItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentItem.Merge(m, src)
 }
 func (m *ContentItem) XXX_Size() int {
 	return xxx_messageInfo_ContentItem.Size(m)
@@ -1395,95 +1284,15 @@ func (m *ContentItem) GetByteItem() *ByteContentItem {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ContentItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ContentItem_OneofMarshaler, _ContentItem_OneofUnmarshaler, _ContentItem_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ContentItem) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ContentItem_Value)(nil),
 		(*ContentItem_Table)(nil),
 		(*ContentItem_ByteItem)(nil),
 	}
 }
 
-func _ContentItem_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ContentItem)
-	// data_item
-	switch x := m.DataItem.(type) {
-	case *ContentItem_Value:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Value)
-	case *ContentItem_Table:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Table); err != nil {
-			return err
-		}
-	case *ContentItem_ByteItem:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ByteItem); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ContentItem.DataItem has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ContentItem_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ContentItem)
-	switch tag {
-	case 3: // data_item.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.DataItem = &ContentItem_Value{x}
-		return true, err
-	case 4: // data_item.table
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Table)
-		err := b.DecodeMessage(msg)
-		m.DataItem = &ContentItem_Table{msg}
-		return true, err
-	case 5: // data_item.byte_item
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ByteContentItem)
-		err := b.DecodeMessage(msg)
-		m.DataItem = &ContentItem_ByteItem{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ContentItem_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ContentItem)
-	// data_item
-	switch x := m.DataItem.(type) {
-	case *ContentItem_Value:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Value)))
-		n += len(x.Value)
-	case *ContentItem_Table:
-		s := proto.Size(x.Table)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ContentItem_ByteItem:
-		s := proto.Size(x.ByteItem)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Structured content to inspect. Up to 50,000 `Value`s per request allowed.
 // See https://cloud.google.com/dlp/docs/inspecting-text#inspecting_a_table to
 // learn more.
@@ -1499,16 +1308,17 @@ func (m *Table) Reset()         { *m = Table{} }
 func (m *Table) String() string { return proto.CompactTextString(m) }
 func (*Table) ProtoMessage()    {}
 func (*Table) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{7}
+	return fileDescriptor_6872a91dcb80f8dc, []int{7}
 }
+
 func (m *Table) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Table.Unmarshal(m, b)
 }
 func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
 }
-func (dst *Table) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Table.Merge(dst, src)
+func (m *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(m, src)
 }
 func (m *Table) XXX_Size() int {
 	return xxx_messageInfo_Table.Size(m)
@@ -1544,16 +1354,17 @@ func (m *Table_Row) Reset()         { *m = Table_Row{} }
 func (m *Table_Row) String() string { return proto.CompactTextString(m) }
 func (*Table_Row) ProtoMessage()    {}
 func (*Table_Row) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{7, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{7, 0}
 }
+
 func (m *Table_Row) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Table_Row.Unmarshal(m, b)
 }
 func (m *Table_Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Table_Row.Marshal(b, m, deterministic)
 }
-func (dst *Table_Row) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Table_Row.Merge(dst, src)
+func (m *Table_Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table_Row.Merge(m, src)
 }
 func (m *Table_Row) XXX_Size() int {
 	return xxx_messageInfo_Table_Row.Size(m)
@@ -1591,16 +1402,17 @@ func (m *InspectResult) Reset()         { *m = InspectResult{} }
 func (m *InspectResult) String() string { return proto.CompactTextString(m) }
 func (*InspectResult) ProtoMessage()    {}
 func (*InspectResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{8}
+	return fileDescriptor_6872a91dcb80f8dc, []int{8}
 }
+
 func (m *InspectResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectResult.Unmarshal(m, b)
 }
 func (m *InspectResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectResult.Marshal(b, m, deterministic)
 }
-func (dst *InspectResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectResult.Merge(dst, src)
+func (m *InspectResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectResult.Merge(m, src)
 }
 func (m *InspectResult) XXX_Size() int {
 	return xxx_messageInfo_InspectResult.Size(m)
@@ -1655,16 +1467,17 @@ func (m *Finding) Reset()         { *m = Finding{} }
 func (m *Finding) String() string { return proto.CompactTextString(m) }
 func (*Finding) ProtoMessage()    {}
 func (*Finding) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{9}
+	return fileDescriptor_6872a91dcb80f8dc, []int{9}
 }
+
 func (m *Finding) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Finding.Unmarshal(m, b)
 }
 func (m *Finding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Finding.Marshal(b, m, deterministic)
 }
-func (dst *Finding) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Finding.Merge(dst, src)
+func (m *Finding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Finding.Merge(m, src)
 }
 func (m *Finding) XXX_Size() int {
 	return xxx_messageInfo_Finding.Size(m)
@@ -1741,16 +1554,17 @@ func (m *Location) Reset()         { *m = Location{} }
 func (m *Location) String() string { return proto.CompactTextString(m) }
 func (*Location) ProtoMessage()    {}
 func (*Location) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{10}
+	return fileDescriptor_6872a91dcb80f8dc, []int{10}
 }
+
 func (m *Location) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Location.Unmarshal(m, b)
 }
 func (m *Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Location.Marshal(b, m, deterministic)
 }
-func (dst *Location) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Location.Merge(dst, src)
+func (m *Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Location.Merge(m, src)
 }
 func (m *Location) XXX_Size() int {
 	return xxx_messageInfo_Location.Size(m)
@@ -1819,16 +1633,17 @@ func (m *ContentLocation) Reset()         { *m = ContentLocation{} }
 func (m *ContentLocation) String() string { return proto.CompactTextString(m) }
 func (*ContentLocation) ProtoMessage()    {}
 func (*ContentLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{11}
+	return fileDescriptor_6872a91dcb80f8dc, []int{11}
 }
+
 func (m *ContentLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContentLocation.Unmarshal(m, b)
 }
 func (m *ContentLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContentLocation.Marshal(b, m, deterministic)
 }
-func (dst *ContentLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContentLocation.Merge(dst, src)
+func (m *ContentLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentLocation.Merge(m, src)
 }
 func (m *ContentLocation) XXX_Size() int {
 	return xxx_messageInfo_ContentLocation.Size(m)
@@ -1910,99 +1725,15 @@ func (m *ContentLocation) GetContainerVersion() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ContentLocation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ContentLocation_OneofMarshaler, _ContentLocation_OneofUnmarshaler, _ContentLocation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ContentLocation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ContentLocation_RecordLocation)(nil),
 		(*ContentLocation_ImageLocation)(nil),
 		(*ContentLocation_DocumentLocation)(nil),
 	}
 }
 
-func _ContentLocation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ContentLocation)
-	// location
-	switch x := m.Location.(type) {
-	case *ContentLocation_RecordLocation:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RecordLocation); err != nil {
-			return err
-		}
-	case *ContentLocation_ImageLocation:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ImageLocation); err != nil {
-			return err
-		}
-	case *ContentLocation_DocumentLocation:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DocumentLocation); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ContentLocation.Location has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ContentLocation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ContentLocation)
-	switch tag {
-	case 2: // location.record_location
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RecordLocation)
-		err := b.DecodeMessage(msg)
-		m.Location = &ContentLocation_RecordLocation{msg}
-		return true, err
-	case 3: // location.image_location
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ImageLocation)
-		err := b.DecodeMessage(msg)
-		m.Location = &ContentLocation_ImageLocation{msg}
-		return true, err
-	case 5: // location.document_location
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DocumentLocation)
-		err := b.DecodeMessage(msg)
-		m.Location = &ContentLocation_DocumentLocation{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ContentLocation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ContentLocation)
-	// location
-	switch x := m.Location.(type) {
-	case *ContentLocation_RecordLocation:
-		s := proto.Size(x.RecordLocation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ContentLocation_ImageLocation:
-		s := proto.Size(x.ImageLocation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ContentLocation_DocumentLocation:
-		s := proto.Size(x.DocumentLocation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Location of a finding within a document.
 type DocumentLocation struct {
 	// Offset of the line, from the beginning of the file, where the finding
@@ -2017,16 +1748,17 @@ func (m *DocumentLocation) Reset()         { *m = DocumentLocation{} }
 func (m *DocumentLocation) String() string { return proto.CompactTextString(m) }
 func (*DocumentLocation) ProtoMessage()    {}
 func (*DocumentLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{12}
+	return fileDescriptor_6872a91dcb80f8dc, []int{12}
 }
+
 func (m *DocumentLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DocumentLocation.Unmarshal(m, b)
 }
 func (m *DocumentLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DocumentLocation.Marshal(b, m, deterministic)
 }
-func (dst *DocumentLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DocumentLocation.Merge(dst, src)
+func (m *DocumentLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentLocation.Merge(m, src)
 }
 func (m *DocumentLocation) XXX_Size() int {
 	return xxx_messageInfo_DocumentLocation.Size(m)
@@ -2061,16 +1793,17 @@ func (m *RecordLocation) Reset()         { *m = RecordLocation{} }
 func (m *RecordLocation) String() string { return proto.CompactTextString(m) }
 func (*RecordLocation) ProtoMessage()    {}
 func (*RecordLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{13}
+	return fileDescriptor_6872a91dcb80f8dc, []int{13}
 }
+
 func (m *RecordLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordLocation.Unmarshal(m, b)
 }
 func (m *RecordLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordLocation.Marshal(b, m, deterministic)
 }
-func (dst *RecordLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordLocation.Merge(dst, src)
+func (m *RecordLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordLocation.Merge(m, src)
 }
 func (m *RecordLocation) XXX_Size() int {
 	return xxx_messageInfo_RecordLocation.Size(m)
@@ -2115,16 +1848,17 @@ func (m *TableLocation) Reset()         { *m = TableLocation{} }
 func (m *TableLocation) String() string { return proto.CompactTextString(m) }
 func (*TableLocation) ProtoMessage()    {}
 func (*TableLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{14}
+	return fileDescriptor_6872a91dcb80f8dc, []int{14}
 }
+
 func (m *TableLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TableLocation.Unmarshal(m, b)
 }
 func (m *TableLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TableLocation.Marshal(b, m, deterministic)
 }
-func (dst *TableLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TableLocation.Merge(dst, src)
+func (m *TableLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableLocation.Merge(m, src)
 }
 func (m *TableLocation) XXX_Size() int {
 	return xxx_messageInfo_TableLocation.Size(m)
@@ -2157,16 +1891,17 @@ func (m *Range) Reset()         { *m = Range{} }
 func (m *Range) String() string { return proto.CompactTextString(m) }
 func (*Range) ProtoMessage()    {}
 func (*Range) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{15}
+	return fileDescriptor_6872a91dcb80f8dc, []int{15}
 }
+
 func (m *Range) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Range.Unmarshal(m, b)
 }
 func (m *Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Range.Marshal(b, m, deterministic)
 }
-func (dst *Range) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Range.Merge(dst, src)
+func (m *Range) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Range.Merge(m, src)
 }
 func (m *Range) XXX_Size() int {
 	return xxx_messageInfo_Range.Size(m)
@@ -2204,16 +1939,17 @@ func (m *ImageLocation) Reset()         { *m = ImageLocation{} }
 func (m *ImageLocation) String() string { return proto.CompactTextString(m) }
 func (*ImageLocation) ProtoMessage()    {}
 func (*ImageLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{16}
+	return fileDescriptor_6872a91dcb80f8dc, []int{16}
 }
+
 func (m *ImageLocation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImageLocation.Unmarshal(m, b)
 }
 func (m *ImageLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImageLocation.Marshal(b, m, deterministic)
 }
-func (dst *ImageLocation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImageLocation.Merge(dst, src)
+func (m *ImageLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageLocation.Merge(m, src)
 }
 func (m *ImageLocation) XXX_Size() int {
 	return xxx_messageInfo_ImageLocation.Size(m)
@@ -2250,16 +1986,17 @@ func (m *BoundingBox) Reset()         { *m = BoundingBox{} }
 func (m *BoundingBox) String() string { return proto.CompactTextString(m) }
 func (*BoundingBox) ProtoMessage()    {}
 func (*BoundingBox) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{17}
+	return fileDescriptor_6872a91dcb80f8dc, []int{17}
 }
+
 func (m *BoundingBox) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoundingBox.Unmarshal(m, b)
 }
 func (m *BoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BoundingBox.Marshal(b, m, deterministic)
 }
-func (dst *BoundingBox) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BoundingBox.Merge(dst, src)
+func (m *BoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingBox.Merge(m, src)
 }
 func (m *BoundingBox) XXX_Size() int {
 	return xxx_messageInfo_BoundingBox.Size(m)
@@ -2321,16 +2058,17 @@ func (m *RedactImageRequest) Reset()         { *m = RedactImageRequest{} }
 func (m *RedactImageRequest) String() string { return proto.CompactTextString(m) }
 func (*RedactImageRequest) ProtoMessage()    {}
 func (*RedactImageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{18}
+	return fileDescriptor_6872a91dcb80f8dc, []int{18}
 }
+
 func (m *RedactImageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RedactImageRequest.Unmarshal(m, b)
 }
 func (m *RedactImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RedactImageRequest.Marshal(b, m, deterministic)
 }
-func (dst *RedactImageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RedactImageRequest.Merge(dst, src)
+func (m *RedactImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactImageRequest.Merge(m, src)
 }
 func (m *RedactImageRequest) XXX_Size() int {
 	return xxx_messageInfo_RedactImageRequest.Size(m)
@@ -2398,16 +2136,17 @@ func (m *RedactImageRequest_ImageRedactionConfig) Reset() {
 func (m *RedactImageRequest_ImageRedactionConfig) String() string { return proto.CompactTextString(m) }
 func (*RedactImageRequest_ImageRedactionConfig) ProtoMessage()    {}
 func (*RedactImageRequest_ImageRedactionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{18, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{18, 0}
 }
+
 func (m *RedactImageRequest_ImageRedactionConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Unmarshal(m, b)
 }
 func (m *RedactImageRequest_ImageRedactionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Marshal(b, m, deterministic)
 }
-func (dst *RedactImageRequest_ImageRedactionConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Merge(dst, src)
+func (m *RedactImageRequest_ImageRedactionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Merge(m, src)
 }
 func (m *RedactImageRequest_ImageRedactionConfig) XXX_Size() int {
 	return xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Size(m)
@@ -2464,79 +2203,14 @@ func (m *RedactImageRequest_ImageRedactionConfig) GetRedactionColor() *Color {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RedactImageRequest_ImageRedactionConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RedactImageRequest_ImageRedactionConfig_OneofMarshaler, _RedactImageRequest_ImageRedactionConfig_OneofUnmarshaler, _RedactImageRequest_ImageRedactionConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RedactImageRequest_ImageRedactionConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RedactImageRequest_ImageRedactionConfig_InfoType)(nil),
 		(*RedactImageRequest_ImageRedactionConfig_RedactAllText)(nil),
 	}
 }
 
-func _RedactImageRequest_ImageRedactionConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RedactImageRequest_ImageRedactionConfig)
-	// target
-	switch x := m.Target.(type) {
-	case *RedactImageRequest_ImageRedactionConfig_InfoType:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoType); err != nil {
-			return err
-		}
-	case *RedactImageRequest_ImageRedactionConfig_RedactAllText:
-		t := uint64(0)
-		if x.RedactAllText {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("RedactImageRequest_ImageRedactionConfig.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RedactImageRequest_ImageRedactionConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RedactImageRequest_ImageRedactionConfig)
-	switch tag {
-	case 1: // target.info_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoType)
-		err := b.DecodeMessage(msg)
-		m.Target = &RedactImageRequest_ImageRedactionConfig_InfoType{msg}
-		return true, err
-	case 2: // target.redact_all_text
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &RedactImageRequest_ImageRedactionConfig_RedactAllText{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RedactImageRequest_ImageRedactionConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RedactImageRequest_ImageRedactionConfig)
-	// target
-	switch x := m.Target.(type) {
-	case *RedactImageRequest_ImageRedactionConfig_InfoType:
-		s := proto.Size(x.InfoType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RedactImageRequest_ImageRedactionConfig_RedactAllText:
-		n += 1 // tag and wire
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Represents a color in the RGB color space.
 type Color struct {
 	// The amount of red in the color as a value in the interval [0, 1].
@@ -2554,16 +2228,17 @@ func (m *Color) Reset()         { *m = Color{} }
 func (m *Color) String() string { return proto.CompactTextString(m) }
 func (*Color) ProtoMessage()    {}
 func (*Color) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{19}
+	return fileDescriptor_6872a91dcb80f8dc, []int{19}
 }
+
 func (m *Color) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Color.Unmarshal(m, b)
 }
 func (m *Color) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Color.Marshal(b, m, deterministic)
 }
-func (dst *Color) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Color.Merge(dst, src)
+func (m *Color) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Color.Merge(m, src)
 }
 func (m *Color) XXX_Size() int {
 	return xxx_messageInfo_Color.Size(m)
@@ -2614,16 +2289,17 @@ func (m *RedactImageResponse) Reset()         { *m = RedactImageResponse{} }
 func (m *RedactImageResponse) String() string { return proto.CompactTextString(m) }
 func (*RedactImageResponse) ProtoMessage()    {}
 func (*RedactImageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{20}
+	return fileDescriptor_6872a91dcb80f8dc, []int{20}
 }
+
 func (m *RedactImageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RedactImageResponse.Unmarshal(m, b)
 }
 func (m *RedactImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RedactImageResponse.Marshal(b, m, deterministic)
 }
-func (dst *RedactImageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RedactImageResponse.Merge(dst, src)
+func (m *RedactImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactImageResponse.Merge(m, src)
 }
 func (m *RedactImageResponse) XXX_Size() int {
 	return xxx_messageInfo_RedactImageResponse.Size(m)
@@ -2690,16 +2366,17 @@ func (m *DeidentifyContentRequest) Reset()         { *m = DeidentifyContentReque
 func (m *DeidentifyContentRequest) String() string { return proto.CompactTextString(m) }
 func (*DeidentifyContentRequest) ProtoMessage()    {}
 func (*DeidentifyContentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{21}
+	return fileDescriptor_6872a91dcb80f8dc, []int{21}
 }
+
 func (m *DeidentifyContentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeidentifyContentRequest.Unmarshal(m, b)
 }
 func (m *DeidentifyContentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeidentifyContentRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeidentifyContentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeidentifyContentRequest.Merge(dst, src)
+func (m *DeidentifyContentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyContentRequest.Merge(m, src)
 }
 func (m *DeidentifyContentRequest) XXX_Size() int {
 	return xxx_messageInfo_DeidentifyContentRequest.Size(m)
@@ -2767,16 +2444,17 @@ func (m *DeidentifyContentResponse) Reset()         { *m = DeidentifyContentResp
 func (m *DeidentifyContentResponse) String() string { return proto.CompactTextString(m) }
 func (*DeidentifyContentResponse) ProtoMessage()    {}
 func (*DeidentifyContentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{22}
+	return fileDescriptor_6872a91dcb80f8dc, []int{22}
 }
+
 func (m *DeidentifyContentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeidentifyContentResponse.Unmarshal(m, b)
 }
 func (m *DeidentifyContentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeidentifyContentResponse.Marshal(b, m, deterministic)
 }
-func (dst *DeidentifyContentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeidentifyContentResponse.Merge(dst, src)
+func (m *DeidentifyContentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyContentResponse.Merge(m, src)
 }
 func (m *DeidentifyContentResponse) XXX_Size() int {
 	return xxx_messageInfo_DeidentifyContentResponse.Size(m)
@@ -2841,16 +2519,17 @@ func (m *ReidentifyContentRequest) Reset()         { *m = ReidentifyContentReque
 func (m *ReidentifyContentRequest) String() string { return proto.CompactTextString(m) }
 func (*ReidentifyContentRequest) ProtoMessage()    {}
 func (*ReidentifyContentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{23}
+	return fileDescriptor_6872a91dcb80f8dc, []int{23}
 }
+
 func (m *ReidentifyContentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReidentifyContentRequest.Unmarshal(m, b)
 }
 func (m *ReidentifyContentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReidentifyContentRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReidentifyContentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReidentifyContentRequest.Merge(dst, src)
+func (m *ReidentifyContentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReidentifyContentRequest.Merge(m, src)
 }
 func (m *ReidentifyContentRequest) XXX_Size() int {
 	return xxx_messageInfo_ReidentifyContentRequest.Size(m)
@@ -2918,16 +2597,17 @@ func (m *ReidentifyContentResponse) Reset()         { *m = ReidentifyContentResp
 func (m *ReidentifyContentResponse) String() string { return proto.CompactTextString(m) }
 func (*ReidentifyContentResponse) ProtoMessage()    {}
 func (*ReidentifyContentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{24}
+	return fileDescriptor_6872a91dcb80f8dc, []int{24}
 }
+
 func (m *ReidentifyContentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReidentifyContentResponse.Unmarshal(m, b)
 }
 func (m *ReidentifyContentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReidentifyContentResponse.Marshal(b, m, deterministic)
 }
-func (dst *ReidentifyContentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReidentifyContentResponse.Merge(dst, src)
+func (m *ReidentifyContentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReidentifyContentResponse.Merge(m, src)
 }
 func (m *ReidentifyContentResponse) XXX_Size() int {
 	return xxx_messageInfo_ReidentifyContentResponse.Size(m)
@@ -2976,16 +2656,17 @@ func (m *InspectContentRequest) Reset()         { *m = InspectContentRequest{} }
 func (m *InspectContentRequest) String() string { return proto.CompactTextString(m) }
 func (*InspectContentRequest) ProtoMessage()    {}
 func (*InspectContentRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{25}
+	return fileDescriptor_6872a91dcb80f8dc, []int{25}
 }
+
 func (m *InspectContentRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectContentRequest.Unmarshal(m, b)
 }
 func (m *InspectContentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectContentRequest.Marshal(b, m, deterministic)
 }
-func (dst *InspectContentRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectContentRequest.Merge(dst, src)
+func (m *InspectContentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectContentRequest.Merge(m, src)
 }
 func (m *InspectContentRequest) XXX_Size() int {
 	return xxx_messageInfo_InspectContentRequest.Size(m)
@@ -3037,16 +2718,17 @@ func (m *InspectContentResponse) Reset()         { *m = InspectContentResponse{}
 func (m *InspectContentResponse) String() string { return proto.CompactTextString(m) }
 func (*InspectContentResponse) ProtoMessage()    {}
 func (*InspectContentResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{26}
+	return fileDescriptor_6872a91dcb80f8dc, []int{26}
 }
+
 func (m *InspectContentResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectContentResponse.Unmarshal(m, b)
 }
 func (m *InspectContentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectContentResponse.Marshal(b, m, deterministic)
 }
-func (dst *InspectContentResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectContentResponse.Merge(dst, src)
+func (m *InspectContentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectContentResponse.Merge(m, src)
 }
 func (m *InspectContentResponse) XXX_Size() int {
 	return xxx_messageInfo_InspectContentResponse.Size(m)
@@ -3088,16 +2770,17 @@ func (m *OutputStorageConfig) Reset()         { *m = OutputStorageConfig{} }
 func (m *OutputStorageConfig) String() string { return proto.CompactTextString(m) }
 func (*OutputStorageConfig) ProtoMessage()    {}
 func (*OutputStorageConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{27}
+	return fileDescriptor_6872a91dcb80f8dc, []int{27}
 }
+
 func (m *OutputStorageConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OutputStorageConfig.Unmarshal(m, b)
 }
 func (m *OutputStorageConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OutputStorageConfig.Marshal(b, m, deterministic)
 }
-func (dst *OutputStorageConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutputStorageConfig.Merge(dst, src)
+func (m *OutputStorageConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputStorageConfig.Merge(m, src)
 }
 func (m *OutputStorageConfig) XXX_Size() int {
 	return xxx_messageInfo_OutputStorageConfig.Size(m)
@@ -3139,61 +2822,13 @@ func (m *OutputStorageConfig) GetOutputSchema() OutputStorageConfig_OutputSchema
 	return OutputStorageConfig_OUTPUT_SCHEMA_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputStorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputStorageConfig_OneofMarshaler, _OutputStorageConfig_OneofUnmarshaler, _OutputStorageConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*OutputStorageConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*OutputStorageConfig_Table)(nil),
 	}
 }
 
-func _OutputStorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputStorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *OutputStorageConfig_Table:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Table); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputStorageConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputStorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputStorageConfig)
-	switch tag {
-	case 1: // type.table
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryTable)
-		err := b.DecodeMessage(msg)
-		m.Type = &OutputStorageConfig_Table{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputStorageConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputStorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *OutputStorageConfig_Table:
-		s := proto.Size(x.Table)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Statistics regarding a specific InfoType.
 type InfoTypeStats struct {
 	// The type of finding this stat is for.
@@ -3209,16 +2844,17 @@ func (m *InfoTypeStats) Reset()         { *m = InfoTypeStats{} }
 func (m *InfoTypeStats) String() string { return proto.CompactTextString(m) }
 func (*InfoTypeStats) ProtoMessage()    {}
 func (*InfoTypeStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{28}
+	return fileDescriptor_6872a91dcb80f8dc, []int{28}
 }
+
 func (m *InfoTypeStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InfoTypeStats.Unmarshal(m, b)
 }
 func (m *InfoTypeStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InfoTypeStats.Marshal(b, m, deterministic)
 }
-func (dst *InfoTypeStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InfoTypeStats.Merge(dst, src)
+func (m *InfoTypeStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeStats.Merge(m, src)
 }
 func (m *InfoTypeStats) XXX_Size() int {
 	return xxx_messageInfo_InfoTypeStats.Size(m)
@@ -3258,16 +2894,17 @@ func (m *InspectDataSourceDetails) Reset()         { *m = InspectDataSourceDetai
 func (m *InspectDataSourceDetails) String() string { return proto.CompactTextString(m) }
 func (*InspectDataSourceDetails) ProtoMessage()    {}
 func (*InspectDataSourceDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{29}
+	return fileDescriptor_6872a91dcb80f8dc, []int{29}
 }
+
 func (m *InspectDataSourceDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectDataSourceDetails.Unmarshal(m, b)
 }
 func (m *InspectDataSourceDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectDataSourceDetails.Marshal(b, m, deterministic)
 }
-func (dst *InspectDataSourceDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectDataSourceDetails.Merge(dst, src)
+func (m *InspectDataSourceDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectDataSourceDetails.Merge(m, src)
 }
 func (m *InspectDataSourceDetails) XXX_Size() int {
 	return xxx_messageInfo_InspectDataSourceDetails.Size(m)
@@ -3308,16 +2945,17 @@ func (m *InspectDataSourceDetails_RequestedOptions) Reset() {
 func (m *InspectDataSourceDetails_RequestedOptions) String() string { return proto.CompactTextString(m) }
 func (*InspectDataSourceDetails_RequestedOptions) ProtoMessage()    {}
 func (*InspectDataSourceDetails_RequestedOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{29, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{29, 0}
 }
+
 func (m *InspectDataSourceDetails_RequestedOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Unmarshal(m, b)
 }
 func (m *InspectDataSourceDetails_RequestedOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Marshal(b, m, deterministic)
 }
-func (dst *InspectDataSourceDetails_RequestedOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Merge(dst, src)
+func (m *InspectDataSourceDetails_RequestedOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Merge(m, src)
 }
 func (m *InspectDataSourceDetails_RequestedOptions) XXX_Size() int {
 	return xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Size(m)
@@ -3360,16 +2998,17 @@ func (m *InspectDataSourceDetails_Result) Reset()         { *m = InspectDataSour
 func (m *InspectDataSourceDetails_Result) String() string { return proto.CompactTextString(m) }
 func (*InspectDataSourceDetails_Result) ProtoMessage()    {}
 func (*InspectDataSourceDetails_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{29, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{29, 1}
 }
+
 func (m *InspectDataSourceDetails_Result) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectDataSourceDetails_Result.Unmarshal(m, b)
 }
 func (m *InspectDataSourceDetails_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectDataSourceDetails_Result.Marshal(b, m, deterministic)
 }
-func (dst *InspectDataSourceDetails_Result) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectDataSourceDetails_Result.Merge(dst, src)
+func (m *InspectDataSourceDetails_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectDataSourceDetails_Result.Merge(m, src)
 }
 func (m *InspectDataSourceDetails_Result) XXX_Size() int {
 	return xxx_messageInfo_InspectDataSourceDetails_Result.Size(m)
@@ -3421,16 +3060,17 @@ func (m *InfoTypeDescription) Reset()         { *m = InfoTypeDescription{} }
 func (m *InfoTypeDescription) String() string { return proto.CompactTextString(m) }
 func (*InfoTypeDescription) ProtoMessage()    {}
 func (*InfoTypeDescription) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{30}
+	return fileDescriptor_6872a91dcb80f8dc, []int{30}
 }
+
 func (m *InfoTypeDescription) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InfoTypeDescription.Unmarshal(m, b)
 }
 func (m *InfoTypeDescription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InfoTypeDescription.Marshal(b, m, deterministic)
 }
-func (dst *InfoTypeDescription) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InfoTypeDescription.Merge(dst, src)
+func (m *InfoTypeDescription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeDescription.Merge(m, src)
 }
 func (m *InfoTypeDescription) XXX_Size() int {
 	return xxx_messageInfo_InfoTypeDescription.Size(m)
@@ -3487,16 +3127,17 @@ func (m *ListInfoTypesRequest) Reset()         { *m = ListInfoTypesRequest{} }
 func (m *ListInfoTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInfoTypesRequest) ProtoMessage()    {}
 func (*ListInfoTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{31}
+	return fileDescriptor_6872a91dcb80f8dc, []int{31}
 }
+
 func (m *ListInfoTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInfoTypesRequest.Unmarshal(m, b)
 }
 func (m *ListInfoTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInfoTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInfoTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInfoTypesRequest.Merge(dst, src)
+func (m *ListInfoTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInfoTypesRequest.Merge(m, src)
 }
 func (m *ListInfoTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInfoTypesRequest.Size(m)
@@ -3534,16 +3175,17 @@ func (m *ListInfoTypesResponse) Reset()         { *m = ListInfoTypesResponse{} }
 func (m *ListInfoTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInfoTypesResponse) ProtoMessage()    {}
 func (*ListInfoTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{32}
+	return fileDescriptor_6872a91dcb80f8dc, []int{32}
 }
+
 func (m *ListInfoTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInfoTypesResponse.Unmarshal(m, b)
 }
 func (m *ListInfoTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInfoTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInfoTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInfoTypesResponse.Merge(dst, src)
+func (m *ListInfoTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInfoTypesResponse.Merge(m, src)
 }
 func (m *ListInfoTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInfoTypesResponse.Size(m)
@@ -3580,16 +3222,17 @@ func (m *RiskAnalysisJobConfig) Reset()         { *m = RiskAnalysisJobConfig{} }
 func (m *RiskAnalysisJobConfig) String() string { return proto.CompactTextString(m) }
 func (*RiskAnalysisJobConfig) ProtoMessage()    {}
 func (*RiskAnalysisJobConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{33}
+	return fileDescriptor_6872a91dcb80f8dc, []int{33}
 }
+
 func (m *RiskAnalysisJobConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RiskAnalysisJobConfig.Unmarshal(m, b)
 }
 func (m *RiskAnalysisJobConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RiskAnalysisJobConfig.Marshal(b, m, deterministic)
 }
-func (dst *RiskAnalysisJobConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RiskAnalysisJobConfig.Merge(dst, src)
+func (m *RiskAnalysisJobConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RiskAnalysisJobConfig.Merge(m, src)
 }
 func (m *RiskAnalysisJobConfig) XXX_Size() int {
 	return xxx_messageInfo_RiskAnalysisJobConfig.Size(m)
@@ -3643,16 +3286,17 @@ func (m *QuasiId) Reset()         { *m = QuasiId{} }
 func (m *QuasiId) String() string { return proto.CompactTextString(m) }
 func (*QuasiId) ProtoMessage()    {}
 func (*QuasiId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{34}
+	return fileDescriptor_6872a91dcb80f8dc, []int{34}
 }
+
 func (m *QuasiId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuasiId.Unmarshal(m, b)
 }
 func (m *QuasiId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuasiId.Marshal(b, m, deterministic)
 }
-func (dst *QuasiId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuasiId.Merge(dst, src)
+func (m *QuasiId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuasiId.Merge(m, src)
 }
 func (m *QuasiId) XXX_Size() int {
 	return xxx_messageInfo_QuasiId.Size(m)
@@ -3720,95 +3364,15 @@ func (m *QuasiId) GetInferred() *empty.Empty {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*QuasiId) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _QuasiId_OneofMarshaler, _QuasiId_OneofUnmarshaler, _QuasiId_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*QuasiId) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*QuasiId_InfoType)(nil),
 		(*QuasiId_CustomTag)(nil),
 		(*QuasiId_Inferred)(nil),
 	}
 }
 
-func _QuasiId_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*QuasiId)
-	// tag
-	switch x := m.Tag.(type) {
-	case *QuasiId_InfoType:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoType); err != nil {
-			return err
-		}
-	case *QuasiId_CustomTag:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CustomTag)
-	case *QuasiId_Inferred:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Inferred); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("QuasiId.Tag has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _QuasiId_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*QuasiId)
-	switch tag {
-	case 2: // tag.info_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoType)
-		err := b.DecodeMessage(msg)
-		m.Tag = &QuasiId_InfoType{msg}
-		return true, err
-	case 3: // tag.custom_tag
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Tag = &QuasiId_CustomTag{x}
-		return true, err
-	case 4: // tag.inferred
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(empty.Empty)
-		err := b.DecodeMessage(msg)
-		m.Tag = &QuasiId_Inferred{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _QuasiId_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*QuasiId)
-	// tag
-	switch x := m.Tag.(type) {
-	case *QuasiId_InfoType:
-		s := proto.Size(x.InfoType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *QuasiId_CustomTag:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.CustomTag)))
-		n += len(x.CustomTag)
-	case *QuasiId_Inferred:
-		s := proto.Size(x.Inferred)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An auxiliary table containing statistical information on the relative
 // frequency of different quasi-identifiers values. It has one or several
 // quasi-identifiers columns, and one column that indicates the relative
@@ -3834,16 +3398,17 @@ func (m *StatisticalTable) Reset()         { *m = StatisticalTable{} }
 func (m *StatisticalTable) String() string { return proto.CompactTextString(m) }
 func (*StatisticalTable) ProtoMessage()    {}
 func (*StatisticalTable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{35}
+	return fileDescriptor_6872a91dcb80f8dc, []int{35}
 }
+
 func (m *StatisticalTable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StatisticalTable.Unmarshal(m, b)
 }
 func (m *StatisticalTable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StatisticalTable.Marshal(b, m, deterministic)
 }
-func (dst *StatisticalTable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StatisticalTable.Merge(dst, src)
+func (m *StatisticalTable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatisticalTable.Merge(m, src)
 }
 func (m *StatisticalTable) XXX_Size() int {
 	return xxx_messageInfo_StatisticalTable.Size(m)
@@ -3889,16 +3454,17 @@ func (m *StatisticalTable_QuasiIdentifierField) Reset()         { *m = Statistic
 func (m *StatisticalTable_QuasiIdentifierField) String() string { return proto.CompactTextString(m) }
 func (*StatisticalTable_QuasiIdentifierField) ProtoMessage()    {}
 func (*StatisticalTable_QuasiIdentifierField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{35, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{35, 0}
 }
+
 func (m *StatisticalTable_QuasiIdentifierField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Unmarshal(m, b)
 }
 func (m *StatisticalTable_QuasiIdentifierField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Marshal(b, m, deterministic)
 }
-func (dst *StatisticalTable_QuasiIdentifierField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Merge(dst, src)
+func (m *StatisticalTable_QuasiIdentifierField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Merge(m, src)
 }
 func (m *StatisticalTable_QuasiIdentifierField) XXX_Size() int {
 	return xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Size(m)
@@ -3942,16 +3508,17 @@ func (m *PrivacyMetric) Reset()         { *m = PrivacyMetric{} }
 func (m *PrivacyMetric) String() string { return proto.CompactTextString(m) }
 func (*PrivacyMetric) ProtoMessage()    {}
 func (*PrivacyMetric) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36}
 }
+
 func (m *PrivacyMetric) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric.Unmarshal(m, b)
 }
 func (m *PrivacyMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric.Merge(dst, src)
+func (m *PrivacyMetric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric.Merge(m, src)
 }
 func (m *PrivacyMetric) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric.Size(m)
@@ -4051,9 +3618,9 @@ func (m *PrivacyMetric) GetDeltaPresenceEstimationConfig() *PrivacyMetric_DeltaP
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrivacyMetric) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrivacyMetric_OneofMarshaler, _PrivacyMetric_OneofUnmarshaler, _PrivacyMetric_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PrivacyMetric) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PrivacyMetric_NumericalStatsConfig_)(nil),
 		(*PrivacyMetric_CategoricalStatsConfig_)(nil),
 		(*PrivacyMetric_KAnonymityConfig_)(nil),
@@ -4063,144 +3630,6 @@ func (*PrivacyMetric) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 	}
 }
 
-func _PrivacyMetric_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrivacyMetric)
-	// type
-	switch x := m.Type.(type) {
-	case *PrivacyMetric_NumericalStatsConfig_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NumericalStatsConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_CategoricalStatsConfig_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CategoricalStatsConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_KAnonymityConfig_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KAnonymityConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_LDiversityConfig_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LDiversityConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_KMapEstimationConfig_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KMapEstimationConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_DeltaPresenceEstimationConfig_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeltaPresenceEstimationConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrivacyMetric.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrivacyMetric_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrivacyMetric)
-	switch tag {
-	case 1: // type.numerical_stats_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_NumericalStatsConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_NumericalStatsConfig_{msg}
-		return true, err
-	case 2: // type.categorical_stats_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_CategoricalStatsConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_CategoricalStatsConfig_{msg}
-		return true, err
-	case 3: // type.k_anonymity_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_KAnonymityConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_KAnonymityConfig_{msg}
-		return true, err
-	case 4: // type.l_diversity_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_LDiversityConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_LDiversityConfig_{msg}
-		return true, err
-	case 5: // type.k_map_estimation_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_KMapEstimationConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_KMapEstimationConfig_{msg}
-		return true, err
-	case 6: // type.delta_presence_estimation_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_DeltaPresenceEstimationConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_DeltaPresenceEstimationConfig_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrivacyMetric_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrivacyMetric)
-	// type
-	switch x := m.Type.(type) {
-	case *PrivacyMetric_NumericalStatsConfig_:
-		s := proto.Size(x.NumericalStatsConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_CategoricalStatsConfig_:
-		s := proto.Size(x.CategoricalStatsConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_KAnonymityConfig_:
-		s := proto.Size(x.KAnonymityConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_LDiversityConfig_:
-		s := proto.Size(x.LDiversityConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_KMapEstimationConfig_:
-		s := proto.Size(x.KMapEstimationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_DeltaPresenceEstimationConfig_:
-		s := proto.Size(x.DeltaPresenceEstimationConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Compute numerical stats over an individual column, including
 // min, max, and quantiles.
 type PrivacyMetric_NumericalStatsConfig struct {
@@ -4216,16 +3645,17 @@ func (m *PrivacyMetric_NumericalStatsConfig) Reset()         { *m = PrivacyMetri
 func (m *PrivacyMetric_NumericalStatsConfig) String() string { return proto.CompactTextString(m) }
 func (*PrivacyMetric_NumericalStatsConfig) ProtoMessage()    {}
 func (*PrivacyMetric_NumericalStatsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 0}
 }
+
 func (m *PrivacyMetric_NumericalStatsConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_NumericalStatsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_NumericalStatsConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Merge(dst, src)
+func (m *PrivacyMetric_NumericalStatsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Merge(m, src)
 }
 func (m *PrivacyMetric_NumericalStatsConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Size(m)
@@ -4260,16 +3690,17 @@ func (m *PrivacyMetric_CategoricalStatsConfig) Reset()         { *m = PrivacyMet
 func (m *PrivacyMetric_CategoricalStatsConfig) String() string { return proto.CompactTextString(m) }
 func (*PrivacyMetric_CategoricalStatsConfig) ProtoMessage()    {}
 func (*PrivacyMetric_CategoricalStatsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 1}
 }
+
 func (m *PrivacyMetric_CategoricalStatsConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_CategoricalStatsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_CategoricalStatsConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Merge(dst, src)
+func (m *PrivacyMetric_CategoricalStatsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Merge(m, src)
 }
 func (m *PrivacyMetric_CategoricalStatsConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Size(m)
@@ -4315,16 +3746,17 @@ func (m *PrivacyMetric_KAnonymityConfig) Reset()         { *m = PrivacyMetric_KA
 func (m *PrivacyMetric_KAnonymityConfig) String() string { return proto.CompactTextString(m) }
 func (*PrivacyMetric_KAnonymityConfig) ProtoMessage()    {}
 func (*PrivacyMetric_KAnonymityConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 2}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 2}
 }
+
 func (m *PrivacyMetric_KAnonymityConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_KAnonymityConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_KAnonymityConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Merge(dst, src)
+func (m *PrivacyMetric_KAnonymityConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Merge(m, src)
 }
 func (m *PrivacyMetric_KAnonymityConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Size(m)
@@ -4366,16 +3798,17 @@ func (m *PrivacyMetric_LDiversityConfig) Reset()         { *m = PrivacyMetric_LD
 func (m *PrivacyMetric_LDiversityConfig) String() string { return proto.CompactTextString(m) }
 func (*PrivacyMetric_LDiversityConfig) ProtoMessage()    {}
 func (*PrivacyMetric_LDiversityConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 3}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 3}
 }
+
 func (m *PrivacyMetric_LDiversityConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_LDiversityConfig.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_LDiversityConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_LDiversityConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_LDiversityConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_LDiversityConfig.Merge(dst, src)
+func (m *PrivacyMetric_LDiversityConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_LDiversityConfig.Merge(m, src)
 }
 func (m *PrivacyMetric_LDiversityConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_LDiversityConfig.Size(m)
@@ -4428,16 +3861,17 @@ func (m *PrivacyMetric_KMapEstimationConfig) Reset()         { *m = PrivacyMetri
 func (m *PrivacyMetric_KMapEstimationConfig) String() string { return proto.CompactTextString(m) }
 func (*PrivacyMetric_KMapEstimationConfig) ProtoMessage()    {}
 func (*PrivacyMetric_KMapEstimationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 4}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 4}
 }
+
 func (m *PrivacyMetric_KMapEstimationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_KMapEstimationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_KMapEstimationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Merge(dst, src)
+func (m *PrivacyMetric_KMapEstimationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Merge(m, src)
 }
 func (m *PrivacyMetric_KMapEstimationConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Size(m)
@@ -4494,16 +3928,17 @@ func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) String() string {
 }
 func (*PrivacyMetric_KMapEstimationConfig_TaggedField) ProtoMessage() {}
 func (*PrivacyMetric_KMapEstimationConfig_TaggedField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 4, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 4, 0}
 }
+
 func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Merge(dst, src)
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Merge(m, src)
 }
 func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Size(m)
@@ -4574,95 +4009,15 @@ func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetInferred() *empty.Em
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofMarshaler, _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofUnmarshaler, _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType)(nil),
 		(*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag)(nil),
 		(*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred)(nil),
 	}
 }
 
-func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
-	// tag
-	switch x := m.Tag.(type) {
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoType); err != nil {
-			return err
-		}
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CustomTag)
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Inferred); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrivacyMetric_KMapEstimationConfig_TaggedField.Tag has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
-	switch tag {
-	case 2: // tag.info_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoType)
-		err := b.DecodeMessage(msg)
-		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType{msg}
-		return true, err
-	case 3: // tag.custom_tag
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag{x}
-		return true, err
-	case 4: // tag.inferred
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(empty.Empty)
-		err := b.DecodeMessage(msg)
-		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
-	// tag
-	switch x := m.Tag.(type) {
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType:
-		s := proto.Size(x.InfoType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.CustomTag)))
-		n += len(x.CustomTag)
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred:
-		s := proto.Size(x.Inferred)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // An auxiliary table contains statistical information on the relative
 // frequency of different quasi-identifiers values. It has one or several
 // quasi-identifiers columns, and one column that indicates the relative
@@ -4692,16 +4047,17 @@ func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) String() string {
 }
 func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) ProtoMessage() {}
 func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 4, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 4, 1}
 }
+
 func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Merge(dst, src)
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Merge(m, src)
 }
 func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Size(m)
@@ -4751,16 +4107,17 @@ func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) String(
 }
 func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) ProtoMessage() {}
 func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 4, 1, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 4, 1, 0}
 }
+
 func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Merge(dst, src)
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Merge(m, src)
 }
 func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Size(m)
@@ -4814,16 +4171,17 @@ func (m *PrivacyMetric_DeltaPresenceEstimationConfig) String() string {
 }
 func (*PrivacyMetric_DeltaPresenceEstimationConfig) ProtoMessage() {}
 func (*PrivacyMetric_DeltaPresenceEstimationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{36, 5}
+	return fileDescriptor_6872a91dcb80f8dc, []int{36, 5}
 }
+
 func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Unmarshal(m, b)
 }
 func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Marshal(b, m, deterministic)
 }
-func (dst *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Merge(dst, src)
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Merge(m, src)
 }
 func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Size() int {
 	return xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Size(m)
@@ -4880,16 +4238,17 @@ func (m *AnalyzeDataSourceRiskDetails) Reset()         { *m = AnalyzeDataSourceR
 func (m *AnalyzeDataSourceRiskDetails) String() string { return proto.CompactTextString(m) }
 func (*AnalyzeDataSourceRiskDetails) ProtoMessage()    {}
 func (*AnalyzeDataSourceRiskDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37}
 }
+
 func (m *AnalyzeDataSourceRiskDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails.Size(m)
@@ -5004,9 +4363,9 @@ func (m *AnalyzeDataSourceRiskDetails) GetDeltaPresenceEstimationResult() *Analy
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AnalyzeDataSourceRiskDetails) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AnalyzeDataSourceRiskDetails_OneofMarshaler, _AnalyzeDataSourceRiskDetails_OneofUnmarshaler, _AnalyzeDataSourceRiskDetails_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AnalyzeDataSourceRiskDetails) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AnalyzeDataSourceRiskDetails_NumericalStatsResult_)(nil),
 		(*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_)(nil),
 		(*AnalyzeDataSourceRiskDetails_KAnonymityResult_)(nil),
@@ -5016,144 +4375,6 @@ func (*AnalyzeDataSourceRiskDetails) XXX_OneofFuncs() (func(msg proto.Message, b
 	}
 }
 
-func _AnalyzeDataSourceRiskDetails_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AnalyzeDataSourceRiskDetails)
-	// result
-	switch x := m.Result.(type) {
-	case *AnalyzeDataSourceRiskDetails_NumericalStatsResult_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NumericalStatsResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CategoricalStatsResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_KAnonymityResult_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KAnonymityResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_LDiversityResult_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LDiversityResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_KMapEstimationResult_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KMapEstimationResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DeltaPresenceEstimationResult); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AnalyzeDataSourceRiskDetails.Result has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AnalyzeDataSourceRiskDetails_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AnalyzeDataSourceRiskDetails)
-	switch tag {
-	case 3: // result.numerical_stats_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_NumericalStatsResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_NumericalStatsResult_{msg}
-		return true, err
-	case 4: // result.categorical_stats_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_CategoricalStatsResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_CategoricalStatsResult_{msg}
-		return true, err
-	case 5: // result.k_anonymity_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_KAnonymityResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_KAnonymityResult_{msg}
-		return true, err
-	case 6: // result.l_diversity_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_LDiversityResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_LDiversityResult_{msg}
-		return true, err
-	case 7: // result.k_map_estimation_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_KMapEstimationResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_KMapEstimationResult_{msg}
-		return true, err
-	case 9: // result.delta_presence_estimation_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AnalyzeDataSourceRiskDetails_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AnalyzeDataSourceRiskDetails)
-	// result
-	switch x := m.Result.(type) {
-	case *AnalyzeDataSourceRiskDetails_NumericalStatsResult_:
-		s := proto.Size(x.NumericalStatsResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_:
-		s := proto.Size(x.CategoricalStatsResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_KAnonymityResult_:
-		s := proto.Size(x.KAnonymityResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_LDiversityResult_:
-		s := proto.Size(x.LDiversityResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_KMapEstimationResult_:
-		s := proto.Size(x.KMapEstimationResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_:
-		s := proto.Size(x.DeltaPresenceEstimationResult)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Result of the numerical stats computation.
 type AnalyzeDataSourceRiskDetails_NumericalStatsResult struct {
 	// Minimum value appearing in the column.
@@ -5176,16 +4397,17 @@ func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) String() string {
 }
 func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 0}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Size(m)
@@ -5234,16 +4456,17 @@ func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) String() string {
 }
 func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 1}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Size(m)
@@ -5287,16 +4510,17 @@ func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHis
 func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) ProtoMessage() {
 }
 func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 1, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 1, 0}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Size(m)
@@ -5359,16 +4583,17 @@ func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) String() string {
 }
 func (*AnalyzeDataSourceRiskDetails_KAnonymityResult) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_KAnonymityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 2}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 2}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Size(m)
@@ -5408,16 +4633,17 @@ func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClas
 }
 func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 2, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 2, 0}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Size(m)
@@ -5467,16 +4693,17 @@ func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket
 }
 func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 2, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 2, 1}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Size(m)
@@ -5539,16 +4766,17 @@ func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) String() string {
 }
 func (*AnalyzeDataSourceRiskDetails_LDiversityResult) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_LDiversityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 3}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 3}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Size(m)
@@ -5590,16 +4818,17 @@ func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClas
 }
 func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 3, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 3, 0}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Size(m)
@@ -5665,16 +4894,17 @@ func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket
 }
 func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 3, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 3, 1}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Size(m)
@@ -5745,16 +4975,17 @@ func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) String() string {
 }
 func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 4}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 4}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Size(m)
@@ -5791,16 +5022,17 @@ func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiId
 }
 func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 4, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 4, 0}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Size(m)
@@ -5859,16 +5091,17 @@ func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogr
 func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) ProtoMessage() {
 }
 func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 4, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 4, 1}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Size(m)
@@ -5939,16 +5172,17 @@ func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) String() st
 }
 func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) ProtoMessage() {}
 func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 5}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 5}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Size(m)
@@ -5993,16 +5227,17 @@ func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenc
 func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) ProtoMessage() {
 }
 func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 5, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 5, 0}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Size(m)
@@ -6062,16 +5297,17 @@ func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenc
 func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) ProtoMessage() {
 }
 func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{37, 5, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{37, 5, 1}
 }
+
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Unmarshal(m, b)
 }
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Marshal(b, m, deterministic)
 }
-func (dst *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Merge(dst, src)
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Merge(m, src)
 }
 func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Size() int {
 	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Size(m)
@@ -6132,16 +5368,17 @@ func (m *ValueFrequency) Reset()         { *m = ValueFrequency{} }
 func (m *ValueFrequency) String() string { return proto.CompactTextString(m) }
 func (*ValueFrequency) ProtoMessage()    {}
 func (*ValueFrequency) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{38}
+	return fileDescriptor_6872a91dcb80f8dc, []int{38}
 }
+
 func (m *ValueFrequency) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ValueFrequency.Unmarshal(m, b)
 }
 func (m *ValueFrequency) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ValueFrequency.Marshal(b, m, deterministic)
 }
-func (dst *ValueFrequency) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ValueFrequency.Merge(dst, src)
+func (m *ValueFrequency) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueFrequency.Merge(m, src)
 }
 func (m *ValueFrequency) XXX_Size() int {
 	return xxx_messageInfo_ValueFrequency.Size(m)
@@ -6192,16 +5429,17 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{39}
+	return fileDescriptor_6872a91dcb80f8dc, []int{39}
 }
+
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
 }
 func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
 }
-func (dst *Value) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Value.Merge(dst, src)
+func (m *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(m, src)
 }
 func (m *Value) XXX_Size() int {
 	return xxx_messageInfo_Value.Size(m)
@@ -6327,9 +5565,9 @@ func (m *Value) GetDayOfWeekValue() dayofweek.DayOfWeek {
 	return dayofweek.DayOfWeek_DAY_OF_WEEK_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Value_IntegerValue)(nil),
 		(*Value_FloatValue)(nil),
 		(*Value_StringValue)(nil),
@@ -6341,160 +5579,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// type
-	switch x := m.Type.(type) {
-	case *Value_IntegerValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntegerValue))
-	case *Value_FloatValue:
-		b.EncodeVarint(2<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.FloatValue))
-	case *Value_StringValue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_TimestampValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case *Value_TimeValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimeValue); err != nil {
-			return err
-		}
-	case *Value_DateValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateValue); err != nil {
-			return err
-		}
-	case *Value_DayOfWeekValue:
-		b.EncodeVarint(8<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.DayOfWeekValue))
-	case nil:
-	default:
-		return fmt.Errorf("Value.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 1: // type.integer_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &Value_IntegerValue{int64(x)}
-		return true, err
-	case 2: // type.float_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Type = &Value_FloatValue{math.Float64frombits(x)}
-		return true, err
-	case 3: // type.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Type = &Value_StringValue{x}
-		return true, err
-	case 4: // type.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &Value_BooleanValue{x != 0}
-		return true, err
-	case 5: // type.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_TimestampValue{msg}
-		return true, err
-	case 6: // type.time_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timeofday.TimeOfDay)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_TimeValue{msg}
-		return true, err
-	case 7: // type.date_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(date.Date)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_DateValue{msg}
-		return true, err
-	case 8: // type.day_of_week_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &Value_DayOfWeekValue{dayofweek.DayOfWeek(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// type
-	switch x := m.Type.(type) {
-	case *Value_IntegerValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.IntegerValue))
-	case *Value_FloatValue:
-		n += 1 // tag and wire
-		n += 8
-	case *Value_StringValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BooleanValue:
-		n += 1 // tag and wire
-		n += 1
-	case *Value_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_TimeValue:
-		s := proto.Size(x.TimeValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_DateValue:
-		s := proto.Size(x.DateValue)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_DayOfWeekValue:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.DayOfWeekValue))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message for infoType-dependent details parsed from quote.
 type QuoteInfo struct {
 	// Object representation of the quote.
@@ -6511,16 +5595,17 @@ func (m *QuoteInfo) Reset()         { *m = QuoteInfo{} }
 func (m *QuoteInfo) String() string { return proto.CompactTextString(m) }
 func (*QuoteInfo) ProtoMessage()    {}
 func (*QuoteInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{40}
+	return fileDescriptor_6872a91dcb80f8dc, []int{40}
 }
+
 func (m *QuoteInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuoteInfo.Unmarshal(m, b)
 }
 func (m *QuoteInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuoteInfo.Marshal(b, m, deterministic)
 }
-func (dst *QuoteInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuoteInfo.Merge(dst, src)
+func (m *QuoteInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuoteInfo.Merge(m, src)
 }
 func (m *QuoteInfo) XXX_Size() int {
 	return xxx_messageInfo_QuoteInfo.Size(m)
@@ -6555,61 +5640,13 @@ func (m *QuoteInfo) GetDateTime() *DateTime {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*QuoteInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _QuoteInfo_OneofMarshaler, _QuoteInfo_OneofUnmarshaler, _QuoteInfo_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*QuoteInfo) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*QuoteInfo_DateTime)(nil),
 	}
 }
 
-func _QuoteInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*QuoteInfo)
-	// parsed_quote
-	switch x := m.ParsedQuote.(type) {
-	case *QuoteInfo_DateTime:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateTime); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("QuoteInfo.ParsedQuote has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _QuoteInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*QuoteInfo)
-	switch tag {
-	case 2: // parsed_quote.date_time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DateTime)
-		err := b.DecodeMessage(msg)
-		m.ParsedQuote = &QuoteInfo_DateTime{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _QuoteInfo_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*QuoteInfo)
-	// parsed_quote
-	switch x := m.ParsedQuote.(type) {
-	case *QuoteInfo_DateTime:
-		s := proto.Size(x.DateTime)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message for a date time object.
 // e.g. 2018-01-01, 5th August.
 type DateTime struct {
@@ -6628,16 +5665,17 @@ func (m *DateTime) Reset()         { *m = DateTime{} }
 func (m *DateTime) String() string { return proto.CompactTextString(m) }
 func (*DateTime) ProtoMessage()    {}
 func (*DateTime) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{41}
+	return fileDescriptor_6872a91dcb80f8dc, []int{41}
 }
+
 func (m *DateTime) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DateTime.Unmarshal(m, b)
 }
 func (m *DateTime) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DateTime.Marshal(b, m, deterministic)
 }
-func (dst *DateTime) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DateTime.Merge(dst, src)
+func (m *DateTime) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateTime.Merge(m, src)
 }
 func (m *DateTime) XXX_Size() int {
 	return xxx_messageInfo_DateTime.Size(m)
@@ -6689,16 +5727,17 @@ func (m *DateTime_TimeZone) Reset()         { *m = DateTime_TimeZone{} }
 func (m *DateTime_TimeZone) String() string { return proto.CompactTextString(m) }
 func (*DateTime_TimeZone) ProtoMessage()    {}
 func (*DateTime_TimeZone) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{41, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{41, 0}
 }
+
 func (m *DateTime_TimeZone) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DateTime_TimeZone.Unmarshal(m, b)
 }
 func (m *DateTime_TimeZone) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DateTime_TimeZone.Marshal(b, m, deterministic)
 }
-func (dst *DateTime_TimeZone) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DateTime_TimeZone.Merge(dst, src)
+func (m *DateTime_TimeZone) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateTime_TimeZone.Merge(m, src)
 }
 func (m *DateTime_TimeZone) XXX_Size() int {
 	return xxx_messageInfo_DateTime_TimeZone.Size(m)
@@ -6731,16 +5770,17 @@ func (m *DeidentifyConfig) Reset()         { *m = DeidentifyConfig{} }
 func (m *DeidentifyConfig) String() string { return proto.CompactTextString(m) }
 func (*DeidentifyConfig) ProtoMessage()    {}
 func (*DeidentifyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{42}
+	return fileDescriptor_6872a91dcb80f8dc, []int{42}
 }
+
 func (m *DeidentifyConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeidentifyConfig.Unmarshal(m, b)
 }
 func (m *DeidentifyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeidentifyConfig.Marshal(b, m, deterministic)
 }
-func (dst *DeidentifyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeidentifyConfig.Merge(dst, src)
+func (m *DeidentifyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyConfig.Merge(m, src)
 }
 func (m *DeidentifyConfig) XXX_Size() int {
 	return xxx_messageInfo_DeidentifyConfig.Size(m)
@@ -6788,80 +5828,14 @@ func (m *DeidentifyConfig) GetRecordTransformations() *RecordTransformations {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DeidentifyConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DeidentifyConfig_OneofMarshaler, _DeidentifyConfig_OneofUnmarshaler, _DeidentifyConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DeidentifyConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DeidentifyConfig_InfoTypeTransformations)(nil),
 		(*DeidentifyConfig_RecordTransformations)(nil),
 	}
 }
 
-func _DeidentifyConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DeidentifyConfig)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *DeidentifyConfig_InfoTypeTransformations:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
-			return err
-		}
-	case *DeidentifyConfig_RecordTransformations:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RecordTransformations); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DeidentifyConfig.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DeidentifyConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DeidentifyConfig)
-	switch tag {
-	case 1: // transformation.info_type_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoTypeTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &DeidentifyConfig_InfoTypeTransformations{msg}
-		return true, err
-	case 2: // transformation.record_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RecordTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &DeidentifyConfig_RecordTransformations{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DeidentifyConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DeidentifyConfig)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *DeidentifyConfig_InfoTypeTransformations:
-		s := proto.Size(x.InfoTypeTransformations)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DeidentifyConfig_RecordTransformations:
-		s := proto.Size(x.RecordTransformations)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A rule for transforming a value.
 type PrimitiveTransformation struct {
 	// Types that are valid to be assigned to Transformation:
@@ -6886,16 +5860,17 @@ func (m *PrimitiveTransformation) Reset()         { *m = PrimitiveTransformation
 func (m *PrimitiveTransformation) String() string { return proto.CompactTextString(m) }
 func (*PrimitiveTransformation) ProtoMessage()    {}
 func (*PrimitiveTransformation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{43}
+	return fileDescriptor_6872a91dcb80f8dc, []int{43}
 }
+
 func (m *PrimitiveTransformation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PrimitiveTransformation.Unmarshal(m, b)
 }
 func (m *PrimitiveTransformation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PrimitiveTransformation.Marshal(b, m, deterministic)
 }
-func (dst *PrimitiveTransformation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PrimitiveTransformation.Merge(dst, src)
+func (m *PrimitiveTransformation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrimitiveTransformation.Merge(m, src)
 }
 func (m *PrimitiveTransformation) XXX_Size() int {
 	return xxx_messageInfo_PrimitiveTransformation.Size(m)
@@ -7060,9 +6035,9 @@ func (m *PrimitiveTransformation) GetCryptoDeterministicConfig() *CryptoDetermin
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrimitiveTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrimitiveTransformation_OneofMarshaler, _PrimitiveTransformation_OneofUnmarshaler, _PrimitiveTransformation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PrimitiveTransformation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PrimitiveTransformation_ReplaceConfig)(nil),
 		(*PrimitiveTransformation_RedactConfig)(nil),
 		(*PrimitiveTransformation_CharacterMaskConfig)(nil),
@@ -7077,234 +6052,6 @@ func (*PrimitiveTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *pro
 	}
 }
 
-func _PrimitiveTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrimitiveTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *PrimitiveTransformation_ReplaceConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReplaceConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_RedactConfig:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RedactConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CharacterMaskConfig:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CharacterMaskConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoReplaceFfxFpeConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_FixedSizeBucketingConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FixedSizeBucketingConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_BucketingConfig:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BucketingConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReplaceWithInfoTypeConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_TimePartConfig:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimePartConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CryptoHashConfig:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoHashConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_DateShiftConfig:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateShiftConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CryptoDeterministicConfig:
-		b.EncodeVarint(12<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoDeterministicConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrimitiveTransformation.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrimitiveTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrimitiveTransformation)
-	switch tag {
-	case 1: // transformation.replace_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ReplaceValueConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_ReplaceConfig{msg}
-		return true, err
-	case 2: // transformation.redact_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RedactConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_RedactConfig{msg}
-		return true, err
-	case 3: // transformation.character_mask_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CharacterMaskConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CharacterMaskConfig{msg}
-		return true, err
-	case 4: // transformation.crypto_replace_ffx_fpe_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoReplaceFfxFpeConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CryptoReplaceFfxFpeConfig{msg}
-		return true, err
-	case 5: // transformation.fixed_size_bucketing_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FixedSizeBucketingConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_FixedSizeBucketingConfig{msg}
-		return true, err
-	case 6: // transformation.bucketing_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BucketingConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_BucketingConfig{msg}
-		return true, err
-	case 7: // transformation.replace_with_info_type_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ReplaceWithInfoTypeConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_ReplaceWithInfoTypeConfig{msg}
-		return true, err
-	case 8: // transformation.time_part_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TimePartConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_TimePartConfig{msg}
-		return true, err
-	case 9: // transformation.crypto_hash_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoHashConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CryptoHashConfig{msg}
-		return true, err
-	case 11: // transformation.date_shift_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DateShiftConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_DateShiftConfig{msg}
-		return true, err
-	case 12: // transformation.crypto_deterministic_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoDeterministicConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CryptoDeterministicConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrimitiveTransformation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrimitiveTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *PrimitiveTransformation_ReplaceConfig:
-		s := proto.Size(x.ReplaceConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_RedactConfig:
-		s := proto.Size(x.RedactConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CharacterMaskConfig:
-		s := proto.Size(x.CharacterMaskConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
-		s := proto.Size(x.CryptoReplaceFfxFpeConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_FixedSizeBucketingConfig:
-		s := proto.Size(x.FixedSizeBucketingConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_BucketingConfig:
-		s := proto.Size(x.BucketingConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
-		s := proto.Size(x.ReplaceWithInfoTypeConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_TimePartConfig:
-		s := proto.Size(x.TimePartConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CryptoHashConfig:
-		s := proto.Size(x.CryptoHashConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_DateShiftConfig:
-		s := proto.Size(x.DateShiftConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CryptoDeterministicConfig:
-		s := proto.Size(x.CryptoDeterministicConfig)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // For use with `Date`, `Timestamp`, and `TimeOfDay`, extract or preserve a
 // portion of the value.
 type TimePartConfig struct {
@@ -7318,16 +6065,17 @@ func (m *TimePartConfig) Reset()         { *m = TimePartConfig{} }
 func (m *TimePartConfig) String() string { return proto.CompactTextString(m) }
 func (*TimePartConfig) ProtoMessage()    {}
 func (*TimePartConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{44}
+	return fileDescriptor_6872a91dcb80f8dc, []int{44}
 }
+
 func (m *TimePartConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimePartConfig.Unmarshal(m, b)
 }
 func (m *TimePartConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimePartConfig.Marshal(b, m, deterministic)
 }
-func (dst *TimePartConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimePartConfig.Merge(dst, src)
+func (m *TimePartConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimePartConfig.Merge(m, src)
 }
 func (m *TimePartConfig) XXX_Size() int {
 	return xxx_messageInfo_TimePartConfig.Size(m)
@@ -7364,16 +6112,17 @@ func (m *CryptoHashConfig) Reset()         { *m = CryptoHashConfig{} }
 func (m *CryptoHashConfig) String() string { return proto.CompactTextString(m) }
 func (*CryptoHashConfig) ProtoMessage()    {}
 func (*CryptoHashConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{45}
+	return fileDescriptor_6872a91dcb80f8dc, []int{45}
 }
+
 func (m *CryptoHashConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CryptoHashConfig.Unmarshal(m, b)
 }
 func (m *CryptoHashConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CryptoHashConfig.Marshal(b, m, deterministic)
 }
-func (dst *CryptoHashConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CryptoHashConfig.Merge(dst, src)
+func (m *CryptoHashConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoHashConfig.Merge(m, src)
 }
 func (m *CryptoHashConfig) XXX_Size() int {
 	return xxx_messageInfo_CryptoHashConfig.Size(m)
@@ -7453,16 +6202,17 @@ func (m *CryptoDeterministicConfig) Reset()         { *m = CryptoDeterministicCo
 func (m *CryptoDeterministicConfig) String() string { return proto.CompactTextString(m) }
 func (*CryptoDeterministicConfig) ProtoMessage()    {}
 func (*CryptoDeterministicConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{46}
+	return fileDescriptor_6872a91dcb80f8dc, []int{46}
 }
+
 func (m *CryptoDeterministicConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CryptoDeterministicConfig.Unmarshal(m, b)
 }
 func (m *CryptoDeterministicConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CryptoDeterministicConfig.Marshal(b, m, deterministic)
 }
-func (dst *CryptoDeterministicConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CryptoDeterministicConfig.Merge(dst, src)
+func (m *CryptoDeterministicConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoDeterministicConfig.Merge(m, src)
 }
 func (m *CryptoDeterministicConfig) XXX_Size() int {
 	return xxx_messageInfo_CryptoDeterministicConfig.Size(m)
@@ -7507,16 +6257,17 @@ func (m *ReplaceValueConfig) Reset()         { *m = ReplaceValueConfig{} }
 func (m *ReplaceValueConfig) String() string { return proto.CompactTextString(m) }
 func (*ReplaceValueConfig) ProtoMessage()    {}
 func (*ReplaceValueConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{47}
+	return fileDescriptor_6872a91dcb80f8dc, []int{47}
 }
+
 func (m *ReplaceValueConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReplaceValueConfig.Unmarshal(m, b)
 }
 func (m *ReplaceValueConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReplaceValueConfig.Marshal(b, m, deterministic)
 }
-func (dst *ReplaceValueConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReplaceValueConfig.Merge(dst, src)
+func (m *ReplaceValueConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplaceValueConfig.Merge(m, src)
 }
 func (m *ReplaceValueConfig) XXX_Size() int {
 	return xxx_messageInfo_ReplaceValueConfig.Size(m)
@@ -7545,16 +6296,17 @@ func (m *ReplaceWithInfoTypeConfig) Reset()         { *m = ReplaceWithInfoTypeCo
 func (m *ReplaceWithInfoTypeConfig) String() string { return proto.CompactTextString(m) }
 func (*ReplaceWithInfoTypeConfig) ProtoMessage()    {}
 func (*ReplaceWithInfoTypeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{48}
+	return fileDescriptor_6872a91dcb80f8dc, []int{48}
 }
+
 func (m *ReplaceWithInfoTypeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReplaceWithInfoTypeConfig.Unmarshal(m, b)
 }
 func (m *ReplaceWithInfoTypeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReplaceWithInfoTypeConfig.Marshal(b, m, deterministic)
 }
-func (dst *ReplaceWithInfoTypeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReplaceWithInfoTypeConfig.Merge(dst, src)
+func (m *ReplaceWithInfoTypeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplaceWithInfoTypeConfig.Merge(m, src)
 }
 func (m *ReplaceWithInfoTypeConfig) XXX_Size() int {
 	return xxx_messageInfo_ReplaceWithInfoTypeConfig.Size(m)
@@ -7578,16 +6330,17 @@ func (m *RedactConfig) Reset()         { *m = RedactConfig{} }
 func (m *RedactConfig) String() string { return proto.CompactTextString(m) }
 func (*RedactConfig) ProtoMessage()    {}
 func (*RedactConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{49}
+	return fileDescriptor_6872a91dcb80f8dc, []int{49}
 }
+
 func (m *RedactConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RedactConfig.Unmarshal(m, b)
 }
 func (m *RedactConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RedactConfig.Marshal(b, m, deterministic)
 }
-func (dst *RedactConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RedactConfig.Merge(dst, src)
+func (m *RedactConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactConfig.Merge(m, src)
 }
 func (m *RedactConfig) XXX_Size() int {
 	return xxx_messageInfo_RedactConfig.Size(m)
@@ -7614,16 +6367,17 @@ func (m *CharsToIgnore) Reset()         { *m = CharsToIgnore{} }
 func (m *CharsToIgnore) String() string { return proto.CompactTextString(m) }
 func (*CharsToIgnore) ProtoMessage()    {}
 func (*CharsToIgnore) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{50}
+	return fileDescriptor_6872a91dcb80f8dc, []int{50}
 }
+
 func (m *CharsToIgnore) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CharsToIgnore.Unmarshal(m, b)
 }
 func (m *CharsToIgnore) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CharsToIgnore.Marshal(b, m, deterministic)
 }
-func (dst *CharsToIgnore) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CharsToIgnore.Merge(dst, src)
+func (m *CharsToIgnore) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CharsToIgnore.Merge(m, src)
 }
 func (m *CharsToIgnore) XXX_Size() int {
 	return xxx_messageInfo_CharsToIgnore.Size(m)
@@ -7671,71 +6425,14 @@ func (m *CharsToIgnore) GetCommonCharactersToIgnore() CharsToIgnore_CommonCharsT
 	return CharsToIgnore_COMMON_CHARS_TO_IGNORE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CharsToIgnore) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CharsToIgnore_OneofMarshaler, _CharsToIgnore_OneofUnmarshaler, _CharsToIgnore_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CharsToIgnore) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CharsToIgnore_CharactersToSkip)(nil),
 		(*CharsToIgnore_CommonCharactersToIgnore)(nil),
 	}
 }
 
-func _CharsToIgnore_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CharsToIgnore)
-	// characters
-	switch x := m.Characters.(type) {
-	case *CharsToIgnore_CharactersToSkip:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CharactersToSkip)
-	case *CharsToIgnore_CommonCharactersToIgnore:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CommonCharactersToIgnore))
-	case nil:
-	default:
-		return fmt.Errorf("CharsToIgnore.Characters has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CharsToIgnore_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CharsToIgnore)
-	switch tag {
-	case 1: // characters.characters_to_skip
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Characters = &CharsToIgnore_CharactersToSkip{x}
-		return true, err
-	case 2: // characters.common_characters_to_ignore
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Characters = &CharsToIgnore_CommonCharactersToIgnore{CharsToIgnore_CommonCharsToIgnore(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CharsToIgnore_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CharsToIgnore)
-	// characters
-	switch x := m.Characters.(type) {
-	case *CharsToIgnore_CharactersToSkip:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.CharactersToSkip)))
-		n += len(x.CharactersToSkip)
-	case *CharsToIgnore_CommonCharactersToIgnore:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CommonCharactersToIgnore))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Partially mask a string by replacing a given number of characters with a
 // fixed character. Masking can start from the beginning or end of the string.
 // This can be used on data of any type (numbers, longs, and so on) and when
@@ -7770,16 +6467,17 @@ func (m *CharacterMaskConfig) Reset()         { *m = CharacterMaskConfig{} }
 func (m *CharacterMaskConfig) String() string { return proto.CompactTextString(m) }
 func (*CharacterMaskConfig) ProtoMessage()    {}
 func (*CharacterMaskConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{51}
+	return fileDescriptor_6872a91dcb80f8dc, []int{51}
 }
+
 func (m *CharacterMaskConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CharacterMaskConfig.Unmarshal(m, b)
 }
 func (m *CharacterMaskConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CharacterMaskConfig.Marshal(b, m, deterministic)
 }
-func (dst *CharacterMaskConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CharacterMaskConfig.Merge(dst, src)
+func (m *CharacterMaskConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CharacterMaskConfig.Merge(m, src)
 }
 func (m *CharacterMaskConfig) XXX_Size() int {
 	return xxx_messageInfo_CharacterMaskConfig.Size(m)
@@ -7858,16 +6556,17 @@ func (m *FixedSizeBucketingConfig) Reset()         { *m = FixedSizeBucketingConf
 func (m *FixedSizeBucketingConfig) String() string { return proto.CompactTextString(m) }
 func (*FixedSizeBucketingConfig) ProtoMessage()    {}
 func (*FixedSizeBucketingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{52}
+	return fileDescriptor_6872a91dcb80f8dc, []int{52}
 }
+
 func (m *FixedSizeBucketingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FixedSizeBucketingConfig.Unmarshal(m, b)
 }
 func (m *FixedSizeBucketingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FixedSizeBucketingConfig.Marshal(b, m, deterministic)
 }
-func (dst *FixedSizeBucketingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FixedSizeBucketingConfig.Merge(dst, src)
+func (m *FixedSizeBucketingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FixedSizeBucketingConfig.Merge(m, src)
 }
 func (m *FixedSizeBucketingConfig) XXX_Size() int {
 	return xxx_messageInfo_FixedSizeBucketingConfig.Size(m)
@@ -7920,16 +6619,17 @@ func (m *BucketingConfig) Reset()         { *m = BucketingConfig{} }
 func (m *BucketingConfig) String() string { return proto.CompactTextString(m) }
 func (*BucketingConfig) ProtoMessage()    {}
 func (*BucketingConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{53}
+	return fileDescriptor_6872a91dcb80f8dc, []int{53}
 }
+
 func (m *BucketingConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BucketingConfig.Unmarshal(m, b)
 }
 func (m *BucketingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BucketingConfig.Marshal(b, m, deterministic)
 }
-func (dst *BucketingConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BucketingConfig.Merge(dst, src)
+func (m *BucketingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BucketingConfig.Merge(m, src)
 }
 func (m *BucketingConfig) XXX_Size() int {
 	return xxx_messageInfo_BucketingConfig.Size(m)
@@ -7966,16 +6666,17 @@ func (m *BucketingConfig_Bucket) Reset()         { *m = BucketingConfig_Bucket{}
 func (m *BucketingConfig_Bucket) String() string { return proto.CompactTextString(m) }
 func (*BucketingConfig_Bucket) ProtoMessage()    {}
 func (*BucketingConfig_Bucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{53, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{53, 0}
 }
+
 func (m *BucketingConfig_Bucket) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BucketingConfig_Bucket.Unmarshal(m, b)
 }
 func (m *BucketingConfig_Bucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BucketingConfig_Bucket.Marshal(b, m, deterministic)
 }
-func (dst *BucketingConfig_Bucket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BucketingConfig_Bucket.Merge(dst, src)
+func (m *BucketingConfig_Bucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BucketingConfig_Bucket.Merge(m, src)
 }
 func (m *BucketingConfig_Bucket) XXX_Size() int {
 	return xxx_messageInfo_BucketingConfig_Bucket.Size(m)
@@ -8084,16 +6785,17 @@ func (m *CryptoReplaceFfxFpeConfig) Reset()         { *m = CryptoReplaceFfxFpeCo
 func (m *CryptoReplaceFfxFpeConfig) String() string { return proto.CompactTextString(m) }
 func (*CryptoReplaceFfxFpeConfig) ProtoMessage()    {}
 func (*CryptoReplaceFfxFpeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{54}
+	return fileDescriptor_6872a91dcb80f8dc, []int{54}
 }
+
 func (m *CryptoReplaceFfxFpeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CryptoReplaceFfxFpeConfig.Unmarshal(m, b)
 }
 func (m *CryptoReplaceFfxFpeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CryptoReplaceFfxFpeConfig.Marshal(b, m, deterministic)
 }
-func (dst *CryptoReplaceFfxFpeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CryptoReplaceFfxFpeConfig.Merge(dst, src)
+func (m *CryptoReplaceFfxFpeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoReplaceFfxFpeConfig.Merge(m, src)
 }
 func (m *CryptoReplaceFfxFpeConfig) XXX_Size() int {
 	return xxx_messageInfo_CryptoReplaceFfxFpeConfig.Size(m)
@@ -8175,85 +6877,15 @@ func (m *CryptoReplaceFfxFpeConfig) GetSurrogateInfoType() *InfoType {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CryptoReplaceFfxFpeConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CryptoReplaceFfxFpeConfig_OneofMarshaler, _CryptoReplaceFfxFpeConfig_OneofUnmarshaler, _CryptoReplaceFfxFpeConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CryptoReplaceFfxFpeConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CryptoReplaceFfxFpeConfig_CommonAlphabet)(nil),
 		(*CryptoReplaceFfxFpeConfig_CustomAlphabet)(nil),
 		(*CryptoReplaceFfxFpeConfig_Radix)(nil),
 	}
 }
 
-func _CryptoReplaceFfxFpeConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	// alphabet
-	switch x := m.Alphabet.(type) {
-	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CommonAlphabet))
-	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CustomAlphabet)
-	case *CryptoReplaceFfxFpeConfig_Radix:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Radix))
-	case nil:
-	default:
-		return fmt.Errorf("CryptoReplaceFfxFpeConfig.Alphabet has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	switch tag {
-	case 4: // alphabet.common_alphabet
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_CommonAlphabet{CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet(x)}
-		return true, err
-	case 5: // alphabet.custom_alphabet
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_CustomAlphabet{x}
-		return true, err
-	case 6: // alphabet.radix
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_Radix{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	// alphabet
-	switch x := m.Alphabet.(type) {
-	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.CommonAlphabet))
-	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.CustomAlphabet)))
-		n += len(x.CustomAlphabet)
-	case *CryptoReplaceFfxFpeConfig_Radix:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Radix))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // This is a data encryption key (DEK) (as opposed to
 // a key encryption key (KEK) stored by KMS).
 // When using KMS to wrap/unwrap DEKs, be sure to set an appropriate
@@ -8274,16 +6906,17 @@ func (m *CryptoKey) Reset()         { *m = CryptoKey{} }
 func (m *CryptoKey) String() string { return proto.CompactTextString(m) }
 func (*CryptoKey) ProtoMessage()    {}
 func (*CryptoKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{55}
+	return fileDescriptor_6872a91dcb80f8dc, []int{55}
 }
+
 func (m *CryptoKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CryptoKey.Unmarshal(m, b)
 }
 func (m *CryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CryptoKey.Marshal(b, m, deterministic)
 }
-func (dst *CryptoKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CryptoKey.Merge(dst, src)
+func (m *CryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoKey.Merge(m, src)
 }
 func (m *CryptoKey) XXX_Size() int {
 	return xxx_messageInfo_CryptoKey.Size(m)
@@ -8344,99 +6977,15 @@ func (m *CryptoKey) GetKmsWrapped() *KmsWrappedCryptoKey {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CryptoKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CryptoKey_OneofMarshaler, _CryptoKey_OneofUnmarshaler, _CryptoKey_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CryptoKey) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CryptoKey_Transient)(nil),
 		(*CryptoKey_Unwrapped)(nil),
 		(*CryptoKey_KmsWrapped)(nil),
 	}
 }
 
-func _CryptoKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CryptoKey)
-	// source
-	switch x := m.Source.(type) {
-	case *CryptoKey_Transient:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Transient); err != nil {
-			return err
-		}
-	case *CryptoKey_Unwrapped:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Unwrapped); err != nil {
-			return err
-		}
-	case *CryptoKey_KmsWrapped:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KmsWrapped); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CryptoKey.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CryptoKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CryptoKey)
-	switch tag {
-	case 1: // source.transient
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransientCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_Transient{msg}
-		return true, err
-	case 2: // source.unwrapped
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UnwrappedCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_Unwrapped{msg}
-		return true, err
-	case 3: // source.kms_wrapped
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(KmsWrappedCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_KmsWrapped{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CryptoKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CryptoKey)
-	// source
-	switch x := m.Source.(type) {
-	case *CryptoKey_Transient:
-		s := proto.Size(x.Transient)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CryptoKey_Unwrapped:
-		s := proto.Size(x.Unwrapped)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CryptoKey_KmsWrapped:
-		s := proto.Size(x.KmsWrapped)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Use this to have a random data crypto key generated.
 // It will be discarded after the request finishes.
 type TransientCryptoKey struct {
@@ -8456,16 +7005,17 @@ func (m *TransientCryptoKey) Reset()         { *m = TransientCryptoKey{} }
 func (m *TransientCryptoKey) String() string { return proto.CompactTextString(m) }
 func (*TransientCryptoKey) ProtoMessage()    {}
 func (*TransientCryptoKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{56}
+	return fileDescriptor_6872a91dcb80f8dc, []int{56}
 }
+
 func (m *TransientCryptoKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransientCryptoKey.Unmarshal(m, b)
 }
 func (m *TransientCryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransientCryptoKey.Marshal(b, m, deterministic)
 }
-func (dst *TransientCryptoKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransientCryptoKey.Merge(dst, src)
+func (m *TransientCryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransientCryptoKey.Merge(m, src)
 }
 func (m *TransientCryptoKey) XXX_Size() int {
 	return xxx_messageInfo_TransientCryptoKey.Size(m)
@@ -8497,16 +7047,17 @@ func (m *UnwrappedCryptoKey) Reset()         { *m = UnwrappedCryptoKey{} }
 func (m *UnwrappedCryptoKey) String() string { return proto.CompactTextString(m) }
 func (*UnwrappedCryptoKey) ProtoMessage()    {}
 func (*UnwrappedCryptoKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{57}
+	return fileDescriptor_6872a91dcb80f8dc, []int{57}
 }
+
 func (m *UnwrappedCryptoKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnwrappedCryptoKey.Unmarshal(m, b)
 }
 func (m *UnwrappedCryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UnwrappedCryptoKey.Marshal(b, m, deterministic)
 }
-func (dst *UnwrappedCryptoKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UnwrappedCryptoKey.Merge(dst, src)
+func (m *UnwrappedCryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnwrappedCryptoKey.Merge(m, src)
 }
 func (m *UnwrappedCryptoKey) XXX_Size() int {
 	return xxx_messageInfo_UnwrappedCryptoKey.Size(m)
@@ -8543,16 +7094,17 @@ func (m *KmsWrappedCryptoKey) Reset()         { *m = KmsWrappedCryptoKey{} }
 func (m *KmsWrappedCryptoKey) String() string { return proto.CompactTextString(m) }
 func (*KmsWrappedCryptoKey) ProtoMessage()    {}
 func (*KmsWrappedCryptoKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{58}
+	return fileDescriptor_6872a91dcb80f8dc, []int{58}
 }
+
 func (m *KmsWrappedCryptoKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KmsWrappedCryptoKey.Unmarshal(m, b)
 }
 func (m *KmsWrappedCryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KmsWrappedCryptoKey.Marshal(b, m, deterministic)
 }
-func (dst *KmsWrappedCryptoKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KmsWrappedCryptoKey.Merge(dst, src)
+func (m *KmsWrappedCryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KmsWrappedCryptoKey.Merge(m, src)
 }
 func (m *KmsWrappedCryptoKey) XXX_Size() int {
 	return xxx_messageInfo_KmsWrappedCryptoKey.Size(m)
@@ -8610,16 +7162,17 @@ func (m *DateShiftConfig) Reset()         { *m = DateShiftConfig{} }
 func (m *DateShiftConfig) String() string { return proto.CompactTextString(m) }
 func (*DateShiftConfig) ProtoMessage()    {}
 func (*DateShiftConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{59}
+	return fileDescriptor_6872a91dcb80f8dc, []int{59}
 }
+
 func (m *DateShiftConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DateShiftConfig.Unmarshal(m, b)
 }
 func (m *DateShiftConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DateShiftConfig.Marshal(b, m, deterministic)
 }
-func (dst *DateShiftConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DateShiftConfig.Merge(dst, src)
+func (m *DateShiftConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateShiftConfig.Merge(m, src)
 }
 func (m *DateShiftConfig) XXX_Size() int {
 	return xxx_messageInfo_DateShiftConfig.Size(m)
@@ -8675,61 +7228,13 @@ func (m *DateShiftConfig) GetCryptoKey() *CryptoKey {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DateShiftConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DateShiftConfig_OneofMarshaler, _DateShiftConfig_OneofUnmarshaler, _DateShiftConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DateShiftConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DateShiftConfig_CryptoKey)(nil),
 	}
 }
 
-func _DateShiftConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DateShiftConfig)
-	// method
-	switch x := m.Method.(type) {
-	case *DateShiftConfig_CryptoKey:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DateShiftConfig.Method has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DateShiftConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DateShiftConfig)
-	switch tag {
-	case 4: // method.crypto_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Method = &DateShiftConfig_CryptoKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DateShiftConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DateShiftConfig)
-	// method
-	switch x := m.Method.(type) {
-	case *DateShiftConfig_CryptoKey:
-		s := proto.Size(x.CryptoKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A type of transformation that will scan unstructured text and
 // apply various `PrimitiveTransformation`s to each finding, where the
 // transformation is applied to only values that were identified as a specific
@@ -8747,16 +7252,17 @@ func (m *InfoTypeTransformations) Reset()         { *m = InfoTypeTransformations
 func (m *InfoTypeTransformations) String() string { return proto.CompactTextString(m) }
 func (*InfoTypeTransformations) ProtoMessage()    {}
 func (*InfoTypeTransformations) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{60}
+	return fileDescriptor_6872a91dcb80f8dc, []int{60}
 }
+
 func (m *InfoTypeTransformations) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InfoTypeTransformations.Unmarshal(m, b)
 }
 func (m *InfoTypeTransformations) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InfoTypeTransformations.Marshal(b, m, deterministic)
 }
-func (dst *InfoTypeTransformations) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InfoTypeTransformations.Merge(dst, src)
+func (m *InfoTypeTransformations) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeTransformations.Merge(m, src)
 }
 func (m *InfoTypeTransformations) XXX_Size() int {
 	return xxx_messageInfo_InfoTypeTransformations.Size(m)
@@ -8796,16 +7302,17 @@ func (m *InfoTypeTransformations_InfoTypeTransformation) String() string {
 }
 func (*InfoTypeTransformations_InfoTypeTransformation) ProtoMessage() {}
 func (*InfoTypeTransformations_InfoTypeTransformation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{60, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{60, 0}
 }
+
 func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Unmarshal(m, b)
 }
 func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Marshal(b, m, deterministic)
 }
-func (dst *InfoTypeTransformations_InfoTypeTransformation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Merge(dst, src)
+func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Merge(m, src)
 }
 func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_Size() int {
 	return xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Size(m)
@@ -8859,16 +7366,17 @@ func (m *FieldTransformation) Reset()         { *m = FieldTransformation{} }
 func (m *FieldTransformation) String() string { return proto.CompactTextString(m) }
 func (*FieldTransformation) ProtoMessage()    {}
 func (*FieldTransformation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{61}
+	return fileDescriptor_6872a91dcb80f8dc, []int{61}
 }
+
 func (m *FieldTransformation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldTransformation.Unmarshal(m, b)
 }
 func (m *FieldTransformation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldTransformation.Marshal(b, m, deterministic)
 }
-func (dst *FieldTransformation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldTransformation.Merge(dst, src)
+func (m *FieldTransformation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldTransformation.Merge(m, src)
 }
 func (m *FieldTransformation) XXX_Size() int {
 	return xxx_messageInfo_FieldTransformation.Size(m)
@@ -8930,80 +7438,14 @@ func (m *FieldTransformation) GetInfoTypeTransformations() *InfoTypeTransformati
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FieldTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FieldTransformation_OneofMarshaler, _FieldTransformation_OneofUnmarshaler, _FieldTransformation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*FieldTransformation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*FieldTransformation_PrimitiveTransformation)(nil),
 		(*FieldTransformation_InfoTypeTransformations)(nil),
 	}
 }
 
-func _FieldTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FieldTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *FieldTransformation_PrimitiveTransformation:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PrimitiveTransformation); err != nil {
-			return err
-		}
-	case *FieldTransformation_InfoTypeTransformations:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("FieldTransformation.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FieldTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FieldTransformation)
-	switch tag {
-	case 4: // transformation.primitive_transformation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrimitiveTransformation)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &FieldTransformation_PrimitiveTransformation{msg}
-		return true, err
-	case 5: // transformation.info_type_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoTypeTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &FieldTransformation_InfoTypeTransformations{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FieldTransformation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FieldTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *FieldTransformation_PrimitiveTransformation:
-		s := proto.Size(x.PrimitiveTransformation)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FieldTransformation_InfoTypeTransformations:
-		s := proto.Size(x.InfoTypeTransformations)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A type of transformation that is applied over structured data such as a
 // table.
 type RecordTransformations struct {
@@ -9021,16 +7463,17 @@ func (m *RecordTransformations) Reset()         { *m = RecordTransformations{} }
 func (m *RecordTransformations) String() string { return proto.CompactTextString(m) }
 func (*RecordTransformations) ProtoMessage()    {}
 func (*RecordTransformations) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{62}
+	return fileDescriptor_6872a91dcb80f8dc, []int{62}
 }
+
 func (m *RecordTransformations) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordTransformations.Unmarshal(m, b)
 }
 func (m *RecordTransformations) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordTransformations.Marshal(b, m, deterministic)
 }
-func (dst *RecordTransformations) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordTransformations.Merge(dst, src)
+func (m *RecordTransformations) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordTransformations.Merge(m, src)
 }
 func (m *RecordTransformations) XXX_Size() int {
 	return xxx_messageInfo_RecordTransformations.Size(m)
@@ -9070,16 +7513,17 @@ func (m *RecordSuppression) Reset()         { *m = RecordSuppression{} }
 func (m *RecordSuppression) String() string { return proto.CompactTextString(m) }
 func (*RecordSuppression) ProtoMessage()    {}
 func (*RecordSuppression) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{63}
+	return fileDescriptor_6872a91dcb80f8dc, []int{63}
 }
+
 func (m *RecordSuppression) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordSuppression.Unmarshal(m, b)
 }
 func (m *RecordSuppression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordSuppression.Marshal(b, m, deterministic)
 }
-func (dst *RecordSuppression) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordSuppression.Merge(dst, src)
+func (m *RecordSuppression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordSuppression.Merge(m, src)
 }
 func (m *RecordSuppression) XXX_Size() int {
 	return xxx_messageInfo_RecordSuppression.Size(m)
@@ -9111,16 +7555,17 @@ func (m *RecordCondition) Reset()         { *m = RecordCondition{} }
 func (m *RecordCondition) String() string { return proto.CompactTextString(m) }
 func (*RecordCondition) ProtoMessage()    {}
 func (*RecordCondition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{64}
+	return fileDescriptor_6872a91dcb80f8dc, []int{64}
 }
+
 func (m *RecordCondition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordCondition.Unmarshal(m, b)
 }
 func (m *RecordCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordCondition.Marshal(b, m, deterministic)
 }
-func (dst *RecordCondition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordCondition.Merge(dst, src)
+func (m *RecordCondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition.Merge(m, src)
 }
 func (m *RecordCondition) XXX_Size() int {
 	return xxx_messageInfo_RecordCondition.Size(m)
@@ -9173,16 +7618,17 @@ func (m *RecordCondition_Condition) Reset()         { *m = RecordCondition_Condi
 func (m *RecordCondition_Condition) String() string { return proto.CompactTextString(m) }
 func (*RecordCondition_Condition) ProtoMessage()    {}
 func (*RecordCondition_Condition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{64, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{64, 0}
 }
+
 func (m *RecordCondition_Condition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordCondition_Condition.Unmarshal(m, b)
 }
 func (m *RecordCondition_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordCondition_Condition.Marshal(b, m, deterministic)
 }
-func (dst *RecordCondition_Condition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordCondition_Condition.Merge(dst, src)
+func (m *RecordCondition_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition_Condition.Merge(m, src)
 }
 func (m *RecordCondition_Condition) XXX_Size() int {
 	return xxx_messageInfo_RecordCondition_Condition.Size(m)
@@ -9226,16 +7672,17 @@ func (m *RecordCondition_Conditions) Reset()         { *m = RecordCondition_Cond
 func (m *RecordCondition_Conditions) String() string { return proto.CompactTextString(m) }
 func (*RecordCondition_Conditions) ProtoMessage()    {}
 func (*RecordCondition_Conditions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{64, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{64, 1}
 }
+
 func (m *RecordCondition_Conditions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordCondition_Conditions.Unmarshal(m, b)
 }
 func (m *RecordCondition_Conditions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordCondition_Conditions.Marshal(b, m, deterministic)
 }
-func (dst *RecordCondition_Conditions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordCondition_Conditions.Merge(dst, src)
+func (m *RecordCondition_Conditions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition_Conditions.Merge(m, src)
 }
 func (m *RecordCondition_Conditions) XXX_Size() int {
 	return xxx_messageInfo_RecordCondition_Conditions.Size(m)
@@ -9270,16 +7717,17 @@ func (m *RecordCondition_Expressions) Reset()         { *m = RecordCondition_Exp
 func (m *RecordCondition_Expressions) String() string { return proto.CompactTextString(m) }
 func (*RecordCondition_Expressions) ProtoMessage()    {}
 func (*RecordCondition_Expressions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{64, 2}
+	return fileDescriptor_6872a91dcb80f8dc, []int{64, 2}
 }
+
 func (m *RecordCondition_Expressions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordCondition_Expressions.Unmarshal(m, b)
 }
 func (m *RecordCondition_Expressions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordCondition_Expressions.Marshal(b, m, deterministic)
 }
-func (dst *RecordCondition_Expressions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordCondition_Expressions.Merge(dst, src)
+func (m *RecordCondition_Expressions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition_Expressions.Merge(m, src)
 }
 func (m *RecordCondition_Expressions) XXX_Size() int {
 	return xxx_messageInfo_RecordCondition_Expressions.Size(m)
@@ -9321,61 +7769,13 @@ func (m *RecordCondition_Expressions) GetConditions() *RecordCondition_Condition
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecordCondition_Expressions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecordCondition_Expressions_OneofMarshaler, _RecordCondition_Expressions_OneofUnmarshaler, _RecordCondition_Expressions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RecordCondition_Expressions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RecordCondition_Expressions_Conditions)(nil),
 	}
 }
 
-func _RecordCondition_Expressions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecordCondition_Expressions)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordCondition_Expressions_Conditions:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Conditions); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RecordCondition_Expressions.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecordCondition_Expressions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecordCondition_Expressions)
-	switch tag {
-	case 3: // type.conditions
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RecordCondition_Conditions)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordCondition_Expressions_Conditions{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecordCondition_Expressions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecordCondition_Expressions)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordCondition_Expressions_Conditions:
-		s := proto.Size(x.Conditions)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Overview of the modifications that occurred.
 type TransformationOverview struct {
 	// Total size in bytes that were transformed in some way.
@@ -9391,16 +7791,17 @@ func (m *TransformationOverview) Reset()         { *m = TransformationOverview{}
 func (m *TransformationOverview) String() string { return proto.CompactTextString(m) }
 func (*TransformationOverview) ProtoMessage()    {}
 func (*TransformationOverview) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{65}
+	return fileDescriptor_6872a91dcb80f8dc, []int{65}
 }
+
 func (m *TransformationOverview) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransformationOverview.Unmarshal(m, b)
 }
 func (m *TransformationOverview) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransformationOverview.Marshal(b, m, deterministic)
 }
-func (dst *TransformationOverview) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransformationOverview.Merge(dst, src)
+func (m *TransformationOverview) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransformationOverview.Merge(m, src)
 }
 func (m *TransformationOverview) XXX_Size() int {
 	return xxx_messageInfo_TransformationOverview.Size(m)
@@ -9453,16 +7854,17 @@ func (m *TransformationSummary) Reset()         { *m = TransformationSummary{} }
 func (m *TransformationSummary) String() string { return proto.CompactTextString(m) }
 func (*TransformationSummary) ProtoMessage()    {}
 func (*TransformationSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{66}
+	return fileDescriptor_6872a91dcb80f8dc, []int{66}
 }
+
 func (m *TransformationSummary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransformationSummary.Unmarshal(m, b)
 }
 func (m *TransformationSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransformationSummary.Marshal(b, m, deterministic)
 }
-func (dst *TransformationSummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransformationSummary.Merge(dst, src)
+func (m *TransformationSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransformationSummary.Merge(m, src)
 }
 func (m *TransformationSummary) XXX_Size() int {
 	return xxx_messageInfo_TransformationSummary.Size(m)
@@ -9539,16 +7941,17 @@ func (m *TransformationSummary_SummaryResult) Reset()         { *m = Transformat
 func (m *TransformationSummary_SummaryResult) String() string { return proto.CompactTextString(m) }
 func (*TransformationSummary_SummaryResult) ProtoMessage()    {}
 func (*TransformationSummary_SummaryResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{66, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{66, 0}
 }
+
 func (m *TransformationSummary_SummaryResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransformationSummary_SummaryResult.Unmarshal(m, b)
 }
 func (m *TransformationSummary_SummaryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransformationSummary_SummaryResult.Marshal(b, m, deterministic)
 }
-func (dst *TransformationSummary_SummaryResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransformationSummary_SummaryResult.Merge(dst, src)
+func (m *TransformationSummary_SummaryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransformationSummary_SummaryResult.Merge(m, src)
 }
 func (m *TransformationSummary_SummaryResult) XXX_Size() int {
 	return xxx_messageInfo_TransformationSummary_SummaryResult.Size(m)
@@ -9594,16 +7997,17 @@ func (m *Schedule) Reset()         { *m = Schedule{} }
 func (m *Schedule) String() string { return proto.CompactTextString(m) }
 func (*Schedule) ProtoMessage()    {}
 func (*Schedule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{67}
+	return fileDescriptor_6872a91dcb80f8dc, []int{67}
 }
+
 func (m *Schedule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Schedule.Unmarshal(m, b)
 }
 func (m *Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Schedule.Marshal(b, m, deterministic)
 }
-func (dst *Schedule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Schedule.Merge(dst, src)
+func (m *Schedule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Schedule.Merge(m, src)
 }
 func (m *Schedule) XXX_Size() int {
 	return xxx_messageInfo_Schedule.Size(m)
@@ -9638,61 +8042,13 @@ func (m *Schedule) GetRecurrencePeriodDuration() *duration.Duration {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Schedule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Schedule_OneofMarshaler, _Schedule_OneofUnmarshaler, _Schedule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Schedule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Schedule_RecurrencePeriodDuration)(nil),
 	}
 }
 
-func _Schedule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Schedule)
-	// option
-	switch x := m.Option.(type) {
-	case *Schedule_RecurrencePeriodDuration:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RecurrencePeriodDuration); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Schedule.Option has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Schedule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Schedule)
-	switch tag {
-	case 1: // option.recurrence_period_duration
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.Option = &Schedule_RecurrencePeriodDuration{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Schedule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Schedule)
-	// option
-	switch x := m.Option.(type) {
-	case *Schedule_RecurrencePeriodDuration:
-		s := proto.Size(x.RecurrencePeriodDuration)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The inspectTemplate contains a configuration (set of types of sensitive data
 // to be detected) to be used anywhere you otherwise would normally specify
 // InspectConfig. See https://cloud.google.com/dlp/docs/concepts-templates
@@ -9723,16 +8079,17 @@ func (m *InspectTemplate) Reset()         { *m = InspectTemplate{} }
 func (m *InspectTemplate) String() string { return proto.CompactTextString(m) }
 func (*InspectTemplate) ProtoMessage()    {}
 func (*InspectTemplate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{68}
+	return fileDescriptor_6872a91dcb80f8dc, []int{68}
 }
+
 func (m *InspectTemplate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectTemplate.Unmarshal(m, b)
 }
 func (m *InspectTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectTemplate.Marshal(b, m, deterministic)
 }
-func (dst *InspectTemplate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectTemplate.Merge(dst, src)
+func (m *InspectTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectTemplate.Merge(m, src)
 }
 func (m *InspectTemplate) XXX_Size() int {
 	return xxx_messageInfo_InspectTemplate.Size(m)
@@ -9813,16 +8170,17 @@ func (m *DeidentifyTemplate) Reset()         { *m = DeidentifyTemplate{} }
 func (m *DeidentifyTemplate) String() string { return proto.CompactTextString(m) }
 func (*DeidentifyTemplate) ProtoMessage()    {}
 func (*DeidentifyTemplate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{69}
+	return fileDescriptor_6872a91dcb80f8dc, []int{69}
 }
+
 func (m *DeidentifyTemplate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeidentifyTemplate.Unmarshal(m, b)
 }
 func (m *DeidentifyTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeidentifyTemplate.Marshal(b, m, deterministic)
 }
-func (dst *DeidentifyTemplate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeidentifyTemplate.Merge(dst, src)
+func (m *DeidentifyTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyTemplate.Merge(m, src)
 }
 func (m *DeidentifyTemplate) XXX_Size() int {
 	return xxx_messageInfo_DeidentifyTemplate.Size(m)
@@ -9891,16 +8249,17 @@ func (m *Error) Reset()         { *m = Error{} }
 func (m *Error) String() string { return proto.CompactTextString(m) }
 func (*Error) ProtoMessage()    {}
 func (*Error) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{70}
+	return fileDescriptor_6872a91dcb80f8dc, []int{70}
 }
+
 func (m *Error) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Error.Unmarshal(m, b)
 }
 func (m *Error) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Error.Marshal(b, m, deterministic)
 }
-func (dst *Error) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Error.Merge(dst, src)
+func (m *Error) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Error.Merge(m, src)
 }
 func (m *Error) XXX_Size() int {
 	return xxx_messageInfo_Error.Size(m)
@@ -9967,16 +8326,17 @@ func (m *JobTrigger) Reset()         { *m = JobTrigger{} }
 func (m *JobTrigger) String() string { return proto.CompactTextString(m) }
 func (*JobTrigger) ProtoMessage()    {}
 func (*JobTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{71}
+	return fileDescriptor_6872a91dcb80f8dc, []int{71}
 }
+
 func (m *JobTrigger) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobTrigger.Unmarshal(m, b)
 }
 func (m *JobTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobTrigger.Marshal(b, m, deterministic)
 }
-func (dst *JobTrigger) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobTrigger.Merge(dst, src)
+func (m *JobTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobTrigger.Merge(m, src)
 }
 func (m *JobTrigger) XXX_Size() int {
 	return xxx_messageInfo_JobTrigger.Size(m)
@@ -10074,61 +8434,13 @@ func (m *JobTrigger) GetStatus() JobTrigger_Status {
 	return JobTrigger_STATUS_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*JobTrigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _JobTrigger_OneofMarshaler, _JobTrigger_OneofUnmarshaler, _JobTrigger_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*JobTrigger) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*JobTrigger_InspectJob)(nil),
 	}
 }
 
-func _JobTrigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*JobTrigger)
-	// job
-	switch x := m.Job.(type) {
-	case *JobTrigger_InspectJob:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InspectJob); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("JobTrigger.Job has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _JobTrigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*JobTrigger)
-	switch tag {
-	case 4: // job.inspect_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InspectJobConfig)
-		err := b.DecodeMessage(msg)
-		m.Job = &JobTrigger_InspectJob{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _JobTrigger_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*JobTrigger)
-	// job
-	switch x := m.Job.(type) {
-	case *JobTrigger_InspectJob:
-		s := proto.Size(x.InspectJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // What event needs to occur for a new job to be started.
 type JobTrigger_Trigger struct {
 	// Types that are valid to be assigned to Trigger:
@@ -10143,16 +8455,17 @@ func (m *JobTrigger_Trigger) Reset()         { *m = JobTrigger_Trigger{} }
 func (m *JobTrigger_Trigger) String() string { return proto.CompactTextString(m) }
 func (*JobTrigger_Trigger) ProtoMessage()    {}
 func (*JobTrigger_Trigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{71, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{71, 0}
 }
+
 func (m *JobTrigger_Trigger) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobTrigger_Trigger.Unmarshal(m, b)
 }
 func (m *JobTrigger_Trigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_JobTrigger_Trigger.Marshal(b, m, deterministic)
 }
-func (dst *JobTrigger_Trigger) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JobTrigger_Trigger.Merge(dst, src)
+func (m *JobTrigger_Trigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobTrigger_Trigger.Merge(m, src)
 }
 func (m *JobTrigger_Trigger) XXX_Size() int {
 	return xxx_messageInfo_JobTrigger_Trigger.Size(m)
@@ -10187,61 +8500,13 @@ func (m *JobTrigger_Trigger) GetSchedule() *Schedule {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*JobTrigger_Trigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _JobTrigger_Trigger_OneofMarshaler, _JobTrigger_Trigger_OneofUnmarshaler, _JobTrigger_Trigger_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*JobTrigger_Trigger) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*JobTrigger_Trigger_Schedule)(nil),
 	}
 }
 
-func _JobTrigger_Trigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*JobTrigger_Trigger)
-	// trigger
-	switch x := m.Trigger.(type) {
-	case *JobTrigger_Trigger_Schedule:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Schedule); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("JobTrigger_Trigger.Trigger has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _JobTrigger_Trigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*JobTrigger_Trigger)
-	switch tag {
-	case 1: // trigger.schedule
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Schedule)
-		err := b.DecodeMessage(msg)
-		m.Trigger = &JobTrigger_Trigger_Schedule{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _JobTrigger_Trigger_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*JobTrigger_Trigger)
-	// trigger
-	switch x := m.Trigger.(type) {
-	case *JobTrigger_Trigger_Schedule:
-		s := proto.Size(x.Schedule)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A task to execute on the completion of a job.
 // See https://cloud.google.com/dlp/docs/concepts-actions to learn more.
 type Action struct {
@@ -10260,16 +8525,17 @@ func (m *Action) Reset()         { *m = Action{} }
 func (m *Action) String() string { return proto.CompactTextString(m) }
 func (*Action) ProtoMessage()    {}
 func (*Action) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{72}
+	return fileDescriptor_6872a91dcb80f8dc, []int{72}
 }
+
 func (m *Action) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action.Unmarshal(m, b)
 }
 func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action.Marshal(b, m, deterministic)
 }
-func (dst *Action) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action.Merge(dst, src)
+func (m *Action) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action.Merge(m, src)
 }
 func (m *Action) XXX_Size() int {
 	return xxx_messageInfo_Action.Size(m)
@@ -10343,9 +8609,9 @@ func (m *Action) GetJobNotificationEmails() *Action_JobNotificationEmails {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Action) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Action_OneofMarshaler, _Action_OneofUnmarshaler, _Action_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Action) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Action_SaveFindings_)(nil),
 		(*Action_PubSub)(nil),
 		(*Action_PublishSummaryToCscc_)(nil),
@@ -10353,108 +8619,6 @@ func (*Action) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
 	}
 }
 
-func _Action_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Action)
-	// action
-	switch x := m.Action.(type) {
-	case *Action_SaveFindings_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SaveFindings); err != nil {
-			return err
-		}
-	case *Action_PubSub:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PubSub); err != nil {
-			return err
-		}
-	case *Action_PublishSummaryToCscc_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PublishSummaryToCscc); err != nil {
-			return err
-		}
-	case *Action_JobNotificationEmails_:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.JobNotificationEmails); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Action.Action has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Action_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Action)
-	switch tag {
-	case 1: // action.save_findings
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Action_SaveFindings)
-		err := b.DecodeMessage(msg)
-		m.Action = &Action_SaveFindings_{msg}
-		return true, err
-	case 2: // action.pub_sub
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Action_PublishToPubSub)
-		err := b.DecodeMessage(msg)
-		m.Action = &Action_PubSub{msg}
-		return true, err
-	case 3: // action.publish_summary_to_cscc
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Action_PublishSummaryToCscc)
-		err := b.DecodeMessage(msg)
-		m.Action = &Action_PublishSummaryToCscc_{msg}
-		return true, err
-	case 8: // action.job_notification_emails
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Action_JobNotificationEmails)
-		err := b.DecodeMessage(msg)
-		m.Action = &Action_JobNotificationEmails_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Action_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Action)
-	// action
-	switch x := m.Action.(type) {
-	case *Action_SaveFindings_:
-		s := proto.Size(x.SaveFindings)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Action_PubSub:
-		s := proto.Size(x.PubSub)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Action_PublishSummaryToCscc_:
-		s := proto.Size(x.PublishSummaryToCscc)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Action_JobNotificationEmails_:
-		s := proto.Size(x.JobNotificationEmails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // If set, the detailed findings will be persisted to the specified
 // OutputStorageConfig. Only a single instance of this action can be
 // specified.
@@ -10470,16 +8634,17 @@ func (m *Action_SaveFindings) Reset()         { *m = Action_SaveFindings{} }
 func (m *Action_SaveFindings) String() string { return proto.CompactTextString(m) }
 func (*Action_SaveFindings) ProtoMessage()    {}
 func (*Action_SaveFindings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{72, 0}
+	return fileDescriptor_6872a91dcb80f8dc, []int{72, 0}
 }
+
 func (m *Action_SaveFindings) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action_SaveFindings.Unmarshal(m, b)
 }
 func (m *Action_SaveFindings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action_SaveFindings.Marshal(b, m, deterministic)
 }
-func (dst *Action_SaveFindings) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action_SaveFindings.Merge(dst, src)
+func (m *Action_SaveFindings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_SaveFindings.Merge(m, src)
 }
 func (m *Action_SaveFindings) XXX_Size() int {
 	return xxx_messageInfo_Action_SaveFindings.Size(m)
@@ -10514,16 +8679,17 @@ func (m *Action_PublishToPubSub) Reset()         { *m = Action_PublishToPubSub{}
 func (m *Action_PublishToPubSub) String() string { return proto.CompactTextString(m) }
 func (*Action_PublishToPubSub) ProtoMessage()    {}
 func (*Action_PublishToPubSub) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{72, 1}
+	return fileDescriptor_6872a91dcb80f8dc, []int{72, 1}
 }
+
 func (m *Action_PublishToPubSub) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action_PublishToPubSub.Unmarshal(m, b)
 }
 func (m *Action_PublishToPubSub) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action_PublishToPubSub.Marshal(b, m, deterministic)
 }
-func (dst *Action_PublishToPubSub) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action_PublishToPubSub.Merge(dst, src)
+func (m *Action_PublishToPubSub) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_PublishToPubSub.Merge(m, src)
 }
 func (m *Action_PublishToPubSub) XXX_Size() int {
 	return xxx_messageInfo_Action_PublishToPubSub.Size(m)
@@ -10561,16 +8727,17 @@ func (m *Action_PublishSummaryToCscc) Reset()         { *m = Action_PublishSumma
 func (m *Action_PublishSummaryToCscc) String() string { return proto.CompactTextString(m) }
 func (*Action_PublishSummaryToCscc) ProtoMessage()    {}
 func (*Action_PublishSummaryToCscc) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{72, 2}
+	return fileDescriptor_6872a91dcb80f8dc, []int{72, 2}
 }
+
 func (m *Action_PublishSummaryToCscc) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action_PublishSummaryToCscc.Unmarshal(m, b)
 }
 func (m *Action_PublishSummaryToCscc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action_PublishSummaryToCscc.Marshal(b, m, deterministic)
 }
-func (dst *Action_PublishSummaryToCscc) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action_PublishSummaryToCscc.Merge(dst, src)
+func (m *Action_PublishSummaryToCscc) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_PublishSummaryToCscc.Merge(m, src)
 }
 func (m *Action_PublishSummaryToCscc) XXX_Size() int {
 	return xxx_messageInfo_Action_PublishSummaryToCscc.Size(m)
@@ -10593,16 +8760,17 @@ func (m *Action_JobNotificationEmails) Reset()         { *m = Action_JobNotifica
 func (m *Action_JobNotificationEmails) String() string { return proto.CompactTextString(m) }
 func (*Action_JobNotificationEmails) ProtoMessage()    {}
 func (*Action_JobNotificationEmails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{72, 3}
+	return fileDescriptor_6872a91dcb80f8dc, []int{72, 3}
 }
+
 func (m *Action_JobNotificationEmails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Action_JobNotificationEmails.Unmarshal(m, b)
 }
 func (m *Action_JobNotificationEmails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Action_JobNotificationEmails.Marshal(b, m, deterministic)
 }
-func (dst *Action_JobNotificationEmails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Action_JobNotificationEmails.Merge(dst, src)
+func (m *Action_JobNotificationEmails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_JobNotificationEmails.Merge(m, src)
 }
 func (m *Action_JobNotificationEmails) XXX_Size() int {
 	return xxx_messageInfo_Action_JobNotificationEmails.Size(m)
@@ -10634,16 +8802,17 @@ func (m *CreateInspectTemplateRequest) Reset()         { *m = CreateInspectTempl
 func (m *CreateInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateInspectTemplateRequest) ProtoMessage()    {}
 func (*CreateInspectTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{73}
+	return fileDescriptor_6872a91dcb80f8dc, []int{73}
 }
+
 func (m *CreateInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInspectTemplateRequest.Unmarshal(m, b)
 }
 func (m *CreateInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInspectTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateInspectTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInspectTemplateRequest.Merge(dst, src)
+func (m *CreateInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInspectTemplateRequest.Merge(m, src)
 }
 func (m *CreateInspectTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateInspectTemplateRequest.Size(m)
@@ -10694,16 +8863,17 @@ func (m *UpdateInspectTemplateRequest) Reset()         { *m = UpdateInspectTempl
 func (m *UpdateInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateInspectTemplateRequest) ProtoMessage()    {}
 func (*UpdateInspectTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{74}
+	return fileDescriptor_6872a91dcb80f8dc, []int{74}
 }
+
 func (m *UpdateInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateInspectTemplateRequest.Unmarshal(m, b)
 }
 func (m *UpdateInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateInspectTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateInspectTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateInspectTemplateRequest.Merge(dst, src)
+func (m *UpdateInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInspectTemplateRequest.Merge(m, src)
 }
 func (m *UpdateInspectTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateInspectTemplateRequest.Size(m)
@@ -10750,16 +8920,17 @@ func (m *GetInspectTemplateRequest) Reset()         { *m = GetInspectTemplateReq
 func (m *GetInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInspectTemplateRequest) ProtoMessage()    {}
 func (*GetInspectTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{75}
+	return fileDescriptor_6872a91dcb80f8dc, []int{75}
 }
+
 func (m *GetInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInspectTemplateRequest.Unmarshal(m, b)
 }
 func (m *GetInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInspectTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInspectTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInspectTemplateRequest.Merge(dst, src)
+func (m *GetInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInspectTemplateRequest.Merge(m, src)
 }
 func (m *GetInspectTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInspectTemplateRequest.Size(m)
@@ -10811,16 +8982,17 @@ func (m *ListInspectTemplatesRequest) Reset()         { *m = ListInspectTemplate
 func (m *ListInspectTemplatesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInspectTemplatesRequest) ProtoMessage()    {}
 func (*ListInspectTemplatesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{76}
+	return fileDescriptor_6872a91dcb80f8dc, []int{76}
 }
+
 func (m *ListInspectTemplatesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInspectTemplatesRequest.Unmarshal(m, b)
 }
 func (m *ListInspectTemplatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInspectTemplatesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInspectTemplatesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInspectTemplatesRequest.Merge(dst, src)
+func (m *ListInspectTemplatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInspectTemplatesRequest.Merge(m, src)
 }
 func (m *ListInspectTemplatesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInspectTemplatesRequest.Size(m)
@@ -10875,16 +9047,17 @@ func (m *ListInspectTemplatesResponse) Reset()         { *m = ListInspectTemplat
 func (m *ListInspectTemplatesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInspectTemplatesResponse) ProtoMessage()    {}
 func (*ListInspectTemplatesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{77}
+	return fileDescriptor_6872a91dcb80f8dc, []int{77}
 }
+
 func (m *ListInspectTemplatesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInspectTemplatesResponse.Unmarshal(m, b)
 }
 func (m *ListInspectTemplatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInspectTemplatesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInspectTemplatesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInspectTemplatesResponse.Merge(dst, src)
+func (m *ListInspectTemplatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInspectTemplatesResponse.Merge(m, src)
 }
 func (m *ListInspectTemplatesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInspectTemplatesResponse.Size(m)
@@ -10924,16 +9097,17 @@ func (m *DeleteInspectTemplateRequest) Reset()         { *m = DeleteInspectTempl
 func (m *DeleteInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteInspectTemplateRequest) ProtoMessage()    {}
 func (*DeleteInspectTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{78}
+	return fileDescriptor_6872a91dcb80f8dc, []int{78}
 }
+
 func (m *DeleteInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteInspectTemplateRequest.Unmarshal(m, b)
 }
 func (m *DeleteInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteInspectTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteInspectTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteInspectTemplateRequest.Merge(dst, src)
+func (m *DeleteInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInspectTemplateRequest.Merge(m, src)
 }
 func (m *DeleteInspectTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteInspectTemplateRequest.Size(m)
@@ -10971,16 +9145,17 @@ func (m *CreateJobTriggerRequest) Reset()         { *m = CreateJobTriggerRequest
 func (m *CreateJobTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateJobTriggerRequest) ProtoMessage()    {}
 func (*CreateJobTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{79}
+	return fileDescriptor_6872a91dcb80f8dc, []int{79}
 }
+
 func (m *CreateJobTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateJobTriggerRequest.Unmarshal(m, b)
 }
 func (m *CreateJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateJobTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateJobTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateJobTriggerRequest.Merge(dst, src)
+func (m *CreateJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateJobTriggerRequest.Merge(m, src)
 }
 func (m *CreateJobTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateJobTriggerRequest.Size(m)
@@ -11026,16 +9201,17 @@ func (m *ActivateJobTriggerRequest) Reset()         { *m = ActivateJobTriggerReq
 func (m *ActivateJobTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*ActivateJobTriggerRequest) ProtoMessage()    {}
 func (*ActivateJobTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{80}
+	return fileDescriptor_6872a91dcb80f8dc, []int{80}
 }
+
 func (m *ActivateJobTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ActivateJobTriggerRequest.Unmarshal(m, b)
 }
 func (m *ActivateJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ActivateJobTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *ActivateJobTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ActivateJobTriggerRequest.Merge(dst, src)
+func (m *ActivateJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ActivateJobTriggerRequest.Merge(m, src)
 }
 func (m *ActivateJobTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_ActivateJobTriggerRequest.Size(m)
@@ -11071,16 +9247,17 @@ func (m *UpdateJobTriggerRequest) Reset()         { *m = UpdateJobTriggerRequest
 func (m *UpdateJobTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateJobTriggerRequest) ProtoMessage()    {}
 func (*UpdateJobTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{81}
+	return fileDescriptor_6872a91dcb80f8dc, []int{81}
 }
+
 func (m *UpdateJobTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateJobTriggerRequest.Unmarshal(m, b)
 }
 func (m *UpdateJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateJobTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateJobTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateJobTriggerRequest.Merge(dst, src)
+func (m *UpdateJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobTriggerRequest.Merge(m, src)
 }
 func (m *UpdateJobTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateJobTriggerRequest.Size(m)
@@ -11126,16 +9303,17 @@ func (m *GetJobTriggerRequest) Reset()         { *m = GetJobTriggerRequest{} }
 func (m *GetJobTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*GetJobTriggerRequest) ProtoMessage()    {}
 func (*GetJobTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{82}
+	return fileDescriptor_6872a91dcb80f8dc, []int{82}
 }
+
 func (m *GetJobTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJobTriggerRequest.Unmarshal(m, b)
 }
 func (m *GetJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetJobTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetJobTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetJobTriggerRequest.Merge(dst, src)
+func (m *GetJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobTriggerRequest.Merge(m, src)
 }
 func (m *GetJobTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_GetJobTriggerRequest.Size(m)
@@ -11179,16 +9357,17 @@ func (m *CreateDlpJobRequest) Reset()         { *m = CreateDlpJobRequest{} }
 func (m *CreateDlpJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDlpJobRequest) ProtoMessage()    {}
 func (*CreateDlpJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{83}
+	return fileDescriptor_6872a91dcb80f8dc, []int{83}
 }
+
 func (m *CreateDlpJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDlpJobRequest.Unmarshal(m, b)
 }
 func (m *CreateDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDlpJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDlpJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDlpJobRequest.Merge(dst, src)
+func (m *CreateDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDlpJobRequest.Merge(m, src)
 }
 func (m *CreateDlpJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDlpJobRequest.Size(m)
@@ -11250,80 +9429,14 @@ func (m *CreateDlpJobRequest) GetJobId() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CreateDlpJobRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CreateDlpJobRequest_OneofMarshaler, _CreateDlpJobRequest_OneofUnmarshaler, _CreateDlpJobRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CreateDlpJobRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CreateDlpJobRequest_InspectJob)(nil),
 		(*CreateDlpJobRequest_RiskJob)(nil),
 	}
 }
 
-func _CreateDlpJobRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CreateDlpJobRequest)
-	// job
-	switch x := m.Job.(type) {
-	case *CreateDlpJobRequest_InspectJob:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InspectJob); err != nil {
-			return err
-		}
-	case *CreateDlpJobRequest_RiskJob:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RiskJob); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CreateDlpJobRequest.Job has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CreateDlpJobRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CreateDlpJobRequest)
-	switch tag {
-	case 2: // job.inspect_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InspectJobConfig)
-		err := b.DecodeMessage(msg)
-		m.Job = &CreateDlpJobRequest_InspectJob{msg}
-		return true, err
-	case 3: // job.risk_job
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RiskAnalysisJobConfig)
-		err := b.DecodeMessage(msg)
-		m.Job = &CreateDlpJobRequest_RiskJob{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CreateDlpJobRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CreateDlpJobRequest)
-	// job
-	switch x := m.Job.(type) {
-	case *CreateDlpJobRequest_InspectJob:
-		s := proto.Size(x.InspectJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CreateDlpJobRequest_RiskJob:
-		s := proto.Size(x.RiskJob)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Request message for ListJobTriggers.
 type ListJobTriggersRequest struct {
 	// The parent resource name, for example `projects/my-project-id`.
@@ -11384,16 +9497,17 @@ func (m *ListJobTriggersRequest) Reset()         { *m = ListJobTriggersRequest{}
 func (m *ListJobTriggersRequest) String() string { return proto.CompactTextString(m) }
 func (*ListJobTriggersRequest) ProtoMessage()    {}
 func (*ListJobTriggersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{84}
+	return fileDescriptor_6872a91dcb80f8dc, []int{84}
 }
+
 func (m *ListJobTriggersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobTriggersRequest.Unmarshal(m, b)
 }
 func (m *ListJobTriggersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobTriggersRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListJobTriggersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobTriggersRequest.Merge(dst, src)
+func (m *ListJobTriggersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobTriggersRequest.Merge(m, src)
 }
 func (m *ListJobTriggersRequest) XXX_Size() int {
 	return xxx_messageInfo_ListJobTriggersRequest.Size(m)
@@ -11455,16 +9569,17 @@ func (m *ListJobTriggersResponse) Reset()         { *m = ListJobTriggersResponse
 func (m *ListJobTriggersResponse) String() string { return proto.CompactTextString(m) }
 func (*ListJobTriggersResponse) ProtoMessage()    {}
 func (*ListJobTriggersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{85}
+	return fileDescriptor_6872a91dcb80f8dc, []int{85}
 }
+
 func (m *ListJobTriggersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListJobTriggersResponse.Unmarshal(m, b)
 }
 func (m *ListJobTriggersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListJobTriggersResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListJobTriggersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListJobTriggersResponse.Merge(dst, src)
+func (m *ListJobTriggersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobTriggersResponse.Merge(m, src)
 }
 func (m *ListJobTriggersResponse) XXX_Size() int {
 	return xxx_messageInfo_ListJobTriggersResponse.Size(m)
@@ -11503,16 +9618,17 @@ func (m *DeleteJobTriggerRequest) Reset()         { *m = DeleteJobTriggerRequest
 func (m *DeleteJobTriggerRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteJobTriggerRequest) ProtoMessage()    {}
 func (*DeleteJobTriggerRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{86}
+	return fileDescriptor_6872a91dcb80f8dc, []int{86}
 }
+
 func (m *DeleteJobTriggerRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteJobTriggerRequest.Unmarshal(m, b)
 }
 func (m *DeleteJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteJobTriggerRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteJobTriggerRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteJobTriggerRequest.Merge(dst, src)
+func (m *DeleteJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobTriggerRequest.Merge(m, src)
 }
 func (m *DeleteJobTriggerRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteJobTriggerRequest.Size(m)
@@ -11551,16 +9667,17 @@ func (m *InspectJobConfig) Reset()         { *m = InspectJobConfig{} }
 func (m *InspectJobConfig) String() string { return proto.CompactTextString(m) }
 func (*InspectJobConfig) ProtoMessage()    {}
 func (*InspectJobConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{87}
+	return fileDescriptor_6872a91dcb80f8dc, []int{87}
 }
+
 func (m *InspectJobConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InspectJobConfig.Unmarshal(m, b)
 }
 func (m *InspectJobConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InspectJobConfig.Marshal(b, m, deterministic)
 }
-func (dst *InspectJobConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InspectJobConfig.Merge(dst, src)
+func (m *InspectJobConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectJobConfig.Merge(m, src)
 }
 func (m *InspectJobConfig) XXX_Size() int {
 	return xxx_messageInfo_InspectJobConfig.Size(m)
@@ -11631,16 +9748,17 @@ func (m *DlpJob) Reset()         { *m = DlpJob{} }
 func (m *DlpJob) String() string { return proto.CompactTextString(m) }
 func (*DlpJob) ProtoMessage()    {}
 func (*DlpJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{88}
+	return fileDescriptor_6872a91dcb80f8dc, []int{88}
 }
+
 func (m *DlpJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DlpJob.Unmarshal(m, b)
 }
 func (m *DlpJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DlpJob.Marshal(b, m, deterministic)
 }
-func (dst *DlpJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DlpJob.Merge(dst, src)
+func (m *DlpJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DlpJob.Merge(m, src)
 }
 func (m *DlpJob) XXX_Size() int {
 	return xxx_messageInfo_DlpJob.Size(m)
@@ -11744,80 +9862,14 @@ func (m *DlpJob) GetErrors() []*Error {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DlpJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DlpJob_OneofMarshaler, _DlpJob_OneofUnmarshaler, _DlpJob_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*DlpJob) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*DlpJob_RiskDetails)(nil),
 		(*DlpJob_InspectDetails)(nil),
 	}
 }
 
-func _DlpJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DlpJob)
-	// details
-	switch x := m.Details.(type) {
-	case *DlpJob_RiskDetails:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RiskDetails); err != nil {
-			return err
-		}
-	case *DlpJob_InspectDetails:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InspectDetails); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DlpJob.Details has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DlpJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DlpJob)
-	switch tag {
-	case 4: // details.risk_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails)
-		err := b.DecodeMessage(msg)
-		m.Details = &DlpJob_RiskDetails{msg}
-		return true, err
-	case 5: // details.inspect_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InspectDataSourceDetails)
-		err := b.DecodeMessage(msg)
-		m.Details = &DlpJob_InspectDetails{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DlpJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DlpJob)
-	// details
-	switch x := m.Details.(type) {
-	case *DlpJob_RiskDetails:
-		s := proto.Size(x.RiskDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DlpJob_InspectDetails:
-		s := proto.Size(x.InspectDetails)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The request message for [DlpJobs.GetDlpJob][].
 type GetDlpJobRequest struct {
 	// The name of the DlpJob resource.
@@ -11831,16 +9883,17 @@ func (m *GetDlpJobRequest) Reset()         { *m = GetDlpJobRequest{} }
 func (m *GetDlpJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDlpJobRequest) ProtoMessage()    {}
 func (*GetDlpJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{89}
+	return fileDescriptor_6872a91dcb80f8dc, []int{89}
 }
+
 func (m *GetDlpJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDlpJobRequest.Unmarshal(m, b)
 }
 func (m *GetDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDlpJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDlpJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDlpJobRequest.Merge(dst, src)
+func (m *GetDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDlpJobRequest.Merge(m, src)
 }
 func (m *GetDlpJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDlpJobRequest.Size(m)
@@ -11915,16 +9968,17 @@ func (m *ListDlpJobsRequest) Reset()         { *m = ListDlpJobsRequest{} }
 func (m *ListDlpJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDlpJobsRequest) ProtoMessage()    {}
 func (*ListDlpJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{90}
+	return fileDescriptor_6872a91dcb80f8dc, []int{90}
 }
+
 func (m *ListDlpJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDlpJobsRequest.Unmarshal(m, b)
 }
 func (m *ListDlpJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDlpJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDlpJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDlpJobsRequest.Merge(dst, src)
+func (m *ListDlpJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDlpJobsRequest.Merge(m, src)
 }
 func (m *ListDlpJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDlpJobsRequest.Size(m)
@@ -11992,16 +10046,17 @@ func (m *ListDlpJobsResponse) Reset()         { *m = ListDlpJobsResponse{} }
 func (m *ListDlpJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDlpJobsResponse) ProtoMessage()    {}
 func (*ListDlpJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{91}
+	return fileDescriptor_6872a91dcb80f8dc, []int{91}
 }
+
 func (m *ListDlpJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDlpJobsResponse.Unmarshal(m, b)
 }
 func (m *ListDlpJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDlpJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDlpJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDlpJobsResponse.Merge(dst, src)
+func (m *ListDlpJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDlpJobsResponse.Merge(m, src)
 }
 func (m *ListDlpJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDlpJobsResponse.Size(m)
@@ -12039,16 +10094,17 @@ func (m *CancelDlpJobRequest) Reset()         { *m = CancelDlpJobRequest{} }
 func (m *CancelDlpJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CancelDlpJobRequest) ProtoMessage()    {}
 func (*CancelDlpJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{92}
+	return fileDescriptor_6872a91dcb80f8dc, []int{92}
 }
+
 func (m *CancelDlpJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CancelDlpJobRequest.Unmarshal(m, b)
 }
 func (m *CancelDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CancelDlpJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CancelDlpJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CancelDlpJobRequest.Merge(dst, src)
+func (m *CancelDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelDlpJobRequest.Merge(m, src)
 }
 func (m *CancelDlpJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CancelDlpJobRequest.Size(m)
@@ -12079,16 +10135,17 @@ func (m *DeleteDlpJobRequest) Reset()         { *m = DeleteDlpJobRequest{} }
 func (m *DeleteDlpJobRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDlpJobRequest) ProtoMessage()    {}
 func (*DeleteDlpJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{93}
+	return fileDescriptor_6872a91dcb80f8dc, []int{93}
 }
+
 func (m *DeleteDlpJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDlpJobRequest.Unmarshal(m, b)
 }
 func (m *DeleteDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDlpJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDlpJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDlpJobRequest.Merge(dst, src)
+func (m *DeleteDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDlpJobRequest.Merge(m, src)
 }
 func (m *DeleteDlpJobRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDlpJobRequest.Size(m)
@@ -12127,16 +10184,17 @@ func (m *CreateDeidentifyTemplateRequest) Reset()         { *m = CreateDeidentif
 func (m *CreateDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDeidentifyTemplateRequest) ProtoMessage()    {}
 func (*CreateDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{94}
+	return fileDescriptor_6872a91dcb80f8dc, []int{94}
 }
+
 func (m *CreateDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDeidentifyTemplateRequest.Unmarshal(m, b)
 }
 func (m *CreateDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDeidentifyTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDeidentifyTemplateRequest.Merge(dst, src)
+func (m *CreateDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDeidentifyTemplateRequest.Merge(m, src)
 }
 func (m *CreateDeidentifyTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDeidentifyTemplateRequest.Size(m)
@@ -12187,16 +10245,17 @@ func (m *UpdateDeidentifyTemplateRequest) Reset()         { *m = UpdateDeidentif
 func (m *UpdateDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDeidentifyTemplateRequest) ProtoMessage()    {}
 func (*UpdateDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{95}
+	return fileDescriptor_6872a91dcb80f8dc, []int{95}
 }
+
 func (m *UpdateDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDeidentifyTemplateRequest.Unmarshal(m, b)
 }
 func (m *UpdateDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDeidentifyTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDeidentifyTemplateRequest.Merge(dst, src)
+func (m *UpdateDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDeidentifyTemplateRequest.Merge(m, src)
 }
 func (m *UpdateDeidentifyTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDeidentifyTemplateRequest.Size(m)
@@ -12243,16 +10302,17 @@ func (m *GetDeidentifyTemplateRequest) Reset()         { *m = GetDeidentifyTempl
 func (m *GetDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDeidentifyTemplateRequest) ProtoMessage()    {}
 func (*GetDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{96}
+	return fileDescriptor_6872a91dcb80f8dc, []int{96}
 }
+
 func (m *GetDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDeidentifyTemplateRequest.Unmarshal(m, b)
 }
 func (m *GetDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDeidentifyTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDeidentifyTemplateRequest.Merge(dst, src)
+func (m *GetDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDeidentifyTemplateRequest.Merge(m, src)
 }
 func (m *GetDeidentifyTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDeidentifyTemplateRequest.Size(m)
@@ -12304,16 +10364,17 @@ func (m *ListDeidentifyTemplatesRequest) Reset()         { *m = ListDeidentifyTe
 func (m *ListDeidentifyTemplatesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDeidentifyTemplatesRequest) ProtoMessage()    {}
 func (*ListDeidentifyTemplatesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{97}
+	return fileDescriptor_6872a91dcb80f8dc, []int{97}
 }
+
 func (m *ListDeidentifyTemplatesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeidentifyTemplatesRequest.Unmarshal(m, b)
 }
 func (m *ListDeidentifyTemplatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeidentifyTemplatesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDeidentifyTemplatesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeidentifyTemplatesRequest.Merge(dst, src)
+func (m *ListDeidentifyTemplatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeidentifyTemplatesRequest.Merge(m, src)
 }
 func (m *ListDeidentifyTemplatesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDeidentifyTemplatesRequest.Size(m)
@@ -12369,16 +10430,17 @@ func (m *ListDeidentifyTemplatesResponse) Reset()         { *m = ListDeidentifyT
 func (m *ListDeidentifyTemplatesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDeidentifyTemplatesResponse) ProtoMessage()    {}
 func (*ListDeidentifyTemplatesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{98}
+	return fileDescriptor_6872a91dcb80f8dc, []int{98}
 }
+
 func (m *ListDeidentifyTemplatesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDeidentifyTemplatesResponse.Unmarshal(m, b)
 }
 func (m *ListDeidentifyTemplatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDeidentifyTemplatesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDeidentifyTemplatesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDeidentifyTemplatesResponse.Merge(dst, src)
+func (m *ListDeidentifyTemplatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeidentifyTemplatesResponse.Merge(m, src)
 }
 func (m *ListDeidentifyTemplatesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDeidentifyTemplatesResponse.Size(m)
@@ -12418,16 +10480,17 @@ func (m *DeleteDeidentifyTemplateRequest) Reset()         { *m = DeleteDeidentif
 func (m *DeleteDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteDeidentifyTemplateRequest) ProtoMessage()    {}
 func (*DeleteDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{99}
+	return fileDescriptor_6872a91dcb80f8dc, []int{99}
 }
+
 func (m *DeleteDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteDeidentifyTemplateRequest.Unmarshal(m, b)
 }
 func (m *DeleteDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteDeidentifyTemplateRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteDeidentifyTemplateRequest.Merge(dst, src)
+func (m *DeleteDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDeidentifyTemplateRequest.Merge(m, src)
 }
 func (m *DeleteDeidentifyTemplateRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteDeidentifyTemplateRequest.Size(m)
@@ -12470,16 +10533,17 @@ func (m *LargeCustomDictionaryConfig) Reset()         { *m = LargeCustomDictiona
 func (m *LargeCustomDictionaryConfig) String() string { return proto.CompactTextString(m) }
 func (*LargeCustomDictionaryConfig) ProtoMessage()    {}
 func (*LargeCustomDictionaryConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{100}
+	return fileDescriptor_6872a91dcb80f8dc, []int{100}
 }
+
 func (m *LargeCustomDictionaryConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LargeCustomDictionaryConfig.Unmarshal(m, b)
 }
 func (m *LargeCustomDictionaryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LargeCustomDictionaryConfig.Marshal(b, m, deterministic)
 }
-func (dst *LargeCustomDictionaryConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LargeCustomDictionaryConfig.Merge(dst, src)
+func (m *LargeCustomDictionaryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LargeCustomDictionaryConfig.Merge(m, src)
 }
 func (m *LargeCustomDictionaryConfig) XXX_Size() int {
 	return xxx_messageInfo_LargeCustomDictionaryConfig.Size(m)
@@ -12534,80 +10598,14 @@ func (m *LargeCustomDictionaryConfig) GetBigQueryField() *BigQueryField {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LargeCustomDictionaryConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LargeCustomDictionaryConfig_OneofMarshaler, _LargeCustomDictionaryConfig_OneofUnmarshaler, _LargeCustomDictionaryConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*LargeCustomDictionaryConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*LargeCustomDictionaryConfig_CloudStorageFileSet)(nil),
 		(*LargeCustomDictionaryConfig_BigQueryField)(nil),
 	}
 }
 
-func _LargeCustomDictionaryConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LargeCustomDictionaryConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *LargeCustomDictionaryConfig_CloudStorageFileSet:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudStorageFileSet); err != nil {
-			return err
-		}
-	case *LargeCustomDictionaryConfig_BigQueryField:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigQueryField); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LargeCustomDictionaryConfig.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LargeCustomDictionaryConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LargeCustomDictionaryConfig)
-	switch tag {
-	case 2: // source.cloud_storage_file_set
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStorageFileSet)
-		err := b.DecodeMessage(msg)
-		m.Source = &LargeCustomDictionaryConfig_CloudStorageFileSet{msg}
-		return true, err
-	case 3: // source.big_query_field
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryField)
-		err := b.DecodeMessage(msg)
-		m.Source = &LargeCustomDictionaryConfig_BigQueryField{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LargeCustomDictionaryConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LargeCustomDictionaryConfig)
-	// source
-	switch x := m.Source.(type) {
-	case *LargeCustomDictionaryConfig_CloudStorageFileSet:
-		s := proto.Size(x.CloudStorageFileSet)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LargeCustomDictionaryConfig_BigQueryField:
-		s := proto.Size(x.BigQueryField)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Configuration for a StoredInfoType.
 type StoredInfoTypeConfig struct {
 	// Display name of the StoredInfoType (max 256 characters).
@@ -12626,16 +10624,17 @@ func (m *StoredInfoTypeConfig) Reset()         { *m = StoredInfoTypeConfig{} }
 func (m *StoredInfoTypeConfig) String() string { return proto.CompactTextString(m) }
 func (*StoredInfoTypeConfig) ProtoMessage()    {}
 func (*StoredInfoTypeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{101}
+	return fileDescriptor_6872a91dcb80f8dc, []int{101}
 }
+
 func (m *StoredInfoTypeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StoredInfoTypeConfig.Unmarshal(m, b)
 }
 func (m *StoredInfoTypeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StoredInfoTypeConfig.Marshal(b, m, deterministic)
 }
-func (dst *StoredInfoTypeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StoredInfoTypeConfig.Merge(dst, src)
+func (m *StoredInfoTypeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StoredInfoTypeConfig.Merge(m, src)
 }
 func (m *StoredInfoTypeConfig) XXX_Size() int {
 	return xxx_messageInfo_StoredInfoTypeConfig.Size(m)
@@ -12684,61 +10683,13 @@ func (m *StoredInfoTypeConfig) GetLargeCustomDictionary() *LargeCustomDictionary
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StoredInfoTypeConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StoredInfoTypeConfig_OneofMarshaler, _StoredInfoTypeConfig_OneofUnmarshaler, _StoredInfoTypeConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StoredInfoTypeConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StoredInfoTypeConfig_LargeCustomDictionary)(nil),
 	}
 }
 
-func _StoredInfoTypeConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StoredInfoTypeConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StoredInfoTypeConfig_LargeCustomDictionary:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LargeCustomDictionary); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StoredInfoTypeConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StoredInfoTypeConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StoredInfoTypeConfig)
-	switch tag {
-	case 3: // type.large_custom_dictionary
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(LargeCustomDictionaryConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &StoredInfoTypeConfig_LargeCustomDictionary{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StoredInfoTypeConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StoredInfoTypeConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StoredInfoTypeConfig_LargeCustomDictionary:
-		s := proto.Size(x.LargeCustomDictionary)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Version of a StoredInfoType, including the configuration used to build it,
 // create timestamp, and current state.
 type StoredInfoTypeVersion struct {
@@ -12771,16 +10722,17 @@ func (m *StoredInfoTypeVersion) Reset()         { *m = StoredInfoTypeVersion{} }
 func (m *StoredInfoTypeVersion) String() string { return proto.CompactTextString(m) }
 func (*StoredInfoTypeVersion) ProtoMessage()    {}
 func (*StoredInfoTypeVersion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{102}
+	return fileDescriptor_6872a91dcb80f8dc, []int{102}
 }
+
 func (m *StoredInfoTypeVersion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StoredInfoTypeVersion.Unmarshal(m, b)
 }
 func (m *StoredInfoTypeVersion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StoredInfoTypeVersion.Marshal(b, m, deterministic)
 }
-func (dst *StoredInfoTypeVersion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StoredInfoTypeVersion.Merge(dst, src)
+func (m *StoredInfoTypeVersion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StoredInfoTypeVersion.Merge(m, src)
 }
 func (m *StoredInfoTypeVersion) XXX_Size() int {
 	return xxx_messageInfo_StoredInfoTypeVersion.Size(m)
@@ -12838,16 +10790,17 @@ func (m *StoredInfoType) Reset()         { *m = StoredInfoType{} }
 func (m *StoredInfoType) String() string { return proto.CompactTextString(m) }
 func (*StoredInfoType) ProtoMessage()    {}
 func (*StoredInfoType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{103}
+	return fileDescriptor_6872a91dcb80f8dc, []int{103}
 }
+
 func (m *StoredInfoType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StoredInfoType.Unmarshal(m, b)
 }
 func (m *StoredInfoType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StoredInfoType.Marshal(b, m, deterministic)
 }
-func (dst *StoredInfoType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StoredInfoType.Merge(dst, src)
+func (m *StoredInfoType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StoredInfoType.Merge(m, src)
 }
 func (m *StoredInfoType) XXX_Size() int {
 	return xxx_messageInfo_StoredInfoType.Size(m)
@@ -12900,16 +10853,17 @@ func (m *CreateStoredInfoTypeRequest) Reset()         { *m = CreateStoredInfoTyp
 func (m *CreateStoredInfoTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateStoredInfoTypeRequest) ProtoMessage()    {}
 func (*CreateStoredInfoTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{104}
+	return fileDescriptor_6872a91dcb80f8dc, []int{104}
 }
+
 func (m *CreateStoredInfoTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateStoredInfoTypeRequest.Unmarshal(m, b)
 }
 func (m *CreateStoredInfoTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateStoredInfoTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateStoredInfoTypeRequest.Merge(dst, src)
+func (m *CreateStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateStoredInfoTypeRequest.Merge(m, src)
 }
 func (m *CreateStoredInfoTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateStoredInfoTypeRequest.Size(m)
@@ -12962,16 +10916,17 @@ func (m *UpdateStoredInfoTypeRequest) Reset()         { *m = UpdateStoredInfoTyp
 func (m *UpdateStoredInfoTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateStoredInfoTypeRequest) ProtoMessage()    {}
 func (*UpdateStoredInfoTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{105}
+	return fileDescriptor_6872a91dcb80f8dc, []int{105}
 }
+
 func (m *UpdateStoredInfoTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateStoredInfoTypeRequest.Unmarshal(m, b)
 }
 func (m *UpdateStoredInfoTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateStoredInfoTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateStoredInfoTypeRequest.Merge(dst, src)
+func (m *UpdateStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateStoredInfoTypeRequest.Merge(m, src)
 }
 func (m *UpdateStoredInfoTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateStoredInfoTypeRequest.Size(m)
@@ -13018,16 +10973,17 @@ func (m *GetStoredInfoTypeRequest) Reset()         { *m = GetStoredInfoTypeReque
 func (m *GetStoredInfoTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*GetStoredInfoTypeRequest) ProtoMessage()    {}
 func (*GetStoredInfoTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{106}
+	return fileDescriptor_6872a91dcb80f8dc, []int{106}
 }
+
 func (m *GetStoredInfoTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetStoredInfoTypeRequest.Unmarshal(m, b)
 }
 func (m *GetStoredInfoTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetStoredInfoTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetStoredInfoTypeRequest.Merge(dst, src)
+func (m *GetStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetStoredInfoTypeRequest.Merge(m, src)
 }
 func (m *GetStoredInfoTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_GetStoredInfoTypeRequest.Size(m)
@@ -13080,16 +11036,17 @@ func (m *ListStoredInfoTypesRequest) Reset()         { *m = ListStoredInfoTypesR
 func (m *ListStoredInfoTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListStoredInfoTypesRequest) ProtoMessage()    {}
 func (*ListStoredInfoTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{107}
+	return fileDescriptor_6872a91dcb80f8dc, []int{107}
 }
+
 func (m *ListStoredInfoTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListStoredInfoTypesRequest.Unmarshal(m, b)
 }
 func (m *ListStoredInfoTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListStoredInfoTypesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListStoredInfoTypesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListStoredInfoTypesRequest.Merge(dst, src)
+func (m *ListStoredInfoTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListStoredInfoTypesRequest.Merge(m, src)
 }
 func (m *ListStoredInfoTypesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListStoredInfoTypesRequest.Size(m)
@@ -13144,16 +11101,17 @@ func (m *ListStoredInfoTypesResponse) Reset()         { *m = ListStoredInfoTypes
 func (m *ListStoredInfoTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListStoredInfoTypesResponse) ProtoMessage()    {}
 func (*ListStoredInfoTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{108}
+	return fileDescriptor_6872a91dcb80f8dc, []int{108}
 }
+
 func (m *ListStoredInfoTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListStoredInfoTypesResponse.Unmarshal(m, b)
 }
 func (m *ListStoredInfoTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListStoredInfoTypesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListStoredInfoTypesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListStoredInfoTypesResponse.Merge(dst, src)
+func (m *ListStoredInfoTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListStoredInfoTypesResponse.Merge(m, src)
 }
 func (m *ListStoredInfoTypesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListStoredInfoTypesResponse.Size(m)
@@ -13193,16 +11151,17 @@ func (m *DeleteStoredInfoTypeRequest) Reset()         { *m = DeleteStoredInfoTyp
 func (m *DeleteStoredInfoTypeRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteStoredInfoTypeRequest) ProtoMessage()    {}
 func (*DeleteStoredInfoTypeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dlp_1aebf9c18c267d70, []int{109}
+	return fileDescriptor_6872a91dcb80f8dc, []int{109}
 }
+
 func (m *DeleteStoredInfoTypeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteStoredInfoTypeRequest.Unmarshal(m, b)
 }
 func (m *DeleteStoredInfoTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteStoredInfoTypeRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteStoredInfoTypeRequest.Merge(dst, src)
+func (m *DeleteStoredInfoTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteStoredInfoTypeRequest.Merge(m, src)
 }
 func (m *DeleteStoredInfoTypeRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteStoredInfoTypeRequest.Size(m)
@@ -13221,6 +11180,21 @@ func (m *DeleteStoredInfoTypeRequest) GetName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.privacy.dlp.v2.ContentOption", ContentOption_name, ContentOption_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.MatchingType", MatchingType_name, MatchingType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.InfoTypeSupportedBy", InfoTypeSupportedBy_name, InfoTypeSupportedBy_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.RelationalOperator", RelationalOperator_name, RelationalOperator_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.DlpJobType", DlpJobType_name, DlpJobType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.StoredInfoTypeState", StoredInfoTypeState_name, StoredInfoTypeState_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.ByteContentItem_BytesType", ByteContentItem_BytesType_name, ByteContentItem_BytesType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.OutputStorageConfig_OutputSchema", OutputStorageConfig_OutputSchema_name, OutputStorageConfig_OutputSchema_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.TimePartConfig_TimePart", TimePartConfig_TimePart_name, TimePartConfig_TimePart_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.CharsToIgnore_CommonCharsToIgnore", CharsToIgnore_CommonCharsToIgnore_name, CharsToIgnore_CommonCharsToIgnore_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet", CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.RecordCondition_Expressions_LogicalOperator", RecordCondition_Expressions_LogicalOperator_name, RecordCondition_Expressions_LogicalOperator_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.TransformationSummary_TransformationResultCode", TransformationSummary_TransformationResultCode_name, TransformationSummary_TransformationResultCode_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.JobTrigger_Status", JobTrigger_Status_name, JobTrigger_Status_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.DlpJob_JobState", DlpJob_JobState_name, DlpJob_JobState_value)
 	proto.RegisterType((*ExcludeInfoTypes)(nil), "google.privacy.dlp.v2.ExcludeInfoTypes")
 	proto.RegisterType((*ExclusionRule)(nil), "google.privacy.dlp.v2.ExclusionRule")
 	proto.RegisterType((*InspectionRule)(nil), "google.privacy.dlp.v2.InspectionRule")
@@ -13374,1312 +11348,11 @@ func init() {
 	proto.RegisterType((*ListStoredInfoTypesRequest)(nil), "google.privacy.dlp.v2.ListStoredInfoTypesRequest")
 	proto.RegisterType((*ListStoredInfoTypesResponse)(nil), "google.privacy.dlp.v2.ListStoredInfoTypesResponse")
 	proto.RegisterType((*DeleteStoredInfoTypeRequest)(nil), "google.privacy.dlp.v2.DeleteStoredInfoTypeRequest")
-	proto.RegisterEnum("google.privacy.dlp.v2.ContentOption", ContentOption_name, ContentOption_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.MatchingType", MatchingType_name, MatchingType_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.InfoTypeSupportedBy", InfoTypeSupportedBy_name, InfoTypeSupportedBy_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.RelationalOperator", RelationalOperator_name, RelationalOperator_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.DlpJobType", DlpJobType_name, DlpJobType_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.StoredInfoTypeState", StoredInfoTypeState_name, StoredInfoTypeState_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.ByteContentItem_BytesType", ByteContentItem_BytesType_name, ByteContentItem_BytesType_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.OutputStorageConfig_OutputSchema", OutputStorageConfig_OutputSchema_name, OutputStorageConfig_OutputSchema_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.TimePartConfig_TimePart", TimePartConfig_TimePart_name, TimePartConfig_TimePart_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.CharsToIgnore_CommonCharsToIgnore", CharsToIgnore_CommonCharsToIgnore_name, CharsToIgnore_CommonCharsToIgnore_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet", CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.RecordCondition_Expressions_LogicalOperator", RecordCondition_Expressions_LogicalOperator_name, RecordCondition_Expressions_LogicalOperator_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.TransformationSummary_TransformationResultCode", TransformationSummary_TransformationResultCode_name, TransformationSummary_TransformationResultCode_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.JobTrigger_Status", JobTrigger_Status_name, JobTrigger_Status_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.DlpJob_JobState", DlpJob_JobState_name, DlpJob_JobState_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// DlpServiceClient is the client API for DlpService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type DlpServiceClient interface {
-	// Finds potentially sensitive info in content.
-	// This method has limits on input size, processing time, and output size.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in this request, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	//
-	// For how to guides, see https://cloud.google.com/dlp/docs/inspecting-images
-	// and https://cloud.google.com/dlp/docs/inspecting-text,
-	InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error)
-	// Redacts potentially sensitive info from an image.
-	// This method has limits on input size, processing time, and output size.
-	// See https://cloud.google.com/dlp/docs/redacting-sensitive-data-images to
-	// learn more.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in this request, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error)
-	// De-identifies potentially sensitive info from a ContentItem.
-	// This method has limits on input size and output size.
-	// See https://cloud.google.com/dlp/docs/deidentify-sensitive-data to
-	// learn more.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in this request, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error)
-	// Re-identifies content that has been de-identified.
-	// See
-	// https://cloud.google.com/dlp/docs/pseudonymization#re-identification_in_free_text_code_example
-	// to learn more.
-	ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error)
-	// Returns a list of the sensitive information types that the DLP API
-	// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
-	// learn more.
-	ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error)
-	// Creates an InspectTemplate for re-using frequently used configuration
-	// for inspecting content, images, and storage.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
-	// Updates the InspectTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
-	// Gets an InspectTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
-	// Lists InspectTemplates.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error)
-	// Deletes an InspectTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Creates a DeidentifyTemplate for re-using frequently used configuration
-	// for de-identifying content, images, and storage.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
-	// Updates the DeidentifyTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
-	// Gets a DeidentifyTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
-	// Lists DeidentifyTemplates.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error)
-	// Deletes a DeidentifyTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Creates a job trigger to run DLP actions such as scanning storage for
-	// sensitive information on a set schedule.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	CreateJobTrigger(ctx context.Context, in *CreateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
-	// Updates a job trigger.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	UpdateJobTrigger(ctx context.Context, in *UpdateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
-	// Gets a job trigger.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	GetJobTrigger(ctx context.Context, in *GetJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
-	// Lists job triggers.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	ListJobTriggers(ctx context.Context, in *ListJobTriggersRequest, opts ...grpc.CallOption) (*ListJobTriggersResponse, error)
-	// Deletes a job trigger.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Activate a job trigger. Causes the immediate execute of a trigger
-	// instead of waiting on the trigger event to occur.
-	ActivateJobTrigger(ctx context.Context, in *ActivateJobTriggerRequest, opts ...grpc.CallOption) (*DlpJob, error)
-	// Creates a new job to inspect storage or calculate risk metrics.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in inspect jobs, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	CreateDlpJob(ctx context.Context, in *CreateDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error)
-	// Lists DlpJobs that match the specified filter in the request.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error)
-	// Gets the latest state of a long-running DlpJob.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error)
-	// Deletes a long-running DlpJob. This method indicates that the client is
-	// no longer interested in the DlpJob result. The job will be cancelled if
-	// possible.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Starts asynchronous cancellation on a long-running DlpJob. The server
-	// makes a best effort to cancel the DlpJob, but success is not
-	// guaranteed.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Creates a pre-built stored infoType to be used for inspection.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	CreateStoredInfoType(ctx context.Context, in *CreateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error)
-	// Updates the stored infoType by creating a new version. The existing version
-	// will continue to be used until the new version is ready.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	UpdateStoredInfoType(ctx context.Context, in *UpdateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error)
-	// Gets a stored infoType.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	GetStoredInfoType(ctx context.Context, in *GetStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error)
-	// Lists stored infoTypes.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	ListStoredInfoTypes(ctx context.Context, in *ListStoredInfoTypesRequest, opts ...grpc.CallOption) (*ListStoredInfoTypesResponse, error)
-	// Deletes a stored infoType.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	DeleteStoredInfoType(ctx context.Context, in *DeleteStoredInfoTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
-}
-
-type dlpServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewDlpServiceClient(cc *grpc.ClientConn) DlpServiceClient {
-	return &dlpServiceClient{cc}
 }
 
-func (c *dlpServiceClient) InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error) {
-	out := new(InspectContentResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/InspectContent", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
+func init() { proto.RegisterFile("google/privacy/dlp/v2/dlp.proto", fileDescriptor_6872a91dcb80f8dc) }
 
-func (c *dlpServiceClient) RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error) {
-	out := new(RedactImageResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/RedactImage", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error) {
-	out := new(DeidentifyContentResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeidentifyContent", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error) {
-	out := new(ReidentifyContentResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ReidentifyContent", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error) {
-	out := new(ListInfoTypesResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListInfoTypes", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
-	out := new(InspectTemplate)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateInspectTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
-	out := new(InspectTemplate)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateInspectTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
-	out := new(InspectTemplate)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetInspectTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error) {
-	out := new(ListInspectTemplatesResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListInspectTemplates", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteInspectTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
-	out := new(DeidentifyTemplate)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
-	out := new(DeidentifyTemplate)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
-	out := new(DeidentifyTemplate)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetDeidentifyTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error) {
-	out := new(ListDeidentifyTemplatesResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListDeidentifyTemplates", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateJobTrigger(ctx context.Context, in *CreateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
-	out := new(JobTrigger)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateJobTrigger", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) UpdateJobTrigger(ctx context.Context, in *UpdateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
-	out := new(JobTrigger)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateJobTrigger", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetJobTrigger(ctx context.Context, in *GetJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
-	out := new(JobTrigger)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetJobTrigger", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListJobTriggers(ctx context.Context, in *ListJobTriggersRequest, opts ...grpc.CallOption) (*ListJobTriggersResponse, error) {
-	out := new(ListJobTriggersResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListJobTriggers", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteJobTrigger", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ActivateJobTrigger(ctx context.Context, in *ActivateJobTriggerRequest, opts ...grpc.CallOption) (*DlpJob, error) {
-	out := new(DlpJob)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ActivateJobTrigger", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateDlpJob(ctx context.Context, in *CreateDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error) {
-	out := new(DlpJob)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateDlpJob", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error) {
-	out := new(ListDlpJobsResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListDlpJobs", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error) {
-	out := new(DlpJob)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetDlpJob", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDlpJob", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CancelDlpJob", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateStoredInfoType(ctx context.Context, in *CreateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error) {
-	out := new(StoredInfoType)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateStoredInfoType", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) UpdateStoredInfoType(ctx context.Context, in *UpdateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error) {
-	out := new(StoredInfoType)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateStoredInfoType", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetStoredInfoType(ctx context.Context, in *GetStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error) {
-	out := new(StoredInfoType)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetStoredInfoType", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListStoredInfoTypes(ctx context.Context, in *ListStoredInfoTypesRequest, opts ...grpc.CallOption) (*ListStoredInfoTypesResponse, error) {
-	out := new(ListStoredInfoTypesResponse)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListStoredInfoTypes", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteStoredInfoType(ctx context.Context, in *DeleteStoredInfoTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
-	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteStoredInfoType", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// DlpServiceServer is the server API for DlpService service.
-type DlpServiceServer interface {
-	// Finds potentially sensitive info in content.
-	// This method has limits on input size, processing time, and output size.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in this request, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	//
-	// For how to guides, see https://cloud.google.com/dlp/docs/inspecting-images
-	// and https://cloud.google.com/dlp/docs/inspecting-text,
-	InspectContent(context.Context, *InspectContentRequest) (*InspectContentResponse, error)
-	// Redacts potentially sensitive info from an image.
-	// This method has limits on input size, processing time, and output size.
-	// See https://cloud.google.com/dlp/docs/redacting-sensitive-data-images to
-	// learn more.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in this request, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	RedactImage(context.Context, *RedactImageRequest) (*RedactImageResponse, error)
-	// De-identifies potentially sensitive info from a ContentItem.
-	// This method has limits on input size and output size.
-	// See https://cloud.google.com/dlp/docs/deidentify-sensitive-data to
-	// learn more.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in this request, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	DeidentifyContent(context.Context, *DeidentifyContentRequest) (*DeidentifyContentResponse, error)
-	// Re-identifies content that has been de-identified.
-	// See
-	// https://cloud.google.com/dlp/docs/pseudonymization#re-identification_in_free_text_code_example
-	// to learn more.
-	ReidentifyContent(context.Context, *ReidentifyContentRequest) (*ReidentifyContentResponse, error)
-	// Returns a list of the sensitive information types that the DLP API
-	// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
-	// learn more.
-	ListInfoTypes(context.Context, *ListInfoTypesRequest) (*ListInfoTypesResponse, error)
-	// Creates an InspectTemplate for re-using frequently used configuration
-	// for inspecting content, images, and storage.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	CreateInspectTemplate(context.Context, *CreateInspectTemplateRequest) (*InspectTemplate, error)
-	// Updates the InspectTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	UpdateInspectTemplate(context.Context, *UpdateInspectTemplateRequest) (*InspectTemplate, error)
-	// Gets an InspectTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	GetInspectTemplate(context.Context, *GetInspectTemplateRequest) (*InspectTemplate, error)
-	// Lists InspectTemplates.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	ListInspectTemplates(context.Context, *ListInspectTemplatesRequest) (*ListInspectTemplatesResponse, error)
-	// Deletes an InspectTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
-	DeleteInspectTemplate(context.Context, *DeleteInspectTemplateRequest) (*empty.Empty, error)
-	// Creates a DeidentifyTemplate for re-using frequently used configuration
-	// for de-identifying content, images, and storage.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	CreateDeidentifyTemplate(context.Context, *CreateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
-	// Updates the DeidentifyTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	UpdateDeidentifyTemplate(context.Context, *UpdateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
-	// Gets a DeidentifyTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	GetDeidentifyTemplate(context.Context, *GetDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
-	// Lists DeidentifyTemplates.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	ListDeidentifyTemplates(context.Context, *ListDeidentifyTemplatesRequest) (*ListDeidentifyTemplatesResponse, error)
-	// Deletes a DeidentifyTemplate.
-	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
-	// more.
-	DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*empty.Empty, error)
-	// Creates a job trigger to run DLP actions such as scanning storage for
-	// sensitive information on a set schedule.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	CreateJobTrigger(context.Context, *CreateJobTriggerRequest) (*JobTrigger, error)
-	// Updates a job trigger.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	UpdateJobTrigger(context.Context, *UpdateJobTriggerRequest) (*JobTrigger, error)
-	// Gets a job trigger.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	GetJobTrigger(context.Context, *GetJobTriggerRequest) (*JobTrigger, error)
-	// Lists job triggers.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	ListJobTriggers(context.Context, *ListJobTriggersRequest) (*ListJobTriggersResponse, error)
-	// Deletes a job trigger.
-	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
-	DeleteJobTrigger(context.Context, *DeleteJobTriggerRequest) (*empty.Empty, error)
-	// Activate a job trigger. Causes the immediate execute of a trigger
-	// instead of waiting on the trigger event to occur.
-	ActivateJobTrigger(context.Context, *ActivateJobTriggerRequest) (*DlpJob, error)
-	// Creates a new job to inspect storage or calculate risk metrics.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	//
-	// When no InfoTypes or CustomInfoTypes are specified in inspect jobs, the
-	// system will automatically choose what detectors to run. By default this may
-	// be all types, but may change over time as detectors are updated.
-	CreateDlpJob(context.Context, *CreateDlpJobRequest) (*DlpJob, error)
-	// Lists DlpJobs that match the specified filter in the request.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	ListDlpJobs(context.Context, *ListDlpJobsRequest) (*ListDlpJobsResponse, error)
-	// Gets the latest state of a long-running DlpJob.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	GetDlpJob(context.Context, *GetDlpJobRequest) (*DlpJob, error)
-	// Deletes a long-running DlpJob. This method indicates that the client is
-	// no longer interested in the DlpJob result. The job will be cancelled if
-	// possible.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	DeleteDlpJob(context.Context, *DeleteDlpJobRequest) (*empty.Empty, error)
-	// Starts asynchronous cancellation on a long-running DlpJob. The server
-	// makes a best effort to cancel the DlpJob, but success is not
-	// guaranteed.
-	// See https://cloud.google.com/dlp/docs/inspecting-storage and
-	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
-	CancelDlpJob(context.Context, *CancelDlpJobRequest) (*empty.Empty, error)
-	// Creates a pre-built stored infoType to be used for inspection.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	CreateStoredInfoType(context.Context, *CreateStoredInfoTypeRequest) (*StoredInfoType, error)
-	// Updates the stored infoType by creating a new version. The existing version
-	// will continue to be used until the new version is ready.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	UpdateStoredInfoType(context.Context, *UpdateStoredInfoTypeRequest) (*StoredInfoType, error)
-	// Gets a stored infoType.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	GetStoredInfoType(context.Context, *GetStoredInfoTypeRequest) (*StoredInfoType, error)
-	// Lists stored infoTypes.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	ListStoredInfoTypes(context.Context, *ListStoredInfoTypesRequest) (*ListStoredInfoTypesResponse, error)
-	// Deletes a stored infoType.
-	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
-	// learn more.
-	DeleteStoredInfoType(context.Context, *DeleteStoredInfoTypeRequest) (*empty.Empty, error)
-}
-
-func RegisterDlpServiceServer(s *grpc.Server, srv DlpServiceServer) {
-	s.RegisterService(&_DlpService_serviceDesc, srv)
-}
-
-func _DlpService_InspectContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(InspectContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).InspectContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/InspectContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).InspectContent(ctx, req.(*InspectContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_RedactImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RedactImageRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).RedactImage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/RedactImage",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).RedactImage(ctx, req.(*RedactImageRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeidentifyContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeidentifyContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/DeidentifyContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeidentifyContent(ctx, req.(*DeidentifyContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ReidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReidentifyContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ReidentifyContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ReidentifyContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ReidentifyContent(ctx, req.(*ReidentifyContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListInfoTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListInfoTypesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListInfoTypes(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ListInfoTypes",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListInfoTypes(ctx, req.(*ListInfoTypesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, req.(*CreateInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_UpdateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, req.(*UpdateInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/GetInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetInspectTemplate(ctx, req.(*GetInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListInspectTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListInspectTemplatesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListInspectTemplates(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ListInspectTemplates",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListInspectTemplates(ctx, req.(*ListInspectTemplatesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, req.(*DeleteInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, req.(*CreateDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_UpdateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, req.(*UpdateDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/GetDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, req.(*GetDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListDeidentifyTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListDeidentifyTemplatesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ListDeidentifyTemplates",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, req.(*ListDeidentifyTemplatesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, req.(*DeleteDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateJobTriggerRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateJobTrigger(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateJobTrigger",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateJobTrigger(ctx, req.(*CreateJobTriggerRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_UpdateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateJobTriggerRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).UpdateJobTrigger(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateJobTrigger",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).UpdateJobTrigger(ctx, req.(*UpdateJobTriggerRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetJobTriggerRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetJobTrigger(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/GetJobTrigger",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetJobTrigger(ctx, req.(*GetJobTriggerRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListJobTriggers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListJobTriggersRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListJobTriggers(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ListJobTriggers",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListJobTriggers(ctx, req.(*ListJobTriggersRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteJobTriggerRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteJobTrigger(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteJobTrigger",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteJobTrigger(ctx, req.(*DeleteJobTriggerRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ActivateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ActivateJobTriggerRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ActivateJobTrigger(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ActivateJobTrigger",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ActivateJobTrigger(ctx, req.(*ActivateJobTriggerRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateDlpJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateDlpJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateDlpJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateDlpJob(ctx, req.(*CreateDlpJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListDlpJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListDlpJobsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListDlpJobs(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ListDlpJobs",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListDlpJobs(ctx, req.(*ListDlpJobsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetDlpJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetDlpJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/GetDlpJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetDlpJob(ctx, req.(*GetDlpJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteDlpJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteDlpJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteDlpJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteDlpJob(ctx, req.(*DeleteDlpJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CancelDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CancelDlpJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CancelDlpJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/CancelDlpJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CancelDlpJob(ctx, req.(*CancelDlpJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateStoredInfoTypeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateStoredInfoType(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateStoredInfoType",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateStoredInfoType(ctx, req.(*CreateStoredInfoTypeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_UpdateStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateStoredInfoTypeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).UpdateStoredInfoType(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateStoredInfoType",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).UpdateStoredInfoType(ctx, req.(*UpdateStoredInfoTypeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetStoredInfoTypeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetStoredInfoType(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/GetStoredInfoType",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetStoredInfoType(ctx, req.(*GetStoredInfoTypeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListStoredInfoTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListStoredInfoTypesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListStoredInfoTypes(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/ListStoredInfoTypes",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListStoredInfoTypes(ctx, req.(*ListStoredInfoTypesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteStoredInfoTypeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteStoredInfoType(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteStoredInfoType",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteStoredInfoType(ctx, req.(*DeleteStoredInfoTypeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _DlpService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.privacy.dlp.v2.DlpService",
-	HandlerType: (*DlpServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "InspectContent",
-			Handler:    _DlpService_InspectContent_Handler,
-		},
-		{
-			MethodName: "RedactImage",
-			Handler:    _DlpService_RedactImage_Handler,
-		},
-		{
-			MethodName: "DeidentifyContent",
-			Handler:    _DlpService_DeidentifyContent_Handler,
-		},
-		{
-			MethodName: "ReidentifyContent",
-			Handler:    _DlpService_ReidentifyContent_Handler,
-		},
-		{
-			MethodName: "ListInfoTypes",
-			Handler:    _DlpService_ListInfoTypes_Handler,
-		},
-		{
-			MethodName: "CreateInspectTemplate",
-			Handler:    _DlpService_CreateInspectTemplate_Handler,
-		},
-		{
-			MethodName: "UpdateInspectTemplate",
-			Handler:    _DlpService_UpdateInspectTemplate_Handler,
-		},
-		{
-			MethodName: "GetInspectTemplate",
-			Handler:    _DlpService_GetInspectTemplate_Handler,
-		},
-		{
-			MethodName: "ListInspectTemplates",
-			Handler:    _DlpService_ListInspectTemplates_Handler,
-		},
-		{
-			MethodName: "DeleteInspectTemplate",
-			Handler:    _DlpService_DeleteInspectTemplate_Handler,
-		},
-		{
-			MethodName: "CreateDeidentifyTemplate",
-			Handler:    _DlpService_CreateDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "UpdateDeidentifyTemplate",
-			Handler:    _DlpService_UpdateDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "GetDeidentifyTemplate",
-			Handler:    _DlpService_GetDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "ListDeidentifyTemplates",
-			Handler:    _DlpService_ListDeidentifyTemplates_Handler,
-		},
-		{
-			MethodName: "DeleteDeidentifyTemplate",
-			Handler:    _DlpService_DeleteDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "CreateJobTrigger",
-			Handler:    _DlpService_CreateJobTrigger_Handler,
-		},
-		{
-			MethodName: "UpdateJobTrigger",
-			Handler:    _DlpService_UpdateJobTrigger_Handler,
-		},
-		{
-			MethodName: "GetJobTrigger",
-			Handler:    _DlpService_GetJobTrigger_Handler,
-		},
-		{
-			MethodName: "ListJobTriggers",
-			Handler:    _DlpService_ListJobTriggers_Handler,
-		},
-		{
-			MethodName: "DeleteJobTrigger",
-			Handler:    _DlpService_DeleteJobTrigger_Handler,
-		},
-		{
-			MethodName: "ActivateJobTrigger",
-			Handler:    _DlpService_ActivateJobTrigger_Handler,
-		},
-		{
-			MethodName: "CreateDlpJob",
-			Handler:    _DlpService_CreateDlpJob_Handler,
-		},
-		{
-			MethodName: "ListDlpJobs",
-			Handler:    _DlpService_ListDlpJobs_Handler,
-		},
-		{
-			MethodName: "GetDlpJob",
-			Handler:    _DlpService_GetDlpJob_Handler,
-		},
-		{
-			MethodName: "DeleteDlpJob",
-			Handler:    _DlpService_DeleteDlpJob_Handler,
-		},
-		{
-			MethodName: "CancelDlpJob",
-			Handler:    _DlpService_CancelDlpJob_Handler,
-		},
-		{
-			MethodName: "CreateStoredInfoType",
-			Handler:    _DlpService_CreateStoredInfoType_Handler,
-		},
-		{
-			MethodName: "UpdateStoredInfoType",
-			Handler:    _DlpService_UpdateStoredInfoType_Handler,
-		},
-		{
-			MethodName: "GetStoredInfoType",
-			Handler:    _DlpService_GetStoredInfoType_Handler,
-		},
-		{
-			MethodName: "ListStoredInfoTypes",
-			Handler:    _DlpService_ListStoredInfoTypes_Handler,
-		},
-		{
-			MethodName: "DeleteStoredInfoType",
-			Handler:    _DlpService_DeleteStoredInfoType_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/privacy/dlp/v2/dlp.proto",
-}
-
-func init() {
-	proto.RegisterFile("google/privacy/dlp/v2/dlp.proto", fileDescriptor_dlp_1aebf9c18c267d70)
-}
-
-var fileDescriptor_dlp_1aebf9c18c267d70 = []byte{
+var fileDescriptor_6872a91dcb80f8dc = []byte{
 	// 9320 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x7d, 0x5b, 0x8c, 0x1b, 0x59,
 	0x76, 0x58, 0x17, 0xd9, 0xec, 0x66, 0x1f, 0x36, 0xd9, 0xec, 0xdb, 0x4f, 0x51, 0xd2, 0x4a, 0x53,
@@ -15265,3 +11938,1287 @@ var fileDescriptor_dlp_1aebf9c18c267d70 = []byte{
 	0x75, 0x3f, 0xbe, 0xbf, 0xbe, 0x3f, 0x41, 0x09, 0xbe, 0xf6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff,
 	0x8e, 0x7f, 0xf9, 0x3f, 0x05, 0x96, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// DlpServiceClient is the client API for DlpService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type DlpServiceClient interface {
+	// Finds potentially sensitive info in content.
+	// This method has limits on input size, processing time, and output size.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	//
+	// For how to guides, see https://cloud.google.com/dlp/docs/inspecting-images
+	// and https://cloud.google.com/dlp/docs/inspecting-text,
+	InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error)
+	// Redacts potentially sensitive info from an image.
+	// This method has limits on input size, processing time, and output size.
+	// See https://cloud.google.com/dlp/docs/redacting-sensitive-data-images to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error)
+	// De-identifies potentially sensitive info from a ContentItem.
+	// This method has limits on input size and output size.
+	// See https://cloud.google.com/dlp/docs/deidentify-sensitive-data to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error)
+	// Re-identifies content that has been de-identified.
+	// See
+	// https://cloud.google.com/dlp/docs/pseudonymization#re-identification_in_free_text_code_example
+	// to learn more.
+	ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error)
+	// Returns a list of the sensitive information types that the DLP API
+	// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
+	// learn more.
+	ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error)
+	// Creates an InspectTemplate for re-using frequently used configuration
+	// for inspecting content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
+	// Updates the InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
+	// Gets an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
+	// Lists InspectTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error)
+	// Deletes an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a DeidentifyTemplate for re-using frequently used configuration
+	// for de-identifying content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
+	// Updates the DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
+	// Gets a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
+	// Lists DeidentifyTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error)
+	// Deletes a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a job trigger to run DLP actions such as scanning storage for
+	// sensitive information on a set schedule.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	CreateJobTrigger(ctx context.Context, in *CreateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
+	// Updates a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	UpdateJobTrigger(ctx context.Context, in *UpdateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
+	// Gets a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	GetJobTrigger(ctx context.Context, in *GetJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
+	// Lists job triggers.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	ListJobTriggers(ctx context.Context, in *ListJobTriggersRequest, opts ...grpc.CallOption) (*ListJobTriggersResponse, error)
+	// Deletes a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Activate a job trigger. Causes the immediate execute of a trigger
+	// instead of waiting on the trigger event to occur.
+	ActivateJobTrigger(ctx context.Context, in *ActivateJobTriggerRequest, opts ...grpc.CallOption) (*DlpJob, error)
+	// Creates a new job to inspect storage or calculate risk metrics.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in inspect jobs, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	CreateDlpJob(ctx context.Context, in *CreateDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error)
+	// Lists DlpJobs that match the specified filter in the request.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error)
+	// Gets the latest state of a long-running DlpJob.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error)
+	// Deletes a long-running DlpJob. This method indicates that the client is
+	// no longer interested in the DlpJob result. The job will be cancelled if
+	// possible.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Starts asynchronous cancellation on a long-running DlpJob. The server
+	// makes a best effort to cancel the DlpJob, but success is not
+	// guaranteed.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a pre-built stored infoType to be used for inspection.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	CreateStoredInfoType(ctx context.Context, in *CreateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error)
+	// Updates the stored infoType by creating a new version. The existing version
+	// will continue to be used until the new version is ready.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	UpdateStoredInfoType(ctx context.Context, in *UpdateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error)
+	// Gets a stored infoType.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	GetStoredInfoType(ctx context.Context, in *GetStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error)
+	// Lists stored infoTypes.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	ListStoredInfoTypes(ctx context.Context, in *ListStoredInfoTypesRequest, opts ...grpc.CallOption) (*ListStoredInfoTypesResponse, error)
+	// Deletes a stored infoType.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	DeleteStoredInfoType(ctx context.Context, in *DeleteStoredInfoTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+}
+
+type dlpServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewDlpServiceClient(cc *grpc.ClientConn) DlpServiceClient {
+	return &dlpServiceClient{cc}
+}
+
+func (c *dlpServiceClient) InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error) {
+	out := new(InspectContentResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/InspectContent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error) {
+	out := new(RedactImageResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/RedactImage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error) {
+	out := new(DeidentifyContentResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeidentifyContent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error) {
+	out := new(ReidentifyContentResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ReidentifyContent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error) {
+	out := new(ListInfoTypesResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListInfoTypes", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
+	out := new(InspectTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
+	out := new(InspectTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
+	out := new(InspectTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error) {
+	out := new(ListInspectTemplatesResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListInspectTemplates", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
+	out := new(DeidentifyTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
+	out := new(DeidentifyTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
+	out := new(DeidentifyTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error) {
+	out := new(ListDeidentifyTemplatesResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListDeidentifyTemplates", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateJobTrigger(ctx context.Context, in *CreateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
+	out := new(JobTrigger)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) UpdateJobTrigger(ctx context.Context, in *UpdateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
+	out := new(JobTrigger)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetJobTrigger(ctx context.Context, in *GetJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
+	out := new(JobTrigger)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListJobTriggers(ctx context.Context, in *ListJobTriggersRequest, opts ...grpc.CallOption) (*ListJobTriggersResponse, error) {
+	out := new(ListJobTriggersResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListJobTriggers", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ActivateJobTrigger(ctx context.Context, in *ActivateJobTriggerRequest, opts ...grpc.CallOption) (*DlpJob, error) {
+	out := new(DlpJob)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ActivateJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateDlpJob(ctx context.Context, in *CreateDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error) {
+	out := new(DlpJob)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error) {
+	out := new(ListDlpJobsResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListDlpJobs", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error) {
+	out := new(DlpJob)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CancelDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateStoredInfoType(ctx context.Context, in *CreateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error) {
+	out := new(StoredInfoType)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateStoredInfoType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) UpdateStoredInfoType(ctx context.Context, in *UpdateStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error) {
+	out := new(StoredInfoType)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateStoredInfoType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetStoredInfoType(ctx context.Context, in *GetStoredInfoTypeRequest, opts ...grpc.CallOption) (*StoredInfoType, error) {
+	out := new(StoredInfoType)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetStoredInfoType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListStoredInfoTypes(ctx context.Context, in *ListStoredInfoTypesRequest, opts ...grpc.CallOption) (*ListStoredInfoTypesResponse, error) {
+	out := new(ListStoredInfoTypesResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListStoredInfoTypes", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteStoredInfoType(ctx context.Context, in *DeleteStoredInfoTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteStoredInfoType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// DlpServiceServer is the server API for DlpService service.
+type DlpServiceServer interface {
+	// Finds potentially sensitive info in content.
+	// This method has limits on input size, processing time, and output size.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	//
+	// For how to guides, see https://cloud.google.com/dlp/docs/inspecting-images
+	// and https://cloud.google.com/dlp/docs/inspecting-text,
+	InspectContent(context.Context, *InspectContentRequest) (*InspectContentResponse, error)
+	// Redacts potentially sensitive info from an image.
+	// This method has limits on input size, processing time, and output size.
+	// See https://cloud.google.com/dlp/docs/redacting-sensitive-data-images to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	RedactImage(context.Context, *RedactImageRequest) (*RedactImageResponse, error)
+	// De-identifies potentially sensitive info from a ContentItem.
+	// This method has limits on input size and output size.
+	// See https://cloud.google.com/dlp/docs/deidentify-sensitive-data to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	DeidentifyContent(context.Context, *DeidentifyContentRequest) (*DeidentifyContentResponse, error)
+	// Re-identifies content that has been de-identified.
+	// See
+	// https://cloud.google.com/dlp/docs/pseudonymization#re-identification_in_free_text_code_example
+	// to learn more.
+	ReidentifyContent(context.Context, *ReidentifyContentRequest) (*ReidentifyContentResponse, error)
+	// Returns a list of the sensitive information types that the DLP API
+	// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
+	// learn more.
+	ListInfoTypes(context.Context, *ListInfoTypesRequest) (*ListInfoTypesResponse, error)
+	// Creates an InspectTemplate for re-using frequently used configuration
+	// for inspecting content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	CreateInspectTemplate(context.Context, *CreateInspectTemplateRequest) (*InspectTemplate, error)
+	// Updates the InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	UpdateInspectTemplate(context.Context, *UpdateInspectTemplateRequest) (*InspectTemplate, error)
+	// Gets an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	GetInspectTemplate(context.Context, *GetInspectTemplateRequest) (*InspectTemplate, error)
+	// Lists InspectTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	ListInspectTemplates(context.Context, *ListInspectTemplatesRequest) (*ListInspectTemplatesResponse, error)
+	// Deletes an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	DeleteInspectTemplate(context.Context, *DeleteInspectTemplateRequest) (*empty.Empty, error)
+	// Creates a DeidentifyTemplate for re-using frequently used configuration
+	// for de-identifying content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	CreateDeidentifyTemplate(context.Context, *CreateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
+	// Updates the DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	UpdateDeidentifyTemplate(context.Context, *UpdateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
+	// Gets a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	GetDeidentifyTemplate(context.Context, *GetDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
+	// Lists DeidentifyTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	ListDeidentifyTemplates(context.Context, *ListDeidentifyTemplatesRequest) (*ListDeidentifyTemplatesResponse, error)
+	// Deletes a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*empty.Empty, error)
+	// Creates a job trigger to run DLP actions such as scanning storage for
+	// sensitive information on a set schedule.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	CreateJobTrigger(context.Context, *CreateJobTriggerRequest) (*JobTrigger, error)
+	// Updates a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	UpdateJobTrigger(context.Context, *UpdateJobTriggerRequest) (*JobTrigger, error)
+	// Gets a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	GetJobTrigger(context.Context, *GetJobTriggerRequest) (*JobTrigger, error)
+	// Lists job triggers.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	ListJobTriggers(context.Context, *ListJobTriggersRequest) (*ListJobTriggersResponse, error)
+	// Deletes a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	DeleteJobTrigger(context.Context, *DeleteJobTriggerRequest) (*empty.Empty, error)
+	// Activate a job trigger. Causes the immediate execute of a trigger
+	// instead of waiting on the trigger event to occur.
+	ActivateJobTrigger(context.Context, *ActivateJobTriggerRequest) (*DlpJob, error)
+	// Creates a new job to inspect storage or calculate risk metrics.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in inspect jobs, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	CreateDlpJob(context.Context, *CreateDlpJobRequest) (*DlpJob, error)
+	// Lists DlpJobs that match the specified filter in the request.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	ListDlpJobs(context.Context, *ListDlpJobsRequest) (*ListDlpJobsResponse, error)
+	// Gets the latest state of a long-running DlpJob.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	GetDlpJob(context.Context, *GetDlpJobRequest) (*DlpJob, error)
+	// Deletes a long-running DlpJob. This method indicates that the client is
+	// no longer interested in the DlpJob result. The job will be cancelled if
+	// possible.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	DeleteDlpJob(context.Context, *DeleteDlpJobRequest) (*empty.Empty, error)
+	// Starts asynchronous cancellation on a long-running DlpJob. The server
+	// makes a best effort to cancel the DlpJob, but success is not
+	// guaranteed.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	CancelDlpJob(context.Context, *CancelDlpJobRequest) (*empty.Empty, error)
+	// Creates a pre-built stored infoType to be used for inspection.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	CreateStoredInfoType(context.Context, *CreateStoredInfoTypeRequest) (*StoredInfoType, error)
+	// Updates the stored infoType by creating a new version. The existing version
+	// will continue to be used until the new version is ready.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	UpdateStoredInfoType(context.Context, *UpdateStoredInfoTypeRequest) (*StoredInfoType, error)
+	// Gets a stored infoType.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	GetStoredInfoType(context.Context, *GetStoredInfoTypeRequest) (*StoredInfoType, error)
+	// Lists stored infoTypes.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	ListStoredInfoTypes(context.Context, *ListStoredInfoTypesRequest) (*ListStoredInfoTypesResponse, error)
+	// Deletes a stored infoType.
+	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
+	// learn more.
+	DeleteStoredInfoType(context.Context, *DeleteStoredInfoTypeRequest) (*empty.Empty, error)
+}
+
+func RegisterDlpServiceServer(s *grpc.Server, srv DlpServiceServer) {
+	s.RegisterService(&_DlpService_serviceDesc, srv)
+}
+
+func _DlpService_InspectContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(InspectContentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).InspectContent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/InspectContent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).InspectContent(ctx, req.(*InspectContentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_RedactImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RedactImageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).RedactImage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/RedactImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).RedactImage(ctx, req.(*RedactImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeidentifyContentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeidentifyContent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeidentifyContent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeidentifyContent(ctx, req.(*DeidentifyContentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ReidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ReidentifyContentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ReidentifyContent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ReidentifyContent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ReidentifyContent(ctx, req.(*ReidentifyContentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListInfoTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListInfoTypesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListInfoTypes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListInfoTypes",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListInfoTypes(ctx, req.(*ListInfoTypesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, req.(*CreateInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_UpdateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, req.(*UpdateInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetInspectTemplate(ctx, req.(*GetInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListInspectTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListInspectTemplatesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListInspectTemplates(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListInspectTemplates",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListInspectTemplates(ctx, req.(*ListInspectTemplatesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, req.(*DeleteInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, req.(*CreateDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_UpdateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, req.(*UpdateDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, req.(*GetDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListDeidentifyTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListDeidentifyTemplatesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListDeidentifyTemplates",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, req.(*ListDeidentifyTemplatesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, req.(*DeleteDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateJobTrigger(ctx, req.(*CreateJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_UpdateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).UpdateJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).UpdateJobTrigger(ctx, req.(*UpdateJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetJobTrigger(ctx, req.(*GetJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListJobTriggers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListJobTriggersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListJobTriggers(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListJobTriggers",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListJobTriggers(ctx, req.(*ListJobTriggersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteJobTrigger(ctx, req.(*DeleteJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ActivateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ActivateJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ActivateJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ActivateJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ActivateJobTrigger(ctx, req.(*ActivateJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateDlpJob(ctx, req.(*CreateDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListDlpJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListDlpJobsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListDlpJobs(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListDlpJobs",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListDlpJobs(ctx, req.(*ListDlpJobsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetDlpJob(ctx, req.(*GetDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteDlpJob(ctx, req.(*DeleteDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CancelDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CancelDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CancelDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CancelDlpJob(ctx, req.(*CancelDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateStoredInfoTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateStoredInfoType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateStoredInfoType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateStoredInfoType(ctx, req.(*CreateStoredInfoTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_UpdateStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateStoredInfoTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).UpdateStoredInfoType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateStoredInfoType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).UpdateStoredInfoType(ctx, req.(*UpdateStoredInfoTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetStoredInfoTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetStoredInfoType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetStoredInfoType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetStoredInfoType(ctx, req.(*GetStoredInfoTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListStoredInfoTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListStoredInfoTypesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListStoredInfoTypes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListStoredInfoTypes",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListStoredInfoTypes(ctx, req.(*ListStoredInfoTypesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteStoredInfoType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteStoredInfoTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteStoredInfoType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteStoredInfoType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteStoredInfoType(ctx, req.(*DeleteStoredInfoTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _DlpService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.privacy.dlp.v2.DlpService",
+	HandlerType: (*DlpServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "InspectContent",
+			Handler:    _DlpService_InspectContent_Handler,
+		},
+		{
+			MethodName: "RedactImage",
+			Handler:    _DlpService_RedactImage_Handler,
+		},
+		{
+			MethodName: "DeidentifyContent",
+			Handler:    _DlpService_DeidentifyContent_Handler,
+		},
+		{
+			MethodName: "ReidentifyContent",
+			Handler:    _DlpService_ReidentifyContent_Handler,
+		},
+		{
+			MethodName: "ListInfoTypes",
+			Handler:    _DlpService_ListInfoTypes_Handler,
+		},
+		{
+			MethodName: "CreateInspectTemplate",
+			Handler:    _DlpService_CreateInspectTemplate_Handler,
+		},
+		{
+			MethodName: "UpdateInspectTemplate",
+			Handler:    _DlpService_UpdateInspectTemplate_Handler,
+		},
+		{
+			MethodName: "GetInspectTemplate",
+			Handler:    _DlpService_GetInspectTemplate_Handler,
+		},
+		{
+			MethodName: "ListInspectTemplates",
+			Handler:    _DlpService_ListInspectTemplates_Handler,
+		},
+		{
+			MethodName: "DeleteInspectTemplate",
+			Handler:    _DlpService_DeleteInspectTemplate_Handler,
+		},
+		{
+			MethodName: "CreateDeidentifyTemplate",
+			Handler:    _DlpService_CreateDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "UpdateDeidentifyTemplate",
+			Handler:    _DlpService_UpdateDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "GetDeidentifyTemplate",
+			Handler:    _DlpService_GetDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "ListDeidentifyTemplates",
+			Handler:    _DlpService_ListDeidentifyTemplates_Handler,
+		},
+		{
+			MethodName: "DeleteDeidentifyTemplate",
+			Handler:    _DlpService_DeleteDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "CreateJobTrigger",
+			Handler:    _DlpService_CreateJobTrigger_Handler,
+		},
+		{
+			MethodName: "UpdateJobTrigger",
+			Handler:    _DlpService_UpdateJobTrigger_Handler,
+		},
+		{
+			MethodName: "GetJobTrigger",
+			Handler:    _DlpService_GetJobTrigger_Handler,
+		},
+		{
+			MethodName: "ListJobTriggers",
+			Handler:    _DlpService_ListJobTriggers_Handler,
+		},
+		{
+			MethodName: "DeleteJobTrigger",
+			Handler:    _DlpService_DeleteJobTrigger_Handler,
+		},
+		{
+			MethodName: "ActivateJobTrigger",
+			Handler:    _DlpService_ActivateJobTrigger_Handler,
+		},
+		{
+			MethodName: "CreateDlpJob",
+			Handler:    _DlpService_CreateDlpJob_Handler,
+		},
+		{
+			MethodName: "ListDlpJobs",
+			Handler:    _DlpService_ListDlpJobs_Handler,
+		},
+		{
+			MethodName: "GetDlpJob",
+			Handler:    _DlpService_GetDlpJob_Handler,
+		},
+		{
+			MethodName: "DeleteDlpJob",
+			Handler:    _DlpService_DeleteDlpJob_Handler,
+		},
+		{
+			MethodName: "CancelDlpJob",
+			Handler:    _DlpService_CancelDlpJob_Handler,
+		},
+		{
+			MethodName: "CreateStoredInfoType",
+			Handler:    _DlpService_CreateStoredInfoType_Handler,
+		},
+		{
+			MethodName: "UpdateStoredInfoType",
+			Handler:    _DlpService_UpdateStoredInfoType_Handler,
+		},
+		{
+			MethodName: "GetStoredInfoType",
+			Handler:    _DlpService_GetStoredInfoType_Handler,
+		},
+		{
+			MethodName: "ListStoredInfoTypes",
+			Handler:    _DlpService_ListStoredInfoTypes_Handler,
+		},
+		{
+			MethodName: "DeleteStoredInfoType",
+			Handler:    _DlpService_DeleteStoredInfoType_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/privacy/dlp/v2/dlp.proto",
+}
diff --git a/googleapis/privacy/dlp/v2/storage.pb.go b/googleapis/privacy/dlp/v2/storage.pb.go
index 978259e3a9..3d6fead340 100644
--- a/googleapis/privacy/dlp/v2/storage.pb.go
+++ b/googleapis/privacy/dlp/v2/storage.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/privacy/dlp/v2/storage.proto
 
-package dlp // import "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+package dlp
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Categorization of results based on how likely they are to represent a match,
 // based on the number of elements they contain which imply a match.
@@ -45,6 +48,7 @@ var Likelihood_name = map[int32]string{
 	4: "LIKELY",
 	5: "VERY_LIKELY",
 }
+
 var Likelihood_value = map[string]int32{
 	"LIKELIHOOD_UNSPECIFIED": 0,
 	"VERY_UNLIKELY":          1,
@@ -57,8 +61,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
+
 func (Likelihood) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{0}
+	return fileDescriptor_ab5e749073e1398d, []int{0}
 }
 
 // Definitions of file type groups to scan.
@@ -88,6 +93,7 @@ var FileType_name = map[int32]string{
 	2: "TEXT_FILE",
 	3: "IMAGE",
 }
+
 var FileType_value = map[string]int32{
 	"FILE_TYPE_UNSPECIFIED": 0,
 	"BINARY_FILE":           1,
@@ -98,8 +104,9 @@ var FileType_value = map[string]int32{
 func (x FileType) String() string {
 	return proto.EnumName(FileType_name, int32(x))
 }
+
 func (FileType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{1}
+	return fileDescriptor_ab5e749073e1398d, []int{1}
 }
 
 type CustomInfoType_ExclusionType int32
@@ -116,6 +123,7 @@ var CustomInfoType_ExclusionType_name = map[int32]string{
 	0: "EXCLUSION_TYPE_UNSPECIFIED",
 	1: "EXCLUSION_TYPE_EXCLUDE",
 }
+
 var CustomInfoType_ExclusionType_value = map[string]int32{
 	"EXCLUSION_TYPE_UNSPECIFIED": 0,
 	"EXCLUSION_TYPE_EXCLUDE":     1,
@@ -124,8 +132,9 @@ var CustomInfoType_ExclusionType_value = map[string]int32{
 func (x CustomInfoType_ExclusionType) String() string {
 	return proto.EnumName(CustomInfoType_ExclusionType_name, int32(x))
 }
+
 func (CustomInfoType_ExclusionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 0}
 }
 
 // How to sample bytes if not all bytes are scanned. Meaningful only when used
@@ -147,6 +156,7 @@ var CloudStorageOptions_SampleMethod_name = map[int32]string{
 	1: "TOP",
 	2: "RANDOM_START",
 }
+
 var CloudStorageOptions_SampleMethod_value = map[string]int32{
 	"SAMPLE_METHOD_UNSPECIFIED": 0,
 	"TOP":                       1,
@@ -156,8 +166,9 @@ var CloudStorageOptions_SampleMethod_value = map[string]int32{
 func (x CloudStorageOptions_SampleMethod) String() string {
 	return proto.EnumName(CloudStorageOptions_SampleMethod_name, int32(x))
 }
+
 func (CloudStorageOptions_SampleMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{8, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{8, 0}
 }
 
 // How to sample rows if not all rows are scanned. Meaningful only when used
@@ -178,6 +189,7 @@ var BigQueryOptions_SampleMethod_name = map[int32]string{
 	1: "TOP",
 	2: "RANDOM_START",
 }
+
 var BigQueryOptions_SampleMethod_value = map[string]int32{
 	"SAMPLE_METHOD_UNSPECIFIED": 0,
 	"TOP":                       1,
@@ -187,8 +199,9 @@ var BigQueryOptions_SampleMethod_value = map[string]int32{
 func (x BigQueryOptions_SampleMethod) String() string {
 	return proto.EnumName(BigQueryOptions_SampleMethod_name, int32(x))
 }
+
 func (BigQueryOptions_SampleMethod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{11, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{11, 0}
 }
 
 // Type of information detected by the API.
@@ -208,16 +221,17 @@ func (m *InfoType) Reset()         { *m = InfoType{} }
 func (m *InfoType) String() string { return proto.CompactTextString(m) }
 func (*InfoType) ProtoMessage()    {}
 func (*InfoType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{0}
+	return fileDescriptor_ab5e749073e1398d, []int{0}
 }
+
 func (m *InfoType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InfoType.Unmarshal(m, b)
 }
 func (m *InfoType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InfoType.Marshal(b, m, deterministic)
 }
-func (dst *InfoType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InfoType.Merge(dst, src)
+func (m *InfoType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoType.Merge(m, src)
 }
 func (m *InfoType) XXX_Size() int {
 	return xxx_messageInfo_InfoType.Size(m)
@@ -253,16 +267,17 @@ func (m *StoredType) Reset()         { *m = StoredType{} }
 func (m *StoredType) String() string { return proto.CompactTextString(m) }
 func (*StoredType) ProtoMessage()    {}
 func (*StoredType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{1}
+	return fileDescriptor_ab5e749073e1398d, []int{1}
 }
+
 func (m *StoredType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StoredType.Unmarshal(m, b)
 }
 func (m *StoredType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StoredType.Marshal(b, m, deterministic)
 }
-func (dst *StoredType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StoredType.Merge(dst, src)
+func (m *StoredType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StoredType.Merge(m, src)
 }
 func (m *StoredType) XXX_Size() int {
 	return xxx_messageInfo_StoredType.Size(m)
@@ -323,16 +338,17 @@ func (m *CustomInfoType) Reset()         { *m = CustomInfoType{} }
 func (m *CustomInfoType) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType) ProtoMessage()    {}
 func (*CustomInfoType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2}
+	return fileDescriptor_ab5e749073e1398d, []int{2}
 }
+
 func (m *CustomInfoType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType.Unmarshal(m, b)
 }
 func (m *CustomInfoType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType.Merge(dst, src)
+func (m *CustomInfoType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType.Merge(m, src)
 }
 func (m *CustomInfoType) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType.Size(m)
@@ -434,9 +450,9 @@ func (m *CustomInfoType) GetExclusionType() CustomInfoType_ExclusionType {
 	return CustomInfoType_EXCLUSION_TYPE_UNSPECIFIED
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_OneofMarshaler, _CustomInfoType_OneofUnmarshaler, _CustomInfoType_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomInfoType) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomInfoType_Dictionary_)(nil),
 		(*CustomInfoType_Regex_)(nil),
 		(*CustomInfoType_SurrogateType_)(nil),
@@ -444,108 +460,6 @@ func (*CustomInfoType) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _CustomInfoType_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_Dictionary_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Dictionary); err != nil {
-			return err
-		}
-	case *CustomInfoType_Regex_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Regex); err != nil {
-			return err
-		}
-	case *CustomInfoType_SurrogateType_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SurrogateType); err != nil {
-			return err
-		}
-	case *CustomInfoType_StoredType:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StoredType); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType)
-	switch tag {
-	case 2: // type.dictionary
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Dictionary)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_Dictionary_{msg}
-		return true, err
-	case 3: // type.regex
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Regex)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_Regex_{msg}
-		return true, err
-	case 4: // type.surrogate_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_SurrogateType)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_SurrogateType_{msg}
-		return true, err
-	case 5: // type.stored_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StoredType)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_StoredType{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_Dictionary_:
-		s := proto.Size(x.Dictionary)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomInfoType_Regex_:
-		s := proto.Size(x.Regex)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomInfoType_SurrogateType_:
-		s := proto.Size(x.SurrogateType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomInfoType_StoredType:
-		s := proto.Size(x.StoredType)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Custom information type based on a dictionary of words or phrases. This can
 // be used to match sensitive information specific to the data, such as a list
 // of employee IDs or job titles.
@@ -583,16 +497,17 @@ func (m *CustomInfoType_Dictionary) Reset()         { *m = CustomInfoType_Dictio
 func (m *CustomInfoType_Dictionary) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType_Dictionary) ProtoMessage()    {}
 func (*CustomInfoType_Dictionary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 0}
 }
+
 func (m *CustomInfoType_Dictionary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_Dictionary.Unmarshal(m, b)
 }
 func (m *CustomInfoType_Dictionary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_Dictionary.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_Dictionary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_Dictionary.Merge(dst, src)
+func (m *CustomInfoType_Dictionary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_Dictionary.Merge(m, src)
 }
 func (m *CustomInfoType_Dictionary) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_Dictionary.Size(m)
@@ -640,80 +555,14 @@ func (m *CustomInfoType_Dictionary) GetCloudStoragePath() *CloudStoragePath {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType_Dictionary) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_Dictionary_OneofMarshaler, _CustomInfoType_Dictionary_OneofUnmarshaler, _CustomInfoType_Dictionary_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomInfoType_Dictionary) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomInfoType_Dictionary_WordList_)(nil),
 		(*CustomInfoType_Dictionary_CloudStoragePath)(nil),
 	}
 }
 
-func _CustomInfoType_Dictionary_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType_Dictionary)
-	// source
-	switch x := m.Source.(type) {
-	case *CustomInfoType_Dictionary_WordList_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.WordList); err != nil {
-			return err
-		}
-	case *CustomInfoType_Dictionary_CloudStoragePath:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudStoragePath); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType_Dictionary.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_Dictionary_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType_Dictionary)
-	switch tag {
-	case 1: // source.word_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Dictionary_WordList)
-		err := b.DecodeMessage(msg)
-		m.Source = &CustomInfoType_Dictionary_WordList_{msg}
-		return true, err
-	case 3: // source.cloud_storage_path
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStoragePath)
-		err := b.DecodeMessage(msg)
-		m.Source = &CustomInfoType_Dictionary_CloudStoragePath{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_Dictionary_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType_Dictionary)
-	// source
-	switch x := m.Source.(type) {
-	case *CustomInfoType_Dictionary_WordList_:
-		s := proto.Size(x.WordList)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomInfoType_Dictionary_CloudStoragePath:
-		s := proto.Size(x.CloudStoragePath)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message defining a list of words or phrases to search for in the data.
 type CustomInfoType_Dictionary_WordList struct {
 	// Words or phrases defining the dictionary. The dictionary must contain
@@ -729,16 +578,17 @@ func (m *CustomInfoType_Dictionary_WordList) Reset()         { *m = CustomInfoTy
 func (m *CustomInfoType_Dictionary_WordList) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType_Dictionary_WordList) ProtoMessage()    {}
 func (*CustomInfoType_Dictionary_WordList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 0, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 0, 0}
 }
+
 func (m *CustomInfoType_Dictionary_WordList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_Dictionary_WordList.Unmarshal(m, b)
 }
 func (m *CustomInfoType_Dictionary_WordList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_Dictionary_WordList.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_Dictionary_WordList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_Dictionary_WordList.Merge(dst, src)
+func (m *CustomInfoType_Dictionary_WordList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_Dictionary_WordList.Merge(m, src)
 }
 func (m *CustomInfoType_Dictionary_WordList) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_Dictionary_WordList.Size(m)
@@ -774,16 +624,17 @@ func (m *CustomInfoType_Regex) Reset()         { *m = CustomInfoType_Regex{} }
 func (m *CustomInfoType_Regex) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType_Regex) ProtoMessage()    {}
 func (*CustomInfoType_Regex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 1}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 1}
 }
+
 func (m *CustomInfoType_Regex) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_Regex.Unmarshal(m, b)
 }
 func (m *CustomInfoType_Regex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_Regex.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_Regex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_Regex.Merge(dst, src)
+func (m *CustomInfoType_Regex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_Regex.Merge(m, src)
 }
 func (m *CustomInfoType_Regex) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_Regex.Size(m)
@@ -826,16 +677,17 @@ func (m *CustomInfoType_SurrogateType) Reset()         { *m = CustomInfoType_Sur
 func (m *CustomInfoType_SurrogateType) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType_SurrogateType) ProtoMessage()    {}
 func (*CustomInfoType_SurrogateType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 2}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 2}
 }
+
 func (m *CustomInfoType_SurrogateType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_SurrogateType.Unmarshal(m, b)
 }
 func (m *CustomInfoType_SurrogateType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_SurrogateType.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_SurrogateType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_SurrogateType.Merge(dst, src)
+func (m *CustomInfoType_SurrogateType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_SurrogateType.Merge(m, src)
 }
 func (m *CustomInfoType_SurrogateType) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_SurrogateType.Size(m)
@@ -862,16 +714,17 @@ func (m *CustomInfoType_DetectionRule) Reset()         { *m = CustomInfoType_Det
 func (m *CustomInfoType_DetectionRule) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType_DetectionRule) ProtoMessage()    {}
 func (*CustomInfoType_DetectionRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 3}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 3}
 }
+
 func (m *CustomInfoType_DetectionRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_DetectionRule.Unmarshal(m, b)
 }
 func (m *CustomInfoType_DetectionRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_DetectionRule.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_DetectionRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_DetectionRule.Merge(dst, src)
+func (m *CustomInfoType_DetectionRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule.Merge(m, src)
 }
 func (m *CustomInfoType_DetectionRule) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_DetectionRule.Size(m)
@@ -906,61 +759,13 @@ func (m *CustomInfoType_DetectionRule) GetHotwordRule() *CustomInfoType_Detectio
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType_DetectionRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_DetectionRule_OneofMarshaler, _CustomInfoType_DetectionRule_OneofUnmarshaler, _CustomInfoType_DetectionRule_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomInfoType_DetectionRule) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomInfoType_DetectionRule_HotwordRule_)(nil),
 	}
 }
 
-func _CustomInfoType_DetectionRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType_DetectionRule)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_DetectionRule_HotwordRule_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HotwordRule); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType_DetectionRule.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_DetectionRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType_DetectionRule)
-	switch tag {
-	case 1: // type.hotword_rule
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_DetectionRule_HotwordRule)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_DetectionRule_HotwordRule_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_DetectionRule_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType_DetectionRule)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_DetectionRule_HotwordRule_:
-		s := proto.Size(x.HotwordRule)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message for specifying a window around a finding to apply a detection
 // rule.
 type CustomInfoType_DetectionRule_Proximity struct {
@@ -979,16 +784,17 @@ func (m *CustomInfoType_DetectionRule_Proximity) Reset() {
 func (m *CustomInfoType_DetectionRule_Proximity) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType_DetectionRule_Proximity) ProtoMessage()    {}
 func (*CustomInfoType_DetectionRule_Proximity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 3, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 3, 0}
 }
+
 func (m *CustomInfoType_DetectionRule_Proximity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Unmarshal(m, b)
 }
 func (m *CustomInfoType_DetectionRule_Proximity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_DetectionRule_Proximity) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Merge(dst, src)
+func (m *CustomInfoType_DetectionRule_Proximity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Merge(m, src)
 }
 func (m *CustomInfoType_DetectionRule_Proximity) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Size(m)
@@ -1033,16 +839,17 @@ func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) String() string {
 }
 func (*CustomInfoType_DetectionRule_LikelihoodAdjustment) ProtoMessage() {}
 func (*CustomInfoType_DetectionRule_LikelihoodAdjustment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 3, 1}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 3, 1}
 }
+
 func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Unmarshal(m, b)
 }
 func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Merge(dst, src)
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Merge(m, src)
 }
 func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Size(m)
@@ -1092,70 +899,14 @@ func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) GetRelativeLikelihoo
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofMarshaler, _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofUnmarshaler, _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood)(nil),
 		(*CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood)(nil),
 	}
 }
 
-func _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType_DetectionRule_LikelihoodAdjustment)
-	// adjustment
-	switch x := m.Adjustment.(type) {
-	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.FixedLikelihood))
-	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RelativeLikelihood))
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType_DetectionRule_LikelihoodAdjustment.Adjustment has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType_DetectionRule_LikelihoodAdjustment)
-	switch tag {
-	case 1: // adjustment.fixed_likelihood
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Adjustment = &CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood{Likelihood(x)}
-		return true, err
-	case 2: // adjustment.relative_likelihood
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Adjustment = &CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType_DetectionRule_LikelihoodAdjustment)
-	// adjustment
-	switch x := m.Adjustment.(type) {
-	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.FixedLikelihood))
-	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.RelativeLikelihood))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The rule that adjusts the likelihood of findings within a certain
 // proximity of hotwords.
 type CustomInfoType_DetectionRule_HotwordRule struct {
@@ -1183,16 +934,17 @@ func (m *CustomInfoType_DetectionRule_HotwordRule) Reset() {
 func (m *CustomInfoType_DetectionRule_HotwordRule) String() string { return proto.CompactTextString(m) }
 func (*CustomInfoType_DetectionRule_HotwordRule) ProtoMessage()    {}
 func (*CustomInfoType_DetectionRule_HotwordRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{2, 3, 2}
+	return fileDescriptor_ab5e749073e1398d, []int{2, 3, 2}
 }
+
 func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Unmarshal(m, b)
 }
 func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Marshal(b, m, deterministic)
 }
-func (dst *CustomInfoType_DetectionRule_HotwordRule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Merge(dst, src)
+func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Merge(m, src)
 }
 func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_Size() int {
 	return xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Size(m)
@@ -1237,16 +989,17 @@ func (m *FieldId) Reset()         { *m = FieldId{} }
 func (m *FieldId) String() string { return proto.CompactTextString(m) }
 func (*FieldId) ProtoMessage()    {}
 func (*FieldId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{3}
+	return fileDescriptor_ab5e749073e1398d, []int{3}
 }
+
 func (m *FieldId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldId.Unmarshal(m, b)
 }
 func (m *FieldId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldId.Marshal(b, m, deterministic)
 }
-func (dst *FieldId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldId.Merge(dst, src)
+func (m *FieldId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldId.Merge(m, src)
 }
 func (m *FieldId) XXX_Size() int {
 	return xxx_messageInfo_FieldId.Size(m)
@@ -1284,16 +1037,17 @@ func (m *PartitionId) Reset()         { *m = PartitionId{} }
 func (m *PartitionId) String() string { return proto.CompactTextString(m) }
 func (*PartitionId) ProtoMessage()    {}
 func (*PartitionId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{4}
+	return fileDescriptor_ab5e749073e1398d, []int{4}
 }
+
 func (m *PartitionId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartitionId.Unmarshal(m, b)
 }
 func (m *PartitionId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartitionId.Marshal(b, m, deterministic)
 }
-func (dst *PartitionId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartitionId.Merge(dst, src)
+func (m *PartitionId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionId.Merge(m, src)
 }
 func (m *PartitionId) XXX_Size() int {
 	return xxx_messageInfo_PartitionId.Size(m)
@@ -1331,16 +1085,17 @@ func (m *KindExpression) Reset()         { *m = KindExpression{} }
 func (m *KindExpression) String() string { return proto.CompactTextString(m) }
 func (*KindExpression) ProtoMessage()    {}
 func (*KindExpression) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{5}
+	return fileDescriptor_ab5e749073e1398d, []int{5}
 }
+
 func (m *KindExpression) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KindExpression.Unmarshal(m, b)
 }
 func (m *KindExpression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KindExpression.Marshal(b, m, deterministic)
 }
-func (dst *KindExpression) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KindExpression.Merge(dst, src)
+func (m *KindExpression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KindExpression.Merge(m, src)
 }
 func (m *KindExpression) XXX_Size() int {
 	return xxx_messageInfo_KindExpression.Size(m)
@@ -1374,16 +1129,17 @@ func (m *DatastoreOptions) Reset()         { *m = DatastoreOptions{} }
 func (m *DatastoreOptions) String() string { return proto.CompactTextString(m) }
 func (*DatastoreOptions) ProtoMessage()    {}
 func (*DatastoreOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{6}
+	return fileDescriptor_ab5e749073e1398d, []int{6}
 }
+
 func (m *DatastoreOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatastoreOptions.Unmarshal(m, b)
 }
 func (m *DatastoreOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatastoreOptions.Marshal(b, m, deterministic)
 }
-func (dst *DatastoreOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatastoreOptions.Merge(dst, src)
+func (m *DatastoreOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatastoreOptions.Merge(m, src)
 }
 func (m *DatastoreOptions) XXX_Size() int {
 	return xxx_messageInfo_DatastoreOptions.Size(m)
@@ -1470,16 +1226,17 @@ func (m *CloudStorageRegexFileSet) Reset()         { *m = CloudStorageRegexFileS
 func (m *CloudStorageRegexFileSet) String() string { return proto.CompactTextString(m) }
 func (*CloudStorageRegexFileSet) ProtoMessage()    {}
 func (*CloudStorageRegexFileSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{7}
+	return fileDescriptor_ab5e749073e1398d, []int{7}
 }
+
 func (m *CloudStorageRegexFileSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudStorageRegexFileSet.Unmarshal(m, b)
 }
 func (m *CloudStorageRegexFileSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudStorageRegexFileSet.Marshal(b, m, deterministic)
 }
-func (dst *CloudStorageRegexFileSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudStorageRegexFileSet.Merge(dst, src)
+func (m *CloudStorageRegexFileSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStorageRegexFileSet.Merge(m, src)
 }
 func (m *CloudStorageRegexFileSet) XXX_Size() int {
 	return xxx_messageInfo_CloudStorageRegexFileSet.Size(m)
@@ -1544,16 +1301,17 @@ func (m *CloudStorageOptions) Reset()         { *m = CloudStorageOptions{} }
 func (m *CloudStorageOptions) String() string { return proto.CompactTextString(m) }
 func (*CloudStorageOptions) ProtoMessage()    {}
 func (*CloudStorageOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{8}
+	return fileDescriptor_ab5e749073e1398d, []int{8}
 }
+
 func (m *CloudStorageOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudStorageOptions.Unmarshal(m, b)
 }
 func (m *CloudStorageOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudStorageOptions.Marshal(b, m, deterministic)
 }
-func (dst *CloudStorageOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudStorageOptions.Merge(dst, src)
+func (m *CloudStorageOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStorageOptions.Merge(m, src)
 }
 func (m *CloudStorageOptions) XXX_Size() int {
 	return xxx_messageInfo_CloudStorageOptions.Size(m)
@@ -1631,16 +1389,17 @@ func (m *CloudStorageOptions_FileSet) Reset()         { *m = CloudStorageOptions
 func (m *CloudStorageOptions_FileSet) String() string { return proto.CompactTextString(m) }
 func (*CloudStorageOptions_FileSet) ProtoMessage()    {}
 func (*CloudStorageOptions_FileSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{8, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{8, 0}
 }
+
 func (m *CloudStorageOptions_FileSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudStorageOptions_FileSet.Unmarshal(m, b)
 }
 func (m *CloudStorageOptions_FileSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudStorageOptions_FileSet.Marshal(b, m, deterministic)
 }
-func (dst *CloudStorageOptions_FileSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudStorageOptions_FileSet.Merge(dst, src)
+func (m *CloudStorageOptions_FileSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStorageOptions_FileSet.Merge(m, src)
 }
 func (m *CloudStorageOptions_FileSet) XXX_Size() int {
 	return xxx_messageInfo_CloudStorageOptions_FileSet.Size(m)
@@ -1679,16 +1438,17 @@ func (m *CloudStorageFileSet) Reset()         { *m = CloudStorageFileSet{} }
 func (m *CloudStorageFileSet) String() string { return proto.CompactTextString(m) }
 func (*CloudStorageFileSet) ProtoMessage()    {}
 func (*CloudStorageFileSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{9}
+	return fileDescriptor_ab5e749073e1398d, []int{9}
 }
+
 func (m *CloudStorageFileSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudStorageFileSet.Unmarshal(m, b)
 }
 func (m *CloudStorageFileSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudStorageFileSet.Marshal(b, m, deterministic)
 }
-func (dst *CloudStorageFileSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudStorageFileSet.Merge(dst, src)
+func (m *CloudStorageFileSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStorageFileSet.Merge(m, src)
 }
 func (m *CloudStorageFileSet) XXX_Size() int {
 	return xxx_messageInfo_CloudStorageFileSet.Size(m)
@@ -1720,16 +1480,17 @@ func (m *CloudStoragePath) Reset()         { *m = CloudStoragePath{} }
 func (m *CloudStoragePath) String() string { return proto.CompactTextString(m) }
 func (*CloudStoragePath) ProtoMessage()    {}
 func (*CloudStoragePath) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{10}
+	return fileDescriptor_ab5e749073e1398d, []int{10}
 }
+
 func (m *CloudStoragePath) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CloudStoragePath.Unmarshal(m, b)
 }
 func (m *CloudStoragePath) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CloudStoragePath.Marshal(b, m, deterministic)
 }
-func (dst *CloudStoragePath) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CloudStoragePath.Merge(dst, src)
+func (m *CloudStoragePath) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStoragePath.Merge(m, src)
 }
 func (m *CloudStoragePath) XXX_Size() int {
 	return xxx_messageInfo_CloudStoragePath.Size(m)
@@ -1778,16 +1539,17 @@ func (m *BigQueryOptions) Reset()         { *m = BigQueryOptions{} }
 func (m *BigQueryOptions) String() string { return proto.CompactTextString(m) }
 func (*BigQueryOptions) ProtoMessage()    {}
 func (*BigQueryOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{11}
+	return fileDescriptor_ab5e749073e1398d, []int{11}
 }
+
 func (m *BigQueryOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryOptions.Unmarshal(m, b)
 }
 func (m *BigQueryOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryOptions.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryOptions.Merge(dst, src)
+func (m *BigQueryOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryOptions.Merge(m, src)
 }
 func (m *BigQueryOptions) XXX_Size() int {
 	return xxx_messageInfo_BigQueryOptions.Size(m)
@@ -1857,16 +1619,17 @@ func (m *StorageConfig) Reset()         { *m = StorageConfig{} }
 func (m *StorageConfig) String() string { return proto.CompactTextString(m) }
 func (*StorageConfig) ProtoMessage()    {}
 func (*StorageConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{12}
+	return fileDescriptor_ab5e749073e1398d, []int{12}
 }
+
 func (m *StorageConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StorageConfig.Unmarshal(m, b)
 }
 func (m *StorageConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StorageConfig.Marshal(b, m, deterministic)
 }
-func (dst *StorageConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StorageConfig.Merge(dst, src)
+func (m *StorageConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageConfig.Merge(m, src)
 }
 func (m *StorageConfig) XXX_Size() int {
 	return xxx_messageInfo_StorageConfig.Size(m)
@@ -1934,99 +1697,15 @@ func (m *StorageConfig) GetTimespanConfig() *StorageConfig_TimespanConfig {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StorageConfig_OneofMarshaler, _StorageConfig_OneofUnmarshaler, _StorageConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*StorageConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*StorageConfig_DatastoreOptions)(nil),
 		(*StorageConfig_CloudStorageOptions)(nil),
 		(*StorageConfig_BigQueryOptions)(nil),
 	}
 }
 
-func _StorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StorageConfig_DatastoreOptions:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatastoreOptions); err != nil {
-			return err
-		}
-	case *StorageConfig_CloudStorageOptions:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudStorageOptions); err != nil {
-			return err
-		}
-	case *StorageConfig_BigQueryOptions:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigQueryOptions); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StorageConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StorageConfig)
-	switch tag {
-	case 2: // type.datastore_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatastoreOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_DatastoreOptions{msg}
-		return true, err
-	case 3: // type.cloud_storage_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStorageOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_CloudStorageOptions{msg}
-		return true, err
-	case 4: // type.big_query_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_BigQueryOptions{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StorageConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StorageConfig_DatastoreOptions:
-		s := proto.Size(x.DatastoreOptions)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StorageConfig_CloudStorageOptions:
-		s := proto.Size(x.CloudStorageOptions)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StorageConfig_BigQueryOptions:
-		s := proto.Size(x.BigQueryOptions)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Configuration of the timespan of the items to include in scanning.
 // Currently only supported when inspecting Google Cloud Storage and BigQuery.
 type StorageConfig_TimespanConfig struct {
@@ -2059,16 +1738,17 @@ func (m *StorageConfig_TimespanConfig) Reset()         { *m = StorageConfig_Time
 func (m *StorageConfig_TimespanConfig) String() string { return proto.CompactTextString(m) }
 func (*StorageConfig_TimespanConfig) ProtoMessage()    {}
 func (*StorageConfig_TimespanConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{12, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{12, 0}
 }
+
 func (m *StorageConfig_TimespanConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StorageConfig_TimespanConfig.Unmarshal(m, b)
 }
 func (m *StorageConfig_TimespanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StorageConfig_TimespanConfig.Marshal(b, m, deterministic)
 }
-func (dst *StorageConfig_TimespanConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StorageConfig_TimespanConfig.Merge(dst, src)
+func (m *StorageConfig_TimespanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageConfig_TimespanConfig.Merge(m, src)
 }
 func (m *StorageConfig_TimespanConfig) XXX_Size() int {
 	return xxx_messageInfo_StorageConfig_TimespanConfig.Size(m)
@@ -2123,16 +1803,17 @@ func (m *BigQueryKey) Reset()         { *m = BigQueryKey{} }
 func (m *BigQueryKey) String() string { return proto.CompactTextString(m) }
 func (*BigQueryKey) ProtoMessage()    {}
 func (*BigQueryKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{13}
+	return fileDescriptor_ab5e749073e1398d, []int{13}
 }
+
 func (m *BigQueryKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryKey.Unmarshal(m, b)
 }
 func (m *BigQueryKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryKey.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryKey.Merge(dst, src)
+func (m *BigQueryKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryKey.Merge(m, src)
 }
 func (m *BigQueryKey) XXX_Size() int {
 	return xxx_messageInfo_BigQueryKey.Size(m)
@@ -2170,16 +1851,17 @@ func (m *DatastoreKey) Reset()         { *m = DatastoreKey{} }
 func (m *DatastoreKey) String() string { return proto.CompactTextString(m) }
 func (*DatastoreKey) ProtoMessage()    {}
 func (*DatastoreKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{14}
+	return fileDescriptor_ab5e749073e1398d, []int{14}
 }
+
 func (m *DatastoreKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DatastoreKey.Unmarshal(m, b)
 }
 func (m *DatastoreKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DatastoreKey.Marshal(b, m, deterministic)
 }
-func (dst *DatastoreKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DatastoreKey.Merge(dst, src)
+func (m *DatastoreKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatastoreKey.Merge(m, src)
 }
 func (m *DatastoreKey) XXX_Size() int {
 	return xxx_messageInfo_DatastoreKey.Size(m)
@@ -2225,16 +1907,17 @@ func (m *Key) Reset()         { *m = Key{} }
 func (m *Key) String() string { return proto.CompactTextString(m) }
 func (*Key) ProtoMessage()    {}
 func (*Key) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{15}
+	return fileDescriptor_ab5e749073e1398d, []int{15}
 }
+
 func (m *Key) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Key.Unmarshal(m, b)
 }
 func (m *Key) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Key.Marshal(b, m, deterministic)
 }
-func (dst *Key) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Key.Merge(dst, src)
+func (m *Key) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key.Merge(m, src)
 }
 func (m *Key) XXX_Size() int {
 	return xxx_messageInfo_Key.Size(m)
@@ -2284,16 +1967,17 @@ func (m *Key_PathElement) Reset()         { *m = Key_PathElement{} }
 func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }
 func (*Key_PathElement) ProtoMessage()    {}
 func (*Key_PathElement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{15, 0}
+	return fileDescriptor_ab5e749073e1398d, []int{15, 0}
 }
+
 func (m *Key_PathElement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Key_PathElement.Unmarshal(m, b)
 }
 func (m *Key_PathElement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Key_PathElement.Marshal(b, m, deterministic)
 }
-func (dst *Key_PathElement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Key_PathElement.Merge(dst, src)
+func (m *Key_PathElement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key_PathElement.Merge(m, src)
 }
 func (m *Key_PathElement) XXX_Size() int {
 	return xxx_messageInfo_Key_PathElement.Size(m)
@@ -2348,71 +2032,14 @@ func (m *Key_PathElement) GetName() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Key_PathElement) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Key_PathElement_Id)(nil),
 		(*Key_PathElement_Name)(nil),
 	}
 }
 
-func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case nil:
-	default:
-		return fmt.Errorf("Key_PathElement.IdType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Key_PathElement)
-	switch tag {
-	case 2: // id_type.id
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.IdType = &Key_PathElement_Id{int64(x)}
-		return true, err
-	case 3: // id_type.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.IdType = &Key_PathElement_Name{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message for a unique key indicating a record that contains a finding.
 type RecordKey struct {
 	// Types that are valid to be assigned to Type:
@@ -2431,16 +2058,17 @@ func (m *RecordKey) Reset()         { *m = RecordKey{} }
 func (m *RecordKey) String() string { return proto.CompactTextString(m) }
 func (*RecordKey) ProtoMessage()    {}
 func (*RecordKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{16}
+	return fileDescriptor_ab5e749073e1398d, []int{16}
 }
+
 func (m *RecordKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RecordKey.Unmarshal(m, b)
 }
 func (m *RecordKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RecordKey.Marshal(b, m, deterministic)
 }
-func (dst *RecordKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RecordKey.Merge(dst, src)
+func (m *RecordKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordKey.Merge(m, src)
 }
 func (m *RecordKey) XXX_Size() int {
 	return xxx_messageInfo_RecordKey.Size(m)
@@ -2495,80 +2123,14 @@ func (m *RecordKey) GetIdValues() []string {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecordKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecordKey_OneofMarshaler, _RecordKey_OneofUnmarshaler, _RecordKey_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*RecordKey) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*RecordKey_DatastoreKey)(nil),
 		(*RecordKey_BigQueryKey)(nil),
 	}
 }
 
-func _RecordKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecordKey)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordKey_DatastoreKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatastoreKey); err != nil {
-			return err
-		}
-	case *RecordKey_BigQueryKey:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigQueryKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RecordKey.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecordKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecordKey)
-	switch tag {
-	case 2: // type.datastore_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatastoreKey)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordKey_DatastoreKey{msg}
-		return true, err
-	case 3: // type.big_query_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryKey)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordKey_BigQueryKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecordKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecordKey)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordKey_DatastoreKey:
-		s := proto.Size(x.DatastoreKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RecordKey_BigQueryKey:
-		s := proto.Size(x.BigQueryKey)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message defining the location of a BigQuery table. A table is uniquely
 // identified  by its project_id, dataset_id, and table_name. Within a query
 // a table is often referenced with a string in the format of:
@@ -2591,16 +2153,17 @@ func (m *BigQueryTable) Reset()         { *m = BigQueryTable{} }
 func (m *BigQueryTable) String() string { return proto.CompactTextString(m) }
 func (*BigQueryTable) ProtoMessage()    {}
 func (*BigQueryTable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{17}
+	return fileDescriptor_ab5e749073e1398d, []int{17}
 }
+
 func (m *BigQueryTable) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryTable.Unmarshal(m, b)
 }
 func (m *BigQueryTable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryTable.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryTable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryTable.Merge(dst, src)
+func (m *BigQueryTable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryTable.Merge(m, src)
 }
 func (m *BigQueryTable) XXX_Size() int {
 	return xxx_messageInfo_BigQueryTable.Size(m)
@@ -2647,16 +2210,17 @@ func (m *BigQueryField) Reset()         { *m = BigQueryField{} }
 func (m *BigQueryField) String() string { return proto.CompactTextString(m) }
 func (*BigQueryField) ProtoMessage()    {}
 func (*BigQueryField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{18}
+	return fileDescriptor_ab5e749073e1398d, []int{18}
 }
+
 func (m *BigQueryField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigQueryField.Unmarshal(m, b)
 }
 func (m *BigQueryField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BigQueryField.Marshal(b, m, deterministic)
 }
-func (dst *BigQueryField) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BigQueryField.Merge(dst, src)
+func (m *BigQueryField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryField.Merge(m, src)
 }
 func (m *BigQueryField) XXX_Size() int {
 	return xxx_messageInfo_BigQueryField.Size(m)
@@ -2698,16 +2262,17 @@ func (m *EntityId) Reset()         { *m = EntityId{} }
 func (m *EntityId) String() string { return proto.CompactTextString(m) }
 func (*EntityId) ProtoMessage()    {}
 func (*EntityId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_storage_0642a70333f19630, []int{19}
+	return fileDescriptor_ab5e749073e1398d, []int{19}
 }
+
 func (m *EntityId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntityId.Unmarshal(m, b)
 }
 func (m *EntityId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EntityId.Marshal(b, m, deterministic)
 }
-func (dst *EntityId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EntityId.Merge(dst, src)
+func (m *EntityId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityId.Merge(m, src)
 }
 func (m *EntityId) XXX_Size() int {
 	return xxx_messageInfo_EntityId.Size(m)
@@ -2726,6 +2291,11 @@ func (m *EntityId) GetField() *FieldId {
 }
 
 func init() {
+	proto.RegisterEnum("google.privacy.dlp.v2.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.FileType", FileType_name, FileType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.CustomInfoType_ExclusionType", CustomInfoType_ExclusionType_name, CustomInfoType_ExclusionType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.CloudStorageOptions_SampleMethod", CloudStorageOptions_SampleMethod_name, CloudStorageOptions_SampleMethod_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.BigQueryOptions_SampleMethod", BigQueryOptions_SampleMethod_name, BigQueryOptions_SampleMethod_value)
 	proto.RegisterType((*InfoType)(nil), "google.privacy.dlp.v2.InfoType")
 	proto.RegisterType((*StoredType)(nil), "google.privacy.dlp.v2.StoredType")
 	proto.RegisterType((*CustomInfoType)(nil), "google.privacy.dlp.v2.CustomInfoType")
@@ -2757,18 +2327,13 @@ func init() {
 	proto.RegisterType((*BigQueryTable)(nil), "google.privacy.dlp.v2.BigQueryTable")
 	proto.RegisterType((*BigQueryField)(nil), "google.privacy.dlp.v2.BigQueryField")
 	proto.RegisterType((*EntityId)(nil), "google.privacy.dlp.v2.EntityId")
-	proto.RegisterEnum("google.privacy.dlp.v2.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.FileType", FileType_name, FileType_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.CustomInfoType_ExclusionType", CustomInfoType_ExclusionType_name, CustomInfoType_ExclusionType_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.CloudStorageOptions_SampleMethod", CloudStorageOptions_SampleMethod_name, CloudStorageOptions_SampleMethod_value)
-	proto.RegisterEnum("google.privacy.dlp.v2.BigQueryOptions_SampleMethod", BigQueryOptions_SampleMethod_name, BigQueryOptions_SampleMethod_value)
 }
 
 func init() {
-	proto.RegisterFile("google/privacy/dlp/v2/storage.proto", fileDescriptor_storage_0642a70333f19630)
+	proto.RegisterFile("google/privacy/dlp/v2/storage.proto", fileDescriptor_ab5e749073e1398d)
 }
 
-var fileDescriptor_storage_0642a70333f19630 = []byte{
+var fileDescriptor_ab5e749073e1398d = []byte{
 	// 2075 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdd, 0x72, 0x1b, 0x49,
 	0xf5, 0xd7, 0x48, 0x96, 0x2d, 0x1d, 0x7d, 0x58, 0xee, 0x24, 0x5b, 0xb2, 0xfe, 0x9b, 0xc4, 0x2b,
diff --git a/googleapis/pubsub/v1/pubsub.pb.go b/googleapis/pubsub/v1/pubsub.pb.go
index ff8f3a30ca..4327f86c2d 100644
--- a/googleapis/pubsub/v1/pubsub.pb.go
+++ b/googleapis/pubsub/v1/pubsub.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/pubsub/v1/pubsub.proto
 
-package pubsub // import "google.golang.org/genproto/googleapis/pubsub/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package pubsub
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type MessageStoragePolicy struct {
 	// The list of GCP region IDs where messages that are published to the topic
@@ -45,16 +45,17 @@ func (m *MessageStoragePolicy) Reset()         { *m = MessageStoragePolicy{} }
 func (m *MessageStoragePolicy) String() string { return proto.CompactTextString(m) }
 func (*MessageStoragePolicy) ProtoMessage()    {}
 func (*MessageStoragePolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{0}
+	return fileDescriptor_f602d910f9a348fe, []int{0}
 }
+
 func (m *MessageStoragePolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageStoragePolicy.Unmarshal(m, b)
 }
 func (m *MessageStoragePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MessageStoragePolicy.Marshal(b, m, deterministic)
 }
-func (dst *MessageStoragePolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MessageStoragePolicy.Merge(dst, src)
+func (m *MessageStoragePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageStoragePolicy.Merge(m, src)
 }
 func (m *MessageStoragePolicy) XXX_Size() int {
 	return xxx_messageInfo_MessageStoragePolicy.Size(m)
@@ -108,16 +109,17 @@ func (m *Topic) Reset()         { *m = Topic{} }
 func (m *Topic) String() string { return proto.CompactTextString(m) }
 func (*Topic) ProtoMessage()    {}
 func (*Topic) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{1}
+	return fileDescriptor_f602d910f9a348fe, []int{1}
 }
+
 func (m *Topic) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Topic.Unmarshal(m, b)
 }
 func (m *Topic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Topic.Marshal(b, m, deterministic)
 }
-func (dst *Topic) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Topic.Merge(dst, src)
+func (m *Topic) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Topic.Merge(m, src)
 }
 func (m *Topic) XXX_Size() int {
 	return xxx_messageInfo_Topic.Size(m)
@@ -196,16 +198,17 @@ func (m *PubsubMessage) Reset()         { *m = PubsubMessage{} }
 func (m *PubsubMessage) String() string { return proto.CompactTextString(m) }
 func (*PubsubMessage) ProtoMessage()    {}
 func (*PubsubMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{2}
+	return fileDescriptor_f602d910f9a348fe, []int{2}
 }
+
 func (m *PubsubMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PubsubMessage.Unmarshal(m, b)
 }
 func (m *PubsubMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PubsubMessage.Marshal(b, m, deterministic)
 }
-func (dst *PubsubMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PubsubMessage.Merge(dst, src)
+func (m *PubsubMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PubsubMessage.Merge(m, src)
 }
 func (m *PubsubMessage) XXX_Size() int {
 	return xxx_messageInfo_PubsubMessage.Size(m)
@@ -265,16 +268,17 @@ func (m *GetTopicRequest) Reset()         { *m = GetTopicRequest{} }
 func (m *GetTopicRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTopicRequest) ProtoMessage()    {}
 func (*GetTopicRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{3}
+	return fileDescriptor_f602d910f9a348fe, []int{3}
 }
+
 func (m *GetTopicRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTopicRequest.Unmarshal(m, b)
 }
 func (m *GetTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTopicRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTopicRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTopicRequest.Merge(dst, src)
+func (m *GetTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopicRequest.Merge(m, src)
 }
 func (m *GetTopicRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTopicRequest.Size(m)
@@ -311,16 +315,17 @@ func (m *UpdateTopicRequest) Reset()         { *m = UpdateTopicRequest{} }
 func (m *UpdateTopicRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateTopicRequest) ProtoMessage()    {}
 func (*UpdateTopicRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{4}
+	return fileDescriptor_f602d910f9a348fe, []int{4}
 }
+
 func (m *UpdateTopicRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateTopicRequest.Unmarshal(m, b)
 }
 func (m *UpdateTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateTopicRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateTopicRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateTopicRequest.Merge(dst, src)
+func (m *UpdateTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTopicRequest.Merge(m, src)
 }
 func (m *UpdateTopicRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateTopicRequest.Size(m)
@@ -361,16 +366,17 @@ func (m *PublishRequest) Reset()         { *m = PublishRequest{} }
 func (m *PublishRequest) String() string { return proto.CompactTextString(m) }
 func (*PublishRequest) ProtoMessage()    {}
 func (*PublishRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{5}
+	return fileDescriptor_f602d910f9a348fe, []int{5}
 }
+
 func (m *PublishRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublishRequest.Unmarshal(m, b)
 }
 func (m *PublishRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublishRequest.Marshal(b, m, deterministic)
 }
-func (dst *PublishRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublishRequest.Merge(dst, src)
+func (m *PublishRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishRequest.Merge(m, src)
 }
 func (m *PublishRequest) XXX_Size() int {
 	return xxx_messageInfo_PublishRequest.Size(m)
@@ -410,16 +416,17 @@ func (m *PublishResponse) Reset()         { *m = PublishResponse{} }
 func (m *PublishResponse) String() string { return proto.CompactTextString(m) }
 func (*PublishResponse) ProtoMessage()    {}
 func (*PublishResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{6}
+	return fileDescriptor_f602d910f9a348fe, []int{6}
 }
+
 func (m *PublishResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublishResponse.Unmarshal(m, b)
 }
 func (m *PublishResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublishResponse.Marshal(b, m, deterministic)
 }
-func (dst *PublishResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublishResponse.Merge(dst, src)
+func (m *PublishResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishResponse.Merge(m, src)
 }
 func (m *PublishResponse) XXX_Size() int {
 	return xxx_messageInfo_PublishResponse.Size(m)
@@ -457,16 +464,17 @@ func (m *ListTopicsRequest) Reset()         { *m = ListTopicsRequest{} }
 func (m *ListTopicsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTopicsRequest) ProtoMessage()    {}
 func (*ListTopicsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{7}
+	return fileDescriptor_f602d910f9a348fe, []int{7}
 }
+
 func (m *ListTopicsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicsRequest.Unmarshal(m, b)
 }
 func (m *ListTopicsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicsRequest.Merge(dst, src)
+func (m *ListTopicsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsRequest.Merge(m, src)
 }
 func (m *ListTopicsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTopicsRequest.Size(m)
@@ -514,16 +522,17 @@ func (m *ListTopicsResponse) Reset()         { *m = ListTopicsResponse{} }
 func (m *ListTopicsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTopicsResponse) ProtoMessage()    {}
 func (*ListTopicsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{8}
+	return fileDescriptor_f602d910f9a348fe, []int{8}
 }
+
 func (m *ListTopicsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicsResponse.Unmarshal(m, b)
 }
 func (m *ListTopicsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicsResponse.Merge(dst, src)
+func (m *ListTopicsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsResponse.Merge(m, src)
 }
 func (m *ListTopicsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTopicsResponse.Size(m)
@@ -568,16 +577,17 @@ func (m *ListTopicSubscriptionsRequest) Reset()         { *m = ListTopicSubscrip
 func (m *ListTopicSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTopicSubscriptionsRequest) ProtoMessage()    {}
 func (*ListTopicSubscriptionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{9}
+	return fileDescriptor_f602d910f9a348fe, []int{9}
 }
+
 func (m *ListTopicSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicSubscriptionsRequest.Unmarshal(m, b)
 }
 func (m *ListTopicSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicSubscriptionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicSubscriptionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicSubscriptionsRequest.Merge(dst, src)
+func (m *ListTopicSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsRequest.Merge(m, src)
 }
 func (m *ListTopicSubscriptionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTopicSubscriptionsRequest.Size(m)
@@ -626,16 +636,17 @@ func (m *ListTopicSubscriptionsResponse) Reset()         { *m = ListTopicSubscri
 func (m *ListTopicSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTopicSubscriptionsResponse) ProtoMessage()    {}
 func (*ListTopicSubscriptionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{10}
+	return fileDescriptor_f602d910f9a348fe, []int{10}
 }
+
 func (m *ListTopicSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicSubscriptionsResponse.Unmarshal(m, b)
 }
 func (m *ListTopicSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicSubscriptionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicSubscriptionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicSubscriptionsResponse.Merge(dst, src)
+func (m *ListTopicSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsResponse.Merge(m, src)
 }
 func (m *ListTopicSubscriptionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTopicSubscriptionsResponse.Size(m)
@@ -680,16 +691,17 @@ func (m *ListTopicSnapshotsRequest) Reset()         { *m = ListTopicSnapshotsReq
 func (m *ListTopicSnapshotsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTopicSnapshotsRequest) ProtoMessage()    {}
 func (*ListTopicSnapshotsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{11}
+	return fileDescriptor_f602d910f9a348fe, []int{11}
 }
+
 func (m *ListTopicSnapshotsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicSnapshotsRequest.Unmarshal(m, b)
 }
 func (m *ListTopicSnapshotsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicSnapshotsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicSnapshotsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicSnapshotsRequest.Merge(dst, src)
+func (m *ListTopicSnapshotsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSnapshotsRequest.Merge(m, src)
 }
 func (m *ListTopicSnapshotsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTopicSnapshotsRequest.Size(m)
@@ -738,16 +750,17 @@ func (m *ListTopicSnapshotsResponse) Reset()         { *m = ListTopicSnapshotsRe
 func (m *ListTopicSnapshotsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTopicSnapshotsResponse) ProtoMessage()    {}
 func (*ListTopicSnapshotsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{12}
+	return fileDescriptor_f602d910f9a348fe, []int{12}
 }
+
 func (m *ListTopicSnapshotsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicSnapshotsResponse.Unmarshal(m, b)
 }
 func (m *ListTopicSnapshotsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicSnapshotsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicSnapshotsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicSnapshotsResponse.Merge(dst, src)
+func (m *ListTopicSnapshotsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSnapshotsResponse.Merge(m, src)
 }
 func (m *ListTopicSnapshotsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTopicSnapshotsResponse.Size(m)
@@ -786,16 +799,17 @@ func (m *DeleteTopicRequest) Reset()         { *m = DeleteTopicRequest{} }
 func (m *DeleteTopicRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTopicRequest) ProtoMessage()    {}
 func (*DeleteTopicRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{13}
+	return fileDescriptor_f602d910f9a348fe, []int{13}
 }
+
 func (m *DeleteTopicRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTopicRequest.Unmarshal(m, b)
 }
 func (m *DeleteTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTopicRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTopicRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTopicRequest.Merge(dst, src)
+func (m *DeleteTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTopicRequest.Merge(m, src)
 }
 func (m *DeleteTopicRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTopicRequest.Size(m)
@@ -894,16 +908,17 @@ func (m *Subscription) Reset()         { *m = Subscription{} }
 func (m *Subscription) String() string { return proto.CompactTextString(m) }
 func (*Subscription) ProtoMessage()    {}
 func (*Subscription) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{14}
+	return fileDescriptor_f602d910f9a348fe, []int{14}
 }
+
 func (m *Subscription) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Subscription.Unmarshal(m, b)
 }
 func (m *Subscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Subscription.Marshal(b, m, deterministic)
 }
-func (dst *Subscription) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Subscription.Merge(dst, src)
+func (m *Subscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Subscription.Merge(m, src)
 }
 func (m *Subscription) XXX_Size() int {
 	return xxx_messageInfo_Subscription.Size(m)
@@ -996,16 +1011,17 @@ func (m *ExpirationPolicy) Reset()         { *m = ExpirationPolicy{} }
 func (m *ExpirationPolicy) String() string { return proto.CompactTextString(m) }
 func (*ExpirationPolicy) ProtoMessage()    {}
 func (*ExpirationPolicy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{15}
+	return fileDescriptor_f602d910f9a348fe, []int{15}
 }
+
 func (m *ExpirationPolicy) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExpirationPolicy.Unmarshal(m, b)
 }
 func (m *ExpirationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExpirationPolicy.Marshal(b, m, deterministic)
 }
-func (dst *ExpirationPolicy) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExpirationPolicy.Merge(dst, src)
+func (m *ExpirationPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExpirationPolicy.Merge(m, src)
 }
 func (m *ExpirationPolicy) XXX_Size() int {
 	return xxx_messageInfo_ExpirationPolicy.Size(m)
@@ -1068,16 +1084,17 @@ func (m *PushConfig) Reset()         { *m = PushConfig{} }
 func (m *PushConfig) String() string { return proto.CompactTextString(m) }
 func (*PushConfig) ProtoMessage()    {}
 func (*PushConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{16}
+	return fileDescriptor_f602d910f9a348fe, []int{16}
 }
+
 func (m *PushConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PushConfig.Unmarshal(m, b)
 }
 func (m *PushConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PushConfig.Marshal(b, m, deterministic)
 }
-func (dst *PushConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PushConfig.Merge(dst, src)
+func (m *PushConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PushConfig.Merge(m, src)
 }
 func (m *PushConfig) XXX_Size() int {
 	return xxx_messageInfo_PushConfig.Size(m)
@@ -1126,61 +1143,13 @@ func (m *PushConfig) GetOidcToken() *PushConfig_OidcToken {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PushConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PushConfig_OneofMarshaler, _PushConfig_OneofUnmarshaler, _PushConfig_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*PushConfig) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*PushConfig_OidcToken_)(nil),
 	}
 }
 
-func _PushConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PushConfig)
-	// authentication_method
-	switch x := m.AuthenticationMethod.(type) {
-	case *PushConfig_OidcToken_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OidcToken); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PushConfig.AuthenticationMethod has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PushConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PushConfig)
-	switch tag {
-	case 3: // authentication_method.oidc_token
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PushConfig_OidcToken)
-		err := b.DecodeMessage(msg)
-		m.AuthenticationMethod = &PushConfig_OidcToken_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PushConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PushConfig)
-	// authentication_method
-	switch x := m.AuthenticationMethod.(type) {
-	case *PushConfig_OidcToken_:
-		s := proto.Size(x.OidcToken)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Contains information needed for generating an
 // [OpenID Connect
 // token](https://developers.google.com/identity/protocols/OpenIDConnect).
@@ -1207,16 +1176,17 @@ func (m *PushConfig_OidcToken) Reset()         { *m = PushConfig_OidcToken{} }
 func (m *PushConfig_OidcToken) String() string { return proto.CompactTextString(m) }
 func (*PushConfig_OidcToken) ProtoMessage()    {}
 func (*PushConfig_OidcToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{16, 0}
+	return fileDescriptor_f602d910f9a348fe, []int{16, 0}
 }
+
 func (m *PushConfig_OidcToken) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PushConfig_OidcToken.Unmarshal(m, b)
 }
 func (m *PushConfig_OidcToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PushConfig_OidcToken.Marshal(b, m, deterministic)
 }
-func (dst *PushConfig_OidcToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PushConfig_OidcToken.Merge(dst, src)
+func (m *PushConfig_OidcToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PushConfig_OidcToken.Merge(m, src)
 }
 func (m *PushConfig_OidcToken) XXX_Size() int {
 	return xxx_messageInfo_PushConfig_OidcToken.Size(m)
@@ -1256,16 +1226,17 @@ func (m *ReceivedMessage) Reset()         { *m = ReceivedMessage{} }
 func (m *ReceivedMessage) String() string { return proto.CompactTextString(m) }
 func (*ReceivedMessage) ProtoMessage()    {}
 func (*ReceivedMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{17}
+	return fileDescriptor_f602d910f9a348fe, []int{17}
 }
+
 func (m *ReceivedMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceivedMessage.Unmarshal(m, b)
 }
 func (m *ReceivedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceivedMessage.Marshal(b, m, deterministic)
 }
-func (dst *ReceivedMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceivedMessage.Merge(dst, src)
+func (m *ReceivedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceivedMessage.Merge(m, src)
 }
 func (m *ReceivedMessage) XXX_Size() int {
 	return xxx_messageInfo_ReceivedMessage.Size(m)
@@ -1304,16 +1275,17 @@ func (m *GetSubscriptionRequest) Reset()         { *m = GetSubscriptionRequest{}
 func (m *GetSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSubscriptionRequest) ProtoMessage()    {}
 func (*GetSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{18}
+	return fileDescriptor_f602d910f9a348fe, []int{18}
 }
+
 func (m *GetSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *GetSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSubscriptionRequest.Merge(dst, src)
+func (m *GetSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSubscriptionRequest.Merge(m, src)
 }
 func (m *GetSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSubscriptionRequest.Size(m)
@@ -1347,16 +1319,17 @@ func (m *UpdateSubscriptionRequest) Reset()         { *m = UpdateSubscriptionReq
 func (m *UpdateSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSubscriptionRequest) ProtoMessage()    {}
 func (*UpdateSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{19}
+	return fileDescriptor_f602d910f9a348fe, []int{19}
 }
+
 func (m *UpdateSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *UpdateSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSubscriptionRequest.Merge(dst, src)
+func (m *UpdateSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSubscriptionRequest.Merge(m, src)
 }
 func (m *UpdateSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSubscriptionRequest.Size(m)
@@ -1401,16 +1374,17 @@ func (m *ListSubscriptionsRequest) Reset()         { *m = ListSubscriptionsReque
 func (m *ListSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSubscriptionsRequest) ProtoMessage()    {}
 func (*ListSubscriptionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{20}
+	return fileDescriptor_f602d910f9a348fe, []int{20}
 }
+
 func (m *ListSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSubscriptionsRequest.Unmarshal(m, b)
 }
 func (m *ListSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSubscriptionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSubscriptionsRequest.Merge(dst, src)
+func (m *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsRequest.Merge(m, src)
 }
 func (m *ListSubscriptionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSubscriptionsRequest.Size(m)
@@ -1459,16 +1433,17 @@ func (m *ListSubscriptionsResponse) Reset()         { *m = ListSubscriptionsResp
 func (m *ListSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSubscriptionsResponse) ProtoMessage()    {}
 func (*ListSubscriptionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{21}
+	return fileDescriptor_f602d910f9a348fe, []int{21}
 }
+
 func (m *ListSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSubscriptionsResponse.Unmarshal(m, b)
 }
 func (m *ListSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSubscriptionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSubscriptionsResponse.Merge(dst, src)
+func (m *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsResponse.Merge(m, src)
 }
 func (m *ListSubscriptionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSubscriptionsResponse.Size(m)
@@ -1507,16 +1482,17 @@ func (m *DeleteSubscriptionRequest) Reset()         { *m = DeleteSubscriptionReq
 func (m *DeleteSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSubscriptionRequest) ProtoMessage()    {}
 func (*DeleteSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{22}
+	return fileDescriptor_f602d910f9a348fe, []int{22}
 }
+
 func (m *DeleteSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *DeleteSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSubscriptionRequest.Merge(dst, src)
+func (m *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSubscriptionRequest.Merge(m, src)
 }
 func (m *DeleteSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Size(m)
@@ -1555,16 +1531,17 @@ func (m *ModifyPushConfigRequest) Reset()         { *m = ModifyPushConfigRequest
 func (m *ModifyPushConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*ModifyPushConfigRequest) ProtoMessage()    {}
 func (*ModifyPushConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{23}
+	return fileDescriptor_f602d910f9a348fe, []int{23}
 }
+
 func (m *ModifyPushConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyPushConfigRequest.Unmarshal(m, b)
 }
 func (m *ModifyPushConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModifyPushConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *ModifyPushConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyPushConfigRequest.Merge(dst, src)
+func (m *ModifyPushConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyPushConfigRequest.Merge(m, src)
 }
 func (m *ModifyPushConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_ModifyPushConfigRequest.Size(m)
@@ -1611,16 +1588,17 @@ func (m *PullRequest) Reset()         { *m = PullRequest{} }
 func (m *PullRequest) String() string { return proto.CompactTextString(m) }
 func (*PullRequest) ProtoMessage()    {}
 func (*PullRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{24}
+	return fileDescriptor_f602d910f9a348fe, []int{24}
 }
+
 func (m *PullRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullRequest.Unmarshal(m, b)
 }
 func (m *PullRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PullRequest.Marshal(b, m, deterministic)
 }
-func (dst *PullRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PullRequest.Merge(dst, src)
+func (m *PullRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullRequest.Merge(m, src)
 }
 func (m *PullRequest) XXX_Size() int {
 	return xxx_messageInfo_PullRequest.Size(m)
@@ -1668,16 +1646,17 @@ func (m *PullResponse) Reset()         { *m = PullResponse{} }
 func (m *PullResponse) String() string { return proto.CompactTextString(m) }
 func (*PullResponse) ProtoMessage()    {}
 func (*PullResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{25}
+	return fileDescriptor_f602d910f9a348fe, []int{25}
 }
+
 func (m *PullResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullResponse.Unmarshal(m, b)
 }
 func (m *PullResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PullResponse.Marshal(b, m, deterministic)
 }
-func (dst *PullResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PullResponse.Merge(dst, src)
+func (m *PullResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullResponse.Merge(m, src)
 }
 func (m *PullResponse) XXX_Size() int {
 	return xxx_messageInfo_PullResponse.Size(m)
@@ -1720,16 +1699,17 @@ func (m *ModifyAckDeadlineRequest) Reset()         { *m = ModifyAckDeadlineReque
 func (m *ModifyAckDeadlineRequest) String() string { return proto.CompactTextString(m) }
 func (*ModifyAckDeadlineRequest) ProtoMessage()    {}
 func (*ModifyAckDeadlineRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{26}
+	return fileDescriptor_f602d910f9a348fe, []int{26}
 }
+
 func (m *ModifyAckDeadlineRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyAckDeadlineRequest.Unmarshal(m, b)
 }
 func (m *ModifyAckDeadlineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModifyAckDeadlineRequest.Marshal(b, m, deterministic)
 }
-func (dst *ModifyAckDeadlineRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyAckDeadlineRequest.Merge(dst, src)
+func (m *ModifyAckDeadlineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyAckDeadlineRequest.Merge(m, src)
 }
 func (m *ModifyAckDeadlineRequest) XXX_Size() int {
 	return xxx_messageInfo_ModifyAckDeadlineRequest.Size(m)
@@ -1778,16 +1758,17 @@ func (m *AcknowledgeRequest) Reset()         { *m = AcknowledgeRequest{} }
 func (m *AcknowledgeRequest) String() string { return proto.CompactTextString(m) }
 func (*AcknowledgeRequest) ProtoMessage()    {}
 func (*AcknowledgeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{27}
+	return fileDescriptor_f602d910f9a348fe, []int{27}
 }
+
 func (m *AcknowledgeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcknowledgeRequest.Unmarshal(m, b)
 }
 func (m *AcknowledgeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcknowledgeRequest.Marshal(b, m, deterministic)
 }
-func (dst *AcknowledgeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcknowledgeRequest.Merge(dst, src)
+func (m *AcknowledgeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcknowledgeRequest.Merge(m, src)
 }
 func (m *AcknowledgeRequest) XXX_Size() int {
 	return xxx_messageInfo_AcknowledgeRequest.Size(m)
@@ -1859,16 +1840,17 @@ func (m *StreamingPullRequest) Reset()         { *m = StreamingPullRequest{} }
 func (m *StreamingPullRequest) String() string { return proto.CompactTextString(m) }
 func (*StreamingPullRequest) ProtoMessage()    {}
 func (*StreamingPullRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{28}
+	return fileDescriptor_f602d910f9a348fe, []int{28}
 }
+
 func (m *StreamingPullRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingPullRequest.Unmarshal(m, b)
 }
 func (m *StreamingPullRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingPullRequest.Marshal(b, m, deterministic)
 }
-func (dst *StreamingPullRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingPullRequest.Merge(dst, src)
+func (m *StreamingPullRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingPullRequest.Merge(m, src)
 }
 func (m *StreamingPullRequest) XXX_Size() int {
 	return xxx_messageInfo_StreamingPullRequest.Size(m)
@@ -1928,16 +1910,17 @@ func (m *StreamingPullResponse) Reset()         { *m = StreamingPullResponse{} }
 func (m *StreamingPullResponse) String() string { return proto.CompactTextString(m) }
 func (*StreamingPullResponse) ProtoMessage()    {}
 func (*StreamingPullResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{29}
+	return fileDescriptor_f602d910f9a348fe, []int{29}
 }
+
 func (m *StreamingPullResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StreamingPullResponse.Unmarshal(m, b)
 }
 func (m *StreamingPullResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StreamingPullResponse.Marshal(b, m, deterministic)
 }
-func (dst *StreamingPullResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StreamingPullResponse.Merge(dst, src)
+func (m *StreamingPullResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingPullResponse.Merge(m, src)
 }
 func (m *StreamingPullResponse) XXX_Size() int {
 	return xxx_messageInfo_StreamingPullResponse.Size(m)
@@ -1987,16 +1970,17 @@ func (m *CreateSnapshotRequest) Reset()         { *m = CreateSnapshotRequest{} }
 func (m *CreateSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSnapshotRequest) ProtoMessage()    {}
 func (*CreateSnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{30}
+	return fileDescriptor_f602d910f9a348fe, []int{30}
 }
+
 func (m *CreateSnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSnapshotRequest.Unmarshal(m, b)
 }
 func (m *CreateSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSnapshotRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSnapshotRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSnapshotRequest.Merge(dst, src)
+func (m *CreateSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSnapshotRequest.Merge(m, src)
 }
 func (m *CreateSnapshotRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSnapshotRequest.Size(m)
@@ -2044,16 +2028,17 @@ func (m *UpdateSnapshotRequest) Reset()         { *m = UpdateSnapshotRequest{} }
 func (m *UpdateSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateSnapshotRequest) ProtoMessage()    {}
 func (*UpdateSnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{31}
+	return fileDescriptor_f602d910f9a348fe, []int{31}
 }
+
 func (m *UpdateSnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateSnapshotRequest.Unmarshal(m, b)
 }
 func (m *UpdateSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateSnapshotRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateSnapshotRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateSnapshotRequest.Merge(dst, src)
+func (m *UpdateSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSnapshotRequest.Merge(m, src)
 }
 func (m *UpdateSnapshotRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateSnapshotRequest.Size(m)
@@ -2112,16 +2097,17 @@ func (m *Snapshot) Reset()         { *m = Snapshot{} }
 func (m *Snapshot) String() string { return proto.CompactTextString(m) }
 func (*Snapshot) ProtoMessage()    {}
 func (*Snapshot) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{32}
+	return fileDescriptor_f602d910f9a348fe, []int{32}
 }
+
 func (m *Snapshot) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Snapshot.Unmarshal(m, b)
 }
 func (m *Snapshot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Snapshot.Marshal(b, m, deterministic)
 }
-func (dst *Snapshot) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Snapshot.Merge(dst, src)
+func (m *Snapshot) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Snapshot.Merge(m, src)
 }
 func (m *Snapshot) XXX_Size() int {
 	return xxx_messageInfo_Snapshot.Size(m)
@@ -2174,16 +2160,17 @@ func (m *GetSnapshotRequest) Reset()         { *m = GetSnapshotRequest{} }
 func (m *GetSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSnapshotRequest) ProtoMessage()    {}
 func (*GetSnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{33}
+	return fileDescriptor_f602d910f9a348fe, []int{33}
 }
+
 func (m *GetSnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSnapshotRequest.Unmarshal(m, b)
 }
 func (m *GetSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSnapshotRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSnapshotRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSnapshotRequest.Merge(dst, src)
+func (m *GetSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSnapshotRequest.Merge(m, src)
 }
 func (m *GetSnapshotRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSnapshotRequest.Size(m)
@@ -2221,16 +2208,17 @@ func (m *ListSnapshotsRequest) Reset()         { *m = ListSnapshotsRequest{} }
 func (m *ListSnapshotsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSnapshotsRequest) ProtoMessage()    {}
 func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{34}
+	return fileDescriptor_f602d910f9a348fe, []int{34}
 }
+
 func (m *ListSnapshotsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSnapshotsRequest.Unmarshal(m, b)
 }
 func (m *ListSnapshotsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSnapshotsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSnapshotsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSnapshotsRequest.Merge(dst, src)
+func (m *ListSnapshotsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsRequest.Merge(m, src)
 }
 func (m *ListSnapshotsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSnapshotsRequest.Size(m)
@@ -2278,16 +2266,17 @@ func (m *ListSnapshotsResponse) Reset()         { *m = ListSnapshotsResponse{} }
 func (m *ListSnapshotsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSnapshotsResponse) ProtoMessage()    {}
 func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{35}
+	return fileDescriptor_f602d910f9a348fe, []int{35}
 }
+
 func (m *ListSnapshotsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSnapshotsResponse.Unmarshal(m, b)
 }
 func (m *ListSnapshotsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSnapshotsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSnapshotsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSnapshotsResponse.Merge(dst, src)
+func (m *ListSnapshotsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsResponse.Merge(m, src)
 }
 func (m *ListSnapshotsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSnapshotsResponse.Size(m)
@@ -2326,16 +2315,17 @@ func (m *DeleteSnapshotRequest) Reset()         { *m = DeleteSnapshotRequest{} }
 func (m *DeleteSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSnapshotRequest) ProtoMessage()    {}
 func (*DeleteSnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{36}
+	return fileDescriptor_f602d910f9a348fe, []int{36}
 }
+
 func (m *DeleteSnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSnapshotRequest.Unmarshal(m, b)
 }
 func (m *DeleteSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSnapshotRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSnapshotRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSnapshotRequest.Merge(dst, src)
+func (m *DeleteSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSnapshotRequest.Merge(m, src)
 }
 func (m *DeleteSnapshotRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSnapshotRequest.Size(m)
@@ -2370,16 +2360,17 @@ func (m *SeekRequest) Reset()         { *m = SeekRequest{} }
 func (m *SeekRequest) String() string { return proto.CompactTextString(m) }
 func (*SeekRequest) ProtoMessage()    {}
 func (*SeekRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{37}
+	return fileDescriptor_f602d910f9a348fe, []int{37}
 }
+
 func (m *SeekRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SeekRequest.Unmarshal(m, b)
 }
 func (m *SeekRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SeekRequest.Marshal(b, m, deterministic)
 }
-func (dst *SeekRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SeekRequest.Merge(dst, src)
+func (m *SeekRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SeekRequest.Merge(m, src)
 }
 func (m *SeekRequest) XXX_Size() int {
 	return xxx_messageInfo_SeekRequest.Size(m)
@@ -2434,76 +2425,14 @@ func (m *SeekRequest) GetSnapshot() string {
 	return ""
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SeekRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SeekRequest_OneofMarshaler, _SeekRequest_OneofUnmarshaler, _SeekRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SeekRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*SeekRequest_Time)(nil),
 		(*SeekRequest_Snapshot)(nil),
 	}
 }
 
-func _SeekRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SeekRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *SeekRequest_Time:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Time); err != nil {
-			return err
-		}
-	case *SeekRequest_Snapshot:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Snapshot)
-	case nil:
-	default:
-		return fmt.Errorf("SeekRequest.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SeekRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SeekRequest)
-	switch tag {
-	case 2: // target.time
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.Target = &SeekRequest_Time{msg}
-		return true, err
-	case 3: // target.snapshot
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Target = &SeekRequest_Snapshot{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SeekRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SeekRequest)
-	// target
-	switch x := m.Target.(type) {
-	case *SeekRequest_Time:
-		s := proto.Size(x.Time)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *SeekRequest_Snapshot:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Snapshot)))
-		n += len(x.Snapshot)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Response for the `Seek` method (this response is empty).
 type SeekResponse struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -2515,16 +2444,17 @@ func (m *SeekResponse) Reset()         { *m = SeekResponse{} }
 func (m *SeekResponse) String() string { return proto.CompactTextString(m) }
 func (*SeekResponse) ProtoMessage()    {}
 func (*SeekResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_790424aa8109440f, []int{38}
+	return fileDescriptor_f602d910f9a348fe, []int{38}
 }
+
 func (m *SeekResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SeekResponse.Unmarshal(m, b)
 }
 func (m *SeekResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SeekResponse.Marshal(b, m, deterministic)
 }
-func (dst *SeekResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SeekResponse.Merge(dst, src)
+func (m *SeekResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SeekResponse.Merge(m, src)
 }
 func (m *SeekResponse) XXX_Size() int {
 	return xxx_messageInfo_SeekResponse.Size(m)
@@ -2584,6 +2514,164 @@ func init() {
 	proto.RegisterType((*SeekResponse)(nil), "google.pubsub.v1.SeekResponse")
 }
 
+func init() { proto.RegisterFile("google/pubsub/v1/pubsub.proto", fileDescriptor_f602d910f9a348fe) }
+
+var fileDescriptor_f602d910f9a348fe = []byte{
+	// 2428 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0x4b, 0x73, 0x1b, 0x59,
+	0x15, 0x4e, 0xcb, 0x8f, 0x48, 0x47, 0x76, 0x62, 0xdf, 0xb1, 0x13, 0xb9, 0xf3, 0x72, 0x7a, 0x42,
+	0xec, 0x28, 0x89, 0x64, 0x2b, 0x35, 0x61, 0xe2, 0xe0, 0xa4, 0xec, 0x38, 0x24, 0x21, 0xc9, 0xc4,
+	0xb4, 0x43, 0xa8, 0x82, 0x14, 0xaa, 0x56, 0xf7, 0xb5, 0xdc, 0xa3, 0x7e, 0x4d, 0x77, 0xcb, 0x13,
+	0x0d, 0x84, 0x0a, 0x33, 0x14, 0x55, 0x14, 0x59, 0x00, 0xb3, 0x9d, 0x05, 0x05, 0x3b, 0x16, 0x2c,
+	0x28, 0xd6, 0xb0, 0x67, 0xcb, 0x82, 0x3f, 0xc0, 0x8a, 0xe2, 0x07, 0xc0, 0x82, 0x2a, 0xea, 0x3e,
+	0xba, 0xd5, 0xdd, 0xba, 0x92, 0x2c, 0x9b, 0xec, 0xac, 0x7b, 0xce, 0xed, 0xf3, 0x9d, 0xf7, 0x3d,
+	0xa7, 0x0c, 0xe7, 0x9a, 0xae, 0xdb, 0xb4, 0x70, 0xd5, 0x6b, 0x37, 0x82, 0x76, 0xa3, 0xba, 0xbf,
+	0xca, 0xff, 0xaa, 0x78, 0xbe, 0x1b, 0xba, 0x68, 0x86, 0x91, 0x2b, 0xfc, 0x70, 0x7f, 0x55, 0x3e,
+	0xcb, 0x2f, 0x68, 0x9e, 0x59, 0xd5, 0x1c, 0xc7, 0x0d, 0xb5, 0xd0, 0x74, 0x9d, 0x80, 0xf1, 0xcb,
+	0x0b, 0x09, 0xaa, 0x8f, 0x03, 0xb7, 0xed, 0xeb, 0x98, 0x93, 0xce, 0x47, 0x92, 0xc8, 0xaf, 0x46,
+	0x7b, 0xb7, 0x6a, 0xb4, 0x7d, 0x7a, 0x97, 0xd3, 0xcf, 0x64, 0xe9, 0xd8, 0xf6, 0xc2, 0x0e, 0x27,
+	0x2e, 0x66, 0x89, 0xbb, 0x26, 0xb6, 0x8c, 0xba, 0xad, 0x05, 0x2d, 0xce, 0x71, 0x21, 0xcb, 0x11,
+	0x9a, 0x36, 0x0e, 0x42, 0xcd, 0xf6, 0x18, 0x83, 0xf2, 0x02, 0xe6, 0x9e, 0xe2, 0x20, 0xd0, 0x9a,
+	0x78, 0x27, 0x74, 0x7d, 0xad, 0x89, 0xb7, 0x5d, 0xcb, 0xd4, 0x3b, 0xe8, 0x0e, 0x9c, 0xd1, 0x2c,
+	0xcb, 0xfd, 0x14, 0x1b, 0x75, 0x0f, 0xfb, 0x81, 0x19, 0x84, 0xd8, 0xd1, 0x71, 0xdd, 0xc7, 0x4d,
+	0xa2, 0x57, 0x49, 0x5a, 0x1c, 0x5b, 0x2e, 0xa8, 0x0b, 0x9c, 0x65, 0xbb, 0xcb, 0xa1, 0x32, 0x06,
+	0xe5, 0xcb, 0x1c, 0x4c, 0x3c, 0x77, 0x3d, 0x53, 0x47, 0x08, 0xc6, 0x1d, 0xcd, 0xc6, 0x25, 0x69,
+	0x51, 0x5a, 0x2e, 0xa8, 0xf4, 0x6f, 0x74, 0x1b, 0x26, 0x2d, 0xad, 0x81, 0xad, 0xa0, 0x94, 0x5b,
+	0x1c, 0x5b, 0x2e, 0xd6, 0xde, 0xaf, 0x64, 0x2d, 0x5a, 0xa1, 0x97, 0x2b, 0x4f, 0x28, 0xd7, 0x7d,
+	0x27, 0xf4, 0x3b, 0x2a, 0xbf, 0x82, 0x5e, 0xc2, 0x29, 0x9b, 0x41, 0xae, 0x07, 0x0c, 0x73, 0xdd,
+	0xa3, 0xa0, 0x4b, 0x63, 0x8b, 0xd2, 0x72, 0xb1, 0x76, 0xb9, 0xf7, 0x63, 0x22, 0x15, 0xd5, 0x39,
+	0x5b, 0xa4, 0xf8, 0x22, 0x4c, 0xb5, 0xec, 0xa0, 0xde, 0xc2, 0x9d, 0x3a, 0x85, 0x3d, 0x41, 0x61,
+	0x43, 0xcb, 0x0e, 0x1e, 0xe3, 0xce, 0x47, 0x9a, 0x8d, 0xe5, 0x5b, 0x50, 0x4c, 0xc0, 0x42, 0x33,
+	0x30, 0xd6, 0xc2, 0x1d, 0xae, 0x1e, 0xf9, 0x13, 0xcd, 0xc1, 0xc4, 0xbe, 0x66, 0xb5, 0x71, 0x29,
+	0x47, 0xcf, 0xd8, 0x8f, 0xb5, 0xdc, 0x87, 0x92, 0xf2, 0xa7, 0x1c, 0x4c, 0x6f, 0x53, 0x54, 0x1c,
+	0x11, 0xb1, 0x8e, 0xa1, 0x85, 0x1a, 0xbd, 0x3e, 0xa5, 0xd2, 0xbf, 0xd1, 0x33, 0x00, 0x2d, 0x0c,
+	0x7d, 0xb3, 0xd1, 0x0e, 0x71, 0x64, 0xa1, 0x6a, 0xaf, 0x52, 0xa9, 0x0f, 0x55, 0x36, 0xe2, 0x1b,
+	0xcc, 0x5a, 0x89, 0x4f, 0xa0, 0x73, 0x00, 0x91, 0xc5, 0x4c, 0x83, 0x5a, 0xa9, 0xa0, 0x16, 0xf8,
+	0xc9, 0x23, 0x03, 0xad, 0xc3, 0x94, 0xd7, 0x6e, 0x58, 0x66, 0xb0, 0x57, 0x27, 0xe1, 0x51, 0x1a,
+	0xa7, 0x66, 0x94, 0x63, 0x89, 0x3c, 0x76, 0x2a, 0xcf, 0xa3, 0xd8, 0x51, 0x8b, 0x9c, 0x9f, 0x9c,
+	0xa0, 0x8b, 0x30, 0xe5, 0xfa, 0x06, 0xf6, 0x4d, 0xa7, 0x49, 0xcc, 0xc6, 0x2d, 0x56, 0x8c, 0xce,
+	0x1e, 0xe3, 0x8e, 0xbc, 0x0e, 0x27, 0x33, 0xf8, 0x46, 0x32, 0xdb, 0x12, 0x9c, 0x7c, 0x80, 0x43,
+	0x1a, 0x11, 0x2a, 0xfe, 0xa4, 0x8d, 0x83, 0x90, 0x30, 0x87, 0xe4, 0x37, 0xff, 0x00, 0xfb, 0xa1,
+	0xbc, 0x91, 0x00, 0x7d, 0xc7, 0x33, 0xb4, 0x10, 0xa7, 0x98, 0xaf, 0x27, 0x99, 0x8b, 0xb5, 0xd3,
+	0x7d, 0xa2, 0x8d, 0x7f, 0x05, 0xdd, 0x86, 0x62, 0x9b, 0x7e, 0x84, 0x66, 0x12, 0x85, 0x23, 0x32,
+	0xc7, 0x37, 0x49, 0xb2, 0x3d, 0xd5, 0x82, 0x96, 0x0a, 0x8c, 0x9d, 0xfc, 0xad, 0xe8, 0x70, 0x62,
+	0x9b, 0x19, 0x67, 0x20, 0x54, 0x74, 0x1b, 0xf2, 0xdc, 0x03, 0x91, 0x8b, 0x2f, 0x0c, 0x71, 0xb1,
+	0x1a, 0x5f, 0x50, 0x6a, 0x70, 0x32, 0x16, 0x12, 0x78, 0xae, 0x13, 0x60, 0x74, 0x01, 0x8a, 0x5d,
+	0x1f, 0x47, 0x09, 0x0a, 0xb1, 0x93, 0x03, 0xc5, 0x84, 0xd9, 0x27, 0x66, 0xc0, 0xac, 0x18, 0x44,
+	0xd8, 0x4a, 0x70, 0xdc, 0xf3, 0xdd, 0x8f, 0xb1, 0x1e, 0x72, 0x74, 0xd1, 0x4f, 0x74, 0x06, 0x0a,
+	0x1e, 0x4d, 0x31, 0xf3, 0x33, 0xe6, 0x91, 0x09, 0x35, 0x4f, 0x0e, 0x76, 0xcc, 0xcf, 0x30, 0x09,
+	0x28, 0x4a, 0x0c, 0xdd, 0x16, 0x76, 0xa2, 0x80, 0x22, 0x27, 0xcf, 0xc9, 0x81, 0x62, 0x03, 0x4a,
+	0x8a, 0xe2, 0x08, 0xab, 0x30, 0x49, 0x55, 0x67, 0xe0, 0x06, 0xb8, 0x81, 0xb3, 0xa1, 0xcb, 0x70,
+	0xd2, 0xc1, 0xaf, 0xc2, 0x7a, 0x42, 0x14, 0x0b, 0x8d, 0x69, 0x72, 0xbc, 0x1d, 0x8b, 0xfb, 0x04,
+	0xce, 0xc5, 0xe2, 0x76, 0xda, 0x8d, 0x40, 0xf7, 0x4d, 0x8f, 0x96, 0xdf, 0xc1, 0x1e, 0x38, 0x8a,
+	0x86, 0x0e, 0x9c, 0xef, 0x27, 0x92, 0x6b, 0x7b, 0x09, 0xa6, 0x83, 0x24, 0x81, 0x7b, 0x24, 0x7d,
+	0x78, 0x60, 0x15, 0x6d, 0x58, 0xe8, 0xca, 0x73, 0x34, 0x2f, 0xd8, 0x73, 0xc3, 0x77, 0xa8, 0x5e,
+	0x03, 0x64, 0x91, 0x38, 0xae, 0xda, 0x59, 0x28, 0x04, 0xd1, 0x21, 0x57, 0xab, 0x7b, 0x70, 0x60,
+	0x95, 0xca, 0x80, 0xb6, 0xb0, 0x85, 0x33, 0xa9, 0x2a, 0xce, 0xeb, 0x3f, 0x8f, 0xc3, 0x54, 0xd2,
+	0xcc, 0xc2, 0xa6, 0x12, 0x5f, 0xcd, 0x25, 0xcd, 0xb0, 0x0e, 0x45, 0xaf, 0x1d, 0xec, 0xd5, 0x75,
+	0xd7, 0xd9, 0x35, 0x9b, 0xbc, 0xb6, 0x9d, 0x15, 0xa5, 0x5a, 0xb0, 0x77, 0x8f, 0xf2, 0xa8, 0xe0,
+	0xc5, 0x7f, 0xa3, 0x15, 0x98, 0xd3, 0xf4, 0x56, 0xdd, 0xc0, 0x9a, 0x61, 0x99, 0x0e, 0xae, 0x07,
+	0x58, 0x77, 0x1d, 0x23, 0xa0, 0x45, 0x6e, 0x42, 0x45, 0x9a, 0xde, 0xda, 0xe2, 0xa4, 0x1d, 0x46,
+	0x41, 0x35, 0x98, 0xf7, 0x71, 0xa8, 0x99, 0x4e, 0x5d, 0xd3, 0x5b, 0xd8, 0xa8, 0xc7, 0x59, 0x7e,
+	0x7c, 0x51, 0x5a, 0xce, 0xab, 0xef, 0x31, 0xe2, 0x06, 0xa1, 0xf1, 0xc4, 0x0e, 0xd0, 0x77, 0x41,
+	0x8e, 0x92, 0xd7, 0xc7, 0x21, 0x76, 0x88, 0x8e, 0xf5, 0xe8, 0x25, 0x50, 0xca, 0x53, 0xcc, 0x0b,
+	0x3d, 0x05, 0x68, 0x8b, 0x33, 0xa8, 0x25, 0x7e, 0x59, 0x8d, 0xee, 0x46, 0x14, 0xb4, 0x19, 0x37,
+	0xda, 0x02, 0xcd, 0xb9, 0x72, 0xaf, 0xe2, 0x49, 0xbb, 0x0a, 0xfb, 0xed, 0x4d, 0x38, 0x8d, 0x1d,
+	0xad, 0x61, 0xe1, 0x48, 0x95, 0x7a, 0x54, 0xda, 0x4b, 0x40, 0x55, 0x9a, 0x67, 0x64, 0xae, 0xcd,
+	0x33, 0x4e, 0x44, 0xcf, 0x60, 0x16, 0xbf, 0xf2, 0x4c, 0x86, 0x24, 0x6a, 0xd1, 0x45, 0xaa, 0x8b,
+	0xd2, 0x0b, 0xe3, 0x7e, 0xcc, 0xca, 0xdb, 0xf3, 0x0c, 0xce, 0x9c, 0x1c, 0xa5, 0xf1, 0xde, 0x85,
+	0x99, 0xac, 0x00, 0x74, 0x15, 0xc6, 0xc2, 0xd0, 0xe2, 0x3d, 0x61, 0x80, 0x75, 0x09, 0x97, 0xf2,
+	0xdf, 0x1c, 0x40, 0x37, 0x44, 0xd0, 0xfb, 0x30, 0x4d, 0xa3, 0x0a, 0x3b, 0x86, 0xe7, 0x9a, 0x4e,
+	0x54, 0x3d, 0xa7, 0xc8, 0xe1, 0x7d, 0x7e, 0x86, 0x9e, 0x08, 0xfa, 0xf8, 0xb5, 0x41, 0x91, 0x37,
+	0xb0, 0x89, 0x3f, 0x00, 0x70, 0x4d, 0x43, 0x4f, 0xa4, 0xac, 0xf0, 0xa9, 0x93, 0xf8, 0xda, 0x33,
+	0xd3, 0xd0, 0x69, 0xae, 0x3d, 0x3c, 0xa6, 0x16, 0xdc, 0xe8, 0x87, 0xfc, 0x7d, 0x28, 0xc4, 0x14,
+	0x12, 0xad, 0x01, 0xf6, 0xf7, 0x4d, 0x1d, 0xd7, 0x35, 0x5d, 0x77, 0xdb, 0x4e, 0x58, 0xc7, 0xb6,
+	0x66, 0x5a, 0x5c, 0xa1, 0xf7, 0x38, 0x71, 0x83, 0xd1, 0xee, 0x13, 0x12, 0x92, 0x21, 0xaf, 0xb5,
+	0x0d, 0x93, 0x3c, 0xf7, 0xb8, 0xa5, 0xe3, 0xdf, 0x47, 0xec, 0xf4, 0x9b, 0xa7, 0x61, 0x5e, 0x6b,
+	0x87, 0x7b, 0x24, 0x8a, 0x75, 0x16, 0x37, 0x36, 0x0e, 0xf7, 0x5c, 0x43, 0xd1, 0xe1, 0xa4, 0x8a,
+	0x75, 0x6c, 0xee, 0xc7, 0x59, 0x83, 0xe6, 0x61, 0x92, 0xa4, 0xa6, 0x69, 0x44, 0xb5, 0x42, 0xd3,
+	0x5b, 0x8f, 0x0c, 0x74, 0x0b, 0x8e, 0xf3, 0x38, 0xe5, 0x9d, 0x7b, 0x68, 0x5f, 0x8d, 0xf8, 0x95,
+	0x6f, 0xc0, 0xa9, 0x07, 0x38, 0x4c, 0x26, 0x44, 0x54, 0x96, 0x14, 0x98, 0x4a, 0x16, 0xee, 0xc8,
+	0xdd, 0xc9, 0x33, 0xe5, 0x2b, 0x09, 0x16, 0xd8, 0xe3, 0x43, 0xf4, 0x85, 0x4d, 0xc1, 0x17, 0x8a,
+	0xb5, 0xf3, 0x83, 0xf3, 0x31, 0x2d, 0xe1, 0x68, 0x0f, 0x13, 0x0f, 0x4a, 0xa4, 0xa6, 0x0b, 0x1b,
+	0xe4, 0xbb, 0x79, 0x06, 0xfc, 0x5c, 0x62, 0x5d, 0x4b, 0xdc, 0x20, 0xb7, 0x44, 0x0d, 0x72, 0xb8,
+	0x45, 0x0e, 0xd9, 0x40, 0xef, 0xc2, 0x02, 0xeb, 0x36, 0x87, 0xf5, 0xee, 0x8f, 0xe0, 0xf4, 0x53,
+	0xd7, 0x30, 0x77, 0x3b, 0x89, 0x46, 0x71, 0xf0, 0xeb, 0xd9, 0x36, 0x94, 0x1b, 0xad, 0x0d, 0x29,
+	0x5f, 0x48, 0x50, 0xdc, 0x6e, 0x5b, 0xd6, 0x28, 0x22, 0xaf, 0x03, 0xf2, 0x71, 0xd8, 0xf6, 0x9d,
+	0xba, 0x69, 0xdb, 0xd8, 0x30, 0xb5, 0x10, 0x5b, 0x1d, 0x2a, 0x39, 0xaf, 0xce, 0x32, 0xca, 0xa3,
+	0x2e, 0x81, 0x3c, 0xe3, 0x6d, 0xed, 0x55, 0xb7, 0x5d, 0x8d, 0x51, 0x67, 0x17, 0x6d, 0xed, 0x55,
+	0xd4, 0xa6, 0x94, 0x1f, 0xc0, 0x14, 0x03, 0xc1, 0x5d, 0xf8, 0x11, 0xcc, 0xfa, 0x3c, 0x29, 0xbb,
+	0xf7, 0x98, 0x1b, 0x2f, 0xf6, 0xaa, 0x96, 0xc9, 0x5f, 0x75, 0xc6, 0x4f, 0x1f, 0x04, 0x24, 0x60,
+	0x4a, 0xcc, 0xc8, 0x1b, 0xdd, 0xbe, 0x3a, 0x8a, 0xca, 0xa7, 0xe1, 0x38, 0x2b, 0x09, 0x41, 0x69,
+	0x9c, 0xbe, 0x4b, 0x26, 0x69, 0x4d, 0x08, 0xfa, 0xb6, 0xf1, 0xb1, 0x7e, 0x6d, 0x5c, 0xf9, 0x36,
+	0xa0, 0x0d, 0xbd, 0xe5, 0xb8, 0x9f, 0x5a, 0xd8, 0x68, 0x1e, 0x16, 0x44, 0x2e, 0x09, 0x42, 0xf9,
+	0x49, 0x0e, 0xe6, 0x76, 0x42, 0x1f, 0x6b, 0xb6, 0xe9, 0x34, 0x47, 0xf5, 0x66, 0xbf, 0xaf, 0x92,
+	0xf6, 0x6c, 0x53, 0x9b, 0x89, 0xb4, 0x1b, 0x5b, 0x9e, 0x50, 0xe7, 0x19, 0x39, 0xfb, 0x4e, 0xf9,
+	0xa0, 0xf7, 0x5e, 0xda, 0x76, 0x73, 0xe9, 0x7b, 0x1b, 0x4c, 0xdc, 0x3a, 0x9c, 0x09, 0xa8, 0x0e,
+	0xf5, 0x01, 0xef, 0xa2, 0x12, 0x63, 0xd9, 0xe8, 0x35, 0x6b, 0x13, 0xe6, 0x33, 0x26, 0x78, 0x47,
+	0xb1, 0xf4, 0x77, 0x09, 0xe6, 0xef, 0xf9, 0x98, 0x54, 0x63, 0xfe, 0x34, 0x8d, 0xac, 0x2d, 0x7a,
+	0x3b, 0x66, 0x3d, 0x90, 0x13, 0x78, 0xe0, 0x71, 0xfc, 0x96, 0x1a, 0xa3, 0xb0, 0x6e, 0xf4, 0xc2,
+	0x12, 0x0a, 0x14, 0x3d, 0xaa, 0x8e, 0xf2, 0x96, 0x79, 0x2b, 0xc1, 0x3c, 0xef, 0x33, 0x19, 0xcd,
+	0x6e, 0x42, 0x3e, 0x7a, 0x87, 0xf3, 0xfe, 0x22, 0x0b, 0xaa, 0x69, 0x74, 0x29, 0xe6, 0x3d, 0x5a,
+	0x5f, 0xf9, 0x97, 0x04, 0xf9, 0xe8, 0x9b, 0x23, 0xbc, 0xcb, 0x6f, 0x43, 0x91, 0x3e, 0xf0, 0x30,
+	0xdb, 0x39, 0x8c, 0x0d, 0xdd, 0x39, 0x00, 0x63, 0xa7, 0x2b, 0x87, 0x3b, 0xb1, 0x2b, 0xc6, 0xa9,
+	0x2b, 0x2e, 0xf7, 0x57, 0xf3, 0xff, 0x6d, 0xfd, 0x15, 0x40, 0xe4, 0x8d, 0x90, 0xb1, 0xbc, 0x9c,
+	0xb1, 0x7c, 0xa1, 0x6b, 0x5d, 0xc5, 0x82, 0x39, 0xda, 0x05, 0xb3, 0x63, 0xdb, 0xbb, 0x69, 0xba,
+	0x1d, 0x98, 0xcf, 0x48, 0xe3, 0x09, 0xf6, 0x61, 0x76, 0x6a, 0x1b, 0x1c, 0x1d, 0x87, 0x98, 0xe8,
+	0x6e, 0xc0, 0x3c, 0xef, 0xb1, 0x23, 0x58, 0xe7, 0x17, 0x12, 0x14, 0x77, 0x30, 0x6e, 0x8d, 0x52,
+	0x0b, 0x57, 0x60, 0x9c, 0x06, 0x4d, 0x6e, 0x58, 0xd0, 0x3c, 0x3c, 0xa6, 0x52, 0x4e, 0x74, 0x36,
+	0x81, 0x80, 0x9a, 0xec, 0xe1, 0xb1, 0x2e, 0x86, 0xcd, 0x3c, 0x4c, 0x86, 0x9a, 0xdf, 0xc4, 0xa1,
+	0x72, 0x02, 0xa6, 0x18, 0x18, 0x66, 0xb4, 0xda, 0x5f, 0xf2, 0x50, 0xe0, 0x9b, 0x16, 0xec, 0xa3,
+	0x8f, 0xa1, 0xc8, 0x32, 0x9c, 0x6d, 0x36, 0xfb, 0x2d, 0x30, 0xe4, 0x7e, 0x04, 0xe5, 0xca, 0xe7,
+	0x7f, 0xfb, 0xc7, 0x97, 0xb9, 0xf7, 0xe5, 0xf3, 0xd5, 0xfd, 0xd5, 0xea, 0x0f, 0x49, 0x76, 0xac,
+	0x73, 0x9f, 0x07, 0xd5, 0x72, 0x95, 0xad, 0x3d, 0xaa, 0xe5, 0xd7, 0x6b, 0x52, 0x19, 0xbd, 0x86,
+	0x62, 0x62, 0x93, 0x85, 0x2e, 0xf5, 0x7e, 0xb2, 0x77, 0xd1, 0xd5, 0x5f, 0x70, 0x95, 0x0a, 0xbe,
+	0x52, 0xbb, 0x44, 0x05, 0x53, 0x41, 0x95, 0x81, 0xe2, 0x3f, 0x97, 0xe0, 0x38, 0x57, 0x1c, 0x2d,
+	0x0a, 0x1f, 0xd0, 0x89, 0x15, 0x97, 0x7c, 0x71, 0x00, 0x07, 0xb3, 0xa4, 0x52, 0xa3, 0x08, 0xae,
+	0x29, 0x4b, 0x5d, 0x04, 0x62, 0xe1, 0x7c, 0xb5, 0x48, 0x40, 0xb8, 0x90, 0x8f, 0xf6, 0x7e, 0x48,
+	0x20, 0x22, 0xb3, 0x13, 0xec, 0xaf, 0xfd, 0x12, 0x95, 0x7d, 0x11, 0x5d, 0x18, 0x22, 0x1b, 0xbd,
+	0x91, 0x00, 0xba, 0x9b, 0x2b, 0x24, 0x58, 0x4b, 0xf7, 0xac, 0xd0, 0xe4, 0x4b, 0x83, 0x99, 0xb8,
+	0xfa, 0x69, 0x08, 0x5c, 0x78, 0x02, 0xc4, 0x6b, 0x8e, 0x02, 0xfd, 0x51, 0x82, 0x53, 0xe2, 0xd5,
+	0x12, 0xaa, 0x0e, 0x90, 0x24, 0x7a, 0xd6, 0xcb, 0x2b, 0x07, 0xbf, 0xc0, 0x61, 0x7e, 0x40, 0x61,
+	0x56, 0xd1, 0xf5, 0x21, 0x96, 0xaa, 0xa6, 0x5f, 0xe1, 0xbf, 0x95, 0x12, 0x1b, 0xbf, 0xb8, 0xf4,
+	0xa0, 0xab, 0x83, 0xe4, 0x67, 0xca, 0xa1, 0x7c, 0xed, 0x60, 0xcc, 0x1c, 0xe8, 0x2a, 0x05, 0x7a,
+	0x15, 0x5d, 0x19, 0x0a, 0x34, 0x46, 0x13, 0x42, 0x31, 0xb1, 0x70, 0x12, 0x65, 0x54, 0xef, 0x3e,
+	0x4a, 0x3e, 0xd5, 0x53, 0x5c, 0xee, 0xdb, 0x5e, 0xd8, 0x89, 0xfc, 0x59, 0x1e, 0x16, 0x52, 0xb5,
+	0xff, 0xcc, 0x02, 0x70, 0x5b, 0x37, 0xb0, 0x8f, 0x7e, 0x26, 0x01, 0xe2, 0xaf, 0x84, 0x64, 0x45,
+	0x1b, 0x32, 0xf5, 0xc8, 0x43, 0xe8, 0xca, 0x0a, 0x85, 0x53, 0x96, 0xbf, 0x26, 0x2c, 0x2c, 0x29,
+	0x67, 0xf1, 0x04, 0xff, 0xb5, 0x44, 0x97, 0xea, 0x29, 0x14, 0xcb, 0xc2, 0x1c, 0x13, 0x4c, 0x4c,
+	0x43, 0xf1, 0xa4, 0xe3, 0x28, 0x29, 0x7f, 0x10, 0x2e, 0xf4, 0x9b, 0x78, 0x7f, 0x9f, 0xc2, 0x75,
+	0xb5, 0x5f, 0xf1, 0x3b, 0x0c, 0xb4, 0x75, 0x0a, 0xed, 0xeb, 0xb5, 0x5a, 0x0f, 0xb4, 0xca, 0x41,
+	0xec, 0xf6, 0x95, 0xc4, 0xf6, 0xe8, 0xe9, 0xd4, 0x2c, 0x8b, 0x83, 0x57, 0x98, 0x95, 0x57, 0x0f,
+	0xc4, 0xcb, 0xe3, 0xbc, 0x42, 0xd1, 0x2e, 0xa3, 0xcb, 0x7d, 0xeb, 0x46, 0x3a, 0x13, 0x7f, 0x29,
+	0x45, 0x6b, 0xd5, 0x61, 0x16, 0xec, 0x3b, 0x0e, 0xf7, 0x8d, 0x79, 0xee, 0xd4, 0xf2, 0x88, 0x4e,
+	0xfd, 0x9d, 0x04, 0xb3, 0x3d, 0x53, 0x9d, 0xc8, 0x62, 0xfd, 0x46, 0xbf, 0xbe, 0x80, 0xbe, 0x45,
+	0x01, 0x6d, 0x29, 0x77, 0x47, 0x02, 0xb4, 0x66, 0x67, 0xe5, 0x10, 0xbf, 0xfe, 0x4a, 0x82, 0x62,
+	0x62, 0xe0, 0x13, 0x95, 0x87, 0xde, 0x79, 0xb0, 0x2f, 0xb2, 0x2d, 0x8a, 0xec, 0x8e, 0x72, 0x6b,
+	0x34, 0x64, 0x5a, 0x57, 0x02, 0xc1, 0xf4, 0x53, 0x09, 0xc6, 0xc9, 0x90, 0x84, 0xce, 0x89, 0xfa,
+	0x6b, 0x3c, 0x3f, 0x8a, 0x42, 0x3e, 0x39, 0x5b, 0x45, 0x21, 0xaf, 0xd4, 0x46, 0x43, 0xe3, 0xb5,
+	0x2d, 0x8b, 0xc0, 0xd8, 0x85, 0xe9, 0xd4, 0xcc, 0x86, 0x44, 0xcf, 0x6d, 0xc1, 0x5c, 0x2b, 0x2f,
+	0x0d, 0xe5, 0xe3, 0x00, 0x8f, 0x2d, 0x4b, 0x2b, 0x12, 0xc9, 0xfe, 0x99, 0xec, 0x8e, 0x05, 0x5d,
+	0xe9, 0x17, 0x27, 0x3d, 0x7b, 0x98, 0xbe, 0xce, 0x78, 0x44, 0xd5, 0xbf, 0xa7, 0xdc, 0x39, 0x4c,
+	0x98, 0x74, 0xc5, 0x10, 0x53, 0xfc, 0x18, 0x8a, 0x89, 0xd7, 0xbf, 0x28, 0x48, 0x7a, 0x87, 0x03,
+	0x79, 0xc0, 0x33, 0x5b, 0xb9, 0x4e, 0xb1, 0x2d, 0x21, 0x56, 0xb8, 0xa3, 0x66, 0x95, 0xc2, 0x15,
+	0x35, 0x30, 0x92, 0x4b, 0x6f, 0x25, 0x98, 0x4e, 0x3d, 0xef, 0x45, 0xbe, 0x10, 0x4d, 0x1b, 0x22,
+	0x5f, 0x08, 0xe7, 0x04, 0xa5, 0x4c, 0x11, 0x5d, 0x42, 0x4a, 0xff, 0x8a, 0x13, 0x0b, 0xff, 0x42,
+	0x82, 0x13, 0xe9, 0x99, 0x17, 0x2d, 0x1d, 0x70, 0x2a, 0x1e, 0x68, 0x95, 0x6b, 0x14, 0xc3, 0x65,
+	0xf9, 0xa2, 0xb8, 0x9d, 0x25, 0x2c, 0x42, 0x9c, 0xf2, 0x56, 0x82, 0x13, 0xe9, 0x81, 0x58, 0x84,
+	0x42, 0x38, 0x32, 0x0f, 0x44, 0xc1, 0xeb, 0x5d, 0xad, 0x9c, 0xf2, 0x4d, 0x65, 0x18, 0x9c, 0x37,
+	0x12, 0x9c, 0x48, 0xcf, 0x41, 0x22, 0x38, 0xc2, 0x49, 0xa9, 0x6f, 0x08, 0xf3, 0x30, 0x29, 0x1f,
+	0x30, 0x4c, 0x48, 0xe1, 0x20, 0x73, 0x8c, 0xa8, 0x70, 0x24, 0x86, 0x2d, 0x61, 0xaf, 0x4c, 0x8c,
+	0x3f, 0x87, 0x2d, 0x1c, 0x01, 0xc6, 0xad, 0x35, 0xa9, 0xbc, 0xf9, 0x07, 0x09, 0xe6, 0x74, 0xd7,
+	0xee, 0x11, 0xb2, 0x59, 0x64, 0x0b, 0xf8, 0x6d, 0xa2, 0xe4, 0xb6, 0xf4, 0xbd, 0x9b, 0x9c, 0xa1,
+	0xe9, 0x5a, 0x9a, 0xd3, 0xac, 0xb8, 0x7e, 0xb3, 0xda, 0xc4, 0x0e, 0x35, 0x41, 0x95, 0x91, 0x34,
+	0xcf, 0x0c, 0xba, 0xff, 0x8d, 0x73, 0x9b, 0xfd, 0xf5, 0x6f, 0x49, 0xfa, 0x7d, 0xee, 0xd4, 0x03,
+	0x76, 0xf7, 0x9e, 0xe5, 0xb6, 0x0d, 0x32, 0x75, 0xec, 0xb4, 0x1b, 0x95, 0x17, 0xab, 0x7f, 0x8d,
+	0x08, 0x2f, 0x29, 0xe1, 0x25, 0x23, 0xbc, 0x7c, 0xb1, 0xfa, 0xcf, 0xdc, 0x02, 0x23, 0xac, 0xad,
+	0x51, 0xca, 0xda, 0x1a, 0x23, 0xad, 0xad, 0xbd, 0x58, 0x6d, 0x4c, 0x52, 0x99, 0x37, 0xfe, 0x17,
+	0x00, 0x00, 0xff, 0xff, 0x03, 0x5c, 0x45, 0xef, 0x00, 0x24, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -3726,163 +3814,3 @@ var _Subscriber_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/pubsub/v1/pubsub.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/pubsub/v1/pubsub.proto", fileDescriptor_pubsub_790424aa8109440f)
-}
-
-var fileDescriptor_pubsub_790424aa8109440f = []byte{
-	// 2428 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0x4b, 0x73, 0x1b, 0x59,
-	0x15, 0x4e, 0xcb, 0x8f, 0x48, 0x47, 0x76, 0x62, 0xdf, 0xb1, 0x13, 0xb9, 0xf3, 0x72, 0x7a, 0x42,
-	0xec, 0x28, 0x89, 0x64, 0x2b, 0x35, 0x61, 0xe2, 0xe0, 0xa4, 0xec, 0x38, 0x24, 0x21, 0xc9, 0xc4,
-	0xb4, 0x43, 0xa8, 0x82, 0x14, 0xaa, 0x56, 0xf7, 0xb5, 0xdc, 0xa3, 0x7e, 0x4d, 0x77, 0xcb, 0x13,
-	0x0d, 0x84, 0x0a, 0x33, 0x14, 0x55, 0x14, 0x59, 0x00, 0xb3, 0x9d, 0x05, 0x05, 0x3b, 0x16, 0x2c,
-	0x28, 0xd6, 0xb0, 0x67, 0xcb, 0x82, 0x3f, 0xc0, 0x8a, 0xe2, 0x07, 0xc0, 0x82, 0x2a, 0xea, 0x3e,
-	0xba, 0xd5, 0xdd, 0xba, 0x92, 0x2c, 0x9b, 0xec, 0xac, 0x7b, 0xce, 0xed, 0xf3, 0x9d, 0xf7, 0x3d,
-	0xa7, 0x0c, 0xe7, 0x9a, 0xae, 0xdb, 0xb4, 0x70, 0xd5, 0x6b, 0x37, 0x82, 0x76, 0xa3, 0xba, 0xbf,
-	0xca, 0xff, 0xaa, 0x78, 0xbe, 0x1b, 0xba, 0x68, 0x86, 0x91, 0x2b, 0xfc, 0x70, 0x7f, 0x55, 0x3e,
-	0xcb, 0x2f, 0x68, 0x9e, 0x59, 0xd5, 0x1c, 0xc7, 0x0d, 0xb5, 0xd0, 0x74, 0x9d, 0x80, 0xf1, 0xcb,
-	0x0b, 0x09, 0xaa, 0x8f, 0x03, 0xb7, 0xed, 0xeb, 0x98, 0x93, 0xce, 0x47, 0x92, 0xc8, 0xaf, 0x46,
-	0x7b, 0xb7, 0x6a, 0xb4, 0x7d, 0x7a, 0x97, 0xd3, 0xcf, 0x64, 0xe9, 0xd8, 0xf6, 0xc2, 0x0e, 0x27,
-	0x2e, 0x66, 0x89, 0xbb, 0x26, 0xb6, 0x8c, 0xba, 0xad, 0x05, 0x2d, 0xce, 0x71, 0x21, 0xcb, 0x11,
-	0x9a, 0x36, 0x0e, 0x42, 0xcd, 0xf6, 0x18, 0x83, 0xf2, 0x02, 0xe6, 0x9e, 0xe2, 0x20, 0xd0, 0x9a,
-	0x78, 0x27, 0x74, 0x7d, 0xad, 0x89, 0xb7, 0x5d, 0xcb, 0xd4, 0x3b, 0xe8, 0x0e, 0x9c, 0xd1, 0x2c,
-	0xcb, 0xfd, 0x14, 0x1b, 0x75, 0x0f, 0xfb, 0x81, 0x19, 0x84, 0xd8, 0xd1, 0x71, 0xdd, 0xc7, 0x4d,
-	0xa2, 0x57, 0x49, 0x5a, 0x1c, 0x5b, 0x2e, 0xa8, 0x0b, 0x9c, 0x65, 0xbb, 0xcb, 0xa1, 0x32, 0x06,
-	0xe5, 0xcb, 0x1c, 0x4c, 0x3c, 0x77, 0x3d, 0x53, 0x47, 0x08, 0xc6, 0x1d, 0xcd, 0xc6, 0x25, 0x69,
-	0x51, 0x5a, 0x2e, 0xa8, 0xf4, 0x6f, 0x74, 0x1b, 0x26, 0x2d, 0xad, 0x81, 0xad, 0xa0, 0x94, 0x5b,
-	0x1c, 0x5b, 0x2e, 0xd6, 0xde, 0xaf, 0x64, 0x2d, 0x5a, 0xa1, 0x97, 0x2b, 0x4f, 0x28, 0xd7, 0x7d,
-	0x27, 0xf4, 0x3b, 0x2a, 0xbf, 0x82, 0x5e, 0xc2, 0x29, 0x9b, 0x41, 0xae, 0x07, 0x0c, 0x73, 0xdd,
-	0xa3, 0xa0, 0x4b, 0x63, 0x8b, 0xd2, 0x72, 0xb1, 0x76, 0xb9, 0xf7, 0x63, 0x22, 0x15, 0xd5, 0x39,
-	0x5b, 0xa4, 0xf8, 0x22, 0x4c, 0xb5, 0xec, 0xa0, 0xde, 0xc2, 0x9d, 0x3a, 0x85, 0x3d, 0x41, 0x61,
-	0x43, 0xcb, 0x0e, 0x1e, 0xe3, 0xce, 0x47, 0x9a, 0x8d, 0xe5, 0x5b, 0x50, 0x4c, 0xc0, 0x42, 0x33,
-	0x30, 0xd6, 0xc2, 0x1d, 0xae, 0x1e, 0xf9, 0x13, 0xcd, 0xc1, 0xc4, 0xbe, 0x66, 0xb5, 0x71, 0x29,
-	0x47, 0xcf, 0xd8, 0x8f, 0xb5, 0xdc, 0x87, 0x92, 0xf2, 0xa7, 0x1c, 0x4c, 0x6f, 0x53, 0x54, 0x1c,
-	0x11, 0xb1, 0x8e, 0xa1, 0x85, 0x1a, 0xbd, 0x3e, 0xa5, 0xd2, 0xbf, 0xd1, 0x33, 0x00, 0x2d, 0x0c,
-	0x7d, 0xb3, 0xd1, 0x0e, 0x71, 0x64, 0xa1, 0x6a, 0xaf, 0x52, 0xa9, 0x0f, 0x55, 0x36, 0xe2, 0x1b,
-	0xcc, 0x5a, 0x89, 0x4f, 0xa0, 0x73, 0x00, 0x91, 0xc5, 0x4c, 0x83, 0x5a, 0xa9, 0xa0, 0x16, 0xf8,
-	0xc9, 0x23, 0x03, 0xad, 0xc3, 0x94, 0xd7, 0x6e, 0x58, 0x66, 0xb0, 0x57, 0x27, 0xe1, 0x51, 0x1a,
-	0xa7, 0x66, 0x94, 0x63, 0x89, 0x3c, 0x76, 0x2a, 0xcf, 0xa3, 0xd8, 0x51, 0x8b, 0x9c, 0x9f, 0x9c,
-	0xa0, 0x8b, 0x30, 0xe5, 0xfa, 0x06, 0xf6, 0x4d, 0xa7, 0x49, 0xcc, 0xc6, 0x2d, 0x56, 0x8c, 0xce,
-	0x1e, 0xe3, 0x8e, 0xbc, 0x0e, 0x27, 0x33, 0xf8, 0x46, 0x32, 0xdb, 0x12, 0x9c, 0x7c, 0x80, 0x43,
-	0x1a, 0x11, 0x2a, 0xfe, 0xa4, 0x8d, 0x83, 0x90, 0x30, 0x87, 0xe4, 0x37, 0xff, 0x00, 0xfb, 0xa1,
-	0xbc, 0x91, 0x00, 0x7d, 0xc7, 0x33, 0xb4, 0x10, 0xa7, 0x98, 0xaf, 0x27, 0x99, 0x8b, 0xb5, 0xd3,
-	0x7d, 0xa2, 0x8d, 0x7f, 0x05, 0xdd, 0x86, 0x62, 0x9b, 0x7e, 0x84, 0x66, 0x12, 0x85, 0x23, 0x32,
-	0xc7, 0x37, 0x49, 0xb2, 0x3d, 0xd5, 0x82, 0x96, 0x0a, 0x8c, 0x9d, 0xfc, 0xad, 0xe8, 0x70, 0x62,
-	0x9b, 0x19, 0x67, 0x20, 0x54, 0x74, 0x1b, 0xf2, 0xdc, 0x03, 0x91, 0x8b, 0x2f, 0x0c, 0x71, 0xb1,
-	0x1a, 0x5f, 0x50, 0x6a, 0x70, 0x32, 0x16, 0x12, 0x78, 0xae, 0x13, 0x60, 0x74, 0x01, 0x8a, 0x5d,
-	0x1f, 0x47, 0x09, 0x0a, 0xb1, 0x93, 0x03, 0xc5, 0x84, 0xd9, 0x27, 0x66, 0xc0, 0xac, 0x18, 0x44,
-	0xd8, 0x4a, 0x70, 0xdc, 0xf3, 0xdd, 0x8f, 0xb1, 0x1e, 0x72, 0x74, 0xd1, 0x4f, 0x74, 0x06, 0x0a,
-	0x1e, 0x4d, 0x31, 0xf3, 0x33, 0xe6, 0x91, 0x09, 0x35, 0x4f, 0x0e, 0x76, 0xcc, 0xcf, 0x30, 0x09,
-	0x28, 0x4a, 0x0c, 0xdd, 0x16, 0x76, 0xa2, 0x80, 0x22, 0x27, 0xcf, 0xc9, 0x81, 0x62, 0x03, 0x4a,
-	0x8a, 0xe2, 0x08, 0xab, 0x30, 0x49, 0x55, 0x67, 0xe0, 0x06, 0xb8, 0x81, 0xb3, 0xa1, 0xcb, 0x70,
-	0xd2, 0xc1, 0xaf, 0xc2, 0x7a, 0x42, 0x14, 0x0b, 0x8d, 0x69, 0x72, 0xbc, 0x1d, 0x8b, 0xfb, 0x04,
-	0xce, 0xc5, 0xe2, 0x76, 0xda, 0x8d, 0x40, 0xf7, 0x4d, 0x8f, 0x96, 0xdf, 0xc1, 0x1e, 0x38, 0x8a,
-	0x86, 0x0e, 0x9c, 0xef, 0x27, 0x92, 0x6b, 0x7b, 0x09, 0xa6, 0x83, 0x24, 0x81, 0x7b, 0x24, 0x7d,
-	0x78, 0x60, 0x15, 0x6d, 0x58, 0xe8, 0xca, 0x73, 0x34, 0x2f, 0xd8, 0x73, 0xc3, 0x77, 0xa8, 0x5e,
-	0x03, 0x64, 0x91, 0x38, 0xae, 0xda, 0x59, 0x28, 0x04, 0xd1, 0x21, 0x57, 0xab, 0x7b, 0x70, 0x60,
-	0x95, 0xca, 0x80, 0xb6, 0xb0, 0x85, 0x33, 0xa9, 0x2a, 0xce, 0xeb, 0x3f, 0x8f, 0xc3, 0x54, 0xd2,
-	0xcc, 0xc2, 0xa6, 0x12, 0x5f, 0xcd, 0x25, 0xcd, 0xb0, 0x0e, 0x45, 0xaf, 0x1d, 0xec, 0xd5, 0x75,
-	0xd7, 0xd9, 0x35, 0x9b, 0xbc, 0xb6, 0x9d, 0x15, 0xa5, 0x5a, 0xb0, 0x77, 0x8f, 0xf2, 0xa8, 0xe0,
-	0xc5, 0x7f, 0xa3, 0x15, 0x98, 0xd3, 0xf4, 0x56, 0xdd, 0xc0, 0x9a, 0x61, 0x99, 0x0e, 0xae, 0x07,
-	0x58, 0x77, 0x1d, 0x23, 0xa0, 0x45, 0x6e, 0x42, 0x45, 0x9a, 0xde, 0xda, 0xe2, 0xa4, 0x1d, 0x46,
-	0x41, 0x35, 0x98, 0xf7, 0x71, 0xa8, 0x99, 0x4e, 0x5d, 0xd3, 0x5b, 0xd8, 0xa8, 0xc7, 0x59, 0x7e,
-	0x7c, 0x51, 0x5a, 0xce, 0xab, 0xef, 0x31, 0xe2, 0x06, 0xa1, 0xf1, 0xc4, 0x0e, 0xd0, 0x77, 0x41,
-	0x8e, 0x92, 0xd7, 0xc7, 0x21, 0x76, 0x88, 0x8e, 0xf5, 0xe8, 0x25, 0x50, 0xca, 0x53, 0xcc, 0x0b,
-	0x3d, 0x05, 0x68, 0x8b, 0x33, 0xa8, 0x25, 0x7e, 0x59, 0x8d, 0xee, 0x46, 0x14, 0xb4, 0x19, 0x37,
-	0xda, 0x02, 0xcd, 0xb9, 0x72, 0xaf, 0xe2, 0x49, 0xbb, 0x0a, 0xfb, 0xed, 0x4d, 0x38, 0x8d, 0x1d,
-	0xad, 0x61, 0xe1, 0x48, 0x95, 0x7a, 0x54, 0xda, 0x4b, 0x40, 0x55, 0x9a, 0x67, 0x64, 0xae, 0xcd,
-	0x33, 0x4e, 0x44, 0xcf, 0x60, 0x16, 0xbf, 0xf2, 0x4c, 0x86, 0x24, 0x6a, 0xd1, 0x45, 0xaa, 0x8b,
-	0xd2, 0x0b, 0xe3, 0x7e, 0xcc, 0xca, 0xdb, 0xf3, 0x0c, 0xce, 0x9c, 0x1c, 0xa5, 0xf1, 0xde, 0x85,
-	0x99, 0xac, 0x00, 0x74, 0x15, 0xc6, 0xc2, 0xd0, 0xe2, 0x3d, 0x61, 0x80, 0x75, 0x09, 0x97, 0xf2,
-	0xdf, 0x1c, 0x40, 0x37, 0x44, 0xd0, 0xfb, 0x30, 0x4d, 0xa3, 0x0a, 0x3b, 0x86, 0xe7, 0x9a, 0x4e,
-	0x54, 0x3d, 0xa7, 0xc8, 0xe1, 0x7d, 0x7e, 0x86, 0x9e, 0x08, 0xfa, 0xf8, 0xb5, 0x41, 0x91, 0x37,
-	0xb0, 0x89, 0x3f, 0x00, 0x70, 0x4d, 0x43, 0x4f, 0xa4, 0xac, 0xf0, 0xa9, 0x93, 0xf8, 0xda, 0x33,
-	0xd3, 0xd0, 0x69, 0xae, 0x3d, 0x3c, 0xa6, 0x16, 0xdc, 0xe8, 0x87, 0xfc, 0x7d, 0x28, 0xc4, 0x14,
-	0x12, 0xad, 0x01, 0xf6, 0xf7, 0x4d, 0x1d, 0xd7, 0x35, 0x5d, 0x77, 0xdb, 0x4e, 0x58, 0xc7, 0xb6,
-	0x66, 0x5a, 0x5c, 0xa1, 0xf7, 0x38, 0x71, 0x83, 0xd1, 0xee, 0x13, 0x12, 0x92, 0x21, 0xaf, 0xb5,
-	0x0d, 0x93, 0x3c, 0xf7, 0xb8, 0xa5, 0xe3, 0xdf, 0x47, 0xec, 0xf4, 0x9b, 0xa7, 0x61, 0x5e, 0x6b,
-	0x87, 0x7b, 0x24, 0x8a, 0x75, 0x16, 0x37, 0x36, 0x0e, 0xf7, 0x5c, 0x43, 0xd1, 0xe1, 0xa4, 0x8a,
-	0x75, 0x6c, 0xee, 0xc7, 0x59, 0x83, 0xe6, 0x61, 0x92, 0xa4, 0xa6, 0x69, 0x44, 0xb5, 0x42, 0xd3,
-	0x5b, 0x8f, 0x0c, 0x74, 0x0b, 0x8e, 0xf3, 0x38, 0xe5, 0x9d, 0x7b, 0x68, 0x5f, 0x8d, 0xf8, 0x95,
-	0x6f, 0xc0, 0xa9, 0x07, 0x38, 0x4c, 0x26, 0x44, 0x54, 0x96, 0x14, 0x98, 0x4a, 0x16, 0xee, 0xc8,
-	0xdd, 0xc9, 0x33, 0xe5, 0x2b, 0x09, 0x16, 0xd8, 0xe3, 0x43, 0xf4, 0x85, 0x4d, 0xc1, 0x17, 0x8a,
-	0xb5, 0xf3, 0x83, 0xf3, 0x31, 0x2d, 0xe1, 0x68, 0x0f, 0x13, 0x0f, 0x4a, 0xa4, 0xa6, 0x0b, 0x1b,
-	0xe4, 0xbb, 0x79, 0x06, 0xfc, 0x5c, 0x62, 0x5d, 0x4b, 0xdc, 0x20, 0xb7, 0x44, 0x0d, 0x72, 0xb8,
-	0x45, 0x0e, 0xd9, 0x40, 0xef, 0xc2, 0x02, 0xeb, 0x36, 0x87, 0xf5, 0xee, 0x8f, 0xe0, 0xf4, 0x53,
-	0xd7, 0x30, 0x77, 0x3b, 0x89, 0x46, 0x71, 0xf0, 0xeb, 0xd9, 0x36, 0x94, 0x1b, 0xad, 0x0d, 0x29,
-	0x5f, 0x48, 0x50, 0xdc, 0x6e, 0x5b, 0xd6, 0x28, 0x22, 0xaf, 0x03, 0xf2, 0x71, 0xd8, 0xf6, 0x9d,
-	0xba, 0x69, 0xdb, 0xd8, 0x30, 0xb5, 0x10, 0x5b, 0x1d, 0x2a, 0x39, 0xaf, 0xce, 0x32, 0xca, 0xa3,
-	0x2e, 0x81, 0x3c, 0xe3, 0x6d, 0xed, 0x55, 0xb7, 0x5d, 0x8d, 0x51, 0x67, 0x17, 0x6d, 0xed, 0x55,
-	0xd4, 0xa6, 0x94, 0x1f, 0xc0, 0x14, 0x03, 0xc1, 0x5d, 0xf8, 0x11, 0xcc, 0xfa, 0x3c, 0x29, 0xbb,
-	0xf7, 0x98, 0x1b, 0x2f, 0xf6, 0xaa, 0x96, 0xc9, 0x5f, 0x75, 0xc6, 0x4f, 0x1f, 0x04, 0x24, 0x60,
-	0x4a, 0xcc, 0xc8, 0x1b, 0xdd, 0xbe, 0x3a, 0x8a, 0xca, 0xa7, 0xe1, 0x38, 0x2b, 0x09, 0x41, 0x69,
-	0x9c, 0xbe, 0x4b, 0x26, 0x69, 0x4d, 0x08, 0xfa, 0xb6, 0xf1, 0xb1, 0x7e, 0x6d, 0x5c, 0xf9, 0x36,
-	0xa0, 0x0d, 0xbd, 0xe5, 0xb8, 0x9f, 0x5a, 0xd8, 0x68, 0x1e, 0x16, 0x44, 0x2e, 0x09, 0x42, 0xf9,
-	0x49, 0x0e, 0xe6, 0x76, 0x42, 0x1f, 0x6b, 0xb6, 0xe9, 0x34, 0x47, 0xf5, 0x66, 0xbf, 0xaf, 0x92,
-	0xf6, 0x6c, 0x53, 0x9b, 0x89, 0xb4, 0x1b, 0x5b, 0x9e, 0x50, 0xe7, 0x19, 0x39, 0xfb, 0x4e, 0xf9,
-	0xa0, 0xf7, 0x5e, 0xda, 0x76, 0x73, 0xe9, 0x7b, 0x1b, 0x4c, 0xdc, 0x3a, 0x9c, 0x09, 0xa8, 0x0e,
-	0xf5, 0x01, 0xef, 0xa2, 0x12, 0x63, 0xd9, 0xe8, 0x35, 0x6b, 0x13, 0xe6, 0x33, 0x26, 0x78, 0x47,
-	0xb1, 0xf4, 0x77, 0x09, 0xe6, 0xef, 0xf9, 0x98, 0x54, 0x63, 0xfe, 0x34, 0x8d, 0xac, 0x2d, 0x7a,
-	0x3b, 0x66, 0x3d, 0x90, 0x13, 0x78, 0xe0, 0x71, 0xfc, 0x96, 0x1a, 0xa3, 0xb0, 0x6e, 0xf4, 0xc2,
-	0x12, 0x0a, 0x14, 0x3d, 0xaa, 0x8e, 0xf2, 0x96, 0x79, 0x2b, 0xc1, 0x3c, 0xef, 0x33, 0x19, 0xcd,
-	0x6e, 0x42, 0x3e, 0x7a, 0x87, 0xf3, 0xfe, 0x22, 0x0b, 0xaa, 0x69, 0x74, 0x29, 0xe6, 0x3d, 0x5a,
-	0x5f, 0xf9, 0x97, 0x04, 0xf9, 0xe8, 0x9b, 0x23, 0xbc, 0xcb, 0x6f, 0x43, 0x91, 0x3e, 0xf0, 0x30,
-	0xdb, 0x39, 0x8c, 0x0d, 0xdd, 0x39, 0x00, 0x63, 0xa7, 0x2b, 0x87, 0x3b, 0xb1, 0x2b, 0xc6, 0xa9,
-	0x2b, 0x2e, 0xf7, 0x57, 0xf3, 0xff, 0x6d, 0xfd, 0x15, 0x40, 0xe4, 0x8d, 0x90, 0xb1, 0xbc, 0x9c,
-	0xb1, 0x7c, 0xa1, 0x6b, 0x5d, 0xc5, 0x82, 0x39, 0xda, 0x05, 0xb3, 0x63, 0xdb, 0xbb, 0x69, 0xba,
-	0x1d, 0x98, 0xcf, 0x48, 0xe3, 0x09, 0xf6, 0x61, 0x76, 0x6a, 0x1b, 0x1c, 0x1d, 0x87, 0x98, 0xe8,
-	0x6e, 0xc0, 0x3c, 0xef, 0xb1, 0x23, 0x58, 0xe7, 0x17, 0x12, 0x14, 0x77, 0x30, 0x6e, 0x8d, 0x52,
-	0x0b, 0x57, 0x60, 0x9c, 0x06, 0x4d, 0x6e, 0x58, 0xd0, 0x3c, 0x3c, 0xa6, 0x52, 0x4e, 0x74, 0x36,
-	0x81, 0x80, 0x9a, 0xec, 0xe1, 0xb1, 0x2e, 0x86, 0xcd, 0x3c, 0x4c, 0x86, 0x9a, 0xdf, 0xc4, 0xa1,
-	0x72, 0x02, 0xa6, 0x18, 0x18, 0x66, 0xb4, 0xda, 0x5f, 0xf2, 0x50, 0xe0, 0x9b, 0x16, 0xec, 0xa3,
-	0x8f, 0xa1, 0xc8, 0x32, 0x9c, 0x6d, 0x36, 0xfb, 0x2d, 0x30, 0xe4, 0x7e, 0x04, 0xe5, 0xca, 0xe7,
-	0x7f, 0xfb, 0xc7, 0x97, 0xb9, 0xf7, 0xe5, 0xf3, 0xd5, 0xfd, 0xd5, 0xea, 0x0f, 0x49, 0x76, 0xac,
-	0x73, 0x9f, 0x07, 0xd5, 0x72, 0x95, 0xad, 0x3d, 0xaa, 0xe5, 0xd7, 0x6b, 0x52, 0x19, 0xbd, 0x86,
-	0x62, 0x62, 0x93, 0x85, 0x2e, 0xf5, 0x7e, 0xb2, 0x77, 0xd1, 0xd5, 0x5f, 0x70, 0x95, 0x0a, 0xbe,
-	0x52, 0xbb, 0x44, 0x05, 0x53, 0x41, 0x95, 0x81, 0xe2, 0x3f, 0x97, 0xe0, 0x38, 0x57, 0x1c, 0x2d,
-	0x0a, 0x1f, 0xd0, 0x89, 0x15, 0x97, 0x7c, 0x71, 0x00, 0x07, 0xb3, 0xa4, 0x52, 0xa3, 0x08, 0xae,
-	0x29, 0x4b, 0x5d, 0x04, 0x62, 0xe1, 0x7c, 0xb5, 0x48, 0x40, 0xb8, 0x90, 0x8f, 0xf6, 0x7e, 0x48,
-	0x20, 0x22, 0xb3, 0x13, 0xec, 0xaf, 0xfd, 0x12, 0x95, 0x7d, 0x11, 0x5d, 0x18, 0x22, 0x1b, 0xbd,
-	0x91, 0x00, 0xba, 0x9b, 0x2b, 0x24, 0x58, 0x4b, 0xf7, 0xac, 0xd0, 0xe4, 0x4b, 0x83, 0x99, 0xb8,
-	0xfa, 0x69, 0x08, 0x5c, 0x78, 0x02, 0xc4, 0x6b, 0x8e, 0x02, 0xfd, 0x51, 0x82, 0x53, 0xe2, 0xd5,
-	0x12, 0xaa, 0x0e, 0x90, 0x24, 0x7a, 0xd6, 0xcb, 0x2b, 0x07, 0xbf, 0xc0, 0x61, 0x7e, 0x40, 0x61,
-	0x56, 0xd1, 0xf5, 0x21, 0x96, 0xaa, 0xa6, 0x5f, 0xe1, 0xbf, 0x95, 0x12, 0x1b, 0xbf, 0xb8, 0xf4,
-	0xa0, 0xab, 0x83, 0xe4, 0x67, 0xca, 0xa1, 0x7c, 0xed, 0x60, 0xcc, 0x1c, 0xe8, 0x2a, 0x05, 0x7a,
-	0x15, 0x5d, 0x19, 0x0a, 0x34, 0x46, 0x13, 0x42, 0x31, 0xb1, 0x70, 0x12, 0x65, 0x54, 0xef, 0x3e,
-	0x4a, 0x3e, 0xd5, 0x53, 0x5c, 0xee, 0xdb, 0x5e, 0xd8, 0x89, 0xfc, 0x59, 0x1e, 0x16, 0x52, 0xb5,
-	0xff, 0xcc, 0x02, 0x70, 0x5b, 0x37, 0xb0, 0x8f, 0x7e, 0x26, 0x01, 0xe2, 0xaf, 0x84, 0x64, 0x45,
-	0x1b, 0x32, 0xf5, 0xc8, 0x43, 0xe8, 0xca, 0x0a, 0x85, 0x53, 0x96, 0xbf, 0x26, 0x2c, 0x2c, 0x29,
-	0x67, 0xf1, 0x04, 0xff, 0xb5, 0x44, 0x97, 0xea, 0x29, 0x14, 0xcb, 0xc2, 0x1c, 0x13, 0x4c, 0x4c,
-	0x43, 0xf1, 0xa4, 0xe3, 0x28, 0x29, 0x7f, 0x10, 0x2e, 0xf4, 0x9b, 0x78, 0x7f, 0x9f, 0xc2, 0x75,
-	0xb5, 0x5f, 0xf1, 0x3b, 0x0c, 0xb4, 0x75, 0x0a, 0xed, 0xeb, 0xb5, 0x5a, 0x0f, 0xb4, 0xca, 0x41,
-	0xec, 0xf6, 0x95, 0xc4, 0xf6, 0xe8, 0xe9, 0xd4, 0x2c, 0x8b, 0x83, 0x57, 0x98, 0x95, 0x57, 0x0f,
-	0xc4, 0xcb, 0xe3, 0xbc, 0x42, 0xd1, 0x2e, 0xa3, 0xcb, 0x7d, 0xeb, 0x46, 0x3a, 0x13, 0x7f, 0x29,
-	0x45, 0x6b, 0xd5, 0x61, 0x16, 0xec, 0x3b, 0x0e, 0xf7, 0x8d, 0x79, 0xee, 0xd4, 0xf2, 0x88, 0x4e,
-	0xfd, 0x9d, 0x04, 0xb3, 0x3d, 0x53, 0x9d, 0xc8, 0x62, 0xfd, 0x46, 0xbf, 0xbe, 0x80, 0xbe, 0x45,
-	0x01, 0x6d, 0x29, 0x77, 0x47, 0x02, 0xb4, 0x66, 0x67, 0xe5, 0x10, 0xbf, 0xfe, 0x4a, 0x82, 0x62,
-	0x62, 0xe0, 0x13, 0x95, 0x87, 0xde, 0x79, 0xb0, 0x2f, 0xb2, 0x2d, 0x8a, 0xec, 0x8e, 0x72, 0x6b,
-	0x34, 0x64, 0x5a, 0x57, 0x02, 0xc1, 0xf4, 0x53, 0x09, 0xc6, 0xc9, 0x90, 0x84, 0xce, 0x89, 0xfa,
-	0x6b, 0x3c, 0x3f, 0x8a, 0x42, 0x3e, 0x39, 0x5b, 0x45, 0x21, 0xaf, 0xd4, 0x46, 0x43, 0xe3, 0xb5,
-	0x2d, 0x8b, 0xc0, 0xd8, 0x85, 0xe9, 0xd4, 0xcc, 0x86, 0x44, 0xcf, 0x6d, 0xc1, 0x5c, 0x2b, 0x2f,
-	0x0d, 0xe5, 0xe3, 0x00, 0x8f, 0x2d, 0x4b, 0x2b, 0x12, 0xc9, 0xfe, 0x99, 0xec, 0x8e, 0x05, 0x5d,
-	0xe9, 0x17, 0x27, 0x3d, 0x7b, 0x98, 0xbe, 0xce, 0x78, 0x44, 0xd5, 0xbf, 0xa7, 0xdc, 0x39, 0x4c,
-	0x98, 0x74, 0xc5, 0x10, 0x53, 0xfc, 0x18, 0x8a, 0x89, 0xd7, 0xbf, 0x28, 0x48, 0x7a, 0x87, 0x03,
-	0x79, 0xc0, 0x33, 0x5b, 0xb9, 0x4e, 0xb1, 0x2d, 0x21, 0x56, 0xb8, 0xa3, 0x66, 0x95, 0xc2, 0x15,
-	0x35, 0x30, 0x92, 0x4b, 0x6f, 0x25, 0x98, 0x4e, 0x3d, 0xef, 0x45, 0xbe, 0x10, 0x4d, 0x1b, 0x22,
-	0x5f, 0x08, 0xe7, 0x04, 0xa5, 0x4c, 0x11, 0x5d, 0x42, 0x4a, 0xff, 0x8a, 0x13, 0x0b, 0xff, 0x42,
-	0x82, 0x13, 0xe9, 0x99, 0x17, 0x2d, 0x1d, 0x70, 0x2a, 0x1e, 0x68, 0x95, 0x6b, 0x14, 0xc3, 0x65,
-	0xf9, 0xa2, 0xb8, 0x9d, 0x25, 0x2c, 0x42, 0x9c, 0xf2, 0x56, 0x82, 0x13, 0xe9, 0x81, 0x58, 0x84,
-	0x42, 0x38, 0x32, 0x0f, 0x44, 0xc1, 0xeb, 0x5d, 0xad, 0x9c, 0xf2, 0x4d, 0x65, 0x18, 0x9c, 0x37,
-	0x12, 0x9c, 0x48, 0xcf, 0x41, 0x22, 0x38, 0xc2, 0x49, 0xa9, 0x6f, 0x08, 0xf3, 0x30, 0x29, 0x1f,
-	0x30, 0x4c, 0x48, 0xe1, 0x20, 0x73, 0x8c, 0xa8, 0x70, 0x24, 0x86, 0x2d, 0x61, 0xaf, 0x4c, 0x8c,
-	0x3f, 0x87, 0x2d, 0x1c, 0x01, 0xc6, 0xad, 0x35, 0xa9, 0xbc, 0xf9, 0x07, 0x09, 0xe6, 0x74, 0xd7,
-	0xee, 0x11, 0xb2, 0x59, 0x64, 0x0b, 0xf8, 0x6d, 0xa2, 0xe4, 0xb6, 0xf4, 0xbd, 0x9b, 0x9c, 0xa1,
-	0xe9, 0x5a, 0x9a, 0xd3, 0xac, 0xb8, 0x7e, 0xb3, 0xda, 0xc4, 0x0e, 0x35, 0x41, 0x95, 0x91, 0x34,
-	0xcf, 0x0c, 0xba, 0xff, 0x8d, 0x73, 0x9b, 0xfd, 0xf5, 0x6f, 0x49, 0xfa, 0x7d, 0xee, 0xd4, 0x03,
-	0x76, 0xf7, 0x9e, 0xe5, 0xb6, 0x0d, 0x32, 0x75, 0xec, 0xb4, 0x1b, 0x95, 0x17, 0xab, 0x7f, 0x8d,
-	0x08, 0x2f, 0x29, 0xe1, 0x25, 0x23, 0xbc, 0x7c, 0xb1, 0xfa, 0xcf, 0xdc, 0x02, 0x23, 0xac, 0xad,
-	0x51, 0xca, 0xda, 0x1a, 0x23, 0xad, 0xad, 0xbd, 0x58, 0x6d, 0x4c, 0x52, 0x99, 0x37, 0xfe, 0x17,
-	0x00, 0x00, 0xff, 0xff, 0x03, 0x5c, 0x45, 0xef, 0x00, 0x24, 0x00, 0x00,
-}
diff --git a/googleapis/pubsub/v1beta2/pubsub.pb.go b/googleapis/pubsub/v1beta2/pubsub.pb.go
index f0dd7af18d..7d0e7f4b89 100644
--- a/googleapis/pubsub/v1beta2/pubsub.pb.go
+++ b/googleapis/pubsub/v1beta2/pubsub.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/pubsub/v1beta2/pubsub.proto
 
-package pubsub // import "google.golang.org/genproto/googleapis/pubsub/v1beta2"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
+package pubsub
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
 )
 
@@ -22,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A topic resource.
 type Topic struct {
@@ -37,16 +37,17 @@ func (m *Topic) Reset()         { *m = Topic{} }
 func (m *Topic) String() string { return proto.CompactTextString(m) }
 func (*Topic) ProtoMessage()    {}
 func (*Topic) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{0}
+	return fileDescriptor_2b98a574e1e7c287, []int{0}
 }
+
 func (m *Topic) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Topic.Unmarshal(m, b)
 }
 func (m *Topic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Topic.Marshal(b, m, deterministic)
 }
-func (dst *Topic) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Topic.Merge(dst, src)
+func (m *Topic) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Topic.Merge(m, src)
 }
 func (m *Topic) XXX_Size() int {
 	return xxx_messageInfo_Topic.Size(m)
@@ -85,16 +86,17 @@ func (m *PubsubMessage) Reset()         { *m = PubsubMessage{} }
 func (m *PubsubMessage) String() string { return proto.CompactTextString(m) }
 func (*PubsubMessage) ProtoMessage()    {}
 func (*PubsubMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{1}
+	return fileDescriptor_2b98a574e1e7c287, []int{1}
 }
+
 func (m *PubsubMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PubsubMessage.Unmarshal(m, b)
 }
 func (m *PubsubMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PubsubMessage.Marshal(b, m, deterministic)
 }
-func (dst *PubsubMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PubsubMessage.Merge(dst, src)
+func (m *PubsubMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PubsubMessage.Merge(m, src)
 }
 func (m *PubsubMessage) XXX_Size() int {
 	return xxx_messageInfo_PubsubMessage.Size(m)
@@ -139,16 +141,17 @@ func (m *GetTopicRequest) Reset()         { *m = GetTopicRequest{} }
 func (m *GetTopicRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTopicRequest) ProtoMessage()    {}
 func (*GetTopicRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{2}
+	return fileDescriptor_2b98a574e1e7c287, []int{2}
 }
+
 func (m *GetTopicRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTopicRequest.Unmarshal(m, b)
 }
 func (m *GetTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTopicRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTopicRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTopicRequest.Merge(dst, src)
+func (m *GetTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopicRequest.Merge(m, src)
 }
 func (m *GetTopicRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTopicRequest.Size(m)
@@ -181,16 +184,17 @@ func (m *PublishRequest) Reset()         { *m = PublishRequest{} }
 func (m *PublishRequest) String() string { return proto.CompactTextString(m) }
 func (*PublishRequest) ProtoMessage()    {}
 func (*PublishRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{3}
+	return fileDescriptor_2b98a574e1e7c287, []int{3}
 }
+
 func (m *PublishRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublishRequest.Unmarshal(m, b)
 }
 func (m *PublishRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublishRequest.Marshal(b, m, deterministic)
 }
-func (dst *PublishRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublishRequest.Merge(dst, src)
+func (m *PublishRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishRequest.Merge(m, src)
 }
 func (m *PublishRequest) XXX_Size() int {
 	return xxx_messageInfo_PublishRequest.Size(m)
@@ -230,16 +234,17 @@ func (m *PublishResponse) Reset()         { *m = PublishResponse{} }
 func (m *PublishResponse) String() string { return proto.CompactTextString(m) }
 func (*PublishResponse) ProtoMessage()    {}
 func (*PublishResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{4}
+	return fileDescriptor_2b98a574e1e7c287, []int{4}
 }
+
 func (m *PublishResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublishResponse.Unmarshal(m, b)
 }
 func (m *PublishResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PublishResponse.Marshal(b, m, deterministic)
 }
-func (dst *PublishResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PublishResponse.Merge(dst, src)
+func (m *PublishResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishResponse.Merge(m, src)
 }
 func (m *PublishResponse) XXX_Size() int {
 	return xxx_messageInfo_PublishResponse.Size(m)
@@ -276,16 +281,17 @@ func (m *ListTopicsRequest) Reset()         { *m = ListTopicsRequest{} }
 func (m *ListTopicsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTopicsRequest) ProtoMessage()    {}
 func (*ListTopicsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{5}
+	return fileDescriptor_2b98a574e1e7c287, []int{5}
 }
+
 func (m *ListTopicsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicsRequest.Unmarshal(m, b)
 }
 func (m *ListTopicsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicsRequest.Merge(dst, src)
+func (m *ListTopicsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsRequest.Merge(m, src)
 }
 func (m *ListTopicsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTopicsRequest.Size(m)
@@ -333,16 +339,17 @@ func (m *ListTopicsResponse) Reset()         { *m = ListTopicsResponse{} }
 func (m *ListTopicsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTopicsResponse) ProtoMessage()    {}
 func (*ListTopicsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{6}
+	return fileDescriptor_2b98a574e1e7c287, []int{6}
 }
+
 func (m *ListTopicsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicsResponse.Unmarshal(m, b)
 }
 func (m *ListTopicsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicsResponse.Merge(dst, src)
+func (m *ListTopicsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsResponse.Merge(m, src)
 }
 func (m *ListTopicsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTopicsResponse.Size(m)
@@ -386,16 +393,17 @@ func (m *ListTopicSubscriptionsRequest) Reset()         { *m = ListTopicSubscrip
 func (m *ListTopicSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTopicSubscriptionsRequest) ProtoMessage()    {}
 func (*ListTopicSubscriptionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{7}
+	return fileDescriptor_2b98a574e1e7c287, []int{7}
 }
+
 func (m *ListTopicSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicSubscriptionsRequest.Unmarshal(m, b)
 }
 func (m *ListTopicSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicSubscriptionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicSubscriptionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicSubscriptionsRequest.Merge(dst, src)
+func (m *ListTopicSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsRequest.Merge(m, src)
 }
 func (m *ListTopicSubscriptionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTopicSubscriptionsRequest.Size(m)
@@ -444,16 +452,17 @@ func (m *ListTopicSubscriptionsResponse) Reset()         { *m = ListTopicSubscri
 func (m *ListTopicSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTopicSubscriptionsResponse) ProtoMessage()    {}
 func (*ListTopicSubscriptionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{8}
+	return fileDescriptor_2b98a574e1e7c287, []int{8}
 }
+
 func (m *ListTopicSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTopicSubscriptionsResponse.Unmarshal(m, b)
 }
 func (m *ListTopicSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTopicSubscriptionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTopicSubscriptionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTopicSubscriptionsResponse.Merge(dst, src)
+func (m *ListTopicSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsResponse.Merge(m, src)
 }
 func (m *ListTopicSubscriptionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTopicSubscriptionsResponse.Size(m)
@@ -491,16 +500,17 @@ func (m *DeleteTopicRequest) Reset()         { *m = DeleteTopicRequest{} }
 func (m *DeleteTopicRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteTopicRequest) ProtoMessage()    {}
 func (*DeleteTopicRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{9}
+	return fileDescriptor_2b98a574e1e7c287, []int{9}
 }
+
 func (m *DeleteTopicRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteTopicRequest.Unmarshal(m, b)
 }
 func (m *DeleteTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteTopicRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteTopicRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteTopicRequest.Merge(dst, src)
+func (m *DeleteTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTopicRequest.Merge(m, src)
 }
 func (m *DeleteTopicRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteTopicRequest.Size(m)
@@ -555,16 +565,17 @@ func (m *Subscription) Reset()         { *m = Subscription{} }
 func (m *Subscription) String() string { return proto.CompactTextString(m) }
 func (*Subscription) ProtoMessage()    {}
 func (*Subscription) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{10}
+	return fileDescriptor_2b98a574e1e7c287, []int{10}
 }
+
 func (m *Subscription) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Subscription.Unmarshal(m, b)
 }
 func (m *Subscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Subscription.Marshal(b, m, deterministic)
 }
-func (dst *Subscription) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Subscription.Merge(dst, src)
+func (m *Subscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Subscription.Merge(m, src)
 }
 func (m *Subscription) XXX_Size() int {
 	return xxx_messageInfo_Subscription.Size(m)
@@ -641,16 +652,17 @@ func (m *PushConfig) Reset()         { *m = PushConfig{} }
 func (m *PushConfig) String() string { return proto.CompactTextString(m) }
 func (*PushConfig) ProtoMessage()    {}
 func (*PushConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{11}
+	return fileDescriptor_2b98a574e1e7c287, []int{11}
 }
+
 func (m *PushConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PushConfig.Unmarshal(m, b)
 }
 func (m *PushConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PushConfig.Marshal(b, m, deterministic)
 }
-func (dst *PushConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PushConfig.Merge(dst, src)
+func (m *PushConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PushConfig.Merge(m, src)
 }
 func (m *PushConfig) XXX_Size() int {
 	return xxx_messageInfo_PushConfig.Size(m)
@@ -690,16 +702,17 @@ func (m *ReceivedMessage) Reset()         { *m = ReceivedMessage{} }
 func (m *ReceivedMessage) String() string { return proto.CompactTextString(m) }
 func (*ReceivedMessage) ProtoMessage()    {}
 func (*ReceivedMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{12}
+	return fileDescriptor_2b98a574e1e7c287, []int{12}
 }
+
 func (m *ReceivedMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceivedMessage.Unmarshal(m, b)
 }
 func (m *ReceivedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceivedMessage.Marshal(b, m, deterministic)
 }
-func (dst *ReceivedMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceivedMessage.Merge(dst, src)
+func (m *ReceivedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceivedMessage.Merge(m, src)
 }
 func (m *ReceivedMessage) XXX_Size() int {
 	return xxx_messageInfo_ReceivedMessage.Size(m)
@@ -737,16 +750,17 @@ func (m *GetSubscriptionRequest) Reset()         { *m = GetSubscriptionRequest{}
 func (m *GetSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSubscriptionRequest) ProtoMessage()    {}
 func (*GetSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{13}
+	return fileDescriptor_2b98a574e1e7c287, []int{13}
 }
+
 func (m *GetSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *GetSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSubscriptionRequest.Merge(dst, src)
+func (m *GetSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSubscriptionRequest.Merge(m, src)
 }
 func (m *GetSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSubscriptionRequest.Size(m)
@@ -783,16 +797,17 @@ func (m *ListSubscriptionsRequest) Reset()         { *m = ListSubscriptionsReque
 func (m *ListSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSubscriptionsRequest) ProtoMessage()    {}
 func (*ListSubscriptionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{14}
+	return fileDescriptor_2b98a574e1e7c287, []int{14}
 }
+
 func (m *ListSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSubscriptionsRequest.Unmarshal(m, b)
 }
 func (m *ListSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSubscriptionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSubscriptionsRequest.Merge(dst, src)
+func (m *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsRequest.Merge(m, src)
 }
 func (m *ListSubscriptionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSubscriptionsRequest.Size(m)
@@ -841,16 +856,17 @@ func (m *ListSubscriptionsResponse) Reset()         { *m = ListSubscriptionsResp
 func (m *ListSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSubscriptionsResponse) ProtoMessage()    {}
 func (*ListSubscriptionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{15}
+	return fileDescriptor_2b98a574e1e7c287, []int{15}
 }
+
 func (m *ListSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSubscriptionsResponse.Unmarshal(m, b)
 }
 func (m *ListSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSubscriptionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSubscriptionsResponse.Merge(dst, src)
+func (m *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsResponse.Merge(m, src)
 }
 func (m *ListSubscriptionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSubscriptionsResponse.Size(m)
@@ -888,16 +904,17 @@ func (m *DeleteSubscriptionRequest) Reset()         { *m = DeleteSubscriptionReq
 func (m *DeleteSubscriptionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSubscriptionRequest) ProtoMessage()    {}
 func (*DeleteSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{16}
+	return fileDescriptor_2b98a574e1e7c287, []int{16}
 }
+
 func (m *DeleteSubscriptionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Unmarshal(m, b)
 }
 func (m *DeleteSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSubscriptionRequest.Merge(dst, src)
+func (m *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSubscriptionRequest.Merge(m, src)
 }
 func (m *DeleteSubscriptionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSubscriptionRequest.Size(m)
@@ -935,16 +952,17 @@ func (m *ModifyPushConfigRequest) Reset()         { *m = ModifyPushConfigRequest
 func (m *ModifyPushConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*ModifyPushConfigRequest) ProtoMessage()    {}
 func (*ModifyPushConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{17}
+	return fileDescriptor_2b98a574e1e7c287, []int{17}
 }
+
 func (m *ModifyPushConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyPushConfigRequest.Unmarshal(m, b)
 }
 func (m *ModifyPushConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModifyPushConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *ModifyPushConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyPushConfigRequest.Merge(dst, src)
+func (m *ModifyPushConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyPushConfigRequest.Merge(m, src)
 }
 func (m *ModifyPushConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_ModifyPushConfigRequest.Size(m)
@@ -991,16 +1009,17 @@ func (m *PullRequest) Reset()         { *m = PullRequest{} }
 func (m *PullRequest) String() string { return proto.CompactTextString(m) }
 func (*PullRequest) ProtoMessage()    {}
 func (*PullRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{18}
+	return fileDescriptor_2b98a574e1e7c287, []int{18}
 }
+
 func (m *PullRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullRequest.Unmarshal(m, b)
 }
 func (m *PullRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PullRequest.Marshal(b, m, deterministic)
 }
-func (dst *PullRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PullRequest.Merge(dst, src)
+func (m *PullRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullRequest.Merge(m, src)
 }
 func (m *PullRequest) XXX_Size() int {
 	return xxx_messageInfo_PullRequest.Size(m)
@@ -1048,16 +1067,17 @@ func (m *PullResponse) Reset()         { *m = PullResponse{} }
 func (m *PullResponse) String() string { return proto.CompactTextString(m) }
 func (*PullResponse) ProtoMessage()    {}
 func (*PullResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{19}
+	return fileDescriptor_2b98a574e1e7c287, []int{19}
 }
+
 func (m *PullResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullResponse.Unmarshal(m, b)
 }
 func (m *PullResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PullResponse.Marshal(b, m, deterministic)
 }
-func (dst *PullResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PullResponse.Merge(dst, src)
+func (m *PullResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullResponse.Merge(m, src)
 }
 func (m *PullResponse) XXX_Size() int {
 	return xxx_messageInfo_PullResponse.Size(m)
@@ -1096,16 +1116,17 @@ func (m *ModifyAckDeadlineRequest) Reset()         { *m = ModifyAckDeadlineReque
 func (m *ModifyAckDeadlineRequest) String() string { return proto.CompactTextString(m) }
 func (*ModifyAckDeadlineRequest) ProtoMessage()    {}
 func (*ModifyAckDeadlineRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{20}
+	return fileDescriptor_2b98a574e1e7c287, []int{20}
 }
+
 func (m *ModifyAckDeadlineRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyAckDeadlineRequest.Unmarshal(m, b)
 }
 func (m *ModifyAckDeadlineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ModifyAckDeadlineRequest.Marshal(b, m, deterministic)
 }
-func (dst *ModifyAckDeadlineRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyAckDeadlineRequest.Merge(dst, src)
+func (m *ModifyAckDeadlineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyAckDeadlineRequest.Merge(m, src)
 }
 func (m *ModifyAckDeadlineRequest) XXX_Size() int {
 	return xxx_messageInfo_ModifyAckDeadlineRequest.Size(m)
@@ -1153,16 +1174,17 @@ func (m *AcknowledgeRequest) Reset()         { *m = AcknowledgeRequest{} }
 func (m *AcknowledgeRequest) String() string { return proto.CompactTextString(m) }
 func (*AcknowledgeRequest) ProtoMessage()    {}
 func (*AcknowledgeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pubsub_6c7fd79cadae8b09, []int{21}
+	return fileDescriptor_2b98a574e1e7c287, []int{21}
 }
+
 func (m *AcknowledgeRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AcknowledgeRequest.Unmarshal(m, b)
 }
 func (m *AcknowledgeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AcknowledgeRequest.Marshal(b, m, deterministic)
 }
-func (dst *AcknowledgeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AcknowledgeRequest.Merge(dst, src)
+func (m *AcknowledgeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcknowledgeRequest.Merge(m, src)
 }
 func (m *AcknowledgeRequest) XXX_Size() int {
 	return xxx_messageInfo_AcknowledgeRequest.Size(m)
@@ -1214,6 +1236,82 @@ func init() {
 	proto.RegisterType((*AcknowledgeRequest)(nil), "google.pubsub.v1beta2.AcknowledgeRequest")
 }
 
+func init() { proto.RegisterFile("google/pubsub/v1beta2/pubsub.proto", fileDescriptor_2b98a574e1e7c287) }
+
+var fileDescriptor_2b98a574e1e7c287 = []byte{
+	// 1107 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x6f, 0xdb, 0x54,
+	0x14, 0x97, 0x93, 0xfe, 0xcb, 0x71, 0x4a, 0xda, 0xab, 0xad, 0x73, 0x53, 0x06, 0x9d, 0x37, 0x4a,
+	0x86, 0xb4, 0x64, 0x0b, 0x45, 0x42, 0x8c, 0x7f, 0xed, 0x56, 0x4d, 0x91, 0xa8, 0xc8, 0xdc, 0x3e,
+	0xa0, 0x09, 0x2d, 0x72, 0xec, 0x5b, 0xc7, 0xc4, 0xb1, 0x3d, 0x5f, 0xbb, 0x34, 0x7b, 0x43, 0x08,
+	0xc1, 0x13, 0x1f, 0x85, 0xaf, 0xc0, 0x03, 0x1f, 0x82, 0xaf, 0x83, 0x7c, 0xef, 0xb5, 0x63, 0xa7,
+	0xbe, 0xa9, 0xdb, 0x89, 0x37, 0xdf, 0x73, 0xcf, 0xff, 0x73, 0x7e, 0xe7, 0x1e, 0x83, 0x6a, 0x79,
+	0x9e, 0xe5, 0xe0, 0x8e, 0x1f, 0x0d, 0x49, 0x34, 0xec, 0x9c, 0x3f, 0x19, 0xe2, 0x50, 0xef, 0xf2,
+	0x63, 0xdb, 0x0f, 0xbc, 0xd0, 0x43, 0xb7, 0x19, 0x4f, 0x9b, 0x13, 0x39, 0x4f, 0x73, 0x27, 0x11,
+	0x8d, 0x99, 0x86, 0xd1, 0x59, 0x07, 0x4f, 0xfc, 0x70, 0xca, 0x64, 0xd4, 0x1d, 0x58, 0x3e, 0xf5,
+	0x7c, 0xdb, 0x40, 0x08, 0x96, 0x5c, 0x7d, 0x82, 0x15, 0x69, 0x57, 0x6a, 0xd5, 0x34, 0xfa, 0xad,
+	0xfe, 0x2b, 0xc1, 0x7a, 0x9f, 0x2a, 0x3b, 0xc6, 0x84, 0xe8, 0x16, 0x8e, 0xb9, 0x4c, 0x3d, 0xd4,
+	0x29, 0x57, 0x5d, 0xa3, 0xdf, 0xe8, 0x14, 0x40, 0x0f, 0xc3, 0xc0, 0x1e, 0x46, 0x21, 0x26, 0x4a,
+	0x65, 0xb7, 0xda, 0x92, 0xbb, 0xfb, 0xed, 0x42, 0x5f, 0xda, 0x39, 0x6d, 0xed, 0x83, 0x54, 0xec,
+	0xc8, 0x0d, 0x83, 0xa9, 0x96, 0xd1, 0x83, 0xee, 0x02, 0x4c, 0x18, 0xdb, 0xc0, 0x36, 0x95, 0x2a,
+	0xf5, 0xaa, 0xc6, 0x29, 0x3d, 0xb3, 0xf9, 0x15, 0x34, 0xe6, 0xa4, 0xd1, 0x06, 0x54, 0xc7, 0x78,
+	0xca, 0x03, 0x88, 0x3f, 0xd1, 0x2d, 0x58, 0x3e, 0xd7, 0x9d, 0x08, 0x2b, 0x15, 0x4a, 0x63, 0x87,
+	0x2f, 0x2a, 0x9f, 0x4b, 0xea, 0xc7, 0xd0, 0x78, 0x81, 0x43, 0x1a, 0xb9, 0x86, 0xdf, 0x44, 0x98,
+	0x84, 0x31, 0x73, 0x18, 0x9f, 0xb9, 0x02, 0x76, 0x50, 0x47, 0xf0, 0x5e, 0x3f, 0x1a, 0x3a, 0x36,
+	0x19, 0x2d, 0xe4, 0x43, 0xdf, 0xc2, 0x1a, 0x77, 0x2e, 0x49, 0xc1, 0x83, 0x32, 0x29, 0xd0, 0x52,
+	0x29, 0xb5, 0x0b, 0x8d, 0xd4, 0x12, 0xf1, 0x3d, 0x97, 0x60, 0xf4, 0x21, 0xc8, 0xb3, 0x1c, 0x10,
+	0x45, 0xda, 0xad, 0xb6, 0x6a, 0x1a, 0xa4, 0x49, 0x20, 0xaa, 0x0d, 0x9b, 0xdf, 0xd9, 0x84, 0xc5,
+	0x41, 0x12, 0x07, 0x15, 0x58, 0xf5, 0x03, 0xef, 0x27, 0x6c, 0x84, 0xdc, 0xc5, 0xe4, 0x88, 0x76,
+	0xa0, 0xe6, 0xc7, 0xca, 0x88, 0xfd, 0x96, 0xe5, 0x64, 0x59, 0x5b, 0x8b, 0x09, 0x27, 0xf6, 0x5b,
+	0x1c, 0x27, 0x9c, 0x5e, 0x86, 0xde, 0x18, 0xbb, 0x49, 0xc2, 0x63, 0xca, 0x69, 0x4c, 0x50, 0x03,
+	0x40, 0x59, 0x53, 0xdc, 0xc3, 0x7d, 0x58, 0xa1, 0xf1, 0x33, 0xe7, 0xe4, 0xee, 0xfb, 0x82, 0xa0,
+	0x59, 0xa6, 0x39, 0x2f, 0xda, 0x83, 0x86, 0x8b, 0x2f, 0xc2, 0x41, 0xc6, 0x1e, 0xab, 0xd0, 0x7a,
+	0x4c, 0xee, 0xa7, 0x36, 0xdf, 0xc0, 0xdd, 0xd4, 0xe6, 0x49, 0x34, 0x24, 0x46, 0x60, 0xfb, 0xa1,
+	0xed, 0xb9, 0x64, 0x71, 0x2d, 0xde, 0x25, 0x4c, 0x17, 0x3e, 0x10, 0x99, 0xe4, 0x21, 0x3f, 0x80,
+	0x75, 0x92, 0xbd, 0xe0, 0x65, 0xc9, 0x13, 0x4b, 0x87, 0xf8, 0x09, 0xa0, 0xe7, 0xd8, 0xc1, 0x21,
+	0x2e, 0xd1, 0x8b, 0x7f, 0x49, 0x50, 0xcf, 0xfa, 0x54, 0x84, 0xd9, 0x99, 0x68, 0x25, 0x9b, 0x92,
+	0x43, 0x90, 0xfd, 0x88, 0x8c, 0x06, 0x86, 0xe7, 0x9e, 0xd9, 0x96, 0xb2, 0xb4, 0x2b, 0xb5, 0xe4,
+	0xee, 0x3d, 0x61, 0x87, 0x92, 0xd1, 0x33, 0xca, 0xa8, 0x81, 0x9f, 0x7e, 0xa3, 0xc7, 0x70, 0x4b,
+	0x37, 0xc6, 0x03, 0x13, 0xeb, 0xa6, 0x63, 0xbb, 0x78, 0x40, 0xb0, 0xe1, 0xb9, 0x26, 0x51, 0x96,
+	0x69, 0x86, 0x91, 0x6e, 0x8c, 0x9f, 0xf3, 0xab, 0x13, 0x76, 0xa3, 0xfe, 0x23, 0x01, 0xcc, 0x94,
+	0xa1, 0xfb, 0xb0, 0x4e, 0x9d, 0xc0, 0xae, 0xe9, 0x7b, 0xb6, 0x9b, 0xb4, 0x67, 0x3d, 0x26, 0x1e,
+	0x71, 0x1a, 0x7a, 0x59, 0x30, 0x4d, 0x9e, 0x5c, 0xe9, 0xe8, 0xa2, 0x51, 0xf2, 0xae, 0xb3, 0x62,
+	0x04, 0x0d, 0x0d, 0x1b, 0xd8, 0x3e, 0xc7, 0x66, 0x32, 0x06, 0x6f, 0xc3, 0x4a, 0x9c, 0x0a, 0xdb,
+	0x4c, 0x0a, 0xa4, 0x1b, 0xe3, 0x9e, 0x89, 0xbe, 0x86, 0x55, 0x0e, 0x4e, 0xaa, 0xa5, 0xec, 0x0c,
+	0x48, 0x84, 0xd4, 0x2f, 0x61, 0xeb, 0x05, 0x0e, 0xb3, 0x25, 0x4e, 0x1a, 0x42, 0x85, 0x7a, 0xb6,
+	0xbf, 0x92, 0xcc, 0x65, 0x69, 0xaa, 0x0f, 0x4a, 0xdc, 0xba, 0x85, 0x40, 0xf9, 0x7f, 0x66, 0xc2,
+	0x9f, 0x12, 0x6c, 0x17, 0x98, 0xe4, 0x40, 0xe9, 0x15, 0x01, 0x45, 0xee, 0xde, 0x17, 0xe4, 0x24,
+	0x17, 0xf6, 0x0d, 0xd1, 0xf4, 0x0d, 0x6c, 0x33, 0x34, 0xdd, 0x34, 0x87, 0xbf, 0x48, 0x70, 0xe7,
+	0xd8, 0x33, 0xed, 0xb3, 0x69, 0x06, 0x04, 0xe5, 0xe5, 0xe7, 0x71, 0x56, 0xb9, 0x01, 0xce, 0xd4,
+	0x5f, 0x25, 0x90, 0xfb, 0x91, 0xe3, 0x5c, 0xc7, 0xee, 0x23, 0x40, 0x01, 0x0e, 0xa3, 0xc0, 0x1d,
+	0xd8, 0x93, 0x09, 0x36, 0x6d, 0x3d, 0xc4, 0xce, 0x94, 0x9a, 0x5f, 0xd3, 0x36, 0xd9, 0x4d, 0x6f,
+	0x76, 0x81, 0xee, 0x41, 0x7d, 0xa2, 0x5f, 0x0c, 0xd2, 0x17, 0xab, 0x4a, 0xeb, 0x2e, 0x4f, 0xf4,
+	0x8b, 0xe3, 0xe4, 0x39, 0x32, 0xa0, 0xce, 0x9c, 0xe0, 0xd5, 0x3c, 0x81, 0xcd, 0x80, 0xa3, 0x60,
+	0x26, 0xc7, 0x2a, 0xba, 0x27, 0x88, 0x6f, 0x0e, 0x35, 0xda, 0x46, 0x90, 0x27, 0x10, 0xf5, 0x77,
+	0x09, 0x14, 0x96, 0xee, 0x83, 0xd9, 0xf4, 0xb8, 0x4e, 0xdc, 0x33, 0x20, 0x56, 0xb2, 0x40, 0x14,
+	0x8d, 0xaa, 0xaa, 0x70, 0x54, 0xbd, 0x04, 0x74, 0x60, 0x8c, 0x5d, 0xef, 0x67, 0x07, 0x9b, 0xd6,
+	0xb5, 0x5c, 0xb8, 0x03, 0xab, 0xcc, 0x05, 0x36, 0xad, 0x6a, 0xda, 0x0a, 0xf5, 0x81, 0x74, 0xff,
+	0x58, 0x01, 0xe0, 0x7d, 0x38, 0xc4, 0x01, 0x7a, 0x0d, 0xe8, 0x59, 0x80, 0xf5, 0x7c, 0x6f, 0xa2,
+	0x32, 0x68, 0x68, 0x96, 0x61, 0x42, 0x98, 0xae, 0x34, 0x39, 0xd2, 0x23, 0x81, 0x5c, 0xf1, 0x90,
+	0x29, 0x67, 0xe6, 0x9c, 0xad, 0x1c, 0x39, 0xc8, 0xa3, 0x8e, 0x40, 0x52, 0x34, 0x8f, 0x9a, 0x8f,
+	0xcb, 0x0b, 0xf0, 0xfe, 0x7b, 0x9d, 0x3c, 0x94, 0x39, 0x6f, 0x44, 0x7a, 0x84, 0x53, 0xa0, 0xb9,
+	0x95, 0x4a, 0xf0, 0x75, 0xb8, 0x7d, 0x14, 0xaf, 0xc3, 0xe8, 0x47, 0xd8, 0xbc, 0xd4, 0x89, 0xc2,
+	0xb8, 0x44, 0x3d, 0x2b, 0xd4, 0xde, 0x07, 0x39, 0xd3, 0x5e, 0xe8, 0xa1, 0x40, 0xef, 0xe5, 0x16,
+	0x14, 0x6a, 0xfc, 0x1e, 0x96, 0x62, 0x7c, 0x22, 0x55, 0x38, 0x5c, 0xd2, 0x09, 0x22, 0x2c, 0x6c,
+	0x0e, 0xe0, 0xaf, 0x60, 0x63, 0x7e, 0xf2, 0xa1, 0xf6, 0xc2, 0xf8, 0x2f, 0x8d, 0x48, 0x91, 0xb3,
+	0xdd, 0xbf, 0x97, 0xa0, 0xc6, 0x97, 0x5b, 0x1c, 0xa0, 0x1e, 0xc8, 0x0c, 0x09, 0xec, 0xcf, 0x63,
+	0xe1, 0xce, 0xd8, 0x5c, 0x78, 0x8b, 0x7e, 0x80, 0x55, 0xae, 0x17, 0x7d, 0x24, 0x7e, 0x6b, 0x33,
+	0xeb, 0x7b, 0x73, 0xef, 0x2a, 0x36, 0x9e, 0x8e, 0x3e, 0xac, 0x25, 0x7f, 0x08, 0x68, 0x4f, 0x8c,
+	0xa3, 0xec, 0xda, 0x76, 0x85, 0xaf, 0x3a, 0xc0, 0x6c, 0x83, 0x46, 0xad, 0x05, 0x08, 0xc8, 0xed,
+	0xf3, 0xcd, 0x87, 0x25, 0x38, 0xb9, 0xd3, 0xbf, 0x49, 0xb0, 0x55, 0xbc, 0xbe, 0xa2, 0xfd, 0xab,
+	0xb4, 0x14, 0xe2, 0xf4, 0xb3, 0x6b, 0x4a, 0xa5, 0xc9, 0x93, 0x33, 0x5b, 0xad, 0xb0, 0xdd, 0x2f,
+	0x6f, 0xbe, 0xa2, 0x0e, 0x3a, 0xb4, 0x60, 0xdb, 0xf0, 0x26, 0xc5, 0x7a, 0x0e, 0x65, 0xb6, 0x4f,
+	0xf5, 0x63, 0x91, 0xbe, 0xf4, 0xea, 0x29, 0xe7, 0xb2, 0x3c, 0x47, 0x77, 0xad, 0xb6, 0x17, 0x58,
+	0x1d, 0x0b, 0xbb, 0x54, 0x61, 0x87, 0x5d, 0xe9, 0xbe, 0x4d, 0xe6, 0x7e, 0xa5, 0x9f, 0xb2, 0xe3,
+	0x70, 0x85, 0xf2, 0x7d, 0xfa, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x2d, 0xb0, 0x67, 0x71,
+	0x0f, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1837,81 +1935,3 @@ var _Publisher_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/pubsub/v1beta2/pubsub.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/pubsub/v1beta2/pubsub.proto", fileDescriptor_pubsub_6c7fd79cadae8b09)
-}
-
-var fileDescriptor_pubsub_6c7fd79cadae8b09 = []byte{
-	// 1107 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x6f, 0xdb, 0x54,
-	0x14, 0x97, 0x93, 0xfe, 0xcb, 0x71, 0x4a, 0xda, 0xab, 0xad, 0x73, 0x53, 0x06, 0x9d, 0x37, 0x4a,
-	0x86, 0xb4, 0x64, 0x0b, 0x45, 0x42, 0x8c, 0x7f, 0xed, 0x56, 0x4d, 0x91, 0xa8, 0xc8, 0xdc, 0x3e,
-	0xa0, 0x09, 0x2d, 0x72, 0xec, 0x5b, 0xc7, 0xc4, 0xb1, 0x3d, 0x5f, 0xbb, 0x34, 0x7b, 0x43, 0x08,
-	0xc1, 0x13, 0x1f, 0x85, 0xaf, 0xc0, 0x03, 0x1f, 0x82, 0xaf, 0x83, 0x7c, 0xef, 0xb5, 0x63, 0xa7,
-	0xbe, 0xa9, 0xdb, 0x89, 0x37, 0xdf, 0x73, 0xcf, 0xff, 0x73, 0x7e, 0xe7, 0x1e, 0x83, 0x6a, 0x79,
-	0x9e, 0xe5, 0xe0, 0x8e, 0x1f, 0x0d, 0x49, 0x34, 0xec, 0x9c, 0x3f, 0x19, 0xe2, 0x50, 0xef, 0xf2,
-	0x63, 0xdb, 0x0f, 0xbc, 0xd0, 0x43, 0xb7, 0x19, 0x4f, 0x9b, 0x13, 0x39, 0x4f, 0x73, 0x27, 0x11,
-	0x8d, 0x99, 0x86, 0xd1, 0x59, 0x07, 0x4f, 0xfc, 0x70, 0xca, 0x64, 0xd4, 0x1d, 0x58, 0x3e, 0xf5,
-	0x7c, 0xdb, 0x40, 0x08, 0x96, 0x5c, 0x7d, 0x82, 0x15, 0x69, 0x57, 0x6a, 0xd5, 0x34, 0xfa, 0xad,
-	0xfe, 0x2b, 0xc1, 0x7a, 0x9f, 0x2a, 0x3b, 0xc6, 0x84, 0xe8, 0x16, 0x8e, 0xb9, 0x4c, 0x3d, 0xd4,
-	0x29, 0x57, 0x5d, 0xa3, 0xdf, 0xe8, 0x14, 0x40, 0x0f, 0xc3, 0xc0, 0x1e, 0x46, 0x21, 0x26, 0x4a,
-	0x65, 0xb7, 0xda, 0x92, 0xbb, 0xfb, 0xed, 0x42, 0x5f, 0xda, 0x39, 0x6d, 0xed, 0x83, 0x54, 0xec,
-	0xc8, 0x0d, 0x83, 0xa9, 0x96, 0xd1, 0x83, 0xee, 0x02, 0x4c, 0x18, 0xdb, 0xc0, 0x36, 0x95, 0x2a,
-	0xf5, 0xaa, 0xc6, 0x29, 0x3d, 0xb3, 0xf9, 0x15, 0x34, 0xe6, 0xa4, 0xd1, 0x06, 0x54, 0xc7, 0x78,
-	0xca, 0x03, 0x88, 0x3f, 0xd1, 0x2d, 0x58, 0x3e, 0xd7, 0x9d, 0x08, 0x2b, 0x15, 0x4a, 0x63, 0x87,
-	0x2f, 0x2a, 0x9f, 0x4b, 0xea, 0xc7, 0xd0, 0x78, 0x81, 0x43, 0x1a, 0xb9, 0x86, 0xdf, 0x44, 0x98,
-	0x84, 0x31, 0x73, 0x18, 0x9f, 0xb9, 0x02, 0x76, 0x50, 0x47, 0xf0, 0x5e, 0x3f, 0x1a, 0x3a, 0x36,
-	0x19, 0x2d, 0xe4, 0x43, 0xdf, 0xc2, 0x1a, 0x77, 0x2e, 0x49, 0xc1, 0x83, 0x32, 0x29, 0xd0, 0x52,
-	0x29, 0xb5, 0x0b, 0x8d, 0xd4, 0x12, 0xf1, 0x3d, 0x97, 0x60, 0xf4, 0x21, 0xc8, 0xb3, 0x1c, 0x10,
-	0x45, 0xda, 0xad, 0xb6, 0x6a, 0x1a, 0xa4, 0x49, 0x20, 0xaa, 0x0d, 0x9b, 0xdf, 0xd9, 0x84, 0xc5,
-	0x41, 0x12, 0x07, 0x15, 0x58, 0xf5, 0x03, 0xef, 0x27, 0x6c, 0x84, 0xdc, 0xc5, 0xe4, 0x88, 0x76,
-	0xa0, 0xe6, 0xc7, 0xca, 0x88, 0xfd, 0x96, 0xe5, 0x64, 0x59, 0x5b, 0x8b, 0x09, 0x27, 0xf6, 0x5b,
-	0x1c, 0x27, 0x9c, 0x5e, 0x86, 0xde, 0x18, 0xbb, 0x49, 0xc2, 0x63, 0xca, 0x69, 0x4c, 0x50, 0x03,
-	0x40, 0x59, 0x53, 0xdc, 0xc3, 0x7d, 0x58, 0xa1, 0xf1, 0x33, 0xe7, 0xe4, 0xee, 0xfb, 0x82, 0xa0,
-	0x59, 0xa6, 0x39, 0x2f, 0xda, 0x83, 0x86, 0x8b, 0x2f, 0xc2, 0x41, 0xc6, 0x1e, 0xab, 0xd0, 0x7a,
-	0x4c, 0xee, 0xa7, 0x36, 0xdf, 0xc0, 0xdd, 0xd4, 0xe6, 0x49, 0x34, 0x24, 0x46, 0x60, 0xfb, 0xa1,
-	0xed, 0xb9, 0x64, 0x71, 0x2d, 0xde, 0x25, 0x4c, 0x17, 0x3e, 0x10, 0x99, 0xe4, 0x21, 0x3f, 0x80,
-	0x75, 0x92, 0xbd, 0xe0, 0x65, 0xc9, 0x13, 0x4b, 0x87, 0xf8, 0x09, 0xa0, 0xe7, 0xd8, 0xc1, 0x21,
-	0x2e, 0xd1, 0x8b, 0x7f, 0x49, 0x50, 0xcf, 0xfa, 0x54, 0x84, 0xd9, 0x99, 0x68, 0x25, 0x9b, 0x92,
-	0x43, 0x90, 0xfd, 0x88, 0x8c, 0x06, 0x86, 0xe7, 0x9e, 0xd9, 0x96, 0xb2, 0xb4, 0x2b, 0xb5, 0xe4,
-	0xee, 0x3d, 0x61, 0x87, 0x92, 0xd1, 0x33, 0xca, 0xa8, 0x81, 0x9f, 0x7e, 0xa3, 0xc7, 0x70, 0x4b,
-	0x37, 0xc6, 0x03, 0x13, 0xeb, 0xa6, 0x63, 0xbb, 0x78, 0x40, 0xb0, 0xe1, 0xb9, 0x26, 0x51, 0x96,
-	0x69, 0x86, 0x91, 0x6e, 0x8c, 0x9f, 0xf3, 0xab, 0x13, 0x76, 0xa3, 0xfe, 0x23, 0x01, 0xcc, 0x94,
-	0xa1, 0xfb, 0xb0, 0x4e, 0x9d, 0xc0, 0xae, 0xe9, 0x7b, 0xb6, 0x9b, 0xb4, 0x67, 0x3d, 0x26, 0x1e,
-	0x71, 0x1a, 0x7a, 0x59, 0x30, 0x4d, 0x9e, 0x5c, 0xe9, 0xe8, 0xa2, 0x51, 0xf2, 0xae, 0xb3, 0x62,
-	0x04, 0x0d, 0x0d, 0x1b, 0xd8, 0x3e, 0xc7, 0x66, 0x32, 0x06, 0x6f, 0xc3, 0x4a, 0x9c, 0x0a, 0xdb,
-	0x4c, 0x0a, 0xa4, 0x1b, 0xe3, 0x9e, 0x89, 0xbe, 0x86, 0x55, 0x0e, 0x4e, 0xaa, 0xa5, 0xec, 0x0c,
-	0x48, 0x84, 0xd4, 0x2f, 0x61, 0xeb, 0x05, 0x0e, 0xb3, 0x25, 0x4e, 0x1a, 0x42, 0x85, 0x7a, 0xb6,
-	0xbf, 0x92, 0xcc, 0x65, 0x69, 0xaa, 0x0f, 0x4a, 0xdc, 0xba, 0x85, 0x40, 0xf9, 0x7f, 0x66, 0xc2,
-	0x9f, 0x12, 0x6c, 0x17, 0x98, 0xe4, 0x40, 0xe9, 0x15, 0x01, 0x45, 0xee, 0xde, 0x17, 0xe4, 0x24,
-	0x17, 0xf6, 0x0d, 0xd1, 0xf4, 0x0d, 0x6c, 0x33, 0x34, 0xdd, 0x34, 0x87, 0xbf, 0x48, 0x70, 0xe7,
-	0xd8, 0x33, 0xed, 0xb3, 0x69, 0x06, 0x04, 0xe5, 0xe5, 0xe7, 0x71, 0x56, 0xb9, 0x01, 0xce, 0xd4,
-	0x5f, 0x25, 0x90, 0xfb, 0x91, 0xe3, 0x5c, 0xc7, 0xee, 0x23, 0x40, 0x01, 0x0e, 0xa3, 0xc0, 0x1d,
-	0xd8, 0x93, 0x09, 0x36, 0x6d, 0x3d, 0xc4, 0xce, 0x94, 0x9a, 0x5f, 0xd3, 0x36, 0xd9, 0x4d, 0x6f,
-	0x76, 0x81, 0xee, 0x41, 0x7d, 0xa2, 0x5f, 0x0c, 0xd2, 0x17, 0xab, 0x4a, 0xeb, 0x2e, 0x4f, 0xf4,
-	0x8b, 0xe3, 0xe4, 0x39, 0x32, 0xa0, 0xce, 0x9c, 0xe0, 0xd5, 0x3c, 0x81, 0xcd, 0x80, 0xa3, 0x60,
-	0x26, 0xc7, 0x2a, 0xba, 0x27, 0x88, 0x6f, 0x0e, 0x35, 0xda, 0x46, 0x90, 0x27, 0x10, 0xf5, 0x77,
-	0x09, 0x14, 0x96, 0xee, 0x83, 0xd9, 0xf4, 0xb8, 0x4e, 0xdc, 0x33, 0x20, 0x56, 0xb2, 0x40, 0x14,
-	0x8d, 0xaa, 0xaa, 0x70, 0x54, 0xbd, 0x04, 0x74, 0x60, 0x8c, 0x5d, 0xef, 0x67, 0x07, 0x9b, 0xd6,
-	0xb5, 0x5c, 0xb8, 0x03, 0xab, 0xcc, 0x05, 0x36, 0xad, 0x6a, 0xda, 0x0a, 0xf5, 0x81, 0x74, 0xff,
-	0x58, 0x01, 0xe0, 0x7d, 0x38, 0xc4, 0x01, 0x7a, 0x0d, 0xe8, 0x59, 0x80, 0xf5, 0x7c, 0x6f, 0xa2,
-	0x32, 0x68, 0x68, 0x96, 0x61, 0x42, 0x98, 0xae, 0x34, 0x39, 0xd2, 0x23, 0x81, 0x5c, 0xf1, 0x90,
-	0x29, 0x67, 0xe6, 0x9c, 0xad, 0x1c, 0x39, 0xc8, 0xa3, 0x8e, 0x40, 0x52, 0x34, 0x8f, 0x9a, 0x8f,
-	0xcb, 0x0b, 0xf0, 0xfe, 0x7b, 0x9d, 0x3c, 0x94, 0x39, 0x6f, 0x44, 0x7a, 0x84, 0x53, 0xa0, 0xb9,
-	0x95, 0x4a, 0xf0, 0x75, 0xb8, 0x7d, 0x14, 0xaf, 0xc3, 0xe8, 0x47, 0xd8, 0xbc, 0xd4, 0x89, 0xc2,
-	0xb8, 0x44, 0x3d, 0x2b, 0xd4, 0xde, 0x07, 0x39, 0xd3, 0x5e, 0xe8, 0xa1, 0x40, 0xef, 0xe5, 0x16,
-	0x14, 0x6a, 0xfc, 0x1e, 0x96, 0x62, 0x7c, 0x22, 0x55, 0x38, 0x5c, 0xd2, 0x09, 0x22, 0x2c, 0x6c,
-	0x0e, 0xe0, 0xaf, 0x60, 0x63, 0x7e, 0xf2, 0xa1, 0xf6, 0xc2, 0xf8, 0x2f, 0x8d, 0x48, 0x91, 0xb3,
-	0xdd, 0xbf, 0x97, 0xa0, 0xc6, 0x97, 0x5b, 0x1c, 0xa0, 0x1e, 0xc8, 0x0c, 0x09, 0xec, 0xcf, 0x63,
-	0xe1, 0xce, 0xd8, 0x5c, 0x78, 0x8b, 0x7e, 0x80, 0x55, 0xae, 0x17, 0x7d, 0x24, 0x7e, 0x6b, 0x33,
-	0xeb, 0x7b, 0x73, 0xef, 0x2a, 0x36, 0x9e, 0x8e, 0x3e, 0xac, 0x25, 0x7f, 0x08, 0x68, 0x4f, 0x8c,
-	0xa3, 0xec, 0xda, 0x76, 0x85, 0xaf, 0x3a, 0xc0, 0x6c, 0x83, 0x46, 0xad, 0x05, 0x08, 0xc8, 0xed,
-	0xf3, 0xcd, 0x87, 0x25, 0x38, 0xb9, 0xd3, 0xbf, 0x49, 0xb0, 0x55, 0xbc, 0xbe, 0xa2, 0xfd, 0xab,
-	0xb4, 0x14, 0xe2, 0xf4, 0xb3, 0x6b, 0x4a, 0xa5, 0xc9, 0x93, 0x33, 0x5b, 0xad, 0xb0, 0xdd, 0x2f,
-	0x6f, 0xbe, 0xa2, 0x0e, 0x3a, 0xb4, 0x60, 0xdb, 0xf0, 0x26, 0xc5, 0x7a, 0x0e, 0x65, 0xb6, 0x4f,
-	0xf5, 0x63, 0x91, 0xbe, 0xf4, 0xea, 0x29, 0xe7, 0xb2, 0x3c, 0x47, 0x77, 0xad, 0xb6, 0x17, 0x58,
-	0x1d, 0x0b, 0xbb, 0x54, 0x61, 0x87, 0x5d, 0xe9, 0xbe, 0x4d, 0xe6, 0x7e, 0xa5, 0x9f, 0xb2, 0xe3,
-	0x70, 0x85, 0xf2, 0x7d, 0xfa, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x2d, 0xb0, 0x67, 0x71,
-	0x0f, 0x00, 0x00,
-}
diff --git a/googleapis/rpc/code/code.pb.go b/googleapis/rpc/code/code.pb.go
index d4388850dd..9ff770b5f7 100644
--- a/googleapis/rpc/code/code.pb.go
+++ b/googleapis/rpc/code/code.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/code.proto
 
-package code // import "google.golang.org/genproto/googleapis/rpc/code"
+package code
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The canonical error codes for Google APIs.
 //
@@ -185,6 +188,7 @@ var Code_name = map[int32]string{
 	14: "UNAVAILABLE",
 	15: "DATA_LOSS",
 }
+
 var Code_value = map[string]int32{
 	"OK":                  0,
 	"CANCELLED":           1,
@@ -208,17 +212,18 @@ var Code_value = map[string]int32{
 func (x Code) String() string {
 	return proto.EnumName(Code_name, int32(x))
 }
+
 func (Code) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_code_95b35ec52f4ac337, []int{0}
+	return fileDescriptor_fe593a732623ccf0, []int{0}
 }
 
 func init() {
 	proto.RegisterEnum("google.rpc.Code", Code_name, Code_value)
 }
 
-func init() { proto.RegisterFile("google/rpc/code.proto", fileDescriptor_code_95b35ec52f4ac337) }
+func init() { proto.RegisterFile("google/rpc/code.proto", fileDescriptor_fe593a732623ccf0) }
 
-var fileDescriptor_code_95b35ec52f4ac337 = []byte{
+var fileDescriptor_fe593a732623ccf0 = []byte{
 	// 362 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x51, 0xcd, 0x6e, 0x93, 0x31,
 	0x10, 0xa4, 0x69, 0x49, 0x9b, 0xcd, 0xdf, 0xd6, 0xa5, 0xf0, 0x0e, 0x1c, 0x92, 0x43, 0x8f, 0x9c,
diff --git a/googleapis/rpc/errdetails/error_details.pb.go b/googleapis/rpc/errdetails/error_details.pb.go
index bbdcbacce6..4e165422fc 100644
--- a/googleapis/rpc/errdetails/error_details.pb.go
+++ b/googleapis/rpc/errdetails/error_details.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/error_details.proto
 
-package errdetails // import "google.golang.org/genproto/googleapis/rpc/errdetails"
+package errdetails
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Describes when the clients can retry a failed request. Clients could ignore
 // the recommendation here or retry when this information is missing from error
@@ -44,16 +47,17 @@ func (m *RetryInfo) Reset()         { *m = RetryInfo{} }
 func (m *RetryInfo) String() string { return proto.CompactTextString(m) }
 func (*RetryInfo) ProtoMessage()    {}
 func (*RetryInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{0}
+	return fileDescriptor_851816e4d6b6361a, []int{0}
 }
+
 func (m *RetryInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryInfo.Unmarshal(m, b)
 }
 func (m *RetryInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryInfo.Marshal(b, m, deterministic)
 }
-func (dst *RetryInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryInfo.Merge(dst, src)
+func (m *RetryInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryInfo.Merge(m, src)
 }
 func (m *RetryInfo) XXX_Size() int {
 	return xxx_messageInfo_RetryInfo.Size(m)
@@ -86,16 +90,17 @@ func (m *DebugInfo) Reset()         { *m = DebugInfo{} }
 func (m *DebugInfo) String() string { return proto.CompactTextString(m) }
 func (*DebugInfo) ProtoMessage()    {}
 func (*DebugInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{1}
+	return fileDescriptor_851816e4d6b6361a, []int{1}
 }
+
 func (m *DebugInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DebugInfo.Unmarshal(m, b)
 }
 func (m *DebugInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DebugInfo.Marshal(b, m, deterministic)
 }
-func (dst *DebugInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DebugInfo.Merge(dst, src)
+func (m *DebugInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugInfo.Merge(m, src)
 }
 func (m *DebugInfo) XXX_Size() int {
 	return xxx_messageInfo_DebugInfo.Size(m)
@@ -143,16 +148,17 @@ func (m *QuotaFailure) Reset()         { *m = QuotaFailure{} }
 func (m *QuotaFailure) String() string { return proto.CompactTextString(m) }
 func (*QuotaFailure) ProtoMessage()    {}
 func (*QuotaFailure) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{2}
+	return fileDescriptor_851816e4d6b6361a, []int{2}
 }
+
 func (m *QuotaFailure) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuotaFailure.Unmarshal(m, b)
 }
 func (m *QuotaFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuotaFailure.Marshal(b, m, deterministic)
 }
-func (dst *QuotaFailure) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuotaFailure.Merge(dst, src)
+func (m *QuotaFailure) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaFailure.Merge(m, src)
 }
 func (m *QuotaFailure) XXX_Size() int {
 	return xxx_messageInfo_QuotaFailure.Size(m)
@@ -194,16 +200,17 @@ func (m *QuotaFailure_Violation) Reset()         { *m = QuotaFailure_Violation{}
 func (m *QuotaFailure_Violation) String() string { return proto.CompactTextString(m) }
 func (*QuotaFailure_Violation) ProtoMessage()    {}
 func (*QuotaFailure_Violation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{2, 0}
+	return fileDescriptor_851816e4d6b6361a, []int{2, 0}
 }
+
 func (m *QuotaFailure_Violation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QuotaFailure_Violation.Unmarshal(m, b)
 }
 func (m *QuotaFailure_Violation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QuotaFailure_Violation.Marshal(b, m, deterministic)
 }
-func (dst *QuotaFailure_Violation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QuotaFailure_Violation.Merge(dst, src)
+func (m *QuotaFailure_Violation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaFailure_Violation.Merge(m, src)
 }
 func (m *QuotaFailure_Violation) XXX_Size() int {
 	return xxx_messageInfo_QuotaFailure_Violation.Size(m)
@@ -245,16 +252,17 @@ func (m *PreconditionFailure) Reset()         { *m = PreconditionFailure{} }
 func (m *PreconditionFailure) String() string { return proto.CompactTextString(m) }
 func (*PreconditionFailure) ProtoMessage()    {}
 func (*PreconditionFailure) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{3}
+	return fileDescriptor_851816e4d6b6361a, []int{3}
 }
+
 func (m *PreconditionFailure) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PreconditionFailure.Unmarshal(m, b)
 }
 func (m *PreconditionFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PreconditionFailure.Marshal(b, m, deterministic)
 }
-func (dst *PreconditionFailure) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PreconditionFailure.Merge(dst, src)
+func (m *PreconditionFailure) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PreconditionFailure.Merge(m, src)
 }
 func (m *PreconditionFailure) XXX_Size() int {
 	return xxx_messageInfo_PreconditionFailure.Size(m)
@@ -296,16 +304,17 @@ func (m *PreconditionFailure_Violation) Reset()         { *m = PreconditionFailu
 func (m *PreconditionFailure_Violation) String() string { return proto.CompactTextString(m) }
 func (*PreconditionFailure_Violation) ProtoMessage()    {}
 func (*PreconditionFailure_Violation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{3, 0}
+	return fileDescriptor_851816e4d6b6361a, []int{3, 0}
 }
+
 func (m *PreconditionFailure_Violation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PreconditionFailure_Violation.Unmarshal(m, b)
 }
 func (m *PreconditionFailure_Violation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PreconditionFailure_Violation.Marshal(b, m, deterministic)
 }
-func (dst *PreconditionFailure_Violation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PreconditionFailure_Violation.Merge(dst, src)
+func (m *PreconditionFailure_Violation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PreconditionFailure_Violation.Merge(m, src)
 }
 func (m *PreconditionFailure_Violation) XXX_Size() int {
 	return xxx_messageInfo_PreconditionFailure_Violation.Size(m)
@@ -351,16 +360,17 @@ func (m *BadRequest) Reset()         { *m = BadRequest{} }
 func (m *BadRequest) String() string { return proto.CompactTextString(m) }
 func (*BadRequest) ProtoMessage()    {}
 func (*BadRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{4}
+	return fileDescriptor_851816e4d6b6361a, []int{4}
 }
+
 func (m *BadRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BadRequest.Unmarshal(m, b)
 }
 func (m *BadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BadRequest.Marshal(b, m, deterministic)
 }
-func (dst *BadRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BadRequest.Merge(dst, src)
+func (m *BadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BadRequest.Merge(m, src)
 }
 func (m *BadRequest) XXX_Size() int {
 	return xxx_messageInfo_BadRequest.Size(m)
@@ -395,16 +405,17 @@ func (m *BadRequest_FieldViolation) Reset()         { *m = BadRequest_FieldViola
 func (m *BadRequest_FieldViolation) String() string { return proto.CompactTextString(m) }
 func (*BadRequest_FieldViolation) ProtoMessage()    {}
 func (*BadRequest_FieldViolation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{4, 0}
+	return fileDescriptor_851816e4d6b6361a, []int{4, 0}
 }
+
 func (m *BadRequest_FieldViolation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BadRequest_FieldViolation.Unmarshal(m, b)
 }
 func (m *BadRequest_FieldViolation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BadRequest_FieldViolation.Marshal(b, m, deterministic)
 }
-func (dst *BadRequest_FieldViolation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BadRequest_FieldViolation.Merge(dst, src)
+func (m *BadRequest_FieldViolation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BadRequest_FieldViolation.Merge(m, src)
 }
 func (m *BadRequest_FieldViolation) XXX_Size() int {
 	return xxx_messageInfo_BadRequest_FieldViolation.Size(m)
@@ -447,16 +458,17 @@ func (m *RequestInfo) Reset()         { *m = RequestInfo{} }
 func (m *RequestInfo) String() string { return proto.CompactTextString(m) }
 func (*RequestInfo) ProtoMessage()    {}
 func (*RequestInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{5}
+	return fileDescriptor_851816e4d6b6361a, []int{5}
 }
+
 func (m *RequestInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestInfo.Unmarshal(m, b)
 }
 func (m *RequestInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RequestInfo.Marshal(b, m, deterministic)
 }
-func (dst *RequestInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RequestInfo.Merge(dst, src)
+func (m *RequestInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestInfo.Merge(m, src)
 }
 func (m *RequestInfo) XXX_Size() int {
 	return xxx_messageInfo_RequestInfo.Size(m)
@@ -509,16 +521,17 @@ func (m *ResourceInfo) Reset()         { *m = ResourceInfo{} }
 func (m *ResourceInfo) String() string { return proto.CompactTextString(m) }
 func (*ResourceInfo) ProtoMessage()    {}
 func (*ResourceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{6}
+	return fileDescriptor_851816e4d6b6361a, []int{6}
 }
+
 func (m *ResourceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResourceInfo.Unmarshal(m, b)
 }
 func (m *ResourceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResourceInfo.Marshal(b, m, deterministic)
 }
-func (dst *ResourceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResourceInfo.Merge(dst, src)
+func (m *ResourceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceInfo.Merge(m, src)
 }
 func (m *ResourceInfo) XXX_Size() int {
 	return xxx_messageInfo_ResourceInfo.Size(m)
@@ -574,16 +587,17 @@ func (m *Help) Reset()         { *m = Help{} }
 func (m *Help) String() string { return proto.CompactTextString(m) }
 func (*Help) ProtoMessage()    {}
 func (*Help) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{7}
+	return fileDescriptor_851816e4d6b6361a, []int{7}
 }
+
 func (m *Help) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Help.Unmarshal(m, b)
 }
 func (m *Help) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Help.Marshal(b, m, deterministic)
 }
-func (dst *Help) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Help.Merge(dst, src)
+func (m *Help) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Help.Merge(m, src)
 }
 func (m *Help) XXX_Size() int {
 	return xxx_messageInfo_Help.Size(m)
@@ -616,16 +630,17 @@ func (m *Help_Link) Reset()         { *m = Help_Link{} }
 func (m *Help_Link) String() string { return proto.CompactTextString(m) }
 func (*Help_Link) ProtoMessage()    {}
 func (*Help_Link) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{7, 0}
+	return fileDescriptor_851816e4d6b6361a, []int{7, 0}
 }
+
 func (m *Help_Link) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Help_Link.Unmarshal(m, b)
 }
 func (m *Help_Link) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Help_Link.Marshal(b, m, deterministic)
 }
-func (dst *Help_Link) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Help_Link.Merge(dst, src)
+func (m *Help_Link) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Help_Link.Merge(m, src)
 }
 func (m *Help_Link) XXX_Size() int {
 	return xxx_messageInfo_Help_Link.Size(m)
@@ -668,16 +683,17 @@ func (m *LocalizedMessage) Reset()         { *m = LocalizedMessage{} }
 func (m *LocalizedMessage) String() string { return proto.CompactTextString(m) }
 func (*LocalizedMessage) ProtoMessage()    {}
 func (*LocalizedMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_error_details_c8b155055b3404ad, []int{8}
+	return fileDescriptor_851816e4d6b6361a, []int{8}
 }
+
 func (m *LocalizedMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LocalizedMessage.Unmarshal(m, b)
 }
 func (m *LocalizedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LocalizedMessage.Marshal(b, m, deterministic)
 }
-func (dst *LocalizedMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LocalizedMessage.Merge(dst, src)
+func (m *LocalizedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalizedMessage.Merge(m, src)
 }
 func (m *LocalizedMessage) XXX_Size() int {
 	return xxx_messageInfo_LocalizedMessage.Size(m)
@@ -718,11 +734,9 @@ func init() {
 	proto.RegisterType((*LocalizedMessage)(nil), "google.rpc.LocalizedMessage")
 }
 
-func init() {
-	proto.RegisterFile("google/rpc/error_details.proto", fileDescriptor_error_details_c8b155055b3404ad)
-}
+func init() { proto.RegisterFile("google/rpc/error_details.proto", fileDescriptor_851816e4d6b6361a) }
 
-var fileDescriptor_error_details_c8b155055b3404ad = []byte{
+var fileDescriptor_851816e4d6b6361a = []byte{
 	// 595 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
 	0x14, 0x95, 0x9b, 0xb4, 0x9f, 0x7c, 0x93, 0xaf, 0x14, 0xf3, 0xa3, 0x10, 0x09, 0x14, 0x8c, 0x90,
diff --git a/googleapis/rpc/status/status.pb.go b/googleapis/rpc/status/status.pb.go
index a203bd452a..0b9907f89b 100644
--- a/googleapis/rpc/status/status.pb.go
+++ b/googleapis/rpc/status/status.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/status.proto
 
-package status // import "google.golang.org/genproto/googleapis/rpc/status"
+package status
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The `Status` type defines a logical error model that is suitable for
 // different programming environments, including REST APIs and RPC APIs. It is
@@ -93,16 +96,17 @@ func (m *Status) Reset()         { *m = Status{} }
 func (m *Status) String() string { return proto.CompactTextString(m) }
 func (*Status) ProtoMessage()    {}
 func (*Status) Descriptor() ([]byte, []int) {
-	return fileDescriptor_status_8a460da8fb0891c1, []int{0}
+	return fileDescriptor_24d244abaf643bfe, []int{0}
 }
+
 func (m *Status) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Status.Unmarshal(m, b)
 }
 func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Status.Marshal(b, m, deterministic)
 }
-func (dst *Status) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Status.Merge(dst, src)
+func (m *Status) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Status.Merge(m, src)
 }
 func (m *Status) XXX_Size() int {
 	return xxx_messageInfo_Status.Size(m)
@@ -138,9 +142,9 @@ func init() {
 	proto.RegisterType((*Status)(nil), "google.rpc.Status")
 }
 
-func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor_status_8a460da8fb0891c1) }
+func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor_24d244abaf643bfe) }
 
-var fileDescriptor_status_8a460da8fb0891c1 = []byte{
+var fileDescriptor_24d244abaf643bfe = []byte{
 	// 209 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0x2d, 0xd6, 0x2b, 0x28,
diff --git a/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go b/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
index c3f4be402a..78409bd2a3 100644
--- a/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
+++ b/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/admin/database/v1/spanner_database_admin.proto
 
-package database // import "google.golang.org/genproto/googleapis/spanner/admin/database/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
+package database
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates the current state of the database.
 type Database_State int32
@@ -46,6 +46,7 @@ var Database_State_name = map[int32]string{
 	1: "CREATING",
 	2: "READY",
 }
+
 var Database_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          1,
@@ -55,8 +56,9 @@ var Database_State_value = map[string]int32{
 func (x Database_State) String() string {
 	return proto.EnumName(Database_State_name, int32(x))
 }
+
 func (Database_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{0, 0}
+	return fileDescriptor_9422939aee7fc2d7, []int{0, 0}
 }
 
 // A Cloud Spanner database.
@@ -78,16 +80,17 @@ func (m *Database) Reset()         { *m = Database{} }
 func (m *Database) String() string { return proto.CompactTextString(m) }
 func (*Database) ProtoMessage()    {}
 func (*Database) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{0}
+	return fileDescriptor_9422939aee7fc2d7, []int{0}
 }
+
 func (m *Database) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Database.Unmarshal(m, b)
 }
 func (m *Database) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Database.Marshal(b, m, deterministic)
 }
-func (dst *Database) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Database.Merge(dst, src)
+func (m *Database) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Database.Merge(m, src)
 }
 func (m *Database) XXX_Size() int {
 	return xxx_messageInfo_Database.Size(m)
@@ -135,16 +138,17 @@ func (m *ListDatabasesRequest) Reset()         { *m = ListDatabasesRequest{} }
 func (m *ListDatabasesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDatabasesRequest) ProtoMessage()    {}
 func (*ListDatabasesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{1}
+	return fileDescriptor_9422939aee7fc2d7, []int{1}
 }
+
 func (m *ListDatabasesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatabasesRequest.Unmarshal(m, b)
 }
 func (m *ListDatabasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatabasesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListDatabasesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatabasesRequest.Merge(dst, src)
+func (m *ListDatabasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatabasesRequest.Merge(m, src)
 }
 func (m *ListDatabasesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListDatabasesRequest.Size(m)
@@ -194,16 +198,17 @@ func (m *ListDatabasesResponse) Reset()         { *m = ListDatabasesResponse{} }
 func (m *ListDatabasesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDatabasesResponse) ProtoMessage()    {}
 func (*ListDatabasesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{2}
+	return fileDescriptor_9422939aee7fc2d7, []int{2}
 }
+
 func (m *ListDatabasesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListDatabasesResponse.Unmarshal(m, b)
 }
 func (m *ListDatabasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListDatabasesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListDatabasesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListDatabasesResponse.Merge(dst, src)
+func (m *ListDatabasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatabasesResponse.Merge(m, src)
 }
 func (m *ListDatabasesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListDatabasesResponse.Size(m)
@@ -254,16 +259,17 @@ func (m *CreateDatabaseRequest) Reset()         { *m = CreateDatabaseRequest{} }
 func (m *CreateDatabaseRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateDatabaseRequest) ProtoMessage()    {}
 func (*CreateDatabaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{3}
+	return fileDescriptor_9422939aee7fc2d7, []int{3}
 }
+
 func (m *CreateDatabaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDatabaseRequest.Unmarshal(m, b)
 }
 func (m *CreateDatabaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDatabaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateDatabaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDatabaseRequest.Merge(dst, src)
+func (m *CreateDatabaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatabaseRequest.Merge(m, src)
 }
 func (m *CreateDatabaseRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateDatabaseRequest.Size(m)
@@ -309,16 +315,17 @@ func (m *CreateDatabaseMetadata) Reset()         { *m = CreateDatabaseMetadata{}
 func (m *CreateDatabaseMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateDatabaseMetadata) ProtoMessage()    {}
 func (*CreateDatabaseMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{4}
+	return fileDescriptor_9422939aee7fc2d7, []int{4}
 }
+
 func (m *CreateDatabaseMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateDatabaseMetadata.Unmarshal(m, b)
 }
 func (m *CreateDatabaseMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateDatabaseMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateDatabaseMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateDatabaseMetadata.Merge(dst, src)
+func (m *CreateDatabaseMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatabaseMetadata.Merge(m, src)
 }
 func (m *CreateDatabaseMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateDatabaseMetadata.Size(m)
@@ -351,16 +358,17 @@ func (m *GetDatabaseRequest) Reset()         { *m = GetDatabaseRequest{} }
 func (m *GetDatabaseRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDatabaseRequest) ProtoMessage()    {}
 func (*GetDatabaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{5}
+	return fileDescriptor_9422939aee7fc2d7, []int{5}
 }
+
 func (m *GetDatabaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDatabaseRequest.Unmarshal(m, b)
 }
 func (m *GetDatabaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDatabaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDatabaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDatabaseRequest.Merge(dst, src)
+func (m *GetDatabaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatabaseRequest.Merge(m, src)
 }
 func (m *GetDatabaseRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDatabaseRequest.Size(m)
@@ -430,16 +438,17 @@ func (m *UpdateDatabaseDdlRequest) Reset()         { *m = UpdateDatabaseDdlReque
 func (m *UpdateDatabaseDdlRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateDatabaseDdlRequest) ProtoMessage()    {}
 func (*UpdateDatabaseDdlRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{6}
+	return fileDescriptor_9422939aee7fc2d7, []int{6}
 }
+
 func (m *UpdateDatabaseDdlRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDatabaseDdlRequest.Unmarshal(m, b)
 }
 func (m *UpdateDatabaseDdlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDatabaseDdlRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDatabaseDdlRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDatabaseDdlRequest.Merge(dst, src)
+func (m *UpdateDatabaseDdlRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDatabaseDdlRequest.Merge(m, src)
 }
 func (m *UpdateDatabaseDdlRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateDatabaseDdlRequest.Size(m)
@@ -492,16 +501,17 @@ func (m *UpdateDatabaseDdlMetadata) Reset()         { *m = UpdateDatabaseDdlMeta
 func (m *UpdateDatabaseDdlMetadata) String() string { return proto.CompactTextString(m) }
 func (*UpdateDatabaseDdlMetadata) ProtoMessage()    {}
 func (*UpdateDatabaseDdlMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{7}
+	return fileDescriptor_9422939aee7fc2d7, []int{7}
 }
+
 func (m *UpdateDatabaseDdlMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateDatabaseDdlMetadata.Unmarshal(m, b)
 }
 func (m *UpdateDatabaseDdlMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateDatabaseDdlMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UpdateDatabaseDdlMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateDatabaseDdlMetadata.Merge(dst, src)
+func (m *UpdateDatabaseDdlMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDatabaseDdlMetadata.Merge(m, src)
 }
 func (m *UpdateDatabaseDdlMetadata) XXX_Size() int {
 	return xxx_messageInfo_UpdateDatabaseDdlMetadata.Size(m)
@@ -547,16 +557,17 @@ func (m *DropDatabaseRequest) Reset()         { *m = DropDatabaseRequest{} }
 func (m *DropDatabaseRequest) String() string { return proto.CompactTextString(m) }
 func (*DropDatabaseRequest) ProtoMessage()    {}
 func (*DropDatabaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{8}
+	return fileDescriptor_9422939aee7fc2d7, []int{8}
 }
+
 func (m *DropDatabaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DropDatabaseRequest.Unmarshal(m, b)
 }
 func (m *DropDatabaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DropDatabaseRequest.Marshal(b, m, deterministic)
 }
-func (dst *DropDatabaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DropDatabaseRequest.Merge(dst, src)
+func (m *DropDatabaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DropDatabaseRequest.Merge(m, src)
 }
 func (m *DropDatabaseRequest) XXX_Size() int {
 	return xxx_messageInfo_DropDatabaseRequest.Size(m)
@@ -588,16 +599,17 @@ func (m *GetDatabaseDdlRequest) Reset()         { *m = GetDatabaseDdlRequest{} }
 func (m *GetDatabaseDdlRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDatabaseDdlRequest) ProtoMessage()    {}
 func (*GetDatabaseDdlRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{9}
+	return fileDescriptor_9422939aee7fc2d7, []int{9}
 }
+
 func (m *GetDatabaseDdlRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDatabaseDdlRequest.Unmarshal(m, b)
 }
 func (m *GetDatabaseDdlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDatabaseDdlRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetDatabaseDdlRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDatabaseDdlRequest.Merge(dst, src)
+func (m *GetDatabaseDdlRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatabaseDdlRequest.Merge(m, src)
 }
 func (m *GetDatabaseDdlRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDatabaseDdlRequest.Size(m)
@@ -630,16 +642,17 @@ func (m *GetDatabaseDdlResponse) Reset()         { *m = GetDatabaseDdlResponse{}
 func (m *GetDatabaseDdlResponse) String() string { return proto.CompactTextString(m) }
 func (*GetDatabaseDdlResponse) ProtoMessage()    {}
 func (*GetDatabaseDdlResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_database_admin_742316449a28c935, []int{10}
+	return fileDescriptor_9422939aee7fc2d7, []int{10}
 }
+
 func (m *GetDatabaseDdlResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDatabaseDdlResponse.Unmarshal(m, b)
 }
 func (m *GetDatabaseDdlResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDatabaseDdlResponse.Marshal(b, m, deterministic)
 }
-func (dst *GetDatabaseDdlResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDatabaseDdlResponse.Merge(dst, src)
+func (m *GetDatabaseDdlResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatabaseDdlResponse.Merge(m, src)
 }
 func (m *GetDatabaseDdlResponse) XXX_Size() int {
 	return xxx_messageInfo_GetDatabaseDdlResponse.Size(m)
@@ -658,6 +671,7 @@ func (m *GetDatabaseDdlResponse) GetStatements() []string {
 }
 
 func init() {
+	proto.RegisterEnum("google.spanner.admin.database.v1.Database_State", Database_State_name, Database_State_value)
 	proto.RegisterType((*Database)(nil), "google.spanner.admin.database.v1.Database")
 	proto.RegisterType((*ListDatabasesRequest)(nil), "google.spanner.admin.database.v1.ListDatabasesRequest")
 	proto.RegisterType((*ListDatabasesResponse)(nil), "google.spanner.admin.database.v1.ListDatabasesResponse")
@@ -669,7 +683,79 @@ func init() {
 	proto.RegisterType((*DropDatabaseRequest)(nil), "google.spanner.admin.database.v1.DropDatabaseRequest")
 	proto.RegisterType((*GetDatabaseDdlRequest)(nil), "google.spanner.admin.database.v1.GetDatabaseDdlRequest")
 	proto.RegisterType((*GetDatabaseDdlResponse)(nil), "google.spanner.admin.database.v1.GetDatabaseDdlResponse")
-	proto.RegisterEnum("google.spanner.admin.database.v1.Database_State", Database_State_name, Database_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/spanner/admin/database/v1/spanner_database_admin.proto", fileDescriptor_9422939aee7fc2d7)
+}
+
+var fileDescriptor_9422939aee7fc2d7 = []byte{
+	// 1033 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x96, 0xcf, 0x6f, 0x1b, 0x45,
+	0x14, 0xc7, 0x19, 0xa7, 0xa9, 0x92, 0x17, 0x27, 0x75, 0x06, 0x1c, 0xb9, 0x5b, 0x5a, 0xcc, 0x82,
+	0x2a, 0xd7, 0x12, 0xbb, 0xd8, 0x69, 0x48, 0x30, 0x0a, 0x22, 0xb5, 0x5d, 0xd7, 0x12, 0xb4, 0x96,
+	0xed, 0x56, 0x02, 0x59, 0xb2, 0x26, 0xf6, 0xb0, 0xda, 0xe2, 0xfd, 0xc1, 0xce, 0xb8, 0x6a, 0x8b,
+	0x7a, 0x41, 0xe2, 0xc0, 0x19, 0x90, 0xb8, 0x81, 0x38, 0x70, 0xe0, 0xc4, 0x0d, 0x89, 0x23, 0x47,
+	0xae, 0xfc, 0x01, 0x5c, 0xf8, 0x43, 0xd0, 0xcc, 0xee, 0xd8, 0xeb, 0x75, 0x12, 0xdb, 0x1c, 0xb8,
+	0x79, 0xdf, 0xfb, 0xbe, 0x79, 0x9f, 0x79, 0x3b, 0xdf, 0xf1, 0xc2, 0xb1, 0xe5, 0x79, 0xd6, 0x88,
+	0x9a, 0xcc, 0x27, 0xae, 0x4b, 0x03, 0x93, 0x0c, 0x1d, 0xdb, 0x35, 0x87, 0x84, 0x93, 0x53, 0xc2,
+	0xa8, 0xf9, 0xa4, 0xa4, 0x32, 0x7d, 0x15, 0xeb, 0x4b, 0x89, 0xe1, 0x07, 0x1e, 0xf7, 0x70, 0x3e,
+	0x2c, 0x37, 0x22, 0x91, 0x11, 0xe6, 0x94, 0xd4, 0x78, 0x52, 0xd2, 0x5e, 0x8d, 0x1a, 0x10, 0xdf,
+	0x36, 0x89, 0xeb, 0x7a, 0x9c, 0x70, 0xdb, 0x73, 0x59, 0x58, 0xaf, 0xdd, 0x88, 0xb2, 0x36, 0x71,
+	0x44, 0x2f, 0x9b, 0x38, 0x7d, 0xdf, 0x1b, 0xd9, 0x83, 0x67, 0x51, 0x5e, 0x9b, 0xcd, 0xcf, 0xe4,
+	0xde, 0x88, 0x72, 0x23, 0xcf, 0xb5, 0x82, 0xb1, 0xeb, 0xda, 0xae, 0x65, 0x7a, 0x3e, 0x0d, 0x66,
+	0x1a, 0x5c, 0x8b, 0x44, 0xf2, 0xe9, 0x74, 0xfc, 0xa9, 0x49, 0x1d, 0x9f, 0xab, 0x15, 0x5e, 0x4b,
+	0x26, 0xb9, 0xed, 0x50, 0xc6, 0x89, 0xe3, 0x87, 0x02, 0xfd, 0x07, 0x04, 0x1b, 0xb5, 0x68, 0x33,
+	0x18, 0xc3, 0x25, 0x97, 0x38, 0x34, 0x87, 0xf2, 0xa8, 0xb0, 0xd9, 0x96, 0xbf, 0xf1, 0x5d, 0x58,
+	0x67, 0x9c, 0x70, 0x9a, 0x4b, 0xe5, 0x51, 0x61, 0xa7, 0xfc, 0xb6, 0xb1, 0x68, 0x1e, 0x86, 0x5a,
+	0xce, 0xe8, 0x88, 0xba, 0x76, 0x58, 0xae, 0x1f, 0xc2, 0xba, 0x7c, 0xc6, 0x59, 0xd8, 0xed, 0x74,
+	0x4f, 0xba, 0xf5, 0xfe, 0xc3, 0xfb, 0x9d, 0x56, 0xbd, 0xda, 0xbc, 0xdb, 0xac, 0xd7, 0x32, 0x2f,
+	0xe1, 0x34, 0x6c, 0x54, 0xdb, 0xf5, 0x93, 0x6e, 0xf3, 0x7e, 0x23, 0x83, 0xf0, 0x26, 0xac, 0xb7,
+	0xeb, 0x27, 0xb5, 0x8f, 0x33, 0x29, 0xfd, 0x31, 0xbc, 0xf2, 0xa1, 0xcd, 0xb8, 0x5a, 0x95, 0xb5,
+	0xe9, 0xe7, 0x63, 0xca, 0x38, 0xde, 0x83, 0xcb, 0x3e, 0x09, 0xa8, 0xcb, 0x23, 0xdc, 0xe8, 0x09,
+	0x5f, 0x83, 0x4d, 0x9f, 0x58, 0xb4, 0xcf, 0xec, 0xe7, 0x34, 0xb7, 0x96, 0x47, 0x85, 0xf5, 0xf6,
+	0x86, 0x08, 0x74, 0xec, 0xe7, 0x14, 0x5f, 0x07, 0x90, 0x49, 0xee, 0x7d, 0x46, 0xdd, 0xdc, 0x25,
+	0x59, 0x28, 0xe5, 0x5d, 0x11, 0xd0, 0xbf, 0x46, 0x90, 0x4d, 0x34, 0x63, 0xbe, 0xe7, 0x32, 0x8a,
+	0xef, 0xc1, 0xa6, 0xda, 0x23, 0xcb, 0xa1, 0xfc, 0x5a, 0x61, 0xab, 0x5c, 0x5c, 0x7e, 0x14, 0xed,
+	0x69, 0x31, 0xbe, 0x09, 0x57, 0x5c, 0xfa, 0x94, 0xf7, 0x63, 0x1c, 0x29, 0xc9, 0xb1, 0x2d, 0xc2,
+	0xad, 0x09, 0xcb, 0x57, 0x08, 0xb2, 0xd5, 0x80, 0x12, 0x4e, 0x27, 0xab, 0x2c, 0xd8, 0xf9, 0x2d,
+	0xc8, 0x0c, 0x64, 0x41, 0x5f, 0x8e, 0xdc, 0x11, 0x8a, 0x70, 0xe9, 0x2b, 0x61, 0xbc, 0xa3, 0xc2,
+	0x42, 0x4a, 0x9f, 0xf2, 0x80, 0x4c, 0x95, 0x2c, 0xb7, 0x96, 0x5f, 0x13, 0x52, 0x19, 0x9f, 0x28,
+	0x99, 0x7e, 0x1b, 0xf6, 0x66, 0x31, 0x3e, 0xa2, 0x9c, 0x88, 0xed, 0x60, 0x0d, 0x36, 0xd4, 0xb6,
+	0x22, 0x92, 0xc9, 0xb3, 0x5e, 0x00, 0xdc, 0xa0, 0x3c, 0x49, 0x7e, 0xc6, 0x01, 0xd3, 0x9f, 0x41,
+	0xee, 0xa1, 0x3f, 0x8c, 0xad, 0x5f, 0x1b, 0x8e, 0x94, 0xfe, 0x82, 0x0e, 0xf8, 0x06, 0x40, 0x0c,
+	0x3e, 0x25, 0xe1, 0x63, 0x11, 0xfc, 0x3a, 0xa4, 0x27, 0x5e, 0xe9, 0xdb, 0x43, 0x79, 0x14, 0x36,
+	0xdb, 0x5b, 0x93, 0x58, 0x73, 0xa8, 0xff, 0x88, 0xe0, 0xea, 0x5c, 0xef, 0x65, 0xb6, 0xb7, 0xb0,
+	0x79, 0x03, 0x76, 0x07, 0x9e, 0xe3, 0xd8, 0xbc, 0x3f, 0x31, 0x5c, 0x38, 0xe0, 0xad, 0xb2, 0xa6,
+	0x8e, 0x8d, 0xf2, 0xa4, 0xd1, 0x55, 0x92, 0x76, 0x26, 0x2c, 0x9a, 0x04, 0x98, 0x5e, 0x82, 0x97,
+	0x6b, 0x81, 0xe7, 0x27, 0x07, 0x79, 0xd1, 0xe8, 0xf7, 0x21, 0x1b, 0x1b, 0xfd, 0x72, 0xd3, 0xd4,
+	0x8f, 0x60, 0x2f, 0x59, 0x14, 0x9d, 0xfc, 0xd9, 0xad, 0xa2, 0xe4, 0x56, 0xcb, 0xdf, 0xa5, 0x61,
+	0x5b, 0xd5, 0x9d, 0x08, 0x07, 0xe0, 0xdf, 0x10, 0x6c, 0xcf, 0xb8, 0x08, 0xbf, 0xb3, 0xd8, 0x2a,
+	0x67, 0x79, 0x5c, 0x3b, 0x5c, 0xb9, 0x2e, 0x84, 0xd6, 0x0f, 0xbe, 0xfc, 0xeb, 0x9f, 0x6f, 0x52,
+	0x26, 0x7e, 0x4b, 0xdc, 0xa9, 0x5f, 0x84, 0xfe, 0x38, 0xf6, 0x03, 0xef, 0x31, 0x1d, 0x70, 0x66,
+	0x16, 0x4d, 0xdb, 0x65, 0x9c, 0xb8, 0x03, 0xca, 0xcc, 0xe2, 0x0b, 0x73, 0xea, 0xcd, 0x9f, 0x10,
+	0xec, 0xcc, 0x1e, 0x76, 0xbc, 0x04, 0xc2, 0x99, 0x2e, 0xd5, 0xae, 0xab, 0xc2, 0xd8, 0xed, 0x6d,
+	0x3c, 0x50, 0xa7, 0x4f, 0x3f, 0x92, 0x84, 0x65, 0x7d, 0x35, 0xc2, 0x0a, 0x2a, 0xe2, 0x9f, 0x11,
+	0x6c, 0xc5, 0xde, 0x15, 0xbe, 0xbd, 0x98, 0x70, 0xde, 0x8a, 0xda, 0x0a, 0xb7, 0x57, 0x62, 0x9a,
+	0xc2, 0xb5, 0xe7, 0x90, 0x4e, 0x41, 0xcd, 0xe2, 0x0b, 0xfc, 0x2b, 0x82, 0xdd, 0x39, 0x7b, 0xe1,
+	0xca, 0xe2, 0xc6, 0xe7, 0xdd, 0x07, 0x8b, 0x66, 0xfa, 0x81, 0xe4, 0xac, 0x94, 0x0f, 0x24, 0xa7,
+	0x5a, 0x71, 0x19, 0x56, 0x73, 0x38, 0x1c, 0x89, 0xd9, 0x7e, 0x8f, 0x20, 0x1d, 0xf7, 0x1b, 0x3e,
+	0x58, 0x62, 0x4c, 0xf3, 0xfe, 0xd4, 0xf6, 0xe6, 0x4c, 0x5e, 0x17, 0xff, 0xca, 0xfa, 0xbb, 0x92,
+	0x70, 0xbf, 0x58, 0x5a, 0x99, 0x10, 0xff, 0x81, 0x60, 0x67, 0xd6, 0xa2, 0xcb, 0x9c, 0xcd, 0x33,
+	0x6f, 0x02, 0xed, 0x68, 0xf5, 0xc2, 0xc8, 0x58, 0xc7, 0x72, 0x03, 0x87, 0xf8, 0xbf, 0x8d, 0x18,
+	0x7f, 0x8b, 0x20, 0xdd, 0xa1, 0xbc, 0x49, 0x9c, 0x96, 0xfc, 0xd0, 0xc1, 0xba, 0x22, 0xb1, 0x89,
+	0x23, 0xda, 0xc6, 0x93, 0x8a, 0x36, 0x9b, 0xd0, 0x84, 0x59, 0xbd, 0x29, 0x51, 0xaa, 0xfa, 0xfb,
+	0x12, 0x25, 0xa0, 0xcc, 0x1b, 0x07, 0x83, 0xa5, 0x50, 0x2a, 0x2c, 0xd6, 0x45, 0xbc, 0x76, 0x81,
+	0xd5, 0xb8, 0x08, 0xab, 0xf1, 0xbf, 0x60, 0x59, 0x09, 0xac, 0xdf, 0x11, 0xe0, 0x2e, 0x65, 0x32,
+	0x48, 0x03, 0xc7, 0x66, 0x4c, 0x7c, 0xf7, 0xe1, 0x42, 0xa2, 0xf1, 0xbc, 0x44, 0x21, 0xde, 0x5a,
+	0x42, 0x19, 0xbd, 0xd8, 0x07, 0x12, 0xbb, 0xa9, 0xd7, 0x56, 0xc7, 0xe6, 0x73, 0xab, 0x56, 0x50,
+	0xf1, 0xce, 0xdf, 0x08, 0xde, 0x1c, 0x78, 0xce, 0xc2, 0x93, 0x76, 0xe7, 0x6a, 0x27, 0x4c, 0xcd,
+	0xfc, 0x89, 0xb4, 0x84, 0x6f, 0x5a, 0xe8, 0x93, 0x7b, 0x51, 0xb9, 0xe5, 0x8d, 0x88, 0x6b, 0x19,
+	0x5e, 0x60, 0x99, 0x16, 0x75, 0xa5, 0xab, 0xcc, 0x30, 0x45, 0x7c, 0x9b, 0x9d, 0xff, 0x71, 0xff,
+	0x9e, 0xfa, 0xfd, 0x4b, 0xea, 0x66, 0x23, 0x5c, 0xaa, 0x3a, 0xf2, 0xc6, 0x43, 0x23, 0x6a, 0x6a,
+	0xc8, 0x6e, 0xd3, 0x6f, 0xd6, 0x47, 0xa5, 0x3f, 0x95, 0xb0, 0x27, 0x85, 0xbd, 0x48, 0xd8, 0x93,
+	0xc2, 0x9e, 0x12, 0xf6, 0x1e, 0x95, 0x4e, 0x2f, 0x4b, 0x8c, 0xfd, 0x7f, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0x1d, 0xbc, 0x89, 0x54, 0x62, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1083,76 +1169,3 @@ var _DatabaseAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/spanner/admin/database/v1/spanner_database_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/spanner/admin/database/v1/spanner_database_admin.proto", fileDescriptor_spanner_database_admin_742316449a28c935)
-}
-
-var fileDescriptor_spanner_database_admin_742316449a28c935 = []byte{
-	// 1033 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x96, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xc7, 0x19, 0xa7, 0xa9, 0x92, 0x17, 0x27, 0x75, 0x06, 0x1c, 0xb9, 0x5b, 0x5a, 0xcc, 0x82,
-	0x2a, 0xd7, 0x12, 0xbb, 0xd8, 0x69, 0x48, 0x30, 0x0a, 0x22, 0xb5, 0x5d, 0xd7, 0x12, 0xb4, 0x96,
-	0xed, 0x56, 0x02, 0x59, 0xb2, 0x26, 0xf6, 0xb0, 0xda, 0xe2, 0xfd, 0xc1, 0xce, 0xb8, 0x6a, 0x8b,
-	0x7a, 0x41, 0xe2, 0xc0, 0x19, 0x90, 0xb8, 0x81, 0x38, 0x70, 0xe0, 0xc4, 0x0d, 0x89, 0x23, 0x47,
-	0xae, 0xfc, 0x01, 0x5c, 0xf8, 0x43, 0xd0, 0xcc, 0xee, 0xd8, 0xeb, 0x75, 0x12, 0xdb, 0x1c, 0xb8,
-	0x79, 0xdf, 0xfb, 0xbe, 0x79, 0x9f, 0x79, 0x3b, 0xdf, 0xf1, 0xc2, 0xb1, 0xe5, 0x79, 0xd6, 0x88,
-	0x9a, 0xcc, 0x27, 0xae, 0x4b, 0x03, 0x93, 0x0c, 0x1d, 0xdb, 0x35, 0x87, 0x84, 0x93, 0x53, 0xc2,
-	0xa8, 0xf9, 0xa4, 0xa4, 0x32, 0x7d, 0x15, 0xeb, 0x4b, 0x89, 0xe1, 0x07, 0x1e, 0xf7, 0x70, 0x3e,
-	0x2c, 0x37, 0x22, 0x91, 0x11, 0xe6, 0x94, 0xd4, 0x78, 0x52, 0xd2, 0x5e, 0x8d, 0x1a, 0x10, 0xdf,
-	0x36, 0x89, 0xeb, 0x7a, 0x9c, 0x70, 0xdb, 0x73, 0x59, 0x58, 0xaf, 0xdd, 0x88, 0xb2, 0x36, 0x71,
-	0x44, 0x2f, 0x9b, 0x38, 0x7d, 0xdf, 0x1b, 0xd9, 0x83, 0x67, 0x51, 0x5e, 0x9b, 0xcd, 0xcf, 0xe4,
-	0xde, 0x88, 0x72, 0x23, 0xcf, 0xb5, 0x82, 0xb1, 0xeb, 0xda, 0xae, 0x65, 0x7a, 0x3e, 0x0d, 0x66,
-	0x1a, 0x5c, 0x8b, 0x44, 0xf2, 0xe9, 0x74, 0xfc, 0xa9, 0x49, 0x1d, 0x9f, 0xab, 0x15, 0x5e, 0x4b,
-	0x26, 0xb9, 0xed, 0x50, 0xc6, 0x89, 0xe3, 0x87, 0x02, 0xfd, 0x07, 0x04, 0x1b, 0xb5, 0x68, 0x33,
-	0x18, 0xc3, 0x25, 0x97, 0x38, 0x34, 0x87, 0xf2, 0xa8, 0xb0, 0xd9, 0x96, 0xbf, 0xf1, 0x5d, 0x58,
-	0x67, 0x9c, 0x70, 0x9a, 0x4b, 0xe5, 0x51, 0x61, 0xa7, 0xfc, 0xb6, 0xb1, 0x68, 0x1e, 0x86, 0x5a,
-	0xce, 0xe8, 0x88, 0xba, 0x76, 0x58, 0xae, 0x1f, 0xc2, 0xba, 0x7c, 0xc6, 0x59, 0xd8, 0xed, 0x74,
-	0x4f, 0xba, 0xf5, 0xfe, 0xc3, 0xfb, 0x9d, 0x56, 0xbd, 0xda, 0xbc, 0xdb, 0xac, 0xd7, 0x32, 0x2f,
-	0xe1, 0x34, 0x6c, 0x54, 0xdb, 0xf5, 0x93, 0x6e, 0xf3, 0x7e, 0x23, 0x83, 0xf0, 0x26, 0xac, 0xb7,
-	0xeb, 0x27, 0xb5, 0x8f, 0x33, 0x29, 0xfd, 0x31, 0xbc, 0xf2, 0xa1, 0xcd, 0xb8, 0x5a, 0x95, 0xb5,
-	0xe9, 0xe7, 0x63, 0xca, 0x38, 0xde, 0x83, 0xcb, 0x3e, 0x09, 0xa8, 0xcb, 0x23, 0xdc, 0xe8, 0x09,
-	0x5f, 0x83, 0x4d, 0x9f, 0x58, 0xb4, 0xcf, 0xec, 0xe7, 0x34, 0xb7, 0x96, 0x47, 0x85, 0xf5, 0xf6,
-	0x86, 0x08, 0x74, 0xec, 0xe7, 0x14, 0x5f, 0x07, 0x90, 0x49, 0xee, 0x7d, 0x46, 0xdd, 0xdc, 0x25,
-	0x59, 0x28, 0xe5, 0x5d, 0x11, 0xd0, 0xbf, 0x46, 0x90, 0x4d, 0x34, 0x63, 0xbe, 0xe7, 0x32, 0x8a,
-	0xef, 0xc1, 0xa6, 0xda, 0x23, 0xcb, 0xa1, 0xfc, 0x5a, 0x61, 0xab, 0x5c, 0x5c, 0x7e, 0x14, 0xed,
-	0x69, 0x31, 0xbe, 0x09, 0x57, 0x5c, 0xfa, 0x94, 0xf7, 0x63, 0x1c, 0x29, 0xc9, 0xb1, 0x2d, 0xc2,
-	0xad, 0x09, 0xcb, 0x57, 0x08, 0xb2, 0xd5, 0x80, 0x12, 0x4e, 0x27, 0xab, 0x2c, 0xd8, 0xf9, 0x2d,
-	0xc8, 0x0c, 0x64, 0x41, 0x5f, 0x8e, 0xdc, 0x11, 0x8a, 0x70, 0xe9, 0x2b, 0x61, 0xbc, 0xa3, 0xc2,
-	0x42, 0x4a, 0x9f, 0xf2, 0x80, 0x4c, 0x95, 0x2c, 0xb7, 0x96, 0x5f, 0x13, 0x52, 0x19, 0x9f, 0x28,
-	0x99, 0x7e, 0x1b, 0xf6, 0x66, 0x31, 0x3e, 0xa2, 0x9c, 0x88, 0xed, 0x60, 0x0d, 0x36, 0xd4, 0xb6,
-	0x22, 0x92, 0xc9, 0xb3, 0x5e, 0x00, 0xdc, 0xa0, 0x3c, 0x49, 0x7e, 0xc6, 0x01, 0xd3, 0x9f, 0x41,
-	0xee, 0xa1, 0x3f, 0x8c, 0xad, 0x5f, 0x1b, 0x8e, 0x94, 0xfe, 0x82, 0x0e, 0xf8, 0x06, 0x40, 0x0c,
-	0x3e, 0x25, 0xe1, 0x63, 0x11, 0xfc, 0x3a, 0xa4, 0x27, 0x5e, 0xe9, 0xdb, 0x43, 0x79, 0x14, 0x36,
-	0xdb, 0x5b, 0x93, 0x58, 0x73, 0xa8, 0xff, 0x88, 0xe0, 0xea, 0x5c, 0xef, 0x65, 0xb6, 0xb7, 0xb0,
-	0x79, 0x03, 0x76, 0x07, 0x9e, 0xe3, 0xd8, 0xbc, 0x3f, 0x31, 0x5c, 0x38, 0xe0, 0xad, 0xb2, 0xa6,
-	0x8e, 0x8d, 0xf2, 0xa4, 0xd1, 0x55, 0x92, 0x76, 0x26, 0x2c, 0x9a, 0x04, 0x98, 0x5e, 0x82, 0x97,
-	0x6b, 0x81, 0xe7, 0x27, 0x07, 0x79, 0xd1, 0xe8, 0xf7, 0x21, 0x1b, 0x1b, 0xfd, 0x72, 0xd3, 0xd4,
-	0x8f, 0x60, 0x2f, 0x59, 0x14, 0x9d, 0xfc, 0xd9, 0xad, 0xa2, 0xe4, 0x56, 0xcb, 0xdf, 0xa5, 0x61,
-	0x5b, 0xd5, 0x9d, 0x08, 0x07, 0xe0, 0xdf, 0x10, 0x6c, 0xcf, 0xb8, 0x08, 0xbf, 0xb3, 0xd8, 0x2a,
-	0x67, 0x79, 0x5c, 0x3b, 0x5c, 0xb9, 0x2e, 0x84, 0xd6, 0x0f, 0xbe, 0xfc, 0xeb, 0x9f, 0x6f, 0x52,
-	0x26, 0x7e, 0x4b, 0xdc, 0xa9, 0x5f, 0x84, 0xfe, 0x38, 0xf6, 0x03, 0xef, 0x31, 0x1d, 0x70, 0x66,
-	0x16, 0x4d, 0xdb, 0x65, 0x9c, 0xb8, 0x03, 0xca, 0xcc, 0xe2, 0x0b, 0x73, 0xea, 0xcd, 0x9f, 0x10,
-	0xec, 0xcc, 0x1e, 0x76, 0xbc, 0x04, 0xc2, 0x99, 0x2e, 0xd5, 0xae, 0xab, 0xc2, 0xd8, 0xed, 0x6d,
-	0x3c, 0x50, 0xa7, 0x4f, 0x3f, 0x92, 0x84, 0x65, 0x7d, 0x35, 0xc2, 0x0a, 0x2a, 0xe2, 0x9f, 0x11,
-	0x6c, 0xc5, 0xde, 0x15, 0xbe, 0xbd, 0x98, 0x70, 0xde, 0x8a, 0xda, 0x0a, 0xb7, 0x57, 0x62, 0x9a,
-	0xc2, 0xb5, 0xe7, 0x90, 0x4e, 0x41, 0xcd, 0xe2, 0x0b, 0xfc, 0x2b, 0x82, 0xdd, 0x39, 0x7b, 0xe1,
-	0xca, 0xe2, 0xc6, 0xe7, 0xdd, 0x07, 0x8b, 0x66, 0xfa, 0x81, 0xe4, 0xac, 0x94, 0x0f, 0x24, 0xa7,
-	0x5a, 0x71, 0x19, 0x56, 0x73, 0x38, 0x1c, 0x89, 0xd9, 0x7e, 0x8f, 0x20, 0x1d, 0xf7, 0x1b, 0x3e,
-	0x58, 0x62, 0x4c, 0xf3, 0xfe, 0xd4, 0xf6, 0xe6, 0x4c, 0x5e, 0x17, 0xff, 0xca, 0xfa, 0xbb, 0x92,
-	0x70, 0xbf, 0x58, 0x5a, 0x99, 0x10, 0xff, 0x81, 0x60, 0x67, 0xd6, 0xa2, 0xcb, 0x9c, 0xcd, 0x33,
-	0x6f, 0x02, 0xed, 0x68, 0xf5, 0xc2, 0xc8, 0x58, 0xc7, 0x72, 0x03, 0x87, 0xf8, 0xbf, 0x8d, 0x18,
-	0x7f, 0x8b, 0x20, 0xdd, 0xa1, 0xbc, 0x49, 0x9c, 0x96, 0xfc, 0xd0, 0xc1, 0xba, 0x22, 0xb1, 0x89,
-	0x23, 0xda, 0xc6, 0x93, 0x8a, 0x36, 0x9b, 0xd0, 0x84, 0x59, 0xbd, 0x29, 0x51, 0xaa, 0xfa, 0xfb,
-	0x12, 0x25, 0xa0, 0xcc, 0x1b, 0x07, 0x83, 0xa5, 0x50, 0x2a, 0x2c, 0xd6, 0x45, 0xbc, 0x76, 0x81,
-	0xd5, 0xb8, 0x08, 0xab, 0xf1, 0xbf, 0x60, 0x59, 0x09, 0xac, 0xdf, 0x11, 0xe0, 0x2e, 0x65, 0x32,
-	0x48, 0x03, 0xc7, 0x66, 0x4c, 0x7c, 0xf7, 0xe1, 0x42, 0xa2, 0xf1, 0xbc, 0x44, 0x21, 0xde, 0x5a,
-	0x42, 0x19, 0xbd, 0xd8, 0x07, 0x12, 0xbb, 0xa9, 0xd7, 0x56, 0xc7, 0xe6, 0x73, 0xab, 0x56, 0x50,
-	0xf1, 0xce, 0xdf, 0x08, 0xde, 0x1c, 0x78, 0xce, 0xc2, 0x93, 0x76, 0xe7, 0x6a, 0x27, 0x4c, 0xcd,
-	0xfc, 0x89, 0xb4, 0x84, 0x6f, 0x5a, 0xe8, 0x93, 0x7b, 0x51, 0xb9, 0xe5, 0x8d, 0x88, 0x6b, 0x19,
-	0x5e, 0x60, 0x99, 0x16, 0x75, 0xa5, 0xab, 0xcc, 0x30, 0x45, 0x7c, 0x9b, 0x9d, 0xff, 0x71, 0xff,
-	0x9e, 0xfa, 0xfd, 0x4b, 0xea, 0x66, 0x23, 0x5c, 0xaa, 0x3a, 0xf2, 0xc6, 0x43, 0x23, 0x6a, 0x6a,
-	0xc8, 0x6e, 0xd3, 0x6f, 0xd6, 0x47, 0xa5, 0x3f, 0x95, 0xb0, 0x27, 0x85, 0xbd, 0x48, 0xd8, 0x93,
-	0xc2, 0x9e, 0x12, 0xf6, 0x1e, 0x95, 0x4e, 0x2f, 0x4b, 0x8c, 0xfd, 0x7f, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0x1d, 0xbc, 0x89, 0x54, 0x62, 0x0c, 0x00, 0x00,
-}
diff --git a/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go b/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
index e31a6e6576..7b99e98757 100644
--- a/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
+++ b/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
@@ -1,20 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/admin/instance/v1/spanner_instance_admin.proto
 
-package instance // import "google.golang.org/genproto/googleapis/spanner/admin/instance/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "google.golang.org/genproto/googleapis/iam/v1"
-import longrunning "google.golang.org/genproto/googleapis/longrunning"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package instance
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	v1 "google.golang.org/genproto/googleapis/iam/v1"
+	longrunning "google.golang.org/genproto/googleapis/longrunning"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -27,7 +27,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Indicates the current state of the instance.
 type Instance_State int32
@@ -49,6 +49,7 @@ var Instance_State_name = map[int32]string{
 	1: "CREATING",
 	2: "READY",
 }
+
 var Instance_State_value = map[string]int32{
 	"STATE_UNSPECIFIED": 0,
 	"CREATING":          1,
@@ -58,8 +59,9 @@ var Instance_State_value = map[string]int32{
 func (x Instance_State) String() string {
 	return proto.EnumName(Instance_State_name, int32(x))
 }
+
 func (Instance_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{1, 0}
+	return fileDescriptor_3837da4dfb7336ac, []int{1, 0}
 }
 
 // A possible configuration for a Cloud Spanner instance. Configurations
@@ -80,16 +82,17 @@ func (m *InstanceConfig) Reset()         { *m = InstanceConfig{} }
 func (m *InstanceConfig) String() string { return proto.CompactTextString(m) }
 func (*InstanceConfig) ProtoMessage()    {}
 func (*InstanceConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{0}
+	return fileDescriptor_3837da4dfb7336ac, []int{0}
 }
+
 func (m *InstanceConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InstanceConfig.Unmarshal(m, b)
 }
 func (m *InstanceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InstanceConfig.Marshal(b, m, deterministic)
 }
-func (dst *InstanceConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InstanceConfig.Merge(dst, src)
+func (m *InstanceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstanceConfig.Merge(m, src)
 }
 func (m *InstanceConfig) XXX_Size() int {
 	return xxx_messageInfo_InstanceConfig.Size(m)
@@ -173,16 +176,17 @@ func (m *Instance) Reset()         { *m = Instance{} }
 func (m *Instance) String() string { return proto.CompactTextString(m) }
 func (*Instance) ProtoMessage()    {}
 func (*Instance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{1}
+	return fileDescriptor_3837da4dfb7336ac, []int{1}
 }
+
 func (m *Instance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instance.Unmarshal(m, b)
 }
 func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
 }
-func (dst *Instance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instance.Merge(dst, src)
+func (m *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(m, src)
 }
 func (m *Instance) XXX_Size() int {
 	return xxx_messageInfo_Instance.Size(m)
@@ -259,16 +263,17 @@ func (m *ListInstanceConfigsRequest) Reset()         { *m = ListInstanceConfigsR
 func (m *ListInstanceConfigsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInstanceConfigsRequest) ProtoMessage()    {}
 func (*ListInstanceConfigsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{2}
+	return fileDescriptor_3837da4dfb7336ac, []int{2}
 }
+
 func (m *ListInstanceConfigsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstanceConfigsRequest.Unmarshal(m, b)
 }
 func (m *ListInstanceConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstanceConfigsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInstanceConfigsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstanceConfigsRequest.Merge(dst, src)
+func (m *ListInstanceConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstanceConfigsRequest.Merge(m, src)
 }
 func (m *ListInstanceConfigsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInstanceConfigsRequest.Size(m)
@@ -318,16 +323,17 @@ func (m *ListInstanceConfigsResponse) Reset()         { *m = ListInstanceConfigs
 func (m *ListInstanceConfigsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInstanceConfigsResponse) ProtoMessage()    {}
 func (*ListInstanceConfigsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{3}
+	return fileDescriptor_3837da4dfb7336ac, []int{3}
 }
+
 func (m *ListInstanceConfigsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstanceConfigsResponse.Unmarshal(m, b)
 }
 func (m *ListInstanceConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstanceConfigsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInstanceConfigsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstanceConfigsResponse.Merge(dst, src)
+func (m *ListInstanceConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstanceConfigsResponse.Merge(m, src)
 }
 func (m *ListInstanceConfigsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInstanceConfigsResponse.Size(m)
@@ -367,16 +373,17 @@ func (m *GetInstanceConfigRequest) Reset()         { *m = GetInstanceConfigReque
 func (m *GetInstanceConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInstanceConfigRequest) ProtoMessage()    {}
 func (*GetInstanceConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{4}
+	return fileDescriptor_3837da4dfb7336ac, []int{4}
 }
+
 func (m *GetInstanceConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInstanceConfigRequest.Unmarshal(m, b)
 }
 func (m *GetInstanceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInstanceConfigRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInstanceConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInstanceConfigRequest.Merge(dst, src)
+func (m *GetInstanceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceConfigRequest.Merge(m, src)
 }
 func (m *GetInstanceConfigRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInstanceConfigRequest.Size(m)
@@ -409,16 +416,17 @@ func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
 func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*GetInstanceRequest) ProtoMessage()    {}
 func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{5}
+	return fileDescriptor_3837da4dfb7336ac, []int{5}
 }
+
 func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
 }
 func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+func (m *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(m, src)
 }
 func (m *GetInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_GetInstanceRequest.Size(m)
@@ -458,16 +466,17 @@ func (m *CreateInstanceRequest) Reset()         { *m = CreateInstanceRequest{} }
 func (m *CreateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateInstanceRequest) ProtoMessage()    {}
 func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{6}
+	return fileDescriptor_3837da4dfb7336ac, []int{6}
 }
+
 func (m *CreateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstanceRequest.Unmarshal(m, b)
 }
 func (m *CreateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstanceRequest.Merge(dst, src)
+func (m *CreateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceRequest.Merge(m, src)
 }
 func (m *CreateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateInstanceRequest.Size(m)
@@ -542,16 +551,17 @@ func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
 func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesRequest) ProtoMessage()    {}
 func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{7}
+	return fileDescriptor_3837da4dfb7336ac, []int{7}
 }
+
 func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
 }
 func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+func (m *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(m, src)
 }
 func (m *ListInstancesRequest) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesRequest.Size(m)
@@ -608,16 +618,17 @@ func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
 func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
 func (*ListInstancesResponse) ProtoMessage()    {}
 func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{8}
+	return fileDescriptor_3837da4dfb7336ac, []int{8}
 }
+
 func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
 }
 func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+func (m *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(m, src)
 }
 func (m *ListInstancesResponse) XXX_Size() int {
 	return xxx_messageInfo_ListInstancesResponse.Size(m)
@@ -666,16 +677,17 @@ func (m *UpdateInstanceRequest) Reset()         { *m = UpdateInstanceRequest{} }
 func (m *UpdateInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateInstanceRequest) ProtoMessage()    {}
 func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{9}
+	return fileDescriptor_3837da4dfb7336ac, []int{9}
 }
+
 func (m *UpdateInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateInstanceRequest.Unmarshal(m, b)
 }
 func (m *UpdateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateInstanceRequest.Merge(dst, src)
+func (m *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceRequest.Merge(m, src)
 }
 func (m *UpdateInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateInstanceRequest.Size(m)
@@ -715,16 +727,17 @@ func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
 func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteInstanceRequest) ProtoMessage()    {}
 func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{10}
+	return fileDescriptor_3837da4dfb7336ac, []int{10}
 }
+
 func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
 }
 func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+func (m *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(m, src)
 }
 func (m *DeleteInstanceRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
@@ -766,16 +779,17 @@ func (m *CreateInstanceMetadata) Reset()         { *m = CreateInstanceMetadata{}
 func (m *CreateInstanceMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateInstanceMetadata) ProtoMessage()    {}
 func (*CreateInstanceMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{11}
+	return fileDescriptor_3837da4dfb7336ac, []int{11}
 }
+
 func (m *CreateInstanceMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateInstanceMetadata.Unmarshal(m, b)
 }
 func (m *CreateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateInstanceMetadata.Marshal(b, m, deterministic)
 }
-func (dst *CreateInstanceMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateInstanceMetadata.Merge(dst, src)
+func (m *CreateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceMetadata.Merge(m, src)
 }
 func (m *CreateInstanceMetadata) XXX_Size() int {
 	return xxx_messageInfo_CreateInstanceMetadata.Size(m)
@@ -838,16 +852,17 @@ func (m *UpdateInstanceMetadata) Reset()         { *m = UpdateInstanceMetadata{}
 func (m *UpdateInstanceMetadata) String() string { return proto.CompactTextString(m) }
 func (*UpdateInstanceMetadata) ProtoMessage()    {}
 func (*UpdateInstanceMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_instance_admin_d8dd1634480afab7, []int{12}
+	return fileDescriptor_3837da4dfb7336ac, []int{12}
 }
+
 func (m *UpdateInstanceMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateInstanceMetadata.Unmarshal(m, b)
 }
 func (m *UpdateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateInstanceMetadata.Marshal(b, m, deterministic)
 }
-func (dst *UpdateInstanceMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateInstanceMetadata.Merge(dst, src)
+func (m *UpdateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceMetadata.Merge(m, src)
 }
 func (m *UpdateInstanceMetadata) XXX_Size() int {
 	return xxx_messageInfo_UpdateInstanceMetadata.Size(m)
@@ -887,6 +902,7 @@ func (m *UpdateInstanceMetadata) GetEndTime() *timestamp.Timestamp {
 }
 
 func init() {
+	proto.RegisterEnum("google.spanner.admin.instance.v1.Instance_State", Instance_State_name, Instance_State_value)
 	proto.RegisterType((*InstanceConfig)(nil), "google.spanner.admin.instance.v1.InstanceConfig")
 	proto.RegisterType((*Instance)(nil), "google.spanner.admin.instance.v1.Instance")
 	proto.RegisterMapType((map[string]string)(nil), "google.spanner.admin.instance.v1.Instance.LabelsEntry")
@@ -901,7 +917,90 @@ func init() {
 	proto.RegisterType((*DeleteInstanceRequest)(nil), "google.spanner.admin.instance.v1.DeleteInstanceRequest")
 	proto.RegisterType((*CreateInstanceMetadata)(nil), "google.spanner.admin.instance.v1.CreateInstanceMetadata")
 	proto.RegisterType((*UpdateInstanceMetadata)(nil), "google.spanner.admin.instance.v1.UpdateInstanceMetadata")
-	proto.RegisterEnum("google.spanner.admin.instance.v1.Instance_State", Instance_State_name, Instance_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/spanner/admin/instance/v1/spanner_instance_admin.proto", fileDescriptor_3837da4dfb7336ac)
+}
+
+var fileDescriptor_3837da4dfb7336ac = []byte{
+	// 1210 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
+	0x14, 0x67, 0x92, 0x3a, 0x8d, 0x9f, 0xd3, 0x34, 0x1d, 0x9a, 0xca, 0xb8, 0x94, 0xa6, 0x5b, 0x54,
+	0x5c, 0x83, 0x76, 0x89, 0xa1, 0xff, 0x52, 0x72, 0x48, 0x5d, 0xc7, 0xb5, 0xd4, 0x86, 0x68, 0xed,
+	0x56, 0x02, 0x22, 0x59, 0x53, 0x7b, 0x62, 0x2d, 0xd9, 0x9d, 0x5d, 0x76, 0xc6, 0x15, 0x29, 0xea,
+	0xa5, 0xe2, 0x00, 0x12, 0x12, 0x07, 0x24, 0x84, 0x7a, 0x41, 0xe2, 0x08, 0x12, 0x07, 0xbe, 0x02,
+	0x37, 0xae, 0x7c, 0x00, 0x2e, 0x88, 0xcf, 0x81, 0x66, 0x76, 0xc7, 0xf5, 0xae, 0xed, 0xd8, 0xae,
+	0xe8, 0x89, 0xdb, 0xce, 0xbc, 0xdf, 0x7b, 0xef, 0x37, 0xbf, 0x37, 0xfb, 0xde, 0x2e, 0x6c, 0x76,
+	0x7d, 0xbf, 0xeb, 0x52, 0x8b, 0x07, 0x84, 0x31, 0x1a, 0x5a, 0xa4, 0xe3, 0x39, 0xcc, 0x72, 0x18,
+	0x17, 0x84, 0xb5, 0xa9, 0xf5, 0x68, 0x5d, 0x5b, 0x5a, 0x7a, 0xaf, 0xa5, 0x20, 0x66, 0x10, 0xfa,
+	0xc2, 0xc7, 0x6b, 0x91, 0xbb, 0x19, 0x83, 0xcc, 0xc8, 0xa6, 0xa1, 0xe6, 0xa3, 0xf5, 0xc2, 0xeb,
+	0x71, 0x02, 0x12, 0x38, 0x16, 0x61, 0xcc, 0x17, 0x44, 0x38, 0x3e, 0xe3, 0x91, 0x7f, 0xe1, 0x8d,
+	0xd8, 0xea, 0x10, 0x4f, 0xe6, 0x72, 0x88, 0xd7, 0x0a, 0x7c, 0xd7, 0x69, 0x1f, 0xc6, 0xf6, 0x42,
+	0xd2, 0x9e, 0xb0, 0x5d, 0x8c, 0x6d, 0xae, 0xcf, 0xba, 0x61, 0x8f, 0x31, 0x87, 0x75, 0x2d, 0x3f,
+	0xa0, 0x61, 0x22, 0xc1, 0xd9, 0x18, 0xa4, 0x56, 0x0f, 0x7b, 0xfb, 0x16, 0xf5, 0x02, 0xa1, 0x23,
+	0xac, 0xa5, 0x8d, 0xfb, 0x0e, 0x75, 0x3b, 0x2d, 0x8f, 0xf0, 0x83, 0x18, 0x71, 0x3e, 0x8d, 0x10,
+	0x8e, 0x47, 0xb9, 0x20, 0x5e, 0x10, 0x01, 0x8c, 0x1a, 0x2c, 0xd7, 0xe3, 0xd3, 0x56, 0x7c, 0xb6,
+	0xef, 0x74, 0x31, 0x86, 0x63, 0x8c, 0x78, 0x34, 0x8f, 0xd6, 0x50, 0x31, 0x6b, 0xab, 0x67, 0x7c,
+	0x01, 0x96, 0x3a, 0x0e, 0x0f, 0x5c, 0x72, 0xd8, 0x52, 0xb6, 0x39, 0x65, 0xcb, 0xc5, 0x7b, 0x3b,
+	0xc4, 0xa3, 0xc6, 0x97, 0xf3, 0xb0, 0xa8, 0x23, 0x8d, 0x8c, 0x71, 0x06, 0x16, 0xda, 0x2a, 0x43,
+	0xec, 0x1d, 0xaf, 0x86, 0x62, 0xcf, 0x0f, 0xc5, 0xc6, 0xe7, 0x00, 0x98, 0xdf, 0xa1, 0xad, 0xb6,
+	0xdf, 0x63, 0x22, 0x9f, 0x59, 0x43, 0xc5, 0x8c, 0x9d, 0x95, 0x3b, 0x15, 0xb9, 0x81, 0xb7, 0x21,
+	0xc3, 0x05, 0x11, 0x34, 0xbf, 0xb0, 0x86, 0x8a, 0xcb, 0xe5, 0x77, 0xcd, 0x49, 0x45, 0x35, 0x35,
+	0x51, 0xb3, 0x21, 0xfd, 0xec, 0xc8, 0x1d, 0xef, 0xc0, 0x82, 0x4b, 0x1e, 0x52, 0x97, 0xe7, 0x8f,
+	0xaf, 0xcd, 0x17, 0x73, 0xe5, 0xab, 0x33, 0x04, 0xba, 0xab, 0x1c, 0xab, 0x4c, 0x84, 0x87, 0x76,
+	0x1c, 0xa5, 0x70, 0x03, 0x72, 0x03, 0xdb, 0x78, 0x05, 0xe6, 0x0f, 0xe8, 0x61, 0xac, 0x89, 0x7c,
+	0xc4, 0xa7, 0x21, 0xf3, 0x88, 0xb8, 0x3d, 0xad, 0x67, 0xb4, 0xd8, 0x98, 0xbb, 0x8e, 0x8c, 0x6b,
+	0x90, 0x51, 0xd4, 0xf0, 0x2a, 0x9c, 0x6a, 0x34, 0xb7, 0x9a, 0xd5, 0xd6, 0xfd, 0x9d, 0xc6, 0x6e,
+	0xb5, 0x52, 0xdf, 0xae, 0x57, 0x6f, 0xaf, 0xbc, 0x82, 0x97, 0x60, 0xb1, 0x62, 0x57, 0xb7, 0x9a,
+	0xf5, 0x9d, 0xda, 0x0a, 0xc2, 0x59, 0xc8, 0xd8, 0xd5, 0xad, 0xdb, 0x1f, 0xad, 0xcc, 0x19, 0x01,
+	0x14, 0xee, 0x3a, 0x5c, 0x24, 0x6b, 0xca, 0x6d, 0xfa, 0x59, 0x8f, 0x72, 0x21, 0x6b, 0x10, 0x90,
+	0x90, 0x32, 0x11, 0xb3, 0x88, 0x57, 0xf8, 0x2c, 0x64, 0x03, 0xd2, 0xa5, 0x2d, 0xee, 0x3c, 0x8e,
+	0xc8, 0x64, 0xec, 0x45, 0xb9, 0xd1, 0x70, 0x1e, 0x2b, 0xf5, 0x95, 0x51, 0xf8, 0x07, 0x94, 0xc5,
+	0xe5, 0x51, 0xf0, 0xa6, 0xdc, 0x30, 0x7e, 0x42, 0x70, 0x76, 0x64, 0x4a, 0x1e, 0xf8, 0x8c, 0x53,
+	0xfc, 0x09, 0xac, 0xf4, 0x5f, 0xbd, 0xa8, 0xe4, 0x3c, 0x8f, 0x94, 0xbe, 0x33, 0x14, 0x2a, 0x0a,
+	0x6a, 0x9f, 0x74, 0x92, 0x49, 0xf0, 0x25, 0x38, 0xc9, 0xe8, 0xe7, 0xa2, 0x35, 0x40, 0x30, 0xd2,
+	0xf2, 0x84, 0xdc, 0xde, 0xed, 0x93, 0x34, 0x21, 0x5f, 0xa3, 0x29, 0x8a, 0x5a, 0x94, 0x11, 0x97,
+	0xd5, 0x28, 0x02, 0x1e, 0xc0, 0x1f, 0x85, 0xfc, 0x01, 0xc1, 0x6a, 0x25, 0xa4, 0x44, 0xd0, 0x34,
+	0x7a, 0x9c, 0xd8, 0xe7, 0x21, 0xd7, 0x17, 0xc4, 0xe9, 0xc4, 0x7c, 0x41, 0x6f, 0xd5, 0x3b, 0x78,
+	0x1b, 0x16, 0xf5, 0x4a, 0xc9, 0x9d, 0x2b, 0x97, 0xa6, 0x57, 0xca, 0xee, 0xfb, 0x1a, 0x4f, 0x11,
+	0x9c, 0x1e, 0xac, 0xcc, 0xcb, 0xbc, 0x06, 0x32, 0xe6, 0xbe, 0xe3, 0x0a, 0x1a, 0xe6, 0x8f, 0x45,
+	0x31, 0xa3, 0x95, 0xf1, 0x35, 0x82, 0xd5, 0x14, 0x89, 0xf8, 0x62, 0xdc, 0x81, 0xac, 0xa6, 0xaa,
+	0x6f, 0xc4, 0x2c, 0xe7, 0x7c, 0xee, 0x3c, 0xf5, 0x2d, 0x78, 0x86, 0x60, 0xf5, 0x7e, 0xd0, 0x19,
+	0x51, 0xab, 0x41, 0xc9, 0xd1, 0x8b, 0x4b, 0x8e, 0x6f, 0x00, 0x3c, 0xef, 0xc1, 0x8a, 0x44, 0xae,
+	0x5c, 0xd0, 0x91, 0x74, 0x13, 0x36, 0xb7, 0x25, 0xe4, 0x1e, 0xe1, 0x07, 0x76, 0x76, 0x5f, 0x3f,
+	0x1a, 0x6f, 0xc3, 0xea, 0x6d, 0xea, 0xd2, 0x61, 0x6e, 0xa3, 0x6e, 0xdd, 0xb7, 0x73, 0x70, 0x26,
+	0x79, 0xeb, 0xee, 0x51, 0x41, 0x3a, 0x44, 0x90, 0xff, 0xf2, 0x28, 0x5c, 0x90, 0x50, 0xb4, 0xe4,
+	0xc8, 0x18, 0x7b, 0x94, 0xa6, 0x9e, 0x27, 0x76, 0x56, 0xa1, 0xe5, 0x1a, 0xdf, 0x84, 0x5c, 0x5b,
+	0xc6, 0x70, 0x23, 0xdf, 0xf9, 0x89, 0xbe, 0x10, 0xc1, 0x95, 0xf3, 0x15, 0x58, 0xa4, 0xac, 0x13,
+	0x79, 0x1e, 0x9b, 0xe8, 0x79, 0x9c, 0xb2, 0x8e, 0x5c, 0x29, 0x45, 0x92, 0xb5, 0xfd, 0x9f, 0x2b,
+	0x52, 0xfe, 0x67, 0x09, 0x4e, 0xe8, 0x53, 0x6c, 0xc9, 0xf3, 0xe1, 0xdf, 0x11, 0xbc, 0x3a, 0xa2,
+	0x55, 0xe3, 0x0f, 0x26, 0xcb, 0x31, 0x7e, 0xa8, 0x14, 0x36, 0x5f, 0xd0, 0x3b, 0x6a, 0x03, 0x86,
+	0xf5, 0xf4, 0xcf, 0xbf, 0xbf, 0x9b, 0xbb, 0x8c, 0xdf, 0x92, 0x1f, 0x48, 0x5f, 0x44, 0x9d, 0x68,
+	0x33, 0x08, 0xfd, 0x4f, 0x69, 0x5b, 0x70, 0xab, 0xf4, 0xc4, 0x4a, 0xf7, 0xfc, 0xdf, 0x10, 0x9c,
+	0x1a, 0x6a, 0xe6, 0x78, 0x63, 0x32, 0x8b, 0x71, 0x13, 0xa0, 0x30, 0xf3, 0x20, 0x4a, 0x91, 0x96,
+	0xaf, 0xe4, 0x00, 0xe5, 0x34, 0x63, 0xab, 0xf4, 0x04, 0xff, 0x82, 0xe0, 0x44, 0xa2, 0x0d, 0xe2,
+	0xab, 0xb3, 0xc9, 0xd6, 0x97, 0xfb, 0xda, 0xcc, 0x7e, 0xb1, 0xd0, 0x97, 0x15, 0xe7, 0x8b, 0xf8,
+	0xc2, 0x24, 0xa1, 0x39, 0x7e, 0x86, 0x20, 0x37, 0xa0, 0x16, 0x7e, 0x7f, 0x26, 0x71, 0x35, 0xd3,
+	0x19, 0xde, 0xb2, 0x14, 0xb9, 0x71, 0x82, 0x2a, 0x29, 0xbf, 0x47, 0xb0, 0x9c, 0xec, 0x7d, 0x78,
+	0x0a, 0x4d, 0x46, 0xce, 0xe8, 0xc2, 0x39, 0xed, 0x38, 0xf0, 0x11, 0x6e, 0x7e, 0xa8, 0x3f, 0xc2,
+	0x8d, 0x77, 0x14, 0xab, 0x4b, 0xc6, 0x64, 0xc9, 0x36, 0x50, 0x09, 0xff, 0x88, 0x60, 0x39, 0xd9,
+	0x82, 0xa6, 0x21, 0x36, 0x72, 0x20, 0x4d, 0x22, 0x76, 0x45, 0x11, 0xb3, 0xca, 0x25, 0x45, 0xac,
+	0x1f, 0xee, 0x28, 0xdd, 0x24, 0xc3, 0x6f, 0x10, 0x2c, 0x27, 0x87, 0xcc, 0x34, 0x0c, 0x47, 0x8e,
+	0xa5, 0xc2, 0x99, 0xa1, 0x1e, 0x54, 0x95, 0xbf, 0x26, 0xba, 0x92, 0xa5, 0x29, 0x2a, 0xf9, 0x15,
+	0x82, 0xa5, 0x06, 0x15, 0x75, 0xe2, 0xed, 0xaa, 0x1f, 0x23, 0x6c, 0xe8, 0x98, 0x0e, 0xf1, 0x64,
+	0xe6, 0x41, 0xa3, 0xce, 0xbb, 0x9a, 0xc2, 0x44, 0x56, 0x63, 0x53, 0xa5, 0xbd, 0x66, 0x94, 0x55,
+	0xda, 0x90, 0x72, 0xbf, 0x17, 0xb6, 0xc7, 0x8b, 0xc1, 0x07, 0x22, 0x4b, 0x65, 0x24, 0x95, 0xda,
+	0x51, 0x54, 0x6a, 0x2f, 0x8d, 0x4a, 0x37, 0x45, 0xe5, 0x57, 0x04, 0xb8, 0x49, 0xb9, 0xda, 0xa4,
+	0xa1, 0xe7, 0x70, 0x2e, 0xff, 0x07, 0x71, 0x31, 0x95, 0x6c, 0x18, 0xa2, 0x69, 0x5d, 0x9e, 0x02,
+	0x19, 0xf7, 0x84, 0x8a, 0xa2, 0xba, 0x69, 0x5c, 0x9f, 0x8e, 0xaa, 0x18, 0x8a, 0xb4, 0x81, 0x4a,
+	0xb7, 0xfe, 0x42, 0xf0, 0x66, 0xdb, 0xf7, 0x26, 0x5e, 0xa4, 0x5b, 0xaf, 0x35, 0x22, 0x53, 0x62,
+	0x2a, 0xed, 0xca, 0xeb, 0xb3, 0x8b, 0x3e, 0xbe, 0x13, 0xbb, 0x77, 0x7d, 0x97, 0xb0, 0xae, 0xe9,
+	0x87, 0x5d, 0xab, 0x4b, 0x99, 0xba, 0x5c, 0x56, 0x64, 0x22, 0x81, 0xc3, 0xc7, 0xff, 0xe8, 0xdf,
+	0xd4, 0xcf, 0x3f, 0xcf, 0x5d, 0xaa, 0x45, 0xa1, 0x2a, 0xae, 0xdf, 0xeb, 0x98, 0x71, 0x52, 0x53,
+	0x65, 0x7b, 0xfe, 0xc7, 0xf6, 0x60, 0xfd, 0x0f, 0x0d, 0xdc, 0x53, 0xc0, 0xbd, 0x18, 0xb8, 0xa7,
+	0x80, 0x7b, 0x1a, 0xb8, 0xf7, 0x60, 0xfd, 0xe1, 0x82, 0xa2, 0xf1, 0xde, 0xbf, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x23, 0xcc, 0x85, 0xa9, 0x6e, 0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1482,87 +1581,3 @@ var _InstanceAdmin_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/spanner/admin/instance/v1/spanner_instance_admin.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/spanner/admin/instance/v1/spanner_instance_admin.proto", fileDescriptor_spanner_instance_admin_d8dd1634480afab7)
-}
-
-var fileDescriptor_spanner_instance_admin_d8dd1634480afab7 = []byte{
-	// 1210 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0x92, 0x3a, 0x8d, 0x9f, 0xd3, 0x34, 0x1d, 0x9a, 0xca, 0xb8, 0x94, 0xa6, 0x5b, 0x54,
-	0x5c, 0x83, 0x76, 0x89, 0xa1, 0xff, 0x52, 0x72, 0x48, 0x5d, 0xc7, 0xb5, 0xd4, 0x86, 0x68, 0xed,
-	0x56, 0x02, 0x22, 0x59, 0x53, 0x7b, 0x62, 0x2d, 0xd9, 0x9d, 0x5d, 0x76, 0xc6, 0x15, 0x29, 0xea,
-	0xa5, 0xe2, 0x00, 0x12, 0x12, 0x07, 0x24, 0x84, 0x7a, 0x41, 0xe2, 0x08, 0x12, 0x07, 0xbe, 0x02,
-	0x37, 0xae, 0x7c, 0x00, 0x2e, 0x88, 0xcf, 0x81, 0x66, 0x76, 0xc7, 0xf5, 0xae, 0xed, 0xd8, 0xae,
-	0xe8, 0x89, 0xdb, 0xce, 0xbc, 0xdf, 0x7b, 0xef, 0x37, 0xbf, 0x37, 0xfb, 0xde, 0x2e, 0x6c, 0x76,
-	0x7d, 0xbf, 0xeb, 0x52, 0x8b, 0x07, 0x84, 0x31, 0x1a, 0x5a, 0xa4, 0xe3, 0x39, 0xcc, 0x72, 0x18,
-	0x17, 0x84, 0xb5, 0xa9, 0xf5, 0x68, 0x5d, 0x5b, 0x5a, 0x7a, 0xaf, 0xa5, 0x20, 0x66, 0x10, 0xfa,
-	0xc2, 0xc7, 0x6b, 0x91, 0xbb, 0x19, 0x83, 0xcc, 0xc8, 0xa6, 0xa1, 0xe6, 0xa3, 0xf5, 0xc2, 0xeb,
-	0x71, 0x02, 0x12, 0x38, 0x16, 0x61, 0xcc, 0x17, 0x44, 0x38, 0x3e, 0xe3, 0x91, 0x7f, 0xe1, 0x8d,
-	0xd8, 0xea, 0x10, 0x4f, 0xe6, 0x72, 0x88, 0xd7, 0x0a, 0x7c, 0xd7, 0x69, 0x1f, 0xc6, 0xf6, 0x42,
-	0xd2, 0x9e, 0xb0, 0x5d, 0x8c, 0x6d, 0xae, 0xcf, 0xba, 0x61, 0x8f, 0x31, 0x87, 0x75, 0x2d, 0x3f,
-	0xa0, 0x61, 0x22, 0xc1, 0xd9, 0x18, 0xa4, 0x56, 0x0f, 0x7b, 0xfb, 0x16, 0xf5, 0x02, 0xa1, 0x23,
-	0xac, 0xa5, 0x8d, 0xfb, 0x0e, 0x75, 0x3b, 0x2d, 0x8f, 0xf0, 0x83, 0x18, 0x71, 0x3e, 0x8d, 0x10,
-	0x8e, 0x47, 0xb9, 0x20, 0x5e, 0x10, 0x01, 0x8c, 0x1a, 0x2c, 0xd7, 0xe3, 0xd3, 0x56, 0x7c, 0xb6,
-	0xef, 0x74, 0x31, 0x86, 0x63, 0x8c, 0x78, 0x34, 0x8f, 0xd6, 0x50, 0x31, 0x6b, 0xab, 0x67, 0x7c,
-	0x01, 0x96, 0x3a, 0x0e, 0x0f, 0x5c, 0x72, 0xd8, 0x52, 0xb6, 0x39, 0x65, 0xcb, 0xc5, 0x7b, 0x3b,
-	0xc4, 0xa3, 0xc6, 0x97, 0xf3, 0xb0, 0xa8, 0x23, 0x8d, 0x8c, 0x71, 0x06, 0x16, 0xda, 0x2a, 0x43,
-	0xec, 0x1d, 0xaf, 0x86, 0x62, 0xcf, 0x0f, 0xc5, 0xc6, 0xe7, 0x00, 0x98, 0xdf, 0xa1, 0xad, 0xb6,
-	0xdf, 0x63, 0x22, 0x9f, 0x59, 0x43, 0xc5, 0x8c, 0x9d, 0x95, 0x3b, 0x15, 0xb9, 0x81, 0xb7, 0x21,
-	0xc3, 0x05, 0x11, 0x34, 0xbf, 0xb0, 0x86, 0x8a, 0xcb, 0xe5, 0x77, 0xcd, 0x49, 0x45, 0x35, 0x35,
-	0x51, 0xb3, 0x21, 0xfd, 0xec, 0xc8, 0x1d, 0xef, 0xc0, 0x82, 0x4b, 0x1e, 0x52, 0x97, 0xe7, 0x8f,
-	0xaf, 0xcd, 0x17, 0x73, 0xe5, 0xab, 0x33, 0x04, 0xba, 0xab, 0x1c, 0xab, 0x4c, 0x84, 0x87, 0x76,
-	0x1c, 0xa5, 0x70, 0x03, 0x72, 0x03, 0xdb, 0x78, 0x05, 0xe6, 0x0f, 0xe8, 0x61, 0xac, 0x89, 0x7c,
-	0xc4, 0xa7, 0x21, 0xf3, 0x88, 0xb8, 0x3d, 0xad, 0x67, 0xb4, 0xd8, 0x98, 0xbb, 0x8e, 0x8c, 0x6b,
-	0x90, 0x51, 0xd4, 0xf0, 0x2a, 0x9c, 0x6a, 0x34, 0xb7, 0x9a, 0xd5, 0xd6, 0xfd, 0x9d, 0xc6, 0x6e,
-	0xb5, 0x52, 0xdf, 0xae, 0x57, 0x6f, 0xaf, 0xbc, 0x82, 0x97, 0x60, 0xb1, 0x62, 0x57, 0xb7, 0x9a,
-	0xf5, 0x9d, 0xda, 0x0a, 0xc2, 0x59, 0xc8, 0xd8, 0xd5, 0xad, 0xdb, 0x1f, 0xad, 0xcc, 0x19, 0x01,
-	0x14, 0xee, 0x3a, 0x5c, 0x24, 0x6b, 0xca, 0x6d, 0xfa, 0x59, 0x8f, 0x72, 0x21, 0x6b, 0x10, 0x90,
-	0x90, 0x32, 0x11, 0xb3, 0x88, 0x57, 0xf8, 0x2c, 0x64, 0x03, 0xd2, 0xa5, 0x2d, 0xee, 0x3c, 0x8e,
-	0xc8, 0x64, 0xec, 0x45, 0xb9, 0xd1, 0x70, 0x1e, 0x2b, 0xf5, 0x95, 0x51, 0xf8, 0x07, 0x94, 0xc5,
-	0xe5, 0x51, 0xf0, 0xa6, 0xdc, 0x30, 0x7e, 0x42, 0x70, 0x76, 0x64, 0x4a, 0x1e, 0xf8, 0x8c, 0x53,
-	0xfc, 0x09, 0xac, 0xf4, 0x5f, 0xbd, 0xa8, 0xe4, 0x3c, 0x8f, 0x94, 0xbe, 0x33, 0x14, 0x2a, 0x0a,
-	0x6a, 0x9f, 0x74, 0x92, 0x49, 0xf0, 0x25, 0x38, 0xc9, 0xe8, 0xe7, 0xa2, 0x35, 0x40, 0x30, 0xd2,
-	0xf2, 0x84, 0xdc, 0xde, 0xed, 0x93, 0x34, 0x21, 0x5f, 0xa3, 0x29, 0x8a, 0x5a, 0x94, 0x11, 0x97,
-	0xd5, 0x28, 0x02, 0x1e, 0xc0, 0x1f, 0x85, 0xfc, 0x01, 0xc1, 0x6a, 0x25, 0xa4, 0x44, 0xd0, 0x34,
-	0x7a, 0x9c, 0xd8, 0xe7, 0x21, 0xd7, 0x17, 0xc4, 0xe9, 0xc4, 0x7c, 0x41, 0x6f, 0xd5, 0x3b, 0x78,
-	0x1b, 0x16, 0xf5, 0x4a, 0xc9, 0x9d, 0x2b, 0x97, 0xa6, 0x57, 0xca, 0xee, 0xfb, 0x1a, 0x4f, 0x11,
-	0x9c, 0x1e, 0xac, 0xcc, 0xcb, 0xbc, 0x06, 0x32, 0xe6, 0xbe, 0xe3, 0x0a, 0x1a, 0xe6, 0x8f, 0x45,
-	0x31, 0xa3, 0x95, 0xf1, 0x35, 0x82, 0xd5, 0x14, 0x89, 0xf8, 0x62, 0xdc, 0x81, 0xac, 0xa6, 0xaa,
-	0x6f, 0xc4, 0x2c, 0xe7, 0x7c, 0xee, 0x3c, 0xf5, 0x2d, 0x78, 0x86, 0x60, 0xf5, 0x7e, 0xd0, 0x19,
-	0x51, 0xab, 0x41, 0xc9, 0xd1, 0x8b, 0x4b, 0x8e, 0x6f, 0x00, 0x3c, 0xef, 0xc1, 0x8a, 0x44, 0xae,
-	0x5c, 0xd0, 0x91, 0x74, 0x13, 0x36, 0xb7, 0x25, 0xe4, 0x1e, 0xe1, 0x07, 0x76, 0x76, 0x5f, 0x3f,
-	0x1a, 0x6f, 0xc3, 0xea, 0x6d, 0xea, 0xd2, 0x61, 0x6e, 0xa3, 0x6e, 0xdd, 0xb7, 0x73, 0x70, 0x26,
-	0x79, 0xeb, 0xee, 0x51, 0x41, 0x3a, 0x44, 0x90, 0xff, 0xf2, 0x28, 0x5c, 0x90, 0x50, 0xb4, 0xe4,
-	0xc8, 0x18, 0x7b, 0x94, 0xa6, 0x9e, 0x27, 0x76, 0x56, 0xa1, 0xe5, 0x1a, 0xdf, 0x84, 0x5c, 0x5b,
-	0xc6, 0x70, 0x23, 0xdf, 0xf9, 0x89, 0xbe, 0x10, 0xc1, 0x95, 0xf3, 0x15, 0x58, 0xa4, 0xac, 0x13,
-	0x79, 0x1e, 0x9b, 0xe8, 0x79, 0x9c, 0xb2, 0x8e, 0x5c, 0x29, 0x45, 0x92, 0xb5, 0xfd, 0x9f, 0x2b,
-	0x52, 0xfe, 0x67, 0x09, 0x4e, 0xe8, 0x53, 0x6c, 0xc9, 0xf3, 0xe1, 0xdf, 0x11, 0xbc, 0x3a, 0xa2,
-	0x55, 0xe3, 0x0f, 0x26, 0xcb, 0x31, 0x7e, 0xa8, 0x14, 0x36, 0x5f, 0xd0, 0x3b, 0x6a, 0x03, 0x86,
-	0xf5, 0xf4, 0xcf, 0xbf, 0xbf, 0x9b, 0xbb, 0x8c, 0xdf, 0x92, 0x1f, 0x48, 0x5f, 0x44, 0x9d, 0x68,
-	0x33, 0x08, 0xfd, 0x4f, 0x69, 0x5b, 0x70, 0xab, 0xf4, 0xc4, 0x4a, 0xf7, 0xfc, 0xdf, 0x10, 0x9c,
-	0x1a, 0x6a, 0xe6, 0x78, 0x63, 0x32, 0x8b, 0x71, 0x13, 0xa0, 0x30, 0xf3, 0x20, 0x4a, 0x91, 0x96,
-	0xaf, 0xe4, 0x00, 0xe5, 0x34, 0x63, 0xab, 0xf4, 0x04, 0xff, 0x82, 0xe0, 0x44, 0xa2, 0x0d, 0xe2,
-	0xab, 0xb3, 0xc9, 0xd6, 0x97, 0xfb, 0xda, 0xcc, 0x7e, 0xb1, 0xd0, 0x97, 0x15, 0xe7, 0x8b, 0xf8,
-	0xc2, 0x24, 0xa1, 0x39, 0x7e, 0x86, 0x20, 0x37, 0xa0, 0x16, 0x7e, 0x7f, 0x26, 0x71, 0x35, 0xd3,
-	0x19, 0xde, 0xb2, 0x14, 0xb9, 0x71, 0x82, 0x2a, 0x29, 0xbf, 0x47, 0xb0, 0x9c, 0xec, 0x7d, 0x78,
-	0x0a, 0x4d, 0x46, 0xce, 0xe8, 0xc2, 0x39, 0xed, 0x38, 0xf0, 0x11, 0x6e, 0x7e, 0xa8, 0x3f, 0xc2,
-	0x8d, 0x77, 0x14, 0xab, 0x4b, 0xc6, 0x64, 0xc9, 0x36, 0x50, 0x09, 0xff, 0x88, 0x60, 0x39, 0xd9,
-	0x82, 0xa6, 0x21, 0x36, 0x72, 0x20, 0x4d, 0x22, 0x76, 0x45, 0x11, 0xb3, 0xca, 0x25, 0x45, 0xac,
-	0x1f, 0xee, 0x28, 0xdd, 0x24, 0xc3, 0x6f, 0x10, 0x2c, 0x27, 0x87, 0xcc, 0x34, 0x0c, 0x47, 0x8e,
-	0xa5, 0xc2, 0x99, 0xa1, 0x1e, 0x54, 0x95, 0xbf, 0x26, 0xba, 0x92, 0xa5, 0x29, 0x2a, 0xf9, 0x15,
-	0x82, 0xa5, 0x06, 0x15, 0x75, 0xe2, 0xed, 0xaa, 0x1f, 0x23, 0x6c, 0xe8, 0x98, 0x0e, 0xf1, 0x64,
-	0xe6, 0x41, 0xa3, 0xce, 0xbb, 0x9a, 0xc2, 0x44, 0x56, 0x63, 0x53, 0xa5, 0xbd, 0x66, 0x94, 0x55,
-	0xda, 0x90, 0x72, 0xbf, 0x17, 0xb6, 0xc7, 0x8b, 0xc1, 0x07, 0x22, 0x4b, 0x65, 0x24, 0x95, 0xda,
-	0x51, 0x54, 0x6a, 0x2f, 0x8d, 0x4a, 0x37, 0x45, 0xe5, 0x57, 0x04, 0xb8, 0x49, 0xb9, 0xda, 0xa4,
-	0xa1, 0xe7, 0x70, 0x2e, 0xff, 0x07, 0x71, 0x31, 0x95, 0x6c, 0x18, 0xa2, 0x69, 0x5d, 0x9e, 0x02,
-	0x19, 0xf7, 0x84, 0x8a, 0xa2, 0xba, 0x69, 0x5c, 0x9f, 0x8e, 0xaa, 0x18, 0x8a, 0xb4, 0x81, 0x4a,
-	0xb7, 0xfe, 0x42, 0xf0, 0x66, 0xdb, 0xf7, 0x26, 0x5e, 0xa4, 0x5b, 0xaf, 0x35, 0x22, 0x53, 0x62,
-	0x2a, 0xed, 0xca, 0xeb, 0xb3, 0x8b, 0x3e, 0xbe, 0x13, 0xbb, 0x77, 0x7d, 0x97, 0xb0, 0xae, 0xe9,
-	0x87, 0x5d, 0xab, 0x4b, 0x99, 0xba, 0x5c, 0x56, 0x64, 0x22, 0x81, 0xc3, 0xc7, 0xff, 0xe8, 0xdf,
-	0xd4, 0xcf, 0x3f, 0xcf, 0x5d, 0xaa, 0x45, 0xa1, 0x2a, 0xae, 0xdf, 0xeb, 0x98, 0x71, 0x52, 0x53,
-	0x65, 0x7b, 0xfe, 0xc7, 0xf6, 0x60, 0xfd, 0x0f, 0x0d, 0xdc, 0x53, 0xc0, 0xbd, 0x18, 0xb8, 0xa7,
-	0x80, 0x7b, 0x1a, 0xb8, 0xf7, 0x60, 0xfd, 0xe1, 0x82, 0xa2, 0xf1, 0xde, 0xbf, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x23, 0xcc, 0x85, 0xa9, 0x6e, 0x10, 0x00, 0x00,
-}
diff --git a/googleapis/spanner/v1/keys.pb.go b/googleapis/spanner/v1/keys.pb.go
index ccb2407422..687e253f42 100644
--- a/googleapis/spanner/v1/keys.pb.go
+++ b/googleapis/spanner/v1/keys.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/keys.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // KeyRange represents a range of rows in a table or index.
 //
@@ -130,16 +133,17 @@ func (m *KeyRange) Reset()         { *m = KeyRange{} }
 func (m *KeyRange) String() string { return proto.CompactTextString(m) }
 func (*KeyRange) ProtoMessage()    {}
 func (*KeyRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keys_04f9296dfa9b90cb, []int{0}
+	return fileDescriptor_558e8abca28348dd, []int{0}
 }
+
 func (m *KeyRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeyRange.Unmarshal(m, b)
 }
 func (m *KeyRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeyRange.Marshal(b, m, deterministic)
 }
-func (dst *KeyRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeyRange.Merge(dst, src)
+func (m *KeyRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyRange.Merge(m, src)
 }
 func (m *KeyRange) XXX_Size() int {
 	return xxx_messageInfo_KeyRange.Size(m)
@@ -224,9 +228,9 @@ func (m *KeyRange) GetEndOpen() *_struct.ListValue {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*KeyRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _KeyRange_OneofMarshaler, _KeyRange_OneofUnmarshaler, _KeyRange_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*KeyRange) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*KeyRange_StartClosed)(nil),
 		(*KeyRange_StartOpen)(nil),
 		(*KeyRange_EndClosed)(nil),
@@ -234,120 +238,6 @@ func (*KeyRange) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _KeyRange_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*KeyRange)
-	// start_key_type
-	switch x := m.StartKeyType.(type) {
-	case *KeyRange_StartClosed:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StartClosed); err != nil {
-			return err
-		}
-	case *KeyRange_StartOpen:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StartOpen); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("KeyRange.StartKeyType has unexpected type %T", x)
-	}
-	// end_key_type
-	switch x := m.EndKeyType.(type) {
-	case *KeyRange_EndClosed:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EndClosed); err != nil {
-			return err
-		}
-	case *KeyRange_EndOpen:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.EndOpen); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("KeyRange.EndKeyType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _KeyRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*KeyRange)
-	switch tag {
-	case 1: // start_key_type.start_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.ListValue)
-		err := b.DecodeMessage(msg)
-		m.StartKeyType = &KeyRange_StartClosed{msg}
-		return true, err
-	case 2: // start_key_type.start_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.ListValue)
-		err := b.DecodeMessage(msg)
-		m.StartKeyType = &KeyRange_StartOpen{msg}
-		return true, err
-	case 3: // end_key_type.end_closed
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.ListValue)
-		err := b.DecodeMessage(msg)
-		m.EndKeyType = &KeyRange_EndClosed{msg}
-		return true, err
-	case 4: // end_key_type.end_open
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(_struct.ListValue)
-		err := b.DecodeMessage(msg)
-		m.EndKeyType = &KeyRange_EndOpen{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _KeyRange_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*KeyRange)
-	// start_key_type
-	switch x := m.StartKeyType.(type) {
-	case *KeyRange_StartClosed:
-		s := proto.Size(x.StartClosed)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeyRange_StartOpen:
-		s := proto.Size(x.StartOpen)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// end_key_type
-	switch x := m.EndKeyType.(type) {
-	case *KeyRange_EndClosed:
-		s := proto.Size(x.EndClosed)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *KeyRange_EndOpen:
-		s := proto.Size(x.EndOpen)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // `KeySet` defines a collection of Cloud Spanner keys and/or key ranges. All
 // the keys are expected to be in the same table or index. The keys need
 // not be sorted in any particular way.
@@ -377,16 +267,17 @@ func (m *KeySet) Reset()         { *m = KeySet{} }
 func (m *KeySet) String() string { return proto.CompactTextString(m) }
 func (*KeySet) ProtoMessage()    {}
 func (*KeySet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keys_04f9296dfa9b90cb, []int{1}
+	return fileDescriptor_558e8abca28348dd, []int{1}
 }
+
 func (m *KeySet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeySet.Unmarshal(m, b)
 }
 func (m *KeySet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeySet.Marshal(b, m, deterministic)
 }
-func (dst *KeySet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeySet.Merge(dst, src)
+func (m *KeySet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeySet.Merge(m, src)
 }
 func (m *KeySet) XXX_Size() int {
 	return xxx_messageInfo_KeySet.Size(m)
@@ -423,9 +314,9 @@ func init() {
 	proto.RegisterType((*KeySet)(nil), "google.spanner.v1.KeySet")
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/keys.proto", fileDescriptor_keys_04f9296dfa9b90cb) }
+func init() { proto.RegisterFile("google/spanner/v1/keys.proto", fileDescriptor_558e8abca28348dd) }
 
-var fileDescriptor_keys_04f9296dfa9b90cb = []byte{
+var fileDescriptor_558e8abca28348dd = []byte{
 	// 371 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6b, 0xea, 0x30,
 	0x1c, 0xc7, 0x5f, 0xab, 0xf8, 0x34, 0x8a, 0xf8, 0x0a, 0x8f, 0x57, 0x7c, 0x3b, 0x88, 0xa7, 0x9d,
diff --git a/googleapis/spanner/v1/mutation.pb.go b/googleapis/spanner/v1/mutation.pb.go
index 7887ab3554..9800bfde4d 100644
--- a/googleapis/spanner/v1/mutation.pb.go
+++ b/googleapis/spanner/v1/mutation.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/mutation.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A modification to one or more Cloud Spanner rows.  Mutations can be
 // applied to a Cloud Spanner database by sending them in a
@@ -42,16 +45,17 @@ func (m *Mutation) Reset()         { *m = Mutation{} }
 func (m *Mutation) String() string { return proto.CompactTextString(m) }
 func (*Mutation) ProtoMessage()    {}
 func (*Mutation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutation_469b217da29c28c2, []int{0}
+	return fileDescriptor_069356a524fd0232, []int{0}
 }
+
 func (m *Mutation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation.Unmarshal(m, b)
 }
 func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
 }
-func (dst *Mutation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation.Merge(dst, src)
+func (m *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(m, src)
 }
 func (m *Mutation) XXX_Size() int {
 	return xxx_messageInfo_Mutation.Size(m)
@@ -138,9 +142,9 @@ func (m *Mutation) GetDelete() *Mutation_Delete {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Mutation_OneofMarshaler, _Mutation_OneofUnmarshaler, _Mutation_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Mutation) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*Mutation_Insert)(nil),
 		(*Mutation_Update)(nil),
 		(*Mutation_InsertOrUpdate)(nil),
@@ -149,126 +153,6 @@ func (*Mutation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro
 	}
 }
 
-func _Mutation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Mutation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Mutation_Insert:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Insert); err != nil {
-			return err
-		}
-	case *Mutation_Update:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Update); err != nil {
-			return err
-		}
-	case *Mutation_InsertOrUpdate:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InsertOrUpdate); err != nil {
-			return err
-		}
-	case *Mutation_Replace:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Replace); err != nil {
-			return err
-		}
-	case *Mutation_Delete_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Delete); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Mutation.Operation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Mutation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Mutation)
-	switch tag {
-	case 1: // operation.insert
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_Write)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Insert{msg}
-		return true, err
-	case 2: // operation.update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_Write)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Update{msg}
-		return true, err
-	case 3: // operation.insert_or_update
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_Write)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_InsertOrUpdate{msg}
-		return true, err
-	case 4: // operation.replace
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_Write)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Replace{msg}
-		return true, err
-	case 5: // operation.delete
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Mutation_Delete)
-		err := b.DecodeMessage(msg)
-		m.Operation = &Mutation_Delete_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Mutation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Mutation)
-	// operation
-	switch x := m.Operation.(type) {
-	case *Mutation_Insert:
-		s := proto.Size(x.Insert)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Update:
-		s := proto.Size(x.Update)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_InsertOrUpdate:
-		s := proto.Size(x.InsertOrUpdate)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Replace:
-		s := proto.Size(x.Replace)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Mutation_Delete_:
-		s := proto.Size(x.Delete)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Arguments to [insert][google.spanner.v1.Mutation.insert],
 // [update][google.spanner.v1.Mutation.update],
 // [insert_or_update][google.spanner.v1.Mutation.insert_or_update], and
@@ -303,16 +187,17 @@ func (m *Mutation_Write) Reset()         { *m = Mutation_Write{} }
 func (m *Mutation_Write) String() string { return proto.CompactTextString(m) }
 func (*Mutation_Write) ProtoMessage()    {}
 func (*Mutation_Write) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutation_469b217da29c28c2, []int{0, 0}
+	return fileDescriptor_069356a524fd0232, []int{0, 0}
 }
+
 func (m *Mutation_Write) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_Write.Unmarshal(m, b)
 }
 func (m *Mutation_Write) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_Write.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_Write) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_Write.Merge(dst, src)
+func (m *Mutation_Write) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_Write.Merge(m, src)
 }
 func (m *Mutation_Write) XXX_Size() int {
 	return xxx_messageInfo_Mutation_Write.Size(m)
@@ -362,16 +247,17 @@ func (m *Mutation_Delete) Reset()         { *m = Mutation_Delete{} }
 func (m *Mutation_Delete) String() string { return proto.CompactTextString(m) }
 func (*Mutation_Delete) ProtoMessage()    {}
 func (*Mutation_Delete) Descriptor() ([]byte, []int) {
-	return fileDescriptor_mutation_469b217da29c28c2, []int{0, 1}
+	return fileDescriptor_069356a524fd0232, []int{0, 1}
 }
+
 func (m *Mutation_Delete) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mutation_Delete.Unmarshal(m, b)
 }
 func (m *Mutation_Delete) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mutation_Delete.Marshal(b, m, deterministic)
 }
-func (dst *Mutation_Delete) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mutation_Delete.Merge(dst, src)
+func (m *Mutation_Delete) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_Delete.Merge(m, src)
 }
 func (m *Mutation_Delete) XXX_Size() int {
 	return xxx_messageInfo_Mutation_Delete.Size(m)
@@ -402,11 +288,9 @@ func init() {
 	proto.RegisterType((*Mutation_Delete)(nil), "google.spanner.v1.Mutation.Delete")
 }
 
-func init() {
-	proto.RegisterFile("google/spanner/v1/mutation.proto", fileDescriptor_mutation_469b217da29c28c2)
-}
+func init() { proto.RegisterFile("google/spanner/v1/mutation.proto", fileDescriptor_069356a524fd0232) }
 
-var fileDescriptor_mutation_469b217da29c28c2 = []byte{
+var fileDescriptor_069356a524fd0232 = []byte{
 	// 413 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xd1, 0xea, 0xd3, 0x30,
 	0x14, 0xc6, 0xed, 0xba, 0x75, 0x2e, 0x43, 0xd1, 0xa2, 0x58, 0x8b, 0x17, 0x75, 0x57, 0xbb, 0x4a,
diff --git a/googleapis/spanner/v1/query_plan.pb.go b/googleapis/spanner/v1/query_plan.pb.go
index 588ca580cd..ef5430d6ac 100644
--- a/googleapis/spanner/v1/query_plan.pb.go
+++ b/googleapis/spanner/v1/query_plan.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/query_plan.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The kind of [PlanNode][google.spanner.v1.PlanNode]. Distinguishes between
 // the two different kinds of nodes that can appear in a query plan.
@@ -43,6 +46,7 @@ var PlanNode_Kind_name = map[int32]string{
 	1: "RELATIONAL",
 	2: "SCALAR",
 }
+
 var PlanNode_Kind_value = map[string]int32{
 	"KIND_UNSPECIFIED": 0,
 	"RELATIONAL":       1,
@@ -52,8 +56,9 @@ var PlanNode_Kind_value = map[string]int32{
 func (x PlanNode_Kind) String() string {
 	return proto.EnumName(PlanNode_Kind_name, int32(x))
 }
+
 func (PlanNode_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_query_plan_b863df8d6eeb1d82, []int{0, 0}
+	return fileDescriptor_14e5ab0c0507d181, []int{0, 0}
 }
 
 // Node information for nodes appearing in a
@@ -98,16 +103,17 @@ func (m *PlanNode) Reset()         { *m = PlanNode{} }
 func (m *PlanNode) String() string { return proto.CompactTextString(m) }
 func (*PlanNode) ProtoMessage()    {}
 func (*PlanNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_plan_b863df8d6eeb1d82, []int{0}
+	return fileDescriptor_14e5ab0c0507d181, []int{0}
 }
+
 func (m *PlanNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlanNode.Unmarshal(m, b)
 }
 func (m *PlanNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlanNode.Marshal(b, m, deterministic)
 }
-func (dst *PlanNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlanNode.Merge(dst, src)
+func (m *PlanNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlanNode.Merge(m, src)
 }
 func (m *PlanNode) XXX_Size() int {
 	return xxx_messageInfo_PlanNode.Size(m)
@@ -195,16 +201,17 @@ func (m *PlanNode_ChildLink) Reset()         { *m = PlanNode_ChildLink{} }
 func (m *PlanNode_ChildLink) String() string { return proto.CompactTextString(m) }
 func (*PlanNode_ChildLink) ProtoMessage()    {}
 func (*PlanNode_ChildLink) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_plan_b863df8d6eeb1d82, []int{0, 0}
+	return fileDescriptor_14e5ab0c0507d181, []int{0, 0}
 }
+
 func (m *PlanNode_ChildLink) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlanNode_ChildLink.Unmarshal(m, b)
 }
 func (m *PlanNode_ChildLink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlanNode_ChildLink.Marshal(b, m, deterministic)
 }
-func (dst *PlanNode_ChildLink) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlanNode_ChildLink.Merge(dst, src)
+func (m *PlanNode_ChildLink) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlanNode_ChildLink.Merge(m, src)
 }
 func (m *PlanNode_ChildLink) XXX_Size() int {
 	return xxx_messageInfo_PlanNode_ChildLink.Size(m)
@@ -256,16 +263,17 @@ func (m *PlanNode_ShortRepresentation) Reset()         { *m = PlanNode_ShortRepr
 func (m *PlanNode_ShortRepresentation) String() string { return proto.CompactTextString(m) }
 func (*PlanNode_ShortRepresentation) ProtoMessage()    {}
 func (*PlanNode_ShortRepresentation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_plan_b863df8d6eeb1d82, []int{0, 1}
+	return fileDescriptor_14e5ab0c0507d181, []int{0, 1}
 }
+
 func (m *PlanNode_ShortRepresentation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlanNode_ShortRepresentation.Unmarshal(m, b)
 }
 func (m *PlanNode_ShortRepresentation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlanNode_ShortRepresentation.Marshal(b, m, deterministic)
 }
-func (dst *PlanNode_ShortRepresentation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlanNode_ShortRepresentation.Merge(dst, src)
+func (m *PlanNode_ShortRepresentation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlanNode_ShortRepresentation.Merge(m, src)
 }
 func (m *PlanNode_ShortRepresentation) XXX_Size() int {
 	return xxx_messageInfo_PlanNode_ShortRepresentation.Size(m)
@@ -305,16 +313,17 @@ func (m *QueryPlan) Reset()         { *m = QueryPlan{} }
 func (m *QueryPlan) String() string { return proto.CompactTextString(m) }
 func (*QueryPlan) ProtoMessage()    {}
 func (*QueryPlan) Descriptor() ([]byte, []int) {
-	return fileDescriptor_query_plan_b863df8d6eeb1d82, []int{1}
+	return fileDescriptor_14e5ab0c0507d181, []int{1}
 }
+
 func (m *QueryPlan) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryPlan.Unmarshal(m, b)
 }
 func (m *QueryPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_QueryPlan.Marshal(b, m, deterministic)
 }
-func (dst *QueryPlan) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryPlan.Merge(dst, src)
+func (m *QueryPlan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryPlan.Merge(m, src)
 }
 func (m *QueryPlan) XXX_Size() int {
 	return xxx_messageInfo_QueryPlan.Size(m)
@@ -333,19 +342,17 @@ func (m *QueryPlan) GetPlanNodes() []*PlanNode {
 }
 
 func init() {
+	proto.RegisterEnum("google.spanner.v1.PlanNode_Kind", PlanNode_Kind_name, PlanNode_Kind_value)
 	proto.RegisterType((*PlanNode)(nil), "google.spanner.v1.PlanNode")
 	proto.RegisterType((*PlanNode_ChildLink)(nil), "google.spanner.v1.PlanNode.ChildLink")
 	proto.RegisterType((*PlanNode_ShortRepresentation)(nil), "google.spanner.v1.PlanNode.ShortRepresentation")
 	proto.RegisterMapType((map[string]int32)(nil), "google.spanner.v1.PlanNode.ShortRepresentation.SubqueriesEntry")
 	proto.RegisterType((*QueryPlan)(nil), "google.spanner.v1.QueryPlan")
-	proto.RegisterEnum("google.spanner.v1.PlanNode_Kind", PlanNode_Kind_name, PlanNode_Kind_value)
 }
 
-func init() {
-	proto.RegisterFile("google/spanner/v1/query_plan.proto", fileDescriptor_query_plan_b863df8d6eeb1d82)
-}
+func init() { proto.RegisterFile("google/spanner/v1/query_plan.proto", fileDescriptor_14e5ab0c0507d181) }
 
-var fileDescriptor_query_plan_b863df8d6eeb1d82 = []byte{
+var fileDescriptor_14e5ab0c0507d181 = []byte{
 	// 604 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdd, 0x6e, 0xd3, 0x4c,
 	0x10, 0xfd, 0x9c, 0x26, 0xf9, 0x9a, 0x09, 0x4a, 0xc3, 0xb6, 0xa8, 0x56, 0x40, 0xc2, 0x44, 0x42,
diff --git a/googleapis/spanner/v1/result_set.pb.go b/googleapis/spanner/v1/result_set.pb.go
index 7172f9d5ea..ddf2c623c2 100644
--- a/googleapis/spanner/v1/result_set.pb.go
+++ b/googleapis/spanner/v1/result_set.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/result_set.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Results from [Read][google.spanner.v1.Spanner.Read] or
 // [ExecuteSql][google.spanner.v1.Spanner.ExecuteSql].
@@ -50,16 +53,17 @@ func (m *ResultSet) Reset()         { *m = ResultSet{} }
 func (m *ResultSet) String() string { return proto.CompactTextString(m) }
 func (*ResultSet) ProtoMessage()    {}
 func (*ResultSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_result_set_643b079f04352bdc, []int{0}
+	return fileDescriptor_e8c1400ddbf24213, []int{0}
 }
+
 func (m *ResultSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResultSet.Unmarshal(m, b)
 }
 func (m *ResultSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResultSet.Marshal(b, m, deterministic)
 }
-func (dst *ResultSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResultSet.Merge(dst, src)
+func (m *ResultSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultSet.Merge(m, src)
 }
 func (m *ResultSet) XXX_Size() int {
 	return xxx_messageInfo_ResultSet.Size(m)
@@ -199,16 +203,17 @@ func (m *PartialResultSet) Reset()         { *m = PartialResultSet{} }
 func (m *PartialResultSet) String() string { return proto.CompactTextString(m) }
 func (*PartialResultSet) ProtoMessage()    {}
 func (*PartialResultSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_result_set_643b079f04352bdc, []int{1}
+	return fileDescriptor_e8c1400ddbf24213, []int{1}
 }
+
 func (m *PartialResultSet) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartialResultSet.Unmarshal(m, b)
 }
 func (m *PartialResultSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartialResultSet.Marshal(b, m, deterministic)
 }
-func (dst *PartialResultSet) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartialResultSet.Merge(dst, src)
+func (m *PartialResultSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartialResultSet.Merge(m, src)
 }
 func (m *PartialResultSet) XXX_Size() int {
 	return xxx_messageInfo_PartialResultSet.Size(m)
@@ -278,16 +283,17 @@ func (m *ResultSetMetadata) Reset()         { *m = ResultSetMetadata{} }
 func (m *ResultSetMetadata) String() string { return proto.CompactTextString(m) }
 func (*ResultSetMetadata) ProtoMessage()    {}
 func (*ResultSetMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_result_set_643b079f04352bdc, []int{2}
+	return fileDescriptor_e8c1400ddbf24213, []int{2}
 }
+
 func (m *ResultSetMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResultSetMetadata.Unmarshal(m, b)
 }
 func (m *ResultSetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResultSetMetadata.Marshal(b, m, deterministic)
 }
-func (dst *ResultSetMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResultSetMetadata.Merge(dst, src)
+func (m *ResultSetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultSetMetadata.Merge(m, src)
 }
 func (m *ResultSetMetadata) XXX_Size() int {
 	return xxx_messageInfo_ResultSetMetadata.Size(m)
@@ -343,16 +349,17 @@ func (m *ResultSetStats) Reset()         { *m = ResultSetStats{} }
 func (m *ResultSetStats) String() string { return proto.CompactTextString(m) }
 func (*ResultSetStats) ProtoMessage()    {}
 func (*ResultSetStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_result_set_643b079f04352bdc, []int{3}
+	return fileDescriptor_e8c1400ddbf24213, []int{3}
 }
+
 func (m *ResultSetStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResultSetStats.Unmarshal(m, b)
 }
 func (m *ResultSetStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResultSetStats.Marshal(b, m, deterministic)
 }
-func (dst *ResultSetStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResultSetStats.Merge(dst, src)
+func (m *ResultSetStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultSetStats.Merge(m, src)
 }
 func (m *ResultSetStats) XXX_Size() int {
 	return xxx_messageInfo_ResultSetStats.Size(m)
@@ -414,70 +421,14 @@ func (m *ResultSetStats) GetRowCountLowerBound() int64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ResultSetStats) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ResultSetStats_OneofMarshaler, _ResultSetStats_OneofUnmarshaler, _ResultSetStats_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ResultSetStats) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ResultSetStats_RowCountExact)(nil),
 		(*ResultSetStats_RowCountLowerBound)(nil),
 	}
 }
 
-func _ResultSetStats_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ResultSetStats)
-	// row_count
-	switch x := m.RowCount.(type) {
-	case *ResultSetStats_RowCountExact:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RowCountExact))
-	case *ResultSetStats_RowCountLowerBound:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.RowCountLowerBound))
-	case nil:
-	default:
-		return fmt.Errorf("ResultSetStats.RowCount has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ResultSetStats_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ResultSetStats)
-	switch tag {
-	case 3: // row_count.row_count_exact
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.RowCount = &ResultSetStats_RowCountExact{int64(x)}
-		return true, err
-	case 4: // row_count.row_count_lower_bound
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.RowCount = &ResultSetStats_RowCountLowerBound{int64(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ResultSetStats_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ResultSetStats)
-	// row_count
-	switch x := m.RowCount.(type) {
-	case *ResultSetStats_RowCountExact:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.RowCountExact))
-	case *ResultSetStats_RowCountLowerBound:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.RowCountLowerBound))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*ResultSet)(nil), "google.spanner.v1.ResultSet")
 	proto.RegisterType((*PartialResultSet)(nil), "google.spanner.v1.PartialResultSet")
@@ -485,11 +436,9 @@ func init() {
 	proto.RegisterType((*ResultSetStats)(nil), "google.spanner.v1.ResultSetStats")
 }
 
-func init() {
-	proto.RegisterFile("google/spanner/v1/result_set.proto", fileDescriptor_result_set_643b079f04352bdc)
-}
+func init() { proto.RegisterFile("google/spanner/v1/result_set.proto", fileDescriptor_e8c1400ddbf24213) }
 
-var fileDescriptor_result_set_643b079f04352bdc = []byte{
+var fileDescriptor_e8c1400ddbf24213 = []byte{
 	// 560 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0x13, 0x3f,
 	0x10, 0xc7, 0x7f, 0x4e, 0xda, 0xfe, 0x12, 0x6f, 0x0a, 0xd4, 0x52, 0x69, 0x14, 0x15, 0x94, 0xa6,
diff --git a/googleapis/spanner/v1/spanner.pb.go b/googleapis/spanner/v1/spanner.pb.go
index 72705f522a..2bf787b495 100644
--- a/googleapis/spanner/v1/spanner.pb.go
+++ b/googleapis/spanner/v1/spanner.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/spanner.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import status "google.golang.org/genproto/googleapis/rpc/status"
+package spanner
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_struct "github.com/golang/protobuf/ptypes/struct"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
 )
 
@@ -26,7 +26,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Mode in which the statement must be processed.
 type ExecuteSqlRequest_QueryMode int32
@@ -47,6 +47,7 @@ var ExecuteSqlRequest_QueryMode_name = map[int32]string{
 	1: "PLAN",
 	2: "PROFILE",
 }
+
 var ExecuteSqlRequest_QueryMode_value = map[string]int32{
 	"NORMAL":  0,
 	"PLAN":    1,
@@ -56,8 +57,9 @@ var ExecuteSqlRequest_QueryMode_value = map[string]int32{
 func (x ExecuteSqlRequest_QueryMode) String() string {
 	return proto.EnumName(ExecuteSqlRequest_QueryMode_name, int32(x))
 }
+
 func (ExecuteSqlRequest_QueryMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{6, 0}
+	return fileDescriptor_a420fdbb92791b07, []int{6, 0}
 }
 
 // The request for [CreateSession][google.spanner.v1.Spanner.CreateSession].
@@ -75,16 +77,17 @@ func (m *CreateSessionRequest) Reset()         { *m = CreateSessionRequest{} }
 func (m *CreateSessionRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateSessionRequest) ProtoMessage()    {}
 func (*CreateSessionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{0}
+	return fileDescriptor_a420fdbb92791b07, []int{0}
 }
+
 func (m *CreateSessionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateSessionRequest.Unmarshal(m, b)
 }
 func (m *CreateSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateSessionRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateSessionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateSessionRequest.Merge(dst, src)
+func (m *CreateSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSessionRequest.Merge(m, src)
 }
 func (m *CreateSessionRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateSessionRequest.Size(m)
@@ -138,16 +141,17 @@ func (m *Session) Reset()         { *m = Session{} }
 func (m *Session) String() string { return proto.CompactTextString(m) }
 func (*Session) ProtoMessage()    {}
 func (*Session) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{1}
+	return fileDescriptor_a420fdbb92791b07, []int{1}
 }
+
 func (m *Session) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Session.Unmarshal(m, b)
 }
 func (m *Session) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Session.Marshal(b, m, deterministic)
 }
-func (dst *Session) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Session.Merge(dst, src)
+func (m *Session) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Session.Merge(m, src)
 }
 func (m *Session) XXX_Size() int {
 	return xxx_messageInfo_Session.Size(m)
@@ -199,16 +203,17 @@ func (m *GetSessionRequest) Reset()         { *m = GetSessionRequest{} }
 func (m *GetSessionRequest) String() string { return proto.CompactTextString(m) }
 func (*GetSessionRequest) ProtoMessage()    {}
 func (*GetSessionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{2}
+	return fileDescriptor_a420fdbb92791b07, []int{2}
 }
+
 func (m *GetSessionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSessionRequest.Unmarshal(m, b)
 }
 func (m *GetSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetSessionRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetSessionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetSessionRequest.Merge(dst, src)
+func (m *GetSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSessionRequest.Merge(m, src)
 }
 func (m *GetSessionRequest) XXX_Size() int {
 	return xxx_messageInfo_GetSessionRequest.Size(m)
@@ -258,16 +263,17 @@ func (m *ListSessionsRequest) Reset()         { *m = ListSessionsRequest{} }
 func (m *ListSessionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListSessionsRequest) ProtoMessage()    {}
 func (*ListSessionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{3}
+	return fileDescriptor_a420fdbb92791b07, []int{3}
 }
+
 func (m *ListSessionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSessionsRequest.Unmarshal(m, b)
 }
 func (m *ListSessionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSessionsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListSessionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSessionsRequest.Merge(dst, src)
+func (m *ListSessionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionsRequest.Merge(m, src)
 }
 func (m *ListSessionsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListSessionsRequest.Size(m)
@@ -323,16 +329,17 @@ func (m *ListSessionsResponse) Reset()         { *m = ListSessionsResponse{} }
 func (m *ListSessionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListSessionsResponse) ProtoMessage()    {}
 func (*ListSessionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{4}
+	return fileDescriptor_a420fdbb92791b07, []int{4}
 }
+
 func (m *ListSessionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListSessionsResponse.Unmarshal(m, b)
 }
 func (m *ListSessionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListSessionsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListSessionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListSessionsResponse.Merge(dst, src)
+func (m *ListSessionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionsResponse.Merge(m, src)
 }
 func (m *ListSessionsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListSessionsResponse.Size(m)
@@ -370,16 +377,17 @@ func (m *DeleteSessionRequest) Reset()         { *m = DeleteSessionRequest{} }
 func (m *DeleteSessionRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteSessionRequest) ProtoMessage()    {}
 func (*DeleteSessionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{5}
+	return fileDescriptor_a420fdbb92791b07, []int{5}
 }
+
 func (m *DeleteSessionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteSessionRequest.Unmarshal(m, b)
 }
 func (m *DeleteSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeleteSessionRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeleteSessionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteSessionRequest.Merge(dst, src)
+func (m *DeleteSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSessionRequest.Merge(m, src)
 }
 func (m *DeleteSessionRequest) XXX_Size() int {
 	return xxx_messageInfo_DeleteSessionRequest.Size(m)
@@ -482,16 +490,17 @@ func (m *ExecuteSqlRequest) Reset()         { *m = ExecuteSqlRequest{} }
 func (m *ExecuteSqlRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteSqlRequest) ProtoMessage()    {}
 func (*ExecuteSqlRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{6}
+	return fileDescriptor_a420fdbb92791b07, []int{6}
 }
+
 func (m *ExecuteSqlRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteSqlRequest.Unmarshal(m, b)
 }
 func (m *ExecuteSqlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteSqlRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteSqlRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteSqlRequest.Merge(dst, src)
+func (m *ExecuteSqlRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteSqlRequest.Merge(m, src)
 }
 func (m *ExecuteSqlRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteSqlRequest.Size(m)
@@ -594,16 +603,17 @@ func (m *ExecuteBatchDmlRequest) Reset()         { *m = ExecuteBatchDmlRequest{}
 func (m *ExecuteBatchDmlRequest) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchDmlRequest) ProtoMessage()    {}
 func (*ExecuteBatchDmlRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{7}
+	return fileDescriptor_a420fdbb92791b07, []int{7}
 }
+
 func (m *ExecuteBatchDmlRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchDmlRequest.Unmarshal(m, b)
 }
 func (m *ExecuteBatchDmlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchDmlRequest.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchDmlRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchDmlRequest.Merge(dst, src)
+func (m *ExecuteBatchDmlRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchDmlRequest.Merge(m, src)
 }
 func (m *ExecuteBatchDmlRequest) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchDmlRequest.Size(m)
@@ -679,16 +689,17 @@ func (m *ExecuteBatchDmlRequest_Statement) Reset()         { *m = ExecuteBatchDm
 func (m *ExecuteBatchDmlRequest_Statement) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchDmlRequest_Statement) ProtoMessage()    {}
 func (*ExecuteBatchDmlRequest_Statement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{7, 0}
+	return fileDescriptor_a420fdbb92791b07, []int{7, 0}
 }
+
 func (m *ExecuteBatchDmlRequest_Statement) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchDmlRequest_Statement.Unmarshal(m, b)
 }
 func (m *ExecuteBatchDmlRequest_Statement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchDmlRequest_Statement.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchDmlRequest_Statement) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchDmlRequest_Statement.Merge(dst, src)
+func (m *ExecuteBatchDmlRequest_Statement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchDmlRequest_Statement.Merge(m, src)
 }
 func (m *ExecuteBatchDmlRequest_Statement) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchDmlRequest_Statement.Size(m)
@@ -760,16 +771,17 @@ func (m *ExecuteBatchDmlResponse) Reset()         { *m = ExecuteBatchDmlResponse
 func (m *ExecuteBatchDmlResponse) String() string { return proto.CompactTextString(m) }
 func (*ExecuteBatchDmlResponse) ProtoMessage()    {}
 func (*ExecuteBatchDmlResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{8}
+	return fileDescriptor_a420fdbb92791b07, []int{8}
 }
+
 func (m *ExecuteBatchDmlResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExecuteBatchDmlResponse.Unmarshal(m, b)
 }
 func (m *ExecuteBatchDmlResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ExecuteBatchDmlResponse.Marshal(b, m, deterministic)
 }
-func (dst *ExecuteBatchDmlResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExecuteBatchDmlResponse.Merge(dst, src)
+func (m *ExecuteBatchDmlResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteBatchDmlResponse.Merge(m, src)
 }
 func (m *ExecuteBatchDmlResponse) XXX_Size() int {
 	return xxx_messageInfo_ExecuteBatchDmlResponse.Size(m)
@@ -822,16 +834,17 @@ func (m *PartitionOptions) Reset()         { *m = PartitionOptions{} }
 func (m *PartitionOptions) String() string { return proto.CompactTextString(m) }
 func (*PartitionOptions) ProtoMessage()    {}
 func (*PartitionOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{9}
+	return fileDescriptor_a420fdbb92791b07, []int{9}
 }
+
 func (m *PartitionOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartitionOptions.Unmarshal(m, b)
 }
 func (m *PartitionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartitionOptions.Marshal(b, m, deterministic)
 }
-func (dst *PartitionOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartitionOptions.Merge(dst, src)
+func (m *PartitionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionOptions.Merge(m, src)
 }
 func (m *PartitionOptions) XXX_Size() int {
 	return xxx_messageInfo_PartitionOptions.Size(m)
@@ -911,16 +924,17 @@ func (m *PartitionQueryRequest) Reset()         { *m = PartitionQueryRequest{} }
 func (m *PartitionQueryRequest) String() string { return proto.CompactTextString(m) }
 func (*PartitionQueryRequest) ProtoMessage()    {}
 func (*PartitionQueryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{10}
+	return fileDescriptor_a420fdbb92791b07, []int{10}
 }
+
 func (m *PartitionQueryRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartitionQueryRequest.Unmarshal(m, b)
 }
 func (m *PartitionQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartitionQueryRequest.Marshal(b, m, deterministic)
 }
-func (dst *PartitionQueryRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartitionQueryRequest.Merge(dst, src)
+func (m *PartitionQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionQueryRequest.Merge(m, src)
 }
 func (m *PartitionQueryRequest) XXX_Size() int {
 	return xxx_messageInfo_PartitionQueryRequest.Size(m)
@@ -1014,16 +1028,17 @@ func (m *PartitionReadRequest) Reset()         { *m = PartitionReadRequest{} }
 func (m *PartitionReadRequest) String() string { return proto.CompactTextString(m) }
 func (*PartitionReadRequest) ProtoMessage()    {}
 func (*PartitionReadRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{11}
+	return fileDescriptor_a420fdbb92791b07, []int{11}
 }
+
 func (m *PartitionReadRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartitionReadRequest.Unmarshal(m, b)
 }
 func (m *PartitionReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartitionReadRequest.Marshal(b, m, deterministic)
 }
-func (dst *PartitionReadRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartitionReadRequest.Merge(dst, src)
+func (m *PartitionReadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionReadRequest.Merge(m, src)
 }
 func (m *PartitionReadRequest) XXX_Size() int {
 	return xxx_messageInfo_PartitionReadRequest.Size(m)
@@ -1099,16 +1114,17 @@ func (m *Partition) Reset()         { *m = Partition{} }
 func (m *Partition) String() string { return proto.CompactTextString(m) }
 func (*Partition) ProtoMessage()    {}
 func (*Partition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{12}
+	return fileDescriptor_a420fdbb92791b07, []int{12}
 }
+
 func (m *Partition) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Partition.Unmarshal(m, b)
 }
 func (m *Partition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Partition.Marshal(b, m, deterministic)
 }
-func (dst *Partition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Partition.Merge(dst, src)
+func (m *Partition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Partition.Merge(m, src)
 }
 func (m *Partition) XXX_Size() int {
 	return xxx_messageInfo_Partition.Size(m)
@@ -1142,16 +1158,17 @@ func (m *PartitionResponse) Reset()         { *m = PartitionResponse{} }
 func (m *PartitionResponse) String() string { return proto.CompactTextString(m) }
 func (*PartitionResponse) ProtoMessage()    {}
 func (*PartitionResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{13}
+	return fileDescriptor_a420fdbb92791b07, []int{13}
 }
+
 func (m *PartitionResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PartitionResponse.Unmarshal(m, b)
 }
 func (m *PartitionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PartitionResponse.Marshal(b, m, deterministic)
 }
-func (dst *PartitionResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PartitionResponse.Merge(dst, src)
+func (m *PartitionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionResponse.Merge(m, src)
 }
 func (m *PartitionResponse) XXX_Size() int {
 	return xxx_messageInfo_PartitionResponse.Size(m)
@@ -1238,16 +1255,17 @@ func (m *ReadRequest) Reset()         { *m = ReadRequest{} }
 func (m *ReadRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadRequest) ProtoMessage()    {}
 func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{14}
+	return fileDescriptor_a420fdbb92791b07, []int{14}
 }
+
 func (m *ReadRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReadRequest.Unmarshal(m, b)
 }
 func (m *ReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReadRequest.Marshal(b, m, deterministic)
 }
-func (dst *ReadRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRequest.Merge(dst, src)
+func (m *ReadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRequest.Merge(m, src)
 }
 func (m *ReadRequest) XXX_Size() int {
 	return xxx_messageInfo_ReadRequest.Size(m)
@@ -1337,16 +1355,17 @@ func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest
 func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
 func (*BeginTransactionRequest) ProtoMessage()    {}
 func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{15}
+	return fileDescriptor_a420fdbb92791b07, []int{15}
 }
+
 func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
 }
 func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
 }
-func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+func (m *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(m, src)
 }
 func (m *BeginTransactionRequest) XXX_Size() int {
 	return xxx_messageInfo_BeginTransactionRequest.Size(m)
@@ -1394,16 +1413,17 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{16}
+	return fileDescriptor_a420fdbb92791b07, []int{16}
 }
+
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (dst *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(dst, src)
+func (m *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(m, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -1465,76 +1485,14 @@ func (m *CommitRequest) GetMutations() []*Mutation {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CommitRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CommitRequest_OneofMarshaler, _CommitRequest_OneofUnmarshaler, _CommitRequest_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*CommitRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*CommitRequest_TransactionId)(nil),
 		(*CommitRequest_SingleUseTransaction)(nil),
 	}
 }
 
-func _CommitRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CommitRequest)
-	// transaction
-	switch x := m.Transaction.(type) {
-	case *CommitRequest_TransactionId:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.TransactionId)
-	case *CommitRequest_SingleUseTransaction:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SingleUseTransaction); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CommitRequest.Transaction has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CommitRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CommitRequest)
-	switch tag {
-	case 2: // transaction.transaction_id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Transaction = &CommitRequest_TransactionId{x}
-		return true, err
-	case 3: // transaction.single_use_transaction
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions)
-		err := b.DecodeMessage(msg)
-		m.Transaction = &CommitRequest_SingleUseTransaction{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CommitRequest)
-	// transaction
-	switch x := m.Transaction.(type) {
-	case *CommitRequest_TransactionId:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.TransactionId)))
-		n += len(x.TransactionId)
-	case *CommitRequest_SingleUseTransaction:
-		s := proto.Size(x.SingleUseTransaction)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // The response for [Commit][google.spanner.v1.Spanner.Commit].
 type CommitResponse struct {
 	// The Cloud Spanner timestamp at which the transaction committed.
@@ -1548,16 +1506,17 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{17}
+	return fileDescriptor_a420fdbb92791b07, []int{17}
 }
+
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (dst *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(dst, src)
+func (m *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(m, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -1590,16 +1549,17 @@ func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
 func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
 func (*RollbackRequest) ProtoMessage()    {}
 func (*RollbackRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_spanner_9927dc9412546f3a, []int{18}
+	return fileDescriptor_a420fdbb92791b07, []int{18}
 }
+
 func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
 }
 func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
 }
-func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+func (m *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(m, src)
 }
 func (m *RollbackRequest) XXX_Size() int {
 	return xxx_messageInfo_RollbackRequest.Size(m)
@@ -1625,6 +1585,7 @@ func (m *RollbackRequest) GetTransactionId() []byte {
 }
 
 func init() {
+	proto.RegisterEnum("google.spanner.v1.ExecuteSqlRequest_QueryMode", ExecuteSqlRequest_QueryMode_name, ExecuteSqlRequest_QueryMode_value)
 	proto.RegisterType((*CreateSessionRequest)(nil), "google.spanner.v1.CreateSessionRequest")
 	proto.RegisterType((*Session)(nil), "google.spanner.v1.Session")
 	proto.RegisterMapType((map[string]string)(nil), "google.spanner.v1.Session.LabelsEntry")
@@ -1649,7 +1610,127 @@ func init() {
 	proto.RegisterType((*CommitRequest)(nil), "google.spanner.v1.CommitRequest")
 	proto.RegisterType((*CommitResponse)(nil), "google.spanner.v1.CommitResponse")
 	proto.RegisterType((*RollbackRequest)(nil), "google.spanner.v1.RollbackRequest")
-	proto.RegisterEnum("google.spanner.v1.ExecuteSqlRequest_QueryMode", ExecuteSqlRequest_QueryMode_name, ExecuteSqlRequest_QueryMode_value)
+}
+
+func init() { proto.RegisterFile("google/spanner/v1/spanner.proto", fileDescriptor_a420fdbb92791b07) }
+
+var fileDescriptor_a420fdbb92791b07 = []byte{
+	// 1832 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0xcd, 0x6f, 0x1b, 0xc7,
+	0x15, 0xf7, 0x92, 0x12, 0x25, 0x3e, 0xea, 0x73, 0xc2, 0x48, 0x0c, 0xed, 0x26, 0xca, 0x26, 0x8e,
+	0x54, 0x02, 0x25, 0x63, 0xc5, 0x28, 0x1c, 0x25, 0x69, 0x1c, 0xd9, 0x8a, 0xed, 0x5a, 0xb2, 0xe8,
+	0xa5, 0xec, 0xa0, 0x81, 0x0b, 0x62, 0x44, 0x4e, 0x98, 0xad, 0xf6, 0x4b, 0x3b, 0x43, 0x43, 0x4c,
+	0x91, 0x4b, 0xd1, 0xde, 0x7a, 0x68, 0x1b, 0x14, 0x3d, 0xb4, 0xb7, 0xde, 0x8a, 0x1c, 0x0b, 0xe4,
+	0x56, 0x14, 0x28, 0x90, 0x43, 0x80, 0x9e, 0xfa, 0x2f, 0xf4, 0x6f, 0xe8, 0xa5, 0x97, 0x62, 0xbe,
+	0x96, 0x4b, 0x72, 0x44, 0x31, 0xa5, 0x13, 0xa0, 0xe8, 0x89, 0x3b, 0xf3, 0xde, 0xbc, 0xf9, 0xcd,
+	0xfb, 0xfd, 0xe6, 0xe3, 0x81, 0xf0, 0x52, 0x27, 0x0c, 0x3b, 0x1e, 0xa9, 0xd1, 0x08, 0x07, 0x01,
+	0x89, 0x6b, 0x4f, 0xaf, 0xe9, 0xcf, 0x6a, 0x14, 0x87, 0x2c, 0x44, 0xab, 0xd2, 0xa1, 0xaa, 0x7b,
+	0x9f, 0x5e, 0x2b, 0x5f, 0x51, 0x63, 0x70, 0xe4, 0xd6, 0x70, 0x10, 0x84, 0x0c, 0x33, 0x37, 0x0c,
+	0xa8, 0x1c, 0x50, 0xbe, 0xac, 0xac, 0xa2, 0x75, 0xdc, 0xfd, 0xa8, 0x46, 0xfc, 0x88, 0xf5, 0x94,
+	0xf1, 0xca, 0xb0, 0x91, 0xb2, 0xb8, 0xdb, 0x62, 0xca, 0xfa, 0xd2, 0xb0, 0x95, 0xb9, 0x3e, 0xa1,
+	0x0c, 0xfb, 0x91, 0x72, 0x58, 0x57, 0x0e, 0x71, 0xd4, 0xaa, 0x51, 0x86, 0x59, 0x97, 0x0e, 0xc5,
+	0x4d, 0x2d, 0xe3, 0x84, 0xf4, 0xb4, 0x75, 0x63, 0xd4, 0xea, 0x77, 0x25, 0x6a, 0xe5, 0x61, 0x8f,
+	0x7a, 0xc4, 0x84, 0x76, 0x3d, 0xd6, 0xa4, 0x44, 0xa3, 0x7b, 0x65, 0xd4, 0x87, 0xc5, 0x38, 0xa0,
+	0xb8, 0x95, 0x0a, 0x64, 0x00, 0xc2, 0x7a, 0x11, 0x91, 0x56, 0xfb, 0x63, 0x28, 0xde, 0x8a, 0x09,
+	0x66, 0xa4, 0x41, 0x28, 0x75, 0xc3, 0xc0, 0x21, 0xa7, 0x5d, 0x42, 0x19, 0x2a, 0xc3, 0x7c, 0x1b,
+	0x33, 0x7c, 0x8c, 0x29, 0x29, 0x59, 0x1b, 0xd6, 0x56, 0xde, 0x49, 0xda, 0xe8, 0x3a, 0xcc, 0x51,
+	0xe9, 0x5d, 0xca, 0x6c, 0x58, 0x5b, 0x85, 0xed, 0x72, 0x75, 0x84, 0x92, 0xaa, 0x8e, 0xa7, 0x5d,
+	0xed, 0xcf, 0x33, 0x30, 0xa7, 0x3a, 0x11, 0x82, 0x99, 0x00, 0xfb, 0x3a, 0xb2, 0xf8, 0x46, 0x3f,
+	0x80, 0x9c, 0x87, 0x8f, 0x89, 0x47, 0x4b, 0x99, 0x8d, 0xec, 0x56, 0x61, 0xfb, 0xb5, 0xf3, 0x83,
+	0x56, 0xf7, 0x85, 0xe3, 0x5e, 0xc0, 0xe2, 0x9e, 0xa3, 0x46, 0xa1, 0xb7, 0xa0, 0xd0, 0x12, 0x2b,
+	0x69, 0x72, 0x8e, 0x4a, 0xd9, 0x41, 0x64, 0x9a, 0xc0, 0xea, 0x91, 0x26, 0xd0, 0x01, 0xe9, 0xce,
+	0x3b, 0xd0, 0x23, 0x78, 0x01, 0x47, 0x51, 0x1c, 0x9e, 0xb9, 0x3e, 0x8f, 0xe0, 0x61, 0xca, 0x9a,
+	0x5d, 0xaa, 0x42, 0xcd, 0x5c, 0x18, 0x6a, 0x2d, 0x35, 0x78, 0x1f, 0x53, 0xf6, 0x88, 0x8a, 0xb0,
+	0xe5, 0x37, 0xa1, 0x90, 0x82, 0x8a, 0x56, 0x20, 0x7b, 0x42, 0x7a, 0x6a, 0xd5, 0xfc, 0x13, 0x15,
+	0x61, 0xf6, 0x29, 0xf6, 0xba, 0x44, 0x24, 0x32, 0xef, 0xc8, 0xc6, 0x4e, 0xe6, 0x86, 0x65, 0x6f,
+	0xc2, 0xea, 0x1d, 0xc2, 0x86, 0x58, 0x31, 0xe4, 0xcd, 0xfe, 0x85, 0x05, 0xcf, 0xed, 0xbb, 0x54,
+	0xbb, 0xd2, 0x49, 0x18, 0xbc, 0x0c, 0xf9, 0x08, 0x77, 0x48, 0x93, 0xba, 0x9f, 0xc8, 0xa9, 0x67,
+	0x9d, 0x79, 0xde, 0xd1, 0x70, 0x3f, 0x21, 0xe8, 0x3b, 0x00, 0xc2, 0xc8, 0xc2, 0x13, 0x12, 0x88,
+	0x3c, 0xe6, 0x1d, 0xe1, 0x7e, 0xc4, 0x3b, 0xd0, 0x1a, 0xe4, 0x3e, 0x72, 0x3d, 0x46, 0x62, 0x91,
+	0x97, 0xbc, 0xa3, 0x5a, 0xf6, 0x53, 0x28, 0x0e, 0xc2, 0xa0, 0x51, 0x18, 0x50, 0x82, 0xbe, 0x0f,
+	0xf3, 0x4a, 0x02, 0xb4, 0x64, 0x09, 0x66, 0xc7, 0xc9, 0x25, 0xf1, 0x45, 0xaf, 0xc1, 0x72, 0x40,
+	0xce, 0x58, 0x33, 0x85, 0x45, 0x26, 0x69, 0x91, 0x77, 0xd7, 0x35, 0x1e, 0xbb, 0x02, 0xc5, 0xdb,
+	0xc4, 0x23, 0x23, 0x0a, 0x36, 0xe5, 0xea, 0xab, 0x19, 0x58, 0xdd, 0x3b, 0x23, 0xad, 0x2e, 0x23,
+	0x8d, 0x53, 0x4f, 0x7b, 0x96, 0xfa, 0x7a, 0x96, 0xce, 0xba, 0x89, 0xee, 0x42, 0x21, 0xb5, 0xa1,
+	0x94, 0xda, 0x4d, 0xc2, 0x3c, 0xea, 0x7b, 0x35, 0x88, 0x47, 0x5a, 0x2c, 0x8c, 0x9d, 0xf4, 0x50,
+	0x4e, 0x3d, 0x3d, 0xf5, 0x54, 0x36, 0xf9, 0x27, 0xaa, 0x41, 0x2e, 0xc2, 0x31, 0xf6, 0xa9, 0xd2,
+	0xd7, 0xfa, 0x88, 0xbe, 0x1a, 0xe2, 0x24, 0x72, 0x94, 0x1b, 0x7a, 0x04, 0x05, 0xf1, 0xd5, 0xe4,
+	0xdb, 0x97, 0x96, 0x66, 0x45, 0x2e, 0xaf, 0x1b, 0xc0, 0x8c, 0xac, 0xb0, 0x5a, 0xe7, 0xe3, 0x8e,
+	0xf8, 0x30, 0xb9, 0x67, 0x20, 0x4a, 0x3a, 0xd0, 0xcb, 0xb0, 0xc0, 0x0f, 0x16, 0x5f, 0x27, 0x39,
+	0xb7, 0x61, 0x6d, 0x2d, 0x38, 0x05, 0xd9, 0x27, 0x29, 0x3f, 0x00, 0x38, 0xed, 0x92, 0xb8, 0xd7,
+	0xf4, 0xc3, 0x36, 0x29, 0xcd, 0x6d, 0x58, 0x5b, 0x4b, 0xdb, 0xd5, 0x89, 0x26, 0x7e, 0xc8, 0x87,
+	0x1d, 0x84, 0x6d, 0xe2, 0xe4, 0x4f, 0xf5, 0x27, 0xda, 0x84, 0xe5, 0x08, 0xc7, 0xcc, 0xe5, 0x89,
+	0x51, 0x93, 0xce, 0x8b, 0x49, 0x97, 0x92, 0x6e, 0x39, 0x6f, 0x11, 0x66, 0x29, 0x39, 0x0d, 0xc2,
+	0x52, 0x7e, 0xc3, 0xda, 0xca, 0x3a, 0xb2, 0x51, 0x7e, 0x0c, 0xcb, 0x43, 0xeb, 0x31, 0x6c, 0xac,
+	0xef, 0xa5, 0x37, 0x56, 0x2a, 0xb9, 0x69, 0xce, 0x7a, 0x11, 0x49, 0xef, 0xb8, 0x2a, 0xe4, 0x13,
+	0xb8, 0x08, 0x20, 0xf7, 0xe0, 0xd0, 0x39, 0x78, 0x6f, 0x7f, 0xe5, 0x12, 0x9a, 0x87, 0x99, 0xfa,
+	0xfe, 0x7b, 0x0f, 0x56, 0x2c, 0x54, 0x80, 0xb9, 0xba, 0x73, 0xf8, 0xfe, 0xbd, 0xfd, 0xbd, 0x95,
+	0x8c, 0xfd, 0xaf, 0x2c, 0xac, 0xa9, 0x15, 0xef, 0x62, 0xd6, 0xfa, 0xf8, 0xb6, 0xff, 0xad, 0x2a,
+	0xaa, 0x01, 0xc0, 0x2f, 0x1c, 0xe2, 0x93, 0x80, 0xd1, 0x52, 0x56, 0xa8, 0xe1, 0x8d, 0xf3, 0x49,
+	0x19, 0x82, 0x58, 0x6d, 0xe8, 0xb1, 0x4e, 0x2a, 0x4c, 0x3f, 0xe3, 0x33, 0xe9, 0x8c, 0xff, 0x32,
+	0x03, 0xf9, 0xc4, 0x5f, 0x4b, 0xd9, 0x32, 0x49, 0x39, 0x33, 0x99, 0x94, 0xdb, 0x83, 0x52, 0x96,
+	0xe0, 0x6f, 0xfd, 0x17, 0xe0, 0xc7, 0x29, 0xfb, 0x1b, 0x13, 0xca, 0xcf, 0x2d, 0x58, 0x1f, 0x01,
+	0xa6, 0x4e, 0xbb, 0x77, 0xa0, 0xd0, 0xbf, 0xa6, 0xf5, 0x81, 0x77, 0xc5, 0x10, 0xd4, 0x11, 0x5e,
+	0x0d, 0xc2, 0x1c, 0x88, 0xf5, 0x27, 0x45, 0x15, 0xc8, 0xc9, 0x57, 0x84, 0x82, 0x83, 0xf4, 0xc8,
+	0x38, 0x6a, 0x89, 0x55, 0x77, 0xa9, 0xa3, 0x3c, 0xec, 0x13, 0x58, 0xa9, 0xeb, 0xfd, 0x72, 0x18,
+	0x89, 0x07, 0x0f, 0x7a, 0x1d, 0x8a, 0xfd, 0xad, 0xc5, 0x4f, 0xf7, 0xe6, 0x71, 0x8f, 0x11, 0x2a,
+	0x16, 0x9c, 0x75, 0x50, 0x62, 0xe3, 0x07, 0xfd, 0x2e, 0xb7, 0xa0, 0xab, 0xb0, 0xe4, 0xe3, 0xb3,
+	0x66, 0x62, 0x91, 0x33, 0x67, 0x9d, 0x45, 0x1f, 0x9f, 0x25, 0xe1, 0xa9, 0xfd, 0xb7, 0x2c, 0x3c,
+	0x9f, 0x34, 0xc5, 0x36, 0xf9, 0x1f, 0x3b, 0x3d, 0x7f, 0x64, 0x3a, 0x3d, 0x6f, 0x18, 0xc0, 0x18,
+	0x57, 0x39, 0xf6, 0x04, 0xad, 0xc3, 0x6a, 0x3f, 0xe9, 0xa1, 0x64, 0x42, 0x1c, 0xa3, 0x85, 0xed,
+	0x57, 0xc6, 0x4d, 0xa0, 0x48, 0x73, 0x56, 0xa2, 0xa1, 0x9e, 0x6f, 0x4c, 0xb9, 0x5f, 0x66, 0xa0,
+	0x98, 0x4c, 0xef, 0x10, 0xdc, 0xfe, 0x36, 0x49, 0x2c, 0xc2, 0x2c, 0xc3, 0xc7, 0x1e, 0x51, 0x34,
+	0xca, 0x06, 0xef, 0x75, 0x83, 0x36, 0x39, 0x53, 0xaf, 0x09, 0xd9, 0xe0, 0x78, 0x5a, 0xa1, 0xd7,
+	0xf5, 0x03, 0xc9, 0x54, 0xde, 0xd1, 0x4d, 0xb4, 0x0d, 0x73, 0x27, 0xa4, 0xc7, 0x77, 0x97, 0x4a,
+	0xf1, 0x0b, 0x06, 0x2c, 0xf7, 0x49, 0x8f, 0xef, 0xac, 0xdc, 0x89, 0xf8, 0x35, 0x13, 0x94, 0x9f,
+	0x82, 0x20, 0xfb, 0x3a, 0xe4, 0x13, 0x2f, 0xd3, 0x7d, 0x66, 0x99, 0xee, 0x33, 0xfb, 0x33, 0x0b,
+	0x56, 0x53, 0xe9, 0x57, 0x47, 0xc6, 0xdb, 0xfc, 0xbd, 0x95, 0xec, 0xbe, 0xf3, 0x4f, 0x8c, 0xfe,
+	0xc8, 0x94, 0x3f, 0xba, 0x69, 0xe2, 0xe7, 0xc5, 0xf1, 0xfc, 0x0c, 0xf0, 0x62, 0xff, 0x3d, 0x03,
+	0x85, 0xff, 0x1f, 0x2d, 0x14, 0x61, 0xd6, 0x73, 0x7d, 0x97, 0x89, 0x27, 0x47, 0xd6, 0x91, 0x8d,
+	0x91, 0x47, 0x50, 0x7e, 0xf4, 0x11, 0x64, 0x60, 0x19, 0x8c, 0x2c, 0x33, 0x58, 0xdf, 0x25, 0x1d,
+	0x37, 0x48, 0x27, 0xfc, 0xc2, 0xd4, 0xbe, 0x0b, 0x73, 0x5a, 0x98, 0x32, 0xad, 0x57, 0xc7, 0xa7,
+	0x55, 0x4b, 0x53, 0x8f, 0xb2, 0xff, 0x6d, 0xc1, 0xe2, 0xad, 0xd0, 0xf7, 0x5d, 0x76, 0xf1, 0x64,
+	0x9b, 0xb0, 0x94, 0x22, 0xa3, 0xe9, 0xb6, 0xc5, 0x9c, 0x0b, 0x77, 0x2f, 0x39, 0x8b, 0xa9, 0xfe,
+	0x7b, 0x6d, 0xf4, 0x63, 0x58, 0xa3, 0x6e, 0xd0, 0xf1, 0x88, 0x2c, 0x86, 0x52, 0xdc, 0x67, 0xbf,
+	0x06, 0xc8, 0xbb, 0x97, 0x9c, 0xa2, 0x0c, 0xc3, 0xeb, 0xa2, 0x94, 0x0a, 0xde, 0x84, 0xbc, 0xae,
+	0x7a, 0xf9, 0x39, 0xce, 0x85, 0x7f, 0xd9, 0x10, 0xf1, 0x40, 0xf9, 0x38, 0x7d, 0xef, 0xdd, 0xc5,
+	0x01, 0x29, 0xda, 0x1f, 0xc0, 0x92, 0x5e, 0xbc, 0xda, 0x55, 0x7b, 0xb0, 0xd2, 0x12, 0x3d, 0xcd,
+	0xa4, 0x64, 0x17, 0x69, 0x18, 0x5f, 0xc8, 0x2d, 0xcb, 0x31, 0x49, 0x87, 0xed, 0xc0, 0xb2, 0x13,
+	0x7a, 0xde, 0x31, 0x6e, 0x9d, 0x5c, 0x9c, 0xd7, 0xab, 0xe6, 0xbc, 0x0e, 0x65, 0x75, 0xfb, 0x4b,
+	0x04, 0x73, 0x0d, 0xb9, 0x3c, 0xf4, 0x7b, 0x4e, 0x5b, 0xba, 0x00, 0x47, 0x9b, 0x86, 0x0c, 0x98,
+	0x4a, 0xf4, 0xf2, 0x98, 0x32, 0xca, 0xde, 0xfb, 0xd9, 0x3f, 0xfe, 0xf9, 0x59, 0xe6, 0x5d, 0x7b,
+	0x87, 0x97, 0xfb, 0x3f, 0xd5, 0x75, 0xdf, 0x3b, 0x51, 0x1c, 0xfe, 0x84, 0xb4, 0x18, 0xad, 0x55,
+	0x6a, 0x6e, 0x40, 0x19, 0x0e, 0x5a, 0x84, 0x7f, 0x6b, 0x3b, 0xad, 0x55, 0x3e, 0xad, 0xe9, 0x02,
+	0x6c, 0xc7, 0xaa, 0xa0, 0x5f, 0x59, 0x00, 0xfd, 0x2a, 0x14, 0xbd, 0x6a, 0x98, 0x71, 0xa4, 0x48,
+	0x1d, 0x8b, 0xeb, 0xa6, 0xc0, 0xb5, 0x83, 0x6e, 0x08, 0x5c, 0xbc, 0x26, 0x9b, 0x00, 0x53, 0x02,
+	0xa9, 0x56, 0xf9, 0x14, 0xfd, 0xd1, 0x82, 0x85, 0x74, 0x9d, 0x89, 0x4c, 0xe7, 0x8f, 0xa1, 0x1e,
+	0x2e, 0x6f, 0x5e, 0xe8, 0x27, 0x95, 0x63, 0xef, 0x0a, 0x8c, 0x6f, 0xa3, 0x29, 0x72, 0x87, 0x7e,
+	0x63, 0xc1, 0xe2, 0x40, 0x55, 0x6a, 0xa4, 0xd5, 0x54, 0xb7, 0x96, 0xd7, 0x46, 0xe4, 0xb9, 0xe7,
+	0x47, 0xac, 0xa7, 0x53, 0x57, 0x99, 0x2a, 0x75, 0xd0, 0x2f, 0xd1, 0x8c, 0x6c, 0x8e, 0x54, 0x70,
+	0xe5, 0xb1, 0x6f, 0x57, 0xfb, 0xa1, 0x00, 0x75, 0xdf, 0x7e, 0x5f, 0x80, 0x52, 0x93, 0x7d, 0x4d,
+	0x5c, 0x3b, 0x24, 0x99, 0x94, 0x6b, 0xee, 0x2f, 0x16, 0x3c, 0xa7, 0x61, 0xb0, 0x98, 0x60, 0xdf,
+	0x0d, 0x3a, 0x93, 0xc3, 0x3d, 0xf7, 0x3e, 0xc7, 0x5e, 0x1f, 0xf5, 0x87, 0x02, 0xf5, 0x91, 0x7d,
+	0xf8, 0x2c, 0x50, 0xa7, 0x30, 0xee, 0x58, 0x95, 0xd7, 0x2d, 0xf4, 0x57, 0x0b, 0x96, 0x87, 0xca,
+	0x03, 0xf4, 0xdd, 0x89, 0x6b, 0x9b, 0x72, 0x65, 0x12, 0x57, 0x25, 0xd5, 0xc7, 0x62, 0x21, 0x75,
+	0xfb, 0xfe, 0x33, 0x58, 0x88, 0x0e, 0xce, 0x39, 0xf8, 0xb5, 0x05, 0x33, 0xfc, 0x49, 0x80, 0x5e,
+	0x34, 0xb2, 0x9f, 0xbc, 0x15, 0x2e, 0x50, 0xc7, 0x7d, 0x01, 0x6f, 0xcf, 0xbe, 0x39, 0x0d, 0xbc,
+	0x98, 0xe0, 0x36, 0xc7, 0xf4, 0xb9, 0x05, 0x8b, 0x49, 0xb2, 0x27, 0x02, 0x37, 0x91, 0x16, 0x8e,
+	0x04, 0xc6, 0x07, 0xf6, 0xbd, 0x69, 0x30, 0xd2, 0x34, 0x2e, 0xa9, 0x82, 0x2f, 0x2c, 0x58, 0x19,
+	0x7e, 0x06, 0x20, 0x13, 0xb7, 0xe7, 0xbc, 0x15, 0xca, 0x17, 0xbc, 0xe1, 0xec, 0x0f, 0x04, 0xf0,
+	0x87, 0xf6, 0xfe, 0x34, 0xc0, 0x8f, 0x87, 0x26, 0xe7, 0x89, 0xfe, 0x83, 0x05, 0x39, 0x79, 0x99,
+	0xa2, 0x0d, 0xd3, 0x5d, 0x94, 0x7e, 0x64, 0x94, 0x5f, 0x1e, 0xe3, 0xa1, 0x44, 0x7a, 0x20, 0x80,
+	0xde, 0xb1, 0x77, 0xa7, 0x01, 0x2a, 0xef, 0x65, 0x0e, 0xef, 0x77, 0x16, 0xcc, 0xeb, 0x2b, 0x19,
+	0xd9, 0x26, 0x09, 0x0c, 0xde, 0xd7, 0xe7, 0x1e, 0xa8, 0x87, 0x02, 0xd7, 0x3d, 0xfb, 0xf6, 0x54,
+	0xea, 0x54, 0x93, 0x71, 0x64, 0x5f, 0x58, 0xb0, 0x34, 0x58, 0x3d, 0xa2, 0xad, 0x49, 0x0b, 0xcc,
+	0xf2, 0xab, 0x63, 0x5f, 0xfc, 0x3a, 0x97, 0x8f, 0x04, 0xe6, 0x43, 0xfb, 0x87, 0xd3, 0x60, 0x8e,
+	0x06, 0x00, 0x70, 0xe4, 0x7f, 0xb6, 0x60, 0x71, 0xa0, 0x2e, 0x34, 0x5e, 0x57, 0xa6, 0xca, 0x71,
+	0x42, 0xdc, 0xcf, 0x64, 0x97, 0x45, 0xe9, 0xf9, 0x77, 0xac, 0xca, 0xee, 0x6f, 0x2d, 0x78, 0xbe,
+	0x15, 0xfa, 0xa3, 0x08, 0x76, 0x17, 0xd4, 0xfb, 0xaa, 0xce, 0x29, 0xaf, 0x5b, 0x1f, 0xde, 0x50,
+	0x2e, 0x9d, 0xd0, 0xc3, 0x41, 0xa7, 0x1a, 0xc6, 0x9d, 0x5a, 0x87, 0x04, 0x42, 0x10, 0x35, 0x69,
+	0xc2, 0x91, 0x4b, 0x53, 0xff, 0x91, 0xbc, 0xa5, 0x3e, 0xff, 0x94, 0x59, 0xbf, 0x23, 0x87, 0xde,
+	0xf2, 0xc2, 0x6e, 0xbb, 0xaa, 0xe2, 0x56, 0x1f, 0x5f, 0xfb, 0x4a, 0x5b, 0x9e, 0x08, 0xcb, 0x13,
+	0x65, 0x79, 0xf2, 0xf8, 0xda, 0x71, 0x4e, 0x04, 0x7e, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x33, 0x44, 0xce, 0x51, 0xcb, 0x1a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2467,126 +2548,3 @@ var _Spanner_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/spanner/v1/spanner.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/spanner/v1/spanner.proto", fileDescriptor_spanner_9927dc9412546f3a)
-}
-
-var fileDescriptor_spanner_9927dc9412546f3a = []byte{
-	// 1832 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0xcd, 0x6f, 0x1b, 0xc7,
-	0x15, 0xf7, 0x92, 0x12, 0x25, 0x3e, 0xea, 0x73, 0xc2, 0x48, 0x0c, 0xed, 0x26, 0xca, 0x26, 0x8e,
-	0x54, 0x02, 0x25, 0x63, 0xc5, 0x28, 0x1c, 0x25, 0x69, 0x1c, 0xd9, 0x8a, 0xed, 0x5a, 0xb2, 0xe8,
-	0xa5, 0xec, 0xa0, 0x81, 0x0b, 0x62, 0x44, 0x4e, 0x98, 0xad, 0xf6, 0x4b, 0x3b, 0x43, 0x43, 0x4c,
-	0x91, 0x4b, 0xd1, 0xde, 0x7a, 0x68, 0x1b, 0x14, 0x3d, 0xb4, 0xb7, 0xde, 0x8a, 0x1c, 0x0b, 0xe4,
-	0x56, 0x14, 0x28, 0x90, 0x43, 0x80, 0x9e, 0xfa, 0x2f, 0xf4, 0x6f, 0xe8, 0xa5, 0x97, 0x62, 0xbe,
-	0x96, 0x4b, 0x72, 0x44, 0x31, 0xa5, 0x13, 0xa0, 0xe8, 0x89, 0x3b, 0xf3, 0xde, 0xbc, 0xf9, 0xcd,
-	0xfb, 0xfd, 0xe6, 0xe3, 0x81, 0xf0, 0x52, 0x27, 0x0c, 0x3b, 0x1e, 0xa9, 0xd1, 0x08, 0x07, 0x01,
-	0x89, 0x6b, 0x4f, 0xaf, 0xe9, 0xcf, 0x6a, 0x14, 0x87, 0x2c, 0x44, 0xab, 0xd2, 0xa1, 0xaa, 0x7b,
-	0x9f, 0x5e, 0x2b, 0x5f, 0x51, 0x63, 0x70, 0xe4, 0xd6, 0x70, 0x10, 0x84, 0x0c, 0x33, 0x37, 0x0c,
-	0xa8, 0x1c, 0x50, 0xbe, 0xac, 0xac, 0xa2, 0x75, 0xdc, 0xfd, 0xa8, 0x46, 0xfc, 0x88, 0xf5, 0x94,
-	0xf1, 0xca, 0xb0, 0x91, 0xb2, 0xb8, 0xdb, 0x62, 0xca, 0xfa, 0xd2, 0xb0, 0x95, 0xb9, 0x3e, 0xa1,
-	0x0c, 0xfb, 0x91, 0x72, 0x58, 0x57, 0x0e, 0x71, 0xd4, 0xaa, 0x51, 0x86, 0x59, 0x97, 0x0e, 0xc5,
-	0x4d, 0x2d, 0xe3, 0x84, 0xf4, 0xb4, 0x75, 0x63, 0xd4, 0xea, 0x77, 0x25, 0x6a, 0xe5, 0x61, 0x8f,
-	0x7a, 0xc4, 0x84, 0x76, 0x3d, 0xd6, 0xa4, 0x44, 0xa3, 0x7b, 0x65, 0xd4, 0x87, 0xc5, 0x38, 0xa0,
-	0xb8, 0x95, 0x0a, 0x64, 0x00, 0xc2, 0x7a, 0x11, 0x91, 0x56, 0xfb, 0x63, 0x28, 0xde, 0x8a, 0x09,
-	0x66, 0xa4, 0x41, 0x28, 0x75, 0xc3, 0xc0, 0x21, 0xa7, 0x5d, 0x42, 0x19, 0x2a, 0xc3, 0x7c, 0x1b,
-	0x33, 0x7c, 0x8c, 0x29, 0x29, 0x59, 0x1b, 0xd6, 0x56, 0xde, 0x49, 0xda, 0xe8, 0x3a, 0xcc, 0x51,
-	0xe9, 0x5d, 0xca, 0x6c, 0x58, 0x5b, 0x85, 0xed, 0x72, 0x75, 0x84, 0x92, 0xaa, 0x8e, 0xa7, 0x5d,
-	0xed, 0xcf, 0x33, 0x30, 0xa7, 0x3a, 0x11, 0x82, 0x99, 0x00, 0xfb, 0x3a, 0xb2, 0xf8, 0x46, 0x3f,
-	0x80, 0x9c, 0x87, 0x8f, 0x89, 0x47, 0x4b, 0x99, 0x8d, 0xec, 0x56, 0x61, 0xfb, 0xb5, 0xf3, 0x83,
-	0x56, 0xf7, 0x85, 0xe3, 0x5e, 0xc0, 0xe2, 0x9e, 0xa3, 0x46, 0xa1, 0xb7, 0xa0, 0xd0, 0x12, 0x2b,
-	0x69, 0x72, 0x8e, 0x4a, 0xd9, 0x41, 0x64, 0x9a, 0xc0, 0xea, 0x91, 0x26, 0xd0, 0x01, 0xe9, 0xce,
-	0x3b, 0xd0, 0x23, 0x78, 0x01, 0x47, 0x51, 0x1c, 0x9e, 0xb9, 0x3e, 0x8f, 0xe0, 0x61, 0xca, 0x9a,
-	0x5d, 0xaa, 0x42, 0xcd, 0x5c, 0x18, 0x6a, 0x2d, 0x35, 0x78, 0x1f, 0x53, 0xf6, 0x88, 0x8a, 0xb0,
-	0xe5, 0x37, 0xa1, 0x90, 0x82, 0x8a, 0x56, 0x20, 0x7b, 0x42, 0x7a, 0x6a, 0xd5, 0xfc, 0x13, 0x15,
-	0x61, 0xf6, 0x29, 0xf6, 0xba, 0x44, 0x24, 0x32, 0xef, 0xc8, 0xc6, 0x4e, 0xe6, 0x86, 0x65, 0x6f,
-	0xc2, 0xea, 0x1d, 0xc2, 0x86, 0x58, 0x31, 0xe4, 0xcd, 0xfe, 0x85, 0x05, 0xcf, 0xed, 0xbb, 0x54,
-	0xbb, 0xd2, 0x49, 0x18, 0xbc, 0x0c, 0xf9, 0x08, 0x77, 0x48, 0x93, 0xba, 0x9f, 0xc8, 0xa9, 0x67,
-	0x9d, 0x79, 0xde, 0xd1, 0x70, 0x3f, 0x21, 0xe8, 0x3b, 0x00, 0xc2, 0xc8, 0xc2, 0x13, 0x12, 0x88,
-	0x3c, 0xe6, 0x1d, 0xe1, 0x7e, 0xc4, 0x3b, 0xd0, 0x1a, 0xe4, 0x3e, 0x72, 0x3d, 0x46, 0x62, 0x91,
-	0x97, 0xbc, 0xa3, 0x5a, 0xf6, 0x53, 0x28, 0x0e, 0xc2, 0xa0, 0x51, 0x18, 0x50, 0x82, 0xbe, 0x0f,
-	0xf3, 0x4a, 0x02, 0xb4, 0x64, 0x09, 0x66, 0xc7, 0xc9, 0x25, 0xf1, 0x45, 0xaf, 0xc1, 0x72, 0x40,
-	0xce, 0x58, 0x33, 0x85, 0x45, 0x26, 0x69, 0x91, 0x77, 0xd7, 0x35, 0x1e, 0xbb, 0x02, 0xc5, 0xdb,
-	0xc4, 0x23, 0x23, 0x0a, 0x36, 0xe5, 0xea, 0xab, 0x19, 0x58, 0xdd, 0x3b, 0x23, 0xad, 0x2e, 0x23,
-	0x8d, 0x53, 0x4f, 0x7b, 0x96, 0xfa, 0x7a, 0x96, 0xce, 0xba, 0x89, 0xee, 0x42, 0x21, 0xb5, 0xa1,
-	0x94, 0xda, 0x4d, 0xc2, 0x3c, 0xea, 0x7b, 0x35, 0x88, 0x47, 0x5a, 0x2c, 0x8c, 0x9d, 0xf4, 0x50,
-	0x4e, 0x3d, 0x3d, 0xf5, 0x54, 0x36, 0xf9, 0x27, 0xaa, 0x41, 0x2e, 0xc2, 0x31, 0xf6, 0xa9, 0xd2,
-	0xd7, 0xfa, 0x88, 0xbe, 0x1a, 0xe2, 0x24, 0x72, 0x94, 0x1b, 0x7a, 0x04, 0x05, 0xf1, 0xd5, 0xe4,
-	0xdb, 0x97, 0x96, 0x66, 0x45, 0x2e, 0xaf, 0x1b, 0xc0, 0x8c, 0xac, 0xb0, 0x5a, 0xe7, 0xe3, 0x8e,
-	0xf8, 0x30, 0xb9, 0x67, 0x20, 0x4a, 0x3a, 0xd0, 0xcb, 0xb0, 0xc0, 0x0f, 0x16, 0x5f, 0x27, 0x39,
-	0xb7, 0x61, 0x6d, 0x2d, 0x38, 0x05, 0xd9, 0x27, 0x29, 0x3f, 0x00, 0x38, 0xed, 0x92, 0xb8, 0xd7,
-	0xf4, 0xc3, 0x36, 0x29, 0xcd, 0x6d, 0x58, 0x5b, 0x4b, 0xdb, 0xd5, 0x89, 0x26, 0x7e, 0xc8, 0x87,
-	0x1d, 0x84, 0x6d, 0xe2, 0xe4, 0x4f, 0xf5, 0x27, 0xda, 0x84, 0xe5, 0x08, 0xc7, 0xcc, 0xe5, 0x89,
-	0x51, 0x93, 0xce, 0x8b, 0x49, 0x97, 0x92, 0x6e, 0x39, 0x6f, 0x11, 0x66, 0x29, 0x39, 0x0d, 0xc2,
-	0x52, 0x7e, 0xc3, 0xda, 0xca, 0x3a, 0xb2, 0x51, 0x7e, 0x0c, 0xcb, 0x43, 0xeb, 0x31, 0x6c, 0xac,
-	0xef, 0xa5, 0x37, 0x56, 0x2a, 0xb9, 0x69, 0xce, 0x7a, 0x11, 0x49, 0xef, 0xb8, 0x2a, 0xe4, 0x13,
-	0xb8, 0x08, 0x20, 0xf7, 0xe0, 0xd0, 0x39, 0x78, 0x6f, 0x7f, 0xe5, 0x12, 0x9a, 0x87, 0x99, 0xfa,
-	0xfe, 0x7b, 0x0f, 0x56, 0x2c, 0x54, 0x80, 0xb9, 0xba, 0x73, 0xf8, 0xfe, 0xbd, 0xfd, 0xbd, 0x95,
-	0x8c, 0xfd, 0xaf, 0x2c, 0xac, 0xa9, 0x15, 0xef, 0x62, 0xd6, 0xfa, 0xf8, 0xb6, 0xff, 0xad, 0x2a,
-	0xaa, 0x01, 0xc0, 0x2f, 0x1c, 0xe2, 0x93, 0x80, 0xd1, 0x52, 0x56, 0xa8, 0xe1, 0x8d, 0xf3, 0x49,
-	0x19, 0x82, 0x58, 0x6d, 0xe8, 0xb1, 0x4e, 0x2a, 0x4c, 0x3f, 0xe3, 0x33, 0xe9, 0x8c, 0xff, 0x32,
-	0x03, 0xf9, 0xc4, 0x5f, 0x4b, 0xd9, 0x32, 0x49, 0x39, 0x33, 0x99, 0x94, 0xdb, 0x83, 0x52, 0x96,
-	0xe0, 0x6f, 0xfd, 0x17, 0xe0, 0xc7, 0x29, 0xfb, 0x1b, 0x13, 0xca, 0xcf, 0x2d, 0x58, 0x1f, 0x01,
-	0xa6, 0x4e, 0xbb, 0x77, 0xa0, 0xd0, 0xbf, 0xa6, 0xf5, 0x81, 0x77, 0xc5, 0x10, 0xd4, 0x11, 0x5e,
-	0x0d, 0xc2, 0x1c, 0x88, 0xf5, 0x27, 0x45, 0x15, 0xc8, 0xc9, 0x57, 0x84, 0x82, 0x83, 0xf4, 0xc8,
-	0x38, 0x6a, 0x89, 0x55, 0x77, 0xa9, 0xa3, 0x3c, 0xec, 0x13, 0x58, 0xa9, 0xeb, 0xfd, 0x72, 0x18,
-	0x89, 0x07, 0x0f, 0x7a, 0x1d, 0x8a, 0xfd, 0xad, 0xc5, 0x4f, 0xf7, 0xe6, 0x71, 0x8f, 0x11, 0x2a,
-	0x16, 0x9c, 0x75, 0x50, 0x62, 0xe3, 0x07, 0xfd, 0x2e, 0xb7, 0xa0, 0xab, 0xb0, 0xe4, 0xe3, 0xb3,
-	0x66, 0x62, 0x91, 0x33, 0x67, 0x9d, 0x45, 0x1f, 0x9f, 0x25, 0xe1, 0xa9, 0xfd, 0xb7, 0x2c, 0x3c,
-	0x9f, 0x34, 0xc5, 0x36, 0xf9, 0x1f, 0x3b, 0x3d, 0x7f, 0x64, 0x3a, 0x3d, 0x6f, 0x18, 0xc0, 0x18,
-	0x57, 0x39, 0xf6, 0x04, 0xad, 0xc3, 0x6a, 0x3f, 0xe9, 0xa1, 0x64, 0x42, 0x1c, 0xa3, 0x85, 0xed,
-	0x57, 0xc6, 0x4d, 0xa0, 0x48, 0x73, 0x56, 0xa2, 0xa1, 0x9e, 0x6f, 0x4c, 0xb9, 0x5f, 0x66, 0xa0,
-	0x98, 0x4c, 0xef, 0x10, 0xdc, 0xfe, 0x36, 0x49, 0x2c, 0xc2, 0x2c, 0xc3, 0xc7, 0x1e, 0x51, 0x34,
-	0xca, 0x06, 0xef, 0x75, 0x83, 0x36, 0x39, 0x53, 0xaf, 0x09, 0xd9, 0xe0, 0x78, 0x5a, 0xa1, 0xd7,
-	0xf5, 0x03, 0xc9, 0x54, 0xde, 0xd1, 0x4d, 0xb4, 0x0d, 0x73, 0x27, 0xa4, 0xc7, 0x77, 0x97, 0x4a,
-	0xf1, 0x0b, 0x06, 0x2c, 0xf7, 0x49, 0x8f, 0xef, 0xac, 0xdc, 0x89, 0xf8, 0x35, 0x13, 0x94, 0x9f,
-	0x82, 0x20, 0xfb, 0x3a, 0xe4, 0x13, 0x2f, 0xd3, 0x7d, 0x66, 0x99, 0xee, 0x33, 0xfb, 0x33, 0x0b,
-	0x56, 0x53, 0xe9, 0x57, 0x47, 0xc6, 0xdb, 0xfc, 0xbd, 0x95, 0xec, 0xbe, 0xf3, 0x4f, 0x8c, 0xfe,
-	0xc8, 0x94, 0x3f, 0xba, 0x69, 0xe2, 0xe7, 0xc5, 0xf1, 0xfc, 0x0c, 0xf0, 0x62, 0xff, 0x3d, 0x03,
-	0x85, 0xff, 0x1f, 0x2d, 0x14, 0x61, 0xd6, 0x73, 0x7d, 0x97, 0x89, 0x27, 0x47, 0xd6, 0x91, 0x8d,
-	0x91, 0x47, 0x50, 0x7e, 0xf4, 0x11, 0x64, 0x60, 0x19, 0x8c, 0x2c, 0x33, 0x58, 0xdf, 0x25, 0x1d,
-	0x37, 0x48, 0x27, 0xfc, 0xc2, 0xd4, 0xbe, 0x0b, 0x73, 0x5a, 0x98, 0x32, 0xad, 0x57, 0xc7, 0xa7,
-	0x55, 0x4b, 0x53, 0x8f, 0xb2, 0xff, 0x6d, 0xc1, 0xe2, 0xad, 0xd0, 0xf7, 0x5d, 0x76, 0xf1, 0x64,
-	0x9b, 0xb0, 0x94, 0x22, 0xa3, 0xe9, 0xb6, 0xc5, 0x9c, 0x0b, 0x77, 0x2f, 0x39, 0x8b, 0xa9, 0xfe,
-	0x7b, 0x6d, 0xf4, 0x63, 0x58, 0xa3, 0x6e, 0xd0, 0xf1, 0x88, 0x2c, 0x86, 0x52, 0xdc, 0x67, 0xbf,
-	0x06, 0xc8, 0xbb, 0x97, 0x9c, 0xa2, 0x0c, 0xc3, 0xeb, 0xa2, 0x94, 0x0a, 0xde, 0x84, 0xbc, 0xae,
-	0x7a, 0xf9, 0x39, 0xce, 0x85, 0x7f, 0xd9, 0x10, 0xf1, 0x40, 0xf9, 0x38, 0x7d, 0xef, 0xdd, 0xc5,
-	0x01, 0x29, 0xda, 0x1f, 0xc0, 0x92, 0x5e, 0xbc, 0xda, 0x55, 0x7b, 0xb0, 0xd2, 0x12, 0x3d, 0xcd,
-	0xa4, 0x64, 0x17, 0x69, 0x18, 0x5f, 0xc8, 0x2d, 0xcb, 0x31, 0x49, 0x87, 0xed, 0xc0, 0xb2, 0x13,
-	0x7a, 0xde, 0x31, 0x6e, 0x9d, 0x5c, 0x9c, 0xd7, 0xab, 0xe6, 0xbc, 0x0e, 0x65, 0x75, 0xfb, 0x4b,
-	0x04, 0x73, 0x0d, 0xb9, 0x3c, 0xf4, 0x7b, 0x4e, 0x5b, 0xba, 0x00, 0x47, 0x9b, 0x86, 0x0c, 0x98,
-	0x4a, 0xf4, 0xf2, 0x98, 0x32, 0xca, 0xde, 0xfb, 0xd9, 0x3f, 0xfe, 0xf9, 0x59, 0xe6, 0x5d, 0x7b,
-	0x87, 0x97, 0xfb, 0x3f, 0xd5, 0x75, 0xdf, 0x3b, 0x51, 0x1c, 0xfe, 0x84, 0xb4, 0x18, 0xad, 0x55,
-	0x6a, 0x6e, 0x40, 0x19, 0x0e, 0x5a, 0x84, 0x7f, 0x6b, 0x3b, 0xad, 0x55, 0x3e, 0xad, 0xe9, 0x02,
-	0x6c, 0xc7, 0xaa, 0xa0, 0x5f, 0x59, 0x00, 0xfd, 0x2a, 0x14, 0xbd, 0x6a, 0x98, 0x71, 0xa4, 0x48,
-	0x1d, 0x8b, 0xeb, 0xa6, 0xc0, 0xb5, 0x83, 0x6e, 0x08, 0x5c, 0xbc, 0x26, 0x9b, 0x00, 0x53, 0x02,
-	0xa9, 0x56, 0xf9, 0x14, 0xfd, 0xd1, 0x82, 0x85, 0x74, 0x9d, 0x89, 0x4c, 0xe7, 0x8f, 0xa1, 0x1e,
-	0x2e, 0x6f, 0x5e, 0xe8, 0x27, 0x95, 0x63, 0xef, 0x0a, 0x8c, 0x6f, 0xa3, 0x29, 0x72, 0x87, 0x7e,
-	0x63, 0xc1, 0xe2, 0x40, 0x55, 0x6a, 0xa4, 0xd5, 0x54, 0xb7, 0x96, 0xd7, 0x46, 0xe4, 0xb9, 0xe7,
-	0x47, 0xac, 0xa7, 0x53, 0x57, 0x99, 0x2a, 0x75, 0xd0, 0x2f, 0xd1, 0x8c, 0x6c, 0x8e, 0x54, 0x70,
-	0xe5, 0xb1, 0x6f, 0x57, 0xfb, 0xa1, 0x00, 0x75, 0xdf, 0x7e, 0x5f, 0x80, 0x52, 0x93, 0x7d, 0x4d,
-	0x5c, 0x3b, 0x24, 0x99, 0x94, 0x6b, 0xee, 0x2f, 0x16, 0x3c, 0xa7, 0x61, 0xb0, 0x98, 0x60, 0xdf,
-	0x0d, 0x3a, 0x93, 0xc3, 0x3d, 0xf7, 0x3e, 0xc7, 0x5e, 0x1f, 0xf5, 0x87, 0x02, 0xf5, 0x91, 0x7d,
-	0xf8, 0x2c, 0x50, 0xa7, 0x30, 0xee, 0x58, 0x95, 0xd7, 0x2d, 0xf4, 0x57, 0x0b, 0x96, 0x87, 0xca,
-	0x03, 0xf4, 0xdd, 0x89, 0x6b, 0x9b, 0x72, 0x65, 0x12, 0x57, 0x25, 0xd5, 0xc7, 0x62, 0x21, 0x75,
-	0xfb, 0xfe, 0x33, 0x58, 0x88, 0x0e, 0xce, 0x39, 0xf8, 0xb5, 0x05, 0x33, 0xfc, 0x49, 0x80, 0x5e,
-	0x34, 0xb2, 0x9f, 0xbc, 0x15, 0x2e, 0x50, 0xc7, 0x7d, 0x01, 0x6f, 0xcf, 0xbe, 0x39, 0x0d, 0xbc,
-	0x98, 0xe0, 0x36, 0xc7, 0xf4, 0xb9, 0x05, 0x8b, 0x49, 0xb2, 0x27, 0x02, 0x37, 0x91, 0x16, 0x8e,
-	0x04, 0xc6, 0x07, 0xf6, 0xbd, 0x69, 0x30, 0xd2, 0x34, 0x2e, 0xa9, 0x82, 0x2f, 0x2c, 0x58, 0x19,
-	0x7e, 0x06, 0x20, 0x13, 0xb7, 0xe7, 0xbc, 0x15, 0xca, 0x17, 0xbc, 0xe1, 0xec, 0x0f, 0x04, 0xf0,
-	0x87, 0xf6, 0xfe, 0x34, 0xc0, 0x8f, 0x87, 0x26, 0xe7, 0x89, 0xfe, 0x83, 0x05, 0x39, 0x79, 0x99,
-	0xa2, 0x0d, 0xd3, 0x5d, 0x94, 0x7e, 0x64, 0x94, 0x5f, 0x1e, 0xe3, 0xa1, 0x44, 0x7a, 0x20, 0x80,
-	0xde, 0xb1, 0x77, 0xa7, 0x01, 0x2a, 0xef, 0x65, 0x0e, 0xef, 0x77, 0x16, 0xcc, 0xeb, 0x2b, 0x19,
-	0xd9, 0x26, 0x09, 0x0c, 0xde, 0xd7, 0xe7, 0x1e, 0xa8, 0x87, 0x02, 0xd7, 0x3d, 0xfb, 0xf6, 0x54,
-	0xea, 0x54, 0x93, 0x71, 0x64, 0x5f, 0x58, 0xb0, 0x34, 0x58, 0x3d, 0xa2, 0xad, 0x49, 0x0b, 0xcc,
-	0xf2, 0xab, 0x63, 0x5f, 0xfc, 0x3a, 0x97, 0x8f, 0x04, 0xe6, 0x43, 0xfb, 0x87, 0xd3, 0x60, 0x8e,
-	0x06, 0x00, 0x70, 0xe4, 0x7f, 0xb6, 0x60, 0x71, 0xa0, 0x2e, 0x34, 0x5e, 0x57, 0xa6, 0xca, 0x71,
-	0x42, 0xdc, 0xcf, 0x64, 0x97, 0x45, 0xe9, 0xf9, 0x77, 0xac, 0xca, 0xee, 0x6f, 0x2d, 0x78, 0xbe,
-	0x15, 0xfa, 0xa3, 0x08, 0x76, 0x17, 0xd4, 0xfb, 0xaa, 0xce, 0x29, 0xaf, 0x5b, 0x1f, 0xde, 0x50,
-	0x2e, 0x9d, 0xd0, 0xc3, 0x41, 0xa7, 0x1a, 0xc6, 0x9d, 0x5a, 0x87, 0x04, 0x42, 0x10, 0x35, 0x69,
-	0xc2, 0x91, 0x4b, 0x53, 0xff, 0x91, 0xbc, 0xa5, 0x3e, 0xff, 0x94, 0x59, 0xbf, 0x23, 0x87, 0xde,
-	0xf2, 0xc2, 0x6e, 0xbb, 0xaa, 0xe2, 0x56, 0x1f, 0x5f, 0xfb, 0x4a, 0x5b, 0x9e, 0x08, 0xcb, 0x13,
-	0x65, 0x79, 0xf2, 0xf8, 0xda, 0x71, 0x4e, 0x04, 0x7e, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0x33, 0x44, 0xce, 0x51, 0xcb, 0x1a, 0x00, 0x00,
-}
diff --git a/googleapis/spanner/v1/transaction.pb.go b/googleapis/spanner/v1/transaction.pb.go
index fcf3bec07a..ed1ee8bbc7 100644
--- a/googleapis/spanner/v1/transaction.pb.go
+++ b/googleapis/spanner/v1/transaction.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/transaction.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // # Transactions
 //
@@ -320,16 +323,17 @@ func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
 func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions) ProtoMessage()    {}
 func (*TransactionOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transaction_949bbf6c9797af8e, []int{0}
+	return fileDescriptor_a5743daa0b72b00f, []int{0}
 }
+
 func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
 }
 func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+func (m *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(m, src)
 }
 func (m *TransactionOptions) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions.Size(m)
@@ -390,99 +394,15 @@ func (m *TransactionOptions) GetReadOnly() *TransactionOptions_ReadOnly {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_OneofMarshaler, _TransactionOptions_OneofUnmarshaler, _TransactionOptions_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadWrite_)(nil),
 		(*TransactionOptions_PartitionedDml_)(nil),
 		(*TransactionOptions_ReadOnly_)(nil),
 	}
 }
 
-func _TransactionOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadWrite_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadWrite); err != nil {
-			return err
-		}
-	case *TransactionOptions_PartitionedDml_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PartitionedDml); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadOnly_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadOnly); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions.Mode has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions)
-	switch tag {
-	case 1: // mode.read_write
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadWrite)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadWrite_{msg}
-		return true, err
-	case 3: // mode.partitioned_dml
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_PartitionedDml)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_PartitionedDml_{msg}
-		return true, err
-	case 2: // mode.read_only
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions_ReadOnly)
-		err := b.DecodeMessage(msg)
-		m.Mode = &TransactionOptions_ReadOnly_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions)
-	// mode
-	switch x := m.Mode.(type) {
-	case *TransactionOptions_ReadWrite_:
-		s := proto.Size(x.ReadWrite)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_PartitionedDml_:
-		s := proto.Size(x.PartitionedDml)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadOnly_:
-		s := proto.Size(x.ReadOnly)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Message type to initiate a read-write transaction. Currently this
 // transaction type has no options.
 type TransactionOptions_ReadWrite struct {
@@ -495,16 +415,17 @@ func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions
 func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
 func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transaction_949bbf6c9797af8e, []int{0, 0}
+	return fileDescriptor_a5743daa0b72b00f, []int{0, 0}
 }
+
 func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+func (m *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(m, src)
 }
 func (m *TransactionOptions_ReadWrite) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
@@ -526,16 +447,17 @@ func (m *TransactionOptions_PartitionedDml) Reset()         { *m = TransactionOp
 func (m *TransactionOptions_PartitionedDml) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_PartitionedDml) ProtoMessage()    {}
 func (*TransactionOptions_PartitionedDml) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transaction_949bbf6c9797af8e, []int{0, 1}
+	return fileDescriptor_a5743daa0b72b00f, []int{0, 1}
 }
+
 func (m *TransactionOptions_PartitionedDml) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_PartitionedDml.Unmarshal(m, b)
 }
 func (m *TransactionOptions_PartitionedDml) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_PartitionedDml.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_PartitionedDml) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_PartitionedDml.Merge(dst, src)
+func (m *TransactionOptions_PartitionedDml) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_PartitionedDml.Merge(m, src)
 }
 func (m *TransactionOptions_PartitionedDml) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_PartitionedDml.Size(m)
@@ -570,16 +492,17 @@ func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_
 func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
 func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transaction_949bbf6c9797af8e, []int{0, 2}
+	return fileDescriptor_a5743daa0b72b00f, []int{0, 2}
 }
+
 func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
 }
-func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+func (m *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(m, src)
 }
 func (m *TransactionOptions_ReadOnly) XXX_Size() int {
 	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
@@ -673,9 +596,9 @@ func (m *TransactionOptions_ReadOnly) GetReturnReadTimestamp() bool {
 	return false
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionOptions_ReadOnly) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionOptions_ReadOnly_OneofMarshaler, _TransactionOptions_ReadOnly_OneofUnmarshaler, _TransactionOptions_ReadOnly_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionOptions_ReadOnly) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionOptions_ReadOnly_Strong)(nil),
 		(*TransactionOptions_ReadOnly_MinReadTimestamp)(nil),
 		(*TransactionOptions_ReadOnly_MaxStaleness)(nil),
@@ -684,125 +607,6 @@ func (*TransactionOptions_ReadOnly) XXX_OneofFuncs() (func(msg proto.Message, b
 	}
 }
 
-func _TransactionOptions_ReadOnly_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionOptions_ReadOnly)
-	// timestamp_bound
-	switch x := m.TimestampBound.(type) {
-	case *TransactionOptions_ReadOnly_Strong:
-		t := uint64(0)
-		if x.Strong {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *TransactionOptions_ReadOnly_MinReadTimestamp:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MinReadTimestamp); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadOnly_MaxStaleness:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.MaxStaleness); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadOnly_ReadTimestamp:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReadTimestamp); err != nil {
-			return err
-		}
-	case *TransactionOptions_ReadOnly_ExactStaleness:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ExactStaleness); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionOptions_ReadOnly.TimestampBound has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionOptions_ReadOnly)
-	switch tag {
-	case 1: // timestamp_bound.strong
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.TimestampBound = &TransactionOptions_ReadOnly_Strong{x != 0}
-		return true, err
-	case 2: // timestamp_bound.min_read_timestamp
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.TimestampBound = &TransactionOptions_ReadOnly_MinReadTimestamp{msg}
-		return true, err
-	case 3: // timestamp_bound.max_staleness
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.TimestampBound = &TransactionOptions_ReadOnly_MaxStaleness{msg}
-		return true, err
-	case 4: // timestamp_bound.read_timestamp
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(timestamp.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.TimestampBound = &TransactionOptions_ReadOnly_ReadTimestamp{msg}
-		return true, err
-	case 5: // timestamp_bound.exact_staleness
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(duration.Duration)
-		err := b.DecodeMessage(msg)
-		m.TimestampBound = &TransactionOptions_ReadOnly_ExactStaleness{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionOptions_ReadOnly_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionOptions_ReadOnly)
-	// timestamp_bound
-	switch x := m.TimestampBound.(type) {
-	case *TransactionOptions_ReadOnly_Strong:
-		n += 1 // tag and wire
-		n += 1
-	case *TransactionOptions_ReadOnly_MinReadTimestamp:
-		s := proto.Size(x.MinReadTimestamp)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadOnly_MaxStaleness:
-		s := proto.Size(x.MaxStaleness)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadOnly_ReadTimestamp:
-		s := proto.Size(x.ReadTimestamp)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionOptions_ReadOnly_ExactStaleness:
-		s := proto.Size(x.ExactStaleness)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // A transaction.
 type Transaction struct {
 	// `id` may be used to identify the transaction in subsequent
@@ -830,16 +634,17 @@ func (m *Transaction) Reset()         { *m = Transaction{} }
 func (m *Transaction) String() string { return proto.CompactTextString(m) }
 func (*Transaction) ProtoMessage()    {}
 func (*Transaction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transaction_949bbf6c9797af8e, []int{1}
+	return fileDescriptor_a5743daa0b72b00f, []int{1}
 }
+
 func (m *Transaction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Transaction.Unmarshal(m, b)
 }
 func (m *Transaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Transaction.Marshal(b, m, deterministic)
 }
-func (dst *Transaction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Transaction.Merge(dst, src)
+func (m *Transaction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transaction.Merge(m, src)
 }
 func (m *Transaction) XXX_Size() int {
 	return xxx_messageInfo_Transaction.Size(m)
@@ -888,16 +693,17 @@ func (m *TransactionSelector) Reset()         { *m = TransactionSelector{} }
 func (m *TransactionSelector) String() string { return proto.CompactTextString(m) }
 func (*TransactionSelector) ProtoMessage()    {}
 func (*TransactionSelector) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transaction_949bbf6c9797af8e, []int{2}
+	return fileDescriptor_a5743daa0b72b00f, []int{2}
 }
+
 func (m *TransactionSelector) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransactionSelector.Unmarshal(m, b)
 }
 func (m *TransactionSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransactionSelector.Marshal(b, m, deterministic)
 }
-func (dst *TransactionSelector) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransactionSelector.Merge(dst, src)
+func (m *TransactionSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionSelector.Merge(m, src)
 }
 func (m *TransactionSelector) XXX_Size() int {
 	return xxx_messageInfo_TransactionSelector.Size(m)
@@ -958,95 +764,15 @@ func (m *TransactionSelector) GetBegin() *TransactionOptions {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransactionSelector) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransactionSelector_OneofMarshaler, _TransactionSelector_OneofUnmarshaler, _TransactionSelector_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransactionSelector) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransactionSelector_SingleUse)(nil),
 		(*TransactionSelector_Id)(nil),
 		(*TransactionSelector_Begin)(nil),
 	}
 }
 
-func _TransactionSelector_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransactionSelector)
-	// selector
-	switch x := m.Selector.(type) {
-	case *TransactionSelector_SingleUse:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SingleUse); err != nil {
-			return err
-		}
-	case *TransactionSelector_Id:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Id)
-	case *TransactionSelector_Begin:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Begin); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransactionSelector.Selector has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransactionSelector_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransactionSelector)
-	switch tag {
-	case 1: // selector.single_use
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions)
-		err := b.DecodeMessage(msg)
-		m.Selector = &TransactionSelector_SingleUse{msg}
-		return true, err
-	case 2: // selector.id
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Selector = &TransactionSelector_Id{x}
-		return true, err
-	case 3: // selector.begin
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransactionOptions)
-		err := b.DecodeMessage(msg)
-		m.Selector = &TransactionSelector_Begin{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransactionSelector_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransactionSelector)
-	// selector
-	switch x := m.Selector.(type) {
-	case *TransactionSelector_SingleUse:
-		s := proto.Size(x.SingleUse)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransactionSelector_Id:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.Id)))
-		n += len(x.Id)
-	case *TransactionSelector_Begin:
-		s := proto.Size(x.Begin)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*TransactionOptions)(nil), "google.spanner.v1.TransactionOptions")
 	proto.RegisterType((*TransactionOptions_ReadWrite)(nil), "google.spanner.v1.TransactionOptions.ReadWrite")
@@ -1057,10 +783,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/spanner/v1/transaction.proto", fileDescriptor_transaction_949bbf6c9797af8e)
+	proto.RegisterFile("google/spanner/v1/transaction.proto", fileDescriptor_a5743daa0b72b00f)
 }
 
-var fileDescriptor_transaction_949bbf6c9797af8e = []byte{
+var fileDescriptor_a5743daa0b72b00f = []byte{
 	// 573 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdf, 0x6e, 0xd3, 0x3e,
 	0x14, 0xc7, 0xd3, 0x6e, 0xab, 0xba, 0xd3, 0xae, 0xed, 0x3c, 0x4d, 0xbf, 0xfe, 0x22, 0x04, 0xa8,
diff --git a/googleapis/spanner/v1/type.pb.go b/googleapis/spanner/v1/type.pb.go
index 674cfa9db9..174be847a2 100644
--- a/googleapis/spanner/v1/type.pb.go
+++ b/googleapis/spanner/v1/type.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/type.proto
 
-package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
+package spanner
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `TypeCode` is used as part of [Type][google.spanner.v1.Type] to
 // indicate the type of a Cloud Spanner value.
@@ -75,6 +78,7 @@ var TypeCode_name = map[int32]string{
 	8: "ARRAY",
 	9: "STRUCT",
 }
+
 var TypeCode_value = map[string]int32{
 	"TYPE_CODE_UNSPECIFIED": 0,
 	"BOOL":                  1,
@@ -91,8 +95,9 @@ var TypeCode_value = map[string]int32{
 func (x TypeCode) String() string {
 	return proto.EnumName(TypeCode_name, int32(x))
 }
+
 func (TypeCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_type_aaff9ec10660d5c1, []int{0}
+	return fileDescriptor_dc1f2442a7aeba2a, []int{0}
 }
 
 // `Type` indicates the type of a Cloud Spanner value, as might be stored in a
@@ -117,16 +122,17 @@ func (m *Type) Reset()         { *m = Type{} }
 func (m *Type) String() string { return proto.CompactTextString(m) }
 func (*Type) ProtoMessage()    {}
 func (*Type) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_aaff9ec10660d5c1, []int{0}
+	return fileDescriptor_dc1f2442a7aeba2a, []int{0}
 }
+
 func (m *Type) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Type.Unmarshal(m, b)
 }
 func (m *Type) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Type.Marshal(b, m, deterministic)
 }
-func (dst *Type) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Type.Merge(dst, src)
+func (m *Type) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type.Merge(m, src)
 }
 func (m *Type) XXX_Size() int {
 	return xxx_messageInfo_Type.Size(m)
@@ -177,16 +183,17 @@ func (m *StructType) Reset()         { *m = StructType{} }
 func (m *StructType) String() string { return proto.CompactTextString(m) }
 func (*StructType) ProtoMessage()    {}
 func (*StructType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_aaff9ec10660d5c1, []int{1}
+	return fileDescriptor_dc1f2442a7aeba2a, []int{1}
 }
+
 func (m *StructType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructType.Unmarshal(m, b)
 }
 func (m *StructType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructType.Marshal(b, m, deterministic)
 }
-func (dst *StructType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructType.Merge(dst, src)
+func (m *StructType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructType.Merge(m, src)
 }
 func (m *StructType) XXX_Size() int {
 	return xxx_messageInfo_StructType.Size(m)
@@ -225,16 +232,17 @@ func (m *StructType_Field) Reset()         { *m = StructType_Field{} }
 func (m *StructType_Field) String() string { return proto.CompactTextString(m) }
 func (*StructType_Field) ProtoMessage()    {}
 func (*StructType_Field) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_aaff9ec10660d5c1, []int{1, 0}
+	return fileDescriptor_dc1f2442a7aeba2a, []int{1, 0}
 }
+
 func (m *StructType_Field) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StructType_Field.Unmarshal(m, b)
 }
 func (m *StructType_Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StructType_Field.Marshal(b, m, deterministic)
 }
-func (dst *StructType_Field) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StructType_Field.Merge(dst, src)
+func (m *StructType_Field) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructType_Field.Merge(m, src)
 }
 func (m *StructType_Field) XXX_Size() int {
 	return xxx_messageInfo_StructType_Field.Size(m)
@@ -260,15 +268,15 @@ func (m *StructType_Field) GetType() *Type {
 }
 
 func init() {
+	proto.RegisterEnum("google.spanner.v1.TypeCode", TypeCode_name, TypeCode_value)
 	proto.RegisterType((*Type)(nil), "google.spanner.v1.Type")
 	proto.RegisterType((*StructType)(nil), "google.spanner.v1.StructType")
 	proto.RegisterType((*StructType_Field)(nil), "google.spanner.v1.StructType.Field")
-	proto.RegisterEnum("google.spanner.v1.TypeCode", TypeCode_name, TypeCode_value)
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/type.proto", fileDescriptor_type_aaff9ec10660d5c1) }
+func init() { proto.RegisterFile("google/spanner/v1/type.proto", fileDescriptor_dc1f2442a7aeba2a) }
 
-var fileDescriptor_type_aaff9ec10660d5c1 = []byte{
+var fileDescriptor_dc1f2442a7aeba2a = []byte{
 	// 444 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xd1, 0x8a, 0xd3, 0x40,
 	0x14, 0x86, 0x9d, 0x6d, 0xda, 0x6d, 0x4e, 0x51, 0xc6, 0x81, 0x65, 0xeb, 0xaa, 0x50, 0xd6, 0x9b,
diff --git a/googleapis/storagetransfer/v1/transfer.pb.go b/googleapis/storagetransfer/v1/transfer.pb.go
index 8d963483bd..c83a507119 100644
--- a/googleapis/storagetransfer/v1/transfer.pb.go
+++ b/googleapis/storagetransfer/v1/transfer.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/storagetransfer/v1/transfer.proto
 
-package storagetransfer // import "google.golang.org/genproto/googleapis/storagetransfer/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+package storagetransfer
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Request passed to GetGoogleServiceAccount.
 type GetGoogleServiceAccountRequest struct {
@@ -41,16 +41,17 @@ func (m *GetGoogleServiceAccountRequest) Reset()         { *m = GetGoogleService
 func (m *GetGoogleServiceAccountRequest) String() string { return proto.CompactTextString(m) }
 func (*GetGoogleServiceAccountRequest) ProtoMessage()    {}
 func (*GetGoogleServiceAccountRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{0}
+	return fileDescriptor_9e3f640a3e036c8f, []int{0}
 }
+
 func (m *GetGoogleServiceAccountRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGoogleServiceAccountRequest.Unmarshal(m, b)
 }
 func (m *GetGoogleServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetGoogleServiceAccountRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetGoogleServiceAccountRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetGoogleServiceAccountRequest.Merge(dst, src)
+func (m *GetGoogleServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGoogleServiceAccountRequest.Merge(m, src)
 }
 func (m *GetGoogleServiceAccountRequest) XXX_Size() int {
 	return xxx_messageInfo_GetGoogleServiceAccountRequest.Size(m)
@@ -82,16 +83,17 @@ func (m *CreateTransferJobRequest) Reset()         { *m = CreateTransferJobReque
 func (m *CreateTransferJobRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateTransferJobRequest) ProtoMessage()    {}
 func (*CreateTransferJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{1}
+	return fileDescriptor_9e3f640a3e036c8f, []int{1}
 }
+
 func (m *CreateTransferJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreateTransferJobRequest.Unmarshal(m, b)
 }
 func (m *CreateTransferJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreateTransferJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreateTransferJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreateTransferJobRequest.Merge(dst, src)
+func (m *CreateTransferJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTransferJobRequest.Merge(m, src)
 }
 func (m *CreateTransferJobRequest) XXX_Size() int {
 	return xxx_messageInfo_CreateTransferJobRequest.Size(m)
@@ -139,16 +141,17 @@ func (m *UpdateTransferJobRequest) Reset()         { *m = UpdateTransferJobReque
 func (m *UpdateTransferJobRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdateTransferJobRequest) ProtoMessage()    {}
 func (*UpdateTransferJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{2}
+	return fileDescriptor_9e3f640a3e036c8f, []int{2}
 }
+
 func (m *UpdateTransferJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateTransferJobRequest.Unmarshal(m, b)
 }
 func (m *UpdateTransferJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdateTransferJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdateTransferJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdateTransferJobRequest.Merge(dst, src)
+func (m *UpdateTransferJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTransferJobRequest.Merge(m, src)
 }
 func (m *UpdateTransferJobRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdateTransferJobRequest.Size(m)
@@ -204,16 +207,17 @@ func (m *GetTransferJobRequest) Reset()         { *m = GetTransferJobRequest{} }
 func (m *GetTransferJobRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTransferJobRequest) ProtoMessage()    {}
 func (*GetTransferJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{3}
+	return fileDescriptor_9e3f640a3e036c8f, []int{3}
 }
+
 func (m *GetTransferJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTransferJobRequest.Unmarshal(m, b)
 }
 func (m *GetTransferJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTransferJobRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetTransferJobRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTransferJobRequest.Merge(dst, src)
+func (m *GetTransferJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransferJobRequest.Merge(m, src)
 }
 func (m *GetTransferJobRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTransferJobRequest.Size(m)
@@ -263,16 +267,17 @@ func (m *ListTransferJobsRequest) Reset()         { *m = ListTransferJobsRequest
 func (m *ListTransferJobsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListTransferJobsRequest) ProtoMessage()    {}
 func (*ListTransferJobsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{4}
+	return fileDescriptor_9e3f640a3e036c8f, []int{4}
 }
+
 func (m *ListTransferJobsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferJobsRequest.Unmarshal(m, b)
 }
 func (m *ListTransferJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferJobsRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferJobsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferJobsRequest.Merge(dst, src)
+func (m *ListTransferJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferJobsRequest.Merge(m, src)
 }
 func (m *ListTransferJobsRequest) XXX_Size() int {
 	return xxx_messageInfo_ListTransferJobsRequest.Size(m)
@@ -319,16 +324,17 @@ func (m *ListTransferJobsResponse) Reset()         { *m = ListTransferJobsRespon
 func (m *ListTransferJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListTransferJobsResponse) ProtoMessage()    {}
 func (*ListTransferJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{5}
+	return fileDescriptor_9e3f640a3e036c8f, []int{5}
 }
+
 func (m *ListTransferJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListTransferJobsResponse.Unmarshal(m, b)
 }
 func (m *ListTransferJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListTransferJobsResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListTransferJobsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListTransferJobsResponse.Merge(dst, src)
+func (m *ListTransferJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferJobsResponse.Merge(m, src)
 }
 func (m *ListTransferJobsResponse) XXX_Size() int {
 	return xxx_messageInfo_ListTransferJobsResponse.Size(m)
@@ -367,16 +373,17 @@ func (m *PauseTransferOperationRequest) Reset()         { *m = PauseTransferOper
 func (m *PauseTransferOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*PauseTransferOperationRequest) ProtoMessage()    {}
 func (*PauseTransferOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{6}
+	return fileDescriptor_9e3f640a3e036c8f, []int{6}
 }
+
 func (m *PauseTransferOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PauseTransferOperationRequest.Unmarshal(m, b)
 }
 func (m *PauseTransferOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PauseTransferOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *PauseTransferOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PauseTransferOperationRequest.Merge(dst, src)
+func (m *PauseTransferOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseTransferOperationRequest.Merge(m, src)
 }
 func (m *PauseTransferOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_PauseTransferOperationRequest.Size(m)
@@ -408,16 +415,17 @@ func (m *ResumeTransferOperationRequest) Reset()         { *m = ResumeTransferOp
 func (m *ResumeTransferOperationRequest) String() string { return proto.CompactTextString(m) }
 func (*ResumeTransferOperationRequest) ProtoMessage()    {}
 func (*ResumeTransferOperationRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_2bfd38eb67d3a440, []int{7}
+	return fileDescriptor_9e3f640a3e036c8f, []int{7}
 }
+
 func (m *ResumeTransferOperationRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResumeTransferOperationRequest.Unmarshal(m, b)
 }
 func (m *ResumeTransferOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ResumeTransferOperationRequest.Marshal(b, m, deterministic)
 }
-func (dst *ResumeTransferOperationRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ResumeTransferOperationRequest.Merge(dst, src)
+func (m *ResumeTransferOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeTransferOperationRequest.Merge(m, src)
 }
 func (m *ResumeTransferOperationRequest) XXX_Size() int {
 	return xxx_messageInfo_ResumeTransferOperationRequest.Size(m)
@@ -446,6 +454,64 @@ func init() {
 	proto.RegisterType((*ResumeTransferOperationRequest)(nil), "google.storagetransfer.v1.ResumeTransferOperationRequest")
 }
 
+func init() {
+	proto.RegisterFile("google/storagetransfer/v1/transfer.proto", fileDescriptor_9e3f640a3e036c8f)
+}
+
+var fileDescriptor_9e3f640a3e036c8f = []byte{
+	// 786 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x4e, 0x13, 0x4f,
+	0x14, 0xce, 0xf0, 0xef, 0x07, 0x03, 0xfc, 0x84, 0x49, 0x2c, 0x4b, 0x91, 0xda, 0x2c, 0x49, 0xc5,
+	0x6a, 0x76, 0x6d, 0xeb, 0x85, 0x62, 0x8c, 0x11, 0xa2, 0x88, 0x7f, 0xb1, 0x20, 0x17, 0x86, 0xb8,
+	0x99, 0xb6, 0xd3, 0xcd, 0x96, 0x76, 0x67, 0xdd, 0x99, 0x25, 0x02, 0xe1, 0xc6, 0x17, 0x30, 0xd1,
+	0x98, 0x98, 0x18, 0x13, 0xaf, 0xbd, 0xf7, 0x11, 0xbc, 0xf1, 0xd6, 0x57, 0xf0, 0x21, 0xf4, 0x4a,
+	0xb3, 0xb3, 0xb3, 0x65, 0xd9, 0xb6, 0x0b, 0xa8, 0x77, 0x3b, 0x33, 0xe7, 0x9c, 0xef, 0x3b, 0xe7,
+	0xf0, 0x7d, 0x14, 0xce, 0x9b, 0x94, 0x9a, 0x4d, 0xa2, 0x33, 0x4e, 0x5d, 0x6c, 0x12, 0xee, 0x62,
+	0x9b, 0xd5, 0x89, 0xab, 0x6f, 0x17, 0xf4, 0xf0, 0x5b, 0x73, 0x5c, 0xca, 0x29, 0x9a, 0x0e, 0x22,
+	0xb5, 0x58, 0xa4, 0xb6, 0x5d, 0x48, 0x9f, 0x91, 0x45, 0xb0, 0x63, 0xe9, 0xd8, 0xb6, 0x29, 0xc7,
+	0xdc, 0xa2, 0x36, 0x0b, 0x12, 0xd3, 0x33, 0xf2, 0x55, 0x9c, 0x2a, 0x5e, 0x5d, 0x27, 0x2d, 0x87,
+	0xef, 0xc8, 0xc7, 0x6c, 0xfc, 0xb1, 0x6e, 0x91, 0x66, 0xcd, 0x68, 0x61, 0xb6, 0x25, 0x23, 0xb4,
+	0xa3, 0x19, 0x1a, 0x7c, 0xc7, 0x21, 0x12, 0x4e, 0xbd, 0x01, 0x33, 0xcb, 0x84, 0x2f, 0x8b, 0xa4,
+	0x35, 0xe2, 0x6e, 0x5b, 0x55, 0x72, 0xb3, 0x5a, 0xa5, 0x9e, 0xcd, 0xcb, 0xe4, 0xb9, 0x47, 0x18,
+	0x47, 0xb3, 0x10, 0x3a, 0x2e, 0x6d, 0x90, 0x2a, 0x37, 0xac, 0x9a, 0x02, 0xb2, 0x60, 0x7e, 0xa4,
+	0x3c, 0x22, 0x6f, 0x56, 0x6a, 0x2a, 0x81, 0xca, 0x92, 0x4b, 0x30, 0x27, 0xeb, 0xb2, 0xfc, 0x5d,
+	0x5a, 0x09, 0x53, 0x57, 0xe0, 0x58, 0x1b, 0xb4, 0x41, 0x2b, 0x22, 0x79, 0xb4, 0x98, 0xd3, 0x7a,
+	0xce, 0x46, 0x8b, 0x16, 0x19, 0xe5, 0x07, 0x07, 0xf5, 0x17, 0x80, 0xca, 0x13, 0xa7, 0xd6, 0x1d,
+	0x67, 0x1a, 0x0e, 0x37, 0x68, 0xc5, 0xb0, 0x71, 0x8b, 0x48, 0x82, 0xff, 0x35, 0x68, 0xe5, 0x21,
+	0x6e, 0x91, 0x18, 0xfb, 0xbe, 0x18, 0xfb, 0x0e, 0x86, 0xfd, 0x7f, 0xcc, 0x10, 0x3d, 0x83, 0x19,
+	0x4f, 0x10, 0x34, 0xa2, 0x15, 0x8d, 0x83, 0x0d, 0x29, 0x03, 0xa2, 0x78, 0xb8, 0x22, 0x2d, 0x5c,
+	0xa2, 0x76, 0xdb, 0x0f, 0x79, 0x80, 0xd9, 0x56, 0x39, 0xed, 0xc5, 0x5b, 0x6c, 0xbf, 0xa9, 0x8f,
+	0xe1, 0xe9, 0x65, 0xc2, 0xff, 0x65, 0xf7, 0x6a, 0x0b, 0x4e, 0xdd, 0xb7, 0x58, 0xb4, 0x26, 0x0b,
+	0x8b, 0xa6, 0xe0, 0x50, 0xdd, 0x6a, 0x72, 0xe2, 0xca, 0x92, 0xf2, 0x84, 0x66, 0xe0, 0x88, 0x83,
+	0x4d, 0x62, 0x30, 0x6b, 0x97, 0x88, 0x86, 0x06, 0xcb, 0xc3, 0xfe, 0xc5, 0x9a, 0xb5, 0x1b, 0xc0,
+	0xf9, 0x8f, 0x9c, 0x6e, 0x11, 0x5b, 0x19, 0x94, 0x70, 0xd8, 0x24, 0xeb, 0xfe, 0x85, 0xfa, 0x0a,
+	0x40, 0xa5, 0x13, 0x8f, 0x39, 0xd4, 0x66, 0x04, 0xdd, 0x83, 0xe3, 0xd1, 0xb9, 0x31, 0x05, 0x64,
+	0xfb, 0x4f, 0xb0, 0x8a, 0xb1, 0xc8, 0x2a, 0x18, 0xca, 0xc1, 0x53, 0x36, 0x79, 0xc1, 0x8d, 0x08,
+	0x9b, 0xa0, 0xf9, 0x71, 0xff, 0x7a, 0xb5, 0xcd, 0xa8, 0x04, 0x67, 0x57, 0xb1, 0xc7, 0xda, 0x03,
+	0x7f, 0xe4, 0x10, 0x57, 0xa8, 0x31, 0x1c, 0x03, 0x82, 0x03, 0x91, 0xb9, 0x8a, 0x6f, 0xf5, 0x32,
+	0xcc, 0x94, 0x09, 0xf3, 0x5a, 0x27, 0xca, 0x2a, 0xfe, 0x1c, 0x86, 0xa9, 0xb5, 0xa0, 0x87, 0x30,
+	0x4f, 0xea, 0x0d, 0x7d, 0x06, 0x70, 0xaa, 0x87, 0x08, 0xd1, 0xd5, 0x84, 0xfe, 0x93, 0x85, 0x9b,
+	0xd6, 0x93, 0x52, 0xbb, 0xe4, 0xa9, 0xda, 0xcb, 0x6f, 0xdf, 0xdf, 0xf4, 0xcd, 0xa3, 0x9c, 0xef,
+	0x16, 0x66, 0x97, 0x08, 0xa6, 0xef, 0x1d, 0xfc, 0x39, 0xed, 0xa3, 0x77, 0x00, 0x4e, 0x76, 0x68,
+	0x1f, 0x95, 0x12, 0x60, 0x7b, 0x39, 0x45, 0xfa, 0x98, 0x6b, 0x56, 0x73, 0x82, 0x62, 0x56, 0x9d,
+	0x88, 0x1a, 0x9a, 0xbf, 0xf2, 0x85, 0x43, 0x3a, 0x46, 0xef, 0x01, 0x9c, 0xec, 0xb0, 0x8b, 0x44,
+	0x6a, 0xbd, 0xcc, 0xe5, 0xd8, 0xd4, 0xce, 0x0b, 0x6a, 0x73, 0xc5, 0x8c, 0x4f, 0x6d, 0x2f, 0x54,
+	0xe4, 0xf5, 0x28, 0x49, 0x3d, 0x9f, 0xdf, 0x5f, 0x00, 0x79, 0xf4, 0x1a, 0xc0, 0xff, 0x0f, 0x6b,
+	0x19, 0x5d, 0x4a, 0xde, 0xf3, 0xdf, 0x8f, 0x0c, 0x1d, 0xc1, 0x0b, 0xbd, 0x05, 0x70, 0x22, 0xae,
+	0x4e, 0x54, 0x4c, 0x00, 0xe9, 0x61, 0x1d, 0xe9, 0xd2, 0x89, 0x72, 0x02, 0xf9, 0xab, 0x8a, 0x60,
+	0x89, 0x50, 0xc7, 0x62, 0xd1, 0x07, 0x00, 0x53, 0xdd, 0x45, 0x8a, 0xae, 0x24, 0x20, 0x25, 0xea,
+	0x3a, 0x9d, 0xea, 0x30, 0xe1, 0x5b, 0xfe, 0xbf, 0x59, 0xb5, 0x20, 0x68, 0x5c, 0x50, 0x85, 0x04,
+	0xf6, 0x0e, 0x0d, 0xaa, 0x5d, 0x23, 0x58, 0xa3, 0xe3, 0xd7, 0xf7, 0x97, 0xf9, 0x11, 0xc0, 0xa9,
+	0x1e, 0x7e, 0x90, 0xa8, 0xde, 0x64, 0x0f, 0xe9, 0xc9, 0xb0, 0x28, 0x18, 0x5e, 0x54, 0xcf, 0x1d,
+	0xc9, 0xd0, 0x15, 0x00, 0x0b, 0x20, 0xbf, 0xf8, 0x05, 0xc0, 0xb9, 0x2a, 0x6d, 0x25, 0x90, 0x11,
+	0x20, 0x8b, 0xe3, 0x21, 0x9b, 0x55, 0xff, 0xf8, 0xf4, 0x8e, 0x8c, 0x37, 0x69, 0x13, 0xdb, 0xa6,
+	0x46, 0x5d, 0x53, 0x37, 0x89, 0x2d, 0x42, 0xa5, 0x3d, 0x60, 0xc7, 0x62, 0x5d, 0x7e, 0x6a, 0x5c,
+	0x8b, 0x5d, 0xfd, 0x00, 0xe0, 0x53, 0xdf, 0xd9, 0xc0, 0x73, 0xb4, 0xa5, 0x26, 0xf5, 0x6a, 0x5a,
+	0xcc, 0x0a, 0xb5, 0x8d, 0xc2, 0xd7, 0x30, 0x62, 0x53, 0x44, 0x6c, 0xc6, 0x22, 0x36, 0x37, 0x0a,
+	0x95, 0x21, 0x81, 0x5d, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x71, 0x04, 0x73, 0x87, 0x09,
+	0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -747,61 +813,3 @@ var _StorageTransferService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/storagetransfer/v1/transfer.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/storagetransfer/v1/transfer.proto", fileDescriptor_transfer_2bfd38eb67d3a440)
-}
-
-var fileDescriptor_transfer_2bfd38eb67d3a440 = []byte{
-	// 786 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x4e, 0x13, 0x4f,
-	0x14, 0xce, 0xf0, 0xef, 0x07, 0x03, 0xfc, 0x84, 0x49, 0x2c, 0x4b, 0x91, 0xda, 0x2c, 0x49, 0xc5,
-	0x6a, 0x76, 0x6d, 0xeb, 0x85, 0x62, 0x8c, 0x11, 0xa2, 0x88, 0x7f, 0xb1, 0x20, 0x17, 0x86, 0xb8,
-	0x99, 0xb6, 0xd3, 0xcd, 0x96, 0x76, 0x67, 0xdd, 0x99, 0x25, 0x02, 0xe1, 0xc6, 0x17, 0x30, 0xd1,
-	0x98, 0x98, 0x18, 0x13, 0xaf, 0xbd, 0xf7, 0x11, 0xbc, 0xf1, 0xd6, 0x57, 0xf0, 0x21, 0xf4, 0x4a,
-	0xb3, 0xb3, 0xb3, 0x65, 0xd9, 0xb6, 0x0b, 0xa8, 0x77, 0x3b, 0x33, 0xe7, 0x9c, 0xef, 0x3b, 0xe7,
-	0xf0, 0x7d, 0x14, 0xce, 0x9b, 0x94, 0x9a, 0x4d, 0xa2, 0x33, 0x4e, 0x5d, 0x6c, 0x12, 0xee, 0x62,
-	0x9b, 0xd5, 0x89, 0xab, 0x6f, 0x17, 0xf4, 0xf0, 0x5b, 0x73, 0x5c, 0xca, 0x29, 0x9a, 0x0e, 0x22,
-	0xb5, 0x58, 0xa4, 0xb6, 0x5d, 0x48, 0x9f, 0x91, 0x45, 0xb0, 0x63, 0xe9, 0xd8, 0xb6, 0x29, 0xc7,
-	0xdc, 0xa2, 0x36, 0x0b, 0x12, 0xd3, 0x33, 0xf2, 0x55, 0x9c, 0x2a, 0x5e, 0x5d, 0x27, 0x2d, 0x87,
-	0xef, 0xc8, 0xc7, 0x6c, 0xfc, 0xb1, 0x6e, 0x91, 0x66, 0xcd, 0x68, 0x61, 0xb6, 0x25, 0x23, 0xb4,
-	0xa3, 0x19, 0x1a, 0x7c, 0xc7, 0x21, 0x12, 0x4e, 0xbd, 0x01, 0x33, 0xcb, 0x84, 0x2f, 0x8b, 0xa4,
-	0x35, 0xe2, 0x6e, 0x5b, 0x55, 0x72, 0xb3, 0x5a, 0xa5, 0x9e, 0xcd, 0xcb, 0xe4, 0xb9, 0x47, 0x18,
-	0x47, 0xb3, 0x10, 0x3a, 0x2e, 0x6d, 0x90, 0x2a, 0x37, 0xac, 0x9a, 0x02, 0xb2, 0x60, 0x7e, 0xa4,
-	0x3c, 0x22, 0x6f, 0x56, 0x6a, 0x2a, 0x81, 0xca, 0x92, 0x4b, 0x30, 0x27, 0xeb, 0xb2, 0xfc, 0x5d,
-	0x5a, 0x09, 0x53, 0x57, 0xe0, 0x58, 0x1b, 0xb4, 0x41, 0x2b, 0x22, 0x79, 0xb4, 0x98, 0xd3, 0x7a,
-	0xce, 0x46, 0x8b, 0x16, 0x19, 0xe5, 0x07, 0x07, 0xf5, 0x17, 0x80, 0xca, 0x13, 0xa7, 0xd6, 0x1d,
-	0x67, 0x1a, 0x0e, 0x37, 0x68, 0xc5, 0xb0, 0x71, 0x8b, 0x48, 0x82, 0xff, 0x35, 0x68, 0xe5, 0x21,
-	0x6e, 0x91, 0x18, 0xfb, 0xbe, 0x18, 0xfb, 0x0e, 0x86, 0xfd, 0x7f, 0xcc, 0x10, 0x3d, 0x83, 0x19,
-	0x4f, 0x10, 0x34, 0xa2, 0x15, 0x8d, 0x83, 0x0d, 0x29, 0x03, 0xa2, 0x78, 0xb8, 0x22, 0x2d, 0x5c,
-	0xa2, 0x76, 0xdb, 0x0f, 0x79, 0x80, 0xd9, 0x56, 0x39, 0xed, 0xc5, 0x5b, 0x6c, 0xbf, 0xa9, 0x8f,
-	0xe1, 0xe9, 0x65, 0xc2, 0xff, 0x65, 0xf7, 0x6a, 0x0b, 0x4e, 0xdd, 0xb7, 0x58, 0xb4, 0x26, 0x0b,
-	0x8b, 0xa6, 0xe0, 0x50, 0xdd, 0x6a, 0x72, 0xe2, 0xca, 0x92, 0xf2, 0x84, 0x66, 0xe0, 0x88, 0x83,
-	0x4d, 0x62, 0x30, 0x6b, 0x97, 0x88, 0x86, 0x06, 0xcb, 0xc3, 0xfe, 0xc5, 0x9a, 0xb5, 0x1b, 0xc0,
-	0xf9, 0x8f, 0x9c, 0x6e, 0x11, 0x5b, 0x19, 0x94, 0x70, 0xd8, 0x24, 0xeb, 0xfe, 0x85, 0xfa, 0x0a,
-	0x40, 0xa5, 0x13, 0x8f, 0x39, 0xd4, 0x66, 0x04, 0xdd, 0x83, 0xe3, 0xd1, 0xb9, 0x31, 0x05, 0x64,
-	0xfb, 0x4f, 0xb0, 0x8a, 0xb1, 0xc8, 0x2a, 0x18, 0xca, 0xc1, 0x53, 0x36, 0x79, 0xc1, 0x8d, 0x08,
-	0x9b, 0xa0, 0xf9, 0x71, 0xff, 0x7a, 0xb5, 0xcd, 0xa8, 0x04, 0x67, 0x57, 0xb1, 0xc7, 0xda, 0x03,
-	0x7f, 0xe4, 0x10, 0x57, 0xa8, 0x31, 0x1c, 0x03, 0x82, 0x03, 0x91, 0xb9, 0x8a, 0x6f, 0xf5, 0x32,
-	0xcc, 0x94, 0x09, 0xf3, 0x5a, 0x27, 0xca, 0x2a, 0xfe, 0x1c, 0x86, 0xa9, 0xb5, 0xa0, 0x87, 0x30,
-	0x4f, 0xea, 0x0d, 0x7d, 0x06, 0x70, 0xaa, 0x87, 0x08, 0xd1, 0xd5, 0x84, 0xfe, 0x93, 0x85, 0x9b,
-	0xd6, 0x93, 0x52, 0xbb, 0xe4, 0xa9, 0xda, 0xcb, 0x6f, 0xdf, 0xdf, 0xf4, 0xcd, 0xa3, 0x9c, 0xef,
-	0x16, 0x66, 0x97, 0x08, 0xa6, 0xef, 0x1d, 0xfc, 0x39, 0xed, 0xa3, 0x77, 0x00, 0x4e, 0x76, 0x68,
-	0x1f, 0x95, 0x12, 0x60, 0x7b, 0x39, 0x45, 0xfa, 0x98, 0x6b, 0x56, 0x73, 0x82, 0x62, 0x56, 0x9d,
-	0x88, 0x1a, 0x9a, 0xbf, 0xf2, 0x85, 0x43, 0x3a, 0x46, 0xef, 0x01, 0x9c, 0xec, 0xb0, 0x8b, 0x44,
-	0x6a, 0xbd, 0xcc, 0xe5, 0xd8, 0xd4, 0xce, 0x0b, 0x6a, 0x73, 0xc5, 0x8c, 0x4f, 0x6d, 0x2f, 0x54,
-	0xe4, 0xf5, 0x28, 0x49, 0x3d, 0x9f, 0xdf, 0x5f, 0x00, 0x79, 0xf4, 0x1a, 0xc0, 0xff, 0x0f, 0x6b,
-	0x19, 0x5d, 0x4a, 0xde, 0xf3, 0xdf, 0x8f, 0x0c, 0x1d, 0xc1, 0x0b, 0xbd, 0x05, 0x70, 0x22, 0xae,
-	0x4e, 0x54, 0x4c, 0x00, 0xe9, 0x61, 0x1d, 0xe9, 0xd2, 0x89, 0x72, 0x02, 0xf9, 0xab, 0x8a, 0x60,
-	0x89, 0x50, 0xc7, 0x62, 0xd1, 0x07, 0x00, 0x53, 0xdd, 0x45, 0x8a, 0xae, 0x24, 0x20, 0x25, 0xea,
-	0x3a, 0x9d, 0xea, 0x30, 0xe1, 0x5b, 0xfe, 0xbf, 0x59, 0xb5, 0x20, 0x68, 0x5c, 0x50, 0x85, 0x04,
-	0xf6, 0x0e, 0x0d, 0xaa, 0x5d, 0x23, 0x58, 0xa3, 0xe3, 0xd7, 0xf7, 0x97, 0xf9, 0x11, 0xc0, 0xa9,
-	0x1e, 0x7e, 0x90, 0xa8, 0xde, 0x64, 0x0f, 0xe9, 0xc9, 0xb0, 0x28, 0x18, 0x5e, 0x54, 0xcf, 0x1d,
-	0xc9, 0xd0, 0x15, 0x00, 0x0b, 0x20, 0xbf, 0xf8, 0x05, 0xc0, 0xb9, 0x2a, 0x6d, 0x25, 0x90, 0x11,
-	0x20, 0x8b, 0xe3, 0x21, 0x9b, 0x55, 0xff, 0xf8, 0xf4, 0x8e, 0x8c, 0x37, 0x69, 0x13, 0xdb, 0xa6,
-	0x46, 0x5d, 0x53, 0x37, 0x89, 0x2d, 0x42, 0xa5, 0x3d, 0x60, 0xc7, 0x62, 0x5d, 0x7e, 0x6a, 0x5c,
-	0x8b, 0x5d, 0xfd, 0x00, 0xe0, 0x53, 0xdf, 0xd9, 0xc0, 0x73, 0xb4, 0xa5, 0x26, 0xf5, 0x6a, 0x5a,
-	0xcc, 0x0a, 0xb5, 0x8d, 0xc2, 0xd7, 0x30, 0x62, 0x53, 0x44, 0x6c, 0xc6, 0x22, 0x36, 0x37, 0x0a,
-	0x95, 0x21, 0x81, 0x5d, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x71, 0x04, 0x73, 0x87, 0x09,
-	0x00, 0x00,
-}
diff --git a/googleapis/storagetransfer/v1/transfer_types.pb.go b/googleapis/storagetransfer/v1/transfer_types.pb.go
index a91e047659..82ef179de2 100644
--- a/googleapis/storagetransfer/v1/transfer_types.pb.go
+++ b/googleapis/storagetransfer/v1/transfer_types.pb.go
@@ -1,17 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/storagetransfer/v1/transfer_types.proto
 
-package storagetransfer // import "google.golang.org/genproto/googleapis/storagetransfer/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import code "google.golang.org/genproto/googleapis/rpc/code"
-import date "google.golang.org/genproto/googleapis/type/date"
-import timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+package storagetransfer
+
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	duration "github.com/golang/protobuf/ptypes/duration"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	code "google.golang.org/genproto/googleapis/rpc/code"
+	date "google.golang.org/genproto/googleapis/type/date"
+	timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -22,7 +25,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The status of the transfer job.
 type TransferJob_Status int32
@@ -46,6 +49,7 @@ var TransferJob_Status_name = map[int32]string{
 	2: "DISABLED",
 	3: "DELETED",
 }
+
 var TransferJob_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"ENABLED":            1,
@@ -56,8 +60,9 @@ var TransferJob_Status_value = map[string]int32{
 func (x TransferJob_Status) String() string {
 	return proto.EnumName(TransferJob_Status_name, int32(x))
 }
+
 func (TransferJob_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{9, 0}
+	return fileDescriptor_291a6d3205b12034, []int{9, 0}
 }
 
 // The status of a TransferOperation.
@@ -86,6 +91,7 @@ var TransferOperation_Status_name = map[int32]string{
 	4: "FAILED",
 	5: "ABORTED",
 }
+
 var TransferOperation_Status_value = map[string]int32{
 	"STATUS_UNSPECIFIED": 0,
 	"IN_PROGRESS":        1,
@@ -98,8 +104,9 @@ var TransferOperation_Status_value = map[string]int32{
 func (x TransferOperation_Status) String() string {
 	return proto.EnumName(TransferOperation_Status_name, int32(x))
 }
+
 func (TransferOperation_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{13, 0}
+	return fileDescriptor_291a6d3205b12034, []int{13, 0}
 }
 
 // Google service account
@@ -115,16 +122,17 @@ func (m *GoogleServiceAccount) Reset()         { *m = GoogleServiceAccount{} }
 func (m *GoogleServiceAccount) String() string { return proto.CompactTextString(m) }
 func (*GoogleServiceAccount) ProtoMessage()    {}
 func (*GoogleServiceAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{0}
+	return fileDescriptor_291a6d3205b12034, []int{0}
 }
+
 func (m *GoogleServiceAccount) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoogleServiceAccount.Unmarshal(m, b)
 }
 func (m *GoogleServiceAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoogleServiceAccount.Marshal(b, m, deterministic)
 }
-func (dst *GoogleServiceAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoogleServiceAccount.Merge(dst, src)
+func (m *GoogleServiceAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleServiceAccount.Merge(m, src)
 }
 func (m *GoogleServiceAccount) XXX_Size() int {
 	return xxx_messageInfo_GoogleServiceAccount.Size(m)
@@ -161,16 +169,17 @@ func (m *AwsAccessKey) Reset()         { *m = AwsAccessKey{} }
 func (m *AwsAccessKey) String() string { return proto.CompactTextString(m) }
 func (*AwsAccessKey) ProtoMessage()    {}
 func (*AwsAccessKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{1}
+	return fileDescriptor_291a6d3205b12034, []int{1}
 }
+
 func (m *AwsAccessKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AwsAccessKey.Unmarshal(m, b)
 }
 func (m *AwsAccessKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AwsAccessKey.Marshal(b, m, deterministic)
 }
-func (dst *AwsAccessKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AwsAccessKey.Merge(dst, src)
+func (m *AwsAccessKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AwsAccessKey.Merge(m, src)
 }
 func (m *AwsAccessKey) XXX_Size() int {
 	return xxx_messageInfo_AwsAccessKey.Size(m)
@@ -257,16 +266,17 @@ func (m *ObjectConditions) Reset()         { *m = ObjectConditions{} }
 func (m *ObjectConditions) String() string { return proto.CompactTextString(m) }
 func (*ObjectConditions) ProtoMessage()    {}
 func (*ObjectConditions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{2}
+	return fileDescriptor_291a6d3205b12034, []int{2}
 }
+
 func (m *ObjectConditions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ObjectConditions.Unmarshal(m, b)
 }
 func (m *ObjectConditions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ObjectConditions.Marshal(b, m, deterministic)
 }
-func (dst *ObjectConditions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ObjectConditions.Merge(dst, src)
+func (m *ObjectConditions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectConditions.Merge(m, src)
 }
 func (m *ObjectConditions) XXX_Size() int {
 	return xxx_messageInfo_ObjectConditions.Size(m)
@@ -323,16 +333,17 @@ func (m *GcsData) Reset()         { *m = GcsData{} }
 func (m *GcsData) String() string { return proto.CompactTextString(m) }
 func (*GcsData) ProtoMessage()    {}
 func (*GcsData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{3}
+	return fileDescriptor_291a6d3205b12034, []int{3}
 }
+
 func (m *GcsData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GcsData.Unmarshal(m, b)
 }
 func (m *GcsData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GcsData.Marshal(b, m, deterministic)
 }
-func (dst *GcsData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GcsData.Merge(dst, src)
+func (m *GcsData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsData.Merge(m, src)
 }
 func (m *GcsData) XXX_Size() int {
 	return xxx_messageInfo_GcsData.Size(m)
@@ -372,16 +383,17 @@ func (m *AwsS3Data) Reset()         { *m = AwsS3Data{} }
 func (m *AwsS3Data) String() string { return proto.CompactTextString(m) }
 func (*AwsS3Data) ProtoMessage()    {}
 func (*AwsS3Data) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{4}
+	return fileDescriptor_291a6d3205b12034, []int{4}
 }
+
 func (m *AwsS3Data) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AwsS3Data.Unmarshal(m, b)
 }
 func (m *AwsS3Data) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AwsS3Data.Marshal(b, m, deterministic)
 }
-func (dst *AwsS3Data) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AwsS3Data.Merge(dst, src)
+func (m *AwsS3Data) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AwsS3Data.Merge(m, src)
 }
 func (m *AwsS3Data) XXX_Size() int {
 	return xxx_messageInfo_AwsS3Data.Size(m)
@@ -463,16 +475,17 @@ func (m *HttpData) Reset()         { *m = HttpData{} }
 func (m *HttpData) String() string { return proto.CompactTextString(m) }
 func (*HttpData) ProtoMessage()    {}
 func (*HttpData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{5}
+	return fileDescriptor_291a6d3205b12034, []int{5}
 }
+
 func (m *HttpData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpData.Unmarshal(m, b)
 }
 func (m *HttpData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpData.Marshal(b, m, deterministic)
 }
-func (dst *HttpData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpData.Merge(dst, src)
+func (m *HttpData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpData.Merge(m, src)
 }
 func (m *HttpData) XXX_Size() int {
 	return xxx_messageInfo_HttpData.Size(m)
@@ -512,16 +525,17 @@ func (m *TransferOptions) Reset()         { *m = TransferOptions{} }
 func (m *TransferOptions) String() string { return proto.CompactTextString(m) }
 func (*TransferOptions) ProtoMessage()    {}
 func (*TransferOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{6}
+	return fileDescriptor_291a6d3205b12034, []int{6}
 }
+
 func (m *TransferOptions) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferOptions.Unmarshal(m, b)
 }
 func (m *TransferOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferOptions.Marshal(b, m, deterministic)
 }
-func (dst *TransferOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferOptions.Merge(dst, src)
+func (m *TransferOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferOptions.Merge(m, src)
 }
 func (m *TransferOptions) XXX_Size() int {
 	return xxx_messageInfo_TransferOptions.Size(m)
@@ -584,16 +598,17 @@ func (m *TransferSpec) Reset()         { *m = TransferSpec{} }
 func (m *TransferSpec) String() string { return proto.CompactTextString(m) }
 func (*TransferSpec) ProtoMessage()    {}
 func (*TransferSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{7}
+	return fileDescriptor_291a6d3205b12034, []int{7}
 }
+
 func (m *TransferSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferSpec.Unmarshal(m, b)
 }
 func (m *TransferSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferSpec.Marshal(b, m, deterministic)
 }
-func (dst *TransferSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferSpec.Merge(dst, src)
+func (m *TransferSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferSpec.Merge(m, src)
 }
 func (m *TransferSpec) XXX_Size() int {
 	return xxx_messageInfo_TransferSpec.Size(m)
@@ -692,9 +707,9 @@ func (m *TransferSpec) GetTransferOptions() *TransferOptions {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TransferSpec) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TransferSpec_OneofMarshaler, _TransferSpec_OneofUnmarshaler, _TransferSpec_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*TransferSpec) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*TransferSpec_GcsDataSource)(nil),
 		(*TransferSpec_AwsS3DataSource)(nil),
 		(*TransferSpec_HttpDataSource)(nil),
@@ -702,120 +717,6 @@ func (*TransferSpec) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 	}
 }
 
-func _TransferSpec_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TransferSpec)
-	// data_source
-	switch x := m.DataSource.(type) {
-	case *TransferSpec_GcsDataSource:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDataSource); err != nil {
-			return err
-		}
-	case *TransferSpec_AwsS3DataSource:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.AwsS3DataSource); err != nil {
-			return err
-		}
-	case *TransferSpec_HttpDataSource:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.HttpDataSource); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransferSpec.DataSource has unexpected type %T", x)
-	}
-	// data_sink
-	switch x := m.DataSink.(type) {
-	case *TransferSpec_GcsDataSink:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.GcsDataSink); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("TransferSpec.DataSink has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TransferSpec_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TransferSpec)
-	switch tag {
-	case 1: // data_source.gcs_data_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsData)
-		err := b.DecodeMessage(msg)
-		m.DataSource = &TransferSpec_GcsDataSource{msg}
-		return true, err
-	case 2: // data_source.aws_s3_data_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AwsS3Data)
-		err := b.DecodeMessage(msg)
-		m.DataSource = &TransferSpec_AwsS3DataSource{msg}
-		return true, err
-	case 3: // data_source.http_data_source
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(HttpData)
-		err := b.DecodeMessage(msg)
-		m.DataSource = &TransferSpec_HttpDataSource{msg}
-		return true, err
-	case 4: // data_sink.gcs_data_sink
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GcsData)
-		err := b.DecodeMessage(msg)
-		m.DataSink = &TransferSpec_GcsDataSink{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TransferSpec_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TransferSpec)
-	// data_source
-	switch x := m.DataSource.(type) {
-	case *TransferSpec_GcsDataSource:
-		s := proto.Size(x.GcsDataSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransferSpec_AwsS3DataSource:
-		s := proto.Size(x.AwsS3DataSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TransferSpec_HttpDataSource:
-		s := proto.Size(x.HttpDataSource)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// data_sink
-	switch x := m.DataSink.(type) {
-	case *TransferSpec_GcsDataSink:
-		s := proto.Size(x.GcsDataSink)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // Transfers can be scheduled to recur or to run just once.
 type Schedule struct {
 	// The first day the recurring transfer is scheduled to run. If
@@ -844,16 +745,17 @@ func (m *Schedule) Reset()         { *m = Schedule{} }
 func (m *Schedule) String() string { return proto.CompactTextString(m) }
 func (*Schedule) ProtoMessage()    {}
 func (*Schedule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{8}
+	return fileDescriptor_291a6d3205b12034, []int{8}
 }
+
 func (m *Schedule) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Schedule.Unmarshal(m, b)
 }
 func (m *Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Schedule.Marshal(b, m, deterministic)
 }
-func (dst *Schedule) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Schedule.Merge(dst, src)
+func (m *Schedule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Schedule.Merge(m, src)
 }
 func (m *Schedule) XXX_Size() int {
 	return xxx_messageInfo_Schedule.Size(m)
@@ -925,16 +827,17 @@ func (m *TransferJob) Reset()         { *m = TransferJob{} }
 func (m *TransferJob) String() string { return proto.CompactTextString(m) }
 func (*TransferJob) ProtoMessage()    {}
 func (*TransferJob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{9}
+	return fileDescriptor_291a6d3205b12034, []int{9}
 }
+
 func (m *TransferJob) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferJob.Unmarshal(m, b)
 }
 func (m *TransferJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferJob.Marshal(b, m, deterministic)
 }
-func (dst *TransferJob) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferJob.Merge(dst, src)
+func (m *TransferJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferJob.Merge(m, src)
 }
 func (m *TransferJob) XXX_Size() int {
 	return xxx_messageInfo_TransferJob.Size(m)
@@ -1025,16 +928,17 @@ func (m *ErrorLogEntry) Reset()         { *m = ErrorLogEntry{} }
 func (m *ErrorLogEntry) String() string { return proto.CompactTextString(m) }
 func (*ErrorLogEntry) ProtoMessage()    {}
 func (*ErrorLogEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{10}
+	return fileDescriptor_291a6d3205b12034, []int{10}
 }
+
 func (m *ErrorLogEntry) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorLogEntry.Unmarshal(m, b)
 }
 func (m *ErrorLogEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorLogEntry.Marshal(b, m, deterministic)
 }
-func (dst *ErrorLogEntry) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorLogEntry.Merge(dst, src)
+func (m *ErrorLogEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorLogEntry.Merge(m, src)
 }
 func (m *ErrorLogEntry) XXX_Size() int {
 	return xxx_messageInfo_ErrorLogEntry.Size(m)
@@ -1078,16 +982,17 @@ func (m *ErrorSummary) Reset()         { *m = ErrorSummary{} }
 func (m *ErrorSummary) String() string { return proto.CompactTextString(m) }
 func (*ErrorSummary) ProtoMessage()    {}
 func (*ErrorSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{11}
+	return fileDescriptor_291a6d3205b12034, []int{11}
 }
+
 func (m *ErrorSummary) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ErrorSummary.Unmarshal(m, b)
 }
 func (m *ErrorSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ErrorSummary.Marshal(b, m, deterministic)
 }
-func (dst *ErrorSummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ErrorSummary.Merge(dst, src)
+func (m *ErrorSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorSummary.Merge(m, src)
 }
 func (m *ErrorSummary) XXX_Size() int {
 	return xxx_messageInfo_ErrorSummary.Size(m)
@@ -1168,16 +1073,17 @@ func (m *TransferCounters) Reset()         { *m = TransferCounters{} }
 func (m *TransferCounters) String() string { return proto.CompactTextString(m) }
 func (*TransferCounters) ProtoMessage()    {}
 func (*TransferCounters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{12}
+	return fileDescriptor_291a6d3205b12034, []int{12}
 }
+
 func (m *TransferCounters) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferCounters.Unmarshal(m, b)
 }
 func (m *TransferCounters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferCounters.Marshal(b, m, deterministic)
 }
-func (dst *TransferCounters) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferCounters.Merge(dst, src)
+func (m *TransferCounters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferCounters.Merge(m, src)
 }
 func (m *TransferCounters) XXX_Size() int {
 	return xxx_messageInfo_TransferCounters.Size(m)
@@ -1331,16 +1237,17 @@ func (m *TransferOperation) Reset()         { *m = TransferOperation{} }
 func (m *TransferOperation) String() string { return proto.CompactTextString(m) }
 func (*TransferOperation) ProtoMessage()    {}
 func (*TransferOperation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_transfer_types_1b0f782d53ee7fbd, []int{13}
+	return fileDescriptor_291a6d3205b12034, []int{13}
 }
+
 func (m *TransferOperation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TransferOperation.Unmarshal(m, b)
 }
 func (m *TransferOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TransferOperation.Marshal(b, m, deterministic)
 }
-func (dst *TransferOperation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransferOperation.Merge(dst, src)
+func (m *TransferOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferOperation.Merge(m, src)
 }
 func (m *TransferOperation) XXX_Size() int {
 	return xxx_messageInfo_TransferOperation.Size(m)
@@ -1415,6 +1322,8 @@ func (m *TransferOperation) GetTransferJobName() string {
 }
 
 func init() {
+	proto.RegisterEnum("google.storagetransfer.v1.TransferJob_Status", TransferJob_Status_name, TransferJob_Status_value)
+	proto.RegisterEnum("google.storagetransfer.v1.TransferOperation_Status", TransferOperation_Status_name, TransferOperation_Status_value)
 	proto.RegisterType((*GoogleServiceAccount)(nil), "google.storagetransfer.v1.GoogleServiceAccount")
 	proto.RegisterType((*AwsAccessKey)(nil), "google.storagetransfer.v1.AwsAccessKey")
 	proto.RegisterType((*ObjectConditions)(nil), "google.storagetransfer.v1.ObjectConditions")
@@ -1429,15 +1338,13 @@ func init() {
 	proto.RegisterType((*ErrorSummary)(nil), "google.storagetransfer.v1.ErrorSummary")
 	proto.RegisterType((*TransferCounters)(nil), "google.storagetransfer.v1.TransferCounters")
 	proto.RegisterType((*TransferOperation)(nil), "google.storagetransfer.v1.TransferOperation")
-	proto.RegisterEnum("google.storagetransfer.v1.TransferJob_Status", TransferJob_Status_name, TransferJob_Status_value)
-	proto.RegisterEnum("google.storagetransfer.v1.TransferOperation_Status", TransferOperation_Status_name, TransferOperation_Status_value)
 }
 
 func init() {
-	proto.RegisterFile("google/storagetransfer/v1/transfer_types.proto", fileDescriptor_transfer_types_1b0f782d53ee7fbd)
+	proto.RegisterFile("google/storagetransfer/v1/transfer_types.proto", fileDescriptor_291a6d3205b12034)
 }
 
-var fileDescriptor_transfer_types_1b0f782d53ee7fbd = []byte{
+var fileDescriptor_291a6d3205b12034 = []byte{
 	// 1767 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x6e, 0xdb, 0xc8,
 	0x15, 0x8e, 0x24, 0xc7, 0x96, 0x8e, 0x24, 0x4b, 0x9e, 0xcd, 0x7a, 0x65, 0x27, 0xd9, 0xa4, 0xf4,
diff --git a/googleapis/streetview/publish/v1/resources.pb.go b/googleapis/streetview/publish/v1/resources.pb.go
index 7c813ceb4f..243e88acb7 100644
--- a/googleapis/streetview/publish/v1/resources.pb.go
+++ b/googleapis/streetview/publish/v1/resources.pb.go
@@ -1,14 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/resources.proto
 
-package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
+package publish
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import latlng "google.golang.org/genproto/googleapis/type/latlng"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	latlng "google.golang.org/genproto/googleapis/type/latlng"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -19,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Status of rights transfer.
 type Photo_TransferStatus int32
@@ -55,6 +58,7 @@ var Photo_TransferStatus_name = map[int32]string{
 	6: "CANCELLED",
 	7: "RECEIVED_VIA_TRANSFER",
 }
+
 var Photo_TransferStatus_value = map[string]int32{
 	"TRANSFER_STATUS_UNKNOWN": 0,
 	"NEVER_TRANSFERRED":       1,
@@ -69,8 +73,9 @@ var Photo_TransferStatus_value = map[string]int32{
 func (x Photo_TransferStatus) String() string {
 	return proto.EnumName(Photo_TransferStatus_name, int32(x))
 }
+
 func (Photo_TransferStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{6, 0}
+	return fileDescriptor_56f2b10d5439612a, []int{6, 0}
 }
 
 // Publication status of the photo in Google Maps.
@@ -90,6 +95,7 @@ var Photo_MapsPublishStatus_name = map[int32]string{
 	1: "PUBLISHED",
 	2: "REJECTED_UNKNOWN",
 }
+
 var Photo_MapsPublishStatus_value = map[string]int32{
 	"UNSPECIFIED_MAPS_PUBLISH_STATUS": 0,
 	"PUBLISHED":                       1,
@@ -99,8 +105,9 @@ var Photo_MapsPublishStatus_value = map[string]int32{
 func (x Photo_MapsPublishStatus) String() string {
 	return proto.EnumName(Photo_MapsPublishStatus_name, int32(x))
 }
+
 func (Photo_MapsPublishStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{6, 1}
+	return fileDescriptor_56f2b10d5439612a, []int{6, 1}
 }
 
 // Upload reference for media files.
@@ -118,16 +125,17 @@ func (m *UploadRef) Reset()         { *m = UploadRef{} }
 func (m *UploadRef) String() string { return proto.CompactTextString(m) }
 func (*UploadRef) ProtoMessage()    {}
 func (*UploadRef) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{0}
+	return fileDescriptor_56f2b10d5439612a, []int{0}
 }
+
 func (m *UploadRef) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadRef.Unmarshal(m, b)
 }
 func (m *UploadRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadRef.Marshal(b, m, deterministic)
 }
-func (dst *UploadRef) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadRef.Merge(dst, src)
+func (m *UploadRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadRef.Merge(m, src)
 }
 func (m *UploadRef) XXX_Size() int {
 	return xxx_messageInfo_UploadRef.Size(m)
@@ -158,16 +166,17 @@ func (m *PhotoId) Reset()         { *m = PhotoId{} }
 func (m *PhotoId) String() string { return proto.CompactTextString(m) }
 func (*PhotoId) ProtoMessage()    {}
 func (*PhotoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{1}
+	return fileDescriptor_56f2b10d5439612a, []int{1}
 }
+
 func (m *PhotoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PhotoId.Unmarshal(m, b)
 }
 func (m *PhotoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PhotoId.Marshal(b, m, deterministic)
 }
-func (dst *PhotoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PhotoId.Merge(dst, src)
+func (m *PhotoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PhotoId.Merge(m, src)
 }
 func (m *PhotoId) XXX_Size() int {
 	return xxx_messageInfo_PhotoId.Size(m)
@@ -204,16 +213,17 @@ func (m *Level) Reset()         { *m = Level{} }
 func (m *Level) String() string { return proto.CompactTextString(m) }
 func (*Level) ProtoMessage()    {}
 func (*Level) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{2}
+	return fileDescriptor_56f2b10d5439612a, []int{2}
 }
+
 func (m *Level) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Level.Unmarshal(m, b)
 }
 func (m *Level) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Level.Marshal(b, m, deterministic)
 }
-func (dst *Level) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Level.Merge(dst, src)
+func (m *Level) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Level.Merge(m, src)
 }
 func (m *Level) XXX_Size() int {
 	return xxx_messageInfo_Level.Size(m)
@@ -281,16 +291,17 @@ func (m *Pose) Reset()         { *m = Pose{} }
 func (m *Pose) String() string { return proto.CompactTextString(m) }
 func (*Pose) ProtoMessage()    {}
 func (*Pose) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{3}
+	return fileDescriptor_56f2b10d5439612a, []int{3}
 }
+
 func (m *Pose) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Pose.Unmarshal(m, b)
 }
 func (m *Pose) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Pose.Marshal(b, m, deterministic)
 }
-func (dst *Pose) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Pose.Merge(dst, src)
+func (m *Pose) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Pose.Merge(m, src)
 }
 func (m *Pose) XXX_Size() int {
 	return xxx_messageInfo_Pose.Size(m)
@@ -369,16 +380,17 @@ func (m *Place) Reset()         { *m = Place{} }
 func (m *Place) String() string { return proto.CompactTextString(m) }
 func (*Place) ProtoMessage()    {}
 func (*Place) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{4}
+	return fileDescriptor_56f2b10d5439612a, []int{4}
 }
+
 func (m *Place) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Place.Unmarshal(m, b)
 }
 func (m *Place) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Place.Marshal(b, m, deterministic)
 }
-func (dst *Place) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Place.Merge(dst, src)
+func (m *Place) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Place.Merge(m, src)
 }
 func (m *Place) XXX_Size() int {
 	return xxx_messageInfo_Place.Size(m)
@@ -424,16 +436,17 @@ func (m *Connection) Reset()         { *m = Connection{} }
 func (m *Connection) String() string { return proto.CompactTextString(m) }
 func (*Connection) ProtoMessage()    {}
 func (*Connection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{5}
+	return fileDescriptor_56f2b10d5439612a, []int{5}
 }
+
 func (m *Connection) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Connection.Unmarshal(m, b)
 }
 func (m *Connection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Connection.Marshal(b, m, deterministic)
 }
-func (dst *Connection) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Connection.Merge(dst, src)
+func (m *Connection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Connection.Merge(m, src)
 }
 func (m *Connection) XXX_Size() int {
 	return xxx_messageInfo_Connection.Size(m)
@@ -497,16 +510,17 @@ func (m *Photo) Reset()         { *m = Photo{} }
 func (m *Photo) String() string { return proto.CompactTextString(m) }
 func (*Photo) ProtoMessage()    {}
 func (*Photo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_resources_4fb97700fa63963a, []int{6}
+	return fileDescriptor_56f2b10d5439612a, []int{6}
 }
+
 func (m *Photo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Photo.Unmarshal(m, b)
 }
 func (m *Photo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Photo.Marshal(b, m, deterministic)
 }
-func (dst *Photo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Photo.Merge(dst, src)
+func (m *Photo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Photo.Merge(m, src)
 }
 func (m *Photo) XXX_Size() int {
 	return xxx_messageInfo_Photo.Size(m)
@@ -602,6 +616,8 @@ func (m *Photo) GetMapsPublishStatus() Photo_MapsPublishStatus {
 }
 
 func init() {
+	proto.RegisterEnum("google.streetview.publish.v1.Photo_TransferStatus", Photo_TransferStatus_name, Photo_TransferStatus_value)
+	proto.RegisterEnum("google.streetview.publish.v1.Photo_MapsPublishStatus", Photo_MapsPublishStatus_name, Photo_MapsPublishStatus_value)
 	proto.RegisterType((*UploadRef)(nil), "google.streetview.publish.v1.UploadRef")
 	proto.RegisterType((*PhotoId)(nil), "google.streetview.publish.v1.PhotoId")
 	proto.RegisterType((*Level)(nil), "google.streetview.publish.v1.Level")
@@ -609,15 +625,13 @@ func init() {
 	proto.RegisterType((*Place)(nil), "google.streetview.publish.v1.Place")
 	proto.RegisterType((*Connection)(nil), "google.streetview.publish.v1.Connection")
 	proto.RegisterType((*Photo)(nil), "google.streetview.publish.v1.Photo")
-	proto.RegisterEnum("google.streetview.publish.v1.Photo_TransferStatus", Photo_TransferStatus_name, Photo_TransferStatus_value)
-	proto.RegisterEnum("google.streetview.publish.v1.Photo_MapsPublishStatus", Photo_MapsPublishStatus_name, Photo_MapsPublishStatus_value)
 }
 
 func init() {
-	proto.RegisterFile("google/streetview/publish/v1/resources.proto", fileDescriptor_resources_4fb97700fa63963a)
+	proto.RegisterFile("google/streetview/publish/v1/resources.proto", fileDescriptor_56f2b10d5439612a)
 }
 
-var fileDescriptor_resources_4fb97700fa63963a = []byte{
+var fileDescriptor_56f2b10d5439612a = []byte{
 	// 940 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x6f, 0x6f, 0xdb, 0xb6,
 	0x13, 0xae, 0x9d, 0xd8, 0x8e, 0xcf, 0x4e, 0xe2, 0xb0, 0xed, 0xef, 0xa7, 0x64, 0x2b, 0x9a, 0x29,
diff --git a/googleapis/streetview/publish/v1/rpcmessages.pb.go b/googleapis/streetview/publish/v1/rpcmessages.pb.go
index 87c06cfae8..d0e4b92d2c 100644
--- a/googleapis/streetview/publish/v1/rpcmessages.pb.go
+++ b/googleapis/streetview/publish/v1/rpcmessages.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/rpcmessages.proto
 
-package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
+package publish
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import status "google.golang.org/genproto/googleapis/rpc/status"
-import field_mask "google.golang.org/genproto/protobuf/field_mask"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	status "google.golang.org/genproto/googleapis/rpc/status"
+	field_mask "google.golang.org/genproto/protobuf/field_mask"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Specifies which view of the [Photo][google.streetview.publish.v1.Photo]
 // to include in the response.
@@ -36,6 +39,7 @@ var PhotoView_name = map[int32]string{
 	0: "BASIC",
 	1: "INCLUDE_DOWNLOAD_URL",
 }
+
 var PhotoView_value = map[string]int32{
 	"BASIC":                0,
 	"INCLUDE_DOWNLOAD_URL": 1,
@@ -44,8 +48,9 @@ var PhotoView_value = map[string]int32{
 func (x PhotoView) String() string {
 	return proto.EnumName(PhotoView_name, int32(x))
 }
+
 func (PhotoView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{0}
+	return fileDescriptor_e56ff94407a6aca7, []int{0}
 }
 
 // Request to create a [Photo][google.streetview.publish.v1.Photo].
@@ -61,16 +66,17 @@ func (m *CreatePhotoRequest) Reset()         { *m = CreatePhotoRequest{} }
 func (m *CreatePhotoRequest) String() string { return proto.CompactTextString(m) }
 func (*CreatePhotoRequest) ProtoMessage()    {}
 func (*CreatePhotoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{0}
+	return fileDescriptor_e56ff94407a6aca7, []int{0}
 }
+
 func (m *CreatePhotoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CreatePhotoRequest.Unmarshal(m, b)
 }
 func (m *CreatePhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CreatePhotoRequest.Marshal(b, m, deterministic)
 }
-func (dst *CreatePhotoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CreatePhotoRequest.Merge(dst, src)
+func (m *CreatePhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreatePhotoRequest.Merge(m, src)
 }
 func (m *CreatePhotoRequest) XXX_Size() int {
 	return xxx_messageInfo_CreatePhotoRequest.Size(m)
@@ -118,16 +124,17 @@ func (m *GetPhotoRequest) Reset()         { *m = GetPhotoRequest{} }
 func (m *GetPhotoRequest) String() string { return proto.CompactTextString(m) }
 func (*GetPhotoRequest) ProtoMessage()    {}
 func (*GetPhotoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{1}
+	return fileDescriptor_e56ff94407a6aca7, []int{1}
 }
+
 func (m *GetPhotoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPhotoRequest.Unmarshal(m, b)
 }
 func (m *GetPhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetPhotoRequest.Marshal(b, m, deterministic)
 }
-func (dst *GetPhotoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetPhotoRequest.Merge(dst, src)
+func (m *GetPhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPhotoRequest.Merge(m, src)
 }
 func (m *GetPhotoRequest) XXX_Size() int {
 	return xxx_messageInfo_GetPhotoRequest.Size(m)
@@ -190,16 +197,17 @@ func (m *BatchGetPhotosRequest) Reset()         { *m = BatchGetPhotosRequest{} }
 func (m *BatchGetPhotosRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchGetPhotosRequest) ProtoMessage()    {}
 func (*BatchGetPhotosRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{2}
+	return fileDescriptor_e56ff94407a6aca7, []int{2}
 }
+
 func (m *BatchGetPhotosRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetPhotosRequest.Unmarshal(m, b)
 }
 func (m *BatchGetPhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetPhotosRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetPhotosRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetPhotosRequest.Merge(dst, src)
+func (m *BatchGetPhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetPhotosRequest.Merge(m, src)
 }
 func (m *BatchGetPhotosRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchGetPhotosRequest.Size(m)
@@ -247,16 +255,17 @@ func (m *BatchGetPhotosResponse) Reset()         { *m = BatchGetPhotosResponse{}
 func (m *BatchGetPhotosResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchGetPhotosResponse) ProtoMessage()    {}
 func (*BatchGetPhotosResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{3}
+	return fileDescriptor_e56ff94407a6aca7, []int{3}
 }
+
 func (m *BatchGetPhotosResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchGetPhotosResponse.Unmarshal(m, b)
 }
 func (m *BatchGetPhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchGetPhotosResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchGetPhotosResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchGetPhotosResponse.Merge(dst, src)
+func (m *BatchGetPhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetPhotosResponse.Merge(m, src)
 }
 func (m *BatchGetPhotosResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchGetPhotosResponse.Size(m)
@@ -296,16 +305,17 @@ func (m *PhotoResponse) Reset()         { *m = PhotoResponse{} }
 func (m *PhotoResponse) String() string { return proto.CompactTextString(m) }
 func (*PhotoResponse) ProtoMessage()    {}
 func (*PhotoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{4}
+	return fileDescriptor_e56ff94407a6aca7, []int{4}
 }
+
 func (m *PhotoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PhotoResponse.Unmarshal(m, b)
 }
 func (m *PhotoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PhotoResponse.Marshal(b, m, deterministic)
 }
-func (dst *PhotoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PhotoResponse.Merge(dst, src)
+func (m *PhotoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PhotoResponse.Merge(m, src)
 }
 func (m *PhotoResponse) XXX_Size() int {
 	return xxx_messageInfo_PhotoResponse.Size(m)
@@ -380,16 +390,17 @@ func (m *ListPhotosRequest) Reset()         { *m = ListPhotosRequest{} }
 func (m *ListPhotosRequest) String() string { return proto.CompactTextString(m) }
 func (*ListPhotosRequest) ProtoMessage()    {}
 func (*ListPhotosRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{5}
+	return fileDescriptor_e56ff94407a6aca7, []int{5}
 }
+
 func (m *ListPhotosRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListPhotosRequest.Unmarshal(m, b)
 }
 func (m *ListPhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListPhotosRequest.Marshal(b, m, deterministic)
 }
-func (dst *ListPhotosRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListPhotosRequest.Merge(dst, src)
+func (m *ListPhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPhotosRequest.Merge(m, src)
 }
 func (m *ListPhotosRequest) XXX_Size() int {
 	return xxx_messageInfo_ListPhotosRequest.Size(m)
@@ -453,16 +464,17 @@ func (m *ListPhotosResponse) Reset()         { *m = ListPhotosResponse{} }
 func (m *ListPhotosResponse) String() string { return proto.CompactTextString(m) }
 func (*ListPhotosResponse) ProtoMessage()    {}
 func (*ListPhotosResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{6}
+	return fileDescriptor_e56ff94407a6aca7, []int{6}
 }
+
 func (m *ListPhotosResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListPhotosResponse.Unmarshal(m, b)
 }
 func (m *ListPhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListPhotosResponse.Marshal(b, m, deterministic)
 }
-func (dst *ListPhotosResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListPhotosResponse.Merge(dst, src)
+func (m *ListPhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPhotosResponse.Merge(m, src)
 }
 func (m *ListPhotosResponse) XXX_Size() int {
 	return xxx_messageInfo_ListPhotosResponse.Size(m)
@@ -530,16 +542,17 @@ func (m *UpdatePhotoRequest) Reset()         { *m = UpdatePhotoRequest{} }
 func (m *UpdatePhotoRequest) String() string { return proto.CompactTextString(m) }
 func (*UpdatePhotoRequest) ProtoMessage()    {}
 func (*UpdatePhotoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{7}
+	return fileDescriptor_e56ff94407a6aca7, []int{7}
 }
+
 func (m *UpdatePhotoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdatePhotoRequest.Unmarshal(m, b)
 }
 func (m *UpdatePhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UpdatePhotoRequest.Marshal(b, m, deterministic)
 }
-func (dst *UpdatePhotoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UpdatePhotoRequest.Merge(dst, src)
+func (m *UpdatePhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdatePhotoRequest.Merge(m, src)
 }
 func (m *UpdatePhotoRequest) XXX_Size() int {
 	return xxx_messageInfo_UpdatePhotoRequest.Size(m)
@@ -579,16 +592,17 @@ func (m *BatchUpdatePhotosRequest) Reset()         { *m = BatchUpdatePhotosReque
 func (m *BatchUpdatePhotosRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdatePhotosRequest) ProtoMessage()    {}
 func (*BatchUpdatePhotosRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{8}
+	return fileDescriptor_e56ff94407a6aca7, []int{8}
 }
+
 func (m *BatchUpdatePhotosRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdatePhotosRequest.Unmarshal(m, b)
 }
 func (m *BatchUpdatePhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdatePhotosRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdatePhotosRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdatePhotosRequest.Merge(dst, src)
+func (m *BatchUpdatePhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdatePhotosRequest.Merge(m, src)
 }
 func (m *BatchUpdatePhotosRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdatePhotosRequest.Size(m)
@@ -622,16 +636,17 @@ func (m *BatchUpdatePhotosResponse) Reset()         { *m = BatchUpdatePhotosResp
 func (m *BatchUpdatePhotosResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdatePhotosResponse) ProtoMessage()    {}
 func (*BatchUpdatePhotosResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{9}
+	return fileDescriptor_e56ff94407a6aca7, []int{9}
 }
+
 func (m *BatchUpdatePhotosResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchUpdatePhotosResponse.Unmarshal(m, b)
 }
 func (m *BatchUpdatePhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchUpdatePhotosResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchUpdatePhotosResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchUpdatePhotosResponse.Merge(dst, src)
+func (m *BatchUpdatePhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdatePhotosResponse.Merge(m, src)
 }
 func (m *BatchUpdatePhotosResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchUpdatePhotosResponse.Size(m)
@@ -662,16 +677,17 @@ func (m *DeletePhotoRequest) Reset()         { *m = DeletePhotoRequest{} }
 func (m *DeletePhotoRequest) String() string { return proto.CompactTextString(m) }
 func (*DeletePhotoRequest) ProtoMessage()    {}
 func (*DeletePhotoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{10}
+	return fileDescriptor_e56ff94407a6aca7, []int{10}
 }
+
 func (m *DeletePhotoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeletePhotoRequest.Unmarshal(m, b)
 }
 func (m *DeletePhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DeletePhotoRequest.Marshal(b, m, deterministic)
 }
-func (dst *DeletePhotoRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeletePhotoRequest.Merge(dst, src)
+func (m *DeletePhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePhotoRequest.Merge(m, src)
 }
 func (m *DeletePhotoRequest) XXX_Size() int {
 	return xxx_messageInfo_DeletePhotoRequest.Size(m)
@@ -704,16 +720,17 @@ func (m *BatchDeletePhotosRequest) Reset()         { *m = BatchDeletePhotosReque
 func (m *BatchDeletePhotosRequest) String() string { return proto.CompactTextString(m) }
 func (*BatchDeletePhotosRequest) ProtoMessage()    {}
 func (*BatchDeletePhotosRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{11}
+	return fileDescriptor_e56ff94407a6aca7, []int{11}
 }
+
 func (m *BatchDeletePhotosRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeletePhotosRequest.Unmarshal(m, b)
 }
 func (m *BatchDeletePhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeletePhotosRequest.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeletePhotosRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeletePhotosRequest.Merge(dst, src)
+func (m *BatchDeletePhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeletePhotosRequest.Merge(m, src)
 }
 func (m *BatchDeletePhotosRequest) XXX_Size() int {
 	return xxx_messageInfo_BatchDeletePhotosRequest.Size(m)
@@ -746,16 +763,17 @@ func (m *BatchDeletePhotosResponse) Reset()         { *m = BatchDeletePhotosResp
 func (m *BatchDeletePhotosResponse) String() string { return proto.CompactTextString(m) }
 func (*BatchDeletePhotosResponse) ProtoMessage()    {}
 func (*BatchDeletePhotosResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rpcmessages_3d6515828940d466, []int{12}
+	return fileDescriptor_e56ff94407a6aca7, []int{12}
 }
+
 func (m *BatchDeletePhotosResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchDeletePhotosResponse.Unmarshal(m, b)
 }
 func (m *BatchDeletePhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BatchDeletePhotosResponse.Marshal(b, m, deterministic)
 }
-func (dst *BatchDeletePhotosResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BatchDeletePhotosResponse.Merge(dst, src)
+func (m *BatchDeletePhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeletePhotosResponse.Merge(m, src)
 }
 func (m *BatchDeletePhotosResponse) XXX_Size() int {
 	return xxx_messageInfo_BatchDeletePhotosResponse.Size(m)
@@ -774,6 +792,7 @@ func (m *BatchDeletePhotosResponse) GetStatus() []*status.Status {
 }
 
 func init() {
+	proto.RegisterEnum("google.streetview.publish.v1.PhotoView", PhotoView_name, PhotoView_value)
 	proto.RegisterType((*CreatePhotoRequest)(nil), "google.streetview.publish.v1.CreatePhotoRequest")
 	proto.RegisterType((*GetPhotoRequest)(nil), "google.streetview.publish.v1.GetPhotoRequest")
 	proto.RegisterType((*BatchGetPhotosRequest)(nil), "google.streetview.publish.v1.BatchGetPhotosRequest")
@@ -787,14 +806,13 @@ func init() {
 	proto.RegisterType((*DeletePhotoRequest)(nil), "google.streetview.publish.v1.DeletePhotoRequest")
 	proto.RegisterType((*BatchDeletePhotosRequest)(nil), "google.streetview.publish.v1.BatchDeletePhotosRequest")
 	proto.RegisterType((*BatchDeletePhotosResponse)(nil), "google.streetview.publish.v1.BatchDeletePhotosResponse")
-	proto.RegisterEnum("google.streetview.publish.v1.PhotoView", PhotoView_name, PhotoView_value)
 }
 
 func init() {
-	proto.RegisterFile("google/streetview/publish/v1/rpcmessages.proto", fileDescriptor_rpcmessages_3d6515828940d466)
+	proto.RegisterFile("google/streetview/publish/v1/rpcmessages.proto", fileDescriptor_e56ff94407a6aca7)
 }
 
-var fileDescriptor_rpcmessages_3d6515828940d466 = []byte{
+var fileDescriptor_e56ff94407a6aca7 = []byte{
 	// 669 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x5d, 0x4f, 0xd3, 0x5e,
 	0x18, 0xff, 0x17, 0xd8, 0x60, 0x0f, 0x7f, 0x04, 0x8f, 0x82, 0x65, 0x62, 0xb2, 0x94, 0x44, 0x17,
diff --git a/googleapis/streetview/publish/v1/streetview_publish.pb.go b/googleapis/streetview/publish/v1/streetview_publish.pb.go
index 86c33ff16c..0fbf53f693 100644
--- a/googleapis/streetview/publish/v1/streetview_publish.pb.go
+++ b/googleapis/streetview/publish/v1/streetview_publish.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/streetview_publish.proto
 
-package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package publish
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -23,7 +23,49 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+func init() {
+	proto.RegisterFile("google/streetview/publish/v1/streetview_publish.proto", fileDescriptor_39e5f334059d9d6e)
+}
+
+var fileDescriptor_39e5f334059d9d6e = []byte{
+	// 533 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
+	0x18, 0xc6, 0x15, 0x24, 0x10, 0xb8, 0x08, 0x69, 0x86, 0x55, 0x53, 0x3a, 0x24, 0x08, 0x12, 0xa0,
+	0x6a, 0xd8, 0x1b, 0xe3, 0x8f, 0x54, 0x6e, 0x1d, 0x88, 0x0b, 0x87, 0x69, 0xd5, 0x38, 0x70, 0x99,
+	0xdc, 0xf4, 0x5d, 0x6a, 0x29, 0x8d, 0x4d, 0xec, 0x74, 0x42, 0x30, 0x0e, 0xe3, 0xc8, 0x0d, 0x2e,
+	0x7c, 0x03, 0x3e, 0x10, 0x5f, 0x81, 0x0f, 0x82, 0xea, 0xd8, 0x4d, 0x36, 0x8a, 0x49, 0x4e, 0x69,
+	0xf3, 0x3e, 0xcf, 0xfb, 0xfc, 0xfa, 0xbe, 0xae, 0xd1, 0xd3, 0x44, 0x88, 0x24, 0x05, 0xaa, 0x74,
+	0x0e, 0xa0, 0xe7, 0x1c, 0x4e, 0xa8, 0x2c, 0xc6, 0x29, 0x57, 0x53, 0x3a, 0xdf, 0xa9, 0xbd, 0x3d,
+	0xb2, 0x6f, 0x89, 0xcc, 0x85, 0x16, 0x78, 0xb3, 0xb4, 0x91, 0x4a, 0x40, 0x9c, 0x60, 0xbe, 0x13,
+	0xda, 0x2a, 0x65, 0x92, 0x53, 0x96, 0x65, 0x42, 0x33, 0xcd, 0x45, 0xa6, 0x4a, 0x6f, 0xd8, 0xb3,
+	0x55, 0xf3, 0x6d, 0x5c, 0x1c, 0x53, 0x98, 0x49, 0xfd, 0xc1, 0x16, 0xb7, 0xbc, 0x3c, 0x39, 0x28,
+	0x51, 0xe4, 0x31, 0xb8, 0x56, 0xc4, 0xaf, 0x96, 0xf1, 0x0c, 0x94, 0x62, 0x89, 0xd3, 0x3f, 0xfe,
+	0x8a, 0xd0, 0xc6, 0xc8, 0x68, 0xdf, 0x72, 0x38, 0xd9, 0x2f, 0xa5, 0x23, 0xc8, 0xe7, 0x3c, 0x06,
+	0x2c, 0x51, 0x67, 0xa4, 0x59, 0xae, 0x0f, 0x65, 0x2a, 0xd8, 0x04, 0x77, 0x6d, 0x73, 0xe2, 0x38,
+	0xc9, 0xab, 0x05, 0x67, 0xf8, 0x80, 0xf8, 0x7e, 0x3b, 0x29, 0xdd, 0x07, 0x70, 0x1c, 0xdd, 0x39,
+	0xfb, 0xf5, 0xfb, 0xfb, 0xa5, 0x30, 0x5a, 0x5f, 0xb0, 0xc8, 0xa9, 0xd0, 0x62, 0xa0, 0xaa, 0xfe,
+	0x83, 0xa0, 0x8f, 0x3f, 0xa3, 0xce, 0x5e, 0x0e, 0x4c, 0xc3, 0xfe, 0xa2, 0x8a, 0xb7, 0xfd, 0x9d,
+	0x6b, 0xd2, 0x03, 0x78, 0x5f, 0x80, 0xd2, 0xe1, 0x3d, 0xbf, 0xc3, 0x68, 0xa3, 0x0d, 0xc3, 0x81,
+	0xa3, 0x6b, 0x15, 0xc7, 0x65, 0xf3, 0xc0, 0x9f, 0xd0, 0xd5, 0xd7, 0xa0, 0xcb, 0xf0, 0x47, 0xfe,
+	0x56, 0x4e, 0xd7, 0x2a, 0x79, 0xd3, 0x24, 0x77, 0xf1, 0xad, 0x65, 0x32, 0xfd, 0x68, 0x1e, 0x47,
+	0x7c, 0x72, 0x8a, 0x7f, 0x04, 0xe8, 0xc6, 0x90, 0xe9, 0x78, 0xea, 0x7a, 0x2b, 0xbc, 0xeb, 0xef,
+	0x7a, 0x5e, 0xed, 0x50, 0x9e, 0xb4, 0x33, 0x29, 0x29, 0x32, 0x05, 0x51, 0xcf, 0xb0, 0xad, 0xe3,
+	0x9b, 0x4b, 0x36, 0x35, 0x18, 0x5b, 0x29, 0xfe, 0x12, 0x20, 0xf4, 0x86, 0x2b, 0x87, 0x45, 0xfd,
+	0x09, 0x95, 0xd2, 0x21, 0x6d, 0x37, 0x37, 0x58, 0x1c, 0x6c, 0x70, 0xae, 0x63, 0x54, 0xe1, 0xe0,
+	0x6f, 0x01, 0xea, 0x1c, 0xca, 0x49, 0xd3, 0xf3, 0x51, 0x93, 0xb6, 0xda, 0xd2, 0x96, 0x89, 0xbe,
+	0x1f, 0xde, 0xbe, 0xb8, 0x25, 0xe2, 0x76, 0x45, 0xf8, 0xe4, 0xd4, 0x9d, 0x99, 0x9f, 0x01, 0x5a,
+	0x33, 0x23, 0xad, 0xc5, 0x29, 0xfc, 0xac, 0xc1, 0x0e, 0xea, 0x06, 0x07, 0xf8, 0xbc, 0xb5, 0xcf,
+	0xce, 0xeb, 0xae, 0x81, 0xee, 0x45, 0xdd, 0x8b, 0xeb, 0x2b, 0xd5, 0x8b, 0x7f, 0x57, 0x81, 0x3a,
+	0x2f, 0x21, 0x85, 0x86, 0xd3, 0xab, 0x49, 0x1d, 0xdc, 0x3f, 0x6e, 0x00, 0x77, 0xac, 0xfb, 0xab,
+	0x8f, 0xf5, 0x72, 0x40, 0xb5, 0x8e, 0xcd, 0x06, 0x54, 0x37, 0xb4, 0x19, 0xd0, 0x79, 0xdf, 0xff,
+	0x06, 0x54, 0xaa, 0x07, 0x41, 0x7f, 0x78, 0x16, 0xa0, 0x87, 0xb1, 0x98, 0xb9, 0x84, 0x04, 0x04,
+	0x29, 0x92, 0x78, 0x75, 0xd2, 0x70, 0xed, 0xaf, 0x7b, 0xf3, 0xdd, 0x9e, 0x33, 0x8a, 0x94, 0x65,
+	0x09, 0x11, 0x79, 0x42, 0x13, 0xc8, 0xcc, 0xb0, 0x68, 0x59, 0x62, 0x92, 0xab, 0xd5, 0x97, 0xf3,
+	0x0b, 0xfb, 0x71, 0x7c, 0xc5, 0xe8, 0x77, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x9d, 0xfe,
+	0x1c, 0x89, 0x06, 0x00, 0x00,
+}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -662,45 +704,3 @@ var _StreetViewPublishService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/streetview/publish/v1/streetview_publish.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/streetview/publish/v1/streetview_publish.proto", fileDescriptor_streetview_publish_0ab84337183ba29d)
-}
-
-var fileDescriptor_streetview_publish_0ab84337183ba29d = []byte{
-	// 533 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
-	0x18, 0xc6, 0x15, 0x24, 0x10, 0xb8, 0x08, 0x69, 0x86, 0x55, 0x53, 0x3a, 0x24, 0x08, 0x12, 0xa0,
-	0x6a, 0xd8, 0x1b, 0xe3, 0x8f, 0x54, 0x6e, 0x1d, 0x88, 0x0b, 0x87, 0x69, 0xd5, 0x38, 0x70, 0x99,
-	0xdc, 0xf4, 0x5d, 0x6a, 0x29, 0x8d, 0x4d, 0xec, 0x74, 0x42, 0x30, 0x0e, 0xe3, 0xc8, 0x0d, 0x2e,
-	0x7c, 0x03, 0x3e, 0x10, 0x5f, 0x81, 0x0f, 0x82, 0xea, 0xd8, 0x4d, 0x36, 0x8a, 0x49, 0x4e, 0x69,
-	0xf3, 0x3e, 0xcf, 0xfb, 0xfc, 0xfa, 0xbe, 0xae, 0xd1, 0xd3, 0x44, 0x88, 0x24, 0x05, 0xaa, 0x74,
-	0x0e, 0xa0, 0xe7, 0x1c, 0x4e, 0xa8, 0x2c, 0xc6, 0x29, 0x57, 0x53, 0x3a, 0xdf, 0xa9, 0xbd, 0x3d,
-	0xb2, 0x6f, 0x89, 0xcc, 0x85, 0x16, 0x78, 0xb3, 0xb4, 0x91, 0x4a, 0x40, 0x9c, 0x60, 0xbe, 0x13,
-	0xda, 0x2a, 0x65, 0x92, 0x53, 0x96, 0x65, 0x42, 0x33, 0xcd, 0x45, 0xa6, 0x4a, 0x6f, 0xd8, 0xb3,
-	0x55, 0xf3, 0x6d, 0x5c, 0x1c, 0x53, 0x98, 0x49, 0xfd, 0xc1, 0x16, 0xb7, 0xbc, 0x3c, 0x39, 0x28,
-	0x51, 0xe4, 0x31, 0xb8, 0x56, 0xc4, 0xaf, 0x96, 0xf1, 0x0c, 0x94, 0x62, 0x89, 0xd3, 0x3f, 0xfe,
-	0x8a, 0xd0, 0xc6, 0xc8, 0x68, 0xdf, 0x72, 0x38, 0xd9, 0x2f, 0xa5, 0x23, 0xc8, 0xe7, 0x3c, 0x06,
-	0x2c, 0x51, 0x67, 0xa4, 0x59, 0xae, 0x0f, 0x65, 0x2a, 0xd8, 0x04, 0x77, 0x6d, 0x73, 0xe2, 0x38,
-	0xc9, 0xab, 0x05, 0x67, 0xf8, 0x80, 0xf8, 0x7e, 0x3b, 0x29, 0xdd, 0x07, 0x70, 0x1c, 0xdd, 0x39,
-	0xfb, 0xf5, 0xfb, 0xfb, 0xa5, 0x30, 0x5a, 0x5f, 0xb0, 0xc8, 0xa9, 0xd0, 0x62, 0xa0, 0xaa, 0xfe,
-	0x83, 0xa0, 0x8f, 0x3f, 0xa3, 0xce, 0x5e, 0x0e, 0x4c, 0xc3, 0xfe, 0xa2, 0x8a, 0xb7, 0xfd, 0x9d,
-	0x6b, 0xd2, 0x03, 0x78, 0x5f, 0x80, 0xd2, 0xe1, 0x3d, 0xbf, 0xc3, 0x68, 0xa3, 0x0d, 0xc3, 0x81,
-	0xa3, 0x6b, 0x15, 0xc7, 0x65, 0xf3, 0xc0, 0x9f, 0xd0, 0xd5, 0xd7, 0xa0, 0xcb, 0xf0, 0x47, 0xfe,
-	0x56, 0x4e, 0xd7, 0x2a, 0x79, 0xd3, 0x24, 0x77, 0xf1, 0xad, 0x65, 0x32, 0xfd, 0x68, 0x1e, 0x47,
-	0x7c, 0x72, 0x8a, 0x7f, 0x04, 0xe8, 0xc6, 0x90, 0xe9, 0x78, 0xea, 0x7a, 0x2b, 0xbc, 0xeb, 0xef,
-	0x7a, 0x5e, 0xed, 0x50, 0x9e, 0xb4, 0x33, 0x29, 0x29, 0x32, 0x05, 0x51, 0xcf, 0xb0, 0xad, 0xe3,
-	0x9b, 0x4b, 0x36, 0x35, 0x18, 0x5b, 0x29, 0xfe, 0x12, 0x20, 0xf4, 0x86, 0x2b, 0x87, 0x45, 0xfd,
-	0x09, 0x95, 0xd2, 0x21, 0x6d, 0x37, 0x37, 0x58, 0x1c, 0x6c, 0x70, 0xae, 0x63, 0x54, 0xe1, 0xe0,
-	0x6f, 0x01, 0xea, 0x1c, 0xca, 0x49, 0xd3, 0xf3, 0x51, 0x93, 0xb6, 0xda, 0xd2, 0x96, 0x89, 0xbe,
-	0x1f, 0xde, 0xbe, 0xb8, 0x25, 0xe2, 0x76, 0x45, 0xf8, 0xe4, 0xd4, 0x9d, 0x99, 0x9f, 0x01, 0x5a,
-	0x33, 0x23, 0xad, 0xc5, 0x29, 0xfc, 0xac, 0xc1, 0x0e, 0xea, 0x06, 0x07, 0xf8, 0xbc, 0xb5, 0xcf,
-	0xce, 0xeb, 0xae, 0x81, 0xee, 0x45, 0xdd, 0x8b, 0xeb, 0x2b, 0xd5, 0x8b, 0x7f, 0x57, 0x81, 0x3a,
-	0x2f, 0x21, 0x85, 0x86, 0xd3, 0xab, 0x49, 0x1d, 0xdc, 0x3f, 0x6e, 0x00, 0x77, 0xac, 0xfb, 0xab,
-	0x8f, 0xf5, 0x72, 0x40, 0xb5, 0x8e, 0xcd, 0x06, 0x54, 0x37, 0xb4, 0x19, 0xd0, 0x79, 0xdf, 0xff,
-	0x06, 0x54, 0xaa, 0x07, 0x41, 0x7f, 0x78, 0x16, 0xa0, 0x87, 0xb1, 0x98, 0xb9, 0x84, 0x04, 0x04,
-	0x29, 0x92, 0x78, 0x75, 0xd2, 0x70, 0xed, 0xaf, 0x7b, 0xf3, 0xdd, 0x9e, 0x33, 0x8a, 0x94, 0x65,
-	0x09, 0x11, 0x79, 0x42, 0x13, 0xc8, 0xcc, 0xb0, 0x68, 0x59, 0x62, 0x92, 0xab, 0xd5, 0x97, 0xf3,
-	0x0b, 0xfb, 0x71, 0x7c, 0xc5, 0xe8, 0x77, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x9d, 0xfe,
-	0x1c, 0x89, 0x06, 0x00, 0x00,
-}
diff --git a/googleapis/type/calendarperiod/calendar_period.pb.go b/googleapis/type/calendarperiod/calendar_period.pb.go
index b2fe47ca95..0ee0bd15a4 100644
--- a/googleapis/type/calendarperiod/calendar_period.pb.go
+++ b/googleapis/type/calendarperiod/calendar_period.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/calendar_period.proto
 
-package calendarperiod // import "google.golang.org/genproto/googleapis/type/calendarperiod"
+package calendarperiod
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A `CalendarPeriod` represents the abstract concept of a time period that has
 // a canonical start. Grammatically, "the start of the current
@@ -56,6 +59,7 @@ var CalendarPeriod_name = map[int32]string{
 	6: "HALF",
 	7: "YEAR",
 }
+
 var CalendarPeriod_value = map[string]int32{
 	"CALENDAR_PERIOD_UNSPECIFIED": 0,
 	"DAY":                         1,
@@ -70,19 +74,18 @@ var CalendarPeriod_value = map[string]int32{
 func (x CalendarPeriod) String() string {
 	return proto.EnumName(CalendarPeriod_name, int32(x))
 }
+
 func (CalendarPeriod) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_calendar_period_167ed11c4514c3c9, []int{0}
+	return fileDescriptor_52aec33199a3da0e, []int{0}
 }
 
 func init() {
 	proto.RegisterEnum("google.type.CalendarPeriod", CalendarPeriod_name, CalendarPeriod_value)
 }
 
-func init() {
-	proto.RegisterFile("google/type/calendar_period.proto", fileDescriptor_calendar_period_167ed11c4514c3c9)
-}
+func init() { proto.RegisterFile("google/type/calendar_period.proto", fileDescriptor_52aec33199a3da0e) }
 
-var fileDescriptor_calendar_period_167ed11c4514c3c9 = []byte{
+var fileDescriptor_52aec33199a3da0e = []byte{
 	// 248 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0xb1, 0x4f, 0x83, 0x40,
 	0x14, 0x87, 0x6d, 0x69, 0x8b, 0x7d, 0x8d, 0x7a, 0x39, 0x47, 0x07, 0xe3, 0xea, 0x00, 0x83, 0xa3,
diff --git a/googleapis/type/color/color.pb.go b/googleapis/type/color/color.pb.go
index d2dac1c2c5..223d5188b6 100644
--- a/googleapis/type/color/color.pb.go
+++ b/googleapis/type/color/color.pb.go
@@ -1,12 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/color.proto
 
-package color // import "google.golang.org/genproto/googleapis/type/color"
+package color
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	wrappers "github.com/golang/protobuf/ptypes/wrappers"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a color in the RGBA color space. This representation is designed
 // for simplicity of conversion to/from color representations in various
@@ -166,16 +169,17 @@ func (m *Color) Reset()         { *m = Color{} }
 func (m *Color) String() string { return proto.CompactTextString(m) }
 func (*Color) ProtoMessage()    {}
 func (*Color) Descriptor() ([]byte, []int) {
-	return fileDescriptor_color_f98155ed8cbb2ba9, []int{0}
+	return fileDescriptor_8454902cb8a2d34f, []int{0}
 }
+
 func (m *Color) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Color.Unmarshal(m, b)
 }
 func (m *Color) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Color.Marshal(b, m, deterministic)
 }
-func (dst *Color) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Color.Merge(dst, src)
+func (m *Color) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Color.Merge(m, src)
 }
 func (m *Color) XXX_Size() int {
 	return xxx_messageInfo_Color.Size(m)
@@ -218,9 +222,9 @@ func init() {
 	proto.RegisterType((*Color)(nil), "google.type.Color")
 }
 
-func init() { proto.RegisterFile("google/type/color.proto", fileDescriptor_color_f98155ed8cbb2ba9) }
+func init() { proto.RegisterFile("google/type/color.proto", fileDescriptor_8454902cb8a2d34f) }
 
-var fileDescriptor_color_f98155ed8cbb2ba9 = []byte{
+var fileDescriptor_8454902cb8a2d34f = []byte{
 	// 228 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8f, 0x31, 0x4b, 0xc5, 0x30,
 	0x10, 0xc7, 0x49, 0xfb, 0xea, 0x70, 0x6f, 0x50, 0x82, 0x60, 0x50, 0x90, 0x87, 0xd3, 0x9b, 0x12,
diff --git a/googleapis/type/date/date.pb.go b/googleapis/type/date/date.pb.go
index 5e0a59dae5..2a6a27bc34 100644
--- a/googleapis/type/date/date.pb.go
+++ b/googleapis/type/date/date.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/date.proto
 
-package date // import "google.golang.org/genproto/googleapis/type/date"
+package date
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a whole or partial calendar date, e.g. a birthday. The time of day
 // and time zone are either specified elsewhere or are not significant. The date
@@ -48,16 +51,17 @@ func (m *Date) Reset()         { *m = Date{} }
 func (m *Date) String() string { return proto.CompactTextString(m) }
 func (*Date) ProtoMessage()    {}
 func (*Date) Descriptor() ([]byte, []int) {
-	return fileDescriptor_date_c55f47ce38fcfb50, []int{0}
+	return fileDescriptor_92c30699df886e3f, []int{0}
 }
+
 func (m *Date) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Date.Unmarshal(m, b)
 }
 func (m *Date) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Date.Marshal(b, m, deterministic)
 }
-func (dst *Date) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Date.Merge(dst, src)
+func (m *Date) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Date.Merge(m, src)
 }
 func (m *Date) XXX_Size() int {
 	return xxx_messageInfo_Date.Size(m)
@@ -93,9 +97,9 @@ func init() {
 	proto.RegisterType((*Date)(nil), "google.type.Date")
 }
 
-func init() { proto.RegisterFile("google/type/date.proto", fileDescriptor_date_c55f47ce38fcfb50) }
+func init() { proto.RegisterFile("google/type/date.proto", fileDescriptor_92c30699df886e3f) }
 
-var fileDescriptor_date_c55f47ce38fcfb50 = []byte{
+var fileDescriptor_92c30699df886e3f = []byte{
 	// 172 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca,
diff --git a/googleapis/type/dayofweek/dayofweek.pb.go b/googleapis/type/dayofweek/dayofweek.pb.go
index 6ce58d77fc..05cac227bc 100644
--- a/googleapis/type/dayofweek/dayofweek.pb.go
+++ b/googleapis/type/dayofweek/dayofweek.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/dayofweek.proto
 
-package dayofweek // import "google.golang.org/genproto/googleapis/type/dayofweek"
+package dayofweek
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a day of week.
 type DayOfWeek int32
@@ -50,6 +53,7 @@ var DayOfWeek_name = map[int32]string{
 	6: "SATURDAY",
 	7: "SUNDAY",
 }
+
 var DayOfWeek_value = map[string]int32{
 	"DAY_OF_WEEK_UNSPECIFIED": 0,
 	"MONDAY":                  1,
@@ -64,19 +68,18 @@ var DayOfWeek_value = map[string]int32{
 func (x DayOfWeek) String() string {
 	return proto.EnumName(DayOfWeek_name, int32(x))
 }
+
 func (DayOfWeek) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_dayofweek_b79b7fd6c2a3d9e8, []int{0}
+	return fileDescriptor_7d916f1831ff5ed9, []int{0}
 }
 
 func init() {
 	proto.RegisterEnum("google.type.DayOfWeek", DayOfWeek_name, DayOfWeek_value)
 }
 
-func init() {
-	proto.RegisterFile("google/type/dayofweek.proto", fileDescriptor_dayofweek_b79b7fd6c2a3d9e8)
-}
+func init() { proto.RegisterFile("google/type/dayofweek.proto", fileDescriptor_7d916f1831ff5ed9) }
 
-var fileDescriptor_dayofweek_b79b7fd6c2a3d9e8 = []byte{
+var fileDescriptor_7d916f1831ff5ed9 = []byte{
 	// 235 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x49, 0xac, 0xcc, 0x4f, 0x2b, 0x4f, 0x4d,
diff --git a/googleapis/type/expr/expr.pb.go b/googleapis/type/expr/expr.pb.go
index ed0566e5bd..27d46fe00a 100644
--- a/googleapis/type/expr/expr.pb.go
+++ b/googleapis/type/expr/expr.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/expr.proto
 
-package expr // import "google.golang.org/genproto/googleapis/type/expr"
+package expr
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents an expression text. Example:
 //
@@ -49,16 +52,17 @@ func (m *Expr) Reset()         { *m = Expr{} }
 func (m *Expr) String() string { return proto.CompactTextString(m) }
 func (*Expr) ProtoMessage()    {}
 func (*Expr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_expr_e508ac4329fc65cc, []int{0}
+	return fileDescriptor_d7920f1ae7a2722f, []int{0}
 }
+
 func (m *Expr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Expr.Unmarshal(m, b)
 }
 func (m *Expr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Expr.Marshal(b, m, deterministic)
 }
-func (dst *Expr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Expr.Merge(dst, src)
+func (m *Expr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Expr.Merge(m, src)
 }
 func (m *Expr) XXX_Size() int {
 	return xxx_messageInfo_Expr.Size(m)
@@ -101,9 +105,9 @@ func init() {
 	proto.RegisterType((*Expr)(nil), "google.type.Expr")
 }
 
-func init() { proto.RegisterFile("google/type/expr.proto", fileDescriptor_expr_e508ac4329fc65cc) }
+func init() { proto.RegisterFile("google/type/expr.proto", fileDescriptor_d7920f1ae7a2722f) }
 
-var fileDescriptor_expr_e508ac4329fc65cc = []byte{
+var fileDescriptor_d7920f1ae7a2722f = []byte{
 	// 195 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0xad, 0x28, 0x28, 0xd2, 0x2b, 0x28, 0xca,
diff --git a/googleapis/type/fraction/fraction.pb.go b/googleapis/type/fraction/fraction.pb.go
index 80560dec88..10bd7ff88d 100644
--- a/googleapis/type/fraction/fraction.pb.go
+++ b/googleapis/type/fraction/fraction.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/fraction.proto
 
-package fraction // import "google.golang.org/genproto/googleapis/type/fraction"
+package fraction
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a fraction in terms of a numerator divided by a denominator.
 type Fraction struct {
@@ -34,16 +37,17 @@ func (m *Fraction) Reset()         { *m = Fraction{} }
 func (m *Fraction) String() string { return proto.CompactTextString(m) }
 func (*Fraction) ProtoMessage()    {}
 func (*Fraction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fraction_4cfdd333c72eef64, []int{0}
+	return fileDescriptor_154821c252985829, []int{0}
 }
+
 func (m *Fraction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Fraction.Unmarshal(m, b)
 }
 func (m *Fraction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Fraction.Marshal(b, m, deterministic)
 }
-func (dst *Fraction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Fraction.Merge(dst, src)
+func (m *Fraction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Fraction.Merge(m, src)
 }
 func (m *Fraction) XXX_Size() int {
 	return xxx_messageInfo_Fraction.Size(m)
@@ -72,11 +76,9 @@ func init() {
 	proto.RegisterType((*Fraction)(nil), "google.type.Fraction")
 }
 
-func init() {
-	proto.RegisterFile("google/type/fraction.proto", fileDescriptor_fraction_4cfdd333c72eef64)
-}
+func init() { proto.RegisterFile("google/type/fraction.proto", fileDescriptor_154821c252985829) }
 
-var fileDescriptor_fraction_4cfdd333c72eef64 = []byte{
+var fileDescriptor_154821c252985829 = []byte{
 	// 168 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x2b, 0x4a, 0x4c, 0x2e, 0xc9, 0xcc, 0xcf,
diff --git a/googleapis/type/latlng/latlng.pb.go b/googleapis/type/latlng/latlng.pb.go
index 2ba98d6d80..2fc2f0a87f 100644
--- a/googleapis/type/latlng/latlng.pb.go
+++ b/googleapis/type/latlng/latlng.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/latlng.proto
 
-package latlng // import "google.golang.org/genproto/googleapis/type/latlng"
+package latlng
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // An object representing a latitude/longitude pair. This is expressed as a pair
 // of doubles representing degrees latitude and degrees longitude. Unless
@@ -37,16 +40,17 @@ func (m *LatLng) Reset()         { *m = LatLng{} }
 func (m *LatLng) String() string { return proto.CompactTextString(m) }
 func (*LatLng) ProtoMessage()    {}
 func (*LatLng) Descriptor() ([]byte, []int) {
-	return fileDescriptor_latlng_9542c128e5dfd41d, []int{0}
+	return fileDescriptor_a087c9a103c281a9, []int{0}
 }
+
 func (m *LatLng) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LatLng.Unmarshal(m, b)
 }
 func (m *LatLng) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LatLng.Marshal(b, m, deterministic)
 }
-func (dst *LatLng) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LatLng.Merge(dst, src)
+func (m *LatLng) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLng.Merge(m, src)
 }
 func (m *LatLng) XXX_Size() int {
 	return xxx_messageInfo_LatLng.Size(m)
@@ -75,9 +79,9 @@ func init() {
 	proto.RegisterType((*LatLng)(nil), "google.type.LatLng")
 }
 
-func init() { proto.RegisterFile("google/type/latlng.proto", fileDescriptor_latlng_9542c128e5dfd41d) }
+func init() { proto.RegisterFile("google/type/latlng.proto", fileDescriptor_a087c9a103c281a9) }
 
-var fileDescriptor_latlng_9542c128e5dfd41d = []byte{
+var fileDescriptor_a087c9a103c281a9 = []byte{
 	// 168 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0xcf, 0x49, 0x2c, 0xc9, 0xc9, 0x4b, 0xd7, 0x2b,
diff --git a/googleapis/type/money/money.pb.go b/googleapis/type/money/money.pb.go
index bb6f7bdde6..81fdfcfef6 100644
--- a/googleapis/type/money/money.pb.go
+++ b/googleapis/type/money/money.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/money.proto
 
-package money // import "google.golang.org/genproto/googleapis/type/money"
+package money
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents an amount of money with its currency type.
 type Money struct {
@@ -41,16 +44,17 @@ func (m *Money) Reset()         { *m = Money{} }
 func (m *Money) String() string { return proto.CompactTextString(m) }
 func (*Money) ProtoMessage()    {}
 func (*Money) Descriptor() ([]byte, []int) {
-	return fileDescriptor_money_a475a5747334583b, []int{0}
+	return fileDescriptor_f093d3d05ab4bbee, []int{0}
 }
+
 func (m *Money) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Money.Unmarshal(m, b)
 }
 func (m *Money) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Money.Marshal(b, m, deterministic)
 }
-func (dst *Money) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Money.Merge(dst, src)
+func (m *Money) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Money.Merge(m, src)
 }
 func (m *Money) XXX_Size() int {
 	return xxx_messageInfo_Money.Size(m)
@@ -86,9 +90,9 @@ func init() {
 	proto.RegisterType((*Money)(nil), "google.type.Money")
 }
 
-func init() { proto.RegisterFile("google/type/money.proto", fileDescriptor_money_a475a5747334583b) }
+func init() { proto.RegisterFile("google/type/money.proto", fileDescriptor_f093d3d05ab4bbee) }
 
-var fileDescriptor_money_a475a5747334583b = []byte{
+var fileDescriptor_f093d3d05ab4bbee = []byte{
 	// 193 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0xcf, 0xcd, 0xcf, 0x4b, 0xad, 0xd4, 0x2b, 0x28,
diff --git a/googleapis/type/postaladdress/postal_address.pb.go b/googleapis/type/postaladdress/postal_address.pb.go
index e009129a80..211e07a925 100644
--- a/googleapis/type/postaladdress/postal_address.pb.go
+++ b/googleapis/type/postaladdress/postal_address.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/postal_address.proto
 
-package postaladdress // import "google.golang.org/genproto/googleapis/type/postaladdress"
+package postaladdress
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a postal address, e.g. for postal delivery or payments addresses.
 // Given a postal address, a postal service can deliver items to a premise, P.O.
@@ -123,16 +126,17 @@ func (m *PostalAddress) Reset()         { *m = PostalAddress{} }
 func (m *PostalAddress) String() string { return proto.CompactTextString(m) }
 func (*PostalAddress) ProtoMessage()    {}
 func (*PostalAddress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_postal_address_f1ce9eb95f7d1aa5, []int{0}
+	return fileDescriptor_17c0e9bca935790c, []int{0}
 }
+
 func (m *PostalAddress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PostalAddress.Unmarshal(m, b)
 }
 func (m *PostalAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PostalAddress.Marshal(b, m, deterministic)
 }
-func (dst *PostalAddress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PostalAddress.Merge(dst, src)
+func (m *PostalAddress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PostalAddress.Merge(m, src)
 }
 func (m *PostalAddress) XXX_Size() int {
 	return xxx_messageInfo_PostalAddress.Size(m)
@@ -224,11 +228,9 @@ func init() {
 	proto.RegisterType((*PostalAddress)(nil), "google.type.PostalAddress")
 }
 
-func init() {
-	proto.RegisterFile("google/type/postal_address.proto", fileDescriptor_postal_address_f1ce9eb95f7d1aa5)
-}
+func init() { proto.RegisterFile("google/type/postal_address.proto", fileDescriptor_17c0e9bca935790c) }
 
-var fileDescriptor_postal_address_f1ce9eb95f7d1aa5 = []byte{
+var fileDescriptor_17c0e9bca935790c = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0x31, 0x6f, 0xea, 0x30,
 	0x10, 0xc7, 0x15, 0xf2, 0xe0, 0xc1, 0x05, 0xf4, 0x24, 0xbf, 0x25, 0xea, 0x50, 0x52, 0xba, 0x30,
diff --git a/googleapis/type/quaternion/quaternion.pb.go b/googleapis/type/quaternion/quaternion.pb.go
index b2289f42e3..af40fff114 100644
--- a/googleapis/type/quaternion/quaternion.pb.go
+++ b/googleapis/type/quaternion/quaternion.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/quaternion.proto
 
-package quaternion // import "google.golang.org/genproto/googleapis/type/quaternion"
+package quaternion
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A quaternion is defined as the quotient of two directed lines in a
 // three-dimensional space or equivalently as the quotient of two Euclidean
@@ -93,16 +96,17 @@ func (m *Quaternion) Reset()         { *m = Quaternion{} }
 func (m *Quaternion) String() string { return proto.CompactTextString(m) }
 func (*Quaternion) ProtoMessage()    {}
 func (*Quaternion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_quaternion_a8bd5c2f09ef2c54, []int{0}
+	return fileDescriptor_6b847e1bdd83ff5e, []int{0}
 }
+
 func (m *Quaternion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Quaternion.Unmarshal(m, b)
 }
 func (m *Quaternion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Quaternion.Marshal(b, m, deterministic)
 }
-func (dst *Quaternion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Quaternion.Merge(dst, src)
+func (m *Quaternion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Quaternion.Merge(m, src)
 }
 func (m *Quaternion) XXX_Size() int {
 	return xxx_messageInfo_Quaternion.Size(m)
@@ -145,11 +149,9 @@ func init() {
 	proto.RegisterType((*Quaternion)(nil), "google.type.Quaternion")
 }
 
-func init() {
-	proto.RegisterFile("google/type/quaternion.proto", fileDescriptor_quaternion_a8bd5c2f09ef2c54)
-}
+func init() { proto.RegisterFile("google/type/quaternion.proto", fileDescriptor_6b847e1bdd83ff5e) }
 
-var fileDescriptor_quaternion_a8bd5c2f09ef2c54 = []byte{
+var fileDescriptor_6b847e1bdd83ff5e = []byte{
 	// 170 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x2f, 0x2c, 0x4d, 0x2c, 0x49, 0x2d, 0xca, 0xcb,
diff --git a/googleapis/type/timeofday/timeofday.pb.go b/googleapis/type/timeofday/timeofday.pb.go
index b11577738b..4e4e72378c 100644
--- a/googleapis/type/timeofday/timeofday.pb.go
+++ b/googleapis/type/timeofday/timeofday.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/timeofday.proto
 
-package timeofday // import "google.golang.org/genproto/googleapis/type/timeofday"
+package timeofday
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Represents a time of day. The date and time zone are either not significant
 // or are specified elsewhere. An API may choose to allow leap seconds. Related
@@ -41,16 +44,17 @@ func (m *TimeOfDay) Reset()         { *m = TimeOfDay{} }
 func (m *TimeOfDay) String() string { return proto.CompactTextString(m) }
 func (*TimeOfDay) ProtoMessage()    {}
 func (*TimeOfDay) Descriptor() ([]byte, []int) {
-	return fileDescriptor_timeofday_a44a6b433ddd93bc, []int{0}
+	return fileDescriptor_6c354ab94588cebb, []int{0}
 }
+
 func (m *TimeOfDay) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimeOfDay.Unmarshal(m, b)
 }
 func (m *TimeOfDay) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TimeOfDay.Marshal(b, m, deterministic)
 }
-func (dst *TimeOfDay) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TimeOfDay.Merge(dst, src)
+func (m *TimeOfDay) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeOfDay.Merge(m, src)
 }
 func (m *TimeOfDay) XXX_Size() int {
 	return xxx_messageInfo_TimeOfDay.Size(m)
@@ -93,11 +97,9 @@ func init() {
 	proto.RegisterType((*TimeOfDay)(nil), "google.type.TimeOfDay")
 }
 
-func init() {
-	proto.RegisterFile("google/type/timeofday.proto", fileDescriptor_timeofday_a44a6b433ddd93bc)
-}
+func init() { proto.RegisterFile("google/type/timeofday.proto", fileDescriptor_6c354ab94588cebb) }
 
-var fileDescriptor_timeofday_a44a6b433ddd93bc = []byte{
+var fileDescriptor_6c354ab94588cebb = []byte{
 	// 201 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x2f, 0xc9, 0xcc, 0x4d, 0xcd, 0x4f, 0x4b, 0x49,
diff --git a/googleapis/watcher/v1/watch.pb.go b/googleapis/watcher/v1/watch.pb.go
index cfba658930..9f1ce97573 100644
--- a/googleapis/watcher/v1/watch.pb.go
+++ b/googleapis/watcher/v1/watch.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/watcher/v1/watch.proto
 
-package watcher // import "google.golang.org/genproto/googleapis/watcher/v1"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+package watcher
 
 import (
-	context "golang.org/x/net/context"
+	context "context"
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	_ "github.com/golang/protobuf/ptypes/empty"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // A reported value can be in one of the following states:
 type Change_State int32
@@ -50,6 +50,7 @@ var Change_State_name = map[int32]string{
 	2: "INITIAL_STATE_SKIPPED",
 	3: "ERROR",
 }
+
 var Change_State_value = map[string]int32{
 	"EXISTS":                0,
 	"DOES_NOT_EXIST":        1,
@@ -60,8 +61,9 @@ var Change_State_value = map[string]int32{
 func (x Change_State) String() string {
 	return proto.EnumName(Change_State_name, int32(x))
 }
+
 func (Change_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_watch_fea2f00fe0718109, []int{2, 0}
+	return fileDescriptor_fbde036e07af626b, []int{2, 0}
 }
 
 // The message used by the client to register interest in an entity.
@@ -130,16 +132,17 @@ func (m *Request) Reset()         { *m = Request{} }
 func (m *Request) String() string { return proto.CompactTextString(m) }
 func (*Request) ProtoMessage()    {}
 func (*Request) Descriptor() ([]byte, []int) {
-	return fileDescriptor_watch_fea2f00fe0718109, []int{0}
+	return fileDescriptor_fbde036e07af626b, []int{0}
 }
+
 func (m *Request) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Request.Unmarshal(m, b)
 }
 func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Request.Marshal(b, m, deterministic)
 }
-func (dst *Request) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Request.Merge(dst, src)
+func (m *Request) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Request.Merge(m, src)
 }
 func (m *Request) XXX_Size() int {
 	return xxx_messageInfo_Request.Size(m)
@@ -177,16 +180,17 @@ func (m *ChangeBatch) Reset()         { *m = ChangeBatch{} }
 func (m *ChangeBatch) String() string { return proto.CompactTextString(m) }
 func (*ChangeBatch) ProtoMessage()    {}
 func (*ChangeBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_watch_fea2f00fe0718109, []int{1}
+	return fileDescriptor_fbde036e07af626b, []int{1}
 }
+
 func (m *ChangeBatch) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChangeBatch.Unmarshal(m, b)
 }
 func (m *ChangeBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChangeBatch.Marshal(b, m, deterministic)
 }
-func (dst *ChangeBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChangeBatch.Merge(dst, src)
+func (m *ChangeBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeBatch.Merge(m, src)
 }
 func (m *ChangeBatch) XXX_Size() int {
 	return xxx_messageInfo_ChangeBatch.Size(m)
@@ -234,16 +238,17 @@ func (m *Change) Reset()         { *m = Change{} }
 func (m *Change) String() string { return proto.CompactTextString(m) }
 func (*Change) ProtoMessage()    {}
 func (*Change) Descriptor() ([]byte, []int) {
-	return fileDescriptor_watch_fea2f00fe0718109, []int{2}
+	return fileDescriptor_fbde036e07af626b, []int{2}
 }
+
 func (m *Change) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Change.Unmarshal(m, b)
 }
 func (m *Change) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Change.Marshal(b, m, deterministic)
 }
-func (dst *Change) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Change.Merge(dst, src)
+func (m *Change) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Change.Merge(m, src)
 }
 func (m *Change) XXX_Size() int {
 	return xxx_messageInfo_Change.Size(m)
@@ -290,10 +295,45 @@ func (m *Change) GetContinued() bool {
 }
 
 func init() {
+	proto.RegisterEnum("google.watcher.v1.Change_State", Change_State_name, Change_State_value)
 	proto.RegisterType((*Request)(nil), "google.watcher.v1.Request")
 	proto.RegisterType((*ChangeBatch)(nil), "google.watcher.v1.ChangeBatch")
 	proto.RegisterType((*Change)(nil), "google.watcher.v1.Change")
-	proto.RegisterEnum("google.watcher.v1.Change_State", Change_State_name, Change_State_value)
+}
+
+func init() { proto.RegisterFile("google/watcher/v1/watch.proto", fileDescriptor_fbde036e07af626b) }
+
+var fileDescriptor_fbde036e07af626b = []byte{
+	// 449 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xdd, 0x6e, 0xd3, 0x30,
+	0x14, 0xc6, 0xdd, 0x92, 0xd2, 0xd3, 0x31, 0x75, 0x16, 0x43, 0x69, 0x19, 0x10, 0x85, 0x9b, 0x5c,
+	0x25, 0xac, 0x13, 0x12, 0x12, 0x57, 0x2d, 0x0b, 0x52, 0x04, 0x5b, 0x2b, 0x27, 0x12, 0x13, 0x37,
+	0x91, 0x97, 0x99, 0xac, 0xa2, 0xb1, 0x4b, 0xe2, 0x0e, 0xed, 0x96, 0x57, 0x40, 0x3c, 0x19, 0xaf,
+	0xc0, 0x83, 0xa0, 0xda, 0x0e, 0x20, 0xb2, 0xde, 0x9d, 0xf3, 0xfd, 0xd8, 0xe7, 0x3b, 0x36, 0x3c,
+	0x29, 0x84, 0x28, 0x96, 0x2c, 0xfc, 0x4a, 0x65, 0x7e, 0xcd, 0xaa, 0xf0, 0xe6, 0x58, 0x97, 0xc1,
+	0xaa, 0x12, 0x52, 0xe0, 0x03, 0x4d, 0x07, 0x86, 0x0e, 0x6e, 0x8e, 0x47, 0x47, 0xc6, 0x41, 0x57,
+	0x8b, 0x90, 0x72, 0x2e, 0x24, 0x95, 0x0b, 0xc1, 0x6b, 0x6d, 0x18, 0x0d, 0x0d, 0xab, 0xba, 0xcb,
+	0xf5, 0xa7, 0x90, 0xf2, 0x5b, 0x43, 0x3d, 0xfe, 0x9f, 0x62, 0xe5, 0x4a, 0x1a, 0xd2, 0x7b, 0x0b,
+	0x5d, 0xc2, 0xbe, 0xac, 0x59, 0x2d, 0xf1, 0x23, 0xb0, 0x25, 0xad, 0x0a, 0x26, 0x1d, 0xe4, 0x22,
+	0xbf, 0x47, 0x4c, 0x87, 0x9f, 0xc3, 0x83, 0x8a, 0xd5, 0xeb, 0x92, 0x65, 0x25, 0xad, 0x3e, 0xb3,
+	0xca, 0xe9, 0xb8, 0xc8, 0xdf, 0x23, 0x7b, 0x1a, 0x3c, 0x53, 0x98, 0x37, 0x85, 0xfe, 0x9b, 0x6b,
+	0xca, 0x0b, 0x36, 0xdd, 0x4c, 0x8c, 0x4f, 0xa0, 0x9b, 0xab, 0xb6, 0x76, 0x90, 0xbb, 0xe3, 0xf7,
+	0xc7, 0xc3, 0xa0, 0x95, 0x28, 0xd0, 0x06, 0xd2, 0x28, 0xbd, 0x1f, 0x1d, 0xb0, 0x35, 0x86, 0x1d,
+	0xe8, 0xb2, 0x25, 0x2b, 0x19, 0x6f, 0x86, 0x69, 0x5a, 0xfc, 0x12, 0xac, 0x5a, 0x52, 0xc9, 0xd4,
+	0x14, 0xfb, 0xe3, 0x67, 0x5b, 0xcf, 0x0d, 0x92, 0x8d, 0x8c, 0x68, 0x35, 0xf6, 0x61, 0xf7, 0x8a,
+	0x4a, 0xea, 0xd8, 0x2e, 0xf2, 0xfb, 0xe3, 0x87, 0x8d, 0xab, 0xd9, 0x49, 0x30, 0xe1, 0xb7, 0x44,
+	0x29, 0xda, 0x71, 0x77, 0xdb, 0x71, 0xf1, 0x11, 0xf4, 0x72, 0xc1, 0xe5, 0x82, 0xaf, 0xd9, 0x95,
+	0x63, 0xb9, 0xc8, 0xbf, 0x4f, 0xfe, 0x02, 0xde, 0x19, 0x58, 0xea, 0x72, 0x0c, 0x60, 0x47, 0x17,
+	0x71, 0x92, 0x26, 0x83, 0x7b, 0x18, 0xc3, 0xfe, 0xe9, 0x2c, 0x4a, 0xb2, 0xf3, 0x59, 0x9a, 0x29,
+	0x70, 0x80, 0xf0, 0x10, 0x0e, 0xe3, 0xf3, 0x38, 0x8d, 0x27, 0xef, 0xb3, 0x24, 0x9d, 0xa4, 0x51,
+	0x96, 0xbc, 0x8b, 0xe7, 0xf3, 0xe8, 0x74, 0xd0, 0xc1, 0x3d, 0xb0, 0x22, 0x42, 0x66, 0x64, 0xb0,
+	0x33, 0xce, 0xa1, 0xfb, 0x41, 0xa7, 0xc3, 0x17, 0x60, 0xa9, 0x12, 0x8f, 0xee, 0xc8, 0x6d, 0x1e,
+	0x72, 0xf4, 0x74, 0xeb, 0x4e, 0xd4, 0xe3, 0x78, 0x07, 0xdf, 0x7e, 0xfe, 0xfa, 0xde, 0xe9, 0xe3,
+	0xde, 0x9f, 0x5f, 0xf7, 0x02, 0x4d, 0x33, 0x38, 0xcc, 0x45, 0xd9, 0x76, 0x4e, 0x41, 0x5d, 0x38,
+	0xdf, 0x2c, 0x6a, 0x8e, 0x3e, 0xbe, 0x32, 0x82, 0x42, 0x2c, 0x29, 0x2f, 0x02, 0x51, 0x15, 0x61,
+	0xc1, 0xb8, 0x5a, 0x63, 0xa8, 0x29, 0xba, 0x5a, 0xd4, 0xff, 0x7c, 0xeb, 0xd7, 0xa6, 0xbc, 0xb4,
+	0x95, 0xe8, 0xe4, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0x0a, 0xba, 0x6c, 0xfa, 0x02, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -396,40 +436,3 @@ var _Watcher_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "google/watcher/v1/watch.proto",
 }
-
-func init() {
-	proto.RegisterFile("google/watcher/v1/watch.proto", fileDescriptor_watch_fea2f00fe0718109)
-}
-
-var fileDescriptor_watch_fea2f00fe0718109 = []byte{
-	// 449 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xdd, 0x6e, 0xd3, 0x30,
-	0x14, 0xc6, 0xdd, 0x92, 0xd2, 0xd3, 0x31, 0x75, 0x16, 0x43, 0x69, 0x19, 0x10, 0x85, 0x9b, 0x5c,
-	0x25, 0xac, 0x13, 0x12, 0x12, 0x57, 0x2d, 0x0b, 0x52, 0x04, 0x5b, 0x2b, 0x27, 0x12, 0x13, 0x37,
-	0x91, 0x97, 0x99, 0xac, 0xa2, 0xb1, 0x4b, 0xe2, 0x0e, 0xed, 0x96, 0x57, 0x40, 0x3c, 0x19, 0xaf,
-	0xc0, 0x83, 0xa0, 0xda, 0x0e, 0x20, 0xb2, 0xde, 0x9d, 0xf3, 0xfd, 0xd8, 0xe7, 0x3b, 0x36, 0x3c,
-	0x29, 0x84, 0x28, 0x96, 0x2c, 0xfc, 0x4a, 0x65, 0x7e, 0xcd, 0xaa, 0xf0, 0xe6, 0x58, 0x97, 0xc1,
-	0xaa, 0x12, 0x52, 0xe0, 0x03, 0x4d, 0x07, 0x86, 0x0e, 0x6e, 0x8e, 0x47, 0x47, 0xc6, 0x41, 0x57,
-	0x8b, 0x90, 0x72, 0x2e, 0x24, 0x95, 0x0b, 0xc1, 0x6b, 0x6d, 0x18, 0x0d, 0x0d, 0xab, 0xba, 0xcb,
-	0xf5, 0xa7, 0x90, 0xf2, 0x5b, 0x43, 0x3d, 0xfe, 0x9f, 0x62, 0xe5, 0x4a, 0x1a, 0xd2, 0x7b, 0x0b,
-	0x5d, 0xc2, 0xbe, 0xac, 0x59, 0x2d, 0xf1, 0x23, 0xb0, 0x25, 0xad, 0x0a, 0x26, 0x1d, 0xe4, 0x22,
-	0xbf, 0x47, 0x4c, 0x87, 0x9f, 0xc3, 0x83, 0x8a, 0xd5, 0xeb, 0x92, 0x65, 0x25, 0xad, 0x3e, 0xb3,
-	0xca, 0xe9, 0xb8, 0xc8, 0xdf, 0x23, 0x7b, 0x1a, 0x3c, 0x53, 0x98, 0x37, 0x85, 0xfe, 0x9b, 0x6b,
-	0xca, 0x0b, 0x36, 0xdd, 0x4c, 0x8c, 0x4f, 0xa0, 0x9b, 0xab, 0xb6, 0x76, 0x90, 0xbb, 0xe3, 0xf7,
-	0xc7, 0xc3, 0xa0, 0x95, 0x28, 0xd0, 0x06, 0xd2, 0x28, 0xbd, 0x1f, 0x1d, 0xb0, 0x35, 0x86, 0x1d,
-	0xe8, 0xb2, 0x25, 0x2b, 0x19, 0x6f, 0x86, 0x69, 0x5a, 0xfc, 0x12, 0xac, 0x5a, 0x52, 0xc9, 0xd4,
-	0x14, 0xfb, 0xe3, 0x67, 0x5b, 0xcf, 0x0d, 0x92, 0x8d, 0x8c, 0x68, 0x35, 0xf6, 0x61, 0xf7, 0x8a,
-	0x4a, 0xea, 0xd8, 0x2e, 0xf2, 0xfb, 0xe3, 0x87, 0x8d, 0xab, 0xd9, 0x49, 0x30, 0xe1, 0xb7, 0x44,
-	0x29, 0xda, 0x71, 0x77, 0xdb, 0x71, 0xf1, 0x11, 0xf4, 0x72, 0xc1, 0xe5, 0x82, 0xaf, 0xd9, 0x95,
-	0x63, 0xb9, 0xc8, 0xbf, 0x4f, 0xfe, 0x02, 0xde, 0x19, 0x58, 0xea, 0x72, 0x0c, 0x60, 0x47, 0x17,
-	0x71, 0x92, 0x26, 0x83, 0x7b, 0x18, 0xc3, 0xfe, 0xe9, 0x2c, 0x4a, 0xb2, 0xf3, 0x59, 0x9a, 0x29,
-	0x70, 0x80, 0xf0, 0x10, 0x0e, 0xe3, 0xf3, 0x38, 0x8d, 0x27, 0xef, 0xb3, 0x24, 0x9d, 0xa4, 0x51,
-	0x96, 0xbc, 0x8b, 0xe7, 0xf3, 0xe8, 0x74, 0xd0, 0xc1, 0x3d, 0xb0, 0x22, 0x42, 0x66, 0x64, 0xb0,
-	0x33, 0xce, 0xa1, 0xfb, 0x41, 0xa7, 0xc3, 0x17, 0x60, 0xa9, 0x12, 0x8f, 0xee, 0xc8, 0x6d, 0x1e,
-	0x72, 0xf4, 0x74, 0xeb, 0x4e, 0xd4, 0xe3, 0x78, 0x07, 0xdf, 0x7e, 0xfe, 0xfa, 0xde, 0xe9, 0xe3,
-	0xde, 0x9f, 0x5f, 0xf7, 0x02, 0x4d, 0x33, 0x38, 0xcc, 0x45, 0xd9, 0x76, 0x4e, 0x41, 0x5d, 0x38,
-	0xdf, 0x2c, 0x6a, 0x8e, 0x3e, 0xbe, 0x32, 0x82, 0x42, 0x2c, 0x29, 0x2f, 0x02, 0x51, 0x15, 0x61,
-	0xc1, 0xb8, 0x5a, 0x63, 0xa8, 0x29, 0xba, 0x5a, 0xd4, 0xff, 0x7c, 0xeb, 0xd7, 0xa6, 0xbc, 0xb4,
-	0x95, 0xe8, 0xe4, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0x0a, 0xba, 0x6c, 0xfa, 0x02, 0x00,
-	0x00,
-}
diff --git a/protobuf/api/api.pb.go b/protobuf/api/api.pb.go
index 34a3f30bd2..c82cc0ecd8 100644
--- a/protobuf/api/api.pb.go
+++ b/protobuf/api/api.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/api.proto
 
-package api // import "google.golang.org/genproto/protobuf/api"
+package api
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import ptype "google.golang.org/genproto/protobuf/ptype"
-import source_context "google.golang.org/genproto/protobuf/source_context"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	ptype "google.golang.org/genproto/protobuf/ptype"
+	source_context "google.golang.org/genproto/protobuf/source_context"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // Api is a light-weight descriptor for an API Interface.
 //
@@ -75,16 +78,17 @@ func (m *Api) Reset()         { *m = Api{} }
 func (m *Api) String() string { return proto.CompactTextString(m) }
 func (*Api) ProtoMessage()    {}
 func (*Api) Descriptor() ([]byte, []int) {
-	return fileDescriptor_api_4ac70dbc2fa3744b, []int{0}
+	return fileDescriptor_a2ec32096296c143, []int{0}
 }
+
 func (m *Api) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Api.Unmarshal(m, b)
 }
 func (m *Api) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Api.Marshal(b, m, deterministic)
 }
-func (dst *Api) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Api.Merge(dst, src)
+func (m *Api) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Api.Merge(m, src)
 }
 func (m *Api) XXX_Size() int {
 	return xxx_messageInfo_Api.Size(m)
@@ -169,16 +173,17 @@ func (m *Method) Reset()         { *m = Method{} }
 func (m *Method) String() string { return proto.CompactTextString(m) }
 func (*Method) ProtoMessage()    {}
 func (*Method) Descriptor() ([]byte, []int) {
-	return fileDescriptor_api_4ac70dbc2fa3744b, []int{1}
+	return fileDescriptor_a2ec32096296c143, []int{1}
 }
+
 func (m *Method) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Method.Unmarshal(m, b)
 }
 func (m *Method) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Method.Marshal(b, m, deterministic)
 }
-func (dst *Method) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Method.Merge(dst, src)
+func (m *Method) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Method.Merge(m, src)
 }
 func (m *Method) XXX_Size() int {
 	return xxx_messageInfo_Method.Size(m)
@@ -331,16 +336,17 @@ func (m *Mixin) Reset()         { *m = Mixin{} }
 func (m *Mixin) String() string { return proto.CompactTextString(m) }
 func (*Mixin) ProtoMessage()    {}
 func (*Mixin) Descriptor() ([]byte, []int) {
-	return fileDescriptor_api_4ac70dbc2fa3744b, []int{2}
+	return fileDescriptor_a2ec32096296c143, []int{2}
 }
+
 func (m *Mixin) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Mixin.Unmarshal(m, b)
 }
 func (m *Mixin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Mixin.Marshal(b, m, deterministic)
 }
-func (dst *Mixin) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Mixin.Merge(dst, src)
+func (m *Mixin) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mixin.Merge(m, src)
 }
 func (m *Mixin) XXX_Size() int {
 	return xxx_messageInfo_Mixin.Size(m)
@@ -371,9 +377,9 @@ func init() {
 	proto.RegisterType((*Mixin)(nil), "google.protobuf.Mixin")
 }
 
-func init() { proto.RegisterFile("google/protobuf/api.proto", fileDescriptor_api_4ac70dbc2fa3744b) }
+func init() { proto.RegisterFile("google/protobuf/api.proto", fileDescriptor_a2ec32096296c143) }
 
-var fileDescriptor_api_4ac70dbc2fa3744b = []byte{
+var fileDescriptor_a2ec32096296c143 = []byte{
 	// 432 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcf, 0x8e, 0xd3, 0x30,
 	0x10, 0xc6, 0x95, 0xa4, 0x4d, 0x17, 0xaf, 0xe8, 0x82, 0x91, 0xc0, 0xf4, 0xb0, 0x8a, 0x56, 0x1c,
diff --git a/protobuf/field_mask/field_mask.pb.go b/protobuf/field_mask/field_mask.pb.go
index 60241b8f40..a0889f0c7a 100644
--- a/protobuf/field_mask/field_mask.pb.go
+++ b/protobuf/field_mask/field_mask.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/field_mask.proto
 
-package field_mask // import "google.golang.org/genproto/protobuf/field_mask"
+package field_mask
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `FieldMask` represents a set of symbolic field paths, for example:
 //
@@ -229,16 +232,17 @@ func (m *FieldMask) Reset()         { *m = FieldMask{} }
 func (m *FieldMask) String() string { return proto.CompactTextString(m) }
 func (*FieldMask) ProtoMessage()    {}
 func (*FieldMask) Descriptor() ([]byte, []int) {
-	return fileDescriptor_field_mask_8b509cd473f0dfb7, []int{0}
+	return fileDescriptor_5158202634f0da48, []int{0}
 }
+
 func (m *FieldMask) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FieldMask.Unmarshal(m, b)
 }
 func (m *FieldMask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FieldMask.Marshal(b, m, deterministic)
 }
-func (dst *FieldMask) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FieldMask.Merge(dst, src)
+func (m *FieldMask) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldMask.Merge(m, src)
 }
 func (m *FieldMask) XXX_Size() int {
 	return xxx_messageInfo_FieldMask.Size(m)
@@ -260,11 +264,9 @@ func init() {
 	proto.RegisterType((*FieldMask)(nil), "google.protobuf.FieldMask")
 }
 
-func init() {
-	proto.RegisterFile("google/protobuf/field_mask.proto", fileDescriptor_field_mask_8b509cd473f0dfb7)
-}
+func init() { proto.RegisterFile("google/protobuf/field_mask.proto", fileDescriptor_5158202634f0da48) }
 
-var fileDescriptor_field_mask_8b509cd473f0dfb7 = []byte{
+var fileDescriptor_5158202634f0da48 = []byte{
 	// 175 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcb, 0x4c, 0xcd,
diff --git a/protobuf/ptype/type.pb.go b/protobuf/ptype/type.pb.go
index c78f1aa0be..03ab0f6c96 100644
--- a/protobuf/ptype/type.pb.go
+++ b/protobuf/ptype/type.pb.go
@@ -1,13 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/type.proto
 
-package ptype // import "google.golang.org/genproto/protobuf/ptype"
+package ptype
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import source_context "google.golang.org/genproto/protobuf/source_context"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	any "github.com/golang/protobuf/ptypes/any"
+	source_context "google.golang.org/genproto/protobuf/source_context"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +21,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // The syntax in which a protocol buffer element is defined.
 type Syntax int32
@@ -34,6 +37,7 @@ var Syntax_name = map[int32]string{
 	0: "SYNTAX_PROTO2",
 	1: "SYNTAX_PROTO3",
 }
+
 var Syntax_value = map[string]int32{
 	"SYNTAX_PROTO2": 0,
 	"SYNTAX_PROTO3": 1,
@@ -42,8 +46,9 @@ var Syntax_value = map[string]int32{
 func (x Syntax) String() string {
 	return proto.EnumName(Syntax_name, int32(x))
 }
+
 func (Syntax) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{0}
+	return fileDescriptor_dd271cc1e348c538, []int{0}
 }
 
 // Basic field types.
@@ -111,6 +116,7 @@ var Field_Kind_name = map[int32]string{
 	17: "TYPE_SINT32",
 	18: "TYPE_SINT64",
 }
+
 var Field_Kind_value = map[string]int32{
 	"TYPE_UNKNOWN":  0,
 	"TYPE_DOUBLE":   1,
@@ -136,8 +142,9 @@ var Field_Kind_value = map[string]int32{
 func (x Field_Kind) String() string {
 	return proto.EnumName(Field_Kind_name, int32(x))
 }
+
 func (Field_Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{1, 0}
+	return fileDescriptor_dd271cc1e348c538, []int{1, 0}
 }
 
 // Whether a field is optional, required, or repeated.
@@ -160,6 +167,7 @@ var Field_Cardinality_name = map[int32]string{
 	2: "CARDINALITY_REQUIRED",
 	3: "CARDINALITY_REPEATED",
 }
+
 var Field_Cardinality_value = map[string]int32{
 	"CARDINALITY_UNKNOWN":  0,
 	"CARDINALITY_OPTIONAL": 1,
@@ -170,8 +178,9 @@ var Field_Cardinality_value = map[string]int32{
 func (x Field_Cardinality) String() string {
 	return proto.EnumName(Field_Cardinality_name, int32(x))
 }
+
 func (Field_Cardinality) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{1, 1}
+	return fileDescriptor_dd271cc1e348c538, []int{1, 1}
 }
 
 // A protocol buffer message type.
@@ -197,16 +206,17 @@ func (m *Type) Reset()         { *m = Type{} }
 func (m *Type) String() string { return proto.CompactTextString(m) }
 func (*Type) ProtoMessage()    {}
 func (*Type) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{0}
+	return fileDescriptor_dd271cc1e348c538, []int{0}
 }
+
 func (m *Type) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Type.Unmarshal(m, b)
 }
 func (m *Type) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Type.Marshal(b, m, deterministic)
 }
-func (dst *Type) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Type.Merge(dst, src)
+func (m *Type) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type.Merge(m, src)
 }
 func (m *Type) XXX_Size() int {
 	return xxx_messageInfo_Type.Size(m)
@@ -292,16 +302,17 @@ func (m *Field) Reset()         { *m = Field{} }
 func (m *Field) String() string { return proto.CompactTextString(m) }
 func (*Field) ProtoMessage()    {}
 func (*Field) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{1}
+	return fileDescriptor_dd271cc1e348c538, []int{1}
 }
+
 func (m *Field) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Field.Unmarshal(m, b)
 }
 func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Field.Marshal(b, m, deterministic)
 }
-func (dst *Field) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Field.Merge(dst, src)
+func (m *Field) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Field.Merge(m, src)
 }
 func (m *Field) XXX_Size() int {
 	return xxx_messageInfo_Field.Size(m)
@@ -403,16 +414,17 @@ func (m *Enum) Reset()         { *m = Enum{} }
 func (m *Enum) String() string { return proto.CompactTextString(m) }
 func (*Enum) ProtoMessage()    {}
 func (*Enum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{2}
+	return fileDescriptor_dd271cc1e348c538, []int{2}
 }
+
 func (m *Enum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Enum.Unmarshal(m, b)
 }
 func (m *Enum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Enum.Marshal(b, m, deterministic)
 }
-func (dst *Enum) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Enum.Merge(dst, src)
+func (m *Enum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Enum.Merge(m, src)
 }
 func (m *Enum) XXX_Size() int {
 	return xxx_messageInfo_Enum.Size(m)
@@ -475,16 +487,17 @@ func (m *EnumValue) Reset()         { *m = EnumValue{} }
 func (m *EnumValue) String() string { return proto.CompactTextString(m) }
 func (*EnumValue) ProtoMessage()    {}
 func (*EnumValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{3}
+	return fileDescriptor_dd271cc1e348c538, []int{3}
 }
+
 func (m *EnumValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnumValue.Unmarshal(m, b)
 }
 func (m *EnumValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnumValue.Marshal(b, m, deterministic)
 }
-func (dst *EnumValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnumValue.Merge(dst, src)
+func (m *EnumValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumValue.Merge(m, src)
 }
 func (m *EnumValue) XXX_Size() int {
 	return xxx_messageInfo_EnumValue.Size(m)
@@ -538,16 +551,17 @@ func (m *Option) Reset()         { *m = Option{} }
 func (m *Option) String() string { return proto.CompactTextString(m) }
 func (*Option) ProtoMessage()    {}
 func (*Option) Descriptor() ([]byte, []int) {
-	return fileDescriptor_type_9c5a06c7d02c042f, []int{4}
+	return fileDescriptor_dd271cc1e348c538, []int{4}
 }
+
 func (m *Option) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Option.Unmarshal(m, b)
 }
 func (m *Option) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Option.Marshal(b, m, deterministic)
 }
-func (dst *Option) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Option.Merge(dst, src)
+func (m *Option) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Option.Merge(m, src)
 }
 func (m *Option) XXX_Size() int {
 	return xxx_messageInfo_Option.Size(m)
@@ -573,19 +587,19 @@ func (m *Option) GetValue() *any.Any {
 }
 
 func init() {
+	proto.RegisterEnum("google.protobuf.Syntax", Syntax_name, Syntax_value)
+	proto.RegisterEnum("google.protobuf.Field_Kind", Field_Kind_name, Field_Kind_value)
+	proto.RegisterEnum("google.protobuf.Field_Cardinality", Field_Cardinality_name, Field_Cardinality_value)
 	proto.RegisterType((*Type)(nil), "google.protobuf.Type")
 	proto.RegisterType((*Field)(nil), "google.protobuf.Field")
 	proto.RegisterType((*Enum)(nil), "google.protobuf.Enum")
 	proto.RegisterType((*EnumValue)(nil), "google.protobuf.EnumValue")
 	proto.RegisterType((*Option)(nil), "google.protobuf.Option")
-	proto.RegisterEnum("google.protobuf.Syntax", Syntax_name, Syntax_value)
-	proto.RegisterEnum("google.protobuf.Field_Kind", Field_Kind_name, Field_Kind_value)
-	proto.RegisterEnum("google.protobuf.Field_Cardinality", Field_Cardinality_name, Field_Cardinality_value)
 }
 
-func init() { proto.RegisterFile("google/protobuf/type.proto", fileDescriptor_type_9c5a06c7d02c042f) }
+func init() { proto.RegisterFile("google/protobuf/type.proto", fileDescriptor_dd271cc1e348c538) }
 
-var fileDescriptor_type_9c5a06c7d02c042f = []byte{
+var fileDescriptor_dd271cc1e348c538 = []byte{
 	// 810 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x8e, 0xda, 0x56,
 	0x14, 0x8e, 0x8d, 0xf1, 0xe0, 0xc3, 0xc0, 0xdc, 0xdc, 0x44, 0x89, 0x33, 0x91, 0x52, 0x44, 0xbb,
diff --git a/protobuf/source_context/source_context.pb.go b/protobuf/source_context/source_context.pb.go
index 2e99dc34b1..fe44f7e1a5 100644
--- a/protobuf/source_context/source_context.pb.go
+++ b/protobuf/source_context/source_context.pb.go
@@ -1,11 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/source_context.proto
 
-package source_context // import "google.golang.org/genproto/protobuf/source_context"
+package source_context
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +19,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `SourceContext` represents information about the source of a
 // protobuf element, like the file in which it is defined.
@@ -33,16 +36,17 @@ func (m *SourceContext) Reset()         { *m = SourceContext{} }
 func (m *SourceContext) String() string { return proto.CompactTextString(m) }
 func (*SourceContext) ProtoMessage()    {}
 func (*SourceContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_source_context_145ed41f088ecfc0, []int{0}
+	return fileDescriptor_b686cdb126d509db, []int{0}
 }
+
 func (m *SourceContext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceContext.Unmarshal(m, b)
 }
 func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
 }
-func (dst *SourceContext) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceContext.Merge(dst, src)
+func (m *SourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceContext.Merge(m, src)
 }
 func (m *SourceContext) XXX_Size() int {
 	return xxx_messageInfo_SourceContext.Size(m)
@@ -65,10 +69,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/protobuf/source_context.proto", fileDescriptor_source_context_145ed41f088ecfc0)
+	proto.RegisterFile("google/protobuf/source_context.proto", fileDescriptor_b686cdb126d509db)
 }
 
-var fileDescriptor_source_context_145ed41f088ecfc0 = []byte{
+var fileDescriptor_b686cdb126d509db = []byte{
 	// 184 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xce, 0x2f, 0x2d,